diff --git a/Aaru.Compression/ADC.cs b/Aaru.Compression/ADC.cs
index d0884e7ae..cff6f5008 100644
--- a/Aaru.Compression/ADC.cs
+++ b/Aaru.Compression/ADC.cs
@@ -39,149 +39,148 @@ using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-namespace Aaru.Compression
+namespace Aaru.Compression;
+
+/// <summary>Implements the Apple version of RLE</summary>
+public static class ADC
 {
-    /// <summary>Implements the Apple version of RLE</summary>
-    public static class ADC
+    /// <summary>
+    /// Set to <c>true</c> if this algorithm is supported, <c>false</c> otherwise.
+    /// </summary>
+    public static bool IsSupported => true;
+
+    [DllImport("libAaru.Compression.Native", SetLastError = true)]
+    static extern int AARU_adc_decode_buffer(byte[] dst_buffer, int dst_size, byte[] src_buffer, int src_size);
+
+    const int PLAIN      = 1;
+    const int TWO_BYTE   = 2;
+    const int THREE_BYTE = 3;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    static int GetChunkType(byte byt) => (byt & 0x80) == 0x80
+                                             ? PLAIN
+                                             : (byt & 0x40) == 0x40
+                                                 ? THREE_BYTE
+                                                 : TWO_BYTE;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    static int GetChunkSize(byte byt) => GetChunkType(byt) switch
     {
-        /// <summary>
-        /// Set to <c>true</c> if this algorithm is supported, <c>false</c> otherwise.
-        /// </summary>
-        public static bool IsSupported => true;
+        PLAIN      => (byt & 0x7F)        + 1,
+        TWO_BYTE   => ((byt & 0x3F) >> 2) + 3,
+        THREE_BYTE => (byt & 0x3F)        + 4,
+        _          => -1
+    };
 
-        [DllImport("libAaru.Compression.Native", SetLastError = true)]
-        static extern int AARU_adc_decode_buffer(byte[] dst_buffer, int dst_size, byte[] src_buffer, int src_size);
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    static int GetOffset(ReadOnlySpan<byte> chunk) => GetChunkType(chunk[0]) switch
+    {
+        PLAIN      => 0,
+        TWO_BYTE   => ((chunk[0] & 0x03) << 8) + chunk[1],
+        THREE_BYTE => (chunk[1]          << 8) + chunk[2],
+        _          => -1
+    };
 
-        const int PLAIN      = 1;
-        const int TWO_BYTE   = 2;
-        const int THREE_BYTE = 3;
+    /// <summary>Decompresses a byte buffer that's compressed with ADC</summary>
+    /// <param name="source">Compressed buffer</param>
+    /// <param name="destination">Buffer to hold decompressed data</param>
+    /// <returns>How many bytes are stored on <paramref name="destination" /></returns>
+    [MethodImpl(MethodImplOptions.AggressiveOptimization)]
+    public static int DecodeBuffer(byte[] source, byte[] destination)
+    {
+        if(Native.IsSupported)
+            return AARU_adc_decode_buffer(destination, destination.Length, source, source.Length);
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        static int GetChunkType(byte byt) => (byt & 0x80) == 0x80
-                                                 ? PLAIN
-                                                 : (byt & 0x40) == 0x40
-                                                     ? THREE_BYTE
-                                                     : TWO_BYTE;
+        int        inputPosition = 0;
+        int        chunkSize;
+        int        offset;
+        int        chunkType;
+        int        outPosition = 0;
+        Span<byte> temp        = stackalloc byte[3];
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        static int GetChunkSize(byte byt) => GetChunkType(byt) switch
+        while(inputPosition < source.Length)
         {
-            PLAIN      => (byt & 0x7F)        + 1,
-            TWO_BYTE   => ((byt & 0x3F) >> 2) + 3,
-            THREE_BYTE => (byt & 0x3F)        + 4,
-            _          => -1
-        };
+            byte readByte = source[inputPosition++];
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        static int GetOffset(ReadOnlySpan<byte> chunk) => GetChunkType(chunk[0]) switch
-        {
-            PLAIN      => 0,
-            TWO_BYTE   => ((chunk[0] & 0x03) << 8) + chunk[1],
-            THREE_BYTE => (chunk[1]          << 8) + chunk[2],
-            _          => -1
-        };
+            chunkType = GetChunkType(readByte);
 
-        /// <summary>Decompresses a byte buffer that's compressed with ADC</summary>
-        /// <param name="source">Compressed buffer</param>
-        /// <param name="destination">Buffer to hold decompressed data</param>
-        /// <returns>How many bytes are stored on <paramref name="destination" /></returns>
-        [MethodImpl(MethodImplOptions.AggressiveOptimization)]
-        public static int DecodeBuffer(byte[] source, byte[] destination)
-        {
-            if(Native.IsSupported)
-                return AARU_adc_decode_buffer(destination, destination.Length, source, source.Length);
-
-            int        inputPosition = 0;
-            int        chunkSize;
-            int        offset;
-            int        chunkType;
-            int        outPosition = 0;
-            Span<byte> temp        = stackalloc byte[3];
-
-            while(inputPosition < source.Length)
+            switch(chunkType)
             {
-                byte readByte = source[inputPosition++];
+                case PLAIN:
+                    chunkSize = GetChunkSize(readByte);
 
-                chunkType = GetChunkType(readByte);
+                    if(outPosition + chunkSize > destination.Length)
+                        goto finished;
 
-                switch(chunkType)
-                {
-                    case PLAIN:
-                        chunkSize = GetChunkSize(readByte);
+                    Array.Copy(source, inputPosition, destination, outPosition, chunkSize);
+                    outPosition   += chunkSize;
+                    inputPosition += chunkSize;
 
-                        if(outPosition + chunkSize > destination.Length)
-                            goto finished;
+                    break;
+                case TWO_BYTE:
+                    chunkSize = GetChunkSize(readByte);
+                    temp[0]   = readByte;
+                    temp[1]   = source[inputPosition++];
+                    offset    = GetOffset(temp);
 
-                        Array.Copy(source, inputPosition, destination, outPosition, chunkSize);
-                        outPosition   += chunkSize;
-                        inputPosition += chunkSize;
+                    if(outPosition + chunkSize > destination.Length)
+                        goto finished;
 
-                        break;
-                    case TWO_BYTE:
-                        chunkSize = GetChunkSize(readByte);
-                        temp[0]   = readByte;
-                        temp[1]   = source[inputPosition++];
-                        offset    = GetOffset(temp);
+                    if(offset == 0)
+                    {
+                        byte lastByte = destination[outPosition - 1];
 
-                        if(outPosition + chunkSize > destination.Length)
-                            goto finished;
-
-                        if(offset == 0)
+                        for(int i = 0; i < chunkSize; i++)
                         {
-                            byte lastByte = destination[outPosition - 1];
-
-                            for(int i = 0; i < chunkSize; i++)
-                            {
-                                destination[outPosition] = lastByte;
-                                outPosition++;
-                            }
+                            destination[outPosition] = lastByte;
+                            outPosition++;
                         }
-                        else
+                    }
+                    else
+                    {
+                        for(int i = 0; i < chunkSize; i++)
                         {
-                            for(int i = 0; i < chunkSize; i++)
-                            {
-                                destination[outPosition] = destination[outPosition - offset - 1];
-                                outPosition++;
-                            }
+                            destination[outPosition] = destination[outPosition - offset - 1];
+                            outPosition++;
                         }
+                    }
 
-                        break;
-                    case THREE_BYTE:
-                        chunkSize = GetChunkSize(readByte);
-                        temp[0]   = readByte;
-                        temp[1]   = source[inputPosition++];
-                        temp[2]   = source[inputPosition++];
-                        offset    = GetOffset(temp);
+                    break;
+                case THREE_BYTE:
+                    chunkSize = GetChunkSize(readByte);
+                    temp[0]   = readByte;
+                    temp[1]   = source[inputPosition++];
+                    temp[2]   = source[inputPosition++];
+                    offset    = GetOffset(temp);
 
-                        if(outPosition + chunkSize > destination.Length)
-                            goto finished;
+                    if(outPosition + chunkSize > destination.Length)
+                        goto finished;
 
-                        if(offset == 0)
+                    if(offset == 0)
+                    {
+                        byte lastByte = destination[outPosition - 1];
+
+                        for(int i = 0; i < chunkSize; i++)
                         {
-                            byte lastByte = destination[outPosition - 1];
-
-                            for(int i = 0; i < chunkSize; i++)
-                            {
-                                destination[outPosition] = lastByte;
-                                outPosition++;
-                            }
+                            destination[outPosition] = lastByte;
+                            outPosition++;
                         }
-                        else
+                    }
+                    else
+                    {
+                        for(int i = 0; i < chunkSize; i++)
                         {
-                            for(int i = 0; i < chunkSize; i++)
-                            {
-                                destination[outPosition] = destination[outPosition - offset - 1];
-                                outPosition++;
-                            }
+                            destination[outPosition] = destination[outPosition - offset - 1];
+                            outPosition++;
                         }
+                    }
 
-                        break;
-                }
+                    break;
             }
-
-            finished:
-
-            return outPosition;
         }
+
+        finished:
+
+        return outPosition;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Compression/AppleRle.cs b/Aaru.Compression/AppleRle.cs
index 513fc2f59..569d15aac 100644
--- a/Aaru.Compression/AppleRle.cs
+++ b/Aaru.Compression/AppleRle.cs
@@ -33,105 +33,104 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Compression
+namespace Aaru.Compression;
+
+/// <summary>Implements the Apple version of RLE</summary>
+public static class AppleRle
 {
-    /// <summary>Implements the Apple version of RLE</summary>
-    public static class AppleRle
+    /// <summary>
+    /// Set to <c>true</c> if this algorithm is supported, <c>false</c> otherwise.
+    /// </summary>
+    public static bool IsSupported => true;
+
+    [DllImport("libAaru.Compression.Native", SetLastError = true)]
+    static extern int AARU_apple_rle_decode_buffer(byte[] dst_buffer, int dst_size, byte[] src_buffer, int src_size);
+
+    const uint DART_CHUNK = 20960;
+
+    /// <summary>Decodes a buffer compressed with Apple RLE</summary>
+    /// <param name="source">Encoded buffer</param>
+    /// <param name="destination">Buffer where to write the decoded data</param>
+    /// <returns>The number of decoded bytes</returns>
+    public static int DecodeBuffer(byte[] source, byte[] destination)
     {
-        /// <summary>
-        /// Set to <c>true</c> if this algorithm is supported, <c>false</c> otherwise.
-        /// </summary>
-        public static bool IsSupported => true;
+        if(Native.IsSupported)
+            return AARU_apple_rle_decode_buffer(destination, destination.Length, source, source.Length);
 
-        [DllImport("libAaru.Compression.Native", SetLastError = true)]
-        static extern int AARU_apple_rle_decode_buffer(byte[] dst_buffer, int dst_size, byte[] src_buffer, int src_size);
+        int  count         = 0;
+        bool nextA         = true; // true if A, false if B
+        byte repeatedByteA = 0, repeatedByteB = 0;
+        bool repeatMode    = false; // true if we're repeating, false if we're just copying
+        int  inPosition    = 0, outPosition = 0;
 
-        const uint DART_CHUNK = 20960;
-
-        /// <summary>Decodes a buffer compressed with Apple RLE</summary>
-        /// <param name="source">Encoded buffer</param>
-        /// <param name="destination">Buffer where to write the decoded data</param>
-        /// <returns>The number of decoded bytes</returns>
-        public static int DecodeBuffer(byte[] source, byte[] destination)
+        while(inPosition  <= source.Length &&
+              outPosition <= destination.Length)
         {
-            if(Native.IsSupported)
-                return AARU_apple_rle_decode_buffer(destination, destination.Length, source, source.Length);
-
-            int  count         = 0;
-            bool nextA         = true; // true if A, false if B
-            byte repeatedByteA = 0, repeatedByteB = 0;
-            bool repeatMode    = false; // true if we're repeating, false if we're just copying
-            int  inPosition    = 0, outPosition = 0;
-
-            while(inPosition  <= source.Length &&
-                  outPosition <= destination.Length)
+            switch(repeatMode)
             {
-                switch(repeatMode)
+                case true when count > 0:
                 {
-                    case true when count > 0:
+                    count--;
+
+                    if(nextA)
                     {
-                        count--;
-
-                        if(nextA)
-                        {
-                            nextA = false;
-
-                            destination[outPosition++] = repeatedByteA;
-
-                            continue;
-                        }
-
-                        nextA = true;
-
-                        destination[outPosition++] = repeatedByteB;
-
-                        continue;
-                    }
-                    case false when count > 0:
-                        count--;
-
-                        destination[outPosition++] = source[inPosition++];
-
-                        continue;
-                }
-
-                if(inPosition == source.Length)
-                    break;
-
-                while(true)
-                {
-                    byte  b1 = source[inPosition++];
-                    byte  b2 = source[inPosition++];
-                    short s  = (short)((b1 << 8) | b2);
-
-                    if(s == 0          ||
-                       s >= DART_CHUNK ||
-                       s <= -DART_CHUNK)
-                        continue;
-
-                    if(s < 0)
-                    {
-                        repeatMode    = true;
-                        repeatedByteA = source[inPosition++];
-                        repeatedByteB = source[inPosition++];
-                        count         = (-s * 2) - 1;
-                        nextA         = false;
+                        nextA = false;
 
                         destination[outPosition++] = repeatedByteA;
 
-                        break;
+                        continue;
                     }
 
-                    repeatMode = false;
-                    count      = (s * 2) - 1;
+                    nextA = true;
+
+                    destination[outPosition++] = repeatedByteB;
+
+                    continue;
+                }
+                case false when count > 0:
+                    count--;
 
                     destination[outPosition++] = source[inPosition++];
 
-                    break;
-                }
+                    continue;
             }
 
-            return outPosition;
+            if(inPosition == source.Length)
+                break;
+
+            while(true)
+            {
+                byte  b1 = source[inPosition++];
+                byte  b2 = source[inPosition++];
+                short s  = (short)((b1 << 8) | b2);
+
+                if(s == 0          ||
+                   s >= DART_CHUNK ||
+                   s <= -DART_CHUNK)
+                    continue;
+
+                if(s < 0)
+                {
+                    repeatMode    = true;
+                    repeatedByteA = source[inPosition++];
+                    repeatedByteB = source[inPosition++];
+                    count         = (-s * 2) - 1;
+                    nextA         = false;
+
+                    destination[outPosition++] = repeatedByteA;
+
+                    break;
+                }
+
+                repeatMode = false;
+                count      = (s * 2) - 1;
+
+                destination[outPosition++] = source[inPosition++];
+
+                break;
+            }
         }
+
+        return outPosition;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Compression/Native.cs b/Aaru.Compression/Native.cs
index 3b4d59ea7..59b88218f 100644
--- a/Aaru.Compression/Native.cs
+++ b/Aaru.Compression/Native.cs
@@ -32,52 +32,51 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Compression
+namespace Aaru.Compression;
+
+public static class Native
 {
-    public static class Native
+    static bool _checked;
+    static bool _supported;
+
+    /// <summary>Set to return native as never supported</summary>
+    public static bool ForceManaged { get; set; }
+
+    /// <summary>
+    ///     If set to <c>true</c> the native library was found and loaded correctly and its reported version is
+    ///     compatible.
+    /// </summary>
+    public static bool IsSupported
     {
-        static bool _checked;
-        static bool _supported;
-
-        /// <summary>Set to return native as never supported</summary>
-        public static bool ForceManaged { get; set; }
-
-        /// <summary>
-        ///     If set to <c>true</c> the native library was found and loaded correctly and its reported version is
-        ///     compatible.
-        /// </summary>
-        public static bool IsSupported
+        get
         {
-            get
-            {
-                if(ForceManaged)
-                    return false;
-
-                if(_checked)
-                    return _supported;
-
-                ulong version;
-                _checked = true;
-
-                try
-                {
-                    version = AARU_get_acn_version();
-                }
-                catch
-                {
-                    _supported = false;
-
-                    return false;
-                }
-
-                // TODO: Check version compatibility
-                _supported = version >= 0x06000000;
+            if(ForceManaged)
+                return false;
 
+            if(_checked)
                 return _supported;
-            }
-        }
 
-        [DllImport("libAaru.Compression.Native", SetLastError = true)]
-        static extern ulong AARU_get_acn_version();
+            ulong version;
+            _checked = true;
+
+            try
+            {
+                version = AARU_get_acn_version();
+            }
+            catch
+            {
+                _supported = false;
+
+                return false;
+            }
+
+            // TODO: Check version compatibility
+            _supported = version >= 0x06000000;
+
+            return _supported;
+        }
     }
+
+    [DllImport("libAaru.Compression.Native", SetLastError = true)]
+    static extern ulong AARU_get_acn_version();
 }
\ No newline at end of file
diff --git a/Aaru.Compression/TeleDiskLzh.cs b/Aaru.Compression/TeleDiskLzh.cs
index 3958ce884..f62a774dc 100644
--- a/Aaru.Compression/TeleDiskLzh.cs
+++ b/Aaru.Compression/TeleDiskLzh.cs
@@ -45,415 +45,414 @@
 using System;
 using System.IO;
 
-namespace Aaru.Compression
+namespace Aaru.Compression;
+
+/*
+ * Based on Japanese version 29-NOV-1988
+ * LZSS coded by Haruhiko OKUMURA
+ * Adaptive Huffman Coding coded by Haruyasu YOSHIZAKI
+ * Edited and translated to English by Kenji RIKITAKE
+ */
+/// <summary>Implements the TeleDisk version of LZH</summary>
+public class TeleDiskLzh
 {
+    /// <summary>
+    /// Set to <c>true</c> if this algorithm is supported, <c>false</c> otherwise.
+    /// </summary>
+    public static bool IsSupported => true;
+
+    const int BUFSZ = 512;
+
+    /* LZSS Parameters */
+
+    const int N         = 4096; /* Size of string buffer */
+    const int F         = 60;   /* Size of look-ahead buffer */
+    const int THRESHOLD = 2;
+
+    /* Huffman coding parameters */
+
+    const int N_CHAR = 256 - THRESHOLD + F;
+    /* character code (= 0..N_CHAR-1) */
+    const int T        = (N_CHAR * 2) - 1; /* Size of table */
+    const int ROOT     = T            - 1; /* root position */
+    const int MAX_FREQ = 0x8000;
+
     /*
-     * Based on Japanese version 29-NOV-1988
-     * LZSS coded by Haruhiko OKUMURA
-     * Adaptive Huffman Coding coded by Haruyasu YOSHIZAKI
-     * Edited and translated to English by Kenji RIKITAKE
+     * Tables for encoding/decoding upper 6 bits of
+     * sliding dictionary pointer
      */
-    /// <summary>Implements the TeleDisk version of LZH</summary>
-    public class TeleDiskLzh
+
+    /* decoder table */
+    readonly byte[] _dCode =
     {
-        /// <summary>
-        /// Set to <c>true</c> if this algorithm is supported, <c>false</c> otherwise.
-        /// </summary>
-        public static bool IsSupported => true;
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05,
+        0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+        0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B,
+        0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x10, 0x10,
+        0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14,
+        0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A,
+        0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23,
+        0x24, 0x24, 0x25, 0x25, 0x26, 0x26, 0x27, 0x27, 0x28, 0x28, 0x29, 0x29, 0x2A, 0x2A, 0x2B, 0x2B, 0x2C, 0x2C,
+        0x2D, 0x2D, 0x2E, 0x2E, 0x2F, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
+        0x3C, 0x3D, 0x3E, 0x3F
+    };
 
-        const int BUFSZ = 512;
+    readonly byte[] _dLen =
+    {
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04,
+        0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+        0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+        0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+        0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+        0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+        0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+        0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+        0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+        0x08, 0x08, 0x08, 0x08
+    };
+    readonly ushort[] _freq = new ushort[T + 1]; /* cumulative freq table */
 
-        /* LZSS Parameters */
+    readonly Stream _inStream;
 
-        const int N         = 4096; /* Size of string buffer */
-        const int F         = 60;   /* Size of look-ahead buffer */
-        const int THRESHOLD = 2;
+    /*
+     * pointing parent nodes.
+     * area [T..(T + N_CHAR - 1)] are pointers for leaves
+     */
+    readonly short[] _prnt = new short[T + N_CHAR];
 
-        /* Huffman coding parameters */
+    /* pointing children nodes (son[], son[] + 1)*/
+    readonly short[] _son     = new short[T];
+    readonly byte[]  _textBuf = new byte[N + F - 1];
 
-        const int N_CHAR = 256 - THRESHOLD + F;
-        /* character code (= 0..N_CHAR-1) */
-        const int T        = (N_CHAR * 2) - 1; /* Size of table */
-        const int ROOT     = T            - 1; /* root position */
-        const int MAX_FREQ = 0x8000;
+    ushort _getbuf;
+    byte   _getlen;
 
-        /*
-         * Tables for encoding/decoding upper 6 bits of
-         * sliding dictionary pointer
-         */
+    Tdlzhuf _tdctl;
 
-        /* decoder table */
-        readonly byte[] _dCode =
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,
-            0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-            0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05,
-            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07,
-            0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
-            0x09, 0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B,
-            0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x10, 0x10,
-            0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14,
-            0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x19, 0x19, 0x1A, 0x1A,
-            0x1B, 0x1B, 0x1C, 0x1C, 0x1D, 0x1D, 0x1E, 0x1E, 0x1F, 0x1F, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23,
-            0x24, 0x24, 0x25, 0x25, 0x26, 0x26, 0x27, 0x27, 0x28, 0x28, 0x29, 0x29, 0x2A, 0x2A, 0x2B, 0x2B, 0x2C, 0x2C,
-            0x2D, 0x2D, 0x2E, 0x2E, 0x2F, 0x2F, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B,
-            0x3C, 0x3D, 0x3E, 0x3F
-        };
+    /// <summary>Implements the TeleDisk LZH algorithm over the specified stream.</summary>
+    /// <param name="dataStream">Stream with compressed data.</param>
+    public TeleDiskLzh(Stream dataStream)
+    {
+        int i;
+        _getbuf        = 0;
+        _getlen        = 0;
+        _tdctl         = new Tdlzhuf();
+        _tdctl.Ibufcnt = _tdctl.Ibufndx = 0; // input buffer is empty
+        _tdctl.Bufcnt  = 0;
+        StartHuff();
 
-        readonly byte[] _dLen =
-        {
-            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-            0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04,
-            0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-            0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-            0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-            0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-            0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-            0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-            0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-            0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-            0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-            0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
-            0x08, 0x08, 0x08, 0x08
-        };
-        readonly ushort[] _freq = new ushort[T + 1]; /* cumulative freq table */
+        for(i = 0; i < N - F; i++)
+            _textBuf[i] = 0x20;
 
-        readonly Stream _inStream;
+        _tdctl.R  = N - F;
+        _inStream = dataStream;
+    }
 
-        /*
-         * pointing parent nodes.
-         * area [T..(T + N_CHAR - 1)] are pointers for leaves
-         */
-        readonly short[] _prnt = new short[T + N_CHAR];
+    /* DeCompression
 
-        /* pointing children nodes (son[], son[] + 1)*/
-        readonly short[] _son     = new short[T];
-        readonly byte[]  _textBuf = new byte[N + F - 1];
+    split out initialization code to init_Decode()
 
-        ushort _getbuf;
-        byte   _getlen;
+    */
 
-        Tdlzhuf _tdctl;
+    /// <summary>Decompresses data</summary>
+    /// <param name="buf">Buffer to write the decompressed data to</param>
+    /// <param name="len">Number of bytes to decompress</param>
+    /// <returns>Number of decompressed bytes</returns>
+    public int Decode(out byte[] buf, int len) /* Decoding/Uncompressing */
+    {
+        short c;
+        buf = new byte[len];
+        int count; // was an unsigned long, seems unnecessary
 
-        /// <summary>Implements the TeleDisk LZH algorithm over the specified stream.</summary>
-        /// <param name="dataStream">Stream with compressed data.</param>
-        public TeleDiskLzh(Stream dataStream)
-        {
-            int i;
-            _getbuf        = 0;
-            _getlen        = 0;
-            _tdctl         = new Tdlzhuf();
-            _tdctl.Ibufcnt = _tdctl.Ibufndx = 0; // input buffer is empty
-            _tdctl.Bufcnt  = 0;
-            StartHuff();
+        for(count = 0; count < len;)
+            if(_tdctl.Bufcnt == 0)
+            {
+                if((c = DecodeChar()) < 0)
+                    return count; // fatal error
 
-            for(i = 0; i < N - F; i++)
-                _textBuf[i] = 0x20;
-
-            _tdctl.R  = N - F;
-            _inStream = dataStream;
-        }
-
-        /* DeCompression
-
-        split out initialization code to init_Decode()
-
-        */
-
-        /// <summary>Decompresses data</summary>
-        /// <param name="buf">Buffer to write the decompressed data to</param>
-        /// <param name="len">Number of bytes to decompress</param>
-        /// <returns>Number of decompressed bytes</returns>
-        public int Decode(out byte[] buf, int len) /* Decoding/Uncompressing */
-        {
-            short c;
-            buf = new byte[len];
-            int count; // was an unsigned long, seems unnecessary
-
-            for(count = 0; count < len;)
-                if(_tdctl.Bufcnt == 0)
+                if(c < 256)
                 {
-                    if((c = DecodeChar()) < 0)
-                        return count; // fatal error
-
-                    if(c < 256)
-                    {
-                        buf[count]           =  (byte)c;
-                        _textBuf[_tdctl.R++] =  (byte)c;
-                        _tdctl.R             &= N - 1;
-                        count++;
-                    }
-                    else
-                    {
-                        short pos;
-
-                        if((pos = DecodePosition()) < 0)
-                            return count; // fatal error
-
-                        _tdctl.Bufpos = (ushort)((_tdctl.R - pos - 1) & (N - 1));
-                        _tdctl.Bufcnt = (ushort)(c - 255 + THRESHOLD);
-                        _tdctl.Bufndx = 0;
-                    }
+                    buf[count]           =  (byte)c;
+                    _textBuf[_tdctl.R++] =  (byte)c;
+                    _tdctl.R             &= N - 1;
+                    count++;
                 }
                 else
                 {
-                    // still chars from last string
-                    while(_tdctl.Bufndx < _tdctl.Bufcnt &&
-                          count         < len)
-                    {
-                        c          = _textBuf[(_tdctl.Bufpos + _tdctl.Bufndx) & (N - 1)];
-                        buf[count] = (byte)c;
-                        _tdctl.Bufndx++;
-                        _textBuf[_tdctl.R++] =  (byte)c;
-                        _tdctl.R             &= N - 1;
-                        count++;
-                    }
+                    short pos;
 
-                    // reset bufcnt after copy string from text_buf[]
-                    if(_tdctl.Bufndx >= _tdctl.Bufcnt)
-                        _tdctl.Bufndx = _tdctl.Bufcnt = 0;
+                    if((pos = DecodePosition()) < 0)
+                        return count; // fatal error
+
+                    _tdctl.Bufpos = (ushort)((_tdctl.R - pos - 1) & (N - 1));
+                    _tdctl.Bufcnt = (ushort)(c - 255 + THRESHOLD);
+                    _tdctl.Bufndx = 0;
+                }
+            }
+            else
+            {
+                // still chars from last string
+                while(_tdctl.Bufndx < _tdctl.Bufcnt &&
+                      count         < len)
+                {
+                    c          = _textBuf[(_tdctl.Bufpos + _tdctl.Bufndx) & (N - 1)];
+                    buf[count] = (byte)c;
+                    _tdctl.Bufndx++;
+                    _textBuf[_tdctl.R++] =  (byte)c;
+                    _tdctl.R             &= N - 1;
+                    count++;
                 }
 
-            return count; // count == len, success
-        }
-
-        long DataRead(out byte[] buf, long size)
-        {
-            if(size > _inStream.Length - _inStream.Position)
-                size = _inStream.Length - _inStream.Position;
-
-            buf = new byte[size];
-            _inStream.Read(buf, 0, (int)size);
-
-            return size;
-        }
-
-        int NextWord()
-        {
-            if(_tdctl.Ibufndx >= _tdctl.Ibufcnt)
-            {
-                _tdctl.Ibufndx = 0;
-                _tdctl.Ibufcnt = (ushort)DataRead(out _tdctl.Inbuf, BUFSZ);
-
-                if(_tdctl.Ibufcnt <= 0)
-                    return -1;
+                // reset bufcnt after copy string from text_buf[]
+                if(_tdctl.Bufndx >= _tdctl.Bufcnt)
+                    _tdctl.Bufndx = _tdctl.Bufcnt = 0;
             }
 
-            while(_getlen <= 8)
-            {
-                // typically reads a word at a time
-                _getbuf |= (ushort)(_tdctl.Inbuf[_tdctl.Ibufndx++] << (8 - _getlen));
-                _getlen += 8;
-            }
+        return count; // count == len, success
+    }
 
-            return 0;
-        }
+    long DataRead(out byte[] buf, long size)
+    {
+        if(size > _inStream.Length - _inStream.Position)
+            size = _inStream.Length - _inStream.Position;
 
-        int GetBit() /* get one bit */
+        buf = new byte[size];
+        _inStream.Read(buf, 0, (int)size);
+
+        return size;
+    }
+
+    int NextWord()
+    {
+        if(_tdctl.Ibufndx >= _tdctl.Ibufcnt)
         {
-            if(NextWord() < 0)
+            _tdctl.Ibufndx = 0;
+            _tdctl.Ibufcnt = (ushort)DataRead(out _tdctl.Inbuf, BUFSZ);
+
+            if(_tdctl.Ibufcnt <= 0)
                 return -1;
-
-            short i = (short)_getbuf;
-            _getbuf <<= 1;
-            _getlen--;
-
-            return i < 0 ? 1 : 0;
         }
 
-        int GetByte() /* get a byte */
+        while(_getlen <= 8)
         {
-            if(NextWord() != 0)
-                return -1;
-
-            ushort i = _getbuf;
-            _getbuf <<= 8;
-            _getlen -=  8;
-            i       =   (ushort)(i >> 8);
-
-            return i;
+            // typically reads a word at a time
+            _getbuf |= (ushort)(_tdctl.Inbuf[_tdctl.Ibufndx++] << (8 - _getlen));
+            _getlen += 8;
         }
 
-        /* initialize freq tree */
+        return 0;
+    }
 
-        void StartHuff()
+    int GetBit() /* get one bit */
+    {
+        if(NextWord() < 0)
+            return -1;
+
+        short i = (short)_getbuf;
+        _getbuf <<= 1;
+        _getlen--;
+
+        return i < 0 ? 1 : 0;
+    }
+
+    int GetByte() /* get a byte */
+    {
+        if(NextWord() != 0)
+            return -1;
+
+        ushort i = _getbuf;
+        _getbuf <<= 8;
+        _getlen -=  8;
+        i       =   (ushort)(i >> 8);
+
+        return i;
+    }
+
+    /* initialize freq tree */
+
+    void StartHuff()
+    {
+        int i;
+
+        for(i = 0; i < N_CHAR; i++)
         {
-            int i;
+            _freq[i]     = 1;
+            _son[i]      = (short)(i + T);
+            _prnt[i + T] = (short)i;
+        }
 
-            for(i = 0; i < N_CHAR; i++)
+        i = 0;
+        int j = N_CHAR;
+
+        while(j <= ROOT)
+        {
+            _freq[j] =  (ushort)(_freq[i] + _freq[i + 1]);
+            _son[j]  =  (short)i;
+            _prnt[i] =  _prnt[i + 1] = (short)j;
+            i        += 2;
+            j++;
+        }
+
+        _freq[T]    = 0xffff;
+        _prnt[ROOT] = 0;
+    }
+
+    /* reconstruct freq tree */
+
+    void Reconst()
+    {
+        short i, k;
+
+        /* halven cumulative freq for leaf nodes */
+        short j = 0;
+
+        for(i = 0; i < T; i++)
+            if(_son[i] >= T)
             {
-                _freq[i]     = 1;
-                _son[i]      = (short)(i + T);
-                _prnt[i + T] = (short)i;
-            }
-
-            i = 0;
-            int j = N_CHAR;
-
-            while(j <= ROOT)
-            {
-                _freq[j] =  (ushort)(_freq[i] + _freq[i + 1]);
-                _son[j]  =  (short)i;
-                _prnt[i] =  _prnt[i + 1] = (short)j;
-                i        += 2;
+                _freq[j] = (ushort)((_freq[i] + 1) / 2);
+                _son[j]  = _son[i];
                 j++;
             }
 
-            _freq[T]    = 0xffff;
-            _prnt[ROOT] = 0;
+        /* make a tree : first, connect children nodes */
+        for(i = 0, j = N_CHAR; j < T; i += 2, j++)
+        {
+            k = (short)(i + 1);
+            ushort f = _freq[j] = (ushort)(_freq[i] + _freq[k]);
+
+            for(k = (short)(j - 1); f < _freq[k]; k--) {}
+
+            k++;
+            ushort l = (ushort)((j - k) * 2);
+
+            Array.ConstrainedCopy(_freq, k, _freq, k + 1, l);
+            _freq[k] = f;
+            Array.ConstrainedCopy(_son, k, _son, k + 1, l);
+            _son[k] = i;
         }
 
-        /* reconstruct freq tree */
+        /* connect parent nodes */
+        for(i = 0; i < T; i++)
+            if((k = _son[i]) >= T)
+                _prnt[k] = i;
+            else
+                _prnt[k] = _prnt[k + 1] = i;
+    }
 
-        void Reconst()
+    /* update freq tree */
+
+    void Update(int c)
+    {
+        if(_freq[ROOT] == MAX_FREQ)
+            Reconst();
+
+        c = _prnt[c + T];
+
+        do
         {
-            short i, k;
+            int k = ++_freq[c];
 
-            /* halven cumulative freq for leaf nodes */
-            short j = 0;
+            /* swap nodes to keep the tree freq-ordered */
+            int l;
 
-            for(i = 0; i < T; i++)
-                if(_son[i] >= T)
-                {
-                    _freq[j] = (ushort)((_freq[i] + 1) / 2);
-                    _son[j]  = _son[i];
-                    j++;
-                }
+            if(k <= _freq[l = c + 1])
+                continue;
 
-            /* make a tree : first, connect children nodes */
-            for(i = 0, j = N_CHAR; j < T; i += 2, j++)
-            {
-                k = (short)(i + 1);
-                ushort f = _freq[j] = (ushort)(_freq[i] + _freq[k]);
+            while(k > _freq[++l]) {}
 
-                for(k = (short)(j - 1); f < _freq[k]; k--) {}
+            l--;
+            _freq[c] = _freq[l];
+            _freq[l] = (ushort)k;
 
-                k++;
-                ushort l = (ushort)((j - k) * 2);
+            int i = _son[c];
+            _prnt[i] = (short)l;
 
-                Array.ConstrainedCopy(_freq, k, _freq, k + 1, l);
-                _freq[k] = f;
-                Array.ConstrainedCopy(_son, k, _son, k + 1, l);
-                _son[k] = i;
-            }
+            if(i < T)
+                _prnt[i + 1] = (short)l;
 
-            /* connect parent nodes */
-            for(i = 0; i < T; i++)
-                if((k = _son[i]) >= T)
-                    _prnt[k] = i;
-                else
-                    _prnt[k] = _prnt[k + 1] = i;
-        }
+            int j = _son[l];
+            _son[l] = (short)i;
 
-        /* update freq tree */
+            _prnt[j] = (short)c;
 
-        void Update(int c)
+            if(j < T)
+                _prnt[j + 1] = (short)c;
+
+            _son[c] = (short)j;
+
+            c = l;
+        } while((c = _prnt[c]) != 0); /* do it until reaching the root */
+    }
+
+    short DecodeChar()
+    {
+        ushort c = (ushort)_son[ROOT];
+
+        /*
+         * start searching tree from the root to leaves.
+         * choose node #(son[]) if input bit == 0
+         * else choose #(son[]+1) (input bit == 1)
+         */
+        while(c < T)
         {
-            if(_freq[ROOT] == MAX_FREQ)
-                Reconst();
+            int ret;
 
-            c = _prnt[c + T];
-
-            do
-            {
-                int k = ++_freq[c];
-
-                /* swap nodes to keep the tree freq-ordered */
-                int l;
-
-                if(k <= _freq[l = c + 1])
-                    continue;
-
-                while(k > _freq[++l]) {}
-
-                l--;
-                _freq[c] = _freq[l];
-                _freq[l] = (ushort)k;
-
-                int i = _son[c];
-                _prnt[i] = (short)l;
-
-                if(i < T)
-                    _prnt[i + 1] = (short)l;
-
-                int j = _son[l];
-                _son[l] = (short)i;
-
-                _prnt[j] = (short)c;
-
-                if(j < T)
-                    _prnt[j + 1] = (short)c;
-
-                _son[c] = (short)j;
-
-                c = l;
-            } while((c = _prnt[c]) != 0); /* do it until reaching the root */
-        }
-
-        short DecodeChar()
-        {
-            ushort c = (ushort)_son[ROOT];
-
-            /*
-             * start searching tree from the root to leaves.
-             * choose node #(son[]) if input bit == 0
-             * else choose #(son[]+1) (input bit == 1)
-             */
-            while(c < T)
-            {
-                int ret;
-
-                if((ret = GetBit()) < 0)
-                    return -1;
-
-                c += (ushort)ret;
-                c =  (ushort)_son[c];
-            }
-
-            c -= T;
-            Update(c);
-
-            return (short)c;
-        }
-
-        short DecodePosition()
-        {
-            short bit;
-
-            /* decode upper 6 bits from given table */
-            if((bit = (short)GetByte()) < 0)
+            if((ret = GetBit()) < 0)
                 return -1;
 
-            ushort i = (ushort)bit;
-            ushort c = (ushort)(_dCode[i] << 6);
-            ushort j = _dLen[i];
-
-            /* input lower 6 bits directly */
-            j -= 2;
-
-            while(j-- > 0)
-            {
-                if((bit = (short)GetBit()) < 0)
-                    return -1;
-
-                i = (ushort)((i << 1) + bit);
-            }
-
-            return (short)(c | (i & 0x3f));
+            c += (ushort)ret;
+            c =  (ushort)_son[c];
         }
-        /* update when cumulative frequency */
-        /* reaches to this value */
 
-        struct Tdlzhuf
+        c -= T;
+        Update(c);
+
+        return (short)c;
+    }
+
+    short DecodePosition()
+    {
+        short bit;
+
+        /* decode upper 6 bits from given table */
+        if((bit = (short)GetByte()) < 0)
+            return -1;
+
+        ushort i = (ushort)bit;
+        ushort c = (ushort)(_dCode[i] << 6);
+        ushort j = _dLen[i];
+
+        /* input lower 6 bits directly */
+        j -= 2;
+
+        while(j-- > 0)
         {
-            public ushort R, Bufcnt, Bufndx, Bufpos, // string buffer
-                          // the following to allow block reads from input in next_word()
-                          Ibufcnt, Ibufndx; // input buffer counters
-            public byte[] Inbuf;            // input buffer
+            if((bit = (short)GetBit()) < 0)
+                return -1;
+
+            i = (ushort)((i << 1) + bit);
         }
+
+        return (short)(c | (i & 0x3f));
+    }
+    /* update when cumulative frequency */
+    /* reaches to this value */
+
+    struct Tdlzhuf
+    {
+        public ushort R, Bufcnt, Bufndx, Bufpos, // string buffer
+                      // the following to allow block reads from input in next_word()
+                      Ibufcnt, Ibufndx; // input buffer counters
+        public byte[] Inbuf;            // input buffer
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Checksum.cs b/Aaru.Core/Checksum.cs
index c2077fd20..9cb023244 100644
--- a/Aaru.Core/Checksum.cs
+++ b/Aaru.Core/Checksum.cs
@@ -37,834 +37,833 @@ using Aaru.Checksums;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+/// <summary>Enabled checksums</summary>
+[Flags]
+public enum EnableChecksum
 {
-    /// <summary>Enabled checksums</summary>
-    [Flags]
-    public enum EnableChecksum
+    /// <summary>Enables Adler-32</summary>
+    Adler32 = 1,
+    /// <summary>Enables CRC-16</summary>
+    Crc16 = 2,
+    /// <summary>Enables CRC-32</summary>
+    Crc32 = 4,
+    /// <summary>Enables CRC-64</summary>
+    Crc64 = 8,
+    /// <summary>Enables MD5</summary>
+    Md5 = 16,
+    /// <summary>Enables SHA1</summary>
+    Sha1 = 64,
+    /// <summary>Enables SHA2-256</summary>
+    Sha256 = 128,
+    /// <summary>Enables SHA2-384</summary>
+    Sha384 = 256,
+    /// <summary>Enables SHA2-512</summary>
+    Sha512 = 512,
+    /// <summary>Enables SpamSum</summary>
+    SpamSum = 1024,
+    /// <summary>Enables Fletcher-16</summary>
+    Fletcher16 = 2048,
+    /// <summary>Enables Fletcher-32</summary>
+    Fletcher32 = 4096,
+    /// <summary>Enables all known checksums</summary>
+    All = Adler32 | Crc16 | Crc32 | Crc64 | Md5 | Sha1 | Sha256 | Sha384 | Sha512 | SpamSum | Fletcher16 |
+          Fletcher32
+}
+
+/// <summary>Checksums and hashes data, with different algorithms, multithreaded</summary>
+public sealed class Checksum
+{
+    readonly IChecksum      _adler32Ctx;
+    readonly IChecksum      _crc16Ctx;
+    readonly IChecksum      _crc32Ctx;
+    readonly IChecksum      _crc64Ctx;
+    readonly EnableChecksum _enabled;
+    readonly IChecksum      _f16Ctx;
+    readonly IChecksum      _f32Ctx;
+    readonly IChecksum      _md5Ctx;
+    readonly IChecksum      _sha1Ctx;
+    readonly IChecksum      _sha256Ctx;
+    readonly IChecksum      _sha384Ctx;
+    readonly IChecksum      _sha512Ctx;
+    readonly IChecksum      _ssCtx;
+    HashPacket              _adlerPkt;
+    Thread                  _adlerThread;
+    HashPacket              _crc16Pkt;
+    Thread                  _crc16Thread;
+    HashPacket              _crc32Pkt;
+    Thread                  _crc32Thread;
+    HashPacket              _crc64Pkt;
+    Thread                  _crc64Thread;
+    HashPacket              _f16Pkt;
+    Thread                  _f16Thread;
+    HashPacket              _f32Pkt;
+    Thread                  _f32Thread;
+    HashPacket              _md5Pkt;
+    Thread                  _md5Thread;
+    HashPacket              _sha1Pkt;
+    Thread                  _sha1Thread;
+    HashPacket              _sha256Pkt;
+    Thread                  _sha256Thread;
+    HashPacket              _sha384Pkt;
+    Thread                  _sha384Thread;
+    HashPacket              _sha512Pkt;
+    Thread                  _sha512Thread;
+    HashPacket              _spamsumPkt;
+    Thread                  _spamsumThread;
+
+    /// <summary>Initializes an instance of the checksum operations</summary>
+    /// <param name="enabled">Enabled checksums</param>
+    public Checksum(EnableChecksum enabled = EnableChecksum.All)
     {
-        /// <summary>Enables Adler-32</summary>
-        Adler32 = 1,
-        /// <summary>Enables CRC-16</summary>
-        Crc16 = 2,
-        /// <summary>Enables CRC-32</summary>
-        Crc32 = 4,
-        /// <summary>Enables CRC-64</summary>
-        Crc64 = 8,
-        /// <summary>Enables MD5</summary>
-        Md5 = 16,
-        /// <summary>Enables SHA1</summary>
-        Sha1 = 64,
-        /// <summary>Enables SHA2-256</summary>
-        Sha256 = 128,
-        /// <summary>Enables SHA2-384</summary>
-        Sha384 = 256,
-        /// <summary>Enables SHA2-512</summary>
-        Sha512 = 512,
-        /// <summary>Enables SpamSum</summary>
-        SpamSum = 1024,
-        /// <summary>Enables Fletcher-16</summary>
-        Fletcher16 = 2048,
-        /// <summary>Enables Fletcher-32</summary>
-        Fletcher32 = 4096,
-        /// <summary>Enables all known checksums</summary>
-        All = Adler32 | Crc16 | Crc32 | Crc64 | Md5 | Sha1 | Sha256 | Sha384 | Sha512 | SpamSum | Fletcher16 |
-              Fletcher32
+        _enabled = enabled;
+
+        if(enabled.HasFlag(EnableChecksum.Adler32))
+        {
+            _adler32Ctx = new Adler32Context();
+
+            _adlerPkt = new HashPacket
+            {
+                Context = _adler32Ctx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Crc16))
+        {
+            _crc16Ctx = new CRC16IBMContext();
+
+            _crc16Pkt = new HashPacket
+            {
+                Context = _crc16Ctx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Crc32))
+        {
+            _crc32Ctx = new Crc32Context();
+
+            _crc32Pkt = new HashPacket
+            {
+                Context = _crc32Ctx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Crc64))
+        {
+            _crc64Ctx = new Crc64Context();
+
+            _crc64Pkt = new HashPacket
+            {
+                Context = _crc64Ctx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Md5))
+        {
+            _md5Ctx = new Md5Context();
+
+            _md5Pkt = new HashPacket
+            {
+                Context = _md5Ctx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha1))
+        {
+            _sha1Ctx = new Sha1Context();
+
+            _sha1Pkt = new HashPacket
+            {
+                Context = _sha1Ctx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha256))
+        {
+            _sha256Ctx = new Sha256Context();
+
+            _sha256Pkt = new HashPacket
+            {
+                Context = _sha256Ctx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha384))
+        {
+            _sha384Ctx = new Sha384Context();
+
+            _sha384Pkt = new HashPacket
+            {
+                Context = _sha384Ctx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha512))
+        {
+            _sha512Ctx = new Sha512Context();
+
+            _sha512Pkt = new HashPacket
+            {
+                Context = _sha512Ctx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.SpamSum))
+        {
+            _ssCtx = new SpamSumContext();
+
+            _spamsumPkt = new HashPacket
+            {
+                Context = _ssCtx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Fletcher16))
+        {
+            _f16Ctx = new Fletcher16Context();
+
+            _f16Pkt = new HashPacket
+            {
+                Context = _f16Ctx
+            };
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Fletcher32))
+        {
+            _f32Ctx = new Fletcher32Context();
+
+            _f32Pkt = new HashPacket
+            {
+                Context = _f32Ctx
+            };
+        }
+
+        _adlerThread   = new Thread(UpdateHash);
+        _crc16Thread   = new Thread(UpdateHash);
+        _crc32Thread   = new Thread(UpdateHash);
+        _crc64Thread   = new Thread(UpdateHash);
+        _md5Thread     = new Thread(UpdateHash);
+        _sha1Thread    = new Thread(UpdateHash);
+        _sha256Thread  = new Thread(UpdateHash);
+        _sha384Thread  = new Thread(UpdateHash);
+        _sha512Thread  = new Thread(UpdateHash);
+        _spamsumThread = new Thread(UpdateHash);
+        _f16Thread     = new Thread(UpdateHash);
+        _f32Thread     = new Thread(UpdateHash);
     }
 
-    /// <summary>Checksums and hashes data, with different algorithms, multithreaded</summary>
-    public sealed class Checksum
+    /// <summary>Updates the checksum with new data</summary>
+    /// <param name="data">New data</param>
+    public void Update(byte[] data)
     {
-        readonly IChecksum      _adler32Ctx;
-        readonly IChecksum      _crc16Ctx;
-        readonly IChecksum      _crc32Ctx;
-        readonly IChecksum      _crc64Ctx;
-        readonly EnableChecksum _enabled;
-        readonly IChecksum      _f16Ctx;
-        readonly IChecksum      _f32Ctx;
-        readonly IChecksum      _md5Ctx;
-        readonly IChecksum      _sha1Ctx;
-        readonly IChecksum      _sha256Ctx;
-        readonly IChecksum      _sha384Ctx;
-        readonly IChecksum      _sha512Ctx;
-        readonly IChecksum      _ssCtx;
-        HashPacket              _adlerPkt;
-        Thread                  _adlerThread;
-        HashPacket              _crc16Pkt;
-        Thread                  _crc16Thread;
-        HashPacket              _crc32Pkt;
-        Thread                  _crc32Thread;
-        HashPacket              _crc64Pkt;
-        Thread                  _crc64Thread;
-        HashPacket              _f16Pkt;
-        Thread                  _f16Thread;
-        HashPacket              _f32Pkt;
-        Thread                  _f32Thread;
-        HashPacket              _md5Pkt;
-        Thread                  _md5Thread;
-        HashPacket              _sha1Pkt;
-        Thread                  _sha1Thread;
-        HashPacket              _sha256Pkt;
-        Thread                  _sha256Thread;
-        HashPacket              _sha384Pkt;
-        Thread                  _sha384Thread;
-        HashPacket              _sha512Pkt;
-        Thread                  _sha512Thread;
-        HashPacket              _spamsumPkt;
-        Thread                  _spamsumThread;
-
-        /// <summary>Initializes an instance of the checksum operations</summary>
-        /// <param name="enabled">Enabled checksums</param>
-        public Checksum(EnableChecksum enabled = EnableChecksum.All)
+        if(_enabled.HasFlag(EnableChecksum.Adler32))
         {
-            _enabled = enabled;
+            _adlerPkt.Data = data;
+            _adlerThread.Start(_adlerPkt);
+        }
 
-            if(enabled.HasFlag(EnableChecksum.Adler32))
-            {
-                _adler32Ctx = new Adler32Context();
+        if(_enabled.HasFlag(EnableChecksum.Crc16))
+        {
+            _crc16Pkt.Data = data;
+            _crc16Thread.Start(_crc16Pkt);
+        }
 
-                _adlerPkt = new HashPacket
-                {
-                    Context = _adler32Ctx
-                };
-            }
+        if(_enabled.HasFlag(EnableChecksum.Crc32))
+        {
+            _crc32Pkt.Data = data;
+            _crc32Thread.Start(_crc32Pkt);
+        }
 
-            if(enabled.HasFlag(EnableChecksum.Crc16))
-            {
-                _crc16Ctx = new CRC16IBMContext();
+        if(_enabled.HasFlag(EnableChecksum.Crc64))
+        {
+            _crc64Pkt.Data = data;
+            _crc64Thread.Start(_crc64Pkt);
+        }
 
-                _crc16Pkt = new HashPacket
-                {
-                    Context = _crc16Ctx
-                };
-            }
+        if(_enabled.HasFlag(EnableChecksum.Md5))
+        {
+            _md5Pkt.Data = data;
+            _md5Thread.Start(_md5Pkt);
+        }
 
-            if(enabled.HasFlag(EnableChecksum.Crc32))
-            {
-                _crc32Ctx = new Crc32Context();
+        if(_enabled.HasFlag(EnableChecksum.Sha1))
+        {
+            _sha1Pkt.Data = data;
+            _sha1Thread.Start(_sha1Pkt);
+        }
 
-                _crc32Pkt = new HashPacket
-                {
-                    Context = _crc32Ctx
-                };
-            }
+        if(_enabled.HasFlag(EnableChecksum.Sha256))
+        {
+            _sha256Pkt.Data = data;
+            _sha256Thread.Start(_sha256Pkt);
+        }
 
-            if(enabled.HasFlag(EnableChecksum.Crc64))
-            {
-                _crc64Ctx = new Crc64Context();
+        if(_enabled.HasFlag(EnableChecksum.Sha384))
+        {
+            _sha384Pkt.Data = data;
+            _sha384Thread.Start(_sha384Pkt);
+        }
 
-                _crc64Pkt = new HashPacket
-                {
-                    Context = _crc64Ctx
-                };
-            }
+        if(_enabled.HasFlag(EnableChecksum.Sha512))
+        {
+            _sha512Pkt.Data = data;
+            _sha512Thread.Start(_sha512Pkt);
+        }
 
-            if(enabled.HasFlag(EnableChecksum.Md5))
-            {
-                _md5Ctx = new Md5Context();
+        if(_enabled.HasFlag(EnableChecksum.SpamSum))
+        {
+            _spamsumPkt.Data = data;
+            _spamsumThread.Start(_spamsumPkt);
+        }
 
-                _md5Pkt = new HashPacket
-                {
-                    Context = _md5Ctx
-                };
-            }
+        if(_enabled.HasFlag(EnableChecksum.Fletcher16))
+        {
+            _f16Pkt.Data = data;
+            _f16Thread.Start(_f16Pkt);
+        }
 
-            if(enabled.HasFlag(EnableChecksum.Sha1))
-            {
-                _sha1Ctx = new Sha1Context();
+        if(_enabled.HasFlag(EnableChecksum.Fletcher32))
+        {
+            _f32Pkt.Data = data;
+            _f32Thread.Start(_f32Pkt);
+        }
 
-                _sha1Pkt = new HashPacket
-                {
-                    Context = _sha1Ctx
-                };
-            }
+        while(_adlerThread.IsAlive   ||
+              _crc16Thread.IsAlive   ||
+              _crc32Thread.IsAlive   ||
+              _crc64Thread.IsAlive   ||
+              _md5Thread.IsAlive     ||
+              _sha1Thread.IsAlive    ||
+              _sha256Thread.IsAlive  ||
+              _sha384Thread.IsAlive  ||
+              _sha512Thread.IsAlive  ||
+              _spamsumThread.IsAlive ||
+              _f16Thread.IsAlive     ||
+              _f32Thread.IsAlive) {}
 
-            if(enabled.HasFlag(EnableChecksum.Sha256))
-            {
-                _sha256Ctx = new Sha256Context();
+        if(_enabled.HasFlag(EnableChecksum.Adler32))
+            _adlerThread = new Thread(UpdateHash);
 
-                _sha256Pkt = new HashPacket
-                {
-                    Context = _sha256Ctx
-                };
-            }
+        if(_enabled.HasFlag(EnableChecksum.Crc16))
+            _crc16Thread = new Thread(UpdateHash);
 
-            if(enabled.HasFlag(EnableChecksum.Sha384))
-            {
-                _sha384Ctx = new Sha384Context();
+        if(_enabled.HasFlag(EnableChecksum.Crc32))
+            _crc32Thread = new Thread(UpdateHash);
 
-                _sha384Pkt = new HashPacket
-                {
-                    Context = _sha384Ctx
-                };
-            }
+        if(_enabled.HasFlag(EnableChecksum.Crc16))
+            _crc64Thread = new Thread(UpdateHash);
 
-            if(enabled.HasFlag(EnableChecksum.Sha512))
-            {
-                _sha512Ctx = new Sha512Context();
+        if(_enabled.HasFlag(EnableChecksum.Md5))
+            _md5Thread = new Thread(UpdateHash);
 
-                _sha512Pkt = new HashPacket
-                {
-                    Context = _sha512Ctx
-                };
-            }
+        if(_enabled.HasFlag(EnableChecksum.Sha1))
+            _sha1Thread = new Thread(UpdateHash);
 
-            if(enabled.HasFlag(EnableChecksum.SpamSum))
-            {
-                _ssCtx = new SpamSumContext();
+        if(_enabled.HasFlag(EnableChecksum.Sha256))
+            _sha256Thread = new Thread(UpdateHash);
 
-                _spamsumPkt = new HashPacket
-                {
-                    Context = _ssCtx
-                };
-            }
+        if(_enabled.HasFlag(EnableChecksum.Sha384))
+            _sha384Thread = new Thread(UpdateHash);
 
-            if(enabled.HasFlag(EnableChecksum.Fletcher16))
-            {
-                _f16Ctx = new Fletcher16Context();
+        if(_enabled.HasFlag(EnableChecksum.Sha512))
+            _sha512Thread = new Thread(UpdateHash);
 
-                _f16Pkt = new HashPacket
-                {
-                    Context = _f16Ctx
-                };
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Fletcher32))
-            {
-                _f32Ctx = new Fletcher32Context();
-
-                _f32Pkt = new HashPacket
-                {
-                    Context = _f32Ctx
-                };
-            }
-
-            _adlerThread   = new Thread(UpdateHash);
-            _crc16Thread   = new Thread(UpdateHash);
-            _crc32Thread   = new Thread(UpdateHash);
-            _crc64Thread   = new Thread(UpdateHash);
-            _md5Thread     = new Thread(UpdateHash);
-            _sha1Thread    = new Thread(UpdateHash);
-            _sha256Thread  = new Thread(UpdateHash);
-            _sha384Thread  = new Thread(UpdateHash);
-            _sha512Thread  = new Thread(UpdateHash);
+        if(_enabled.HasFlag(EnableChecksum.SpamSum))
             _spamsumThread = new Thread(UpdateHash);
-            _f16Thread     = new Thread(UpdateHash);
-            _f32Thread     = new Thread(UpdateHash);
-        }
 
-        /// <summary>Updates the checksum with new data</summary>
-        /// <param name="data">New data</param>
-        public void Update(byte[] data)
+        if(_enabled.HasFlag(EnableChecksum.Fletcher16))
+            _f16Thread = new Thread(UpdateHash);
+
+        if(_enabled.HasFlag(EnableChecksum.Fletcher32))
+            _f32Thread = new Thread(UpdateHash);
+    }
+
+    /// <summary>Finishes the checksums</summary>
+    /// <returns>Returns the checksum results</returns>
+    public List<ChecksumType> End()
+    {
+        List<ChecksumType> chks = new List<ChecksumType>();
+
+        ChecksumType chk;
+
+        if(_enabled.HasFlag(EnableChecksum.All))
         {
-            if(_enabled.HasFlag(EnableChecksum.Adler32))
-            {
-                _adlerPkt.Data = data;
-                _adlerThread.Start(_adlerPkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Crc16))
-            {
-                _crc16Pkt.Data = data;
-                _crc16Thread.Start(_crc16Pkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Crc32))
-            {
-                _crc32Pkt.Data = data;
-                _crc32Thread.Start(_crc32Pkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Crc64))
-            {
-                _crc64Pkt.Data = data;
-                _crc64Thread.Start(_crc64Pkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Md5))
-            {
-                _md5Pkt.Data = data;
-                _md5Thread.Start(_md5Pkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Sha1))
-            {
-                _sha1Pkt.Data = data;
-                _sha1Thread.Start(_sha1Pkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Sha256))
-            {
-                _sha256Pkt.Data = data;
-                _sha256Thread.Start(_sha256Pkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Sha384))
-            {
-                _sha384Pkt.Data = data;
-                _sha384Thread.Start(_sha384Pkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Sha512))
-            {
-                _sha512Pkt.Data = data;
-                _sha512Thread.Start(_sha512Pkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.SpamSum))
-            {
-                _spamsumPkt.Data = data;
-                _spamsumThread.Start(_spamsumPkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Fletcher16))
-            {
-                _f16Pkt.Data = data;
-                _f16Thread.Start(_f16Pkt);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Fletcher32))
-            {
-                _f32Pkt.Data = data;
-                _f32Thread.Start(_f32Pkt);
-            }
-
-            while(_adlerThread.IsAlive   ||
-                  _crc16Thread.IsAlive   ||
-                  _crc32Thread.IsAlive   ||
-                  _crc64Thread.IsAlive   ||
-                  _md5Thread.IsAlive     ||
-                  _sha1Thread.IsAlive    ||
-                  _sha256Thread.IsAlive  ||
-                  _sha384Thread.IsAlive  ||
-                  _sha512Thread.IsAlive  ||
-                  _spamsumThread.IsAlive ||
-                  _f16Thread.IsAlive     ||
-                  _f32Thread.IsAlive) {}
-
-            if(_enabled.HasFlag(EnableChecksum.Adler32))
-                _adlerThread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.Crc16))
-                _crc16Thread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.Crc32))
-                _crc32Thread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.Crc16))
-                _crc64Thread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.Md5))
-                _md5Thread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.Sha1))
-                _sha1Thread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.Sha256))
-                _sha256Thread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.Sha384))
-                _sha384Thread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.Sha512))
-                _sha512Thread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.SpamSum))
-                _spamsumThread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.Fletcher16))
-                _f16Thread = new Thread(UpdateHash);
-
-            if(_enabled.HasFlag(EnableChecksum.Fletcher32))
-                _f32Thread = new Thread(UpdateHash);
-        }
-
-        /// <summary>Finishes the checksums</summary>
-        /// <returns>Returns the checksum results</returns>
-        public List<ChecksumType> End()
-        {
-            List<ChecksumType> chks = new List<ChecksumType>();
-
-            ChecksumType chk;
-
-            if(_enabled.HasFlag(EnableChecksum.All))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.adler32,
-                    Value = _adler32Ctx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Crc16))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.crc16,
-                    Value = _crc16Ctx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Crc32))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.crc32,
-                    Value = _crc32Ctx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Crc64))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.crc64,
-                    Value = _crc64Ctx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Md5))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.md5,
-                    Value = _md5Ctx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Sha1))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.sha1,
-                    Value = _sha1Ctx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Sha256))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.sha256,
-                    Value = _sha256Ctx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Sha384))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.sha384,
-                    Value = _sha384Ctx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Sha512))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.sha512,
-                    Value = _sha512Ctx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.SpamSum))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.spamsum,
-                    Value = _ssCtx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(_enabled.HasFlag(EnableChecksum.Fletcher16))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.fletcher16,
-                    Value = _f16Ctx.End()
-                };
-
-                chks.Add(chk);
-            }
-
-            if(!_enabled.HasFlag(EnableChecksum.Fletcher32))
-                return chks;
-
             chk = new ChecksumType
             {
-                type  = ChecksumTypeType.fletcher32,
-                Value = _f32Ctx.End()
+                type  = ChecksumTypeType.adler32,
+                Value = _adler32Ctx.End()
             };
 
             chks.Add(chk);
+        }
 
+        if(_enabled.HasFlag(EnableChecksum.Crc16))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.crc16,
+                Value = _crc16Ctx.End()
+            };
+
+            chks.Add(chk);
+        }
+
+        if(_enabled.HasFlag(EnableChecksum.Crc32))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.crc32,
+                Value = _crc32Ctx.End()
+            };
+
+            chks.Add(chk);
+        }
+
+        if(_enabled.HasFlag(EnableChecksum.Crc64))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.crc64,
+                Value = _crc64Ctx.End()
+            };
+
+            chks.Add(chk);
+        }
+
+        if(_enabled.HasFlag(EnableChecksum.Md5))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.md5,
+                Value = _md5Ctx.End()
+            };
+
+            chks.Add(chk);
+        }
+
+        if(_enabled.HasFlag(EnableChecksum.Sha1))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.sha1,
+                Value = _sha1Ctx.End()
+            };
+
+            chks.Add(chk);
+        }
+
+        if(_enabled.HasFlag(EnableChecksum.Sha256))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.sha256,
+                Value = _sha256Ctx.End()
+            };
+
+            chks.Add(chk);
+        }
+
+        if(_enabled.HasFlag(EnableChecksum.Sha384))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.sha384,
+                Value = _sha384Ctx.End()
+            };
+
+            chks.Add(chk);
+        }
+
+        if(_enabled.HasFlag(EnableChecksum.Sha512))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.sha512,
+                Value = _sha512Ctx.End()
+            };
+
+            chks.Add(chk);
+        }
+
+        if(_enabled.HasFlag(EnableChecksum.SpamSum))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.spamsum,
+                Value = _ssCtx.End()
+            };
+
+            chks.Add(chk);
+        }
+
+        if(_enabled.HasFlag(EnableChecksum.Fletcher16))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.fletcher16,
+                Value = _f16Ctx.End()
+            };
+
+            chks.Add(chk);
+        }
+
+        if(!_enabled.HasFlag(EnableChecksum.Fletcher32))
             return chks;
-        }
 
-        internal static List<ChecksumType> GetChecksums(byte[] data, EnableChecksum enabled = EnableChecksum.All)
+        chk = new ChecksumType
         {
-            IChecksum adler32CtxData = null;
-            IChecksum crc16CtxData   = null;
-            IChecksum crc32CtxData   = null;
-            IChecksum crc64CtxData   = null;
-            IChecksum md5CtxData     = null;
-            IChecksum sha1CtxData    = null;
-            IChecksum sha256CtxData  = null;
-            IChecksum sha384CtxData  = null;
-            IChecksum sha512CtxData  = null;
-            IChecksum ssctxData      = null;
-            IChecksum f16CtxData     = null;
-            IChecksum f32CtxData     = null;
+            type  = ChecksumTypeType.fletcher32,
+            Value = _f32Ctx.End()
+        };
 
-            var adlerThreadData   = new Thread(UpdateHash);
-            var crc16ThreadData   = new Thread(UpdateHash);
-            var crc32ThreadData   = new Thread(UpdateHash);
-            var crc64ThreadData   = new Thread(UpdateHash);
-            var md5ThreadData     = new Thread(UpdateHash);
-            var sha1ThreadData    = new Thread(UpdateHash);
-            var sha256ThreadData  = new Thread(UpdateHash);
-            var sha384ThreadData  = new Thread(UpdateHash);
-            var sha512ThreadData  = new Thread(UpdateHash);
-            var spamsumThreadData = new Thread(UpdateHash);
-            var f16ThreadData     = new Thread(UpdateHash);
-            var f32ThreadData     = new Thread(UpdateHash);
+        chks.Add(chk);
 
-            if(enabled.HasFlag(EnableChecksum.Adler32))
-            {
-                adler32CtxData = new Adler32Context();
-
-                var adlerPktData = new HashPacket
-                {
-                    Context = adler32CtxData,
-                    Data    = data
-                };
-
-                adlerThreadData.Start(adlerPktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Crc16))
-            {
-                crc16CtxData = new CRC16IBMContext();
-
-                var crc16PktData = new HashPacket
-                {
-                    Context = crc16CtxData,
-                    Data    = data
-                };
-
-                crc16ThreadData.Start(crc16PktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Crc32))
-            {
-                crc32CtxData = new Crc32Context();
-
-                var crc32PktData = new HashPacket
-                {
-                    Context = crc32CtxData,
-                    Data    = data
-                };
-
-                crc32ThreadData.Start(crc32PktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Crc64))
-            {
-                crc64CtxData = new Crc64Context();
-
-                var crc64PktData = new HashPacket
-                {
-                    Context = crc64CtxData,
-                    Data    = data
-                };
-
-                crc64ThreadData.Start(crc64PktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Md5))
-            {
-                md5CtxData = new Md5Context();
-
-                var md5PktData = new HashPacket
-                {
-                    Context = md5CtxData,
-                    Data    = data
-                };
-
-                md5ThreadData.Start(md5PktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Sha1))
-            {
-                sha1CtxData = new Sha1Context();
-
-                var sha1PktData = new HashPacket
-                {
-                    Context = sha1CtxData,
-                    Data    = data
-                };
-
-                sha1ThreadData.Start(sha1PktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Sha256))
-            {
-                sha256CtxData = new Sha256Context();
-
-                var sha256PktData = new HashPacket
-                {
-                    Context = sha256CtxData,
-                    Data    = data
-                };
-
-                sha256ThreadData.Start(sha256PktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Sha384))
-            {
-                sha384CtxData = new Sha384Context();
-
-                var sha384PktData = new HashPacket
-                {
-                    Context = sha384CtxData,
-                    Data    = data
-                };
-
-                sha384ThreadData.Start(sha384PktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Sha512))
-            {
-                sha512CtxData = new Sha512Context();
-
-                var sha512PktData = new HashPacket
-                {
-                    Context = sha512CtxData,
-                    Data    = data
-                };
-
-                sha512ThreadData.Start(sha512PktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.SpamSum))
-            {
-                ssctxData = new SpamSumContext();
-
-                var spamsumPktData = new HashPacket
-                {
-                    Context = ssctxData,
-                    Data    = data
-                };
-
-                spamsumThreadData.Start(spamsumPktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Fletcher16))
-            {
-                f16CtxData = new Fletcher16Context();
-
-                var f16PktData = new HashPacket
-                {
-                    Context = f16CtxData,
-                    Data    = data
-                };
-
-                f16ThreadData.Start(f16PktData);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Fletcher32))
-            {
-                f32CtxData = new Fletcher32Context();
-
-                var f32PktData = new HashPacket
-                {
-                    Context = f32CtxData,
-                    Data    = data
-                };
-
-                f32ThreadData.Start(f32PktData);
-            }
-
-            while(adlerThreadData.IsAlive   ||
-                  crc16ThreadData.IsAlive   ||
-                  crc32ThreadData.IsAlive   ||
-                  crc64ThreadData.IsAlive   ||
-                  md5ThreadData.IsAlive     ||
-                  sha1ThreadData.IsAlive    ||
-                  sha256ThreadData.IsAlive  ||
-                  sha384ThreadData.IsAlive  ||
-                  sha512ThreadData.IsAlive  ||
-                  spamsumThreadData.IsAlive ||
-                  f16ThreadData.IsAlive     ||
-                  f32ThreadData.IsAlive) {}
-
-            List<ChecksumType> dataChecksums = new List<ChecksumType>();
-            ChecksumType       chk;
-
-            if(enabled.HasFlag(EnableChecksum.Adler32))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.adler32,
-                    Value = adler32CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Crc16))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.crc16,
-                    Value = crc16CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Crc32))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.crc32,
-                    Value = crc32CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Crc64))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.crc64,
-                    Value = crc64CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Md5))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.md5,
-                    Value = md5CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Sha1))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.sha1,
-                    Value = sha1CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Sha256))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.sha256,
-                    Value = sha256CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Sha384))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.sha384,
-                    Value = sha384CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Sha512))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.sha512,
-                    Value = sha512CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.SpamSum))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.spamsum,
-                    Value = ssctxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Fletcher16))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.fletcher16,
-                    Value = f16CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            if(enabled.HasFlag(EnableChecksum.Fletcher32))
-            {
-                chk = new ChecksumType
-                {
-                    type  = ChecksumTypeType.fletcher32,
-                    Value = f32CtxData.End()
-                };
-
-                dataChecksums.Add(chk);
-            }
-
-            return dataChecksums;
-        }
-
-        #region Threading helpers
-        struct HashPacket
-        {
-            public IChecksum Context;
-            public byte[]    Data;
-        }
-
-        static void UpdateHash(object packet) => ((HashPacket)packet).Context.Update(((HashPacket)packet).Data);
-        #endregion Threading helpers
+        return chks;
     }
+
+    internal static List<ChecksumType> GetChecksums(byte[] data, EnableChecksum enabled = EnableChecksum.All)
+    {
+        IChecksum adler32CtxData = null;
+        IChecksum crc16CtxData   = null;
+        IChecksum crc32CtxData   = null;
+        IChecksum crc64CtxData   = null;
+        IChecksum md5CtxData     = null;
+        IChecksum sha1CtxData    = null;
+        IChecksum sha256CtxData  = null;
+        IChecksum sha384CtxData  = null;
+        IChecksum sha512CtxData  = null;
+        IChecksum ssctxData      = null;
+        IChecksum f16CtxData     = null;
+        IChecksum f32CtxData     = null;
+
+        var adlerThreadData   = new Thread(UpdateHash);
+        var crc16ThreadData   = new Thread(UpdateHash);
+        var crc32ThreadData   = new Thread(UpdateHash);
+        var crc64ThreadData   = new Thread(UpdateHash);
+        var md5ThreadData     = new Thread(UpdateHash);
+        var sha1ThreadData    = new Thread(UpdateHash);
+        var sha256ThreadData  = new Thread(UpdateHash);
+        var sha384ThreadData  = new Thread(UpdateHash);
+        var sha512ThreadData  = new Thread(UpdateHash);
+        var spamsumThreadData = new Thread(UpdateHash);
+        var f16ThreadData     = new Thread(UpdateHash);
+        var f32ThreadData     = new Thread(UpdateHash);
+
+        if(enabled.HasFlag(EnableChecksum.Adler32))
+        {
+            adler32CtxData = new Adler32Context();
+
+            var adlerPktData = new HashPacket
+            {
+                Context = adler32CtxData,
+                Data    = data
+            };
+
+            adlerThreadData.Start(adlerPktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Crc16))
+        {
+            crc16CtxData = new CRC16IBMContext();
+
+            var crc16PktData = new HashPacket
+            {
+                Context = crc16CtxData,
+                Data    = data
+            };
+
+            crc16ThreadData.Start(crc16PktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Crc32))
+        {
+            crc32CtxData = new Crc32Context();
+
+            var crc32PktData = new HashPacket
+            {
+                Context = crc32CtxData,
+                Data    = data
+            };
+
+            crc32ThreadData.Start(crc32PktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Crc64))
+        {
+            crc64CtxData = new Crc64Context();
+
+            var crc64PktData = new HashPacket
+            {
+                Context = crc64CtxData,
+                Data    = data
+            };
+
+            crc64ThreadData.Start(crc64PktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Md5))
+        {
+            md5CtxData = new Md5Context();
+
+            var md5PktData = new HashPacket
+            {
+                Context = md5CtxData,
+                Data    = data
+            };
+
+            md5ThreadData.Start(md5PktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha1))
+        {
+            sha1CtxData = new Sha1Context();
+
+            var sha1PktData = new HashPacket
+            {
+                Context = sha1CtxData,
+                Data    = data
+            };
+
+            sha1ThreadData.Start(sha1PktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha256))
+        {
+            sha256CtxData = new Sha256Context();
+
+            var sha256PktData = new HashPacket
+            {
+                Context = sha256CtxData,
+                Data    = data
+            };
+
+            sha256ThreadData.Start(sha256PktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha384))
+        {
+            sha384CtxData = new Sha384Context();
+
+            var sha384PktData = new HashPacket
+            {
+                Context = sha384CtxData,
+                Data    = data
+            };
+
+            sha384ThreadData.Start(sha384PktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha512))
+        {
+            sha512CtxData = new Sha512Context();
+
+            var sha512PktData = new HashPacket
+            {
+                Context = sha512CtxData,
+                Data    = data
+            };
+
+            sha512ThreadData.Start(sha512PktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.SpamSum))
+        {
+            ssctxData = new SpamSumContext();
+
+            var spamsumPktData = new HashPacket
+            {
+                Context = ssctxData,
+                Data    = data
+            };
+
+            spamsumThreadData.Start(spamsumPktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Fletcher16))
+        {
+            f16CtxData = new Fletcher16Context();
+
+            var f16PktData = new HashPacket
+            {
+                Context = f16CtxData,
+                Data    = data
+            };
+
+            f16ThreadData.Start(f16PktData);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Fletcher32))
+        {
+            f32CtxData = new Fletcher32Context();
+
+            var f32PktData = new HashPacket
+            {
+                Context = f32CtxData,
+                Data    = data
+            };
+
+            f32ThreadData.Start(f32PktData);
+        }
+
+        while(adlerThreadData.IsAlive   ||
+              crc16ThreadData.IsAlive   ||
+              crc32ThreadData.IsAlive   ||
+              crc64ThreadData.IsAlive   ||
+              md5ThreadData.IsAlive     ||
+              sha1ThreadData.IsAlive    ||
+              sha256ThreadData.IsAlive  ||
+              sha384ThreadData.IsAlive  ||
+              sha512ThreadData.IsAlive  ||
+              spamsumThreadData.IsAlive ||
+              f16ThreadData.IsAlive     ||
+              f32ThreadData.IsAlive) {}
+
+        List<ChecksumType> dataChecksums = new List<ChecksumType>();
+        ChecksumType       chk;
+
+        if(enabled.HasFlag(EnableChecksum.Adler32))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.adler32,
+                Value = adler32CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Crc16))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.crc16,
+                Value = crc16CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Crc32))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.crc32,
+                Value = crc32CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Crc64))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.crc64,
+                Value = crc64CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Md5))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.md5,
+                Value = md5CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha1))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.sha1,
+                Value = sha1CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha256))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.sha256,
+                Value = sha256CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha384))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.sha384,
+                Value = sha384CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Sha512))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.sha512,
+                Value = sha512CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.SpamSum))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.spamsum,
+                Value = ssctxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Fletcher16))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.fletcher16,
+                Value = f16CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        if(enabled.HasFlag(EnableChecksum.Fletcher32))
+        {
+            chk = new ChecksumType
+            {
+                type  = ChecksumTypeType.fletcher32,
+                Value = f32CtxData.End()
+            };
+
+            dataChecksums.Add(chk);
+        }
+
+        return dataChecksums;
+    }
+
+    #region Threading helpers
+    struct HashPacket
+    {
+        public IChecksum Context;
+        public byte[]    Data;
+    }
+
+    static void UpdateHash(object packet) => ((HashPacket)packet).Context.Update(((HashPacket)packet).Data);
+    #endregion Threading helpers
 }
\ No newline at end of file
diff --git a/Aaru.Core/DataFile.cs b/Aaru.Core/DataFile.cs
index df6477aee..dcf40a524 100644
--- a/Aaru.Core/DataFile.cs
+++ b/Aaru.Core/DataFile.cs
@@ -34,127 +34,126 @@ using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using Aaru.Console;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+/// <summary>Abstracts a datafile with a block based interface</summary>
+[SuppressMessage("ReSharper", "UnusedMethodReturnValue.Global"),
+ SuppressMessage("ReSharper", "UnusedMember.Global")]
+public sealed class DataFile
 {
-    /// <summary>Abstracts a datafile with a block based interface</summary>
-    [SuppressMessage("ReSharper", "UnusedMethodReturnValue.Global"),
-     SuppressMessage("ReSharper", "UnusedMember.Global")]
-    public sealed class DataFile
+    readonly FileStream _dataFs;
+
+    /// <summary>Opens, or create, a new file</summary>
+    /// <param name="outputFile">File</param>
+    public DataFile(string outputFile) =>
+        _dataFs = new FileStream(outputFile, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+
+    /// <summary>Closes the file</summary>
+    public void Close() => _dataFs?.Close();
+
+    /// <summary>Reads bytes at current position</summary>
+    /// <param name="array">Array to place read data within</param>
+    /// <param name="offset">Offset of <see cref="array" /> where data will be read</param>
+    /// <param name="count">How many bytes to read</param>
+    /// <returns>How many bytes were read</returns>
+    public int Read(byte[] array, int offset, int count) => _dataFs.Read(array, offset, count);
+
+    /// <summary>Seeks to the specified block</summary>
+    /// <param name="block">Block to seek to</param>
+    /// <param name="blockSize">Block size in bytes</param>
+    /// <returns>Position</returns>
+    public long Seek(ulong block, ulong blockSize) => _dataFs.Seek((long)(block * blockSize), SeekOrigin.Begin);
+
+    /// <summary>Seeks to specified byte position</summary>
+    /// <param name="offset">Byte position</param>
+    /// <param name="origin">Where to count for position</param>
+    /// <returns>Position</returns>
+    public long Seek(ulong offset, SeekOrigin origin) => _dataFs.Seek((long)offset, origin);
+
+    /// <summary>Seeks to specified byte position</summary>
+    /// <param name="offset">Byte position</param>
+    /// <param name="origin">Where to count for position</param>
+    /// <returns>Position</returns>
+    public long Seek(long offset, SeekOrigin origin) => _dataFs.Seek(offset, origin);
+
+    /// <summary>Writes data at current position</summary>
+    /// <param name="data">Data</param>
+    public void Write(byte[] data) => Write(data, 0, data.Length);
+
+    /// <summary>Writes data at current position</summary>
+    /// <param name="data">Data</param>
+    /// <param name="offset">Offset of data from where to start taking data to write</param>
+    /// <param name="count">How many bytes to write</param>
+    public void Write(byte[] data, int offset, int count) => _dataFs.Write(data, offset, count);
+
+    /// <summary>Writes data at specified block</summary>
+    /// <param name="data">Data</param>
+    /// <param name="block">Block</param>
+    /// <param name="blockSize">Bytes per block</param>
+    public void WriteAt(byte[] data, ulong block, uint blockSize) =>
+        WriteAt(data, block, blockSize, 0, data.Length);
+
+    /// <summary>Writes data at specified block</summary>
+    /// <param name="data">Data</param>
+    /// <param name="block">Block</param>
+    /// <param name="blockSize">Bytes per block</param>
+    /// <param name="offset">Offset of data from where to start taking data to write</param>
+    /// <param name="count">How many bytes to write</param>
+    public void WriteAt(byte[] data, ulong block, uint blockSize, int offset, int count)
     {
-        readonly FileStream _dataFs;
+        _dataFs.Seek((long)(block * blockSize), SeekOrigin.Begin);
+        _dataFs.Write(data, offset, count);
+    }
 
-        /// <summary>Opens, or create, a new file</summary>
-        /// <param name="outputFile">File</param>
-        public DataFile(string outputFile) =>
-            _dataFs = new FileStream(outputFile, FileMode.OpenOrCreate, FileAccess.ReadWrite);
+    /// <summary>Current file position</summary>
+    public long Position => _dataFs.Position;
 
-        /// <summary>Closes the file</summary>
-        public void Close() => _dataFs?.Close();
+    /// <summary>Writes data to a newly created file</summary>
+    /// <param name="who">Who asked the file to be written (class, plugin, etc.)</param>
+    /// <param name="data">Data to write</param>
+    /// <param name="outputPrefix">First part of the file name</param>
+    /// <param name="outputSuffix">Last part of the file name</param>
+    /// <param name="whatWriting">What is the data about?</param>
+    public static void WriteTo(string who, string outputPrefix, string outputSuffix, string whatWriting,
+                               byte[] data)
+    {
+        if(!string.IsNullOrEmpty(outputPrefix) &&
+           !string.IsNullOrEmpty(outputSuffix))
+            WriteTo(who, outputPrefix + outputSuffix, data, whatWriting);
+    }
 
-        /// <summary>Reads bytes at current position</summary>
-        /// <param name="array">Array to place read data within</param>
-        /// <param name="offset">Offset of <see cref="array" /> where data will be read</param>
-        /// <param name="count">How many bytes to read</param>
-        /// <returns>How many bytes were read</returns>
-        public int Read(byte[] array, int offset, int count) => _dataFs.Read(array, offset, count);
+    /// <summary>Writes data to a newly created file</summary>
+    /// <param name="who">Who asked the file to be written (class, plugin, etc.)</param>
+    /// <param name="filename">Filename to create</param>
+    /// <param name="data">Data to write</param>
+    /// <param name="whatWriting">What is the data about?</param>
+    /// <param name="overwrite">If set to <c>true</c> overwrites the file, does nothing otherwise</param>
+    public static void WriteTo(string who, string filename, byte[] data, string whatWriting = null,
+                               bool overwrite = false)
+    {
+        if(string.IsNullOrEmpty(filename))
+            return;
 
-        /// <summary>Seeks to the specified block</summary>
-        /// <param name="block">Block to seek to</param>
-        /// <param name="blockSize">Block size in bytes</param>
-        /// <returns>Position</returns>
-        public long Seek(ulong block, ulong blockSize) => _dataFs.Seek((long)(block * blockSize), SeekOrigin.Begin);
+        if(File.Exists(filename))
+            if(overwrite)
+                File.Delete(filename);
+            else
+            {
+                AaruConsole.ErrorWriteLine("Not overwriting file {0}", filename);
 
-        /// <summary>Seeks to specified byte position</summary>
-        /// <param name="offset">Byte position</param>
-        /// <param name="origin">Where to count for position</param>
-        /// <returns>Position</returns>
-        public long Seek(ulong offset, SeekOrigin origin) => _dataFs.Seek((long)offset, origin);
-
-        /// <summary>Seeks to specified byte position</summary>
-        /// <param name="offset">Byte position</param>
-        /// <param name="origin">Where to count for position</param>
-        /// <returns>Position</returns>
-        public long Seek(long offset, SeekOrigin origin) => _dataFs.Seek(offset, origin);
-
-        /// <summary>Writes data at current position</summary>
-        /// <param name="data">Data</param>
-        public void Write(byte[] data) => Write(data, 0, data.Length);
-
-        /// <summary>Writes data at current position</summary>
-        /// <param name="data">Data</param>
-        /// <param name="offset">Offset of data from where to start taking data to write</param>
-        /// <param name="count">How many bytes to write</param>
-        public void Write(byte[] data, int offset, int count) => _dataFs.Write(data, offset, count);
-
-        /// <summary>Writes data at specified block</summary>
-        /// <param name="data">Data</param>
-        /// <param name="block">Block</param>
-        /// <param name="blockSize">Bytes per block</param>
-        public void WriteAt(byte[] data, ulong block, uint blockSize) =>
-            WriteAt(data, block, blockSize, 0, data.Length);
-
-        /// <summary>Writes data at specified block</summary>
-        /// <param name="data">Data</param>
-        /// <param name="block">Block</param>
-        /// <param name="blockSize">Bytes per block</param>
-        /// <param name="offset">Offset of data from where to start taking data to write</param>
-        /// <param name="count">How many bytes to write</param>
-        public void WriteAt(byte[] data, ulong block, uint blockSize, int offset, int count)
-        {
-            _dataFs.Seek((long)(block * blockSize), SeekOrigin.Begin);
-            _dataFs.Write(data, offset, count);
-        }
-
-        /// <summary>Current file position</summary>
-        public long Position => _dataFs.Position;
-
-        /// <summary>Writes data to a newly created file</summary>
-        /// <param name="who">Who asked the file to be written (class, plugin, etc.)</param>
-        /// <param name="data">Data to write</param>
-        /// <param name="outputPrefix">First part of the file name</param>
-        /// <param name="outputSuffix">Last part of the file name</param>
-        /// <param name="whatWriting">What is the data about?</param>
-        public static void WriteTo(string who, string outputPrefix, string outputSuffix, string whatWriting,
-                                   byte[] data)
-        {
-            if(!string.IsNullOrEmpty(outputPrefix) &&
-               !string.IsNullOrEmpty(outputSuffix))
-                WriteTo(who, outputPrefix + outputSuffix, data, whatWriting);
-        }
-
-        /// <summary>Writes data to a newly created file</summary>
-        /// <param name="who">Who asked the file to be written (class, plugin, etc.)</param>
-        /// <param name="filename">Filename to create</param>
-        /// <param name="data">Data to write</param>
-        /// <param name="whatWriting">What is the data about?</param>
-        /// <param name="overwrite">If set to <c>true</c> overwrites the file, does nothing otherwise</param>
-        public static void WriteTo(string who, string filename, byte[] data, string whatWriting = null,
-                                   bool overwrite = false)
-        {
-            if(string.IsNullOrEmpty(filename))
                 return;
-
-            if(File.Exists(filename))
-                if(overwrite)
-                    File.Delete(filename);
-                else
-                {
-                    AaruConsole.ErrorWriteLine("Not overwriting file {0}", filename);
-
-                    return;
-                }
-
-            try
-            {
-                AaruConsole.DebugWriteLine(who, "Writing " + whatWriting + " to {0}", filename);
-                var outputFs = new FileStream(filename, FileMode.CreateNew);
-                outputFs.Write(data, 0, data.Length);
-                outputFs.Close();
-            }
-            catch
-            {
-                AaruConsole.ErrorWriteLine("Unable to write file {0}", filename);
             }
+
+        try
+        {
+            AaruConsole.DebugWriteLine(who, "Writing " + whatWriting + " to {0}", filename);
+            var outputFs = new FileStream(filename, FileMode.CreateNew);
+            outputFs.Write(data, 0, data.Length);
+            outputFs.Close();
+        }
+        catch
+        {
+            AaruConsole.ErrorWriteLine("Unable to write file {0}", filename);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/ATA.cs b/Aaru.Core/Devices/Dumping/ATA.cs
index a2e454b99..03f10035c 100644
--- a/Aaru.Core/Devices/Dumping/ATA.cs
+++ b/Aaru.Core/Devices/Dumping/ATA.cs
@@ -48,225 +48,331 @@ using Identify = Aaru.CommonTypes.Structs.Devices.ATA.Identify;
 using Tuple = Aaru.Decoders.PCMCIA.Tuple;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.Core.Devices.Dumping
-{
-    /// <summary>Implements dumping ATA devices</summary>
-    public partial class Dump
-    {
-        /// <summary>Dumps an ATA device</summary>
-        void Ata()
-        {
-            bool recoveredError;
-            var  outputFormat = _outputPlugin as IWritableImage;
+namespace Aaru.Core.Devices.Dumping;
 
-            if(_dumpRaw)
+/// <summary>Implements dumping ATA devices</summary>
+public partial class Dump
+{
+    /// <summary>Dumps an ATA device</summary>
+    void Ata()
+    {
+        bool recoveredError;
+        var  outputFormat = _outputPlugin as IWritableImage;
+
+        if(_dumpRaw)
+        {
+            if(_force)
+                ErrorMessage?.Invoke("Raw dumping not yet supported in ATA devices, continuing...");
+            else
             {
-                if(_force)
-                    ErrorMessage?.Invoke("Raw dumping not yet supported in ATA devices, continuing...");
-                else
+                StoppingErrorMessage?.Invoke("Raw dumping not yet supported in ATA devices, aborting...");
+
+                return;
+            }
+        }
+
+        const ushort ataProfile         = 0x0001;
+        const uint   timeout            = 5;
+        double       imageWriteDuration = 0;
+        MediaType    mediaType          = MediaType.Unknown;
+
+        UpdateStatus?.Invoke("Requesting ATA IDENTIFY DEVICE.");
+        _dumpLog.WriteLine("Requesting ATA IDENTIFY DEVICE.");
+        bool sense = _dev.AtaIdentify(out byte[] cmdBuf, out AtaErrorRegistersChs errorChs);
+
+        if(sense)
+            _errorLog?.WriteLine("ATA IDENTIFY DEVICE", _dev.Error, _dev.LastError, errorChs);
+        else if(Identify.Decode(cmdBuf).HasValue)
+        {
+            Identify.IdentifyDevice? ataIdNullable = Identify.Decode(cmdBuf);
+
+            if(ataIdNullable != null)
+            {
+                Identify.IdentifyDevice ataId       = ataIdNullable.Value;
+                byte[]                  ataIdentify = cmdBuf;
+                cmdBuf = Array.Empty<byte>();
+
+                DateTime start;
+                DateTime end;
+                double   totalDuration = 0;
+                double   currentSpeed  = 0;
+                double   maxSpeed      = double.MinValue;
+                double   minSpeed      = double.MaxValue;
+
+                // Initialize reader
+                UpdateStatus?.Invoke("Initializing reader.");
+                _dumpLog.WriteLine("Initializing reader.");
+                var ataReader = new Reader(_dev, timeout, ataIdentify, _errorLog);
+
+                // Fill reader blocks
+                ulong blocks = ataReader.GetDeviceBlocks();
+
+                // Check block sizes
+                if(ataReader.GetBlockSize())
                 {
-                    StoppingErrorMessage?.Invoke("Raw dumping not yet supported in ATA devices, aborting...");
+                    _dumpLog.WriteLine("ERROR: Cannot get block size: {0}.", ataReader.ErrorMessage);
+                    ErrorMessage(ataReader.ErrorMessage);
 
                     return;
                 }
-            }
 
-            const ushort ataProfile         = 0x0001;
-            const uint   timeout            = 5;
-            double       imageWriteDuration = 0;
-            MediaType    mediaType          = MediaType.Unknown;
+                uint blockSize          = ataReader.LogicalBlockSize;
+                uint physicalSectorSize = ataReader.PhysicalBlockSize;
 
-            UpdateStatus?.Invoke("Requesting ATA IDENTIFY DEVICE.");
-            _dumpLog.WriteLine("Requesting ATA IDENTIFY DEVICE.");
-            bool sense = _dev.AtaIdentify(out byte[] cmdBuf, out AtaErrorRegistersChs errorChs);
-
-            if(sense)
-                _errorLog?.WriteLine("ATA IDENTIFY DEVICE", _dev.Error, _dev.LastError, errorChs);
-            else if(Identify.Decode(cmdBuf).HasValue)
-            {
-                Identify.IdentifyDevice? ataIdNullable = Identify.Decode(cmdBuf);
-
-                if(ataIdNullable != null)
+                if(ataReader.FindReadCommand())
                 {
-                    Identify.IdentifyDevice ataId       = ataIdNullable.Value;
-                    byte[]                  ataIdentify = cmdBuf;
-                    cmdBuf = Array.Empty<byte>();
+                    _dumpLog.WriteLine("ERROR: Cannot find correct read command: {0}.", ataReader.ErrorMessage);
+                    ErrorMessage(ataReader.ErrorMessage);
 
-                    DateTime start;
-                    DateTime end;
-                    double   totalDuration = 0;
-                    double   currentSpeed  = 0;
-                    double   maxSpeed      = double.MinValue;
-                    double   minSpeed      = double.MaxValue;
+                    return;
+                }
 
-                    // Initialize reader
-                    UpdateStatus?.Invoke("Initializing reader.");
-                    _dumpLog.WriteLine("Initializing reader.");
-                    var ataReader = new Reader(_dev, timeout, ataIdentify, _errorLog);
+                // Check how many blocks to read, if error show and return
+                if(ataReader.GetBlocksToRead(_maximumReadable))
+                {
+                    _dumpLog.WriteLine("ERROR: Cannot get blocks to read: {0}.", ataReader.ErrorMessage);
+                    ErrorMessage(ataReader.ErrorMessage);
 
-                    // Fill reader blocks
-                    ulong blocks = ataReader.GetDeviceBlocks();
+                    return;
+                }
 
-                    // Check block sizes
-                    if(ataReader.GetBlockSize())
+                uint   blocksToRead = ataReader.BlocksToRead;
+                ushort cylinders    = ataReader.Cylinders;
+                byte   heads        = ataReader.Heads;
+                byte   sectors      = ataReader.Sectors;
+
+                UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
+
+                UpdateStatus?.
+                    Invoke($"Device reports {cylinders} cylinders {heads} heads {sectors} sectors per track.");
+
+                UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
+                UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
+                UpdateStatus?.Invoke($"Device reports {physicalSectorSize} bytes per physical block.");
+                _dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);
+
+                _dumpLog.WriteLine("Device reports {0} cylinders {1} heads {2} sectors per track.", cylinders,
+                                   heads, sectors);
+
+                _dumpLog.WriteLine("Device can read {0} blocks at a time.", blocksToRead);
+                _dumpLog.WriteLine("Device reports {0} bytes per logical block.", blockSize);
+                _dumpLog.WriteLine("Device reports {0} bytes per physical block.", physicalSectorSize);
+
+                bool removable = !_dev.IsCompactFlash &&
+                                 ataId.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.Removable);
+
+                DumpHardwareType currentTry = null;
+                ExtentsULong     extents    = null;
+
+                ResumeSupport.Process(ataReader.IsLba, removable, blocks, _dev.Manufacturer, _dev.Model,
+                                      _dev.Serial, _dev.PlatformId, ref _resume, ref currentTry, ref extents,
+                                      _dev.FirmwareRevision, _private, _force);
+
+                if(currentTry == null ||
+                   extents    == null)
+                {
+                    StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
+
+                    return;
+                }
+
+                MhddLog mhddLog;
+                IbgLog  ibgLog;
+                double  duration;
+
+                bool ret = true;
+
+                if(_dev.IsUsb                  &&
+                   _dev.UsbDescriptors != null &&
+                   !outputFormat.SupportedMediaTags.Contains(MediaTagType.USB_Descriptors))
+                {
+                    ret = false;
+                    _dumpLog.WriteLine("Output format does not support USB descriptors.");
+                    ErrorMessage("Output format does not support USB descriptors.");
+                }
+
+                if(_dev.IsPcmcia    &&
+                   _dev.Cis != null &&
+                   !outputFormat.SupportedMediaTags.Contains(MediaTagType.PCMCIA_CIS))
+                {
+                    ret = false;
+                    _dumpLog.WriteLine("Output format does not support PCMCIA CIS descriptors.");
+                    ErrorMessage("Output format does not support PCMCIA CIS descriptors.");
+                }
+
+                if(!outputFormat.SupportedMediaTags.Contains(MediaTagType.ATA_IDENTIFY))
+                {
+                    ret = false;
+                    _dumpLog.WriteLine("Output format does not support ATA IDENTIFY.");
+                    ErrorMessage("Output format does not support ATA IDENTIFY.");
+                }
+
+                if(!ret)
+                {
+                    _dumpLog.WriteLine("Several media tags not supported, {0}continuing...", _force ? "" : "not ");
+
+                    if(_force)
+                        ErrorMessage("Several media tags not supported, continuing...");
+                    else
                     {
-                        _dumpLog.WriteLine("ERROR: Cannot get block size: {0}.", ataReader.ErrorMessage);
-                        ErrorMessage(ataReader.ErrorMessage);
+                        StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
 
                         return;
                     }
+                }
 
-                    uint blockSize          = ataReader.LogicalBlockSize;
-                    uint physicalSectorSize = ataReader.PhysicalBlockSize;
+                mediaType = MediaTypeFromDevice.GetFromAta(_dev.Manufacturer, _dev.Model, _dev.IsRemovable,
+                                                           _dev.IsCompactFlash, _dev.IsPcmcia, blocks);
 
-                    if(ataReader.FindReadCommand())
+                ret = outputFormat.Create(_outputPath, mediaType, _formatOptions, blocks, blockSize);
+
+                // Cannot create image
+                if(!ret)
+                {
+                    _dumpLog.WriteLine("Error creating output image, not continuing.");
+                    _dumpLog.WriteLine(outputFormat.ErrorMessage);
+
+                    StoppingErrorMessage?.Invoke("Error creating output image, not continuing." +
+                                                 Environment.NewLine + outputFormat.ErrorMessage);
+
+                    return;
+                }
+
+                // Setting geometry
+                outputFormat.SetGeometry(cylinders, heads, sectors);
+
+                if(ataReader.IsLba)
+                {
+                    UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
+
+                    if(_skip < blocksToRead)
+                        _skip = blocksToRead;
+
+                    mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead,
+                                          _private);
+
+                    ibgLog = new IbgLog(_outputPrefix + ".ibg", ataProfile);
+
+                    if(_resume.NextBlock > 0)
                     {
-                        _dumpLog.WriteLine("ERROR: Cannot find correct read command: {0}.", ataReader.ErrorMessage);
-                        ErrorMessage(ataReader.ErrorMessage);
-
-                        return;
+                        UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
+                        _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
                     }
 
-                    // Check how many blocks to read, if error show and return
-                    if(ataReader.GetBlocksToRead(_maximumReadable))
+                    bool newTrim = false;
+
+                    start = DateTime.UtcNow;
+                    DateTime timeSpeedStart   = DateTime.UtcNow;
+                    ulong    sectorSpeedStart = 0;
+                    InitProgress?.Invoke();
+
+                    for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
                     {
-                        _dumpLog.WriteLine("ERROR: Cannot get blocks to read: {0}.", ataReader.ErrorMessage);
-                        ErrorMessage(ataReader.ErrorMessage);
+                        if(_aborted)
+                        {
+                            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                            UpdateStatus?.Invoke("Aborted!");
+                            _dumpLog.WriteLine("Aborted!");
 
-                        return;
-                    }
+                            break;
+                        }
 
-                    uint   blocksToRead = ataReader.BlocksToRead;
-                    ushort cylinders    = ataReader.Cylinders;
-                    byte   heads        = ataReader.Heads;
-                    byte   sectors      = ataReader.Sectors;
+                        if(blocks - i < blocksToRead)
+                            blocksToRead = (byte)(blocks - i);
 
-                    UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
+                        if(currentSpeed > maxSpeed &&
+                           currentSpeed > 0)
+                            maxSpeed = currentSpeed;
 
-                    UpdateStatus?.
-                        Invoke($"Device reports {cylinders} cylinders {heads} heads {sectors} sectors per track.");
+                        if(currentSpeed < minSpeed &&
+                           currentSpeed > 0)
+                            minSpeed = currentSpeed;
 
-                    UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
-                    UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
-                    UpdateStatus?.Invoke($"Device reports {physicalSectorSize} bytes per physical block.");
-                    _dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);
+                        UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)",
+                                               (long)i, (long)blocks);
 
-                    _dumpLog.WriteLine("Device reports {0} cylinders {1} heads {2} sectors per track.", cylinders,
-                                       heads, sectors);
+                        bool error = ataReader.ReadBlocks(out cmdBuf, i, blocksToRead, out duration, out _, out _);
 
-                    _dumpLog.WriteLine("Device can read {0} blocks at a time.", blocksToRead);
-                    _dumpLog.WriteLine("Device reports {0} bytes per logical block.", blockSize);
-                    _dumpLog.WriteLine("Device reports {0} bytes per physical block.", physicalSectorSize);
-
-                    bool removable = !_dev.IsCompactFlash &&
-                                     ataId.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.Removable);
-
-                    DumpHardwareType currentTry = null;
-                    ExtentsULong     extents    = null;
-
-                    ResumeSupport.Process(ataReader.IsLba, removable, blocks, _dev.Manufacturer, _dev.Model,
-                                          _dev.Serial, _dev.PlatformId, ref _resume, ref currentTry, ref extents,
-                                          _dev.FirmwareRevision, _private, _force);
-
-                    if(currentTry == null ||
-                       extents    == null)
-                    {
-                        StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
-
-                        return;
-                    }
-
-                    MhddLog mhddLog;
-                    IbgLog  ibgLog;
-                    double  duration;
-
-                    bool ret = true;
-
-                    if(_dev.IsUsb                  &&
-                       _dev.UsbDescriptors != null &&
-                       !outputFormat.SupportedMediaTags.Contains(MediaTagType.USB_Descriptors))
-                    {
-                        ret = false;
-                        _dumpLog.WriteLine("Output format does not support USB descriptors.");
-                        ErrorMessage("Output format does not support USB descriptors.");
-                    }
-
-                    if(_dev.IsPcmcia    &&
-                       _dev.Cis != null &&
-                       !outputFormat.SupportedMediaTags.Contains(MediaTagType.PCMCIA_CIS))
-                    {
-                        ret = false;
-                        _dumpLog.WriteLine("Output format does not support PCMCIA CIS descriptors.");
-                        ErrorMessage("Output format does not support PCMCIA CIS descriptors.");
-                    }
-
-                    if(!outputFormat.SupportedMediaTags.Contains(MediaTagType.ATA_IDENTIFY))
-                    {
-                        ret = false;
-                        _dumpLog.WriteLine("Output format does not support ATA IDENTIFY.");
-                        ErrorMessage("Output format does not support ATA IDENTIFY.");
-                    }
-
-                    if(!ret)
-                    {
-                        _dumpLog.WriteLine("Several media tags not supported, {0}continuing...", _force ? "" : "not ");
-
-                        if(_force)
-                            ErrorMessage("Several media tags not supported, continuing...");
+                        if(!error)
+                        {
+                            mhddLog.Write(i, duration);
+                            ibgLog.Write(i, currentSpeed * 1024);
+                            DateTime writeStart = DateTime.Now;
+                            outputFormat.WriteSectors(cmdBuf, i, blocksToRead);
+                            imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                            extents.Add(i, blocksToRead, true);
+                        }
                         else
                         {
-                            StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
+                            if(i + _skip > blocks)
+                                _skip = (uint)(blocks - i);
 
-                            return;
-                        }
-                    }
+                            for(ulong b = i; b < i + _skip; b++)
+                                _resume.BadBlocks.Add(b);
 
-                    mediaType = MediaTypeFromDevice.GetFromAta(_dev.Manufacturer, _dev.Model, _dev.IsRemovable,
-                                                               _dev.IsCompactFlash, _dev.IsPcmcia, blocks);
+                            mhddLog.Write(i, duration < 500 ? 65535 : duration);
 
-                    ret = outputFormat.Create(_outputPath, mediaType, _formatOptions, blocks, blockSize);
-
-                    // Cannot create image
-                    if(!ret)
-                    {
-                        _dumpLog.WriteLine("Error creating output image, not continuing.");
-                        _dumpLog.WriteLine(outputFormat.ErrorMessage);
-
-                        StoppingErrorMessage?.Invoke("Error creating output image, not continuing." +
-                                                     Environment.NewLine + outputFormat.ErrorMessage);
-
-                        return;
-                    }
-
-                    // Setting geometry
-                    outputFormat.SetGeometry(cylinders, heads, sectors);
-
-                    if(ataReader.IsLba)
-                    {
-                        UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
-
-                        if(_skip < blocksToRead)
-                            _skip = blocksToRead;
-
-                        mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead,
-                                              _private);
-
-                        ibgLog = new IbgLog(_outputPrefix + ".ibg", ataProfile);
-
-                        if(_resume.NextBlock > 0)
-                        {
-                            UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
-                            _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
+                            ibgLog.Write(i, 0);
+                            DateTime writeStart = DateTime.Now;
+                            outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
+                            imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                            _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
+                            i       += _skip - blocksToRead;
+                            newTrim =  true;
                         }
 
-                        bool newTrim = false;
+                        sectorSpeedStart  += blocksToRead;
+                        _resume.NextBlock =  i + blocksToRead;
 
+                        double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+                        if(elapsed <= 0)
+                            continue;
+
+                        currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+                        sectorSpeedStart = 0;
+                        timeSpeedStart   = DateTime.UtcNow;
+                    }
+
+                    _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+
+                    end = DateTime.Now;
+                    EndProgress?.Invoke();
+                    mhddLog.Close();
+
+                    ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                                 blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+
+                    UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+
+                    UpdateStatus?.
+                        Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
+
+                    UpdateStatus?.
+                        Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
+
+                    _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
+
+                    _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
+                                       blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
+
+                    _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
+                                       blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
+
+                    #region Trimming
+                    if(_resume.BadBlocks.Count > 0 &&
+                       !_aborted                   &&
+                       _trim                       &&
+                       newTrim)
+                    {
                         start = DateTime.UtcNow;
-                        DateTime timeSpeedStart   = DateTime.UtcNow;
-                        ulong    sectorSpeedStart = 0;
+                        UpdateStatus?.Invoke("Trimming skipped sectors");
+                        _dumpLog.WriteLine("Trimming skipped sectors");
+
+                        ulong[] tmpArray = _resume.BadBlocks.ToArray();
                         InitProgress?.Invoke();
 
-                        for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
+                        foreach(ulong badSector in tmpArray)
                         {
                             if(_aborted)
                             {
@@ -277,147 +383,111 @@ namespace Aaru.Core.Devices.Dumping
                                 break;
                             }
 
-                            if(blocks - i < blocksToRead)
-                                blocksToRead = (byte)(blocks - i);
+                            PulseProgress?.Invoke($"Trimming sector {badSector}");
 
-                            if(currentSpeed > maxSpeed &&
-                               currentSpeed > 0)
-                                maxSpeed = currentSpeed;
+                            bool error =
+                                ataReader.ReadBlock(out cmdBuf, badSector, out duration, out recoveredError, out _);
 
-                            if(currentSpeed < minSpeed &&
-                               currentSpeed > 0)
-                                minSpeed = currentSpeed;
+                            totalDuration += duration;
 
-                            UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)",
-                                                   (long)i, (long)blocks);
-
-                            bool error = ataReader.ReadBlocks(out cmdBuf, i, blocksToRead, out duration, out _, out _);
-
-                            if(!error)
-                            {
-                                mhddLog.Write(i, duration);
-                                ibgLog.Write(i, currentSpeed * 1024);
-                                DateTime writeStart = DateTime.Now;
-                                outputFormat.WriteSectors(cmdBuf, i, blocksToRead);
-                                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                                extents.Add(i, blocksToRead, true);
-                            }
-                            else
-                            {
-                                if(i + _skip > blocks)
-                                    _skip = (uint)(blocks - i);
-
-                                for(ulong b = i; b < i + _skip; b++)
-                                    _resume.BadBlocks.Add(b);
-
-                                mhddLog.Write(i, duration < 500 ? 65535 : duration);
-
-                                ibgLog.Write(i, 0);
-                                DateTime writeStart = DateTime.Now;
-                                outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
-                                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                                _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
-                                i       += _skip - blocksToRead;
-                                newTrim =  true;
-                            }
-
-                            sectorSpeedStart  += blocksToRead;
-                            _resume.NextBlock =  i + blocksToRead;
-
-                            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                            if(elapsed <= 0)
+                            if(error && !recoveredError)
                                 continue;
 
-                            currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                            sectorSpeedStart = 0;
-                            timeSpeedStart   = DateTime.UtcNow;
+                            _resume.BadBlocks.Remove(badSector);
+                            extents.Add(badSector);
+                            outputFormat.WriteSector(cmdBuf, badSector);
                         }
 
-                        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
-
-                        end = DateTime.Now;
                         EndProgress?.Invoke();
-                        mhddLog.Close();
+                        end = DateTime.UtcNow;
+                        UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
+                        _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+                    }
+                    #endregion Trimming
 
-                        ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                                     blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+                    #region Error handling
+                    if(_resume.BadBlocks.Count > 0 &&
+                       !_aborted                   &&
+                       _retryPasses > 0)
+                    {
+                        int  pass    = 1;
+                        bool forward = true;
 
-                        UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+                        InitProgress?.Invoke();
+                        repeatRetryLba:
+                        ulong[] tmpArray = _resume.BadBlocks.ToArray();
 
-                        UpdateStatus?.
-                            Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
-
-                        UpdateStatus?.
-                            Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
-
-                        _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
-
-                        _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                                           blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
-
-                        _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                                           blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
-
-                        #region Trimming
-                        if(_resume.BadBlocks.Count > 0 &&
-                           !_aborted                   &&
-                           _trim                       &&
-                           newTrim)
+                        foreach(ulong badSector in tmpArray)
                         {
-                            start = DateTime.UtcNow;
-                            UpdateStatus?.Invoke("Trimming skipped sectors");
-                            _dumpLog.WriteLine("Trimming skipped sectors");
-
-                            ulong[] tmpArray = _resume.BadBlocks.ToArray();
-                            InitProgress?.Invoke();
-
-                            foreach(ulong badSector in tmpArray)
+                            if(_aborted)
                             {
-                                if(_aborted)
-                                {
-                                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                                    UpdateStatus?.Invoke("Aborted!");
-                                    _dumpLog.WriteLine("Aborted!");
+                                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                                UpdateStatus?.Invoke("Aborted!");
+                                _dumpLog.WriteLine("Aborted!");
 
-                                    break;
-                                }
+                                break;
+                            }
 
-                                PulseProgress?.Invoke($"Trimming sector {badSector}");
+                            PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector,
+                                                                pass, forward ? "forward" : "reverse",
+                                                                _persistent ? "recovering partial data, " : ""));
 
-                                bool error =
-                                    ataReader.ReadBlock(out cmdBuf, badSector, out duration, out recoveredError, out _);
+                            bool error =
+                                ataReader.ReadBlock(out cmdBuf, badSector, out duration, out recoveredError, out _);
 
-                                totalDuration += duration;
-
-                                if(error && !recoveredError)
-                                    continue;
+                            totalDuration += duration;
 
+                            if(!error || recoveredError)
+                            {
                                 _resume.BadBlocks.Remove(badSector);
                                 extents.Add(badSector);
                                 outputFormat.WriteSector(cmdBuf, badSector);
+                                UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
+                                _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
                             }
-
-                            EndProgress?.Invoke();
-                            end = DateTime.UtcNow;
-                            UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
-                            _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+                            else if(_persistent)
+                                outputFormat.WriteSector(cmdBuf, badSector);
                         }
-                        #endregion Trimming
 
-                        #region Error handling
-                        if(_resume.BadBlocks.Count > 0 &&
-                           !_aborted                   &&
-                           _retryPasses > 0)
+                        if(pass < _retryPasses &&
+                           !_aborted           &&
+                           _resume.BadBlocks.Count > 0)
                         {
-                            int  pass    = 1;
-                            bool forward = true;
+                            pass++;
+                            forward = !forward;
+                            _resume.BadBlocks.Sort();
 
-                            InitProgress?.Invoke();
-                            repeatRetryLba:
-                            ulong[] tmpArray = _resume.BadBlocks.ToArray();
+                            if(!forward)
+                                _resume.BadBlocks.Reverse();
 
-                            foreach(ulong badSector in tmpArray)
+                            goto repeatRetryLba;
+                        }
+
+                        EndProgress?.Invoke();
+                    }
+                    #endregion Error handling LBA
+
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                }
+                else
+                {
+                    mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead,
+                                          _private);
+
+                    ibgLog = new IbgLog(_outputPrefix + ".ibg", ataProfile);
+
+                    ulong currentBlock = 0;
+                    blocks = (ulong)(cylinders * heads * sectors);
+                    start  = DateTime.UtcNow;
+                    DateTime timeSpeedStart   = DateTime.UtcNow;
+                    ulong    sectorSpeedStart = 0;
+                    InitProgress?.Invoke();
+
+                    for(ushort cy = 0; cy < cylinders; cy++)
+                    {
+                        for(byte hd = 0; hd < heads; hd++)
+                        {
+                            for(byte sc = 1; sc < sectors; sc++)
                             {
                                 if(_aborted)
                                 {
@@ -428,436 +498,365 @@ namespace Aaru.Core.Devices.Dumping
                                     break;
                                 }
 
-                                PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector,
-                                                                    pass, forward ? "forward" : "reverse",
-                                                                    _persistent ? "recovering partial data, " : ""));
+                                if(currentSpeed > maxSpeed &&
+                                   currentSpeed > 0)
+                                    maxSpeed = currentSpeed;
+
+                                if(currentSpeed < minSpeed &&
+                                   currentSpeed > 0)
+                                    minSpeed = currentSpeed;
+
+                                PulseProgress?.
+                                    Invoke($"Reading cylinder {cy} head {hd} sector {sc} ({currentSpeed:F3} MiB/sec.)");
 
                                 bool error =
-                                    ataReader.ReadBlock(out cmdBuf, badSector, out duration, out recoveredError, out _);
+                                    ataReader.ReadChs(out cmdBuf, cy, hd, sc, out duration, out recoveredError);
 
                                 totalDuration += duration;
 
                                 if(!error || recoveredError)
                                 {
-                                    _resume.BadBlocks.Remove(badSector);
-                                    extents.Add(badSector);
-                                    outputFormat.WriteSector(cmdBuf, badSector);
-                                    UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
-                                    _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
+                                    mhddLog.Write(currentBlock, duration);
+                                    ibgLog.Write(currentBlock, currentSpeed * 1024);
+                                    DateTime writeStart = DateTime.Now;
+
+                                    outputFormat.WriteSector(cmdBuf,
+                                                             (ulong)((((cy * heads) + hd) * sectors) + (sc - 1)));
+
+                                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                                    extents.Add(currentBlock);
+
+                                    _dumpLog.WriteLine("Error reading cylinder {0} head {1} sector {2}.", cy, hd,
+                                                       sc);
                                 }
-                                else if(_persistent)
-                                    outputFormat.WriteSector(cmdBuf, badSector);
-                            }
-
-                            if(pass < _retryPasses &&
-                               !_aborted           &&
-                               _resume.BadBlocks.Count > 0)
-                            {
-                                pass++;
-                                forward = !forward;
-                                _resume.BadBlocks.Sort();
-
-                                if(!forward)
-                                    _resume.BadBlocks.Reverse();
-
-                                goto repeatRetryLba;
-                            }
-
-                            EndProgress?.Invoke();
-                        }
-                        #endregion Error handling LBA
-
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    }
-                    else
-                    {
-                        mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead,
-                                              _private);
-
-                        ibgLog = new IbgLog(_outputPrefix + ".ibg", ataProfile);
-
-                        ulong currentBlock = 0;
-                        blocks = (ulong)(cylinders * heads * sectors);
-                        start  = DateTime.UtcNow;
-                        DateTime timeSpeedStart   = DateTime.UtcNow;
-                        ulong    sectorSpeedStart = 0;
-                        InitProgress?.Invoke();
-
-                        for(ushort cy = 0; cy < cylinders; cy++)
-                        {
-                            for(byte hd = 0; hd < heads; hd++)
-                            {
-                                for(byte sc = 1; sc < sectors; sc++)
+                                else
                                 {
-                                    if(_aborted)
-                                    {
-                                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                                        UpdateStatus?.Invoke("Aborted!");
-                                        _dumpLog.WriteLine("Aborted!");
+                                    _resume.BadBlocks.Add(currentBlock);
+                                    mhddLog.Write(currentBlock, duration < 500 ? 65535 : duration);
 
-                                        break;
-                                    }
+                                    ibgLog.Write(currentBlock, 0);
+                                    DateTime writeStart = DateTime.Now;
 
-                                    if(currentSpeed > maxSpeed &&
-                                       currentSpeed > 0)
-                                        maxSpeed = currentSpeed;
+                                    outputFormat.WriteSector(new byte[blockSize],
+                                                             (ulong)((((cy * heads) + hd) * sectors) + (sc - 1)));
 
-                                    if(currentSpeed < minSpeed &&
-                                       currentSpeed > 0)
-                                        minSpeed = currentSpeed;
-
-                                    PulseProgress?.
-                                        Invoke($"Reading cylinder {cy} head {hd} sector {sc} ({currentSpeed:F3} MiB/sec.)");
-
-                                    bool error =
-                                        ataReader.ReadChs(out cmdBuf, cy, hd, sc, out duration, out recoveredError);
-
-                                    totalDuration += duration;
-
-                                    if(!error || recoveredError)
-                                    {
-                                        mhddLog.Write(currentBlock, duration);
-                                        ibgLog.Write(currentBlock, currentSpeed * 1024);
-                                        DateTime writeStart = DateTime.Now;
-
-                                        outputFormat.WriteSector(cmdBuf,
-                                                                  (ulong)((((cy * heads) + hd) * sectors) + (sc - 1)));
-
-                                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                                        extents.Add(currentBlock);
-
-                                        _dumpLog.WriteLine("Error reading cylinder {0} head {1} sector {2}.", cy, hd,
-                                                           sc);
-                                    }
-                                    else
-                                    {
-                                        _resume.BadBlocks.Add(currentBlock);
-                                        mhddLog.Write(currentBlock, duration < 500 ? 65535 : duration);
-
-                                        ibgLog.Write(currentBlock, 0);
-                                        DateTime writeStart = DateTime.Now;
-
-                                        outputFormat.WriteSector(new byte[blockSize],
-                                                                  (ulong)((((cy * heads) + hd) * sectors) + (sc - 1)));
-
-                                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                                    }
-
-                                    sectorSpeedStart++;
-                                    currentBlock++;
-
-                                    double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                                    if(elapsed <= 0)
-                                        continue;
-
-                                    currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                                    sectorSpeedStart = 0;
-                                    timeSpeedStart   = DateTime.UtcNow;
+                                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
                                 }
+
+                                sectorSpeedStart++;
+                                currentBlock++;
+
+                                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+                                if(elapsed <= 0)
+                                    continue;
+
+                                currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+                                sectorSpeedStart = 0;
+                                timeSpeedStart   = DateTime.UtcNow;
                             }
                         }
-
-                        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
-
-                        end = DateTime.Now;
-                        EndProgress?.Invoke();
-                        mhddLog.Close();
-
-                        ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                                     blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
-
-                        UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
-
-                        UpdateStatus?.
-                            Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
-
-                        UpdateStatus?.
-                            Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / (imageWriteDuration / 1000):F3} KiB/sec.");
-
-                        _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
-
-                        _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                                           blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
-
-                        _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                                           blockSize * (double)(blocks + 1) / 1024 / (imageWriteDuration / 1000));
                     }
 
-                    foreach(ulong bad in _resume.BadBlocks)
-                        _dumpLog.WriteLine("Sector {0} could not be read.", bad);
+                    _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
 
-                    outputFormat.SetDumpHardware(_resume.Tries);
+                    end = DateTime.Now;
+                    EndProgress?.Invoke();
+                    mhddLog.Close();
 
-                    // TODO: Non-removable
-                    var metadata = new CommonTypes.Structs.ImageInfo
+                    ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                                 blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+
+                    UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+
+                    UpdateStatus?.
+                        Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
+
+                    UpdateStatus?.
+                        Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / (imageWriteDuration / 1000):F3} KiB/sec.");
+
+                    _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
+
+                    _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
+                                       blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
+
+                    _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
+                                       blockSize * (double)(blocks + 1) / 1024 / (imageWriteDuration / 1000));
+                }
+
+                foreach(ulong bad in _resume.BadBlocks)
+                    _dumpLog.WriteLine("Sector {0} could not be read.", bad);
+
+                outputFormat.SetDumpHardware(_resume.Tries);
+
+                // TODO: Non-removable
+                var metadata = new CommonTypes.Structs.ImageInfo
+                {
+                    Application        = "Aaru",
+                    ApplicationVersion = Version.GetVersion()
+                };
+
+                if(!outputFormat.SetMetadata(metadata))
+                    ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
+                                         outputFormat.ErrorMessage);
+
+                if(_preSidecar != null)
+                    outputFormat.SetCicmMetadata(_preSidecar);
+
+                _dumpLog.WriteLine("Closing output file.");
+                UpdateStatus?.Invoke("Closing output file.");
+                DateTime closeStart = DateTime.Now;
+                outputFormat.Close();
+                DateTime closeEnd = DateTime.Now;
+                UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
+                _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
+
+                if(_aborted)
+                {
+                    _dumpLog.WriteLine("Aborted!");
+                    UpdateStatus?.Invoke("Aborted!");
+
+                    return;
+                }
+
+                double totalChkDuration = 0;
+
+                outputFormat.WriteMediaTag(ataIdentify, MediaTagType.ATA_IDENTIFY);
+
+                if(_dev.IsUsb &&
+                   _dev.UsbDescriptors != null)
+                    outputFormat.WriteMediaTag(_dev.UsbDescriptors, MediaTagType.USB_Descriptors);
+
+                if(_dev.IsPcmcia &&
+                   _dev.Cis != null)
+                    outputFormat.WriteMediaTag(_dev.Cis, MediaTagType.PCMCIA_CIS);
+
+                if(_metadata)
+                {
+                    _dumpLog.WriteLine("Creating sidecar.");
+                    UpdateStatus?.Invoke("Creating sidecar.");
+                    var         filters     = new FiltersList();
+                    IFilter     filter      = filters.GetFilter(_outputPath);
+                    IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
+                    ErrorNumber opened      = inputPlugin.Open(filter);
+
+                    if(opened != ErrorNumber.NoError)
                     {
-                        Application        = "Aaru",
-                        ApplicationVersion = Version.GetVersion()
-                    };
-
-                    if(!outputFormat.SetMetadata(metadata))
-                        ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
-                                             outputFormat.ErrorMessage);
-
-                    if(_preSidecar != null)
-                        outputFormat.SetCicmMetadata(_preSidecar);
-
-                    _dumpLog.WriteLine("Closing output file.");
-                    UpdateStatus?.Invoke("Closing output file.");
-                    DateTime closeStart = DateTime.Now;
-                    outputFormat.Close();
-                    DateTime closeEnd = DateTime.Now;
-                    UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
-                    _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
-
-                    if(_aborted)
-                    {
-                        _dumpLog.WriteLine("Aborted!");
-                        UpdateStatus?.Invoke("Aborted!");
+                        StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
 
                         return;
                     }
 
-                    double totalChkDuration = 0;
+                    DateTime chkStart = DateTime.UtcNow;
 
-                    outputFormat.WriteMediaTag(ataIdentify, MediaTagType.ATA_IDENTIFY);
+                    _sidecarClass = new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
 
-                    if(_dev.IsUsb &&
-                       _dev.UsbDescriptors != null)
-                        outputFormat.WriteMediaTag(_dev.UsbDescriptors, MediaTagType.USB_Descriptors);
+                    _sidecarClass.InitProgressEvent    += InitProgress;
+                    _sidecarClass.UpdateProgressEvent  += UpdateProgress;
+                    _sidecarClass.EndProgressEvent     += EndProgress;
+                    _sidecarClass.InitProgressEvent2   += InitProgress2;
+                    _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
+                    _sidecarClass.EndProgressEvent2    += EndProgress2;
+                    _sidecarClass.UpdateStatusEvent    += UpdateStatus;
+                    CICMMetadataType sidecar = _sidecarClass.Create();
 
-                    if(_dev.IsPcmcia &&
-                       _dev.Cis != null)
-                        outputFormat.WriteMediaTag(_dev.Cis, MediaTagType.PCMCIA_CIS);
-
-                    if(_metadata)
+                    if(!_aborted)
                     {
-                        _dumpLog.WriteLine("Creating sidecar.");
-                        UpdateStatus?.Invoke("Creating sidecar.");
-                        var         filters     = new FiltersList();
-                        IFilter     filter      = filters.GetFilter(_outputPath);
-                        IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
-                        ErrorNumber opened      = inputPlugin.Open(filter);
-
-                        if(opened != ErrorNumber.NoError)
+                        if(_preSidecar != null)
                         {
-                            StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
-
-                            return;
+                            _preSidecar.BlockMedia = sidecar.BlockMedia;
+                            sidecar                = _preSidecar;
                         }
 
-                        DateTime chkStart = DateTime.UtcNow;
-
-                        _sidecarClass = new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
-
-                        _sidecarClass.InitProgressEvent    += InitProgress;
-                        _sidecarClass.UpdateProgressEvent  += UpdateProgress;
-                        _sidecarClass.EndProgressEvent     += EndProgress;
-                        _sidecarClass.InitProgressEvent2   += InitProgress2;
-                        _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
-                        _sidecarClass.EndProgressEvent2    += EndProgress2;
-                        _sidecarClass.UpdateStatusEvent    += UpdateStatus;
-                        CICMMetadataType sidecar = _sidecarClass.Create();
-
-                        if(!_aborted)
+                        if(_dev.IsUsb &&
+                           _dev.UsbDescriptors != null)
                         {
-                            if(_preSidecar != null)
+                            _dumpLog.WriteLine("Reading USB descriptors.");
+                            UpdateStatus?.Invoke("Reading USB descriptors.");
+
+                            sidecar.BlockMedia[0].USB = new USBType
                             {
-                                _preSidecar.BlockMedia = sidecar.BlockMedia;
-                                sidecar                = _preSidecar;
-                            }
-
-                            if(_dev.IsUsb &&
-                               _dev.UsbDescriptors != null)
-                            {
-                                _dumpLog.WriteLine("Reading USB descriptors.");
-                                UpdateStatus?.Invoke("Reading USB descriptors.");
-
-                                sidecar.BlockMedia[0].USB = new USBType
-                                {
-                                    ProductID = _dev.UsbProductId,
-                                    VendorID  = _dev.UsbVendorId,
-                                    Descriptors = new DumpType
-                                    {
-                                        Image     = _outputPath,
-                                        Size      = (ulong)_dev.UsbDescriptors.Length,
-                                        Checksums = Checksum.GetChecksums(_dev.UsbDescriptors).ToArray()
-                                    }
-                                };
-                            }
-
-                            if(_dev.IsPcmcia &&
-                               _dev.Cis != null)
-                            {
-                                _dumpLog.WriteLine("Reading PCMCIA CIS.");
-                                UpdateStatus?.Invoke("Reading PCMCIA CIS.");
-
-                                sidecar.BlockMedia[0].PCMCIA = new PCMCIAType
-                                {
-                                    CIS = new DumpType
-                                    {
-                                        Image     = _outputPath,
-                                        Size      = (ulong)_dev.Cis.Length,
-                                        Checksums = Checksum.GetChecksums(_dev.Cis).ToArray()
-                                    }
-                                };
-
-                                _dumpLog.WriteLine("Decoding PCMCIA CIS.");
-                                UpdateStatus?.Invoke("Decoding PCMCIA CIS.");
-                                Tuple[] tuples = CIS.GetTuples(_dev.Cis);
-
-                                if(tuples != null)
-                                    foreach(Tuple tuple in tuples)
-                                        switch(tuple.Code)
-                                        {
-                                            case TupleCodes.CISTPL_MANFID:
-                                                ManufacturerIdentificationTuple manufacturerId =
-                                                    CIS.DecodeManufacturerIdentificationTuple(tuple);
-
-                                                if(manufacturerId != null)
-                                                {
-                                                    sidecar.BlockMedia[0].PCMCIA.ManufacturerCode =
-                                                        manufacturerId.ManufacturerID;
-
-                                                    sidecar.BlockMedia[0].PCMCIA.CardCode = manufacturerId.CardID;
-                                                    sidecar.BlockMedia[0].PCMCIA.ManufacturerCodeSpecified = true;
-                                                    sidecar.BlockMedia[0].PCMCIA.CardCodeSpecified = true;
-                                                }
-
-                                                break;
-                                            case TupleCodes.CISTPL_VERS_1:
-                                                Level1VersionTuple version = CIS.DecodeLevel1VersionTuple(tuple);
-
-                                                if(version != null)
-                                                {
-                                                    sidecar.BlockMedia[0].PCMCIA.Manufacturer = version.Manufacturer;
-                                                    sidecar.BlockMedia[0].PCMCIA.ProductName  = version.Product;
-
-                                                    sidecar.BlockMedia[0].PCMCIA.Compliance =
-                                                        $"{version.MajorVersion}.{version.MinorVersion}";
-
-                                                    sidecar.BlockMedia[0].PCMCIA.AdditionalInformation =
-                                                        version.AdditionalInformation;
-                                                }
-
-                                                break;
-                                        }
-                            }
-
-                            if(_private)
-                                DeviceReport.ClearIdentify(ataIdentify);
-
-                            sidecar.BlockMedia[0].ATA = new ATAType
-                            {
-                                Identify = new DumpType
+                                ProductID = _dev.UsbProductId,
+                                VendorID  = _dev.UsbVendorId,
+                                Descriptors = new DumpType
                                 {
                                     Image     = _outputPath,
-                                    Size      = (ulong)cmdBuf.Length,
-                                    Checksums = Checksum.GetChecksums(cmdBuf).ToArray()
+                                    Size      = (ulong)_dev.UsbDescriptors.Length,
+                                    Checksums = Checksum.GetChecksums(_dev.UsbDescriptors).ToArray()
+                                }
+                            };
+                        }
+
+                        if(_dev.IsPcmcia &&
+                           _dev.Cis != null)
+                        {
+                            _dumpLog.WriteLine("Reading PCMCIA CIS.");
+                            UpdateStatus?.Invoke("Reading PCMCIA CIS.");
+
+                            sidecar.BlockMedia[0].PCMCIA = new PCMCIAType
+                            {
+                                CIS = new DumpType
+                                {
+                                    Image     = _outputPath,
+                                    Size      = (ulong)_dev.Cis.Length,
+                                    Checksums = Checksum.GetChecksums(_dev.Cis).ToArray()
                                 }
                             };
 
-                            DateTime chkEnd = DateTime.UtcNow;
+                            _dumpLog.WriteLine("Decoding PCMCIA CIS.");
+                            UpdateStatus?.Invoke("Decoding PCMCIA CIS.");
+                            Tuple[] tuples = CIS.GetTuples(_dev.Cis);
 
-                            totalChkDuration = (chkEnd - chkStart).TotalMilliseconds;
-                            UpdateStatus?.Invoke($"Sidecar created in {(chkEnd - chkStart).TotalSeconds} seconds.");
+                            if(tuples != null)
+                                foreach(Tuple tuple in tuples)
+                                    switch(tuple.Code)
+                                    {
+                                        case TupleCodes.CISTPL_MANFID:
+                                            ManufacturerIdentificationTuple manufacturerId =
+                                                CIS.DecodeManufacturerIdentificationTuple(tuple);
 
-                            UpdateStatus?.
-                                Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
+                                            if(manufacturerId != null)
+                                            {
+                                                sidecar.BlockMedia[0].PCMCIA.ManufacturerCode =
+                                                    manufacturerId.ManufacturerID;
 
-                            _dumpLog.WriteLine("Sidecar created in {0} seconds.", (chkEnd - chkStart).TotalSeconds);
+                                                sidecar.BlockMedia[0].PCMCIA.CardCode = manufacturerId.CardID;
+                                                sidecar.BlockMedia[0].PCMCIA.ManufacturerCodeSpecified = true;
+                                                sidecar.BlockMedia[0].PCMCIA.CardCodeSpecified = true;
+                                            }
 
-                            _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
-                                               blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
+                                            break;
+                                        case TupleCodes.CISTPL_VERS_1:
+                                            Level1VersionTuple version = CIS.DecodeLevel1VersionTuple(tuple);
 
-                            List<(ulong start, string type)> filesystems = new();
+                                            if(version != null)
+                                            {
+                                                sidecar.BlockMedia[0].PCMCIA.Manufacturer = version.Manufacturer;
+                                                sidecar.BlockMedia[0].PCMCIA.ProductName  = version.Product;
 
-                            if(sidecar.BlockMedia[0].FileSystemInformation != null)
-                                filesystems.AddRange(from partition in sidecar.BlockMedia[0].FileSystemInformation
-                                                     where partition.FileSystems != null
-                                                     from fileSystem in partition.FileSystems
-                                                     select (partition.StartSector, fileSystem.Type));
+                                                sidecar.BlockMedia[0].PCMCIA.Compliance =
+                                                    $"{version.MajorVersion}.{version.MinorVersion}";
 
-                            if(filesystems.Count > 0)
-                                foreach(var filesystem in filesystems.Select(o => new
-                                {
-                                    o.start,
-                                    o.type
-                                }).Distinct())
-                                {
-                                    UpdateStatus?.
-                                        Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
+                                                sidecar.BlockMedia[0].PCMCIA.AdditionalInformation =
+                                                    version.AdditionalInformation;
+                                            }
 
-                                    _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type,
-                                                       filesystem.start);
-                                }
+                                            break;
+                                    }
+                        }
 
-                            (string type, string subType) = CommonTypes.Metadata.MediaType.MediaTypeToString(mediaType);
+                        if(_private)
+                            DeviceReport.ClearIdentify(ataIdentify);
 
-                            sidecar.BlockMedia[0].DiskType          = type;
-                            sidecar.BlockMedia[0].DiskSubType       = subType;
-                            sidecar.BlockMedia[0].Interface         = "ATA";
-                            sidecar.BlockMedia[0].LogicalBlocks     = blocks;
-                            sidecar.BlockMedia[0].PhysicalBlockSize = physicalSectorSize;
-                            sidecar.BlockMedia[0].LogicalBlockSize  = blockSize;
-                            sidecar.BlockMedia[0].Manufacturer      = _dev.Manufacturer;
-                            sidecar.BlockMedia[0].Model             = _dev.Model;
-
-                            if(!_private)
-                                sidecar.BlockMedia[0].Serial = _dev.Serial;
-
-                            sidecar.BlockMedia[0].Size = blocks * blockSize;
-
-                            if(cylinders > 0 &&
-                               heads     > 0 &&
-                               sectors   > 0)
+                        sidecar.BlockMedia[0].ATA = new ATAType
+                        {
+                            Identify = new DumpType
                             {
-                                sidecar.BlockMedia[0].Cylinders                = cylinders;
-                                sidecar.BlockMedia[0].CylindersSpecified       = true;
-                                sidecar.BlockMedia[0].Heads                    = heads;
-                                sidecar.BlockMedia[0].HeadsSpecified           = true;
-                                sidecar.BlockMedia[0].SectorsPerTrack          = sectors;
-                                sidecar.BlockMedia[0].SectorsPerTrackSpecified = true;
+                                Image     = _outputPath,
+                                Size      = (ulong)cmdBuf.Length,
+                                Checksums = Checksum.GetChecksums(cmdBuf).ToArray()
+                            }
+                        };
+
+                        DateTime chkEnd = DateTime.UtcNow;
+
+                        totalChkDuration = (chkEnd - chkStart).TotalMilliseconds;
+                        UpdateStatus?.Invoke($"Sidecar created in {(chkEnd - chkStart).TotalSeconds} seconds.");
+
+                        UpdateStatus?.
+                            Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
+
+                        _dumpLog.WriteLine("Sidecar created in {0} seconds.", (chkEnd - chkStart).TotalSeconds);
+
+                        _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
+                                           blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
+
+                        List<(ulong start, string type)> filesystems = new();
+
+                        if(sidecar.BlockMedia[0].FileSystemInformation != null)
+                            filesystems.AddRange(from partition in sidecar.BlockMedia[0].FileSystemInformation
+                                                 where partition.FileSystems != null
+                                                 from fileSystem in partition.FileSystems
+                                                 select (partition.StartSector, fileSystem.Type));
+
+                        if(filesystems.Count > 0)
+                            foreach(var filesystem in filesystems.Select(o => new
+                                    {
+                                        o.start,
+                                        o.type
+                                    }).Distinct())
+                            {
+                                UpdateStatus?.
+                                    Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
+
+                                _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type,
+                                                   filesystem.start);
                             }
 
-                            UpdateStatus?.Invoke("Writing metadata sidecar");
+                        (string type, string subType) = CommonTypes.Metadata.MediaType.MediaTypeToString(mediaType);
 
-                            var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
+                        sidecar.BlockMedia[0].DiskType          = type;
+                        sidecar.BlockMedia[0].DiskSubType       = subType;
+                        sidecar.BlockMedia[0].Interface         = "ATA";
+                        sidecar.BlockMedia[0].LogicalBlocks     = blocks;
+                        sidecar.BlockMedia[0].PhysicalBlockSize = physicalSectorSize;
+                        sidecar.BlockMedia[0].LogicalBlockSize  = blockSize;
+                        sidecar.BlockMedia[0].Manufacturer      = _dev.Manufacturer;
+                        sidecar.BlockMedia[0].Model             = _dev.Model;
 
-                            var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
-                            xmlSer.Serialize(xmlFs, sidecar);
-                            xmlFs.Close();
+                        if(!_private)
+                            sidecar.BlockMedia[0].Serial = _dev.Serial;
+
+                        sidecar.BlockMedia[0].Size = blocks * blockSize;
+
+                        if(cylinders > 0 &&
+                           heads     > 0 &&
+                           sectors   > 0)
+                        {
+                            sidecar.BlockMedia[0].Cylinders                = cylinders;
+                            sidecar.BlockMedia[0].CylindersSpecified       = true;
+                            sidecar.BlockMedia[0].Heads                    = heads;
+                            sidecar.BlockMedia[0].HeadsSpecified           = true;
+                            sidecar.BlockMedia[0].SectorsPerTrack          = sectors;
+                            sidecar.BlockMedia[0].SectorsPerTrackSpecified = true;
                         }
+
+                        UpdateStatus?.Invoke("Writing metadata sidecar");
+
+                        var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
+
+                        var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
+                        xmlSer.Serialize(xmlFs, sidecar);
+                        xmlFs.Close();
                     }
-
-                    UpdateStatus?.Invoke("");
-
-                    UpdateStatus?.
-                        Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
-
-                    UpdateStatus?.
-                        Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
-
-                    if(maxSpeed > 0)
-                        UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
-
-                    if(minSpeed > 0 &&
-                       minSpeed < double.MaxValue)
-                        UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
-
-                    UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
-
-                    if(_resume.BadBlocks.Count > 0)
-                        _resume.BadBlocks.Sort();
-
-                    UpdateStatus?.Invoke("");
                 }
 
-                Statistics.AddMedia(mediaType, true);
+                UpdateStatus?.Invoke("");
+
+                UpdateStatus?.
+                    Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+
+                UpdateStatus?.
+                    Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+
+                if(maxSpeed > 0)
+                    UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+
+                if(minSpeed > 0 &&
+                   minSpeed < double.MaxValue)
+                    UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+
+                UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
+
+                if(_resume.BadBlocks.Count > 0)
+                    _resume.BadBlocks.Sort();
+
+                UpdateStatus?.Invoke("");
             }
-            else
-                StoppingErrorMessage?.Invoke("Unable to communicate with ATA device.");
+
+            Statistics.AddMedia(mediaType, true);
         }
+        else
+            StoppingErrorMessage?.Invoke("Unable to communicate with ATA device.");
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/CdiReady.cs b/Aaru.Core/Devices/Dumping/CompactDisc/CdiReady.cs
index 7bf84424b..c567b7b81 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/CdiReady.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/CdiReady.cs
@@ -45,373 +45,372 @@ using Schemas;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Detects if a sector contains data</summary>
+    /// <param name="sector">Sector contents</param>
+    /// <returns><c>true</c> if it contains Yellow Book data, <c>false</c> otherwise</returns>
+    static bool IsData(byte[] sector)
     {
-        /// <summary>Detects if a sector contains data</summary>
-        /// <param name="sector">Sector contents</param>
-        /// <returns><c>true</c> if it contains Yellow Book data, <c>false</c> otherwise</returns>
-        static bool IsData(byte[] sector)
+        if(sector?.Length != 2352)
+            return false;
+
+        byte[] syncMark =
         {
-            if(sector?.Length != 2352)
-                return false;
+            0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
+        };
 
-            byte[] syncMark =
-            {
-                0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
-            };
+        byte[] testMark = new byte[12];
+        Array.Copy(sector, 0, testMark, 0, 12);
 
-            byte[] testMark = new byte[12];
-            Array.Copy(sector, 0, testMark, 0, 12);
+        return syncMark.SequenceEqual(testMark) && (sector[0xF] == 0 || sector[0xF] == 1 || sector[0xF] == 2);
+    }
 
-            return syncMark.SequenceEqual(testMark) && (sector[0xF] == 0 || sector[0xF] == 1 || sector[0xF] == 2);
+    /// <summary>Detects if a sector contains scrambled data</summary>
+    /// <param name="sector">Sector contents</param>
+    /// <param name="wantedLba">What LBA we intended to read</param>
+    /// <param name="offset">Offset in bytes, if found</param>
+    /// <returns><c>true</c> if it contains Yellow Book data, <c>false</c> otherwise</returns>
+    static bool IsScrambledData(byte[] sector, int wantedLba, out int? offset)
+    {
+        offset = 0;
+
+        if(sector?.Length != 2352)
+            return false;
+
+        byte[] syncMark =
+        {
+            0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
+        };
+
+        byte[] testMark = new byte[12];
+
+        for(int i = 0; i <= 2336; i++)
+        {
+            Array.Copy(sector, i, testMark, 0, 12);
+
+            if(!syncMark.SequenceEqual(testMark) ||
+               (sector[i + 0xF] != 0x60 && sector[i + 0xF] != 0x61 && sector[i + 0xF] != 0x62))
+                continue;
+
+            // De-scramble M and S
+            int minute = sector[i + 12] ^ 0x01;
+            int second = sector[i + 13] ^ 0x80;
+            int frame  = sector[i + 14];
+
+            // Convert to binary
+            minute = (minute / 16 * 10) + (minute & 0x0F);
+            second = (second / 16 * 10) + (second & 0x0F);
+            frame  = (frame  / 16 * 10) + (frame  & 0x0F);
+
+            // Calculate the first found LBA
+            int lba = (minute * 60 * 75) + (second * 75) + frame - 150;
+
+            // Calculate the difference between the found LBA and the requested one
+            int diff = wantedLba - lba;
+
+            offset = i + (2352 * diff);
+
+            return true;
         }
 
-        /// <summary>Detects if a sector contains scrambled data</summary>
-        /// <param name="sector">Sector contents</param>
-        /// <param name="wantedLba">What LBA we intended to read</param>
-        /// <param name="offset">Offset in bytes, if found</param>
-        /// <returns><c>true</c> if it contains Yellow Book data, <c>false</c> otherwise</returns>
-        static bool IsScrambledData(byte[] sector, int wantedLba, out int? offset)
+        return false;
+    }
+
+    // TODO: Set pregap for Track 1
+    // TODO: Detect errors in sectors
+    /// <summary>Reads all the hidden track in CD-i Ready discs</summary>
+    /// <param name="blocks">Total number of positive sectors</param>
+    /// <param name="blockSize">Size of the read sector in bytes</param>
+    /// <param name="currentSpeed">Current read speed</param>
+    /// <param name="currentTry">Current dump hardware try</param>
+    /// <param name="extents">Extents</param>
+    /// <param name="ibgLog">IMGBurn log</param>
+    /// <param name="imageWriteDuration">Duration of image write</param>
+    /// <param name="leadOutExtents">Lead-out extents</param>
+    /// <param name="maxSpeed">Maximum speed</param>
+    /// <param name="mhddLog">MHDD log</param>
+    /// <param name="minSpeed">Minimum speed</param>
+    /// <param name="offsetBytes">Read offset</param>
+    /// <param name="sectorsForOffset">Sectors needed to fix offset</param>
+    /// <param name="subSize">Subchannel size in bytes</param>
+    /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
+    /// <param name="totalDuration">Total commands duration</param>
+    /// <param name="cdiReadyReadAsAudio">Is the drive returning CD-i Ready hidden track as audio?</param>
+    /// <param name="tracks">Disc tracks</param>
+    /// <param name="subLog">Subchannel log</param>
+    /// <param name="desiredSubchannel">Subchannel desired to save</param>
+    /// <param name="isrcs">List of disc ISRCs</param>
+    /// <param name="mcn">Disc media catalogue number</param>
+    /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
+    /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
+    void ReadCdiReady(uint blockSize, ref double currentSpeed, DumpHardwareType currentTry, ExtentsULong extents,
+                      IbgLog ibgLog, ref double imageWriteDuration, ExtentsULong leadOutExtents,
+                      ref double maxSpeed, MhddLog mhddLog, ref double minSpeed, uint subSize,
+                      MmcSubchannel supportedSubchannel, ref double totalDuration, Track[] tracks,
+                      SubchannelLog subLog, MmcSubchannel desiredSubchannel, Dictionary<byte, string> isrcs,
+                      ref string mcn, HashSet<int> subchannelExtents, ulong blocks, bool cdiReadyReadAsAudio,
+                      int offsetBytes, int sectorsForOffset, Dictionary<byte, int> smallestPregapLbaPerTrack)
+    {
+        ulong      sectorSpeedStart = 0;               // Used to calculate correct speed
+        DateTime   timeSpeedStart   = DateTime.UtcNow; // Time of start for speed calculation
+        bool       sense;                              // Sense indicator
+        byte[]     cmdBuf;                             // Data buffer
+        byte[]     senseBuf;                           // Sense buffer
+        double     cmdDuration;                        // Command execution time
+        const uint sectorSize = 2352;                  // Full sector size
+        Track      firstTrack = tracks.FirstOrDefault(t => t.Sequence == 1);
+        uint       blocksToRead; // How many sectors to read at once
+        var        outputOptical = _outputPlugin as IWritableOpticalImage;
+
+        if(firstTrack is null)
+            return;
+
+        if(cdiReadyReadAsAudio)
         {
-            offset = 0;
+            _dumpLog.WriteLine("Setting speed to 8x for CD-i Ready reading as audio.");
+            UpdateStatus?.Invoke("Setting speed to 8x for CD-i Ready reading as audio.");
 
-            if(sector?.Length != 2352)
-                return false;
+            _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, 1416, 0, _dev.Timeout, out _);
+        }
 
-            byte[] syncMark =
+        InitProgress?.Invoke();
+
+        for(ulong i = _resume.NextBlock; i < firstTrack.StartSector; i += blocksToRead)
+        {
+            if(_aborted)
             {
-                0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
-            };
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
 
-            byte[] testMark = new byte[12];
-
-            for(int i = 0; i <= 2336; i++)
-            {
-                Array.Copy(sector, i, testMark, 0, 12);
-
-                if(!syncMark.SequenceEqual(testMark) ||
-                   (sector[i + 0xF] != 0x60 && sector[i + 0xF] != 0x61 && sector[i + 0xF] != 0x62))
-                    continue;
-
-                // De-scramble M and S
-                int minute = sector[i + 12] ^ 0x01;
-                int second = sector[i + 13] ^ 0x80;
-                int frame  = sector[i + 14];
-
-                // Convert to binary
-                minute = (minute / 16 * 10) + (minute & 0x0F);
-                second = (second / 16 * 10) + (second & 0x0F);
-                frame  = (frame  / 16 * 10) + (frame  & 0x0F);
-
-                // Calculate the first found LBA
-                int lba = (minute * 60 * 75) + (second * 75) + frame - 150;
-
-                // Calculate the difference between the found LBA and the requested one
-                int diff = wantedLba - lba;
-
-                offset = i + (2352 * diff);
-
-                return true;
+                break;
             }
 
-            return false;
-        }
+            uint firstSectorToRead = (uint)i;
 
-        // TODO: Set pregap for Track 1
-        // TODO: Detect errors in sectors
-        /// <summary>Reads all the hidden track in CD-i Ready discs</summary>
-        /// <param name="blocks">Total number of positive sectors</param>
-        /// <param name="blockSize">Size of the read sector in bytes</param>
-        /// <param name="currentSpeed">Current read speed</param>
-        /// <param name="currentTry">Current dump hardware try</param>
-        /// <param name="extents">Extents</param>
-        /// <param name="ibgLog">IMGBurn log</param>
-        /// <param name="imageWriteDuration">Duration of image write</param>
-        /// <param name="leadOutExtents">Lead-out extents</param>
-        /// <param name="maxSpeed">Maximum speed</param>
-        /// <param name="mhddLog">MHDD log</param>
-        /// <param name="minSpeed">Minimum speed</param>
-        /// <param name="offsetBytes">Read offset</param>
-        /// <param name="sectorsForOffset">Sectors needed to fix offset</param>
-        /// <param name="subSize">Subchannel size in bytes</param>
-        /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
-        /// <param name="totalDuration">Total commands duration</param>
-        /// <param name="cdiReadyReadAsAudio">Is the drive returning CD-i Ready hidden track as audio?</param>
-        /// <param name="tracks">Disc tracks</param>
-        /// <param name="subLog">Subchannel log</param>
-        /// <param name="desiredSubchannel">Subchannel desired to save</param>
-        /// <param name="isrcs">List of disc ISRCs</param>
-        /// <param name="mcn">Disc media catalogue number</param>
-        /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
-        /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
-        void ReadCdiReady(uint blockSize, ref double currentSpeed, DumpHardwareType currentTry, ExtentsULong extents,
-                          IbgLog ibgLog, ref double imageWriteDuration, ExtentsULong leadOutExtents,
-                          ref double maxSpeed, MhddLog mhddLog, ref double minSpeed, uint subSize,
-                          MmcSubchannel supportedSubchannel, ref double totalDuration, Track[] tracks,
-                          SubchannelLog subLog, MmcSubchannel desiredSubchannel, Dictionary<byte, string> isrcs,
-                          ref string mcn, HashSet<int> subchannelExtents, ulong blocks, bool cdiReadyReadAsAudio,
-                          int offsetBytes, int sectorsForOffset, Dictionary<byte, int> smallestPregapLbaPerTrack)
-        {
-            ulong      sectorSpeedStart = 0;               // Used to calculate correct speed
-            DateTime   timeSpeedStart   = DateTime.UtcNow; // Time of start for speed calculation
-            bool       sense;                              // Sense indicator
-            byte[]     cmdBuf;                             // Data buffer
-            byte[]     senseBuf;                           // Sense buffer
-            double     cmdDuration;                        // Command execution time
-            const uint sectorSize = 2352;                  // Full sector size
-            Track      firstTrack = tracks.FirstOrDefault(t => t.Sequence == 1);
-            uint       blocksToRead; // How many sectors to read at once
-            var        outputOptical = _outputPlugin as IWritableOpticalImage;
+            blocksToRead = _maximumReadable;
 
-            if(firstTrack is null)
-                return;
+            if(blocksToRead == 1 && cdiReadyReadAsAudio)
+                blocksToRead += (uint)sectorsForOffset;
 
             if(cdiReadyReadAsAudio)
             {
-                _dumpLog.WriteLine("Setting speed to 8x for CD-i Ready reading as audio.");
-                UpdateStatus?.Invoke("Setting speed to 8x for CD-i Ready reading as audio.");
-
-                _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, 1416, 0, _dev.Timeout, out _);
+                if(offsetBytes < 0)
+                {
+                    if(i == 0)
+                        firstSectorToRead = uint.MaxValue - (uint)(sectorsForOffset - 1); // -1
+                    else
+                        firstSectorToRead -= (uint)sectorsForOffset;
+                }
             }
 
-            InitProgress?.Invoke();
+            if(currentSpeed > maxSpeed &&
+               currentSpeed > 0)
+                maxSpeed = currentSpeed;
 
-            for(ulong i = _resume.NextBlock; i < firstTrack.StartSector; i += blocksToRead)
+            if(currentSpeed < minSpeed &&
+               currentSpeed > 0)
+                minSpeed = currentSpeed;
+
+            UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
+                                   (long)blocks);
+
+            sense = _dev.ReadCd(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, blocksToRead,
+                                MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
+
+            totalDuration += cmdDuration;
+
+            double elapsed;
+
+            // Overcome the track mode change drive error
+            if(sense)
             {
-                if(_aborted)
+                for(uint r = 0; r < _maximumReadable; r++)
                 {
-                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    UpdateStatus?.Invoke("Aborted!");
-                    _dumpLog.WriteLine("Aborted!");
+                    UpdateProgress?.Invoke($"Reading sector {i + r} of {blocks} ({currentSpeed:F3} MiB/sec.)",
+                                           (long)i + r, (long)blocks);
 
-                    break;
-                }
+                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)(i + r), blockSize,
+                                        (uint)sectorsForOffset + 1, MmcSectorTypes.AllTypes, false, false, true,
+                                        MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                        supportedSubchannel, _dev.Timeout, out cmdDuration);
 
-                uint firstSectorToRead = (uint)i;
+                    totalDuration += cmdDuration;
 
-                blocksToRead = _maximumReadable;
-
-                if(blocksToRead == 1 && cdiReadyReadAsAudio)
-                    blocksToRead += (uint)sectorsForOffset;
-
-                if(cdiReadyReadAsAudio)
-                {
-                    if(offsetBytes < 0)
+                    if(!sense &&
+                       !_dev.Error)
                     {
-                        if(i == 0)
-                            firstSectorToRead = uint.MaxValue - (uint)(sectorsForOffset - 1); // -1
-                        else
-                            firstSectorToRead -= (uint)sectorsForOffset;
-                    }
-                }
+                        mhddLog.Write(i + r, cmdDuration);
+                        ibgLog.Write(i  + r, currentSpeed * 1024);
+                        extents.Add(i   + r, 1, true);
+                        DateTime writeStart = DateTime.Now;
 
-                if(currentSpeed > maxSpeed &&
-                   currentSpeed > 0)
-                    maxSpeed = currentSpeed;
+                        if(cdiReadyReadAsAudio)
+                            FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel,
+                                          ref blocksToRead, subSize, ref cmdBuf, blockSize, false);
 
-                if(currentSpeed < minSpeed &&
-                   currentSpeed > 0)
-                    minSpeed = currentSpeed;
-
-                UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
-                                       (long)blocks);
-
-                sense = _dev.ReadCd(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, blocksToRead,
-                                    MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
-                                    MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
-
-                totalDuration += cmdDuration;
-
-                double elapsed;
-
-                // Overcome the track mode change drive error
-                if(sense)
-                {
-                    for(uint r = 0; r < _maximumReadable; r++)
-                    {
-                        UpdateProgress?.Invoke($"Reading sector {i + r} of {blocks} ({currentSpeed:F3} MiB/sec.)",
-                                               (long)i + r, (long)blocks);
-
-                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)(i + r), blockSize,
-                                            (uint)sectorsForOffset + 1, MmcSectorTypes.AllTypes, false, false, true,
-                                            MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                            supportedSubchannel, _dev.Timeout, out cmdDuration);
-
-                        totalDuration += cmdDuration;
-
-                        if(!sense &&
-                           !_dev.Error)
+                        if(supportedSubchannel != MmcSubchannel.None)
                         {
-                            mhddLog.Write(i + r, cmdDuration);
-                            ibgLog.Write(i  + r, currentSpeed * 1024);
-                            extents.Add(i   + r, 1, true);
-                            DateTime writeStart = DateTime.Now;
+                            byte[] data = new byte[sectorSize];
+                            byte[] sub  = new byte[subSize];
+
+                            Array.Copy(cmdBuf, 0, data, 0, sectorSize);
+
+                            Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
 
                             if(cdiReadyReadAsAudio)
-                                FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel,
-                                              ref blocksToRead, subSize, ref cmdBuf, blockSize, false);
+                                data = Sector.Scramble(data);
 
-                            if(supportedSubchannel != MmcSubchannel.None)
+                            outputOptical.WriteSectorsLong(data, i + r, 1);
+
+                            bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
+                                desiredSubchannel, sub, i + r, 1, subLog, isrcs, 1, ref mcn, tracks,
+                                subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
+                                _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
+
+                            // Set tracks and go back
+                            if(indexesChanged)
                             {
-                                byte[] data = new byte[sectorSize];
-                                byte[] sub  = new byte[subSize];
+                                (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
+                                i -= _maximumReadable;
 
-                                Array.Copy(cmdBuf, 0, data, 0, sectorSize);
-
-                                Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
-
-                                if(cdiReadyReadAsAudio)
-                                    data = Sector.Scramble(data);
-
-                                outputOptical.WriteSectorsLong(data, i + r, 1);
-
-                                bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
-                                    desiredSubchannel, sub, i + r, 1, subLog, isrcs, 1, ref mcn, tracks,
-                                    subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
-                                    _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
-
-                                // Set tracks and go back
-                                if(indexesChanged)
-                                {
-                                    (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
-                                    i -= _maximumReadable;
-
-                                    continue;
-                                }
+                                continue;
                             }
-                            else
-                            {
-                                outputOptical.WriteSectorsLong(cmdBuf, i + r, 1);
-                            }
-
-                            imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
                         }
                         else
                         {
-                            _errorLog?.WriteLine(i + r, _dev.Error, _dev.LastError, senseBuf);
-
-                            leadOutExtents.Add(i + r, firstTrack.StartSector - 1);
-
-                            UpdateStatus?.
-                                Invoke($"Adding CD-i Ready hole from LBA {i + r} to {firstTrack.StartSector - 1} inclusive.");
-
-                            _dumpLog.WriteLine("Adding CD-i Ready hole from LBA {0} to {1} inclusive.", i + r,
-                                               firstTrack.StartSector                                - 1);
-
-                            break;
+                            outputOptical.WriteSectorsLong(cmdBuf, i + r, 1);
                         }
 
-                        sectorSpeedStart += r;
-
-                        _resume.NextBlock = i + r;
-
-                        elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                        if(elapsed <= 0)
-                            continue;
-
-                        currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                        sectorSpeedStart = 0;
-                        timeSpeedStart   = DateTime.UtcNow;
-                    }
-                }
-
-                if(!sense &&
-                   !_dev.Error)
-                {
-                    if(cdiReadyReadAsAudio)
-                        FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel, ref blocksToRead,
-                                      subSize, ref cmdBuf, blockSize, false);
-
-                    mhddLog.Write(i, cmdDuration);
-                    ibgLog.Write(i, currentSpeed * 1024);
-                    extents.Add(i, blocksToRead, true);
-                    DateTime writeStart = DateTime.Now;
-
-                    if(supportedSubchannel != MmcSubchannel.None)
-                    {
-                        byte[] data    = new byte[sectorSize * blocksToRead];
-                        byte[] sub     = new byte[subSize    * blocksToRead];
-                        byte[] tmpData = new byte[sectorSize];
-
-                        for(int b = 0; b < blocksToRead; b++)
-                        {
-                            if(cdiReadyReadAsAudio)
-                            {
-                                Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), tmpData, 0, sectorSize);
-                                tmpData = Sector.Scramble(tmpData);
-                                Array.Copy(tmpData, 0, data, sectorSize * b, sectorSize);
-                            }
-                            else
-                                Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b, sectorSize);
-
-                            Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize * b, subSize);
-                        }
-
-                        outputOptical.WriteSectorsLong(data, i, blocksToRead);
-
-                        bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
-                            desiredSubchannel, sub, i, blocksToRead, subLog, isrcs, 1, ref mcn, tracks,
-                            subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
-                            _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
-
-                        // Set tracks and go back
-                        if(indexesChanged)
-                        {
-                            (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
-                            i -= blocksToRead;
-
-                            continue;
-                        }
+                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
                     }
                     else
                     {
-                        if(cdiReadyReadAsAudio)
-                        {
-                            byte[] tmpData = new byte[sectorSize];
-                            byte[] data    = new byte[sectorSize * blocksToRead];
+                        _errorLog?.WriteLine(i + r, _dev.Error, _dev.LastError, senseBuf);
 
-                            for(int b = 0; b < blocksToRead; b++)
-                            {
-                                Array.Copy(cmdBuf, (int)(b * sectorSize), tmpData, 0, sectorSize);
-                                tmpData = Sector.Scramble(tmpData);
-                                Array.Copy(tmpData, 0, data, sectorSize * b, sectorSize);
-                            }
+                        leadOutExtents.Add(i + r, firstTrack.StartSector - 1);
 
-                            outputOptical.WriteSectorsLong(data, i, blocksToRead);
-                        }
-                        else
-                            outputOptical.WriteSectorsLong(cmdBuf, i, blocksToRead);
+                        UpdateStatus?.
+                            Invoke($"Adding CD-i Ready hole from LBA {i + r} to {firstTrack.StartSector - 1} inclusive.");
+
+                        _dumpLog.WriteLine("Adding CD-i Ready hole from LBA {0} to {1} inclusive.", i + r,
+                                           firstTrack.StartSector                                     - 1);
+
+                        break;
                     }
 
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                    sectorSpeedStart += r;
+
+                    _resume.NextBlock = i + r;
+
+                    elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+                    if(elapsed <= 0)
+                        continue;
+
+                    currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+                    sectorSpeedStart = 0;
+                    timeSpeedStart   = DateTime.UtcNow;
+                }
+            }
+
+            if(!sense &&
+               !_dev.Error)
+            {
+                if(cdiReadyReadAsAudio)
+                    FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel, ref blocksToRead,
+                                  subSize, ref cmdBuf, blockSize, false);
+
+                mhddLog.Write(i, cmdDuration);
+                ibgLog.Write(i, currentSpeed * 1024);
+                extents.Add(i, blocksToRead, true);
+                DateTime writeStart = DateTime.Now;
+
+                if(supportedSubchannel != MmcSubchannel.None)
+                {
+                    byte[] data    = new byte[sectorSize * blocksToRead];
+                    byte[] sub     = new byte[subSize    * blocksToRead];
+                    byte[] tmpData = new byte[sectorSize];
+
+                    for(int b = 0; b < blocksToRead; b++)
+                    {
+                        if(cdiReadyReadAsAudio)
+                        {
+                            Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), tmpData, 0, sectorSize);
+                            tmpData = Sector.Scramble(tmpData);
+                            Array.Copy(tmpData, 0, data, sectorSize * b, sectorSize);
+                        }
+                        else
+                            Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b, sectorSize);
+
+                        Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize * b, subSize);
+                    }
+
+                    outputOptical.WriteSectorsLong(data, i, blocksToRead);
+
+                    bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
+                        desiredSubchannel, sub, i, blocksToRead, subLog, isrcs, 1, ref mcn, tracks,
+                        subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
+                        _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
+
+                    // Set tracks and go back
+                    if(indexesChanged)
+                    {
+                        (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
+                        i -= blocksToRead;
+
+                        continue;
+                    }
                 }
                 else
                 {
-                    _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
+                    if(cdiReadyReadAsAudio)
+                    {
+                        byte[] tmpData = new byte[sectorSize];
+                        byte[] data    = new byte[sectorSize * blocksToRead];
 
-                    _resume.NextBlock = firstTrack.StartSector;
+                        for(int b = 0; b < blocksToRead; b++)
+                        {
+                            Array.Copy(cmdBuf, (int)(b * sectorSize), tmpData, 0, sectorSize);
+                            tmpData = Sector.Scramble(tmpData);
+                            Array.Copy(tmpData, 0, data, sectorSize * b, sectorSize);
+                        }
 
-                    break;
+                        outputOptical.WriteSectorsLong(data, i, blocksToRead);
+                    }
+                    else
+                        outputOptical.WriteSectorsLong(cmdBuf, i, blocksToRead);
                 }
 
-                sectorSpeedStart += blocksToRead;
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+            }
+            else
+            {
+                _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
 
-                _resume.NextBlock = i + blocksToRead;
+                _resume.NextBlock = firstTrack.StartSector;
 
-                elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                if(elapsed <= 0)
-                    continue;
-
-                currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                sectorSpeedStart = 0;
-                timeSpeedStart   = DateTime.UtcNow;
+                break;
             }
 
-            EndProgress?.Invoke();
+            sectorSpeedStart += blocksToRead;
+
+            _resume.NextBlock = i + blocksToRead;
+
+            elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+            if(elapsed <= 0)
+                continue;
+
+            currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+            sectorSpeedStart = 0;
+            timeSpeedStart   = DateTime.UtcNow;
         }
+
+        EndProgress?.Invoke();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
index e6f678193..18ac308d5 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Data.cs
@@ -49,727 +49,726 @@ using Schemas;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Reads all CD user data</summary>
+    /// <param name="audioExtents">Extents with audio sectors</param>
+    /// <param name="blocks">Total number of positive sectors</param>
+    /// <param name="blockSize">Size of the read sector in bytes</param>
+    /// <param name="currentSpeed">Current read speed</param>
+    /// <param name="currentTry">Current dump hardware try</param>
+    /// <param name="extents">Extents</param>
+    /// <param name="ibgLog">IMGBurn log</param>
+    /// <param name="imageWriteDuration">Duration of image write</param>
+    /// <param name="lastSector">Last sector number</param>
+    /// <param name="leadOutExtents">Lead-out extents</param>
+    /// <param name="maxSpeed">Maximum speed</param>
+    /// <param name="mhddLog">MHDD log</param>
+    /// <param name="minSpeed">Minimum speed</param>
+    /// <param name="newTrim">Is trim a new one?</param>
+    /// <param name="nextData">Next cluster of sectors is all data</param>
+    /// <param name="offsetBytes">Read offset</param>
+    /// <param name="read6">Device supports READ(6)</param>
+    /// <param name="read10">Device supports READ(10)</param>
+    /// <param name="read12">Device supports READ(12)</param>
+    /// <param name="read16">Device supports READ(16)</param>
+    /// <param name="readcd">Device supports READ CD</param>
+    /// <param name="sectorsForOffset">Sectors needed to fix offset</param>
+    /// <param name="subSize">Subchannel size in bytes</param>
+    /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
+    /// <param name="supportsLongSectors">Supports reading EDC and ECC</param>
+    /// <param name="totalDuration">Total commands duration</param>
+    /// <param name="tracks">Disc tracks</param>
+    /// <param name="subLog">Subchannel log</param>
+    /// <param name="desiredSubchannel">Subchannel desired to save</param>
+    /// <param name="isrcs">List of disc ISRCs</param>
+    /// <param name="mcn">Disc media catalogue number</param>
+    /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
+    /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
+    void ReadCdData(ExtentsULong audioExtents, ulong blocks, uint blockSize, ref double currentSpeed,
+                    DumpHardwareType currentTry, ExtentsULong extents, IbgLog ibgLog, ref double imageWriteDuration,
+                    long lastSector, ExtentsULong leadOutExtents, ref double maxSpeed, MhddLog mhddLog,
+                    ref double minSpeed, out bool newTrim, bool nextData, int offsetBytes, bool read6, bool read10,
+                    bool read12, bool read16, bool readcd, int sectorsForOffset, uint subSize,
+                    MmcSubchannel supportedSubchannel, bool supportsLongSectors, ref double totalDuration,
+                    Track[] tracks, SubchannelLog subLog, MmcSubchannel desiredSubchannel,
+                    Dictionary<byte, string> isrcs, ref string mcn, HashSet<int> subchannelExtents,
+                    Dictionary<byte, int> smallestPregapLbaPerTrack)
     {
-        /// <summary>Reads all CD user data</summary>
-        /// <param name="audioExtents">Extents with audio sectors</param>
-        /// <param name="blocks">Total number of positive sectors</param>
-        /// <param name="blockSize">Size of the read sector in bytes</param>
-        /// <param name="currentSpeed">Current read speed</param>
-        /// <param name="currentTry">Current dump hardware try</param>
-        /// <param name="extents">Extents</param>
-        /// <param name="ibgLog">IMGBurn log</param>
-        /// <param name="imageWriteDuration">Duration of image write</param>
-        /// <param name="lastSector">Last sector number</param>
-        /// <param name="leadOutExtents">Lead-out extents</param>
-        /// <param name="maxSpeed">Maximum speed</param>
-        /// <param name="mhddLog">MHDD log</param>
-        /// <param name="minSpeed">Minimum speed</param>
-        /// <param name="newTrim">Is trim a new one?</param>
-        /// <param name="nextData">Next cluster of sectors is all data</param>
-        /// <param name="offsetBytes">Read offset</param>
-        /// <param name="read6">Device supports READ(6)</param>
-        /// <param name="read10">Device supports READ(10)</param>
-        /// <param name="read12">Device supports READ(12)</param>
-        /// <param name="read16">Device supports READ(16)</param>
-        /// <param name="readcd">Device supports READ CD</param>
-        /// <param name="sectorsForOffset">Sectors needed to fix offset</param>
-        /// <param name="subSize">Subchannel size in bytes</param>
-        /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
-        /// <param name="supportsLongSectors">Supports reading EDC and ECC</param>
-        /// <param name="totalDuration">Total commands duration</param>
-        /// <param name="tracks">Disc tracks</param>
-        /// <param name="subLog">Subchannel log</param>
-        /// <param name="desiredSubchannel">Subchannel desired to save</param>
-        /// <param name="isrcs">List of disc ISRCs</param>
-        /// <param name="mcn">Disc media catalogue number</param>
-        /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
-        /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
-        void ReadCdData(ExtentsULong audioExtents, ulong blocks, uint blockSize, ref double currentSpeed,
-                        DumpHardwareType currentTry, ExtentsULong extents, IbgLog ibgLog, ref double imageWriteDuration,
-                        long lastSector, ExtentsULong leadOutExtents, ref double maxSpeed, MhddLog mhddLog,
-                        ref double minSpeed, out bool newTrim, bool nextData, int offsetBytes, bool read6, bool read10,
-                        bool read12, bool read16, bool readcd, int sectorsForOffset, uint subSize,
-                        MmcSubchannel supportedSubchannel, bool supportsLongSectors, ref double totalDuration,
-                        Track[] tracks, SubchannelLog subLog, MmcSubchannel desiredSubchannel,
-                        Dictionary<byte, string> isrcs, ref string mcn, HashSet<int> subchannelExtents,
-                        Dictionary<byte, int> smallestPregapLbaPerTrack)
+        ulong      sectorSpeedStart = 0;               // Used to calculate correct speed
+        DateTime   timeSpeedStart   = DateTime.UtcNow; // Time of start for speed calculation
+        uint       blocksToRead;                       // How many sectors to read at once
+        bool       sense       = true;                 // Sense indicator
+        byte[]     cmdBuf      = null;                 // Data buffer
+        byte[]     senseBuf    = null;                 // Sense buffer
+        double     cmdDuration = 0;                    // Command execution time
+        const uint sectorSize  = 2352;                 // Full sector size
+        newTrim = false;
+        PlextorSubchannel supportedPlextorSubchannel;
+        var               outputFormat = _outputPlugin as IWritableImage;
+
+        switch(supportedSubchannel)
         {
-            ulong      sectorSpeedStart = 0;               // Used to calculate correct speed
-            DateTime   timeSpeedStart   = DateTime.UtcNow; // Time of start for speed calculation
-            uint       blocksToRead;                       // How many sectors to read at once
-            bool       sense       = true;                 // Sense indicator
-            byte[]     cmdBuf      = null;                 // Data buffer
-            byte[]     senseBuf    = null;                 // Sense buffer
-            double     cmdDuration = 0;                    // Command execution time
-            const uint sectorSize  = 2352;                 // Full sector size
-            newTrim = false;
-            PlextorSubchannel supportedPlextorSubchannel;
-            var               outputFormat = _outputPlugin as IWritableImage;
+            case MmcSubchannel.None:
+                supportedPlextorSubchannel = PlextorSubchannel.None;
 
-            switch(supportedSubchannel)
+                break;
+            case MmcSubchannel.Raw:
+                supportedPlextorSubchannel = PlextorSubchannel.Pack;
+
+                break;
+            case MmcSubchannel.Q16:
+                supportedPlextorSubchannel = PlextorSubchannel.Q16;
+
+                break;
+            default:
+                supportedPlextorSubchannel = PlextorSubchannel.None;
+
+                break;
+        }
+
+        InitProgress?.Invoke();
+
+        int  currentReadSpeed      = _speed;
+        bool crossingLeadOut       = false;
+        bool failedCrossingLeadOut = false;
+        bool skippingLead          = false;
+
+        for(ulong i = _resume.NextBlock; (long)i <= lastSector; i += blocksToRead)
+        {
+            if(_aborted)
             {
-                case MmcSubchannel.None:
-                    supportedPlextorSubchannel = PlextorSubchannel.None;
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
 
-                    break;
-                case MmcSubchannel.Raw:
-                    supportedPlextorSubchannel = PlextorSubchannel.Pack;
-
-                    break;
-                case MmcSubchannel.Q16:
-                    supportedPlextorSubchannel = PlextorSubchannel.Q16;
-
-                    break;
-                default:
-                    supportedPlextorSubchannel = PlextorSubchannel.None;
-
-                    break;
+                break;
             }
 
-            InitProgress?.Invoke();
-
-            int  currentReadSpeed      = _speed;
-            bool crossingLeadOut       = false;
-            bool failedCrossingLeadOut = false;
-            bool skippingLead          = false;
-
-            for(ulong i = _resume.NextBlock; (long)i <= lastSector; i += blocksToRead)
+            while(leadOutExtents.Contains(i))
             {
-                if(_aborted)
+                skippingLead = true;
+                i++;
+            }
+
+            if((long)i > lastSector)
+                break;
+
+            uint firstSectorToRead = (uint)i;
+
+            Track track = tracks.OrderBy(t => t.StartSector).LastOrDefault(t => i >= t.StartSector);
+
+            blocksToRead = 0;
+            bool inData = nextData;
+
+            for(ulong j = i; j < i + _maximumReadable; j++)
+            {
+                if(j > (ulong)lastSector)
                 {
-                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    UpdateStatus?.Invoke("Aborted!");
-                    _dumpLog.WriteLine("Aborted!");
+                    if(!failedCrossingLeadOut &&
+                       !inData)
+                        blocksToRead += (uint)sectorsForOffset;
+
+                    if(sectorsForOffset > 0 &&
+                       !inData)
+                        crossingLeadOut = true;
 
                     break;
                 }
 
-                while(leadOutExtents.Contains(i))
+                if(nextData)
                 {
-                    skippingLead = true;
-                    i++;
-                }
-
-                if((long)i > lastSector)
-                    break;
-
-                uint firstSectorToRead = (uint)i;
-
-                Track track = tracks.OrderBy(t => t.StartSector).LastOrDefault(t => i >= t.StartSector);
-
-                blocksToRead = 0;
-                bool inData = nextData;
-
-                for(ulong j = i; j < i + _maximumReadable; j++)
-                {
-                    if(j > (ulong)lastSector)
+                    if(audioExtents.Contains(j))
                     {
-                        if(!failedCrossingLeadOut &&
-                           !inData)
-                            blocksToRead += (uint)sectorsForOffset;
-
-                        if(sectorsForOffset > 0 &&
-                           !inData)
-                            crossingLeadOut = true;
+                        nextData = false;
 
                         break;
                     }
 
-                    if(nextData)
+                    blocksToRead++;
+                }
+                else
+                {
+                    if(!audioExtents.Contains(j))
                     {
-                        if(audioExtents.Contains(j))
-                        {
-                            nextData = false;
+                        nextData = true;
 
-                            break;
-                        }
-
-                        blocksToRead++;
+                        break;
                     }
+
+                    blocksToRead++;
+                }
+            }
+
+            if(track.Sequence                             != 0 &&
+               i + blocksToRead - (ulong)sectorsForOffset > track.EndSector + 1)
+                blocksToRead = (uint)(track.EndSector + 1 - i + (ulong)sectorsForOffset);
+
+            if(blocksToRead == 1 &&
+               !inData)
+                blocksToRead += (uint)sectorsForOffset;
+
+            if(blocksToRead == 0)
+            {
+                if(!skippingLead)
+                    i += (ulong)sectorsForOffset;
+
+                skippingLead = false;
+
+                continue;
+            }
+
+            if(_fixOffset && !inData)
+            {
+                if(offsetBytes < 0)
+                {
+                    if(i == 0)
+                        firstSectorToRead = uint.MaxValue - (uint)(sectorsForOffset - 1); // -1
                     else
+                        firstSectorToRead -= (uint)sectorsForOffset;
+
+                    if(blocksToRead <= sectorsForOffset)
+                        blocksToRead += (uint)sectorsForOffset;
+                }
+            }
+
+            if(!inData &&
+               currentReadSpeed == 0xFFFF)
+            {
+                _dumpLog.WriteLine("Setting speed to 8x for audio reading.");
+                UpdateStatus?.Invoke("Setting speed to 8x for audio reading.");
+
+                _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, 1416, 0, _dev.Timeout, out _);
+
+                currentReadSpeed = 1200;
+            }
+
+            if(inData && currentReadSpeed != _speed)
+            {
+                _dumpLog.WriteLine($"Setting speed to {(_speed == 0xFFFF ? "MAX for data reading" : $"{_speed}x")}.");
+
+                UpdateStatus?.
+                    Invoke($"Setting speed to {(_speed == 0xFFFF ? "MAX for data reading" : $"{_speed}x")}.");
+
+                _speed *= _speedMultiplier;
+
+                if(_speed == 0 ||
+                   _speed > 0xFFFF)
+                    _speed = 0xFFFF;
+
+                currentReadSpeed = _speed;
+
+                _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, (ushort)_speed, 0, _dev.Timeout, out _);
+            }
+
+            if(inData && crossingLeadOut)
+            {
+                firstSectorToRead = (uint)i;
+                blocksToRead      = (uint)(lastSector - firstSectorToRead) + 1;
+                crossingLeadOut   = false;
+            }
+
+            if(currentSpeed > maxSpeed &&
+               currentSpeed > 0)
+                maxSpeed = currentSpeed;
+
+            if(currentSpeed < minSpeed &&
+               currentSpeed > 0)
+                minSpeed = currentSpeed;
+
+            UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
+                                   (long)blocks);
+
+            if(crossingLeadOut       &&
+               failedCrossingLeadOut &&
+               blocksToRead > 1)
+                blocksToRead--;
+
+            if(_supportsPlextorD8 && !inData)
+            {
+                sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf, firstSectorToRead, blockSize,
+                                                  blocksToRead, supportedPlextorSubchannel, out cmdDuration);
+
+                totalDuration += cmdDuration;
+            }
+            else if(readcd)
+            {
+                if(inData)
+                {
+                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, blocksToRead,
+                                        MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                        true, true, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
+                                        out cmdDuration);
+
+                    if(sense)
                     {
-                        if(!audioExtents.Contains(j))
+                        DecodedSense? decSense = Sense.Decode(senseBuf);
+
+                        // Try to workaround firmware
+                        if(decSense?.ASC == 0x64)
                         {
-                            nextData = true;
+                            bool goBackTrackTypeChange = false;
 
-                            break;
-                        }
-
-                        blocksToRead++;
-                    }
-                }
-
-                if(track.Sequence                        != 0 &&
-                   i + blocksToRead - (ulong)sectorsForOffset > track.EndSector + 1)
-                    blocksToRead = (uint)(track.EndSector + 1 - i + (ulong)sectorsForOffset);
-
-                if(blocksToRead == 1 &&
-                   !inData)
-                    blocksToRead += (uint)sectorsForOffset;
-
-                if(blocksToRead == 0)
-                {
-                    if(!skippingLead)
-                        i += (ulong)sectorsForOffset;
-
-                    skippingLead = false;
-
-                    continue;
-                }
-
-                if(_fixOffset && !inData)
-                {
-                    if(offsetBytes < 0)
-                    {
-                        if(i == 0)
-                            firstSectorToRead = uint.MaxValue - (uint)(sectorsForOffset - 1); // -1
-                        else
-                            firstSectorToRead -= (uint)sectorsForOffset;
-
-                        if(blocksToRead <= sectorsForOffset)
-                            blocksToRead += (uint)sectorsForOffset;
-                    }
-                }
-
-                if(!inData &&
-                   currentReadSpeed == 0xFFFF)
-                {
-                    _dumpLog.WriteLine("Setting speed to 8x for audio reading.");
-                    UpdateStatus?.Invoke("Setting speed to 8x for audio reading.");
-
-                    _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, 1416, 0, _dev.Timeout, out _);
-
-                    currentReadSpeed = 1200;
-                }
-
-                if(inData && currentReadSpeed != _speed)
-                {
-                    _dumpLog.WriteLine($"Setting speed to {(_speed == 0xFFFF ? "MAX for data reading" : $"{_speed}x")}.");
-
-                    UpdateStatus?.
-                        Invoke($"Setting speed to {(_speed == 0xFFFF ? "MAX for data reading" : $"{_speed}x")}.");
-
-                    _speed *= _speedMultiplier;
-
-                    if(_speed == 0 ||
-                       _speed > 0xFFFF)
-                        _speed = 0xFFFF;
-
-                    currentReadSpeed = _speed;
-
-                    _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, (ushort)_speed, 0, _dev.Timeout, out _);
-                }
-
-                if(inData && crossingLeadOut)
-                {
-                    firstSectorToRead = (uint)i;
-                    blocksToRead      = (uint)(lastSector - firstSectorToRead) + 1;
-                    crossingLeadOut   = false;
-                }
-
-                if(currentSpeed > maxSpeed &&
-                   currentSpeed > 0)
-                    maxSpeed = currentSpeed;
-
-                if(currentSpeed < minSpeed &&
-                   currentSpeed > 0)
-                    minSpeed = currentSpeed;
-
-                UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
-                                       (long)blocks);
-
-                if(crossingLeadOut       &&
-                   failedCrossingLeadOut &&
-                   blocksToRead > 1)
-                    blocksToRead--;
-
-                if(_supportsPlextorD8 && !inData)
-                {
-                    sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf, firstSectorToRead, blockSize,
-                                                      blocksToRead, supportedPlextorSubchannel, out cmdDuration);
-
-                    totalDuration += cmdDuration;
-                }
-                else if(readcd)
-                {
-                    if(inData)
-                    {
-                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, blocksToRead,
-                                            MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                            true, true, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
-                                            out cmdDuration);
-
-                        if(sense)
-                        {
-                            DecodedSense? decSense = Sense.Decode(senseBuf);
-
-                            // Try to workaround firmware
-                            if(decSense?.ASC == 0x64)
+                            // Go one for one as the drive does not tell us which one failed
+                            for(int bi = 0; bi < blocksToRead; bi++)
                             {
-                                bool goBackTrackTypeChange = false;
-
-                                // Go one for one as the drive does not tell us which one failed
-                                for(int bi = 0; bi < blocksToRead; bi++)
-                                {
-                                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)(firstSectorToRead + bi),
-                                                        blockSize, 1, MmcSectorTypes.AllTypes, false, false, true,
-                                                        MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                                        supportedSubchannel, _dev.Timeout, out double cmdDuration2);
-
-                                    cmdDuration += cmdDuration2;
-
-                                    if(!sense             &&
-                                       cmdBuf[0]  == 0x00 &&
-                                       cmdBuf[1]  == 0xFF &&
-                                       cmdBuf[2]  == 0xFF &&
-                                       cmdBuf[3]  == 0xFF &&
-                                       cmdBuf[4]  == 0xFF &&
-                                       cmdBuf[5]  == 0xFF &&
-                                       cmdBuf[6]  == 0xFF &&
-                                       cmdBuf[7]  == 0xFF &&
-                                       cmdBuf[8]  == 0xFF &&
-                                       cmdBuf[9]  == 0xFF &&
-                                       cmdBuf[10] == 0xFF &&
-                                       cmdBuf[11] == 0x00)
-                                        continue;
-
-                                    // Set those sectors as audio
-                                    for(int bip = bi; bip < blocksToRead; bip++)
-                                        audioExtents.Add((ulong)(firstSectorToRead + bip));
-
-                                    goBackTrackTypeChange = true;
-
-                                    break;
-                                }
-
-                                // Go back to read again
-                                if(goBackTrackTypeChange)
-                                {
-                                    blocksToRead = 0;
-                                    nextData     = true;
-
-                                    continue;
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, blocksToRead,
-                                            MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                            MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
-
-                        if(sense)
-                        {
-                            DecodedSense? decSense = Sense.Decode(senseBuf);
-
-                            // Try to workaround firmware
-                            if((decSense?.ASC == 0x11 && decSense?.ASCQ == 0x05) ||
-                               decSense?.ASC == 0x64)
-                            {
-                                sense = _dev.ReadCd(out cmdBuf, out _, firstSectorToRead, blockSize, blocksToRead,
-                                                    MmcSectorTypes.AllTypes, false, false, true,
+                                sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)(firstSectorToRead + bi),
+                                                    blockSize, 1, MmcSectorTypes.AllTypes, false, false, true,
                                                     MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
                                                     supportedSubchannel, _dev.Timeout, out double cmdDuration2);
 
                                 cmdDuration += cmdDuration2;
-                            }
-                        }
-                    }
-
-                    totalDuration += cmdDuration;
-                }
-                else if(read16)
-                {
-                    sense = _dev.Read16(out cmdBuf, out senseBuf, 0, false, false, false, firstSectorToRead, blockSize,
-                                        0, blocksToRead, false, _dev.Timeout, out cmdDuration);
-                }
-                else if(read12)
-                {
-                    sense = _dev.Read12(out cmdBuf, out senseBuf, 0, false, false, false, false, firstSectorToRead,
-                                        blockSize, 0, blocksToRead, false, _dev.Timeout, out cmdDuration);
-                }
-                else if(read10)
-                {
-                    sense = _dev.Read10(out cmdBuf, out senseBuf, 0, false, false, false, false, firstSectorToRead,
-                                        blockSize, 0, (ushort)blocksToRead, _dev.Timeout, out cmdDuration);
-                }
-                else if(read6)
-                {
-                    sense = _dev.Read6(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, (byte)blocksToRead,
-                                       _dev.Timeout, out cmdDuration);
-                }
-
-                double elapsed;
-
-                // Overcome the track mode change drive error
-                if(inData    &&
-                   !nextData &&
-                   sense)
-                {
-                    for(uint r = 0; r < blocksToRead; r++)
-                    {
-                        UpdateProgress?.Invoke($"Reading sector {i + r} of {blocks} ({currentSpeed:F3} MiB/sec.)",
-                                               (long)i + r, (long)blocks);
-
-                        if(_supportsPlextorD8)
-                        {
-                            int adjustment = 0;
-
-                            if(offsetBytes < 0)
-                                adjustment = -sectorsForOffset;
-
-                            sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf,
-                                                              (uint)(firstSectorToRead + r + adjustment), blockSize,
-                                                              (uint)sectorsForOffset + 1, supportedPlextorSubchannel,
-                                                              out cmdDuration);
-
-                            totalDuration += cmdDuration;
-
-                            if(!sense)
-                            {
-                                uint sectorsForFix = (uint)(1 + sectorsForOffset);
-
-                                FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel,
-                                              ref sectorsForFix, subSize, ref cmdBuf, blockSize, false);
-
-                                // TODO: Implement sector validity
-                                cmdBuf = Sector.Scramble(cmdBuf);
-                            }
-                        }
-                        else if(readcd)
-                        {
-                            sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)(i + r), blockSize, 1,
-                                                MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                                true, true, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
-                                                out cmdDuration);
-
-                            totalDuration += cmdDuration;
-                        }
-                        else if(read16)
-                        {
-                            sense = _dev.Read16(out cmdBuf, out senseBuf, 0, false, true, false, i + r, blockSize, 0, 1,
-                                                false, _dev.Timeout, out cmdDuration);
-                        }
-                        else if(read12)
-                        {
-                            sense = _dev.Read12(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)(i + r),
-                                                blockSize, 0, 1, false, _dev.Timeout, out cmdDuration);
-                        }
-                        else if(read10)
-                        {
-                            sense = _dev.Read10(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)(i + r),
-                                                blockSize, 0, 1, _dev.Timeout, out cmdDuration);
-                        }
-                        else if(read6)
-                        {
-                            sense = _dev.Read6(out cmdBuf, out senseBuf, (uint)(i + r), blockSize, 1, _dev.Timeout,
-                                               out cmdDuration);
-                        }
-
-                        if(!sense &&
-                           !_dev.Error)
-                        {
-                            mhddLog.Write(i + r, cmdDuration);
-                            ibgLog.Write(i  + r, currentSpeed * 1024);
-                            extents.Add(i   + r, 1, true);
-                            DateTime writeStart = DateTime.Now;
-
-                            if(supportedSubchannel != MmcSubchannel.None)
-                            {
-                                byte[] data = new byte[sectorSize];
-                                byte[] sub  = new byte[subSize];
-
-                                Array.Copy(cmdBuf, 0, data, 0, sectorSize);
-
-                                Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
-
-                                if(supportsLongSectors)
-                                    outputFormat.WriteSectorsLong(data, i + r, 1);
-                                else
-                                {
-                                    var    cooked = new MemoryStream();
-                                    byte[] sector = new byte[sectorSize];
-
-                                    for(int b = 0; b < blocksToRead; b++)
-                                    {
-                                        Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), sector, 0, sectorSize);
-                                        byte[] cookedSector = Sector.GetUserData(sector);
-                                        cooked.Write(cookedSector, 0, cookedSector.Length);
-                                    }
-
-                                    outputFormat.WriteSectors(cooked.ToArray(), i, blocksToRead);
-                                }
-
-                                bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
-                                    desiredSubchannel, sub, i + r, 1, subLog, isrcs, (byte)track.Sequence,
-                                    ref mcn, tracks, subchannelExtents, _fixSubchannelPosition, outputFormat as IWritableOpticalImage,
-                                    _fixSubchannel, _fixSubchannelCrc, _dumpLog, UpdateStatus,
-                                    smallestPregapLbaPerTrack, true);
-
-                                // Set tracks and go back
-                                if(indexesChanged)
-                                {
-                                    (outputFormat as IWritableOpticalImage).SetTracks(tracks.ToList());
-                                    i -= blocksToRead;
 
+                                if(!sense             &&
+                                   cmdBuf[0]  == 0x00 &&
+                                   cmdBuf[1]  == 0xFF &&
+                                   cmdBuf[2]  == 0xFF &&
+                                   cmdBuf[3]  == 0xFF &&
+                                   cmdBuf[4]  == 0xFF &&
+                                   cmdBuf[5]  == 0xFF &&
+                                   cmdBuf[6]  == 0xFF &&
+                                   cmdBuf[7]  == 0xFF &&
+                                   cmdBuf[8]  == 0xFF &&
+                                   cmdBuf[9]  == 0xFF &&
+                                   cmdBuf[10] == 0xFF &&
+                                   cmdBuf[11] == 0x00)
                                     continue;
-                                }
+
+                                // Set those sectors as audio
+                                for(int bip = bi; bip < blocksToRead; bip++)
+                                    audioExtents.Add((ulong)(firstSectorToRead + bip));
+
+                                goBackTrackTypeChange = true;
+
+                                break;
                             }
-                            else
+
+                            // Go back to read again
+                            if(goBackTrackTypeChange)
                             {
-                                if(supportsLongSectors)
-                                    outputFormat.WriteSectorsLong(cmdBuf, i + r, 1);
-                                else
-                                {
-                                    var    cooked = new MemoryStream();
-                                    byte[] sector = new byte[sectorSize];
+                                blocksToRead = 0;
+                                nextData     = true;
 
-                                    for(int b = 0; b < blocksToRead; b++)
-                                    {
-                                        Array.Copy(cmdBuf, (int)(b * sectorSize), sector, 0, sectorSize);
-                                        byte[] cookedSector = Sector.GetUserData(sector);
-                                        cooked.Write(cookedSector, 0, cookedSector.Length);
-                                    }
-
-                                    outputFormat.WriteSectors(cooked.ToArray(), i, blocksToRead);
-                                }
+                                continue;
                             }
-
-                            imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                        }
-                        else
-                        {
-                            _errorLog?.WriteLine(i + r, _dev.Error, _dev.LastError, senseBuf);
-
-                            // Write empty data
-                            DateTime writeStart = DateTime.Now;
-
-                            if(supportedSubchannel != MmcSubchannel.None)
-                            {
-                                outputFormat.WriteSectorsLong(new byte[sectorSize], i + r, 1);
-
-                                if(desiredSubchannel != MmcSubchannel.None)
-                                    outputFormat.WriteSectorsTag(new byte[subSize], i + r, 1,
-                                                                  SectorTagType.CdSectorSubchannel);
-                            }
-                            else
-                            {
-                                if(supportsLongSectors)
-                                    outputFormat.WriteSectorsLong(new byte[blockSize], i + r, 1);
-                                else
-                                {
-                                    if(cmdBuf.Length % sectorSize == 0)
-                                        outputFormat.WriteSectors(new byte[2048], i + r, 1);
-                                    else
-                                        outputFormat.WriteSectorsLong(new byte[blockSize], i + r, 1);
-                                }
-                            }
-
-                            imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-
-                            _resume.BadBlocks.Add(i + r);
-
-                            AaruConsole.DebugWriteLine("Dump-Media", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
-                            mhddLog.Write(i + r, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                            ibgLog.Write(i                                                         + r, 0);
-                            _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", 1, i + r);
-                            newTrim = true;
-                        }
-
-                        sectorSpeedStart += r;
-
-                        _resume.NextBlock = i + r;
-
-                        elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                        if(elapsed <= 0)
-                            continue;
-
-                        currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                        sectorSpeedStart = 0;
-                        timeSpeedStart   = DateTime.UtcNow;
-                    }
-
-                    continue;
-                }
-
-                if(!sense &&
-                   !_dev.Error)
-                {
-                    if(crossingLeadOut && failedCrossingLeadOut)
-                    {
-                        byte[] tmp = new byte[cmdBuf.Length + blockSize];
-                        Array.Copy(cmdBuf, 0, tmp, 0, cmdBuf.Length);
-                    }
-
-                    // Because one block has been partially used to fix the offset
-                    if(_fixOffset &&
-                       !inData    &&
-                       offsetBytes != 0)
-                        FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel, ref blocksToRead,
-                                      subSize, ref cmdBuf, blockSize, failedCrossingLeadOut);
-
-                    mhddLog.Write(i, cmdDuration);
-                    ibgLog.Write(i, currentSpeed * 1024);
-                    extents.Add(i, blocksToRead, true);
-                    DateTime writeStart = DateTime.Now;
-
-                    if(supportedSubchannel != MmcSubchannel.None)
-                    {
-                        byte[] data = new byte[sectorSize * blocksToRead];
-                        byte[] sub  = new byte[subSize    * blocksToRead];
-
-                        for(int b = 0; b < blocksToRead; b++)
-                        {
-                            Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b, sectorSize);
-
-                            Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize * b, subSize);
-                        }
-
-                        if(supportsLongSectors)
-                            outputFormat.WriteSectorsLong(data, i, blocksToRead);
-                        else
-                        {
-                            var    cooked = new MemoryStream();
-                            byte[] sector = new byte[sectorSize];
-
-                            for(int b = 0; b < blocksToRead; b++)
-                            {
-                                Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), sector, 0, sectorSize);
-                                byte[] cookedSector = Sector.GetUserData(sector);
-                                cooked.Write(cookedSector, 0, cookedSector.Length);
-                            }
-
-                            outputFormat.WriteSectors(cooked.ToArray(), i, blocksToRead);
-                        }
-
-                        bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
-                            desiredSubchannel, sub, i, blocksToRead, subLog, isrcs, (byte)track.Sequence,
-                            ref mcn, tracks, subchannelExtents, _fixSubchannelPosition, outputFormat as IWritableOpticalImage,
-                            _fixSubchannel, _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack,
-                            true);
-
-                        // Set tracks and go back
-                        if(indexesChanged)
-                        {
-                            (outputFormat as IWritableOpticalImage).SetTracks(tracks.ToList());
-                            i -= blocksToRead;
-
-                            continue;
                         }
                     }
-                    else
-                    {
-                        if(supportsLongSectors)
-                            outputFormat.WriteSectorsLong(cmdBuf, i, blocksToRead);
-                        else
-                        {
-                            var    cooked = new MemoryStream();
-                            byte[] sector = new byte[sectorSize];
-
-                            for(int b = 0; b < blocksToRead; b++)
-                            {
-                                Array.Copy(cmdBuf, (int)(b * sectorSize), sector, 0, sectorSize);
-                                byte[] cookedSector = Sector.GetUserData(sector);
-                                cooked.Write(cookedSector, 0, cookedSector.Length);
-                            }
-
-                            outputFormat.WriteSectors(cooked.ToArray(), i, blocksToRead);
-                        }
-                    }
-
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
                 }
                 else
                 {
-                    if(crossingLeadOut && Sense.Decode(senseBuf)?.ASC == 0x21)
+                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, blocksToRead,
+                                        MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
+                                        MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
+
+                    if(sense)
                     {
-                        if(failedCrossingLeadOut)
-                            break;
+                        DecodedSense? decSense = Sense.Decode(senseBuf);
 
-                        failedCrossingLeadOut = true;
-                        blocksToRead          = 0;
-
-                        continue;
-                    }
-
-                    _errorLog?.WriteLine(firstSectorToRead, _dev.Error, _dev.LastError, senseBuf);
-
-                    // TODO: Reset device after X errors
-                    if(_stopOnError)
-                        return; // TODO: Return more cleanly
-
-                    if(i + _skip > blocks)
-                        _skip = (uint)(blocks - i);
-
-                    // Write empty data
-                    DateTime writeStart = DateTime.Now;
-
-                    if(supportedSubchannel != MmcSubchannel.None)
-                    {
-                        outputFormat.WriteSectorsLong(new byte[sectorSize * _skip], i, _skip);
-
-                        if(desiredSubchannel != MmcSubchannel.None)
-                            outputFormat.WriteSectorsTag(new byte[subSize * _skip], i, _skip,
-                                                          SectorTagType.CdSectorSubchannel);
-                    }
-                    else
-                    {
-                        if(supportsLongSectors)
+                        // Try to workaround firmware
+                        if((decSense?.ASC == 0x11 && decSense?.ASCQ == 0x05) ||
+                           decSense?.ASC == 0x64)
                         {
-                            outputFormat.WriteSectorsLong(new byte[blockSize * _skip], i, _skip);
+                            sense = _dev.ReadCd(out cmdBuf, out _, firstSectorToRead, blockSize, blocksToRead,
+                                                MmcSectorTypes.AllTypes, false, false, true,
+                                                MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                                supportedSubchannel, _dev.Timeout, out double cmdDuration2);
+
+                            cmdDuration += cmdDuration2;
+                        }
+                    }
+                }
+
+                totalDuration += cmdDuration;
+            }
+            else if(read16)
+            {
+                sense = _dev.Read16(out cmdBuf, out senseBuf, 0, false, false, false, firstSectorToRead, blockSize,
+                                    0, blocksToRead, false, _dev.Timeout, out cmdDuration);
+            }
+            else if(read12)
+            {
+                sense = _dev.Read12(out cmdBuf, out senseBuf, 0, false, false, false, false, firstSectorToRead,
+                                    blockSize, 0, blocksToRead, false, _dev.Timeout, out cmdDuration);
+            }
+            else if(read10)
+            {
+                sense = _dev.Read10(out cmdBuf, out senseBuf, 0, false, false, false, false, firstSectorToRead,
+                                    blockSize, 0, (ushort)blocksToRead, _dev.Timeout, out cmdDuration);
+            }
+            else if(read6)
+            {
+                sense = _dev.Read6(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, (byte)blocksToRead,
+                                   _dev.Timeout, out cmdDuration);
+            }
+
+            double elapsed;
+
+            // Overcome the track mode change drive error
+            if(inData    &&
+               !nextData &&
+               sense)
+            {
+                for(uint r = 0; r < blocksToRead; r++)
+                {
+                    UpdateProgress?.Invoke($"Reading sector {i + r} of {blocks} ({currentSpeed:F3} MiB/sec.)",
+                                           (long)i + r, (long)blocks);
+
+                    if(_supportsPlextorD8)
+                    {
+                        int adjustment = 0;
+
+                        if(offsetBytes < 0)
+                            adjustment = -sectorsForOffset;
+
+                        sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf,
+                                                          (uint)(firstSectorToRead + r + adjustment), blockSize,
+                                                          (uint)sectorsForOffset + 1, supportedPlextorSubchannel,
+                                                          out cmdDuration);
+
+                        totalDuration += cmdDuration;
+
+                        if(!sense)
+                        {
+                            uint sectorsForFix = (uint)(1 + sectorsForOffset);
+
+                            FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel,
+                                          ref sectorsForFix, subSize, ref cmdBuf, blockSize, false);
+
+                            // TODO: Implement sector validity
+                            cmdBuf = Sector.Scramble(cmdBuf);
+                        }
+                    }
+                    else if(readcd)
+                    {
+                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)(i + r), blockSize, 1,
+                                            MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                            true, true, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
+                                            out cmdDuration);
+
+                        totalDuration += cmdDuration;
+                    }
+                    else if(read16)
+                    {
+                        sense = _dev.Read16(out cmdBuf, out senseBuf, 0, false, true, false, i + r, blockSize, 0, 1,
+                                            false, _dev.Timeout, out cmdDuration);
+                    }
+                    else if(read12)
+                    {
+                        sense = _dev.Read12(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)(i + r),
+                                            blockSize, 0, 1, false, _dev.Timeout, out cmdDuration);
+                    }
+                    else if(read10)
+                    {
+                        sense = _dev.Read10(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)(i + r),
+                                            blockSize, 0, 1, _dev.Timeout, out cmdDuration);
+                    }
+                    else if(read6)
+                    {
+                        sense = _dev.Read6(out cmdBuf, out senseBuf, (uint)(i + r), blockSize, 1, _dev.Timeout,
+                                           out cmdDuration);
+                    }
+
+                    if(!sense &&
+                       !_dev.Error)
+                    {
+                        mhddLog.Write(i + r, cmdDuration);
+                        ibgLog.Write(i  + r, currentSpeed * 1024);
+                        extents.Add(i   + r, 1, true);
+                        DateTime writeStart = DateTime.Now;
+
+                        if(supportedSubchannel != MmcSubchannel.None)
+                        {
+                            byte[] data = new byte[sectorSize];
+                            byte[] sub  = new byte[subSize];
+
+                            Array.Copy(cmdBuf, 0, data, 0, sectorSize);
+
+                            Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
+
+                            if(supportsLongSectors)
+                                outputFormat.WriteSectorsLong(data, i + r, 1);
+                            else
+                            {
+                                var    cooked = new MemoryStream();
+                                byte[] sector = new byte[sectorSize];
+
+                                for(int b = 0; b < blocksToRead; b++)
+                                {
+                                    Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), sector, 0, sectorSize);
+                                    byte[] cookedSector = Sector.GetUserData(sector);
+                                    cooked.Write(cookedSector, 0, cookedSector.Length);
+                                }
+
+                                outputFormat.WriteSectors(cooked.ToArray(), i, blocksToRead);
+                            }
+
+                            bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
+                                desiredSubchannel, sub, i + r, 1, subLog, isrcs, (byte)track.Sequence,
+                                ref mcn, tracks, subchannelExtents, _fixSubchannelPosition, outputFormat as IWritableOpticalImage,
+                                _fixSubchannel, _fixSubchannelCrc, _dumpLog, UpdateStatus,
+                                smallestPregapLbaPerTrack, true);
+
+                            // Set tracks and go back
+                            if(indexesChanged)
+                            {
+                                (outputFormat as IWritableOpticalImage).SetTracks(tracks.ToList());
+                                i -= blocksToRead;
+
+                                continue;
+                            }
                         }
                         else
                         {
-                            if(cmdBuf.Length % sectorSize == 0)
-                                outputFormat.WriteSectors(new byte[2048 * _skip], i, _skip);
+                            if(supportsLongSectors)
+                                outputFormat.WriteSectorsLong(cmdBuf, i + r, 1);
                             else
-                                outputFormat.WriteSectorsLong(new byte[blockSize * _skip], i, _skip);
+                            {
+                                var    cooked = new MemoryStream();
+                                byte[] sector = new byte[sectorSize];
+
+                                for(int b = 0; b < blocksToRead; b++)
+                                {
+                                    Array.Copy(cmdBuf, (int)(b * sectorSize), sector, 0, sectorSize);
+                                    byte[] cookedSector = Sector.GetUserData(sector);
+                                    cooked.Write(cookedSector, 0, cookedSector.Length);
+                                }
+
+                                outputFormat.WriteSectors(cooked.ToArray(), i, blocksToRead);
+                            }
                         }
+
+                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                    }
+                    else
+                    {
+                        _errorLog?.WriteLine(i + r, _dev.Error, _dev.LastError, senseBuf);
+
+                        // Write empty data
+                        DateTime writeStart = DateTime.Now;
+
+                        if(supportedSubchannel != MmcSubchannel.None)
+                        {
+                            outputFormat.WriteSectorsLong(new byte[sectorSize], i + r, 1);
+
+                            if(desiredSubchannel != MmcSubchannel.None)
+                                outputFormat.WriteSectorsTag(new byte[subSize], i + r, 1,
+                                                             SectorTagType.CdSectorSubchannel);
+                        }
+                        else
+                        {
+                            if(supportsLongSectors)
+                                outputFormat.WriteSectorsLong(new byte[blockSize], i + r, 1);
+                            else
+                            {
+                                if(cmdBuf.Length % sectorSize == 0)
+                                    outputFormat.WriteSectors(new byte[2048], i + r, 1);
+                                else
+                                    outputFormat.WriteSectorsLong(new byte[blockSize], i + r, 1);
+                            }
+                        }
+
+                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+
+                        _resume.BadBlocks.Add(i + r);
+
+                        AaruConsole.DebugWriteLine("Dump-Media", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
+                        mhddLog.Write(i + r, cmdDuration < 500 ? 65535 : cmdDuration);
+
+                        ibgLog.Write(i                                                         + r, 0);
+                        _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", 1, i + r);
+                        newTrim = true;
                     }
 
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                    sectorSpeedStart += r;
 
-                    for(ulong b = i; b < i + _skip; b++)
-                        _resume.BadBlocks.Add(b);
+                    _resume.NextBlock = i + r;
 
-                    AaruConsole.DebugWriteLine("Dump-Media", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
-                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+                    elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
 
-                    ibgLog.Write(i, 0);
-                    _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
-                    i       += _skip - blocksToRead;
-                    newTrim =  true;
+                    if(elapsed <= 0)
+                        continue;
+
+                    currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+                    sectorSpeedStart = 0;
+                    timeSpeedStart   = DateTime.UtcNow;
                 }
 
-                sectorSpeedStart += blocksToRead;
-
-                _resume.NextBlock = i + blocksToRead;
-
-                elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                if(elapsed <= 0)
-                    continue;
-
-                currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                sectorSpeedStart = 0;
-                timeSpeedStart   = DateTime.UtcNow;
+                continue;
             }
 
-            EndProgress?.Invoke();
+            if(!sense &&
+               !_dev.Error)
+            {
+                if(crossingLeadOut && failedCrossingLeadOut)
+                {
+                    byte[] tmp = new byte[cmdBuf.Length + blockSize];
+                    Array.Copy(cmdBuf, 0, tmp, 0, cmdBuf.Length);
+                }
 
-            _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+                // Because one block has been partially used to fix the offset
+                if(_fixOffset &&
+                   !inData    &&
+                   offsetBytes != 0)
+                    FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel, ref blocksToRead,
+                                  subSize, ref cmdBuf, blockSize, failedCrossingLeadOut);
 
-            if(!failedCrossingLeadOut)
-                return;
+                mhddLog.Write(i, cmdDuration);
+                ibgLog.Write(i, currentSpeed * 1024);
+                extents.Add(i, blocksToRead, true);
+                DateTime writeStart = DateTime.Now;
 
-            _dumpLog.WriteLine("Failed crossing into Lead-Out, dump may not be correct.");
-            UpdateStatus?.Invoke("Failed crossing into Lead-Out, dump may not be correct.");
+                if(supportedSubchannel != MmcSubchannel.None)
+                {
+                    byte[] data = new byte[sectorSize * blocksToRead];
+                    byte[] sub  = new byte[subSize    * blocksToRead];
+
+                    for(int b = 0; b < blocksToRead; b++)
+                    {
+                        Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b, sectorSize);
+
+                        Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize * b, subSize);
+                    }
+
+                    if(supportsLongSectors)
+                        outputFormat.WriteSectorsLong(data, i, blocksToRead);
+                    else
+                    {
+                        var    cooked = new MemoryStream();
+                        byte[] sector = new byte[sectorSize];
+
+                        for(int b = 0; b < blocksToRead; b++)
+                        {
+                            Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), sector, 0, sectorSize);
+                            byte[] cookedSector = Sector.GetUserData(sector);
+                            cooked.Write(cookedSector, 0, cookedSector.Length);
+                        }
+
+                        outputFormat.WriteSectors(cooked.ToArray(), i, blocksToRead);
+                    }
+
+                    bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
+                        desiredSubchannel, sub, i, blocksToRead, subLog, isrcs, (byte)track.Sequence,
+                        ref mcn, tracks, subchannelExtents, _fixSubchannelPosition, outputFormat as IWritableOpticalImage,
+                        _fixSubchannel, _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack,
+                        true);
+
+                    // Set tracks and go back
+                    if(indexesChanged)
+                    {
+                        (outputFormat as IWritableOpticalImage).SetTracks(tracks.ToList());
+                        i -= blocksToRead;
+
+                        continue;
+                    }
+                }
+                else
+                {
+                    if(supportsLongSectors)
+                        outputFormat.WriteSectorsLong(cmdBuf, i, blocksToRead);
+                    else
+                    {
+                        var    cooked = new MemoryStream();
+                        byte[] sector = new byte[sectorSize];
+
+                        for(int b = 0; b < blocksToRead; b++)
+                        {
+                            Array.Copy(cmdBuf, (int)(b * sectorSize), sector, 0, sectorSize);
+                            byte[] cookedSector = Sector.GetUserData(sector);
+                            cooked.Write(cookedSector, 0, cookedSector.Length);
+                        }
+
+                        outputFormat.WriteSectors(cooked.ToArray(), i, blocksToRead);
+                    }
+                }
+
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+            }
+            else
+            {
+                if(crossingLeadOut && Sense.Decode(senseBuf)?.ASC == 0x21)
+                {
+                    if(failedCrossingLeadOut)
+                        break;
+
+                    failedCrossingLeadOut = true;
+                    blocksToRead          = 0;
+
+                    continue;
+                }
+
+                _errorLog?.WriteLine(firstSectorToRead, _dev.Error, _dev.LastError, senseBuf);
+
+                // TODO: Reset device after X errors
+                if(_stopOnError)
+                    return; // TODO: Return more cleanly
+
+                if(i + _skip > blocks)
+                    _skip = (uint)(blocks - i);
+
+                // Write empty data
+                DateTime writeStart = DateTime.Now;
+
+                if(supportedSubchannel != MmcSubchannel.None)
+                {
+                    outputFormat.WriteSectorsLong(new byte[sectorSize * _skip], i, _skip);
+
+                    if(desiredSubchannel != MmcSubchannel.None)
+                        outputFormat.WriteSectorsTag(new byte[subSize * _skip], i, _skip,
+                                                     SectorTagType.CdSectorSubchannel);
+                }
+                else
+                {
+                    if(supportsLongSectors)
+                    {
+                        outputFormat.WriteSectorsLong(new byte[blockSize * _skip], i, _skip);
+                    }
+                    else
+                    {
+                        if(cmdBuf.Length % sectorSize == 0)
+                            outputFormat.WriteSectors(new byte[2048 * _skip], i, _skip);
+                        else
+                            outputFormat.WriteSectorsLong(new byte[blockSize * _skip], i, _skip);
+                    }
+                }
+
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+
+                for(ulong b = i; b < i + _skip; b++)
+                    _resume.BadBlocks.Add(b);
+
+                AaruConsole.DebugWriteLine("Dump-Media", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
+                mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+
+                ibgLog.Write(i, 0);
+                _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
+                i       += _skip - blocksToRead;
+                newTrim =  true;
+            }
+
+            sectorSpeedStart += blocksToRead;
+
+            _resume.NextBlock = i + blocksToRead;
+
+            elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+            if(elapsed <= 0)
+                continue;
+
+            currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+            sectorSpeedStart = 0;
+            timeSpeedStart   = DateTime.UtcNow;
         }
+
+        EndProgress?.Invoke();
+
+        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+
+        if(!failedCrossingLeadOut)
+            return;
+
+        _dumpLog.WriteLine("Failed crossing into Lead-Out, dump may not be correct.");
+        UpdateStatus?.Invoke("Failed crossing into Lead-Out, dump may not be correct.");
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
index eb931d17a..5039351b6 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Dump.cs
@@ -53,1006 +53,994 @@ using Version = Aaru.CommonTypes.Interop.Version;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+/// <summary>Implement dumping Compact Discs</summary>
+
+// TODO: Barcode
+sealed partial class Dump
 {
-    /// <summary>Implement dumping Compact Discs</summary>
-
-    // TODO: Barcode
-    sealed partial class Dump
+    /// <summary>Dumps a compact disc</summary>
+    void CompactDisc()
     {
-        /// <summary>Dumps a compact disc</summary>
-        void CompactDisc()
+        ExtentsULong             audioExtents;                        // Extents with audio sectors
+        ulong                    blocks;                              // Total number of positive sectors
+        uint                     blockSize;                           // Size of the read sector in bytes
+        CdOffset                 cdOffset;                            // Read offset from database
+        byte[]                   cmdBuf;                              // Data buffer
+        DumpHardwareType         currentTry   = null;                 // Current dump hardware try
+        double                   currentSpeed = 0;                    // Current read speed
+        int?                     discOffset   = null;                 // Disc write offset
+        DateTime                 dumpStart    = DateTime.UtcNow;      // Time of dump start
+        DateTime                 end;                                 // Time of operation end
+        ExtentsULong             extents = null;                      // Extents
+        bool                     hiddenData;                          // Hidden track is data
+        IbgLog                   ibgLog;                              // IMGBurn log
+        double                   imageWriteDuration = 0;              // Duration of image write
+        long                     lastSector;                          // Last sector number
+        var                      leadOutExtents = new ExtentsULong(); // Lead-out extents
+        Dictionary<int, long>    leadOutStarts  = new();              // Lead-out starts
+        double                   maxSpeed       = double.MinValue;    // Maximum speed
+        MhddLog                  mhddLog;                             // MHDD log
+        double                   minSpeed = double.MaxValue;          // Minimum speed
+        bool                     newTrim;                             // Is trim a new one?
+        int                      offsetBytes = 0;                     // Read offset
+        bool                     read6       = false;                 // Device supports READ(6)
+        bool                     read10      = false;                 // Device supports READ(10)
+        bool                     read12      = false;                 // Device supports READ(12)
+        bool                     read16      = false;                 // Device supports READ(16)
+        bool                     readcd;                              // Device supports READ CD
+        bool                     ret;                                 // Image writing return status
+        const uint               sectorSize       = 2352;             // Full sector size
+        int                      sectorsForOffset = 0;                // Sectors needed to fix offset
+        bool                     sense            = true;             // Sense indicator
+        int                      sessions;                            // Number of sessions in disc
+        DateTime                 start;                               // Start of operation
+        SubchannelLog            subLog = null;                       // Subchannel log
+        uint                     subSize;                             // Subchannel size in bytes
+        TrackSubchannelType      subType;                             // Track subchannel type
+        bool                     supportsLongSectors = true;          // Supports reading EDC and ECC
+        bool                     supportsPqSubchannel;                // Supports reading PQ subchannel
+        bool                     supportsRwSubchannel;                // Supports reading RW subchannel
+        byte[]                   tmpBuf;                              // Temporary buffer
+        FullTOC.CDFullTOC?       toc;                                 // Full CD TOC
+        double                   totalDuration = 0;                   // Total commands duration
+        Dictionary<byte, byte>   trackFlags    = new();               // Track flags
+        Track[]                  tracks;                              // Tracks in disc
+        int                      firstTrackLastSession;               // Number of first track in last session
+        bool                     hiddenTrack;                         // Disc has a hidden track before track 1
+        MmcSubchannel            supportedSubchannel;                 // Drive's maximum supported subchannel
+        MmcSubchannel            desiredSubchannel;                   // User requested subchannel
+        bool                     bcdSubchannel       = false;         // Subchannel positioning is in BCD
+        Dictionary<byte, string> isrcs               = new();
+        string                   mcn                 = null;
+        HashSet<int>             subchannelExtents   = new();
+        bool                     cdiReadyReadAsAudio = false;
+        uint                     firstLba;
+        var                      outputOptical = _outputPlugin as IWritableOpticalImage;
+
+        Dictionary<MediaTagType, byte[]> mediaTags                 = new(); // Media tags
+        Dictionary<byte, int>            smallestPregapLbaPerTrack = new();
+
+        MediaType dskType = MediaType.CD;
+
+        if(_dumpRaw)
         {
-            ExtentsULong             audioExtents;                        // Extents with audio sectors
-            ulong                    blocks;                              // Total number of positive sectors
-            uint                     blockSize;                           // Size of the read sector in bytes
-            CdOffset                 cdOffset;                            // Read offset from database
-            byte[]                   cmdBuf;                              // Data buffer
-            DumpHardwareType         currentTry   = null;                 // Current dump hardware try
-            double                   currentSpeed = 0;                    // Current read speed
-            int?                     discOffset   = null;                 // Disc write offset
-            DateTime                 dumpStart    = DateTime.UtcNow;      // Time of dump start
-            DateTime                 end;                                 // Time of operation end
-            ExtentsULong             extents = null;                      // Extents
-            bool                     hiddenData;                          // Hidden track is data
-            IbgLog                   ibgLog;                              // IMGBurn log
-            double                   imageWriteDuration = 0;              // Duration of image write
-            long                     lastSector;                          // Last sector number
-            var                      leadOutExtents = new ExtentsULong(); // Lead-out extents
-            Dictionary<int, long>    leadOutStarts  = new();              // Lead-out starts
-            double                   maxSpeed       = double.MinValue;    // Maximum speed
-            MhddLog                  mhddLog;                             // MHDD log
-            double                   minSpeed = double.MaxValue;          // Minimum speed
-            bool                     newTrim;                             // Is trim a new one?
-            int                      offsetBytes = 0;                     // Read offset
-            bool                     read6       = false;                 // Device supports READ(6)
-            bool                     read10      = false;                 // Device supports READ(10)
-            bool                     read12      = false;                 // Device supports READ(12)
-            bool                     read16      = false;                 // Device supports READ(16)
-            bool                     readcd;                              // Device supports READ CD
-            bool                     ret;                                 // Image writing return status
-            const uint               sectorSize       = 2352;             // Full sector size
-            int                      sectorsForOffset = 0;                // Sectors needed to fix offset
-            bool                     sense            = true;             // Sense indicator
-            int                      sessions;                            // Number of sessions in disc
-            DateTime                 start;                               // Start of operation
-            SubchannelLog            subLog = null;                       // Subchannel log
-            uint                     subSize;                             // Subchannel size in bytes
-            TrackSubchannelType      subType;                             // Track subchannel type
-            bool                     supportsLongSectors = true;          // Supports reading EDC and ECC
-            bool                     supportsPqSubchannel;                // Supports reading PQ subchannel
-            bool                     supportsRwSubchannel;                // Supports reading RW subchannel
-            byte[]                   tmpBuf;                              // Temporary buffer
-            FullTOC.CDFullTOC?       toc;                                 // Full CD TOC
-            double                   totalDuration = 0;                   // Total commands duration
-            Dictionary<byte, byte>   trackFlags    = new();               // Track flags
-            Track[]                  tracks;                              // Tracks in disc
-            int                      firstTrackLastSession;               // Number of first track in last session
-            bool                     hiddenTrack;                         // Disc has a hidden track before track 1
-            MmcSubchannel            supportedSubchannel;                 // Drive's maximum supported subchannel
-            MmcSubchannel            desiredSubchannel;                   // User requested subchannel
-            bool                     bcdSubchannel       = false;         // Subchannel positioning is in BCD
-            Dictionary<byte, string> isrcs               = new();
-            string                   mcn                 = null;
-            HashSet<int>             subchannelExtents   = new();
-            bool                     cdiReadyReadAsAudio = false;
-            uint                     firstLba;
-            var                      outputOptical = _outputPlugin as IWritableOpticalImage;
+            _dumpLog.WriteLine("Raw CD dumping not yet implemented");
+            StoppingErrorMessage?.Invoke("Raw CD dumping not yet implemented");
 
-            Dictionary<MediaTagType, byte[]> mediaTags                 = new(); // Media tags
-            Dictionary<byte, int>            smallestPregapLbaPerTrack = new();
+            return;
+        }
 
-            MediaType dskType = MediaType.CD;
+        tracks = GetCdTracks(_dev, _dumpLog, _force, out lastSector, leadOutStarts, mediaTags, StoppingErrorMessage,
+                             out toc, trackFlags, UpdateStatus);
 
-            if(_dumpRaw)
-            {
-                _dumpLog.WriteLine("Raw CD dumping not yet implemented");
-                StoppingErrorMessage?.Invoke("Raw CD dumping not yet implemented");
+        if(tracks is null)
+        {
+            _dumpLog.WriteLine("Could not get tracks!");
+            StoppingErrorMessage?.Invoke("Could not get tracks!");
 
-                return;
-            }
+            return;
+        }
 
-            tracks = GetCdTracks(_dev, _dumpLog, _force, out lastSector, leadOutStarts, mediaTags, StoppingErrorMessage,
-                                 out toc, trackFlags, UpdateStatus);
+        firstLba = (uint)tracks.Min(t => t.StartSector);
 
-            if(tracks is null)
-            {
-                _dumpLog.WriteLine("Could not get tracks!");
-                StoppingErrorMessage?.Invoke("Could not get tracks!");
+        // Check subchannels support
+        supportsPqSubchannel = SupportsPqSubchannel(_dev, _dumpLog, UpdateStatus, firstLba);
+        supportsRwSubchannel = SupportsRwSubchannel(_dev, _dumpLog, UpdateStatus, firstLba);
 
-                return;
-            }
+        if(supportsRwSubchannel)
+            supportedSubchannel = MmcSubchannel.Raw;
+        else if(supportsPqSubchannel)
+            supportedSubchannel = MmcSubchannel.Q16;
+        else
+            supportedSubchannel = MmcSubchannel.None;
 
-            firstLba = (uint)tracks.Min(t => t.StartSector);
-
-            // Check subchannels support
-            supportsPqSubchannel = SupportsPqSubchannel(_dev, _dumpLog, UpdateStatus, firstLba);
-            supportsRwSubchannel = SupportsRwSubchannel(_dev, _dumpLog, UpdateStatus, firstLba);
-
-            if(supportsRwSubchannel)
-                supportedSubchannel = MmcSubchannel.Raw;
-            else if(supportsPqSubchannel)
-                supportedSubchannel = MmcSubchannel.Q16;
-            else
-                supportedSubchannel = MmcSubchannel.None;
-
-            switch(_subchannel)
-            {
-                case DumpSubchannel.Any:
-                    if(supportsRwSubchannel)
-                        desiredSubchannel = MmcSubchannel.Raw;
-                    else if(supportsPqSubchannel)
-                        desiredSubchannel = MmcSubchannel.Q16;
-                    else
-                        desiredSubchannel = MmcSubchannel.None;
-
-                    break;
-                case DumpSubchannel.Rw:
-                    if(supportsRwSubchannel)
-                        desiredSubchannel = MmcSubchannel.Raw;
-                    else
-                    {
-                        _dumpLog.WriteLine("Drive does not support the requested subchannel format, not continuing...");
-
-                        StoppingErrorMessage?.
-                            Invoke("Drive does not support the requested subchannel format, not continuing...");
-
-                        return;
-                    }
-
-                    break;
-                case DumpSubchannel.RwOrPq:
-                    if(supportsRwSubchannel)
-                        desiredSubchannel = MmcSubchannel.Raw;
-                    else if(supportsPqSubchannel)
-                        desiredSubchannel = MmcSubchannel.Q16;
-                    else
-                    {
-                        _dumpLog.WriteLine("Drive does not support the requested subchannel format, not continuing...");
-
-                        StoppingErrorMessage?.
-                            Invoke("Drive does not support the requested subchannel format, not continuing...");
-
-                        return;
-                    }
-
-                    break;
-                case DumpSubchannel.Pq:
-                    if(supportsPqSubchannel)
-                        desiredSubchannel = MmcSubchannel.Q16;
-                    else
-                    {
-                        _dumpLog.WriteLine("Drive does not support the requested subchannel format, not continuing...");
-
-                        StoppingErrorMessage?.
-                            Invoke("Drive does not support the requested subchannel format, not continuing...");
-
-                        return;
-                    }
-
-                    break;
-                case DumpSubchannel.None:
+        switch(_subchannel)
+        {
+            case DumpSubchannel.Any:
+                if(supportsRwSubchannel)
+                    desiredSubchannel = MmcSubchannel.Raw;
+                else if(supportsPqSubchannel)
+                    desiredSubchannel = MmcSubchannel.Q16;
+                else
                     desiredSubchannel = MmcSubchannel.None;
 
-                    break;
-                default: throw new ArgumentOutOfRangeException();
-            }
-
-            if(desiredSubchannel == MmcSubchannel.Q16 && supportsPqSubchannel)
-                supportedSubchannel = MmcSubchannel.Q16;
-
-            // Check if output format supports subchannels
-            if(!outputOptical.SupportedSectorTags.Contains(SectorTagType.CdSectorSubchannel) &&
-               desiredSubchannel != MmcSubchannel.None)
-            {
-                if(_force || _subchannel == DumpSubchannel.None)
-                {
-                    _dumpLog.WriteLine("Output format does not support subchannels, continuing...");
-                    UpdateStatus?.Invoke("Output format does not support subchannels, continuing...");
-                }
+                break;
+            case DumpSubchannel.Rw:
+                if(supportsRwSubchannel)
+                    desiredSubchannel = MmcSubchannel.Raw;
                 else
                 {
-                    _dumpLog.WriteLine("Output format does not support subchannels, not continuing...");
-                    StoppingErrorMessage?.Invoke("Output format does not support subchannels, not continuing...");
+                    _dumpLog.WriteLine("Drive does not support the requested subchannel format, not continuing...");
+
+                    StoppingErrorMessage?.
+                        Invoke("Drive does not support the requested subchannel format, not continuing...");
 
                     return;
                 }
 
+                break;
+            case DumpSubchannel.RwOrPq:
+                if(supportsRwSubchannel)
+                    desiredSubchannel = MmcSubchannel.Raw;
+                else if(supportsPqSubchannel)
+                    desiredSubchannel = MmcSubchannel.Q16;
+                else
+                {
+                    _dumpLog.WriteLine("Drive does not support the requested subchannel format, not continuing...");
+
+                    StoppingErrorMessage?.
+                        Invoke("Drive does not support the requested subchannel format, not continuing...");
+
+                    return;
+                }
+
+                break;
+            case DumpSubchannel.Pq:
+                if(supportsPqSubchannel)
+                    desiredSubchannel = MmcSubchannel.Q16;
+                else
+                {
+                    _dumpLog.WriteLine("Drive does not support the requested subchannel format, not continuing...");
+
+                    StoppingErrorMessage?.
+                        Invoke("Drive does not support the requested subchannel format, not continuing...");
+
+                    return;
+                }
+
+                break;
+            case DumpSubchannel.None:
                 desiredSubchannel = MmcSubchannel.None;
-            }
 
-            switch(supportedSubchannel)
+                break;
+            default: throw new ArgumentOutOfRangeException();
+        }
+
+        if(desiredSubchannel == MmcSubchannel.Q16 && supportsPqSubchannel)
+            supportedSubchannel = MmcSubchannel.Q16;
+
+        // Check if output format supports subchannels
+        if(!outputOptical.SupportedSectorTags.Contains(SectorTagType.CdSectorSubchannel) &&
+           desiredSubchannel != MmcSubchannel.None)
+        {
+            if(_force || _subchannel == DumpSubchannel.None)
             {
-                case MmcSubchannel.None:
-                    _dumpLog.WriteLine("Checking if drive supports reading without subchannel...");
-                    UpdateStatus?.Invoke("Checking if drive supports reading without subchannel...");
-
-                    readcd = !_dev.ReadCd(out cmdBuf, out _, firstLba, sectorSize, 1, MmcSectorTypes.AllTypes, false,
-                                          false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                          supportedSubchannel, _dev.Timeout, out _);
-
-                    if(!readcd)
-                    {
-                        _dumpLog.WriteLine("Drive does not support READ CD, trying SCSI READ commands...");
-                        ErrorMessage?.Invoke("Drive does not support READ CD, trying SCSI READ commands...");
-
-                        _dumpLog.WriteLine("Checking if drive supports READ(6)...");
-                        UpdateStatus?.Invoke("Checking if drive supports READ(6)...");
-                        read6 = !_dev.Read6(out cmdBuf, out _, firstLba, 2048, 1, _dev.Timeout, out _);
-                        _dumpLog.WriteLine("Checking if drive supports READ(10)...");
-                        UpdateStatus?.Invoke("Checking if drive supports READ(10)...");
-
-                        read10 = !_dev.Read10(out cmdBuf, out _, 0, false, true, false, false, firstLba, 2048, 0, 1,
-                                              _dev.Timeout, out _);
-
-                        _dumpLog.WriteLine("Checking if drive supports READ(12)...");
-                        UpdateStatus?.Invoke("Checking if drive supports READ(12)...");
-
-                        read12 = !_dev.Read12(out cmdBuf, out _, 0, false, true, false, false, firstLba, 2048, 0, 1,
-                                              false, _dev.Timeout, out _);
-
-                        _dumpLog.WriteLine("Checking if drive supports READ(16)...");
-                        UpdateStatus?.Invoke("Checking if drive supports READ(16)...");
-
-                        read16 = !_dev.Read16(out cmdBuf, out _, 0, false, true, false, firstLba, 2048, 0, 1, false,
-                                              _dev.Timeout, out _);
-
-                        if(!read6  &&
-                           !read10 &&
-                           !read12 &&
-                           !read16)
-                        {
-                            _dumpLog.WriteLine("Cannot read from disc, not continuing...");
-                            StoppingErrorMessage?.Invoke("Cannot read from disc, not continuing...");
-
-                            return;
-                        }
-
-                        if(read6)
-                        {
-                            _dumpLog.WriteLine("Drive supports READ(6)...");
-                            UpdateStatus?.Invoke("Drive supports READ(6)...");
-                        }
-
-                        if(read10)
-                        {
-                            _dumpLog.WriteLine("Drive supports READ(10)...");
-                            UpdateStatus?.Invoke("Drive supports READ(10)...");
-                        }
-
-                        if(read12)
-                        {
-                            _dumpLog.WriteLine("Drive supports READ(12)...");
-                            UpdateStatus?.Invoke("Drive supports READ(12)...");
-                        }
-
-                        if(read16)
-                        {
-                            _dumpLog.WriteLine("Drive supports READ(16)...");
-                            UpdateStatus?.Invoke("Drive supports READ(16)...");
-                        }
-                    }
-
-                    _dumpLog.WriteLine("Drive can read without subchannel...");
-                    UpdateStatus?.Invoke("Drive can read without subchannel...");
-
-                    subSize = 0;
-                    subType = TrackSubchannelType.None;
-
-                    break;
-                case MmcSubchannel.Raw:
-                    _dumpLog.WriteLine("Full raw subchannel reading supported...");
-                    UpdateStatus?.Invoke("Full raw subchannel reading supported...");
-                    subType = TrackSubchannelType.Raw;
-                    subSize = 96;
-                    readcd  = true;
-
-                    break;
-                case MmcSubchannel.Q16:
-                    _dumpLog.WriteLine("PQ subchannel reading supported...");
-                    _dumpLog.WriteLine("WARNING: If disc says CD+G, CD+EG, CD-MIDI, CD Graphics or CD Enhanced Graphics, dump will be incorrect!");
-                    UpdateStatus?.Invoke("PQ subchannel reading supported...");
-
-                    UpdateStatus?.
-                        Invoke("WARNING: If disc says CD+G, CD+EG, CD-MIDI, CD Graphics or CD Enhanced Graphics, dump will be incorrect!");
-
-                    subType = TrackSubchannelType.Q16;
-                    subSize = 16;
-                    readcd  = true;
-
-                    break;
-                default:
-                    _dumpLog.WriteLine("Handling subchannel type {0} not supported, exiting...", supportedSubchannel);
-
-                    StoppingErrorMessage?.
-                        Invoke($"Handling subchannel type {supportedSubchannel} not supported, exiting...");
-
-                    return;
+                _dumpLog.WriteLine("Output format does not support subchannels, continuing...");
+                UpdateStatus?.Invoke("Output format does not support subchannels, continuing...");
             }
-
-            switch(desiredSubchannel)
+            else
             {
-                case MmcSubchannel.None:
-                    subType = TrackSubchannelType.None;
-
-                    break;
-                case MmcSubchannel.Raw:
-                case MmcSubchannel.Q16:
-                    subType = TrackSubchannelType.Raw;
-
-                    break;
-            }
-
-            blockSize = sectorSize + subSize;
-
-            // Check if subchannel is BCD
-            if(supportedSubchannel != MmcSubchannel.None)
-            {
-                sense = _dev.ReadCd(out cmdBuf, out _, (((firstLba / 75) + 1) * 75) + 35, blockSize, 1,
-                                    MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
-                                    MmcErrorField.None, supportedSubchannel, _dev.Timeout, out _);
-
-                if(!sense)
-                {
-                    tmpBuf = new byte[subSize];
-                    Array.Copy(cmdBuf, sectorSize, tmpBuf, 0, subSize);
-
-                    if(supportedSubchannel == MmcSubchannel.Q16)
-                        tmpBuf = Subchannel.ConvertQToRaw(tmpBuf);
-
-                    tmpBuf = Subchannel.Deinterleave(tmpBuf);
-
-                    // 9th Q subchannel is always FRAME when in user data area
-                    // LBA 35 => MSF 00:02:35 => FRAME 35 (in hexadecimal 0x23)
-                    // Sometimes drive returns a pregap here but MSF 00:02:3x => FRAME 3x (hexadecimal 0x20 to 0x27)
-                    bcdSubchannel = (tmpBuf[21] & 0x30) > 0;
-
-                    if(bcdSubchannel)
-                    {
-                        _dumpLog.WriteLine("Drive returns subchannel in BCD...");
-                        UpdateStatus?.Invoke("Drive returns subchannel in BCD...");
-                    }
-                    else
-                    {
-                        _dumpLog.WriteLine("Drive does not returns subchannel in BCD...");
-                        UpdateStatus?.Invoke("Drive does not returns subchannel in BCD...");
-                    }
-                }
-            }
-
-            foreach(Track trk in tracks)
-                trk.SubchannelType = subType;
-
-            _dumpLog.WriteLine("Calculating pregaps, can take some time...");
-            UpdateStatus?.Invoke("Calculating pregaps, can take some time...");
-
-            SolveTrackPregaps(_dev, _dumpLog, UpdateStatus, tracks, supportsPqSubchannel, supportsRwSubchannel, _dbDev,
-                              out bool inexactPositioning, true);
-
-            if(inexactPositioning)
-            {
-                _dumpLog.WriteLine("WARNING: The drive has returned incorrect Q positioning when calculating pregaps. A best effort has been tried but they may be incorrect.");
-
-                UpdateStatus?.
-                    Invoke("WARNING: The drive has returned incorrect Q positioning when calculating pregaps. A best effort has been tried but they may be incorrect.");
-            }
-
-            if(!(outputOptical as IWritableOpticalImage).OpticalCapabilities.HasFlag(OpticalImageCapabilities.
-                   CanStoreRawData))
-            {
-                if(!_force)
-                {
-                    _dumpLog.WriteLine("Output format does not support storing raw data, this may end in a loss of data, not continuing...");
-
-                    StoppingErrorMessage?.
-                        Invoke("Output format does not support storing raw data, this may end in a loss of data, not continuing...");
-
-                    return;
-                }
-
-                _dumpLog.WriteLine("Output format does not support storing raw data, this may end in a loss of data, continuing...");
-
-                ErrorMessage?.
-                    Invoke("Output format does not support storing raw data, this may end in a loss of data, continuing...");
-            }
-
-            if(!(outputOptical as IWritableOpticalImage).OpticalCapabilities.HasFlag(OpticalImageCapabilities.
-                   CanStoreAudioTracks) &&
-               tracks.Any(track => track.Type == TrackType.Audio))
-            {
-                _dumpLog.WriteLine("Output format does not support audio tracks, cannot continue...");
-
-                StoppingErrorMessage?.Invoke("Output format does not support audio tracks, cannot continue...");
+                _dumpLog.WriteLine("Output format does not support subchannels, not continuing...");
+                StoppingErrorMessage?.Invoke("Output format does not support subchannels, not continuing...");
 
                 return;
             }
 
-            if(!(outputOptical as IWritableOpticalImage).OpticalCapabilities.HasFlag(OpticalImageCapabilities.
-                   CanStorePregaps) &&
-               tracks.Where(track => track.Sequence != tracks.First(t => t.Session == track.Session).Sequence).
-                      Any(track => track.Pregap     > 0))
-            {
-                if(!_force)
+            desiredSubchannel = MmcSubchannel.None;
+        }
+
+        switch(supportedSubchannel)
+        {
+            case MmcSubchannel.None:
+                _dumpLog.WriteLine("Checking if drive supports reading without subchannel...");
+                UpdateStatus?.Invoke("Checking if drive supports reading without subchannel...");
+
+                readcd = !_dev.ReadCd(out cmdBuf, out _, firstLba, sectorSize, 1, MmcSectorTypes.AllTypes, false,
+                                      false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                      supportedSubchannel, _dev.Timeout, out _);
+
+                if(!readcd)
                 {
-                    _dumpLog.WriteLine("Output format does not support pregaps, this may end in a loss of data, not continuing...");
+                    _dumpLog.WriteLine("Drive does not support READ CD, trying SCSI READ commands...");
+                    ErrorMessage?.Invoke("Drive does not support READ CD, trying SCSI READ commands...");
 
-                    StoppingErrorMessage?.
-                        Invoke("Output format does not support pregaps, this may end in a loss of data, not continuing...");
+                    _dumpLog.WriteLine("Checking if drive supports READ(6)...");
+                    UpdateStatus?.Invoke("Checking if drive supports READ(6)...");
+                    read6 = !_dev.Read6(out cmdBuf, out _, firstLba, 2048, 1, _dev.Timeout, out _);
+                    _dumpLog.WriteLine("Checking if drive supports READ(10)...");
+                    UpdateStatus?.Invoke("Checking if drive supports READ(10)...");
 
-                    return;
-                }
+                    read10 = !_dev.Read10(out cmdBuf, out _, 0, false, true, false, false, firstLba, 2048, 0, 1,
+                                          _dev.Timeout, out _);
 
-                _dumpLog.WriteLine("Output format does not support pregaps, this may end in a loss of data, continuing...");
+                    _dumpLog.WriteLine("Checking if drive supports READ(12)...");
+                    UpdateStatus?.Invoke("Checking if drive supports READ(12)...");
 
-                ErrorMessage?.
-                    Invoke("Output format does not support pregaps, this may end in a loss of data, continuing...");
-            }
+                    read12 = !_dev.Read12(out cmdBuf, out _, 0, false, true, false, false, firstLba, 2048, 0, 1,
+                                          false, _dev.Timeout, out _);
 
-            for(int t = 1; t < tracks.Length; t++)
-                tracks[t - 1].EndSector = tracks[t].StartSector - 1;
+                    _dumpLog.WriteLine("Checking if drive supports READ(16)...");
+                    UpdateStatus?.Invoke("Checking if drive supports READ(16)...");
 
-            tracks[^1].EndSector = (ulong)lastSector;
-            blocks               = (ulong)(lastSector + 1);
+                    read16 = !_dev.Read16(out cmdBuf, out _, 0, false, true, false, firstLba, 2048, 0, 1, false,
+                                          _dev.Timeout, out _);
 
-            if(blocks == 0)
-            {
-                StoppingErrorMessage?.Invoke("Cannot dump blank media.");
-
-                return;
-            }
-
-            ResumeSupport.Process(true, true, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial, _dev.PlatformId,
-                                  ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision, _private, _force);
-
-            if(currentTry == null ||
-               extents    == null)
-            {
-                StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
-
-                return;
-            }
-
-            // Read media tags
-            ReadCdTags(ref dskType, mediaTags, out sessions, out firstTrackLastSession);
-
-            if(!(outputOptical as IWritableOpticalImage).OpticalCapabilities.HasFlag(OpticalImageCapabilities.
-                   CanStoreSessions) &&
-               sessions > 1)
-            {
-                // TODO: Disabled until 6.0
-                /*if(!_force)
-                {*/
-                _dumpLog.WriteLine("Output format does not support sessions, this will end in a loss of data, not continuing...");
-
-                StoppingErrorMessage?.
-                    Invoke("Output format does not support sessions, this will end in a loss of data, not continuing...");
-
-                return;
-                /*}
-
-                _dumpLog.WriteLine("Output format does not support sessions, this will end in a loss of data, continuing...");
-
-                ErrorMessage?.
-                    Invoke("Output format does not support sessions, this will end in a loss of data, continuing...");*/
-            }
-
-            // Check if output format supports all disc tags we have retrieved so far
-            foreach(MediaTagType tag in mediaTags.Keys.Where(tag => !outputOptical.SupportedMediaTags.Contains(tag)))
-            {
-                if(_force)
-                {
-                    _dumpLog.WriteLine("Output format does not support {0}, continuing...", tag);
-                    ErrorMessage?.Invoke($"Output format does not support {tag}, continuing...");
-                }
-                else
-                {
-                    _dumpLog.WriteLine("Output format does not support {0}, not continuing...", tag);
-                    StoppingErrorMessage?.Invoke($"Output format does not support {tag}, not continuing...");
-
-                    return;
-                }
-            }
-
-            if(leadOutStarts.Any())
-            {
-                UpdateStatus?.Invoke("Solving lead-outs...");
-
-                foreach(KeyValuePair<int, long> leadOuts in leadOutStarts)
-                    foreach(Track trk in tracks.Where(trk => trk.Session   == leadOuts.Key).
-                                                Where(trk => trk.EndSector >= (ulong)leadOuts.Value))
-                        trk.EndSector = (ulong)leadOuts.Value - 1;
-
-                var dataExtents = new ExtentsULong();
-
-                foreach(Track trk in tracks)
-                    dataExtents.Add(trk.StartSector, trk.EndSector);
-
-                Tuple<ulong, ulong>[] dataExtentsArray = dataExtents.ToArray();
-
-                for(int i = 0; i < dataExtentsArray.Length - 1; i++)
-                    leadOutExtents.Add(dataExtentsArray[i].Item2 + 1, dataExtentsArray[i + 1].Item1 - 1);
-            }
-
-            _dumpLog.WriteLine("Detecting disc type...");
-            UpdateStatus?.Invoke("Detecting disc type...");
-
-            MMC.DetectDiscType(ref dskType, sessions, toc, _dev, out hiddenTrack, out hiddenData, firstTrackLastSession,
-                               blocks);
-
-            if(hiddenTrack || firstLba > 0)
-            {
-                _dumpLog.WriteLine("Disc contains a hidden track...");
-                UpdateStatus?.Invoke("Disc contains a hidden track...");
-
-                List<Track> trkList = new()
-                {
-                    new Track
+                    if(!read6  &&
+                       !read10 &&
+                       !read12 &&
+                       !read16)
                     {
-                        Sequence          = 0,
-                        Session           = 1,
-                        Type              = hiddenData ? TrackType.Data : TrackType.Audio,
-                        StartSector       = 0,
-                        BytesPerSector    = (int)sectorSize,
-                        RawBytesPerSector = (int)sectorSize,
-                        SubchannelType    = subType,
-                        EndSector         = tracks.First(t => t.Sequence == 1).StartSector - 1
+                        _dumpLog.WriteLine("Cannot read from disc, not continuing...");
+                        StoppingErrorMessage?.Invoke("Cannot read from disc, not continuing...");
+
+                        return;
                     }
-                };
 
-                trkList.AddRange(tracks);
-                tracks = trkList.ToArray();
-            }
+                    if(read6)
+                    {
+                        _dumpLog.WriteLine("Drive supports READ(6)...");
+                        UpdateStatus?.Invoke("Drive supports READ(6)...");
+                    }
 
-            if(tracks.Any(t => t.Type == TrackType.Audio) &&
-               desiredSubchannel != MmcSubchannel.Raw)
-            {
+                    if(read10)
+                    {
+                        _dumpLog.WriteLine("Drive supports READ(10)...");
+                        UpdateStatus?.Invoke("Drive supports READ(10)...");
+                    }
+
+                    if(read12)
+                    {
+                        _dumpLog.WriteLine("Drive supports READ(12)...");
+                        UpdateStatus?.Invoke("Drive supports READ(12)...");
+                    }
+
+                    if(read16)
+                    {
+                        _dumpLog.WriteLine("Drive supports READ(16)...");
+                        UpdateStatus?.Invoke("Drive supports READ(16)...");
+                    }
+                }
+
+                _dumpLog.WriteLine("Drive can read without subchannel...");
+                UpdateStatus?.Invoke("Drive can read without subchannel...");
+
+                subSize = 0;
+                subType = TrackSubchannelType.None;
+
+                break;
+            case MmcSubchannel.Raw:
+                _dumpLog.WriteLine("Full raw subchannel reading supported...");
+                UpdateStatus?.Invoke("Full raw subchannel reading supported...");
+                subType = TrackSubchannelType.Raw;
+                subSize = 96;
+                readcd  = true;
+
+                break;
+            case MmcSubchannel.Q16:
+                _dumpLog.WriteLine("PQ subchannel reading supported...");
                 _dumpLog.WriteLine("WARNING: If disc says CD+G, CD+EG, CD-MIDI, CD Graphics or CD Enhanced Graphics, dump will be incorrect!");
+                UpdateStatus?.Invoke("PQ subchannel reading supported...");
 
                 UpdateStatus?.
                     Invoke("WARNING: If disc says CD+G, CD+EG, CD-MIDI, CD Graphics or CD Enhanced Graphics, dump will be incorrect!");
-            }
 
-            // Check mode for tracks
-            foreach(Track trk in tracks.Where(t => t.Type != TrackType.Audio))
+                subType = TrackSubchannelType.Q16;
+                subSize = 16;
+                readcd  = true;
+
+                break;
+            default:
+                _dumpLog.WriteLine("Handling subchannel type {0} not supported, exiting...", supportedSubchannel);
+
+                StoppingErrorMessage?.
+                    Invoke($"Handling subchannel type {supportedSubchannel} not supported, exiting...");
+
+                return;
+        }
+
+        switch(desiredSubchannel)
+        {
+            case MmcSubchannel.None:
+                subType = TrackSubchannelType.None;
+
+                break;
+            case MmcSubchannel.Raw:
+            case MmcSubchannel.Q16:
+                subType = TrackSubchannelType.Raw;
+
+                break;
+        }
+
+        blockSize = sectorSize + subSize;
+
+        // Check if subchannel is BCD
+        if(supportedSubchannel != MmcSubchannel.None)
+        {
+            sense = _dev.ReadCd(out cmdBuf, out _, (((firstLba / 75) + 1) * 75) + 35, blockSize, 1,
+                                MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                MmcErrorField.None, supportedSubchannel, _dev.Timeout, out _);
+
+            if(!sense)
             {
-                if(!readcd)
-                {
-                    trk.Type = TrackType.CdMode1;
+                tmpBuf = new byte[subSize];
+                Array.Copy(cmdBuf, sectorSize, tmpBuf, 0, subSize);
 
-                    continue;
+                if(supportedSubchannel == MmcSubchannel.Q16)
+                    tmpBuf = Subchannel.ConvertQToRaw(tmpBuf);
+
+                tmpBuf = Subchannel.Deinterleave(tmpBuf);
+
+                // 9th Q subchannel is always FRAME when in user data area
+                // LBA 35 => MSF 00:02:35 => FRAME 35 (in hexadecimal 0x23)
+                // Sometimes drive returns a pregap here but MSF 00:02:3x => FRAME 3x (hexadecimal 0x20 to 0x27)
+                bcdSubchannel = (tmpBuf[21] & 0x30) > 0;
+
+                if(bcdSubchannel)
+                {
+                    _dumpLog.WriteLine("Drive returns subchannel in BCD...");
+                    UpdateStatus?.Invoke("Drive returns subchannel in BCD...");
                 }
-
-                _dumpLog.WriteLine("Checking mode for track {0}...", trk.Sequence);
-                UpdateStatus?.Invoke($"Checking mode for track {trk.Sequence}...");
-
-                sense = _dev.ReadCd(out cmdBuf, out _, (uint)(trk.StartSector + trk.Pregap), blockSize, 1,
-                                    MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
-                                    MmcErrorField.None, supportedSubchannel, _dev.Timeout, out _);
-
-                if(sense)
+                else
                 {
-                    _dumpLog.WriteLine("Unable to guess mode for track {0}, continuing...", trk.Sequence);
-
-                    UpdateStatus?.Invoke($"Unable to guess mode for track {trk.Sequence}, continuing...");
-
-                    continue;
-                }
-
-                int bufOffset = 0;
-
-                while(cmdBuf[0  + bufOffset] != 0x00 ||
-                      cmdBuf[1  + bufOffset] != 0xFF ||
-                      cmdBuf[2  + bufOffset] != 0xFF ||
-                      cmdBuf[3  + bufOffset] != 0xFF ||
-                      cmdBuf[4  + bufOffset] != 0xFF ||
-                      cmdBuf[5  + bufOffset] != 0xFF ||
-                      cmdBuf[6  + bufOffset] != 0xFF ||
-                      cmdBuf[7  + bufOffset] != 0xFF ||
-                      cmdBuf[8  + bufOffset] != 0xFF ||
-                      cmdBuf[9  + bufOffset] != 0xFF ||
-                      cmdBuf[10 + bufOffset] != 0xFF ||
-                      cmdBuf[11 + bufOffset] != 0x00)
-                {
-                    if(bufOffset + 12 >= cmdBuf.Length)
-                        break;
-
-                    bufOffset++;
-                }
-
-                switch(cmdBuf[15 + bufOffset])
-                {
-                    case 1:
-                    case 0x61: // Scrambled
-                        UpdateStatus?.Invoke($"Track {trk.Sequence} is MODE1");
-                        _dumpLog.WriteLine("Track {0} is MODE1", trk.Sequence);
-                        trk.Type = TrackType.CdMode1;
-
-                        break;
-                    case 2:
-                    case 0x62: // Scrambled
-                        if(dskType == MediaType.CDI ||
-                           dskType == MediaType.CDIREADY)
-                        {
-                            UpdateStatus?.Invoke($"Track {trk.Sequence} is MODE2");
-                            _dumpLog.WriteLine("Track {0} is MODE2", trk.Sequence);
-                            trk.Type = TrackType.CdMode2Formless;
-
-                            break;
-                        }
-
-                        if((cmdBuf[0x012] & 0x20) == 0x20) // mode 2 form 2
-                        {
-                            UpdateStatus?.Invoke($"Track {trk.Sequence} is MODE2 FORM 2");
-                            _dumpLog.WriteLine("Track {0} is MODE2 FORM 2", trk.Sequence);
-                            trk.Type = TrackType.CdMode2Form2;
-
-                            break;
-                        }
-
-                        UpdateStatus?.Invoke($"Track {trk.Sequence} is MODE2 FORM 1");
-                        _dumpLog.WriteLine("Track {0} is MODE2 FORM 1", trk.Sequence);
-                        trk.Type = TrackType.CdMode2Form1;
-
-                        // These media type specifications do not legally allow mode 2 tracks to be present
-                        if(dskType == MediaType.CDROM  ||
-                           dskType == MediaType.CDPLUS ||
-                           dskType == MediaType.CDV)
-                            dskType = MediaType.CD;
-
-                        break;
-                    default:
-                        UpdateStatus?.Invoke($"Track {trk.Sequence} is unknown mode {cmdBuf[15]}");
-                        _dumpLog.WriteLine("Track {0} is unknown mode {1}", trk.Sequence, cmdBuf[15]);
-
-                        break;
+                    _dumpLog.WriteLine("Drive does not returns subchannel in BCD...");
+                    UpdateStatus?.Invoke("Drive does not returns subchannel in BCD...");
                 }
             }
+        }
 
-            if(outputOptical.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000"))
+        foreach(Track trk in tracks)
+            trk.SubchannelType = subType;
+
+        _dumpLog.WriteLine("Calculating pregaps, can take some time...");
+        UpdateStatus?.Invoke("Calculating pregaps, can take some time...");
+
+        SolveTrackPregaps(_dev, _dumpLog, UpdateStatus, tracks, supportsPqSubchannel, supportsRwSubchannel, _dbDev,
+                          out bool inexactPositioning, true);
+
+        if(inexactPositioning)
+        {
+            _dumpLog.WriteLine("WARNING: The drive has returned incorrect Q positioning when calculating pregaps. A best effort has been tried but they may be incorrect.");
+
+            UpdateStatus?.
+                Invoke("WARNING: The drive has returned incorrect Q positioning when calculating pregaps. A best effort has been tried but they may be incorrect.");
+        }
+
+        if(!(outputOptical as IWritableOpticalImage).OpticalCapabilities.HasFlag(OpticalImageCapabilities.
+               CanStoreRawData))
+        {
+            if(!_force)
             {
-                if(tracks.Length > 1)
-                {
-                    StoppingErrorMessage?.Invoke("Output format does not support more than 1 track, not continuing...");
-                    _dumpLog.WriteLine("Output format does not support more than 1 track, not continuing...");
+                _dumpLog.WriteLine("Output format does not support storing raw data, this may end in a loss of data, not continuing...");
 
-                    return;
-                }
-
-                if(tracks.Any(t => t.Type == TrackType.Audio))
-                {
-                    StoppingErrorMessage?.Invoke("Output format does not support audio tracks, not continuing...");
-                    _dumpLog.WriteLine("Output format does not support audio tracks, not continuing...");
-
-                    return;
-                }
-
-                if(tracks.Any(t => t.Type != TrackType.CdMode1))
-                {
-                    StoppingErrorMessage?.Invoke("Output format only supports MODE 1 tracks, not continuing...");
-                    _dumpLog.WriteLine("Output format only supports MODE 1 tracks, not continuing...");
-
-                    return;
-                }
-
-                supportsLongSectors = false;
-            }
-
-            // Check if something prevents from dumping the first track pregap
-            if(_dumpFirstTrackPregap && readcd)
-            {
-                if(!outputOptical.SupportedMediaTags.Contains(MediaTagType.CD_FirstTrackPregap))
-                {
-                    if(_force)
-                    {
-                        _dumpLog.WriteLine("Output format does not support CD first track pregap, continuing...");
-                        ErrorMessage?.Invoke("Output format does not support CD first track pregap, continuing...");
-                    }
-                    else
-                    {
-                        _dumpLog.WriteLine("Output format does not support CD first track pregap, not continuing...");
-
-                        StoppingErrorMessage?.
-                            Invoke("Output format does not support CD first track pregap, not continuing...");
-
-                        return;
-                    }
-
-                    _dumpFirstTrackPregap = false;
-                }
-            }
-
-            // Try how many blocks are readable at once
-            while(true)
-            {
-                if(readcd)
-                {
-                    sense = _dev.ReadCd(out cmdBuf, out _, firstLba, blockSize, _maximumReadable,
-                                        MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true,
-                                        true, MmcErrorField.None, supportedSubchannel, _dev.Timeout, out _);
-
-                    if(_dev.Error || sense)
-                        _maximumReadable /= 2;
-                }
-                else if(read16)
-                {
-                    sense = _dev.Read16(out cmdBuf, out _, 0, false, true, false, firstLba, blockSize, 0,
-                                        _maximumReadable, false, _dev.Timeout, out _);
-
-                    if(_dev.Error || sense)
-                        _maximumReadable /= 2;
-                }
-                else if(read12)
-                {
-                    sense = _dev.Read12(out cmdBuf, out _, 0, false, true, false, false, firstLba, blockSize, 0,
-                                        _maximumReadable, false, _dev.Timeout, out _);
-
-                    if(_dev.Error || sense)
-                        _maximumReadable /= 2;
-                }
-                else if(read10)
-                {
-                    sense = _dev.Read10(out cmdBuf, out _, 0, false, true, false, false, firstLba, blockSize, 0,
-                                        (ushort)_maximumReadable, _dev.Timeout, out _);
-
-                    if(_dev.Error || sense)
-                        _maximumReadable /= 2;
-                }
-                else if(read6)
-                {
-                    sense = _dev.Read6(out cmdBuf, out _, firstLba, blockSize, (byte)_maximumReadable, _dev.Timeout,
-                                       out _);
-
-                    if(_dev.Error || sense)
-                        _maximumReadable /= 2;
-                }
-
-                if(!_dev.Error ||
-                   _maximumReadable == 1)
-                    break;
-            }
-
-            if(_dev.Error || sense)
-            {
-                _dumpLog.WriteLine("Device error {0} trying to guess ideal transfer length.", _dev.LastError);
-                StoppingErrorMessage?.Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
-            }
-
-            // Try to read the first track pregap
-            if(_dumpFirstTrackPregap && readcd)
-                ReadCdFirstTrackPregap(blockSize, ref currentSpeed, mediaTags, supportedSubchannel, ref totalDuration);
-
-            _dumpLog.WriteLine("Reading {0} sectors at a time.", _maximumReadable);
-            _dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);
-            _dumpLog.WriteLine("Device can read {0} blocks at a time.", _maximumReadable);
-            _dumpLog.WriteLine("Device reports {0} bytes per logical block.", blockSize);
-            _dumpLog.WriteLine("SCSI device type: {0}.", _dev.ScsiType);
-            _dumpLog.WriteLine("Media identified as {0}.", dskType);
-
-            UpdateStatus?.Invoke($"Reading {_maximumReadable} sectors at a time.");
-            UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
-            UpdateStatus?.Invoke($"Device can read {_maximumReadable} blocks at a time.");
-            UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
-            UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
-            UpdateStatus?.Invoke($"Media identified as {dskType}.");
-
-            ret = outputOptical.Create(_outputPath, dskType, _formatOptions, blocks,
-                                       supportsLongSectors ? blockSize : 2048);
-
-            // Cannot create image
-            if(!ret)
-            {
-                _dumpLog.WriteLine("Error creating output image, not continuing.");
-                _dumpLog.WriteLine(outputOptical.ErrorMessage);
-
-                StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
-                                             outputOptical.ErrorMessage);
+                StoppingErrorMessage?.
+                    Invoke("Output format does not support storing raw data, this may end in a loss of data, not continuing...");
 
                 return;
             }
 
-            ErrorNumber errno = outputOptical.ReadMediaTag(MediaTagType.CD_MCN, out byte[] mcnBytes);
+            _dumpLog.WriteLine("Output format does not support storing raw data, this may end in a loss of data, continuing...");
 
-            if(errno == ErrorNumber.NoError)
-                mcn = Encoding.ASCII.GetString(mcnBytes);
+            ErrorMessage?.
+                Invoke("Output format does not support storing raw data, this may end in a loss of data, continuing...");
+        }
 
-            if((outputOptical as IWritableOpticalImage).Tracks != null)
-                foreach(Track imgTrack in (outputOptical as IWritableOpticalImage).Tracks)
-                {
-                    errno = (outputOptical as IWritableOpticalImage).ReadSectorTag(imgTrack.Sequence,
-                        SectorTagType.CdTrackIsrc, out byte[] isrcBytes);
+        if(!(outputOptical as IWritableOpticalImage).OpticalCapabilities.HasFlag(OpticalImageCapabilities.
+               CanStoreAudioTracks) &&
+           tracks.Any(track => track.Type == TrackType.Audio))
+        {
+            _dumpLog.WriteLine("Output format does not support audio tracks, cannot continue...");
 
-                    if(errno == ErrorNumber.NoError)
-                        isrcs[(byte)imgTrack.Sequence] = Encoding.ASCII.GetString(isrcBytes);
+            StoppingErrorMessage?.Invoke("Output format does not support audio tracks, cannot continue...");
 
-                    Track trk = tracks.FirstOrDefault(t => t.Sequence == imgTrack.Sequence);
+            return;
+        }
 
-                    if(trk == null)
-                        continue;
-
-                    trk.Pregap      = imgTrack.Pregap;
-                    trk.StartSector = imgTrack.StartSector;
-                    trk.EndSector   = imgTrack.EndSector;
-
-                    foreach(KeyValuePair<ushort, int> imgIdx in imgTrack.Indexes)
-                        trk.Indexes[imgIdx.Key] = imgIdx.Value;
-                }
-
-            // Send track list to output plugin. This may fail if subchannel is set but unsupported.
-            ret = (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
-
-            if(!ret &&
-               desiredSubchannel == MmcSubchannel.None)
+        if(!(outputOptical as IWritableOpticalImage).OpticalCapabilities.HasFlag(OpticalImageCapabilities.
+               CanStorePregaps) &&
+           tracks.Where(track => track.Sequence != tracks.First(t => t.Session == track.Session).Sequence).
+                  Any(track => track.Pregap     > 0))
+        {
+            if(!_force)
             {
-                _dumpLog.WriteLine("Error sending tracks to output image, not continuing.");
-                _dumpLog.WriteLine(outputOptical.ErrorMessage);
+                _dumpLog.WriteLine("Output format does not support pregaps, this may end in a loss of data, not continuing...");
 
-                StoppingErrorMessage?.Invoke("Error sending tracks to output image, not continuing." +
-                                             Environment.NewLine + outputOptical.ErrorMessage);
+                StoppingErrorMessage?.
+                    Invoke("Output format does not support pregaps, this may end in a loss of data, not continuing...");
 
                 return;
             }
 
-            // If a subchannel is supported, check if output plugin allows us to write it.
-            if(desiredSubchannel != MmcSubchannel.None &&
-               !(outputOptical as IWritableOpticalImage).OpticalCapabilities.HasFlag(OpticalImageCapabilities.
-                   CanStoreSubchannelRw))
+            _dumpLog.WriteLine("Output format does not support pregaps, this may end in a loss of data, continuing...");
+
+            ErrorMessage?.
+                Invoke("Output format does not support pregaps, this may end in a loss of data, continuing...");
+        }
+
+        for(int t = 1; t < tracks.Length; t++)
+            tracks[t - 1].EndSector = tracks[t].StartSector - 1;
+
+        tracks[^1].EndSector = (ulong)lastSector;
+        blocks               = (ulong)(lastSector + 1);
+
+        if(blocks == 0)
+        {
+            StoppingErrorMessage?.Invoke("Cannot dump blank media.");
+
+            return;
+        }
+
+        ResumeSupport.Process(true, true, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial, _dev.PlatformId,
+                              ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision, _private, _force);
+
+        if(currentTry == null ||
+           extents    == null)
+        {
+            StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
+
+            return;
+        }
+
+        // Read media tags
+        ReadCdTags(ref dskType, mediaTags, out sessions, out firstTrackLastSession);
+
+        if(!(outputOptical as IWritableOpticalImage).OpticalCapabilities.HasFlag(OpticalImageCapabilities.
+               CanStoreSessions) &&
+           sessions > 1)
+        {
+            // TODO: Disabled until 6.0
+            /*if(!_force)
+            {*/
+            _dumpLog.WriteLine("Output format does not support sessions, this will end in a loss of data, not continuing...");
+
+            StoppingErrorMessage?.
+                Invoke("Output format does not support sessions, this will end in a loss of data, not continuing...");
+
+            return;
+            /*}
+
+            _dumpLog.WriteLine("Output format does not support sessions, this will end in a loss of data, continuing...");
+
+            ErrorMessage?.
+                Invoke("Output format does not support sessions, this will end in a loss of data, continuing...");*/
+        }
+
+        // Check if output format supports all disc tags we have retrieved so far
+        foreach(MediaTagType tag in mediaTags.Keys.Where(tag => !outputOptical.SupportedMediaTags.Contains(tag)))
+        {
+            if(_force)
             {
-                _dumpLog.WriteLine("Output image does not support subchannels, {0}continuing...", _force ? "" : "not ");
-
-                if(_force)
-                    ErrorMessage?.Invoke("Output image does not support subchannels, continuing...");
-                else
-                {
-                    StoppingErrorMessage?.Invoke("Output image does not support subchannels, not continuing...");
-
-                    return;
-                }
-            }
-
-            if(supportedSubchannel != MmcSubchannel.None)
-            {
-                _dumpLog.WriteLine($"Creating subchannel log in {_outputPrefix + ".sub.log"}");
-                subLog = new SubchannelLog(_outputPrefix + ".sub.log", bcdSubchannel);
-            }
-
-            // Set track flags
-            foreach(KeyValuePair<byte, byte> kvp in trackFlags)
-            {
-                Track track = tracks.FirstOrDefault(t => t.Sequence == kvp.Key);
-
-                if(track is null)
-                    continue;
-
-                _dumpLog.WriteLine("Setting flags for track {0}...", track.Sequence);
-                UpdateStatus?.Invoke($"Setting flags for track {track.Sequence}...");
-
-                outputOptical.WriteSectorTag(new[]
-                {
-                    kvp.Value
-                }, kvp.Key, SectorTagType.CdTrackFlags);
-            }
-
-            // Set MCN
-            if(supportedSubchannel == MmcSubchannel.None)
-            {
-                sense = _dev.ReadMcn(out mcn, out _, out _, _dev.Timeout, out _);
-
-                if(!sense      &&
-                   mcn != null &&
-                   mcn != "0000000000000")
-                {
-                    UpdateStatus?.Invoke($"Found Media Catalogue Number: {mcn}");
-                    _dumpLog.WriteLine("Found Media Catalogue Number: {0}", mcn);
-                }
-                else
-                    mcn = null;
-            }
-
-            // Set ISRCs
-            if(supportedSubchannel == MmcSubchannel.None)
-                foreach(Track trk in tracks)
-                {
-                    sense = _dev.ReadIsrc((byte)trk.Sequence, out string isrc, out _, out _, _dev.Timeout, out _);
-
-                    if(sense        ||
-                       isrc == null ||
-                       isrc == "000000000000")
-                        continue;
-
-                    isrcs[(byte)trk.Sequence] = isrc;
-
-                    UpdateStatus?.Invoke($"Found ISRC for track {trk.Sequence}: {isrc}");
-                    _dumpLog.WriteLine($"Found ISRC for track {trk.Sequence}: {isrc}");
-                }
-
-            if(supportedSubchannel != MmcSubchannel.None &&
-               desiredSubchannel   != MmcSubchannel.None)
-            {
-                subchannelExtents = new HashSet<int>();
-
-                _resume.BadSubchannels ??= new List<int>();
-
-                foreach(int sub in _resume.BadSubchannels)
-                    subchannelExtents.Add(sub);
-
-                if(_resume.NextBlock < blocks)
-                    for(ulong i = _resume.NextBlock; i < blocks; i++)
-                        subchannelExtents.Add((int)i);
-            }
-
-            if(_resume.NextBlock > 0)
-            {
-                UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
-                _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
-            }
-
-            if(_skip < _maximumReadable)
-                _skip = _maximumReadable;
-
-        #if DEBUG
-            foreach(Track trk in tracks)
-                UpdateStatus?.
-                    Invoke($"Track {trk.Sequence} starts at LBA {trk.StartSector} and ends at LBA {trk.EndSector}");
-        #endif
-
-            // Check offset
-            if(_fixOffset)
-            {
-                if(tracks.All(t => t.Type != TrackType.Audio))
-                {
-                    // No audio tracks so no need to fix offset
-                    _dumpLog.WriteLine("No audio tracks, disabling offset fix.");
-                    UpdateStatus.Invoke("No audio tracks, disabling offset fix.");
-
-                    _fixOffset = false;
-                }
-
-                if(!readcd)
-                {
-                    _dumpLog.WriteLine("READ CD command is not supported, disabling offset fix. Dump may not be correct.");
-
-                    UpdateStatus?.
-                        Invoke("READ CD command is not supported, disabling offset fix. Dump may not be correct.");
-
-                    _fixOffset = false;
-                }
-            }
-            else if(tracks.Any(t => t.Type == TrackType.Audio))
-            {
-                _dumpLog.WriteLine("There are audio tracks and offset fixing is disabled, dump may not be correct.");
-                UpdateStatus?.Invoke("There are audio tracks and offset fixing is disabled, dump may not be correct.");
-            }
-
-            // Search for read offset in main database
-            cdOffset =
-                _ctx.CdOffsets.FirstOrDefault(d => (d.Manufacturer == _dev.Manufacturer ||
-                                                    d.Manufacturer == _dev.Manufacturer.Replace('/', '-')) &&
-                                                   (d.Model == _dev.Model || d.Model == _dev.Model.Replace('/', '-')));
-
-            Media.Info.CompactDisc.GetOffset(cdOffset, _dbDev, _debug, _dev, dskType, _dumpLog, tracks, UpdateStatus,
-                                             out int? driveOffset, out int? combinedOffset, out _supportsPlextorD8);
-
-            if(combinedOffset is null)
-            {
-                if(driveOffset is null)
-                {
-                    _dumpLog.WriteLine("Drive reading offset not found in database.");
-                    UpdateStatus?.Invoke("Drive reading offset not found in database.");
-                    _dumpLog.WriteLine("Disc offset cannot be calculated.");
-                    UpdateStatus?.Invoke("Disc offset cannot be calculated.");
-
-                    if(tracks.Any(t => t.Type == TrackType.Audio))
-                    {
-                        _dumpLog.WriteLine("Dump may not be correct.");
-
-                        UpdateStatus?.Invoke("Dump may not be correct.");
-                    }
-
-                    if(_fixOffset)
-                        _fixOffset = false;
-                }
-                else
-                {
-                    _dumpLog.WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset   / 4} samples).");
-                    UpdateStatus?.Invoke($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
-
-                    _dumpLog.WriteLine("Disc write offset is unknown, dump may not be correct.");
-                    UpdateStatus?.Invoke("Disc write offset is unknown, dump may not be correct.");
-
-                    offsetBytes = driveOffset.Value;
-
-                    sectorsForOffset = offsetBytes / (int)sectorSize;
-
-                    if(sectorsForOffset < 0)
-                        sectorsForOffset *= -1;
-
-                    if(offsetBytes % sectorSize != 0)
-                        sectorsForOffset++;
-                }
+                _dumpLog.WriteLine("Output format does not support {0}, continuing...", tag);
+                ErrorMessage?.Invoke($"Output format does not support {tag}, continuing...");
             }
             else
             {
-                offsetBytes      = combinedOffset.Value;
+                _dumpLog.WriteLine("Output format does not support {0}, not continuing...", tag);
+                StoppingErrorMessage?.Invoke($"Output format does not support {tag}, not continuing...");
+
+                return;
+            }
+        }
+
+        if(leadOutStarts.Any())
+        {
+            UpdateStatus?.Invoke("Solving lead-outs...");
+
+            foreach(KeyValuePair<int, long> leadOuts in leadOutStarts)
+                foreach(Track trk in tracks.Where(trk => trk.Session   == leadOuts.Key).
+                                            Where(trk => trk.EndSector >= (ulong)leadOuts.Value))
+                    trk.EndSector = (ulong)leadOuts.Value - 1;
+
+            var dataExtents = new ExtentsULong();
+
+            foreach(Track trk in tracks)
+                dataExtents.Add(trk.StartSector, trk.EndSector);
+
+            Tuple<ulong, ulong>[] dataExtentsArray = dataExtents.ToArray();
+
+            for(int i = 0; i < dataExtentsArray.Length - 1; i++)
+                leadOutExtents.Add(dataExtentsArray[i].Item2 + 1, dataExtentsArray[i + 1].Item1 - 1);
+        }
+
+        _dumpLog.WriteLine("Detecting disc type...");
+        UpdateStatus?.Invoke("Detecting disc type...");
+
+        MMC.DetectDiscType(ref dskType, sessions, toc, _dev, out hiddenTrack, out hiddenData, firstTrackLastSession,
+                           blocks);
+
+        if(hiddenTrack || firstLba > 0)
+        {
+            _dumpLog.WriteLine("Disc contains a hidden track...");
+            UpdateStatus?.Invoke("Disc contains a hidden track...");
+
+            List<Track> trkList = new()
+            {
+                new Track
+                {
+                    Sequence          = 0,
+                    Session           = 1,
+                    Type              = hiddenData ? TrackType.Data : TrackType.Audio,
+                    StartSector       = 0,
+                    BytesPerSector    = (int)sectorSize,
+                    RawBytesPerSector = (int)sectorSize,
+                    SubchannelType    = subType,
+                    EndSector         = tracks.First(t => t.Sequence == 1).StartSector - 1
+                }
+            };
+
+            trkList.AddRange(tracks);
+            tracks = trkList.ToArray();
+        }
+
+        if(tracks.Any(t => t.Type == TrackType.Audio) &&
+           desiredSubchannel != MmcSubchannel.Raw)
+        {
+            _dumpLog.WriteLine("WARNING: If disc says CD+G, CD+EG, CD-MIDI, CD Graphics or CD Enhanced Graphics, dump will be incorrect!");
+
+            UpdateStatus?.
+                Invoke("WARNING: If disc says CD+G, CD+EG, CD-MIDI, CD Graphics or CD Enhanced Graphics, dump will be incorrect!");
+        }
+
+        // Check mode for tracks
+        foreach(Track trk in tracks.Where(t => t.Type != TrackType.Audio))
+        {
+            if(!readcd)
+            {
+                trk.Type = TrackType.CdMode1;
+
+                continue;
+            }
+
+            _dumpLog.WriteLine("Checking mode for track {0}...", trk.Sequence);
+            UpdateStatus?.Invoke($"Checking mode for track {trk.Sequence}...");
+
+            sense = _dev.ReadCd(out cmdBuf, out _, (uint)(trk.StartSector + trk.Pregap), blockSize, 1,
+                                MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                MmcErrorField.None, supportedSubchannel, _dev.Timeout, out _);
+
+            if(sense)
+            {
+                _dumpLog.WriteLine("Unable to guess mode for track {0}, continuing...", trk.Sequence);
+
+                UpdateStatus?.Invoke($"Unable to guess mode for track {trk.Sequence}, continuing...");
+
+                continue;
+            }
+
+            int bufOffset = 0;
+
+            while(cmdBuf[0  + bufOffset] != 0x00 ||
+                  cmdBuf[1  + bufOffset] != 0xFF ||
+                  cmdBuf[2  + bufOffset] != 0xFF ||
+                  cmdBuf[3  + bufOffset] != 0xFF ||
+                  cmdBuf[4  + bufOffset] != 0xFF ||
+                  cmdBuf[5  + bufOffset] != 0xFF ||
+                  cmdBuf[6  + bufOffset] != 0xFF ||
+                  cmdBuf[7  + bufOffset] != 0xFF ||
+                  cmdBuf[8  + bufOffset] != 0xFF ||
+                  cmdBuf[9  + bufOffset] != 0xFF ||
+                  cmdBuf[10 + bufOffset] != 0xFF ||
+                  cmdBuf[11 + bufOffset] != 0x00)
+            {
+                if(bufOffset + 12 >= cmdBuf.Length)
+                    break;
+
+                bufOffset++;
+            }
+
+            switch(cmdBuf[15 + bufOffset])
+            {
+                case 1:
+                case 0x61: // Scrambled
+                    UpdateStatus?.Invoke($"Track {trk.Sequence} is MODE1");
+                    _dumpLog.WriteLine("Track {0} is MODE1", trk.Sequence);
+                    trk.Type = TrackType.CdMode1;
+
+                    break;
+                case 2:
+                case 0x62: // Scrambled
+                    if(dskType == MediaType.CDI ||
+                       dskType == MediaType.CDIREADY)
+                    {
+                        UpdateStatus?.Invoke($"Track {trk.Sequence} is MODE2");
+                        _dumpLog.WriteLine("Track {0} is MODE2", trk.Sequence);
+                        trk.Type = TrackType.CdMode2Formless;
+
+                        break;
+                    }
+
+                    if((cmdBuf[0x012] & 0x20) == 0x20) // mode 2 form 2
+                    {
+                        UpdateStatus?.Invoke($"Track {trk.Sequence} is MODE2 FORM 2");
+                        _dumpLog.WriteLine("Track {0} is MODE2 FORM 2", trk.Sequence);
+                        trk.Type = TrackType.CdMode2Form2;
+
+                        break;
+                    }
+
+                    UpdateStatus?.Invoke($"Track {trk.Sequence} is MODE2 FORM 1");
+                    _dumpLog.WriteLine("Track {0} is MODE2 FORM 1", trk.Sequence);
+                    trk.Type = TrackType.CdMode2Form1;
+
+                    // These media type specifications do not legally allow mode 2 tracks to be present
+                    if(dskType == MediaType.CDROM  ||
+                       dskType == MediaType.CDPLUS ||
+                       dskType == MediaType.CDV)
+                        dskType = MediaType.CD;
+
+                    break;
+                default:
+                    UpdateStatus?.Invoke($"Track {trk.Sequence} is unknown mode {cmdBuf[15]}");
+                    _dumpLog.WriteLine("Track {0} is unknown mode {1}", trk.Sequence, cmdBuf[15]);
+
+                    break;
+            }
+        }
+
+        if(outputOptical.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000"))
+        {
+            if(tracks.Length > 1)
+            {
+                StoppingErrorMessage?.Invoke("Output format does not support more than 1 track, not continuing...");
+                _dumpLog.WriteLine("Output format does not support more than 1 track, not continuing...");
+
+                return;
+            }
+
+            if(tracks.Any(t => t.Type == TrackType.Audio))
+            {
+                StoppingErrorMessage?.Invoke("Output format does not support audio tracks, not continuing...");
+                _dumpLog.WriteLine("Output format does not support audio tracks, not continuing...");
+
+                return;
+            }
+
+            if(tracks.Any(t => t.Type != TrackType.CdMode1))
+            {
+                StoppingErrorMessage?.Invoke("Output format only supports MODE 1 tracks, not continuing...");
+                _dumpLog.WriteLine("Output format only supports MODE 1 tracks, not continuing...");
+
+                return;
+            }
+
+            supportsLongSectors = false;
+        }
+
+        // Check if something prevents from dumping the first track pregap
+        if(_dumpFirstTrackPregap && readcd)
+        {
+            if(!outputOptical.SupportedMediaTags.Contains(MediaTagType.CD_FirstTrackPregap))
+            {
+                if(_force)
+                {
+                    _dumpLog.WriteLine("Output format does not support CD first track pregap, continuing...");
+                    ErrorMessage?.Invoke("Output format does not support CD first track pregap, continuing...");
+                }
+                else
+                {
+                    _dumpLog.WriteLine("Output format does not support CD first track pregap, not continuing...");
+
+                    StoppingErrorMessage?.
+                        Invoke("Output format does not support CD first track pregap, not continuing...");
+
+                    return;
+                }
+
+                _dumpFirstTrackPregap = false;
+            }
+        }
+
+        // Try how many blocks are readable at once
+        while(true)
+        {
+            if(readcd)
+            {
+                sense = _dev.ReadCd(out cmdBuf, out _, firstLba, blockSize, _maximumReadable,
+                                    MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true,
+                                    true, MmcErrorField.None, supportedSubchannel, _dev.Timeout, out _);
+
+                if(_dev.Error || sense)
+                    _maximumReadable /= 2;
+            }
+            else if(read16)
+            {
+                sense = _dev.Read16(out cmdBuf, out _, 0, false, true, false, firstLba, blockSize, 0,
+                                    _maximumReadable, false, _dev.Timeout, out _);
+
+                if(_dev.Error || sense)
+                    _maximumReadable /= 2;
+            }
+            else if(read12)
+            {
+                sense = _dev.Read12(out cmdBuf, out _, 0, false, true, false, false, firstLba, blockSize, 0,
+                                    _maximumReadable, false, _dev.Timeout, out _);
+
+                if(_dev.Error || sense)
+                    _maximumReadable /= 2;
+            }
+            else if(read10)
+            {
+                sense = _dev.Read10(out cmdBuf, out _, 0, false, true, false, false, firstLba, blockSize, 0,
+                                    (ushort)_maximumReadable, _dev.Timeout, out _);
+
+                if(_dev.Error || sense)
+                    _maximumReadable /= 2;
+            }
+            else if(read6)
+            {
+                sense = _dev.Read6(out cmdBuf, out _, firstLba, blockSize, (byte)_maximumReadable, _dev.Timeout,
+                                   out _);
+
+                if(_dev.Error || sense)
+                    _maximumReadable /= 2;
+            }
+
+            if(!_dev.Error ||
+               _maximumReadable == 1)
+                break;
+        }
+
+        if(_dev.Error || sense)
+        {
+            _dumpLog.WriteLine("Device error {0} trying to guess ideal transfer length.", _dev.LastError);
+            StoppingErrorMessage?.Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
+        }
+
+        // Try to read the first track pregap
+        if(_dumpFirstTrackPregap && readcd)
+            ReadCdFirstTrackPregap(blockSize, ref currentSpeed, mediaTags, supportedSubchannel, ref totalDuration);
+
+        _dumpLog.WriteLine("Reading {0} sectors at a time.", _maximumReadable);
+        _dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);
+        _dumpLog.WriteLine("Device can read {0} blocks at a time.", _maximumReadable);
+        _dumpLog.WriteLine("Device reports {0} bytes per logical block.", blockSize);
+        _dumpLog.WriteLine("SCSI device type: {0}.", _dev.ScsiType);
+        _dumpLog.WriteLine("Media identified as {0}.", dskType);
+
+        UpdateStatus?.Invoke($"Reading {_maximumReadable} sectors at a time.");
+        UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
+        UpdateStatus?.Invoke($"Device can read {_maximumReadable} blocks at a time.");
+        UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
+        UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
+        UpdateStatus?.Invoke($"Media identified as {dskType}.");
+
+        ret = outputOptical.Create(_outputPath, dskType, _formatOptions, blocks,
+                                   supportsLongSectors ? blockSize : 2048);
+
+        // Cannot create image
+        if(!ret)
+        {
+            _dumpLog.WriteLine("Error creating output image, not continuing.");
+            _dumpLog.WriteLine(outputOptical.ErrorMessage);
+
+            StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
+                                         outputOptical.ErrorMessage);
+
+            return;
+        }
+
+        ErrorNumber errno = outputOptical.ReadMediaTag(MediaTagType.CD_MCN, out byte[] mcnBytes);
+
+        if(errno == ErrorNumber.NoError)
+            mcn = Encoding.ASCII.GetString(mcnBytes);
+
+        if((outputOptical as IWritableOpticalImage).Tracks != null)
+            foreach(Track imgTrack in (outputOptical as IWritableOpticalImage).Tracks)
+            {
+                errno = (outputOptical as IWritableOpticalImage).ReadSectorTag(imgTrack.Sequence,
+                                                                               SectorTagType.CdTrackIsrc, out byte[] isrcBytes);
+
+                if(errno == ErrorNumber.NoError)
+                    isrcs[(byte)imgTrack.Sequence] = Encoding.ASCII.GetString(isrcBytes);
+
+                Track trk = tracks.FirstOrDefault(t => t.Sequence == imgTrack.Sequence);
+
+                if(trk == null)
+                    continue;
+
+                trk.Pregap      = imgTrack.Pregap;
+                trk.StartSector = imgTrack.StartSector;
+                trk.EndSector   = imgTrack.EndSector;
+
+                foreach(KeyValuePair<ushort, int> imgIdx in imgTrack.Indexes)
+                    trk.Indexes[imgIdx.Key] = imgIdx.Value;
+            }
+
+        // Send track list to output plugin. This may fail if subchannel is set but unsupported.
+        ret = (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
+
+        if(!ret &&
+           desiredSubchannel == MmcSubchannel.None)
+        {
+            _dumpLog.WriteLine("Error sending tracks to output image, not continuing.");
+            _dumpLog.WriteLine(outputOptical.ErrorMessage);
+
+            StoppingErrorMessage?.Invoke("Error sending tracks to output image, not continuing." +
+                                         Environment.NewLine + outputOptical.ErrorMessage);
+
+            return;
+        }
+
+        // If a subchannel is supported, check if output plugin allows us to write it.
+        if(desiredSubchannel != MmcSubchannel.None &&
+           !(outputOptical as IWritableOpticalImage).OpticalCapabilities.HasFlag(OpticalImageCapabilities.
+               CanStoreSubchannelRw))
+        {
+            _dumpLog.WriteLine("Output image does not support subchannels, {0}continuing...", _force ? "" : "not ");
+
+            if(_force)
+                ErrorMessage?.Invoke("Output image does not support subchannels, continuing...");
+            else
+            {
+                StoppingErrorMessage?.Invoke("Output image does not support subchannels, not continuing...");
+
+                return;
+            }
+        }
+
+        if(supportedSubchannel != MmcSubchannel.None)
+        {
+            _dumpLog.WriteLine($"Creating subchannel log in {_outputPrefix + ".sub.log"}");
+            subLog = new SubchannelLog(_outputPrefix + ".sub.log", bcdSubchannel);
+        }
+
+        // Set track flags
+        foreach(KeyValuePair<byte, byte> kvp in trackFlags)
+        {
+            Track track = tracks.FirstOrDefault(t => t.Sequence == kvp.Key);
+
+            if(track is null)
+                continue;
+
+            _dumpLog.WriteLine("Setting flags for track {0}...", track.Sequence);
+            UpdateStatus?.Invoke($"Setting flags for track {track.Sequence}...");
+
+            outputOptical.WriteSectorTag(new[]
+            {
+                kvp.Value
+            }, kvp.Key, SectorTagType.CdTrackFlags);
+        }
+
+        // Set MCN
+        if(supportedSubchannel == MmcSubchannel.None)
+        {
+            sense = _dev.ReadMcn(out mcn, out _, out _, _dev.Timeout, out _);
+
+            if(!sense      &&
+               mcn != null &&
+               mcn != "0000000000000")
+            {
+                UpdateStatus?.Invoke($"Found Media Catalogue Number: {mcn}");
+                _dumpLog.WriteLine("Found Media Catalogue Number: {0}", mcn);
+            }
+            else
+                mcn = null;
+        }
+
+        // Set ISRCs
+        if(supportedSubchannel == MmcSubchannel.None)
+            foreach(Track trk in tracks)
+            {
+                sense = _dev.ReadIsrc((byte)trk.Sequence, out string isrc, out _, out _, _dev.Timeout, out _);
+
+                if(sense        ||
+                   isrc == null ||
+                   isrc == "000000000000")
+                    continue;
+
+                isrcs[(byte)trk.Sequence] = isrc;
+
+                UpdateStatus?.Invoke($"Found ISRC for track {trk.Sequence}: {isrc}");
+                _dumpLog.WriteLine($"Found ISRC for track {trk.Sequence}: {isrc}");
+            }
+
+        if(supportedSubchannel != MmcSubchannel.None &&
+           desiredSubchannel   != MmcSubchannel.None)
+        {
+            subchannelExtents = new HashSet<int>();
+
+            _resume.BadSubchannels ??= new List<int>();
+
+            foreach(int sub in _resume.BadSubchannels)
+                subchannelExtents.Add(sub);
+
+            if(_resume.NextBlock < blocks)
+                for(ulong i = _resume.NextBlock; i < blocks; i++)
+                    subchannelExtents.Add((int)i);
+        }
+
+        if(_resume.NextBlock > 0)
+        {
+            UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
+            _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
+        }
+
+        if(_skip < _maximumReadable)
+            _skip = _maximumReadable;
+
+    #if DEBUG
+        foreach(Track trk in tracks)
+            UpdateStatus?.
+                Invoke($"Track {trk.Sequence} starts at LBA {trk.StartSector} and ends at LBA {trk.EndSector}");
+    #endif
+
+        // Check offset
+        if(_fixOffset)
+        {
+            if(tracks.All(t => t.Type != TrackType.Audio))
+            {
+                // No audio tracks so no need to fix offset
+                _dumpLog.WriteLine("No audio tracks, disabling offset fix.");
+                UpdateStatus.Invoke("No audio tracks, disabling offset fix.");
+
+                _fixOffset = false;
+            }
+
+            if(!readcd)
+            {
+                _dumpLog.WriteLine("READ CD command is not supported, disabling offset fix. Dump may not be correct.");
+
+                UpdateStatus?.
+                    Invoke("READ CD command is not supported, disabling offset fix. Dump may not be correct.");
+
+                _fixOffset = false;
+            }
+        }
+        else if(tracks.Any(t => t.Type == TrackType.Audio))
+        {
+            _dumpLog.WriteLine("There are audio tracks and offset fixing is disabled, dump may not be correct.");
+            UpdateStatus?.Invoke("There are audio tracks and offset fixing is disabled, dump may not be correct.");
+        }
+
+        // Search for read offset in main database
+        cdOffset =
+            _ctx.CdOffsets.FirstOrDefault(d => (d.Manufacturer == _dev.Manufacturer ||
+                                                d.Manufacturer == _dev.Manufacturer.Replace('/', '-')) &&
+                                               (d.Model == _dev.Model || d.Model == _dev.Model.Replace('/', '-')));
+
+        Media.Info.CompactDisc.GetOffset(cdOffset, _dbDev, _debug, _dev, dskType, _dumpLog, tracks, UpdateStatus,
+                                         out int? driveOffset, out int? combinedOffset, out _supportsPlextorD8);
+
+        if(combinedOffset is null)
+        {
+            if(driveOffset is null)
+            {
+                _dumpLog.WriteLine("Drive reading offset not found in database.");
+                UpdateStatus?.Invoke("Drive reading offset not found in database.");
+                _dumpLog.WriteLine("Disc offset cannot be calculated.");
+                UpdateStatus?.Invoke("Disc offset cannot be calculated.");
+
+                if(tracks.Any(t => t.Type == TrackType.Audio))
+                {
+                    _dumpLog.WriteLine("Dump may not be correct.");
+
+                    UpdateStatus?.Invoke("Dump may not be correct.");
+                }
+
+                if(_fixOffset)
+                    _fixOffset = false;
+            }
+            else
+            {
+                _dumpLog.WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset   / 4} samples).");
+                UpdateStatus?.Invoke($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
+
+                _dumpLog.WriteLine("Disc write offset is unknown, dump may not be correct.");
+                UpdateStatus?.Invoke("Disc write offset is unknown, dump may not be correct.");
+
+                offsetBytes = driveOffset.Value;
+
                 sectorsForOffset = offsetBytes / (int)sectorSize;
 
                 if(sectorsForOffset < 0)
@@ -1060,358 +1048,369 @@ namespace Aaru.Core.Devices.Dumping
 
                 if(offsetBytes % sectorSize != 0)
                     sectorsForOffset++;
-
-                if(driveOffset is null)
-                {
-                    _dumpLog.WriteLine("Drive reading offset not found in database.");
-                    UpdateStatus?.Invoke("Drive reading offset not found in database.");
-                    _dumpLog.WriteLine($"Combined disc and drive offsets are {offsetBytes} bytes ({offsetBytes / 4} samples).");
-
-                    UpdateStatus?.
-                        Invoke($"Combined disc and drive offsets are {offsetBytes} bytes ({offsetBytes / 4} samples).");
-                }
-                else
-                {
-                    _dumpLog.WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset   / 4} samples).");
-                    UpdateStatus?.Invoke($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
-
-                    discOffset = offsetBytes - driveOffset;
-
-                    _dumpLog.WriteLine($"Disc offsets is {discOffset} bytes ({discOffset / 4} samples)");
-
-                    UpdateStatus?.Invoke($"Disc offsets is {discOffset} bytes ({discOffset / 4} samples)");
-                }
             }
+        }
+        else
+        {
+            offsetBytes      = combinedOffset.Value;
+            sectorsForOffset = offsetBytes / (int)sectorSize;
 
-            if(!_fixOffset ||
-               tracks.All(t => t.Type != TrackType.Audio))
+            if(sectorsForOffset < 0)
+                sectorsForOffset *= -1;
+
+            if(offsetBytes % sectorSize != 0)
+                sectorsForOffset++;
+
+            if(driveOffset is null)
             {
-                offsetBytes      = 0;
-                sectorsForOffset = 0;
+                _dumpLog.WriteLine("Drive reading offset not found in database.");
+                UpdateStatus?.Invoke("Drive reading offset not found in database.");
+                _dumpLog.WriteLine($"Combined disc and drive offsets are {offsetBytes} bytes ({offsetBytes / 4} samples).");
+
+                UpdateStatus?.
+                    Invoke($"Combined disc and drive offsets are {offsetBytes} bytes ({offsetBytes / 4} samples).");
             }
-
-            mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, _maximumReadable, _private);
-            ibgLog  = new IbgLog(_outputPrefix  + ".ibg", 0x0008);
-
-            audioExtents = new ExtentsULong();
-
-            foreach(Track audioTrack in tracks.Where(t => t.Type == TrackType.Audio))
+            else
             {
-                audioExtents.Add(audioTrack.StartSector, audioTrack.EndSector);
+                _dumpLog.WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset   / 4} samples).");
+                UpdateStatus?.Invoke($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
+
+                discOffset = offsetBytes - driveOffset;
+
+                _dumpLog.WriteLine($"Disc offsets is {discOffset} bytes ({discOffset / 4} samples)");
+
+                UpdateStatus?.Invoke($"Disc offsets is {discOffset} bytes ({discOffset / 4} samples)");
             }
+        }
 
-            // Set speed
-            if(_speedMultiplier >= 0)
+        if(!_fixOffset ||
+           tracks.All(t => t.Type != TrackType.Audio))
+        {
+            offsetBytes      = 0;
+            sectorsForOffset = 0;
+        }
+
+        mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, _maximumReadable, _private);
+        ibgLog  = new IbgLog(_outputPrefix  + ".ibg", 0x0008);
+
+        audioExtents = new ExtentsULong();
+
+        foreach(Track audioTrack in tracks.Where(t => t.Type == TrackType.Audio))
+        {
+            audioExtents.Add(audioTrack.StartSector, audioTrack.EndSector);
+        }
+
+        // Set speed
+        if(_speedMultiplier >= 0)
+        {
+            _dumpLog.WriteLine($"Setting speed to {(_speed   == 0 ? "MAX for data reading" : $"{_speed}x")}.");
+            UpdateStatus?.Invoke($"Setting speed to {(_speed == 0 ? "MAX for data reading" : $"{_speed}x")}.");
+
+            _speed *= _speedMultiplier;
+
+            if(_speed == 0 ||
+               _speed > 0xFFFF)
+                _speed = 0xFFFF;
+
+            _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, (ushort)_speed, 0, _dev.Timeout, out _);
+        }
+
+        // Start reading
+        start = DateTime.UtcNow;
+
+        if(dskType == MediaType.CDIREADY)
+        {
+            Track track0 = tracks.FirstOrDefault(t => t.Sequence == 0);
+
+            track0.Type = TrackType.CdMode2Formless;
+
+            if(!supportsLongSectors)
             {
-                _dumpLog.WriteLine($"Setting speed to {(_speed   == 0 ? "MAX for data reading" : $"{_speed}x")}.");
-                UpdateStatus?.Invoke($"Setting speed to {(_speed == 0 ? "MAX for data reading" : $"{_speed}x")}.");
+                _dumpLog.WriteLine("Dumping CD-i Ready requires the output image format to support long sectors.");
 
-                _speed *= _speedMultiplier;
-
-                if(_speed == 0 ||
-                   _speed > 0xFFFF)
-                    _speed = 0xFFFF;
-
-                _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, (ushort)_speed, 0, _dev.Timeout, out _);
-            }
-
-            // Start reading
-            start = DateTime.UtcNow;
-
-            if(dskType == MediaType.CDIREADY)
-            {
-                Track track0 = tracks.FirstOrDefault(t => t.Sequence == 0);
-
-                track0.Type = TrackType.CdMode2Formless;
-
-                if(!supportsLongSectors)
-                {
-                    _dumpLog.WriteLine("Dumping CD-i Ready requires the output image format to support long sectors.");
-
-                    StoppingErrorMessage?.
-                        Invoke("Dumping CD-i Ready requires the output image format to support long sectors.");
-
-                    return;
-                }
-
-                if(!readcd)
-                {
-                    _dumpLog.WriteLine("Dumping CD-i Ready requires the drive to support the READ CD command.");
-
-                    StoppingErrorMessage?.
-                        Invoke("Dumping CD-i Ready requires the drive to support the READ CD command.");
-
-                    return;
-                }
-
-                _dev.ReadCd(out cmdBuf, out _, 0, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
-                            MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None, _dev.Timeout,
-                            out _);
-
-                hiddenData = IsData(cmdBuf);
-
-                if(!hiddenData)
-                {
-                    cdiReadyReadAsAudio = IsScrambledData(cmdBuf, 0, out combinedOffset);
-
-                    if(cdiReadyReadAsAudio)
-                    {
-                        offsetBytes      = combinedOffset.Value;
-                        sectorsForOffset = offsetBytes / (int)sectorSize;
-
-                        if(sectorsForOffset < 0)
-                            sectorsForOffset *= -1;
-
-                        if(offsetBytes % sectorSize != 0)
-                            sectorsForOffset++;
-
-                        _dumpLog.WriteLine("Enabling skipping CD-i Ready hole because drive returns data as audio.");
-
-                        UpdateStatus?.Invoke("Enabling skipping CD-i Ready hole because drive returns data as audio.");
-
-                        _skipCdireadyHole = true;
-
-                        if(driveOffset is null)
-                        {
-                            _dumpLog.WriteLine("Drive reading offset not found in database.");
-                            UpdateStatus?.Invoke("Drive reading offset not found in database.");
-
-                            _dumpLog.
-                                WriteLine($"Combined disc and drive offsets are {offsetBytes} bytes ({offsetBytes / 4} samples).");
-
-                            UpdateStatus?.
-                                Invoke($"Combined disc and drive offsets are {offsetBytes} bytes ({offsetBytes / 4} samples).");
-                        }
-                        else
-                        {
-                            _dumpLog.
-                                WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
-
-                            UpdateStatus?.
-                                Invoke($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
-
-                            discOffset = offsetBytes - driveOffset;
-
-                            _dumpLog.WriteLine($"Disc offsets is {discOffset} bytes ({discOffset / 4} samples)");
-
-                            UpdateStatus?.Invoke($"Disc offsets is {discOffset} bytes ({discOffset / 4} samples)");
-                        }
-                    }
-                }
-
-                if(!_skipCdireadyHole)
-                {
-                    _dumpLog.WriteLine("There will be thousand of errors between track 0 and track 1, that is normal and you can ignore them.");
-
-                    UpdateStatus?.
-                        Invoke("There will be thousand of errors between track 0 and track 1, that is normal and you can ignore them.");
-                }
-
-                if(_skipCdireadyHole)
-                    ReadCdiReady(blockSize, ref currentSpeed, currentTry, extents, ibgLog, ref imageWriteDuration,
-                                 leadOutExtents, ref maxSpeed, mhddLog, ref minSpeed, subSize, supportedSubchannel,
-                                 ref totalDuration, tracks, subLog, desiredSubchannel, isrcs, ref mcn,
-                                 subchannelExtents, blocks, cdiReadyReadAsAudio, offsetBytes, sectorsForOffset,
-                                 smallestPregapLbaPerTrack);
-            }
-
-            ReadCdData(audioExtents, blocks, blockSize, ref currentSpeed, currentTry, extents, ibgLog,
-                       ref imageWriteDuration, lastSector, leadOutExtents, ref maxSpeed, mhddLog, ref minSpeed,
-                       out newTrim, tracks[0].Type != TrackType.Audio, offsetBytes, read6, read10, read12, read16,
-                       readcd, sectorsForOffset, subSize, supportedSubchannel, supportsLongSectors, ref totalDuration,
-                       tracks, subLog, desiredSubchannel, isrcs, ref mcn, subchannelExtents, smallestPregapLbaPerTrack);
-
-            // TODO: Enable when underlying images support lead-outs
-            /*
-            DumpCdLeadOuts(blocks, blockSize, ref currentSpeed, currentTry, extents, ibgLog, ref imageWriteDuration,
-                           leadOutExtents, ref maxSpeed, mhddLog, ref minSpeed, read6, read10, read12, read16, readcd,
-                           supportedSubchannel, subSize, ref totalDuration, subLog, desiredSubchannel, isrcs, ref mcn, tracks,
-                           smallestPregapLbaPerTrack);
-            */
-
-            end = DateTime.UtcNow;
-            mhddLog.Close();
-
-            ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                         blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
-
-            UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
-
-            UpdateStatus?.
-                Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
-
-            UpdateStatus?.
-                Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
-
-            _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
-
-            _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
-
-            _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
-
-            TrimCdUserData(audioExtents, blockSize, currentTry, extents, newTrim, offsetBytes, read6, read10, read12,
-                           read16, readcd, sectorsForOffset, subSize, supportedSubchannel, supportsLongSectors,
-                           ref totalDuration, subLog, desiredSubchannel, tracks, isrcs, ref mcn, subchannelExtents,
-                           smallestPregapLbaPerTrack);
-
-            RetryCdUserData(audioExtents, blockSize, currentTry, extents, offsetBytes, readcd, sectorsForOffset,
-                            subSize, supportedSubchannel, ref totalDuration, subLog, desiredSubchannel, tracks, isrcs,
-                            ref mcn, subchannelExtents, smallestPregapLbaPerTrack, supportsLongSectors);
-
-            foreach(Tuple<ulong, ulong> leadoutExtent in leadOutExtents.ToArray())
-            {
-                for(ulong e = leadoutExtent.Item1; e <= leadoutExtent.Item2; e++)
-                    subchannelExtents.Remove((int)e);
-            }
-
-            if(subchannelExtents.Count > 0 &&
-               _retryPasses            > 0 &&
-               _retrySubchannel)
-                RetrySubchannel(readcd, subSize, supportedSubchannel, ref totalDuration, subLog, desiredSubchannel,
-                                tracks, isrcs, ref mcn, subchannelExtents, smallestPregapLbaPerTrack);
-
-            // Write media tags to image
-            if(!_aborted)
-                foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags)
-                {
-                    if(tag.Value is null)
-                    {
-                        AaruConsole.ErrorWriteLine("Error: Tag type {0} is null, skipping...", tag.Key);
-
-                        continue;
-                    }
-
-                    ret = outputOptical.WriteMediaTag(tag.Value, tag.Key);
-
-                    if(ret || _force)
-                        continue;
-
-                    // Cannot write tag to image
-                    _dumpLog.WriteLine($"Cannot write tag {tag.Key}.");
-                    StoppingErrorMessage?.Invoke(outputOptical.ErrorMessage);
-
-                    return;
-                }
-
-            _resume.BadBlocks.Sort();
-
-            foreach(ulong bad in _resume.BadBlocks)
-                _dumpLog.WriteLine("Sector {0} could not be read.", bad);
-
-            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-
-            _resume.BadSubchannels = new List<int>();
-            _resume.BadSubchannels.AddRange(subchannelExtents);
-            _resume.BadSubchannels.Sort();
-
-            if(_generateSubchannels                                                         &&
-               outputOptical.SupportedSectorTags.Contains(SectorTagType.CdSectorSubchannel) &&
-               !_aborted)
-                Media.CompactDisc.GenerateSubchannels(subchannelExtents, tracks, trackFlags, blocks, subLog, _dumpLog,
-                                                      InitProgress, UpdateProgress, EndProgress, outputOptical);
-
-            // TODO: Disc ID
-            var metadata = new CommonTypes.Structs.ImageInfo
-            {
-                Application        = "Aaru",
-                ApplicationVersion = Version.GetVersion()
-            };
-
-            if(!outputOptical.SetMetadata(metadata))
-                ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
-                                     outputOptical.ErrorMessage);
-
-            outputOptical.SetDumpHardware(_resume.Tries);
-
-            if(_preSidecar != null)
-                outputOptical.SetCicmMetadata(_preSidecar);
-
-            foreach(KeyValuePair<byte, string> isrc in isrcs)
-            {
-                // TODO: Track tags
-                if(!outputOptical.WriteSectorTag(Encoding.ASCII.GetBytes(isrc.Value), isrc.Key,
-                                                 SectorTagType.CdTrackIsrc))
-                    continue;
-
-                UpdateStatus?.Invoke($"Setting ISRC for track {isrc.Key} to {isrc.Value}");
-                _dumpLog.WriteLine("Setting ISRC for track {0} to {1}", isrc.Key, isrc.Value);
-            }
-
-            if(mcn != null &&
-               outputOptical.WriteMediaTag(Encoding.ASCII.GetBytes(mcn), MediaTagType.CD_MCN))
-            {
-                UpdateStatus?.Invoke($"Setting disc Media Catalogue Number to {mcn}");
-                _dumpLog.WriteLine("Setting disc Media Catalogue Number to {0}", mcn);
-            }
-
-            foreach(Track trk in tracks)
-            {
-                // Fix track starts in each session's first track
-                if(tracks.Where(t => t.Session == trk.Session).OrderBy(t => t.Sequence).FirstOrDefault().Sequence ==
-                   trk.Sequence)
-                {
-                    if(trk.Sequence == 1)
-                        continue;
-
-                    trk.StartSector -= trk.Pregap;
-                    trk.Indexes[0]  =  (int)trk.StartSector;
-
-                    continue;
-                }
-
-                if(trk.Indexes.TryGetValue(0, out int idx0) &&
-                   trk.Indexes.TryGetValue(1, out int idx1) &&
-                   idx0 == idx1)
-                    trk.Indexes.Remove(0);
-            }
-
-            (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
-
-            _dumpLog.WriteLine("Closing output file.");
-            UpdateStatus?.Invoke("Closing output file.");
-            DateTime closeStart = DateTime.Now;
-            outputOptical.Close();
-            DateTime closeEnd = DateTime.Now;
-            UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
-
-            subLog?.Close();
-
-            if(_aborted)
-            {
-                _dumpLog.WriteLine("Aborted!");
+                StoppingErrorMessage?.
+                    Invoke("Dumping CD-i Ready requires the output image format to support long sectors.");
 
                 return;
             }
 
-            double totalChkDuration = 0;
+            if(!readcd)
+            {
+                _dumpLog.WriteLine("Dumping CD-i Ready requires the drive to support the READ CD command.");
 
-            if(_metadata)
-                WriteOpticalSidecar(blockSize, blocks, dskType, null, mediaTags, sessions, out totalChkDuration,
-                                    discOffset);
+                StoppingErrorMessage?.
+                    Invoke("Dumping CD-i Ready requires the drive to support the READ CD command.");
 
-            end = DateTime.UtcNow;
-            UpdateStatus?.Invoke("");
+                return;
+            }
 
-            UpdateStatus?.
-                Invoke($"Took a total of {(end - dumpStart).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+            _dev.ReadCd(out cmdBuf, out _, 0, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
+                        MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None, _dev.Timeout,
+                        out _);
 
-            UpdateStatus?.
-                Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+            hiddenData = IsData(cmdBuf);
 
-            if(maxSpeed > 0)
-                UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+            if(!hiddenData)
+            {
+                cdiReadyReadAsAudio = IsScrambledData(cmdBuf, 0, out combinedOffset);
 
-            if(minSpeed > 0 &&
-               minSpeed < double.MaxValue)
-                UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+                if(cdiReadyReadAsAudio)
+                {
+                    offsetBytes      = combinedOffset.Value;
+                    sectorsForOffset = offsetBytes / (int)sectorSize;
 
-            UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
-            UpdateStatus?.Invoke($"{_resume.BadSubchannels.Count} subchannels could not be read.");
-            UpdateStatus?.Invoke("");
+                    if(sectorsForOffset < 0)
+                        sectorsForOffset *= -1;
 
-            Statistics.AddMedia(dskType, true);
+                    if(offsetBytes % sectorSize != 0)
+                        sectorsForOffset++;
+
+                    _dumpLog.WriteLine("Enabling skipping CD-i Ready hole because drive returns data as audio.");
+
+                    UpdateStatus?.Invoke("Enabling skipping CD-i Ready hole because drive returns data as audio.");
+
+                    _skipCdireadyHole = true;
+
+                    if(driveOffset is null)
+                    {
+                        _dumpLog.WriteLine("Drive reading offset not found in database.");
+                        UpdateStatus?.Invoke("Drive reading offset not found in database.");
+
+                        _dumpLog.
+                            WriteLine($"Combined disc and drive offsets are {offsetBytes} bytes ({offsetBytes / 4} samples).");
+
+                        UpdateStatus?.
+                            Invoke($"Combined disc and drive offsets are {offsetBytes} bytes ({offsetBytes / 4} samples).");
+                    }
+                    else
+                    {
+                        _dumpLog.
+                            WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
+
+                        UpdateStatus?.
+                            Invoke($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
+
+                        discOffset = offsetBytes - driveOffset;
+
+                        _dumpLog.WriteLine($"Disc offsets is {discOffset} bytes ({discOffset / 4} samples)");
+
+                        UpdateStatus?.Invoke($"Disc offsets is {discOffset} bytes ({discOffset / 4} samples)");
+                    }
+                }
+            }
+
+            if(!_skipCdireadyHole)
+            {
+                _dumpLog.WriteLine("There will be thousand of errors between track 0 and track 1, that is normal and you can ignore them.");
+
+                UpdateStatus?.
+                    Invoke("There will be thousand of errors between track 0 and track 1, that is normal and you can ignore them.");
+            }
+
+            if(_skipCdireadyHole)
+                ReadCdiReady(blockSize, ref currentSpeed, currentTry, extents, ibgLog, ref imageWriteDuration,
+                             leadOutExtents, ref maxSpeed, mhddLog, ref minSpeed, subSize, supportedSubchannel,
+                             ref totalDuration, tracks, subLog, desiredSubchannel, isrcs, ref mcn,
+                             subchannelExtents, blocks, cdiReadyReadAsAudio, offsetBytes, sectorsForOffset,
+                             smallestPregapLbaPerTrack);
         }
+
+        ReadCdData(audioExtents, blocks, blockSize, ref currentSpeed, currentTry, extents, ibgLog,
+                   ref imageWriteDuration, lastSector, leadOutExtents, ref maxSpeed, mhddLog, ref minSpeed,
+                   out newTrim, tracks[0].Type != TrackType.Audio, offsetBytes, read6, read10, read12, read16,
+                   readcd, sectorsForOffset, subSize, supportedSubchannel, supportsLongSectors, ref totalDuration,
+                   tracks, subLog, desiredSubchannel, isrcs, ref mcn, subchannelExtents, smallestPregapLbaPerTrack);
+
+        // TODO: Enable when underlying images support lead-outs
+        /*
+        DumpCdLeadOuts(blocks, blockSize, ref currentSpeed, currentTry, extents, ibgLog, ref imageWriteDuration,
+                       leadOutExtents, ref maxSpeed, mhddLog, ref minSpeed, read6, read10, read12, read16, readcd,
+                       supportedSubchannel, subSize, ref totalDuration, subLog, desiredSubchannel, isrcs, ref mcn, tracks,
+                       smallestPregapLbaPerTrack);
+        */
+
+        end = DateTime.UtcNow;
+        mhddLog.Close();
+
+        ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                     blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+
+        UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+
+        UpdateStatus?.
+            Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
+
+        UpdateStatus?.
+            Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
+
+        _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
+
+        _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
+
+        _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
+
+        TrimCdUserData(audioExtents, blockSize, currentTry, extents, newTrim, offsetBytes, read6, read10, read12,
+                       read16, readcd, sectorsForOffset, subSize, supportedSubchannel, supportsLongSectors,
+                       ref totalDuration, subLog, desiredSubchannel, tracks, isrcs, ref mcn, subchannelExtents,
+                       smallestPregapLbaPerTrack);
+
+        RetryCdUserData(audioExtents, blockSize, currentTry, extents, offsetBytes, readcd, sectorsForOffset,
+                        subSize, supportedSubchannel, ref totalDuration, subLog, desiredSubchannel, tracks, isrcs,
+                        ref mcn, subchannelExtents, smallestPregapLbaPerTrack, supportsLongSectors);
+
+        foreach(Tuple<ulong, ulong> leadoutExtent in leadOutExtents.ToArray())
+        {
+            for(ulong e = leadoutExtent.Item1; e <= leadoutExtent.Item2; e++)
+                subchannelExtents.Remove((int)e);
+        }
+
+        if(subchannelExtents.Count > 0 &&
+           _retryPasses            > 0 &&
+           _retrySubchannel)
+            RetrySubchannel(readcd, subSize, supportedSubchannel, ref totalDuration, subLog, desiredSubchannel,
+                            tracks, isrcs, ref mcn, subchannelExtents, smallestPregapLbaPerTrack);
+
+        // Write media tags to image
+        if(!_aborted)
+            foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags)
+            {
+                if(tag.Value is null)
+                {
+                    AaruConsole.ErrorWriteLine("Error: Tag type {0} is null, skipping...", tag.Key);
+
+                    continue;
+                }
+
+                ret = outputOptical.WriteMediaTag(tag.Value, tag.Key);
+
+                if(ret || _force)
+                    continue;
+
+                // Cannot write tag to image
+                _dumpLog.WriteLine($"Cannot write tag {tag.Key}.");
+                StoppingErrorMessage?.Invoke(outputOptical.ErrorMessage);
+
+                return;
+            }
+
+        _resume.BadBlocks.Sort();
+
+        foreach(ulong bad in _resume.BadBlocks)
+            _dumpLog.WriteLine("Sector {0} could not be read.", bad);
+
+        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+
+        _resume.BadSubchannels = new List<int>();
+        _resume.BadSubchannels.AddRange(subchannelExtents);
+        _resume.BadSubchannels.Sort();
+
+        if(_generateSubchannels                                                         &&
+           outputOptical.SupportedSectorTags.Contains(SectorTagType.CdSectorSubchannel) &&
+           !_aborted)
+            Media.CompactDisc.GenerateSubchannels(subchannelExtents, tracks, trackFlags, blocks, subLog, _dumpLog,
+                                                  InitProgress, UpdateProgress, EndProgress, outputOptical);
+
+        // TODO: Disc ID
+        var metadata = new CommonTypes.Structs.ImageInfo
+        {
+            Application        = "Aaru",
+            ApplicationVersion = Version.GetVersion()
+        };
+
+        if(!outputOptical.SetMetadata(metadata))
+            ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
+                                 outputOptical.ErrorMessage);
+
+        outputOptical.SetDumpHardware(_resume.Tries);
+
+        if(_preSidecar != null)
+            outputOptical.SetCicmMetadata(_preSidecar);
+
+        foreach(KeyValuePair<byte, string> isrc in isrcs)
+        {
+            // TODO: Track tags
+            if(!outputOptical.WriteSectorTag(Encoding.ASCII.GetBytes(isrc.Value), isrc.Key,
+                                             SectorTagType.CdTrackIsrc))
+                continue;
+
+            UpdateStatus?.Invoke($"Setting ISRC for track {isrc.Key} to {isrc.Value}");
+            _dumpLog.WriteLine("Setting ISRC for track {0} to {1}", isrc.Key, isrc.Value);
+        }
+
+        if(mcn != null &&
+           outputOptical.WriteMediaTag(Encoding.ASCII.GetBytes(mcn), MediaTagType.CD_MCN))
+        {
+            UpdateStatus?.Invoke($"Setting disc Media Catalogue Number to {mcn}");
+            _dumpLog.WriteLine("Setting disc Media Catalogue Number to {0}", mcn);
+        }
+
+        foreach(Track trk in tracks)
+        {
+            // Fix track starts in each session's first track
+            if(tracks.Where(t => t.Session == trk.Session).OrderBy(t => t.Sequence).FirstOrDefault().Sequence ==
+               trk.Sequence)
+            {
+                if(trk.Sequence == 1)
+                    continue;
+
+                trk.StartSector -= trk.Pregap;
+                trk.Indexes[0]  =  (int)trk.StartSector;
+
+                continue;
+            }
+
+            if(trk.Indexes.TryGetValue(0, out int idx0) &&
+               trk.Indexes.TryGetValue(1, out int idx1) &&
+               idx0 == idx1)
+                trk.Indexes.Remove(0);
+        }
+
+        (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
+
+        _dumpLog.WriteLine("Closing output file.");
+        UpdateStatus?.Invoke("Closing output file.");
+        DateTime closeStart = DateTime.Now;
+        outputOptical.Close();
+        DateTime closeEnd = DateTime.Now;
+        UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
+
+        subLog?.Close();
+
+        if(_aborted)
+        {
+            _dumpLog.WriteLine("Aborted!");
+
+            return;
+        }
+
+        double totalChkDuration = 0;
+
+        if(_metadata)
+            WriteOpticalSidecar(blockSize, blocks, dskType, null, mediaTags, sessions, out totalChkDuration,
+                                discOffset);
+
+        end = DateTime.UtcNow;
+        UpdateStatus?.Invoke("");
+
+        UpdateStatus?.
+            Invoke($"Took a total of {(end - dumpStart).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+
+        UpdateStatus?.
+            Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+
+        if(maxSpeed > 0)
+            UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+
+        if(minSpeed > 0 &&
+           minSpeed < double.MaxValue)
+            UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+
+        UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
+        UpdateStatus?.Invoke($"{_resume.BadSubchannels.Count} subchannels could not be read.");
+        UpdateStatus?.Invoke("");
+
+        Statistics.AddMedia(dskType, true);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
index 9a2a5f56a..bf02420b2 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
@@ -49,641 +49,640 @@ using TrackType = Aaru.CommonTypes.Enums.TrackType;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Retried errored sectors in CompactDisc</summary>
+    /// <param name="audioExtents">Extents with audio sectors</param>
+    /// <param name="blockSize">Size of the read sector in bytes</param>
+    /// <param name="currentTry">Current dump hardware try</param>
+    /// <param name="extents">Extents</param>
+    /// <param name="offsetBytes">Read offset</param>
+    /// <param name="readcd">Device supports READ CD</param>
+    /// <param name="sectorsForOffset">Sectors needed to fix offset</param>
+    /// <param name="subSize">Subchannel size in bytes</param>
+    /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
+    /// <param name="supportsLongSectors">Supports reading EDC and ECC</param>
+    /// <param name="totalDuration">Total commands duration</param>
+    /// <param name="tracks">Disc tracks</param>
+    /// <param name="subLog">Subchannel log</param>
+    /// <param name="desiredSubchannel">Subchannel desired to save</param>
+    /// <param name="isrcs">List of disc ISRCs</param>
+    /// <param name="mcn">Disc media catalogue number</param>
+    /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
+    /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
+    void RetryCdUserData(ExtentsULong audioExtents, uint blockSize, DumpHardwareType currentTry,
+                         ExtentsULong extents, int offsetBytes, bool readcd, int sectorsForOffset, uint subSize,
+                         MmcSubchannel supportedSubchannel, ref double totalDuration, SubchannelLog subLog,
+                         MmcSubchannel desiredSubchannel, Track[] tracks, Dictionary<byte, string> isrcs,
+                         ref string mcn, HashSet<int> subchannelExtents,
+                         Dictionary<byte, int> smallestPregapLbaPerTrack, bool supportsLongSectors)
     {
-        /// <summary>Retried errored sectors in CompactDisc</summary>
-        /// <param name="audioExtents">Extents with audio sectors</param>
-        /// <param name="blockSize">Size of the read sector in bytes</param>
-        /// <param name="currentTry">Current dump hardware try</param>
-        /// <param name="extents">Extents</param>
-        /// <param name="offsetBytes">Read offset</param>
-        /// <param name="readcd">Device supports READ CD</param>
-        /// <param name="sectorsForOffset">Sectors needed to fix offset</param>
-        /// <param name="subSize">Subchannel size in bytes</param>
-        /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
-        /// <param name="supportsLongSectors">Supports reading EDC and ECC</param>
-        /// <param name="totalDuration">Total commands duration</param>
-        /// <param name="tracks">Disc tracks</param>
-        /// <param name="subLog">Subchannel log</param>
-        /// <param name="desiredSubchannel">Subchannel desired to save</param>
-        /// <param name="isrcs">List of disc ISRCs</param>
-        /// <param name="mcn">Disc media catalogue number</param>
-        /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
-        /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
-        void RetryCdUserData(ExtentsULong audioExtents, uint blockSize, DumpHardwareType currentTry,
-                             ExtentsULong extents, int offsetBytes, bool readcd, int sectorsForOffset, uint subSize,
-                             MmcSubchannel supportedSubchannel, ref double totalDuration, SubchannelLog subLog,
-                             MmcSubchannel desiredSubchannel, Track[] tracks, Dictionary<byte, string> isrcs,
-                             ref string mcn, HashSet<int> subchannelExtents,
-                             Dictionary<byte, int> smallestPregapLbaPerTrack, bool supportsLongSectors)
+        bool              sense  = true;     // Sense indicator
+        byte[]            cmdBuf = null;     // Data buffer
+        double            cmdDuration;       // Command execution time
+        const uint        sectorSize = 2352; // Full sector size
+        byte[]            senseBuf   = null; // Sense buffer
+        PlextorSubchannel supportedPlextorSubchannel;
+        var               outputOptical = _outputPlugin as IWritableOpticalImage;
+
+        switch(supportedSubchannel)
         {
-            bool              sense  = true;     // Sense indicator
-            byte[]            cmdBuf = null;     // Data buffer
-            double            cmdDuration;       // Command execution time
-            const uint        sectorSize = 2352; // Full sector size
-            byte[]            senseBuf   = null; // Sense buffer
-            PlextorSubchannel supportedPlextorSubchannel;
-            var               outputOptical = _outputPlugin as IWritableOpticalImage;
+            case MmcSubchannel.None:
+                supportedPlextorSubchannel = PlextorSubchannel.None;
 
-            switch(supportedSubchannel)
+                break;
+            case MmcSubchannel.Raw:
+                supportedPlextorSubchannel = PlextorSubchannel.Pack;
+
+                break;
+            case MmcSubchannel.Q16:
+                supportedPlextorSubchannel = PlextorSubchannel.Q16;
+
+                break;
+            default:
+                supportedPlextorSubchannel = PlextorSubchannel.None;
+
+                break;
+        }
+
+        if(_resume.BadBlocks.Count <= 0 ||
+           _aborted                     ||
+           _retryPasses <= 0)
+            return;
+
+        int  pass              = 1;
+        bool forward           = true;
+        bool runningPersistent = false;
+
+        Modes.ModePage? currentModePage = null;
+        byte[]          md6;
+        byte[]          md10;
+
+        if(_persistent)
+        {
+            Modes.ModePage_01_MMC pgMmc;
+
+            sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x01, _dev.Timeout,
+                                    out _);
+
+            if(sense)
             {
-                case MmcSubchannel.None:
-                    supportedPlextorSubchannel = PlextorSubchannel.None;
+                sense = _dev.ModeSense10(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x01,
+                                         _dev.Timeout, out _);
 
-                    break;
-                case MmcSubchannel.Raw:
-                    supportedPlextorSubchannel = PlextorSubchannel.Pack;
-
-                    break;
-                case MmcSubchannel.Q16:
-                    supportedPlextorSubchannel = PlextorSubchannel.Q16;
-
-                    break;
-                default:
-                    supportedPlextorSubchannel = PlextorSubchannel.None;
-
-                    break;
-            }
-
-            if(_resume.BadBlocks.Count <= 0 ||
-               _aborted                     ||
-               _retryPasses <= 0)
-                return;
-
-            int  pass              = 1;
-            bool forward           = true;
-            bool runningPersistent = false;
-
-            Modes.ModePage? currentModePage = null;
-            byte[]          md6;
-            byte[]          md10;
-
-            if(_persistent)
-            {
-                Modes.ModePage_01_MMC pgMmc;
-
-                sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x01, _dev.Timeout,
-                                        out _);
-
-                if(sense)
+                if(!sense)
                 {
-                    sense = _dev.ModeSense10(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x01,
-                                             _dev.Timeout, out _);
+                    Modes.DecodedMode? dcMode10 =
+                        Modes.DecodeMode10(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
 
-                    if(!sense)
-                    {
-                        Modes.DecodedMode? dcMode10 =
-                            Modes.DecodeMode10(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
-
-                        if(dcMode10?.Pages != null)
-                            foreach(Modes.ModePage modePage in dcMode10.Value.Pages.Where(modePage =>
-                                modePage.Page == 0x01 && modePage.Subpage == 0x00))
-                                currentModePage = modePage;
-                    }
-                }
-                else
-                {
-                    Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
-
-                    if(dcMode6?.Pages != null)
-                        foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
-                            modePage.Page == 0x01 && modePage.Subpage == 0x00))
+                    if(dcMode10?.Pages != null)
+                        foreach(Modes.ModePage modePage in dcMode10.Value.Pages.Where(modePage =>
+                                    modePage.Page == 0x01 && modePage.Subpage == 0x00))
                             currentModePage = modePage;
                 }
+            }
+            else
+            {
+                Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
 
-                if(currentModePage == null)
+                if(dcMode6?.Pages != null)
+                    foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
+                                modePage.Page == 0x01 && modePage.Subpage == 0x00))
+                        currentModePage = modePage;
+            }
+
+            if(currentModePage == null)
+            {
+                pgMmc = new Modes.ModePage_01_MMC
                 {
-                    pgMmc = new Modes.ModePage_01_MMC
-                    {
-                        PS             = false,
-                        ReadRetryCount = 32,
-                        Parameter      = 0x00
-                    };
+                    PS             = false,
+                    ReadRetryCount = 32,
+                    Parameter      = 0x00
+                };
 
-                    currentModePage = new Modes.ModePage
+                currentModePage = new Modes.ModePage
+                {
+                    Page         = 0x01,
+                    Subpage      = 0x00,
+                    PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
+                };
+            }
+
+            pgMmc = new Modes.ModePage_01_MMC
+            {
+                PS             = false,
+                ReadRetryCount = 255,
+                Parameter      = 0x20
+            };
+
+            var md = new Modes.DecodedMode
+            {
+                Header = new Modes.ModeHeader(),
+                Pages = new[]
+                {
+                    new Modes.ModePage
                     {
                         Page         = 0x01,
                         Subpage      = 0x00,
                         PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
-                    };
+                    }
+                }
+            };
+
+            md6  = Modes.EncodeMode6(md, _dev.ScsiType);
+            md10 = Modes.EncodeMode10(md, _dev.ScsiType);
+
+            UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks).");
+            _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
+            sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
+
+            if(sense)
+                sense = _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
+
+            if(sense)
+            {
+                UpdateStatus?.
+                    Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
+
+                AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
+
+                _dumpLog.WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
+            }
+            else
+            {
+                runningPersistent = true;
+            }
+        }
+
+        InitProgress?.Invoke();
+        cdRepeatRetry:
+        ulong[]     tmpArray              = _resume.BadBlocks.ToArray();
+        List<ulong> sectorsNotEvenPartial = new List<ulong>();
+
+        for(int i = 0; i < tmpArray.Length; i++)
+        {
+            ulong badSector = tmpArray[i];
+
+            if(_aborted)
+            {
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                _dumpLog.WriteLine("Aborted!");
+
+                break;
+            }
+
+            PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
+                                                forward ? "forward" : "reverse",
+                                                runningPersistent ? "recovering partial data, " : ""));
+
+            Track track = tracks.OrderBy(t => t.StartSector).
+                                 LastOrDefault(t => badSector >= t.StartSector);
+
+            byte sectorsToReRead   = 1;
+            uint badSectorToReRead = (uint)badSector;
+
+            if(_fixOffset                       &&
+               audioExtents.Contains(badSector) &&
+               offsetBytes != 0)
+            {
+                if(offsetBytes > 0)
+                {
+                    badSectorToReRead -= (uint)sectorsForOffset;
                 }
 
-                pgMmc = new Modes.ModePage_01_MMC
-                {
-                    PS             = false,
-                    ReadRetryCount = 255,
-                    Parameter      = 0x20
-                };
+                sectorsToReRead = (byte)(sectorsForOffset + 1);
+            }
 
-                var md = new Modes.DecodedMode
+            if(_supportsPlextorD8 && audioExtents.Contains(badSector))
+            {
+                sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf, badSectorToReRead, blockSize,
+                                                  sectorsToReRead, supportedPlextorSubchannel, out cmdDuration);
+
+                totalDuration += cmdDuration;
+            }
+            else if(readcd)
+            {
+                if(audioExtents.Contains(badSector))
                 {
-                    Header = new Modes.ModeHeader(),
-                    Pages = new[]
+                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, badSectorToReRead, blockSize, sectorsToReRead,
+                                        MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
+                                        MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
+
+                    if(sense)
                     {
-                        new Modes.ModePage
+                        DecodedSense? decSense = Sense.Decode(senseBuf);
+
+                        // Try to workaround firmware
+                        if((decSense?.ASC == 0x11 && decSense?.ASCQ == 0x05) ||
+                           decSense?.ASC == 0x64)
                         {
-                            Page         = 0x01,
-                            Subpage      = 0x00,
-                            PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
+                            sense = _dev.ReadCd(out cmdBuf, out _, badSectorToReRead, blockSize, sectorsToReRead,
+                                                MmcSectorTypes.AllTypes, false, false, true,
+                                                MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                                supportedSubchannel, _dev.Timeout, out double cmdDuration2);
+
+                            cmdDuration += cmdDuration2;
                         }
                     }
-                };
-
-                md6  = Modes.EncodeMode6(md, _dev.ScsiType);
-                md10 = Modes.EncodeMode10(md, _dev.ScsiType);
-
-                UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks).");
-                _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
-                sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
-
-                if(sense)
-                    sense = _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
-
-                if(sense)
-                {
-                    UpdateStatus?.
-                        Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
-
-                    AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
-
-                    _dumpLog.WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
                 }
                 else
                 {
-                    runningPersistent = true;
-                }
-            }
+                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, badSectorToReRead, blockSize, sectorsToReRead,
+                                        MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                        true, true, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
+                                        out cmdDuration);
 
-            InitProgress?.Invoke();
-            cdRepeatRetry:
-            ulong[]     tmpArray              = _resume.BadBlocks.ToArray();
-            List<ulong> sectorsNotEvenPartial = new List<ulong>();
-
-            for(int i = 0; i < tmpArray.Length; i++)
-            {
-                ulong badSector = tmpArray[i];
-
-                if(_aborted)
-                {
-                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    _dumpLog.WriteLine("Aborted!");
-
-                    break;
-                }
-
-                PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
-                                                    forward ? "forward" : "reverse",
-                                                    runningPersistent ? "recovering partial data, " : ""));
-
-                Track track = tracks.OrderBy(t => t.StartSector).
-                                     LastOrDefault(t => badSector >= t.StartSector);
-
-                byte sectorsToReRead   = 1;
-                uint badSectorToReRead = (uint)badSector;
-
-                if(_fixOffset                       &&
-                   audioExtents.Contains(badSector) &&
-                   offsetBytes != 0)
-                {
-                    if(offsetBytes > 0)
+                    if(sense)
                     {
-                        badSectorToReRead -= (uint)sectorsForOffset;
-                    }
+                        DecodedSense? decSense = Sense.Decode(senseBuf);
 
-                    sectorsToReRead = (byte)(sectorsForOffset + 1);
-                }
-
-                if(_supportsPlextorD8 && audioExtents.Contains(badSector))
-                {
-                    sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf, badSectorToReRead, blockSize,
-                                                      sectorsToReRead, supportedPlextorSubchannel, out cmdDuration);
-
-                    totalDuration += cmdDuration;
-                }
-                else if(readcd)
-                {
-                    if(audioExtents.Contains(badSector))
-                    {
-                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, badSectorToReRead, blockSize, sectorsToReRead,
-                                            MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                            MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
-
-                        if(sense)
+                        // Try to workaround firmware
+                        if((decSense?.ASC == 0x11 && decSense?.ASCQ == 0x05) ||
+                           decSense?.ASC == 0x64)
                         {
-                            DecodedSense? decSense = Sense.Decode(senseBuf);
+                            sense = _dev.ReadCd(out cmdBuf, out _, badSectorToReRead, blockSize, sectorsToReRead,
+                                                MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
+                                                false, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
+                                                out double cmdDuration2);
 
-                            // Try to workaround firmware
-                            if((decSense?.ASC == 0x11 && decSense?.ASCQ == 0x05) ||
-                               decSense?.ASC == 0x64)
-                            {
-                                sense = _dev.ReadCd(out cmdBuf, out _, badSectorToReRead, blockSize, sectorsToReRead,
-                                                    MmcSectorTypes.AllTypes, false, false, true,
-                                                    MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                                    supportedSubchannel, _dev.Timeout, out double cmdDuration2);
-
-                                cmdDuration += cmdDuration2;
-                            }
+                            cmdDuration += cmdDuration2;
                         }
                     }
-                    else
+                }
+
+                totalDuration += cmdDuration;
+            }
+
+            if(sense || _dev.Error)
+            {
+                _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
+
+                if(!runningPersistent)
+                    continue;
+
+                DecodedSense? decSense = Sense.Decode(senseBuf);
+
+                // MEDIUM ERROR, retry with ignore error below
+                if(decSense is { ASC: 0x11 })
+                    if(!sectorsNotEvenPartial.Contains(badSector))
+                        sectorsNotEvenPartial.Add(badSector);
+            }
+
+            // Because one block has been partially used to fix the offset
+            if(_fixOffset                       &&
+               audioExtents.Contains(badSector) &&
+               offsetBytes != 0)
+            {
+                uint blocksToRead = sectorsToReRead;
+
+                FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel, ref blocksToRead,
+                              subSize, ref cmdBuf, blockSize, false);
+            }
+
+            if(!sense &&
+               !_dev.Error)
+            {
+                _resume.BadBlocks.Remove(badSector);
+                extents.Add(badSector);
+                UpdateStatus?.Invoke($"Correctly retried sector {badSector} in pass {pass}.");
+                _dumpLog.WriteLine("Correctly retried sector {0} in pass {1}.", badSector, pass);
+                sectorsNotEvenPartial.Remove(badSector);
+            }
+            else
+                _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
+
+            if(supportedSubchannel != MmcSubchannel.None)
+            {
+                byte[] data = new byte[sectorSize];
+                byte[] sub  = new byte[subSize];
+                Array.Copy(cmdBuf, 0, data, 0, sectorSize);
+                Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
+
+                if(supportsLongSectors)
+                    outputOptical.WriteSectorLong(data, badSector);
+                else
+                    outputOptical.WriteSector(Sector.GetUserData(data), badSector);
+
+                bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
+                                                                               desiredSubchannel, sub, badSector, 1, subLog, isrcs, (byte)track.Sequence, ref mcn,
+                                                                               tracks, subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
+                                                                               _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
+
+                // Set tracks and go back
+                if(!indexesChanged)
+                    continue;
+
+                (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
+                i--;
+            }
+            else
+            {
+                if(supportsLongSectors)
+                    outputOptical.WriteSectorLong(cmdBuf, badSector);
+                else
+                    outputOptical.WriteSector(Sector.GetUserData(cmdBuf), badSector);
+            }
+        }
+
+        if(pass < _retryPasses &&
+           !_aborted           &&
+           _resume.BadBlocks.Count > 0)
+        {
+            pass++;
+            forward = !forward;
+            _resume.BadBlocks.Sort();
+
+            if(!forward)
+                _resume.BadBlocks.Reverse();
+
+            goto cdRepeatRetry;
+        }
+
+        EndProgress?.Invoke();
+
+        // TODO: Enable when underlying images support lead-outs
+        /*
+            RetryCdLeadOuts(blocks, blockSize, ref currentSpeed, currentTry, extents, ibgLog, ref imageWriteDuration,
+                   leadOutExtents, ref maxSpeed, mhddLog, ref minSpeed, read6, read10, read12, read16, readcd,
+                   supportedSubchannel, subSize, ref totalDuration);
+            */
+
+        // Try to ignore read errors, on some drives this allows to recover partial even if damaged data
+        if(_persistent && sectorsNotEvenPartial.Count > 0)
+        {
+            var pgMmc = new Modes.ModePage_01_MMC
+            {
+                PS             = false,
+                ReadRetryCount = 255,
+                Parameter      = 0x01
+            };
+
+            var md = new Modes.DecodedMode
+            {
+                Header = new Modes.ModeHeader(),
+                Pages = new[]
+                {
+                    new Modes.ModePage
                     {
-                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, badSectorToReRead, blockSize, sectorsToReRead,
+                        Page         = 0x01,
+                        Subpage      = 0x00,
+                        PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
+                    }
+                }
+            };
+
+            md6  = Modes.EncodeMode6(md, _dev.ScsiType);
+            md10 = Modes.EncodeMode10(md, _dev.ScsiType);
+
+            _dumpLog.WriteLine("Sending MODE SELECT to drive (ignore error correction).");
+            sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
+
+            if(sense)
+                sense = _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
+
+            if(!sense)
+            {
+                runningPersistent = true;
+
+                InitProgress?.Invoke();
+
+                for(int i = 0; i < sectorsNotEvenPartial.Count; i++)
+                {
+                    ulong badSector = sectorsNotEvenPartial[i];
+
+                    if(_aborted)
+                    {
+                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                        _dumpLog.WriteLine("Aborted!");
+
+                        break;
+                    }
+
+                    PulseProgress?.Invoke($"Trying to get partial data for sector {badSector}");
+
+                    Track track = tracks.OrderBy(t => t.StartSector).
+                                         LastOrDefault(t => badSector >= t.StartSector);
+
+                    if(readcd)
+                    {
+                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)badSector, blockSize, 1,
                                             MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
                                             true, true, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
                                             out cmdDuration);
 
-                        if(sense)
-                        {
-                            DecodedSense? decSense = Sense.Decode(senseBuf);
-
-                            // Try to workaround firmware
-                            if((decSense?.ASC == 0x11 && decSense?.ASCQ == 0x05) ||
-                               decSense?.ASC == 0x64)
-                            {
-                                sense = _dev.ReadCd(out cmdBuf, out _, badSectorToReRead, blockSize, sectorsToReRead,
-                                                    MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
-                                                    false, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
-                                                    out double cmdDuration2);
-
-                                cmdDuration += cmdDuration2;
-                            }
-                        }
+                        totalDuration += cmdDuration;
                     }
 
-                    totalDuration += cmdDuration;
-                }
-
-                if(sense || _dev.Error)
-                {
-                    _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
-
-                    if(!runningPersistent)
-                        continue;
-
-                    DecodedSense? decSense = Sense.Decode(senseBuf);
-
-                    // MEDIUM ERROR, retry with ignore error below
-                    if(decSense is { ASC: 0x11 })
-                        if(!sectorsNotEvenPartial.Contains(badSector))
-                            sectorsNotEvenPartial.Add(badSector);
-                }
-
-                // Because one block has been partially used to fix the offset
-                if(_fixOffset                       &&
-                   audioExtents.Contains(badSector) &&
-                   offsetBytes != 0)
-                {
-                    uint blocksToRead = sectorsToReRead;
-
-                    FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel, ref blocksToRead,
-                                  subSize, ref cmdBuf, blockSize, false);
-                }
-
-                if(!sense &&
-                   !_dev.Error)
-                {
-                    _resume.BadBlocks.Remove(badSector);
-                    extents.Add(badSector);
-                    UpdateStatus?.Invoke($"Correctly retried sector {badSector} in pass {pass}.");
-                    _dumpLog.WriteLine("Correctly retried sector {0} in pass {1}.", badSector, pass);
-                    sectorsNotEvenPartial.Remove(badSector);
-                }
-                else
-                    _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
-
-                if(supportedSubchannel != MmcSubchannel.None)
-                {
-                    byte[] data = new byte[sectorSize];
-                    byte[] sub  = new byte[subSize];
-                    Array.Copy(cmdBuf, 0, data, 0, sectorSize);
-                    Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
-
-                    if(supportsLongSectors)
-                        outputOptical.WriteSectorLong(data, badSector);
-                    else
-                        outputOptical.WriteSector(Sector.GetUserData(data), badSector);
-
-                    bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
-                        desiredSubchannel, sub, badSector, 1, subLog, isrcs, (byte)track.Sequence, ref mcn,
-                        tracks, subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
-                        _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
-
-                    // Set tracks and go back
-                    if(!indexesChanged)
-                        continue;
-
-                    (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
-                    i--;
-                }
-                else
-                {
-                    if(supportsLongSectors)
-                        outputOptical.WriteSectorLong(cmdBuf, badSector);
-                    else
-                        outputOptical.WriteSector(Sector.GetUserData(cmdBuf), badSector);
-                }
-            }
-
-            if(pass < _retryPasses &&
-               !_aborted           &&
-               _resume.BadBlocks.Count > 0)
-            {
-                pass++;
-                forward = !forward;
-                _resume.BadBlocks.Sort();
-
-                if(!forward)
-                    _resume.BadBlocks.Reverse();
-
-                goto cdRepeatRetry;
-            }
-
-            EndProgress?.Invoke();
-
-            // TODO: Enable when underlying images support lead-outs
-            /*
-                RetryCdLeadOuts(blocks, blockSize, ref currentSpeed, currentTry, extents, ibgLog, ref imageWriteDuration,
-                       leadOutExtents, ref maxSpeed, mhddLog, ref minSpeed, read6, read10, read12, read16, readcd,
-                       supportedSubchannel, subSize, ref totalDuration);
-                */
-
-            // Try to ignore read errors, on some drives this allows to recover partial even if damaged data
-            if(_persistent && sectorsNotEvenPartial.Count > 0)
-            {
-                var pgMmc = new Modes.ModePage_01_MMC
-                {
-                    PS             = false,
-                    ReadRetryCount = 255,
-                    Parameter      = 0x01
-                };
-
-                var md = new Modes.DecodedMode
-                {
-                    Header = new Modes.ModeHeader(),
-                    Pages = new[]
+                    if(sense || _dev.Error)
                     {
-                        new Modes.ModePage
-                        {
-                            Page         = 0x01,
-                            Subpage      = 0x00,
-                            PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
-                        }
+                        _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
+
+                        continue;
                     }
-                };
 
-                md6  = Modes.EncodeMode6(md, _dev.ScsiType);
-                md10 = Modes.EncodeMode10(md, _dev.ScsiType);
+                    _dumpLog.WriteLine("Got partial data for sector {0} in pass {1}.", badSector, pass);
 
-                _dumpLog.WriteLine("Sending MODE SELECT to drive (ignore error correction).");
-                sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
-
-                if(sense)
-                    sense = _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
-
-                if(!sense)
-                {
-                    runningPersistent = true;
-
-                    InitProgress?.Invoke();
-
-                    for(int i = 0; i < sectorsNotEvenPartial.Count; i++)
+                    if(supportedSubchannel != MmcSubchannel.None)
                     {
-                        ulong badSector = sectorsNotEvenPartial[i];
+                        byte[] data = new byte[sectorSize];
+                        byte[] sub  = new byte[subSize];
+                        Array.Copy(cmdBuf, 0, data, 0, sectorSize);
+                        Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
 
-                        if(_aborted)
-                        {
-                            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                            _dumpLog.WriteLine("Aborted!");
-
-                            break;
-                        }
-
-                        PulseProgress?.Invoke($"Trying to get partial data for sector {badSector}");
-
-                        Track track = tracks.OrderBy(t => t.StartSector).
-                                             LastOrDefault(t => badSector >= t.StartSector);
-
-                        if(readcd)
-                        {
-                            sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)badSector, blockSize, 1,
-                                                MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                                true, true, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
-                                                out cmdDuration);
-
-                            totalDuration += cmdDuration;
-                        }
-
-                        if(sense || _dev.Error)
-                        {
-                            _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
-
-                            continue;
-                        }
-
-                        _dumpLog.WriteLine("Got partial data for sector {0} in pass {1}.", badSector, pass);
-
-                        if(supportedSubchannel != MmcSubchannel.None)
-                        {
-                            byte[] data = new byte[sectorSize];
-                            byte[] sub  = new byte[subSize];
-                            Array.Copy(cmdBuf, 0, data, 0, sectorSize);
-                            Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
-
-                            if(supportsLongSectors)
-                                outputOptical.WriteSectorLong(data, badSector);
-                            else
-                                outputOptical.WriteSector(Sector.GetUserData(data), badSector);
-
-                            bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
-                                desiredSubchannel, sub, badSector, 1, subLog, isrcs, (byte)track.Sequence,
-                                ref mcn, tracks, subchannelExtents, _fixSubchannelPosition, outputOptical,
-                                _fixSubchannel, _fixSubchannelCrc, _dumpLog, UpdateStatus,
-                                smallestPregapLbaPerTrack, true);
-
-                            // Set tracks and go back
-                            if(indexesChanged)
-                            {
-                                (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
-                                i--;
-                            }
-                        }
+                        if(supportsLongSectors)
+                            outputOptical.WriteSectorLong(data, badSector);
                         else
+                            outputOptical.WriteSector(Sector.GetUserData(data), badSector);
+
+                        bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
+                            desiredSubchannel, sub, badSector, 1, subLog, isrcs, (byte)track.Sequence,
+                            ref mcn, tracks, subchannelExtents, _fixSubchannelPosition, outputOptical,
+                            _fixSubchannel, _fixSubchannelCrc, _dumpLog, UpdateStatus,
+                            smallestPregapLbaPerTrack, true);
+
+                        // Set tracks and go back
+                        if(indexesChanged)
                         {
-                            if(supportsLongSectors)
-                                outputOptical.WriteSectorLong(cmdBuf, badSector);
-                            else
-                                outputOptical.WriteSector(Sector.GetUserData(cmdBuf), badSector);
+                            (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
+                            i--;
                         }
                     }
-
-                    EndProgress?.Invoke();
-                }
-            }
-
-            if(runningPersistent && currentModePage.HasValue)
-            {
-                var md = new Modes.DecodedMode
-                {
-                    Header = new Modes.ModeHeader(),
-                    Pages = new[]
+                    else
                     {
-                        currentModePage.Value
+                        if(supportsLongSectors)
+                            outputOptical.WriteSectorLong(cmdBuf, badSector);
+                        else
+                            outputOptical.WriteSector(Sector.GetUserData(cmdBuf), badSector);
                     }
-                };
+                }
 
-                md6  = Modes.EncodeMode6(md, _dev.ScsiType);
-                md10 = Modes.EncodeMode10(md, _dev.ScsiType);
-
-                _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
-                sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
-
-                if(sense)
-                    _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
+                EndProgress?.Invoke();
             }
-
-            EndProgress?.Invoke();
         }
 
-        /// <summary>Retried errored subchannels in CompactDisc</summary>
-        /// <param name="readcd">Device supports READ CD</param>
-        /// <param name="subSize">Subchannel size in bytes</param>
-        /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
-        /// <param name="totalDuration">Total commands duration</param>
-        /// <param name="tracks">Disc tracks</param>
-        /// <param name="subLog">Subchannel log</param>
-        /// <param name="desiredSubchannel">Subchannel desired to save</param>
-        /// <param name="isrcs">List of disc ISRCs</param>
-        /// <param name="mcn">Disc media catalogue number</param>
-        /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
-        /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
-        void RetrySubchannel(bool readcd, uint subSize, MmcSubchannel supportedSubchannel, ref double totalDuration,
-                             SubchannelLog subLog, MmcSubchannel desiredSubchannel, Track[] tracks,
-                             Dictionary<byte, string> isrcs, ref string mcn, HashSet<int> subchannelExtents,
-                             Dictionary<byte, int> smallestPregapLbaPerTrack)
+        if(runningPersistent && currentModePage.HasValue)
         {
-            bool              sense  = true;   // Sense indicator
-            byte[]            cmdBuf = null;   // Data buffer
-            double            cmdDuration;     // Command execution time
-            byte[]            senseBuf = null; // Sense buffer
-            PlextorSubchannel supportedPlextorSubchannel;
-            var               outputOptical = _outputPlugin as IWritableOpticalImage;
-
-            if(supportedSubchannel == MmcSubchannel.None ||
-               desiredSubchannel   == MmcSubchannel.None)
-                return;
-
-            switch(supportedSubchannel)
+            var md = new Modes.DecodedMode
             {
-                case MmcSubchannel.None:
-                    supportedPlextorSubchannel = PlextorSubchannel.None;
+                Header = new Modes.ModeHeader(),
+                Pages = new[]
+                {
+                    currentModePage.Value
+                }
+            };
 
-                    break;
-                case MmcSubchannel.Raw:
-                    supportedPlextorSubchannel = PlextorSubchannel.All;
+            md6  = Modes.EncodeMode6(md, _dev.ScsiType);
+            md10 = Modes.EncodeMode10(md, _dev.ScsiType);
 
-                    break;
-                case MmcSubchannel.Q16:
-                    supportedPlextorSubchannel = PlextorSubchannel.Q16;
+            _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
+            sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
 
-                    break;
-                case MmcSubchannel.Rw:
-                    supportedPlextorSubchannel = PlextorSubchannel.Pack;
+            if(sense)
+                _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
+        }
 
-                    break;
-                default:
-                    supportedPlextorSubchannel = PlextorSubchannel.None;
+        EndProgress?.Invoke();
+    }
 
-                    break;
-            }
+    /// <summary>Retried errored subchannels in CompactDisc</summary>
+    /// <param name="readcd">Device supports READ CD</param>
+    /// <param name="subSize">Subchannel size in bytes</param>
+    /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
+    /// <param name="totalDuration">Total commands duration</param>
+    /// <param name="tracks">Disc tracks</param>
+    /// <param name="subLog">Subchannel log</param>
+    /// <param name="desiredSubchannel">Subchannel desired to save</param>
+    /// <param name="isrcs">List of disc ISRCs</param>
+    /// <param name="mcn">Disc media catalogue number</param>
+    /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
+    /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
+    void RetrySubchannel(bool readcd, uint subSize, MmcSubchannel supportedSubchannel, ref double totalDuration,
+                         SubchannelLog subLog, MmcSubchannel desiredSubchannel, Track[] tracks,
+                         Dictionary<byte, string> isrcs, ref string mcn, HashSet<int> subchannelExtents,
+                         Dictionary<byte, int> smallestPregapLbaPerTrack)
+    {
+        bool              sense  = true;   // Sense indicator
+        byte[]            cmdBuf = null;   // Data buffer
+        double            cmdDuration;     // Command execution time
+        byte[]            senseBuf = null; // Sense buffer
+        PlextorSubchannel supportedPlextorSubchannel;
+        var               outputOptical = _outputPlugin as IWritableOpticalImage;
+
+        if(supportedSubchannel == MmcSubchannel.None ||
+           desiredSubchannel   == MmcSubchannel.None)
+            return;
+
+        switch(supportedSubchannel)
+        {
+            case MmcSubchannel.None:
+                supportedPlextorSubchannel = PlextorSubchannel.None;
+
+                break;
+            case MmcSubchannel.Raw:
+                supportedPlextorSubchannel = PlextorSubchannel.All;
+
+                break;
+            case MmcSubchannel.Q16:
+                supportedPlextorSubchannel = PlextorSubchannel.Q16;
+
+                break;
+            case MmcSubchannel.Rw:
+                supportedPlextorSubchannel = PlextorSubchannel.Pack;
+
+                break;
+            default:
+                supportedPlextorSubchannel = PlextorSubchannel.None;
+
+                break;
+        }
+
+        if(_aborted)
+            return;
+
+        int  pass    = 1;
+        bool forward = true;
+
+        InitProgress?.Invoke();
+
+        cdRepeatRetry:
+
+        _resume.BadSubchannels = new List<int>();
+        _resume.BadSubchannels.AddRange(subchannelExtents);
+        _resume.BadSubchannels.Sort();
+
+        if(!forward)
+            _resume.BadSubchannels.Reverse();
+
+        int[] tmpArray = _resume.BadSubchannels.ToArray();
+
+        foreach(int bs in tmpArray)
+        {
+            uint badSector = (uint)bs;
+
+            Track track = tracks.OrderBy(t => t.StartSector).
+                                 LastOrDefault(t => badSector >= t.StartSector);
 
             if(_aborted)
-                return;
-
-            int  pass    = 1;
-            bool forward = true;
-
-            InitProgress?.Invoke();
-
-            cdRepeatRetry:
-
-            _resume.BadSubchannels = new List<int>();
-            _resume.BadSubchannels.AddRange(subchannelExtents);
-            _resume.BadSubchannels.Sort();
-
-            if(!forward)
-                _resume.BadSubchannels.Reverse();
-
-            int[] tmpArray = _resume.BadSubchannels.ToArray();
-
-            foreach(int bs in tmpArray)
             {
-                uint badSector = (uint)bs;
+                _dumpLog.WriteLine("Aborted!");
 
-                Track track = tracks.OrderBy(t => t.StartSector).
-                                     LastOrDefault(t => badSector >= t.StartSector);
-
-                if(_aborted)
-                {
-                    _dumpLog.WriteLine("Aborted!");
-
-                    break;
-                }
-
-                PulseProgress?.
-                    Invoke($"Retrying sector {badSector} subchannel, pass {pass}, {(forward ? "forward" : "reverse")}");
-
-                uint startSector = badSector - 2;
-
-                if(_supportsPlextorD8)
-                {
-                    sense = _dev.PlextorReadCdDa(out cmdBuf, out senseBuf, startSector, subSize, 5,
-                                                 supportedPlextorSubchannel, 0, out cmdDuration);
-
-                    totalDuration += cmdDuration;
-                }
-                else if(readcd)
-                {
-                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, startSector, subSize, 5,
-                                        track.Type == TrackType.Audio ? MmcSectorTypes.Cdda
-                                            : MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, false,
-                                        false, MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
-
-                    totalDuration += cmdDuration;
-                }
-
-                if(sense || _dev.Error)
-                {
-                    _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
-
-                    continue;
-                }
-
-                Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel, desiredSubchannel, cmdBuf, badSector, 5,
-                                                         subLog, isrcs, (byte)track.Sequence, ref mcn, tracks,
-                                                         subchannelExtents, _fixSubchannelPosition, outputOptical,
-                                                         _fixSubchannel, _fixSubchannelCrc, _dumpLog, UpdateStatus,
-                                                         smallestPregapLbaPerTrack, true);
-
-                if(subchannelExtents.Contains(bs))
-                    continue;
-
-                UpdateStatus?.Invoke($"Correctly retried sector {badSector} subchannel in pass {pass}.");
-                _dumpLog.WriteLine("Correctly retried sector {0} subchannel in pass {1}.", badSector, pass);
+                break;
             }
 
-            if(pass < _retryPasses &&
-               !_aborted           &&
-               subchannelExtents.Count > 0)
-            {
-                pass++;
-                forward = !forward;
+            PulseProgress?.
+                Invoke($"Retrying sector {badSector} subchannel, pass {pass}, {(forward ? "forward" : "reverse")}");
 
-                goto cdRepeatRetry;
+            uint startSector = badSector - 2;
+
+            if(_supportsPlextorD8)
+            {
+                sense = _dev.PlextorReadCdDa(out cmdBuf, out senseBuf, startSector, subSize, 5,
+                                             supportedPlextorSubchannel, 0, out cmdDuration);
+
+                totalDuration += cmdDuration;
+            }
+            else if(readcd)
+            {
+                sense = _dev.ReadCd(out cmdBuf, out senseBuf, startSector, subSize, 5,
+                                    track.Type == TrackType.Audio ? MmcSectorTypes.Cdda
+                                        : MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, false,
+                                    false, MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
+
+                totalDuration += cmdDuration;
             }
 
-            EndProgress?.Invoke();
+            if(sense || _dev.Error)
+            {
+                _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
+
+                continue;
+            }
+
+            Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel, desiredSubchannel, cmdBuf, badSector, 5,
+                                                     subLog, isrcs, (byte)track.Sequence, ref mcn, tracks,
+                                                     subchannelExtents, _fixSubchannelPosition, outputOptical,
+                                                     _fixSubchannel, _fixSubchannelCrc, _dumpLog, UpdateStatus,
+                                                     smallestPregapLbaPerTrack, true);
+
+            if(subchannelExtents.Contains(bs))
+                continue;
+
+            UpdateStatus?.Invoke($"Correctly retried sector {badSector} subchannel in pass {pass}.");
+            _dumpLog.WriteLine("Correctly retried sector {0} subchannel in pass {1}.", badSector, pass);
         }
+
+        if(pass < _retryPasses &&
+           !_aborted           &&
+           subchannelExtents.Count > 0)
+        {
+            pass++;
+            forward = !forward;
+
+            goto cdRepeatRetry;
+        }
+
+        EndProgress?.Invoke();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs b/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs
index ad0a5a2aa..15372aa79 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/LeadOuts.cs
@@ -45,346 +45,345 @@ using Schemas;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Dumps inter-session lead-outs</summary>
+    /// <param name="blockSize">Size of the read sector in bytes</param>
+    /// <param name="currentSpeed">Current read speed</param>
+    /// <param name="currentTry">Current dump hardware try</param>
+    /// <param name="extents">Extents</param>
+    /// <param name="ibgLog">IMGBurn log</param>
+    /// <param name="imageWriteDuration">Duration of image write</param>
+    /// <param name="leadOutExtents">Lead-out extents</param>
+    /// <param name="maxSpeed">Maximum speed</param>
+    /// <param name="mhddLog">MHDD log</param>
+    /// <param name="minSpeed">Minimum speed</param>
+    /// <param name="read6">Device supports READ(6)</param>
+    /// <param name="read10">Device supports READ(10)</param>
+    /// <param name="read12">Device supports READ(12)</param>
+    /// <param name="read16">Device supports READ(16)</param>
+    /// <param name="readcd">Device supports READ CD</param>
+    /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
+    /// <param name="subSize">Subchannel size in bytes</param>
+    /// <param name="totalDuration">Total commands duration</param>
+    /// <param name="tracks">Disc tracks</param>
+    /// <param name="subLog">Subchannel log</param>
+    /// <param name="desiredSubchannel">Subchannel desired to save</param>
+    /// <param name="isrcs">List of disc ISRCs</param>
+    /// <param name="mcn">Disc media catalogue number</param>
+    /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
+    /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
+    void DumpCdLeadOuts(uint blockSize, ref double currentSpeed, DumpHardwareType currentTry, ExtentsULong extents,
+                        IbgLog ibgLog, ref double imageWriteDuration, ExtentsULong leadOutExtents,
+                        ref double maxSpeed, MhddLog mhddLog, ref double minSpeed, bool read6, bool read10,
+                        bool read12, bool read16, bool readcd, MmcSubchannel supportedSubchannel, uint subSize,
+                        ref double totalDuration, SubchannelLog subLog, MmcSubchannel desiredSubchannel,
+                        Dictionary<byte, string> isrcs, ref string mcn, Track[] tracks,
+                        HashSet<int> subchannelExtents, Dictionary<byte, int> smallestPregapLbaPerTrack)
     {
-        /// <summary>Dumps inter-session lead-outs</summary>
-        /// <param name="blockSize">Size of the read sector in bytes</param>
-        /// <param name="currentSpeed">Current read speed</param>
-        /// <param name="currentTry">Current dump hardware try</param>
-        /// <param name="extents">Extents</param>
-        /// <param name="ibgLog">IMGBurn log</param>
-        /// <param name="imageWriteDuration">Duration of image write</param>
-        /// <param name="leadOutExtents">Lead-out extents</param>
-        /// <param name="maxSpeed">Maximum speed</param>
-        /// <param name="mhddLog">MHDD log</param>
-        /// <param name="minSpeed">Minimum speed</param>
-        /// <param name="read6">Device supports READ(6)</param>
-        /// <param name="read10">Device supports READ(10)</param>
-        /// <param name="read12">Device supports READ(12)</param>
-        /// <param name="read16">Device supports READ(16)</param>
-        /// <param name="readcd">Device supports READ CD</param>
-        /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
-        /// <param name="subSize">Subchannel size in bytes</param>
-        /// <param name="totalDuration">Total commands duration</param>
-        /// <param name="tracks">Disc tracks</param>
-        /// <param name="subLog">Subchannel log</param>
-        /// <param name="desiredSubchannel">Subchannel desired to save</param>
-        /// <param name="isrcs">List of disc ISRCs</param>
-        /// <param name="mcn">Disc media catalogue number</param>
-        /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
-        /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
-        void DumpCdLeadOuts(uint blockSize, ref double currentSpeed, DumpHardwareType currentTry, ExtentsULong extents,
-                            IbgLog ibgLog, ref double imageWriteDuration, ExtentsULong leadOutExtents,
-                            ref double maxSpeed, MhddLog mhddLog, ref double minSpeed, bool read6, bool read10,
-                            bool read12, bool read16, bool readcd, MmcSubchannel supportedSubchannel, uint subSize,
-                            ref double totalDuration, SubchannelLog subLog, MmcSubchannel desiredSubchannel,
-                            Dictionary<byte, string> isrcs, ref string mcn, Track[] tracks,
-                            HashSet<int> subchannelExtents, Dictionary<byte, int> smallestPregapLbaPerTrack)
-        {
-            byte[]     cmdBuf        = null; // Data buffer
-            const uint sectorSize    = 2352; // Full sector size
-            bool       sense         = true; // Sense indicator
-            byte[]     senseBuf      = null;
-            var        outputOptical = _outputPlugin as IWritableOpticalImage;
+        byte[]     cmdBuf        = null; // Data buffer
+        const uint sectorSize    = 2352; // Full sector size
+        bool       sense         = true; // Sense indicator
+        byte[]     senseBuf      = null;
+        var        outputOptical = _outputPlugin as IWritableOpticalImage;
 
-            UpdateStatus?.Invoke("Reading lead-outs");
-            _dumpLog.WriteLine("Reading lead-outs");
+        UpdateStatus?.Invoke("Reading lead-outs");
+        _dumpLog.WriteLine("Reading lead-outs");
 
-            InitProgress?.Invoke();
+        InitProgress?.Invoke();
 
-            foreach((ulong item1, ulong item2) in leadOutExtents.ToArray())
-                for(ulong i = item1; i <= item2; i++)
+        foreach((ulong item1, ulong item2) in leadOutExtents.ToArray())
+            for(ulong i = item1; i <= item2; i++)
+            {
+                if(_aborted)
                 {
-                    if(_aborted)
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                    _dumpLog.WriteLine("Aborted!");
+
+                    break;
+                }
+
+                double cmdDuration = 0;
+
+                if(currentSpeed > maxSpeed &&
+                   currentSpeed > 0)
+                    maxSpeed = currentSpeed;
+
+                if(currentSpeed < minSpeed &&
+                   currentSpeed > 0)
+                    minSpeed = currentSpeed;
+
+                PulseProgress?.Invoke($"Reading sector {i} at lead-out ({currentSpeed:F3} MiB/sec.)");
+
+                if(readcd)
+                {
+                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)i, blockSize, 1, MmcSectorTypes.AllTypes,
+                                        false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                        MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
+
+                    totalDuration += cmdDuration;
+                }
+                else if(read16)
+                    sense = _dev.Read16(out cmdBuf, out senseBuf, 0, false, true, false, i, blockSize, 0, 1, false,
+                                        _dev.Timeout, out cmdDuration);
+                else if(read12)
+                    sense = _dev.Read12(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize,
+                                        0, 1, false, _dev.Timeout, out cmdDuration);
+                else if(read10)
+                    sense = _dev.Read10(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize,
+                                        0, 1, _dev.Timeout, out cmdDuration);
+                else if(read6)
+                    sense = _dev.Read6(out cmdBuf, out senseBuf, (uint)i, blockSize, 1, _dev.Timeout,
+                                       out cmdDuration);
+
+                if(!sense &&
+                   !_dev.Error)
+                {
+                    mhddLog.Write(i, cmdDuration);
+                    ibgLog.Write(i, currentSpeed * 1024);
+                    extents.Add(i, _maximumReadable, true);
+                    leadOutExtents.Remove(i);
+                    DateTime writeStart = DateTime.Now;
+
+                    if(supportedSubchannel != MmcSubchannel.None)
                     {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        _dumpLog.WriteLine("Aborted!");
+                        byte[] data = new byte[sectorSize * _maximumReadable];
+                        byte[] sub  = new byte[subSize    * _maximumReadable];
 
-                        break;
-                    }
-
-                    double cmdDuration = 0;
-
-                    if(currentSpeed > maxSpeed &&
-                       currentSpeed > 0)
-                        maxSpeed = currentSpeed;
-
-                    if(currentSpeed < minSpeed &&
-                       currentSpeed > 0)
-                        minSpeed = currentSpeed;
-
-                    PulseProgress?.Invoke($"Reading sector {i} at lead-out ({currentSpeed:F3} MiB/sec.)");
-
-                    if(readcd)
-                    {
-                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)i, blockSize, 1, MmcSectorTypes.AllTypes,
-                                            false, false, true, MmcHeaderCodes.AllHeaders, true, true,
-                                            MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
-
-                        totalDuration += cmdDuration;
-                    }
-                    else if(read16)
-                        sense = _dev.Read16(out cmdBuf, out senseBuf, 0, false, true, false, i, blockSize, 0, 1, false,
-                                            _dev.Timeout, out cmdDuration);
-                    else if(read12)
-                        sense = _dev.Read12(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize,
-                                            0, 1, false, _dev.Timeout, out cmdDuration);
-                    else if(read10)
-                        sense = _dev.Read10(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize,
-                                            0, 1, _dev.Timeout, out cmdDuration);
-                    else if(read6)
-                        sense = _dev.Read6(out cmdBuf, out senseBuf, (uint)i, blockSize, 1, _dev.Timeout,
-                                           out cmdDuration);
-
-                    if(!sense &&
-                       !_dev.Error)
-                    {
-                        mhddLog.Write(i, cmdDuration);
-                        ibgLog.Write(i, currentSpeed * 1024);
-                        extents.Add(i, _maximumReadable, true);
-                        leadOutExtents.Remove(i);
-                        DateTime writeStart = DateTime.Now;
-
-                        if(supportedSubchannel != MmcSubchannel.None)
+                        for(int b = 0; b < _maximumReadable; b++)
                         {
-                            byte[] data = new byte[sectorSize * _maximumReadable];
-                            byte[] sub  = new byte[subSize    * _maximumReadable];
+                            Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b, sectorSize);
 
-                            for(int b = 0; b < _maximumReadable; b++)
-                            {
-                                Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b, sectorSize);
-
-                                Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize * b, subSize);
-                            }
-
-                            outputOptical.WriteSectorsLong(data, i, _maximumReadable);
-
-                            bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
-                                desiredSubchannel, sub, i, _maximumReadable, subLog, isrcs, 0xAA, ref mcn, tracks,
-                                subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
-                                _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
-
-                            // Set tracks and go back
-                            if(indexesChanged)
-                            {
-                                (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
-                                i--;
-
-                                continue;
-                            }
+                            Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize * b, subSize);
                         }
-                        else
-                            outputOptical.WriteSectors(cmdBuf, i, _maximumReadable);
 
-                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                        outputOptical.WriteSectorsLong(data, i, _maximumReadable);
+
+                        bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
+                            desiredSubchannel, sub, i, _maximumReadable, subLog, isrcs, 0xAA, ref mcn, tracks,
+                            subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
+                            _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
+
+                        // Set tracks and go back
+                        if(indexesChanged)
+                        {
+                            (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
+                            i--;
+
+                            continue;
+                        }
                     }
                     else
+                        outputOptical.WriteSectors(cmdBuf, i, _maximumReadable);
+
+                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                }
+                else
+                {
+                    _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
+
+                    // TODO: Reset device after X errors
+                    if(_stopOnError)
+                        return; // TODO: Return more cleanly
+
+                    // Write empty data
+                    DateTime writeStart = DateTime.Now;
+
+                    if(supportedSubchannel != MmcSubchannel.None)
                     {
-                        _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
+                        outputOptical.WriteSectorsLong(new byte[sectorSize * _skip], i, 1);
 
-                        // TODO: Reset device after X errors
-                        if(_stopOnError)
-                            return; // TODO: Return more cleanly
+                        outputOptical.WriteSectorsTag(new byte[subSize * _skip], i, 1,
+                                                      SectorTagType.CdSectorSubchannel);
+                    }
+                    else
+                        outputOptical.WriteSectors(new byte[blockSize * _skip], i, 1);
 
-                        // Write empty data
-                        DateTime writeStart = DateTime.Now;
+                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
 
-                        if(supportedSubchannel != MmcSubchannel.None)
+                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+
+                    ibgLog.Write(i, 0);
+                }
+
+                double newSpeed = (double)blockSize * _maximumReadable / 1048576 / (cmdDuration / 1000);
+
+                if(!double.IsInfinity(newSpeed))
+                    currentSpeed = newSpeed;
+
+                _resume.NextBlock = i + 1;
+            }
+
+        EndProgress?.Invoke();
+    }
+
+    /// <summary>Retries inter-session lead-outs</summary>
+    /// <param name="blockSize">Size of the read sector in bytes</param>
+    /// <param name="currentSpeed">Current read speed</param>
+    /// <param name="currentTry">Current dump hardware try</param>
+    /// <param name="extents">Extents</param>
+    /// <param name="ibgLog">IMGBurn log</param>
+    /// <param name="imageWriteDuration">Duration of image write</param>
+    /// <param name="leadOutExtents">Lead-out extents</param>
+    /// <param name="maxSpeed">Maximum speed</param>
+    /// <param name="mhddLog">MHDD log</param>
+    /// <param name="minSpeed">Minimum speed</param>
+    /// <param name="read6">Device supports READ(6)</param>
+    /// <param name="read10">Device supports READ(10)</param>
+    /// <param name="read12">Device supports READ(12)</param>
+    /// <param name="read16">Device supports READ(16)</param>
+    /// <param name="readcd">Device supports READ CD</param>
+    /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
+    /// <param name="subSize">Subchannel size in bytes</param>
+    /// <param name="totalDuration">Total commands duration</param>
+    /// <param name="tracks">Disc tracks</param>
+    /// <param name="subLog">Subchannel log</param>
+    /// <param name="desiredSubchannel">Subchannel desired to save</param>
+    /// <param name="isrcs">List of disc ISRCs</param>
+    /// <param name="mcn">Disc media catalogue number</param>
+    /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
+    /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
+    void RetryCdLeadOuts(uint blockSize, ref double currentSpeed, DumpHardwareType currentTry, ExtentsULong extents,
+                         IbgLog ibgLog, ref double imageWriteDuration, ExtentsULong leadOutExtents,
+                         ref double maxSpeed, MhddLog mhddLog, ref double minSpeed, bool read6, bool read10,
+                         bool read12, bool read16, bool readcd, MmcSubchannel supportedSubchannel, uint subSize,
+                         ref double totalDuration, SubchannelLog subLog, MmcSubchannel desiredSubchannel,
+                         Dictionary<byte, string> isrcs, ref string mcn, Track[] tracks,
+                         HashSet<int> subchannelExtents, Dictionary<byte, int> smallestPregapLbaPerTrack)
+    {
+        byte[]     cmdBuf        = null; // Data buffer
+        const uint sectorSize    = 2352; // Full sector size
+        bool       sense         = true; // Sense indicator
+        byte[]     senseBuf      = null;
+        var        outputOptical = _outputPlugin as IWritableOpticalImage;
+
+        _dumpLog.WriteLine("Retrying lead-outs");
+
+        InitProgress?.Invoke();
+
+        foreach((ulong item1, ulong item2) in leadOutExtents.ToArray())
+            for(ulong i = item1; i <= item2; i++)
+            {
+                if(_aborted)
+                {
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                    _dumpLog.WriteLine("Aborted!");
+
+                    break;
+                }
+
+                double cmdDuration = 0;
+
+                if(currentSpeed > maxSpeed &&
+                   currentSpeed > 0)
+                    maxSpeed = currentSpeed;
+
+                if(currentSpeed < minSpeed &&
+                   currentSpeed > 0)
+                    minSpeed = currentSpeed;
+
+                PulseProgress?.Invoke($"Reading sector {i} at lead-out ({currentSpeed:F3} MiB/sec.)");
+
+                if(readcd)
+                {
+                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)i, blockSize, 1, MmcSectorTypes.AllTypes,
+                                        false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                        MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
+
+                    totalDuration += cmdDuration;
+                }
+                else if(read16)
+                    sense = _dev.Read16(out cmdBuf, out senseBuf, 0, false, true, false, i, blockSize, 0, 1, false,
+                                        _dev.Timeout, out cmdDuration);
+                else if(read12)
+                    sense = _dev.Read12(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize,
+                                        0, 1, false, _dev.Timeout, out cmdDuration);
+                else if(read10)
+                    sense = _dev.Read10(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize,
+                                        0, 1, _dev.Timeout, out cmdDuration);
+                else if(read6)
+                    sense = _dev.Read6(out cmdBuf, out senseBuf, (uint)i, blockSize, 1, _dev.Timeout,
+                                       out cmdDuration);
+
+                if(!sense &&
+                   !_dev.Error)
+                {
+                    mhddLog.Write(i, cmdDuration);
+                    ibgLog.Write(i, currentSpeed * 1024);
+                    extents.Add(i, _maximumReadable, true);
+                    leadOutExtents.Remove(i);
+                    DateTime writeStart = DateTime.Now;
+
+                    if(supportedSubchannel != MmcSubchannel.None)
+                    {
+                        byte[] data = new byte[sectorSize * _maximumReadable];
+                        byte[] sub  = new byte[subSize    * _maximumReadable];
+
+                        for(int b = 0; b < _maximumReadable; b++)
                         {
-                            outputOptical.WriteSectorsLong(new byte[sectorSize * _skip], i, 1);
+                            Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b, sectorSize);
 
+                            Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize * b, subSize);
+                        }
+
+                        outputOptical.WriteSectorsLong(data, i, _maximumReadable);
+
+                        bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
+                            desiredSubchannel, sub, i, _maximumReadable, subLog, isrcs, 0xAA, ref mcn, tracks,
+                            subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
+                            _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
+
+                        // Set tracks and go back
+                        if(indexesChanged)
+                        {
+                            (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
+                            i--;
+
+                            continue;
+                        }
+                    }
+                    else
+                        outputOptical.WriteSectors(cmdBuf, i, _maximumReadable);
+
+                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                }
+                else
+                {
+                    _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
+
+                    // TODO: Reset device after X errors
+                    if(_stopOnError)
+                        return; // TODO: Return more cleanly
+
+                    // Write empty data
+                    DateTime writeStart = DateTime.Now;
+
+                    if(supportedSubchannel != MmcSubchannel.None)
+                    {
+                        outputOptical.WriteSectorsLong(new byte[sectorSize * _skip], i, 1);
+
+                        if(desiredSubchannel != MmcSubchannel.None)
                             outputOptical.WriteSectorsTag(new byte[subSize * _skip], i, 1,
                                                           SectorTagType.CdSectorSubchannel);
-                        }
-                        else
-                            outputOptical.WriteSectors(new byte[blockSize * _skip], i, 1);
-
-                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-
-                        mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                        ibgLog.Write(i, 0);
-                    }
-
-                    double newSpeed = (double)blockSize * _maximumReadable / 1048576 / (cmdDuration / 1000);
-
-                    if(!double.IsInfinity(newSpeed))
-                        currentSpeed = newSpeed;
-
-                    _resume.NextBlock = i + 1;
-                }
-
-            EndProgress?.Invoke();
-        }
-
-        /// <summary>Retries inter-session lead-outs</summary>
-        /// <param name="blockSize">Size of the read sector in bytes</param>
-        /// <param name="currentSpeed">Current read speed</param>
-        /// <param name="currentTry">Current dump hardware try</param>
-        /// <param name="extents">Extents</param>
-        /// <param name="ibgLog">IMGBurn log</param>
-        /// <param name="imageWriteDuration">Duration of image write</param>
-        /// <param name="leadOutExtents">Lead-out extents</param>
-        /// <param name="maxSpeed">Maximum speed</param>
-        /// <param name="mhddLog">MHDD log</param>
-        /// <param name="minSpeed">Minimum speed</param>
-        /// <param name="read6">Device supports READ(6)</param>
-        /// <param name="read10">Device supports READ(10)</param>
-        /// <param name="read12">Device supports READ(12)</param>
-        /// <param name="read16">Device supports READ(16)</param>
-        /// <param name="readcd">Device supports READ CD</param>
-        /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
-        /// <param name="subSize">Subchannel size in bytes</param>
-        /// <param name="totalDuration">Total commands duration</param>
-        /// <param name="tracks">Disc tracks</param>
-        /// <param name="subLog">Subchannel log</param>
-        /// <param name="desiredSubchannel">Subchannel desired to save</param>
-        /// <param name="isrcs">List of disc ISRCs</param>
-        /// <param name="mcn">Disc media catalogue number</param>
-        /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
-        /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
-        void RetryCdLeadOuts(uint blockSize, ref double currentSpeed, DumpHardwareType currentTry, ExtentsULong extents,
-                             IbgLog ibgLog, ref double imageWriteDuration, ExtentsULong leadOutExtents,
-                             ref double maxSpeed, MhddLog mhddLog, ref double minSpeed, bool read6, bool read10,
-                             bool read12, bool read16, bool readcd, MmcSubchannel supportedSubchannel, uint subSize,
-                             ref double totalDuration, SubchannelLog subLog, MmcSubchannel desiredSubchannel,
-                             Dictionary<byte, string> isrcs, ref string mcn, Track[] tracks,
-                             HashSet<int> subchannelExtents, Dictionary<byte, int> smallestPregapLbaPerTrack)
-        {
-            byte[]     cmdBuf        = null; // Data buffer
-            const uint sectorSize    = 2352; // Full sector size
-            bool       sense         = true; // Sense indicator
-            byte[]     senseBuf      = null;
-            var        outputOptical = _outputPlugin as IWritableOpticalImage;
-
-            _dumpLog.WriteLine("Retrying lead-outs");
-
-            InitProgress?.Invoke();
-
-            foreach((ulong item1, ulong item2) in leadOutExtents.ToArray())
-                for(ulong i = item1; i <= item2; i++)
-                {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    double cmdDuration = 0;
-
-                    if(currentSpeed > maxSpeed &&
-                       currentSpeed > 0)
-                        maxSpeed = currentSpeed;
-
-                    if(currentSpeed < minSpeed &&
-                       currentSpeed > 0)
-                        minSpeed = currentSpeed;
-
-                    PulseProgress?.Invoke($"Reading sector {i} at lead-out ({currentSpeed:F3} MiB/sec.)");
-
-                    if(readcd)
-                    {
-                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, (uint)i, blockSize, 1, MmcSectorTypes.AllTypes,
-                                            false, false, true, MmcHeaderCodes.AllHeaders, true, true,
-                                            MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
-
-                        totalDuration += cmdDuration;
-                    }
-                    else if(read16)
-                        sense = _dev.Read16(out cmdBuf, out senseBuf, 0, false, true, false, i, blockSize, 0, 1, false,
-                                            _dev.Timeout, out cmdDuration);
-                    else if(read12)
-                        sense = _dev.Read12(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize,
-                                            0, 1, false, _dev.Timeout, out cmdDuration);
-                    else if(read10)
-                        sense = _dev.Read10(out cmdBuf, out senseBuf, 0, false, true, false, false, (uint)i, blockSize,
-                                            0, 1, _dev.Timeout, out cmdDuration);
-                    else if(read6)
-                        sense = _dev.Read6(out cmdBuf, out senseBuf, (uint)i, blockSize, 1, _dev.Timeout,
-                                           out cmdDuration);
-
-                    if(!sense &&
-                       !_dev.Error)
-                    {
-                        mhddLog.Write(i, cmdDuration);
-                        ibgLog.Write(i, currentSpeed * 1024);
-                        extents.Add(i, _maximumReadable, true);
-                        leadOutExtents.Remove(i);
-                        DateTime writeStart = DateTime.Now;
-
-                        if(supportedSubchannel != MmcSubchannel.None)
-                        {
-                            byte[] data = new byte[sectorSize * _maximumReadable];
-                            byte[] sub  = new byte[subSize    * _maximumReadable];
-
-                            for(int b = 0; b < _maximumReadable; b++)
-                            {
-                                Array.Copy(cmdBuf, (int)(0 + (b * blockSize)), data, sectorSize * b, sectorSize);
-
-                                Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize * b, subSize);
-                            }
-
-                            outputOptical.WriteSectorsLong(data, i, _maximumReadable);
-
-                            bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
-                                desiredSubchannel, sub, i, _maximumReadable, subLog, isrcs, 0xAA, ref mcn, tracks,
-                                subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
-                                _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
-
-                            // Set tracks and go back
-                            if(indexesChanged)
-                            {
-                                (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
-                                i--;
-
-                                continue;
-                            }
-                        }
-                        else
-                            outputOptical.WriteSectors(cmdBuf, i, _maximumReadable);
-
-                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
                     }
                     else
-                    {
-                        _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
+                        outputOptical.WriteSectors(new byte[blockSize * _skip], i, 1);
 
-                        // TODO: Reset device after X errors
-                        if(_stopOnError)
-                            return; // TODO: Return more cleanly
+                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
 
-                        // Write empty data
-                        DateTime writeStart = DateTime.Now;
+                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
 
-                        if(supportedSubchannel != MmcSubchannel.None)
-                        {
-                            outputOptical.WriteSectorsLong(new byte[sectorSize * _skip], i, 1);
-
-                            if(desiredSubchannel != MmcSubchannel.None)
-                                outputOptical.WriteSectorsTag(new byte[subSize * _skip], i, 1,
-                                                              SectorTagType.CdSectorSubchannel);
-                        }
-                        else
-                            outputOptical.WriteSectors(new byte[blockSize * _skip], i, 1);
-
-                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-
-                        mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                        ibgLog.Write(i, 0);
-                    }
-
-                    double newSpeed = (double)blockSize * _maximumReadable / 1048576 / (cmdDuration / 1000);
-
-                    if(!double.IsInfinity(newSpeed))
-                        currentSpeed = newSpeed;
+                    ibgLog.Write(i, 0);
                 }
 
-            EndProgress?.Invoke();
-        }
+                double newSpeed = (double)blockSize * _maximumReadable / 1048576 / (cmdDuration / 1000);
+
+                if(!double.IsInfinity(newSpeed))
+                    currentSpeed = newSpeed;
+            }
+
+        EndProgress?.Invoke();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Offset.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Offset.cs
index 8229842cc..e80f61e76 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Offset.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Offset.cs
@@ -37,86 +37,85 @@ using Aaru.Devices;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Fix offset in audio/scrambled sectors</summary>
+    /// <param name="offsetBytes">Offset in bytes</param>
+    /// <param name="sectorSize">Sector size in bytes</param>
+    /// <param name="sectorsForOffset">How many extra sectors we got for offset</param>
+    /// <param name="supportedSubchannel">Subchannel type</param>
+    /// <param name="blocksToRead">How many sectors did we got</param>
+    /// <param name="subSize">Subchannel size in bytes</param>
+    /// <param name="cmdBuf">Data buffer</param>
+    /// <param name="blockSize">Block size in bytes</param>
+    /// <param name="failedCrossingLeadOut">Set if we failed to cross into the Lead-Out</param>
+    static void FixOffsetData(int offsetBytes, uint sectorSize, int sectorsForOffset,
+                              MmcSubchannel supportedSubchannel, ref uint blocksToRead, uint subSize,
+                              ref byte[] cmdBuf, uint blockSize, bool failedCrossingLeadOut)
     {
-        /// <summary>Fix offset in audio/scrambled sectors</summary>
-        /// <param name="offsetBytes">Offset in bytes</param>
-        /// <param name="sectorSize">Sector size in bytes</param>
-        /// <param name="sectorsForOffset">How many extra sectors we got for offset</param>
-        /// <param name="supportedSubchannel">Subchannel type</param>
-        /// <param name="blocksToRead">How many sectors did we got</param>
-        /// <param name="subSize">Subchannel size in bytes</param>
-        /// <param name="cmdBuf">Data buffer</param>
-        /// <param name="blockSize">Block size in bytes</param>
-        /// <param name="failedCrossingLeadOut">Set if we failed to cross into the Lead-Out</param>
-        static void FixOffsetData(int offsetBytes, uint sectorSize, int sectorsForOffset,
-                                  MmcSubchannel supportedSubchannel, ref uint blocksToRead, uint subSize,
-                                  ref byte[] cmdBuf, uint blockSize, bool failedCrossingLeadOut)
+        if(cmdBuf.Length == 0)
+            return;
+
+        int offsetFix = offsetBytes < 0 ? (int)((sectorSize * sectorsForOffset) + offsetBytes) : offsetBytes;
+
+        byte[] tmpBuf;
+
+        if(supportedSubchannel != MmcSubchannel.None)
         {
-            if(cmdBuf.Length == 0)
-                return;
+            // De-interleave subchannel
+            byte[] data = new byte[sectorSize * blocksToRead];
+            byte[] sub  = new byte[subSize    * blocksToRead];
 
-            int offsetFix = offsetBytes < 0 ? (int)((sectorSize * sectorsForOffset) + offsetBytes) : offsetBytes;
-
-            byte[] tmpBuf;
-
-            if(supportedSubchannel != MmcSubchannel.None)
+            for(int b = 0; b < blocksToRead; b++)
             {
-                // De-interleave subchannel
-                byte[] data = new byte[sectorSize * blocksToRead];
-                byte[] sub  = new byte[subSize    * blocksToRead];
-
-                for(int b = 0; b < blocksToRead; b++)
-                {
-                    Array.Copy(cmdBuf, (int)(0          + (b * blockSize)), data, sectorSize * b, sectorSize);
-                    Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize     * b, subSize);
-                }
-
-                if(failedCrossingLeadOut)
-                {
-                    blocksToRead += (uint)sectorsForOffset;
-
-                    tmpBuf = new byte[sectorSize * blocksToRead];
-                    Array.Copy(data, 0, tmpBuf, 0, data.Length);
-                    data   = tmpBuf;
-                    tmpBuf = new byte[subSize * blocksToRead];
-                    Array.Copy(sub, 0, tmpBuf, 0, sub.Length);
-                    sub = tmpBuf;
-                }
-
-                tmpBuf = new byte[sectorSize * (blocksToRead - sectorsForOffset)];
-                Array.Copy(data, offsetFix, tmpBuf, 0, tmpBuf.Length);
-                data = tmpBuf;
-
-                blocksToRead -= (uint)sectorsForOffset;
-
-                // Re-interleave subchannel
-                cmdBuf = new byte[blockSize * blocksToRead];
-
-                for(int b = 0; b < blocksToRead; b++)
-                {
-                    Array.Copy(data, sectorSize * b, cmdBuf, (int)(0          + (b * blockSize)), sectorSize);
-                    Array.Copy(sub, subSize     * b, cmdBuf, (int)(sectorSize + (b * blockSize)), subSize);
-                }
+                Array.Copy(cmdBuf, (int)(0          + (b * blockSize)), data, sectorSize * b, sectorSize);
+                Array.Copy(cmdBuf, (int)(sectorSize + (b * blockSize)), sub, subSize     * b, subSize);
             }
-            else
+
+            if(failedCrossingLeadOut)
             {
-                if(failedCrossingLeadOut)
-                {
-                    blocksToRead += (uint)sectorsForOffset;
+                blocksToRead += (uint)sectorsForOffset;
 
-                    tmpBuf = new byte[blockSize * blocksToRead];
-                    Array.Copy(cmdBuf, 0, tmpBuf, 0, cmdBuf.Length);
-                    cmdBuf = tmpBuf;
-                }
-
-                tmpBuf = new byte[blockSize * (blocksToRead - sectorsForOffset)];
-                Array.Copy(cmdBuf, offsetFix, tmpBuf, 0, tmpBuf.Length);
-                cmdBuf       =  tmpBuf;
-                blocksToRead -= (uint)sectorsForOffset;
+                tmpBuf = new byte[sectorSize * blocksToRead];
+                Array.Copy(data, 0, tmpBuf, 0, data.Length);
+                data   = tmpBuf;
+                tmpBuf = new byte[subSize * blocksToRead];
+                Array.Copy(sub, 0, tmpBuf, 0, sub.Length);
+                sub = tmpBuf;
             }
+
+            tmpBuf = new byte[sectorSize * (blocksToRead - sectorsForOffset)];
+            Array.Copy(data, offsetFix, tmpBuf, 0, tmpBuf.Length);
+            data = tmpBuf;
+
+            blocksToRead -= (uint)sectorsForOffset;
+
+            // Re-interleave subchannel
+            cmdBuf = new byte[blockSize * blocksToRead];
+
+            for(int b = 0; b < blocksToRead; b++)
+            {
+                Array.Copy(data, sectorSize * b, cmdBuf, (int)(0          + (b * blockSize)), sectorSize);
+                Array.Copy(sub, subSize     * b, cmdBuf, (int)(sectorSize + (b * blockSize)), subSize);
+            }
+        }
+        else
+        {
+            if(failedCrossingLeadOut)
+            {
+                blocksToRead += (uint)sectorsForOffset;
+
+                tmpBuf = new byte[blockSize * blocksToRead];
+                Array.Copy(cmdBuf, 0, tmpBuf, 0, cmdBuf.Length);
+                cmdBuf = tmpBuf;
+            }
+
+            tmpBuf = new byte[blockSize * (blocksToRead - sectorsForOffset)];
+            Array.Copy(cmdBuf, offsetFix, tmpBuf, 0, tmpBuf.Length);
+            cmdBuf       =  tmpBuf;
+            blocksToRead -= (uint)sectorsForOffset;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Plextor.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Plextor.cs
index 44a8c1725..5b433deab 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Plextor.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Plextor.cs
@@ -33,84 +33,83 @@
 using System;
 using Aaru.Devices;
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Reads a sector using Plextor's D8h READ CDDA command with subchannel</summary>
+    /// <param name="cmdBuf">Data buffer</param>
+    /// <param name="senseBuf">Sense buffer</param>
+    /// <param name="firstSectorToRead">Fix sector to read</param>
+    /// <param name="blockSize">Sector size in bytes</param>
+    /// <param name="blocksToRead">How many sectors to read</param>
+    /// <param name="supportedPlextorSubchannel">Supported subchannel type</param>
+    /// <param name="cmdDuration">Time spent sending commands to the drive</param>
+    /// <returns><c>true</c> if an error occured, <c>false</c> otherwise</returns>
+    bool ReadPlextorWithSubchannel(out byte[] cmdBuf, out byte[] senseBuf, uint firstSectorToRead, uint blockSize,
+                                   uint blocksToRead, PlextorSubchannel supportedPlextorSubchannel,
+                                   out double cmdDuration)
     {
-        /// <summary>Reads a sector using Plextor's D8h READ CDDA command with subchannel</summary>
-        /// <param name="cmdBuf">Data buffer</param>
-        /// <param name="senseBuf">Sense buffer</param>
-        /// <param name="firstSectorToRead">Fix sector to read</param>
-        /// <param name="blockSize">Sector size in bytes</param>
-        /// <param name="blocksToRead">How many sectors to read</param>
-        /// <param name="supportedPlextorSubchannel">Supported subchannel type</param>
-        /// <param name="cmdDuration">Time spent sending commands to the drive</param>
-        /// <returns><c>true</c> if an error occured, <c>false</c> otherwise</returns>
-        bool ReadPlextorWithSubchannel(out byte[] cmdBuf, out byte[] senseBuf, uint firstSectorToRead, uint blockSize,
-                                       uint blocksToRead, PlextorSubchannel supportedPlextorSubchannel,
-                                       out double cmdDuration)
+        bool sense;
+        cmdBuf = null;
+
+        if(supportedPlextorSubchannel == PlextorSubchannel.None)
         {
-            bool sense;
-            cmdBuf = null;
+            sense = _dev.PlextorReadCdDa(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, blocksToRead,
+                                         supportedPlextorSubchannel, 0, out cmdDuration);
 
-            if(supportedPlextorSubchannel == PlextorSubchannel.None)
-            {
-                sense = _dev.PlextorReadCdDa(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, blocksToRead,
-                                             supportedPlextorSubchannel, 0, out cmdDuration);
-
-                if(!sense)
-                    return false;
-
-                // As a workaround for some firmware bugs, seek far away.
-                _dev.PlextorReadCdDa(out _, out senseBuf, firstSectorToRead - 32, blockSize, blocksToRead,
-                                     supportedPlextorSubchannel, 0, out _);
-
-                sense = _dev.PlextorReadCdDa(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, blocksToRead,
-                                             supportedPlextorSubchannel, _dev.Timeout, out cmdDuration);
-
-                return sense;
-            }
-
-            byte[] subBuf;
-
-            uint subSize = supportedPlextorSubchannel == PlextorSubchannel.Q16 ? 16u : 96u;
-
-            if(supportedPlextorSubchannel == PlextorSubchannel.Q16 ||
-               supportedPlextorSubchannel == PlextorSubchannel.Pack)
-            {
-                sense = _dev.PlextorReadCdDa(out cmdBuf, out senseBuf, firstSectorToRead, 2352 + subSize, blocksToRead,
-                                             supportedPlextorSubchannel, _dev.Timeout, out cmdDuration);
-
-                if(!sense)
-                    return false;
-            }
+            if(!sense)
+                return false;
 
             // As a workaround for some firmware bugs, seek far away.
             _dev.PlextorReadCdDa(out _, out senseBuf, firstSectorToRead - 32, blockSize, blocksToRead,
                                  supportedPlextorSubchannel, 0, out _);
 
-            sense = _dev.PlextorReadCdDa(out byte[] dataBuf, out senseBuf, firstSectorToRead, 2352, blocksToRead,
-                                         PlextorSubchannel.None, 0, out cmdDuration);
+            sense = _dev.PlextorReadCdDa(out cmdBuf, out senseBuf, firstSectorToRead, blockSize, blocksToRead,
+                                         supportedPlextorSubchannel, _dev.Timeout, out cmdDuration);
 
-            if(sense)
-                return true;
-
-            sense = _dev.PlextorReadCdDa(out subBuf, out senseBuf, firstSectorToRead, subSize, blocksToRead,
-                                         supportedPlextorSubchannel == PlextorSubchannel.Pack ? PlextorSubchannel.All
-                                             : supportedPlextorSubchannel, 0, out cmdDuration);
-
-            if(sense)
-                return true;
-
-            cmdBuf = new byte[(2352 * blocksToRead) + (subSize * blocksToRead)];
-
-            for(int b = 0; b < blocksToRead; b++)
-            {
-                Array.Copy(dataBuf, 2352   * b, cmdBuf, (2352 + subSize) * b, 2352);
-                Array.Copy(subBuf, subSize * b, cmdBuf, ((2352 + subSize) * b) + 2352, subSize);
-            }
-
-            return false;
+            return sense;
         }
+
+        byte[] subBuf;
+
+        uint subSize = supportedPlextorSubchannel == PlextorSubchannel.Q16 ? 16u : 96u;
+
+        if(supportedPlextorSubchannel == PlextorSubchannel.Q16 ||
+           supportedPlextorSubchannel == PlextorSubchannel.Pack)
+        {
+            sense = _dev.PlextorReadCdDa(out cmdBuf, out senseBuf, firstSectorToRead, 2352 + subSize, blocksToRead,
+                                         supportedPlextorSubchannel, _dev.Timeout, out cmdDuration);
+
+            if(!sense)
+                return false;
+        }
+
+        // As a workaround for some firmware bugs, seek far away.
+        _dev.PlextorReadCdDa(out _, out senseBuf, firstSectorToRead - 32, blockSize, blocksToRead,
+                             supportedPlextorSubchannel, 0, out _);
+
+        sense = _dev.PlextorReadCdDa(out byte[] dataBuf, out senseBuf, firstSectorToRead, 2352, blocksToRead,
+                                     PlextorSubchannel.None, 0, out cmdDuration);
+
+        if(sense)
+            return true;
+
+        sense = _dev.PlextorReadCdDa(out subBuf, out senseBuf, firstSectorToRead, subSize, blocksToRead,
+                                     supportedPlextorSubchannel == PlextorSubchannel.Pack ? PlextorSubchannel.All
+                                         : supportedPlextorSubchannel, 0, out cmdDuration);
+
+        if(sense)
+            return true;
+
+        cmdBuf = new byte[(2352 * blocksToRead) + (subSize * blocksToRead)];
+
+        for(int b = 0; b < blocksToRead; b++)
+        {
+            Array.Copy(dataBuf, 2352   * b, cmdBuf, (2352 + subSize) * b, 2352);
+            Array.Copy(subBuf, subSize * b, cmdBuf, ((2352 + subSize) * b) + 2352, subSize);
+        }
+
+        return false;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
index 3d9b59f3e..19f279853 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Pregap.cs
@@ -46,214 +46,316 @@ using Aaru.Devices;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    // TODO: Fix offset
+    /// <summary>Reads the first track pregap from a CompactDisc</summary>
+    /// <param name="blockSize">Block size in bytes</param>
+    /// <param name="currentSpeed">Current speed</param>
+    /// <param name="mediaTags">List of media tags</param>
+    /// <param name="supportedSubchannel">Subchannel the drive can read</param>
+    /// <param name="totalDuration">Total time spent sending commands to a drive</param>
+    void ReadCdFirstTrackPregap(uint blockSize, ref double currentSpeed, Dictionary<MediaTagType, byte[]> mediaTags,
+                                MmcSubchannel supportedSubchannel, ref double totalDuration)
     {
-        // TODO: Fix offset
-        /// <summary>Reads the first track pregap from a CompactDisc</summary>
-        /// <param name="blockSize">Block size in bytes</param>
-        /// <param name="currentSpeed">Current speed</param>
-        /// <param name="mediaTags">List of media tags</param>
-        /// <param name="supportedSubchannel">Subchannel the drive can read</param>
-        /// <param name="totalDuration">Total time spent sending commands to a drive</param>
-        void ReadCdFirstTrackPregap(uint blockSize, ref double currentSpeed, Dictionary<MediaTagType, byte[]> mediaTags,
-                                    MmcSubchannel supportedSubchannel, ref double totalDuration)
+        bool     sense;                           // Sense indicator
+        byte[]   cmdBuf;                          // Data buffer
+        double   cmdDuration;                     // Command execution time
+        DateTime timeSpeedStart;                  // Time of start for speed calculation
+        ulong    sectorSpeedStart            = 0; // Used to calculate correct speed
+        bool     gotFirstTrackPregap         = false;
+        int      firstTrackPregapSectorsGood = 0;
+        var      firstTrackPregapMs          = new MemoryStream();
+
+        _dumpLog.WriteLine("Reading first track pregap");
+        UpdateStatus?.Invoke("Reading first track pregap");
+        InitProgress?.Invoke();
+        timeSpeedStart = DateTime.UtcNow;
+
+        for(int firstTrackPregapBlock = -150; firstTrackPregapBlock < 0 && _resume.NextBlock == 0;
+            firstTrackPregapBlock++)
         {
-            bool     sense;                           // Sense indicator
-            byte[]   cmdBuf;                          // Data buffer
-            double   cmdDuration;                     // Command execution time
-            DateTime timeSpeedStart;                  // Time of start for speed calculation
-            ulong    sectorSpeedStart            = 0; // Used to calculate correct speed
-            bool     gotFirstTrackPregap         = false;
-            int      firstTrackPregapSectorsGood = 0;
-            var      firstTrackPregapMs          = new MemoryStream();
-
-            _dumpLog.WriteLine("Reading first track pregap");
-            UpdateStatus?.Invoke("Reading first track pregap");
-            InitProgress?.Invoke();
-            timeSpeedStart = DateTime.UtcNow;
-
-            for(int firstTrackPregapBlock = -150; firstTrackPregapBlock < 0 && _resume.NextBlock == 0;
-                firstTrackPregapBlock++)
+            if(_aborted)
             {
-                if(_aborted)
-                {
-                    _dumpLog.WriteLine("Aborted!");
-                    UpdateStatus?.Invoke("Aborted!");
-
-                    break;
-                }
-
-                PulseProgress?.
-                    Invoke($"Trying to read first track pregap sector {firstTrackPregapBlock} ({currentSpeed:F3} MiB/sec.)");
-
-                // ReSharper disable IntVariableOverflowInUncheckedContext
-                sense = _dev.ReadCd(out cmdBuf, out _, (uint)firstTrackPregapBlock, blockSize, 1,
-                                    MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
-                                    MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
-
-                // ReSharper restore IntVariableOverflowInUncheckedContext
-
-                if(!sense &&
-                   !_dev.Error)
-                {
-                    firstTrackPregapMs.Write(cmdBuf, 0, (int)blockSize);
-                    gotFirstTrackPregap = true;
-                    firstTrackPregapSectorsGood++;
-                    totalDuration += cmdDuration;
-                }
-                else
-                {
-                    // Write empty data
-                    if(gotFirstTrackPregap)
-                        firstTrackPregapMs.Write(new byte[blockSize], 0, (int)blockSize);
-                }
-
-                sectorSpeedStart++;
-
-                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                if(elapsed <= 0)
-                    continue;
-
-                currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                sectorSpeedStart = 0;
-                timeSpeedStart   = DateTime.UtcNow;
-            }
-
-            if(firstTrackPregapSectorsGood > 0)
-                mediaTags.Add(MediaTagType.CD_FirstTrackPregap, firstTrackPregapMs.ToArray());
-
-            EndProgress?.Invoke();
-            UpdateStatus?.Invoke($"Got {firstTrackPregapSectorsGood} first track pregap sectors.");
-            _dumpLog.WriteLine("Got {0} first track pregap sectors.", firstTrackPregapSectorsGood);
-
-            firstTrackPregapMs.Close();
-        }
-
-        /// <summary>Calculate track pregaps</summary>
-        /// <param name="dev">Device</param>
-        /// <param name="dumpLog">Dumping log</param>
-        /// <param name="updateStatus">Progress update callback</param>
-        /// <param name="tracks">List of tracks</param>
-        /// <param name="supportsPqSubchannel">Set if drive supports reading PQ subchannel</param>
-        /// <param name="supportsRwSubchannel">Set if drive supports reading RW subchannel</param>
-        /// <param name="dbDev">Database entry for device</param>
-        /// <param name="inexactPositioning">Set if we found the drive does not return the exact subchannel we requested</param>
-        /// <param name="dumping">Set if dumping, otherwise media info</param>
-        public static void SolveTrackPregaps(Device dev, DumpLog dumpLog, UpdateStatusHandler updateStatus,
-                                             Track[] tracks, bool supportsPqSubchannel, bool supportsRwSubchannel,
-                                             Database.Models.Device dbDev, out bool inexactPositioning, bool dumping)
-        {
-            bool                  sense  = true; // Sense indicator
-            byte[]                subBuf = null;
-            int                   posQ;
-            uint                  retries;
-            bool?                 bcd = null;
-            byte[]                crc;
-            Dictionary<uint, int> pregaps = new Dictionary<uint, int>();
-            inexactPositioning = false;
-
-            if(!supportsPqSubchannel &&
-               !supportsRwSubchannel)
-                return;
-
-            // Check if subchannel is BCD
-            for(retries = 0; retries < 10; retries++)
-            {
-                sense = supportsRwSubchannel ? GetSectorForPregapRaw(dev, 11, dbDev, out subBuf, false)
-                            : GetSectorForPregapQ16(dev, 11, out subBuf, false);
-
-                if(sense)
-                    continue;
-
-                bcd = (subBuf[9] & 0x10) > 0;
+                _dumpLog.WriteLine("Aborted!");
+                UpdateStatus?.Invoke("Aborted!");
 
                 break;
             }
 
-            AaruConsole.DebugWriteLine("Pregap calculator", bcd == true
-                                                                ? "Subchannel is BCD"
-                                                                : bcd == false
-                                                                    ? "Subchannel is not BCD"
-                                                                    : "Could not detect drive subchannel BCD");
+            PulseProgress?.
+                Invoke($"Trying to read first track pregap sector {firstTrackPregapBlock} ({currentSpeed:F3} MiB/sec.)");
 
-            if(bcd is null)
+            // ReSharper disable IntVariableOverflowInUncheckedContext
+            sense = _dev.ReadCd(out cmdBuf, out _, (uint)firstTrackPregapBlock, blockSize, 1,
+                                MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
+
+            // ReSharper restore IntVariableOverflowInUncheckedContext
+
+            if(!sense &&
+               !_dev.Error)
             {
-                dumpLog?.WriteLine("Could not detect if drive subchannel is BCD or not, pregaps could not be calculated, dump may be incorrect...");
-
-                updateStatus?.
-                    Invoke("Could not detect if drive subchannel is BCD or not, pregaps could not be calculated, dump may be incorrect...");
-
-                return;
+                firstTrackPregapMs.Write(cmdBuf, 0, (int)blockSize);
+                gotFirstTrackPregap = true;
+                firstTrackPregapSectorsGood++;
+                totalDuration += cmdDuration;
+            }
+            else
+            {
+                // Write empty data
+                if(gotFirstTrackPregap)
+                    firstTrackPregapMs.Write(new byte[blockSize], 0, (int)blockSize);
             }
 
-            // Initialize the dictionary
-            foreach(Track t in tracks)
-                pregaps[t.Sequence] = 0;
+            sectorSpeedStart++;
 
-            for(int t = 0; t < tracks.Length; t++)
+            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+            if(elapsed <= 0)
+                continue;
+
+            currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+            sectorSpeedStart = 0;
+            timeSpeedStart   = DateTime.UtcNow;
+        }
+
+        if(firstTrackPregapSectorsGood > 0)
+            mediaTags.Add(MediaTagType.CD_FirstTrackPregap, firstTrackPregapMs.ToArray());
+
+        EndProgress?.Invoke();
+        UpdateStatus?.Invoke($"Got {firstTrackPregapSectorsGood} first track pregap sectors.");
+        _dumpLog.WriteLine("Got {0} first track pregap sectors.", firstTrackPregapSectorsGood);
+
+        firstTrackPregapMs.Close();
+    }
+
+    /// <summary>Calculate track pregaps</summary>
+    /// <param name="dev">Device</param>
+    /// <param name="dumpLog">Dumping log</param>
+    /// <param name="updateStatus">Progress update callback</param>
+    /// <param name="tracks">List of tracks</param>
+    /// <param name="supportsPqSubchannel">Set if drive supports reading PQ subchannel</param>
+    /// <param name="supportsRwSubchannel">Set if drive supports reading RW subchannel</param>
+    /// <param name="dbDev">Database entry for device</param>
+    /// <param name="inexactPositioning">Set if we found the drive does not return the exact subchannel we requested</param>
+    /// <param name="dumping">Set if dumping, otherwise media info</param>
+    public static void SolveTrackPregaps(Device dev, DumpLog dumpLog, UpdateStatusHandler updateStatus,
+                                         Track[] tracks, bool supportsPqSubchannel, bool supportsRwSubchannel,
+                                         Database.Models.Device dbDev, out bool inexactPositioning, bool dumping)
+    {
+        bool                  sense  = true; // Sense indicator
+        byte[]                subBuf = null;
+        int                   posQ;
+        uint                  retries;
+        bool?                 bcd = null;
+        byte[]                crc;
+        Dictionary<uint, int> pregaps = new Dictionary<uint, int>();
+        inexactPositioning = false;
+
+        if(!supportsPqSubchannel &&
+           !supportsRwSubchannel)
+            return;
+
+        // Check if subchannel is BCD
+        for(retries = 0; retries < 10; retries++)
+        {
+            sense = supportsRwSubchannel ? GetSectorForPregapRaw(dev, 11, dbDev, out subBuf, false)
+                        : GetSectorForPregapQ16(dev, 11, out subBuf, false);
+
+            if(sense)
+                continue;
+
+            bcd = (subBuf[9] & 0x10) > 0;
+
+            break;
+        }
+
+        AaruConsole.DebugWriteLine("Pregap calculator", bcd == true
+                                                            ? "Subchannel is BCD"
+                                                            : bcd == false
+                                                                ? "Subchannel is not BCD"
+                                                                : "Could not detect drive subchannel BCD");
+
+        if(bcd is null)
+        {
+            dumpLog?.WriteLine("Could not detect if drive subchannel is BCD or not, pregaps could not be calculated, dump may be incorrect...");
+
+            updateStatus?.
+                Invoke("Could not detect if drive subchannel is BCD or not, pregaps could not be calculated, dump may be incorrect...");
+
+            return;
+        }
+
+        // Initialize the dictionary
+        foreach(Track t in tracks)
+            pregaps[t.Sequence] = 0;
+
+        for(int t = 0; t < tracks.Length; t++)
+        {
+            Track track        = tracks[t];
+            int   trackRetries = 0;
+
+            // First track of each session has at least 150 sectors of pregap and is not always readable
+            if(tracks.Where(trk => trk.Session == track.Session).OrderBy(trk => trk.Sequence).
+                      FirstOrDefault().Sequence == track.Sequence)
             {
-                Track track        = tracks[t];
-                int   trackRetries = 0;
+                AaruConsole.DebugWriteLine("Pregap calculator", "Skipping track {0}", track.Sequence);
 
-                // First track of each session has at least 150 sectors of pregap and is not always readable
-                if(tracks.Where(trk => trk.Session == track.Session).OrderBy(trk => trk.Sequence).
-                          FirstOrDefault().Sequence == track.Sequence)
+                if(track.Sequence > 1)
+                    pregaps[track.Sequence] = 150;
+
+                continue;
+            }
+
+            if(t                  > 0               &&
+               tracks[t - 1].Type == tracks[t].Type &&
+               dumping)
+            {
+                AaruConsole.DebugWriteLine("Pregap calculator", "Skipping track {0}", track.Sequence);
+
+                continue;
+            }
+
+            if(dumping && dev.Manufacturer.ToLowerInvariant().StartsWith("plextor", StringComparison.Ordinal))
+            {
+                AaruConsole.DebugWriteLine("Pregap calculator", "Skipping track {0} due to Plextor firmware bug",
+                                           track.Sequence);
+
+                continue;
+            }
+
+            AaruConsole.DebugWriteLine("Pregap calculator", "Track {0}", track.Sequence);
+
+            int   lba           = (int)track.StartSector - 1;
+            bool  pregapFound   = false;
+            Track previousTrack = tracks.FirstOrDefault(trk => trk.Sequence == track.Sequence - 1);
+
+            bool goneBack                      = false;
+            bool goFront                       = false;
+            bool forward                       = false;
+            bool crcOk                         = false;
+            bool previousPregapIsPreviousTrack = false;
+
+            // Check if pregap is 0
+            for(retries = 0; retries < 10 && !pregapFound; retries++)
+            {
+                sense = supportsRwSubchannel
+                            ? GetSectorForPregapRaw(dev, (uint)lba, dbDev, out subBuf,
+                                                    track.Type == TrackType.Audio)
+                            : GetSectorForPregapQ16(dev, (uint)lba, out subBuf, track.Type == TrackType.Audio);
+
+                if(sense)
                 {
-                    AaruConsole.DebugWriteLine("Pregap calculator", "Skipping track {0}", track.Sequence);
-
-                    if(track.Sequence > 1)
-                        pregaps[track.Sequence] = 150;
+                    AaruConsole.DebugWriteLine("Pregap calculator", "LBA: {0}, Try {1}, Sense {2}", lba,
+                                               retries + 1, sense);
 
                     continue;
                 }
 
-                if(t                       > 0                    &&
-                   tracks[t - 1].Type == tracks[t].Type &&
-                   dumping)
-                {
-                    AaruConsole.DebugWriteLine("Pregap calculator", "Skipping track {0}", track.Sequence);
+                if(bcd == false)
+                    BinaryToBcdQ(subBuf);
 
-                    continue;
+                CRC16CCITTContext.Data(subBuf, 10, out crc);
+
+                AaruConsole.DebugWriteLine("Pregap calculator",
+                                           "LBA: {0}, Try {1}, Sense {2}, Q: {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
+                                           lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3],
+                                           subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8], subBuf[9],
+                                           subBuf[10], subBuf[11], crc[0], crc[1]);
+
+                crcOk = crc[0] == subBuf[10] && crc[1] == subBuf[11];
+
+                // Try to do a simple correction
+                if(!crcOk)
+                {
+                    // Data track cannot have 11xxb in CONTROL
+                    if((subBuf[0] & 0x40) > 0)
+                        subBuf[0] &= 0x7F;
+
+                    // ADR only uses two bits
+                    subBuf[0] &= 0xF3;
+
+                    // Don't care about other Q modes
+                    if((subBuf[0] & 0xF) == 1)
+                    {
+                        // ZERO only used in DDCD
+                        subBuf[6] = 0;
+
+                        // Fix BCD numbering
+                        for(int i = 1; i < 10; i++)
+                        {
+                            if((subBuf[i] & 0xF0) > 0xA0)
+                                subBuf[i] &= 0x7F;
+
+                            if((subBuf[i] & 0x0F) > 0x0A)
+                                subBuf[i] &= 0xF7;
+                        }
+                    }
+
+                    CRC16CCITTContext.Data(subBuf, 10, out crc);
+
+                    crcOk = crc[0] == subBuf[10] && crc[1] == subBuf[11];
+
+                    if(crcOk)
+                    {
+                        AaruConsole.DebugWriteLine("Pregap calculator",
+                                                   "LBA: {0}, Try {1}, Sense {2}, Q (FIXED): {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
+                                                   lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2],
+                                                   subBuf[3], subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8],
+                                                   subBuf[9], subBuf[10], subBuf[11], crc[0], crc[1]);
+                    }
+                    else
+                        continue;
                 }
 
-                if(dumping && dev.Manufacturer.ToLowerInvariant().StartsWith("plextor", StringComparison.Ordinal))
-                {
-                    AaruConsole.DebugWriteLine("Pregap calculator", "Skipping track {0} due to Plextor firmware bug",
-                                               track.Sequence);
+                BcdToBinaryQ(subBuf);
 
+                // Q position
+                if((subBuf[0] & 0xF) != 1)
                     continue;
-                }
 
-                AaruConsole.DebugWriteLine("Pregap calculator", "Track {0}", track.Sequence);
+                posQ = (subBuf[7] * 60 * 75) + (subBuf[8] * 75) + subBuf[9] - 150;
 
-                int   lba           = (int)track.StartSector - 1;
-                bool  pregapFound   = false;
-                Track previousTrack = tracks.FirstOrDefault(trk => trk.Sequence == track.Sequence - 1);
+                if(subBuf[1] != track.Sequence - 1 ||
+                   subBuf[2] == 0                  ||
+                   posQ      != lba)
+                    break;
 
-                bool goneBack                      = false;
-                bool goFront                       = false;
-                bool forward                       = false;
-                bool crcOk                         = false;
-                bool previousPregapIsPreviousTrack = false;
+                pregaps[track.Sequence] = 0;
 
-                // Check if pregap is 0
-                for(retries = 0; retries < 10 && !pregapFound; retries++)
+                pregapFound = true;
+            }
+
+            if(pregapFound)
+                continue;
+
+            // Calculate pregap
+            lba = (int)track.StartSector - 150;
+
+            while(lba > (int)previousTrack.StartSector &&
+                  lba <= (int)track.StartSector)
+            {
+                // Some drives crash if you try to read just before the previous read, so seek away first
+                if(!forward)
+                    sense = supportsRwSubchannel
+                                ? GetSectorForPregapRaw(dev, (uint)lba - 10, dbDev, out subBuf,
+                                                        track.Type == TrackType.Audio)
+                                : GetSectorForPregapQ16(dev, (uint)lba - 10, out subBuf,
+                                                        track.Type == TrackType.Audio);
+
+                for(retries = 0; retries < 10; retries++)
                 {
                     sense = supportsRwSubchannel
                                 ? GetSectorForPregapRaw(dev, (uint)lba, dbDev, out subBuf,
                                                         track.Type == TrackType.Audio)
-                                : GetSectorForPregapQ16(dev, (uint)lba, out subBuf, track.Type == TrackType.Audio);
+                                : GetSectorForPregapQ16(dev, (uint)lba, out subBuf,
+                                                        track.Type == TrackType.Audio);
 
                     if(sense)
-                    {
-                        AaruConsole.DebugWriteLine("Pregap calculator", "LBA: {0}, Try {1}, Sense {2}", lba,
-                                                   retries + 1, sense);
-
                         continue;
-                    }
 
                     if(bcd == false)
                         BinaryToBcdQ(subBuf);
@@ -304,510 +406,407 @@ namespace Aaru.Core.Devices.Dumping
                             AaruConsole.DebugWriteLine("Pregap calculator",
                                                        "LBA: {0}, Try {1}, Sense {2}, Q (FIXED): {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
                                                        lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2],
-                                                       subBuf[3], subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8],
-                                                       subBuf[9], subBuf[10], subBuf[11], crc[0], crc[1]);
+                                                       subBuf[3], subBuf[4], subBuf[5], subBuf[6], subBuf[7],
+                                                       subBuf[8], subBuf[9], subBuf[10], subBuf[11], crc[0],
+                                                       crc[1]);
+
+                            break;
                         }
-                        else
-                            continue;
                     }
 
-                    BcdToBinaryQ(subBuf);
-
-                    // Q position
-                    if((subBuf[0] & 0xF) != 1)
-                        continue;
-
-                    posQ = (subBuf[7] * 60 * 75) + (subBuf[8] * 75) + subBuf[9] - 150;
-
-                    if(subBuf[1] != track.Sequence - 1 ||
-                       subBuf[2] == 0                       ||
-                       posQ      != lba)
+                    if(crcOk)
                         break;
-
-                    pregaps[track.Sequence] = 0;
-
-                    pregapFound = true;
                 }
 
-                if(pregapFound)
-                    continue;
-
-                // Calculate pregap
-                lba = (int)track.StartSector - 150;
-
-                while(lba > (int)previousTrack.StartSector &&
-                      lba <= (int)track.StartSector)
+                if(retries == 10)
                 {
-                    // Some drives crash if you try to read just before the previous read, so seek away first
-                    if(!forward)
-                        sense = supportsRwSubchannel
-                                    ? GetSectorForPregapRaw(dev, (uint)lba - 10, dbDev, out subBuf,
-                                                            track.Type == TrackType.Audio)
-                                    : GetSectorForPregapQ16(dev, (uint)lba - 10, out subBuf,
-                                                            track.Type == TrackType.Audio);
-
-                    for(retries = 0; retries < 10; retries++)
+                    if(sense)
                     {
-                        sense = supportsRwSubchannel
-                                    ? GetSectorForPregapRaw(dev, (uint)lba, dbDev, out subBuf,
-                                                            track.Type == TrackType.Audio)
-                                    : GetSectorForPregapQ16(dev, (uint)lba, out subBuf,
-                                                            track.Type == TrackType.Audio);
+                        trackRetries++;
 
-                        if(sense)
-                            continue;
-
-                        if(bcd == false)
-                            BinaryToBcdQ(subBuf);
-
-                        CRC16CCITTContext.Data(subBuf, 10, out crc);
-
-                        AaruConsole.DebugWriteLine("Pregap calculator",
-                                                   "LBA: {0}, Try {1}, Sense {2}, Q: {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
-                                                   lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2], subBuf[3],
-                                                   subBuf[4], subBuf[5], subBuf[6], subBuf[7], subBuf[8], subBuf[9],
-                                                   subBuf[10], subBuf[11], crc[0], crc[1]);
-
-                        crcOk = crc[0] == subBuf[10] && crc[1] == subBuf[11];
-
-                        // Try to do a simple correction
-                        if(!crcOk)
+                        if(trackRetries >= 10)
                         {
-                            // Data track cannot have 11xxb in CONTROL
-                            if((subBuf[0] & 0x40) > 0)
-                                subBuf[0] &= 0x7F;
-
-                            // ADR only uses two bits
-                            subBuf[0] &= 0xF3;
-
-                            // Don't care about other Q modes
-                            if((subBuf[0] & 0xF) == 1)
+                            if(pregaps[track.Sequence] == 0)
                             {
-                                // ZERO only used in DDCD
-                                subBuf[6] = 0;
-
-                                // Fix BCD numbering
-                                for(int i = 1; i < 10; i++)
+                                if((previousTrack.Type == TrackType.Audio &&
+                                    track.Type         != TrackType.Audio) ||
+                                   (previousTrack.Type != TrackType.Audio &&
+                                    track.Type         == TrackType.Audio))
                                 {
-                                    if((subBuf[i] & 0xF0) > 0xA0)
-                                        subBuf[i] &= 0x7F;
+                                    dumpLog?.
+                                        WriteLine("Could not read subchannel for this track, supposing 150 sectors.");
 
-                                    if((subBuf[i] & 0x0F) > 0x0A)
-                                        subBuf[i] &= 0xF7;
-                                }
-                            }
-
-                            CRC16CCITTContext.Data(subBuf, 10, out crc);
-
-                            crcOk = crc[0] == subBuf[10] && crc[1] == subBuf[11];
-
-                            if(crcOk)
-                            {
-                                AaruConsole.DebugWriteLine("Pregap calculator",
-                                                           "LBA: {0}, Try {1}, Sense {2}, Q (FIXED): {3:X2} {4:X2} {5:X2} {6:X2} {7:X2} {8:X2} {9:X2} {10:X2} {11:X2} {12:X2} CRC 0x{13:X2}{14:X2}, Calculated CRC: 0x{15:X2}{16:X2}",
-                                                           lba, retries + 1, sense, subBuf[0], subBuf[1], subBuf[2],
-                                                           subBuf[3], subBuf[4], subBuf[5], subBuf[6], subBuf[7],
-                                                           subBuf[8], subBuf[9], subBuf[10], subBuf[11], crc[0],
-                                                           crc[1]);
-
-                                break;
-                            }
-                        }
-
-                        if(crcOk)
-                            break;
-                    }
-
-                    if(retries == 10)
-                    {
-                        if(sense)
-                        {
-                            trackRetries++;
-
-                            if(trackRetries >= 10)
-                            {
-                                if(pregaps[track.Sequence] == 0)
-                                {
-                                    if((previousTrack.Type == TrackType.Audio &&
-                                        track.Type         != TrackType.Audio) ||
-                                       (previousTrack.Type != TrackType.Audio &&
-                                        track.Type         == TrackType.Audio))
-                                    {
-                                        dumpLog?.
-                                            WriteLine("Could not read subchannel for this track, supposing 150 sectors.");
-
-                                        updateStatus?.
-                                            Invoke("Could not read subchannel for this track, supposing 150 sectors.");
-                                    }
-                                    else
-                                    {
-                                        dumpLog?.
-                                            WriteLine("Could not read subchannel for this track, supposing 0 sectors.");
-
-                                        updateStatus?.
-                                            Invoke("Could not read subchannel for this track, supposing 0 sectors.");
-                                    }
+                                    updateStatus?.
+                                        Invoke("Could not read subchannel for this track, supposing 150 sectors.");
                                 }
                                 else
                                 {
                                     dumpLog?.
-                                        WriteLine($"Could not read subchannel for this track, supposing {pregaps[track.Sequence]} sectors.");
+                                        WriteLine("Could not read subchannel for this track, supposing 0 sectors.");
 
                                     updateStatus?.
-                                        Invoke($"Could not read subchannel for this track, supposing {pregaps[track.Sequence]} sectors.");
+                                        Invoke("Could not read subchannel for this track, supposing 0 sectors.");
                                 }
+                            }
+                            else
+                            {
+                                dumpLog?.
+                                    WriteLine($"Could not read subchannel for this track, supposing {pregaps[track.Sequence]} sectors.");
 
-                                break;
+                                updateStatus?.
+                                    Invoke($"Could not read subchannel for this track, supposing {pregaps[track.Sequence]} sectors.");
                             }
 
-                            dumpLog?.WriteLine($"Could not read subchannel for sector {lba}");
-                            updateStatus?.Invoke($"Could not read subchannel for sector {lba}");
-
-                            lba++;
-                            forward = true;
-
-                            continue;
+                            break;
                         }
 
-                        dumpLog?.WriteLine($"Could not get correct subchannel for sector {lba}");
-                        updateStatus?.Invoke($"Could not get correct subchannel for sector {lba}");
-                    }
+                        dumpLog?.WriteLine($"Could not read subchannel for sector {lba}");
+                        updateStatus?.Invoke($"Could not read subchannel for sector {lba}");
 
-                    if(subBuf.All(b => b == 0))
-                    {
-                        inexactPositioning = true;
-
-                        AaruConsole.DebugWriteLine("Pregap calculator", "All Q empty for LBA {0}", lba);
-
-                        break;
-                    }
-
-                    BcdToBinaryQ(subBuf);
-
-                    // If it's not Q position
-                    if((subBuf[0] & 0xF) != 1)
-                    {
-                        // This means we already searched back, so search forward
-                        if(goFront)
-                        {
-                            lba++;
-                            forward = true;
-
-                            if(lba == (int)previousTrack.StartSector)
-                                break;
-
-                            continue;
-                        }
-
-                        // Search back
-                        goneBack = true;
-                        lba--;
-                        forward = false;
+                        lba++;
+                        forward = true;
 
                         continue;
                     }
 
-                    // Previous track
-                    if(subBuf[1] < track.Sequence)
+                    dumpLog?.WriteLine($"Could not get correct subchannel for sector {lba}");
+                    updateStatus?.Invoke($"Could not get correct subchannel for sector {lba}");
+                }
+
+                if(subBuf.All(b => b == 0))
+                {
+                    inexactPositioning = true;
+
+                    AaruConsole.DebugWriteLine("Pregap calculator", "All Q empty for LBA {0}", lba);
+
+                    break;
+                }
+
+                BcdToBinaryQ(subBuf);
+
+                // If it's not Q position
+                if((subBuf[0] & 0xF) != 1)
+                {
+                    // This means we already searched back, so search forward
+                    if(goFront)
                     {
                         lba++;
-                        forward                       = true;
-                        previousPregapIsPreviousTrack = true;
+                        forward = true;
 
-                        // Already gone back, so go forward
-                        if(goneBack)
-                            goFront = true;
-
-                        continue;
-                    }
-
-                    // Same track, but not pregap
-                    if(subBuf[1] == track.Sequence &&
-                       subBuf[2] > 0)
-                    {
-                        lba--;
-                        forward = false;
-
-                        if(previousPregapIsPreviousTrack)
+                        if(lba == (int)previousTrack.StartSector)
                             break;
 
                         continue;
                     }
 
-                    previousPregapIsPreviousTrack = false;
+                    // Search back
+                    goneBack = true;
+                    lba--;
+                    forward = false;
 
-                    // Pregap according to Q position
-                    posQ = (subBuf[7] * 60 * 75) + (subBuf[8] * 75) + subBuf[9] - 150;
-                    int diff    = posQ                        - lba;
-                    int pregapQ = (int)track.StartSector - lba;
+                    continue;
+                }
 
-                    if(diff != 0)
-                    {
-                        AaruConsole.DebugWriteLine("Pregap calculator", "Invalid Q position for LBA {0}, got {1}", lba,
-                                                   posQ);
+                // Previous track
+                if(subBuf[1] < track.Sequence)
+                {
+                    lba++;
+                    forward                       = true;
+                    previousPregapIsPreviousTrack = true;
 
-                        inexactPositioning = true;
-                    }
+                    // Already gone back, so go forward
+                    if(goneBack)
+                        goFront = true;
 
-                    // Received a Q post the LBA we wanted, just go back. If we are already going forward, break
-                    if(posQ > lba)
-                    {
-                        if(forward)
-                            break;
+                    continue;
+                }
 
-                        lba--;
+                // Same track, but not pregap
+                if(subBuf[1] == track.Sequence &&
+                   subBuf[2] > 0)
+                {
+                    lba--;
+                    forward = false;
 
-                        continue;
-                    }
+                    if(previousPregapIsPreviousTrack)
+                        break;
 
-                    // Bigger than known change, otherwise we found it
-                    if(pregapQ > pregaps[track.Sequence])
-                    {
-                        // If CRC is not OK, only accept pregaps less than 10 sectors longer than previously now
-                        if(crcOk || pregapQ - pregaps[track.Sequence] < 10)
-                        {
-                            AaruConsole.DebugWriteLine("Pregap calculator", "Pregap for track {0}: {1}",
-                                                       track.Sequence, pregapQ);
+                    continue;
+                }
 
-                            pregaps[track.Sequence] = pregapQ;
-                        }
+                previousPregapIsPreviousTrack = false;
 
-                        // We are going forward, so we have already been in the previous track, so add 1 to pregap and get out of here
-                        else if(forward)
-                        {
-                            pregaps[track.Sequence]++;
+                // Pregap according to Q position
+                posQ = (subBuf[7] * 60 * 75) + (subBuf[8] * 75) + subBuf[9] - 150;
+                int diff    = posQ                   - lba;
+                int pregapQ = (int)track.StartSector - lba;
 
-                            break;
-                        }
-                    }
-                    else if(pregapQ == pregaps[track.Sequence])
+                if(diff != 0)
+                {
+                    AaruConsole.DebugWriteLine("Pregap calculator", "Invalid Q position for LBA {0}, got {1}", lba,
+                                               posQ);
+
+                    inexactPositioning = true;
+                }
+
+                // Received a Q post the LBA we wanted, just go back. If we are already going forward, break
+                if(posQ > lba)
+                {
+                    if(forward)
                         break;
 
                     lba--;
-                    forward = false;
-                }
-            }
 
-            foreach(Track trk in tracks)
-            {
-                trk.Pregap = (ulong)pregaps[trk.Sequence];
-
-                // Do not reduce pregap, or starting position of session's first track
-                if(tracks.Where(t => t.Session == trk.Session).OrderBy(t => t.Sequence).FirstOrDefault().
-                          Sequence == trk.Sequence)
                     continue;
+                }
 
-                if(dumping)
+                // Bigger than known change, otherwise we found it
+                if(pregapQ > pregaps[track.Sequence])
                 {
-                    // Minus five, to ensure dumping will fix if there is a pregap LBA 0
-                    int red = 5;
-
-                    while(trk.Pregap > 0 &&
-                          red             > 0)
+                    // If CRC is not OK, only accept pregaps less than 10 sectors longer than previously now
+                    if(crcOk || pregapQ - pregaps[track.Sequence] < 10)
                     {
-                        trk.Pregap--;
-                        red--;
+                        AaruConsole.DebugWriteLine("Pregap calculator", "Pregap for track {0}: {1}",
+                                                   track.Sequence, pregapQ);
+
+                        pregaps[track.Sequence] = pregapQ;
+                    }
+
+                    // We are going forward, so we have already been in the previous track, so add 1 to pregap and get out of here
+                    else if(forward)
+                    {
+                        pregaps[track.Sequence]++;
+
+                        break;
                     }
                 }
+                else if(pregapQ == pregaps[track.Sequence])
+                    break;
 
-                trk.StartSector -= trk.Pregap;
-
-            #if DEBUG
-                dumpLog?.WriteLine($"Track {trk.Sequence} pregap is {trk.Pregap} sectors");
-                updateStatus?.Invoke($"Track {trk.Sequence} pregap is {trk.Pregap} sectors");
-            #endif
+                lba--;
+                forward = false;
             }
         }
 
-        /// <summary>Reads a RAW subchannel sector for pregap calculation</summary>
-        /// <param name="dev">Device</param>
-        /// <param name="lba">LBA</param>
-        /// <param name="dbDev">Database entry for device</param>
-        /// <param name="subBuf">Read subchannel</param>
-        /// <param name="audioTrack">Set if it is an audio track</param>
-        /// <returns><c>true</c> if read correctly, <c>false</c> otherwise</returns>
-        static bool GetSectorForPregapRaw(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf,
-                                          bool audioTrack)
+        foreach(Track trk in tracks)
         {
-            byte[] cmdBuf;
-            bool   sense;
-            subBuf = null;
+            trk.Pregap = (ulong)pregaps[trk.Sequence];
 
-            if(audioTrack)
+            // Do not reduce pregap, or starting position of session's first track
+            if(tracks.Where(t => t.Session == trk.Session).OrderBy(t => t.Sequence).FirstOrDefault().
+                      Sequence == trk.Sequence)
+                continue;
+
+            if(dumping)
             {
-                sense = dev.ReadCd(out cmdBuf, out _, lba, 2448, 1, MmcSectorTypes.Cdda, false, false, false,
-                                   MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Raw, dev.Timeout,
-                                   out _);
+                // Minus five, to ensure dumping will fix if there is a pregap LBA 0
+                int red = 5;
 
-                if(sense)
-                    sense = dev.ReadCd(out cmdBuf, out _, lba, 2448, 1, MmcSectorTypes.AllTypes, false, false, true,
-                                       MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Raw,
-                                       dev.Timeout, out _);
+                while(trk.Pregap > 0 &&
+                      red        > 0)
+                {
+                    trk.Pregap--;
+                    red--;
+                }
             }
-            else
-            {
+
+            trk.StartSector -= trk.Pregap;
+
+        #if DEBUG
+            dumpLog?.WriteLine($"Track {trk.Sequence} pregap is {trk.Pregap} sectors");
+            updateStatus?.Invoke($"Track {trk.Sequence} pregap is {trk.Pregap} sectors");
+        #endif
+        }
+    }
+
+    /// <summary>Reads a RAW subchannel sector for pregap calculation</summary>
+    /// <param name="dev">Device</param>
+    /// <param name="lba">LBA</param>
+    /// <param name="dbDev">Database entry for device</param>
+    /// <param name="subBuf">Read subchannel</param>
+    /// <param name="audioTrack">Set if it is an audio track</param>
+    /// <returns><c>true</c> if read correctly, <c>false</c> otherwise</returns>
+    static bool GetSectorForPregapRaw(Device dev, uint lba, Database.Models.Device dbDev, out byte[] subBuf,
+                                      bool audioTrack)
+    {
+        byte[] cmdBuf;
+        bool   sense;
+        subBuf = null;
+
+        if(audioTrack)
+        {
+            sense = dev.ReadCd(out cmdBuf, out _, lba, 2448, 1, MmcSectorTypes.Cdda, false, false, false,
+                               MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Raw, dev.Timeout,
+                               out _);
+
+            if(sense)
                 sense = dev.ReadCd(out cmdBuf, out _, lba, 2448, 1, MmcSectorTypes.AllTypes, false, false, true,
                                    MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Raw,
                                    dev.Timeout, out _);
+        }
+        else
+        {
+            sense = dev.ReadCd(out cmdBuf, out _, lba, 2448, 1, MmcSectorTypes.AllTypes, false, false, true,
+                               MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Raw,
+                               dev.Timeout, out _);
 
-                if(sense)
-                    sense = dev.ReadCd(out cmdBuf, out _, lba, 2448, 1, MmcSectorTypes.Cdda, false, false, false,
-                                       MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Raw,
-                                       dev.Timeout, out _);
-            }
+            if(sense)
+                sense = dev.ReadCd(out cmdBuf, out _, lba, 2448, 1, MmcSectorTypes.Cdda, false, false, false,
+                                   MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Raw,
+                                   dev.Timeout, out _);
+        }
 
-            if(!sense)
-            {
-                byte[] tmpBuf = new byte[96];
-                Array.Copy(cmdBuf, 2352, tmpBuf, 0, 96);
-                subBuf = DeinterleaveQ(tmpBuf);
-            }
-            else
-            {
-                sense = dev.ReadCd(out cmdBuf, out _, lba, 96, 1, MmcSectorTypes.AllTypes, false, false, false,
+        if(!sense)
+        {
+            byte[] tmpBuf = new byte[96];
+            Array.Copy(cmdBuf, 2352, tmpBuf, 0, 96);
+            subBuf = DeinterleaveQ(tmpBuf);
+        }
+        else
+        {
+            sense = dev.ReadCd(out cmdBuf, out _, lba, 96, 1, MmcSectorTypes.AllTypes, false, false, false,
+                               MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Raw,
+                               dev.Timeout, out _);
+
+            if(sense)
+                sense = dev.ReadCd(out cmdBuf, out _, lba, 96, 1, MmcSectorTypes.Cdda, false, false, false,
                                    MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Raw,
                                    dev.Timeout, out _);
 
-                if(sense)
-                    sense = dev.ReadCd(out cmdBuf, out _, lba, 96, 1, MmcSectorTypes.Cdda, false, false, false,
-                                       MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Raw,
-                                       dev.Timeout, out _);
-
-                if(!sense)
-                {
-                    subBuf = DeinterleaveQ(cmdBuf);
-                }
-                else if(dbDev?.ATAPI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA == true) == true ||
-                        dbDev?.SCSI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA  == true) == true ||
-                        dev.Manufacturer.ToLowerInvariant()                                        == "plextor")
-                    sense = dev.PlextorReadCdDa(out cmdBuf, out _, lba, 96, 1, PlextorSubchannel.All, dev.Timeout,
-                                                out _);
-
-                {
-                    if(!sense)
-                        subBuf = DeinterleaveQ(cmdBuf);
-                }
+            if(!sense)
+            {
+                subBuf = DeinterleaveQ(cmdBuf);
             }
+            else if(dbDev?.ATAPI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA == true) == true ||
+                    dbDev?.SCSI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA  == true) == true ||
+                    dev.Manufacturer.ToLowerInvariant()                                        == "plextor")
+                sense = dev.PlextorReadCdDa(out cmdBuf, out _, lba, 96, 1, PlextorSubchannel.All, dev.Timeout,
+                                            out _);
 
-            return sense;
+            {
+                if(!sense)
+                    subBuf = DeinterleaveQ(cmdBuf);
+            }
         }
 
-        /// <summary>Reads a Q16 subchannel sector for pregap calculation</summary>
-        /// <param name="dev">Device</param>
-        /// <param name="lba">LBA</param>
-        /// <param name="subBuf">Read subchannel</param>
-        /// <param name="audioTrack">Set if it is an audio track</param>
-        /// <returns><c>true</c> if read correctly, <c>false</c> otherwise</returns>
-        static bool GetSectorForPregapQ16(Device dev, uint lba, out byte[] subBuf, bool audioTrack)
+        return sense;
+    }
+
+    /// <summary>Reads a Q16 subchannel sector for pregap calculation</summary>
+    /// <param name="dev">Device</param>
+    /// <param name="lba">LBA</param>
+    /// <param name="subBuf">Read subchannel</param>
+    /// <param name="audioTrack">Set if it is an audio track</param>
+    /// <returns><c>true</c> if read correctly, <c>false</c> otherwise</returns>
+    static bool GetSectorForPregapQ16(Device dev, uint lba, out byte[] subBuf, bool audioTrack)
+    {
+        byte[] cmdBuf;
+        bool   sense;
+        subBuf = null;
+
+        if(audioTrack)
         {
-            byte[] cmdBuf;
-            bool   sense;
-            subBuf = null;
+            sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.Cdda, false, false, false,
+                               MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Q16, dev.Timeout,
+                               out _);
 
-            if(audioTrack)
-            {
-                sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.Cdda, false, false, false,
-                                   MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Q16, dev.Timeout,
-                                   out _);
-
-                if(sense)
-                    sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.AllTypes, false, false, true,
-                                       MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Q16,
-                                       dev.Timeout, out _);
-            }
-            else
-            {
+            if(sense)
                 sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.AllTypes, false, false, true,
                                    MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Q16,
                                    dev.Timeout, out _);
+        }
+        else
+        {
+            sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.AllTypes, false, false, true,
+                               MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Q16,
+                               dev.Timeout, out _);
 
-                if(sense)
-                    sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.Cdda, false, false, false,
-                                       MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Q16,
-                                       dev.Timeout, out _);
-            }
+            if(sense)
+                sense = dev.ReadCd(out cmdBuf, out _, lba, 2368, 1, MmcSectorTypes.Cdda, false, false, false,
+                                   MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.Q16,
+                                   dev.Timeout, out _);
+        }
 
-            if(!sense)
-            {
-                subBuf = new byte[16];
-                Array.Copy(cmdBuf, 2352, subBuf, 0, 16);
-            }
-            else
-            {
-                sense = dev.ReadCd(out cmdBuf, out _, lba, 16, 1, MmcSectorTypes.AllTypes, false, false, false,
+        if(!sense)
+        {
+            subBuf = new byte[16];
+            Array.Copy(cmdBuf, 2352, subBuf, 0, 16);
+        }
+        else
+        {
+            sense = dev.ReadCd(out cmdBuf, out _, lba, 16, 1, MmcSectorTypes.AllTypes, false, false, false,
+                               MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Q16,
+                               dev.Timeout, out _);
+
+            if(sense)
+                sense = dev.ReadCd(out cmdBuf, out _, lba, 16, 1, MmcSectorTypes.Cdda, false, false, false,
                                    MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Q16,
                                    dev.Timeout, out _);
 
-                if(sense)
-                    sense = dev.ReadCd(out cmdBuf, out _, lba, 16, 1, MmcSectorTypes.Cdda, false, false, false,
-                                       MmcHeaderCodes.None, false, false, MmcErrorField.None, MmcSubchannel.Q16,
-                                       dev.Timeout, out _);
-
-                if(!sense)
-                    subBuf = cmdBuf;
-            }
-
-            return sense;
+            if(!sense)
+                subBuf = cmdBuf;
         }
 
-        /// <summary>De-interleaves Q subchannel</summary>
-        /// <param name="subchannel">Interleaved subchannel</param>
-        /// <returns>De-interleaved Q subchannel</returns>
-        static byte[] DeinterleaveQ(byte[] subchannel)
+        return sense;
+    }
+
+    /// <summary>De-interleaves Q subchannel</summary>
+    /// <param name="subchannel">Interleaved subchannel</param>
+    /// <returns>De-interleaved Q subchannel</returns>
+    static byte[] DeinterleaveQ(byte[] subchannel)
+    {
+        int[] q = new int[subchannel.Length / 8];
+
+        // De-interlace Q subchannel
+        for(int iq = 0; iq < subchannel.Length; iq += 8)
         {
-            int[] q = new int[subchannel.Length / 8];
-
-            // De-interlace Q subchannel
-            for(int iq = 0; iq < subchannel.Length; iq += 8)
-            {
-                q[iq / 8] =  (subchannel[iq] & 0x40) << 1;
-                q[iq / 8] += subchannel[iq + 1] & 0x40;
-                q[iq / 8] += (subchannel[iq + 2] & 0x40) >> 1;
-                q[iq / 8] += (subchannel[iq + 3] & 0x40) >> 2;
-                q[iq / 8] += (subchannel[iq + 4] & 0x40) >> 3;
-                q[iq / 8] += (subchannel[iq + 5] & 0x40) >> 4;
-                q[iq / 8] += (subchannel[iq + 6] & 0x40) >> 5;
-                q[iq / 8] += (subchannel[iq + 7] & 0x40) >> 6;
-            }
-
-            byte[] deQ = new byte[q.Length];
-
-            for(int iq = 0; iq < q.Length; iq++)
-            {
-                deQ[iq] = (byte)q[iq];
-            }
-
-            return deQ;
+            q[iq / 8] =  (subchannel[iq] & 0x40) << 1;
+            q[iq / 8] += subchannel[iq + 1] & 0x40;
+            q[iq / 8] += (subchannel[iq + 2] & 0x40) >> 1;
+            q[iq / 8] += (subchannel[iq + 3] & 0x40) >> 2;
+            q[iq / 8] += (subchannel[iq + 4] & 0x40) >> 3;
+            q[iq / 8] += (subchannel[iq + 5] & 0x40) >> 4;
+            q[iq / 8] += (subchannel[iq + 6] & 0x40) >> 5;
+            q[iq / 8] += (subchannel[iq + 7] & 0x40) >> 6;
         }
 
-        /// <summary>In place converts Q subchannel from binary to BCD numbering</summary>
-        /// <param name="q">Q subchannel</param>
-        static void BinaryToBcdQ(byte[] q)
+        byte[] deQ = new byte[q.Length];
+
+        for(int iq = 0; iq < q.Length; iq++)
         {
-            q[1] = (byte)(((q[1] / 10) << 4) + (q[1] % 10));
-            q[2] = (byte)(((q[2] / 10) << 4) + (q[2] % 10));
-            q[3] = (byte)(((q[3] / 10) << 4) + (q[3] % 10));
-            q[4] = (byte)(((q[4] / 10) << 4) + (q[4] % 10));
-            q[5] = (byte)(((q[5] / 10) << 4) + (q[5] % 10));
-            q[6] = (byte)(((q[6] / 10) << 4) + (q[6] % 10));
-            q[7] = (byte)(((q[7] / 10) << 4) + (q[7] % 10));
-            q[8] = (byte)(((q[8] / 10) << 4) + (q[8] % 10));
-            q[9] = (byte)(((q[9] / 10) << 4) + (q[9] % 10));
+            deQ[iq] = (byte)q[iq];
         }
 
-        /// <summary>In place converts Q subchannel from BCD to binary numbering</summary>
-        /// <param name="q">Q subchannel</param>
-        static void BcdToBinaryQ(byte[] q)
-        {
-            q[1] = (byte)((q[1] / 16 * 10) + (q[1] & 0x0F));
-            q[2] = (byte)((q[2] / 16 * 10) + (q[2] & 0x0F));
-            q[3] = (byte)((q[3] / 16 * 10) + (q[3] & 0x0F));
-            q[4] = (byte)((q[4] / 16 * 10) + (q[4] & 0x0F));
-            q[5] = (byte)((q[5] / 16 * 10) + (q[5] & 0x0F));
-            q[6] = (byte)((q[6] / 16 * 10) + (q[6] & 0x0F));
-            q[7] = (byte)((q[7] / 16 * 10) + (q[7] & 0x0F));
-            q[8] = (byte)((q[8] / 16 * 10) + (q[8] & 0x0F));
-            q[9] = (byte)((q[9] / 16 * 10) + (q[9] & 0x0F));
-        }
+        return deQ;
+    }
+
+    /// <summary>In place converts Q subchannel from binary to BCD numbering</summary>
+    /// <param name="q">Q subchannel</param>
+    static void BinaryToBcdQ(byte[] q)
+    {
+        q[1] = (byte)(((q[1] / 10) << 4) + (q[1] % 10));
+        q[2] = (byte)(((q[2] / 10) << 4) + (q[2] % 10));
+        q[3] = (byte)(((q[3] / 10) << 4) + (q[3] % 10));
+        q[4] = (byte)(((q[4] / 10) << 4) + (q[4] % 10));
+        q[5] = (byte)(((q[5] / 10) << 4) + (q[5] % 10));
+        q[6] = (byte)(((q[6] / 10) << 4) + (q[6] % 10));
+        q[7] = (byte)(((q[7] / 10) << 4) + (q[7] % 10));
+        q[8] = (byte)(((q[8] / 10) << 4) + (q[8] % 10));
+        q[9] = (byte)(((q[9] / 10) << 4) + (q[9] % 10));
+    }
+
+    /// <summary>In place converts Q subchannel from BCD to binary numbering</summary>
+    /// <param name="q">Q subchannel</param>
+    static void BcdToBinaryQ(byte[] q)
+    {
+        q[1] = (byte)((q[1] / 16 * 10) + (q[1] & 0x0F));
+        q[2] = (byte)((q[2] / 16 * 10) + (q[2] & 0x0F));
+        q[3] = (byte)((q[3] / 16 * 10) + (q[3] & 0x0F));
+        q[4] = (byte)((q[4] / 16 * 10) + (q[4] & 0x0F));
+        q[5] = (byte)((q[5] / 16 * 10) + (q[5] & 0x0F));
+        q[6] = (byte)((q[6] / 16 * 10) + (q[6] & 0x0F));
+        q[7] = (byte)((q[7] / 16 * 10) + (q[7] & 0x0F));
+        q[8] = (byte)((q[8] / 16 * 10) + (q[8] & 0x0F));
+        q[9] = (byte)((q[9] / 16 * 10) + (q[9] & 0x0F));
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs
index df0194427..f15313215 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Subchannel.cs
@@ -38,40 +38,39 @@ using Aaru.Devices;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Check if the drive can read RW raw subchannel</summary>
+    /// <param name="dev">Device</param>
+    /// <param name="dumpLog">Dumping log</param>
+    /// <param name="updateStatus">Progress update callback</param>
+    /// <param name="lba">LBA to try</param>
+    /// <returns><c>true</c> if read correctly, <c>false</c> otherwise</returns>
+    public static bool SupportsRwSubchannel(Device dev, DumpLog dumpLog, UpdateStatusHandler updateStatus, uint lba)
     {
-        /// <summary>Check if the drive can read RW raw subchannel</summary>
-        /// <param name="dev">Device</param>
-        /// <param name="dumpLog">Dumping log</param>
-        /// <param name="updateStatus">Progress update callback</param>
-        /// <param name="lba">LBA to try</param>
-        /// <returns><c>true</c> if read correctly, <c>false</c> otherwise</returns>
-        public static bool SupportsRwSubchannel(Device dev, DumpLog dumpLog, UpdateStatusHandler updateStatus, uint lba)
-        {
-            dumpLog?.WriteLine("Checking if drive supports full raw subchannel reading...");
-            updateStatus?.Invoke("Checking if drive supports full raw subchannel reading...");
+        dumpLog?.WriteLine("Checking if drive supports full raw subchannel reading...");
+        updateStatus?.Invoke("Checking if drive supports full raw subchannel reading...");
 
-            return !dev.ReadCd(out _, out _, lba, 2352 + 96, 1, MmcSectorTypes.AllTypes, false, false, true,
-                               MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Raw,
-                               dev.Timeout, out _);
-        }
+        return !dev.ReadCd(out _, out _, lba, 2352 + 96, 1, MmcSectorTypes.AllTypes, false, false, true,
+                           MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Raw,
+                           dev.Timeout, out _);
+    }
 
-        /// <summary>Check if the drive can read RW raw subchannel</summary>
-        /// <param name="dev">Device</param>
-        /// <param name="dumpLog">Dumping log</param>
-        /// <param name="updateStatus">Progress update callback</param>
-        /// <param name="lba">LBA to try</param>
-        /// <returns><c>true</c> if read correctly, <c>false</c> otherwise</returns>
-        public static bool SupportsPqSubchannel(Device dev, DumpLog dumpLog, UpdateStatusHandler updateStatus, uint lba)
-        {
-            dumpLog?.WriteLine("Checking if drive supports PQ subchannel reading...");
-            updateStatus?.Invoke("Checking if drive supports PQ subchannel reading...");
+    /// <summary>Check if the drive can read RW raw subchannel</summary>
+    /// <param name="dev">Device</param>
+    /// <param name="dumpLog">Dumping log</param>
+    /// <param name="updateStatus">Progress update callback</param>
+    /// <param name="lba">LBA to try</param>
+    /// <returns><c>true</c> if read correctly, <c>false</c> otherwise</returns>
+    public static bool SupportsPqSubchannel(Device dev, DumpLog dumpLog, UpdateStatusHandler updateStatus, uint lba)
+    {
+        dumpLog?.WriteLine("Checking if drive supports PQ subchannel reading...");
+        updateStatus?.Invoke("Checking if drive supports PQ subchannel reading...");
 
-            return !dev.ReadCd(out _, out _, lba, 2352 + 16, 1, MmcSectorTypes.AllTypes, false, false, true,
-                               MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Q16,
-                               dev.Timeout, out _);
-        }
+        return !dev.ReadCd(out _, out _, lba, 2352 + 16, 1, MmcSectorTypes.AllTypes, false, false, true,
+                           MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.Q16,
+                           dev.Timeout, out _);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Tags.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Tags.cs
index 271958df6..2545878f9 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Tags.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Tags.cs
@@ -42,106 +42,105 @@ using Aaru.Devices;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Reads media tags from Compact Disc media</summary>
+    /// <param name="mediaType">Media type</param>
+    /// <param name="mediaTags">Media tags dictionary</param>
+    /// <param name="sessions">Sessions</param>
+    /// <param name="firstTrackLastSession">First track in last session</param>
+    void ReadCdTags(ref MediaType mediaType, Dictionary<MediaTagType, byte[]> mediaTags, out int sessions,
+                    out int firstTrackLastSession)
     {
-        /// <summary>Reads media tags from Compact Disc media</summary>
-        /// <param name="mediaType">Media type</param>
-        /// <param name="mediaTags">Media tags dictionary</param>
-        /// <param name="sessions">Sessions</param>
-        /// <param name="firstTrackLastSession">First track in last session</param>
-        void ReadCdTags(ref MediaType mediaType, Dictionary<MediaTagType, byte[]> mediaTags, out int sessions,
-                        out int firstTrackLastSession)
+        byte[] cmdBuf; // Data buffer
+        bool   sense;  // Sense indicator
+        byte[] tmpBuf; // Temporary buffer
+        sessions              = 1;
+        firstTrackLastSession = 1;
+
+        // ATIP exists on blank CDs
+        _dumpLog.WriteLine("Reading ATIP");
+        UpdateStatus?.Invoke("Reading ATIP");
+        sense = _dev.ReadAtip(out cmdBuf, out _, _dev.Timeout, out _);
+
+        if(!sense)
         {
-            byte[] cmdBuf; // Data buffer
-            bool   sense;  // Sense indicator
-            byte[] tmpBuf; // Temporary buffer
-            sessions              = 1;
-            firstTrackLastSession = 1;
+            ATIP.CDATIP atip = ATIP.Decode(cmdBuf);
 
-            // ATIP exists on blank CDs
-            _dumpLog.WriteLine("Reading ATIP");
-            UpdateStatus?.Invoke("Reading ATIP");
-            sense = _dev.ReadAtip(out cmdBuf, out _, _dev.Timeout, out _);
-
-            if(!sense)
+            if(atip != null)
             {
-                ATIP.CDATIP atip = ATIP.Decode(cmdBuf);
+                // Only CD-R and CD-RW have ATIP
+                mediaType = atip.DiscType ? MediaType.CDRW : MediaType.CDR;
 
-                if(atip != null)
-                {
-                    // Only CD-R and CD-RW have ATIP
-                    mediaType = atip.DiscType ? MediaType.CDRW : MediaType.CDR;
-
-                    tmpBuf = new byte[cmdBuf.Length - 4];
-                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                    mediaTags.Add(MediaTagType.CD_ATIP, tmpBuf);
-                }
-            }
-
-            _dumpLog.WriteLine("Reading Disc Information");
-            UpdateStatus?.Invoke("Reading Disc Information");
-
-            sense = _dev.ReadDiscInformation(out cmdBuf, out _, MmcDiscInformationDataTypes.DiscInformation,
-                                             _dev.Timeout, out _);
-
-            if(!sense)
-            {
-                DiscInformation.StandardDiscInformation? discInfo = DiscInformation.Decode000b(cmdBuf);
-
-                if(discInfo.HasValue &&
-                   mediaType == MediaType.CD)
-                    switch(discInfo.Value.DiscType)
-                    {
-                        case 0x10:
-                            mediaType = MediaType.CDI;
-
-                            break;
-                        case 0x20:
-                            mediaType = MediaType.CDROMXA;
-
-                            break;
-                    }
-            }
-
-            _dumpLog.WriteLine("Reading PMA");
-            UpdateStatus?.Invoke("Reading PMA");
-            sense = _dev.ReadPma(out cmdBuf, out _, _dev.Timeout, out _);
-
-            if(!sense &&
-               PMA.Decode(cmdBuf).HasValue)
-            {
                 tmpBuf = new byte[cmdBuf.Length - 4];
                 Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                mediaTags.Add(MediaTagType.CD_PMA, tmpBuf);
+                mediaTags.Add(MediaTagType.CD_ATIP, tmpBuf);
             }
+        }
 
-            _dumpLog.WriteLine("Reading Session Information");
-            UpdateStatus?.Invoke("Reading Session Information");
-            sense = _dev.ReadSessionInfo(out cmdBuf, out _, _dev.Timeout, out _);
+        _dumpLog.WriteLine("Reading Disc Information");
+        UpdateStatus?.Invoke("Reading Disc Information");
 
-            if(!sense)
-            {
-                Session.CDSessionInfo? session = Session.Decode(cmdBuf);
+        sense = _dev.ReadDiscInformation(out cmdBuf, out _, MmcDiscInformationDataTypes.DiscInformation,
+                                         _dev.Timeout, out _);
 
-                if(session.HasValue)
+        if(!sense)
+        {
+            DiscInformation.StandardDiscInformation? discInfo = DiscInformation.Decode000b(cmdBuf);
+
+            if(discInfo.HasValue &&
+               mediaType == MediaType.CD)
+                switch(discInfo.Value.DiscType)
                 {
-                    sessions              = session.Value.LastCompleteSession;
-                    firstTrackLastSession = session.Value.TrackDescriptors[0].TrackNumber;
+                    case 0x10:
+                        mediaType = MediaType.CDI;
+
+                        break;
+                    case 0x20:
+                        mediaType = MediaType.CDROMXA;
+
+                        break;
                 }
-            }
+        }
 
-            _dumpLog.WriteLine("Reading CD-Text from Lead-In");
-            UpdateStatus?.Invoke("Reading CD-Text from Lead-In");
-            sense = _dev.ReadCdText(out cmdBuf, out _, _dev.Timeout, out _);
-
-            if(sense || !CDTextOnLeadIn.Decode(cmdBuf).HasValue)
-                return;
+        _dumpLog.WriteLine("Reading PMA");
+        UpdateStatus?.Invoke("Reading PMA");
+        sense = _dev.ReadPma(out cmdBuf, out _, _dev.Timeout, out _);
 
+        if(!sense &&
+           PMA.Decode(cmdBuf).HasValue)
+        {
             tmpBuf = new byte[cmdBuf.Length - 4];
             Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-            mediaTags.Add(MediaTagType.CD_TEXT, tmpBuf);
+            mediaTags.Add(MediaTagType.CD_PMA, tmpBuf);
         }
+
+        _dumpLog.WriteLine("Reading Session Information");
+        UpdateStatus?.Invoke("Reading Session Information");
+        sense = _dev.ReadSessionInfo(out cmdBuf, out _, _dev.Timeout, out _);
+
+        if(!sense)
+        {
+            Session.CDSessionInfo? session = Session.Decode(cmdBuf);
+
+            if(session.HasValue)
+            {
+                sessions              = session.Value.LastCompleteSession;
+                firstTrackLastSession = session.Value.TrackDescriptors[0].TrackNumber;
+            }
+        }
+
+        _dumpLog.WriteLine("Reading CD-Text from Lead-In");
+        UpdateStatus?.Invoke("Reading CD-Text from Lead-In");
+        sense = _dev.ReadCdText(out cmdBuf, out _, _dev.Timeout, out _);
+
+        if(sense || !CDTextOnLeadIn.Decode(cmdBuf).HasValue)
+            return;
+
+        tmpBuf = new byte[cmdBuf.Length - 4];
+        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+        mediaTags.Add(MediaTagType.CD_TEXT, tmpBuf);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs
index 186fdb48a..0392d520d 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Tracks.cs
@@ -44,243 +44,242 @@ using Aaru.Devices;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Reads the TOC, processes it, returns the track list and last sector</summary>
+    /// <param name="dev">Device</param>
+    /// <param name="dumpLog">Dump log</param>
+    /// <param name="force">Force dump enabled</param>
+    /// <param name="lastSector">Last sector number</param>
+    /// <param name="leadOutStarts">Lead-out starts</param>
+    /// <param name="mediaTags">Media tags</param>
+    /// <param name="stoppingErrorMessage">Stopping error message handler</param>
+    /// <param name="toc">Full CD TOC</param>
+    /// <param name="trackFlags">Track flags</param>
+    /// <param name="updateStatus">Update status handler</param>
+    /// <returns>List of tracks</returns>
+    public static Track[] GetCdTracks(Device dev, DumpLog dumpLog, bool force, out long lastSector,
+                                      Dictionary<int, long> leadOutStarts,
+                                      Dictionary<MediaTagType, byte[]> mediaTags,
+                                      ErrorMessageHandler stoppingErrorMessage, out FullTOC.CDFullTOC? toc,
+                                      Dictionary<byte, byte> trackFlags, UpdateStatusHandler updateStatus)
     {
-        /// <summary>Reads the TOC, processes it, returns the track list and last sector</summary>
-        /// <param name="dev">Device</param>
-        /// <param name="dumpLog">Dump log</param>
-        /// <param name="force">Force dump enabled</param>
-        /// <param name="lastSector">Last sector number</param>
-        /// <param name="leadOutStarts">Lead-out starts</param>
-        /// <param name="mediaTags">Media tags</param>
-        /// <param name="stoppingErrorMessage">Stopping error message handler</param>
-        /// <param name="toc">Full CD TOC</param>
-        /// <param name="trackFlags">Track flags</param>
-        /// <param name="updateStatus">Update status handler</param>
-        /// <returns>List of tracks</returns>
-        public static Track[] GetCdTracks(Device dev, DumpLog dumpLog, bool force, out long lastSector,
-                                          Dictionary<int, long> leadOutStarts,
-                                          Dictionary<MediaTagType, byte[]> mediaTags,
-                                          ErrorMessageHandler stoppingErrorMessage, out FullTOC.CDFullTOC? toc,
-                                          Dictionary<byte, byte> trackFlags, UpdateStatusHandler updateStatus)
+        byte[]      cmdBuf;                        // Data buffer
+        const uint  sectorSize = 2352;             // Full sector size
+        bool        sense;                         // Sense indicator
+        List<Track> trackList = new List<Track>(); // Tracks in disc
+        byte[]      tmpBuf;                        // Temporary buffer
+        toc        = null;
+        lastSector = 0;
+        TrackType leadoutTrackType = TrackType.Audio;
+
+        // We discarded all discs that falsify a TOC before requesting a real TOC
+        // No TOC, no CD (or an empty one)
+        dumpLog?.WriteLine("Reading full TOC");
+        updateStatus?.Invoke("Reading full TOC");
+        sense = dev.ReadRawToc(out cmdBuf, out _, 0, dev.Timeout, out _);
+
+        if(!sense)
         {
-            byte[]      cmdBuf;                        // Data buffer
-            const uint  sectorSize = 2352;             // Full sector size
-            bool        sense;                         // Sense indicator
-            List<Track> trackList = new List<Track>(); // Tracks in disc
-            byte[]      tmpBuf;                        // Temporary buffer
-            toc        = null;
-            lastSector = 0;
-            TrackType leadoutTrackType = TrackType.Audio;
-
-            // We discarded all discs that falsify a TOC before requesting a real TOC
-            // No TOC, no CD (or an empty one)
-            dumpLog?.WriteLine("Reading full TOC");
-            updateStatus?.Invoke("Reading full TOC");
-            sense = dev.ReadRawToc(out cmdBuf, out _, 0, dev.Timeout, out _);
-
-            if(!sense)
-            {
-                toc = FullTOC.Decode(cmdBuf);
-
-                if(toc.HasValue)
-                {
-                    tmpBuf = new byte[cmdBuf.Length - 2];
-                    Array.Copy(cmdBuf, 2, tmpBuf, 0, cmdBuf.Length - 2);
-                    mediaTags?.Add(MediaTagType.CD_FullTOC, tmpBuf);
-                }
-            }
-
-            updateStatus?.Invoke("Building track map...");
-            dumpLog?.WriteLine("Building track map...");
+            toc = FullTOC.Decode(cmdBuf);
 
             if(toc.HasValue)
             {
-                FullTOC.TrackDataDescriptor[] sortedTracks =
-                    toc.Value.TrackDescriptors.OrderBy(track => track.POINT).ToArray();
+                tmpBuf = new byte[cmdBuf.Length - 2];
+                Array.Copy(cmdBuf, 2, tmpBuf, 0, cmdBuf.Length - 2);
+                mediaTags?.Add(MediaTagType.CD_FullTOC, tmpBuf);
+            }
+        }
 
-                foreach(FullTOC.TrackDataDescriptor trk in sortedTracks.Where(trk => trk.ADR == 1 || trk.ADR == 4))
-                    if(trk.POINT >= 0x01 &&
-                       trk.POINT <= 0x63)
+        updateStatus?.Invoke("Building track map...");
+        dumpLog?.WriteLine("Building track map...");
+
+        if(toc.HasValue)
+        {
+            FullTOC.TrackDataDescriptor[] sortedTracks =
+                toc.Value.TrackDescriptors.OrderBy(track => track.POINT).ToArray();
+
+            foreach(FullTOC.TrackDataDescriptor trk in sortedTracks.Where(trk => trk.ADR == 1 || trk.ADR == 4))
+                if(trk.POINT >= 0x01 &&
+                   trk.POINT <= 0x63)
+                {
+                    trackList.Add(new Track
                     {
-                        trackList.Add(new Track
-                        {
-                            Sequence = trk.POINT,
-                            Session  = trk.SessionNumber,
-                            Type = (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrack ||
-                                        (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrackIncremental
-                                            ? TrackType.Data : TrackType.Audio,
-                            StartSector =
-                                (ulong)((trk.PHOUR * 3600 * 75) + (trk.PMIN * 60 * 75) + (trk.PSEC * 75) + trk.PFRAME -
-                                        150),
-                            BytesPerSector    = (int)sectorSize,
-                            RawBytesPerSector = (int)sectorSize
-                        });
+                        Sequence = trk.POINT,
+                        Session  = trk.SessionNumber,
+                        Type = (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrack ||
+                               (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrackIncremental
+                                   ? TrackType.Data : TrackType.Audio,
+                        StartSector =
+                            (ulong)((trk.PHOUR * 3600 * 75) + (trk.PMIN * 60 * 75) + (trk.PSEC * 75) + trk.PFRAME -
+                                    150),
+                        BytesPerSector    = (int)sectorSize,
+                        RawBytesPerSector = (int)sectorSize
+                    });
 
-                        trackFlags?.Add(trk.POINT, trk.CONTROL);
-                    }
-                    else if(trk.POINT == 0xA2)
+                    trackFlags?.Add(trk.POINT, trk.CONTROL);
+                }
+                else if(trk.POINT == 0xA2)
+                {
+                    int phour, pmin, psec, pframe;
+
+                    if(trk.PFRAME == 0)
                     {
-                        int phour, pmin, psec, pframe;
+                        pframe = 74;
 
-                        if(trk.PFRAME == 0)
+                        if(trk.PSEC == 0)
                         {
-                            pframe = 74;
+                            psec = 59;
 
-                            if(trk.PSEC == 0)
+                            if(trk.PMIN == 0)
                             {
-                                psec = 59;
-
-                                if(trk.PMIN == 0)
-                                {
-                                    pmin  = 59;
-                                    phour = trk.PHOUR - 1;
-                                }
-                                else
-                                {
-                                    pmin  = trk.PMIN - 1;
-                                    phour = trk.PHOUR;
-                                }
+                                pmin  = 59;
+                                phour = trk.PHOUR - 1;
                             }
                             else
                             {
-                                psec  = trk.PSEC - 1;
-                                pmin  = trk.PMIN;
+                                pmin  = trk.PMIN - 1;
                                 phour = trk.PHOUR;
                             }
                         }
                         else
                         {
-                            pframe = trk.PFRAME - 1;
-                            psec   = trk.PSEC;
-                            pmin   = trk.PMIN;
-                            phour  = trk.PHOUR;
+                            psec  = trk.PSEC - 1;
+                            pmin  = trk.PMIN;
+                            phour = trk.PHOUR;
                         }
-
-                        lastSector = (phour * 3600 * 75) + (pmin * 60 * 75) + (psec * 75) + pframe - 150;
-                        leadOutStarts?.Add(trk.SessionNumber, lastSector + 1);
                     }
-                    else if(trk.POINT == 0xA0 &&
-                            trk.ADR   == 1)
+                    else
+                    {
+                        pframe = trk.PFRAME - 1;
+                        psec   = trk.PSEC;
+                        pmin   = trk.PMIN;
+                        phour  = trk.PHOUR;
+                    }
+
+                    lastSector = (phour * 3600 * 75) + (pmin * 60 * 75) + (psec * 75) + pframe - 150;
+                    leadOutStarts?.Add(trk.SessionNumber, lastSector + 1);
+                }
+                else if(trk.POINT == 0xA0 &&
+                        trk.ADR   == 1)
+                {
+                    leadoutTrackType =
+                        (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrack ||
+                        (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrackIncremental ? TrackType.Data
+                            : TrackType.Audio;
+                }
+        }
+        else
+        {
+            updateStatus?.Invoke("Cannot read RAW TOC, requesting processed one...");
+            dumpLog?.WriteLine("Cannot read RAW TOC, requesting processed one...");
+            sense = dev.ReadToc(out cmdBuf, out _, false, 0, dev.Timeout, out _);
+
+            TOC.CDTOC? oldToc = TOC.Decode(cmdBuf);
+
+            if((sense || !oldToc.HasValue) &&
+               !force)
+            {
+                dumpLog?.WriteLine("Could not read TOC, if you want to continue, use force, and will try from LBA 0 to 360000...");
+
+                stoppingErrorMessage?.
+                    Invoke("Could not read TOC, if you want to continue, use force, and will try from LBA 0 to 360000...");
+
+                return null;
+            }
+
+            if(oldToc.HasValue)
+                foreach(TOC.CDTOCTrackDataDescriptor trk in oldToc.Value.TrackDescriptors.
+                                                                   OrderBy(t => t.TrackNumber).
+                                                                   Where(trk => trk.ADR == 1 || trk.ADR == 4))
+                    if(trk.TrackNumber >= 0x01 &&
+                       trk.TrackNumber <= 0x63)
+                    {
+                        trackList.Add(new Track
+                        {
+                            Sequence = trk.TrackNumber,
+                            Session  = 1,
+                            Type = (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrack ||
+                                   (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrackIncremental
+                                       ? TrackType.Data : TrackType.Audio,
+                            StartSector       = trk.TrackStartAddress,
+                            BytesPerSector    = (int)sectorSize,
+                            RawBytesPerSector = (int)sectorSize
+                        });
+
+                        trackFlags?.Add(trk.TrackNumber, trk.CONTROL);
+                    }
+                    else if(trk.TrackNumber == 0xAA)
                     {
                         leadoutTrackType =
                             (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrack ||
                             (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrackIncremental ? TrackType.Data
                                 : TrackType.Audio;
+
+                        lastSector = trk.TrackStartAddress - 1;
                     }
-            }
-            else
+        }
+
+        if(trackList.Count == 0)
+        {
+            updateStatus?.Invoke("No tracks found, adding a single track from 0 to Lead-Out");
+            dumpLog?.WriteLine("No tracks found, adding a single track from 0 to Lead-Out");
+
+            trackList.Add(new Track
             {
-                updateStatus?.Invoke("Cannot read RAW TOC, requesting processed one...");
-                dumpLog?.WriteLine("Cannot read RAW TOC, requesting processed one...");
-                sense = dev.ReadToc(out cmdBuf, out _, false, 0, dev.Timeout, out _);
+                Sequence          = 1,
+                Session           = 1,
+                Type              = leadoutTrackType,
+                StartSector       = 0,
+                BytesPerSector    = (int)sectorSize,
+                RawBytesPerSector = (int)sectorSize
+            });
 
-                TOC.CDTOC? oldToc = TOC.Decode(cmdBuf);
+            trackFlags?.Add(1, (byte)(leadoutTrackType == TrackType.Audio ? 0 : 4));
+        }
 
-                if((sense || !oldToc.HasValue) &&
-                   !force)
-                {
-                    dumpLog?.WriteLine("Could not read TOC, if you want to continue, use force, and will try from LBA 0 to 360000...");
+        if(lastSector != 0)
+            return trackList.ToArray();
 
-                    stoppingErrorMessage?.
-                        Invoke("Could not read TOC, if you want to continue, use force, and will try from LBA 0 to 360000...");
+        sense = dev.ReadCapacity16(out cmdBuf, out _, dev.Timeout, out _);
 
-                    return null;
-                }
+        if(!sense)
+        {
+            byte[] temp = new byte[8];
 
-                if(oldToc.HasValue)
-                    foreach(TOC.CDTOCTrackDataDescriptor trk in oldToc.Value.TrackDescriptors.
-                                                                       OrderBy(t => t.TrackNumber).
-                                                                       Where(trk => trk.ADR == 1 || trk.ADR == 4))
-                        if(trk.TrackNumber >= 0x01 &&
-                           trk.TrackNumber <= 0x63)
-                        {
-                            trackList.Add(new Track
-                            {
-                                Sequence = trk.TrackNumber,
-                                Session  = 1,
-                                Type = (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrack ||
-                                            (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrackIncremental
-                                                ? TrackType.Data : TrackType.Audio,
-                                StartSector       = trk.TrackStartAddress,
-                                BytesPerSector    = (int)sectorSize,
-                                RawBytesPerSector = (int)sectorSize
-                            });
-
-                            trackFlags?.Add(trk.TrackNumber, trk.CONTROL);
-                        }
-                        else if(trk.TrackNumber == 0xAA)
-                        {
-                            leadoutTrackType =
-                                (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrack ||
-                                (TocControl)(trk.CONTROL & 0x0D) == TocControl.DataTrackIncremental ? TrackType.Data
-                                    : TrackType.Audio;
-
-                            lastSector = trk.TrackStartAddress - 1;
-                        }
-            }
-
-            if(trackList.Count == 0)
-            {
-                updateStatus?.Invoke("No tracks found, adding a single track from 0 to Lead-Out");
-                dumpLog?.WriteLine("No tracks found, adding a single track from 0 to Lead-Out");
-
-                trackList.Add(new Track
-                {
-                    Sequence          = 1,
-                    Session           = 1,
-                    Type              = leadoutTrackType,
-                    StartSector       = 0,
-                    BytesPerSector    = (int)sectorSize,
-                    RawBytesPerSector = (int)sectorSize
-                });
-
-                trackFlags?.Add(1, (byte)(leadoutTrackType == TrackType.Audio ? 0 : 4));
-            }
-
-            if(lastSector != 0)
-                return trackList.ToArray();
-
-            sense = dev.ReadCapacity16(out cmdBuf, out _, dev.Timeout, out _);
+            Array.Copy(cmdBuf, 0, temp, 0, 8);
+            Array.Reverse(temp);
+            lastSector = (long)BitConverter.ToUInt64(temp, 0);
+        }
+        else
+        {
+            sense = dev.ReadCapacity(out cmdBuf, out _, dev.Timeout, out _);
 
             if(!sense)
-            {
-                byte[] temp = new byte[8];
-
-                Array.Copy(cmdBuf, 0, temp, 0, 8);
-                Array.Reverse(temp);
-                lastSector = (long)BitConverter.ToUInt64(temp, 0);
-            }
-            else
-            {
-                sense = dev.ReadCapacity(out cmdBuf, out _, dev.Timeout, out _);
-
-                if(!sense)
-                    lastSector = ((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) & 0xFFFFFFFF;
-            }
-
-            if(lastSector > 0)
-                return trackList.ToArray();
-
-            if(!force)
-            {
-                stoppingErrorMessage?.
-                    Invoke("Could not find Lead-Out, if you want to continue use force option and will continue until 360000 sectors...");
-
-                dumpLog?.WriteLine("Could not find Lead-Out, if you want to continue use force option and will continue until 360000 sectors...");
-
-                return null;
-            }
-
-            updateStatus?.
-                Invoke("WARNING: Could not find Lead-Out start, will try to read up to 360000 sectors, probably will fail before...");
-
-            dumpLog?.WriteLine("WARNING: Could not find Lead-Out start, will try to read up to 360000 sectors, probably will fail before...");
-            lastSector = 360000;
-
-            return trackList.ToArray();
+                lastSector = ((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) & 0xFFFFFFFF;
         }
+
+        if(lastSector > 0)
+            return trackList.ToArray();
+
+        if(!force)
+        {
+            stoppingErrorMessage?.
+                Invoke("Could not find Lead-Out, if you want to continue use force option and will continue until 360000 sectors...");
+
+            dumpLog?.WriteLine("Could not find Lead-Out, if you want to continue use force option and will continue until 360000 sectors...");
+
+            return null;
+        }
+
+        updateStatus?.
+            Invoke("WARNING: Could not find Lead-Out start, will try to read up to 360000 sectors, probably will fail before...");
+
+        dumpLog?.WriteLine("WARNING: Could not find Lead-Out start, will try to read up to 360000 sectors, probably will fail before...");
+        lastSector = 360000;
+
+        return trackList.ToArray();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs b/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs
index 60f1fbb11..4dcadf4df 100644
--- a/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs
+++ b/Aaru.Core/Devices/Dumping/CompactDisc/Trim.cs
@@ -46,263 +46,262 @@ using Schemas;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Trims errored sectors in a CompactDisc</summary>
+    /// <param name="audioExtents">Extents with audio sectors</param>
+    /// <param name="blockSize">Size of the read sector in bytes</param>
+    /// <param name="currentTry">Current dump hardware try</param>
+    /// <param name="extents">Extents</param>
+    /// <param name="newTrim">Is trim a new one?</param>
+    /// <param name="offsetBytes">Read offset</param>
+    /// <param name="read6">Device supports READ(6)</param>
+    /// <param name="read10">Device supports READ(10)</param>
+    /// <param name="read12">Device supports READ(12)</param>
+    /// <param name="read16">Device supports READ(16)</param>
+    /// <param name="readcd">Device supports READ CD</param>
+    /// <param name="sectorsForOffset">Sectors needed to fix offset</param>
+    /// <param name="subSize">Subchannel size in bytes</param>
+    /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
+    /// <param name="supportsLongSectors">Supports reading EDC and ECC</param>
+    /// <param name="totalDuration">Total commands duration</param>
+    /// <param name="tracks">Disc tracks</param>
+    /// <param name="subLog">Subchannel log</param>
+    /// <param name="desiredSubchannel">Subchannel desired to save</param>
+    /// <param name="isrcs">List of disc ISRCs</param>
+    /// <param name="mcn">Disc media catalogue number</param>
+    /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
+    /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
+    void TrimCdUserData(ExtentsULong audioExtents, uint blockSize, DumpHardwareType currentTry,
+                        ExtentsULong extents, bool newTrim, int offsetBytes, bool read6, bool read10, bool read12,
+                        bool read16, bool readcd, int sectorsForOffset, uint subSize,
+                        MmcSubchannel supportedSubchannel, bool supportsLongSectors, ref double totalDuration,
+                        SubchannelLog subLog, MmcSubchannel desiredSubchannel, Track[] tracks,
+                        Dictionary<byte, string> isrcs, ref string mcn, HashSet<int> subchannelExtents,
+                        Dictionary<byte, int> smallestPregapLbaPerTrack)
     {
-        /// <summary>Trims errored sectors in a CompactDisc</summary>
-        /// <param name="audioExtents">Extents with audio sectors</param>
-        /// <param name="blockSize">Size of the read sector in bytes</param>
-        /// <param name="currentTry">Current dump hardware try</param>
-        /// <param name="extents">Extents</param>
-        /// <param name="newTrim">Is trim a new one?</param>
-        /// <param name="offsetBytes">Read offset</param>
-        /// <param name="read6">Device supports READ(6)</param>
-        /// <param name="read10">Device supports READ(10)</param>
-        /// <param name="read12">Device supports READ(12)</param>
-        /// <param name="read16">Device supports READ(16)</param>
-        /// <param name="readcd">Device supports READ CD</param>
-        /// <param name="sectorsForOffset">Sectors needed to fix offset</param>
-        /// <param name="subSize">Subchannel size in bytes</param>
-        /// <param name="supportedSubchannel">Drive's maximum supported subchannel</param>
-        /// <param name="supportsLongSectors">Supports reading EDC and ECC</param>
-        /// <param name="totalDuration">Total commands duration</param>
-        /// <param name="tracks">Disc tracks</param>
-        /// <param name="subLog">Subchannel log</param>
-        /// <param name="desiredSubchannel">Subchannel desired to save</param>
-        /// <param name="isrcs">List of disc ISRCs</param>
-        /// <param name="mcn">Disc media catalogue number</param>
-        /// <param name="subchannelExtents">List of subchannels not yet dumped correctly</param>
-        /// <param name="smallestPregapLbaPerTrack">List of smallest pregap relative address per track</param>
-        void TrimCdUserData(ExtentsULong audioExtents, uint blockSize, DumpHardwareType currentTry,
-                            ExtentsULong extents, bool newTrim, int offsetBytes, bool read6, bool read10, bool read12,
-                            bool read16, bool readcd, int sectorsForOffset, uint subSize,
-                            MmcSubchannel supportedSubchannel, bool supportsLongSectors, ref double totalDuration,
-                            SubchannelLog subLog, MmcSubchannel desiredSubchannel, Track[] tracks,
-                            Dictionary<byte, string> isrcs, ref string mcn, HashSet<int> subchannelExtents,
-                            Dictionary<byte, int> smallestPregapLbaPerTrack)
+        DateTime          start;
+        DateTime          end;
+        bool              sense       = true; // Sense indicator
+        byte[]            cmdBuf      = null; // Data buffer
+        double            cmdDuration = 0;    // Command execution time
+        const uint        sectorSize  = 2352; // Full sector size
+        PlextorSubchannel supportedPlextorSubchannel;
+        byte[]            senseBuf      = null;
+        var               outputOptical = _outputPlugin as IWritableOpticalImage;
+
+        switch(supportedSubchannel)
         {
-            DateTime          start;
-            DateTime          end;
-            bool              sense       = true; // Sense indicator
-            byte[]            cmdBuf      = null; // Data buffer
-            double            cmdDuration = 0;    // Command execution time
-            const uint        sectorSize  = 2352; // Full sector size
-            PlextorSubchannel supportedPlextorSubchannel;
-            byte[]            senseBuf      = null;
-            var               outputOptical = _outputPlugin as IWritableOpticalImage;
+            case MmcSubchannel.None:
+                supportedPlextorSubchannel = PlextorSubchannel.None;
 
-            switch(supportedSubchannel)
+                break;
+            case MmcSubchannel.Raw:
+                supportedPlextorSubchannel = PlextorSubchannel.Pack;
+
+                break;
+            case MmcSubchannel.Q16:
+                supportedPlextorSubchannel = PlextorSubchannel.Q16;
+
+                break;
+            default:
+                supportedPlextorSubchannel = PlextorSubchannel.None;
+
+                break;
+        }
+
+        if(_resume.BadBlocks.Count <= 0 ||
+           _aborted                     ||
+           !_trim                       ||
+           !newTrim)
+            return;
+
+        start = DateTime.UtcNow;
+        UpdateStatus?.Invoke("Trimming skipped sectors");
+        _dumpLog.WriteLine("Trimming skipped sectors");
+        InitProgress?.Invoke();
+
+        trimStart:
+        ulong[] tmpArray = _resume.BadBlocks.ToArray();
+
+        for(int b = 0; b < tmpArray.Length; b++)
+        {
+            ulong badSector = tmpArray[b];
+
+            if(_aborted)
             {
-                case MmcSubchannel.None:
-                    supportedPlextorSubchannel = PlextorSubchannel.None;
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
 
-                    break;
-                case MmcSubchannel.Raw:
-                    supportedPlextorSubchannel = PlextorSubchannel.Pack;
-
-                    break;
-                case MmcSubchannel.Q16:
-                    supportedPlextorSubchannel = PlextorSubchannel.Q16;
-
-                    break;
-                default:
-                    supportedPlextorSubchannel = PlextorSubchannel.None;
-
-                    break;
+                break;
             }
 
-            if(_resume.BadBlocks.Count <= 0 ||
-               _aborted                     ||
-               !_trim                       ||
-               !newTrim)
-                return;
+            PulseProgress?.Invoke($"Trimming sector {badSector}");
 
-            start = DateTime.UtcNow;
-            UpdateStatus?.Invoke("Trimming skipped sectors");
-            _dumpLog.WriteLine("Trimming skipped sectors");
-            InitProgress?.Invoke();
+            Track track = tracks.OrderBy(t => t.StartSector).
+                                 LastOrDefault(t => badSector >= t.StartSector);
 
-            trimStart:
-            ulong[] tmpArray = _resume.BadBlocks.ToArray();
+            byte sectorsToTrim   = 1;
+            uint badSectorToRead = (uint)badSector;
 
-            for(int b = 0; b < tmpArray.Length; b++)
+            if(_fixOffset                       &&
+               audioExtents.Contains(badSector) &&
+               offsetBytes != 0)
             {
-                ulong badSector = tmpArray[b];
-
-                if(_aborted)
+                if(offsetBytes > 0)
                 {
-                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    UpdateStatus?.Invoke("Aborted!");
-                    _dumpLog.WriteLine("Aborted!");
-
-                    break;
+                    badSectorToRead -= (uint)sectorsForOffset;
                 }
 
-                PulseProgress?.Invoke($"Trimming sector {badSector}");
+                sectorsToTrim = (byte)(sectorsForOffset + 1);
+            }
 
-                Track track = tracks.OrderBy(t => t.StartSector).
-                                     LastOrDefault(t => badSector >= t.StartSector);
+            bool forceFixOffset = false;
 
-                byte sectorsToTrim   = 1;
-                uint badSectorToRead = (uint)badSector;
-
-                if(_fixOffset                       &&
-                   audioExtents.Contains(badSector) &&
-                   offsetBytes != 0)
+            if(_supportsPlextorD8 && audioExtents.Contains(badSector))
+                sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf, badSectorToRead, blockSize,
+                                                  sectorsToTrim, supportedPlextorSubchannel, out cmdDuration);
+            else if(readcd)
+            {
+                if(audioExtents.Contains(badSector))
                 {
-                    if(offsetBytes > 0)
+                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, badSectorToRead, blockSize, sectorsToTrim,
+                                        MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
+                                        MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
+
+                    if(sense)
                     {
-                        badSectorToRead -= (uint)sectorsForOffset;
-                    }
+                        DecodedSense? decSense = Sense.Decode(senseBuf);
 
-                    sectorsToTrim = (byte)(sectorsForOffset + 1);
-                }
-
-                bool forceFixOffset = false;
-
-                if(_supportsPlextorD8 && audioExtents.Contains(badSector))
-                    sense = ReadPlextorWithSubchannel(out cmdBuf, out senseBuf, badSectorToRead, blockSize,
-                                                      sectorsToTrim, supportedPlextorSubchannel, out cmdDuration);
-                else if(readcd)
-                {
-                    if(audioExtents.Contains(badSector))
-                    {
-                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, badSectorToRead, blockSize, sectorsToTrim,
-                                            MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                            MmcErrorField.None, supportedSubchannel, _dev.Timeout, out cmdDuration);
-
-                        if(sense)
+                        // Try to workaround firmware
+                        if((decSense?.ASC == 0x11 && decSense?.ASCQ == 0x05) ||
+                           decSense?.ASC == 0x64)
                         {
-                            DecodedSense? decSense = Sense.Decode(senseBuf);
+                            sense = _dev.ReadCd(out cmdBuf, out _, badSectorToRead, blockSize, sectorsToTrim,
+                                                MmcSectorTypes.AllTypes, false, false, true,
+                                                MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                                supportedSubchannel, _dev.Timeout, out double cmdDuration2);
 
-                            // Try to workaround firmware
-                            if((decSense?.ASC == 0x11 && decSense?.ASCQ == 0x05) ||
-                               decSense?.ASC == 0x64)
-                            {
-                                sense = _dev.ReadCd(out cmdBuf, out _, badSectorToRead, blockSize, sectorsToTrim,
-                                                    MmcSectorTypes.AllTypes, false, false, true,
-                                                    MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                                    supportedSubchannel, _dev.Timeout, out double cmdDuration2);
-
-                                cmdDuration += cmdDuration2;
-                            }
+                            cmdDuration += cmdDuration2;
                         }
                     }
-                    else
+                }
+                else
+                {
+                    sense = _dev.ReadCd(out cmdBuf, out senseBuf, badSectorToRead, blockSize, sectorsToTrim,
+                                        MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                        true, true, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
+                                        out cmdDuration);
+
+                    if(sense)
                     {
-                        sense = _dev.ReadCd(out cmdBuf, out senseBuf, badSectorToRead, blockSize, sectorsToTrim,
-                                            MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                            true, true, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
-                                            out cmdDuration);
+                        DecodedSense? decSense = Sense.Decode(senseBuf);
 
-                        if(sense)
+                        // Try to workaround firmware
+                        if(decSense?.ASC == 0x64)
                         {
-                            DecodedSense? decSense = Sense.Decode(senseBuf);
+                            sense = _dev.ReadCd(out cmdBuf, out _, badSectorToRead, blockSize, sectorsToTrim,
+                                                MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
+                                                false, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
+                                                out double cmdDuration2);
 
-                            // Try to workaround firmware
-                            if(decSense?.ASC == 0x64)
-                            {
-                                sense = _dev.ReadCd(out cmdBuf, out _, badSectorToRead, blockSize, sectorsToTrim,
-                                                    MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
-                                                    false, MmcErrorField.None, supportedSubchannel, _dev.Timeout,
-                                                    out double cmdDuration2);
-
-                                cmdDuration += cmdDuration2;
-                            }
+                            cmdDuration += cmdDuration2;
                         }
                     }
-
-                    totalDuration += cmdDuration;
                 }
-                else if(read16)
-                    sense = _dev.Read16(out cmdBuf, out senseBuf, 0, false, true, false, badSectorToRead, blockSize, 0,
-                                        sectorsToTrim, false, _dev.Timeout, out cmdDuration);
-                else if(read12)
-                    sense = _dev.Read12(out cmdBuf, out senseBuf, 0, false, true, false, false, badSectorToRead,
-                                        blockSize, 0, sectorsToTrim, false, _dev.Timeout, out cmdDuration);
-                else if(read10)
-                    sense = _dev.Read10(out cmdBuf, out senseBuf, 0, false, true, false, false, badSectorToRead,
-                                        blockSize, 0, sectorsToTrim, _dev.Timeout, out cmdDuration);
-                else if(read6)
-                    sense = _dev.Read6(out cmdBuf, out senseBuf, badSectorToRead, blockSize, sectorsToTrim,
-                                       _dev.Timeout, out cmdDuration);
 
                 totalDuration += cmdDuration;
+            }
+            else if(read16)
+                sense = _dev.Read16(out cmdBuf, out senseBuf, 0, false, true, false, badSectorToRead, blockSize, 0,
+                                    sectorsToTrim, false, _dev.Timeout, out cmdDuration);
+            else if(read12)
+                sense = _dev.Read12(out cmdBuf, out senseBuf, 0, false, true, false, false, badSectorToRead,
+                                    blockSize, 0, sectorsToTrim, false, _dev.Timeout, out cmdDuration);
+            else if(read10)
+                sense = _dev.Read10(out cmdBuf, out senseBuf, 0, false, true, false, false, badSectorToRead,
+                                    blockSize, 0, sectorsToTrim, _dev.Timeout, out cmdDuration);
+            else if(read6)
+                sense = _dev.Read6(out cmdBuf, out senseBuf, badSectorToRead, blockSize, sectorsToTrim,
+                                   _dev.Timeout, out cmdDuration);
 
-                if(sense || _dev.Error)
-                {
-                    _errorLog?.WriteLine(badSectorToRead, _dev.Error, _dev.LastError, senseBuf);
+            totalDuration += cmdDuration;
 
-                    continue;
-                }
+            if(sense || _dev.Error)
+            {
+                _errorLog?.WriteLine(badSectorToRead, _dev.Error, _dev.LastError, senseBuf);
 
-                if(!sense &&
-                   !_dev.Error)
-                {
-                    _resume.BadBlocks.Remove(badSector);
-                    extents.Add(badSector);
-                }
-
-                // Because one block has been partially used to fix the offset
-                if(_fixOffset                       &&
-                   audioExtents.Contains(badSector) &&
-                   offsetBytes != 0)
-                {
-                    uint blocksToRead = sectorsToTrim;
-
-                    FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel, ref blocksToRead,
-                                  subSize, ref cmdBuf, blockSize, false);
-                }
-
-                if(supportedSubchannel != MmcSubchannel.None)
-                {
-                    byte[] data = new byte[sectorSize];
-                    byte[] sub  = new byte[subSize];
-                    Array.Copy(cmdBuf, 0, data, 0, sectorSize);
-                    Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
-
-                    if(supportsLongSectors)
-                        outputOptical.WriteSectorLong(data, badSector);
-                    else
-                        outputOptical.WriteSector(Sector.GetUserData(data), badSector);
-
-                    ulong trkStartBefore = track.StartSector;
-
-                    bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
-                        desiredSubchannel, sub, badSector, 1, subLog, isrcs, (byte)track.Sequence, ref mcn,
-                        tracks, subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
-                        _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
-
-                    // Set tracks and go back
-                    if(!indexesChanged)
-                        continue;
-
-                    (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
-
-                    if(track.StartSector != trkStartBefore &&
-                       !_resume.BadBlocks.Contains(track.StartSector))
-                    {
-                        _resume.BadBlocks.Add(track.StartSector);
-
-                        goto trimStart;
-                    }
-
-                    b--;
-
-                    continue;
-                }
-
-                if(supportsLongSectors)
-                    outputOptical.WriteSectorLong(cmdBuf, badSector);
-                else
-                    outputOptical.WriteSector(Sector.GetUserData(cmdBuf), badSector);
+                continue;
             }
 
-            EndProgress?.Invoke();
-            end = DateTime.UtcNow;
-            UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
-            _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+            if(!sense &&
+               !_dev.Error)
+            {
+                _resume.BadBlocks.Remove(badSector);
+                extents.Add(badSector);
+            }
+
+            // Because one block has been partially used to fix the offset
+            if(_fixOffset                       &&
+               audioExtents.Contains(badSector) &&
+               offsetBytes != 0)
+            {
+                uint blocksToRead = sectorsToTrim;
+
+                FixOffsetData(offsetBytes, sectorSize, sectorsForOffset, supportedSubchannel, ref blocksToRead,
+                              subSize, ref cmdBuf, blockSize, false);
+            }
+
+            if(supportedSubchannel != MmcSubchannel.None)
+            {
+                byte[] data = new byte[sectorSize];
+                byte[] sub  = new byte[subSize];
+                Array.Copy(cmdBuf, 0, data, 0, sectorSize);
+                Array.Copy(cmdBuf, sectorSize, sub, 0, subSize);
+
+                if(supportsLongSectors)
+                    outputOptical.WriteSectorLong(data, badSector);
+                else
+                    outputOptical.WriteSector(Sector.GetUserData(data), badSector);
+
+                ulong trkStartBefore = track.StartSector;
+
+                bool indexesChanged = Media.CompactDisc.WriteSubchannelToImage(supportedSubchannel,
+                                                                               desiredSubchannel, sub, badSector, 1, subLog, isrcs, (byte)track.Sequence, ref mcn,
+                                                                               tracks, subchannelExtents, _fixSubchannelPosition, outputOptical, _fixSubchannel,
+                                                                               _fixSubchannelCrc, _dumpLog, UpdateStatus, smallestPregapLbaPerTrack, true);
+
+                // Set tracks and go back
+                if(!indexesChanged)
+                    continue;
+
+                (outputOptical as IWritableOpticalImage).SetTracks(tracks.ToList());
+
+                if(track.StartSector != trkStartBefore &&
+                   !_resume.BadBlocks.Contains(track.StartSector))
+                {
+                    _resume.BadBlocks.Add(track.StartSector);
+
+                    goto trimStart;
+                }
+
+                b--;
+
+                continue;
+            }
+
+            if(supportsLongSectors)
+                outputOptical.WriteSectorLong(cmdBuf, badSector);
+            else
+                outputOptical.WriteSector(Sector.GetUserData(cmdBuf), badSector);
         }
+
+        EndProgress?.Invoke();
+        end = DateTime.UtcNow;
+        UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
+        _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/Dump.cs b/Aaru.Core/Devices/Dumping/Dump.cs
index 3bc405a78..ce4b9652b 100644
--- a/Aaru.Core/Devices/Dumping/Dump.cs
+++ b/Aaru.Core/Devices/Dumping/Dump.cs
@@ -46,268 +46,267 @@ using Aaru.Database;
 using Aaru.Devices;
 using Schemas;
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+/// <summary>Subchannel requested to dump</summary>
+public enum DumpSubchannel
 {
-    /// <summary>Subchannel requested to dump</summary>
-    public enum DumpSubchannel
+    /// <summary>Any available subchannel, in order: raw P to W, PQ, none</summary>
+    Any,
+    /// <summary>Raw P to W</summary>
+    Rw,
+    /// <summary>Raw P to W or PQ if not possible</summary>
+    RwOrPq,
+    /// <summary>PQ</summary>
+    Pq,
+    /// <summary>None</summary>
+    None
+}
+
+public partial class Dump
+{
+    readonly bool                       _debug;
+    readonly Device                     _dev;
+    readonly string                     _devicePath;
+    readonly bool                       _doResume;
+    readonly DumpLog                    _dumpLog;
+    readonly bool                       _dumpRaw;
+    readonly Encoding                   _encoding;
+    readonly ErrorLog                   _errorLog;
+    readonly bool                       _fixSubchannel;
+    readonly bool                       _fixSubchannelCrc;
+    readonly bool                       _fixSubchannelPosition;
+    readonly bool                       _force;
+    readonly Dictionary<string, string> _formatOptions;
+    readonly bool                       _generateSubchannels;
+    readonly bool                       _metadata;
+    readonly string                     _outputPath;
+    readonly IBaseWritableImage         _outputPlugin;
+    readonly string                     _outputPrefix;
+    readonly bool                       _persistent;
+    readonly CICMMetadataType           _preSidecar;
+    readonly bool                       _private;
+    readonly ushort                     _retryPasses;
+    readonly bool                       _retrySubchannel;
+    readonly bool                       _stopOnError;
+    readonly bool                       _storeEncrypted;
+    readonly DumpSubchannel             _subchannel;
+    readonly bool                       _titleKeys;
+    readonly bool                       _trim;
+    bool                                _useBufferedReads;
+    bool                                _aborted;
+    AaruContext                         _ctx;   // Main database context
+    Database.Models.Device              _dbDev; // Device database entry
+    bool                                _dumpFirstTrackPregap;
+    bool                                _fixOffset;
+    uint                                _maximumReadable; // Maximum number of sectors drive can read at once
+    Resume                              _resume;
+    Sidecar                             _sidecarClass;
+    uint                                _skip;
+    bool                                _skipCdireadyHole;
+    int                                 _speed;
+    int                                 _speedMultiplier;
+    bool                                _supportsPlextorD8;
+
+    /// <summary>Initializes dumpers</summary>
+    /// <param name="doResume">Should resume?</param>
+    /// <param name="dev">Device</param>
+    /// <param name="devicePath">Path to the device</param>
+    /// <param name="outputPrefix">Prefix for output log files</param>
+    /// <param name="outputPlugin">Plugin for output file</param>
+    /// <param name="retryPasses">How many times to retry</param>
+    /// <param name="force">Force to continue dump whenever possible</param>
+    /// <param name="dumpRaw">Dump long sectors</param>
+    /// <param name="persistent">Store whatever data the drive returned on error</param>
+    /// <param name="stopOnError">Stop dump on first error</param>
+    /// <param name="resume">Information for dump resuming</param>
+    /// <param name="dumpLog">Dump logger</param>
+    /// <param name="encoding">Encoding to use when analyzing dump</param>
+    /// <param name="outputPath">Path to output file</param>
+    /// <param name="formatOptions">Formats to pass to output file plugin</param>
+    /// <param name="trim">Trim errors from skipped sectors</param>
+    /// <param name="dumpFirstTrackPregap">Try to read and dump as much first track pregap as possible</param>
+    /// <param name="preSidecar">Sidecar to store in dumped image</param>
+    /// <param name="skip">How many sectors to skip reading on error</param>
+    /// <param name="metadata">Create metadata sidecar after dump?</param>
+    /// <param name="fixOffset">Fix audio offset</param>
+    /// <param name="debug">Debug mode</param>
+    /// <param name="subchannel">Desired subchannel to save to image</param>
+    /// <param name="speed">Desired drive speed</param>
+    /// <param name="private">Disable saving paths or serial numbers in images and logs</param>
+    /// <param name="fixSubchannelPosition">Fix subchannel position (save where it says it belongs)</param>
+    /// <param name="retrySubchannel">Retry reading incorrect or missing subchannels</param>
+    /// <param name="fixSubchannel">Try to fix subchannel errors (but not Q CRC)</param>
+    /// <param name="fixSubchannelCrc">Try to fix subchannel Q CRC errors</param>
+    /// <param name="skipCdireadyHole">Skip gap between CD-i Ready hidden track and track 1 audio</param>
+    /// <param name="errorLog">Error log</param>
+    /// <param name="generateSubchannels">Generate missing subchannels</param>
+    /// <param name="maximumReadable">Number of maximum blocks to be read at once (can be overriden by database)</param>
+    /// <param name="useBufferedReads">
+    ///     If MMC/SD does not support CMD23, use OS buffered reads instead of multiple single block
+    ///     commands
+    /// </param>
+    /// <param name="storeEncrypted">Store encrypted data as is</param>
+    /// <param name="titleKeys">Dump DVD CSS title keys</param>
+    public Dump(bool doResume, Device dev, string devicePath, IBaseWritableImage outputPlugin, ushort retryPasses,
+                bool force, bool dumpRaw, bool persistent, bool stopOnError, Resume resume, DumpLog dumpLog,
+                Encoding encoding, string outputPrefix, string outputPath, Dictionary<string, string> formatOptions,
+                CICMMetadataType preSidecar, uint skip, bool metadata, bool trim, bool dumpFirstTrackPregap,
+                bool fixOffset, bool debug, DumpSubchannel subchannel, int speed, bool @private,
+                bool fixSubchannelPosition, bool retrySubchannel, bool fixSubchannel, bool fixSubchannelCrc,
+                bool skipCdireadyHole, ErrorLog errorLog, bool generateSubchannels, uint maximumReadable,
+                bool useBufferedReads, bool storeEncrypted, bool titleKeys)
     {
-        /// <summary>Any available subchannel, in order: raw P to W, PQ, none</summary>
-        Any,
-        /// <summary>Raw P to W</summary>
-        Rw,
-        /// <summary>Raw P to W or PQ if not possible</summary>
-        RwOrPq,
-        /// <summary>PQ</summary>
-        Pq,
-        /// <summary>None</summary>
-        None
+        _doResume              = doResume;
+        _dev                   = dev;
+        _devicePath            = devicePath;
+        _outputPlugin          = outputPlugin;
+        _retryPasses           = retryPasses;
+        _force                 = force;
+        _dumpRaw               = dumpRaw;
+        _persistent            = persistent;
+        _stopOnError           = stopOnError;
+        _resume                = resume;
+        _dumpLog               = dumpLog;
+        _encoding              = encoding;
+        _outputPrefix          = outputPrefix;
+        _outputPath            = outputPath;
+        _formatOptions         = formatOptions;
+        _preSidecar            = preSidecar;
+        _skip                  = skip;
+        _metadata              = metadata;
+        _trim                  = trim;
+        _dumpFirstTrackPregap  = dumpFirstTrackPregap;
+        _aborted               = false;
+        _fixOffset             = fixOffset;
+        _debug                 = debug;
+        _maximumReadable       = maximumReadable;
+        _subchannel            = subchannel;
+        _speedMultiplier       = -1;
+        _speed                 = speed;
+        _private               = @private;
+        _fixSubchannelPosition = fixSubchannelPosition;
+        _retrySubchannel       = retrySubchannel;
+        _fixSubchannel         = fixSubchannel;
+        _fixSubchannelCrc      = fixSubchannelCrc;
+        _skipCdireadyHole      = skipCdireadyHole;
+        _errorLog              = errorLog;
+        _generateSubchannels   = generateSubchannels;
+        _useBufferedReads      = useBufferedReads;
+        _storeEncrypted        = storeEncrypted;
+        _titleKeys             = titleKeys;
     }
 
-    public partial class Dump
+    /// <summary>Starts dumping with the established fields and autodetecting the device type</summary>
+    public void Start()
     {
-        readonly bool                       _debug;
-        readonly Device                     _dev;
-        readonly string                     _devicePath;
-        readonly bool                       _doResume;
-        readonly DumpLog                    _dumpLog;
-        readonly bool                       _dumpRaw;
-        readonly Encoding                   _encoding;
-        readonly ErrorLog                   _errorLog;
-        readonly bool                       _fixSubchannel;
-        readonly bool                       _fixSubchannelCrc;
-        readonly bool                       _fixSubchannelPosition;
-        readonly bool                       _force;
-        readonly Dictionary<string, string> _formatOptions;
-        readonly bool                       _generateSubchannels;
-        readonly bool                       _metadata;
-        readonly string                     _outputPath;
-        readonly IBaseWritableImage             _outputPlugin;
-        readonly string                     _outputPrefix;
-        readonly bool                       _persistent;
-        readonly CICMMetadataType           _preSidecar;
-        readonly bool                       _private;
-        readonly ushort                     _retryPasses;
-        readonly bool                       _retrySubchannel;
-        readonly bool                       _stopOnError;
-        readonly bool                       _storeEncrypted;
-        readonly DumpSubchannel             _subchannel;
-        readonly bool                       _titleKeys;
-        readonly bool                       _trim;
-        bool                                _useBufferedReads;
-        bool                                _aborted;
-        AaruContext                         _ctx;   // Main database context
-        Database.Models.Device              _dbDev; // Device database entry
-        bool                                _dumpFirstTrackPregap;
-        bool                                _fixOffset;
-        uint                                _maximumReadable; // Maximum number of sectors drive can read at once
-        Resume                              _resume;
-        Sidecar                             _sidecarClass;
-        uint                                _skip;
-        bool                                _skipCdireadyHole;
-        int                                 _speed;
-        int                                 _speedMultiplier;
-        bool                                _supportsPlextorD8;
+        // Open main database
+        _ctx = AaruContext.Create(Settings.Settings.MainDbPath);
 
-        /// <summary>Initializes dumpers</summary>
-        /// <param name="doResume">Should resume?</param>
-        /// <param name="dev">Device</param>
-        /// <param name="devicePath">Path to the device</param>
-        /// <param name="outputPrefix">Prefix for output log files</param>
-        /// <param name="outputPlugin">Plugin for output file</param>
-        /// <param name="retryPasses">How many times to retry</param>
-        /// <param name="force">Force to continue dump whenever possible</param>
-        /// <param name="dumpRaw">Dump long sectors</param>
-        /// <param name="persistent">Store whatever data the drive returned on error</param>
-        /// <param name="stopOnError">Stop dump on first error</param>
-        /// <param name="resume">Information for dump resuming</param>
-        /// <param name="dumpLog">Dump logger</param>
-        /// <param name="encoding">Encoding to use when analyzing dump</param>
-        /// <param name="outputPath">Path to output file</param>
-        /// <param name="formatOptions">Formats to pass to output file plugin</param>
-        /// <param name="trim">Trim errors from skipped sectors</param>
-        /// <param name="dumpFirstTrackPregap">Try to read and dump as much first track pregap as possible</param>
-        /// <param name="preSidecar">Sidecar to store in dumped image</param>
-        /// <param name="skip">How many sectors to skip reading on error</param>
-        /// <param name="metadata">Create metadata sidecar after dump?</param>
-        /// <param name="fixOffset">Fix audio offset</param>
-        /// <param name="debug">Debug mode</param>
-        /// <param name="subchannel">Desired subchannel to save to image</param>
-        /// <param name="speed">Desired drive speed</param>
-        /// <param name="private">Disable saving paths or serial numbers in images and logs</param>
-        /// <param name="fixSubchannelPosition">Fix subchannel position (save where it says it belongs)</param>
-        /// <param name="retrySubchannel">Retry reading incorrect or missing subchannels</param>
-        /// <param name="fixSubchannel">Try to fix subchannel errors (but not Q CRC)</param>
-        /// <param name="fixSubchannelCrc">Try to fix subchannel Q CRC errors</param>
-        /// <param name="skipCdireadyHole">Skip gap between CD-i Ready hidden track and track 1 audio</param>
-        /// <param name="errorLog">Error log</param>
-        /// <param name="generateSubchannels">Generate missing subchannels</param>
-        /// <param name="maximumReadable">Number of maximum blocks to be read at once (can be overriden by database)</param>
-        /// <param name="useBufferedReads">
-        ///     If MMC/SD does not support CMD23, use OS buffered reads instead of multiple single block
-        ///     commands
-        /// </param>
-        /// <param name="storeEncrypted">Store encrypted data as is</param>
-        /// <param name="titleKeys">Dump DVD CSS title keys</param>
-        public Dump(bool doResume, Device dev, string devicePath, IBaseWritableImage outputPlugin, ushort retryPasses,
-                    bool force, bool dumpRaw, bool persistent, bool stopOnError, Resume resume, DumpLog dumpLog,
-                    Encoding encoding, string outputPrefix, string outputPath, Dictionary<string, string> formatOptions,
-                    CICMMetadataType preSidecar, uint skip, bool metadata, bool trim, bool dumpFirstTrackPregap,
-                    bool fixOffset, bool debug, DumpSubchannel subchannel, int speed, bool @private,
-                    bool fixSubchannelPosition, bool retrySubchannel, bool fixSubchannel, bool fixSubchannelCrc,
-                    bool skipCdireadyHole, ErrorLog errorLog, bool generateSubchannels, uint maximumReadable,
-                    bool useBufferedReads, bool storeEncrypted, bool titleKeys)
+        // Search for device in main database
+        _dbDev = _ctx.Devices.FirstOrDefault(d => d.Manufacturer == _dev.Manufacturer && d.Model == _dev.Model &&
+                                                  d.Revision     == _dev.FirmwareRevision);
+
+        if(_dbDev is null)
         {
-            _doResume              = doResume;
-            _dev                   = dev;
-            _devicePath            = devicePath;
-            _outputPlugin          = outputPlugin;
-            _retryPasses           = retryPasses;
-            _force                 = force;
-            _dumpRaw               = dumpRaw;
-            _persistent            = persistent;
-            _stopOnError           = stopOnError;
-            _resume                = resume;
-            _dumpLog               = dumpLog;
-            _encoding              = encoding;
-            _outputPrefix          = outputPrefix;
-            _outputPath            = outputPath;
-            _formatOptions         = formatOptions;
-            _preSidecar            = preSidecar;
-            _skip                  = skip;
-            _metadata              = metadata;
-            _trim                  = trim;
-            _dumpFirstTrackPregap  = dumpFirstTrackPregap;
-            _aborted               = false;
-            _fixOffset             = fixOffset;
-            _debug                 = debug;
-            _maximumReadable       = maximumReadable;
-            _subchannel            = subchannel;
-            _speedMultiplier       = -1;
-            _speed                 = speed;
-            _private               = @private;
-            _fixSubchannelPosition = fixSubchannelPosition;
-            _retrySubchannel       = retrySubchannel;
-            _fixSubchannel         = fixSubchannel;
-            _fixSubchannelCrc      = fixSubchannelCrc;
-            _skipCdireadyHole      = skipCdireadyHole;
-            _errorLog              = errorLog;
-            _generateSubchannels   = generateSubchannels;
-            _useBufferedReads      = useBufferedReads;
-            _storeEncrypted        = storeEncrypted;
-            _titleKeys             = titleKeys;
+            _dumpLog.WriteLine("Device not in database, please create a device report and attach it to a Github issue.");
+
+            UpdateStatus?.
+                Invoke("Device not in database, please create a device report and attach it to a Github issue.");
+        }
+        else
+        {
+            _dumpLog.WriteLine($"Device in database since {_dbDev.LastSynchronized}.");
+            UpdateStatus?.Invoke($"Device in database since {_dbDev.LastSynchronized}.");
+
+            if(_dbDev.OptimalMultipleSectorsRead > 0)
+                _maximumReadable = (uint)_dbDev.OptimalMultipleSectorsRead;
         }
 
-        /// <summary>Starts dumping with the established fields and autodetecting the device type</summary>
-        public void Start()
+        switch(_dev.IsUsb)
         {
-            // Open main database
-            _ctx = AaruContext.Create(Settings.Settings.MainDbPath);
+            case true when _dev.UsbVendorId == 0x054C && _dev.UsbProductId is 0x01C8 or 0x01C9 or 0x02D2: PlayStationPortable();
 
-            // Search for device in main database
-            _dbDev = _ctx.Devices.FirstOrDefault(d => d.Manufacturer == _dev.Manufacturer && d.Model == _dev.Model &&
-                                                      d.Revision     == _dev.FirmwareRevision);
+                break;
+            case true when _dev.UsbVendorId ==0x0403 && _dev.UsbProductId ==0x97C1: Retrode();
 
-            if(_dbDev is null)
-            {
-                _dumpLog.WriteLine("Device not in database, please create a device report and attach it to a Github issue.");
+                break;
+            default:
+                switch(_dev.Type)
+                {
+                    case DeviceType.ATA:
+                        Ata();
 
-                UpdateStatus?.
-                    Invoke("Device not in database, please create a device report and attach it to a Github issue.");
-            }
-            else
-            {
-                _dumpLog.WriteLine($"Device in database since {_dbDev.LastSynchronized}.");
-                UpdateStatus?.Invoke($"Device in database since {_dbDev.LastSynchronized}.");
+                        break;
+                    case DeviceType.MMC:
+                    case DeviceType.SecureDigital:
+                        SecureDigital();
 
-                if(_dbDev.OptimalMultipleSectorsRead > 0)
-                    _maximumReadable = (uint)_dbDev.OptimalMultipleSectorsRead;
-            }
+                        break;
+                    case DeviceType.NVMe:
+                        NVMe();
 
-            switch(_dev.IsUsb)
-            {
-                case true when _dev.UsbVendorId == 0x054C && _dev.UsbProductId is 0x01C8 or 0x01C9 or 0x02D2: PlayStationPortable();
+                        break;
+                    case DeviceType.ATAPI:
+                    case DeviceType.SCSI:
+                        Scsi();
 
-                    break;
-                case true when _dev.UsbVendorId ==0x0403  && _dev.UsbProductId ==0x97C1:                      Retrode();
+                        break;
+                    default:
+                        _dumpLog.WriteLine("Unknown device type.");
+                        _dumpLog.Close();
+                        StoppingErrorMessage?.Invoke("Unknown device type.");
 
-                    break;
-                default:
-                    switch(_dev.Type)
-                    {
-                        case DeviceType.ATA:
-                            Ata();
+                        return;
+                }
 
-                            break;
-                        case DeviceType.MMC:
-                        case DeviceType.SecureDigital:
-                            SecureDigital();
-
-                            break;
-                        case DeviceType.NVMe:
-                            NVMe();
-
-                            break;
-                        case DeviceType.ATAPI:
-                        case DeviceType.SCSI:
-                            Scsi();
-
-                            break;
-                        default:
-                            _dumpLog.WriteLine("Unknown device type.");
-                            _dumpLog.Close();
-                            StoppingErrorMessage?.Invoke("Unknown device type.");
-
-                            return;
-                    }
-
-                    break;
-            }
-
-            _errorLog.Close();
-            _dumpLog.Close();
-
-            if(_resume == null ||
-               !_doResume)
-                return;
-
-            _resume.LastWriteDate = DateTime.UtcNow;
-            _resume.BadBlocks.Sort();
-
-            if(File.Exists(_outputPrefix + ".resume.xml"))
-                File.Delete(_outputPrefix + ".resume.xml");
-
-            var fs = new FileStream(_outputPrefix + ".resume.xml", FileMode.Create, FileAccess.ReadWrite);
-            var xs = new XmlSerializer(_resume.GetType());
-            xs.Serialize(fs, _resume);
-            fs.Close();
+                break;
         }
 
-        /// <summary>Aborts the dump in progress</summary>
-        public void Abort()
-        {
-            _aborted = true;
-            _sidecarClass?.Abort();
-        }
+        _errorLog.Close();
+        _dumpLog.Close();
 
-        /// <summary>Event raised when the progress bar is not longer needed</summary>
-        public event EndProgressHandler EndProgress;
-        /// <summary>Event raised when a progress bar is needed</summary>
-        public event InitProgressHandler InitProgress;
-        /// <summary>Event raised to report status updates</summary>
-        public event UpdateStatusHandler UpdateStatus;
-        /// <summary>Event raised to report a non-fatal error</summary>
-        public event ErrorMessageHandler ErrorMessage;
-        /// <summary>Event raised to report a fatal error that stops the dumping operation and should call user's attention</summary>
-        public event ErrorMessageHandler StoppingErrorMessage;
-        /// <summary>Event raised to update the values of a determinate progress bar</summary>
-        public event UpdateProgressHandler UpdateProgress;
-        /// <summary>Event raised to update the status of an undeterminate progress bar</summary>
-        public event PulseProgressHandler PulseProgress;
-        /// <summary>Event raised when the progress bar is not longer needed</summary>
-        public event EndProgressHandler2 EndProgress2;
-        /// <summary>Event raised when a progress bar is needed</summary>
-        public event InitProgressHandler2 InitProgress2;
-        /// <summary>Event raised to update the values of a determinate progress bar</summary>
-        public event UpdateProgressHandler2 UpdateProgress2;
+        if(_resume == null ||
+           !_doResume)
+            return;
+
+        _resume.LastWriteDate = DateTime.UtcNow;
+        _resume.BadBlocks.Sort();
+
+        if(File.Exists(_outputPrefix + ".resume.xml"))
+            File.Delete(_outputPrefix + ".resume.xml");
+
+        var fs = new FileStream(_outputPrefix + ".resume.xml", FileMode.Create, FileAccess.ReadWrite);
+        var xs = new XmlSerializer(_resume.GetType());
+        xs.Serialize(fs, _resume);
+        fs.Close();
     }
+
+    /// <summary>Aborts the dump in progress</summary>
+    public void Abort()
+    {
+        _aborted = true;
+        _sidecarClass?.Abort();
+    }
+
+    /// <summary>Event raised when the progress bar is not longer needed</summary>
+    public event EndProgressHandler EndProgress;
+    /// <summary>Event raised when a progress bar is needed</summary>
+    public event InitProgressHandler InitProgress;
+    /// <summary>Event raised to report status updates</summary>
+    public event UpdateStatusHandler UpdateStatus;
+    /// <summary>Event raised to report a non-fatal error</summary>
+    public event ErrorMessageHandler ErrorMessage;
+    /// <summary>Event raised to report a fatal error that stops the dumping operation and should call user's attention</summary>
+    public event ErrorMessageHandler StoppingErrorMessage;
+    /// <summary>Event raised to update the values of a determinate progress bar</summary>
+    public event UpdateProgressHandler UpdateProgress;
+    /// <summary>Event raised to update the status of an undeterminate progress bar</summary>
+    public event PulseProgressHandler PulseProgress;
+    /// <summary>Event raised when the progress bar is not longer needed</summary>
+    public event EndProgressHandler2 EndProgress2;
+    /// <summary>Event raised when a progress bar is needed</summary>
+    public event InitProgressHandler2 InitProgress2;
+    /// <summary>Event raised to update the values of a determinate progress bar</summary>
+    public event UpdateProgressHandler2 UpdateProgress2;
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/MMC.cs b/Aaru.Core/Devices/Dumping/MMC.cs
index 88a1342c2..817ffa25a 100644
--- a/Aaru.Core/Devices/Dumping/MMC.cs
+++ b/Aaru.Core/Devices/Dumping/MMC.cs
@@ -52,200 +52,197 @@ using Spare = Aaru.Decoders.DVD.Spare;
 
 // ReSharper disable JoinDeclarationAndInitializer
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+/// <summary>Implement dumping optical discs from MultiMedia devices</summary>
+partial class Dump
 {
-    /// <summary>Implement dumping optical discs from MultiMedia devices</summary>
-    partial class Dump
+    /// <summary>Dumps an optical disc</summary>
+    void Mmc()
     {
-        /// <summary>Dumps an optical disc</summary>
-        void Mmc()
+        MediaType     dskType = MediaType.Unknown;
+        bool          sense;
+        byte[]        tmpBuf;
+        bool          compactDisc      = true;
+        bool          gotConfiguration = false;
+        bool          isXbox           = false;
+        DVDDecryption dvdDecrypt       = null;
+        _speedMultiplier = 1;
+
+        // TODO: Log not only what is it reading, but if it was read correctly or not.
+        sense = _dev.GetConfiguration(out byte[] cmdBuf, out _, 0, MmcGetConfigurationRt.Current, _dev.Timeout,
+                                      out _);
+
+        if(!sense)
         {
-            MediaType     dskType = MediaType.Unknown;
-            bool          sense;
-            byte[]        tmpBuf;
-            bool          compactDisc      = true;
-            bool          gotConfiguration = false;
-            bool          isXbox           = false;
-            DVDDecryption dvdDecrypt       = null;
-            _speedMultiplier = 1;
+            gotConfiguration = true;
+            Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
+            _dumpLog.WriteLine("Device reports current profile is 0x{0:X4}", ftr.CurrentProfile);
 
-            // TODO: Log not only what is it reading, but if it was read correctly or not.
-            sense = _dev.GetConfiguration(out byte[] cmdBuf, out _, 0, MmcGetConfigurationRt.Current, _dev.Timeout,
-                                          out _);
-
-            if(!sense)
+            switch(ftr.CurrentProfile)
             {
-                gotConfiguration = true;
-                Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
-                _dumpLog.WriteLine("Device reports current profile is 0x{0:X4}", ftr.CurrentProfile);
+                case 0x0001:
+                    dskType          = MediaType.GENERIC_HDD;
+                    _speedMultiplier = -1;
+                    goto default;
+                case 0x0002:
+                    dskType          = MediaType.PD650;
+                    _speedMultiplier = -1;
+                    goto default;
+                case 0x0005:
+                    dskType = MediaType.CDMO;
 
-                switch(ftr.CurrentProfile)
-                {
-                    case 0x0001:
-                        dskType          = MediaType.GENERIC_HDD;
-                        _speedMultiplier = -1;
-                        goto default;
-                    case 0x0002:
-                        dskType          = MediaType.PD650;
-                        _speedMultiplier = -1;
-                        goto default;
-                    case 0x0005:
-                        dskType = MediaType.CDMO;
+                    break;
+                case 0x0008:
+                    dskType = MediaType.CD;
 
-                        break;
-                    case 0x0008:
-                        dskType = MediaType.CD;
+                    break;
+                case 0x0009:
+                    dskType = MediaType.CDR;
 
-                        break;
-                    case 0x0009:
-                        dskType = MediaType.CDR;
+                    break;
+                case 0x000A:
+                    dskType = MediaType.CDRW;
 
-                        break;
-                    case 0x000A:
-                        dskType = MediaType.CDRW;
+                    break;
+                case 0x0010:
+                    dskType          = MediaType.DVDROM;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x0011:
+                    dskType          = MediaType.DVDR;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x0012:
+                    dskType          = MediaType.DVDRAM;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x0013:
+                case 0x0014:
+                    dskType          = MediaType.DVDRW;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x0015:
+                case 0x0016:
+                    dskType          = MediaType.DVDRDL;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x0017:
+                    dskType          = MediaType.DVDRWDL;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x0018:
+                    dskType          = MediaType.DVDDownload;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x001A:
+                    dskType          = MediaType.DVDPRW;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x001B:
+                    dskType          = MediaType.DVDPR;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x0020:
+                    dskType = MediaType.DDCD;
+                    goto default;
+                case 0x0021:
+                    dskType = MediaType.DDCDR;
+                    goto default;
+                case 0x0022:
+                    dskType = MediaType.DDCDRW;
+                    goto default;
+                case 0x002A:
+                    dskType          = MediaType.DVDPRWDL;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x002B:
+                    dskType          = MediaType.DVDPRDL;
+                    _speedMultiplier = 9;
+                    goto default;
+                case 0x0040:
+                    dskType          = MediaType.BDROM;
+                    _speedMultiplier = 30;
+                    goto default;
+                case 0x0041:
+                case 0x0042:
+                    dskType          = MediaType.BDR;
+                    _speedMultiplier = 30;
+                    goto default;
+                case 0x0043:
+                    dskType          = MediaType.BDRE;
+                    _speedMultiplier = 30;
+                    goto default;
+                case 0x0050:
+                    dskType          = MediaType.HDDVDROM;
+                    _speedMultiplier = 30;
+                    goto default;
+                case 0x0051:
+                    dskType          = MediaType.HDDVDR;
+                    _speedMultiplier = 30;
+                    goto default;
+                case 0x0052:
+                    dskType          = MediaType.HDDVDRAM;
+                    _speedMultiplier = 30;
+                    goto default;
+                case 0x0053:
+                    dskType          = MediaType.HDDVDRW;
+                    _speedMultiplier = 30;
+                    goto default;
+                case 0x0058:
+                    dskType          = MediaType.HDDVDRDL;
+                    _speedMultiplier = 30;
+                    goto default;
+                case 0x005A:
+                    dskType          = MediaType.HDDVDRWDL;
+                    _speedMultiplier = 30;
+                    goto default;
+                default:
+                    compactDisc = false;
 
-                        break;
-                    case 0x0010:
-                        dskType          = MediaType.DVDROM;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x0011:
-                        dskType          = MediaType.DVDR;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x0012:
-                        dskType          = MediaType.DVDRAM;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x0013:
-                    case 0x0014:
-                        dskType          = MediaType.DVDRW;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x0015:
-                    case 0x0016:
-                        dskType          = MediaType.DVDRDL;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x0017:
-                        dskType          = MediaType.DVDRWDL;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x0018:
-                        dskType          = MediaType.DVDDownload;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x001A:
-                        dskType          = MediaType.DVDPRW;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x001B:
-                        dskType          = MediaType.DVDPR;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x0020:
-                        dskType = MediaType.DDCD;
-                        goto default;
-                    case 0x0021:
-                        dskType = MediaType.DDCDR;
-                        goto default;
-                    case 0x0022:
-                        dskType = MediaType.DDCDRW;
-                        goto default;
-                    case 0x002A:
-                        dskType          = MediaType.DVDPRWDL;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x002B:
-                        dskType          = MediaType.DVDPRDL;
-                        _speedMultiplier = 9;
-                        goto default;
-                    case 0x0040:
-                        dskType          = MediaType.BDROM;
-                        _speedMultiplier = 30;
-                        goto default;
-                    case 0x0041:
-                    case 0x0042:
-                        dskType          = MediaType.BDR;
-                        _speedMultiplier = 30;
-                        goto default;
-                    case 0x0043:
-                        dskType          = MediaType.BDRE;
-                        _speedMultiplier = 30;
-                        goto default;
-                    case 0x0050:
-                        dskType          = MediaType.HDDVDROM;
-                        _speedMultiplier = 30;
-                        goto default;
-                    case 0x0051:
-                        dskType          = MediaType.HDDVDR;
-                        _speedMultiplier = 30;
-                        goto default;
-                    case 0x0052:
-                        dskType          = MediaType.HDDVDRAM;
-                        _speedMultiplier = 30;
-                        goto default;
-                    case 0x0053:
-                        dskType          = MediaType.HDDVDRW;
-                        _speedMultiplier = 30;
-                        goto default;
-                    case 0x0058:
-                        dskType          = MediaType.HDDVDRDL;
-                        _speedMultiplier = 30;
-                        goto default;
-                    case 0x005A:
-                        dskType          = MediaType.HDDVDRWDL;
-                        _speedMultiplier = 30;
-                        goto default;
-                    default:
-                        compactDisc = false;
-
-                        break;
-                }
+                    break;
             }
+        }
 
-            Modes.DecodedMode? decMode = null;
+        Modes.DecodedMode? decMode = null;
 
-            sense = _dev.ModeSense6(out cmdBuf, out _, true, ScsiModeSensePageControl.Current, 0x00, _dev.Timeout,
+        sense = _dev.ModeSense6(out cmdBuf, out _, true, ScsiModeSensePageControl.Current, 0x00, _dev.Timeout,
+                                out _);
+
+        if(sense || _dev.Error)
+        {
+            sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x00, _dev.Timeout,
                                     out _);
 
+            if(!sense &&
+               !_dev.Error)
+                decMode = Modes.DecodeMode6(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
+        }
+        else
+            decMode = Modes.DecodeMode6(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
+
+        if(decMode is null)
+        {
+            sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current, 0x3F, 0x00,
+                                     _dev.Timeout, out _);
+
             if(sense || _dev.Error)
             {
-                sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x00, _dev.Timeout,
-                                        out _);
-
-                if(!sense &&
-                   !_dev.Error)
-                    decMode = Modes.DecodeMode6(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
-            }
-            else
-                decMode = Modes.DecodeMode6(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
-
-            if(decMode is null)
-            {
-                sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current, 0x3F, 0x00,
-                                         _dev.Timeout, out _);
+                sense = _dev.ModeSense10(out cmdBuf, out _, false, false, ScsiModeSensePageControl.Current, 0x3F,
+                                         0x00, _dev.Timeout, out _);
 
                 if(sense || _dev.Error)
                 {
-                    sense = _dev.ModeSense10(out cmdBuf, out _, false, false, ScsiModeSensePageControl.Current, 0x3F,
+                    sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current, 0x00,
                                              0x00, _dev.Timeout, out _);
 
                     if(sense || _dev.Error)
                     {
-                        sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current, 0x00,
-                                                 0x00, _dev.Timeout, out _);
+                        sense = _dev.ModeSense10(out cmdBuf, out _, false, false, ScsiModeSensePageControl.Current,
+                                                 0x00, 0x00, _dev.Timeout, out _);
 
-                        if(sense || _dev.Error)
-                        {
-                            sense = _dev.ModeSense10(out cmdBuf, out _, false, false, ScsiModeSensePageControl.Current,
-                                                     0x00, 0x00, _dev.Timeout, out _);
-
-                            if(!sense &&
-                               !_dev.Error)
-                                decMode = Modes.DecodeMode10(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
-                        }
-                        else
+                        if(!sense &&
+                           !_dev.Error)
                             decMode = Modes.DecodeMode10(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
                     }
                     else
@@ -254,847 +251,849 @@ namespace Aaru.Core.Devices.Dumping
                 else
                     decMode = Modes.DecodeMode10(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
             }
+            else
+                decMode = Modes.DecodeMode10(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
+        }
 
-            if(decMode.HasValue  &&
-               _dev.IsUsb        &&
-               !gotConfiguration &&
-               (decMode.Value.Header.MediumType == MediumTypes.UnknownBlockDevice  ||
-                decMode.Value.Header.MediumType == MediumTypes.ReadOnlyBlockDevice ||
-                decMode.Value.Header.MediumType == MediumTypes.ReadWriteBlockDevice))
+        if(decMode.HasValue  &&
+           _dev.IsUsb        &&
+           !gotConfiguration &&
+           (decMode.Value.Header.MediumType == MediumTypes.UnknownBlockDevice  ||
+            decMode.Value.Header.MediumType == MediumTypes.ReadOnlyBlockDevice ||
+            decMode.Value.Header.MediumType == MediumTypes.ReadWriteBlockDevice))
+        {
+            _speedMultiplier = -1;
+            Sbc(null, MediaType.Unknown, false);
+
+            return;
+        }
+
+        if(compactDisc)
+        {
+            _speedMultiplier *= 177;
+            CompactDisc();
+
+            return;
+        }
+
+        _speedMultiplier *= 150;
+
+        var   scsiReader = new Reader(_dev, _dev.Timeout, null, _errorLog, _dumpRaw);
+        ulong blocks     = scsiReader.GetDeviceBlocks();
+        _dumpLog.WriteLine("Device reports disc has {0} blocks", blocks);
+        Dictionary<MediaTagType, byte[]> mediaTags = new Dictionary<MediaTagType, byte[]>();
+
+        if(dskType == MediaType.PD650)
+            switch(blocks + 1)
             {
-                _speedMultiplier = -1;
-                Sbc(null, MediaType.Unknown, false);
+                case 1281856:
+                    dskType = MediaType.PD650_WORM;
 
-                return;
+                    break;
+                case 58620544:
+                    dskType = MediaType.REV120;
+
+                    break;
+                case 17090880:
+                    dskType = MediaType.REV35;
+
+                    break;
+
+                case 34185728:
+                    dskType = MediaType.REV70;
+
+                    break;
             }
 
-            if(compactDisc)
-            {
-                _speedMultiplier *= 177;
-                CompactDisc();
+        #region Nintendo
+        switch(dskType)
+        {
+            case MediaType.Unknown when blocks > 0:
+                _dumpLog.WriteLine("Reading Physical Format Information");
 
-                return;
-            }
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.PhysicalInformation, 0, _dev.Timeout, out _);
 
-            _speedMultiplier *= 150;
-
-            var   scsiReader = new Reader(_dev, _dev.Timeout, null, _errorLog, _dumpRaw);
-            ulong blocks     = scsiReader.GetDeviceBlocks();
-            _dumpLog.WriteLine("Device reports disc has {0} blocks", blocks);
-            Dictionary<MediaTagType, byte[]> mediaTags = new Dictionary<MediaTagType, byte[]>();
-
-            if(dskType == MediaType.PD650)
-                switch(blocks + 1)
+                if(!sense)
                 {
-                    case 1281856:
-                        dskType = MediaType.PD650_WORM;
+                    PFI.PhysicalFormatInformation? nintendoPfi = PFI.Decode(cmdBuf, dskType);
 
-                        break;
-                    case 58620544:
-                        dskType = MediaType.REV120;
+                    if(nintendoPfi?.DiskCategory     == DiskCategory.Nintendo &&
+                       nintendoPfi.Value.PartVersion == 15)
+                    {
+                        _dumpLog.WriteLine("Dumping Nintendo GameCube or Wii discs is not yet implemented.");
 
-                        break;
-                    case 17090880:
-                        dskType = MediaType.REV35;
+                        StoppingErrorMessage?.
+                            Invoke("Dumping Nintendo GameCube or Wii discs is not yet implemented.");
 
-                        break;
-
-                    case 34185728:
-                        dskType = MediaType.REV70;
-
-                        break;
+                        return;
+                    }
                 }
 
-            #region Nintendo
-            switch(dskType)
-            {
-                case MediaType.Unknown when blocks > 0:
-                    _dumpLog.WriteLine("Reading Physical Format Information");
+                break;
+            case MediaType.DVDDownload:
+            case MediaType.DVDPR:
+            case MediaType.DVDPRDL:
+            case MediaType.DVDPRW:
+            case MediaType.DVDPRWDL:
+            case MediaType.DVDR:
+            case MediaType.DVDRAM:
+            case MediaType.DVDRDL:
+            case MediaType.DVDROM:
+            case MediaType.DVDRW:
+            case MediaType.DVDRWDL:
+            case MediaType.HDDVDR:
+            case MediaType.HDDVDRAM:
+            case MediaType.HDDVDRDL:
+            case MediaType.HDDVDROM:
+            case MediaType.HDDVDRW:
+            case MediaType.HDDVDRWDL:
+                _dumpLog.WriteLine("Reading Physical Format Information");
 
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.PhysicalInformation, 0, _dev.Timeout, out _);
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.PhysicalInformation, 0, _dev.Timeout, out _);
 
-                    if(!sense)
+                if(!sense)
+                {
+                    PFI.PhysicalFormatInformation? nullablePfi = PFI.Decode(cmdBuf, dskType);
+
+                    if(nullablePfi.HasValue)
                     {
-                        PFI.PhysicalFormatInformation? nintendoPfi = PFI.Decode(cmdBuf, dskType);
+                        tmpBuf = new byte[cmdBuf.Length - 4];
+                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                        mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
 
-                        if(nintendoPfi?.DiskCategory     == DiskCategory.Nintendo &&
-                           nintendoPfi.Value.PartVersion == 15)
+                        PFI.PhysicalFormatInformation decPfi = nullablePfi.Value;
+                        UpdateStatus?.Invoke($"PFI:\n{PFI.Prettify(decPfi)}");
+
+                        // False book types
+                        switch(decPfi.DiskCategory)
                         {
-                            _dumpLog.WriteLine("Dumping Nintendo GameCube or Wii discs is not yet implemented.");
+                            case DiskCategory.DVDPR:
+                                dskType = MediaType.DVDPR;
+
+                                break;
+                            case DiskCategory.DVDPRDL:
+                                dskType = MediaType.DVDPRDL;
+
+                                break;
+                            case DiskCategory.DVDPRW:
+                                dskType = MediaType.DVDPRW;
+
+                                break;
+                            case DiskCategory.DVDPRWDL:
+                                dskType = MediaType.DVDPRWDL;
+
+                                break;
+                            case DiskCategory.DVDR:
+                                dskType = decPfi.PartVersion >= 6 ? MediaType.DVDRDL : MediaType.DVDR;
+
+                                break;
+                            case DiskCategory.DVDRAM:
+                                dskType = MediaType.DVDRAM;
+
+                                break;
+                            default:
+                                dskType = MediaType.DVDROM;
+
+                                break;
+                            case DiskCategory.DVDRW:
+                                dskType = decPfi.PartVersion >= 15 ? MediaType.DVDRWDL : MediaType.DVDRW;
+
+                                break;
+                            case DiskCategory.HDDVDR:
+                                dskType = MediaType.HDDVDR;
+
+                                break;
+                            case DiskCategory.HDDVDRAM:
+                                dskType = MediaType.HDDVDRAM;
+
+                                break;
+                            case DiskCategory.HDDVDROM:
+                                dskType = MediaType.HDDVDROM;
+
+                                break;
+                            case DiskCategory.HDDVDRW:
+                                dskType = MediaType.HDDVDRW;
+
+                                break;
+                            case DiskCategory.Nintendo:
+                                dskType = decPfi.DiscSize == DVDSize.Eighty ? MediaType.GOD : MediaType.WOD;
+
+                                break;
+                            case DiskCategory.UMD:
+                                dskType = MediaType.UMD;
+
+                                break;
+                        }
+                    }
+                }
+
+                _dumpLog.WriteLine("Reading Disc Manufacturing Information");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.DiscManufacturingInformation, 0, _dev.Timeout,
+                                               out _);
+
+                if(!sense)
+                {
+                    if(DMI.IsXbox(cmdBuf) ||
+                       DMI.IsXbox360(cmdBuf))
+                    {
+                        if(DMI.IsXbox(cmdBuf))
+                        {
+                            dskType = MediaType.XGD;
+                        }
+                        else if(DMI.IsXbox360(cmdBuf))
+                        {
+                            dskType = MediaType.XGD2;
+
+                            // All XGD3 all have the same number of blocks
+                            if(blocks + 1 == 25063   || // Locked (or non compatible drive)
+                               blocks + 1 == 4229664 || // Xtreme unlock
+                               blocks + 1 == 4246304)   // Wxripper unlock
+                                dskType = MediaType.XGD3;
+                        }
+
+                        isXbox = true;
+
+                        sense = _dev.ScsiInquiry(out byte[] inqBuf, out _);
+
+                        if(sense || Inquiry.Decode(inqBuf)?.KreonPresent != true)
+                        {
+                            _dumpLog.WriteLine("Dumping Xbox Game Discs requires a drive with Kreon firmware.");
 
                             StoppingErrorMessage?.
-                                Invoke("Dumping Nintendo GameCube or Wii discs is not yet implemented.");
+                                Invoke("Dumping Xbox Game Discs requires a drive with Kreon firmware.");
 
+                            if(!_force)
+                                return;
+
+                            isXbox = false;
+                        }
+
+                        if(_dumpRaw && !_force)
+                        {
+                            StoppingErrorMessage?.
+                                Invoke("Not continuing. If you want to continue reading cooked data when raw is not available use the force option.");
+
+                            // TODO: Exit more gracefully
                             return;
                         }
                     }
 
-                    break;
-                case MediaType.DVDDownload:
-                case MediaType.DVDPR:
-                case MediaType.DVDPRDL:
-                case MediaType.DVDPRW:
-                case MediaType.DVDPRWDL:
-                case MediaType.DVDR:
-                case MediaType.DVDRAM:
-                case MediaType.DVDRDL:
-                case MediaType.DVDROM:
-                case MediaType.DVDRW:
-                case MediaType.DVDRWDL:
-                case MediaType.HDDVDR:
-                case MediaType.HDDVDRAM:
-                case MediaType.HDDVDRDL:
-                case MediaType.HDDVDROM:
-                case MediaType.HDDVDRW:
-                case MediaType.HDDVDRWDL:
-                    _dumpLog.WriteLine("Reading Physical Format Information");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.PhysicalInformation, 0, _dev.Timeout, out _);
-
-                    if(!sense)
-                    {
-                        PFI.PhysicalFormatInformation? nullablePfi = PFI.Decode(cmdBuf, dskType);
-
-                        if(nullablePfi.HasValue)
-                        {
-                            tmpBuf = new byte[cmdBuf.Length - 4];
-                            Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                            mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
-
-                            PFI.PhysicalFormatInformation decPfi = nullablePfi.Value;
-                            UpdateStatus?.Invoke($"PFI:\n{PFI.Prettify(decPfi)}");
-
-                            // False book types
-                            switch(decPfi.DiskCategory)
-                            {
-                                case DiskCategory.DVDPR:
-                                    dskType = MediaType.DVDPR;
-
-                                    break;
-                                case DiskCategory.DVDPRDL:
-                                    dskType = MediaType.DVDPRDL;
-
-                                    break;
-                                case DiskCategory.DVDPRW:
-                                    dskType = MediaType.DVDPRW;
-
-                                    break;
-                                case DiskCategory.DVDPRWDL:
-                                    dskType = MediaType.DVDPRWDL;
-
-                                    break;
-                                case DiskCategory.DVDR:
-                                    dskType = decPfi.PartVersion >= 6 ? MediaType.DVDRDL : MediaType.DVDR;
-
-                                    break;
-                                case DiskCategory.DVDRAM:
-                                    dskType = MediaType.DVDRAM;
-
-                                    break;
-                                default:
-                                    dskType = MediaType.DVDROM;
-
-                                    break;
-                                case DiskCategory.DVDRW:
-                                    dskType = decPfi.PartVersion >= 15 ? MediaType.DVDRWDL : MediaType.DVDRW;
-
-                                    break;
-                                case DiskCategory.HDDVDR:
-                                    dskType = MediaType.HDDVDR;
-
-                                    break;
-                                case DiskCategory.HDDVDRAM:
-                                    dskType = MediaType.HDDVDRAM;
-
-                                    break;
-                                case DiskCategory.HDDVDROM:
-                                    dskType = MediaType.HDDVDROM;
-
-                                    break;
-                                case DiskCategory.HDDVDRW:
-                                    dskType = MediaType.HDDVDRW;
-
-                                    break;
-                                case DiskCategory.Nintendo:
-                                    dskType = decPfi.DiscSize == DVDSize.Eighty ? MediaType.GOD : MediaType.WOD;
-
-                                    break;
-                                case DiskCategory.UMD:
-                                    dskType = MediaType.UMD;
-
-                                    break;
-                            }
-                        }
-                    }
-
-                    _dumpLog.WriteLine("Reading Disc Manufacturing Information");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.DiscManufacturingInformation, 0, _dev.Timeout,
-                                                   out _);
-
-                    if(!sense)
-                    {
-                        if(DMI.IsXbox(cmdBuf) ||
-                           DMI.IsXbox360(cmdBuf))
-                        {
-                            if(DMI.IsXbox(cmdBuf))
-                            {
-                                dskType = MediaType.XGD;
-                            }
-                            else if(DMI.IsXbox360(cmdBuf))
-                            {
-                                dskType = MediaType.XGD2;
-
-                                // All XGD3 all have the same number of blocks
-                                if(blocks + 1 == 25063   || // Locked (or non compatible drive)
-                                   blocks + 1 == 4229664 || // Xtreme unlock
-                                   blocks + 1 == 4246304)   // Wxripper unlock
-                                    dskType = MediaType.XGD3;
-                            }
-
-                            isXbox = true;
-
-                            sense = _dev.ScsiInquiry(out byte[] inqBuf, out _);
-
-                            if(sense || Inquiry.Decode(inqBuf)?.KreonPresent != true)
-                            {
-                                _dumpLog.WriteLine("Dumping Xbox Game Discs requires a drive with Kreon firmware.");
-
-                                StoppingErrorMessage?.
-                                    Invoke("Dumping Xbox Game Discs requires a drive with Kreon firmware.");
-
-                                if(!_force)
-                                    return;
-
-                                isXbox = false;
-                            }
-
-                            if(_dumpRaw && !_force)
-                            {
-                                StoppingErrorMessage?.
-                                    Invoke("Not continuing. If you want to continue reading cooked data when raw is not available use the force option.");
-
-                                // TODO: Exit more gracefully
-                                return;
-                            }
-                        }
-
-                        if(cmdBuf.Length == 2052)
-                        {
-                            tmpBuf = new byte[cmdBuf.Length - 4];
-                            Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                            mediaTags.Add(MediaTagType.DVD_DMI, tmpBuf);
-                        }
-                    }
-
-                    break;
-            }
-            #endregion Nintendo
-
-            #region All DVD and HD DVD types
-            #endregion All DVD and HD DVD types
-
-            #region DVD-ROM
-            if(dskType == MediaType.DVDDownload ||
-               dskType == MediaType.DVDROM)
-            {
-                _dumpLog.WriteLine("Reading Lead-in Copyright Information.");
-
-                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                               MmcDiscStructureFormat.CopyrightInformation, 0, _dev.Timeout, out _);
-
-                if(!sense)
-                    if(CSS_CPRM.DecodeLeadInCopyright(cmdBuf).HasValue)
+                    if(cmdBuf.Length == 2052)
                     {
                         tmpBuf = new byte[cmdBuf.Length - 4];
                         Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.DVD_CMI, tmpBuf);
+                        mediaTags.Add(MediaTagType.DVD_DMI, tmpBuf);
+                    }
+                }
 
-                        CSS_CPRM.LeadInCopyright? cmi = CSS_CPRM.DecodeLeadInCopyright(cmdBuf);
+                break;
+        }
+        #endregion Nintendo
 
-                        if(cmi?.CopyrightType == CopyrightType.NoProtection)
-                            UpdateStatus?.Invoke("Drive reports no copy protection on disc.");
+        #region All DVD and HD DVD types
+        #endregion All DVD and HD DVD types
+
+        #region DVD-ROM
+        if(dskType == MediaType.DVDDownload ||
+           dskType == MediaType.DVDROM)
+        {
+            _dumpLog.WriteLine("Reading Lead-in Copyright Information.");
+
+            sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                           MmcDiscStructureFormat.CopyrightInformation, 0, _dev.Timeout, out _);
+
+            if(!sense)
+                if(CSS_CPRM.DecodeLeadInCopyright(cmdBuf).HasValue)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.DVD_CMI, tmpBuf);
+
+                    CSS_CPRM.LeadInCopyright? cmi = CSS_CPRM.DecodeLeadInCopyright(cmdBuf);
+
+                    if(cmi?.CopyrightType == CopyrightType.NoProtection)
+                        UpdateStatus?.Invoke("Drive reports no copy protection on disc.");
+                    else
+                    {
+                        if(!Settings.Settings.Current.EnableDecryption)
+                            UpdateStatus?.Invoke("Drive reports the disc uses copy protection. " +
+                                                 "The dump will be incorrect unless decryption is enabled.");
                         else
                         {
-                            if(!Settings.Settings.Current.EnableDecryption)
-                                UpdateStatus?.Invoke("Drive reports the disc uses copy protection. " +
-                                                     "The dump will be incorrect unless decryption is enabled.");
-                            else
+                            if(cmi?.CopyrightType == CopyrightType.CSS)
                             {
-                                if(cmi?.CopyrightType == CopyrightType.CSS)
+                                UpdateStatus?.Invoke("Drive reports disc uses CSS copy protection.");
+
+                                dvdDecrypt = new DVDDecryption(_dev);
+
+                                sense = dvdDecrypt.ReadBusKey(out cmdBuf, out _,
+                                                              CSS_CPRM.DecodeLeadInCopyright(cmdBuf)?.
+                                                                       CopyrightType ?? CopyrightType.NoProtection,
+                                                              _dev.Timeout, out _);
+
+                                if(!sense)
                                 {
-                                    UpdateStatus?.Invoke("Drive reports disc uses CSS copy protection.");
+                                    byte[] busKey = cmdBuf;
 
-                                    dvdDecrypt = new DVDDecryption(_dev);
-
-                                    sense = dvdDecrypt.ReadBusKey(out cmdBuf, out _,
-                                                                  CSS_CPRM.DecodeLeadInCopyright(cmdBuf)?.
-                                                                           CopyrightType ?? CopyrightType.NoProtection,
-                                                                  _dev.Timeout, out _);
+                                    UpdateStatus?.Invoke("Reading disc key.");
+                                    sense = dvdDecrypt.ReadDiscKey(out cmdBuf, out _, _dev.Timeout, out _);
 
                                     if(!sense)
                                     {
-                                        byte[] busKey = cmdBuf;
+                                        CSS_CPRM.DiscKey? decodedDiscKey = CSS.DecodeDiscKey(cmdBuf, busKey);
 
-                                        UpdateStatus?.Invoke("Reading disc key.");
-                                        sense = dvdDecrypt.ReadDiscKey(out cmdBuf, out _, _dev.Timeout, out _);
+                                        sense = dvdDecrypt.ReadAsf(out cmdBuf, out _,
+                                                                   DvdCssKeyClass.DvdCssCppmOrCprm, _dev.Timeout,
+                                                                   out _);
 
                                         if(!sense)
                                         {
-                                            CSS_CPRM.DiscKey? decodedDiscKey = CSS.DecodeDiscKey(cmdBuf, busKey);
-
-                                            sense = dvdDecrypt.ReadAsf(out cmdBuf, out _,
-                                                                       DvdCssKeyClass.DvdCssCppmOrCprm, _dev.Timeout,
-                                                                       out _);
-
-                                            if(!sense)
+                                            if(cmdBuf[7] == 1)
                                             {
-                                                if(cmdBuf[7] == 1)
+                                                UpdateStatus?.Invoke("Disc and drive authentication succeeded.");
+
+                                                sense = dvdDecrypt.ReadRpc(out cmdBuf, out _,
+                                                                           DvdCssKeyClass.DvdCssCppmOrCprm,
+                                                                           _dev.Timeout, out _);
+
+                                                if(!sense)
                                                 {
-                                                    UpdateStatus?.Invoke("Disc and drive authentication succeeded.");
+                                                    CSS_CPRM.RegionalPlaybackControlState? rpc =
+                                                        CSS_CPRM.DecodeRegionalPlaybackControlState(cmdBuf);
 
-                                                    sense = dvdDecrypt.ReadRpc(out cmdBuf, out _,
-                                                                               DvdCssKeyClass.DvdCssCppmOrCprm,
-                                                                               _dev.Timeout, out _);
-
-                                                    if(!sense)
+                                                    if(rpc.HasValue)
                                                     {
-                                                        CSS_CPRM.RegionalPlaybackControlState? rpc =
-                                                            CSS_CPRM.DecodeRegionalPlaybackControlState(cmdBuf);
-
-                                                        if(rpc.HasValue)
-                                                        {
-                                                            UpdateStatus?.Invoke(CSS.CheckRegion(rpc.Value, cmi.Value)
-                                                                ? "Disc and drive regions match."
-                                                                : "Disc and drive regions do not match. The dump will be incorrect");
-                                                        }
+                                                        UpdateStatus?.Invoke(CSS.CheckRegion(rpc.Value, cmi.Value)
+                                                                                 ? "Disc and drive regions match."
+                                                                                 : "Disc and drive regions do not match. The dump will be incorrect");
                                                     }
+                                                }
 
-                                                    if(decodedDiscKey.HasValue)
+                                                if(decodedDiscKey.HasValue)
+                                                {
+                                                    mediaTags.Add(MediaTagType.DVD_DiscKey,
+                                                                  decodedDiscKey.Value.Key);
+
+                                                    UpdateStatus?.Invoke("Decrypting disc key.");
+
+                                                    CSS.DecryptDiscKey(decodedDiscKey.Value.Key,
+                                                                       out byte[] discKey);
+
+                                                    if(discKey != null)
                                                     {
-                                                        mediaTags.Add(MediaTagType.DVD_DiscKey,
-                                                                      decodedDiscKey.Value.Key);
-
-                                                        UpdateStatus?.Invoke("Decrypting disc key.");
-
-                                                        CSS.DecryptDiscKey(decodedDiscKey.Value.Key,
-                                                                           out byte[] discKey);
-
-                                                        if(discKey != null)
-                                                        {
-                                                            UpdateStatus?.Invoke("Decryption of disc key succeeded.");
-                                                            mediaTags.Add(MediaTagType.DVD_DiscKey_Decrypted, discKey);
-                                                        }
-                                                        else
-                                                            UpdateStatus?.Invoke("Decryption of disc key failed.");
+                                                        UpdateStatus?.Invoke("Decryption of disc key succeeded.");
+                                                        mediaTags.Add(MediaTagType.DVD_DiscKey_Decrypted, discKey);
                                                     }
+                                                    else
+                                                        UpdateStatus?.Invoke("Decryption of disc key failed.");
                                                 }
                                             }
                                         }
                                     }
                                 }
-                                else
-                                {
-                                    UpdateStatus?.
-                                        Invoke($"Drive reports disc uses {(CSS_CPRM.DecodeLeadInCopyright(cmdBuf)?.CopyrightType ?? CopyrightType.NoProtection).ToString()} copy protection. " +
-                                               "This is not yet supported and the dump will be incorrect.");
-                                }
+                            }
+                            else
+                            {
+                                UpdateStatus?.
+                                    Invoke($"Drive reports disc uses {(CSS_CPRM.DecodeLeadInCopyright(cmdBuf)?.CopyrightType ?? CopyrightType.NoProtection).ToString()} copy protection. " +
+                                           "This is not yet supported and the dump will be incorrect.");
                             }
                         }
                     }
-            }
-            #endregion DVD-ROM
+                }
+        }
+        #endregion DVD-ROM
 
-            switch(dskType)
-            {
-                #region DVD-ROM and HD DVD-ROM
-                case MediaType.DVDDownload:
-                case MediaType.DVDROM:
-                case MediaType.HDDVDROM:
-                    _dumpLog.WriteLine("Reading Burst Cutting Area.");
+        switch(dskType)
+        {
+            #region DVD-ROM and HD DVD-ROM
+            case MediaType.DVDDownload:
+            case MediaType.DVDROM:
+            case MediaType.HDDVDROM:
+                _dumpLog.WriteLine("Reading Burst Cutting Area.");
 
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.BurstCuttingArea, 0, _dev.Timeout, out _);
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.BurstCuttingArea, 0, _dev.Timeout, out _);
 
-                    if(!sense)
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.DVD_BCA, tmpBuf);
+                }
+
+                break;
+            #endregion DVD-ROM and HD DVD-ROM
+
+            #region DVD-RAM and HD DVD-RAM
+            case MediaType.DVDRAM:
+            case MediaType.HDDVDRAM:
+                _dumpLog.WriteLine("Reading Disc Description Structure.");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.DvdramDds, 0, _dev.Timeout, out _);
+
+                if(!sense)
+                    if(DDS.Decode(cmdBuf).HasValue)
                     {
                         tmpBuf = new byte[cmdBuf.Length - 4];
                         Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.DVD_BCA, tmpBuf);
+                        mediaTags.Add(MediaTagType.DVDRAM_DDS, tmpBuf);
                     }
 
-                    break;
-                #endregion DVD-ROM and HD DVD-ROM
+                _dumpLog.WriteLine("Reading Spare Area Information.");
 
-                #region DVD-RAM and HD DVD-RAM
-                case MediaType.DVDRAM:
-                case MediaType.HDDVDRAM:
-                    _dumpLog.WriteLine("Reading Disc Description Structure.");
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, _dev.Timeout,
+                                               out _);
 
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.DvdramDds, 0, _dev.Timeout, out _);
-
-                    if(!sense)
-                        if(DDS.Decode(cmdBuf).HasValue)
-                        {
-                            tmpBuf = new byte[cmdBuf.Length - 4];
-                            Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                            mediaTags.Add(MediaTagType.DVDRAM_DDS, tmpBuf);
-                        }
-
-                    _dumpLog.WriteLine("Reading Spare Area Information.");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, _dev.Timeout,
-                                                   out _);
-
-                    if(!sense)
-                        if(Spare.Decode(cmdBuf).HasValue)
-                        {
-                            tmpBuf = new byte[cmdBuf.Length - 4];
-                            Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                            mediaTags.Add(MediaTagType.DVDRAM_SpareArea, tmpBuf);
-                        }
-
-                    break;
-                #endregion DVD-RAM and HD DVD-RAM
-
-                #region DVD-R and DVD-RW
-                case MediaType.DVDR:
-                case MediaType.DVDRW:
-                    _dumpLog.WriteLine("Reading Pre-Recorded Information.");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.PreRecordedInfo, 0, _dev.Timeout, out _);
-
-                    if(!sense)
+                if(!sense)
+                    if(Spare.Decode(cmdBuf).HasValue)
                     {
                         tmpBuf = new byte[cmdBuf.Length - 4];
                         Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.DVDR_PreRecordedInfo, tmpBuf);
+                        mediaTags.Add(MediaTagType.DVDRAM_SpareArea, tmpBuf);
                     }
 
-                    break;
-                #endregion DVD-R and DVD-RW
-            }
+                break;
+            #endregion DVD-RAM and HD DVD-RAM
 
-            switch(dskType)
-            {
-                #region DVD-R, DVD-RW and HD DVD-R
-                case MediaType.DVDR:
-                case MediaType.DVDRW:
-                case MediaType.HDDVDR:
-                    _dumpLog.WriteLine("Reading Media Identifier.");
+            #region DVD-R and DVD-RW
+            case MediaType.DVDR:
+            case MediaType.DVDRW:
+                _dumpLog.WriteLine("Reading Pre-Recorded Information.");
 
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.DvdrMediaIdentifier, 0, _dev.Timeout, out _);
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.PreRecordedInfo, 0, _dev.Timeout, out _);
 
-                    if(!sense)
-                    {
-                        tmpBuf = new byte[cmdBuf.Length - 4];
-                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.DVDR_MediaIdentifier, tmpBuf);
-                    }
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.DVDR_PreRecordedInfo, tmpBuf);
+                }
 
-                    _dumpLog.WriteLine("Reading Recordable Physical Information.");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.DvdrPhysicalInformation, 0, _dev.Timeout,
-                                                   out _);
-
-                    if(!sense)
-                    {
-                        tmpBuf = new byte[cmdBuf.Length - 4];
-                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.DVDR_PFI, tmpBuf);
-                    }
-
-                    break;
-                #endregion DVD-R, DVD-RW and HD DVD-R
-
-                #region All DVD+
-                case MediaType.DVDPR:
-                case MediaType.DVDPRDL:
-                case MediaType.DVDPRW:
-                case MediaType.DVDPRWDL:
-                    _dumpLog.WriteLine("Reading ADdress In Pregroove.");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.Adip, 0, _dev.Timeout, out _);
-
-                    if(!sense)
-                    {
-                        tmpBuf = new byte[cmdBuf.Length - 4];
-                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.DVD_ADIP, tmpBuf);
-                    }
-
-                    _dumpLog.WriteLine("Reading Disc Control Blocks.");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.Dcb, 0, _dev.Timeout, out _);
-
-                    if(!sense)
-                    {
-                        tmpBuf = new byte[cmdBuf.Length - 4];
-                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.DCB, tmpBuf);
-                    }
-
-                    break;
-                #endregion All DVD+
-
-                #region HD DVD-ROM
-                case MediaType.HDDVDROM:
-                    _dumpLog.WriteLine("Reading Lead-in Copyright Information.");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                   MmcDiscStructureFormat.HddvdCopyrightInformation, 0, _dev.Timeout,
-                                                   out _);
-
-                    if(!sense)
-                    {
-                        tmpBuf = new byte[cmdBuf.Length - 4];
-                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.HDDVD_CPI, tmpBuf);
-                    }
-
-                    break;
-                #endregion HD DVD-ROM
-
-                #region All Blu-ray
-                case MediaType.BDR:
-                case MediaType.BDRE:
-                case MediaType.BDROM:
-                case MediaType.BDRXL:
-                case MediaType.BDREXL:
-                case MediaType.UHDBD:
-                    _dumpLog.WriteLine("Reading Disc Information.");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                   MmcDiscStructureFormat.DiscInformation, 0, _dev.Timeout, out _);
-
-                    if(!sense)
-                        if(DI.Decode(cmdBuf).HasValue)
-                        {
-                            tmpBuf = new byte[cmdBuf.Length - 4];
-                            Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                            mediaTags.Add(MediaTagType.BD_DI, tmpBuf);
-                        }
-
-                    // TODO: PAC
-                    /*
-                    dumpLog.WriteLine("Reading PAC.");
-                    sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                  MmcDiscStructureFormat.Pac, 0, dev.Timeout, out _);
-                    if(!sense)
-                    {
-                        tmpBuf = new byte[cmdBuf.Length - 4];
-                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.PAC, tmpBuf);
-                    }*/
-                    break;
-                #endregion All Blu-ray
-            }
-
-            switch(dskType)
-            {
-                #region BD-ROM only
-                case MediaType.BDROM:
-                case MediaType.UHDBD:
-                    _dumpLog.WriteLine("Reading Burst Cutting Area.");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                   MmcDiscStructureFormat.BdBurstCuttingArea, 0, _dev.Timeout, out _);
-
-                    if(!sense)
-                    {
-                        tmpBuf = new byte[cmdBuf.Length - 4];
-                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.BD_BCA, tmpBuf);
-                    }
-
-                    break;
-                #endregion BD-ROM only
-
-                #region Writable Blu-ray only
-                case MediaType.BDR:
-                case MediaType.BDRE:
-                case MediaType.BDRXL:
-                case MediaType.BDREXL:
-                    _dumpLog.WriteLine("Reading Disc Definition Structure.");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                   MmcDiscStructureFormat.BdDds, 0, _dev.Timeout, out _);
-
-                    if(!sense)
-                    {
-                        tmpBuf = new byte[cmdBuf.Length - 4];
-                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.BD_DDS, tmpBuf);
-                    }
-
-                    _dumpLog.WriteLine("Reading Spare Area Information.");
-
-                    sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                   MmcDiscStructureFormat.BdSpareAreaInformation, 0, _dev.Timeout,
-                                                   out _);
-
-                    if(!sense)
-                    {
-                        tmpBuf = new byte[cmdBuf.Length - 4];
-                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
-                        mediaTags.Add(MediaTagType.BD_SpareArea, tmpBuf);
-                    }
-
-                    break;
-                #endregion Writable Blu-ray only
-            }
-
-            if(isXbox)
-            {
-                Xgd(mediaTags, dskType);
-
-                return;
-            }
-
-            Sbc(mediaTags, dskType, true, dvdDecrypt);
+                break;
+            #endregion DVD-R and DVD-RW
         }
 
-        // TODO: Move somewhere else
-        internal static void AddMediaTagToSidecar(string outputPath, MediaTagType tagType, byte[] tag,
-                                                  ref CICMMetadataType sidecar)
+        switch(dskType)
         {
-            switch(tagType)
-            {
-                case MediaTagType.DVD_PFI:
-                    sidecar.OpticalDisc[0].PFI = new DumpType
+            #region DVD-R, DVD-RW and HD DVD-R
+            case MediaType.DVDR:
+            case MediaType.DVDRW:
+            case MediaType.HDDVDR:
+                _dumpLog.WriteLine("Reading Media Identifier.");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.DvdrMediaIdentifier, 0, _dev.Timeout, out _);
+
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.DVDR_MediaIdentifier, tmpBuf);
+                }
+
+                _dumpLog.WriteLine("Reading Recordable Physical Information.");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.DvdrPhysicalInformation, 0, _dev.Timeout,
+                                               out _);
+
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.DVDR_PFI, tmpBuf);
+                }
+
+                break;
+            #endregion DVD-R, DVD-RW and HD DVD-R
+
+            #region All DVD+
+            case MediaType.DVDPR:
+            case MediaType.DVDPRDL:
+            case MediaType.DVDPRW:
+            case MediaType.DVDPRWDL:
+                _dumpLog.WriteLine("Reading ADdress In Pregroove.");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.Adip, 0, _dev.Timeout, out _);
+
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.DVD_ADIP, tmpBuf);
+                }
+
+                _dumpLog.WriteLine("Reading Disc Control Blocks.");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.Dcb, 0, _dev.Timeout, out _);
+
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.DCB, tmpBuf);
+                }
+
+                break;
+            #endregion All DVD+
+
+            #region HD DVD-ROM
+            case MediaType.HDDVDROM:
+                _dumpLog.WriteLine("Reading Lead-in Copyright Information.");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                               MmcDiscStructureFormat.HddvdCopyrightInformation, 0, _dev.Timeout,
+                                               out _);
+
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.HDDVD_CPI, tmpBuf);
+                }
+
+                break;
+            #endregion HD DVD-ROM
+
+            #region All Blu-ray
+            case MediaType.BDR:
+            case MediaType.BDRE:
+            case MediaType.BDROM:
+            case MediaType.BDRXL:
+            case MediaType.BDREXL:
+            case MediaType.UHDBD:
+                _dumpLog.WriteLine("Reading Disc Information.");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
+                                               MmcDiscStructureFormat.DiscInformation, 0, _dev.Timeout, out _);
+
+                if(!sense)
+                    if(DI.Decode(cmdBuf).HasValue)
                     {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
+                        tmpBuf = new byte[cmdBuf.Length - 4];
+                        Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                        mediaTags.Add(MediaTagType.BD_DI, tmpBuf);
+                    }
 
-                    break;
-                case MediaTagType.DVD_DMI:
-                    sidecar.OpticalDisc[0].DMI = new DumpType
+                // TODO: PAC
+                /*
+                dumpLog.WriteLine("Reading PAC.");
+                sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
+                                              MmcDiscStructureFormat.Pac, 0, dev.Timeout, out _);
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.PAC, tmpBuf);
+                }*/
+                break;
+            #endregion All Blu-ray
+        }
+
+        switch(dskType)
+        {
+            #region BD-ROM only
+            case MediaType.BDROM:
+            case MediaType.UHDBD:
+                _dumpLog.WriteLine("Reading Burst Cutting Area.");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
+                                               MmcDiscStructureFormat.BdBurstCuttingArea, 0, _dev.Timeout, out _);
+
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.BD_BCA, tmpBuf);
+                }
+
+                break;
+            #endregion BD-ROM only
+
+            #region Writable Blu-ray only
+            case MediaType.BDR:
+            case MediaType.BDRE:
+            case MediaType.BDRXL:
+            case MediaType.BDREXL:
+                _dumpLog.WriteLine("Reading Disc Definition Structure.");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
+                                               MmcDiscStructureFormat.BdDds, 0, _dev.Timeout, out _);
+
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.BD_DDS, tmpBuf);
+                }
+
+                _dumpLog.WriteLine("Reading Spare Area Information.");
+
+                sense = _dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
+                                               MmcDiscStructureFormat.BdSpareAreaInformation, 0, _dev.Timeout,
+                                               out _);
+
+                if(!sense)
+                {
+                    tmpBuf = new byte[cmdBuf.Length - 4];
+                    Array.Copy(cmdBuf, 4, tmpBuf, 0, cmdBuf.Length - 4);
+                    mediaTags.Add(MediaTagType.BD_SpareArea, tmpBuf);
+                }
+
+                break;
+            #endregion Writable Blu-ray only
+        }
+
+        if(isXbox)
+        {
+            Xgd(mediaTags, dskType);
+
+            return;
+        }
+
+        Sbc(mediaTags, dskType, true, dvdDecrypt);
+    }
+
+    // TODO: Move somewhere else
+    internal static void AddMediaTagToSidecar(string outputPath, MediaTagType tagType, byte[] tag,
+                                              ref CICMMetadataType sidecar)
+    {
+        switch(tagType)
+        {
+            case MediaTagType.DVD_PFI:
+                sidecar.OpticalDisc[0].PFI = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.DVD_DMI:
+                sidecar.OpticalDisc[0].DMI = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.DVD_CMI:
+            case MediaTagType.HDDVD_CPI:
+                sidecar.OpticalDisc[0].CMI = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                byte[] tmp = new byte[tag.Length + 4];
+                Array.Copy(tag, 0, tmp, 4, tag.Length);
+                tmp[0] = (byte)((tag.Length & 0xFF00) >> 8);
+                tmp[1] = (byte)(tag.Length & 0xFF);
+
+                CSS_CPRM.LeadInCopyright? cpy = CSS_CPRM.DecodeLeadInCopyright(tmp);
+
+                if(cpy.HasValue &&
+                   cpy.Value.CopyrightType != CopyrightType.NoProtection)
+                    sidecar.OpticalDisc[0].CopyProtection = cpy.Value.CopyrightType.ToString();
+
+                break;
+            case MediaTagType.DVD_BCA:
+            case MediaTagType.BD_BCA:
+                sidecar.OpticalDisc[0].BCA = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.BD_DDS:
+            case MediaTagType.DVDRAM_DDS:
+                sidecar.OpticalDisc[0].DDS = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.DVDRAM_SpareArea:
+            case MediaTagType.BD_SpareArea:
+                sidecar.OpticalDisc[0].SAI = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.DVDR_PreRecordedInfo:
+                sidecar.OpticalDisc[0].PRI = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.DVD_MediaIdentifier:
+                sidecar.OpticalDisc[0].MediaID = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.DVDR_PFI:
+                sidecar.OpticalDisc[0].PFIR = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.DVD_ADIP:
+                sidecar.OpticalDisc[0].ADIP = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.DCB:
+                sidecar.OpticalDisc[0].DCB = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.BD_DI:
+                sidecar.OpticalDisc[0].DI = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.Xbox_SecuritySector:
+                sidecar.OpticalDisc[0].Xbox ??= new XboxType();
+
+                sidecar.OpticalDisc[0].Xbox.SecuritySectors = new[]
+                {
+                    new XboxSecuritySectorsType
                     {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.DVD_CMI:
-                case MediaTagType.HDDVD_CPI:
-                    sidecar.OpticalDisc[0].CMI = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    byte[] tmp = new byte[tag.Length + 4];
-                    Array.Copy(tag, 0, tmp, 4, tag.Length);
-                    tmp[0] = (byte)((tag.Length & 0xFF00) >> 8);
-                    tmp[1] = (byte)(tag.Length & 0xFF);
-
-                    CSS_CPRM.LeadInCopyright? cpy = CSS_CPRM.DecodeLeadInCopyright(tmp);
-
-                    if(cpy.HasValue &&
-                       cpy.Value.CopyrightType != CopyrightType.NoProtection)
-                        sidecar.OpticalDisc[0].CopyProtection = cpy.Value.CopyrightType.ToString();
-
-                    break;
-                case MediaTagType.DVD_BCA:
-                case MediaTagType.BD_BCA:
-                    sidecar.OpticalDisc[0].BCA = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.BD_DDS:
-                case MediaTagType.DVDRAM_DDS:
-                    sidecar.OpticalDisc[0].DDS = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.DVDRAM_SpareArea:
-                case MediaTagType.BD_SpareArea:
-                    sidecar.OpticalDisc[0].SAI = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.DVDR_PreRecordedInfo:
-                    sidecar.OpticalDisc[0].PRI = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.DVD_MediaIdentifier:
-                    sidecar.OpticalDisc[0].MediaID = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.DVDR_PFI:
-                    sidecar.OpticalDisc[0].PFIR = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.DVD_ADIP:
-                    sidecar.OpticalDisc[0].ADIP = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.DCB:
-                    sidecar.OpticalDisc[0].DCB = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.BD_DI:
-                    sidecar.OpticalDisc[0].DI = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.Xbox_SecuritySector:
-                    sidecar.OpticalDisc[0].Xbox ??= new XboxType();
-
-                    sidecar.OpticalDisc[0].Xbox.SecuritySectors = new[]
-                    {
-                        new XboxSecuritySectorsType
-                        {
-                            RequestNumber  = 0,
-                            RequestVersion = 1,
-                            SecuritySectors = new DumpType
-                            {
-                                Image     = outputPath,
-                                Size      = (ulong)tag.Length,
-                                Checksums = Checksum.GetChecksums(tag).ToArray()
-                            }
-                        }
-                    };
-
-                    break;
-                case MediaTagType.Xbox_PFI:
-                    sidecar.OpticalDisc[0].Xbox ??= new XboxType();
-
-                    sidecar.OpticalDisc[0].Xbox.PFI = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.Xbox_DMI:
-                    sidecar.OpticalDisc[0].Xbox ??= new XboxType();
-
-                    sidecar.OpticalDisc[0].Xbox.DMI = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.CD_FullTOC:
-                    sidecar.OpticalDisc[0].TOC = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.CD_ATIP:
-                    sidecar.OpticalDisc[0].ATIP = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.CD_PMA:
-                    sidecar.OpticalDisc[0].PMA = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.CD_TEXT:
-                    sidecar.OpticalDisc[0].LeadInCdText = new DumpType
-                    {
-                        Image     = outputPath,
-                        Size      = (ulong)tag.Length,
-                        Checksums = Checksum.GetChecksums(tag).ToArray()
-                    };
-
-                    break;
-                case MediaTagType.CD_FirstTrackPregap:
-                    sidecar.OpticalDisc[0].FirstTrackPregrap = new[]
-                    {
-                        new BorderType
+                        RequestNumber  = 0,
+                        RequestVersion = 1,
+                        SecuritySectors = new DumpType
                         {
                             Image     = outputPath,
                             Size      = (ulong)tag.Length,
                             Checksums = Checksum.GetChecksums(tag).ToArray()
                         }
-                    };
+                    }
+                };
 
-                    break;
-                case MediaTagType.CD_LeadIn:
-                    sidecar.OpticalDisc[0].LeadIn = new[]
+                break;
+            case MediaTagType.Xbox_PFI:
+                sidecar.OpticalDisc[0].Xbox ??= new XboxType();
+
+                sidecar.OpticalDisc[0].Xbox.PFI = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.Xbox_DMI:
+                sidecar.OpticalDisc[0].Xbox ??= new XboxType();
+
+                sidecar.OpticalDisc[0].Xbox.DMI = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.CD_FullTOC:
+                sidecar.OpticalDisc[0].TOC = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.CD_ATIP:
+                sidecar.OpticalDisc[0].ATIP = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.CD_PMA:
+                sidecar.OpticalDisc[0].PMA = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.CD_TEXT:
+                sidecar.OpticalDisc[0].LeadInCdText = new DumpType
+                {
+                    Image     = outputPath,
+                    Size      = (ulong)tag.Length,
+                    Checksums = Checksum.GetChecksums(tag).ToArray()
+                };
+
+                break;
+            case MediaTagType.CD_FirstTrackPregap:
+                sidecar.OpticalDisc[0].FirstTrackPregrap = new[]
+                {
+                    new BorderType
                     {
-                        new BorderType
-                        {
-                            Image     = outputPath,
-                            Size      = (ulong)tag.Length,
-                            Checksums = Checksum.GetChecksums(tag).ToArray()
-                        }
-                    };
+                        Image     = outputPath,
+                        Size      = (ulong)tag.Length,
+                        Checksums = Checksum.GetChecksums(tag).ToArray()
+                    }
+                };
 
-                    break;
-            }
+                break;
+            case MediaTagType.CD_LeadIn:
+                sidecar.OpticalDisc[0].LeadIn = new[]
+                {
+                    new BorderType
+                    {
+                        Image     = outputPath,
+                        Size      = (ulong)tag.Length,
+                        Checksums = Checksum.GetChecksums(tag).ToArray()
+                    }
+                };
+
+                break;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/Metadata.cs b/Aaru.Core/Devices/Dumping/Metadata.cs
index 5fcc5fdf8..2fe54bc0f 100644
--- a/Aaru.Core/Devices/Dumping/Metadata.cs
+++ b/Aaru.Core/Devices/Dumping/Metadata.cs
@@ -42,109 +42,108 @@ using Aaru.CommonTypes.Metadata;
 using Schemas;
 using MediaType = Aaru.CommonTypes.MediaType;
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Creates optical metadata sidecar</summary>
+    /// <param name="blockSize">Size of the read sector in bytes</param>
+    /// <param name="blocks">Total number of positive sectors</param>
+    /// <param name="mediaType">Disc type</param>
+    /// <param name="layers">Disc layers</param>
+    /// <param name="mediaTags">Media tags</param>
+    /// <param name="sessions">Disc sessions</param>
+    /// <param name="totalChkDuration">Total time spent doing checksums</param>
+    /// <param name="discOffset">Disc write offset</param>
+    void WriteOpticalSidecar(uint blockSize, ulong blocks, MediaType mediaType, LayersType layers,
+                             Dictionary<MediaTagType, byte[]> mediaTags, int sessions, out double totalChkDuration,
+                             int? discOffset)
     {
-        /// <summary>Creates optical metadata sidecar</summary>
-        /// <param name="blockSize">Size of the read sector in bytes</param>
-        /// <param name="blocks">Total number of positive sectors</param>
-        /// <param name="mediaType">Disc type</param>
-        /// <param name="layers">Disc layers</param>
-        /// <param name="mediaTags">Media tags</param>
-        /// <param name="sessions">Disc sessions</param>
-        /// <param name="totalChkDuration">Total time spent doing checksums</param>
-        /// <param name="discOffset">Disc write offset</param>
-        void WriteOpticalSidecar(uint blockSize, ulong blocks, MediaType mediaType, LayersType layers,
-                                 Dictionary<MediaTagType, byte[]> mediaTags, int sessions, out double totalChkDuration,
-                                 int? discOffset)
+        _dumpLog.WriteLine("Creating sidecar.");
+        var         filters     = new FiltersList();
+        IFilter     filter      = filters.GetFilter(_outputPath);
+        IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
+        totalChkDuration = 0;
+        ErrorNumber opened = inputPlugin.Open(filter);
+
+        if(opened != ErrorNumber.NoError)
         {
-            _dumpLog.WriteLine("Creating sidecar.");
-            var         filters     = new FiltersList();
-            IFilter     filter      = filters.GetFilter(_outputPath);
-            IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
-            totalChkDuration = 0;
-            ErrorNumber opened = inputPlugin.Open(filter);
+            StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
 
-            if(opened != ErrorNumber.NoError)
-            {
-                StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
-
-                return;
-            }
-
-            DateTime chkStart = DateTime.UtcNow;
-
-            // ReSharper disable once UseObjectOrCollectionInitializer
-            _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
-            _sidecarClass.InitProgressEvent    += InitProgress;
-            _sidecarClass.UpdateProgressEvent  += UpdateProgress;
-            _sidecarClass.EndProgressEvent     += EndProgress;
-            _sidecarClass.InitProgressEvent2   += InitProgress2;
-            _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
-            _sidecarClass.EndProgressEvent2    += EndProgress2;
-            _sidecarClass.UpdateStatusEvent    += UpdateStatus;
-            CICMMetadataType sidecar = _sidecarClass.Create();
-            DateTime         end     = DateTime.UtcNow;
-
-            if(_aborted)
-                return;
-
-            totalChkDuration = (end - chkStart).TotalMilliseconds;
-            _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
-
-            _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
-
-            if(_preSidecar != null)
-            {
-                _preSidecar.OpticalDisc = sidecar.OpticalDisc;
-                sidecar                 = _preSidecar;
-            }
-
-            List<(ulong start, string type)> filesystems = new();
-
-            if(sidecar.OpticalDisc[0].Track != null)
-                filesystems.AddRange(from xmlTrack in sidecar.OpticalDisc[0].Track
-                                     where xmlTrack.FileSystemInformation != null
-                                     from partition in xmlTrack.FileSystemInformation
-                                     where partition.FileSystems != null from fileSystem in partition.FileSystems
-                                     select (partition.StartSector, fileSystem.Type));
-
-            if(filesystems.Count > 0)
-                foreach(var filesystem in filesystems.Select(o => new
-                {
-                    o.start,
-                    o.type
-                }).Distinct())
-                    _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start);
-
-            sidecar.OpticalDisc[0].Dimensions = Dimensions.DimensionsFromMediaType(mediaType);
-            (string type, string subType) discType = CommonTypes.Metadata.MediaType.MediaTypeToString(mediaType);
-            sidecar.OpticalDisc[0].DiscType          = discType.type;
-            sidecar.OpticalDisc[0].DiscSubType       = discType.subType;
-            sidecar.OpticalDisc[0].DumpHardwareArray = _resume.Tries.ToArray();
-            sidecar.OpticalDisc[0].Sessions          = (uint)sessions;
-            sidecar.OpticalDisc[0].Layers            = layers;
-
-            if(discOffset.HasValue)
-            {
-                sidecar.OpticalDisc[0].Offset          = (int)(discOffset / 4);
-                sidecar.OpticalDisc[0].OffsetSpecified = true;
-            }
-
-            if(mediaTags != null)
-                foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags.Where(tag => _outputPlugin.
-                    SupportedMediaTags.Contains(tag.Key)))
-                    AddMediaTagToSidecar(_outputPath, tag.Key, tag.Value, ref sidecar);
-
-            UpdateStatus?.Invoke("Writing metadata sidecar");
-
-            var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
-
-            var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
-            xmlSer.Serialize(xmlFs, sidecar);
-            xmlFs.Close();
+            return;
         }
+
+        DateTime chkStart = DateTime.UtcNow;
+
+        // ReSharper disable once UseObjectOrCollectionInitializer
+        _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
+        _sidecarClass.InitProgressEvent    += InitProgress;
+        _sidecarClass.UpdateProgressEvent  += UpdateProgress;
+        _sidecarClass.EndProgressEvent     += EndProgress;
+        _sidecarClass.InitProgressEvent2   += InitProgress2;
+        _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
+        _sidecarClass.EndProgressEvent2    += EndProgress2;
+        _sidecarClass.UpdateStatusEvent    += UpdateStatus;
+        CICMMetadataType sidecar = _sidecarClass.Create();
+        DateTime         end     = DateTime.UtcNow;
+
+        if(_aborted)
+            return;
+
+        totalChkDuration = (end - chkStart).TotalMilliseconds;
+        _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
+
+        _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
+
+        if(_preSidecar != null)
+        {
+            _preSidecar.OpticalDisc = sidecar.OpticalDisc;
+            sidecar                 = _preSidecar;
+        }
+
+        List<(ulong start, string type)> filesystems = new();
+
+        if(sidecar.OpticalDisc[0].Track != null)
+            filesystems.AddRange(from xmlTrack in sidecar.OpticalDisc[0].Track
+                                 where xmlTrack.FileSystemInformation != null
+                                 from partition in xmlTrack.FileSystemInformation
+                                 where partition.FileSystems != null from fileSystem in partition.FileSystems
+                                 select (partition.StartSector, fileSystem.Type));
+
+        if(filesystems.Count > 0)
+            foreach(var filesystem in filesystems.Select(o => new
+                    {
+                        o.start,
+                        o.type
+                    }).Distinct())
+                _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start);
+
+        sidecar.OpticalDisc[0].Dimensions = Dimensions.DimensionsFromMediaType(mediaType);
+        (string type, string subType) discType = CommonTypes.Metadata.MediaType.MediaTypeToString(mediaType);
+        sidecar.OpticalDisc[0].DiscType          = discType.type;
+        sidecar.OpticalDisc[0].DiscSubType       = discType.subType;
+        sidecar.OpticalDisc[0].DumpHardwareArray = _resume.Tries.ToArray();
+        sidecar.OpticalDisc[0].Sessions          = (uint)sessions;
+        sidecar.OpticalDisc[0].Layers            = layers;
+
+        if(discOffset.HasValue)
+        {
+            sidecar.OpticalDisc[0].Offset          = (int)(discOffset / 4);
+            sidecar.OpticalDisc[0].OffsetSpecified = true;
+        }
+
+        if(mediaTags != null)
+            foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags.Where(tag => _outputPlugin.
+                                                                                  SupportedMediaTags.Contains(tag.Key)))
+                AddMediaTagToSidecar(_outputPath, tag.Key, tag.Value, ref sidecar);
+
+        UpdateStatus?.Invoke("Writing metadata sidecar");
+
+        var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
+
+        var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
+        xmlSer.Serialize(xmlFs, sidecar);
+        xmlFs.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/MiniDisc.cs b/Aaru.Core/Devices/Dumping/MiniDisc.cs
index 98b1c83fd..38c3f4ad2 100644
--- a/Aaru.Core/Devices/Dumping/MiniDisc.cs
+++ b/Aaru.Core/Devices/Dumping/MiniDisc.cs
@@ -50,284 +50,400 @@ using Version = Aaru.CommonTypes.Interop.Version;
 
 // ReSharper disable JoinDeclarationAndInitializer
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+/// <summary>Implements dumping MiniDisc Data devices</summary>
+partial class Dump
 {
-    /// <summary>Implements dumping MiniDisc Data devices</summary>
-    partial class Dump
+    /// <summary>Dumps a MiniDisc Data device</summary>
+    void MiniDisc()
     {
-        /// <summary>Dumps a MiniDisc Data device</summary>
-        void MiniDisc()
+        bool                             sense;
+        byte                             scsiMediumType = 0;
+        const ushort                     sbcProfile     = 0x0001;
+        DateTime                         start;
+        DateTime                         end;
+        double                           totalDuration = 0;
+        double                           currentSpeed  = 0;
+        double                           maxSpeed      = double.MinValue;
+        double                           minSpeed      = double.MaxValue;
+        byte[]                           readBuffer;
+        Modes.DecodedMode?               decMode   = null;
+        Dictionary<MediaTagType, byte[]> mediaTags = new();
+        byte[]                           cmdBuf;
+        bool                             ret;
+        var                              outputFormat = _outputPlugin as IWritableImage;
+
+        _dumpLog.WriteLine("Initializing reader.");
+        var   scsiReader = new Reader(_dev, _dev.Timeout, null, _errorLog);
+        ulong blocks     = scsiReader.GetDeviceBlocks();
+        uint  blockSize  = scsiReader.LogicalBlockSize;
+
+        _dumpLog.WriteLine("Requesting MODE SENSE (6).");
+        UpdateStatus?.Invoke("Requesting MODE SENSE (6).");
+
+        sense = _dev.ModeSense6(out cmdBuf, out _, true, ScsiModeSensePageControl.Current, 0x3F, 5, out _);
+
+        if(!sense      &&
+           !_dev.Error &&
+           Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
+            decMode = Modes.DecodeMode6(cmdBuf, _dev.ScsiType);
+
+        if(decMode.HasValue)
+            scsiMediumType = (byte)decMode.Value.Header.MediumType;
+
+        if(blockSize != 2048)
         {
-            bool                             sense;
-            byte                             scsiMediumType = 0;
-            const ushort                     sbcProfile     = 0x0001;
-            DateTime                         start;
-            DateTime                         end;
-            double                           totalDuration = 0;
-            double                           currentSpeed  = 0;
-            double                           maxSpeed      = double.MinValue;
-            double                           minSpeed      = double.MaxValue;
-            byte[]                           readBuffer;
-            Modes.DecodedMode?               decMode   = null;
-            Dictionary<MediaTagType, byte[]> mediaTags = new();
-            byte[]                           cmdBuf;
-            bool                             ret;
-            var                              outputFormat = _outputPlugin as IWritableImage;
+            _dumpLog.WriteLine("MiniDisc albums, NetMD discs or user-written audio MiniDisc cannot be dumped.");
 
-            _dumpLog.WriteLine("Initializing reader.");
-            var   scsiReader = new Reader(_dev, _dev.Timeout, null, _errorLog);
-            ulong blocks     = scsiReader.GetDeviceBlocks();
-            uint  blockSize  = scsiReader.LogicalBlockSize;
+            StoppingErrorMessage?.
+                Invoke("MiniDisc albums, NetMD discs or user-written audio MiniDisc cannot be dumped.");
 
-            _dumpLog.WriteLine("Requesting MODE SENSE (6).");
-            UpdateStatus?.Invoke("Requesting MODE SENSE (6).");
+            return;
+        }
 
-            sense = _dev.ModeSense6(out cmdBuf, out _, true, ScsiModeSensePageControl.Current, 0x3F, 5, out _);
+        MediaType dskType = MediaType.MDData;
 
-            if(!sense      &&
-               !_dev.Error &&
-               Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
-                decMode = Modes.DecodeMode6(cmdBuf, _dev.ScsiType);
+        if(scsiReader.FindReadCommand())
+        {
+            _dumpLog.WriteLine("ERROR: Cannot find correct read command: {0}.", scsiReader.ErrorMessage);
+            StoppingErrorMessage?.Invoke("Unable to read medium.");
 
-            if(decMode.HasValue)
-                scsiMediumType = (byte)decMode.Value.Header.MediumType;
+            return;
+        }
 
-            if(blockSize != 2048)
+        if(blocks    != 0 &&
+           blockSize != 0)
+        {
+            blocks++;
+
+            ulong totalSize = blocks * blockSize;
+
+            if(totalSize > 1099511627776)
+                UpdateStatus?.
+                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)");
+            else if(totalSize > 1073741824)
+                UpdateStatus?.
+                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)");
+            else if(totalSize > 1048576)
+                UpdateStatus?.
+                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)");
+            else if(totalSize > 1024)
+                UpdateStatus?.
+                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)");
+            else
+                UpdateStatus?.
+                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize} bytes)");
+        }
+
+        // Check how many blocks to read, if error show and return
+        // 64 works, gets maximum speed (150KiB/s), slow I know...
+        if(scsiReader.GetBlocksToRead())
+        {
+            _dumpLog.WriteLine("ERROR: Cannot get blocks to read: {0}.", scsiReader.ErrorMessage);
+            StoppingErrorMessage?.Invoke(scsiReader.ErrorMessage);
+
+            return;
+        }
+
+        uint blocksToRead      = scsiReader.BlocksToRead;
+        uint logicalBlockSize  = blockSize;
+        uint physicalBlockSize = scsiReader.PhysicalBlockSize;
+
+        if(blocks == 0)
+        {
+            _dumpLog.WriteLine("ERROR: Unable to read medium or empty medium present...");
+            StoppingErrorMessage?.Invoke("Unable to read medium or empty medium present...");
+
+            return;
+        }
+
+        UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
+        UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
+        UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
+        UpdateStatus?.Invoke($"Device reports {scsiReader.LongBlockSize} bytes per physical block.");
+        UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
+        UpdateStatus?.Invoke($"SCSI medium type: {scsiMediumType}.");
+        UpdateStatus?.Invoke($"Media identified as {dskType}");
+
+        _dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);
+        _dumpLog.WriteLine("Device can read {0} blocks at a time.", blocksToRead);
+        _dumpLog.WriteLine("Device reports {0} bytes per logical block.", blockSize);
+        _dumpLog.WriteLine("Device reports {0} bytes per physical block.", scsiReader.LongBlockSize);
+        _dumpLog.WriteLine("SCSI device type: {0}.", _dev.ScsiType);
+        _dumpLog.WriteLine("SCSI medium type: {0}.", scsiMediumType);
+        _dumpLog.WriteLine("Media identified as {0}.", dskType);
+
+        sense = _dev.MiniDiscGetType(out cmdBuf, out _, _dev.Timeout, out _);
+
+        if(!sense &&
+           !_dev.Error)
+            mediaTags.Add(MediaTagType.MiniDiscType, cmdBuf);
+
+        sense = _dev.MiniDiscD5(out cmdBuf, out _, _dev.Timeout, out _);
+
+        if(!sense &&
+           !_dev.Error)
+            mediaTags.Add(MediaTagType.MiniDiscD5, cmdBuf);
+
+        sense = _dev.MiniDiscReadDataTOC(out cmdBuf, out _, _dev.Timeout, out _);
+
+        if(!sense &&
+           !_dev.Error)
+            mediaTags.Add(MediaTagType.MiniDiscDTOC, cmdBuf);
+
+        var utocMs = new MemoryStream();
+
+        for(uint i = 0; i < 3; i++)
+        {
+            sense = _dev.MiniDiscReadUserTOC(out cmdBuf, out _, i, _dev.Timeout, out _);
+
+            if(sense || _dev.Error)
+                break;
+
+            utocMs.Write(cmdBuf, 0, 2336);
+        }
+
+        if(utocMs.Length > 0)
+            mediaTags.Add(MediaTagType.MiniDiscUTOC, utocMs.ToArray());
+
+        ret = true;
+
+        foreach(MediaTagType tag in mediaTags.Keys.Where(tag => !outputFormat.SupportedMediaTags.Contains(tag)))
+        {
+            ret = false;
+            _dumpLog.WriteLine($"Output format does not support {tag}.");
+            ErrorMessage?.Invoke($"Output format does not support {tag}.");
+        }
+
+        if(!ret)
+        {
+            if(_force)
             {
-                _dumpLog.WriteLine("MiniDisc albums, NetMD discs or user-written audio MiniDisc cannot be dumped.");
-
-                StoppingErrorMessage?.
-                    Invoke("MiniDisc albums, NetMD discs or user-written audio MiniDisc cannot be dumped.");
+                _dumpLog.WriteLine("Several media tags not supported, continuing...");
+                ErrorMessage?.Invoke("Several media tags not supported, continuing...");
+            }
+            else
+            {
+                _dumpLog.WriteLine("Several media tags not supported, not continuing...");
+                StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
 
                 return;
             }
+        }
 
-            MediaType dskType = MediaType.MDData;
+        UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
+        _dumpLog.WriteLine("Reading {0} sectors at a time.", blocksToRead);
 
-            if(scsiReader.FindReadCommand())
-            {
-                _dumpLog.WriteLine("ERROR: Cannot find correct read command: {0}.", scsiReader.ErrorMessage);
-                StoppingErrorMessage?.Invoke("Unable to read medium.");
+        var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
+        var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", sbcProfile);
+        ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
 
-                return;
-            }
+        // Cannot create image
+        if(!ret)
+        {
+            _dumpLog.WriteLine("Error creating output image, not continuing.");
+            _dumpLog.WriteLine(outputFormat.ErrorMessage);
 
-            if(blocks    != 0 &&
-               blockSize != 0)
-            {
-                blocks++;
+            StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
+                                         outputFormat.ErrorMessage);
 
-                ulong totalSize = blocks * blockSize;
+            return;
+        }
 
-                if(totalSize > 1099511627776)
-                    UpdateStatus?.
-                        Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)");
-                else if(totalSize > 1073741824)
-                    UpdateStatus?.
-                        Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)");
-                else if(totalSize > 1048576)
-                    UpdateStatus?.
-                        Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)");
-                else if(totalSize > 1024)
-                    UpdateStatus?.
-                        Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)");
-                else
-                    UpdateStatus?.
-                        Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize} bytes)");
-            }
+        start = DateTime.UtcNow;
+        double imageWriteDuration = 0;
 
-            // Check how many blocks to read, if error show and return
-            // 64 works, gets maximum speed (150KiB/s), slow I know...
-            if(scsiReader.GetBlocksToRead())
-            {
-                _dumpLog.WriteLine("ERROR: Cannot get blocks to read: {0}.", scsiReader.ErrorMessage);
-                StoppingErrorMessage?.Invoke(scsiReader.ErrorMessage);
+        if(decMode?.Pages != null)
+        {
+            bool setGeometry = false;
 
-                return;
-            }
-
-            uint blocksToRead      = scsiReader.BlocksToRead;
-            uint logicalBlockSize  = blockSize;
-            uint physicalBlockSize = scsiReader.PhysicalBlockSize;
-
-            if(blocks == 0)
-            {
-                _dumpLog.WriteLine("ERROR: Unable to read medium or empty medium present...");
-                StoppingErrorMessage?.Invoke("Unable to read medium or empty medium present...");
-
-                return;
-            }
-
-            UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
-            UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
-            UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
-            UpdateStatus?.Invoke($"Device reports {scsiReader.LongBlockSize} bytes per physical block.");
-            UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
-            UpdateStatus?.Invoke($"SCSI medium type: {scsiMediumType}.");
-            UpdateStatus?.Invoke($"Media identified as {dskType}");
-
-            _dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);
-            _dumpLog.WriteLine("Device can read {0} blocks at a time.", blocksToRead);
-            _dumpLog.WriteLine("Device reports {0} bytes per logical block.", blockSize);
-            _dumpLog.WriteLine("Device reports {0} bytes per physical block.", scsiReader.LongBlockSize);
-            _dumpLog.WriteLine("SCSI device type: {0}.", _dev.ScsiType);
-            _dumpLog.WriteLine("SCSI medium type: {0}.", scsiMediumType);
-            _dumpLog.WriteLine("Media identified as {0}.", dskType);
-
-            sense = _dev.MiniDiscGetType(out cmdBuf, out _, _dev.Timeout, out _);
-
-            if(!sense &&
-               !_dev.Error)
-                mediaTags.Add(MediaTagType.MiniDiscType, cmdBuf);
-
-            sense = _dev.MiniDiscD5(out cmdBuf, out _, _dev.Timeout, out _);
-
-            if(!sense &&
-               !_dev.Error)
-                mediaTags.Add(MediaTagType.MiniDiscD5, cmdBuf);
-
-            sense = _dev.MiniDiscReadDataTOC(out cmdBuf, out _, _dev.Timeout, out _);
-
-            if(!sense &&
-               !_dev.Error)
-                mediaTags.Add(MediaTagType.MiniDiscDTOC, cmdBuf);
-
-            var utocMs = new MemoryStream();
-
-            for(uint i = 0; i < 3; i++)
-            {
-                sense = _dev.MiniDiscReadUserTOC(out cmdBuf, out _, i, _dev.Timeout, out _);
-
-                if(sense || _dev.Error)
-                    break;
-
-                utocMs.Write(cmdBuf, 0, 2336);
-            }
-
-            if(utocMs.Length > 0)
-                mediaTags.Add(MediaTagType.MiniDiscUTOC, utocMs.ToArray());
-
-            ret = true;
-
-            foreach(MediaTagType tag in mediaTags.Keys.Where(tag => !outputFormat.SupportedMediaTags.Contains(tag)))
-            {
-                ret = false;
-                _dumpLog.WriteLine($"Output format does not support {tag}.");
-                ErrorMessage?.Invoke($"Output format does not support {tag}.");
-            }
-
-            if(!ret)
-            {
-                if(_force)
+            foreach(Modes.ModePage page in decMode.Value.Pages)
+                if(page.Page    == 0x04 &&
+                   page.Subpage == 0x00)
                 {
-                    _dumpLog.WriteLine("Several media tags not supported, continuing...");
-                    ErrorMessage?.Invoke("Several media tags not supported, continuing...");
+                    Modes.ModePage_04? rigidPage = Modes.DecodeModePage_04(page.PageResponse);
+
+                    if(!rigidPage.HasValue || setGeometry)
+                        continue;
+
+                    _dumpLog.WriteLine("Setting geometry to {0} cylinders, {1} heads, {2} sectors per track",
+                                       rigidPage.Value.Cylinders, rigidPage.Value.Heads,
+                                       (uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads)));
+
+                    UpdateStatus?.
+                        Invoke($"Setting geometry to {rigidPage.Value.Cylinders} cylinders, {rigidPage.Value.Heads} heads, {(uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads))} sectors per track");
+
+                    outputFormat.SetGeometry(rigidPage.Value.Cylinders, rigidPage.Value.Heads,
+                                             (uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads)));
+
+                    setGeometry = true;
                 }
-                else
+                else if(page.Page    == 0x05 &&
+                        page.Subpage == 0x00)
                 {
-                    _dumpLog.WriteLine("Several media tags not supported, not continuing...");
-                    StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
+                    Modes.ModePage_05? flexiblePage = Modes.DecodeModePage_05(page.PageResponse);
 
-                    return;
+                    if(!flexiblePage.HasValue)
+                        continue;
+
+                    _dumpLog.WriteLine("Setting geometry to {0} cylinders, {1} heads, {2} sectors per track",
+                                       flexiblePage.Value.Cylinders, flexiblePage.Value.Heads,
+                                       flexiblePage.Value.SectorsPerTrack);
+
+                    UpdateStatus?.
+                        Invoke($"Setting geometry to {flexiblePage.Value.Cylinders} cylinders, {flexiblePage.Value.Heads} heads, {flexiblePage.Value.SectorsPerTrack} sectors per track");
+
+                    outputFormat.SetGeometry(flexiblePage.Value.Cylinders, flexiblePage.Value.Heads,
+                                             flexiblePage.Value.SectorsPerTrack);
+
+                    setGeometry = true;
                 }
-            }
+        }
 
-            UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
-            _dumpLog.WriteLine("Reading {0} sectors at a time.", blocksToRead);
+        DumpHardwareType currentTry = null;
+        ExtentsULong     extents    = null;
 
-            var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
-            var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", sbcProfile);
-            ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
+        ResumeSupport.Process(true, _dev.IsRemovable, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial,
+                              _dev.PlatformId, ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision,
+                              _private, _force);
 
-            // Cannot create image
-            if(!ret)
+        if(currentTry == null ||
+           extents    == null)
+        {
+            StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
+
+            return;
+        }
+
+        if(_resume.NextBlock > 0)
+        {
+            UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
+            _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
+        }
+
+        bool     newTrim          = false;
+        DateTime timeSpeedStart   = DateTime.UtcNow;
+        ulong    sectorSpeedStart = 0;
+        InitProgress?.Invoke();
+
+        for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
+        {
+            if(_aborted)
             {
-                _dumpLog.WriteLine("Error creating output image, not continuing.");
-                _dumpLog.WriteLine(outputFormat.ErrorMessage);
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
 
-                StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
-                                             outputFormat.ErrorMessage);
-
-                return;
+                break;
             }
 
+            if(blocks - i < blocksToRead)
+                blocksToRead = (uint)(blocks - i);
+
+            if(currentSpeed > maxSpeed &&
+               currentSpeed > 0)
+                maxSpeed = currentSpeed;
+
+            if(currentSpeed < minSpeed &&
+               currentSpeed > 0)
+                minSpeed = currentSpeed;
+
+            UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
+                                   (long)blocks);
+
+            sense = _dev.Read6(out readBuffer, out _, (uint)i, blockSize, (byte)blocksToRead, _dev.Timeout,
+                               out double cmdDuration);
+
+            totalDuration += cmdDuration;
+
+            if(!sense &&
+               !_dev.Error)
+            {
+                mhddLog.Write(i, cmdDuration);
+                ibgLog.Write(i, currentSpeed * 1024);
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(readBuffer, i, blocksToRead);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                extents.Add(i, blocksToRead, true);
+            }
+            else
+            {
+                // TODO: Reset device after X errors
+                if(_stopOnError)
+                    return; // TODO: Return more cleanly
+
+                if(i + _skip > blocks)
+                    _skip = (uint)(blocks - i);
+
+                // Write empty data
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+
+                for(ulong b = i; b < i + _skip; b++)
+                    _resume.BadBlocks.Add(b);
+
+                mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+
+                ibgLog.Write(i, 0);
+                _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
+                i       += _skip - blocksToRead;
+                newTrim =  true;
+            }
+
+            sectorSpeedStart  += blocksToRead;
+            _resume.NextBlock =  i + blocksToRead;
+
+            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+            if(elapsed <= 0)
+                continue;
+
+            currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+            sectorSpeedStart = 0;
+            timeSpeedStart   = DateTime.UtcNow;
+        }
+
+        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+
+        end = DateTime.UtcNow;
+        EndProgress?.Invoke();
+        mhddLog.Close();
+
+        ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                     blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+
+        UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+
+        UpdateStatus?.
+            Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
+
+        UpdateStatus?.
+            Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
+
+        _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
+
+        _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
+
+        _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
+
+        #region Trimming
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _trim                       &&
+           newTrim)
+        {
             start = DateTime.UtcNow;
-            double imageWriteDuration = 0;
+            UpdateStatus?.Invoke("Trimming skipped sectors");
+            _dumpLog.WriteLine("Trimming skipped sectors");
 
-            if(decMode?.Pages != null)
-            {
-                bool setGeometry = false;
-
-                foreach(Modes.ModePage page in decMode.Value.Pages)
-                    if(page.Page    == 0x04 &&
-                       page.Subpage == 0x00)
-                    {
-                        Modes.ModePage_04? rigidPage = Modes.DecodeModePage_04(page.PageResponse);
-
-                        if(!rigidPage.HasValue || setGeometry)
-                            continue;
-
-                        _dumpLog.WriteLine("Setting geometry to {0} cylinders, {1} heads, {2} sectors per track",
-                                           rigidPage.Value.Cylinders, rigidPage.Value.Heads,
-                                           (uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads)));
-
-                        UpdateStatus?.
-                            Invoke($"Setting geometry to {rigidPage.Value.Cylinders} cylinders, {rigidPage.Value.Heads} heads, {(uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads))} sectors per track");
-
-                        outputFormat.SetGeometry(rigidPage.Value.Cylinders, rigidPage.Value.Heads,
-                                                  (uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads)));
-
-                        setGeometry = true;
-                    }
-                    else if(page.Page    == 0x05 &&
-                            page.Subpage == 0x00)
-                    {
-                        Modes.ModePage_05? flexiblePage = Modes.DecodeModePage_05(page.PageResponse);
-
-                        if(!flexiblePage.HasValue)
-                            continue;
-
-                        _dumpLog.WriteLine("Setting geometry to {0} cylinders, {1} heads, {2} sectors per track",
-                                           flexiblePage.Value.Cylinders, flexiblePage.Value.Heads,
-                                           flexiblePage.Value.SectorsPerTrack);
-
-                        UpdateStatus?.
-                            Invoke($"Setting geometry to {flexiblePage.Value.Cylinders} cylinders, {flexiblePage.Value.Heads} heads, {flexiblePage.Value.SectorsPerTrack} sectors per track");
-
-                        outputFormat.SetGeometry(flexiblePage.Value.Cylinders, flexiblePage.Value.Heads,
-                                                  flexiblePage.Value.SectorsPerTrack);
-
-                        setGeometry = true;
-                    }
-            }
-
-            DumpHardwareType currentTry = null;
-            ExtentsULong     extents    = null;
-
-            ResumeSupport.Process(true, _dev.IsRemovable, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial,
-                                  _dev.PlatformId, ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision,
-                                  _private, _force);
-
-            if(currentTry == null ||
-               extents    == null)
-            {
-                StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
-
-                return;
-            }
-
-            if(_resume.NextBlock > 0)
-            {
-                UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
-                _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
-            }
-
-            bool     newTrim          = false;
-            DateTime timeSpeedStart   = DateTime.UtcNow;
-            ulong    sectorSpeedStart = 0;
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
             InitProgress?.Invoke();
 
-            for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
+            foreach(ulong badSector in tmpArray)
             {
                 if(_aborted)
                 {
@@ -338,21 +454,147 @@ namespace Aaru.Core.Devices.Dumping
                     break;
                 }
 
-                if(blocks - i < blocksToRead)
-                    blocksToRead = (uint)(blocks - i);
+                PulseProgress?.Invoke($"Trimming sector {badSector}");
 
-                if(currentSpeed > maxSpeed &&
-                   currentSpeed > 0)
-                    maxSpeed = currentSpeed;
+                sense = _dev.Read6(out readBuffer, out _, (uint)badSector, blockSize, 1, _dev.Timeout,
+                                   out double _);
 
-                if(currentSpeed < minSpeed &&
-                   currentSpeed > 0)
-                    minSpeed = currentSpeed;
+                if(sense || _dev.Error)
+                    continue;
 
-                UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
-                                       (long)blocks);
+                _resume.BadBlocks.Remove(badSector);
+                extents.Add(badSector);
+                outputFormat.WriteSector(readBuffer, badSector);
+            }
 
-                sense = _dev.Read6(out readBuffer, out _, (uint)i, blockSize, (byte)blocksToRead, _dev.Timeout,
+            EndProgress?.Invoke();
+            end = DateTime.UtcNow;
+            UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
+            _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+        }
+        #endregion Trimming
+
+        #region Error handling
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _retryPasses > 0)
+        {
+            int  pass              = 1;
+            bool forward           = true;
+            bool runningPersistent = false;
+
+            Modes.ModePage? currentModePage = null;
+            byte[]          md6;
+
+            if(_persistent)
+            {
+                Modes.ModePage_01 pg;
+
+                sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
+                                        _dev.Timeout, out _);
+
+                if(!sense)
+                {
+                    Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(readBuffer, _dev.ScsiType);
+
+                    if(dcMode6?.Pages != null)
+                        foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
+                                    modePage.Page == 0x01 && modePage.Subpage == 0x00))
+                            currentModePage = modePage;
+                }
+
+                if(currentModePage == null)
+                {
+                    pg = new Modes.ModePage_01
+                    {
+                        PS             = false,
+                        AWRE           = true,
+                        ARRE           = true,
+                        TB             = false,
+                        RC             = false,
+                        EER            = true,
+                        PER            = false,
+                        DTE            = true,
+                        DCR            = false,
+                        ReadRetryCount = 32
+                    };
+
+                    currentModePage = new Modes.ModePage
+                    {
+                        Page         = 0x01,
+                        Subpage      = 0x00,
+                        PageResponse = Modes.EncodeModePage_01(pg)
+                    };
+                }
+
+                pg = new Modes.ModePage_01
+                {
+                    PS             = false,
+                    AWRE           = false,
+                    ARRE           = false,
+                    TB             = true,
+                    RC             = false,
+                    EER            = true,
+                    PER            = false,
+                    DTE            = false,
+                    DCR            = false,
+                    ReadRetryCount = 255
+                };
+
+                var md = new Modes.DecodedMode
+                {
+                    Header = new Modes.ModeHeader(),
+                    Pages = new[]
+                    {
+                        new Modes.ModePage
+                        {
+                            Page         = 0x01,
+                            Subpage      = 0x00,
+                            PageResponse = Modes.EncodeModePage_01(pg)
+                        }
+                    }
+                };
+
+                md6 = Modes.EncodeMode6(md, _dev.ScsiType);
+
+                UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks).");
+                _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
+                sense = _dev.ModeSelect(md6, out byte[] senseBuf, true, false, _dev.Timeout, out _);
+
+                if(sense)
+                {
+                    UpdateStatus?.
+                        Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
+
+                    AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
+
+                    _dumpLog.
+                        WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
+                }
+                else
+                    runningPersistent = true;
+            }
+
+            InitProgress?.Invoke();
+            repeatRetry:
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
+
+            foreach(ulong badSector in tmpArray)
+            {
+                if(_aborted)
+                {
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                    UpdateStatus?.Invoke("Aborted!");
+                    _dumpLog.WriteLine("Aborted!");
+
+                    break;
+                }
+
+                PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
+                                                    forward ? "forward" : "reverse",
+                                                    runningPersistent ? "recovering partial data, " : ""));
+
+                sense = _dev.Read6(out readBuffer, out _, (uint)badSector, blockSize, 1, _dev.Timeout,
                                    out double cmdDuration);
 
                 totalDuration += cmdDuration;
@@ -360,459 +602,216 @@ namespace Aaru.Core.Devices.Dumping
                 if(!sense &&
                    !_dev.Error)
                 {
-                    mhddLog.Write(i, cmdDuration);
-                    ibgLog.Write(i, currentSpeed * 1024);
-                    DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(readBuffer, i, blocksToRead);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                    extents.Add(i, blocksToRead, true);
-                }
-                else
-                {
-                    // TODO: Reset device after X errors
-                    if(_stopOnError)
-                        return; // TODO: Return more cleanly
-
-                    if(i + _skip > blocks)
-                        _skip = (uint)(blocks - i);
-
-                    // Write empty data
-                    DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-
-                    for(ulong b = i; b < i + _skip; b++)
-                        _resume.BadBlocks.Add(b);
-
-                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                    ibgLog.Write(i, 0);
-                    _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
-                    i       += _skip - blocksToRead;
-                    newTrim =  true;
-                }
-
-                sectorSpeedStart  += blocksToRead;
-                _resume.NextBlock =  i + blocksToRead;
-
-                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                if(elapsed <= 0)
-                    continue;
-
-                currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                sectorSpeedStart = 0;
-                timeSpeedStart   = DateTime.UtcNow;
-            }
-
-            _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
-
-            end = DateTime.UtcNow;
-            EndProgress?.Invoke();
-            mhddLog.Close();
-
-            ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                         blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
-
-            UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
-
-            UpdateStatus?.
-                Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
-
-            UpdateStatus?.
-                Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
-
-            _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
-
-            _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
-
-            _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
-
-            #region Trimming
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _trim                       &&
-               newTrim)
-            {
-                start = DateTime.UtcNow;
-                UpdateStatus?.Invoke("Trimming skipped sectors");
-                _dumpLog.WriteLine("Trimming skipped sectors");
-
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
-                InitProgress?.Invoke();
-
-                foreach(ulong badSector in tmpArray)
-                {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    PulseProgress?.Invoke($"Trimming sector {badSector}");
-
-                    sense = _dev.Read6(out readBuffer, out _, (uint)badSector, blockSize, 1, _dev.Timeout,
-                                       out double _);
-
-                    if(sense || _dev.Error)
-                        continue;
-
                     _resume.BadBlocks.Remove(badSector);
                     extents.Add(badSector);
                     outputFormat.WriteSector(readBuffer, badSector);
+                    UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
+                    _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
                 }
-
-                EndProgress?.Invoke();
-                end = DateTime.UtcNow;
-                UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
-                _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+                else if(runningPersistent)
+                    outputFormat.WriteSector(readBuffer, badSector);
             }
-            #endregion Trimming
 
-            #region Error handling
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _retryPasses > 0)
+            if(pass < _retryPasses &&
+               !_aborted           &&
+               _resume.BadBlocks.Count > 0)
             {
-                int  pass              = 1;
-                bool forward           = true;
-                bool runningPersistent = false;
+                pass++;
+                forward = !forward;
+                _resume.BadBlocks.Sort();
 
-                Modes.ModePage? currentModePage = null;
-                byte[]          md6;
+                if(!forward)
+                    _resume.BadBlocks.Reverse();
 
-                if(_persistent)
-                {
-                    Modes.ModePage_01 pg;
-
-                    sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
-                                            _dev.Timeout, out _);
-
-                    if(!sense)
-                    {
-                        Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(readBuffer, _dev.ScsiType);
-
-                        if(dcMode6?.Pages != null)
-                            foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
-                                modePage.Page == 0x01 && modePage.Subpage == 0x00))
-                                currentModePage = modePage;
-                    }
-
-                    if(currentModePage == null)
-                    {
-                        pg = new Modes.ModePage_01
-                        {
-                            PS             = false,
-                            AWRE           = true,
-                            ARRE           = true,
-                            TB             = false,
-                            RC             = false,
-                            EER            = true,
-                            PER            = false,
-                            DTE            = true,
-                            DCR            = false,
-                            ReadRetryCount = 32
-                        };
-
-                        currentModePage = new Modes.ModePage
-                        {
-                            Page         = 0x01,
-                            Subpage      = 0x00,
-                            PageResponse = Modes.EncodeModePage_01(pg)
-                        };
-                    }
-
-                    pg = new Modes.ModePage_01
-                    {
-                        PS             = false,
-                        AWRE           = false,
-                        ARRE           = false,
-                        TB             = true,
-                        RC             = false,
-                        EER            = true,
-                        PER            = false,
-                        DTE            = false,
-                        DCR            = false,
-                        ReadRetryCount = 255
-                    };
-
-                    var md = new Modes.DecodedMode
-                    {
-                        Header = new Modes.ModeHeader(),
-                        Pages = new[]
-                        {
-                            new Modes.ModePage
-                            {
-                                Page         = 0x01,
-                                Subpage      = 0x00,
-                                PageResponse = Modes.EncodeModePage_01(pg)
-                            }
-                        }
-                    };
-
-                    md6 = Modes.EncodeMode6(md, _dev.ScsiType);
-
-                    UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks).");
-                    _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
-                    sense = _dev.ModeSelect(md6, out byte[] senseBuf, true, false, _dev.Timeout, out _);
-
-                    if(sense)
-                    {
-                        UpdateStatus?.
-                            Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
-
-                        AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
-
-                        _dumpLog.
-                            WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
-                    }
-                    else
-                        runningPersistent = true;
-                }
-
-                InitProgress?.Invoke();
-                repeatRetry:
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
-
-                foreach(ulong badSector in tmpArray)
-                {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
-                                                        forward ? "forward" : "reverse",
-                                                        runningPersistent ? "recovering partial data, " : ""));
-
-                    sense = _dev.Read6(out readBuffer, out _, (uint)badSector, blockSize, 1, _dev.Timeout,
-                                       out double cmdDuration);
-
-                    totalDuration += cmdDuration;
-
-                    if(!sense &&
-                       !_dev.Error)
-                    {
-                        _resume.BadBlocks.Remove(badSector);
-                        extents.Add(badSector);
-                        outputFormat.WriteSector(readBuffer, badSector);
-                        UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
-                        _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
-                    }
-                    else if(runningPersistent)
-                        outputFormat.WriteSector(readBuffer, badSector);
-                }
-
-                if(pass < _retryPasses &&
-                   !_aborted           &&
-                   _resume.BadBlocks.Count > 0)
-                {
-                    pass++;
-                    forward = !forward;
-                    _resume.BadBlocks.Sort();
-
-                    if(!forward)
-                        _resume.BadBlocks.Reverse();
-
-                    goto repeatRetry;
-                }
-
-                if(runningPersistent && currentModePage.HasValue)
-                {
-                    var md = new Modes.DecodedMode
-                    {
-                        Header = new Modes.ModeHeader(),
-                        Pages = new[]
-                        {
-                            currentModePage.Value
-                        }
-                    };
-
-                    md6 = Modes.EncodeMode6(md, _dev.ScsiType);
-
-                    UpdateStatus?.Invoke("Sending MODE SELECT to drive (return device to previous status).");
-                    _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
-                    _dev.ModeSelect(md6, out _, true, false, _dev.Timeout, out _);
-                }
-
-                EndProgress?.Invoke();
+                goto repeatRetry;
             }
-            #endregion Error handling
 
-            _resume.BadBlocks.Sort();
-
-            foreach(ulong bad in _resume.BadBlocks)
-                _dumpLog.WriteLine("Sector {0} could not be read.", bad);
-
-            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-
-            outputFormat.SetDumpHardware(_resume.Tries);
-
-            var metadata = new CommonTypes.Structs.ImageInfo
+            if(runningPersistent && currentModePage.HasValue)
             {
-                Application        = "Aaru",
-                ApplicationVersion = Version.GetVersion()
-            };
+                var md = new Modes.DecodedMode
+                {
+                    Header = new Modes.ModeHeader(),
+                    Pages = new[]
+                    {
+                        currentModePage.Value
+                    }
+                };
 
-            if(!outputFormat.SetMetadata(metadata))
-                ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
-                                     outputFormat.ErrorMessage);
+                md6 = Modes.EncodeMode6(md, _dev.ScsiType);
 
-            if(_preSidecar != null)
-                outputFormat.SetCicmMetadata(_preSidecar);
+                UpdateStatus?.Invoke("Sending MODE SELECT to drive (return device to previous status).");
+                _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
+                _dev.ModeSelect(md6, out _, true, false, _dev.Timeout, out _);
+            }
 
-            _dumpLog.WriteLine("Closing output file.");
-            UpdateStatus?.Invoke("Closing output file.");
-            DateTime closeStart = DateTime.Now;
-            outputFormat.Close();
-            DateTime closeEnd = DateTime.Now;
-            UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
-            _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
+            EndProgress?.Invoke();
+        }
+        #endregion Error handling
 
-            if(_aborted)
+        _resume.BadBlocks.Sort();
+
+        foreach(ulong bad in _resume.BadBlocks)
+            _dumpLog.WriteLine("Sector {0} could not be read.", bad);
+
+        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+
+        outputFormat.SetDumpHardware(_resume.Tries);
+
+        var metadata = new CommonTypes.Structs.ImageInfo
+        {
+            Application        = "Aaru",
+            ApplicationVersion = Version.GetVersion()
+        };
+
+        if(!outputFormat.SetMetadata(metadata))
+            ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
+                                 outputFormat.ErrorMessage);
+
+        if(_preSidecar != null)
+            outputFormat.SetCicmMetadata(_preSidecar);
+
+        _dumpLog.WriteLine("Closing output file.");
+        UpdateStatus?.Invoke("Closing output file.");
+        DateTime closeStart = DateTime.Now;
+        outputFormat.Close();
+        DateTime closeEnd = DateTime.Now;
+        UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
+        _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
+
+        if(_aborted)
+        {
+            UpdateStatus?.Invoke("Aborted!");
+            _dumpLog.WriteLine("Aborted!");
+
+            return;
+        }
+
+        double totalChkDuration = 0;
+
+        if(_metadata)
+        {
+            UpdateStatus?.Invoke("Creating sidecar.");
+            _dumpLog.WriteLine("Creating sidecar.");
+            var         filters     = new FiltersList();
+            IFilter     filter      = filters.GetFilter(_outputPath);
+            IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
+            ErrorNumber opened      = inputPlugin.Open(filter);
+
+            if(opened != ErrorNumber.NoError)
             {
-                UpdateStatus?.Invoke("Aborted!");
-                _dumpLog.WriteLine("Aborted!");
+                StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
 
                 return;
             }
 
-            double totalChkDuration = 0;
+            DateTime chkStart = DateTime.UtcNow;
+            _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
+            _sidecarClass.InitProgressEvent    += InitProgress;
+            _sidecarClass.UpdateProgressEvent  += UpdateProgress;
+            _sidecarClass.EndProgressEvent     += EndProgress;
+            _sidecarClass.InitProgressEvent2   += InitProgress2;
+            _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
+            _sidecarClass.EndProgressEvent2    += EndProgress2;
+            _sidecarClass.UpdateStatusEvent    += UpdateStatus;
+            CICMMetadataType sidecar = _sidecarClass.Create();
+            end = DateTime.UtcNow;
 
-            if(_metadata)
+            if(!_aborted)
             {
-                UpdateStatus?.Invoke("Creating sidecar.");
-                _dumpLog.WriteLine("Creating sidecar.");
-                var         filters     = new FiltersList();
-                IFilter     filter      = filters.GetFilter(_outputPath);
-                IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
-                ErrorNumber opened      = inputPlugin.Open(filter);
+                totalChkDuration = (end - chkStart).TotalMilliseconds;
+                UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds.");
 
-                if(opened != ErrorNumber.NoError)
+                UpdateStatus?.
+                    Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
+
+                _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
+
+                _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
+                                   blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
+
+                if(_preSidecar != null)
                 {
-                    StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
-
-                    return;
+                    _preSidecar.BlockMedia = sidecar.BlockMedia;
+                    sidecar                = _preSidecar;
                 }
 
-                DateTime chkStart = DateTime.UtcNow;
-                _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
-                _sidecarClass.InitProgressEvent    += InitProgress;
-                _sidecarClass.UpdateProgressEvent  += UpdateProgress;
-                _sidecarClass.EndProgressEvent     += EndProgress;
-                _sidecarClass.InitProgressEvent2   += InitProgress2;
-                _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
-                _sidecarClass.EndProgressEvent2    += EndProgress2;
-                _sidecarClass.UpdateStatusEvent    += UpdateStatus;
-                CICMMetadataType sidecar = _sidecarClass.Create();
-                end = DateTime.UtcNow;
+                List<(ulong start, string type)> filesystems = new();
 
-                if(!_aborted)
-                {
-                    totalChkDuration = (end - chkStart).TotalMilliseconds;
-                    UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds.");
+                if(sidecar.BlockMedia[0].FileSystemInformation != null)
+                    filesystems.AddRange(from partition in sidecar.BlockMedia[0].FileSystemInformation
+                                         where partition.FileSystems != null
+                                         from fileSystem in partition.FileSystems
+                                         select (partition.StartSector, fileSystem.Type));
 
-                    UpdateStatus?.
-                        Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
-
-                    _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
-
-                    _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
-                                       blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
-
-                    if(_preSidecar != null)
+                if(filesystems.Count > 0)
+                    foreach(var filesystem in filesystems.Select(o => new
+                            {
+                                o.start,
+                                o.type
+                            }).Distinct())
                     {
-                        _preSidecar.BlockMedia = sidecar.BlockMedia;
-                        sidecar                = _preSidecar;
+                        UpdateStatus?.Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
+                        _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start);
                     }
 
-                    List<(ulong start, string type)> filesystems = new();
+                sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType);
+                (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
+                sidecar.BlockMedia[0].DiskType    = xmlType.type;
+                sidecar.BlockMedia[0].DiskSubType = xmlType.subType;
 
-                    if(sidecar.BlockMedia[0].FileSystemInformation != null)
-                        filesystems.AddRange(from partition in sidecar.BlockMedia[0].FileSystemInformation
-                                             where partition.FileSystems != null
-                                             from fileSystem in partition.FileSystems
-                                             select (partition.StartSector, fileSystem.Type));
+                if(!_dev.IsRemovable ||
+                   _dev.IsUsb)
+                    if(_dev.Type == DeviceType.ATAPI)
+                        sidecar.BlockMedia[0].Interface = "ATAPI";
+                    else if(_dev.IsUsb)
+                        sidecar.BlockMedia[0].Interface = "USB";
+                    else if(_dev.IsFireWire)
+                        sidecar.BlockMedia[0].Interface = "FireWire";
+                    else
+                        sidecar.BlockMedia[0].Interface = "SCSI";
 
-                    if(filesystems.Count > 0)
-                        foreach(var filesystem in filesystems.Select(o => new
-                        {
-                            o.start,
-                            o.type
-                        }).Distinct())
-                        {
-                            UpdateStatus?.Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
-                            _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start);
-                        }
+                sidecar.BlockMedia[0].LogicalBlocks     = blocks;
+                sidecar.BlockMedia[0].PhysicalBlockSize = physicalBlockSize;
+                sidecar.BlockMedia[0].LogicalBlockSize  = logicalBlockSize;
+                sidecar.BlockMedia[0].Manufacturer      = _dev.Manufacturer;
+                sidecar.BlockMedia[0].Model             = _dev.Model;
 
-                    sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType);
-                    (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
-                    sidecar.BlockMedia[0].DiskType    = xmlType.type;
-                    sidecar.BlockMedia[0].DiskSubType = xmlType.subType;
+                if(!_private)
+                    sidecar.BlockMedia[0].Serial = _dev.Serial;
 
-                    if(!_dev.IsRemovable ||
-                       _dev.IsUsb)
-                        if(_dev.Type == DeviceType.ATAPI)
-                            sidecar.BlockMedia[0].Interface = "ATAPI";
-                        else if(_dev.IsUsb)
-                            sidecar.BlockMedia[0].Interface = "USB";
-                        else if(_dev.IsFireWire)
-                            sidecar.BlockMedia[0].Interface = "FireWire";
-                        else
-                            sidecar.BlockMedia[0].Interface = "SCSI";
+                sidecar.BlockMedia[0].Size = blocks * blockSize;
 
-                    sidecar.BlockMedia[0].LogicalBlocks     = blocks;
-                    sidecar.BlockMedia[0].PhysicalBlockSize = physicalBlockSize;
-                    sidecar.BlockMedia[0].LogicalBlockSize  = logicalBlockSize;
-                    sidecar.BlockMedia[0].Manufacturer      = _dev.Manufacturer;
-                    sidecar.BlockMedia[0].Model             = _dev.Model;
+                if(_dev.IsRemovable)
+                    sidecar.BlockMedia[0].DumpHardwareArray = _resume.Tries.ToArray();
 
-                    if(!_private)
-                        sidecar.BlockMedia[0].Serial = _dev.Serial;
+                UpdateStatus?.Invoke("Writing metadata sidecar");
 
-                    sidecar.BlockMedia[0].Size = blocks * blockSize;
+                var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
 
-                    if(_dev.IsRemovable)
-                        sidecar.BlockMedia[0].DumpHardwareArray = _resume.Tries.ToArray();
-
-                    UpdateStatus?.Invoke("Writing metadata sidecar");
-
-                    var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
-
-                    var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
-                    xmlSer.Serialize(xmlFs, sidecar);
-                    xmlFs.Close();
-                }
+                var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
+                xmlSer.Serialize(xmlFs, sidecar);
+                xmlFs.Close();
             }
-
-            UpdateStatus?.Invoke("");
-
-            UpdateStatus?.
-                Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
-
-            UpdateStatus?.
-                Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
-
-            if(maxSpeed > 0)
-                UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
-
-            if(minSpeed > 0 &&
-               minSpeed < double.MaxValue)
-                UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
-
-            UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
-            UpdateStatus?.Invoke("");
-
-            Statistics.AddMedia(dskType, true);
         }
+
+        UpdateStatus?.Invoke("");
+
+        UpdateStatus?.
+            Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+
+        UpdateStatus?.
+            Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+
+        if(maxSpeed > 0)
+            UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+
+        if(minSpeed > 0 &&
+           minSpeed < double.MaxValue)
+            UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+
+        UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
+        UpdateStatus?.Invoke("");
+
+        Statistics.AddMedia(dskType, true);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/NVMe.cs b/Aaru.Core/Devices/Dumping/NVMe.cs
index 628161b22..614c881f7 100644
--- a/Aaru.Core/Devices/Dumping/NVMe.cs
+++ b/Aaru.Core/Devices/Dumping/NVMe.cs
@@ -32,11 +32,10 @@
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+public partial class Dump
 {
-    public partial class Dump
-    {
-        /// <summary>Dumps an NVMe device</summary>
-        public void NVMe() => StoppingErrorMessage?.Invoke("NVMe devices not yet supported.");
-    }
+    /// <summary>Dumps an NVMe device</summary>
+    public void NVMe() => StoppingErrorMessage?.Invoke("NVMe devices not yet supported.");
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
index 513fad0b4..4e1f2b74a 100644
--- a/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
+++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
@@ -50,131 +50,248 @@ using Schemas;
 using MediaType = Aaru.CommonTypes.MediaType;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+public partial class Dump
 {
-    public partial class Dump
+    [SuppressMessage("ReSharper", "JoinDeclarationAndInitializer")]
+    void DumpMs()
     {
-        [SuppressMessage("ReSharper", "JoinDeclarationAndInitializer")]
-        void DumpMs()
+        const ushort sbcProfile    = 0x0001;
+        const uint   blockSize     = 512;
+        double       totalDuration = 0;
+        double       currentSpeed  = 0;
+        double       maxSpeed      = double.MinValue;
+        double       minSpeed      = double.MaxValue;
+        uint         blocksToRead  = 64;
+        DateTime     start;
+        DateTime     end;
+        MediaType    dskType;
+        bool         sense;
+        byte[]       senseBuf;
+        var          outputFormat = _outputPlugin as IWritableImage;
+
+        sense = _dev.ReadCapacity(out byte[] readBuffer, out _, _dev.Timeout, out _);
+
+        if(sense)
         {
-            const ushort sbcProfile    = 0x0001;
-            const uint   blockSize     = 512;
-            double       totalDuration = 0;
-            double       currentSpeed  = 0;
-            double       maxSpeed      = double.MinValue;
-            double       minSpeed      = double.MaxValue;
-            uint         blocksToRead  = 64;
-            DateTime     start;
-            DateTime     end;
-            MediaType    dskType;
-            bool         sense;
-            byte[]       senseBuf;
-            var          outputFormat = _outputPlugin as IWritableImage;
+            _dumpLog.WriteLine("Could not detect capacity...");
+            StoppingErrorMessage?.Invoke("Could not detect capacity...");
 
-            sense = _dev.ReadCapacity(out byte[] readBuffer, out _, _dev.Timeout, out _);
+            return;
+        }
 
-            if(sense)
+        uint blocks = (uint)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]);
+
+        blocks++;
+
+        ulong totalSize = blocks * (ulong)blockSize;
+
+        if(totalSize > 1099511627776)
+            UpdateStatus?.
+                Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)");
+        else if(totalSize > 1073741824)
+            UpdateStatus?.
+                Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)");
+        else if(totalSize > 1048576)
+            UpdateStatus?.
+                Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)");
+        else if(totalSize > 1024)
+            UpdateStatus?.
+                Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)");
+        else
+            UpdateStatus?.
+                Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize} bytes)");
+
+        if(blocks == 0)
+        {
+            _dumpLog.WriteLine("ERROR: Unable to read medium or empty medium present...");
+            StoppingErrorMessage?.Invoke("Unable to read medium or empty medium present...");
+
+            return;
+        }
+
+        UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
+        UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
+        UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
+        UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
+
+        if(blocks > 262144)
+        {
+            dskType = MediaType.MemoryStickProDuo;
+            _dumpLog.WriteLine("Media detected as MemoryStick Pro Duo...");
+            UpdateStatus?.Invoke("Media detected as MemoryStick Pro Duo...");
+        }
+        else
+        {
+            dskType = MediaType.MemoryStickDuo;
+            _dumpLog.WriteLine("Media detected as MemoryStick Duo...");
+            UpdateStatus?.Invoke("Media detected as MemoryStick Duo...");
+        }
+
+        bool ret;
+
+        var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
+        var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", sbcProfile);
+        ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
+
+        // Cannot create image
+        if(!ret)
+        {
+            _dumpLog.WriteLine("Error creating output image, not continuing.");
+            _dumpLog.WriteLine(outputFormat.ErrorMessage);
+
+            StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
+                                         outputFormat.ErrorMessage);
+
+            return;
+        }
+
+        start = DateTime.UtcNow;
+        double imageWriteDuration = 0;
+
+        DumpHardwareType currentTry = null;
+        ExtentsULong     extents    = null;
+
+        ResumeSupport.Process(true, _dev.IsRemovable, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial,
+                              _dev.PlatformId, ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision,
+                              _private, _force);
+
+        if(currentTry == null ||
+           extents    == null)
+        {
+            StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
+
+            return;
+        }
+
+        if(_resume.NextBlock > 0)
+            _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
+
+        bool newTrim = false;
+
+        DateTime timeSpeedStart   = DateTime.UtcNow;
+        ulong    sectorSpeedStart = 0;
+        InitProgress?.Invoke();
+
+        for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
+        {
+            if(_aborted)
             {
-                _dumpLog.WriteLine("Could not detect capacity...");
-                StoppingErrorMessage?.Invoke("Could not detect capacity...");
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
 
-                return;
+                break;
             }
 
-            uint blocks = (uint)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]);
+            if(blocks - i < blocksToRead)
+                blocksToRead = (uint)(blocks - i);
 
-            blocks++;
+            if(currentSpeed > maxSpeed &&
+               currentSpeed > 0)
+                maxSpeed = currentSpeed;
 
-            ulong totalSize = blocks * (ulong)blockSize;
+            if(currentSpeed < minSpeed &&
+               currentSpeed > 0)
+                minSpeed = currentSpeed;
 
-            if(totalSize > 1099511627776)
-                UpdateStatus?.
-                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)");
-            else if(totalSize > 1073741824)
-                UpdateStatus?.
-                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)");
-            else if(totalSize > 1048576)
-                UpdateStatus?.
-                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)");
-            else if(totalSize > 1024)
-                UpdateStatus?.
-                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)");
-            else
-                UpdateStatus?.
-                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize} bytes)");
+            UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i, blocks);
 
-            if(blocks == 0)
+            sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, (uint)i, blockSize, 0,
+                                blocksToRead, false, _dev.Timeout, out double cmdDuration);
+
+            totalDuration += cmdDuration;
+
+            if(!sense &&
+               !_dev.Error)
             {
-                _dumpLog.WriteLine("ERROR: Unable to read medium or empty medium present...");
-                StoppingErrorMessage?.Invoke("Unable to read medium or empty medium present...");
-
-                return;
-            }
-
-            UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
-            UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
-            UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
-            UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
-
-            if(blocks > 262144)
-            {
-                dskType = MediaType.MemoryStickProDuo;
-                _dumpLog.WriteLine("Media detected as MemoryStick Pro Duo...");
-                UpdateStatus?.Invoke("Media detected as MemoryStick Pro Duo...");
+                mhddLog.Write(i, cmdDuration);
+                ibgLog.Write(i, currentSpeed * 1024);
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(readBuffer, i, blocksToRead);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                extents.Add(i, blocksToRead, true);
             }
             else
             {
-                dskType = MediaType.MemoryStickDuo;
-                _dumpLog.WriteLine("Media detected as MemoryStick Duo...");
-                UpdateStatus?.Invoke("Media detected as MemoryStick Duo...");
+                _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
+
+                // TODO: Reset device after X errors
+                if(_stopOnError)
+                    return; // TODO: Return more cleanly
+
+                if(i + _skip > blocks)
+                    _skip = (uint)(blocks - i);
+
+                // Write empty data
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+
+                for(ulong b = i; b < i + _skip; b++)
+                    _resume.BadBlocks.Add(b);
+
+                mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+
+                ibgLog.Write(i, 0);
+                _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
+                i       += _skip - blocksToRead;
+                newTrim =  true;
             }
 
-            bool ret;
+            sectorSpeedStart  += blocksToRead;
+            _resume.NextBlock =  i + blocksToRead;
 
-            var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
-            var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", sbcProfile);
-            ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
+            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
 
-            // Cannot create image
-            if(!ret)
-            {
-                _dumpLog.WriteLine("Error creating output image, not continuing.");
-                _dumpLog.WriteLine(outputFormat.ErrorMessage);
+            if(elapsed <= 0)
+                continue;
 
-                StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
-                                             outputFormat.ErrorMessage);
+            currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+            sectorSpeedStart = 0;
+            timeSpeedStart   = DateTime.UtcNow;
+        }
 
-                return;
-            }
+        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
 
+        end = DateTime.UtcNow;
+        EndProgress?.Invoke();
+        mhddLog.Close();
+
+        ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                     blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+
+        UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+
+        UpdateStatus?.
+            Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
+
+        UpdateStatus?.
+            Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
+
+        _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
+
+        _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
+
+        _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
+
+        #region Trimming
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _trim                       &&
+           newTrim)
+        {
             start = DateTime.UtcNow;
-            double imageWriteDuration = 0;
+            UpdateStatus?.Invoke("Trimming skipped sectors");
+            _dumpLog.WriteLine("Trimming skipped sectors");
 
-            DumpHardwareType currentTry = null;
-            ExtentsULong     extents    = null;
-
-            ResumeSupport.Process(true, _dev.IsRemovable, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial,
-                                  _dev.PlatformId, ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision,
-                                  _private, _force);
-
-            if(currentTry == null ||
-               extents    == null)
-            {
-                StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
-
-                return;
-            }
-
-            if(_resume.NextBlock > 0)
-                _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
-
-            bool newTrim = false;
-
-            DateTime timeSpeedStart   = DateTime.UtcNow;
-            ulong    sectorSpeedStart = 0;
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
             InitProgress?.Invoke();
 
-            for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
+            foreach(ulong badSector in tmpArray)
             {
                 if(_aborted)
                 {
@@ -185,491 +302,373 @@ namespace Aaru.Core.Devices.Dumping
                     break;
                 }
 
-                if(blocks - i < blocksToRead)
-                    blocksToRead = (uint)(blocks - i);
+                PulseProgress?.Invoke($"Trimming sector {badSector}");
 
-                if(currentSpeed > maxSpeed &&
-                   currentSpeed > 0)
-                    maxSpeed = currentSpeed;
+                sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, (uint)badSector,
+                                    blockSize, 0, 1, false, _dev.Timeout, out double _);
 
-                if(currentSpeed < minSpeed &&
-                   currentSpeed > 0)
-                    minSpeed = currentSpeed;
-
-                UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i, blocks);
-
-                sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, (uint)i, blockSize, 0,
-                                    blocksToRead, false, _dev.Timeout, out double cmdDuration);
-
-                totalDuration += cmdDuration;
-
-                if(!sense &&
-                   !_dev.Error)
+                if(sense || _dev.Error)
                 {
-                    mhddLog.Write(i, cmdDuration);
-                    ibgLog.Write(i, currentSpeed * 1024);
-                    DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(readBuffer, i, blocksToRead);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                    extents.Add(i, blocksToRead, true);
+                    _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
+
+                    continue;
+                }
+
+                _resume.BadBlocks.Remove(badSector);
+                extents.Add(badSector);
+                outputFormat.WriteSector(readBuffer, badSector);
+            }
+
+            EndProgress?.Invoke();
+            end = DateTime.UtcNow;
+            _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+        }
+        #endregion Trimming
+
+        #region Error handling
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _retryPasses > 0)
+        {
+            int  pass              = 1;
+            bool forward           = true;
+            bool runningPersistent = false;
+
+            Modes.ModePage? currentModePage = null;
+            byte[]          md6;
+
+            if(_persistent)
+            {
+                Modes.ModePage_01 pg;
+
+                sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
+                                        _dev.Timeout, out _);
+
+                if(sense)
+                {
+                    sense = _dev.ModeSense10(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
+                                             _dev.Timeout, out _);
+
+                    if(!sense)
+                    {
+                        Modes.DecodedMode? dcMode10 = Modes.DecodeMode10(readBuffer, _dev.ScsiType);
+
+                        if(dcMode10.HasValue)
+                            foreach(Modes.ModePage modePage in dcMode10.Value.Pages.Where(modePage =>
+                                        modePage.Page == 0x01 && modePage.Subpage == 0x00))
+                                currentModePage = modePage;
+                    }
                 }
                 else
                 {
-                    _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
+                    Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(readBuffer, _dev.ScsiType);
 
-                    // TODO: Reset device after X errors
-                    if(_stopOnError)
-                        return; // TODO: Return more cleanly
-
-                    if(i + _skip > blocks)
-                        _skip = (uint)(blocks - i);
-
-                    // Write empty data
-                    DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-
-                    for(ulong b = i; b < i + _skip; b++)
-                        _resume.BadBlocks.Add(b);
-
-                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                    ibgLog.Write(i, 0);
-                    _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
-                    i       += _skip - blocksToRead;
-                    newTrim =  true;
-                }
-
-                sectorSpeedStart  += blocksToRead;
-                _resume.NextBlock =  i + blocksToRead;
-
-                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                if(elapsed <= 0)
-                    continue;
-
-                currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                sectorSpeedStart = 0;
-                timeSpeedStart   = DateTime.UtcNow;
-            }
-
-            _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
-
-            end = DateTime.UtcNow;
-            EndProgress?.Invoke();
-            mhddLog.Close();
-
-            ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                         blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
-
-            UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
-
-            UpdateStatus?.
-                Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
-
-            UpdateStatus?.
-                Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
-
-            _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
-
-            _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
-
-            _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
-
-            #region Trimming
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _trim                       &&
-               newTrim)
-            {
-                start = DateTime.UtcNow;
-                UpdateStatus?.Invoke("Trimming skipped sectors");
-                _dumpLog.WriteLine("Trimming skipped sectors");
-
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
-                InitProgress?.Invoke();
-
-                foreach(ulong badSector in tmpArray)
-                {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    PulseProgress?.Invoke($"Trimming sector {badSector}");
-
-                    sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, (uint)badSector,
-                                        blockSize, 0, 1, false, _dev.Timeout, out double _);
-
-                    if(sense || _dev.Error)
-                    {
-                        _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
-
-                        continue;
-                    }
-
-                    _resume.BadBlocks.Remove(badSector);
-                    extents.Add(badSector);
-                    outputFormat.WriteSector(readBuffer, badSector);
-                }
-
-                EndProgress?.Invoke();
-                end = DateTime.UtcNow;
-                _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
-            }
-            #endregion Trimming
-
-            #region Error handling
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _retryPasses > 0)
-            {
-                int  pass              = 1;
-                bool forward           = true;
-                bool runningPersistent = false;
-
-                Modes.ModePage? currentModePage = null;
-                byte[]          md6;
-
-                if(_persistent)
-                {
-                    Modes.ModePage_01 pg;
-
-                    sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
-                                            _dev.Timeout, out _);
-
-                    if(sense)
-                    {
-                        sense = _dev.ModeSense10(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
-                                                 _dev.Timeout, out _);
-
-                        if(!sense)
-                        {
-                            Modes.DecodedMode? dcMode10 = Modes.DecodeMode10(readBuffer, _dev.ScsiType);
-
-                            if(dcMode10.HasValue)
-                                foreach(Modes.ModePage modePage in dcMode10.Value.Pages.Where(modePage =>
+                    if(dcMode6.HasValue)
+                        foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
                                     modePage.Page == 0x01 && modePage.Subpage == 0x00))
-                                    currentModePage = modePage;
-                        }
-                    }
-                    else
+                            currentModePage = modePage;
+                }
+
+                if(currentModePage == null)
+                {
+                    pg = new Modes.ModePage_01
                     {
-                        Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(readBuffer, _dev.ScsiType);
+                        PS             = false,
+                        AWRE           = true,
+                        ARRE           = true,
+                        TB             = false,
+                        RC             = false,
+                        EER            = true,
+                        PER            = false,
+                        DTE            = true,
+                        DCR            = false,
+                        ReadRetryCount = 32
+                    };
 
-                        if(dcMode6.HasValue)
-                            foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
-                                modePage.Page == 0x01 && modePage.Subpage == 0x00))
-                                currentModePage = modePage;
-                    }
-
-                    if(currentModePage == null)
+                    currentModePage = new Modes.ModePage
                     {
-                        pg = new Modes.ModePage_01
-                        {
-                            PS             = false,
-                            AWRE           = true,
-                            ARRE           = true,
-                            TB             = false,
-                            RC             = false,
-                            EER            = true,
-                            PER            = false,
-                            DTE            = true,
-                            DCR            = false,
-                            ReadRetryCount = 32
-                        };
+                        Page         = 0x01,
+                        Subpage      = 0x00,
+                        PageResponse = Modes.EncodeModePage_01(pg)
+                    };
+                }
 
-                        currentModePage = new Modes.ModePage
+                pg = new Modes.ModePage_01
+                {
+                    PS             = false,
+                    AWRE           = false,
+                    ARRE           = false,
+                    TB             = true,
+                    RC             = false,
+                    EER            = true,
+                    PER            = false,
+                    DTE            = false,
+                    DCR            = false,
+                    ReadRetryCount = 255
+                };
+
+                var md = new Modes.DecodedMode
+                {
+                    Header = new Modes.ModeHeader(),
+                    Pages = new[]
+                    {
+                        new Modes.ModePage
                         {
                             Page         = 0x01,
                             Subpage      = 0x00,
                             PageResponse = Modes.EncodeModePage_01(pg)
-                        };
-                    }
-
-                    pg = new Modes.ModePage_01
-                    {
-                        PS             = false,
-                        AWRE           = false,
-                        ARRE           = false,
-                        TB             = true,
-                        RC             = false,
-                        EER            = true,
-                        PER            = false,
-                        DTE            = false,
-                        DCR            = false,
-                        ReadRetryCount = 255
-                    };
-
-                    var md = new Modes.DecodedMode
-                    {
-                        Header = new Modes.ModeHeader(),
-                        Pages = new[]
-                        {
-                            new Modes.ModePage
-                            {
-                                Page         = 0x01,
-                                Subpage      = 0x00,
-                                PageResponse = Modes.EncodeModePage_01(pg)
-                            }
                         }
-                    };
-
-                    md6 = Modes.EncodeMode6(md, _dev.ScsiType);
-
-                    UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks).");
-                    _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
-                    sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
-
-                    if(sense)
-                    {
-                        UpdateStatus?.
-                            Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
-
-                        AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
-
-                        _dumpLog.
-                            WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
                     }
-                    else
-                        runningPersistent = true;
-                }
+                };
 
-                InitProgress?.Invoke();
-                repeatRetry:
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
+                md6 = Modes.EncodeMode6(md, _dev.ScsiType);
 
-                foreach(ulong badSector in tmpArray)
+                UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks).");
+                _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
+                sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
+
+                if(sense)
                 {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        _dumpLog.WriteLine("Aborted!");
+                    UpdateStatus?.
+                        Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
 
-                        break;
-                    }
+                    AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
 
-                    PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
-                                                        forward ? "forward" : "reverse",
-                                                        runningPersistent ? "recovering partial data, " : ""));
-
-                    sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, (uint)badSector,
-                                        blockSize, 0, 1, false, _dev.Timeout, out double cmdDuration);
-
-                    totalDuration += cmdDuration;
-
-                    if(sense || _dev.Error)
-                        _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
-
-                    if(!sense &&
-                       !_dev.Error)
-                    {
-                        _resume.BadBlocks.Remove(badSector);
-                        extents.Add(badSector);
-                        outputFormat.WriteSector(readBuffer, badSector);
-                        UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
-                        _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
-                    }
-                    else if(runningPersistent)
-                        outputFormat.WriteSector(readBuffer, badSector);
+                    _dumpLog.
+                        WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
                 }
-
-                if(pass < _retryPasses &&
-                   !_aborted           &&
-                   _resume.BadBlocks.Count > 0)
-                {
-                    pass++;
-                    forward = !forward;
-                    _resume.BadBlocks.Sort();
-
-                    if(!forward)
-                        _resume.BadBlocks.Reverse();
-
-                    goto repeatRetry;
-                }
-
-                if(runningPersistent && currentModePage.HasValue)
-                {
-                    var md = new Modes.DecodedMode
-                    {
-                        Header = new Modes.ModeHeader(),
-                        Pages = new[]
-                        {
-                            currentModePage.Value
-                        }
-                    };
-
-                    md6 = Modes.EncodeMode6(md, _dev.ScsiType);
-
-                    UpdateStatus?.Invoke("Sending MODE SELECT to drive (return device to previous status).");
-                    _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
-                    _dev.ModeSelect(md6, out _, true, false, _dev.Timeout, out _);
-                }
-
-                EndProgress?.Invoke();
+                else
+                    runningPersistent = true;
             }
-            #endregion Error handling
 
-            _resume.BadBlocks.Sort();
+            InitProgress?.Invoke();
+            repeatRetry:
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
 
-            foreach(ulong bad in _resume.BadBlocks)
-                _dumpLog.WriteLine("Sector {0} could not be read.", bad);
-
-            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-
-            var metadata = new CommonTypes.Structs.ImageInfo
+            foreach(ulong badSector in tmpArray)
             {
-                Application        = "Aaru",
-                ApplicationVersion = Version.GetVersion()
-            };
+                if(_aborted)
+                {
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                    _dumpLog.WriteLine("Aborted!");
 
-            if(!outputFormat.SetMetadata(metadata))
-                ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
-                                     outputFormat.ErrorMessage);
+                    break;
+                }
 
-            outputFormat.SetDumpHardware(_resume.Tries);
+                PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
+                                                    forward ? "forward" : "reverse",
+                                                    runningPersistent ? "recovering partial data, " : ""));
 
-            if(_preSidecar != null)
-                outputFormat.SetCicmMetadata(_preSidecar);
+                sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, (uint)badSector,
+                                    blockSize, 0, 1, false, _dev.Timeout, out double cmdDuration);
 
-            _dumpLog.WriteLine("Closing output file.");
-            UpdateStatus?.Invoke("Closing output file.");
-            DateTime closeStart = DateTime.Now;
-            outputFormat.Close();
-            DateTime closeEnd = DateTime.Now;
-            UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
-            _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
+                totalDuration += cmdDuration;
 
-            if(_aborted)
+                if(sense || _dev.Error)
+                    _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
+
+                if(!sense &&
+                   !_dev.Error)
+                {
+                    _resume.BadBlocks.Remove(badSector);
+                    extents.Add(badSector);
+                    outputFormat.WriteSector(readBuffer, badSector);
+                    UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
+                    _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
+                }
+                else if(runningPersistent)
+                    outputFormat.WriteSector(readBuffer, badSector);
+            }
+
+            if(pass < _retryPasses &&
+               !_aborted           &&
+               _resume.BadBlocks.Count > 0)
             {
-                UpdateStatus?.Invoke("Aborted!");
-                _dumpLog.WriteLine("Aborted!");
+                pass++;
+                forward = !forward;
+                _resume.BadBlocks.Sort();
+
+                if(!forward)
+                    _resume.BadBlocks.Reverse();
+
+                goto repeatRetry;
+            }
+
+            if(runningPersistent && currentModePage.HasValue)
+            {
+                var md = new Modes.DecodedMode
+                {
+                    Header = new Modes.ModeHeader(),
+                    Pages = new[]
+                    {
+                        currentModePage.Value
+                    }
+                };
+
+                md6 = Modes.EncodeMode6(md, _dev.ScsiType);
+
+                UpdateStatus?.Invoke("Sending MODE SELECT to drive (return device to previous status).");
+                _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
+                _dev.ModeSelect(md6, out _, true, false, _dev.Timeout, out _);
+            }
+
+            EndProgress?.Invoke();
+        }
+        #endregion Error handling
+
+        _resume.BadBlocks.Sort();
+
+        foreach(ulong bad in _resume.BadBlocks)
+            _dumpLog.WriteLine("Sector {0} could not be read.", bad);
+
+        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+
+        var metadata = new CommonTypes.Structs.ImageInfo
+        {
+            Application        = "Aaru",
+            ApplicationVersion = Version.GetVersion()
+        };
+
+        if(!outputFormat.SetMetadata(metadata))
+            ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
+                                 outputFormat.ErrorMessage);
+
+        outputFormat.SetDumpHardware(_resume.Tries);
+
+        if(_preSidecar != null)
+            outputFormat.SetCicmMetadata(_preSidecar);
+
+        _dumpLog.WriteLine("Closing output file.");
+        UpdateStatus?.Invoke("Closing output file.");
+        DateTime closeStart = DateTime.Now;
+        outputFormat.Close();
+        DateTime closeEnd = DateTime.Now;
+        UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
+        _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
+
+        if(_aborted)
+        {
+            UpdateStatus?.Invoke("Aborted!");
+            _dumpLog.WriteLine("Aborted!");
+
+            return;
+        }
+
+        double totalChkDuration = 0;
+
+        if(_metadata)
+        {
+            UpdateStatus?.Invoke("Creating sidecar.");
+            _dumpLog.WriteLine("Creating sidecar.");
+            var         filters     = new FiltersList();
+            IFilter     filter      = filters.GetFilter(_outputPath);
+            IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
+            ErrorNumber opened      = inputPlugin.Open(filter);
+
+            if(opened != ErrorNumber.NoError)
+            {
+                StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
 
                 return;
             }
 
-            double totalChkDuration = 0;
+            DateTime chkStart = DateTime.UtcNow;
+            _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
+            _sidecarClass.InitProgressEvent    += InitProgress;
+            _sidecarClass.UpdateProgressEvent  += UpdateProgress;
+            _sidecarClass.EndProgressEvent     += EndProgress;
+            _sidecarClass.InitProgressEvent2   += InitProgress2;
+            _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
+            _sidecarClass.EndProgressEvent2    += EndProgress2;
+            _sidecarClass.UpdateStatusEvent    += UpdateStatus;
+            CICMMetadataType sidecar = _sidecarClass.Create();
+            end = DateTime.UtcNow;
 
-            if(_metadata)
+            if(!_aborted)
             {
-                UpdateStatus?.Invoke("Creating sidecar.");
-                _dumpLog.WriteLine("Creating sidecar.");
-                var         filters     = new FiltersList();
-                IFilter     filter      = filters.GetFilter(_outputPath);
-                IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
-                ErrorNumber opened      = inputPlugin.Open(filter);
+                totalChkDuration = (end - chkStart).TotalMilliseconds;
+                UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds.");
 
-                if(opened != ErrorNumber.NoError)
+                UpdateStatus?.
+                    Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
+
+                _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
+
+                _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
+                                   blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
+
+                if(_preSidecar != null)
                 {
-                    StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
-
-                    return;
+                    _preSidecar.BlockMedia = sidecar.BlockMedia;
+                    sidecar                = _preSidecar;
                 }
 
-                DateTime chkStart = DateTime.UtcNow;
-                _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
-                _sidecarClass.InitProgressEvent    += InitProgress;
-                _sidecarClass.UpdateProgressEvent  += UpdateProgress;
-                _sidecarClass.EndProgressEvent     += EndProgress;
-                _sidecarClass.InitProgressEvent2   += InitProgress2;
-                _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
-                _sidecarClass.EndProgressEvent2    += EndProgress2;
-                _sidecarClass.UpdateStatusEvent    += UpdateStatus;
-                CICMMetadataType sidecar = _sidecarClass.Create();
-                end = DateTime.UtcNow;
+                List<(ulong start, string type)> filesystems = new();
 
-                if(!_aborted)
-                {
-                    totalChkDuration = (end - chkStart).TotalMilliseconds;
-                    UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds.");
+                if(sidecar.BlockMedia[0].FileSystemInformation != null)
+                    filesystems.AddRange(from partition in sidecar.BlockMedia[0].FileSystemInformation
+                                         where partition.FileSystems != null
+                                         from fileSystem in partition.FileSystems
+                                         select (partition.StartSector, fileSystem.Type));
 
-                    UpdateStatus?.
-                        Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
-
-                    _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
-
-                    _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
-                                       blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
-
-                    if(_preSidecar != null)
+                if(filesystems.Count > 0)
+                    foreach(var filesystem in filesystems.Select(o => new
+                            {
+                                o.start,
+                                o.type
+                            }).Distinct())
                     {
-                        _preSidecar.BlockMedia = sidecar.BlockMedia;
-                        sidecar                = _preSidecar;
+                        UpdateStatus?.Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
+                        _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start);
                     }
 
-                    List<(ulong start, string type)> filesystems = new();
+                sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType);
+                (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
+                sidecar.BlockMedia[0].DiskType          = xmlType.type;
+                sidecar.BlockMedia[0].DiskSubType       = xmlType.subType;
+                sidecar.BlockMedia[0].Interface         = "USB";
+                sidecar.BlockMedia[0].LogicalBlocks     = blocks;
+                sidecar.BlockMedia[0].PhysicalBlockSize = (int)blockSize;
+                sidecar.BlockMedia[0].LogicalBlockSize  = (int)blockSize;
+                sidecar.BlockMedia[0].Manufacturer      = _dev.Manufacturer;
+                sidecar.BlockMedia[0].Model             = _dev.Model;
 
-                    if(sidecar.BlockMedia[0].FileSystemInformation != null)
-                        filesystems.AddRange(from partition in sidecar.BlockMedia[0].FileSystemInformation
-                                             where partition.FileSystems != null
-                                             from fileSystem in partition.FileSystems
-                                             select (partition.StartSector, fileSystem.Type));
+                if(!_private)
+                    sidecar.BlockMedia[0].Serial = _dev.Serial;
 
-                    if(filesystems.Count > 0)
-                        foreach(var filesystem in filesystems.Select(o => new
-                        {
-                            o.start,
-                            o.type
-                        }).Distinct())
-                        {
-                            UpdateStatus?.Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
-                            _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start);
-                        }
+                sidecar.BlockMedia[0].Size = blocks * blockSize;
 
-                    sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType);
-                    (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
-                    sidecar.BlockMedia[0].DiskType          = xmlType.type;
-                    sidecar.BlockMedia[0].DiskSubType       = xmlType.subType;
-                    sidecar.BlockMedia[0].Interface         = "USB";
-                    sidecar.BlockMedia[0].LogicalBlocks     = blocks;
-                    sidecar.BlockMedia[0].PhysicalBlockSize = (int)blockSize;
-                    sidecar.BlockMedia[0].LogicalBlockSize  = (int)blockSize;
-                    sidecar.BlockMedia[0].Manufacturer      = _dev.Manufacturer;
-                    sidecar.BlockMedia[0].Model             = _dev.Model;
+                if(_dev.IsRemovable)
+                    sidecar.BlockMedia[0].DumpHardwareArray = _resume.Tries.ToArray();
 
-                    if(!_private)
-                        sidecar.BlockMedia[0].Serial = _dev.Serial;
+                UpdateStatus?.Invoke("Writing metadata sidecar");
 
-                    sidecar.BlockMedia[0].Size = blocks * blockSize;
+                var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
 
-                    if(_dev.IsRemovable)
-                        sidecar.BlockMedia[0].DumpHardwareArray = _resume.Tries.ToArray();
-
-                    UpdateStatus?.Invoke("Writing metadata sidecar");
-
-                    var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
-
-                    var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
-                    xmlSer.Serialize(xmlFs, sidecar);
-                    xmlFs.Close();
-                }
+                var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
+                xmlSer.Serialize(xmlFs, sidecar);
+                xmlFs.Close();
             }
-
-            UpdateStatus?.Invoke("");
-
-            UpdateStatus?.
-                Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
-
-            UpdateStatus?.
-                Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
-
-            if(maxSpeed > 0)
-                UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
-
-            if(minSpeed > 0 &&
-               minSpeed < double.MaxValue)
-                UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
-
-            UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
-            UpdateStatus?.Invoke("");
-
-            Statistics.AddMedia(dskType, true);
         }
+
+        UpdateStatus?.Invoke("");
+
+        UpdateStatus?.
+            Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+
+        UpdateStatus?.
+            Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+
+        if(maxSpeed > 0)
+            UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+
+        if(minSpeed > 0 &&
+           minSpeed < double.MaxValue)
+            UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+
+        UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
+        UpdateStatus?.Invoke("");
+
+        Statistics.AddMedia(dskType, true);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/PlayStationPortable.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/PlayStationPortable.cs
index 28c7d662e..1cc05fad5 100644
--- a/Aaru.Core/Devices/Dumping/PlayStationPortable/PlayStationPortable.cs
+++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/PlayStationPortable.cs
@@ -38,178 +38,177 @@ using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+public partial class Dump
 {
-    public partial class Dump
+    static readonly byte[] _fatSignature =
     {
-        static readonly byte[] _fatSignature =
+        0x46, 0x41, 0x54, 0x31, 0x36, 0x20, 0x20, 0x20
+    };
+    static readonly byte[] _isoExtension =
+    {
+        0x49, 0x53, 0x4F
+    };
+
+    /// <summary>Dumps a CFW PlayStation Portable UMD</summary>
+    void PlayStationPortable()
+    {
+        if(!_outputPlugin.SupportedMediaTypes.Contains(MediaType.MemoryStickDuo)    &&
+           !_outputPlugin.SupportedMediaTypes.Contains(MediaType.MemoryStickProDuo) &&
+           !_outputPlugin.SupportedMediaTypes.Contains(MediaType.UMD))
         {
-            0x46, 0x41, 0x54, 0x31, 0x36, 0x20, 0x20, 0x20
-        };
-        static readonly byte[] _isoExtension =
-        {
-            0x49, 0x53, 0x4F
-        };
+            _dumpLog.WriteLine("Selected output plugin does not support MemoryStick Duo or UMD, cannot dump...");
 
-        /// <summary>Dumps a CFW PlayStation Portable UMD</summary>
-        void PlayStationPortable()
-        {
-            if(!_outputPlugin.SupportedMediaTypes.Contains(MediaType.MemoryStickDuo)    &&
-               !_outputPlugin.SupportedMediaTypes.Contains(MediaType.MemoryStickProDuo) &&
-               !_outputPlugin.SupportedMediaTypes.Contains(MediaType.UMD))
-            {
-                _dumpLog.WriteLine("Selected output plugin does not support MemoryStick Duo or UMD, cannot dump...");
+            StoppingErrorMessage?.
+                Invoke("Selected output plugin does not support MemoryStick Duo or UMD, cannot dump...");
 
-                StoppingErrorMessage?.
-                    Invoke("Selected output plugin does not support MemoryStick Duo or UMD, cannot dump...");
-
-                return;
-            }
-
-            UpdateStatus?.Invoke("Checking if media is UMD or MemoryStick...");
-            _dumpLog.WriteLine("Checking if media is UMD or MemoryStick...");
-
-            bool sense = _dev.ModeSense6(out byte[] buffer, out _, false, ScsiModeSensePageControl.Current, 0,
-                                         _dev.Timeout, out _);
-
-            if(sense)
-            {
-                _dumpLog.WriteLine("Could not get MODE SENSE...");
-                StoppingErrorMessage?.Invoke("Could not get MODE SENSE...");
-
-                return;
-            }
-
-            Modes.DecodedMode? decoded = Modes.DecodeMode6(buffer, PeripheralDeviceTypes.DirectAccess);
-
-            if(!decoded.HasValue)
-            {
-                _dumpLog.WriteLine("Could not decode MODE SENSE...");
-                StoppingErrorMessage?.Invoke("Could not decode MODE SENSE...");
-
-                return;
-            }
-
-            // UMDs are always write protected
-            if(!decoded.Value.Header.WriteProtected)
-            {
-                DumpMs();
-
-                return;
-            }
-
-            sense = _dev.Read12(out buffer, out _, 0, false, true, false, false, 0, 512, 0, 1, false, _dev.Timeout,
-                                out _);
-
-            if(sense)
-            {
-                _dumpLog.WriteLine("Could not read...");
-                StoppingErrorMessage?.Invoke("Could not read...");
-
-                return;
-            }
-
-            byte[] tmp = new byte[8];
-
-            Array.Copy(buffer, 0x36, tmp, 0, 8);
-
-            // UMDs are stored inside a FAT16 volume
-            if(!tmp.SequenceEqual(_fatSignature))
-            {
-                DumpMs();
-
-                return;
-            }
-
-            ushort fatStart      = (ushort)((buffer[0x0F] << 8) + buffer[0x0E]);
-            ushort sectorsPerFat = (ushort)((buffer[0x17] << 8) + buffer[0x16]);
-            ushort rootStart     = (ushort)((sectorsPerFat * 2) + fatStart);
-
-            UpdateStatus?.Invoke($"Reading root directory in sector {rootStart}...");
-            _dumpLog.WriteLine("Reading root directory in sector {0}...", rootStart);
-
-            sense = _dev.Read12(out buffer, out _, 0, false, true, false, false, rootStart, 512, 0, 1, false,
-                                _dev.Timeout, out _);
-
-            if(sense)
-            {
-                StoppingErrorMessage?.Invoke("Could not read...");
-                _dumpLog.WriteLine("Could not read...");
-
-                return;
-            }
-
-            tmp = new byte[3];
-            Array.Copy(buffer, 0x28, tmp, 0, 3);
-
-            if(!tmp.SequenceEqual(_isoExtension))
-            {
-                DumpMs();
-
-                return;
-            }
-
-            UpdateStatus?.Invoke($"FAT starts at sector {fatStart} and runs for {sectorsPerFat} sectors...");
-            _dumpLog.WriteLine("FAT starts at sector {0} and runs for {1} sectors...", fatStart, sectorsPerFat);
-
-            UpdateStatus?.Invoke("Reading FAT...");
-            _dumpLog.WriteLine("Reading FAT...");
-
-            byte[] fat = new byte[sectorsPerFat * 512];
-
-            uint position = 0;
-
-            while(position < sectorsPerFat)
-            {
-                uint transfer = 64;
-
-                if(transfer + position > sectorsPerFat)
-                    transfer = sectorsPerFat - position;
-
-                sense = _dev.Read12(out buffer, out _, 0, false, true, false, false, position + fatStart, 512, 0,
-                                    transfer, false, _dev.Timeout, out _);
-
-                if(sense)
-                {
-                    StoppingErrorMessage?.Invoke("Could not read...");
-                    _dumpLog.WriteLine("Could not read...");
-
-                    return;
-                }
-
-                Array.Copy(buffer, 0, fat, position * 512, transfer * 512);
-
-                position += transfer;
-            }
-
-            UpdateStatus?.Invoke("Traversing FAT...");
-            _dumpLog.WriteLine("Traversing FAT...");
-
-            ushort previousCluster = BitConverter.ToUInt16(fat, 4);
-
-            for(int i = 3; i < fat.Length / 2; i++)
-            {
-                ushort nextCluster = BitConverter.ToUInt16(fat, i * 2);
-
-                if(nextCluster == previousCluster + 1)
-                {
-                    previousCluster = nextCluster;
-
-                    continue;
-                }
-
-                if(nextCluster == 0xFFFF)
-                    break;
-
-                DumpMs();
-
-                return;
-            }
-
-            if(_outputPlugin is IWritableOpticalImage)
-                DumpUmd();
-            else
-                StoppingErrorMessage?.Invoke("The specified plugin does not support storing optical disc images.");
+            return;
         }
+
+        UpdateStatus?.Invoke("Checking if media is UMD or MemoryStick...");
+        _dumpLog.WriteLine("Checking if media is UMD or MemoryStick...");
+
+        bool sense = _dev.ModeSense6(out byte[] buffer, out _, false, ScsiModeSensePageControl.Current, 0,
+                                     _dev.Timeout, out _);
+
+        if(sense)
+        {
+            _dumpLog.WriteLine("Could not get MODE SENSE...");
+            StoppingErrorMessage?.Invoke("Could not get MODE SENSE...");
+
+            return;
+        }
+
+        Modes.DecodedMode? decoded = Modes.DecodeMode6(buffer, PeripheralDeviceTypes.DirectAccess);
+
+        if(!decoded.HasValue)
+        {
+            _dumpLog.WriteLine("Could not decode MODE SENSE...");
+            StoppingErrorMessage?.Invoke("Could not decode MODE SENSE...");
+
+            return;
+        }
+
+        // UMDs are always write protected
+        if(!decoded.Value.Header.WriteProtected)
+        {
+            DumpMs();
+
+            return;
+        }
+
+        sense = _dev.Read12(out buffer, out _, 0, false, true, false, false, 0, 512, 0, 1, false, _dev.Timeout,
+                            out _);
+
+        if(sense)
+        {
+            _dumpLog.WriteLine("Could not read...");
+            StoppingErrorMessage?.Invoke("Could not read...");
+
+            return;
+        }
+
+        byte[] tmp = new byte[8];
+
+        Array.Copy(buffer, 0x36, tmp, 0, 8);
+
+        // UMDs are stored inside a FAT16 volume
+        if(!tmp.SequenceEqual(_fatSignature))
+        {
+            DumpMs();
+
+            return;
+        }
+
+        ushort fatStart      = (ushort)((buffer[0x0F] << 8) + buffer[0x0E]);
+        ushort sectorsPerFat = (ushort)((buffer[0x17] << 8) + buffer[0x16]);
+        ushort rootStart     = (ushort)((sectorsPerFat * 2) + fatStart);
+
+        UpdateStatus?.Invoke($"Reading root directory in sector {rootStart}...");
+        _dumpLog.WriteLine("Reading root directory in sector {0}...", rootStart);
+
+        sense = _dev.Read12(out buffer, out _, 0, false, true, false, false, rootStart, 512, 0, 1, false,
+                            _dev.Timeout, out _);
+
+        if(sense)
+        {
+            StoppingErrorMessage?.Invoke("Could not read...");
+            _dumpLog.WriteLine("Could not read...");
+
+            return;
+        }
+
+        tmp = new byte[3];
+        Array.Copy(buffer, 0x28, tmp, 0, 3);
+
+        if(!tmp.SequenceEqual(_isoExtension))
+        {
+            DumpMs();
+
+            return;
+        }
+
+        UpdateStatus?.Invoke($"FAT starts at sector {fatStart} and runs for {sectorsPerFat} sectors...");
+        _dumpLog.WriteLine("FAT starts at sector {0} and runs for {1} sectors...", fatStart, sectorsPerFat);
+
+        UpdateStatus?.Invoke("Reading FAT...");
+        _dumpLog.WriteLine("Reading FAT...");
+
+        byte[] fat = new byte[sectorsPerFat * 512];
+
+        uint position = 0;
+
+        while(position < sectorsPerFat)
+        {
+            uint transfer = 64;
+
+            if(transfer + position > sectorsPerFat)
+                transfer = sectorsPerFat - position;
+
+            sense = _dev.Read12(out buffer, out _, 0, false, true, false, false, position + fatStart, 512, 0,
+                                transfer, false, _dev.Timeout, out _);
+
+            if(sense)
+            {
+                StoppingErrorMessage?.Invoke("Could not read...");
+                _dumpLog.WriteLine("Could not read...");
+
+                return;
+            }
+
+            Array.Copy(buffer, 0, fat, position * 512, transfer * 512);
+
+            position += transfer;
+        }
+
+        UpdateStatus?.Invoke("Traversing FAT...");
+        _dumpLog.WriteLine("Traversing FAT...");
+
+        ushort previousCluster = BitConverter.ToUInt16(fat, 4);
+
+        for(int i = 3; i < fat.Length / 2; i++)
+        {
+            ushort nextCluster = BitConverter.ToUInt16(fat, i * 2);
+
+            if(nextCluster == previousCluster + 1)
+            {
+                previousCluster = nextCluster;
+
+                continue;
+            }
+
+            if(nextCluster == 0xFFFF)
+                break;
+
+            DumpMs();
+
+            return;
+        }
+
+        if(_outputPlugin is IWritableOpticalImage)
+            DumpUmd();
+        else
+            StoppingErrorMessage?.Invoke("The specified plugin does not support storing optical disc images.");
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs b/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs
index 1e2db9634..e601bfef2 100644
--- a/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs
+++ b/Aaru.Core/Devices/Dumping/PlayStationPortable/UMD.cs
@@ -48,543 +48,542 @@ using Schemas;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+public partial class Dump
 {
-    public partial class Dump
+    [SuppressMessage("ReSharper", "JoinDeclarationAndInitializer")]
+    void DumpUmd()
     {
-        [SuppressMessage("ReSharper", "JoinDeclarationAndInitializer")]
-        void DumpUmd()
+        const uint      blockSize     = 2048;
+        const MediaType dskType       = MediaType.UMD;
+        uint            blocksToRead  = 16;
+        double          totalDuration = 0;
+        double          currentSpeed  = 0;
+        double          maxSpeed      = double.MinValue;
+        double          minSpeed      = double.MaxValue;
+        DateTime        start;
+        DateTime        end;
+        byte[]          senseBuf;
+        var             outputOptical = _outputPlugin as IWritableOpticalImage;
+
+        bool sense = _dev.Read12(out byte[] readBuffer, out _, 0, false, true, false, false, 0, 512, 0, 1, false,
+                                 _dev.Timeout, out _);
+
+        if(sense)
         {
-            const uint      blockSize     = 2048;
-            const MediaType dskType       = MediaType.UMD;
-            uint            blocksToRead  = 16;
-            double          totalDuration = 0;
-            double          currentSpeed  = 0;
-            double          maxSpeed      = double.MinValue;
-            double          minSpeed      = double.MaxValue;
-            DateTime        start;
-            DateTime        end;
-            byte[]          senseBuf;
-            var             outputOptical = _outputPlugin as IWritableOpticalImage;
+            _dumpLog.WriteLine("Could not read...");
+            StoppingErrorMessage?.Invoke("Could not read...");
 
-            bool sense = _dev.Read12(out byte[] readBuffer, out _, 0, false, true, false, false, 0, 512, 0, 1, false,
-                                     _dev.Timeout, out _);
+            return;
+        }
 
-            if(sense)
+        ushort fatStart      = (ushort)((readBuffer[0x0F] << 8) + readBuffer[0x0E]);
+        ushort sectorsPerFat = (ushort)((readBuffer[0x17] << 8) + readBuffer[0x16]);
+        ushort rootStart     = (ushort)((sectorsPerFat * 2)     + fatStart);
+        ushort rootSize      = (ushort)(((readBuffer[0x12] << 8) + readBuffer[0x11]) * 32 / 512);
+        ushort umdStart      = (ushort)(rootStart + rootSize);
+
+        UpdateStatus?.Invoke($"Reading root directory in sector {rootStart}...");
+        _dumpLog.WriteLine("Reading root directory in sector {0}...", rootStart);
+
+        sense = _dev.Read12(out readBuffer, out _, 0, false, true, false, false, rootStart, 512, 0, 1, false,
+                            _dev.Timeout, out _);
+
+        if(sense)
+        {
+            _dumpLog.WriteLine("Could not read...");
+            StoppingErrorMessage?.Invoke("Could not read...");
+
+            return;
+        }
+
+        uint   umdSizeInBytes  = BitConverter.ToUInt32(readBuffer, 0x3C);
+        ulong  blocks          = umdSizeInBytes / blockSize;
+        string mediaPartNumber = Encoding.ASCII.GetString(readBuffer, 0, 11).Trim();
+
+        ulong totalSize = blocks * blockSize;
+
+        if(totalSize > 1099511627776)
+            UpdateStatus?.
+                Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)");
+        else if(totalSize > 1073741824)
+            UpdateStatus?.
+                Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)");
+        else if(totalSize > 1048576)
+            UpdateStatus?.
+                Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)");
+        else if(totalSize > 1024)
+            UpdateStatus?.
+                Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)");
+        else
+            UpdateStatus?.
+                Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize} bytes)");
+
+        UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
+        UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
+        UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
+        UpdateStatus?.Invoke($"Device reports {2048} bytes per physical block.");
+        UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
+        UpdateStatus?.Invoke($"Media identified as {dskType}.");
+        UpdateStatus?.Invoke($"Media part number is {mediaPartNumber}.");
+        _dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);
+        _dumpLog.WriteLine("Device can read {0} blocks at a time.", blocksToRead);
+        _dumpLog.WriteLine("Device reports {0} bytes per logical block.", blockSize);
+        _dumpLog.WriteLine("Device reports {0} bytes per physical block.", 2048);
+        _dumpLog.WriteLine("SCSI device type: {0}.", _dev.ScsiType);
+        _dumpLog.WriteLine("Media identified as {0}.", dskType);
+        _dumpLog.WriteLine("Media part number is {0}.", mediaPartNumber);
+
+        bool ret;
+
+        var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
+        var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", 0x0010);
+        ret = outputOptical.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
+
+        // Cannot create image
+        if(!ret)
+        {
+            _dumpLog.WriteLine("Error creating output image, not continuing.");
+            _dumpLog.WriteLine(outputOptical.ErrorMessage);
+
+            StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
+                                         outputOptical.ErrorMessage);
+
+            return;
+        }
+
+        start = DateTime.UtcNow;
+        double imageWriteDuration = 0;
+
+        (outputOptical as IWritableOpticalImage)?.SetTracks(new List<Track>
+        {
+            new Track
             {
-                _dumpLog.WriteLine("Could not read...");
-                StoppingErrorMessage?.Invoke("Could not read...");
+                BytesPerSector    = (int)blockSize,
+                EndSector         = blocks - 1,
+                Sequence          = 1,
+                RawBytesPerSector = (int)blockSize,
+                SubchannelType    = TrackSubchannelType.None,
+                Session           = 1,
+                Type              = TrackType.Data
+            }
+        });
 
-                return;
+        DumpHardwareType currentTry = null;
+        ExtentsULong     extents    = null;
+
+        ResumeSupport.Process(true, _dev.IsRemovable, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial,
+                              _dev.PlatformId, ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision,
+                              _private, _force);
+
+        if(currentTry == null ||
+           extents    == null)
+        {
+            StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
+
+            return;
+        }
+
+        if(_resume.NextBlock > 0)
+            _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
+
+        bool newTrim = false;
+
+        DateTime timeSpeedStart   = DateTime.UtcNow;
+        ulong    sectorSpeedStart = 0;
+        InitProgress?.Invoke();
+
+        for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
+        {
+            if(_aborted)
+            {
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
+
+                break;
             }
 
-            ushort fatStart      = (ushort)((readBuffer[0x0F] << 8) + readBuffer[0x0E]);
-            ushort sectorsPerFat = (ushort)((readBuffer[0x17] << 8) + readBuffer[0x16]);
-            ushort rootStart     = (ushort)((sectorsPerFat * 2)     + fatStart);
-            ushort rootSize      = (ushort)(((readBuffer[0x12] << 8) + readBuffer[0x11]) * 32 / 512);
-            ushort umdStart      = (ushort)(rootStart + rootSize);
+            if(blocks - i < blocksToRead)
+                blocksToRead = (uint)(blocks - i);
 
-            UpdateStatus?.Invoke($"Reading root directory in sector {rootStart}...");
-            _dumpLog.WriteLine("Reading root directory in sector {0}...", rootStart);
+            if(currentSpeed > maxSpeed &&
+               currentSpeed > 0)
+                maxSpeed = currentSpeed;
 
-            sense = _dev.Read12(out readBuffer, out _, 0, false, true, false, false, rootStart, 512, 0, 1, false,
-                                _dev.Timeout, out _);
+            if(currentSpeed < minSpeed &&
+               currentSpeed > 0)
+                minSpeed = currentSpeed;
 
-            if(sense)
+            UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
+                                   (long)blocks);
+
+            sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false,
+                                (uint)(umdStart + (i * 4)), 512, 0, blocksToRead * 4, false, _dev.Timeout,
+                                out double cmdDuration);
+
+            totalDuration += cmdDuration;
+
+            if(!sense &&
+               !_dev.Error)
             {
-                _dumpLog.WriteLine("Could not read...");
-                StoppingErrorMessage?.Invoke("Could not read...");
-
-                return;
+                mhddLog.Write(i, cmdDuration);
+                ibgLog.Write(i, currentSpeed * 1024);
+                DateTime writeStart = DateTime.Now;
+                outputOptical.WriteSectors(readBuffer, i, blocksToRead);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                extents.Add(i, blocksToRead, true);
             }
-
-            uint   umdSizeInBytes  = BitConverter.ToUInt32(readBuffer, 0x3C);
-            ulong  blocks          = umdSizeInBytes / blockSize;
-            string mediaPartNumber = Encoding.ASCII.GetString(readBuffer, 0, 11).Trim();
-
-            ulong totalSize = blocks * blockSize;
-
-            if(totalSize > 1099511627776)
-                UpdateStatus?.
-                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)");
-            else if(totalSize > 1073741824)
-                UpdateStatus?.
-                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)");
-            else if(totalSize > 1048576)
-                UpdateStatus?.
-                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)");
-            else if(totalSize > 1024)
-                UpdateStatus?.
-                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)");
             else
-                UpdateStatus?.
-                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize} bytes)");
-
-            UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
-            UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
-            UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
-            UpdateStatus?.Invoke($"Device reports {2048} bytes per physical block.");
-            UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
-            UpdateStatus?.Invoke($"Media identified as {dskType}.");
-            UpdateStatus?.Invoke($"Media part number is {mediaPartNumber}.");
-            _dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);
-            _dumpLog.WriteLine("Device can read {0} blocks at a time.", blocksToRead);
-            _dumpLog.WriteLine("Device reports {0} bytes per logical block.", blockSize);
-            _dumpLog.WriteLine("Device reports {0} bytes per physical block.", 2048);
-            _dumpLog.WriteLine("SCSI device type: {0}.", _dev.ScsiType);
-            _dumpLog.WriteLine("Media identified as {0}.", dskType);
-            _dumpLog.WriteLine("Media part number is {0}.", mediaPartNumber);
-
-            bool ret;
-
-            var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
-            var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", 0x0010);
-            ret = outputOptical.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
-
-            // Cannot create image
-            if(!ret)
             {
-                _dumpLog.WriteLine("Error creating output image, not continuing.");
-                _dumpLog.WriteLine(outputOptical.ErrorMessage);
+                _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
 
-                StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
-                                             outputOptical.ErrorMessage);
+                // TODO: Reset device after X errors
+                if(_stopOnError)
+                    return; // TODO: Return more cleanly
 
-                return;
+                if(i + _skip > blocks)
+                    _skip = (uint)(blocks - i);
+
+                // Write empty data
+                DateTime writeStart = DateTime.Now;
+                outputOptical.WriteSectors(new byte[blockSize * _skip], i, _skip);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+
+                for(ulong b = i; b < i + _skip; b++)
+                    _resume.BadBlocks.Add(b);
+
+                mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+
+                ibgLog.Write(i, 0);
+                _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
+                i       += _skip - blocksToRead;
+                newTrim =  true;
             }
 
+            sectorSpeedStart  += blocksToRead;
+            _resume.NextBlock =  i + blocksToRead;
+
+            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+            if(elapsed <= 0)
+                continue;
+
+            currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+            sectorSpeedStart = 0;
+            timeSpeedStart   = DateTime.UtcNow;
+        }
+
+        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+
+        end = DateTime.UtcNow;
+        EndProgress?.Invoke();
+        mhddLog.Close();
+
+        ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                     blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+
+        UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+
+        UpdateStatus?.
+            Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
+
+        UpdateStatus?.
+            Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
+
+        _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
+
+        _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
+
+        _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
+
+        #region Trimming
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _trim                       &&
+           newTrim)
+        {
             start = DateTime.UtcNow;
-            double imageWriteDuration = 0;
+            _dumpLog.WriteLine("Trimming skipped sectors");
 
-            (outputOptical as IWritableOpticalImage)?.SetTracks(new List<Track>
-            {
-                new Track
-                {
-                    BytesPerSector    = (int)blockSize,
-                    EndSector         = blocks - 1,
-                    Sequence          = 1,
-                    RawBytesPerSector = (int)blockSize,
-                    SubchannelType    = TrackSubchannelType.None,
-                    Session           = 1,
-                    Type              = TrackType.Data
-                }
-            });
-
-            DumpHardwareType currentTry = null;
-            ExtentsULong     extents    = null;
-
-            ResumeSupport.Process(true, _dev.IsRemovable, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial,
-                                  _dev.PlatformId, ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision,
-                                  _private, _force);
-
-            if(currentTry == null ||
-               extents    == null)
-            {
-                StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
-
-                return;
-            }
-
-            if(_resume.NextBlock > 0)
-                _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
-
-            bool newTrim = false;
-
-            DateTime timeSpeedStart   = DateTime.UtcNow;
-            ulong    sectorSpeedStart = 0;
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
             InitProgress?.Invoke();
 
-            for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
+            foreach(ulong badSector in tmpArray)
             {
                 if(_aborted)
                 {
                     currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    UpdateStatus?.Invoke("Aborted!");
                     _dumpLog.WriteLine("Aborted!");
 
                     break;
                 }
 
-                if(blocks - i < blocksToRead)
-                    blocksToRead = (uint)(blocks - i);
-
-                if(currentSpeed > maxSpeed &&
-                   currentSpeed > 0)
-                    maxSpeed = currentSpeed;
-
-                if(currentSpeed < minSpeed &&
-                   currentSpeed > 0)
-                    minSpeed = currentSpeed;
-
-                UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
-                                       (long)blocks);
+                PulseProgress?.Invoke($"Trimming sector {badSector}");
 
                 sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false,
-                                    (uint)(umdStart + (i * 4)), 512, 0, blocksToRead * 4, false, _dev.Timeout,
-                                    out double cmdDuration);
+                                    (uint)(umdStart + (badSector * 4)), 512, 0, 4, false, _dev.Timeout,
+                                    out double _);
 
-                totalDuration += cmdDuration;
-
-                if(!sense &&
-                   !_dev.Error)
+                if(sense || _dev.Error)
                 {
-                    mhddLog.Write(i, cmdDuration);
-                    ibgLog.Write(i, currentSpeed * 1024);
-                    DateTime writeStart = DateTime.Now;
-                    outputOptical.WriteSectors(readBuffer, i, blocksToRead);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                    extents.Add(i, blocksToRead, true);
-                }
-                else
-                {
-                    _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
+                    _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
 
-                    // TODO: Reset device after X errors
-                    if(_stopOnError)
-                        return; // TODO: Return more cleanly
-
-                    if(i + _skip > blocks)
-                        _skip = (uint)(blocks - i);
-
-                    // Write empty data
-                    DateTime writeStart = DateTime.Now;
-                    outputOptical.WriteSectors(new byte[blockSize * _skip], i, _skip);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-
-                    for(ulong b = i; b < i + _skip; b++)
-                        _resume.BadBlocks.Add(b);
-
-                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                    ibgLog.Write(i, 0);
-                    _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
-                    i       += _skip - blocksToRead;
-                    newTrim =  true;
-                }
-
-                sectorSpeedStart  += blocksToRead;
-                _resume.NextBlock =  i + blocksToRead;
-
-                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                if(elapsed <= 0)
                     continue;
-
-                currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                sectorSpeedStart = 0;
-                timeSpeedStart   = DateTime.UtcNow;
-            }
-
-            _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
-
-            end = DateTime.UtcNow;
-            EndProgress?.Invoke();
-            mhddLog.Close();
-
-            ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                         blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
-
-            UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
-
-            UpdateStatus?.
-                Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
-
-            UpdateStatus?.
-                Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
-
-            _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
-
-            _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
-
-            _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
-
-            #region Trimming
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _trim                       &&
-               newTrim)
-            {
-                start = DateTime.UtcNow;
-                _dumpLog.WriteLine("Trimming skipped sectors");
-
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
-                InitProgress?.Invoke();
-
-                foreach(ulong badSector in tmpArray)
-                {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    PulseProgress?.Invoke($"Trimming sector {badSector}");
-
-                    sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false,
-                                        (uint)(umdStart + (badSector * 4)), 512, 0, 4, false, _dev.Timeout,
-                                        out double _);
-
-                    if(sense || _dev.Error)
-                    {
-                        _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
-
-                        continue;
-                    }
-
-                    _resume.BadBlocks.Remove(badSector);
-                    extents.Add(badSector);
-                    outputOptical.WriteSector(readBuffer, badSector);
                 }
 
-                EndProgress?.Invoke();
-                end = DateTime.UtcNow;
-                _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+                _resume.BadBlocks.Remove(badSector);
+                extents.Add(badSector);
+                outputOptical.WriteSector(readBuffer, badSector);
             }
-            #endregion Trimming
 
-            #region Error handling
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _retryPasses > 0)
+            EndProgress?.Invoke();
+            end = DateTime.UtcNow;
+            _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+        }
+        #endregion Trimming
+
+        #region Error handling
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _retryPasses > 0)
+        {
+            int  pass              = 1;
+            bool forward           = true;
+            bool runningPersistent = false;
+
+            Modes.ModePage? currentModePage = null;
+            byte[]          md6;
+
+            if(_persistent)
             {
-                int  pass              = 1;
-                bool forward           = true;
-                bool runningPersistent = false;
+                Modes.ModePage_01 pg;
 
-                Modes.ModePage? currentModePage = null;
-                byte[]          md6;
+                sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
+                                        _dev.Timeout, out _);
 
-                if(_persistent)
+                if(!sense)
                 {
-                    Modes.ModePage_01 pg;
+                    Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(readBuffer, _dev.ScsiType);
 
-                    sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
-                                            _dev.Timeout, out _);
+                    if(dcMode6.HasValue)
+                        foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
+                                    modePage.Page == 0x01 && modePage.Subpage == 0x00))
+                            currentModePage = modePage;
+                }
 
-                    if(!sense)
+                if(currentModePage == null)
+                {
+                    pg = new Modes.ModePage_01
                     {
-                        Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(readBuffer, _dev.ScsiType);
+                        PS             = false,
+                        AWRE           = true,
+                        ARRE           = true,
+                        TB             = false,
+                        RC             = false,
+                        EER            = true,
+                        PER            = false,
+                        DTE            = true,
+                        DCR            = false,
+                        ReadRetryCount = 32
+                    };
 
-                        if(dcMode6.HasValue)
-                            foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
-                                modePage.Page == 0x01 && modePage.Subpage == 0x00))
-                                currentModePage = modePage;
-                    }
-
-                    if(currentModePage == null)
+                    currentModePage = new Modes.ModePage
                     {
-                        pg = new Modes.ModePage_01
-                        {
-                            PS             = false,
-                            AWRE           = true,
-                            ARRE           = true,
-                            TB             = false,
-                            RC             = false,
-                            EER            = true,
-                            PER            = false,
-                            DTE            = true,
-                            DCR            = false,
-                            ReadRetryCount = 32
-                        };
+                        Page         = 0x01,
+                        Subpage      = 0x00,
+                        PageResponse = Modes.EncodeModePage_01(pg)
+                    };
+                }
 
-                        currentModePage = new Modes.ModePage
+                pg = new Modes.ModePage_01
+                {
+                    PS             = false,
+                    AWRE           = false,
+                    ARRE           = false,
+                    TB             = true,
+                    RC             = false,
+                    EER            = true,
+                    PER            = false,
+                    DTE            = false,
+                    DCR            = false,
+                    ReadRetryCount = 255
+                };
+
+                var md = new Modes.DecodedMode
+                {
+                    Header = new Modes.ModeHeader(),
+                    Pages = new[]
+                    {
+                        new Modes.ModePage
                         {
                             Page         = 0x01,
                             Subpage      = 0x00,
                             PageResponse = Modes.EncodeModePage_01(pg)
-                        };
-                    }
-
-                    pg = new Modes.ModePage_01
-                    {
-                        PS             = false,
-                        AWRE           = false,
-                        ARRE           = false,
-                        TB             = true,
-                        RC             = false,
-                        EER            = true,
-                        PER            = false,
-                        DTE            = false,
-                        DCR            = false,
-                        ReadRetryCount = 255
-                    };
-
-                    var md = new Modes.DecodedMode
-                    {
-                        Header = new Modes.ModeHeader(),
-                        Pages = new[]
-                        {
-                            new Modes.ModePage
-                            {
-                                Page         = 0x01,
-                                Subpage      = 0x00,
-                                PageResponse = Modes.EncodeModePage_01(pg)
-                            }
                         }
-                    };
-
-                    md6 = Modes.EncodeMode6(md, _dev.ScsiType);
-
-                    _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
-                    sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
-
-                    if(sense)
-                    {
-                        UpdateStatus?.
-                            Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
-
-                        AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
-
-                        _dumpLog.
-                            WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
                     }
-                    else
-                        runningPersistent = true;
-                }
+                };
 
-                InitProgress?.Invoke();
-                repeatRetry:
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
+                md6 = Modes.EncodeMode6(md, _dev.ScsiType);
 
-                foreach(ulong badSector in tmpArray)
+                _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
+                sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
+
+                if(sense)
                 {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        _dumpLog.WriteLine("Aborted!");
+                    UpdateStatus?.
+                        Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
 
-                        break;
-                    }
+                    AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
 
-                    PulseProgress?.
-                        Invoke($"Retrying sector {badSector}, pass {pass}, {(runningPersistent ? "recovering partial data, " : "")}{(forward ? "forward" : "reverse")}");
-
-                    sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false,
-                                        (uint)(umdStart + (badSector * 4)), 512, 0, 4, false, _dev.Timeout,
-                                        out double cmdDuration);
-
-                    totalDuration += cmdDuration;
-
-                    if(sense || _dev.Error)
-                        _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
-
-                    if(!sense &&
-                       !_dev.Error)
-                    {
-                        _resume.BadBlocks.Remove(badSector);
-                        extents.Add(badSector);
-                        outputOptical.WriteSector(readBuffer, badSector);
-
-                        UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
-
-                        _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
-                    }
-                    else if(runningPersistent)
-                        outputOptical.WriteSector(readBuffer, badSector);
+                    _dumpLog.
+                        WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
                 }
-
-                if(pass < _retryPasses &&
-                   !_aborted           &&
-                   _resume.BadBlocks.Count > 0)
-                {
-                    pass++;
-                    forward = !forward;
-                    _resume.BadBlocks.Sort();
-
-                    if(!forward)
-                        _resume.BadBlocks.Reverse();
-
-                    goto repeatRetry;
-                }
-
-                if(runningPersistent && currentModePage.HasValue)
-                {
-                    var md = new Modes.DecodedMode
-                    {
-                        Header = new Modes.ModeHeader(),
-                        Pages = new[]
-                        {
-                            currentModePage.Value
-                        }
-                    };
-
-                    md6 = Modes.EncodeMode6(md, _dev.ScsiType);
-
-                    _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
-                    _dev.ModeSelect(md6, out _, true, false, _dev.Timeout, out _);
-                }
-
-                EndProgress?.Invoke();
-                AaruConsole.WriteLine();
-            }
-            #endregion Error handling
-
-            _resume.BadBlocks.Sort();
-
-            foreach(ulong bad in _resume.BadBlocks)
-                _dumpLog.WriteLine("Sector {0} could not be read.", bad);
-
-            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-
-            var metadata = new CommonTypes.Structs.ImageInfo
-            {
-                Application        = "Aaru",
-                ApplicationVersion = Version.GetVersion(),
-                MediaPartNumber    = mediaPartNumber
-            };
-
-            if(!outputOptical.SetMetadata(metadata))
-                ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
-                                     outputOptical.ErrorMessage);
-
-            outputOptical.SetDumpHardware(_resume.Tries);
-
-            if(_preSidecar != null)
-                outputOptical.SetCicmMetadata(_preSidecar);
-
-            _dumpLog.WriteLine("Closing output file.");
-            UpdateStatus?.Invoke("Closing output file.");
-            DateTime closeStart = DateTime.Now;
-            outputOptical.Close();
-            DateTime closeEnd = DateTime.Now;
-            _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
-
-            if(_aborted)
-            {
-                UpdateStatus?.Invoke("Aborted!");
-                _dumpLog.WriteLine("Aborted!");
-
-                return;
+                else
+                    runningPersistent = true;
             }
 
-            double totalChkDuration = 0;
+            InitProgress?.Invoke();
+            repeatRetry:
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
 
-            if(_metadata)
-                WriteOpticalSidecar(blockSize, blocks, dskType, null, null, 1, out totalChkDuration, null);
+            foreach(ulong badSector in tmpArray)
+            {
+                if(_aborted)
+                {
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                    _dumpLog.WriteLine("Aborted!");
 
-            UpdateStatus?.Invoke("");
+                    break;
+                }
 
-            UpdateStatus?.
-                Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+                PulseProgress?.
+                    Invoke($"Retrying sector {badSector}, pass {pass}, {(runningPersistent ? "recovering partial data, " : "")}{(forward ? "forward" : "reverse")}");
 
-            UpdateStatus?.
-                Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+                sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false,
+                                    (uint)(umdStart + (badSector * 4)), 512, 0, 4, false, _dev.Timeout,
+                                    out double cmdDuration);
 
-            if(maxSpeed > 0)
-                UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+                totalDuration += cmdDuration;
 
-            if(minSpeed > 0 &&
-               minSpeed < double.MaxValue)
-                UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+                if(sense || _dev.Error)
+                    _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
 
-            UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
-            UpdateStatus?.Invoke("");
+                if(!sense &&
+                   !_dev.Error)
+                {
+                    _resume.BadBlocks.Remove(badSector);
+                    extents.Add(badSector);
+                    outputOptical.WriteSector(readBuffer, badSector);
 
-            Statistics.AddMedia(dskType, true);
+                    UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
+
+                    _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
+                }
+                else if(runningPersistent)
+                    outputOptical.WriteSector(readBuffer, badSector);
+            }
+
+            if(pass < _retryPasses &&
+               !_aborted           &&
+               _resume.BadBlocks.Count > 0)
+            {
+                pass++;
+                forward = !forward;
+                _resume.BadBlocks.Sort();
+
+                if(!forward)
+                    _resume.BadBlocks.Reverse();
+
+                goto repeatRetry;
+            }
+
+            if(runningPersistent && currentModePage.HasValue)
+            {
+                var md = new Modes.DecodedMode
+                {
+                    Header = new Modes.ModeHeader(),
+                    Pages = new[]
+                    {
+                        currentModePage.Value
+                    }
+                };
+
+                md6 = Modes.EncodeMode6(md, _dev.ScsiType);
+
+                _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
+                _dev.ModeSelect(md6, out _, true, false, _dev.Timeout, out _);
+            }
+
+            EndProgress?.Invoke();
+            AaruConsole.WriteLine();
         }
+        #endregion Error handling
+
+        _resume.BadBlocks.Sort();
+
+        foreach(ulong bad in _resume.BadBlocks)
+            _dumpLog.WriteLine("Sector {0} could not be read.", bad);
+
+        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+
+        var metadata = new CommonTypes.Structs.ImageInfo
+        {
+            Application        = "Aaru",
+            ApplicationVersion = Version.GetVersion(),
+            MediaPartNumber    = mediaPartNumber
+        };
+
+        if(!outputOptical.SetMetadata(metadata))
+            ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
+                                 outputOptical.ErrorMessage);
+
+        outputOptical.SetDumpHardware(_resume.Tries);
+
+        if(_preSidecar != null)
+            outputOptical.SetCicmMetadata(_preSidecar);
+
+        _dumpLog.WriteLine("Closing output file.");
+        UpdateStatus?.Invoke("Closing output file.");
+        DateTime closeStart = DateTime.Now;
+        outputOptical.Close();
+        DateTime closeEnd = DateTime.Now;
+        _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
+
+        if(_aborted)
+        {
+            UpdateStatus?.Invoke("Aborted!");
+            _dumpLog.WriteLine("Aborted!");
+
+            return;
+        }
+
+        double totalChkDuration = 0;
+
+        if(_metadata)
+            WriteOpticalSidecar(blockSize, blocks, dskType, null, null, 1, out totalChkDuration, null);
+
+        UpdateStatus?.Invoke("");
+
+        UpdateStatus?.
+            Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+
+        UpdateStatus?.
+            Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+
+        if(maxSpeed > 0)
+            UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+
+        if(minSpeed > 0 &&
+           minSpeed < double.MaxValue)
+            UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+
+        UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
+        UpdateStatus?.Invoke("");
+
+        Statistics.AddMedia(dskType, true);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/ResumeSupport.cs b/Aaru.Core/Devices/Dumping/ResumeSupport.cs
index 4b9b473aa..5d8a92797 100644
--- a/Aaru.Core/Devices/Dumping/ResumeSupport.cs
+++ b/Aaru.Core/Devices/Dumping/ResumeSupport.cs
@@ -38,138 +38,137 @@ using Schemas;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+/// <summary>Implements resume support</summary>
+internal static class ResumeSupport
 {
-    /// <summary>Implements resume support</summary>
-    internal static class ResumeSupport
+    /// <summary>Process resume</summary>
+    /// <param name="isLba">If drive is LBA</param>
+    /// <param name="removable">If media is removable from device</param>
+    /// <param name="blocks">Media blocks</param>
+    /// <param name="manufacturer">Device manufacturer</param>
+    /// <param name="model">Device model</param>
+    /// <param name="serial">Device serial</param>
+    /// <param name="platform">Platform where the dump is made</param>
+    /// <param name="resume">Previous resume, or null</param>
+    /// <param name="currentTry">Current dumping hardware</param>
+    /// <param name="extents">Dumped extents</param>
+    /// <param name="firmware">Firmware revision</param>
+    /// <param name="isTape">Set to <c>true</c> if device is a streaming tape, <c>false</c> otherwise</param>
+    /// <param name="private">Disable saving paths or serial numbers in images and logs</param>
+    /// <param name="force">Force dump enabled</param>
+    /// <exception cref="System.NotImplementedException">If device uses CHS addressing</exception>
+    /// <exception cref="System.InvalidOperationException">
+    ///     If the provided resume does not correspond with the current in
+    ///     progress dump
+    /// </exception>
+    internal static void Process(bool isLba, bool removable, ulong blocks, string manufacturer, string model,
+                                 string serial, PlatformID platform, ref Resume resume,
+                                 ref DumpHardwareType currentTry, ref ExtentsULong extents, string firmware,
+                                 bool @private, bool force, bool isTape = false)
     {
-        /// <summary>Process resume</summary>
-        /// <param name="isLba">If drive is LBA</param>
-        /// <param name="removable">If media is removable from device</param>
-        /// <param name="blocks">Media blocks</param>
-        /// <param name="manufacturer">Device manufacturer</param>
-        /// <param name="model">Device model</param>
-        /// <param name="serial">Device serial</param>
-        /// <param name="platform">Platform where the dump is made</param>
-        /// <param name="resume">Previous resume, or null</param>
-        /// <param name="currentTry">Current dumping hardware</param>
-        /// <param name="extents">Dumped extents</param>
-        /// <param name="firmware">Firmware revision</param>
-        /// <param name="isTape">Set to <c>true</c> if device is a streaming tape, <c>false</c> otherwise</param>
-        /// <param name="private">Disable saving paths or serial numbers in images and logs</param>
-        /// <param name="force">Force dump enabled</param>
-        /// <exception cref="System.NotImplementedException">If device uses CHS addressing</exception>
-        /// <exception cref="System.InvalidOperationException">
-        ///     If the provided resume does not correspond with the current in
-        ///     progress dump
-        /// </exception>
-        internal static void Process(bool isLba, bool removable, ulong blocks, string manufacturer, string model,
-                                     string serial, PlatformID platform, ref Resume resume,
-                                     ref DumpHardwareType currentTry, ref ExtentsULong extents, string firmware,
-                                     bool @private, bool force, bool isTape = false)
+        if(@private)
+            serial = null;
+
+        if(resume != null)
         {
-            if(@private)
-                serial = null;
+            if(!isLba)
+                throw new NotImplementedException("Resuming CHS devices is currently not supported.");
 
-            if(resume != null)
+            if(resume.Tape != isTape)
+                throw new
+                    InvalidOperationException($"Resume file specifies a {(resume.Tape ? "tape" : "not tape")} device but you're requesting to dump a {(isTape ? "tape" : "not tape")} device, not continuing...");
+
+            if(resume.Removable != removable &&
+               !force)
+                throw new
+                    InvalidOperationException($"Resume file specifies a {(resume.Removable ? "removable" : "non removable")} device but you're requesting to dump a {(removable ? "removable" : "non removable")} device, not continuing...");
+
+            if(!isTape                        &&
+               resume.LastBlock != blocks - 1 &&
+               !force)
+                throw new
+                    InvalidOperationException($"Resume file specifies a device with {resume.LastBlock + 1} blocks but you're requesting to dump one with {blocks} blocks, not continuing...");
+
+            foreach(DumpHardwareType oldTry in resume.Tries)
             {
-                if(!isLba)
-                    throw new NotImplementedException("Resuming CHS devices is currently not supported.");
-
-                if(resume.Tape != isTape)
-                    throw new
-                        InvalidOperationException($"Resume file specifies a {(resume.Tape ? "tape" : "not tape")} device but you're requesting to dump a {(isTape ? "tape" : "not tape")} device, not continuing...");
-
-                if(resume.Removable != removable &&
+                if(!removable &&
                    !force)
-                    throw new
-                        InvalidOperationException($"Resume file specifies a {(resume.Removable ? "removable" : "non removable")} device but you're requesting to dump a {(removable ? "removable" : "non removable")} device, not continuing...");
-
-                if(!isTape                        &&
-                   resume.LastBlock != blocks - 1 &&
-                   !force)
-                    throw new
-                        InvalidOperationException($"Resume file specifies a device with {resume.LastBlock + 1} blocks but you're requesting to dump one with {blocks} blocks, not continuing...");
-
-                foreach(DumpHardwareType oldTry in resume.Tries)
                 {
-                    if(!removable &&
-                       !force)
-                    {
-                        if(oldTry.Manufacturer != manufacturer)
-                            throw new
-                                InvalidOperationException($"Resume file specifies a device manufactured by {oldTry.Manufacturer} but you're requesting to dump one by {manufacturer}, not continuing...");
+                    if(oldTry.Manufacturer != manufacturer)
+                        throw new
+                            InvalidOperationException($"Resume file specifies a device manufactured by {oldTry.Manufacturer} but you're requesting to dump one by {manufacturer}, not continuing...");
 
-                        if(oldTry.Model != model)
-                            throw new
-                                InvalidOperationException($"Resume file specifies a device model {oldTry.Model} but you're requesting to dump model {model}, not continuing...");
+                    if(oldTry.Model != model)
+                        throw new
+                            InvalidOperationException($"Resume file specifies a device model {oldTry.Model} but you're requesting to dump model {model}, not continuing...");
 
-                        if(oldTry.Serial != serial)
-                            throw new
-                                InvalidOperationException($"Resume file specifies a device with serial {oldTry.Serial} but you're requesting to dump one with serial {serial}, not continuing...");
+                    if(oldTry.Serial != serial)
+                        throw new
+                            InvalidOperationException($"Resume file specifies a device with serial {oldTry.Serial} but you're requesting to dump one with serial {serial}, not continuing...");
 
-                        if(oldTry.Firmware != firmware)
-                            throw new
-                                InvalidOperationException($"Resume file specifies a device with firmware version {oldTry.Firmware} but you're requesting to dump one with firmware version {firmware}, not continuing...");
-                    }
-
-                    if(oldTry.Software == null)
-                        throw new InvalidOperationException("Found corrupt resume file, cannot continue...");
-
-                    if(oldTry.Software.Name            != "Aaru"              ||
-                       oldTry.Software.OperatingSystem != platform.ToString() ||
-                       oldTry.Software.Version         != Version.GetVersion())
-                        continue;
-
-                    if(removable && (oldTry.Manufacturer != manufacturer || oldTry.Model    != model ||
-                                     oldTry.Serial       != serial       || oldTry.Firmware != firmware))
-                        continue;
-
-                    currentTry = oldTry;
-                    extents    = ExtentsConverter.FromMetadata(currentTry.Extents);
-
-                    break;
+                    if(oldTry.Firmware != firmware)
+                        throw new
+                            InvalidOperationException($"Resume file specifies a device with firmware version {oldTry.Firmware} but you're requesting to dump one with firmware version {firmware}, not continuing...");
                 }
 
-                if(currentTry != null)
-                    return;
+                if(oldTry.Software == null)
+                    throw new InvalidOperationException("Found corrupt resume file, cannot continue...");
 
-                currentTry = new DumpHardwareType
-                {
-                    Software     = CommonTypes.Metadata.Version.GetSoftwareType(),
-                    Manufacturer = manufacturer,
-                    Model        = model,
-                    Serial       = serial,
-                    Firmware     = firmware
-                };
+                if(oldTry.Software.Name            != "Aaru"              ||
+                   oldTry.Software.OperatingSystem != platform.ToString() ||
+                   oldTry.Software.Version         != Version.GetVersion())
+                    continue;
 
-                resume.Tries.Add(currentTry);
-                extents = new ExtentsULong();
+                if(removable && (oldTry.Manufacturer != manufacturer || oldTry.Model    != model ||
+                                 oldTry.Serial       != serial       || oldTry.Firmware != firmware))
+                    continue;
+
+                currentTry = oldTry;
+                extents    = ExtentsConverter.FromMetadata(currentTry.Extents);
+
+                break;
             }
-            else
+
+            if(currentTry != null)
+                return;
+
+            currentTry = new DumpHardwareType
             {
-                resume = new Resume
-                {
-                    Tries        = new List<DumpHardwareType>(),
-                    CreationDate = DateTime.UtcNow,
-                    BadBlocks    = new List<ulong>(),
-                    LastBlock    = isTape ? 0 : blocks - 1,
-                    Tape         = isTape
-                };
+                Software     = CommonTypes.Metadata.Version.GetSoftwareType(),
+                Manufacturer = manufacturer,
+                Model        = model,
+                Serial       = serial,
+                Firmware     = firmware
+            };
 
-                currentTry = new DumpHardwareType
-                {
-                    Software     = CommonTypes.Metadata.Version.GetSoftwareType(),
-                    Manufacturer = manufacturer,
-                    Model        = model,
-                    Serial       = serial,
-                    Firmware     = firmware
-                };
+            resume.Tries.Add(currentTry);
+            extents = new ExtentsULong();
+        }
+        else
+        {
+            resume = new Resume
+            {
+                Tries        = new List<DumpHardwareType>(),
+                CreationDate = DateTime.UtcNow,
+                BadBlocks    = new List<ulong>(),
+                LastBlock    = isTape ? 0 : blocks - 1,
+                Tape         = isTape
+            };
 
-                resume.Tries.Add(currentTry);
-                extents          = new ExtentsULong();
-                resume.Removable = removable;
-            }
+            currentTry = new DumpHardwareType
+            {
+                Software     = CommonTypes.Metadata.Version.GetSoftwareType(),
+                Manufacturer = manufacturer,
+                Model        = model,
+                Serial       = serial,
+                Firmware     = firmware
+            };
+
+            resume.Tries.Add(currentTry);
+            extents          = new ExtentsULong();
+            resume.Removable = removable;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/SCSI.cs b/Aaru.Core/Devices/Dumping/SCSI.cs
index 83b7c1492..cbdc0dd75 100644
--- a/Aaru.Core/Devices/Dumping/SCSI.cs
+++ b/Aaru.Core/Devices/Dumping/SCSI.cs
@@ -37,167 +37,159 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Decoders.SCSI;
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+/// <summary>Implements dumping SCSI and ATAPI devices</summary>
+public partial class Dump
 {
-    /// <summary>Implements dumping SCSI and ATAPI devices</summary>
-    public partial class Dump
+    // TODO: Get cartridge serial number from Certance vendor EVPD
+    /// <summary>Dumps a SCSI Block Commands device or a Reduced Block Commands devices</summary>
+    void Scsi()
     {
-        // TODO: Get cartridge serial number from Certance vendor EVPD
-        /// <summary>Dumps a SCSI Block Commands device or a Reduced Block Commands devices</summary>
-        void Scsi()
+        int resets = 0;
+
+        if(_dev.IsRemovable)
         {
-            int resets = 0;
+            InitProgress?.Invoke();
+            deviceGotReset:
+            bool sense = _dev.ScsiTestUnitReady(out byte[] senseBuf, _dev.Timeout, out _);
 
-            if(_dev.IsRemovable)
+            if(sense)
             {
-                InitProgress?.Invoke();
-                deviceGotReset:
-                bool sense = _dev.ScsiTestUnitReady(out byte[] senseBuf, _dev.Timeout, out _);
+                DecodedSense? decSense = Sense.Decode(senseBuf);
 
-                if(sense)
+                if(decSense.HasValue)
                 {
-                    DecodedSense? decSense = Sense.Decode(senseBuf);
+                    ErrorMessage?.
+                        Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
 
-                    if(decSense.HasValue)
+                    _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
+                                       decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
+
+                    // Just retry, for 5 times
+                    if(decSense.Value.ASC == 0x29)
                     {
-                        ErrorMessage?.
-                            Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
+                        resets++;
 
-                        _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
-                                           decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
+                        if(resets < 5)
+                            goto deviceGotReset;
+                    }
 
-                        // Just retry, for 5 times
-                        if(decSense.Value.ASC == 0x29)
+                    if(decSense.Value.ASC == 0x3A)
+                    {
+                        int leftRetries = 5;
+
+                        while(leftRetries > 0)
                         {
-                            resets++;
+                            PulseProgress?.Invoke("Waiting for drive to become ready");
+                            Thread.Sleep(2000);
+                            sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
 
-                            if(resets < 5)
-                                goto deviceGotReset;
+                            if(!sense)
+                                break;
+
+                            decSense = Sense.Decode(senseBuf);
+
+                            if(decSense.HasValue)
+                            {
+                                ErrorMessage?.
+                                    Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
+
+                                _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
+                                                   decSense.Value.SenseKey, decSense.Value.ASC,
+                                                   decSense.Value.ASCQ);
+                            }
+
+                            leftRetries--;
                         }
 
-                        if(decSense.Value.ASC == 0x3A)
+                        if(sense)
                         {
-                            int leftRetries = 5;
+                            StoppingErrorMessage?.Invoke("Please insert media in drive");
 
-                            while(leftRetries > 0)
-                            {
-                                PulseProgress?.Invoke("Waiting for drive to become ready");
-                                Thread.Sleep(2000);
-                                sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
-
-                                if(!sense)
-                                    break;
-
-                                decSense = Sense.Decode(senseBuf);
-
-                                if(decSense.HasValue)
-                                {
-                                    ErrorMessage?.
-                                        Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
-
-                                    _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
-                                                       decSense.Value.SenseKey, decSense.Value.ASC,
-                                                       decSense.Value.ASCQ);
-                                }
-
-                                leftRetries--;
-                            }
-
-                            if(sense)
-                            {
-                                StoppingErrorMessage?.Invoke("Please insert media in drive");
-
-                                return;
-                            }
-                        }
-                        else if(decSense.Value.ASC  == 0x04 &&
-                                decSense.Value.ASCQ == 0x01)
-                        {
-                            int leftRetries = 50;
-
-                            while(leftRetries > 0)
-                            {
-                                PulseProgress?.Invoke("Waiting for drive to become ready");
-                                Thread.Sleep(2000);
-                                sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
-
-                                if(!sense)
-                                    break;
-
-                                decSense = Sense.Decode(senseBuf);
-
-                                if(decSense.HasValue)
-                                {
-                                    ErrorMessage?.
-                                        Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
-
-                                    _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
-                                                       decSense.Value.SenseKey, decSense.Value.ASC,
-                                                       decSense.Value.ASCQ);
-                                }
-
-                                leftRetries--;
-                            }
-
-                            if(sense)
-                            {
-                                StoppingErrorMessage?.
-                                    Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
-
-                                return;
-                            }
-                        }
-                        /*else if (decSense.Value.ASC == 0x29 && decSense.Value.ASCQ == 0x00)
-                        {
-                            if (!deviceReset)
-                            {
-                                deviceReset = true;
-                                ErrorMessage?.Invoke("Device did reset, retrying...");
-                                goto retryTestReady;
-                            }
-
-                            StoppingErrorMessage?.Invoke(string.Format("Error testing unit was ready:\n{0}",
-                                                         Decoders.SCSI.Sense.PrettifySense(senseBuf)));
                             return;
-                        }*/
-                        // These should be trapped by the OS but seems in some cases they're not
-                        else if(decSense.Value.ASC == 0x28)
-                        {
-                            int leftRetries = 10;
-
-                            while(leftRetries > 0)
-                            {
-                                PulseProgress?.Invoke("Waiting for drive to become ready");
-                                Thread.Sleep(2000);
-                                sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
-
-                                if(!sense)
-                                    break;
-
-                                decSense = Sense.Decode(senseBuf);
-
-                                if(decSense.HasValue)
-                                {
-                                    ErrorMessage?.
-                                        Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
-
-                                    _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
-                                                       decSense.Value.SenseKey, decSense.Value.ASC,
-                                                       decSense.Value.ASCQ);
-                                }
-
-                                leftRetries--;
-                            }
-
-                            if(sense)
-                            {
-                                StoppingErrorMessage?.
-                                    Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
-
-                                return;
-                            }
                         }
-                        else
+                    }
+                    else if(decSense.Value.ASC  == 0x04 &&
+                            decSense.Value.ASCQ == 0x01)
+                    {
+                        int leftRetries = 50;
+
+                        while(leftRetries > 0)
+                        {
+                            PulseProgress?.Invoke("Waiting for drive to become ready");
+                            Thread.Sleep(2000);
+                            sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
+
+                            if(!sense)
+                                break;
+
+                            decSense = Sense.Decode(senseBuf);
+
+                            if(decSense.HasValue)
+                            {
+                                ErrorMessage?.
+                                    Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
+
+                                _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
+                                                   decSense.Value.SenseKey, decSense.Value.ASC,
+                                                   decSense.Value.ASCQ);
+                            }
+
+                            leftRetries--;
+                        }
+
+                        if(sense)
+                        {
+                            StoppingErrorMessage?.
+                                Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
+
+                            return;
+                        }
+                    }
+                    /*else if (decSense.Value.ASC == 0x29 && decSense.Value.ASCQ == 0x00)
+                    {
+                        if (!deviceReset)
+                        {
+                            deviceReset = true;
+                            ErrorMessage?.Invoke("Device did reset, retrying...");
+                            goto retryTestReady;
+                        }
+
+                        StoppingErrorMessage?.Invoke(string.Format("Error testing unit was ready:\n{0}",
+                                                     Decoders.SCSI.Sense.PrettifySense(senseBuf)));
+                        return;
+                    }*/
+                    // These should be trapped by the OS but seems in some cases they're not
+                    else if(decSense.Value.ASC == 0x28)
+                    {
+                        int leftRetries = 10;
+
+                        while(leftRetries > 0)
+                        {
+                            PulseProgress?.Invoke("Waiting for drive to become ready");
+                            Thread.Sleep(2000);
+                            sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
+
+                            if(!sense)
+                                break;
+
+                            decSense = Sense.Decode(senseBuf);
+
+                            if(decSense.HasValue)
+                            {
+                                ErrorMessage?.
+                                    Invoke($"Device not ready. Sense {decSense.Value.SenseKey} ASC {decSense.Value.ASC:X2}h ASCQ {decSense.Value.ASCQ:X2}h");
+
+                                _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
+                                                   decSense.Value.SenseKey, decSense.Value.ASC,
+                                                   decSense.Value.ASCQ);
+                            }
+
+                            leftRetries--;
+                        }
+
+                        if(sense)
                         {
                             StoppingErrorMessage?.
                                 Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
@@ -207,51 +199,58 @@ namespace Aaru.Core.Devices.Dumping
                     }
                     else
                     {
-                        StoppingErrorMessage?.Invoke("Unknown testing unit was ready.");
+                        StoppingErrorMessage?.
+                            Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
 
                         return;
                     }
                 }
-
-                EndProgress?.Invoke();
-            }
-
-            switch(_dev.ScsiType)
-            {
-                case PeripheralDeviceTypes.SequentialAccess:
-                    if(_dumpRaw)
-                    {
-                        StoppingErrorMessage?.Invoke("Tapes cannot be dumped raw.");
-
-                        return;
-                    }
-
-                    if(_outputPlugin is IWritableTapeImage)
-                        Ssc();
-                    else
-                        StoppingErrorMessage?.
-                            Invoke("The specified plugin does not support storing streaming tape images.");
+                else
+                {
+                    StoppingErrorMessage?.Invoke("Unknown testing unit was ready.");
 
                     return;
-                case PeripheralDeviceTypes.MultiMediaDevice:
-                    if(_outputPlugin is IWritableOpticalImage)
-                        Mmc();
-                    else
-                        StoppingErrorMessage?.
-                            Invoke("The specified plugin does not support storing optical disc images.");
+                }
+            }
+
+            EndProgress?.Invoke();
+        }
+
+        switch(_dev.ScsiType)
+        {
+            case PeripheralDeviceTypes.SequentialAccess:
+                if(_dumpRaw)
+                {
+                    StoppingErrorMessage?.Invoke("Tapes cannot be dumped raw.");
 
                     return;
-                case PeripheralDeviceTypes.BridgingExpander
-                    when _dev.Model.StartsWith("MDM", StringComparison.InvariantCulture) ||
-                         _dev.Model.StartsWith("MDH", StringComparison.InvariantCulture):
-                    MiniDisc();
+                }
 
-                    break;
-                default:
-                    Sbc(null, MediaType.Unknown, false);
+                if(_outputPlugin is IWritableTapeImage)
+                    Ssc();
+                else
+                    StoppingErrorMessage?.
+                        Invoke("The specified plugin does not support storing streaming tape images.");
 
-                    break;
-            }
+                return;
+            case PeripheralDeviceTypes.MultiMediaDevice:
+                if(_outputPlugin is IWritableOpticalImage)
+                    Mmc();
+                else
+                    StoppingErrorMessage?.
+                        Invoke("The specified plugin does not support storing optical disc images.");
+
+                return;
+            case PeripheralDeviceTypes.BridgingExpander
+                when _dev.Model.StartsWith("MDM", StringComparison.InvariantCulture) ||
+                     _dev.Model.StartsWith("MDH", StringComparison.InvariantCulture):
+                MiniDisc();
+
+                break;
+            default:
+                Sbc(null, MediaType.Unknown, false);
+
+                break;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/SSC.cs b/Aaru.Core/Devices/Dumping/SSC.cs
index dbe67e838..cbe02c2d9 100644
--- a/Aaru.Core/Devices/Dumping/SSC.cs
+++ b/Aaru.Core/Devices/Dumping/SSC.cs
@@ -53,67 +53,144 @@ using Version = Aaru.CommonTypes.Interop.Version;
 
 // ReSharper disable JoinDeclarationAndInitializer
 
-namespace Aaru.Core.Devices.Dumping
-{
-    partial class Dump
-    {
-        /// <summary>Dumps the tape from a SCSI Streaming device</summary>
-        void Ssc()
-        {
-            DecodedSense? decSense;
-            bool          sense;
-            uint          blockSize;
-            ulong         blocks  = 0;
-            MediaType     dskType = MediaType.Unknown;
-            DateTime      start;
-            DateTime      end;
-            double        totalDuration = 0;
-            double        currentSpeed  = 0;
-            double        maxSpeed      = double.MinValue;
-            double        minSpeed      = double.MaxValue;
-            var           outputTape    = _outputPlugin as IWritableTapeImage;
+namespace Aaru.Core.Devices.Dumping;
 
-            _dev.RequestSense(out byte[] senseBuf, _dev.Timeout, out double duration);
+partial class Dump
+{
+    /// <summary>Dumps the tape from a SCSI Streaming device</summary>
+    void Ssc()
+    {
+        DecodedSense? decSense;
+        bool          sense;
+        uint          blockSize;
+        ulong         blocks  = 0;
+        MediaType     dskType = MediaType.Unknown;
+        DateTime      start;
+        DateTime      end;
+        double        totalDuration = 0;
+        double        currentSpeed  = 0;
+        double        maxSpeed      = double.MinValue;
+        double        minSpeed      = double.MaxValue;
+        var           outputTape    = _outputPlugin as IWritableTapeImage;
+
+        _dev.RequestSense(out byte[] senseBuf, _dev.Timeout, out double duration);
+        decSense = Sense.Decode(senseBuf);
+
+        InitProgress?.Invoke();
+
+        if(decSense.HasValue &&
+           decSense.Value.SenseKey != SenseKeys.NoSense)
+        {
+            _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey,
+                               decSense.Value.ASC, decSense.Value.ASCQ);
+
+            StoppingErrorMessage?.Invoke("Drive has status error, please correct. Sense follows..." +
+                                         Environment.NewLine + decSense.Value.Description);
+
+            return;
+        }
+
+        // Not in BOM/P
+        if(decSense is { ASC: 0x00 }       &&
+           decSense.Value.ASCQ     != 0x00 &&
+           decSense.Value.ASCQ     != 0x04 &&
+           decSense.Value.SenseKey != SenseKeys.IllegalRequest)
+        {
+            _dumpLog.WriteLine("Rewinding, please wait...");
+            PulseProgress?.Invoke("Rewinding, please wait...");
+
+            // Rewind, let timeout apply
+            _dev.Rewind(out senseBuf, _dev.Timeout, out duration);
+
+            // Still rewinding?
+            // TODO: Pause?
+            do
+            {
+                PulseProgress?.Invoke("Rewinding, please wait...");
+                _dev.RequestSense(out senseBuf, _dev.Timeout, out duration);
+                decSense = Sense.Decode(senseBuf);
+            } while(decSense is { ASC: 0x00 } &&
+                    (decSense.Value.ASCQ == 0x1A || decSense.Value.ASCQ != 0x04 || decSense.Value.ASCQ != 0x00));
+
+            _dev.RequestSense(out senseBuf, _dev.Timeout, out duration);
             decSense = Sense.Decode(senseBuf);
 
-            InitProgress?.Invoke();
-
+            // And yet, did not rewind!
             if(decSense.HasValue &&
-               decSense.Value.SenseKey != SenseKeys.NoSense)
+               ((decSense.Value.ASC == 0x00 && decSense.Value.ASCQ != 0x04 && decSense.Value.ASCQ != 0x00) ||
+                decSense.Value.ASC != 0x00))
             {
+                StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
+                                             Environment.NewLine + decSense.Value.Description);
+
+                _dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
+
                 _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey,
                                    decSense.Value.ASC, decSense.Value.ASCQ);
 
-                StoppingErrorMessage?.Invoke("Drive has status error, please correct. Sense follows..." +
-                                             Environment.NewLine + decSense.Value.Description);
+                return;
+            }
+        }
+
+        // Check position
+        sense = _dev.ReadPosition(out byte[] cmdBuf, out senseBuf, SscPositionForms.Short, _dev.Timeout,
+                                  out duration);
+
+        if(sense)
+        {
+            // READ POSITION is mandatory starting SCSI-2, so do not cry if the drive does not recognize the command (SCSI-1 or earlier)
+            // Anyway, <=SCSI-1 tapes do not support partitions
+            decSense = Sense.Decode(senseBuf);
+
+            if(decSense.HasValue &&
+               ((decSense.Value.ASC == 0x20 && decSense.Value.ASCQ     != 0x00) ||
+                (decSense.Value.ASC != 0x20 && decSense.Value.SenseKey != SenseKeys.IllegalRequest)))
+            {
+                StoppingErrorMessage?.Invoke("Could not get position. Sense follows..." + Environment.NewLine +
+                                             decSense.Value.Description);
+
+                _dumpLog.WriteLine("Could not get position. Sense follows...");
+
+                _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey,
+                                   decSense.Value.ASC, decSense.Value.ASCQ);
 
                 return;
             }
-
-            // Not in BOM/P
-            if(decSense is { ASC: 0x00 }       &&
-               decSense.Value.ASCQ     != 0x00 &&
-               decSense.Value.ASCQ     != 0x04 &&
-               decSense.Value.SenseKey != SenseKeys.IllegalRequest)
+        }
+        else
+        {
+            // Not in partition 0
+            if(cmdBuf[1] != 0)
             {
-                _dumpLog.WriteLine("Rewinding, please wait...");
-                PulseProgress?.Invoke("Rewinding, please wait...");
+                UpdateStatus?.Invoke("Drive not in partition 0. Rewinding, please wait...");
+                _dumpLog.WriteLine("Drive not in partition 0. Rewinding, please wait...");
 
                 // Rewind, let timeout apply
-                _dev.Rewind(out senseBuf, _dev.Timeout, out duration);
+                sense = _dev.Locate(out senseBuf, false, 0, 0, _dev.Timeout, out duration);
+
+                if(sense)
+                {
+                    StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
+                                                 Environment.NewLine + decSense?.Description);
+
+                    _dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
+
+                    _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense?.SenseKey,
+                                       decSense?.ASC, decSense?.ASCQ);
+
+                    return;
+                }
 
                 // Still rewinding?
                 // TODO: Pause?
                 do
                 {
+                    Thread.Sleep(1000);
                     PulseProgress?.Invoke("Rewinding, please wait...");
                     _dev.RequestSense(out senseBuf, _dev.Timeout, out duration);
                     decSense = Sense.Decode(senseBuf);
                 } while(decSense is { ASC: 0x00 } &&
-                        (decSense.Value.ASCQ == 0x1A || decSense.Value.ASCQ != 0x04 || decSense.Value.ASCQ != 0x00));
-
-                _dev.RequestSense(out senseBuf, _dev.Timeout, out duration);
-                decSense = Sense.Decode(senseBuf);
+                        (decSense.Value.ASCQ == 0x1A || decSense.Value.ASCQ == 0x19));
 
                 // And yet, did not rewind!
                 if(decSense.HasValue &&
@@ -125,263 +202,164 @@ namespace Aaru.Core.Devices.Dumping
 
                     _dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
 
-                    _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey,
-                                       decSense.Value.ASC, decSense.Value.ASCQ);
+                    _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
+                                       decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
 
                     return;
                 }
-            }
 
-            // Check position
-            sense = _dev.ReadPosition(out byte[] cmdBuf, out senseBuf, SscPositionForms.Short, _dev.Timeout,
-                                      out duration);
+                sense = _dev.ReadPosition(out cmdBuf, out senseBuf, SscPositionForms.Short, _dev.Timeout,
+                                          out duration);
 
-            if(sense)
-            {
-                // READ POSITION is mandatory starting SCSI-2, so do not cry if the drive does not recognize the command (SCSI-1 or earlier)
-                // Anyway, <=SCSI-1 tapes do not support partitions
-                decSense = Sense.Decode(senseBuf);
-
-                if(decSense.HasValue &&
-                   ((decSense.Value.ASC == 0x20 && decSense.Value.ASCQ     != 0x00) ||
-                    (decSense.Value.ASC != 0x20 && decSense.Value.SenseKey != SenseKeys.IllegalRequest)))
+                if(sense)
                 {
-                    StoppingErrorMessage?.Invoke("Could not get position. Sense follows..." + Environment.NewLine +
-                                                 decSense.Value.Description);
+                    decSense = Sense.Decode(senseBuf);
 
-                    _dumpLog.WriteLine("Could not get position. Sense follows...");
+                    StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
+                                                 Environment.NewLine + decSense?.Description);
 
-                    _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey,
-                                       decSense.Value.ASC, decSense.Value.ASCQ);
+                    _dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
+
+                    _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense?.SenseKey,
+                                       decSense?.ASC, decSense?.ASCQ);
 
                     return;
                 }
-            }
-            else
-            {
-                // Not in partition 0
+
+                // Still not in partition 0!!!?
                 if(cmdBuf[1] != 0)
                 {
-                    UpdateStatus?.Invoke("Drive not in partition 0. Rewinding, please wait...");
-                    _dumpLog.WriteLine("Drive not in partition 0. Rewinding, please wait...");
+                    StoppingErrorMessage?.Invoke("Drive could not rewind to partition 0 but no error occurred...");
+                    _dumpLog.WriteLine("Drive could not rewind to partition 0 but no error occurred...");
 
-                    // Rewind, let timeout apply
-                    sense = _dev.Locate(out senseBuf, false, 0, 0, _dev.Timeout, out duration);
-
-                    if(sense)
-                    {
-                        StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
-                                                     Environment.NewLine + decSense?.Description);
-
-                        _dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
-
-                        _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense?.SenseKey,
-                                           decSense?.ASC, decSense?.ASCQ);
-
-                        return;
-                    }
-
-                    // Still rewinding?
-                    // TODO: Pause?
-                    do
-                    {
-                        Thread.Sleep(1000);
-                        PulseProgress?.Invoke("Rewinding, please wait...");
-                        _dev.RequestSense(out senseBuf, _dev.Timeout, out duration);
-                        decSense = Sense.Decode(senseBuf);
-                    } while(decSense is { ASC: 0x00 } &&
-                            (decSense.Value.ASCQ == 0x1A || decSense.Value.ASCQ == 0x19));
-
-                    // And yet, did not rewind!
-                    if(decSense.HasValue &&
-                       ((decSense.Value.ASC == 0x00 && decSense.Value.ASCQ != 0x04 && decSense.Value.ASCQ != 0x00) ||
-                        decSense.Value.ASC != 0x00))
-                    {
-                        StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
-                                                     Environment.NewLine + decSense.Value.Description);
-
-                        _dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
-
-                        _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
-                                           decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
-
-                        return;
-                    }
-
-                    sense = _dev.ReadPosition(out cmdBuf, out senseBuf, SscPositionForms.Short, _dev.Timeout,
-                                              out duration);
-
-                    if(sense)
-                    {
-                        decSense = Sense.Decode(senseBuf);
-
-                        StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
-                                                     Environment.NewLine + decSense?.Description);
-
-                        _dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
-
-                        _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense?.SenseKey,
-                                           decSense?.ASC, decSense?.ASCQ);
-
-                        return;
-                    }
-
-                    // Still not in partition 0!!!?
-                    if(cmdBuf[1] != 0)
-                    {
-                        StoppingErrorMessage?.Invoke("Drive could not rewind to partition 0 but no error occurred...");
-                        _dumpLog.WriteLine("Drive could not rewind to partition 0 but no error occurred...");
-
-                        return;
-                    }
+                    return;
                 }
             }
+        }
 
-            EndProgress?.Invoke();
+        EndProgress?.Invoke();
 
-            byte   scsiMediumTypeTape  = 0;
-            byte   scsiDensityCodeTape = 0;
-            byte[] mode6Data           = null;
-            byte[] mode10Data          = null;
+        byte   scsiMediumTypeTape  = 0;
+        byte   scsiDensityCodeTape = 0;
+        byte[] mode6Data           = null;
+        byte[] mode10Data          = null;
 
-            UpdateStatus?.Invoke("Requesting MODE SENSE (10).");
+        UpdateStatus?.Invoke("Requesting MODE SENSE (10).");
 
+        sense = _dev.ModeSense10(out cmdBuf, out senseBuf, false, true, ScsiModeSensePageControl.Current, 0x3F,
+                                 0xFF, 5, out duration);
+
+        if(!sense ||
+           _dev.Error)
             sense = _dev.ModeSense10(out cmdBuf, out senseBuf, false, true, ScsiModeSensePageControl.Current, 0x3F,
-                                     0xFF, 5, out duration);
+                                     0x00, 5, out duration);
 
-            if(!sense ||
-               _dev.Error)
-                sense = _dev.ModeSense10(out cmdBuf, out senseBuf, false, true, ScsiModeSensePageControl.Current, 0x3F,
-                                         0x00, 5, out duration);
+        Modes.DecodedMode? decMode = null;
 
-            Modes.DecodedMode? decMode = null;
+        if(!sense &&
+           !_dev.Error)
+            if(Modes.DecodeMode10(cmdBuf, _dev.ScsiType).HasValue)
+                decMode = Modes.DecodeMode10(cmdBuf, _dev.ScsiType);
 
-            if(!sense &&
-               !_dev.Error)
-                if(Modes.DecodeMode10(cmdBuf, _dev.ScsiType).HasValue)
-                    decMode = Modes.DecodeMode10(cmdBuf, _dev.ScsiType);
+        UpdateStatus?.Invoke("Requesting MODE SENSE (6).");
 
-            UpdateStatus?.Invoke("Requesting MODE SENSE (6).");
+        sense = _dev.ModeSense6(out cmdBuf, out senseBuf, false, ScsiModeSensePageControl.Current, 0x3F, 0x00, 5,
+                                out duration);
 
-            sense = _dev.ModeSense6(out cmdBuf, out senseBuf, false, ScsiModeSensePageControl.Current, 0x3F, 0x00, 5,
-                                    out duration);
+        if(sense || _dev.Error)
+            sense = _dev.ModeSense6(out cmdBuf, out senseBuf, false, ScsiModeSensePageControl.Current, 0x3F, 0x00,
+                                    5, out duration);
 
-            if(sense || _dev.Error)
-                sense = _dev.ModeSense6(out cmdBuf, out senseBuf, false, ScsiModeSensePageControl.Current, 0x3F, 0x00,
-                                        5, out duration);
+        if(sense || _dev.Error)
+            sense = _dev.ModeSense(out cmdBuf, out senseBuf, 5, out duration);
 
-            if(sense || _dev.Error)
-                sense = _dev.ModeSense(out cmdBuf, out senseBuf, 5, out duration);
+        if(!sense &&
+           !_dev.Error)
+            if(Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
+                decMode = Modes.DecodeMode6(cmdBuf, _dev.ScsiType);
 
-            if(!sense &&
-               !_dev.Error)
-                if(Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
-                    decMode = Modes.DecodeMode6(cmdBuf, _dev.ScsiType);
+        // TODO: Check partitions page
+        if(decMode.HasValue)
+        {
+            scsiMediumTypeTape = (byte)decMode.Value.Header.MediumType;
 
-            // TODO: Check partitions page
-            if(decMode.HasValue)
-            {
-                scsiMediumTypeTape = (byte)decMode.Value.Header.MediumType;
+            if(decMode.Value.Header.BlockDescriptors?.Length > 0)
+                scsiDensityCodeTape = (byte)decMode.Value.Header.BlockDescriptors[0].Density;
 
-                if(decMode.Value.Header.BlockDescriptors?.Length > 0)
-                    scsiDensityCodeTape = (byte)decMode.Value.Header.BlockDescriptors[0].Density;
+            blockSize = decMode.Value.Header.BlockDescriptors?[0].BlockLength ?? 0;
 
-                blockSize = decMode.Value.Header.BlockDescriptors?[0].BlockLength ?? 0;
+            UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
+        }
+        else
+            blockSize = 1;
 
-                UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
-            }
-            else
-                blockSize = 1;
+        if(!_dev.ReadBlockLimits(out cmdBuf, out senseBuf, _dev.Timeout, out _))
+        {
+            BlockLimits.BlockLimitsData? blockLimits = BlockLimits.Decode(cmdBuf);
 
-            if(!_dev.ReadBlockLimits(out cmdBuf, out senseBuf, _dev.Timeout, out _))
-            {
-                BlockLimits.BlockLimitsData? blockLimits = BlockLimits.Decode(cmdBuf);
+            if(blockLimits?.minBlockLen > blockSize)
+                blockSize = blockLimits?.minBlockLen ?? 0;
+        }
 
-                if(blockLimits?.minBlockLen > blockSize)
-                    blockSize = blockLimits?.minBlockLen ?? 0;
-            }
+        if(blockSize == 0)
+            blockSize = 1;
 
-            if(blockSize == 0)
-                blockSize = 1;
+        if(dskType == MediaType.Unknown)
+            dskType = MediaTypeFromDevice.GetFromScsi((byte)_dev.ScsiType, _dev.Manufacturer, _dev.Model,
+                                                      scsiMediumTypeTape, scsiDensityCodeTape, blocks, blockSize,
+                                                      _dev.IsUsb, false);
 
-            if(dskType == MediaType.Unknown)
-                dskType = MediaTypeFromDevice.GetFromScsi((byte)_dev.ScsiType, _dev.Manufacturer, _dev.Model,
-                                                          scsiMediumTypeTape, scsiDensityCodeTape, blocks, blockSize,
-                                                          _dev.IsUsb, false);
+        if(dskType == MediaType.Unknown)
+            dskType = MediaType.UnknownTape;
 
-            if(dskType == MediaType.Unknown)
-                dskType = MediaType.UnknownTape;
+        UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
+        UpdateStatus?.Invoke($"SCSI medium type: {scsiMediumTypeTape}.");
+        UpdateStatus?.Invoke($"SCSI density type: {scsiDensityCodeTape}.");
+        UpdateStatus?.Invoke($"Media identified as {dskType}.");
 
-            UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
-            UpdateStatus?.Invoke($"SCSI medium type: {scsiMediumTypeTape}.");
-            UpdateStatus?.Invoke($"SCSI density type: {scsiDensityCodeTape}.");
-            UpdateStatus?.Invoke($"Media identified as {dskType}.");
+        _dumpLog.WriteLine("SCSI device type: {0}.", _dev.ScsiType);
+        _dumpLog.WriteLine("SCSI medium type: {0}.", scsiMediumTypeTape);
+        _dumpLog.WriteLine("SCSI density type: {0}.", scsiDensityCodeTape);
+        _dumpLog.WriteLine("Media identified as {0}.", dskType);
 
-            _dumpLog.WriteLine("SCSI device type: {0}.", _dev.ScsiType);
-            _dumpLog.WriteLine("SCSI medium type: {0}.", scsiMediumTypeTape);
-            _dumpLog.WriteLine("SCSI density type: {0}.", scsiDensityCodeTape);
-            _dumpLog.WriteLine("Media identified as {0}.", dskType);
+        bool  endOfMedia       = false;
+        ulong currentBlock     = 0;
+        uint  currentFile      = 0;
+        byte  currentPartition = 0;
+        byte  totalPartitions  = 1; // TODO: Handle partitions.
+        bool  fixedLen         = false;
+        uint  transferLen      = blockSize;
 
-            bool  endOfMedia       = false;
-            ulong currentBlock     = 0;
-            uint  currentFile      = 0;
-            byte  currentPartition = 0;
-            byte  totalPartitions  = 1; // TODO: Handle partitions.
-            bool  fixedLen         = false;
-            uint  transferLen      = blockSize;
+        firstRead:
 
-            firstRead:
+        sense = _dev.Read6(out cmdBuf, out senseBuf, false, fixedLen, transferLen, blockSize, _dev.Timeout,
+                           out duration);
 
-            sense = _dev.Read6(out cmdBuf, out senseBuf, false, fixedLen, transferLen, blockSize, _dev.Timeout,
-                               out duration);
+        if(sense)
+        {
+            decSense = Sense.Decode(senseBuf);
 
-            if(sense)
-            {
-                decSense = Sense.Decode(senseBuf);
+            if(decSense.HasValue)
+                if(decSense.Value.SenseKey == SenseKeys.IllegalRequest)
+                {
+                    sense = _dev.Space(out senseBuf, SscSpaceCodes.LogicalBlock, -1, _dev.Timeout, out duration);
 
-                if(decSense.HasValue)
-                    if(decSense.Value.SenseKey == SenseKeys.IllegalRequest)
+                    if(sense)
                     {
-                        sense = _dev.Space(out senseBuf, SscSpaceCodes.LogicalBlock, -1, _dev.Timeout, out duration);
+                        decSense = Sense.Decode(senseBuf);
 
-                        if(sense)
+                        bool eom = decSense?.Fixed?.EOM == true;
+
+                        if(decSense?.Descriptor != null &&
+                           decSense.Value.Descriptor.Value.Descriptors.TryGetValue(4, out byte[] sscDescriptor))
+                            Sense.DecodeDescriptor04(sscDescriptor, out _, out eom, out _);
+
+                        if(!eom)
                         {
-                            decSense = Sense.Decode(senseBuf);
-
-                            bool eom = decSense?.Fixed?.EOM == true;
-
-                            if(decSense?.Descriptor != null &&
-                               decSense.Value.Descriptor.Value.Descriptors.TryGetValue(4, out byte[] sscDescriptor))
-                                Sense.DecodeDescriptor04(sscDescriptor, out _, out eom, out _);
-
-                            if(!eom)
-                            {
-                                StoppingErrorMessage?.Invoke("Drive could not return back. Sense follows..." +
-                                                             Environment.NewLine + decSense.Value.Description);
-
-                                _dumpLog.WriteLine("Drive could not return back. Sense follows...");
-
-                                _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
-                                                   decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
-
-                                return;
-                            }
-                        }
-
-                        fixedLen    = true;
-                        transferLen = 1;
-
-                        sense = _dev.Read6(out cmdBuf, out senseBuf, false, fixedLen, transferLen, blockSize,
-                                           _dev.Timeout, out duration);
-
-                        if(sense)
-                        {
-                            decSense = Sense.Decode(senseBuf);
-
-                            StoppingErrorMessage?.Invoke("Drive could not read. Sense follows..." +
+                            StoppingErrorMessage?.Invoke("Drive could not return back. Sense follows..." +
                                                          Environment.NewLine + decSense.Value.Description);
 
-                            _dumpLog.WriteLine("Drive could not read. Sense follows...");
+                            _dumpLog.WriteLine("Drive could not return back. Sense follows...");
 
                             _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
                                                decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
@@ -389,59 +367,19 @@ namespace Aaru.Core.Devices.Dumping
                             return;
                         }
                     }
-                    else if(decSense.Value.ASC  == 0x00 &&
-                            decSense.Value.ASCQ == 0x00)
+
+                    fixedLen    = true;
+                    transferLen = 1;
+
+                    sense = _dev.Read6(out cmdBuf, out senseBuf, false, fixedLen, transferLen, blockSize,
+                                       _dev.Timeout, out duration);
+
+                    if(sense)
                     {
-                        bool ili         = decSense.Value.Fixed?.ILI              == true;
-                        bool valid       = decSense.Value.Fixed?.InformationValid == true;
-                        uint information = decSense.Value.Fixed?.Information ?? 0;
+                        decSense = Sense.Decode(senseBuf);
 
-                        if(decSense.Value.Descriptor.HasValue)
-                        {
-                            valid = decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00);
-
-                            if(valid)
-                                information = (uint)Sense.DecodeDescriptor00(desc00);
-
-                            if(decSense.Value.Descriptor.Value.Descriptors.TryGetValue(4, out byte[] desc04))
-                                Sense.DecodeDescriptor04(desc04, out _, out _, out ili);
-                        }
-
-                        if(ili && valid)
-                        {
-                            blockSize = (uint)((int)blockSize -
-                                               BitConverter.ToInt32(BitConverter.GetBytes(information), 0));
-
-                            transferLen = blockSize;
-
-                            UpdateStatus?.Invoke($"Blocksize changed to {blockSize} bytes at block {currentBlock}");
-                            _dumpLog.WriteLine("Blocksize changed to {0} bytes at block {1}", blockSize, currentBlock);
-
-                            sense = _dev.Space(out senseBuf, SscSpaceCodes.LogicalBlock, -1, _dev.Timeout,
-                                               out duration);
-
-                            totalDuration += duration;
-
-                            if(sense)
-                            {
-                                decSense = Sense.Decode(senseBuf);
-
-                                StoppingErrorMessage?.Invoke("Drive could not go back one block. Sense follows..." +
-                                                             Environment.NewLine + decSense.Value.Description);
-
-                                _dumpLog.WriteLine("Drive could not go back one block. Sense follows...");
-
-                                _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
-                                                   decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
-
-                                return;
-                            }
-
-                            goto firstRead;
-                        }
-
-                        StoppingErrorMessage?.Invoke("Drive could not read. Sense follows..." + Environment.NewLine +
-                                                     decSense.Value.Description);
+                        StoppingErrorMessage?.Invoke("Drive could not read. Sense follows..." +
+                                                     Environment.NewLine + decSense.Value.Description);
 
                         _dumpLog.WriteLine("Drive could not read. Sense follows...");
 
@@ -450,263 +388,307 @@ namespace Aaru.Core.Devices.Dumping
 
                         return;
                     }
-                    else
-                    {
-                        StoppingErrorMessage?.Invoke("Drive could not read. Sense follows..." + Environment.NewLine +
-                                                     decSense.Value.Description);
-
-                        _dumpLog.WriteLine("Drive could not read. Sense follows...");
-
-                        _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
-                                           decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
-
-                        return;
-                    }
-                else
-                {
-                    StoppingErrorMessage?.Invoke("Cannot read device, don't know why, exiting...");
-                    _dumpLog.WriteLine("Cannot read device, don't know why, exiting...");
-
-                    return;
                 }
-            }
-
-            sense = _dev.Space(out senseBuf, SscSpaceCodes.LogicalBlock, -1, _dev.Timeout, out duration);
-
-            if(sense)
-            {
-                decSense = Sense.Decode(senseBuf);
-
-                bool eom = decSense?.Fixed?.EOM == true;
-
-                if(decSense.Value.Descriptor.HasValue &&
-                   decSense.Value.Descriptor.Value.Descriptors.TryGetValue(4, out byte[] desc04))
-                    Sense.DecodeDescriptor04(desc04, out _, out eom, out _);
-
-                if(!eom)
+                else if(decSense.Value.ASC  == 0x00 &&
+                        decSense.Value.ASCQ == 0x00)
                 {
-                    StoppingErrorMessage?.Invoke("Drive could not return back. Sense follows..." + Environment.NewLine +
+                    bool ili         = decSense.Value.Fixed?.ILI              == true;
+                    bool valid       = decSense.Value.Fixed?.InformationValid == true;
+                    uint information = decSense.Value.Fixed?.Information ?? 0;
+
+                    if(decSense.Value.Descriptor.HasValue)
+                    {
+                        valid = decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00);
+
+                        if(valid)
+                            information = (uint)Sense.DecodeDescriptor00(desc00);
+
+                        if(decSense.Value.Descriptor.Value.Descriptors.TryGetValue(4, out byte[] desc04))
+                            Sense.DecodeDescriptor04(desc04, out _, out _, out ili);
+                    }
+
+                    if(ili && valid)
+                    {
+                        blockSize = (uint)((int)blockSize -
+                                           BitConverter.ToInt32(BitConverter.GetBytes(information), 0));
+
+                        transferLen = blockSize;
+
+                        UpdateStatus?.Invoke($"Blocksize changed to {blockSize} bytes at block {currentBlock}");
+                        _dumpLog.WriteLine("Blocksize changed to {0} bytes at block {1}", blockSize, currentBlock);
+
+                        sense = _dev.Space(out senseBuf, SscSpaceCodes.LogicalBlock, -1, _dev.Timeout,
+                                           out duration);
+
+                        totalDuration += duration;
+
+                        if(sense)
+                        {
+                            decSense = Sense.Decode(senseBuf);
+
+                            StoppingErrorMessage?.Invoke("Drive could not go back one block. Sense follows..." +
+                                                         Environment.NewLine + decSense.Value.Description);
+
+                            _dumpLog.WriteLine("Drive could not go back one block. Sense follows...");
+
+                            _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
+                                               decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
+
+                            return;
+                        }
+
+                        goto firstRead;
+                    }
+
+                    StoppingErrorMessage?.Invoke("Drive could not read. Sense follows..." + Environment.NewLine +
                                                  decSense.Value.Description);
 
-                    _dumpLog.WriteLine("Drive could not return back. Sense follows...");
+                    _dumpLog.WriteLine("Drive could not read. Sense follows...");
 
-                    _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey,
-                                       decSense.Value.ASC, decSense.Value.ASCQ);
+                    _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
+                                       decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
 
                     return;
                 }
-            }
+                else
+                {
+                    StoppingErrorMessage?.Invoke("Drive could not read. Sense follows..." + Environment.NewLine +
+                                                 decSense.Value.Description);
 
-            DumpHardwareType currentTry = null;
-            ExtentsULong     extents    = null;
+                    _dumpLog.WriteLine("Drive could not read. Sense follows...");
 
-            ResumeSupport.Process(true, _dev.IsRemovable, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial,
-                                  _dev.PlatformId, ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision,
-                                  _private, _force, true);
+                    _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
+                                       decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
 
-            if(currentTry == null ||
-               extents    == null)
+                    return;
+                }
+            else
             {
-                StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
+                StoppingErrorMessage?.Invoke("Cannot read device, don't know why, exiting...");
+                _dumpLog.WriteLine("Cannot read device, don't know why, exiting...");
 
                 return;
             }
+        }
 
-            bool canLocateLong = false;
-            bool canLocate     = false;
+        sense = _dev.Space(out senseBuf, SscSpaceCodes.LogicalBlock, -1, _dev.Timeout, out duration);
 
-            UpdateStatus?.Invoke("Positioning tape to block 1.");
-            _dumpLog.WriteLine("Positioning tape to block 1");
+        if(sense)
+        {
+            decSense = Sense.Decode(senseBuf);
 
-            sense = _dev.Locate16(out senseBuf, 1, _dev.Timeout, out _);
+            bool eom = decSense?.Fixed?.EOM == true;
+
+            if(decSense.Value.Descriptor.HasValue &&
+               decSense.Value.Descriptor.Value.Descriptors.TryGetValue(4, out byte[] desc04))
+                Sense.DecodeDescriptor04(desc04, out _, out eom, out _);
+
+            if(!eom)
+            {
+                StoppingErrorMessage?.Invoke("Drive could not return back. Sense follows..." + Environment.NewLine +
+                                             decSense.Value.Description);
+
+                _dumpLog.WriteLine("Drive could not return back. Sense follows...");
+
+                _dumpLog.WriteLine("Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey,
+                                   decSense.Value.ASC, decSense.Value.ASCQ);
+
+                return;
+            }
+        }
+
+        DumpHardwareType currentTry = null;
+        ExtentsULong     extents    = null;
+
+        ResumeSupport.Process(true, _dev.IsRemovable, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial,
+                              _dev.PlatformId, ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision,
+                              _private, _force, true);
+
+        if(currentTry == null ||
+           extents    == null)
+        {
+            StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
+
+            return;
+        }
+
+        bool canLocateLong = false;
+        bool canLocate     = false;
+
+        UpdateStatus?.Invoke("Positioning tape to block 1.");
+        _dumpLog.WriteLine("Positioning tape to block 1");
+
+        sense = _dev.Locate16(out senseBuf, 1, _dev.Timeout, out _);
+
+        if(!sense)
+        {
+            sense = _dev.ReadPositionLong(out cmdBuf, out senseBuf, _dev.Timeout, out _);
 
             if(!sense)
             {
-                sense = _dev.ReadPositionLong(out cmdBuf, out senseBuf, _dev.Timeout, out _);
+                ulong position = Swapping.Swap(BitConverter.ToUInt64(cmdBuf, 8));
 
-                if(!sense)
+                if(position == 1)
                 {
-                    ulong position = Swapping.Swap(BitConverter.ToUInt64(cmdBuf, 8));
-
-                    if(position == 1)
-                    {
-                        canLocateLong = true;
-                        UpdateStatus?.Invoke("LOCATE LONG works.");
-                        _dumpLog.WriteLine("LOCATE LONG works.");
-                    }
+                    canLocateLong = true;
+                    UpdateStatus?.Invoke("LOCATE LONG works.");
+                    _dumpLog.WriteLine("LOCATE LONG works.");
                 }
             }
+        }
 
-            sense = _dev.Locate(out senseBuf, 1, _dev.Timeout, out _);
+        sense = _dev.Locate(out senseBuf, 1, _dev.Timeout, out _);
+
+        if(!sense)
+        {
+            sense = _dev.ReadPosition(out cmdBuf, out senseBuf, _dev.Timeout, out _);
 
             if(!sense)
             {
-                sense = _dev.ReadPosition(out cmdBuf, out senseBuf, _dev.Timeout, out _);
+                ulong position = Swapping.Swap(BitConverter.ToUInt32(cmdBuf, 4));
+
+                if(position == 1)
+                {
+                    canLocate = true;
+                    UpdateStatus?.Invoke("LOCATE works.");
+                    _dumpLog.WriteLine("LOCATE works.");
+                }
+            }
+        }
+
+        if(_resume.NextBlock > 0)
+        {
+            UpdateStatus?.Invoke($"Positioning tape to block {_resume.NextBlock}.");
+            _dumpLog.WriteLine("Positioning tape to block {0}.", _resume.NextBlock);
+
+            if(canLocateLong)
+            {
+                sense = _dev.Locate16(out senseBuf, _resume.NextBlock, _dev.Timeout, out _);
 
                 if(!sense)
                 {
-                    ulong position = Swapping.Swap(BitConverter.ToUInt32(cmdBuf, 4));
+                    sense = _dev.ReadPositionLong(out cmdBuf, out senseBuf, _dev.Timeout, out _);
 
-                    if(position == 1)
+                    if(sense)
                     {
-                        canLocate = true;
-                        UpdateStatus?.Invoke("LOCATE works.");
-                        _dumpLog.WriteLine("LOCATE works.");
+                        if(!_force)
+                        {
+                            _dumpLog.
+                                WriteLine("Could not check current position, unable to resume. If you want to continue use force.");
+
+                            StoppingErrorMessage?.
+                                Invoke("Could not check current position, unable to resume. If you want to continue use force.");
+
+                            return;
+                        }
+
+                        _dumpLog.
+                            WriteLine("Could not check current position, unable to resume. Dumping from the start.");
+
+                        ErrorMessage?.
+                            Invoke("Could not check current position, unable to resume. Dumping from the start.");
+
+                        canLocateLong = false;
                     }
-                }
-            }
-
-            if(_resume.NextBlock > 0)
-            {
-                UpdateStatus?.Invoke($"Positioning tape to block {_resume.NextBlock}.");
-                _dumpLog.WriteLine("Positioning tape to block {0}.", _resume.NextBlock);
-
-                if(canLocateLong)
-                {
-                    sense = _dev.Locate16(out senseBuf, _resume.NextBlock, _dev.Timeout, out _);
-
-                    if(!sense)
+                    else
                     {
-                        sense = _dev.ReadPositionLong(out cmdBuf, out senseBuf, _dev.Timeout, out _);
+                        ulong position = Swapping.Swap(BitConverter.ToUInt64(cmdBuf, 8));
 
-                        if(sense)
+                        if(position != _resume.NextBlock)
                         {
                             if(!_force)
                             {
                                 _dumpLog.
-                                    WriteLine("Could not check current position, unable to resume. If you want to continue use force.");
+                                    WriteLine("Current position is not as expected, unable to resume. If you want to continue use force.");
 
                                 StoppingErrorMessage?.
-                                    Invoke("Could not check current position, unable to resume. If you want to continue use force.");
+                                    Invoke("Current position is not as expected, unable to resume. If you want to continue use force.");
 
                                 return;
                             }
 
                             _dumpLog.
-                                WriteLine("Could not check current position, unable to resume. Dumping from the start.");
+                                WriteLine("Current position is not as expected, unable to resume. Dumping from the start.");
 
                             ErrorMessage?.
-                                Invoke("Could not check current position, unable to resume. Dumping from the start.");
+                                Invoke("Current position is not as expected, unable to resume. Dumping from the start.");
 
                             canLocateLong = false;
                         }
-                        else
-                        {
-                            ulong position = Swapping.Swap(BitConverter.ToUInt64(cmdBuf, 8));
-
-                            if(position != _resume.NextBlock)
-                            {
-                                if(!_force)
-                                {
-                                    _dumpLog.
-                                        WriteLine("Current position is not as expected, unable to resume. If you want to continue use force.");
-
-                                    StoppingErrorMessage?.
-                                        Invoke("Current position is not as expected, unable to resume. If you want to continue use force.");
-
-                                    return;
-                                }
-
-                                _dumpLog.
-                                    WriteLine("Current position is not as expected, unable to resume. Dumping from the start.");
-
-                                ErrorMessage?.
-                                    Invoke("Current position is not as expected, unable to resume. Dumping from the start.");
-
-                                canLocateLong = false;
-                            }
-                        }
                     }
-                    else
+                }
+                else
+                {
+                    if(!_force)
+                    {
+                        _dumpLog.
+                            WriteLine("Cannot reposition tape, unable to resume. If you want to continue use force.");
+
+                        StoppingErrorMessage?.
+                            Invoke("Cannot reposition tape, unable to resume. If you want to continue use force.");
+
+                        return;
+                    }
+
+                    _dumpLog.WriteLine("Cannot reposition tape, unable to resume. Dumping from the start.");
+                    ErrorMessage?.Invoke("Cannot reposition tape, unable to resume. Dumping from the start.");
+                    canLocateLong = false;
+                }
+            }
+            else if(canLocate)
+            {
+                sense = _dev.Locate(out senseBuf, (uint)_resume.NextBlock, _dev.Timeout, out _);
+
+                if(!sense)
+                {
+                    sense = _dev.ReadPosition(out cmdBuf, out senseBuf, _dev.Timeout, out _);
+
+                    if(sense)
                     {
                         if(!_force)
                         {
                             _dumpLog.
-                                WriteLine("Cannot reposition tape, unable to resume. If you want to continue use force.");
+                                WriteLine("Could not check current position, unable to resume. If you want to continue use force.");
 
                             StoppingErrorMessage?.
-                                Invoke("Cannot reposition tape, unable to resume. If you want to continue use force.");
+                                Invoke("Could not check current position, unable to resume. If you want to continue use force.");
 
                             return;
                         }
 
-                        _dumpLog.WriteLine("Cannot reposition tape, unable to resume. Dumping from the start.");
-                        ErrorMessage?.Invoke("Cannot reposition tape, unable to resume. Dumping from the start.");
-                        canLocateLong = false;
+                        _dumpLog.
+                            WriteLine("Could not check current position, unable to resume. Dumping from the start.");
+
+                        ErrorMessage?.
+                            Invoke("Could not check current position, unable to resume. Dumping from the start.");
+
+                        canLocate = false;
                     }
-                }
-                else if(canLocate)
-                {
-                    sense = _dev.Locate(out senseBuf, (uint)_resume.NextBlock, _dev.Timeout, out _);
-
-                    if(!sense)
+                    else
                     {
-                        sense = _dev.ReadPosition(out cmdBuf, out senseBuf, _dev.Timeout, out _);
+                        ulong position = Swapping.Swap(BitConverter.ToUInt32(cmdBuf, 4));
 
-                        if(sense)
+                        if(position != _resume.NextBlock)
                         {
                             if(!_force)
                             {
                                 _dumpLog.
-                                    WriteLine("Could not check current position, unable to resume. If you want to continue use force.");
+                                    WriteLine("Current position is not as expected, unable to resume. If you want to continue use force.");
 
                                 StoppingErrorMessage?.
-                                    Invoke("Could not check current position, unable to resume. If you want to continue use force.");
+                                    Invoke("Current position is not as expected, unable to resume. If you want to continue use force.");
 
                                 return;
                             }
 
                             _dumpLog.
-                                WriteLine("Could not check current position, unable to resume. Dumping from the start.");
+                                WriteLine("Current position is not as expected, unable to resume. Dumping from the start.");
 
                             ErrorMessage?.
-                                Invoke("Could not check current position, unable to resume. Dumping from the start.");
+                                Invoke("Current position is not as expected, unable to resume. Dumping from the start.");
 
                             canLocate = false;
                         }
-                        else
-                        {
-                            ulong position = Swapping.Swap(BitConverter.ToUInt32(cmdBuf, 4));
-
-                            if(position != _resume.NextBlock)
-                            {
-                                if(!_force)
-                                {
-                                    _dumpLog.
-                                        WriteLine("Current position is not as expected, unable to resume. If you want to continue use force.");
-
-                                    StoppingErrorMessage?.
-                                        Invoke("Current position is not as expected, unable to resume. If you want to continue use force.");
-
-                                    return;
-                                }
-
-                                _dumpLog.
-                                    WriteLine("Current position is not as expected, unable to resume. Dumping from the start.");
-
-                                ErrorMessage?.
-                                    Invoke("Current position is not as expected, unable to resume. Dumping from the start.");
-
-                                canLocate = false;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if(!_force)
-                        {
-                            _dumpLog.
-                                WriteLine("Cannot reposition tape, unable to resume. If you want to continue use force.");
-
-                            StoppingErrorMessage?.
-                                Invoke("Cannot reposition tape, unable to resume. If you want to continue use force.");
-
-                            return;
-                        }
-
-                        _dumpLog.WriteLine("Cannot reposition tape, unable to resume. Dumping from the start.");
-                        ErrorMessage?.Invoke("Cannot reposition tape, unable to resume. Dumping from the start.");
-                        canLocate = false;
                     }
                 }
                 else
@@ -729,108 +711,427 @@ namespace Aaru.Core.Devices.Dumping
             }
             else
             {
-                _ = canLocateLong ? _dev.Locate16(out senseBuf, false, 0, 0, _dev.Timeout, out duration)
-                        : _dev.Locate(out senseBuf, false, 0, 0, _dev.Timeout, out duration);
-
-                do
+                if(!_force)
                 {
-                    Thread.Sleep(1000);
-                    PulseProgress?.Invoke("Rewinding, please wait...");
-                    _dev.RequestSense(out senseBuf, _dev.Timeout, out duration);
-                    decSense = Sense.Decode(senseBuf);
-                } while(decSense is { ASC: 0x00 } &&
-                        (decSense.Value.ASCQ == 0x1A || decSense.Value.ASCQ == 0x19));
+                    _dumpLog.
+                        WriteLine("Cannot reposition tape, unable to resume. If you want to continue use force.");
 
-                // And yet, did not rewind!
-                if(decSense.HasValue &&
-                   ((decSense.Value.ASC == 0x00 && decSense.Value.ASCQ != 0x00 && decSense.Value.ASCQ != 0x04) ||
-                    decSense.Value.ASC != 0x00))
-                {
-                    StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
-                                                 Environment.NewLine + decSense.Value.Description);
-
-                    _dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
-
-                    _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey,
-                                       decSense.Value.ASC, decSense.Value.ASCQ);
+                    StoppingErrorMessage?.
+                        Invoke("Cannot reposition tape, unable to resume. If you want to continue use force.");
 
                     return;
                 }
+
+                _dumpLog.WriteLine("Cannot reposition tape, unable to resume. Dumping from the start.");
+                ErrorMessage?.Invoke("Cannot reposition tape, unable to resume. Dumping from the start.");
+                canLocate = false;
             }
+        }
+        else
+        {
+            _ = canLocateLong ? _dev.Locate16(out senseBuf, false, 0, 0, _dev.Timeout, out duration)
+                    : _dev.Locate(out senseBuf, false, 0, 0, _dev.Timeout, out duration);
 
-            bool ret = outputTape.SetTape();
-
-            // Cannot set image to tape mode
-            if(!ret)
+            do
             {
-                _dumpLog.WriteLine("Error setting output image in tape mode, not continuing.");
-                _dumpLog.WriteLine(outputTape.ErrorMessage);
+                Thread.Sleep(1000);
+                PulseProgress?.Invoke("Rewinding, please wait...");
+                _dev.RequestSense(out senseBuf, _dev.Timeout, out duration);
+                decSense = Sense.Decode(senseBuf);
+            } while(decSense is { ASC: 0x00 } &&
+                    (decSense.Value.ASCQ == 0x1A || decSense.Value.ASCQ == 0x19));
 
-                StoppingErrorMessage?.Invoke("Error setting output image in tape mode, not continuing." +
-                                             Environment.NewLine + outputTape.ErrorMessage);
+            // And yet, did not rewind!
+            if(decSense.HasValue &&
+               ((decSense.Value.ASC == 0x00 && decSense.Value.ASCQ != 0x00 && decSense.Value.ASCQ != 0x04) ||
+                decSense.Value.ASC != 0x00))
+            {
+                StoppingErrorMessage?.Invoke("Drive could not rewind, please correct. Sense follows..." +
+                                             Environment.NewLine + decSense.Value.Description);
+
+                _dumpLog.WriteLine("Drive could not rewind, please correct. Sense follows...");
+
+                _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h", decSense.Value.SenseKey,
+                                   decSense.Value.ASC, decSense.Value.ASCQ);
 
                 return;
             }
+        }
 
-            ret = outputTape.Create(_outputPath, dskType, _formatOptions, 0, 0);
+        bool ret = outputTape.SetTape();
 
-            // Cannot create image
-            if(!ret)
-            {
-                _dumpLog.WriteLine("Error creating output image, not continuing.");
-                _dumpLog.WriteLine(outputTape.ErrorMessage);
+        // Cannot set image to tape mode
+        if(!ret)
+        {
+            _dumpLog.WriteLine("Error setting output image in tape mode, not continuing.");
+            _dumpLog.WriteLine(outputTape.ErrorMessage);
 
-                StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
-                                             outputTape.ErrorMessage);
+            StoppingErrorMessage?.Invoke("Error setting output image in tape mode, not continuing." +
+                                         Environment.NewLine + outputTape.ErrorMessage);
 
-                return;
-            }
+            return;
+        }
 
-            start = DateTime.UtcNow;
-            var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, 1, _private);
-            var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", 0x0008);
+        ret = outputTape.Create(_outputPath, dskType, _formatOptions, 0, 0);
 
-            var currentTapeFile = new TapeFile
-            {
-                File       = currentFile,
-                FirstBlock = currentBlock,
-                Partition  = currentPartition
-            };
+        // Cannot create image
+        if(!ret)
+        {
+            _dumpLog.WriteLine("Error creating output image, not continuing.");
+            _dumpLog.WriteLine(outputTape.ErrorMessage);
 
-            var currentTapePartition = new TapePartition
-            {
-                Number     = currentPartition,
-                FirstBlock = currentBlock
-            };
+            StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
+                                         outputTape.ErrorMessage);
 
-            if((canLocate || canLocateLong) &&
-               _resume.NextBlock > 0)
-            {
-                currentBlock = _resume.NextBlock;
+            return;
+        }
 
-                currentTapeFile =
-                    outputTape.Files.FirstOrDefault(f => f.LastBlock ==
-                                                         outputTape?.
+        start = DateTime.UtcNow;
+        var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, 1, _private);
+        var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", 0x0008);
+
+        var currentTapeFile = new TapeFile
+        {
+            File       = currentFile,
+            FirstBlock = currentBlock,
+            Partition  = currentPartition
+        };
+
+        var currentTapePartition = new TapePartition
+        {
+            Number     = currentPartition,
+            FirstBlock = currentBlock
+        };
+
+        if((canLocate || canLocateLong) &&
+           _resume.NextBlock > 0)
+        {
+            currentBlock = _resume.NextBlock;
+
+            currentTapeFile =
+                outputTape.Files.FirstOrDefault(f => f.LastBlock ==
+                                                     outputTape?.
                                                          Files.Max(g => g.LastBlock));
 
-                currentTapePartition =
-                    outputTape.TapePartitions.FirstOrDefault(p => p.LastBlock ==
-                                                                  outputTape?.TapePartitions.Max(g => g.LastBlock));
+            currentTapePartition =
+                outputTape.TapePartitions.FirstOrDefault(p => p.LastBlock ==
+                                                              outputTape?.TapePartitions.Max(g => g.LastBlock));
+        }
+
+        if(mode6Data != null)
+            outputTape.WriteMediaTag(mode6Data, MediaTagType.SCSI_MODESENSE_6);
+
+        if(mode10Data != null)
+            outputTape.WriteMediaTag(mode10Data, MediaTagType.SCSI_MODESENSE_10);
+
+        DateTime timeSpeedStart     = DateTime.UtcNow;
+        ulong    currentSpeedSize   = 0;
+        double   imageWriteDuration = 0;
+
+        InitProgress?.Invoke();
+
+        while(currentPartition < totalPartitions)
+        {
+            if(_aborted)
+            {
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
+
+                break;
             }
 
-            if(mode6Data != null)
-                outputTape.WriteMediaTag(mode6Data, MediaTagType.SCSI_MODESENSE_6);
+            if(endOfMedia)
+            {
+                UpdateStatus?.Invoke($"Finished partition {currentPartition}");
+                _dumpLog.WriteLine("Finished partition {0}", currentPartition);
 
-            if(mode10Data != null)
-                outputTape.WriteMediaTag(mode10Data, MediaTagType.SCSI_MODESENSE_10);
+                currentTapeFile.LastBlock = currentBlock - 1;
 
-            DateTime timeSpeedStart     = DateTime.UtcNow;
-            ulong    currentSpeedSize   = 0;
-            double   imageWriteDuration = 0;
+                if(currentTapeFile.LastBlock > currentTapeFile.FirstBlock)
+                    outputTape.AddFile(currentTapeFile);
+
+                currentTapePartition.LastBlock = currentBlock - 1;
+                outputTape.AddPartition(currentTapePartition);
+
+                currentPartition++;
+
+                if(currentPartition < totalPartitions)
+                {
+                    currentFile++;
+
+                    currentTapeFile = new TapeFile
+                    {
+                        File       = currentFile,
+                        FirstBlock = currentBlock,
+                        Partition  = currentPartition
+                    };
+
+                    currentTapePartition = new TapePartition
+                    {
+                        Number     = currentPartition,
+                        FirstBlock = currentBlock
+                    };
+
+                    UpdateStatus?.Invoke($"Seeking to partition {currentPartition}");
+                    _dev.Locate(out senseBuf, false, currentPartition, 0, _dev.Timeout, out duration);
+                    totalDuration += duration;
+                }
+
+                continue;
+            }
+
+            if(currentSpeed > maxSpeed &&
+               currentSpeed > 0)
+                maxSpeed = currentSpeed;
+
+            if(currentSpeed < minSpeed &&
+               currentSpeed > 0)
+                minSpeed = currentSpeed;
+
+            PulseProgress?.Invoke($"Reading block {currentBlock} ({currentSpeed:F3} MiB/sec.)");
+
+            sense = _dev.Read6(out cmdBuf, out senseBuf, false, fixedLen, transferLen, blockSize, _dev.Timeout,
+                               out duration);
+
+            totalDuration += duration;
+
+            if(sense                 &&
+               senseBuf?.Length != 0 &&
+               !ArrayHelpers.ArrayIsNullOrEmpty(senseBuf))
+            {
+                decSense = Sense.Decode(senseBuf);
+
+                bool ili         = decSense?.Fixed?.ILI              == true;
+                bool valid       = decSense?.Fixed?.InformationValid == true;
+                uint information = decSense?.Fixed?.Information ?? 0;
+                bool eom         = decSense?.Fixed?.EOM      == true;
+                bool filemark    = decSense?.Fixed?.Filemark == true;
+
+                if(decSense?.Descriptor.HasValue == true)
+                {
+                    if(decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
+                    {
+                        valid       = true;
+                        information = (uint)Sense.DecodeDescriptor00(desc00);
+                    }
+
+                    if(decSense.Value.Descriptor.Value.Descriptors.TryGetValue(4, out byte[] desc04))
+                        Sense.DecodeDescriptor04(desc04, out filemark, out eom, out ili);
+                }
+
+                if(decSense.Value.ASC  == 0x00 &&
+                   decSense.Value.ASCQ == 0x00 &&
+                   ili                         &&
+                   valid)
+                {
+                    blockSize = (uint)((int)blockSize -
+                                       BitConverter.ToInt32(BitConverter.GetBytes(information), 0));
+
+                    if(!fixedLen)
+                        transferLen = blockSize;
+
+                    UpdateStatus?.Invoke($"Blocksize changed to {blockSize} bytes at block {currentBlock}");
+                    _dumpLog.WriteLine("Blocksize changed to {0} bytes at block {1}", blockSize, currentBlock);
+
+                    sense = _dev.Space(out senseBuf, SscSpaceCodes.LogicalBlock, -1, _dev.Timeout, out duration);
+
+                    totalDuration += duration;
+
+                    if(sense)
+                    {
+                        decSense = Sense.Decode(senseBuf);
+
+                        StoppingErrorMessage?.Invoke("Drive could not go back one block. Sense follows..." +
+                                                     Environment.NewLine + decSense.Value.Description);
+
+                        outputTape.Close();
+                        _dumpLog.WriteLine("Drive could not go back one block. Sense follows...");
+
+                        _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
+                                           decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
+
+                        return;
+                    }
+
+                    continue;
+                }
+
+                switch(decSense.Value.SenseKey)
+                {
+                    case SenseKeys.BlankCheck when currentBlock == 0:
+                        StoppingErrorMessage?.Invoke("Cannot dump a blank tape...");
+                        outputTape.Close();
+                        _dumpLog.WriteLine("Cannot dump a blank tape...");
+
+                        return;
+
+                    // For sure this is an end-of-tape/partition
+                    case SenseKeys.BlankCheck when decSense.Value.ASC == 0x00 &&
+                                                   (decSense.Value.ASCQ == 0x02 || decSense.Value.ASCQ == 0x05 ||
+                                                    eom):
+                        // TODO: Detect end of partition
+                        endOfMedia = true;
+                        UpdateStatus?.Invoke("Found end-of-tape/partition...");
+                        _dumpLog.WriteLine("Found end-of-tape/partition...");
+
+                        continue;
+                    case SenseKeys.BlankCheck:
+                        StoppingErrorMessage?.Invoke("Blank block found, end of tape?...");
+                        endOfMedia = true;
+                        _dumpLog.WriteLine("Blank block found, end of tape?...");
+
+                        continue;
+                }
+
+                if((decSense.Value.SenseKey == SenseKeys.NoSense ||
+                    decSense.Value.SenseKey == SenseKeys.RecoveredError) &&
+                   (decSense.Value.ASCQ == 0x02 || decSense.Value.ASCQ == 0x05 || eom))
+                {
+                    // TODO: Detect end of partition
+                    endOfMedia = true;
+                    UpdateStatus?.Invoke("Found end-of-tape/partition...");
+                    _dumpLog.WriteLine("Found end-of-tape/partition...");
+
+                    continue;
+                }
+
+                if((decSense.Value.SenseKey == SenseKeys.NoSense ||
+                    decSense.Value.SenseKey == SenseKeys.RecoveredError) &&
+                   (decSense.Value.ASCQ == 0x01 || filemark))
+                {
+                    currentTapeFile.LastBlock = currentBlock - 1;
+                    outputTape.AddFile(currentTapeFile);
+
+                    currentFile++;
+
+                    currentTapeFile = new TapeFile
+                    {
+                        File       = currentFile,
+                        FirstBlock = currentBlock,
+                        Partition  = currentPartition
+                    };
+
+                    UpdateStatus?.Invoke($"Changed to file {currentFile} at block {currentBlock}");
+                    _dumpLog.WriteLine("Changed to file {0} at block {1}", currentFile, currentBlock);
+
+                    continue;
+                }
+
+                if(decSense is null)
+                {
+                    StoppingErrorMessage?.
+                        Invoke($"Drive could not read block ${currentBlock}. Sense cannot be decoded, look at log for dump...");
+
+                    _dumpLog.WriteLine($"Drive could not read block ${currentBlock}. Sense bytes follow...");
+                    _dumpLog.WriteLine(PrintHex.ByteArrayToHexArrayString(senseBuf, 32));
+                }
+                else
+                {
+                    StoppingErrorMessage?.
+                        Invoke($"Drive could not read block ${currentBlock}. Sense follows...\n{decSense.Value.SenseKey} {decSense.Value.Description}");
+
+                    _dumpLog.WriteLine($"Drive could not read block ${currentBlock}. Sense follows...");
+
+                    _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
+                                       decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
+                }
+
+                // TODO: Reset device after X errors
+                if(_stopOnError)
+                    return; // TODO: Return more cleanly
+
+                // Write empty data
+                DateTime writeStart = DateTime.Now;
+                outputTape.WriteSector(new byte[blockSize], currentBlock);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+
+                mhddLog.Write(currentBlock, duration < 500 ? 65535 : duration);
+                ibgLog.Write(currentBlock, 0);
+                _resume.BadBlocks.Add(currentBlock);
+            }
+            else
+            {
+                mhddLog.Write(currentBlock, duration);
+                ibgLog.Write(currentBlock, currentSpeed * 1024);
+                DateTime writeStart = DateTime.Now;
+                outputTape.WriteSector(cmdBuf, currentBlock);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                extents.Add(currentBlock, 1, true);
+            }
+
+            currentBlock++;
+            _resume.NextBlock++;
+            currentSpeedSize += blockSize;
+
+            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+            if(elapsed <= 0)
+                continue;
+
+            currentSpeed     = currentSpeedSize / (1048576 * elapsed);
+            currentSpeedSize = 0;
+            timeSpeedStart   = DateTime.UtcNow;
+        }
+
+        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+        blocks            = currentBlock + 1;
+        end               = DateTime.UtcNow;
+
+        // If not aborted this is added at the end of medium
+        if(_aborted)
+        {
+            currentTapeFile.LastBlock = currentBlock - 1;
+            outputTape.AddFile(currentTapeFile);
+
+            currentTapePartition.LastBlock = currentBlock - 1;
+            outputTape.AddPartition(currentTapePartition);
+        }
+
+        EndProgress?.Invoke();
+        mhddLog.Close();
+
+        ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                     blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+
+        UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+
+        UpdateStatus?.
+            Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
+
+        UpdateStatus?.
+            Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
+
+        _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
+
+        _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
+
+        _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
+
+        #region Error handling
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _retryPasses > 0            &&
+           (canLocate || canLocateLong))
+        {
+            int  pass              = 1;
+            bool forward           = false;
+            bool runningPersistent = false;
+
+            Modes.ModePage? currentModePage = null;
+
+            if(_persistent)
+            {
+                // TODO: Implement persistent
+            }
 
             InitProgress?.Invoke();
+            repeatRetry:
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
 
-            while(currentPartition < totalPartitions)
+            foreach(ulong badBlock in tmpArray)
             {
                 if(_aborted)
                 {
@@ -841,599 +1142,297 @@ namespace Aaru.Core.Devices.Dumping
                     break;
                 }
 
-                if(endOfMedia)
+                PulseProgress?.Invoke(string.Format("Retrying block {0}, pass {1}, {3}{2}", badBlock, pass,
+                                                    forward ? "forward" : "reverse",
+                                                    runningPersistent ? "recovering partial data, " : ""));
+
+                UpdateStatus?.Invoke($"Positioning tape to block {badBlock}.");
+                _dumpLog.WriteLine($"Positioning tape to block {badBlock}.");
+
+                if(canLocateLong)
                 {
-                    UpdateStatus?.Invoke($"Finished partition {currentPartition}");
-                    _dumpLog.WriteLine("Finished partition {0}", currentPartition);
+                    sense = _dev.Locate16(out senseBuf, _resume.NextBlock, _dev.Timeout, out _);
 
-                    currentTapeFile.LastBlock = currentBlock - 1;
-
-                    if(currentTapeFile.LastBlock > currentTapeFile.FirstBlock)
-                        outputTape.AddFile(currentTapeFile);
-
-                    currentTapePartition.LastBlock = currentBlock - 1;
-                    outputTape.AddPartition(currentTapePartition);
-
-                    currentPartition++;
-
-                    if(currentPartition < totalPartitions)
+                    if(!sense)
                     {
-                        currentFile++;
+                        sense = _dev.ReadPositionLong(out cmdBuf, out senseBuf, _dev.Timeout, out _);
 
-                        currentTapeFile = new TapeFile
+                        if(sense)
                         {
-                            File       = currentFile,
-                            FirstBlock = currentBlock,
-                            Partition  = currentPartition
-                        };
+                            _dumpLog.WriteLine("Could not check current position, continuing.");
+                            StoppingErrorMessage?.Invoke("Could not check current position, continuing.");
 
-                        currentTapePartition = new TapePartition
+                            continue;
+                        }
+
+                        ulong position = Swapping.Swap(BitConverter.ToUInt64(cmdBuf, 8));
+
+                        if(position != _resume.NextBlock)
                         {
-                            Number     = currentPartition,
-                            FirstBlock = currentBlock
-                        };
+                            _dumpLog.WriteLine("Current position is not as expected, continuing.");
+                            StoppingErrorMessage?.Invoke("Current position is not as expected, continuing.");
 
-                        UpdateStatus?.Invoke($"Seeking to partition {currentPartition}");
-                        _dev.Locate(out senseBuf, false, currentPartition, 0, _dev.Timeout, out duration);
-                        totalDuration += duration;
+                            continue;
+                        }
                     }
+                    else
+                    {
+                        _dumpLog.WriteLine($"Cannot position tape to block {badBlock}.");
+                        ErrorMessage?.Invoke($"Cannot position tape to block {badBlock}.");
 
-                    continue;
+                        continue;
+                    }
                 }
+                else
+                {
+                    sense = _dev.Locate(out senseBuf, (uint)_resume.NextBlock, _dev.Timeout, out _);
 
-                if(currentSpeed > maxSpeed &&
-                   currentSpeed > 0)
-                    maxSpeed = currentSpeed;
+                    if(!sense)
+                    {
+                        sense = _dev.ReadPosition(out cmdBuf, out senseBuf, _dev.Timeout, out _);
 
-                if(currentSpeed < minSpeed &&
-                   currentSpeed > 0)
-                    minSpeed = currentSpeed;
+                        if(sense)
+                        {
+                            _dumpLog.WriteLine("Could not check current position, continuing.");
+                            StoppingErrorMessage?.Invoke("Could not check current position, continuing.");
 
-                PulseProgress?.Invoke($"Reading block {currentBlock} ({currentSpeed:F3} MiB/sec.)");
+                            continue;
+                        }
+
+                        ulong position = Swapping.Swap(BitConverter.ToUInt32(cmdBuf, 4));
+
+                        if(position != _resume.NextBlock)
+                        {
+                            _dumpLog.WriteLine("Current position is not as expected, continuing.");
+                            StoppingErrorMessage?.Invoke("Current position is not as expected, continuing.");
+
+                            continue;
+                        }
+                    }
+                    else
+                    {
+                        _dumpLog.WriteLine($"Cannot position tape to block {badBlock}.");
+                        ErrorMessage?.Invoke($"Cannot position tape to block {badBlock}.");
+
+                        continue;
+                    }
+                }
 
                 sense = _dev.Read6(out cmdBuf, out senseBuf, false, fixedLen, transferLen, blockSize, _dev.Timeout,
                                    out duration);
 
                 totalDuration += duration;
 
-                if(sense                 &&
-                   senseBuf?.Length != 0 &&
-                   !ArrayHelpers.ArrayIsNullOrEmpty(senseBuf))
+                if(!sense &&
+                   !_dev.Error)
                 {
-                    decSense = Sense.Decode(senseBuf);
-
-                    bool ili         = decSense?.Fixed?.ILI              == true;
-                    bool valid       = decSense?.Fixed?.InformationValid == true;
-                    uint information = decSense?.Fixed?.Information ?? 0;
-                    bool eom         = decSense?.Fixed?.EOM      == true;
-                    bool filemark    = decSense?.Fixed?.Filemark == true;
-
-                    if(decSense?.Descriptor.HasValue == true)
-                    {
-                        if(decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
-                        {
-                            valid       = true;
-                            information = (uint)Sense.DecodeDescriptor00(desc00);
-                        }
-
-                        if(decSense.Value.Descriptor.Value.Descriptors.TryGetValue(4, out byte[] desc04))
-                            Sense.DecodeDescriptor04(desc04, out filemark, out eom, out ili);
-                    }
-
-                    if(decSense.Value.ASC  == 0x00 &&
-                       decSense.Value.ASCQ == 0x00 &&
-                       ili                         &&
-                       valid)
-                    {
-                        blockSize = (uint)((int)blockSize -
-                                           BitConverter.ToInt32(BitConverter.GetBytes(information), 0));
-
-                        if(!fixedLen)
-                            transferLen = blockSize;
-
-                        UpdateStatus?.Invoke($"Blocksize changed to {blockSize} bytes at block {currentBlock}");
-                        _dumpLog.WriteLine("Blocksize changed to {0} bytes at block {1}", blockSize, currentBlock);
-
-                        sense = _dev.Space(out senseBuf, SscSpaceCodes.LogicalBlock, -1, _dev.Timeout, out duration);
-
-                        totalDuration += duration;
-
-                        if(sense)
-                        {
-                            decSense = Sense.Decode(senseBuf);
-
-                            StoppingErrorMessage?.Invoke("Drive could not go back one block. Sense follows..." +
-                                                         Environment.NewLine + decSense.Value.Description);
-
-                            outputTape.Close();
-                            _dumpLog.WriteLine("Drive could not go back one block. Sense follows...");
-
-                            _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
-                                               decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
-
-                            return;
-                        }
-
-                        continue;
-                    }
-
-                    switch(decSense.Value.SenseKey)
-                    {
-                        case SenseKeys.BlankCheck when currentBlock == 0:
-                            StoppingErrorMessage?.Invoke("Cannot dump a blank tape...");
-                            outputTape.Close();
-                            _dumpLog.WriteLine("Cannot dump a blank tape...");
-
-                            return;
-
-                        // For sure this is an end-of-tape/partition
-                        case SenseKeys.BlankCheck when decSense.Value.ASC == 0x00 &&
-                                                       (decSense.Value.ASCQ == 0x02 || decSense.Value.ASCQ == 0x05 ||
-                                                        eom):
-                            // TODO: Detect end of partition
-                            endOfMedia = true;
-                            UpdateStatus?.Invoke("Found end-of-tape/partition...");
-                            _dumpLog.WriteLine("Found end-of-tape/partition...");
-
-                            continue;
-                        case SenseKeys.BlankCheck:
-                            StoppingErrorMessage?.Invoke("Blank block found, end of tape?...");
-                            endOfMedia = true;
-                            _dumpLog.WriteLine("Blank block found, end of tape?...");
-
-                            continue;
-                    }
-
-                    if((decSense.Value.SenseKey == SenseKeys.NoSense ||
-                        decSense.Value.SenseKey == SenseKeys.RecoveredError) &&
-                       (decSense.Value.ASCQ == 0x02 || decSense.Value.ASCQ == 0x05 || eom))
-                    {
-                        // TODO: Detect end of partition
-                        endOfMedia = true;
-                        UpdateStatus?.Invoke("Found end-of-tape/partition...");
-                        _dumpLog.WriteLine("Found end-of-tape/partition...");
-
-                        continue;
-                    }
-
-                    if((decSense.Value.SenseKey == SenseKeys.NoSense ||
-                        decSense.Value.SenseKey == SenseKeys.RecoveredError) &&
-                       (decSense.Value.ASCQ == 0x01 || filemark))
-                    {
-                        currentTapeFile.LastBlock = currentBlock - 1;
-                        outputTape.AddFile(currentTapeFile);
-
-                        currentFile++;
-
-                        currentTapeFile = new TapeFile
-                        {
-                            File       = currentFile,
-                            FirstBlock = currentBlock,
-                            Partition  = currentPartition
-                        };
-
-                        UpdateStatus?.Invoke($"Changed to file {currentFile} at block {currentBlock}");
-                        _dumpLog.WriteLine("Changed to file {0} at block {1}", currentFile, currentBlock);
-
-                        continue;
-                    }
-
-                    if(decSense is null)
-                    {
-                        StoppingErrorMessage?.
-                            Invoke($"Drive could not read block ${currentBlock}. Sense cannot be decoded, look at log for dump...");
-
-                        _dumpLog.WriteLine($"Drive could not read block ${currentBlock}. Sense bytes follow...");
-                        _dumpLog.WriteLine(PrintHex.ByteArrayToHexArrayString(senseBuf, 32));
-                    }
-                    else
-                    {
-                        StoppingErrorMessage?.
-                            Invoke($"Drive could not read block ${currentBlock}. Sense follows...\n{decSense.Value.SenseKey} {decSense.Value.Description}");
-
-                        _dumpLog.WriteLine($"Drive could not read block ${currentBlock}. Sense follows...");
-
-                        _dumpLog.WriteLine("Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
-                                           decSense.Value.SenseKey, decSense.Value.ASC, decSense.Value.ASCQ);
-                    }
-
-                    // TODO: Reset device after X errors
-                    if(_stopOnError)
-                        return; // TODO: Return more cleanly
-
-                    // Write empty data
-                    DateTime writeStart = DateTime.Now;
-                    outputTape.WriteSector(new byte[blockSize], currentBlock);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-
-                    mhddLog.Write(currentBlock, duration < 500 ? 65535 : duration);
-                    ibgLog.Write(currentBlock, 0);
-                    _resume.BadBlocks.Add(currentBlock);
+                    _resume.BadBlocks.Remove(badBlock);
+                    extents.Add(badBlock);
+                    outputTape.WriteSector(cmdBuf, badBlock);
+                    UpdateStatus?.Invoke($"Correctly retried block {badBlock} in pass {pass}.");
+                    _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badBlock, pass);
                 }
-                else
-                {
-                    mhddLog.Write(currentBlock, duration);
-                    ibgLog.Write(currentBlock, currentSpeed * 1024);
-                    DateTime writeStart = DateTime.Now;
-                    outputTape.WriteSector(cmdBuf, currentBlock);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                    extents.Add(currentBlock, 1, true);
-                }
-
-                currentBlock++;
-                _resume.NextBlock++;
-                currentSpeedSize += blockSize;
-
-                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                if(elapsed <= 0)
-                    continue;
-
-                currentSpeed     = currentSpeedSize / (1048576 * elapsed);
-                currentSpeedSize = 0;
-                timeSpeedStart   = DateTime.UtcNow;
+                else if(runningPersistent)
+                    outputTape.WriteSector(cmdBuf, badBlock);
             }
 
-            _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
-            blocks            = currentBlock + 1;
-            end               = DateTime.UtcNow;
-
-            // If not aborted this is added at the end of medium
-            if(_aborted)
+            if(pass < _retryPasses &&
+               !_aborted           &&
+               _resume.BadBlocks.Count > 0)
             {
-                currentTapeFile.LastBlock = currentBlock - 1;
-                outputTape.AddFile(currentTapeFile);
+                pass++;
+                forward = !forward;
+                _resume.BadBlocks.Sort();
 
-                currentTapePartition.LastBlock = currentBlock - 1;
-                outputTape.AddPartition(currentTapePartition);
+                if(!forward)
+                    _resume.BadBlocks.Reverse();
+
+                goto repeatRetry;
+            }
+
+            if(runningPersistent && currentModePage.HasValue)
+            {
+                // TODO: Persistent mode
             }
 
             EndProgress?.Invoke();
-            mhddLog.Close();
-
-            ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                         blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
-
-            UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
-
-            UpdateStatus?.
-                Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
-
-            UpdateStatus?.
-                Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
-
-            _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
-
-            _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
-
-            _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
-
-            #region Error handling
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _retryPasses > 0            &&
-               (canLocate || canLocateLong))
-            {
-                int  pass              = 1;
-                bool forward           = false;
-                bool runningPersistent = false;
-
-                Modes.ModePage? currentModePage = null;
-
-                if(_persistent)
-                {
-                    // TODO: Implement persistent
-                }
-
-                InitProgress?.Invoke();
-                repeatRetry:
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
-
-                foreach(ulong badBlock in tmpArray)
-                {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    PulseProgress?.Invoke(string.Format("Retrying block {0}, pass {1}, {3}{2}", badBlock, pass,
-                                                        forward ? "forward" : "reverse",
-                                                        runningPersistent ? "recovering partial data, " : ""));
-
-                    UpdateStatus?.Invoke($"Positioning tape to block {badBlock}.");
-                    _dumpLog.WriteLine($"Positioning tape to block {badBlock}.");
-
-                    if(canLocateLong)
-                    {
-                        sense = _dev.Locate16(out senseBuf, _resume.NextBlock, _dev.Timeout, out _);
-
-                        if(!sense)
-                        {
-                            sense = _dev.ReadPositionLong(out cmdBuf, out senseBuf, _dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                _dumpLog.WriteLine("Could not check current position, continuing.");
-                                StoppingErrorMessage?.Invoke("Could not check current position, continuing.");
-
-                                continue;
-                            }
-
-                            ulong position = Swapping.Swap(BitConverter.ToUInt64(cmdBuf, 8));
-
-                            if(position != _resume.NextBlock)
-                            {
-                                _dumpLog.WriteLine("Current position is not as expected, continuing.");
-                                StoppingErrorMessage?.Invoke("Current position is not as expected, continuing.");
-
-                                continue;
-                            }
-                        }
-                        else
-                        {
-                            _dumpLog.WriteLine($"Cannot position tape to block {badBlock}.");
-                            ErrorMessage?.Invoke($"Cannot position tape to block {badBlock}.");
-
-                            continue;
-                        }
-                    }
-                    else
-                    {
-                        sense = _dev.Locate(out senseBuf, (uint)_resume.NextBlock, _dev.Timeout, out _);
-
-                        if(!sense)
-                        {
-                            sense = _dev.ReadPosition(out cmdBuf, out senseBuf, _dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                _dumpLog.WriteLine("Could not check current position, continuing.");
-                                StoppingErrorMessage?.Invoke("Could not check current position, continuing.");
-
-                                continue;
-                            }
-
-                            ulong position = Swapping.Swap(BitConverter.ToUInt32(cmdBuf, 4));
-
-                            if(position != _resume.NextBlock)
-                            {
-                                _dumpLog.WriteLine("Current position is not as expected, continuing.");
-                                StoppingErrorMessage?.Invoke("Current position is not as expected, continuing.");
-
-                                continue;
-                            }
-                        }
-                        else
-                        {
-                            _dumpLog.WriteLine($"Cannot position tape to block {badBlock}.");
-                            ErrorMessage?.Invoke($"Cannot position tape to block {badBlock}.");
-
-                            continue;
-                        }
-                    }
-
-                    sense = _dev.Read6(out cmdBuf, out senseBuf, false, fixedLen, transferLen, blockSize, _dev.Timeout,
-                                       out duration);
-
-                    totalDuration += duration;
-
-                    if(!sense &&
-                       !_dev.Error)
-                    {
-                        _resume.BadBlocks.Remove(badBlock);
-                        extents.Add(badBlock);
-                        outputTape.WriteSector(cmdBuf, badBlock);
-                        UpdateStatus?.Invoke($"Correctly retried block {badBlock} in pass {pass}.");
-                        _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badBlock, pass);
-                    }
-                    else if(runningPersistent)
-                        outputTape.WriteSector(cmdBuf, badBlock);
-                }
-
-                if(pass < _retryPasses &&
-                   !_aborted           &&
-                   _resume.BadBlocks.Count > 0)
-                {
-                    pass++;
-                    forward = !forward;
-                    _resume.BadBlocks.Sort();
-
-                    if(!forward)
-                        _resume.BadBlocks.Reverse();
-
-                    goto repeatRetry;
-                }
-
-                if(runningPersistent && currentModePage.HasValue)
-                {
-                    // TODO: Persistent mode
-                }
-
-                EndProgress?.Invoke();
-            }
-            #endregion Error handling
-
-            _resume.BadBlocks.Sort();
-
-            foreach(ulong bad in _resume.BadBlocks)
-                _dumpLog.WriteLine("Block {0} could not be read.", bad);
-
-            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-
-            outputTape.SetDumpHardware(_resume.Tries);
-
-            // TODO: Media Serial Number
-            var metadata = new CommonTypes.Structs.ImageInfo
-            {
-                Application        = "Aaru",
-                ApplicationVersion = Version.GetVersion()
-            };
-
-            if(!outputTape.SetMetadata(metadata))
-                ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
-                                     outputTape.ErrorMessage);
-
-            if(_preSidecar != null)
-                outputTape.SetCicmMetadata(_preSidecar);
-
-            _dumpLog.WriteLine("Closing output file.");
-            UpdateStatus?.Invoke("Closing output file.");
-            DateTime closeStart = DateTime.Now;
-            outputTape.Close();
-            DateTime closeEnd = DateTime.Now;
-            UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
-            _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
-
-            if(_aborted)
-            {
-                UpdateStatus?.Invoke("Aborted!");
-                _dumpLog.WriteLine("Aborted!");
-
-                return;
-            }
-
-            if(_aborted)
-            {
-                UpdateStatus?.Invoke("Aborted!");
-                _dumpLog.WriteLine("Aborted!");
-
-                return;
-            }
-
-            double totalChkDuration = 0;
-
-            if(_metadata)
-            {
-                UpdateStatus?.Invoke("Creating sidecar.");
-                _dumpLog.WriteLine("Creating sidecar.");
-                var         filters     = new FiltersList();
-                IFilter     filter      = filters.GetFilter(_outputPath);
-                IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
-                ErrorNumber opened      = inputPlugin.Open(filter);
-
-                if(opened != ErrorNumber.NoError)
-                {
-                    StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
-
-                    return;
-                }
-
-                DateTime chkStart = DateTime.UtcNow;
-                _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
-                _sidecarClass.InitProgressEvent    += InitProgress;
-                _sidecarClass.UpdateProgressEvent  += UpdateProgress;
-                _sidecarClass.EndProgressEvent     += EndProgress;
-                _sidecarClass.InitProgressEvent2   += InitProgress2;
-                _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
-                _sidecarClass.EndProgressEvent2    += EndProgress2;
-                _sidecarClass.UpdateStatusEvent    += UpdateStatus;
-                CICMMetadataType sidecar = _sidecarClass.Create();
-                end = DateTime.UtcNow;
-
-                if(!_aborted)
-                {
-                    totalChkDuration = (end - chkStart).TotalMilliseconds;
-                    UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds.");
-
-                    UpdateStatus?.
-                        Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
-
-                    _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
-
-                    _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
-                                       blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
-
-                    if(_preSidecar != null)
-                    {
-                        _preSidecar.BlockMedia = sidecar.BlockMedia;
-                        sidecar                = _preSidecar;
-                    }
-
-                    List<(ulong start, string type)> filesystems = new();
-
-                    if(sidecar.BlockMedia[0].FileSystemInformation != null)
-                        filesystems.AddRange(from partition in sidecar.BlockMedia[0].FileSystemInformation
-                                             where partition.FileSystems != null
-                                             from fileSystem in partition.FileSystems
-                                             select (partition.StartSector, fileSystem.Type));
-
-                    if(filesystems.Count > 0)
-                        foreach(var filesystem in filesystems.Select(o => new
-                        {
-                            o.start,
-                            o.type
-                        }).Distinct())
-                        {
-                            UpdateStatus?.Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
-                            _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start);
-                        }
-
-                    sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType);
-
-                    (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
-
-                    sidecar.BlockMedia[0].DiskType    = xmlType.type;
-                    sidecar.BlockMedia[0].DiskSubType = xmlType.subType;
-
-                    // TODO: Implement device firmware revision
-                    if(!_dev.IsRemovable ||
-                       _dev.IsUsb)
-                        if(_dev.Type == DeviceType.ATAPI)
-                            sidecar.BlockMedia[0].Interface = "ATAPI";
-                        else if(_dev.IsUsb)
-                            sidecar.BlockMedia[0].Interface = "USB";
-                        else if(_dev.IsFireWire)
-                            sidecar.BlockMedia[0].Interface = "FireWire";
-                        else
-                            sidecar.BlockMedia[0].Interface = "SCSI";
-
-                    sidecar.BlockMedia[0].LogicalBlocks = blocks;
-                    sidecar.BlockMedia[0].Manufacturer  = _dev.Manufacturer;
-                    sidecar.BlockMedia[0].Model         = _dev.Model;
-
-                    if(!_private)
-                        sidecar.BlockMedia[0].Serial = _dev.Serial;
-
-                    sidecar.BlockMedia[0].Size = blocks * blockSize;
-
-                    if(_dev.IsRemovable)
-                        sidecar.BlockMedia[0].DumpHardwareArray = _resume.Tries.ToArray();
-
-                    UpdateStatus?.Invoke("Writing metadata sidecar");
-
-                    var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
-
-                    var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
-                    xmlSer.Serialize(xmlFs, sidecar);
-                    xmlFs.Close();
-                }
-            }
-
-            UpdateStatus?.Invoke("");
-
-            UpdateStatus?.
-                Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
-
-            UpdateStatus?.
-                Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
-
-            if(maxSpeed > 0)
-                UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
-
-            if(minSpeed > 0 &&
-               minSpeed < double.MaxValue)
-                UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
-
-            UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
-            UpdateStatus?.Invoke("");
-
-            Statistics.AddMedia(dskType, true);
         }
+        #endregion Error handling
+
+        _resume.BadBlocks.Sort();
+
+        foreach(ulong bad in _resume.BadBlocks)
+            _dumpLog.WriteLine("Block {0} could not be read.", bad);
+
+        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+
+        outputTape.SetDumpHardware(_resume.Tries);
+
+        // TODO: Media Serial Number
+        var metadata = new CommonTypes.Structs.ImageInfo
+        {
+            Application        = "Aaru",
+            ApplicationVersion = Version.GetVersion()
+        };
+
+        if(!outputTape.SetMetadata(metadata))
+            ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
+                                 outputTape.ErrorMessage);
+
+        if(_preSidecar != null)
+            outputTape.SetCicmMetadata(_preSidecar);
+
+        _dumpLog.WriteLine("Closing output file.");
+        UpdateStatus?.Invoke("Closing output file.");
+        DateTime closeStart = DateTime.Now;
+        outputTape.Close();
+        DateTime closeEnd = DateTime.Now;
+        UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
+        _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
+
+        if(_aborted)
+        {
+            UpdateStatus?.Invoke("Aborted!");
+            _dumpLog.WriteLine("Aborted!");
+
+            return;
+        }
+
+        if(_aborted)
+        {
+            UpdateStatus?.Invoke("Aborted!");
+            _dumpLog.WriteLine("Aborted!");
+
+            return;
+        }
+
+        double totalChkDuration = 0;
+
+        if(_metadata)
+        {
+            UpdateStatus?.Invoke("Creating sidecar.");
+            _dumpLog.WriteLine("Creating sidecar.");
+            var         filters     = new FiltersList();
+            IFilter     filter      = filters.GetFilter(_outputPath);
+            IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
+            ErrorNumber opened      = inputPlugin.Open(filter);
+
+            if(opened != ErrorNumber.NoError)
+            {
+                StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
+
+                return;
+            }
+
+            DateTime chkStart = DateTime.UtcNow;
+            _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
+            _sidecarClass.InitProgressEvent    += InitProgress;
+            _sidecarClass.UpdateProgressEvent  += UpdateProgress;
+            _sidecarClass.EndProgressEvent     += EndProgress;
+            _sidecarClass.InitProgressEvent2   += InitProgress2;
+            _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
+            _sidecarClass.EndProgressEvent2    += EndProgress2;
+            _sidecarClass.UpdateStatusEvent    += UpdateStatus;
+            CICMMetadataType sidecar = _sidecarClass.Create();
+            end = DateTime.UtcNow;
+
+            if(!_aborted)
+            {
+                totalChkDuration = (end - chkStart).TotalMilliseconds;
+                UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds.");
+
+                UpdateStatus?.
+                    Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
+
+                _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
+
+                _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
+                                   blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
+
+                if(_preSidecar != null)
+                {
+                    _preSidecar.BlockMedia = sidecar.BlockMedia;
+                    sidecar                = _preSidecar;
+                }
+
+                List<(ulong start, string type)> filesystems = new();
+
+                if(sidecar.BlockMedia[0].FileSystemInformation != null)
+                    filesystems.AddRange(from partition in sidecar.BlockMedia[0].FileSystemInformation
+                                         where partition.FileSystems != null
+                                         from fileSystem in partition.FileSystems
+                                         select (partition.StartSector, fileSystem.Type));
+
+                if(filesystems.Count > 0)
+                    foreach(var filesystem in filesystems.Select(o => new
+                            {
+                                o.start,
+                                o.type
+                            }).Distinct())
+                    {
+                        UpdateStatus?.Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
+                        _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type, filesystem.start);
+                    }
+
+                sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType);
+
+                (string type, string subType) xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
+
+                sidecar.BlockMedia[0].DiskType    = xmlType.type;
+                sidecar.BlockMedia[0].DiskSubType = xmlType.subType;
+
+                // TODO: Implement device firmware revision
+                if(!_dev.IsRemovable ||
+                   _dev.IsUsb)
+                    if(_dev.Type == DeviceType.ATAPI)
+                        sidecar.BlockMedia[0].Interface = "ATAPI";
+                    else if(_dev.IsUsb)
+                        sidecar.BlockMedia[0].Interface = "USB";
+                    else if(_dev.IsFireWire)
+                        sidecar.BlockMedia[0].Interface = "FireWire";
+                    else
+                        sidecar.BlockMedia[0].Interface = "SCSI";
+
+                sidecar.BlockMedia[0].LogicalBlocks = blocks;
+                sidecar.BlockMedia[0].Manufacturer  = _dev.Manufacturer;
+                sidecar.BlockMedia[0].Model         = _dev.Model;
+
+                if(!_private)
+                    sidecar.BlockMedia[0].Serial = _dev.Serial;
+
+                sidecar.BlockMedia[0].Size = blocks * blockSize;
+
+                if(_dev.IsRemovable)
+                    sidecar.BlockMedia[0].DumpHardwareArray = _resume.Tries.ToArray();
+
+                UpdateStatus?.Invoke("Writing metadata sidecar");
+
+                var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
+
+                var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
+                xmlSer.Serialize(xmlFs, sidecar);
+                xmlFs.Close();
+            }
+        }
+
+        UpdateStatus?.Invoke("");
+
+        UpdateStatus?.
+            Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+
+        UpdateStatus?.
+            Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+
+        if(maxSpeed > 0)
+            UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+
+        if(minSpeed > 0 &&
+           minSpeed < double.MaxValue)
+            UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+
+        UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
+        UpdateStatus?.Invoke("");
+
+        Statistics.AddMedia(dskType, true);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/Sbc/Data.cs b/Aaru.Core/Devices/Dumping/Sbc/Data.cs
index 256cf36dc..5cde02fbf 100644
--- a/Aaru.Core/Devices/Dumping/Sbc/Data.cs
+++ b/Aaru.Core/Devices/Dumping/Sbc/Data.cs
@@ -41,236 +41,235 @@ using DVDDecryption = Aaru.Decryption.DVD.Dump;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Dumps data when dumping from a SCSI Block Commands compliant device</summary>
+    /// <param name="blocks">Media blocks</param>
+    /// <param name="maxBlocksToRead">Maximum number of blocks to read in a single command</param>
+    /// <param name="blockSize">Block size in bytes</param>
+    /// <param name="currentTry">Resume information</param>
+    /// <param name="extents">Correctly dump extents</param>
+    /// <param name="currentSpeed">Current speed</param>
+    /// <param name="minSpeed">Minimum speed</param>
+    /// <param name="maxSpeed">Maximum speed</param>
+    /// <param name="totalDuration">Total time spent in commands</param>
+    /// <param name="scsiReader">SCSI reader</param>
+    /// <param name="mhddLog">MHDD log</param>
+    /// <param name="ibgLog">ImgBurn log</param>
+    /// <param name="imageWriteDuration">Total time spent writing to image</param>
+    /// <param name="newTrim">Set if we need to start a trim</param>
+    /// <param name="dvdDecrypt">DVD CSS decryption module</param>
+    /// <param name="discKey">The DVD disc key</param>
+    void ReadSbcData(in ulong blocks, in uint maxBlocksToRead, in uint blockSize, DumpHardwareType currentTry,
+                     ExtentsULong extents, ref double currentSpeed, ref double minSpeed, ref double maxSpeed,
+                     ref double totalDuration, Reader scsiReader, MhddLog mhddLog, IbgLog ibgLog,
+                     ref double imageWriteDuration, ref bool newTrim, ref DVDDecryption dvdDecrypt, byte[] discKey)
     {
-        /// <summary>Dumps data when dumping from a SCSI Block Commands compliant device</summary>
-        /// <param name="blocks">Media blocks</param>
-        /// <param name="maxBlocksToRead">Maximum number of blocks to read in a single command</param>
-        /// <param name="blockSize">Block size in bytes</param>
-        /// <param name="currentTry">Resume information</param>
-        /// <param name="extents">Correctly dump extents</param>
-        /// <param name="currentSpeed">Current speed</param>
-        /// <param name="minSpeed">Minimum speed</param>
-        /// <param name="maxSpeed">Maximum speed</param>
-        /// <param name="totalDuration">Total time spent in commands</param>
-        /// <param name="scsiReader">SCSI reader</param>
-        /// <param name="mhddLog">MHDD log</param>
-        /// <param name="ibgLog">ImgBurn log</param>
-        /// <param name="imageWriteDuration">Total time spent writing to image</param>
-        /// <param name="newTrim">Set if we need to start a trim</param>
-        /// <param name="dvdDecrypt">DVD CSS decryption module</param>
-        /// <param name="discKey">The DVD disc key</param>
-        void ReadSbcData(in ulong blocks, in uint maxBlocksToRead, in uint blockSize, DumpHardwareType currentTry,
-                         ExtentsULong extents, ref double currentSpeed, ref double minSpeed, ref double maxSpeed,
-                         ref double totalDuration, Reader scsiReader, MhddLog mhddLog, IbgLog ibgLog,
-                         ref double imageWriteDuration, ref bool newTrim, ref DVDDecryption dvdDecrypt, byte[] discKey)
+        ulong    sectorSpeedStart = 0;
+        bool     sense;
+        DateTime timeSpeedStart = DateTime.UtcNow;
+        byte[]   buffer;
+        uint     blocksToRead = maxBlocksToRead;
+        var      outputFormat = _outputPlugin as IWritableImage;
+
+        InitProgress?.Invoke();
+
+        for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
         {
-            ulong    sectorSpeedStart = 0;
-            bool     sense;
-            DateTime timeSpeedStart = DateTime.UtcNow;
-            byte[]   buffer;
-            uint     blocksToRead = maxBlocksToRead;
-            var      outputFormat = _outputPlugin as IWritableImage;
-
-            InitProgress?.Invoke();
-
-            for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
+            if(_aborted)
             {
-                if(_aborted)
-                {
-                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    UpdateStatus?.Invoke("Aborted!");
-                    _dumpLog.WriteLine("Aborted!");
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
 
-                    break;
-                }
-
-                if(blocks - i < blocksToRead)
-                    blocksToRead = (uint)(blocks - i);
-
-                if(currentSpeed > maxSpeed &&
-                   currentSpeed > 0)
-                    maxSpeed = currentSpeed;
-
-                if(currentSpeed < minSpeed &&
-                   currentSpeed > 0)
-                    minSpeed = currentSpeed;
-
-                UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
-                                       (long)blocks);
-
-                sense = scsiReader.ReadBlocks(out buffer, i, blocksToRead, out double cmdDuration, out _, out _);
-                totalDuration += cmdDuration;
-
-                if(!sense &&
-                   !_dev.Error)
-                {
-                    if(Settings.Settings.Current.EnableDecryption &&
-                       discKey != null                            &&
-                       _titleKeys)
-                    {
-                        for(ulong j = 0; j < blocksToRead; j++)
-                        {
-                            if(_aborted)
-                                break;
-
-                            if(!_resume.MissingTitleKeys.Contains(i + j))
-
-                                // Key is already dumped.
-                                continue;
-
-                            byte[] tmpBuf;
-
-                            bool tmpSense = dvdDecrypt.ReadTitleKey(out tmpBuf, out _, DvdCssKeyClass.DvdCssCppmOrCprm,
-                                                                    i + j, _dev.Timeout, out _);
-
-                            if(!tmpSense)
-                            {
-                                CSS_CPRM.TitleKey? titleKey = CSS.DecodeTitleKey(tmpBuf, dvdDecrypt.BusKey);
-
-                                if(titleKey.HasValue)
-                                    outputFormat.WriteSectorTag(new[]
-                                    {
-                                        titleKey.Value.CMI
-                                    }, i + j, SectorTagType.DvdCmi);
-                                else
-                                    continue;
-
-                                // If the CMI bit is 1, the sector is using copy protection, else it is not
-                                if((titleKey.Value.CMI & 0x80) >> 7 == 0)
-                                {
-                                    // The CMI indicates this sector is not encrypted.
-                                    outputFormat.WriteSectorTag(new byte[]
-                                    {
-                                        0, 0, 0, 0, 0
-                                    }, i + j, SectorTagType.DvdTitleKey);
-
-                                    outputFormat.WriteSectorTag(new byte[]
-                                    {
-                                        0, 0, 0, 0, 0
-                                    }, i + j, SectorTagType.DvdTitleKeyDecrypted);
-
-                                    _resume.MissingTitleKeys.Remove(i + j);
-
-                                    continue;
-                                }
-
-                                // According to libdvdcss, if the key is all zeroes, the sector is actually
-                                // not encrypted even if the CMI says it is.
-                                if(titleKey.Value.Key.All(k => k == 0))
-                                {
-                                    outputFormat.WriteSectorTag(new byte[]
-                                    {
-                                        0, 0, 0, 0, 0
-                                    }, i + j, SectorTagType.DvdTitleKey);
-
-                                    outputFormat.WriteSectorTag(new byte[]
-                                    {
-                                        0, 0, 0, 0, 0
-                                    }, i + j, SectorTagType.DvdTitleKeyDecrypted);
-
-                                    _resume.MissingTitleKeys.Remove(i + j);
-
-                                    continue;
-                                }
-
-                                outputFormat.WriteSectorTag(titleKey.Value.Key, i + j, SectorTagType.DvdTitleKey);
-                                _resume.MissingTitleKeys.Remove(i                  + j);
-
-                                CSS.DecryptTitleKey(0, discKey, titleKey.Value.Key, out tmpBuf);
-                                outputFormat.WriteSectorTag(tmpBuf, i + j, SectorTagType.DvdTitleKeyDecrypted);
-                            }
-                        }
-
-                        if(!_storeEncrypted)
-
-                            // Todo: Flag in the outputFormat that a sector has been decrypted
-                        {
-                            ErrorNumber errno =
-                                outputFormat.ReadSectorsTag(i, blocksToRead, SectorTagType.DvdCmi, out byte[] cmi);
-
-                            if(errno != ErrorNumber.NoError)
-                                ErrorMessage?.Invoke($"Error retrieving CMI for sector {i}");
-                            else
-                            {
-                                errno = outputFormat.ReadSectorsTag(i, blocksToRead,
-                                                                     SectorTagType.DvdTitleKeyDecrypted,
-                                                                     out byte[] titleKey);
-
-                                if(errno != ErrorNumber.NoError)
-                                    ErrorMessage?.Invoke($"Error retrieving title key for sector {i}");
-                                else
-                                    buffer = CSS.DecryptSector(buffer, cmi, titleKey, blocksToRead, blockSize);
-                            }
-                        }
-                    }
-
-                    mhddLog.Write(i, cmdDuration);
-                    ibgLog.Write(i, currentSpeed * 1024);
-                    DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(buffer, i, blocksToRead);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                    extents.Add(i, blocksToRead, true);
-                }
-                else
-                {
-                    if(_dev.Manufacturer.ToLowerInvariant() == "insite")
-                    {
-                        _resume.BadBlocks.Add(i);
-                        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
-                        _resume.NextBlock++;
-                        _aborted = true;
-
-                        _dumpLog?.
-                            WriteLine("INSITE floptical drives get crazy on the SCSI bus when an error is found, stopping so you can reboot the computer or reset the scsi bus appropriately.");
-
-                        UpdateStatus?.
-                            Invoke("INSITE floptical drives get crazy on the SCSI bus when an error is found, stopping so you can reboot the computer or reset the scsi bus appropriately");
-
-                        continue;
-                    }
-
-                    // TODO: Reset device after X errors
-                    if(_stopOnError)
-                        return; // TODO: Return more cleanly
-
-                    if(i + _skip > blocks)
-                        _skip = (uint)(blocks - i);
-
-                    // Write empty data
-                    DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-
-                    for(ulong b = i; b < i + _skip; b++)
-                        _resume.BadBlocks.Add(b);
-
-                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                    ibgLog.Write(i, 0);
-                    _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
-                    i       += _skip - blocksToRead;
-                    newTrim =  true;
-                }
-
-                sectorSpeedStart  += blocksToRead;
-                _resume.NextBlock =  i + blocksToRead;
-
-                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                if(elapsed <= 0)
-                    continue;
-
-                currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                sectorSpeedStart = 0;
-                timeSpeedStart   = DateTime.UtcNow;
+                break;
             }
 
-            _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+            if(blocks - i < blocksToRead)
+                blocksToRead = (uint)(blocks - i);
 
-            EndProgress?.Invoke();
+            if(currentSpeed > maxSpeed &&
+               currentSpeed > 0)
+                maxSpeed = currentSpeed;
+
+            if(currentSpeed < minSpeed &&
+               currentSpeed > 0)
+                minSpeed = currentSpeed;
+
+            UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
+                                   (long)blocks);
+
+            sense         =  scsiReader.ReadBlocks(out buffer, i, blocksToRead, out double cmdDuration, out _, out _);
+            totalDuration += cmdDuration;
+
+            if(!sense &&
+               !_dev.Error)
+            {
+                if(Settings.Settings.Current.EnableDecryption &&
+                   discKey != null                            &&
+                   _titleKeys)
+                {
+                    for(ulong j = 0; j < blocksToRead; j++)
+                    {
+                        if(_aborted)
+                            break;
+
+                        if(!_resume.MissingTitleKeys.Contains(i + j))
+
+                            // Key is already dumped.
+                            continue;
+
+                        byte[] tmpBuf;
+
+                        bool tmpSense = dvdDecrypt.ReadTitleKey(out tmpBuf, out _, DvdCssKeyClass.DvdCssCppmOrCprm,
+                                                                i + j, _dev.Timeout, out _);
+
+                        if(!tmpSense)
+                        {
+                            CSS_CPRM.TitleKey? titleKey = CSS.DecodeTitleKey(tmpBuf, dvdDecrypt.BusKey);
+
+                            if(titleKey.HasValue)
+                                outputFormat.WriteSectorTag(new[]
+                                {
+                                    titleKey.Value.CMI
+                                }, i + j, SectorTagType.DvdCmi);
+                            else
+                                continue;
+
+                            // If the CMI bit is 1, the sector is using copy protection, else it is not
+                            if((titleKey.Value.CMI & 0x80) >> 7 == 0)
+                            {
+                                // The CMI indicates this sector is not encrypted.
+                                outputFormat.WriteSectorTag(new byte[]
+                                {
+                                    0, 0, 0, 0, 0
+                                }, i + j, SectorTagType.DvdTitleKey);
+
+                                outputFormat.WriteSectorTag(new byte[]
+                                {
+                                    0, 0, 0, 0, 0
+                                }, i + j, SectorTagType.DvdTitleKeyDecrypted);
+
+                                _resume.MissingTitleKeys.Remove(i + j);
+
+                                continue;
+                            }
+
+                            // According to libdvdcss, if the key is all zeroes, the sector is actually
+                            // not encrypted even if the CMI says it is.
+                            if(titleKey.Value.Key.All(k => k == 0))
+                            {
+                                outputFormat.WriteSectorTag(new byte[]
+                                {
+                                    0, 0, 0, 0, 0
+                                }, i + j, SectorTagType.DvdTitleKey);
+
+                                outputFormat.WriteSectorTag(new byte[]
+                                {
+                                    0, 0, 0, 0, 0
+                                }, i + j, SectorTagType.DvdTitleKeyDecrypted);
+
+                                _resume.MissingTitleKeys.Remove(i + j);
+
+                                continue;
+                            }
+
+                            outputFormat.WriteSectorTag(titleKey.Value.Key, i + j, SectorTagType.DvdTitleKey);
+                            _resume.MissingTitleKeys.Remove(i                 + j);
+
+                            CSS.DecryptTitleKey(0, discKey, titleKey.Value.Key, out tmpBuf);
+                            outputFormat.WriteSectorTag(tmpBuf, i + j, SectorTagType.DvdTitleKeyDecrypted);
+                        }
+                    }
+
+                    if(!_storeEncrypted)
+
+                        // Todo: Flag in the outputFormat that a sector has been decrypted
+                    {
+                        ErrorNumber errno =
+                            outputFormat.ReadSectorsTag(i, blocksToRead, SectorTagType.DvdCmi, out byte[] cmi);
+
+                        if(errno != ErrorNumber.NoError)
+                            ErrorMessage?.Invoke($"Error retrieving CMI for sector {i}");
+                        else
+                        {
+                            errno = outputFormat.ReadSectorsTag(i, blocksToRead,
+                                                                SectorTagType.DvdTitleKeyDecrypted,
+                                                                out byte[] titleKey);
+
+                            if(errno != ErrorNumber.NoError)
+                                ErrorMessage?.Invoke($"Error retrieving title key for sector {i}");
+                            else
+                                buffer = CSS.DecryptSector(buffer, cmi, titleKey, blocksToRead, blockSize);
+                        }
+                    }
+                }
+
+                mhddLog.Write(i, cmdDuration);
+                ibgLog.Write(i, currentSpeed * 1024);
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(buffer, i, blocksToRead);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                extents.Add(i, blocksToRead, true);
+            }
+            else
+            {
+                if(_dev.Manufacturer.ToLowerInvariant() == "insite")
+                {
+                    _resume.BadBlocks.Add(i);
+                    _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+                    _resume.NextBlock++;
+                    _aborted = true;
+
+                    _dumpLog?.
+                        WriteLine("INSITE floptical drives get crazy on the SCSI bus when an error is found, stopping so you can reboot the computer or reset the scsi bus appropriately.");
+
+                    UpdateStatus?.
+                        Invoke("INSITE floptical drives get crazy on the SCSI bus when an error is found, stopping so you can reboot the computer or reset the scsi bus appropriately");
+
+                    continue;
+                }
+
+                // TODO: Reset device after X errors
+                if(_stopOnError)
+                    return; // TODO: Return more cleanly
+
+                if(i + _skip > blocks)
+                    _skip = (uint)(blocks - i);
+
+                // Write empty data
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+
+                for(ulong b = i; b < i + _skip; b++)
+                    _resume.BadBlocks.Add(b);
+
+                mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+
+                ibgLog.Write(i, 0);
+                _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
+                i       += _skip - blocksToRead;
+                newTrim =  true;
+            }
+
+            sectorSpeedStart  += blocksToRead;
+            _resume.NextBlock =  i + blocksToRead;
+
+            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+            if(elapsed <= 0)
+                continue;
+
+            currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+            sectorSpeedStart = 0;
+            timeSpeedStart   = DateTime.UtcNow;
         }
+
+        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+
+        EndProgress?.Invoke();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/Sbc/Dump.cs b/Aaru.Core/Devices/Dumping/Sbc/Dump.cs
index 0bb5c4b06..558a82720 100644
--- a/Aaru.Core/Devices/Dumping/Sbc/Dump.cs
+++ b/Aaru.Core/Devices/Dumping/Sbc/Dump.cs
@@ -59,441 +59,495 @@ using Version = Aaru.CommonTypes.Interop.Version;
 
 // ReSharper disable JoinDeclarationAndInitializer
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+/// <summary>Implements dumping SCSI Block Commands and Reduced Block Commands devices</summary>
+partial class Dump
 {
-    /// <summary>Implements dumping SCSI Block Commands and Reduced Block Commands devices</summary>
-    partial class Dump
+    /// <summary>Dumps a SCSI Block Commands device or a Reduced Block Commands devices</summary>
+    /// <param name="opticalDisc">If device contains an optical disc (e.g. DVD or BD)</param>
+    /// <param name="mediaTags">Media tags as retrieved in MMC layer</param>
+    /// <param name="dskType">Disc type as detected in SCSI or MMC layer</param>
+    /// <param name="dvdDecrypt">DVD CSS decryption module</param>
+    void Sbc(Dictionary<MediaTagType, byte[]> mediaTags, MediaType dskType, bool opticalDisc,
+             DVDDecryption dvdDecrypt = null)
     {
-        /// <summary>Dumps a SCSI Block Commands device or a Reduced Block Commands devices</summary>
-        /// <param name="opticalDisc">If device contains an optical disc (e.g. DVD or BD)</param>
-        /// <param name="mediaTags">Media tags as retrieved in MMC layer</param>
-        /// <param name="dskType">Disc type as detected in SCSI or MMC layer</param>
-        /// <param name="dvdDecrypt">DVD CSS decryption module</param>
-        void Sbc(Dictionary<MediaTagType, byte[]> mediaTags, MediaType dskType, bool opticalDisc,
-                 DVDDecryption dvdDecrypt = null)
-        {
-            bool               sense;
-            byte               scsiMediumType     = 0;
-            byte               scsiDensityCode    = 0;
-            bool               containsFloppyPage = false;
-            const ushort       sbcProfile         = 0x0001;
-            DateTime           start;
-            DateTime           end;
-            double             totalDuration = 0;
-            double             currentSpeed  = 0;
-            double             maxSpeed      = double.MinValue;
-            double             minSpeed      = double.MaxValue;
-            byte[]             readBuffer;
-            Modes.DecodedMode? decMode = null;
-            bool               ret;
-            ExtentsULong       blankExtents = null;
-            var                outputFormat = _outputPlugin as IWritableImage;
-
-            if(opticalDisc)
-                switch(dskType)
-                {
-                    case MediaType.REV35:
-                    case MediaType.REV70:
-                    case MediaType.REV120:
-                        opticalDisc = false;
-
-                        break;
-                }
-
-            _dumpLog.WriteLine("Initializing reader.");
-            var   scsiReader = new Reader(_dev, _dev.Timeout, null, _errorLog, _dumpRaw);
-            ulong blocks     = scsiReader.GetDeviceBlocks();
-            uint  blockSize  = scsiReader.LogicalBlockSize;
-
-            if(!opticalDisc)
-            {
-                mediaTags = new Dictionary<MediaTagType, byte[]>();
-
-                if(_dev.IsUsb &&
-                   _dev.UsbDescriptors != null)
-                    mediaTags.Add(MediaTagType.USB_Descriptors, null);
-
-                if(_dev.Type == DeviceType.ATAPI)
-                    mediaTags.Add(MediaTagType.ATAPI_IDENTIFY, null);
-
-                if(_dev.IsPcmcia &&
-                   _dev.Cis != null)
-                    mediaTags.Add(MediaTagType.PCMCIA_CIS, null);
-
-                sense = _dev.ScsiInquiry(out byte[] cmdBuf, out _);
-
-                if(_private)
-                    cmdBuf = DeviceReport.ClearInquiry(cmdBuf);
-
-                mediaTags.Add(MediaTagType.SCSI_INQUIRY, cmdBuf);
-
-                if(!sense)
-                {
-                    _dumpLog.WriteLine("Requesting MODE SENSE (10).");
-                    UpdateStatus?.Invoke("Requesting MODE SENSE (10).");
-
-                    sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current, 0x3F,
-                                             0xFF, 5, out _);
-
-                    if(!sense ||
-                       _dev.Error)
-                        sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current, 0x3F,
-                                                 0x00, 5, out _);
-
-                    if(!sense &&
-                       !_dev.Error)
-                        if(Modes.DecodeMode10(cmdBuf, _dev.ScsiType).HasValue)
-                        {
-                            mediaTags.Add(MediaTagType.SCSI_MODESENSE_10, cmdBuf);
-                            decMode = Modes.DecodeMode10(cmdBuf, _dev.ScsiType);
-                        }
-
-                    _dumpLog.WriteLine("Requesting MODE SENSE (6).");
-                    UpdateStatus?.Invoke("Requesting MODE SENSE (6).");
-
-                    sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x3F, 0x00, 5,
-                                            out _);
-
-                    if(sense || _dev.Error)
-                        sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x3F, 0x00,
-                                                5, out _);
-
-                    if(sense || _dev.Error)
-                        sense = _dev.ModeSense(out cmdBuf, out _, 5, out _);
-
-                    if(!sense &&
-                       !_dev.Error)
-                        if(Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
-                        {
-                            mediaTags.Add(MediaTagType.SCSI_MODESENSE_6, cmdBuf);
-                            decMode = Modes.DecodeMode6(cmdBuf, _dev.ScsiType);
-                        }
-
-                    if(decMode.HasValue)
-                    {
-                        scsiMediumType = (byte)decMode.Value.Header.MediumType;
-
-                        if(decMode.Value.Header.BlockDescriptors?.Length > 0)
-                            scsiDensityCode = (byte)decMode.Value.Header.BlockDescriptors[0].Density;
-
-                        // TODO: Fix this
-                        containsFloppyPage = decMode.Value.Pages?.Aggregate(containsFloppyPage,
-                                                                            (current, modePage) =>
-                                                                                current | (modePage.Page == 0x05)) ==
-                                             true;
-                    }
-                }
-            }
-
-            if(dskType == MediaType.Unknown)
-                dskType = MediaTypeFromDevice.GetFromScsi((byte)_dev.ScsiType, _dev.Manufacturer, _dev.Model,
-                                                          scsiMediumType, scsiDensityCode, blocks + 1, blockSize,
-                                                          _dev.IsUsb, opticalDisc);
-
-            if(_dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
-                MMC.DetectDiscType(ref dskType, 1, null, _dev, out _, out _, 0, blocks + 1);
+        bool               sense;
+        byte               scsiMediumType     = 0;
+        byte               scsiDensityCode    = 0;
+        bool               containsFloppyPage = false;
+        const ushort       sbcProfile         = 0x0001;
+        DateTime           start;
+        DateTime           end;
+        double             totalDuration = 0;
+        double             currentSpeed  = 0;
+        double             maxSpeed      = double.MinValue;
+        double             minSpeed      = double.MaxValue;
+        byte[]             readBuffer;
+        Modes.DecodedMode? decMode = null;
+        bool               ret;
+        ExtentsULong       blankExtents = null;
+        var                outputFormat = _outputPlugin as IWritableImage;
 
+        if(opticalDisc)
             switch(dskType)
             {
-                // Hi-MD devices show the disks while in Hi-MD mode, but they cannot be read using any known command
-                // SonicStage changes the device mode, so it is no longer a mass storage device, and can only read
-                // tracks written by that same application ID (changes between computers).
-                case MediaType.MD:
-                    _dumpLog.WriteLine("MiniDisc albums, NetMD discs or user-written audio MiniDisc cannot be dumped.");
-
-                    StoppingErrorMessage?.
-                        Invoke("MiniDisc albums, NetMD discs or user-written audio MiniDisc cannot be dumped.");
-
-                    return;
-                case MediaType.Unknown when _dev.IsUsb && containsFloppyPage:
-                    dskType = MediaType.FlashDrive;
+                case MediaType.REV35:
+                case MediaType.REV70:
+                case MediaType.REV120:
+                    opticalDisc = false;
 
                     break;
             }
 
-            if(scsiReader.FindReadCommand())
+        _dumpLog.WriteLine("Initializing reader.");
+        var   scsiReader = new Reader(_dev, _dev.Timeout, null, _errorLog, _dumpRaw);
+        ulong blocks     = scsiReader.GetDeviceBlocks();
+        uint  blockSize  = scsiReader.LogicalBlockSize;
+
+        if(!opticalDisc)
+        {
+            mediaTags = new Dictionary<MediaTagType, byte[]>();
+
+            if(_dev.IsUsb &&
+               _dev.UsbDescriptors != null)
+                mediaTags.Add(MediaTagType.USB_Descriptors, null);
+
+            if(_dev.Type == DeviceType.ATAPI)
+                mediaTags.Add(MediaTagType.ATAPI_IDENTIFY, null);
+
+            if(_dev.IsPcmcia &&
+               _dev.Cis != null)
+                mediaTags.Add(MediaTagType.PCMCIA_CIS, null);
+
+            sense = _dev.ScsiInquiry(out byte[] cmdBuf, out _);
+
+            if(_private)
+                cmdBuf = DeviceReport.ClearInquiry(cmdBuf);
+
+            mediaTags.Add(MediaTagType.SCSI_INQUIRY, cmdBuf);
+
+            if(!sense)
             {
-                _dumpLog.WriteLine("ERROR: Cannot find correct read command: {0}.", scsiReader.ErrorMessage);
-                StoppingErrorMessage?.Invoke("Unable to read medium.");
+                _dumpLog.WriteLine("Requesting MODE SENSE (10).");
+                UpdateStatus?.Invoke("Requesting MODE SENSE (10).");
 
-                return;
-            }
+                sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current, 0x3F,
+                                         0xFF, 5, out _);
 
-            if(blocks    != 0 &&
-               blockSize != 0)
-            {
-                blocks++;
+                if(!sense ||
+                   _dev.Error)
+                    sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current, 0x3F,
+                                             0x00, 5, out _);
 
-                ulong totalSize = blocks * blockSize;
-
-                if(totalSize > 1099511627776)
-                    UpdateStatus?.
-                        Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)");
-                else if(totalSize > 1073741824)
-                    UpdateStatus?.
-                        Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)");
-                else if(totalSize > 1048576)
-                    UpdateStatus?.
-                        Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)");
-                else if(totalSize > 1024)
-                    UpdateStatus?.
-                        Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)");
-                else
-                    UpdateStatus?.
-                        Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize} bytes)");
-            }
-
-            // Check how many blocks to read, if error show and return
-            if(scsiReader.GetBlocksToRead(_maximumReadable))
-            {
-                _dumpLog.WriteLine("ERROR: Cannot get blocks to read: {0}.", scsiReader.ErrorMessage);
-                StoppingErrorMessage?.Invoke(scsiReader.ErrorMessage);
-
-                return;
-            }
-
-            uint blocksToRead      = scsiReader.BlocksToRead;
-            uint logicalBlockSize  = blockSize;
-            uint physicalBlockSize = scsiReader.PhysicalBlockSize;
-
-            if(blocks == 0)
-            {
-                _dumpLog.WriteLine("ERROR: Unable to read medium or empty medium present...");
-                StoppingErrorMessage?.Invoke("Unable to read medium or empty medium present...");
-
-                return;
-            }
-
-            UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
-            UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
-            UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
-            UpdateStatus?.Invoke($"Device reports {scsiReader.LongBlockSize} bytes per physical block.");
-            UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
-            UpdateStatus?.Invoke($"SCSI medium type: {scsiMediumType}.");
-            UpdateStatus?.Invoke($"SCSI density type: {scsiDensityCode}.");
-            UpdateStatus?.Invoke($"SCSI floppy mode page present: {containsFloppyPage}.");
-            UpdateStatus?.Invoke($"Media identified as {dskType}");
-
-            _dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);
-            _dumpLog.WriteLine("Device can read {0} blocks at a time.", blocksToRead);
-            _dumpLog.WriteLine("Device reports {0} bytes per logical block.", blockSize);
-            _dumpLog.WriteLine("Device reports {0} bytes per physical block.", scsiReader.LongBlockSize);
-            _dumpLog.WriteLine("SCSI device type: {0}.", _dev.ScsiType);
-            _dumpLog.WriteLine("SCSI medium type: {0}.", scsiMediumType);
-            _dumpLog.WriteLine("SCSI density type: {0}.", scsiDensityCode);
-            _dumpLog.WriteLine("SCSI floppy mode page present: {0}.", containsFloppyPage);
-            _dumpLog.WriteLine("Media identified as {0}.", dskType);
-
-            uint longBlockSize = scsiReader.LongBlockSize;
-
-            if(_dumpRaw)
-                if(blockSize == longBlockSize)
-                {
-                    ErrorMessage?.Invoke(!scsiReader.CanReadRaw
-                                             ? "Device doesn't seem capable of reading raw data from media."
-                                             : "Device is capable of reading raw data but I've been unable to guess correct sector size.");
-
-                    if(!_force)
+                if(!sense &&
+                   !_dev.Error)
+                    if(Modes.DecodeMode10(cmdBuf, _dev.ScsiType).HasValue)
                     {
-                        StoppingErrorMessage?.
-                            Invoke("Not continuing. If you want to continue reading cooked data when raw is not available use the force option.");
-
-                        // TODO: Exit more gracefully
-                        return;
+                        mediaTags.Add(MediaTagType.SCSI_MODESENSE_10, cmdBuf);
+                        decMode = Modes.DecodeMode10(cmdBuf, _dev.ScsiType);
                     }
 
-                    ErrorMessage?.Invoke("Continuing dumping cooked data.");
-                }
-                else
+                _dumpLog.WriteLine("Requesting MODE SENSE (6).");
+                UpdateStatus?.Invoke("Requesting MODE SENSE (6).");
+
+                sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x3F, 0x00, 5,
+                                        out _);
+
+                if(sense || _dev.Error)
+                    sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x3F, 0x00,
+                                            5, out _);
+
+                if(sense || _dev.Error)
+                    sense = _dev.ModeSense(out cmdBuf, out _, 5, out _);
+
+                if(!sense &&
+                   !_dev.Error)
+                    if(Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
+                    {
+                        mediaTags.Add(MediaTagType.SCSI_MODESENSE_6, cmdBuf);
+                        decMode = Modes.DecodeMode6(cmdBuf, _dev.ScsiType);
+                    }
+
+                if(decMode.HasValue)
                 {
-                    // Only a block will be read, but it contains 16 sectors and command expect sector number not block number
-                    blocksToRead = (uint)(longBlockSize == 37856 ? 16 : 1);
+                    scsiMediumType = (byte)decMode.Value.Header.MediumType;
 
-                    UpdateStatus?.
-                        Invoke($"Reading {longBlockSize} raw bytes ({blockSize * blocksToRead} cooked bytes) per sector.");
+                    if(decMode.Value.Header.BlockDescriptors?.Length > 0)
+                        scsiDensityCode = (byte)decMode.Value.Header.BlockDescriptors[0].Density;
 
-                    physicalBlockSize = longBlockSize;
-                    blockSize         = longBlockSize;
+                    // TODO: Fix this
+                    containsFloppyPage = decMode.Value.Pages?.Aggregate(containsFloppyPage,
+                                                                        (current, modePage) =>
+                                                                            current | (modePage.Page == 0x05)) ==
+                                         true;
+                }
+            }
+        }
+
+        if(dskType == MediaType.Unknown)
+            dskType = MediaTypeFromDevice.GetFromScsi((byte)_dev.ScsiType, _dev.Manufacturer, _dev.Model,
+                                                      scsiMediumType, scsiDensityCode, blocks + 1, blockSize,
+                                                      _dev.IsUsb, opticalDisc);
+
+        if(_dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
+            MMC.DetectDiscType(ref dskType, 1, null, _dev, out _, out _, 0, blocks + 1);
+
+        switch(dskType)
+        {
+            // Hi-MD devices show the disks while in Hi-MD mode, but they cannot be read using any known command
+            // SonicStage changes the device mode, so it is no longer a mass storage device, and can only read
+            // tracks written by that same application ID (changes between computers).
+            case MediaType.MD:
+                _dumpLog.WriteLine("MiniDisc albums, NetMD discs or user-written audio MiniDisc cannot be dumped.");
+
+                StoppingErrorMessage?.
+                    Invoke("MiniDisc albums, NetMD discs or user-written audio MiniDisc cannot be dumped.");
+
+                return;
+            case MediaType.Unknown when _dev.IsUsb && containsFloppyPage:
+                dskType = MediaType.FlashDrive;
+
+                break;
+        }
+
+        if(scsiReader.FindReadCommand())
+        {
+            _dumpLog.WriteLine("ERROR: Cannot find correct read command: {0}.", scsiReader.ErrorMessage);
+            StoppingErrorMessage?.Invoke("Unable to read medium.");
+
+            return;
+        }
+
+        if(blocks    != 0 &&
+           blockSize != 0)
+        {
+            blocks++;
+
+            ulong totalSize = blocks * blockSize;
+
+            if(totalSize > 1099511627776)
+                UpdateStatus?.
+                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)");
+            else if(totalSize > 1073741824)
+                UpdateStatus?.
+                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)");
+            else if(totalSize > 1048576)
+                UpdateStatus?.
+                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)");
+            else if(totalSize > 1024)
+                UpdateStatus?.
+                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)");
+            else
+                UpdateStatus?.
+                    Invoke($"Media has {blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize} bytes)");
+        }
+
+        // Check how many blocks to read, if error show and return
+        if(scsiReader.GetBlocksToRead(_maximumReadable))
+        {
+            _dumpLog.WriteLine("ERROR: Cannot get blocks to read: {0}.", scsiReader.ErrorMessage);
+            StoppingErrorMessage?.Invoke(scsiReader.ErrorMessage);
+
+            return;
+        }
+
+        uint blocksToRead      = scsiReader.BlocksToRead;
+        uint logicalBlockSize  = blockSize;
+        uint physicalBlockSize = scsiReader.PhysicalBlockSize;
+
+        if(blocks == 0)
+        {
+            _dumpLog.WriteLine("ERROR: Unable to read medium or empty medium present...");
+            StoppingErrorMessage?.Invoke("Unable to read medium or empty medium present...");
+
+            return;
+        }
+
+        UpdateStatus?.Invoke($"Device reports {blocks} blocks ({blocks * blockSize} bytes).");
+        UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
+        UpdateStatus?.Invoke($"Device reports {blockSize} bytes per logical block.");
+        UpdateStatus?.Invoke($"Device reports {scsiReader.LongBlockSize} bytes per physical block.");
+        UpdateStatus?.Invoke($"SCSI device type: {_dev.ScsiType}.");
+        UpdateStatus?.Invoke($"SCSI medium type: {scsiMediumType}.");
+        UpdateStatus?.Invoke($"SCSI density type: {scsiDensityCode}.");
+        UpdateStatus?.Invoke($"SCSI floppy mode page present: {containsFloppyPage}.");
+        UpdateStatus?.Invoke($"Media identified as {dskType}");
+
+        _dumpLog.WriteLine("Device reports {0} blocks ({1} bytes).", blocks, blocks * blockSize);
+        _dumpLog.WriteLine("Device can read {0} blocks at a time.", blocksToRead);
+        _dumpLog.WriteLine("Device reports {0} bytes per logical block.", blockSize);
+        _dumpLog.WriteLine("Device reports {0} bytes per physical block.", scsiReader.LongBlockSize);
+        _dumpLog.WriteLine("SCSI device type: {0}.", _dev.ScsiType);
+        _dumpLog.WriteLine("SCSI medium type: {0}.", scsiMediumType);
+        _dumpLog.WriteLine("SCSI density type: {0}.", scsiDensityCode);
+        _dumpLog.WriteLine("SCSI floppy mode page present: {0}.", containsFloppyPage);
+        _dumpLog.WriteLine("Media identified as {0}.", dskType);
+
+        uint longBlockSize = scsiReader.LongBlockSize;
+
+        if(_dumpRaw)
+            if(blockSize == longBlockSize)
+            {
+                ErrorMessage?.Invoke(!scsiReader.CanReadRaw
+                                         ? "Device doesn't seem capable of reading raw data from media."
+                                         : "Device is capable of reading raw data but I've been unable to guess correct sector size.");
+
+                if(!_force)
+                {
+                    StoppingErrorMessage?.
+                        Invoke("Not continuing. If you want to continue reading cooked data when raw is not available use the force option.");
+
+                    // TODO: Exit more gracefully
+                    return;
                 }
 
-            ret = true;
-
-            foreach(MediaTagType tag in mediaTags.Keys.Where(tag => !outputFormat.SupportedMediaTags.Contains(tag)))
+                ErrorMessage?.Invoke("Continuing dumping cooked data.");
+            }
+            else
             {
-                ret = false;
-                _dumpLog.WriteLine($"Output format does not support {tag}.");
-                ErrorMessage?.Invoke($"Output format does not support {tag}.");
+                // Only a block will be read, but it contains 16 sectors and command expect sector number not block number
+                blocksToRead = (uint)(longBlockSize == 37856 ? 16 : 1);
+
+                UpdateStatus?.
+                    Invoke($"Reading {longBlockSize} raw bytes ({blockSize * blocksToRead} cooked bytes) per sector.");
+
+                physicalBlockSize = longBlockSize;
+                blockSize         = longBlockSize;
             }
 
+        ret = true;
+
+        foreach(MediaTagType tag in mediaTags.Keys.Where(tag => !outputFormat.SupportedMediaTags.Contains(tag)))
+        {
+            ret = false;
+            _dumpLog.WriteLine($"Output format does not support {tag}.");
+            ErrorMessage?.Invoke($"Output format does not support {tag}.");
+        }
+
+        if(!ret)
+        {
+            if(_force)
+            {
+                _dumpLog.WriteLine("Several media tags not supported, continuing...");
+                ErrorMessage?.Invoke("Several media tags not supported, continuing...");
+            }
+            else
+            {
+                _dumpLog.WriteLine("Several media tags not supported, not continuing...");
+                StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
+
+                return;
+            }
+        }
+
+        UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
+        _dumpLog.WriteLine("Reading {0} sectors at a time.", blocksToRead);
+
+        var  mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
+        var  ibgLog = new IbgLog(_outputPrefix + ".ibg", sbcProfile);
+        bool imageCreated = false;
+
+        if(!opticalDisc)
+        {
+            ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
+
+            // Cannot create image
             if(!ret)
             {
-                if(_force)
-                {
-                    _dumpLog.WriteLine("Several media tags not supported, continuing...");
-                    ErrorMessage?.Invoke("Several media tags not supported, continuing...");
-                }
-                else
-                {
-                    _dumpLog.WriteLine("Several media tags not supported, not continuing...");
-                    StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
+                _dumpLog.WriteLine("Error creating output image, not continuing.");
+                _dumpLog.WriteLine(outputFormat.ErrorMessage);
 
-                    return;
-                }
+                StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
+                                             outputFormat.ErrorMessage);
+
+                return;
             }
 
-            UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
-            _dumpLog.WriteLine("Reading {0} sectors at a time.", blocksToRead);
+            imageCreated = true;
+        }
 
-            var  mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
-            var  ibgLog = new IbgLog(_outputPrefix + ".ibg", sbcProfile);
-            bool imageCreated = false;
+        start = DateTime.UtcNow;
+        double imageWriteDuration      = 0;
+        bool   writeSingleOpticalTrack = true;
 
-            if(!opticalDisc)
+        if(opticalDisc)
+        {
+            if(outputFormat is IWritableOpticalImage opticalPlugin)
             {
-                ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
+                sense = _dev.ReadDiscInformation(out readBuffer, out _, MmcDiscInformationDataTypes.DiscInformation,
+                                                 _dev.Timeout, out _);
 
-                // Cannot create image
-                if(!ret)
+                if(!sense)
                 {
-                    _dumpLog.WriteLine("Error creating output image, not continuing.");
-                    _dumpLog.WriteLine(outputFormat.ErrorMessage);
+                    DiscInformation.StandardDiscInformation? discInformation =
+                        DiscInformation.Decode000b(readBuffer);
 
-                    StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
-                                                 outputFormat.ErrorMessage);
+                    // This means the output image can store sessions that are not on a CD, like on a DVD or Blu-ray
+                    bool canStoreNotCdSessions =
+                        opticalPlugin.OpticalCapabilities.HasFlag(OpticalImageCapabilities.CanStoreNotCdSessions);
 
-                    return;
-                }
+                    // This means the output image can store tracks that are not on a CD, like on a DVD or Blu-ray
+                    bool canStoreNotCdTracks =
+                        opticalPlugin.OpticalCapabilities.HasFlag(OpticalImageCapabilities.CanStoreNotCdTracks);
 
-                imageCreated = true;
-            }
-
-            start = DateTime.UtcNow;
-            double imageWriteDuration      = 0;
-            bool   writeSingleOpticalTrack = true;
-
-            if(opticalDisc)
-            {
-                if(outputFormat is IWritableOpticalImage opticalPlugin)
-                {
-                    sense = _dev.ReadDiscInformation(out readBuffer, out _, MmcDiscInformationDataTypes.DiscInformation,
-                                                     _dev.Timeout, out _);
-
-                    if(!sense)
+                    if(discInformation.HasValue)
                     {
-                        DiscInformation.StandardDiscInformation? discInformation =
-                            DiscInformation.Decode000b(readBuffer);
+                        writeSingleOpticalTrack = false;
 
-                        // This means the output image can store sessions that are not on a CD, like on a DVD or Blu-ray
-                        bool canStoreNotCdSessions =
-                            opticalPlugin.OpticalCapabilities.HasFlag(OpticalImageCapabilities.CanStoreNotCdSessions);
-
-                        // This means the output image can store tracks that are not on a CD, like on a DVD or Blu-ray
-                        bool canStoreNotCdTracks =
-                            opticalPlugin.OpticalCapabilities.HasFlag(OpticalImageCapabilities.CanStoreNotCdTracks);
-
-                        if(discInformation.HasValue)
+                        if(discInformation?.Sessions > 1 &&
+                           !canStoreNotCdSessions)
                         {
-                            writeSingleOpticalTrack = false;
-
-                            if(discInformation?.Sessions > 1 &&
-                               !canStoreNotCdSessions)
+                            if(_force)
                             {
-                                if(_force)
-                                {
-                                    _dumpLog.
-                                        WriteLine("Image does not support multiple sessions in non Compact Disc dumps, continuing...");
+                                _dumpLog.
+                                    WriteLine("Image does not support multiple sessions in non Compact Disc dumps, continuing...");
 
-                                    ErrorMessage?.
-                                        Invoke("Image does not support multiple sessions in non Compact Disc dumps, continuing...");
-                                }
-                                else
-                                {
-                                    _dumpLog.
-                                        WriteLine("Image does not support multiple sessions in non Compact Disc dumps, not continuing...");
-
-                                    StoppingErrorMessage?.
-                                        Invoke("Image does not support multiple sessions in non Compact Disc dumps, not continuing...");
-
-                                    return;
-                                }
+                                ErrorMessage?.
+                                    Invoke("Image does not support multiple sessions in non Compact Disc dumps, continuing...");
                             }
-
-                            if((discInformation?.LastTrackLastSession - discInformation?.FirstTrackNumber > 0 ||
-                                discInformation?.FirstTrackNumber                                         != 1) &&
-                               !canStoreNotCdTracks)
+                            else
                             {
-                                if(_force)
-                                {
-                                    _dumpLog.
-                                        WriteLine("Image does not support multiple tracks in non Compact Disc dumps, continuing...");
+                                _dumpLog.
+                                    WriteLine("Image does not support multiple sessions in non Compact Disc dumps, not continuing...");
 
-                                    ErrorMessage?.
-                                        Invoke("Image does not support multiple tracks in non Compact Disc dumps, continuing...");
-                                }
-                                else
-                                {
-                                    _dumpLog.
-                                        WriteLine("Image does not support multiple tracks in non Compact Disc dumps, not continuing...");
+                                StoppingErrorMessage?.
+                                    Invoke("Image does not support multiple sessions in non Compact Disc dumps, not continuing...");
 
-                                    StoppingErrorMessage?.
-                                        Invoke("Image does not support multiple tracks in non Compact Disc dumps, not continuing...");
-
-                                    return;
-                                }
+                                return;
                             }
+                        }
 
-                            UpdateStatus?.Invoke("Building track map...");
-                            _dumpLog.WriteLine("Building track map...");
-
-                            List<Track> tracks = new();
-
-                            for(ushort tno = discInformation.Value.FirstTrackNumber;
-                                tno <= discInformation?.LastTrackLastSession; tno++)
+                        if((discInformation?.LastTrackLastSession - discInformation?.FirstTrackNumber > 0 ||
+                            discInformation?.FirstTrackNumber                                         != 1) &&
+                           !canStoreNotCdTracks)
+                        {
+                            if(_force)
                             {
-                                sense = _dev.ReadTrackInformation(out readBuffer, out _, false,
-                                                                  TrackInformationType.LogicalTrackNumber, tno,
-                                                                  _dev.Timeout, out _);
+                                _dumpLog.
+                                    WriteLine("Image does not support multiple tracks in non Compact Disc dumps, continuing...");
 
-                                if(sense)
-                                    continue;
-
-                                var trkInfo = TrackInformation.Decode(readBuffer);
-
-                                if(trkInfo is null)
-                                    continue;
-
-                                // Some drives return this invalid value with recordable discs
-                                if(trkInfo.LogicalTrackNumber == 0)
-                                    continue;
-
-                                // Fixes a firmware bug in some DVD drives
-                                if((int)trkInfo.LogicalTrackStartAddress < 0)
-                                    trkInfo.LogicalTrackStartAddress = 0;
-
-                                // Some drives return this invalid value with recordable discs
-                                if(trkInfo.LogicalTrackSize == 0xFFFFFFFF)
-                                    trkInfo.LogicalTrackSize = (uint)(blocks - trkInfo.LogicalTrackStartAddress);
-
-                                var track = new Track
-                                {
-                                    Sequence          = trkInfo.LogicalTrackNumber,
-                                    Session           = (ushort)(canStoreNotCdSessions ? trkInfo.SessionNumber : 1),
-                                    Type              = TrackType.Data,
-                                    StartSector       = trkInfo.LogicalTrackStartAddress,
-                                    EndSector         = trkInfo.LogicalTrackSize + trkInfo.LogicalTrackStartAddress - 1,
-                                    RawBytesPerSector = (int)blockSize,
-                                    BytesPerSector    = (int)blockSize,
-                                    SubchannelType    = TrackSubchannelType.None
-                                };
-
-                                if(track.EndSector >= blocks)
-                                    blocks = track.EndSector + 1;
-
-                                tracks.Add(track);
+                                ErrorMessage?.
+                                    Invoke("Image does not support multiple tracks in non Compact Disc dumps, continuing...");
                             }
+                            else
+                            {
+                                _dumpLog.
+                                    WriteLine("Image does not support multiple tracks in non Compact Disc dumps, not continuing...");
 
-                            if(tracks.Count == 0)
-                                tracks.Add(new Track
+                                StoppingErrorMessage?.
+                                    Invoke("Image does not support multiple tracks in non Compact Disc dumps, not continuing...");
+
+                                return;
+                            }
+                        }
+
+                        UpdateStatus?.Invoke("Building track map...");
+                        _dumpLog.WriteLine("Building track map...");
+
+                        List<Track> tracks = new();
+
+                        for(ushort tno = discInformation.Value.FirstTrackNumber;
+                            tno <= discInformation?.LastTrackLastSession; tno++)
+                        {
+                            sense = _dev.ReadTrackInformation(out readBuffer, out _, false,
+                                                              TrackInformationType.LogicalTrackNumber, tno,
+                                                              _dev.Timeout, out _);
+
+                            if(sense)
+                                continue;
+
+                            var trkInfo = TrackInformation.Decode(readBuffer);
+
+                            if(trkInfo is null)
+                                continue;
+
+                            // Some drives return this invalid value with recordable discs
+                            if(trkInfo.LogicalTrackNumber == 0)
+                                continue;
+
+                            // Fixes a firmware bug in some DVD drives
+                            if((int)trkInfo.LogicalTrackStartAddress < 0)
+                                trkInfo.LogicalTrackStartAddress = 0;
+
+                            // Some drives return this invalid value with recordable discs
+                            if(trkInfo.LogicalTrackSize == 0xFFFFFFFF)
+                                trkInfo.LogicalTrackSize = (uint)(blocks - trkInfo.LogicalTrackStartAddress);
+
+                            var track = new Track
+                            {
+                                Sequence          = trkInfo.LogicalTrackNumber,
+                                Session           = (ushort)(canStoreNotCdSessions ? trkInfo.SessionNumber : 1),
+                                Type              = TrackType.Data,
+                                StartSector       = trkInfo.LogicalTrackStartAddress,
+                                EndSector         = trkInfo.LogicalTrackSize + trkInfo.LogicalTrackStartAddress - 1,
+                                RawBytesPerSector = (int)blockSize,
+                                BytesPerSector    = (int)blockSize,
+                                SubchannelType    = TrackSubchannelType.None
+                            };
+
+                            if(track.EndSector >= blocks)
+                                blocks = track.EndSector + 1;
+
+                            tracks.Add(track);
+                        }
+
+                        if(tracks.Count == 0)
+                            tracks.Add(new Track
+                            {
+                                BytesPerSector    = (int)blockSize,
+                                EndSector         = blocks - 1,
+                                Sequence          = 1,
+                                RawBytesPerSector = (int)blockSize,
+                                SubchannelType    = TrackSubchannelType.None,
+                                Session           = 1,
+                                Type              = TrackType.Data
+                            });
+                        else
+                            tracks = tracks.OrderBy(t => t.Sequence).ToList();
+
+                        ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
+
+                        // Cannot create image
+                        if(!ret)
+                        {
+                            _dumpLog.WriteLine("Error creating output image, not continuing.");
+                            _dumpLog.WriteLine(outputFormat.ErrorMessage);
+
+                            StoppingErrorMessage?.Invoke("Error creating output image, not continuing." +
+                                                         Environment.NewLine + outputFormat.ErrorMessage);
+
+                            return;
+                        }
+
+                        imageCreated = true;
+
+                    #if DEBUG
+                        foreach(Track trk in tracks)
+                            UpdateStatus?.
+                                Invoke($"Track {trk.Sequence} starts at LBA {trk.StartSector} and ends at LBA {trk.EndSector}");
+                    #endif
+
+                        if(canStoreNotCdTracks)
+                        {
+                            ret = opticalPlugin.SetTracks(tracks);
+
+                            if(!ret)
+                            {
+                                _dumpLog.WriteLine("Error sending tracks to output image, not continuing.");
+                                _dumpLog.WriteLine(opticalPlugin.ErrorMessage);
+
+                                StoppingErrorMessage?.
+                                    Invoke("Error sending tracks to output image, not continuing." +
+                                           Environment.NewLine + opticalPlugin.ErrorMessage);
+
+                                return;
+                            }
+                        }
+                        else
+                            opticalPlugin.SetTracks(new List<Track>
+                            {
+                                new()
                                 {
                                     BytesPerSector    = (int)blockSize,
                                     EndSector         = blocks - 1,
@@ -502,752 +556,697 @@ namespace Aaru.Core.Devices.Dumping
                                     SubchannelType    = TrackSubchannelType.None,
                                     Session           = 1,
                                     Type              = TrackType.Data
-                                });
-                            else
-                                tracks = tracks.OrderBy(t => t.Sequence).ToList();
-
-                            ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
-
-                            // Cannot create image
-                            if(!ret)
-                            {
-                                _dumpLog.WriteLine("Error creating output image, not continuing.");
-                                _dumpLog.WriteLine(outputFormat.ErrorMessage);
-
-                                StoppingErrorMessage?.Invoke("Error creating output image, not continuing." +
-                                                             Environment.NewLine + outputFormat.ErrorMessage);
-
-                                return;
-                            }
-
-                            imageCreated = true;
-
-                        #if DEBUG
-                            foreach(Track trk in tracks)
-                                UpdateStatus?.
-                                    Invoke($"Track {trk.Sequence} starts at LBA {trk.StartSector} and ends at LBA {trk.EndSector}");
-                        #endif
-
-                            if(canStoreNotCdTracks)
-                            {
-                                ret = opticalPlugin.SetTracks(tracks);
-
-                                if(!ret)
-                                {
-                                    _dumpLog.WriteLine("Error sending tracks to output image, not continuing.");
-                                    _dumpLog.WriteLine(opticalPlugin.ErrorMessage);
-
-                                    StoppingErrorMessage?.
-                                        Invoke("Error sending tracks to output image, not continuing." +
-                                               Environment.NewLine + opticalPlugin.ErrorMessage);
-
-                                    return;
                                 }
-                            }
-                            else
-                                opticalPlugin.SetTracks(new List<Track>
-                                {
-                                    new()
-                                    {
-                                        BytesPerSector    = (int)blockSize,
-                                        EndSector         = blocks - 1,
-                                        Sequence          = 1,
-                                        RawBytesPerSector = (int)blockSize,
-                                        SubchannelType    = TrackSubchannelType.None,
-                                        Session           = 1,
-                                        Type              = TrackType.Data
-                                    }
-                                });
-                        }
+                            });
                     }
                 }
-                else
-                {
-                    _dumpLog.WriteLine("The specified plugin does not support storing optical disc images..");
-                    StoppingErrorMessage?.Invoke("The specified plugin does not support storing optical disc images.");
-
-                    return;
-                }
             }
-            else if(decMode?.Pages != null)
+            else
             {
-                bool setGeometry = false;
+                _dumpLog.WriteLine("The specified plugin does not support storing optical disc images..");
+                StoppingErrorMessage?.Invoke("The specified plugin does not support storing optical disc images.");
 
-                foreach(Modes.ModePage page in decMode.Value.Pages)
-                    if(page.Page    == 0x04 &&
-                       page.Subpage == 0x00)
-                    {
-                        Modes.ModePage_04? rigidPage = Modes.DecodeModePage_04(page.PageResponse);
-
-                        if(!rigidPage.HasValue || setGeometry)
-                            continue;
-
-                        _dumpLog.WriteLine("Setting geometry to {0} cylinders, {1} heads, {2} sectors per track",
-                                           rigidPage.Value.Cylinders, rigidPage.Value.Heads,
-                                           (uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads)));
-
-                        UpdateStatus?.
-                            Invoke($"Setting geometry to {rigidPage.Value.Cylinders} cylinders, {rigidPage.Value.Heads} heads, {(uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads))} sectors per track");
-
-                        outputFormat.SetGeometry(rigidPage.Value.Cylinders, rigidPage.Value.Heads,
-                                                  (uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads)));
-
-                        setGeometry = true;
-                    }
-                    else if(page.Page    == 0x05 &&
-                            page.Subpage == 0x00)
-                    {
-                        Modes.ModePage_05? flexiblePage = Modes.DecodeModePage_05(page.PageResponse);
-
-                        if(!flexiblePage.HasValue)
-                            continue;
-
-                        _dumpLog.WriteLine("Setting geometry to {0} cylinders, {1} heads, {2} sectors per track",
-                                           flexiblePage.Value.Cylinders, flexiblePage.Value.Heads,
-                                           flexiblePage.Value.SectorsPerTrack);
-
-                        UpdateStatus?.
-                            Invoke($"Setting geometry to {flexiblePage.Value.Cylinders} cylinders, {flexiblePage.Value.Heads} heads, {flexiblePage.Value.SectorsPerTrack} sectors per track");
-
-                        outputFormat.SetGeometry(flexiblePage.Value.Cylinders, flexiblePage.Value.Heads,
-                                                  flexiblePage.Value.SectorsPerTrack);
-
-                        setGeometry = true;
-                    }
+                return;
             }
+        }
+        else if(decMode?.Pages != null)
+        {
+            bool setGeometry = false;
 
-            if(!imageCreated)
-            {
-                ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
-
-                // Cannot create image
-                if(!ret)
+            foreach(Modes.ModePage page in decMode.Value.Pages)
+                if(page.Page    == 0x04 &&
+                   page.Subpage == 0x00)
                 {
-                    _dumpLog.WriteLine("Error creating output image, not continuing.");
-                    _dumpLog.WriteLine(outputFormat.ErrorMessage);
+                    Modes.ModePage_04? rigidPage = Modes.DecodeModePage_04(page.PageResponse);
 
-                    StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
-                                                 outputFormat.ErrorMessage);
+                    if(!rigidPage.HasValue || setGeometry)
+                        continue;
 
-                    return;
+                    _dumpLog.WriteLine("Setting geometry to {0} cylinders, {1} heads, {2} sectors per track",
+                                       rigidPage.Value.Cylinders, rigidPage.Value.Heads,
+                                       (uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads)));
+
+                    UpdateStatus?.
+                        Invoke($"Setting geometry to {rigidPage.Value.Cylinders} cylinders, {rigidPage.Value.Heads} heads, {(uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads))} sectors per track");
+
+                    outputFormat.SetGeometry(rigidPage.Value.Cylinders, rigidPage.Value.Heads,
+                                             (uint)(blocks / (rigidPage.Value.Cylinders * rigidPage.Value.Heads)));
+
+                    setGeometry = true;
                 }
-
-                if(writeSingleOpticalTrack)
+                else if(page.Page    == 0x05 &&
+                        page.Subpage == 0x00)
                 {
-                    _dumpLog.WriteLine("Creating single track as could not retrieve track list from drive.");
+                    Modes.ModePage_05? flexiblePage = Modes.DecodeModePage_05(page.PageResponse);
 
-                    UpdateStatus?.Invoke("Creating single track as could not retrieve track list from drive.");
+                    if(!flexiblePage.HasValue)
+                        continue;
 
-                    (outputFormat as IWritableOpticalImage)?.SetTracks(new List<Track>
-                    {
-                        new()
-                        {
-                            BytesPerSector    = (int)blockSize,
-                            EndSector         = blocks - 1,
-                            Sequence          = 1,
-                            RawBytesPerSector = (int)blockSize,
-                            SubchannelType    = TrackSubchannelType.None,
-                            Session           = 1,
-                            Type              = TrackType.Data
-                        }
-                    });
+                    _dumpLog.WriteLine("Setting geometry to {0} cylinders, {1} heads, {2} sectors per track",
+                                       flexiblePage.Value.Cylinders, flexiblePage.Value.Heads,
+                                       flexiblePage.Value.SectorsPerTrack);
+
+                    UpdateStatus?.
+                        Invoke($"Setting geometry to {flexiblePage.Value.Cylinders} cylinders, {flexiblePage.Value.Heads} heads, {flexiblePage.Value.SectorsPerTrack} sectors per track");
+
+                    outputFormat.SetGeometry(flexiblePage.Value.Cylinders, flexiblePage.Value.Heads,
+                                             flexiblePage.Value.SectorsPerTrack);
+
+                    setGeometry = true;
                 }
-            }
+        }
 
-            DumpHardwareType currentTry = null;
-            ExtentsULong     extents    = null;
+        if(!imageCreated)
+        {
+            ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
 
-            ResumeSupport.Process(true, _dev.IsRemovable, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial,
-                                  _dev.PlatformId, ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision,
-                                  _private, _force);
-
-            if(currentTry == null ||
-               extents    == null)
+            // Cannot create image
+            if(!ret)
             {
-                StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
+                _dumpLog.WriteLine("Error creating output image, not continuing.");
+                _dumpLog.WriteLine(outputFormat.ErrorMessage);
+
+                StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
+                                             outputFormat.ErrorMessage);
 
                 return;
             }
 
-            if(_resume.NextBlock > 0)
+            if(writeSingleOpticalTrack)
             {
-                UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
-                _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
+                _dumpLog.WriteLine("Creating single track as could not retrieve track list from drive.");
+
+                UpdateStatus?.Invoke("Creating single track as could not retrieve track list from drive.");
+
+                (outputFormat as IWritableOpticalImage)?.SetTracks(new List<Track>
+                {
+                    new()
+                    {
+                        BytesPerSector    = (int)blockSize,
+                        EndSector         = blocks - 1,
+                        Sequence          = 1,
+                        RawBytesPerSector = (int)blockSize,
+                        SubchannelType    = TrackSubchannelType.None,
+                        Session           = 1,
+                        Type              = TrackType.Data
+                    }
+                });
             }
+        }
 
-            // Set speed
-            if(_speedMultiplier >= 0)
-            {
-                _dumpLog.WriteLine($"Setting speed to {(_speed   == 0 ? "MAX." : $"{_speed}x")}.");
-                UpdateStatus?.Invoke($"Setting speed to {(_speed == 0 ? "MAX." : $"{_speed}x")}.");
+        DumpHardwareType currentTry = null;
+        ExtentsULong     extents    = null;
 
-                _speed *= _speedMultiplier;
+        ResumeSupport.Process(true, _dev.IsRemovable, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial,
+                              _dev.PlatformId, ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision,
+                              _private, _force);
 
-                if(_speed == 0 ||
-                   _speed > 0xFFFF)
-                    _speed = 0xFFFF;
+        if(currentTry == null ||
+           extents    == null)
+        {
+            StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
 
-                _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, (ushort)_speed, 0, _dev.Timeout, out _);
-            }
+            return;
+        }
 
-            if(_resume?.BlankExtents != null)
-                blankExtents = ExtentsConverter.FromMetadata(_resume.BlankExtents);
+        if(_resume.NextBlock > 0)
+        {
+            UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
+            _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
+        }
 
-            bool newTrim = false;
+        // Set speed
+        if(_speedMultiplier >= 0)
+        {
+            _dumpLog.WriteLine($"Setting speed to {(_speed   == 0 ? "MAX." : $"{_speed}x")}.");
+            UpdateStatus?.Invoke($"Setting speed to {(_speed == 0 ? "MAX." : $"{_speed}x")}.");
 
-            if(mediaTags.TryGetValue(MediaTagType.DVD_CMI, out byte[] cmi) &&
-               Settings.Settings.Current.EnableDecryption                  &&
-               _titleKeys                                                  &&
-               dskType               == MediaType.DVDROM                   &&
-               (CopyrightType)cmi[0] == CopyrightType.CSS)
-            {
-                UpdateStatus?.Invoke("Title keys dumping is enabled. This will be very slow.");
-                _resume.MissingTitleKeys ??= new List<ulong>(Enumerable.Range(0, (int)blocks).Select(n => (ulong)n));
-            }
+            _speed *= _speedMultiplier;
 
-            if(_dev.ScsiType == PeripheralDeviceTypes.OpticalDevice)
-                ReadOpticalData(blocks, blocksToRead, blockSize, currentTry, extents, ref currentSpeed, ref minSpeed,
-                                ref maxSpeed, ref totalDuration, scsiReader, mhddLog, ibgLog, ref imageWriteDuration,
-                                ref newTrim, ref blankExtents);
-            else
-                ReadSbcData(blocks, blocksToRead, blockSize, currentTry, extents, ref currentSpeed, ref minSpeed,
+            if(_speed == 0 ||
+               _speed > 0xFFFF)
+                _speed = 0xFFFF;
+
+            _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, (ushort)_speed, 0, _dev.Timeout, out _);
+        }
+
+        if(_resume?.BlankExtents != null)
+            blankExtents = ExtentsConverter.FromMetadata(_resume.BlankExtents);
+
+        bool newTrim = false;
+
+        if(mediaTags.TryGetValue(MediaTagType.DVD_CMI, out byte[] cmi) &&
+           Settings.Settings.Current.EnableDecryption                  &&
+           _titleKeys                                                  &&
+           dskType               == MediaType.DVDROM                   &&
+           (CopyrightType)cmi[0] == CopyrightType.CSS)
+        {
+            UpdateStatus?.Invoke("Title keys dumping is enabled. This will be very slow.");
+            _resume.MissingTitleKeys ??= new List<ulong>(Enumerable.Range(0, (int)blocks).Select(n => (ulong)n));
+        }
+
+        if(_dev.ScsiType == PeripheralDeviceTypes.OpticalDevice)
+            ReadOpticalData(blocks, blocksToRead, blockSize, currentTry, extents, ref currentSpeed, ref minSpeed,
                             ref maxSpeed, ref totalDuration, scsiReader, mhddLog, ibgLog, ref imageWriteDuration,
-                            ref newTrim, ref dvdDecrypt,
-                            mediaTags.ContainsKey(MediaTagType.DVD_DiscKey_Decrypted)
-                                ? mediaTags[MediaTagType.DVD_DiscKey_Decrypted] : null);
+                            ref newTrim, ref blankExtents);
+        else
+            ReadSbcData(blocks, blocksToRead, blockSize, currentTry, extents, ref currentSpeed, ref minSpeed,
+                        ref maxSpeed, ref totalDuration, scsiReader, mhddLog, ibgLog, ref imageWriteDuration,
+                        ref newTrim, ref dvdDecrypt,
+                        mediaTags.ContainsKey(MediaTagType.DVD_DiscKey_Decrypted)
+                            ? mediaTags[MediaTagType.DVD_DiscKey_Decrypted] : null);
 
+        end = DateTime.UtcNow;
+        mhddLog.Close();
+
+        ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                     blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+
+        UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+
+        UpdateStatus?.
+            Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
+
+        UpdateStatus?.
+            Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
+
+        _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
+
+        _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
+
+        _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
+
+        #region Trimming
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _trim                       &&
+           newTrim)
+        {
+            start = DateTime.UtcNow;
+            UpdateStatus?.Invoke("Trimming skipped sectors");
+            _dumpLog.WriteLine("Trimming skipped sectors");
+
+            InitProgress?.Invoke();
+
+            TrimSbcData(scsiReader, extents, currentTry, blankExtents);
+
+            EndProgress?.Invoke();
             end = DateTime.UtcNow;
-            mhddLog.Close();
+            UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
+            _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+        }
+        #endregion Trimming
 
-            ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                         blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+        #region Error handling
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _retryPasses > 0)
+            RetrySbcData(scsiReader, currentTry, extents, ref totalDuration, blankExtents);
 
-            UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+        if(_resume.MissingTitleKeys?.Count > 0        &&
+           !_aborted                                  &&
+           _retryPasses > 0                           &&
+           Settings.Settings.Current.EnableDecryption &&
+           _titleKeys                                 &&
+           mediaTags.ContainsKey(MediaTagType.DVD_DiscKey_Decrypted))
+            RetryTitleKeys(dvdDecrypt, mediaTags[MediaTagType.DVD_DiscKey_Decrypted], ref totalDuration);
+        #endregion Error handling
 
-            UpdateStatus?.
-                Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
-
-            UpdateStatus?.
-                Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
-
-            _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
-
-            _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
-
-            _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
-
-            #region Trimming
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _trim                       &&
-               newTrim)
+        if(opticalDisc)
+        {
+            foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags)
             {
-                start = DateTime.UtcNow;
-                UpdateStatus?.Invoke("Trimming skipped sectors");
-                _dumpLog.WriteLine("Trimming skipped sectors");
-
-                InitProgress?.Invoke();
-
-                TrimSbcData(scsiReader, extents, currentTry, blankExtents);
-
-                EndProgress?.Invoke();
-                end = DateTime.UtcNow;
-                UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
-                _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
-            }
-            #endregion Trimming
-
-            #region Error handling
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _retryPasses > 0)
-                RetrySbcData(scsiReader, currentTry, extents, ref totalDuration, blankExtents);
-
-            if(_resume.MissingTitleKeys?.Count > 0        &&
-               !_aborted                                  &&
-               _retryPasses > 0                           &&
-               Settings.Settings.Current.EnableDecryption &&
-               _titleKeys                                 &&
-               mediaTags.ContainsKey(MediaTagType.DVD_DiscKey_Decrypted))
-                RetryTitleKeys(dvdDecrypt, mediaTags[MediaTagType.DVD_DiscKey_Decrypted], ref totalDuration);
-            #endregion Error handling
-
-            if(opticalDisc)
-            {
-                foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags)
+                if(tag.Value is null)
                 {
-                    if(tag.Value is null)
-                    {
-                        AaruConsole.ErrorWriteLine("Error: Tag type {0} is null, skipping...", tag.Key);
+                    AaruConsole.ErrorWriteLine("Error: Tag type {0} is null, skipping...", tag.Key);
 
-                        continue;
-                    }
-
-                    ret = outputFormat.WriteMediaTag(tag.Value, tag.Key);
-
-                    if(ret || _force)
-                        continue;
-
-                    // Cannot write tag to image
-                    StoppingErrorMessage?.Invoke($"Cannot write tag {tag.Key}.");
-
-                    _dumpLog.WriteLine($"Cannot write tag {tag.Key}." + Environment.NewLine +
-                                       outputFormat.ErrorMessage);
-
-                    return;
+                    continue;
                 }
+
+                ret = outputFormat.WriteMediaTag(tag.Value, tag.Key);
+
+                if(ret || _force)
+                    continue;
+
+                // Cannot write tag to image
+                StoppingErrorMessage?.Invoke($"Cannot write tag {tag.Key}.");
+
+                _dumpLog.WriteLine($"Cannot write tag {tag.Key}." + Environment.NewLine +
+                                   outputFormat.ErrorMessage);
+
+                return;
             }
-            else
+        }
+        else
+        {
+            if(!_dev.IsRemovable ||
+               _dev.IsUsb)
             {
-                if(!_dev.IsRemovable ||
-                   _dev.IsUsb)
+                if(_dev.IsUsb &&
+                   _dev.UsbDescriptors != null)
                 {
-                    if(_dev.IsUsb &&
-                       _dev.UsbDescriptors != null)
+                    UpdateStatus?.Invoke("Reading USB descriptors.");
+                    _dumpLog.WriteLine("Reading USB descriptors.");
+                    ret = outputFormat.WriteMediaTag(_dev.UsbDescriptors, MediaTagType.USB_Descriptors);
+
+                    if(!ret &&
+                       !_force)
                     {
-                        UpdateStatus?.Invoke("Reading USB descriptors.");
-                        _dumpLog.WriteLine("Reading USB descriptors.");
-                        ret = outputFormat.WriteMediaTag(_dev.UsbDescriptors, MediaTagType.USB_Descriptors);
+                        _dumpLog.WriteLine("Cannot write USB descriptors.");
 
-                        if(!ret &&
-                           !_force)
-                        {
-                            _dumpLog.WriteLine("Cannot write USB descriptors.");
+                        StoppingErrorMessage?.Invoke("Cannot write USB descriptors." + Environment.NewLine +
+                                                     outputFormat.ErrorMessage);
 
-                            StoppingErrorMessage?.Invoke("Cannot write USB descriptors." + Environment.NewLine +
-                                                         outputFormat.ErrorMessage);
-
-                            return;
-                        }
+                        return;
                     }
+                }
 
-                    byte[] cmdBuf;
+                byte[] cmdBuf;
 
-                    if(_dev.Type == DeviceType.ATAPI)
-                    {
-                        UpdateStatus?.Invoke("Requesting ATAPI IDENTIFY PACKET DEVICE.");
-                        _dumpLog.WriteLine("Requesting ATAPI IDENTIFY PACKET DEVICE.");
-                        sense = _dev.AtapiIdentify(out cmdBuf, out _);
-
-                        if(!sense)
-                        {
-                            if(_private)
-                                cmdBuf = DeviceReport.ClearIdentify(cmdBuf);
-
-                            ret = outputFormat.WriteMediaTag(cmdBuf, MediaTagType.ATAPI_IDENTIFY);
-
-                            if(!ret &&
-                               !_force)
-                            {
-                                _dumpLog.WriteLine("Cannot write ATAPI IDENTIFY PACKET DEVICE.");
-
-                                StoppingErrorMessage?.Invoke("Cannot write ATAPI IDENTIFY PACKET DEVICE." +
-                                                             Environment.NewLine + outputFormat.ErrorMessage);
-
-                                return;
-                            }
-                        }
-                    }
-
-                    sense = _dev.ScsiInquiry(out cmdBuf, out _);
+                if(_dev.Type == DeviceType.ATAPI)
+                {
+                    UpdateStatus?.Invoke("Requesting ATAPI IDENTIFY PACKET DEVICE.");
+                    _dumpLog.WriteLine("Requesting ATAPI IDENTIFY PACKET DEVICE.");
+                    sense = _dev.AtapiIdentify(out cmdBuf, out _);
 
                     if(!sense)
                     {
-                        UpdateStatus?.Invoke("Requesting SCSI INQUIRY.");
-                        _dumpLog.WriteLine("Requesting SCSI INQUIRY.");
-                        ret = outputFormat.WriteMediaTag(cmdBuf, MediaTagType.SCSI_INQUIRY);
+                        if(_private)
+                            cmdBuf = DeviceReport.ClearIdentify(cmdBuf);
+
+                        ret = outputFormat.WriteMediaTag(cmdBuf, MediaTagType.ATAPI_IDENTIFY);
 
                         if(!ret &&
                            !_force)
                         {
-                            StoppingErrorMessage?.Invoke("Cannot write SCSI INQUIRY.");
+                            _dumpLog.WriteLine("Cannot write ATAPI IDENTIFY PACKET DEVICE.");
 
-                            _dumpLog.WriteLine("Cannot write SCSI INQUIRY." + Environment.NewLine +
-                                               outputFormat.ErrorMessage);
+                            StoppingErrorMessage?.Invoke("Cannot write ATAPI IDENTIFY PACKET DEVICE." +
+                                                         Environment.NewLine + outputFormat.ErrorMessage);
 
                             return;
                         }
-
-                        UpdateStatus?.Invoke("Requesting MODE SENSE (10).");
-                        _dumpLog.WriteLine("Requesting MODE SENSE (10).");
-
-                        sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current, 0x3F,
-                                                 0xFF, 5, out _);
-
-                        if(!sense ||
-                           _dev.Error)
-                            sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current,
-                                                     0x3F, 0x00, 5, out _);
-
-                        if(!sense &&
-                           !_dev.Error)
-                            if(Modes.DecodeMode10(cmdBuf, _dev.ScsiType).HasValue)
-                            {
-                                ret = outputFormat.WriteMediaTag(cmdBuf, MediaTagType.SCSI_MODESENSE_10);
-
-                                if(!ret &&
-                                   !_force)
-                                {
-                                    _dumpLog.WriteLine("Cannot write SCSI MODE SENSE (10).");
-
-                                    StoppingErrorMessage?.Invoke("Cannot write SCSI MODE SENSE (10)." +
-                                                                 Environment.NewLine + outputFormat.ErrorMessage);
-
-                                    return;
-                                }
-                            }
-
-                        UpdateStatus?.Invoke("Requesting MODE SENSE (6).");
-                        _dumpLog.WriteLine("Requesting MODE SENSE (6).");
-
-                        sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x3F, 0x00,
-                                                5, out _);
-
-                        if(sense || _dev.Error)
-                            sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x3F,
-                                                    0x00, 5, out _);
-
-                        if(sense || _dev.Error)
-                            sense = _dev.ModeSense(out cmdBuf, out _, 5, out _);
-
-                        if(!sense &&
-                           !_dev.Error)
-                            if(Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
-                            {
-                                ret = outputFormat.WriteMediaTag(cmdBuf, MediaTagType.SCSI_MODESENSE_6);
-
-                                if(!ret &&
-                                   !_force)
-                                {
-                                    _dumpLog.WriteLine("Cannot write SCSI MODE SENSE (6).");
-
-                                    StoppingErrorMessage?.Invoke("Cannot write SCSI MODE SENSE (6)." +
-                                                                 Environment.NewLine + outputFormat.ErrorMessage);
-
-                                    return;
-                                }
-                            }
                     }
                 }
-            }
 
-            _resume.BadBlocks.Sort();
+                sense = _dev.ScsiInquiry(out cmdBuf, out _);
 
-            foreach(ulong bad in _resume.BadBlocks)
-                _dumpLog.WriteLine("Sector {0} could not be read.", bad);
-
-            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-
-            outputFormat.SetDumpHardware(_resume.Tries);
-
-            // TODO: Media Serial Number
-            // TODO: Non-removable drive information
-            var metadata = new CommonTypes.Structs.ImageInfo
-            {
-                Application        = "Aaru",
-                ApplicationVersion = Version.GetVersion()
-            };
-
-            if(!outputFormat.SetMetadata(metadata))
-                ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
-                                     outputFormat.ErrorMessage);
-
-            if(_preSidecar != null)
-                outputFormat.SetCicmMetadata(_preSidecar);
-
-            _dumpLog.WriteLine("Closing output file.");
-            UpdateStatus?.Invoke("Closing output file.");
-            DateTime closeStart = DateTime.Now;
-            outputFormat.Close();
-            DateTime closeEnd = DateTime.Now;
-            UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
-            _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
-
-            if(_aborted)
-            {
-                UpdateStatus?.Invoke("Aborted!");
-                _dumpLog.WriteLine("Aborted!");
-
-                return;
-            }
-
-            double totalChkDuration = 0;
-
-            if(_metadata)
-            {
-                // TODO: Layers
-                if(opticalDisc)
-                    WriteOpticalSidecar(blockSize, blocks, dskType, null, mediaTags, 1, out totalChkDuration, null);
-                else
+                if(!sense)
                 {
-                    UpdateStatus?.Invoke("Creating sidecar.");
-                    _dumpLog.WriteLine("Creating sidecar.");
-                    var         filters     = new FiltersList();
-                    IFilter     filter      = filters.GetFilter(_outputPath);
-                    IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
-                    ErrorNumber opened      = inputPlugin.Open(filter);
+                    UpdateStatus?.Invoke("Requesting SCSI INQUIRY.");
+                    _dumpLog.WriteLine("Requesting SCSI INQUIRY.");
+                    ret = outputFormat.WriteMediaTag(cmdBuf, MediaTagType.SCSI_INQUIRY);
 
-                    if(opened != ErrorNumber.NoError)
+                    if(!ret &&
+                       !_force)
                     {
-                        StoppingErrorMessage?.Invoke(string.Format("Error {0} opening created image.", opened));
+                        StoppingErrorMessage?.Invoke("Cannot write SCSI INQUIRY.");
+
+                        _dumpLog.WriteLine("Cannot write SCSI INQUIRY." + Environment.NewLine +
+                                           outputFormat.ErrorMessage);
 
                         return;
                     }
 
-                    DateTime chkStart = DateTime.UtcNow;
-                    _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
-                    _sidecarClass.InitProgressEvent    += InitProgress;
-                    _sidecarClass.UpdateProgressEvent  += UpdateProgress;
-                    _sidecarClass.EndProgressEvent     += EndProgress;
-                    _sidecarClass.InitProgressEvent2   += InitProgress2;
-                    _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
-                    _sidecarClass.EndProgressEvent2    += EndProgress2;
-                    _sidecarClass.UpdateStatusEvent    += UpdateStatus;
-                    CICMMetadataType sidecar = _sidecarClass.Create();
-                    end = DateTime.UtcNow;
+                    UpdateStatus?.Invoke("Requesting MODE SENSE (10).");
+                    _dumpLog.WriteLine("Requesting MODE SENSE (10).");
 
-                    if(!_aborted)
-                    {
-                        totalChkDuration = (end - chkStart).TotalMilliseconds;
-                        UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds.");
+                    sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current, 0x3F,
+                                             0xFF, 5, out _);
 
-                        UpdateStatus?.
-                            Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
+                    if(!sense ||
+                       _dev.Error)
+                        sense = _dev.ModeSense10(out cmdBuf, out _, false, true, ScsiModeSensePageControl.Current,
+                                                 0x3F, 0x00, 5, out _);
 
-                        _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
-
-                        _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
-                                           blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
-
-                        if(_preSidecar != null)
+                    if(!sense &&
+                       !_dev.Error)
+                        if(Modes.DecodeMode10(cmdBuf, _dev.ScsiType).HasValue)
                         {
-                            _preSidecar.BlockMedia = sidecar.BlockMedia;
-                            sidecar                = _preSidecar;
+                            ret = outputFormat.WriteMediaTag(cmdBuf, MediaTagType.SCSI_MODESENSE_10);
+
+                            if(!ret &&
+                               !_force)
+                            {
+                                _dumpLog.WriteLine("Cannot write SCSI MODE SENSE (10).");
+
+                                StoppingErrorMessage?.Invoke("Cannot write SCSI MODE SENSE (10)." +
+                                                             Environment.NewLine + outputFormat.ErrorMessage);
+
+                                return;
+                            }
                         }
 
-                        // All USB flash drives report as removable, even if the media is not removable
-                        if(!_dev.IsRemovable ||
-                           _dev.IsUsb)
+                    UpdateStatus?.Invoke("Requesting MODE SENSE (6).");
+                    _dumpLog.WriteLine("Requesting MODE SENSE (6).");
+
+                    sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x3F, 0x00,
+                                            5, out _);
+
+                    if(sense || _dev.Error)
+                        sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x3F,
+                                                0x00, 5, out _);
+
+                    if(sense || _dev.Error)
+                        sense = _dev.ModeSense(out cmdBuf, out _, 5, out _);
+
+                    if(!sense &&
+                       !_dev.Error)
+                        if(Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
                         {
-                            if(_dev.IsUsb &&
-                               _dev.UsbDescriptors != null)
-                                if(outputFormat.SupportedMediaTags.Contains(MediaTagType.USB_Descriptors))
-                                    sidecar.BlockMedia[0].USB = new USBType
-                                    {
-                                        ProductID = _dev.UsbProductId,
-                                        VendorID  = _dev.UsbVendorId,
-                                        Descriptors = new DumpType
-                                        {
-                                            Image     = _outputPath,
-                                            Size      = (ulong)_dev.UsbDescriptors.Length,
-                                            Checksums = Checksum.GetChecksums(_dev.UsbDescriptors).ToArray()
-                                        }
-                                    };
+                            ret = outputFormat.WriteMediaTag(cmdBuf, MediaTagType.SCSI_MODESENSE_6);
 
-                            byte[] cmdBuf;
-
-                            if(_dev.Type == DeviceType.ATAPI)
+                            if(!ret &&
+                               !_force)
                             {
-                                sense = _dev.AtapiIdentify(out cmdBuf, out _);
+                                _dumpLog.WriteLine("Cannot write SCSI MODE SENSE (6).");
 
-                                if(!sense)
-                                    if(outputFormat.SupportedMediaTags.Contains(MediaTagType.ATAPI_IDENTIFY))
-                                        sidecar.BlockMedia[0].ATA = new ATAType
-                                        {
-                                            Identify = new DumpType
-                                            {
-                                                Image     = _outputPath,
-                                                Size      = (ulong)cmdBuf.Length,
-                                                Checksums = Checksum.GetChecksums(cmdBuf).ToArray()
-                                            }
-                                        };
+                                StoppingErrorMessage?.Invoke("Cannot write SCSI MODE SENSE (6)." +
+                                                             Environment.NewLine + outputFormat.ErrorMessage);
+
+                                return;
                             }
+                        }
+                }
+            }
+        }
 
-                            sense = _dev.ScsiInquiry(out cmdBuf, out _);
+        _resume.BadBlocks.Sort();
+
+        foreach(ulong bad in _resume.BadBlocks)
+            _dumpLog.WriteLine("Sector {0} could not be read.", bad);
+
+        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+
+        outputFormat.SetDumpHardware(_resume.Tries);
+
+        // TODO: Media Serial Number
+        // TODO: Non-removable drive information
+        var metadata = new CommonTypes.Structs.ImageInfo
+        {
+            Application        = "Aaru",
+            ApplicationVersion = Version.GetVersion()
+        };
+
+        if(!outputFormat.SetMetadata(metadata))
+            ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
+                                 outputFormat.ErrorMessage);
+
+        if(_preSidecar != null)
+            outputFormat.SetCicmMetadata(_preSidecar);
+
+        _dumpLog.WriteLine("Closing output file.");
+        UpdateStatus?.Invoke("Closing output file.");
+        DateTime closeStart = DateTime.Now;
+        outputFormat.Close();
+        DateTime closeEnd = DateTime.Now;
+        UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
+        _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
+
+        if(_aborted)
+        {
+            UpdateStatus?.Invoke("Aborted!");
+            _dumpLog.WriteLine("Aborted!");
+
+            return;
+        }
+
+        double totalChkDuration = 0;
+
+        if(_metadata)
+        {
+            // TODO: Layers
+            if(opticalDisc)
+                WriteOpticalSidecar(blockSize, blocks, dskType, null, mediaTags, 1, out totalChkDuration, null);
+            else
+            {
+                UpdateStatus?.Invoke("Creating sidecar.");
+                _dumpLog.WriteLine("Creating sidecar.");
+                var         filters     = new FiltersList();
+                IFilter     filter      = filters.GetFilter(_outputPath);
+                IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
+                ErrorNumber opened      = inputPlugin.Open(filter);
+
+                if(opened != ErrorNumber.NoError)
+                {
+                    StoppingErrorMessage?.Invoke(string.Format("Error {0} opening created image.", opened));
+
+                    return;
+                }
+
+                DateTime chkStart = DateTime.UtcNow;
+                _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
+                _sidecarClass.InitProgressEvent    += InitProgress;
+                _sidecarClass.UpdateProgressEvent  += UpdateProgress;
+                _sidecarClass.EndProgressEvent     += EndProgress;
+                _sidecarClass.InitProgressEvent2   += InitProgress2;
+                _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
+                _sidecarClass.EndProgressEvent2    += EndProgress2;
+                _sidecarClass.UpdateStatusEvent    += UpdateStatus;
+                CICMMetadataType sidecar = _sidecarClass.Create();
+                end = DateTime.UtcNow;
+
+                if(!_aborted)
+                {
+                    totalChkDuration = (end - chkStart).TotalMilliseconds;
+                    UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds.");
+
+                    UpdateStatus?.
+                        Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
+
+                    _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
+
+                    _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
+                                       blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
+
+                    if(_preSidecar != null)
+                    {
+                        _preSidecar.BlockMedia = sidecar.BlockMedia;
+                        sidecar                = _preSidecar;
+                    }
+
+                    // All USB flash drives report as removable, even if the media is not removable
+                    if(!_dev.IsRemovable ||
+                       _dev.IsUsb)
+                    {
+                        if(_dev.IsUsb &&
+                           _dev.UsbDescriptors != null)
+                            if(outputFormat.SupportedMediaTags.Contains(MediaTagType.USB_Descriptors))
+                                sidecar.BlockMedia[0].USB = new USBType
+                                {
+                                    ProductID = _dev.UsbProductId,
+                                    VendorID  = _dev.UsbVendorId,
+                                    Descriptors = new DumpType
+                                    {
+                                        Image     = _outputPath,
+                                        Size      = (ulong)_dev.UsbDescriptors.Length,
+                                        Checksums = Checksum.GetChecksums(_dev.UsbDescriptors).ToArray()
+                                    }
+                                };
+
+                        byte[] cmdBuf;
+
+                        if(_dev.Type == DeviceType.ATAPI)
+                        {
+                            sense = _dev.AtapiIdentify(out cmdBuf, out _);
 
                             if(!sense)
-                            {
-                                if(outputFormat.SupportedMediaTags.Contains(MediaTagType.SCSI_INQUIRY))
-                                    sidecar.BlockMedia[0].SCSI = new SCSIType
+                                if(outputFormat.SupportedMediaTags.Contains(MediaTagType.ATAPI_IDENTIFY))
+                                    sidecar.BlockMedia[0].ATA = new ATAType
                                     {
-                                        Inquiry = new DumpType
+                                        Identify = new DumpType
                                         {
                                             Image     = _outputPath,
                                             Size      = (ulong)cmdBuf.Length,
                                             Checksums = Checksum.GetChecksums(cmdBuf).ToArray()
                                         }
                                     };
+                        }
 
-                                // TODO: SCSI Extended Vendor Page descriptors
-                                /*
-                                UpdateStatus?.Invoke("Reading SCSI Extended Vendor Page Descriptors.");
-                                dumpLog.WriteLine("Reading SCSI Extended Vendor Page Descriptors.");
-                                sense = dev.ScsiInquiry(out cmdBuf, out _, 0x00);
-                                if(!sense)
+                        sense = _dev.ScsiInquiry(out cmdBuf, out _);
+
+                        if(!sense)
+                        {
+                            if(outputFormat.SupportedMediaTags.Contains(MediaTagType.SCSI_INQUIRY))
+                                sidecar.BlockMedia[0].SCSI = new SCSIType
                                 {
-                                    byte[] pages = EVPD.DecodePage00(cmdBuf);
-
-                                    if(pages != null)
+                                    Inquiry = new DumpType
                                     {
-                                        List<EVPDType> evpds = new List<EVPDType>();
-                                        foreach(byte page in pages)
-                                        {
-                                            dumpLog.WriteLine("Requesting page {0:X2}h.", page);
-                                            sense = dev.ScsiInquiry(out cmdBuf, out _, page);
-                                            if(sense) continue;
-
-                                            EVPDType evpd = new EVPDType
-                                            {
-                                                Image = $"{outputPrefix}.evpd_{page:X2}h.bin",
-                                                Checksums = Checksum.GetChecksums(cmdBuf).ToArray(),
-                                                Size = cmdBuf.Length
-                                            };
-                                            evpd.Checksums = Checksum.GetChecksums(cmdBuf).ToArray();
-                                            DataFile.WriteTo("SCSI Dump", evpd.Image, cmdBuf);
-                                            evpds.Add(evpd);
-                                        }
-
-                                        if(evpds.Count > 0) sidecar.BlockMedia[0].SCSI.EVPD = evpds.ToArray();
+                                        Image     = _outputPath,
+                                        Size      = (ulong)cmdBuf.Length,
+                                        Checksums = Checksum.GetChecksums(cmdBuf).ToArray()
                                     }
+                                };
+
+                            // TODO: SCSI Extended Vendor Page descriptors
+                            /*
+                            UpdateStatus?.Invoke("Reading SCSI Extended Vendor Page Descriptors.");
+                            dumpLog.WriteLine("Reading SCSI Extended Vendor Page Descriptors.");
+                            sense = dev.ScsiInquiry(out cmdBuf, out _, 0x00);
+                            if(!sense)
+                            {
+                                byte[] pages = EVPD.DecodePage00(cmdBuf);
+
+                                if(pages != null)
+                                {
+                                    List<EVPDType> evpds = new List<EVPDType>();
+                                    foreach(byte page in pages)
+                                    {
+                                        dumpLog.WriteLine("Requesting page {0:X2}h.", page);
+                                        sense = dev.ScsiInquiry(out cmdBuf, out _, page);
+                                        if(sense) continue;
+
+                                        EVPDType evpd = new EVPDType
+                                        {
+                                            Image = $"{outputPrefix}.evpd_{page:X2}h.bin",
+                                            Checksums = Checksum.GetChecksums(cmdBuf).ToArray(),
+                                            Size = cmdBuf.Length
+                                        };
+                                        evpd.Checksums = Checksum.GetChecksums(cmdBuf).ToArray();
+                                        DataFile.WriteTo("SCSI Dump", evpd.Image, cmdBuf);
+                                        evpds.Add(evpd);
+                                    }
+
+                                    if(evpds.Count > 0) sidecar.BlockMedia[0].SCSI.EVPD = evpds.ToArray();
                                 }
-                                */
+                            }
+                            */
 
-                                UpdateStatus?.Invoke("Requesting MODE SENSE (10).");
-                                _dumpLog.WriteLine("Requesting MODE SENSE (10).");
+                            UpdateStatus?.Invoke("Requesting MODE SENSE (10).");
+                            _dumpLog.WriteLine("Requesting MODE SENSE (10).");
 
+                            sense = _dev.ModeSense10(out cmdBuf, out _, false, true,
+                                                     ScsiModeSensePageControl.Current, 0x3F, 0xFF, 5, out _);
+
+                            if(!sense ||
+                               _dev.Error)
                                 sense = _dev.ModeSense10(out cmdBuf, out _, false, true,
-                                                         ScsiModeSensePageControl.Current, 0x3F, 0xFF, 5, out _);
+                                                         ScsiModeSensePageControl.Current, 0x3F, 0x00, 5, out _);
 
-                                if(!sense ||
-                                   _dev.Error)
-                                    sense = _dev.ModeSense10(out cmdBuf, out _, false, true,
-                                                             ScsiModeSensePageControl.Current, 0x3F, 0x00, 5, out _);
+                            if(!sense &&
+                               !_dev.Error)
+                                if(Modes.DecodeMode10(cmdBuf, _dev.ScsiType).HasValue)
+                                    if(outputFormat.SupportedMediaTags.Contains(MediaTagType.SCSI_MODESENSE_10))
+                                        sidecar.BlockMedia[0].SCSI.ModeSense10 = new DumpType
+                                        {
+                                            Image     = _outputPath,
+                                            Size      = (ulong)cmdBuf.Length,
+                                            Checksums = Checksum.GetChecksums(cmdBuf).ToArray()
+                                        };
 
-                                if(!sense &&
-                                   !_dev.Error)
-                                    if(Modes.DecodeMode10(cmdBuf, _dev.ScsiType).HasValue)
-                                        if(outputFormat.SupportedMediaTags.Contains(MediaTagType.SCSI_MODESENSE_10))
-                                            sidecar.BlockMedia[0].SCSI.ModeSense10 = new DumpType
-                                            {
-                                                Image     = _outputPath,
-                                                Size      = (ulong)cmdBuf.Length,
-                                                Checksums = Checksum.GetChecksums(cmdBuf).ToArray()
-                                            };
+                            UpdateStatus?.Invoke("Requesting MODE SENSE (6).");
+                            _dumpLog.WriteLine("Requesting MODE SENSE (6).");
 
-                                UpdateStatus?.Invoke("Requesting MODE SENSE (6).");
-                                _dumpLog.WriteLine("Requesting MODE SENSE (6).");
+                            sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current,
+                                                    0x3F, 0x00, 5, out _);
 
+                            if(sense || _dev.Error)
                                 sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current,
                                                         0x3F, 0x00, 5, out _);
 
-                                if(sense || _dev.Error)
-                                    sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current,
-                                                            0x3F, 0x00, 5, out _);
+                            if(sense || _dev.Error)
+                                sense = _dev.ModeSense(out cmdBuf, out _, 5, out _);
 
-                                if(sense || _dev.Error)
-                                    sense = _dev.ModeSense(out cmdBuf, out _, 5, out _);
+                            if(!sense &&
+                               !_dev.Error)
+                                if(Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
+                                    if(outputFormat.SupportedMediaTags.Contains(MediaTagType.SCSI_MODESENSE_6))
+                                        sidecar.BlockMedia[0].SCSI.ModeSense = new DumpType
+                                        {
+                                            Image     = _outputPath,
+                                            Size      = (ulong)cmdBuf.Length,
+                                            Checksums = Checksum.GetChecksums(cmdBuf).ToArray()
+                                        };
+                        }
+                    }
 
-                                if(!sense &&
-                                   !_dev.Error)
-                                    if(Modes.DecodeMode6(cmdBuf, _dev.ScsiType).HasValue)
-                                        if(outputFormat.SupportedMediaTags.Contains(MediaTagType.SCSI_MODESENSE_6))
-                                            sidecar.BlockMedia[0].SCSI.ModeSense = new DumpType
-                                            {
-                                                Image     = _outputPath,
-                                                Size      = (ulong)cmdBuf.Length,
-                                                Checksums = Checksum.GetChecksums(cmdBuf).ToArray()
-                                            };
-                            }
+                    List<(ulong start, string type)> filesystems = new();
+
+                    if(sidecar.BlockMedia[0].FileSystemInformation != null)
+                        filesystems.AddRange(from partition in sidecar.BlockMedia[0].FileSystemInformation
+                                             where partition.FileSystems != null
+                                             from fileSystem in partition.FileSystems
+                                             select (partition.StartSector, fileSystem.Type));
+
+                    if(filesystems.Count > 0)
+                        foreach(var filesystem in filesystems.Select(o => new
+                                {
+                                    o.start,
+                                    o.type
+                                }).Distinct())
+                        {
+                            UpdateStatus?.
+                                Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
+
+                            _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type,
+                                               filesystem.start);
                         }
 
-                        List<(ulong start, string type)> filesystems = new();
+                    sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType);
 
-                        if(sidecar.BlockMedia[0].FileSystemInformation != null)
-                            filesystems.AddRange(from partition in sidecar.BlockMedia[0].FileSystemInformation
-                                                 where partition.FileSystems != null
-                                                 from fileSystem in partition.FileSystems
-                                                 select (partition.StartSector, fileSystem.Type));
+                    (string type, string subType) xmlType =
+                        CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
 
-                        if(filesystems.Count > 0)
-                            foreach(var filesystem in filesystems.Select(o => new
-                            {
-                                o.start,
-                                o.type
-                            }).Distinct())
-                            {
-                                UpdateStatus?.
-                                    Invoke($"Found filesystem {filesystem.type} at sector {filesystem.start}");
+                    sidecar.BlockMedia[0].DiskType    = xmlType.type;
+                    sidecar.BlockMedia[0].DiskSubType = xmlType.subType;
 
-                                _dumpLog.WriteLine("Found filesystem {0} at sector {1}", filesystem.type,
-                                                   filesystem.start);
-                            }
+                    // TODO: Implement device firmware revision
+                    if(!_dev.IsRemovable ||
+                       _dev.IsUsb)
+                        if(_dev.Type == DeviceType.ATAPI)
+                            sidecar.BlockMedia[0].Interface = "ATAPI";
+                        else if(_dev.IsUsb)
+                            sidecar.BlockMedia[0].Interface = "USB";
+                        else if(_dev.IsFireWire)
+                            sidecar.BlockMedia[0].Interface = "FireWire";
+                        else
+                            sidecar.BlockMedia[0].Interface = "SCSI";
 
-                        sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(dskType);
+                    sidecar.BlockMedia[0].LogicalBlocks     = blocks;
+                    sidecar.BlockMedia[0].PhysicalBlockSize = physicalBlockSize;
+                    sidecar.BlockMedia[0].LogicalBlockSize  = logicalBlockSize;
+                    sidecar.BlockMedia[0].Manufacturer      = _dev.Manufacturer;
+                    sidecar.BlockMedia[0].Model             = _dev.Model;
 
-                        (string type, string subType) xmlType =
-                            CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
+                    if(!_private)
+                        sidecar.BlockMedia[0].Serial = _dev.Serial;
 
-                        sidecar.BlockMedia[0].DiskType    = xmlType.type;
-                        sidecar.BlockMedia[0].DiskSubType = xmlType.subType;
+                    sidecar.BlockMedia[0].Size = blocks * blockSize;
 
-                        // TODO: Implement device firmware revision
-                        if(!_dev.IsRemovable ||
-                           _dev.IsUsb)
-                            if(_dev.Type == DeviceType.ATAPI)
-                                sidecar.BlockMedia[0].Interface = "ATAPI";
-                            else if(_dev.IsUsb)
-                                sidecar.BlockMedia[0].Interface = "USB";
-                            else if(_dev.IsFireWire)
-                                sidecar.BlockMedia[0].Interface = "FireWire";
-                            else
-                                sidecar.BlockMedia[0].Interface = "SCSI";
+                    if(_dev.IsRemovable)
+                        sidecar.BlockMedia[0].DumpHardwareArray = _resume.Tries.ToArray();
 
-                        sidecar.BlockMedia[0].LogicalBlocks     = blocks;
-                        sidecar.BlockMedia[0].PhysicalBlockSize = physicalBlockSize;
-                        sidecar.BlockMedia[0].LogicalBlockSize  = logicalBlockSize;
-                        sidecar.BlockMedia[0].Manufacturer      = _dev.Manufacturer;
-                        sidecar.BlockMedia[0].Model             = _dev.Model;
+                    UpdateStatus?.Invoke("Writing metadata sidecar");
 
-                        if(!_private)
-                            sidecar.BlockMedia[0].Serial = _dev.Serial;
+                    var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
 
-                        sidecar.BlockMedia[0].Size = blocks * blockSize;
-
-                        if(_dev.IsRemovable)
-                            sidecar.BlockMedia[0].DumpHardwareArray = _resume.Tries.ToArray();
-
-                        UpdateStatus?.Invoke("Writing metadata sidecar");
-
-                        var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
-
-                        var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
-                        xmlSer.Serialize(xmlFs, sidecar);
-                        xmlFs.Close();
-                    }
+                    var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
+                    xmlSer.Serialize(xmlFs, sidecar);
+                    xmlFs.Close();
                 }
             }
-
-            UpdateStatus?.Invoke("");
-
-            UpdateStatus?.
-                Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
-
-            UpdateStatus?.
-                Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
-
-            if(maxSpeed > 0)
-                UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
-
-            if(minSpeed > 0 &&
-               minSpeed < double.MaxValue)
-                UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
-
-            UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
-            UpdateStatus?.Invoke("");
-
-            Statistics.AddMedia(dskType, true);
         }
+
+        UpdateStatus?.Invoke("");
+
+        UpdateStatus?.
+            Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+
+        UpdateStatus?.
+            Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+
+        if(maxSpeed > 0)
+            UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+
+        if(minSpeed > 0 &&
+           minSpeed < double.MaxValue)
+            UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+
+        UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
+        UpdateStatus?.Invoke("");
+
+        Statistics.AddMedia(dskType, true);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/Sbc/Error.cs b/Aaru.Core/Devices/Dumping/Sbc/Error.cs
index 0cebdd5e4..cef558f67 100644
--- a/Aaru.Core/Devices/Dumping/Sbc/Error.cs
+++ b/Aaru.Core/Devices/Dumping/Sbc/Error.cs
@@ -43,377 +43,376 @@ using DVDDecryption = Aaru.Decryption.DVD.Dump;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Retries errored data when dumping from a SCSI Block Commands compliant device</summary>
+    /// <param name="currentTry">Resume information</param>
+    /// <param name="extents">Correctly dump extents</param>
+    /// <param name="totalDuration">Total time spent in commands</param>
+    /// <param name="scsiReader">SCSI reader</param>
+    /// <param name="blankExtents">Blank extents</param>
+    void RetrySbcData(Reader scsiReader, DumpHardwareType currentTry, ExtentsULong extents,
+                      ref double totalDuration, ExtentsULong blankExtents)
     {
-        /// <summary>Retries errored data when dumping from a SCSI Block Commands compliant device</summary>
-        /// <param name="currentTry">Resume information</param>
-        /// <param name="extents">Correctly dump extents</param>
-        /// <param name="totalDuration">Total time spent in commands</param>
-        /// <param name="scsiReader">SCSI reader</param>
-        /// <param name="blankExtents">Blank extents</param>
-        void RetrySbcData(Reader scsiReader, DumpHardwareType currentTry, ExtentsULong extents,
-                          ref double totalDuration, ExtentsULong blankExtents)
+        int             pass              = 1;
+        bool            forward           = true;
+        bool            runningPersistent = false;
+        bool            sense;
+        byte[]          buffer;
+        bool            recoveredError;
+        Modes.ModePage? currentModePage = null;
+        byte[]          md6;
+        byte[]          md10;
+        bool            blankCheck;
+        bool            newBlank     = false;
+        var             outputFormat = _outputPlugin as IWritableImage;
+
+        if(_persistent)
         {
-            int             pass              = 1;
-            bool            forward           = true;
-            bool            runningPersistent = false;
-            bool            sense;
-            byte[]          buffer;
-            bool            recoveredError;
-            Modes.ModePage? currentModePage = null;
-            byte[]          md6;
-            byte[]          md10;
-            bool            blankCheck;
-            bool            newBlank     = false;
-            var             outputFormat = _outputPlugin as IWritableImage;
+            Modes.ModePage_01_MMC pgMmc;
+            Modes.ModePage_01     pg;
 
-            if(_persistent)
+            sense = _dev.ModeSense6(out buffer, out _, false, ScsiModeSensePageControl.Current, 0x01, _dev.Timeout,
+                                    out _);
+
+            if(sense)
             {
-                Modes.ModePage_01_MMC pgMmc;
-                Modes.ModePage_01     pg;
+                sense = _dev.ModeSense10(out buffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
+                                         _dev.Timeout, out _);
 
-                sense = _dev.ModeSense6(out buffer, out _, false, ScsiModeSensePageControl.Current, 0x01, _dev.Timeout,
-                                        out _);
-
-                if(sense)
+                if(!sense)
                 {
-                    sense = _dev.ModeSense10(out buffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
-                                             _dev.Timeout, out _);
+                    Modes.DecodedMode? dcMode10 = Modes.DecodeMode10(buffer, _dev.ScsiType);
 
-                    if(!sense)
-                    {
-                        Modes.DecodedMode? dcMode10 = Modes.DecodeMode10(buffer, _dev.ScsiType);
-
-                        if(dcMode10?.Pages != null)
-                            foreach(Modes.ModePage modePage in dcMode10.Value.Pages.Where(modePage =>
-                                modePage.Page == 0x01 && modePage.Subpage == 0x00))
-                                currentModePage = modePage;
-                    }
-                }
-                else
-                {
-                    Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(buffer, _dev.ScsiType);
-
-                    if(dcMode6?.Pages != null)
-                        foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
-                            modePage.Page == 0x01 && modePage.Subpage == 0x00))
+                    if(dcMode10?.Pages != null)
+                        foreach(Modes.ModePage modePage in dcMode10.Value.Pages.Where(modePage =>
+                                    modePage.Page == 0x01 && modePage.Subpage == 0x00))
                             currentModePage = modePage;
                 }
+            }
+            else
+            {
+                Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(buffer, _dev.ScsiType);
 
-                if(currentModePage == null)
-                {
-                    if(_dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
-                    {
-                        pgMmc = new Modes.ModePage_01_MMC
-                        {
-                            PS             = false,
-                            ReadRetryCount = 32,
-                            Parameter      = 0x00
-                        };
-
-                        currentModePage = new Modes.ModePage
-                        {
-                            Page         = 0x01,
-                            Subpage      = 0x00,
-                            PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
-                        };
-                    }
-                    else
-                    {
-                        pg = new Modes.ModePage_01
-                        {
-                            PS             = false,
-                            AWRE           = true,
-                            ARRE           = true,
-                            TB             = false,
-                            RC             = false,
-                            EER            = true,
-                            PER            = false,
-                            DTE            = true,
-                            DCR            = false,
-                            ReadRetryCount = 32
-                        };
-
-                        currentModePage = new Modes.ModePage
-                        {
-                            Page         = 0x01,
-                            Subpage      = 0x00,
-                            PageResponse = Modes.EncodeModePage_01(pg)
-                        };
-                    }
-                }
+                if(dcMode6?.Pages != null)
+                    foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
+                                modePage.Page == 0x01 && modePage.Subpage == 0x00))
+                        currentModePage = modePage;
+            }
 
+            if(currentModePage == null)
+            {
                 if(_dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
                 {
                     pgMmc = new Modes.ModePage_01_MMC
                     {
                         PS             = false,
-                        ReadRetryCount = 255,
-                        Parameter      = 0x20
+                        ReadRetryCount = 32,
+                        Parameter      = 0x00
                     };
 
-                    var md = new Modes.DecodedMode
+                    currentModePage = new Modes.ModePage
                     {
-                        Header = new Modes.ModeHeader(),
-                        Pages = new[]
-                        {
-                            new Modes.ModePage
-                            {
-                                Page         = 0x01,
-                                Subpage      = 0x00,
-                                PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
-                            }
-                        }
+                        Page         = 0x01,
+                        Subpage      = 0x00,
+                        PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
                     };
-
-                    md6  = Modes.EncodeMode6(md, _dev.ScsiType);
-                    md10 = Modes.EncodeMode10(md, _dev.ScsiType);
                 }
                 else
                 {
                     pg = new Modes.ModePage_01
                     {
                         PS             = false,
-                        AWRE           = false,
-                        ARRE           = false,
-                        TB             = true,
+                        AWRE           = true,
+                        ARRE           = true,
+                        TB             = false,
                         RC             = false,
                         EER            = true,
                         PER            = false,
-                        DTE            = false,
+                        DTE            = true,
                         DCR            = false,
-                        ReadRetryCount = 255
+                        ReadRetryCount = 32
                     };
 
-                    var md = new Modes.DecodedMode
+                    currentModePage = new Modes.ModePage
                     {
-                        Header = new Modes.ModeHeader(),
-                        Pages = new[]
-                        {
-                            new Modes.ModePage
-                            {
-                                Page         = 0x01,
-                                Subpage      = 0x00,
-                                PageResponse = Modes.EncodeModePage_01(pg)
-                            }
-                        }
+                        Page         = 0x01,
+                        Subpage      = 0x00,
+                        PageResponse = Modes.EncodeModePage_01(pg)
                     };
-
-                    md6  = Modes.EncodeMode6(md, _dev.ScsiType);
-                    md10 = Modes.EncodeMode10(md, _dev.ScsiType);
-                }
-
-                UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks).");
-                _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
-                sense = _dev.ModeSelect(md6, out byte[] senseBuf, true, false, _dev.Timeout, out _);
-
-                if(sense)
-                    sense = _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
-
-                if(sense)
-                {
-                    UpdateStatus?.
-                        Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
-
-                    AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
-
-                    _dumpLog.WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
-                }
-                else
-                {
-                    runningPersistent = true;
                 }
             }
 
-            InitProgress?.Invoke();
-            repeatRetry:
-            ulong[] tmpArray = _resume.BadBlocks.ToArray();
-
-            foreach(ulong badSector in tmpArray)
+            if(_dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
             {
-                if(_aborted)
+                pgMmc = new Modes.ModePage_01_MMC
                 {
-                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    UpdateStatus?.Invoke("Aborted!");
-                    _dumpLog.WriteLine("Aborted!");
+                    PS             = false,
+                    ReadRetryCount = 255,
+                    Parameter      = 0x20
+                };
 
-                    break;
-                }
-
-                PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
-                                                    forward ? "forward" : "reverse",
-                                                    runningPersistent ? "recovering partial data, " : ""));
-
-                sense = scsiReader.ReadBlock(out buffer, badSector, out double cmdDuration, out recoveredError,
-                                             out blankCheck);
-
-                totalDuration += cmdDuration;
-
-                if(blankCheck)
-                {
-                    _resume.BadBlocks.Remove(badSector);
-                    blankExtents.Add(badSector, badSector);
-                    newBlank = true;
-
-                    UpdateStatus?.Invoke($"Found blank block {badSector} in pass {pass}.");
-                    _dumpLog.WriteLine("Found blank block {0} in pass {1}.", badSector, pass);
-
-                    continue;
-                }
-
-                if((!sense && !_dev.Error) || recoveredError)
-                {
-                    _resume.BadBlocks.Remove(badSector);
-                    extents.Add(badSector);
-                    outputFormat.WriteSector(buffer, badSector);
-                    UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
-                    _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
-                }
-                else if(runningPersistent)
-                {
-                    outputFormat.WriteSector(buffer, badSector);
-                }
-            }
-
-            if(pass < _retryPasses &&
-               !_aborted           &&
-               _resume.BadBlocks.Count > 0)
-            {
-                pass++;
-                forward = !forward;
-                _resume.BadBlocks.Sort();
-
-                if(!forward)
-                    _resume.BadBlocks.Reverse();
-
-                goto repeatRetry;
-            }
-
-            if(runningPersistent && currentModePage.HasValue)
-            {
                 var md = new Modes.DecodedMode
                 {
                     Header = new Modes.ModeHeader(),
                     Pages = new[]
                     {
-                        currentModePage.Value
+                        new Modes.ModePage
+                        {
+                            Page         = 0x01,
+                            Subpage      = 0x00,
+                            PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
+                        }
                     }
                 };
 
                 md6  = Modes.EncodeMode6(md, _dev.ScsiType);
                 md10 = Modes.EncodeMode10(md, _dev.ScsiType);
+            }
+            else
+            {
+                pg = new Modes.ModePage_01
+                {
+                    PS             = false,
+                    AWRE           = false,
+                    ARRE           = false,
+                    TB             = true,
+                    RC             = false,
+                    EER            = true,
+                    PER            = false,
+                    DTE            = false,
+                    DCR            = false,
+                    ReadRetryCount = 255
+                };
 
-                UpdateStatus?.Invoke("Sending MODE SELECT to drive (return device to previous status).");
-                _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
-                sense = _dev.ModeSelect(md6, out _, true, false, _dev.Timeout, out _);
+                var md = new Modes.DecodedMode
+                {
+                    Header = new Modes.ModeHeader(),
+                    Pages = new[]
+                    {
+                        new Modes.ModePage
+                        {
+                            Page         = 0x01,
+                            Subpage      = 0x00,
+                            PageResponse = Modes.EncodeModePage_01(pg)
+                        }
+                    }
+                };
 
-                if(sense)
-                    _dev.ModeSelect10(md10, out _, true, false, _dev.Timeout, out _);
+                md6  = Modes.EncodeMode6(md, _dev.ScsiType);
+                md10 = Modes.EncodeMode10(md, _dev.ScsiType);
             }
 
-            if(newBlank)
-                _resume.BlankExtents = ExtentsConverter.ToMetadata(blankExtents);
+            UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks).");
+            _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
+            sense = _dev.ModeSelect(md6, out byte[] senseBuf, true, false, _dev.Timeout, out _);
 
-            EndProgress?.Invoke();
+            if(sense)
+                sense = _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
+
+            if(sense)
+            {
+                UpdateStatus?.
+                    Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
+
+                AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
+
+                _dumpLog.WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
+            }
+            else
+            {
+                runningPersistent = true;
+            }
         }
 
-        void RetryTitleKeys(DVDDecryption dvdDecrypt, byte[] discKey, ref double totalDuration)
+        InitProgress?.Invoke();
+        repeatRetry:
+        ulong[] tmpArray = _resume.BadBlocks.ToArray();
+
+        foreach(ulong badSector in tmpArray)
         {
-            int    pass    = 1;
-            bool   forward = true;
-            bool   sense;
-            byte[] buffer;
-            var    outputFormat = _outputPlugin as IWritableImage;
-
-            InitProgress?.Invoke();
-
-            repeatRetry:
-            ulong[] tmpArray = _resume.MissingTitleKeys.ToArray();
-
-            foreach(ulong missingKey in tmpArray)
+            if(_aborted)
             {
-                if(_aborted)
-                {
-                    UpdateStatus?.Invoke("Aborted!");
-                    _dumpLog.WriteLine("Aborted!");
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
 
-                    break;
+                break;
+            }
+
+            PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
+                                                forward ? "forward" : "reverse",
+                                                runningPersistent ? "recovering partial data, " : ""));
+
+            sense = scsiReader.ReadBlock(out buffer, badSector, out double cmdDuration, out recoveredError,
+                                         out blankCheck);
+
+            totalDuration += cmdDuration;
+
+            if(blankCheck)
+            {
+                _resume.BadBlocks.Remove(badSector);
+                blankExtents.Add(badSector, badSector);
+                newBlank = true;
+
+                UpdateStatus?.Invoke($"Found blank block {badSector} in pass {pass}.");
+                _dumpLog.WriteLine("Found blank block {0} in pass {1}.", badSector, pass);
+
+                continue;
+            }
+
+            if((!sense && !_dev.Error) || recoveredError)
+            {
+                _resume.BadBlocks.Remove(badSector);
+                extents.Add(badSector);
+                outputFormat.WriteSector(buffer, badSector);
+                UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
+                _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
+            }
+            else if(runningPersistent)
+            {
+                outputFormat.WriteSector(buffer, badSector);
+            }
+        }
+
+        if(pass < _retryPasses &&
+           !_aborted           &&
+           _resume.BadBlocks.Count > 0)
+        {
+            pass++;
+            forward = !forward;
+            _resume.BadBlocks.Sort();
+
+            if(!forward)
+                _resume.BadBlocks.Reverse();
+
+            goto repeatRetry;
+        }
+
+        if(runningPersistent && currentModePage.HasValue)
+        {
+            var md = new Modes.DecodedMode
+            {
+                Header = new Modes.ModeHeader(),
+                Pages = new[]
+                {
+                    currentModePage.Value
                 }
+            };
 
-                PulseProgress?.Invoke(string.Format("Retrying title key {0}, pass {1}, {2}", missingKey, pass,
-                                                    forward ? "forward" : "reverse"));
+            md6  = Modes.EncodeMode6(md, _dev.ScsiType);
+            md10 = Modes.EncodeMode10(md, _dev.ScsiType);
 
-                sense = dvdDecrypt.ReadTitleKey(out buffer, out _, DvdCssKeyClass.DvdCssCppmOrCprm, missingKey,
-                                                _dev.Timeout, out double cmdDuration);
+            UpdateStatus?.Invoke("Sending MODE SELECT to drive (return device to previous status).");
+            _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
+            sense = _dev.ModeSelect(md6, out _, true, false, _dev.Timeout, out _);
 
-                totalDuration += cmdDuration;
+            if(sense)
+                _dev.ModeSelect10(md10, out _, true, false, _dev.Timeout, out _);
+        }
 
-                if(!sense &&
-                   !_dev.Error)
+        if(newBlank)
+            _resume.BlankExtents = ExtentsConverter.ToMetadata(blankExtents);
+
+        EndProgress?.Invoke();
+    }
+
+    void RetryTitleKeys(DVDDecryption dvdDecrypt, byte[] discKey, ref double totalDuration)
+    {
+        int    pass    = 1;
+        bool   forward = true;
+        bool   sense;
+        byte[] buffer;
+        var    outputFormat = _outputPlugin as IWritableImage;
+
+        InitProgress?.Invoke();
+
+        repeatRetry:
+        ulong[] tmpArray = _resume.MissingTitleKeys.ToArray();
+
+        foreach(ulong missingKey in tmpArray)
+        {
+            if(_aborted)
+            {
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
+
+                break;
+            }
+
+            PulseProgress?.Invoke(string.Format("Retrying title key {0}, pass {1}, {2}", missingKey, pass,
+                                                forward ? "forward" : "reverse"));
+
+            sense = dvdDecrypt.ReadTitleKey(out buffer, out _, DvdCssKeyClass.DvdCssCppmOrCprm, missingKey,
+                                            _dev.Timeout, out double cmdDuration);
+
+            totalDuration += cmdDuration;
+
+            if(!sense &&
+               !_dev.Error)
+            {
+                CSS_CPRM.TitleKey? titleKey = CSS.DecodeTitleKey(buffer, dvdDecrypt.BusKey);
+
+                if(titleKey.HasValue)
                 {
-                    CSS_CPRM.TitleKey? titleKey = CSS.DecodeTitleKey(buffer, dvdDecrypt.BusKey);
-
-                    if(titleKey.HasValue)
+                    outputFormat.WriteSectorTag(new[]
                     {
-                        outputFormat.WriteSectorTag(new[]
+                        titleKey.Value.CMI
+                    }, missingKey, SectorTagType.DvdCmi);
+
+                    // If the CMI bit is 1, the sector is using copy protection, else it is not
+                    // If the decoded title key is zeroed, there should be no copy protection
+                    if((titleKey.Value.CMI & 0x80) >> 7 == 0 ||
+                       titleKey.Value.Key.All(k => k == 0))
+                    {
+                        outputFormat.WriteSectorTag(new byte[]
                         {
-                            titleKey.Value.CMI
-                        }, missingKey, SectorTagType.DvdCmi);
+                            0, 0, 0, 0, 0
+                        }, missingKey, SectorTagType.DvdTitleKey);
 
-                        // If the CMI bit is 1, the sector is using copy protection, else it is not
-                        // If the decoded title key is zeroed, there should be no copy protection
-                        if((titleKey.Value.CMI & 0x80) >> 7 == 0 ||
-                           titleKey.Value.Key.All(k => k == 0))
+                        outputFormat.WriteSectorTag(new byte[]
                         {
-                            outputFormat.WriteSectorTag(new byte[]
-                            {
-                                0, 0, 0, 0, 0
-                            }, missingKey, SectorTagType.DvdTitleKey);
+                            0, 0, 0, 0, 0
+                        }, missingKey, SectorTagType.DvdTitleKeyDecrypted);
 
-                            outputFormat.WriteSectorTag(new byte[]
-                            {
-                                0, 0, 0, 0, 0
-                            }, missingKey, SectorTagType.DvdTitleKeyDecrypted);
+                        _resume.MissingTitleKeys.Remove(missingKey);
+                        UpdateStatus?.Invoke($"Correctly retried title key {missingKey} in pass {pass}.");
+                        _dumpLog.WriteLine("Correctly retried title key {0} in pass {1}.", missingKey, pass);
+                    }
+                    else
+                    {
+                        outputFormat.WriteSectorTag(titleKey.Value.Key, missingKey, SectorTagType.DvdTitleKey);
+                        _resume.MissingTitleKeys.Remove(missingKey);
 
-                            _resume.MissingTitleKeys.Remove(missingKey);
-                            UpdateStatus?.Invoke($"Correctly retried title key {missingKey} in pass {pass}.");
-                            _dumpLog.WriteLine("Correctly retried title key {0} in pass {1}.", missingKey, pass);
+                        if(discKey != null)
+                        {
+                            CSS.DecryptTitleKey(0, discKey, titleKey.Value.Key, out buffer);
+                            outputFormat.WriteSectorTag(buffer, missingKey, SectorTagType.DvdTitleKeyDecrypted);
                         }
-                        else
-                        {
-                            outputFormat.WriteSectorTag(titleKey.Value.Key, missingKey, SectorTagType.DvdTitleKey);
-                            _resume.MissingTitleKeys.Remove(missingKey);
 
-                            if(discKey != null)
-                            {
-                                CSS.DecryptTitleKey(0, discKey, titleKey.Value.Key, out buffer);
-                                outputFormat.WriteSectorTag(buffer, missingKey, SectorTagType.DvdTitleKeyDecrypted);
-                            }
-
-                            UpdateStatus?.Invoke($"Correctly retried title key {missingKey} in pass {pass}.");
-                            _dumpLog.WriteLine("Correctly retried title key {0} in pass {1}.", missingKey, pass);
-                        }
+                        UpdateStatus?.Invoke($"Correctly retried title key {missingKey} in pass {pass}.");
+                        _dumpLog.WriteLine("Correctly retried title key {0} in pass {1}.", missingKey, pass);
                     }
                 }
             }
-
-            if(pass < _retryPasses &&
-               !_aborted           &&
-               _resume.MissingTitleKeys.Count > 0)
-            {
-                pass++;
-                forward = !forward;
-                _resume.MissingTitleKeys.Sort();
-
-                if(!forward)
-                    _resume.MissingTitleKeys.Reverse();
-
-                goto repeatRetry;
-            }
-
-            EndProgress?.Invoke();
         }
+
+        if(pass < _retryPasses &&
+           !_aborted           &&
+           _resume.MissingTitleKeys.Count > 0)
+        {
+            pass++;
+            forward = !forward;
+            _resume.MissingTitleKeys.Sort();
+
+            if(!forward)
+                _resume.MissingTitleKeys.Reverse();
+
+            goto repeatRetry;
+        }
+
+        EndProgress?.Invoke();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/Sbc/Optical.cs b/Aaru.Core/Devices/Dumping/Sbc/Optical.cs
index 9c8347165..45b2c98f0 100644
--- a/Aaru.Core/Devices/Dumping/Sbc/Optical.cs
+++ b/Aaru.Core/Devices/Dumping/Sbc/Optical.cs
@@ -12,259 +12,258 @@ using Schemas;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>
+    ///     Dumps data when dumping from a SCSI Block Commands compliant device, optical variant (magneto-optical and
+    ///     successors)
+    /// </summary>
+    /// <param name="blocks">Media blocks</param>
+    /// <param name="maxBlocksToRead">Maximum number of blocks to read in a single command</param>
+    /// <param name="blockSize">Block size in bytes</param>
+    /// <param name="currentTry">Resume information</param>
+    /// <param name="extents">Correctly dump extents</param>
+    /// <param name="currentSpeed">Current speed</param>
+    /// <param name="minSpeed">Minimum speed</param>
+    /// <param name="maxSpeed">Maximum speed</param>
+    /// <param name="totalDuration">Total time spent in commands</param>
+    /// <param name="scsiReader">SCSI reader</param>
+    /// <param name="mhddLog">MHDD log</param>
+    /// <param name="ibgLog">ImgBurn log</param>
+    /// <param name="imageWriteDuration">Total time spent writing to image</param>
+    /// <param name="newTrim">Set if we need to start a trim</param>
+    /// <param name="blankExtents">Blank extents</param>
+    void ReadOpticalData(in ulong blocks, in uint maxBlocksToRead, in uint blockSize, DumpHardwareType currentTry,
+                         ExtentsULong extents, ref double currentSpeed, ref double minSpeed, ref double maxSpeed,
+                         ref double totalDuration, Reader scsiReader, MhddLog mhddLog, IbgLog ibgLog,
+                         ref double imageWriteDuration, ref bool newTrim, ref ExtentsULong blankExtents)
     {
-        /// <summary>
-        ///     Dumps data when dumping from a SCSI Block Commands compliant device, optical variant (magneto-optical and
-        ///     successors)
-        /// </summary>
-        /// <param name="blocks">Media blocks</param>
-        /// <param name="maxBlocksToRead">Maximum number of blocks to read in a single command</param>
-        /// <param name="blockSize">Block size in bytes</param>
-        /// <param name="currentTry">Resume information</param>
-        /// <param name="extents">Correctly dump extents</param>
-        /// <param name="currentSpeed">Current speed</param>
-        /// <param name="minSpeed">Minimum speed</param>
-        /// <param name="maxSpeed">Maximum speed</param>
-        /// <param name="totalDuration">Total time spent in commands</param>
-        /// <param name="scsiReader">SCSI reader</param>
-        /// <param name="mhddLog">MHDD log</param>
-        /// <param name="ibgLog">ImgBurn log</param>
-        /// <param name="imageWriteDuration">Total time spent writing to image</param>
-        /// <param name="newTrim">Set if we need to start a trim</param>
-        /// <param name="blankExtents">Blank extents</param>
-        void ReadOpticalData(in ulong blocks, in uint maxBlocksToRead, in uint blockSize, DumpHardwareType currentTry,
-                             ExtentsULong extents, ref double currentSpeed, ref double minSpeed, ref double maxSpeed,
-                             ref double totalDuration, Reader scsiReader, MhddLog mhddLog, IbgLog ibgLog,
-                             ref double imageWriteDuration, ref bool newTrim, ref ExtentsULong blankExtents)
+        const uint maxBlocks      = 256;
+        var        writtenExtents = new ExtentsULong();
+        bool       written;
+        uint       c = maxBlocks;
+        bool       conditionMet;
+        bool       changingCounter;
+        bool       changingWritten;
+        uint       blocksToRead = maxBlocksToRead;
+        bool       sense;
+        byte[]     buffer;
+        ulong      sectorSpeedStart = 0;
+        DateTime   timeSpeedStart   = DateTime.UtcNow;
+        bool       canMediumScan    = true;
+        var        outputFormat     = _outputPlugin as IWritableImage;
+
+        InitProgress?.Invoke();
+
+        if(blankExtents is null)
         {
-            const uint maxBlocks      = 256;
-            var        writtenExtents = new ExtentsULong();
-            bool       written;
-            uint       c = maxBlocks;
-            bool       conditionMet;
-            bool       changingCounter;
-            bool       changingWritten;
-            uint       blocksToRead = maxBlocksToRead;
-            bool       sense;
-            byte[]     buffer;
-            ulong      sectorSpeedStart = 0;
-            DateTime   timeSpeedStart   = DateTime.UtcNow;
-            bool       canMediumScan    = true;
-            var        outputFormat     = _outputPlugin as IWritableImage;
+            blankExtents = new ExtentsULong();
 
-            InitProgress?.Invoke();
+            written = _dev.MediumScan(out buffer, true, false, false, false, false, 0, 1, 1, out _, out _,
+                                      uint.MaxValue, out _);
 
-            if(blankExtents is null)
+            DecodedSense? decodedSense = Sense.Decode(buffer);
+
+            if(_dev.LastError         != 0 ||
+               decodedSense?.SenseKey == SenseKeys.IllegalRequest)
             {
-                blankExtents = new ExtentsULong();
+                UpdateStatus?.
+                    Invoke("The current environment doesn't support the medium scan command, dump will take much longer than normal.");
 
-                written = _dev.MediumScan(out buffer, true, false, false, false, false, 0, 1, 1, out _, out _,
-                                          uint.MaxValue, out _);
-
-                DecodedSense? decodedSense = Sense.Decode(buffer);
-
-                if(_dev.LastError         != 0 ||
-                   decodedSense?.SenseKey == SenseKeys.IllegalRequest)
-                {
-                    UpdateStatus?.
-                        Invoke("The current environment doesn't support the medium scan command, dump will take much longer than normal.");
-
-                    canMediumScan = false;
-                    writtenExtents.Add(0, blocks - 1);
-                }
-
-                // TODO: Find a place where MEDIUM SCAN works properly
-                else if(buffer?.Length > 0 &&
-                        !ArrayHelpers.ArrayIsNullOrEmpty(buffer))
-                    AaruConsole.
-                        WriteLine("Please open a bug report in github with the manufacturer and model of this device, as well as your operating system name and version and this message: This environment correctly supports MEDIUM SCAN command.");
-
-                changingCounter = false;
-                changingWritten = false;
-
-                for(uint b = 0; b < blocks; b += c)
-                {
-                    if(!canMediumScan)
-                        break;
-
-                    if(_aborted)
-                    {
-                        _resume.BlankExtents = null;
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    if(changingWritten)
-                    {
-                        changingWritten = false;
-                        written         = !written;
-                        c               = maxBlocks;
-                    }
-
-                    if(changingCounter)
-                    {
-                        b               -= c;
-                        changingCounter =  false;
-                    }
-
-                    if(b + c >= blocks)
-                        c = (uint)(blocks - b);
-
-                    UpdateProgress?.
-                        Invoke($"Scanning for {c} {(written ? "written" : "blank")} blocks starting in block {b}", b,
-                               (long)blocks);
-
-                    conditionMet = _dev.MediumScan(out _, written, false, false, false, false, b, c, c, out _, out _,
-                                                   uint.MaxValue, out _);
-
-                    if(conditionMet)
-                    {
-                        if(written)
-                            writtenExtents.Add(b, c, true);
-                        else
-                            blankExtents.Add(b, c, true);
-
-                        if(c < maxBlocks)
-                            changingWritten = true;
-                    }
-                    else
-                    {
-                        if(c > 64)
-                            c /= 2;
-                        else
-                            c--;
-
-                        changingCounter = true;
-
-                        if(c != 0)
-                            continue;
-
-                        written = !written;
-                        c       = maxBlocks;
-                    }
-                }
-
-                if(_resume != null && canMediumScan)
-                    _resume.BlankExtents = ExtentsConverter.ToMetadata(blankExtents);
-
-                EndProgress?.Invoke();
-            }
-            else
-            {
+                canMediumScan = false;
                 writtenExtents.Add(0, blocks - 1);
-
-                foreach(Tuple<ulong, ulong> blank in blankExtents.ToArray())
-                    for(ulong b = blank.Item1; b <= blank.Item2; b++)
-                        writtenExtents.Remove(b);
             }
 
-            if(writtenExtents.Count == 0)
+            // TODO: Find a place where MEDIUM SCAN works properly
+            else if(buffer?.Length > 0 &&
+                    !ArrayHelpers.ArrayIsNullOrEmpty(buffer))
+                AaruConsole.
+                    WriteLine("Please open a bug report in github with the manufacturer and model of this device, as well as your operating system name and version and this message: This environment correctly supports MEDIUM SCAN command.");
+
+            changingCounter = false;
+            changingWritten = false;
+
+            for(uint b = 0; b < blocks; b += c)
             {
-                UpdateStatus?.Invoke("Cannot dump empty media!");
-                _dumpLog.WriteLine("Cannot dump empty media!");
+                if(!canMediumScan)
+                    break;
 
-                return;
-            }
-
-            InitProgress?.Invoke();
-
-            Tuple<ulong, ulong>[] extentsToDump = writtenExtents.ToArray();
-
-            foreach(Tuple<ulong, ulong> extent in extentsToDump)
-            {
-                if(extent.Item2 < _resume.NextBlock)
-                    continue; // Skip this extent
-
-                ulong nextBlock = extent.Item1;
-
-                if(extent.Item1 < _resume.NextBlock)
-                    nextBlock = (uint)_resume.NextBlock;
-
-                for(ulong i = nextBlock; i <= extent.Item2; i += blocksToRead)
+                if(_aborted)
                 {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
+                    _resume.BlankExtents = null;
+                    UpdateStatus?.Invoke("Aborted!");
+                    _dumpLog.WriteLine("Aborted!");
 
-                        break;
-                    }
+                    break;
+                }
 
-                    if(extent.Item2 + 1 - i < blocksToRead)
-                        blocksToRead = (uint)(extent.Item2 + 1 - i);
+                if(changingWritten)
+                {
+                    changingWritten = false;
+                    written         = !written;
+                    c               = maxBlocks;
+                }
 
-                    if(currentSpeed > maxSpeed &&
-                       currentSpeed > 0)
-                        maxSpeed = currentSpeed;
+                if(changingCounter)
+                {
+                    b               -= c;
+                    changingCounter =  false;
+                }
 
-                    if(currentSpeed < minSpeed &&
-                       currentSpeed > 0)
-                        minSpeed = currentSpeed;
+                if(b + c >= blocks)
+                    c = (uint)(blocks - b);
 
-                    UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
-                                           (long)blocks);
+                UpdateProgress?.
+                    Invoke($"Scanning for {c} {(written ? "written" : "blank")} blocks starting in block {b}", b,
+                           (long)blocks);
 
-                    sense = scsiReader.ReadBlocks(out buffer, i, blocksToRead, out double cmdDuration, out _, out _);
-                    totalDuration += cmdDuration;
+                conditionMet = _dev.MediumScan(out _, written, false, false, false, false, b, c, c, out _, out _,
+                                               uint.MaxValue, out _);
 
-                    if(!sense &&
-                       !_dev.Error)
-                    {
-                        mhddLog.Write(i, cmdDuration);
-                        ibgLog.Write(i, currentSpeed * 1024);
-                        DateTime writeStart = DateTime.Now;
-                        outputFormat.WriteSectors(buffer, i, blocksToRead);
-                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                        extents.Add(i, blocksToRead, true);
-                    }
+                if(conditionMet)
+                {
+                    if(written)
+                        writtenExtents.Add(b, c, true);
                     else
-                    {
-                        // TODO: Reset device after X errors
-                        if(_stopOnError)
-                            return; // TODO: Return more cleanly
+                        blankExtents.Add(b, c, true);
 
-                        if(i + _skip > extent.Item2 + 1)
-                            _skip = (uint)(extent.Item2 + 1 - i);
+                    if(c < maxBlocks)
+                        changingWritten = true;
+                }
+                else
+                {
+                    if(c > 64)
+                        c /= 2;
+                    else
+                        c--;
 
-                        // Write empty data
-                        DateTime writeStart = DateTime.Now;
-                        outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
-                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                    changingCounter = true;
 
-                        for(ulong b = i; b < i + _skip; b++)
-                            _resume.BadBlocks.Add(b);
-
-                        mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                        ibgLog.Write(i, 0);
-                        _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
-                        i       += _skip - blocksToRead;
-                        newTrim =  true;
-                    }
-
-                    sectorSpeedStart  += blocksToRead;
-                    _resume.NextBlock =  i + blocksToRead;
-
-                    double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                    if(elapsed <= 0)
+                    if(c != 0)
                         continue;
 
-                    currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                    sectorSpeedStart = 0;
-                    timeSpeedStart   = DateTime.UtcNow;
+                    written = !written;
+                    c       = maxBlocks;
                 }
             }
 
-            _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+            if(_resume != null && canMediumScan)
+                _resume.BlankExtents = ExtentsConverter.ToMetadata(blankExtents);
 
             EndProgress?.Invoke();
         }
+        else
+        {
+            writtenExtents.Add(0, blocks - 1);
+
+            foreach(Tuple<ulong, ulong> blank in blankExtents.ToArray())
+                for(ulong b = blank.Item1; b <= blank.Item2; b++)
+                    writtenExtents.Remove(b);
+        }
+
+        if(writtenExtents.Count == 0)
+        {
+            UpdateStatus?.Invoke("Cannot dump empty media!");
+            _dumpLog.WriteLine("Cannot dump empty media!");
+
+            return;
+        }
+
+        InitProgress?.Invoke();
+
+        Tuple<ulong, ulong>[] extentsToDump = writtenExtents.ToArray();
+
+        foreach(Tuple<ulong, ulong> extent in extentsToDump)
+        {
+            if(extent.Item2 < _resume.NextBlock)
+                continue; // Skip this extent
+
+            ulong nextBlock = extent.Item1;
+
+            if(extent.Item1 < _resume.NextBlock)
+                nextBlock = (uint)_resume.NextBlock;
+
+            for(ulong i = nextBlock; i <= extent.Item2; i += blocksToRead)
+            {
+                if(_aborted)
+                {
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                    UpdateStatus?.Invoke("Aborted!");
+                    _dumpLog.WriteLine("Aborted!");
+
+                    break;
+                }
+
+                if(extent.Item2 + 1 - i < blocksToRead)
+                    blocksToRead = (uint)(extent.Item2 + 1 - i);
+
+                if(currentSpeed > maxSpeed &&
+                   currentSpeed > 0)
+                    maxSpeed = currentSpeed;
+
+                if(currentSpeed < minSpeed &&
+                   currentSpeed > 0)
+                    minSpeed = currentSpeed;
+
+                UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
+                                       (long)blocks);
+
+                sense = scsiReader.ReadBlocks(out buffer, i, blocksToRead, out double cmdDuration, out _, out _);
+                totalDuration += cmdDuration;
+
+                if(!sense &&
+                   !_dev.Error)
+                {
+                    mhddLog.Write(i, cmdDuration);
+                    ibgLog.Write(i, currentSpeed * 1024);
+                    DateTime writeStart = DateTime.Now;
+                    outputFormat.WriteSectors(buffer, i, blocksToRead);
+                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                    extents.Add(i, blocksToRead, true);
+                }
+                else
+                {
+                    // TODO: Reset device after X errors
+                    if(_stopOnError)
+                        return; // TODO: Return more cleanly
+
+                    if(i + _skip > extent.Item2 + 1)
+                        _skip = (uint)(extent.Item2 + 1 - i);
+
+                    // Write empty data
+                    DateTime writeStart = DateTime.Now;
+                    outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
+                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+
+                    for(ulong b = i; b < i + _skip; b++)
+                        _resume.BadBlocks.Add(b);
+
+                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+
+                    ibgLog.Write(i, 0);
+                    _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
+                    i       += _skip - blocksToRead;
+                    newTrim =  true;
+                }
+
+                sectorSpeedStart  += blocksToRead;
+                _resume.NextBlock =  i + blocksToRead;
+
+                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+                if(elapsed <= 0)
+                    continue;
+
+                currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+                sectorSpeedStart = 0;
+                timeSpeedStart   = DateTime.UtcNow;
+            }
+        }
+
+        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+
+        EndProgress?.Invoke();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/Sbc/Trim.cs b/Aaru.Core/Devices/Dumping/Sbc/Trim.cs
index 2ff2f9191..c7437ab40 100644
--- a/Aaru.Core/Devices/Dumping/Sbc/Trim.cs
+++ b/Aaru.Core/Devices/Dumping/Sbc/Trim.cs
@@ -32,64 +32,63 @@ using Schemas;
 // ReSharper disable InlineOutVariableDeclaration
 // ReSharper disable TooWideLocalVariableScope
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+partial class Dump
 {
-    partial class Dump
+    /// <summary>Trims data when dumping from a SCSI Block Commands compliant device</summary>
+    /// <param name="scsiReader">SCSI reader</param>
+    /// <param name="extents">Correctly dump extents</param>
+    /// <param name="currentTry">Resume information</param>
+    /// <param name="blankExtents">Blank extents</param>
+    void TrimSbcData(Reader scsiReader, ExtentsULong extents, DumpHardwareType currentTry,
+                     ExtentsULong blankExtents)
     {
-        /// <summary>Trims data when dumping from a SCSI Block Commands compliant device</summary>
-        /// <param name="scsiReader">SCSI reader</param>
-        /// <param name="extents">Correctly dump extents</param>
-        /// <param name="currentTry">Resume information</param>
-        /// <param name="blankExtents">Blank extents</param>
-        void TrimSbcData(Reader scsiReader, ExtentsULong extents, DumpHardwareType currentTry,
-                         ExtentsULong blankExtents)
+        ulong[] tmpArray = _resume.BadBlocks.ToArray();
+        bool    sense;
+        bool    recoveredError;
+        bool    blankCheck;
+        byte[]  buffer;
+        bool    newBlank     = false;
+        var     outputFormat = _outputPlugin as IWritableImage;
+
+        foreach(ulong badSector in tmpArray)
         {
-            ulong[] tmpArray = _resume.BadBlocks.ToArray();
-            bool    sense;
-            bool    recoveredError;
-            bool    blankCheck;
-            byte[]  buffer;
-            bool    newBlank     = false;
-            var     outputFormat = _outputPlugin as IWritableImage;
-
-            foreach(ulong badSector in tmpArray)
+            if(_aborted)
             {
-                if(_aborted)
-                {
-                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    UpdateStatus?.Invoke("Aborted!");
-                    _dumpLog.WriteLine("Aborted!");
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
 
-                    break;
-                }
-
-                PulseProgress?.Invoke($"Trimming sector {badSector}");
-
-                sense = scsiReader.ReadBlock(out buffer, badSector, out double _, out recoveredError, out blankCheck);
-
-                if(blankCheck)
-                {
-                    blankExtents.Add(badSector, badSector);
-                    newBlank = true;
-                    _resume.BadBlocks.Remove(badSector);
-
-                    UpdateStatus?.Invoke($"Found blank block {badSector}.");
-                    _dumpLog.WriteLine("Found blank block {0}.", badSector);
-
-                    continue;
-                }
-
-                if((sense || _dev.Error) &&
-                   !recoveredError)
-                    continue;
-
-                _resume.BadBlocks.Remove(badSector);
-                extents.Add(badSector);
-                outputFormat.WriteSector(buffer, badSector);
+                break;
             }
 
-            if(newBlank)
-                _resume.BlankExtents = ExtentsConverter.ToMetadata(blankExtents);
+            PulseProgress?.Invoke($"Trimming sector {badSector}");
+
+            sense = scsiReader.ReadBlock(out buffer, badSector, out double _, out recoveredError, out blankCheck);
+
+            if(blankCheck)
+            {
+                blankExtents.Add(badSector, badSector);
+                newBlank = true;
+                _resume.BadBlocks.Remove(badSector);
+
+                UpdateStatus?.Invoke($"Found blank block {badSector}.");
+                _dumpLog.WriteLine("Found blank block {0}.", badSector);
+
+                continue;
+            }
+
+            if((sense || _dev.Error) &&
+               !recoveredError)
+                continue;
+
+            _resume.BadBlocks.Remove(badSector);
+            extents.Add(badSector);
+            outputFormat.WriteSector(buffer, badSector);
         }
+
+        if(newBlank)
+            _resume.BlankExtents = ExtentsConverter.ToMetadata(blankExtents);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/SecureDigital.cs b/Aaru.Core/Devices/Dumping/SecureDigital.cs
index f65e1e125..163d55450 100644
--- a/Aaru.Core/Devices/Dumping/SecureDigital.cs
+++ b/Aaru.Core/Devices/Dumping/SecureDigital.cs
@@ -51,549 +51,668 @@ using Version = Aaru.CommonTypes.Interop.Version;
 
 // ReSharper disable JoinDeclarationAndInitializer
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+/// <summary>Implements dumping a MultiMediaCard or SecureDigital flash card</summary>
+public partial class Dump
 {
-    /// <summary>Implements dumping a MultiMediaCard or SecureDigital flash card</summary>
-    public partial class Dump
+    /// <summary>Dumps a MultiMediaCard or SecureDigital flash card</summary>
+    void SecureDigital()
     {
-        /// <summary>Dumps a MultiMediaCard or SecureDigital flash card</summary>
-        void SecureDigital()
+        if(_dumpRaw)
         {
-            if(_dumpRaw)
-            {
-                if(_force)
-                    ErrorMessage?.
-                        Invoke("Raw dumping is not supported in MultiMediaCard or SecureDigital devices. Continuing...");
-                else
-                {
-                    StoppingErrorMessage?.
-                        Invoke("Raw dumping is not supported in MultiMediaCard or SecureDigital devices. Aborting...");
-
-                    return;
-                }
-            }
-
-            bool         sense;
-            const ushort sdProfile = 0x0001;
-            const uint   timeout   = 5;
-            double       duration;
-            ushort       blocksToRead      = 128;
-            uint         blockSize         = 512;
-            ulong        blocks            = 0;
-            byte[]       csd               = null;
-            byte[]       ocr               = null;
-            byte[]       ecsd              = null;
-            byte[]       scr               = null;
-            uint         physicalBlockSize = 0;
-            bool         byteAddressed     = true;
-            uint[]       response;
-            bool         supportsCmd23 = false;
-            var          outputFormat  = _outputPlugin as IWritableImage;
-
-            Dictionary<MediaTagType, byte[]> mediaTags = new();
-
-            switch(_dev.Type)
-            {
-                case DeviceType.MMC:
-                {
-                    UpdateStatus?.Invoke("Reading CSD");
-                    _dumpLog.WriteLine("Reading CSD");
-                    sense = _dev.ReadCsd(out csd, out response, timeout, out duration);
-
-                    if(!sense)
-                    {
-                        CSD csdDecoded = Decoders.MMC.Decoders.DecodeCSD(csd);
-                        blocks    = (ulong)((csdDecoded.Size + 1) * Math.Pow(2, csdDecoded.SizeMultiplier + 2));
-                        blockSize = (uint)Math.Pow(2, csdDecoded.ReadBlockLength);
-
-                        mediaTags.Add(MediaTagType.MMC_CSD, null);
-
-                        // Found at least since MMC System Specification 3.31
-                        supportsCmd23 = csdDecoded.Version >= 3;
-
-                        if(csdDecoded.Size == 0xFFF)
-                        {
-                            UpdateStatus?.Invoke("Reading Extended CSD");
-                            _dumpLog.WriteLine("Reading Extended CSD");
-                            sense = _dev.ReadExtendedCsd(out ecsd, out response, timeout, out duration);
-
-                            if(!sense)
-                            {
-                                ExtendedCSD ecsdDecoded = Decoders.MMC.Decoders.DecodeExtendedCSD(ecsd);
-                                blocks    = ecsdDecoded.SectorCount;
-                                blockSize = (uint)(ecsdDecoded.SectorSize == 1 ? 4096 : 512);
-
-                                if(ecsdDecoded.NativeSectorSize == 0)
-                                    physicalBlockSize = 512;
-                                else if(ecsdDecoded.NativeSectorSize == 1)
-                                    physicalBlockSize = 4096;
-
-                                blocksToRead = (ushort)(ecsdDecoded.OptimalReadSize * 4096 / blockSize);
-
-                                if(blocksToRead == 0)
-                                    blocksToRead = 128;
-
-                                // Supposing it's high-capacity MMC if it has Extended CSD...
-                                byteAddressed = false;
-                                mediaTags.Add(MediaTagType.MMC_ExtendedCSD, null);
-                            }
-                            else
-                            {
-                                _errorLog?.WriteLine("Read eCSD", _dev.Error, _dev.LastError, response);
-                                ecsd = null;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        _errorLog?.WriteLine("Read CSD", _dev.Error, _dev.LastError, response);
-                        csd = null;
-                    }
-
-                    UpdateStatus?.Invoke("Reading OCR");
-                    _dumpLog.WriteLine("Reading OCR");
-                    sense = _dev.ReadOcr(out ocr, out response, timeout, out duration);
-
-                    if(sense)
-                    {
-                        _errorLog?.WriteLine("Read OCR", _dev.Error, _dev.LastError, response);
-                        ocr = null;
-                    }
-                    else
-                        mediaTags.Add(MediaTagType.MMC_OCR, null);
-
-                    break;
-                }
-
-                case DeviceType.SecureDigital:
-                {
-                    UpdateStatus?.Invoke("Reading CSD");
-                    _dumpLog.WriteLine("Reading CSD");
-                    sense = _dev.ReadCsd(out csd, out response, timeout, out duration);
-
-                    if(!sense)
-                    {
-                        Decoders.SecureDigital.CSD csdDecoded = Decoders.SecureDigital.Decoders.DecodeCSD(csd);
-
-                        blocks = (ulong)(csdDecoded.Structure == 0
-                                             ? (csdDecoded.Size + 1) * Math.Pow(2, csdDecoded.SizeMultiplier + 2)
-                                             : (csdDecoded.Size + 1) * 1024);
-
-                        blockSize = (uint)Math.Pow(2, csdDecoded.ReadBlockLength);
-
-                        // Structure >=1 for SDHC/SDXC, so that's block addressed
-                        byteAddressed = csdDecoded.Structure == 0;
-                        mediaTags.Add(MediaTagType.SD_CSD, null);
-
-                        physicalBlockSize = blockSize;
-
-                        if(blockSize != 512)
-                        {
-                            uint ratio = blockSize / 512;
-                            blocks    *= ratio;
-                            blockSize =  512;
-                        }
-                    }
-                    else
-                    {
-                        _errorLog?.WriteLine("Read CSD", _dev.Error, _dev.LastError, response);
-                        csd = null;
-                    }
-
-                    UpdateStatus?.Invoke("Reading OCR");
-                    _dumpLog.WriteLine("Reading OCR");
-                    sense = _dev.ReadSdocr(out ocr, out response, timeout, out duration);
-
-                    if(sense)
-                    {
-                        _errorLog?.WriteLine("Read OCR", _dev.Error, _dev.LastError, response);
-                        ocr = null;
-                    }
-                    else
-                        mediaTags.Add(MediaTagType.SD_OCR, null);
-
-                    UpdateStatus?.Invoke("Reading SCR");
-                    _dumpLog.WriteLine("Reading SCR");
-                    sense = _dev.ReadScr(out scr, out response, timeout, out duration);
-
-                    if(sense)
-                    {
-                        _errorLog?.WriteLine("Read SCR", _dev.Error, _dev.LastError, response);
-                        scr = null;
-                    }
-                    else
-                    {
-                        supportsCmd23 = Decoders.SecureDigital.Decoders.DecodeSCR(scr)?.CommandSupport.
-                                                 HasFlag(CommandSupport.SetBlockCount) ?? false;
-
-                        mediaTags.Add(MediaTagType.SD_SCR, null);
-                    }
-
-                    break;
-                }
-            }
-
-            UpdateStatus?.Invoke("Reading CID");
-            _dumpLog.WriteLine("Reading CID");
-            sense = _dev.ReadCid(out byte[] cid, out response, timeout, out duration);
-
-            if(sense)
-            {
-                _errorLog?.WriteLine("Read CID", _dev.Error, _dev.LastError, response);
-                cid = null;
-            }
+            if(_force)
+                ErrorMessage?.
+                    Invoke("Raw dumping is not supported in MultiMediaCard or SecureDigital devices. Continuing...");
             else
-                mediaTags.Add(_dev.Type == DeviceType.SecureDigital ? MediaTagType.SD_CID : MediaTagType.MMC_CID, null);
-
-            DateTime start;
-            DateTime end;
-            double   totalDuration = 0;
-            double   currentSpeed  = 0;
-            double   maxSpeed      = double.MinValue;
-            double   minSpeed      = double.MaxValue;
-
-            if(blocks == 0)
             {
-                _dumpLog.WriteLine("Unable to get device size.");
-                StoppingErrorMessage?.Invoke("Unable to get device size.");
+                StoppingErrorMessage?.
+                    Invoke("Raw dumping is not supported in MultiMediaCard or SecureDigital devices. Aborting...");
 
                 return;
             }
+        }
 
-            UpdateStatus?.Invoke($"Device reports {blocks} blocks.");
-            _dumpLog.WriteLine("Device reports {0} blocks.", blocks);
+        bool         sense;
+        const ushort sdProfile = 0x0001;
+        const uint   timeout   = 5;
+        double       duration;
+        ushort       blocksToRead      = 128;
+        uint         blockSize         = 512;
+        ulong        blocks            = 0;
+        byte[]       csd               = null;
+        byte[]       ocr               = null;
+        byte[]       ecsd              = null;
+        byte[]       scr               = null;
+        uint         physicalBlockSize = 0;
+        bool         byteAddressed     = true;
+        uint[]       response;
+        bool         supportsCmd23 = false;
+        var          outputFormat  = _outputPlugin as IWritableImage;
 
-            byte[] cmdBuf;
-            bool   error;
+        Dictionary<MediaTagType, byte[]> mediaTags = new();
 
-            if(blocksToRead > _maximumReadable)
-                blocksToRead = (ushort)_maximumReadable;
-
-            if(supportsCmd23 && blocksToRead > 1)
+        switch(_dev.Type)
+        {
+            case DeviceType.MMC:
             {
-                sense = _dev.ReadWithBlockCount(out cmdBuf, out _, 0, blockSize, 1, byteAddressed, timeout,
-                                                out duration);
+                UpdateStatus?.Invoke("Reading CSD");
+                _dumpLog.WriteLine("Reading CSD");
+                sense = _dev.ReadCsd(out csd, out response, timeout, out duration);
 
-                if(sense || _dev.Error)
-                    supportsCmd23 = false;
+                if(!sense)
+                {
+                    CSD csdDecoded = Decoders.MMC.Decoders.DecodeCSD(csd);
+                    blocks    = (ulong)((csdDecoded.Size + 1) * Math.Pow(2, csdDecoded.SizeMultiplier + 2));
+                    blockSize = (uint)Math.Pow(2, csdDecoded.ReadBlockLength);
 
-                // Need to restart device, otherwise is it just busy streaming data with no one listening
-                sense = _dev.ReOpen();
+                    mediaTags.Add(MediaTagType.MMC_CSD, null);
+
+                    // Found at least since MMC System Specification 3.31
+                    supportsCmd23 = csdDecoded.Version >= 3;
+
+                    if(csdDecoded.Size == 0xFFF)
+                    {
+                        UpdateStatus?.Invoke("Reading Extended CSD");
+                        _dumpLog.WriteLine("Reading Extended CSD");
+                        sense = _dev.ReadExtendedCsd(out ecsd, out response, timeout, out duration);
+
+                        if(!sense)
+                        {
+                            ExtendedCSD ecsdDecoded = Decoders.MMC.Decoders.DecodeExtendedCSD(ecsd);
+                            blocks    = ecsdDecoded.SectorCount;
+                            blockSize = (uint)(ecsdDecoded.SectorSize == 1 ? 4096 : 512);
+
+                            if(ecsdDecoded.NativeSectorSize == 0)
+                                physicalBlockSize = 512;
+                            else if(ecsdDecoded.NativeSectorSize == 1)
+                                physicalBlockSize = 4096;
+
+                            blocksToRead = (ushort)(ecsdDecoded.OptimalReadSize * 4096 / blockSize);
+
+                            if(blocksToRead == 0)
+                                blocksToRead = 128;
+
+                            // Supposing it's high-capacity MMC if it has Extended CSD...
+                            byteAddressed = false;
+                            mediaTags.Add(MediaTagType.MMC_ExtendedCSD, null);
+                        }
+                        else
+                        {
+                            _errorLog?.WriteLine("Read eCSD", _dev.Error, _dev.LastError, response);
+                            ecsd = null;
+                        }
+                    }
+                }
+                else
+                {
+                    _errorLog?.WriteLine("Read CSD", _dev.Error, _dev.LastError, response);
+                    csd = null;
+                }
+
+                UpdateStatus?.Invoke("Reading OCR");
+                _dumpLog.WriteLine("Reading OCR");
+                sense = _dev.ReadOcr(out ocr, out response, timeout, out duration);
 
                 if(sense)
                 {
-                    StoppingErrorMessage?.Invoke($"Error {_dev.LastError} reopening device.");
-
-                    return;
+                    _errorLog?.WriteLine("Read OCR", _dev.Error, _dev.LastError, response);
+                    ocr = null;
                 }
+                else
+                    mediaTags.Add(MediaTagType.MMC_OCR, null);
+
+                break;
             }
 
-            if(supportsCmd23 && blocksToRead > 1)
+            case DeviceType.SecureDigital:
             {
-                while(true)
+                UpdateStatus?.Invoke("Reading CSD");
+                _dumpLog.WriteLine("Reading CSD");
+                sense = _dev.ReadCsd(out csd, out response, timeout, out duration);
+
+                if(!sense)
                 {
-                    error = _dev.ReadWithBlockCount(out cmdBuf, out _, 0, blockSize, blocksToRead, byteAddressed,
-                                                    timeout, out duration);
+                    Decoders.SecureDigital.CSD csdDecoded = Decoders.SecureDigital.Decoders.DecodeCSD(csd);
 
-                    if(error)
-                        blocksToRead /= 2;
+                    blocks = (ulong)(csdDecoded.Structure == 0
+                                         ? (csdDecoded.Size + 1) * Math.Pow(2, csdDecoded.SizeMultiplier + 2)
+                                         : (csdDecoded.Size + 1) * 1024);
 
-                    if(!error ||
-                       blocksToRead == 1)
-                        break;
-                }
+                    blockSize = (uint)Math.Pow(2, csdDecoded.ReadBlockLength);
 
-                if(error)
-                {
-                    _dumpLog.WriteLine("ERROR: Cannot get blocks to read, device error {0}.", _dev.LastError);
+                    // Structure >=1 for SDHC/SDXC, so that's block addressed
+                    byteAddressed = csdDecoded.Structure == 0;
+                    mediaTags.Add(MediaTagType.SD_CSD, null);
 
-                    StoppingErrorMessage?.
-                        Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
+                    physicalBlockSize = blockSize;
 
-                    return;
-                }
-            }
-
-            if(_useBufferedReads && blocksToRead > 1 && !supportsCmd23)
-            {
-                while(true)
-                {
-                    error = _dev.BufferedOsRead(out cmdBuf, 0, blockSize * blocksToRead,
-                                                out duration);
-
-                    if(error)
-                        blocksToRead /= 2;
-
-                    if(!error ||
-                       blocksToRead == 1)
-                        break;
-
-                    // Device is in timeout, reopen to reset
-                    if(_dev.LastError == 110)
-                        sense = _dev.ReOpen();
-                }
-
-                if(error)
-                {
-                    UpdateStatus?.Invoke("Buffered OS reads are not working, trying direct commands.");
-                    _dumpLog.WriteLine("Buffered OS reads are not working, trying direct commands.");
-                    blocksToRead      = 1;
-                    _useBufferedReads = false;
-                }
-            }
-
-            if(!_useBufferedReads && blocksToRead > 1 && !supportsCmd23)
-            {
-                while(true)
-                {
-                    error = _dev.ReadMultipleUsingSingle(out cmdBuf, out _, 0, blockSize, blocksToRead,
-                                                         byteAddressed, timeout, out duration);
-
-                    if(error)
-                        blocksToRead /= 2;
-
-                    // Device is in timeout, reopen to reset
-                    if(_dev.LastError == 110)
-                        sense = _dev.ReOpen();
-
-                    if(!error ||
-                       blocksToRead == 1)
-                        break;
-                }
-
-                if(error)
-                {
-                    _dumpLog.WriteLine("ERROR: Cannot get blocks to read, device error {0}.", _dev.LastError);
-
-                    StoppingErrorMessage?.
-                        Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
-
-                    return;
-                }
-            }
-
-            if(blocksToRead == 1)
-            {
-                error = _dev.ReadSingleBlock(out cmdBuf, out _, 0, blockSize, byteAddressed, timeout,
-                                             out duration);
-
-                if(error)
-                {
-                    _dumpLog.WriteLine("ERROR: Could not read from device, device error {0}.", _dev.LastError);
-
-                    StoppingErrorMessage?.
-                        Invoke($"Device error {_dev.LastError} trying to read from device.");
-
-                    return;
-                }
-            }
-
-            if(supportsCmd23 || blocksToRead == 1)
-            {
-                UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
-                _dumpLog.WriteLine("Device can read {0} blocks at a time.", blocksToRead);
-            }
-            else if(_useBufferedReads)
-            {
-                UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time using OS buffered reads.");
-                _dumpLog.WriteLine("Device can read {0} blocks at a time using OS buffered reads.", blocksToRead);
-            }
-            else
-            {
-                UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks using sequential commands.");
-                _dumpLog.WriteLine("Device can read {0} blocks using sequential commands.", blocksToRead);
-            }
-
-            if(_skip < blocksToRead)
-                _skip = blocksToRead;
-
-            DumpHardwareType currentTry = null;
-            ExtentsULong     extents    = null;
-
-            ResumeSupport.Process(true, false, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial, _dev.PlatformId,
-                                  ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision, _private, _force);
-
-            if(currentTry == null ||
-               extents    == null)
-            {
-                StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
-
-                return;
-            }
-
-            bool ret = true;
-
-            foreach(MediaTagType tag in mediaTags.Keys.Where(tag => !outputFormat.SupportedMediaTags.Contains(tag)))
-            {
-                ret = false;
-                _dumpLog.WriteLine($"Output format does not support {tag}.");
-                ErrorMessage?.Invoke($"Output format does not support {tag}.");
-            }
-
-            if(!ret)
-            {
-                if(_force)
-                {
-                    _dumpLog.WriteLine("Several media tags not supported, continuing...");
-                    ErrorMessage?.Invoke("Several media tags not supported, continuing...");
+                    if(blockSize != 512)
+                    {
+                        uint ratio = blockSize / 512;
+                        blocks    *= ratio;
+                        blockSize =  512;
+                    }
                 }
                 else
                 {
-                    _dumpLog.WriteLine("Several media tags not supported, not continuing...");
-                    StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
-
-                    return;
+                    _errorLog?.WriteLine("Read CSD", _dev.Error, _dev.LastError, response);
+                    csd = null;
                 }
+
+                UpdateStatus?.Invoke("Reading OCR");
+                _dumpLog.WriteLine("Reading OCR");
+                sense = _dev.ReadSdocr(out ocr, out response, timeout, out duration);
+
+                if(sense)
+                {
+                    _errorLog?.WriteLine("Read OCR", _dev.Error, _dev.LastError, response);
+                    ocr = null;
+                }
+                else
+                    mediaTags.Add(MediaTagType.SD_OCR, null);
+
+                UpdateStatus?.Invoke("Reading SCR");
+                _dumpLog.WriteLine("Reading SCR");
+                sense = _dev.ReadScr(out scr, out response, timeout, out duration);
+
+                if(sense)
+                {
+                    _errorLog?.WriteLine("Read SCR", _dev.Error, _dev.LastError, response);
+                    scr = null;
+                }
+                else
+                {
+                    supportsCmd23 = Decoders.SecureDigital.Decoders.DecodeSCR(scr)?.CommandSupport.
+                                             HasFlag(CommandSupport.SetBlockCount) ?? false;
+
+                    mediaTags.Add(MediaTagType.SD_SCR, null);
+                }
+
+                break;
+            }
+        }
+
+        UpdateStatus?.Invoke("Reading CID");
+        _dumpLog.WriteLine("Reading CID");
+        sense = _dev.ReadCid(out byte[] cid, out response, timeout, out duration);
+
+        if(sense)
+        {
+            _errorLog?.WriteLine("Read CID", _dev.Error, _dev.LastError, response);
+            cid = null;
+        }
+        else
+            mediaTags.Add(_dev.Type == DeviceType.SecureDigital ? MediaTagType.SD_CID : MediaTagType.MMC_CID, null);
+
+        DateTime start;
+        DateTime end;
+        double   totalDuration = 0;
+        double   currentSpeed  = 0;
+        double   maxSpeed      = double.MinValue;
+        double   minSpeed      = double.MaxValue;
+
+        if(blocks == 0)
+        {
+            _dumpLog.WriteLine("Unable to get device size.");
+            StoppingErrorMessage?.Invoke("Unable to get device size.");
+
+            return;
+        }
+
+        UpdateStatus?.Invoke($"Device reports {blocks} blocks.");
+        _dumpLog.WriteLine("Device reports {0} blocks.", blocks);
+
+        byte[] cmdBuf;
+        bool   error;
+
+        if(blocksToRead > _maximumReadable)
+            blocksToRead = (ushort)_maximumReadable;
+
+        if(supportsCmd23 && blocksToRead > 1)
+        {
+            sense = _dev.ReadWithBlockCount(out cmdBuf, out _, 0, blockSize, 1, byteAddressed, timeout,
+                                            out duration);
+
+            if(sense || _dev.Error)
+                supportsCmd23 = false;
+
+            // Need to restart device, otherwise is it just busy streaming data with no one listening
+            sense = _dev.ReOpen();
+
+            if(sense)
+            {
+                StoppingErrorMessage?.Invoke($"Error {_dev.LastError} reopening device.");
+
+                return;
+            }
+        }
+
+        if(supportsCmd23 && blocksToRead > 1)
+        {
+            while(true)
+            {
+                error = _dev.ReadWithBlockCount(out cmdBuf, out _, 0, blockSize, blocksToRead, byteAddressed,
+                                                timeout, out duration);
+
+                if(error)
+                    blocksToRead /= 2;
+
+                if(!error ||
+                   blocksToRead == 1)
+                    break;
             }
 
-            var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
-            var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", sdProfile);
-
-            ret = outputFormat.Create(_outputPath,
-                                       _dev.Type == DeviceType.SecureDigital ? MediaType.SecureDigital : MediaType.MMC,
-                                       _formatOptions, blocks, blockSize);
-
-            // Cannot create image
-            if(!ret)
+            if(error)
             {
-                _dumpLog.WriteLine("Error creating output image, not continuing.");
-                _dumpLog.WriteLine(outputFormat.ErrorMessage);
+                _dumpLog.WriteLine("ERROR: Cannot get blocks to read, device error {0}.", _dev.LastError);
 
-                StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
+                StoppingErrorMessage?.
+                    Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
+
+                return;
+            }
+        }
+
+        if(_useBufferedReads && blocksToRead > 1 && !supportsCmd23)
+        {
+            while(true)
+            {
+                error = _dev.BufferedOsRead(out cmdBuf, 0, blockSize * blocksToRead,
+                                            out duration);
+
+                if(error)
+                    blocksToRead /= 2;
+
+                if(!error ||
+                   blocksToRead == 1)
+                    break;
+
+                // Device is in timeout, reopen to reset
+                if(_dev.LastError == 110)
+                    sense = _dev.ReOpen();
+            }
+
+            if(error)
+            {
+                UpdateStatus?.Invoke("Buffered OS reads are not working, trying direct commands.");
+                _dumpLog.WriteLine("Buffered OS reads are not working, trying direct commands.");
+                blocksToRead      = 1;
+                _useBufferedReads = false;
+            }
+        }
+
+        if(!_useBufferedReads && blocksToRead > 1 && !supportsCmd23)
+        {
+            while(true)
+            {
+                error = _dev.ReadMultipleUsingSingle(out cmdBuf, out _, 0, blockSize, blocksToRead,
+                                                     byteAddressed, timeout, out duration);
+
+                if(error)
+                    blocksToRead /= 2;
+
+                // Device is in timeout, reopen to reset
+                if(_dev.LastError == 110)
+                    sense = _dev.ReOpen();
+
+                if(!error ||
+                   blocksToRead == 1)
+                    break;
+            }
+
+            if(error)
+            {
+                _dumpLog.WriteLine("ERROR: Cannot get blocks to read, device error {0}.", _dev.LastError);
+
+                StoppingErrorMessage?.
+                    Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
+
+                return;
+            }
+        }
+
+        if(blocksToRead == 1)
+        {
+            error = _dev.ReadSingleBlock(out cmdBuf, out _, 0, blockSize, byteAddressed, timeout,
+                                         out duration);
+
+            if(error)
+            {
+                _dumpLog.WriteLine("ERROR: Could not read from device, device error {0}.", _dev.LastError);
+
+                StoppingErrorMessage?.
+                    Invoke($"Device error {_dev.LastError} trying to read from device.");
+
+                return;
+            }
+        }
+
+        if(supportsCmd23 || blocksToRead == 1)
+        {
+            UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time.");
+            _dumpLog.WriteLine("Device can read {0} blocks at a time.", blocksToRead);
+        }
+        else if(_useBufferedReads)
+        {
+            UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks at a time using OS buffered reads.");
+            _dumpLog.WriteLine("Device can read {0} blocks at a time using OS buffered reads.", blocksToRead);
+        }
+        else
+        {
+            UpdateStatus?.Invoke($"Device can read {blocksToRead} blocks using sequential commands.");
+            _dumpLog.WriteLine("Device can read {0} blocks using sequential commands.", blocksToRead);
+        }
+
+        if(_skip < blocksToRead)
+            _skip = blocksToRead;
+
+        DumpHardwareType currentTry = null;
+        ExtentsULong     extents    = null;
+
+        ResumeSupport.Process(true, false, blocks, _dev.Manufacturer, _dev.Model, _dev.Serial, _dev.PlatformId,
+                              ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision, _private, _force);
+
+        if(currentTry == null ||
+           extents    == null)
+        {
+            StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
+
+            return;
+        }
+
+        bool ret = true;
+
+        foreach(MediaTagType tag in mediaTags.Keys.Where(tag => !outputFormat.SupportedMediaTags.Contains(tag)))
+        {
+            ret = false;
+            _dumpLog.WriteLine($"Output format does not support {tag}.");
+            ErrorMessage?.Invoke($"Output format does not support {tag}.");
+        }
+
+        if(!ret)
+        {
+            if(_force)
+            {
+                _dumpLog.WriteLine("Several media tags not supported, continuing...");
+                ErrorMessage?.Invoke("Several media tags not supported, continuing...");
+            }
+            else
+            {
+                _dumpLog.WriteLine("Several media tags not supported, not continuing...");
+                StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
+
+                return;
+            }
+        }
+
+        var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
+        var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", sdProfile);
+
+        ret = outputFormat.Create(_outputPath,
+                                  _dev.Type == DeviceType.SecureDigital ? MediaType.SecureDigital : MediaType.MMC,
+                                  _formatOptions, blocks, blockSize);
+
+        // Cannot create image
+        if(!ret)
+        {
+            _dumpLog.WriteLine("Error creating output image, not continuing.");
+            _dumpLog.WriteLine(outputFormat.ErrorMessage);
+
+            StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
+                                         outputFormat.ErrorMessage);
+
+            return;
+        }
+
+        if(cid != null)
+        {
+            if(_dev.Type == DeviceType.SecureDigital && _private)
+            {
+                // Clear serial number and manufacturing date
+                cid[9]  = 0;
+                cid[10] = 0;
+                cid[11] = 0;
+                cid[12] = 0;
+                cid[13] = 0;
+                cid[14] = 0;
+            }
+            else if(_dev.Type == DeviceType.MMC && _private)
+            {
+                // Clear serial number and manufacturing date
+                cid[10] = 0;
+                cid[11] = 0;
+                cid[12] = 0;
+                cid[13] = 0;
+                cid[14] = 0;
+            }
+
+            ret =
+                outputFormat.WriteMediaTag(cid,
+                                           _dev.Type == DeviceType.SecureDigital ? MediaTagType.SD_CID
+                                               : MediaTagType.MMC_CID);
+
+            // Cannot write CID to image
+            if(!ret &&
+               !_force)
+            {
+                _dumpLog.WriteLine("Cannot write CID to output image.");
+
+                StoppingErrorMessage?.Invoke("Cannot write CID to output image." + Environment.NewLine +
                                              outputFormat.ErrorMessage);
 
                 return;
             }
+        }
 
-            if(cid != null)
+        if(csd != null)
+        {
+            ret =
+                outputFormat.WriteMediaTag(csd,
+                                           _dev.Type == DeviceType.SecureDigital ? MediaTagType.SD_CSD
+                                               : MediaTagType.MMC_CSD);
+
+            // Cannot write CSD to image
+            if(!ret &&
+               !_force)
             {
-                if(_dev.Type == DeviceType.SecureDigital && _private)
-                {
-                    // Clear serial number and manufacturing date
-                    cid[9]  = 0;
-                    cid[10] = 0;
-                    cid[11] = 0;
-                    cid[12] = 0;
-                    cid[13] = 0;
-                    cid[14] = 0;
-                }
-                else if(_dev.Type == DeviceType.MMC && _private)
-                {
-                    // Clear serial number and manufacturing date
-                    cid[10] = 0;
-                    cid[11] = 0;
-                    cid[12] = 0;
-                    cid[13] = 0;
-                    cid[14] = 0;
-                }
+                _dumpLog.WriteLine("Cannot write CSD to output image.");
 
-                ret =
-                    outputFormat.WriteMediaTag(cid,
-                                                _dev.Type == DeviceType.SecureDigital ? MediaTagType.SD_CID
-                                                    : MediaTagType.MMC_CID);
+                StoppingErrorMessage?.Invoke("Cannot write CSD to output image." + Environment.NewLine +
+                                             outputFormat.ErrorMessage);
 
-                // Cannot write CID to image
-                if(!ret &&
-                   !_force)
-                {
-                    _dumpLog.WriteLine("Cannot write CID to output image.");
+                return;
+            }
+        }
 
-                    StoppingErrorMessage?.Invoke("Cannot write CID to output image." + Environment.NewLine +
-                                                 outputFormat.ErrorMessage);
+        if(ecsd != null)
+        {
+            ret = outputFormat.WriteMediaTag(ecsd, MediaTagType.MMC_ExtendedCSD);
 
-                    return;
-                }
+            // Cannot write Extended CSD to image
+            if(!ret &&
+               !_force)
+            {
+                _dumpLog.WriteLine("Cannot write Extended CSD to output image.");
+
+                StoppingErrorMessage?.Invoke("Cannot write Extended CSD to output image." + Environment.NewLine +
+                                             outputFormat.ErrorMessage);
+
+                return;
+            }
+        }
+
+        if(ocr != null)
+        {
+            ret =
+                outputFormat.WriteMediaTag(ocr,
+                                           _dev.Type == DeviceType.SecureDigital ? MediaTagType.SD_OCR
+                                               : MediaTagType.MMC_OCR);
+
+            // Cannot write OCR to image
+            if(!ret &&
+               !_force)
+            {
+                _dumpLog.WriteLine("Cannot write OCR to output image.");
+
+                StoppingErrorMessage?.Invoke("Cannot write OCR to output image." + Environment.NewLine +
+                                             outputFormat.ErrorMessage);
+
+                return;
+            }
+        }
+
+        if(scr != null)
+        {
+            ret = outputFormat.WriteMediaTag(scr, MediaTagType.SD_SCR);
+
+            // Cannot write SCR to image
+            if(!ret &&
+               !_force)
+            {
+                _dumpLog.WriteLine("Cannot write SCR to output image.");
+
+                StoppingErrorMessage?.Invoke("Cannot write SCR to output image." + Environment.NewLine +
+                                             outputFormat.ErrorMessage);
+
+                return;
+            }
+        }
+
+        if(_resume.NextBlock > 0)
+        {
+            UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
+            _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
+        }
+
+        start = DateTime.UtcNow;
+        double   imageWriteDuration = 0;
+        bool     newTrim            = false;
+        DateTime timeSpeedStart     = DateTime.UtcNow;
+        ulong    sectorSpeedStart   = 0;
+
+        InitProgress?.Invoke();
+
+        for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
+        {
+            if(_aborted)
+            {
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
+
+                break;
             }
 
-            if(csd != null)
+            if(blocks - i < blocksToRead)
+                blocksToRead = (byte)(blocks - i);
+
+            if(currentSpeed > maxSpeed &&
+               currentSpeed > 0)
+                maxSpeed = currentSpeed;
+
+            if(currentSpeed < minSpeed &&
+               currentSpeed > 0)
+                minSpeed = currentSpeed;
+
+            UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
+                                   (long)blocks);
+
+            if(blocksToRead == 1)
+                error = _dev.ReadSingleBlock(out cmdBuf, out _, (uint)i, blockSize, byteAddressed, timeout,
+                                             out duration);
+            else if(supportsCmd23)
+                error = _dev.ReadWithBlockCount(out cmdBuf, out _, (uint)i, blockSize, blocksToRead, byteAddressed,
+                                                timeout, out duration);
+            else if(_useBufferedReads)
+                error = _dev.BufferedOsRead(out cmdBuf, (long)(i * blockSize), blockSize * blocksToRead,
+                                            out duration);
+            else
+                error = _dev.ReadMultipleUsingSingle(out cmdBuf, out _, (uint)i, blockSize, blocksToRead,
+                                                     byteAddressed, timeout, out duration);
+
+            if(!error)
             {
-                ret =
-                    outputFormat.WriteMediaTag(csd,
-                                                _dev.Type == DeviceType.SecureDigital ? MediaTagType.SD_CSD
-                                                    : MediaTagType.MMC_CSD);
+                mhddLog.Write(i, duration);
+                ibgLog.Write(i, currentSpeed * 1024);
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(cmdBuf, i, blocksToRead);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                extents.Add(i, blocksToRead, true);
+            }
+            else
+            {
+                _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, byteAddressed, response);
 
-                // Cannot write CSD to image
-                if(!ret &&
-                   !_force)
-                {
-                    _dumpLog.WriteLine("Cannot write CSD to output image.");
+                if(i + _skip > blocks)
+                    _skip = (uint)(blocks - i);
 
-                    StoppingErrorMessage?.Invoke("Cannot write CSD to output image." + Environment.NewLine +
-                                                 outputFormat.ErrorMessage);
+                for(ulong b = i; b < i + _skip; b++)
+                    _resume.BadBlocks.Add(b);
 
-                    return;
-                }
+                mhddLog.Write(i, duration < 500 ? 65535 : duration);
+
+                ibgLog.Write(i, 0);
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
+                i       += _skip - blocksToRead;
+                newTrim =  true;
             }
 
-            if(ecsd != null)
-            {
-                ret = outputFormat.WriteMediaTag(ecsd, MediaTagType.MMC_ExtendedCSD);
+            sectorSpeedStart  += blocksToRead;
+            _resume.NextBlock =  i + blocksToRead;
 
-                // Cannot write Extended CSD to image
-                if(!ret &&
-                   !_force)
-                {
-                    _dumpLog.WriteLine("Cannot write Extended CSD to output image.");
+            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
 
-                    StoppingErrorMessage?.Invoke("Cannot write Extended CSD to output image." + Environment.NewLine +
-                                                 outputFormat.ErrorMessage);
+            if(elapsed <= 0)
+                continue;
 
-                    return;
-                }
-            }
+            currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+            sectorSpeedStart = 0;
+            timeSpeedStart   = DateTime.UtcNow;
+        }
 
-            if(ocr != null)
-            {
-                ret =
-                    outputFormat.WriteMediaTag(ocr,
-                                                _dev.Type == DeviceType.SecureDigital ? MediaTagType.SD_OCR
-                                                    : MediaTagType.MMC_OCR);
+        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
 
-                // Cannot write OCR to image
-                if(!ret &&
-                   !_force)
-                {
-                    _dumpLog.WriteLine("Cannot write OCR to output image.");
+        end = DateTime.Now;
+        EndProgress?.Invoke();
+        mhddLog.Close();
 
-                    StoppingErrorMessage?.Invoke("Cannot write OCR to output image." + Environment.NewLine +
-                                                 outputFormat.ErrorMessage);
+        ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                     blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
 
-                    return;
-                }
-            }
+        UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
 
-            if(scr != null)
-            {
-                ret = outputFormat.WriteMediaTag(scr, MediaTagType.SD_SCR);
+        UpdateStatus?.
+            Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
 
-                // Cannot write SCR to image
-                if(!ret &&
-                   !_force)
-                {
-                    _dumpLog.WriteLine("Cannot write SCR to output image.");
+        UpdateStatus?.
+            Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
 
-                    StoppingErrorMessage?.Invoke("Cannot write SCR to output image." + Environment.NewLine +
-                                                 outputFormat.ErrorMessage);
+        _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
 
-                    return;
-                }
-            }
+        _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
 
-            if(_resume.NextBlock > 0)
-            {
-                UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
-                _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
-            }
+        _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
 
+        #region Trimming
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _trim                       &&
+           newTrim)
+        {
             start = DateTime.UtcNow;
-            double   imageWriteDuration = 0;
-            bool     newTrim            = false;
-            DateTime timeSpeedStart     = DateTime.UtcNow;
-            ulong    sectorSpeedStart   = 0;
+            UpdateStatus?.Invoke("Trimming skipped sectors");
+            _dumpLog.WriteLine("Trimming skipped sectors");
 
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
             InitProgress?.Invoke();
 
-            for(ulong i = _resume.NextBlock; i < blocks; i += blocksToRead)
+            foreach(ulong badSector in tmpArray)
             {
                 if(_aborted)
                 {
@@ -604,373 +723,253 @@ namespace Aaru.Core.Devices.Dumping
                     break;
                 }
 
-                if(blocks - i < blocksToRead)
-                    blocksToRead = (byte)(blocks - i);
+                PulseProgress?.Invoke($"Trimming sector {badSector}");
 
-                if(currentSpeed > maxSpeed &&
-                   currentSpeed > 0)
-                    maxSpeed = currentSpeed;
+                error = _dev.ReadSingleBlock(out cmdBuf, out response, (uint)badSector, blockSize, byteAddressed,
+                                             timeout, out duration);
 
-                if(currentSpeed < minSpeed &&
-                   currentSpeed > 0)
-                    minSpeed = currentSpeed;
+                totalDuration += duration;
 
-                UpdateProgress?.Invoke($"Reading sector {i} of {blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
-                                       (long)blocks);
+                if(error)
+                {
+                    _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, byteAddressed, response);
 
-                if(blocksToRead == 1)
-                    error = _dev.ReadSingleBlock(out cmdBuf, out _, (uint)i, blockSize, byteAddressed, timeout,
-                                                 out duration);
-                else if(supportsCmd23)
-                    error = _dev.ReadWithBlockCount(out cmdBuf, out _, (uint)i, blockSize, blocksToRead, byteAddressed,
-                                                    timeout, out duration);
-                else if(_useBufferedReads)
-                    error = _dev.BufferedOsRead(out cmdBuf, (long)(i * blockSize), blockSize * blocksToRead,
-                                                out duration);
-                else
-                    error = _dev.ReadMultipleUsingSingle(out cmdBuf, out _, (uint)i, blockSize, blocksToRead,
-                                                         byteAddressed, timeout, out duration);
+                    continue;
+                }
+
+                _resume.BadBlocks.Remove(badSector);
+                extents.Add(badSector);
+                outputFormat.WriteSector(cmdBuf, badSector);
+            }
+
+            EndProgress?.Invoke();
+            end = DateTime.UtcNow;
+            UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
+            _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+        }
+        #endregion Trimming
+
+        #region Error handling
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _retryPasses > 0)
+        {
+            int  pass              = 1;
+            bool forward           = true;
+            bool runningPersistent = false;
+
+            InitProgress?.Invoke();
+            repeatRetryLba:
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
+
+            foreach(ulong badSector in tmpArray)
+            {
+                if(_aborted)
+                {
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                    UpdateStatus?.Invoke("Aborted!");
+                    _dumpLog.WriteLine("Aborted!");
+
+                    break;
+                }
+
+                PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
+                                                    forward ? "forward" : "reverse",
+                                                    runningPersistent ? "recovering partial data, " : ""));
+
+                error = _dev.ReadSingleBlock(out cmdBuf, out response, (uint)badSector, blockSize, byteAddressed,
+                                             timeout, out duration);
+
+                totalDuration += duration;
+
+                if(error)
+                    _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, byteAddressed, response);
 
                 if(!error)
                 {
-                    mhddLog.Write(i, duration);
-                    ibgLog.Write(i, currentSpeed * 1024);
-                    DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(cmdBuf, i, blocksToRead);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                    extents.Add(i, blocksToRead, true);
-                }
-                else
-                {
-                    _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, byteAddressed, response);
-
-                    if(i + _skip > blocks)
-                        _skip = (uint)(blocks - i);
-
-                    for(ulong b = i; b < i + _skip; b++)
-                        _resume.BadBlocks.Add(b);
-
-                    mhddLog.Write(i, duration < 500 ? 65535 : duration);
-
-                    ibgLog.Write(i, 0);
-                    DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                    _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
-                    i       += _skip - blocksToRead;
-                    newTrim =  true;
-                }
-
-                sectorSpeedStart  += blocksToRead;
-                _resume.NextBlock =  i + blocksToRead;
-
-                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                if(elapsed <= 0)
-                    continue;
-
-                currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                sectorSpeedStart = 0;
-                timeSpeedStart   = DateTime.UtcNow;
-            }
-
-            _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
-
-            end = DateTime.Now;
-            EndProgress?.Invoke();
-            mhddLog.Close();
-
-            ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                         blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
-
-            UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
-
-            UpdateStatus?.
-                Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
-
-            UpdateStatus?.
-                Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
-
-            _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
-
-            _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
-
-            _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
-
-            #region Trimming
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _trim                       &&
-               newTrim)
-            {
-                start = DateTime.UtcNow;
-                UpdateStatus?.Invoke("Trimming skipped sectors");
-                _dumpLog.WriteLine("Trimming skipped sectors");
-
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
-                InitProgress?.Invoke();
-
-                foreach(ulong badSector in tmpArray)
-                {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    PulseProgress?.Invoke($"Trimming sector {badSector}");
-
-                    error = _dev.ReadSingleBlock(out cmdBuf, out response, (uint)badSector, blockSize, byteAddressed,
-                                                 timeout, out duration);
-
-                    totalDuration += duration;
-
-                    if(error)
-                    {
-                        _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, byteAddressed, response);
-
-                        continue;
-                    }
-
                     _resume.BadBlocks.Remove(badSector);
                     extents.Add(badSector);
                     outputFormat.WriteSector(cmdBuf, badSector);
+                    UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
+                    _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
                 }
-
-                EndProgress?.Invoke();
-                end = DateTime.UtcNow;
-                UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
-                _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
-            }
-            #endregion Trimming
-
-            #region Error handling
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _retryPasses > 0)
-            {
-                int  pass              = 1;
-                bool forward           = true;
-                bool runningPersistent = false;
-
-                InitProgress?.Invoke();
-                repeatRetryLba:
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
-
-                foreach(ulong badSector in tmpArray)
-                {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
-                                                        forward ? "forward" : "reverse",
-                                                        runningPersistent ? "recovering partial data, " : ""));
-
-                    error = _dev.ReadSingleBlock(out cmdBuf, out response, (uint)badSector, blockSize, byteAddressed,
-                                                 timeout, out duration);
-
-                    totalDuration += duration;
-
-                    if(error)
-                        _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, byteAddressed, response);
-
-                    if(!error)
-                    {
-                        _resume.BadBlocks.Remove(badSector);
-                        extents.Add(badSector);
-                        outputFormat.WriteSector(cmdBuf, badSector);
-                        UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
-                        _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
-                    }
-                    else if(runningPersistent)
-                        outputFormat.WriteSector(cmdBuf, badSector);
-                }
-
-                if(pass < _retryPasses &&
-                   !_aborted           &&
-                   _resume.BadBlocks.Count > 0)
-                {
-                    pass++;
-                    forward = !forward;
-                    _resume.BadBlocks.Sort();
-
-                    if(!forward)
-                        _resume.BadBlocks.Reverse();
-
-                    goto repeatRetryLba;
-                }
-
-                EndProgress?.Invoke();
-            }
-            #endregion Error handling
-
-            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-
-            outputFormat.SetDumpHardware(_resume.Tries);
-
-            // TODO: Drive info
-            var metadata = new CommonTypes.Structs.ImageInfo
-            {
-                Application        = "Aaru",
-                ApplicationVersion = Version.GetVersion()
-            };
-
-            if(!outputFormat.SetMetadata(metadata))
-                ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
-                                     outputFormat.ErrorMessage);
-
-            if(_preSidecar != null)
-                outputFormat.SetCicmMetadata(_preSidecar);
-
-            _dumpLog.WriteLine("Closing output file.");
-            UpdateStatus?.Invoke("Closing output file.");
-            DateTime closeStart = DateTime.Now;
-            outputFormat.Close();
-            DateTime closeEnd = DateTime.Now;
-            UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
-            _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
-
-            if(_aborted)
-            {
-                UpdateStatus?.Invoke("Aborted!");
-                _dumpLog.WriteLine("Aborted!");
-
-                return;
+                else if(runningPersistent)
+                    outputFormat.WriteSector(cmdBuf, badSector);
             }
 
-            double totalChkDuration = 0;
-
-            if(_metadata)
+            if(pass < _retryPasses &&
+               !_aborted           &&
+               _resume.BadBlocks.Count > 0)
             {
-                UpdateStatus?.Invoke("Creating sidecar.");
-                _dumpLog.WriteLine("Creating sidecar.");
-                var         filters     = new FiltersList();
-                IFilter     filter      = filters.GetFilter(_outputPath);
-                IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
-                ErrorNumber opened      = inputPlugin.Open(filter);
-
-                if(opened != ErrorNumber.NoError)
-                    StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
-
-                DateTime chkStart = DateTime.UtcNow;
-                _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
-                _sidecarClass.InitProgressEvent    += InitProgress;
-                _sidecarClass.UpdateProgressEvent  += UpdateProgress;
-                _sidecarClass.EndProgressEvent     += EndProgress;
-                _sidecarClass.InitProgressEvent2   += InitProgress2;
-                _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
-                _sidecarClass.EndProgressEvent2    += EndProgress2;
-                _sidecarClass.UpdateStatusEvent    += UpdateStatus;
-                CICMMetadataType sidecar = _sidecarClass.Create();
-
-                if(!_aborted)
-                {
-                    if(_preSidecar != null)
-                    {
-                        _preSidecar.BlockMedia = sidecar.BlockMedia;
-                        sidecar                = _preSidecar;
-                    }
-
-                    end = DateTime.UtcNow;
-
-                    totalChkDuration = (end - chkStart).TotalMilliseconds;
-                    UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds.");
-
-                    UpdateStatus?.
-                        Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
-
-                    _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
-
-                    _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
-                                       blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
-
-                    (string type, string subType) xmlType = (null, null);
-
-                    switch(_dev.Type)
-                    {
-                        case DeviceType.MMC:
-                            xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.MMC);
-
-                            sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(MediaType.MMC);
-
-                            break;
-                        case DeviceType.SecureDigital:
-                            CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.SecureDigital);
-
-                            sidecar.BlockMedia[0].Dimensions =
-                                Dimensions.DimensionsFromMediaType(MediaType.SecureDigital);
-
-                            break;
-                    }
-
-                    sidecar.BlockMedia[0].DiskType    = xmlType.type;
-                    sidecar.BlockMedia[0].DiskSubType = xmlType.subType;
-
-                    // TODO: Implement device firmware revision
-                    sidecar.BlockMedia[0].LogicalBlocks     = blocks;
-                    sidecar.BlockMedia[0].PhysicalBlockSize = physicalBlockSize > 0 ? physicalBlockSize : blockSize;
-                    sidecar.BlockMedia[0].LogicalBlockSize  = blockSize;
-                    sidecar.BlockMedia[0].Manufacturer      = _dev.Manufacturer;
-                    sidecar.BlockMedia[0].Model             = _dev.Model;
-
-                    if(!_private)
-                        sidecar.BlockMedia[0].Serial = _dev.Serial;
-
-                    sidecar.BlockMedia[0].Size = blocks * blockSize;
-
-                    UpdateStatus?.Invoke("Writing metadata sidecar");
-
-                    var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
-
-                    var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
-                    xmlSer.Serialize(xmlFs, sidecar);
-                    xmlFs.Close();
-                }
-            }
-
-            UpdateStatus?.Invoke("");
-
-            UpdateStatus?.
-                Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
-
-            UpdateStatus?.
-                Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
-
-            if(maxSpeed > 0)
-                UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
-
-            if(minSpeed > 0 &&
-               minSpeed < double.MaxValue)
-                UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
-
-            UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
-            UpdateStatus?.Invoke("");
-
-            if(_resume.BadBlocks.Count > 0)
+                pass++;
+                forward = !forward;
                 _resume.BadBlocks.Sort();
 
-            switch(_dev.Type)
-            {
-                case DeviceType.MMC:
-                    Statistics.AddMedia(MediaType.MMC, true);
+                if(!forward)
+                    _resume.BadBlocks.Reverse();
 
-                    break;
-                case DeviceType.SecureDigital:
-                    Statistics.AddMedia(MediaType.SecureDigital, true);
-
-                    break;
+                goto repeatRetryLba;
             }
+
+            EndProgress?.Invoke();
+        }
+        #endregion Error handling
+
+        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+
+        outputFormat.SetDumpHardware(_resume.Tries);
+
+        // TODO: Drive info
+        var metadata = new CommonTypes.Structs.ImageInfo
+        {
+            Application        = "Aaru",
+            ApplicationVersion = Version.GetVersion()
+        };
+
+        if(!outputFormat.SetMetadata(metadata))
+            ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
+                                 outputFormat.ErrorMessage);
+
+        if(_preSidecar != null)
+            outputFormat.SetCicmMetadata(_preSidecar);
+
+        _dumpLog.WriteLine("Closing output file.");
+        UpdateStatus?.Invoke("Closing output file.");
+        DateTime closeStart = DateTime.Now;
+        outputFormat.Close();
+        DateTime closeEnd = DateTime.Now;
+        UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
+        _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
+
+        if(_aborted)
+        {
+            UpdateStatus?.Invoke("Aborted!");
+            _dumpLog.WriteLine("Aborted!");
+
+            return;
+        }
+
+        double totalChkDuration = 0;
+
+        if(_metadata)
+        {
+            UpdateStatus?.Invoke("Creating sidecar.");
+            _dumpLog.WriteLine("Creating sidecar.");
+            var         filters     = new FiltersList();
+            IFilter     filter      = filters.GetFilter(_outputPath);
+            IMediaImage inputPlugin = ImageFormat.Detect(filter) as IMediaImage;
+            ErrorNumber opened      = inputPlugin.Open(filter);
+
+            if(opened != ErrorNumber.NoError)
+                StoppingErrorMessage?.Invoke($"Error {opened} opening created image.");
+
+            DateTime chkStart = DateTime.UtcNow;
+            _sidecarClass                      =  new Sidecar(inputPlugin, _outputPath, filter.Id, _encoding);
+            _sidecarClass.InitProgressEvent    += InitProgress;
+            _sidecarClass.UpdateProgressEvent  += UpdateProgress;
+            _sidecarClass.EndProgressEvent     += EndProgress;
+            _sidecarClass.InitProgressEvent2   += InitProgress2;
+            _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
+            _sidecarClass.EndProgressEvent2    += EndProgress2;
+            _sidecarClass.UpdateStatusEvent    += UpdateStatus;
+            CICMMetadataType sidecar = _sidecarClass.Create();
+
+            if(!_aborted)
+            {
+                if(_preSidecar != null)
+                {
+                    _preSidecar.BlockMedia = sidecar.BlockMedia;
+                    sidecar                = _preSidecar;
+                }
+
+                end = DateTime.UtcNow;
+
+                totalChkDuration = (end - chkStart).TotalMilliseconds;
+                UpdateStatus?.Invoke($"Sidecar created in {(end - chkStart).TotalSeconds} seconds.");
+
+                UpdateStatus?.
+                    Invoke($"Average checksum speed {blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000):F3} KiB/sec.");
+
+                _dumpLog.WriteLine("Sidecar created in {0} seconds.", (end - chkStart).TotalSeconds);
+
+                _dumpLog.WriteLine("Average checksum speed {0:F3} KiB/sec.",
+                                   blockSize * (double)(blocks + 1) / 1024 / (totalChkDuration / 1000));
+
+                (string type, string subType) xmlType = (null, null);
+
+                switch(_dev.Type)
+                {
+                    case DeviceType.MMC:
+                        xmlType = CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.MMC);
+
+                        sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(MediaType.MMC);
+
+                        break;
+                    case DeviceType.SecureDigital:
+                        CommonTypes.Metadata.MediaType.MediaTypeToString(MediaType.SecureDigital);
+
+                        sidecar.BlockMedia[0].Dimensions =
+                            Dimensions.DimensionsFromMediaType(MediaType.SecureDigital);
+
+                        break;
+                }
+
+                sidecar.BlockMedia[0].DiskType    = xmlType.type;
+                sidecar.BlockMedia[0].DiskSubType = xmlType.subType;
+
+                // TODO: Implement device firmware revision
+                sidecar.BlockMedia[0].LogicalBlocks     = blocks;
+                sidecar.BlockMedia[0].PhysicalBlockSize = physicalBlockSize > 0 ? physicalBlockSize : blockSize;
+                sidecar.BlockMedia[0].LogicalBlockSize  = blockSize;
+                sidecar.BlockMedia[0].Manufacturer      = _dev.Manufacturer;
+                sidecar.BlockMedia[0].Model             = _dev.Model;
+
+                if(!_private)
+                    sidecar.BlockMedia[0].Serial = _dev.Serial;
+
+                sidecar.BlockMedia[0].Size = blocks * blockSize;
+
+                UpdateStatus?.Invoke("Writing metadata sidecar");
+
+                var xmlFs = new FileStream(_outputPrefix + ".cicm.xml", FileMode.Create);
+
+                var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
+                xmlSer.Serialize(xmlFs, sidecar);
+                xmlFs.Close();
+            }
+        }
+
+        UpdateStatus?.Invoke("");
+
+        UpdateStatus?.
+            Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+
+        UpdateStatus?.
+            Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+
+        if(maxSpeed > 0)
+            UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+
+        if(minSpeed > 0 &&
+           minSpeed < double.MaxValue)
+            UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+
+        UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
+        UpdateStatus?.Invoke("");
+
+        if(_resume.BadBlocks.Count > 0)
+            _resume.BadBlocks.Sort();
+
+        switch(_dev.Type)
+        {
+            case DeviceType.MMC:
+                Statistics.AddMedia(MediaType.MMC, true);
+
+                break;
+            case DeviceType.SecureDigital:
+                Statistics.AddMedia(MediaType.SecureDigital, true);
+
+                break;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Dumping/XGD.cs b/Aaru.Core/Devices/Dumping/XGD.cs
index 6db095c68..4d41794ce 100644
--- a/Aaru.Core/Devices/Dumping/XGD.cs
+++ b/Aaru.Core/Devices/Dumping/XGD.cs
@@ -53,666 +53,531 @@ using Version = Aaru.CommonTypes.Interop.Version;
 
 // ReSharper disable JoinDeclarationAndInitializer
 
-namespace Aaru.Core.Devices.Dumping
+namespace Aaru.Core.Devices.Dumping;
+
+/// <summary>Implements dumping an Xbox Game Disc using a Kreon drive</summary>
+partial class Dump
 {
-    /// <summary>Implements dumping an Xbox Game Disc using a Kreon drive</summary>
-    partial class Dump
+    /// <summary>Dumps an Xbox Game Disc using a Kreon drive</summary>
+    /// <param name="mediaTags">Media tags as retrieved in MMC layer</param>
+    /// <param name="dskType">Disc type as detected in MMC layer</param>
+    void Xgd(Dictionary<MediaTagType, byte[]> mediaTags, MediaType dskType)
     {
-        /// <summary>Dumps an Xbox Game Disc using a Kreon drive</summary>
-        /// <param name="mediaTags">Media tags as retrieved in MMC layer</param>
-        /// <param name="dskType">Disc type as detected in MMC layer</param>
-        void Xgd(Dictionary<MediaTagType, byte[]> mediaTags, MediaType dskType)
+        bool       sense;
+        const uint blockSize    = 2048;
+        uint       blocksToRead = 64;
+        DateTime   start;
+        DateTime   end;
+        double     totalDuration = 0;
+        double     currentSpeed  = 0;
+        double     maxSpeed      = double.MinValue;
+        double     minSpeed      = double.MaxValue;
+        var        outputFormat  = _outputPlugin as IWritableImage;
+
+        if(DetectOS.GetRealPlatformID() != PlatformID.Win32NT)
         {
-            bool       sense;
-            const uint blockSize    = 2048;
-            uint       blocksToRead = 64;
-            DateTime   start;
-            DateTime   end;
-            double     totalDuration = 0;
-            double     currentSpeed  = 0;
-            double     maxSpeed      = double.MinValue;
-            double     minSpeed      = double.MaxValue;
-            var        outputFormat  = _outputPlugin as IWritableImage;
+            bool isAdmin = _dev.IsRemote ? _dev.IsRemoteAdmin : DetectOS.IsAdmin;
 
-            if(DetectOS.GetRealPlatformID() != PlatformID.Win32NT)
+            if(!isAdmin)
             {
-                bool isAdmin = _dev.IsRemote ? _dev.IsRemoteAdmin : DetectOS.IsAdmin;
+                AaruConsole.
+                    ErrorWriteLine("Because of the commands sent to a device, dumping XGD must be done with administrative privileges. Cannot continue.");
 
-                if(!isAdmin)
-                {
-                    AaruConsole.
-                        ErrorWriteLine("Because of the commands sent to a device, dumping XGD must be done with administrative privileges. Cannot continue.");
-
-                    _dumpLog.WriteLine("Cannot dump XGD without administrative privileges.");
-
-                    return;
-                }
-            }
-
-            if(mediaTags.ContainsKey(MediaTagType.DVD_PFI))
-                mediaTags.Remove(MediaTagType.DVD_PFI);
-
-            if(mediaTags.ContainsKey(MediaTagType.DVD_DMI))
-                mediaTags.Remove(MediaTagType.DVD_DMI);
-
-            // Drive shall move to lock state when a new disc is inserted. Old kreon versions do not lock correctly so save this
-            sense = _dev.ReadCapacity(out byte[] coldReadCapacity, out byte[] senseBuf, _dev.Timeout, out _);
-
-            if(sense)
-            {
-                _dumpLog.WriteLine("Cannot get disc capacity.");
-                StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
+                _dumpLog.WriteLine("Cannot dump XGD without administrative privileges.");
 
                 return;
             }
+        }
 
-            // Drive shall move to lock state when a new disc is inserted. Old kreon versions do not lock correctly so save this
-            sense = _dev.ReadDiscStructure(out byte[] coldPfi, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                           MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
+        if(mediaTags.ContainsKey(MediaTagType.DVD_PFI))
+            mediaTags.Remove(MediaTagType.DVD_PFI);
 
-            if(sense)
-            {
-                _dumpLog.WriteLine("Cannot get PFI.");
-                StoppingErrorMessage?.Invoke("Cannot get PFI.");
+        if(mediaTags.ContainsKey(MediaTagType.DVD_DMI))
+            mediaTags.Remove(MediaTagType.DVD_DMI);
 
-                return;
-            }
+        // Drive shall move to lock state when a new disc is inserted. Old kreon versions do not lock correctly so save this
+        sense = _dev.ReadCapacity(out byte[] coldReadCapacity, out byte[] senseBuf, _dev.Timeout, out _);
 
-            UpdateStatus?.Invoke("Reading Xbox Security Sector.");
-            _dumpLog.WriteLine("Reading Xbox Security Sector.");
-            sense = _dev.KreonExtractSs(out byte[] ssBuf, out senseBuf, _dev.Timeout, out _);
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot get disc capacity.");
+            StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
 
-            if(sense)
-            {
-                _dumpLog.WriteLine("Cannot get Xbox Security Sector, not continuing.");
-                StoppingErrorMessage?.Invoke("Cannot get Xbox Security Sector, not continuing.");
+            return;
+        }
 
-                return;
-            }
+        // Drive shall move to lock state when a new disc is inserted. Old kreon versions do not lock correctly so save this
+        sense = _dev.ReadDiscStructure(out byte[] coldPfi, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                       MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
 
-            _dumpLog.WriteLine("Decoding Xbox Security Sector.");
-            UpdateStatus?.Invoke("Decoding Xbox Security Sector.");
-            SS.SecuritySector? xboxSs = SS.Decode(ssBuf);
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot get PFI.");
+            StoppingErrorMessage?.Invoke("Cannot get PFI.");
 
-            if(!xboxSs.HasValue)
-            {
-                _dumpLog.WriteLine("Cannot decode Xbox Security Sector, not continuing.");
-                StoppingErrorMessage?.Invoke("Cannot decode Xbox Security Sector, not continuing.");
+            return;
+        }
 
-                return;
-            }
+        UpdateStatus?.Invoke("Reading Xbox Security Sector.");
+        _dumpLog.WriteLine("Reading Xbox Security Sector.");
+        sense = _dev.KreonExtractSs(out byte[] ssBuf, out senseBuf, _dev.Timeout, out _);
 
-            byte[] tmpBuf = new byte[ssBuf.Length - 4];
-            Array.Copy(ssBuf, 4, tmpBuf, 0, ssBuf.Length - 4);
-            mediaTags.Add(MediaTagType.Xbox_SecuritySector, tmpBuf);
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot get Xbox Security Sector, not continuing.");
+            StoppingErrorMessage?.Invoke("Cannot get Xbox Security Sector, not continuing.");
 
-            // Get video partition size
-            AaruConsole.DebugWriteLine("Dump-media command", "Getting video partition size");
-            UpdateStatus?.Invoke("Locking drive.");
-            _dumpLog.WriteLine("Locking drive.");
-            sense = _dev.KreonLock(out senseBuf, _dev.Timeout, out _);
+            return;
+        }
 
-            if(sense)
-            {
-                _errorLog?.WriteLine("Kreon lock", _dev.Error, _dev.LastError, senseBuf);
+        _dumpLog.WriteLine("Decoding Xbox Security Sector.");
+        UpdateStatus?.Invoke("Decoding Xbox Security Sector.");
+        SS.SecuritySector? xboxSs = SS.Decode(ssBuf);
 
-                _dumpLog.WriteLine("Cannot lock drive, not continuing.");
-                StoppingErrorMessage?.Invoke("Cannot lock drive, not continuing.");
+        if(!xboxSs.HasValue)
+        {
+            _dumpLog.WriteLine("Cannot decode Xbox Security Sector, not continuing.");
+            StoppingErrorMessage?.Invoke("Cannot decode Xbox Security Sector, not continuing.");
 
-                return;
-            }
+            return;
+        }
 
-            UpdateStatus?.Invoke("Getting video partition size.");
-            _dumpLog.WriteLine("Getting video partition size.");
-            sense = _dev.ReadCapacity(out byte[] readBuffer, out senseBuf, _dev.Timeout, out _);
+        byte[] tmpBuf = new byte[ssBuf.Length - 4];
+        Array.Copy(ssBuf, 4, tmpBuf, 0, ssBuf.Length - 4);
+        mediaTags.Add(MediaTagType.Xbox_SecuritySector, tmpBuf);
 
-            if(sense)
-            {
-                _dumpLog.WriteLine("Cannot get disc capacity.");
-                StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
+        // Get video partition size
+        AaruConsole.DebugWriteLine("Dump-media command", "Getting video partition size");
+        UpdateStatus?.Invoke("Locking drive.");
+        _dumpLog.WriteLine("Locking drive.");
+        sense = _dev.KreonLock(out senseBuf, _dev.Timeout, out _);
 
-                return;
-            }
+        if(sense)
+        {
+            _errorLog?.WriteLine("Kreon lock", _dev.Error, _dev.LastError, senseBuf);
 
-            ulong totalSize =
-                (ulong)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]) &
-                0xFFFFFFFF;
+            _dumpLog.WriteLine("Cannot lock drive, not continuing.");
+            StoppingErrorMessage?.Invoke("Cannot lock drive, not continuing.");
 
-            UpdateStatus?.Invoke("Reading Physical Format Information.");
-            _dumpLog.WriteLine("Reading Physical Format Information.");
+            return;
+        }
 
-            sense = _dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                           MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
+        UpdateStatus?.Invoke("Getting video partition size.");
+        _dumpLog.WriteLine("Getting video partition size.");
+        sense = _dev.ReadCapacity(out byte[] readBuffer, out senseBuf, _dev.Timeout, out _);
 
-            if(sense)
-            {
-                _dumpLog.WriteLine("Cannot get PFI.");
-                StoppingErrorMessage?.Invoke("Cannot get PFI.");
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot get disc capacity.");
+            StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
 
-                return;
-            }
+            return;
+        }
 
-            tmpBuf = new byte[readBuffer.Length - 4];
-            Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
+        ulong totalSize =
+            (ulong)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]) &
+            0xFFFFFFFF;
+
+        UpdateStatus?.Invoke("Reading Physical Format Information.");
+        _dumpLog.WriteLine("Reading Physical Format Information.");
+
+        sense = _dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                       MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
+
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot get PFI.");
+            StoppingErrorMessage?.Invoke("Cannot get PFI.");
+
+            return;
+        }
+
+        tmpBuf = new byte[readBuffer.Length - 4];
+        Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
+        mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
+        AaruConsole.DebugWriteLine("Dump-media command", "Video partition total size: {0} sectors", totalSize);
+
+        ulong l0Video = (PFI.Decode(readBuffer, MediaType.DVDROM)?.Layer0EndPSN     ?? 0) -
+                        (PFI.Decode(readBuffer, MediaType.DVDROM)?.DataAreaStartPSN ?? 0) + 1;
+
+        ulong l1Video = totalSize - l0Video + 1;
+        UpdateStatus?.Invoke("Reading Disc Manufacturing Information.");
+        _dumpLog.WriteLine("Reading Disc Manufacturing Information.");
+
+        sense = _dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                       MmcDiscStructureFormat.DiscManufacturingInformation, 0, 0, out _);
+
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot get DMI.");
+            StoppingErrorMessage?.Invoke("Cannot get DMI.");
+
+            return;
+        }
+
+        tmpBuf = new byte[readBuffer.Length - 4];
+        Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
+        mediaTags.Add(MediaTagType.DVD_DMI, tmpBuf);
+
+        // Should be a safe value to detect the lock command was ignored, and we're indeed getting the whole size and not the locked one
+        if(totalSize > 300000)
+        {
+            UpdateStatus?.Invoke("Video partition is too big, did lock work? Trying cold values.");
+            _dumpLog.WriteLine("Video partition is too big, did lock work? Trying cold values.");
+
+            totalSize = (ulong)((coldReadCapacity[0] << 24) + (coldReadCapacity[1] << 16) +
+                                (coldReadCapacity[2] << 8)  + coldReadCapacity[3]) & 0xFFFFFFFF;
+
+            tmpBuf = new byte[coldPfi.Length - 4];
+            Array.Copy(coldPfi, 4, tmpBuf, 0, coldPfi.Length - 4);
+            mediaTags.Remove(MediaTagType.DVD_PFI);
             mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
             AaruConsole.DebugWriteLine("Dump-media command", "Video partition total size: {0} sectors", totalSize);
 
-            ulong l0Video = (PFI.Decode(readBuffer, MediaType.DVDROM)?.Layer0EndPSN     ?? 0) -
-                            (PFI.Decode(readBuffer, MediaType.DVDROM)?.DataAreaStartPSN ?? 0) + 1;
+            l0Video = (PFI.Decode(coldPfi, MediaType.DVDROM)?.Layer0EndPSN     ?? 0) -
+                      (PFI.Decode(coldPfi, MediaType.DVDROM)?.DataAreaStartPSN ?? 0) + 1;
 
-            ulong l1Video = totalSize - l0Video + 1;
-            UpdateStatus?.Invoke("Reading Disc Manufacturing Information.");
-            _dumpLog.WriteLine("Reading Disc Manufacturing Information.");
+            l1Video = totalSize - l0Video + 1;
 
-            sense = _dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                           MmcDiscStructureFormat.DiscManufacturingInformation, 0, 0, out _);
-
-            if(sense)
-            {
-                _dumpLog.WriteLine("Cannot get DMI.");
-                StoppingErrorMessage?.Invoke("Cannot get DMI.");
-
-                return;
-            }
-
-            tmpBuf = new byte[readBuffer.Length - 4];
-            Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
-            mediaTags.Add(MediaTagType.DVD_DMI, tmpBuf);
-
-            // Should be a safe value to detect the lock command was ignored, and we're indeed getting the whole size and not the locked one
             if(totalSize > 300000)
             {
-                UpdateStatus?.Invoke("Video partition is too big, did lock work? Trying cold values.");
-                _dumpLog.WriteLine("Video partition is too big, did lock work? Trying cold values.");
+                _dumpLog.WriteLine("Cannot get video partition size, not continuing. Try to eject and reinsert the drive, if it keeps happening, contact support.");
 
-                totalSize = (ulong)((coldReadCapacity[0] << 24) + (coldReadCapacity[1] << 16) +
-                                    (coldReadCapacity[2] << 8)  + coldReadCapacity[3]) & 0xFFFFFFFF;
-
-                tmpBuf = new byte[coldPfi.Length - 4];
-                Array.Copy(coldPfi, 4, tmpBuf, 0, coldPfi.Length - 4);
-                mediaTags.Remove(MediaTagType.DVD_PFI);
-                mediaTags.Add(MediaTagType.DVD_PFI, tmpBuf);
-                AaruConsole.DebugWriteLine("Dump-media command", "Video partition total size: {0} sectors", totalSize);
-
-                l0Video = (PFI.Decode(coldPfi, MediaType.DVDROM)?.Layer0EndPSN     ?? 0) -
-                          (PFI.Decode(coldPfi, MediaType.DVDROM)?.DataAreaStartPSN ?? 0) + 1;
-
-                l1Video = totalSize - l0Video + 1;
-
-                if(totalSize > 300000)
-                {
-                    _dumpLog.WriteLine("Cannot get video partition size, not continuing. Try to eject and reinsert the drive, if it keeps happening, contact support.");
-
-                    StoppingErrorMessage?.
-                        Invoke("Cannot get video partition size, not continuing. Try to eject and reinsert the drive, if it keeps happening, contact support.");
-
-                    return;
-                }
-            }
-
-            // Get game partition size
-            AaruConsole.DebugWriteLine("Dump-media command", "Getting game partition size");
-            UpdateStatus?.Invoke("Unlocking drive (Xtreme).");
-            _dumpLog.WriteLine("Unlocking drive (Xtreme).");
-            sense = _dev.KreonUnlockXtreme(out senseBuf, _dev.Timeout, out _);
-
-            if(sense)
-            {
-                _errorLog?.WriteLine("Kreon Xtreme unlock", _dev.Error, _dev.LastError, senseBuf);
-                _dumpLog.WriteLine("Cannot unlock drive, not continuing.");
-                StoppingErrorMessage?.Invoke("Cannot unlock drive, not continuing.");
+                StoppingErrorMessage?.
+                    Invoke("Cannot get video partition size, not continuing. Try to eject and reinsert the drive, if it keeps happening, contact support.");
 
                 return;
             }
+        }
 
-            UpdateStatus?.Invoke("Getting game partition size.");
-            _dumpLog.WriteLine("Getting game partition size.");
-            sense = _dev.ReadCapacity(out readBuffer, out senseBuf, _dev.Timeout, out _);
+        // Get game partition size
+        AaruConsole.DebugWriteLine("Dump-media command", "Getting game partition size");
+        UpdateStatus?.Invoke("Unlocking drive (Xtreme).");
+        _dumpLog.WriteLine("Unlocking drive (Xtreme).");
+        sense = _dev.KreonUnlockXtreme(out senseBuf, _dev.Timeout, out _);
 
-            if(sense)
+        if(sense)
+        {
+            _errorLog?.WriteLine("Kreon Xtreme unlock", _dev.Error, _dev.LastError, senseBuf);
+            _dumpLog.WriteLine("Cannot unlock drive, not continuing.");
+            StoppingErrorMessage?.Invoke("Cannot unlock drive, not continuing.");
+
+            return;
+        }
+
+        UpdateStatus?.Invoke("Getting game partition size.");
+        _dumpLog.WriteLine("Getting game partition size.");
+        sense = _dev.ReadCapacity(out readBuffer, out senseBuf, _dev.Timeout, out _);
+
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot get disc capacity.");
+            StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
+
+            return;
+        }
+
+        ulong gameSize =
+            ((ulong)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]) &
+             0xFFFFFFFF) + 1;
+
+        AaruConsole.DebugWriteLine("Dump-media command", "Game partition total size: {0} sectors", gameSize);
+
+        // Get middle zone size
+        AaruConsole.DebugWriteLine("Dump-media command", "Getting middle zone size");
+        UpdateStatus?.Invoke("Unlocking drive (Wxripper).");
+        _dumpLog.WriteLine("Unlocking drive (Wxripper).");
+        sense = _dev.KreonUnlockWxripper(out senseBuf, _dev.Timeout, out _);
+
+        if(sense)
+        {
+            _errorLog?.WriteLine("Kreon Wxripper unlock", _dev.Error, _dev.LastError, senseBuf);
+            _dumpLog.WriteLine("Cannot unlock drive, not continuing.");
+            StoppingErrorMessage?.Invoke("Cannot unlock drive, not continuing.");
+
+            return;
+        }
+
+        UpdateStatus?.Invoke("Getting disc size.");
+        _dumpLog.WriteLine("Getting disc size.");
+        sense = _dev.ReadCapacity(out readBuffer, out senseBuf, _dev.Timeout, out _);
+
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot get disc capacity.");
+            StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
+
+            return;
+        }
+
+        totalSize = (ulong)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]) &
+                    0xFFFFFFFF;
+
+        UpdateStatus?.Invoke("Reading Physical Format Information.");
+        _dumpLog.WriteLine("Reading Physical Format Information.");
+
+        sense = _dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                       MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
+
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot get PFI.");
+            StoppingErrorMessage?.Invoke("Cannot get PFI.");
+
+            return;
+        }
+
+        AaruConsole.DebugWriteLine("Dump-media command", "Unlocked total size: {0} sectors", totalSize);
+        ulong blocks = totalSize + 1;
+
+        PFI.PhysicalFormatInformation? wxRipperPfiNullable = PFI.Decode(readBuffer, MediaType.DVDROM);
+
+        if(wxRipperPfiNullable == null)
+        {
+            _dumpLog.WriteLine("Cannot decode PFI.");
+            StoppingErrorMessage?.Invoke("Cannot decode PFI.");
+
+            return;
+        }
+
+        PFI.PhysicalFormatInformation wxRipperPfi = wxRipperPfiNullable.Value;
+
+        UpdateStatus?.Invoke($"WxRipper PFI's Data Area Start PSN: {wxRipperPfi.DataAreaStartPSN} sectors");
+        UpdateStatus?.Invoke($"WxRipper PFI's Layer 0 End PSN: {wxRipperPfi.Layer0EndPSN} sectors");
+        _dumpLog.WriteLine($"WxRipper PFI's Data Area Start PSN: {wxRipperPfi.DataAreaStartPSN} sectors");
+        _dumpLog.WriteLine($"WxRipper PFI's Layer 0 End PSN: {wxRipperPfi.Layer0EndPSN} sectors");
+
+        ulong middleZone = totalSize - (wxRipperPfi.Layer0EndPSN - wxRipperPfi.DataAreaStartPSN + 1) - gameSize + 1;
+
+        tmpBuf = new byte[readBuffer.Length - 4];
+        Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
+        mediaTags.Add(MediaTagType.Xbox_PFI, tmpBuf);
+
+        UpdateStatus?.Invoke("Reading Disc Manufacturing Information.");
+        _dumpLog.WriteLine("Reading Disc Manufacturing Information.");
+
+        sense = _dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                       MmcDiscStructureFormat.DiscManufacturingInformation, 0, 0, out _);
+
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot get DMI.");
+            StoppingErrorMessage?.Invoke("Cannot get DMI.");
+
+            return;
+        }
+
+        tmpBuf = new byte[readBuffer.Length - 4];
+        Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
+        mediaTags.Add(MediaTagType.Xbox_DMI, tmpBuf);
+
+        totalSize = l0Video + l1Video + (middleZone * 2) + gameSize;
+        ulong layerBreak = l0Video + middleZone + (gameSize / 2);
+
+        UpdateStatus?.Invoke($"Video layer 0 size: {l0Video} sectors");
+        UpdateStatus?.Invoke($"Video layer 1 size: {l1Video} sectors");
+        UpdateStatus?.Invoke($"Middle zone size: {middleZone} sectors");
+        UpdateStatus?.Invoke($"Game data size: {gameSize} sectors");
+        UpdateStatus?.Invoke($"Total size: {totalSize} sectors");
+        UpdateStatus?.Invoke($"Real layer break: {layerBreak}");
+        UpdateStatus?.Invoke("");
+
+        _dumpLog.WriteLine("Video layer 0 size: {0} sectors", l0Video);
+        _dumpLog.WriteLine("Video layer 1 size: {0} sectors", l1Video);
+        _dumpLog.WriteLine("Middle zone 0 size: {0} sectors", middleZone);
+        _dumpLog.WriteLine("Game data 0 size: {0} sectors", gameSize);
+        _dumpLog.WriteLine("Total 0 size: {0} sectors", totalSize);
+        _dumpLog.WriteLine("Real layer break: {0}", layerBreak);
+
+        bool read12 = !_dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, 0, blockSize, 0, 1,
+                                   false, _dev.Timeout, out _);
+
+        if(!read12)
+        {
+            _dumpLog.WriteLine("Cannot read medium, aborting scan...");
+            StoppingErrorMessage?.Invoke("Cannot read medium, aborting scan...");
+
+            return;
+        }
+
+        _dumpLog.WriteLine("Using SCSI READ (12) command.");
+        UpdateStatus?.Invoke("Using SCSI READ (12) command.");
+
+        // Set speed
+        if(_speedMultiplier >= 0)
+        {
+            _dumpLog.WriteLine($"Setting speed to {(_speed   == 0 ? "MAX." : $"{_speed}x")}.");
+            UpdateStatus?.Invoke($"Setting speed to {(_speed == 0 ? "MAX." : $"{_speed}x")}.");
+
+            _speed *= _speedMultiplier;
+
+            if(_speed == 0 ||
+               _speed > 0xFFFF)
+                _speed = 0xFFFF;
+
+            _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, (ushort)_speed, 0, _dev.Timeout, out _);
+        }
+
+        while(true)
+        {
+            sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, 0, blockSize, 0,
+                                blocksToRead, false, _dev.Timeout, out _);
+
+            if(sense || _dev.Error)
+                blocksToRead /= 2;
+
+            if(!_dev.Error ||
+               blocksToRead == 1)
+                break;
+        }
+
+        if(_dev.Error)
+        {
+            _dumpLog.WriteLine("Device error {0} trying to guess ideal transfer length.", _dev.LastError);
+            StoppingErrorMessage?.Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
+
+            return;
+        }
+
+        if(_skip < blocksToRead)
+            _skip = blocksToRead;
+
+        bool ret = true;
+
+        foreach(MediaTagType tag in mediaTags.Keys.Where(tag => !outputFormat.SupportedMediaTags.Contains(tag)))
+        {
+            ret = false;
+            _dumpLog.WriteLine($"Output format does not support {tag}.");
+            ErrorMessage?.Invoke($"Output format does not support {tag}.");
+        }
+
+        if(!ret)
+        {
+            if(_force)
             {
-                _dumpLog.WriteLine("Cannot get disc capacity.");
-                StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
+                _dumpLog.WriteLine("Several media tags not supported, continuing...");
+                ErrorMessage?.Invoke("Several media tags not supported, continuing...");
+            }
+            else
+            {
+                _dumpLog.WriteLine("Several media tags not supported, not continuing...");
+                StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
 
                 return;
             }
+        }
 
-            ulong gameSize =
-                ((ulong)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]) &
-                 0xFFFFFFFF) + 1;
+        _dumpLog.WriteLine("Reading {0} sectors at a time.", blocksToRead);
+        UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
 
-            AaruConsole.DebugWriteLine("Dump-media command", "Game partition total size: {0} sectors", gameSize);
+        var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
+        var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", 0x0010);
+        ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
 
-            // Get middle zone size
-            AaruConsole.DebugWriteLine("Dump-media command", "Getting middle zone size");
-            UpdateStatus?.Invoke("Unlocking drive (Wxripper).");
-            _dumpLog.WriteLine("Unlocking drive (Wxripper).");
-            sense = _dev.KreonUnlockWxripper(out senseBuf, _dev.Timeout, out _);
+        // Cannot create image
+        if(!ret)
+        {
+            _dumpLog.WriteLine("Error creating output image, not continuing.");
+            _dumpLog.WriteLine(outputFormat.ErrorMessage);
 
-            if(sense)
+            StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
+                                         outputFormat.ErrorMessage);
+
+            return;
+        }
+
+        start = DateTime.UtcNow;
+        double imageWriteDuration = 0;
+
+        double           cmdDuration      = 0;
+        uint             saveBlocksToRead = blocksToRead;
+        DumpHardwareType currentTry       = null;
+        ExtentsULong     extents          = null;
+
+        ResumeSupport.Process(true, true, totalSize, _dev.Manufacturer, _dev.Model, _dev.Serial, _dev.PlatformId,
+                              ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision, _private, _force);
+
+        if(currentTry == null ||
+           extents    == null)
+            StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
+
+        (outputFormat as IWritableOpticalImage).SetTracks(new List<Track>
+        {
+            new Track
             {
-                _errorLog?.WriteLine("Kreon Wxripper unlock", _dev.Error, _dev.LastError, senseBuf);
-                _dumpLog.WriteLine("Cannot unlock drive, not continuing.");
-                StoppingErrorMessage?.Invoke("Cannot unlock drive, not continuing.");
+                BytesPerSector    = (int)blockSize,
+                EndSector         = blocks - 1,
+                Sequence          = 1,
+                RawBytesPerSector = (int)blockSize,
+                SubchannelType    = TrackSubchannelType.None,
+                Session           = 1,
+                Type              = TrackType.Data
+            }
+        });
 
-                return;
+        ulong currentSector = _resume.NextBlock;
+
+        if(_resume.NextBlock > 0)
+        {
+            UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
+            _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
+        }
+
+        bool newTrim = false;
+
+        _dumpLog.WriteLine("Reading game partition.");
+        UpdateStatus?.Invoke("Reading game partition.");
+        DateTime timeSpeedStart   = DateTime.UtcNow;
+        ulong    sectorSpeedStart = 0;
+        InitProgress?.Invoke();
+
+        for(int e = 0; e <= 16; e++)
+        {
+            if(_aborted)
+            {
+                _resume.NextBlock  = currentSector;
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
+
+                break;
             }
 
-            UpdateStatus?.Invoke("Getting disc size.");
-            _dumpLog.WriteLine("Getting disc size.");
-            sense = _dev.ReadCapacity(out readBuffer, out senseBuf, _dev.Timeout, out _);
+            if(currentSector >= blocks)
+                break;
 
-            if(sense)
+            ulong extentStart, extentEnd;
+
+            // Extents
+            if(e < 16)
             {
-                _dumpLog.WriteLine("Cannot get disc capacity.");
-                StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
-
-                return;
-            }
-
-            totalSize = (ulong)((readBuffer[0] << 24) + (readBuffer[1] << 16) + (readBuffer[2] << 8) + readBuffer[3]) &
-                        0xFFFFFFFF;
-
-            UpdateStatus?.Invoke("Reading Physical Format Information.");
-            _dumpLog.WriteLine("Reading Physical Format Information.");
-
-            sense = _dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                           MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
-
-            if(sense)
-            {
-                _dumpLog.WriteLine("Cannot get PFI.");
-                StoppingErrorMessage?.Invoke("Cannot get PFI.");
-
-                return;
-            }
-
-            AaruConsole.DebugWriteLine("Dump-media command", "Unlocked total size: {0} sectors", totalSize);
-            ulong blocks = totalSize + 1;
-
-            PFI.PhysicalFormatInformation? wxRipperPfiNullable = PFI.Decode(readBuffer, MediaType.DVDROM);
-
-            if(wxRipperPfiNullable == null)
-            {
-                _dumpLog.WriteLine("Cannot decode PFI.");
-                StoppingErrorMessage?.Invoke("Cannot decode PFI.");
-
-                return;
-            }
-
-            PFI.PhysicalFormatInformation wxRipperPfi = wxRipperPfiNullable.Value;
-
-            UpdateStatus?.Invoke($"WxRipper PFI's Data Area Start PSN: {wxRipperPfi.DataAreaStartPSN} sectors");
-            UpdateStatus?.Invoke($"WxRipper PFI's Layer 0 End PSN: {wxRipperPfi.Layer0EndPSN} sectors");
-            _dumpLog.WriteLine($"WxRipper PFI's Data Area Start PSN: {wxRipperPfi.DataAreaStartPSN} sectors");
-            _dumpLog.WriteLine($"WxRipper PFI's Layer 0 End PSN: {wxRipperPfi.Layer0EndPSN} sectors");
-
-            ulong middleZone = totalSize - (wxRipperPfi.Layer0EndPSN - wxRipperPfi.DataAreaStartPSN + 1) - gameSize + 1;
-
-            tmpBuf = new byte[readBuffer.Length - 4];
-            Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
-            mediaTags.Add(MediaTagType.Xbox_PFI, tmpBuf);
-
-            UpdateStatus?.Invoke("Reading Disc Manufacturing Information.");
-            _dumpLog.WriteLine("Reading Disc Manufacturing Information.");
-
-            sense = _dev.ReadDiscStructure(out readBuffer, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                           MmcDiscStructureFormat.DiscManufacturingInformation, 0, 0, out _);
-
-            if(sense)
-            {
-                _dumpLog.WriteLine("Cannot get DMI.");
-                StoppingErrorMessage?.Invoke("Cannot get DMI.");
-
-                return;
-            }
-
-            tmpBuf = new byte[readBuffer.Length - 4];
-            Array.Copy(readBuffer, 4, tmpBuf, 0, readBuffer.Length - 4);
-            mediaTags.Add(MediaTagType.Xbox_DMI, tmpBuf);
-
-            totalSize = l0Video + l1Video + (middleZone * 2) + gameSize;
-            ulong layerBreak = l0Video + middleZone + (gameSize / 2);
-
-            UpdateStatus?.Invoke($"Video layer 0 size: {l0Video} sectors");
-            UpdateStatus?.Invoke($"Video layer 1 size: {l1Video} sectors");
-            UpdateStatus?.Invoke($"Middle zone size: {middleZone} sectors");
-            UpdateStatus?.Invoke($"Game data size: {gameSize} sectors");
-            UpdateStatus?.Invoke($"Total size: {totalSize} sectors");
-            UpdateStatus?.Invoke($"Real layer break: {layerBreak}");
-            UpdateStatus?.Invoke("");
-
-            _dumpLog.WriteLine("Video layer 0 size: {0} sectors", l0Video);
-            _dumpLog.WriteLine("Video layer 1 size: {0} sectors", l1Video);
-            _dumpLog.WriteLine("Middle zone 0 size: {0} sectors", middleZone);
-            _dumpLog.WriteLine("Game data 0 size: {0} sectors", gameSize);
-            _dumpLog.WriteLine("Total 0 size: {0} sectors", totalSize);
-            _dumpLog.WriteLine("Real layer break: {0}", layerBreak);
-
-            bool read12 = !_dev.Read12(out readBuffer, out senseBuf, 0, false, true, false, false, 0, blockSize, 0, 1,
-                                       false, _dev.Timeout, out _);
-
-            if(!read12)
-            {
-                _dumpLog.WriteLine("Cannot read medium, aborting scan...");
-                StoppingErrorMessage?.Invoke("Cannot read medium, aborting scan...");
-
-                return;
-            }
-
-            _dumpLog.WriteLine("Using SCSI READ (12) command.");
-            UpdateStatus?.Invoke("Using SCSI READ (12) command.");
-
-            // Set speed
-            if(_speedMultiplier >= 0)
-            {
-                _dumpLog.WriteLine($"Setting speed to {(_speed   == 0 ? "MAX." : $"{_speed}x")}.");
-                UpdateStatus?.Invoke($"Setting speed to {(_speed == 0 ? "MAX." : $"{_speed}x")}.");
-
-                _speed *= _speedMultiplier;
-
-                if(_speed == 0 ||
-                   _speed > 0xFFFF)
-                    _speed = 0xFFFF;
-
-                _dev.SetCdSpeed(out _, RotationalControl.ClvAndImpureCav, (ushort)_speed, 0, _dev.Timeout, out _);
-            }
-
-            while(true)
-            {
-                sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, 0, blockSize, 0,
-                                    blocksToRead, false, _dev.Timeout, out _);
-
-                if(sense || _dev.Error)
-                    blocksToRead /= 2;
-
-                if(!_dev.Error ||
-                   blocksToRead == 1)
-                    break;
-            }
-
-            if(_dev.Error)
-            {
-                _dumpLog.WriteLine("Device error {0} trying to guess ideal transfer length.", _dev.LastError);
-                StoppingErrorMessage?.Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
-
-                return;
-            }
-
-            if(_skip < blocksToRead)
-                _skip = blocksToRead;
-
-            bool ret = true;
-
-            foreach(MediaTagType tag in mediaTags.Keys.Where(tag => !outputFormat.SupportedMediaTags.Contains(tag)))
-            {
-                ret = false;
-                _dumpLog.WriteLine($"Output format does not support {tag}.");
-                ErrorMessage?.Invoke($"Output format does not support {tag}.");
-            }
-
-            if(!ret)
-            {
-                if(_force)
-                {
-                    _dumpLog.WriteLine("Several media tags not supported, continuing...");
-                    ErrorMessage?.Invoke("Several media tags not supported, continuing...");
-                }
+                if(xboxSs.Value.Extents[e].StartPSN <= xboxSs.Value.Layer0EndPSN)
+                    extentStart = xboxSs.Value.Extents[e].StartPSN - 0x30000;
                 else
-                {
-                    _dumpLog.WriteLine("Several media tags not supported, not continuing...");
-                    StoppingErrorMessage?.Invoke("Several media tags not supported, not continuing...");
+                    extentStart = ((xboxSs.Value.Layer0EndPSN + 1) * 2)               -
+                                  ((xboxSs.Value.Extents[e].StartPSN ^ 0xFFFFFF) + 1) - 0x30000;
 
-                    return;
-                }
-            }
-
-            _dumpLog.WriteLine("Reading {0} sectors at a time.", blocksToRead);
-            UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
-
-            var mhddLog = new MhddLog(_outputPrefix + ".mhddlog.bin", _dev, blocks, blockSize, blocksToRead, _private);
-            var ibgLog  = new IbgLog(_outputPrefix  + ".ibg", 0x0010);
-            ret = outputFormat.Create(_outputPath, dskType, _formatOptions, blocks, blockSize);
-
-            // Cannot create image
-            if(!ret)
-            {
-                _dumpLog.WriteLine("Error creating output image, not continuing.");
-                _dumpLog.WriteLine(outputFormat.ErrorMessage);
-
-                StoppingErrorMessage?.Invoke("Error creating output image, not continuing." + Environment.NewLine +
-                                             outputFormat.ErrorMessage);
-
-                return;
-            }
-
-            start = DateTime.UtcNow;
-            double imageWriteDuration = 0;
-
-            double           cmdDuration      = 0;
-            uint             saveBlocksToRead = blocksToRead;
-            DumpHardwareType currentTry       = null;
-            ExtentsULong     extents          = null;
-
-            ResumeSupport.Process(true, true, totalSize, _dev.Manufacturer, _dev.Model, _dev.Serial, _dev.PlatformId,
-                                  ref _resume, ref currentTry, ref extents, _dev.FirmwareRevision, _private, _force);
-
-            if(currentTry == null ||
-               extents    == null)
-                StoppingErrorMessage?.Invoke("Could not process resume file, not continuing...");
-
-            (outputFormat as IWritableOpticalImage).SetTracks(new List<Track>
-            {
-                new Track
-                {
-                    BytesPerSector    = (int)blockSize,
-                    EndSector         = blocks - 1,
-                    Sequence          = 1,
-                    RawBytesPerSector = (int)blockSize,
-                    SubchannelType    = TrackSubchannelType.None,
-                    Session           = 1,
-                    Type              = TrackType.Data
-                }
-            });
-
-            ulong currentSector = _resume.NextBlock;
-
-            if(_resume.NextBlock > 0)
-            {
-                UpdateStatus?.Invoke($"Resuming from block {_resume.NextBlock}.");
-                _dumpLog.WriteLine("Resuming from block {0}.", _resume.NextBlock);
-            }
-
-            bool newTrim = false;
-
-            _dumpLog.WriteLine("Reading game partition.");
-            UpdateStatus?.Invoke("Reading game partition.");
-            DateTime timeSpeedStart   = DateTime.UtcNow;
-            ulong    sectorSpeedStart = 0;
-            InitProgress?.Invoke();
-
-            for(int e = 0; e <= 16; e++)
-            {
-                if(_aborted)
-                {
-                    _resume.NextBlock  = currentSector;
-                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    UpdateStatus?.Invoke("Aborted!");
-                    _dumpLog.WriteLine("Aborted!");
-
-                    break;
-                }
-
-                if(currentSector >= blocks)
-                    break;
-
-                ulong extentStart, extentEnd;
-
-                // Extents
-                if(e < 16)
-                {
-                    if(xboxSs.Value.Extents[e].StartPSN <= xboxSs.Value.Layer0EndPSN)
-                        extentStart = xboxSs.Value.Extents[e].StartPSN - 0x30000;
-                    else
-                        extentStart = ((xboxSs.Value.Layer0EndPSN + 1) * 2)               -
-                                      ((xboxSs.Value.Extents[e].StartPSN ^ 0xFFFFFF) + 1) - 0x30000;
-
-                    if(xboxSs.Value.Extents[e].EndPSN <= xboxSs.Value.Layer0EndPSN)
-                        extentEnd = xboxSs.Value.Extents[e].EndPSN - 0x30000;
-                    else
-                        extentEnd = ((xboxSs.Value.Layer0EndPSN + 1) * 2)             -
-                                    ((xboxSs.Value.Extents[e].EndPSN ^ 0xFFFFFF) + 1) - 0x30000;
-                }
-
-                // After last extent
+                if(xboxSs.Value.Extents[e].EndPSN <= xboxSs.Value.Layer0EndPSN)
+                    extentEnd = xboxSs.Value.Extents[e].EndPSN - 0x30000;
                 else
-                {
-                    extentStart = blocks;
-                    extentEnd   = blocks;
-                }
-
-                if(currentSector > extentEnd)
-                    continue;
-
-                for(ulong i = currentSector; i < extentStart; i += blocksToRead)
-                {
-                    saveBlocksToRead = blocksToRead;
-
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    if(extentStart - i < blocksToRead)
-                        blocksToRead = (uint)(extentStart - i);
-
-                    if(currentSpeed > maxSpeed &&
-                       currentSpeed > 0)
-                        maxSpeed = currentSpeed;
-
-                    if(currentSpeed < minSpeed &&
-                       currentSpeed > 0)
-                        minSpeed = currentSpeed;
-
-                    UpdateProgress?.Invoke($"Reading sector {i} of {totalSize} ({currentSpeed:F3} MiB/sec.)", (long)i,
-                                           (long)totalSize);
-
-                    sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)i, blockSize,
-                                        0, blocksToRead, false, _dev.Timeout, out cmdDuration);
-
-                    totalDuration += cmdDuration;
-
-                    if(!sense &&
-                       !_dev.Error)
-                    {
-                        mhddLog.Write(i, cmdDuration);
-                        ibgLog.Write(i, currentSpeed * 1024);
-                        DateTime writeStart = DateTime.Now;
-                        outputFormat.WriteSectors(readBuffer, i, blocksToRead);
-                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                        extents.Add(i, blocksToRead, true);
-                    }
-                    else
-                    {
-                        _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
-
-                        // TODO: Reset device after X errors
-                        if(_stopOnError)
-                            return; // TODO: Return more cleanly
-
-                        if(i + _skip > blocks)
-                            _skip = (uint)(blocks - i);
-
-                        // Write empty data
-                        DateTime writeStart = DateTime.Now;
-                        outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
-                        imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-
-                        for(ulong b = i; b < i + _skip; b++)
-                            _resume.BadBlocks.Add(b);
-
-                        AaruConsole.DebugWriteLine("Dump-Media", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
-                        mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                        ibgLog.Write(i, 0);
-
-                        _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
-                        i += _skip - blocksToRead;
-
-                        string[] senseLines = Sense.PrettifySense(senseBuf).Split(new[]
-                        {
-                            Environment.NewLine
-                        }, StringSplitOptions.RemoveEmptyEntries);
-
-                        foreach(string senseLine in senseLines)
-                            _dumpLog.WriteLine(senseLine);
-
-                        newTrim = true;
-                    }
-
-                    blocksToRead      =  saveBlocksToRead;
-                    currentSector     =  i + 1;
-                    _resume.NextBlock =  currentSector;
-                    sectorSpeedStart  += blocksToRead;
-
-                    double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                    if(elapsed <= 0)
-                        continue;
-
-                    currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                    sectorSpeedStart = 0;
-                    timeSpeedStart   = DateTime.UtcNow;
-                }
-
-                for(ulong i = extentStart; i <= extentEnd; i += blocksToRead)
-                {
-                    saveBlocksToRead = blocksToRead;
-
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
-
-                        break;
-                    }
-
-                    if(extentEnd - i < blocksToRead)
-                        blocksToRead = (uint)(extentEnd - i) + 1;
-
-                    mhddLog.Write(i, cmdDuration);
-                    ibgLog.Write(i, currentSpeed * 1024);
-
-                    // Write empty data
-                    DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(new byte[blockSize * blocksToRead], i, blocksToRead);
-                    imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                    blocksToRead       =  saveBlocksToRead;
-                    extents.Add(i, blocksToRead, true);
-                    currentSector     = i + 1;
-                    _resume.NextBlock = currentSector;
-                }
-
-                if(!_aborted)
-                    currentSector = extentEnd + 1;
+                    extentEnd = ((xboxSs.Value.Layer0EndPSN + 1) * 2)             -
+                                ((xboxSs.Value.Extents[e].EndPSN ^ 0xFFFFFF) + 1) - 0x30000;
             }
 
-            _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
-
-            EndProgress?.Invoke();
-
-            // Middle Zone D
-            UpdateStatus?.Invoke("Writing Middle Zone D (empty).");
-            _dumpLog.WriteLine("Writing Middle Zone D (empty).");
-            InitProgress?.Invoke();
-
-            for(ulong middle = currentSector - blocks - 1; middle < middleZone - 1; middle += blocksToRead)
+            // After last extent
+            else
             {
+                extentStart = blocks;
+                extentEnd   = blocks;
+            }
+
+            if(currentSector > extentEnd)
+                continue;
+
+            for(ulong i = currentSector; i < extentStart; i += blocksToRead)
+            {
+                saveBlocksToRead = blocksToRead;
+
                 if(_aborted)
                 {
                     currentTry.Extents = ExtentsConverter.ToMetadata(extents);
@@ -722,69 +587,8 @@ namespace Aaru.Core.Devices.Dumping
                     break;
                 }
 
-                if(middleZone - 1 - middle < blocksToRead)
-                    blocksToRead = (uint)(middleZone - 1 - middle);
-
-                UpdateProgress?.
-                    Invoke($"Reading sector {middle + currentSector} of {totalSize} ({currentSpeed:F3} MiB/sec.)",
-                           (long)(middle            + currentSector), (long)totalSize);
-
-                mhddLog.Write(middle + currentSector, cmdDuration);
-                ibgLog.Write(middle  + currentSector, currentSpeed * 1024);
-
-                // Write empty data
-                DateTime writeStart = DateTime.Now;
-                outputFormat.WriteSectors(new byte[blockSize * blocksToRead], middle + currentSector, blocksToRead);
-                imageWriteDuration += (DateTime.Now                                   - writeStart).TotalSeconds;
-                extents.Add(currentSector, blocksToRead, true);
-
-                currentSector     += blocksToRead;
-                _resume.NextBlock =  currentSector;
-            }
-
-            EndProgress?.Invoke();
-
-            blocksToRead = saveBlocksToRead;
-
-            UpdateStatus?.Invoke("Locking drive.");
-            _dumpLog.WriteLine("Locking drive.");
-            sense = _dev.KreonLock(out senseBuf, _dev.Timeout, out _);
-
-            if(sense)
-            {
-                _dumpLog.WriteLine("Cannot lock drive, not continuing.");
-                StoppingErrorMessage?.Invoke("Cannot lock drive, not continuing.");
-
-                return;
-            }
-
-            sense = _dev.ReadCapacity(out readBuffer, out senseBuf, _dev.Timeout, out _);
-
-            if(sense)
-            {
-                StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
-
-                return;
-            }
-
-            // Video Layer 1
-            _dumpLog.WriteLine("Reading Video Layer 1.");
-            UpdateStatus?.Invoke("Reading Video Layer 1.");
-            InitProgress?.Invoke();
-
-            for(ulong l1 = currentSector - blocks - middleZone + l0Video; l1 < l0Video + l1Video; l1 += blocksToRead)
-            {
-                if(_aborted)
-                {
-                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                    UpdateStatus?.Invoke("Aborted!");
-                    _dumpLog.WriteLine("Aborted!");
-
-                    break;
-                }
-
-                if(l0Video + l1Video - l1 < blocksToRead)
-                    blocksToRead = (uint)(l0Video + l1Video - l1);
+                if(extentStart - i < blocksToRead)
+                    blocksToRead = (uint)(extentStart - i);
 
                 if(currentSpeed > maxSpeed &&
                    currentSpeed > 0)
@@ -794,46 +598,50 @@ namespace Aaru.Core.Devices.Dumping
                    currentSpeed > 0)
                     minSpeed = currentSpeed;
 
-                UpdateProgress?.Invoke($"Reading sector {currentSector} of {totalSize} ({currentSpeed:F3} MiB/sec.)",
-                                       (long)currentSector, (long)totalSize);
+                UpdateProgress?.Invoke($"Reading sector {i} of {totalSize} ({currentSpeed:F3} MiB/sec.)", (long)i,
+                                       (long)totalSize);
 
-                sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)l1, blockSize, 0,
-                                    blocksToRead, false, _dev.Timeout, out cmdDuration);
+                sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)i, blockSize,
+                                    0, blocksToRead, false, _dev.Timeout, out cmdDuration);
 
                 totalDuration += cmdDuration;
 
                 if(!sense &&
                    !_dev.Error)
                 {
-                    mhddLog.Write(currentSector, cmdDuration);
-                    ibgLog.Write(currentSector, currentSpeed * 1024);
+                    mhddLog.Write(i, cmdDuration);
+                    ibgLog.Write(i, currentSpeed * 1024);
                     DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(readBuffer, currentSector, blocksToRead);
+                    outputFormat.WriteSectors(readBuffer, i, blocksToRead);
                     imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
-                    extents.Add(currentSector, blocksToRead, true);
+                    extents.Add(i, blocksToRead, true);
                 }
                 else
                 {
-                    _errorLog?.WriteLine(currentSector, _dev.Error, _dev.LastError, senseBuf);
+                    _errorLog?.WriteLine(i, _dev.Error, _dev.LastError, senseBuf);
 
                     // TODO: Reset device after X errors
                     if(_stopOnError)
                         return; // TODO: Return more cleanly
 
+                    if(i + _skip > blocks)
+                        _skip = (uint)(blocks - i);
+
                     // Write empty data
                     DateTime writeStart = DateTime.Now;
-                    outputFormat.WriteSectors(new byte[blockSize * _skip], currentSector, _skip);
+                    outputFormat.WriteSectors(new byte[blockSize * _skip], i, _skip);
                     imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
 
-                    // TODO: Handle errors in video partition
-                    //errored += blocksToRead;
-                    //resume.BadBlocks.Add(l1);
-                    AaruConsole.DebugWriteLine("Dump-Media", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
-                    mhddLog.Write(l1, cmdDuration < 500 ? 65535 : cmdDuration);
+                    for(ulong b = i; b < i + _skip; b++)
+                        _resume.BadBlocks.Add(b);
 
-                    ibgLog.Write(l1, 0);
-                    _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, l1);
-                    l1 += _skip - blocksToRead;
+                    AaruConsole.DebugWriteLine("Dump-Media", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
+                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+
+                    ibgLog.Write(i, 0);
+
+                    _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, i);
+                    i += _skip - blocksToRead;
 
                     string[] senseLines = Sense.PrettifySense(senseBuf).Split(new[]
                     {
@@ -842,9 +650,12 @@ namespace Aaru.Core.Devices.Dumping
 
                     foreach(string senseLine in senseLines)
                         _dumpLog.WriteLine(senseLine);
+
+                    newTrim = true;
                 }
 
-                currentSector     += blocksToRead;
+                blocksToRead      =  saveBlocksToRead;
+                currentSector     =  i + 1;
                 _resume.NextBlock =  currentSector;
                 sectorSpeedStart  += blocksToRead;
 
@@ -858,402 +669,590 @@ namespace Aaru.Core.Devices.Dumping
                 timeSpeedStart   = DateTime.UtcNow;
             }
 
-            EndProgress?.Invoke();
-
-            UpdateStatus?.Invoke("Unlocking drive (Wxripper).");
-            _dumpLog.WriteLine("Unlocking drive (Wxripper).");
-            sense = _dev.KreonUnlockWxripper(out senseBuf, _dev.Timeout, out _);
-
-            if(sense)
+            for(ulong i = extentStart; i <= extentEnd; i += blocksToRead)
             {
-                _errorLog?.WriteLine("Kreon Wxripper unlock", _dev.Error, _dev.LastError, senseBuf);
-                _dumpLog.WriteLine("Cannot unlock drive, not continuing.");
-                StoppingErrorMessage?.Invoke("Cannot unlock drive, not continuing.");
+                saveBlocksToRead = blocksToRead;
 
-                return;
-            }
-
-            sense = _dev.ReadCapacity(out readBuffer, out senseBuf, _dev.Timeout, out _);
-
-            if(sense)
-            {
-                StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
-
-                return;
-            }
-
-            end = DateTime.UtcNow;
-            AaruConsole.WriteLine();
-            mhddLog.Close();
-
-            ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                         blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
-
-            UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
-
-            UpdateStatus?.
-                Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
-
-            UpdateStatus?.
-                Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
-
-            _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
-
-            _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
-
-            _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
-                               blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
-
-            #region Trimming
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _trim                       &&
-               newTrim)
-            {
-                start = DateTime.UtcNow;
-                UpdateStatus?.Invoke("Trimming skipped sectors");
-                _dumpLog.WriteLine("Trimming skipped sectors");
-
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
-                InitProgress?.Invoke();
-
-                foreach(ulong badSector in tmpArray)
+                if(_aborted)
                 {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        _dumpLog.WriteLine("Aborted!");
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                    UpdateStatus?.Invoke("Aborted!");
+                    _dumpLog.WriteLine("Aborted!");
 
-                        break;
-                    }
-
-                    PulseProgress?.Invoke($"Trimming sector {badSector}");
-
-                    sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)badSector,
-                                        blockSize, 0, 1, false, _dev.Timeout, out cmdDuration);
-
-                    totalDuration += cmdDuration;
-
-                    if(sense || _dev.Error)
-                    {
-                        _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
-
-                        continue;
-                    }
-
-                    _resume.BadBlocks.Remove(badSector);
-                    extents.Add(badSector);
-                    outputFormat.WriteSector(readBuffer, badSector);
+                    break;
                 }
 
-                EndProgress?.Invoke();
-                end = DateTime.UtcNow;
-                UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
-                _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+                if(extentEnd - i < blocksToRead)
+                    blocksToRead = (uint)(extentEnd - i) + 1;
+
+                mhddLog.Write(i, cmdDuration);
+                ibgLog.Write(i, currentSpeed * 1024);
+
+                // Write empty data
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(new byte[blockSize * blocksToRead], i, blocksToRead);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                blocksToRead       =  saveBlocksToRead;
+                extents.Add(i, blocksToRead, true);
+                currentSector     = i + 1;
+                _resume.NextBlock = currentSector;
             }
-            #endregion Trimming
 
-            #region Error handling
-            if(_resume.BadBlocks.Count > 0 &&
-               !_aborted                   &&
-               _retryPasses > 0)
+            if(!_aborted)
+                currentSector = extentEnd + 1;
+        }
+
+        _resume.BadBlocks = _resume.BadBlocks.Distinct().ToList();
+
+        EndProgress?.Invoke();
+
+        // Middle Zone D
+        UpdateStatus?.Invoke("Writing Middle Zone D (empty).");
+        _dumpLog.WriteLine("Writing Middle Zone D (empty).");
+        InitProgress?.Invoke();
+
+        for(ulong middle = currentSector - blocks - 1; middle < middleZone - 1; middle += blocksToRead)
+        {
+            if(_aborted)
             {
-                List<ulong> tmpList = new List<ulong>();
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
 
-                foreach(ulong ur in _resume.BadBlocks)
-                    for(ulong i = ur; i < ur + blocksToRead; i++)
-                        tmpList.Add(i);
+                break;
+            }
 
-                tmpList.Sort();
+            if(middleZone - 1 - middle < blocksToRead)
+                blocksToRead = (uint)(middleZone - 1 - middle);
 
-                int  pass              = 1;
-                bool forward           = true;
-                bool runningPersistent = false;
+            UpdateProgress?.
+                Invoke($"Reading sector {middle + currentSector} of {totalSize} ({currentSpeed:F3} MiB/sec.)",
+                       (long)(middle            + currentSector), (long)totalSize);
 
-                _resume.BadBlocks = tmpList;
-                Modes.ModePage? currentModePage = null;
-                byte[]          md6;
-                byte[]          md10;
+            mhddLog.Write(middle + currentSector, cmdDuration);
+            ibgLog.Write(middle  + currentSector, currentSpeed * 1024);
 
-                if(_persistent)
+            // Write empty data
+            DateTime writeStart = DateTime.Now;
+            outputFormat.WriteSectors(new byte[blockSize * blocksToRead], middle + currentSector, blocksToRead);
+            imageWriteDuration += (DateTime.Now                                  - writeStart).TotalSeconds;
+            extents.Add(currentSector, blocksToRead, true);
+
+            currentSector     += blocksToRead;
+            _resume.NextBlock =  currentSector;
+        }
+
+        EndProgress?.Invoke();
+
+        blocksToRead = saveBlocksToRead;
+
+        UpdateStatus?.Invoke("Locking drive.");
+        _dumpLog.WriteLine("Locking drive.");
+        sense = _dev.KreonLock(out senseBuf, _dev.Timeout, out _);
+
+        if(sense)
+        {
+            _dumpLog.WriteLine("Cannot lock drive, not continuing.");
+            StoppingErrorMessage?.Invoke("Cannot lock drive, not continuing.");
+
+            return;
+        }
+
+        sense = _dev.ReadCapacity(out readBuffer, out senseBuf, _dev.Timeout, out _);
+
+        if(sense)
+        {
+            StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
+
+            return;
+        }
+
+        // Video Layer 1
+        _dumpLog.WriteLine("Reading Video Layer 1.");
+        UpdateStatus?.Invoke("Reading Video Layer 1.");
+        InitProgress?.Invoke();
+
+        for(ulong l1 = currentSector - blocks - middleZone + l0Video; l1 < l0Video + l1Video; l1 += blocksToRead)
+        {
+            if(_aborted)
+            {
+                currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                UpdateStatus?.Invoke("Aborted!");
+                _dumpLog.WriteLine("Aborted!");
+
+                break;
+            }
+
+            if(l0Video + l1Video - l1 < blocksToRead)
+                blocksToRead = (uint)(l0Video + l1Video - l1);
+
+            if(currentSpeed > maxSpeed &&
+               currentSpeed > 0)
+                maxSpeed = currentSpeed;
+
+            if(currentSpeed < minSpeed &&
+               currentSpeed > 0)
+                minSpeed = currentSpeed;
+
+            UpdateProgress?.Invoke($"Reading sector {currentSector} of {totalSize} ({currentSpeed:F3} MiB/sec.)",
+                                   (long)currentSector, (long)totalSize);
+
+            sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)l1, blockSize, 0,
+                                blocksToRead, false, _dev.Timeout, out cmdDuration);
+
+            totalDuration += cmdDuration;
+
+            if(!sense &&
+               !_dev.Error)
+            {
+                mhddLog.Write(currentSector, cmdDuration);
+                ibgLog.Write(currentSector, currentSpeed * 1024);
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(readBuffer, currentSector, blocksToRead);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+                extents.Add(currentSector, blocksToRead, true);
+            }
+            else
+            {
+                _errorLog?.WriteLine(currentSector, _dev.Error, _dev.LastError, senseBuf);
+
+                // TODO: Reset device after X errors
+                if(_stopOnError)
+                    return; // TODO: Return more cleanly
+
+                // Write empty data
+                DateTime writeStart = DateTime.Now;
+                outputFormat.WriteSectors(new byte[blockSize * _skip], currentSector, _skip);
+                imageWriteDuration += (DateTime.Now - writeStart).TotalSeconds;
+
+                // TODO: Handle errors in video partition
+                //errored += blocksToRead;
+                //resume.BadBlocks.Add(l1);
+                AaruConsole.DebugWriteLine("Dump-Media", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
+                mhddLog.Write(l1, cmdDuration < 500 ? 65535 : cmdDuration);
+
+                ibgLog.Write(l1, 0);
+                _dumpLog.WriteLine("Skipping {0} blocks from errored block {1}.", _skip, l1);
+                l1 += _skip - blocksToRead;
+
+                string[] senseLines = Sense.PrettifySense(senseBuf).Split(new[]
                 {
-                    Modes.ModePage_01_MMC pgMmc;
+                    Environment.NewLine
+                }, StringSplitOptions.RemoveEmptyEntries);
 
-                    sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
-                                            _dev.Timeout, out _);
+                foreach(string senseLine in senseLines)
+                    _dumpLog.WriteLine(senseLine);
+            }
 
-                    if(sense)
+            currentSector     += blocksToRead;
+            _resume.NextBlock =  currentSector;
+            sectorSpeedStart  += blocksToRead;
+
+            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+            if(elapsed <= 0)
+                continue;
+
+            currentSpeed     = sectorSpeedStart * blockSize / (1048576 * elapsed);
+            sectorSpeedStart = 0;
+            timeSpeedStart   = DateTime.UtcNow;
+        }
+
+        EndProgress?.Invoke();
+
+        UpdateStatus?.Invoke("Unlocking drive (Wxripper).");
+        _dumpLog.WriteLine("Unlocking drive (Wxripper).");
+        sense = _dev.KreonUnlockWxripper(out senseBuf, _dev.Timeout, out _);
+
+        if(sense)
+        {
+            _errorLog?.WriteLine("Kreon Wxripper unlock", _dev.Error, _dev.LastError, senseBuf);
+            _dumpLog.WriteLine("Cannot unlock drive, not continuing.");
+            StoppingErrorMessage?.Invoke("Cannot unlock drive, not continuing.");
+
+            return;
+        }
+
+        sense = _dev.ReadCapacity(out readBuffer, out senseBuf, _dev.Timeout, out _);
+
+        if(sense)
+        {
+            StoppingErrorMessage?.Invoke("Cannot get disc capacity.");
+
+            return;
+        }
+
+        end = DateTime.UtcNow;
+        AaruConsole.WriteLine();
+        mhddLog.Close();
+
+        ibgLog.Close(_dev, blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                     blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000), _devicePath);
+
+        UpdateStatus?.Invoke($"Dump finished in {(end - start).TotalSeconds} seconds.");
+
+        UpdateStatus?.
+            Invoke($"Average dump speed {blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000):F3} KiB/sec.");
+
+        UpdateStatus?.
+            Invoke($"Average write speed {blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration:F3} KiB/sec.");
+
+        _dumpLog.WriteLine("Dump finished in {0} seconds.", (end - start).TotalSeconds);
+
+        _dumpLog.WriteLine("Average dump speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / (totalDuration / 1000));
+
+        _dumpLog.WriteLine("Average write speed {0:F3} KiB/sec.",
+                           blockSize * (double)(blocks + 1) / 1024 / imageWriteDuration);
+
+        #region Trimming
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _trim                       &&
+           newTrim)
+        {
+            start = DateTime.UtcNow;
+            UpdateStatus?.Invoke("Trimming skipped sectors");
+            _dumpLog.WriteLine("Trimming skipped sectors");
+
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
+            InitProgress?.Invoke();
+
+            foreach(ulong badSector in tmpArray)
+            {
+                if(_aborted)
+                {
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                    _dumpLog.WriteLine("Aborted!");
+
+                    break;
+                }
+
+                PulseProgress?.Invoke($"Trimming sector {badSector}");
+
+                sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)badSector,
+                                    blockSize, 0, 1, false, _dev.Timeout, out cmdDuration);
+
+                totalDuration += cmdDuration;
+
+                if(sense || _dev.Error)
+                {
+                    _errorLog?.WriteLine(badSector, _dev.Error, _dev.LastError, senseBuf);
+
+                    continue;
+                }
+
+                _resume.BadBlocks.Remove(badSector);
+                extents.Add(badSector);
+                outputFormat.WriteSector(readBuffer, badSector);
+            }
+
+            EndProgress?.Invoke();
+            end = DateTime.UtcNow;
+            UpdateStatus?.Invoke($"Trimming finished in {(end - start).TotalSeconds} seconds.");
+            _dumpLog.WriteLine("Trimming finished in {0} seconds.", (end - start).TotalSeconds);
+        }
+        #endregion Trimming
+
+        #region Error handling
+        if(_resume.BadBlocks.Count > 0 &&
+           !_aborted                   &&
+           _retryPasses > 0)
+        {
+            List<ulong> tmpList = new List<ulong>();
+
+            foreach(ulong ur in _resume.BadBlocks)
+                for(ulong i = ur; i < ur + blocksToRead; i++)
+                    tmpList.Add(i);
+
+            tmpList.Sort();
+
+            int  pass              = 1;
+            bool forward           = true;
+            bool runningPersistent = false;
+
+            _resume.BadBlocks = tmpList;
+            Modes.ModePage? currentModePage = null;
+            byte[]          md6;
+            byte[]          md10;
+
+            if(_persistent)
+            {
+                Modes.ModePage_01_MMC pgMmc;
+
+                sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
+                                        _dev.Timeout, out _);
+
+                if(sense)
+                {
+                    sense = _dev.ModeSense10(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
+                                             _dev.Timeout, out _);
+
+                    if(!sense)
                     {
-                        sense = _dev.ModeSense10(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
-                                                 _dev.Timeout, out _);
+                        Modes.DecodedMode? dcMode10 =
+                            Modes.DecodeMode10(readBuffer, PeripheralDeviceTypes.MultiMediaDevice);
 
-                        if(!sense)
-                        {
-                            Modes.DecodedMode? dcMode10 =
-                                Modes.DecodeMode10(readBuffer, PeripheralDeviceTypes.MultiMediaDevice);
-
-                            if(dcMode10.HasValue)
-                                foreach(Modes.ModePage modePage in dcMode10.Value.Pages.Where(modePage =>
-                                    modePage.Page == 0x01 && modePage.Subpage == 0x00))
-                                    currentModePage = modePage;
-                        }
-                    }
-                    else
-                    {
-                        Modes.DecodedMode? dcMode6 =
-                            Modes.DecodeMode6(readBuffer, PeripheralDeviceTypes.MultiMediaDevice);
-
-                        if(dcMode6.HasValue)
-                            foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
-                                modePage.Page == 0x01 && modePage.Subpage == 0x00))
+                        if(dcMode10.HasValue)
+                            foreach(Modes.ModePage modePage in dcMode10.Value.Pages.Where(modePage =>
+                                        modePage.Page == 0x01 && modePage.Subpage == 0x00))
                                 currentModePage = modePage;
                     }
+                }
+                else
+                {
+                    Modes.DecodedMode? dcMode6 =
+                        Modes.DecodeMode6(readBuffer, PeripheralDeviceTypes.MultiMediaDevice);
 
-                    if(currentModePage == null)
+                    if(dcMode6.HasValue)
+                        foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>
+                                    modePage.Page == 0x01 && modePage.Subpage == 0x00))
+                            currentModePage = modePage;
+                }
+
+                if(currentModePage == null)
+                {
+                    pgMmc = new Modes.ModePage_01_MMC
                     {
-                        pgMmc = new Modes.ModePage_01_MMC
-                        {
-                            PS             = false,
-                            ReadRetryCount = 0x20,
-                            Parameter      = 0x00
-                        };
+                        PS             = false,
+                        ReadRetryCount = 0x20,
+                        Parameter      = 0x00
+                    };
 
-                        currentModePage = new Modes.ModePage
+                    currentModePage = new Modes.ModePage
+                    {
+                        Page         = 0x01,
+                        Subpage      = 0x00,
+                        PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
+                    };
+                }
+
+                pgMmc = new Modes.ModePage_01_MMC
+                {
+                    PS             = false,
+                    ReadRetryCount = 255,
+                    Parameter      = 0x20
+                };
+
+                var md = new Modes.DecodedMode
+                {
+                    Header = new Modes.ModeHeader(),
+                    Pages = new[]
+                    {
+                        new Modes.ModePage
                         {
                             Page         = 0x01,
                             Subpage      = 0x00,
                             PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
-                        };
-                    }
-
-                    pgMmc = new Modes.ModePage_01_MMC
-                    {
-                        PS             = false,
-                        ReadRetryCount = 255,
-                        Parameter      = 0x20
-                    };
-
-                    var md = new Modes.DecodedMode
-                    {
-                        Header = new Modes.ModeHeader(),
-                        Pages = new[]
-                        {
-                            new Modes.ModePage
-                            {
-                                Page         = 0x01,
-                                Subpage      = 0x00,
-                                PageResponse = Modes.EncodeModePage_01_MMC(pgMmc)
-                            }
                         }
-                    };
-
-                    md6  = Modes.EncodeMode6(md, _dev.ScsiType);
-                    md10 = Modes.EncodeMode10(md, _dev.ScsiType);
-
-                    UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks).");
-                    _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
-                    sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
-
-                    if(sense)
-                        sense = _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
-
-                    if(sense)
-                    {
-                        UpdateStatus?.
-                            Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
-
-                        AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
-
-                        _dumpLog.
-                            WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
                     }
-                    else
-                        runningPersistent = true;
-                }
+                };
 
-                InitProgress?.Invoke();
-                repeatRetry:
-                ulong[] tmpArray = _resume.BadBlocks.ToArray();
+                md6  = Modes.EncodeMode6(md, _dev.ScsiType);
+                md10 = Modes.EncodeMode10(md, _dev.ScsiType);
 
-                foreach(ulong badSector in tmpArray)
+                UpdateStatus?.Invoke("Sending MODE SELECT to drive (return damaged blocks).");
+                _dumpLog.WriteLine("Sending MODE SELECT to drive (return damaged blocks).");
+                sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
+
+                if(sense)
+                    sense = _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
+
+                if(sense)
                 {
-                    if(_aborted)
-                    {
-                        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-                        UpdateStatus?.Invoke("Aborted!");
-                        _dumpLog.WriteLine("Aborted!");
+                    UpdateStatus?.
+                        Invoke("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
 
-                        break;
-                    }
+                    AaruConsole.DebugWriteLine("Error: {0}", Sense.PrettifySense(senseBuf));
 
-                    PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
-                                                        forward ? "forward" : "reverse",
-                                                        runningPersistent ? "recovering partial data, " : ""));
-
-                    sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)badSector,
-                                        blockSize, 0, 1, false, _dev.Timeout, out cmdDuration);
-
-                    totalDuration += cmdDuration;
-
-                    if(sense || _dev.Error)
-                        _errorLog?.WriteLine(currentSector, _dev.Error, _dev.LastError, senseBuf);
-
-                    if(!sense &&
-                       !_dev.Error)
-                    {
-                        _resume.BadBlocks.Remove(badSector);
-                        extents.Add(badSector);
-                        outputFormat.WriteSector(readBuffer, badSector);
-                        UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
-                        _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
-                    }
-                    else if(runningPersistent)
-                        outputFormat.WriteSector(readBuffer, badSector);
+                    _dumpLog.
+                        WriteLine("Drive did not accept MODE SELECT command for persistent error reading, try another drive.");
                 }
-
-                if(pass < _retryPasses &&
-                   !_aborted           &&
-                   _resume.BadBlocks.Count > 0)
-                {
-                    pass++;
-                    forward = !forward;
-                    _resume.BadBlocks.Sort();
-
-                    if(!forward)
-                        _resume.BadBlocks.Reverse();
-
-                    goto repeatRetry;
-                }
-
-                if(runningPersistent && currentModePage.HasValue)
-                {
-                    var md = new Modes.DecodedMode
-                    {
-                        Header = new Modes.ModeHeader(),
-                        Pages = new[]
-                        {
-                            currentModePage.Value
-                        }
-                    };
-
-                    md6  = Modes.EncodeMode6(md, _dev.ScsiType);
-                    md10 = Modes.EncodeMode10(md, _dev.ScsiType);
-
-                    UpdateStatus?.Invoke("Sending MODE SELECT to drive (return device to previous status).");
-                    _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
-                    sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
-
-                    if(sense)
-                        _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
-                }
-
-                EndProgress?.Invoke();
-            }
-            #endregion Error handling
-
-            _resume.BadBlocks.Sort();
-            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-
-            foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags)
-            {
-                if(tag.Value is null)
-                {
-                    AaruConsole.ErrorWriteLine("Error: Tag type {0} is null, skipping...", tag.Key);
-
-                    continue;
-                }
-
-                ret = outputFormat.WriteMediaTag(tag.Value, tag.Key);
-
-                if(ret || _force)
-                    continue;
-
-                // Cannot write tag to image
-                _dumpLog.WriteLine($"Cannot write tag {tag.Key}.");
-
-                StoppingErrorMessage?.Invoke($"Cannot write tag {tag.Key}." + Environment.NewLine +
-                                             outputFormat.ErrorMessage);
-
-                return;
+                else
+                    runningPersistent = true;
             }
 
-            _resume.BadBlocks.Sort();
+            InitProgress?.Invoke();
+            repeatRetry:
+            ulong[] tmpArray = _resume.BadBlocks.ToArray();
 
-            foreach(ulong bad in _resume.BadBlocks)
-                _dumpLog.WriteLine("Sector {0} could not be read.", bad);
-
-            currentTry.Extents = ExtentsConverter.ToMetadata(extents);
-
-            outputFormat.SetDumpHardware(_resume.Tries);
-
-            var metadata = new CommonTypes.Structs.ImageInfo
+            foreach(ulong badSector in tmpArray)
             {
-                Application        = "Aaru",
-                ApplicationVersion = Version.GetVersion()
+                if(_aborted)
+                {
+                    currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+                    UpdateStatus?.Invoke("Aborted!");
+                    _dumpLog.WriteLine("Aborted!");
+
+                    break;
+                }
+
+                PulseProgress?.Invoke(string.Format("Retrying sector {0}, pass {1}, {3}{2}", badSector, pass,
+                                                    forward ? "forward" : "reverse",
+                                                    runningPersistent ? "recovering partial data, " : ""));
+
+                sense = _dev.Read12(out readBuffer, out senseBuf, 0, false, false, false, false, (uint)badSector,
+                                    blockSize, 0, 1, false, _dev.Timeout, out cmdDuration);
+
+                totalDuration += cmdDuration;
+
+                if(sense || _dev.Error)
+                    _errorLog?.WriteLine(currentSector, _dev.Error, _dev.LastError, senseBuf);
+
+                if(!sense &&
+                   !_dev.Error)
+                {
+                    _resume.BadBlocks.Remove(badSector);
+                    extents.Add(badSector);
+                    outputFormat.WriteSector(readBuffer, badSector);
+                    UpdateStatus?.Invoke($"Correctly retried block {badSector} in pass {pass}.");
+                    _dumpLog.WriteLine("Correctly retried block {0} in pass {1}.", badSector, pass);
+                }
+                else if(runningPersistent)
+                    outputFormat.WriteSector(readBuffer, badSector);
+            }
+
+            if(pass < _retryPasses &&
+               !_aborted           &&
+               _resume.BadBlocks.Count > 0)
+            {
+                pass++;
+                forward = !forward;
+                _resume.BadBlocks.Sort();
+
+                if(!forward)
+                    _resume.BadBlocks.Reverse();
+
+                goto repeatRetry;
+            }
+
+            if(runningPersistent && currentModePage.HasValue)
+            {
+                var md = new Modes.DecodedMode
+                {
+                    Header = new Modes.ModeHeader(),
+                    Pages = new[]
+                    {
+                        currentModePage.Value
+                    }
+                };
+
+                md6  = Modes.EncodeMode6(md, _dev.ScsiType);
+                md10 = Modes.EncodeMode10(md, _dev.ScsiType);
+
+                UpdateStatus?.Invoke("Sending MODE SELECT to drive (return device to previous status).");
+                _dumpLog.WriteLine("Sending MODE SELECT to drive (return device to previous status).");
+                sense = _dev.ModeSelect(md6, out senseBuf, true, false, _dev.Timeout, out _);
+
+                if(sense)
+                    _dev.ModeSelect10(md10, out senseBuf, true, false, _dev.Timeout, out _);
+            }
+
+            EndProgress?.Invoke();
+        }
+        #endregion Error handling
+
+        _resume.BadBlocks.Sort();
+        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+
+        foreach(KeyValuePair<MediaTagType, byte[]> tag in mediaTags)
+        {
+            if(tag.Value is null)
+            {
+                AaruConsole.ErrorWriteLine("Error: Tag type {0} is null, skipping...", tag.Key);
+
+                continue;
+            }
+
+            ret = outputFormat.WriteMediaTag(tag.Value, tag.Key);
+
+            if(ret || _force)
+                continue;
+
+            // Cannot write tag to image
+            _dumpLog.WriteLine($"Cannot write tag {tag.Key}.");
+
+            StoppingErrorMessage?.Invoke($"Cannot write tag {tag.Key}." + Environment.NewLine +
+                                         outputFormat.ErrorMessage);
+
+            return;
+        }
+
+        _resume.BadBlocks.Sort();
+
+        foreach(ulong bad in _resume.BadBlocks)
+            _dumpLog.WriteLine("Sector {0} could not be read.", bad);
+
+        currentTry.Extents = ExtentsConverter.ToMetadata(extents);
+
+        outputFormat.SetDumpHardware(_resume.Tries);
+
+        var metadata = new CommonTypes.Structs.ImageInfo
+        {
+            Application        = "Aaru",
+            ApplicationVersion = Version.GetVersion()
+        };
+
+        if(!outputFormat.SetMetadata(metadata))
+            ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
+                                 outputFormat.ErrorMessage);
+
+        if(_preSidecar != null)
+            outputFormat.SetCicmMetadata(_preSidecar);
+
+        _dumpLog.WriteLine("Closing output file.");
+        UpdateStatus?.Invoke("Closing output file.");
+        DateTime closeStart = DateTime.Now;
+        outputFormat.Close();
+        DateTime closeEnd = DateTime.Now;
+        UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
+        _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
+
+        if(_aborted)
+        {
+            UpdateStatus?.Invoke("Aborted!");
+            _dumpLog.WriteLine("Aborted!");
+
+            return;
+        }
+
+        double totalChkDuration = 0;
+
+        if(_metadata)
+        {
+            var layers = new LayersType
+            {
+                type          = LayersTypeType.OTP,
+                typeSpecified = true,
+                Sectors       = new SectorsType[1]
             };
 
-            if(!outputFormat.SetMetadata(metadata))
-                ErrorMessage?.Invoke("Error {0} setting metadata, continuing..." + Environment.NewLine +
-                                     outputFormat.ErrorMessage);
-
-            if(_preSidecar != null)
-                outputFormat.SetCicmMetadata(_preSidecar);
-
-            _dumpLog.WriteLine("Closing output file.");
-            UpdateStatus?.Invoke("Closing output file.");
-            DateTime closeStart = DateTime.Now;
-            outputFormat.Close();
-            DateTime closeEnd = DateTime.Now;
-            UpdateStatus?.Invoke($"Closed in {(closeEnd - closeStart).TotalSeconds} seconds.");
-            _dumpLog.WriteLine("Closed in {0} seconds.", (closeEnd - closeStart).TotalSeconds);
-
-            if(_aborted)
+            layers.Sectors[0] = new SectorsType
             {
-                UpdateStatus?.Invoke("Aborted!");
-                _dumpLog.WriteLine("Aborted!");
+                Value = layerBreak
+            };
 
-                return;
-            }
-
-            double totalChkDuration = 0;
-
-            if(_metadata)
-            {
-                var layers = new LayersType
-                {
-                    type          = LayersTypeType.OTP,
-                    typeSpecified = true,
-                    Sectors       = new SectorsType[1]
-                };
-
-                layers.Sectors[0] = new SectorsType
-                {
-                    Value = layerBreak
-                };
-
-                WriteOpticalSidecar(blockSize, blocks, dskType, layers, mediaTags, 1, out totalChkDuration, null);
-            }
-
-            UpdateStatus?.Invoke("");
-
-            UpdateStatus?.
-                Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
-
-            UpdateStatus?.
-                Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
-
-            if(maxSpeed > 0)
-                UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
-
-            if(minSpeed > 0 &&
-               minSpeed < double.MaxValue)
-                UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
-
-            UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
-            UpdateStatus?.Invoke("");
-
-            Statistics.AddMedia(dskType, true);
+            WriteOpticalSidecar(blockSize, blocks, dskType, layers, mediaTags, 1, out totalChkDuration, null);
         }
+
+        UpdateStatus?.Invoke("");
+
+        UpdateStatus?.
+            Invoke($"Took a total of {(end - start).TotalSeconds:F3} seconds ({totalDuration / 1000:F3} processing commands, {totalChkDuration / 1000:F3} checksumming, {imageWriteDuration:F3} writing, {(closeEnd - closeStart).TotalSeconds:F3} closing).");
+
+        UpdateStatus?.
+            Invoke($"Average speed: {blockSize * (double)(blocks + 1) / 1048576 / (totalDuration / 1000):F3} MiB/sec.");
+
+        if(maxSpeed > 0)
+            UpdateStatus?.Invoke($"Fastest speed burst: {maxSpeed:F3} MiB/sec.");
+
+        if(minSpeed > 0 &&
+           minSpeed < double.MaxValue)
+            UpdateStatus?.Invoke($"Slowest speed burst: {minSpeed:F3} MiB/sec.");
+
+        UpdateStatus?.Invoke($"{_resume.BadBlocks.Count} sectors could not be read.");
+        UpdateStatus?.Invoke("");
+
+        Statistics.AddMedia(dskType, true);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Info/DeviceInfo.cs b/Aaru.Core/Devices/Info/DeviceInfo.cs
index bf7ccb3ad..61916737b 100644
--- a/Aaru.Core/Devices/Info/DeviceInfo.cs
+++ b/Aaru.Core/Devices/Info/DeviceInfo.cs
@@ -45,575 +45,574 @@ using Aaru.Helpers;
 using DVDDecryption = Aaru.Decryption.DVD.Dump;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 
-namespace Aaru.Core.Devices.Info
+namespace Aaru.Core.Devices.Info;
+
+/// <summary>Obtains and contains information about a device</summary>
+public partial class DeviceInfo
 {
-    /// <summary>Obtains and contains information about a device</summary>
-    public partial class DeviceInfo
+    /// <summary>Initializes an instance of this class for the specified device</summary>
+    /// <param name="dev">Device</param>
+    public DeviceInfo(Device dev)
     {
-        /// <summary>Initializes an instance of this class for the specified device</summary>
-        /// <param name="dev">Device</param>
-        public DeviceInfo(Device dev)
+        Type                  = dev.Type;
+        Manufacturer          = dev.Manufacturer;
+        Model                 = dev.Model;
+        FirmwareRevision      = dev.FirmwareRevision;
+        Serial                = dev.Serial;
+        ScsiType              = dev.ScsiType;
+        IsRemovable           = dev.IsRemovable;
+        IsUsb                 = dev.IsUsb;
+        UsbVendorId           = dev.UsbVendorId;
+        UsbProductId          = dev.UsbProductId;
+        UsbDescriptors        = dev.UsbDescriptors;
+        UsbManufacturerString = dev.UsbManufacturerString;
+        UsbProductString      = dev.UsbProductString;
+        UsbSerialString       = dev.UsbSerialString;
+        IsFireWire            = dev.IsFireWire;
+        FireWireGuid          = dev.FireWireGuid;
+        FireWireModel         = dev.FireWireModel;
+        FireWireModelName     = dev.FireWireModelName;
+        FireWireVendor        = dev.FireWireVendor;
+        FireWireVendorName    = dev.FireWireVendorName;
+        IsCompactFlash        = dev.IsCompactFlash;
+        IsPcmcia              = dev.IsPcmcia;
+        Cis                   = dev.Cis;
+
+        switch(dev.Type)
         {
-            Type                  = dev.Type;
-            Manufacturer          = dev.Manufacturer;
-            Model                 = dev.Model;
-            FirmwareRevision      = dev.FirmwareRevision;
-            Serial                = dev.Serial;
-            ScsiType              = dev.ScsiType;
-            IsRemovable           = dev.IsRemovable;
-            IsUsb                 = dev.IsUsb;
-            UsbVendorId           = dev.UsbVendorId;
-            UsbProductId          = dev.UsbProductId;
-            UsbDescriptors        = dev.UsbDescriptors;
-            UsbManufacturerString = dev.UsbManufacturerString;
-            UsbProductString      = dev.UsbProductString;
-            UsbSerialString       = dev.UsbSerialString;
-            IsFireWire            = dev.IsFireWire;
-            FireWireGuid          = dev.FireWireGuid;
-            FireWireModel         = dev.FireWireModel;
-            FireWireModelName     = dev.FireWireModelName;
-            FireWireVendor        = dev.FireWireVendor;
-            FireWireVendorName    = dev.FireWireVendorName;
-            IsCompactFlash        = dev.IsCompactFlash;
-            IsPcmcia              = dev.IsPcmcia;
-            Cis                   = dev.Cis;
-
-            switch(dev.Type)
+            case DeviceType.ATA:
             {
-                case DeviceType.ATA:
+                bool sense = dev.AtaIdentify(out byte[] ataBuf, out AtaErrorRegistersChs errorRegisters);
+
+                if(sense)
                 {
-                    bool sense = dev.AtaIdentify(out byte[] ataBuf, out AtaErrorRegistersChs errorRegisters);
+                    AaruConsole.DebugWriteLine("Device-Info command", "STATUS = 0x{0:X2}", errorRegisters.Status);
+                    AaruConsole.DebugWriteLine("Device-Info command", "ERROR = 0x{0:X2}", errorRegisters.Error);
 
-                    if(sense)
-                    {
-                        AaruConsole.DebugWriteLine("Device-Info command", "STATUS = 0x{0:X2}", errorRegisters.Status);
-                        AaruConsole.DebugWriteLine("Device-Info command", "ERROR = 0x{0:X2}", errorRegisters.Error);
+                    AaruConsole.DebugWriteLine("Device-Info command", "NSECTOR = 0x{0:X2}",
+                                               errorRegisters.SectorCount);
 
-                        AaruConsole.DebugWriteLine("Device-Info command", "NSECTOR = 0x{0:X2}",
-                                                   errorRegisters.SectorCount);
+                    AaruConsole.DebugWriteLine("Device-Info command", "SECTOR = 0x{0:X2}", errorRegisters.Sector);
 
-                        AaruConsole.DebugWriteLine("Device-Info command", "SECTOR = 0x{0:X2}", errorRegisters.Sector);
+                    AaruConsole.DebugWriteLine("Device-Info command", "CYLHIGH = 0x{0:X2}",
+                                               errorRegisters.CylinderHigh);
 
-                        AaruConsole.DebugWriteLine("Device-Info command", "CYLHIGH = 0x{0:X2}",
-                                                   errorRegisters.CylinderHigh);
+                    AaruConsole.DebugWriteLine("Device-Info command", "CYLLOW = 0x{0:X2}",
+                                               errorRegisters.CylinderLow);
 
-                        AaruConsole.DebugWriteLine("Device-Info command", "CYLLOW = 0x{0:X2}",
-                                                   errorRegisters.CylinderLow);
+                    AaruConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}",
+                                               errorRegisters.DeviceHead);
 
-                        AaruConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}",
-                                                   errorRegisters.DeviceHead);
-
-                        AaruConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError);
-
-                        break;
-                    }
-
-                    if(dev.Error)
-                    {
-                        AaruConsole.ErrorWriteLine("Error {0} querying ATA IDENTIFY", dev.LastError);
-
-                        break;
-                    }
-
-                    AtaIdentify = ataBuf;
-
-                    dev.EnableMediaCardPassThrough(out errorRegisters, dev.Timeout, out _);
-
-                    if(errorRegisters.Sector      == 0xAA &&
-                       errorRegisters.SectorCount == 0x55)
-                        AtaMcptError = errorRegisters;
+                    AaruConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError);
 
                     break;
                 }
 
-                case DeviceType.ATAPI:
+                if(dev.Error)
                 {
-                    bool sense = dev.AtapiIdentify(out byte[] ataBuf, out AtaErrorRegistersChs errorRegisters);
+                    AaruConsole.ErrorWriteLine("Error {0} querying ATA IDENTIFY", dev.LastError);
 
-                    if(sense)
-                    {
-                        AaruConsole.DebugWriteLine("Device-Info command", "STATUS = 0x{0:X2}", errorRegisters.Status);
-                        AaruConsole.DebugWriteLine("Device-Info command", "ERROR = 0x{0:X2}", errorRegisters.Error);
-
-                        AaruConsole.DebugWriteLine("Device-Info command", "NSECTOR = 0x{0:X2}",
-                                                   errorRegisters.SectorCount);
-
-                        AaruConsole.DebugWriteLine("Device-Info command", "SECTOR = 0x{0:X2}", errorRegisters.Sector);
-
-                        AaruConsole.DebugWriteLine("Device-Info command", "CYLHIGH = 0x{0:X2}",
-                                                   errorRegisters.CylinderHigh);
-
-                        AaruConsole.DebugWriteLine("Device-Info command", "CYLLOW = 0x{0:X2}",
-                                                   errorRegisters.CylinderLow);
-
-                        AaruConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}",
-                                                   errorRegisters.DeviceHead);
-
-                        AaruConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError);
-
-                        break;
-                    }
-
-                    if(!dev.Error)
-                        AtapiIdentify = ataBuf;
-                    else
-                        AaruConsole.ErrorWriteLine("Error {0} querying ATA PACKET IDENTIFY", dev.LastError);
-
-                    // ATAPI devices are also SCSI devices
-                    goto case DeviceType.SCSI;
+                    break;
                 }
 
-                case DeviceType.SCSI:
+                AtaIdentify = ataBuf;
+
+                dev.EnableMediaCardPassThrough(out errorRegisters, dev.Timeout, out _);
+
+                if(errorRegisters.Sector      == 0xAA &&
+                   errorRegisters.SectorCount == 0x55)
+                    AtaMcptError = errorRegisters;
+
+                break;
+            }
+
+            case DeviceType.ATAPI:
+            {
+                bool sense = dev.AtapiIdentify(out byte[] ataBuf, out AtaErrorRegistersChs errorRegisters);
+
+                if(sense)
                 {
-                    bool sense = dev.ScsiInquiry(out byte[] inqBuf, out byte[] senseBuf);
+                    AaruConsole.DebugWriteLine("Device-Info command", "STATUS = 0x{0:X2}", errorRegisters.Status);
+                    AaruConsole.DebugWriteLine("Device-Info command", "ERROR = 0x{0:X2}", errorRegisters.Error);
 
-                    if(sense)
-                    {
-                        AaruConsole.ErrorWriteLine("SCSI error:\n{0}", Sense.PrettifySense(senseBuf));
+                    AaruConsole.DebugWriteLine("Device-Info command", "NSECTOR = 0x{0:X2}",
+                                               errorRegisters.SectorCount);
 
-                        break;
-                    }
+                    AaruConsole.DebugWriteLine("Device-Info command", "SECTOR = 0x{0:X2}", errorRegisters.Sector);
 
-                    ScsiInquiryData = inqBuf;
-                    ScsiInquiry     = Inquiry.Decode(inqBuf);
+                    AaruConsole.DebugWriteLine("Device-Info command", "CYLHIGH = 0x{0:X2}",
+                                               errorRegisters.CylinderHigh);
 
-                    sense = dev.ScsiInquiry(out inqBuf, out senseBuf, 0x00);
+                    AaruConsole.DebugWriteLine("Device-Info command", "CYLLOW = 0x{0:X2}",
+                                               errorRegisters.CylinderLow);
 
-                    if(!sense)
-                    {
-                        ScsiEvpdPages = new Dictionary<byte, byte[]>();
+                    AaruConsole.DebugWriteLine("Device-Info command", "DEVICE = 0x{0:X2}",
+                                               errorRegisters.DeviceHead);
 
-                        byte[] pages = EVPD.DecodePage00(inqBuf);
+                    AaruConsole.DebugWriteLine("Device-Info command", "Error code = {0}", dev.LastError);
 
-                        if(pages != null)
-                            foreach(byte page in pages)
-                            {
-                                sense = dev.ScsiInquiry(out inqBuf, out senseBuf, page);
+                    break;
+                }
 
-                                if(sense)
-                                    continue;
+                if(!dev.Error)
+                    AtapiIdentify = ataBuf;
+                else
+                    AaruConsole.ErrorWriteLine("Error {0} querying ATA PACKET IDENTIFY", dev.LastError);
 
-                                ScsiEvpdPages.Add(page, inqBuf);
-                            }
-                    }
+                // ATAPI devices are also SCSI devices
+                goto case DeviceType.SCSI;
+            }
 
-                    var devType = (PeripheralDeviceTypes)ScsiInquiry.Value.PeripheralDeviceType;
+            case DeviceType.SCSI:
+            {
+                bool sense = dev.ScsiInquiry(out byte[] inqBuf, out byte[] senseBuf);
 
-                    sense = dev.ModeSense10(out byte[] modeBuf, out senseBuf, false, true,
-                                            ScsiModeSensePageControl.Current, 0x3F, 0xFF, 5, out _);
+                if(sense)
+                {
+                    AaruConsole.ErrorWriteLine("SCSI error:\n{0}", Sense.PrettifySense(senseBuf));
+
+                    break;
+                }
+
+                ScsiInquiryData = inqBuf;
+                ScsiInquiry     = Inquiry.Decode(inqBuf);
+
+                sense = dev.ScsiInquiry(out inqBuf, out senseBuf, 0x00);
+
+                if(!sense)
+                {
+                    ScsiEvpdPages = new Dictionary<byte, byte[]>();
+
+                    byte[] pages = EVPD.DecodePage00(inqBuf);
+
+                    if(pages != null)
+                        foreach(byte page in pages)
+                        {
+                            sense = dev.ScsiInquiry(out inqBuf, out senseBuf, page);
+
+                            if(sense)
+                                continue;
+
+                            ScsiEvpdPages.Add(page, inqBuf);
+                        }
+                }
+
+                var devType = (PeripheralDeviceTypes)ScsiInquiry.Value.PeripheralDeviceType;
+
+                sense = dev.ModeSense10(out byte[] modeBuf, out senseBuf, false, true,
+                                        ScsiModeSensePageControl.Current, 0x3F, 0xFF, 5, out _);
+
+                if(!sense &&
+                   !dev.Error)
+                    ScsiModeSense10 = modeBuf;
+
+                if(sense || dev.Error)
+                {
+                    sense = dev.ModeSense10(out modeBuf, out senseBuf, false, true,
+                                            ScsiModeSensePageControl.Current, 0x3F, 0x00, 5, out _);
 
                     if(!sense &&
                        !dev.Error)
                         ScsiModeSense10 = modeBuf;
+                }
 
-                    if(sense || dev.Error)
-                    {
-                        sense = dev.ModeSense10(out modeBuf, out senseBuf, false, true,
-                                                ScsiModeSensePageControl.Current, 0x3F, 0x00, 5, out _);
+                if(!sense &&
+                   !dev.Error)
+                    ScsiMode = Modes.DecodeMode10(modeBuf, devType);
 
-                        if(!sense &&
-                           !dev.Error)
-                            ScsiModeSense10 = modeBuf;
-                    }
+                bool useMode10 = !(sense || dev.Error || !ScsiMode.HasValue);
 
-                    if(!sense &&
-                       !dev.Error)
-                        ScsiMode = Modes.DecodeMode10(modeBuf, devType);
+                sense = dev.ModeSense6(out modeBuf, out senseBuf, false, ScsiModeSensePageControl.Current, 0x3F,
+                                       0xFF, 5, out _);
 
-                    bool useMode10 = !(sense || dev.Error || !ScsiMode.HasValue);
+                if(!sense &&
+                   !dev.Error)
+                    ScsiModeSense6 = modeBuf;
 
+                if(sense || dev.Error)
+                {
                     sense = dev.ModeSense6(out modeBuf, out senseBuf, false, ScsiModeSensePageControl.Current, 0x3F,
-                                           0xFF, 5, out _);
+                                           0x00, 5, out _);
 
                     if(!sense &&
                        !dev.Error)
                         ScsiModeSense6 = modeBuf;
+                }
 
-                    if(sense || dev.Error)
+                if(sense || dev.Error)
+                {
+                    sense = dev.ModeSense(out modeBuf, out senseBuf, 5, out _);
+
+                    if(!sense &&
+                       !dev.Error)
+                        ScsiModeSense6 = modeBuf;
+                }
+
+                if(!sense     &&
+                   !dev.Error &&
+                   !useMode10)
+                    ScsiMode = Modes.DecodeMode6(modeBuf, devType);
+
+                switch(devType)
+                {
+                    case PeripheralDeviceTypes.MultiMediaDevice:
                     {
-                        sense = dev.ModeSense6(out modeBuf, out senseBuf, false, ScsiModeSensePageControl.Current, 0x3F,
-                                               0x00, 5, out _);
+                        sense = dev.GetConfiguration(out byte[] confBuf, out senseBuf, dev.Timeout, out _);
 
-                        if(!sense &&
-                           !dev.Error)
-                            ScsiModeSense6 = modeBuf;
-                    }
+                        if(!sense)
+                            MmcConfiguration = confBuf;
 
-                    if(sense || dev.Error)
-                    {
-                        sense = dev.ModeSense(out modeBuf, out senseBuf, 5, out _);
+                        var dvdDecrypt = new DVDDecryption(dev);
 
-                        if(!sense &&
-                           !dev.Error)
-                            ScsiModeSense6 = modeBuf;
-                    }
+                        sense = dvdDecrypt.ReadRpc(out byte[] cmdBuf, out _, DvdCssKeyClass.DvdCssCppmOrCprm,
+                                                   dev.Timeout, out _);
 
-                    if(!sense     &&
-                       !dev.Error &&
-                       !useMode10)
-                        ScsiMode = Modes.DecodeMode6(modeBuf, devType);
-
-                    switch(devType)
-                    {
-                        case PeripheralDeviceTypes.MultiMediaDevice:
+                        if(!sense)
                         {
-                            sense = dev.GetConfiguration(out byte[] confBuf, out senseBuf, dev.Timeout, out _);
+                            CSS_CPRM.RegionalPlaybackControlState? rpc =
+                                CSS_CPRM.DecodeRegionalPlaybackControlState(cmdBuf);
 
-                            if(!sense)
-                                MmcConfiguration = confBuf;
+                            if(rpc.HasValue)
+                                RPC = rpc;
+                        }
 
-                            var dvdDecrypt = new DVDDecryption(dev);
+                        // TODO: DVD drives respond correctly to BD status.
+                        // While specification says if no medium is present
+                        // it should inform all possible capabilities,
+                        // testing drives show only supported media capabilities.
+                        /*
+                        byte[] strBuf;
+                        sense = dev.ReadDiscStructure(out strBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out _);
 
-                            sense = dvdDecrypt.ReadRpc(out byte[] cmdBuf, out _, DvdCssKeyClass.DvdCssCppmOrCprm,
-                                                       dev.Timeout, out _);
-
-                            if(!sense)
+                        if (!sense)
+                        {
+                            Decoders.SCSI.DiscStructureCapabilities.Capability[] caps = Decoders.SCSI.DiscStructureCapabilities.Decode(strBuf);
+                            if (caps != null)
                             {
-                                CSS_CPRM.RegionalPlaybackControlState? rpc =
-                                    CSS_CPRM.DecodeRegionalPlaybackControlState(cmdBuf);
-
-                                if(rpc.HasValue)
-                                    RPC = rpc;
-                            }
-
-                            // TODO: DVD drives respond correctly to BD status.
-                            // While specification says if no medium is present
-                            // it should inform all possible capabilities,
-                            // testing drives show only supported media capabilities.
-                            /*
-                            byte[] strBuf;
-                            sense = dev.ReadDiscStructure(out strBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out _);
-
-                            if (!sense)
-                            {
-                                Decoders.SCSI.DiscStructureCapabilities.Capability[] caps = Decoders.SCSI.DiscStructureCapabilities.Decode(strBuf);
-                                if (caps != null)
+                                foreach (Decoders.SCSI.DiscStructureCapabilities.Capability cap in caps)
                                 {
-                                    foreach (Decoders.SCSI.DiscStructureCapabilities.Capability cap in caps)
+                                    if (cap.SDS && cap.RDS)
+                                        AaruConsole.WriteLine("Drive can READ/SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
+                                    else if (cap.SDS)
+                                        AaruConsole.WriteLine("Drive can SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
+                                    else if (cap.RDS)
+                                        AaruConsole.WriteLine("Drive can READ DISC STRUCTURE format {0:X2}h", cap.FormatCode);
+                                }
+                            }
+                        }
+
+                        sense = dev.ReadDiscStructure(out strBuf, out senseBuf, MmcDiscStructureMediaType.BD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out _);
+
+                        if (!sense)
+                        {
+                            Decoders.SCSI.DiscStructureCapabilities.Capability[] caps = Decoders.SCSI.DiscStructureCapabilities.Decode(strBuf);
+                            if (caps != null)
+                            {
+                                foreach (Decoders.SCSI.DiscStructureCapabilities.Capability cap in caps)
+                                {
+                                    if (cap.SDS && cap.RDS)
+                                        AaruConsole.WriteLine("Drive can READ/SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
+                                    else if (cap.SDS)
+                                        AaruConsole.WriteLine("Drive can SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
+                                    else if (cap.RDS)
+                                        AaruConsole.WriteLine("Drive can READ DISC STRUCTURE format {0:X2}h", cap.FormatCode);
+                                }
+                            }
+                        }
+                        */
+
+                        #region Plextor
+                        if(dev.Manufacturer == "PLEXTOR")
+                        {
+                            bool   plxtSense = true;
+                            bool   plxtDvd   = false;
+                            byte[] plxtBuf   = null;
+
+                            switch(dev.Model)
+                            {
+                                case "DVDR   PX-708A":
+                                case "DVDR   PX-708A2":
+                                case "DVDR   PX-712A":
+                                    plxtDvd = true;
+
+                                    plxtSense = dev.PlextorReadEeprom(out plxtBuf, out senseBuf, dev.Timeout,
+                                                                      out _);
+
+                                    break;
+                                case "DVDR   PX-714A":
+                                case "DVDR   PX-716A":
+                                case "DVDR   PX-716AL":
+                                case "DVDR   PX-755A":
+                                case "DVDR   PX-760A":
+                                {
+                                    plxtBuf = new byte[256 * 4];
+
+                                    for(byte i = 0; i < 4; i++)
                                     {
-                                        if (cap.SDS && cap.RDS)
-                                            AaruConsole.WriteLine("Drive can READ/SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
-                                        else if (cap.SDS)
-                                            AaruConsole.WriteLine("Drive can SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
-                                        else if (cap.RDS)
-                                            AaruConsole.WriteLine("Drive can READ DISC STRUCTURE format {0:X2}h", cap.FormatCode);
+                                        plxtSense = dev.PlextorReadEepromBlock(out byte[] plxtBufSmall,
+                                                                               out senseBuf, i, 256, dev.Timeout, out _);
+
+                                        if(plxtSense)
+                                            break;
+
+                                        Array.Copy(plxtBufSmall, 0, plxtBuf, i * 256, 256);
                                     }
+
+                                    plxtDvd = true;
+
+                                    break;
+                                }
+
+                                default:
+                                {
+                                    if(dev.Model.StartsWith("CD-R   ", StringComparison.Ordinal))
+                                        plxtSense = dev.PlextorReadEepromCdr(out plxtBuf, out senseBuf, dev.Timeout,
+                                                                             out _);
+
+                                    break;
                                 }
                             }
 
-                            sense = dev.ReadDiscStructure(out strBuf, out senseBuf, MmcDiscStructureMediaType.BD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out _);
-
-                            if (!sense)
+                            PlextorFeatures = new Plextor
                             {
-                                Decoders.SCSI.DiscStructureCapabilities.Capability[] caps = Decoders.SCSI.DiscStructureCapabilities.Decode(strBuf);
-                                if (caps != null)
-                                {
-                                    foreach (Decoders.SCSI.DiscStructureCapabilities.Capability cap in caps)
-                                    {
-                                        if (cap.SDS && cap.RDS)
-                                            AaruConsole.WriteLine("Drive can READ/SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
-                                        else if (cap.SDS)
-                                            AaruConsole.WriteLine("Drive can SEND DISC STRUCTURE format {0:X2}h", cap.FormatCode);
-                                        else if (cap.RDS)
-                                            AaruConsole.WriteLine("Drive can READ DISC STRUCTURE format {0:X2}h", cap.FormatCode);
-                                    }
-                                }
-                            }
-                            */
+                                IsDvd = plxtDvd
+                            };
 
-                            #region Plextor
-                            if(dev.Manufacturer == "PLEXTOR")
+                            if(!plxtSense)
                             {
-                                bool   plxtSense = true;
-                                bool   plxtDvd   = false;
-                                byte[] plxtBuf   = null;
-
-                                switch(dev.Model)
-                                {
-                                    case "DVDR   PX-708A":
-                                    case "DVDR   PX-708A2":
-                                    case "DVDR   PX-712A":
-                                        plxtDvd = true;
-
-                                        plxtSense = dev.PlextorReadEeprom(out plxtBuf, out senseBuf, dev.Timeout,
-                                                                          out _);
-
-                                        break;
-                                    case "DVDR   PX-714A":
-                                    case "DVDR   PX-716A":
-                                    case "DVDR   PX-716AL":
-                                    case "DVDR   PX-755A":
-                                    case "DVDR   PX-760A":
-                                    {
-                                        plxtBuf = new byte[256 * 4];
-
-                                        for(byte i = 0; i < 4; i++)
-                                        {
-                                            plxtSense = dev.PlextorReadEepromBlock(out byte[] plxtBufSmall,
-                                                out senseBuf, i, 256, dev.Timeout, out _);
-
-                                            if(plxtSense)
-                                                break;
-
-                                            Array.Copy(plxtBufSmall, 0, plxtBuf, i * 256, 256);
-                                        }
-
-                                        plxtDvd = true;
-
-                                        break;
-                                    }
-
-                                    default:
-                                    {
-                                        if(dev.Model.StartsWith("CD-R   ", StringComparison.Ordinal))
-                                            plxtSense = dev.PlextorReadEepromCdr(out plxtBuf, out senseBuf, dev.Timeout,
-                                                out _);
-
-                                        break;
-                                    }
-                                }
-
-                                PlextorFeatures = new Plextor
-                                {
-                                    IsDvd = plxtDvd
-                                };
-
-                                if(!plxtSense)
-                                {
-                                    PlextorFeatures.Eeprom = plxtBuf;
-
-                                    if(plxtDvd)
-                                    {
-                                        PlextorFeatures.Discs        = BigEndianBitConverter.ToUInt16(plxtBuf, 0x0120);
-                                        PlextorFeatures.CdReadTime   = BigEndianBitConverter.ToUInt32(plxtBuf, 0x0122);
-                                        PlextorFeatures.CdWriteTime  = BigEndianBitConverter.ToUInt32(plxtBuf, 0x0126);
-                                        PlextorFeatures.DvdReadTime  = BigEndianBitConverter.ToUInt32(plxtBuf, 0x012A);
-                                        PlextorFeatures.DvdWriteTime = BigEndianBitConverter.ToUInt32(plxtBuf, 0x012E);
-                                    }
-                                    else
-                                    {
-                                        PlextorFeatures.Discs       = BigEndianBitConverter.ToUInt16(plxtBuf, 0x0078);
-                                        PlextorFeatures.CdReadTime  = BigEndianBitConverter.ToUInt32(plxtBuf, 0x006C);
-                                        PlextorFeatures.CdWriteTime = BigEndianBitConverter.ToUInt32(plxtBuf, 0x007A);
-                                    }
-                                }
-
-                                plxtSense = dev.PlextorGetPoweRec(out senseBuf, out bool plxtPwrRecEnabled,
-                                                                  out ushort plxtPwrRecSpeed, dev.Timeout, out _);
-
-                                if(!plxtSense)
-                                {
-                                    PlextorFeatures.PoweRec = true;
-
-                                    if(plxtPwrRecEnabled)
-                                    {
-                                        PlextorFeatures.PoweRecEnabled          = true;
-                                        PlextorFeatures.PoweRecRecommendedSpeed = plxtPwrRecSpeed;
-
-                                        plxtSense = dev.PlextorGetSpeeds(out senseBuf, out ushort plxtPwrRecSelected,
-                                                                         out ushort plxtPwrRecMax,
-                                                                         out ushort plxtPwrRecLast, dev.Timeout, out _);
-
-                                        if(!plxtSense)
-                                        {
-                                            PlextorFeatures.PoweRecSelected = plxtPwrRecSelected;
-                                            PlextorFeatures.PoweRecMax      = plxtPwrRecMax;
-                                            PlextorFeatures.PoweRecLast     = plxtPwrRecLast;
-                                        }
-                                    }
-                                }
-
-                                // TODO: Check it with a drive
-                                plxtSense = dev.PlextorGetSilentMode(out plxtBuf, out senseBuf, dev.Timeout, out _);
-
-                                if(!plxtSense)
-                                    if(plxtBuf[0] == 1)
-                                    {
-                                        PlextorFeatures.SilentModeEnabled = true;
-                                        PlextorFeatures.AccessTimeLimit   = plxtBuf[1];
-
-                                        PlextorFeatures.CdReadSpeedLimit  = plxtBuf[2];
-                                        PlextorFeatures.DvdReadSpeedLimit = plxtBuf[3];
-                                        PlextorFeatures.CdWriteSpeedLimit = plxtBuf[4];
-
-                                        // TODO: Check which one is each one
-                                        /*
-                                            if(plxtBuf[6] > 0)
-                                                AaruConsole.WriteLine("\tTray eject speed limited to {0}",
-                                                                     -(plxtBuf[6] + 48));
-                                            if(plxtBuf[7] > 0)
-                                                AaruConsole.WriteLine("\tTray eject speed limited to {0}",
-                                                                     plxtBuf[7] - 47);
-                                        */
-                                    }
-
-                                plxtSense = dev.PlextorGetGigaRec(out plxtBuf, out senseBuf, dev.Timeout, out _);
-
-                                if(!plxtSense)
-                                    PlextorFeatures.GigaRec = true;
-
-                                plxtSense = dev.PlextorGetSecuRec(out plxtBuf, out senseBuf, dev.Timeout, out _);
-
-                                if(!plxtSense)
-                                    PlextorFeatures.SecuRec = true;
-
-                                plxtSense = dev.PlextorGetSpeedRead(out plxtBuf, out senseBuf, dev.Timeout, out _);
-
-                                if(!plxtSense)
-                                {
-                                    PlextorFeatures.SpeedRead = true;
-
-                                    if((plxtBuf[2] & 0x01) == 0x01)
-                                        PlextorFeatures.SpeedReadEnabled = true;
-                                }
-
-                                plxtSense = dev.PlextorGetHiding(out plxtBuf, out senseBuf, dev.Timeout, out _);
-
-                                if(!plxtSense)
-                                {
-                                    PlextorFeatures.Hiding = true;
-
-                                    if((plxtBuf[2] & 0x02) == 0x02)
-                                        PlextorFeatures.HidesRecordables = true;
-
-                                    if((plxtBuf[2] & 0x01) == 0x01)
-                                        PlextorFeatures.HidesSessions = true;
-                                }
-
-                                plxtSense = dev.PlextorGetVariRec(out plxtBuf, out senseBuf, false, dev.Timeout, out _);
-
-                                if(!plxtSense)
-                                    PlextorFeatures.VariRec = true;
+                                PlextorFeatures.Eeprom = plxtBuf;
 
                                 if(plxtDvd)
                                 {
-                                    plxtSense = dev.PlextorGetVariRec(out plxtBuf, out senseBuf, true, dev.Timeout,
-                                                                      out _);
-
-                                    if(!plxtSense)
-                                        PlextorFeatures.VariRecDvd = true;
-
-                                    plxtSense = dev.PlextorGetBitsetting(out plxtBuf, out senseBuf, false, dev.Timeout,
-                                                                         out _);
-
-                                    if(!plxtSense)
-                                        PlextorFeatures.BitSetting = true;
-
-                                    plxtSense = dev.PlextorGetBitsetting(out plxtBuf, out senseBuf, true, dev.Timeout,
-                                                                         out _);
-
-                                    if(!plxtSense)
-                                        PlextorFeatures.BitSettingDl = true;
-
-                                    plxtSense = dev.PlextorGetTestWriteDvdPlus(out plxtBuf, out senseBuf, dev.Timeout,
-                                                                               out _);
-
-                                    if(!plxtSense)
-                                        PlextorFeatures.DvdPlusWriteTest = true;
+                                    PlextorFeatures.Discs        = BigEndianBitConverter.ToUInt16(plxtBuf, 0x0120);
+                                    PlextorFeatures.CdReadTime   = BigEndianBitConverter.ToUInt32(plxtBuf, 0x0122);
+                                    PlextorFeatures.CdWriteTime  = BigEndianBitConverter.ToUInt32(plxtBuf, 0x0126);
+                                    PlextorFeatures.DvdReadTime  = BigEndianBitConverter.ToUInt32(plxtBuf, 0x012A);
+                                    PlextorFeatures.DvdWriteTime = BigEndianBitConverter.ToUInt32(plxtBuf, 0x012E);
+                                }
+                                else
+                                {
+                                    PlextorFeatures.Discs       = BigEndianBitConverter.ToUInt16(plxtBuf, 0x0078);
+                                    PlextorFeatures.CdReadTime  = BigEndianBitConverter.ToUInt32(plxtBuf, 0x006C);
+                                    PlextorFeatures.CdWriteTime = BigEndianBitConverter.ToUInt32(plxtBuf, 0x007A);
                                 }
                             }
-                            #endregion Plextor
 
-                            if(ScsiInquiry.Value.KreonPresent)
-                                if(!dev.KreonGetFeatureList(out senseBuf, out KreonFeatures krFeatures, dev.Timeout,
-                                                            out _))
-                                    KreonFeatures = krFeatures;
+                            plxtSense = dev.PlextorGetPoweRec(out senseBuf, out bool plxtPwrRecEnabled,
+                                                              out ushort plxtPwrRecSpeed, dev.Timeout, out _);
 
-                            break;
-                        }
-
-                        case PeripheralDeviceTypes.SequentialAccess:
-                        {
-                            sense = dev.ReadBlockLimits(out byte[] seqBuf, out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                                AaruConsole.ErrorWriteLine("READ BLOCK LIMITS:\n{0}", Sense.PrettifySense(senseBuf));
-                            else
-                                BlockLimits = seqBuf;
-
-                            sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                                AaruConsole.ErrorWriteLine("REPORT DENSITY SUPPORT:\n{0}",
-                                                           Sense.PrettifySense(senseBuf));
-                            else
+                            if(!plxtSense)
                             {
-                                DensitySupport       = seqBuf;
-                                DensitySupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf);
+                                PlextorFeatures.PoweRec = true;
+
+                                if(plxtPwrRecEnabled)
+                                {
+                                    PlextorFeatures.PoweRecEnabled          = true;
+                                    PlextorFeatures.PoweRecRecommendedSpeed = plxtPwrRecSpeed;
+
+                                    plxtSense = dev.PlextorGetSpeeds(out senseBuf, out ushort plxtPwrRecSelected,
+                                                                     out ushort plxtPwrRecMax,
+                                                                     out ushort plxtPwrRecLast, dev.Timeout, out _);
+
+                                    if(!plxtSense)
+                                    {
+                                        PlextorFeatures.PoweRecSelected = plxtPwrRecSelected;
+                                        PlextorFeatures.PoweRecMax      = plxtPwrRecMax;
+                                        PlextorFeatures.PoweRecLast     = plxtPwrRecLast;
+                                    }
+                                }
                             }
 
-                            sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, out _);
+                            // TODO: Check it with a drive
+                            plxtSense = dev.PlextorGetSilentMode(out plxtBuf, out senseBuf, dev.Timeout, out _);
 
-                            if(sense)
-                                AaruConsole.ErrorWriteLine("REPORT DENSITY SUPPORT (MEDIUM):\n{0}",
-                                                           Sense.PrettifySense(senseBuf));
-                            else
+                            if(!plxtSense)
+                                if(plxtBuf[0] == 1)
+                                {
+                                    PlextorFeatures.SilentModeEnabled = true;
+                                    PlextorFeatures.AccessTimeLimit   = plxtBuf[1];
+
+                                    PlextorFeatures.CdReadSpeedLimit  = plxtBuf[2];
+                                    PlextorFeatures.DvdReadSpeedLimit = plxtBuf[3];
+                                    PlextorFeatures.CdWriteSpeedLimit = plxtBuf[4];
+
+                                    // TODO: Check which one is each one
+                                    /*
+                                        if(plxtBuf[6] > 0)
+                                            AaruConsole.WriteLine("\tTray eject speed limited to {0}",
+                                                                 -(plxtBuf[6] + 48));
+                                        if(plxtBuf[7] > 0)
+                                            AaruConsole.WriteLine("\tTray eject speed limited to {0}",
+                                                                 plxtBuf[7] - 47);
+                                    */
+                                }
+
+                            plxtSense = dev.PlextorGetGigaRec(out plxtBuf, out senseBuf, dev.Timeout, out _);
+
+                            if(!plxtSense)
+                                PlextorFeatures.GigaRec = true;
+
+                            plxtSense = dev.PlextorGetSecuRec(out plxtBuf, out senseBuf, dev.Timeout, out _);
+
+                            if(!plxtSense)
+                                PlextorFeatures.SecuRec = true;
+
+                            plxtSense = dev.PlextorGetSpeedRead(out plxtBuf, out senseBuf, dev.Timeout, out _);
+
+                            if(!plxtSense)
                             {
-                                MediumDensitySupport   = seqBuf;
-                                MediaTypeSupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf);
+                                PlextorFeatures.SpeedRead = true;
+
+                                if((plxtBuf[2] & 0x01) == 0x01)
+                                    PlextorFeatures.SpeedReadEnabled = true;
                             }
 
-                            break;
+                            plxtSense = dev.PlextorGetHiding(out plxtBuf, out senseBuf, dev.Timeout, out _);
+
+                            if(!plxtSense)
+                            {
+                                PlextorFeatures.Hiding = true;
+
+                                if((plxtBuf[2] & 0x02) == 0x02)
+                                    PlextorFeatures.HidesRecordables = true;
+
+                                if((plxtBuf[2] & 0x01) == 0x01)
+                                    PlextorFeatures.HidesSessions = true;
+                            }
+
+                            plxtSense = dev.PlextorGetVariRec(out plxtBuf, out senseBuf, false, dev.Timeout, out _);
+
+                            if(!plxtSense)
+                                PlextorFeatures.VariRec = true;
+
+                            if(plxtDvd)
+                            {
+                                plxtSense = dev.PlextorGetVariRec(out plxtBuf, out senseBuf, true, dev.Timeout,
+                                                                  out _);
+
+                                if(!plxtSense)
+                                    PlextorFeatures.VariRecDvd = true;
+
+                                plxtSense = dev.PlextorGetBitsetting(out plxtBuf, out senseBuf, false, dev.Timeout,
+                                                                     out _);
+
+                                if(!plxtSense)
+                                    PlextorFeatures.BitSetting = true;
+
+                                plxtSense = dev.PlextorGetBitsetting(out plxtBuf, out senseBuf, true, dev.Timeout,
+                                                                     out _);
+
+                                if(!plxtSense)
+                                    PlextorFeatures.BitSettingDl = true;
+
+                                plxtSense = dev.PlextorGetTestWriteDvdPlus(out plxtBuf, out senseBuf, dev.Timeout,
+                                                                           out _);
+
+                                if(!plxtSense)
+                                    PlextorFeatures.DvdPlusWriteTest = true;
+                            }
                         }
+                        #endregion Plextor
+
+                        if(ScsiInquiry.Value.KreonPresent)
+                            if(!dev.KreonGetFeatureList(out senseBuf, out KreonFeatures krFeatures, dev.Timeout,
+                                                        out _))
+                                KreonFeatures = krFeatures;
+
+                        break;
                     }
 
-                    break;
+                    case PeripheralDeviceTypes.SequentialAccess:
+                    {
+                        sense = dev.ReadBlockLimits(out byte[] seqBuf, out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                            AaruConsole.ErrorWriteLine("READ BLOCK LIMITS:\n{0}", Sense.PrettifySense(senseBuf));
+                        else
+                            BlockLimits = seqBuf;
+
+                        sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                            AaruConsole.ErrorWriteLine("REPORT DENSITY SUPPORT:\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
+                        else
+                        {
+                            DensitySupport       = seqBuf;
+                            DensitySupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf);
+                        }
+
+                        sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, out _);
+
+                        if(sense)
+                            AaruConsole.ErrorWriteLine("REPORT DENSITY SUPPORT (MEDIUM):\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
+                        else
+                        {
+                            MediumDensitySupport   = seqBuf;
+                            MediaTypeSupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf);
+                        }
+
+                        break;
+                    }
                 }
 
-                case DeviceType.MMC:
-                {
-                    bool sense = dev.ReadCid(out byte[] mmcBuf, out _, dev.Timeout, out _);
-
-                    if(!sense)
-                        CID = mmcBuf;
-
-                    sense = dev.ReadCsd(out mmcBuf, out _, dev.Timeout, out _);
-
-                    if(!sense)
-                        CSD = mmcBuf;
-
-                    sense = dev.ReadOcr(out mmcBuf, out _, dev.Timeout, out _);
-
-                    if(!sense)
-                        OCR = mmcBuf;
-
-                    sense = dev.ReadExtendedCsd(out mmcBuf, out _, dev.Timeout, out _);
-
-                    if(!sense &&
-                       !ArrayHelpers.ArrayIsNullOrEmpty(mmcBuf))
-                        ExtendedCSD = mmcBuf;
-                }
-
-                    break;
-                case DeviceType.SecureDigital:
-                {
-                    bool sense = dev.ReadCid(out byte[] sdBuf, out _, dev.Timeout, out _);
-
-                    if(!sense)
-                        CID = sdBuf;
-
-                    sense = dev.ReadCsd(out sdBuf, out _, dev.Timeout, out _);
-
-                    if(!sense)
-                        CSD = sdBuf;
-
-                    sense = dev.ReadSdocr(out sdBuf, out _, dev.Timeout, out _);
-
-                    if(!sense)
-                        OCR = sdBuf;
-
-                    sense = dev.ReadScr(out sdBuf, out _, dev.Timeout, out _);
-
-                    if(!sense)
-                        SCR = sdBuf;
-                }
-
-                    break;
-                default:
-                    AaruConsole.ErrorWriteLine("Unknown device type {0}, cannot get information.", dev.Type);
-
-                    break;
+                break;
             }
+
+            case DeviceType.MMC:
+            {
+                bool sense = dev.ReadCid(out byte[] mmcBuf, out _, dev.Timeout, out _);
+
+                if(!sense)
+                    CID = mmcBuf;
+
+                sense = dev.ReadCsd(out mmcBuf, out _, dev.Timeout, out _);
+
+                if(!sense)
+                    CSD = mmcBuf;
+
+                sense = dev.ReadOcr(out mmcBuf, out _, dev.Timeout, out _);
+
+                if(!sense)
+                    OCR = mmcBuf;
+
+                sense = dev.ReadExtendedCsd(out mmcBuf, out _, dev.Timeout, out _);
+
+                if(!sense &&
+                   !ArrayHelpers.ArrayIsNullOrEmpty(mmcBuf))
+                    ExtendedCSD = mmcBuf;
+            }
+
+                break;
+            case DeviceType.SecureDigital:
+            {
+                bool sense = dev.ReadCid(out byte[] sdBuf, out _, dev.Timeout, out _);
+
+                if(!sense)
+                    CID = sdBuf;
+
+                sense = dev.ReadCsd(out sdBuf, out _, dev.Timeout, out _);
+
+                if(!sense)
+                    CSD = sdBuf;
+
+                sense = dev.ReadSdocr(out sdBuf, out _, dev.Timeout, out _);
+
+                if(!sense)
+                    OCR = sdBuf;
+
+                sense = dev.ReadScr(out sdBuf, out _, dev.Timeout, out _);
+
+                if(!sense)
+                    SCR = sdBuf;
+            }
+
+                break;
+            default:
+                AaruConsole.ErrorWriteLine("Unknown device type {0}, cannot get information.", dev.Type);
+
+                break;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Info/Plextor.cs b/Aaru.Core/Devices/Info/Plextor.cs
index 49907f297..f8da7d5ee 100644
--- a/Aaru.Core/Devices/Info/Plextor.cs
+++ b/Aaru.Core/Devices/Info/Plextor.cs
@@ -30,72 +30,71 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Core.Devices.Info
+namespace Aaru.Core.Devices.Info;
+
+/// <summary>Contains information about Plextor features</summary>
+public class Plextor
 {
-    /// <summary>Contains information about Plextor features</summary>
-    public class Plextor
-    {
-        /// <summary>Access time limit</summary>
-        public byte AccessTimeLimit;
-        /// <summary>Drive supports setting book type bit for DVD+R</summary>
-        public bool BitSetting;
-        /// <summary>Drive supports setting book type bit for DVD+R DL</summary>
-        public bool BitSettingDl;
-        /// <summary>CD read speed limit</summary>
-        public byte CdReadSpeedLimit;
-        /// <summary>Time drive has spent reading CDs</summary>
-        public uint CdReadTime;
-        /// <summary>CD write speed limit</summary>
-        public byte CdWriteSpeedLimit;
-        /// <summary>Time drive has spent writing CDs</summary>
-        public uint CdWriteTime;
-        /// <summary>Total number of loaded discs</summary>
-        public ushort Discs;
-        /// <summary>Drive supports test writing DVD+</summary>
-        public bool DvdPlusWriteTest;
-        /// <summary>DVD read limit</summary>
-        public byte DvdReadSpeedLimit;
-        /// <summary>Time drive has spent reading DVDs</summary>
-        public uint DvdReadTime;
-        /// <summary>Time drive has spent writing DVDs</summary>
-        public uint DvdWriteTime;
-        /// <summary>Raw contents of EEPROM</summary>
-        public byte[] Eeprom;
-        /// <summary>Drive supports GigaRec</summary>
-        public bool GigaRec;
-        /// <summary>Drive will show recordable CDs as embossed</summary>
-        public bool HidesRecordables;
-        /// <summary>Drive will hide sessions</summary>
-        public bool HidesSessions;
-        /// <summary>Drive supports hiding recordable CDs and sessions</summary>
-        public bool Hiding;
-        /// <summary>Drive is a DVD capable drive</summary>
-        public bool IsDvd;
-        /// <summary>Drive supports PoweRec</summary>
-        public bool PoweRec;
-        /// <summary>Drive has PoweRec enabled</summary>
-        public bool PoweRecEnabled;
-        /// <summary>Last used PoweRec in KiB/sec</summary>
-        public ushort PoweRecLast;
-        /// <summary>Maximum supported PoweRec for currently inserted media in KiB/sec</summary>
-        public ushort PoweRecMax;
-        /// <summary>Recommended supported PoweRec for currently inserted media in KiB/sec</summary>
-        public ushort PoweRecRecommendedSpeed;
-        /// <summary>Selected supported PoweRec for currently inserted media in KiB/sec</summary>
-        public ushort PoweRecSelected;
-        /// <summary>Drive supports SecuRec</summary>
-        public bool SecuRec;
-        /// <summary>Drive supports SilentMode</summary>
-        public bool SilentMode;
-        /// <summary>Drive has SilentMode enabled</summary>
-        public bool SilentModeEnabled;
-        /// <summary>Drive supports SpeedRead</summary>
-        public bool SpeedRead;
-        /// <summary>Drive has SpeedRead enabled</summary>
-        public bool SpeedReadEnabled;
-        /// <summary>Drive supports VariRec</summary>
-        public bool VariRec;
-        /// <summary>Drive supports VariRec for DVDs</summary>
-        public bool VariRecDvd;
-    }
+    /// <summary>Access time limit</summary>
+    public byte AccessTimeLimit;
+    /// <summary>Drive supports setting book type bit for DVD+R</summary>
+    public bool BitSetting;
+    /// <summary>Drive supports setting book type bit for DVD+R DL</summary>
+    public bool BitSettingDl;
+    /// <summary>CD read speed limit</summary>
+    public byte CdReadSpeedLimit;
+    /// <summary>Time drive has spent reading CDs</summary>
+    public uint CdReadTime;
+    /// <summary>CD write speed limit</summary>
+    public byte CdWriteSpeedLimit;
+    /// <summary>Time drive has spent writing CDs</summary>
+    public uint CdWriteTime;
+    /// <summary>Total number of loaded discs</summary>
+    public ushort Discs;
+    /// <summary>Drive supports test writing DVD+</summary>
+    public bool DvdPlusWriteTest;
+    /// <summary>DVD read limit</summary>
+    public byte DvdReadSpeedLimit;
+    /// <summary>Time drive has spent reading DVDs</summary>
+    public uint DvdReadTime;
+    /// <summary>Time drive has spent writing DVDs</summary>
+    public uint DvdWriteTime;
+    /// <summary>Raw contents of EEPROM</summary>
+    public byte[] Eeprom;
+    /// <summary>Drive supports GigaRec</summary>
+    public bool GigaRec;
+    /// <summary>Drive will show recordable CDs as embossed</summary>
+    public bool HidesRecordables;
+    /// <summary>Drive will hide sessions</summary>
+    public bool HidesSessions;
+    /// <summary>Drive supports hiding recordable CDs and sessions</summary>
+    public bool Hiding;
+    /// <summary>Drive is a DVD capable drive</summary>
+    public bool IsDvd;
+    /// <summary>Drive supports PoweRec</summary>
+    public bool PoweRec;
+    /// <summary>Drive has PoweRec enabled</summary>
+    public bool PoweRecEnabled;
+    /// <summary>Last used PoweRec in KiB/sec</summary>
+    public ushort PoweRecLast;
+    /// <summary>Maximum supported PoweRec for currently inserted media in KiB/sec</summary>
+    public ushort PoweRecMax;
+    /// <summary>Recommended supported PoweRec for currently inserted media in KiB/sec</summary>
+    public ushort PoweRecRecommendedSpeed;
+    /// <summary>Selected supported PoweRec for currently inserted media in KiB/sec</summary>
+    public ushort PoweRecSelected;
+    /// <summary>Drive supports SecuRec</summary>
+    public bool SecuRec;
+    /// <summary>Drive supports SilentMode</summary>
+    public bool SilentMode;
+    /// <summary>Drive has SilentMode enabled</summary>
+    public bool SilentModeEnabled;
+    /// <summary>Drive supports SpeedRead</summary>
+    public bool SpeedRead;
+    /// <summary>Drive has SpeedRead enabled</summary>
+    public bool SpeedReadEnabled;
+    /// <summary>Drive supports VariRec</summary>
+    public bool VariRec;
+    /// <summary>Drive supports VariRec for DVDs</summary>
+    public bool VariRecDvd;
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Info/Properties.cs b/Aaru.Core/Devices/Info/Properties.cs
index 89946a524..0f9271780 100644
--- a/Aaru.Core/Devices/Info/Properties.cs
+++ b/Aaru.Core/Devices/Info/Properties.cs
@@ -40,101 +40,100 @@ using Aaru.Decoders.SCSI.SSC;
 using Aaru.Devices;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 
-namespace Aaru.Core.Devices.Info
+namespace Aaru.Core.Devices.Info;
+
+public partial class DeviceInfo
 {
-    public partial class DeviceInfo
-    {
-        /// <summary>Raw IDENTIFY DEVICE response</summary>
-        public byte[] AtaIdentify { get; }
-        /// <summary>Raw IDENTIFY PACKET DEVICE response</summary>
-        public byte[] AtapiIdentify { get; }
-        /// <summary>Raw INQUIRY response</summary>
-        public byte[] ScsiInquiryData { get; }
-        /// <summary>Decoded INQUIRY response</summary>
-        public Inquiry? ScsiInquiry { get; }
-        /// <summary>Response for ATA Memory Card Pass Through</summary>
-        public AtaErrorRegistersChs? AtaMcptError { get; }
-        /// <summary>List of raw EVPD page indexed by page number</summary>
-        public Dictionary<byte, byte[]> ScsiEvpdPages { get; }
-        /// <summary>Decoded MODE SENSE response</summary>
-        public Modes.DecodedMode? ScsiMode { get; }
-        /// <summary>Raw MODE SENSE(6) response</summary>
-        public byte[] ScsiModeSense6 { get; }
-        /// <summary>Raw MODE SENSE(10) response</summary>
-        public byte[] ScsiModeSense10 { get; }
-        /// <summary>Raw GET CONFIGURATION response</summary>
-        public byte[] MmcConfiguration { get; }
-        /// <summary>Decoded Plextor features</summary>
-        public Plextor PlextorFeatures { get; }
-        /// <summary>Decoded Kreon features</summary>
-        public KreonFeatures KreonFeatures { get; }
-        /// <summary>Raw GET BLOCK LIMITS support</summary>
-        public byte[] BlockLimits { get; }
-        /// <summary>Raw density support</summary>
-        public byte[] DensitySupport { get; }
-        /// <summary>Decoded density support</summary>
-        public DensitySupport.DensitySupportHeader? DensitySupportHeader { get; }
-        /// <summary>Raw medium density support</summary>
-        public byte[] MediumDensitySupport { get; }
-        /// <summary>Decoded medium density support</summary>
-        public DensitySupport.MediaTypeSupportHeader? MediaTypeSupportHeader { get; }
-        /// <summary>Raw CID registers</summary>
-        public byte[] CID { get; }
-        /// <summary>Raw CSD</summary>
-        public byte[] CSD { get; }
-        /// <summary>Raw extended CSD</summary>
-        public byte[] ExtendedCSD { get; }
-        /// <summary>Raw SCR registers</summary>
-        public byte[] SCR { get; }
-        /// <summary>Raw OCR registers</summary>
-        public byte[] OCR { get; }
-        /// <summary>Aaru's device type</summary>
-        public DeviceType Type { get; }
-        /// <summary>Device manufacturer</summary>
-        public string Manufacturer { get; }
-        /// <summary>Device model</summary>
-        public string Model { get; }
-        /// <summary>Device firmware version or revision</summary>
-        public string FirmwareRevision { get; }
-        /// <summary>Device serial number</summary>
-        public string Serial { get; }
-        /// <summary>SCSI Peripheral Device Type</summary>
-        public PeripheralDeviceTypes ScsiType { get; }
-        /// <summary>Is media removable from device?</summary>
-        public bool IsRemovable { get; }
-        /// <summary>Is device attached via USB?</summary>
-        public bool IsUsb { get; }
-        /// <summary>USB vendor ID</summary>
-        public ushort UsbVendorId { get; }
-        /// <summary>USB product ID</summary>
-        public ushort UsbProductId { get; }
-        /// <summary>Raw USB descriptors</summary>
-        public byte[] UsbDescriptors { get; }
-        /// <summary>USB manufacturer string</summary>
-        public string UsbManufacturerString { get; }
-        /// <summary>USB product string</summary>
-        public string UsbProductString { get; }
-        /// <summary>USB serial number string</summary>
-        public string UsbSerialString { get; }
-        /// <summary>Is device attached via FireWire?</summary>
-        public bool IsFireWire { get; }
-        /// <summary>FireWire's device GUID</summary>
-        public ulong FireWireGuid { get; }
-        /// <summary>FireWire's device model ID</summary>
-        public uint FireWireModel { get; }
-        /// <summary>FireWire's device model name</summary>
-        public string FireWireModelName { get; }
-        /// <summary>FireWire's device vendor ID</summary>
-        public uint FireWireVendor { get; }
-        /// <summary>FireWire's device vendor name</summary>
-        public string FireWireVendorName { get; }
-        /// <summary>Is device a CompactFlash device?</summary>
-        public bool IsCompactFlash { get; }
-        /// <summary>Is device a PCMCIA or CardBus device?</summary>
-        public bool IsPcmcia { get; }
-        /// <summary>PCMCIA/CardBus CIS</summary>
-        public byte[] Cis { get; }
-        /// <summary>MMC device CSS/CPRM Region Protection Code</summary>
-        public CSS_CPRM.RegionalPlaybackControlState? RPC { get; }
-    }
+    /// <summary>Raw IDENTIFY DEVICE response</summary>
+    public byte[] AtaIdentify { get; }
+    /// <summary>Raw IDENTIFY PACKET DEVICE response</summary>
+    public byte[] AtapiIdentify { get; }
+    /// <summary>Raw INQUIRY response</summary>
+    public byte[] ScsiInquiryData { get; }
+    /// <summary>Decoded INQUIRY response</summary>
+    public Inquiry? ScsiInquiry { get; }
+    /// <summary>Response for ATA Memory Card Pass Through</summary>
+    public AtaErrorRegistersChs? AtaMcptError { get; }
+    /// <summary>List of raw EVPD page indexed by page number</summary>
+    public Dictionary<byte, byte[]> ScsiEvpdPages { get; }
+    /// <summary>Decoded MODE SENSE response</summary>
+    public Modes.DecodedMode? ScsiMode { get; }
+    /// <summary>Raw MODE SENSE(6) response</summary>
+    public byte[] ScsiModeSense6 { get; }
+    /// <summary>Raw MODE SENSE(10) response</summary>
+    public byte[] ScsiModeSense10 { get; }
+    /// <summary>Raw GET CONFIGURATION response</summary>
+    public byte[] MmcConfiguration { get; }
+    /// <summary>Decoded Plextor features</summary>
+    public Plextor PlextorFeatures { get; }
+    /// <summary>Decoded Kreon features</summary>
+    public KreonFeatures KreonFeatures { get; }
+    /// <summary>Raw GET BLOCK LIMITS support</summary>
+    public byte[] BlockLimits { get; }
+    /// <summary>Raw density support</summary>
+    public byte[] DensitySupport { get; }
+    /// <summary>Decoded density support</summary>
+    public DensitySupport.DensitySupportHeader? DensitySupportHeader { get; }
+    /// <summary>Raw medium density support</summary>
+    public byte[] MediumDensitySupport { get; }
+    /// <summary>Decoded medium density support</summary>
+    public DensitySupport.MediaTypeSupportHeader? MediaTypeSupportHeader { get; }
+    /// <summary>Raw CID registers</summary>
+    public byte[] CID { get; }
+    /// <summary>Raw CSD</summary>
+    public byte[] CSD { get; }
+    /// <summary>Raw extended CSD</summary>
+    public byte[] ExtendedCSD { get; }
+    /// <summary>Raw SCR registers</summary>
+    public byte[] SCR { get; }
+    /// <summary>Raw OCR registers</summary>
+    public byte[] OCR { get; }
+    /// <summary>Aaru's device type</summary>
+    public DeviceType Type { get; }
+    /// <summary>Device manufacturer</summary>
+    public string Manufacturer { get; }
+    /// <summary>Device model</summary>
+    public string Model { get; }
+    /// <summary>Device firmware version or revision</summary>
+    public string FirmwareRevision { get; }
+    /// <summary>Device serial number</summary>
+    public string Serial { get; }
+    /// <summary>SCSI Peripheral Device Type</summary>
+    public PeripheralDeviceTypes ScsiType { get; }
+    /// <summary>Is media removable from device?</summary>
+    public bool IsRemovable { get; }
+    /// <summary>Is device attached via USB?</summary>
+    public bool IsUsb { get; }
+    /// <summary>USB vendor ID</summary>
+    public ushort UsbVendorId { get; }
+    /// <summary>USB product ID</summary>
+    public ushort UsbProductId { get; }
+    /// <summary>Raw USB descriptors</summary>
+    public byte[] UsbDescriptors { get; }
+    /// <summary>USB manufacturer string</summary>
+    public string UsbManufacturerString { get; }
+    /// <summary>USB product string</summary>
+    public string UsbProductString { get; }
+    /// <summary>USB serial number string</summary>
+    public string UsbSerialString { get; }
+    /// <summary>Is device attached via FireWire?</summary>
+    public bool IsFireWire { get; }
+    /// <summary>FireWire's device GUID</summary>
+    public ulong FireWireGuid { get; }
+    /// <summary>FireWire's device model ID</summary>
+    public uint FireWireModel { get; }
+    /// <summary>FireWire's device model name</summary>
+    public string FireWireModelName { get; }
+    /// <summary>FireWire's device vendor ID</summary>
+    public uint FireWireVendor { get; }
+    /// <summary>FireWire's device vendor name</summary>
+    public string FireWireVendorName { get; }
+    /// <summary>Is device a CompactFlash device?</summary>
+    public bool IsCompactFlash { get; }
+    /// <summary>Is device a PCMCIA or CardBus device?</summary>
+    public bool IsPcmcia { get; }
+    /// <summary>PCMCIA/CardBus CIS</summary>
+    public byte[] Cis { get; }
+    /// <summary>MMC device CSS/CPRM Region Protection Code</summary>
+    public CSS_CPRM.RegionalPlaybackControlState? RPC { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Reader.cs b/Aaru.Core/Devices/Reader.cs
index 003d784f3..1c35c8ed0 100644
--- a/Aaru.Core/Devices/Reader.cs
+++ b/Aaru.Core/Devices/Reader.cs
@@ -36,172 +36,171 @@ using Aaru.CommonTypes.Structs.Devices.ATA;
 using Aaru.Core.Logging;
 using Aaru.Devices;
 
-namespace Aaru.Core.Devices
+namespace Aaru.Core.Devices;
+
+/// <summary>Reduces common code used for scanning and dumping</summary>
+internal sealed partial class Reader
 {
-    /// <summary>Reduces common code used for scanning and dumping</summary>
-    internal sealed partial class Reader
+    readonly Device   _dev;
+    readonly ErrorLog _errorLog;
+    readonly uint     _timeout;
+
+    internal Reader(Device dev, uint timeout, byte[] identification, ErrorLog errorLog, bool raw = false)
     {
-        readonly Device   _dev;
-        readonly ErrorLog _errorLog;
-        readonly uint     _timeout;
+        _dev         = dev;
+        _timeout     = timeout;
+        BlocksToRead = 64;
+        CanReadRaw   = raw;
+        _errorLog    = errorLog;
 
-        internal Reader(Device dev, uint timeout, byte[] identification, ErrorLog errorLog, bool raw = false)
+        switch(dev.Type)
         {
-            _dev         = dev;
-            _timeout     = timeout;
-            BlocksToRead = 64;
-            CanReadRaw   = raw;
-            _errorLog    = errorLog;
+            case DeviceType.ATA:
+                Identify.IdentifyDevice? ataIdNullable = Identify.Decode(identification);
 
-            switch(dev.Type)
-            {
-                case DeviceType.ATA:
-                    Identify.IdentifyDevice? ataIdNullable = Identify.Decode(identification);
+                if(ataIdNullable.HasValue)
+                    _ataId = ataIdNullable.Value;
 
-                    if(ataIdNullable.HasValue)
-                        _ataId = ataIdNullable.Value;
-
-                    break;
-                case DeviceType.NVMe: throw new NotImplementedException("NVMe devices not yet supported.");
-            }
+                break;
+            case DeviceType.NVMe: throw new NotImplementedException("NVMe devices not yet supported.");
         }
+    }
 
-        internal string ErrorMessage      { get; private set; }
-        internal ulong  Blocks            { get; private set; }
-        internal uint   BlocksToRead      { get; private set; }
-        internal uint   LogicalBlockSize  { get; private set; }
-        internal uint   PhysicalBlockSize { get; private set; }
-        internal uint   LongBlockSize     { get; private set; }
-        internal bool   CanReadRaw        { get; private set; }
-        internal bool   CanSeek           => _ataSeek    || _seek6 || _seek10;
-        internal bool   CanSeekLba        => _ataSeekLba || _seek6 || _seek10;
+    internal string ErrorMessage      { get; private set; }
+    internal ulong  Blocks            { get; private set; }
+    internal uint   BlocksToRead      { get; private set; }
+    internal uint   LogicalBlockSize  { get; private set; }
+    internal uint   PhysicalBlockSize { get; private set; }
+    internal uint   LongBlockSize     { get; private set; }
+    internal bool   CanReadRaw        { get; private set; }
+    internal bool   CanSeek           => _ataSeek    || _seek6 || _seek10;
+    internal bool   CanSeekLba        => _ataSeekLba || _seek6 || _seek10;
 
-        internal ulong GetDeviceBlocks()
+    internal ulong GetDeviceBlocks()
+    {
+        switch(_dev.Type)
         {
-            switch(_dev.Type)
-            {
-                case DeviceType.ATA: return AtaGetBlocks();
-                case DeviceType.ATAPI:
-                case DeviceType.SCSI: return ScsiGetBlocks();
-                default:
-                    ErrorMessage = $"Unknown device type {_dev.Type}.";
+            case DeviceType.ATA: return AtaGetBlocks();
+            case DeviceType.ATAPI:
+            case DeviceType.SCSI: return ScsiGetBlocks();
+            default:
+                ErrorMessage = $"Unknown device type {_dev.Type}.";
 
-                    return 0;
-            }
+                return 0;
         }
+    }
 
-        internal bool FindReadCommand()
+    internal bool FindReadCommand()
+    {
+        switch(_dev.Type)
         {
-            switch(_dev.Type)
-            {
-                case DeviceType.ATA: return AtaFindReadCommand();
-                case DeviceType.ATAPI:
-                case DeviceType.SCSI: return ScsiFindReadCommand();
-                default:
-                    ErrorMessage = $"Unknown device type {_dev.Type}.";
+            case DeviceType.ATA: return AtaFindReadCommand();
+            case DeviceType.ATAPI:
+            case DeviceType.SCSI: return ScsiFindReadCommand();
+            default:
+                ErrorMessage = $"Unknown device type {_dev.Type}.";
 
-                    return true;
-            }
+                return true;
         }
+    }
 
-        internal bool GetBlockSize()
+    internal bool GetBlockSize()
+    {
+        switch(_dev.Type)
         {
-            switch(_dev.Type)
-            {
-                case DeviceType.ATA: return AtaGetBlockSize();
-                case DeviceType.ATAPI:
-                case DeviceType.SCSI: return ScsiGetBlockSize();
-                default:
-                    ErrorMessage = $"Unknown device type {_dev.Type}.";
+            case DeviceType.ATA: return AtaGetBlockSize();
+            case DeviceType.ATAPI:
+            case DeviceType.SCSI: return ScsiGetBlockSize();
+            default:
+                ErrorMessage = $"Unknown device type {_dev.Type}.";
 
-                    return true;
-            }
+                return true;
         }
+    }
 
-        internal bool GetBlocksToRead(uint startWithBlocks = 64)
+    internal bool GetBlocksToRead(uint startWithBlocks = 64)
+    {
+        switch(_dev.Type)
         {
-            switch(_dev.Type)
-            {
-                case DeviceType.ATA: return AtaGetBlocksToRead(startWithBlocks);
-                case DeviceType.ATAPI:
-                case DeviceType.SCSI: return ScsiGetBlocksToRead(startWithBlocks);
-                default:
-                    ErrorMessage = $"Unknown device type {_dev.Type}.";
+            case DeviceType.ATA: return AtaGetBlocksToRead(startWithBlocks);
+            case DeviceType.ATAPI:
+            case DeviceType.SCSI: return ScsiGetBlocksToRead(startWithBlocks);
+            default:
+                ErrorMessage = $"Unknown device type {_dev.Type}.";
 
-                    return true;
-            }
+                return true;
         }
+    }
 
-        internal bool ReadBlock(out byte[] buffer, ulong block, out double duration, out bool recoveredError,
-                                out bool blankCheck) =>
-            ReadBlocks(out buffer, block, 1, out duration, out recoveredError, out blankCheck);
+    internal bool ReadBlock(out byte[] buffer, ulong block, out double duration, out bool recoveredError,
+                            out bool blankCheck) =>
+        ReadBlocks(out buffer, block, 1, out duration, out recoveredError, out blankCheck);
 
-        internal bool ReadBlocks(out byte[] buffer, ulong block, out double duration, out bool recoveredError,
-                                 out bool blankCheck) => ReadBlocks(out buffer, block, BlocksToRead, out duration,
-                                                                    out recoveredError, out blankCheck);
+    internal bool ReadBlocks(out byte[] buffer, ulong block, out double duration, out bool recoveredError,
+                             out bool blankCheck) => ReadBlocks(out buffer, block, BlocksToRead, out duration,
+                                                                out recoveredError, out blankCheck);
 
-        internal bool ReadBlocks(out byte[] buffer, ulong block, uint count, out double duration,
-                                 out bool recoveredError, out bool blankCheck)
+    internal bool ReadBlocks(out byte[] buffer, ulong block, uint count, out double duration,
+                             out bool recoveredError, out bool blankCheck)
+    {
+        switch(_dev.Type)
         {
-            switch(_dev.Type)
-            {
-                case DeviceType.ATA:
-                    blankCheck = false;
+            case DeviceType.ATA:
+                blankCheck = false;
 
-                    return AtaReadBlocks(out buffer, block, count, out duration, out recoveredError);
-                case DeviceType.ATAPI:
-                case DeviceType.SCSI:
-                    return ScsiReadBlocks(out buffer, block, count, out duration, out recoveredError, out blankCheck);
-                default:
-                    buffer         = null;
-                    duration       = 0d;
-                    recoveredError = false;
-                    blankCheck     = false;
+                return AtaReadBlocks(out buffer, block, count, out duration, out recoveredError);
+            case DeviceType.ATAPI:
+            case DeviceType.SCSI:
+                return ScsiReadBlocks(out buffer, block, count, out duration, out recoveredError, out blankCheck);
+            default:
+                buffer         = null;
+                duration       = 0d;
+                recoveredError = false;
+                blankCheck     = false;
 
-                    return true;
-            }
+                return true;
         }
+    }
 
-        internal bool ReadChs(out byte[] buffer, ushort cylinder, byte head, byte sector, out double duration,
-                              out bool recoveredError)
+    internal bool ReadChs(out byte[] buffer, ushort cylinder, byte head, byte sector, out double duration,
+                          out bool recoveredError)
+    {
+        switch(_dev.Type)
         {
-            switch(_dev.Type)
-            {
-                case DeviceType.ATA:
-                    return AtaReadChs(out buffer, cylinder, head, sector, out duration, out recoveredError);
-                default:
-                    buffer         = null;
-                    duration       = 0d;
-                    recoveredError = false;
+            case DeviceType.ATA:
+                return AtaReadChs(out buffer, cylinder, head, sector, out duration, out recoveredError);
+            default:
+                buffer         = null;
+                duration       = 0d;
+                recoveredError = false;
 
-                    return true;
-            }
+                return true;
         }
+    }
 
-        internal bool Seek(ulong block, out double duration)
+    internal bool Seek(ulong block, out double duration)
+    {
+        switch(_dev.Type)
         {
-            switch(_dev.Type)
-            {
-                case DeviceType.ATA: return AtaSeek(block, out duration);
-                case DeviceType.ATAPI:
-                case DeviceType.SCSI: return ScsiSeek(block, out duration);
-                default:
-                    duration = 0d;
+            case DeviceType.ATA: return AtaSeek(block, out duration);
+            case DeviceType.ATAPI:
+            case DeviceType.SCSI: return ScsiSeek(block, out duration);
+            default:
+                duration = 0d;
 
-                    return true;
-            }
+                return true;
         }
+    }
 
-        internal bool SeekChs(ushort cylinder, byte head, byte sector, out double duration)
+    internal bool SeekChs(ushort cylinder, byte head, byte sector, out double duration)
+    {
+        switch(_dev.Type)
         {
-            switch(_dev.Type)
-            {
-                case DeviceType.ATA: return AtaSeekChs(cylinder, head, sector, out duration);
-                default:
-                    duration = 0;
+            case DeviceType.ATA: return AtaSeekChs(cylinder, head, sector, out duration);
+            default:
+                duration = 0;
 
-                    return true;
-            }
+                return true;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/ReaderATA.cs b/Aaru.Core/Devices/ReaderATA.cs
index 5c37e76ce..178e5718d 100644
--- a/Aaru.Core/Devices/ReaderATA.cs
+++ b/Aaru.Core/Devices/ReaderATA.cs
@@ -36,482 +36,481 @@ using Aaru.Console;
 using Aaru.Decoders.ATA;
 using Identify = Aaru.CommonTypes.Structs.Devices.ATA.Identify;
 
-namespace Aaru.Core.Devices
+namespace Aaru.Core.Devices;
+
+internal sealed partial class Reader
 {
-    internal sealed partial class Reader
+    Identify.IdentifyDevice _ataId;
+    bool                    _ataRead;
+    bool                    _ataReadDma;
+    bool                    _ataReadDmaLba;
+    bool                    _ataReadDmaLba48;
+    bool                    _ataReadDmaRetry;
+    bool                    _ataReadDmaRetryLba;
+    bool                    _ataReadLba;
+    bool                    _ataReadLba48;
+    bool                    _ataReadRetry;
+    bool                    _ataReadRetryLba;
+    bool                    _ataSeek;
+    bool                    _ataSeekLba;
+
+    internal bool   IsLba     { get; private set; }
+    internal ushort Cylinders { get; private set; }
+    internal byte   Heads     { get; private set; }
+    internal byte   Sectors   { get; private set; }
+
+    void GetDeviceChs()
     {
-        Identify.IdentifyDevice _ataId;
-        bool                    _ataRead;
-        bool                    _ataReadDma;
-        bool                    _ataReadDmaLba;
-        bool                    _ataReadDmaLba48;
-        bool                    _ataReadDmaRetry;
-        bool                    _ataReadDmaRetryLba;
-        bool                    _ataReadLba;
-        bool                    _ataReadLba48;
-        bool                    _ataReadRetry;
-        bool                    _ataReadRetryLba;
-        bool                    _ataSeek;
-        bool                    _ataSeekLba;
+        if(_dev.Type != DeviceType.ATA)
+            return;
 
-        internal bool   IsLba     { get; private set; }
-        internal ushort Cylinders { get; private set; }
-        internal byte   Heads     { get; private set; }
-        internal byte   Sectors   { get; private set; }
-
-        void GetDeviceChs()
+        if(_ataId.CurrentCylinders       > 0 &&
+           _ataId.CurrentHeads           > 0 &&
+           _ataId.CurrentSectorsPerTrack > 0)
         {
-            if(_dev.Type != DeviceType.ATA)
-                return;
-
-            if(_ataId.CurrentCylinders       > 0 &&
-               _ataId.CurrentHeads           > 0 &&
-               _ataId.CurrentSectorsPerTrack > 0)
-            {
-                Cylinders = _ataId.CurrentCylinders;
-                Heads     = (byte)_ataId.CurrentHeads;
-                Sectors   = (byte)_ataId.CurrentSectorsPerTrack;
-                Blocks    = (ulong)(Cylinders * Heads * Sectors);
-            }
-
-            if((_ataId.CurrentCylinders != 0 && _ataId.CurrentHeads != 0 && _ataId.CurrentSectorsPerTrack != 0) ||
-               _ataId.Cylinders       <= 0                                                                      ||
-               _ataId.Heads           <= 0                                                                      ||
-               _ataId.SectorsPerTrack <= 0)
-                return;
-
-            Cylinders = _ataId.Cylinders;
-            Heads     = (byte)_ataId.Heads;
-            Sectors   = (byte)_ataId.SectorsPerTrack;
+            Cylinders = _ataId.CurrentCylinders;
+            Heads     = (byte)_ataId.CurrentHeads;
+            Sectors   = (byte)_ataId.CurrentSectorsPerTrack;
             Blocks    = (ulong)(Cylinders * Heads * Sectors);
         }
 
-        ulong AtaGetBlocks()
+        if((_ataId.CurrentCylinders != 0 && _ataId.CurrentHeads != 0 && _ataId.CurrentSectorsPerTrack != 0) ||
+           _ataId.Cylinders       <= 0                                                                      ||
+           _ataId.Heads           <= 0                                                                      ||
+           _ataId.SectorsPerTrack <= 0)
+            return;
+
+        Cylinders = _ataId.Cylinders;
+        Heads     = (byte)_ataId.Heads;
+        Sectors   = (byte)_ataId.SectorsPerTrack;
+        Blocks    = (ulong)(Cylinders * Heads * Sectors);
+    }
+
+    ulong AtaGetBlocks()
+    {
+        GetDeviceChs();
+
+        if(_ataId.Capabilities.HasFlag(Identify.CapabilitiesBit.LBASupport))
         {
-            GetDeviceChs();
-
-            if(_ataId.Capabilities.HasFlag(Identify.CapabilitiesBit.LBASupport))
-            {
-                Blocks = _ataId.LBASectors;
-                IsLba  = true;
-            }
-
-            if(!_ataId.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
-                return Blocks;
-
-            Blocks = _ataId.LBA48Sectors;
+            Blocks = _ataId.LBASectors;
             IsLba  = true;
-
-            return Blocks;
         }
 
-        bool AtaFindReadCommand()
+        if(!_ataId.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
+            return Blocks;
+
+        Blocks = _ataId.LBA48Sectors;
+        IsLba  = true;
+
+        return Blocks;
+    }
+
+    bool AtaFindReadCommand()
+    {
+        if(Blocks == 0)
+            GetDeviceBlocks();
+
+        bool                   sense;
+        int                    tries  = 0;
+        uint                   lba    = 0;
+        ushort                 cyl    = 0;
+        byte                   head   = 0;
+        byte                   sector = 1;
+        AtaErrorRegistersChs   errorChs;
+        AtaErrorRegistersLba28 errorLba;
+        var                    rnd = new Random();
+
+        while(tries < 10)
         {
-            if(Blocks == 0)
-                GetDeviceBlocks();
+            sense            = _dev.Read(out byte[] cmdBuf, out errorChs, false, cyl, head, sector, 1, _timeout, out _);
+            _ataRead         = !sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && cmdBuf.Length > 0;
+            sense            = _dev.Read(out cmdBuf, out errorChs, true, cyl, head, sector, 1, _timeout, out _);
+            _ataReadRetry    = !sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && cmdBuf.Length > 0;
+            sense            = _dev.ReadDma(out cmdBuf, out errorChs, false, cyl, head, sector, 1, _timeout, out _);
+            _ataReadDma      = !sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && cmdBuf.Length > 0;
+            sense            = _dev.ReadDma(out cmdBuf, out errorChs, true, cyl, head, sector, 1, _timeout, out _);
+            _ataReadDmaRetry = !sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && cmdBuf.Length > 0;
 
-            bool                   sense;
-            int                    tries  = 0;
-            uint                   lba    = 0;
-            ushort                 cyl    = 0;
-            byte                   head   = 0;
-            byte                   sector = 1;
-            AtaErrorRegistersChs   errorChs;
-            AtaErrorRegistersLba28 errorLba;
-            var                    rnd = new Random();
+            sense            = _dev.Read(out cmdBuf, out errorLba, false, lba, 1, _timeout, out _);
+            _ataReadLba      = !sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0;
+            sense            = _dev.Read(out cmdBuf, out errorLba, true, lba, 1, _timeout, out _);
+            _ataReadRetryLba = !sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0;
+            sense            = _dev.ReadDma(out cmdBuf, out errorLba, false, lba, 1, _timeout, out _);
+            _ataReadDmaLba   = !sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0;
+            sense            = _dev.ReadDma(out cmdBuf, out errorLba, true, lba, 1, _timeout, out _);
 
-            while(tries < 10)
+            _ataReadDmaRetryLba =
+                !sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0;
+
+            sense         = _dev.Read(out cmdBuf, out AtaErrorRegistersLba48 errorLba48, lba, 1, _timeout, out _);
+            _ataReadLba48 = !sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 && cmdBuf.Length > 0;
+            sense         = _dev.ReadDma(out cmdBuf, out errorLba48, lba, 1, _timeout, out _);
+
+            _ataReadDmaLba48 = !sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 &&
+                               cmdBuf.Length                        > 0;
+
+            if(_ataRead            ||
+               _ataReadRetry       ||
+               _ataReadDma         ||
+               _ataReadDmaRetry    ||
+               _ataReadLba         ||
+               _ataReadRetryLba    ||
+               _ataReadDmaLba      ||
+               _ataReadDmaRetryLba ||
+               _ataReadLba48       ||
+               _ataReadDmaLba48)
             {
-                sense = _dev.Read(out byte[] cmdBuf, out errorChs, false, cyl, head, sector, 1, _timeout, out _);
-                _ataRead = !sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && cmdBuf.Length > 0;
-                sense = _dev.Read(out cmdBuf, out errorChs, true, cyl, head, sector, 1, _timeout, out _);
-                _ataReadRetry = !sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && cmdBuf.Length > 0;
-                sense = _dev.ReadDma(out cmdBuf, out errorChs, false, cyl, head, sector, 1, _timeout, out _);
-                _ataReadDma = !sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && cmdBuf.Length > 0;
-                sense = _dev.ReadDma(out cmdBuf, out errorChs, true, cyl, head, sector, 1, _timeout, out _);
-                _ataReadDmaRetry = !sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && cmdBuf.Length > 0;
-
-                sense            = _dev.Read(out cmdBuf, out errorLba, false, lba, 1, _timeout, out _);
-                _ataReadLba      = !sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0;
-                sense            = _dev.Read(out cmdBuf, out errorLba, true, lba, 1, _timeout, out _);
-                _ataReadRetryLba = !sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0;
-                sense            = _dev.ReadDma(out cmdBuf, out errorLba, false, lba, 1, _timeout, out _);
-                _ataReadDmaLba   = !sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0;
-                sense            = _dev.ReadDma(out cmdBuf, out errorLba, true, lba, 1, _timeout, out _);
-
-                _ataReadDmaRetryLba =
-                    !sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0;
-
-                sense         = _dev.Read(out cmdBuf, out AtaErrorRegistersLba48 errorLba48, lba, 1, _timeout, out _);
-                _ataReadLba48 = !sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 && cmdBuf.Length > 0;
-                sense         = _dev.ReadDma(out cmdBuf, out errorLba48, lba, 1, _timeout, out _);
-
-                _ataReadDmaLba48 = !sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 &&
-                                   cmdBuf.Length                        > 0;
-
-                if(_ataRead            ||
-                   _ataReadRetry       ||
-                   _ataReadDma         ||
-                   _ataReadDmaRetry    ||
-                   _ataReadLba         ||
-                   _ataReadRetryLba    ||
-                   _ataReadDmaLba      ||
-                   _ataReadDmaRetryLba ||
-                   _ataReadLba48       ||
-                   _ataReadDmaLba48)
-                {
-                    break;
-                }
-
-                lba    = (uint)rnd.Next(1, (int)Blocks);
-                cyl    = (ushort)rnd.Next(0, Cylinders);
-                head   = (byte)rnd.Next(0, Heads);
-                sector = (byte)rnd.Next(1, Sectors);
-                tries++;
+                break;
             }
 
-            sense       = _dev.Seek(out errorChs, 0, 0, 1, _timeout, out _);
-            _ataSeek    = !sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0;
-            sense       = _dev.Seek(out errorLba, 0, _timeout, out _);
-            _ataSeekLba = !sense && (errorLba.Status & 0x27) == 0 && errorChs.Error == 0;
+            lba    = (uint)rnd.Next(1, (int)Blocks);
+            cyl    = (ushort)rnd.Next(0, Cylinders);
+            head   = (byte)rnd.Next(0, Heads);
+            sector = (byte)rnd.Next(1, Sectors);
+            tries++;
+        }
 
-            if(IsLba)
+        sense       = _dev.Seek(out errorChs, 0, 0, 1, _timeout, out _);
+        _ataSeek    = !sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0;
+        sense       = _dev.Seek(out errorLba, 0, _timeout, out _);
+        _ataSeekLba = !sense && (errorLba.Status & 0x27) == 0 && errorChs.Error == 0;
+
+        if(IsLba)
+        {
+            if(Blocks > 0xFFFFFFF &&
+               !_ataReadLba48     &&
+               !_ataReadDmaLba48)
             {
-                if(Blocks > 0xFFFFFFF &&
-                   !_ataReadLba48     &&
-                   !_ataReadDmaLba48)
-                {
-                    ErrorMessage = "Device needs 48-bit LBA commands but I can't issue them... Aborting.";
-
-                    return true;
-                }
-
-                if(!_ataReadLba      &&
-                   !_ataReadRetryLba &&
-                   !_ataReadDmaLba   &&
-                   !_ataReadDmaRetryLba)
-                {
-                    ErrorMessage = "Device needs 28-bit LBA commands but I can't issue them... Aborting.";
-
-                    return true;
-                }
-            }
-            else
-            {
-                if(!_ataRead      &&
-                   !_ataReadRetry &&
-                   !_ataReadDma   &&
-                   !_ataReadDmaRetry)
-                {
-                    ErrorMessage = "Device needs CHS commands but I can't issue them... Aborting.";
-
-                    return true;
-                }
-            }
-
-            if(_ataReadDmaLba48)
-                AaruConsole.WriteLine("Using ATA READ DMA EXT command.");
-            else if(_ataReadLba48)
-                AaruConsole.WriteLine("Using ATA READ EXT command.");
-            else if(_ataReadDmaRetryLba)
-                AaruConsole.WriteLine("Using ATA READ DMA command with retries (LBA).");
-            else if(_ataReadDmaLba)
-                AaruConsole.WriteLine("Using ATA READ DMA command (LBA).");
-            else if(_ataReadRetryLba)
-                AaruConsole.WriteLine("Using ATA READ command with retries (LBA).");
-            else if(_ataReadLba)
-                AaruConsole.WriteLine("Using ATA READ command (LBA).");
-            else if(_ataReadDmaRetry)
-                AaruConsole.WriteLine("Using ATA READ DMA command with retries (CHS).");
-            else if(_ataReadDma)
-                AaruConsole.WriteLine("Using ATA READ DMA command (CHS).");
-            else if(_ataReadRetry)
-                AaruConsole.WriteLine("Using ATA READ command with retries (CHS).");
-            else if(_ataRead)
-                AaruConsole.WriteLine("Using ATA READ command (CHS).");
-            else
-            {
-                ErrorMessage = "Could not get a working read command!";
+                ErrorMessage = "Device needs 48-bit LBA commands but I can't issue them... Aborting.";
 
                 return true;
             }
 
-            return false;
+            if(!_ataReadLba      &&
+               !_ataReadRetryLba &&
+               !_ataReadDmaLba   &&
+               !_ataReadDmaRetryLba)
+            {
+                ErrorMessage = "Device needs 28-bit LBA commands but I can't issue them... Aborting.";
+
+                return true;
+            }
+        }
+        else
+        {
+            if(!_ataRead      &&
+               !_ataReadRetry &&
+               !_ataReadDma   &&
+               !_ataReadDmaRetry)
+            {
+                ErrorMessage = "Device needs CHS commands but I can't issue them... Aborting.";
+
+                return true;
+            }
         }
 
-        bool AtaGetBlockSize()
+        if(_ataReadDmaLba48)
+            AaruConsole.WriteLine("Using ATA READ DMA EXT command.");
+        else if(_ataReadLba48)
+            AaruConsole.WriteLine("Using ATA READ EXT command.");
+        else if(_ataReadDmaRetryLba)
+            AaruConsole.WriteLine("Using ATA READ DMA command with retries (LBA).");
+        else if(_ataReadDmaLba)
+            AaruConsole.WriteLine("Using ATA READ DMA command (LBA).");
+        else if(_ataReadRetryLba)
+            AaruConsole.WriteLine("Using ATA READ command with retries (LBA).");
+        else if(_ataReadLba)
+            AaruConsole.WriteLine("Using ATA READ command (LBA).");
+        else if(_ataReadDmaRetry)
+            AaruConsole.WriteLine("Using ATA READ DMA command with retries (CHS).");
+        else if(_ataReadDma)
+            AaruConsole.WriteLine("Using ATA READ DMA command (CHS).");
+        else if(_ataReadRetry)
+            AaruConsole.WriteLine("Using ATA READ command with retries (CHS).");
+        else if(_ataRead)
+            AaruConsole.WriteLine("Using ATA READ command (CHS).");
+        else
         {
-            if((_ataId.PhysLogSectorSize & 0x8000) == 0x0000 &&
-               (_ataId.PhysLogSectorSize & 0x4000) == 0x4000)
-            {
-                if((_ataId.PhysLogSectorSize & 0x1000) == 0x1000)
-                    if(_ataId.LogicalSectorWords <= 255 ||
-                       _ataId.LogicalAlignment   == 0xFFFF)
-                        LogicalBlockSize = 512;
-                    else
-                        LogicalBlockSize = _ataId.LogicalSectorWords * 2;
-                else
-                    LogicalBlockSize = 512;
-
-                if((_ataId.PhysLogSectorSize & 0x2000) == 0x2000)
-                    PhysicalBlockSize = LogicalBlockSize * (uint)Math.Pow(2, _ataId.PhysLogSectorSize & 0xF);
-                else
-                    PhysicalBlockSize = LogicalBlockSize;
-            }
-            else
-            {
-                LogicalBlockSize  = 512;
-                PhysicalBlockSize = 512;
-            }
-
-            // TODO: ATA READ LONG
-            LongBlockSize = 0;
-
-            return false;
-        }
-
-        bool AtaGetBlocksToRead(uint startWithBlocks)
-        {
-            BlocksToRead = startWithBlocks;
-
-            if(!IsLba)
-            {
-                BlocksToRead = 1;
-
-                return false;
-            }
-
-            bool error = true;
-
-            while(IsLba)
-            {
-                byte[]                 cmdBuf;
-                bool                   sense;
-                AtaErrorRegistersLba48 errorLba48;
-
-                if(_ataReadDmaLba48)
-                {
-                    sense = _dev.ReadDma(out cmdBuf, out errorLba48, 0, (byte)BlocksToRead, _timeout, out _);
-                    error = !(!sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 && cmdBuf.Length > 0);
-                }
-                else if(_ataReadLba48)
-                {
-                    sense = _dev.Read(out cmdBuf, out errorLba48, 0, (byte)BlocksToRead, _timeout, out _);
-                    error = !(!sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 && cmdBuf.Length > 0);
-                }
-                else
-                {
-                    AtaErrorRegistersLba28 errorLba;
-
-                    if(_ataReadDmaRetryLba)
-                    {
-                        sense = _dev.ReadDma(out cmdBuf, out errorLba, true, 0, (byte)BlocksToRead, _timeout, out _);
-                        error = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0);
-                    }
-                    else if(_ataReadDmaLba)
-                    {
-                        sense = _dev.ReadDma(out cmdBuf, out errorLba, false, 0, (byte)BlocksToRead, _timeout, out _);
-                        error = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0);
-                    }
-                    else if(_ataReadRetryLba)
-                    {
-                        sense = _dev.Read(out cmdBuf, out errorLba, true, 0, (byte)BlocksToRead, _timeout, out _);
-                        error = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0);
-                    }
-                    else if(_ataReadLba)
-                    {
-                        sense = _dev.Read(out cmdBuf, out errorLba, false, 0, (byte)BlocksToRead, _timeout, out _);
-                        error = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0);
-                    }
-                }
-
-                if(error)
-                    BlocksToRead /= 2;
-
-                if(!error ||
-                   BlocksToRead == 1)
-                    break;
-            }
-
-            if(!error ||
-               !IsLba)
-                return false;
-
-            BlocksToRead = 1;
-            ErrorMessage = $"Device error {_dev.LastError} trying to guess ideal transfer length.";
+            ErrorMessage = "Could not get a working read command!";
 
             return true;
         }
 
-        bool AtaReadBlocks(out byte[] buffer, ulong block, uint count, out double duration, out bool recoveredError)
+        return false;
+    }
+
+    bool AtaGetBlockSize()
+    {
+        if((_ataId.PhysLogSectorSize & 0x8000) == 0x0000 &&
+           (_ataId.PhysLogSectorSize & 0x4000) == 0x4000)
         {
-            bool                   error = true;
+            if((_ataId.PhysLogSectorSize & 0x1000) == 0x1000)
+                if(_ataId.LogicalSectorWords <= 255 ||
+                   _ataId.LogicalAlignment   == 0xFFFF)
+                    LogicalBlockSize = 512;
+                else
+                    LogicalBlockSize = _ataId.LogicalSectorWords * 2;
+            else
+                LogicalBlockSize = 512;
+
+            if((_ataId.PhysLogSectorSize & 0x2000) == 0x2000)
+                PhysicalBlockSize = LogicalBlockSize * (uint)Math.Pow(2, _ataId.PhysLogSectorSize & 0xF);
+            else
+                PhysicalBlockSize = LogicalBlockSize;
+        }
+        else
+        {
+            LogicalBlockSize  = 512;
+            PhysicalBlockSize = 512;
+        }
+
+        // TODO: ATA READ LONG
+        LongBlockSize = 0;
+
+        return false;
+    }
+
+    bool AtaGetBlocksToRead(uint startWithBlocks)
+    {
+        BlocksToRead = startWithBlocks;
+
+        if(!IsLba)
+        {
+            BlocksToRead = 1;
+
+            return false;
+        }
+
+        bool error = true;
+
+        while(IsLba)
+        {
+            byte[]                 cmdBuf;
             bool                   sense;
-            AtaErrorRegistersLba28 errorLba;
             AtaErrorRegistersLba48 errorLba48;
-            byte                   status = 0, errorByte = 0;
-            buffer         = null;
-            duration       = 0;
-            recoveredError = false;
 
             if(_ataReadDmaLba48)
             {
-                sense     = _dev.ReadDma(out buffer, out errorLba48, block, (byte)count, _timeout, out duration);
-                error     = !(!sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 && buffer.Length > 0);
-                status    = errorLba48.Status;
-                errorByte = errorLba48.Error;
-
-                if(error)
-                    _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba48);
+                sense = _dev.ReadDma(out cmdBuf, out errorLba48, 0, (byte)BlocksToRead, _timeout, out _);
+                error = !(!sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 && cmdBuf.Length > 0);
             }
             else if(_ataReadLba48)
             {
-                sense     = _dev.Read(out buffer, out errorLba48, block, (byte)count, _timeout, out duration);
-                error     = !(!sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 && buffer.Length > 0);
-                status    = errorLba48.Status;
-                errorByte = errorLba48.Error;
-
-                if(error)
-                    _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba48);
+                sense = _dev.Read(out cmdBuf, out errorLba48, 0, (byte)BlocksToRead, _timeout, out _);
+                error = !(!sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 && cmdBuf.Length > 0);
             }
-            else if(_ataReadDmaRetryLba)
+            else
             {
-                sense = _dev.ReadDma(out buffer, out errorLba, true, (uint)block, (byte)count, _timeout, out duration);
+                AtaErrorRegistersLba28 errorLba;
 
-                error     = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && buffer.Length > 0);
-                status    = errorLba.Status;
-                errorByte = errorLba.Error;
-
-                if(error)
-                    _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba);
-            }
-            else if(_ataReadDmaLba)
-            {
-                sense = _dev.ReadDma(out buffer, out errorLba, false, (uint)block, (byte)count, _timeout, out duration);
-
-                error     = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && buffer.Length > 0);
-                status    = errorLba.Status;
-                errorByte = errorLba.Error;
-
-                if(error)
-                    _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba);
-            }
-            else if(_ataReadRetryLba)
-            {
-                sense     = _dev.Read(out buffer, out errorLba, true, (uint)block, (byte)count, _timeout, out duration);
-                error     = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && buffer.Length > 0);
-                status    = errorLba.Status;
-                errorByte = errorLba.Error;
-
-                if(error)
-                    _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba);
-            }
-            else if(_ataReadLba)
-            {
-                sense = _dev.Read(out buffer, out errorLba, false, (uint)block, (byte)count, _timeout, out duration);
-                error = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && buffer.Length > 0);
-                status = errorLba.Status;
-                errorByte = errorLba.Error;
-
-                if(error)
-                    _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba);
+                if(_ataReadDmaRetryLba)
+                {
+                    sense = _dev.ReadDma(out cmdBuf, out errorLba, true, 0, (byte)BlocksToRead, _timeout, out _);
+                    error = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0);
+                }
+                else if(_ataReadDmaLba)
+                {
+                    sense = _dev.ReadDma(out cmdBuf, out errorLba, false, 0, (byte)BlocksToRead, _timeout, out _);
+                    error = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0);
+                }
+                else if(_ataReadRetryLba)
+                {
+                    sense = _dev.Read(out cmdBuf, out errorLba, true, 0, (byte)BlocksToRead, _timeout, out _);
+                    error = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0);
+                }
+                else if(_ataReadLba)
+                {
+                    sense = _dev.Read(out cmdBuf, out errorLba, false, 0, (byte)BlocksToRead, _timeout, out _);
+                    error = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && cmdBuf.Length > 0);
+                }
             }
 
-            if(!error)
-                return false;
+            if(error)
+                BlocksToRead /= 2;
 
-            if((status & 0x04) == 0x04)
-                recoveredError = true;
-
-            AaruConsole.DebugWriteLine("ATA Reader", "ATA ERROR: {0} STATUS: {1}", errorByte, status);
-
-            return true;
+            if(!error ||
+               BlocksToRead == 1)
+                break;
         }
 
-        bool AtaReadChs(out byte[] buffer, ushort cylinder, byte head, byte sector, out double duration,
-                        out bool recoveredError)
+        if(!error ||
+           !IsLba)
+            return false;
+
+        BlocksToRead = 1;
+        ErrorMessage = $"Device error {_dev.LastError} trying to guess ideal transfer length.";
+
+        return true;
+    }
+
+    bool AtaReadBlocks(out byte[] buffer, ulong block, uint count, out double duration, out bool recoveredError)
+    {
+        bool                   error = true;
+        bool                   sense;
+        AtaErrorRegistersLba28 errorLba;
+        AtaErrorRegistersLba48 errorLba48;
+        byte                   status = 0, errorByte = 0;
+        buffer         = null;
+        duration       = 0;
+        recoveredError = false;
+
+        if(_ataReadDmaLba48)
         {
-            bool                 error = true;
-            bool                 sense;
-            AtaErrorRegistersChs errorChs;
-            byte                 status = 0, errorByte = 0;
-            buffer         = null;
-            duration       = 0;
-            recoveredError = false;
+            sense     = _dev.ReadDma(out buffer, out errorLba48, block, (byte)count, _timeout, out duration);
+            error     = !(!sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 && buffer.Length > 0);
+            status    = errorLba48.Status;
+            errorByte = errorLba48.Error;
 
-            if(_ataReadDmaRetry)
-            {
-                sense = _dev.ReadDma(out buffer, out errorChs, true, cylinder, head, sector, 1, _timeout, out duration);
-
-                error     = !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && buffer.Length > 0);
-                status    = errorChs.Status;
-                errorByte = errorChs.Error;
-
-                if(error)
-                    _errorLog?.WriteLine(cylinder, head, sector, _dev.Error, _dev.LastError, errorChs);
-            }
-            else if(_ataReadDma)
-            {
-                sense = _dev.ReadDma(out buffer, out errorChs, false, cylinder, head, sector, 1, _timeout,
-                                     out duration);
-
-                error     = !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && buffer.Length > 0);
-                status    = errorChs.Status;
-                errorByte = errorChs.Error;
-
-                if(error)
-                    _errorLog?.WriteLine(cylinder, head, sector, _dev.Error, _dev.LastError, errorChs);
-            }
-            else if(_ataReadRetry)
-            {
-                sense = _dev.Read(out buffer, out errorChs, true, cylinder, head, sector, 1, _timeout, out duration);
-                error = !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && buffer.Length > 0);
-                status = errorChs.Status;
-                errorByte = errorChs.Error;
-
-                if(error)
-                    _errorLog?.WriteLine(cylinder, head, sector, _dev.Error, _dev.LastError, errorChs);
-            }
-            else if(_ataRead)
-            {
-                sense = _dev.Read(out buffer, out errorChs, false, cylinder, head, sector, 1, _timeout, out duration);
-                error = !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && buffer.Length > 0);
-                status = errorChs.Status;
-                errorByte = errorChs.Error;
-
-                if(error)
-                    _errorLog?.WriteLine(cylinder, head, sector, _dev.Error, _dev.LastError, errorChs);
-            }
-
-            if(!error)
-                return false;
-
-            if((status & 0x04) == 0x04)
-                recoveredError = true;
-
-            AaruConsole.DebugWriteLine("ATA Reader", "ATA ERROR: {0} STATUS: {1}", errorByte, status);
-
-            return true;
+            if(error)
+                _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba48);
         }
-
-        bool AtaSeek(ulong block, out double duration)
+        else if(_ataReadLba48)
         {
-            bool sense = _dev.Seek(out AtaErrorRegistersLba28 errorLba, (uint)block, _timeout, out duration);
+            sense     = _dev.Read(out buffer, out errorLba48, block, (byte)count, _timeout, out duration);
+            error     = !(!sense && (errorLba48.Status & 0x27) == 0 && errorLba48.Error == 0 && buffer.Length > 0);
+            status    = errorLba48.Status;
+            errorByte = errorLba48.Error;
 
-            if(!(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0))
+            if(error)
+                _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba48);
+        }
+        else if(_ataReadDmaRetryLba)
+        {
+            sense = _dev.ReadDma(out buffer, out errorLba, true, (uint)block, (byte)count, _timeout, out duration);
+
+            error     = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && buffer.Length > 0);
+            status    = errorLba.Status;
+            errorByte = errorLba.Error;
+
+            if(error)
                 _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba);
-
-            return !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0);
         }
-
-        bool AtaSeekChs(ushort cylinder, byte head, byte sector, out double duration)
+        else if(_ataReadDmaLba)
         {
-            bool sense = _dev.Seek(out AtaErrorRegistersChs errorChs, cylinder, head, sector, _timeout, out duration);
+            sense = _dev.ReadDma(out buffer, out errorLba, false, (uint)block, (byte)count, _timeout, out duration);
 
-            if(!(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0))
-                _errorLog?.WriteLine(cylinder, head, sector, _dev.Error, _dev.LastError, errorChs);
+            error     = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && buffer.Length > 0);
+            status    = errorLba.Status;
+            errorByte = errorLba.Error;
 
-            return !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0);
+            if(error)
+                _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba);
         }
+        else if(_ataReadRetryLba)
+        {
+            sense     = _dev.Read(out buffer, out errorLba, true, (uint)block, (byte)count, _timeout, out duration);
+            error     = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && buffer.Length > 0);
+            status    = errorLba.Status;
+            errorByte = errorLba.Error;
+
+            if(error)
+                _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba);
+        }
+        else if(_ataReadLba)
+        {
+            sense     = _dev.Read(out buffer, out errorLba, false, (uint)block, (byte)count, _timeout, out duration);
+            error     = !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0 && buffer.Length > 0);
+            status    = errorLba.Status;
+            errorByte = errorLba.Error;
+
+            if(error)
+                _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba);
+        }
+
+        if(!error)
+            return false;
+
+        if((status & 0x04) == 0x04)
+            recoveredError = true;
+
+        AaruConsole.DebugWriteLine("ATA Reader", "ATA ERROR: {0} STATUS: {1}", errorByte, status);
+
+        return true;
+    }
+
+    bool AtaReadChs(out byte[] buffer, ushort cylinder, byte head, byte sector, out double duration,
+                    out bool recoveredError)
+    {
+        bool                 error = true;
+        bool                 sense;
+        AtaErrorRegistersChs errorChs;
+        byte                 status = 0, errorByte = 0;
+        buffer         = null;
+        duration       = 0;
+        recoveredError = false;
+
+        if(_ataReadDmaRetry)
+        {
+            sense = _dev.ReadDma(out buffer, out errorChs, true, cylinder, head, sector, 1, _timeout, out duration);
+
+            error     = !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && buffer.Length > 0);
+            status    = errorChs.Status;
+            errorByte = errorChs.Error;
+
+            if(error)
+                _errorLog?.WriteLine(cylinder, head, sector, _dev.Error, _dev.LastError, errorChs);
+        }
+        else if(_ataReadDma)
+        {
+            sense = _dev.ReadDma(out buffer, out errorChs, false, cylinder, head, sector, 1, _timeout,
+                                 out duration);
+
+            error     = !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && buffer.Length > 0);
+            status    = errorChs.Status;
+            errorByte = errorChs.Error;
+
+            if(error)
+                _errorLog?.WriteLine(cylinder, head, sector, _dev.Error, _dev.LastError, errorChs);
+        }
+        else if(_ataReadRetry)
+        {
+            sense     = _dev.Read(out buffer, out errorChs, true, cylinder, head, sector, 1, _timeout, out duration);
+            error     = !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && buffer.Length > 0);
+            status    = errorChs.Status;
+            errorByte = errorChs.Error;
+
+            if(error)
+                _errorLog?.WriteLine(cylinder, head, sector, _dev.Error, _dev.LastError, errorChs);
+        }
+        else if(_ataRead)
+        {
+            sense     = _dev.Read(out buffer, out errorChs, false, cylinder, head, sector, 1, _timeout, out duration);
+            error     = !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0 && buffer.Length > 0);
+            status    = errorChs.Status;
+            errorByte = errorChs.Error;
+
+            if(error)
+                _errorLog?.WriteLine(cylinder, head, sector, _dev.Error, _dev.LastError, errorChs);
+        }
+
+        if(!error)
+            return false;
+
+        if((status & 0x04) == 0x04)
+            recoveredError = true;
+
+        AaruConsole.DebugWriteLine("ATA Reader", "ATA ERROR: {0} STATUS: {1}", errorByte, status);
+
+        return true;
+    }
+
+    bool AtaSeek(ulong block, out double duration)
+    {
+        bool sense = _dev.Seek(out AtaErrorRegistersLba28 errorLba, (uint)block, _timeout, out duration);
+
+        if(!(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0))
+            _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, errorLba);
+
+        return !(!sense && (errorLba.Status & 0x27) == 0 && errorLba.Error == 0);
+    }
+
+    bool AtaSeekChs(ushort cylinder, byte head, byte sector, out double duration)
+    {
+        bool sense = _dev.Seek(out AtaErrorRegistersChs errorChs, cylinder, head, sector, _timeout, out duration);
+
+        if(!(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0))
+            _errorLog?.WriteLine(cylinder, head, sector, _dev.Error, _dev.LastError, errorChs);
+
+        return !(!sense && (errorChs.Status & 0x27) == 0 && errorChs.Error == 0);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/ReaderSCSI.cs b/Aaru.Core/Devices/ReaderSCSI.cs
index 29b0a4f0f..d2605b9ec 100644
--- a/Aaru.Core/Devices/ReaderSCSI.cs
+++ b/Aaru.Core/Devices/ReaderSCSI.cs
@@ -35,41 +35,75 @@ using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 
-namespace Aaru.Core.Devices
+namespace Aaru.Core.Devices;
+
+internal sealed partial class Reader
 {
-    internal sealed partial class Reader
+    // TODO: Raw reading
+    bool _hldtstReadRaw;
+    bool _plextorReadRaw;
+    bool _read10;
+    bool _read12;
+    bool _read16;
+    bool _read6;
+    bool _readLong10;
+    bool _readLong16;
+    bool _readLongDvd;
+    bool _seek10;
+    bool _seek6;
+    bool _syqReadLong10;
+    bool _syqReadLong6;
+
+    ulong ScsiGetBlocks() => ScsiGetBlockSize() ? 0 : Blocks;
+
+    bool ScsiFindReadCommand()
     {
-        // TODO: Raw reading
-        bool _hldtstReadRaw;
-        bool _plextorReadRaw;
-        bool _read10;
-        bool _read12;
-        bool _read16;
-        bool _read6;
-        bool _readLong10;
-        bool _readLong16;
-        bool _readLongDvd;
-        bool _seek10;
-        bool _seek6;
-        bool _syqReadLong10;
-        bool _syqReadLong6;
+        if(Blocks == 0)
+            GetDeviceBlocks();
 
-        ulong ScsiGetBlocks() => ScsiGetBlockSize() ? 0 : Blocks;
+        if(Blocks == 0)
+            return true;
 
-        bool ScsiFindReadCommand()
+        byte[] senseBuf;
+        int    tries      = 0;
+        uint   lba        = 0;
+        bool   mediumScan = false;
+
+        if(_dev.ScsiType == PeripheralDeviceTypes.OpticalDevice)
         {
-            if(Blocks == 0)
-                GetDeviceBlocks();
+            mediumScan = !_dev.MediumScan(out _, true, false, false, false, false, lba, 1, (uint)Blocks,
+                                          out uint foundLba, out _, _timeout, out _);
 
-            if(Blocks == 0)
-                return true;
+            if(mediumScan)
+                lba = foundLba;
+        }
 
-            byte[] senseBuf;
-            int    tries      = 0;
-            uint   lba        = 0;
-            bool   mediumScan = false;
+        var rnd = new Random();
 
-            if(_dev.ScsiType == PeripheralDeviceTypes.OpticalDevice)
+        while(tries < 10)
+        {
+            _read6 = !_dev.Read6(out _, out senseBuf, lba, LogicalBlockSize, _timeout, out _);
+
+            _read10 = !_dev.Read10(out _, out senseBuf, 0, false, false, false, false, lba, LogicalBlockSize, 0, 1,
+                                   _timeout, out _);
+
+            _read12 = !_dev.Read12(out _, out senseBuf, 0, false, false, false, false, lba, LogicalBlockSize, 0, 1,
+                                   false, _timeout, out _);
+
+            _read16 = !_dev.Read16(out _, out senseBuf, 0, false, false, false, lba, LogicalBlockSize, 0, 1, false,
+                                   _timeout, out _);
+
+            if(_read6  ||
+               _read10 ||
+               _read12 ||
+               _read16)
+            {
+                break;
+            }
+
+            lba = (uint)rnd.Next(1, (int)Blocks);
+
+            if(mediumScan)
             {
                 mediumScan = !_dev.MediumScan(out _, true, false, false, false, false, lba, 1, (uint)Blocks,
                                               out uint foundLba, out _, _timeout, out _);
@@ -78,668 +112,633 @@ namespace Aaru.Core.Devices
                     lba = foundLba;
             }
 
-            var rnd = new Random();
+            tries++;
+        }
 
-            while(tries < 10)
+        if(!_read6  &&
+           !_read10 &&
+           !_read12 &&
+           !_read16)
+        {
+            // Magneto-opticals may have empty LBA 0 but we know they work with READ(12)
+            if(_dev.ScsiType == PeripheralDeviceTypes.OpticalDevice)
             {
-                _read6 = !_dev.Read6(out _, out senseBuf, lba, LogicalBlockSize, _timeout, out _);
-
-                _read10 = !_dev.Read10(out _, out senseBuf, 0, false, false, false, false, lba, LogicalBlockSize, 0, 1,
-                                       _timeout, out _);
-
-                _read12 = !_dev.Read12(out _, out senseBuf, 0, false, false, false, false, lba, LogicalBlockSize, 0, 1,
-                                       false, _timeout, out _);
-
-                _read16 = !_dev.Read16(out _, out senseBuf, 0, false, false, false, lba, LogicalBlockSize, 0, 1, false,
-                                       _timeout, out _);
-
-                if(_read6  ||
-                   _read10 ||
-                   _read12 ||
-                   _read16)
-                {
-                    break;
-                }
-
-                lba = (uint)rnd.Next(1, (int)Blocks);
-
-                if(mediumScan)
-                {
-                    mediumScan = !_dev.MediumScan(out _, true, false, false, false, false, lba, 1, (uint)Blocks,
-                                                  out uint foundLba, out _, _timeout, out _);
-
-                    if(mediumScan)
-                        lba = foundLba;
-                }
-
-                tries++;
-            }
-
-            if(!_read6  &&
-               !_read10 &&
-               !_read12 &&
-               !_read16)
-            {
-                // Magneto-opticals may have empty LBA 0 but we know they work with READ(12)
-                if(_dev.ScsiType == PeripheralDeviceTypes.OpticalDevice)
-                {
-                    ErrorMessage = "Cannot read medium, aborting scan...";
-
-                    return true;
-                }
-
-                _read12 = true;
-            }
-
-            if(_read6   &&
-               !_read10 &&
-               !_read12 &&
-               !_read16 &&
-               Blocks > 0x001FFFFF + 1)
-            {
-                ErrorMessage =
-                    $"Device only supports SCSI READ (6) but has more than {0x001FFFFF + 1} blocks ({Blocks} blocks total)";
+                ErrorMessage = "Cannot read medium, aborting scan...";
 
                 return true;
             }
 
-            if(Blocks > 0x001FFFFF + 1)
-                _read6 = false;
+            _read12 = true;
+        }
 
-            if(_read10)
-                _read12 = false;
+        if(_read6   &&
+           !_read10 &&
+           !_read12 &&
+           !_read16 &&
+           Blocks > 0x001FFFFF + 1)
+        {
+            ErrorMessage =
+                $"Device only supports SCSI READ (6) but has more than {0x001FFFFF + 1} blocks ({Blocks} blocks total)";
 
-            if(!_read16 &&
-               Blocks > 0xFFFFFFFF + (long)1)
+            return true;
+        }
+
+        if(Blocks > 0x001FFFFF + 1)
+            _read6 = false;
+
+        if(_read10)
+            _read12 = false;
+
+        if(!_read16 &&
+           Blocks > 0xFFFFFFFF + (long)1)
+        {
+            ErrorMessage =
+                $"Device only supports SCSI READ (10) but has more than {0xFFFFFFFF + (long)1} blocks ({Blocks} blocks total)";
+
+            return true;
+        }
+
+        if(Blocks > 0xFFFFFFFF + (long)1)
+        {
+            _read10 = false;
+            _read12 = false;
+        }
+
+        _seek6 = !_dev.Seek6(out senseBuf, lba, _timeout, out _);
+
+        _seek10 = !_dev.Seek10(out senseBuf, lba, _timeout, out _);
+
+        if(CanReadRaw)
+        {
+            bool testSense;
+            CanReadRaw = false;
+
+            if(_dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
             {
-                ErrorMessage =
-                    $"Device only supports SCSI READ (10) but has more than {0xFFFFFFFF + (long)1} blocks ({Blocks} blocks total)";
-
-                return true;
-            }
-
-            if(Blocks > 0xFFFFFFFF + (long)1)
-            {
-                _read10 = false;
-                _read12 = false;
-            }
-
-            _seek6 = !_dev.Seek6(out senseBuf, lba, _timeout, out _);
-
-            _seek10 = !_dev.Seek10(out senseBuf, lba, _timeout, out _);
-
-            if(CanReadRaw)
-            {
-                bool testSense;
-                CanReadRaw = false;
-
-                if(_dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
+                /*testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, 0xFFFF, timeout, out duration);
+                if (testSense && !dev.Error)
                 {
-                    /*testSense = dev.ReadLong16(out readBuffer, out senseBuf, false, 0, 0xFFFF, timeout, out duration);
-                    if (testSense && !dev.Error)
+                    decSense = Decoders.SCSI.Sense.DecodeFixed(senseBuf);
+                    if (decSense.HasValue)
                     {
-                        decSense = Decoders.SCSI.Sense.DecodeFixed(senseBuf);
-                        if (decSense.HasValue)
+                        if (decSense.Value.SenseKey == Aaru.Decoders.SCSI.SenseKeys.IllegalRequest &&
+                            decSense.Value.ASC == 0x24 && decSense.Value.ASCQ == 0x00)
                         {
-                            if (decSense.Value.SenseKey == Aaru.Decoders.SCSI.SenseKeys.IllegalRequest &&
-                                decSense.Value.ASC == 0x24 && decSense.Value.ASCQ == 0x00)
+                            readRaw = true;
+                            if (decSense.Value.InformationValid && decSense.Value.ILI)
                             {
-                                readRaw = true;
-                                if (decSense.Value.InformationValid && decSense.Value.ILI)
-                                {
-                                    longBlockSize = 0xFFFF - (decSense.Value.Information & 0xFFFF);
-                                    readLong16 = !dev.ReadLong16(out readBuffer, out senseBuf, false, 0, longBlockSize, timeout, out duration);
-                                }
-                            }
-                        }
-                    }*/
-
-                    testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, 0xFFFF, _timeout, out _);
-                    DecodedSense? decSense;
-
-                    if(testSense && !_dev.Error)
-                    {
-                        decSense = Sense.Decode(senseBuf);
-
-                        if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
-                           decSense.Value.ASC  == 0x24                     &&
-                           decSense.Value.ASCQ == 0x00)
-                        {
-                            CanReadRaw = true;
-
-                            bool valid       = decSense?.Fixed?.InformationValid == true;
-                            bool ili         = decSense?.Fixed?.ILI              == true;
-                            uint information = decSense?.Fixed?.Information ?? 0;
-
-                            if(decSense.Value.Descriptor.HasValue &&
-                               decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
-                            {
-                                valid       = true;
-                                ili         = true;
-                                information = (uint)Sense.DecodeDescriptor00(desc00);
-
-                                if(decSense.Value.Descriptor.Value.Descriptors.TryGetValue(4, out byte[] desc04))
-                                    Sense.DecodeDescriptor04(desc04, out _, out _, out ili);
-                            }
-
-                            if(valid && ili)
-                            {
-                                LongBlockSize = 0xFFFF - (information & 0xFFFF);
-
-                                _readLong10 = !_dev.ReadLong10(out _, out senseBuf, false, false, 0,
-                                                               (ushort)LongBlockSize, _timeout, out _);
+                                longBlockSize = 0xFFFF - (decSense.Value.Information & 0xFFFF);
+                                readLong16 = !dev.ReadLong16(out readBuffer, out senseBuf, false, 0, longBlockSize, timeout, out duration);
                             }
                         }
                     }
+                }*/
 
-                    if(CanReadRaw && LongBlockSize == LogicalBlockSize)
-                        switch(LogicalBlockSize)
-                        {
-                            case 512:
-                            {
-                                foreach(ushort testSize in new ushort[]
-                                {
-                                    // Long sector sizes for floppies
-                                    514,
+                testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, 0xFFFF, _timeout, out _);
+                DecodedSense? decSense;
 
-                                    // Long sector sizes for SuperDisk
-                                    536, 558,
+                if(testSense && !_dev.Error)
+                {
+                    decSense = Sense.Decode(senseBuf);
 
-                                    // Long sector sizes for 512-byte magneto-opticals
-                                    600, 610, 630
-                                })
-                                {
-                                    testSense = _dev.ReadLong16(out _, out senseBuf, false, 0, testSize, _timeout,
-                                                                out _);
-
-                                    if(!testSense &&
-                                       !_dev.Error)
-                                    {
-                                        _readLong16   = true;
-                                        LongBlockSize = testSize;
-                                        CanReadRaw    = true;
-
-                                        break;
-                                    }
-
-                                    testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, testSize,
-                                                                _timeout, out _);
-
-                                    if(testSense || _dev.Error)
-                                        continue;
-
-                                    _readLong10   = true;
-                                    LongBlockSize = testSize;
-                                    CanReadRaw    = true;
-
-                                    break;
-                                }
-
-                                break;
-                            }
-                            case 1024:
-                            {
-                                foreach(ushort testSize in new ushort[]
-                                {
-                                    // Long sector sizes for floppies
-                                    1026,
-
-                                    // Long sector sizes for 1024-byte magneto-opticals
-                                    1200
-                                })
-                                {
-                                    testSense = _dev.ReadLong16(out _, out senseBuf, false, 0, testSize, _timeout,
-                                                                out _);
-
-                                    if(!testSense &&
-                                       !_dev.Error)
-                                    {
-                                        _readLong16   = true;
-                                        LongBlockSize = testSize;
-                                        CanReadRaw    = true;
-
-                                        break;
-                                    }
-
-                                    testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, testSize,
-                                                                _timeout, out _);
-
-                                    if(testSense || _dev.Error)
-                                        continue;
-
-                                    _readLong10   = true;
-                                    LongBlockSize = testSize;
-                                    CanReadRaw    = true;
-
-                                    break;
-                                }
-
-                                break;
-                            }
-                            case 2048:
-                            {
-                                testSense = _dev.ReadLong16(out _, out senseBuf, false, 0, 2380, _timeout, out _);
-
-                                if(!testSense &&
-                                   !_dev.Error)
-                                {
-                                    _readLong16   = true;
-                                    LongBlockSize = 2380;
-                                    CanReadRaw    = true;
-                                }
-                                else
-                                {
-                                    testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, 2380, _timeout,
-                                                                out _);
-
-                                    if(!testSense &&
-                                       !_dev.Error)
-                                    {
-                                        _readLong10   = true;
-                                        LongBlockSize = 2380;
-                                        CanReadRaw    = true;
-                                    }
-                                }
-
-                                break;
-                            }
-                            case 4096:
-                            {
-                                testSense = _dev.ReadLong16(out _, out senseBuf, false, 0, 4760, _timeout, out _);
-
-                                if(!testSense &&
-                                   !_dev.Error)
-                                {
-                                    _readLong16   = true;
-                                    LongBlockSize = 4760;
-                                    CanReadRaw    = true;
-                                }
-                                else
-                                {
-                                    testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, 4760, _timeout,
-                                                                out _);
-
-                                    if(!testSense &&
-                                       !_dev.Error)
-                                    {
-                                        _readLong10   = true;
-                                        LongBlockSize = 4760;
-                                        CanReadRaw    = true;
-                                    }
-                                }
-
-                                break;
-                            }
-                            case 8192:
-                            {
-                                testSense = _dev.ReadLong16(out _, out senseBuf, false, 0, 9424, _timeout, out _);
-
-                                if(!testSense &&
-                                   !_dev.Error)
-                                {
-                                    _readLong16   = true;
-                                    LongBlockSize = 9424;
-                                    CanReadRaw    = true;
-                                }
-                                else
-                                {
-                                    testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, 9424, _timeout,
-                                                                out _);
-
-                                    if(!testSense &&
-                                       !_dev.Error)
-                                    {
-                                        _readLong10   = true;
-                                        LongBlockSize = 9424;
-                                        CanReadRaw    = true;
-                                    }
-                                }
-
-                                break;
-                            }
-                        }
-
-                    if(!CanReadRaw &&
-                       _dev.Manufacturer == "SYQUEST")
+                    if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
+                       decSense.Value.ASC  == 0x24                     &&
+                       decSense.Value.ASCQ == 0x00)
                     {
-                        testSense = _dev.SyQuestReadLong10(out _, out senseBuf, 0, 0xFFFF, _timeout, out _);
+                        CanReadRaw = true;
 
-                        if(testSense)
+                        bool valid       = decSense?.Fixed?.InformationValid == true;
+                        bool ili         = decSense?.Fixed?.ILI              == true;
+                        uint information = decSense?.Fixed?.Information ?? 0;
+
+                        if(decSense.Value.Descriptor.HasValue &&
+                           decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
                         {
-                            decSense = Sense.Decode(senseBuf);
+                            valid       = true;
+                            ili         = true;
+                            information = (uint)Sense.DecodeDescriptor00(desc00);
 
-                            if(decSense.HasValue)
-                                if(decSense.Value.SenseKey == SenseKeys.IllegalRequest &&
-                                   decSense.Value.ASC      == 0x24                     &&
-                                   decSense.Value.ASCQ     == 0x00)
-                                {
-                                    CanReadRaw = true;
-
-                                    bool valid       = decSense?.Fixed?.InformationValid == true;
-                                    bool ili         = decSense?.Fixed?.ILI              == true;
-                                    uint information = decSense?.Fixed?.Information ?? 0;
-
-                                    if(decSense.Value.Descriptor.HasValue &&
-                                       decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
-                                    {
-                                        valid       = true;
-                                        ili         = true;
-                                        information = (uint)Sense.DecodeDescriptor00(desc00);
-
-                                        if(decSense.Value.Descriptor.Value.Descriptors.
-                                                    TryGetValue(4, out byte[] desc04))
-                                            Sense.DecodeDescriptor04(desc04, out _, out _, out ili);
-                                    }
-
-                                    if(valid && ili)
-                                    {
-                                        LongBlockSize = 0xFFFF - (information & 0xFFFF);
-
-                                        _syqReadLong10 =
-                                            !_dev.SyQuestReadLong10(out _, out senseBuf, 0, LongBlockSize, _timeout,
-                                                                    out _);
-                                    }
-                                }
-                                else
-                                {
-                                    testSense = _dev.SyQuestReadLong6(out _, out senseBuf, 0, 0xFFFF, _timeout, out _);
-
-                                    if(testSense)
-                                    {
-                                        decSense = Sense.Decode(senseBuf);
-
-                                        if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
-                                           decSense.Value.ASC  == 0x24                     &&
-                                           decSense.Value.ASCQ == 0x00)
-                                        {
-                                            CanReadRaw = true;
-
-                                            bool valid       = decSense?.Fixed?.InformationValid == true;
-                                            bool ili         = decSense?.Fixed?.ILI              == true;
-                                            uint information = decSense?.Fixed?.Information ?? 0;
-
-                                            if(decSense.Value.Descriptor.HasValue &&
-                                               decSense.Value.Descriptor.Value.Descriptors.
-                                                        TryGetValue(0, out byte[] desc00))
-                                            {
-                                                valid       = true;
-                                                ili         = true;
-                                                information = (uint)Sense.DecodeDescriptor00(desc00);
-
-                                                if(decSense.Value.Descriptor.Value.Descriptors.
-                                                            TryGetValue(4, out byte[] desc04))
-                                                    Sense.DecodeDescriptor04(desc04, out _, out _, out ili);
-                                            }
-
-                                            if(valid && ili)
-                                            {
-                                                LongBlockSize = 0xFFFF - (information & 0xFFFF);
-
-                                                _syqReadLong6 =
-                                                    !_dev.SyQuestReadLong6(out _, out senseBuf, 0, LongBlockSize,
-                                                                           _timeout, out _);
-                                            }
-                                        }
-                                    }
-                                }
+                            if(decSense.Value.Descriptor.Value.Descriptors.TryGetValue(4, out byte[] desc04))
+                                Sense.DecodeDescriptor04(desc04, out _, out _, out ili);
                         }
 
-                        if(!CanReadRaw &&
-                           LogicalBlockSize == 256)
+                        if(valid && ili)
                         {
-                            testSense = _dev.SyQuestReadLong6(out _, out senseBuf, 0, 262, _timeout, out _);
+                            LongBlockSize = 0xFFFF - (information & 0xFFFF);
+
+                            _readLong10 = !_dev.ReadLong10(out _, out senseBuf, false, false, 0,
+                                                           (ushort)LongBlockSize, _timeout, out _);
+                        }
+                    }
+                }
+
+                if(CanReadRaw && LongBlockSize == LogicalBlockSize)
+                    switch(LogicalBlockSize)
+                    {
+                        case 512:
+                        {
+                            foreach(ushort testSize in new ushort[]
+                                    {
+                                        // Long sector sizes for floppies
+                                        514,
+
+                                        // Long sector sizes for SuperDisk
+                                        536, 558,
+
+                                        // Long sector sizes for 512-byte magneto-opticals
+                                        600, 610, 630
+                                    })
+                            {
+                                testSense = _dev.ReadLong16(out _, out senseBuf, false, 0, testSize, _timeout,
+                                                            out _);
+
+                                if(!testSense &&
+                                   !_dev.Error)
+                                {
+                                    _readLong16   = true;
+                                    LongBlockSize = testSize;
+                                    CanReadRaw    = true;
+
+                                    break;
+                                }
+
+                                testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, testSize,
+                                                            _timeout, out _);
+
+                                if(testSense || _dev.Error)
+                                    continue;
+
+                                _readLong10   = true;
+                                LongBlockSize = testSize;
+                                CanReadRaw    = true;
+
+                                break;
+                            }
+
+                            break;
+                        }
+                        case 1024:
+                        {
+                            foreach(ushort testSize in new ushort[]
+                                    {
+                                        // Long sector sizes for floppies
+                                        1026,
+
+                                        // Long sector sizes for 1024-byte magneto-opticals
+                                        1200
+                                    })
+                            {
+                                testSense = _dev.ReadLong16(out _, out senseBuf, false, 0, testSize, _timeout,
+                                                            out _);
+
+                                if(!testSense &&
+                                   !_dev.Error)
+                                {
+                                    _readLong16   = true;
+                                    LongBlockSize = testSize;
+                                    CanReadRaw    = true;
+
+                                    break;
+                                }
+
+                                testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, testSize,
+                                                            _timeout, out _);
+
+                                if(testSense || _dev.Error)
+                                    continue;
+
+                                _readLong10   = true;
+                                LongBlockSize = testSize;
+                                CanReadRaw    = true;
+
+                                break;
+                            }
+
+                            break;
+                        }
+                        case 2048:
+                        {
+                            testSense = _dev.ReadLong16(out _, out senseBuf, false, 0, 2380, _timeout, out _);
 
                             if(!testSense &&
                                !_dev.Error)
                             {
-                                _syqReadLong6 = true;
-                                LongBlockSize = 262;
+                                _readLong16   = true;
+                                LongBlockSize = 2380;
                                 CanReadRaw    = true;
                             }
+                            else
+                            {
+                                testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, 2380, _timeout,
+                                                            out _);
+
+                                if(!testSense &&
+                                   !_dev.Error)
+                                {
+                                    _readLong10   = true;
+                                    LongBlockSize = 2380;
+                                    CanReadRaw    = true;
+                                }
+                            }
+
+                            break;
+                        }
+                        case 4096:
+                        {
+                            testSense = _dev.ReadLong16(out _, out senseBuf, false, 0, 4760, _timeout, out _);
+
+                            if(!testSense &&
+                               !_dev.Error)
+                            {
+                                _readLong16   = true;
+                                LongBlockSize = 4760;
+                                CanReadRaw    = true;
+                            }
+                            else
+                            {
+                                testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, 4760, _timeout,
+                                                            out _);
+
+                                if(!testSense &&
+                                   !_dev.Error)
+                                {
+                                    _readLong10   = true;
+                                    LongBlockSize = 4760;
+                                    CanReadRaw    = true;
+                                }
+                            }
+
+                            break;
+                        }
+                        case 8192:
+                        {
+                            testSense = _dev.ReadLong16(out _, out senseBuf, false, 0, 9424, _timeout, out _);
+
+                            if(!testSense &&
+                               !_dev.Error)
+                            {
+                                _readLong16   = true;
+                                LongBlockSize = 9424;
+                                CanReadRaw    = true;
+                            }
+                            else
+                            {
+                                testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, 9424, _timeout,
+                                                            out _);
+
+                                if(!testSense &&
+                                   !_dev.Error)
+                                {
+                                    _readLong10   = true;
+                                    LongBlockSize = 9424;
+                                    CanReadRaw    = true;
+                                }
+                            }
+
+                            break;
                         }
                     }
-                }
-                else
+
+                if(!CanReadRaw &&
+                   _dev.Manufacturer == "SYQUEST")
                 {
-                    switch(_dev.Manufacturer)
+                    testSense = _dev.SyQuestReadLong10(out _, out senseBuf, 0, 0xFFFF, _timeout, out _);
+
+                    if(testSense)
                     {
-                        case "HL-DT-ST":
-                            _hldtstReadRaw = !_dev.HlDtStReadRawDvd(out _, out senseBuf, 0, 1, _timeout, out _);
+                        decSense = Sense.Decode(senseBuf);
 
-                            break;
-                        case "PLEXTOR":
-                            _plextorReadRaw = !_dev.PlextorReadRawDvd(out _, out senseBuf, 0, 1, _timeout, out _);
+                        if(decSense.HasValue)
+                            if(decSense.Value.SenseKey == SenseKeys.IllegalRequest &&
+                               decSense.Value.ASC      == 0x24                     &&
+                               decSense.Value.ASCQ     == 0x00)
+                            {
+                                CanReadRaw = true;
 
-                            break;
+                                bool valid       = decSense?.Fixed?.InformationValid == true;
+                                bool ili         = decSense?.Fixed?.ILI              == true;
+                                uint information = decSense?.Fixed?.Information ?? 0;
+
+                                if(decSense.Value.Descriptor.HasValue &&
+                                   decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
+                                {
+                                    valid       = true;
+                                    ili         = true;
+                                    information = (uint)Sense.DecodeDescriptor00(desc00);
+
+                                    if(decSense.Value.Descriptor.Value.Descriptors.
+                                                TryGetValue(4, out byte[] desc04))
+                                        Sense.DecodeDescriptor04(desc04, out _, out _, out ili);
+                                }
+
+                                if(valid && ili)
+                                {
+                                    LongBlockSize = 0xFFFF - (information & 0xFFFF);
+
+                                    _syqReadLong10 =
+                                        !_dev.SyQuestReadLong10(out _, out senseBuf, 0, LongBlockSize, _timeout,
+                                                                out _);
+                                }
+                            }
+                            else
+                            {
+                                testSense = _dev.SyQuestReadLong6(out _, out senseBuf, 0, 0xFFFF, _timeout, out _);
+
+                                if(testSense)
+                                {
+                                    decSense = Sense.Decode(senseBuf);
+
+                                    if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
+                                       decSense.Value.ASC  == 0x24                     &&
+                                       decSense.Value.ASCQ == 0x00)
+                                    {
+                                        CanReadRaw = true;
+
+                                        bool valid       = decSense?.Fixed?.InformationValid == true;
+                                        bool ili         = decSense?.Fixed?.ILI              == true;
+                                        uint information = decSense?.Fixed?.Information ?? 0;
+
+                                        if(decSense.Value.Descriptor.HasValue &&
+                                           decSense.Value.Descriptor.Value.Descriptors.
+                                                    TryGetValue(0, out byte[] desc00))
+                                        {
+                                            valid       = true;
+                                            ili         = true;
+                                            information = (uint)Sense.DecodeDescriptor00(desc00);
+
+                                            if(decSense.Value.Descriptor.Value.Descriptors.
+                                                        TryGetValue(4, out byte[] desc04))
+                                                Sense.DecodeDescriptor04(desc04, out _, out _, out ili);
+                                        }
+
+                                        if(valid && ili)
+                                        {
+                                            LongBlockSize = 0xFFFF - (information & 0xFFFF);
+
+                                            _syqReadLong6 =
+                                                !_dev.SyQuestReadLong6(out _, out senseBuf, 0, LongBlockSize,
+                                                                       _timeout, out _);
+                                        }
+                                    }
+                                }
+                            }
                     }
 
-                    if(_hldtstReadRaw || _plextorReadRaw)
-                    {
-                        CanReadRaw    = true;
-                        LongBlockSize = 2064;
-                    }
-
-                    // READ LONG (10) for some DVD drives
                     if(!CanReadRaw &&
-                       _dev.Manufacturer == "MATSHITA")
+                       LogicalBlockSize == 256)
                     {
-                        testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, 37856, _timeout, out _);
+                        testSense = _dev.SyQuestReadLong6(out _, out senseBuf, 0, 262, _timeout, out _);
 
                         if(!testSense &&
                            !_dev.Error)
                         {
-                            _readLongDvd  = true;
-                            LongBlockSize = 37856;
+                            _syqReadLong6 = true;
+                            LongBlockSize = 262;
                             CanReadRaw    = true;
                         }
                     }
                 }
             }
-
-            if(CanReadRaw)
+            else
             {
-                if(_readLong16)
-                    AaruConsole.WriteLine("Using SCSI READ LONG (16) command.");
-                else if(_readLong10 || _readLongDvd)
-                    AaruConsole.WriteLine("Using SCSI READ LONG (10) command.");
-                else if(_syqReadLong10)
-                    AaruConsole.WriteLine("Using SyQuest READ LONG (10) command.");
-                else if(_syqReadLong6)
-                    AaruConsole.WriteLine("Using SyQuest READ LONG (6) command.");
-                else if(_hldtstReadRaw)
-                    AaruConsole.WriteLine("Using HL-DT-ST raw DVD reading.");
-                else if(_plextorReadRaw)
-                    AaruConsole.WriteLine("Using Plextor raw DVD reading.");
-            }
-            else if(_read6)
-                AaruConsole.WriteLine("Using SCSI READ (6) command.");
-            else if(_read10)
-                AaruConsole.WriteLine("Using SCSI READ (10) command.");
-            else if(_read12)
-                AaruConsole.WriteLine("Using SCSI READ (12) command.");
-            else if(_read16)
-                AaruConsole.WriteLine("Using SCSI READ (16) command.");
+                switch(_dev.Manufacturer)
+                {
+                    case "HL-DT-ST":
+                        _hldtstReadRaw = !_dev.HlDtStReadRawDvd(out _, out senseBuf, 0, 1, _timeout, out _);
 
-            return false;
+                        break;
+                    case "PLEXTOR":
+                        _plextorReadRaw = !_dev.PlextorReadRawDvd(out _, out senseBuf, 0, 1, _timeout, out _);
+
+                        break;
+                }
+
+                if(_hldtstReadRaw || _plextorReadRaw)
+                {
+                    CanReadRaw    = true;
+                    LongBlockSize = 2064;
+                }
+
+                // READ LONG (10) for some DVD drives
+                if(!CanReadRaw &&
+                   _dev.Manufacturer == "MATSHITA")
+                {
+                    testSense = _dev.ReadLong10(out _, out senseBuf, false, false, 0, 37856, _timeout, out _);
+
+                    if(!testSense &&
+                       !_dev.Error)
+                    {
+                        _readLongDvd  = true;
+                        LongBlockSize = 37856;
+                        CanReadRaw    = true;
+                    }
+                }
+            }
         }
 
-        bool ScsiGetBlockSize()
+        if(CanReadRaw)
         {
-            Blocks = 0;
+            if(_readLong16)
+                AaruConsole.WriteLine("Using SCSI READ LONG (16) command.");
+            else if(_readLong10 || _readLongDvd)
+                AaruConsole.WriteLine("Using SCSI READ LONG (10) command.");
+            else if(_syqReadLong10)
+                AaruConsole.WriteLine("Using SyQuest READ LONG (10) command.");
+            else if(_syqReadLong6)
+                AaruConsole.WriteLine("Using SyQuest READ LONG (6) command.");
+            else if(_hldtstReadRaw)
+                AaruConsole.WriteLine("Using HL-DT-ST raw DVD reading.");
+            else if(_plextorReadRaw)
+                AaruConsole.WriteLine("Using Plextor raw DVD reading.");
+        }
+        else if(_read6)
+            AaruConsole.WriteLine("Using SCSI READ (6) command.");
+        else if(_read10)
+            AaruConsole.WriteLine("Using SCSI READ (10) command.");
+        else if(_read12)
+            AaruConsole.WriteLine("Using SCSI READ (12) command.");
+        else if(_read16)
+            AaruConsole.WriteLine("Using SCSI READ (16) command.");
 
-            bool sense = _dev.ReadCapacity(out byte[] cmdBuf, out byte[] senseBuf, _timeout, out _);
+        return false;
+    }
+
+    bool ScsiGetBlockSize()
+    {
+        Blocks = 0;
+
+        bool sense = _dev.ReadCapacity(out byte[] cmdBuf, out byte[] senseBuf, _timeout, out _);
+
+        if(!sense)
+        {
+            Blocks = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) & 0xFFFFFFFF;
+            LogicalBlockSize = (uint)((cmdBuf[4] << 24) + (cmdBuf[5] << 16) + (cmdBuf[6] << 8) + cmdBuf[7]);
+        }
+
+        if(sense || Blocks == 0xFFFFFFFF)
+        {
+            sense = _dev.ReadCapacity16(out cmdBuf, out senseBuf, _timeout, out _);
+
+            if(sense && Blocks == 0)
+                if(_dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
+                {
+                    ErrorMessage = "Unable to get media capacity\n" + $"{Sense.PrettifySense(senseBuf)}";
+
+                    return true;
+                }
 
             if(!sense)
             {
-                Blocks = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) & 0xFFFFFFFF;
-                LogicalBlockSize = (uint)((cmdBuf[4] << 24) + (cmdBuf[5] << 16) + (cmdBuf[6] << 8) + cmdBuf[7]);
-            }
+                byte[] temp = new byte[8];
 
-            if(sense || Blocks == 0xFFFFFFFF)
+                Array.Copy(cmdBuf, 0, temp, 0, 8);
+                Array.Reverse(temp);
+                Blocks           = BitConverter.ToUInt64(temp, 0);
+                LogicalBlockSize = (uint)((cmdBuf[8] << 24) + (cmdBuf[9] << 16) + (cmdBuf[10] << 8) + cmdBuf[11]);
+            }
+        }
+
+        PhysicalBlockSize = LogicalBlockSize;
+        LongBlockSize     = LogicalBlockSize;
+
+        return false;
+    }
+
+    bool ScsiGetBlocksToRead(uint startWithBlocks)
+    {
+        BlocksToRead = startWithBlocks;
+
+        while(true)
+        {
+            if(_read6)
             {
-                sense = _dev.ReadCapacity16(out cmdBuf, out senseBuf, _timeout, out _);
+                _dev.Read6(out _, out _, 0, LogicalBlockSize, (byte)BlocksToRead, _timeout, out _);
 
-                if(sense && Blocks == 0)
-                    if(_dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
-                    {
-                        ErrorMessage = "Unable to get media capacity\n" + $"{Sense.PrettifySense(senseBuf)}";
+                if(_dev.Error)
+                    BlocksToRead /= 2;
+            }
+            else if(_read10)
+            {
+                _dev.Read10(out _, out _, 0, false, true, false, false, 0, LogicalBlockSize, 0,
+                            (ushort)BlocksToRead, _timeout, out _);
 
-                        return true;
-                    }
+                if(_dev.Error)
+                    BlocksToRead /= 2;
+            }
+            else if(_read12)
+            {
+                _dev.Read12(out _, out _, 0, false, false, false, false, 0, LogicalBlockSize, 0, BlocksToRead,
+                            false, _timeout, out _);
 
-                if(!sense)
-                {
-                    byte[] temp = new byte[8];
+                if(_dev.Error)
+                    BlocksToRead /= 2;
+            }
+            else if(_read16)
+            {
+                _dev.Read16(out _, out _, 0, false, true, false, 0, LogicalBlockSize, 0, BlocksToRead, false,
+                            _timeout, out _);
 
-                    Array.Copy(cmdBuf, 0, temp, 0, 8);
-                    Array.Reverse(temp);
-                    Blocks           = BitConverter.ToUInt64(temp, 0);
-                    LogicalBlockSize = (uint)((cmdBuf[8] << 24) + (cmdBuf[9] << 16) + (cmdBuf[10] << 8) + cmdBuf[11]);
-                }
+                if(_dev.Error)
+                    BlocksToRead /= 2;
             }
 
-            PhysicalBlockSize = LogicalBlockSize;
-            LongBlockSize     = LogicalBlockSize;
+            if(!_dev.Error ||
+               BlocksToRead == 1)
+                break;
+        }
+
+        if(!_dev.Error)
+            return false;
+
+        // Magneto-opticals may have LBA 0 empty, we can hard code the value to a safe one
+        if(_dev.ScsiType == PeripheralDeviceTypes.OpticalDevice)
+        {
+            BlocksToRead = 16;
 
             return false;
         }
 
-        bool ScsiGetBlocksToRead(uint startWithBlocks)
-        {
-            BlocksToRead = startWithBlocks;
+        BlocksToRead = 1;
+        ErrorMessage = $"Device error {_dev.LastError} trying to guess ideal transfer length.";
 
-            while(true)
-            {
-                if(_read6)
-                {
-                    _dev.Read6(out _, out _, 0, LogicalBlockSize, (byte)BlocksToRead, _timeout, out _);
+        return true;
+    }
 
-                    if(_dev.Error)
-                        BlocksToRead /= 2;
-                }
-                else if(_read10)
-                {
-                    _dev.Read10(out _, out _, 0, false, true, false, false, 0, LogicalBlockSize, 0,
-                                (ushort)BlocksToRead, _timeout, out _);
+    bool ScsiReadBlocks(out byte[] buffer, ulong block, uint count, out double duration, out bool recoveredError,
+                        out bool blankCheck)
+    {
+        bool   sense;
+        byte[] senseBuf;
+        buffer         = null;
+        duration       = 0;
+        recoveredError = false;
+        blankCheck     = false;
 
-                    if(_dev.Error)
-                        BlocksToRead /= 2;
-                }
-                else if(_read12)
-                {
-                    _dev.Read12(out _, out _, 0, false, false, false, false, 0, LogicalBlockSize, 0, BlocksToRead,
-                                false, _timeout, out _);
-
-                    if(_dev.Error)
-                        BlocksToRead /= 2;
-                }
-                else if(_read16)
-                {
-                    _dev.Read16(out _, out _, 0, false, true, false, 0, LogicalBlockSize, 0, BlocksToRead, false,
-                                _timeout, out _);
-
-                    if(_dev.Error)
-                        BlocksToRead /= 2;
-                }
-
-                if(!_dev.Error ||
-                   BlocksToRead == 1)
-                    break;
-            }
-
-            if(!_dev.Error)
-                return false;
-
-            // Magneto-opticals may have LBA 0 empty, we can hard code the value to a safe one
-            if(_dev.ScsiType == PeripheralDeviceTypes.OpticalDevice)
-            {
-                BlocksToRead = 16;
-
-                return false;
-            }
-
-            BlocksToRead = 1;
-            ErrorMessage = $"Device error {_dev.LastError} trying to guess ideal transfer length.";
-
-            return true;
-        }
-
-        bool ScsiReadBlocks(out byte[] buffer, ulong block, uint count, out double duration, out bool recoveredError,
-                            out bool blankCheck)
-        {
-            bool   sense;
-            byte[] senseBuf;
-            buffer         = null;
-            duration       = 0;
-            recoveredError = false;
-            blankCheck     = false;
-
-            if(CanReadRaw)
-                if(_readLong16)
-                    sense = _dev.ReadLong16(out buffer, out senseBuf, false, block, LongBlockSize, _timeout,
-                                            out duration);
-                else if(_readLong10)
-                    sense = _dev.ReadLong10(out buffer, out senseBuf, false, false, (uint)block, (ushort)LongBlockSize,
-                                            _timeout, out duration);
-                else if(_syqReadLong10)
-                    sense = _dev.SyQuestReadLong10(out buffer, out senseBuf, (uint)block, LongBlockSize, _timeout,
-                                                   out duration);
-                else if(_syqReadLong6)
-                    sense = _dev.SyQuestReadLong6(out buffer, out senseBuf, (uint)block, LongBlockSize, _timeout,
-                                                  out duration);
-                else if(_hldtstReadRaw)
-                    sense = _dev.HlDtStReadRawDvd(out buffer, out senseBuf, (uint)block, LongBlockSize, _timeout,
-                                                  out duration);
-                else if(_plextorReadRaw)
-                    sense = _dev.PlextorReadRawDvd(out buffer, out senseBuf, (uint)block, LongBlockSize, _timeout,
-                                                   out duration);
-                else
-                    return true;
+        if(CanReadRaw)
+            if(_readLong16)
+                sense = _dev.ReadLong16(out buffer, out senseBuf, false, block, LongBlockSize, _timeout,
+                                        out duration);
+            else if(_readLong10)
+                sense = _dev.ReadLong10(out buffer, out senseBuf, false, false, (uint)block, (ushort)LongBlockSize,
+                                        _timeout, out duration);
+            else if(_syqReadLong10)
+                sense = _dev.SyQuestReadLong10(out buffer, out senseBuf, (uint)block, LongBlockSize, _timeout,
+                                               out duration);
+            else if(_syqReadLong6)
+                sense = _dev.SyQuestReadLong6(out buffer, out senseBuf, (uint)block, LongBlockSize, _timeout,
+                                              out duration);
+            else if(_hldtstReadRaw)
+                sense = _dev.HlDtStReadRawDvd(out buffer, out senseBuf, (uint)block, LongBlockSize, _timeout,
+                                              out duration);
+            else if(_plextorReadRaw)
+                sense = _dev.PlextorReadRawDvd(out buffer, out senseBuf, (uint)block, LongBlockSize, _timeout,
+                                               out duration);
             else
-            {
-                if(_read6)
-                    sense = _dev.Read6(out buffer, out senseBuf, (uint)block, LogicalBlockSize, (byte)count, _timeout,
-                                       out duration);
-                else if(_read10)
-                    sense = _dev.Read10(out buffer, out senseBuf, 0, false, false, false, false, (uint)block,
-                                        LogicalBlockSize, 0, (ushort)count, _timeout, out duration);
-                else if(_read12)
-                    sense = _dev.Read12(out buffer, out senseBuf, 0, false, false, false, false, (uint)block,
-                                        LogicalBlockSize, 0, count, false, _timeout, out duration);
-                else if(_read16)
-                    sense = _dev.Read16(out buffer, out senseBuf, 0, false, false, false, block, LogicalBlockSize, 0,
-                                        count, false, _timeout, out duration);
-                else
-                    return true;
-            }
-
-            if(sense || _dev.Error)
-                _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, senseBuf);
-
-            if(!sense &&
-               !_dev.Error)
-                return false;
-
-            recoveredError = Sense.Decode(senseBuf)?.SenseKey == SenseKeys.RecoveredError;
-
-            blankCheck = Sense.Decode(senseBuf)?.SenseKey == SenseKeys.BlankCheck;
-
-            AaruConsole.DebugWriteLine("SCSI Reader", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
-
-            return sense;
-        }
-
-        bool ScsiSeek(ulong block, out double duration)
+                return true;
+        else
         {
-            bool sense = true;
-            duration = 0;
-
-            if(_seek6)
-                sense = _dev.Seek6(out _, (uint)block, _timeout, out duration);
-            else if(_seek10)
-                sense = _dev.Seek10(out _, (uint)block, _timeout, out duration);
-
-            return sense;
+            if(_read6)
+                sense = _dev.Read6(out buffer, out senseBuf, (uint)block, LogicalBlockSize, (byte)count, _timeout,
+                                   out duration);
+            else if(_read10)
+                sense = _dev.Read10(out buffer, out senseBuf, 0, false, false, false, false, (uint)block,
+                                    LogicalBlockSize, 0, (ushort)count, _timeout, out duration);
+            else if(_read12)
+                sense = _dev.Read12(out buffer, out senseBuf, 0, false, false, false, false, (uint)block,
+                                    LogicalBlockSize, 0, count, false, _timeout, out duration);
+            else if(_read16)
+                sense = _dev.Read16(out buffer, out senseBuf, 0, false, false, false, block, LogicalBlockSize, 0,
+                                    count, false, _timeout, out duration);
+            else
+                return true;
         }
+
+        if(sense || _dev.Error)
+            _errorLog?.WriteLine(block, _dev.Error, _dev.LastError, senseBuf);
+
+        if(!sense &&
+           !_dev.Error)
+            return false;
+
+        recoveredError = Sense.Decode(senseBuf)?.SenseKey == SenseKeys.RecoveredError;
+
+        blankCheck = Sense.Decode(senseBuf)?.SenseKey == SenseKeys.BlankCheck;
+
+        AaruConsole.DebugWriteLine("SCSI Reader", "READ error:\n{0}", Sense.PrettifySense(senseBuf));
+
+        return sense;
+    }
+
+    bool ScsiSeek(ulong block, out double duration)
+    {
+        bool sense = true;
+        duration = 0;
+
+        if(_seek6)
+            sense = _dev.Seek6(out _, (uint)block, _timeout, out duration);
+        else if(_seek10)
+            sense = _dev.Seek10(out _, (uint)block, _timeout, out duration);
+
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Report/ATA.cs b/Aaru.Core/Devices/Report/ATA.cs
index 4c03b7c41..85d5a2168 100644
--- a/Aaru.Core/Devices/Report/ATA.cs
+++ b/Aaru.Core/Devices/Report/ATA.cs
@@ -38,492 +38,98 @@ using Aaru.Devices;
 using Spectre.Console;
 using Identify = Aaru.CommonTypes.Structs.Devices.ATA.Identify;
 
-namespace Aaru.Core.Devices.Report
+namespace Aaru.Core.Devices.Report;
+
+public sealed partial class DeviceReport
 {
-    public sealed partial class DeviceReport
+    /// <summary>Creates a report for media inserted into an ATA device</summary>
+    /// <returns>Media report</returns>
+    public TestedMedia ReportAtaMedia()
     {
-        /// <summary>Creates a report for media inserted into an ATA device</summary>
-        /// <returns>Media report</returns>
-        public TestedMedia ReportAtaMedia()
+        bool                   sense      = true;
+        AtaErrorRegistersChs   errorChs   = new();
+        AtaErrorRegistersLba28 errorLba   = new();
+        AtaErrorRegistersLba48 errorLba48 = new();
+        byte[]                 buffer     = Array.Empty<byte>();
+        byte[]                 readBuf    = Array.Empty<byte>();
+
+        var mediaTest = new TestedMedia
         {
-            bool                   sense      = true;
-            AtaErrorRegistersChs   errorChs   = new();
-            AtaErrorRegistersLba28 errorLba   = new();
-            AtaErrorRegistersLba48 errorLba48 = new();
-            byte[]                 buffer     = Array.Empty<byte>();
-            byte[]                 readBuf    = Array.Empty<byte>();
+            MediumTypeName =
+                AnsiConsole.Ask<string>("Please write a description of the media type and press enter: "),
+            Model             = AnsiConsole.Ask<string>("Please write the media model and press enter: "),
+            MediaIsRecognized = true
+        };
 
-            var mediaTest = new TestedMedia
-            {
-                MediumTypeName =
-                    AnsiConsole.Ask<string>("Please write a description of the media type and press enter: "),
-                Model             = AnsiConsole.Ask<string>("Please write the media model and press enter: "),
-                MediaIsRecognized = true
-            };
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying ATA IDENTIFY...").IsIndeterminate();
-                _dev.AtaIdentify(out buffer, out _, _dev.Timeout, out _);
-            });
-
-            mediaTest.IdentifyData   = ClearIdentify(buffer);
-            mediaTest.IdentifyDevice = Identify.Decode(buffer);
-
-            if(mediaTest.IdentifyDevice.HasValue)
-            {
-                Identify.IdentifyDevice ataId = mediaTest.IdentifyDevice.Value;
-
-                if(ataId.UnformattedBPT != 0)
-                    mediaTest.UnformattedBPT = ataId.UnformattedBPT;
-
-                if(ataId.UnformattedBPS != 0)
-                    mediaTest.UnformattedBPS = ataId.UnformattedBPS;
-
-                if(ataId.Cylinders       > 0 &&
-                   ataId.Heads           > 0 &&
-                   ataId.SectorsPerTrack > 0)
-                {
-                    mediaTest.CHS = new Chs
-                    {
-                        Cylinders = ataId.Cylinders,
-                        Heads     = ataId.Heads,
-                        Sectors   = ataId.SectorsPerTrack
-                    };
-
-                    mediaTest.Blocks = (ulong)(ataId.Cylinders * ataId.Heads * ataId.SectorsPerTrack);
-                }
-
-                if(ataId.CurrentCylinders       > 0 &&
-                   ataId.CurrentHeads           > 0 &&
-                   ataId.CurrentSectorsPerTrack > 0)
-                {
-                    mediaTest.CurrentCHS = new Chs
-                    {
-                        Cylinders = ataId.CurrentCylinders,
-                        Heads     = ataId.CurrentHeads,
-                        Sectors   = ataId.CurrentSectorsPerTrack
-                    };
-
-                    if(mediaTest.Blocks == 0)
-                        mediaTest.Blocks =
-                            (ulong)(ataId.CurrentCylinders * ataId.CurrentHeads * ataId.CurrentSectorsPerTrack);
-                }
-
-                if(ataId.Capabilities.HasFlag(Identify.CapabilitiesBit.LBASupport))
-                {
-                    mediaTest.LBASectors = ataId.LBASectors;
-                    mediaTest.Blocks     = ataId.LBASectors;
-                }
-
-                if(ataId.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
-                {
-                    mediaTest.LBA48Sectors = ataId.LBA48Sectors;
-                    mediaTest.Blocks       = ataId.LBA48Sectors;
-                }
-
-                if(ataId.NominalRotationRate != 0x0000 &&
-                   ataId.NominalRotationRate != 0xFFFF)
-                    if(ataId.NominalRotationRate == 0x0001)
-                        mediaTest.SolidStateDevice = true;
-                    else
-                    {
-                        mediaTest.SolidStateDevice    = false;
-                        mediaTest.NominalRotationRate = ataId.NominalRotationRate;
-                    }
-
-                uint logicalSectorSize;
-                uint physicalSectorSize;
-
-                if((ataId.PhysLogSectorSize & 0x8000) == 0x0000 &&
-                   (ataId.PhysLogSectorSize & 0x4000) == 0x4000)
-                {
-                    if((ataId.PhysLogSectorSize & 0x1000) == 0x1000)
-                        if(ataId.LogicalSectorWords <= 255 ||
-                           ataId.LogicalAlignment   == 0xFFFF)
-                            logicalSectorSize = 512;
-                        else
-                            logicalSectorSize = ataId.LogicalSectorWords * 2;
-                    else
-                        logicalSectorSize = 512;
-
-                    if((ataId.PhysLogSectorSize & 0x2000) == 0x2000)
-                        physicalSectorSize = (uint)(logicalSectorSize * ((1 << ataId.PhysLogSectorSize) & 0xF));
-                    else
-                        physicalSectorSize = logicalSectorSize;
-                }
-                else
-                {
-                    logicalSectorSize  = 512;
-                    physicalSectorSize = 512;
-                }
-
-                mediaTest.BlockSize = logicalSectorSize;
-
-                if(physicalSectorSize != logicalSectorSize)
-                {
-                    mediaTest.PhysicalBlockSize = physicalSectorSize;
-
-                    if((ataId.LogicalAlignment & 0x8000) == 0x0000 &&
-                       (ataId.LogicalAlignment & 0x4000) == 0x4000)
-                        mediaTest.LogicalAlignment = (ushort)(ataId.LogicalAlignment & 0x3FFF);
-                }
-
-                if(ataId.EccBytes != 0x0000 &&
-                   ataId.EccBytes != 0xFFFF)
-                    mediaTest.LongBlockSize = logicalSectorSize + ataId.EccBytes;
-
-                if(ataId.UnformattedBPS > logicalSectorSize &&
-                   (!(ataId.EccBytes != 0x0000 && ataId.EccBytes != 0xFFFF) || mediaTest.LongBlockSize == 516))
-                    mediaTest.LongBlockSize = ataId.UnformattedBPS;
-
-                if(ataId.CommandSet3.HasFlag(Identify.CommandSetBit3.MustBeSet)    &&
-                   !ataId.CommandSet3.HasFlag(Identify.CommandSetBit3.MustBeClear) &&
-                   ataId.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.MediaSerial))
-                {
-                    mediaTest.CanReadMediaSerial = true;
-
-                    if(!string.IsNullOrWhiteSpace(ataId.MediaManufacturer))
-                        mediaTest.Manufacturer = ataId.MediaManufacturer;
-                }
-
-                ulong checkCorrectRead = BitConverter.ToUInt64(buffer, 0);
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ SECTOR(S) in CHS mode...").IsIndeterminate();
-                    sense = _dev.Read(out readBuf, out errorChs, false, 0, 0, 1, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadSectors = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
-                                                readBuf.Length                     > 0;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadSectorsData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ SECTOR(S) RETRY in CHS mode...").IsIndeterminate();
-                    sense = _dev.Read(out readBuf, out errorChs, true, 0, 0, 1, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
-                                              readBuf.Length                     > 0;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadSectorsRetryData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ DMA in CHS mode...").IsIndeterminate();
-                    sense = _dev.ReadDma(out readBuf, out errorChs, false, 0, 0, 1, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadDma = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
-                                            readBuf.Length                     > 0;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadDmaData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ DMA RETRY in CHS mode...").IsIndeterminate();
-                    sense = _dev.ReadDma(out readBuf, out errorChs, true, 0, 0, 1, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadDmaRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
-                                                 readBuf.Length                     > 0;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadDmaRetryData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying SEEK in CHS mode...").IsIndeterminate();
-                    sense = _dev.Seek(out errorChs, 0, 0, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0;
-
-                AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense,
-                                           errorChs.Status, errorChs.Error);
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ SECTOR(S) in LBA mode...").IsIndeterminate();
-                    sense = _dev.Read(out readBuf, out errorLba, false, 0, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
-                                            readBuf.Length                     > 0;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadLbaData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ SECTOR(S) RETRY in LBA mode...").IsIndeterminate();
-                    sense = _dev.Read(out readBuf, out errorLba, true, 0, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
-                                                 readBuf.Length                     > 0;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadRetryLbaData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ DMA in LBA mode...").IsIndeterminate();
-                    sense = _dev.ReadDma(out readBuf, out errorLba, false, 0, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadDmaLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
-                                               readBuf.Length                     > 0;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadDmaLbaData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ DMA RETRY in LBA mode...").IsIndeterminate();
-                    sense = _dev.ReadDma(out readBuf, out errorLba, true, 0, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadDmaRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
-                                                    readBuf.Length                     > 0;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadDmaRetryLbaData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying SEEK in LBA mode...").IsIndeterminate();
-                    sense = _dev.Seek(out errorLba, 0, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0;
-
-                AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense,
-                                           errorChs.Status, errorChs.Error);
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ SECTOR(S) in LBA48 mode...").IsIndeterminate();
-                    sense = _dev.Read(out readBuf, out AtaErrorRegistersLba48 errorLba48, 0, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 &&
-                                              readBuf.Length                       > 0;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadLba48Data = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ DMA in LBA48 mode...").IsIndeterminate();
-                    sense = _dev.ReadDma(out readBuf, out errorLba48, 0, 1, _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadDmaLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 &&
-                                                 errorLba48.Error                     == 0    && readBuf.Length > 0;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadDmaLba48Data = readBuf;
-
-                // Send SET FEATURES before sending READ LONG commands, retrieve IDENTIFY again and
-                // check if ECC size changed. Sector is set to 1 because without it most drives just return
-                // CORRECTABLE ERROR for this command.
-                _dev.SetFeatures(out _, AtaFeatures.EnableReadLongVendorLength, 0, 0, 1, 0, _dev.Timeout, out _);
-
-                _dev.AtaIdentify(out buffer, out _, _dev.Timeout, out _);
-
-                if(Identify.Decode(buffer).HasValue)
-                {
-                    ataId = Identify.Decode(buffer).Value;
-
-                    if(ataId.EccBytes != 0x0000 &&
-                       ataId.EccBytes != 0xFFFF)
-                        mediaTest.LongBlockSize = logicalSectorSize + ataId.EccBytes;
-
-                    if(ataId.UnformattedBPS > logicalSectorSize &&
-                       (!(ataId.EccBytes != 0x0000 && ataId.EccBytes != 0xFFFF) || mediaTest.LongBlockSize == 516))
-                        mediaTest.LongBlockSize = ataId.UnformattedBPS;
-                }
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ LONG in CHS mode...").IsIndeterminate();
-
-                    sense = _dev.ReadLong(out readBuf, out errorChs, false, 0, 0, 1, mediaTest.LongBlockSize ?? 0,
-                                          _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadLong = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
-                                             readBuf.Length                     > 0     &&
-                                             BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadLongData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ LONG RETRY in CHS mode...").IsIndeterminate();
-
-                    sense = _dev.ReadLong(out readBuf, out errorChs, true, 0, 0, 1, mediaTest.LongBlockSize ?? 0,
-                                          _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadLongRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
-                                                  readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) !=
-                                                  checkCorrectRead;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadLongRetryData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ LONG in LBA mode...").IsIndeterminate();
-
-                    sense = _dev.ReadLong(out readBuf, out errorLba, false, 0, mediaTest.LongBlockSize ?? 0,
-                                          _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadLongLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
-                                                readBuf.Length                     > 0     &&
-                                                BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadLongLbaData = readBuf;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying READ LONG RETRY in LBA mode...").IsIndeterminate();
-
-                    sense = _dev.ReadLong(out readBuf, out errorLba, true, 0, mediaTest.LongBlockSize ?? 0,
-                                          _dev.Timeout, out _);
-                });
-
-                mediaTest.SupportsReadLongRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 &&
-                                                     errorLba.Error                     == 0    && readBuf.Length > 0 &&
-                                                     BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
-
-                AaruConsole.DebugWriteLine("ATA Report",
-                                           "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
-                                           errorChs.Status, errorChs.Error, readBuf.Length);
-
-                mediaTest.ReadLongRetryLbaData = readBuf;
-            }
-            else
-                mediaTest.MediaIsRecognized = false;
-
-            return mediaTest;
-        }
-
-        /// <summary>Creates a report of an ATA device</summary>
-        public TestedMedia ReportAta(Identify.IdentifyDevice ataId)
+        Spectre.ProgressSingleSpinner(ctx =>
         {
-            bool                   sense        = true;
-            byte[]                 readBuf      = Array.Empty<byte>();
-            AtaErrorRegistersChs   errorChs     = new();
-            AtaErrorRegistersLba28 errorLba     = new();
-            AtaErrorRegistersLba48 errorLba48   = new();
-            var                    capabilities = new TestedMedia();
+            ctx.AddTask("Querying ATA IDENTIFY...").IsIndeterminate();
+            _dev.AtaIdentify(out buffer, out _, _dev.Timeout, out _);
+        });
+
+        mediaTest.IdentifyData   = ClearIdentify(buffer);
+        mediaTest.IdentifyDevice = Identify.Decode(buffer);
+
+        if(mediaTest.IdentifyDevice.HasValue)
+        {
+            Identify.IdentifyDevice ataId = mediaTest.IdentifyDevice.Value;
 
             if(ataId.UnformattedBPT != 0)
-                capabilities.UnformattedBPT = ataId.UnformattedBPT;
+                mediaTest.UnformattedBPT = ataId.UnformattedBPT;
 
             if(ataId.UnformattedBPS != 0)
-                capabilities.UnformattedBPS = ataId.UnformattedBPS;
+                mediaTest.UnformattedBPS = ataId.UnformattedBPS;
 
             if(ataId.Cylinders       > 0 &&
                ataId.Heads           > 0 &&
                ataId.SectorsPerTrack > 0)
             {
-                capabilities.CHS = new Chs
+                mediaTest.CHS = new Chs
                 {
                     Cylinders = ataId.Cylinders,
                     Heads     = ataId.Heads,
                     Sectors   = ataId.SectorsPerTrack
                 };
 
-                capabilities.Blocks = (ulong)(ataId.Cylinders * ataId.Heads * ataId.SectorsPerTrack);
+                mediaTest.Blocks = (ulong)(ataId.Cylinders * ataId.Heads * ataId.SectorsPerTrack);
             }
 
             if(ataId.CurrentCylinders       > 0 &&
                ataId.CurrentHeads           > 0 &&
                ataId.CurrentSectorsPerTrack > 0)
             {
-                capabilities.CurrentCHS = new Chs
+                mediaTest.CurrentCHS = new Chs
                 {
                     Cylinders = ataId.CurrentCylinders,
                     Heads     = ataId.CurrentHeads,
                     Sectors   = ataId.CurrentSectorsPerTrack
                 };
 
-                capabilities.Blocks =
-                    (ulong)(ataId.CurrentCylinders * ataId.CurrentHeads * ataId.CurrentSectorsPerTrack);
+                if(mediaTest.Blocks == 0)
+                    mediaTest.Blocks =
+                        (ulong)(ataId.CurrentCylinders * ataId.CurrentHeads * ataId.CurrentSectorsPerTrack);
             }
 
             if(ataId.Capabilities.HasFlag(Identify.CapabilitiesBit.LBASupport))
             {
-                capabilities.LBASectors = ataId.LBASectors;
-                capabilities.Blocks     = ataId.LBASectors;
+                mediaTest.LBASectors = ataId.LBASectors;
+                mediaTest.Blocks     = ataId.LBASectors;
             }
 
             if(ataId.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
             {
-                capabilities.LBA48Sectors = ataId.LBA48Sectors;
-                capabilities.Blocks       = ataId.LBA48Sectors;
+                mediaTest.LBA48Sectors = ataId.LBA48Sectors;
+                mediaTest.Blocks       = ataId.LBA48Sectors;
             }
 
             if(ataId.NominalRotationRate != 0x0000 &&
                ataId.NominalRotationRate != 0xFFFF)
                 if(ataId.NominalRotationRate == 0x0001)
-                    capabilities.SolidStateDevice = true;
+                    mediaTest.SolidStateDevice = true;
                 else
                 {
-                    capabilities.SolidStateDevice    = false;
-                    capabilities.NominalRotationRate = ataId.NominalRotationRate;
+                    mediaTest.SolidStateDevice    = false;
+                    mediaTest.NominalRotationRate = ataId.NominalRotationRate;
                 }
 
             uint logicalSectorSize;
@@ -542,7 +148,7 @@ namespace Aaru.Core.Devices.Report
                     logicalSectorSize = 512;
 
                 if((ataId.PhysLogSectorSize & 0x2000) == 0x2000)
-                    physicalSectorSize = logicalSectorSize * (uint)Math.Pow(2, ataId.PhysLogSectorSize & 0xF);
+                    physicalSectorSize = (uint)(logicalSectorSize * ((1 << ataId.PhysLogSectorSize) & 0xF));
                 else
                     physicalSectorSize = logicalSectorSize;
             }
@@ -552,36 +158,36 @@ namespace Aaru.Core.Devices.Report
                 physicalSectorSize = 512;
             }
 
-            capabilities.BlockSize = logicalSectorSize;
+            mediaTest.BlockSize = logicalSectorSize;
 
             if(physicalSectorSize != logicalSectorSize)
             {
-                capabilities.PhysicalBlockSize = physicalSectorSize;
+                mediaTest.PhysicalBlockSize = physicalSectorSize;
 
                 if((ataId.LogicalAlignment & 0x8000) == 0x0000 &&
                    (ataId.LogicalAlignment & 0x4000) == 0x4000)
-                    capabilities.LogicalAlignment = (ushort)(ataId.LogicalAlignment & 0x3FFF);
+                    mediaTest.LogicalAlignment = (ushort)(ataId.LogicalAlignment & 0x3FFF);
             }
 
             if(ataId.EccBytes != 0x0000 &&
                ataId.EccBytes != 0xFFFF)
-                capabilities.LongBlockSize = logicalSectorSize + ataId.EccBytes;
+                mediaTest.LongBlockSize = logicalSectorSize + ataId.EccBytes;
 
             if(ataId.UnformattedBPS > logicalSectorSize &&
-               (!(ataId.EccBytes != 0x0000 && ataId.EccBytes != 0xFFFF) || capabilities.LongBlockSize == 516))
-                capabilities.LongBlockSize = ataId.UnformattedBPS;
+               (!(ataId.EccBytes != 0x0000 && ataId.EccBytes != 0xFFFF) || mediaTest.LongBlockSize == 516))
+                mediaTest.LongBlockSize = ataId.UnformattedBPS;
 
             if(ataId.CommandSet3.HasFlag(Identify.CommandSetBit3.MustBeSet)    &&
                !ataId.CommandSet3.HasFlag(Identify.CommandSetBit3.MustBeClear) &&
                ataId.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.MediaSerial))
             {
-                capabilities.CanReadMediaSerial = true;
+                mediaTest.CanReadMediaSerial = true;
 
                 if(!string.IsNullOrWhiteSpace(ataId.MediaManufacturer))
-                    capabilities.Manufacturer = ataId.MediaManufacturer;
+                    mediaTest.Manufacturer = ataId.MediaManufacturer;
             }
 
-            ulong checkCorrectRead = 0;
+            ulong checkCorrectRead = BitConverter.ToUInt64(buffer, 0);
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -589,13 +195,14 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.Read(out readBuf, out errorChs, false, 0, 0, 1, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadSectors = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
-                                               readBuf.Length                     > 0;
+            mediaTest.SupportsReadSectors = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
+                                            readBuf.Length                     > 0;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadSectorsData = readBuf;
+            mediaTest.ReadSectorsData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -603,13 +210,14 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.Read(out readBuf, out errorChs, true, 0, 0, 1, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadRetry =
-                !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
+            mediaTest.SupportsReadRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
+                                          readBuf.Length                     > 0;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadSectorsRetryData = readBuf;
+            mediaTest.ReadSectorsRetryData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -617,13 +225,14 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.ReadDma(out readBuf, out errorChs, false, 0, 0, 1, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadDma =
-                !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
+            mediaTest.SupportsReadDma = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
+                                        readBuf.Length                     > 0;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadDmaData = readBuf;
+            mediaTest.ReadDmaData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -631,13 +240,14 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.ReadDma(out readBuf, out errorChs, true, 0, 0, 1, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadDmaRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
-                                                readBuf.Length                     > 0;
+            mediaTest.SupportsReadDmaRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
+                                             readBuf.Length                     > 0;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadDmaRetryData = readBuf;
+            mediaTest.ReadDmaRetryData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -645,7 +255,7 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.Seek(out errorChs, 0, 0, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0;
+            mediaTest.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense,
                                        errorChs.Status, errorChs.Error);
@@ -656,13 +266,14 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.Read(out readBuf, out errorLba, false, 0, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadLba =
-                !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
+            mediaTest.SupportsReadLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
+                                        readBuf.Length                     > 0;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadLbaData = readBuf;
+            mediaTest.ReadLbaData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -670,13 +281,14 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.Read(out readBuf, out errorLba, true, 0, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
-                                                readBuf.Length                     > 0;
+            mediaTest.SupportsReadRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
+                                             readBuf.Length                     > 0;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadRetryLbaData = readBuf;
+            mediaTest.ReadRetryLbaData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -684,13 +296,14 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.ReadDma(out readBuf, out errorLba, false, 0, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadDmaLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
-                                              readBuf.Length                     > 0;
+            mediaTest.SupportsReadDmaLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
+                                           readBuf.Length                     > 0;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadDmaLbaData = readBuf;
+            mediaTest.ReadDmaLbaData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -698,13 +311,14 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.ReadDma(out readBuf, out errorLba, true, 0, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadDmaRetryLba =
-                !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
+            mediaTest.SupportsReadDmaRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
+                                                readBuf.Length                     > 0;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadDmaRetryLbaData = readBuf;
+            mediaTest.ReadDmaRetryLbaData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -712,24 +326,25 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.Seek(out errorLba, 0, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0;
+            mediaTest.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0;
 
             AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense,
-                                       errorLba.Status, errorLba.Error);
+                                       errorChs.Status, errorChs.Error);
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
                 ctx.AddTask("Trying READ SECTOR(S) in LBA48 mode...").IsIndeterminate();
-                sense = _dev.Read(out readBuf, out errorLba48, 0, 1, _dev.Timeout, out _);
+                sense = _dev.Read(out readBuf, out AtaErrorRegistersLba48 errorLba48, 0, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 &&
-                                             readBuf.Length                       > 0;
+            mediaTest.SupportsReadLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 &&
+                                          readBuf.Length                       > 0;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorLba48.Status, errorLba48.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadLba48Data = readBuf;
+            mediaTest.ReadLba48Data = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
@@ -737,20 +352,21 @@ namespace Aaru.Core.Devices.Report
                 sense = _dev.ReadDma(out readBuf, out errorLba48, 0, 1, _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadDmaLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 &&
-                                                readBuf.Length                       > 0;
+            mediaTest.SupportsReadDmaLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 &&
+                                             errorLba48.Error                     == 0    && readBuf.Length > 0;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorLba48.Status, errorLba48.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadDmaLba48Data = readBuf;
+            mediaTest.ReadDmaLba48Data = readBuf;
 
             // Send SET FEATURES before sending READ LONG commands, retrieve IDENTIFY again and
             // check if ECC size changed. Sector is set to 1 because without it most drives just return
             // CORRECTABLE ERROR for this command.
             _dev.SetFeatures(out _, AtaFeatures.EnableReadLongVendorLength, 0, 0, 1, 0, _dev.Timeout, out _);
 
-            _dev.AtaIdentify(out byte[] buffer, out _, _dev.Timeout, out _);
+            _dev.AtaIdentify(out buffer, out _, _dev.Timeout, out _);
 
             if(Identify.Decode(buffer).HasValue)
             {
@@ -758,96 +374,479 @@ namespace Aaru.Core.Devices.Report
 
                 if(ataId.EccBytes != 0x0000 &&
                    ataId.EccBytes != 0xFFFF)
-                    capabilities.LongBlockSize = logicalSectorSize + ataId.EccBytes;
+                    mediaTest.LongBlockSize = logicalSectorSize + ataId.EccBytes;
 
                 if(ataId.UnformattedBPS > logicalSectorSize &&
-                   (!(ataId.EccBytes != 0x0000 && ataId.EccBytes != 0xFFFF) || capabilities.LongBlockSize == 516))
-                    capabilities.LongBlockSize = ataId.UnformattedBPS;
+                   (!(ataId.EccBytes != 0x0000 && ataId.EccBytes != 0xFFFF) || mediaTest.LongBlockSize == 516))
+                    mediaTest.LongBlockSize = ataId.UnformattedBPS;
             }
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
                 ctx.AddTask("Trying READ LONG in CHS mode...").IsIndeterminate();
 
-                sense = _dev.ReadLong(out readBuf, out errorChs, false, 0, 0, 1, capabilities.LongBlockSize ?? 0,
+                sense = _dev.ReadLong(out readBuf, out errorChs, false, 0, 0, 1, mediaTest.LongBlockSize ?? 0,
                                       _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadLong = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
-                                            readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
+            mediaTest.SupportsReadLong = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
+                                         readBuf.Length                     > 0     &&
+                                         BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadLongData = readBuf;
+            mediaTest.ReadLongData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
                 ctx.AddTask("Trying READ LONG RETRY in CHS mode...").IsIndeterminate();
 
-                sense = _dev.ReadLong(out readBuf, out errorChs, true, 0, 0, 1, capabilities.LongBlockSize ?? 0,
+                sense = _dev.ReadLong(out readBuf, out errorChs, true, 0, 0, 1, mediaTest.LongBlockSize ?? 0,
                                       _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadLongRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
-                                                 readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) !=
-                                                 checkCorrectRead;
+            mediaTest.SupportsReadLongRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
+                                              readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) !=
+                                              checkCorrectRead;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorChs.Status, errorChs.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadLongRetryData = readBuf;
+            mediaTest.ReadLongRetryData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
                 ctx.AddTask("Trying READ LONG in LBA mode...").IsIndeterminate();
 
-                sense = _dev.ReadLong(out readBuf, out errorLba, false, 0, capabilities.LongBlockSize ?? 0,
+                sense = _dev.ReadLong(out readBuf, out errorLba, false, 0, mediaTest.LongBlockSize ?? 0,
                                       _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadLongLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
-                                               readBuf.Length                     > 0     &&
-                                               BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
+            mediaTest.SupportsReadLongLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
+                                            readBuf.Length                     > 0     &&
+                                            BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadLongLbaData = readBuf;
+            mediaTest.ReadLongLbaData = readBuf;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
                 ctx.AddTask("Trying READ LONG RETRY in LBA mode...").IsIndeterminate();
 
-                sense = _dev.ReadLong(out readBuf, out errorLba, true, 0, capabilities.LongBlockSize ?? 0, _dev.Timeout,
-                                      out _);
+                sense = _dev.ReadLong(out readBuf, out errorLba, true, 0, mediaTest.LongBlockSize ?? 0,
+                                      _dev.Timeout, out _);
             });
 
-            capabilities.SupportsReadLongRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
-                                                    readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) !=
-                                                    checkCorrectRead;
+            mediaTest.SupportsReadLongRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 &&
+                                                 errorLba.Error                     == 0    && readBuf.Length > 0 &&
+                                                 BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
 
-            AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
-                                       sense, errorLba.Status, errorLba.Error, readBuf.Length);
+            AaruConsole.DebugWriteLine("ATA Report",
+                                       "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}", sense,
+                                       errorChs.Status, errorChs.Error, readBuf.Length);
 
-            capabilities.ReadLongRetryLbaData = readBuf;
-
-            return capabilities;
+            mediaTest.ReadLongRetryLbaData = readBuf;
         }
+        else
+            mediaTest.MediaIsRecognized = false;
 
-        /// <summary>Clear serial numbers and other private fields from an IDENTIFY ATA DEVICE response</summary>
-        /// <param name="buffer">IDENTIFY ATA DEVICE response</param>
-        /// <returns>IDENTIFY ATA DEVICE response without the private fields</returns>
-        public static byte[] ClearIdentify(byte[] buffer)
+        return mediaTest;
+    }
+
+    /// <summary>Creates a report of an ATA device</summary>
+    public TestedMedia ReportAta(Identify.IdentifyDevice ataId)
+    {
+        bool                   sense        = true;
+        byte[]                 readBuf      = Array.Empty<byte>();
+        AtaErrorRegistersChs   errorChs     = new();
+        AtaErrorRegistersLba28 errorLba     = new();
+        AtaErrorRegistersLba48 errorLba48   = new();
+        var                    capabilities = new TestedMedia();
+
+        if(ataId.UnformattedBPT != 0)
+            capabilities.UnformattedBPT = ataId.UnformattedBPT;
+
+        if(ataId.UnformattedBPS != 0)
+            capabilities.UnformattedBPS = ataId.UnformattedBPS;
+
+        if(ataId.Cylinders       > 0 &&
+           ataId.Heads           > 0 &&
+           ataId.SectorsPerTrack > 0)
         {
-            byte[] empty = new byte[512];
+            capabilities.CHS = new Chs
+            {
+                Cylinders = ataId.Cylinders,
+                Heads     = ataId.Heads,
+                Sectors   = ataId.SectorsPerTrack
+            };
 
-            Array.Copy(empty, 0, buffer, 20, 20);
-            Array.Copy(empty, 0, buffer, 216, 8);
-            Array.Copy(empty, 0, buffer, 224, 8);
-            Array.Copy(empty, 0, buffer, 352, 40);
-
-            return buffer;
+            capabilities.Blocks = (ulong)(ataId.Cylinders * ataId.Heads * ataId.SectorsPerTrack);
         }
+
+        if(ataId.CurrentCylinders       > 0 &&
+           ataId.CurrentHeads           > 0 &&
+           ataId.CurrentSectorsPerTrack > 0)
+        {
+            capabilities.CurrentCHS = new Chs
+            {
+                Cylinders = ataId.CurrentCylinders,
+                Heads     = ataId.CurrentHeads,
+                Sectors   = ataId.CurrentSectorsPerTrack
+            };
+
+            capabilities.Blocks =
+                (ulong)(ataId.CurrentCylinders * ataId.CurrentHeads * ataId.CurrentSectorsPerTrack);
+        }
+
+        if(ataId.Capabilities.HasFlag(Identify.CapabilitiesBit.LBASupport))
+        {
+            capabilities.LBASectors = ataId.LBASectors;
+            capabilities.Blocks     = ataId.LBASectors;
+        }
+
+        if(ataId.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
+        {
+            capabilities.LBA48Sectors = ataId.LBA48Sectors;
+            capabilities.Blocks       = ataId.LBA48Sectors;
+        }
+
+        if(ataId.NominalRotationRate != 0x0000 &&
+           ataId.NominalRotationRate != 0xFFFF)
+            if(ataId.NominalRotationRate == 0x0001)
+                capabilities.SolidStateDevice = true;
+            else
+            {
+                capabilities.SolidStateDevice    = false;
+                capabilities.NominalRotationRate = ataId.NominalRotationRate;
+            }
+
+        uint logicalSectorSize;
+        uint physicalSectorSize;
+
+        if((ataId.PhysLogSectorSize & 0x8000) == 0x0000 &&
+           (ataId.PhysLogSectorSize & 0x4000) == 0x4000)
+        {
+            if((ataId.PhysLogSectorSize & 0x1000) == 0x1000)
+                if(ataId.LogicalSectorWords <= 255 ||
+                   ataId.LogicalAlignment   == 0xFFFF)
+                    logicalSectorSize = 512;
+                else
+                    logicalSectorSize = ataId.LogicalSectorWords * 2;
+            else
+                logicalSectorSize = 512;
+
+            if((ataId.PhysLogSectorSize & 0x2000) == 0x2000)
+                physicalSectorSize = logicalSectorSize * (uint)Math.Pow(2, ataId.PhysLogSectorSize & 0xF);
+            else
+                physicalSectorSize = logicalSectorSize;
+        }
+        else
+        {
+            logicalSectorSize  = 512;
+            physicalSectorSize = 512;
+        }
+
+        capabilities.BlockSize = logicalSectorSize;
+
+        if(physicalSectorSize != logicalSectorSize)
+        {
+            capabilities.PhysicalBlockSize = physicalSectorSize;
+
+            if((ataId.LogicalAlignment & 0x8000) == 0x0000 &&
+               (ataId.LogicalAlignment & 0x4000) == 0x4000)
+                capabilities.LogicalAlignment = (ushort)(ataId.LogicalAlignment & 0x3FFF);
+        }
+
+        if(ataId.EccBytes != 0x0000 &&
+           ataId.EccBytes != 0xFFFF)
+            capabilities.LongBlockSize = logicalSectorSize + ataId.EccBytes;
+
+        if(ataId.UnformattedBPS > logicalSectorSize &&
+           (!(ataId.EccBytes != 0x0000 && ataId.EccBytes != 0xFFFF) || capabilities.LongBlockSize == 516))
+            capabilities.LongBlockSize = ataId.UnformattedBPS;
+
+        if(ataId.CommandSet3.HasFlag(Identify.CommandSetBit3.MustBeSet)    &&
+           !ataId.CommandSet3.HasFlag(Identify.CommandSetBit3.MustBeClear) &&
+           ataId.EnabledCommandSet3.HasFlag(Identify.CommandSetBit3.MediaSerial))
+        {
+            capabilities.CanReadMediaSerial = true;
+
+            if(!string.IsNullOrWhiteSpace(ataId.MediaManufacturer))
+                capabilities.Manufacturer = ataId.MediaManufacturer;
+        }
+
+        ulong checkCorrectRead = 0;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ SECTOR(S) in CHS mode...").IsIndeterminate();
+            sense = _dev.Read(out readBuf, out errorChs, false, 0, 0, 1, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadSectors = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
+                                           readBuf.Length                     > 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorChs.Status, errorChs.Error, readBuf.Length);
+
+        capabilities.ReadSectorsData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ SECTOR(S) RETRY in CHS mode...").IsIndeterminate();
+            sense = _dev.Read(out readBuf, out errorChs, true, 0, 0, 1, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadRetry =
+            !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorChs.Status, errorChs.Error, readBuf.Length);
+
+        capabilities.ReadSectorsRetryData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ DMA in CHS mode...").IsIndeterminate();
+            sense = _dev.ReadDma(out readBuf, out errorChs, false, 0, 0, 1, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadDma =
+            !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 && readBuf.Length > 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorChs.Status, errorChs.Error, readBuf.Length);
+
+        capabilities.ReadDmaData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ DMA RETRY in CHS mode...").IsIndeterminate();
+            sense = _dev.ReadDma(out readBuf, out errorChs, true, 0, 0, 1, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadDmaRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
+                                            readBuf.Length                     > 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorChs.Status, errorChs.Error, readBuf.Length);
+
+        capabilities.ReadDmaRetryData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SEEK in CHS mode...").IsIndeterminate();
+            sense = _dev.Seek(out errorChs, 0, 0, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsSeek = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense,
+                                   errorChs.Status, errorChs.Error);
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ SECTOR(S) in LBA mode...").IsIndeterminate();
+            sense = _dev.Read(out readBuf, out errorLba, false, 0, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadLba =
+            !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorLba.Status, errorLba.Error, readBuf.Length);
+
+        capabilities.ReadLbaData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ SECTOR(S) RETRY in LBA mode...").IsIndeterminate();
+            sense = _dev.Read(out readBuf, out errorLba, true, 0, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
+                                            readBuf.Length                     > 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorLba.Status, errorLba.Error, readBuf.Length);
+
+        capabilities.ReadRetryLbaData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ DMA in LBA mode...").IsIndeterminate();
+            sense = _dev.ReadDma(out readBuf, out errorLba, false, 0, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadDmaLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
+                                          readBuf.Length                     > 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorLba.Status, errorLba.Error, readBuf.Length);
+
+        capabilities.ReadDmaLbaData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ DMA RETRY in LBA mode...").IsIndeterminate();
+            sense = _dev.ReadDma(out readBuf, out errorLba, true, 0, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadDmaRetryLba =
+            !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 && readBuf.Length > 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorLba.Status, errorLba.Error, readBuf.Length);
+
+        capabilities.ReadDmaRetryLbaData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SEEK in LBA mode...").IsIndeterminate();
+            sense = _dev.Seek(out errorLba, 0, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsSeekLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}", sense,
+                                   errorLba.Status, errorLba.Error);
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ SECTOR(S) in LBA48 mode...").IsIndeterminate();
+            sense = _dev.Read(out readBuf, out errorLba48, 0, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 &&
+                                         readBuf.Length                       > 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorLba48.Status, errorLba48.Error, readBuf.Length);
+
+        capabilities.ReadLba48Data = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ DMA in LBA48 mode...").IsIndeterminate();
+            sense = _dev.ReadDma(out readBuf, out errorLba48, 0, 1, _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadDmaLba48 = !sense && (errorLba48.Status & 0x01) != 0x01 && errorLba48.Error == 0 &&
+                                            readBuf.Length                       > 0;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorLba48.Status, errorLba48.Error, readBuf.Length);
+
+        capabilities.ReadDmaLba48Data = readBuf;
+
+        // Send SET FEATURES before sending READ LONG commands, retrieve IDENTIFY again and
+        // check if ECC size changed. Sector is set to 1 because without it most drives just return
+        // CORRECTABLE ERROR for this command.
+        _dev.SetFeatures(out _, AtaFeatures.EnableReadLongVendorLength, 0, 0, 1, 0, _dev.Timeout, out _);
+
+        _dev.AtaIdentify(out byte[] buffer, out _, _dev.Timeout, out _);
+
+        if(Identify.Decode(buffer).HasValue)
+        {
+            ataId = Identify.Decode(buffer).Value;
+
+            if(ataId.EccBytes != 0x0000 &&
+               ataId.EccBytes != 0xFFFF)
+                capabilities.LongBlockSize = logicalSectorSize + ataId.EccBytes;
+
+            if(ataId.UnformattedBPS > logicalSectorSize &&
+               (!(ataId.EccBytes != 0x0000 && ataId.EccBytes != 0xFFFF) || capabilities.LongBlockSize == 516))
+                capabilities.LongBlockSize = ataId.UnformattedBPS;
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ LONG in CHS mode...").IsIndeterminate();
+
+            sense = _dev.ReadLong(out readBuf, out errorChs, false, 0, 0, 1, capabilities.LongBlockSize ?? 0,
+                                  _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadLong = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
+                                        readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) != checkCorrectRead;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorChs.Status, errorChs.Error, readBuf.Length);
+
+        capabilities.ReadLongData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ LONG RETRY in CHS mode...").IsIndeterminate();
+
+            sense = _dev.ReadLong(out readBuf, out errorChs, true, 0, 0, 1, capabilities.LongBlockSize ?? 0,
+                                  _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadLongRetry = !sense && (errorChs.Status & 0x01) != 0x01 && errorChs.Error == 0 &&
+                                             readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) !=
+                                             checkCorrectRead;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorChs.Status, errorChs.Error, readBuf.Length);
+
+        capabilities.ReadLongRetryData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ LONG in LBA mode...").IsIndeterminate();
+
+            sense = _dev.ReadLong(out readBuf, out errorLba, false, 0, capabilities.LongBlockSize ?? 0,
+                                  _dev.Timeout, out _);
+        });
+
+        capabilities.SupportsReadLongLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
+                                           readBuf.Length                     > 0     &&
+                                           BitConverter.ToUInt64(readBuf, 0)  != checkCorrectRead;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorLba.Status, errorLba.Error, readBuf.Length);
+
+        capabilities.ReadLongLbaData = readBuf;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying READ LONG RETRY in LBA mode...").IsIndeterminate();
+
+            sense = _dev.ReadLong(out readBuf, out errorLba, true, 0, capabilities.LongBlockSize ?? 0, _dev.Timeout,
+                                  out _);
+        });
+
+        capabilities.SupportsReadLongRetryLba = !sense && (errorLba.Status & 0x01) != 0x01 && errorLba.Error == 0 &&
+                                                readBuf.Length > 0 && BitConverter.ToUInt64(readBuf, 0) !=
+                                                checkCorrectRead;
+
+        AaruConsole.DebugWriteLine("ATA Report", "Sense = {0}, Status = 0x{1:X2}, Error = 0x{2:X2}, Length = {3}",
+                                   sense, errorLba.Status, errorLba.Error, readBuf.Length);
+
+        capabilities.ReadLongRetryLbaData = readBuf;
+
+        return capabilities;
+    }
+
+    /// <summary>Clear serial numbers and other private fields from an IDENTIFY ATA DEVICE response</summary>
+    /// <param name="buffer">IDENTIFY ATA DEVICE response</param>
+    /// <returns>IDENTIFY ATA DEVICE response without the private fields</returns>
+    public static byte[] ClearIdentify(byte[] buffer)
+    {
+        byte[] empty = new byte[512];
+
+        Array.Copy(empty, 0, buffer, 20, 20);
+        Array.Copy(empty, 0, buffer, 216, 8);
+        Array.Copy(empty, 0, buffer, 224, 8);
+        Array.Copy(empty, 0, buffer, 352, 40);
+
+        return buffer;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Report/DeviceReport.cs b/Aaru.Core/Devices/Report/DeviceReport.cs
index eea805e39..05342629a 100644
--- a/Aaru.Core/Devices/Report/DeviceReport.cs
+++ b/Aaru.Core/Devices/Report/DeviceReport.cs
@@ -32,14 +32,13 @@
 
 using Aaru.Devices;
 
-namespace Aaru.Core.Devices.Report
-{
-    public sealed partial class DeviceReport
-    {
-        readonly Device _dev;
+namespace Aaru.Core.Devices.Report;
 
-        /// <summary>Initializes a device report for the specified device (must be opened)</summary>
-        /// <param name="device">Device</param>
-        public DeviceReport(Device device) => _dev = device;
-    }
+public sealed partial class DeviceReport
+{
+    readonly Device _dev;
+
+    /// <summary>Initializes a device report for the specified device (must be opened)</summary>
+    /// <param name="device">Device</param>
+    public DeviceReport(Device device) => _dev = device;
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Report/FireWire.cs b/Aaru.Core/Devices/Report/FireWire.cs
index ae3dfd7e3..fa367c85e 100644
--- a/Aaru.Core/Devices/Report/FireWire.cs
+++ b/Aaru.Core/Devices/Report/FireWire.cs
@@ -32,18 +32,17 @@
 
 using Aaru.CommonTypes.Metadata;
 
-namespace Aaru.Core.Devices.Report
+namespace Aaru.Core.Devices.Report;
+
+/// <summary>Implements creating a report for a FireWire device</summary>
+public sealed partial class DeviceReport
 {
-    /// <summary>Implements creating a report for a FireWire device</summary>
-    public sealed partial class DeviceReport
+    /// <summary>Fills a device report with parameters specific to a FireWire device</summary>
+    public FireWire FireWireReport() => new FireWire
     {
-        /// <summary>Fills a device report with parameters specific to a FireWire device</summary>
-        public FireWire FireWireReport() => new FireWire
-        {
-            Manufacturer = _dev.FireWireVendorName,
-            Product      = _dev.FireWireModelName,
-            ProductID    = _dev.FireWireModel,
-            VendorID     = _dev.FireWireVendor
-        };
-    }
+        Manufacturer = _dev.FireWireVendorName,
+        Product      = _dev.FireWireModelName,
+        ProductID    = _dev.FireWireModel,
+        VendorID     = _dev.FireWireVendor
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Report/GdRomSwapTrick.cs b/Aaru.Core/Devices/Report/GdRomSwapTrick.cs
index 5384c1ae0..a1886ce30 100644
--- a/Aaru.Core/Devices/Report/GdRomSwapTrick.cs
+++ b/Aaru.Core/Devices/Report/GdRomSwapTrick.cs
@@ -41,1570 +41,1569 @@ using Aaru.Devices;
 
 // ReSharper disable InlineOutVariableDeclaration
 
-namespace Aaru.Core.Devices.Report
+namespace Aaru.Core.Devices.Report;
+
+public sealed partial class DeviceReport
 {
-    public sealed partial class DeviceReport
+    /// <summary>Tries and checks reading a GD-ROM disc using the swap disc trick and adds the result to a device report</summary>
+    /// <param name="report">Device report</param>
+    public void ReportGdRomSwapTrick(ref DeviceReportV2 report)
     {
-        /// <summary>Tries and checks reading a GD-ROM disc using the swap disc trick and adds the result to a device report</summary>
-        /// <param name="report">Device report</param>
-        public void ReportGdRomSwapTrick(ref DeviceReportV2 report)
+        report.GdRomSwapDiscCapabilities = new GdRomSwapDiscCapabilities();
+
+        var pressedKey = new ConsoleKeyInfo();
+
+        while(pressedKey.Key != ConsoleKey.Y &&
+              pressedKey.Key != ConsoleKey.N)
         {
-            report.GdRomSwapDiscCapabilities = new GdRomSwapDiscCapabilities();
+            AaruConsole.
+                Write("Have you previously tried with a GD-ROM disc and did the computer hang or crash? (Y/N): ");
 
-            var pressedKey = new ConsoleKeyInfo();
+            pressedKey = System.Console.ReadKey();
+            AaruConsole.WriteLine();
+        }
 
-            while(pressedKey.Key != ConsoleKey.Y &&
-                  pressedKey.Key != ConsoleKey.N)
-            {
-                AaruConsole.
-                    Write("Have you previously tried with a GD-ROM disc and did the computer hang or crash? (Y/N): ");
+        if(pressedKey.Key == ConsoleKey.Y)
+        {
+            report.GdRomSwapDiscCapabilities.TestCrashed = true;
 
-                pressedKey = System.Console.ReadKey();
-                AaruConsole.WriteLine();
-            }
+            return;
+        }
 
-            if(pressedKey.Key == ConsoleKey.Y)
-            {
-                report.GdRomSwapDiscCapabilities.TestCrashed = true;
+        AaruConsole.WriteLine("Ejecting disc...");
 
-                return;
-            }
+        _dev.AllowMediumRemoval(out _, _dev.Timeout, out _);
+        _dev.EjectTray(out _, _dev.Timeout, out _);
 
-            AaruConsole.WriteLine("Ejecting disc...");
+        AaruConsole.WriteLine("Please insert trap disc inside...");
+        AaruConsole.WriteLine("Press any key to continue...");
+        System.Console.ReadLine();
 
-            _dev.AllowMediumRemoval(out _, _dev.Timeout, out _);
-            _dev.EjectTray(out _, _dev.Timeout, out _);
+        AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
 
-            AaruConsole.WriteLine("Please insert trap disc inside...");
-            AaruConsole.WriteLine("Press any key to continue...");
-            System.Console.ReadLine();
+        int    retries = 0;
+        bool   sense;
+        byte[] buffer;
+        byte[] senseBuffer;
 
-            AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+        do
+        {
+            retries++;
+            sense = _dev.ScsiTestUnitReady(out senseBuffer, _dev.Timeout, out _);
 
-            int    retries = 0;
-            bool   sense;
-            byte[] buffer;
-            byte[] senseBuffer;
+            if(!sense)
+                break;
 
-            do
-            {
-                retries++;
-                sense = _dev.ScsiTestUnitReady(out senseBuffer, _dev.Timeout, out _);
+            DecodedSense? decodedSense = Sense.Decode(senseBuffer);
 
-                if(!sense)
-                    break;
+            if(decodedSense?.ASC != 0x04)
+                break;
 
-                DecodedSense? decodedSense = Sense.Decode(senseBuffer);
+            if(decodedSense?.ASCQ != 0x01)
+                break;
 
-                if(decodedSense?.ASC != 0x04)
-                    break;
+            Thread.Sleep(2000);
+        } while(retries < 25);
 
-                if(decodedSense?.ASCQ != 0x01)
-                    break;
+        sense = _dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
 
-                Thread.Sleep(2000);
-            } while(retries < 25);
+        if(sense)
+        {
+            AaruConsole.WriteLine("READ FULL TOC failed...");
+            AaruConsole.DebugWriteLine("GD-ROM reporter", "{0}", Sense.PrettifySense(senseBuffer));
 
+            report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
+            report.GdRomSwapDiscCapabilities.TestCrashed        = false;
+
+            return;
+        }
+
+        FullTOC.CDFullTOC? decodedToc = FullTOC.Decode(buffer);
+
+        if(decodedToc is null)
+        {
+            AaruConsole.WriteLine("Could not decode TOC...");
+
+            report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
+            report.GdRomSwapDiscCapabilities.TestCrashed        = false;
+
+            return;
+        }
+
+        FullTOC.CDFullTOC toc = decodedToc.Value;
+
+        FullTOC.TrackDataDescriptor leadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
+
+        if(leadOutTrack.POINT != 0xA2)
+        {
+            AaruConsole.WriteLine("Cannot find lead-out...");
+
+            report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
+            report.GdRomSwapDiscCapabilities.TestCrashed        = false;
+
+            return;
+        }
+
+        int  min         = 0, sec, frame;
+        bool tocIsNotBcd = false;
+
+        report.GdRomSwapDiscCapabilities.SwapDiscLeadOutPMIN  = leadOutTrack.PMIN;
+        report.GdRomSwapDiscCapabilities.SwapDiscLeadOutPSEC  = leadOutTrack.PSEC;
+        report.GdRomSwapDiscCapabilities.SwapDiscLeadOutPFRAM = leadOutTrack.PFRAME;
+
+        if(leadOutTrack.PMIN == 122)
+            tocIsNotBcd = true;
+
+        if(leadOutTrack.PMIN >= 0xA0 &&
+           !tocIsNotBcd)
+        {
+            min               += 90;
+            leadOutTrack.PMIN -= 0x90;
+        }
+
+        if(tocIsNotBcd)
+        {
+            min   = leadOutTrack.PMIN;
+            sec   = leadOutTrack.PSEC;
+            frame = leadOutTrack.PFRAME;
+        }
+        else
+        {
+            min   += ((leadOutTrack.PMIN   >> 4) * 10) + (leadOutTrack.PMIN   & 0x0F);
+            sec   =  ((leadOutTrack.PSEC   >> 4) * 10) + (leadOutTrack.PSEC   & 0x0F);
+            frame =  ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F);
+        }
+
+        int sectors = (min * 60 * 75) + (sec * 75) + frame - 150;
+
+        AaruConsole.WriteLine("Trap disc shows {0} sectors...", sectors);
+
+        if(sectors < 450000)
+        {
+            AaruConsole.WriteLine("Trap disc doesn't have enough sectors...");
+
+            report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
+            report.GdRomSwapDiscCapabilities.TestCrashed        = false;
+
+            return;
+        }
+
+        report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = true;
+
+        AaruConsole.WriteLine("Stopping motor...");
+
+        _dev.StopUnit(out _, _dev.Timeout, out _);
+
+        AaruConsole.WriteLine("Please MANUALLY get the trap disc out and put the GD-ROM disc inside...");
+        AaruConsole.WriteLine("Press any key to continue...");
+        System.Console.ReadLine();
+
+        AaruConsole.WriteLine("Waiting 5 seconds...");
+        Thread.Sleep(5000);
+
+        AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+
+        retries = 0;
+
+        do
+        {
+            retries++;
             sense = _dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
 
-            if(sense)
+            if(!sense)
+                break;
+
+            DecodedSense? decodedSense = Sense.Decode(senseBuffer);
+
+            if(decodedSense?.ASC != 0x04)
+                break;
+
+            if(decodedSense?.ASCQ != 0x01)
+                break;
+        } while(retries < 25);
+
+        if(sense)
+        {
+            AaruConsole.WriteLine("READ FULL TOC failed...");
+            AaruConsole.DebugWriteLine("GD-ROM reporter", "{0}", Sense.PrettifySense(senseBuffer));
+
+            report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
+            report.GdRomSwapDiscCapabilities.TestCrashed        = false;
+
+            return;
+        }
+
+        decodedToc = FullTOC.Decode(buffer);
+
+        if(decodedToc is null)
+        {
+            AaruConsole.WriteLine("Could not decode TOC...");
+
+            report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
+            report.GdRomSwapDiscCapabilities.TestCrashed        = false;
+
+            return;
+        }
+
+        toc = decodedToc.Value;
+
+        FullTOC.TrackDataDescriptor newLeadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
+
+        if(newLeadOutTrack.POINT != 0xA2)
+        {
+            AaruConsole.WriteLine("Cannot find lead-out...");
+
+            report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
+            report.GdRomSwapDiscCapabilities.TestCrashed        = false;
+
+            return;
+        }
+
+        if(newLeadOutTrack.PMIN >= 0xA0 &&
+           !tocIsNotBcd)
+            newLeadOutTrack.PMIN -= 0x90;
+
+        if(newLeadOutTrack.PMIN   != leadOutTrack.PMIN ||
+           newLeadOutTrack.PSEC   != leadOutTrack.PSEC ||
+           newLeadOutTrack.PFRAME != leadOutTrack.PFRAME)
+        {
+            AaruConsole.WriteLine("Lead-out has changed, this drive does not support hot swapping discs...");
+
+            report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
+            report.GdRomSwapDiscCapabilities.TestCrashed        = false;
+
+            return;
+        }
+
+        _dev.SetCdSpeed(out _, RotationalControl.PureCav, 170, 0, _dev.Timeout, out _);
+
+        AaruConsole.Write("Reading LBA 0... ");
+
+        report.GdRomSwapDiscCapabilities.Lba0Readable = !_dev.ReadCd(out byte[] lba0Buffer, out byte[] lba0Sense, 0,
+                                                                     2352, 1, MmcSectorTypes.AllTypes, false, false,
+                                                                     true, MmcHeaderCodes.AllHeaders, true, true,
+                                                                     MmcErrorField.None, MmcSubchannel.None,
+                                                                     _dev.Timeout, out _);
+
+        report.GdRomSwapDiscCapabilities.Lba0Data         = lba0Buffer;
+        report.GdRomSwapDiscCapabilities.Lba0Sense        = lba0Sense;
+        report.GdRomSwapDiscCapabilities.Lba0DecodedSense = Sense.PrettifySense(lba0Sense);
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba0Readable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 0 as audio (scrambled)... ");
+
+        report.GdRomSwapDiscCapabilities.Lba0ScrambledReadable = !_dev.ReadCd(out byte[] lba0ScrambledBuffer,
+                                                                              out byte[] lba0ScrambledSense, 0, 2352, 1,
+                                                                              MmcSectorTypes.Cdda, false, false, false,
+                                                                              MmcHeaderCodes.None, true, false,
+                                                                              MmcErrorField.None, MmcSubchannel.None,
+                                                                              _dev.Timeout, out _);
+
+        report.GdRomSwapDiscCapabilities.Lba0ScrambledData         = lba0ScrambledBuffer;
+        report.GdRomSwapDiscCapabilities.Lba0ScrambledSense        = lba0ScrambledSense;
+        report.GdRomSwapDiscCapabilities.Lba0ScrambledDecodedSense = Sense.PrettifySense(lba0ScrambledSense);
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba0ScrambledReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 100000 as audio... ");
+        uint cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba100000AudioReadable = !_dev.ReadCd(out byte[] lba100000AudioBuffer,
+                                                                          out byte[] lba100000AudioSenseBuffer,
+                                                                          100000, 2352, cluster,
+                                                                          MmcSectorTypes.Cdda, false, false,
+                                                                          false, MmcHeaderCodes.None, true,
+                                                                          false, MmcErrorField.None,
+                                                                          MmcSubchannel.None, _dev.Timeout,
+                                                                          out _);
+
+            report.GdRomSwapDiscCapabilities.Lba100000AudioData  = lba100000AudioBuffer;
+            report.GdRomSwapDiscCapabilities.Lba100000AudioSense = lba100000AudioSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba100000AudioDecodedSense =
+                Sense.PrettifySense(lba100000AudioSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba100000AudioReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba100000AudioReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 50000 as audio... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba50000AudioReadable = !_dev.ReadCd(out byte[] lba50000AudioBuffer,
+                                                                         out byte[] lba50000AudioSenseBuffer,
+                                                                         50000, 2352, cluster,
+                                                                         MmcSectorTypes.Cdda, false, false,
+                                                                         false, MmcHeaderCodes.None, true,
+                                                                         false, MmcErrorField.None,
+                                                                         MmcSubchannel.None, _dev.Timeout,
+                                                                         out _);
+
+            report.GdRomSwapDiscCapabilities.Lba50000AudioData  = lba50000AudioBuffer;
+            report.GdRomSwapDiscCapabilities.Lba50000AudioSense = lba50000AudioSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba50000AudioDecodedSense =
+                Sense.PrettifySense(lba50000AudioSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba50000AudioReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba50000AudioReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 450000 as audio... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba450000AudioReadable = !_dev.ReadCd(out byte[] lba450000AudioBuffer,
+                                                                          out byte[] lba450000AudioSenseBuffer,
+                                                                          450000, 2352, cluster,
+                                                                          MmcSectorTypes.Cdda, false, false,
+                                                                          false, MmcHeaderCodes.None, true,
+                                                                          false, MmcErrorField.None,
+                                                                          MmcSubchannel.None, _dev.Timeout,
+                                                                          out _);
+
+            report.GdRomSwapDiscCapabilities.Lba450000AudioData  = lba450000AudioBuffer;
+            report.GdRomSwapDiscCapabilities.Lba450000AudioSense = lba450000AudioSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba450000AudioDecodedSense =
+                Sense.PrettifySense(lba450000AudioSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba450000AudioReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba450000AudioReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 400000 as audio... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba400000AudioReadable = !_dev.ReadCd(out byte[] lba400000AudioBuffer,
+                                                                          out byte[] lba400000AudioSenseBuffer,
+                                                                          400000, 2352, cluster,
+                                                                          MmcSectorTypes.Cdda, false, false,
+                                                                          false, MmcHeaderCodes.None, true,
+                                                                          false, MmcErrorField.None,
+                                                                          MmcSubchannel.None, _dev.Timeout,
+                                                                          out _);
+
+            report.GdRomSwapDiscCapabilities.Lba400000AudioData  = lba400000AudioBuffer;
+            report.GdRomSwapDiscCapabilities.Lba400000AudioSense = lba400000AudioSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba400000AudioDecodedSense =
+                Sense.PrettifySense(lba400000AudioSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba400000AudioReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba400000AudioReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 45000 as audio... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba45000AudioReadable = !_dev.ReadCd(out byte[] lba45000AudioBuffer,
+                                                                         out byte[] lba45000AudioSenseBuffer,
+                                                                         45000, 2352, cluster,
+                                                                         MmcSectorTypes.Cdda, false, false,
+                                                                         false, MmcHeaderCodes.None, true,
+                                                                         false, MmcErrorField.None,
+                                                                         MmcSubchannel.None, _dev.Timeout,
+                                                                         out _);
+
+            report.GdRomSwapDiscCapabilities.Lba45000AudioData  = lba45000AudioBuffer;
+            report.GdRomSwapDiscCapabilities.Lba45000AudioSense = lba45000AudioSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba45000AudioDecodedSense =
+                Sense.PrettifySense(lba45000AudioSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba45000AudioReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba45000AudioReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 44990 as audio... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba44990AudioReadable = !_dev.ReadCd(out byte[] lba44990AudioBuffer,
+                                                                         out byte[] lba44990AudioSenseBuffer,
+                                                                         44990, 2352, cluster,
+                                                                         MmcSectorTypes.Cdda, false, false,
+                                                                         false, MmcHeaderCodes.None, true,
+                                                                         false, MmcErrorField.None,
+                                                                         MmcSubchannel.None, _dev.Timeout,
+                                                                         out _);
+
+            report.GdRomSwapDiscCapabilities.Lba44990AudioData  = lba44990AudioBuffer;
+            report.GdRomSwapDiscCapabilities.Lba44990AudioSense = lba44990AudioSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba44990AudioDecodedSense =
+                Sense.PrettifySense(lba44990AudioSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba44990AudioReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba44990AudioReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 100000 as audio with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadable =
+                !_dev.ReadCd(out byte[] lba100000AudioPqBuffer, out byte[] lba100000AudioPqSenseBuffer, 100000,
+                             2368, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
+                             false, MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba100000AudioPqData  = lba100000AudioPqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba100000AudioPqSense = lba100000AudioPqSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba100000AudioPqDecodedSense =
+                Sense.PrettifySense(lba100000AudioPqSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 50000 as audio with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadable =
+                !_dev.ReadCd(out byte[] lba50000AudioPqBuffer, out byte[] lba50000AudioPqSenseBuffer, 50000, 2368,
+                             cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
+                             MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba50000AudioPqData  = lba50000AudioPqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba50000AudioPqSense = lba50000AudioPqSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba50000AudioPqDecodedSense =
+                Sense.PrettifySense(lba50000AudioPqSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 450000 as audio with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadable =
+                !_dev.ReadCd(out byte[] lba450000AudioPqBuffer, out byte[] lba450000AudioPqSenseBuffer, 450000,
+                             2368, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
+                             false, MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba450000AudioPqData  = lba450000AudioPqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba450000AudioPqSense = lba450000AudioPqSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba450000AudioPqDecodedSense =
+                Sense.PrettifySense(lba450000AudioPqSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 400000 as audio with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadable =
+                !_dev.ReadCd(out byte[] lba400000AudioPqBuffer, out byte[] lba400000AudioPqSenseBuffer, 400000,
+                             2368, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
+                             false, MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba400000AudioPqData  = lba400000AudioPqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba400000AudioPqSense = lba400000AudioPqSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba400000AudioPqDecodedSense =
+                Sense.PrettifySense(lba400000AudioPqSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 45000 as audio with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadable =
+                !_dev.ReadCd(out byte[] lba45000AudioPqBuffer, out byte[] lba45000AudioPqSenseBuffer, 45000, 2368,
+                             cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
+                             MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba45000AudioPqData  = lba45000AudioPqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba45000AudioPqSense = lba45000AudioPqSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba45000AudioPqDecodedSense =
+                Sense.PrettifySense(lba45000AudioPqSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 44990 as audio with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba44990AudioPqReadable =
+                !_dev.ReadCd(out byte[] lba44990AudioPqBuffer, out byte[] lba44990AudioPqSenseBuffer, 44990, 2368,
+                             cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
+                             MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba44990AudioPqData  = lba44990AudioPqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba44990AudioPqSense = lba44990AudioPqSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba44990AudioPqDecodedSense =
+                Sense.PrettifySense(lba44990AudioPqSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba44990AudioPqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba44990AudioPqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioPqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 100000 as audio with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadable =
+                !_dev.ReadCd(out byte[] lba100000AudioRwBuffer, out byte[] lba100000AudioRwSenseBuffer, 100000,
+                             2448, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
+                             false, MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba100000AudioRwData  = lba100000AudioRwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba100000AudioRwSense = lba100000AudioRwSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba100000AudioRwDecodedSense =
+                Sense.PrettifySense(lba100000AudioRwSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 50000 as audio with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadable =
+                !_dev.ReadCd(out byte[] lba50000AudioRwBuffer, out byte[] lba50000AudioRwSenseBuffer, 50000, 2448,
+                             cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
+                             MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba50000AudioRwData  = lba50000AudioRwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba50000AudioRwSense = lba50000AudioRwSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba50000AudioRwDecodedSense =
+                Sense.PrettifySense(lba50000AudioRwSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 450000 as audio with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadable =
+                !_dev.ReadCd(out byte[] lba450000AudioRwBuffer, out byte[] lba450000AudioRwSenseBuffer, 450000,
+                             2448, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
+                             false, MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba450000AudioRwData  = lba450000AudioRwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba450000AudioRwSense = lba450000AudioRwSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba450000AudioRwDecodedSense =
+                Sense.PrettifySense(lba450000AudioRwSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 400000 as audio with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadable =
+                !_dev.ReadCd(out byte[] lba400000AudioRwBuffer, out byte[] lba400000AudioRwSenseBuffer, 400000,
+                             2448, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
+                             false, MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba400000AudioRwData  = lba400000AudioRwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba400000AudioRwSense = lba400000AudioRwSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba400000AudioRwDecodedSense =
+                Sense.PrettifySense(lba400000AudioRwSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 45000 as audio with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadable =
+                !_dev.ReadCd(out byte[] lba45000AudioRwBuffer, out byte[] lba45000AudioRwSenseBuffer, 45000, 2448,
+                             cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
+                             MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba45000AudioRwData  = lba45000AudioRwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba45000AudioRwSense = lba45000AudioRwSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba45000AudioRwDecodedSense =
+                Sense.PrettifySense(lba45000AudioRwSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 44990 as audio with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba44990AudioRwReadable =
+                !_dev.ReadCd(out byte[] lba44990AudioRwBuffer, out byte[] lba44990AudioRwSenseBuffer, 44990, 2448,
+                             cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
+                             MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba44990AudioRwData  = lba44990AudioRwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba44990AudioRwSense = lba44990AudioRwSenseBuffer;
+
+            report.GdRomSwapDiscCapabilities.Lba44990AudioRwDecodedSense =
+                Sense.PrettifySense(lba44990AudioRwSenseBuffer);
+
+            report.GdRomSwapDiscCapabilities.Lba44990AudioRwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba44990AudioRwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioRwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 100000... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba100000Readable = !_dev.ReadCd(out byte[] lba100000Buffer,
+                                                                              out byte[] lba100000SenseBuffer, 100000,
+                                                                              2352, cluster, MmcSectorTypes.AllTypes,
+                                                                              false, false, true,
+                                                                              MmcHeaderCodes.AllHeaders, true, true,
+                                                                              MmcErrorField.None, MmcSubchannel.None,
+                                                                              _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba100000Data            = lba100000Buffer;
+            report.GdRomSwapDiscCapabilities.Lba100000Sense           = lba100000SenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba100000DecodedSense    = Sense.PrettifySense(lba100000SenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba100000ReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba100000Readable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000Readable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 50000... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba50000Readable = !_dev.ReadCd(out byte[] lba50000Buffer,
+                                                                             out byte[] lba50000SenseBuffer, 50000,
+                                                                             2352, cluster, MmcSectorTypes.AllTypes,
+                                                                             false, false, true,
+                                                                             MmcHeaderCodes.AllHeaders, true, true,
+                                                                             MmcErrorField.None, MmcSubchannel.None,
+                                                                             _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba50000Data            = lba50000Buffer;
+            report.GdRomSwapDiscCapabilities.Lba50000Sense           = lba50000SenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba50000DecodedSense    = Sense.PrettifySense(lba50000SenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba50000ReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba50000Readable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000Readable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 450000... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba450000Readable = !_dev.ReadCd(out byte[] lba450000Buffer,
+                                                                              out byte[] lba450000SenseBuffer, 450000,
+                                                                              2352, cluster, MmcSectorTypes.AllTypes,
+                                                                              false, false, true,
+                                                                              MmcHeaderCodes.AllHeaders, true, true,
+                                                                              MmcErrorField.None, MmcSubchannel.None,
+                                                                              _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba450000Data            = lba450000Buffer;
+            report.GdRomSwapDiscCapabilities.Lba450000Sense           = lba450000SenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba450000DecodedSense    = Sense.PrettifySense(lba450000SenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba450000ReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba450000Readable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000Readable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 400000... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba400000Readable = !_dev.ReadCd(out byte[] lba400000Buffer,
+                                                                              out byte[] lba400000SenseBuffer, 400000,
+                                                                              2352, cluster, MmcSectorTypes.AllTypes,
+                                                                              false, false, true,
+                                                                              MmcHeaderCodes.AllHeaders, true, true,
+                                                                              MmcErrorField.None, MmcSubchannel.None,
+                                                                              _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba400000Data            = lba400000Buffer;
+            report.GdRomSwapDiscCapabilities.Lba400000Sense           = lba400000SenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba400000DecodedSense    = Sense.PrettifySense(lba400000SenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba400000ReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba400000Readable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000Readable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 45000... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba45000Readable = !_dev.ReadCd(out byte[] lba45000Buffer,
+                                                                             out byte[] lba45000SenseBuffer, 45000,
+                                                                             2352, cluster, MmcSectorTypes.AllTypes,
+                                                                             false, false, true,
+                                                                             MmcHeaderCodes.AllHeaders, true, true,
+                                                                             MmcErrorField.None, MmcSubchannel.None,
+                                                                             _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba45000Data            = lba45000Buffer;
+            report.GdRomSwapDiscCapabilities.Lba45000Sense           = lba45000SenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba45000DecodedSense    = Sense.PrettifySense(lba45000SenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba45000ReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba45000Readable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000Readable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 44990... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba44990Readable = !_dev.ReadCd(out byte[] lba44990Buffer,
+                                                                             out byte[] lba44990SenseBuffer, 44990,
+                                                                             2352, cluster, MmcSectorTypes.AllTypes,
+                                                                             false, false, true,
+                                                                             MmcHeaderCodes.AllHeaders, true, true,
+                                                                             MmcErrorField.None, MmcSubchannel.None,
+                                                                             _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba44990Data            = lba44990Buffer;
+            report.GdRomSwapDiscCapabilities.Lba44990Sense           = lba44990SenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba44990DecodedSense    = Sense.PrettifySense(lba44990SenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba44990ReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba44990Readable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990Readable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 100000 with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba100000PqReadable = !_dev.ReadCd(out byte[] lba100000PqBuffer,
+                                                                                    out byte[] lba100000PqSenseBuffer,
+                                                                                    100000, 2368, cluster,
+                                                                                    MmcSectorTypes.AllTypes, false, false,
+                                                                                    true, MmcHeaderCodes.AllHeaders, true,
+                                                                                    true, MmcErrorField.None,
+                                                                                    MmcSubchannel.Q16, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba100000PqData            = lba100000PqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba100000PqSense           = lba100000PqSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba100000PqDecodedSense    = Sense.PrettifySense(lba100000PqSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba100000PqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba100000PqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000PqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 50000 with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba50000PqReadable = !_dev.ReadCd(out byte[] lba50000PqBuffer,
+                                                                               out byte[] lba50000PqSenseBuffer, 50000,
+                                                                               2368, cluster, MmcSectorTypes.AllTypes,
+                                                                               false, false, true,
+                                                                               MmcHeaderCodes.AllHeaders, true, true,
+                                                                               MmcErrorField.None, MmcSubchannel.Q16,
+                                                                               _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba50000PqData            = lba50000PqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba50000PqSense           = lba50000PqSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba50000PqDecodedSense    = Sense.PrettifySense(lba50000PqSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba50000PqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba50000PqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000PqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 450000 with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba450000PqReadable = !_dev.ReadCd(out byte[] lba450000PqBuffer,
+                                                                                    out byte[] lba450000PqSenseBuffer,
+                                                                                    450000, 2368, cluster,
+                                                                                    MmcSectorTypes.AllTypes, false, false,
+                                                                                    true, MmcHeaderCodes.AllHeaders, true,
+                                                                                    true, MmcErrorField.None,
+                                                                                    MmcSubchannel.Q16, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba450000PqData            = lba450000PqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba450000PqSense           = lba450000PqSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba450000PqDecodedSense    = Sense.PrettifySense(lba450000PqSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba450000PqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba450000PqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000PqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 400000 with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba400000PqReadable = !_dev.ReadCd(out byte[] lba400000PqBuffer,
+                                                                                    out byte[] lba400000PqSenseBuffer,
+                                                                                    400000, 2368, cluster,
+                                                                                    MmcSectorTypes.AllTypes, false, false,
+                                                                                    true, MmcHeaderCodes.AllHeaders, true,
+                                                                                    true, MmcErrorField.None,
+                                                                                    MmcSubchannel.Q16, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba400000PqData            = lba400000PqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba400000PqSense           = lba400000PqSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba400000PqDecodedSense    = Sense.PrettifySense(lba400000PqSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba400000PqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba400000PqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000PqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 45000 with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba45000PqReadable = !_dev.ReadCd(out byte[] lba45000PqBuffer,
+                                                                               out byte[] lba45000PqSenseBuffer, 45000,
+                                                                               2368, cluster, MmcSectorTypes.AllTypes,
+                                                                               false, false, true,
+                                                                               MmcHeaderCodes.AllHeaders, true, true,
+                                                                               MmcErrorField.None, MmcSubchannel.Q16,
+                                                                               _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba45000PqData            = lba45000PqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba45000PqSense           = lba45000PqSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba45000PqDecodedSense    = Sense.PrettifySense(lba45000PqSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba45000PqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba45000PqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000PqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 44990 with PQ subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba44990PqReadable = !_dev.ReadCd(out byte[] lba44990PqBuffer,
+                                                                               out byte[] lba44990PqSenseBuffer, 44990,
+                                                                               2368, cluster, MmcSectorTypes.AllTypes,
+                                                                               false, false, true,
+                                                                               MmcHeaderCodes.AllHeaders, true, true,
+                                                                               MmcErrorField.None, MmcSubchannel.Q16,
+                                                                               _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba44990PqData            = lba44990PqBuffer;
+            report.GdRomSwapDiscCapabilities.Lba44990PqSense           = lba44990PqSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba44990PqDecodedSense    = Sense.PrettifySense(lba44990PqSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba44990PqReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba44990PqReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990PqReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 100000 with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba100000RwReadable = !_dev.ReadCd(out byte[] lba100000RwBuffer,
+                                                                                    out byte[] lba100000RwSenseBuffer,
+                                                                                    100000, 2448, cluster,
+                                                                                    MmcSectorTypes.AllTypes, false, false,
+                                                                                    true, MmcHeaderCodes.AllHeaders, true,
+                                                                                    true, MmcErrorField.None,
+                                                                                    MmcSubchannel.Raw, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba100000RwData            = lba100000RwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba100000RwSense           = lba100000RwSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba100000RwDecodedSense    = Sense.PrettifySense(lba100000RwSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba100000RwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba100000RwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000RwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 50000 with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba50000RwReadable = !_dev.ReadCd(out byte[] lba50000RwBuffer,
+                                                                               out byte[] lba50000RwSenseBuffer, 50000,
+                                                                               2448, cluster, MmcSectorTypes.AllTypes,
+                                                                               false, false, true,
+                                                                               MmcHeaderCodes.AllHeaders, true, true,
+                                                                               MmcErrorField.None, MmcSubchannel.Raw,
+                                                                               _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba50000RwData            = lba50000RwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba50000RwSense           = lba50000RwSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba50000RwDecodedSense    = Sense.PrettifySense(lba50000RwSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba50000RwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba50000RwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000RwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 450000 with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba450000RwReadable = !_dev.ReadCd(out byte[] lba450000RwBuffer,
+                                                                                    out byte[] lba450000RwSenseBuffer,
+                                                                                    450000, 2448, cluster,
+                                                                                    MmcSectorTypes.AllTypes, false, false,
+                                                                                    true, MmcHeaderCodes.AllHeaders, true,
+                                                                                    true, MmcErrorField.None,
+                                                                                    MmcSubchannel.Raw, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba450000RwData            = lba450000RwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba450000RwSense           = lba450000RwSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba450000RwDecodedSense    = Sense.PrettifySense(lba450000RwSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba450000RwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba450000RwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000RwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 400000 with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba400000RwReadable = !_dev.ReadCd(out byte[] lba400000RwBuffer,
+                                                                                    out byte[] lba400000RwSenseBuffer,
+                                                                                    400000, 2448, cluster,
+                                                                                    MmcSectorTypes.AllTypes, false, false,
+                                                                                    true, MmcHeaderCodes.AllHeaders, true,
+                                                                                    true, MmcErrorField.None,
+                                                                                    MmcSubchannel.Raw, _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba400000RwData            = lba400000RwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba400000RwSense           = lba400000RwSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba400000RwDecodedSense    = Sense.PrettifySense(lba400000RwSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba400000RwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba400000RwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000RwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 45000 with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba45000RwReadable = !_dev.ReadCd(out byte[] lba45000RwBuffer,
+                                                                               out byte[] lba45000RwSenseBuffer, 45000,
+                                                                               2448, cluster, MmcSectorTypes.AllTypes,
+                                                                               false, false, true,
+                                                                               MmcHeaderCodes.AllHeaders, true, true,
+                                                                               MmcErrorField.None, MmcSubchannel.Raw,
+                                                                               _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba45000RwData            = lba45000RwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba45000RwSense           = lba45000RwSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba45000RwDecodedSense    = Sense.PrettifySense(lba45000RwSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba45000RwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba45000RwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000RwReadable ? "Success!" : "FAIL!");
+
+        AaruConsole.Write("Reading LBA 44990 with RW subchannel... ");
+        cluster = 16;
+
+        while(true)
+        {
+            report.GdRomSwapDiscCapabilities.Lba44990RwReadable = !_dev.ReadCd(out byte[] lba44990RwBuffer,
+                                                                               out byte[] lba44990RwSenseBuffer, 44990,
+                                                                               2448, cluster, MmcSectorTypes.AllTypes,
+                                                                               false, false, true,
+                                                                               MmcHeaderCodes.AllHeaders, true, true,
+                                                                               MmcErrorField.None, MmcSubchannel.Raw,
+                                                                               _dev.Timeout, out _);
+
+            report.GdRomSwapDiscCapabilities.Lba44990RwData            = lba44990RwBuffer;
+            report.GdRomSwapDiscCapabilities.Lba44990RwSense           = lba44990RwSenseBuffer;
+            report.GdRomSwapDiscCapabilities.Lba44990RwDecodedSense    = Sense.PrettifySense(lba44990RwSenseBuffer);
+            report.GdRomSwapDiscCapabilities.Lba44990RwReadableCluster = (int)cluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba44990RwReadable)
+                break;
+
+            if(cluster == 1)
+                break;
+
+            cluster /= 2;
+        }
+
+        AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990RwReadable ? "Success!" : "FAIL!");
+
+        if(report.GdRomSwapDiscCapabilities.Lba45000Readable       == false &&
+           report.GdRomSwapDiscCapabilities.Lba50000Readable       == false &&
+           report.GdRomSwapDiscCapabilities.Lba100000Readable      == false &&
+           report.GdRomSwapDiscCapabilities.Lba400000Readable      == false &&
+           report.GdRomSwapDiscCapabilities.Lba450000Readable      == false &&
+           report.GdRomSwapDiscCapabilities.Lba45000AudioReadable  == false &&
+           report.GdRomSwapDiscCapabilities.Lba50000AudioReadable  == false &&
+           report.GdRomSwapDiscCapabilities.Lba100000AudioReadable == false &&
+           report.GdRomSwapDiscCapabilities.Lba400000AudioReadable == false &&
+           report.GdRomSwapDiscCapabilities.Lba450000AudioReadable == false)
+            return;
+
+        pressedKey = new ConsoleKeyInfo();
+
+        while(pressedKey.Key != ConsoleKey.Y &&
+              pressedKey.Key != ConsoleKey.N)
+        {
+            AaruConsole.
+                Write("The next part of the test will read the whole high density area of a GD-ROM from the smallest known readable sector until the first error happens\n" +
+                      "Do you want to proceed? (Y/N): ");
+
+            pressedKey = System.Console.ReadKey();
+            AaruConsole.WriteLine();
+        }
+
+        if(pressedKey.Key == ConsoleKey.N)
+            return;
+
+        uint          startingSector = 45000;
+        bool          readAsAudio    = false;
+        bool          aborted        = false;
+        MmcSubchannel subchannel     = MmcSubchannel.None;
+        uint          blockSize      = 2352;
+
+        if(report.GdRomSwapDiscCapabilities.Lba45000Readable == false)
+        {
+            startingSector = 45000;
+            readAsAudio    = false;
+            cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba45000ReadableCluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba45000RwReadable)
+                subchannel = MmcSubchannel.Raw;
+            else if(report.GdRomSwapDiscCapabilities.Lba45000PqReadable)
+                subchannel = MmcSubchannel.Q16;
+        }
+        else if(report.GdRomSwapDiscCapabilities.Lba50000Readable == false)
+        {
+            startingSector = 50000;
+            readAsAudio    = false;
+            cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba50000ReadableCluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba50000RwReadable)
+                subchannel = MmcSubchannel.Raw;
+            else if(report.GdRomSwapDiscCapabilities.Lba50000PqReadable)
+                subchannel = MmcSubchannel.Q16;
+        }
+        else if(report.GdRomSwapDiscCapabilities.Lba100000Readable == false)
+        {
+            startingSector = 100000;
+            readAsAudio    = false;
+            cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba100000ReadableCluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba100000RwReadable)
+                subchannel = MmcSubchannel.Raw;
+            else if(report.GdRomSwapDiscCapabilities.Lba100000PqReadable)
+                subchannel = MmcSubchannel.Q16;
+        }
+        else if(report.GdRomSwapDiscCapabilities.Lba400000Readable == false)
+        {
+            startingSector = 400000;
+            readAsAudio    = false;
+            cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba400000ReadableCluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba400000RwReadable)
+                subchannel = MmcSubchannel.Raw;
+            else if(report.GdRomSwapDiscCapabilities.Lba400000PqReadable)
+                subchannel = MmcSubchannel.Q16;
+        }
+        else if(report.GdRomSwapDiscCapabilities.Lba450000Readable == false)
+        {
+            startingSector = 450000;
+            readAsAudio    = false;
+            cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba450000ReadableCluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba450000RwReadable)
+                subchannel = MmcSubchannel.Raw;
+            else if(report.GdRomSwapDiscCapabilities.Lba450000PqReadable)
+                subchannel = MmcSubchannel.Q16;
+        }
+        else if(report.GdRomSwapDiscCapabilities.Lba45000AudioReadable == false)
+        {
+            startingSector = 45000;
+            readAsAudio    = true;
+            cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba45000AudioReadableCluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadable)
+                subchannel = MmcSubchannel.Raw;
+            else if(report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadable)
+                subchannel = MmcSubchannel.Q16;
+        }
+        else if(report.GdRomSwapDiscCapabilities.Lba50000AudioReadable == false)
+        {
+            startingSector = 50000;
+            readAsAudio    = true;
+            cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba50000AudioReadableCluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadable)
+                subchannel = MmcSubchannel.Raw;
+            else if(report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadable)
+                subchannel = MmcSubchannel.Q16;
+        }
+        else if(report.GdRomSwapDiscCapabilities.Lba100000AudioReadable == false)
+        {
+            startingSector = 100000;
+            readAsAudio    = true;
+            cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba100000AudioReadableCluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadable)
+                subchannel = MmcSubchannel.Raw;
+            else if(report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadable)
+                subchannel = MmcSubchannel.Q16;
+        }
+        else if(report.GdRomSwapDiscCapabilities.Lba400000AudioReadable == false)
+        {
+            startingSector = 400000;
+            readAsAudio    = true;
+            cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba400000AudioReadableCluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadable)
+                subchannel = MmcSubchannel.Raw;
+            else if(report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadable)
+                subchannel = MmcSubchannel.Q16;
+        }
+        else if(report.GdRomSwapDiscCapabilities.Lba450000AudioReadable == false)
+        {
+            startingSector = 450000;
+            readAsAudio    = true;
+            cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba450000AudioReadableCluster;
+
+            if(report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadable)
+                subchannel = MmcSubchannel.Raw;
+            else if(report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadable)
+                subchannel = MmcSubchannel.Q16;
+        }
+
+        System.Console.CancelKeyPress += (sender, e) =>
+        {
+            e.Cancel = true;
+            aborted  = true;
+        };
+
+        report.GdRomSwapDiscCapabilities.MinimumReadableSectorInHdArea = startingSector;
+
+        switch(subchannel)
+        {
+            case MmcSubchannel.Raw:
+                blockSize += 96;
+
+                break;
+            case MmcSubchannel.Q16:
+                blockSize += 16;
+
+                break;
+        }
+
+        byte[] lastSuccessfulPq = null;
+        byte[] lastSuccessfulRw = null;
+        bool   trackModeChange  = false;
+
+        AaruConsole.WriteLine();
+
+        for(uint lba = startingSector; lba < sectors; lba += cluster)
+        {
+            if(aborted)
             {
-                AaruConsole.WriteLine("READ FULL TOC failed...");
-                AaruConsole.DebugWriteLine("GD-ROM reporter", "{0}", Sense.PrettifySense(senseBuffer));
-
-                report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
-                report.GdRomSwapDiscCapabilities.TestCrashed        = false;
-
-                return;
-            }
-
-            FullTOC.CDFullTOC? decodedToc = FullTOC.Decode(buffer);
-
-            if(decodedToc is null)
-            {
-                AaruConsole.WriteLine("Could not decode TOC...");
-
-                report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
-                report.GdRomSwapDiscCapabilities.TestCrashed        = false;
-
-                return;
-            }
-
-            FullTOC.CDFullTOC toc = decodedToc.Value;
-
-            FullTOC.TrackDataDescriptor leadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
-
-            if(leadOutTrack.POINT != 0xA2)
-            {
-                AaruConsole.WriteLine("Cannot find lead-out...");
-
-                report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
-                report.GdRomSwapDiscCapabilities.TestCrashed        = false;
-
-                return;
-            }
-
-            int  min         = 0, sec, frame;
-            bool tocIsNotBcd = false;
-
-            report.GdRomSwapDiscCapabilities.SwapDiscLeadOutPMIN  = leadOutTrack.PMIN;
-            report.GdRomSwapDiscCapabilities.SwapDiscLeadOutPSEC  = leadOutTrack.PSEC;
-            report.GdRomSwapDiscCapabilities.SwapDiscLeadOutPFRAM = leadOutTrack.PFRAME;
-
-            if(leadOutTrack.PMIN == 122)
-                tocIsNotBcd = true;
-
-            if(leadOutTrack.PMIN >= 0xA0 &&
-               !tocIsNotBcd)
-            {
-                min               += 90;
-                leadOutTrack.PMIN -= 0x90;
-            }
-
-            if(tocIsNotBcd)
-            {
-                min   = leadOutTrack.PMIN;
-                sec   = leadOutTrack.PSEC;
-                frame = leadOutTrack.PFRAME;
-            }
-            else
-            {
-                min   += ((leadOutTrack.PMIN   >> 4) * 10) + (leadOutTrack.PMIN   & 0x0F);
-                sec   =  ((leadOutTrack.PSEC   >> 4) * 10) + (leadOutTrack.PSEC   & 0x0F);
-                frame =  ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F);
-            }
-
-            int sectors = (min * 60 * 75) + (sec * 75) + frame - 150;
-
-            AaruConsole.WriteLine("Trap disc shows {0} sectors...", sectors);
-
-            if(sectors < 450000)
-            {
-                AaruConsole.WriteLine("Trap disc doesn't have enough sectors...");
-
-                report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
-                report.GdRomSwapDiscCapabilities.TestCrashed        = false;
-
-                return;
-            }
-
-            report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = true;
-
-            AaruConsole.WriteLine("Stopping motor...");
-
-            _dev.StopUnit(out _, _dev.Timeout, out _);
-
-            AaruConsole.WriteLine("Please MANUALLY get the trap disc out and put the GD-ROM disc inside...");
-            AaruConsole.WriteLine("Press any key to continue...");
-            System.Console.ReadLine();
-
-            AaruConsole.WriteLine("Waiting 5 seconds...");
-            Thread.Sleep(5000);
-
-            AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
-
-            retries = 0;
-
-            do
-            {
-                retries++;
-                sense = _dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
-
-                if(!sense)
-                    break;
-
-                DecodedSense? decodedSense = Sense.Decode(senseBuffer);
-
-                if(decodedSense?.ASC != 0x04)
-                    break;
-
-                if(decodedSense?.ASCQ != 0x01)
-                    break;
-            } while(retries < 25);
-
-            if(sense)
-            {
-                AaruConsole.WriteLine("READ FULL TOC failed...");
-                AaruConsole.DebugWriteLine("GD-ROM reporter", "{0}", Sense.PrettifySense(senseBuffer));
-
-                report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
-                report.GdRomSwapDiscCapabilities.TestCrashed        = false;
-
-                return;
-            }
-
-            decodedToc = FullTOC.Decode(buffer);
-
-            if(decodedToc is null)
-            {
-                AaruConsole.WriteLine("Could not decode TOC...");
-
-                report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
-                report.GdRomSwapDiscCapabilities.TestCrashed        = false;
-
-                return;
-            }
-
-            toc = decodedToc.Value;
-
-            FullTOC.TrackDataDescriptor newLeadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
-
-            if(newLeadOutTrack.POINT != 0xA2)
-            {
-                AaruConsole.WriteLine("Cannot find lead-out...");
-
-                report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
-                report.GdRomSwapDiscCapabilities.TestCrashed        = false;
-
-                return;
-            }
-
-            if(newLeadOutTrack.PMIN >= 0xA0 &&
-               !tocIsNotBcd)
-                newLeadOutTrack.PMIN -= 0x90;
-
-            if(newLeadOutTrack.PMIN   != leadOutTrack.PMIN ||
-               newLeadOutTrack.PSEC   != leadOutTrack.PSEC ||
-               newLeadOutTrack.PFRAME != leadOutTrack.PFRAME)
-            {
-                AaruConsole.WriteLine("Lead-out has changed, this drive does not support hot swapping discs...");
-
-                report.GdRomSwapDiscCapabilities.RecognizedSwapDisc = false;
-                report.GdRomSwapDiscCapabilities.TestCrashed        = false;
-
-                return;
-            }
-
-            _dev.SetCdSpeed(out _, RotationalControl.PureCav, 170, 0, _dev.Timeout, out _);
-
-            AaruConsole.Write("Reading LBA 0... ");
-
-            report.GdRomSwapDiscCapabilities.Lba0Readable = !_dev.ReadCd(out byte[] lba0Buffer, out byte[] lba0Sense, 0,
-                                                                         2352, 1, MmcSectorTypes.AllTypes, false, false,
-                                                                         true, MmcHeaderCodes.AllHeaders, true, true,
-                                                                         MmcErrorField.None, MmcSubchannel.None,
-                                                                         _dev.Timeout, out _);
-
-            report.GdRomSwapDiscCapabilities.Lba0Data         = lba0Buffer;
-            report.GdRomSwapDiscCapabilities.Lba0Sense        = lba0Sense;
-            report.GdRomSwapDiscCapabilities.Lba0DecodedSense = Sense.PrettifySense(lba0Sense);
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba0Readable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 0 as audio (scrambled)... ");
-
-            report.GdRomSwapDiscCapabilities.Lba0ScrambledReadable = !_dev.ReadCd(out byte[] lba0ScrambledBuffer,
-                                                                         out byte[] lba0ScrambledSense, 0, 2352, 1,
-                                                                         MmcSectorTypes.Cdda, false, false, false,
-                                                                         MmcHeaderCodes.None, true, false,
-                                                                         MmcErrorField.None, MmcSubchannel.None,
-                                                                         _dev.Timeout, out _);
-
-            report.GdRomSwapDiscCapabilities.Lba0ScrambledData         = lba0ScrambledBuffer;
-            report.GdRomSwapDiscCapabilities.Lba0ScrambledSense        = lba0ScrambledSense;
-            report.GdRomSwapDiscCapabilities.Lba0ScrambledDecodedSense = Sense.PrettifySense(lba0ScrambledSense);
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba0ScrambledReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 100000 as audio... ");
-            uint cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba100000AudioReadable = !_dev.ReadCd(out byte[] lba100000AudioBuffer,
-                                                                              out byte[] lba100000AudioSenseBuffer,
-                                                                              100000, 2352, cluster,
-                                                                              MmcSectorTypes.Cdda, false, false,
-                                                                              false, MmcHeaderCodes.None, true,
-                                                                              false, MmcErrorField.None,
-                                                                              MmcSubchannel.None, _dev.Timeout,
-                                                                              out _);
-
-                report.GdRomSwapDiscCapabilities.Lba100000AudioData  = lba100000AudioBuffer;
-                report.GdRomSwapDiscCapabilities.Lba100000AudioSense = lba100000AudioSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba100000AudioDecodedSense =
-                    Sense.PrettifySense(lba100000AudioSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba100000AudioReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba100000AudioReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 50000 as audio... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba50000AudioReadable = !_dev.ReadCd(out byte[] lba50000AudioBuffer,
-                                                                             out byte[] lba50000AudioSenseBuffer,
-                                                                             50000, 2352, cluster,
-                                                                             MmcSectorTypes.Cdda, false, false,
-                                                                             false, MmcHeaderCodes.None, true,
-                                                                             false, MmcErrorField.None,
-                                                                             MmcSubchannel.None, _dev.Timeout,
-                                                                             out _);
-
-                report.GdRomSwapDiscCapabilities.Lba50000AudioData  = lba50000AudioBuffer;
-                report.GdRomSwapDiscCapabilities.Lba50000AudioSense = lba50000AudioSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba50000AudioDecodedSense =
-                    Sense.PrettifySense(lba50000AudioSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba50000AudioReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba50000AudioReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 450000 as audio... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba450000AudioReadable = !_dev.ReadCd(out byte[] lba450000AudioBuffer,
-                                                                              out byte[] lba450000AudioSenseBuffer,
-                                                                              450000, 2352, cluster,
-                                                                              MmcSectorTypes.Cdda, false, false,
-                                                                              false, MmcHeaderCodes.None, true,
-                                                                              false, MmcErrorField.None,
-                                                                              MmcSubchannel.None, _dev.Timeout,
-                                                                              out _);
-
-                report.GdRomSwapDiscCapabilities.Lba450000AudioData  = lba450000AudioBuffer;
-                report.GdRomSwapDiscCapabilities.Lba450000AudioSense = lba450000AudioSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba450000AudioDecodedSense =
-                    Sense.PrettifySense(lba450000AudioSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba450000AudioReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba450000AudioReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 400000 as audio... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba400000AudioReadable = !_dev.ReadCd(out byte[] lba400000AudioBuffer,
-                                                                              out byte[] lba400000AudioSenseBuffer,
-                                                                              400000, 2352, cluster,
-                                                                              MmcSectorTypes.Cdda, false, false,
-                                                                              false, MmcHeaderCodes.None, true,
-                                                                              false, MmcErrorField.None,
-                                                                              MmcSubchannel.None, _dev.Timeout,
-                                                                              out _);
-
-                report.GdRomSwapDiscCapabilities.Lba400000AudioData  = lba400000AudioBuffer;
-                report.GdRomSwapDiscCapabilities.Lba400000AudioSense = lba400000AudioSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba400000AudioDecodedSense =
-                    Sense.PrettifySense(lba400000AudioSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba400000AudioReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba400000AudioReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 45000 as audio... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba45000AudioReadable = !_dev.ReadCd(out byte[] lba45000AudioBuffer,
-                                                                             out byte[] lba45000AudioSenseBuffer,
-                                                                             45000, 2352, cluster,
-                                                                             MmcSectorTypes.Cdda, false, false,
-                                                                             false, MmcHeaderCodes.None, true,
-                                                                             false, MmcErrorField.None,
-                                                                             MmcSubchannel.None, _dev.Timeout,
-                                                                             out _);
-
-                report.GdRomSwapDiscCapabilities.Lba45000AudioData  = lba45000AudioBuffer;
-                report.GdRomSwapDiscCapabilities.Lba45000AudioSense = lba45000AudioSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba45000AudioDecodedSense =
-                    Sense.PrettifySense(lba45000AudioSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba45000AudioReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba45000AudioReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 44990 as audio... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba44990AudioReadable = !_dev.ReadCd(out byte[] lba44990AudioBuffer,
-                                                                             out byte[] lba44990AudioSenseBuffer,
-                                                                             44990, 2352, cluster,
-                                                                             MmcSectorTypes.Cdda, false, false,
-                                                                             false, MmcHeaderCodes.None, true,
-                                                                             false, MmcErrorField.None,
-                                                                             MmcSubchannel.None, _dev.Timeout,
-                                                                             out _);
-
-                report.GdRomSwapDiscCapabilities.Lba44990AudioData  = lba44990AudioBuffer;
-                report.GdRomSwapDiscCapabilities.Lba44990AudioSense = lba44990AudioSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba44990AudioDecodedSense =
-                    Sense.PrettifySense(lba44990AudioSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba44990AudioReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba44990AudioReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 100000 as audio with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadable =
-                    !_dev.ReadCd(out byte[] lba100000AudioPqBuffer, out byte[] lba100000AudioPqSenseBuffer, 100000,
-                                 2368, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
-                                 false, MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba100000AudioPqData  = lba100000AudioPqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba100000AudioPqSense = lba100000AudioPqSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba100000AudioPqDecodedSense =
-                    Sense.PrettifySense(lba100000AudioPqSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 50000 as audio with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadable =
-                    !_dev.ReadCd(out byte[] lba50000AudioPqBuffer, out byte[] lba50000AudioPqSenseBuffer, 50000, 2368,
-                                 cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                 MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba50000AudioPqData  = lba50000AudioPqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba50000AudioPqSense = lba50000AudioPqSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba50000AudioPqDecodedSense =
-                    Sense.PrettifySense(lba50000AudioPqSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 450000 as audio with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadable =
-                    !_dev.ReadCd(out byte[] lba450000AudioPqBuffer, out byte[] lba450000AudioPqSenseBuffer, 450000,
-                                 2368, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
-                                 false, MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba450000AudioPqData  = lba450000AudioPqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba450000AudioPqSense = lba450000AudioPqSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba450000AudioPqDecodedSense =
-                    Sense.PrettifySense(lba450000AudioPqSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 400000 as audio with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadable =
-                    !_dev.ReadCd(out byte[] lba400000AudioPqBuffer, out byte[] lba400000AudioPqSenseBuffer, 400000,
-                                 2368, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
-                                 false, MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba400000AudioPqData  = lba400000AudioPqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba400000AudioPqSense = lba400000AudioPqSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba400000AudioPqDecodedSense =
-                    Sense.PrettifySense(lba400000AudioPqSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 45000 as audio with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadable =
-                    !_dev.ReadCd(out byte[] lba45000AudioPqBuffer, out byte[] lba45000AudioPqSenseBuffer, 45000, 2368,
-                                 cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                 MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba45000AudioPqData  = lba45000AudioPqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba45000AudioPqSense = lba45000AudioPqSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba45000AudioPqDecodedSense =
-                    Sense.PrettifySense(lba45000AudioPqSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 44990 as audio with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba44990AudioPqReadable =
-                    !_dev.ReadCd(out byte[] lba44990AudioPqBuffer, out byte[] lba44990AudioPqSenseBuffer, 44990, 2368,
-                                 cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                 MmcErrorField.None, MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba44990AudioPqData  = lba44990AudioPqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba44990AudioPqSense = lba44990AudioPqSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba44990AudioPqDecodedSense =
-                    Sense.PrettifySense(lba44990AudioPqSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba44990AudioPqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba44990AudioPqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioPqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 100000 as audio with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadable =
-                    !_dev.ReadCd(out byte[] lba100000AudioRwBuffer, out byte[] lba100000AudioRwSenseBuffer, 100000,
-                                 2448, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
-                                 false, MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba100000AudioRwData  = lba100000AudioRwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba100000AudioRwSense = lba100000AudioRwSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba100000AudioRwDecodedSense =
-                    Sense.PrettifySense(lba100000AudioRwSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 50000 as audio with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadable =
-                    !_dev.ReadCd(out byte[] lba50000AudioRwBuffer, out byte[] lba50000AudioRwSenseBuffer, 50000, 2448,
-                                 cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                 MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba50000AudioRwData  = lba50000AudioRwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba50000AudioRwSense = lba50000AudioRwSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba50000AudioRwDecodedSense =
-                    Sense.PrettifySense(lba50000AudioRwSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 450000 as audio with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadable =
-                    !_dev.ReadCd(out byte[] lba450000AudioRwBuffer, out byte[] lba450000AudioRwSenseBuffer, 450000,
-                                 2448, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
-                                 false, MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba450000AudioRwData  = lba450000AudioRwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba450000AudioRwSense = lba450000AudioRwSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba450000AudioRwDecodedSense =
-                    Sense.PrettifySense(lba450000AudioRwSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 400000 as audio with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadable =
-                    !_dev.ReadCd(out byte[] lba400000AudioRwBuffer, out byte[] lba400000AudioRwSenseBuffer, 400000,
-                                 2448, cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true,
-                                 false, MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba400000AudioRwData  = lba400000AudioRwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba400000AudioRwSense = lba400000AudioRwSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba400000AudioRwDecodedSense =
-                    Sense.PrettifySense(lba400000AudioRwSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 45000 as audio with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadable =
-                    !_dev.ReadCd(out byte[] lba45000AudioRwBuffer, out byte[] lba45000AudioRwSenseBuffer, 45000, 2448,
-                                 cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                 MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba45000AudioRwData  = lba45000AudioRwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba45000AudioRwSense = lba45000AudioRwSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba45000AudioRwDecodedSense =
-                    Sense.PrettifySense(lba45000AudioRwSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 44990 as audio with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba44990AudioRwReadable =
-                    !_dev.ReadCd(out byte[] lba44990AudioRwBuffer, out byte[] lba44990AudioRwSenseBuffer, 44990, 2448,
-                                 cluster, MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                 MmcErrorField.None, MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba44990AudioRwData  = lba44990AudioRwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba44990AudioRwSense = lba44990AudioRwSenseBuffer;
-
-                report.GdRomSwapDiscCapabilities.Lba44990AudioRwDecodedSense =
-                    Sense.PrettifySense(lba44990AudioRwSenseBuffer);
-
-                report.GdRomSwapDiscCapabilities.Lba44990AudioRwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba44990AudioRwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990AudioRwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 100000... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba100000Readable = !_dev.ReadCd(out byte[] lba100000Buffer,
-                                                                         out byte[] lba100000SenseBuffer, 100000,
-                                                                         2352, cluster, MmcSectorTypes.AllTypes,
-                                                                         false, false, true,
-                                                                         MmcHeaderCodes.AllHeaders, true, true,
-                                                                         MmcErrorField.None, MmcSubchannel.None,
-                                                                         _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba100000Data            = lba100000Buffer;
-                report.GdRomSwapDiscCapabilities.Lba100000Sense           = lba100000SenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba100000DecodedSense    = Sense.PrettifySense(lba100000SenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba100000ReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba100000Readable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000Readable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 50000... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba50000Readable = !_dev.ReadCd(out byte[] lba50000Buffer,
-                                                                        out byte[] lba50000SenseBuffer, 50000,
-                                                                        2352, cluster, MmcSectorTypes.AllTypes,
-                                                                        false, false, true,
-                                                                        MmcHeaderCodes.AllHeaders, true, true,
-                                                                        MmcErrorField.None, MmcSubchannel.None,
-                                                                        _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba50000Data            = lba50000Buffer;
-                report.GdRomSwapDiscCapabilities.Lba50000Sense           = lba50000SenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba50000DecodedSense    = Sense.PrettifySense(lba50000SenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba50000ReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba50000Readable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000Readable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 450000... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba450000Readable = !_dev.ReadCd(out byte[] lba450000Buffer,
-                                                                         out byte[] lba450000SenseBuffer, 450000,
-                                                                         2352, cluster, MmcSectorTypes.AllTypes,
-                                                                         false, false, true,
-                                                                         MmcHeaderCodes.AllHeaders, true, true,
-                                                                         MmcErrorField.None, MmcSubchannel.None,
-                                                                         _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba450000Data            = lba450000Buffer;
-                report.GdRomSwapDiscCapabilities.Lba450000Sense           = lba450000SenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba450000DecodedSense    = Sense.PrettifySense(lba450000SenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba450000ReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba450000Readable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000Readable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 400000... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba400000Readable = !_dev.ReadCd(out byte[] lba400000Buffer,
-                                                                         out byte[] lba400000SenseBuffer, 400000,
-                                                                         2352, cluster, MmcSectorTypes.AllTypes,
-                                                                         false, false, true,
-                                                                         MmcHeaderCodes.AllHeaders, true, true,
-                                                                         MmcErrorField.None, MmcSubchannel.None,
-                                                                         _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba400000Data            = lba400000Buffer;
-                report.GdRomSwapDiscCapabilities.Lba400000Sense           = lba400000SenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba400000DecodedSense    = Sense.PrettifySense(lba400000SenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba400000ReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba400000Readable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000Readable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 45000... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba45000Readable = !_dev.ReadCd(out byte[] lba45000Buffer,
-                                                                        out byte[] lba45000SenseBuffer, 45000,
-                                                                        2352, cluster, MmcSectorTypes.AllTypes,
-                                                                        false, false, true,
-                                                                        MmcHeaderCodes.AllHeaders, true, true,
-                                                                        MmcErrorField.None, MmcSubchannel.None,
-                                                                        _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba45000Data            = lba45000Buffer;
-                report.GdRomSwapDiscCapabilities.Lba45000Sense           = lba45000SenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba45000DecodedSense    = Sense.PrettifySense(lba45000SenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba45000ReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba45000Readable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000Readable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 44990... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba44990Readable = !_dev.ReadCd(out byte[] lba44990Buffer,
-                                                                        out byte[] lba44990SenseBuffer, 44990,
-                                                                        2352, cluster, MmcSectorTypes.AllTypes,
-                                                                        false, false, true,
-                                                                        MmcHeaderCodes.AllHeaders, true, true,
-                                                                        MmcErrorField.None, MmcSubchannel.None,
-                                                                        _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba44990Data            = lba44990Buffer;
-                report.GdRomSwapDiscCapabilities.Lba44990Sense           = lba44990SenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba44990DecodedSense    = Sense.PrettifySense(lba44990SenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba44990ReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba44990Readable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990Readable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 100000 with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba100000PqReadable = !_dev.ReadCd(out byte[] lba100000PqBuffer,
-                                                                           out byte[] lba100000PqSenseBuffer,
-                                                                           100000, 2368, cluster,
-                                                                           MmcSectorTypes.AllTypes, false, false,
-                                                                           true, MmcHeaderCodes.AllHeaders, true,
-                                                                           true, MmcErrorField.None,
-                                                                           MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba100000PqData = lba100000PqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba100000PqSense = lba100000PqSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba100000PqDecodedSense = Sense.PrettifySense(lba100000PqSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba100000PqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba100000PqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000PqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 50000 with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba50000PqReadable = !_dev.ReadCd(out byte[] lba50000PqBuffer,
-                                                                          out byte[] lba50000PqSenseBuffer, 50000,
-                                                                          2368, cluster, MmcSectorTypes.AllTypes,
-                                                                          false, false, true,
-                                                                          MmcHeaderCodes.AllHeaders, true, true,
-                                                                          MmcErrorField.None, MmcSubchannel.Q16,
-                                                                          _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba50000PqData            = lba50000PqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba50000PqSense           = lba50000PqSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba50000PqDecodedSense    = Sense.PrettifySense(lba50000PqSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba50000PqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba50000PqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000PqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 450000 with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba450000PqReadable = !_dev.ReadCd(out byte[] lba450000PqBuffer,
-                                                                           out byte[] lba450000PqSenseBuffer,
-                                                                           450000, 2368, cluster,
-                                                                           MmcSectorTypes.AllTypes, false, false,
-                                                                           true, MmcHeaderCodes.AllHeaders, true,
-                                                                           true, MmcErrorField.None,
-                                                                           MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba450000PqData = lba450000PqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba450000PqSense = lba450000PqSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba450000PqDecodedSense = Sense.PrettifySense(lba450000PqSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba450000PqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba450000PqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000PqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 400000 with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba400000PqReadable = !_dev.ReadCd(out byte[] lba400000PqBuffer,
-                                                                           out byte[] lba400000PqSenseBuffer,
-                                                                           400000, 2368, cluster,
-                                                                           MmcSectorTypes.AllTypes, false, false,
-                                                                           true, MmcHeaderCodes.AllHeaders, true,
-                                                                           true, MmcErrorField.None,
-                                                                           MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba400000PqData = lba400000PqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba400000PqSense = lba400000PqSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba400000PqDecodedSense = Sense.PrettifySense(lba400000PqSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba400000PqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba400000PqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000PqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 45000 with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba45000PqReadable = !_dev.ReadCd(out byte[] lba45000PqBuffer,
-                                                                          out byte[] lba45000PqSenseBuffer, 45000,
-                                                                          2368, cluster, MmcSectorTypes.AllTypes,
-                                                                          false, false, true,
-                                                                          MmcHeaderCodes.AllHeaders, true, true,
-                                                                          MmcErrorField.None, MmcSubchannel.Q16,
-                                                                          _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba45000PqData            = lba45000PqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba45000PqSense           = lba45000PqSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba45000PqDecodedSense    = Sense.PrettifySense(lba45000PqSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba45000PqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba45000PqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000PqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 44990 with PQ subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba44990PqReadable = !_dev.ReadCd(out byte[] lba44990PqBuffer,
-                                                                          out byte[] lba44990PqSenseBuffer, 44990,
-                                                                          2368, cluster, MmcSectorTypes.AllTypes,
-                                                                          false, false, true,
-                                                                          MmcHeaderCodes.AllHeaders, true, true,
-                                                                          MmcErrorField.None, MmcSubchannel.Q16,
-                                                                          _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba44990PqData            = lba44990PqBuffer;
-                report.GdRomSwapDiscCapabilities.Lba44990PqSense           = lba44990PqSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba44990PqDecodedSense    = Sense.PrettifySense(lba44990PqSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba44990PqReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba44990PqReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990PqReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 100000 with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba100000RwReadable = !_dev.ReadCd(out byte[] lba100000RwBuffer,
-                                                                           out byte[] lba100000RwSenseBuffer,
-                                                                           100000, 2448, cluster,
-                                                                           MmcSectorTypes.AllTypes, false, false,
-                                                                           true, MmcHeaderCodes.AllHeaders, true,
-                                                                           true, MmcErrorField.None,
-                                                                           MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba100000RwData = lba100000RwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba100000RwSense = lba100000RwSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba100000RwDecodedSense = Sense.PrettifySense(lba100000RwSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba100000RwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba100000RwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba100000RwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 50000 with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba50000RwReadable = !_dev.ReadCd(out byte[] lba50000RwBuffer,
-                                                                          out byte[] lba50000RwSenseBuffer, 50000,
-                                                                          2448, cluster, MmcSectorTypes.AllTypes,
-                                                                          false, false, true,
-                                                                          MmcHeaderCodes.AllHeaders, true, true,
-                                                                          MmcErrorField.None, MmcSubchannel.Raw,
-                                                                          _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba50000RwData            = lba50000RwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba50000RwSense           = lba50000RwSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba50000RwDecodedSense    = Sense.PrettifySense(lba50000RwSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba50000RwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba50000RwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba50000RwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 450000 with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba450000RwReadable = !_dev.ReadCd(out byte[] lba450000RwBuffer,
-                                                                           out byte[] lba450000RwSenseBuffer,
-                                                                           450000, 2448, cluster,
-                                                                           MmcSectorTypes.AllTypes, false, false,
-                                                                           true, MmcHeaderCodes.AllHeaders, true,
-                                                                           true, MmcErrorField.None,
-                                                                           MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba450000RwData = lba450000RwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba450000RwSense = lba450000RwSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba450000RwDecodedSense = Sense.PrettifySense(lba450000RwSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba450000RwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba450000RwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba450000RwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 400000 with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba400000RwReadable = !_dev.ReadCd(out byte[] lba400000RwBuffer,
-                                                                           out byte[] lba400000RwSenseBuffer,
-                                                                           400000, 2448, cluster,
-                                                                           MmcSectorTypes.AllTypes, false, false,
-                                                                           true, MmcHeaderCodes.AllHeaders, true,
-                                                                           true, MmcErrorField.None,
-                                                                           MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba400000RwData = lba400000RwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba400000RwSense = lba400000RwSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba400000RwDecodedSense = Sense.PrettifySense(lba400000RwSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba400000RwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba400000RwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba400000RwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 45000 with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba45000RwReadable = !_dev.ReadCd(out byte[] lba45000RwBuffer,
-                                                                          out byte[] lba45000RwSenseBuffer, 45000,
-                                                                          2448, cluster, MmcSectorTypes.AllTypes,
-                                                                          false, false, true,
-                                                                          MmcHeaderCodes.AllHeaders, true, true,
-                                                                          MmcErrorField.None, MmcSubchannel.Raw,
-                                                                          _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba45000RwData            = lba45000RwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba45000RwSense           = lba45000RwSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba45000RwDecodedSense    = Sense.PrettifySense(lba45000RwSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba45000RwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba45000RwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba45000RwReadable ? "Success!" : "FAIL!");
-
-            AaruConsole.Write("Reading LBA 44990 with RW subchannel... ");
-            cluster = 16;
-
-            while(true)
-            {
-                report.GdRomSwapDiscCapabilities.Lba44990RwReadable = !_dev.ReadCd(out byte[] lba44990RwBuffer,
-                                                                          out byte[] lba44990RwSenseBuffer, 44990,
-                                                                          2448, cluster, MmcSectorTypes.AllTypes,
-                                                                          false, false, true,
-                                                                          MmcHeaderCodes.AllHeaders, true, true,
-                                                                          MmcErrorField.None, MmcSubchannel.Raw,
-                                                                          _dev.Timeout, out _);
-
-                report.GdRomSwapDiscCapabilities.Lba44990RwData            = lba44990RwBuffer;
-                report.GdRomSwapDiscCapabilities.Lba44990RwSense           = lba44990RwSenseBuffer;
-                report.GdRomSwapDiscCapabilities.Lba44990RwDecodedSense    = Sense.PrettifySense(lba44990RwSenseBuffer);
-                report.GdRomSwapDiscCapabilities.Lba44990RwReadableCluster = (int)cluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba44990RwReadable)
-                    break;
-
-                if(cluster == 1)
-                    break;
-
-                cluster /= 2;
-            }
-
-            AaruConsole.WriteLine(report.GdRomSwapDiscCapabilities.Lba44990RwReadable ? "Success!" : "FAIL!");
-
-            if(report.GdRomSwapDiscCapabilities.Lba45000Readable       == false &&
-               report.GdRomSwapDiscCapabilities.Lba50000Readable       == false &&
-               report.GdRomSwapDiscCapabilities.Lba100000Readable      == false &&
-               report.GdRomSwapDiscCapabilities.Lba400000Readable      == false &&
-               report.GdRomSwapDiscCapabilities.Lba450000Readable      == false &&
-               report.GdRomSwapDiscCapabilities.Lba45000AudioReadable  == false &&
-               report.GdRomSwapDiscCapabilities.Lba50000AudioReadable  == false &&
-               report.GdRomSwapDiscCapabilities.Lba100000AudioReadable == false &&
-               report.GdRomSwapDiscCapabilities.Lba400000AudioReadable == false &&
-               report.GdRomSwapDiscCapabilities.Lba450000AudioReadable == false)
-                return;
-
-            pressedKey = new ConsoleKeyInfo();
-
-            while(pressedKey.Key != ConsoleKey.Y &&
-                  pressedKey.Key != ConsoleKey.N)
-            {
-                AaruConsole.
-                    Write("The next part of the test will read the whole high density area of a GD-ROM from the smallest known readable sector until the first error happens\n" +
-                          "Do you want to proceed? (Y/N): ");
-
-                pressedKey = System.Console.ReadKey();
                 AaruConsole.WriteLine();
+                AaruConsole.WriteLine("Aborted!");
+
+                break;
             }
 
-            if(pressedKey.Key == ConsoleKey.N)
-                return;
+            AaruConsole.Write("\rReading LBA {0} of {1}", lba, sectors);
 
-            uint          startingSector = 45000;
-            bool          readAsAudio    = false;
-            bool          aborted        = false;
-            MmcSubchannel subchannel     = MmcSubchannel.None;
-            uint          blockSize      = 2352;
+            sense = readAsAudio
+                        ? _dev.ReadCd(out buffer, out senseBuffer, lba, blockSize, cluster, MmcSectorTypes.Cdda,
+                                      false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
+                                      subchannel, _dev.Timeout, out _) : _dev.ReadCd(out buffer, out senseBuffer,
+                            lba, blockSize, cluster, MmcSectorTypes.AllTypes, false, false, true,
+                            MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, subchannel,
+                            _dev.Timeout, out _);
 
-            if(report.GdRomSwapDiscCapabilities.Lba45000Readable == false)
+            if(sense)
             {
-                startingSector = 45000;
-                readAsAudio    = false;
-                cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba45000ReadableCluster;
+                if(trackModeChange)
+                    break;
 
-                if(report.GdRomSwapDiscCapabilities.Lba45000RwReadable)
-                    subchannel = MmcSubchannel.Raw;
-                else if(report.GdRomSwapDiscCapabilities.Lba45000PqReadable)
-                    subchannel = MmcSubchannel.Q16;
-            }
-            else if(report.GdRomSwapDiscCapabilities.Lba50000Readable == false)
-            {
-                startingSector = 50000;
-                readAsAudio    = false;
-                cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba50000ReadableCluster;
+                DecodedSense? decoded = Sense.Decode(senseBuffer);
 
-                if(report.GdRomSwapDiscCapabilities.Lba50000RwReadable)
-                    subchannel = MmcSubchannel.Raw;
-                else if(report.GdRomSwapDiscCapabilities.Lba50000PqReadable)
-                    subchannel = MmcSubchannel.Q16;
-            }
-            else if(report.GdRomSwapDiscCapabilities.Lba100000Readable == false)
-            {
-                startingSector = 100000;
-                readAsAudio    = false;
-                cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba100000ReadableCluster;
+                if(decoded?.ASC != 0x64)
+                    break;
 
-                if(report.GdRomSwapDiscCapabilities.Lba100000RwReadable)
-                    subchannel = MmcSubchannel.Raw;
-                else if(report.GdRomSwapDiscCapabilities.Lba100000PqReadable)
-                    subchannel = MmcSubchannel.Q16;
-            }
-            else if(report.GdRomSwapDiscCapabilities.Lba400000Readable == false)
-            {
-                startingSector = 400000;
-                readAsAudio    = false;
-                cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba400000ReadableCluster;
+                if(decoded?.ASCQ != 0x00)
+                    break;
 
-                if(report.GdRomSwapDiscCapabilities.Lba400000RwReadable)
-                    subchannel = MmcSubchannel.Raw;
-                else if(report.GdRomSwapDiscCapabilities.Lba400000PqReadable)
-                    subchannel = MmcSubchannel.Q16;
-            }
-            else if(report.GdRomSwapDiscCapabilities.Lba450000Readable == false)
-            {
-                startingSector = 450000;
-                readAsAudio    = false;
-                cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba450000ReadableCluster;
+                trackModeChange = true;
+                readAsAudio     = !readAsAudio;
 
-                if(report.GdRomSwapDiscCapabilities.Lba450000RwReadable)
-                    subchannel = MmcSubchannel.Raw;
-                else if(report.GdRomSwapDiscCapabilities.Lba450000PqReadable)
-                    subchannel = MmcSubchannel.Q16;
-            }
-            else if(report.GdRomSwapDiscCapabilities.Lba45000AudioReadable == false)
-            {
-                startingSector = 45000;
-                readAsAudio    = true;
-                cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba45000AudioReadableCluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba45000AudioRwReadable)
-                    subchannel = MmcSubchannel.Raw;
-                else if(report.GdRomSwapDiscCapabilities.Lba45000AudioPqReadable)
-                    subchannel = MmcSubchannel.Q16;
-            }
-            else if(report.GdRomSwapDiscCapabilities.Lba50000AudioReadable == false)
-            {
-                startingSector = 50000;
-                readAsAudio    = true;
-                cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba50000AudioReadableCluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba50000AudioRwReadable)
-                    subchannel = MmcSubchannel.Raw;
-                else if(report.GdRomSwapDiscCapabilities.Lba50000AudioPqReadable)
-                    subchannel = MmcSubchannel.Q16;
-            }
-            else if(report.GdRomSwapDiscCapabilities.Lba100000AudioReadable == false)
-            {
-                startingSector = 100000;
-                readAsAudio    = true;
-                cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba100000AudioReadableCluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba100000AudioRwReadable)
-                    subchannel = MmcSubchannel.Raw;
-                else if(report.GdRomSwapDiscCapabilities.Lba100000AudioPqReadable)
-                    subchannel = MmcSubchannel.Q16;
-            }
-            else if(report.GdRomSwapDiscCapabilities.Lba400000AudioReadable == false)
-            {
-                startingSector = 400000;
-                readAsAudio    = true;
-                cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba400000AudioReadableCluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba400000AudioRwReadable)
-                    subchannel = MmcSubchannel.Raw;
-                else if(report.GdRomSwapDiscCapabilities.Lba400000AudioPqReadable)
-                    subchannel = MmcSubchannel.Q16;
-            }
-            else if(report.GdRomSwapDiscCapabilities.Lba450000AudioReadable == false)
-            {
-                startingSector = 450000;
-                readAsAudio    = true;
-                cluster        = (uint)report.GdRomSwapDiscCapabilities.Lba450000AudioReadableCluster;
-
-                if(report.GdRomSwapDiscCapabilities.Lba450000AudioRwReadable)
-                    subchannel = MmcSubchannel.Raw;
-                else if(report.GdRomSwapDiscCapabilities.Lba450000AudioPqReadable)
-                    subchannel = MmcSubchannel.Q16;
+                continue;
             }
 
-            System.Console.CancelKeyPress += (sender, e) =>
-            {
-                e.Cancel = true;
-                aborted  = true;
-            };
-
-            report.GdRomSwapDiscCapabilities.MinimumReadableSectorInHdArea = startingSector;
+            trackModeChange = false;
 
             switch(subchannel)
             {
                 case MmcSubchannel.Raw:
-                    blockSize += 96;
+                    lastSuccessfulRw = buffer;
 
                     break;
                 case MmcSubchannel.Q16:
-                    blockSize += 16;
+                    lastSuccessfulPq = buffer;
 
                     break;
             }
 
-            byte[] lastSuccessfulPq = null;
-            byte[] lastSuccessfulRw = null;
-            bool   trackModeChange  = false;
-
-            AaruConsole.WriteLine();
-
-            for(uint lba = startingSector; lba < sectors; lba += cluster)
-            {
-                if(aborted)
-                {
-                    AaruConsole.WriteLine();
-                    AaruConsole.WriteLine("Aborted!");
-
-                    break;
-                }
-
-                AaruConsole.Write("\rReading LBA {0} of {1}", lba, sectors);
-
-                sense = readAsAudio
-                            ? _dev.ReadCd(out buffer, out senseBuffer, lba, blockSize, cluster, MmcSectorTypes.Cdda,
-                                          false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                          subchannel, _dev.Timeout, out _) : _dev.ReadCd(out buffer, out senseBuffer,
-                                lba, blockSize, cluster, MmcSectorTypes.AllTypes, false, false, true,
-                                MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, subchannel,
-                                _dev.Timeout, out _);
-
-                if(sense)
-                {
-                    if(trackModeChange)
-                        break;
-
-                    DecodedSense? decoded = Sense.Decode(senseBuffer);
-
-                    if(decoded?.ASC != 0x64)
-                        break;
-
-                    if(decoded?.ASCQ != 0x00)
-                        break;
-
-                    trackModeChange = true;
-                    readAsAudio     = !readAsAudio;
-
-                    continue;
-                }
-
-                trackModeChange = false;
-
-                switch(subchannel)
-                {
-                    case MmcSubchannel.Raw:
-                        lastSuccessfulRw = buffer;
-
-                        break;
-                    case MmcSubchannel.Q16:
-                        lastSuccessfulPq = buffer;
-
-                        break;
-                }
-
-                report.GdRomSwapDiscCapabilities.MaximumReadableSectorInHdArea = lba + cluster - 1;
-            }
-
-            AaruConsole.WriteLine();
-
-            report.GdRomSwapDiscCapabilities.MaximumReadablePqInHdArea = lastSuccessfulPq;
-            report.GdRomSwapDiscCapabilities.MaximumReadableRwInHdArea = lastSuccessfulRw;
+            report.GdRomSwapDiscCapabilities.MaximumReadableSectorInHdArea = lba + cluster - 1;
         }
+
+        AaruConsole.WriteLine();
+
+        report.GdRomSwapDiscCapabilities.MaximumReadablePqInHdArea = lastSuccessfulPq;
+        report.GdRomSwapDiscCapabilities.MaximumReadableRwInHdArea = lastSuccessfulRw;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Report/MMC.cs b/Aaru.Core/Devices/Report/MMC.cs
index a75e2ba6e..6ec8da17d 100644
--- a/Aaru.Core/Devices/Report/MMC.cs
+++ b/Aaru.Core/Devices/Report/MMC.cs
@@ -42,687 +42,782 @@ using Aaru.Devices;
 using Aaru.Helpers;
 using Spectre.Console;
 
-namespace Aaru.Core.Devices.Report
+namespace Aaru.Core.Devices.Report;
+
+public sealed partial class DeviceReport
 {
-    public sealed partial class DeviceReport
+    static byte[] ClearMmcFeatures(byte[] response)
     {
-        static byte[] ClearMmcFeatures(byte[] response)
+        uint offset = 8;
+
+        while(offset + 4 < response.Length)
         {
-            uint offset = 8;
+            ushort code = (ushort)((response[offset + 0] << 8) + response[offset + 1]);
+            byte[] data = new byte[response[offset + 3] + 4];
 
-            while(offset + 4 < response.Length)
+            if(code != 0x0108)
             {
-                ushort code = (ushort)((response[offset + 0] << 8) + response[offset + 1]);
-                byte[] data = new byte[response[offset + 3] + 4];
-
-                if(code != 0x0108)
-                {
-                    offset += (uint)data.Length;
-
-                    continue;
-                }
-
-                if(data.Length + offset > response.Length)
-                    data = new byte[response.Length - offset];
-
-                Array.Copy(data, 4, response, offset + 4, data.Length - 4);
                 offset += (uint)data.Length;
+
+                continue;
             }
 
-            return response;
+            if(data.Length + offset > response.Length)
+                data = new byte[response.Length - offset];
+
+            Array.Copy(data, 4, response, offset + 4, data.Length - 4);
+            offset += (uint)data.Length;
         }
 
-        /// <summary>Creates a report for the GET CONFIGURATION response of an MMC device</summary>
-        /// <returns>MMC features report</returns>
-        public MmcFeatures ReportMmcFeatures()
+        return response;
+    }
+
+    /// <summary>Creates a report for the GET CONFIGURATION response of an MMC device</summary>
+    /// <returns>MMC features report</returns>
+    public MmcFeatures ReportMmcFeatures()
+    {
+        bool   sense  = true;
+        byte[] buffer = Array.Empty<byte>();
+
+        Spectre.ProgressSingleSpinner(ctx =>
         {
-            bool   sense  = true;
-            byte[] buffer = Array.Empty<byte>();
+            ctx.AddTask("Querying MMC GET CONFIGURATION...").IsIndeterminate();
+            sense = _dev.GetConfiguration(out buffer, out _, _dev.Timeout, out _);
+        });
 
-            Spectre.ProgressSingleSpinner(ctx =>
+        if(sense)
+            return null;
+
+        Features.SeparatedFeatures ftr = Features.Separate(buffer);
+
+        if(ftr.Descriptors        == null ||
+           ftr.Descriptors.Length <= 0)
+            return null;
+
+        var report = new MmcFeatures
+        {
+            BinaryData = ClearMmcFeatures(buffer)
+        };
+
+        foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
+            switch(desc.Code)
             {
-                ctx.AddTask("Querying MMC GET CONFIGURATION...").IsIndeterminate();
-                sense = _dev.GetConfiguration(out buffer, out _, _dev.Timeout, out _);
-            });
-
-            if(sense)
-                return null;
-
-            Features.SeparatedFeatures ftr = Features.Separate(buffer);
-
-            if(ftr.Descriptors        == null ||
-               ftr.Descriptors.Length <= 0)
-                return null;
-
-            var report = new MmcFeatures
-            {
-                BinaryData = ClearMmcFeatures(buffer)
-            };
-
-            foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
-                switch(desc.Code)
+                case 0x0001:
                 {
-                    case 0x0001:
+                    Feature_0001? ftr0001 = Features.Decode_0001(desc.Data);
+
+                    if(ftr0001.HasValue)
                     {
-                        Feature_0001? ftr0001 = Features.Decode_0001(desc.Data);
+                        report.PhysicalInterfaceStandardNumber = (uint)ftr0001.Value.PhysicalInterfaceStandard;
 
-                        if(ftr0001.HasValue)
-                        {
-                            report.PhysicalInterfaceStandardNumber = (uint)ftr0001.Value.PhysicalInterfaceStandard;
-
-                            report.SupportsDeviceBusyEvent = ftr0001.Value.DBE;
-                        }
+                        report.SupportsDeviceBusyEvent = ftr0001.Value.DBE;
                     }
-
-                        break;
-                    case 0x0003:
-                    {
-                        Feature_0003? ftr0003 = Features.Decode_0003(desc.Data);
-
-                        if(ftr0003.HasValue)
-                        {
-                            report.LoadingMechanismType = ftr0003.Value.LoadingMechanismType;
-                            report.CanLoad              = ftr0003.Value.Load;
-                            report.CanEject             = ftr0003.Value.Eject;
-                            report.PreventJumper        = ftr0003.Value.PreventJumper;
-                            report.DBML                 = ftr0003.Value.DBML;
-                            report.Locked               = ftr0003.Value.Lock;
-                        }
-                    }
-
-                        break;
-                    case 0x0004:
-                    {
-                        Feature_0004? ftr0004 = Features.Decode_0004(desc.Data);
-
-                        if(ftr0004.HasValue)
-                        {
-                            report.SupportsWriteProtectPAC = ftr0004.Value.DWP;
-                            report.SupportsWriteInhibitDCB = ftr0004.Value.WDCB;
-                            report.SupportsPWP             = ftr0004.Value.SPWP;
-                            report.SupportsSWPP            = ftr0004.Value.SSWPP;
-                        }
-                    }
-
-                        break;
-                    case 0x0010:
-                    {
-                        Feature_0010? ftr0010 = Features.Decode_0010(desc.Data);
-
-                        if(ftr0010.HasValue)
-                        {
-                            if(ftr0010.Value.LogicalBlockSize > 0)
-                                report.LogicalBlockSize = ftr0010.Value.LogicalBlockSize;
-
-                            if(ftr0010.Value.Blocking > 0)
-                                report.BlocksPerReadableUnit = ftr0010.Value.Blocking;
-
-                            report.ErrorRecoveryPage = ftr0010.Value.PP;
-                        }
-                    }
-
-                        break;
-                    case 0x001D:
-                        report.MultiRead = true;
-
-                        break;
-                    case 0x001E:
-                    {
-                        report.CanReadCD = true;
-                        Feature_001E? ftr001E = Features.Decode_001E(desc.Data);
-
-                        if(ftr001E.HasValue)
-                        {
-                            report.SupportsDAP         = ftr001E.Value.DAP;
-                            report.SupportsC2          = ftr001E.Value.C2;
-                            report.CanReadLeadInCDText = ftr001E.Value.CDText;
-                        }
-                    }
-
-                        break;
-                    case 0x001F:
-                    {
-                        report.CanReadDVD = true;
-                        Feature_001F? ftr001F = Features.Decode_001F(desc.Data);
-
-                        if(ftr001F.HasValue)
-                        {
-                            report.DVDMultiRead     = ftr001F.Value.MULTI110;
-                            report.CanReadAllDualRW = ftr001F.Value.DualRW;
-                            report.CanReadAllDualR  = ftr001F.Value.DualR;
-                        }
-                    }
-
-                        break;
-                    case 0x0022:
-                        report.CanEraseSector = true;
-
-                        break;
-                    case 0x0023:
-                    {
-                        report.CanFormat = true;
-                        Feature_0023? ftr0023 = Features.Decode_0023(desc.Data);
-
-                        if(ftr0023.HasValue)
-                        {
-                            report.CanFormatBDREWithoutSpare = ftr0023.Value.RENoSA;
-                            report.CanExpandBDRESpareArea    = ftr0023.Value.Expand;
-                            report.CanFormatQCert            = ftr0023.Value.QCert;
-                            report.CanFormatCert             = ftr0023.Value.Cert;
-                            report.CanFormatFRF              = ftr0023.Value.FRF;
-                            report.CanFormatRRM              = ftr0023.Value.RRM;
-                        }
-                    }
-
-                        break;
-                    case 0x0024:
-                        report.CanReadSpareAreaInformation = true;
-
-                        break;
-                    case 0x0027:
-                        report.CanWriteCDRWCAV = true;
-
-                        break;
-                    case 0x0028:
-                    {
-                        report.CanReadCDMRW = true;
-                        Feature_0028? ftr0028 = Features.Decode_0028(desc.Data);
-
-                        if(ftr0028.HasValue)
-                        {
-                            report.CanReadDVDPlusMRW  = ftr0028.Value.DVDPRead;
-                            report.CanWriteDVDPlusMRW = ftr0028.Value.DVDPWrite;
-                            report.CanWriteCDMRW      = ftr0028.Value.Write;
-                        }
-                    }
-
-                        break;
-                    case 0x002A:
-                    {
-                        report.CanReadDVDPlusRW = true;
-                        Feature_002A? ftr002A = Features.Decode_002A(desc.Data);
-
-                        if(ftr002A.HasValue)
-                            report.CanWriteDVDPlusRW = ftr002A.Value.Write;
-                    }
-
-                        break;
-                    case 0x002B:
-                    {
-                        report.CanReadDVDPlusR = true;
-                        Feature_002B? ftr002B = Features.Decode_002B(desc.Data);
-
-                        if(ftr002B.HasValue)
-                            report.CanWriteDVDPlusR = ftr002B.Value.Write;
-                    }
-
-                        break;
-                    case 0x002D:
-                    {
-                        report.CanWriteCDTAO = true;
-                        Feature_002D? ftr002D = Features.Decode_002D(desc.Data);
-
-                        if(ftr002D.HasValue)
-                        {
-                            report.BufferUnderrunFreeInTAO       = ftr002D.Value.BUF;
-                            report.CanWriteRawSubchannelInTAO    = ftr002D.Value.RWRaw;
-                            report.CanWritePackedSubchannelInTAO = ftr002D.Value.RWPack;
-                            report.CanTestWriteInTAO             = ftr002D.Value.TestWrite;
-                            report.CanOverwriteTAOTrack          = ftr002D.Value.CDRW;
-                            report.CanWriteRWSubchannelInTAO     = ftr002D.Value.RWSubchannel;
-                        }
-                    }
-
-                        break;
-                    case 0x002E:
-                    {
-                        report.CanWriteCDSAO = true;
-                        Feature_002E? ftr002E = Features.Decode_002E(desc.Data);
-
-                        if(ftr002E.HasValue)
-                        {
-                            report.BufferUnderrunFreeInSAO   = ftr002E.Value.BUF;
-                            report.CanWriteRawMultiSession   = ftr002E.Value.RAWMS;
-                            report.CanWriteRaw               = ftr002E.Value.RAW;
-                            report.CanTestWriteInSAO         = ftr002E.Value.TestWrite;
-                            report.CanOverwriteSAOTrack      = ftr002E.Value.CDRW;
-                            report.CanWriteRWSubchannelInSAO = ftr002E.Value.RW;
-                        }
-                    }
-
-                        break;
-                    case 0x002F:
-                    {
-                        report.CanWriteDVDR = true;
-                        Feature_002F? ftr002F = Features.Decode_002F(desc.Data);
-
-                        if(ftr002F.HasValue)
-                        {
-                            report.BufferUnderrunFreeInDVD = ftr002F.Value.BUF;
-                            report.CanWriteDVDRDL          = ftr002F.Value.RDL;
-                            report.CanTestWriteDVD         = ftr002F.Value.TestWrite;
-                            report.CanWriteDVDRW           = ftr002F.Value.DVDRW;
-                        }
-                    }
-
-                        break;
-                    case 0x0030:
-                        report.CanReadDDCD = true;
-
-                        break;
-                    case 0x0031:
-                    {
-                        report.CanWriteDDCDR = true;
-                        Feature_0031? ftr0031 = Features.Decode_0031(desc.Data);
-
-                        if(ftr0031.HasValue)
-                            report.CanTestWriteDDCDR = ftr0031.Value.TestWrite;
-                    }
-
-                        break;
-                    case 0x0032:
-                        report.CanWriteDDCDRW = true;
-
-                        break;
-                    case 0x0037:
-                        report.CanWriteCDRW = true;
-
-                        break;
-                    case 0x0038:
-                        report.CanPseudoOverwriteBDR = true;
-
-                        break;
-                    case 0x003A:
-                    {
-                        report.CanReadDVDPlusRWDL = true;
-                        Feature_003A? ftr003A = Features.Decode_003A(desc.Data);
-
-                        if(ftr003A.HasValue)
-                            report.CanWriteDVDPlusRWDL = ftr003A.Value.Write;
-                    }
-
-                        break;
-                    case 0x003B:
-                    {
-                        report.CanReadDVDPlusRDL = true;
-                        Feature_003B? ftr003B = Features.Decode_003B(desc.Data);
-
-                        if(ftr003B.HasValue)
-                            report.CanWriteDVDPlusRDL = ftr003B.Value.Write;
-                    }
-
-                        break;
-                    case 0x0040:
-                    {
-                        report.CanReadBD = true;
-                        Feature_0040? ftr0040 = Features.Decode_0040(desc.Data);
-
-                        if(ftr0040.HasValue)
-                        {
-                            report.CanReadBluBCA   = ftr0040.Value.BCA;
-                            report.CanReadBDRE2    = ftr0040.Value.RE2;
-                            report.CanReadBDRE1    = ftr0040.Value.RE1;
-                            report.CanReadOldBDRE  = ftr0040.Value.OldRE;
-                            report.CanReadBDR      = ftr0040.Value.R;
-                            report.CanReadOldBDR   = ftr0040.Value.OldR;
-                            report.CanReadBDROM    = ftr0040.Value.ROM;
-                            report.CanReadOldBDROM = ftr0040.Value.OldROM;
-                        }
-                    }
-
-                        break;
-                    case 0x0041:
-                    {
-                        report.CanWriteBD = true;
-                        Feature_0041? ftr0041 = Features.Decode_0041(desc.Data);
-
-                        if(ftr0041.HasValue)
-                        {
-                            report.CanWriteBDRE2   = ftr0041.Value.RE2;
-                            report.CanWriteBDRE1   = ftr0041.Value.RE1;
-                            report.CanWriteOldBDRE = ftr0041.Value.OldRE;
-                            report.CanWriteBDR     = ftr0041.Value.R;
-                            report.CanWriteOldBDR  = ftr0041.Value.OldR;
-                        }
-                    }
-
-                        break;
-                    case 0x0050:
-                    {
-                        report.CanReadHDDVD = true;
-                        Feature_0050? ftr0050 = Features.Decode_0050(desc.Data);
-
-                        if(ftr0050.HasValue)
-                        {
-                            report.CanReadHDDVDR   = ftr0050.Value.HDDVDR;
-                            report.CanReadHDDVDRAM = ftr0050.Value.HDDVDRAM;
-                        }
-                    }
-
-                        break;
-                    case 0x0051:
-                    {
-                        // TODO: Write HD DVD-RW
-                        Feature_0051? ftr0051 = Features.Decode_0051(desc.Data);
-
-                        if(ftr0051.HasValue)
-                        {
-                            report.CanWriteHDDVDR   = ftr0051.Value.HDDVDR;
-                            report.CanWriteHDDVDRAM = ftr0051.Value.HDDVDRAM;
-                        }
-                    }
-
-                        break;
-                    case 0x0080:
-                        report.SupportsHybridDiscs = true;
-
-                        break;
-                    case 0x0101:
-                        report.SupportsModePage1Ch = true;
-
-                        break;
-                    case 0x0102:
-                    {
-                        report.EmbeddedChanger = true;
-                        Feature_0102? ftr0102 = Features.Decode_0102(desc.Data);
-
-                        if(ftr0102.HasValue)
-                        {
-                            report.ChangerIsSideChangeCapable = ftr0102.Value.SCC;
-                            report.ChangerSupportsDiscPresent = ftr0102.Value.SDP;
-                            report.ChangerSlots               = (byte)(ftr0102.Value.HighestSlotNumber + 1);
-                        }
-                    }
-
-                        break;
-                    case 0x0103:
-                    {
-                        report.CanPlayCDAudio = true;
-                        Feature_0103? ftr0103 = Features.Decode_0103(desc.Data);
-
-                        if(ftr0103.HasValue)
-                        {
-                            report.CanAudioScan            = ftr0103.Value.Scan;
-                            report.CanMuteSeparateChannels = ftr0103.Value.SCM;
-                            report.SupportsSeparateVolume  = ftr0103.Value.SV;
-
-                            if(ftr0103.Value.VolumeLevels > 0)
-                                report.VolumeLevels = ftr0103.Value.VolumeLevels;
-                        }
-                    }
-
-                        break;
-                    case 0x0104:
-                        report.CanUpgradeFirmware = true;
-
-                        break;
-                    case 0x0106:
-                    {
-                        report.SupportsCSS = true;
-                        Feature_0106? ftr0106 = Features.Decode_0106(desc.Data);
-
-                        if(ftr0106?.CSSVersion > 0)
-                            report.CSSVersion = ftr0106.Value.CSSVersion;
-                    }
-
-                        break;
-                    case 0x0108:
-                        report.CanReportDriveSerial = true;
-
-                        break;
-                    case 0x0109:
-                        report.CanReportMediaSerial = true;
-
-                        break;
-                    case 0x010B:
-                    {
-                        report.SupportsCPRM = true;
-                        Feature_010B? ftr010B = Features.Decode_010B(desc.Data);
-
-                        if(ftr010B?.CPRMVersion > 0)
-                            report.CPRMVersion = ftr010B.Value.CPRMVersion;
-                    }
-
-                        break;
-                    case 0x010C:
-                    {
-                        Feature_010C? ftr010C = Features.Decode_010C(desc.Data);
-
-                        if(ftr010C.HasValue)
-                        {
-                            byte[] temp = new byte[4];
-                            temp[0] = (byte)((ftr010C.Value.Century & 0xFF00) >> 8);
-                            temp[1] = (byte)(ftr010C.Value.Century & 0xFF);
-                            temp[2] = (byte)((ftr010C.Value.Year & 0xFF00) >> 8);
-                            temp[3] = (byte)(ftr010C.Value.Year & 0xFF);
-                            string syear = Encoding.ASCII.GetString(temp);
-                            temp    = new byte[2];
-                            temp[0] = (byte)((ftr010C.Value.Month & 0xFF00) >> 8);
-                            temp[1] = (byte)(ftr010C.Value.Month & 0xFF);
-                            string smonth = Encoding.ASCII.GetString(temp);
-                            temp    = new byte[2];
-                            temp[0] = (byte)((ftr010C.Value.Day & 0xFF00) >> 8);
-                            temp[1] = (byte)(ftr010C.Value.Day & 0xFF);
-                            string sday = Encoding.ASCII.GetString(temp);
-                            temp    = new byte[2];
-                            temp[0] = (byte)((ftr010C.Value.Hour & 0xFF00) >> 8);
-                            temp[1] = (byte)(ftr010C.Value.Hour & 0xFF);
-                            string shour = Encoding.ASCII.GetString(temp);
-                            temp    = new byte[2];
-                            temp[0] = (byte)((ftr010C.Value.Minute & 0xFF00) >> 8);
-                            temp[1] = (byte)(ftr010C.Value.Minute & 0xFF);
-                            string sminute = Encoding.ASCII.GetString(temp);
-                            temp    = new byte[2];
-                            temp[0] = (byte)((ftr010C.Value.Second & 0xFF00) >> 8);
-                            temp[1] = (byte)(ftr010C.Value.Second & 0xFF);
-                            string ssecond = Encoding.ASCII.GetString(temp);
-
-                            try
-                            {
-                                report.FirmwareDate = new DateTime(int.Parse(syear), int.Parse(smonth), int.Parse(sday),
-                                                                   int.Parse(shour), int.Parse(sminute),
-                                                                   int.Parse(ssecond), DateTimeKind.Utc);
-                            }
-                            #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
-                            catch
-                            {
-                                // ignored
-                            }
-                            #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
-                        }
-                    }
-
-                        break;
-                    case 0x010D:
-                    {
-                        report.SupportsAACS = true;
-                        Feature_010D? ftr010D = Features.Decode_010D(desc.Data);
-
-                        if(ftr010D.HasValue)
-                        {
-                            report.CanReadDriveAACSCertificate = ftr010D.Value.RDC;
-                            report.CanReadCPRM_MKB             = ftr010D.Value.RMC;
-                            report.CanWriteBusEncryptedBlocks  = ftr010D.Value.WBE;
-                            report.SupportsBusEncryption       = ftr010D.Value.BEC;
-                            report.CanGenerateBindingNonce     = ftr010D.Value.BNG;
-
-                            if(ftr010D.Value.BindNonceBlocks > 0)
-                                report.BindingNonceBlocks = ftr010D.Value.BindNonceBlocks;
-
-                            if(ftr010D.Value.AGIDs > 0)
-                                report.AGIDs = ftr010D.Value.AGIDs;
-
-                            if(ftr010D.Value.AACSVersion > 0)
-                                report.AACSVersion = ftr010D.Value.AACSVersion;
-                        }
-                    }
-
-                        break;
-                    case 0x010E:
-                        report.CanWriteCSSManagedDVD = true;
-
-                        break;
-                    case 0x0113:
-                        report.SupportsSecurDisc = true;
-
-                        break;
-                    case 0x0142:
-                        report.SupportsOSSC = true;
-
-                        break;
-                    case 0x0110:
-                        report.SupportsVCPS = true;
-
-                        break;
                 }
 
-            return report;
+                    break;
+                case 0x0003:
+                {
+                    Feature_0003? ftr0003 = Features.Decode_0003(desc.Data);
+
+                    if(ftr0003.HasValue)
+                    {
+                        report.LoadingMechanismType = ftr0003.Value.LoadingMechanismType;
+                        report.CanLoad              = ftr0003.Value.Load;
+                        report.CanEject             = ftr0003.Value.Eject;
+                        report.PreventJumper        = ftr0003.Value.PreventJumper;
+                        report.DBML                 = ftr0003.Value.DBML;
+                        report.Locked               = ftr0003.Value.Lock;
+                    }
+                }
+
+                    break;
+                case 0x0004:
+                {
+                    Feature_0004? ftr0004 = Features.Decode_0004(desc.Data);
+
+                    if(ftr0004.HasValue)
+                    {
+                        report.SupportsWriteProtectPAC = ftr0004.Value.DWP;
+                        report.SupportsWriteInhibitDCB = ftr0004.Value.WDCB;
+                        report.SupportsPWP             = ftr0004.Value.SPWP;
+                        report.SupportsSWPP            = ftr0004.Value.SSWPP;
+                    }
+                }
+
+                    break;
+                case 0x0010:
+                {
+                    Feature_0010? ftr0010 = Features.Decode_0010(desc.Data);
+
+                    if(ftr0010.HasValue)
+                    {
+                        if(ftr0010.Value.LogicalBlockSize > 0)
+                            report.LogicalBlockSize = ftr0010.Value.LogicalBlockSize;
+
+                        if(ftr0010.Value.Blocking > 0)
+                            report.BlocksPerReadableUnit = ftr0010.Value.Blocking;
+
+                        report.ErrorRecoveryPage = ftr0010.Value.PP;
+                    }
+                }
+
+                    break;
+                case 0x001D:
+                    report.MultiRead = true;
+
+                    break;
+                case 0x001E:
+                {
+                    report.CanReadCD = true;
+                    Feature_001E? ftr001E = Features.Decode_001E(desc.Data);
+
+                    if(ftr001E.HasValue)
+                    {
+                        report.SupportsDAP         = ftr001E.Value.DAP;
+                        report.SupportsC2          = ftr001E.Value.C2;
+                        report.CanReadLeadInCDText = ftr001E.Value.CDText;
+                    }
+                }
+
+                    break;
+                case 0x001F:
+                {
+                    report.CanReadDVD = true;
+                    Feature_001F? ftr001F = Features.Decode_001F(desc.Data);
+
+                    if(ftr001F.HasValue)
+                    {
+                        report.DVDMultiRead     = ftr001F.Value.MULTI110;
+                        report.CanReadAllDualRW = ftr001F.Value.DualRW;
+                        report.CanReadAllDualR  = ftr001F.Value.DualR;
+                    }
+                }
+
+                    break;
+                case 0x0022:
+                    report.CanEraseSector = true;
+
+                    break;
+                case 0x0023:
+                {
+                    report.CanFormat = true;
+                    Feature_0023? ftr0023 = Features.Decode_0023(desc.Data);
+
+                    if(ftr0023.HasValue)
+                    {
+                        report.CanFormatBDREWithoutSpare = ftr0023.Value.RENoSA;
+                        report.CanExpandBDRESpareArea    = ftr0023.Value.Expand;
+                        report.CanFormatQCert            = ftr0023.Value.QCert;
+                        report.CanFormatCert             = ftr0023.Value.Cert;
+                        report.CanFormatFRF              = ftr0023.Value.FRF;
+                        report.CanFormatRRM              = ftr0023.Value.RRM;
+                    }
+                }
+
+                    break;
+                case 0x0024:
+                    report.CanReadSpareAreaInformation = true;
+
+                    break;
+                case 0x0027:
+                    report.CanWriteCDRWCAV = true;
+
+                    break;
+                case 0x0028:
+                {
+                    report.CanReadCDMRW = true;
+                    Feature_0028? ftr0028 = Features.Decode_0028(desc.Data);
+
+                    if(ftr0028.HasValue)
+                    {
+                        report.CanReadDVDPlusMRW  = ftr0028.Value.DVDPRead;
+                        report.CanWriteDVDPlusMRW = ftr0028.Value.DVDPWrite;
+                        report.CanWriteCDMRW      = ftr0028.Value.Write;
+                    }
+                }
+
+                    break;
+                case 0x002A:
+                {
+                    report.CanReadDVDPlusRW = true;
+                    Feature_002A? ftr002A = Features.Decode_002A(desc.Data);
+
+                    if(ftr002A.HasValue)
+                        report.CanWriteDVDPlusRW = ftr002A.Value.Write;
+                }
+
+                    break;
+                case 0x002B:
+                {
+                    report.CanReadDVDPlusR = true;
+                    Feature_002B? ftr002B = Features.Decode_002B(desc.Data);
+
+                    if(ftr002B.HasValue)
+                        report.CanWriteDVDPlusR = ftr002B.Value.Write;
+                }
+
+                    break;
+                case 0x002D:
+                {
+                    report.CanWriteCDTAO = true;
+                    Feature_002D? ftr002D = Features.Decode_002D(desc.Data);
+
+                    if(ftr002D.HasValue)
+                    {
+                        report.BufferUnderrunFreeInTAO       = ftr002D.Value.BUF;
+                        report.CanWriteRawSubchannelInTAO    = ftr002D.Value.RWRaw;
+                        report.CanWritePackedSubchannelInTAO = ftr002D.Value.RWPack;
+                        report.CanTestWriteInTAO             = ftr002D.Value.TestWrite;
+                        report.CanOverwriteTAOTrack          = ftr002D.Value.CDRW;
+                        report.CanWriteRWSubchannelInTAO     = ftr002D.Value.RWSubchannel;
+                    }
+                }
+
+                    break;
+                case 0x002E:
+                {
+                    report.CanWriteCDSAO = true;
+                    Feature_002E? ftr002E = Features.Decode_002E(desc.Data);
+
+                    if(ftr002E.HasValue)
+                    {
+                        report.BufferUnderrunFreeInSAO   = ftr002E.Value.BUF;
+                        report.CanWriteRawMultiSession   = ftr002E.Value.RAWMS;
+                        report.CanWriteRaw               = ftr002E.Value.RAW;
+                        report.CanTestWriteInSAO         = ftr002E.Value.TestWrite;
+                        report.CanOverwriteSAOTrack      = ftr002E.Value.CDRW;
+                        report.CanWriteRWSubchannelInSAO = ftr002E.Value.RW;
+                    }
+                }
+
+                    break;
+                case 0x002F:
+                {
+                    report.CanWriteDVDR = true;
+                    Feature_002F? ftr002F = Features.Decode_002F(desc.Data);
+
+                    if(ftr002F.HasValue)
+                    {
+                        report.BufferUnderrunFreeInDVD = ftr002F.Value.BUF;
+                        report.CanWriteDVDRDL          = ftr002F.Value.RDL;
+                        report.CanTestWriteDVD         = ftr002F.Value.TestWrite;
+                        report.CanWriteDVDRW           = ftr002F.Value.DVDRW;
+                    }
+                }
+
+                    break;
+                case 0x0030:
+                    report.CanReadDDCD = true;
+
+                    break;
+                case 0x0031:
+                {
+                    report.CanWriteDDCDR = true;
+                    Feature_0031? ftr0031 = Features.Decode_0031(desc.Data);
+
+                    if(ftr0031.HasValue)
+                        report.CanTestWriteDDCDR = ftr0031.Value.TestWrite;
+                }
+
+                    break;
+                case 0x0032:
+                    report.CanWriteDDCDRW = true;
+
+                    break;
+                case 0x0037:
+                    report.CanWriteCDRW = true;
+
+                    break;
+                case 0x0038:
+                    report.CanPseudoOverwriteBDR = true;
+
+                    break;
+                case 0x003A:
+                {
+                    report.CanReadDVDPlusRWDL = true;
+                    Feature_003A? ftr003A = Features.Decode_003A(desc.Data);
+
+                    if(ftr003A.HasValue)
+                        report.CanWriteDVDPlusRWDL = ftr003A.Value.Write;
+                }
+
+                    break;
+                case 0x003B:
+                {
+                    report.CanReadDVDPlusRDL = true;
+                    Feature_003B? ftr003B = Features.Decode_003B(desc.Data);
+
+                    if(ftr003B.HasValue)
+                        report.CanWriteDVDPlusRDL = ftr003B.Value.Write;
+                }
+
+                    break;
+                case 0x0040:
+                {
+                    report.CanReadBD = true;
+                    Feature_0040? ftr0040 = Features.Decode_0040(desc.Data);
+
+                    if(ftr0040.HasValue)
+                    {
+                        report.CanReadBluBCA   = ftr0040.Value.BCA;
+                        report.CanReadBDRE2    = ftr0040.Value.RE2;
+                        report.CanReadBDRE1    = ftr0040.Value.RE1;
+                        report.CanReadOldBDRE  = ftr0040.Value.OldRE;
+                        report.CanReadBDR      = ftr0040.Value.R;
+                        report.CanReadOldBDR   = ftr0040.Value.OldR;
+                        report.CanReadBDROM    = ftr0040.Value.ROM;
+                        report.CanReadOldBDROM = ftr0040.Value.OldROM;
+                    }
+                }
+
+                    break;
+                case 0x0041:
+                {
+                    report.CanWriteBD = true;
+                    Feature_0041? ftr0041 = Features.Decode_0041(desc.Data);
+
+                    if(ftr0041.HasValue)
+                    {
+                        report.CanWriteBDRE2   = ftr0041.Value.RE2;
+                        report.CanWriteBDRE1   = ftr0041.Value.RE1;
+                        report.CanWriteOldBDRE = ftr0041.Value.OldRE;
+                        report.CanWriteBDR     = ftr0041.Value.R;
+                        report.CanWriteOldBDR  = ftr0041.Value.OldR;
+                    }
+                }
+
+                    break;
+                case 0x0050:
+                {
+                    report.CanReadHDDVD = true;
+                    Feature_0050? ftr0050 = Features.Decode_0050(desc.Data);
+
+                    if(ftr0050.HasValue)
+                    {
+                        report.CanReadHDDVDR   = ftr0050.Value.HDDVDR;
+                        report.CanReadHDDVDRAM = ftr0050.Value.HDDVDRAM;
+                    }
+                }
+
+                    break;
+                case 0x0051:
+                {
+                    // TODO: Write HD DVD-RW
+                    Feature_0051? ftr0051 = Features.Decode_0051(desc.Data);
+
+                    if(ftr0051.HasValue)
+                    {
+                        report.CanWriteHDDVDR   = ftr0051.Value.HDDVDR;
+                        report.CanWriteHDDVDRAM = ftr0051.Value.HDDVDRAM;
+                    }
+                }
+
+                    break;
+                case 0x0080:
+                    report.SupportsHybridDiscs = true;
+
+                    break;
+                case 0x0101:
+                    report.SupportsModePage1Ch = true;
+
+                    break;
+                case 0x0102:
+                {
+                    report.EmbeddedChanger = true;
+                    Feature_0102? ftr0102 = Features.Decode_0102(desc.Data);
+
+                    if(ftr0102.HasValue)
+                    {
+                        report.ChangerIsSideChangeCapable = ftr0102.Value.SCC;
+                        report.ChangerSupportsDiscPresent = ftr0102.Value.SDP;
+                        report.ChangerSlots               = (byte)(ftr0102.Value.HighestSlotNumber + 1);
+                    }
+                }
+
+                    break;
+                case 0x0103:
+                {
+                    report.CanPlayCDAudio = true;
+                    Feature_0103? ftr0103 = Features.Decode_0103(desc.Data);
+
+                    if(ftr0103.HasValue)
+                    {
+                        report.CanAudioScan            = ftr0103.Value.Scan;
+                        report.CanMuteSeparateChannels = ftr0103.Value.SCM;
+                        report.SupportsSeparateVolume  = ftr0103.Value.SV;
+
+                        if(ftr0103.Value.VolumeLevels > 0)
+                            report.VolumeLevels = ftr0103.Value.VolumeLevels;
+                    }
+                }
+
+                    break;
+                case 0x0104:
+                    report.CanUpgradeFirmware = true;
+
+                    break;
+                case 0x0106:
+                {
+                    report.SupportsCSS = true;
+                    Feature_0106? ftr0106 = Features.Decode_0106(desc.Data);
+
+                    if(ftr0106?.CSSVersion > 0)
+                        report.CSSVersion = ftr0106.Value.CSSVersion;
+                }
+
+                    break;
+                case 0x0108:
+                    report.CanReportDriveSerial = true;
+
+                    break;
+                case 0x0109:
+                    report.CanReportMediaSerial = true;
+
+                    break;
+                case 0x010B:
+                {
+                    report.SupportsCPRM = true;
+                    Feature_010B? ftr010B = Features.Decode_010B(desc.Data);
+
+                    if(ftr010B?.CPRMVersion > 0)
+                        report.CPRMVersion = ftr010B.Value.CPRMVersion;
+                }
+
+                    break;
+                case 0x010C:
+                {
+                    Feature_010C? ftr010C = Features.Decode_010C(desc.Data);
+
+                    if(ftr010C.HasValue)
+                    {
+                        byte[] temp = new byte[4];
+                        temp[0] = (byte)((ftr010C.Value.Century & 0xFF00) >> 8);
+                        temp[1] = (byte)(ftr010C.Value.Century & 0xFF);
+                        temp[2] = (byte)((ftr010C.Value.Year & 0xFF00) >> 8);
+                        temp[3] = (byte)(ftr010C.Value.Year & 0xFF);
+                        string syear = Encoding.ASCII.GetString(temp);
+                        temp    = new byte[2];
+                        temp[0] = (byte)((ftr010C.Value.Month & 0xFF00) >> 8);
+                        temp[1] = (byte)(ftr010C.Value.Month & 0xFF);
+                        string smonth = Encoding.ASCII.GetString(temp);
+                        temp    = new byte[2];
+                        temp[0] = (byte)((ftr010C.Value.Day & 0xFF00) >> 8);
+                        temp[1] = (byte)(ftr010C.Value.Day & 0xFF);
+                        string sday = Encoding.ASCII.GetString(temp);
+                        temp    = new byte[2];
+                        temp[0] = (byte)((ftr010C.Value.Hour & 0xFF00) >> 8);
+                        temp[1] = (byte)(ftr010C.Value.Hour & 0xFF);
+                        string shour = Encoding.ASCII.GetString(temp);
+                        temp    = new byte[2];
+                        temp[0] = (byte)((ftr010C.Value.Minute & 0xFF00) >> 8);
+                        temp[1] = (byte)(ftr010C.Value.Minute & 0xFF);
+                        string sminute = Encoding.ASCII.GetString(temp);
+                        temp    = new byte[2];
+                        temp[0] = (byte)((ftr010C.Value.Second & 0xFF00) >> 8);
+                        temp[1] = (byte)(ftr010C.Value.Second & 0xFF);
+                        string ssecond = Encoding.ASCII.GetString(temp);
+
+                        try
+                        {
+                            report.FirmwareDate = new DateTime(int.Parse(syear), int.Parse(smonth), int.Parse(sday),
+                                                               int.Parse(shour), int.Parse(sminute),
+                                                               int.Parse(ssecond), DateTimeKind.Utc);
+                        }
+                        #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
+                        catch
+                        {
+                            // ignored
+                        }
+                        #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
+                    }
+                }
+
+                    break;
+                case 0x010D:
+                {
+                    report.SupportsAACS = true;
+                    Feature_010D? ftr010D = Features.Decode_010D(desc.Data);
+
+                    if(ftr010D.HasValue)
+                    {
+                        report.CanReadDriveAACSCertificate = ftr010D.Value.RDC;
+                        report.CanReadCPRM_MKB             = ftr010D.Value.RMC;
+                        report.CanWriteBusEncryptedBlocks  = ftr010D.Value.WBE;
+                        report.SupportsBusEncryption       = ftr010D.Value.BEC;
+                        report.CanGenerateBindingNonce     = ftr010D.Value.BNG;
+
+                        if(ftr010D.Value.BindNonceBlocks > 0)
+                            report.BindingNonceBlocks = ftr010D.Value.BindNonceBlocks;
+
+                        if(ftr010D.Value.AGIDs > 0)
+                            report.AGIDs = ftr010D.Value.AGIDs;
+
+                        if(ftr010D.Value.AACSVersion > 0)
+                            report.AACSVersion = ftr010D.Value.AACSVersion;
+                    }
+                }
+
+                    break;
+                case 0x010E:
+                    report.CanWriteCSSManagedDVD = true;
+
+                    break;
+                case 0x0113:
+                    report.SupportsSecurDisc = true;
+
+                    break;
+                case 0x0142:
+                    report.SupportsOSSC = true;
+
+                    break;
+                case 0x0110:
+                    report.SupportsVCPS = true;
+
+                    break;
+            }
+
+        return report;
+    }
+
+    /// <summary>Creates a report for media inserted into an MMC device</summary>
+    /// <param name="mediaType">Expected media type name</param>
+    /// <param name="tryPlextor">Try Plextor vendor commands</param>
+    /// <param name="tryPioneer">Try Pioneer vendor commands</param>
+    /// <param name="tryNec">Try NEC vendor commands</param>
+    /// <param name="tryHldtst">Try HL-DT-ST vendor commands</param>
+    /// <param name="tryMediaTekF106">Try MediaTek vendor commands</param>
+    /// <returns></returns>
+    public TestedMedia ReportMmcMedia(string mediaType, bool tryPlextor, bool tryPioneer, bool tryNec,
+                                      bool tryHldtst, bool tryMediaTekF106)
+    {
+        bool   sense       = true;
+        byte[] buffer      = Array.Empty<byte>();
+        byte[] senseBuffer = Array.Empty<byte>();
+        var    mediaTest   = new TestedMedia();
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI READ CAPACITY...").IsIndeterminate();
+            sense = _dev.ReadCapacity(out buffer, out senseBuffer, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            mediaTest.SupportsReadCapacity = true;
+
+            mediaTest.Blocks = ((ulong)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3]) &
+                                0xFFFFFFFF) + 1;
+
+            mediaTest.BlockSize = (uint)((buffer[5] << 24) + (buffer[5] << 16) + (buffer[6] << 8) + buffer[7]);
         }
 
-        /// <summary>Creates a report for media inserted into an MMC device</summary>
-        /// <param name="mediaType">Expected media type name</param>
-        /// <param name="tryPlextor">Try Plextor vendor commands</param>
-        /// <param name="tryPioneer">Try Pioneer vendor commands</param>
-        /// <param name="tryNec">Try NEC vendor commands</param>
-        /// <param name="tryHldtst">Try HL-DT-ST vendor commands</param>
-        /// <param name="tryMediaTekF106">Try MediaTek vendor commands</param>
-        /// <returns></returns>
-        public TestedMedia ReportMmcMedia(string mediaType, bool tryPlextor, bool tryPioneer, bool tryNec,
-                                          bool tryHldtst, bool tryMediaTekF106)
+        Spectre.ProgressSingleSpinner(ctx =>
         {
-            bool   sense       = true;
-            byte[] buffer      = Array.Empty<byte>();
-            byte[] senseBuffer = Array.Empty<byte>();
-            var    mediaTest   = new TestedMedia();
+            ctx.AddTask("Querying SCSI READ CAPACITY (16)...").IsIndeterminate();
+            sense = _dev.ReadCapacity16(out buffer, out buffer, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            mediaTest.SupportsReadCapacity16 = true;
+            byte[] temp = new byte[8];
+            Array.Copy(buffer, 0, temp, 0, 8);
+            Array.Reverse(temp);
+            mediaTest.Blocks    = BitConverter.ToUInt64(temp, 0) + 1;
+            mediaTest.BlockSize = (uint)((buffer[5] << 24) + (buffer[5] << 16) + (buffer[6] << 8) + buffer[7]);
+        }
+
+        Modes.DecodedMode? decMode = null;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI MODE SENSE (10)...").IsIndeterminate();
+
+            sense = _dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current,
+                                     0x3F, 0x00, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            decMode = Modes.DecodeMode10(buffer, _dev.ScsiType);
+
+            mediaTest.ModeSense10Data = buffer;
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI MODE SENSE...").IsIndeterminate();
+            sense = _dev.ModeSense(out buffer, out senseBuffer, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            decMode ??= Modes.DecodeMode6(buffer, _dev.ScsiType);
+
+            mediaTest.ModeSense6Data = buffer;
+        }
+
+        if(decMode != null)
+        {
+            mediaTest.MediumType = (byte?)decMode?.Header.MediumType;
+
+            if(decMode?.Header.BlockDescriptors?.Length > 0)
+                mediaTest.Density = (byte?)decMode?.Header.BlockDescriptors?[0].Density;
+        }
+
+        if(mediaType.StartsWith("CD-", StringComparison.Ordinal)   ||
+           mediaType.StartsWith("DDCD-", StringComparison.Ordinal) ||
+           mediaType == "Audio CD")
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying CD TOC...").IsIndeterminate();
+
+                mediaTest.CanReadTOC =
+                    !_dev.ReadTocPmaAtip(out buffer, out senseBuffer, false, 0, 0, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadTOC);
+            mediaTest.TocData = buffer;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
-                ctx.AddTask("Querying SCSI READ CAPACITY...").IsIndeterminate();
-                sense = _dev.ReadCapacity(out buffer, out senseBuffer, _dev.Timeout, out _);
+                ctx.AddTask("Querying CD Full TOC...").IsIndeterminate();
+                mediaTest.CanReadFullTOC = !_dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
             });
 
-            if(!sense &&
-               !_dev.Error)
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadFullTOC);
+            mediaTest.FullTocData = buffer;
+        }
+
+        if(mediaType.StartsWith("CD-R", StringComparison.Ordinal) ||
+           mediaType.StartsWith("DDCD-R", StringComparison.Ordinal))
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
             {
-                mediaTest.SupportsReadCapacity = true;
+                ctx.AddTask("Querying CD ATIP...").IsIndeterminate();
+                mediaTest.CanReadATIP = !_dev.ReadAtip(out buffer, out senseBuffer, _dev.Timeout, out _);
+            });
 
-                mediaTest.Blocks = ((ulong)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3]) &
-                                    0xFFFFFFFF) + 1;
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadATIP);
 
-                mediaTest.BlockSize = (uint)((buffer[5] << 24) + (buffer[5] << 16) + (buffer[6] << 8) + buffer[7]);
-            }
+            mediaTest.AtipData = buffer;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
-                ctx.AddTask("Querying SCSI READ CAPACITY (16)...").IsIndeterminate();
-                sense = _dev.ReadCapacity16(out buffer, out buffer, _dev.Timeout, out _);
+                ctx.AddTask("Querying CD PMA...").IsIndeterminate();
+                mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _);
             });
 
-            if(!sense &&
-               !_dev.Error)
-            {
-                mediaTest.SupportsReadCapacity16 = true;
-                byte[] temp = new byte[8];
-                Array.Copy(buffer, 0, temp, 0, 8);
-                Array.Reverse(temp);
-                mediaTest.Blocks    = BitConverter.ToUInt64(temp, 0) + 1;
-                mediaTest.BlockSize = (uint)((buffer[5] << 24) + (buffer[5] << 16) + (buffer[6] << 8) + buffer[7]);
-            }
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPMA);
 
-            Modes.DecodedMode? decMode = null;
+            mediaTest.PmaData = buffer;
+        }
+
+        if(mediaType.StartsWith("DVD-", StringComparison.Ordinal)    ||
+           mediaType.StartsWith("DVD+", StringComparison.Ordinal)    ||
+           mediaType.StartsWith("HD DVD-", StringComparison.Ordinal) ||
+           mediaType.StartsWith("PD-", StringComparison.Ordinal))
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying DVD PFI...").IsIndeterminate();
+
+                mediaTest.CanReadPFI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                               MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                               MmcDiscStructureFormat.PhysicalInformation, 0,
+                                                               _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPFI);
+
+            mediaTest.PfiData = buffer;
 
             Spectre.ProgressSingleSpinner(ctx =>
             {
-                ctx.AddTask("Querying SCSI MODE SENSE (10)...").IsIndeterminate();
+                ctx.AddTask("Querying DVD DMI...").IsIndeterminate();
 
-                sense = _dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current,
-                                         0x3F, 0x00, _dev.Timeout, out _);
+                mediaTest.CanReadDMI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                               MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                               MmcDiscStructureFormat.DiscManufacturingInformation,
+                                                               0, _dev.Timeout, out _);
             });
 
-            if(!sense &&
-               !_dev.Error)
-            {
-                decMode = Modes.DecodeMode10(buffer, _dev.ScsiType);
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDMI);
 
-                mediaTest.ModeSense10Data = buffer;
-            }
+            mediaTest.DmiData = buffer;
+        }
 
+        if(mediaType == "DVD-ROM")
+        {
             Spectre.ProgressSingleSpinner(ctx =>
             {
-                ctx.AddTask("Querying SCSI MODE SENSE...").IsIndeterminate();
-                sense = _dev.ModeSense(out buffer, out senseBuffer, _dev.Timeout, out _);
+                ctx.AddTask("Querying DVD CMI...").IsIndeterminate();
+
+                mediaTest.CanReadCMI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                               MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                               MmcDiscStructureFormat.CopyrightInformation, 0,
+                                                               _dev.Timeout, out _);
             });
 
-            if(!sense &&
-               !_dev.Error)
-            {
-                decMode ??= Modes.DecodeMode6(buffer, _dev.ScsiType);
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCMI);
 
-                mediaTest.ModeSense6Data = buffer;
-            }
+            mediaTest.CmiData = buffer;
+        }
 
-            if(decMode != null)
-            {
-                mediaTest.MediumType = (byte?)decMode?.Header.MediumType;
-
-                if(decMode?.Header.BlockDescriptors?.Length > 0)
-                    mediaTest.Density = (byte?)decMode?.Header.BlockDescriptors?[0].Density;
-            }
-
-            if(mediaType.StartsWith("CD-", StringComparison.Ordinal)   ||
-               mediaType.StartsWith("DDCD-", StringComparison.Ordinal) ||
-               mediaType == "Audio CD")
-            {
+        switch(mediaType)
+        {
+            case "DVD-ROM":
+            case "HD DVD-ROM":
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Querying CD TOC...").IsIndeterminate();
+                    ctx.AddTask("Querying DVD BCA...").IsIndeterminate();
 
-                    mediaTest.CanReadTOC =
-                        !_dev.ReadTocPmaAtip(out buffer, out senseBuffer, false, 0, 0, _dev.Timeout, out _);
+                    mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                                   MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                                   MmcDiscStructureFormat.BurstCuttingArea, 0,
+                                                                   _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadTOC);
-                mediaTest.TocData = buffer;
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadBCA);
+
+                mediaTest.DvdBcaData = buffer;
 
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Querying CD Full TOC...").IsIndeterminate();
-                    mediaTest.CanReadFullTOC = !_dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
+                    ctx.AddTask("Querying DVD AACS...").IsIndeterminate();
+
+                    mediaTest.CanReadAACS = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                                    MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                                    MmcDiscStructureFormat.DvdAacs, 0, _dev.Timeout,
+                                                                    out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadFullTOC);
-                mediaTest.FullTocData = buffer;
-            }
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadAACS);
 
-            if(mediaType.StartsWith("CD-R", StringComparison.Ordinal) ||
-               mediaType.StartsWith("DDCD-R", StringComparison.Ordinal))
-            {
+                mediaTest.DvdAacsData = buffer;
+
+                break;
+            case "Nintendo GameCube game":
+            case "Nintendo Wii game":
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Querying CD ATIP...").IsIndeterminate();
-                    mediaTest.CanReadATIP = !_dev.ReadAtip(out buffer, out senseBuffer, _dev.Timeout, out _);
+                    ctx.AddTask("Querying DVD BCA...").IsIndeterminate();
+
+                    mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                                   MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                                   MmcDiscStructureFormat.BurstCuttingArea, 0,
+                                                                   _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadATIP);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadBCA);
 
-                mediaTest.AtipData = buffer;
+                mediaTest.DvdBcaData = buffer;
 
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Querying CD PMA...").IsIndeterminate();
-                    mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPMA);
-
-                mediaTest.PmaData = buffer;
-            }
-
-            if(mediaType.StartsWith("DVD-", StringComparison.Ordinal)    ||
-               mediaType.StartsWith("DVD+", StringComparison.Ordinal)    ||
-               mediaType.StartsWith("HD DVD-", StringComparison.Ordinal) ||
-               mediaType.StartsWith("PD-", StringComparison.Ordinal))
-            {
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
                     ctx.AddTask("Querying DVD PFI...").IsIndeterminate();
@@ -750,1520 +845,1424 @@ namespace Aaru.Core.Devices.Report
                 AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDMI);
 
                 mediaTest.DmiData = buffer;
-            }
 
-            if(mediaType == "DVD-ROM")
-            {
+                break;
+            case "BD-ROM":
+            case "Ultra HD Blu-ray movie":
+            case "PlayStation 3 game":
+            case "PlayStation 4 game":
+            case "PlayStation 5 game":
+            case "Xbox One game":
+            case "Nintendo Wii U game":
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Querying DVD CMI...").IsIndeterminate();
+                    ctx.AddTask("Querying BD BCA...").IsIndeterminate();
 
-                    mediaTest.CanReadCMI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                   MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                   MmcDiscStructureFormat.CopyrightInformation, 0,
+                    mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                                   MmcDiscStructureMediaType.Bd, 0, 0,
+                                                                   MmcDiscStructureFormat.BdBurstCuttingArea, 0,
                                                                    _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCMI);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadBCA);
 
-                mediaTest.CmiData = buffer;
-            }
+                mediaTest.BluBcaData = buffer;
 
-            switch(mediaType)
-            {
-                case "DVD-ROM":
-                case "HD DVD-ROM":
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying DVD BCA...").IsIndeterminate();
-
-                        mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                       MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                       MmcDiscStructureFormat.BurstCuttingArea, 0,
-                                                                       _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadBCA);
-
-                    mediaTest.DvdBcaData = buffer;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying DVD AACS...").IsIndeterminate();
-
-                        mediaTest.CanReadAACS = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                        MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                        MmcDiscStructureFormat.DvdAacs, 0, _dev.Timeout,
-                                                                        out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadAACS);
-
-                    mediaTest.DvdAacsData = buffer;
-
-                    break;
-                case "Nintendo GameCube game":
-                case "Nintendo Wii game":
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying DVD BCA...").IsIndeterminate();
-
-                        mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                       MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                       MmcDiscStructureFormat.BurstCuttingArea, 0,
-                                                                       _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadBCA);
-
-                    mediaTest.DvdBcaData = buffer;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying DVD PFI...").IsIndeterminate();
-
-                        mediaTest.CanReadPFI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                       MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                       MmcDiscStructureFormat.PhysicalInformation, 0,
-                                                                       _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPFI);
-
-                    mediaTest.PfiData = buffer;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying DVD DMI...").IsIndeterminate();
-
-                        mediaTest.CanReadDMI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                       MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                       MmcDiscStructureFormat.DiscManufacturingInformation,
-                                                                       0, _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDMI);
-
-                    mediaTest.DmiData = buffer;
-
-                    break;
-                case "BD-ROM":
-                case "Ultra HD Blu-ray movie":
-                case "PlayStation 3 game":
-                case "PlayStation 4 game":
-                case "PlayStation 5 game":
-                case "Xbox One game":
-                case "Nintendo Wii U game":
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying BD BCA...").IsIndeterminate();
-
-                        mediaTest.CanReadBCA = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                       MmcDiscStructureMediaType.Bd, 0, 0,
-                                                                       MmcDiscStructureFormat.BdBurstCuttingArea, 0,
-                                                                       _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadBCA);
-
-                    mediaTest.BluBcaData = buffer;
-
-                    break;
-                case "DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)":
-                case "DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)":
-                case "HD DVD-RAM":
-                case "PD-650":
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying Disc Definition Structure...").IsIndeterminate();
-
-                        mediaTest.CanReadDDS = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                       MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                       MmcDiscStructureFormat.DvdramDds, 0,
-                                                                       _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDDS);
-
-                    mediaTest.DvdDdsData = buffer;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying Spare Area Information...").IsIndeterminate();
-
-                        mediaTest.CanReadSpareAreaInformation =
-                            !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                    MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, _dev.Timeout,
-                                                    out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadSpareAreaInformation);
-
-                    mediaTest.DvdSaiData = buffer;
-
-                    break;
-            }
-
-            if(mediaType.StartsWith("BD-R", StringComparison.Ordinal) &&
-               mediaType != "BD-ROM")
-            {
+                break;
+            case "DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)":
+            case "DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)":
+            case "HD DVD-RAM":
+            case "PD-650":
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Querying BD DDS...").IsIndeterminate();
+                    ctx.AddTask("Querying Disc Definition Structure...").IsIndeterminate();
 
                     mediaTest.CanReadDDS = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                   MmcDiscStructureMediaType.Bd, 0, 0,
-                                                                   MmcDiscStructureFormat.BdDds, 0, _dev.Timeout,
-                                                                   out _);
+                                                                   MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                                   MmcDiscStructureFormat.DvdramDds, 0,
+                                                                   _dev.Timeout, out _);
                 });
 
                 AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDDS);
 
-                mediaTest.BluDdsData = buffer;
+                mediaTest.DvdDdsData = buffer;
 
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Querying BD SAI...").IsIndeterminate();
+                    ctx.AddTask("Querying Spare Area Information...").IsIndeterminate();
 
                     mediaTest.CanReadSpareAreaInformation =
-                        !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                MmcDiscStructureFormat.BdSpareAreaInformation, 0, _dev.Timeout, out _);
+                        !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, _dev.Timeout,
+                                                out _);
                 });
 
                 AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadSpareAreaInformation);
 
-                mediaTest.BluSaiData = buffer;
-            }
+                mediaTest.DvdSaiData = buffer;
 
-            if(mediaType == "DVD-R" ||
-               mediaType == "DVD-RW")
+                break;
+        }
+
+        if(mediaType.StartsWith("BD-R", StringComparison.Ordinal) &&
+           mediaType != "BD-ROM")
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
             {
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Querying DVD PRI...").IsIndeterminate();
+                ctx.AddTask("Querying BD DDS...").IsIndeterminate();
 
-                    mediaTest.CanReadPRI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                mediaTest.CanReadDDS = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                               MmcDiscStructureMediaType.Bd, 0, 0,
+                                                               MmcDiscStructureFormat.BdDds, 0, _dev.Timeout,
+                                                               out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDDS);
+
+            mediaTest.BluDdsData = buffer;
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying BD SAI...").IsIndeterminate();
+
+                mediaTest.CanReadSpareAreaInformation =
+                    !_dev.ReadDiscStructure(out buffer, out senseBuffer, MmcDiscStructureMediaType.Bd, 0, 0,
+                                            MmcDiscStructureFormat.BdSpareAreaInformation, 0, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadSpareAreaInformation);
+
+            mediaTest.BluSaiData = buffer;
+        }
+
+        if(mediaType == "DVD-R" ||
+           mediaType == "DVD-RW")
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying DVD PRI...").IsIndeterminate();
+
+                mediaTest.CanReadPRI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                               MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                               MmcDiscStructureFormat.PreRecordedInfo, 0,
+                                                               _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPRI);
+
+            mediaTest.PriData = buffer;
+        }
+
+        if(mediaType == "DVD-R"  ||
+           mediaType == "DVD-RW" ||
+           mediaType == "HD DVD-R")
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying DVD Media ID...").IsIndeterminate();
+
+                mediaTest.CanReadMediaID = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
                                                                    MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                   MmcDiscStructureFormat.PreRecordedInfo, 0,
+                                                                   MmcDiscStructureFormat.DvdrMediaIdentifier, 0,
                                                                    _dev.Timeout, out _);
-                });
+            });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPRI);
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadMediaID);
 
-                mediaTest.PriData = buffer;
-            }
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying DVD Embossed PFI...").IsIndeterminate();
 
-            if(mediaType == "DVD-R"  ||
-               mediaType == "DVD-RW" ||
-               mediaType == "HD DVD-R")
+                mediaTest.CanReadRecordablePFI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                                         MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                                         MmcDiscStructureFormat.
+                                                                             DvdrPhysicalInformation, 0,
+                                                                         _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRecordablePFI);
+
+            mediaTest.EmbossedPfiData = buffer;
+        }
+
+        if(mediaType.StartsWith("DVD+R", StringComparison.Ordinal) ||
+           mediaType == "DVD+MRW")
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying DVD ADIP...").IsIndeterminate();
+
+                mediaTest.CanReadADIP = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                                MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                                MmcDiscStructureFormat.Adip, 0, _dev.Timeout,
+                                                                out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadADIP);
+
+            mediaTest.AdipData = buffer;
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying DVD DCB...").IsIndeterminate();
+
+                mediaTest.CanReadDCB = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                               MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                               MmcDiscStructureFormat.Dcb, 0, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDCB);
+
+            mediaTest.DcbData = buffer;
+        }
+
+        if(mediaType == "HD DVD-ROM")
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying HD DVD CMI...").IsIndeterminate();
+
+                mediaTest.CanReadHDCMI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                                 MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                                 MmcDiscStructureFormat.HddvdCopyrightInformation,
+                                                                 0, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadHDCMI);
+
+            mediaTest.HdCmiData = buffer;
+        }
+
+        if(mediaType.EndsWith(" DL", StringComparison.Ordinal))
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying DVD Layer Capacity...").IsIndeterminate();
+
+                mediaTest.CanReadLayerCapacity = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                                         MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                                         MmcDiscStructureFormat.DvdrLayerCapacity,
+                                                                         0, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadLayerCapacity);
+
+            mediaTest.DvdLayerData = buffer;
+        }
+
+        if(mediaType.StartsWith("BD-R", StringComparison.Ordinal) ||
+           mediaType == "Ultra HD Blu-ray movie"                  ||
+           mediaType == "PlayStation 3 game"                      ||
+           mediaType == "PlayStation 4 game"                      ||
+           mediaType == "PlayStation 5 game"                      ||
+           mediaType == "Xbox One game"                           ||
+           mediaType == "Nintendo Wii game")
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying BD Disc Information...").IsIndeterminate();
+
+                mediaTest.CanReadDiscInformation = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                                           MmcDiscStructureMediaType.Bd, 0, 0,
+                                                                           MmcDiscStructureFormat.DiscInformation,
+                                                                           0, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDiscInformation);
+
+            mediaTest.BluDiData = buffer;
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying BD PAC...").IsIndeterminate();
+
+                mediaTest.CanReadPAC = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
+                                                               MmcDiscStructureMediaType.Bd, 0, 0,
+                                                               MmcDiscStructureFormat.Pac, 0, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPAC);
+
+            mediaTest.BluPacData = buffer;
+        }
+
+        if(mediaType.StartsWith("CD-", StringComparison.Ordinal))
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying SCSI READ CD scrambled...").IsIndeterminate();
+
+                mediaTest.CanReadCdScrambled = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1,
+                                                            MmcSectorTypes.Cdda, false, false, false,
+                                                            MmcHeaderCodes.None, true, false, MmcErrorField.None,
+                                                            MmcSubchannel.None, _dev.Timeout, out _);
+            });
+
+            mediaTest.ReadCdScrambledData = buffer;
+        }
+
+        if(mediaType.StartsWith("PD-", StringComparison.Ordinal))
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying SCSI READ (6)...").IsIndeterminate();
+                mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 16, 512, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead6);
+
+            mediaTest.Read6Data = buffer;
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying SCSI READ (10)...").IsIndeterminate();
+
+                mediaTest.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false,
+                                                        16, 512, 0, 1, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead10);
+
+            mediaTest.Read10Data = buffer;
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying SCSI READ (12)...").IsIndeterminate();
+
+                mediaTest.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false,
+                                                        16, 512, 0, 1, false, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead12);
+
+            mediaTest.Read12Data = buffer;
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying SCSI READ (16)...").IsIndeterminate();
+
+                mediaTest.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 16, 512,
+                                                        0, 1, false, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead16);
+
+            mediaTest.Read16Data = buffer;
+        }
+        else
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying SCSI READ (6)...").IsIndeterminate();
+                mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 16, 2048, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead6);
+
+            mediaTest.Read6Data = buffer;
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying SCSI READ (10)...").IsIndeterminate();
+
+                mediaTest.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false,
+                                                        16, 2048, 0, 1, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead10);
+
+            mediaTest.Read10Data = buffer;
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying SCSI READ (12)...").IsIndeterminate();
+
+                mediaTest.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false,
+                                                        16, 2048, 0, 1, false, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead12);
+
+            mediaTest.Read12Data = buffer;
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying SCSI READ (16)...").IsIndeterminate();
+
+                mediaTest.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 16,
+                                                        2048, 0, 1, false, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead16);
+
+            mediaTest.Read16Data = buffer;
+        }
+
+        if(mediaType.StartsWith("CD-", StringComparison.Ordinal)   ||
+           mediaType.StartsWith("DDCD-", StringComparison.Ordinal) ||
+           mediaType == "Audio CD")
+        {
+            if(mediaType == "Audio CD")
             {
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Querying DVD Media ID...").IsIndeterminate();
+                    ctx.AddTask("Trying SCSI READ CD...").IsIndeterminate();
 
-                    mediaTest.CanReadMediaID = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                       MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                       MmcDiscStructureFormat.DvdrMediaIdentifier, 0,
-                                                                       _dev.Timeout, out _);
+                    mediaTest.SupportsReadCd = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1,
+                                                            MmcSectorTypes.Cdda, false, false, false,
+                                                            MmcHeaderCodes.None, true, false, MmcErrorField.None,
+                                                            MmcSubchannel.None, _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadMediaID);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCd);
+
+                mediaTest.ReadCdFullData = buffer;
 
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Querying DVD Embossed PFI...").IsIndeterminate();
+                    ctx.AddTask("Trying SCSI READ CD MSF...").IsIndeterminate();
 
-                    mediaTest.CanReadRecordablePFI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                             MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                             MmcDiscStructureFormat.
-                                                                                 DvdrPhysicalInformation, 0,
-                                                                             _dev.Timeout, out _);
+                    mediaTest.SupportsReadCdMsf = !_dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210,
+                                                                  0x00000211, 2352, MmcSectorTypes.Cdda, false,
+                                                                  false, MmcHeaderCodes.None, true, false,
+                                                                  MmcErrorField.None, MmcSubchannel.None,
+                                                                  _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRecordablePFI);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdMsf);
 
-                mediaTest.EmbossedPfiData = buffer;
-            }
-
-            if(mediaType.StartsWith("DVD+R", StringComparison.Ordinal) ||
-               mediaType == "DVD+MRW")
-            {
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Querying DVD ADIP...").IsIndeterminate();
-
-                    mediaTest.CanReadADIP = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                    MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                    MmcDiscStructureFormat.Adip, 0, _dev.Timeout,
-                                                                    out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadADIP);
-
-                mediaTest.AdipData = buffer;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Querying DVD DCB...").IsIndeterminate();
-
-                    mediaTest.CanReadDCB = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                   MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                   MmcDiscStructureFormat.Dcb, 0, _dev.Timeout, out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDCB);
-
-                mediaTest.DcbData = buffer;
-            }
-
-            if(mediaType == "HD DVD-ROM")
-            {
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Querying HD DVD CMI...").IsIndeterminate();
-
-                    mediaTest.CanReadHDCMI = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                     MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                     MmcDiscStructureFormat.HddvdCopyrightInformation,
-                                                                     0, _dev.Timeout, out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadHDCMI);
-
-                mediaTest.HdCmiData = buffer;
-            }
-
-            if(mediaType.EndsWith(" DL", StringComparison.Ordinal))
-            {
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Querying DVD Layer Capacity...").IsIndeterminate();
-
-                    mediaTest.CanReadLayerCapacity = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                             MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                                             MmcDiscStructureFormat.DvdrLayerCapacity,
-                                                                             0, _dev.Timeout, out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadLayerCapacity);
-
-                mediaTest.DvdLayerData = buffer;
-            }
-
-            if(mediaType.StartsWith("BD-R", StringComparison.Ordinal) ||
-               mediaType == "Ultra HD Blu-ray movie"                  ||
-               mediaType == "PlayStation 3 game"                      ||
-               mediaType == "PlayStation 4 game"                      ||
-               mediaType == "PlayStation 5 game"                      ||
-               mediaType == "Xbox One game"                           ||
-               mediaType == "Nintendo Wii game")
-            {
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Querying BD Disc Information...").IsIndeterminate();
-
-                    mediaTest.CanReadDiscInformation = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                               MmcDiscStructureMediaType.Bd, 0, 0,
-                                                                               MmcDiscStructureFormat.DiscInformation,
-                                                                               0, _dev.Timeout, out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadDiscInformation);
-
-                mediaTest.BluDiData = buffer;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Querying BD PAC...").IsIndeterminate();
-
-                    mediaTest.CanReadPAC = !_dev.ReadDiscStructure(out buffer, out senseBuffer,
-                                                                   MmcDiscStructureMediaType.Bd, 0, 0,
-                                                                   MmcDiscStructureFormat.Pac, 0, _dev.Timeout, out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPAC);
-
-                mediaTest.BluPacData = buffer;
-            }
-
-            if(mediaType.StartsWith("CD-", StringComparison.Ordinal))
-            {
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying SCSI READ CD scrambled...").IsIndeterminate();
-
-                    mediaTest.CanReadCdScrambled = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1,
-                                                                MmcSectorTypes.Cdda, false, false, false,
-                                                                MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                                                MmcSubchannel.None, _dev.Timeout, out _);
-                });
-
-                mediaTest.ReadCdScrambledData = buffer;
-            }
-
-            if(mediaType.StartsWith("PD-", StringComparison.Ordinal))
-            {
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying SCSI READ (6)...").IsIndeterminate();
-                    mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 16, 512, _dev.Timeout, out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead6);
-
-                mediaTest.Read6Data = buffer;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying SCSI READ (10)...").IsIndeterminate();
-
-                    mediaTest.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false,
-                                                            16, 512, 0, 1, _dev.Timeout, out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead10);
-
-                mediaTest.Read10Data = buffer;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying SCSI READ (12)...").IsIndeterminate();
-
-                    mediaTest.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false,
-                                                            16, 512, 0, 1, false, _dev.Timeout, out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead12);
-
-                mediaTest.Read12Data = buffer;
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying SCSI READ (16)...").IsIndeterminate();
-
-                    mediaTest.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 16, 512,
-                                                            0, 1, false, _dev.Timeout, out _);
-                });
-
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead16);
-
-                mediaTest.Read16Data = buffer;
+                mediaTest.ReadCdMsfFullData = buffer;
             }
             else
             {
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Trying SCSI READ (6)...").IsIndeterminate();
-                    mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 16, 2048, _dev.Timeout, out _);
+                    ctx.AddTask("Trying SCSI READ CD...").IsIndeterminate();
+
+                    mediaTest.SupportsReadCd = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2048, 1,
+                                                            MmcSectorTypes.AllTypes, false, false, false,
+                                                            MmcHeaderCodes.None, true, false, MmcErrorField.None,
+                                                            MmcSubchannel.None, _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead6);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCd);
 
-                mediaTest.Read6Data = buffer;
+                mediaTest.ReadCdData = buffer;
 
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Trying SCSI READ (10)...").IsIndeterminate();
+                    ctx.AddTask("Trying SCSI READ CD MSF...").IsIndeterminate();
 
-                    mediaTest.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, true, false, false,
-                                                            16, 2048, 0, 1, _dev.Timeout, out _);
+                    mediaTest.SupportsReadCdMsf = !_dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210,
+                                                                  0x00000211, 2048, MmcSectorTypes.AllTypes, false,
+                                                                  false, MmcHeaderCodes.None, true, false,
+                                                                  MmcErrorField.None, MmcSubchannel.None,
+                                                                  _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead10);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdMsf);
 
-                mediaTest.Read10Data = buffer;
+                mediaTest.ReadCdMsfData = buffer;
 
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Trying SCSI READ (12)...").IsIndeterminate();
+                    ctx.AddTask("Trying SCSI READ CD full sector...").IsIndeterminate();
 
-                    mediaTest.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, true, false, false,
-                                                            16, 2048, 0, 1, false, _dev.Timeout, out _);
+                    mediaTest.SupportsReadCdRaw = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1,
+                                                               MmcSectorTypes.AllTypes, false, false, true,
+                                                               MmcHeaderCodes.AllHeaders, true, true,
+                                                               MmcErrorField.None, MmcSubchannel.None, _dev.Timeout,
+                                                               out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead12);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdRaw);
 
-                mediaTest.Read12Data = buffer;
+                mediaTest.ReadCdFullData = buffer;
 
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Trying SCSI READ (16)...").IsIndeterminate();
+                    ctx.AddTask("Trying SCSI READ CD MSF full sector...").IsIndeterminate();
 
-                    mediaTest.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, true, false, 16,
-                                                            2048, 0, 1, false, _dev.Timeout, out _);
+                    mediaTest.SupportsReadCdMsfRaw = !_dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210,
+                                                                     0x00000211, 2352, MmcSectorTypes.AllTypes,
+                                                                     false, false, MmcHeaderCodes.AllHeaders, true,
+                                                                     true, MmcErrorField.None, MmcSubchannel.None,
+                                                                     _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead16);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdMsfRaw);
 
-                mediaTest.Read16Data = buffer;
+                mediaTest.ReadCdMsfFullData = buffer;
             }
 
-            if(mediaType.StartsWith("CD-", StringComparison.Ordinal)   ||
-               mediaType.StartsWith("DDCD-", StringComparison.Ordinal) ||
-               mediaType == "Audio CD")
+            if(mediaTest.SupportsReadCdRaw == true ||
+               mediaType                   == "Audio CD")
             {
-                if(mediaType == "Audio CD")
+                Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    Spectre.ProgressSingleSpinner(ctx =>
+                    ctx.AddTask("Trying to read CD Track 1 pre-gap...").IsIndeterminate();
+
+                    for(int i = -10; i < 0; i++)
                     {
-                        ctx.AddTask("Trying SCSI READ CD...").IsIndeterminate();
-
-                        mediaTest.SupportsReadCd = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1,
-                                                                MmcSectorTypes.Cdda, false, false, false,
-                                                                MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                                                MmcSubchannel.None, _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCd);
-
-                    mediaTest.ReadCdFullData = buffer;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying SCSI READ CD MSF...").IsIndeterminate();
-
-                        mediaTest.SupportsReadCdMsf = !_dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210,
-                                                                      0x00000211, 2352, MmcSectorTypes.Cdda, false,
-                                                                      false, MmcHeaderCodes.None, true, false,
-                                                                      MmcErrorField.None, MmcSubchannel.None,
-                                                                      _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdMsf);
-
-                    mediaTest.ReadCdMsfFullData = buffer;
-                }
-                else
-                {
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying SCSI READ CD...").IsIndeterminate();
-
-                        mediaTest.SupportsReadCd = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2048, 1,
-                                                                MmcSectorTypes.AllTypes, false, false, false,
-                                                                MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                                                MmcSubchannel.None, _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCd);
-
-                    mediaTest.ReadCdData = buffer;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying SCSI READ CD MSF...").IsIndeterminate();
-
-                        mediaTest.SupportsReadCdMsf = !_dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210,
-                                                                      0x00000211, 2048, MmcSectorTypes.AllTypes, false,
-                                                                      false, MmcHeaderCodes.None, true, false,
-                                                                      MmcErrorField.None, MmcSubchannel.None,
-                                                                      _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdMsf);
-
-                    mediaTest.ReadCdMsfData = buffer;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying SCSI READ CD full sector...").IsIndeterminate();
-
-                        mediaTest.SupportsReadCdRaw = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2352, 1,
-                                                                   MmcSectorTypes.AllTypes, false, false, true,
-                                                                   MmcHeaderCodes.AllHeaders, true, true,
-                                                                   MmcErrorField.None, MmcSubchannel.None, _dev.Timeout,
-                                                                   out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdRaw);
-
-                    mediaTest.ReadCdFullData = buffer;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying SCSI READ CD MSF full sector...").IsIndeterminate();
-
-                        mediaTest.SupportsReadCdMsfRaw = !_dev.ReadCdMsf(out buffer, out senseBuffer, 0x00000210,
-                                                                         0x00000211, 2352, MmcSectorTypes.AllTypes,
-                                                                         false, false, MmcHeaderCodes.AllHeaders, true,
-                                                                         true, MmcErrorField.None, MmcSubchannel.None,
-                                                                         _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsReadCdMsfRaw);
-
-                    mediaTest.ReadCdMsfFullData = buffer;
-                }
-
-                if(mediaTest.SupportsReadCdRaw == true ||
-                   mediaType                   == "Audio CD")
-                {
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to read CD Track 1 pre-gap...").IsIndeterminate();
-
-                        for(int i = -10; i < 0; i++)
-                        {
-                            // ReSharper disable IntVariableOverflowInUncheckedContext
-                            if(mediaType == "Audio CD")
-                                sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.Cdda,
-                                                    false, false, false, MmcHeaderCodes.None, true, false,
-                                                    MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out _);
-                            else
-                                sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1,
-                                                    MmcSectorTypes.AllTypes, false, false, true,
-                                                    MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                                    MmcSubchannel.None, _dev.Timeout, out _);
-
-                            // ReSharper restore IntVariableOverflowInUncheckedContext
-
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", sense);
-
-                            mediaTest.Track1PregapData = buffer;
-
-                            if(sense)
-                                continue;
-
-                            mediaTest.CanReadFirstTrackPreGap = true;
-
-                            break;
-                        }
-                    });
-
-                    mediaTest.CanReadFirstTrackPreGap ??= false;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to read CD Lead-In...").IsIndeterminate();
-
-                        foreach(int i in new[]
-                        {
-                            -5000, -4000, -3000, -2000, -1000, -500, -250
-                        })
-                        {
-                            if(mediaType == "Audio CD")
-                                sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.Cdda,
-                                                    false, false, false, MmcHeaderCodes.None, true, false,
-                                                    MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out _);
-                            else
-                                sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1,
-                                                    MmcSectorTypes.AllTypes, false, false, true,
-                                                    MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                                    MmcSubchannel.None, _dev.Timeout, out _);
-
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", sense);
-
-                            mediaTest.LeadInData = buffer;
-
-                            if(sense)
-                                continue;
-
-                            mediaTest.CanReadLeadIn = true;
-
-                            break;
-                        }
-                    });
-
-                    mediaTest.CanReadLeadIn ??= false;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to read CD Lead-Out...").IsIndeterminate();
-
+                        // ReSharper disable IntVariableOverflowInUncheckedContext
                         if(mediaType == "Audio CD")
-                            mediaTest.CanReadLeadOut = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                    (uint)(mediaTest.Blocks + 1), 2352, 1,
-                                                                    MmcSectorTypes.Cdda, false, false, false,
-                                                                    MmcHeaderCodes.None, true, false,
-                                                                    MmcErrorField.None, MmcSubchannel.None,
-                                                                    _dev.Timeout, out _);
+                            sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.Cdda,
+                                                false, false, false, MmcHeaderCodes.None, true, false,
+                                                MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out _);
                         else
-                            mediaTest.CanReadLeadOut = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                    (uint)(mediaTest.Blocks + 1), 2352, 1,
-                                                                    MmcSectorTypes.AllTypes, false, false, true,
-                                                                    MmcHeaderCodes.AllHeaders, true, true,
-                                                                    MmcErrorField.None, MmcSubchannel.None,
-                                                                    _dev.Timeout, out _);
-                    });
+                            sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1,
+                                                MmcSectorTypes.AllTypes, false, false, true,
+                                                MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                                MmcSubchannel.None, _dev.Timeout, out _);
 
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadLeadOut);
+                        // ReSharper restore IntVariableOverflowInUncheckedContext
 
-                    mediaTest.LeadOutData = buffer;
-                }
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", sense);
 
-                if(mediaType == "Audio CD")
+                        mediaTest.Track1PregapData = buffer;
+
+                        if(sense)
+                            continue;
+
+                        mediaTest.CanReadFirstTrackPreGap = true;
+
+                        break;
+                    }
+                });
+
+                mediaTest.CanReadFirstTrackPreGap ??= false;
+
+                Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to read C2 Pointers...").IsIndeterminate();
-                        mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _);
+                    ctx.AddTask("Trying to read CD Lead-In...").IsIndeterminate();
 
-                        // They return OK, but then all following commands make the drive fail miserably.
-                        if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
-                            mediaTest.CanReadC2Pointers = false;
+                    foreach(int i in new[]
+                            {
+                                -5000, -4000, -3000, -2000, -1000, -500, -250
+                            })
+                    {
+                        if(mediaType == "Audio CD")
+                            sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1, MmcSectorTypes.Cdda,
+                                                false, false, false, MmcHeaderCodes.None, true, false,
+                                                MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out _);
                         else
-                        {
-                            mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2646, 1,
-                                                                       MmcSectorTypes.Cdda, false, false, false,
-                                                                       MmcHeaderCodes.None, true, false,
-                                                                       MmcErrorField.C2Pointers, MmcSubchannel.None,
-                                                                       _dev.Timeout, out _);
+                            sense = _dev.ReadCd(out buffer, out senseBuffer, (uint)i, 2352, 1,
+                                                MmcSectorTypes.AllTypes, false, false, true,
+                                                MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                                MmcSubchannel.None, _dev.Timeout, out _);
 
-                            if(!mediaTest.CanReadC2Pointers == true)
-                                mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2648, 1,
-                                                                           MmcSectorTypes.Cdda, false, false, false,
-                                                                           MmcHeaderCodes.None, true, false,
-                                                                           MmcErrorField.C2PointersAndBlock,
-                                                                           MmcSubchannel.None, _dev.Timeout, out _);
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", sense);
 
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadC2Pointers);
+                        mediaTest.LeadInData = buffer;
 
-                            mediaTest.C2PointersData = buffer;
-                        }
-                    });
+                        if(sense)
+                            continue;
 
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to read subchannels...").IsIndeterminate();
+                        mediaTest.CanReadLeadIn = true;
 
-                        mediaTest.CanReadPQSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2368, 1,
-                                                                     MmcSectorTypes.Cdda, false, false, false,
-                                                                     MmcHeaderCodes.None, true, false,
-                                                                     MmcErrorField.None, MmcSubchannel.Q16,
-                                                                     _dev.Timeout, out _);
+                        break;
+                    }
+                });
 
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannel);
+                mediaTest.CanReadLeadIn ??= false;
 
-                        mediaTest.PQSubchannelData = buffer;
-
-                        mediaTest.CanReadRWSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2448, 1,
-                                                                     MmcSectorTypes.Cdda, false, false, false,
-                                                                     MmcHeaderCodes.None, true, false,
-                                                                     MmcErrorField.None, MmcSubchannel.Raw,
-                                                                     _dev.Timeout, out _);
-
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannel);
-
-                        mediaTest.RWSubchannelData = buffer;
-
-                        mediaTest.CanReadCorrectedSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2448, 1,
-                                                                            MmcSectorTypes.Cdda, false, false, false,
-                                                                            MmcHeaderCodes.None, true, false,
-                                                                            MmcErrorField.None, MmcSubchannel.Rw,
-                                                                            _dev.Timeout, out _);
-
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannel);
-
-                        mediaTest.CorrectedSubchannelData = buffer;
-                    });
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to read subchannels with C2 Pointers...").IsIndeterminate();
-                        mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _);
-
-                        // They return OK, but then all following commands make the drive fail miserably.
-                        if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
-                        {
-                            mediaTest.CanReadPQSubchannelWithC2        = false;
-                            mediaTest.CanReadRWSubchannelWithC2        = false;
-                            mediaTest.CanReadCorrectedSubchannelWithC2 = false;
-                        }
-                        else
-                        {
-                            mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2662, 1,
-                                                                               MmcSectorTypes.Cdda, false, false, false,
-                                                                               MmcHeaderCodes.None, true, false,
-                                                                               MmcErrorField.C2Pointers,
-                                                                               MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                            if(mediaTest.CanReadPQSubchannelWithC2 == false)
-                                mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 11,
-                                                                          2664, 1, MmcSectorTypes.Cdda, false,
-                                                                          false, false, MmcHeaderCodes.None, true,
-                                                                          false, MmcErrorField.C2PointersAndBlock,
-                                                                          MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                       !mediaTest.CanReadPQSubchannelWithC2);
-
-                            mediaTest.PQSubchannelWithC2Data = buffer;
-
-                            mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2712, 1,
-                                                                               MmcSectorTypes.Cdda, false, false, false,
-                                                                               MmcHeaderCodes.None, true, false,
-                                                                               MmcErrorField.C2Pointers,
-                                                                               MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                            if(mediaTest.CanReadRWSubchannelWithC2 == false)
-                                mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 11,
-                                                                          2714, 1, MmcSectorTypes.Cdda, false,
-                                                                          false, false, MmcHeaderCodes.None, true,
-                                                                          false, MmcErrorField.C2PointersAndBlock,
-                                                                          MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                       !mediaTest.CanReadRWSubchannelWithC2);
-
-                            mediaTest.RWSubchannelWithC2Data = buffer;
-
-                            mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 11,
-                                                                             2712, 1, MmcSectorTypes.Cdda, false,
-                                                                             false, false, MmcHeaderCodes.None,
-                                                                             true, false, MmcErrorField.C2Pointers,
-                                                                             MmcSubchannel.Rw, _dev.Timeout,
-                                                                             out _);
-
-                            if(mediaTest.CanReadCorrectedSubchannelWithC2 == false)
-                                mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                                 11, 2714, 1, MmcSectorTypes.Cdda,
-                                                                                 false, false, false,
-                                                                                 MmcHeaderCodes.None, true, false,
-                                                                                 MmcErrorField.C2PointersAndBlock,
-                                                                                 MmcSubchannel.Rw, _dev.Timeout,
-                                                                                 out _);
-
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                       !mediaTest.CanReadCorrectedSubchannelWithC2);
-
-                            mediaTest.CorrectedSubchannelWithC2Data = buffer;
-                        }
-                    });
-                }
-                else if(mediaTest.SupportsReadCdRaw == true)
+                Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to read C2 Pointers...").IsIndeterminate();
+                    ctx.AddTask("Trying to read CD Lead-Out...").IsIndeterminate();
 
-                        // They return OK, but then all following commands make the drive fail miserably.
-                        if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
-                            mediaTest.CanReadC2Pointers = false;
-                        else
-                        {
-                            mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2646, 1,
-                                                                       MmcSectorTypes.AllTypes, false, false, true,
-                                                                       MmcHeaderCodes.AllHeaders, true, true,
-                                                                       MmcErrorField.C2Pointers, MmcSubchannel.None,
-                                                                       _dev.Timeout, out _);
+                    if(mediaType == "Audio CD")
+                        mediaTest.CanReadLeadOut = !_dev.ReadCd(out buffer, out senseBuffer,
+                                                                (uint)(mediaTest.Blocks + 1), 2352, 1,
+                                                                MmcSectorTypes.Cdda, false, false, false,
+                                                                MmcHeaderCodes.None, true, false,
+                                                                MmcErrorField.None, MmcSubchannel.None,
+                                                                _dev.Timeout, out _);
+                    else
+                        mediaTest.CanReadLeadOut = !_dev.ReadCd(out buffer, out senseBuffer,
+                                                                (uint)(mediaTest.Blocks + 1), 2352, 1,
+                                                                MmcSectorTypes.AllTypes, false, false, true,
+                                                                MmcHeaderCodes.AllHeaders, true, true,
+                                                                MmcErrorField.None, MmcSubchannel.None,
+                                                                _dev.Timeout, out _);
+                });
 
-                            if(mediaTest.CanReadC2Pointers == false)
-                                mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2648, 1,
-                                                                           MmcSectorTypes.AllTypes, false, false, true,
-                                                                           MmcHeaderCodes.AllHeaders, true, true,
-                                                                           MmcErrorField.C2PointersAndBlock,
-                                                                           MmcSubchannel.None, _dev.Timeout, out _);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadLeadOut);
 
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadC2Pointers);
+                mediaTest.LeadOutData = buffer;
+            }
 
-                            mediaTest.C2PointersData = buffer;
-                        }
-                    });
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to read subchannels...").IsIndeterminate();
-
-                        mediaTest.CanReadPQSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2368, 1,
-                                                                     MmcSectorTypes.AllTypes, false, false, true,
-                                                                     MmcHeaderCodes.AllHeaders, true, true,
-                                                                     MmcErrorField.None, MmcSubchannel.Q16,
-                                                                     _dev.Timeout, out _);
-
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannel);
-
-                        mediaTest.PQSubchannelData = buffer;
-
-                        mediaTest.CanReadRWSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2448, 1,
-                                                                     MmcSectorTypes.AllTypes, false, false, true,
-                                                                     MmcHeaderCodes.AllHeaders, true, true,
-                                                                     MmcErrorField.None, MmcSubchannel.Raw,
-                                                                     _dev.Timeout, out _);
-
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannel);
-
-                        mediaTest.RWSubchannelData = buffer;
-
-                        mediaTest.CanReadCorrectedSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2448, 1,
-                                                                            MmcSectorTypes.AllTypes, false, false, true,
-                                                                            MmcHeaderCodes.AllHeaders, true, true,
-                                                                            MmcErrorField.None, MmcSubchannel.Rw,
-                                                                            _dev.Timeout, out _);
-
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannel);
-
-                        mediaTest.CorrectedSubchannelData = buffer;
-                    });
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to read subchannels with C2 Pointers...").IsIndeterminate();
-
-                        if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
-                        {
-                            mediaTest.CanReadPQSubchannelWithC2        = false;
-                            mediaTest.CanReadRWSubchannelWithC2        = false;
-                            mediaTest.CanReadCorrectedSubchannelWithC2 = false;
-                        }
-                        else
-                        {
-                            mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2662, 1,
-                                                                               MmcSectorTypes.AllTypes, false, false,
-                                                                               true, MmcHeaderCodes.AllHeaders, true,
-                                                                               true, MmcErrorField.C2Pointers,
-                                                                               MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                            if(mediaTest.CanReadPQSubchannelWithC2 == false)
-                                mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
-                                                                          2664, 1, MmcSectorTypes.AllTypes, false,
-                                                                          false, true, MmcHeaderCodes.AllHeaders,
-                                                                          true, true,
-                                                                          MmcErrorField.C2PointersAndBlock,
-                                                                          MmcSubchannel.Q16, _dev.Timeout, out _);
-
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                       !mediaTest.CanReadPQSubchannelWithC2);
-
-                            mediaTest.PQSubchannelWithC2Data = buffer;
-
-                            mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2712, 1,
-                                                                               MmcSectorTypes.AllTypes, false, false,
-                                                                               true, MmcHeaderCodes.AllHeaders, true,
-                                                                               true, MmcErrorField.C2Pointers,
-                                                                               MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                            if(mediaTest.CanReadRWSubchannelWithC2 == false)
-                                mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
-                                                                          2714, 1, MmcSectorTypes.AllTypes, false,
-                                                                          false, true, MmcHeaderCodes.AllHeaders,
-                                                                          true, true,
-                                                                          MmcErrorField.C2PointersAndBlock,
-                                                                          MmcSubchannel.Raw, _dev.Timeout, out _);
-
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                       !mediaTest.CanReadRWSubchannelWithC2);
-
-                            mediaTest.RWSubchannelWithC2Data = buffer;
-
-                            mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
-                                                                             2712, 1, MmcSectorTypes.AllTypes,
-                                                                             false, false, true,
-                                                                             MmcHeaderCodes.AllHeaders, true, true,
-                                                                             MmcErrorField.C2Pointers,
-                                                                             MmcSubchannel.Rw, _dev.Timeout,
-                                                                             out _);
-
-                            if(mediaTest.CanReadCorrectedSubchannelWithC2 == false)
-                                mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                                 16, 2714, 1,
-                                                                                 MmcSectorTypes.AllTypes, false,
-                                                                                 false, true,
-                                                                                 MmcHeaderCodes.AllHeaders, true,
-                                                                                 true,
-                                                                                 MmcErrorField.C2PointersAndBlock,
-                                                                                 MmcSubchannel.Rw, _dev.Timeout,
-                                                                                 out _);
-
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                       !mediaTest.CanReadCorrectedSubchannelWithC2);
-
-                            mediaTest.CorrectedSubchannelWithC2Data = buffer;
-                        }
-                    });
-                }
-                else
+            if(mediaType == "Audio CD")
+            {
+                Spectre.ProgressSingleSpinner(ctx =>
                 {
+                    ctx.AddTask("Trying to read C2 Pointers...").IsIndeterminate();
+                    mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _);
+
+                    // They return OK, but then all following commands make the drive fail miserably.
                     if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
                         mediaTest.CanReadC2Pointers = false;
                     else
                     {
-                        Spectre.ProgressSingleSpinner(ctx =>
-                        {
-                            ctx.AddTask("Trying to read C2 Pointers...").IsIndeterminate();
+                        mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2646, 1,
+                                                                   MmcSectorTypes.Cdda, false, false, false,
+                                                                   MmcHeaderCodes.None, true, false,
+                                                                   MmcErrorField.C2Pointers, MmcSubchannel.None,
+                                                                   _dev.Timeout, out _);
 
-                            mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2342, 1,
-                                                                       MmcSectorTypes.AllTypes, false, false, false,
+                        if(!mediaTest.CanReadC2Pointers == true)
+                            mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2648, 1,
+                                                                       MmcSectorTypes.Cdda, false, false, false,
                                                                        MmcHeaderCodes.None, true, false,
-                                                                       MmcErrorField.C2Pointers, MmcSubchannel.None,
-                                                                       _dev.Timeout, out _);
-
-                            if(mediaTest.CanReadC2Pointers == false)
-                                mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2344, 1,
-                                                                           MmcSectorTypes.AllTypes, false, false, false,
-                                                                           MmcHeaderCodes.None, true, false,
-                                                                           MmcErrorField.C2PointersAndBlock,
-                                                                           MmcSubchannel.None, _dev.Timeout, out _);
-                        });
+                                                                       MmcErrorField.C2PointersAndBlock,
+                                                                       MmcSubchannel.None, _dev.Timeout, out _);
 
                         AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadC2Pointers);
 
                         mediaTest.C2PointersData = buffer;
                     }
+                });
 
-                    Spectre.ProgressSingleSpinner(ctx =>
+                Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Trying to read subchannels...").IsIndeterminate();
+
+                    mediaTest.CanReadPQSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2368, 1,
+                                                                 MmcSectorTypes.Cdda, false, false, false,
+                                                                 MmcHeaderCodes.None, true, false,
+                                                                 MmcErrorField.None, MmcSubchannel.Q16,
+                                                                 _dev.Timeout, out _);
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannel);
+
+                    mediaTest.PQSubchannelData = buffer;
+
+                    mediaTest.CanReadRWSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2448, 1,
+                                                                 MmcSectorTypes.Cdda, false, false, false,
+                                                                 MmcHeaderCodes.None, true, false,
+                                                                 MmcErrorField.None, MmcSubchannel.Raw,
+                                                                 _dev.Timeout, out _);
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannel);
+
+                    mediaTest.RWSubchannelData = buffer;
+
+                    mediaTest.CanReadCorrectedSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2448, 1,
+                                                                        MmcSectorTypes.Cdda, false, false, false,
+                                                                        MmcHeaderCodes.None, true, false,
+                                                                        MmcErrorField.None, MmcSubchannel.Rw,
+                                                                        _dev.Timeout, out _);
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannel);
+
+                    mediaTest.CorrectedSubchannelData = buffer;
+                });
+
+                Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Trying to read subchannels with C2 Pointers...").IsIndeterminate();
+                    mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _);
+
+                    // They return OK, but then all following commands make the drive fail miserably.
+                    if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
                     {
-                        ctx.AddTask("Trying to read subchannels...").IsIndeterminate();
-                        mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _);
-
-                        mediaTest.CanReadPQSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2064, 1,
-                                                                     MmcSectorTypes.AllTypes, false, false, false,
-                                                                     MmcHeaderCodes.None, true, false,
-                                                                     MmcErrorField.None, MmcSubchannel.Q16,
-                                                                     _dev.Timeout, out _);
-
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannel);
-
-                        mediaTest.PQSubchannelData = buffer;
-
-                        mediaTest.CanReadRWSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2144, 1,
-                                                                     MmcSectorTypes.AllTypes, false, false, false,
-                                                                     MmcHeaderCodes.None, true, false,
-                                                                     MmcErrorField.None, MmcSubchannel.Raw,
-                                                                     _dev.Timeout, out _);
-
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannel);
-
-                        mediaTest.RWSubchannelData = buffer;
-
-                        mediaTest.CanReadCorrectedSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2144, 1,
-                                                                            MmcSectorTypes.AllTypes, false, false,
-                                                                            false, MmcHeaderCodes.None, true, false,
-                                                                            MmcErrorField.None, MmcSubchannel.Rw,
-                                                                            _dev.Timeout, out _);
-
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannel);
-
-                        mediaTest.CorrectedSubchannelData = buffer;
-                    });
-
-                    Spectre.ProgressSingleSpinner(ctx =>
+                        mediaTest.CanReadPQSubchannelWithC2        = false;
+                        mediaTest.CanReadRWSubchannelWithC2        = false;
+                        mediaTest.CanReadCorrectedSubchannelWithC2 = false;
+                    }
+                    else
                     {
-                        ctx.AddTask("Trying to read subchannels with C2 Pointers...").IsIndeterminate();
+                        mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2662, 1,
+                                                                           MmcSectorTypes.Cdda, false, false, false,
+                                                                           MmcHeaderCodes.None, true, false,
+                                                                           MmcErrorField.C2Pointers,
+                                                                           MmcSubchannel.Q16, _dev.Timeout, out _);
 
-                        if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
-                        {
-                            mediaTest.CanReadPQSubchannelWithC2        = false;
-                            mediaTest.CanReadRWSubchannelWithC2        = false;
-                            mediaTest.CanReadCorrectedSubchannelWithC2 = false;
-                        }
-                        else
-                        {
-                            mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2358, 1,
-                                                                               MmcSectorTypes.AllTypes, false, false,
-                                                                               false, MmcHeaderCodes.None, true, false,
-                                                                               MmcErrorField.C2Pointers,
+                        if(mediaTest.CanReadPQSubchannelWithC2 == false)
+                            mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 11,
+                                                                               2664, 1, MmcSectorTypes.Cdda, false,
+                                                                               false, false, MmcHeaderCodes.None, true,
+                                                                               false, MmcErrorField.C2PointersAndBlock,
                                                                                MmcSubchannel.Q16, _dev.Timeout, out _);
 
-                            if(mediaTest.CanReadPQSubchannelWithC2 == false)
-                                mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
-                                                                          2360, 1, MmcSectorTypes.AllTypes, false,
-                                                                          false, false, MmcHeaderCodes.None, true,
-                                                                          false, MmcErrorField.C2PointersAndBlock,
-                                                                          MmcSubchannel.Q16, _dev.Timeout, out _);
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                                   !mediaTest.CanReadPQSubchannelWithC2);
 
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                       !mediaTest.CanReadPQSubchannelWithC2);
+                        mediaTest.PQSubchannelWithC2Data = buffer;
 
-                            mediaTest.PQSubchannelWithC2Data = buffer;
+                        mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 11, 2712, 1,
+                                                                           MmcSectorTypes.Cdda, false, false, false,
+                                                                           MmcHeaderCodes.None, true, false,
+                                                                           MmcErrorField.C2Pointers,
+                                                                           MmcSubchannel.Raw, _dev.Timeout, out _);
 
-                            mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2438, 1,
-                                                                               MmcSectorTypes.AllTypes, false, false,
-                                                                               false, MmcHeaderCodes.None, true, false,
-                                                                               MmcErrorField.C2Pointers,
+                        if(mediaTest.CanReadRWSubchannelWithC2 == false)
+                            mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 11,
+                                                                               2714, 1, MmcSectorTypes.Cdda, false,
+                                                                               false, false, MmcHeaderCodes.None, true,
+                                                                               false, MmcErrorField.C2PointersAndBlock,
                                                                                MmcSubchannel.Raw, _dev.Timeout, out _);
 
-                            if(mediaTest.CanReadRWSubchannelWithC2 == false)
-                                mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
-                                                                          2440, 1, MmcSectorTypes.AllTypes, false,
-                                                                          false, false, MmcHeaderCodes.None, true,
-                                                                          false, MmcErrorField.C2PointersAndBlock,
-                                                                          MmcSubchannel.Raw, _dev.Timeout, out _);
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                                   !mediaTest.CanReadRWSubchannelWithC2);
 
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                       !mediaTest.CanReadRWSubchannelWithC2);
+                        mediaTest.RWSubchannelWithC2Data = buffer;
 
-                            mediaTest.RWSubchannelWithC2Data = buffer;
+                        mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 11,
+                                                                         2712, 1, MmcSectorTypes.Cdda, false,
+                                                                         false, false, MmcHeaderCodes.None,
+                                                                         true, false, MmcErrorField.C2Pointers,
+                                                                         MmcSubchannel.Rw, _dev.Timeout,
+                                                                         out _);
 
-                            mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
-                                                                             2438, 1, MmcSectorTypes.AllTypes,
+                        if(mediaTest.CanReadCorrectedSubchannelWithC2 == false)
+                            mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer,
+                                                                             11, 2714, 1, MmcSectorTypes.Cdda,
                                                                              false, false, false,
                                                                              MmcHeaderCodes.None, true, false,
-                                                                             MmcErrorField.C2Pointers,
+                                                                             MmcErrorField.C2PointersAndBlock,
                                                                              MmcSubchannel.Rw, _dev.Timeout,
                                                                              out _);
 
-                            if(mediaTest.CanReadCorrectedSubchannelWithC2 == false)
-                                mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                                 16, 2440, 1,
-                                                                                 MmcSectorTypes.AllTypes, false,
-                                                                                 false, false, MmcHeaderCodes.None,
-                                                                                 true, false,
-                                                                                 MmcErrorField.C2PointersAndBlock,
-                                                                                 MmcSubchannel.Rw, _dev.Timeout,
-                                                                                 out _);
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                                   !mediaTest.CanReadCorrectedSubchannelWithC2);
 
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                       !mediaTest.CanReadCorrectedSubchannelWithC2);
-
-                            mediaTest.CorrectedSubchannelWithC2Data = buffer;
-                        }
-                    });
-                }
-
-                if(tryPlextor)
-                {
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying Plextor READ CD-DA...").IsIndeterminate();
-
-                        mediaTest.SupportsPlextorReadCDDA =
-                            !_dev.PlextorReadCdDa(out buffer, out senseBuffer, 16, 2352, 1, PlextorSubchannel.None,
-                                                  _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPlextorReadCDDA);
-
-                    mediaTest.PlextorReadCddaData = buffer;
-                }
-
-                if(tryPioneer)
-                {
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying Pioneer READ CD-DA...").IsIndeterminate();
-
-                        mediaTest.SupportsPioneerReadCDDA =
-                            !_dev.PioneerReadCdDa(out buffer, out senseBuffer, 16, 2352, 1, PioneerSubchannel.None,
-                                                  _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPioneerReadCDDA);
-
-                    mediaTest.PioneerReadCddaData = buffer;
-
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying Pioneer READ CD-DA MSF...").IsIndeterminate();
-
-                        mediaTest.SupportsPioneerReadCDDAMSF =
-                            !_dev.PioneerReadCdDaMsf(out buffer, out senseBuffer, 0x00000210, 0x00000211, 2352,
-                                                     PioneerSubchannel.None, _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPioneerReadCDDAMSF);
-
-                    mediaTest.PioneerReadCddaMsfData = buffer;
-                }
-
-                if(tryNec)
-                {
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying NEC READ CD-DA...").IsIndeterminate();
-
-                        mediaTest.SupportsNECReadCDDA =
-                            !_dev.NecReadCdDa(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _);
-                    });
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsNECReadCDDA);
-
-                    mediaTest.NecReadCddaData = buffer;
-                }
-            }
-
-            mediaTest.LongBlockSize = mediaTest.BlockSize;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
-                sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 16, 0xFFFF, _dev.Timeout, out _);
-            });
-
-            if(sense && !_dev.Error)
-            {
-                DecodedSense? decSense = Sense.Decode(senseBuffer);
-
-                if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
-                   decSense.Value.ASC  == 0x24                     &&
-                   decSense.Value.ASCQ == 0x00)
-                {
-                    mediaTest.SupportsReadLong = true;
-
-                    bool valid       = decSense?.Fixed?.InformationValid == true;
-                    bool ili         = decSense?.Fixed?.ILI              == true;
-                    uint information = decSense?.Fixed?.Information ?? 0;
-
-                    if(decSense?.Descriptor.HasValue == true &&
-                       decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
-                    {
-                        valid       = true;
-                        ili         = true;
-                        information = (uint)Sense.DecodeDescriptor00(desc00);
+                        mediaTest.CorrectedSubchannelWithC2Data = buffer;
                     }
-
-                    if(valid && ili)
-                        mediaTest.LongBlockSize = 0xFFFF - (information & 0xFFFF);
-                }
+                });
             }
-
-            if(mediaTest.SupportsReadLong == true &&
-               mediaTest.LongBlockSize    == mediaTest.BlockSize)
+            else if(mediaTest.SupportsReadCdRaw == true)
             {
-                // DVDs
-                sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 16, 37856, _dev.Timeout, out _);
-
-                if(!sense &&
-                   !_dev.Error)
+                Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    mediaTest.ReadLong10Data   = buffer;
-                    mediaTest.SupportsReadLong = true;
-                    mediaTest.LongBlockSize    = 37856;
+                    ctx.AddTask("Trying to read C2 Pointers...").IsIndeterminate();
+
+                    // They return OK, but then all following commands make the drive fail miserably.
+                    if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
+                        mediaTest.CanReadC2Pointers = false;
+                    else
+                    {
+                        mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2646, 1,
+                                                                   MmcSectorTypes.AllTypes, false, false, true,
+                                                                   MmcHeaderCodes.AllHeaders, true, true,
+                                                                   MmcErrorField.C2Pointers, MmcSubchannel.None,
+                                                                   _dev.Timeout, out _);
+
+                        if(mediaTest.CanReadC2Pointers == false)
+                            mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2648, 1,
+                                                                       MmcSectorTypes.AllTypes, false, false, true,
+                                                                       MmcHeaderCodes.AllHeaders, true, true,
+                                                                       MmcErrorField.C2PointersAndBlock,
+                                                                       MmcSubchannel.None, _dev.Timeout, out _);
+
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadC2Pointers);
+
+                        mediaTest.C2PointersData = buffer;
+                    }
+                });
+
+                Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Trying to read subchannels...").IsIndeterminate();
+
+                    mediaTest.CanReadPQSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2368, 1,
+                                                                 MmcSectorTypes.AllTypes, false, false, true,
+                                                                 MmcHeaderCodes.AllHeaders, true, true,
+                                                                 MmcErrorField.None, MmcSubchannel.Q16,
+                                                                 _dev.Timeout, out _);
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannel);
+
+                    mediaTest.PQSubchannelData = buffer;
+
+                    mediaTest.CanReadRWSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2448, 1,
+                                                                 MmcSectorTypes.AllTypes, false, false, true,
+                                                                 MmcHeaderCodes.AllHeaders, true, true,
+                                                                 MmcErrorField.None, MmcSubchannel.Raw,
+                                                                 _dev.Timeout, out _);
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannel);
+
+                    mediaTest.RWSubchannelData = buffer;
+
+                    mediaTest.CanReadCorrectedSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2448, 1,
+                                                                        MmcSectorTypes.AllTypes, false, false, true,
+                                                                        MmcHeaderCodes.AllHeaders, true, true,
+                                                                        MmcErrorField.None, MmcSubchannel.Rw,
+                                                                        _dev.Timeout, out _);
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannel);
+
+                    mediaTest.CorrectedSubchannelData = buffer;
+                });
+
+                Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Trying to read subchannels with C2 Pointers...").IsIndeterminate();
+
+                    if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
+                    {
+                        mediaTest.CanReadPQSubchannelWithC2        = false;
+                        mediaTest.CanReadRWSubchannelWithC2        = false;
+                        mediaTest.CanReadCorrectedSubchannelWithC2 = false;
+                    }
+                    else
+                    {
+                        mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2662, 1,
+                                                                           MmcSectorTypes.AllTypes, false, false,
+                                                                           true, MmcHeaderCodes.AllHeaders, true,
+                                                                           true, MmcErrorField.C2Pointers,
+                                                                           MmcSubchannel.Q16, _dev.Timeout, out _);
+
+                        if(mediaTest.CanReadPQSubchannelWithC2 == false)
+                            mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
+                                                                               2664, 1, MmcSectorTypes.AllTypes, false,
+                                                                               false, true, MmcHeaderCodes.AllHeaders,
+                                                                               true, true,
+                                                                               MmcErrorField.C2PointersAndBlock,
+                                                                               MmcSubchannel.Q16, _dev.Timeout, out _);
+
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                                   !mediaTest.CanReadPQSubchannelWithC2);
+
+                        mediaTest.PQSubchannelWithC2Data = buffer;
+
+                        mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2712, 1,
+                                                                           MmcSectorTypes.AllTypes, false, false,
+                                                                           true, MmcHeaderCodes.AllHeaders, true,
+                                                                           true, MmcErrorField.C2Pointers,
+                                                                           MmcSubchannel.Raw, _dev.Timeout, out _);
+
+                        if(mediaTest.CanReadRWSubchannelWithC2 == false)
+                            mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
+                                                                               2714, 1, MmcSectorTypes.AllTypes, false,
+                                                                               false, true, MmcHeaderCodes.AllHeaders,
+                                                                               true, true,
+                                                                               MmcErrorField.C2PointersAndBlock,
+                                                                               MmcSubchannel.Raw, _dev.Timeout, out _);
+
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                                   !mediaTest.CanReadRWSubchannelWithC2);
+
+                        mediaTest.RWSubchannelWithC2Data = buffer;
+
+                        mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
+                                                                         2712, 1, MmcSectorTypes.AllTypes,
+                                                                         false, false, true,
+                                                                         MmcHeaderCodes.AllHeaders, true, true,
+                                                                         MmcErrorField.C2Pointers,
+                                                                         MmcSubchannel.Rw, _dev.Timeout,
+                                                                         out _);
+
+                        if(mediaTest.CanReadCorrectedSubchannelWithC2 == false)
+                            mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer,
+                                                                             16, 2714, 1,
+                                                                             MmcSectorTypes.AllTypes, false,
+                                                                             false, true,
+                                                                             MmcHeaderCodes.AllHeaders, true,
+                                                                             true,
+                                                                             MmcErrorField.C2PointersAndBlock,
+                                                                             MmcSubchannel.Rw, _dev.Timeout,
+                                                                             out _);
+
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                                   !mediaTest.CanReadCorrectedSubchannelWithC2);
+
+                        mediaTest.CorrectedSubchannelWithC2Data = buffer;
+                    }
+                });
+            }
+            else
+            {
+                if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
+                    mediaTest.CanReadC2Pointers = false;
+                else
+                {
+                    Spectre.ProgressSingleSpinner(ctx =>
+                    {
+                        ctx.AddTask("Trying to read C2 Pointers...").IsIndeterminate();
+
+                        mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2342, 1,
+                                                                   MmcSectorTypes.AllTypes, false, false, false,
+                                                                   MmcHeaderCodes.None, true, false,
+                                                                   MmcErrorField.C2Pointers, MmcSubchannel.None,
+                                                                   _dev.Timeout, out _);
+
+                        if(mediaTest.CanReadC2Pointers == false)
+                            mediaTest.CanReadC2Pointers = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2344, 1,
+                                                                       MmcSectorTypes.AllTypes, false, false, false,
+                                                                       MmcHeaderCodes.None, true, false,
+                                                                       MmcErrorField.C2PointersAndBlock,
+                                                                       MmcSubchannel.None, _dev.Timeout, out _);
+                    });
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadC2Pointers);
+
+                    mediaTest.C2PointersData = buffer;
                 }
+
+                Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Trying to read subchannels...").IsIndeterminate();
+                    mediaTest.CanReadPMA = !_dev.ReadPma(out buffer, out senseBuffer, _dev.Timeout, out _);
+
+                    mediaTest.CanReadPQSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2064, 1,
+                                                                 MmcSectorTypes.AllTypes, false, false, false,
+                                                                 MmcHeaderCodes.None, true, false,
+                                                                 MmcErrorField.None, MmcSubchannel.Q16,
+                                                                 _dev.Timeout, out _);
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadPQSubchannel);
+
+                    mediaTest.PQSubchannelData = buffer;
+
+                    mediaTest.CanReadRWSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2144, 1,
+                                                                 MmcSectorTypes.AllTypes, false, false, false,
+                                                                 MmcHeaderCodes.None, true, false,
+                                                                 MmcErrorField.None, MmcSubchannel.Raw,
+                                                                 _dev.Timeout, out _);
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadRWSubchannel);
+
+                    mediaTest.RWSubchannelData = buffer;
+
+                    mediaTest.CanReadCorrectedSubchannel = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2144, 1,
+                                                                        MmcSectorTypes.AllTypes, false, false,
+                                                                        false, MmcHeaderCodes.None, true, false,
+                                                                        MmcErrorField.None, MmcSubchannel.Rw,
+                                                                        _dev.Timeout, out _);
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadCorrectedSubchannel);
+
+                    mediaTest.CorrectedSubchannelData = buffer;
+                });
+
+                Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Trying to read subchannels with C2 Pointers...").IsIndeterminate();
+
+                    if(_dev.Model.StartsWith("iHOS104", StringComparison.Ordinal))
+                    {
+                        mediaTest.CanReadPQSubchannelWithC2        = false;
+                        mediaTest.CanReadRWSubchannelWithC2        = false;
+                        mediaTest.CanReadCorrectedSubchannelWithC2 = false;
+                    }
+                    else
+                    {
+                        mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2358, 1,
+                                                                           MmcSectorTypes.AllTypes, false, false,
+                                                                           false, MmcHeaderCodes.None, true, false,
+                                                                           MmcErrorField.C2Pointers,
+                                                                           MmcSubchannel.Q16, _dev.Timeout, out _);
+
+                        if(mediaTest.CanReadPQSubchannelWithC2 == false)
+                            mediaTest.CanReadPQSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
+                                                                               2360, 1, MmcSectorTypes.AllTypes, false,
+                                                                               false, false, MmcHeaderCodes.None, true,
+                                                                               false, MmcErrorField.C2PointersAndBlock,
+                                                                               MmcSubchannel.Q16, _dev.Timeout, out _);
+
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                                   !mediaTest.CanReadPQSubchannelWithC2);
+
+                        mediaTest.PQSubchannelWithC2Data = buffer;
+
+                        mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16, 2438, 1,
+                                                                           MmcSectorTypes.AllTypes, false, false,
+                                                                           false, MmcHeaderCodes.None, true, false,
+                                                                           MmcErrorField.C2Pointers,
+                                                                           MmcSubchannel.Raw, _dev.Timeout, out _);
+
+                        if(mediaTest.CanReadRWSubchannelWithC2 == false)
+                            mediaTest.CanReadRWSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
+                                                                               2440, 1, MmcSectorTypes.AllTypes, false,
+                                                                               false, false, MmcHeaderCodes.None, true,
+                                                                               false, MmcErrorField.C2PointersAndBlock,
+                                                                               MmcSubchannel.Raw, _dev.Timeout, out _);
+
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                                   !mediaTest.CanReadRWSubchannelWithC2);
+
+                        mediaTest.RWSubchannelWithC2Data = buffer;
+
+                        mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer, 16,
+                                                                         2438, 1, MmcSectorTypes.AllTypes,
+                                                                         false, false, false,
+                                                                         MmcHeaderCodes.None, true, false,
+                                                                         MmcErrorField.C2Pointers,
+                                                                         MmcSubchannel.Rw, _dev.Timeout,
+                                                                         out _);
+
+                        if(mediaTest.CanReadCorrectedSubchannelWithC2 == false)
+                            mediaTest.CanReadCorrectedSubchannelWithC2 = !_dev.ReadCd(out buffer, out senseBuffer,
+                                                                             16, 2440, 1,
+                                                                             MmcSectorTypes.AllTypes, false,
+                                                                             false, false, MmcHeaderCodes.None,
+                                                                             true, false,
+                                                                             MmcErrorField.C2PointersAndBlock,
+                                                                             MmcSubchannel.Rw, _dev.Timeout,
+                                                                             out _);
+
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                                   !mediaTest.CanReadCorrectedSubchannelWithC2);
+
+                        mediaTest.CorrectedSubchannelWithC2Data = buffer;
+                    }
+                });
             }
 
             if(tryPlextor)
             {
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Trying Plextor trick to raw read DVDs...").IsIndeterminate();
+                    ctx.AddTask("Trying Plextor READ CD-DA...").IsIndeterminate();
 
-                    mediaTest.SupportsPlextorReadRawDVD =
-                        !_dev.PlextorReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _);
+                    mediaTest.SupportsPlextorReadCDDA =
+                        !_dev.PlextorReadCdDa(out buffer, out senseBuffer, 16, 2352, 1, PlextorSubchannel.None,
+                                              _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPlextorReadRawDVD);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPlextorReadCDDA);
 
-                if(mediaTest.SupportsPlextorReadRawDVD == true)
-                    mediaTest.SupportsPlextorReadRawDVD = !ArrayHelpers.ArrayIsNullOrEmpty(buffer);
-
-                if(mediaTest.SupportsPlextorReadRawDVD == true)
-                    mediaTest.PlextorReadRawDVDData = buffer;
+                mediaTest.PlextorReadCddaData = buffer;
             }
 
-            if(tryHldtst)
+            if(tryPioneer)
             {
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Trying HL-DT-ST (aka LG) trick to raw read DVDs...").IsIndeterminate();
+                    ctx.AddTask("Trying Pioneer READ CD-DA...").IsIndeterminate();
 
-                    mediaTest.SupportsHLDTSTReadRawDVD =
-                        !_dev.HlDtStReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _);
+                    mediaTest.SupportsPioneerReadCDDA =
+                        !_dev.PioneerReadCdDa(out buffer, out senseBuffer, 16, 2352, 1, PioneerSubchannel.None,
+                                              _dev.Timeout, out _);
                 });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsHLDTSTReadRawDVD);
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPioneerReadCDDA);
 
-                if(mediaTest.SupportsHLDTSTReadRawDVD == true)
-                    mediaTest.SupportsHLDTSTReadRawDVD = !ArrayHelpers.ArrayIsNullOrEmpty(buffer);
-
-                if(mediaTest.SupportsHLDTSTReadRawDVD == true)
-                    mediaTest.HLDTSTReadRawDVDData = buffer;
-            }
-
-            if(tryMediaTekF106)
-            {
-                bool triedLba0    = false;
-                bool triedLeadOut = false;
+                mediaTest.PioneerReadCddaData = buffer;
 
                 Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Trying MediaTek READ DRAM command...").IsIndeterminate();
+                    ctx.AddTask("Trying Pioneer READ CD-DA MSF...").IsIndeterminate();
 
+                    mediaTest.SupportsPioneerReadCDDAMSF =
+                        !_dev.PioneerReadCdDaMsf(out buffer, out senseBuffer, 0x00000210, 0x00000211, 2352,
+                                                 PioneerSubchannel.None, _dev.Timeout, out _);
+                });
+
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPioneerReadCDDAMSF);
+
+                mediaTest.PioneerReadCddaMsfData = buffer;
+            }
+
+            if(tryNec)
+            {
+                Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Trying NEC READ CD-DA...").IsIndeterminate();
+
+                    mediaTest.SupportsNECReadCDDA =
+                        !_dev.NecReadCdDa(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _);
+                });
+
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsNECReadCDDA);
+
+                mediaTest.NecReadCddaData = buffer;
+            }
+        }
+
+        mediaTest.LongBlockSize = mediaTest.BlockSize;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
+            sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 16, 0xFFFF, _dev.Timeout, out _);
+        });
+
+        if(sense && !_dev.Error)
+        {
+            DecodedSense? decSense = Sense.Decode(senseBuffer);
+
+            if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
+               decSense.Value.ASC  == 0x24                     &&
+               decSense.Value.ASCQ == 0x00)
+            {
+                mediaTest.SupportsReadLong = true;
+
+                bool valid       = decSense?.Fixed?.InformationValid == true;
+                bool ili         = decSense?.Fixed?.ILI              == true;
+                uint information = decSense?.Fixed?.Information ?? 0;
+
+                if(decSense?.Descriptor.HasValue == true &&
+                   decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
+                {
+                    valid       = true;
+                    ili         = true;
+                    information = (uint)Sense.DecodeDescriptor00(desc00);
+                }
+
+                if(valid && ili)
+                    mediaTest.LongBlockSize = 0xFFFF - (information & 0xFFFF);
+            }
+        }
+
+        if(mediaTest.SupportsReadLong == true &&
+           mediaTest.LongBlockSize    == mediaTest.BlockSize)
+        {
+            // DVDs
+            sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 16, 37856, _dev.Timeout, out _);
+
+            if(!sense &&
+               !_dev.Error)
+            {
+                mediaTest.ReadLong10Data   = buffer;
+                mediaTest.SupportsReadLong = true;
+                mediaTest.LongBlockSize    = 37856;
+            }
+        }
+
+        if(tryPlextor)
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying Plextor trick to raw read DVDs...").IsIndeterminate();
+
+                mediaTest.SupportsPlextorReadRawDVD =
+                    !_dev.PlextorReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsPlextorReadRawDVD);
+
+            if(mediaTest.SupportsPlextorReadRawDVD == true)
+                mediaTest.SupportsPlextorReadRawDVD = !ArrayHelpers.ArrayIsNullOrEmpty(buffer);
+
+            if(mediaTest.SupportsPlextorReadRawDVD == true)
+                mediaTest.PlextorReadRawDVDData = buffer;
+        }
+
+        if(tryHldtst)
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying HL-DT-ST (aka LG) trick to raw read DVDs...").IsIndeterminate();
+
+                mediaTest.SupportsHLDTSTReadRawDVD =
+                    !_dev.HlDtStReadRawDvd(out buffer, out senseBuffer, 16, 1, _dev.Timeout, out _);
+            });
+
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsHLDTSTReadRawDVD);
+
+            if(mediaTest.SupportsHLDTSTReadRawDVD == true)
+                mediaTest.SupportsHLDTSTReadRawDVD = !ArrayHelpers.ArrayIsNullOrEmpty(buffer);
+
+            if(mediaTest.SupportsHLDTSTReadRawDVD == true)
+                mediaTest.HLDTSTReadRawDVDData = buffer;
+        }
+
+        if(tryMediaTekF106)
+        {
+            bool triedLba0    = false;
+            bool triedLeadOut = false;
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying MediaTek READ DRAM command...").IsIndeterminate();
+
+                if(mediaType                == "Audio CD" &&
+                   mediaTest.SupportsReadCd == true)
+                {
+                    _dev.ReadCd(out _, out _, 0, 2352, 1, MmcSectorTypes.Cdda, false, false, false,
+                                MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
+                                _dev.Timeout, out _);
+
+                    triedLba0 = true;
+                }
+                else if((mediaType.StartsWith("CD", StringComparison.OrdinalIgnoreCase) ||
+                         mediaType == "Enhanced CD (aka E-CD, CD-Plus or CD+)") &&
+                        mediaTest.SupportsReadCdRaw == true)
+                {
+                    _dev.ReadCd(out _, out _, 0, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
+                                MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
+                                _dev.Timeout, out _);
+
+                    triedLba0 = true;
+                }
+                else if((mediaType.StartsWith("CD", StringComparison.OrdinalIgnoreCase) ||
+                         mediaType == "Enhanced CD (aka E-CD, CD-Plus or CD+)") &&
+                        mediaTest.SupportsReadCd == true)
+                {
+                    _dev.ReadCd(out _, out _, 0, 2048, 1, MmcSectorTypes.AllTypes, false, false, false,
+                                MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
+                                _dev.Timeout, out _);
+
+                    triedLba0 = true;
+                }
+                else if(mediaTest.SupportsRead6 == true)
+                {
+                    _dev.Read6(out _, out _, 0, 2048, _dev.Timeout, out _);
+                    triedLba0 = true;
+                }
+                else if(mediaTest.SupportsRead10 == true)
+                {
+                    _dev.Read10(out _, out _, 0, false, true, false, false, 0, 2048, 0, 1, _dev.Timeout, out _);
+                    triedLba0 = true;
+                }
+                else if(mediaTest.SupportsRead12 == true)
+                {
+                    _dev.Read12(out _, out _, 0, false, true, false, false, 0, 2048, 0, 1, false, _dev.Timeout,
+                                out _);
+
+                    triedLba0 = true;
+                }
+                else if(mediaTest.SupportsRead16 == true)
+                {
+                    _dev.Read16(out _, out _, 0, false, true, false, 0, 2048, 0, 1, false, _dev.Timeout, out _);
+                    triedLba0 = true;
+                }
+
+                if(!triedLba0)
+                    return;
+
+                mediaTest.CanReadF1_06 =
+                    !_dev.MediaTekReadDram(out buffer, out senseBuffer, 0, 0xB00, _dev.Timeout, out _);
+
+                mediaTest.ReadF1_06Data = mediaTest.CanReadF1_06 == true ? buffer : senseBuffer;
+
+                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadF1_06);
+            });
+
+            Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Trying MediaTek READ DRAM command for Lead-Out...").IsIndeterminate();
+
+                if(mediaTest.Blocks > 0)
+                {
                     if(mediaType                == "Audio CD" &&
                        mediaTest.SupportsReadCd == true)
                     {
-                        _dev.ReadCd(out _, out _, 0, 2352, 1, MmcSectorTypes.Cdda, false, false, false,
-                                    MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
-                                    _dev.Timeout, out _);
+                        _dev.ReadCd(out _, out _, (uint)(mediaTest.Blocks + 1), 2352, 1, MmcSectorTypes.Cdda, false,
+                                    false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
+                                    MmcSubchannel.None, _dev.Timeout, out _);
 
-                        triedLba0 = true;
+                        triedLeadOut = true;
                     }
                     else if((mediaType.StartsWith("CD", StringComparison.OrdinalIgnoreCase) ||
                              mediaType == "Enhanced CD (aka E-CD, CD-Plus or CD+)") &&
                             mediaTest.SupportsReadCdRaw == true)
                     {
-                        _dev.ReadCd(out _, out _, 0, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
-                                    MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
-                                    _dev.Timeout, out _);
+                        _dev.ReadCd(out _, out _, (uint)(mediaTest.Blocks + 1), 2352, 1, MmcSectorTypes.AllTypes,
+                                    false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                    MmcSubchannel.None, _dev.Timeout, out _);
 
-                        triedLba0 = true;
+                        triedLeadOut = true;
                     }
                     else if((mediaType.StartsWith("CD", StringComparison.OrdinalIgnoreCase) ||
                              mediaType == "Enhanced CD (aka E-CD, CD-Plus or CD+)") &&
                             mediaTest.SupportsReadCd == true)
                     {
-                        _dev.ReadCd(out _, out _, 0, 2048, 1, MmcSectorTypes.AllTypes, false, false, false,
-                                    MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
-                                    _dev.Timeout, out _);
+                        _dev.ReadCd(out _, out _, (uint)(mediaTest.Blocks + 1), 2048, 1, MmcSectorTypes.AllTypes,
+                                    false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
+                                    MmcSubchannel.None, _dev.Timeout, out _);
 
-                        triedLba0 = true;
+                        triedLeadOut = true;
                     }
                     else if(mediaTest.SupportsRead6 == true)
                     {
-                        _dev.Read6(out _, out _, 0, 2048, _dev.Timeout, out _);
-                        triedLba0 = true;
+                        _dev.Read6(out _, out _, (uint)(mediaTest.Blocks + 1), 2048, _dev.Timeout, out _);
+                        triedLeadOut = true;
                     }
                     else if(mediaTest.SupportsRead10 == true)
                     {
-                        _dev.Read10(out _, out _, 0, false, true, false, false, 0, 2048, 0, 1, _dev.Timeout, out _);
-                        triedLba0 = true;
+                        _dev.Read10(out _, out _, 0, false, true, false, false, (uint)(mediaTest.Blocks + 1), 2048,
+                                    0, 1, _dev.Timeout, out _);
+
+                        triedLeadOut = true;
                     }
                     else if(mediaTest.SupportsRead12 == true)
                     {
-                        _dev.Read12(out _, out _, 0, false, true, false, false, 0, 2048, 0, 1, false, _dev.Timeout,
-                                    out _);
+                        _dev.Read12(out _, out _, 0, false, true, false, false, (uint)(mediaTest.Blocks + 1), 2048,
+                                    0, 1, false, _dev.Timeout, out _);
 
-                        triedLba0 = true;
+                        triedLeadOut = true;
                     }
                     else if(mediaTest.SupportsRead16 == true)
                     {
-                        _dev.Read16(out _, out _, 0, false, true, false, 0, 2048, 0, 1, false, _dev.Timeout, out _);
-                        triedLba0 = true;
+                        _dev.Read16(out _, out _, 0, false, true, false, (ulong)(mediaTest.Blocks + 1), 2048, 0, 1,
+                                    false, _dev.Timeout, out _);
+
+                        triedLeadOut = true;
                     }
 
-                    if(!triedLba0)
-                        return;
-
-                    mediaTest.CanReadF1_06 =
-                        !_dev.MediaTekReadDram(out buffer, out senseBuffer, 0, 0xB00, _dev.Timeout, out _);
-
-                    mediaTest.ReadF1_06Data = mediaTest.CanReadF1_06 == true ? buffer : senseBuffer;
-
-                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadF1_06);
-                });
-
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Trying MediaTek READ DRAM command for Lead-Out...").IsIndeterminate();
-
-                    if(mediaTest.Blocks > 0)
+                    if(triedLeadOut)
                     {
-                        if(mediaType                == "Audio CD" &&
-                           mediaTest.SupportsReadCd == true)
-                        {
-                            _dev.ReadCd(out _, out _, (uint)(mediaTest.Blocks + 1), 2352, 1, MmcSectorTypes.Cdda, false,
-                                        false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                        MmcSubchannel.None, _dev.Timeout, out _);
+                        mediaTest.CanReadF1_06LeadOut =
+                            !_dev.MediaTekReadDram(out buffer, out senseBuffer, 0, 0xB00, _dev.Timeout, out _);
 
-                            triedLeadOut = true;
-                        }
-                        else if((mediaType.StartsWith("CD", StringComparison.OrdinalIgnoreCase) ||
-                                 mediaType == "Enhanced CD (aka E-CD, CD-Plus or CD+)") &&
-                                mediaTest.SupportsReadCdRaw == true)
-                        {
-                            _dev.ReadCd(out _, out _, (uint)(mediaTest.Blocks + 1), 2352, 1, MmcSectorTypes.AllTypes,
-                                        false, false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                        MmcSubchannel.None, _dev.Timeout, out _);
+                        mediaTest.ReadF1_06LeadOutData =
+                            mediaTest.CanReadF1_06LeadOut == true ? buffer : senseBuffer;
 
-                            triedLeadOut = true;
-                        }
-                        else if((mediaType.StartsWith("CD", StringComparison.OrdinalIgnoreCase) ||
-                                 mediaType == "Enhanced CD (aka E-CD, CD-Plus or CD+)") &&
-                                mediaTest.SupportsReadCd == true)
+                        // This means it has returned the same as previous read, so not really lead-out.
+                        if(mediaTest.CanReadF1_06        == true &&
+                           mediaTest.CanReadF1_06LeadOut == true &&
+                           mediaTest.ReadF1_06Data.SequenceEqual(mediaTest.ReadF1_06LeadOutData))
                         {
-                            _dev.ReadCd(out _, out _, (uint)(mediaTest.Blocks + 1), 2048, 1, MmcSectorTypes.AllTypes,
-                                        false, false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                        MmcSubchannel.None, _dev.Timeout, out _);
-
-                            triedLeadOut = true;
-                        }
-                        else if(mediaTest.SupportsRead6 == true)
-                        {
-                            _dev.Read6(out _, out _, (uint)(mediaTest.Blocks + 1), 2048, _dev.Timeout, out _);
-                            triedLeadOut = true;
-                        }
-                        else if(mediaTest.SupportsRead10 == true)
-                        {
-                            _dev.Read10(out _, out _, 0, false, true, false, false, (uint)(mediaTest.Blocks + 1), 2048,
-                                        0, 1, _dev.Timeout, out _);
-
-                            triedLeadOut = true;
-                        }
-                        else if(mediaTest.SupportsRead12 == true)
-                        {
-                            _dev.Read12(out _, out _, 0, false, true, false, false, (uint)(mediaTest.Blocks + 1), 2048,
-                                        0, 1, false, _dev.Timeout, out _);
-
-                            triedLeadOut = true;
-                        }
-                        else if(mediaTest.SupportsRead16 == true)
-                        {
-                            _dev.Read16(out _, out _, 0, false, true, false, (ulong)(mediaTest.Blocks + 1), 2048, 0, 1,
-                                        false, _dev.Timeout, out _);
-
-                            triedLeadOut = true;
+                            mediaTest.CanReadF1_06LeadOut  = false;
+                            mediaTest.ReadF1_06LeadOutData = senseBuffer;
                         }
 
-                        if(triedLeadOut)
-                        {
-                            mediaTest.CanReadF1_06LeadOut =
-                                !_dev.MediaTekReadDram(out buffer, out senseBuffer, 0, 0xB00, _dev.Timeout, out _);
-
-                            mediaTest.ReadF1_06LeadOutData =
-                                mediaTest.CanReadF1_06LeadOut == true ? buffer : senseBuffer;
-
-                            // This means it has returned the same as previous read, so not really lead-out.
-                            if(mediaTest.CanReadF1_06        == true &&
-                               mediaTest.CanReadF1_06LeadOut == true &&
-                               mediaTest.ReadF1_06Data.SequenceEqual(mediaTest.ReadF1_06LeadOutData))
-                            {
-                                mediaTest.CanReadF1_06LeadOut  = false;
-                                mediaTest.ReadF1_06LeadOutData = senseBuffer;
-                            }
-
-                            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadF1_06LeadOut);
-                        }
+                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadF1_06LeadOut);
                     }
-                });
-            }
+                }
+            });
+        }
 
-            // This is for checking multi-session support, and inter-session lead-in/out reading, as Enhanced CD are
-            if(mediaType == "Enhanced CD (aka E-CD, CD-Plus or CD+)")
+        // This is for checking multi-session support, and inter-session lead-in/out reading, as Enhanced CD are
+        if(mediaType == "Enhanced CD (aka E-CD, CD-Plus or CD+)")
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
             {
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Querying CD Full TOC...").IsIndeterminate();
-                    mediaTest.CanReadFullTOC = !_dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
-                });
+                ctx.AddTask("Querying CD Full TOC...").IsIndeterminate();
+                mediaTest.CanReadFullTOC = !_dev.ReadRawToc(out buffer, out senseBuffer, 1, _dev.Timeout, out _);
+            });
 
-                AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadFullTOC);
+            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.CanReadFullTOC);
 
-                mediaTest.FullTocData = buffer;
+            mediaTest.FullTocData = buffer;
+
+            if(mediaTest.CanReadFullTOC == true)
+            {
+                FullTOC.CDFullTOC? decodedTocNullable = FullTOC.Decode(buffer);
+
+                mediaTest.CanReadFullTOC = decodedTocNullable.HasValue;
 
                 if(mediaTest.CanReadFullTOC == true)
                 {
-                    FullTOC.CDFullTOC? decodedTocNullable = FullTOC.Decode(buffer);
+                    FullTOC.CDFullTOC decodedToc = decodedTocNullable.Value;
 
-                    mediaTest.CanReadFullTOC = decodedTocNullable.HasValue;
-
-                    if(mediaTest.CanReadFullTOC == true)
+                    if(!decodedToc.TrackDescriptors.Any(t => t.SessionNumber > 1))
                     {
-                        FullTOC.CDFullTOC decodedToc = decodedTocNullable.Value;
+                        AaruConsole.
+                            ErrorWriteLine("Could not find second session. Have you inserted the correct type of disc?");
 
-                        if(!decodedToc.TrackDescriptors.Any(t => t.SessionNumber > 1))
+                        return null;
+                    }
+
+                    FullTOC.TrackDataDescriptor firstSessionLeadOutTrack =
+                        decodedToc.TrackDescriptors.FirstOrDefault(t => t.SessionNumber == 1 && t.POINT == 0xA2);
+
+                    FullTOC.TrackDataDescriptor secondSessionFirstTrack =
+                        decodedToc.TrackDescriptors.FirstOrDefault(t => t.SessionNumber > 1 && t.POINT <= 99);
+
+                    if(firstSessionLeadOutTrack.SessionNumber == 0 ||
+                       secondSessionFirstTrack.SessionNumber  == 0)
+                    {
+                        AaruConsole.
+                            ErrorWriteLine("Could not find second session. Have you inserted the correct type of disc?");
+
+                        return null;
+                    }
+
+                    AaruConsole.DebugWriteLine("SCSI Report",
+                                               "First session Lead-Out starts at {0:D2}:{1:D2}:{2:D2}",
+                                               firstSessionLeadOutTrack.PMIN, firstSessionLeadOutTrack.PSEC,
+                                               firstSessionLeadOutTrack.PFRAME);
+
+                    AaruConsole.DebugWriteLine("SCSI Report", "Second session starts at {0:D2}:{1:D2}:{2:D2}",
+                                               secondSessionFirstTrack.PMIN, secondSessionFirstTrack.PSEC,
+                                               secondSessionFirstTrack.PFRAME);
+
+                    // Skip Lead-Out pre-gap
+                    uint firstSessionLeadOutLba = (uint)((firstSessionLeadOutTrack.PMIN * 60 * 75) +
+                                                         (firstSessionLeadOutTrack.PSEC * 75)      +
+                                                         firstSessionLeadOutTrack.PFRAME           + 150);
+
+                    // Skip second session track pre-gap
+                    uint secondSessionLeadInLba = (uint)((secondSessionFirstTrack.PMIN * 60 * 75) +
+                                                         (secondSessionFirstTrack.PSEC * 75)      +
+                                                         secondSessionFirstTrack.PFRAME - 300);
+
+                    Spectre.ProgressSingleSpinner(ctx =>
+                    {
+                        ctx.AddTask("Trying SCSI READ CD in first session Lead-Out...").IsIndeterminate();
+
+                        mediaTest.CanReadingIntersessionLeadOut = !_dev.ReadCd(out buffer, out senseBuffer,
+                                                                               firstSessionLeadOutLba, 2448, 1,
+                                                                               MmcSectorTypes.AllTypes, false, false,
+                                                                               false, MmcHeaderCodes.AllHeaders, true,
+                                                                               false, MmcErrorField.None,
+                                                                               MmcSubchannel.Raw, _dev.Timeout, out _);
+
+                        if(mediaTest.CanReadingIntersessionLeadOut == false)
                         {
-                            AaruConsole.
-                                ErrorWriteLine("Could not find second session. Have you inserted the correct type of disc?");
-
-                            return null;
-                        }
-
-                        FullTOC.TrackDataDescriptor firstSessionLeadOutTrack =
-                            decodedToc.TrackDescriptors.FirstOrDefault(t => t.SessionNumber == 1 && t.POINT == 0xA2);
-
-                        FullTOC.TrackDataDescriptor secondSessionFirstTrack =
-                            decodedToc.TrackDescriptors.FirstOrDefault(t => t.SessionNumber > 1 && t.POINT <= 99);
-
-                        if(firstSessionLeadOutTrack.SessionNumber == 0 ||
-                           secondSessionFirstTrack.SessionNumber  == 0)
-                        {
-                            AaruConsole.
-                                ErrorWriteLine("Could not find second session. Have you inserted the correct type of disc?");
-
-                            return null;
-                        }
-
-                        AaruConsole.DebugWriteLine("SCSI Report",
-                                                   "First session Lead-Out starts at {0:D2}:{1:D2}:{2:D2}",
-                                                   firstSessionLeadOutTrack.PMIN, firstSessionLeadOutTrack.PSEC,
-                                                   firstSessionLeadOutTrack.PFRAME);
-
-                        AaruConsole.DebugWriteLine("SCSI Report", "Second session starts at {0:D2}:{1:D2}:{2:D2}",
-                                                   secondSessionFirstTrack.PMIN, secondSessionFirstTrack.PSEC,
-                                                   secondSessionFirstTrack.PFRAME);
-
-                        // Skip Lead-Out pre-gap
-                        uint firstSessionLeadOutLba = (uint)((firstSessionLeadOutTrack.PMIN * 60 * 75) +
-                                                             (firstSessionLeadOutTrack.PSEC * 75)      +
-                                                             firstSessionLeadOutTrack.PFRAME           + 150);
-
-                        // Skip second session track pre-gap
-                        uint secondSessionLeadInLba = (uint)((secondSessionFirstTrack.PMIN * 60 * 75) +
-                                                             (secondSessionFirstTrack.PSEC * 75)      +
-                                                             secondSessionFirstTrack.PFRAME - 300);
-
-                        Spectre.ProgressSingleSpinner(ctx =>
-                        {
-                            ctx.AddTask("Trying SCSI READ CD in first session Lead-Out...").IsIndeterminate();
-
                             mediaTest.CanReadingIntersessionLeadOut = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                          firstSessionLeadOutLba, 2448, 1,
-                                                                          MmcSectorTypes.AllTypes, false, false,
-                                                                          false, MmcHeaderCodes.AllHeaders, true,
+                                                                          firstSessionLeadOutLba, 2368, 1,
+                                                                          MmcSectorTypes.AllTypes, false,
+                                                                          false, false,
+                                                                          MmcHeaderCodes.AllHeaders, true,
                                                                           false, MmcErrorField.None,
-                                                                          MmcSubchannel.Raw, _dev.Timeout, out _);
+                                                                          MmcSubchannel.Q16, _dev.Timeout,
+                                                                          out _);
 
                             if(mediaTest.CanReadingIntersessionLeadOut == false)
-                            {
                                 mediaTest.CanReadingIntersessionLeadOut = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                              firstSessionLeadOutLba, 2368, 1,
+                                                                              firstSessionLeadOutLba, 2352, 1,
                                                                               MmcSectorTypes.AllTypes, false,
                                                                               false, false,
                                                                               MmcHeaderCodes.AllHeaders, true,
                                                                               false, MmcErrorField.None,
-                                                                              MmcSubchannel.Q16, _dev.Timeout,
+                                                                              MmcSubchannel.None, _dev.Timeout,
                                                                               out _);
+                        }
+                    });
 
-                                if(mediaTest.CanReadingIntersessionLeadOut == false)
-                                    mediaTest.CanReadingIntersessionLeadOut = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                                  firstSessionLeadOutLba, 2352, 1,
-                                                                                  MmcSectorTypes.AllTypes, false,
-                                                                                  false, false,
-                                                                                  MmcHeaderCodes.AllHeaders, true,
-                                                                                  false, MmcErrorField.None,
-                                                                                  MmcSubchannel.None, _dev.Timeout,
-                                                                                  out _);
-                            }
-                        });
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                               !mediaTest.CanReadingIntersessionLeadOut);
 
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                   !mediaTest.CanReadingIntersessionLeadOut);
+                    mediaTest.IntersessionLeadOutData = buffer;
 
-                        mediaTest.IntersessionLeadOutData = buffer;
+                    Spectre.ProgressSingleSpinner(ctx =>
+                    {
+                        ctx.AddTask("Trying SCSI READ CD in second session Lead-In...").IsIndeterminate();
 
-                        Spectre.ProgressSingleSpinner(ctx =>
+                        mediaTest.CanReadingIntersessionLeadIn = !_dev.ReadCd(out buffer, out senseBuffer,
+                                                                              secondSessionLeadInLba, 2448, 1,
+                                                                              MmcSectorTypes.AllTypes, false, false,
+                                                                              false, MmcHeaderCodes.AllHeaders, true,
+                                                                              false, MmcErrorField.None,
+                                                                              MmcSubchannel.Raw, _dev.Timeout, out _);
+
+                        if(mediaTest.CanReadingIntersessionLeadIn == false)
                         {
-                            ctx.AddTask("Trying SCSI READ CD in second session Lead-In...").IsIndeterminate();
-
                             mediaTest.CanReadingIntersessionLeadIn = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                         secondSessionLeadInLba, 2448, 1,
+                                                                         secondSessionLeadInLba, 2368, 1,
                                                                          MmcSectorTypes.AllTypes, false, false,
-                                                                         false, MmcHeaderCodes.AllHeaders, true,
-                                                                         false, MmcErrorField.None,
-                                                                         MmcSubchannel.Raw, _dev.Timeout, out _);
+                                                                         false, MmcHeaderCodes.AllHeaders,
+                                                                         true, false, MmcErrorField.None,
+                                                                         MmcSubchannel.Q16, _dev.Timeout,
+                                                                         out _);
 
                             if(mediaTest.CanReadingIntersessionLeadIn == false)
-                            {
                                 mediaTest.CanReadingIntersessionLeadIn = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                             secondSessionLeadInLba, 2368, 1,
-                                                                             MmcSectorTypes.AllTypes, false, false,
-                                                                             false, MmcHeaderCodes.AllHeaders,
-                                                                             true, false, MmcErrorField.None,
-                                                                             MmcSubchannel.Q16, _dev.Timeout,
+                                                                             secondSessionLeadInLba, 2352, 1,
+                                                                             MmcSectorTypes.AllTypes, false,
+                                                                             false, false,
+                                                                             MmcHeaderCodes.AllHeaders, true,
+                                                                             false, MmcErrorField.None,
+                                                                             MmcSubchannel.None, _dev.Timeout,
                                                                              out _);
+                        }
+                    });
 
-                                if(mediaTest.CanReadingIntersessionLeadIn == false)
-                                    mediaTest.CanReadingIntersessionLeadIn = !_dev.ReadCd(out buffer, out senseBuffer,
-                                                                                 secondSessionLeadInLba, 2352, 1,
-                                                                                 MmcSectorTypes.AllTypes, false,
-                                                                                 false, false,
-                                                                                 MmcHeaderCodes.AllHeaders, true,
-                                                                                 false, MmcErrorField.None,
-                                                                                 MmcSubchannel.None, _dev.Timeout,
-                                                                                 out _);
-                            }
-                        });
+                    AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
+                                               !mediaTest.CanReadingIntersessionLeadIn);
 
-                        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}",
-                                                   !mediaTest.CanReadingIntersessionLeadIn);
-
-                        mediaTest.IntersessionLeadInData = buffer;
-                    }
+                    mediaTest.IntersessionLeadInData = buffer;
                 }
             }
-
-            mediaTest.Blocks = null;
-
-            return mediaTest;
         }
+
+        mediaTest.Blocks = null;
+
+        return mediaTest;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Report/PCMCIA.cs b/Aaru.Core/Devices/Report/PCMCIA.cs
index f71db5476..1ee78ef15 100644
--- a/Aaru.Core/Devices/Report/PCMCIA.cs
+++ b/Aaru.Core/Devices/Report/PCMCIA.cs
@@ -33,52 +33,51 @@
 using Aaru.CommonTypes.Metadata;
 using Aaru.Decoders.PCMCIA;
 
-namespace Aaru.Core.Devices.Report
+namespace Aaru.Core.Devices.Report;
+
+/// <summary>Implements creating a report for a PCMCIA device</summary>
+public sealed partial class DeviceReport
 {
-    /// <summary>Implements creating a report for a PCMCIA device</summary>
-    public sealed partial class DeviceReport
+    /// <summary>Fills a device report with parameters specific to a PCMCIA device</summary>
+    public Pcmcia PcmciaReport()
     {
-        /// <summary>Fills a device report with parameters specific to a PCMCIA device</summary>
-        public Pcmcia PcmciaReport()
+        var pcmciaReport = new Pcmcia
         {
-            var pcmciaReport = new Pcmcia
-            {
-                CIS = _dev.Cis
-            };
+            CIS = _dev.Cis
+        };
 
-            Tuple[] tuples = CIS.GetTuples(_dev.Cis);
-
-            if(tuples == null)
-                return pcmciaReport;
-
-            foreach(Tuple tuple in tuples)
-                switch(tuple.Code)
-                {
-                    case TupleCodes.CISTPL_MANFID:
-                        ManufacturerIdentificationTuple manfid = CIS.DecodeManufacturerIdentificationTuple(tuple);
-
-                        if(manfid != null)
-                        {
-                            pcmciaReport.ManufacturerCode = manfid.ManufacturerID;
-                            pcmciaReport.CardCode         = manfid.CardID;
-                        }
-
-                        break;
-                    case TupleCodes.CISTPL_VERS_1:
-                        Level1VersionTuple vers = CIS.DecodeLevel1VersionTuple(tuple);
-
-                        if(vers != null)
-                        {
-                            pcmciaReport.Manufacturer          = vers.Manufacturer;
-                            pcmciaReport.ProductName           = vers.Product;
-                            pcmciaReport.Compliance            = $"{vers.MajorVersion}.{vers.MinorVersion}";
-                            pcmciaReport.AdditionalInformation = vers.AdditionalInformation;
-                        }
-
-                        break;
-                }
+        Tuple[] tuples = CIS.GetTuples(_dev.Cis);
 
+        if(tuples == null)
             return pcmciaReport;
-        }
+
+        foreach(Tuple tuple in tuples)
+            switch(tuple.Code)
+            {
+                case TupleCodes.CISTPL_MANFID:
+                    ManufacturerIdentificationTuple manfid = CIS.DecodeManufacturerIdentificationTuple(tuple);
+
+                    if(manfid != null)
+                    {
+                        pcmciaReport.ManufacturerCode = manfid.ManufacturerID;
+                        pcmciaReport.CardCode         = manfid.CardID;
+                    }
+
+                    break;
+                case TupleCodes.CISTPL_VERS_1:
+                    Level1VersionTuple vers = CIS.DecodeLevel1VersionTuple(tuple);
+
+                    if(vers != null)
+                    {
+                        pcmciaReport.Manufacturer          = vers.Manufacturer;
+                        pcmciaReport.ProductName           = vers.Product;
+                        pcmciaReport.Compliance            = $"{vers.MajorVersion}.{vers.MinorVersion}";
+                        pcmciaReport.AdditionalInformation = vers.AdditionalInformation;
+                    }
+
+                    break;
+            }
+
+        return pcmciaReport;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Report/SSC.cs b/Aaru.Core/Devices/Report/SSC.cs
index 5e4379a1f..d5e49806e 100644
--- a/Aaru.Core/Devices/Report/SSC.cs
+++ b/Aaru.Core/Devices/Report/SSC.cs
@@ -38,255 +38,254 @@ using Aaru.Decoders.SCSI.SSC;
 using Aaru.Devices;
 using Spectre.Console;
 
-namespace Aaru.Core.Devices.Report
+namespace Aaru.Core.Devices.Report;
+
+public sealed partial class DeviceReport
 {
-    public sealed partial class DeviceReport
+    /// <summary>Creates a report from a SCSI Sequential Commands device</summary>
+    /// <returns>SSC report</returns>
+    public Ssc ReportScsiSsc()
     {
-        /// <summary>Creates a report from a SCSI Sequential Commands device</summary>
-        /// <returns>SSC report</returns>
-        public Ssc ReportScsiSsc()
+        var    report = new Ssc();
+        bool   sense  = true;
+        byte[] buffer = Array.Empty<byte>();
+
+        Spectre.ProgressSingleSpinner(ctx =>
         {
-            var    report = new Ssc();
-            bool   sense  = true;
-            byte[] buffer = Array.Empty<byte>();
+            ctx.AddTask("Querying SCSI READ BLOCK LIMITS...").IsIndeterminate();
+            sense = _dev.ReadBlockLimits(out buffer, out _, _dev.Timeout, out _);
+        });
 
-            Spectre.ProgressSingleSpinner(ctx =>
+        if(!sense)
+        {
+            BlockLimits.BlockLimitsData? decBl = BlockLimits.Decode(buffer);
+
+            if(decBl?.granularity > 0)
+                report.BlockSizeGranularity = decBl.Value.granularity;
+
+            if(decBl?.maxBlockLen > 0)
+                report.MaxBlockLength = decBl.Value.maxBlockLen;
+
+            if(decBl?.minBlockLen > 0)
+                report.MinBlockLength = decBl.Value.minBlockLen;
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI REPORT DENSITY SUPPORT...").IsIndeterminate();
+            sense = _dev.ReportDensitySupport(out buffer, out _, false, false, _dev.Timeout, out _);
+        });
+
+        if(!sense)
+        {
+            DensitySupport.DensitySupportHeader? dsh = DensitySupport.DecodeDensity(buffer);
+
+            if(dsh.HasValue)
             {
-                ctx.AddTask("Querying SCSI READ BLOCK LIMITS...").IsIndeterminate();
-                sense = _dev.ReadBlockLimits(out buffer, out _, _dev.Timeout, out _);
-            });
+                SupportedDensity[] array = new SupportedDensity[dsh.Value.descriptors.Length];
 
-            if(!sense)
-            {
-                BlockLimits.BlockLimitsData? decBl = BlockLimits.Decode(buffer);
-
-                if(decBl?.granularity > 0)
-                    report.BlockSizeGranularity = decBl.Value.granularity;
-
-                if(decBl?.maxBlockLen > 0)
-                    report.MaxBlockLength = decBl.Value.maxBlockLen;
-
-                if(decBl?.minBlockLen > 0)
-                    report.MinBlockLength = decBl.Value.minBlockLen;
-            }
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI REPORT DENSITY SUPPORT...").IsIndeterminate();
-                sense = _dev.ReportDensitySupport(out buffer, out _, false, false, _dev.Timeout, out _);
-            });
-
-            if(!sense)
-            {
-                DensitySupport.DensitySupportHeader? dsh = DensitySupport.DecodeDensity(buffer);
-
-                if(dsh.HasValue)
-                {
-                    SupportedDensity[] array = new SupportedDensity[dsh.Value.descriptors.Length];
-
-                    for(int i = 0; i < dsh.Value.descriptors.Length; i++)
-                        array[i] = new SupportedDensity
-                        {
-                            BitsPerMm      = dsh.Value.descriptors[i].bpmm,
-                            Capacity       = dsh.Value.descriptors[i].capacity,
-                            DefaultDensity = dsh.Value.descriptors[i].defaultDensity,
-                            Description    = dsh.Value.descriptors[i].description,
-                            Duplicate      = dsh.Value.descriptors[i].duplicate,
-                            Name           = dsh.Value.descriptors[i].name,
-                            Organization   = dsh.Value.descriptors[i].organization,
-                            PrimaryCode    = dsh.Value.descriptors[i].primaryCode,
-                            SecondaryCode  = dsh.Value.descriptors[i].secondaryCode,
-                            Tracks         = dsh.Value.descriptors[i].tracks,
-                            Width          = dsh.Value.descriptors[i].width,
-                            Writable       = dsh.Value.descriptors[i].writable
-                        };
-
-                    report.SupportedDensities = array.ToList();
-                }
-            }
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI REPORT DENSITY SUPPORT for medium types...").IsIndeterminate();
-                sense = _dev.ReportDensitySupport(out buffer, out _, true, false, _dev.Timeout, out _);
-            });
-
-            if(sense)
-                return report;
-
-            DensitySupport.MediaTypeSupportHeader? mtsh = DensitySupport.DecodeMediumType(buffer);
-
-            if(!mtsh.HasValue)
-                return report;
-
-            SscSupportedMedia[] array2 = new SscSupportedMedia[mtsh.Value.descriptors.Length];
-
-            for(int i = 0; i < mtsh.Value.descriptors.Length; i++)
-            {
-                array2[i] = new SscSupportedMedia
-                {
-                    Description  = mtsh.Value.descriptors[i].description,
-                    Length       = mtsh.Value.descriptors[i].length,
-                    MediumType   = mtsh.Value.descriptors[i].mediumType,
-                    Name         = mtsh.Value.descriptors[i].name,
-                    Organization = mtsh.Value.descriptors[i].organization,
-                    Width        = mtsh.Value.descriptors[i].width
-                };
-
-                if(mtsh.Value.descriptors[i].densityCodes == null)
-                    continue;
-
-                DensityCode[] array3 = new DensityCode[mtsh.Value.descriptors[i].densityCodes.Length];
-
-                for(int j = 0; j < mtsh.Value.descriptors[i].densityCodes.Length; j++)
-                    array3[j] = new DensityCode
+                for(int i = 0; i < dsh.Value.descriptors.Length; i++)
+                    array[i] = new SupportedDensity
                     {
-                        Code = mtsh.Value.descriptors[i].densityCodes[j]
+                        BitsPerMm      = dsh.Value.descriptors[i].bpmm,
+                        Capacity       = dsh.Value.descriptors[i].capacity,
+                        DefaultDensity = dsh.Value.descriptors[i].defaultDensity,
+                        Description    = dsh.Value.descriptors[i].description,
+                        Duplicate      = dsh.Value.descriptors[i].duplicate,
+                        Name           = dsh.Value.descriptors[i].name,
+                        Organization   = dsh.Value.descriptors[i].organization,
+                        PrimaryCode    = dsh.Value.descriptors[i].primaryCode,
+                        SecondaryCode  = dsh.Value.descriptors[i].secondaryCode,
+                        Tracks         = dsh.Value.descriptors[i].tracks,
+                        Width          = dsh.Value.descriptors[i].width,
+                        Writable       = dsh.Value.descriptors[i].writable
                     };
 
-                array2[i].DensityCodes = array3.Distinct().ToList();
+                report.SupportedDensities = array.ToList();
             }
-
-            report.SupportedMediaTypes = array2.ToList();
-
-            return report;
         }
 
-        /// <summary>Creates a report for media inserted into an SSC device</summary>
-        /// <returns>Media report</returns>
-        public TestedSequentialMedia ReportSscMedia()
+        Spectre.ProgressSingleSpinner(ctx =>
         {
-            var    seqTest = new TestedSequentialMedia();
-            bool   sense   = true;
-            byte[] buffer  = Array.Empty<byte>();
+            ctx.AddTask("Querying SCSI REPORT DENSITY SUPPORT for medium types...").IsIndeterminate();
+            sense = _dev.ReportDensitySupport(out buffer, out _, true, false, _dev.Timeout, out _);
+        });
 
-            Modes.DecodedMode? decMode = null;
+        if(sense)
+            return report;
 
-            Spectre.ProgressSingleSpinner(ctx =>
+        DensitySupport.MediaTypeSupportHeader? mtsh = DensitySupport.DecodeMediumType(buffer);
+
+        if(!mtsh.HasValue)
+            return report;
+
+        SscSupportedMedia[] array2 = new SscSupportedMedia[mtsh.Value.descriptors.Length];
+
+        for(int i = 0; i < mtsh.Value.descriptors.Length; i++)
+        {
+            array2[i] = new SscSupportedMedia
             {
-                ctx.AddTask("Querying SCSI MODE SENSE (10)...").IsIndeterminate();
+                Description  = mtsh.Value.descriptors[i].description,
+                Length       = mtsh.Value.descriptors[i].length,
+                MediumType   = mtsh.Value.descriptors[i].mediumType,
+                Name         = mtsh.Value.descriptors[i].name,
+                Organization = mtsh.Value.descriptors[i].organization,
+                Width        = mtsh.Value.descriptors[i].width
+            };
 
-                sense = _dev.ModeSense10(out buffer, out _, false, true, ScsiModeSensePageControl.Current, 0x3F, 0x00,
-                                         _dev.Timeout, out _);
-            });
+            if(mtsh.Value.descriptors[i].densityCodes == null)
+                continue;
 
-            if(!sense &&
-               !_dev.Error)
-            {
-                decMode                 = Modes.DecodeMode10(buffer, _dev.ScsiType);
-                seqTest.ModeSense10Data = buffer;
-            }
+            DensityCode[] array3 = new DensityCode[mtsh.Value.descriptors[i].densityCodes.Length];
 
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI MODE SENSE...").IsIndeterminate();
-                sense = _dev.ModeSense(out buffer, out _, _dev.Timeout, out _);
-            });
-
-            if(!sense &&
-               !_dev.Error)
-            {
-                decMode ??= Modes.DecodeMode6(buffer, _dev.ScsiType);
-
-                seqTest.ModeSense6Data = buffer;
-            }
-
-            if(decMode.HasValue)
-            {
-                seqTest.MediumType = (byte)decMode.Value.Header.MediumType;
-
-                if(decMode.Value.Header.BlockDescriptors?.Length > 0)
-                    seqTest.Density = (byte)decMode.Value.Header.BlockDescriptors?[0].Density;
-            }
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI REPORT DENSITY SUPPORT for current media...").IsIndeterminate();
-                sense = _dev.ReportDensitySupport(out buffer, out _, false, true, _dev.Timeout, out _);
-            });
-
-            if(!sense)
-            {
-                DensitySupport.DensitySupportHeader? dsh = DensitySupport.DecodeDensity(buffer);
-
-                if(dsh.HasValue)
+            for(int j = 0; j < mtsh.Value.descriptors[i].densityCodes.Length; j++)
+                array3[j] = new DensityCode
                 {
-                    SupportedDensity[] array = new SupportedDensity[dsh.Value.descriptors.Length];
+                    Code = mtsh.Value.descriptors[i].densityCodes[j]
+                };
 
-                    for(int i = 0; i < dsh.Value.descriptors.Length; i++)
-                        array[i] = new SupportedDensity
-                        {
-                            BitsPerMm      = dsh.Value.descriptors[i].bpmm,
-                            Capacity       = dsh.Value.descriptors[i].capacity,
-                            DefaultDensity = dsh.Value.descriptors[i].defaultDensity,
-                            Description    = dsh.Value.descriptors[i].description,
-                            Duplicate      = dsh.Value.descriptors[i].duplicate,
-                            Name           = dsh.Value.descriptors[i].name,
-                            Organization   = dsh.Value.descriptors[i].organization,
-                            PrimaryCode    = dsh.Value.descriptors[i].primaryCode,
-                            SecondaryCode  = dsh.Value.descriptors[i].secondaryCode,
-                            Tracks         = dsh.Value.descriptors[i].tracks,
-                            Width          = dsh.Value.descriptors[i].width,
-                            Writable       = dsh.Value.descriptors[i].writable
-                        };
-
-                    seqTest.SupportedDensities = array.ToList();
-                }
-            }
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI REPORT DENSITY SUPPORT for medium types for current media...").
-                    IsIndeterminate();
-
-                sense = _dev.ReportDensitySupport(out buffer, out _, true, true, _dev.Timeout, out _);
-            });
-
-            if(!sense)
-            {
-                DensitySupport.MediaTypeSupportHeader? mtsh = DensitySupport.DecodeMediumType(buffer);
-
-                if(mtsh.HasValue)
-                {
-                    SscSupportedMedia[] array = new SscSupportedMedia[mtsh.Value.descriptors.Length];
-
-                    for(int i = 0; i < mtsh.Value.descriptors.Length; i++)
-                    {
-                        array[i] = new SscSupportedMedia
-                        {
-                            Description  = mtsh.Value.descriptors[i].description,
-                            Length       = mtsh.Value.descriptors[i].length,
-                            MediumType   = mtsh.Value.descriptors[i].mediumType,
-                            Name         = mtsh.Value.descriptors[i].name,
-                            Organization = mtsh.Value.descriptors[i].organization,
-                            Width        = mtsh.Value.descriptors[i].width
-                        };
-
-                        if(mtsh.Value.descriptors[i].densityCodes == null)
-                            continue;
-
-                        DensityCode[] array2 = new DensityCode[mtsh.Value.descriptors[i].densityCodes.Length];
-
-                        for(int j = 0; j < mtsh.Value.descriptors[i].densityCodes.Length; j++)
-                            array2[j] = new DensityCode
-                            {
-                                Code = mtsh.Value.descriptors[i].densityCodes[j]
-                            };
-
-                        array[i].DensityCodes = array2.Distinct().ToList();
-                    }
-
-                    seqTest.SupportedMediaTypes = array.ToList();
-                }
-            }
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ MEDIA SERIAL NUMBER...").IsIndeterminate();
-                seqTest.CanReadMediaSerial = !_dev.ReadMediaSerialNumber(out buffer, out _, _dev.Timeout, out _);
-            });
-
-            return seqTest;
+            array2[i].DensityCodes = array3.Distinct().ToList();
         }
+
+        report.SupportedMediaTypes = array2.ToList();
+
+        return report;
+    }
+
+    /// <summary>Creates a report for media inserted into an SSC device</summary>
+    /// <returns>Media report</returns>
+    public TestedSequentialMedia ReportSscMedia()
+    {
+        var    seqTest = new TestedSequentialMedia();
+        bool   sense   = true;
+        byte[] buffer  = Array.Empty<byte>();
+
+        Modes.DecodedMode? decMode = null;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI MODE SENSE (10)...").IsIndeterminate();
+
+            sense = _dev.ModeSense10(out buffer, out _, false, true, ScsiModeSensePageControl.Current, 0x3F, 0x00,
+                                     _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            decMode                 = Modes.DecodeMode10(buffer, _dev.ScsiType);
+            seqTest.ModeSense10Data = buffer;
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI MODE SENSE...").IsIndeterminate();
+            sense = _dev.ModeSense(out buffer, out _, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            decMode ??= Modes.DecodeMode6(buffer, _dev.ScsiType);
+
+            seqTest.ModeSense6Data = buffer;
+        }
+
+        if(decMode.HasValue)
+        {
+            seqTest.MediumType = (byte)decMode.Value.Header.MediumType;
+
+            if(decMode.Value.Header.BlockDescriptors?.Length > 0)
+                seqTest.Density = (byte)decMode.Value.Header.BlockDescriptors?[0].Density;
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI REPORT DENSITY SUPPORT for current media...").IsIndeterminate();
+            sense = _dev.ReportDensitySupport(out buffer, out _, false, true, _dev.Timeout, out _);
+        });
+
+        if(!sense)
+        {
+            DensitySupport.DensitySupportHeader? dsh = DensitySupport.DecodeDensity(buffer);
+
+            if(dsh.HasValue)
+            {
+                SupportedDensity[] array = new SupportedDensity[dsh.Value.descriptors.Length];
+
+                for(int i = 0; i < dsh.Value.descriptors.Length; i++)
+                    array[i] = new SupportedDensity
+                    {
+                        BitsPerMm      = dsh.Value.descriptors[i].bpmm,
+                        Capacity       = dsh.Value.descriptors[i].capacity,
+                        DefaultDensity = dsh.Value.descriptors[i].defaultDensity,
+                        Description    = dsh.Value.descriptors[i].description,
+                        Duplicate      = dsh.Value.descriptors[i].duplicate,
+                        Name           = dsh.Value.descriptors[i].name,
+                        Organization   = dsh.Value.descriptors[i].organization,
+                        PrimaryCode    = dsh.Value.descriptors[i].primaryCode,
+                        SecondaryCode  = dsh.Value.descriptors[i].secondaryCode,
+                        Tracks         = dsh.Value.descriptors[i].tracks,
+                        Width          = dsh.Value.descriptors[i].width,
+                        Writable       = dsh.Value.descriptors[i].writable
+                    };
+
+                seqTest.SupportedDensities = array.ToList();
+            }
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI REPORT DENSITY SUPPORT for medium types for current media...").
+                IsIndeterminate();
+
+            sense = _dev.ReportDensitySupport(out buffer, out _, true, true, _dev.Timeout, out _);
+        });
+
+        if(!sense)
+        {
+            DensitySupport.MediaTypeSupportHeader? mtsh = DensitySupport.DecodeMediumType(buffer);
+
+            if(mtsh.HasValue)
+            {
+                SscSupportedMedia[] array = new SscSupportedMedia[mtsh.Value.descriptors.Length];
+
+                for(int i = 0; i < mtsh.Value.descriptors.Length; i++)
+                {
+                    array[i] = new SscSupportedMedia
+                    {
+                        Description  = mtsh.Value.descriptors[i].description,
+                        Length       = mtsh.Value.descriptors[i].length,
+                        MediumType   = mtsh.Value.descriptors[i].mediumType,
+                        Name         = mtsh.Value.descriptors[i].name,
+                        Organization = mtsh.Value.descriptors[i].organization,
+                        Width        = mtsh.Value.descriptors[i].width
+                    };
+
+                    if(mtsh.Value.descriptors[i].densityCodes == null)
+                        continue;
+
+                    DensityCode[] array2 = new DensityCode[mtsh.Value.descriptors[i].densityCodes.Length];
+
+                    for(int j = 0; j < mtsh.Value.descriptors[i].densityCodes.Length; j++)
+                        array2[j] = new DensityCode
+                        {
+                            Code = mtsh.Value.descriptors[i].densityCodes[j]
+                        };
+
+                    array[i].DensityCodes = array2.Distinct().ToList();
+                }
+
+                seqTest.SupportedMediaTypes = array.ToList();
+            }
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ MEDIA SERIAL NUMBER...").IsIndeterminate();
+            seqTest.CanReadMediaSerial = !_dev.ReadMediaSerialNumber(out buffer, out _, _dev.Timeout, out _);
+        });
+
+        return seqTest;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Report/Scsi.cs b/Aaru.Core/Devices/Report/Scsi.cs
index 660bbac9a..ff89b362b 100644
--- a/Aaru.Core/Devices/Report/Scsi.cs
+++ b/Aaru.Core/Devices/Report/Scsi.cs
@@ -42,231 +42,224 @@ using Aaru.Helpers;
 using Spectre.Console;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 
-namespace Aaru.Core.Devices.Report
+namespace Aaru.Core.Devices.Report;
+
+public sealed partial class DeviceReport
 {
-    public sealed partial class DeviceReport
+    /// <summary>Creates a report for the SCSI INQUIRY response</summary>
+    /// <returns>SCSI report</returns>
+    public Scsi ReportScsiInquiry()
     {
-        /// <summary>Creates a report for the SCSI INQUIRY response</summary>
-        /// <returns>SCSI report</returns>
-        public Scsi ReportScsiInquiry()
+        bool   sense  = true;
+        byte[] buffer = Array.Empty<byte>();
+
+        Spectre.ProgressSingleSpinner(ctx =>
         {
-            bool   sense  = true;
-            byte[] buffer = Array.Empty<byte>();
+            ctx.AddTask("Querying SCSI INQUIRY...").IsIndeterminate();
+            sense = _dev.ScsiInquiry(out buffer, out _);
+        });
 
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI INQUIRY...").IsIndeterminate();
-                sense = _dev.ScsiInquiry(out buffer, out _);
-            });
+        var report = new Scsi();
 
-            var report = new Scsi();
+        if(sense)
+            return null;
 
-            if(sense)
-                return null;
+        Inquiry? decodedNullable = Inquiry.Decode(buffer);
 
-            Inquiry? decodedNullable = Inquiry.Decode(buffer);
+        if(!decodedNullable.HasValue)
+            return null;
 
-            if(!decodedNullable.HasValue)
-                return null;
+        report.InquiryData = ClearInquiry(buffer);
 
-            report.InquiryData = ClearInquiry(buffer);
+        return report;
+    }
 
-            return report;
-        }
-
-        internal static byte[] ClearInquiry(byte[] inquiry)
-        {
-            Inquiry? decodedNullable = Inquiry.Decode(inquiry);
-
-            if(!decodedNullable.HasValue)
-                return inquiry;
-
-            Inquiry decoded = decodedNullable.Value;
-
-            if(!decoded.SeagatePresent ||
-               StringHandlers.CToString(decoded.VendorIdentification)?.Trim().ToLowerInvariant() != "seagate")
-                return inquiry;
-
-            // Clear Seagate serial number
-            for(int i = 36; i <= 43; i++)
-                inquiry[i] = 0;
+    internal static byte[] ClearInquiry(byte[] inquiry)
+    {
+        Inquiry? decodedNullable = Inquiry.Decode(inquiry);
 
+        if(!decodedNullable.HasValue)
             return inquiry;
-        }
 
-        /// <summary>Returns a list of decoded SCSI EVPD pages</summary>
-        /// <param name="vendor">Decoded SCSI vendor identification</param>
-        /// <returns>List of decoded SCSI EVPD pages</returns>
-        public List<ScsiPage> ReportEvpdPages(string vendor)
+        Inquiry decoded = decodedNullable.Value;
+
+        if(!decoded.SeagatePresent ||
+           StringHandlers.CToString(decoded.VendorIdentification)?.Trim().ToLowerInvariant() != "seagate")
+            return inquiry;
+
+        // Clear Seagate serial number
+        for(int i = 36; i <= 43; i++)
+            inquiry[i] = 0;
+
+        return inquiry;
+    }
+
+    /// <summary>Returns a list of decoded SCSI EVPD pages</summary>
+    /// <param name="vendor">Decoded SCSI vendor identification</param>
+    /// <returns>List of decoded SCSI EVPD pages</returns>
+    public List<ScsiPage> ReportEvpdPages(string vendor)
+    {
+        bool   sense  = false;
+        byte[] buffer = Array.Empty<byte>();
+
+        Spectre.ProgressSingleSpinner(ctx =>
         {
-            bool   sense  = false;
-            byte[] buffer = Array.Empty<byte>();
+            ctx.AddTask("Querying list of SCSI EVPDs...").IsIndeterminate();
+            sense = _dev.ScsiInquiry(out buffer, out _, 0x00);
+        });
 
-            Spectre.ProgressSingleSpinner(ctx =>
+        if(sense)
+            return null;
+
+        byte[] evpdPages = EVPD.DecodePage00(buffer);
+
+        if(evpdPages        == null ||
+           evpdPages.Length <= 0)
+            return null;
+
+        List<ScsiPage> evpds = new();
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ProgressTask task = ctx.
+                                AddTask("Querying SCSI EVPD pages...",
+                                        maxValue: evpdPages.Count(page => page != 0x80)).IsIndeterminate();
+
+            foreach(byte page in evpdPages.Where(page => page != 0x80))
             {
-                ctx.AddTask("Querying list of SCSI EVPDs...").IsIndeterminate();
-                sense = _dev.ScsiInquiry(out buffer, out _, 0x00);
-            });
+                task.Description = $"Querying SCSI EVPD {page:X2}h...";
+                task.Increment(1);
+                sense = _dev.ScsiInquiry(out buffer, out _, page);
 
-            if(sense)
-                return null;
+                if(sense)
+                    continue;
 
-            byte[] evpdPages = EVPD.DecodePage00(buffer);
+                byte[] empty;
 
-            if(evpdPages        == null ||
-               evpdPages.Length <= 0)
-                return null;
-
-            List<ScsiPage> evpds = new();
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ProgressTask task = ctx.
-                                    AddTask("Querying SCSI EVPD pages...",
-                                            maxValue: evpdPages.Count(page => page != 0x80)).IsIndeterminate();
-
-                foreach(byte page in evpdPages.Where(page => page != 0x80))
+                switch(page)
                 {
-                    task.Description = $"Querying SCSI EVPD {page:X2}h...";
-                    task.Increment(1);
-                    sense = _dev.ScsiInquiry(out buffer, out _, page);
+                    case 0x83:
+                        buffer = ClearPage83(buffer);
 
-                    if(sense)
-                        continue;
+                        break;
+                    case 0x80:
+                        byte[] identify = new byte[512];
+                        Array.Copy(buffer, 60, identify, 0, 512);
+                        identify = ClearIdentify(identify);
+                        Array.Copy(identify, 0, buffer, 60, 512);
 
-                    byte[] empty;
+                        break;
+                    case 0xB1:
+                    case 0xB3:
+                        empty = new byte[buffer.Length - 4];
+                        Array.Copy(empty, 0, buffer, 4, buffer.Length - 4);
 
-                    switch(page)
-                    {
-                        case 0x83:
-                            buffer = ClearPage83(buffer);
+                        break;
+                    case 0xC1 when vendor == "ibm":
+                        empty = new byte[12];
+                        Array.Copy(empty, 0, buffer, 4, 12);
+                        Array.Copy(empty, 0, buffer, 16, 12);
 
-                            break;
-                        case 0x80:
-                            byte[] identify = new byte[512];
-                            Array.Copy(buffer, 60, identify, 0, 512);
-                            identify = ClearIdentify(identify);
-                            Array.Copy(identify, 0, buffer, 60, 512);
+                        break;
+                    case 0xC2 when vendor == "certance":
+                    case 0xC3 when vendor == "certance":
+                    case 0xC4 when vendor == "certance":
+                    case 0xC5 when vendor == "certance":
+                    case 0xC6 when vendor == "certance":
+                        Array.Copy(new byte[12], 0, buffer, 4, 12);
 
-                            break;
-                        case 0xB1:
-                        case 0xB3:
-                            empty = new byte[buffer.Length - 4];
-                            Array.Copy(empty, 0, buffer, 4, buffer.Length - 4);
-
-                            break;
-                        case 0xC1 when vendor == "ibm":
-                            empty = new byte[12];
-                            Array.Copy(empty, 0, buffer, 4, 12);
-                            Array.Copy(empty, 0, buffer, 16, 12);
-
-                            break;
-                        case 0xC2 when vendor == "certance":
-                        case 0xC3 when vendor == "certance":
-                        case 0xC4 when vendor == "certance":
-                        case 0xC5 when vendor == "certance":
-                        case 0xC6 when vendor == "certance":
-                            Array.Copy(new byte[12], 0, buffer, 4, 12);
-
-                            break;
-                    }
-
-                    var evpd = new ScsiPage
-                    {
-                        page  = page,
-                        value = buffer
-                    };
-
-                    evpds.Add(evpd);
+                        break;
                 }
-            });
 
-            return evpds.Count > 0 ? evpds : null;
-        }
+                var evpd = new ScsiPage
+                {
+                    page  = page,
+                    value = buffer
+                };
 
-        byte[] ClearPage83(byte[] pageResponse)
-        {
-            if(pageResponse?[1] != 0x83)
-                return null;
-
-            if(pageResponse[3] + 4 != pageResponse.Length)
-                return null;
-
-            if(pageResponse.Length < 6)
-                return null;
-
-            int position = 4;
-
-            while(position < pageResponse.Length)
-            {
-                byte length = pageResponse[position + 3];
-
-                if(length + position + 4 >= pageResponse.Length)
-                    length = (byte)(pageResponse.Length - position - 4);
-
-                byte[] empty = new byte[length];
-                Array.Copy(empty, 0, pageResponse, position + 4, length);
-
-                position += 4 + length;
+                evpds.Add(evpd);
             }
+        });
 
-            return pageResponse;
+        return evpds.Count > 0 ? evpds : null;
+    }
+
+    byte[] ClearPage83(byte[] pageResponse)
+    {
+        if(pageResponse?[1] != 0x83)
+            return null;
+
+        if(pageResponse[3] + 4 != pageResponse.Length)
+            return null;
+
+        if(pageResponse.Length < 6)
+            return null;
+
+        int position = 4;
+
+        while(position < pageResponse.Length)
+        {
+            byte length = pageResponse[position + 3];
+
+            if(length + position + 4 >= pageResponse.Length)
+                length = (byte)(pageResponse.Length - position - 4);
+
+            byte[] empty = new byte[length];
+            Array.Copy(empty, 0, pageResponse, position + 4, length);
+
+            position += 4 + length;
         }
 
-        /// <summary>Adds reports for the decoded SCSI MODE SENSE pages to a device report</summary>
-        /// <param name="report">Device report</param>
-        /// <param name="cdromMode">Returns raw MODE SENSE page 2Ah, aka CD-ROM page</param>
-        /// <param name="mediumType">Returns decoded list of supported media types response</param>
-        public void ReportScsiModes(ref DeviceReportV2 report, out byte[] cdromMode, out MediumTypes mediumType)
+        return pageResponse;
+    }
+
+    /// <summary>Adds reports for the decoded SCSI MODE SENSE pages to a device report</summary>
+    /// <param name="report">Device report</param>
+    /// <param name="cdromMode">Returns raw MODE SENSE page 2Ah, aka CD-ROM page</param>
+    /// <param name="mediumType">Returns decoded list of supported media types response</param>
+    public void ReportScsiModes(ref DeviceReportV2 report, out byte[] cdromMode, out MediumTypes mediumType)
+    {
+        Modes.DecodedMode?    decMode = null;
+        PeripheralDeviceTypes devType = _dev.ScsiType;
+        byte[]                mode10Buffer;
+        byte[]                mode6Buffer;
+        bool                  sense;
+        mediumType = 0;
+
+        DeviceReportV2 v2 = report;
+
+        Spectre.ProgressSingleSpinner(ctx =>
         {
-            Modes.DecodedMode?    decMode = null;
-            PeripheralDeviceTypes devType = _dev.ScsiType;
-            byte[]                mode10Buffer;
-            byte[]                mode6Buffer;
-            bool                  sense;
-            mediumType = 0;
+            ctx.AddTask("Querying all mode pages and subpages using SCSI MODE SENSE (10)...").IsIndeterminate();
 
-            DeviceReportV2 v2 = report;
-
-            Spectre.ProgressSingleSpinner(ctx =>
+            foreach(ScsiModeSensePageControl pageControl in new[]
+                    {
+                        ScsiModeSensePageControl.Default, ScsiModeSensePageControl.Current,
+                        ScsiModeSensePageControl.Changeable
+                    })
             {
-                ctx.AddTask("Querying all mode pages and subpages using SCSI MODE SENSE (10)...").IsIndeterminate();
+                bool saveBuffer = false;
 
-                foreach(ScsiModeSensePageControl pageControl in new[]
-                {
-                    ScsiModeSensePageControl.Default, ScsiModeSensePageControl.Current,
-                    ScsiModeSensePageControl.Changeable
-                })
-                {
-                    bool saveBuffer = false;
+                sense = _dev.ModeSense10(out mode10Buffer, out _, false, true, pageControl, 0x3F, 0xFF,
+                                         _dev.Timeout, out _);
 
-                    sense = _dev.ModeSense10(out mode10Buffer, out _, false, true, pageControl, 0x3F, 0xFF,
+                if(sense || _dev.Error)
+                {
+                    sense = _dev.ModeSense10(out mode10Buffer, out _, false, false, pageControl, 0x3F, 0xFF,
                                              _dev.Timeout, out _);
 
                     if(sense || _dev.Error)
                     {
-                        sense = _dev.ModeSense10(out mode10Buffer, out _, false, false, pageControl, 0x3F, 0xFF,
+                        sense = _dev.ModeSense10(out mode10Buffer, out _, false, true, pageControl, 0x3F, 0x00,
                                                  _dev.Timeout, out _);
 
                         if(sense || _dev.Error)
                         {
-                            sense = _dev.ModeSense10(out mode10Buffer, out _, false, true, pageControl, 0x3F, 0x00,
+                            sense = _dev.ModeSense10(out mode10Buffer, out _, false, false, pageControl, 0x3F, 0x00,
                                                      _dev.Timeout, out _);
 
-                            if(sense || _dev.Error)
-                            {
-                                sense = _dev.ModeSense10(out mode10Buffer, out _, false, false, pageControl, 0x3F, 0x00,
-                                                         _dev.Timeout, out _);
-
-                                if(!sense &&
-                                   !_dev.Error)
-                                {
-                                    v2.SCSI.SupportsModeSense10 =   true;
-                                    decMode                     ??= Modes.DecodeMode10(mode10Buffer, devType);
-                                    saveBuffer                  =   true;
-                                }
-                            }
-                            else
+                            if(!sense &&
+                               !_dev.Error)
                             {
                                 v2.SCSI.SupportsModeSense10 =   true;
                                 decMode                     ??= Modes.DecodeMode10(mode10Buffer, devType);
@@ -275,10 +268,9 @@ namespace Aaru.Core.Devices.Report
                         }
                         else
                         {
-                            v2.SCSI.SupportsModeSense10  =   true;
-                            v2.SCSI.SupportsModeSubpages =   true;
-                            decMode                      ??= Modes.DecodeMode10(mode10Buffer, devType);
-                            saveBuffer                   =   true;
+                            v2.SCSI.SupportsModeSense10 =   true;
+                            decMode                     ??= Modes.DecodeMode10(mode10Buffer, devType);
+                            saveBuffer                  =   true;
                         }
                     }
                     else
@@ -288,75 +280,76 @@ namespace Aaru.Core.Devices.Report
                         decMode                      ??= Modes.DecodeMode10(mode10Buffer, devType);
                         saveBuffer                   =   true;
                     }
-
-                    if(!saveBuffer)
-                        continue;
-
-                    switch(pageControl)
-                    {
-                        case ScsiModeSensePageControl.Default:
-                            v2.SCSI.ModeSense10Data = mode10Buffer;
-
-                            break;
-                        case ScsiModeSensePageControl.Changeable:
-                            v2.SCSI.ModeSense10ChangeableData = mode10Buffer;
-
-                            break;
-                        case ScsiModeSensePageControl.Current:
-                            v2.SCSI.ModeSense10CurrentData = mode10Buffer;
-
-                            break;
-                    }
                 }
-            });
+                else
+                {
+                    v2.SCSI.SupportsModeSense10  =   true;
+                    v2.SCSI.SupportsModeSubpages =   true;
+                    decMode                      ??= Modes.DecodeMode10(mode10Buffer, devType);
+                    saveBuffer                   =   true;
+                }
 
-            Spectre.ProgressSingleSpinner(ctx =>
+                if(!saveBuffer)
+                    continue;
+
+                switch(pageControl)
+                {
+                    case ScsiModeSensePageControl.Default:
+                        v2.SCSI.ModeSense10Data = mode10Buffer;
+
+                        break;
+                    case ScsiModeSensePageControl.Changeable:
+                        v2.SCSI.ModeSense10ChangeableData = mode10Buffer;
+
+                        break;
+                    case ScsiModeSensePageControl.Current:
+                        v2.SCSI.ModeSense10CurrentData = mode10Buffer;
+
+                        break;
+                }
+            }
+        });
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying all mode pages and subpages using SCSI MODE SENSE (6)...").IsIndeterminate();
+
+            foreach(ScsiModeSensePageControl pageControl in new[]
+                    {
+                        ScsiModeSensePageControl.Default, ScsiModeSensePageControl.Current,
+                        ScsiModeSensePageControl.Changeable
+                    })
             {
-                ctx.AddTask("Querying all mode pages and subpages using SCSI MODE SENSE (6)...").IsIndeterminate();
+                bool saveBuffer = false;
+                sense = _dev.ModeSense6(out mode6Buffer, out _, true, pageControl, 0x3F, 0xFF, _dev.Timeout, out _);
 
-                foreach(ScsiModeSensePageControl pageControl in new[]
+                if(sense || _dev.Error)
                 {
-                    ScsiModeSensePageControl.Default, ScsiModeSensePageControl.Current,
-                    ScsiModeSensePageControl.Changeable
-                })
-                {
-                    bool saveBuffer = false;
-                    sense = _dev.ModeSense6(out mode6Buffer, out _, true, pageControl, 0x3F, 0xFF, _dev.Timeout, out _);
+                    sense = _dev.ModeSense6(out mode6Buffer, out _, false, pageControl, 0x3F, 0xFF, _dev.Timeout,
+                                            out _);
 
                     if(sense || _dev.Error)
                     {
-                        sense = _dev.ModeSense6(out mode6Buffer, out _, false, pageControl, 0x3F, 0xFF, _dev.Timeout,
+                        sense = _dev.ModeSense6(out mode6Buffer, out _, true, pageControl, 0x3F, 0x00, _dev.Timeout,
                                                 out _);
 
                         if(sense || _dev.Error)
                         {
-                            sense = _dev.ModeSense6(out mode6Buffer, out _, true, pageControl, 0x3F, 0x00, _dev.Timeout,
-                                                    out _);
+                            sense = _dev.ModeSense6(out mode6Buffer, out _, false, pageControl, 0x3F, 0x00,
+                                                    _dev.Timeout, out _);
 
                             if(sense || _dev.Error)
                             {
-                                sense = _dev.ModeSense6(out mode6Buffer, out _, false, pageControl, 0x3F, 0x00,
+                                sense = _dev.ModeSense6(out mode6Buffer, out _, true, pageControl, 0x00, 0x00,
                                                         _dev.Timeout, out _);
 
                                 if(sense || _dev.Error)
                                 {
-                                    sense = _dev.ModeSense6(out mode6Buffer, out _, true, pageControl, 0x00, 0x00,
+                                    sense = _dev.ModeSense6(out mode6Buffer, out _, false, pageControl, 0x00, 0x00,
                                                             _dev.Timeout, out _);
 
-                                    if(sense || _dev.Error)
-                                    {
-                                        sense = _dev.ModeSense6(out mode6Buffer, out _, false, pageControl, 0x00, 0x00,
-                                                                _dev.Timeout, out _);
-
-                                        if(!sense &&
-                                           !_dev.Error)
-                                        {
-                                            v2.SCSI.SupportsModeSense6 =   true;
-                                            decMode                    ??= Modes.DecodeMode6(mode6Buffer, devType);
-                                            saveBuffer                 =   true;
-                                        }
-                                    }
-                                    else
+                                    if(!sense &&
+                                       !_dev.Error)
                                     {
                                         v2.SCSI.SupportsModeSense6 =   true;
                                         decMode                    ??= Modes.DecodeMode6(mode6Buffer, devType);
@@ -379,221 +372,260 @@ namespace Aaru.Core.Devices.Report
                         }
                         else
                         {
-                            v2.SCSI.SupportsModeSense10  =   true;
-                            v2.SCSI.SupportsModeSubpages =   true;
-                            decMode                      ??= Modes.DecodeMode6(mode6Buffer, devType);
-                            saveBuffer                   =   true;
+                            v2.SCSI.SupportsModeSense6 =   true;
+                            decMode                    ??= Modes.DecodeMode6(mode6Buffer, devType);
+                            saveBuffer                 =   true;
                         }
                     }
                     else
                     {
-                        v2.SCSI.SupportsModeSense6   =   true;
+                        v2.SCSI.SupportsModeSense10  =   true;
                         v2.SCSI.SupportsModeSubpages =   true;
                         decMode                      ??= Modes.DecodeMode6(mode6Buffer, devType);
                         saveBuffer                   =   true;
                     }
-
-                    if(!saveBuffer)
-                        continue;
-
-                    switch(pageControl)
-                    {
-                        case ScsiModeSensePageControl.Default:
-                            v2.SCSI.ModeSense6Data = mode6Buffer;
-
-                            break;
-                        case ScsiModeSensePageControl.Changeable:
-                            v2.SCSI.ModeSense6ChangeableData = mode6Buffer;
-
-                            break;
-                        case ScsiModeSensePageControl.Current:
-                            v2.SCSI.ModeSense6CurrentData = mode6Buffer;
-
-                            break;
-                    }
                 }
-            });
+                else
+                {
+                    v2.SCSI.SupportsModeSense6   =   true;
+                    v2.SCSI.SupportsModeSubpages =   true;
+                    decMode                      ??= Modes.DecodeMode6(mode6Buffer, devType);
+                    saveBuffer                   =   true;
+                }
 
-            report = v2;
+                if(!saveBuffer)
+                    continue;
 
-            cdromMode = null;
+                switch(pageControl)
+                {
+                    case ScsiModeSensePageControl.Default:
+                        v2.SCSI.ModeSense6Data = mode6Buffer;
 
-            if(!decMode.HasValue)
-                return;
+                        break;
+                    case ScsiModeSensePageControl.Changeable:
+                        v2.SCSI.ModeSense6ChangeableData = mode6Buffer;
 
-            mediumType = decMode.Value.Header.MediumType;
+                        break;
+                    case ScsiModeSensePageControl.Current:
+                        v2.SCSI.ModeSense6CurrentData = mode6Buffer;
 
-            report.SCSI.ModeSense = new ScsiMode
+                        break;
+                }
+            }
+        });
+
+        report = v2;
+
+        cdromMode = null;
+
+        if(!decMode.HasValue)
+            return;
+
+        mediumType = decMode.Value.Header.MediumType;
+
+        report.SCSI.ModeSense = new ScsiMode
+        {
+            BlankCheckEnabled = decMode.Value.Header.EBC,
+            DPOandFUA         = decMode.Value.Header.DPOFUA,
+            WriteProtected    = decMode.Value.Header.WriteProtected
+        };
+
+        if(decMode.Value.Header.BufferedMode > 0)
+            report.SCSI.ModeSense.BufferedMode = decMode.Value.Header.BufferedMode;
+
+        if(decMode.Value.Header.Speed > 0)
+            report.SCSI.ModeSense.Speed = decMode.Value.Header.Speed;
+
+        if(decMode.Value.Pages == null)
+            return;
+
+        List<ScsiPage> modePages = new();
+
+        foreach(Modes.ModePage page in decMode.Value.Pages)
+        {
+            var modePage = new ScsiPage
             {
-                BlankCheckEnabled = decMode.Value.Header.EBC,
-                DPOandFUA         = decMode.Value.Header.DPOFUA,
-                WriteProtected    = decMode.Value.Header.WriteProtected
+                page    = page.Page,
+                subpage = page.Subpage,
+                value   = page.PageResponse
             };
 
-            if(decMode.Value.Header.BufferedMode > 0)
-                report.SCSI.ModeSense.BufferedMode = decMode.Value.Header.BufferedMode;
+            modePages.Add(modePage);
 
-            if(decMode.Value.Header.Speed > 0)
-                report.SCSI.ModeSense.Speed = decMode.Value.Header.Speed;
-
-            if(decMode.Value.Pages == null)
-                return;
-
-            List<ScsiPage> modePages = new();
-
-            foreach(Modes.ModePage page in decMode.Value.Pages)
-            {
-                var modePage = new ScsiPage
-                {
-                    page    = page.Page,
-                    subpage = page.Subpage,
-                    value   = page.PageResponse
-                };
-
-                modePages.Add(modePage);
-
-                if(modePage.page    == 0x2A &&
-                   modePage.subpage == 0x00)
-                    cdromMode = page.PageResponse;
-            }
-
-            if(modePages.Count > 0)
-                report.SCSI.ModeSense.ModePages = modePages;
+            if(modePage.page    == 0x2A &&
+               modePage.subpage == 0x00)
+                cdromMode = page.PageResponse;
         }
 
-        /// <summary>Creates a report for media inserted into a SCSI device</summary>
-        /// <returns>Media report</returns>
-        public TestedMedia ReportScsiMedia()
+        if(modePages.Count > 0)
+            report.SCSI.ModeSense.ModePages = modePages;
+    }
+
+    /// <summary>Creates a report for media inserted into a SCSI device</summary>
+    /// <returns>Media report</returns>
+    public TestedMedia ReportScsiMedia()
+    {
+        var    mediaTest   = new TestedMedia();
+        bool   sense       = true;
+        byte[] buffer      = Array.Empty<byte>();
+        byte[] senseBuffer = Array.Empty<byte>();
+
+        Spectre.ProgressSingleSpinner(ctx =>
         {
-            var    mediaTest   = new TestedMedia();
-            bool   sense       = true;
-            byte[] buffer      = Array.Empty<byte>();
-            byte[] senseBuffer = Array.Empty<byte>();
+            ctx.AddTask("Querying SCSI READ CAPACITY...").IsIndeterminate();
+            sense = _dev.ReadCapacity(out buffer, out senseBuffer, _dev.Timeout, out _);
+        });
 
-            Spectre.ProgressSingleSpinner(ctx =>
+        if(!sense &&
+           !_dev.Error)
+        {
+            mediaTest.SupportsReadCapacity = true;
+
+            mediaTest.Blocks = ((ulong)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3]) &
+                                0xFFFFFFFF) + 1;
+
+            mediaTest.BlockSize = (uint)((buffer[4] << 24) + (buffer[5] << 16) + (buffer[6] << 8) + buffer[7]);
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI READ CAPACITY (16)...").IsIndeterminate();
+            sense = _dev.ReadCapacity16(out buffer, out buffer, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            mediaTest.SupportsReadCapacity16 = true;
+            byte[] temp = new byte[8];
+            Array.Copy(buffer, 0, temp, 0, 8);
+            Array.Reverse(temp);
+            mediaTest.Blocks    = BitConverter.ToUInt64(temp, 0) + 1;
+            mediaTest.BlockSize = (uint)((buffer[8] << 24) + (buffer[9] << 16) + (buffer[10] << 8) + buffer[11]);
+        }
+
+        Modes.DecodedMode? decMode = null;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI MODE SENSE (10)...").IsIndeterminate();
+
+            sense = _dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current,
+                                     0x3F, 0x00, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            decMode                   = Modes.DecodeMode10(buffer, _dev.ScsiType);
+            mediaTest.ModeSense10Data = buffer;
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI MODE SENSE...").IsIndeterminate();
+            sense = _dev.ModeSense(out buffer, out senseBuffer, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            decMode ??= Modes.DecodeMode6(buffer, _dev.ScsiType);
+
+            mediaTest.ModeSense6Data = buffer;
+        }
+
+        if(decMode.HasValue)
+        {
+            mediaTest.MediumType = (byte)decMode.Value.Header.MediumType;
+
+            if(decMode.Value.Header.BlockDescriptors?.Length > 0)
+                mediaTest.Density = (byte)decMode.Value.Header.BlockDescriptors[0].Density;
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ (6)...").IsIndeterminate();
+
+            mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 0, mediaTest.BlockSize ?? 512,
+                                                  _dev.Timeout, out _);
+        });
+
+        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead6);
+        mediaTest.Read6Data = buffer;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ (10)...").IsIndeterminate();
+
+            mediaTest.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, false, false, false, 0,
+                                                    mediaTest.BlockSize ?? 512, 0, 1, _dev.Timeout, out _);
+        });
+
+        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead10);
+        mediaTest.Read10Data = buffer;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ (12)...").IsIndeterminate();
+
+            mediaTest.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, false, false, false, 0,
+                                                    mediaTest.BlockSize ?? 512, 0, 1, false, _dev.Timeout, out _);
+        });
+
+        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead12);
+        mediaTest.Read12Data = buffer;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ (16)...").IsIndeterminate();
+
+            mediaTest.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, false, false, 0,
+                                                    mediaTest.BlockSize ?? 512, 0, 1, false, _dev.Timeout, out _);
+        });
+
+        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead16);
+        mediaTest.Read16Data = buffer;
+
+        mediaTest.LongBlockSize = mediaTest.BlockSize;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
+            sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 0xFFFF, _dev.Timeout, out _);
+        });
+
+        if(sense && !_dev.Error)
+        {
+            DecodedSense? decSense = Sense.Decode(senseBuffer);
+
+            if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
+               decSense.Value.ASC  == 0x24                     &&
+               decSense.Value.ASCQ == 0x00)
             {
-                ctx.AddTask("Querying SCSI READ CAPACITY...").IsIndeterminate();
-                sense = _dev.ReadCapacity(out buffer, out senseBuffer, _dev.Timeout, out _);
-            });
+                mediaTest.SupportsReadLong = true;
 
-            if(!sense &&
-               !_dev.Error)
-            {
-                mediaTest.SupportsReadCapacity = true;
+                bool valid       = decSense.Value.Fixed?.InformationValid == true;
+                bool ili         = decSense.Value.Fixed?.ILI              == true;
+                uint information = decSense.Value.Fixed?.Information ?? 0;
 
-                mediaTest.Blocks = ((ulong)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3]) &
-                                    0xFFFFFFFF) + 1;
+                if(decSense.Value.Descriptor.HasValue &&
+                   decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
+                {
+                    valid       = true;
+                    ili         = true;
+                    information = (uint)Sense.DecodeDescriptor00(desc00);
+                }
 
-                mediaTest.BlockSize = (uint)((buffer[4] << 24) + (buffer[5] << 16) + (buffer[6] << 8) + buffer[7]);
+                if(valid && ili)
+                    mediaTest.LongBlockSize = 0xFFFF - (information & 0xFFFF);
             }
+        }
 
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI READ CAPACITY (16)...").IsIndeterminate();
-                sense = _dev.ReadCapacity16(out buffer, out buffer, _dev.Timeout, out _);
-            });
-
-            if(!sense &&
-               !_dev.Error)
-            {
-                mediaTest.SupportsReadCapacity16 = true;
-                byte[] temp = new byte[8];
-                Array.Copy(buffer, 0, temp, 0, 8);
-                Array.Reverse(temp);
-                mediaTest.Blocks    = BitConverter.ToUInt64(temp, 0) + 1;
-                mediaTest.BlockSize = (uint)((buffer[8] << 24) + (buffer[9] << 16) + (buffer[10] << 8) + buffer[11]);
-            }
-
-            Modes.DecodedMode? decMode = null;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI MODE SENSE (10)...").IsIndeterminate();
-
-                sense = _dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current,
-                                         0x3F, 0x00, _dev.Timeout, out _);
-            });
-
-            if(!sense &&
-               !_dev.Error)
-            {
-                decMode                   = Modes.DecodeMode10(buffer, _dev.ScsiType);
-                mediaTest.ModeSense10Data = buffer;
-            }
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI MODE SENSE...").IsIndeterminate();
-                sense = _dev.ModeSense(out buffer, out senseBuffer, _dev.Timeout, out _);
-            });
-
-            if(!sense &&
-               !_dev.Error)
-            {
-                decMode ??= Modes.DecodeMode6(buffer, _dev.ScsiType);
-
-                mediaTest.ModeSense6Data = buffer;
-            }
-
-            if(decMode.HasValue)
-            {
-                mediaTest.MediumType = (byte)decMode.Value.Header.MediumType;
-
-                if(decMode.Value.Header.BlockDescriptors?.Length > 0)
-                    mediaTest.Density = (byte)decMode.Value.Header.BlockDescriptors[0].Density;
-            }
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ (6)...").IsIndeterminate();
-
-                mediaTest.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 0, mediaTest.BlockSize ?? 512,
-                                                      _dev.Timeout, out _);
-            });
-
-            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead6);
-            mediaTest.Read6Data = buffer;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ (10)...").IsIndeterminate();
-
-                mediaTest.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, false, false, false, 0,
-                                                        mediaTest.BlockSize ?? 512, 0, 1, _dev.Timeout, out _);
-            });
-
-            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead10);
-            mediaTest.Read10Data = buffer;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ (12)...").IsIndeterminate();
-
-                mediaTest.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, false, false, false, 0,
-                                                        mediaTest.BlockSize ?? 512, 0, 1, false, _dev.Timeout, out _);
-            });
-
-            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead12);
-            mediaTest.Read12Data = buffer;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ (16)...").IsIndeterminate();
-
-                mediaTest.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, false, false, 0,
-                                                        mediaTest.BlockSize ?? 512, 0, 1, false, _dev.Timeout, out _);
-            });
-
-            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !mediaTest.SupportsRead16);
-            mediaTest.Read16Data = buffer;
-
-            mediaTest.LongBlockSize = mediaTest.BlockSize;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
-                sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 0xFFFF, _dev.Timeout, out _);
-            });
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
+            sense = _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 0xFFFF, _dev.Timeout, out _);
 
             if(sense && !_dev.Error)
             {
@@ -603,7 +635,7 @@ namespace Aaru.Core.Devices.Report
                    decSense.Value.ASC  == 0x24                     &&
                    decSense.Value.ASCQ == 0x00)
                 {
-                    mediaTest.SupportsReadLong = true;
+                    mediaTest.SupportsReadLong16 = true;
 
                     bool valid       = decSense.Value.Fixed?.InformationValid == true;
                     bool ili         = decSense.Value.Fixed?.ILI              == true;
@@ -622,45 +654,335 @@ namespace Aaru.Core.Devices.Report
                 }
             }
 
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
-                sense = _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 0xFFFF, _dev.Timeout, out _);
-
-                if(sense && !_dev.Error)
+            if((mediaTest.SupportsReadLong == true || mediaTest.SupportsReadLong16 == true) &&
+               mediaTest.LongBlockSize == mediaTest.BlockSize)
+                switch(mediaTest.BlockSize)
                 {
-                    DecodedSense? decSense = Sense.Decode(senseBuffer);
-
-                    if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
-                       decSense.Value.ASC  == 0x24                     &&
-                       decSense.Value.ASCQ == 0x00)
+                    case 512:
                     {
-                        mediaTest.SupportsReadLong16 = true;
+                        foreach(ushort testSize in new ushort[]
+                                {
+                                    // Long sector sizes for floppies
+                                    514,
 
-                        bool valid       = decSense.Value.Fixed?.InformationValid == true;
-                        bool ili         = decSense.Value.Fixed?.ILI              == true;
-                        uint information = decSense.Value.Fixed?.Information ?? 0;
+                                    // Long sector sizes for SuperDisk
+                                    536, 558,
 
-                        if(decSense.Value.Descriptor.HasValue &&
-                           decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
+                                    // Long sector sizes for 512-byte magneto-opticals
+                                    600, 610, 630
+                                })
                         {
-                            valid       = true;
-                            ili         = true;
-                            information = (uint)Sense.DecodeDescriptor00(desc00);
+                            sense = mediaTest.SupportsReadLong16 == true
+                                        ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, testSize,
+                                                          _dev.Timeout, out _)
+                                        : _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, testSize,
+                                                          _dev.Timeout, out _);
+
+                            if(sense || _dev.Error)
+                                continue;
+
+                            mediaTest.LongBlockSize = testSize;
+
+                            break;
                         }
 
-                        if(valid && ili)
-                            mediaTest.LongBlockSize = 0xFFFF - (information & 0xFFFF);
+                        break;
+                    }
+                    case 1024:
+                    {
+                        foreach(ushort testSize in new ushort[]
+                                {
+                                    // Long sector sizes for floppies
+                                    1026,
+
+                                    // Long sector sizes for 1024-byte magneto-opticals
+                                    1200
+                                })
+                        {
+                            sense = mediaTest.SupportsReadLong16 == true
+                                        ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, testSize,
+                                                          _dev.Timeout, out _)
+                                        : _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, testSize,
+                                                          _dev.Timeout, out _);
+
+                            if(sense || _dev.Error)
+                                continue;
+
+                            mediaTest.LongBlockSize = testSize;
+
+                            break;
+                        }
+
+                        break;
+                    }
+                    case 2048:
+                    {
+                        sense = mediaTest.SupportsReadLong16 == true
+                                    ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 2380, _dev.Timeout,
+                                                      out _) : _dev.ReadLong10(out buffer, out senseBuffer, false,
+                                                                               false, 0, 2380, _dev.Timeout, out _);
+
+                        if(!sense &&
+                           !_dev.Error)
+                            mediaTest.LongBlockSize = 2380;
+
+                        break;
+                    }
+                    case 4096:
+                    {
+                        sense = mediaTest.SupportsReadLong16 == true
+                                    ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 4760, _dev.Timeout,
+                                                      out _) : _dev.ReadLong10(out buffer, out senseBuffer, false,
+                                                                               false, 0, 4760, _dev.Timeout, out _);
+
+                        if(!sense &&
+                           !_dev.Error)
+                            mediaTest.LongBlockSize = 4760;
+
+                        break;
+                    }
+                    case 8192:
+                    {
+                        sense = mediaTest.SupportsReadLong16 == true
+                                    ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 9424, _dev.Timeout,
+                                                      out _) : _dev.ReadLong10(out buffer, out senseBuffer, false,
+                                                                               false, 0, 9424, _dev.Timeout, out _);
+
+                        if(!sense &&
+                           !_dev.Error)
+                            mediaTest.LongBlockSize = 9424;
+
+                        break;
                     }
                 }
+        });
 
-                if((mediaTest.SupportsReadLong == true || mediaTest.SupportsReadLong16 == true) &&
-                   mediaTest.LongBlockSize == mediaTest.BlockSize)
-                    switch(mediaTest.BlockSize)
-                    {
-                        case 512:
-                        {
-                            foreach(ushort testSize in new ushort[]
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ MEDIA SERIAL NUMBER...").IsIndeterminate();
+
+            mediaTest.CanReadMediaSerial =
+                !_dev.ReadMediaSerialNumber(out buffer, out senseBuffer, _dev.Timeout, out _);
+        });
+
+        return mediaTest;
+    }
+
+    /// <summary>Creates a media report for a non-removable SCSI device</summary>
+    /// <returns>Media report</returns>
+    public TestedMedia ReportScsi()
+    {
+        bool   sense       = true;
+        byte[] buffer      = Array.Empty<byte>();
+        byte[] senseBuffer = Array.Empty<byte>();
+
+        var capabilities = new TestedMedia
+        {
+            MediaIsRecognized = true
+        };
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI READ CAPACITY...").IsIndeterminate();
+            sense = _dev.ReadCapacity(out buffer, out senseBuffer, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            capabilities.SupportsReadCapacity = true;
+
+            capabilities.Blocks = ((ulong)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3]) &
+                                   0xFFFFFFFF) + 1;
+
+            capabilities.BlockSize = (uint)((buffer[4] << 24) + (buffer[5] << 16) + (buffer[6] << 8) + buffer[7]);
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI READ CAPACITY (16)...").IsIndeterminate();
+            sense = _dev.ReadCapacity16(out buffer, out buffer, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            capabilities.SupportsReadCapacity16 = true;
+            byte[] temp = new byte[8];
+            Array.Copy(buffer, 0, temp, 0, 8);
+            Array.Reverse(temp);
+            capabilities.Blocks    = BitConverter.ToUInt64(temp, 0) + 1;
+            capabilities.BlockSize = (uint)((buffer[8] << 24) + (buffer[9] << 16) + (buffer[10] << 8) + buffer[11]);
+        }
+
+        Modes.DecodedMode? decMode = null;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI MODE SENSE (10)...").IsIndeterminate();
+
+            sense = _dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current,
+                                     0x3F, 0x00, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            decMode                      = Modes.DecodeMode10(buffer, _dev.ScsiType);
+            capabilities.ModeSense10Data = buffer;
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Querying SCSI MODE SENSE...").IsIndeterminate();
+            sense = _dev.ModeSense(out buffer, out senseBuffer, _dev.Timeout, out _);
+        });
+
+        if(!sense &&
+           !_dev.Error)
+        {
+            decMode ??= Modes.DecodeMode6(buffer, _dev.ScsiType);
+
+            capabilities.ModeSense6Data = buffer;
+        }
+
+        if(decMode.HasValue)
+        {
+            capabilities.MediumType = (byte)decMode.Value.Header.MediumType;
+
+            if(decMode.Value.Header.BlockDescriptors?.Length > 0)
+                capabilities.Density = (byte)decMode.Value.Header.BlockDescriptors[0].Density;
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ (6)...").IsIndeterminate();
+
+            capabilities.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 0, capabilities.BlockSize ?? 512,
+                                                     _dev.Timeout, out _);
+        });
+
+        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead6);
+        capabilities.Read6Data = buffer;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ (10)...").IsIndeterminate();
+
+            capabilities.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, false, false, false,
+                                                       0, capabilities.BlockSize ?? 512, 0, 1, _dev.Timeout, out _);
+        });
+
+        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead10);
+        capabilities.Read10Data = buffer;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ (12)...").IsIndeterminate();
+
+            capabilities.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, false, false, false,
+                                                       0, capabilities.BlockSize ?? 512, 0, 1, false, _dev.Timeout,
+                                                       out _);
+        });
+
+        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead12);
+        capabilities.Read12Data = buffer;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ (16)...").IsIndeterminate();
+
+            capabilities.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, false, false, 0,
+                                                       capabilities.BlockSize ?? 512, 0, 1, false, _dev.Timeout,
+                                                       out _);
+        });
+
+        AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead16);
+        capabilities.Read16Data = buffer;
+
+        capabilities.LongBlockSize = capabilities.BlockSize;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
+            sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 0xFFFF, _dev.Timeout, out _);
+        });
+
+        if(sense && !_dev.Error)
+        {
+            DecodedSense? decSense = Sense.Decode(senseBuffer);
+
+            if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
+               decSense.Value.ASC  == 0x24                     &&
+               decSense.Value.ASCQ == 0x00)
+            {
+                capabilities.SupportsReadLong = true;
+
+                bool valid       = decSense.Value.Fixed?.InformationValid == true;
+                bool ili         = decSense.Value.Fixed?.ILI              == true;
+                uint information = decSense.Value.Fixed?.Information ?? 0;
+
+                if(decSense.Value.Descriptor.HasValue &&
+                   decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
+                {
+                    valid       = true;
+                    ili         = true;
+                    information = (uint)Sense.DecodeDescriptor00(desc00);
+                }
+
+                if(valid && ili)
+                    capabilities.LongBlockSize = 0xFFFF - (information & 0xFFFF);
+            }
+        }
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
+            sense = _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 0xFFFF, _dev.Timeout, out _);
+        });
+
+        if(sense && !_dev.Error)
+        {
+            capabilities.SupportsReadLong16 = true;
+            DecodedSense? decSense = Sense.Decode(senseBuffer);
+
+            if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
+               decSense.Value.ASC  == 0x24                     &&
+               decSense.Value.ASCQ == 0x00)
+            {
+                capabilities.SupportsReadLong16 = true;
+
+                bool valid       = decSense.Value.Fixed?.InformationValid == true;
+                bool ili         = decSense.Value.Fixed?.ILI              == true;
+                uint information = decSense.Value.Fixed?.Information ?? 0;
+
+                if(decSense.Value.Descriptor.HasValue &&
+                   decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
+                {
+                    valid       = true;
+                    ili         = true;
+                    information = (uint)Sense.DecodeDescriptor00(desc00);
+                }
+
+                if(valid && ili)
+                    capabilities.LongBlockSize = 0xFFFF - (information & 0xFFFF);
+            }
+        }
+
+        if((capabilities.SupportsReadLong != true && capabilities.SupportsReadLong16 != true) ||
+           capabilities.LongBlockSize != capabilities.BlockSize)
+            return capabilities;
+
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask(capabilities.SupportsReadLong16 == true ? "Trying SCSI READ LONG (16)..."
+                            : "Trying SCSI READ LONG (10)...").IsIndeterminate();
+
+            switch(capabilities.BlockSize)
+            {
+                case 512:
+                {
+                    foreach(ushort testSize in new ushort[]
                             {
                                 // Long sector sizes for floppies
                                 514,
@@ -671,26 +993,26 @@ namespace Aaru.Core.Devices.Report
                                 // Long sector sizes for 512-byte magneto-opticals
                                 600, 610, 630
                             })
-                            {
-                                sense = mediaTest.SupportsReadLong16 == true
-                                            ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, testSize,
-                                                              _dev.Timeout, out _)
-                                            : _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, testSize,
-                                                              _dev.Timeout, out _);
+                    {
+                        sense = capabilities.SupportsReadLong16 == true
+                                    ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, testSize, _dev.Timeout,
+                                                      out _) : _dev.ReadLong10(out buffer, out senseBuffer, false,
+                                                                               false, 0, testSize, _dev.Timeout, out _);
 
-                                if(sense || _dev.Error)
-                                    continue;
+                        if(sense || _dev.Error)
+                            continue;
 
-                                mediaTest.LongBlockSize = testSize;
+                        capabilities.SupportsReadLong = true;
+                        capabilities.LongBlockSize    = testSize;
 
-                                break;
-                            }
+                        break;
+                    }
 
-                            break;
-                        }
-                        case 1024:
-                        {
-                            foreach(ushort testSize in new ushort[]
+                    break;
+                }
+                case 1024:
+                {
+                    foreach(ushort testSize in new ushort[]
                             {
                                 // Long sector sizes for floppies
                                 1026,
@@ -698,394 +1020,71 @@ namespace Aaru.Core.Devices.Report
                                 // Long sector sizes for 1024-byte magneto-opticals
                                 1200
                             })
-                            {
-                                sense = mediaTest.SupportsReadLong16 == true
-                                            ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, testSize,
-                                                              _dev.Timeout, out _)
-                                            : _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, testSize,
-                                                              _dev.Timeout, out _);
+                    {
+                        sense = capabilities.SupportsReadLong16 == true
+                                    ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, testSize, _dev.Timeout,
+                                                      out _) : _dev.ReadLong10(out buffer, out senseBuffer, false,
+                                                                               false, 0, testSize, _dev.Timeout, out _);
 
-                                if(sense || _dev.Error)
-                                    continue;
+                        if(sense || _dev.Error)
+                            continue;
 
-                                mediaTest.LongBlockSize = testSize;
+                        capabilities.SupportsReadLong = true;
+                        capabilities.LongBlockSize    = testSize;
 
-                                break;
-                            }
-
-                            break;
-                        }
-                        case 2048:
-                        {
-                            sense = mediaTest.SupportsReadLong16 == true
-                                        ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 2380, _dev.Timeout,
-                                                          out _) : _dev.ReadLong10(out buffer, out senseBuffer, false,
-                                            false, 0, 2380, _dev.Timeout, out _);
-
-                            if(!sense &&
-                               !_dev.Error)
-                                mediaTest.LongBlockSize = 2380;
-
-                            break;
-                        }
-                        case 4096:
-                        {
-                            sense = mediaTest.SupportsReadLong16 == true
-                                        ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 4760, _dev.Timeout,
-                                                          out _) : _dev.ReadLong10(out buffer, out senseBuffer, false,
-                                            false, 0, 4760, _dev.Timeout, out _);
-
-                            if(!sense &&
-                               !_dev.Error)
-                                mediaTest.LongBlockSize = 4760;
-
-                            break;
-                        }
-                        case 8192:
-                        {
-                            sense = mediaTest.SupportsReadLong16 == true
-                                        ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 9424, _dev.Timeout,
-                                                          out _) : _dev.ReadLong10(out buffer, out senseBuffer, false,
-                                            false, 0, 9424, _dev.Timeout, out _);
-
-                            if(!sense &&
-                               !_dev.Error)
-                                mediaTest.LongBlockSize = 9424;
-
-                            break;
-                        }
+                        break;
                     }
-            });
 
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ MEDIA SERIAL NUMBER...").IsIndeterminate();
-
-                mediaTest.CanReadMediaSerial =
-                    !_dev.ReadMediaSerialNumber(out buffer, out senseBuffer, _dev.Timeout, out _);
-            });
-
-            return mediaTest;
-        }
-
-        /// <summary>Creates a media report for a non-removable SCSI device</summary>
-        /// <returns>Media report</returns>
-        public TestedMedia ReportScsi()
-        {
-            bool   sense       = true;
-            byte[] buffer      = Array.Empty<byte>();
-            byte[] senseBuffer = Array.Empty<byte>();
-
-            var capabilities = new TestedMedia
-            {
-                MediaIsRecognized = true
-            };
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI READ CAPACITY...").IsIndeterminate();
-                sense = _dev.ReadCapacity(out buffer, out senseBuffer, _dev.Timeout, out _);
-            });
-
-            if(!sense &&
-               !_dev.Error)
-            {
-                capabilities.SupportsReadCapacity = true;
-
-                capabilities.Blocks = ((ulong)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3]) &
-                                       0xFFFFFFFF) + 1;
-
-                capabilities.BlockSize = (uint)((buffer[4] << 24) + (buffer[5] << 16) + (buffer[6] << 8) + buffer[7]);
-            }
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI READ CAPACITY (16)...").IsIndeterminate();
-                sense = _dev.ReadCapacity16(out buffer, out buffer, _dev.Timeout, out _);
-            });
-
-            if(!sense &&
-               !_dev.Error)
-            {
-                capabilities.SupportsReadCapacity16 = true;
-                byte[] temp = new byte[8];
-                Array.Copy(buffer, 0, temp, 0, 8);
-                Array.Reverse(temp);
-                capabilities.Blocks    = BitConverter.ToUInt64(temp, 0) + 1;
-                capabilities.BlockSize = (uint)((buffer[8] << 24) + (buffer[9] << 16) + (buffer[10] << 8) + buffer[11]);
-            }
-
-            Modes.DecodedMode? decMode = null;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI MODE SENSE (10)...").IsIndeterminate();
-
-                sense = _dev.ModeSense10(out buffer, out senseBuffer, false, true, ScsiModeSensePageControl.Current,
-                                         0x3F, 0x00, _dev.Timeout, out _);
-            });
-
-            if(!sense &&
-               !_dev.Error)
-            {
-                decMode                      = Modes.DecodeMode10(buffer, _dev.ScsiType);
-                capabilities.ModeSense10Data = buffer;
-            }
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Querying SCSI MODE SENSE...").IsIndeterminate();
-                sense = _dev.ModeSense(out buffer, out senseBuffer, _dev.Timeout, out _);
-            });
-
-            if(!sense &&
-               !_dev.Error)
-            {
-                decMode ??= Modes.DecodeMode6(buffer, _dev.ScsiType);
-
-                capabilities.ModeSense6Data = buffer;
-            }
-
-            if(decMode.HasValue)
-            {
-                capabilities.MediumType = (byte)decMode.Value.Header.MediumType;
-
-                if(decMode.Value.Header.BlockDescriptors?.Length > 0)
-                    capabilities.Density = (byte)decMode.Value.Header.BlockDescriptors[0].Density;
-            }
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ (6)...").IsIndeterminate();
-
-                capabilities.SupportsRead6 = !_dev.Read6(out buffer, out senseBuffer, 0, capabilities.BlockSize ?? 512,
-                                                         _dev.Timeout, out _);
-            });
-
-            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead6);
-            capabilities.Read6Data = buffer;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ (10)...").IsIndeterminate();
-
-                capabilities.SupportsRead10 = !_dev.Read10(out buffer, out senseBuffer, 0, false, false, false, false,
-                                                           0, capabilities.BlockSize ?? 512, 0, 1, _dev.Timeout, out _);
-            });
-
-            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead10);
-            capabilities.Read10Data = buffer;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ (12)...").IsIndeterminate();
-
-                capabilities.SupportsRead12 = !_dev.Read12(out buffer, out senseBuffer, 0, false, false, false, false,
-                                                           0, capabilities.BlockSize ?? 512, 0, 1, false, _dev.Timeout,
-                                                           out _);
-            });
-
-            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead12);
-            capabilities.Read12Data = buffer;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ (16)...").IsIndeterminate();
-
-                capabilities.SupportsRead16 = !_dev.Read16(out buffer, out senseBuffer, 0, false, false, false, 0,
-                                                           capabilities.BlockSize ?? 512, 0, 1, false, _dev.Timeout,
-                                                           out _);
-            });
-
-            AaruConsole.DebugWriteLine("SCSI Report", "Sense = {0}", !capabilities.SupportsRead16);
-            capabilities.Read16Data = buffer;
-
-            capabilities.LongBlockSize = capabilities.BlockSize;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
-                sense = _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 0xFFFF, _dev.Timeout, out _);
-            });
-
-            if(sense && !_dev.Error)
-            {
-                DecodedSense? decSense = Sense.Decode(senseBuffer);
-
-                if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
-                   decSense.Value.ASC  == 0x24                     &&
-                   decSense.Value.ASCQ == 0x00)
+                    break;
+                }
+                case 2048:
                 {
+                    sense = capabilities.SupportsReadLong16 == true
+                                ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 2380, _dev.Timeout, out _)
+                                : _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 2380, _dev.Timeout,
+                                                  out _);
+
+                    if(sense || _dev.Error)
+                        return;
+
                     capabilities.SupportsReadLong = true;
+                    capabilities.LongBlockSize    = 2380;
 
-                    bool valid       = decSense.Value.Fixed?.InformationValid == true;
-                    bool ili         = decSense.Value.Fixed?.ILI              == true;
-                    uint information = decSense.Value.Fixed?.Information ?? 0;
+                    break;
+                }
+                case 4096:
+                {
+                    sense = capabilities.SupportsReadLong16 == true
+                                ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 4760, _dev.Timeout, out _)
+                                : _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 4760, _dev.Timeout,
+                                                  out _);
 
-                    if(decSense.Value.Descriptor.HasValue &&
-                       decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
-                    {
-                        valid       = true;
-                        ili         = true;
-                        information = (uint)Sense.DecodeDescriptor00(desc00);
-                    }
+                    if(sense || _dev.Error)
+                        return;
 
-                    if(valid && ili)
-                        capabilities.LongBlockSize = 0xFFFF - (information & 0xFFFF);
+                    capabilities.SupportsReadLong = true;
+                    capabilities.LongBlockSize    = 4760;
+
+                    break;
+                }
+                case 8192:
+                {
+                    sense = capabilities.SupportsReadLong16 == true
+                                ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 9424, _dev.Timeout, out _)
+                                : _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 9424, _dev.Timeout,
+                                                  out _);
+
+                    if(sense || _dev.Error)
+                        return;
+
+                    capabilities.SupportsReadLong = true;
+                    capabilities.LongBlockSize    = 9424;
+
+                    break;
                 }
             }
+        });
 
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
-                sense = _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 0xFFFF, _dev.Timeout, out _);
-            });
-
-            if(sense && !_dev.Error)
-            {
-                capabilities.SupportsReadLong16 = true;
-                DecodedSense? decSense = Sense.Decode(senseBuffer);
-
-                if(decSense?.SenseKey  == SenseKeys.IllegalRequest &&
-                   decSense.Value.ASC  == 0x24                     &&
-                   decSense.Value.ASCQ == 0x00)
-                {
-                    capabilities.SupportsReadLong16 = true;
-
-                    bool valid       = decSense.Value.Fixed?.InformationValid == true;
-                    bool ili         = decSense.Value.Fixed?.ILI              == true;
-                    uint information = decSense.Value.Fixed?.Information ?? 0;
-
-                    if(decSense.Value.Descriptor.HasValue &&
-                       decSense.Value.Descriptor.Value.Descriptors.TryGetValue(0, out byte[] desc00))
-                    {
-                        valid       = true;
-                        ili         = true;
-                        information = (uint)Sense.DecodeDescriptor00(desc00);
-                    }
-
-                    if(valid && ili)
-                        capabilities.LongBlockSize = 0xFFFF - (information & 0xFFFF);
-                }
-            }
-
-            if((capabilities.SupportsReadLong != true && capabilities.SupportsReadLong16 != true) ||
-               capabilities.LongBlockSize != capabilities.BlockSize)
-                return capabilities;
-
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask(capabilities.SupportsReadLong16 == true ? "Trying SCSI READ LONG (16)..."
-                                : "Trying SCSI READ LONG (10)...").IsIndeterminate();
-
-                switch(capabilities.BlockSize)
-                {
-                    case 512:
-                    {
-                        foreach(ushort testSize in new ushort[]
-                        {
-                            // Long sector sizes for floppies
-                            514,
-
-                            // Long sector sizes for SuperDisk
-                            536, 558,
-
-                            // Long sector sizes for 512-byte magneto-opticals
-                            600, 610, 630
-                        })
-                        {
-                            sense = capabilities.SupportsReadLong16 == true
-                                        ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, testSize, _dev.Timeout,
-                                                          out _) : _dev.ReadLong10(out buffer, out senseBuffer, false,
-                                            false, 0, testSize, _dev.Timeout, out _);
-
-                            if(sense || _dev.Error)
-                                continue;
-
-                            capabilities.SupportsReadLong = true;
-                            capabilities.LongBlockSize    = testSize;
-
-                            break;
-                        }
-
-                        break;
-                    }
-                    case 1024:
-                    {
-                        foreach(ushort testSize in new ushort[]
-                        {
-                            // Long sector sizes for floppies
-                            1026,
-
-                            // Long sector sizes for 1024-byte magneto-opticals
-                            1200
-                        })
-                        {
-                            sense = capabilities.SupportsReadLong16 == true
-                                        ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, testSize, _dev.Timeout,
-                                                          out _) : _dev.ReadLong10(out buffer, out senseBuffer, false,
-                                            false, 0, testSize, _dev.Timeout, out _);
-
-                            if(sense || _dev.Error)
-                                continue;
-
-                            capabilities.SupportsReadLong = true;
-                            capabilities.LongBlockSize    = testSize;
-
-                            break;
-                        }
-
-                        break;
-                    }
-                    case 2048:
-                    {
-                        sense = capabilities.SupportsReadLong16 == true
-                                    ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 2380, _dev.Timeout, out _)
-                                    : _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 2380, _dev.Timeout,
-                                                      out _);
-
-                        if(sense || _dev.Error)
-                            return;
-
-                        capabilities.SupportsReadLong = true;
-                        capabilities.LongBlockSize    = 2380;
-
-                        break;
-                    }
-                    case 4096:
-                    {
-                        sense = capabilities.SupportsReadLong16 == true
-                                    ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 4760, _dev.Timeout, out _)
-                                    : _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 4760, _dev.Timeout,
-                                                      out _);
-
-                        if(sense || _dev.Error)
-                            return;
-
-                        capabilities.SupportsReadLong = true;
-                        capabilities.LongBlockSize    = 4760;
-
-                        break;
-                    }
-                    case 8192:
-                    {
-                        sense = capabilities.SupportsReadLong16 == true
-                                    ? _dev.ReadLong16(out buffer, out senseBuffer, false, 0, 9424, _dev.Timeout, out _)
-                                    : _dev.ReadLong10(out buffer, out senseBuffer, false, false, 0, 9424, _dev.Timeout,
-                                                      out _);
-
-                        if(sense || _dev.Error)
-                            return;
-
-                        capabilities.SupportsReadLong = true;
-                        capabilities.LongBlockSize    = 9424;
-
-                        break;
-                    }
-                }
-            });
-
-            return capabilities;
-        }
+        return capabilities;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Report/SecureDigital.cs b/Aaru.Core/Devices/Report/SecureDigital.cs
index 0ff1e385f..33630c1da 100644
--- a/Aaru.Core/Devices/Report/SecureDigital.cs
+++ b/Aaru.Core/Devices/Report/SecureDigital.cs
@@ -36,146 +36,145 @@ using Aaru.CommonTypes.Metadata;
 using Aaru.Console;
 using Spectre.Console;
 
-namespace Aaru.Core.Devices.Report
+namespace Aaru.Core.Devices.Report;
+
+/// <summary>Implements creating a device report for a SecureDigital or MultiMediaCard flash card</summary>
+public sealed partial class DeviceReport
 {
-    /// <summary>Implements creating a device report for a SecureDigital or MultiMediaCard flash card</summary>
-    public sealed partial class DeviceReport
+    /// <summary>Creates a device report for a SecureDigital or MultiMediaCard flash card</summary>
+    public MmcSd MmcSdReport()
     {
-        /// <summary>Creates a device report for a SecureDigital or MultiMediaCard flash card</summary>
-        public MmcSd MmcSdReport()
+        var    report = new MmcSd();
+        bool   sense  = true;
+        byte[] cid    = Array.Empty<byte>();
+        byte[] csd    = Array.Empty<byte>();
+        byte[] ecsd   = Array.Empty<byte>();
+        byte[] scr    = Array.Empty<byte>();
+
+        Spectre.ProgressSingleSpinner(ctx =>
         {
-            var    report = new MmcSd();
-            bool   sense  = true;
-            byte[] cid    = Array.Empty<byte>();
-            byte[] csd    = Array.Empty<byte>();
-            byte[] ecsd   = Array.Empty<byte>();
-            byte[] scr    = Array.Empty<byte>();
+            ctx.AddTask("Trying to get CID...").IsIndeterminate();
+            sense = _dev.ReadCid(out cid, out _, _dev.Timeout, out _);
+        });
 
-            Spectre.ProgressSingleSpinner(ctx =>
+        if(!sense)
+        {
+            AaruConsole.WriteLine("CID obtained correctly...");
+
+            switch(_dev.Type)
             {
-                ctx.AddTask("Trying to get CID...").IsIndeterminate();
-                sense = _dev.ReadCid(out cid, out _, _dev.Timeout, out _);
-            });
+                case DeviceType.SecureDigital:
+                    // Clear serial number and manufacturing date
+                    cid[9]  = 0;
+                    cid[10] = 0;
+                    cid[11] = 0;
+                    cid[12] = 0;
+                    cid[13] = 0;
+                    cid[14] = 0;
 
-            if(!sense)
-            {
-                AaruConsole.WriteLine("CID obtained correctly...");
+                    break;
+                case DeviceType.MMC:
+                    // Clear serial number and manufacturing date
+                    cid[10] = 0;
+                    cid[11] = 0;
+                    cid[12] = 0;
+                    cid[13] = 0;
+                    cid[14] = 0;
 
-                switch(_dev.Type)
-                {
-                    case DeviceType.SecureDigital:
-                        // Clear serial number and manufacturing date
-                        cid[9]  = 0;
-                        cid[10] = 0;
-                        cid[11] = 0;
-                        cid[12] = 0;
-                        cid[13] = 0;
-                        cid[14] = 0;
-
-                        break;
-                    case DeviceType.MMC:
-                        // Clear serial number and manufacturing date
-                        cid[10] = 0;
-                        cid[11] = 0;
-                        cid[12] = 0;
-                        cid[13] = 0;
-                        cid[14] = 0;
-
-                        break;
-                }
-
-                report.CID = cid;
+                    break;
             }
-            else
-                AaruConsole.WriteLine("Could not read CID...");
 
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying to get CSD...").IsIndeterminate();
-                sense = _dev.ReadCsd(out csd, out _, _dev.Timeout, out _);
-            });
+            report.CID = cid;
+        }
+        else
+            AaruConsole.WriteLine("Could not read CID...");
 
-            if(!sense)
-            {
-                AaruConsole.WriteLine("CSD obtained correctly...");
-                report.CSD = csd;
-            }
-            else
-                AaruConsole.WriteLine("Could not read CSD...");
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying to get CSD...").IsIndeterminate();
+            sense = _dev.ReadCsd(out csd, out _, _dev.Timeout, out _);
+        });
 
-            sense = true;
-            byte[] ocr = null;
+        if(!sense)
+        {
+            AaruConsole.WriteLine("CSD obtained correctly...");
+            report.CSD = csd;
+        }
+        else
+            AaruConsole.WriteLine("Could not read CSD...");
 
-            Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Trying to get OCR...").IsIndeterminate();
+        sense = true;
+        byte[] ocr = null;
 
-                switch(_dev.Type)
-                {
-                    case DeviceType.MMC:
-                    {
-                        sense = _dev.ReadOcr(out ocr, out _, _dev.Timeout, out _);
-
-                        break;
-                    }
-                    case DeviceType.SecureDigital:
-                    {
-                        sense = _dev.ReadSdocr(out ocr, out _, _dev.Timeout, out _);
-
-                        break;
-                    }
-                }
-            });
-
-            if(!sense)
-            {
-                AaruConsole.WriteLine("OCR obtained correctly...");
-                report.OCR = ocr;
-            }
-            else
-                AaruConsole.WriteLine("Could not read OCR...");
+        Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Trying to get OCR...").IsIndeterminate();
 
             switch(_dev.Type)
             {
                 case DeviceType.MMC:
                 {
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to get Extended CSD...").IsIndeterminate();
-                        sense = _dev.ReadExtendedCsd(out ecsd, out _, _dev.Timeout, out _);
-                    });
-
-                    if(!sense)
-                    {
-                        AaruConsole.WriteLine("Extended CSD obtained correctly...");
-                        report.ExtendedCSD = ecsd;
-                    }
-                    else
-                        AaruConsole.WriteLine("Could not read Extended CSD...");
+                    sense = _dev.ReadOcr(out ocr, out _, _dev.Timeout, out _);
 
                     break;
                 }
                 case DeviceType.SecureDigital:
                 {
-                    Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Trying to get SCR...").IsIndeterminate();
-                        sense = _dev.ReadScr(out scr, out _, _dev.Timeout, out _);
-                    });
-
-                    if(!sense)
-                    {
-                        AaruConsole.WriteLine("SCR obtained correctly...");
-                        report.SCR = scr;
-                    }
-                    else
-                        AaruConsole.WriteLine("Could not read SCR...");
+                    sense = _dev.ReadSdocr(out ocr, out _, _dev.Timeout, out _);
 
                     break;
                 }
             }
+        });
 
-            return report;
+        if(!sense)
+        {
+            AaruConsole.WriteLine("OCR obtained correctly...");
+            report.OCR = ocr;
         }
+        else
+            AaruConsole.WriteLine("Could not read OCR...");
+
+        switch(_dev.Type)
+        {
+            case DeviceType.MMC:
+            {
+                Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Trying to get Extended CSD...").IsIndeterminate();
+                    sense = _dev.ReadExtendedCsd(out ecsd, out _, _dev.Timeout, out _);
+                });
+
+                if(!sense)
+                {
+                    AaruConsole.WriteLine("Extended CSD obtained correctly...");
+                    report.ExtendedCSD = ecsd;
+                }
+                else
+                    AaruConsole.WriteLine("Could not read Extended CSD...");
+
+                break;
+            }
+            case DeviceType.SecureDigital:
+            {
+                Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Trying to get SCR...").IsIndeterminate();
+                    sense = _dev.ReadScr(out scr, out _, _dev.Timeout, out _);
+                });
+
+                if(!sense)
+                {
+                    AaruConsole.WriteLine("SCR obtained correctly...");
+                    report.SCR = scr;
+                }
+                else
+                    AaruConsole.WriteLine("Could not read SCR...");
+
+                break;
+            }
+        }
+
+        return report;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Report/USB.cs b/Aaru.Core/Devices/Report/USB.cs
index 48ca6a45e..899cbff81 100644
--- a/Aaru.Core/Devices/Report/USB.cs
+++ b/Aaru.Core/Devices/Report/USB.cs
@@ -32,24 +32,23 @@
 
 using Aaru.CommonTypes.Metadata;
 
-namespace Aaru.Core.Devices.Report
-{
-    /// <summary>Implements creating a report for a USB device</summary>
-    public sealed partial class DeviceReport
-    {
-        /// <summary>Fills a device report with parameters specific to a USB device</summary>
-        public Usb UsbReport()
-        {
-            var usbReport = new Usb
-            {
-                Manufacturer = _dev.UsbManufacturerString,
-                Product      = _dev.UsbProductString,
-                ProductID    = _dev.UsbProductId,
-                VendorID     = _dev.UsbVendorId,
-                Descriptors  = _dev.UsbDescriptors
-            };
+namespace Aaru.Core.Devices.Report;
 
-            return usbReport;
-        }
+/// <summary>Implements creating a report for a USB device</summary>
+public sealed partial class DeviceReport
+{
+    /// <summary>Fills a device report with parameters specific to a USB device</summary>
+    public Usb UsbReport()
+    {
+        var usbReport = new Usb
+        {
+            Manufacturer = _dev.UsbManufacturerString,
+            Product      = _dev.UsbProductString,
+            ProductID    = _dev.UsbProductId,
+            VendorID     = _dev.UsbVendorId,
+            Descriptors  = _dev.UsbDescriptors
+        };
+
+        return usbReport;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Scanning/ATA.cs b/Aaru.Core/Devices/Scanning/ATA.cs
index b94918f99..fbafddfc5 100644
--- a/Aaru.Core/Devices/Scanning/ATA.cs
+++ b/Aaru.Core/Devices/Scanning/ATA.cs
@@ -35,337 +35,336 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs.Devices.ATA;
 using Aaru.Core.Logging;
 
-namespace Aaru.Core.Devices.Scanning
+namespace Aaru.Core.Devices.Scanning;
+
+/// <summary>Implements scanning the media from an ATA device</summary>
+public sealed partial class MediaScan
 {
-    /// <summary>Implements scanning the media from an ATA device</summary>
-    public sealed partial class MediaScan
+    /// <summary>Scans the media from an ATA device</summary>
+    /// <returns>Scanning results</returns>
+    ScanResults Ata()
     {
-        /// <summary>Scans the media from an ATA device</summary>
-        /// <returns>Scanning results</returns>
-        ScanResults Ata()
+        var results = new ScanResults
         {
-            var results = new ScanResults
+            Blocks = 0
+        };
+
+        const ushort ataProfile = 0x0001;
+        const uint   timeout    = 5;
+
+        bool sense = _dev.AtaIdentify(out byte[] cmdBuf, out _);
+
+        if(!sense &&
+           Identify.Decode(cmdBuf).HasValue)
+        {
+            // Initialize reader
+            var ataReader = new Reader(_dev, timeout, cmdBuf, null);
+
+            // Fill reader blocks
+            results.Blocks = ataReader.GetDeviceBlocks();
+
+            if(ataReader.FindReadCommand())
             {
-                Blocks = 0
-            };
-
-            const ushort ataProfile = 0x0001;
-            const uint   timeout    = 5;
-
-            bool sense = _dev.AtaIdentify(out byte[] cmdBuf, out _);
-
-            if(!sense &&
-               Identify.Decode(cmdBuf).HasValue)
-            {
-                // Initialize reader
-                var ataReader = new Reader(_dev, timeout, cmdBuf, null);
-
-                // Fill reader blocks
-                results.Blocks = ataReader.GetDeviceBlocks();
-
-                if(ataReader.FindReadCommand())
-                {
-                    StoppingErrorMessage?.Invoke(ataReader.ErrorMessage);
-
-                    return results;
-                }
-
-                // Check block sizes
-                if(ataReader.GetBlockSize())
-                {
-                    StoppingErrorMessage?.Invoke(ataReader.ErrorMessage);
-
-                    return results;
-                }
-
-                uint blockSize = ataReader.LogicalBlockSize;
-
-                // Check how many blocks to read, if error show and return
-                if(ataReader.GetBlocksToRead())
-                {
-                    StoppingErrorMessage?.Invoke(ataReader.ErrorMessage);
-
-                    return results;
-                }
-
-                uint   blocksToRead = ataReader.BlocksToRead;
-                ushort cylinders    = ataReader.Cylinders;
-                byte   heads        = ataReader.Heads;
-                byte   sectors      = ataReader.Sectors;
-
-                results.A       = 0; // <3ms
-                results.B       = 0; // >=3ms, <10ms
-                results.C       = 0; // >=10ms, <50ms
-                results.D       = 0; // >=50ms, <150ms
-                results.E       = 0; // >=150ms, <500ms
-                results.F       = 0; // >=500ms
-                results.Errored = 0;
-                DateTime start;
-                DateTime end;
-                results.ProcessingTime = 0;
-                double currentSpeed = 0;
-                results.MaxSpeed          = double.MinValue;
-                results.MinSpeed          = double.MaxValue;
-                results.UnreadableSectors = new List<ulong>();
-                results.SeekMax           = double.MinValue;
-                results.SeekMin           = double.MaxValue;
-                results.SeekTotal         = 0;
-                const int seekTimes = 1000;
-
-                double seekCur;
-
-                var rnd = new Random();
-
-                MhddLog mhddLog;
-                IbgLog  ibgLog;
-                double  duration;
-
-                if(ataReader.IsLba)
-                {
-                    UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
-
-                    InitBlockMap?.Invoke(results.Blocks, blockSize, blocksToRead, ataProfile);
-                    mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, blocksToRead, false);
-                    ibgLog  = new IbgLog(_ibgLogPath, ataProfile);
-
-                    start = DateTime.UtcNow;
-                    DateTime timeSpeedStart   = DateTime.UtcNow;
-                    ulong    sectorSpeedStart = 0;
-                    InitProgress?.Invoke();
-
-                    for(ulong i = 0; i < results.Blocks; i += blocksToRead)
-                    {
-                        if(_aborted)
-                            break;
-
-                        if(results.Blocks - i < blocksToRead)
-                            blocksToRead = (byte)(results.Blocks - i);
-
-                        if(currentSpeed > results.MaxSpeed &&
-                           currentSpeed > 0)
-                            results.MaxSpeed = currentSpeed;
-
-                        if(currentSpeed < results.MinSpeed &&
-                           currentSpeed > 0)
-                            results.MinSpeed = currentSpeed;
-
-                        UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)",
-                                               (long)i, (long)results.Blocks);
-
-                        bool error = ataReader.ReadBlocks(out cmdBuf, i, blocksToRead, out duration, out _, out _);
-
-                        if(!error)
-                        {
-                            if(duration >= 500)
-                                results.F += blocksToRead;
-                            else if(duration >= 150)
-                                results.E += blocksToRead;
-                            else if(duration >= 50)
-                                results.D += blocksToRead;
-                            else if(duration >= 10)
-                                results.C += blocksToRead;
-                            else if(duration >= 3)
-                                results.B += blocksToRead;
-                            else
-                                results.A += blocksToRead;
-
-                            ScanTime?.Invoke(i, duration);
-                            mhddLog.Write(i, duration);
-                            ibgLog.Write(i, currentSpeed * 1024);
-                        }
-                        else
-                        {
-                            ScanUnreadable?.Invoke(i);
-                            results.Errored += blocksToRead;
-
-                            for(ulong b = i; b < i + blocksToRead; b++)
-                                results.UnreadableSectors.Add(b);
-
-                            mhddLog.Write(i, duration < 500 ? 65535 : duration);
-
-                            ibgLog.Write(i, 0);
-                        }
-
-                        sectorSpeedStart += blocksToRead;
-
-                        double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                        if(elapsed <= 0)
-                            continue;
-
-                        currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                        ScanSpeed?.Invoke(i, currentSpeed                      * 1024);
-                        sectorSpeedStart = 0;
-                        timeSpeedStart   = DateTime.UtcNow;
-                    }
-
-                    end = DateTime.UtcNow;
-                    EndProgress?.Invoke();
-                    mhddLog.Close();
-
-                    ibgLog.Close(_dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                                 blockSize * (double)(results.Blocks + 1) / 1024 / (results.ProcessingTime / 1000),
-                                 _devicePath);
-
-                    InitProgress?.Invoke();
-
-                    if(ataReader.CanSeekLba && _seekTest)
-                        for(int i = 0; i < seekTimes; i++)
-                        {
-                            if(_aborted)
-                                break;
-
-                            uint seekPos = (uint)rnd.Next((int)results.Blocks);
-
-                            PulseProgress?.Invoke($"Seeking to sector {seekPos}...\t\t");
-
-                            ataReader.Seek(seekPos, out seekCur);
-
-                            if(seekCur > results.SeekMax &&
-                               seekCur > 0)
-                                results.SeekMax = seekCur;
-
-                            if(seekCur < results.SeekMin &&
-                               seekCur > 0)
-                                results.SeekMin = seekCur;
-
-                            results.SeekTotal += seekCur;
-                            GC.Collect();
-                        }
-
-                    EndProgress?.Invoke();
-                }
-                else
-                {
-                    InitBlockMap?.Invoke(results.Blocks, blockSize, blocksToRead, ataProfile);
-                    mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, blocksToRead, false);
-                    ibgLog  = new IbgLog(_ibgLogPath, ataProfile);
-
-                    ulong currentBlock = 0;
-                    results.Blocks = (ulong)(cylinders * heads * sectors);
-                    start          = DateTime.UtcNow;
-                    DateTime timeSpeedStart   = DateTime.UtcNow;
-                    ulong    sectorSpeedStart = 0;
-                    InitProgress?.Invoke();
-
-                    for(ushort cy = 0; cy < cylinders; cy++)
-                    {
-                        for(byte hd = 0; hd < heads; hd++)
-                        {
-                            for(byte sc = 1; sc < sectors; sc++)
-                            {
-                                if(_aborted)
-                                    break;
-
-                                if(currentSpeed > results.MaxSpeed &&
-                                   currentSpeed > 0)
-                                    results.MaxSpeed = currentSpeed;
-
-                                if(currentSpeed < results.MinSpeed &&
-                                   currentSpeed > 0)
-                                    results.MinSpeed = currentSpeed;
-
-                                PulseProgress?.
-                                    Invoke($"Reading cylinder {cy} head {hd} sector {sc} ({currentSpeed:F3} MiB/sec.)");
-
-                                bool error = ataReader.ReadChs(out cmdBuf, cy, hd, sc, out duration, out _);
-
-                                if(!error)
-                                {
-                                    if(duration >= 500)
-                                        results.F += blocksToRead;
-                                    else if(duration >= 150)
-                                        results.E += blocksToRead;
-                                    else if(duration >= 50)
-                                        results.D += blocksToRead;
-                                    else if(duration >= 10)
-                                        results.C += blocksToRead;
-                                    else if(duration >= 3)
-                                        results.B += blocksToRead;
-                                    else
-                                        results.A += blocksToRead;
-
-                                    ScanTime?.Invoke(currentBlock, duration);
-                                    mhddLog.Write(currentBlock, duration);
-                                    ibgLog.Write(currentBlock, currentSpeed * 1024);
-                                }
-                                else
-                                {
-                                    ScanUnreadable?.Invoke(currentBlock);
-                                    results.Errored += blocksToRead;
-                                    results.UnreadableSectors.Add(currentBlock);
-                                    mhddLog.Write(currentBlock, duration < 500 ? 65535 : duration);
-
-                                    ibgLog.Write(currentBlock, 0);
-                                }
-
-                                sectorSpeedStart++;
-                                currentBlock++;
-
-                                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                                if(elapsed <= 0)
-                                    continue;
-
-                                currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                                ScanSpeed?.Invoke(currentBlock, currentSpeed           * 1024);
-                                sectorSpeedStart = 0;
-                                timeSpeedStart   = DateTime.UtcNow;
-                            }
-                        }
-                    }
-
-                    end = DateTime.UtcNow;
-                    EndProgress?.Invoke();
-                    mhddLog.Close();
-
-                    ibgLog.Close(_dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                                 blockSize * (double)(results.Blocks + 1) / 1024 / (results.ProcessingTime / 1000),
-                                 _devicePath);
-
-                    InitProgress?.Invoke();
-
-                    if(ataReader.CanSeek)
-                        for(int i = 0; i < seekTimes; i++)
-                        {
-                            if(_aborted)
-                                break;
-
-                            ushort seekCy = (ushort)rnd.Next(cylinders);
-                            byte   seekHd = (byte)rnd.Next(heads);
-                            byte   seekSc = (byte)rnd.Next(sectors);
-
-                            PulseProgress?.
-                                Invoke($"\rSeeking to cylinder {seekCy}, head {seekHd}, sector {seekSc}...\t\t");
-
-                            ataReader.SeekChs(seekCy, seekHd, seekSc, out seekCur);
-
-                            if(seekCur > results.SeekMax &&
-                               seekCur > 0)
-                                results.SeekMax = seekCur;
-
-                            if(seekCur < results.SeekMin &&
-                               seekCur > 0)
-                                results.SeekMin = seekCur;
-
-                            results.SeekTotal += seekCur;
-                            GC.Collect();
-                        }
-
-                    EndProgress?.Invoke();
-                }
-
-                results.ProcessingTime /= 1000;
-                results.TotalTime      =  (end - start).TotalSeconds;
-                results.AvgSpeed       =  blockSize * (double)(results.Blocks + 1) / 1048576 / results.ProcessingTime;
-                results.SeekTimes      =  seekTimes;
+                StoppingErrorMessage?.Invoke(ataReader.ErrorMessage);
 
                 return results;
             }
 
-            StoppingErrorMessage?.Invoke("Unable to communicate with ATA device.");
+            // Check block sizes
+            if(ataReader.GetBlockSize())
+            {
+                StoppingErrorMessage?.Invoke(ataReader.ErrorMessage);
+
+                return results;
+            }
+
+            uint blockSize = ataReader.LogicalBlockSize;
+
+            // Check how many blocks to read, if error show and return
+            if(ataReader.GetBlocksToRead())
+            {
+                StoppingErrorMessage?.Invoke(ataReader.ErrorMessage);
+
+                return results;
+            }
+
+            uint   blocksToRead = ataReader.BlocksToRead;
+            ushort cylinders    = ataReader.Cylinders;
+            byte   heads        = ataReader.Heads;
+            byte   sectors      = ataReader.Sectors;
+
+            results.A       = 0; // <3ms
+            results.B       = 0; // >=3ms, <10ms
+            results.C       = 0; // >=10ms, <50ms
+            results.D       = 0; // >=50ms, <150ms
+            results.E       = 0; // >=150ms, <500ms
+            results.F       = 0; // >=500ms
+            results.Errored = 0;
+            DateTime start;
+            DateTime end;
+            results.ProcessingTime = 0;
+            double currentSpeed = 0;
+            results.MaxSpeed          = double.MinValue;
+            results.MinSpeed          = double.MaxValue;
+            results.UnreadableSectors = new List<ulong>();
+            results.SeekMax           = double.MinValue;
+            results.SeekMin           = double.MaxValue;
+            results.SeekTotal         = 0;
+            const int seekTimes = 1000;
+
+            double seekCur;
+
+            var rnd = new Random();
+
+            MhddLog mhddLog;
+            IbgLog  ibgLog;
+            double  duration;
+
+            if(ataReader.IsLba)
+            {
+                UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
+
+                InitBlockMap?.Invoke(results.Blocks, blockSize, blocksToRead, ataProfile);
+                mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, blocksToRead, false);
+                ibgLog  = new IbgLog(_ibgLogPath, ataProfile);
+
+                start = DateTime.UtcNow;
+                DateTime timeSpeedStart   = DateTime.UtcNow;
+                ulong    sectorSpeedStart = 0;
+                InitProgress?.Invoke();
+
+                for(ulong i = 0; i < results.Blocks; i += blocksToRead)
+                {
+                    if(_aborted)
+                        break;
+
+                    if(results.Blocks - i < blocksToRead)
+                        blocksToRead = (byte)(results.Blocks - i);
+
+                    if(currentSpeed > results.MaxSpeed &&
+                       currentSpeed > 0)
+                        results.MaxSpeed = currentSpeed;
+
+                    if(currentSpeed < results.MinSpeed &&
+                       currentSpeed > 0)
+                        results.MinSpeed = currentSpeed;
+
+                    UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)",
+                                           (long)i, (long)results.Blocks);
+
+                    bool error = ataReader.ReadBlocks(out cmdBuf, i, blocksToRead, out duration, out _, out _);
+
+                    if(!error)
+                    {
+                        if(duration >= 500)
+                            results.F += blocksToRead;
+                        else if(duration >= 150)
+                            results.E += blocksToRead;
+                        else if(duration >= 50)
+                            results.D += blocksToRead;
+                        else if(duration >= 10)
+                            results.C += blocksToRead;
+                        else if(duration >= 3)
+                            results.B += blocksToRead;
+                        else
+                            results.A += blocksToRead;
+
+                        ScanTime?.Invoke(i, duration);
+                        mhddLog.Write(i, duration);
+                        ibgLog.Write(i, currentSpeed * 1024);
+                    }
+                    else
+                    {
+                        ScanUnreadable?.Invoke(i);
+                        results.Errored += blocksToRead;
+
+                        for(ulong b = i; b < i + blocksToRead; b++)
+                            results.UnreadableSectors.Add(b);
+
+                        mhddLog.Write(i, duration < 500 ? 65535 : duration);
+
+                        ibgLog.Write(i, 0);
+                    }
+
+                    sectorSpeedStart += blocksToRead;
+
+                    double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+                    if(elapsed <= 0)
+                        continue;
+
+                    currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
+                    ScanSpeed?.Invoke(i, currentSpeed                      * 1024);
+                    sectorSpeedStart = 0;
+                    timeSpeedStart   = DateTime.UtcNow;
+                }
+
+                end = DateTime.UtcNow;
+                EndProgress?.Invoke();
+                mhddLog.Close();
+
+                ibgLog.Close(_dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                             blockSize * (double)(results.Blocks + 1) / 1024 / (results.ProcessingTime / 1000),
+                             _devicePath);
+
+                InitProgress?.Invoke();
+
+                if(ataReader.CanSeekLba && _seekTest)
+                    for(int i = 0; i < seekTimes; i++)
+                    {
+                        if(_aborted)
+                            break;
+
+                        uint seekPos = (uint)rnd.Next((int)results.Blocks);
+
+                        PulseProgress?.Invoke($"Seeking to sector {seekPos}...\t\t");
+
+                        ataReader.Seek(seekPos, out seekCur);
+
+                        if(seekCur > results.SeekMax &&
+                           seekCur > 0)
+                            results.SeekMax = seekCur;
+
+                        if(seekCur < results.SeekMin &&
+                           seekCur > 0)
+                            results.SeekMin = seekCur;
+
+                        results.SeekTotal += seekCur;
+                        GC.Collect();
+                    }
+
+                EndProgress?.Invoke();
+            }
+            else
+            {
+                InitBlockMap?.Invoke(results.Blocks, blockSize, blocksToRead, ataProfile);
+                mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, blocksToRead, false);
+                ibgLog  = new IbgLog(_ibgLogPath, ataProfile);
+
+                ulong currentBlock = 0;
+                results.Blocks = (ulong)(cylinders * heads * sectors);
+                start          = DateTime.UtcNow;
+                DateTime timeSpeedStart   = DateTime.UtcNow;
+                ulong    sectorSpeedStart = 0;
+                InitProgress?.Invoke();
+
+                for(ushort cy = 0; cy < cylinders; cy++)
+                {
+                    for(byte hd = 0; hd < heads; hd++)
+                    {
+                        for(byte sc = 1; sc < sectors; sc++)
+                        {
+                            if(_aborted)
+                                break;
+
+                            if(currentSpeed > results.MaxSpeed &&
+                               currentSpeed > 0)
+                                results.MaxSpeed = currentSpeed;
+
+                            if(currentSpeed < results.MinSpeed &&
+                               currentSpeed > 0)
+                                results.MinSpeed = currentSpeed;
+
+                            PulseProgress?.
+                                Invoke($"Reading cylinder {cy} head {hd} sector {sc} ({currentSpeed:F3} MiB/sec.)");
+
+                            bool error = ataReader.ReadChs(out cmdBuf, cy, hd, sc, out duration, out _);
+
+                            if(!error)
+                            {
+                                if(duration >= 500)
+                                    results.F += blocksToRead;
+                                else if(duration >= 150)
+                                    results.E += blocksToRead;
+                                else if(duration >= 50)
+                                    results.D += blocksToRead;
+                                else if(duration >= 10)
+                                    results.C += blocksToRead;
+                                else if(duration >= 3)
+                                    results.B += blocksToRead;
+                                else
+                                    results.A += blocksToRead;
+
+                                ScanTime?.Invoke(currentBlock, duration);
+                                mhddLog.Write(currentBlock, duration);
+                                ibgLog.Write(currentBlock, currentSpeed * 1024);
+                            }
+                            else
+                            {
+                                ScanUnreadable?.Invoke(currentBlock);
+                                results.Errored += blocksToRead;
+                                results.UnreadableSectors.Add(currentBlock);
+                                mhddLog.Write(currentBlock, duration < 500 ? 65535 : duration);
+
+                                ibgLog.Write(currentBlock, 0);
+                            }
+
+                            sectorSpeedStart++;
+                            currentBlock++;
+
+                            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+                            if(elapsed <= 0)
+                                continue;
+
+                            currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
+                            ScanSpeed?.Invoke(currentBlock, currentSpeed           * 1024);
+                            sectorSpeedStart = 0;
+                            timeSpeedStart   = DateTime.UtcNow;
+                        }
+                    }
+                }
+
+                end = DateTime.UtcNow;
+                EndProgress?.Invoke();
+                mhddLog.Close();
+
+                ibgLog.Close(_dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                             blockSize * (double)(results.Blocks + 1) / 1024 / (results.ProcessingTime / 1000),
+                             _devicePath);
+
+                InitProgress?.Invoke();
+
+                if(ataReader.CanSeek)
+                    for(int i = 0; i < seekTimes; i++)
+                    {
+                        if(_aborted)
+                            break;
+
+                        ushort seekCy = (ushort)rnd.Next(cylinders);
+                        byte   seekHd = (byte)rnd.Next(heads);
+                        byte   seekSc = (byte)rnd.Next(sectors);
+
+                        PulseProgress?.
+                            Invoke($"\rSeeking to cylinder {seekCy}, head {seekHd}, sector {seekSc}...\t\t");
+
+                        ataReader.SeekChs(seekCy, seekHd, seekSc, out seekCur);
+
+                        if(seekCur > results.SeekMax &&
+                           seekCur > 0)
+                            results.SeekMax = seekCur;
+
+                        if(seekCur < results.SeekMin &&
+                           seekCur > 0)
+                            results.SeekMin = seekCur;
+
+                        results.SeekTotal += seekCur;
+                        GC.Collect();
+                    }
+
+                EndProgress?.Invoke();
+            }
+
+            results.ProcessingTime /= 1000;
+            results.TotalTime      =  (end - start).TotalSeconds;
+            results.AvgSpeed       =  blockSize * (double)(results.Blocks + 1) / 1048576 / results.ProcessingTime;
+            results.SeekTimes      =  seekTimes;
 
             return results;
         }
+
+        StoppingErrorMessage?.Invoke("Unable to communicate with ATA device.");
+
+        return results;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Scanning/MediaScan.cs b/Aaru.Core/Devices/Scanning/MediaScan.cs
index b7f2f7cc2..168ce0fc7 100644
--- a/Aaru.Core/Devices/Scanning/MediaScan.cs
+++ b/Aaru.Core/Devices/Scanning/MediaScan.cs
@@ -35,78 +35,77 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.Devices;
 
-namespace Aaru.Core.Devices.Scanning
+namespace Aaru.Core.Devices.Scanning;
+
+public sealed partial class MediaScan
 {
-    public sealed partial class MediaScan
+    readonly Device _dev;
+    readonly string _devicePath;
+    readonly string _ibgLogPath;
+    readonly string _mhddLogPath;
+    readonly bool   _seekTest;
+    readonly bool   _useBufferedReads;
+    bool            _aborted;
+
+    /// <param name="mhddLogPath">Path to a MHDD log file</param>
+    /// <param name="ibgLogPath">Path to a IMGBurn log file</param>
+    /// <param name="devicePath">Device path</param>
+    /// <param name="dev">Device</param>
+    /// <param name="seekTest">Enable seek test</param>
+    /// <param name="useBufferedReads">
+    ///     If MMC/SD does not support CMD23, use OS buffered reads instead of multiple single block
+    ///     commands
+    /// </param>
+    public MediaScan(string mhddLogPath, string ibgLogPath, string devicePath, Device dev, bool useBufferedReads,
+                     bool seekTest = true)
     {
-        readonly Device _dev;
-        readonly string _devicePath;
-        readonly string _ibgLogPath;
-        readonly string _mhddLogPath;
-        readonly bool   _seekTest;
-        readonly bool   _useBufferedReads;
-        bool            _aborted;
-
-        /// <param name="mhddLogPath">Path to a MHDD log file</param>
-        /// <param name="ibgLogPath">Path to a IMGBurn log file</param>
-        /// <param name="devicePath">Device path</param>
-        /// <param name="dev">Device</param>
-        /// <param name="seekTest">Enable seek test</param>
-        /// <param name="useBufferedReads">
-        ///     If MMC/SD does not support CMD23, use OS buffered reads instead of multiple single block
-        ///     commands
-        /// </param>
-        public MediaScan(string mhddLogPath, string ibgLogPath, string devicePath, Device dev, bool useBufferedReads,
-                         bool seekTest = true)
-        {
-            _mhddLogPath      = mhddLogPath;
-            _ibgLogPath       = ibgLogPath;
-            _devicePath       = devicePath;
-            _dev              = dev;
-            _aborted          = false;
-            _seekTest         = seekTest;
-            _useBufferedReads = useBufferedReads;
-        }
-
-        /// <summary>Starts a media scan</summary>
-        /// <returns>Media scan results</returns>
-        /// <exception cref="NotSupportedException">Unknown device type</exception>
-        public ScanResults Scan()
-        {
-            switch(_dev.Type)
-            {
-                case DeviceType.ATA: return Ata();
-                case DeviceType.MMC:
-                case DeviceType.SecureDigital: return SecureDigital();
-                case DeviceType.NVMe: return Nvme();
-                case DeviceType.ATAPI:
-                case DeviceType.SCSI: return Scsi();
-                default: throw new NotSupportedException("Unknown device type.");
-            }
-        }
-
-        /// <summary>Aborts the running media scan</summary>
-        public void Abort() => _aborted = true;
-
-        /// <summary>Event raised when the progress bar is not longer needed</summary>
-        public event EndProgressHandler EndProgress;
-        /// <summary>Event raised when a progress bar is needed</summary>
-        public event InitProgressHandler InitProgress;
-        /// <summary>Event raised to report status updates</summary>
-        public event UpdateStatusHandler UpdateStatus;
-        /// <summary>Event raised to report a fatal error that stops the dumping operation and should call user's attention</summary>
-        public event ErrorMessageHandler StoppingErrorMessage;
-        /// <summary>Event raised to update the values of a determinate progress bar</summary>
-        public event UpdateProgressHandler UpdateProgress;
-        /// <summary>Event raised to update the status of an indeterminate progress bar</summary>
-        public event PulseProgressHandler PulseProgress;
-        /// <summary>Updates lists of time taken on scanning from the specified sector</summary>
-        public event ScanTimeHandler ScanTime;
-        /// <summary>Specified a number of blocks could not be read on scan</summary>
-        public event ScanUnreadableHandler ScanUnreadable;
-        /// <summary>Initializes a block map that's going to be filled with a media scan</summary>
-        public event InitBlockMapHandler InitBlockMap;
-        /// <summary>Sends the speed of scanning a specific sector</summary>
-        public event ScanSpeedHandler ScanSpeed;
+        _mhddLogPath      = mhddLogPath;
+        _ibgLogPath       = ibgLogPath;
+        _devicePath       = devicePath;
+        _dev              = dev;
+        _aborted          = false;
+        _seekTest         = seekTest;
+        _useBufferedReads = useBufferedReads;
     }
+
+    /// <summary>Starts a media scan</summary>
+    /// <returns>Media scan results</returns>
+    /// <exception cref="NotSupportedException">Unknown device type</exception>
+    public ScanResults Scan()
+    {
+        switch(_dev.Type)
+        {
+            case DeviceType.ATA: return Ata();
+            case DeviceType.MMC:
+            case DeviceType.SecureDigital: return SecureDigital();
+            case DeviceType.NVMe: return Nvme();
+            case DeviceType.ATAPI:
+            case DeviceType.SCSI: return Scsi();
+            default: throw new NotSupportedException("Unknown device type.");
+        }
+    }
+
+    /// <summary>Aborts the running media scan</summary>
+    public void Abort() => _aborted = true;
+
+    /// <summary>Event raised when the progress bar is not longer needed</summary>
+    public event EndProgressHandler EndProgress;
+    /// <summary>Event raised when a progress bar is needed</summary>
+    public event InitProgressHandler InitProgress;
+    /// <summary>Event raised to report status updates</summary>
+    public event UpdateStatusHandler UpdateStatus;
+    /// <summary>Event raised to report a fatal error that stops the dumping operation and should call user's attention</summary>
+    public event ErrorMessageHandler StoppingErrorMessage;
+    /// <summary>Event raised to update the values of a determinate progress bar</summary>
+    public event UpdateProgressHandler UpdateProgress;
+    /// <summary>Event raised to update the status of an indeterminate progress bar</summary>
+    public event PulseProgressHandler PulseProgress;
+    /// <summary>Updates lists of time taken on scanning from the specified sector</summary>
+    public event ScanTimeHandler ScanTime;
+    /// <summary>Specified a number of blocks could not be read on scan</summary>
+    public event ScanUnreadableHandler ScanUnreadable;
+    /// <summary>Initializes a block map that's going to be filled with a media scan</summary>
+    public event InitBlockMapHandler InitBlockMap;
+    /// <summary>Sends the speed of scanning a specific sector</summary>
+    public event ScanSpeedHandler ScanSpeed;
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Scanning/NVMe.cs b/Aaru.Core/Devices/Scanning/NVMe.cs
index 388275eeb..7888249c3 100644
--- a/Aaru.Core/Devices/Scanning/NVMe.cs
+++ b/Aaru.Core/Devices/Scanning/NVMe.cs
@@ -30,15 +30,14 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Core.Devices.Scanning
-{
-    public sealed partial class MediaScan
-    {
-        ScanResults Nvme()
-        {
-            StoppingErrorMessage?.Invoke("NVMe devices not yet supported.");
+namespace Aaru.Core.Devices.Scanning;
 
-            return default;
-        }
+public sealed partial class MediaScan
+{
+    ScanResults Nvme()
+    {
+        StoppingErrorMessage?.Invoke("NVMe devices not yet supported.");
+
+        return default;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Scanning/SCSI.cs b/Aaru.Core/Devices/Scanning/SCSI.cs
index f9fb67abf..179e92838 100644
--- a/Aaru.Core/Devices/Scanning/SCSI.cs
+++ b/Aaru.Core/Devices/Scanning/SCSI.cs
@@ -41,513 +41,408 @@ using Aaru.Decoders.SCSI;
 using Aaru.Decoders.SCSI.MMC;
 using Aaru.Devices;
 
-namespace Aaru.Core.Devices.Scanning
+namespace Aaru.Core.Devices.Scanning;
+
+/// <summary>Implements scanning the media from an SCSI device</summary>
+public sealed partial class MediaScan
 {
-    /// <summary>Implements scanning the media from an SCSI device</summary>
-    public sealed partial class MediaScan
+    ScanResults Scsi()
     {
-        ScanResults Scsi()
+        var     results = new ScanResults();
+        MhddLog mhddLog;
+        IbgLog  ibgLog;
+        byte[]  senseBuf;
+        bool    sense;
+        uint    blockSize        = 0;
+        ushort  currentProfile   = 0x0001;
+        bool    foundReadCommand = false;
+        bool    readcd           = false;
+
+        results.Blocks = 0;
+
+        if(_dev.IsRemovable)
         {
-            var     results = new ScanResults();
-            MhddLog mhddLog;
-            IbgLog  ibgLog;
-            byte[]  senseBuf;
-            bool    sense;
-            uint    blockSize        = 0;
-            ushort  currentProfile   = 0x0001;
-            bool    foundReadCommand = false;
-            bool    readcd           = false;
+            sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
 
-            results.Blocks = 0;
-
-            if(_dev.IsRemovable)
+            if(sense)
             {
-                sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
+                InitProgress?.Invoke();
+                DecodedSense? decSense = Sense.Decode(senseBuf);
 
-                if(sense)
-                {
-                    InitProgress?.Invoke();
-                    DecodedSense? decSense = Sense.Decode(senseBuf);
-
-                    if(decSense.HasValue)
-                        switch(decSense.Value.ASC)
+                if(decSense.HasValue)
+                    switch(decSense.Value.ASC)
+                    {
+                        case 0x3A:
                         {
-                            case 0x3A:
+                            int leftRetries = 5;
+
+                            while(leftRetries > 0)
                             {
-                                int leftRetries = 5;
+                                PulseProgress?.Invoke("Waiting for drive to become ready");
+                                Thread.Sleep(2000);
+                                sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
 
-                                while(leftRetries > 0)
-                                {
-                                    PulseProgress?.Invoke("Waiting for drive to become ready");
-                                    Thread.Sleep(2000);
-                                    sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
+                                if(!sense)
+                                    break;
 
-                                    if(!sense)
-                                        break;
-
-                                    leftRetries--;
-                                }
-
-                                if(sense)
-                                {
-                                    StoppingErrorMessage?.Invoke("Please insert media in drive");
-
-                                    return results;
-                                }
-
-                                break;
-                            }
-                            case 0x04 when decSense.Value.ASCQ == 0x01:
-                            {
-                                int leftRetries = 10;
-
-                                while(leftRetries > 0)
-                                {
-                                    PulseProgress?.Invoke("Waiting for drive to become ready");
-                                    Thread.Sleep(2000);
-                                    sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
-
-                                    if(!sense)
-                                        break;
-
-                                    leftRetries--;
-                                }
-
-                                if(sense)
-                                {
-                                    StoppingErrorMessage?.
-                                        Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
-
-                                    return results;
-                                }
-
-                                break;
+                                leftRetries--;
                             }
 
-                            // These should be trapped by the OS but seems in some cases they're not
-                            case 0x28:
+                            if(sense)
                             {
-                                int leftRetries = 10;
+                                StoppingErrorMessage?.Invoke("Please insert media in drive");
 
-                                while(leftRetries > 0)
-                                {
-                                    PulseProgress?.Invoke("Waiting for drive to become ready");
-                                    Thread.Sleep(2000);
-                                    sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
-
-                                    if(!sense)
-                                        break;
-
-                                    leftRetries--;
-                                }
-
-                                if(sense)
-                                {
-                                    StoppingErrorMessage?.
-                                        Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
-
-                                    return results;
-                                }
-
-                                break;
+                                return results;
                             }
-                            default:
+
+                            break;
+                        }
+                        case 0x04 when decSense.Value.ASCQ == 0x01:
+                        {
+                            int leftRetries = 10;
+
+                            while(leftRetries > 0)
+                            {
+                                PulseProgress?.Invoke("Waiting for drive to become ready");
+                                Thread.Sleep(2000);
+                                sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
+
+                                if(!sense)
+                                    break;
+
+                                leftRetries--;
+                            }
+
+                            if(sense)
+                            {
                                 StoppingErrorMessage?.
                                     Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
 
                                 return results;
-                        }
-                    else
-                    {
-                        StoppingErrorMessage?.Invoke("Unknown testing unit was ready.");
-
-                        return results;
-                    }
-
-                    EndProgress?.Invoke();
-                }
-            }
-
-            Reader scsiReader = null;
-
-            switch(_dev.ScsiType)
-            {
-                case PeripheralDeviceTypes.DirectAccess:
-                case PeripheralDeviceTypes.MultiMediaDevice:
-                case PeripheralDeviceTypes.OCRWDevice:
-                case PeripheralDeviceTypes.OpticalDevice:
-                case PeripheralDeviceTypes.SimplifiedDevice:
-                case PeripheralDeviceTypes.WriteOnceDevice:
-                    scsiReader       = new Reader(_dev, _dev.Timeout, null, null);
-                    results.Blocks   = scsiReader.GetDeviceBlocks();
-                    foundReadCommand = !scsiReader.FindReadCommand();
-
-                    if(!foundReadCommand &&
-                       _dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
-                    {
-                        StoppingErrorMessage?.Invoke("Unable to read medium.");
-
-                        return results;
-                    }
-
-                    blockSize = scsiReader.LogicalBlockSize;
-
-                    if(results.Blocks != 0 &&
-                       blockSize      != 0)
-                    {
-                        results.Blocks++;
-
-                        ulong totalSize = results.Blocks * blockSize;
-
-                        if(totalSize > 1099511627776)
-                            UpdateStatus?.
-                                Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)");
-                        else if(totalSize > 1073741824)
-                            UpdateStatus?.
-                                Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)");
-                        else if(totalSize > 1048576)
-                            UpdateStatus?.
-                                Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)");
-                        else if(totalSize > 1024)
-                            UpdateStatus?.
-                                Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)");
-                        else
-                            UpdateStatus?.
-                                Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize} bytes)");
-                    }
-
-                    break;
-                case PeripheralDeviceTypes.SequentialAccess:
-                    StoppingErrorMessage?.Invoke("Scanning will never be supported on SCSI Streaming Devices." +
-                                                 Environment.NewLine                                           +
-                                                 "It has no sense to do it, and it will put too much strain on the tape.");
-
-                    return results;
-            }
-
-            if(results.Blocks == 0)
-            {
-                StoppingErrorMessage?.Invoke("Unable to read medium or empty medium present...");
-
-                return results;
-            }
-
-            bool               compactDisc = true;
-            FullTOC.CDFullTOC? toc         = null;
-
-            if(_dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
-            {
-                sense = _dev.GetConfiguration(out byte[] cmdBuf, out senseBuf, 0, MmcGetConfigurationRt.Current,
-                                              _dev.Timeout, out _);
-
-                if(!sense)
-                {
-                    Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
-
-                    currentProfile = ftr.CurrentProfile;
-
-                    switch(ftr.CurrentProfile)
-                    {
-                        case 0x0005:
-                        case 0x0008:
-                        case 0x0009:
-                        case 0x000A:
-                        case 0x0020:
-                        case 0x0021:
-                        case 0x0022: break;
-                        default:
-                            compactDisc = false;
+                            }
 
                             break;
+                        }
+
+                        // These should be trapped by the OS but seems in some cases they're not
+                        case 0x28:
+                        {
+                            int leftRetries = 10;
+
+                            while(leftRetries > 0)
+                            {
+                                PulseProgress?.Invoke("Waiting for drive to become ready");
+                                Thread.Sleep(2000);
+                                sense = _dev.ScsiTestUnitReady(out senseBuf, _dev.Timeout, out _);
+
+                                if(!sense)
+                                    break;
+
+                                leftRetries--;
+                            }
+
+                            if(sense)
+                            {
+                                StoppingErrorMessage?.
+                                    Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
+
+                                return results;
+                            }
+
+                            break;
+                        }
+                        default:
+                            StoppingErrorMessage?.
+                                Invoke($"Error testing unit was ready:\n{Sense.PrettifySense(senseBuf)}");
+
+                            return results;
                     }
-                }
-
-                if(compactDisc)
+                else
                 {
-                    currentProfile = 0x0008;
-
-                    // We discarded all discs that falsify a TOC before requesting a real TOC
-                    // No TOC, no CD (or an empty one)
-                    bool tocSense = _dev.ReadRawToc(out cmdBuf, out senseBuf, 1, _dev.Timeout, out _);
-
-                    if(!tocSense)
-                        toc = FullTOC.Decode(cmdBuf);
-                }
-            }
-            else
-                compactDisc = false;
-
-            scsiReader.GetBlocksToRead();
-
-            uint blocksToRead;
-            results.A       = 0; // <3ms
-            results.B       = 0; // >=3ms, <10ms
-            results.C       = 0; // >=10ms, <50ms
-            results.D       = 0; // >=50ms, <150ms
-            results.E       = 0; // >=150ms, <500ms
-            results.F       = 0; // >=500ms
-            results.Errored = 0;
-            DateTime start;
-            DateTime end;
-            results.ProcessingTime = 0;
-            results.TotalTime      = 0;
-            double currentSpeed = 0;
-            results.MaxSpeed          = double.MinValue;
-            results.MinSpeed          = double.MaxValue;
-            results.UnreadableSectors = new List<ulong>();
-
-            if(compactDisc)
-            {
-                blocksToRead = 64;
-
-                if(toc == null)
-                {
-                    StoppingErrorMessage?.Invoke("Error trying to decode TOC...");
+                    StoppingErrorMessage?.Invoke("Unknown testing unit was ready.");
 
                     return results;
                 }
 
-                readcd = !_dev.ReadCd(out _, out senseBuf, 0, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
-                                      MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
-                                      _dev.Timeout, out _);
+                EndProgress?.Invoke();
+            }
+        }
 
-                if(readcd)
-                    UpdateStatus?.Invoke("Using MMC READ CD command.");
-                else if(!foundReadCommand)
+        Reader scsiReader = null;
+
+        switch(_dev.ScsiType)
+        {
+            case PeripheralDeviceTypes.DirectAccess:
+            case PeripheralDeviceTypes.MultiMediaDevice:
+            case PeripheralDeviceTypes.OCRWDevice:
+            case PeripheralDeviceTypes.OpticalDevice:
+            case PeripheralDeviceTypes.SimplifiedDevice:
+            case PeripheralDeviceTypes.WriteOnceDevice:
+                scsiReader       = new Reader(_dev, _dev.Timeout, null, null);
+                results.Blocks   = scsiReader.GetDeviceBlocks();
+                foundReadCommand = !scsiReader.FindReadCommand();
+
+                if(!foundReadCommand &&
+                   _dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
                 {
                     StoppingErrorMessage?.Invoke("Unable to read medium.");
 
                     return results;
                 }
 
-                start = DateTime.UtcNow;
+                blockSize = scsiReader.LogicalBlockSize;
 
-                if(readcd)
-                    while(true)
-                    {
-                        sense = _dev.ReadCd(out _, out senseBuf, 0, 2352, blocksToRead, MmcSectorTypes.AllTypes, false,
-                                            false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                            MmcSubchannel.None, _dev.Timeout, out _);
-
-                        if(_dev.Error || sense)
-                            blocksToRead /= 2;
-
-                        if(!_dev.Error ||
-                           blocksToRead == 1)
-                            break;
-                    }
-
-                if(_dev.Error)
+                if(results.Blocks != 0 &&
+                   blockSize      != 0)
                 {
-                    StoppingErrorMessage?.
-                        Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
+                    results.Blocks++;
 
-                    return results;
+                    ulong totalSize = results.Blocks * blockSize;
+
+                    if(totalSize > 1099511627776)
+                        UpdateStatus?.
+                            Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)");
+                    else if(totalSize > 1073741824)
+                        UpdateStatus?.
+                            Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)");
+                    else if(totalSize > 1048576)
+                        UpdateStatus?.
+                            Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)");
+                    else if(totalSize > 1024)
+                        UpdateStatus?.
+                            Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)");
+                    else
+                        UpdateStatus?.
+                            Invoke($"Media has {results.Blocks} blocks of {blockSize} bytes/each. (for a total of {totalSize} bytes)");
                 }
 
-                UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
+                break;
+            case PeripheralDeviceTypes.SequentialAccess:
+                StoppingErrorMessage?.Invoke("Scanning will never be supported on SCSI Streaming Devices." +
+                                             Environment.NewLine                                           +
+                                             "It has no sense to do it, and it will put too much strain on the tape.");
 
-                InitBlockMap?.Invoke(results.Blocks, blockSize, blocksToRead, currentProfile);
-                mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, blocksToRead, false);
-                ibgLog  = new IbgLog(_ibgLogPath, currentProfile);
-                DateTime timeSpeedStart   = DateTime.UtcNow;
-                ulong    sectorSpeedStart = 0;
+                return results;
+        }
 
-                InitProgress?.Invoke();
+        if(results.Blocks == 0)
+        {
+            StoppingErrorMessage?.Invoke("Unable to read medium or empty medium present...");
 
-                for(ulong i = 0; i < results.Blocks; i += blocksToRead)
+            return results;
+        }
+
+        bool               compactDisc = true;
+        FullTOC.CDFullTOC? toc         = null;
+
+        if(_dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
+        {
+            sense = _dev.GetConfiguration(out byte[] cmdBuf, out senseBuf, 0, MmcGetConfigurationRt.Current,
+                                          _dev.Timeout, out _);
+
+            if(!sense)
+            {
+                Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
+
+                currentProfile = ftr.CurrentProfile;
+
+                switch(ftr.CurrentProfile)
                 {
-                    if(_aborted)
+                    case 0x0005:
+                    case 0x0008:
+                    case 0x0009:
+                    case 0x000A:
+                    case 0x0020:
+                    case 0x0021:
+                    case 0x0022: break;
+                    default:
+                        compactDisc = false;
+
                         break;
+                }
+            }
 
-                    double cmdDuration;
+            if(compactDisc)
+            {
+                currentProfile = 0x0008;
 
-                    if(results.Blocks - i < blocksToRead)
-                        blocksToRead = (uint)(results.Blocks - i);
+                // We discarded all discs that falsify a TOC before requesting a real TOC
+                // No TOC, no CD (or an empty one)
+                bool tocSense = _dev.ReadRawToc(out cmdBuf, out senseBuf, 1, _dev.Timeout, out _);
 
-                    if(currentSpeed > results.MaxSpeed &&
-                       currentSpeed > 0)
-                        results.MaxSpeed = currentSpeed;
+                if(!tocSense)
+                    toc = FullTOC.Decode(cmdBuf);
+            }
+        }
+        else
+            compactDisc = false;
 
-                    if(currentSpeed < results.MinSpeed &&
-                       currentSpeed > 0)
-                        results.MinSpeed = currentSpeed;
+        scsiReader.GetBlocksToRead();
 
-                    UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)",
-                                           (long)i, (long)results.Blocks);
+        uint blocksToRead;
+        results.A       = 0; // <3ms
+        results.B       = 0; // >=3ms, <10ms
+        results.C       = 0; // >=10ms, <50ms
+        results.D       = 0; // >=50ms, <150ms
+        results.E       = 0; // >=150ms, <500ms
+        results.F       = 0; // >=500ms
+        results.Errored = 0;
+        DateTime start;
+        DateTime end;
+        results.ProcessingTime = 0;
+        results.TotalTime      = 0;
+        double currentSpeed = 0;
+        results.MaxSpeed          = double.MinValue;
+        results.MinSpeed          = double.MaxValue;
+        results.UnreadableSectors = new List<ulong>();
+
+        if(compactDisc)
+        {
+            blocksToRead = 64;
+
+            if(toc == null)
+            {
+                StoppingErrorMessage?.Invoke("Error trying to decode TOC...");
+
+                return results;
+            }
+
+            readcd = !_dev.ReadCd(out _, out senseBuf, 0, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
+                                  MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
+                                  _dev.Timeout, out _);
+
+            if(readcd)
+                UpdateStatus?.Invoke("Using MMC READ CD command.");
+            else if(!foundReadCommand)
+            {
+                StoppingErrorMessage?.Invoke("Unable to read medium.");
+
+                return results;
+            }
+
+            start = DateTime.UtcNow;
+
+            if(readcd)
+                while(true)
+                {
+                    sense = _dev.ReadCd(out _, out senseBuf, 0, 2352, blocksToRead, MmcSectorTypes.AllTypes, false,
+                                        false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                        MmcSubchannel.None, _dev.Timeout, out _);
+
+                    if(_dev.Error || sense)
+                        blocksToRead /= 2;
+
+                    if(!_dev.Error ||
+                       blocksToRead == 1)
+                        break;
+                }
+
+            if(_dev.Error)
+            {
+                StoppingErrorMessage?.
+                    Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
+
+                return results;
+            }
+
+            UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
+
+            InitBlockMap?.Invoke(results.Blocks, blockSize, blocksToRead, currentProfile);
+            mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, blocksToRead, false);
+            ibgLog  = new IbgLog(_ibgLogPath, currentProfile);
+            DateTime timeSpeedStart   = DateTime.UtcNow;
+            ulong    sectorSpeedStart = 0;
+
+            InitProgress?.Invoke();
+
+            for(ulong i = 0; i < results.Blocks; i += blocksToRead)
+            {
+                if(_aborted)
+                    break;
+
+                double cmdDuration;
+
+                if(results.Blocks - i < blocksToRead)
+                    blocksToRead = (uint)(results.Blocks - i);
+
+                if(currentSpeed > results.MaxSpeed &&
+                   currentSpeed > 0)
+                    results.MaxSpeed = currentSpeed;
+
+                if(currentSpeed < results.MinSpeed &&
+                   currentSpeed > 0)
+                    results.MinSpeed = currentSpeed;
+
+                UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)",
+                                       (long)i, (long)results.Blocks);
+
+                if(readcd)
+                {
+                    sense = _dev.ReadCd(out _, out senseBuf, (uint)i, 2352, blocksToRead, MmcSectorTypes.AllTypes,
+                                        false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                        MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out cmdDuration);
+                }
+                else
+                {
+                    sense = scsiReader.ReadBlocks(out _, i, blocksToRead, out cmdDuration, out _, out _);
+                }
+
+                results.ProcessingTime += cmdDuration;
+
+                if(!sense)
+                {
+                    if(cmdDuration >= 500)
+                        results.F += blocksToRead;
+                    else if(cmdDuration >= 150)
+                        results.E += blocksToRead;
+                    else if(cmdDuration >= 50)
+                        results.D += blocksToRead;
+                    else if(cmdDuration >= 10)
+                        results.C += blocksToRead;
+                    else if(cmdDuration >= 3)
+                        results.B += blocksToRead;
+                    else
+                        results.A += blocksToRead;
+
+                    ScanTime?.Invoke(i, cmdDuration);
+                    mhddLog.Write(i, cmdDuration);
+                    ibgLog.Write(i, currentSpeed * 1024);
+                }
+                else
+                {
+                    DecodedSense? senseDecoded = null;
 
                     if(readcd)
                     {
-                        sense = _dev.ReadCd(out _, out senseBuf, (uint)i, 2352, blocksToRead, MmcSectorTypes.AllTypes,
-                                            false, false, true, MmcHeaderCodes.AllHeaders, true, true,
-                                            MmcErrorField.None, MmcSubchannel.None, _dev.Timeout, out cmdDuration);
-                    }
-                    else
-                    {
-                        sense = scsiReader.ReadBlocks(out _, i, blocksToRead, out cmdDuration, out _, out _);
-                    }
+                        AaruConsole.DebugWriteLine("Media-Scan", "READ CD error:\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
 
-                    results.ProcessingTime += cmdDuration;
+                        senseDecoded = Sense.Decode(senseBuf);
 
-                    if(!sense)
-                    {
-                        if(cmdDuration >= 500)
-                            results.F += blocksToRead;
-                        else if(cmdDuration >= 150)
-                            results.E += blocksToRead;
-                        else if(cmdDuration >= 50)
-                            results.D += blocksToRead;
-                        else if(cmdDuration >= 10)
-                            results.C += blocksToRead;
-                        else if(cmdDuration >= 3)
-                            results.B += blocksToRead;
-                        else
-                            results.A += blocksToRead;
-
-                        ScanTime?.Invoke(i, cmdDuration);
-                        mhddLog.Write(i, cmdDuration);
-                        ibgLog.Write(i, currentSpeed * 1024);
-                    }
-                    else
-                    {
-                        DecodedSense? senseDecoded = null;
-
-                        if(readcd)
+                        if(senseDecoded.HasValue)
                         {
-                            AaruConsole.DebugWriteLine("Media-Scan", "READ CD error:\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
+                            // TODO: This error happens when changing from track type afaik. Need to solve that more cleanly
+                            // LOGICAL BLOCK ADDRESS OUT OF RANGE
+                            if((senseDecoded.Value.ASC != 0x21 || senseDecoded.Value.ASCQ != 0x00) &&
 
-                            senseDecoded = Sense.Decode(senseBuf);
-
-                            if(senseDecoded.HasValue)
+                               // ILLEGAL MODE FOR THIS TRACK (requesting sectors as-is, this is a firmware misconception when audio sectors
+                               // are in a track where subchannel indicates data)
+                               (senseDecoded.Value.ASC != 0x64 || senseDecoded.Value.ASCQ != 0x00))
                             {
-                                // TODO: This error happens when changing from track type afaik. Need to solve that more cleanly
-                                // LOGICAL BLOCK ADDRESS OUT OF RANGE
-                                if((senseDecoded.Value.ASC != 0x21 || senseDecoded.Value.ASCQ != 0x00) &&
+                                results.Errored += blocksToRead;
 
-                                   // ILLEGAL MODE FOR THIS TRACK (requesting sectors as-is, this is a firmware misconception when audio sectors
-                                   // are in a track where subchannel indicates data)
-                                   (senseDecoded.Value.ASC != 0x64 || senseDecoded.Value.ASCQ != 0x00))
-                                {
-                                    results.Errored += blocksToRead;
+                                for(ulong b = i; b < i + blocksToRead; b++)
+                                    results.UnreadableSectors.Add(b);
 
-                                    for(ulong b = i; b < i + blocksToRead; b++)
-                                        results.UnreadableSectors.Add(b);
+                                ScanUnreadable?.Invoke(i);
+                                mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
 
-                                    ScanUnreadable?.Invoke(i);
-                                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                                    ibgLog.Write(i, 0);
-                                }
+                                ibgLog.Write(i, 0);
                             }
                         }
-
-                        if(!senseDecoded.HasValue)
-                        {
-                            ScanUnreadable?.Invoke(i);
-                            results.Errored += blocksToRead;
-
-                            for(ulong b = i; b < i + blocksToRead; b++)
-                                results.UnreadableSectors.Add(b);
-
-                            mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
-
-                            ibgLog.Write(i, 0);
-                        }
                     }
 
-                    sectorSpeedStart += blocksToRead;
-
-                    double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                    if(elapsed <= 0)
-                        continue;
-
-                    currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                    ScanSpeed?.Invoke(i, currentSpeed                      * 1024);
-                    sectorSpeedStart = 0;
-                    timeSpeedStart   = DateTime.UtcNow;
-                }
-
-                end = DateTime.UtcNow;
-                EndProgress?.Invoke();
-                mhddLog.Close();
-
-                currentSpeed = sectorSpeedStart * blockSize / (1048576 * (end - timeSpeedStart).TotalSeconds);
-
-                // ReSharper disable once CompareOfFloatsByEqualityOperator
-                if(results.MaxSpeed == double.MinValue)
-                    results.MaxSpeed = currentSpeed;
-
-                // ReSharper disable once CompareOfFloatsByEqualityOperator
-                if(results.MinSpeed == double.MaxValue)
-                    results.MinSpeed = currentSpeed;
-
-                ibgLog.Close(_dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                             blockSize * (double)(results.Blocks + 1) / 1024 / (results.ProcessingTime / 1000),
-                             _devicePath);
-            }
-            else
-            {
-                start = DateTime.UtcNow;
-
-                UpdateStatus?.Invoke($"Reading {scsiReader.BlocksToRead} sectors at a time.");
-
-                InitBlockMap?.Invoke(results.Blocks, blockSize, scsiReader.BlocksToRead, currentProfile);
-                mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, scsiReader.BlocksToRead, false);
-                ibgLog  = new IbgLog(_ibgLogPath, currentProfile);
-                DateTime timeSpeedStart   = DateTime.UtcNow;
-                ulong    sectorSpeedStart = 0;
-
-                InitProgress?.Invoke();
-
-                for(ulong i = 0; i < results.Blocks; i += scsiReader.BlocksToRead)
-                {
-                    if(_aborted)
-                        break;
-
-                    blocksToRead = scsiReader.BlocksToRead;
-
-                    if(results.Blocks - i < blocksToRead)
-                        blocksToRead = (uint)(results.Blocks - i);
-
-                    if(currentSpeed > results.MaxSpeed &&
-                       currentSpeed > 0)
-                        results.MaxSpeed = currentSpeed;
-
-                    if(currentSpeed < results.MinSpeed &&
-                       currentSpeed > 0)
-                        results.MinSpeed = currentSpeed;
-
-                    UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)",
-                                           (long)i, (long)results.Blocks);
-
-                    sense = scsiReader.ReadBlocks(out _, i, blocksToRead, out double cmdDuration, out _, out _);
-                    results.ProcessingTime += cmdDuration;
-
-                    if(!sense &&
-                       !_dev.Error)
-                    {
-                        if(cmdDuration >= 500)
-                            results.F += blocksToRead;
-                        else if(cmdDuration >= 150)
-                            results.E += blocksToRead;
-                        else if(cmdDuration >= 50)
-                            results.D += blocksToRead;
-                        else if(cmdDuration >= 10)
-                            results.C += blocksToRead;
-                        else if(cmdDuration >= 3)
-                            results.B += blocksToRead;
-                        else
-                            results.A += blocksToRead;
-
-                        ScanTime?.Invoke(i, cmdDuration);
-                        mhddLog.Write(i, cmdDuration);
-                        ibgLog.Write(i, currentSpeed * 1024);
-                    }
-
-                    // TODO: Separate errors on kind of errors.
-                    else
+                    if(!senseDecoded.HasValue)
                     {
                         ScanUnreadable?.Invoke(i);
                         results.Errored += blocksToRead;
@@ -556,80 +451,184 @@ namespace Aaru.Core.Devices.Scanning
                             results.UnreadableSectors.Add(b);
 
                         mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+
                         ibgLog.Write(i, 0);
                     }
-
-                    sectorSpeedStart += blocksToRead;
-
-                    double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                    if(elapsed <= 0)
-                        continue;
-
-                    currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                    ScanSpeed?.Invoke(i, currentSpeed                      * 1024);
-                    sectorSpeedStart = 0;
-                    timeSpeedStart   = DateTime.UtcNow;
                 }
 
-                end = DateTime.UtcNow;
-                EndProgress?.Invoke();
-                mhddLog.Close();
+                sectorSpeedStart += blocksToRead;
 
-                ibgLog.Close(_dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                             blockSize * (double)(results.Blocks + 1) / 1024 / (results.ProcessingTime / 1000),
-                             _devicePath);
+                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+                if(elapsed <= 0)
+                    continue;
+
+                currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
+                ScanSpeed?.Invoke(i, currentSpeed                      * 1024);
+                sectorSpeedStart = 0;
+                timeSpeedStart   = DateTime.UtcNow;
             }
 
-            results.SeekMax   = double.MinValue;
-            results.SeekMin   = double.MaxValue;
-            results.SeekTotal = 0;
-            const int seekTimes = 1000;
+            end = DateTime.UtcNow;
+            EndProgress?.Invoke();
+            mhddLog.Close();
 
-            var rnd = new Random();
+            currentSpeed = sectorSpeedStart * blockSize / (1048576 * (end - timeSpeedStart).TotalSeconds);
+
+            // ReSharper disable once CompareOfFloatsByEqualityOperator
+            if(results.MaxSpeed == double.MinValue)
+                results.MaxSpeed = currentSpeed;
+
+            // ReSharper disable once CompareOfFloatsByEqualityOperator
+            if(results.MinSpeed == double.MaxValue)
+                results.MinSpeed = currentSpeed;
+
+            ibgLog.Close(_dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                         blockSize * (double)(results.Blocks + 1) / 1024 / (results.ProcessingTime / 1000),
+                         _devicePath);
+        }
+        else
+        {
+            start = DateTime.UtcNow;
+
+            UpdateStatus?.Invoke($"Reading {scsiReader.BlocksToRead} sectors at a time.");
+
+            InitBlockMap?.Invoke(results.Blocks, blockSize, scsiReader.BlocksToRead, currentProfile);
+            mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, scsiReader.BlocksToRead, false);
+            ibgLog  = new IbgLog(_ibgLogPath, currentProfile);
+            DateTime timeSpeedStart   = DateTime.UtcNow;
+            ulong    sectorSpeedStart = 0;
 
             InitProgress?.Invoke();
 
-            for(int i = 0; i < seekTimes; i++)
+            for(ulong i = 0; i < results.Blocks; i += scsiReader.BlocksToRead)
             {
-                if(_aborted || !_seekTest)
+                if(_aborted)
                     break;
 
-                uint seekPos = (uint)rnd.Next((int)results.Blocks);
+                blocksToRead = scsiReader.BlocksToRead;
 
-                PulseProgress?.Invoke($"Seeking to sector {seekPos}...\t\t");
+                if(results.Blocks - i < blocksToRead)
+                    blocksToRead = (uint)(results.Blocks - i);
 
-                double seekCur;
+                if(currentSpeed > results.MaxSpeed &&
+                   currentSpeed > 0)
+                    results.MaxSpeed = currentSpeed;
 
-                if(scsiReader.CanSeek)
-                    scsiReader.Seek(seekPos, out seekCur);
-                else if(readcd)
-                    _dev.ReadCd(out _, out _, seekPos, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
-                                MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
-                                _dev.Timeout, out seekCur);
+                if(currentSpeed < results.MinSpeed &&
+                   currentSpeed > 0)
+                    results.MinSpeed = currentSpeed;
+
+                UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)",
+                                       (long)i, (long)results.Blocks);
+
+                sense = scsiReader.ReadBlocks(out _, i, blocksToRead, out double cmdDuration, out _, out _);
+                results.ProcessingTime += cmdDuration;
+
+                if(!sense &&
+                   !_dev.Error)
+                {
+                    if(cmdDuration >= 500)
+                        results.F += blocksToRead;
+                    else if(cmdDuration >= 150)
+                        results.E += blocksToRead;
+                    else if(cmdDuration >= 50)
+                        results.D += blocksToRead;
+                    else if(cmdDuration >= 10)
+                        results.C += blocksToRead;
+                    else if(cmdDuration >= 3)
+                        results.B += blocksToRead;
+                    else
+                        results.A += blocksToRead;
+
+                    ScanTime?.Invoke(i, cmdDuration);
+                    mhddLog.Write(i, cmdDuration);
+                    ibgLog.Write(i, currentSpeed * 1024);
+                }
+
+                // TODO: Separate errors on kind of errors.
                 else
-                    scsiReader.ReadBlock(out _, seekPos, out seekCur, out _, out _);
+                {
+                    ScanUnreadable?.Invoke(i);
+                    results.Errored += blocksToRead;
 
-                if(seekCur > results.SeekMax &&
-                   seekCur > 0)
-                    results.SeekMax = seekCur;
+                    for(ulong b = i; b < i + blocksToRead; b++)
+                        results.UnreadableSectors.Add(b);
 
-                if(seekCur < results.SeekMin &&
-                   seekCur > 0)
-                    results.SeekMin = seekCur;
+                    mhddLog.Write(i, cmdDuration < 500 ? 65535 : cmdDuration);
+                    ibgLog.Write(i, 0);
+                }
 
-                results.SeekTotal += seekCur;
-                GC.Collect();
+                sectorSpeedStart += blocksToRead;
+
+                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+                if(elapsed <= 0)
+                    continue;
+
+                currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
+                ScanSpeed?.Invoke(i, currentSpeed                      * 1024);
+                sectorSpeedStart = 0;
+                timeSpeedStart   = DateTime.UtcNow;
             }
 
+            end = DateTime.UtcNow;
             EndProgress?.Invoke();
+            mhddLog.Close();
 
-            results.ProcessingTime /= 1000;
-            results.TotalTime      =  (end - start).TotalSeconds;
-            results.AvgSpeed       =  blockSize * (double)(results.Blocks + 1) / 1048576 / results.ProcessingTime;
-            results.SeekTimes      =  seekTimes;
-
-            return results;
+            ibgLog.Close(_dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                         blockSize * (double)(results.Blocks + 1) / 1024 / (results.ProcessingTime / 1000),
+                         _devicePath);
         }
+
+        results.SeekMax   = double.MinValue;
+        results.SeekMin   = double.MaxValue;
+        results.SeekTotal = 0;
+        const int seekTimes = 1000;
+
+        var rnd = new Random();
+
+        InitProgress?.Invoke();
+
+        for(int i = 0; i < seekTimes; i++)
+        {
+            if(_aborted || !_seekTest)
+                break;
+
+            uint seekPos = (uint)rnd.Next((int)results.Blocks);
+
+            PulseProgress?.Invoke($"Seeking to sector {seekPos}...\t\t");
+
+            double seekCur;
+
+            if(scsiReader.CanSeek)
+                scsiReader.Seek(seekPos, out seekCur);
+            else if(readcd)
+                _dev.ReadCd(out _, out _, seekPos, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
+                            MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
+                            _dev.Timeout, out seekCur);
+            else
+                scsiReader.ReadBlock(out _, seekPos, out seekCur, out _, out _);
+
+            if(seekCur > results.SeekMax &&
+               seekCur > 0)
+                results.SeekMax = seekCur;
+
+            if(seekCur < results.SeekMin &&
+               seekCur > 0)
+                results.SeekMin = seekCur;
+
+            results.SeekTotal += seekCur;
+            GC.Collect();
+        }
+
+        EndProgress?.Invoke();
+
+        results.ProcessingTime /= 1000;
+        results.TotalTime      =  (end - start).TotalSeconds;
+        results.AvgSpeed       =  blockSize * (double)(results.Blocks + 1) / 1048576 / results.ProcessingTime;
+        results.SeekTimes      =  seekTimes;
+
+        return results;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Scanning/ScanResults.cs b/Aaru.Core/Devices/Scanning/ScanResults.cs
index 767819753..4093c8671 100644
--- a/Aaru.Core/Devices/Scanning/ScanResults.cs
+++ b/Aaru.Core/Devices/Scanning/ScanResults.cs
@@ -32,46 +32,45 @@
 
 using System.Collections.Generic;
 
-namespace Aaru.Core.Devices.Scanning
+namespace Aaru.Core.Devices.Scanning;
+
+/// <summary>Contains the results of a media scan</summary>
+public struct ScanResults
 {
-    /// <summary>Contains the results of a media scan</summary>
-    public struct ScanResults
-    {
-        /// <summary>Total time spent scanning</summary>
-        public double TotalTime;
-        /// <summary>Total time spent by the device processing commands</summary>
-        public double ProcessingTime;
-        /// <summary>Average scan speed</summary>
-        public double AvgSpeed;
-        /// <summary>Maximum scan speed burst</summary>
-        public double MaxSpeed;
-        /// <summary>Minimum scan speed</summary>
-        public double MinSpeed;
-        /// <summary>Sectors that took less than 3 milliseconds to be processed</summary>
-        public ulong A;
-        /// <summary>Sectors that took less than 10 milliseconds but more than 3 milliseconds to be processed</summary>
-        public ulong B;
-        /// <summary>Sectors that took less than 50 milliseconds but more than 10 milliseconds to be processed</summary>
-        public ulong C;
-        /// <summary>Sectors that took less than 150 milliseconds but more than 50 milliseconds to be processed</summary>
-        public ulong D;
-        /// <summary>Sectors that took less than 500 milliseconds but more than 150 milliseconds to be processed</summary>
-        public ulong E;
-        /// <summary>Sectors that took more than 500 milliseconds to be processed</summary>
-        public ulong F;
-        /// <summary>List of sectors that could not be read</summary>
-        public List<ulong> UnreadableSectors;
-        /// <summary>Slowest seek</summary>
-        public double SeekMax;
-        /// <summary>Fastest seek</summary>
-        public double SeekMin;
-        /// <summary>Total time spent seeking</summary>
-        public double SeekTotal;
-        /// <summary>How many seeks have been done</summary>
-        public int SeekTimes;
-        /// <summary>How many blocks were scanned</summary>
-        public ulong Blocks;
-        /// <summary>How many blocks could not be read</summary>
-        public ulong Errored;
-    }
+    /// <summary>Total time spent scanning</summary>
+    public double TotalTime;
+    /// <summary>Total time spent by the device processing commands</summary>
+    public double ProcessingTime;
+    /// <summary>Average scan speed</summary>
+    public double AvgSpeed;
+    /// <summary>Maximum scan speed burst</summary>
+    public double MaxSpeed;
+    /// <summary>Minimum scan speed</summary>
+    public double MinSpeed;
+    /// <summary>Sectors that took less than 3 milliseconds to be processed</summary>
+    public ulong A;
+    /// <summary>Sectors that took less than 10 milliseconds but more than 3 milliseconds to be processed</summary>
+    public ulong B;
+    /// <summary>Sectors that took less than 50 milliseconds but more than 10 milliseconds to be processed</summary>
+    public ulong C;
+    /// <summary>Sectors that took less than 150 milliseconds but more than 50 milliseconds to be processed</summary>
+    public ulong D;
+    /// <summary>Sectors that took less than 500 milliseconds but more than 150 milliseconds to be processed</summary>
+    public ulong E;
+    /// <summary>Sectors that took more than 500 milliseconds to be processed</summary>
+    public ulong F;
+    /// <summary>List of sectors that could not be read</summary>
+    public List<ulong> UnreadableSectors;
+    /// <summary>Slowest seek</summary>
+    public double SeekMax;
+    /// <summary>Fastest seek</summary>
+    public double SeekMin;
+    /// <summary>Total time spent seeking</summary>
+    public double SeekTotal;
+    /// <summary>How many seeks have been done</summary>
+    public int SeekTimes;
+    /// <summary>How many blocks were scanned</summary>
+    public ulong Blocks;
+    /// <summary>How many blocks could not be read</summary>
+    public ulong Errored;
 }
\ No newline at end of file
diff --git a/Aaru.Core/Devices/Scanning/SecureDigital.cs b/Aaru.Core/Devices/Scanning/SecureDigital.cs
index 90e4812f0..eff52900b 100644
--- a/Aaru.Core/Devices/Scanning/SecureDigital.cs
+++ b/Aaru.Core/Devices/Scanning/SecureDigital.cs
@@ -40,311 +40,310 @@ using DeviceType = Aaru.CommonTypes.Enums.DeviceType;
 
 // ReSharper disable JoinDeclarationAndInitializer
 
-namespace Aaru.Core.Devices.Scanning
+namespace Aaru.Core.Devices.Scanning;
+
+/// <summary>Implements scanning a SecureDigital or MultiMediaCard flash card</summary>
+public sealed partial class MediaScan
 {
-    /// <summary>Implements scanning a SecureDigital or MultiMediaCard flash card</summary>
-    public sealed partial class MediaScan
+    ScanResults SecureDigital()
     {
-        ScanResults SecureDigital()
+        var    results = new ScanResults();
+        byte[] cmdBuf;
+        bool   sense;
+        results.Blocks = 0;
+        const uint   timeout = 5;
+        double       duration;
+        const ushort sdProfile     = 0x0001;
+        ushort       blocksToRead  = 128;
+        uint         blockSize     = 512;
+        bool         byteAddressed = true;
+        bool         supportsCmd23 = false;
+
+        switch(_dev.Type)
         {
-            var    results = new ScanResults();
-            byte[] cmdBuf;
-            bool   sense;
-            results.Blocks = 0;
-            const uint   timeout = 5;
-            double       duration;
-            const ushort sdProfile     = 0x0001;
-            ushort       blocksToRead  = 128;
-            uint         blockSize     = 512;
-            bool         byteAddressed = true;
-            bool         supportsCmd23 = false;
-
-            switch(_dev.Type)
+            case DeviceType.MMC:
             {
-                case DeviceType.MMC:
+                sense = _dev.ReadCsd(out cmdBuf, out _, timeout, out _);
+
+                if(!sense)
                 {
-                    sense = _dev.ReadCsd(out cmdBuf, out _, timeout, out _);
+                    CSD csd = Decoders.MMC.Decoders.DecodeCSD(cmdBuf);
+                    results.Blocks = (ulong)((csd.Size + 1) * Math.Pow(2, csd.SizeMultiplier + 2));
+                    blockSize      = (uint)Math.Pow(2, csd.ReadBlockLength);
 
-                    if(!sense)
+                    // Found at least since MMC System Specification 3.31
+                    supportsCmd23 = csd.Version >= 3;
+
+                    if(csd.Size == 0xFFF)
                     {
-                        CSD csd = Decoders.MMC.Decoders.DecodeCSD(cmdBuf);
-                        results.Blocks = (ulong)((csd.Size + 1) * Math.Pow(2, csd.SizeMultiplier + 2));
-                        blockSize      = (uint)Math.Pow(2, csd.ReadBlockLength);
-
-                        // Found at least since MMC System Specification 3.31
-                        supportsCmd23 = csd.Version >= 3;
-
-                        if(csd.Size == 0xFFF)
-                        {
-                            sense = _dev.ReadExtendedCsd(out cmdBuf, out _, timeout, out _);
-
-                            if(!sense)
-                            {
-                                ExtendedCSD ecsd = Decoders.MMC.Decoders.DecodeExtendedCSD(cmdBuf);
-                                results.Blocks = ecsd.SectorCount;
-                                blockSize      = (uint)(ecsd.SectorSize == 1 ? 4096 : 512);
-
-                                blocksToRead = (ushort)(ecsd.OptimalReadSize * 4096 / blockSize);
-
-                                if(blocksToRead == 0)
-                                    blocksToRead = 128;
-
-                                // Supposing it's high-capacity MMC if it has Extended CSD...
-                                byteAddressed = false;
-                            }
-                        }
-                    }
-
-                    break;
-                }
-
-                case DeviceType.SecureDigital:
-                {
-                    sense = _dev.ReadCsd(out cmdBuf, out _, timeout, out _);
-
-                    if(!sense)
-                    {
-                        Decoders.SecureDigital.CSD csd = Decoders.SecureDigital.Decoders.DecodeCSD(cmdBuf);
-
-                        results.Blocks = (ulong)(csd.Structure == 0
-                                                     ? (csd.Size + 1) * Math.Pow(2, csd.SizeMultiplier + 2)
-                                                     : (csd.Size + 1) * 1024);
-
-                        blockSize = (uint)Math.Pow(2, csd.ReadBlockLength);
-
-                        // Structure >=1 for SDHC/SDXC, so that's block addressed
-                        byteAddressed = csd.Structure == 0;
-
-                        if(blockSize != 512)
-                        {
-                            uint ratio = blockSize / 512;
-                            results.Blocks *= ratio;
-                            blockSize      =  512;
-                        }
-
-                        sense = _dev.ReadScr(out cmdBuf, out _, timeout, out _);
+                        sense = _dev.ReadExtendedCsd(out cmdBuf, out _, timeout, out _);
 
                         if(!sense)
-                            supportsCmd23 = Decoders.SecureDigital.Decoders.DecodeSCR(cmdBuf)?.CommandSupport.
-                                                     HasFlag(CommandSupport.SetBlockCount) ?? false;
+                        {
+                            ExtendedCSD ecsd = Decoders.MMC.Decoders.DecodeExtendedCSD(cmdBuf);
+                            results.Blocks = ecsd.SectorCount;
+                            blockSize      = (uint)(ecsd.SectorSize == 1 ? 4096 : 512);
+
+                            blocksToRead = (ushort)(ecsd.OptimalReadSize * 4096 / blockSize);
+
+                            if(blocksToRead == 0)
+                                blocksToRead = 128;
+
+                            // Supposing it's high-capacity MMC if it has Extended CSD...
+                            byteAddressed = false;
+                        }
+                    }
+                }
+
+                break;
+            }
+
+            case DeviceType.SecureDigital:
+            {
+                sense = _dev.ReadCsd(out cmdBuf, out _, timeout, out _);
+
+                if(!sense)
+                {
+                    Decoders.SecureDigital.CSD csd = Decoders.SecureDigital.Decoders.DecodeCSD(cmdBuf);
+
+                    results.Blocks = (ulong)(csd.Structure == 0
+                                                 ? (csd.Size + 1) * Math.Pow(2, csd.SizeMultiplier + 2)
+                                                 : (csd.Size + 1) * 1024);
+
+                    blockSize = (uint)Math.Pow(2, csd.ReadBlockLength);
+
+                    // Structure >=1 for SDHC/SDXC, so that's block addressed
+                    byteAddressed = csd.Structure == 0;
+
+                    if(blockSize != 512)
+                    {
+                        uint ratio = blockSize / 512;
+                        results.Blocks *= ratio;
+                        blockSize      =  512;
                     }
 
-                    break;
+                    sense = _dev.ReadScr(out cmdBuf, out _, timeout, out _);
+
+                    if(!sense)
+                        supportsCmd23 = Decoders.SecureDigital.Decoders.DecodeSCR(cmdBuf)?.CommandSupport.
+                                                 HasFlag(CommandSupport.SetBlockCount) ?? false;
                 }
+
+                break;
             }
+        }
 
-            if(results.Blocks == 0)
-            {
-                StoppingErrorMessage?.Invoke("Unable to get device size.");
-
-                return results;
-            }
-
-            if(supportsCmd23)
-            {
-                sense = _dev.ReadWithBlockCount(out cmdBuf, out _, 0, blockSize, 1, byteAddressed, timeout,
-                                                out duration);
-
-                if(sense || _dev.Error)
-                {
-                    UpdateStatus?.
-                        Invoke("Environment does not support setting block count, downgrading to OS reading.");
-
-                    supportsCmd23 = false;
-                }
-
-                // Need to restart device, otherwise is it just busy streaming data with no one listening
-                sense = _dev.ReOpen();
-
-                if(sense)
-                {
-                    StoppingErrorMessage?.Invoke($"Error {_dev.LastError} reopening device.");
-
-                    return results;
-                }
-            }
-
-            if(supportsCmd23)
-            {
-                while(true)
-                {
-                    sense = _dev.ReadWithBlockCount(out cmdBuf, out _, 0, blockSize, blocksToRead, byteAddressed,
-                                                    timeout, out duration);
-
-                    if(sense)
-                        blocksToRead /= 2;
-
-                    if(!sense ||
-                       blocksToRead == 1)
-                        break;
-                }
-
-                if(sense)
-                {
-                    StoppingErrorMessage?.
-                        Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
-
-                    return results;
-                }
-            }
-
-            results.A       = 0; // <3ms
-            results.B       = 0; // >=3ms, <10ms
-            results.C       = 0; // >=10ms, <50ms
-            results.D       = 0; // >=50ms, <150ms
-            results.E       = 0; // >=150ms, <500ms
-            results.F       = 0; // >=500ms
-            results.Errored = 0;
-            DateTime start;
-            DateTime end;
-            results.ProcessingTime = 0;
-            double currentSpeed = 0;
-            results.MaxSpeed          = double.MinValue;
-            results.MinSpeed          = double.MaxValue;
-            results.UnreadableSectors = new List<ulong>();
-            results.SeekMax           = double.MinValue;
-            results.SeekMin           = double.MaxValue;
-            results.SeekTotal         = 0;
-            const int seekTimes = 100;
-
-            var rnd = new Random();
-
-            if(supportsCmd23 || blocksToRead == 1)
-                UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
-            else if(_useBufferedReads)
-                UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time using OS buffered reads.");
-            else
-                UpdateStatus?.Invoke($"Reading {blocksToRead} sectors using sequential single commands.");
-
-            InitBlockMap?.Invoke(results.Blocks, blockSize, blocksToRead, sdProfile);
-            var mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, blocksToRead, false);
-            var ibgLog  = new IbgLog(_ibgLogPath, sdProfile);
-
-            start = DateTime.UtcNow;
-            DateTime timeSpeedStart   = DateTime.UtcNow;
-            ulong    sectorSpeedStart = 0;
-            InitProgress?.Invoke();
-
-            for(ulong i = 0; i < results.Blocks; i += blocksToRead)
-            {
-                if(_aborted)
-                    break;
-
-                if(results.Blocks - i < blocksToRead)
-                    blocksToRead = (byte)(results.Blocks - i);
-
-                if(currentSpeed > results.MaxSpeed &&
-                   currentSpeed > 0)
-                    results.MaxSpeed = currentSpeed;
-
-                if(currentSpeed < results.MinSpeed &&
-                   currentSpeed > 0)
-                    results.MinSpeed = currentSpeed;
-
-                UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
-                                       (long)results.Blocks);
-
-                bool error;
-
-                if(blocksToRead == 1)
-                    error = _dev.ReadSingleBlock(out cmdBuf, out _, (uint)i, blockSize, byteAddressed, timeout,
-                                                 out duration);
-                else if(supportsCmd23)
-                    error = _dev.ReadWithBlockCount(out cmdBuf, out _, (uint)i, blockSize, blocksToRead, byteAddressed,
-                                                    timeout, out duration);
-                else if(_useBufferedReads)
-                    error = _dev.BufferedOsRead(out cmdBuf, (long)(i * blockSize), blockSize * blocksToRead,
-                                                out duration);
-                else
-                    error = _dev.ReadMultipleUsingSingle(out cmdBuf, out _, (uint)i, blockSize, blocksToRead,
-                                                         byteAddressed, timeout, out duration);
-
-                if(!error)
-                {
-                    if(duration >= 500)
-                        results.F += blocksToRead;
-                    else if(duration >= 150)
-                        results.E += blocksToRead;
-                    else if(duration >= 50)
-                        results.D += blocksToRead;
-                    else if(duration >= 10)
-                        results.C += blocksToRead;
-                    else if(duration >= 3)
-                        results.B += blocksToRead;
-                    else
-                        results.A += blocksToRead;
-
-                    ScanTime?.Invoke(i, duration);
-                    mhddLog.Write(i, duration);
-                    ibgLog.Write(i, currentSpeed * 1024);
-                }
-                else
-                {
-                    ScanUnreadable?.Invoke(i);
-                    results.Errored += blocksToRead;
-
-                    for(ulong b = i; b < i + blocksToRead; b++)
-                        results.UnreadableSectors.Add(b);
-
-                    mhddLog.Write(i, duration < 500 ? 65535 : duration);
-
-                    ibgLog.Write(i, 0);
-                }
-
-                sectorSpeedStart += blocksToRead;
-
-                double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
-
-                if(elapsed <= 0)
-                    continue;
-
-                currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
-                ScanSpeed?.Invoke(i, currentSpeed                      * 1024);
-                sectorSpeedStart = 0;
-                timeSpeedStart   = DateTime.UtcNow;
-            }
-
-            end = DateTime.UtcNow;
-            EndProgress?.Invoke();
-            mhddLog.Close();
-
-            ibgLog.Close(_dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
-                         blockSize * (double)(results.Blocks + 1) / 1024 / (results.ProcessingTime / 1000),
-                         _devicePath);
-
-            InitProgress?.Invoke();
-
-            for(int i = 0; i < seekTimes; i++)
-            {
-                if(_aborted || !_seekTest)
-                    break;
-
-                uint seekPos = (uint)rnd.Next((int)results.Blocks);
-
-                PulseProgress?.Invoke($"Seeking to sector {seekPos}...\t\t");
-
-                _dev.ReadSingleBlock(out cmdBuf, out _, seekPos, blockSize, byteAddressed, timeout, out double seekCur);
-
-                if(seekCur > results.SeekMax &&
-                   seekCur > 0)
-                    results.SeekMax = seekCur;
-
-                if(seekCur < results.SeekMin &&
-                   seekCur > 0)
-                    results.SeekMin = seekCur;
-
-                results.SeekTotal += seekCur;
-                GC.Collect();
-            }
-
-            EndProgress?.Invoke();
-
-            results.ProcessingTime /= 1000;
-            results.TotalTime      =  (end - start).TotalSeconds;
-            results.AvgSpeed       =  blockSize * (double)(results.Blocks + 1) / 1048576 / results.ProcessingTime;
-            results.SeekTimes      =  seekTimes;
+        if(results.Blocks == 0)
+        {
+            StoppingErrorMessage?.Invoke("Unable to get device size.");
 
             return results;
         }
+
+        if(supportsCmd23)
+        {
+            sense = _dev.ReadWithBlockCount(out cmdBuf, out _, 0, blockSize, 1, byteAddressed, timeout,
+                                            out duration);
+
+            if(sense || _dev.Error)
+            {
+                UpdateStatus?.
+                    Invoke("Environment does not support setting block count, downgrading to OS reading.");
+
+                supportsCmd23 = false;
+            }
+
+            // Need to restart device, otherwise is it just busy streaming data with no one listening
+            sense = _dev.ReOpen();
+
+            if(sense)
+            {
+                StoppingErrorMessage?.Invoke($"Error {_dev.LastError} reopening device.");
+
+                return results;
+            }
+        }
+
+        if(supportsCmd23)
+        {
+            while(true)
+            {
+                sense = _dev.ReadWithBlockCount(out cmdBuf, out _, 0, blockSize, blocksToRead, byteAddressed,
+                                                timeout, out duration);
+
+                if(sense)
+                    blocksToRead /= 2;
+
+                if(!sense ||
+                   blocksToRead == 1)
+                    break;
+            }
+
+            if(sense)
+            {
+                StoppingErrorMessage?.
+                    Invoke($"Device error {_dev.LastError} trying to guess ideal transfer length.");
+
+                return results;
+            }
+        }
+
+        results.A       = 0; // <3ms
+        results.B       = 0; // >=3ms, <10ms
+        results.C       = 0; // >=10ms, <50ms
+        results.D       = 0; // >=50ms, <150ms
+        results.E       = 0; // >=150ms, <500ms
+        results.F       = 0; // >=500ms
+        results.Errored = 0;
+        DateTime start;
+        DateTime end;
+        results.ProcessingTime = 0;
+        double currentSpeed = 0;
+        results.MaxSpeed          = double.MinValue;
+        results.MinSpeed          = double.MaxValue;
+        results.UnreadableSectors = new List<ulong>();
+        results.SeekMax           = double.MinValue;
+        results.SeekMin           = double.MaxValue;
+        results.SeekTotal         = 0;
+        const int seekTimes = 100;
+
+        var rnd = new Random();
+
+        if(supportsCmd23 || blocksToRead == 1)
+            UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time.");
+        else if(_useBufferedReads)
+            UpdateStatus?.Invoke($"Reading {blocksToRead} sectors at a time using OS buffered reads.");
+        else
+            UpdateStatus?.Invoke($"Reading {blocksToRead} sectors using sequential single commands.");
+
+        InitBlockMap?.Invoke(results.Blocks, blockSize, blocksToRead, sdProfile);
+        var mhddLog = new MhddLog(_mhddLogPath, _dev, results.Blocks, blockSize, blocksToRead, false);
+        var ibgLog  = new IbgLog(_ibgLogPath, sdProfile);
+
+        start = DateTime.UtcNow;
+        DateTime timeSpeedStart   = DateTime.UtcNow;
+        ulong    sectorSpeedStart = 0;
+        InitProgress?.Invoke();
+
+        for(ulong i = 0; i < results.Blocks; i += blocksToRead)
+        {
+            if(_aborted)
+                break;
+
+            if(results.Blocks - i < blocksToRead)
+                blocksToRead = (byte)(results.Blocks - i);
+
+            if(currentSpeed > results.MaxSpeed &&
+               currentSpeed > 0)
+                results.MaxSpeed = currentSpeed;
+
+            if(currentSpeed < results.MinSpeed &&
+               currentSpeed > 0)
+                results.MinSpeed = currentSpeed;
+
+            UpdateProgress?.Invoke($"Reading sector {i} of {results.Blocks} ({currentSpeed:F3} MiB/sec.)", (long)i,
+                                   (long)results.Blocks);
+
+            bool error;
+
+            if(blocksToRead == 1)
+                error = _dev.ReadSingleBlock(out cmdBuf, out _, (uint)i, blockSize, byteAddressed, timeout,
+                                             out duration);
+            else if(supportsCmd23)
+                error = _dev.ReadWithBlockCount(out cmdBuf, out _, (uint)i, blockSize, blocksToRead, byteAddressed,
+                                                timeout, out duration);
+            else if(_useBufferedReads)
+                error = _dev.BufferedOsRead(out cmdBuf, (long)(i * blockSize), blockSize * blocksToRead,
+                                            out duration);
+            else
+                error = _dev.ReadMultipleUsingSingle(out cmdBuf, out _, (uint)i, blockSize, blocksToRead,
+                                                     byteAddressed, timeout, out duration);
+
+            if(!error)
+            {
+                if(duration >= 500)
+                    results.F += blocksToRead;
+                else if(duration >= 150)
+                    results.E += blocksToRead;
+                else if(duration >= 50)
+                    results.D += blocksToRead;
+                else if(duration >= 10)
+                    results.C += blocksToRead;
+                else if(duration >= 3)
+                    results.B += blocksToRead;
+                else
+                    results.A += blocksToRead;
+
+                ScanTime?.Invoke(i, duration);
+                mhddLog.Write(i, duration);
+                ibgLog.Write(i, currentSpeed * 1024);
+            }
+            else
+            {
+                ScanUnreadable?.Invoke(i);
+                results.Errored += blocksToRead;
+
+                for(ulong b = i; b < i + blocksToRead; b++)
+                    results.UnreadableSectors.Add(b);
+
+                mhddLog.Write(i, duration < 500 ? 65535 : duration);
+
+                ibgLog.Write(i, 0);
+            }
+
+            sectorSpeedStart += blocksToRead;
+
+            double elapsed = (DateTime.UtcNow - timeSpeedStart).TotalSeconds;
+
+            if(elapsed <= 0)
+                continue;
+
+            currentSpeed = sectorSpeedStart * blockSize / (1048576 * elapsed);
+            ScanSpeed?.Invoke(i, currentSpeed                      * 1024);
+            sectorSpeedStart = 0;
+            timeSpeedStart   = DateTime.UtcNow;
+        }
+
+        end = DateTime.UtcNow;
+        EndProgress?.Invoke();
+        mhddLog.Close();
+
+        ibgLog.Close(_dev, results.Blocks, blockSize, (end - start).TotalSeconds, currentSpeed * 1024,
+                     blockSize * (double)(results.Blocks + 1) / 1024 / (results.ProcessingTime / 1000),
+                     _devicePath);
+
+        InitProgress?.Invoke();
+
+        for(int i = 0; i < seekTimes; i++)
+        {
+            if(_aborted || !_seekTest)
+                break;
+
+            uint seekPos = (uint)rnd.Next((int)results.Blocks);
+
+            PulseProgress?.Invoke($"Seeking to sector {seekPos}...\t\t");
+
+            _dev.ReadSingleBlock(out cmdBuf, out _, seekPos, blockSize, byteAddressed, timeout, out double seekCur);
+
+            if(seekCur > results.SeekMax &&
+               seekCur > 0)
+                results.SeekMax = seekCur;
+
+            if(seekCur < results.SeekMin &&
+               seekCur > 0)
+                results.SeekMin = seekCur;
+
+            results.SeekTotal += seekCur;
+            GC.Collect();
+        }
+
+        EndProgress?.Invoke();
+
+        results.ProcessingTime /= 1000;
+        results.TotalTime      =  (end - start).TotalSeconds;
+        results.AvgSpeed       =  blockSize * (double)(results.Blocks + 1) / 1048576 / results.ProcessingTime;
+        results.SeekTimes      =  seekTimes;
+
+        return results;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Error.cs b/Aaru.Core/Error.cs
index a4a2d9583..d451cbb1e 100644
--- a/Aaru.Core/Error.cs
+++ b/Aaru.Core/Error.cs
@@ -32,96 +32,95 @@
 
 using Aaru.CommonTypes.Interop;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+/// <summary>Prints the description of a system error number.</summary>
+public static class Error
 {
     /// <summary>Prints the description of a system error number.</summary>
-    public static class Error
+    /// <param name="errno">System error number.</param>
+    /// <returns>Error description.</returns>
+    public static string Print(int errno)
     {
-        /// <summary>Prints the description of a system error number.</summary>
-        /// <param name="errno">System error number.</param>
-        /// <returns>Error description.</returns>
-        public static string Print(int errno)
+        switch(DetectOS.GetRealPlatformID())
         {
-            switch(DetectOS.GetRealPlatformID())
-            {
-                case PlatformID.Win32S:
-                case PlatformID.Win32Windows:
-                case PlatformID.Win32NT:
-                case PlatformID.WinCE:
-                case PlatformID.WindowsPhone:
-                case PlatformID.Xbox: return PrintWin32Error(errno);
-                case PlatformID.Unix:
-                case PlatformID.MacOSX:
-                case PlatformID.iOS:
-                case PlatformID.Linux:
-                case PlatformID.Solaris:
-                case PlatformID.NetBSD:
-                case PlatformID.OpenBSD:
-                case PlatformID.FreeBSD:
-                case PlatformID.DragonFly:
-                case PlatformID.Android:
-                case PlatformID.Tizen:
-                case PlatformID.Hurd:
-                case PlatformID.Haiku:
-                case PlatformID.HPUX:
-                case PlatformID.AIX:
-                case PlatformID.OS400:
-                case PlatformID.IRIX:
-                case PlatformID.Minix:
-                case PlatformID.QNX:
-                case PlatformID.SINIX:
-                case PlatformID.Tru64:
-                case PlatformID.Ultrix:
-                case PlatformID.OpenServer:
-                case PlatformID.UnixWare:
-                case PlatformID.zOS: return PrintUnixError(errno);
-                case PlatformID.Wii:          return $"Unknown error code {errno}";
-                case PlatformID.WiiU:         return $"Unknown error code {errno}";
-                case PlatformID.PlayStation3: return $"Unknown error code {errno}";
-                case PlatformID.PlayStation4: return $"Unknown error code {errno}";
-                case PlatformID.NonStop:      return $"Unknown error code {errno}";
-                case PlatformID.Unknown:      return $"Unknown error code {errno}";
-                default:                      return $"Unknown error code {errno}";
-            }
+            case PlatformID.Win32S:
+            case PlatformID.Win32Windows:
+            case PlatformID.Win32NT:
+            case PlatformID.WinCE:
+            case PlatformID.WindowsPhone:
+            case PlatformID.Xbox: return PrintWin32Error(errno);
+            case PlatformID.Unix:
+            case PlatformID.MacOSX:
+            case PlatformID.iOS:
+            case PlatformID.Linux:
+            case PlatformID.Solaris:
+            case PlatformID.NetBSD:
+            case PlatformID.OpenBSD:
+            case PlatformID.FreeBSD:
+            case PlatformID.DragonFly:
+            case PlatformID.Android:
+            case PlatformID.Tizen:
+            case PlatformID.Hurd:
+            case PlatformID.Haiku:
+            case PlatformID.HPUX:
+            case PlatformID.AIX:
+            case PlatformID.OS400:
+            case PlatformID.IRIX:
+            case PlatformID.Minix:
+            case PlatformID.QNX:
+            case PlatformID.SINIX:
+            case PlatformID.Tru64:
+            case PlatformID.Ultrix:
+            case PlatformID.OpenServer:
+            case PlatformID.UnixWare:
+            case PlatformID.zOS: return PrintUnixError(errno);
+            case PlatformID.Wii:          return $"Unknown error code {errno}";
+            case PlatformID.WiiU:         return $"Unknown error code {errno}";
+            case PlatformID.PlayStation3: return $"Unknown error code {errno}";
+            case PlatformID.PlayStation4: return $"Unknown error code {errno}";
+            case PlatformID.NonStop:      return $"Unknown error code {errno}";
+            case PlatformID.Unknown:      return $"Unknown error code {errno}";
+            default:                      return $"Unknown error code {errno}";
         }
+    }
 
-        static string PrintUnixError(int errno)
+    static string PrintUnixError(int errno)
+    {
+        switch(errno)
         {
-            switch(errno)
-            {
-                case 2:  // ENOENT
-                case 19: // ENODEV
-                    return "The specified device cannot be found.";
-                case 13: // EACCESS
-                    return "Not enough permissions to open the device.";
-                case 16: // EBUSY
-                    return "The specified device is in use by another process.";
-                case 30: // EROFS
-                    return "Cannot open the device in writable mode, as needed by some commands.";
-                default: return $"Unknown error code {errno}";
-            }
+            case 2:  // ENOENT
+            case 19: // ENODEV
+                return "The specified device cannot be found.";
+            case 13: // EACCESS
+                return "Not enough permissions to open the device.";
+            case 16: // EBUSY
+                return "The specified device is in use by another process.";
+            case 30: // EROFS
+                return "Cannot open the device in writable mode, as needed by some commands.";
+            default: return $"Unknown error code {errno}";
         }
+    }
 
-        static string PrintWin32Error(int errno)
+    static string PrintWin32Error(int errno)
+    {
+        switch(errno)
         {
-            switch(errno)
-            {
-                case 2: // ERROR_FILE_NOT_FOUND
-                case 3: // ERROR_PATH_NOT_FOUND
-                    return "The specified device cannot be found.";
-                case 5: // ERROR_ACCESS_DENIED
-                    return "Not enough permissions to open the device.";
-                case 19: // ERROR_WRITE_PROTECT
-                    return "Cannot open the device in writable mode, as needed by some commands.";
-                case 32:  // ERROR_SHARING_VIOLATION
-                case 33:  // ERROR_LOCK_VIOLATION
-                case 108: // ERROR_DRIVE_LOCKED
-                case 170: // ERROR_BUSY
-                    return "The specified device is in use by another process.";
-                case 130: // ERROR_DIRECT_ACCESS_HANDLE
-                    return "Tried to open a file instead of a device.";
-                default: return $"Unknown error code {errno}";
-            }
+            case 2: // ERROR_FILE_NOT_FOUND
+            case 3: // ERROR_PATH_NOT_FOUND
+                return "The specified device cannot be found.";
+            case 5: // ERROR_ACCESS_DENIED
+                return "Not enough permissions to open the device.";
+            case 19: // ERROR_WRITE_PROTECT
+                return "Cannot open the device in writable mode, as needed by some commands.";
+            case 32:  // ERROR_SHARING_VIOLATION
+            case 33:  // ERROR_LOCK_VIOLATION
+            case 108: // ERROR_DRIVE_LOCKED
+            case 170: // ERROR_BUSY
+                return "The specified device is in use by another process.";
+            case 130: // ERROR_DIRECT_ACCESS_HANDLE
+                return "Tried to open a file instead of a device.";
+            default: return $"Unknown error code {errno}";
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Filesystems.cs b/Aaru.Core/Filesystems.cs
index fa92c84ff..6287fa171 100644
--- a/Aaru.Core/Filesystems.cs
+++ b/Aaru.Core/Filesystems.cs
@@ -35,26 +35,25 @@ using System.Linq;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.Core
-{
-    /// <summary>Core filesystem operations</summary>
-    public static class Filesystems
-    {
-        /// <summary>
-        ///     Traverses all known filesystems and outputs a list of all that recognized what is in the specified image and
-        ///     partition
-        /// </summary>
-        /// <param name="imagePlugin">Media image</param>
-        /// <param name="idPlugins">List of plugins recognizing the filesystem</param>
-        /// <param name="partition">Partition</param>
-        /// <param name="getGuid">Gets plugin GUID</param>
-        public static void Identify(IMediaImage imagePlugin, out List<string> idPlugins, Partition partition,
-                                    bool getGuid = false)
-        {
-            PluginBase plugins = GetPluginBase.Instance;
+namespace Aaru.Core;
 
-            idPlugins = (from plugin in plugins.PluginsList.Values where plugin.Identify(imagePlugin, partition)
-                         select getGuid ? plugin.Id.ToString() : plugin.Name.ToLower()).ToList();
-        }
+/// <summary>Core filesystem operations</summary>
+public static class Filesystems
+{
+    /// <summary>
+    ///     Traverses all known filesystems and outputs a list of all that recognized what is in the specified image and
+    ///     partition
+    /// </summary>
+    /// <param name="imagePlugin">Media image</param>
+    /// <param name="idPlugins">List of plugins recognizing the filesystem</param>
+    /// <param name="partition">Partition</param>
+    /// <param name="getGuid">Gets plugin GUID</param>
+    public static void Identify(IMediaImage imagePlugin, out List<string> idPlugins, Partition partition,
+                                bool getGuid = false)
+    {
+        PluginBase plugins = GetPluginBase.Instance;
+
+        idPlugins = (from plugin in plugins.PluginsList.Values where plugin.Identify(imagePlugin, partition)
+                     select getGuid ? plugin.Id.ToString() : plugin.Name.ToLower()).ToList();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/GetPluginBase.cs b/Aaru.Core/GetPluginBase.cs
index 69d2f2f27..391ddc82d 100644
--- a/Aaru.Core/GetPluginBase.cs
+++ b/Aaru.Core/GetPluginBase.cs
@@ -34,34 +34,33 @@ using Aaru.Checksums;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+/// <summary>Plugin base operations</summary>
+public static class GetPluginBase
 {
-    /// <summary>Plugin base operations</summary>
-    public static class GetPluginBase
+    /// <summary>Gets an instance with all the known plugins</summary>
+    public static PluginBase Instance
     {
-        /// <summary>Gets an instance with all the known plugins</summary>
-        public static PluginBase Instance
+        get
         {
-            get
-            {
-                var instance = new PluginBase();
+            var instance = new PluginBase();
 
-                IPluginRegister checksumRegister    = new Register();
-                IPluginRegister imagesRegister      = new DiscImages.Register();
-                IPluginRegister filesystemsRegister = new Aaru.Filesystems.Register();
-                IPluginRegister filtersRegister     = new Filters.Register();
-                IPluginRegister partitionsRegister  = new Aaru.Partitions.Register();
-                IPluginRegister archiveRegister     = new Archives.Register();
+            IPluginRegister checksumRegister    = new Register();
+            IPluginRegister imagesRegister      = new DiscImages.Register();
+            IPluginRegister filesystemsRegister = new Aaru.Filesystems.Register();
+            IPluginRegister filtersRegister     = new Filters.Register();
+            IPluginRegister partitionsRegister  = new Aaru.Partitions.Register();
+            IPluginRegister archiveRegister     = new Archives.Register();
 
-                instance.AddPlugins(checksumRegister);
-                instance.AddPlugins(imagesRegister);
-                instance.AddPlugins(filesystemsRegister);
-                instance.AddPlugins(filtersRegister);
-                instance.AddPlugins(partitionsRegister);
-                instance.AddPlugins(archiveRegister);
+            instance.AddPlugins(checksumRegister);
+            instance.AddPlugins(imagesRegister);
+            instance.AddPlugins(filesystemsRegister);
+            instance.AddPlugins(filtersRegister);
+            instance.AddPlugins(partitionsRegister);
+            instance.AddPlugins(archiveRegister);
 
-                return instance;
-            }
+            return instance;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Logging/DumpLog.cs b/Aaru.Core/Logging/DumpLog.cs
index 9613084b9..27ca8c17a 100644
--- a/Aaru.Core/Logging/DumpLog.cs
+++ b/Aaru.Core/Logging/DumpLog.cs
@@ -39,162 +39,161 @@ using Aaru.Devices;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.Core.Logging
+namespace Aaru.Core.Logging;
+
+/// <summary>Creates a dump log</summary>
+public sealed class DumpLog
 {
-    /// <summary>Creates a dump log</summary>
-    public sealed class DumpLog
+    readonly StreamWriter _logSw;
+
+    /// <summary>Initializes the dump log</summary>
+    /// <param name="outputFile">Output log file</param>
+    /// <param name="dev">Device</param>
+    /// <param name="private">Disable saving paths or serial numbers in log</param>
+    public DumpLog(string outputFile, Device dev, bool @private)
     {
-        readonly StreamWriter _logSw;
+        if(string.IsNullOrEmpty(outputFile))
+            return;
 
-        /// <summary>Initializes the dump log</summary>
-        /// <param name="outputFile">Output log file</param>
-        /// <param name="dev">Device</param>
-        /// <param name="private">Disable saving paths or serial numbers in log</param>
-        public DumpLog(string outputFile, Device dev, bool @private)
+        _logSw = new StreamWriter(outputFile, true);
+
+        _logSw.WriteLine("Start logging at {0}", DateTime.Now);
+
+        PlatformID platId  = DetectOS.GetRealPlatformID();
+        string     platVer = DetectOS.GetVersion();
+
+        var assemblyVersion =
+            Attribute.GetCustomAttribute(typeof(DumpLog).Assembly, typeof(AssemblyInformationalVersionAttribute)) as
+                AssemblyInformationalVersionAttribute;
+
+        _logSw.WriteLine("################# System information #################");
+
+        _logSw.WriteLine("{0} {1} ({2}-bit)", DetectOS.GetPlatformName(platId, platVer), platVer,
+                         Environment.Is64BitOperatingSystem ? 64 : 32);
+
+        if(DetectOS.IsMono)
+            _logSw.WriteLine("Mono {0}", Version.GetMonoVersion());
+        else if(DetectOS.IsNetCore)
+            _logSw.WriteLine(".NET Core {0}", Version.GetNetCoreVersion());
+        else
+            _logSw.WriteLine(RuntimeInformation.FrameworkDescription);
+
+        _logSw.WriteLine();
+
+        _logSw.WriteLine("################# Program information ################");
+        _logSw.WriteLine("Aaru {0}", assemblyVersion?.InformationalVersion);
+        _logSw.WriteLine("Running in {0}-bit", Environment.Is64BitProcess ? 64 : 32);
+        _logSw.WriteLine("Running as superuser: {0}", DetectOS.IsAdmin ? "Yes" : "No");
+    #if DEBUG
+        _logSw.WriteLine("DEBUG version");
+    #endif
+        if(@private)
         {
-            if(string.IsNullOrEmpty(outputFile))
-                return;
+            string[] args = Environment.GetCommandLineArgs();
 
-            _logSw = new StreamWriter(outputFile, true);
-
-            _logSw.WriteLine("Start logging at {0}", DateTime.Now);
-
-            PlatformID platId  = DetectOS.GetRealPlatformID();
-            string     platVer = DetectOS.GetVersion();
-
-            var assemblyVersion =
-                Attribute.GetCustomAttribute(typeof(DumpLog).Assembly, typeof(AssemblyInformationalVersionAttribute)) as
-                    AssemblyInformationalVersionAttribute;
-
-            _logSw.WriteLine("################# System information #################");
-
-            _logSw.WriteLine("{0} {1} ({2}-bit)", DetectOS.GetPlatformName(platId, platVer), platVer,
-                             Environment.Is64BitOperatingSystem ? 64 : 32);
-
-            if(DetectOS.IsMono)
-                _logSw.WriteLine("Mono {0}", Version.GetMonoVersion());
-            else if(DetectOS.IsNetCore)
-                _logSw.WriteLine(".NET Core {0}", Version.GetNetCoreVersion());
-            else
-                _logSw.WriteLine(RuntimeInformation.FrameworkDescription);
-
-            _logSw.WriteLine();
-
-            _logSw.WriteLine("################# Program information ################");
-            _logSw.WriteLine("Aaru {0}", assemblyVersion?.InformationalVersion);
-            _logSw.WriteLine("Running in {0}-bit", Environment.Is64BitProcess ? 64 : 32);
-            _logSw.WriteLine("Running as superuser: {0}", DetectOS.IsAdmin ? "Yes" : "No");
-        #if DEBUG
-            _logSw.WriteLine("DEBUG version");
-        #endif
-            if(@private)
+            for(int i = 0; i < args.Length; i++)
             {
-                string[] args = Environment.GetCommandLineArgs();
+                if(args[i].StartsWith("/dev", StringComparison.OrdinalIgnoreCase) ||
+                   args[i].StartsWith("aaru://", StringComparison.OrdinalIgnoreCase))
+                    continue;
 
-                for(int i = 0; i < args.Length; i++)
+                try
                 {
-                    if(args[i].StartsWith("/dev", StringComparison.OrdinalIgnoreCase) ||
-                       args[i].StartsWith("aaru://", StringComparison.OrdinalIgnoreCase))
-                        continue;
-
-                    try
-                    {
-                        args[i] = Path.GetFileName(args[i]);
-                    }
-                    catch
-                    {
-                        // Do nothing
-                    }
+                    args[i] = Path.GetFileName(args[i]);
+                }
+                catch
+                {
+                    // Do nothing
                 }
-
-                _logSw.WriteLine("Command line: {0}", string.Join(" ", args));
-            }
-            else
-                _logSw.WriteLine("Command line: {0}", Environment.CommandLine);
-
-            _logSw.WriteLine();
-
-            if(dev.IsRemote)
-            {
-                _logSw.WriteLine("################# Remote information #################");
-                _logSw.WriteLine("Server: {0}", dev.RemoteApplication);
-                _logSw.WriteLine("Version: {0}", dev.RemoteVersion);
-
-                _logSw.WriteLine("Operating system: {0} {1}", dev.RemoteOperatingSystem,
-                                 dev.RemoteOperatingSystemVersion);
-
-                _logSw.WriteLine("Architecture: {0}", dev.RemoteArchitecture);
-                _logSw.WriteLine("Protocol version: {0}", dev.RemoteProtocolVersion);
-                _logSw.WriteLine("Running as superuser: {0}", dev.IsRemoteAdmin ? "Yes" : "No");
-                _logSw.WriteLine("######################################################");
             }
 
-            _logSw.WriteLine("################# Device information #################");
-            _logSw.WriteLine("Manufacturer: {0}", dev.Manufacturer);
-            _logSw.WriteLine("Model: {0}", dev.Model);
-            _logSw.WriteLine("Firmware revision: {0}", dev.FirmwareRevision);
+            _logSw.WriteLine("Command line: {0}", string.Join(" ", args));
+        }
+        else
+            _logSw.WriteLine("Command line: {0}", Environment.CommandLine);
+
+        _logSw.WriteLine();
+
+        if(dev.IsRemote)
+        {
+            _logSw.WriteLine("################# Remote information #################");
+            _logSw.WriteLine("Server: {0}", dev.RemoteApplication);
+            _logSw.WriteLine("Version: {0}", dev.RemoteVersion);
+
+            _logSw.WriteLine("Operating system: {0} {1}", dev.RemoteOperatingSystem,
+                             dev.RemoteOperatingSystemVersion);
+
+            _logSw.WriteLine("Architecture: {0}", dev.RemoteArchitecture);
+            _logSw.WriteLine("Protocol version: {0}", dev.RemoteProtocolVersion);
+            _logSw.WriteLine("Running as superuser: {0}", dev.IsRemoteAdmin ? "Yes" : "No");
+            _logSw.WriteLine("######################################################");
+        }
+
+        _logSw.WriteLine("################# Device information #################");
+        _logSw.WriteLine("Manufacturer: {0}", dev.Manufacturer);
+        _logSw.WriteLine("Model: {0}", dev.Model);
+        _logSw.WriteLine("Firmware revision: {0}", dev.FirmwareRevision);
+
+        if(!@private)
+            _logSw.WriteLine("Serial number: {0}", dev.Serial);
+
+        _logSw.WriteLine("Removable device: {0}", dev.IsRemovable);
+        _logSw.WriteLine("Device type: {0}", dev.Type);
+        _logSw.WriteLine("CompactFlash device: {0}", dev.IsCompactFlash);
+        _logSw.WriteLine("PCMCIA device: {0}", dev.IsPcmcia);
+        _logSw.WriteLine("USB device: {0}", dev.IsUsb);
+
+        if(dev.IsUsb)
+        {
+            _logSw.WriteLine("USB manufacturer: {0}", dev.UsbManufacturerString);
+            _logSw.WriteLine("USB product: {0}", dev.UsbProductString);
 
             if(!@private)
-                _logSw.WriteLine("Serial number: {0}", dev.Serial);
+                _logSw.WriteLine("USB serial: {0}", dev.UsbSerialString);
 
-            _logSw.WriteLine("Removable device: {0}", dev.IsRemovable);
-            _logSw.WriteLine("Device type: {0}", dev.Type);
-            _logSw.WriteLine("CompactFlash device: {0}", dev.IsCompactFlash);
-            _logSw.WriteLine("PCMCIA device: {0}", dev.IsPcmcia);
-            _logSw.WriteLine("USB device: {0}", dev.IsUsb);
-
-            if(dev.IsUsb)
-            {
-                _logSw.WriteLine("USB manufacturer: {0}", dev.UsbManufacturerString);
-                _logSw.WriteLine("USB product: {0}", dev.UsbProductString);
-
-                if(!@private)
-                    _logSw.WriteLine("USB serial: {0}", dev.UsbSerialString);
-
-                _logSw.WriteLine("USB vendor ID: {0:X4}h", dev.UsbVendorId);
-                _logSw.WriteLine("USB product ID: {0:X4}h", dev.UsbProductId);
-            }
-
-            _logSw.WriteLine("FireWire device: {0}", dev.IsFireWire);
-
-            if(dev.IsFireWire)
-            {
-                _logSw.WriteLine("FireWire vendor: {0}", dev.FireWireVendorName);
-                _logSw.WriteLine("FireWire model: {0}", dev.FireWireModelName);
-
-                if(!@private)
-                    _logSw.WriteLine("FireWire GUID: 0x{0:X16}", dev.FireWireGuid);
-
-                _logSw.WriteLine("FireWire vendor ID: 0x{0:X8}", dev.FireWireVendor);
-                _logSw.WriteLine("FireWire product ID: 0x{0:X8}", dev.FireWireModel);
-            }
-
-            _logSw.WriteLine("######################################################");
-
-            _logSw.WriteLine();
-            _logSw.WriteLine("################ Dumping progress log ################");
-            _logSw.Flush();
+            _logSw.WriteLine("USB vendor ID: {0:X4}h", dev.UsbVendorId);
+            _logSw.WriteLine("USB product ID: {0:X4}h", dev.UsbProductId);
         }
 
-        /// <summary>Adds a new line to the dump log</summary>
-        /// <param name="format">Format string</param>
-        /// <param name="args">Arguments</param>
-        public void WriteLine(string format, params object[] args)
+        _logSw.WriteLine("FireWire device: {0}", dev.IsFireWire);
+
+        if(dev.IsFireWire)
         {
-            if(_logSw == null)
-                return;
+            _logSw.WriteLine("FireWire vendor: {0}", dev.FireWireVendorName);
+            _logSw.WriteLine("FireWire model: {0}", dev.FireWireModelName);
 
-            string text = string.Format(format, args);
-            _logSw.WriteLine("{0:s} {1}", DateTime.Now, text);
-            _logSw.Flush();
+            if(!@private)
+                _logSw.WriteLine("FireWire GUID: 0x{0:X16}", dev.FireWireGuid);
+
+            _logSw.WriteLine("FireWire vendor ID: 0x{0:X8}", dev.FireWireVendor);
+            _logSw.WriteLine("FireWire product ID: 0x{0:X8}", dev.FireWireModel);
         }
 
-        /// <summary>Finishes and closes the dump log</summary>
-        public void Close()
-        {
-            _logSw?.WriteLine("######################################################");
-            _logSw?.WriteLine("End logging at {0}", DateTime.Now);
-            _logSw?.Close();
-        }
+        _logSw.WriteLine("######################################################");
+
+        _logSw.WriteLine();
+        _logSw.WriteLine("################ Dumping progress log ################");
+        _logSw.Flush();
+    }
+
+    /// <summary>Adds a new line to the dump log</summary>
+    /// <param name="format">Format string</param>
+    /// <param name="args">Arguments</param>
+    public void WriteLine(string format, params object[] args)
+    {
+        if(_logSw == null)
+            return;
+
+        string text = string.Format(format, args);
+        _logSw.WriteLine("{0:s} {1}", DateTime.Now, text);
+        _logSw.Flush();
+    }
+
+    /// <summary>Finishes and closes the dump log</summary>
+    public void Close()
+    {
+        _logSw?.WriteLine("######################################################");
+        _logSw?.WriteLine("End logging at {0}", DateTime.Now);
+        _logSw?.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Logging/ErrorLog.cs b/Aaru.Core/Logging/ErrorLog.cs
index 4b1e904c3..14272e81b 100644
--- a/Aaru.Core/Logging/ErrorLog.cs
+++ b/Aaru.Core/Logging/ErrorLog.cs
@@ -33,506 +33,505 @@ using System.Linq;
 using Aaru.Decoders.ATA;
 using Aaru.Decoders.SCSI;
 
-namespace Aaru.Core.Logging
+namespace Aaru.Core.Logging;
+
+/// <summary>Logs errors</summary>
+public sealed class ErrorLog
 {
-    /// <summary>Logs errors</summary>
-    public sealed class ErrorLog
+    readonly StreamWriter _logSw;
+
+    /// <summary>Initializes the error log</summary>
+    /// <param name="outputFile">Output log file</param>
+    public ErrorLog(string outputFile)
     {
-        readonly StreamWriter _logSw;
+        if(string.IsNullOrEmpty(outputFile))
+            return;
 
-        /// <summary>Initializes the error log</summary>
-        /// <param name="outputFile">Output log file</param>
-        public ErrorLog(string outputFile)
+        _logSw = new StreamWriter(outputFile, true);
+
+        _logSw.WriteLine("Start error logging at {0}", DateTime.Now);
+        _logSw.WriteLine("######################################################");
+        _logSw.Flush();
+    }
+
+    /// <summary>Finishes and closes the error log</summary>
+    public void Close()
+    {
+        _logSw.WriteLine("######################################################");
+        _logSw.WriteLine("End logging at {0}", DateTime.Now);
+        _logSw.Close();
+    }
+
+    /// <summary>Register an ATA error after sending a CHS command</summary>
+    /// <param name="command">Command</param>
+    /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
+    /// <param name="errno">Operating system error number</param>
+    /// <param name="registers">Error registers</param>
+    public void WriteLine(string command, bool osError, int errno, AtaErrorRegistersChs registers)
+    {
+        if(osError)
         {
-            if(string.IsNullOrEmpty(outputFile))
-                return;
-
-            _logSw = new StreamWriter(outputFile, true);
-
-            _logSw.WriteLine("Start error logging at {0}", DateTime.Now);
-            _logSw.WriteLine("######################################################");
+            _logSw.WriteLine("ATA command {0} operating system error: {1}.", command, errno);
             _logSw.Flush();
         }
-
-        /// <summary>Finishes and closes the error log</summary>
-        public void Close()
+        else
         {
-            _logSw.WriteLine("######################################################");
-            _logSw.WriteLine("End logging at {0}", DateTime.Now);
-            _logSw.Close();
-        }
+            List<string> error  = new List<string>();
+            List<string> status = new List<string>();
 
-        /// <summary>Register an ATA error after sending a CHS command</summary>
-        /// <param name="command">Command</param>
-        /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
-        /// <param name="errno">Operating system error number</param>
-        /// <param name="registers">Error registers</param>
-        public void WriteLine(string command, bool osError, int errno, AtaErrorRegistersChs registers)
-        {
-            if(osError)
-            {
-                _logSw.WriteLine("ATA command {0} operating system error: {1}.", command, errno);
-                _logSw.Flush();
-            }
-            else
-            {
-                List<string> error  = new List<string>();
-                List<string> status = new List<string>();
+            if((registers.Status & 0x01) == 0x01)
+                status.Add("ERR");
 
-                if((registers.Status & 0x01) == 0x01)
-                    status.Add("ERR");
+            if((registers.Status & 0x02) == 0x02)
+                status.Add("IDX");
 
-                if((registers.Status & 0x02) == 0x02)
-                    status.Add("IDX");
+            if((registers.Status & 0x04) == 0x04)
+                status.Add("CORR");
 
-                if((registers.Status & 0x04) == 0x04)
-                    status.Add("CORR");
+            if((registers.Status & 0x08) == 0x08)
+                status.Add("DRQ");
 
-                if((registers.Status & 0x08) == 0x08)
-                    status.Add("DRQ");
+            if((registers.Status & 0x10) == 0x10)
+                status.Add("SRV");
 
-                if((registers.Status & 0x10) == 0x10)
-                    status.Add("SRV");
+            if((registers.Status & 0x20) == 0x20)
+                status.Add("DF");
 
-                if((registers.Status & 0x20) == 0x20)
-                    status.Add("DF");
+            if((registers.Status & 0x40) == 0x40)
+                status.Add("RDY");
 
-                if((registers.Status & 0x40) == 0x40)
-                    status.Add("RDY");
+            if((registers.Status & 0x80) == 0x80)
+                status.Add("BSY");
 
-                if((registers.Status & 0x80) == 0x80)
-                    status.Add("BSY");
+            if((registers.Error & 0x01) == 0x01)
+                error.Add("AMNF");
 
-                if((registers.Error & 0x01) == 0x01)
-                    error.Add("AMNF");
+            if((registers.Error & 0x02) == 0x02)
+                error.Add("T0NF");
 
-                if((registers.Error & 0x02) == 0x02)
-                    error.Add("T0NF");
+            if((registers.Error & 0x04) == 0x04)
+                error.Add("ABRT");
 
-                if((registers.Error & 0x04) == 0x04)
-                    error.Add("ABRT");
+            if((registers.Error & 0x08) == 0x08)
+                error.Add("MCR");
 
-                if((registers.Error & 0x08) == 0x08)
-                    error.Add("MCR");
+            if((registers.Error & 0x10) == 0x10)
+                error.Add("IDNF");
 
-                if((registers.Error & 0x10) == 0x10)
-                    error.Add("IDNF");
+            if((registers.Error & 0x20) == 0x20)
+                error.Add("MC");
 
-                if((registers.Error & 0x20) == 0x20)
-                    error.Add("MC");
+            if((registers.Error & 0x40) == 0x40)
+                error.Add("UNC");
 
-                if((registers.Error & 0x40) == 0x40)
-                    error.Add("UNC");
+            if((registers.Error & 0x80) == 0x80)
+                error.Add("BBK");
 
-                if((registers.Error & 0x80) == 0x80)
-                    error.Add("BBK");
-
-                _logSw.WriteLine("ATA command {0} error: status = {1}, error = {2}.", command, string.Join(' ', status),
-                                 string.Join(' ', error));
-
-                _logSw.Flush();
-            }
-        }
-
-        /// <summary>Register an ATA error after trying to read using CHS commands</summary>
-        /// <param name="cylinder">Cylinder</param>
-        /// <param name="head">Head</param>
-        /// <param name="sector">Sector</param>
-        /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
-        /// <param name="errno">Operating system error number</param>
-        /// <param name="registers">Error registers</param>
-        public void WriteLine(ushort cylinder, byte head, byte sector, bool osError, int errno,
-                              AtaErrorRegistersChs registers)
-        {
-            if(osError)
-            {
-                _logSw.WriteLine("ATA reading C/H/S {0}/{1}/{2} operating system error: {3}.", cylinder, head, sector,
-                                 errno);
-
-                _logSw.Flush();
-            }
-            else
-            {
-                List<string> error  = new List<string>();
-                List<string> status = new List<string>();
-
-                if((registers.Status & 0x01) == 0x01)
-                    status.Add("ERR");
-
-                if((registers.Status & 0x02) == 0x02)
-                    status.Add("IDX");
-
-                if((registers.Status & 0x04) == 0x04)
-                    status.Add("CORR");
-
-                if((registers.Status & 0x08) == 0x08)
-                    status.Add("DRQ");
-
-                if((registers.Status & 0x10) == 0x10)
-                    status.Add("SRV");
-
-                if((registers.Status & 0x20) == 0x20)
-                    status.Add("DF");
-
-                if((registers.Status & 0x40) == 0x40)
-                    status.Add("RDY");
-
-                if((registers.Status & 0x80) == 0x80)
-                    status.Add("BSY");
-
-                if((registers.Error & 0x01) == 0x01)
-                    error.Add("AMNF");
-
-                if((registers.Error & 0x02) == 0x02)
-                    error.Add("T0NF");
-
-                if((registers.Error & 0x04) == 0x04)
-                    error.Add("ABRT");
-
-                if((registers.Error & 0x08) == 0x08)
-                    error.Add("MCR");
-
-                if((registers.Error & 0x10) == 0x10)
-                    error.Add("IDNF");
-
-                if((registers.Error & 0x20) == 0x20)
-                    error.Add("MC");
-
-                if((registers.Error & 0x40) == 0x40)
-                    error.Add("UNC");
-
-                if((registers.Error & 0x80) == 0x80)
-                    error.Add("BBK");
-
-                _logSw.WriteLine("ATA reading C/H/S {0}/{1}/{2} error: status = {3}, error = {4}.", cylinder, head,
-                                 sector, string.Join(' ', status), string.Join(' ', error));
-
-                _logSw.Flush();
-            }
-        }
-
-        /// <summary>Register an ATA error after trying to read using 28-bit LBA commands</summary>
-        /// <param name="block">Starting block</param>
-        /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
-        /// <param name="errno">Operating system error number</param>
-        /// <param name="registers">Error registers</param>
-        public void WriteLine(ulong block, bool osError, int errno, AtaErrorRegistersLba28 registers)
-        {
-            if(osError)
-            {
-                _logSw.WriteLine("ATA reading LBA {0} operating system error: {1}.", block, errno);
-                _logSw.Flush();
-            }
-            else
-            {
-                List<string> error  = new List<string>();
-                List<string> status = new List<string>();
-
-                if((registers.Status & 0x01) == 0x01)
-                    status.Add("ERR");
-
-                if((registers.Status & 0x02) == 0x02)
-                    status.Add("IDX");
-
-                if((registers.Status & 0x04) == 0x04)
-                    status.Add("CORR");
-
-                if((registers.Status & 0x08) == 0x08)
-                    status.Add("DRQ");
-
-                if((registers.Status & 0x10) == 0x10)
-                    status.Add("SRV");
-
-                if((registers.Status & 0x20) == 0x20)
-                    status.Add("DF");
-
-                if((registers.Status & 0x40) == 0x40)
-                    status.Add("RDY");
-
-                if((registers.Status & 0x80) == 0x80)
-                    status.Add("BSY");
-
-                if((registers.Error & 0x01) == 0x01)
-                    error.Add("AMNF");
-
-                if((registers.Error & 0x02) == 0x02)
-                    error.Add("T0NF");
-
-                if((registers.Error & 0x04) == 0x04)
-                    error.Add("ABRT");
-
-                if((registers.Error & 0x08) == 0x08)
-                    error.Add("MCR");
-
-                if((registers.Error & 0x10) == 0x10)
-                    error.Add("IDNF");
-
-                if((registers.Error & 0x20) == 0x20)
-                    error.Add("MC");
-
-                if((registers.Error & 0x40) == 0x40)
-                    error.Add("UNC");
-
-                if((registers.Error & 0x80) == 0x80)
-                    error.Add("BBK");
-
-                _logSw.WriteLine("ATA reading LBA {0} error: status = {1}, error = {2}.", block,
-                                 string.Join(' ', status), string.Join(' ', error));
-
-                _logSw.Flush();
-            }
-        }
-
-        /// <summary>Register an ATA error after trying to read using 48-bit LBA commands</summary>
-        /// <param name="block">Starting block</param>
-        /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
-        /// <param name="errno">Operating system error number</param>
-        /// <param name="registers">Error registers</param>
-        public void WriteLine(ulong block, bool osError, int errno, AtaErrorRegistersLba48 registers)
-        {
-            if(osError)
-            {
-                _logSw.WriteLine("ATA reading LBA {0} operating system error: {1}.", block, errno);
-                _logSw.Flush();
-            }
-            else
-            {
-                List<string> error  = new List<string>();
-                List<string> status = new List<string>();
-
-                if((registers.Status & 0x01) == 0x01)
-                    status.Add("ERR");
-
-                if((registers.Status & 0x02) == 0x02)
-                    status.Add("IDX");
-
-                if((registers.Status & 0x04) == 0x04)
-                    status.Add("CORR");
-
-                if((registers.Status & 0x08) == 0x08)
-                    status.Add("DRQ");
-
-                if((registers.Status & 0x10) == 0x10)
-                    status.Add("SRV");
-
-                if((registers.Status & 0x20) == 0x20)
-                    status.Add("DF");
-
-                if((registers.Status & 0x40) == 0x40)
-                    status.Add("RDY");
-
-                if((registers.Status & 0x80) == 0x80)
-                    status.Add("BSY");
-
-                if((registers.Error & 0x01) == 0x01)
-                    error.Add("AMNF");
-
-                if((registers.Error & 0x02) == 0x02)
-                    error.Add("T0NF");
-
-                if((registers.Error & 0x04) == 0x04)
-                    error.Add("ABRT");
-
-                if((registers.Error & 0x08) == 0x08)
-                    error.Add("MCR");
-
-                if((registers.Error & 0x10) == 0x10)
-                    error.Add("IDNF");
-
-                if((registers.Error & 0x20) == 0x20)
-                    error.Add("MC");
-
-                if((registers.Error & 0x40) == 0x40)
-                    error.Add("UNC");
-
-                if((registers.Error & 0x80) == 0x80)
-                    error.Add("BBK");
-
-                _logSw.WriteLine("ATA reading LBA {0} error: status = {1}, error = {2}.", block,
-                                 string.Join(' ', status), string.Join(' ', error));
-
-                _logSw.Flush();
-            }
-        }
-
-        /// <summary>Register a SCSI error after sending a command</summary>
-        /// <param name="command">Command</param>
-        /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
-        /// <param name="errno">Operating system error number</param>
-        /// <param name="senseBuffer">REQUEST SENSE response buffer</param>
-        public void WriteLine(string command, bool osError, int errno, byte[] senseBuffer)
-        {
-            if(osError)
-            {
-                _logSw.WriteLine("SCSI command {0} operating system error: {1}.", command, errno);
-                _logSw.Flush();
-
-                return;
-            }
-
-            DecodedSense? decodedSense = Sense.Decode(senseBuffer);
-            string        prettySense  = Sense.PrettifySense(senseBuffer);
-            string        hexSense     = string.Join(' ', senseBuffer.Select(b => $"{b:X2}"));
-
-            if(decodedSense.HasValue)
-            {
-                if(prettySense != null)
-                {
-                    if(prettySense.StartsWith("SCSI SENSE: ", StringComparison.Ordinal))
-                        prettySense = prettySense.Substring(12);
-
-                    if(prettySense.EndsWith('\n'))
-                        prettySense = prettySense.Substring(0, prettySense.Length - 1);
-
-                    prettySense = prettySense.Replace("\n", " - ");
-
-                    _logSw.WriteLine("SCSI command {0} error: SENSE {1} ASC {2:X2}h ASCQ {3:X2}h, {4}, {5}.", command,
-                                     decodedSense.Value.SenseKey, decodedSense.Value.ASC, decodedSense.Value.ASCQ,
-                                     hexSense, prettySense);
-                }
-                else
-                {
-                    _logSw.WriteLine("SCSI command {0} error: SENSE {1} ASC {2:X2}h ASCQ {3:X2}h, {4}.", command,
-                                     decodedSense.Value.SenseKey, decodedSense.Value.ASC, decodedSense.Value.ASCQ,
-                                     hexSense);
-                }
-            }
-            else
-            {
-                if(prettySense != null)
-                {
-                    if(prettySense.StartsWith("SCSI SENSE: ", StringComparison.Ordinal))
-                        prettySense = prettySense.Substring(12);
-
-                    if(prettySense.EndsWith('\n'))
-                        prettySense = prettySense.Substring(0, prettySense.Length - 1);
-
-                    prettySense = prettySense.Replace("\n", " - ");
-
-                    _logSw.WriteLine("SCSI command {0} error: {1}, {2}.", command, hexSense, prettySense);
-                }
-                else
-                {
-                    _logSw.WriteLine("SCSI command {0} error: {1}", command, hexSense);
-                }
-            }
+            _logSw.WriteLine("ATA command {0} error: status = {1}, error = {2}.", command, string.Join(' ', status),
+                             string.Join(' ', error));
 
             _logSw.Flush();
         }
-
-        /// <summary>Register an SCSI error after trying to read</summary>
-        /// <param name="block">Starting block</param>
-        /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
-        /// <param name="errno">Operating system error number</param>
-        /// <param name="senseBuffer">REQUEST SENSE response buffer</param>
-        public void WriteLine(ulong block, bool osError, int errno, byte[] senseBuffer)
-        {
-            if(osError)
-            {
-                _logSw.WriteLine("SCSI reading LBA {0} operating system error: {1}.", block, errno);
-                _logSw.Flush();
-
-                if(senseBuffer is null     ||
-                   senseBuffer.Length == 0 ||
-                   senseBuffer.All(s => s == 0))
-                    return;
-            }
-
-            DecodedSense? decodedSense = Sense.Decode(senseBuffer);
-            string        prettySense  = Sense.PrettifySense(senseBuffer);
-            string        hexSense     = string.Join(' ', senseBuffer.Select(b => $"{b:X2}"));
-
-            if(decodedSense.HasValue)
-            {
-                if(prettySense != null)
-                {
-                    if(prettySense.StartsWith("SCSI SENSE: ", StringComparison.Ordinal))
-                        prettySense = prettySense.Substring(12);
-
-                    if(prettySense.EndsWith('\n'))
-                        prettySense = prettySense.Substring(0, prettySense.Length - 1);
-
-                    prettySense = prettySense.Replace("\n", " - ");
-
-                    _logSw.WriteLine("SCSI reading LBA {0} error: SENSE {1} ASC {2:X2}h ASCQ {3:X2}h, {4}, {5}.", block,
-                                     decodedSense.Value.SenseKey, decodedSense.Value.ASC, decodedSense.Value.ASCQ,
-                                     hexSense, prettySense);
-                }
-                else
-                {
-                    _logSw.WriteLine("SCSI reading LBA {0} error: SENSE {1} ASC {2:X2}h ASCQ {3:X2}h, {4}.", block,
-                                     decodedSense.Value.SenseKey, decodedSense.Value.ASC, decodedSense.Value.ASCQ,
-                                     hexSense);
-                }
-            }
-            else
-            {
-                if(prettySense != null)
-                {
-                    if(prettySense.StartsWith("SCSI SENSE: ", StringComparison.Ordinal))
-                        prettySense = prettySense.Substring(12);
-
-                    if(prettySense.EndsWith('\n'))
-                        prettySense = prettySense.Substring(0, prettySense.Length - 1);
-
-                    prettySense = prettySense.Replace("\n", " - ");
-
-                    _logSw.WriteLine("SCSI reading LBA {0} error: {1}, {2}.", block, hexSense, prettySense);
-                }
-                else
-                {
-                    _logSw.WriteLine("SCSI reading LBA {0} error: {1}", block, hexSense);
-                }
-            }
-
-            _logSw.Flush();
-        }
-
-        /// <summary>Register a SecureDigital / MultiMediaCard error after sending a command</summary>
-        /// <param name="command">Command</param>
-        /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
-        /// <param name="errno">Operating system error number</param>
-        /// <param name="response">Response</param>
-        public void WriteLine(string command, bool osError, int errno, uint[] response)
-        {
-            if(osError)
-            {
-                _logSw.WriteLine("SD/MMC command {0} operating system error: {1}.", command, errno);
-                _logSw.Flush();
-
-                return;
-            }
-
-            // TODO: Decode response
-            _logSw.WriteLine("SD/MMC command {0} error: {1}", command,
-                             string.Join(" - ", response.Select(r => $"0x{r:X8}")));
-
-            _logSw.Flush();
-        }
-
-        /// <summary>Register a SecureDigital / MultiMediaCard error after trying to read</summary>
-        /// <param name="block">Starting block</param>
-        /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
-        /// <param name="errno">Operating system error number</param>
-        /// <param name="byteAddressed">Byte addressed</param>
-        /// <param name="response">Response</param>
-        public void WriteLine(ulong block, bool osError, int errno, bool byteAddressed, uint[] response)
-
-        {
-            if(osError)
-            {
-                _logSw.WriteLine("SD/MMC reading LBA {0} ({1}-addressed) operating system error: {2}.", block,
-                                 byteAddressed ? "byte" : "block", errno);
-
-                _logSw.Flush();
-
-                return;
-            }
-
-            _logSw.WriteLine("SD/MMC reading LBA {0} ({1}-addressed) error: {2}", block,
-                             byteAddressed ? "byte" : "block", string.Join(" - ", response.Select(r => $"0x{r:X8}")));
-
-            throw new NotImplementedException();
-        }
+    }
+
+    /// <summary>Register an ATA error after trying to read using CHS commands</summary>
+    /// <param name="cylinder">Cylinder</param>
+    /// <param name="head">Head</param>
+    /// <param name="sector">Sector</param>
+    /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
+    /// <param name="errno">Operating system error number</param>
+    /// <param name="registers">Error registers</param>
+    public void WriteLine(ushort cylinder, byte head, byte sector, bool osError, int errno,
+                          AtaErrorRegistersChs registers)
+    {
+        if(osError)
+        {
+            _logSw.WriteLine("ATA reading C/H/S {0}/{1}/{2} operating system error: {3}.", cylinder, head, sector,
+                             errno);
+
+            _logSw.Flush();
+        }
+        else
+        {
+            List<string> error  = new List<string>();
+            List<string> status = new List<string>();
+
+            if((registers.Status & 0x01) == 0x01)
+                status.Add("ERR");
+
+            if((registers.Status & 0x02) == 0x02)
+                status.Add("IDX");
+
+            if((registers.Status & 0x04) == 0x04)
+                status.Add("CORR");
+
+            if((registers.Status & 0x08) == 0x08)
+                status.Add("DRQ");
+
+            if((registers.Status & 0x10) == 0x10)
+                status.Add("SRV");
+
+            if((registers.Status & 0x20) == 0x20)
+                status.Add("DF");
+
+            if((registers.Status & 0x40) == 0x40)
+                status.Add("RDY");
+
+            if((registers.Status & 0x80) == 0x80)
+                status.Add("BSY");
+
+            if((registers.Error & 0x01) == 0x01)
+                error.Add("AMNF");
+
+            if((registers.Error & 0x02) == 0x02)
+                error.Add("T0NF");
+
+            if((registers.Error & 0x04) == 0x04)
+                error.Add("ABRT");
+
+            if((registers.Error & 0x08) == 0x08)
+                error.Add("MCR");
+
+            if((registers.Error & 0x10) == 0x10)
+                error.Add("IDNF");
+
+            if((registers.Error & 0x20) == 0x20)
+                error.Add("MC");
+
+            if((registers.Error & 0x40) == 0x40)
+                error.Add("UNC");
+
+            if((registers.Error & 0x80) == 0x80)
+                error.Add("BBK");
+
+            _logSw.WriteLine("ATA reading C/H/S {0}/{1}/{2} error: status = {3}, error = {4}.", cylinder, head,
+                             sector, string.Join(' ', status), string.Join(' ', error));
+
+            _logSw.Flush();
+        }
+    }
+
+    /// <summary>Register an ATA error after trying to read using 28-bit LBA commands</summary>
+    /// <param name="block">Starting block</param>
+    /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
+    /// <param name="errno">Operating system error number</param>
+    /// <param name="registers">Error registers</param>
+    public void WriteLine(ulong block, bool osError, int errno, AtaErrorRegistersLba28 registers)
+    {
+        if(osError)
+        {
+            _logSw.WriteLine("ATA reading LBA {0} operating system error: {1}.", block, errno);
+            _logSw.Flush();
+        }
+        else
+        {
+            List<string> error  = new List<string>();
+            List<string> status = new List<string>();
+
+            if((registers.Status & 0x01) == 0x01)
+                status.Add("ERR");
+
+            if((registers.Status & 0x02) == 0x02)
+                status.Add("IDX");
+
+            if((registers.Status & 0x04) == 0x04)
+                status.Add("CORR");
+
+            if((registers.Status & 0x08) == 0x08)
+                status.Add("DRQ");
+
+            if((registers.Status & 0x10) == 0x10)
+                status.Add("SRV");
+
+            if((registers.Status & 0x20) == 0x20)
+                status.Add("DF");
+
+            if((registers.Status & 0x40) == 0x40)
+                status.Add("RDY");
+
+            if((registers.Status & 0x80) == 0x80)
+                status.Add("BSY");
+
+            if((registers.Error & 0x01) == 0x01)
+                error.Add("AMNF");
+
+            if((registers.Error & 0x02) == 0x02)
+                error.Add("T0NF");
+
+            if((registers.Error & 0x04) == 0x04)
+                error.Add("ABRT");
+
+            if((registers.Error & 0x08) == 0x08)
+                error.Add("MCR");
+
+            if((registers.Error & 0x10) == 0x10)
+                error.Add("IDNF");
+
+            if((registers.Error & 0x20) == 0x20)
+                error.Add("MC");
+
+            if((registers.Error & 0x40) == 0x40)
+                error.Add("UNC");
+
+            if((registers.Error & 0x80) == 0x80)
+                error.Add("BBK");
+
+            _logSw.WriteLine("ATA reading LBA {0} error: status = {1}, error = {2}.", block,
+                             string.Join(' ', status), string.Join(' ', error));
+
+            _logSw.Flush();
+        }
+    }
+
+    /// <summary>Register an ATA error after trying to read using 48-bit LBA commands</summary>
+    /// <param name="block">Starting block</param>
+    /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
+    /// <param name="errno">Operating system error number</param>
+    /// <param name="registers">Error registers</param>
+    public void WriteLine(ulong block, bool osError, int errno, AtaErrorRegistersLba48 registers)
+    {
+        if(osError)
+        {
+            _logSw.WriteLine("ATA reading LBA {0} operating system error: {1}.", block, errno);
+            _logSw.Flush();
+        }
+        else
+        {
+            List<string> error  = new List<string>();
+            List<string> status = new List<string>();
+
+            if((registers.Status & 0x01) == 0x01)
+                status.Add("ERR");
+
+            if((registers.Status & 0x02) == 0x02)
+                status.Add("IDX");
+
+            if((registers.Status & 0x04) == 0x04)
+                status.Add("CORR");
+
+            if((registers.Status & 0x08) == 0x08)
+                status.Add("DRQ");
+
+            if((registers.Status & 0x10) == 0x10)
+                status.Add("SRV");
+
+            if((registers.Status & 0x20) == 0x20)
+                status.Add("DF");
+
+            if((registers.Status & 0x40) == 0x40)
+                status.Add("RDY");
+
+            if((registers.Status & 0x80) == 0x80)
+                status.Add("BSY");
+
+            if((registers.Error & 0x01) == 0x01)
+                error.Add("AMNF");
+
+            if((registers.Error & 0x02) == 0x02)
+                error.Add("T0NF");
+
+            if((registers.Error & 0x04) == 0x04)
+                error.Add("ABRT");
+
+            if((registers.Error & 0x08) == 0x08)
+                error.Add("MCR");
+
+            if((registers.Error & 0x10) == 0x10)
+                error.Add("IDNF");
+
+            if((registers.Error & 0x20) == 0x20)
+                error.Add("MC");
+
+            if((registers.Error & 0x40) == 0x40)
+                error.Add("UNC");
+
+            if((registers.Error & 0x80) == 0x80)
+                error.Add("BBK");
+
+            _logSw.WriteLine("ATA reading LBA {0} error: status = {1}, error = {2}.", block,
+                             string.Join(' ', status), string.Join(' ', error));
+
+            _logSw.Flush();
+        }
+    }
+
+    /// <summary>Register a SCSI error after sending a command</summary>
+    /// <param name="command">Command</param>
+    /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
+    /// <param name="errno">Operating system error number</param>
+    /// <param name="senseBuffer">REQUEST SENSE response buffer</param>
+    public void WriteLine(string command, bool osError, int errno, byte[] senseBuffer)
+    {
+        if(osError)
+        {
+            _logSw.WriteLine("SCSI command {0} operating system error: {1}.", command, errno);
+            _logSw.Flush();
+
+            return;
+        }
+
+        DecodedSense? decodedSense = Sense.Decode(senseBuffer);
+        string        prettySense  = Sense.PrettifySense(senseBuffer);
+        string        hexSense     = string.Join(' ', senseBuffer.Select(b => $"{b:X2}"));
+
+        if(decodedSense.HasValue)
+        {
+            if(prettySense != null)
+            {
+                if(prettySense.StartsWith("SCSI SENSE: ", StringComparison.Ordinal))
+                    prettySense = prettySense.Substring(12);
+
+                if(prettySense.EndsWith('\n'))
+                    prettySense = prettySense.Substring(0, prettySense.Length - 1);
+
+                prettySense = prettySense.Replace("\n", " - ");
+
+                _logSw.WriteLine("SCSI command {0} error: SENSE {1} ASC {2:X2}h ASCQ {3:X2}h, {4}, {5}.", command,
+                                 decodedSense.Value.SenseKey, decodedSense.Value.ASC, decodedSense.Value.ASCQ,
+                                 hexSense, prettySense);
+            }
+            else
+            {
+                _logSw.WriteLine("SCSI command {0} error: SENSE {1} ASC {2:X2}h ASCQ {3:X2}h, {4}.", command,
+                                 decodedSense.Value.SenseKey, decodedSense.Value.ASC, decodedSense.Value.ASCQ,
+                                 hexSense);
+            }
+        }
+        else
+        {
+            if(prettySense != null)
+            {
+                if(prettySense.StartsWith("SCSI SENSE: ", StringComparison.Ordinal))
+                    prettySense = prettySense.Substring(12);
+
+                if(prettySense.EndsWith('\n'))
+                    prettySense = prettySense.Substring(0, prettySense.Length - 1);
+
+                prettySense = prettySense.Replace("\n", " - ");
+
+                _logSw.WriteLine("SCSI command {0} error: {1}, {2}.", command, hexSense, prettySense);
+            }
+            else
+            {
+                _logSw.WriteLine("SCSI command {0} error: {1}", command, hexSense);
+            }
+        }
+
+        _logSw.Flush();
+    }
+
+    /// <summary>Register an SCSI error after trying to read</summary>
+    /// <param name="block">Starting block</param>
+    /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
+    /// <param name="errno">Operating system error number</param>
+    /// <param name="senseBuffer">REQUEST SENSE response buffer</param>
+    public void WriteLine(ulong block, bool osError, int errno, byte[] senseBuffer)
+    {
+        if(osError)
+        {
+            _logSw.WriteLine("SCSI reading LBA {0} operating system error: {1}.", block, errno);
+            _logSw.Flush();
+
+            if(senseBuffer is null     ||
+               senseBuffer.Length == 0 ||
+               senseBuffer.All(s => s == 0))
+                return;
+        }
+
+        DecodedSense? decodedSense = Sense.Decode(senseBuffer);
+        string        prettySense  = Sense.PrettifySense(senseBuffer);
+        string        hexSense     = string.Join(' ', senseBuffer.Select(b => $"{b:X2}"));
+
+        if(decodedSense.HasValue)
+        {
+            if(prettySense != null)
+            {
+                if(prettySense.StartsWith("SCSI SENSE: ", StringComparison.Ordinal))
+                    prettySense = prettySense.Substring(12);
+
+                if(prettySense.EndsWith('\n'))
+                    prettySense = prettySense.Substring(0, prettySense.Length - 1);
+
+                prettySense = prettySense.Replace("\n", " - ");
+
+                _logSw.WriteLine("SCSI reading LBA {0} error: SENSE {1} ASC {2:X2}h ASCQ {3:X2}h, {4}, {5}.", block,
+                                 decodedSense.Value.SenseKey, decodedSense.Value.ASC, decodedSense.Value.ASCQ,
+                                 hexSense, prettySense);
+            }
+            else
+            {
+                _logSw.WriteLine("SCSI reading LBA {0} error: SENSE {1} ASC {2:X2}h ASCQ {3:X2}h, {4}.", block,
+                                 decodedSense.Value.SenseKey, decodedSense.Value.ASC, decodedSense.Value.ASCQ,
+                                 hexSense);
+            }
+        }
+        else
+        {
+            if(prettySense != null)
+            {
+                if(prettySense.StartsWith("SCSI SENSE: ", StringComparison.Ordinal))
+                    prettySense = prettySense.Substring(12);
+
+                if(prettySense.EndsWith('\n'))
+                    prettySense = prettySense.Substring(0, prettySense.Length - 1);
+
+                prettySense = prettySense.Replace("\n", " - ");
+
+                _logSw.WriteLine("SCSI reading LBA {0} error: {1}, {2}.", block, hexSense, prettySense);
+            }
+            else
+            {
+                _logSw.WriteLine("SCSI reading LBA {0} error: {1}", block, hexSense);
+            }
+        }
+
+        _logSw.Flush();
+    }
+
+    /// <summary>Register a SecureDigital / MultiMediaCard error after sending a command</summary>
+    /// <param name="command">Command</param>
+    /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
+    /// <param name="errno">Operating system error number</param>
+    /// <param name="response">Response</param>
+    public void WriteLine(string command, bool osError, int errno, uint[] response)
+    {
+        if(osError)
+        {
+            _logSw.WriteLine("SD/MMC command {0} operating system error: {1}.", command, errno);
+            _logSw.Flush();
+
+            return;
+        }
+
+        // TODO: Decode response
+        _logSw.WriteLine("SD/MMC command {0} error: {1}", command,
+                         string.Join(" - ", response.Select(r => $"0x{r:X8}")));
+
+        _logSw.Flush();
+    }
+
+    /// <summary>Register a SecureDigital / MultiMediaCard error after trying to read</summary>
+    /// <param name="block">Starting block</param>
+    /// <param name="osError"><c>true</c> if operating system returned an error status instead of the device</param>
+    /// <param name="errno">Operating system error number</param>
+    /// <param name="byteAddressed">Byte addressed</param>
+    /// <param name="response">Response</param>
+    public void WriteLine(ulong block, bool osError, int errno, bool byteAddressed, uint[] response)
+
+    {
+        if(osError)
+        {
+            _logSw.WriteLine("SD/MMC reading LBA {0} ({1}-addressed) operating system error: {2}.", block,
+                             byteAddressed ? "byte" : "block", errno);
+
+            _logSw.Flush();
+
+            return;
+        }
+
+        _logSw.WriteLine("SD/MMC reading LBA {0} ({1}-addressed) error: {2}", block,
+                         byteAddressed ? "byte" : "block", string.Join(" - ", response.Select(r => $"0x{r:X8}")));
+
+        throw new NotImplementedException();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Logging/IBGLog.cs b/Aaru.Core/Logging/IBGLog.cs
index e79f3ca14..d79012306 100644
--- a/Aaru.Core/Logging/IBGLog.cs
+++ b/Aaru.Core/Logging/IBGLog.cs
@@ -36,317 +36,316 @@ using System.IO;
 using System.Text;
 using Aaru.Devices;
 
-namespace Aaru.Core.Logging
+namespace Aaru.Core.Logging;
+
+/// <summary>Implements a log in the format used by IMGBurn</summary>
+internal sealed class IbgLog
 {
-    /// <summary>Implements a log in the format used by IMGBurn</summary>
-    internal sealed class IbgLog
+    readonly CultureInfo   _ibgCulture;
+    readonly double        _ibgDivider;
+    readonly string        _ibgMediaType;
+    readonly StringBuilder _ibgSb;
+    readonly string        _logFile;
+    DateTime               _ibgDatePoint;
+    ulong                  _ibgIntSector;
+    double                 _ibgIntSpeed;
+    double                 _ibgMaxSpeed;
+    int                    _ibgSampleRate;
+    int                    _ibgSnaps;
+    bool                   _ibgStartSet;
+    double                 _ibgStartSpeed;
+
+    /// <summary>Initializes the IMGBurn log</summary>
+    /// <param name="outputFile">Log file</param>
+    /// <param name="currentProfile">Profile as defined by SCSI MultiMedia Commands specification</param>
+    internal IbgLog(string outputFile, ushort currentProfile)
     {
-        readonly CultureInfo   _ibgCulture;
-        readonly double        _ibgDivider;
-        readonly string        _ibgMediaType;
-        readonly StringBuilder _ibgSb;
-        readonly string        _logFile;
-        DateTime               _ibgDatePoint;
-        ulong                  _ibgIntSector;
-        double                 _ibgIntSpeed;
-        double                 _ibgMaxSpeed;
-        int                    _ibgSampleRate;
-        int                    _ibgSnaps;
-        bool                   _ibgStartSet;
-        double                 _ibgStartSpeed;
+        if(string.IsNullOrEmpty(outputFile))
+            return;
 
-        /// <summary>Initializes the IMGBurn log</summary>
-        /// <param name="outputFile">Log file</param>
-        /// <param name="currentProfile">Profile as defined by SCSI MultiMedia Commands specification</param>
-        internal IbgLog(string outputFile, ushort currentProfile)
+        _logFile      = outputFile;
+        _ibgSb        = new StringBuilder();
+        _ibgDatePoint = DateTime.Now;
+        _ibgCulture   = new CultureInfo("en-US");
+        _ibgStartSet  = false;
+        _ibgMaxSpeed  = 0;
+        _ibgIntSpeed  = 0;
+        _ibgSnaps     = 0;
+        _ibgIntSector = 0;
+
+        switch(currentProfile)
         {
-            if(string.IsNullOrEmpty(outputFile))
-                return;
+            case 0x0001:
+                _ibgMediaType = "HDD";
+                _ibgDivider   = 1353;
 
-            _logFile      = outputFile;
-            _ibgSb        = new StringBuilder();
-            _ibgDatePoint = DateTime.Now;
-            _ibgCulture   = new CultureInfo("en-US");
-            _ibgStartSet  = false;
-            _ibgMaxSpeed  = 0;
-            _ibgIntSpeed  = 0;
-            _ibgSnaps     = 0;
-            _ibgIntSector = 0;
+                break;
+            case 0x0002:
+                _ibgMediaType = "PD-650";
+                _ibgDivider   = 150;
 
-            switch(currentProfile)
-            {
-                case 0x0001:
-                    _ibgMediaType = "HDD";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x0005:
+                _ibgMediaType = "CD-MO";
+                _ibgDivider   = 150;
 
-                    break;
-                case 0x0002:
-                    _ibgMediaType = "PD-650";
-                    _ibgDivider   = 150;
+                break;
+            case 0x0008:
+                _ibgMediaType = "CD-ROM";
+                _ibgDivider   = 150;
 
-                    break;
-                case 0x0005:
-                    _ibgMediaType = "CD-MO";
-                    _ibgDivider   = 150;
+                break;
+            case 0x0009:
+                _ibgMediaType = "CD-R";
+                _ibgDivider   = 150;
 
-                    break;
-                case 0x0008:
-                    _ibgMediaType = "CD-ROM";
-                    _ibgDivider   = 150;
+                break;
+            case 0x000A:
+                _ibgMediaType = "CD-RW";
+                _ibgDivider   = 150;
 
-                    break;
-                case 0x0009:
-                    _ibgMediaType = "CD-R";
-                    _ibgDivider   = 150;
+                break;
+            case 0x0010:
+                _ibgMediaType = "DVD-ROM";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x000A:
-                    _ibgMediaType = "CD-RW";
-                    _ibgDivider   = 150;
+                break;
+            case 0x0011:
+                _ibgMediaType = "DVD-R";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x0010:
-                    _ibgMediaType = "DVD-ROM";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x0012:
+                _ibgMediaType = "DVD-RAM";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x0011:
-                    _ibgMediaType = "DVD-R";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x0013:
+            case 0x0014:
+                _ibgMediaType = "DVD-RW";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x0012:
-                    _ibgMediaType = "DVD-RAM";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x0015:
+            case 0x0016:
+                _ibgMediaType = "DVD-R DL";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x0013:
-                case 0x0014:
-                    _ibgMediaType = "DVD-RW";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x0017:
+                _ibgMediaType = "DVD-RW DL";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x0015:
-                case 0x0016:
-                    _ibgMediaType = "DVD-R DL";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x0018:
+                _ibgMediaType = "DVD-Download";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x0017:
-                    _ibgMediaType = "DVD-RW DL";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x001A:
+                _ibgMediaType = "DVD+RW";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x0018:
-                    _ibgMediaType = "DVD-Download";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x001B:
+                _ibgMediaType = "DVD+R";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x001A:
-                    _ibgMediaType = "DVD+RW";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x0020:
+                _ibgMediaType = "DDCD-ROM";
+                _ibgDivider   = 150;
 
-                    break;
-                case 0x001B:
-                    _ibgMediaType = "DVD+R";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x0021:
+                _ibgMediaType = "DDCD-R";
+                _ibgDivider   = 150;
 
-                    break;
-                case 0x0020:
-                    _ibgMediaType = "DDCD-ROM";
-                    _ibgDivider   = 150;
+                break;
+            case 0x0022:
+                _ibgMediaType = "DDCD-RW";
+                _ibgDivider   = 150;
 
-                    break;
-                case 0x0021:
-                    _ibgMediaType = "DDCD-R";
-                    _ibgDivider   = 150;
+                break;
+            case 0x002A:
+                _ibgMediaType = "DVD+RW DL";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x0022:
-                    _ibgMediaType = "DDCD-RW";
-                    _ibgDivider   = 150;
+                break;
+            case 0x002B:
+                _ibgMediaType = "DVD+R DL";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x002A:
-                    _ibgMediaType = "DVD+RW DL";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x0040:
+                _ibgMediaType = "BD-ROM";
+                _ibgDivider   = 4500;
 
-                    break;
-                case 0x002B:
-                    _ibgMediaType = "DVD+R DL";
-                    _ibgDivider   = 1353;
+                break;
+            case 0x0041:
+            case 0x0042:
+                _ibgMediaType = "BD-R";
+                _ibgDivider   = 4500;
 
-                    break;
-                case 0x0040:
-                    _ibgMediaType = "BD-ROM";
-                    _ibgDivider   = 4500;
+                break;
+            case 0x0043:
+                _ibgMediaType = "BD-RE";
+                _ibgDivider   = 4500;
 
-                    break;
-                case 0x0041:
-                case 0x0042:
-                    _ibgMediaType = "BD-R";
-                    _ibgDivider   = 4500;
+                break;
+            case 0x0050:
+                _ibgMediaType = "HD DVD-ROM";
+                _ibgDivider   = 4500;
 
-                    break;
-                case 0x0043:
-                    _ibgMediaType = "BD-RE";
-                    _ibgDivider   = 4500;
+                break;
+            case 0x0051:
+                _ibgMediaType = "HD DVD-R";
+                _ibgDivider   = 4500;
 
-                    break;
-                case 0x0050:
-                    _ibgMediaType = "HD DVD-ROM";
-                    _ibgDivider   = 4500;
+                break;
+            case 0x0052:
+                _ibgMediaType = "HD DVD-RAM";
+                _ibgDivider   = 4500;
 
-                    break;
-                case 0x0051:
-                    _ibgMediaType = "HD DVD-R";
-                    _ibgDivider   = 4500;
+                break;
+            case 0x0053:
+                _ibgMediaType = "HD DVD-RW";
+                _ibgDivider   = 4500;
 
-                    break;
-                case 0x0052:
-                    _ibgMediaType = "HD DVD-RAM";
-                    _ibgDivider   = 4500;
+                break;
+            case 0x0058:
+                _ibgMediaType = "HD DVD-R DL";
+                _ibgDivider   = 4500;
 
-                    break;
-                case 0x0053:
-                    _ibgMediaType = "HD DVD-RW";
-                    _ibgDivider   = 4500;
+                break;
+            case 0x005A:
+                _ibgMediaType = "HD DVD-RW DL";
+                _ibgDivider   = 4500;
 
-                    break;
-                case 0x0058:
-                    _ibgMediaType = "HD DVD-R DL";
-                    _ibgDivider   = 4500;
+                break;
+            default:
+                _ibgMediaType = "Unknown";
+                _ibgDivider   = 1353;
 
-                    break;
-                case 0x005A:
-                    _ibgMediaType = "HD DVD-RW DL";
-                    _ibgDivider   = 4500;
-
-                    break;
-                default:
-                    _ibgMediaType = "Unknown";
-                    _ibgDivider   = 1353;
-
-                    break;
-            }
-        }
-
-        /// <summary>Adds a new speed snapshot to the log</summary>
-        /// <param name="sector">Sector for the snapshot</param>
-        /// <param name="currentSpeed">Current speed at the snapshot</param>
-        internal void Write(ulong sector, double currentSpeed)
-        {
-            if(_logFile == null)
-                return;
-
-            _ibgIntSpeed   += currentSpeed;
-            _ibgSampleRate += (int)Math.Floor((DateTime.Now - _ibgDatePoint).TotalMilliseconds);
-            _ibgSnaps++;
-
-            if(_ibgSampleRate < 100)
-                return;
-
-            if(_ibgIntSpeed > 0 &&
-               !_ibgStartSet)
-            {
-                _ibgStartSpeed = _ibgIntSpeed / _ibgSnaps / _ibgDivider;
-                _ibgStartSet   = true;
-            }
-
-            _ibgSb.AppendFormat("{0:0.00},{1},{2:0},0", _ibgIntSpeed / _ibgSnaps / _ibgDivider, _ibgIntSector,
-                                _ibgSampleRate).AppendLine();
-
-            if(_ibgIntSpeed / _ibgSnaps / _ibgDivider > _ibgMaxSpeed)
-                _ibgMaxSpeed = _ibgIntSpeed / _ibgDivider;
-
-            _ibgDatePoint  = DateTime.Now;
-            _ibgIntSpeed   = 0;
-            _ibgSampleRate = 0;
-            _ibgSnaps      = 0;
-            _ibgIntSector  = sector;
-        }
-
-        /// <summary>Closes the IMGBurn log</summary>
-        /// <param name="dev">Device</param>
-        /// <param name="blocks">Media blocks</param>
-        /// <param name="blockSize">Bytes per block</param>
-        /// <param name="totalSeconds">Total seconds spent dumping</param>
-        /// <param name="currentSpeed">Speed at the end</param>
-        /// <param name="averageSpeed">Average speed</param>
-        /// <param name="devicePath">Device path</param>
-        internal void Close(Device dev, ulong blocks, ulong blockSize, double totalSeconds, double currentSpeed,
-                            double averageSpeed, string devicePath)
-        {
-            if(_logFile == null)
-                return;
-
-            var    ibgFs     = new FileStream(_logFile, FileMode.Create);
-            var    ibgHeader = new StringBuilder();
-            string ibgBusType;
-
-            if(dev.IsUsb)
-                ibgBusType = "USB";
-            else if(dev.IsFireWire)
-                ibgBusType = "FireWire";
-            else
-                ibgBusType = dev.Type.ToString();
-
-            ibgHeader.AppendLine("IBGD");
-            ibgHeader.AppendLine();
-            ibgHeader.AppendLine("[START_CONFIGURATION]");
-            ibgHeader.AppendLine("IBGD_VERSION=2");
-            ibgHeader.AppendLine();
-            ibgHeader.AppendFormat("DATE={0}", DateTime.Now).AppendLine();
-            ibgHeader.AppendLine();
-            ibgHeader.AppendFormat("SAMPLE_RATE={0}", 100).AppendLine();
-
-            ibgHeader.AppendLine();
-
-            ibgHeader.AppendFormat("DEVICE=[0:0:0] {0} {1} ({2}) ({3})", dev.Manufacturer, dev.Model, devicePath,
-                                   ibgBusType).AppendLine();
-
-            ibgHeader.AppendLine("DEVICE_ADDRESS=0:0:0");
-            ibgHeader.AppendFormat("DEVICE_MAKEMODEL={0} {1}", dev.Manufacturer, dev.Model).AppendLine();
-            ibgHeader.AppendFormat("DEVICE_FIRMWAREVERSION={0}", dev.FirmwareRevision).AppendLine();
-            ibgHeader.AppendFormat("DEVICE_DRIVELETTER={0}", devicePath).AppendLine();
-            ibgHeader.AppendFormat("DEVICE_BUSTYPE={0}", ibgBusType).AppendLine();
-            ibgHeader.AppendLine();
-
-            ibgHeader.AppendFormat("MEDIA_TYPE={0}", _ibgMediaType).AppendLine();
-            ibgHeader.AppendLine("MEDIA_BOOKTYPE=Unknown");
-            ibgHeader.AppendLine("MEDIA_ID=N/A");
-            ibgHeader.AppendLine("MEDIA_TRACKPATH=PTP");
-            ibgHeader.AppendLine("MEDIA_SPEEDS=N/A");
-            ibgHeader.AppendFormat("MEDIA_CAPACITY={0}", blocks).AppendLine();
-            ibgHeader.AppendLine("MEDIA_LAYER_BREAK=0");
-            ibgHeader.AppendLine();
-            ibgHeader.AppendLine("DATA_IMAGEFILE=/dev/null");
-            ibgHeader.AppendFormat("DATA_SECTORS={0}", blocks).AppendLine();
-            ibgHeader.AppendFormat("DATA_TYPE=MODE1/{0}", blockSize).AppendLine();
-            ibgHeader.AppendLine("DATA_VOLUMEIDENTIFIER=");
-            ibgHeader.AppendLine();
-            ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_START={0:0.00}", _ibgStartSpeed).AppendLine();
-            ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_END={0:0.00}", currentSpeed / _ibgDivider).AppendLine();
-
-            ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_AVERAGE={0:0.00}", averageSpeed / _ibgDivider).
-                      AppendLine();
-
-            ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_MAX={0:0.00}", _ibgMaxSpeed).AppendLine();
-            ibgHeader.AppendFormat(_ibgCulture, "VERIFY_TIME_TAKEN={0:0}", Math.Floor(totalSeconds)).AppendLine();
-            ibgHeader.AppendLine("[END_CONFIGURATION]");
-            ibgHeader.AppendLine();
-            ibgHeader.AppendLine("HRPC=True");
-            ibgHeader.AppendLine();
-            ibgHeader.AppendLine("[START_VERIFY_GRAPH_VALUES]");
-            ibgHeader.Append(_ibgSb);
-            ibgHeader.AppendLine("[END_VERIFY_GRAPH_VALUES]");
-            ibgHeader.AppendLine();
-            ibgHeader.Replace("\r\n", "\n").Replace("\r", "\n").Replace("\n", "\r\n");
-
-            var sr = new StreamWriter(ibgFs);
-            sr.Write(ibgHeader);
-            sr.Close();
-            ibgFs.Close();
+                break;
         }
     }
+
+    /// <summary>Adds a new speed snapshot to the log</summary>
+    /// <param name="sector">Sector for the snapshot</param>
+    /// <param name="currentSpeed">Current speed at the snapshot</param>
+    internal void Write(ulong sector, double currentSpeed)
+    {
+        if(_logFile == null)
+            return;
+
+        _ibgIntSpeed   += currentSpeed;
+        _ibgSampleRate += (int)Math.Floor((DateTime.Now - _ibgDatePoint).TotalMilliseconds);
+        _ibgSnaps++;
+
+        if(_ibgSampleRate < 100)
+            return;
+
+        if(_ibgIntSpeed > 0 &&
+           !_ibgStartSet)
+        {
+            _ibgStartSpeed = _ibgIntSpeed / _ibgSnaps / _ibgDivider;
+            _ibgStartSet   = true;
+        }
+
+        _ibgSb.AppendFormat("{0:0.00},{1},{2:0},0", _ibgIntSpeed / _ibgSnaps / _ibgDivider, _ibgIntSector,
+                            _ibgSampleRate).AppendLine();
+
+        if(_ibgIntSpeed / _ibgSnaps / _ibgDivider > _ibgMaxSpeed)
+            _ibgMaxSpeed = _ibgIntSpeed / _ibgDivider;
+
+        _ibgDatePoint  = DateTime.Now;
+        _ibgIntSpeed   = 0;
+        _ibgSampleRate = 0;
+        _ibgSnaps      = 0;
+        _ibgIntSector  = sector;
+    }
+
+    /// <summary>Closes the IMGBurn log</summary>
+    /// <param name="dev">Device</param>
+    /// <param name="blocks">Media blocks</param>
+    /// <param name="blockSize">Bytes per block</param>
+    /// <param name="totalSeconds">Total seconds spent dumping</param>
+    /// <param name="currentSpeed">Speed at the end</param>
+    /// <param name="averageSpeed">Average speed</param>
+    /// <param name="devicePath">Device path</param>
+    internal void Close(Device dev, ulong blocks, ulong blockSize, double totalSeconds, double currentSpeed,
+                        double averageSpeed, string devicePath)
+    {
+        if(_logFile == null)
+            return;
+
+        var    ibgFs     = new FileStream(_logFile, FileMode.Create);
+        var    ibgHeader = new StringBuilder();
+        string ibgBusType;
+
+        if(dev.IsUsb)
+            ibgBusType = "USB";
+        else if(dev.IsFireWire)
+            ibgBusType = "FireWire";
+        else
+            ibgBusType = dev.Type.ToString();
+
+        ibgHeader.AppendLine("IBGD");
+        ibgHeader.AppendLine();
+        ibgHeader.AppendLine("[START_CONFIGURATION]");
+        ibgHeader.AppendLine("IBGD_VERSION=2");
+        ibgHeader.AppendLine();
+        ibgHeader.AppendFormat("DATE={0}", DateTime.Now).AppendLine();
+        ibgHeader.AppendLine();
+        ibgHeader.AppendFormat("SAMPLE_RATE={0}", 100).AppendLine();
+
+        ibgHeader.AppendLine();
+
+        ibgHeader.AppendFormat("DEVICE=[0:0:0] {0} {1} ({2}) ({3})", dev.Manufacturer, dev.Model, devicePath,
+                               ibgBusType).AppendLine();
+
+        ibgHeader.AppendLine("DEVICE_ADDRESS=0:0:0");
+        ibgHeader.AppendFormat("DEVICE_MAKEMODEL={0} {1}", dev.Manufacturer, dev.Model).AppendLine();
+        ibgHeader.AppendFormat("DEVICE_FIRMWAREVERSION={0}", dev.FirmwareRevision).AppendLine();
+        ibgHeader.AppendFormat("DEVICE_DRIVELETTER={0}", devicePath).AppendLine();
+        ibgHeader.AppendFormat("DEVICE_BUSTYPE={0}", ibgBusType).AppendLine();
+        ibgHeader.AppendLine();
+
+        ibgHeader.AppendFormat("MEDIA_TYPE={0}", _ibgMediaType).AppendLine();
+        ibgHeader.AppendLine("MEDIA_BOOKTYPE=Unknown");
+        ibgHeader.AppendLine("MEDIA_ID=N/A");
+        ibgHeader.AppendLine("MEDIA_TRACKPATH=PTP");
+        ibgHeader.AppendLine("MEDIA_SPEEDS=N/A");
+        ibgHeader.AppendFormat("MEDIA_CAPACITY={0}", blocks).AppendLine();
+        ibgHeader.AppendLine("MEDIA_LAYER_BREAK=0");
+        ibgHeader.AppendLine();
+        ibgHeader.AppendLine("DATA_IMAGEFILE=/dev/null");
+        ibgHeader.AppendFormat("DATA_SECTORS={0}", blocks).AppendLine();
+        ibgHeader.AppendFormat("DATA_TYPE=MODE1/{0}", blockSize).AppendLine();
+        ibgHeader.AppendLine("DATA_VOLUMEIDENTIFIER=");
+        ibgHeader.AppendLine();
+        ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_START={0:0.00}", _ibgStartSpeed).AppendLine();
+        ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_END={0:0.00}", currentSpeed / _ibgDivider).AppendLine();
+
+        ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_AVERAGE={0:0.00}", averageSpeed / _ibgDivider).
+                  AppendLine();
+
+        ibgHeader.AppendFormat(_ibgCulture, "VERIFY_SPEED_MAX={0:0.00}", _ibgMaxSpeed).AppendLine();
+        ibgHeader.AppendFormat(_ibgCulture, "VERIFY_TIME_TAKEN={0:0}", Math.Floor(totalSeconds)).AppendLine();
+        ibgHeader.AppendLine("[END_CONFIGURATION]");
+        ibgHeader.AppendLine();
+        ibgHeader.AppendLine("HRPC=True");
+        ibgHeader.AppendLine();
+        ibgHeader.AppendLine("[START_VERIFY_GRAPH_VALUES]");
+        ibgHeader.Append(_ibgSb);
+        ibgHeader.AppendLine("[END_VERIFY_GRAPH_VALUES]");
+        ibgHeader.AppendLine();
+        ibgHeader.Replace("\r\n", "\n").Replace("\r", "\n").Replace("\n", "\r\n");
+
+        var sr = new StreamWriter(ibgFs);
+        sr.Write(ibgHeader);
+        sr.Close();
+        ibgFs.Close();
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Logging/MHDDLog.cs b/Aaru.Core/Logging/MHDDLog.cs
index 910c6b4cd..f7075d32d 100644
--- a/Aaru.Core/Logging/MHDDLog.cs
+++ b/Aaru.Core/Logging/MHDDLog.cs
@@ -37,135 +37,134 @@ using System.Text;
 using Aaru.CommonTypes.Enums;
 using Aaru.Devices;
 
-namespace Aaru.Core.Logging
+namespace Aaru.Core.Logging;
+
+/// <summary>Implements a log in the format used by MHDD</summary>
+internal sealed class MhddLog
 {
-    /// <summary>Implements a log in the format used by MHDD</summary>
-    internal sealed class MhddLog
+    const    string       MHDD_VER = "VER:2 ";
+    readonly string       _logFile;
+    readonly MemoryStream _mhddFs;
+
+    /// <summary>Initializes the MHDD log</summary>
+    /// <param name="outputFile">Log file</param>
+    /// <param name="dev">Device</param>
+    /// <param name="blocks">Blocks in media</param>
+    /// <param name="blockSize">Bytes per block</param>
+    /// <param name="blocksToRead">How many blocks read at once</param>
+    /// <param name="private">Disable saving paths or serial numbers in log</param>
+    internal MhddLog(string outputFile, Device dev, ulong blocks, ulong blockSize, ulong blocksToRead,
+                     bool @private)
     {
-        const    string       MHDD_VER = "VER:2 ";
-        readonly string       _logFile;
-        readonly MemoryStream _mhddFs;
+        if(dev == null ||
+           string.IsNullOrEmpty(outputFile))
+            return;
 
-        /// <summary>Initializes the MHDD log</summary>
-        /// <param name="outputFile">Log file</param>
-        /// <param name="dev">Device</param>
-        /// <param name="blocks">Blocks in media</param>
-        /// <param name="blockSize">Bytes per block</param>
-        /// <param name="blocksToRead">How many blocks read at once</param>
-        /// <param name="private">Disable saving paths or serial numbers in log</param>
-        internal MhddLog(string outputFile, Device dev, ulong blocks, ulong blockSize, ulong blocksToRead,
-                         bool @private)
+        _mhddFs  = new MemoryStream();
+        _logFile = outputFile;
+
+        string mode;
+
+        switch(dev.Type)
         {
-            if(dev == null ||
-               string.IsNullOrEmpty(outputFile))
-                return;
+            case DeviceType.ATA:
+            case DeviceType.ATAPI:
+                mode = "MODE: IDE";
 
-            _mhddFs  = new MemoryStream();
-            _logFile = outputFile;
+                break;
+            case DeviceType.SCSI:
+                mode = "MODE: SCSI";
 
-            string mode;
+                break;
+            case DeviceType.MMC:
+                mode = "MODE: MMC";
 
-            switch(dev.Type)
-            {
-                case DeviceType.ATA:
-                case DeviceType.ATAPI:
-                    mode = "MODE: IDE";
+                break;
+            case DeviceType.NVMe:
+                mode = "MODE: NVMe";
 
-                    break;
-                case DeviceType.SCSI:
-                    mode = "MODE: SCSI";
+                break;
+            case DeviceType.SecureDigital:
+                mode = "MODE: SD";
 
-                    break;
-                case DeviceType.MMC:
-                    mode = "MODE: MMC";
+                break;
+            default:
+                mode = "MODE: IDE";
 
-                    break;
-                case DeviceType.NVMe:
-                    mode = "MODE: NVMe";
-
-                    break;
-                case DeviceType.SecureDigital:
-                    mode = "MODE: SD";
-
-                    break;
-                default:
-                    mode = "MODE: IDE";
-
-                    break;
-            }
-
-            string device     = $"DEVICE: {dev.Manufacturer} {dev.Model}";
-            string fw         = $"F/W: {dev.FirmwareRevision}";
-            string sn         = $"S/N: {(@private ? "" : dev.Serial)}";
-            string sectors    = string.Format(new CultureInfo("en-US"), "SECTORS: {0:n0}", blocks);
-            string sectorSize = string.Format(new CultureInfo("en-US"), "SECTOR SIZE: {0:n0} bytes", blockSize);
-
-            string scanBlockSize =
-                string.Format(new CultureInfo("en-US"), "SCAN BLOCK SIZE: {0:n0} sectors", blocksToRead);
-
-            byte[] deviceBytes        = Encoding.ASCII.GetBytes(device);
-            byte[] modeBytes          = Encoding.ASCII.GetBytes(mode);
-            byte[] fwBytes            = Encoding.ASCII.GetBytes(fw);
-            byte[] snBytes            = Encoding.ASCII.GetBytes(sn);
-            byte[] sectorsBytes       = Encoding.ASCII.GetBytes(sectors);
-            byte[] sectorSizeBytes    = Encoding.ASCII.GetBytes(sectorSize);
-            byte[] scanBlockSizeBytes = Encoding.ASCII.GetBytes(scanBlockSize);
-            byte[] verBytes           = Encoding.ASCII.GetBytes(MHDD_VER);
-
-            uint pointer = (uint)(deviceBytes.Length  + modeBytes.Length       + fwBytes.Length + snBytes.Length +
-                                  sectorsBytes.Length + sectorSizeBytes.Length + scanBlockSizeBytes.Length +
-                                  verBytes.Length     + (2 * 9)                + // New lines
-                                  4);                                            // Pointer
-
-            byte[] newLine = new byte[2];
-            newLine[0] = 0x0D;
-            newLine[1] = 0x0A;
-
-            _mhddFs.Write(BitConverter.GetBytes(pointer), 0, 4);
-            _mhddFs.Write(newLine, 0, 2);
-            _mhddFs.Write(verBytes, 0, verBytes.Length);
-            _mhddFs.Write(newLine, 0, 2);
-            _mhddFs.Write(modeBytes, 0, modeBytes.Length);
-            _mhddFs.Write(newLine, 0, 2);
-            _mhddFs.Write(deviceBytes, 0, deviceBytes.Length);
-            _mhddFs.Write(newLine, 0, 2);
-            _mhddFs.Write(fwBytes, 0, fwBytes.Length);
-            _mhddFs.Write(newLine, 0, 2);
-            _mhddFs.Write(snBytes, 0, snBytes.Length);
-            _mhddFs.Write(newLine, 0, 2);
-            _mhddFs.Write(sectorsBytes, 0, sectorsBytes.Length);
-            _mhddFs.Write(newLine, 0, 2);
-            _mhddFs.Write(sectorSizeBytes, 0, sectorSizeBytes.Length);
-            _mhddFs.Write(newLine, 0, 2);
-            _mhddFs.Write(scanBlockSizeBytes, 0, scanBlockSizeBytes.Length);
-            _mhddFs.Write(newLine, 0, 2);
+                break;
         }
 
-        /// <summary>Logs a new read</summary>
-        /// <param name="sector">Starting sector</param>
-        /// <param name="duration">Duration in milliseconds</param>
-        internal void Write(ulong sector, double duration)
-        {
-            if(_logFile == null)
-                return;
+        string device     = $"DEVICE: {dev.Manufacturer} {dev.Model}";
+        string fw         = $"F/W: {dev.FirmwareRevision}";
+        string sn         = $"S/N: {(@private ? "" : dev.Serial)}";
+        string sectors    = string.Format(new CultureInfo("en-US"), "SECTORS: {0:n0}", blocks);
+        string sectorSize = string.Format(new CultureInfo("en-US"), "SECTOR SIZE: {0:n0} bytes", blockSize);
 
-            byte[] sectorBytes   = BitConverter.GetBytes(sector);
-            byte[] durationBytes = BitConverter.GetBytes((ulong)(duration * 1000));
+        string scanBlockSize =
+            string.Format(new CultureInfo("en-US"), "SCAN BLOCK SIZE: {0:n0} sectors", blocksToRead);
 
-            _mhddFs.Write(sectorBytes, 0, 8);
-            _mhddFs.Write(durationBytes, 0, 8);
-        }
+        byte[] deviceBytes        = Encoding.ASCII.GetBytes(device);
+        byte[] modeBytes          = Encoding.ASCII.GetBytes(mode);
+        byte[] fwBytes            = Encoding.ASCII.GetBytes(fw);
+        byte[] snBytes            = Encoding.ASCII.GetBytes(sn);
+        byte[] sectorsBytes       = Encoding.ASCII.GetBytes(sectors);
+        byte[] sectorSizeBytes    = Encoding.ASCII.GetBytes(sectorSize);
+        byte[] scanBlockSizeBytes = Encoding.ASCII.GetBytes(scanBlockSize);
+        byte[] verBytes           = Encoding.ASCII.GetBytes(MHDD_VER);
 
-        /// <summary>Closes and writes to file the MHDD log</summary>
-        internal void Close()
-        {
-            if(_logFile == null)
-                return;
+        uint pointer = (uint)(deviceBytes.Length  + modeBytes.Length       + fwBytes.Length + snBytes.Length +
+                              sectorsBytes.Length + sectorSizeBytes.Length + scanBlockSizeBytes.Length +
+                              verBytes.Length     + (2 * 9)                + // New lines
+                              4);                                            // Pointer
 
-            var fs = new FileStream(_logFile, FileMode.Create);
-            _mhddFs.WriteTo(fs);
-            _mhddFs.Close();
-            fs.Close();
-        }
+        byte[] newLine = new byte[2];
+        newLine[0] = 0x0D;
+        newLine[1] = 0x0A;
+
+        _mhddFs.Write(BitConverter.GetBytes(pointer), 0, 4);
+        _mhddFs.Write(newLine, 0, 2);
+        _mhddFs.Write(verBytes, 0, verBytes.Length);
+        _mhddFs.Write(newLine, 0, 2);
+        _mhddFs.Write(modeBytes, 0, modeBytes.Length);
+        _mhddFs.Write(newLine, 0, 2);
+        _mhddFs.Write(deviceBytes, 0, deviceBytes.Length);
+        _mhddFs.Write(newLine, 0, 2);
+        _mhddFs.Write(fwBytes, 0, fwBytes.Length);
+        _mhddFs.Write(newLine, 0, 2);
+        _mhddFs.Write(snBytes, 0, snBytes.Length);
+        _mhddFs.Write(newLine, 0, 2);
+        _mhddFs.Write(sectorsBytes, 0, sectorsBytes.Length);
+        _mhddFs.Write(newLine, 0, 2);
+        _mhddFs.Write(sectorSizeBytes, 0, sectorSizeBytes.Length);
+        _mhddFs.Write(newLine, 0, 2);
+        _mhddFs.Write(scanBlockSizeBytes, 0, scanBlockSizeBytes.Length);
+        _mhddFs.Write(newLine, 0, 2);
+    }
+
+    /// <summary>Logs a new read</summary>
+    /// <param name="sector">Starting sector</param>
+    /// <param name="duration">Duration in milliseconds</param>
+    internal void Write(ulong sector, double duration)
+    {
+        if(_logFile == null)
+            return;
+
+        byte[] sectorBytes   = BitConverter.GetBytes(sector);
+        byte[] durationBytes = BitConverter.GetBytes((ulong)(duration * 1000));
+
+        _mhddFs.Write(sectorBytes, 0, 8);
+        _mhddFs.Write(durationBytes, 0, 8);
+    }
+
+    /// <summary>Closes and writes to file the MHDD log</summary>
+    internal void Close()
+    {
+        if(_logFile == null)
+            return;
+
+        var fs = new FileStream(_logFile, FileMode.Create);
+        _mhddFs.WriteTo(fs);
+        _mhddFs.Close();
+        fs.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Logging/SubchannelLog.cs b/Aaru.Core/Logging/SubchannelLog.cs
index 011ec1073..1ddb5fcda 100644
--- a/Aaru.Core/Logging/SubchannelLog.cs
+++ b/Aaru.Core/Logging/SubchannelLog.cs
@@ -30,267 +30,266 @@ using System;
 using System.IO;
 using Aaru.Decoders.CD;
 
-namespace Aaru.Core.Logging
+namespace Aaru.Core.Logging;
+
+/// <summary>Logs subchannel data</summary>
+public class SubchannelLog
 {
-    /// <summary>Logs subchannel data</summary>
-    public class SubchannelLog
+    const    int          SUB_SIZE = 96;
+    readonly bool         _bcd;
+    readonly StreamWriter _logSw;
+
+    /// <summary>Initializes the subchannel log</summary>
+    /// <param name="outputFile">Output log file</param>
+    /// <param name="bcd">Drive returns subchannel in BCD format</param>
+    public SubchannelLog(string outputFile, bool bcd)
     {
-        const    int          SUB_SIZE = 96;
-        readonly bool         _bcd;
-        readonly StreamWriter _logSw;
+        if(string.IsNullOrEmpty(outputFile))
+            return;
 
-        /// <summary>Initializes the subchannel log</summary>
-        /// <param name="outputFile">Output log file</param>
-        /// <param name="bcd">Drive returns subchannel in BCD format</param>
-        public SubchannelLog(string outputFile, bool bcd)
+        _bcd = bcd;
+
+        _logSw = new StreamWriter(outputFile, true);
+
+        _logSw.WriteLine("Start subchannel logging at {0}", DateTime.Now);
+        _logSw.WriteLine("######################################################");
+        _logSw.Flush();
+    }
+
+    /// <summary>Finishes and closes the subchannel log</summary>
+    public void Close()
+    {
+        _logSw.WriteLine("######################################################");
+        _logSw.WriteLine("End logging at {0}", DateTime.Now);
+        _logSw.Close();
+    }
+
+    /// <summary>Logs an entry to the subchannel log</summary>
+    /// <param name="subchannel">Subchannel data</param>
+    /// <param name="raw">Set to <c>true</c> if the subchannel data is raw</param>
+    /// <param name="startingLba">First LBA read from drive to retrieve the data</param>
+    /// <param name="blocks">Number of blocks read</param>
+    /// <param name="generated">Set to <c>true</c> if the subchannel has been generated, <c>false</c> if read from media</param>
+    /// <param name="fixed">Set to <c>true</c> if the subchannel has been fixed, <c>false</c> if as is</param>
+    public void WriteEntry(byte[] subchannel, bool raw, long startingLba, uint blocks, bool generated, bool @fixed)
+    {
+        if(subchannel.Length / SUB_SIZE != blocks)
         {
-            if(string.IsNullOrEmpty(outputFile))
-                return;
-
-            _bcd = bcd;
-
-            _logSw = new StreamWriter(outputFile, true);
-
-            _logSw.WriteLine("Start subchannel logging at {0}", DateTime.Now);
-            _logSw.WriteLine("######################################################");
+            _logSw.WriteLine("Data length is invalid!");
             _logSw.Flush();
+
+            return;
         }
 
-        /// <summary>Finishes and closes the subchannel log</summary>
-        public void Close()
+        int[] p = new int[subchannel.Length / 8];
+        int[] q = new int[subchannel.Length / 8];
+        int[] r = new int[subchannel.Length / 8];
+        int[] s = new int[subchannel.Length / 8];
+        int[] t = new int[subchannel.Length / 8];
+        int[] u = new int[subchannel.Length / 8];
+        int[] v = new int[subchannel.Length / 8];
+        int[] w = new int[subchannel.Length / 8];
+
+        for(int i = 0; i < subchannel.Length; i += 8)
         {
-            _logSw.WriteLine("######################################################");
-            _logSw.WriteLine("End logging at {0}", DateTime.Now);
-            _logSw.Close();
+            p[i / 8] =  subchannel[i] & 0x80;
+            p[i / 8] += (subchannel[i + 1] & 0x80) >> 1;
+            p[i / 8] += (subchannel[i + 2] & 0x80) >> 2;
+            p[i / 8] += (subchannel[i + 3] & 0x80) >> 3;
+            p[i / 8] += (subchannel[i + 4] & 0x80) >> 4;
+            p[i / 8] += (subchannel[i + 5] & 0x80) >> 5;
+            p[i / 8] += (subchannel[i + 6] & 0x80) >> 6;
+            p[i / 8] += (subchannel[i + 7] & 0x80) >> 7;
+
+            q[i / 8] =  (subchannel[i] & 0x40) << 1;
+            q[i / 8] += subchannel[i + 1] & 0x40;
+            q[i / 8] += (subchannel[i + 2] & 0x40) >> 1;
+            q[i / 8] += (subchannel[i + 3] & 0x40) >> 2;
+            q[i / 8] += (subchannel[i + 4] & 0x40) >> 3;
+            q[i / 8] += (subchannel[i + 5] & 0x40) >> 4;
+            q[i / 8] += (subchannel[i + 6] & 0x40) >> 5;
+            q[i / 8] += (subchannel[i + 7] & 0x40) >> 6;
+
+            r[i / 8] =  (subchannel[i]     & 0x20) << 2;
+            r[i / 8] += (subchannel[i + 1] & 0x20) << 1;
+            r[i / 8] += subchannel[i + 2] & 0x20;
+            r[i / 8] += (subchannel[i + 3] & 0x20) >> 1;
+            r[i / 8] += (subchannel[i + 4] & 0x20) >> 2;
+            r[i / 8] += (subchannel[i + 5] & 0x20) >> 3;
+            r[i / 8] += (subchannel[i + 6] & 0x20) >> 4;
+            r[i / 8] += (subchannel[i + 7] & 0x20) >> 5;
+
+            s[i / 8] =  (subchannel[i]     & 0x10) << 3;
+            s[i / 8] += (subchannel[i + 1] & 0x10) << 2;
+            s[i / 8] += (subchannel[i + 2] & 0x10) << 1;
+            s[i / 8] += subchannel[i + 3] & 0x10;
+            s[i / 8] += (subchannel[i + 4] & 0x10) >> 1;
+            s[i / 8] += (subchannel[i + 5] & 0x10) >> 2;
+            s[i / 8] += (subchannel[i + 6] & 0x10) >> 3;
+            s[i / 8] += (subchannel[i + 7] & 0x10) >> 4;
+
+            t[i / 8] =  (subchannel[i]     & 0x08) << 4;
+            t[i / 8] += (subchannel[i + 1] & 0x08) << 3;
+            t[i / 8] += (subchannel[i + 2] & 0x08) << 2;
+            t[i / 8] += (subchannel[i + 3] & 0x08) << 1;
+            t[i / 8] += subchannel[i + 4] & 0x08;
+            t[i / 8] += (subchannel[i + 5] & 0x08) >> 1;
+            t[i / 8] += (subchannel[i + 6] & 0x08) >> 2;
+            t[i / 8] += (subchannel[i + 7] & 0x08) >> 3;
+
+            u[i / 8] =  (subchannel[i]     & 0x04) << 5;
+            u[i / 8] += (subchannel[i + 1] & 0x04) << 4;
+            u[i / 8] += (subchannel[i + 2] & 0x04) << 3;
+            u[i / 8] += (subchannel[i + 3] & 0x04) << 2;
+            u[i / 8] += (subchannel[i + 4] & 0x04) << 1;
+            u[i / 8] += subchannel[i + 5] & 0x04;
+            u[i / 8] += (subchannel[i + 6] & 0x04) >> 1;
+            u[i / 8] += (subchannel[i + 7] & 0x04) >> 2;
+
+            v[i / 8] =  (subchannel[i]     & 0x02) << 6;
+            v[i / 8] += (subchannel[i + 1] & 0x02) << 5;
+            v[i / 8] += (subchannel[i + 2] & 0x02) << 4;
+            v[i / 8] += (subchannel[i + 3] & 0x02) << 3;
+            v[i / 8] += (subchannel[i + 4] & 0x02) << 2;
+            v[i / 8] += (subchannel[i + 5] & 0x02) << 1;
+            v[i / 8] += subchannel[i + 6] & 0x02;
+            v[i / 8] += (subchannel[i + 7] & 0x02) >> 1;
+
+            w[i / 8] =  (subchannel[i]     & 0x01) << 7;
+            w[i / 8] += (subchannel[i + 1] & 0x01) << 6;
+            w[i / 8] += (subchannel[i + 2] & 0x01) << 5;
+            w[i / 8] += (subchannel[i + 3] & 0x01) << 4;
+            w[i / 8] += (subchannel[i + 4] & 0x01) << 3;
+            w[i / 8] += (subchannel[i + 5] & 0x01) << 2;
+            w[i / 8] += (subchannel[i + 6] & 0x01) << 1;
+            w[i / 8] += subchannel[i + 7] & 0x01;
         }
 
-        /// <summary>Logs an entry to the subchannel log</summary>
-        /// <param name="subchannel">Subchannel data</param>
-        /// <param name="raw">Set to <c>true</c> if the subchannel data is raw</param>
-        /// <param name="startingLba">First LBA read from drive to retrieve the data</param>
-        /// <param name="blocks">Number of blocks read</param>
-        /// <param name="generated">Set to <c>true</c> if the subchannel has been generated, <c>false</c> if read from media</param>
-        /// <param name="fixed">Set to <c>true</c> if the subchannel has been fixed, <c>false</c> if as is</param>
-        public void WriteEntry(byte[] subchannel, bool raw, long startingLba, uint blocks, bool generated, bool @fixed)
+        for(uint block = 0; block < blocks; block++)
         {
-            if(subchannel.Length / SUB_SIZE != blocks)
-            {
-                _logSw.WriteLine("Data length is invalid!");
-                _logSw.Flush();
+            bool rwEmpty = true;
 
-                return;
-            }
-
-            int[] p = new int[subchannel.Length / 8];
-            int[] q = new int[subchannel.Length / 8];
-            int[] r = new int[subchannel.Length / 8];
-            int[] s = new int[subchannel.Length / 8];
-            int[] t = new int[subchannel.Length / 8];
-            int[] u = new int[subchannel.Length / 8];
-            int[] v = new int[subchannel.Length / 8];
-            int[] w = new int[subchannel.Length / 8];
-
-            for(int i = 0; i < subchannel.Length; i += 8)
-            {
-                p[i / 8] =  subchannel[i] & 0x80;
-                p[i / 8] += (subchannel[i + 1] & 0x80) >> 1;
-                p[i / 8] += (subchannel[i + 2] & 0x80) >> 2;
-                p[i / 8] += (subchannel[i + 3] & 0x80) >> 3;
-                p[i / 8] += (subchannel[i + 4] & 0x80) >> 4;
-                p[i / 8] += (subchannel[i + 5] & 0x80) >> 5;
-                p[i / 8] += (subchannel[i + 6] & 0x80) >> 6;
-                p[i / 8] += (subchannel[i + 7] & 0x80) >> 7;
-
-                q[i / 8] =  (subchannel[i] & 0x40) << 1;
-                q[i / 8] += subchannel[i + 1] & 0x40;
-                q[i / 8] += (subchannel[i + 2] & 0x40) >> 1;
-                q[i / 8] += (subchannel[i + 3] & 0x40) >> 2;
-                q[i / 8] += (subchannel[i + 4] & 0x40) >> 3;
-                q[i / 8] += (subchannel[i + 5] & 0x40) >> 4;
-                q[i / 8] += (subchannel[i + 6] & 0x40) >> 5;
-                q[i / 8] += (subchannel[i + 7] & 0x40) >> 6;
-
-                r[i / 8] =  (subchannel[i]     & 0x20) << 2;
-                r[i / 8] += (subchannel[i + 1] & 0x20) << 1;
-                r[i / 8] += subchannel[i + 2] & 0x20;
-                r[i / 8] += (subchannel[i + 3] & 0x20) >> 1;
-                r[i / 8] += (subchannel[i + 4] & 0x20) >> 2;
-                r[i / 8] += (subchannel[i + 5] & 0x20) >> 3;
-                r[i / 8] += (subchannel[i + 6] & 0x20) >> 4;
-                r[i / 8] += (subchannel[i + 7] & 0x20) >> 5;
-
-                s[i / 8] =  (subchannel[i]     & 0x10) << 3;
-                s[i / 8] += (subchannel[i + 1] & 0x10) << 2;
-                s[i / 8] += (subchannel[i + 2] & 0x10) << 1;
-                s[i / 8] += subchannel[i + 3] & 0x10;
-                s[i / 8] += (subchannel[i + 4] & 0x10) >> 1;
-                s[i / 8] += (subchannel[i + 5] & 0x10) >> 2;
-                s[i / 8] += (subchannel[i + 6] & 0x10) >> 3;
-                s[i / 8] += (subchannel[i + 7] & 0x10) >> 4;
-
-                t[i / 8] =  (subchannel[i]     & 0x08) << 4;
-                t[i / 8] += (subchannel[i + 1] & 0x08) << 3;
-                t[i / 8] += (subchannel[i + 2] & 0x08) << 2;
-                t[i / 8] += (subchannel[i + 3] & 0x08) << 1;
-                t[i / 8] += subchannel[i + 4] & 0x08;
-                t[i / 8] += (subchannel[i + 5] & 0x08) >> 1;
-                t[i / 8] += (subchannel[i + 6] & 0x08) >> 2;
-                t[i / 8] += (subchannel[i + 7] & 0x08) >> 3;
-
-                u[i / 8] =  (subchannel[i]     & 0x04) << 5;
-                u[i / 8] += (subchannel[i + 1] & 0x04) << 4;
-                u[i / 8] += (subchannel[i + 2] & 0x04) << 3;
-                u[i / 8] += (subchannel[i + 3] & 0x04) << 2;
-                u[i / 8] += (subchannel[i + 4] & 0x04) << 1;
-                u[i / 8] += subchannel[i + 5] & 0x04;
-                u[i / 8] += (subchannel[i + 6] & 0x04) >> 1;
-                u[i / 8] += (subchannel[i + 7] & 0x04) >> 2;
-
-                v[i / 8] =  (subchannel[i]     & 0x02) << 6;
-                v[i / 8] += (subchannel[i + 1] & 0x02) << 5;
-                v[i / 8] += (subchannel[i + 2] & 0x02) << 4;
-                v[i / 8] += (subchannel[i + 3] & 0x02) << 3;
-                v[i / 8] += (subchannel[i + 4] & 0x02) << 2;
-                v[i / 8] += (subchannel[i + 5] & 0x02) << 1;
-                v[i / 8] += subchannel[i + 6] & 0x02;
-                v[i / 8] += (subchannel[i + 7] & 0x02) >> 1;
-
-                w[i / 8] =  (subchannel[i]     & 0x01) << 7;
-                w[i / 8] += (subchannel[i + 1] & 0x01) << 6;
-                w[i / 8] += (subchannel[i + 2] & 0x01) << 5;
-                w[i / 8] += (subchannel[i + 3] & 0x01) << 4;
-                w[i / 8] += (subchannel[i + 4] & 0x01) << 3;
-                w[i / 8] += (subchannel[i + 5] & 0x01) << 2;
-                w[i / 8] += (subchannel[i + 6] & 0x01) << 1;
-                w[i / 8] += subchannel[i + 7] & 0x01;
-            }
-
-            for(uint block = 0; block < blocks; block++)
-            {
-                bool rwEmpty = true;
-
-                if(raw)
-                    for(uint i = 12 * block; i < (12 * block) + 12; i++)
-                    {
-                        if((r[i] == 0 && s[i] == 0 && t[i] == 0 && u[i] == 0 && v[i] == 0 && w[i] == 0) ||
-                           (r[i] == 0xFF && s[i] == 0xFF && t[i] == 0xFF && u[i] == 0xFF && v[i] == 0xFF &&
-                            w[i] == 0xFF))
-                            continue;
-
-                        rwEmpty = false;
-
-                        break;
-                    }
-
-                bool corruptedPause = false;
-                bool pause          = false;
-
-                for(int i = 0; i < 12; i++)
+            if(raw)
+                for(uint i = 12 * block; i < (12 * block) + 12; i++)
                 {
-                    if(p[i] == 0 ||
-                       p[i] == 0xFF)
+                    if((r[i] == 0 && s[i] == 0 && t[i] == 0 && u[i] == 0 && v[i] == 0 && w[i] == 0) ||
+                       (r[i] == 0xFF && s[i] == 0xFF && t[i] == 0xFF && u[i] == 0xFF && v[i] == 0xFF &&
+                        w[i] == 0xFF))
                         continue;
 
-                    corruptedPause = true;
+                    rwEmpty = false;
 
                     break;
                 }
 
-                if(!corruptedPause)
-                    pause = p[0] == 1;
+            bool corruptedPause = false;
+            bool pause          = false;
 
-                byte[] subBuf = new byte[12];
-                subBuf[0]  = (byte)q[0  + (block * 12)];
-                subBuf[1]  = (byte)q[1  + (block * 12)];
-                subBuf[2]  = (byte)q[2  + (block * 12)];
-                subBuf[3]  = (byte)q[3  + (block * 12)];
-                subBuf[4]  = (byte)q[4  + (block * 12)];
-                subBuf[5]  = (byte)q[5  + (block * 12)];
-                subBuf[6]  = (byte)q[6  + (block * 12)];
-                subBuf[7]  = (byte)q[7  + (block * 12)];
-                subBuf[8]  = (byte)q[8  + (block * 12)];
-                subBuf[9]  = (byte)q[9  + (block * 12)];
-                subBuf[10] = (byte)q[10 + (block * 12)];
-                subBuf[11] = (byte)q[11 + (block * 12)];
+            for(int i = 0; i < 12; i++)
+            {
+                if(p[i] == 0 ||
+                   p[i] == 0xFF)
+                    continue;
 
-                string prettyQ = Subchannel.PrettifyQ(subBuf, generated || _bcd, startingLba + block, corruptedPause,
-                                                      pause, rwEmpty);
+                corruptedPause = true;
 
-                if(generated)
-                    prettyQ += " (GENERATED)";
-                else if(@fixed)
-                    prettyQ += " (FIXED)";
-
-                _logSw.WriteLine(prettyQ);
+                break;
             }
 
-            _logSw.Flush();
+            if(!corruptedPause)
+                pause = p[0] == 1;
+
+            byte[] subBuf = new byte[12];
+            subBuf[0]  = (byte)q[0  + (block * 12)];
+            subBuf[1]  = (byte)q[1  + (block * 12)];
+            subBuf[2]  = (byte)q[2  + (block * 12)];
+            subBuf[3]  = (byte)q[3  + (block * 12)];
+            subBuf[4]  = (byte)q[4  + (block * 12)];
+            subBuf[5]  = (byte)q[5  + (block * 12)];
+            subBuf[6]  = (byte)q[6  + (block * 12)];
+            subBuf[7]  = (byte)q[7  + (block * 12)];
+            subBuf[8]  = (byte)q[8  + (block * 12)];
+            subBuf[9]  = (byte)q[9  + (block * 12)];
+            subBuf[10] = (byte)q[10 + (block * 12)];
+            subBuf[11] = (byte)q[11 + (block * 12)];
+
+            string prettyQ = Subchannel.PrettifyQ(subBuf, generated || _bcd, startingLba + block, corruptedPause,
+                                                  pause, rwEmpty);
+
+            if(generated)
+                prettyQ += " (GENERATED)";
+            else if(@fixed)
+                prettyQ += " (FIXED)";
+
+            _logSw.WriteLine(prettyQ);
         }
 
-        /// <summary>Logs message indicating the P subchannel has been fixed</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WritePFix(long lba) => WriteMessageWithPosition(lba, "fixed P subchannel using weight average.");
+        _logSw.Flush();
+    }
 
-        /// <summary>Logs message indicating the R-W subchannels have been fixed</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteRwFix(long lba) => WriteMessageWithPosition(lba, "fixed R-W subchannels writing empty data.");
+    /// <summary>Logs message indicating the P subchannel has been fixed</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WritePFix(long lba) => WriteMessageWithPosition(lba, "fixed P subchannel using weight average.");
 
-        /// <summary>Logs message indicating the ADR field of the Q subchannel has been fixed</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteQAdrFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with correct ADR.");
+    /// <summary>Logs message indicating the R-W subchannels have been fixed</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteRwFix(long lba) => WriteMessageWithPosition(lba, "fixed R-W subchannels writing empty data.");
 
-        /// <summary>Logs message indicating the CONTROL field of the Q subchannel has been fixed</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteQCtrlFix(long lba) =>
-            WriteMessageWithPosition(lba, "fixed Q subchannel with correct CONTROL.");
+    /// <summary>Logs message indicating the ADR field of the Q subchannel has been fixed</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteQAdrFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with correct ADR.");
 
-        /// <summary>Logs message indicating the ZERO field of the Q subchannel has been fixed</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteQZeroFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with correct ZERO.");
+    /// <summary>Logs message indicating the CONTROL field of the Q subchannel has been fixed</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteQCtrlFix(long lba) =>
+        WriteMessageWithPosition(lba, "fixed Q subchannel with correct CONTROL.");
 
-        /// <summary>Logs message indicating the TNO field of the Q subchannel has been fixed</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteQTnoFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with correct TNO.");
+    /// <summary>Logs message indicating the ZERO field of the Q subchannel has been fixed</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteQZeroFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with correct ZERO.");
 
-        /// <summary>Logs message indicating the INDEX field of the Q subchannel has been fixed</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteQIndexFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with correct INDEX.");
+    /// <summary>Logs message indicating the TNO field of the Q subchannel has been fixed</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteQTnoFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with correct TNO.");
 
-        /// <summary>Logs message indicating the relative position of the Q subchannel has been fixed</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteQRelPosFix(long lba) =>
-            WriteMessageWithPosition(lba, "fixed Q subchannel with correct RELATIVE POSITION.");
+    /// <summary>Logs message indicating the INDEX field of the Q subchannel has been fixed</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteQIndexFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with correct INDEX.");
 
-        /// <summary>Logs message indicating the absolute position of the Q subchannel has been fixed</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteQAbsPosFix(long lba) =>
-            WriteMessageWithPosition(lba, "fixed Q subchannel with correct ABSOLUTE POSITION.");
+    /// <summary>Logs message indicating the relative position of the Q subchannel has been fixed</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteQRelPosFix(long lba) =>
+        WriteMessageWithPosition(lba, "fixed Q subchannel with correct RELATIVE POSITION.");
 
-        /// <summary>Logs message indicating the CRC of the Q subchannel has been fixed</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteQCrcFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with correct CRC.");
+    /// <summary>Logs message indicating the absolute position of the Q subchannel has been fixed</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteQAbsPosFix(long lba) =>
+        WriteMessageWithPosition(lba, "fixed Q subchannel with correct ABSOLUTE POSITION.");
 
-        /// <summary>Logs message indicating the the Q subchannel has been fixed with a known good MCN</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteQMcnFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with known good MCN.");
+    /// <summary>Logs message indicating the CRC of the Q subchannel has been fixed</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteQCrcFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with correct CRC.");
 
-        /// <summary>Logs message indicating the the Q subchannel has been fixed with a known good ISRC</summary>
-        /// <param name="lba">LBA fix belongs to</param>
-        public void WriteQIsrcFix(long lba) =>
-            WriteMessageWithPosition(lba, "fixed Q subchannel with known good ISRC.");
+    /// <summary>Logs message indicating the the Q subchannel has been fixed with a known good MCN</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteQMcnFix(long lba) => WriteMessageWithPosition(lba, "fixed Q subchannel with known good MCN.");
 
-        /// <summary>Logs a message with a specified position</summary>
-        /// <param name="lba">LBA position</param>
-        /// <param name="message">Message to log</param>
-        public void WriteMessageWithPosition(long lba, string message)
-        {
-            long   minute = (lba + 150)        / 4500;
-            long   second = (lba + 150) % 4500 / 75;
-            long   frame  = (lba + 150)        % 4500 % 75;
-            string area   = lba < 0 ? "Lead-In" : "Program";
+    /// <summary>Logs message indicating the the Q subchannel has been fixed with a known good ISRC</summary>
+    /// <param name="lba">LBA fix belongs to</param>
+    public void WriteQIsrcFix(long lba) =>
+        WriteMessageWithPosition(lba, "fixed Q subchannel with known good ISRC.");
 
-            _logSw.WriteLine($"{minute:D2}:{second:D2}:{frame:D2} - LBA {lba,6}: {area} area, {message}");
-            _logSw.Flush();
-        }
+    /// <summary>Logs a message with a specified position</summary>
+    /// <param name="lba">LBA position</param>
+    /// <param name="message">Message to log</param>
+    public void WriteMessageWithPosition(long lba, string message)
+    {
+        long   minute = (lba + 150)        / 4500;
+        long   second = (lba + 150) % 4500 / 75;
+        long   frame  = (lba + 150)        % 4500 % 75;
+        string area   = lba < 0 ? "Lead-In" : "Program";
+
+        _logSw.WriteLine($"{minute:D2}:{second:D2}:{frame:D2} - LBA {lba,6}: {area} area, {message}");
+        _logSw.Flush();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Media/CompactDisc.cs b/Aaru.Core/Media/CompactDisc.cs
index c5a436af6..cb43a055d 100644
--- a/Aaru.Core/Media/CompactDisc.cs
+++ b/Aaru.Core/Media/CompactDisc.cs
@@ -39,416 +39,395 @@ using Aaru.Decoders.CD;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Core.Media
+namespace Aaru.Core.Media;
+
+/// <summary>Operations over CD based media</summary>
+public static class CompactDisc
 {
-    /// <summary>Operations over CD based media</summary>
-    public static class CompactDisc
+    /// <summary>Writes subchannel data to an image</summary>
+    /// <param name="supportedSubchannel">Subchannel read by drive</param>
+    /// <param name="desiredSubchannel">Subchannel user wants written to image</param>
+    /// <param name="sub">Subchannel data</param>
+    /// <param name="sectorAddress">Starting sector</param>
+    /// <param name="length">How many sectors were read</param>
+    /// <param name="subLog">Subchannel log</param>
+    /// <param name="isrcs">List of ISRCs</param>
+    /// <param name="currentTrack">Current track number</param>
+    /// <param name="mcn">Disc's MCN</param>
+    /// <param name="tracks">List of tracks</param>
+    /// <param name="subchannelExtents">List of subchannel extents</param>
+    /// <param name="fixSubchannelPosition">If we want to fix subchannel position</param>
+    /// <param name="outputPlugin">Output image</param>
+    /// <param name="fixSubchannel">If we want to fix subchannel contents</param>
+    /// <param name="fixSubchannelCrc">If we want to fix Q subchannel CRC if the contents look sane</param>
+    /// <param name="dumpLog">Dumping log</param>
+    /// <param name="updateStatus">Status update callback</param>
+    /// <param name="smallestPregapLbaPerTrack">List of smallest known pregap per track</param>
+    /// <param name="dumping">Set if we are dumping, otherwise converting</param>
+    /// <returns><c>true</c> if indexes have changed, <c>false</c> otherwise</returns>
+    public static bool WriteSubchannelToImage(MmcSubchannel supportedSubchannel, MmcSubchannel desiredSubchannel,
+                                              byte[] sub, ulong sectorAddress, uint length, SubchannelLog subLog,
+                                              Dictionary<byte, string> isrcs, byte currentTrack, ref string mcn,
+                                              Track[] tracks, HashSet<int> subchannelExtents,
+                                              bool fixSubchannelPosition, IWritableOpticalImage outputPlugin,
+                                              bool fixSubchannel, bool fixSubchannelCrc, DumpLog dumpLog,
+                                              UpdateStatusHandler updateStatus,
+                                              Dictionary<byte, int> smallestPregapLbaPerTrack, bool dumping)
     {
-        /// <summary>Writes subchannel data to an image</summary>
-        /// <param name="supportedSubchannel">Subchannel read by drive</param>
-        /// <param name="desiredSubchannel">Subchannel user wants written to image</param>
-        /// <param name="sub">Subchannel data</param>
-        /// <param name="sectorAddress">Starting sector</param>
-        /// <param name="length">How many sectors were read</param>
-        /// <param name="subLog">Subchannel log</param>
-        /// <param name="isrcs">List of ISRCs</param>
-        /// <param name="currentTrack">Current track number</param>
-        /// <param name="mcn">Disc's MCN</param>
-        /// <param name="tracks">List of tracks</param>
-        /// <param name="subchannelExtents">List of subchannel extents</param>
-        /// <param name="fixSubchannelPosition">If we want to fix subchannel position</param>
-        /// <param name="outputPlugin">Output image</param>
-        /// <param name="fixSubchannel">If we want to fix subchannel contents</param>
-        /// <param name="fixSubchannelCrc">If we want to fix Q subchannel CRC if the contents look sane</param>
-        /// <param name="dumpLog">Dumping log</param>
-        /// <param name="updateStatus">Status update callback</param>
-        /// <param name="smallestPregapLbaPerTrack">List of smallest known pregap per track</param>
-        /// <param name="dumping">Set if we are dumping, otherwise converting</param>
-        /// <returns><c>true</c> if indexes have changed, <c>false</c> otherwise</returns>
-        public static bool WriteSubchannelToImage(MmcSubchannel supportedSubchannel, MmcSubchannel desiredSubchannel,
-                                                  byte[] sub, ulong sectorAddress, uint length, SubchannelLog subLog,
-                                                  Dictionary<byte, string> isrcs, byte currentTrack, ref string mcn,
-                                                  Track[] tracks, HashSet<int> subchannelExtents,
-                                                  bool fixSubchannelPosition, IWritableOpticalImage outputPlugin,
-                                                  bool fixSubchannel, bool fixSubchannelCrc, DumpLog dumpLog,
-                                                  UpdateStatusHandler updateStatus,
-                                                  Dictionary<byte, int> smallestPregapLbaPerTrack, bool dumping)
+        // We need to work in PW raw subchannels
+        if(supportedSubchannel == MmcSubchannel.Q16)
+            sub = Subchannel.ConvertQToRaw(sub);
+
+        // If not desired to fix, or to save, the subchannel, just save as is (or none)
+        if(!fixSubchannelPosition &&
+           desiredSubchannel != MmcSubchannel.None)
+            outputPlugin.WriteSectorsTag(sub, sectorAddress, length, SectorTagType.CdSectorSubchannel);
+
+        subLog?.WriteEntry(sub, supportedSubchannel == MmcSubchannel.Raw, (long)sectorAddress, length, false,
+                           false);
+
+        byte[] deSub = Subchannel.Deinterleave(sub);
+
+        bool indexesChanged = CheckIndexesFromSubchannel(deSub, isrcs, currentTrack, ref mcn, tracks, dumpLog,
+                                                         updateStatus, smallestPregapLbaPerTrack, dumping);
+
+        if(!fixSubchannelPosition ||
+           desiredSubchannel == MmcSubchannel.None)
+            return indexesChanged;
+
+        int prePos = int.MinValue;
+
+        // Check subchannel
+        for(int subPos = 0; subPos < deSub.Length; subPos += 96)
         {
-            // We need to work in PW raw subchannels
-            if(supportedSubchannel == MmcSubchannel.Q16)
-                sub = Subchannel.ConvertQToRaw(sub);
+            // Expected LBA
+            long lba = (long)sectorAddress + (subPos / 96);
 
-            // If not desired to fix, or to save, the subchannel, just save as is (or none)
-            if(!fixSubchannelPosition &&
-               desiredSubchannel != MmcSubchannel.None)
-                outputPlugin.WriteSectorsTag(sub, sectorAddress, length, SectorTagType.CdSectorSubchannel);
+            // We fixed the subchannel
+            bool @fixed = false;
 
-            subLog?.WriteEntry(sub, supportedSubchannel == MmcSubchannel.Raw, (long)sectorAddress, length, false,
-                               false);
+            byte[] q = new byte[12];
+            Array.Copy(deSub, subPos + 12, q, 0, 12);
 
-            byte[] deSub = Subchannel.Deinterleave(sub);
+            // Check Q CRC
+            CRC16CCITTContext.Data(q, 10, out byte[] crc);
+            bool crcOk = crc[0] == q[10] && crc[1] == q[11];
 
-            bool indexesChanged = CheckIndexesFromSubchannel(deSub, isrcs, currentTrack, ref mcn, tracks, dumpLog,
-                                                             updateStatus, smallestPregapLbaPerTrack, dumping);
+            // Start considering P to be OK
+            bool pOk     = true;
+            int  pWeight = 0;
 
-            if(!fixSubchannelPosition ||
-               desiredSubchannel == MmcSubchannel.None)
-                return indexesChanged;
-
-            int prePos = int.MinValue;
-
-            // Check subchannel
-            for(int subPos = 0; subPos < deSub.Length; subPos += 96)
+            // Check P and weight
+            for(int p = subPos; p < subPos + 12; p++)
             {
-                // Expected LBA
-                long lba = (long)sectorAddress + (subPos / 96);
+                if(deSub[p] != 0 &&
+                   deSub[p] != 255)
+                    pOk = false;
 
-                // We fixed the subchannel
-                bool @fixed = false;
-
-                byte[] q = new byte[12];
-                Array.Copy(deSub, subPos + 12, q, 0, 12);
-
-                // Check Q CRC
-                CRC16CCITTContext.Data(q, 10, out byte[] crc);
-                bool crcOk = crc[0] == q[10] && crc[1] == q[11];
-
-                // Start considering P to be OK
-                bool pOk     = true;
-                int  pWeight = 0;
-
-                // Check P and weight
-                for(int p = subPos; p < subPos + 12; p++)
-                {
-                    if(deSub[p] != 0 &&
-                       deSub[p] != 255)
-                        pOk = false;
-
-                    for(int w = 0; w < 8; w++)
-                        if(((deSub[p] >> w) & 1) > 0)
-                            pWeight++;
-                }
-
-                // This seems to be a somewhat common pattern
-                bool rOk = deSub.Skip(subPos + 24).Take(12).All(r => r == 0x00) ||
-                           deSub.Skip(subPos + 24).Take(12).All(r => r == 0xFF);
-
-                bool sOk = deSub.Skip(subPos + 36).Take(12).All(s => s == 0x00) ||
-                           deSub.Skip(subPos + 36).Take(12).All(s => s == 0xFF);
-
-                bool tOk = deSub.Skip(subPos + 48).Take(12).All(t => t == 0x00) ||
-                           deSub.Skip(subPos + 48).Take(12).All(t => t == 0xFF);
-
-                bool uOk = deSub.Skip(subPos + 60).Take(12).All(u => u == 0x00) ||
-                           deSub.Skip(subPos + 60).Take(12).All(u => u == 0xFF);
-
-                bool vOk = deSub.Skip(subPos + 72).Take(12).All(v => v == 0x00) ||
-                           deSub.Skip(subPos + 72).Take(12).All(v => v == 0xFF);
-
-                bool wOk = deSub.Skip(subPos + 84).Take(12).All(w => w == 0x00) ||
-                           deSub.Skip(subPos + 84).Take(12).All(w => w == 0xFF);
-
-                bool rwOk         = rOk && sOk && tOk && uOk && vOk && wOk;
-                bool rwPacket     = false;
-                bool cdtextPacket = false;
-
-                // Check RW contents
-                if(!rwOk)
-                {
-                    byte[] sectorSub = new byte[96];
-                    Array.Copy(sub, subPos, sectorSub, 0, 96);
-
-                    DetectRwPackets(sectorSub, out _, out rwPacket, out cdtextPacket);
-
-                    // TODO: CD+G reed solomon
-                    if(rwPacket && !cdtextPacket)
-                        rwOk = true;
-
-                    if(cdtextPacket)
-                        rwOk = CheckCdTextPackets(sectorSub);
-                }
-
-                // Fix P
-                if(!pOk && fixSubchannel)
-                {
-                    if(pWeight >= 48)
-                        for(int p = subPos; p < subPos + 12; p++)
-                            deSub[p] = 255;
-                    else
-                        for(int p = subPos; p < subPos + 12; p++)
-                            deSub[p] = 0;
-
-                    pOk    = true;
-                    @fixed = true;
-
-                    subLog?.WritePFix(lba);
-                }
-
-                // RW is not a known pattern or packet, fix it
-                if(!rwOk         &&
-                   !rwPacket     &&
-                   !cdtextPacket &&
-                   fixSubchannel)
-                {
-                    for(int rw = subPos + 24; rw < subPos + 96; rw++)
-                        deSub[rw] = 0;
-
-                    rwOk   = true;
-                    @fixed = true;
-
-                    subLog.WriteRwFix(lba);
-                }
-
-                byte smin, ssec, amin, asec, aframe;
-                int  aPos;
-
-                // Fix Q
-                if(!crcOk        &&
-                   fixSubchannel &&
-                   subPos > 0    &&
-                   subPos < deSub.Length - 96)
-                {
-                    isrcs.TryGetValue(currentTrack, out string knownGoodIsrc);
-
-                    crcOk = FixQSubchannel(deSub, q, subPos, mcn, knownGoodIsrc, fixSubchannelCrc, out bool fixedAdr,
-                                           out bool controlFix, out bool fixedZero, out bool fixedTno,
-                                           out bool fixedIndex, out bool fixedRelPos, out bool fixedAbsPos,
-                                           out bool fixedCrc, out bool fixedMcn, out bool fixedIsrc);
-
-                    if(crcOk)
-                    {
-                        Array.Copy(q, 0, deSub, subPos + 12, 12);
-                        @fixed = true;
-
-                        if(fixedAdr)
-                            subLog?.WriteQAdrFix(lba);
-
-                        if(controlFix)
-                            subLog?.WriteQCtrlFix(lba);
-
-                        if(fixedZero)
-                            subLog?.WriteQZeroFix(lba);
-
-                        if(fixedTno)
-                            subLog?.WriteQTnoFix(lba);
-
-                        if(fixedIndex)
-                            subLog?.WriteQIndexFix(lba);
-
-                        if(fixedRelPos)
-                            subLog?.WriteQRelPosFix(lba);
-
-                        if(fixedAbsPos)
-                            subLog?.WriteQAbsPosFix(lba);
-
-                        if(fixedCrc)
-                            subLog?.WriteQCrcFix(lba);
-
-                        if(fixedMcn)
-                            subLog?.WriteQMcnFix(lba);
-
-                        if(fixedIsrc)
-                            subLog?.WriteQIsrcFix(lba);
-                    }
-                }
-
-                if(!pOk   ||
-                   !crcOk ||
-                   !rwOk)
-                    continue;
-
-                aframe = (byte)((q[9] / 16 * 10) + (q[9] & 0x0F));
-
-                if((q[0] & 0x3) == 1)
-                {
-                    amin = (byte)((q[7] / 16 * 10) + (q[7] & 0x0F));
-                    asec = (byte)((q[8] / 16 * 10) + (q[8] & 0x0F));
-                    aPos = (amin * 60 * 75) + (asec * 75) + aframe - 150;
-                }
-                else
-                {
-                    ulong expectedSectorAddress = sectorAddress + (ulong)(subPos / 96) + 150;
-                    smin                  =  (byte)(expectedSectorAddress / 60 / 75);
-                    expectedSectorAddress -= (ulong)(smin                 * 60 * 75);
-                    ssec                  =  (byte)(expectedSectorAddress / 75);
-
-                    aPos = (smin * 60 * 75) + (ssec * 75) + aframe - 150;
-
-                    // Next second
-                    if(aPos < prePos)
-                        aPos += 75;
-                }
-
-                // TODO: Negative sectors
-                if(aPos < 0)
-                    continue;
-
-                prePos = aPos;
-
-                byte[] posSub = new byte[96];
-                Array.Copy(deSub, subPos, posSub, 0, 96);
-                posSub = Subchannel.Interleave(posSub);
-                outputPlugin.WriteSectorTag(posSub, (ulong)aPos, SectorTagType.CdSectorSubchannel);
-
-                subchannelExtents.Remove(aPos);
-
-                if(@fixed)
-                    subLog?.WriteEntry(posSub, supportedSubchannel == MmcSubchannel.Raw, lba, 1, false, true);
+                for(int w = 0; w < 8; w++)
+                    if(((deSub[p] >> w) & 1) > 0)
+                        pWeight++;
             }
 
-            return indexesChanged;
+            // This seems to be a somewhat common pattern
+            bool rOk = deSub.Skip(subPos + 24).Take(12).All(r => r == 0x00) ||
+                       deSub.Skip(subPos + 24).Take(12).All(r => r == 0xFF);
+
+            bool sOk = deSub.Skip(subPos + 36).Take(12).All(s => s == 0x00) ||
+                       deSub.Skip(subPos + 36).Take(12).All(s => s == 0xFF);
+
+            bool tOk = deSub.Skip(subPos + 48).Take(12).All(t => t == 0x00) ||
+                       deSub.Skip(subPos + 48).Take(12).All(t => t == 0xFF);
+
+            bool uOk = deSub.Skip(subPos + 60).Take(12).All(u => u == 0x00) ||
+                       deSub.Skip(subPos + 60).Take(12).All(u => u == 0xFF);
+
+            bool vOk = deSub.Skip(subPos + 72).Take(12).All(v => v == 0x00) ||
+                       deSub.Skip(subPos + 72).Take(12).All(v => v == 0xFF);
+
+            bool wOk = deSub.Skip(subPos + 84).Take(12).All(w => w == 0x00) ||
+                       deSub.Skip(subPos + 84).Take(12).All(w => w == 0xFF);
+
+            bool rwOk         = rOk && sOk && tOk && uOk && vOk && wOk;
+            bool rwPacket     = false;
+            bool cdtextPacket = false;
+
+            // Check RW contents
+            if(!rwOk)
+            {
+                byte[] sectorSub = new byte[96];
+                Array.Copy(sub, subPos, sectorSub, 0, 96);
+
+                DetectRwPackets(sectorSub, out _, out rwPacket, out cdtextPacket);
+
+                // TODO: CD+G reed solomon
+                if(rwPacket && !cdtextPacket)
+                    rwOk = true;
+
+                if(cdtextPacket)
+                    rwOk = CheckCdTextPackets(sectorSub);
+            }
+
+            // Fix P
+            if(!pOk && fixSubchannel)
+            {
+                if(pWeight >= 48)
+                    for(int p = subPos; p < subPos + 12; p++)
+                        deSub[p] = 255;
+                else
+                    for(int p = subPos; p < subPos + 12; p++)
+                        deSub[p] = 0;
+
+                pOk    = true;
+                @fixed = true;
+
+                subLog?.WritePFix(lba);
+            }
+
+            // RW is not a known pattern or packet, fix it
+            if(!rwOk         &&
+               !rwPacket     &&
+               !cdtextPacket &&
+               fixSubchannel)
+            {
+                for(int rw = subPos + 24; rw < subPos + 96; rw++)
+                    deSub[rw] = 0;
+
+                rwOk   = true;
+                @fixed = true;
+
+                subLog.WriteRwFix(lba);
+            }
+
+            byte smin, ssec, amin, asec, aframe;
+            int  aPos;
+
+            // Fix Q
+            if(!crcOk        &&
+               fixSubchannel &&
+               subPos > 0    &&
+               subPos < deSub.Length - 96)
+            {
+                isrcs.TryGetValue(currentTrack, out string knownGoodIsrc);
+
+                crcOk = FixQSubchannel(deSub, q, subPos, mcn, knownGoodIsrc, fixSubchannelCrc, out bool fixedAdr,
+                                       out bool controlFix, out bool fixedZero, out bool fixedTno,
+                                       out bool fixedIndex, out bool fixedRelPos, out bool fixedAbsPos,
+                                       out bool fixedCrc, out bool fixedMcn, out bool fixedIsrc);
+
+                if(crcOk)
+                {
+                    Array.Copy(q, 0, deSub, subPos + 12, 12);
+                    @fixed = true;
+
+                    if(fixedAdr)
+                        subLog?.WriteQAdrFix(lba);
+
+                    if(controlFix)
+                        subLog?.WriteQCtrlFix(lba);
+
+                    if(fixedZero)
+                        subLog?.WriteQZeroFix(lba);
+
+                    if(fixedTno)
+                        subLog?.WriteQTnoFix(lba);
+
+                    if(fixedIndex)
+                        subLog?.WriteQIndexFix(lba);
+
+                    if(fixedRelPos)
+                        subLog?.WriteQRelPosFix(lba);
+
+                    if(fixedAbsPos)
+                        subLog?.WriteQAbsPosFix(lba);
+
+                    if(fixedCrc)
+                        subLog?.WriteQCrcFix(lba);
+
+                    if(fixedMcn)
+                        subLog?.WriteQMcnFix(lba);
+
+                    if(fixedIsrc)
+                        subLog?.WriteQIsrcFix(lba);
+                }
+            }
+
+            if(!pOk   ||
+               !crcOk ||
+               !rwOk)
+                continue;
+
+            aframe = (byte)((q[9] / 16 * 10) + (q[9] & 0x0F));
+
+            if((q[0] & 0x3) == 1)
+            {
+                amin = (byte)((q[7] / 16 * 10) + (q[7] & 0x0F));
+                asec = (byte)((q[8] / 16 * 10) + (q[8] & 0x0F));
+                aPos = (amin * 60 * 75) + (asec * 75) + aframe - 150;
+            }
+            else
+            {
+                ulong expectedSectorAddress = sectorAddress + (ulong)(subPos / 96) + 150;
+                smin                  =  (byte)(expectedSectorAddress / 60 / 75);
+                expectedSectorAddress -= (ulong)(smin                 * 60 * 75);
+                ssec                  =  (byte)(expectedSectorAddress / 75);
+
+                aPos = (smin * 60 * 75) + (ssec * 75) + aframe - 150;
+
+                // Next second
+                if(aPos < prePos)
+                    aPos += 75;
+            }
+
+            // TODO: Negative sectors
+            if(aPos < 0)
+                continue;
+
+            prePos = aPos;
+
+            byte[] posSub = new byte[96];
+            Array.Copy(deSub, subPos, posSub, 0, 96);
+            posSub = Subchannel.Interleave(posSub);
+            outputPlugin.WriteSectorTag(posSub, (ulong)aPos, SectorTagType.CdSectorSubchannel);
+
+            subchannelExtents.Remove(aPos);
+
+            if(@fixed)
+                subLog?.WriteEntry(posSub, supportedSubchannel == MmcSubchannel.Raw, lba, 1, false, true);
         }
 
-        /// <summary>Check subchannel for indexes</summary>
-        /// <param name="deSub">De-interleaved subchannel</param>
-        /// <param name="isrcs">List of ISRCs</param>
-        /// <param name="currentTrack">Current track number</param>
-        /// <param name="mcn">Disc's MCN</param>
-        /// <param name="tracks">List of tracks</param>
-        /// <param name="dumpLog">Dumping log</param>
-        /// <param name="updateStatus">Status update callback</param>
-        /// <param name="smallestPregapLbaPerTrack">List of smallest known pregap per track</param>
-        /// <param name="dumping">Set if we are dumping, otherwise converting</param>
-        /// <returns><c>true</c> if indexes have changed, <c>false</c> otherwise</returns>
-        static bool CheckIndexesFromSubchannel(byte[] deSub, Dictionary<byte, string> isrcs, byte currentTrack,
-                                               ref string mcn, Track[] tracks, DumpLog dumpLog,
-                                               UpdateStatusHandler updateStatus,
-                                               Dictionary<byte, int> smallestPregapLbaPerTrack, bool dumping)
+        return indexesChanged;
+    }
+
+    /// <summary>Check subchannel for indexes</summary>
+    /// <param name="deSub">De-interleaved subchannel</param>
+    /// <param name="isrcs">List of ISRCs</param>
+    /// <param name="currentTrack">Current track number</param>
+    /// <param name="mcn">Disc's MCN</param>
+    /// <param name="tracks">List of tracks</param>
+    /// <param name="dumpLog">Dumping log</param>
+    /// <param name="updateStatus">Status update callback</param>
+    /// <param name="smallestPregapLbaPerTrack">List of smallest known pregap per track</param>
+    /// <param name="dumping">Set if we are dumping, otherwise converting</param>
+    /// <returns><c>true</c> if indexes have changed, <c>false</c> otherwise</returns>
+    static bool CheckIndexesFromSubchannel(byte[] deSub, Dictionary<byte, string> isrcs, byte currentTrack,
+                                           ref string mcn, Track[] tracks, DumpLog dumpLog,
+                                           UpdateStatusHandler updateStatus,
+                                           Dictionary<byte, int> smallestPregapLbaPerTrack, bool dumping)
+    {
+        bool status = false;
+
+        // Check subchannel
+        for(int subPos = 0; subPos < deSub.Length; subPos += 96)
         {
-            bool status = false;
+            byte[] q = new byte[12];
+            Array.Copy(deSub, subPos + 12, q, 0, 12);
 
-            // Check subchannel
-            for(int subPos = 0; subPos < deSub.Length; subPos += 96)
+            CRC16CCITTContext.Data(q, 10, out byte[] crc);
+            bool crcOk = crc[0] == q[10] && crc[1] == q[11];
+
+            switch(q[0] & 0x3)
             {
-                byte[] q = new byte[12];
-                Array.Copy(deSub, subPos + 12, q, 0, 12);
-
-                CRC16CCITTContext.Data(q, 10, out byte[] crc);
-                bool crcOk = crc[0] == q[10] && crc[1] == q[11];
-
-                switch(q[0] & 0x3)
+                // ISRC
+                case 3:
                 {
-                    // ISRC
-                    case 3:
+                    string isrc = Subchannel.DecodeIsrc(q);
+
+                    if(isrc == null ||
+                       isrc == "000000000000")
+                        continue;
+
+                    if(!crcOk)
+                        continue;
+
+                    if(!isrcs.ContainsKey(currentTrack))
                     {
-                        string isrc = Subchannel.DecodeIsrc(q);
+                        dumpLog?.WriteLine($"Found new ISRC {isrc} for track {currentTrack}.");
+                        updateStatus?.Invoke($"Found new ISRC {isrc} for track {currentTrack}.");
+                    }
+                    else if(isrcs[currentTrack] != isrc)
+                    {
+                        dumpLog?.
+                            WriteLine($"ISRC for track {currentTrack} changed from {isrcs[currentTrack]} to {isrc}.");
 
-                        if(isrc == null ||
-                           isrc == "000000000000")
-                            continue;
-
-                        if(!crcOk)
-                            continue;
-
-                        if(!isrcs.ContainsKey(currentTrack))
-                        {
-                            dumpLog?.WriteLine($"Found new ISRC {isrc} for track {currentTrack}.");
-                            updateStatus?.Invoke($"Found new ISRC {isrc} for track {currentTrack}.");
-                        }
-                        else if(isrcs[currentTrack] != isrc)
-                        {
-                            dumpLog?.
-                                WriteLine($"ISRC for track {currentTrack} changed from {isrcs[currentTrack]} to {isrc}.");
-
-                            updateStatus?.
-                                Invoke($"ISRC for track {currentTrack} changed from {isrcs[currentTrack]} to {isrc}.");
-                        }
-
-                        isrcs[currentTrack] = isrc;
-
-                        break;
+                        updateStatus?.
+                            Invoke($"ISRC for track {currentTrack} changed from {isrcs[currentTrack]} to {isrc}.");
                     }
 
-                    // MCN
-                    case 2:
+                    isrcs[currentTrack] = isrc;
+
+                    break;
+                }
+
+                // MCN
+                case 2:
+                {
+                    string newMcn = Subchannel.DecodeMcn(q);
+
+                    if(newMcn == null ||
+                       newMcn == "0000000000000")
+                        continue;
+
+                    if(!crcOk)
+                        continue;
+
+                    if(mcn is null)
                     {
-                        string newMcn = Subchannel.DecodeMcn(q);
-
-                        if(newMcn == null ||
-                           newMcn == "0000000000000")
-                            continue;
-
-                        if(!crcOk)
-                            continue;
-
-                        if(mcn is null)
-                        {
-                            dumpLog?.WriteLine($"Found new MCN {newMcn}.");
-                            updateStatus?.Invoke($"Found new MCN {newMcn}.");
-                        }
-                        else if(mcn != newMcn)
-                        {
-                            dumpLog?.WriteLine($"MCN changed from {mcn} to {newMcn}.");
-                            updateStatus?.Invoke($"MCN changed from {mcn} to {newMcn}.");
-                        }
-
-                        mcn = newMcn;
-
-                        break;
+                        dumpLog?.WriteLine($"Found new MCN {newMcn}.");
+                        updateStatus?.Invoke($"Found new MCN {newMcn}.");
+                    }
+                    else if(mcn != newMcn)
+                    {
+                        dumpLog?.WriteLine($"MCN changed from {mcn} to {newMcn}.");
+                        updateStatus?.Invoke($"MCN changed from {mcn} to {newMcn}.");
                     }
 
-                    // Positioning
-                    case 1 when !crcOk: continue;
-                    case 1:
-                    {
-                        byte trackNo = (byte)((q[1] / 16 * 10) + (q[1] & 0x0F));
+                    mcn = newMcn;
 
-                        for(int i = 0; i < tracks.Length; i++)
+                    break;
+                }
+
+                // Positioning
+                case 1 when !crcOk: continue;
+                case 1:
+                {
+                    byte trackNo = (byte)((q[1] / 16 * 10) + (q[1] & 0x0F));
+
+                    for(int i = 0; i < tracks.Length; i++)
+                    {
+                        if(tracks[i].Sequence != trackNo)
+                            continue;
+
+                        // Pregap
+                        if(q[2]    == 0 &&
+                           trackNo > 1)
                         {
-                            if(tracks[i].Sequence != trackNo)
+                            byte pmin   = (byte)((q[3] / 16 * 10) + (q[3] & 0x0F));
+                            byte psec   = (byte)((q[4] / 16 * 10) + (q[4] & 0x0F));
+                            byte pframe = (byte)((q[5] / 16 * 10) + (q[5] & 0x0F));
+                            int  qPos   = (pmin * 60 * 75) + (psec * 75) + pframe;
+
+                            // When we are dumping we calculate the pregap in reverse from index 1 back.
+                            // When we are not, we go from index 0.
+                            if(!smallestPregapLbaPerTrack.ContainsKey(trackNo))
+                                smallestPregapLbaPerTrack[trackNo] = dumping ? 1 : 0;
+
+                            uint firstTrackNumberInSameSession = tracks.
+                                                                 Where(t => t.Session ==
+                                                                            tracks[i].Session).
+                                                                 Min(t => t.Sequence);
+
+                            if(tracks[i].Sequence == firstTrackNumberInSameSession)
                                 continue;
 
-                            // Pregap
-                            if(q[2]    == 0 &&
-                               trackNo > 1)
+                            if(qPos < smallestPregapLbaPerTrack[trackNo])
                             {
-                                byte pmin   = (byte)((q[3] / 16 * 10) + (q[3] & 0x0F));
-                                byte psec   = (byte)((q[4] / 16 * 10) + (q[4] & 0x0F));
-                                byte pframe = (byte)((q[5] / 16 * 10) + (q[5] & 0x0F));
-                                int  qPos   = (pmin * 60 * 75) + (psec * 75) + pframe;
+                                int dif = smallestPregapLbaPerTrack[trackNo] - qPos;
+                                tracks[i].Pregap                   += (ulong)dif;
+                                tracks[i].StartSector              -= (ulong)dif;
+                                smallestPregapLbaPerTrack[trackNo] =  qPos;
 
-                                // When we are dumping we calculate the pregap in reverse from index 1 back.
-                                // When we are not, we go from index 0.
-                                if(!smallestPregapLbaPerTrack.ContainsKey(trackNo))
-                                    smallestPregapLbaPerTrack[trackNo] = dumping ? 1 : 0;
-
-                                uint firstTrackNumberInSameSession = tracks.
-                                                                     Where(t => t.Session ==
-                                                                               tracks[i].Session).
-                                                                     Min(t => t.Sequence);
-
-                                if(tracks[i].Sequence == firstTrackNumberInSameSession)
-                                    continue;
-
-                                if(qPos < smallestPregapLbaPerTrack[trackNo])
-                                {
-                                    int dif = smallestPregapLbaPerTrack[trackNo] - qPos;
-                                    tracks[i].Pregap              += (ulong)dif;
-                                    tracks[i].StartSector         -= (ulong)dif;
-                                    smallestPregapLbaPerTrack[trackNo] =  qPos;
-
-                                    if(i                            > 0 &&
-                                       tracks[i - 1].EndSector >= tracks[i].StartSector)
-                                        tracks[i - 1].EndSector = tracks[i].StartSector - 1;
-
-                                    dumpLog?.
-                                        WriteLine($"Pregap for track {trackNo} set to {tracks[i].Pregap} sectors.");
-
-                                    updateStatus?.
-                                        Invoke($"Pregap for track {trackNo} set to {tracks[i].Pregap} sectors.");
-
-                                    status = true;
-                                }
-
-                                if(tracks[i].Pregap >= (ulong)qPos)
-                                    continue;
-
-                                ulong oldPregap = tracks[i].Pregap;
-
-                                tracks[i].Pregap      =  (ulong)qPos;
-                                tracks[i].StartSector -= tracks[i].Pregap - oldPregap;
-
-                                if(i                            > 0 &&
+                                if(i                       > 0 &&
                                    tracks[i - 1].EndSector >= tracks[i].StartSector)
                                     tracks[i - 1].EndSector = tracks[i].StartSector - 1;
 
@@ -459,545 +438,581 @@ namespace Aaru.Core.Media
                                     Invoke($"Pregap for track {trackNo} set to {tracks[i].Pregap} sectors.");
 
                                 status = true;
-
-                                continue;
                             }
 
-                            if(q[2] == 0)
+                            if(tracks[i].Pregap >= (ulong)qPos)
                                 continue;
 
-                            byte amin   = (byte)((q[7] / 16 * 10) + (q[7] & 0x0F));
-                            byte asec   = (byte)((q[8] / 16 * 10) + (q[8] & 0x0F));
-                            byte aframe = (byte)((q[9] / 16 * 10) + (q[9] & 0x0F));
-                            int  aPos   = (amin * 60 * 75) + (asec * 75) + aframe - 150;
+                            ulong oldPregap = tracks[i].Pregap;
 
-                            if(tracks[i].Indexes.ContainsKey(q[2]) &&
-                               aPos >= tracks[i].Indexes[q[2]])
-                                continue;
+                            tracks[i].Pregap      =  (ulong)qPos;
+                            tracks[i].StartSector -= tracks[i].Pregap - oldPregap;
 
-                            dumpLog?.WriteLine($"Setting index {q[2]} for track {trackNo} to LBA {aPos}.");
-                            updateStatus?.Invoke($"Setting index {q[2]} for track {trackNo} to LBA {aPos}.");
+                            if(i                       > 0 &&
+                               tracks[i - 1].EndSector >= tracks[i].StartSector)
+                                tracks[i - 1].EndSector = tracks[i].StartSector - 1;
 
-                            tracks[i].Indexes[q[2]] = aPos;
+                            dumpLog?.
+                                WriteLine($"Pregap for track {trackNo} set to {tracks[i].Pregap} sectors.");
+
+                            updateStatus?.
+                                Invoke($"Pregap for track {trackNo} set to {tracks[i].Pregap} sectors.");
 
                             status = true;
+
+                            continue;
                         }
 
-                        break;
+                        if(q[2] == 0)
+                            continue;
+
+                        byte amin   = (byte)((q[7] / 16 * 10) + (q[7] & 0x0F));
+                        byte asec   = (byte)((q[8] / 16 * 10) + (q[8] & 0x0F));
+                        byte aframe = (byte)((q[9] / 16 * 10) + (q[9] & 0x0F));
+                        int  aPos   = (amin * 60 * 75) + (asec * 75) + aframe - 150;
+
+                        if(tracks[i].Indexes.ContainsKey(q[2]) &&
+                           aPos >= tracks[i].Indexes[q[2]])
+                            continue;
+
+                        dumpLog?.WriteLine($"Setting index {q[2]} for track {trackNo} to LBA {aPos}.");
+                        updateStatus?.Invoke($"Setting index {q[2]} for track {trackNo} to LBA {aPos}.");
+
+                        tracks[i].Indexes[q[2]] = aPos;
+
+                        status = true;
                     }
+
+                    break;
                 }
             }
+        }
 
+        return status;
+    }
+
+    /// <summary>Detect RW packets</summary>
+    /// <param name="subchannel">Subchannel data</param>
+    /// <param name="zero">Set if it contains a ZERO packet</param>
+    /// <param name="rwPacket">Set if it contains a GRAPHICS, EXTENDED GRAPHICS or MIDI packet</param>
+    /// <param name="cdtextPacket">Set if it contains a TEXT packet</param>
+    static void DetectRwPackets(byte[] subchannel, out bool zero, out bool rwPacket, out bool cdtextPacket)
+    {
+        zero         = false;
+        rwPacket     = false;
+        cdtextPacket = false;
+
+        byte[] cdTextPack1  = new byte[18];
+        byte[] cdTextPack2  = new byte[18];
+        byte[] cdTextPack3  = new byte[18];
+        byte[] cdTextPack4  = new byte[18];
+        byte[] cdSubRwPack1 = new byte[24];
+        byte[] cdSubRwPack2 = new byte[24];
+        byte[] cdSubRwPack3 = new byte[24];
+        byte[] cdSubRwPack4 = new byte[24];
+
+        int i = 0;
+
+        for(int j = 0; j < 18; j++)
+        {
+            cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x3F) << 2));
+
+            cdTextPack1[j] = (byte)(cdTextPack1[j++] | ((subchannel[i] & 0xC0) >> 4));
+
+            if(j < 18)
+                cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x0F) << 4));
+
+            if(j < 18)
+                cdTextPack1[j] = (byte)(cdTextPack1[j++] | ((subchannel[i] & 0x3C) >> 2));
+
+            if(j < 18)
+                cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x03) << 6));
+
+            if(j < 18)
+                cdTextPack1[j] = (byte)(cdTextPack1[j] | (subchannel[i++] & 0x3F));
+        }
+
+        for(int j = 0; j < 18; j++)
+        {
+            cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x3F) << 2));
+
+            cdTextPack2[j] = (byte)(cdTextPack2[j++] | ((subchannel[i] & 0xC0) >> 4));
+
+            if(j < 18)
+                cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x0F) << 4));
+
+            if(j < 18)
+                cdTextPack2[j] = (byte)(cdTextPack2[j++] | ((subchannel[i] & 0x3C) >> 2));
+
+            if(j < 18)
+                cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x03) << 6));
+
+            if(j < 18)
+                cdTextPack2[j] = (byte)(cdTextPack2[j] | (subchannel[i++] & 0x3F));
+        }
+
+        for(int j = 0; j < 18; j++)
+        {
+            cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x3F) << 2));
+
+            cdTextPack3[j] = (byte)(cdTextPack3[j++] | ((subchannel[i] & 0xC0) >> 4));
+
+            if(j < 18)
+                cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x0F) << 4));
+
+            if(j < 18)
+                cdTextPack3[j] = (byte)(cdTextPack3[j++] | ((subchannel[i] & 0x3C) >> 2));
+
+            if(j < 18)
+                cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x03) << 6));
+
+            if(j < 18)
+                cdTextPack3[j] = (byte)(cdTextPack3[j] | (subchannel[i++] & 0x3F));
+        }
+
+        for(int j = 0; j < 18; j++)
+        {
+            cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x3F) << 2));
+
+            cdTextPack4[j] = (byte)(cdTextPack4[j++] | ((subchannel[i] & 0xC0) >> 4));
+
+            if(j < 18)
+                cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x0F) << 4));
+
+            if(j < 18)
+                cdTextPack4[j] = (byte)(cdTextPack4[j++] | ((subchannel[i] & 0x3C) >> 2));
+
+            if(j < 18)
+                cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x03) << 6));
+
+            if(j < 18)
+                cdTextPack4[j] = (byte)(cdTextPack4[j] | (subchannel[i++] & 0x3F));
+        }
+
+        i = 0;
+
+        for(int j = 0; j < 24; j++)
+            cdSubRwPack1[j] = (byte)(subchannel[i++] & 0x3F);
+
+        for(int j = 0; j < 24; j++)
+            cdSubRwPack2[j] = (byte)(subchannel[i++] & 0x3F);
+
+        for(int j = 0; j < 24; j++)
+            cdSubRwPack3[j] = (byte)(subchannel[i++] & 0x3F);
+
+        for(int j = 0; j < 24; j++)
+            cdSubRwPack4[j] = (byte)(subchannel[i++] & 0x3F);
+
+        switch(cdSubRwPack1[0])
+        {
+            case 0x00:
+                zero = true;
+
+                break;
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x18:
+            case 0x38:
+                rwPacket = true;
+
+                break;
+            case 0x14:
+                cdtextPacket = true;
+
+                break;
+        }
+
+        switch(cdSubRwPack2[0])
+        {
+            case 0x00:
+                zero = true;
+
+                break;
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x18:
+            case 0x38:
+                rwPacket = true;
+
+                break;
+            case 0x14:
+                cdtextPacket = true;
+
+                break;
+        }
+
+        switch(cdSubRwPack3[0])
+        {
+            case 0x00:
+                zero = true;
+
+                break;
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x18:
+            case 0x38:
+                rwPacket = true;
+
+                break;
+            case 0x14:
+                cdtextPacket = true;
+
+                break;
+        }
+
+        switch(cdSubRwPack4[0])
+        {
+            case 0x00:
+                zero = true;
+
+                break;
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x18:
+            case 0x38:
+                rwPacket = true;
+
+                break;
+            case 0x14:
+                cdtextPacket = true;
+
+                break;
+        }
+
+        if((cdTextPack1[0] & 0x80) == 0x80)
+            cdtextPacket = true;
+
+        if((cdTextPack2[0] & 0x80) == 0x80)
+            cdtextPacket = true;
+
+        if((cdTextPack3[0] & 0x80) == 0x80)
+            cdtextPacket = true;
+
+        if((cdTextPack4[0] & 0x80) == 0x80)
+            cdtextPacket = true;
+    }
+
+    /// <summary>Checks if subchannel contains a TEXT packet</summary>
+    /// <param name="subchannel">Subchannel data</param>
+    /// <returns><c>true</c> if subchannel contains a TEXT packet, <c>false</c> otherwise</returns>
+    static bool CheckCdTextPackets(byte[] subchannel)
+    {
+        byte[] cdTextPack1 = new byte[18];
+        byte[] cdTextPack2 = new byte[18];
+        byte[] cdTextPack3 = new byte[18];
+        byte[] cdTextPack4 = new byte[18];
+
+        int i = 0;
+
+        for(int j = 0; j < 18; j++)
+        {
+            cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x3F) << 2));
+
+            cdTextPack1[j] = (byte)(cdTextPack1[j++] | ((subchannel[i] & 0xC0) >> 4));
+
+            if(j < 18)
+                cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x0F) << 4));
+
+            if(j < 18)
+                cdTextPack1[j] = (byte)(cdTextPack1[j++] | ((subchannel[i] & 0x3C) >> 2));
+
+            if(j < 18)
+                cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x03) << 6));
+
+            if(j < 18)
+                cdTextPack1[j] = (byte)(cdTextPack1[j] | (subchannel[i++] & 0x3F));
+        }
+
+        for(int j = 0; j < 18; j++)
+        {
+            cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x3F) << 2));
+
+            cdTextPack2[j] = (byte)(cdTextPack2[j++] | ((subchannel[i] & 0xC0) >> 4));
+
+            if(j < 18)
+                cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x0F) << 4));
+
+            if(j < 18)
+                cdTextPack2[j] = (byte)(cdTextPack2[j++] | ((subchannel[i] & 0x3C) >> 2));
+
+            if(j < 18)
+                cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x03) << 6));
+
+            if(j < 18)
+                cdTextPack2[j] = (byte)(cdTextPack2[j] | (subchannel[i++] & 0x3F));
+        }
+
+        for(int j = 0; j < 18; j++)
+        {
+            cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x3F) << 2));
+
+            cdTextPack3[j] = (byte)(cdTextPack3[j++] | ((subchannel[i] & 0xC0) >> 4));
+
+            if(j < 18)
+                cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x0F) << 4));
+
+            if(j < 18)
+                cdTextPack3[j] = (byte)(cdTextPack3[j++] | ((subchannel[i] & 0x3C) >> 2));
+
+            if(j < 18)
+                cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x03) << 6));
+
+            if(j < 18)
+                cdTextPack3[j] = (byte)(cdTextPack3[j] | (subchannel[i++] & 0x3F));
+        }
+
+        for(int j = 0; j < 18; j++)
+        {
+            cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x3F) << 2));
+
+            cdTextPack4[j] = (byte)(cdTextPack4[j++] | ((subchannel[i] & 0xC0) >> 4));
+
+            if(j < 18)
+                cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x0F) << 4));
+
+            if(j < 18)
+                cdTextPack4[j] = (byte)(cdTextPack4[j++] | ((subchannel[i] & 0x3C) >> 2));
+
+            if(j < 18)
+                cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x03) << 6));
+
+            if(j < 18)
+                cdTextPack4[j] = (byte)(cdTextPack4[j] | (subchannel[i++] & 0x3F));
+        }
+
+        bool status = true;
+
+        if((cdTextPack1[0] & 0x80) == 0x80)
+        {
+            ushort cdTextPack1Crc    = BigEndianBitConverter.ToUInt16(cdTextPack1, 16);
+            byte[] cdTextPack1ForCrc = new byte[16];
+            Array.Copy(cdTextPack1, 0, cdTextPack1ForCrc, 0, 16);
+            ushort calculatedCdtp1Crc = CRC16CCITTContext.Calculate(cdTextPack1ForCrc);
+
+            if(cdTextPack1Crc != calculatedCdtp1Crc &&
+               cdTextPack1Crc != 0)
+                status = false;
+        }
+
+        if((cdTextPack2[0] & 0x80) == 0x80)
+        {
+            ushort cdTextPack2Crc    = BigEndianBitConverter.ToUInt16(cdTextPack2, 16);
+            byte[] cdTextPack2ForCrc = new byte[16];
+            Array.Copy(cdTextPack2, 0, cdTextPack2ForCrc, 0, 16);
+            ushort calculatedCdtp2Crc = CRC16CCITTContext.Calculate(cdTextPack2ForCrc);
+
+            if(cdTextPack2Crc != calculatedCdtp2Crc &&
+               cdTextPack2Crc != 0)
+                status = false;
+        }
+
+        if((cdTextPack3[0] & 0x80) == 0x80)
+        {
+            ushort cdTextPack3Crc    = BigEndianBitConverter.ToUInt16(cdTextPack3, 16);
+            byte[] cdTextPack3ForCrc = new byte[16];
+            Array.Copy(cdTextPack3, 0, cdTextPack3ForCrc, 0, 16);
+            ushort calculatedCdtp3Crc = CRC16CCITTContext.Calculate(cdTextPack3ForCrc);
+
+            if(cdTextPack3Crc != calculatedCdtp3Crc &&
+               cdTextPack3Crc != 0)
+                status = false;
+        }
+
+        if((cdTextPack4[0] & 0x80) != 0x80)
             return status;
+
+        ushort cdTextPack4Crc    = BigEndianBitConverter.ToUInt16(cdTextPack4, 16);
+        byte[] cdTextPack4ForCrc = new byte[16];
+        Array.Copy(cdTextPack4, 0, cdTextPack4ForCrc, 0, 16);
+        ushort calculatedCdtp4Crc = CRC16CCITTContext.Calculate(cdTextPack4ForCrc);
+
+        if(cdTextPack4Crc == calculatedCdtp4Crc ||
+           cdTextPack4Crc == 0)
+            return status;
+
+        return false;
+    }
+
+    /// <summary>Fixes Q subchannel</summary>
+    /// <param name="deSub">Deinterleaved subchannel data</param>
+    /// <param name="q">Q subchannel</param>
+    /// <param name="subPos">Position in <see>deSub</see></param>
+    /// <param name="mcn">Disc's MCN</param>
+    /// <param name="isrc">Track ISRC</param>
+    /// <param name="fixCrc">Set to <c>true</c> if we should fix the CRC, <c>false</c> otherwise</param>
+    /// <param name="fixedAdr">Set to <c>true</c> if we fixed the ADR, <c>false</c> otherwise</param>
+    /// <param name="controlFix">Set to <c>true</c> if we fixed the CONTROL, <c>false</c> otherwise</param>
+    /// <param name="fixedZero">Set to <c>true</c> if we fixed the ZERO, <c>false</c> otherwise</param>
+    /// <param name="fixedTno">Set to <c>true</c> if we fixed the TNO, <c>false</c> otherwise</param>
+    /// <param name="fixedIndex">Set to <c>true</c> if we fixed the INDEX, <c>false</c> otherwise</param>
+    /// <param name="fixedRelPos">Set to <c>true</c> if we fixed the PMIN, PSEC and/or PFRAME, <c>false</c> otherwise</param>
+    /// <param name="fixedAbsPos">Set to <c>true</c> if we fixed the AMIN, ASEC and/or AFRAME, <c>false</c> otherwise</param>
+    /// <param name="fixedCrc">Set to <c>true</c> if we fixed the CRC, <c>false</c> otherwise</param>
+    /// <param name="fixedMcn">Set to <c>true</c> if we fixed the MCN, <c>false</c> otherwise</param>
+    /// <param name="fixedIsrc">Set to <c>true</c> if we fixed the ISRC, <c>false</c> otherwise</param>
+    /// <returns><c>true</c> if it was fixed correctly, <c>false</c> otherwise</returns>
+    static bool FixQSubchannel(byte[] deSub, byte[] q, int subPos, string mcn, string isrc, bool fixCrc,
+                               out bool fixedAdr, out bool controlFix, out bool fixedZero, out bool fixedTno,
+                               out bool fixedIndex, out bool fixedRelPos, out bool fixedAbsPos, out bool fixedCrc,
+                               out bool fixedMcn, out bool fixedIsrc)
+    {
+        byte amin, asec, aframe, pmin, psec, pframe;
+        byte rmin, rsec, rframe;
+        int  aPos, rPos, pPos, dPos;
+        controlFix  = false;
+        fixedZero   = false;
+        fixedTno    = false;
+        fixedIndex  = false;
+        fixedRelPos = false;
+        fixedAbsPos = false;
+        fixedCrc    = false;
+        fixedMcn    = false;
+        fixedIsrc   = false;
+
+        byte[] preQ  = new byte[12];
+        byte[] nextQ = new byte[12];
+        Array.Copy(deSub, subPos + 12 - 96, preQ, 0, 12);
+        Array.Copy(deSub, subPos      + 12 + 96, nextQ, 0, 12);
+        bool status;
+
+        CRC16CCITTContext.Data(preQ, 10, out byte[] preCrc);
+        bool preCrcOk = preCrc[0] == preQ[10] && preCrc[1] == preQ[11];
+
+        CRC16CCITTContext.Data(nextQ, 10, out byte[] nextCrc);
+        bool nextCrcOk = nextCrc[0] == nextQ[10] && nextCrc[1] == nextQ[11];
+
+        fixedAdr = false;
+
+        // Extraneous bits in ADR
+        if((q[0] & 0xC) != 0)
+        {
+            q[0]     &= 0xF3;
+            fixedAdr =  true;
         }
 
-        /// <summary>Detect RW packets</summary>
-        /// <param name="subchannel">Subchannel data</param>
-        /// <param name="zero">Set if it contains a ZERO packet</param>
-        /// <param name="rwPacket">Set if it contains a GRAPHICS, EXTENDED GRAPHICS or MIDI packet</param>
-        /// <param name="cdtextPacket">Set if it contains a TEXT packet</param>
-        static void DetectRwPackets(byte[] subchannel, out bool zero, out bool rwPacket, out bool cdtextPacket)
+        CRC16CCITTContext.Data(q, 10, out byte[] qCrc);
+        status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+        if(fixedAdr && status)
+            return true;
+
+        int oldAdr = q[0] & 0x3;
+
+        // Try Q-Mode 1
+        q[0] = (byte)((q[0] & 0xF0) + 1);
+        CRC16CCITTContext.Data(q, 10, out qCrc);
+        status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+        if(status)
         {
-            zero         = false;
-            rwPacket     = false;
-            cdtextPacket = false;
+            fixedAdr = true;
 
-            byte[] cdTextPack1  = new byte[18];
-            byte[] cdTextPack2  = new byte[18];
-            byte[] cdTextPack3  = new byte[18];
-            byte[] cdTextPack4  = new byte[18];
-            byte[] cdSubRwPack1 = new byte[24];
-            byte[] cdSubRwPack2 = new byte[24];
-            byte[] cdSubRwPack3 = new byte[24];
-            byte[] cdSubRwPack4 = new byte[24];
-
-            int i = 0;
-
-            for(int j = 0; j < 18; j++)
-            {
-                cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x3F) << 2));
-
-                cdTextPack1[j] = (byte)(cdTextPack1[j++] | ((subchannel[i] & 0xC0) >> 4));
-
-                if(j < 18)
-                    cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x0F) << 4));
-
-                if(j < 18)
-                    cdTextPack1[j] = (byte)(cdTextPack1[j++] | ((subchannel[i] & 0x3C) >> 2));
-
-                if(j < 18)
-                    cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x03) << 6));
-
-                if(j < 18)
-                    cdTextPack1[j] = (byte)(cdTextPack1[j] | (subchannel[i++] & 0x3F));
-            }
-
-            for(int j = 0; j < 18; j++)
-            {
-                cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x3F) << 2));
-
-                cdTextPack2[j] = (byte)(cdTextPack2[j++] | ((subchannel[i] & 0xC0) >> 4));
-
-                if(j < 18)
-                    cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x0F) << 4));
-
-                if(j < 18)
-                    cdTextPack2[j] = (byte)(cdTextPack2[j++] | ((subchannel[i] & 0x3C) >> 2));
-
-                if(j < 18)
-                    cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x03) << 6));
-
-                if(j < 18)
-                    cdTextPack2[j] = (byte)(cdTextPack2[j] | (subchannel[i++] & 0x3F));
-            }
-
-            for(int j = 0; j < 18; j++)
-            {
-                cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x3F) << 2));
-
-                cdTextPack3[j] = (byte)(cdTextPack3[j++] | ((subchannel[i] & 0xC0) >> 4));
-
-                if(j < 18)
-                    cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x0F) << 4));
-
-                if(j < 18)
-                    cdTextPack3[j] = (byte)(cdTextPack3[j++] | ((subchannel[i] & 0x3C) >> 2));
-
-                if(j < 18)
-                    cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x03) << 6));
-
-                if(j < 18)
-                    cdTextPack3[j] = (byte)(cdTextPack3[j] | (subchannel[i++] & 0x3F));
-            }
-
-            for(int j = 0; j < 18; j++)
-            {
-                cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x3F) << 2));
-
-                cdTextPack4[j] = (byte)(cdTextPack4[j++] | ((subchannel[i] & 0xC0) >> 4));
-
-                if(j < 18)
-                    cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x0F) << 4));
-
-                if(j < 18)
-                    cdTextPack4[j] = (byte)(cdTextPack4[j++] | ((subchannel[i] & 0x3C) >> 2));
-
-                if(j < 18)
-                    cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x03) << 6));
-
-                if(j < 18)
-                    cdTextPack4[j] = (byte)(cdTextPack4[j] | (subchannel[i++] & 0x3F));
-            }
-
-            i = 0;
-
-            for(int j = 0; j < 24; j++)
-                cdSubRwPack1[j] = (byte)(subchannel[i++] & 0x3F);
-
-            for(int j = 0; j < 24; j++)
-                cdSubRwPack2[j] = (byte)(subchannel[i++] & 0x3F);
-
-            for(int j = 0; j < 24; j++)
-                cdSubRwPack3[j] = (byte)(subchannel[i++] & 0x3F);
-
-            for(int j = 0; j < 24; j++)
-                cdSubRwPack4[j] = (byte)(subchannel[i++] & 0x3F);
-
-            switch(cdSubRwPack1[0])
-            {
-                case 0x00:
-                    zero = true;
-
-                    break;
-                case 0x08:
-                case 0x09:
-                case 0x0A:
-                case 0x18:
-                case 0x38:
-                    rwPacket = true;
-
-                    break;
-                case 0x14:
-                    cdtextPacket = true;
-
-                    break;
-            }
-
-            switch(cdSubRwPack2[0])
-            {
-                case 0x00:
-                    zero = true;
-
-                    break;
-                case 0x08:
-                case 0x09:
-                case 0x0A:
-                case 0x18:
-                case 0x38:
-                    rwPacket = true;
-
-                    break;
-                case 0x14:
-                    cdtextPacket = true;
-
-                    break;
-            }
-
-            switch(cdSubRwPack3[0])
-            {
-                case 0x00:
-                    zero = true;
-
-                    break;
-                case 0x08:
-                case 0x09:
-                case 0x0A:
-                case 0x18:
-                case 0x38:
-                    rwPacket = true;
-
-                    break;
-                case 0x14:
-                    cdtextPacket = true;
-
-                    break;
-            }
-
-            switch(cdSubRwPack4[0])
-            {
-                case 0x00:
-                    zero = true;
-
-                    break;
-                case 0x08:
-                case 0x09:
-                case 0x0A:
-                case 0x18:
-                case 0x38:
-                    rwPacket = true;
-
-                    break;
-                case 0x14:
-                    cdtextPacket = true;
-
-                    break;
-            }
-
-            if((cdTextPack1[0] & 0x80) == 0x80)
-                cdtextPacket = true;
-
-            if((cdTextPack2[0] & 0x80) == 0x80)
-                cdtextPacket = true;
-
-            if((cdTextPack3[0] & 0x80) == 0x80)
-                cdtextPacket = true;
-
-            if((cdTextPack4[0] & 0x80) == 0x80)
-                cdtextPacket = true;
+            return true;
         }
 
-        /// <summary>Checks if subchannel contains a TEXT packet</summary>
-        /// <param name="subchannel">Subchannel data</param>
-        /// <returns><c>true</c> if subchannel contains a TEXT packet, <c>false</c> otherwise</returns>
-        static bool CheckCdTextPackets(byte[] subchannel)
+        // Try Q-Mode 2
+        q[0] = (byte)((q[0] & 0xF0) + 2);
+        CRC16CCITTContext.Data(q, 10, out qCrc);
+        status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+        if(status)
         {
-            byte[] cdTextPack1 = new byte[18];
-            byte[] cdTextPack2 = new byte[18];
-            byte[] cdTextPack3 = new byte[18];
-            byte[] cdTextPack4 = new byte[18];
+            fixedAdr = true;
 
-            int i = 0;
-
-            for(int j = 0; j < 18; j++)
-            {
-                cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x3F) << 2));
-
-                cdTextPack1[j] = (byte)(cdTextPack1[j++] | ((subchannel[i] & 0xC0) >> 4));
-
-                if(j < 18)
-                    cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x0F) << 4));
-
-                if(j < 18)
-                    cdTextPack1[j] = (byte)(cdTextPack1[j++] | ((subchannel[i] & 0x3C) >> 2));
-
-                if(j < 18)
-                    cdTextPack1[j] = (byte)(cdTextPack1[j] | ((subchannel[i++] & 0x03) << 6));
-
-                if(j < 18)
-                    cdTextPack1[j] = (byte)(cdTextPack1[j] | (subchannel[i++] & 0x3F));
-            }
-
-            for(int j = 0; j < 18; j++)
-            {
-                cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x3F) << 2));
-
-                cdTextPack2[j] = (byte)(cdTextPack2[j++] | ((subchannel[i] & 0xC0) >> 4));
-
-                if(j < 18)
-                    cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x0F) << 4));
-
-                if(j < 18)
-                    cdTextPack2[j] = (byte)(cdTextPack2[j++] | ((subchannel[i] & 0x3C) >> 2));
-
-                if(j < 18)
-                    cdTextPack2[j] = (byte)(cdTextPack2[j] | ((subchannel[i++] & 0x03) << 6));
-
-                if(j < 18)
-                    cdTextPack2[j] = (byte)(cdTextPack2[j] | (subchannel[i++] & 0x3F));
-            }
-
-            for(int j = 0; j < 18; j++)
-            {
-                cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x3F) << 2));
-
-                cdTextPack3[j] = (byte)(cdTextPack3[j++] | ((subchannel[i] & 0xC0) >> 4));
-
-                if(j < 18)
-                    cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x0F) << 4));
-
-                if(j < 18)
-                    cdTextPack3[j] = (byte)(cdTextPack3[j++] | ((subchannel[i] & 0x3C) >> 2));
-
-                if(j < 18)
-                    cdTextPack3[j] = (byte)(cdTextPack3[j] | ((subchannel[i++] & 0x03) << 6));
-
-                if(j < 18)
-                    cdTextPack3[j] = (byte)(cdTextPack3[j] | (subchannel[i++] & 0x3F));
-            }
-
-            for(int j = 0; j < 18; j++)
-            {
-                cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x3F) << 2));
-
-                cdTextPack4[j] = (byte)(cdTextPack4[j++] | ((subchannel[i] & 0xC0) >> 4));
-
-                if(j < 18)
-                    cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x0F) << 4));
-
-                if(j < 18)
-                    cdTextPack4[j] = (byte)(cdTextPack4[j++] | ((subchannel[i] & 0x3C) >> 2));
-
-                if(j < 18)
-                    cdTextPack4[j] = (byte)(cdTextPack4[j] | ((subchannel[i++] & 0x03) << 6));
-
-                if(j < 18)
-                    cdTextPack4[j] = (byte)(cdTextPack4[j] | (subchannel[i++] & 0x3F));
-            }
-
-            bool status = true;
-
-            if((cdTextPack1[0] & 0x80) == 0x80)
-            {
-                ushort cdTextPack1Crc    = BigEndianBitConverter.ToUInt16(cdTextPack1, 16);
-                byte[] cdTextPack1ForCrc = new byte[16];
-                Array.Copy(cdTextPack1, 0, cdTextPack1ForCrc, 0, 16);
-                ushort calculatedCdtp1Crc = CRC16CCITTContext.Calculate(cdTextPack1ForCrc);
-
-                if(cdTextPack1Crc != calculatedCdtp1Crc &&
-                   cdTextPack1Crc != 0)
-                    status = false;
-            }
-
-            if((cdTextPack2[0] & 0x80) == 0x80)
-            {
-                ushort cdTextPack2Crc    = BigEndianBitConverter.ToUInt16(cdTextPack2, 16);
-                byte[] cdTextPack2ForCrc = new byte[16];
-                Array.Copy(cdTextPack2, 0, cdTextPack2ForCrc, 0, 16);
-                ushort calculatedCdtp2Crc = CRC16CCITTContext.Calculate(cdTextPack2ForCrc);
-
-                if(cdTextPack2Crc != calculatedCdtp2Crc &&
-                   cdTextPack2Crc != 0)
-                    status = false;
-            }
-
-            if((cdTextPack3[0] & 0x80) == 0x80)
-            {
-                ushort cdTextPack3Crc    = BigEndianBitConverter.ToUInt16(cdTextPack3, 16);
-                byte[] cdTextPack3ForCrc = new byte[16];
-                Array.Copy(cdTextPack3, 0, cdTextPack3ForCrc, 0, 16);
-                ushort calculatedCdtp3Crc = CRC16CCITTContext.Calculate(cdTextPack3ForCrc);
-
-                if(cdTextPack3Crc != calculatedCdtp3Crc &&
-                   cdTextPack3Crc != 0)
-                    status = false;
-            }
-
-            if((cdTextPack4[0] & 0x80) != 0x80)
-                return status;
-
-            ushort cdTextPack4Crc    = BigEndianBitConverter.ToUInt16(cdTextPack4, 16);
-            byte[] cdTextPack4ForCrc = new byte[16];
-            Array.Copy(cdTextPack4, 0, cdTextPack4ForCrc, 0, 16);
-            ushort calculatedCdtp4Crc = CRC16CCITTContext.Calculate(cdTextPack4ForCrc);
-
-            if(cdTextPack4Crc == calculatedCdtp4Crc ||
-               cdTextPack4Crc == 0)
-                return status;
-
-            return false;
+            return true;
         }
 
-        /// <summary>Fixes Q subchannel</summary>
-        /// <param name="deSub">Deinterleaved subchannel data</param>
-        /// <param name="q">Q subchannel</param>
-        /// <param name="subPos">Position in <see>deSub</see></param>
-        /// <param name="mcn">Disc's MCN</param>
-        /// <param name="isrc">Track ISRC</param>
-        /// <param name="fixCrc">Set to <c>true</c> if we should fix the CRC, <c>false</c> otherwise</param>
-        /// <param name="fixedAdr">Set to <c>true</c> if we fixed the ADR, <c>false</c> otherwise</param>
-        /// <param name="controlFix">Set to <c>true</c> if we fixed the CONTROL, <c>false</c> otherwise</param>
-        /// <param name="fixedZero">Set to <c>true</c> if we fixed the ZERO, <c>false</c> otherwise</param>
-        /// <param name="fixedTno">Set to <c>true</c> if we fixed the TNO, <c>false</c> otherwise</param>
-        /// <param name="fixedIndex">Set to <c>true</c> if we fixed the INDEX, <c>false</c> otherwise</param>
-        /// <param name="fixedRelPos">Set to <c>true</c> if we fixed the PMIN, PSEC and/or PFRAME, <c>false</c> otherwise</param>
-        /// <param name="fixedAbsPos">Set to <c>true</c> if we fixed the AMIN, ASEC and/or AFRAME, <c>false</c> otherwise</param>
-        /// <param name="fixedCrc">Set to <c>true</c> if we fixed the CRC, <c>false</c> otherwise</param>
-        /// <param name="fixedMcn">Set to <c>true</c> if we fixed the MCN, <c>false</c> otherwise</param>
-        /// <param name="fixedIsrc">Set to <c>true</c> if we fixed the ISRC, <c>false</c> otherwise</param>
-        /// <returns><c>true</c> if it was fixed correctly, <c>false</c> otherwise</returns>
-        static bool FixQSubchannel(byte[] deSub, byte[] q, int subPos, string mcn, string isrc, bool fixCrc,
-                                   out bool fixedAdr, out bool controlFix, out bool fixedZero, out bool fixedTno,
-                                   out bool fixedIndex, out bool fixedRelPos, out bool fixedAbsPos, out bool fixedCrc,
-                                   out bool fixedMcn, out bool fixedIsrc)
+        // Try Q-Mode 3
+        q[0] = (byte)((q[0] & 0xF0) + 3);
+        CRC16CCITTContext.Data(q, 10, out qCrc);
+        status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+        if(status)
         {
-            byte amin, asec, aframe, pmin, psec, pframe;
-            byte rmin, rsec, rframe;
-            int  aPos, rPos, pPos, dPos;
-            controlFix  = false;
-            fixedZero   = false;
-            fixedTno    = false;
-            fixedIndex  = false;
-            fixedRelPos = false;
-            fixedAbsPos = false;
-            fixedCrc    = false;
-            fixedMcn    = false;
-            fixedIsrc   = false;
+            fixedAdr = true;
 
-            byte[] preQ  = new byte[12];
-            byte[] nextQ = new byte[12];
-            Array.Copy(deSub, subPos + 12 - 96, preQ, 0, 12);
-            Array.Copy(deSub, subPos      + 12 + 96, nextQ, 0, 12);
-            bool status;
+            return true;
+        }
 
-            CRC16CCITTContext.Data(preQ, 10, out byte[] preCrc);
-            bool preCrcOk = preCrc[0] == preQ[10] && preCrc[1] == preQ[11];
+        q[0] = (byte)((q[0] & 0xF0) + oldAdr);
 
-            CRC16CCITTContext.Data(nextQ, 10, out byte[] nextCrc);
-            bool nextCrcOk = nextCrc[0] == nextQ[10] && nextCrc[1] == nextQ[11];
+        oldAdr = q[0];
 
-            fixedAdr = false;
+        // Try using previous control
+        if(preCrcOk && (q[0] & 0xF0) != (preQ[0] & 0xF0))
+        {
+            q[0] = (byte)((q[0] & 0x03) + (preQ[0] & 0xF0));
 
-            // Extraneous bits in ADR
-            if((q[0] & 0xC) != 0)
-            {
-                q[0]     &= 0xF3;
-                fixedAdr =  true;
-            }
-
-            CRC16CCITTContext.Data(q, 10, out byte[] qCrc);
-            status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-            if(fixedAdr && status)
-                return true;
-
-            int oldAdr = q[0] & 0x3;
-
-            // Try Q-Mode 1
-            q[0] = (byte)((q[0] & 0xF0) + 1);
             CRC16CCITTContext.Data(q, 10, out qCrc);
             status = qCrc[0] == q[10] && qCrc[1] == q[11];
 
             if(status)
             {
-                fixedAdr = true;
-
-                return true;
-            }
-
-            // Try Q-Mode 2
-            q[0] = (byte)((q[0] & 0xF0) + 2);
-            CRC16CCITTContext.Data(q, 10, out qCrc);
-            status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-            if(status)
-            {
-                fixedAdr = true;
-
-                return true;
-            }
-
-            // Try Q-Mode 3
-            q[0] = (byte)((q[0] & 0xF0) + 3);
-            CRC16CCITTContext.Data(q, 10, out qCrc);
-            status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-            if(status)
-            {
-                fixedAdr = true;
-
-                return true;
-            }
-
-            q[0] = (byte)((q[0] & 0xF0) + oldAdr);
-
-            oldAdr = q[0];
-
-            // Try using previous control
-            if(preCrcOk && (q[0] & 0xF0) != (preQ[0] & 0xF0))
-            {
-                q[0] = (byte)((q[0] & 0x03) + (preQ[0] & 0xF0));
-
-                CRC16CCITTContext.Data(q, 10, out qCrc);
-                status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                if(status)
-                {
-                    controlFix = true;
-
-                    return true;
-                }
-
-                q[0] = (byte)oldAdr;
-            }
-
-            // Try using next control
-            if(nextCrcOk && (q[0] & 0xF0) != (nextQ[0] & 0xF0))
-            {
-                q[0] = (byte)((q[0] & 0x03) + (nextQ[0] & 0xF0));
-
-                CRC16CCITTContext.Data(q, 10, out qCrc);
-                status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                if(status)
-                {
-                    controlFix = true;
-
-                    return true;
-                }
-
-                q[0] = (byte)oldAdr;
-            }
-
-            if(preCrcOk                               &&
-               nextCrcOk                              &&
-               (nextQ[0] & 0xF0) == (preQ[0]  & 0xF0) &&
-               (q[0]     & 0xF0) != (nextQ[0] & 0xF0))
-            {
-                q[0] = (byte)((q[0] & 0x03) + (nextQ[0] & 0xF0));
-
                 controlFix = true;
+
+                return true;
             }
 
-            switch(q[0] & 0x3)
+            q[0] = (byte)oldAdr;
+        }
+
+        // Try using next control
+        if(nextCrcOk && (q[0] & 0xF0) != (nextQ[0] & 0xF0))
+        {
+            q[0] = (byte)((q[0] & 0x03) + (nextQ[0] & 0xF0));
+
+            CRC16CCITTContext.Data(q, 10, out qCrc);
+            status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+            if(status)
             {
-                // Positioning
-                case 1:
+                controlFix = true;
+
+                return true;
+            }
+
+            q[0] = (byte)oldAdr;
+        }
+
+        if(preCrcOk                               &&
+           nextCrcOk                              &&
+           (nextQ[0] & 0xF0) == (preQ[0]  & 0xF0) &&
+           (q[0]     & 0xF0) != (nextQ[0] & 0xF0))
+        {
+            q[0] = (byte)((q[0] & 0x03) + (nextQ[0] & 0xF0));
+
+            controlFix = true;
+        }
+
+        switch(q[0] & 0x3)
+        {
+            // Positioning
+            case 1:
+            {
+                // ZERO not zero
+                if(q[6] != 0)
                 {
-                    // ZERO not zero
-                    if(q[6] != 0)
+                    q[6]      = 0;
+                    fixedZero = true;
+
+                    CRC16CCITTContext.Data(q, 10, out qCrc);
+                    status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+                    if(status)
+                        return true;
+                }
+
+                if(preCrcOk && nextCrcOk)
+                {
+                    if(preQ[1] == nextQ[1] &&
+                       preQ[1] != q[1])
                     {
-                        q[6]      = 0;
-                        fixedZero = true;
+                        q[1]     = preQ[1];
+                        fixedTno = true;
 
                         CRC16CCITTContext.Data(q, 10, out qCrc);
                         status = qCrc[0] == q[10] && qCrc[1] == q[11];
@@ -1005,216 +1020,84 @@ namespace Aaru.Core.Media
                         if(status)
                             return true;
                     }
+                }
 
-                    if(preCrcOk && nextCrcOk)
+                if(preCrcOk && nextCrcOk)
+                {
+                    if(preQ[2] == nextQ[2] &&
+                       preQ[2] != q[2])
                     {
-                        if(preQ[1] == nextQ[1] &&
-                           preQ[1] != q[1])
-                        {
-                            q[1]     = preQ[1];
-                            fixedTno = true;
+                        q[2]       = preQ[2];
+                        fixedIndex = true;
 
-                            CRC16CCITTContext.Data(q, 10, out qCrc);
-                            status = qCrc[0] == q[10] && qCrc[1] == q[11];
+                        CRC16CCITTContext.Data(q, 10, out qCrc);
+                        status = qCrc[0] == q[10] && qCrc[1] == q[11];
 
-                            if(status)
-                                return true;
-                        }
+                        if(status)
+                            return true;
                     }
+                }
 
-                    if(preCrcOk && nextCrcOk)
+                amin   = (byte)((q[7] / 16 * 10) + (q[7] & 0x0F));
+                asec   = (byte)((q[8] / 16 * 10) + (q[8] & 0x0F));
+                aframe = (byte)((q[9] / 16 * 10) + (q[9] & 0x0F));
+                aPos   = (amin * 60 * 75) + (asec * 75) + aframe - 150;
+
+                pmin   = (byte)((q[3] / 16 * 10) + (q[3] & 0x0F));
+                psec   = (byte)((q[4] / 16 * 10) + (q[4] & 0x0F));
+                pframe = (byte)((q[5] / 16 * 10) + (q[5] & 0x0F));
+                pPos   = (pmin * 60 * 75) + (psec * 75) + pframe;
+
+                // TODO: pregap
+                // Not pregap
+                if(q[2] > 0)
+                {
+                    // Previous was not pregap either
+                    if(preQ[2] > 0 && preCrcOk)
                     {
-                        if(preQ[2] == nextQ[2] &&
-                           preQ[2] != q[2])
-                        {
-                            q[2]       = preQ[2];
-                            fixedIndex = true;
+                        rmin   = (byte)((preQ[3] / 16 * 10) + (preQ[3] & 0x0F));
+                        rsec   = (byte)((preQ[4] / 16 * 10) + (preQ[4] & 0x0F));
+                        rframe = (byte)((preQ[5] / 16 * 10) + (preQ[5] & 0x0F));
+                        rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe;
 
-                            CRC16CCITTContext.Data(q, 10, out qCrc);
-                            status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                            if(status)
-                                return true;
-                        }
-                    }
-
-                    amin   = (byte)((q[7] / 16 * 10) + (q[7] & 0x0F));
-                    asec   = (byte)((q[8] / 16 * 10) + (q[8] & 0x0F));
-                    aframe = (byte)((q[9] / 16 * 10) + (q[9] & 0x0F));
-                    aPos   = (amin * 60 * 75) + (asec * 75) + aframe - 150;
-
-                    pmin   = (byte)((q[3] / 16 * 10) + (q[3] & 0x0F));
-                    psec   = (byte)((q[4] / 16 * 10) + (q[4] & 0x0F));
-                    pframe = (byte)((q[5] / 16 * 10) + (q[5] & 0x0F));
-                    pPos   = (pmin * 60 * 75) + (psec * 75) + pframe;
-
-                    // TODO: pregap
-                    // Not pregap
-                    if(q[2] > 0)
-                    {
-                        // Previous was not pregap either
-                        if(preQ[2] > 0 && preCrcOk)
-                        {
-                            rmin   = (byte)((preQ[3] / 16 * 10) + (preQ[3] & 0x0F));
-                            rsec   = (byte)((preQ[4] / 16 * 10) + (preQ[4] & 0x0F));
-                            rframe = (byte)((preQ[5] / 16 * 10) + (preQ[5] & 0x0F));
-                            rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe;
-
-                            dPos = pPos - rPos;
-
-                            if(dPos != 1)
-                            {
-                                q[3] = preQ[3];
-                                q[4] = preQ[4];
-                                q[5] = preQ[5];
-
-                                // BCD add 1, so 0x39 becomes 0x40
-                                if((q[5] & 0xF) == 9)
-                                    q[5] += 7;
-                                else
-                                    q[5]++;
-
-                                // 74 frames, so from 0x00 to 0x74, BCD
-                                if(q[5] >= 0x74)
-                                {
-                                    // 0 frames
-                                    q[5] = 0;
-
-                                    // Add 1 second
-                                    if((q[4] & 0xF) == 9)
-                                        q[4] += 7;
-                                    else
-                                        q[4]++;
-
-                                    // 60 seconds, so from 0x00 to 0x59, BCD
-                                    if(q[4] >= 0x59)
-                                    {
-                                        // 0 seconds
-                                        q[4] = 0;
-
-                                        // Add 1 minute
-                                        q[3]++;
-                                    }
-                                }
-
-                                fixedRelPos = true;
-
-                                CRC16CCITTContext.Data(q, 10, out qCrc);
-                                status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                                if(status)
-                                    return true;
-                            }
-                        }
-
-                        // Next is not pregap and we didn't fix relative position with previous
-                        if(nextQ[2] > 0 &&
-                           nextCrcOk    &&
-                           !fixedRelPos)
-                        {
-                            rmin   = (byte)((nextQ[3] / 16 * 10) + (nextQ[3] & 0x0F));
-                            rsec   = (byte)((nextQ[4] / 16 * 10) + (nextQ[4] & 0x0F));
-                            rframe = (byte)((nextQ[5] / 16 * 10) + (nextQ[5] & 0x0F));
-                            rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe;
-
-                            dPos = rPos - pPos;
-
-                            if(dPos != 1)
-                            {
-                                q[3] = nextQ[3];
-                                q[4] = nextQ[4];
-                                q[5] = nextQ[5];
-
-                                // If frames is 0
-                                if(q[5] == 0)
-                                {
-                                    // If seconds is 0
-                                    if(q[4] == 0)
-                                    {
-                                        // BCD decrease minutes
-                                        if((q[3] & 0xF) == 0)
-                                            q[3] = (byte)((q[3] & 0xF0) - 0x10);
-                                        else
-                                            q[3]--;
-
-                                        q[4] = 0x59;
-                                        q[5] = 0x73;
-                                    }
-                                    else
-                                    {
-                                        // BCD decrease seconds
-                                        if((q[4] & 0xF) == 0)
-                                            q[4] = (byte)((q[4] & 0xF0) - 0x10);
-                                        else
-                                            q[4]--;
-
-                                        q[5] = 0x73;
-                                    }
-                                }
-
-                                // BCD decrease frames
-                                else if((q[5] & 0xF) == 0)
-                                    q[5] = (byte)((q[5] & 0xF0) - 0x10);
-                                else
-                                    q[5]--;
-
-                                fixedRelPos = true;
-
-                                CRC16CCITTContext.Data(q, 10, out qCrc);
-                                status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                                if(status)
-                                    return true;
-                            }
-                        }
-                    }
-
-                    // Previous Q's CRC is correct
-                    if(preCrcOk)
-                    {
-                        rmin   = (byte)((preQ[7] / 16 * 10) + (preQ[7] & 0x0F));
-                        rsec   = (byte)((preQ[8] / 16 * 10) + (preQ[8] & 0x0F));
-                        rframe = (byte)((preQ[9] / 16 * 10) + (preQ[9] & 0x0F));
-                        rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe - 150;
-
-                        dPos = aPos - rPos;
+                        dPos = pPos - rPos;
 
                         if(dPos != 1)
                         {
-                            q[7] = preQ[7];
-                            q[8] = preQ[8];
-                            q[9] = preQ[9];
+                            q[3] = preQ[3];
+                            q[4] = preQ[4];
+                            q[5] = preQ[5];
 
                             // BCD add 1, so 0x39 becomes 0x40
-                            if((q[9] & 0xF) == 9)
-                                q[9] += 7;
+                            if((q[5] & 0xF) == 9)
+                                q[5] += 7;
                             else
-                                q[9]++;
+                                q[5]++;
 
                             // 74 frames, so from 0x00 to 0x74, BCD
-                            if(q[9] >= 0x74)
+                            if(q[5] >= 0x74)
                             {
                                 // 0 frames
-                                q[9] = 0;
+                                q[5] = 0;
 
                                 // Add 1 second
-                                if((q[8] & 0xF) == 9)
-                                    q[8] += 7;
+                                if((q[4] & 0xF) == 9)
+                                    q[4] += 7;
                                 else
-                                    q[8]++;
+                                    q[4]++;
 
                                 // 60 seconds, so from 0x00 to 0x59, BCD
-                                if(q[8] >= 0x59)
+                                if(q[4] >= 0x59)
                                 {
                                     // 0 seconds
-                                    q[8] = 0;
+                                    q[4] = 0;
 
                                     // Add 1 minute
-                                    q[7]++;
+                                    q[3]++;
                                 }
                             }
 
-                            fixedAbsPos = true;
+                            fixedRelPos = true;
 
                             CRC16CCITTContext.Data(q, 10, out qCrc);
                             status = qCrc[0] == q[10] && qCrc[1] == q[11];
@@ -1227,121 +1110,8 @@ namespace Aaru.Core.Media
                     // Next is not pregap and we didn't fix relative position with previous
                     if(nextQ[2] > 0 &&
                        nextCrcOk    &&
-                       !fixedAbsPos)
+                       !fixedRelPos)
                     {
-                        rmin   = (byte)((nextQ[7] / 16 * 10) + (nextQ[7] & 0x0F));
-                        rsec   = (byte)((nextQ[8] / 16 * 10) + (nextQ[8] & 0x0F));
-                        rframe = (byte)((nextQ[9] / 16 * 10) + (nextQ[9] & 0x0F));
-                        rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe - 150;
-
-                        dPos = rPos - pPos;
-
-                        if(dPos != 1)
-                        {
-                            q[7] = nextQ[7];
-                            q[8] = nextQ[8];
-                            q[9] = nextQ[9];
-
-                            // If frames is 0
-                            if(q[9] == 0)
-                            {
-                                // If seconds is 0
-                                if(q[8] == 0)
-                                {
-                                    // BCD decrease minutes
-                                    if((q[7] & 0xF) == 0)
-                                        q[7] = (byte)((q[7] & 0xF0) - 0x10);
-                                    else
-                                        q[7]--;
-
-                                    q[8] = 0x59;
-                                    q[9] = 0x73;
-                                }
-                                else
-                                {
-                                    // BCD decrease seconds
-                                    if((q[8] & 0xF) == 0)
-                                        q[8] = (byte)((q[8] & 0xF0) - 0x10);
-                                    else
-                                        q[8]--;
-
-                                    q[9] = 0x73;
-                                }
-                            }
-
-                            // BCD decrease frames
-                            else if((q[9] & 0xF) == 0)
-                                q[9] = (byte)((q[9] & 0xF0) - 0x10);
-                            else
-                                q[9]--;
-
-                            fixedAbsPos = true;
-
-                            CRC16CCITTContext.Data(q, 10, out qCrc);
-                            status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                            if(status)
-                                return true;
-                        }
-                    }
-
-                    CRC16CCITTContext.Data(q, 10, out qCrc);
-                    status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                    // Game Over
-                    if(!fixCrc || status)
-                        return false;
-
-                    // Previous Q's CRC is correct
-                    if(preCrcOk)
-                    {
-                        rmin   = (byte)((preQ[7] / 16 * 10) + (preQ[7] & 0x0F));
-                        rsec   = (byte)((preQ[8] / 16 * 10) + (preQ[8] & 0x0F));
-                        rframe = (byte)((preQ[9] / 16 * 10) + (preQ[9] & 0x0F));
-                        rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe - 150;
-
-                        dPos = aPos - rPos;
-
-                        bool absOk = dPos == 1;
-
-                        rmin   = (byte)((preQ[3] / 16 * 10) + (preQ[3] & 0x0F));
-                        rsec   = (byte)((preQ[4] / 16 * 10) + (preQ[4] & 0x0F));
-                        rframe = (byte)((preQ[5] / 16 * 10) + (preQ[5] & 0x0F));
-                        rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe;
-
-                        dPos = pPos - rPos;
-
-                        bool relOk = dPos == 1;
-
-                        if(q[0] != preQ[0] ||
-                           q[1] != preQ[1] ||
-                           q[2] != preQ[2] ||
-                           q[6] != 0       ||
-                           !absOk          ||
-                           !relOk)
-                            return false;
-
-                        CRC16CCITTContext.Data(q, 10, out qCrc);
-                        q[10] = qCrc[0];
-                        q[11] = qCrc[1];
-
-                        fixedCrc = true;
-
-                        return true;
-                    }
-
-                    // Next Q's CRC is correct
-                    if(nextCrcOk)
-                    {
-                        rmin   = (byte)((nextQ[7] / 16 * 10) + (nextQ[7] & 0x0F));
-                        rsec   = (byte)((nextQ[8] / 16 * 10) + (nextQ[8] & 0x0F));
-                        rframe = (byte)((nextQ[9] / 16 * 10) + (nextQ[9] & 0x0F));
-                        rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe - 150;
-
-                        dPos = rPos - aPos;
-
-                        bool absOk = dPos == 1;
-
                         rmin   = (byte)((nextQ[3] / 16 * 10) + (nextQ[3] & 0x0F));
                         rsec   = (byte)((nextQ[4] / 16 * 10) + (nextQ[4] & 0x0F));
                         rframe = (byte)((nextQ[5] / 16 * 10) + (nextQ[5] & 0x0F));
@@ -1349,100 +1119,102 @@ namespace Aaru.Core.Media
 
                         dPos = rPos - pPos;
 
-                        bool relOk = dPos == 1;
+                        if(dPos != 1)
+                        {
+                            q[3] = nextQ[3];
+                            q[4] = nextQ[4];
+                            q[5] = nextQ[5];
 
-                        if(q[0] != nextQ[0] ||
-                           q[1] != nextQ[1] ||
-                           q[2] != nextQ[2] ||
-                           q[6] != 0        ||
-                           !absOk           ||
-                           !relOk)
-                            return false;
+                            // If frames is 0
+                            if(q[5] == 0)
+                            {
+                                // If seconds is 0
+                                if(q[4] == 0)
+                                {
+                                    // BCD decrease minutes
+                                    if((q[3] & 0xF) == 0)
+                                        q[3] = (byte)((q[3] & 0xF0) - 0x10);
+                                    else
+                                        q[3]--;
 
-                        CRC16CCITTContext.Data(q, 10, out qCrc);
-                        q[10] = qCrc[0];
-                        q[11] = qCrc[1];
+                                    q[4] = 0x59;
+                                    q[5] = 0x73;
+                                }
+                                else
+                                {
+                                    // BCD decrease seconds
+                                    if((q[4] & 0xF) == 0)
+                                        q[4] = (byte)((q[4] & 0xF0) - 0x10);
+                                    else
+                                        q[4]--;
 
-                        fixedCrc = true;
+                                    q[5] = 0x73;
+                                }
+                            }
 
-                        return true;
+                            // BCD decrease frames
+                            else if((q[5] & 0xF) == 0)
+                                q[5] = (byte)((q[5] & 0xF0) - 0x10);
+                            else
+                                q[5]--;
+
+                            fixedRelPos = true;
+
+                            CRC16CCITTContext.Data(q, 10, out qCrc);
+                            status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+                            if(status)
+                                return true;
+                        }
                     }
-
-                    // Ok if previous and next are both BAD I won't rewrite the CRC at all
-                    break;
                 }
 
-                // MCN
-                case 2:
+                // Previous Q's CRC is correct
+                if(preCrcOk)
                 {
-                    // Previous Q's CRC is correct
-                    if(preCrcOk)
-                    {
-                        rframe = (byte)((preQ[9] / 16 * 10) + (preQ[9] & 0x0F));
-                        aframe = (byte)((q[9]    / 16 * 10) + (q[9]    & 0x0F));
+                    rmin   = (byte)((preQ[7] / 16 * 10) + (preQ[7] & 0x0F));
+                    rsec   = (byte)((preQ[8] / 16 * 10) + (preQ[8] & 0x0F));
+                    rframe = (byte)((preQ[9] / 16 * 10) + (preQ[9] & 0x0F));
+                    rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe - 150;
 
-                        if(aframe - rframe != 1)
+                    dPos = aPos - rPos;
+
+                    if(dPos != 1)
+                    {
+                        q[7] = preQ[7];
+                        q[8] = preQ[8];
+                        q[9] = preQ[9];
+
+                        // BCD add 1, so 0x39 becomes 0x40
+                        if((q[9] & 0xF) == 9)
+                            q[9] += 7;
+                        else
+                            q[9]++;
+
+                        // 74 frames, so from 0x00 to 0x74, BCD
+                        if(q[9] >= 0x74)
                         {
-                            q[9] = preQ[9];
+                            // 0 frames
+                            q[9] = 0;
 
-                            if((q[9] & 0xF) == 9)
-                                q[9] += 7;
+                            // Add 1 second
+                            if((q[8] & 0xF) == 9)
+                                q[8] += 7;
                             else
-                                q[9]++;
+                                q[8]++;
 
-                            if(q[9] >= 0x74)
-                                q[9] = 0;
+                            // 60 seconds, so from 0x00 to 0x59, BCD
+                            if(q[8] >= 0x59)
+                            {
+                                // 0 seconds
+                                q[8] = 0;
 
-                            fixedAbsPos = true;
-
-                            CRC16CCITTContext.Data(q, 10, out qCrc);
-                            status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                            if(status)
-                                return true;
+                                // Add 1 minute
+                                q[7]++;
+                            }
                         }
-                    }
 
-                    // Next Q's CRC is correct
-                    else if(nextCrcOk)
-                    {
-                        rframe = (byte)((nextQ[9] / 16 * 10) + (nextQ[9] & 0x0F));
-                        aframe = (byte)((q[9]     / 16 * 10) + (q[9]     & 0x0F));
-
-                        if(aframe - rframe != 1)
-                        {
-                            q[9] = nextQ[9];
-
-                            if(q[9] == 0)
-                                q[9] = 0x73;
-                            else if((q[9] & 0xF) == 0)
-                                q[9] = (byte)((q[9] & 0xF0) - 0x10);
-                            else
-                                q[9]--;
-
-                            fixedAbsPos = true;
-
-                            CRC16CCITTContext.Data(q, 10, out qCrc);
-                            status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                            if(status)
-                                return true;
-                        }
-                    }
-
-                    // We know the MCN
-                    if(mcn != null)
-                    {
-                        q[1] = (byte)((((mcn[0]  - 0x30) & 0x0F) * 16) + ((mcn[1]  - 0x30) & 0x0F));
-                        q[2] = (byte)((((mcn[2]  - 0x30) & 0x0F) * 16) + ((mcn[3]  - 0x30) & 0x0F));
-                        q[3] = (byte)((((mcn[4]  - 0x30) & 0x0F) * 16) + ((mcn[5]  - 0x30) & 0x0F));
-                        q[4] = (byte)((((mcn[6]  - 0x30) & 0x0F) * 16) + ((mcn[7]  - 0x30) & 0x0F));
-                        q[5] = (byte)((((mcn[8]  - 0x30) & 0x0F) * 16) + ((mcn[9]  - 0x30) & 0x0F));
-                        q[6] = (byte)((((mcn[10] - 0x30) & 0x0F) * 16) + ((mcn[11] - 0x30) & 0x0F));
-                        q[7] = (byte)(((mcn[12]                                    - 0x30) & 0x0F) * 8);
-                        q[8] = 0;
-
-                        fixedMcn = true;
+                        fixedAbsPos = true;
 
                         CRC16CCITTContext.Data(q, 10, out qCrc);
                         status = qCrc[0] == q[10] && qCrc[1] == q[11];
@@ -1450,10 +1222,103 @@ namespace Aaru.Core.Media
                         if(status)
                             return true;
                     }
+                }
 
-                    if(!fixCrc    ||
-                       !nextCrcOk ||
-                       !preCrcOk)
+                // Next is not pregap and we didn't fix relative position with previous
+                if(nextQ[2] > 0 &&
+                   nextCrcOk    &&
+                   !fixedAbsPos)
+                {
+                    rmin   = (byte)((nextQ[7] / 16 * 10) + (nextQ[7] & 0x0F));
+                    rsec   = (byte)((nextQ[8] / 16 * 10) + (nextQ[8] & 0x0F));
+                    rframe = (byte)((nextQ[9] / 16 * 10) + (nextQ[9] & 0x0F));
+                    rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe - 150;
+
+                    dPos = rPos - pPos;
+
+                    if(dPos != 1)
+                    {
+                        q[7] = nextQ[7];
+                        q[8] = nextQ[8];
+                        q[9] = nextQ[9];
+
+                        // If frames is 0
+                        if(q[9] == 0)
+                        {
+                            // If seconds is 0
+                            if(q[8] == 0)
+                            {
+                                // BCD decrease minutes
+                                if((q[7] & 0xF) == 0)
+                                    q[7] = (byte)((q[7] & 0xF0) - 0x10);
+                                else
+                                    q[7]--;
+
+                                q[8] = 0x59;
+                                q[9] = 0x73;
+                            }
+                            else
+                            {
+                                // BCD decrease seconds
+                                if((q[8] & 0xF) == 0)
+                                    q[8] = (byte)((q[8] & 0xF0) - 0x10);
+                                else
+                                    q[8]--;
+
+                                q[9] = 0x73;
+                            }
+                        }
+
+                        // BCD decrease frames
+                        else if((q[9] & 0xF) == 0)
+                            q[9] = (byte)((q[9] & 0xF0) - 0x10);
+                        else
+                            q[9]--;
+
+                        fixedAbsPos = true;
+
+                        CRC16CCITTContext.Data(q, 10, out qCrc);
+                        status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+                        if(status)
+                            return true;
+                    }
+                }
+
+                CRC16CCITTContext.Data(q, 10, out qCrc);
+                status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+                // Game Over
+                if(!fixCrc || status)
+                    return false;
+
+                // Previous Q's CRC is correct
+                if(preCrcOk)
+                {
+                    rmin   = (byte)((preQ[7] / 16 * 10) + (preQ[7] & 0x0F));
+                    rsec   = (byte)((preQ[8] / 16 * 10) + (preQ[8] & 0x0F));
+                    rframe = (byte)((preQ[9] / 16 * 10) + (preQ[9] & 0x0F));
+                    rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe - 150;
+
+                    dPos = aPos - rPos;
+
+                    bool absOk = dPos == 1;
+
+                    rmin   = (byte)((preQ[3] / 16 * 10) + (preQ[3] & 0x0F));
+                    rsec   = (byte)((preQ[4] / 16 * 10) + (preQ[4] & 0x0F));
+                    rframe = (byte)((preQ[5] / 16 * 10) + (preQ[5] & 0x0F));
+                    rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe;
+
+                    dPos = pPos - rPos;
+
+                    bool relOk = dPos == 1;
+
+                    if(q[0] != preQ[0] ||
+                       q[1] != preQ[1] ||
+                       q[2] != preQ[2] ||
+                       q[6] != 0       ||
+                       !absOk          ||
+                       !relOk)
                         return false;
 
                     CRC16CCITTContext.Data(q, 10, out qCrc);
@@ -1465,94 +1330,33 @@ namespace Aaru.Core.Media
                     return true;
                 }
 
-                // ISRC
-                case 3:
+                // Next Q's CRC is correct
+                if(nextCrcOk)
                 {
-                    // Previous Q's CRC is correct
-                    if(preCrcOk)
-                    {
-                        rframe = (byte)((preQ[9] / 16 * 10) + (preQ[9] & 0x0F));
-                        aframe = (byte)((q[9]    / 16 * 10) + (q[9]    & 0x0F));
+                    rmin   = (byte)((nextQ[7] / 16 * 10) + (nextQ[7] & 0x0F));
+                    rsec   = (byte)((nextQ[8] / 16 * 10) + (nextQ[8] & 0x0F));
+                    rframe = (byte)((nextQ[9] / 16 * 10) + (nextQ[9] & 0x0F));
+                    rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe - 150;
 
-                        if(aframe - rframe != 1)
-                        {
-                            q[9] = preQ[9];
+                    dPos = rPos - aPos;
 
-                            if((q[9] & 0xF) == 9)
-                                q[9] += 7;
-                            else
-                                q[9]++;
+                    bool absOk = dPos == 1;
 
-                            if(q[9] >= 0x74)
-                                q[9] = 0;
+                    rmin   = (byte)((nextQ[3] / 16 * 10) + (nextQ[3] & 0x0F));
+                    rsec   = (byte)((nextQ[4] / 16 * 10) + (nextQ[4] & 0x0F));
+                    rframe = (byte)((nextQ[5] / 16 * 10) + (nextQ[5] & 0x0F));
+                    rPos   = (rmin * 60 * 75) + (rsec * 75) + rframe;
 
-                            fixedAbsPos = true;
+                    dPos = rPos - pPos;
 
-                            CRC16CCITTContext.Data(q, 10, out qCrc);
-                            status = qCrc[0] == q[10] && qCrc[1] == q[11];
+                    bool relOk = dPos == 1;
 
-                            if(status)
-                                return true;
-                        }
-                    }
-
-                    // Next Q's CRC is correct
-                    else if(nextCrcOk)
-                    {
-                        rframe = (byte)((nextQ[9] / 16 * 10) + (nextQ[9] & 0x0F));
-                        aframe = (byte)((q[9]     / 16 * 10) + (q[9]     & 0x0F));
-
-                        if(aframe - rframe != 1)
-                        {
-                            q[9] = nextQ[9];
-
-                            if(q[9] == 0)
-                                q[9] = 0x73;
-                            else if((q[9] & 0xF) == 0)
-                                q[9] = (byte)((q[9] & 0xF0) - 0x10);
-                            else
-                                q[9]--;
-
-                            fixedAbsPos = true;
-
-                            CRC16CCITTContext.Data(q, 10, out qCrc);
-                            status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                            if(status)
-                                return true;
-                        }
-                    }
-
-                    // We know the ISRC
-                    if(isrc != null)
-                    {
-                        byte i1 = Subchannel.GetIsrcCode(isrc[0]);
-                        byte i2 = Subchannel.GetIsrcCode(isrc[1]);
-                        byte i3 = Subchannel.GetIsrcCode(isrc[2]);
-                        byte i4 = Subchannel.GetIsrcCode(isrc[3]);
-                        byte i5 = Subchannel.GetIsrcCode(isrc[4]);
-
-                        q[1] = (byte)((i1 << 2) + ((i2 & 0x30) >> 4));
-                        q[2] = (byte)(((i2             & 0xF)  << 4) + (i3 >> 2));
-                        q[3] = (byte)(((i3             & 0x3)  << 6) + i4);
-                        q[4] = (byte)(i5 << 2);
-                        q[5] = (byte)((((isrc[5] - 0x30) & 0x0F) * 16) + ((isrc[6]  - 0x30) & 0x0F));
-                        q[6] = (byte)((((isrc[7] - 0x30) & 0x0F) * 16) + ((isrc[8]  - 0x30) & 0x0F));
-                        q[7] = (byte)((((isrc[9] - 0x30) & 0x0F) * 16) + ((isrc[10] - 0x30) & 0x0F));
-                        q[8] = (byte)(((isrc[11]                                    - 0x30) & 0x0F) * 16);
-
-                        fixedIsrc = true;
-
-                        CRC16CCITTContext.Data(q, 10, out qCrc);
-                        status = qCrc[0] == q[10] && qCrc[1] == q[11];
-
-                        if(status)
-                            return true;
-                    }
-
-                    if(!fixCrc    ||
-                       !nextCrcOk ||
-                       !preCrcOk)
+                    if(q[0] != nextQ[0] ||
+                       q[1] != nextQ[1] ||
+                       q[2] != nextQ[2] ||
+                       q[6] != 0        ||
+                       !absOk           ||
+                       !relOk)
                         return false;
 
                     CRC16CCITTContext.Data(q, 10, out qCrc);
@@ -1563,79 +1367,274 @@ namespace Aaru.Core.Media
 
                     return true;
                 }
+
+                // Ok if previous and next are both BAD I won't rewrite the CRC at all
+                break;
             }
 
-            return false;
-        }
-
-        /// <summary>Generates a correct subchannel all the missing ones</summary>
-        /// <param name="subchannelExtents">List of missing subchannels</param>
-        /// <param name="tracks">List of tracks</param>
-        /// <param name="trackFlags">Flags of tracks</param>
-        /// <param name="blocks">Disc size</param>
-        /// <param name="subLog">Subchannel log</param>
-        /// <param name="dumpLog">Dump log</param>
-        /// <param name="initProgress">Progress initialization callback</param>
-        /// <param name="updateProgress">Progress update callback</param>
-        /// <param name="endProgress">Progress finalization callback</param>
-        /// <param name="outputPlugin">Output image</param>
-        public static void GenerateSubchannels(HashSet<int> subchannelExtents, Track[] tracks,
-                                               Dictionary<byte, byte> trackFlags, ulong blocks, SubchannelLog subLog,
-                                               DumpLog dumpLog, InitProgressHandler initProgress,
-                                               UpdateProgressHandler updateProgress, EndProgressHandler endProgress,
-                                               IWritableImage outputPlugin)
-        {
-            initProgress?.Invoke();
-
-            foreach(int sector in subchannelExtents)
+            // MCN
+            case 2:
             {
-                Track track = tracks.LastOrDefault(t => (int)t.StartSector <= sector);
-                byte  trkFlags;
-                byte  flags;
-                ulong trackStart;
-                ulong pregap;
-
-                if(track == null)
-                    continue;
-
-                // Hidden track
-                if(track.Sequence == 0)
+                // Previous Q's CRC is correct
+                if(preCrcOk)
                 {
-                    track      = tracks.FirstOrDefault(t => (int)t.Sequence == 1);
-                    trackStart = 0;
-                    pregap     = track?.StartSector ?? 0;
-                }
-                else
-                {
-                    trackStart = track.StartSector;
-                    pregap     = track.Pregap;
+                    rframe = (byte)((preQ[9] / 16 * 10) + (preQ[9] & 0x0F));
+                    aframe = (byte)((q[9]    / 16 * 10) + (q[9]    & 0x0F));
+
+                    if(aframe - rframe != 1)
+                    {
+                        q[9] = preQ[9];
+
+                        if((q[9] & 0xF) == 9)
+                            q[9] += 7;
+                        else
+                            q[9]++;
+
+                        if(q[9] >= 0x74)
+                            q[9] = 0;
+
+                        fixedAbsPos = true;
+
+                        CRC16CCITTContext.Data(q, 10, out qCrc);
+                        status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+                        if(status)
+                            return true;
+                    }
                 }
 
-                if(!trackFlags.TryGetValue((byte)(track?.Sequence ?? 0), out trkFlags) &&
-                   track?.Type != TrackType.Audio)
-                    flags = (byte)CdFlags.DataTrack;
-                else
-                    flags = trkFlags;
+                // Next Q's CRC is correct
+                else if(nextCrcOk)
+                {
+                    rframe = (byte)((nextQ[9] / 16 * 10) + (nextQ[9] & 0x0F));
+                    aframe = (byte)((q[9]     / 16 * 10) + (q[9]     & 0x0F));
 
-                byte index;
+                    if(aframe - rframe != 1)
+                    {
+                        q[9] = nextQ[9];
 
-                if(track?.Indexes?.Count > 0)
-                    index = (byte)track.Indexes.LastOrDefault(i => i.Value >= sector).Key;
-                else
-                    index = 0;
+                        if(q[9] == 0)
+                            q[9] = 0x73;
+                        else if((q[9] & 0xF) == 0)
+                            q[9] = (byte)((q[9] & 0xF0) - 0x10);
+                        else
+                            q[9]--;
 
-                updateProgress?.Invoke($"Generating subchannel for sector {sector}...", sector, (long)blocks);
-                dumpLog?.WriteLine($"Generating subchannel for sector {sector}.");
+                        fixedAbsPos = true;
 
-                byte[] sub = Subchannel.Generate(sector, track?.Sequence ?? 0, (int)pregap, (int)trackStart, flags,
-                                                 index);
+                        CRC16CCITTContext.Data(q, 10, out qCrc);
+                        status = qCrc[0] == q[10] && qCrc[1] == q[11];
 
-                outputPlugin.WriteSectorsTag(sub, (ulong)sector, 1, SectorTagType.CdSectorSubchannel);
+                        if(status)
+                            return true;
+                    }
+                }
 
-                subLog?.WriteEntry(sub, true, sector, 1, true, false);
+                // We know the MCN
+                if(mcn != null)
+                {
+                    q[1] = (byte)((((mcn[0]  - 0x30) & 0x0F) * 16) + ((mcn[1]  - 0x30) & 0x0F));
+                    q[2] = (byte)((((mcn[2]  - 0x30) & 0x0F) * 16) + ((mcn[3]  - 0x30) & 0x0F));
+                    q[3] = (byte)((((mcn[4]  - 0x30) & 0x0F) * 16) + ((mcn[5]  - 0x30) & 0x0F));
+                    q[4] = (byte)((((mcn[6]  - 0x30) & 0x0F) * 16) + ((mcn[7]  - 0x30) & 0x0F));
+                    q[5] = (byte)((((mcn[8]  - 0x30) & 0x0F) * 16) + ((mcn[9]  - 0x30) & 0x0F));
+                    q[6] = (byte)((((mcn[10] - 0x30) & 0x0F) * 16) + ((mcn[11] - 0x30) & 0x0F));
+                    q[7] = (byte)(((mcn[12]                                    - 0x30) & 0x0F) * 8);
+                    q[8] = 0;
+
+                    fixedMcn = true;
+
+                    CRC16CCITTContext.Data(q, 10, out qCrc);
+                    status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+                    if(status)
+                        return true;
+                }
+
+                if(!fixCrc    ||
+                   !nextCrcOk ||
+                   !preCrcOk)
+                    return false;
+
+                CRC16CCITTContext.Data(q, 10, out qCrc);
+                q[10] = qCrc[0];
+                q[11] = qCrc[1];
+
+                fixedCrc = true;
+
+                return true;
             }
 
-            endProgress?.Invoke();
+            // ISRC
+            case 3:
+            {
+                // Previous Q's CRC is correct
+                if(preCrcOk)
+                {
+                    rframe = (byte)((preQ[9] / 16 * 10) + (preQ[9] & 0x0F));
+                    aframe = (byte)((q[9]    / 16 * 10) + (q[9]    & 0x0F));
+
+                    if(aframe - rframe != 1)
+                    {
+                        q[9] = preQ[9];
+
+                        if((q[9] & 0xF) == 9)
+                            q[9] += 7;
+                        else
+                            q[9]++;
+
+                        if(q[9] >= 0x74)
+                            q[9] = 0;
+
+                        fixedAbsPos = true;
+
+                        CRC16CCITTContext.Data(q, 10, out qCrc);
+                        status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+                        if(status)
+                            return true;
+                    }
+                }
+
+                // Next Q's CRC is correct
+                else if(nextCrcOk)
+                {
+                    rframe = (byte)((nextQ[9] / 16 * 10) + (nextQ[9] & 0x0F));
+                    aframe = (byte)((q[9]     / 16 * 10) + (q[9]     & 0x0F));
+
+                    if(aframe - rframe != 1)
+                    {
+                        q[9] = nextQ[9];
+
+                        if(q[9] == 0)
+                            q[9] = 0x73;
+                        else if((q[9] & 0xF) == 0)
+                            q[9] = (byte)((q[9] & 0xF0) - 0x10);
+                        else
+                            q[9]--;
+
+                        fixedAbsPos = true;
+
+                        CRC16CCITTContext.Data(q, 10, out qCrc);
+                        status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+                        if(status)
+                            return true;
+                    }
+                }
+
+                // We know the ISRC
+                if(isrc != null)
+                {
+                    byte i1 = Subchannel.GetIsrcCode(isrc[0]);
+                    byte i2 = Subchannel.GetIsrcCode(isrc[1]);
+                    byte i3 = Subchannel.GetIsrcCode(isrc[2]);
+                    byte i4 = Subchannel.GetIsrcCode(isrc[3]);
+                    byte i5 = Subchannel.GetIsrcCode(isrc[4]);
+
+                    q[1] = (byte)((i1 << 2) + ((i2 & 0x30) >> 4));
+                    q[2] = (byte)(((i2             & 0xF)  << 4) + (i3 >> 2));
+                    q[3] = (byte)(((i3             & 0x3)  << 6) + i4);
+                    q[4] = (byte)(i5 << 2);
+                    q[5] = (byte)((((isrc[5] - 0x30) & 0x0F) * 16) + ((isrc[6]  - 0x30) & 0x0F));
+                    q[6] = (byte)((((isrc[7] - 0x30) & 0x0F) * 16) + ((isrc[8]  - 0x30) & 0x0F));
+                    q[7] = (byte)((((isrc[9] - 0x30) & 0x0F) * 16) + ((isrc[10] - 0x30) & 0x0F));
+                    q[8] = (byte)(((isrc[11]                                    - 0x30) & 0x0F) * 16);
+
+                    fixedIsrc = true;
+
+                    CRC16CCITTContext.Data(q, 10, out qCrc);
+                    status = qCrc[0] == q[10] && qCrc[1] == q[11];
+
+                    if(status)
+                        return true;
+                }
+
+                if(!fixCrc    ||
+                   !nextCrcOk ||
+                   !preCrcOk)
+                    return false;
+
+                CRC16CCITTContext.Data(q, 10, out qCrc);
+                q[10] = qCrc[0];
+                q[11] = qCrc[1];
+
+                fixedCrc = true;
+
+                return true;
+            }
         }
+
+        return false;
+    }
+
+    /// <summary>Generates a correct subchannel all the missing ones</summary>
+    /// <param name="subchannelExtents">List of missing subchannels</param>
+    /// <param name="tracks">List of tracks</param>
+    /// <param name="trackFlags">Flags of tracks</param>
+    /// <param name="blocks">Disc size</param>
+    /// <param name="subLog">Subchannel log</param>
+    /// <param name="dumpLog">Dump log</param>
+    /// <param name="initProgress">Progress initialization callback</param>
+    /// <param name="updateProgress">Progress update callback</param>
+    /// <param name="endProgress">Progress finalization callback</param>
+    /// <param name="outputPlugin">Output image</param>
+    public static void GenerateSubchannels(HashSet<int> subchannelExtents, Track[] tracks,
+                                           Dictionary<byte, byte> trackFlags, ulong blocks, SubchannelLog subLog,
+                                           DumpLog dumpLog, InitProgressHandler initProgress,
+                                           UpdateProgressHandler updateProgress, EndProgressHandler endProgress,
+                                           IWritableImage outputPlugin)
+    {
+        initProgress?.Invoke();
+
+        foreach(int sector in subchannelExtents)
+        {
+            Track track = tracks.LastOrDefault(t => (int)t.StartSector <= sector);
+            byte  trkFlags;
+            byte  flags;
+            ulong trackStart;
+            ulong pregap;
+
+            if(track == null)
+                continue;
+
+            // Hidden track
+            if(track.Sequence == 0)
+            {
+                track      = tracks.FirstOrDefault(t => (int)t.Sequence == 1);
+                trackStart = 0;
+                pregap     = track?.StartSector ?? 0;
+            }
+            else
+            {
+                trackStart = track.StartSector;
+                pregap     = track.Pregap;
+            }
+
+            if(!trackFlags.TryGetValue((byte)(track?.Sequence ?? 0), out trkFlags) &&
+               track?.Type != TrackType.Audio)
+                flags = (byte)CdFlags.DataTrack;
+            else
+                flags = trkFlags;
+
+            byte index;
+
+            if(track?.Indexes?.Count > 0)
+                index = (byte)track.Indexes.LastOrDefault(i => i.Value >= sector).Key;
+            else
+                index = 0;
+
+            updateProgress?.Invoke($"Generating subchannel for sector {sector}...", sector, (long)blocks);
+            dumpLog?.WriteLine($"Generating subchannel for sector {sector}.");
+
+            byte[] sub = Subchannel.Generate(sector, track?.Sequence ?? 0, (int)pregap, (int)trackStart, flags,
+                                             index);
+
+            outputPlugin.WriteSectorsTag(sub, (ulong)sector, 1, SectorTagType.CdSectorSubchannel);
+
+            subLog?.WriteEntry(sub, true, sector, 1, true, false);
+        }
+
+        endProgress?.Invoke();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Media/Detection/MMC.cs b/Aaru.Core/Media/Detection/MMC.cs
index 87c98e047..4d0b0ada6 100644
--- a/Aaru.Core/Media/Detection/MMC.cs
+++ b/Aaru.Core/Media/Detection/MMC.cs
@@ -49,669 +49,725 @@ using DMI = Aaru.Decoders.Xbox.DMI;
 
 // ReSharper disable JoinDeclarationAndInitializer
 
-namespace Aaru.Core.Media.Detection
+namespace Aaru.Core.Media.Detection;
+
+/// <summary>Detects media type for MMC class devices</summary>
+public static class MMC
 {
-    /// <summary>Detects media type for MMC class devices</summary>
-    public static class MMC
+    /// <summary>SHA256 of PlayStation 2 boot sectors, seen in PAL discs</summary>
+    const string PS2_PAL_HASH = "5d04ff236613e1d8adcf9c201874acd6f6deed1e04306558b86f91cfb626f39d";
+
+    /// <summary>SHA256 of PlayStation 2 boot sectors, seen in Japanese, American, Malaysian and Korean discs</summary>
+    const string PS2_NTSC_HASH = "0bada1426e2c0351b872ef2a9ad2e5a0ac3918f4c53aa53329cb2911a8e16c23";
+
+    /// <summary>SHA256 of PlayStation 2 boot sectors, seen in Japanese discs</summary>
+    const string PS2_JAPANESE_HASH = "b82bffb809070d61fe050b7e1545df53d8f3cc648257cdff7502bc0ba6b38870";
+
+    static readonly byte[] _ps3Id =
     {
-        /// <summary>SHA256 of PlayStation 2 boot sectors, seen in PAL discs</summary>
-        const string PS2_PAL_HASH = "5d04ff236613e1d8adcf9c201874acd6f6deed1e04306558b86f91cfb626f39d";
+        0x50, 0x6C, 0x61, 0x79, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x33, 0x00, 0x00, 0x00, 0x00
+    };
 
-        /// <summary>SHA256 of PlayStation 2 boot sectors, seen in Japanese, American, Malaysian and Korean discs</summary>
-        const string PS2_NTSC_HASH = "0bada1426e2c0351b872ef2a9ad2e5a0ac3918f4c53aa53329cb2911a8e16c23";
+    static readonly byte[] _ps4Id =
+    {
+        0x50, 0x6C, 0x61, 0x79, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x34, 0x00, 0x00, 0x00, 0x00
+    };
 
-        /// <summary>SHA256 of PlayStation 2 boot sectors, seen in Japanese discs</summary>
-        const string PS2_JAPANESE_HASH = "b82bffb809070d61fe050b7e1545df53d8f3cc648257cdff7502bc0ba6b38870";
+    static readonly byte[] _ps5Id =
+    {
+        0x50, 0x6C, 0x61, 0x79, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x35, 0x00, 0x00, 0x00, 0x00
+    };
 
-        static readonly byte[] _ps3Id =
-        {
-            0x50, 0x6C, 0x61, 0x79, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x33, 0x00, 0x00, 0x00, 0x00
-        };
+    static readonly byte[] _operaId =
+    {
+        0x01, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x01
+    };
 
-        static readonly byte[] _ps4Id =
-        {
-            0x50, 0x6C, 0x61, 0x79, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x34, 0x00, 0x00, 0x00, 0x00
-        };
+    // Only present on bootable CDs, but those make more than 99% of all available
+    static readonly byte[] _fmTownsBootId =
+    {
+        0x49, 0x50, 0x4C, 0x34, 0xEB, 0x55, 0x06
+    };
 
-        static readonly byte[] _ps5Id =
-        {
-            0x50, 0x6C, 0x61, 0x79, 0x53, 0x74, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x35, 0x00, 0x00, 0x00, 0x00
-        };
+    /// <summary>Present on first two seconds of second track, says "COPYRIGHT BANDAI"</summary>
+    static readonly byte[] _playdiaCopyright =
+    {
+        0x43, 0x4F, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x42, 0x41, 0x4E, 0x44, 0x41, 0x49
+    };
 
-        static readonly byte[] _operaId =
-        {
-            0x01, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x01
-        };
+    static readonly byte[] _pcEngineSignature =
+    {
+        0x50, 0x43, 0x20, 0x45, 0x6E, 0x67, 0x69, 0x6E, 0x65, 0x20, 0x43, 0x44, 0x2D, 0x52, 0x4F, 0x4D, 0x20, 0x53,
+        0x59, 0x53, 0x54, 0x45, 0x4D
+    };
 
-        // Only present on bootable CDs, but those make more than 99% of all available
-        static readonly byte[] _fmTownsBootId =
-        {
-            0x49, 0x50, 0x4C, 0x34, 0xEB, 0x55, 0x06
-        };
+    static readonly byte[] _pcFxSignature =
+    {
+        0x50, 0x43, 0x2D, 0x46, 0x58, 0x3A, 0x48, 0x75, 0x5F, 0x43, 0x44, 0x2D, 0x52, 0x4F, 0x4D
+    };
 
-        /// <summary>Present on first two seconds of second track, says "COPYRIGHT BANDAI"</summary>
-        static readonly byte[] _playdiaCopyright =
-        {
-            0x43, 0x4F, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x42, 0x41, 0x4E, 0x44, 0x41, 0x49
-        };
+    static readonly byte[] _atariSignature =
+    {
+        0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41,
+        0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52,
+        0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41,
+        0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x52, 0x41, 0x20, 0x49, 0x50, 0x41,
+        0x52, 0x50, 0x56, 0x4F, 0x44, 0x45, 0x44, 0x20, 0x54, 0x41, 0x20, 0x41, 0x45, 0x48, 0x44, 0x41, 0x52, 0x45,
+        0x41, 0x20, 0x52, 0x54
+    };
 
-        static readonly byte[] _pcEngineSignature =
-        {
-            0x50, 0x43, 0x20, 0x45, 0x6E, 0x67, 0x69, 0x6E, 0x65, 0x20, 0x43, 0x44, 0x2D, 0x52, 0x4F, 0x4D, 0x20, 0x53,
-            0x59, 0x53, 0x54, 0x45, 0x4D
-        };
-
-        static readonly byte[] _pcFxSignature =
-        {
-            0x50, 0x43, 0x2D, 0x46, 0x58, 0x3A, 0x48, 0x75, 0x5F, 0x43, 0x44, 0x2D, 0x52, 0x4F, 0x4D
-        };
-
-        static readonly byte[] _atariSignature =
-        {
-            0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41,
-            0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52,
-            0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41,
-            0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x49, 0x52, 0x54, 0x41, 0x52, 0x41, 0x20, 0x49, 0x50, 0x41,
-            0x52, 0x50, 0x56, 0x4F, 0x44, 0x45, 0x44, 0x20, 0x54, 0x41, 0x20, 0x41, 0x45, 0x48, 0x44, 0x41, 0x52, 0x45,
-            0x41, 0x20, 0x52, 0x54
-        };
-
-        /// <summary>This is some kind of header. Every 10 bytes there's an audio byte.</summary>
-        static readonly byte[] _videoNowColorFrameMarker =
-        {
-            0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3,
-            0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81,
-            0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7,
-            0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3,
-            0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00,
-            0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3,
-            0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81,
-            0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7,
-            0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3,
-            0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00,
-            0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3,
-            0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81,
-            0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7,
-            0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x00, 0x00, 0x02, 0x01, 0x04, 0x02, 0x06, 0x03, 0xFF, 0x00, 0x08, 0x04,
-            0x0A, 0x05, 0x0C, 0x06, 0x0E, 0x07, 0xFF, 0x00, 0x11, 0x08, 0x13, 0x09, 0x15, 0x0A, 0x17, 0x0B, 0xFF, 0x00,
-            0x19, 0x0C, 0x1B, 0x0D, 0x1D, 0x0E, 0x1F, 0x0F, 0xFF, 0x00, 0x00, 0x28, 0x02, 0x29, 0x04, 0x2A, 0x06, 0x2B,
-            0xFF, 0x00, 0x08, 0x2C, 0x0A, 0x2D, 0x0C, 0x2E, 0x0E, 0x2F, 0xFF, 0x00, 0x11, 0x30, 0x13, 0x31, 0x15, 0x32,
-            0x17, 0x33, 0xFF, 0x00, 0x19, 0x34, 0x1B, 0x35, 0x1D, 0x36, 0x1F, 0x37, 0xFF, 0x00, 0x00, 0x38, 0x02, 0x39,
-            0x04, 0x3A, 0x06, 0x3B, 0xFF, 0x00, 0x08, 0x3C, 0x0A, 0x3D, 0x0C, 0x3E, 0x0E, 0x3F, 0xFF, 0x00, 0x11, 0x40,
-            0x13, 0x41, 0x15, 0x42, 0x17, 0x43, 0xFF, 0x00, 0x19, 0x44, 0x1B, 0x45, 0x1D, 0x46, 0x1F, 0x47, 0xFF, 0x00,
-            0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-            0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-            0xFF, 0xFF, 0xFF, 0x00
-        };
-
-        static bool IsData(byte[] sector)
-        {
-            if(sector?.Length != 2352)
-                return false;
-
-            byte[] syncMark =
-            {
-                0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
-            };
-
-            byte[] testMark = new byte[12];
-            Array.Copy(sector, 0, testMark, 0, 12);
-
-            return syncMark.SequenceEqual(testMark) && (sector[0xF] == 0 || sector[0xF] == 1 || sector[0xF] == 2);
-        }
-
-        static bool IsScrambledData(byte[] sector, int wantedLba, out int offset)
-        {
-            offset = 0;
-
-            if(sector?.Length != 2352)
-                return false;
-
-            byte[] syncMark =
-            {
-                0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
-            };
-
-            byte[] testMark = new byte[12];
-
-            for(int i = 0; i <= 2336; i++)
-            {
-                Array.Copy(sector, i, testMark, 0, 12);
-
-                if(!syncMark.SequenceEqual(testMark) ||
-                   (sector[i + 0xF] != 0x60 && sector[i + 0xF] != 0x61 && sector[i + 0xF] != 0x62))
-                    continue;
-
-                // De-scramble M and S
-                int minute = sector[i + 12] ^ 0x01;
-                int second = sector[i + 13] ^ 0x80;
-                int frame  = sector[i + 14];
-
-                // Convert to binary
-                minute = (minute / 16 * 10) + (minute & 0x0F);
-                second = (second / 16 * 10) + (second & 0x0F);
-                frame  = (frame  / 16 * 10) + (frame  & 0x0F);
-
-                // Calculate the first found LBA
-                int lba = (minute * 60 * 75) + (second * 75) + frame - 150;
-
-                // Calculate the difference between the found LBA and the requested one
-                int diff = wantedLba - lba;
-
-                offset = i + (2352 * diff);
-
-                return true;
-            }
+    /// <summary>This is some kind of header. Every 10 bytes there's an audio byte.</summary>
+    static readonly byte[] _videoNowColorFrameMarker =
+    {
+        0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3,
+        0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81,
+        0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7,
+        0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3,
+        0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00,
+        0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3,
+        0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81,
+        0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7,
+        0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3,
+        0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00,
+        0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3,
+        0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81,
+        0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7, 0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x81, 0xE3, 0xE3, 0xC7,
+        0xC7, 0x81, 0x81, 0xE3, 0xC7, 0x00, 0x00, 0x00, 0x02, 0x01, 0x04, 0x02, 0x06, 0x03, 0xFF, 0x00, 0x08, 0x04,
+        0x0A, 0x05, 0x0C, 0x06, 0x0E, 0x07, 0xFF, 0x00, 0x11, 0x08, 0x13, 0x09, 0x15, 0x0A, 0x17, 0x0B, 0xFF, 0x00,
+        0x19, 0x0C, 0x1B, 0x0D, 0x1D, 0x0E, 0x1F, 0x0F, 0xFF, 0x00, 0x00, 0x28, 0x02, 0x29, 0x04, 0x2A, 0x06, 0x2B,
+        0xFF, 0x00, 0x08, 0x2C, 0x0A, 0x2D, 0x0C, 0x2E, 0x0E, 0x2F, 0xFF, 0x00, 0x11, 0x30, 0x13, 0x31, 0x15, 0x32,
+        0x17, 0x33, 0xFF, 0x00, 0x19, 0x34, 0x1B, 0x35, 0x1D, 0x36, 0x1F, 0x37, 0xFF, 0x00, 0x00, 0x38, 0x02, 0x39,
+        0x04, 0x3A, 0x06, 0x3B, 0xFF, 0x00, 0x08, 0x3C, 0x0A, 0x3D, 0x0C, 0x3E, 0x0E, 0x3F, 0xFF, 0x00, 0x11, 0x40,
+        0x13, 0x41, 0x15, 0x42, 0x17, 0x43, 0xFF, 0x00, 0x19, 0x44, 0x1B, 0x45, 0x1D, 0x46, 0x1F, 0x47, 0xFF, 0x00,
+        0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0x00
+    };
 
+    static bool IsData(byte[] sector)
+    {
+        if(sector?.Length != 2352)
             return false;
-        }
 
-        static byte[] DescrambleAndFixOffset(byte[] sector, int offsetBytes, int sectorsForOffset)
+        byte[] syncMark =
         {
-            byte[] descrambled = new byte[2352];
+            0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
+        };
 
-            int offsetFix = offsetBytes < 0 ? (2352 * sectorsForOffset) + offsetBytes : offsetBytes;
+        byte[] testMark = new byte[12];
+        Array.Copy(sector, 0, testMark, 0, 12);
 
-            Array.Copy(sector, offsetFix, descrambled, 0, 2352);
+        return syncMark.SequenceEqual(testMark) && (sector[0xF] == 0 || sector[0xF] == 1 || sector[0xF] == 2);
+    }
 
-            return Sector.Scramble(descrambled);
-        }
-
-        /// <summary>Checks if the media corresponds to CD-i.</summary>
-        /// <param name="sector0">Contents of LBA 0, with all headers.</param>
-        /// <param name="sector16">Contents of LBA 0, with all headers.</param>
-        /// <returns><c>true</c> if it corresponds to a CD-i, <c>false</c>otherwise.</returns>
-        static bool IsCdi(byte[] sector0, byte[] sector16)
-        {
-            if(sector16?.Length != 2352)
-                return false;
-
-            byte[] cdiMark =
-            {
-                0x01, 0x43, 0x44, 0x2D
-            };
-
-            bool isData = IsData(sector0);
-
-            if(!isData ||
-               (sector0[0xF] != 2 && sector0[0xF] != 1))
-                return false;
-
-            byte[] testMark = new byte[4];
-            Array.Copy(sector16, 24, testMark, 0, 4);
-
-            return cdiMark.SequenceEqual(testMark);
-        }
-
-        static bool IsVideoNowColor(byte[] videoFrame)
-        {
-            if(videoFrame is null ||
-               videoFrame.Length < _videoNowColorFrameMarker.Length)
-                return false;
-
-            byte[] buffer = new byte[_videoNowColorFrameMarker.Length];
-
-            for(int framePosition = 0; framePosition + buffer.Length < videoFrame.Length; framePosition++)
-            {
-                Array.Copy(videoFrame, framePosition, buffer, 0, buffer.Length);
-
-                for(int ab = 9; ab < buffer.Length; ab += 10)
-                    buffer[ab] = 0;
-
-                if(!_videoNowColorFrameMarker.SequenceEqual(buffer))
-                    continue;
-
-                return true;
-            }
+    static bool IsScrambledData(byte[] sector, int wantedLba, out int offset)
+    {
+        offset = 0;
 
+        if(sector?.Length != 2352)
             return false;
+
+        byte[] syncMark =
+        {
+            0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
+        };
+
+        byte[] testMark = new byte[12];
+
+        for(int i = 0; i <= 2336; i++)
+        {
+            Array.Copy(sector, i, testMark, 0, 12);
+
+            if(!syncMark.SequenceEqual(testMark) ||
+               (sector[i + 0xF] != 0x60 && sector[i + 0xF] != 0x61 && sector[i + 0xF] != 0x62))
+                continue;
+
+            // De-scramble M and S
+            int minute = sector[i + 12] ^ 0x01;
+            int second = sector[i + 13] ^ 0x80;
+            int frame  = sector[i + 14];
+
+            // Convert to binary
+            minute = (minute / 16 * 10) + (minute & 0x0F);
+            second = (second / 16 * 10) + (second & 0x0F);
+            frame  = (frame  / 16 * 10) + (frame  & 0x0F);
+
+            // Calculate the first found LBA
+            int lba = (minute * 60 * 75) + (second * 75) + frame - 150;
+
+            // Calculate the difference between the found LBA and the requested one
+            int diff = wantedLba - lba;
+
+            offset = i + (2352 * diff);
+
+            return true;
         }
 
-        internal static int GetVideoNowColorOffset(byte[] data)
-        {
-            byte[] buffer = new byte[_videoNowColorFrameMarker.Length];
+        return false;
+    }
 
-            for(int framePosition = 0; framePosition + buffer.Length < data.Length; framePosition++)
+    static byte[] DescrambleAndFixOffset(byte[] sector, int offsetBytes, int sectorsForOffset)
+    {
+        byte[] descrambled = new byte[2352];
+
+        int offsetFix = offsetBytes < 0 ? (2352 * sectorsForOffset) + offsetBytes : offsetBytes;
+
+        Array.Copy(sector, offsetFix, descrambled, 0, 2352);
+
+        return Sector.Scramble(descrambled);
+    }
+
+    /// <summary>Checks if the media corresponds to CD-i.</summary>
+    /// <param name="sector0">Contents of LBA 0, with all headers.</param>
+    /// <param name="sector16">Contents of LBA 0, with all headers.</param>
+    /// <returns><c>true</c> if it corresponds to a CD-i, <c>false</c>otherwise.</returns>
+    static bool IsCdi(byte[] sector0, byte[] sector16)
+    {
+        if(sector16?.Length != 2352)
+            return false;
+
+        byte[] cdiMark =
+        {
+            0x01, 0x43, 0x44, 0x2D
+        };
+
+        bool isData = IsData(sector0);
+
+        if(!isData ||
+           (sector0[0xF] != 2 && sector0[0xF] != 1))
+            return false;
+
+        byte[] testMark = new byte[4];
+        Array.Copy(sector16, 24, testMark, 0, 4);
+
+        return cdiMark.SequenceEqual(testMark);
+    }
+
+    static bool IsVideoNowColor(byte[] videoFrame)
+    {
+        if(videoFrame is null ||
+           videoFrame.Length < _videoNowColorFrameMarker.Length)
+            return false;
+
+        byte[] buffer = new byte[_videoNowColorFrameMarker.Length];
+
+        for(int framePosition = 0; framePosition + buffer.Length < videoFrame.Length; framePosition++)
+        {
+            Array.Copy(videoFrame, framePosition, buffer, 0, buffer.Length);
+
+            for(int ab = 9; ab < buffer.Length; ab += 10)
+                buffer[ab] = 0;
+
+            if(!_videoNowColorFrameMarker.SequenceEqual(buffer))
+                continue;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    internal static int GetVideoNowColorOffset(byte[] data)
+    {
+        byte[] buffer = new byte[_videoNowColorFrameMarker.Length];
+
+        for(int framePosition = 0; framePosition + buffer.Length < data.Length; framePosition++)
+        {
+            Array.Copy(data, framePosition, buffer, 0, buffer.Length);
+
+            for(int ab = 9; ab < buffer.Length; ab += 10)
+                buffer[ab] = 0;
+
+            if(!_videoNowColorFrameMarker.SequenceEqual(buffer))
+                continue;
+
+            return 18032 - framePosition;
+        }
+
+        return 0;
+    }
+
+    internal static void DetectDiscType(ref MediaType mediaType, int sessions, FullTOC.CDFullTOC? decodedToc,
+                                        Device dev, out bool hiddenTrack, out bool hiddenData,
+                                        int firstTrackLastSession, ulong blocks)
+    {
+        uint                startOfFirstDataTrack = uint.MaxValue;
+        DI.DiscInformation? blurayDi              = null;
+        byte[]              cmdBuf;
+        bool                sense;
+        byte                secondSessionFirstTrack = 0;
+        byte[]              sector0;
+        byte[]              sector1                      = null;
+        byte[]              ps2BootSectors               = null;
+        byte[]              playdia1                     = null;
+        byte[]              playdia2                     = null;
+        byte[]              firstDataSectorNotZero       = null;
+        byte[]              secondDataSectorNotZero      = null;
+        byte[]              firstTrackSecondSession      = null;
+        byte[]              firstTrackSecondSessionAudio = null;
+        byte[]              videoNowColorFrame;
+        hiddenTrack = false;
+        hiddenData  = false;
+
+        sense = dev.GetConfiguration(out cmdBuf, out _, 0, MmcGetConfigurationRt.Current, dev.Timeout, out _);
+
+        if(!sense)
+        {
+            Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
+
+            AaruConsole.DebugWriteLine("Media-Info command", "GET CONFIGURATION current profile is {0:X4}h",
+                                       ftr.CurrentProfile);
+
+            switch(ftr.CurrentProfile)
             {
-                Array.Copy(data, framePosition, buffer, 0, buffer.Length);
+                case 0x0001:
+                    mediaType = MediaType.GENERIC_HDD;
 
-                for(int ab = 9; ab < buffer.Length; ab += 10)
-                    buffer[ab] = 0;
+                    break;
+                case 0x0005:
+                    mediaType = MediaType.CDMO;
 
-                if(!_videoNowColorFrameMarker.SequenceEqual(buffer))
-                    continue;
+                    break;
+                case 0x0008:
+                    mediaType = MediaType.CD;
 
-                return 18032 - framePosition;
+                    break;
+                case 0x0009:
+                    mediaType = MediaType.CDR;
+
+                    break;
+                case 0x000A:
+                    mediaType = MediaType.CDRW;
+
+                    break;
+                case 0x0010:
+                    mediaType = MediaType.DVDROM;
+
+                    break;
+                case 0x0011:
+                    mediaType = MediaType.DVDR;
+
+                    break;
+                case 0x0012:
+                    mediaType = MediaType.DVDRAM;
+
+                    break;
+                case 0x0013:
+                case 0x0014:
+                    mediaType = MediaType.DVDRW;
+
+                    break;
+                case 0x0015:
+                case 0x0016:
+                    mediaType = MediaType.DVDRDL;
+
+                    break;
+                case 0x0017:
+                    mediaType = MediaType.DVDRWDL;
+
+                    break;
+                case 0x0018:
+                    mediaType = MediaType.DVDDownload;
+
+                    break;
+                case 0x001A:
+                    mediaType = MediaType.DVDPRW;
+
+                    break;
+                case 0x001B:
+                    mediaType = MediaType.DVDPR;
+
+                    break;
+                case 0x0020:
+                    mediaType = MediaType.DDCD;
+
+                    break;
+                case 0x0021:
+                    mediaType = MediaType.DDCDR;
+
+                    break;
+                case 0x0022:
+                    mediaType = MediaType.DDCDRW;
+
+                    break;
+                case 0x002A:
+                    mediaType = MediaType.DVDPRWDL;
+
+                    break;
+                case 0x002B:
+                    mediaType = MediaType.DVDPRDL;
+
+                    break;
+                case 0x0040:
+                    mediaType = MediaType.BDROM;
+
+                    break;
+                case 0x0041:
+                case 0x0042:
+                    mediaType = MediaType.BDR;
+
+                    break;
+                case 0x0043:
+                    mediaType = MediaType.BDRE;
+
+                    break;
+                case 0x0050:
+                    mediaType = MediaType.HDDVDROM;
+
+                    break;
+                case 0x0051:
+                    mediaType = MediaType.HDDVDR;
+
+                    break;
+                case 0x0052:
+                    mediaType = MediaType.HDDVDRAM;
+
+                    break;
+                case 0x0053:
+                    mediaType = MediaType.HDDVDRW;
+
+                    break;
+                case 0x0058:
+                    mediaType = MediaType.HDDVDRDL;
+
+                    break;
+                case 0x005A:
+                    mediaType = MediaType.HDDVDRWDL;
+
+                    break;
             }
-
-            return 0;
         }
 
-        internal static void DetectDiscType(ref MediaType mediaType, int sessions, FullTOC.CDFullTOC? decodedToc,
-                                            Device dev, out bool hiddenTrack, out bool hiddenData,
-                                            int firstTrackLastSession, ulong blocks)
-        {
-            uint                startOfFirstDataTrack = uint.MaxValue;
-            DI.DiscInformation? blurayDi              = null;
-            byte[]              cmdBuf;
-            bool                sense;
-            byte                secondSessionFirstTrack = 0;
-            byte[]              sector0;
-            byte[]              sector1                      = null;
-            byte[]              ps2BootSectors               = null;
-            byte[]              playdia1                     = null;
-            byte[]              playdia2                     = null;
-            byte[]              firstDataSectorNotZero       = null;
-            byte[]              secondDataSectorNotZero      = null;
-            byte[]              firstTrackSecondSession      = null;
-            byte[]              firstTrackSecondSessionAudio = null;
-            byte[]              videoNowColorFrame;
-            hiddenTrack = false;
-            hiddenData  = false;
+        if(decodedToc?.TrackDescriptors.Any(t => t.SessionNumber == 2) == true)
+            secondSessionFirstTrack = decodedToc.Value.TrackDescriptors.Where(t => t.SessionNumber == 2).
+                                                 Min(t => t.POINT);
 
-            sense = dev.GetConfiguration(out cmdBuf, out _, 0, MmcGetConfigurationRt.Current, dev.Timeout, out _);
+        if(mediaType == MediaType.CD      ||
+           mediaType == MediaType.CDROMXA ||
+           mediaType == MediaType.CDI)
+        {
+            sense = dev.ReadAtip(out cmdBuf, out _, dev.Timeout, out _);
 
             if(!sense)
             {
-                Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
+                ATIP.CDATIP atip = ATIP.Decode(cmdBuf);
 
-                AaruConsole.DebugWriteLine("Media-Info command", "GET CONFIGURATION current profile is {0:X4}h",
-                                           ftr.CurrentProfile);
+                if(atip != null)
 
-                switch(ftr.CurrentProfile)
-                {
-                    case 0x0001:
-                        mediaType = MediaType.GENERIC_HDD;
-
-                        break;
-                    case 0x0005:
-                        mediaType = MediaType.CDMO;
-
-                        break;
-                    case 0x0008:
-                        mediaType = MediaType.CD;
-
-                        break;
-                    case 0x0009:
-                        mediaType = MediaType.CDR;
-
-                        break;
-                    case 0x000A:
-                        mediaType = MediaType.CDRW;
-
-                        break;
-                    case 0x0010:
-                        mediaType = MediaType.DVDROM;
-
-                        break;
-                    case 0x0011:
-                        mediaType = MediaType.DVDR;
-
-                        break;
-                    case 0x0012:
-                        mediaType = MediaType.DVDRAM;
-
-                        break;
-                    case 0x0013:
-                    case 0x0014:
-                        mediaType = MediaType.DVDRW;
-
-                        break;
-                    case 0x0015:
-                    case 0x0016:
-                        mediaType = MediaType.DVDRDL;
-
-                        break;
-                    case 0x0017:
-                        mediaType = MediaType.DVDRWDL;
-
-                        break;
-                    case 0x0018:
-                        mediaType = MediaType.DVDDownload;
-
-                        break;
-                    case 0x001A:
-                        mediaType = MediaType.DVDPRW;
-
-                        break;
-                    case 0x001B:
-                        mediaType = MediaType.DVDPR;
-
-                        break;
-                    case 0x0020:
-                        mediaType = MediaType.DDCD;
-
-                        break;
-                    case 0x0021:
-                        mediaType = MediaType.DDCDR;
-
-                        break;
-                    case 0x0022:
-                        mediaType = MediaType.DDCDRW;
-
-                        break;
-                    case 0x002A:
-                        mediaType = MediaType.DVDPRWDL;
-
-                        break;
-                    case 0x002B:
-                        mediaType = MediaType.DVDPRDL;
-
-                        break;
-                    case 0x0040:
-                        mediaType = MediaType.BDROM;
-
-                        break;
-                    case 0x0041:
-                    case 0x0042:
-                        mediaType = MediaType.BDR;
-
-                        break;
-                    case 0x0043:
-                        mediaType = MediaType.BDRE;
-
-                        break;
-                    case 0x0050:
-                        mediaType = MediaType.HDDVDROM;
-
-                        break;
-                    case 0x0051:
-                        mediaType = MediaType.HDDVDR;
-
-                        break;
-                    case 0x0052:
-                        mediaType = MediaType.HDDVDRAM;
-
-                        break;
-                    case 0x0053:
-                        mediaType = MediaType.HDDVDRW;
-
-                        break;
-                    case 0x0058:
-                        mediaType = MediaType.HDDVDRDL;
-
-                        break;
-                    case 0x005A:
-                        mediaType = MediaType.HDDVDRWDL;
-
-                        break;
-                }
+                    // Only CD-R and CD-RW have ATIP
+                    mediaType = atip.DiscType ? MediaType.CDRW : MediaType.CDR;
             }
+        }
 
-            if(decodedToc?.TrackDescriptors.Any(t => t.SessionNumber == 2) == true)
-                secondSessionFirstTrack = decodedToc.Value.TrackDescriptors.Where(t => t.SessionNumber == 2).
-                                                     Min(t => t.POINT);
+        if(mediaType == MediaType.CD ||
+           mediaType == MediaType.CDROMXA)
+        {
+            bool hasDataTrack                  = false;
+            bool hasAudioTrack                 = false;
+            bool allFirstSessionTracksAreAudio = true;
+            bool hasVideoTrack                 = false;
 
-            if(mediaType == MediaType.CD      ||
-               mediaType == MediaType.CDROMXA ||
-               mediaType == MediaType.CDI)
+            if(decodedToc.HasValue)
             {
-                sense = dev.ReadAtip(out cmdBuf, out _, dev.Timeout, out _);
+                FullTOC.TrackDataDescriptor a0Track =
+                    decodedToc.Value.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA0 && t.ADR == 1);
 
-                if(!sense)
-                {
-                    ATIP.CDATIP atip = ATIP.Decode(cmdBuf);
+                if(a0Track.POINT == 0xA0)
+                    switch(a0Track.PSEC)
+                    {
+                        case 0x10:
+                            AaruConsole.DebugWriteLine("Media detection", "TOC says disc type is CD-i.");
+                            mediaType = MediaType.CDI;
 
-                    if(atip != null)
+                            break;
+                        case 0x20:
+                            AaruConsole.DebugWriteLine("Media detection", "TOC says disc type is CD-ROM XA.");
+                            mediaType = MediaType.CDROMXA;
 
-                        // Only CD-R and CD-RW have ATIP
-                        mediaType = atip.DiscType ? MediaType.CDRW : MediaType.CDR;
-                }
-            }
+                            break;
+                    }
 
-            if(mediaType == MediaType.CD ||
-               mediaType == MediaType.CDROMXA)
-            {
-                bool hasDataTrack                  = false;
-                bool hasAudioTrack                 = false;
-                bool allFirstSessionTracksAreAudio = true;
-                bool hasVideoTrack                 = false;
-
-                if(decodedToc.HasValue)
-                {
-                    FullTOC.TrackDataDescriptor a0Track =
-                        decodedToc.Value.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA0 && t.ADR == 1);
-
-                    if(a0Track.POINT == 0xA0)
-                        switch(a0Track.PSEC)
-                        {
-                            case 0x10:
-                                AaruConsole.DebugWriteLine("Media detection", "TOC says disc type is CD-i.");
-                                mediaType = MediaType.CDI;
-
-                                break;
-                            case 0x20:
-                                AaruConsole.DebugWriteLine("Media detection", "TOC says disc type is CD-ROM XA.");
-                                mediaType = MediaType.CDROMXA;
-
-                                break;
-                        }
-
-                    foreach(FullTOC.TrackDataDescriptor track in
+                foreach(FullTOC.TrackDataDescriptor track in
                         decodedToc.Value.TrackDescriptors.Where(t => t.POINT > 0 && t.POINT <= 0x99))
-                    {
-                        if(track.TNO == 1 &&
-                           ((TocControl)(track.CONTROL & 0x0D) == TocControl.DataTrack ||
-                            (TocControl)(track.CONTROL & 0x0D) == TocControl.DataTrackIncremental))
-                            allFirstSessionTracksAreAudio &= firstTrackLastSession != 1;
-
-                        if((TocControl)(track.CONTROL & 0x0D) == TocControl.DataTrack ||
-                           (TocControl)(track.CONTROL & 0x0D) == TocControl.DataTrackIncremental)
-                        {
-                            uint startAddress = (uint)((track.PHOUR * 3600 * 75) + (track.PMIN * 60 * 75) +
-                                                       (track.PSEC  * 75)        + track.PFRAME - 150);
-
-                            if(startAddress < startOfFirstDataTrack)
-                                startOfFirstDataTrack = startAddress;
-
-                            hasDataTrack                  =  true;
-                            allFirstSessionTracksAreAudio &= track.POINT >= firstTrackLastSession;
-                        }
-                        else
-                        {
-                            hasAudioTrack = true;
-                        }
-
-                        hasVideoTrack |= track.ADR == 4;
-                    }
-                }
-
-                if(mediaType != MediaType.CDI)
                 {
-                    if(hasDataTrack                  &&
-                       hasAudioTrack                 &&
-                       allFirstSessionTracksAreAudio &&
-                       sessions == 2)
-                    {
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Disc has audio and data tracks, two sessions, and all data tracks are in second session, setting as CD+.");
+                    if(track.TNO == 1 &&
+                       ((TocControl)(track.CONTROL & 0x0D) == TocControl.DataTrack ||
+                        (TocControl)(track.CONTROL & 0x0D) == TocControl.DataTrackIncremental))
+                        allFirstSessionTracksAreAudio &= firstTrackLastSession != 1;
 
-                        mediaType = MediaType.CDPLUS;
+                    if((TocControl)(track.CONTROL & 0x0D) == TocControl.DataTrack ||
+                       (TocControl)(track.CONTROL & 0x0D) == TocControl.DataTrackIncremental)
+                    {
+                        uint startAddress = (uint)((track.PHOUR * 3600 * 75) + (track.PMIN * 60 * 75) +
+                                                   (track.PSEC  * 75)        + track.PFRAME - 150);
+
+                        if(startAddress < startOfFirstDataTrack)
+                            startOfFirstDataTrack = startAddress;
+
+                        hasDataTrack                  =  true;
+                        allFirstSessionTracksAreAudio &= track.POINT >= firstTrackLastSession;
+                    }
+                    else
+                    {
+                        hasAudioTrack = true;
                     }
 
-                    if(!hasDataTrack &&
-                       hasAudioTrack &&
-                       sessions == 1)
-                    {
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Disc has only audio tracks in a single session, setting as CD Digital Audio.");
-
-                        mediaType = MediaType.CDDA;
-                    }
-
-                    if(hasDataTrack   &&
-                       !hasAudioTrack &&
-                       sessions == 1)
-                    {
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Disc has only data tracks in a single session, setting as CD-ROM.");
-
-                        mediaType = MediaType.CDROM;
-                    }
-
-                    if(hasVideoTrack &&
-                       !hasDataTrack &&
-                       sessions == 1)
-                    {
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Disc has video tracks in a single session, setting as CD Video.");
-
-                        mediaType = MediaType.CDV;
-                    }
-                }
-
-                if((mediaType == MediaType.CD || mediaType == MediaType.CDROM) && hasDataTrack)
-                {
-                    foreach(uint startAddress in decodedToc.Value.TrackDescriptors.
-                                                            Where(t => t.POINT > 0 && t.POINT <= 0x99 &&
-                                                                       ((TocControl)(t.CONTROL & 0x0D) ==
-                                                                        TocControl.DataTrack ||
-                                                                        (TocControl)(t.CONTROL & 0x0D) ==
-                                                                        TocControl.DataTrackIncremental)).
-                                                            Select(track => (uint)((track.PHOUR     * 3600 * 75) +
-                                                                                        (track.PMIN * 60   * 75) +
-                                                                                        (track.PSEC * 75)        +
-                                                                                        track.PFRAME - 150) + 16))
-                    {
-                        sense = dev.ReadCd(out cmdBuf, out _, startAddress, 2352, 1, MmcSectorTypes.AllTypes, false,
-                                           false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                           MmcSubchannel.None, dev.Timeout, out _);
-
-                        if(sense || dev.Error)
-                            continue;
-
-                        if(cmdBuf[0]  != 0x00 ||
-                           cmdBuf[1]  != 0xFF ||
-                           cmdBuf[2]  != 0xFF ||
-                           cmdBuf[3]  != 0xFF ||
-                           cmdBuf[4]  != 0xFF ||
-                           cmdBuf[5]  != 0xFF ||
-                           cmdBuf[6]  != 0xFF ||
-                           cmdBuf[7]  != 0xFF ||
-                           cmdBuf[8]  != 0xFF ||
-                           cmdBuf[9]  != 0xFF ||
-                           cmdBuf[10] != 0xFF ||
-                           cmdBuf[11] != 0x00 ||
-                           cmdBuf[15] != 0x02)
-                            continue;
-
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Disc has a mode 2 data track, setting as CD-ROM XA.");
-
-                        mediaType = MediaType.CDROMXA;
-
-                        break;
-                    }
+                    hasVideoTrack |= track.ADR == 4;
                 }
             }
 
-            if(secondSessionFirstTrack                                                   != 0 &&
-               decodedToc?.TrackDescriptors.Any(t => t.POINT == secondSessionFirstTrack) == true)
+            if(mediaType != MediaType.CDI)
             {
-                FullTOC.TrackDataDescriptor secondSessionFirstTrackTrack =
-                    decodedToc.Value.TrackDescriptors.First(t => t.POINT == secondSessionFirstTrack);
+                if(hasDataTrack                  &&
+                   hasAudioTrack                 &&
+                   allFirstSessionTracksAreAudio &&
+                   sessions == 2)
+                {
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Disc has audio and data tracks, two sessions, and all data tracks are in second session, setting as CD+.");
 
-                uint firstSectorSecondSessionFirstTrack =
-                    (uint)((secondSessionFirstTrackTrack.PHOUR * 3600 * 75) +
-                           (secondSessionFirstTrackTrack.PMIN  * 60   * 75) + (secondSessionFirstTrackTrack.PSEC * 75) +
-                           secondSessionFirstTrackTrack.PFRAME - 150);
+                    mediaType = MediaType.CDPLUS;
+                }
 
+                if(!hasDataTrack &&
+                   hasAudioTrack &&
+                   sessions == 1)
+                {
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Disc has only audio tracks in a single session, setting as CD Digital Audio.");
+
+                    mediaType = MediaType.CDDA;
+                }
+
+                if(hasDataTrack   &&
+                   !hasAudioTrack &&
+                   sessions == 1)
+                {
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Disc has only data tracks in a single session, setting as CD-ROM.");
+
+                    mediaType = MediaType.CDROM;
+                }
+
+                if(hasVideoTrack &&
+                   !hasDataTrack &&
+                   sessions == 1)
+                {
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Disc has video tracks in a single session, setting as CD Video.");
+
+                    mediaType = MediaType.CDV;
+                }
+            }
+
+            if((mediaType == MediaType.CD || mediaType == MediaType.CDROM) && hasDataTrack)
+            {
+                foreach(uint startAddress in decodedToc.Value.TrackDescriptors.
+                                                        Where(t => t.POINT > 0 && t.POINT <= 0x99 &&
+                                                                   ((TocControl)(t.CONTROL & 0x0D) ==
+                                                                    TocControl.DataTrack ||
+                                                                    (TocControl)(t.CONTROL & 0x0D) ==
+                                                                    TocControl.DataTrackIncremental)).
+                                                        Select(track => (uint)((track.PHOUR * 3600 * 75) +
+                                                                               (track.PMIN  * 60   * 75) +
+                                                                               (track.PSEC  * 75)        +
+                                                                               track.PFRAME - 150) + 16))
+                {
+                    sense = dev.ReadCd(out cmdBuf, out _, startAddress, 2352, 1, MmcSectorTypes.AllTypes, false,
+                                       false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                       MmcSubchannel.None, dev.Timeout, out _);
+
+                    if(sense || dev.Error)
+                        continue;
+
+                    if(cmdBuf[0]  != 0x00 ||
+                       cmdBuf[1]  != 0xFF ||
+                       cmdBuf[2]  != 0xFF ||
+                       cmdBuf[3]  != 0xFF ||
+                       cmdBuf[4]  != 0xFF ||
+                       cmdBuf[5]  != 0xFF ||
+                       cmdBuf[6]  != 0xFF ||
+                       cmdBuf[7]  != 0xFF ||
+                       cmdBuf[8]  != 0xFF ||
+                       cmdBuf[9]  != 0xFF ||
+                       cmdBuf[10] != 0xFF ||
+                       cmdBuf[11] != 0x00 ||
+                       cmdBuf[15] != 0x02)
+                        continue;
+
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Disc has a mode 2 data track, setting as CD-ROM XA.");
+
+                    mediaType = MediaType.CDROMXA;
+
+                    break;
+                }
+            }
+        }
+
+        if(secondSessionFirstTrack                                                   != 0 &&
+           decodedToc?.TrackDescriptors.Any(t => t.POINT == secondSessionFirstTrack) == true)
+        {
+            FullTOC.TrackDataDescriptor secondSessionFirstTrackTrack =
+                decodedToc.Value.TrackDescriptors.First(t => t.POINT == secondSessionFirstTrack);
+
+            uint firstSectorSecondSessionFirstTrack =
+                (uint)((secondSessionFirstTrackTrack.PHOUR * 3600 * 75) +
+                       (secondSessionFirstTrackTrack.PMIN  * 60   * 75) + (secondSessionFirstTrackTrack.PSEC * 75) +
+                       secondSessionFirstTrackTrack.PFRAME - 150);
+
+            sense = dev.ReadCd(out cmdBuf, out _, firstSectorSecondSessionFirstTrack, 2352, 1,
+                               MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                               MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+
+            if(!sense &&
+               !dev.Error)
+            {
+                firstTrackSecondSession = cmdBuf;
+            }
+            else
+            {
                 sense = dev.ReadCd(out cmdBuf, out _, firstSectorSecondSessionFirstTrack, 2352, 1,
-                                   MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                   MmcSectorTypes.Cdda, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
                                    MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
                 if(!sense &&
                    !dev.Error)
-                {
                     firstTrackSecondSession = cmdBuf;
-                }
-                else
-                {
-                    sense = dev.ReadCd(out cmdBuf, out _, firstSectorSecondSessionFirstTrack, 2352, 1,
-                                       MmcSectorTypes.Cdda, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
-                                       MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+            }
 
-                    if(!sense &&
-                       !dev.Error)
-                        firstTrackSecondSession = cmdBuf;
-                }
+            sense = dev.ReadCd(out cmdBuf, out _, firstSectorSecondSessionFirstTrack - 1, 2352, 3,
+                               MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                               MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
+            if(!sense &&
+               !dev.Error)
+            {
+                firstTrackSecondSessionAudio = cmdBuf;
+            }
+            else
+            {
                 sense = dev.ReadCd(out cmdBuf, out _, firstSectorSecondSessionFirstTrack - 1, 2352, 3,
-                                   MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                   MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
                                    MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
                 if(!sense &&
                    !dev.Error)
-                {
                     firstTrackSecondSessionAudio = cmdBuf;
-                }
-                else
-                {
-                    sense = dev.ReadCd(out cmdBuf, out _, firstSectorSecondSessionFirstTrack - 1, 2352, 3,
-                                       MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                       MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+            }
+        }
 
-                    if(!sense &&
-                       !dev.Error)
-                        firstTrackSecondSessionAudio = cmdBuf;
+        videoNowColorFrame = new byte[9 * 2352];
+
+        for(int i = 0; i < 9; i++)
+        {
+            sense = dev.ReadCd(out cmdBuf, out _, (uint)i, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
+                               MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
+                               dev.Timeout, out _);
+
+            if(sense || dev.Error)
+            {
+                sense = dev.ReadCd(out cmdBuf, out _, (uint)i, 2352, 1, MmcSectorTypes.Cdda, false, false, false,
+                                   MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
+                                   dev.Timeout, out _);
+
+                if(sense || !dev.Error)
+                {
+                    videoNowColorFrame = null;
+
+                    break;
                 }
             }
 
-            videoNowColorFrame = new byte[9 * 2352];
+            Array.Copy(cmdBuf, 0, videoNowColorFrame, i * 2352, 2352);
+        }
 
-            for(int i = 0; i < 9; i++)
+        FullTOC.TrackDataDescriptor? firstTrack = decodedToc?.TrackDescriptors.FirstOrDefault(t => t.POINT == 1);
+
+        if(firstTrack?.POINT == 1)
+        {
+            uint firstTrackSector = (uint)((firstTrack.Value.PHOUR * 3600 * 75) +
+                                           (firstTrack.Value.PMIN  * 60   * 75) + (firstTrack.Value.PSEC * 75) +
+                                           firstTrack.Value.PFRAME - 150);
+
+            // Check for hidden data before start of track 1
+            if(firstTrackSector > 0)
             {
-                sense = dev.ReadCd(out cmdBuf, out _, (uint)i, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
+                sense = dev.ReadCd(out sector0, out _, 0, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
                                    MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
                                    dev.Timeout, out _);
 
-                if(sense || dev.Error)
+                if(!dev.Error &&
+                   !sense)
                 {
-                    sense = dev.ReadCd(out cmdBuf, out _, (uint)i, 2352, 1, MmcSectorTypes.Cdda, false, false, false,
-                                       MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
-                                       dev.Timeout, out _);
+                    hiddenTrack = true;
 
-                    if(sense || !dev.Error)
+                    hiddenData = IsData(sector0);
+
+                    if(hiddenData)
                     {
-                        videoNowColorFrame = null;
+                        sense = dev.ReadCd(out byte[] sector16, out _, 16, 2352, 1, MmcSectorTypes.AllTypes, false,
+                                           false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                           MmcSubchannel.None, dev.Timeout, out _);
 
-                        break;
+                        if(!sense &&
+                           IsCdi(sector0, sector16))
+                        {
+                            mediaType = MediaType.CDIREADY;
+
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Disc has a hidden CD-i track in track 1's pregap, setting as CD-i Ready.");
+
+                            return;
+                        }
                     }
-                }
-
-                Array.Copy(cmdBuf, 0, videoNowColorFrame, i * 2352, 2352);
-            }
-
-            FullTOC.TrackDataDescriptor? firstTrack = decodedToc?.TrackDescriptors.FirstOrDefault(t => t.POINT == 1);
-
-            if(firstTrack?.POINT == 1)
-            {
-                uint firstTrackSector = (uint)((firstTrack.Value.PHOUR * 3600 * 75) +
-                                               (firstTrack.Value.PMIN  * 60   * 75) + (firstTrack.Value.PSEC * 75) +
-                                               firstTrack.Value.PFRAME - 150);
-
-                // Check for hidden data before start of track 1
-                if(firstTrackSector > 0)
-                {
-                    sense = dev.ReadCd(out sector0, out _, 0, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
-                                       MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
-                                       dev.Timeout, out _);
-
-                    if(!dev.Error &&
-                       !sense)
+                    else
                     {
-                        hiddenTrack = true;
-
-                        hiddenData = IsData(sector0);
+                        hiddenData = IsScrambledData(sector0, 0, out int combinedOffset);
 
                         if(hiddenData)
                         {
-                            sense = dev.ReadCd(out byte[] sector16, out _, 16, 2352, 1, MmcSectorTypes.AllTypes, false,
-                                               false, true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                            int sectorsForOffset = combinedOffset / 2352;
+
+                            if(sectorsForOffset < 0)
+                                sectorsForOffset *= -1;
+
+                            if(combinedOffset % 2352 != 0)
+                                sectorsForOffset++;
+
+                            int lba0  = 0;
+                            int lba16 = 16;
+
+                            if(combinedOffset < 0)
+                            {
+                                lba0  -= sectorsForOffset;
+                                lba16 -= sectorsForOffset;
+                            }
+
+                            sense = dev.ReadCd(out sector0, out _, (uint)lba0, 2352, (uint)sectorsForOffset + 1,
+                                               MmcSectorTypes.AllTypes, false, false, true,
+                                               MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
                                                MmcSubchannel.None, dev.Timeout, out _);
 
-                            if(!sense &&
-                               IsCdi(sector0, sector16))
+                            // Drive does not support reading negative sectors?
+                            if(sense && lba0 < 0)
+                            {
+                                dev.ReadCd(out sector0, out _, 0, 2352, 2, MmcSectorTypes.AllTypes, false, false,
+                                           true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                           MmcSubchannel.None, dev.Timeout, out _);
+
+                                sector0 = DescrambleAndFixOffset(sector0, combinedOffset, sectorsForOffset);
+                            }
+                            else
+                                sector0 = DescrambleAndFixOffset(sector0, combinedOffset, sectorsForOffset);
+
+                            dev.ReadCd(out byte[] sector16, out _, (uint)lba16, 2352, (uint)sectorsForOffset + 1,
+                                       MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true,
+                                       true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+
+                            sector16 = DescrambleAndFixOffset(sector16, combinedOffset, sectorsForOffset);
+
+                            if(IsCdi(sector0, sector16))
                             {
                                 mediaType = MediaType.CDIREADY;
 
@@ -721,142 +777,173 @@ namespace Aaru.Core.Media.Detection
                                 return;
                             }
                         }
-                        else
-                        {
-                            hiddenData = IsScrambledData(sector0, 0, out int combinedOffset);
-
-                            if(hiddenData)
-                            {
-                                int sectorsForOffset = combinedOffset / 2352;
-
-                                if(sectorsForOffset < 0)
-                                    sectorsForOffset *= -1;
-
-                                if(combinedOffset % 2352 != 0)
-                                    sectorsForOffset++;
-
-                                int lba0  = 0;
-                                int lba16 = 16;
-
-                                if(combinedOffset < 0)
-                                {
-                                    lba0  -= sectorsForOffset;
-                                    lba16 -= sectorsForOffset;
-                                }
-
-                                sense = dev.ReadCd(out sector0, out _, (uint)lba0, 2352, (uint)sectorsForOffset + 1,
-                                                   MmcSectorTypes.AllTypes, false, false, true,
-                                                   MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                                   MmcSubchannel.None, dev.Timeout, out _);
-
-                                // Drive does not support reading negative sectors?
-                                if(sense && lba0 < 0)
-                                {
-                                    dev.ReadCd(out sector0, out _, 0, 2352, 2, MmcSectorTypes.AllTypes, false, false,
-                                               true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                               MmcSubchannel.None, dev.Timeout, out _);
-
-                                    sector0 = DescrambleAndFixOffset(sector0, combinedOffset, sectorsForOffset);
-                                }
-                                else
-                                    sector0 = DescrambleAndFixOffset(sector0, combinedOffset, sectorsForOffset);
-
-                                dev.ReadCd(out byte[] sector16, out _, (uint)lba16, 2352, (uint)sectorsForOffset + 1,
-                                           MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true,
-                                           true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
-
-                                sector16 = DescrambleAndFixOffset(sector16, combinedOffset, sectorsForOffset);
-
-                                if(IsCdi(sector0, sector16))
-                                {
-                                    mediaType = MediaType.CDIREADY;
-
-                                    AaruConsole.DebugWriteLine("Media detection",
-                                                               "Disc has a hidden CD-i track in track 1's pregap, setting as CD-i Ready.");
-
-                                    return;
-                                }
-                            }
-                        }
                     }
                 }
             }
+        }
 
-            sector0 = null;
+        sector0 = null;
 
-            switch(mediaType)
+        switch(mediaType)
+        {
+            case MediaType.CD:
+            case MediaType.CDDA:
+            case MediaType.CDPLUS:
+            case MediaType.CDROM:
+            case MediaType.CDROMXA:
             {
-                case MediaType.CD:
-                case MediaType.CDDA:
-                case MediaType.CDPLUS:
-                case MediaType.CDROM:
-                case MediaType.CDROMXA:
+                sense = dev.ReadCd(out cmdBuf, out _, 0, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
+                                   MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
+                                   dev.Timeout, out _);
+
+                if(!sense &&
+                   !dev.Error)
                 {
-                    sense = dev.ReadCd(out cmdBuf, out _, 0, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
-                                       MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
+                    sector0 = new byte[2048];
+                    Array.Copy(cmdBuf, 16, sector0, 0, 2048);
+
+                    sense = dev.ReadCd(out cmdBuf, out _, 1, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
+                                       MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                       MmcSubchannel.None, dev.Timeout, out _);
+
+                    if(!sense &&
+                       !dev.Error)
+                    {
+                        sector1 = new byte[2048];
+                        Array.Copy(cmdBuf, 16, sector1, 0, 2048);
+                    }
+
+                    sense = dev.ReadCd(out cmdBuf, out _, 4200, 2352, 1, MmcSectorTypes.AllTypes, false, false,
+                                       true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                       MmcSubchannel.None, dev.Timeout, out _);
+
+                    if(!sense &&
+                       !dev.Error)
+                    {
+                        playdia1 = new byte[2048];
+                        Array.Copy(cmdBuf, 24, playdia1, 0, 2048);
+                    }
+
+                    sense = dev.ReadCd(out cmdBuf, out _, 4201, 2352, 1, MmcSectorTypes.AllTypes, false, false,
+                                       true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                       MmcSubchannel.None, dev.Timeout, out _);
+
+                    if(!sense &&
+                       !dev.Error)
+                    {
+                        playdia2 = new byte[2048];
+                        Array.Copy(cmdBuf, 24, playdia2, 0, 2048);
+                    }
+
+                    if(startOfFirstDataTrack != uint.MaxValue)
+                    {
+                        sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack, 2352, 1,
+                                           MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                           true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+
+                        if(!sense &&
+                           !dev.Error)
+                        {
+                            firstDataSectorNotZero = new byte[2048];
+                            Array.Copy(cmdBuf, 16, firstDataSectorNotZero, 0, 2048);
+                        }
+
+                        sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack + 1, 2352, 1,
+                                           MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                           true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+
+                        if(!sense &&
+                           !dev.Error)
+                        {
+                            secondDataSectorNotZero = new byte[2048];
+                            Array.Copy(cmdBuf, 16, secondDataSectorNotZero, 0, 2048);
+                        }
+                    }
+
+                    var ps2Ms = new MemoryStream();
+
+                    for(uint p = 0; p < 12; p++)
+                    {
+                        sense = dev.ReadCd(out cmdBuf, out _, p, 2352, 1, MmcSectorTypes.AllTypes, false, false,
+                                           true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                                           MmcSubchannel.None, dev.Timeout, out _);
+
+                        if(sense || dev.Error)
+                            break;
+
+                        ps2Ms.Write(cmdBuf, cmdBuf[0x0F] == 0x02 ? 24 : 16, 2048);
+                    }
+
+                    if(ps2Ms.Length == 0x6000)
+                        ps2BootSectors = ps2Ms.ToArray();
+                }
+                else
+                {
+                    sense = dev.ReadCd(out cmdBuf, out _, 0, 2324, 1, MmcSectorTypes.Mode2, false, false, false,
+                                       MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
                                        dev.Timeout, out _);
 
                     if(!sense &&
                        !dev.Error)
                     {
                         sector0 = new byte[2048];
-                        Array.Copy(cmdBuf, 16, sector0, 0, 2048);
+                        Array.Copy(cmdBuf, 0, sector0, 0, 2048);
 
-                        sense = dev.ReadCd(out cmdBuf, out _, 1, 2352, 1, MmcSectorTypes.AllTypes, false, false, true,
-                                           MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
-                                           MmcSubchannel.None, dev.Timeout, out _);
+                        sense = dev.ReadCd(out cmdBuf, out _, 1, 2324, 1, MmcSectorTypes.Mode2, false, false, false,
+                                           MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
+                                           dev.Timeout, out _);
 
                         if(!sense &&
                            !dev.Error)
                         {
                             sector1 = new byte[2048];
-                            Array.Copy(cmdBuf, 16, sector1, 0, 2048);
+                            Array.Copy(cmdBuf, 1, sector0, 0, 2048);
                         }
 
-                        sense = dev.ReadCd(out cmdBuf, out _, 4200, 2352, 1, MmcSectorTypes.AllTypes, false, false,
-                                           true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                        sense = dev.ReadCd(out cmdBuf, out _, 4200, 2324, 1, MmcSectorTypes.Mode2, false, false,
+                                           false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
                                            MmcSubchannel.None, dev.Timeout, out _);
 
                         if(!sense &&
                            !dev.Error)
                         {
                             playdia1 = new byte[2048];
-                            Array.Copy(cmdBuf, 24, playdia1, 0, 2048);
+                            Array.Copy(cmdBuf, 0, playdia1, 0, 2048);
                         }
 
-                        sense = dev.ReadCd(out cmdBuf, out _, 4201, 2352, 1, MmcSectorTypes.AllTypes, false, false,
-                                           true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                        sense = dev.ReadCd(out cmdBuf, out _, 4201, 2324, 1, MmcSectorTypes.Mode2, false, false,
+                                           false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
                                            MmcSubchannel.None, dev.Timeout, out _);
 
                         if(!sense &&
                            !dev.Error)
                         {
                             playdia2 = new byte[2048];
-                            Array.Copy(cmdBuf, 24, playdia2, 0, 2048);
+                            Array.Copy(cmdBuf, 0, playdia2, 0, 2048);
                         }
 
                         if(startOfFirstDataTrack != uint.MaxValue)
                         {
-                            sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack, 2352, 1,
-                                               MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                               true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+                            sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack, 2324, 1,
+                                               MmcSectorTypes.Mode2, false, false, false, MmcHeaderCodes.None, true,
+                                               false, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
                             if(!sense &&
                                !dev.Error)
                             {
                                 firstDataSectorNotZero = new byte[2048];
-                                Array.Copy(cmdBuf, 16, firstDataSectorNotZero, 0, 2048);
+                                Array.Copy(cmdBuf, 0, firstDataSectorNotZero, 0, 2048);
                             }
 
-                            sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack + 1, 2352, 1,
-                                               MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                               true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+                            sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack + 1, 2324, 1,
+                                               MmcSectorTypes.Mode2, false, false, false, MmcHeaderCodes.None, true,
+                                               false, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
                             if(!sense &&
                                !dev.Error)
                             {
                                 secondDataSectorNotZero = new byte[2048];
-                                Array.Copy(cmdBuf, 16, secondDataSectorNotZero, 0, 2048);
+                                Array.Copy(cmdBuf, 0, secondDataSectorNotZero, 0, 2048);
                             }
                         }
 
@@ -864,14 +951,14 @@ namespace Aaru.Core.Media.Detection
 
                         for(uint p = 0; p < 12; p++)
                         {
-                            sense = dev.ReadCd(out cmdBuf, out _, p, 2352, 1, MmcSectorTypes.AllTypes, false, false,
-                                               true, MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None,
+                            sense = dev.ReadCd(out cmdBuf, out _, p, 2324, 1, MmcSectorTypes.Mode2, false, false,
+                                               false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
                                                MmcSubchannel.None, dev.Timeout, out _);
 
                             if(sense || dev.Error)
                                 break;
 
-                            ps2Ms.Write(cmdBuf, cmdBuf[0x0F] == 0x02 ? 24 : 16, 2048);
+                            ps2Ms.Write(cmdBuf, 0, 2048);
                         }
 
                         if(ps2Ms.Length == 0x6000)
@@ -879,182 +966,120 @@ namespace Aaru.Core.Media.Detection
                     }
                     else
                     {
-                        sense = dev.ReadCd(out cmdBuf, out _, 0, 2324, 1, MmcSectorTypes.Mode2, false, false, false,
+                        sense = dev.ReadCd(out cmdBuf, out _, 0, 2048, 1, MmcSectorTypes.Mode1, false, false, false,
                                            MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
                                            dev.Timeout, out _);
 
                         if(!sense &&
                            !dev.Error)
                         {
-                            sector0 = new byte[2048];
-                            Array.Copy(cmdBuf, 0, sector0, 0, 2048);
+                            sector0 = cmdBuf;
 
-                            sense = dev.ReadCd(out cmdBuf, out _, 1, 2324, 1, MmcSectorTypes.Mode2, false, false, false,
-                                               MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
-                                               dev.Timeout, out _);
-
-                            if(!sense &&
-                               !dev.Error)
-                            {
-                                sector1 = new byte[2048];
-                                Array.Copy(cmdBuf, 1, sector0, 0, 2048);
-                            }
-
-                            sense = dev.ReadCd(out cmdBuf, out _, 4200, 2324, 1, MmcSectorTypes.Mode2, false, false,
+                            sense = dev.ReadCd(out cmdBuf, out _, 0, 2048, 1, MmcSectorTypes.Mode1, false, false,
                                                false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
                                                MmcSubchannel.None, dev.Timeout, out _);
 
                             if(!sense &&
                                !dev.Error)
-                            {
-                                playdia1 = new byte[2048];
-                                Array.Copy(cmdBuf, 0, playdia1, 0, 2048);
-                            }
+                                sector1 = cmdBuf;
 
-                            sense = dev.ReadCd(out cmdBuf, out _, 4201, 2324, 1, MmcSectorTypes.Mode2, false, false,
+                            sense = dev.ReadCd(out cmdBuf, out _, 0, 2048, 12, MmcSectorTypes.Mode1, false, false,
                                                false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
                                                MmcSubchannel.None, dev.Timeout, out _);
 
                             if(!sense &&
                                !dev.Error)
-                            {
-                                playdia2 = new byte[2048];
-                                Array.Copy(cmdBuf, 0, playdia2, 0, 2048);
-                            }
+                                ps2BootSectors = cmdBuf;
 
                             if(startOfFirstDataTrack != uint.MaxValue)
                             {
-                                sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack, 2324, 1,
-                                                   MmcSectorTypes.Mode2, false, false, false, MmcHeaderCodes.None, true,
-                                                   false, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+                                sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack, 2048, 1,
+                                                   MmcSectorTypes.Mode1, false, false, false, MmcHeaderCodes.None,
+                                                   true, false, MmcErrorField.None, MmcSubchannel.None, dev.Timeout,
+                                                   out _);
 
                                 if(!sense &&
                                    !dev.Error)
-                                {
-                                    firstDataSectorNotZero = new byte[2048];
-                                    Array.Copy(cmdBuf, 0, firstDataSectorNotZero, 0, 2048);
-                                }
+                                    firstDataSectorNotZero = cmdBuf;
 
-                                sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack + 1, 2324, 1,
-                                                   MmcSectorTypes.Mode2, false, false, false, MmcHeaderCodes.None, true,
-                                                   false, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+                                sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack + 1, 2048, 1,
+                                                   MmcSectorTypes.Mode1, false, false, false, MmcHeaderCodes.None,
+                                                   true, false, MmcErrorField.None, MmcSubchannel.None, dev.Timeout,
+                                                   out _);
 
                                 if(!sense &&
                                    !dev.Error)
-                                {
-                                    secondDataSectorNotZero = new byte[2048];
-                                    Array.Copy(cmdBuf, 0, secondDataSectorNotZero, 0, 2048);
-                                }
+                                    secondDataSectorNotZero = cmdBuf;
                             }
-
-                            var ps2Ms = new MemoryStream();
-
-                            for(uint p = 0; p < 12; p++)
-                            {
-                                sense = dev.ReadCd(out cmdBuf, out _, p, 2324, 1, MmcSectorTypes.Mode2, false, false,
-                                                   false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                                   MmcSubchannel.None, dev.Timeout, out _);
-
-                                if(sense || dev.Error)
-                                    break;
-
-                                ps2Ms.Write(cmdBuf, 0, 2048);
-                            }
-
-                            if(ps2Ms.Length == 0x6000)
-                                ps2BootSectors = ps2Ms.ToArray();
                         }
                         else
                         {
-                            sense = dev.ReadCd(out cmdBuf, out _, 0, 2048, 1, MmcSectorTypes.Mode1, false, false, false,
-                                               MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
-                                               dev.Timeout, out _);
-
-                            if(!sense &&
-                               !dev.Error)
-                            {
-                                sector0 = cmdBuf;
-
-                                sense = dev.ReadCd(out cmdBuf, out _, 0, 2048, 1, MmcSectorTypes.Mode1, false, false,
-                                                   false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                                   MmcSubchannel.None, dev.Timeout, out _);
-
-                                if(!sense &&
-                                   !dev.Error)
-                                    sector1 = cmdBuf;
-
-                                sense = dev.ReadCd(out cmdBuf, out _, 0, 2048, 12, MmcSectorTypes.Mode1, false, false,
-                                                   false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                                   MmcSubchannel.None, dev.Timeout, out _);
-
-                                if(!sense &&
-                                   !dev.Error)
-                                    ps2BootSectors = cmdBuf;
-
-                                if(startOfFirstDataTrack != uint.MaxValue)
-                                {
-                                    sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack, 2048, 1,
-                                                       MmcSectorTypes.Mode1, false, false, false, MmcHeaderCodes.None,
-                                                       true, false, MmcErrorField.None, MmcSubchannel.None, dev.Timeout,
-                                                       out _);
-
-                                    if(!sense &&
-                                       !dev.Error)
-                                        firstDataSectorNotZero = cmdBuf;
-
-                                    sense = dev.ReadCd(out cmdBuf, out _, startOfFirstDataTrack + 1, 2048, 1,
-                                                       MmcSectorTypes.Mode1, false, false, false, MmcHeaderCodes.None,
-                                                       true, false, MmcErrorField.None, MmcSubchannel.None, dev.Timeout,
-                                                       out _);
-
-                                    if(!sense &&
-                                       !dev.Error)
-                                        secondDataSectorNotZero = cmdBuf;
-                                }
-                            }
-                            else
-                            {
-                                goto case MediaType.DVDROM;
-                            }
+                            goto case MediaType.DVDROM;
                         }
                     }
-
-                    break;
                 }
 
-                // TODO: Check for CD-i Ready
-                case MediaType.CDI: break;
-                case MediaType.DVDROM:
-                case MediaType.HDDVDROM:
-                case MediaType.BDROM:
-                case MediaType.UHDBD:
-                case MediaType.Unknown:
-                    if(mediaType == MediaType.BDROM ||
-                       mediaType == MediaType.UHDBD)
-                    {
-                        sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                      MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out _);
+                break;
+            }
 
-                        if(!sense)
-                            blurayDi = DI.Decode(cmdBuf);
-                    }
+            // TODO: Check for CD-i Ready
+            case MediaType.CDI: break;
+            case MediaType.DVDROM:
+            case MediaType.HDDVDROM:
+            case MediaType.BDROM:
+            case MediaType.UHDBD:
+            case MediaType.Unknown:
+                if(mediaType == MediaType.BDROM ||
+                   mediaType == MediaType.UHDBD)
+                {
+                    sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Bd, 0, 0,
+                                                  MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out _);
 
-                    sense = dev.Read16(out cmdBuf, out _, 0, false, false, false, 0, 2048, 0, 1, false, dev.Timeout,
+                    if(!sense)
+                        blurayDi = DI.Decode(cmdBuf);
+                }
+
+                sense = dev.Read16(out cmdBuf, out _, 0, false, false, false, 0, 2048, 0, 1, false, dev.Timeout,
+                                   out _);
+
+                if(!sense &&
+                   !dev.Error)
+                {
+                    sector0 = cmdBuf;
+
+                    sense = dev.Read16(out cmdBuf, out _, 0, false, false, false, 1, 2048, 0, 1, false, dev.Timeout,
                                        out _);
 
+                    if(!sense &&
+                       !dev.Error)
+                        sector1 = cmdBuf;
+
+                    sense = dev.Read16(out cmdBuf, out _, 0, false, false, false, 0, 2048, 0, 12, false,
+                                       dev.Timeout, out _);
+
+                    if(!sense     &&
+                       !dev.Error &&
+                       cmdBuf.Length == 0x6000)
+                        ps2BootSectors = cmdBuf;
+                }
+                else
+                {
+                    sense = dev.Read12(out cmdBuf, out _, 0, false, false, false, false, 0, 2048, 0, 1, false,
+                                       dev.Timeout, out _);
+
                     if(!sense &&
                        !dev.Error)
                     {
                         sector0 = cmdBuf;
 
-                        sense = dev.Read16(out cmdBuf, out _, 0, false, false, false, 1, 2048, 0, 1, false, dev.Timeout,
-                                           out _);
+                        sense = dev.Read12(out cmdBuf, out _, 0, false, false, false, false, 1, 2048, 0, 1, false,
+                                           dev.Timeout, out _);
 
                         if(!sense &&
                            !dev.Error)
                             sector1 = cmdBuf;
 
-                        sense = dev.Read16(out cmdBuf, out _, 0, false, false, false, 0, 2048, 0, 12, false,
+                        sense = dev.Read12(out cmdBuf, out _, 0, false, false, false, false, 0, 2048, 0, 12, false,
                                            dev.Timeout, out _);
 
                         if(!sense     &&
@@ -1064,7 +1089,7 @@ namespace Aaru.Core.Media.Detection
                     }
                     else
                     {
-                        sense = dev.Read12(out cmdBuf, out _, 0, false, false, false, false, 0, 2048, 0, 1, false,
+                        sense = dev.Read10(out cmdBuf, out _, 0, false, false, false, false, 0, 2048, 0, 1,
                                            dev.Timeout, out _);
 
                         if(!sense &&
@@ -1072,14 +1097,14 @@ namespace Aaru.Core.Media.Detection
                         {
                             sector0 = cmdBuf;
 
-                            sense = dev.Read12(out cmdBuf, out _, 0, false, false, false, false, 1, 2048, 0, 1, false,
+                            sense = dev.Read10(out cmdBuf, out _, 0, false, false, false, false, 1, 2048, 0, 1,
                                                dev.Timeout, out _);
 
                             if(!sense &&
                                !dev.Error)
                                 sector1 = cmdBuf;
 
-                            sense = dev.Read12(out cmdBuf, out _, 0, false, false, false, false, 0, 2048, 0, 12, false,
+                            sense = dev.Read10(out cmdBuf, out _, 0, false, false, false, false, 0, 2048, 0, 12,
                                                dev.Timeout, out _);
 
                             if(!sense     &&
@@ -1089,725 +1114,274 @@ namespace Aaru.Core.Media.Detection
                         }
                         else
                         {
-                            sense = dev.Read10(out cmdBuf, out _, 0, false, false, false, false, 0, 2048, 0, 1,
-                                               dev.Timeout, out _);
+                            sense = dev.Read6(out cmdBuf, out _, 0, 2048, 1, dev.Timeout, out _);
 
                             if(!sense &&
                                !dev.Error)
                             {
                                 sector0 = cmdBuf;
 
-                                sense = dev.Read10(out cmdBuf, out _, 0, false, false, false, false, 1, 2048, 0, 1,
-                                                   dev.Timeout, out _);
+                                sense = dev.Read6(out cmdBuf, out _, 1, 2048, 1, dev.Timeout, out _);
 
                                 if(!sense &&
                                    !dev.Error)
                                     sector1 = cmdBuf;
 
-                                sense = dev.Read10(out cmdBuf, out _, 0, false, false, false, false, 0, 2048, 0, 12,
-                                                   dev.Timeout, out _);
+                                sense = dev.Read6(out cmdBuf, out _, 0, 2048, 12, dev.Timeout, out _);
 
                                 if(!sense     &&
                                    !dev.Error &&
                                    cmdBuf.Length == 0x6000)
                                     ps2BootSectors = cmdBuf;
                             }
-                            else
-                            {
-                                sense = dev.Read6(out cmdBuf, out _, 0, 2048, 1, dev.Timeout, out _);
-
-                                if(!sense &&
-                                   !dev.Error)
-                                {
-                                    sector0 = cmdBuf;
-
-                                    sense = dev.Read6(out cmdBuf, out _, 1, 2048, 1, dev.Timeout, out _);
-
-                                    if(!sense &&
-                                       !dev.Error)
-                                        sector1 = cmdBuf;
-
-                                    sense = dev.Read6(out cmdBuf, out _, 0, 2048, 12, dev.Timeout, out _);
-
-                                    if(!sense     &&
-                                       !dev.Error &&
-                                       cmdBuf.Length == 0x6000)
-                                        ps2BootSectors = cmdBuf;
-                                }
-                            }
                         }
                     }
+                }
 
-                    if(mediaType == MediaType.DVDROM)
-                    {
-                        sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout,
-                                                      out _);
-
-                        if(!sense)
-                        {
-                            PFI.PhysicalFormatInformation? pfi = PFI.Decode(cmdBuf, mediaType);
-
-                            if(pfi != null)
-                            {
-                                switch(pfi.Value.DiskCategory)
-                                {
-                                    case DiskCategory.DVDPR:
-                                        mediaType = MediaType.DVDPR;
-
-                                        break;
-                                    case DiskCategory.DVDPRDL:
-                                        mediaType = MediaType.DVDPRDL;
-
-                                        break;
-                                    case DiskCategory.DVDPRW:
-                                        mediaType = MediaType.DVDPRW;
-
-                                        break;
-                                    case DiskCategory.DVDPRWDL:
-                                        mediaType = MediaType.DVDPRWDL;
-
-                                        break;
-                                    case DiskCategory.DVDR:
-                                        mediaType = pfi.Value.PartVersion >= 6 ? MediaType.DVDRDL : MediaType.DVDR;
-
-                                        break;
-                                    case DiskCategory.DVDRAM:
-                                        mediaType = MediaType.DVDRAM;
-
-                                        break;
-                                    case DiskCategory.DVDRW:
-                                        mediaType = pfi.Value.PartVersion >= 15 ? MediaType.DVDRWDL : MediaType.DVDRW;
-
-                                        break;
-                                    case DiskCategory.HDDVDR:
-                                        mediaType = MediaType.HDDVDR;
-
-                                        break;
-                                    case DiskCategory.HDDVDRAM:
-                                        mediaType = MediaType.HDDVDRAM;
-
-                                        break;
-                                    case DiskCategory.HDDVDROM:
-                                        mediaType = MediaType.HDDVDROM;
-
-                                        break;
-                                    case DiskCategory.HDDVDRW:
-                                        mediaType = MediaType.HDDVDRW;
-
-                                        break;
-                                    case DiskCategory.Nintendo:
-                                        mediaType = pfi.Value.DiscSize == DVDSize.Eighty ? MediaType.GOD
-                                                        : MediaType.WOD;
-
-                                        break;
-                                    case DiskCategory.UMD:
-                                        mediaType = MediaType.UMD;
-
-                                        break;
-                                }
-                            }
-                        }
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.DiscManufacturingInformation, 0,
-                                                      dev.Timeout, out _);
-
-                        if(!sense)
-                        {
-                            if(DMI.IsXbox(cmdBuf))
-                            {
-                                AaruConsole.DebugWriteLine("Media detection",
-                                                           "Found Xbox DMI, setting disc type to Xbox Game Disc (XGD).");
-
-                                mediaType = MediaType.XGD;
-
-                                return;
-                            }
-
-                            if(DMI.IsXbox360(cmdBuf))
-                            {
-                                // All XGD3 all have the same number of blocks
-                                if(blocks == 25063   || // Locked (or non compatible drive)
-                                   blocks == 4229664 || // Xtreme unlock
-                                   blocks == 4246304)   // Wxripper unlock
-                                {
-                                    AaruConsole.DebugWriteLine("Media detection",
-                                                               "Found Xbox 360 DMI with {0} blocks, setting disc type to Xbox 360 Game Disc 3 (XGD3).");
-
-                                    mediaType = MediaType.XGD3;
-
-                                    return;
-                                }
-
-                                AaruConsole.DebugWriteLine("Media detection",
-                                                           "Found Xbox 360 DMI with {0} blocks, setting disc type to Xbox 360 Game Disc 2 (XGD2).");
-
-                                mediaType = MediaType.XGD2;
-
-                                return;
-                            }
-                        }
-                    }
-
-                    break;
-
-                // Recordables will be checked for PhotoCD only
-                case MediaType.CDR:
-                    // Check if ISO9660
-                    sense = dev.Read12(out byte[] isoSector, out _, 0, false, false, false, false, 16, 2048, 0, 1,
-                                       false, dev.Timeout, out _);
-
-                    // Sector 16 reads, and contains "CD001" magic?
-                    if(sense                ||
-                       isoSector[1] != 0x43 ||
-                       isoSector[2] != 0x44 ||
-                       isoSector[3] != 0x30 ||
-                       isoSector[4] != 0x30 ||
-                       isoSector[5] != 0x31)
-                        return;
-
-                    // From sectors 16 to 31
-                    uint isoSectorPosition = 16;
-
-                    while(isoSectorPosition < 32)
-                    {
-                        sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, isoSectorPosition, 2048,
-                                           0, 1, false, dev.Timeout, out _);
-
-                        // If sector cannot be read, break here
-                        if(sense)
-                            break;
-
-                        // If sector does not contain "CD001" magic, break
-                        if(isoSector[1] != 0x43 ||
-                           isoSector[2] != 0x44 ||
-                           isoSector[3] != 0x30 ||
-                           isoSector[4] != 0x30 ||
-                           isoSector[5] != 0x31)
-                            break;
-
-                        // If it is PVD or end of descriptor chain, break
-                        if(isoSector[0] == 1 ||
-                           isoSector[0] == 255)
-                            break;
-
-                        isoSectorPosition++;
-                    }
-
-                    // If it's not an ISO9660 PVD, return
-                    if(isoSector[0] != 1    ||
-                       isoSector[1] != 0x43 ||
-                       isoSector[2] != 0x44 ||
-                       isoSector[3] != 0x30 ||
-                       isoSector[4] != 0x30 ||
-                       isoSector[5] != 0x31)
-                        return;
-
-                    uint rootStart  = BitConverter.ToUInt32(isoSector, 158);
-                    uint rootLength = BitConverter.ToUInt32(isoSector, 166);
-
-                    if(rootStart  == 0 ||
-                       rootLength == 0)
-                        return;
-
-                    rootLength /= 2048;
-
-                    try
-                    {
-                        using var rootMs = new MemoryStream();
-
-                        for(uint i = 0; i < rootLength; i++)
-                        {
-                            sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, rootStart + i, 2048,
-                                               0, 1, false, dev.Timeout, out _);
-
-                            if(sense)
-                                break;
-
-                            rootMs.Write(isoSector, 0, 2048);
-                        }
-
-                        isoSector = rootMs.ToArray();
-                    }
-                    catch
-                    {
-                        return;
-                    }
-
-                    if(isoSector.Length < 2048)
-                        return;
-
-                    int  rootPos   = 0;
-                    uint pcdStart  = 0;
-                    uint pcdLength = 0;
-
-                    while(isoSector[rootPos]           > 0                &&
-                          rootPos                      < isoSector.Length &&
-                          rootPos + isoSector[rootPos] <= isoSector.Length)
-                    {
-                        int    nameLen = isoSector[rootPos + 32];
-                        byte[] tmpName = new byte[nameLen];
-                        Array.Copy(isoSector, rootPos + 33, tmpName, 0, nameLen);
-                        string name = StringHandlers.CToString(tmpName).ToUpperInvariant();
-
-                        if(name.EndsWith(";1", StringComparison.InvariantCulture))
-                            name = name.Substring(0, name.Length - 2);
-
-                        if(name                             == "PHOTO_CD" &&
-                           (isoSector[rootPos + 25] & 0x02) == 0x02)
-                        {
-                            pcdStart  = BitConverter.ToUInt32(isoSector, rootPos + 2);
-                            pcdLength = BitConverter.ToUInt32(isoSector, rootPos + 10) / 2048;
-                        }
-
-                        rootPos += isoSector[rootPos];
-                    }
-
-                    if(pcdLength > 0)
-                    {
-                        try
-                        {
-                            using var pcdMs = new MemoryStream();
-
-                            for(uint i = 0; i < pcdLength; i++)
-                            {
-                                sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, pcdStart + i,
-                                                   2048, 0, 1, false, dev.Timeout, out _);
-
-                                if(sense)
-                                    break;
-
-                                pcdMs.Write(isoSector, 0, 2048);
-                            }
-
-                            isoSector = pcdMs.ToArray();
-                        }
-                        catch
-                        {
-                            return;
-                        }
-
-                        if(isoSector.Length < 2048)
-                            return;
-
-                        for(int pi = 0; pi < pcdLength; pi++)
-                        {
-                            int  pcdPos  = pi * 2048;
-                            uint infoPos = 0;
-
-                            while(isoSector[pcdPos]          > 0                &&
-                                  pcdPos                     < isoSector.Length &&
-                                  pcdPos + isoSector[pcdPos] <= isoSector.Length)
-                            {
-                                int    nameLen = isoSector[pcdPos + 32];
-                                byte[] tmpName = new byte[nameLen];
-                                Array.Copy(isoSector, pcdPos + 33, tmpName, 0, nameLen);
-                                string name = StringHandlers.CToString(tmpName).ToUpperInvariant();
-
-                                if(name.EndsWith(";1", StringComparison.InvariantCulture))
-                                    name = name.Substring(0, name.Length - 2);
-
-                                if(name == "INFO.PCD")
-                                {
-                                    infoPos = BitConverter.ToUInt32(isoSector, pcdPos + 2);
-
-                                    break;
-                                }
-
-                                pcdPos += isoSector[pcdPos];
-                            }
-
-                            if(infoPos > 0)
-                            {
-                                sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, infoPos, 2048,
-                                                   0, 1, false, dev.Timeout, out _);
-
-                                if(sense)
-                                    break;
-
-                                byte[] systemId = new byte[8];
-                                Array.Copy(isoSector, 0, systemId, 0, 8);
-
-                                string id = StringHandlers.CToString(systemId).TrimEnd();
-
-                                switch(id)
-                                {
-                                    case "PHOTO_CD":
-                                        mediaType = MediaType.PCD;
-
-                                        AaruConsole.DebugWriteLine("Media detection",
-                                                                   "Found Photo CD description file, setting disc type to Photo CD.");
-
-                                        return;
-                                }
-                            }
-                        }
-                    }
-
-                    break;
-
-                // Other recordables will not be checked
-                case MediaType.CDRW:
-                case MediaType.CDMRW:
-                case MediaType.DDCDR:
-                case MediaType.DDCDRW:
-                case MediaType.DVDR:
-                case MediaType.DVDRW:
-                case MediaType.DVDPR:
-                case MediaType.DVDPRW:
-                case MediaType.DVDPRWDL:
-                case MediaType.DVDRDL:
-                case MediaType.DVDPRDL:
-                case MediaType.DVDRAM:
-                case MediaType.DVDRWDL:
-                case MediaType.DVDDownload:
-                case MediaType.HDDVDRAM:
-                case MediaType.HDDVDR:
-                case MediaType.HDDVDRW:
-                case MediaType.HDDVDRDL:
-                case MediaType.HDDVDRWDL:
-                case MediaType.BDR:
-                case MediaType.BDRE:
-                case MediaType.BDRXL:
-                case MediaType.BDREXL: return;
-            }
-
-            if(sector0 == null)
-                return;
-
-            switch(mediaType)
-            {
-                case MediaType.CD:
-                case MediaType.CDDA:
-                case MediaType.CDPLUS:
-                case MediaType.CDROM:
-                case MediaType.CDROMXA:
-                    // TODO: Pippin requires interpreting Apple Partition Map, reading HFS and checking for Pippin signatures
+                if(mediaType == MediaType.DVDROM)
                 {
-                    if(CD.DecodeIPBin(sector0).HasValue)
+                    sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout,
+                                                  out _);
+
+                    if(!sense)
                     {
-                        mediaType = MediaType.MEGACD;
+                        PFI.PhysicalFormatInformation? pfi = PFI.Decode(cmdBuf, mediaType);
 
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Found Mega/Sega CD IP.BIN, setting disc type to Mega CD.");
-
-                        return;
-                    }
-
-                    if(Saturn.DecodeIPBin(sector0).HasValue)
-                    {
-                        mediaType = MediaType.SATURNCD;
-
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Found Sega Saturn IP.BIN, setting disc type to Saturn CD.");
-
-                        return;
-                    }
-
-                    // Are GDR detectable ???
-                    if(Dreamcast.DecodeIPBin(sector0).HasValue)
-                    {
-                        mediaType = MediaType.GDROM;
-
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Found Sega Dreamcast IP.BIN, setting disc type to GD-ROM.");
-
-                        return;
-                    }
-
-                    if(ps2BootSectors is { Length: 0x6000 })
-                    {
-                        // The decryption key is applied as XOR. As first byte is originally always NULL, it gives us the key :)
-                        byte decryptByte = ps2BootSectors[0];
-
-                        for(int i = 0; i < 0x6000; i++)
-                            ps2BootSectors[i] ^= decryptByte;
-
-                        string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _);
-
-                        AaruConsole.DebugWriteLine("Media-info Command", "PlayStation 2 boot sectors SHA256: {0}",
-                                                   ps2BootSectorsHash);
-
-                        if(ps2BootSectorsHash == PS2_PAL_HASH  ||
-                           ps2BootSectorsHash == PS2_NTSC_HASH ||
-                           ps2BootSectorsHash == PS2_JAPANESE_HASH)
+                        if(pfi != null)
                         {
-                            mediaType = MediaType.PS2CD;
-
-                            AaruConsole.DebugWriteLine("Media detection",
-                                                       "Found Sony PlayStation 2 boot sectors, setting disc type to PS2 CD.");
-
-                            goto hasPs2CdBoot;
-                        }
-                    }
-
-                    if(sector0 != null)
-                    {
-                        byte[] syncBytes = new byte[7];
-                        Array.Copy(sector0, 0, syncBytes, 0, 7);
-
-                        if(_operaId.SequenceEqual(syncBytes))
-                        {
-                            mediaType = MediaType.ThreeDO;
-
-                            AaruConsole.DebugWriteLine("Media detection",
-                                                       "Found Opera filesystem, setting disc type to 3DO.");
-
-                            return;
-                        }
-
-                        if(_fmTownsBootId.SequenceEqual(syncBytes))
-                        {
-                            mediaType = MediaType.FMTOWNS;
-
-                            AaruConsole.DebugWriteLine("Media detection",
-                                                       "Found FM-Towns boot, setting disc type to FM-Towns.");
-
-                            return;
-                        }
-                    }
-
-                    if(playdia1 != null &&
-                       playdia2 != null)
-                    {
-                        byte[] pd1 = new byte[_playdiaCopyright.Length];
-                        byte[] pd2 = new byte[_playdiaCopyright.Length];
-
-                        Array.Copy(playdia1, 38, pd1, 0, pd1.Length);
-                        Array.Copy(playdia2, 0, pd2, 0, pd1.Length);
-
-                        if(_playdiaCopyright.SequenceEqual(pd1) &&
-                           _playdiaCopyright.SequenceEqual(pd2))
-                        {
-                            mediaType = MediaType.Playdia;
-
-                            AaruConsole.DebugWriteLine("Media detection",
-                                                       "Found Playdia copyright, setting disc type to Playdia.");
-
-                            return;
-                        }
-                    }
-
-                    if(secondDataSectorNotZero != null)
-                    {
-                        byte[] pce = new byte[_pcEngineSignature.Length];
-                        Array.Copy(secondDataSectorNotZero, 32, pce, 0, pce.Length);
-
-                        if(_pcEngineSignature.SequenceEqual(pce))
-                        {
-                            mediaType = MediaType.SuperCDROM2;
-
-                            AaruConsole.DebugWriteLine("Media detection",
-                                                       "Found PC-Engine CD signature, setting disc type to Super CD-ROM².");
-
-                            return;
-                        }
-                    }
-
-                    if(firstDataSectorNotZero != null)
-                    {
-                        byte[] pcfx = new byte[_pcFxSignature.Length];
-                        Array.Copy(firstDataSectorNotZero, 0, pcfx, 0, pcfx.Length);
-
-                        if(_pcFxSignature.SequenceEqual(pcfx))
-                        {
-                            mediaType = MediaType.PCFX;
-
-                            AaruConsole.DebugWriteLine("Media detection",
-                                                       "Found PC-FX copyright, setting disc type to PC-FX.");
-
-                            return;
-                        }
-                    }
-
-                    if(firstTrackSecondSessionAudio != null)
-                    {
-                        byte[] jaguar = new byte[_atariSignature.Length];
-
-                        for(int i = 0; i + jaguar.Length <= firstTrackSecondSessionAudio.Length; i += 2)
-                        {
-                            Array.Copy(firstTrackSecondSessionAudio, i, jaguar, 0, jaguar.Length);
-
-                            if(!_atariSignature.SequenceEqual(jaguar))
-                                continue;
-
-                            mediaType = MediaType.JaguarCD;
-
-                            AaruConsole.DebugWriteLine("Media detection",
-                                                       "Found Atari signature, setting disc type to Jaguar CD.");
-
-                            break;
-                        }
-                    }
-
-                    if(firstTrackSecondSession?.Length >= 2336)
-                    {
-                        byte[] milcd = new byte[2048];
-                        Array.Copy(firstTrackSecondSession, 24, milcd, 0, 2048);
-
-                        if(Dreamcast.DecodeIPBin(milcd).HasValue)
-                        {
-                            mediaType = MediaType.MilCD;
-
-                            AaruConsole.DebugWriteLine("Media detection",
-                                                       "Found Sega Dreamcast IP.BIN on second session, setting disc type to MilCD.");
-
-                            return;
-                        }
-                    }
-
-                    // TODO: Detect black and white VideoNow
-                    // TODO: Detect VideoNow XP
-                    if(IsVideoNowColor(videoNowColorFrame))
-                    {
-                        mediaType = MediaType.VideoNowColor;
-
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Found VideoNow! Color frame, setting disc type to VideoNow Color.");
-
-                        return;
-                    }
-
-                    // Check CD+G, CD+EG and CD+MIDI
-                    if(mediaType == MediaType.CDDA)
-                    {
-                        sense = dev.ReadCd(out byte[] subBuf, out _, 150, 96, 8, MmcSectorTypes.Cdda, false, false,
-                                           false, MmcHeaderCodes.None, false, false, MmcErrorField.None,
-                                           MmcSubchannel.Raw, dev.Timeout, out _);
-
-                        if(!sense)
-                        {
-                            bool cdg    = false;
-                            bool cdeg   = false;
-                            bool cdmidi = false;
-
-                            for(int i = 0; i < 8; i++)
+                            switch(pfi.Value.DiskCategory)
                             {
-                                byte[] tmpSub = new byte[96];
-                                Array.Copy(subBuf, i * 96, tmpSub, 0, 96);
-                                DetectRwPackets(tmpSub, out bool cdgPacket, out bool cdegPacket, out bool cdmidiPacket);
+                                case DiskCategory.DVDPR:
+                                    mediaType = MediaType.DVDPR;
 
-                                if(cdgPacket)
-                                    cdg = true;
+                                    break;
+                                case DiskCategory.DVDPRDL:
+                                    mediaType = MediaType.DVDPRDL;
 
-                                if(cdegPacket)
-                                    cdeg = true;
+                                    break;
+                                case DiskCategory.DVDPRW:
+                                    mediaType = MediaType.DVDPRW;
 
-                                if(cdmidiPacket)
-                                    cdmidi = true;
+                                    break;
+                                case DiskCategory.DVDPRWDL:
+                                    mediaType = MediaType.DVDPRWDL;
+
+                                    break;
+                                case DiskCategory.DVDR:
+                                    mediaType = pfi.Value.PartVersion >= 6 ? MediaType.DVDRDL : MediaType.DVDR;
+
+                                    break;
+                                case DiskCategory.DVDRAM:
+                                    mediaType = MediaType.DVDRAM;
+
+                                    break;
+                                case DiskCategory.DVDRW:
+                                    mediaType = pfi.Value.PartVersion >= 15 ? MediaType.DVDRWDL : MediaType.DVDRW;
+
+                                    break;
+                                case DiskCategory.HDDVDR:
+                                    mediaType = MediaType.HDDVDR;
+
+                                    break;
+                                case DiskCategory.HDDVDRAM:
+                                    mediaType = MediaType.HDDVDRAM;
+
+                                    break;
+                                case DiskCategory.HDDVDROM:
+                                    mediaType = MediaType.HDDVDROM;
+
+                                    break;
+                                case DiskCategory.HDDVDRW:
+                                    mediaType = MediaType.HDDVDRW;
+
+                                    break;
+                                case DiskCategory.Nintendo:
+                                    mediaType = pfi.Value.DiscSize == DVDSize.Eighty ? MediaType.GOD
+                                                    : MediaType.WOD;
+
+                                    break;
+                                case DiskCategory.UMD:
+                                    mediaType = MediaType.UMD;
+
+                                    break;
                             }
+                        }
+                    }
 
-                            if(cdeg)
+                    sense = dev.ReadDiscStructure(out cmdBuf, out _, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.DiscManufacturingInformation, 0,
+                                                  dev.Timeout, out _);
+
+                    if(!sense)
+                    {
+                        if(DMI.IsXbox(cmdBuf))
+                        {
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Found Xbox DMI, setting disc type to Xbox Game Disc (XGD).");
+
+                            mediaType = MediaType.XGD;
+
+                            return;
+                        }
+
+                        if(DMI.IsXbox360(cmdBuf))
+                        {
+                            // All XGD3 all have the same number of blocks
+                            if(blocks == 25063   || // Locked (or non compatible drive)
+                               blocks == 4229664 || // Xtreme unlock
+                               blocks == 4246304)   // Wxripper unlock
                             {
-                                mediaType = MediaType.CDEG;
-
                                 AaruConsole.DebugWriteLine("Media detection",
-                                                           "Found enhanced graphics RW packet, setting disc type to CD+EG.");
+                                                           "Found Xbox 360 DMI with {0} blocks, setting disc type to Xbox 360 Game Disc 3 (XGD3).");
+
+                                mediaType = MediaType.XGD3;
 
                                 return;
                             }
 
-                            if(cdg)
-                            {
-                                mediaType = MediaType.CDG;
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Found Xbox 360 DMI with {0} blocks, setting disc type to Xbox 360 Game Disc 2 (XGD2).");
 
-                                AaruConsole.DebugWriteLine("Media detection",
-                                                           "Found graphics RW packet, setting disc type to CD+G.");
+                            mediaType = MediaType.XGD2;
 
-                                return;
-                            }
-
-                            if(cdmidi)
-                            {
-                                mediaType = MediaType.CDMIDI;
-
-                                AaruConsole.DebugWriteLine("Media detection",
-                                                           "Found MIDI RW packet, setting disc type to CD+MIDI.");
-
-                                return;
-                            }
+                            return;
                         }
                     }
+                }
 
-                    // If it has a PS2 boot area it can still be PS1, so check for SYSTEM.CNF below
-                    hasPs2CdBoot:
+                break;
 
-                    // Check if ISO9660
-                    sense = dev.Read12(out byte[] isoSector, out _, 0, false, false, false, false, 16, 2048, 0, 1,
-                                       false, dev.Timeout, out _);
+            // Recordables will be checked for PhotoCD only
+            case MediaType.CDR:
+                // Check if ISO9660
+                sense = dev.Read12(out byte[] isoSector, out _, 0, false, false, false, false, 16, 2048, 0, 1,
+                                   false, dev.Timeout, out _);
 
-                    // Sector 16 reads, and contains "CD001" magic?
-                    if(sense                ||
-                       isoSector[1] != 0x43 ||
+                // Sector 16 reads, and contains "CD001" magic?
+                if(sense                ||
+                   isoSector[1] != 0x43 ||
+                   isoSector[2] != 0x44 ||
+                   isoSector[3] != 0x30 ||
+                   isoSector[4] != 0x30 ||
+                   isoSector[5] != 0x31)
+                    return;
+
+                // From sectors 16 to 31
+                uint isoSectorPosition = 16;
+
+                while(isoSectorPosition < 32)
+                {
+                    sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, isoSectorPosition, 2048,
+                                       0, 1, false, dev.Timeout, out _);
+
+                    // If sector cannot be read, break here
+                    if(sense)
+                        break;
+
+                    // If sector does not contain "CD001" magic, break
+                    if(isoSector[1] != 0x43 ||
                        isoSector[2] != 0x44 ||
                        isoSector[3] != 0x30 ||
                        isoSector[4] != 0x30 ||
                        isoSector[5] != 0x31)
-                        return;
+                        break;
 
-                    // From sectors 16 to 31
-                    uint isoSectorPosition = 16;
+                    // If it is PVD or end of descriptor chain, break
+                    if(isoSector[0] == 1 ||
+                       isoSector[0] == 255)
+                        break;
 
-                    while(isoSectorPosition < 32)
+                    isoSectorPosition++;
+                }
+
+                // If it's not an ISO9660 PVD, return
+                if(isoSector[0] != 1    ||
+                   isoSector[1] != 0x43 ||
+                   isoSector[2] != 0x44 ||
+                   isoSector[3] != 0x30 ||
+                   isoSector[4] != 0x30 ||
+                   isoSector[5] != 0x31)
+                    return;
+
+                uint rootStart  = BitConverter.ToUInt32(isoSector, 158);
+                uint rootLength = BitConverter.ToUInt32(isoSector, 166);
+
+                if(rootStart  == 0 ||
+                   rootLength == 0)
+                    return;
+
+                rootLength /= 2048;
+
+                try
+                {
+                    using var rootMs = new MemoryStream();
+
+                    for(uint i = 0; i < rootLength; i++)
                     {
-                        sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, isoSectorPosition, 2048,
+                        sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, rootStart + i, 2048,
                                            0, 1, false, dev.Timeout, out _);
 
-                        // If sector cannot be read, break here
                         if(sense)
                             break;
 
-                        // If sector does not contain "CD001" magic, break
-                        if(isoSector[1] != 0x43 ||
-                           isoSector[2] != 0x44 ||
-                           isoSector[3] != 0x30 ||
-                           isoSector[4] != 0x30 ||
-                           isoSector[5] != 0x31)
-                            break;
-
-                        // If it is PVD or end of descriptor chain, break
-                        if(isoSector[0] == 1 ||
-                           isoSector[0] == 255)
-                            break;
-
-                        isoSectorPosition++;
+                        rootMs.Write(isoSector, 0, 2048);
                     }
 
-                    // If it's not an ISO9660 PVD, return
-                    if(isoSector[0] != 1    ||
-                       isoSector[1] != 0x43 ||
-                       isoSector[2] != 0x44 ||
-                       isoSector[3] != 0x30 ||
-                       isoSector[4] != 0x30 ||
-                       isoSector[5] != 0x31)
-                        return;
+                    isoSector = rootMs.ToArray();
+                }
+                catch
+                {
+                    return;
+                }
 
-                    uint rootStart  = BitConverter.ToUInt32(isoSector, 158);
-                    uint rootLength = BitConverter.ToUInt32(isoSector, 166);
+                if(isoSector.Length < 2048)
+                    return;
 
-                    if(rootStart  == 0 ||
-                       rootLength == 0)
-                        return;
+                int  rootPos   = 0;
+                uint pcdStart  = 0;
+                uint pcdLength = 0;
 
-                    rootLength /= 2048;
+                while(isoSector[rootPos]           > 0                &&
+                      rootPos                      < isoSector.Length &&
+                      rootPos + isoSector[rootPos] <= isoSector.Length)
+                {
+                    int    nameLen = isoSector[rootPos + 32];
+                    byte[] tmpName = new byte[nameLen];
+                    Array.Copy(isoSector, rootPos + 33, tmpName, 0, nameLen);
+                    string name = StringHandlers.CToString(tmpName).ToUpperInvariant();
 
+                    if(name.EndsWith(";1", StringComparison.InvariantCulture))
+                        name = name.Substring(0, name.Length - 2);
+
+                    if(name                             == "PHOTO_CD" &&
+                       (isoSector[rootPos + 25] & 0x02) == 0x02)
+                    {
+                        pcdStart  = BitConverter.ToUInt32(isoSector, rootPos + 2);
+                        pcdLength = BitConverter.ToUInt32(isoSector, rootPos + 10) / 2048;
+                    }
+
+                    rootPos += isoSector[rootPos];
+                }
+
+                if(pcdLength > 0)
+                {
                     try
                     {
-                        using var rootMs = new MemoryStream();
+                        using var pcdMs = new MemoryStream();
 
-                        for(uint i = 0; i < rootLength; i++)
+                        for(uint i = 0; i < pcdLength; i++)
                         {
-                            sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, rootStart + i, 2048,
-                                               0, 1, false, dev.Timeout, out _);
+                            sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, pcdStart + i,
+                                               2048, 0, 1, false, dev.Timeout, out _);
 
                             if(sense)
                                 break;
 
-                            rootMs.Write(isoSector, 0, 2048);
+                            pcdMs.Write(isoSector, 0, 2048);
                         }
 
-                        isoSector = rootMs.ToArray();
+                        isoSector = pcdMs.ToArray();
                     }
                     catch
                     {
@@ -1817,390 +1391,37 @@ namespace Aaru.Core.Media.Detection
                     if(isoSector.Length < 2048)
                         return;
 
-                    List<string> rootEntries   = new List<string>();
-                    uint         ngcdIplStart  = 0;
-                    uint         ngcdIplLength = 0;
-                    uint         vcdStart      = 0;
-                    uint         vcdLength     = 0;
-                    uint         pcdStart      = 0;
-                    uint         pcdLength     = 0;
-                    uint         ps1Start      = 0;
-                    uint         ps1Length     = 0;
-
-                    for(int ri = 0; ri < rootLength; ri++)
+                    for(int pi = 0; pi < pcdLength; pi++)
                     {
-                        int rootPos = ri * 2048;
+                        int  pcdPos  = pi * 2048;
+                        uint infoPos = 0;
 
-                        while(rootPos                      < isoSector.Length &&
-                              isoSector[rootPos]           > 0                &&
-                              rootPos + isoSector[rootPos] <= isoSector.Length)
+                        while(isoSector[pcdPos]          > 0                &&
+                              pcdPos                     < isoSector.Length &&
+                              pcdPos + isoSector[pcdPos] <= isoSector.Length)
                         {
-                            int    nameLen = isoSector[rootPos + 32];
+                            int    nameLen = isoSector[pcdPos + 32];
                             byte[] tmpName = new byte[nameLen];
-                            Array.Copy(isoSector, rootPos + 33, tmpName, 0, nameLen);
+                            Array.Copy(isoSector, pcdPos + 33, tmpName, 0, nameLen);
                             string name = StringHandlers.CToString(tmpName).ToUpperInvariant();
 
                             if(name.EndsWith(";1", StringComparison.InvariantCulture))
                                 name = name.Substring(0, name.Length - 2);
 
-                            rootEntries.Add(name);
-
-                            switch(name)
+                            if(name == "INFO.PCD")
                             {
-                                case "IPL.TXT":
-                                    ngcdIplStart  = BitConverter.ToUInt32(isoSector, rootPos + 2);
-                                    ngcdIplLength = BitConverter.ToUInt32(isoSector, rootPos + 10);
+                                infoPos = BitConverter.ToUInt32(isoSector, pcdPos + 2);
 
-                                    break;
-
-                                case "VCD" when (isoSector[rootPos   + 25] & 0x02) == 0x02:
-                                case "SVCD" when (isoSector[rootPos  + 25] & 0x02) == 0x02:
-                                case "HQVCD" when (isoSector[rootPos + 25] & 0x02) == 0x02:
-                                    vcdStart  = BitConverter.ToUInt32(isoSector, rootPos + 2);
-                                    vcdLength = BitConverter.ToUInt32(isoSector, rootPos + 10) / 2048;
-
-                                    break;
-                                case "PHOTO_CD" when (isoSector[rootPos + 25] & 0x02) == 0x02:
-                                    pcdStart  = BitConverter.ToUInt32(isoSector, rootPos + 2);
-                                    pcdLength = BitConverter.ToUInt32(isoSector, rootPos + 10) / 2048;
-
-                                    break;
-                                case "SYSTEM.CNF":
-                                    ps1Start  = BitConverter.ToUInt32(isoSector, rootPos + 2);
-                                    ps1Length = BitConverter.ToUInt32(isoSector, rootPos + 10);
-
-                                    break;
-                            }
-
-                            rootPos += isoSector[rootPos];
-                        }
-                    }
-
-                    if(rootEntries.Count == 0)
-                        return;
-
-                    if(rootEntries.Contains("CD32.TM"))
-                    {
-                        mediaType = MediaType.CD32;
-
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Found CD32.TM file in root, setting disc type to Amiga CD32.");
-
-                        return;
-                    }
-
-                    if(rootEntries.Contains("CDTV.TM"))
-                    {
-                        mediaType = MediaType.CDTV;
-
-                        AaruConsole.DebugWriteLine("Media detection",
-                                                   "Found CDTV.TM file in root, setting disc type to Commodore CDTV.");
-
-                        return;
-                    }
-
-                    // "IPL.TXT" length
-                    if(ngcdIplLength > 0)
-                    {
-                        uint ngcdSectors = ngcdIplLength / 2048;
-
-                        if(ngcdIplLength % 2048 > 0)
-                            ngcdSectors++;
-
-                        string iplTxt;
-
-                        // Read "IPL.TXT"
-                        try
-                        {
-                            using var ngcdMs = new MemoryStream();
-
-                            for(uint i = 0; i < ngcdSectors; i++)
-                            {
-                                sense = dev.Read12(out isoSector, out _, 0, false, false, false, false,
-                                                   ngcdIplStart + i, 2048, 0, 1, false, dev.Timeout, out _);
-
-                                if(sense)
-                                    break;
-
-                                ngcdMs.Write(isoSector, 0, 2048);
-                            }
-
-                            isoSector = ngcdMs.ToArray();
-                            iplTxt    = Encoding.ASCII.GetString(isoSector);
-                        }
-                        catch
-                        {
-                            iplTxt = null;
-                        }
-
-                        // Check "IPL.TXT" lines
-                        if(iplTxt != null)
-                        {
-                            using var sr = new StringReader(iplTxt);
-
-                            bool correctNeoGeoCd = true;
-                            int  lineNumber      = 0;
-
-                            while(sr.Peek() > 0)
-                            {
-                                string line = sr.ReadLine();
-
-                                // End of file
-                                if(line is null ||
-                                   line.Length == 0)
-                                {
-                                    if(lineNumber == 0)
-                                        correctNeoGeoCd = false;
-
-                                    break;
-                                }
-
-                                // Split line by comma
-                                string[] split = line.Split(',');
-
-                                // Empty line
-                                if(split.Length == 0)
-                                    continue;
-
-                                // More than 3 entries
-                                if(split.Length != 3)
-                                {
-                                    if(line[0] < 0x20)
-                                        break;
-
-                                    correctNeoGeoCd = false;
-
-                                    break;
-                                }
-
-                                // Split filename
-                                string[] split2 = split[0].Split('.');
-
-                                // Filename must have two parts, name and extension
-                                if(split2.Length != 2)
-                                {
-                                    correctNeoGeoCd = false;
-
-                                    break;
-                                }
-
-                                // Name must be smaller or equal to 8 characters
-                                if(split2[0].Length > 8)
-                                {
-                                    correctNeoGeoCd = false;
-
-                                    break;
-                                }
-
-                                // Extension must be smaller or equal to 8 characters
-                                if(split2[1].Length > 3)
-                                {
-                                    correctNeoGeoCd = false;
-
-                                    break;
-                                }
-
-                                // Second part must be a single digit
-                                if(split[1].Length != 1 ||
-                                   !byte.TryParse(split[1], out _))
-                                {
-                                    correctNeoGeoCd = false;
-
-                                    break;
-                                }
-
-                                // Third part must be bigger or equal to 1 and smaller or equal to 8
-                                if(split[2].Length < 1 ||
-                                   split[2].Length > 8)
-                                {
-                                    correctNeoGeoCd = false;
-
-                                    break;
-                                }
-
-                                try
-                                {
-                                    _ = Convert.ToUInt32(split[2], 16);
-                                }
-                                catch
-                                {
-                                    correctNeoGeoCd = false;
-
-                                    break;
-                                }
-
-                                lineNumber++;
-                            }
-
-                            if(correctNeoGeoCd)
-                            {
-                                mediaType = MediaType.NeoGeoCD;
-
-                                AaruConsole.DebugWriteLine("Media detection",
-                                                           "Found correct IPL.TXT file in root, setting disc type to Neo Geo CD.");
-
-                                return;
-                            }
-                        }
-                    }
-
-                    if(vcdLength > 0)
-                    {
-                        try
-                        {
-                            using var vcdMs = new MemoryStream();
-
-                            for(uint i = 0; i < vcdLength; i++)
-                            {
-                                sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, vcdStart + i,
-                                                   2048, 0, 1, false, dev.Timeout, out _);
-
-                                if(sense)
-                                    break;
-
-                                vcdMs.Write(isoSector, 0, 2048);
-                            }
-
-                            isoSector = vcdMs.ToArray();
-                        }
-                        catch
-                        {
-                            return;
-                        }
-
-                        if(isoSector.Length < 2048)
-                            return;
-
-                        uint infoPos = 0;
-
-                        for(int vi = 0; vi < vcdLength; vi++)
-                        {
-                            int vcdPos = vi * 2048;
-
-                            while(vcdPos                     < isoSector.Length &&
-                                  isoSector[vcdPos]          > 0                &&
-                                  vcdPos + isoSector[vcdPos] <= isoSector.Length)
-                            {
-                                int    nameLen = isoSector[vcdPos + 32];
-                                byte[] tmpName = new byte[nameLen];
-                                Array.Copy(isoSector, vcdPos + 33, tmpName, 0, nameLen);
-                                string name = StringHandlers.CToString(tmpName).ToUpperInvariant();
-
-                                if(name.EndsWith(";1", StringComparison.InvariantCulture))
-                                    name = name.Substring(0, name.Length - 2);
-
-                                if(name == "INFO.VCD" ||
-                                   name == "INFO.SVD")
-                                {
-                                    infoPos = BitConverter.ToUInt32(isoSector, vcdPos + 2);
-
-                                    break;
-                                }
-
-                                vcdPos += isoSector[vcdPos];
-                            }
-                        }
-
-                        if(infoPos > 0)
-                        {
-                            sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, infoPos, 2048, 0, 1,
-                                               false, dev.Timeout, out _);
-
-                            if(sense)
                                 break;
-
-                            byte[] systemId = new byte[8];
-                            Array.Copy(isoSector, 0, systemId, 0, 8);
-
-                            string id = StringHandlers.CToString(systemId).TrimEnd();
-
-                            switch(id)
-                            {
-                                case "VIDEO_CD":
-                                    mediaType = MediaType.VCD;
-
-                                    AaruConsole.DebugWriteLine("Media detection",
-                                                               "Found Video CD description file, setting disc type to Video CD.");
-
-                                    return;
-                                case "SUPERVCD":
-                                    mediaType = MediaType.SVCD;
-
-                                    AaruConsole.DebugWriteLine("Media detection",
-                                                               "Found Super Video CD description file, setting disc type to Super Video CD.");
-
-                                    break;
-                                case "HQ-VCD":
-                                    mediaType = MediaType.CVD;
-
-                                    AaruConsole.DebugWriteLine("Media detection",
-                                                               "Found China Video Disc description file, setting disc type to China Video Disc.");
-
-                                    break;
-                            }
-                        }
-                    }
-
-                    if(pcdLength > 0)
-                    {
-                        try
-                        {
-                            using var pcdMs = new MemoryStream();
-
-                            for(uint i = 0; i < pcdLength; i++)
-                            {
-                                sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, pcdStart + i,
-                                                   2048, 0, 1, false, dev.Timeout, out _);
-
-                                if(sense)
-                                    break;
-
-                                pcdMs.Write(isoSector, 0, 2048);
                             }
 
-                            isoSector = pcdMs.ToArray();
-                        }
-                        catch
-                        {
-                            return;
-                        }
-
-                        if(isoSector.Length < 2048)
-                            return;
-
-                        uint infoPos = 0;
-
-                        for(int pi = 0; pi < pcdLength; pi++)
-                        {
-                            int pcdPos = pi * 2048;
-
-                            while(pcdPos                     < isoSector.Length &&
-                                  isoSector[pcdPos]          > 0                &&
-                                  pcdPos + isoSector[pcdPos] <= isoSector.Length)
-                            {
-                                int    nameLen = isoSector[pcdPos + 32];
-                                byte[] tmpName = new byte[nameLen];
-                                Array.Copy(isoSector, pcdPos + 33, tmpName, 0, nameLen);
-                                string name = StringHandlers.CToString(tmpName).ToUpperInvariant();
-
-                                if(name.EndsWith(";1", StringComparison.InvariantCulture))
-                                    name = name.Substring(0, name.Length - 2);
-
-                                if(name == "INFO.PCD")
-                                {
-                                    infoPos = BitConverter.ToUInt32(isoSector, pcdPos + 2);
-
-                                    break;
-                                }
-
-                                pcdPos += isoSector[pcdPos];
-                            }
+                            pcdPos += isoSector[pcdPos];
                         }
 
                         if(infoPos > 0)
                         {
-                            sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, infoPos, 2048, 0, 1,
-                                               false, dev.Timeout, out _);
+                            sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, infoPos, 2048,
+                                               0, 1, false, dev.Timeout, out _);
 
                             if(sense)
                                 break;
@@ -2222,318 +1443,1096 @@ namespace Aaru.Core.Media.Detection
                             }
                         }
                     }
-
-                    // "SYSTEM.CNF" length
-                    if(ps1Length > 0)
-                    {
-                        uint ps1Sectors = ps1Length / 2048;
-
-                        if(ps1Length % 2048 > 0)
-                            ps1Sectors++;
-
-                        string ps1Txt;
-
-                        // Read "SYSTEM.CNF"
-                        try
-                        {
-                            using var ps1Ms = new MemoryStream();
-
-                            for(uint i = 0; i < ps1Sectors; i++)
-                            {
-                                sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, ps1Start + i,
-                                                   2048, 0, 1, false, dev.Timeout, out _);
-
-                                if(sense)
-                                    break;
-
-                                ps1Ms.Write(isoSector, 0, 2048);
-                            }
-
-                            isoSector = ps1Ms.ToArray();
-                            ps1Txt    = Encoding.ASCII.GetString(isoSector);
-                        }
-                        catch
-                        {
-                            ps1Txt = null;
-                        }
-
-                        // Check "SYSTEM.CNF" lines
-                        if(ps1Txt != null)
-                        {
-                            using var sr = new StringReader(ps1Txt);
-
-                            string ps1BootFile = null;
-                            string ps2BootFile = null;
-
-                            while(sr.Peek() > 0)
-                            {
-                                string line = sr.ReadLine();
-
-                                // End of file
-                                if(line is null ||
-                                   line.Length == 0)
-                                    break;
-
-                                line = line.Replace(" ", "");
-
-                                if(line.StartsWith("BOOT=cdrom:", StringComparison.InvariantCultureIgnoreCase))
-                                {
-                                    ps1BootFile = line.Substring(11);
-
-                                    if(ps1BootFile.StartsWith('\\'))
-                                        ps1BootFile = ps1BootFile.Substring(1);
-
-                                    if(ps1BootFile.EndsWith(";1", StringComparison.InvariantCultureIgnoreCase))
-                                        ps1BootFile = ps1BootFile.Substring(0, ps1BootFile.Length - 2);
-
-                                    break;
-                                }
-
-                                if(line.StartsWith("BOOT2=cdrom0:", StringComparison.InvariantCultureIgnoreCase))
-                                {
-                                    ps2BootFile = line.Substring(13);
-
-                                    if(ps2BootFile.StartsWith('\\'))
-                                        ps2BootFile = ps2BootFile.Substring(1);
-
-                                    if(ps2BootFile.EndsWith(";1", StringComparison.InvariantCultureIgnoreCase))
-                                        ps2BootFile = ps2BootFile.Substring(0, ps2BootFile.Length - 2);
-
-                                    break;
-                                }
-                            }
-
-                            if(ps1BootFile != null &&
-                               rootEntries.Contains(ps1BootFile.ToUpperInvariant()))
-                            {
-                                mediaType = MediaType.PS1CD;
-
-                                AaruConsole.DebugWriteLine("Media detection",
-                                                           "Found correct SYSTEM.CNF file in root pointing to existing file in root, setting disc type to PlayStation CD.");
-                            }
-
-                            if(ps2BootFile != null &&
-                               rootEntries.Contains(ps2BootFile.ToUpperInvariant()))
-                            {
-                                mediaType = MediaType.PS2CD;
-
-                                AaruConsole.DebugWriteLine("Media detection",
-                                                           "Found correct SYSTEM.CNF file in root pointing to existing file in root, setting disc type to PlayStation 2 CD.");
-                            }
-                        }
-                    }
-
-                    break;
                 }
 
-                // TODO: Check for CD-i Ready
-                case MediaType.CDI: break;
-                case MediaType.DVDROM:
-                case MediaType.HDDVDROM:
-                case MediaType.BDROM:
-                case MediaType.UHDBD:
-                case MediaType.Unknown:
-                    // TODO: Nuon requires reading the filesystem, searching for a file called "/NUON/NUON.RUN"
-                    if(ps2BootSectors is { Length: 0x6000 })
-                    {
-                        // The decryption key is applied as XOR. As first byte is originally always NULL, it gives us the key :)
-                        byte decryptByte = ps2BootSectors[0];
+                break;
 
-                        for(int i = 0; i < 0x6000; i++)
-                            ps2BootSectors[i] ^= decryptByte;
-
-                        string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _);
-
-                        AaruConsole.DebugWriteLine("Media-info Command", "PlayStation 2 boot sectors SHA256: {0}",
-                                                   ps2BootSectorsHash);
-
-                        if(ps2BootSectorsHash == PS2_PAL_HASH  ||
-                           ps2BootSectorsHash == PS2_NTSC_HASH ||
-                           ps2BootSectorsHash == PS2_JAPANESE_HASH)
-                        {
-                            AaruConsole.DebugWriteLine("Media detection",
-                                                       "Found Sony PlayStation 2 boot sectors, setting disc type to PS2 DVD.");
-
-                            mediaType = MediaType.PS2DVD;
-                        }
-                    }
-
-                    if(sector1 != null)
-                    {
-                        byte[] tmp = new byte[_ps3Id.Length];
-                        Array.Copy(sector1, 0, tmp, 0, tmp.Length);
-
-                        if(tmp.SequenceEqual(_ps3Id))
-                            switch(mediaType)
-                            {
-                                case MediaType.BDROM:
-                                    AaruConsole.DebugWriteLine("Media detection",
-                                                               "Found Sony PlayStation 3 boot sectors, setting disc type to PS3 Blu-ray.");
-
-                                    mediaType = MediaType.PS3BD;
-
-                                    break;
-                                case MediaType.DVDROM:
-                                    AaruConsole.DebugWriteLine("Media detection",
-                                                               "Found Sony PlayStation 3 boot sectors, setting disc type to PS3 DVD.");
-
-                                    mediaType = MediaType.PS3DVD;
-
-                                    break;
-                            }
-
-                        tmp = new byte[_ps4Id.Length];
-                        Array.Copy(sector1, 512, tmp, 0, tmp.Length);
-
-                        if(tmp.SequenceEqual(_ps4Id) &&
-                           mediaType == MediaType.BDROM)
-                        {
-                            mediaType = MediaType.PS4BD;
-
-                            AaruConsole.DebugWriteLine("Media detection",
-                                                       "Found Sony PlayStation 4 boot sectors, setting disc type to PS4 Blu-ray.");
-                        }
-                    }
-
-                    if(blurayDi                              != null &&
-                       blurayDi?.Units?.Length               > 0     &&
-                       blurayDi?.Units[0].DiscTypeIdentifier != null)
-                    {
-                        string blurayType = StringHandlers.CToString(blurayDi?.Units[0].DiscTypeIdentifier);
-
-                        switch(blurayType)
-                        {
-                            case "XG4":
-                                AaruConsole.DebugWriteLine("Media detection",
-                                                           "Blu-ray type set to \"XG4\", setting disc type to Xbox One Disc (XGD4).");
-
-                                mediaType = MediaType.XGD4;
-
-                                break;
-
-                            // TODO: PS5
-                            case "BDU":
-                                if(sector1 != null)
-                                {
-                                    byte[] tmp = new byte[_ps5Id.Length];
-                                    Array.Copy(sector1, 1024, tmp, 0, tmp.Length);
-
-                                    if(tmp.SequenceEqual(_ps5Id))
-                                    {
-                                        mediaType = MediaType.PS5BD;
-
-                                        AaruConsole.DebugWriteLine("Media detection",
-                                                                   "Found Sony PlayStation 5 boot sectors, setting disc type to PS5 Ultra HD Blu-ray.");
-
-                                        break;
-                                    }
-                                }
-
-                                AaruConsole.DebugWriteLine("Media detection",
-                                                           "Blu-ray type set to \"BDU\", setting disc type to Ultra HD Blu-ray.");
-
-                                mediaType = MediaType.UHDBD;
-
-                                break;
-                        }
-                    }
-
-                    break;
-            }
+            // Other recordables will not be checked
+            case MediaType.CDRW:
+            case MediaType.CDMRW:
+            case MediaType.DDCDR:
+            case MediaType.DDCDRW:
+            case MediaType.DVDR:
+            case MediaType.DVDRW:
+            case MediaType.DVDPR:
+            case MediaType.DVDPRW:
+            case MediaType.DVDPRWDL:
+            case MediaType.DVDRDL:
+            case MediaType.DVDPRDL:
+            case MediaType.DVDRAM:
+            case MediaType.DVDRWDL:
+            case MediaType.DVDDownload:
+            case MediaType.HDDVDRAM:
+            case MediaType.HDDVDR:
+            case MediaType.HDDVDRW:
+            case MediaType.HDDVDRDL:
+            case MediaType.HDDVDRWDL:
+            case MediaType.BDR:
+            case MediaType.BDRE:
+            case MediaType.BDRXL:
+            case MediaType.BDREXL: return;
         }
 
-        static void DetectRwPackets(byte[] subchannel, out bool cdgPacket, out bool cdegPacket, out bool cdmidiPacket)
+        if(sector0 == null)
+            return;
+
+        switch(mediaType)
         {
-            cdgPacket    = false;
-            cdegPacket   = false;
-            cdmidiPacket = false;
-
-            byte[] cdSubRwPack1 = new byte[24];
-            byte[] cdSubRwPack2 = new byte[24];
-            byte[] cdSubRwPack3 = new byte[24];
-            byte[] cdSubRwPack4 = new byte[24];
-
-            int i = 0;
-
-            for(int j = 0; j < 24; j++)
-                cdSubRwPack1[j] = (byte)(subchannel[i++] & 0x3F);
-
-            for(int j = 0; j < 24; j++)
-                cdSubRwPack2[j] = (byte)(subchannel[i++] & 0x3F);
-
-            for(int j = 0; j < 24; j++)
-                cdSubRwPack3[j] = (byte)(subchannel[i++] & 0x3F);
-
-            for(int j = 0; j < 24; j++)
-                cdSubRwPack4[j] = (byte)(subchannel[i++] & 0x3F);
-
-            switch(cdSubRwPack1[0])
+            case MediaType.CD:
+            case MediaType.CDDA:
+            case MediaType.CDPLUS:
+            case MediaType.CDROM:
+            case MediaType.CDROMXA:
+                // TODO: Pippin requires interpreting Apple Partition Map, reading HFS and checking for Pippin signatures
             {
-                case 0x08:
-                case 0x09:
-                    cdgPacket = true;
+                if(CD.DecodeIPBin(sector0).HasValue)
+                {
+                    mediaType = MediaType.MEGACD;
 
-                    break;
-                case 0x0A:
-                    cdegPacket = true;
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Found Mega/Sega CD IP.BIN, setting disc type to Mega CD.");
 
-                    break;
-                case 0x38:
-                    cdmidiPacket = true;
+                    return;
+                }
 
-                    break;
+                if(Saturn.DecodeIPBin(sector0).HasValue)
+                {
+                    mediaType = MediaType.SATURNCD;
+
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Found Sega Saturn IP.BIN, setting disc type to Saturn CD.");
+
+                    return;
+                }
+
+                // Are GDR detectable ???
+                if(Dreamcast.DecodeIPBin(sector0).HasValue)
+                {
+                    mediaType = MediaType.GDROM;
+
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Found Sega Dreamcast IP.BIN, setting disc type to GD-ROM.");
+
+                    return;
+                }
+
+                if(ps2BootSectors is { Length: 0x6000 })
+                {
+                    // The decryption key is applied as XOR. As first byte is originally always NULL, it gives us the key :)
+                    byte decryptByte = ps2BootSectors[0];
+
+                    for(int i = 0; i < 0x6000; i++)
+                        ps2BootSectors[i] ^= decryptByte;
+
+                    string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _);
+
+                    AaruConsole.DebugWriteLine("Media-info Command", "PlayStation 2 boot sectors SHA256: {0}",
+                                               ps2BootSectorsHash);
+
+                    if(ps2BootSectorsHash == PS2_PAL_HASH  ||
+                       ps2BootSectorsHash == PS2_NTSC_HASH ||
+                       ps2BootSectorsHash == PS2_JAPANESE_HASH)
+                    {
+                        mediaType = MediaType.PS2CD;
+
+                        AaruConsole.DebugWriteLine("Media detection",
+                                                   "Found Sony PlayStation 2 boot sectors, setting disc type to PS2 CD.");
+
+                        goto hasPs2CdBoot;
+                    }
+                }
+
+                if(sector0 != null)
+                {
+                    byte[] syncBytes = new byte[7];
+                    Array.Copy(sector0, 0, syncBytes, 0, 7);
+
+                    if(_operaId.SequenceEqual(syncBytes))
+                    {
+                        mediaType = MediaType.ThreeDO;
+
+                        AaruConsole.DebugWriteLine("Media detection",
+                                                   "Found Opera filesystem, setting disc type to 3DO.");
+
+                        return;
+                    }
+
+                    if(_fmTownsBootId.SequenceEqual(syncBytes))
+                    {
+                        mediaType = MediaType.FMTOWNS;
+
+                        AaruConsole.DebugWriteLine("Media detection",
+                                                   "Found FM-Towns boot, setting disc type to FM-Towns.");
+
+                        return;
+                    }
+                }
+
+                if(playdia1 != null &&
+                   playdia2 != null)
+                {
+                    byte[] pd1 = new byte[_playdiaCopyright.Length];
+                    byte[] pd2 = new byte[_playdiaCopyright.Length];
+
+                    Array.Copy(playdia1, 38, pd1, 0, pd1.Length);
+                    Array.Copy(playdia2, 0, pd2, 0, pd1.Length);
+
+                    if(_playdiaCopyright.SequenceEqual(pd1) &&
+                       _playdiaCopyright.SequenceEqual(pd2))
+                    {
+                        mediaType = MediaType.Playdia;
+
+                        AaruConsole.DebugWriteLine("Media detection",
+                                                   "Found Playdia copyright, setting disc type to Playdia.");
+
+                        return;
+                    }
+                }
+
+                if(secondDataSectorNotZero != null)
+                {
+                    byte[] pce = new byte[_pcEngineSignature.Length];
+                    Array.Copy(secondDataSectorNotZero, 32, pce, 0, pce.Length);
+
+                    if(_pcEngineSignature.SequenceEqual(pce))
+                    {
+                        mediaType = MediaType.SuperCDROM2;
+
+                        AaruConsole.DebugWriteLine("Media detection",
+                                                   "Found PC-Engine CD signature, setting disc type to Super CD-ROM².");
+
+                        return;
+                    }
+                }
+
+                if(firstDataSectorNotZero != null)
+                {
+                    byte[] pcfx = new byte[_pcFxSignature.Length];
+                    Array.Copy(firstDataSectorNotZero, 0, pcfx, 0, pcfx.Length);
+
+                    if(_pcFxSignature.SequenceEqual(pcfx))
+                    {
+                        mediaType = MediaType.PCFX;
+
+                        AaruConsole.DebugWriteLine("Media detection",
+                                                   "Found PC-FX copyright, setting disc type to PC-FX.");
+
+                        return;
+                    }
+                }
+
+                if(firstTrackSecondSessionAudio != null)
+                {
+                    byte[] jaguar = new byte[_atariSignature.Length];
+
+                    for(int i = 0; i + jaguar.Length <= firstTrackSecondSessionAudio.Length; i += 2)
+                    {
+                        Array.Copy(firstTrackSecondSessionAudio, i, jaguar, 0, jaguar.Length);
+
+                        if(!_atariSignature.SequenceEqual(jaguar))
+                            continue;
+
+                        mediaType = MediaType.JaguarCD;
+
+                        AaruConsole.DebugWriteLine("Media detection",
+                                                   "Found Atari signature, setting disc type to Jaguar CD.");
+
+                        break;
+                    }
+                }
+
+                if(firstTrackSecondSession?.Length >= 2336)
+                {
+                    byte[] milcd = new byte[2048];
+                    Array.Copy(firstTrackSecondSession, 24, milcd, 0, 2048);
+
+                    if(Dreamcast.DecodeIPBin(milcd).HasValue)
+                    {
+                        mediaType = MediaType.MilCD;
+
+                        AaruConsole.DebugWriteLine("Media detection",
+                                                   "Found Sega Dreamcast IP.BIN on second session, setting disc type to MilCD.");
+
+                        return;
+                    }
+                }
+
+                // TODO: Detect black and white VideoNow
+                // TODO: Detect VideoNow XP
+                if(IsVideoNowColor(videoNowColorFrame))
+                {
+                    mediaType = MediaType.VideoNowColor;
+
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Found VideoNow! Color frame, setting disc type to VideoNow Color.");
+
+                    return;
+                }
+
+                // Check CD+G, CD+EG and CD+MIDI
+                if(mediaType == MediaType.CDDA)
+                {
+                    sense = dev.ReadCd(out byte[] subBuf, out _, 150, 96, 8, MmcSectorTypes.Cdda, false, false,
+                                       false, MmcHeaderCodes.None, false, false, MmcErrorField.None,
+                                       MmcSubchannel.Raw, dev.Timeout, out _);
+
+                    if(!sense)
+                    {
+                        bool cdg    = false;
+                        bool cdeg   = false;
+                        bool cdmidi = false;
+
+                        for(int i = 0; i < 8; i++)
+                        {
+                            byte[] tmpSub = new byte[96];
+                            Array.Copy(subBuf, i * 96, tmpSub, 0, 96);
+                            DetectRwPackets(tmpSub, out bool cdgPacket, out bool cdegPacket, out bool cdmidiPacket);
+
+                            if(cdgPacket)
+                                cdg = true;
+
+                            if(cdegPacket)
+                                cdeg = true;
+
+                            if(cdmidiPacket)
+                                cdmidi = true;
+                        }
+
+                        if(cdeg)
+                        {
+                            mediaType = MediaType.CDEG;
+
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Found enhanced graphics RW packet, setting disc type to CD+EG.");
+
+                            return;
+                        }
+
+                        if(cdg)
+                        {
+                            mediaType = MediaType.CDG;
+
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Found graphics RW packet, setting disc type to CD+G.");
+
+                            return;
+                        }
+
+                        if(cdmidi)
+                        {
+                            mediaType = MediaType.CDMIDI;
+
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Found MIDI RW packet, setting disc type to CD+MIDI.");
+
+                            return;
+                        }
+                    }
+                }
+
+                // If it has a PS2 boot area it can still be PS1, so check for SYSTEM.CNF below
+                hasPs2CdBoot:
+
+                // Check if ISO9660
+                sense = dev.Read12(out byte[] isoSector, out _, 0, false, false, false, false, 16, 2048, 0, 1,
+                                   false, dev.Timeout, out _);
+
+                // Sector 16 reads, and contains "CD001" magic?
+                if(sense                ||
+                   isoSector[1] != 0x43 ||
+                   isoSector[2] != 0x44 ||
+                   isoSector[3] != 0x30 ||
+                   isoSector[4] != 0x30 ||
+                   isoSector[5] != 0x31)
+                    return;
+
+                // From sectors 16 to 31
+                uint isoSectorPosition = 16;
+
+                while(isoSectorPosition < 32)
+                {
+                    sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, isoSectorPosition, 2048,
+                                       0, 1, false, dev.Timeout, out _);
+
+                    // If sector cannot be read, break here
+                    if(sense)
+                        break;
+
+                    // If sector does not contain "CD001" magic, break
+                    if(isoSector[1] != 0x43 ||
+                       isoSector[2] != 0x44 ||
+                       isoSector[3] != 0x30 ||
+                       isoSector[4] != 0x30 ||
+                       isoSector[5] != 0x31)
+                        break;
+
+                    // If it is PVD or end of descriptor chain, break
+                    if(isoSector[0] == 1 ||
+                       isoSector[0] == 255)
+                        break;
+
+                    isoSectorPosition++;
+                }
+
+                // If it's not an ISO9660 PVD, return
+                if(isoSector[0] != 1    ||
+                   isoSector[1] != 0x43 ||
+                   isoSector[2] != 0x44 ||
+                   isoSector[3] != 0x30 ||
+                   isoSector[4] != 0x30 ||
+                   isoSector[5] != 0x31)
+                    return;
+
+                uint rootStart  = BitConverter.ToUInt32(isoSector, 158);
+                uint rootLength = BitConverter.ToUInt32(isoSector, 166);
+
+                if(rootStart  == 0 ||
+                   rootLength == 0)
+                    return;
+
+                rootLength /= 2048;
+
+                try
+                {
+                    using var rootMs = new MemoryStream();
+
+                    for(uint i = 0; i < rootLength; i++)
+                    {
+                        sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, rootStart + i, 2048,
+                                           0, 1, false, dev.Timeout, out _);
+
+                        if(sense)
+                            break;
+
+                        rootMs.Write(isoSector, 0, 2048);
+                    }
+
+                    isoSector = rootMs.ToArray();
+                }
+                catch
+                {
+                    return;
+                }
+
+                if(isoSector.Length < 2048)
+                    return;
+
+                List<string> rootEntries   = new List<string>();
+                uint         ngcdIplStart  = 0;
+                uint         ngcdIplLength = 0;
+                uint         vcdStart      = 0;
+                uint         vcdLength     = 0;
+                uint         pcdStart      = 0;
+                uint         pcdLength     = 0;
+                uint         ps1Start      = 0;
+                uint         ps1Length     = 0;
+
+                for(int ri = 0; ri < rootLength; ri++)
+                {
+                    int rootPos = ri * 2048;
+
+                    while(rootPos                      < isoSector.Length &&
+                          isoSector[rootPos]           > 0                &&
+                          rootPos + isoSector[rootPos] <= isoSector.Length)
+                    {
+                        int    nameLen = isoSector[rootPos + 32];
+                        byte[] tmpName = new byte[nameLen];
+                        Array.Copy(isoSector, rootPos + 33, tmpName, 0, nameLen);
+                        string name = StringHandlers.CToString(tmpName).ToUpperInvariant();
+
+                        if(name.EndsWith(";1", StringComparison.InvariantCulture))
+                            name = name.Substring(0, name.Length - 2);
+
+                        rootEntries.Add(name);
+
+                        switch(name)
+                        {
+                            case "IPL.TXT":
+                                ngcdIplStart  = BitConverter.ToUInt32(isoSector, rootPos + 2);
+                                ngcdIplLength = BitConverter.ToUInt32(isoSector, rootPos + 10);
+
+                                break;
+
+                            case "VCD" when (isoSector[rootPos   + 25] & 0x02) == 0x02:
+                            case "SVCD" when (isoSector[rootPos  + 25] & 0x02) == 0x02:
+                            case "HQVCD" when (isoSector[rootPos + 25] & 0x02) == 0x02:
+                                vcdStart  = BitConverter.ToUInt32(isoSector, rootPos + 2);
+                                vcdLength = BitConverter.ToUInt32(isoSector, rootPos + 10) / 2048;
+
+                                break;
+                            case "PHOTO_CD" when (isoSector[rootPos + 25] & 0x02) == 0x02:
+                                pcdStart  = BitConverter.ToUInt32(isoSector, rootPos + 2);
+                                pcdLength = BitConverter.ToUInt32(isoSector, rootPos + 10) / 2048;
+
+                                break;
+                            case "SYSTEM.CNF":
+                                ps1Start  = BitConverter.ToUInt32(isoSector, rootPos + 2);
+                                ps1Length = BitConverter.ToUInt32(isoSector, rootPos + 10);
+
+                                break;
+                        }
+
+                        rootPos += isoSector[rootPos];
+                    }
+                }
+
+                if(rootEntries.Count == 0)
+                    return;
+
+                if(rootEntries.Contains("CD32.TM"))
+                {
+                    mediaType = MediaType.CD32;
+
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Found CD32.TM file in root, setting disc type to Amiga CD32.");
+
+                    return;
+                }
+
+                if(rootEntries.Contains("CDTV.TM"))
+                {
+                    mediaType = MediaType.CDTV;
+
+                    AaruConsole.DebugWriteLine("Media detection",
+                                               "Found CDTV.TM file in root, setting disc type to Commodore CDTV.");
+
+                    return;
+                }
+
+                // "IPL.TXT" length
+                if(ngcdIplLength > 0)
+                {
+                    uint ngcdSectors = ngcdIplLength / 2048;
+
+                    if(ngcdIplLength % 2048 > 0)
+                        ngcdSectors++;
+
+                    string iplTxt;
+
+                    // Read "IPL.TXT"
+                    try
+                    {
+                        using var ngcdMs = new MemoryStream();
+
+                        for(uint i = 0; i < ngcdSectors; i++)
+                        {
+                            sense = dev.Read12(out isoSector, out _, 0, false, false, false, false,
+                                               ngcdIplStart + i, 2048, 0, 1, false, dev.Timeout, out _);
+
+                            if(sense)
+                                break;
+
+                            ngcdMs.Write(isoSector, 0, 2048);
+                        }
+
+                        isoSector = ngcdMs.ToArray();
+                        iplTxt    = Encoding.ASCII.GetString(isoSector);
+                    }
+                    catch
+                    {
+                        iplTxt = null;
+                    }
+
+                    // Check "IPL.TXT" lines
+                    if(iplTxt != null)
+                    {
+                        using var sr = new StringReader(iplTxt);
+
+                        bool correctNeoGeoCd = true;
+                        int  lineNumber      = 0;
+
+                        while(sr.Peek() > 0)
+                        {
+                            string line = sr.ReadLine();
+
+                            // End of file
+                            if(line is null ||
+                               line.Length == 0)
+                            {
+                                if(lineNumber == 0)
+                                    correctNeoGeoCd = false;
+
+                                break;
+                            }
+
+                            // Split line by comma
+                            string[] split = line.Split(',');
+
+                            // Empty line
+                            if(split.Length == 0)
+                                continue;
+
+                            // More than 3 entries
+                            if(split.Length != 3)
+                            {
+                                if(line[0] < 0x20)
+                                    break;
+
+                                correctNeoGeoCd = false;
+
+                                break;
+                            }
+
+                            // Split filename
+                            string[] split2 = split[0].Split('.');
+
+                            // Filename must have two parts, name and extension
+                            if(split2.Length != 2)
+                            {
+                                correctNeoGeoCd = false;
+
+                                break;
+                            }
+
+                            // Name must be smaller or equal to 8 characters
+                            if(split2[0].Length > 8)
+                            {
+                                correctNeoGeoCd = false;
+
+                                break;
+                            }
+
+                            // Extension must be smaller or equal to 8 characters
+                            if(split2[1].Length > 3)
+                            {
+                                correctNeoGeoCd = false;
+
+                                break;
+                            }
+
+                            // Second part must be a single digit
+                            if(split[1].Length != 1 ||
+                               !byte.TryParse(split[1], out _))
+                            {
+                                correctNeoGeoCd = false;
+
+                                break;
+                            }
+
+                            // Third part must be bigger or equal to 1 and smaller or equal to 8
+                            if(split[2].Length < 1 ||
+                               split[2].Length > 8)
+                            {
+                                correctNeoGeoCd = false;
+
+                                break;
+                            }
+
+                            try
+                            {
+                                _ = Convert.ToUInt32(split[2], 16);
+                            }
+                            catch
+                            {
+                                correctNeoGeoCd = false;
+
+                                break;
+                            }
+
+                            lineNumber++;
+                        }
+
+                        if(correctNeoGeoCd)
+                        {
+                            mediaType = MediaType.NeoGeoCD;
+
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Found correct IPL.TXT file in root, setting disc type to Neo Geo CD.");
+
+                            return;
+                        }
+                    }
+                }
+
+                if(vcdLength > 0)
+                {
+                    try
+                    {
+                        using var vcdMs = new MemoryStream();
+
+                        for(uint i = 0; i < vcdLength; i++)
+                        {
+                            sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, vcdStart + i,
+                                               2048, 0, 1, false, dev.Timeout, out _);
+
+                            if(sense)
+                                break;
+
+                            vcdMs.Write(isoSector, 0, 2048);
+                        }
+
+                        isoSector = vcdMs.ToArray();
+                    }
+                    catch
+                    {
+                        return;
+                    }
+
+                    if(isoSector.Length < 2048)
+                        return;
+
+                    uint infoPos = 0;
+
+                    for(int vi = 0; vi < vcdLength; vi++)
+                    {
+                        int vcdPos = vi * 2048;
+
+                        while(vcdPos                     < isoSector.Length &&
+                              isoSector[vcdPos]          > 0                &&
+                              vcdPos + isoSector[vcdPos] <= isoSector.Length)
+                        {
+                            int    nameLen = isoSector[vcdPos + 32];
+                            byte[] tmpName = new byte[nameLen];
+                            Array.Copy(isoSector, vcdPos + 33, tmpName, 0, nameLen);
+                            string name = StringHandlers.CToString(tmpName).ToUpperInvariant();
+
+                            if(name.EndsWith(";1", StringComparison.InvariantCulture))
+                                name = name.Substring(0, name.Length - 2);
+
+                            if(name == "INFO.VCD" ||
+                               name == "INFO.SVD")
+                            {
+                                infoPos = BitConverter.ToUInt32(isoSector, vcdPos + 2);
+
+                                break;
+                            }
+
+                            vcdPos += isoSector[vcdPos];
+                        }
+                    }
+
+                    if(infoPos > 0)
+                    {
+                        sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, infoPos, 2048, 0, 1,
+                                           false, dev.Timeout, out _);
+
+                        if(sense)
+                            break;
+
+                        byte[] systemId = new byte[8];
+                        Array.Copy(isoSector, 0, systemId, 0, 8);
+
+                        string id = StringHandlers.CToString(systemId).TrimEnd();
+
+                        switch(id)
+                        {
+                            case "VIDEO_CD":
+                                mediaType = MediaType.VCD;
+
+                                AaruConsole.DebugWriteLine("Media detection",
+                                                           "Found Video CD description file, setting disc type to Video CD.");
+
+                                return;
+                            case "SUPERVCD":
+                                mediaType = MediaType.SVCD;
+
+                                AaruConsole.DebugWriteLine("Media detection",
+                                                           "Found Super Video CD description file, setting disc type to Super Video CD.");
+
+                                break;
+                            case "HQ-VCD":
+                                mediaType = MediaType.CVD;
+
+                                AaruConsole.DebugWriteLine("Media detection",
+                                                           "Found China Video Disc description file, setting disc type to China Video Disc.");
+
+                                break;
+                        }
+                    }
+                }
+
+                if(pcdLength > 0)
+                {
+                    try
+                    {
+                        using var pcdMs = new MemoryStream();
+
+                        for(uint i = 0; i < pcdLength; i++)
+                        {
+                            sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, pcdStart + i,
+                                               2048, 0, 1, false, dev.Timeout, out _);
+
+                            if(sense)
+                                break;
+
+                            pcdMs.Write(isoSector, 0, 2048);
+                        }
+
+                        isoSector = pcdMs.ToArray();
+                    }
+                    catch
+                    {
+                        return;
+                    }
+
+                    if(isoSector.Length < 2048)
+                        return;
+
+                    uint infoPos = 0;
+
+                    for(int pi = 0; pi < pcdLength; pi++)
+                    {
+                        int pcdPos = pi * 2048;
+
+                        while(pcdPos                     < isoSector.Length &&
+                              isoSector[pcdPos]          > 0                &&
+                              pcdPos + isoSector[pcdPos] <= isoSector.Length)
+                        {
+                            int    nameLen = isoSector[pcdPos + 32];
+                            byte[] tmpName = new byte[nameLen];
+                            Array.Copy(isoSector, pcdPos + 33, tmpName, 0, nameLen);
+                            string name = StringHandlers.CToString(tmpName).ToUpperInvariant();
+
+                            if(name.EndsWith(";1", StringComparison.InvariantCulture))
+                                name = name.Substring(0, name.Length - 2);
+
+                            if(name == "INFO.PCD")
+                            {
+                                infoPos = BitConverter.ToUInt32(isoSector, pcdPos + 2);
+
+                                break;
+                            }
+
+                            pcdPos += isoSector[pcdPos];
+                        }
+                    }
+
+                    if(infoPos > 0)
+                    {
+                        sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, infoPos, 2048, 0, 1,
+                                           false, dev.Timeout, out _);
+
+                        if(sense)
+                            break;
+
+                        byte[] systemId = new byte[8];
+                        Array.Copy(isoSector, 0, systemId, 0, 8);
+
+                        string id = StringHandlers.CToString(systemId).TrimEnd();
+
+                        switch(id)
+                        {
+                            case "PHOTO_CD":
+                                mediaType = MediaType.PCD;
+
+                                AaruConsole.DebugWriteLine("Media detection",
+                                                           "Found Photo CD description file, setting disc type to Photo CD.");
+
+                                return;
+                        }
+                    }
+                }
+
+                // "SYSTEM.CNF" length
+                if(ps1Length > 0)
+                {
+                    uint ps1Sectors = ps1Length / 2048;
+
+                    if(ps1Length % 2048 > 0)
+                        ps1Sectors++;
+
+                    string ps1Txt;
+
+                    // Read "SYSTEM.CNF"
+                    try
+                    {
+                        using var ps1Ms = new MemoryStream();
+
+                        for(uint i = 0; i < ps1Sectors; i++)
+                        {
+                            sense = dev.Read12(out isoSector, out _, 0, false, false, false, false, ps1Start + i,
+                                               2048, 0, 1, false, dev.Timeout, out _);
+
+                            if(sense)
+                                break;
+
+                            ps1Ms.Write(isoSector, 0, 2048);
+                        }
+
+                        isoSector = ps1Ms.ToArray();
+                        ps1Txt    = Encoding.ASCII.GetString(isoSector);
+                    }
+                    catch
+                    {
+                        ps1Txt = null;
+                    }
+
+                    // Check "SYSTEM.CNF" lines
+                    if(ps1Txt != null)
+                    {
+                        using var sr = new StringReader(ps1Txt);
+
+                        string ps1BootFile = null;
+                        string ps2BootFile = null;
+
+                        while(sr.Peek() > 0)
+                        {
+                            string line = sr.ReadLine();
+
+                            // End of file
+                            if(line is null ||
+                               line.Length == 0)
+                                break;
+
+                            line = line.Replace(" ", "");
+
+                            if(line.StartsWith("BOOT=cdrom:", StringComparison.InvariantCultureIgnoreCase))
+                            {
+                                ps1BootFile = line.Substring(11);
+
+                                if(ps1BootFile.StartsWith('\\'))
+                                    ps1BootFile = ps1BootFile.Substring(1);
+
+                                if(ps1BootFile.EndsWith(";1", StringComparison.InvariantCultureIgnoreCase))
+                                    ps1BootFile = ps1BootFile.Substring(0, ps1BootFile.Length - 2);
+
+                                break;
+                            }
+
+                            if(line.StartsWith("BOOT2=cdrom0:", StringComparison.InvariantCultureIgnoreCase))
+                            {
+                                ps2BootFile = line.Substring(13);
+
+                                if(ps2BootFile.StartsWith('\\'))
+                                    ps2BootFile = ps2BootFile.Substring(1);
+
+                                if(ps2BootFile.EndsWith(";1", StringComparison.InvariantCultureIgnoreCase))
+                                    ps2BootFile = ps2BootFile.Substring(0, ps2BootFile.Length - 2);
+
+                                break;
+                            }
+                        }
+
+                        if(ps1BootFile != null &&
+                           rootEntries.Contains(ps1BootFile.ToUpperInvariant()))
+                        {
+                            mediaType = MediaType.PS1CD;
+
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Found correct SYSTEM.CNF file in root pointing to existing file in root, setting disc type to PlayStation CD.");
+                        }
+
+                        if(ps2BootFile != null &&
+                           rootEntries.Contains(ps2BootFile.ToUpperInvariant()))
+                        {
+                            mediaType = MediaType.PS2CD;
+
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Found correct SYSTEM.CNF file in root pointing to existing file in root, setting disc type to PlayStation 2 CD.");
+                        }
+                    }
+                }
+
+                break;
             }
 
-            switch(cdSubRwPack2[0])
-            {
-                case 0x08:
-                case 0x09:
-                    cdgPacket = true;
+            // TODO: Check for CD-i Ready
+            case MediaType.CDI: break;
+            case MediaType.DVDROM:
+            case MediaType.HDDVDROM:
+            case MediaType.BDROM:
+            case MediaType.UHDBD:
+            case MediaType.Unknown:
+                // TODO: Nuon requires reading the filesystem, searching for a file called "/NUON/NUON.RUN"
+                if(ps2BootSectors is { Length: 0x6000 })
+                {
+                    // The decryption key is applied as XOR. As first byte is originally always NULL, it gives us the key :)
+                    byte decryptByte = ps2BootSectors[0];
 
-                    break;
-                case 0x0A:
-                    cdegPacket = true;
+                    for(int i = 0; i < 0x6000; i++)
+                        ps2BootSectors[i] ^= decryptByte;
 
-                    break;
-                case 0x38:
-                    cdmidiPacket = true;
+                    string ps2BootSectorsHash = Sha256Context.Data(ps2BootSectors, out _);
 
-                    break;
-            }
+                    AaruConsole.DebugWriteLine("Media-info Command", "PlayStation 2 boot sectors SHA256: {0}",
+                                               ps2BootSectorsHash);
 
-            switch(cdSubRwPack3[0])
-            {
-                case 0x08:
-                case 0x09:
-                    cdgPacket = true;
+                    if(ps2BootSectorsHash == PS2_PAL_HASH  ||
+                       ps2BootSectorsHash == PS2_NTSC_HASH ||
+                       ps2BootSectorsHash == PS2_JAPANESE_HASH)
+                    {
+                        AaruConsole.DebugWriteLine("Media detection",
+                                                   "Found Sony PlayStation 2 boot sectors, setting disc type to PS2 DVD.");
 
-                    break;
-                case 0x0A:
-                    cdegPacket = true;
+                        mediaType = MediaType.PS2DVD;
+                    }
+                }
 
-                    break;
-                case 0x38:
-                    cdmidiPacket = true;
+                if(sector1 != null)
+                {
+                    byte[] tmp = new byte[_ps3Id.Length];
+                    Array.Copy(sector1, 0, tmp, 0, tmp.Length);
 
-                    break;
-            }
+                    if(tmp.SequenceEqual(_ps3Id))
+                        switch(mediaType)
+                        {
+                            case MediaType.BDROM:
+                                AaruConsole.DebugWriteLine("Media detection",
+                                                           "Found Sony PlayStation 3 boot sectors, setting disc type to PS3 Blu-ray.");
 
-            switch(cdSubRwPack4[0])
-            {
-                case 0x08:
-                case 0x09:
-                    cdgPacket = true;
+                                mediaType = MediaType.PS3BD;
 
-                    break;
-                case 0x0A:
-                    cdegPacket = true;
+                                break;
+                            case MediaType.DVDROM:
+                                AaruConsole.DebugWriteLine("Media detection",
+                                                           "Found Sony PlayStation 3 boot sectors, setting disc type to PS3 DVD.");
 
-                    break;
-                case 0x38:
-                    cdmidiPacket = true;
+                                mediaType = MediaType.PS3DVD;
 
-                    break;
-            }
+                                break;
+                        }
+
+                    tmp = new byte[_ps4Id.Length];
+                    Array.Copy(sector1, 512, tmp, 0, tmp.Length);
+
+                    if(tmp.SequenceEqual(_ps4Id) &&
+                       mediaType == MediaType.BDROM)
+                    {
+                        mediaType = MediaType.PS4BD;
+
+                        AaruConsole.DebugWriteLine("Media detection",
+                                                   "Found Sony PlayStation 4 boot sectors, setting disc type to PS4 Blu-ray.");
+                    }
+                }
+
+                if(blurayDi                              != null &&
+                   blurayDi?.Units?.Length               > 0     &&
+                   blurayDi?.Units[0].DiscTypeIdentifier != null)
+                {
+                    string blurayType = StringHandlers.CToString(blurayDi?.Units[0].DiscTypeIdentifier);
+
+                    switch(blurayType)
+                    {
+                        case "XG4":
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Blu-ray type set to \"XG4\", setting disc type to Xbox One Disc (XGD4).");
+
+                            mediaType = MediaType.XGD4;
+
+                            break;
+
+                        // TODO: PS5
+                        case "BDU":
+                            if(sector1 != null)
+                            {
+                                byte[] tmp = new byte[_ps5Id.Length];
+                                Array.Copy(sector1, 1024, tmp, 0, tmp.Length);
+
+                                if(tmp.SequenceEqual(_ps5Id))
+                                {
+                                    mediaType = MediaType.PS5BD;
+
+                                    AaruConsole.DebugWriteLine("Media detection",
+                                                               "Found Sony PlayStation 5 boot sectors, setting disc type to PS5 Ultra HD Blu-ray.");
+
+                                    break;
+                                }
+                            }
+
+                            AaruConsole.DebugWriteLine("Media detection",
+                                                       "Blu-ray type set to \"BDU\", setting disc type to Ultra HD Blu-ray.");
+
+                            mediaType = MediaType.UHDBD;
+
+                            break;
+                    }
+                }
+
+                break;
+        }
+    }
+
+    static void DetectRwPackets(byte[] subchannel, out bool cdgPacket, out bool cdegPacket, out bool cdmidiPacket)
+    {
+        cdgPacket    = false;
+        cdegPacket   = false;
+        cdmidiPacket = false;
+
+        byte[] cdSubRwPack1 = new byte[24];
+        byte[] cdSubRwPack2 = new byte[24];
+        byte[] cdSubRwPack3 = new byte[24];
+        byte[] cdSubRwPack4 = new byte[24];
+
+        int i = 0;
+
+        for(int j = 0; j < 24; j++)
+            cdSubRwPack1[j] = (byte)(subchannel[i++] & 0x3F);
+
+        for(int j = 0; j < 24; j++)
+            cdSubRwPack2[j] = (byte)(subchannel[i++] & 0x3F);
+
+        for(int j = 0; j < 24; j++)
+            cdSubRwPack3[j] = (byte)(subchannel[i++] & 0x3F);
+
+        for(int j = 0; j < 24; j++)
+            cdSubRwPack4[j] = (byte)(subchannel[i++] & 0x3F);
+
+        switch(cdSubRwPack1[0])
+        {
+            case 0x08:
+            case 0x09:
+                cdgPacket = true;
+
+                break;
+            case 0x0A:
+                cdegPacket = true;
+
+                break;
+            case 0x38:
+                cdmidiPacket = true;
+
+                break;
+        }
+
+        switch(cdSubRwPack2[0])
+        {
+            case 0x08:
+            case 0x09:
+                cdgPacket = true;
+
+                break;
+            case 0x0A:
+                cdegPacket = true;
+
+                break;
+            case 0x38:
+                cdmidiPacket = true;
+
+                break;
+        }
+
+        switch(cdSubRwPack3[0])
+        {
+            case 0x08:
+            case 0x09:
+                cdgPacket = true;
+
+                break;
+            case 0x0A:
+                cdegPacket = true;
+
+                break;
+            case 0x38:
+                cdmidiPacket = true;
+
+                break;
+        }
+
+        switch(cdSubRwPack4[0])
+        {
+            case 0x08:
+            case 0x09:
+                cdgPacket = true;
+
+                break;
+            case 0x0A:
+                cdegPacket = true;
+
+                break;
+            case 0x38:
+                cdmidiPacket = true;
+
+                break;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Media/Info/CompactDisc.cs b/Aaru.Core/Media/Info/CompactDisc.cs
index 2207efe23..2ab6fafe9 100644
--- a/Aaru.Core/Media/Info/CompactDisc.cs
+++ b/Aaru.Core/Media/Info/CompactDisc.cs
@@ -43,301 +43,300 @@ using Aaru.Decoders.CD;
 using Aaru.Devices;
 using Device = Aaru.Database.Models.Device;
 
-namespace Aaru.Core.Media.Info
+namespace Aaru.Core.Media.Info;
+
+/// <summary>Core operations for retrieving information about CD based media</summary>
+public static class CompactDisc
 {
-    /// <summary>Core operations for retrieving information about CD based media</summary>
-    public static class CompactDisc
+    /// <summary>Gets the offset bytes from a Compact Disc</summary>
+    /// <param name="cdOffset">Offset entry from database</param>
+    /// <param name="dbDev">Device entry from database</param>
+    /// <param name="debug">Debug</param>
+    /// <param name="dev">Opened device</param>
+    /// <param name="dskType">Detected disk type</param>
+    /// <param name="dumpLog">Dump log if applicable</param>
+    /// <param name="tracks">Disc track list</param>
+    /// <param name="updateStatus">UpdateStatus event</param>
+    /// <param name="driveOffset">Drive offset</param>
+    /// <param name="combinedOffset">Combined offset</param>
+    /// <param name="supportsPlextorReadCdDa">Set to <c>true</c> if drive supports PLEXTOR READ CD-DA vendor command</param>
+    /// <returns><c>true</c> if offset could be found, <c>false</c> otherwise</returns>
+    [SuppressMessage("ReSharper", "TooWideLocalVariableScope")]
+    public static void GetOffset(CdOffset cdOffset, Device dbDev, bool debug, Aaru.Devices.Device dev,
+                                 MediaType dskType, DumpLog dumpLog, Track[] tracks,
+                                 UpdateStatusHandler updateStatus, out int? driveOffset, out int? combinedOffset,
+                                 out bool supportsPlextorReadCdDa)
     {
-        /// <summary>Gets the offset bytes from a Compact Disc</summary>
-        /// <param name="cdOffset">Offset entry from database</param>
-        /// <param name="dbDev">Device entry from database</param>
-        /// <param name="debug">Debug</param>
-        /// <param name="dev">Opened device</param>
-        /// <param name="dskType">Detected disk type</param>
-        /// <param name="dumpLog">Dump log if applicable</param>
-        /// <param name="tracks">Disc track list</param>
-        /// <param name="updateStatus">UpdateStatus event</param>
-        /// <param name="driveOffset">Drive offset</param>
-        /// <param name="combinedOffset">Combined offset</param>
-        /// <param name="supportsPlextorReadCdDa">Set to <c>true</c> if drive supports PLEXTOR READ CD-DA vendor command</param>
-        /// <returns><c>true</c> if offset could be found, <c>false</c> otherwise</returns>
-        [SuppressMessage("ReSharper", "TooWideLocalVariableScope")]
-        public static void GetOffset(CdOffset cdOffset, Device dbDev, bool debug, Aaru.Devices.Device dev,
-                                     MediaType dskType, DumpLog dumpLog, Track[] tracks,
-                                     UpdateStatusHandler updateStatus, out int? driveOffset, out int? combinedOffset,
-                                     out bool supportsPlextorReadCdDa)
+        byte[]     cmdBuf;
+        bool       sense;
+        int        minute;
+        int        second;
+        int        frame;
+        byte[]     sectorSync;
+        byte[]     tmpBuf;
+        int        lba;
+        int        diff;
+        Track      dataTrack   = default;
+        Track      audioTrack  = default;
+        bool       offsetFound = false;
+        const uint sectorSize  = 2352;
+        driveOffset             = cdOffset?.Offset * 4;
+        combinedOffset          = null;
+        supportsPlextorReadCdDa = false;
+
+        if(dskType != MediaType.VideoNowColor)
         {
-            byte[]     cmdBuf;
-            bool       sense;
-            int        minute;
-            int        second;
-            int        frame;
-            byte[]     sectorSync;
-            byte[]     tmpBuf;
-            int        lba;
-            int        diff;
-            Track      dataTrack   = default;
-            Track      audioTrack  = default;
-            bool       offsetFound = false;
-            const uint sectorSize  = 2352;
-            driveOffset             = cdOffset?.Offset * 4;
-            combinedOffset          = null;
-            supportsPlextorReadCdDa = false;
-
-            if(dskType != MediaType.VideoNowColor)
+            if(tracks.Any(t => t.Type != TrackType.Audio))
             {
-                if(tracks.Any(t => t.Type != TrackType.Audio))
+                dataTrack = tracks.FirstOrDefault(t => t.Type != TrackType.Audio);
+
+                if(dataTrack != null)
                 {
-                    dataTrack = tracks.FirstOrDefault(t => t.Type != TrackType.Audio);
-
-                    if(dataTrack != null)
+                    // Build sync
+                    sectorSync = new byte[]
                     {
-                        // Build sync
-                        sectorSync = new byte[]
+                        0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
+                    };
+
+                    tmpBuf = new byte[sectorSync.Length];
+
+                    // Ensure to be out of the pregap, or multi-session discs give funny values
+                    uint wantedLba = (uint)(dataTrack.StartSector + 151);
+
+                    // Plextor READ CDDA
+                    if(dbDev?.ATAPI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA == true) == true ||
+                       dbDev?.SCSI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA  == true) == true ||
+                       dev.Manufacturer.ToLowerInvariant()                                        == "plextor")
+                    {
+                        sense = dev.PlextorReadCdDa(out cmdBuf, out _, wantedLba, sectorSize, 3,
+                                                    PlextorSubchannel.None, dev.Timeout, out _);
+
+                        if(!sense &&
+                           !dev.Error)
                         {
-                            0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
-                        };
+                            supportsPlextorReadCdDa = true;
 
-                        tmpBuf = new byte[sectorSync.Length];
-
-                        // Ensure to be out of the pregap, or multi-session discs give funny values
-                        uint wantedLba = (uint)(dataTrack.StartSector + 151);
-
-                        // Plextor READ CDDA
-                        if(dbDev?.ATAPI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA == true) == true ||
-                           dbDev?.SCSI?.RemovableMedias?.Any(d => d.SupportsPlextorReadCDDA  == true) == true ||
-                           dev.Manufacturer.ToLowerInvariant()                                        == "plextor")
-                        {
-                            sense = dev.PlextorReadCdDa(out cmdBuf, out _, wantedLba, sectorSize, 3,
-                                                        PlextorSubchannel.None, dev.Timeout, out _);
-
-                            if(!sense &&
-                               !dev.Error)
+                            for(int i = 0; i < cmdBuf.Length - sectorSync.Length; i++)
                             {
-                                supportsPlextorReadCdDa = true;
+                                Array.Copy(cmdBuf, i, tmpBuf, 0, sectorSync.Length);
 
-                                for(int i = 0; i < cmdBuf.Length - sectorSync.Length; i++)
-                                {
-                                    Array.Copy(cmdBuf, i, tmpBuf, 0, sectorSync.Length);
+                                if(!tmpBuf.SequenceEqual(sectorSync))
+                                    continue;
 
-                                    if(!tmpBuf.SequenceEqual(sectorSync))
-                                        continue;
+                                // De-scramble M and S
+                                minute = cmdBuf[i + 12] ^ 0x01;
+                                second = cmdBuf[i + 13] ^ 0x80;
+                                frame  = cmdBuf[i + 14];
 
-                                    // De-scramble M and S
-                                    minute = cmdBuf[i + 12] ^ 0x01;
-                                    second = cmdBuf[i + 13] ^ 0x80;
-                                    frame  = cmdBuf[i + 14];
+                                // Convert to binary
+                                minute = (minute / 16 * 10) + (minute & 0x0F);
+                                second = (second / 16 * 10) + (second & 0x0F);
+                                frame  = (frame  / 16 * 10) + (frame  & 0x0F);
 
-                                    // Convert to binary
-                                    minute = (minute / 16 * 10) + (minute & 0x0F);
-                                    second = (second / 16 * 10) + (second & 0x0F);
-                                    frame  = (frame  / 16 * 10) + (frame  & 0x0F);
+                                // Calculate the first found LBA
+                                lba = (minute * 60 * 75) + (second * 75) + frame - 150;
 
-                                    // Calculate the first found LBA
-                                    lba = (minute * 60 * 75) + (second * 75) + frame - 150;
+                                // Calculate the difference between the found LBA and the requested one
+                                diff = (int)wantedLba - lba;
 
-                                    // Calculate the difference between the found LBA and the requested one
-                                    diff = (int)wantedLba - lba;
+                                combinedOffset = i + (2352 * diff);
+                                offsetFound    = true;
 
-                                    combinedOffset = i + (2352 * diff);
-                                    offsetFound    = true;
-
-                                    break;
-                                }
+                                break;
                             }
                         }
+                    }
 
-                        if(!offsetFound &&
-                           (debug || dbDev?.ATAPI?.RemovableMedias?.Any(d => d.CanReadCdScrambled == true) == true ||
-                            dbDev?.SCSI?.RemovableMedias?.Any(d => d.CanReadCdScrambled           == true) == true ||
-                            dbDev?.SCSI?.MultiMediaDevice?.TestedMedia?.Any(d => d.CanReadCdScrambled == true) ==
-                            true || dev.Manufacturer.ToLowerInvariant() == "hl-dt-st"))
-                        {
-                            sense = dev.ReadCd(out cmdBuf, out _, wantedLba, sectorSize, 3, MmcSectorTypes.Cdda, false,
-                                               false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                               MmcSubchannel.None, dev.Timeout, out _);
-
-                            if(!sense &&
-                               !dev.Error)
-                            {
-                                // Clear cache
-                                for(int i = 0; i < 63; i++)
-                                {
-                                    sense = dev.ReadCd(out _, out _, (uint)(wantedLba + 3 + (16 * i)), sectorSize, 16,
-                                                       MmcSectorTypes.AllTypes, false, false, false,
-                                                       MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                                       MmcSubchannel.None, dev.Timeout, out _);
-
-                                    if(sense || dev.Error)
-                                        break;
-                                }
-
-                                dev.ReadCd(out cmdBuf, out _, wantedLba, sectorSize, 3, MmcSectorTypes.Cdda, false,
+                    if(!offsetFound &&
+                       (debug || dbDev?.ATAPI?.RemovableMedias?.Any(d => d.CanReadCdScrambled == true) == true ||
+                        dbDev?.SCSI?.RemovableMedias?.Any(d => d.CanReadCdScrambled           == true) == true ||
+                        dbDev?.SCSI?.MultiMediaDevice?.TestedMedia?.Any(d => d.CanReadCdScrambled == true) ==
+                        true || dev.Manufacturer.ToLowerInvariant() == "hl-dt-st"))
+                    {
+                        sense = dev.ReadCd(out cmdBuf, out _, wantedLba, sectorSize, 3, MmcSectorTypes.Cdda, false,
                                            false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
                                            MmcSubchannel.None, dev.Timeout, out _);
 
-                                for(int i = 0; i < cmdBuf.Length - sectorSync.Length; i++)
-                                {
-                                    Array.Copy(cmdBuf, i, tmpBuf, 0, sectorSync.Length);
-
-                                    if(!tmpBuf.SequenceEqual(sectorSync))
-                                        continue;
-
-                                    // De-scramble M and S
-                                    minute = cmdBuf[i + 12] ^ 0x01;
-                                    second = cmdBuf[i + 13] ^ 0x80;
-                                    frame  = cmdBuf[i + 14];
-
-                                    // Convert to binary
-                                    minute = (minute / 16 * 10) + (minute & 0x0F);
-                                    second = (second / 16 * 10) + (second & 0x0F);
-                                    frame  = (frame  / 16 * 10) + (frame  & 0x0F);
-
-                                    // Calculate the first found LBA
-                                    lba = (minute * 60 * 75) + (second * 75) + frame - 150;
-
-                                    // Calculate the difference between the found LBA and the requested one
-                                    diff = (int)wantedLba - lba;
-
-                                    combinedOffset = i + (2352 * diff);
-                                    offsetFound    = true;
+                        if(!sense &&
+                           !dev.Error)
+                        {
+                            // Clear cache
+                            for(int i = 0; i < 63; i++)
+                            {
+                                sense = dev.ReadCd(out _, out _, (uint)(wantedLba + 3 + (16 * i)), sectorSize, 16,
+                                                   MmcSectorTypes.AllTypes, false, false, false,
+                                                   MmcHeaderCodes.None, true, false, MmcErrorField.None,
+                                                   MmcSubchannel.None, dev.Timeout, out _);
 
+                                if(sense || dev.Error)
                                     break;
-                                }
+                            }
+
+                            dev.ReadCd(out cmdBuf, out _, wantedLba, sectorSize, 3, MmcSectorTypes.Cdda, false,
+                                       false, false, MmcHeaderCodes.None, true, false, MmcErrorField.None,
+                                       MmcSubchannel.None, dev.Timeout, out _);
+
+                            for(int i = 0; i < cmdBuf.Length - sectorSync.Length; i++)
+                            {
+                                Array.Copy(cmdBuf, i, tmpBuf, 0, sectorSync.Length);
+
+                                if(!tmpBuf.SequenceEqual(sectorSync))
+                                    continue;
+
+                                // De-scramble M and S
+                                minute = cmdBuf[i + 12] ^ 0x01;
+                                second = cmdBuf[i + 13] ^ 0x80;
+                                frame  = cmdBuf[i + 14];
+
+                                // Convert to binary
+                                minute = (minute / 16 * 10) + (minute & 0x0F);
+                                second = (second / 16 * 10) + (second & 0x0F);
+                                frame  = (frame  / 16 * 10) + (frame  & 0x0F);
+
+                                // Calculate the first found LBA
+                                lba = (minute * 60 * 75) + (second * 75) + frame - 150;
+
+                                // Calculate the difference between the found LBA and the requested one
+                                diff = (int)wantedLba - lba;
+
+                                combinedOffset = i + (2352 * diff);
+                                offsetFound    = true;
+
+                                break;
                             }
                         }
                     }
                 }
-
-                if(offsetFound)
-                    return;
-
-                // Try to get another the offset some other way, we need an audio track just after a data track, same session
-
-                for(int i = 1; i < tracks.Length; i++)
-                {
-                    if(tracks[i - 1].Type == TrackType.Audio ||
-                       tracks[i].Type     != TrackType.Audio)
-                        continue;
-
-                    dataTrack  = tracks[i - 1];
-                    audioTrack = tracks[i];
-
-                    break;
-                }
-
-                if(dataTrack is null ||
-                   audioTrack is null)
-                    return;
-
-                // Found them
-                sense = dev.ReadCd(out cmdBuf, out _, (uint)audioTrack.StartSector, sectorSize, 3,
-                                   MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
-                                   MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
-
-                if(sense || dev.Error)
-                    return;
-
-                dataTrack.EndSector += 150;
-
-                // Calculate MSF
-                minute = (int)dataTrack.EndSector                     / 4500;
-                second = ((int)dataTrack.EndSector - (minute * 4500)) / 75;
-                frame  = (int)dataTrack.EndSector - (minute * 4500) - (second * 75);
-
-                dataTrack.EndSector -= 150;
-
-                // Convert to BCD
-                minute = ((minute / 10) << 4) + (minute % 10);
-                second = ((second / 10) << 4) + (second % 10);
-                frame  = ((frame  / 10) << 4) + (frame  % 10);
-
-                // Scramble M and S
-                minute ^= 0x01;
-                second ^= 0x80;
-
-                // Build sync
-                sectorSync = new byte[]
-                {
-                    0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, (byte)minute, (byte)second,
-                    (byte)frame
-                };
-
-                tmpBuf = new byte[sectorSync.Length];
-
-                for(int i = 0; i < cmdBuf.Length - sectorSync.Length; i++)
-                {
-                    Array.Copy(cmdBuf, i, tmpBuf, 0, sectorSync.Length);
-
-                    if(!tmpBuf.SequenceEqual(sectorSync))
-                        continue;
-
-                    combinedOffset = i + 2352;
-                    offsetFound    = true;
-
-                    break;
-                }
-
-                if(offsetFound || audioTrack.Pregap <= 0)
-                    return;
-
-                sense = dev.ReadCd(out byte[] dataBuf, out _, (uint)dataTrack.EndSector, sectorSize, 1,
-                                   MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
-                                   MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
-
-                if(sense || dev.Error)
-                    return;
-
-                for(int i = 0; i < dataBuf.Length; i++)
-                    dataBuf[i] ^= Sector.ScrambleTable[i];
-
-                for(int i = 0; i < 2352; i++)
-                {
-                    byte[] dataSide  = new byte[2352 - i];
-                    byte[] audioSide = new byte[2352 - i];
-
-                    Array.Copy(dataBuf, i, dataSide, 0, dataSide.Length);
-                    Array.Copy(cmdBuf, 0, audioSide, 0, audioSide.Length);
-
-                    if(!dataSide.SequenceEqual(audioSide))
-                        continue;
-
-                    combinedOffset = audioSide.Length;
-
-                    break;
-                }
             }
-            else
-            {
-                byte[] videoNowColorFrame = new byte[9 * sectorSize];
 
-                sense = dev.ReadCd(out cmdBuf, out _, 0, sectorSize, 9, MmcSectorTypes.AllTypes, false, false, true,
-                                   MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
+            if(offsetFound)
+                return;
+
+            // Try to get another the offset some other way, we need an audio track just after a data track, same session
+
+            for(int i = 1; i < tracks.Length; i++)
+            {
+                if(tracks[i - 1].Type == TrackType.Audio ||
+                   tracks[i].Type     != TrackType.Audio)
+                    continue;
+
+                dataTrack  = tracks[i - 1];
+                audioTrack = tracks[i];
+
+                break;
+            }
+
+            if(dataTrack is null ||
+               audioTrack is null)
+                return;
+
+            // Found them
+            sense = dev.ReadCd(out cmdBuf, out _, (uint)audioTrack.StartSector, sectorSize, 3,
+                               MmcSectorTypes.Cdda, false, false, false, MmcHeaderCodes.None, true, false,
+                               MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+
+            if(sense || dev.Error)
+                return;
+
+            dataTrack.EndSector += 150;
+
+            // Calculate MSF
+            minute = (int)dataTrack.EndSector                     / 4500;
+            second = ((int)dataTrack.EndSector - (minute * 4500)) / 75;
+            frame  = (int)dataTrack.EndSector - (minute * 4500) - (second * 75);
+
+            dataTrack.EndSector -= 150;
+
+            // Convert to BCD
+            minute = ((minute / 10) << 4) + (minute % 10);
+            second = ((second / 10) << 4) + (second % 10);
+            frame  = ((frame  / 10) << 4) + (frame  % 10);
+
+            // Scramble M and S
+            minute ^= 0x01;
+            second ^= 0x80;
+
+            // Build sync
+            sectorSync = new byte[]
+            {
+                0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, (byte)minute, (byte)second,
+                (byte)frame
+            };
+
+            tmpBuf = new byte[sectorSync.Length];
+
+            for(int i = 0; i < cmdBuf.Length - sectorSync.Length; i++)
+            {
+                Array.Copy(cmdBuf, i, tmpBuf, 0, sectorSync.Length);
+
+                if(!tmpBuf.SequenceEqual(sectorSync))
+                    continue;
+
+                combinedOffset = i + 2352;
+                offsetFound    = true;
+
+                break;
+            }
+
+            if(offsetFound || audioTrack.Pregap <= 0)
+                return;
+
+            sense = dev.ReadCd(out byte[] dataBuf, out _, (uint)dataTrack.EndSector, sectorSize, 1,
+                               MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                               MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+
+            if(sense || dev.Error)
+                return;
+
+            for(int i = 0; i < dataBuf.Length; i++)
+                dataBuf[i] ^= Sector.ScrambleTable[i];
+
+            for(int i = 0; i < 2352; i++)
+            {
+                byte[] dataSide  = new byte[2352 - i];
+                byte[] audioSide = new byte[2352 - i];
+
+                Array.Copy(dataBuf, i, dataSide, 0, dataSide.Length);
+                Array.Copy(cmdBuf, 0, audioSide, 0, audioSide.Length);
+
+                if(!dataSide.SequenceEqual(audioSide))
+                    continue;
+
+                combinedOffset = audioSide.Length;
+
+                break;
+            }
+        }
+        else
+        {
+            byte[] videoNowColorFrame = new byte[9 * sectorSize];
+
+            sense = dev.ReadCd(out cmdBuf, out _, 0, sectorSize, 9, MmcSectorTypes.AllTypes, false, false, true,
+                               MmcHeaderCodes.AllHeaders, true, true, MmcErrorField.None, MmcSubchannel.None,
+                               dev.Timeout, out _);
+
+            if(sense || dev.Error)
+            {
+                sense = dev.ReadCd(out cmdBuf, out _, 0, sectorSize, 9, MmcSectorTypes.Cdda, false, false, true,
+                                   MmcHeaderCodes.None, true, true, MmcErrorField.None, MmcSubchannel.None,
                                    dev.Timeout, out _);
 
                 if(sense || dev.Error)
                 {
-                    sense = dev.ReadCd(out cmdBuf, out _, 0, sectorSize, 9, MmcSectorTypes.Cdda, false, false, true,
-                                       MmcHeaderCodes.None, true, true, MmcErrorField.None, MmcSubchannel.None,
-                                       dev.Timeout, out _);
+                    videoNowColorFrame = null;
+                }
+            }
 
-                    if(sense || dev.Error)
-                    {
-                        videoNowColorFrame = null;
-                    }
-                }
-
-                if(videoNowColorFrame is null)
-                {
-                    dumpLog?.WriteLine("Could not find VideoNow Color frame offset, dump may not be correct.");
-                    updateStatus?.Invoke("Could not find VideoNow Color frame offset, dump may not be correct.");
-                }
-                else
-                {
-                    combinedOffset = MMC.GetVideoNowColorOffset(videoNowColorFrame);
-                    dumpLog?.WriteLine($"VideoNow Color frame is offset {combinedOffset} bytes.");
-                    updateStatus?.Invoke($"VideoNow Color frame is offset {combinedOffset} bytes.");
-                }
+            if(videoNowColorFrame is null)
+            {
+                dumpLog?.WriteLine("Could not find VideoNow Color frame offset, dump may not be correct.");
+                updateStatus?.Invoke("Could not find VideoNow Color frame offset, dump may not be correct.");
+            }
+            else
+            {
+                combinedOffset = MMC.GetVideoNowColorOffset(videoNowColorFrame);
+                dumpLog?.WriteLine($"VideoNow Color frame is offset {combinedOffset} bytes.");
+                updateStatus?.Invoke($"VideoNow Color frame is offset {combinedOffset} bytes.");
             }
         }
     }
diff --git a/Aaru.Core/Media/Info/ScsiInfo.cs b/Aaru.Core/Media/Info/ScsiInfo.cs
index 50f389914..49e8ac642 100644
--- a/Aaru.Core/Media/Info/ScsiInfo.cs
+++ b/Aaru.Core/Media/Info/ScsiInfo.cs
@@ -51,98 +51,90 @@ using DMI = Aaru.Decoders.Xbox.DMI;
 using DVDDecryption = Aaru.Decryption.DVD.Dump;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 
-namespace Aaru.Core.Media.Info
+namespace Aaru.Core.Media.Info;
+
+/// <summary>Retrieves information from a SCSI device</summary>
+public sealed class ScsiInfo
 {
-    /// <summary>Retrieves information from a SCSI device</summary>
-    public sealed class ScsiInfo
+    /// <summary>Initializes this class with the specific device, and fills in the information</summary>
+    /// <param name="dev">Device</param>
+    public ScsiInfo(Device dev)
     {
-        /// <summary>Initializes this class with the specific device, and fills in the information</summary>
-        /// <param name="dev">Device</param>
-        public ScsiInfo(Device dev)
+        if(dev.Type != DeviceType.SCSI &&
+           dev.Type != DeviceType.ATAPI)
+            return;
+
+        MediaType     = MediaType.Unknown;
+        MediaInserted = false;
+        int    resets = 0;
+        bool   sense;
+        byte[] cmdBuf;
+        byte[] senseBuf;
+        bool   containsFloppyPage    = false;
+        int    sessions              = 1;
+        int    firstTrackLastSession = 1;
+
+        if(dev.IsRemovable)
         {
-            if(dev.Type != DeviceType.SCSI &&
-               dev.Type != DeviceType.ATAPI)
-                return;
+            deviceGotReset:
+            sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
 
-            MediaType     = MediaType.Unknown;
-            MediaInserted = false;
-            int    resets = 0;
-            bool   sense;
-            byte[] cmdBuf;
-            byte[] senseBuf;
-            bool   containsFloppyPage    = false;
-            int    sessions              = 1;
-            int    firstTrackLastSession = 1;
-
-            if(dev.IsRemovable)
+            if(sense)
             {
-                deviceGotReset:
-                sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
+                DecodedSense? decSense = Sense.Decode(senseBuf);
 
-                if(sense)
+                if(decSense.HasValue)
                 {
-                    DecodedSense? decSense = Sense.Decode(senseBuf);
-
-                    if(decSense.HasValue)
+                    // Just retry, for 5 times
+                    if(decSense?.ASC == 0x29)
                     {
-                        // Just retry, for 5 times
-                        if(decSense?.ASC == 0x29)
-                        {
-                            resets++;
+                        resets++;
 
-                            if(resets < 5)
-                                goto deviceGotReset;
+                        if(resets < 5)
+                            goto deviceGotReset;
+                    }
+
+                    if(decSense?.ASC == 0x3A)
+                    {
+                        int leftRetries = 5;
+
+                        while(leftRetries > 0)
+                        {
+                            //AaruConsole.WriteLine("\rWaiting for drive to become ready");
+                            Thread.Sleep(2000);
+                            sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
+
+                            if(!sense)
+                                break;
+
+                            leftRetries--;
                         }
 
-                        if(decSense?.ASC == 0x3A)
+                        if(sense)
                         {
-                            int leftRetries = 5;
+                            AaruConsole.ErrorWriteLine("Please insert media in drive");
 
-                            while(leftRetries > 0)
-                            {
-                                //AaruConsole.WriteLine("\rWaiting for drive to become ready");
-                                Thread.Sleep(2000);
-                                sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
-
-                                if(!sense)
-                                    break;
-
-                                leftRetries--;
-                            }
-
-                            if(sense)
-                            {
-                                AaruConsole.ErrorWriteLine("Please insert media in drive");
-
-                                return;
-                            }
+                            return;
                         }
-                        else if(decSense?.ASC  == 0x04 &&
-                                decSense?.ASCQ == 0x01)
+                    }
+                    else if(decSense?.ASC  == 0x04 &&
+                            decSense?.ASCQ == 0x01)
+                    {
+                        int leftRetries = 10;
+
+                        while(leftRetries > 0)
                         {
-                            int leftRetries = 10;
+                            //AaruConsole.WriteLine("\rWaiting for drive to become ready");
+                            Thread.Sleep(2000);
+                            sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
 
-                            while(leftRetries > 0)
-                            {
-                                //AaruConsole.WriteLine("\rWaiting for drive to become ready");
-                                Thread.Sleep(2000);
-                                sense = dev.ScsiTestUnitReady(out senseBuf, dev.Timeout, out _);
+                            if(!sense)
+                                break;
 
-                                if(!sense)
-                                    break;
-
-                                leftRetries--;
-                            }
-
-                            if(sense)
-                            {
-                                AaruConsole.ErrorWriteLine("Error testing unit was ready:\n{0}",
-                                                           Sense.PrettifySense(senseBuf));
-
-                                return;
-                            }
+                            leftRetries--;
                         }
-                        else
+
+                        if(sense)
                         {
                             AaruConsole.ErrorWriteLine("Error testing unit was ready:\n{0}",
                                                        Sense.PrettifySense(senseBuf));
@@ -152,1486 +144,1493 @@ namespace Aaru.Core.Media.Info
                     }
                     else
                     {
-                        AaruConsole.ErrorWriteLine("Unknown testing unit was ready.");
+                        AaruConsole.ErrorWriteLine("Error testing unit was ready:\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
 
                         return;
                     }
                 }
+                else
+                {
+                    AaruConsole.ErrorWriteLine("Unknown testing unit was ready.");
+
+                    return;
+                }
             }
+        }
 
-            MediaInserted = true;
+        MediaInserted = true;
 
-            DeviceInfo = new DeviceInfo(dev);
+        DeviceInfo = new DeviceInfo(dev);
 
-            byte scsiMediumType  = 0;
-            byte scsiDensityCode = 0;
+        byte scsiMediumType  = 0;
+        byte scsiDensityCode = 0;
 
-            if(DeviceInfo.ScsiMode.HasValue)
-            {
-                scsiMediumType = (byte)DeviceInfo.ScsiMode.Value.Header.MediumType;
+        if(DeviceInfo.ScsiMode.HasValue)
+        {
+            scsiMediumType = (byte)DeviceInfo.ScsiMode.Value.Header.MediumType;
 
-                if(DeviceInfo.ScsiMode?.Header.BlockDescriptors?.Length > 0)
-                    scsiDensityCode = (byte)DeviceInfo.ScsiMode.Value.Header.BlockDescriptors[0].Density;
+            if(DeviceInfo.ScsiMode?.Header.BlockDescriptors?.Length > 0)
+                scsiDensityCode = (byte)DeviceInfo.ScsiMode.Value.Header.BlockDescriptors[0].Density;
 
-                if(DeviceInfo.ScsiMode.Value.Pages != null)
-                    containsFloppyPage = DeviceInfo.ScsiMode.Value.Pages.Any(p => p.Page == 0x05);
-            }
+            if(DeviceInfo.ScsiMode.Value.Pages != null)
+                containsFloppyPage = DeviceInfo.ScsiMode.Value.Pages.Any(p => p.Page == 0x05);
+        }
 
-            Blocks    = 0;
-            BlockSize = 0;
+        Blocks    = 0;
+        BlockSize = 0;
 
-            switch(dev.ScsiType)
-            {
-                case PeripheralDeviceTypes.DirectAccess:
-                case PeripheralDeviceTypes.MultiMediaDevice:
-                case PeripheralDeviceTypes.OCRWDevice:
-                case PeripheralDeviceTypes.OpticalDevice:
-                case PeripheralDeviceTypes.SimplifiedDevice:
-                case PeripheralDeviceTypes.WriteOnceDevice:
-                    sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                    if(!sense)
-                    {
-                        ReadCapacity = cmdBuf;
-
-                        Blocks = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) &
-                                 0xFFFFFFFF;
-
-                        BlockSize = (uint)((cmdBuf[5] << 24) + (cmdBuf[5] << 16) + (cmdBuf[6] << 8) + cmdBuf[7]);
-                    }
-
-                    sense = dev.ReadCapacity16(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                    if(!sense)
-                        ReadCapacity16 = cmdBuf;
-
-                    if(ReadCapacity == null       ||
-                       Blocks       == 0xFFFFFFFF ||
-                       Blocks       == 0)
-                    {
-                        if(ReadCapacity16 == null &&
-                           Blocks         == 0)
-                            if(dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
-                            {
-                                AaruConsole.ErrorWriteLine("Unable to get media capacity");
-                                AaruConsole.ErrorWriteLine("{0}", Sense.PrettifySense(senseBuf));
-                            }
-
-                        if(ReadCapacity16 != null)
-                        {
-                            byte[] temp = new byte[8];
-
-                            Array.Copy(cmdBuf, 0, temp, 0, 8);
-                            Array.Reverse(temp);
-                            Blocks    = BitConverter.ToUInt64(temp, 0);
-                            BlockSize = (uint)((cmdBuf[8] << 24) + (cmdBuf[9] << 16) + (cmdBuf[10] << 8) + cmdBuf[11]);
-                        }
-                    }
-
-                    if(Blocks    != 0 &&
-                       BlockSize != 0)
-                        Blocks++;
-
-                    break;
-                case PeripheralDeviceTypes.SequentialAccess:
-                    byte[] medBuf;
-
-                    sense = dev.ReportDensitySupport(out byte[] seqBuf, out senseBuf, false, dev.Timeout, out _);
-
-                    if(!sense)
-                    {
-                        sense = dev.ReportDensitySupport(out medBuf, out senseBuf, true, dev.Timeout, out _);
-
-                        if(!sense &&
-                           !seqBuf.SequenceEqual(medBuf))
-                        {
-                            DensitySupport       = seqBuf;
-                            DensitySupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf);
-                        }
-                    }
-
-                    sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, out _);
-
-                    if(!sense)
-                    {
-                        sense = dev.ReportDensitySupport(out medBuf, out senseBuf, true, true, dev.Timeout, out _);
-
-                        if(!sense &&
-                           !seqBuf.SequenceEqual(medBuf))
-                        {
-                            MediaTypeSupport       = medBuf;
-                            MediaTypeSupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf);
-                        }
-                    }
-
-                    // TODO: Get a machine where 16-byte CDBs don't get DID_ABORT
-                    /*
-                sense = dev.ReadAttribute(out seqBuf, out senseBuf, ScsiAttributeAction.List, 0, dev.Timeout, out _);
-                if (sense)
-                    AaruConsole.ErrorWriteLine("SCSI READ ATTRIBUTE:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_scsi_readattribute.bin", "SCSI READ ATTRIBUTE", seqBuf);
-                }
-                */
-                    break;
-                case PeripheralDeviceTypes.BridgingExpander
-                    when dev.Model.StartsWith("MDM", StringComparison.Ordinal) ||
-                         dev.Model.StartsWith("MDH", StringComparison.Ordinal):
-                    sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                    if(!sense)
-                    {
-                        ReadCapacity = cmdBuf;
-
-                        Blocks = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) &
-                                 0xFFFFFFFF;
-
-                        BlockSize = (uint)((cmdBuf[5] << 24) + (cmdBuf[5] << 16) + (cmdBuf[6] << 8) + cmdBuf[7]);
-                    }
-
-                    break;
-            }
-
-            if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
-            {
-                sense = dev.GetConfiguration(out cmdBuf, out senseBuf, 0, MmcGetConfigurationRt.Current, dev.Timeout,
-                                             out _);
-
-                if(sense)
-                {
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ GET CONFIGURATION:\n{0}",
-                                               Sense.PrettifySense(senseBuf));
-
-                    if(dev.IsUsb &&
-                       (scsiMediumType == 0x40 || scsiMediumType == 0x41 || scsiMediumType == 0x42))
-                        MediaType = MediaType.FlashDrive;
-                }
-                else
-                {
-                    MmcConfiguration = cmdBuf;
-                    Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
-
-                    AaruConsole.DebugWriteLine("Media-Info command", "GET CONFIGURATION current profile is {0:X4}h",
-                                               ftr.CurrentProfile);
-
-                    switch(ftr.CurrentProfile)
-                    {
-                        case 0x0001:
-                            MediaType = MediaType.GENERIC_HDD;
-
-                            break;
-                        case 0x0002:
-                            switch(scsiMediumType)
-                            {
-                                case 0x01:
-                                    MediaType = MediaType.PD650;
-
-                                    break;
-                                case 0x41:
-                                    switch(Blocks)
-                                    {
-                                        case 58620544:
-                                            MediaType = MediaType.REV120;
-
-                                            break;
-                                        case 17090880:
-                                            MediaType = MediaType.REV35;
-
-                                            break;
-                                        case 34185728:
-                                            MediaType = MediaType.REV70;
-
-                                            break;
-                                    }
-
-                                    break;
-                                default:
-                                    MediaType = MediaType.Unknown;
-
-                                    break;
-                            }
-
-                            break;
-                        case 0x0005:
-                            MediaType = MediaType.CDMO;
-
-                            break;
-                        case 0x0008:
-                            MediaType = MediaType.CD;
-
-                            break;
-                        case 0x0009:
-                            MediaType = MediaType.CDR;
-
-                            break;
-                        case 0x000A:
-                            MediaType = MediaType.CDRW;
-
-                            break;
-                        case 0x0010:
-                            MediaType = MediaType.DVDROM;
-
-                            break;
-                        case 0x0011:
-                            MediaType = MediaType.DVDR;
-
-                            break;
-                        case 0x0012:
-                            MediaType = MediaType.DVDRAM;
-
-                            break;
-                        case 0x0013:
-                        case 0x0014:
-                            MediaType = MediaType.DVDRW;
-
-                            break;
-                        case 0x0015:
-                        case 0x0016:
-                            MediaType = MediaType.DVDRDL;
-
-                            break;
-                        case 0x0017:
-                            MediaType = MediaType.DVDRWDL;
-
-                            break;
-                        case 0x0018:
-                            MediaType = MediaType.DVDDownload;
-
-                            break;
-                        case 0x001A:
-                            MediaType = MediaType.DVDPRW;
-
-                            break;
-                        case 0x001B:
-                            MediaType = MediaType.DVDPR;
-
-                            break;
-                        case 0x0020:
-                            MediaType = MediaType.DDCD;
-
-                            break;
-                        case 0x0021:
-                            MediaType = MediaType.DDCDR;
-
-                            break;
-                        case 0x0022:
-                            MediaType = MediaType.DDCDRW;
-
-                            break;
-                        case 0x002A:
-                            MediaType = MediaType.DVDPRWDL;
-
-                            break;
-                        case 0x002B:
-                            MediaType = MediaType.DVDPRDL;
-
-                            break;
-                        case 0x0040:
-                            MediaType = MediaType.BDROM;
-
-                            break;
-                        case 0x0041:
-                        case 0x0042:
-                            MediaType = MediaType.BDR;
-
-                            break;
-                        case 0x0043:
-                            MediaType = MediaType.BDRE;
-
-                            break;
-                        case 0x0050:
-                            MediaType = MediaType.HDDVDROM;
-
-                            break;
-                        case 0x0051:
-                            MediaType = MediaType.HDDVDR;
-
-                            break;
-                        case 0x0052:
-                            MediaType = MediaType.HDDVDRAM;
-
-                            break;
-                        case 0x0053:
-                            MediaType = MediaType.HDDVDRW;
-
-                            break;
-                        case 0x0058:
-                            MediaType = MediaType.HDDVDRDL;
-
-                            break;
-                        case 0x005A:
-                            MediaType = MediaType.HDDVDRWDL;
-
-                            break;
-                    }
-                }
-
-                if(MediaType == MediaType.PD650 &&
-                   Blocks    == 1281856)
-                    MediaType = MediaType.PD650_WORM;
-
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                              MmcDiscStructureFormat.RecognizedFormatLayers, 0, dev.Timeout, out _);
-
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command",
-                                               "READ DISC STRUCTURE: Recognized Format Layers\n{0}",
-                                               Sense.PrettifySense(senseBuf));
-                else
-                    RecognizedFormatLayers = cmdBuf;
-
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                              MmcDiscStructureFormat.WriteProtectionStatus, 0, dev.Timeout, out _);
-
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command",
-                                               "READ DISC STRUCTURE: Write Protection Status\n{0}",
-                                               Sense.PrettifySense(senseBuf));
-                else
-                    WriteProtectionStatus = cmdBuf;
-
-                // More like a drive information
-                /*
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out _);
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Capability List\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_capabilitylist.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
-                */
-
-                #region All DVD and HD DVD types
-                if(MediaType == MediaType.DVDDownload ||
-                   MediaType == MediaType.DVDPR       ||
-                   MediaType == MediaType.DVDPRDL     ||
-                   MediaType == MediaType.DVDPRW      ||
-                   MediaType == MediaType.DVDPRWDL    ||
-                   MediaType == MediaType.DVDR        ||
-                   MediaType == MediaType.DVDRAM      ||
-                   MediaType == MediaType.DVDRDL      ||
-                   MediaType == MediaType.DVDROM      ||
-                   MediaType == MediaType.DVDRW       ||
-                   MediaType == MediaType.DVDRWDL     ||
-                   MediaType == MediaType.HDDVDR      ||
-                   MediaType == MediaType.HDDVDRAM    ||
-                   MediaType == MediaType.HDDVDRDL    ||
-                   MediaType == MediaType.HDDVDROM    ||
-                   MediaType == MediaType.HDDVDRW     ||
-                   MediaType == MediaType.HDDVDRWDL)
-                {
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out _);
-
-                    if(sense)
-                    {
-                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PFI\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    }
-                    else
-                    {
-                        DvdPfi     = cmdBuf;
-                        DecodedPfi = PFI.Decode(cmdBuf, MediaType);
-
-                        if(DecodedPfi.HasValue)
-                            if(MediaType == MediaType.DVDROM)
-                                switch(DecodedPfi.Value.DiskCategory)
-                                {
-                                    case DiskCategory.DVDPR:
-                                        MediaType = MediaType.DVDPR;
-
-                                        break;
-                                    case DiskCategory.DVDPRDL:
-                                        MediaType = MediaType.DVDPRDL;
-
-                                        break;
-                                    case DiskCategory.DVDPRW:
-                                        MediaType = MediaType.DVDPRW;
-
-                                        break;
-                                    case DiskCategory.DVDPRWDL:
-                                        MediaType = MediaType.DVDPRWDL;
-
-                                        break;
-                                    case DiskCategory.DVDR:
-                                        MediaType = DecodedPfi.Value.PartVersion >= 6 ? MediaType.DVDRDL
-                                                        : MediaType.DVDR;
-
-                                        break;
-                                    case DiskCategory.DVDRAM:
-                                        MediaType = MediaType.DVDRAM;
-
-                                        break;
-                                    default:
-                                        MediaType = MediaType.DVDROM;
-
-                                        break;
-                                    case DiskCategory.DVDRW:
-                                        MediaType = DecodedPfi.Value.PartVersion >= 15 ? MediaType.DVDRWDL
-                                                        : MediaType.DVDRW;
-
-                                        break;
-                                    case DiskCategory.HDDVDR:
-                                        MediaType = MediaType.HDDVDR;
-
-                                        break;
-                                    case DiskCategory.HDDVDRAM:
-                                        MediaType = MediaType.HDDVDRAM;
-
-                                        break;
-                                    case DiskCategory.HDDVDROM:
-                                        MediaType = MediaType.HDDVDROM;
-
-                                        break;
-                                    case DiskCategory.HDDVDRW:
-                                        MediaType = MediaType.HDDVDRW;
-
-                                        break;
-                                    case DiskCategory.Nintendo:
-                                        MediaType = DecodedPfi.Value.DiscSize == DVDSize.Eighty ? MediaType.GOD
-                                                        : MediaType.WOD;
-
-                                        break;
-                                    case DiskCategory.UMD:
-                                        MediaType = MediaType.UMD;
-
-                                        break;
-                                }
-                    }
-
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout,
-                                                  out _);
-
-                    if(sense)
-                    {
-                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DMI\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    }
-                    else
-                    {
-                        DvdDmi = cmdBuf;
-
-                        if(DMI.IsXbox(cmdBuf))
-                        {
-                            MediaType = MediaType.XGD;
-                        }
-                        else if(DMI.IsXbox360(cmdBuf))
-                        {
-                            MediaType = MediaType.XGD2;
-
-                            // All XGD3 all have the same number of blocks
-                            if(Blocks == 25063   || // Locked (or non compatible drive)
-                               Blocks == 4229664 || // Xtreme unlock
-                               Blocks == 4246304)   // Wxripper unlock
-                                MediaType = MediaType.XGD3;
-                        }
-                    }
-                }
-                #endregion All DVD and HD DVD types
-
-                #region DVD-ROM
-                if(MediaType == MediaType.DVDDownload ||
-                   MediaType == MediaType.DVDROM)
-                {
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.CopyrightInformation, 0, dev.Timeout, out _);
-
-                    if(sense)
-                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: CMI\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    else
-                        DvdCmi = cmdBuf;
-                }
-                #endregion DVD-ROM
-
-                switch(MediaType)
-                {
-                    #region DVD-ROM and HD DVD-ROM
-                    case MediaType.DVDDownload:
-                    case MediaType.DVDROM:
-                    case MediaType.HDDVDROM:
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.BurstCuttingArea, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: BCA\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdBca = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.DvdAacs, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD AACS\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdAacs = cmdBuf;
-
-                        break;
-                    #endregion DVD-ROM and HD DVD-ROM
-
-                    #region DVD-RAM and HD DVD-RAM
-                    case MediaType.DVDRAM:
-                    case MediaType.HDDVDRAM:
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.DvdramDds, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DDS\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdRamDds = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.DvdramMediumStatus, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Medium Status\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdRamCartridgeStatus = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, dev.Timeout,
-                                                      out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: SAI\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdRamSpareArea = cmdBuf;
-
-                        break;
-                    #endregion DVD-RAM and HD DVD-RAM
-
-                    #region DVD-R and HD DVD-R
-                    case MediaType.DVDR:
-                    case MediaType.HDDVDR:
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.LastBorderOutRmd, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command",
-                                                       "READ DISC STRUCTURE: Last-Out Border RMD\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            LastBorderOutRmd = cmdBuf;
-
-                        break;
-                    #endregion DVD-R and HD DVD-R
-                }
-
-                var dvdDecrypt = new DVDDecryption(dev);
-                sense = dvdDecrypt.ReadBusKey(out cmdBuf, out senseBuf, CopyrightType.CSS, dev.Timeout, out _);
+        switch(dev.ScsiType)
+        {
+            case PeripheralDeviceTypes.DirectAccess:
+            case PeripheralDeviceTypes.MultiMediaDevice:
+            case PeripheralDeviceTypes.OCRWDevice:
+            case PeripheralDeviceTypes.OpticalDevice:
+            case PeripheralDeviceTypes.SimplifiedDevice:
+            case PeripheralDeviceTypes.WriteOnceDevice:
+                sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _);
 
                 if(!sense)
                 {
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.DiscKey, dvdDecrypt.Agid, dev.Timeout, out _);
+                    ReadCapacity = cmdBuf;
 
-                    if(sense)
-                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Disc Key\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    else
-                        DvdDiscKey = cmdBuf;
+                    Blocks = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) &
+                             0xFFFFFFFF;
 
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.SectorCopyrightInformation, dvdDecrypt.Agid,
-                                                  dev.Timeout, out _);
-
-                    if(sense)
-                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Sector CMI\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    else
-                        DvdSectorCmi = cmdBuf;
+                    BlockSize = (uint)((cmdBuf[5] << 24) + (cmdBuf[5] << 16) + (cmdBuf[6] << 8) + cmdBuf[7]);
                 }
 
-                #region Require drive authentication, won't work
+                sense = dev.ReadCapacity16(out cmdBuf, out senseBuf, dev.Timeout, out _);
+
+                if(!sense)
+                    ReadCapacity16 = cmdBuf;
+
+                if(ReadCapacity == null       ||
+                   Blocks       == 0xFFFFFFFF ||
+                   Blocks       == 0)
+                {
+                    if(ReadCapacity16 == null &&
+                       Blocks         == 0)
+                        if(dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
+                        {
+                            AaruConsole.ErrorWriteLine("Unable to get media capacity");
+                            AaruConsole.ErrorWriteLine("{0}", Sense.PrettifySense(senseBuf));
+                        }
+
+                    if(ReadCapacity16 != null)
+                    {
+                        byte[] temp = new byte[8];
+
+                        Array.Copy(cmdBuf, 0, temp, 0, 8);
+                        Array.Reverse(temp);
+                        Blocks    = BitConverter.ToUInt64(temp, 0);
+                        BlockSize = (uint)((cmdBuf[8] << 24) + (cmdBuf[9] << 16) + (cmdBuf[10] << 8) + cmdBuf[11]);
+                    }
+                }
+
+                if(Blocks    != 0 &&
+                   BlockSize != 0)
+                    Blocks++;
+
+                break;
+            case PeripheralDeviceTypes.SequentialAccess:
+                byte[] medBuf;
+
+                sense = dev.ReportDensitySupport(out byte[] seqBuf, out senseBuf, false, dev.Timeout, out _);
+
+                if(!sense)
+                {
+                    sense = dev.ReportDensitySupport(out medBuf, out senseBuf, true, dev.Timeout, out _);
+
+                    if(!sense &&
+                       !seqBuf.SequenceEqual(medBuf))
+                    {
+                        DensitySupport       = seqBuf;
+                        DensitySupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeDensity(seqBuf);
+                    }
+                }
+
+                sense = dev.ReportDensitySupport(out seqBuf, out senseBuf, true, false, dev.Timeout, out _);
+
+                if(!sense)
+                {
+                    sense = dev.ReportDensitySupport(out medBuf, out senseBuf, true, true, dev.Timeout, out _);
+
+                    if(!sense &&
+                       !seqBuf.SequenceEqual(medBuf))
+                    {
+                        MediaTypeSupport       = medBuf;
+                        MediaTypeSupportHeader = Decoders.SCSI.SSC.DensitySupport.DecodeMediumType(seqBuf);
+                    }
+                }
+
+                // TODO: Get a machine where 16-byte CDBs don't get DID_ABORT
                 /*
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MediaIdentifier, 0, dev.Timeout, out _);
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_mediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MediaKeyBlock, 0, dev.Timeout, out _);
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_mkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSVolId, 0, dev.Timeout, out _);
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Volume ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsvolid.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMediaSerial, 0, dev.Timeout, out _);
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Media Serial Number\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacssn.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMediaId, 0, dev.Timeout, out _);
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsmediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMKB, 0, dev.Timeout, out _);
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsmkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSLBAExtents, 0, dev.Timeout, out _);
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS LBA Extents\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacslbaextents.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMKBCPRM, 0, dev.Timeout, out _);
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS CPRM MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacscprmmkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
-                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSDataKeys, 0, dev.Timeout, out _);
-                if(sense)
-                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Data Keys\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
-                else
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsdatakeys.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
-                */
-                #endregion Require drive authentication, won't work
-
-                #region DVD-R and DVD-RW
-                if(MediaType == MediaType.DVDR   ||
-                   MediaType == MediaType.DVDRW  ||
-                   MediaType == MediaType.DVDRDL ||
-                   MediaType == MediaType.DVDRWDL)
-                {
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.PreRecordedInfo, 0, dev.Timeout, out _);
-
-                    if(sense)
-                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Pre-Recorded Info\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    else
-                    {
-                        DvdPreRecordedInfo = cmdBuf;
-
-                        DecodedDvdPrePitInformation = PRI.Decode(cmdBuf);
-                    }
-                }
-                #endregion DVD-R and DVD-RW
-
-                switch(MediaType)
-                {
-                    #region DVD-R, DVD-RW and HD DVD-R
-                    case MediaType.DVDR:
-                    case MediaType.DVDRW:
-                    case MediaType.DVDRDL:
-                    case MediaType.DVDRWDL:
-                    case MediaType.HDDVDR:
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.DvdrMediaIdentifier, 0, dev.Timeout,
-                                                      out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD-R Media ID\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdrMediaIdentifier = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.DvdrPhysicalInformation, 0, dev.Timeout,
-                                                      out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD-R PFI\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                        {
-                            DvdrPhysicalInformation = cmdBuf;
-
-                            DecodedDvdrPfi = PFI.Decode(cmdBuf, MediaType);
-                        }
-
-                        break;
-                    #endregion DVD-R, DVD-RW and HD DVD-R
-
-                    #region All DVD+
-                    case MediaType.DVDPR:
-                    case MediaType.DVDPRDL:
-                    case MediaType.DVDPRW:
-                    case MediaType.DVDPRWDL:
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.Adip, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: ADIP\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdPlusAdip = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.Dcb, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DCB\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdPlusDcb = cmdBuf;
-
-                        break;
-                    #endregion All DVD+
-
-                    #region HD DVD-ROM
-                    case MediaType.HDDVDROM:
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.HddvdCopyrightInformation, 0, dev.Timeout,
-                                                      out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: HD DVD CMI\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            HddvdCopyrightInformation = cmdBuf;
-
-                        break;
-                    #endregion HD DVD-ROM
-                }
-
-                #region HD DVD-R
-                if(MediaType == MediaType.HDDVDR)
-                {
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.HddvdrMediumStatus, 0, dev.Timeout, out _);
-
-                    if(sense)
-                        AaruConsole.DebugWriteLine("Media-Info command",
-                                                   "READ DISC STRUCTURE: HD DVD-R Medium Status\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    else
-                        HddvdrMediumStatus = cmdBuf;
-
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.HddvdrLastRmd, 0, dev.Timeout, out _);
-
-                    if(sense)
-                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Last RMD\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    else
-                        HddvdrLastRmd = cmdBuf;
-                }
-                #endregion HD DVD-R
-
-                #region DVD-R DL, DVD-RW DL, DVD+R DL, DVD+RW DL
-                if(MediaType == MediaType.DVDPRDL ||
-                   MediaType == MediaType.DVDRDL  ||
-                   MediaType == MediaType.DVDRWDL ||
-                   MediaType == MediaType.DVDPRWDL)
-                {
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.DvdrLayerCapacity, 0, dev.Timeout, out _);
-
-                    if(sense)
-                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Layer Capacity\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    else
-                        DvdrLayerCapacity = cmdBuf;
-                }
-                #endregion DVD-R DL, DVD-RW DL, DVD+R DL, DVD+RW DL
-
-                switch(MediaType)
-                {
-                    #region DVD-R DL
-                    case MediaType.DVDRDL:
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.MiddleZoneStart, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command",
-                                                       "READ DISC STRUCTURE: Middle Zone Start\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdrDlMiddleZoneStart = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.JumpIntervalSize, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command",
-                                                       "READ DISC STRUCTURE: Jump Interval Size\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdrDlJumpIntervalSize = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.ManualLayerJumpStartLba, 0, dev.Timeout,
-                                                      out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command",
-                                                       "READ DISC STRUCTURE: Manual Layer Jump Start LBA\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdrDlManualLayerJumpStartLba = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                      MmcDiscStructureFormat.RemapAnchorPoint, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command",
-                                                       "READ DISC STRUCTURE: Remap Anchor Point\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            DvdrDlRemapAnchorPoint = cmdBuf;
-
-                        break;
-                    #endregion DVD-R DL
-
-                    #region All Blu-ray
-                    case MediaType.BDR:
-                    case MediaType.BDRE:
-                    case MediaType.BDROM:
-                    case MediaType.UHDBD:
-                    case MediaType.BDRXL:
-                    case MediaType.BDREXL:
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                      MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DI\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            BlurayDiscInformation = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                      MmcDiscStructureFormat.Pac, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PAC\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            BlurayPac = cmdBuf;
-
-                        break;
-                    #endregion All Blu-ray
-                }
-
-                switch(MediaType)
-                {
-                    #region BD-ROM only
-                    case MediaType.BDROM:
-                    case MediaType.UHDBD:
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                      MmcDiscStructureFormat.BdBurstCuttingArea, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: BCA\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            BlurayBurstCuttingArea = cmdBuf;
-
-                        break;
-                    #endregion BD-ROM only
-
-                    #region Writable Blu-ray only
-                    case MediaType.BDR:
-                    case MediaType.BDRE:
-                    case MediaType.BDRXL:
-                    case MediaType.BDREXL:
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                      MmcDiscStructureFormat.BdDds, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DDS\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            BlurayDds = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                      MmcDiscStructureFormat.CartridgeStatus, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command",
-                                                       "READ DISC STRUCTURE: Cartridge Status\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            BlurayCartridgeStatus = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                      MmcDiscStructureFormat.BdSpareAreaInformation, 0, dev.Timeout,
-                                                      out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command",
-                                                       "READ DISC STRUCTURE: Spare Area Information\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            BluraySpareAreaInformation = cmdBuf;
-
-                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
-                                                      MmcDiscStructureFormat.RawDfl, 0, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Raw DFL\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            BlurayRawDfl = cmdBuf;
-
-                        sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf,
-                                                        MmcDiscInformationDataTypes.TrackResources, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 001b\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            BlurayTrackResources = cmdBuf;
-
-                        sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf,
-                                                        MmcDiscInformationDataTypes.PowResources, dev.Timeout, out _);
-
-                        if(sense)
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 010b\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        else
-                            BlurayPowResources = cmdBuf;
-
-                        break;
-                    #endregion Writable Blu-ray only
-
-                    #region CDs
-                    case MediaType.CD:
-                    case MediaType.CDR:
-                    case MediaType.CDROM:
-                    case MediaType.CDRW:
-                    case MediaType.Unknown:
-                        // We discarded all discs that falsify a TOC before requesting a real TOC
-                        // No TOC, no CD (or an empty one)
-                        bool tocSense = dev.ReadTocPmaAtip(out cmdBuf, out senseBuf, false, 0, 0, dev.Timeout, out _);
-
-                        if(tocSense)
-                        {
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: TOC\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        }
-                        else
-                        {
-                            Toc        = cmdBuf;
-                            DecodedToc = TOC.Decode(cmdBuf);
-
-                            // As we have a TOC we know it is a CD
-                            if(MediaType == MediaType.Unknown)
-                                MediaType = MediaType.CD;
-                        }
-
-                        // ATIP exists on blank CDs
-                        sense = dev.ReadAtip(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                        if(sense)
-                        {
-                            AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: ATIP\n{0}",
-                                                       Sense.PrettifySense(senseBuf));
-                        }
-                        else
-                        {
-                            Atip        = cmdBuf;
-                            DecodedAtip = ATIP.Decode(cmdBuf);
-
-                            if(DecodedAtip != null)
-
-                                // Only CD-R and CD-RW have ATIP
-                                MediaType = DecodedAtip.DiscType ? MediaType.CDRW : MediaType.CDR;
-                            else
-                                Atip = null;
-                        }
-
-                        // We got a TOC, get information about a recorded/mastered CD
-                        if(!tocSense)
-                        {
-                            sense = dev.ReadSessionInfo(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: Session info\n{0}",
-                                                           Sense.PrettifySense(senseBuf));
-                            }
-                            else if(cmdBuf.Length > 4)
-                            {
-                                Session        = cmdBuf;
-                                DecodedSession = Decoders.CD.Session.Decode(cmdBuf);
-
-                                if(DecodedSession.HasValue)
-                                {
-                                    sessions              = DecodedSession.Value.LastCompleteSession;
-                                    firstTrackLastSession = DecodedSession.Value.TrackDescriptors[0].TrackNumber;
-                                }
-                            }
-
-                            sense = dev.ReadRawToc(out cmdBuf, out senseBuf, 1, dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: Raw TOC\n{0}",
-                                                           Sense.PrettifySense(senseBuf));
-                            }
-                            else if(cmdBuf.Length > 4)
-                            {
-                                RawToc = cmdBuf;
-
-                                FullToc = FullTOC.Decode(cmdBuf);
-                            }
-
-                            sense = dev.ReadPma(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                                AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: PMA\n{0}",
-                                                           Sense.PrettifySense(senseBuf));
-                            else if(cmdBuf.Length > 4)
-                                Pma = cmdBuf;
-
-                            sense = dev.ReadCdText(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: CD-TEXT\n{0}",
-                                                           Sense.PrettifySense(senseBuf));
-                            }
-                            else if(cmdBuf.Length > 4)
-                            {
-                                CdTextLeadIn        = cmdBuf;
-                                DecodedCdTextLeadIn = CDTextOnLeadIn.Decode(cmdBuf);
-                            }
-
-                            sense = dev.ReadMcn(out string mcn, out _, out _, dev.Timeout, out _);
-
-                            if(!sense      &&
-                               mcn != null &&
-                               mcn != "0000000000000")
-                                Mcn = mcn;
-
-                            Isrcs = new Dictionary<byte, string>();
-
-                            for(byte i = DecodedToc.Value.FirstTrack; i <= DecodedToc.Value.LastTrack; i++)
-                            {
-                                sense = dev.ReadIsrc(i, out string isrc, out _, out _, dev.Timeout, out _);
-
-                                if(!sense       &&
-                                   isrc != null &&
-                                   isrc != "000000000000")
-                                    Isrcs.Add(i, isrc);
-                            }
-
-                            if(Isrcs.Count == 0)
-                                Isrcs = null;
-                        }
-
-                        break;
-                    #endregion CDs
-                }
-
-                #region Nintendo
-                if(MediaType == MediaType.Unknown &&
-                   Blocks    > 0)
-                {
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out _);
-
-                    if(sense)
-                    {
-                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PFI\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    }
-                    else
-                    {
-                        DvdPfi = cmdBuf;
-                        PFI.PhysicalFormatInformation? nintendoPfi = PFI.Decode(cmdBuf, MediaType);
-
-                        if(nintendoPfi != null)
-                        {
-                            AaruConsole.WriteLine("PFI:\n{0}", PFI.Prettify(cmdBuf, MediaType));
-
-                            if(nintendoPfi.Value.DiskCategory == DiskCategory.Nintendo &&
-                               nintendoPfi.Value.PartVersion  == 15)
-                                switch(nintendoPfi.Value.DiscSize)
-                                {
-                                    case DVDSize.Eighty:
-                                        MediaType = MediaType.GOD;
-
-                                        break;
-                                    case DVDSize.OneTwenty:
-                                        MediaType = MediaType.WOD;
-
-                                        break;
-                                }
-                        }
-                    }
-
-                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                  MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout,
-                                                  out _);
-
-                    if(sense)
-                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DMI\n{0}",
-                                                   Sense.PrettifySense(senseBuf));
-                    else
-                        DvdDmi = cmdBuf;
-                }
-                #endregion Nintendo
+            sense = dev.ReadAttribute(out seqBuf, out senseBuf, ScsiAttributeAction.List, 0, dev.Timeout, out _);
+            if (sense)
+                AaruConsole.ErrorWriteLine("SCSI READ ATTRIBUTE:\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_scsi_readattribute.bin", "SCSI READ ATTRIBUTE", seqBuf);
             }
+            */
+                break;
+            case PeripheralDeviceTypes.BridgingExpander
+                when dev.Model.StartsWith("MDM", StringComparison.Ordinal) ||
+                     dev.Model.StartsWith("MDH", StringComparison.Ordinal):
+                sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _);
 
-            sense = dev.ReadMediaSerialNumber(out cmdBuf, out senseBuf, dev.Timeout, out _);
+                if(!sense)
+                {
+                    ReadCapacity = cmdBuf;
+
+                    Blocks = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) &
+                             0xFFFFFFFF;
+
+                    BlockSize = (uint)((cmdBuf[5] << 24) + (cmdBuf[5] << 16) + (cmdBuf[6] << 8) + cmdBuf[7]);
+                }
+
+                break;
+        }
+
+        if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
+        {
+            sense = dev.GetConfiguration(out cmdBuf, out senseBuf, 0, MmcGetConfigurationRt.Current, dev.Timeout,
+                                         out _);
 
             if(sense)
             {
-                AaruConsole.DebugWriteLine("Media-Info command", "READ MEDIA SERIAL NUMBER\n{0}",
+                AaruConsole.DebugWriteLine("Media-Info command", "READ GET CONFIGURATION:\n{0}",
                                            Sense.PrettifySense(senseBuf));
+
+                if(dev.IsUsb &&
+                   (scsiMediumType == 0x40 || scsiMediumType == 0x41 || scsiMediumType == 0x42))
+                    MediaType = MediaType.FlashDrive;
             }
             else
             {
-                if(cmdBuf.Length >= 4)
-                    MediaSerialNumber = cmdBuf;
+                MmcConfiguration = cmdBuf;
+                Features.SeparatedFeatures ftr = Features.Separate(cmdBuf);
+
+                AaruConsole.DebugWriteLine("Media-Info command", "GET CONFIGURATION current profile is {0:X4}h",
+                                           ftr.CurrentProfile);
+
+                switch(ftr.CurrentProfile)
+                {
+                    case 0x0001:
+                        MediaType = MediaType.GENERIC_HDD;
+
+                        break;
+                    case 0x0002:
+                        switch(scsiMediumType)
+                        {
+                            case 0x01:
+                                MediaType = MediaType.PD650;
+
+                                break;
+                            case 0x41:
+                                switch(Blocks)
+                                {
+                                    case 58620544:
+                                        MediaType = MediaType.REV120;
+
+                                        break;
+                                    case 17090880:
+                                        MediaType = MediaType.REV35;
+
+                                        break;
+                                    case 34185728:
+                                        MediaType = MediaType.REV70;
+
+                                        break;
+                                }
+
+                                break;
+                            default:
+                                MediaType = MediaType.Unknown;
+
+                                break;
+                        }
+
+                        break;
+                    case 0x0005:
+                        MediaType = MediaType.CDMO;
+
+                        break;
+                    case 0x0008:
+                        MediaType = MediaType.CD;
+
+                        break;
+                    case 0x0009:
+                        MediaType = MediaType.CDR;
+
+                        break;
+                    case 0x000A:
+                        MediaType = MediaType.CDRW;
+
+                        break;
+                    case 0x0010:
+                        MediaType = MediaType.DVDROM;
+
+                        break;
+                    case 0x0011:
+                        MediaType = MediaType.DVDR;
+
+                        break;
+                    case 0x0012:
+                        MediaType = MediaType.DVDRAM;
+
+                        break;
+                    case 0x0013:
+                    case 0x0014:
+                        MediaType = MediaType.DVDRW;
+
+                        break;
+                    case 0x0015:
+                    case 0x0016:
+                        MediaType = MediaType.DVDRDL;
+
+                        break;
+                    case 0x0017:
+                        MediaType = MediaType.DVDRWDL;
+
+                        break;
+                    case 0x0018:
+                        MediaType = MediaType.DVDDownload;
+
+                        break;
+                    case 0x001A:
+                        MediaType = MediaType.DVDPRW;
+
+                        break;
+                    case 0x001B:
+                        MediaType = MediaType.DVDPR;
+
+                        break;
+                    case 0x0020:
+                        MediaType = MediaType.DDCD;
+
+                        break;
+                    case 0x0021:
+                        MediaType = MediaType.DDCDR;
+
+                        break;
+                    case 0x0022:
+                        MediaType = MediaType.DDCDRW;
+
+                        break;
+                    case 0x002A:
+                        MediaType = MediaType.DVDPRWDL;
+
+                        break;
+                    case 0x002B:
+                        MediaType = MediaType.DVDPRDL;
+
+                        break;
+                    case 0x0040:
+                        MediaType = MediaType.BDROM;
+
+                        break;
+                    case 0x0041:
+                    case 0x0042:
+                        MediaType = MediaType.BDR;
+
+                        break;
+                    case 0x0043:
+                        MediaType = MediaType.BDRE;
+
+                        break;
+                    case 0x0050:
+                        MediaType = MediaType.HDDVDROM;
+
+                        break;
+                    case 0x0051:
+                        MediaType = MediaType.HDDVDR;
+
+                        break;
+                    case 0x0052:
+                        MediaType = MediaType.HDDVDRAM;
+
+                        break;
+                    case 0x0053:
+                        MediaType = MediaType.HDDVDRW;
+
+                        break;
+                    case 0x0058:
+                        MediaType = MediaType.HDDVDRDL;
+
+                        break;
+                    case 0x005A:
+                        MediaType = MediaType.HDDVDRWDL;
+
+                        break;
+                }
+            }
+
+            if(MediaType == MediaType.PD650 &&
+               Blocks    == 1281856)
+                MediaType = MediaType.PD650_WORM;
+
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                          MmcDiscStructureFormat.RecognizedFormatLayers, 0, dev.Timeout, out _);
+
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command",
+                                           "READ DISC STRUCTURE: Recognized Format Layers\n{0}",
+                                           Sense.PrettifySense(senseBuf));
+            else
+                RecognizedFormatLayers = cmdBuf;
+
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                          MmcDiscStructureFormat.WriteProtectionStatus, 0, dev.Timeout, out _);
+
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command",
+                                           "READ DISC STRUCTURE: Write Protection Status\n{0}",
+                                           Sense.PrettifySense(senseBuf));
+            else
+                WriteProtectionStatus = cmdBuf;
+
+            // More like a drive information
+            /*
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.CapabilityList, 0, dev.Timeout, out _);
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Capability List\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_capabilitylist.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+            */
+
+            #region All DVD and HD DVD types
+            if(MediaType == MediaType.DVDDownload ||
+               MediaType == MediaType.DVDPR       ||
+               MediaType == MediaType.DVDPRDL     ||
+               MediaType == MediaType.DVDPRW      ||
+               MediaType == MediaType.DVDPRWDL    ||
+               MediaType == MediaType.DVDR        ||
+               MediaType == MediaType.DVDRAM      ||
+               MediaType == MediaType.DVDRDL      ||
+               MediaType == MediaType.DVDROM      ||
+               MediaType == MediaType.DVDRW       ||
+               MediaType == MediaType.DVDRWDL     ||
+               MediaType == MediaType.HDDVDR      ||
+               MediaType == MediaType.HDDVDRAM    ||
+               MediaType == MediaType.HDDVDRDL    ||
+               MediaType == MediaType.HDDVDROM    ||
+               MediaType == MediaType.HDDVDRW     ||
+               MediaType == MediaType.HDDVDRWDL)
+            {
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out _);
+
+                if(sense)
+                {
+                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PFI\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                }
+                else
+                {
+                    DvdPfi     = cmdBuf;
+                    DecodedPfi = PFI.Decode(cmdBuf, MediaType);
+
+                    if(DecodedPfi.HasValue)
+                        if(MediaType == MediaType.DVDROM)
+                            switch(DecodedPfi.Value.DiskCategory)
+                            {
+                                case DiskCategory.DVDPR:
+                                    MediaType = MediaType.DVDPR;
+
+                                    break;
+                                case DiskCategory.DVDPRDL:
+                                    MediaType = MediaType.DVDPRDL;
+
+                                    break;
+                                case DiskCategory.DVDPRW:
+                                    MediaType = MediaType.DVDPRW;
+
+                                    break;
+                                case DiskCategory.DVDPRWDL:
+                                    MediaType = MediaType.DVDPRWDL;
+
+                                    break;
+                                case DiskCategory.DVDR:
+                                    MediaType = DecodedPfi.Value.PartVersion >= 6 ? MediaType.DVDRDL
+                                                    : MediaType.DVDR;
+
+                                    break;
+                                case DiskCategory.DVDRAM:
+                                    MediaType = MediaType.DVDRAM;
+
+                                    break;
+                                default:
+                                    MediaType = MediaType.DVDROM;
+
+                                    break;
+                                case DiskCategory.DVDRW:
+                                    MediaType = DecodedPfi.Value.PartVersion >= 15 ? MediaType.DVDRWDL
+                                                    : MediaType.DVDRW;
+
+                                    break;
+                                case DiskCategory.HDDVDR:
+                                    MediaType = MediaType.HDDVDR;
+
+                                    break;
+                                case DiskCategory.HDDVDRAM:
+                                    MediaType = MediaType.HDDVDRAM;
+
+                                    break;
+                                case DiskCategory.HDDVDROM:
+                                    MediaType = MediaType.HDDVDROM;
+
+                                    break;
+                                case DiskCategory.HDDVDRW:
+                                    MediaType = MediaType.HDDVDRW;
+
+                                    break;
+                                case DiskCategory.Nintendo:
+                                    MediaType = DecodedPfi.Value.DiscSize == DVDSize.Eighty ? MediaType.GOD
+                                                    : MediaType.WOD;
+
+                                    break;
+                                case DiskCategory.UMD:
+                                    MediaType = MediaType.UMD;
+
+                                    break;
+                            }
+                }
+
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout,
+                                              out _);
+
+                if(sense)
+                {
+                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DMI\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                }
+                else
+                {
+                    DvdDmi = cmdBuf;
+
+                    if(DMI.IsXbox(cmdBuf))
+                    {
+                        MediaType = MediaType.XGD;
+                    }
+                    else if(DMI.IsXbox360(cmdBuf))
+                    {
+                        MediaType = MediaType.XGD2;
+
+                        // All XGD3 all have the same number of blocks
+                        if(Blocks == 25063   || // Locked (or non compatible drive)
+                           Blocks == 4229664 || // Xtreme unlock
+                           Blocks == 4246304)   // Wxripper unlock
+                            MediaType = MediaType.XGD3;
+                    }
+                }
+            }
+            #endregion All DVD and HD DVD types
+
+            #region DVD-ROM
+            if(MediaType == MediaType.DVDDownload ||
+               MediaType == MediaType.DVDROM)
+            {
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.CopyrightInformation, 0, dev.Timeout, out _);
+
+                if(sense)
+                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: CMI\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                else
+                    DvdCmi = cmdBuf;
+            }
+            #endregion DVD-ROM
+
+            switch(MediaType)
+            {
+                #region DVD-ROM and HD DVD-ROM
+                case MediaType.DVDDownload:
+                case MediaType.DVDROM:
+                case MediaType.HDDVDROM:
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.BurstCuttingArea, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: BCA\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdBca = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.DvdAacs, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD AACS\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdAacs = cmdBuf;
+
+                    break;
+                #endregion DVD-ROM and HD DVD-ROM
+
+                #region DVD-RAM and HD DVD-RAM
+                case MediaType.DVDRAM:
+                case MediaType.HDDVDRAM:
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.DvdramDds, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DDS\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdRamDds = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.DvdramMediumStatus, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Medium Status\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdRamCartridgeStatus = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.DvdramSpareAreaInformation, 0, dev.Timeout,
+                                                  out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: SAI\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdRamSpareArea = cmdBuf;
+
+                    break;
+                #endregion DVD-RAM and HD DVD-RAM
+
+                #region DVD-R and HD DVD-R
+                case MediaType.DVDR:
+                case MediaType.HDDVDR:
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.LastBorderOutRmd, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command",
+                                                   "READ DISC STRUCTURE: Last-Out Border RMD\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        LastBorderOutRmd = cmdBuf;
+
+                    break;
+                #endregion DVD-R and HD DVD-R
+            }
+
+            var dvdDecrypt = new DVDDecryption(dev);
+            sense = dvdDecrypt.ReadBusKey(out cmdBuf, out senseBuf, CopyrightType.CSS, dev.Timeout, out _);
+
+            if(!sense)
+            {
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.DiscKey, dvdDecrypt.Agid, dev.Timeout, out _);
+
+                if(sense)
+                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Disc Key\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                else
+                    DvdDiscKey = cmdBuf;
+
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.SectorCopyrightInformation, dvdDecrypt.Agid,
+                                              dev.Timeout, out _);
+
+                if(sense)
+                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Sector CMI\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                else
+                    DvdSectorCmi = cmdBuf;
+            }
+
+            #region Require drive authentication, won't work
+            /*
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MediaIdentifier, 0, dev.Timeout, out _);
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_mediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.MediaKeyBlock, 0, dev.Timeout, out _);
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_mkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSVolId, 0, dev.Timeout, out _);
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Volume ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsvolid.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMediaSerial, 0, dev.Timeout, out _);
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Media Serial Number\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacssn.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMediaId, 0, dev.Timeout, out _);
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Media ID\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsmediaid.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMKB, 0, dev.Timeout, out _);
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsmkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSLBAExtents, 0, dev.Timeout, out _);
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS LBA Extents\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacslbaextents.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSMKBCPRM, 0, dev.Timeout, out _);
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS CPRM MKB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacscprmmkb.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.AACSDataKeys, 0, dev.Timeout, out _);
+            if(sense)
+                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: AACS Data Keys\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
+            else
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_aacsdatakeys.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
+            */
+            #endregion Require drive authentication, won't work
+
+            #region DVD-R and DVD-RW
+            if(MediaType == MediaType.DVDR   ||
+               MediaType == MediaType.DVDRW  ||
+               MediaType == MediaType.DVDRDL ||
+               MediaType == MediaType.DVDRWDL)
+            {
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.PreRecordedInfo, 0, dev.Timeout, out _);
+
+                if(sense)
+                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Pre-Recorded Info\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                else
+                {
+                    DvdPreRecordedInfo = cmdBuf;
+
+                    DecodedDvdPrePitInformation = PRI.Decode(cmdBuf);
+                }
+            }
+            #endregion DVD-R and DVD-RW
+
+            switch(MediaType)
+            {
+                #region DVD-R, DVD-RW and HD DVD-R
+                case MediaType.DVDR:
+                case MediaType.DVDRW:
+                case MediaType.DVDRDL:
+                case MediaType.DVDRWDL:
+                case MediaType.HDDVDR:
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.DvdrMediaIdentifier, 0, dev.Timeout,
+                                                  out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD-R Media ID\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdrMediaIdentifier = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.DvdrPhysicalInformation, 0, dev.Timeout,
+                                                  out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DVD-R PFI\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                    {
+                        DvdrPhysicalInformation = cmdBuf;
+
+                        DecodedDvdrPfi = PFI.Decode(cmdBuf, MediaType);
+                    }
+
+                    break;
+                #endregion DVD-R, DVD-RW and HD DVD-R
+
+                #region All DVD+
+                case MediaType.DVDPR:
+                case MediaType.DVDPRDL:
+                case MediaType.DVDPRW:
+                case MediaType.DVDPRWDL:
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.Adip, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: ADIP\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdPlusAdip = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.Dcb, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DCB\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdPlusDcb = cmdBuf;
+
+                    break;
+                #endregion All DVD+
+
+                #region HD DVD-ROM
+                case MediaType.HDDVDROM:
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.HddvdCopyrightInformation, 0, dev.Timeout,
+                                                  out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: HD DVD CMI\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        HddvdCopyrightInformation = cmdBuf;
+
+                    break;
+                #endregion HD DVD-ROM
+            }
+
+            #region HD DVD-R
+            if(MediaType == MediaType.HDDVDR)
+            {
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.HddvdrMediumStatus, 0, dev.Timeout, out _);
+
+                if(sense)
+                    AaruConsole.DebugWriteLine("Media-Info command",
+                                               "READ DISC STRUCTURE: HD DVD-R Medium Status\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                else
+                    HddvdrMediumStatus = cmdBuf;
+
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.HddvdrLastRmd, 0, dev.Timeout, out _);
+
+                if(sense)
+                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Last RMD\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                else
+                    HddvdrLastRmd = cmdBuf;
+            }
+            #endregion HD DVD-R
+
+            #region DVD-R DL, DVD-RW DL, DVD+R DL, DVD+RW DL
+            if(MediaType == MediaType.DVDPRDL ||
+               MediaType == MediaType.DVDRDL  ||
+               MediaType == MediaType.DVDRWDL ||
+               MediaType == MediaType.DVDPRWDL)
+            {
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.DvdrLayerCapacity, 0, dev.Timeout, out _);
+
+                if(sense)
+                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Layer Capacity\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                else
+                    DvdrLayerCapacity = cmdBuf;
+            }
+            #endregion DVD-R DL, DVD-RW DL, DVD+R DL, DVD+RW DL
+
+            switch(MediaType)
+            {
+                #region DVD-R DL
+                case MediaType.DVDRDL:
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.MiddleZoneStart, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command",
+                                                   "READ DISC STRUCTURE: Middle Zone Start\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdrDlMiddleZoneStart = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.JumpIntervalSize, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command",
+                                                   "READ DISC STRUCTURE: Jump Interval Size\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdrDlJumpIntervalSize = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.ManualLayerJumpStartLba, 0, dev.Timeout,
+                                                  out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command",
+                                                   "READ DISC STRUCTURE: Manual Layer Jump Start LBA\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdrDlManualLayerJumpStartLba = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                  MmcDiscStructureFormat.RemapAnchorPoint, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command",
+                                                   "READ DISC STRUCTURE: Remap Anchor Point\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        DvdrDlRemapAnchorPoint = cmdBuf;
+
+                    break;
+                #endregion DVD-R DL
+
+                #region All Blu-ray
+                case MediaType.BDR:
+                case MediaType.BDRE:
+                case MediaType.BDROM:
+                case MediaType.UHDBD:
+                case MediaType.BDRXL:
+                case MediaType.BDREXL:
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
+                                                  MmcDiscStructureFormat.DiscInformation, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DI\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        BlurayDiscInformation = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
+                                                  MmcDiscStructureFormat.Pac, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PAC\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        BlurayPac = cmdBuf;
+
+                    break;
+                #endregion All Blu-ray
             }
 
             switch(MediaType)
             {
-                #region Xbox
-                case MediaType.XGD:
-                case MediaType.XGD2:
-                case MediaType.XGD3:
-                    // We need to get INQUIRY to know if it is a Kreon drive
-                    sense = dev.ScsiInquiry(out byte[] inqBuffer, out senseBuf);
+                #region BD-ROM only
+                case MediaType.BDROM:
+                case MediaType.UHDBD:
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
+                                                  MmcDiscStructureFormat.BdBurstCuttingArea, 0, dev.Timeout, out _);
 
-                    if(!sense)
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: BCA\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        BlurayBurstCuttingArea = cmdBuf;
+
+                    break;
+                #endregion BD-ROM only
+
+                #region Writable Blu-ray only
+                case MediaType.BDR:
+                case MediaType.BDRE:
+                case MediaType.BDRXL:
+                case MediaType.BDREXL:
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
+                                                  MmcDiscStructureFormat.BdDds, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DDS\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        BlurayDds = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
+                                                  MmcDiscStructureFormat.CartridgeStatus, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command",
+                                                   "READ DISC STRUCTURE: Cartridge Status\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        BlurayCartridgeStatus = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
+                                                  MmcDiscStructureFormat.BdSpareAreaInformation, 0, dev.Timeout,
+                                                  out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command",
+                                                   "READ DISC STRUCTURE: Spare Area Information\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        BluraySpareAreaInformation = cmdBuf;
+
+                    sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Bd, 0, 0,
+                                                  MmcDiscStructureFormat.RawDfl, 0, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: Raw DFL\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        BlurayRawDfl = cmdBuf;
+
+                    sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf,
+                                                    MmcDiscInformationDataTypes.TrackResources, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 001b\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        BlurayTrackResources = cmdBuf;
+
+                    sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf,
+                                                    MmcDiscInformationDataTypes.PowResources, dev.Timeout, out _);
+
+                    if(sense)
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 010b\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    else
+                        BlurayPowResources = cmdBuf;
+
+                    break;
+                #endregion Writable Blu-ray only
+
+                #region CDs
+                case MediaType.CD:
+                case MediaType.CDR:
+                case MediaType.CDROM:
+                case MediaType.CDRW:
+                case MediaType.Unknown:
+                    // We discarded all discs that falsify a TOC before requesting a real TOC
+                    // No TOC, no CD (or an empty one)
+                    bool tocSense = dev.ReadTocPmaAtip(out cmdBuf, out senseBuf, false, 0, 0, dev.Timeout, out _);
+
+                    if(tocSense)
                     {
-                        Inquiry? inq = Inquiry.Decode(inqBuffer);
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: TOC\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    }
+                    else
+                    {
+                        Toc        = cmdBuf;
+                        DecodedToc = TOC.Decode(cmdBuf);
 
-                        if(inq?.KreonPresent == true)
+                        // As we have a TOC we know it is a CD
+                        if(MediaType == MediaType.Unknown)
+                            MediaType = MediaType.CD;
+                    }
+
+                    // ATIP exists on blank CDs
+                    sense = dev.ReadAtip(out cmdBuf, out senseBuf, dev.Timeout, out _);
+
+                    if(sense)
+                    {
+                        AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: ATIP\n{0}",
+                                                   Sense.PrettifySense(senseBuf));
+                    }
+                    else
+                    {
+                        Atip        = cmdBuf;
+                        DecodedAtip = ATIP.Decode(cmdBuf);
+
+                        if(DecodedAtip != null)
+
+                            // Only CD-R and CD-RW have ATIP
+                            MediaType = DecodedAtip.DiscType ? MediaType.CDRW : MediaType.CDR;
+                        else
+                            Atip = null;
+                    }
+
+                    // We got a TOC, get information about a recorded/mastered CD
+                    if(!tocSense)
+                    {
+                        sense = dev.ReadSessionInfo(out cmdBuf, out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
                         {
-                            sense = dev.KreonExtractSs(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                                AaruConsole.DebugWriteLine("Media-Info command", "KREON EXTRACT SS:\n{0}",
-                                                           Sense.PrettifySense(senseBuf));
-                            else
-                                XboxSecuritySector = cmdBuf;
-
-                            DecodedXboxSecuritySector = SS.Decode(cmdBuf);
-
-                            // Get video partition size
-                            AaruConsole.DebugWriteLine("Dump-media command", "Getting video partition size");
-                            sense = dev.KreonLock(out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.ErrorWriteLine("Cannot lock drive, not continuing.");
-
-                                break;
-                            }
-
-                            sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.ErrorWriteLine("Cannot get disc capacity.");
-
-                                break;
-                            }
-
-                            ulong totalSize =
-                                (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) &
-                                0xFFFFFFFF;
-
-                            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                          MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.ErrorWriteLine("Cannot get PFI.");
-
-                                break;
-                            }
-
-                            AaruConsole.DebugWriteLine("Dump-media command", "Video partition total size: {0} sectors",
-                                                       totalSize);
-
-                            ulong l0Video = PFI.Decode(cmdBuf, MediaType).Value.Layer0EndPSN -
-                                            PFI.Decode(cmdBuf, MediaType).Value.DataAreaStartPSN + 1;
-
-                            ulong l1Video = totalSize - l0Video + 1;
-
-                            // Get game partition size
-                            AaruConsole.DebugWriteLine("Dump-media command", "Getting game partition size");
-                            sense = dev.KreonUnlockXtreme(out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.ErrorWriteLine("Cannot unlock drive, not continuing.");
-
-                                break;
-                            }
-
-                            sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.ErrorWriteLine("Cannot get disc capacity.");
-
-                                return;
-                            }
-
-                            ulong gameSize =
-                                ((ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) &
-                                 0xFFFFFFFF) + 1;
-
-                            AaruConsole.DebugWriteLine("Dump-media command", "Game partition total size: {0} sectors",
-                                                       gameSize);
-
-                            // Get middle zone size
-                            AaruConsole.DebugWriteLine("Dump-media command", "Getting middle zone size");
-                            sense = dev.KreonUnlockWxripper(out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.ErrorWriteLine("Cannot unlock drive, not continuing.");
-
-                                break;
-                            }
-
-                            sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.ErrorWriteLine("Cannot get disc capacity.");
-
-                                break;
-                            }
-
-                            totalSize = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) &
-                                        0xFFFFFFFF;
-
-                            sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
-                                                          MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
-
-                            if(sense)
-                            {
-                                AaruConsole.ErrorWriteLine("Cannot get PFI.");
-
-                                break;
-                            }
-
-                            AaruConsole.DebugWriteLine("Dump-media command", "Unlocked total size: {0} sectors",
-                                                       totalSize);
-
-                            ulong middleZone =
-                                totalSize - (PFI.Decode(cmdBuf, MediaType).Value.Layer0EndPSN -
-                                             PFI.Decode(cmdBuf, MediaType).Value.DataAreaStartPSN + 1) - gameSize + 1;
-
-                            totalSize = l0Video + l1Video + (middleZone * 2) + gameSize;
-                            ulong layerBreak = l0Video + middleZone + (gameSize / 2);
-
-                            XgdInfo = new XgdInfo
-                            {
-                                L0Video    = l0Video,
-                                L1Video    = l1Video,
-                                MiddleZone = middleZone,
-                                GameSize   = gameSize,
-                                TotalSize  = totalSize,
-                                LayerBreak = layerBreak
-                            };
+                            AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: Session info\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
                         }
+                        else if(cmdBuf.Length > 4)
+                        {
+                            Session        = cmdBuf;
+                            DecodedSession = Decoders.CD.Session.Decode(cmdBuf);
+
+                            if(DecodedSession.HasValue)
+                            {
+                                sessions              = DecodedSession.Value.LastCompleteSession;
+                                firstTrackLastSession = DecodedSession.Value.TrackDescriptors[0].TrackNumber;
+                            }
+                        }
+
+                        sense = dev.ReadRawToc(out cmdBuf, out senseBuf, 1, dev.Timeout, out _);
+
+                        if(sense)
+                        {
+                            AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: Raw TOC\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
+                        }
+                        else if(cmdBuf.Length > 4)
+                        {
+                            RawToc = cmdBuf;
+
+                            FullToc = FullTOC.Decode(cmdBuf);
+                        }
+
+                        sense = dev.ReadPma(out cmdBuf, out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                            AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: PMA\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
+                        else if(cmdBuf.Length > 4)
+                            Pma = cmdBuf;
+
+                        sense = dev.ReadCdText(out cmdBuf, out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                        {
+                            AaruConsole.DebugWriteLine("Media-Info command", "READ TOC/PMA/ATIP: CD-TEXT\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
+                        }
+                        else if(cmdBuf.Length > 4)
+                        {
+                            CdTextLeadIn        = cmdBuf;
+                            DecodedCdTextLeadIn = CDTextOnLeadIn.Decode(cmdBuf);
+                        }
+
+                        sense = dev.ReadMcn(out string mcn, out _, out _, dev.Timeout, out _);
+
+                        if(!sense      &&
+                           mcn != null &&
+                           mcn != "0000000000000")
+                            Mcn = mcn;
+
+                        Isrcs = new Dictionary<byte, string>();
+
+                        for(byte i = DecodedToc.Value.FirstTrack; i <= DecodedToc.Value.LastTrack; i++)
+                        {
+                            sense = dev.ReadIsrc(i, out string isrc, out _, out _, dev.Timeout, out _);
+
+                            if(!sense       &&
+                               isrc != null &&
+                               isrc != "000000000000")
+                                Isrcs.Add(i, isrc);
+                        }
+
+                        if(Isrcs.Count == 0)
+                            Isrcs = null;
                     }
 
                     break;
-                #endregion Xbox
-
-                case MediaType.Unknown:
-                    MediaType = MediaTypeFromDevice.GetFromScsi((byte)dev.ScsiType, dev.Manufacturer, dev.Model,
-                                                                scsiMediumType, scsiDensityCode, Blocks, BlockSize,
-                                                                dev.IsUsb, true);
-
-                    break;
+                #endregion CDs
             }
 
+            #region Nintendo
             if(MediaType == MediaType.Unknown &&
-               dev.IsUsb                      &&
-               containsFloppyPage)
-                MediaType = MediaType.FlashDrive;
-
-            if(MediaType == MediaType.Unknown &&
-               !dev.IsRemovable)
-                MediaType = MediaType.GENERIC_HDD;
-
-            if(DeviceInfo.ScsiType != PeripheralDeviceTypes.MultiMediaDevice ||
-               (dev.IsUsb && (scsiMediumType == 0x40 || scsiMediumType == 0x41 || scsiMediumType == 0x42)))
-                return;
-
-            sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf, MmcDiscInformationDataTypes.DiscInformation,
-                                            dev.Timeout, out _);
-
-            if(sense)
+               Blocks    > 0)
             {
-                AaruConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 000b\n{0}",
-                                           Sense.PrettifySense(senseBuf));
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.PhysicalInformation, 0, dev.Timeout, out _);
+
+                if(sense)
+                {
+                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: PFI\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                }
+                else
+                {
+                    DvdPfi = cmdBuf;
+                    PFI.PhysicalFormatInformation? nintendoPfi = PFI.Decode(cmdBuf, MediaType);
+
+                    if(nintendoPfi != null)
+                    {
+                        AaruConsole.WriteLine("PFI:\n{0}", PFI.Prettify(cmdBuf, MediaType));
+
+                        if(nintendoPfi.Value.DiskCategory == DiskCategory.Nintendo &&
+                           nintendoPfi.Value.PartVersion  == 15)
+                            switch(nintendoPfi.Value.DiscSize)
+                            {
+                                case DVDSize.Eighty:
+                                    MediaType = MediaType.GOD;
+
+                                    break;
+                                case DVDSize.OneTwenty:
+                                    MediaType = MediaType.WOD;
+
+                                    break;
+                            }
+                    }
+                }
+
+                sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                              MmcDiscStructureFormat.DiscManufacturingInformation, 0, dev.Timeout,
+                                              out _);
+
+                if(sense)
+                    AaruConsole.DebugWriteLine("Media-Info command", "READ DISC STRUCTURE: DMI\n{0}",
+                                               Sense.PrettifySense(senseBuf));
+                else
+                    DvdDmi = cmdBuf;
             }
-            else
-            {
-                DiscInformation        = cmdBuf;
-                DecodedDiscInformation = Decoders.SCSI.MMC.DiscInformation.Decode000b(cmdBuf);
-
-                if(DecodedDiscInformation.HasValue)
-                    if(MediaType == MediaType.CD)
-                        switch(DecodedDiscInformation.Value.DiscType)
-                        {
-                            case 0x10:
-                                MediaType = MediaType.CDI;
-
-                                break;
-                            case 0x20:
-                                MediaType = MediaType.CDROMXA;
-
-                                break;
-                        }
-            }
-
-            MediaType tmpType = MediaType;
-            MMC.DetectDiscType(ref tmpType, sessions, FullToc, dev, out _, out _, firstTrackLastSession, Blocks);
-
-            MediaType = tmpType;
+            #endregion Nintendo
         }
 
-        /// <summary>Decoded DVD Pre-Recorded Information</summary>
-        public PRI.PreRecordedInformation? DecodedDvdPrePitInformation { get; }
-        /// <summary>Decoded recordable DVD Physical Format Information</summary>
-        public PFI.PhysicalFormatInformation? DecodedDvdrPfi { get; }
-        /// <summary>Raw media serial number</summary>
-        public byte[] MediaSerialNumber { get; }
-        /// <summary>Raw Xbox security sectors</summary>
-        public byte[] XboxSecuritySector { get; }
-        /// <summary>Decoded Xbox security sectors</summary>
-        public SS.SecuritySector? DecodedXboxSecuritySector { get; }
-        /// <summary>Information about an XGD, XGD2 or XGD3 media</summary>
-        public XgdInfo XgdInfo { get; }
-        /// <summary>MMC drive raw GET CONFIGURATION</summary>
-        public byte[] MmcConfiguration { get; }
-        /// <summary>Raw recognized format layers</summary>
-        public byte[] RecognizedFormatLayers { get; }
-        /// <summary>Raw write protection status</summary>
-        public byte[] WriteProtectionStatus { get; }
-        /// <summary>Raw DVD Physical Format Information</summary>
-        public byte[] DvdPfi { get; }
-        /// <summary>Decoded DVD Physical Format Information</summary>
-        public PFI.PhysicalFormatInformation? DecodedPfi { get; }
-        /// <summary>Raw DVD Disc Manufacturing Information</summary>
-        public byte[] DvdDmi { get; }
-        /// <summary>Raw DVD Copyright Management Information</summary>
-        public byte[] DvdCmi { get; }
-        /// <summary>Raw DVD Burst Cutting Area</summary>
-        public byte[] DvdBca { get; }
-        /// <summary>Raw DVD AACS information</summary>
-        public byte[] DvdAacs { get; }
-        /// <summary>Raw DVD-RAM Disc Definition Structure</summary>
-        public byte[] DvdRamDds { get; }
-        /// <summary>Raw DVD-RAM Cartridge Status</summary>
-        public byte[] DvdRamCartridgeStatus { get; }
-        /// <summary>Raw DVD-RAM Spare Area Information</summary>
-        public byte[] DvdRamSpareArea { get; }
-        /// <summary>Raw DVD-R(W) Last Border-Out RMD</summary>
-        public byte[] LastBorderOutRmd { get; }
-        /// <summary>Raw DVD-R(W) Pre-Recorded Information</summary>
-        public byte[] DvdPreRecordedInfo { get; }
-        /// <summary>Raw DVD-R Media ID</summary>
-        public byte[] DvdrMediaIdentifier { get; }
-        /// <summary>Raw recordable DVD Physical Format Information</summary>
-        public byte[] DvdrPhysicalInformation { get; }
-        /// <summary>Raw DVD+R(W) ADIP</summary>
-        public byte[] DvdPlusAdip { get; }
-        /// <summary>Raw DVD+R(W) Disc Control Blocks</summary>
-        public byte[] DvdPlusDcb { get; }
-        /// <summary>Raw HD DVD Copyright Management Information</summary>
-        public byte[] HddvdCopyrightInformation { get; }
-        /// <summary>Raw HD DVD-R Medium Status</summary>
-        public byte[] HddvdrMediumStatus { get; }
-        /// <summary>Raw HD DVD-R(W) Last Border-Out RMD</summary>
-        public byte[] HddvdrLastRmd { get; }
-        /// <summary>Raw DVD-R(W) Layer Capacity</summary>
-        public byte[] DvdrLayerCapacity { get; }
-        /// <summary>Raw DVD-R DL Middle Zone start</summary>
-        public byte[] DvdrDlMiddleZoneStart { get; }
-        /// <summary>Raw DVD-R DL Jump Interval size</summary>
-        public byte[] DvdrDlJumpIntervalSize { get; }
-        /// <summary>Raw DVD-R DL Manual Layer Jump Start LBA</summary>
-        public byte[] DvdrDlManualLayerJumpStartLba { get; }
-        /// <summary>Raw DVD-R DL Remap Anchor Point</summary>
-        public byte[] DvdrDlRemapAnchorPoint { get; }
-        /// <summary>Raw Blu-ray Disc Information</summary>
-        public byte[] BlurayDiscInformation { get; }
-        /// <summary>Raw Blu-ray PAC</summary>
-        public byte[] BlurayPac { get; }
-        /// <summary>Raw Blu-ray Burst Cutting Area</summary>
-        public byte[] BlurayBurstCuttingArea { get; }
-        /// <summary>Raw Blu-ray Disc Definition Structure</summary>
-        public byte[] BlurayDds { get; }
-        /// <summary>Raw Blu-ray Cartridge Status</summary>
-        public byte[] BlurayCartridgeStatus { get; }
-        /// <summary>Raw Blu-ray Spare Area Information</summary>
-        public byte[] BluraySpareAreaInformation { get; }
-        /// <summary>Raw Blu-ray DFL</summary>
-        public byte[] BlurayRawDfl { get; }
-        /// <summary>Raw Blu-ray Pseudo OverWrite Resources</summary>
-        public byte[] BlurayPowResources { get; }
-        /// <summary>Raw READ TOC response</summary>
-        public byte[] Toc { get; }
-        /// <summary>Raw READ ATIP response</summary>
-        public byte[] Atip { get; }
-        /// <summary>Raw READ DISC INFORMATION response</summary>
-        public byte[] DiscInformation { get; }
-        /// <summary>Raw READ SESSION response</summary>
-        public byte[] Session { get; }
-        /// <summary>Raw READ FULL TOC response</summary>
-        public byte[] RawToc { get; }
-        /// <summary>Raw READ PMA response</summary>
-        public byte[] Pma { get; }
-        /// <summary>Raw Lead-In's CD-TEXT response</summary>
-        public byte[] CdTextLeadIn { get; }
-        /// <summary>Decoded READ TOC response</summary>
-        public TOC.CDTOC? DecodedToc { get; }
-        /// <summary>Decoded READ ATIP response</summary>
-        public ATIP.CDATIP DecodedAtip { get; }
-        /// <summary>Decoded READ SESSION response</summary>
-        public Session.CDSessionInfo? DecodedSession { get; }
-        /// <summary>Decoded READ FULL TOC response</summary>
-        public FullTOC.CDFullTOC? FullToc { get; }
-        /// <summary>Decoded Lead-In CD-TEXT response</summary>
-        public CDTextOnLeadIn.CDText? DecodedCdTextLeadIn { get; }
-        /// <summary>Raw Blu-ray track resources</summary>
-        public byte[] BlurayTrackResources { get; }
-        /// <summary>Decoded Blu-ray Disc Information</summary>
-        public DiscInformation.StandardDiscInformation? DecodedDiscInformation { get; }
-        /// <summary>Decoded Media Catalogue Number</summary>
-        public string Mcn { get; }
-        /// <summary>List of decoded track ISRCs</summary>
-        public Dictionary<byte, string> Isrcs { get; }
-        /// <summary>Set if media is inserted in drive</summary>
-        public bool MediaInserted { get; }
-        /// <summary>Detected media type</summary>
-        public MediaType MediaType { get; }
-        /// <summary>Device information</summary>
-        public DeviceInfo DeviceInfo { get; }
-        /// <summary>Raw READ CAPACITY(10) response</summary>
-        public byte[] ReadCapacity { get; }
-        /// <summary>Number of blocks in media</summary>
-        public ulong Blocks { get; }
-        /// <summary>Logical block size</summary>
-        public uint BlockSize { get; }
-        /// <summary>Raw READ CAPACITY(16) response</summary>
-        public byte[] ReadCapacity16 { get; }
-        /// <summary>Raw SSC Density support</summary>
-        public byte[] DensitySupport { get; }
-        /// <summary>Decoded SSC Density support</summary>
-        public DensitySupport.DensitySupportHeader? DensitySupportHeader { get; }
-        /// <summary>Raw SSC media support</summary>
-        public byte[] MediaTypeSupport { get; }
-        /// <summary>Decoded SSC media support</summary>
-        public DensitySupport.MediaTypeSupportHeader? MediaTypeSupportHeader { get; }
-        /// <summary>Raw data from DVD sector Copyright Management Information</summary>
-        public byte[] DvdSectorCmi { get; }
-        /// <summary>Raw DVD Disc Key</summary>
-        public byte[] DvdDiscKey { get; }
+        sense = dev.ReadMediaSerialNumber(out cmdBuf, out senseBuf, dev.Timeout, out _);
+
+        if(sense)
+        {
+            AaruConsole.DebugWriteLine("Media-Info command", "READ MEDIA SERIAL NUMBER\n{0}",
+                                       Sense.PrettifySense(senseBuf));
+        }
+        else
+        {
+            if(cmdBuf.Length >= 4)
+                MediaSerialNumber = cmdBuf;
+        }
+
+        switch(MediaType)
+        {
+            #region Xbox
+            case MediaType.XGD:
+            case MediaType.XGD2:
+            case MediaType.XGD3:
+                // We need to get INQUIRY to know if it is a Kreon drive
+                sense = dev.ScsiInquiry(out byte[] inqBuffer, out senseBuf);
+
+                if(!sense)
+                {
+                    Inquiry? inq = Inquiry.Decode(inqBuffer);
+
+                    if(inq?.KreonPresent == true)
+                    {
+                        sense = dev.KreonExtractSs(out cmdBuf, out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                            AaruConsole.DebugWriteLine("Media-Info command", "KREON EXTRACT SS:\n{0}",
+                                                       Sense.PrettifySense(senseBuf));
+                        else
+                            XboxSecuritySector = cmdBuf;
+
+                        DecodedXboxSecuritySector = SS.Decode(cmdBuf);
+
+                        // Get video partition size
+                        AaruConsole.DebugWriteLine("Dump-media command", "Getting video partition size");
+                        sense = dev.KreonLock(out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                        {
+                            AaruConsole.ErrorWriteLine("Cannot lock drive, not continuing.");
+
+                            break;
+                        }
+
+                        sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                        {
+                            AaruConsole.ErrorWriteLine("Cannot get disc capacity.");
+
+                            break;
+                        }
+
+                        ulong totalSize =
+                            (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) &
+                            0xFFFFFFFF;
+
+                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                      MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
+
+                        if(sense)
+                        {
+                            AaruConsole.ErrorWriteLine("Cannot get PFI.");
+
+                            break;
+                        }
+
+                        AaruConsole.DebugWriteLine("Dump-media command", "Video partition total size: {0} sectors",
+                                                   totalSize);
+
+                        ulong l0Video = PFI.Decode(cmdBuf, MediaType).Value.Layer0EndPSN -
+                                        PFI.Decode(cmdBuf, MediaType).Value.DataAreaStartPSN + 1;
+
+                        ulong l1Video = totalSize - l0Video + 1;
+
+                        // Get game partition size
+                        AaruConsole.DebugWriteLine("Dump-media command", "Getting game partition size");
+                        sense = dev.KreonUnlockXtreme(out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                        {
+                            AaruConsole.ErrorWriteLine("Cannot unlock drive, not continuing.");
+
+                            break;
+                        }
+
+                        sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                        {
+                            AaruConsole.ErrorWriteLine("Cannot get disc capacity.");
+
+                            return;
+                        }
+
+                        ulong gameSize =
+                            ((ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) &
+                             0xFFFFFFFF) + 1;
+
+                        AaruConsole.DebugWriteLine("Dump-media command", "Game partition total size: {0} sectors",
+                                                   gameSize);
+
+                        // Get middle zone size
+                        AaruConsole.DebugWriteLine("Dump-media command", "Getting middle zone size");
+                        sense = dev.KreonUnlockWxripper(out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                        {
+                            AaruConsole.ErrorWriteLine("Cannot unlock drive, not continuing.");
+
+                            break;
+                        }
+
+                        sense = dev.ReadCapacity(out cmdBuf, out senseBuf, dev.Timeout, out _);
+
+                        if(sense)
+                        {
+                            AaruConsole.ErrorWriteLine("Cannot get disc capacity.");
+
+                            break;
+                        }
+
+                        totalSize = (ulong)((cmdBuf[0] << 24) + (cmdBuf[1] << 16) + (cmdBuf[2] << 8) + cmdBuf[3]) &
+                                    0xFFFFFFFF;
+
+                        sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.Dvd, 0, 0,
+                                                      MmcDiscStructureFormat.PhysicalInformation, 0, 0, out _);
+
+                        if(sense)
+                        {
+                            AaruConsole.ErrorWriteLine("Cannot get PFI.");
+
+                            break;
+                        }
+
+                        AaruConsole.DebugWriteLine("Dump-media command", "Unlocked total size: {0} sectors",
+                                                   totalSize);
+
+                        ulong middleZone =
+                            totalSize - (PFI.Decode(cmdBuf, MediaType).Value.Layer0EndPSN -
+                                         PFI.Decode(cmdBuf, MediaType).Value.DataAreaStartPSN + 1) - gameSize + 1;
+
+                        totalSize = l0Video + l1Video + (middleZone * 2) + gameSize;
+                        ulong layerBreak = l0Video + middleZone + (gameSize / 2);
+
+                        XgdInfo = new XgdInfo
+                        {
+                            L0Video    = l0Video,
+                            L1Video    = l1Video,
+                            MiddleZone = middleZone,
+                            GameSize   = gameSize,
+                            TotalSize  = totalSize,
+                            LayerBreak = layerBreak
+                        };
+                    }
+                }
+
+                break;
+            #endregion Xbox
+
+            case MediaType.Unknown:
+                MediaType = MediaTypeFromDevice.GetFromScsi((byte)dev.ScsiType, dev.Manufacturer, dev.Model,
+                                                            scsiMediumType, scsiDensityCode, Blocks, BlockSize,
+                                                            dev.IsUsb, true);
+
+                break;
+        }
+
+        if(MediaType == MediaType.Unknown &&
+           dev.IsUsb                      &&
+           containsFloppyPage)
+            MediaType = MediaType.FlashDrive;
+
+        if(MediaType == MediaType.Unknown &&
+           !dev.IsRemovable)
+            MediaType = MediaType.GENERIC_HDD;
+
+        if(DeviceInfo.ScsiType != PeripheralDeviceTypes.MultiMediaDevice ||
+           (dev.IsUsb && (scsiMediumType == 0x40 || scsiMediumType == 0x41 || scsiMediumType == 0x42)))
+            return;
+
+        sense = dev.ReadDiscInformation(out cmdBuf, out senseBuf, MmcDiscInformationDataTypes.DiscInformation,
+                                        dev.Timeout, out _);
+
+        if(sense)
+        {
+            AaruConsole.DebugWriteLine("Media-Info command", "READ DISC INFORMATION 000b\n{0}",
+                                       Sense.PrettifySense(senseBuf));
+        }
+        else
+        {
+            DiscInformation        = cmdBuf;
+            DecodedDiscInformation = Decoders.SCSI.MMC.DiscInformation.Decode000b(cmdBuf);
+
+            if(DecodedDiscInformation.HasValue)
+                if(MediaType == MediaType.CD)
+                    switch(DecodedDiscInformation.Value.DiscType)
+                    {
+                        case 0x10:
+                            MediaType = MediaType.CDI;
+
+                            break;
+                        case 0x20:
+                            MediaType = MediaType.CDROMXA;
+
+                            break;
+                    }
+        }
+
+        MediaType tmpType = MediaType;
+        MMC.DetectDiscType(ref tmpType, sessions, FullToc, dev, out _, out _, firstTrackLastSession, Blocks);
+
+        MediaType = tmpType;
     }
+
+    /// <summary>Decoded DVD Pre-Recorded Information</summary>
+    public PRI.PreRecordedInformation? DecodedDvdPrePitInformation { get; }
+    /// <summary>Decoded recordable DVD Physical Format Information</summary>
+    public PFI.PhysicalFormatInformation? DecodedDvdrPfi { get; }
+    /// <summary>Raw media serial number</summary>
+    public byte[] MediaSerialNumber { get; }
+    /// <summary>Raw Xbox security sectors</summary>
+    public byte[] XboxSecuritySector { get; }
+    /// <summary>Decoded Xbox security sectors</summary>
+    public SS.SecuritySector? DecodedXboxSecuritySector { get; }
+    /// <summary>Information about an XGD, XGD2 or XGD3 media</summary>
+    public XgdInfo XgdInfo { get; }
+    /// <summary>MMC drive raw GET CONFIGURATION</summary>
+    public byte[] MmcConfiguration { get; }
+    /// <summary>Raw recognized format layers</summary>
+    public byte[] RecognizedFormatLayers { get; }
+    /// <summary>Raw write protection status</summary>
+    public byte[] WriteProtectionStatus { get; }
+    /// <summary>Raw DVD Physical Format Information</summary>
+    public byte[] DvdPfi { get; }
+    /// <summary>Decoded DVD Physical Format Information</summary>
+    public PFI.PhysicalFormatInformation? DecodedPfi { get; }
+    /// <summary>Raw DVD Disc Manufacturing Information</summary>
+    public byte[] DvdDmi { get; }
+    /// <summary>Raw DVD Copyright Management Information</summary>
+    public byte[] DvdCmi { get; }
+    /// <summary>Raw DVD Burst Cutting Area</summary>
+    public byte[] DvdBca { get; }
+    /// <summary>Raw DVD AACS information</summary>
+    public byte[] DvdAacs { get; }
+    /// <summary>Raw DVD-RAM Disc Definition Structure</summary>
+    public byte[] DvdRamDds { get; }
+    /// <summary>Raw DVD-RAM Cartridge Status</summary>
+    public byte[] DvdRamCartridgeStatus { get; }
+    /// <summary>Raw DVD-RAM Spare Area Information</summary>
+    public byte[] DvdRamSpareArea { get; }
+    /// <summary>Raw DVD-R(W) Last Border-Out RMD</summary>
+    public byte[] LastBorderOutRmd { get; }
+    /// <summary>Raw DVD-R(W) Pre-Recorded Information</summary>
+    public byte[] DvdPreRecordedInfo { get; }
+    /// <summary>Raw DVD-R Media ID</summary>
+    public byte[] DvdrMediaIdentifier { get; }
+    /// <summary>Raw recordable DVD Physical Format Information</summary>
+    public byte[] DvdrPhysicalInformation { get; }
+    /// <summary>Raw DVD+R(W) ADIP</summary>
+    public byte[] DvdPlusAdip { get; }
+    /// <summary>Raw DVD+R(W) Disc Control Blocks</summary>
+    public byte[] DvdPlusDcb { get; }
+    /// <summary>Raw HD DVD Copyright Management Information</summary>
+    public byte[] HddvdCopyrightInformation { get; }
+    /// <summary>Raw HD DVD-R Medium Status</summary>
+    public byte[] HddvdrMediumStatus { get; }
+    /// <summary>Raw HD DVD-R(W) Last Border-Out RMD</summary>
+    public byte[] HddvdrLastRmd { get; }
+    /// <summary>Raw DVD-R(W) Layer Capacity</summary>
+    public byte[] DvdrLayerCapacity { get; }
+    /// <summary>Raw DVD-R DL Middle Zone start</summary>
+    public byte[] DvdrDlMiddleZoneStart { get; }
+    /// <summary>Raw DVD-R DL Jump Interval size</summary>
+    public byte[] DvdrDlJumpIntervalSize { get; }
+    /// <summary>Raw DVD-R DL Manual Layer Jump Start LBA</summary>
+    public byte[] DvdrDlManualLayerJumpStartLba { get; }
+    /// <summary>Raw DVD-R DL Remap Anchor Point</summary>
+    public byte[] DvdrDlRemapAnchorPoint { get; }
+    /// <summary>Raw Blu-ray Disc Information</summary>
+    public byte[] BlurayDiscInformation { get; }
+    /// <summary>Raw Blu-ray PAC</summary>
+    public byte[] BlurayPac { get; }
+    /// <summary>Raw Blu-ray Burst Cutting Area</summary>
+    public byte[] BlurayBurstCuttingArea { get; }
+    /// <summary>Raw Blu-ray Disc Definition Structure</summary>
+    public byte[] BlurayDds { get; }
+    /// <summary>Raw Blu-ray Cartridge Status</summary>
+    public byte[] BlurayCartridgeStatus { get; }
+    /// <summary>Raw Blu-ray Spare Area Information</summary>
+    public byte[] BluraySpareAreaInformation { get; }
+    /// <summary>Raw Blu-ray DFL</summary>
+    public byte[] BlurayRawDfl { get; }
+    /// <summary>Raw Blu-ray Pseudo OverWrite Resources</summary>
+    public byte[] BlurayPowResources { get; }
+    /// <summary>Raw READ TOC response</summary>
+    public byte[] Toc { get; }
+    /// <summary>Raw READ ATIP response</summary>
+    public byte[] Atip { get; }
+    /// <summary>Raw READ DISC INFORMATION response</summary>
+    public byte[] DiscInformation { get; }
+    /// <summary>Raw READ SESSION response</summary>
+    public byte[] Session { get; }
+    /// <summary>Raw READ FULL TOC response</summary>
+    public byte[] RawToc { get; }
+    /// <summary>Raw READ PMA response</summary>
+    public byte[] Pma { get; }
+    /// <summary>Raw Lead-In's CD-TEXT response</summary>
+    public byte[] CdTextLeadIn { get; }
+    /// <summary>Decoded READ TOC response</summary>
+    public TOC.CDTOC? DecodedToc { get; }
+    /// <summary>Decoded READ ATIP response</summary>
+    public ATIP.CDATIP DecodedAtip { get; }
+    /// <summary>Decoded READ SESSION response</summary>
+    public Session.CDSessionInfo? DecodedSession { get; }
+    /// <summary>Decoded READ FULL TOC response</summary>
+    public FullTOC.CDFullTOC? FullToc { get; }
+    /// <summary>Decoded Lead-In CD-TEXT response</summary>
+    public CDTextOnLeadIn.CDText? DecodedCdTextLeadIn { get; }
+    /// <summary>Raw Blu-ray track resources</summary>
+    public byte[] BlurayTrackResources { get; }
+    /// <summary>Decoded Blu-ray Disc Information</summary>
+    public DiscInformation.StandardDiscInformation? DecodedDiscInformation { get; }
+    /// <summary>Decoded Media Catalogue Number</summary>
+    public string Mcn { get; }
+    /// <summary>List of decoded track ISRCs</summary>
+    public Dictionary<byte, string> Isrcs { get; }
+    /// <summary>Set if media is inserted in drive</summary>
+    public bool MediaInserted { get; }
+    /// <summary>Detected media type</summary>
+    public MediaType MediaType { get; }
+    /// <summary>Device information</summary>
+    public DeviceInfo DeviceInfo { get; }
+    /// <summary>Raw READ CAPACITY(10) response</summary>
+    public byte[] ReadCapacity { get; }
+    /// <summary>Number of blocks in media</summary>
+    public ulong Blocks { get; }
+    /// <summary>Logical block size</summary>
+    public uint BlockSize { get; }
+    /// <summary>Raw READ CAPACITY(16) response</summary>
+    public byte[] ReadCapacity16 { get; }
+    /// <summary>Raw SSC Density support</summary>
+    public byte[] DensitySupport { get; }
+    /// <summary>Decoded SSC Density support</summary>
+    public DensitySupport.DensitySupportHeader? DensitySupportHeader { get; }
+    /// <summary>Raw SSC media support</summary>
+    public byte[] MediaTypeSupport { get; }
+    /// <summary>Decoded SSC media support</summary>
+    public DensitySupport.MediaTypeSupportHeader? MediaTypeSupportHeader { get; }
+    /// <summary>Raw data from DVD sector Copyright Management Information</summary>
+    public byte[] DvdSectorCmi { get; }
+    /// <summary>Raw DVD Disc Key</summary>
+    public byte[] DvdDiscKey { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Media/Info/XgdInfo.cs b/Aaru.Core/Media/Info/XgdInfo.cs
index b64d41462..097b5e1fb 100644
--- a/Aaru.Core/Media/Info/XgdInfo.cs
+++ b/Aaru.Core/Media/Info/XgdInfo.cs
@@ -30,22 +30,21 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Core.Media.Info
+namespace Aaru.Core.Media.Info;
+
+/// <summary>Information about an XGD, XGD2 or XGD3 media.</summary>
+public sealed class XgdInfo
 {
-    /// <summary>Information about an XGD, XGD2 or XGD3 media.</summary>
-    public sealed class XgdInfo
-    {
-        /// <summary>Size of the game partition</summary>
-        public ulong GameSize;
-        /// <summary>Size of layer 0 of the video partition</summary>
-        public ulong L0Video;
-        /// <summary>Size of layer 1 of the video partition</summary>
-        public ulong L1Video;
-        /// <summary>Real layer break</summary>
-        public ulong LayerBreak;
-        /// <summary>Size of the middle zone</summary>
-        public ulong MiddleZone;
-        /// <summary>Total size of media</summary>
-        public ulong TotalSize;
-    }
+    /// <summary>Size of the game partition</summary>
+    public ulong GameSize;
+    /// <summary>Size of layer 0 of the video partition</summary>
+    public ulong L0Video;
+    /// <summary>Size of layer 1 of the video partition</summary>
+    public ulong L1Video;
+    /// <summary>Real layer break</summary>
+    public ulong LayerBreak;
+    /// <summary>Size of the middle zone</summary>
+    public ulong MiddleZone;
+    /// <summary>Total size of media</summary>
+    public ulong TotalSize;
 }
\ No newline at end of file
diff --git a/Aaru.Core/Options.cs b/Aaru.Core/Options.cs
index 64d925208..6ea7bbf33 100644
--- a/Aaru.Core/Options.cs
+++ b/Aaru.Core/Options.cs
@@ -34,171 +34,170 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+/// <summary>Option parsing</summary>
+public static class Options
 {
-    /// <summary>Option parsing</summary>
-    public static class Options
+    /// <summary>Parses a string with options</summary>
+    /// <param name="options">Options string</param>
+    /// <returns>Options name-value dictionary</returns>
+    public static Dictionary<string, string> Parse(string options)
     {
-        /// <summary>Parses a string with options</summary>
-        /// <param name="options">Options string</param>
-        /// <returns>Options name-value dictionary</returns>
-        public static Dictionary<string, string> Parse(string options)
-        {
-            Dictionary<string, string> parsed  = new Dictionary<string, string>();
-            bool                       escaped = false;
-            bool                       quoted  = false;
-            bool                       inValue = false;
-            string                     name    = null;
-            string                     value;
-            var                        sb = new StringBuilder();
-
-            if(options == null)
-                return parsed;
-
-            for(int index = 0; index < options.Length; index++)
-            {
-                char c = options[index];
-
-                switch(c)
-                {
-                    case '\\' when !escaped:
-                        escaped = true;
-
-                        break;
-                    case '"' when !escaped:
-                        quoted = !quoted;
-
-                        break;
-                    case '=' when quoted:
-                        sb.Append(c);
-
-                        break;
-                    case '=':
-                        name    = sb.ToString().ToLower(CultureInfo.CurrentCulture);
-                        sb      = new StringBuilder();
-                        inValue = true;
-
-                        break;
-                    case ',' when quoted:
-                        sb.Append(c);
-
-                        break;
-                    case ',' when inValue:
-                        value   = sb.ToString();
-                        sb      = new StringBuilder();
-                        inValue = false;
-
-                        if(string.IsNullOrEmpty(name) ||
-                           string.IsNullOrEmpty(value))
-                            continue;
-
-                        if(parsed.ContainsKey(name))
-                            parsed.Remove(name);
-
-                        parsed.Add(name, value);
-
-                        break;
-                    default:
-                        if(escaped)
-                            switch(c)
-                            {
-                                case 'a':
-                                    sb.Append('\a');
-                                    escaped = false;
-
-                                    break;
-                                case 'b':
-                                    sb.Append('\b');
-                                    escaped = false;
-
-                                    break;
-                                case 'f':
-                                    sb.Append('\f');
-                                    escaped = false;
-
-                                    break;
-                                case 'n':
-                                    sb.Append('\n');
-                                    escaped = false;
-
-                                    break;
-                                case 'r':
-                                    sb.Append('\r');
-                                    escaped = false;
-
-                                    break;
-                                case 't':
-                                    sb.Append('\t');
-                                    escaped = false;
-
-                                    break;
-                                case 'v':
-                                    sb.Append('\v');
-                                    escaped = false;
-
-                                    break;
-                                case '\\':
-                                    sb.Append('\\');
-                                    escaped = false;
-
-                                    break;
-                                case '\'':
-                                    sb.Append('\'');
-                                    escaped = false;
-
-                                    break;
-                                case '"':
-                                    sb.Append('"');
-                                    escaped = false;
-
-                                    break;
-                                case '0':
-                                    sb.Append('\0');
-                                    escaped = false;
-
-                                    break;
-                                case 'u':
-                                    string unicode = options.Substring(index + 1, 4);
-                                    sb.Append((char)int.Parse(unicode, NumberStyles.HexNumber));
-                                    escaped =  false;
-                                    index   += 4;
-
-                                    break;
-                                case 'U':
-                                    string longUnicode = options.Substring(index + 1, 8);
-                                    sb.Append((char)int.Parse(longUnicode, NumberStyles.HexNumber));
-                                    escaped =  false;
-                                    index   += 8;
-
-                                    break;
-                                default:
-                                    sb.Append(c);
-                                    escaped = false;
-
-                                    break;
-                            }
-                        else
-                            sb.Append(c);
-
-                        break;
-                }
-            }
-
-            if(!inValue)
-                return parsed;
-
-            value = sb.ToString();
-
-            if(string.IsNullOrEmpty(name) ||
-               string.IsNullOrEmpty(value))
-                return parsed;
-
-            if(parsed.ContainsKey(name))
-                parsed.Remove(name);
-
-            parsed.Add(name, value);
+        Dictionary<string, string> parsed  = new Dictionary<string, string>();
+        bool                       escaped = false;
+        bool                       quoted  = false;
+        bool                       inValue = false;
+        string                     name    = null;
+        string                     value;
+        var                        sb = new StringBuilder();
 
+        if(options == null)
             return parsed;
+
+        for(int index = 0; index < options.Length; index++)
+        {
+            char c = options[index];
+
+            switch(c)
+            {
+                case '\\' when !escaped:
+                    escaped = true;
+
+                    break;
+                case '"' when !escaped:
+                    quoted = !quoted;
+
+                    break;
+                case '=' when quoted:
+                    sb.Append(c);
+
+                    break;
+                case '=':
+                    name    = sb.ToString().ToLower(CultureInfo.CurrentCulture);
+                    sb      = new StringBuilder();
+                    inValue = true;
+
+                    break;
+                case ',' when quoted:
+                    sb.Append(c);
+
+                    break;
+                case ',' when inValue:
+                    value   = sb.ToString();
+                    sb      = new StringBuilder();
+                    inValue = false;
+
+                    if(string.IsNullOrEmpty(name) ||
+                       string.IsNullOrEmpty(value))
+                        continue;
+
+                    if(parsed.ContainsKey(name))
+                        parsed.Remove(name);
+
+                    parsed.Add(name, value);
+
+                    break;
+                default:
+                    if(escaped)
+                        switch(c)
+                        {
+                            case 'a':
+                                sb.Append('\a');
+                                escaped = false;
+
+                                break;
+                            case 'b':
+                                sb.Append('\b');
+                                escaped = false;
+
+                                break;
+                            case 'f':
+                                sb.Append('\f');
+                                escaped = false;
+
+                                break;
+                            case 'n':
+                                sb.Append('\n');
+                                escaped = false;
+
+                                break;
+                            case 'r':
+                                sb.Append('\r');
+                                escaped = false;
+
+                                break;
+                            case 't':
+                                sb.Append('\t');
+                                escaped = false;
+
+                                break;
+                            case 'v':
+                                sb.Append('\v');
+                                escaped = false;
+
+                                break;
+                            case '\\':
+                                sb.Append('\\');
+                                escaped = false;
+
+                                break;
+                            case '\'':
+                                sb.Append('\'');
+                                escaped = false;
+
+                                break;
+                            case '"':
+                                sb.Append('"');
+                                escaped = false;
+
+                                break;
+                            case '0':
+                                sb.Append('\0');
+                                escaped = false;
+
+                                break;
+                            case 'u':
+                                string unicode = options.Substring(index + 1, 4);
+                                sb.Append((char)int.Parse(unicode, NumberStyles.HexNumber));
+                                escaped =  false;
+                                index   += 4;
+
+                                break;
+                            case 'U':
+                                string longUnicode = options.Substring(index + 1, 8);
+                                sb.Append((char)int.Parse(longUnicode, NumberStyles.HexNumber));
+                                escaped =  false;
+                                index   += 8;
+
+                                break;
+                            default:
+                                sb.Append(c);
+                                escaped = false;
+
+                                break;
+                        }
+                    else
+                        sb.Append(c);
+
+                    break;
+            }
         }
+
+        if(!inValue)
+            return parsed;
+
+        value = sb.ToString();
+
+        if(string.IsNullOrEmpty(name) ||
+           string.IsNullOrEmpty(value))
+            return parsed;
+
+        if(parsed.ContainsKey(name))
+            parsed.Remove(name);
+
+        parsed.Add(name, value);
+
+        return parsed;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Partitions.cs b/Aaru.Core/Partitions.cs
index 001836012..64c47174f 100644
--- a/Aaru.Core/Partitions.cs
+++ b/Aaru.Core/Partitions.cs
@@ -37,169 +37,168 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+/// <summary>Implements methods for handling partitions</summary>
+public static class Partitions
 {
-    /// <summary>Implements methods for handling partitions</summary>
-    public static class Partitions
+    /// <summary>Gets a list of all partitions present in the specified image</summary>
+    /// <param name="image">Image</param>
+    /// <returns>List of found partitions</returns>
+    public static List<Partition> GetAll(IMediaImage image)
     {
-        /// <summary>Gets a list of all partitions present in the specified image</summary>
-        /// <param name="image">Image</param>
-        /// <returns>List of found partitions</returns>
-        public static List<Partition> GetAll(IMediaImage image)
-        {
-            PluginBase      plugins          = GetPluginBase.Instance;
-            List<Partition> foundPartitions  = new List<Partition>();
-            List<Partition> childPartitions  = new List<Partition>();
-            List<ulong>     checkedLocations = new List<ulong>();
+        PluginBase      plugins          = GetPluginBase.Instance;
+        List<Partition> foundPartitions  = new List<Partition>();
+        List<Partition> childPartitions  = new List<Partition>();
+        List<ulong>     checkedLocations = new List<ulong>();
 
-            var tapeImage          = image as ITapeImage;
-            var partitionableImage = image as IPartitionableMediaImage;
+        var tapeImage          = image as ITapeImage;
+        var partitionableImage = image as IPartitionableMediaImage;
 
-            // Create partitions from image files
-            if(tapeImage?.Files != null)
-                foreach(TapeFile tapeFile in tapeImage.Files)
-                {
-                    foreach(IPartition partitionPlugin in plugins.PartPluginsList.Values)
-                        if(partitionPlugin.GetInformation(image, out List<Partition> partitions, tapeFile.FirstBlock))
-                        {
-                            foundPartitions.AddRange(partitions);
-
-                            AaruConsole.DebugWriteLine("Partitions", "Found {0} @ {1}", partitionPlugin.Name,
-                                                       tapeFile.FirstBlock);
-                        }
-
-                    checkedLocations.Add(tapeFile.FirstBlock);
-                }
-
-            // Getting all partitions from device (e.g. tracks)
-            if(partitionableImage?.Partitions != null)
-                foreach(Partition imagePartition in partitionableImage.Partitions)
-                {
-                    foreach(IPartition partitionPlugin in plugins.PartPluginsList.Values)
-                        if(partitionPlugin.GetInformation(image, out List<Partition> partitions, imagePartition.Start))
-                        {
-                            foundPartitions.AddRange(partitions);
-
-                            AaruConsole.DebugWriteLine("Partitions", "Found {0} @ {1}", partitionPlugin.Name,
-                                                       imagePartition.Start);
-                        }
-
-                    checkedLocations.Add(imagePartition.Start);
-                }
-
-            // Getting all partitions at start of device
-            if(!checkedLocations.Contains(0))
+        // Create partitions from image files
+        if(tapeImage?.Files != null)
+            foreach(TapeFile tapeFile in tapeImage.Files)
             {
                 foreach(IPartition partitionPlugin in plugins.PartPluginsList.Values)
-                    if(partitionPlugin.GetInformation(image, out List<Partition> partitions, 0))
+                    if(partitionPlugin.GetInformation(image, out List<Partition> partitions, tapeFile.FirstBlock))
                     {
                         foundPartitions.AddRange(partitions);
-                        AaruConsole.DebugWriteLine("Partitions", "Found {0} @ 0", partitionPlugin.Name);
+
+                        AaruConsole.DebugWriteLine("Partitions", "Found {0} @ {1}", partitionPlugin.Name,
+                                                   tapeFile.FirstBlock);
                     }
 
-                checkedLocations.Add(0);
+                checkedLocations.Add(tapeFile.FirstBlock);
             }
 
-            while(foundPartitions.Count > 0)
+        // Getting all partitions from device (e.g. tracks)
+        if(partitionableImage?.Partitions != null)
+            foreach(Partition imagePartition in partitionableImage.Partitions)
             {
-                if(checkedLocations.Contains(foundPartitions[0].Start))
-                {
-                    childPartitions.Add(foundPartitions[0]);
-                    foundPartitions.RemoveAt(0);
-
-                    continue;
-                }
-
-                List<Partition> children = new List<Partition>();
-
                 foreach(IPartition partitionPlugin in plugins.PartPluginsList.Values)
-                {
-                    AaruConsole.DebugWriteLine("Partitions", "Trying {0} @ {1}", partitionPlugin.Name,
-                                               foundPartitions[0].Start);
+                    if(partitionPlugin.GetInformation(image, out List<Partition> partitions, imagePartition.Start))
+                    {
+                        foundPartitions.AddRange(partitions);
 
-                    if(!partitionPlugin.GetInformation(image, out List<Partition> partitions, foundPartitions[0].Start))
-                        continue;
+                        AaruConsole.DebugWriteLine("Partitions", "Found {0} @ {1}", partitionPlugin.Name,
+                                                   imagePartition.Start);
+                    }
 
-                    AaruConsole.DebugWriteLine("Partitions", "Found {0} @ {1}", partitionPlugin.Name,
-                                               foundPartitions[0].Start);
-
-                    children.AddRange(partitions);
-                }
-
-                checkedLocations.Add(foundPartitions[0].Start);
-
-                AaruConsole.DebugWriteLine("Partitions", "Got {0} children", children.Count);
-
-                if(children.Count > 0)
-                {
-                    foundPartitions.RemoveAt(0);
-
-                    foreach(Partition child in children)
-                        if(checkedLocations.Contains(child.Start))
-                            childPartitions.Add(child);
-                        else
-                            foundPartitions.Add(child);
-                }
-                else
-                {
-                    childPartitions.Add(foundPartitions[0]);
-                    foundPartitions.RemoveAt(0);
-                }
-
-                AaruConsole.DebugWriteLine("Partitions", "Got {0} parents", foundPartitions.Count);
-                AaruConsole.DebugWriteLine("Partitions", "Got {0} partitions", childPartitions.Count);
+                checkedLocations.Add(imagePartition.Start);
             }
 
-            // Be sure that device partitions are not excluded if not mapped by any scheme...
-            if(!(tapeImage is null))
-            {
-                List<ulong> startLocations =
-                    childPartitions.Select(detectedPartition => detectedPartition.Start).ToList();
-
-                if(tapeImage.Files != null)
-                    childPartitions.AddRange(tapeImage.Files.Where(f => !startLocations.Contains(f.FirstBlock)).
-                                                       Select(tapeFile => new Partition
-                                                       {
-                                                           Start    = tapeFile.FirstBlock,
-                                                           Length   = tapeFile.LastBlock - tapeFile.FirstBlock + 1,
-                                                           Sequence = tapeFile.File
-                                                       }));
-            }
-
-            if(!(partitionableImage is null))
-            {
-                List<ulong> startLocations =
-                    childPartitions.Select(detectedPartition => detectedPartition.Start).ToList();
-
-                if(partitionableImage.Partitions != null)
-                    childPartitions.AddRange(partitionableImage.Partitions.Where(imagePartition =>
-                                                 !startLocations.Contains(imagePartition.Start)));
-            }
-
-            Partition[] childArray = childPartitions.OrderBy(part => part.Start).ThenBy(part => part.Length).
-                                                     ThenBy(part => part.Scheme).ToArray();
-
-            for(long i = 0; i < childArray.LongLength; i++)
-                childArray[i].Sequence = (ulong)i;
-
-            return childArray.ToList();
-        }
-
-        /// <summary>Adds all partition schemes from the specified list of partitions to statistics</summary>
-        /// <param name="partitions">List of partitions</param>
-        public static void AddSchemesToStats(List<Partition> partitions)
+        // Getting all partitions at start of device
+        if(!checkedLocations.Contains(0))
         {
-            if(partitions       == null ||
-               partitions.Count == 0)
-                return;
+            foreach(IPartition partitionPlugin in plugins.PartPluginsList.Values)
+                if(partitionPlugin.GetInformation(image, out List<Partition> partitions, 0))
+                {
+                    foundPartitions.AddRange(partitions);
+                    AaruConsole.DebugWriteLine("Partitions", "Found {0} @ 0", partitionPlugin.Name);
+                }
 
-            List<string> schemes = new List<string>();
-
-            foreach(Partition part in partitions.Where(part => !schemes.Contains(part.Scheme)))
-                schemes.Add(part.Scheme);
-
-            foreach(string scheme in schemes)
-                Statistics.AddPartition(scheme);
+            checkedLocations.Add(0);
         }
+
+        while(foundPartitions.Count > 0)
+        {
+            if(checkedLocations.Contains(foundPartitions[0].Start))
+            {
+                childPartitions.Add(foundPartitions[0]);
+                foundPartitions.RemoveAt(0);
+
+                continue;
+            }
+
+            List<Partition> children = new List<Partition>();
+
+            foreach(IPartition partitionPlugin in plugins.PartPluginsList.Values)
+            {
+                AaruConsole.DebugWriteLine("Partitions", "Trying {0} @ {1}", partitionPlugin.Name,
+                                           foundPartitions[0].Start);
+
+                if(!partitionPlugin.GetInformation(image, out List<Partition> partitions, foundPartitions[0].Start))
+                    continue;
+
+                AaruConsole.DebugWriteLine("Partitions", "Found {0} @ {1}", partitionPlugin.Name,
+                                           foundPartitions[0].Start);
+
+                children.AddRange(partitions);
+            }
+
+            checkedLocations.Add(foundPartitions[0].Start);
+
+            AaruConsole.DebugWriteLine("Partitions", "Got {0} children", children.Count);
+
+            if(children.Count > 0)
+            {
+                foundPartitions.RemoveAt(0);
+
+                foreach(Partition child in children)
+                    if(checkedLocations.Contains(child.Start))
+                        childPartitions.Add(child);
+                    else
+                        foundPartitions.Add(child);
+            }
+            else
+            {
+                childPartitions.Add(foundPartitions[0]);
+                foundPartitions.RemoveAt(0);
+            }
+
+            AaruConsole.DebugWriteLine("Partitions", "Got {0} parents", foundPartitions.Count);
+            AaruConsole.DebugWriteLine("Partitions", "Got {0} partitions", childPartitions.Count);
+        }
+
+        // Be sure that device partitions are not excluded if not mapped by any scheme...
+        if(!(tapeImage is null))
+        {
+            List<ulong> startLocations =
+                childPartitions.Select(detectedPartition => detectedPartition.Start).ToList();
+
+            if(tapeImage.Files != null)
+                childPartitions.AddRange(tapeImage.Files.Where(f => !startLocations.Contains(f.FirstBlock)).
+                                                   Select(tapeFile => new Partition
+                                                   {
+                                                       Start    = tapeFile.FirstBlock,
+                                                       Length   = tapeFile.LastBlock - tapeFile.FirstBlock + 1,
+                                                       Sequence = tapeFile.File
+                                                   }));
+        }
+
+        if(!(partitionableImage is null))
+        {
+            List<ulong> startLocations =
+                childPartitions.Select(detectedPartition => detectedPartition.Start).ToList();
+
+            if(partitionableImage.Partitions != null)
+                childPartitions.AddRange(partitionableImage.Partitions.Where(imagePartition =>
+                                                                                 !startLocations.Contains(imagePartition.Start)));
+        }
+
+        Partition[] childArray = childPartitions.OrderBy(part => part.Start).ThenBy(part => part.Length).
+                                                 ThenBy(part => part.Scheme).ToArray();
+
+        for(long i = 0; i < childArray.LongLength; i++)
+            childArray[i].Sequence = (ulong)i;
+
+        return childArray.ToList();
+    }
+
+    /// <summary>Adds all partition schemes from the specified list of partitions to statistics</summary>
+    /// <param name="partitions">List of partitions</param>
+    public static void AddSchemesToStats(List<Partition> partitions)
+    {
+        if(partitions       == null ||
+           partitions.Count == 0)
+            return;
+
+        List<string> schemes = new List<string>();
+
+        foreach(Partition part in partitions.Where(part => !schemes.Contains(part.Scheme)))
+            schemes.Add(part.Scheme);
+
+        foreach(string scheme in schemes)
+            Statistics.AddPartition(scheme);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/PrintScsiModePages.cs b/Aaru.Core/PrintScsiModePages.cs
index 4794efa9a..06df018f7 100644
--- a/Aaru.Core/PrintScsiModePages.cs
+++ b/Aaru.Core/PrintScsiModePages.cs
@@ -35,344 +35,343 @@ using Aaru.Console;
 using Aaru.Decoders.SCSI;
 using Aaru.Helpers;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+/// <summary>Prints all SCSI MODE pages</summary>
+public static class PrintScsiModePages
 {
     /// <summary>Prints all SCSI MODE pages</summary>
-    public static class PrintScsiModePages
+    /// <param name="decMode">Decoded SCSI MODE SENSE</param>
+    /// <param name="devType">SCSI Peripheral Type</param>
+    /// <param name="vendorId">SCSI vendor identification</param>
+    public static void Print(Modes.DecodedMode decMode, PeripheralDeviceTypes devType, byte[] vendorId)
     {
-        /// <summary>Prints all SCSI MODE pages</summary>
-        /// <param name="decMode">Decoded SCSI MODE SENSE</param>
-        /// <param name="devType">SCSI Peripheral Type</param>
-        /// <param name="vendorId">SCSI vendor identification</param>
-        public static void Print(Modes.DecodedMode decMode, PeripheralDeviceTypes devType, byte[] vendorId)
-        {
-            AaruConsole.WriteLine(Modes.PrettifyModeHeader(decMode.Header, devType));
+        AaruConsole.WriteLine(Modes.PrettifyModeHeader(decMode.Header, devType));
 
-            if(decMode.Pages == null)
-                return;
+        if(decMode.Pages == null)
+            return;
 
-            foreach(Modes.ModePage page in decMode.Pages)
+        foreach(Modes.ModePage page in decMode.Pages)
 
-                //AaruConsole.WriteLine("Page {0:X2}h subpage {1:X2}h is {2} bytes long", page.Page, page.Subpage, page.PageResponse.Length);
-                switch(page.Page)
+            //AaruConsole.WriteLine("Page {0:X2}h subpage {1:X2}h is {2} bytes long", page.Page, page.Subpage, page.PageResponse.Length);
+            switch(page.Page)
+            {
+                case 0x00:
                 {
-                    case 0x00:
-                    {
-                        if(devType      == PeripheralDeviceTypes.MultiMediaDevice &&
-                           page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_00_SFF(page.PageResponse));
-                        else
-                        {
-                            if(page.Subpage != 0)
-                                AaruConsole.WriteLine("Found unknown vendor mode page {0:X2}h subpage {1:X2}h",
-                                                      page.Page, page.Subpage);
-                            else
-                                AaruConsole.WriteLine("Found unknown vendor mode page {0:X2}h", page.Page);
-                        }
-
-                        break;
-                    }
-                    case 0x01:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
-                                                      ? Modes.PrettifyModePage_01_MMC(page.PageResponse)
-                                                      : Modes.PrettifyModePage_01(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x02:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_02(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x03:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_03(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x04:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_04(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x05:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_05(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x06:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_06(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x07:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
-                                                      ? Modes.PrettifyModePage_07_MMC(page.PageResponse)
-                                                      : Modes.PrettifyModePage_07(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x08:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_08(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x0A:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_0A(page.PageResponse));
-                        else if(page.Subpage == 1)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_0A_S01(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x0B:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_0B(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x0D:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_0D(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x0E:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_0E(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x0F:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_0F(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x10:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(devType == PeripheralDeviceTypes.SequentialAccess
-                                                      ? Modes.PrettifyModePage_10_SSC(page.PageResponse)
-                                                      : Modes.PrettifyModePage_10(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x11:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_11(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x12:
-                    case 0x13:
-                    case 0x14:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_12_13_14(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x1A:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_1A(page.PageResponse));
-                        else if(page.Subpage == 1)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_1A_S01(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x1B:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_1B(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x1C:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
-                                                      ? Modes.PrettifyModePage_1C_SFF(page.PageResponse)
-                                                      : Modes.PrettifyModePage_1C(page.PageResponse));
-                        else if(page.Subpage == 1)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_1C_S01(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x1D:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_1D(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x21:
-                    {
-                        if(StringHandlers.CToString(vendorId).Trim() == "CERTANCE")
-                            AaruConsole.WriteLine(Modes.PrettifyCertanceModePage_21(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x22:
-                    {
-                        if(StringHandlers.CToString(vendorId).Trim() == "CERTANCE")
-                            AaruConsole.WriteLine(Modes.PrettifyCertanceModePage_22(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x24:
-                    {
-                        if(StringHandlers.CToString(vendorId).Trim() == "IBM")
-                            AaruConsole.WriteLine(Modes.PrettifyIBMModePage_24(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x2A:
-                    {
-                        if(page.Subpage == 0)
-                            AaruConsole.WriteLine(Modes.PrettifyModePage_2A(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x2F:
-                    {
-                        if(StringHandlers.CToString(vendorId).Trim() == "IBM")
-                            AaruConsole.WriteLine(Modes.PrettifyIBMModePage_2F(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x30:
-                    {
-                        if(Modes.IsAppleModePage_30(page.PageResponse))
-                            AaruConsole.WriteLine("Drive identifies as Apple OEM drive");
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x3B:
-                    {
-                        if(StringHandlers.CToString(vendorId).Trim() == "HP")
-                            AaruConsole.WriteLine(Modes.PrettifyHPModePage_3B(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x3C:
-                    {
-                        if(StringHandlers.CToString(vendorId).Trim() == "HP")
-                            AaruConsole.WriteLine(Modes.PrettifyHPModePage_3C(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x3D:
-                    {
-                        if(StringHandlers.CToString(vendorId).Trim() == "IBM")
-                            AaruConsole.WriteLine(Modes.PrettifyIBMModePage_3D(page.PageResponse));
-                        else if(StringHandlers.CToString(vendorId).Trim() == "HP")
-                            AaruConsole.WriteLine(Modes.PrettifyHPModePage_3D(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    case 0x3E:
-                    {
-                        if(StringHandlers.CToString(vendorId).Trim() == "FUJITSU")
-                            AaruConsole.WriteLine(Modes.PrettifyFujitsuModePage_3E(page.PageResponse));
-                        else if(StringHandlers.CToString(vendorId).Trim() == "HP")
-                            AaruConsole.WriteLine(Modes.PrettifyHPModePage_3E(page.PageResponse));
-                        else
-                            goto default;
-
-                        break;
-                    }
-                    default:
+                    if(devType      == PeripheralDeviceTypes.MultiMediaDevice &&
+                       page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_00_SFF(page.PageResponse));
+                    else
                     {
                         if(page.Subpage != 0)
-                            AaruConsole.WriteLine("Found unknown mode page {0:X2}h subpage {1:X2}h", page.Page,
-                                                  page.Subpage);
+                            AaruConsole.WriteLine("Found unknown vendor mode page {0:X2}h subpage {1:X2}h",
+                                                  page.Page, page.Subpage);
                         else
-                            AaruConsole.WriteLine("Found unknown mode page {0:X2}h", page.Page);
-
-                        break;
+                            AaruConsole.WriteLine("Found unknown vendor mode page {0:X2}h", page.Page);
                     }
+
+                    break;
                 }
-        }
+                case 0x01:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
+                                                  ? Modes.PrettifyModePage_01_MMC(page.PageResponse)
+                                                  : Modes.PrettifyModePage_01(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x02:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_02(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x03:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_03(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x04:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_04(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x05:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_05(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x06:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_06(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x07:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
+                                                  ? Modes.PrettifyModePage_07_MMC(page.PageResponse)
+                                                  : Modes.PrettifyModePage_07(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x08:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_08(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x0A:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_0A(page.PageResponse));
+                    else if(page.Subpage == 1)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_0A_S01(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x0B:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_0B(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x0D:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_0D(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x0E:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_0E(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x0F:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_0F(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x10:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(devType == PeripheralDeviceTypes.SequentialAccess
+                                                  ? Modes.PrettifyModePage_10_SSC(page.PageResponse)
+                                                  : Modes.PrettifyModePage_10(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x11:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_11(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x12:
+                case 0x13:
+                case 0x14:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_12_13_14(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x1A:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_1A(page.PageResponse));
+                    else if(page.Subpage == 1)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_1A_S01(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x1B:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_1B(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x1C:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(devType == PeripheralDeviceTypes.MultiMediaDevice
+                                                  ? Modes.PrettifyModePage_1C_SFF(page.PageResponse)
+                                                  : Modes.PrettifyModePage_1C(page.PageResponse));
+                    else if(page.Subpage == 1)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_1C_S01(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x1D:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_1D(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x21:
+                {
+                    if(StringHandlers.CToString(vendorId).Trim() == "CERTANCE")
+                        AaruConsole.WriteLine(Modes.PrettifyCertanceModePage_21(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x22:
+                {
+                    if(StringHandlers.CToString(vendorId).Trim() == "CERTANCE")
+                        AaruConsole.WriteLine(Modes.PrettifyCertanceModePage_22(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x24:
+                {
+                    if(StringHandlers.CToString(vendorId).Trim() == "IBM")
+                        AaruConsole.WriteLine(Modes.PrettifyIBMModePage_24(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x2A:
+                {
+                    if(page.Subpage == 0)
+                        AaruConsole.WriteLine(Modes.PrettifyModePage_2A(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x2F:
+                {
+                    if(StringHandlers.CToString(vendorId).Trim() == "IBM")
+                        AaruConsole.WriteLine(Modes.PrettifyIBMModePage_2F(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x30:
+                {
+                    if(Modes.IsAppleModePage_30(page.PageResponse))
+                        AaruConsole.WriteLine("Drive identifies as Apple OEM drive");
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x3B:
+                {
+                    if(StringHandlers.CToString(vendorId).Trim() == "HP")
+                        AaruConsole.WriteLine(Modes.PrettifyHPModePage_3B(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x3C:
+                {
+                    if(StringHandlers.CToString(vendorId).Trim() == "HP")
+                        AaruConsole.WriteLine(Modes.PrettifyHPModePage_3C(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x3D:
+                {
+                    if(StringHandlers.CToString(vendorId).Trim() == "IBM")
+                        AaruConsole.WriteLine(Modes.PrettifyIBMModePage_3D(page.PageResponse));
+                    else if(StringHandlers.CToString(vendorId).Trim() == "HP")
+                        AaruConsole.WriteLine(Modes.PrettifyHPModePage_3D(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                case 0x3E:
+                {
+                    if(StringHandlers.CToString(vendorId).Trim() == "FUJITSU")
+                        AaruConsole.WriteLine(Modes.PrettifyFujitsuModePage_3E(page.PageResponse));
+                    else if(StringHandlers.CToString(vendorId).Trim() == "HP")
+                        AaruConsole.WriteLine(Modes.PrettifyHPModePage_3E(page.PageResponse));
+                    else
+                        goto default;
+
+                    break;
+                }
+                default:
+                {
+                    if(page.Subpage != 0)
+                        AaruConsole.WriteLine("Found unknown mode page {0:X2}h subpage {1:X2}h", page.Page,
+                                              page.Subpage);
+                    else
+                        AaruConsole.WriteLine("Found unknown mode page {0:X2}h", page.Page);
+
+                    break;
+                }
+            }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Remote.cs b/Aaru.Core/Remote.cs
index 0ca2fa390..8b8bd2a37 100644
--- a/Aaru.Core/Remote.cs
+++ b/Aaru.Core/Remote.cs
@@ -49,507 +49,506 @@ using Spectre.Console;
 using CdOffset = Aaru.Database.Models.CdOffset;
 using Version = Aaru.CommonTypes.Metadata.Version;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+/// <summary>Handles connections to Aaru.Server</summary>
+public static class Remote
 {
-    /// <summary>Handles connections to Aaru.Server</summary>
-    public static class Remote
+    /// <summary>Submits a device report</summary>
+    /// <param name="report">Device report</param>
+    public static void SubmitReport(DeviceReportV2 report)
     {
-        /// <summary>Submits a device report</summary>
-        /// <param name="report">Device report</param>
-        public static void SubmitReport(DeviceReportV2 report)
+        var submitThread = new Thread(() =>
         {
-            var submitThread = new Thread(() =>
+            Spectre.ProgressSingleSpinner(ctx =>
             {
-                Spectre.ProgressSingleSpinner(ctx =>
+                ctx.AddTask("Uploading device report").IsIndeterminate();
+
+                try
                 {
-                    ctx.AddTask("Uploading device report").IsIndeterminate();
+                    string json = JsonConvert.SerializeObject(report, Formatting.Indented,
+                                                              new JsonSerializerSettings
+                                                              {
+                                                                  NullValueHandling = NullValueHandling.Ignore
+                                                              });
 
-                    try
-                    {
-                        string json = JsonConvert.SerializeObject(report, Formatting.Indented,
-                                                                  new JsonSerializerSettings
-                                                                  {
-                                                                      NullValueHandling = NullValueHandling.Ignore
-                                                                  });
+                    byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
+                    var    request   = WebRequest.Create("https://www.aaru.app/api/uploadreportv2");
+                    ((HttpWebRequest)request).UserAgent = $"Aaru {typeof(Version).Assembly.GetName().Version}";
+                    request.Method                      = "POST";
+                    request.ContentLength               = jsonBytes.Length;
+                    request.ContentType                 = "application/json";
+                    Stream reqStream = request.GetRequestStream();
+                    reqStream.Write(jsonBytes, 0, jsonBytes.Length);
+                    reqStream.Close();
+                    WebResponse response = request.GetResponse();
 
-                        byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
-                        var    request   = WebRequest.Create("https://www.aaru.app/api/uploadreportv2");
-                        ((HttpWebRequest)request).UserAgent = $"Aaru {typeof(Version).Assembly.GetName().Version}";
-                        request.Method                      = "POST";
-                        request.ContentLength               = jsonBytes.Length;
-                        request.ContentType                 = "application/json";
-                        Stream reqStream = request.GetRequestStream();
-                        reqStream.Write(jsonBytes, 0, jsonBytes.Length);
-                        reqStream.Close();
-                        WebResponse response = request.GetResponse();
+                    if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK)
+                        return;
 
-                        if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK)
-                            return;
+                    Stream data   = response.GetResponseStream();
+                    var    reader = new StreamReader(data ?? throw new InvalidOperationException());
 
-                        Stream data   = response.GetResponseStream();
-                        var    reader = new StreamReader(data ?? throw new InvalidOperationException());
+                    reader.ReadToEnd();
+                    data.Close();
+                    response.Close();
+                }
+                catch(WebException)
+                {
+                    // Can't connect to the server, do nothing
+                }
 
-                        reader.ReadToEnd();
-                        data.Close();
-                        response.Close();
-                    }
-                    catch(WebException)
-                    {
-                        // Can't connect to the server, do nothing
-                    }
-
-                    // ReSharper disable once RedundantCatchClause
-                    catch
-                    {
-                    #if DEBUG
-                        if(Debugger.IsAttached)
-                            throw;
-                    #endif
-                    }
-                });
+                // ReSharper disable once RedundantCatchClause
+                catch
+                {
+                #if DEBUG
+                    if(Debugger.IsAttached)
+                        throw;
+                #endif
+                }
             });
+        });
 
-            submitThread.Start();
-        }
+        submitThread.Start();
+    }
 
-        /// <summary>Updates the main database</summary>
-        /// <param name="create">If <c>true</c> creates the database from scratch, otherwise updates an existing database</param>
-        public static void UpdateMainDatabase(bool create)
+    /// <summary>Updates the main database</summary>
+    /// <param name="create">If <c>true</c> creates the database from scratch, otherwise updates an existing database</param>
+    public static void UpdateMainDatabase(bool create)
+    {
+        var mctx = AaruContext.Create(Settings.Settings.MainDbPath);
+
+        if(create)
         {
-            var mctx = AaruContext.Create(Settings.Settings.MainDbPath);
+            mctx.Database.EnsureCreated();
+
+            mctx.Database.
+                 ExecuteSqlRaw("CREATE TABLE IF NOT EXISTS \"__EFMigrationsHistory\" (\"MigrationId\" TEXT PRIMARY KEY, \"ProductVersion\" TEXT)");
+
+            foreach(string migration in mctx.Database.GetPendingMigrations())
+            {
+                mctx.Database.
+                     ExecuteSqlRaw($"INSERT INTO \"__EFMigrationsHistory\" (MigrationId, ProductVersion) VALUES ('{migration}', '0.0.0')");
+            }
+        }
+        else
+            mctx.Database.Migrate();
+
+        mctx.SaveChanges();
+
+        try
+        {
+            long     lastUpdate = 0;
+            DateTime latest     = DateTime.MinValue;
+
+            if(!create)
+            {
+                List<DateTime> latestAll = new();
+
+                if(mctx.UsbVendors.Any())
+                    latestAll.Add(mctx.UsbVendors.Max(v => v.ModifiedWhen));
+
+                if(mctx.UsbProducts.Any())
+                    latestAll.Add(mctx.UsbProducts.Max(p => p.ModifiedWhen));
+
+                if(mctx.CdOffsets.Any())
+                    latestAll.Add(mctx.CdOffsets.Max(o => o.ModifiedWhen));
+
+                if(mctx.Devices.Any())
+                    latestAll.Add(mctx.Devices.Max(d => d.LastSynchronized));
+
+                if(latestAll.Any())
+                {
+                    latest     = latestAll.Max(t => t);
+                    lastUpdate = (latest.ToFileTimeUtc() - new DateTime(1970, 1, 1).ToFileTimeUtc()) / 10000000;
+                }
+            }
+
+            if(lastUpdate == 0)
+            {
+                create = true;
+                AaruConsole.WriteLine("Creating main database");
+            }
+            else
+            {
+                AaruConsole.WriteLine("Updating main database");
+                AaruConsole.WriteLine("Last update: {0}", latest);
+            }
+
+            DateTime updateStart = DateTime.UtcNow;
+
+            var request = WebRequest.Create($"https://www.aaru.app/api/update?timestamp={lastUpdate}");
+            ((HttpWebRequest)request).UserAgent = $"Aaru {typeof(Version).Assembly.GetName().Version}";
+            request.Method                      = "GET";
+            request.ContentType                 = "application/json";
+            WebResponse response = request.GetResponse();
+
+            if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK)
+            {
+                AaruConsole.ErrorWriteLine("Error {0} when trying to get updated entities.",
+                                           ((HttpWebResponse)response).StatusCode);
+
+                return;
+            }
+
+            Stream  data   = response.GetResponseStream();
+            var     reader = new StreamReader(data ?? throw new InvalidOperationException());
+            SyncDto sync   = JsonConvert.DeserializeObject<SyncDto>(reader.ReadToEnd()) ?? new SyncDto();
 
             if(create)
             {
-                mctx.Database.EnsureCreated();
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask task = ctx.AddTask("Adding USB vendors");
+                                task.MaxValue = sync.UsbVendors.Count;
 
-                mctx.Database.
-                     ExecuteSqlRaw("CREATE TABLE IF NOT EXISTS \"__EFMigrationsHistory\" (\"MigrationId\" TEXT PRIMARY KEY, \"ProductVersion\" TEXT)");
+                                foreach(UsbVendorDto vendor in sync.UsbVendors)
+                                {
+                                    task.Increment(1);
+                                    mctx.UsbVendors.Add(new UsbVendor(vendor.VendorId, vendor.Vendor));
+                                }
+                            });
 
-                foreach(string migration in mctx.Database.GetPendingMigrations())
-                {
-                    mctx.Database.
-                         ExecuteSqlRaw($"INSERT INTO \"__EFMigrationsHistory\" (MigrationId, ProductVersion) VALUES ('{migration}', '0.0.0')");
-                }
+                AaruConsole.WriteLine("Added {0} usb vendors", sync.UsbVendors.Count);
+
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask task = ctx.AddTask("Adding USB products");
+                                task.MaxValue = sync.UsbProducts.Count;
+
+                                foreach(UsbProductDto product in sync.UsbProducts)
+                                {
+                                    task.Increment(1);
+
+                                    mctx.UsbProducts.Add(new UsbProduct(product.VendorId, product.ProductId,
+                                                                        product.Product));
+                                }
+                            });
+
+                AaruConsole.WriteLine("Added {0} usb products", sync.UsbProducts.Count);
+
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask task = ctx.AddTask("Adding CompactDisc read offsets");
+                                task.MaxValue = sync.Offsets.Count;
+
+                                foreach(CdOffsetDto offset in sync.Offsets)
+                                {
+                                    task.Increment(1);
+
+                                    mctx.CdOffsets.Add(new CdOffset(offset)
+                                    {
+                                        Id = offset.Id
+                                    });
+                                }
+                            });
+
+                AaruConsole.WriteLine("Added {0} CompactDisc read offsets", sync.Offsets.Count);
+
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask task = ctx.AddTask("Adding known devices");
+                                task.MaxValue = sync.Devices.Count;
+
+                                foreach(DeviceDto device in sync.Devices)
+
+                                {
+                                    task.Increment(1);
+
+                                    mctx.Devices.Add(new Device(device)
+                                    {
+                                        Id = device.Id
+                                    });
+                                }
+                            });
+
+                AaruConsole.WriteLine("Added {0} known devices", sync.Devices.Count);
+
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask task = ctx.AddTask("Adding known iNES/NES 2.0 headers");
+                                task.MaxValue = sync.NesHeaders?.Count ?? 0;
+
+                                foreach(NesHeaderDto header in sync.NesHeaders ?? new List<NesHeaderDto>())
+                                {
+                                    task.Increment(1);
+
+                                    mctx.NesHeaders.Add(new NesHeaderInfo
+                                    {
+                                        Id                     = header.Id,
+                                        AddedWhen              = DateTime.UtcNow,
+                                        BatteryPresent         = header.BatteryPresent,
+                                        ConsoleType            = header.ConsoleType,
+                                        DefaultExpansionDevice = header.DefaultExpansionDevice,
+                                        ExtendedConsoleType    = header.ExtendedConsoleType,
+                                        FourScreenMode         = header.FourScreenMode,
+                                        Mapper                 = header.Mapper,
+                                        ModifiedWhen           = DateTime.UtcNow,
+                                        NametableMirroring     = header.NametableMirroring,
+                                        Sha256                 = header.Sha256,
+                                        Submapper              = header.Submapper,
+                                        TimingMode             = header.TimingMode,
+                                        VsHardwareType         = header.VsHardwareType,
+                                        VsPpuType              = header.VsPpuType
+                                    });
+                                }
+                            });
+
+                AaruConsole.WriteLine("Added {0} known iNES/NES 2.0 headers", sync.NesHeaders?.Count ?? 0);
             }
             else
-                mctx.Database.Migrate();
-
-            mctx.SaveChanges();
-
-            try
             {
-                long     lastUpdate = 0;
-                DateTime latest     = DateTime.MinValue;
+                long addedVendors       = 0;
+                long addedProducts      = 0;
+                long addedOffsets       = 0;
+                long addedDevices       = 0;
+                long addedNesHeaders    = 0;
+                long modifiedVendors    = 0;
+                long modifiedProducts   = 0;
+                long modifiedOffsets    = 0;
+                long modifiedDevices    = 0;
+                long modifiedNesHeaders = 0;
 
-                if(!create)
-                {
-                    List<DateTime> latestAll = new();
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask task = ctx.AddTask("Updating USB vendors");
+                                task.MaxValue = sync.UsbVendors.Count;
 
-                    if(mctx.UsbVendors.Any())
-                        latestAll.Add(mctx.UsbVendors.Max(v => v.ModifiedWhen));
-
-                    if(mctx.UsbProducts.Any())
-                        latestAll.Add(mctx.UsbProducts.Max(p => p.ModifiedWhen));
-
-                    if(mctx.CdOffsets.Any())
-                        latestAll.Add(mctx.CdOffsets.Max(o => o.ModifiedWhen));
-
-                    if(mctx.Devices.Any())
-                        latestAll.Add(mctx.Devices.Max(d => d.LastSynchronized));
-
-                    if(latestAll.Any())
-                    {
-                        latest     = latestAll.Max(t => t);
-                        lastUpdate = (latest.ToFileTimeUtc() - new DateTime(1970, 1, 1).ToFileTimeUtc()) / 10000000;
-                    }
-                }
-
-                if(lastUpdate == 0)
-                {
-                    create = true;
-                    AaruConsole.WriteLine("Creating main database");
-                }
-                else
-                {
-                    AaruConsole.WriteLine("Updating main database");
-                    AaruConsole.WriteLine("Last update: {0}", latest);
-                }
-
-                DateTime updateStart = DateTime.UtcNow;
-
-                var request = WebRequest.Create($"https://www.aaru.app/api/update?timestamp={lastUpdate}");
-                ((HttpWebRequest)request).UserAgent = $"Aaru {typeof(Version).Assembly.GetName().Version}";
-                request.Method                      = "GET";
-                request.ContentType                 = "application/json";
-                WebResponse response = request.GetResponse();
-
-                if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK)
-                {
-                    AaruConsole.ErrorWriteLine("Error {0} when trying to get updated entities.",
-                                               ((HttpWebResponse)response).StatusCode);
-
-                    return;
-                }
-
-                Stream  data   = response.GetResponseStream();
-                var     reader = new StreamReader(data ?? throw new InvalidOperationException());
-                SyncDto sync   = JsonConvert.DeserializeObject<SyncDto>(reader.ReadToEnd()) ?? new SyncDto();
-
-                if(create)
-                {
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
+                                foreach(UsbVendorDto vendor in sync.UsbVendors)
                                 {
-                                    ProgressTask task = ctx.AddTask("Adding USB vendors");
-                                    task.MaxValue = sync.UsbVendors.Count;
+                                    task.Increment(1);
 
-                                    foreach(UsbVendorDto vendor in sync.UsbVendors)
+                                    UsbVendor existing =
+                                        mctx.UsbVendors.FirstOrDefault(v => v.Id == vendor.VendorId);
+
+                                    if(existing != null)
                                     {
-                                        task.Increment(1);
+                                        modifiedVendors++;
+                                        existing.Vendor       = vendor.Vendor;
+                                        existing.ModifiedWhen = updateStart;
+                                        mctx.UsbVendors.Update(existing);
+                                    }
+                                    else
+                                    {
+                                        addedVendors++;
                                         mctx.UsbVendors.Add(new UsbVendor(vendor.VendorId, vendor.Vendor));
                                     }
-                                });
+                                }
+                            });
 
-                    AaruConsole.WriteLine("Added {0} usb vendors", sync.UsbVendors.Count);
+                AaruConsole.WriteLine("Added {0} USB vendors", addedVendors);
+                AaruConsole.WriteLine("Modified {0} USB vendors", modifiedVendors);
 
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask task = ctx.AddTask("Updating USB products");
+                                task.MaxValue = sync.UsbVendors.Count;
+
+                                foreach(UsbProductDto product in sync.UsbProducts)
                                 {
-                                    ProgressTask task = ctx.AddTask("Adding USB products");
-                                    task.MaxValue = sync.UsbProducts.Count;
+                                    task.Increment(1);
 
-                                    foreach(UsbProductDto product in sync.UsbProducts)
+                                    UsbProduct existing =
+                                        mctx.UsbProducts.FirstOrDefault(p => p.VendorId  == product.VendorId &&
+                                                                             p.ProductId == product.ProductId);
+
+                                    if(existing != null)
                                     {
-                                        task.Increment(1);
+                                        modifiedProducts++;
+                                        existing.Product      = product.Product;
+                                        existing.ModifiedWhen = updateStart;
+                                        mctx.UsbProducts.Update(existing);
+                                    }
+                                    else
+                                    {
+                                        addedProducts++;
 
                                         mctx.UsbProducts.Add(new UsbProduct(product.VendorId, product.ProductId,
                                                                             product.Product));
                                     }
-                                });
+                                }
+                            });
 
-                    AaruConsole.WriteLine("Added {0} usb products", sync.UsbProducts.Count);
+                AaruConsole.WriteLine("Added {0} USB products", addedProducts);
+                AaruConsole.WriteLine("Modified {0} USB products", modifiedProducts);
 
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask task = ctx.AddTask("Updating CompactDisc read offsets");
+                                task.MaxValue = sync.Offsets.Count;
+
+                                foreach(CdOffsetDto offset in sync.Offsets)
                                 {
-                                    ProgressTask task = ctx.AddTask("Adding CompactDisc read offsets");
-                                    task.MaxValue = sync.Offsets.Count;
+                                    CdOffset existing = mctx.CdOffsets.FirstOrDefault(o => o.Id == offset.Id);
+                                    task.Increment(1);
 
-                                    foreach(CdOffsetDto offset in sync.Offsets)
+                                    if(existing != null)
                                     {
-                                        task.Increment(1);
+                                        modifiedOffsets++;
+                                        existing.Agreement    = offset.Agreement;
+                                        existing.Manufacturer = offset.Manufacturer;
+                                        existing.Model        = offset.Model;
+                                        existing.Submissions  = offset.Submissions;
+                                        existing.Offset       = offset.Offset;
+                                        existing.ModifiedWhen = updateStart;
+                                        mctx.CdOffsets.Update(existing);
+                                    }
+                                    else
+                                    {
+                                        addedOffsets++;
 
                                         mctx.CdOffsets.Add(new CdOffset(offset)
                                         {
                                             Id = offset.Id
                                         });
                                     }
-                                });
+                                }
+                            });
 
-                    AaruConsole.WriteLine("Added {0} CompactDisc read offsets", sync.Offsets.Count);
+                AaruConsole.WriteLine("Added {0} CompactDisc read offsets", addedOffsets);
+                AaruConsole.WriteLine("Modified {0} CompactDisc read offsets", modifiedOffsets);
 
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask task = ctx.AddTask("Updating known devices");
+                                task.MaxValue = sync.Offsets.Count;
+
+                                foreach(DeviceDto device in sync.Devices)
                                 {
-                                    ProgressTask task = ctx.AddTask("Adding known devices");
-                                    task.MaxValue = sync.Devices.Count;
-
-                                    foreach(DeviceDto device in sync.Devices)
+                                    task.Increment(1);
+                                    Device existing = mctx.Devices.FirstOrDefault(d => d.Id == device.Id);
 
+                                    if(existing != null)
                                     {
-                                        task.Increment(1);
+                                        modifiedDevices++;
+
+                                        mctx.Remove(existing);
+
+                                        existing = new Device(device)
+                                        {
+                                            Id                         = device.Id,
+                                            OptimalMultipleSectorsRead = device.OptimalMultipleSectorsRead,
+                                            CanReadGdRomUsingSwapDisc  = device.CanReadGdRomUsingSwapDisc
+                                        };
+
+                                        mctx.Devices.Add(existing);
+                                    }
+                                    else
+                                    {
+                                        addedDevices++;
 
                                         mctx.Devices.Add(new Device(device)
                                         {
-                                            Id = device.Id
+                                            Id                         = device.Id,
+                                            OptimalMultipleSectorsRead = device.OptimalMultipleSectorsRead,
+                                            CanReadGdRomUsingSwapDisc  = device.CanReadGdRomUsingSwapDisc
                                         });
                                     }
-                                });
+                                }
+                            });
 
-                    AaruConsole.WriteLine("Added {0} known devices", sync.Devices.Count);
+                AaruConsole.WriteLine("Added {0} known devices", addedDevices);
+                AaruConsole.WriteLine("Modified {0} known devices", modifiedDevices);
 
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask task = ctx.AddTask("Updating known iNES/NES 2.0 headers");
+                                task.MaxValue = sync.Offsets.Count;
+
+                                foreach(NesHeaderDto header in sync.NesHeaders)
                                 {
-                                    ProgressTask task = ctx.AddTask("Adding known iNES/NES 2.0 headers");
-                                    task.MaxValue = sync.NesHeaders?.Count ?? 0;
+                                    task.Increment(1);
+                                    NesHeaderInfo existing = mctx.NesHeaders.FirstOrDefault(d => d.Id == header.Id);
 
-                                    foreach(NesHeaderDto header in sync.NesHeaders ?? new List<NesHeaderDto>())
+                                    if(existing != null)
                                     {
-                                        task.Increment(1);
+                                        modifiedNesHeaders++;
+                                        DateTime addedDate = existing.AddedWhen;
+
+                                        mctx.Remove(existing);
+
+                                        existing = new NesHeaderInfo
+                                        {
+                                            Id                     = header.Id,
+                                            AddedWhen              = addedDate,
+                                            BatteryPresent         = header.BatteryPresent,
+                                            ConsoleType            = header.ConsoleType,
+                                            DefaultExpansionDevice = header.DefaultExpansionDevice,
+                                            ExtendedConsoleType    = header.ExtendedConsoleType,
+                                            FourScreenMode         = header.FourScreenMode,
+                                            Mapper                 = header.Mapper,
+                                            ModifiedWhen           = DateTime.UtcNow,
+                                            NametableMirroring     = header.NametableMirroring,
+                                            Sha256                 = header.Sha256,
+                                            Submapper              = header.Submapper,
+                                            TimingMode             = header.TimingMode,
+                                            VsHardwareType         = header.VsHardwareType,
+                                            VsPpuType              = header.VsPpuType
+                                        };
+
+                                        mctx.NesHeaders.Add(existing);
+                                    }
+                                    else
+                                    {
+                                        addedNesHeaders++;
 
                                         mctx.NesHeaders.Add(new NesHeaderInfo
                                         {
-                                            Id = header.Id,
-                                            AddedWhen = DateTime.UtcNow,
-                                            BatteryPresent = header.BatteryPresent,
-                                            ConsoleType = header.ConsoleType,
+                                            Id                     = header.Id,
+                                            AddedWhen              = DateTime.UtcNow,
+                                            BatteryPresent         = header.BatteryPresent,
+                                            ConsoleType            = header.ConsoleType,
                                             DefaultExpansionDevice = header.DefaultExpansionDevice,
-                                            ExtendedConsoleType = header.ExtendedConsoleType,
-                                            FourScreenMode = header.FourScreenMode,
-                                            Mapper = header.Mapper,
-                                            ModifiedWhen = DateTime.UtcNow,
-                                            NametableMirroring = header.NametableMirroring,
-                                            Sha256 = header.Sha256,
-                                            Submapper = header.Submapper,
-                                            TimingMode = header.TimingMode,
-                                            VsHardwareType = header.VsHardwareType,
-                                            VsPpuType = header.VsPpuType
+                                            ExtendedConsoleType    = header.ExtendedConsoleType,
+                                            FourScreenMode         = header.FourScreenMode,
+                                            Mapper                 = header.Mapper,
+                                            ModifiedWhen           = DateTime.UtcNow,
+                                            NametableMirroring     = header.NametableMirroring,
+                                            Sha256                 = header.Sha256,
+                                            Submapper              = header.Submapper,
+                                            TimingMode             = header.TimingMode,
+                                            VsHardwareType         = header.VsHardwareType,
+                                            VsPpuType              = header.VsPpuType
                                         });
                                     }
-                                });
+                                }
+                            });
 
-                    AaruConsole.WriteLine("Added {0} known iNES/NES 2.0 headers", sync.NesHeaders?.Count ?? 0);
-                }
-                else
-                {
-                    long addedVendors       = 0;
-                    long addedProducts      = 0;
-                    long addedOffsets       = 0;
-                    long addedDevices       = 0;
-                    long addedNesHeaders    = 0;
-                    long modifiedVendors    = 0;
-                    long modifiedProducts   = 0;
-                    long modifiedOffsets    = 0;
-                    long modifiedDevices    = 0;
-                    long modifiedNesHeaders = 0;
-
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
-                                {
-                                    ProgressTask task = ctx.AddTask("Updating USB vendors");
-                                    task.MaxValue = sync.UsbVendors.Count;
-
-                                    foreach(UsbVendorDto vendor in sync.UsbVendors)
-                                    {
-                                        task.Increment(1);
-
-                                        UsbVendor existing =
-                                            mctx.UsbVendors.FirstOrDefault(v => v.Id == vendor.VendorId);
-
-                                        if(existing != null)
-                                        {
-                                            modifiedVendors++;
-                                            existing.Vendor       = vendor.Vendor;
-                                            existing.ModifiedWhen = updateStart;
-                                            mctx.UsbVendors.Update(existing);
-                                        }
-                                        else
-                                        {
-                                            addedVendors++;
-                                            mctx.UsbVendors.Add(new UsbVendor(vendor.VendorId, vendor.Vendor));
-                                        }
-                                    }
-                                });
-
-                    AaruConsole.WriteLine("Added {0} USB vendors", addedVendors);
-                    AaruConsole.WriteLine("Modified {0} USB vendors", modifiedVendors);
-
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
-                                {
-                                    ProgressTask task = ctx.AddTask("Updating USB products");
-                                    task.MaxValue = sync.UsbVendors.Count;
-
-                                    foreach(UsbProductDto product in sync.UsbProducts)
-                                    {
-                                        task.Increment(1);
-
-                                        UsbProduct existing =
-                                            mctx.UsbProducts.FirstOrDefault(p => p.VendorId == product.VendorId &&
-                                                                                p.ProductId == product.ProductId);
-
-                                        if(existing != null)
-                                        {
-                                            modifiedProducts++;
-                                            existing.Product      = product.Product;
-                                            existing.ModifiedWhen = updateStart;
-                                            mctx.UsbProducts.Update(existing);
-                                        }
-                                        else
-                                        {
-                                            addedProducts++;
-
-                                            mctx.UsbProducts.Add(new UsbProduct(product.VendorId, product.ProductId,
-                                                                                    product.Product));
-                                        }
-                                    }
-                                });
-
-                    AaruConsole.WriteLine("Added {0} USB products", addedProducts);
-                    AaruConsole.WriteLine("Modified {0} USB products", modifiedProducts);
-
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
-                                {
-                                    ProgressTask task = ctx.AddTask("Updating CompactDisc read offsets");
-                                    task.MaxValue = sync.Offsets.Count;
-
-                                    foreach(CdOffsetDto offset in sync.Offsets)
-                                    {
-                                        CdOffset existing = mctx.CdOffsets.FirstOrDefault(o => o.Id == offset.Id);
-                                        task.Increment(1);
-
-                                        if(existing != null)
-                                        {
-                                            modifiedOffsets++;
-                                            existing.Agreement    = offset.Agreement;
-                                            existing.Manufacturer = offset.Manufacturer;
-                                            existing.Model        = offset.Model;
-                                            existing.Submissions  = offset.Submissions;
-                                            existing.Offset       = offset.Offset;
-                                            existing.ModifiedWhen = updateStart;
-                                            mctx.CdOffsets.Update(existing);
-                                        }
-                                        else
-                                        {
-                                            addedOffsets++;
-
-                                            mctx.CdOffsets.Add(new CdOffset(offset)
-                                            {
-                                                Id = offset.Id
-                                            });
-                                        }
-                                    }
-                                });
-
-                    AaruConsole.WriteLine("Added {0} CompactDisc read offsets", addedOffsets);
-                    AaruConsole.WriteLine("Modified {0} CompactDisc read offsets", modifiedOffsets);
-
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
-                                {
-                                    ProgressTask task = ctx.AddTask("Updating known devices");
-                                    task.MaxValue = sync.Offsets.Count;
-
-                                    foreach(DeviceDto device in sync.Devices)
-                                    {
-                                        task.Increment(1);
-                                        Device existing = mctx.Devices.FirstOrDefault(d => d.Id == device.Id);
-
-                                        if(existing != null)
-                                        {
-                                            modifiedDevices++;
-
-                                            mctx.Remove(existing);
-
-                                            existing = new Device(device)
-                                            {
-                                                Id                         = device.Id,
-                                                OptimalMultipleSectorsRead = device.OptimalMultipleSectorsRead,
-                                                CanReadGdRomUsingSwapDisc  = device.CanReadGdRomUsingSwapDisc
-                                            };
-
-                                            mctx.Devices.Add(existing);
-                                        }
-                                        else
-                                        {
-                                            addedDevices++;
-
-                                            mctx.Devices.Add(new Device(device)
-                                            {
-                                                Id                         = device.Id,
-                                                OptimalMultipleSectorsRead = device.OptimalMultipleSectorsRead,
-                                                CanReadGdRomUsingSwapDisc  = device.CanReadGdRomUsingSwapDisc
-                                            });
-                                        }
-                                    }
-                                });
-
-                    AaruConsole.WriteLine("Added {0} known devices", addedDevices);
-                    AaruConsole.WriteLine("Modified {0} known devices", modifiedDevices);
-
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
-                                {
-                                    ProgressTask task = ctx.AddTask("Updating known iNES/NES 2.0 headers");
-                                    task.MaxValue = sync.Offsets.Count;
-
-                                    foreach(NesHeaderDto header in sync.NesHeaders)
-                                    {
-                                        task.Increment(1);
-                                        NesHeaderInfo existing = mctx.NesHeaders.FirstOrDefault(d => d.Id == header.Id);
-
-                                        if(existing != null)
-                                        {
-                                            modifiedNesHeaders++;
-                                            DateTime addedDate = existing.AddedWhen;
-
-                                            mctx.Remove(existing);
-
-                                            existing = new NesHeaderInfo
-                                            {
-                                                Id                     = header.Id,
-                                                AddedWhen              = addedDate,
-                                                BatteryPresent         = header.BatteryPresent,
-                                                ConsoleType            = header.ConsoleType,
-                                                DefaultExpansionDevice = header.DefaultExpansionDevice,
-                                                ExtendedConsoleType    = header.ExtendedConsoleType,
-                                                FourScreenMode         = header.FourScreenMode,
-                                                Mapper                 = header.Mapper,
-                                                ModifiedWhen           = DateTime.UtcNow,
-                                                NametableMirroring     = header.NametableMirroring,
-                                                Sha256                 = header.Sha256,
-                                                Submapper              = header.Submapper,
-                                                TimingMode             = header.TimingMode,
-                                                VsHardwareType         = header.VsHardwareType,
-                                                VsPpuType              = header.VsPpuType
-                                            };
-
-                                            mctx.NesHeaders.Add(existing);
-                                        }
-                                        else
-                                        {
-                                            addedNesHeaders++;
-
-                                            mctx.NesHeaders.Add(new NesHeaderInfo
-                                            {
-                                                Id                     = header.Id,
-                                                AddedWhen              = DateTime.UtcNow,
-                                                BatteryPresent         = header.BatteryPresent,
-                                                ConsoleType            = header.ConsoleType,
-                                                DefaultExpansionDevice = header.DefaultExpansionDevice,
-                                                ExtendedConsoleType    = header.ExtendedConsoleType,
-                                                FourScreenMode         = header.FourScreenMode,
-                                                Mapper                 = header.Mapper,
-                                                ModifiedWhen           = DateTime.UtcNow,
-                                                NametableMirroring     = header.NametableMirroring,
-                                                Sha256                 = header.Sha256,
-                                                Submapper              = header.Submapper,
-                                                TimingMode             = header.TimingMode,
-                                                VsHardwareType         = header.VsHardwareType,
-                                                VsPpuType              = header.VsPpuType
-                                            });
-                                        }
-                                    }
-                                });
-
-                    AaruConsole.WriteLine("Added {0} known iNES/NES 2.0 headers", addedDevices);
-                    AaruConsole.WriteLine("Modified {0} known iNES/NES 2.0 headers", modifiedDevices);
-                }
+                AaruConsole.WriteLine("Added {0} known iNES/NES 2.0 headers", addedDevices);
+                AaruConsole.WriteLine("Modified {0} known iNES/NES 2.0 headers", modifiedDevices);
             }
-            catch(Exception ex)
+        }
+        catch(Exception ex)
+        {
+            AaruConsole.ErrorWriteLine("Exception {0} when updating database.", ex);
+        }
+        finally
+        {
+            Spectre.ProgressSingleSpinner(ctx =>
             {
-                AaruConsole.ErrorWriteLine("Exception {0} when updating database.", ex);
-            }
-            finally
-            {
-                Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Saving changes...").IsIndeterminate();
-                    mctx.SaveChanges();
-                });
-            }
+                ctx.AddTask("Saving changes...").IsIndeterminate();
+                mctx.SaveChanges();
+            });
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Sidecar/AudioMedia.cs b/Aaru.Core/Sidecar/AudioMedia.cs
index b5dfd914e..e80e15acf 100644
--- a/Aaru.Core/Sidecar/AudioMedia.cs
+++ b/Aaru.Core/Sidecar/AudioMedia.cs
@@ -38,54 +38,53 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Core
-{
-    public sealed partial class Sidecar
-    {
-        // TODO: Complete it
-        /// <summary>Creates a metadata sidecar for an audio media (e.g. cassette)</summary>
-        /// <param name="image">Image</param>
-        /// <param name="filterId">Filter uuid</param>
-        /// <param name="imagePath">Image path</param>
-        /// <param name="fi">Image file information</param>
-        /// <param name="plugins">Image plugins</param>
-        /// <param name="imgChecksums">List of image checksums</param>
-        /// <param name="sidecar">Metadata sidecar</param>
-        /// <param name="encoding">Encoding to be used for filesystem plugins</param>
-        static void AudioMedia(IBaseImage image, Guid filterId, string imagePath, FileInfo fi, PluginBase plugins,
-                               List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar, Encoding encoding)
-        {
-            sidecar.AudioMedia = new[]
-            {
-                new AudioMediaType
-                {
-                    Checksums = imgChecksums.ToArray(),
-                    Image = new ImageType
-                    {
-                        format          = image.Format,
-                        offset          = 0,
-                        offsetSpecified = true,
-                        Value           = Path.GetFileName(imagePath)
-                    },
-                    Size = (ulong)fi.Length,
-                    Sequence = new SequenceType
-                    {
-                        MediaTitle = image.Info.MediaTitle
-                    }
-                }
-            };
+namespace Aaru.Core;
 
-            if(image.Info.MediaSequence     != 0 &&
-               image.Info.LastMediaSequence != 0)
+public sealed partial class Sidecar
+{
+    // TODO: Complete it
+    /// <summary>Creates a metadata sidecar for an audio media (e.g. cassette)</summary>
+    /// <param name="image">Image</param>
+    /// <param name="filterId">Filter uuid</param>
+    /// <param name="imagePath">Image path</param>
+    /// <param name="fi">Image file information</param>
+    /// <param name="plugins">Image plugins</param>
+    /// <param name="imgChecksums">List of image checksums</param>
+    /// <param name="sidecar">Metadata sidecar</param>
+    /// <param name="encoding">Encoding to be used for filesystem plugins</param>
+    static void AudioMedia(IBaseImage image, Guid filterId, string imagePath, FileInfo fi, PluginBase plugins,
+                           List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar, Encoding encoding)
+    {
+        sidecar.AudioMedia = new[]
+        {
+            new AudioMediaType
             {
-                sidecar.AudioMedia[0].Sequence.MediaSequence = (uint)image.Info.MediaSequence;
-                sidecar.AudioMedia[0].Sequence.TotalMedia    = (uint)image.Info.LastMediaSequence;
-            }
-            else
-            {
-                sidecar.AudioMedia[0].Sequence.MediaSequence = 1;
-                sidecar.AudioMedia[0].Sequence.TotalMedia    = 1;
+                Checksums = imgChecksums.ToArray(),
+                Image = new ImageType
+                {
+                    format          = image.Format,
+                    offset          = 0,
+                    offsetSpecified = true,
+                    Value           = Path.GetFileName(imagePath)
+                },
+                Size = (ulong)fi.Length,
+                Sequence = new SequenceType
+                {
+                    MediaTitle = image.Info.MediaTitle
+                }
             }
+        };
+
+        if(image.Info.MediaSequence     != 0 &&
+           image.Info.LastMediaSequence != 0)
+        {
+            sidecar.AudioMedia[0].Sequence.MediaSequence = (uint)image.Info.MediaSequence;
+            sidecar.AudioMedia[0].Sequence.TotalMedia    = (uint)image.Info.LastMediaSequence;
+        }
+        else
+        {
+            sidecar.AudioMedia[0].Sequence.MediaSequence = 1;
+            sidecar.AudioMedia[0].Sequence.TotalMedia    = 1;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Sidecar/BlockMedia.cs b/Aaru.Core/Sidecar/BlockMedia.cs
index 1a75988ad..4ae9e443b 100644
--- a/Aaru.Core/Sidecar/BlockMedia.cs
+++ b/Aaru.Core/Sidecar/BlockMedia.cs
@@ -49,455 +49,555 @@ using Schemas;
 using MediaType = Aaru.CommonTypes.Metadata.MediaType;
 using Tuple = Aaru.Decoders.PCMCIA.Tuple;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+public sealed partial class Sidecar
 {
-    public sealed partial class Sidecar
+    /// <summary>Creates a metadata sidecar for a block media (e.g. floppy, hard disk, flash card, usb stick)</summary>
+    /// <param name="image">Image</param>
+    /// <param name="filterId">Filter uuid</param>
+    /// <param name="imagePath">Image path</param>
+    /// <param name="fi">Image file information</param>
+    /// <param name="plugins">Image plugins</param>
+    /// <param name="imgChecksums">List of image checksums</param>
+    /// <param name="sidecar">Metadata sidecar</param>
+    /// <param name="encoding">Encoding to be used for filesystem plugins</param>
+    void BlockMedia(IMediaImage image, Guid filterId, string imagePath, FileInfo fi, PluginBase plugins,
+                    List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar, Encoding encoding)
     {
-        /// <summary>Creates a metadata sidecar for a block media (e.g. floppy, hard disk, flash card, usb stick)</summary>
-        /// <param name="image">Image</param>
-        /// <param name="filterId">Filter uuid</param>
-        /// <param name="imagePath">Image path</param>
-        /// <param name="fi">Image file information</param>
-        /// <param name="plugins">Image plugins</param>
-        /// <param name="imgChecksums">List of image checksums</param>
-        /// <param name="sidecar">Metadata sidecar</param>
-        /// <param name="encoding">Encoding to be used for filesystem plugins</param>
-        void BlockMedia(IMediaImage image, Guid filterId, string imagePath, FileInfo fi, PluginBase plugins,
-                        List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar, Encoding encoding)
+        if(_aborted)
+            return;
+
+        sidecar.BlockMedia = new[]
+        {
+            new BlockMediaType
+            {
+                Checksums = imgChecksums.ToArray(),
+                Image = new ImageType
+                {
+                    format          = image.Format,
+                    offset          = 0,
+                    offsetSpecified = true,
+                    Value           = Path.GetFileName(imagePath)
+                },
+                Size = (ulong)fi.Length,
+                Sequence = new SequenceType
+                {
+                    MediaTitle = image.Info.MediaTitle
+                }
+            }
+        };
+
+        if(image.Info.MediaSequence     != 0 &&
+           image.Info.LastMediaSequence != 0)
+        {
+            sidecar.BlockMedia[0].Sequence.MediaSequence = (uint)image.Info.MediaSequence;
+            sidecar.BlockMedia[0].Sequence.TotalMedia    = (uint)image.Info.LastMediaSequence;
+        }
+        else
+        {
+            sidecar.BlockMedia[0].Sequence.MediaSequence = 1;
+            sidecar.BlockMedia[0].Sequence.TotalMedia    = 1;
+        }
+
+        UpdateStatus("Hashing media tags...");
+        ErrorNumber errno;
+        byte[]      buffer;
+
+        foreach(MediaTagType tagType in image.Info.ReadableMediaTags)
         {
             if(_aborted)
                 return;
 
-            sidecar.BlockMedia = new[]
+            switch(tagType)
             {
-                new BlockMediaType
-                {
-                    Checksums = imgChecksums.ToArray(),
-                    Image = new ImageType
+                case MediaTagType.ATAPI_IDENTIFY:
+                    errno = image.ReadMediaTag(MediaTagType.ATAPI_IDENTIFY, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].ATA = new ATAType
                     {
-                        format          = image.Format,
-                        offset          = 0,
-                        offsetSpecified = true,
-                        Value           = Path.GetFileName(imagePath)
-                    },
-                    Size = (ulong)fi.Length,
-                    Sequence = new SequenceType
+                        Identify = new DumpType
+                        {
+                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                            Size      = (ulong)buffer.Length
+                        }
+                    };
+
+                    break;
+                case MediaTagType.ATA_IDENTIFY:
+                    errno = image.ReadMediaTag(MediaTagType.ATA_IDENTIFY, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].ATA = new ATAType
                     {
-                        MediaTitle = image.Info.MediaTitle
-                    }
-                }
-            };
+                        Identify = new DumpType
+                        {
+                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                            Size      = (ulong)buffer.Length
+                        }
+                    };
 
-            if(image.Info.MediaSequence     != 0 &&
-               image.Info.LastMediaSequence != 0)
-            {
-                sidecar.BlockMedia[0].Sequence.MediaSequence = (uint)image.Info.MediaSequence;
-                sidecar.BlockMedia[0].Sequence.TotalMedia    = (uint)image.Info.LastMediaSequence;
-            }
-            else
-            {
-                sidecar.BlockMedia[0].Sequence.MediaSequence = 1;
-                sidecar.BlockMedia[0].Sequence.TotalMedia    = 1;
+                    break;
+                case MediaTagType.PCMCIA_CIS:
+                    errno = image.ReadMediaTag(MediaTagType.PCMCIA_CIS, out byte[] cis);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].PCMCIA = new PCMCIAType
+                    {
+                        CIS = new DumpType
+                        {
+                            Checksums = Checksum.GetChecksums(cis).ToArray(),
+                            Size      = (ulong)cis.Length
+                        }
+                    };
+
+                    Tuple[] tuples = CIS.GetTuples(cis);
+
+                    if(tuples != null)
+                        foreach(Tuple tuple in tuples)
+                            switch(tuple.Code)
+                            {
+                                case TupleCodes.CISTPL_MANFID:
+                                    ManufacturerIdentificationTuple manfid =
+                                        CIS.DecodeManufacturerIdentificationTuple(tuple);
+
+                                    if(manfid != null)
+                                    {
+                                        sidecar.BlockMedia[0].PCMCIA.ManufacturerCode = manfid.ManufacturerID;
+
+                                        sidecar.BlockMedia[0].PCMCIA.CardCode                  = manfid.CardID;
+                                        sidecar.BlockMedia[0].PCMCIA.ManufacturerCodeSpecified = true;
+                                        sidecar.BlockMedia[0].PCMCIA.CardCodeSpecified         = true;
+                                    }
+
+                                    break;
+                                case TupleCodes.CISTPL_VERS_1:
+                                    Level1VersionTuple vers = CIS.DecodeLevel1VersionTuple(tuple);
+
+                                    if(vers != null)
+                                    {
+                                        sidecar.BlockMedia[0].PCMCIA.Manufacturer = vers.Manufacturer;
+                                        sidecar.BlockMedia[0].PCMCIA.ProductName  = vers.Product;
+
+                                        sidecar.BlockMedia[0].PCMCIA.Compliance =
+                                            $"{vers.MajorVersion}.{vers.MinorVersion}";
+
+                                        sidecar.BlockMedia[0].PCMCIA.AdditionalInformation =
+                                            vers.AdditionalInformation;
+                                    }
+
+                                    break;
+                            }
+
+                    break;
+                case MediaTagType.SCSI_INQUIRY:
+                    errno = image.ReadMediaTag(MediaTagType.SCSI_INQUIRY, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].SCSI = new SCSIType
+                    {
+                        Inquiry = new DumpType
+                        {
+                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                            Size      = (ulong)buffer.Length
+                        }
+                    };
+
+                    break;
+                case MediaTagType.SD_CID:
+                    errno = image.ReadMediaTag(MediaTagType.SD_CID, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].SecureDigital ??= new SecureDigitalType();
+
+                    sidecar.BlockMedia[0].SecureDigital.CID = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
+                case MediaTagType.SD_CSD:
+                    errno = image.ReadMediaTag(MediaTagType.SD_CSD, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].SecureDigital ??= new SecureDigitalType();
+
+                    sidecar.BlockMedia[0].SecureDigital.CSD = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
+                case MediaTagType.SD_SCR:
+                    errno = image.ReadMediaTag(MediaTagType.SD_SCR, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].SecureDigital ??= new SecureDigitalType();
+
+                    sidecar.BlockMedia[0].SecureDigital.SCR = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
+                case MediaTagType.SD_OCR:
+                    errno = image.ReadMediaTag(MediaTagType.SD_OCR, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].SecureDigital ??= new SecureDigitalType();
+
+                    sidecar.BlockMedia[0].SecureDigital.OCR = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
+                case MediaTagType.MMC_CID:
+                    errno = image.ReadMediaTag(MediaTagType.MMC_CID, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].MultiMediaCard ??= new MultiMediaCardType();
+
+                    sidecar.BlockMedia[0].MultiMediaCard.CID = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
+                case MediaTagType.MMC_CSD:
+                    errno = image.ReadMediaTag(MediaTagType.MMC_CSD, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].MultiMediaCard ??= new MultiMediaCardType();
+
+                    sidecar.BlockMedia[0].MultiMediaCard.CSD = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
+                case MediaTagType.MMC_OCR:
+                    errno = image.ReadMediaTag(MediaTagType.MMC_OCR, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].MultiMediaCard ??= new MultiMediaCardType();
+
+                    sidecar.BlockMedia[0].MultiMediaCard.OCR = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
+                case MediaTagType.MMC_ExtendedCSD:
+                    errno = image.ReadMediaTag(MediaTagType.MMC_ExtendedCSD, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].MultiMediaCard ??= new MultiMediaCardType();
+
+                    sidecar.BlockMedia[0].MultiMediaCard.ExtendedCSD = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
+                case MediaTagType.USB_Descriptors:
+                    errno = image.ReadMediaTag(MediaTagType.USB_Descriptors, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].USB ??= new USBType();
+
+                    sidecar.BlockMedia[0].USB.Descriptors = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
+                case MediaTagType.SCSI_MODESENSE_6:
+                    errno = image.ReadMediaTag(MediaTagType.SCSI_MODESENSE_6, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].SCSI ??= new SCSIType();
+
+                    sidecar.BlockMedia[0].SCSI.ModeSense = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
+                case MediaTagType.SCSI_MODESENSE_10:
+                    errno = image.ReadMediaTag(MediaTagType.SCSI_MODESENSE_10, out buffer);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    sidecar.BlockMedia[0].SCSI ??= new SCSIType();
+
+                    sidecar.BlockMedia[0].SCSI.ModeSense10 = new DumpType
+                    {
+                        Checksums = Checksum.GetChecksums(buffer).ToArray(),
+                        Size      = (ulong)buffer.Length
+                    };
+
+                    break;
             }
+        }
 
-            UpdateStatus("Hashing media tags...");
-            ErrorNumber errno;
-            byte[]      buffer;
+        // If there is only one track, and it's the same as the image file (e.g. ".iso" files), don't re-checksum.
+        if(image.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000") &&
+           filterId == new Guid("12345678-AAAA-BBBB-CCCC-123456789000"))
+            sidecar.BlockMedia[0].ContentChecksums = sidecar.BlockMedia[0].Checksums;
+        else
+        {
+            UpdateStatus("Hashing sectors...");
 
-            foreach(MediaTagType tagType in image.Info.ReadableMediaTags)
+            var contentChkWorker = new Checksum();
+
+            // For fast debugging, skip checksum
+            //goto skipImageChecksum;
+
+            uint  sectorsToRead = 64;
+            ulong sectors       = image.Info.Sectors;
+            ulong doneSectors   = 0;
+
+            InitProgress2();
+
+            while(doneSectors < sectors)
             {
                 if(_aborted)
+                {
+                    EndProgress2();
+
                     return;
-
-                switch(tagType)
-                {
-                    case MediaTagType.ATAPI_IDENTIFY:
-                        errno = image.ReadMediaTag(MediaTagType.ATAPI_IDENTIFY, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].ATA = new ATAType
-                        {
-                            Identify = new DumpType
-                            {
-                                Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                                Size      = (ulong)buffer.Length
-                            }
-                        };
-
-                        break;
-                    case MediaTagType.ATA_IDENTIFY:
-                        errno = image.ReadMediaTag(MediaTagType.ATA_IDENTIFY, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].ATA = new ATAType
-                        {
-                            Identify = new DumpType
-                            {
-                                Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                                Size      = (ulong)buffer.Length
-                            }
-                        };
-
-                        break;
-                    case MediaTagType.PCMCIA_CIS:
-                        errno = image.ReadMediaTag(MediaTagType.PCMCIA_CIS, out byte[] cis);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].PCMCIA = new PCMCIAType
-                        {
-                            CIS = new DumpType
-                            {
-                                Checksums = Checksum.GetChecksums(cis).ToArray(),
-                                Size      = (ulong)cis.Length
-                            }
-                        };
-
-                        Tuple[] tuples = CIS.GetTuples(cis);
-
-                        if(tuples != null)
-                            foreach(Tuple tuple in tuples)
-                                switch(tuple.Code)
-                                {
-                                    case TupleCodes.CISTPL_MANFID:
-                                        ManufacturerIdentificationTuple manfid =
-                                            CIS.DecodeManufacturerIdentificationTuple(tuple);
-
-                                        if(manfid != null)
-                                        {
-                                            sidecar.BlockMedia[0].PCMCIA.ManufacturerCode = manfid.ManufacturerID;
-
-                                            sidecar.BlockMedia[0].PCMCIA.CardCode                  = manfid.CardID;
-                                            sidecar.BlockMedia[0].PCMCIA.ManufacturerCodeSpecified = true;
-                                            sidecar.BlockMedia[0].PCMCIA.CardCodeSpecified         = true;
-                                        }
-
-                                        break;
-                                    case TupleCodes.CISTPL_VERS_1:
-                                        Level1VersionTuple vers = CIS.DecodeLevel1VersionTuple(tuple);
-
-                                        if(vers != null)
-                                        {
-                                            sidecar.BlockMedia[0].PCMCIA.Manufacturer = vers.Manufacturer;
-                                            sidecar.BlockMedia[0].PCMCIA.ProductName  = vers.Product;
-
-                                            sidecar.BlockMedia[0].PCMCIA.Compliance =
-                                                $"{vers.MajorVersion}.{vers.MinorVersion}";
-
-                                            sidecar.BlockMedia[0].PCMCIA.AdditionalInformation =
-                                                vers.AdditionalInformation;
-                                        }
-
-                                        break;
-                                }
-
-                        break;
-                    case MediaTagType.SCSI_INQUIRY:
-                        errno = image.ReadMediaTag(MediaTagType.SCSI_INQUIRY, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].SCSI = new SCSIType
-                        {
-                            Inquiry = new DumpType
-                            {
-                                Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                                Size      = (ulong)buffer.Length
-                            }
-                        };
-
-                        break;
-                    case MediaTagType.SD_CID:
-                        errno = image.ReadMediaTag(MediaTagType.SD_CID, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].SecureDigital ??= new SecureDigitalType();
-
-                        sidecar.BlockMedia[0].SecureDigital.CID = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
-                    case MediaTagType.SD_CSD:
-                        errno = image.ReadMediaTag(MediaTagType.SD_CSD, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].SecureDigital ??= new SecureDigitalType();
-
-                        sidecar.BlockMedia[0].SecureDigital.CSD = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
-                    case MediaTagType.SD_SCR:
-                        errno = image.ReadMediaTag(MediaTagType.SD_SCR, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].SecureDigital ??= new SecureDigitalType();
-
-                        sidecar.BlockMedia[0].SecureDigital.SCR = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
-                    case MediaTagType.SD_OCR:
-                        errno = image.ReadMediaTag(MediaTagType.SD_OCR, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].SecureDigital ??= new SecureDigitalType();
-
-                        sidecar.BlockMedia[0].SecureDigital.OCR = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
-                    case MediaTagType.MMC_CID:
-                        errno = image.ReadMediaTag(MediaTagType.MMC_CID, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].MultiMediaCard ??= new MultiMediaCardType();
-
-                        sidecar.BlockMedia[0].MultiMediaCard.CID = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
-                    case MediaTagType.MMC_CSD:
-                        errno = image.ReadMediaTag(MediaTagType.MMC_CSD, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].MultiMediaCard ??= new MultiMediaCardType();
-
-                        sidecar.BlockMedia[0].MultiMediaCard.CSD = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
-                    case MediaTagType.MMC_OCR:
-                        errno = image.ReadMediaTag(MediaTagType.MMC_OCR, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].MultiMediaCard ??= new MultiMediaCardType();
-
-                        sidecar.BlockMedia[0].MultiMediaCard.OCR = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
-                    case MediaTagType.MMC_ExtendedCSD:
-                        errno = image.ReadMediaTag(MediaTagType.MMC_ExtendedCSD, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].MultiMediaCard ??= new MultiMediaCardType();
-
-                        sidecar.BlockMedia[0].MultiMediaCard.ExtendedCSD = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
-                    case MediaTagType.USB_Descriptors:
-                        errno = image.ReadMediaTag(MediaTagType.USB_Descriptors, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].USB ??= new USBType();
-
-                        sidecar.BlockMedia[0].USB.Descriptors = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
-                    case MediaTagType.SCSI_MODESENSE_6:
-                        errno = image.ReadMediaTag(MediaTagType.SCSI_MODESENSE_6, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].SCSI ??= new SCSIType();
-
-                        sidecar.BlockMedia[0].SCSI.ModeSense = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
-                    case MediaTagType.SCSI_MODESENSE_10:
-                        errno = image.ReadMediaTag(MediaTagType.SCSI_MODESENSE_10, out buffer);
-
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        sidecar.BlockMedia[0].SCSI ??= new SCSIType();
-
-                        sidecar.BlockMedia[0].SCSI.ModeSense10 = new DumpType
-                        {
-                            Checksums = Checksum.GetChecksums(buffer).ToArray(),
-                            Size      = (ulong)buffer.Length
-                        };
-
-                        break;
                 }
-            }
 
-            // If there is only one track, and it's the same as the image file (e.g. ".iso" files), don't re-checksum.
-            if(image.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000") &&
-               filterId == new Guid("12345678-AAAA-BBBB-CCCC-123456789000"))
-                sidecar.BlockMedia[0].ContentChecksums = sidecar.BlockMedia[0].Checksums;
-            else
-            {
-                UpdateStatus("Hashing sectors...");
+                byte[] sector;
 
-                var contentChkWorker = new Checksum();
-
-                // For fast debugging, skip checksum
-                //goto skipImageChecksum;
-
-                uint  sectorsToRead = 64;
-                ulong sectors       = image.Info.Sectors;
-                ulong doneSectors   = 0;
-
-                InitProgress2();
-
-                while(doneSectors < sectors)
+                if(sectors - doneSectors >= sectorsToRead)
                 {
-                    if(_aborted)
+                    errno = image.ReadSectors(doneSectors, sectorsToRead, out sector);
+
+                    if(errno != ErrorNumber.NoError)
                     {
+                        UpdateStatus($"Error {errno} reading sector {doneSectors}");
                         EndProgress2();
 
                         return;
                     }
 
-                    byte[] sector;
+                    UpdateProgress2("Hashing sector {0} of {1}", (long)doneSectors, (long)sectors);
+                    doneSectors += sectorsToRead;
+                }
+                else
+                {
+                    errno = image.ReadSectors(doneSectors, (uint)(sectors - doneSectors), out sector);
 
-                    if(sectors - doneSectors >= sectorsToRead)
+                    if(errno != ErrorNumber.NoError)
                     {
-                        errno = image.ReadSectors(doneSectors, sectorsToRead, out sector);
+                        UpdateStatus($"Error {errno} reading sector {doneSectors}");
+                        EndProgress2();
 
-                        if(errno != ErrorNumber.NoError)
-                        {
-                            UpdateStatus($"Error {errno} reading sector {doneSectors}");
-                            EndProgress2();
-
-                            return;
-                        }
-
-                        UpdateProgress2("Hashing sector {0} of {1}", (long)doneSectors, (long)sectors);
-                        doneSectors += sectorsToRead;
-                    }
-                    else
-                    {
-                        errno = image.ReadSectors(doneSectors, (uint)(sectors - doneSectors), out sector);
-
-                        if(errno != ErrorNumber.NoError)
-                        {
-                            UpdateStatus($"Error {errno} reading sector {doneSectors}");
-                            EndProgress2();
-
-                            return;
-                        }
-
-                        UpdateProgress2("Hashing sector {0} of {1}", (long)doneSectors, (long)sectors);
-                        doneSectors += sectors - doneSectors;
+                        return;
                     }
 
-                    contentChkWorker.Update(sector);
+                    UpdateProgress2("Hashing sector {0} of {1}", (long)doneSectors, (long)sectors);
+                    doneSectors += sectors - doneSectors;
                 }
 
-                // For fast debugging, skip checksum
-                //skipImageChecksum:
-
-                List<ChecksumType> cntChecksums = contentChkWorker.End();
-
-                sidecar.BlockMedia[0].ContentChecksums = cntChecksums.ToArray();
-
-                EndProgress2();
+                contentChkWorker.Update(sector);
             }
 
-            (string type, string subType) diskType = MediaType.MediaTypeToString(image.Info.MediaType);
-            sidecar.BlockMedia[0].DiskType    = diskType.type;
-            sidecar.BlockMedia[0].DiskSubType = diskType.subType;
-            Statistics.AddMedia(image.Info.MediaType, false);
+            // For fast debugging, skip checksum
+            //skipImageChecksum:
 
-            sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(image.Info.MediaType);
+            List<ChecksumType> cntChecksums = contentChkWorker.End();
 
-            sidecar.BlockMedia[0].LogicalBlocks    = image.Info.Sectors;
-            sidecar.BlockMedia[0].LogicalBlockSize = image.Info.SectorSize;
+            sidecar.BlockMedia[0].ContentChecksums = cntChecksums.ToArray();
 
-            // TODO: Detect it
-            sidecar.BlockMedia[0].PhysicalBlockSize = image.Info.SectorSize;
+            EndProgress2();
+        }
 
-            if(image is ITapeImage { IsTape: true } tapeImage)
+        (string type, string subType) diskType = MediaType.MediaTypeToString(image.Info.MediaType);
+        sidecar.BlockMedia[0].DiskType    = diskType.type;
+        sidecar.BlockMedia[0].DiskSubType = diskType.subType;
+        Statistics.AddMedia(image.Info.MediaType, false);
+
+        sidecar.BlockMedia[0].Dimensions = Dimensions.DimensionsFromMediaType(image.Info.MediaType);
+
+        sidecar.BlockMedia[0].LogicalBlocks    = image.Info.Sectors;
+        sidecar.BlockMedia[0].LogicalBlockSize = image.Info.SectorSize;
+
+        // TODO: Detect it
+        sidecar.BlockMedia[0].PhysicalBlockSize = image.Info.SectorSize;
+
+        if(image is ITapeImage { IsTape: true } tapeImage)
+        {
+            List<TapePartitionType> tapePartitions = new();
+
+            foreach(TapePartition tapePartition in tapeImage.TapePartitions)
             {
-                List<TapePartitionType> tapePartitions = new();
-
-                foreach(TapePartition tapePartition in tapeImage.TapePartitions)
+                var thisPartition = new TapePartitionType
                 {
-                    var thisPartition = new TapePartitionType
+                    Image      = sidecar.BlockMedia[0].Image,
+                    Sequence   = tapePartition.Number,
+                    StartBlock = tapePartition.FirstBlock,
+                    EndBlock   = tapePartition.LastBlock
+                };
+
+                if(tapeImage.TapePartitions.Count == 1)
+                    thisPartition.Checksums = sidecar.BlockMedia[0].ContentChecksums;
+                else
+                {
+                    UpdateStatus($"Hashing partition {tapePartition.Number}...");
+
+                    if(_aborted)
+                        return;
+
+                    var tapePartitionChk = new Checksum();
+
+                    // For fast debugging, skip checksum
+                    //goto skipImageChecksum;
+
+                    uint  sectorsToRead = 64;
+                    ulong sectors       = tapePartition.LastBlock - tapePartition.FirstBlock + 1;
+                    ulong doneSectors   = 0;
+
+                    InitProgress2();
+
+                    while(doneSectors < sectors)
                     {
+                        if(_aborted)
+                        {
+                            EndProgress2();
+
+                            return;
+                        }
+
+                        byte[] sector;
+
+                        if(sectors - doneSectors >= sectorsToRead)
+                        {
+                            errno = image.ReadSectors(tapePartition.FirstBlock + doneSectors, sectorsToRead,
+                                                      out sector);
+
+                            if(errno != ErrorNumber.NoError)
+                            {
+                                AaruConsole.
+                                    ErrorWriteLine($"Error {errno} reading sector {tapePartition.FirstBlock + doneSectors}");
+
+                                EndProgress2();
+
+                                return;
+                            }
+
+                            UpdateProgress2("Hashing blocks {0} of {1}", (long)doneSectors, (long)sectors);
+                            doneSectors += sectorsToRead;
+                        }
+                        else
+                        {
+                            errno = image.ReadSectors(tapePartition.FirstBlock + doneSectors,
+                                                      (uint)(sectors - doneSectors), out sector);
+
+                            if(errno != ErrorNumber.NoError)
+                            {
+                                AaruConsole.
+                                    ErrorWriteLine($"Error {errno} reading sector {tapePartition.FirstBlock + doneSectors}");
+
+                                EndProgress2();
+
+                                return;
+                            }
+
+                            UpdateProgress2("Hashing blocks {0} of {1}", (long)doneSectors, (long)sectors);
+                            doneSectors += sectors - doneSectors;
+                        }
+
+                        thisPartition.Size += (ulong)sector.LongLength;
+
+                        tapePartitionChk.Update(sector);
+                    }
+
+                    // For fast debugging, skip checksum
+                    //skipImageChecksum:
+
+                    List<ChecksumType> partitionChecksums = tapePartitionChk.End();
+
+                    thisPartition.Checksums = partitionChecksums.ToArray();
+
+                    EndProgress2();
+                }
+
+                List<TapeFileType> filesInPartition = new();
+
+                foreach(TapeFile tapeFile in tapeImage.Files.Where(f => f.Partition == tapePartition.Number))
+                {
+                    var thisFile = new TapeFileType
+                    {
+                        Sequence   = tapeFile.File,
+                        StartBlock = tapeFile.FirstBlock,
+                        EndBlock   = tapeFile.LastBlock,
                         Image      = sidecar.BlockMedia[0].Image,
-                        Sequence   = tapePartition.Number,
-                        StartBlock = tapePartition.FirstBlock,
-                        EndBlock   = tapePartition.LastBlock
+                        Size       = 0,
+                        BlockSize  = 0
                     };
 
-                    if(tapeImage.TapePartitions.Count == 1)
-                        thisPartition.Checksums = sidecar.BlockMedia[0].ContentChecksums;
+                    if(tapeImage.Files.Count(f => f.Partition == tapePartition.Number) == 1)
+                    {
+                        thisFile.Checksums = thisPartition.Checksums;
+                        thisFile.Size      = thisPartition.Size;
+                    }
                     else
                     {
-                        UpdateStatus($"Hashing partition {tapePartition.Number}...");
+                        UpdateStatus($"Hashing file {tapeFile.File}...");
 
                         if(_aborted)
                             return;
 
-                        var tapePartitionChk = new Checksum();
+                        var tapeFileChk = new Checksum();
 
                         // For fast debugging, skip checksum
                         //goto skipImageChecksum;
 
                         uint  sectorsToRead = 64;
-                        ulong sectors       = tapePartition.LastBlock - tapePartition.FirstBlock + 1;
+                        ulong sectors       = tapeFile.LastBlock - tapeFile.FirstBlock + 1;
                         ulong doneSectors   = 0;
 
                         InitProgress2();
@@ -515,13 +615,13 @@ namespace Aaru.Core
 
                             if(sectors - doneSectors >= sectorsToRead)
                             {
-                                errno = image.ReadSectors(tapePartition.FirstBlock + doneSectors, sectorsToRead,
+                                errno = image.ReadSectors(tapeFile.FirstBlock + doneSectors, sectorsToRead,
                                                           out sector);
 
                                 if(errno != ErrorNumber.NoError)
                                 {
                                     AaruConsole.
-                                        ErrorWriteLine($"Error {errno} reading sector {tapePartition.FirstBlock + doneSectors}");
+                                        ErrorWriteLine($"Error {errno} reading sector {tapeFile.FirstBlock + doneSectors}");
 
                                     EndProgress2();
 
@@ -533,13 +633,13 @@ namespace Aaru.Core
                             }
                             else
                             {
-                                errno = image.ReadSectors(tapePartition.FirstBlock + doneSectors,
+                                errno = image.ReadSectors(tapeFile.FirstBlock + doneSectors,
                                                           (uint)(sectors - doneSectors), out sector);
 
                                 if(errno != ErrorNumber.NoError)
                                 {
                                     AaruConsole.
-                                        ErrorWriteLine($"Error {errno} reading sector {tapePartition.FirstBlock + doneSectors}");
+                                        ErrorWriteLine($"Error {errno} reading sector {tapeFile.FirstBlock + doneSectors}");
 
                                     EndProgress2();
 
@@ -550,216 +650,61 @@ namespace Aaru.Core
                                 doneSectors += sectors - doneSectors;
                             }
 
-                            thisPartition.Size += (ulong)sector.LongLength;
+                            if((ulong)sector.LongLength > thisFile.BlockSize)
+                                thisFile.BlockSize = (ulong)sector.LongLength;
 
-                            tapePartitionChk.Update(sector);
+                            thisFile.Size += (ulong)sector.LongLength;
+
+                            tapeFileChk.Update(sector);
                         }
 
                         // For fast debugging, skip checksum
                         //skipImageChecksum:
 
-                        List<ChecksumType> partitionChecksums = tapePartitionChk.End();
+                        List<ChecksumType> fileChecksums = tapeFileChk.End();
 
-                        thisPartition.Checksums = partitionChecksums.ToArray();
+                        thisFile.Checksums = fileChecksums.ToArray();
 
                         EndProgress2();
                     }
 
-                    List<TapeFileType> filesInPartition = new();
-
-                    foreach(TapeFile tapeFile in tapeImage.Files.Where(f => f.Partition == tapePartition.Number))
-                    {
-                        var thisFile = new TapeFileType
-                        {
-                            Sequence   = tapeFile.File,
-                            StartBlock = tapeFile.FirstBlock,
-                            EndBlock   = tapeFile.LastBlock,
-                            Image      = sidecar.BlockMedia[0].Image,
-                            Size       = 0,
-                            BlockSize  = 0
-                        };
-
-                        if(tapeImage.Files.Count(f => f.Partition == tapePartition.Number) == 1)
-                        {
-                            thisFile.Checksums = thisPartition.Checksums;
-                            thisFile.Size      = thisPartition.Size;
-                        }
-                        else
-                        {
-                            UpdateStatus($"Hashing file {tapeFile.File}...");
-
-                            if(_aborted)
-                                return;
-
-                            var tapeFileChk = new Checksum();
-
-                            // For fast debugging, skip checksum
-                            //goto skipImageChecksum;
-
-                            uint  sectorsToRead = 64;
-                            ulong sectors       = tapeFile.LastBlock - tapeFile.FirstBlock + 1;
-                            ulong doneSectors   = 0;
-
-                            InitProgress2();
-
-                            while(doneSectors < sectors)
-                            {
-                                if(_aborted)
-                                {
-                                    EndProgress2();
-
-                                    return;
-                                }
-
-                                byte[] sector;
-
-                                if(sectors - doneSectors >= sectorsToRead)
-                                {
-                                    errno = image.ReadSectors(tapeFile.FirstBlock + doneSectors, sectorsToRead,
-                                                              out sector);
-
-                                    if(errno != ErrorNumber.NoError)
-                                    {
-                                        AaruConsole.
-                                            ErrorWriteLine($"Error {errno} reading sector {tapeFile.FirstBlock + doneSectors}");
-
-                                        EndProgress2();
-
-                                        return;
-                                    }
-
-                                    UpdateProgress2("Hashing blocks {0} of {1}", (long)doneSectors, (long)sectors);
-                                    doneSectors += sectorsToRead;
-                                }
-                                else
-                                {
-                                    errno = image.ReadSectors(tapeFile.FirstBlock + doneSectors,
-                                                              (uint)(sectors - doneSectors), out sector);
-
-                                    if(errno != ErrorNumber.NoError)
-                                    {
-                                        AaruConsole.
-                                            ErrorWriteLine($"Error {errno} reading sector {tapeFile.FirstBlock + doneSectors}");
-
-                                        EndProgress2();
-
-                                        return;
-                                    }
-
-                                    UpdateProgress2("Hashing blocks {0} of {1}", (long)doneSectors, (long)sectors);
-                                    doneSectors += sectors - doneSectors;
-                                }
-
-                                if((ulong)sector.LongLength > thisFile.BlockSize)
-                                    thisFile.BlockSize = (ulong)sector.LongLength;
-
-                                thisFile.Size += (ulong)sector.LongLength;
-
-                                tapeFileChk.Update(sector);
-                            }
-
-                            // For fast debugging, skip checksum
-                            //skipImageChecksum:
-
-                            List<ChecksumType> fileChecksums = tapeFileChk.End();
-
-                            thisFile.Checksums = fileChecksums.ToArray();
-
-                            EndProgress2();
-                        }
-
-                        filesInPartition.Add(thisFile);
-                    }
-
-                    thisPartition.File = filesInPartition.ToArray();
-                    tapePartitions.Add(thisPartition);
+                    filesInPartition.Add(thisFile);
                 }
 
-                sidecar.BlockMedia[0].TapeInformation = tapePartitions.ToArray();
+                thisPartition.File = filesInPartition.ToArray();
+                tapePartitions.Add(thisPartition);
             }
 
-            UpdateStatus("Checking filesystems...");
+            sidecar.BlockMedia[0].TapeInformation = tapePartitions.ToArray();
+        }
 
-            if(_aborted)
-                return;
+        UpdateStatus("Checking filesystems...");
 
-            List<Partition> partitions = Partitions.GetAll(image);
-            Partitions.AddSchemesToStats(partitions);
+        if(_aborted)
+            return;
 
-            sidecar.BlockMedia[0].FileSystemInformation = new PartitionType[1];
+        List<Partition> partitions = Partitions.GetAll(image);
+        Partitions.AddSchemesToStats(partitions);
 
-            if(partitions.Count > 0)
-            {
-                sidecar.BlockMedia[0].FileSystemInformation = new PartitionType[partitions.Count];
+        sidecar.BlockMedia[0].FileSystemInformation = new PartitionType[1];
 
-                for(int i = 0; i < partitions.Count; i++)
-                {
-                    if(_aborted)
-                        return;
+        if(partitions.Count > 0)
+        {
+            sidecar.BlockMedia[0].FileSystemInformation = new PartitionType[partitions.Count];
 
-                    sidecar.BlockMedia[0].FileSystemInformation[i] = new PartitionType
-                    {
-                        Description = partitions[i].Description,
-                        EndSector   = partitions[i].End,
-                        Name        = partitions[i].Name,
-                        Sequence    = (uint)partitions[i].Sequence,
-                        StartSector = partitions[i].Start,
-                        Type        = partitions[i].Type
-                    };
-
-                    List<FileSystemType> lstFs = new();
-
-                    foreach(IFilesystem plugin in plugins.PluginsList.Values)
-                        try
-                        {
-                            if(_aborted)
-                                return;
-
-                            if(!plugin.Identify(image, partitions[i]))
-                                continue;
-
-                            if(plugin is IReadOnlyFilesystem fsPlugin &&
-                               fsPlugin.Mount(image, partitions[i], encoding, null, null) == ErrorNumber.NoError)
-                            {
-                                UpdateStatus($"Mounting {fsPlugin.XmlFsType.Type}");
-
-                                fsPlugin.XmlFsType.Contents = Files(fsPlugin);
-
-                                fsPlugin.Unmount();
-                            }
-                            else
-                                plugin.GetInformation(image, partitions[i], out _, encoding);
-
-                            lstFs.Add(plugin.XmlFsType);
-                            Statistics.AddFilesystem(plugin.XmlFsType.Type);
-                        }
-                        #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
-                        catch
-                            #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
-                        {
-                            //AaruConsole.DebugWriteLine("Create-sidecar command", "Plugin {0} crashed", _plugin.Name);
-                        }
-
-                    if(lstFs.Count > 0)
-                        sidecar.BlockMedia[0].FileSystemInformation[i].FileSystems = lstFs.ToArray();
-                }
-            }
-            else
+            for(int i = 0; i < partitions.Count; i++)
             {
                 if(_aborted)
                     return;
 
-                sidecar.BlockMedia[0].FileSystemInformation[0] = new PartitionType
+                sidecar.BlockMedia[0].FileSystemInformation[i] = new PartitionType
                 {
-                    StartSector = 0,
-                    EndSector   = image.Info.Sectors - 1
-                };
-
-                var wholePart = new Partition
-                {
-                    Name   = "Whole device",
-                    Length = image.Info.Sectors,
-                    Size   = image.Info.Sectors * image.Info.SectorSize
+                    Description = partitions[i].Description,
+                    EndSector   = partitions[i].End,
+                    Name        = partitions[i].Name,
+                    Sequence    = (uint)partitions[i].Sequence,
+                    StartSector = partitions[i].Start,
+                    Type        = partitions[i].Type
                 };
 
                 List<FileSystemType> lstFs = new();
@@ -770,11 +715,11 @@ namespace Aaru.Core
                         if(_aborted)
                             return;
 
-                        if(!plugin.Identify(image, wholePart))
+                        if(!plugin.Identify(image, partitions[i]))
                             continue;
 
                         if(plugin is IReadOnlyFilesystem fsPlugin &&
-                           fsPlugin.Mount(image, wholePart, encoding, null, null) == ErrorNumber.NoError)
+                           fsPlugin.Mount(image, partitions[i], encoding, null, null) == ErrorNumber.NoError)
                         {
                             UpdateStatus($"Mounting {fsPlugin.XmlFsType.Type}");
 
@@ -783,7 +728,7 @@ namespace Aaru.Core
                             fsPlugin.Unmount();
                         }
                         else
-                            plugin.GetInformation(image, wholePart, out _, encoding);
+                            plugin.GetInformation(image, partitions[i], out _, encoding);
 
                         lstFs.Add(plugin.XmlFsType);
                         Statistics.AddFilesystem(plugin.XmlFsType.Type);
@@ -796,467 +741,521 @@ namespace Aaru.Core
                     }
 
                 if(lstFs.Count > 0)
-                    sidecar.BlockMedia[0].FileSystemInformation[0].FileSystems = lstFs.ToArray();
+                    sidecar.BlockMedia[0].FileSystemInformation[i].FileSystems = lstFs.ToArray();
             }
-
-            UpdateStatus("Saving metadata...");
-
-            if(image.Info.Cylinders       > 0 &&
-               image.Info.Heads           > 0 &&
-               image.Info.SectorsPerTrack > 0)
-            {
-                sidecar.BlockMedia[0].CylindersSpecified       = true;
-                sidecar.BlockMedia[0].HeadsSpecified           = true;
-                sidecar.BlockMedia[0].SectorsPerTrackSpecified = true;
-                sidecar.BlockMedia[0].Cylinders                = image.Info.Cylinders;
-                sidecar.BlockMedia[0].Heads                    = (ushort)image.Info.Heads;
-                sidecar.BlockMedia[0].SectorsPerTrack          = image.Info.SectorsPerTrack;
-            }
-
-            if(image.Info.ReadableMediaTags.Contains(MediaTagType.ATA_IDENTIFY))
-            {
-                Identify.IdentifyDevice? ataId = null;
-                errno = image.ReadMediaTag(MediaTagType.ATA_IDENTIFY, out buffer);
-
-                if(errno == ErrorNumber.NoError)
-                    ataId = Identify.Decode(buffer);
-
-                if(ataId.HasValue)
-                    if(ataId.Value.CurrentCylinders       > 0 &&
-                       ataId.Value.CurrentHeads           > 0 &&
-                       ataId.Value.CurrentSectorsPerTrack > 0)
-                    {
-                        sidecar.BlockMedia[0].CylindersSpecified       = true;
-                        sidecar.BlockMedia[0].HeadsSpecified           = true;
-                        sidecar.BlockMedia[0].SectorsPerTrackSpecified = true;
-                        sidecar.BlockMedia[0].Cylinders                = ataId.Value.CurrentCylinders;
-                        sidecar.BlockMedia[0].Heads                    = ataId.Value.CurrentHeads;
-                        sidecar.BlockMedia[0].SectorsPerTrack          = ataId.Value.CurrentSectorsPerTrack;
-                    }
-                    else if(ataId.Value.Cylinders       > 0 &&
-                            ataId.Value.Heads           > 0 &&
-                            ataId.Value.SectorsPerTrack > 0)
-                    {
-                        sidecar.BlockMedia[0].CylindersSpecified       = true;
-                        sidecar.BlockMedia[0].HeadsSpecified           = true;
-                        sidecar.BlockMedia[0].SectorsPerTrackSpecified = true;
-                        sidecar.BlockMedia[0].Cylinders                = ataId.Value.Cylinders;
-                        sidecar.BlockMedia[0].Heads                    = ataId.Value.Heads;
-                        sidecar.BlockMedia[0].SectorsPerTrack          = ataId.Value.SectorsPerTrack;
-                    }
-            }
-
-            if(image.DumpHardware != null)
-                sidecar.BlockMedia[0].DumpHardwareArray = image.DumpHardware.ToArray();
-
-            // TODO: This is more of a hack, redo it planned for >4.0
-            string trkFormat = null;
-
-            switch(image.Info.MediaType)
-            {
-                case CommonTypes.MediaType.Apple32SS:
-                case CommonTypes.MediaType.Apple32DS:
-                    trkFormat = "Apple GCR (DOS 3.2)";
-
-                    break;
-                case CommonTypes.MediaType.Apple33SS:
-                case CommonTypes.MediaType.Apple33DS:
-                    trkFormat = "Apple GCR (DOS 3.3)";
-
-                    break;
-                case CommonTypes.MediaType.AppleSonySS:
-                case CommonTypes.MediaType.AppleSonyDS:
-                    trkFormat = "Apple GCR (Sony)";
-
-                    break;
-                case CommonTypes.MediaType.AppleFileWare:
-                    trkFormat = "Apple GCR (Twiggy)";
-
-                    break;
-                case CommonTypes.MediaType.DOS_525_SS_DD_9:
-                case CommonTypes.MediaType.DOS_525_DS_DD_8:
-                case CommonTypes.MediaType.DOS_525_DS_DD_9:
-                case CommonTypes.MediaType.DOS_525_HD:
-                case CommonTypes.MediaType.DOS_35_SS_DD_8:
-                case CommonTypes.MediaType.DOS_35_SS_DD_9:
-                case CommonTypes.MediaType.DOS_35_DS_DD_8:
-                case CommonTypes.MediaType.DOS_35_DS_DD_9:
-                case CommonTypes.MediaType.DOS_35_HD:
-                case CommonTypes.MediaType.DOS_35_ED:
-                case CommonTypes.MediaType.DMF:
-                case CommonTypes.MediaType.DMF_82:
-                case CommonTypes.MediaType.XDF_525:
-                case CommonTypes.MediaType.XDF_35:
-                case CommonTypes.MediaType.IBM53FD_256:
-                case CommonTypes.MediaType.IBM53FD_512:
-                case CommonTypes.MediaType.IBM53FD_1024:
-                case CommonTypes.MediaType.RX02:
-                case CommonTypes.MediaType.RX03:
-                case CommonTypes.MediaType.RX50:
-                case CommonTypes.MediaType.ACORN_525_SS_DD_40:
-                case CommonTypes.MediaType.ACORN_525_SS_DD_80:
-                case CommonTypes.MediaType.ACORN_525_DS_DD:
-                case CommonTypes.MediaType.ACORN_35_DS_DD:
-                case CommonTypes.MediaType.ACORN_35_DS_HD:
-                case CommonTypes.MediaType.ATARI_525_ED:
-                case CommonTypes.MediaType.ATARI_525_DD:
-                case CommonTypes.MediaType.ATARI_35_SS_DD:
-                case CommonTypes.MediaType.ATARI_35_DS_DD:
-                case CommonTypes.MediaType.ATARI_35_SS_DD_11:
-                case CommonTypes.MediaType.ATARI_35_DS_DD_11:
-                case CommonTypes.MediaType.DOS_525_SS_DD_8:
-                case CommonTypes.MediaType.NEC_8_DD:
-                case CommonTypes.MediaType.NEC_525_SS:
-                case CommonTypes.MediaType.NEC_525_DS:
-                case CommonTypes.MediaType.NEC_525_HD:
-                case CommonTypes.MediaType.NEC_35_HD_8:
-                case CommonTypes.MediaType.NEC_35_HD_15:
-                case CommonTypes.MediaType.NEC_35_TD:
-                case CommonTypes.MediaType.FDFORMAT_525_DD:
-                case CommonTypes.MediaType.FDFORMAT_525_HD:
-                case CommonTypes.MediaType.FDFORMAT_35_DD:
-                case CommonTypes.MediaType.FDFORMAT_35_HD:
-                case CommonTypes.MediaType.Apricot_35:
-                case CommonTypes.MediaType.CompactFloppy:
-                case CommonTypes.MediaType.MetaFloppy_Mod_I:
-                case CommonTypes.MediaType.MetaFloppy_Mod_II:
-                    trkFormat = "IBM MFM";
-
-                    break;
-                case CommonTypes.MediaType.ATARI_525_SD:
-                case CommonTypes.MediaType.NEC_8_SD:
-                case CommonTypes.MediaType.ACORN_525_SS_SD_40:
-                case CommonTypes.MediaType.ACORN_525_SS_SD_80:
-                case CommonTypes.MediaType.RX01:
-                case CommonTypes.MediaType.IBM23FD:
-                case CommonTypes.MediaType.IBM33FD_128:
-                case CommonTypes.MediaType.IBM33FD_256:
-                case CommonTypes.MediaType.IBM33FD_512:
-                case CommonTypes.MediaType.IBM43FD_128:
-                case CommonTypes.MediaType.IBM43FD_256:
-                    trkFormat = "IBM FM";
-
-                    break;
-                case CommonTypes.MediaType.CBM_35_DD:
-                    trkFormat = "Commodore MFM";
-
-                    break;
-                case CommonTypes.MediaType.CBM_AMIGA_35_HD:
-                case CommonTypes.MediaType.CBM_AMIGA_35_DD:
-                    trkFormat = "Amiga MFM";
-
-                    break;
-                case CommonTypes.MediaType.CBM_1540:
-                case CommonTypes.MediaType.CBM_1540_Ext:
-                case CommonTypes.MediaType.CBM_1571:
-                    trkFormat = "Commodore GCR";
-
-                    break;
-                case CommonTypes.MediaType.SHARP_525_9:
-                case CommonTypes.MediaType.SHARP_35_9: break;
-                case CommonTypes.MediaType.ECMA_99_15:
-                case CommonTypes.MediaType.ECMA_99_26:
-                case CommonTypes.MediaType.ECMA_99_8:
-                    trkFormat = "ISO MFM";
-
-                    break;
-                case CommonTypes.MediaType.ECMA_54:
-                case CommonTypes.MediaType.ECMA_59:
-                case CommonTypes.MediaType.ECMA_66:
-                case CommonTypes.MediaType.ECMA_69_8:
-                case CommonTypes.MediaType.ECMA_69_15:
-                case CommonTypes.MediaType.ECMA_69_26:
-                case CommonTypes.MediaType.ECMA_70:
-                case CommonTypes.MediaType.ECMA_78:
-                case CommonTypes.MediaType.ECMA_78_2:
-                    trkFormat = "ISO FM";
-
-                    break;
-                default:
-                    trkFormat = "Unknown";
-
-                    break;
-            }
-
-            #region SuperCardPro
-            string scpFilePath = Path.Combine(Path.GetDirectoryName(imagePath),
-                                              Path.GetFileNameWithoutExtension(imagePath) + ".scp");
-
+        }
+        else
+        {
             if(_aborted)
                 return;
 
-            if(File.Exists(scpFilePath))
+            sidecar.BlockMedia[0].FileSystemInformation[0] = new PartitionType
             {
-                UpdateStatus("Hashing SuperCardPro image...");
-                var scpImage  = new SuperCardPro();
-                var scpFilter = new ZZZNoFilter();
-                scpFilter.Open(scpFilePath);
+                StartSector = 0,
+                EndSector   = image.Info.Sectors - 1
+            };
 
-                if(image.Info.Heads <= 2 &&
-                   scpImage.Identify(scpFilter))
+            var wholePart = new Partition
+            {
+                Name   = "Whole device",
+                Length = image.Info.Sectors,
+                Size   = image.Info.Sectors * image.Info.SectorSize
+            };
+
+            List<FileSystemType> lstFs = new();
+
+            foreach(IFilesystem plugin in plugins.PluginsList.Values)
+                try
                 {
-                    try
+                    if(_aborted)
+                        return;
+
+                    if(!plugin.Identify(image, wholePart))
+                        continue;
+
+                    if(plugin is IReadOnlyFilesystem fsPlugin &&
+                       fsPlugin.Mount(image, wholePart, encoding, null, null) == ErrorNumber.NoError)
                     {
-                        scpImage.Open(scpFilter);
+                        UpdateStatus($"Mounting {fsPlugin.XmlFsType.Type}");
+
+                        fsPlugin.XmlFsType.Contents = Files(fsPlugin);
+
+                        fsPlugin.Unmount();
                     }
-                    catch(NotImplementedException) {}
+                    else
+                        plugin.GetInformation(image, wholePart, out _, encoding);
 
-                    if((image.Info.Heads == 2 && scpImage.Header.heads == 0) ||
-                       (image.Info.Heads == 1 && (scpImage.Header.heads == 1 || scpImage.Header.heads == 2)))
-                        if(scpImage.Header.end + 1 >= image.Info.Cylinders)
+                    lstFs.Add(plugin.XmlFsType);
+                    Statistics.AddFilesystem(plugin.XmlFsType.Type);
+                }
+                #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
+                catch
+                    #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
+                {
+                    //AaruConsole.DebugWriteLine("Create-sidecar command", "Plugin {0} crashed", _plugin.Name);
+                }
+
+            if(lstFs.Count > 0)
+                sidecar.BlockMedia[0].FileSystemInformation[0].FileSystems = lstFs.ToArray();
+        }
+
+        UpdateStatus("Saving metadata...");
+
+        if(image.Info.Cylinders       > 0 &&
+           image.Info.Heads           > 0 &&
+           image.Info.SectorsPerTrack > 0)
+        {
+            sidecar.BlockMedia[0].CylindersSpecified       = true;
+            sidecar.BlockMedia[0].HeadsSpecified           = true;
+            sidecar.BlockMedia[0].SectorsPerTrackSpecified = true;
+            sidecar.BlockMedia[0].Cylinders                = image.Info.Cylinders;
+            sidecar.BlockMedia[0].Heads                    = (ushort)image.Info.Heads;
+            sidecar.BlockMedia[0].SectorsPerTrack          = image.Info.SectorsPerTrack;
+        }
+
+        if(image.Info.ReadableMediaTags.Contains(MediaTagType.ATA_IDENTIFY))
+        {
+            Identify.IdentifyDevice? ataId = null;
+            errno = image.ReadMediaTag(MediaTagType.ATA_IDENTIFY, out buffer);
+
+            if(errno == ErrorNumber.NoError)
+                ataId = Identify.Decode(buffer);
+
+            if(ataId.HasValue)
+                if(ataId.Value.CurrentCylinders       > 0 &&
+                   ataId.Value.CurrentHeads           > 0 &&
+                   ataId.Value.CurrentSectorsPerTrack > 0)
+                {
+                    sidecar.BlockMedia[0].CylindersSpecified       = true;
+                    sidecar.BlockMedia[0].HeadsSpecified           = true;
+                    sidecar.BlockMedia[0].SectorsPerTrackSpecified = true;
+                    sidecar.BlockMedia[0].Cylinders                = ataId.Value.CurrentCylinders;
+                    sidecar.BlockMedia[0].Heads                    = ataId.Value.CurrentHeads;
+                    sidecar.BlockMedia[0].SectorsPerTrack          = ataId.Value.CurrentSectorsPerTrack;
+                }
+                else if(ataId.Value.Cylinders       > 0 &&
+                        ataId.Value.Heads           > 0 &&
+                        ataId.Value.SectorsPerTrack > 0)
+                {
+                    sidecar.BlockMedia[0].CylindersSpecified       = true;
+                    sidecar.BlockMedia[0].HeadsSpecified           = true;
+                    sidecar.BlockMedia[0].SectorsPerTrackSpecified = true;
+                    sidecar.BlockMedia[0].Cylinders                = ataId.Value.Cylinders;
+                    sidecar.BlockMedia[0].Heads                    = ataId.Value.Heads;
+                    sidecar.BlockMedia[0].SectorsPerTrack          = ataId.Value.SectorsPerTrack;
+                }
+        }
+
+        if(image.DumpHardware != null)
+            sidecar.BlockMedia[0].DumpHardwareArray = image.DumpHardware.ToArray();
+
+        // TODO: This is more of a hack, redo it planned for >4.0
+        string trkFormat = null;
+
+        switch(image.Info.MediaType)
+        {
+            case CommonTypes.MediaType.Apple32SS:
+            case CommonTypes.MediaType.Apple32DS:
+                trkFormat = "Apple GCR (DOS 3.2)";
+
+                break;
+            case CommonTypes.MediaType.Apple33SS:
+            case CommonTypes.MediaType.Apple33DS:
+                trkFormat = "Apple GCR (DOS 3.3)";
+
+                break;
+            case CommonTypes.MediaType.AppleSonySS:
+            case CommonTypes.MediaType.AppleSonyDS:
+                trkFormat = "Apple GCR (Sony)";
+
+                break;
+            case CommonTypes.MediaType.AppleFileWare:
+                trkFormat = "Apple GCR (Twiggy)";
+
+                break;
+            case CommonTypes.MediaType.DOS_525_SS_DD_9:
+            case CommonTypes.MediaType.DOS_525_DS_DD_8:
+            case CommonTypes.MediaType.DOS_525_DS_DD_9:
+            case CommonTypes.MediaType.DOS_525_HD:
+            case CommonTypes.MediaType.DOS_35_SS_DD_8:
+            case CommonTypes.MediaType.DOS_35_SS_DD_9:
+            case CommonTypes.MediaType.DOS_35_DS_DD_8:
+            case CommonTypes.MediaType.DOS_35_DS_DD_9:
+            case CommonTypes.MediaType.DOS_35_HD:
+            case CommonTypes.MediaType.DOS_35_ED:
+            case CommonTypes.MediaType.DMF:
+            case CommonTypes.MediaType.DMF_82:
+            case CommonTypes.MediaType.XDF_525:
+            case CommonTypes.MediaType.XDF_35:
+            case CommonTypes.MediaType.IBM53FD_256:
+            case CommonTypes.MediaType.IBM53FD_512:
+            case CommonTypes.MediaType.IBM53FD_1024:
+            case CommonTypes.MediaType.RX02:
+            case CommonTypes.MediaType.RX03:
+            case CommonTypes.MediaType.RX50:
+            case CommonTypes.MediaType.ACORN_525_SS_DD_40:
+            case CommonTypes.MediaType.ACORN_525_SS_DD_80:
+            case CommonTypes.MediaType.ACORN_525_DS_DD:
+            case CommonTypes.MediaType.ACORN_35_DS_DD:
+            case CommonTypes.MediaType.ACORN_35_DS_HD:
+            case CommonTypes.MediaType.ATARI_525_ED:
+            case CommonTypes.MediaType.ATARI_525_DD:
+            case CommonTypes.MediaType.ATARI_35_SS_DD:
+            case CommonTypes.MediaType.ATARI_35_DS_DD:
+            case CommonTypes.MediaType.ATARI_35_SS_DD_11:
+            case CommonTypes.MediaType.ATARI_35_DS_DD_11:
+            case CommonTypes.MediaType.DOS_525_SS_DD_8:
+            case CommonTypes.MediaType.NEC_8_DD:
+            case CommonTypes.MediaType.NEC_525_SS:
+            case CommonTypes.MediaType.NEC_525_DS:
+            case CommonTypes.MediaType.NEC_525_HD:
+            case CommonTypes.MediaType.NEC_35_HD_8:
+            case CommonTypes.MediaType.NEC_35_HD_15:
+            case CommonTypes.MediaType.NEC_35_TD:
+            case CommonTypes.MediaType.FDFORMAT_525_DD:
+            case CommonTypes.MediaType.FDFORMAT_525_HD:
+            case CommonTypes.MediaType.FDFORMAT_35_DD:
+            case CommonTypes.MediaType.FDFORMAT_35_HD:
+            case CommonTypes.MediaType.Apricot_35:
+            case CommonTypes.MediaType.CompactFloppy:
+            case CommonTypes.MediaType.MetaFloppy_Mod_I:
+            case CommonTypes.MediaType.MetaFloppy_Mod_II:
+                trkFormat = "IBM MFM";
+
+                break;
+            case CommonTypes.MediaType.ATARI_525_SD:
+            case CommonTypes.MediaType.NEC_8_SD:
+            case CommonTypes.MediaType.ACORN_525_SS_SD_40:
+            case CommonTypes.MediaType.ACORN_525_SS_SD_80:
+            case CommonTypes.MediaType.RX01:
+            case CommonTypes.MediaType.IBM23FD:
+            case CommonTypes.MediaType.IBM33FD_128:
+            case CommonTypes.MediaType.IBM33FD_256:
+            case CommonTypes.MediaType.IBM33FD_512:
+            case CommonTypes.MediaType.IBM43FD_128:
+            case CommonTypes.MediaType.IBM43FD_256:
+                trkFormat = "IBM FM";
+
+                break;
+            case CommonTypes.MediaType.CBM_35_DD:
+                trkFormat = "Commodore MFM";
+
+                break;
+            case CommonTypes.MediaType.CBM_AMIGA_35_HD:
+            case CommonTypes.MediaType.CBM_AMIGA_35_DD:
+                trkFormat = "Amiga MFM";
+
+                break;
+            case CommonTypes.MediaType.CBM_1540:
+            case CommonTypes.MediaType.CBM_1540_Ext:
+            case CommonTypes.MediaType.CBM_1571:
+                trkFormat = "Commodore GCR";
+
+                break;
+            case CommonTypes.MediaType.SHARP_525_9:
+            case CommonTypes.MediaType.SHARP_35_9: break;
+            case CommonTypes.MediaType.ECMA_99_15:
+            case CommonTypes.MediaType.ECMA_99_26:
+            case CommonTypes.MediaType.ECMA_99_8:
+                trkFormat = "ISO MFM";
+
+                break;
+            case CommonTypes.MediaType.ECMA_54:
+            case CommonTypes.MediaType.ECMA_59:
+            case CommonTypes.MediaType.ECMA_66:
+            case CommonTypes.MediaType.ECMA_69_8:
+            case CommonTypes.MediaType.ECMA_69_15:
+            case CommonTypes.MediaType.ECMA_69_26:
+            case CommonTypes.MediaType.ECMA_70:
+            case CommonTypes.MediaType.ECMA_78:
+            case CommonTypes.MediaType.ECMA_78_2:
+                trkFormat = "ISO FM";
+
+                break;
+            default:
+                trkFormat = "Unknown";
+
+                break;
+        }
+
+        #region SuperCardPro
+        string scpFilePath = Path.Combine(Path.GetDirectoryName(imagePath),
+                                          Path.GetFileNameWithoutExtension(imagePath) + ".scp");
+
+        if(_aborted)
+            return;
+
+        if(File.Exists(scpFilePath))
+        {
+            UpdateStatus("Hashing SuperCardPro image...");
+            var scpImage  = new SuperCardPro();
+            var scpFilter = new ZZZNoFilter();
+            scpFilter.Open(scpFilePath);
+
+            if(image.Info.Heads <= 2 &&
+               scpImage.Identify(scpFilter))
+            {
+                try
+                {
+                    scpImage.Open(scpFilter);
+                }
+                catch(NotImplementedException) {}
+
+                if((image.Info.Heads == 2 && scpImage.Header.heads == 0) ||
+                   (image.Info.Heads == 1 && (scpImage.Header.heads == 1 || scpImage.Header.heads == 2)))
+                    if(scpImage.Header.end + 1 >= image.Info.Cylinders)
+                    {
+                        List<BlockTrackType> scpBlockTrackTypes = new();
+                        ulong                currentSector      = 0;
+                        Stream               scpStream          = scpFilter.GetDataForkStream();
+
+                        for(byte t = scpImage.Header.start; t <= scpImage.Header.end; t++)
                         {
-                            List<BlockTrackType> scpBlockTrackTypes = new();
-                            ulong                currentSector      = 0;
-                            Stream               scpStream          = scpFilter.GetDataForkStream();
+                            if(_aborted)
+                                return;
 
-                            for(byte t = scpImage.Header.start; t <= scpImage.Header.end; t++)
+                            var scpBlockTrackType = new BlockTrackType
                             {
-                                if(_aborted)
-                                    return;
-
-                                var scpBlockTrackType = new BlockTrackType
+                                Cylinder = t / image.Info.Heads,
+                                Head     = (ushort)(t % image.Info.Heads),
+                                Image = new ImageType
                                 {
-                                    Cylinder = t / image.Info.Heads,
-                                    Head     = (ushort)(t % image.Info.Heads),
-                                    Image = new ImageType
-                                    {
-                                        format = scpImage.Format,
-                                        Value  = Path.GetFileName(scpFilePath),
-                                        offset = scpImage.Header.offsets[t]
-                                    }
-                                };
-
-                                if(scpBlockTrackType.Cylinder < image.Info.Cylinders)
-                                {
-                                    scpBlockTrackType.StartSector    =  currentSector;
-                                    currentSector                    += image.Info.SectorsPerTrack;
-                                    scpBlockTrackType.EndSector      =  currentSector - 1;
-                                    scpBlockTrackType.Sectors        =  image.Info.SectorsPerTrack;
-                                    scpBlockTrackType.BytesPerSector =  image.Info.SectorSize;
-                                    scpBlockTrackType.Format         =  trkFormat;
+                                    format = scpImage.Format,
+                                    Value  = Path.GetFileName(scpFilePath),
+                                    offset = scpImage.Header.offsets[t]
                                 }
+                            };
 
-                                if(scpImage.ScpTracks.TryGetValue(t, out SuperCardPro.TrackHeader scpTrack))
-                                {
-                                    byte[] trackContents =
-                                        new byte[scpTrack.Entries.Last().dataOffset +
-                                                 scpTrack.Entries.Last().trackLength - scpImage.Header.offsets[t] + 1];
-
-                                    scpStream.Position = scpImage.Header.offsets[t];
-                                    scpStream.Read(trackContents, 0, trackContents.Length);
-                                    scpBlockTrackType.Size      = (ulong)trackContents.Length;
-                                    scpBlockTrackType.Checksums = Checksum.GetChecksums(trackContents).ToArray();
-                                }
-
-                                scpBlockTrackTypes.Add(scpBlockTrackType);
+                            if(scpBlockTrackType.Cylinder < image.Info.Cylinders)
+                            {
+                                scpBlockTrackType.StartSector    =  currentSector;
+                                currentSector                    += image.Info.SectorsPerTrack;
+                                scpBlockTrackType.EndSector      =  currentSector - 1;
+                                scpBlockTrackType.Sectors        =  image.Info.SectorsPerTrack;
+                                scpBlockTrackType.BytesPerSector =  image.Info.SectorSize;
+                                scpBlockTrackType.Format         =  trkFormat;
                             }
 
-                            sidecar.BlockMedia[0].Track = scpBlockTrackTypes.OrderBy(t => t.Cylinder).
-                                                                             ThenBy(t => t.Head).ToArray();
+                            if(scpImage.ScpTracks.TryGetValue(t, out SuperCardPro.TrackHeader scpTrack))
+                            {
+                                byte[] trackContents =
+                                    new byte[scpTrack.Entries.Last().dataOffset +
+                                             scpTrack.Entries.Last().trackLength - scpImage.Header.offsets[t] + 1];
+
+                                scpStream.Position = scpImage.Header.offsets[t];
+                                scpStream.Read(trackContents, 0, trackContents.Length);
+                                scpBlockTrackType.Size      = (ulong)trackContents.Length;
+                                scpBlockTrackType.Checksums = Checksum.GetChecksums(trackContents).ToArray();
+                            }
+
+                            scpBlockTrackTypes.Add(scpBlockTrackType);
                         }
-                        else
-                            AaruConsole.
-                                ErrorWriteLine("SuperCardPro image do not contain same number of tracks ({0}) than disk image ({1}), ignoring...",
-                                               scpImage.Header.end + 1, image.Info.Cylinders);
+
+                        sidecar.BlockMedia[0].Track = scpBlockTrackTypes.OrderBy(t => t.Cylinder).
+                                                                         ThenBy(t => t.Head).ToArray();
+                    }
                     else
                         AaruConsole.
-                            ErrorWriteLine("SuperCardPro image do not contain same number of heads ({0}) than disk image ({1}), ignoring...",
-                                           2, image.Info.Heads);
-                }
-            }
-            #endregion
-
-            #region KryoFlux
-            string kfFile = null;
-
-            string basename = Path.Combine(Path.GetDirectoryName(imagePath),
-                                           Path.GetFileNameWithoutExtension(imagePath));
-
-            bool kfDir = false;
-
-            if(_aborted)
-                return;
-
-            if(Directory.Exists(basename))
-            {
-                string[] possibleKfStarts = Directory.GetFiles(basename, "*.raw", SearchOption.TopDirectoryOnly);
-
-                if(possibleKfStarts.Length > 0)
-                {
-                    kfFile = possibleKfStarts[0];
-                    kfDir  = true;
-                }
-            }
-            else if(File.Exists(basename + "00.0.raw"))
-                kfFile = basename + "00.0.raw";
-            else if(File.Exists(basename + "00.1.raw"))
-                kfFile = basename + "00.1.raw";
-
-            if(kfFile != null)
-            {
-                UpdateStatus("Hashing KryoFlux images...");
-
-                var kfImage  = new KryoFlux();
-                var kfFilter = new ZZZNoFilter();
-                kfFilter.Open(kfFile);
-
-                if(image.Info.Heads <= 2 &&
-                   kfImage.Identify(kfFilter))
-                {
-                    try
-                    {
-                        kfImage.Open(kfFilter);
-                    }
-                    catch(NotImplementedException) {}
-
-                    if(kfImage.Info.Heads == image.Info.Heads)
-                        if(kfImage.Info.Cylinders >= image.Info.Cylinders)
-                        {
-                            List<BlockTrackType> kfBlockTrackTypes = new();
-
-                            ulong currentSector = 0;
-
-                            foreach(KeyValuePair<byte, IFilter> kvp in kfImage.tracks)
-                            {
-                                if(_aborted)
-                                    return;
-
-                                var kfBlockTrackType = new BlockTrackType
-                                {
-                                    Cylinder = kvp.Key / image.Info.Heads,
-                                    Head     = (ushort)(kvp.Key % image.Info.Heads),
-                                    Image = new ImageType
-                                    {
-                                        format = kfImage.Format,
-                                        Value = kfDir
-                                                    ? Path.
-                                                        Combine(Path.GetFileName(Path.GetDirectoryName(kvp.Value.BasePath)),
-                                                                kvp.Value.Filename) : kvp.Value.Filename,
-                                        offset = 0
-                                    }
-                                };
-
-                                if(kfBlockTrackType.Cylinder < image.Info.Cylinders)
-                                {
-                                    kfBlockTrackType.StartSector    =  currentSector;
-                                    currentSector                   += image.Info.SectorsPerTrack;
-                                    kfBlockTrackType.EndSector      =  currentSector - 1;
-                                    kfBlockTrackType.Sectors        =  image.Info.SectorsPerTrack;
-                                    kfBlockTrackType.BytesPerSector =  image.Info.SectorSize;
-                                    kfBlockTrackType.Format         =  trkFormat;
-                                }
-
-                                Stream kfStream      = kvp.Value.GetDataForkStream();
-                                byte[] trackContents = new byte[kfStream.Length];
-                                kfStream.Position = 0;
-                                kfStream.Read(trackContents, 0, trackContents.Length);
-                                kfBlockTrackType.Size      = (ulong)trackContents.Length;
-                                kfBlockTrackType.Checksums = Checksum.GetChecksums(trackContents).ToArray();
-
-                                kfBlockTrackTypes.Add(kfBlockTrackType);
-                            }
-
-                            sidecar.BlockMedia[0].Track = kfBlockTrackTypes.OrderBy(t => t.Cylinder).
-                                                                            ThenBy(t => t.Head).ToArray();
-                        }
-                        else
-                            AaruConsole.
-                                ErrorWriteLine("KryoFlux image do not contain same number of tracks ({0}) than disk image ({1}), ignoring...",
-                                               kfImage.Info.Cylinders, image.Info.Cylinders);
-                    else
-                        AaruConsole.
-                            ErrorWriteLine("KryoFluximage do not contain same number of heads ({0}) than disk image ({1}), ignoring...",
-                                           kfImage.Info.Heads, image.Info.Heads);
-                }
-            }
-            #endregion
-
-            #region DiscFerret
-            string dfiFilePath = Path.Combine(Path.GetDirectoryName(imagePath),
-                                              Path.GetFileNameWithoutExtension(imagePath) + ".dfi");
-
-            if(_aborted)
-                return;
-
-            if(!File.Exists(dfiFilePath))
-                return;
-
-            var dfiImage  = new DiscFerret();
-            var dfiFilter = new ZZZNoFilter();
-            dfiFilter.Open(dfiFilePath);
-
-            if(!dfiImage.Identify(dfiFilter))
-                return;
-
-            try
-            {
-                dfiImage.Open(dfiFilter);
-            }
-            catch(NotImplementedException) {}
-
-            UpdateStatus("Hashing DiscFerret image...");
-
-            if(image.Info.Heads == dfiImage.Info.Heads)
-                if(dfiImage.Info.Cylinders >= image.Info.Cylinders)
-                {
-                    List<BlockTrackType> dfiBlockTrackTypes = new();
-                    ulong                currentSector      = 0;
-                    Stream               dfiStream          = dfiFilter.GetDataForkStream();
-
-                    foreach(int t in dfiImage.TrackOffsets.Keys)
-                    {
-                        if(_aborted)
-                            return;
-
-                        var dfiBlockTrackType = new BlockTrackType
-                        {
-                            Cylinder = (uint)(t   / image.Info.Heads),
-                            Head     = (ushort)(t % image.Info.Heads),
-                            Image = new ImageType
-                            {
-                                format = dfiImage.Format,
-                                Value  = Path.GetFileName(dfiFilePath)
-                            }
-                        };
-
-                        if(dfiBlockTrackType.Cylinder < image.Info.Cylinders)
-                        {
-                            dfiBlockTrackType.StartSector    =  currentSector;
-                            currentSector                    += image.Info.SectorsPerTrack;
-                            dfiBlockTrackType.EndSector      =  currentSector - 1;
-                            dfiBlockTrackType.Sectors        =  image.Info.SectorsPerTrack;
-                            dfiBlockTrackType.BytesPerSector =  image.Info.SectorSize;
-                            dfiBlockTrackType.Format         =  trkFormat;
-                        }
-
-                        if(dfiImage.TrackOffsets.TryGetValue(t, out long offset) &&
-                           dfiImage.TrackLengths.TryGetValue(t, out long length))
-                        {
-                            dfiBlockTrackType.Image.offset = (ulong)offset;
-                            byte[] trackContents = new byte[length];
-                            dfiStream.Position = offset;
-                            dfiStream.Read(trackContents, 0, trackContents.Length);
-                            dfiBlockTrackType.Size      = (ulong)trackContents.Length;
-                            dfiBlockTrackType.Checksums = Checksum.GetChecksums(trackContents).ToArray();
-                        }
-
-                        dfiBlockTrackTypes.Add(dfiBlockTrackType);
-                    }
-
-                    sidecar.BlockMedia[0].Track =
-                        dfiBlockTrackTypes.OrderBy(t => t.Cylinder).ThenBy(t => t.Head).ToArray();
-                }
+                            ErrorWriteLine("SuperCardPro image do not contain same number of tracks ({0}) than disk image ({1}), ignoring...",
+                                           scpImage.Header.end + 1, image.Info.Cylinders);
                 else
                     AaruConsole.
-                        ErrorWriteLine("DiscFerret image do not contain same number of tracks ({0}) than disk image ({1}), ignoring...",
-                                       dfiImage.Info.Cylinders, image.Info.Cylinders);
+                        ErrorWriteLine("SuperCardPro image do not contain same number of heads ({0}) than disk image ({1}), ignoring...",
+                                       2, image.Info.Heads);
+            }
+        }
+        #endregion
+
+        #region KryoFlux
+        string kfFile = null;
+
+        string basename = Path.Combine(Path.GetDirectoryName(imagePath),
+                                       Path.GetFileNameWithoutExtension(imagePath));
+
+        bool kfDir = false;
+
+        if(_aborted)
+            return;
+
+        if(Directory.Exists(basename))
+        {
+            string[] possibleKfStarts = Directory.GetFiles(basename, "*.raw", SearchOption.TopDirectoryOnly);
+
+            if(possibleKfStarts.Length > 0)
+            {
+                kfFile = possibleKfStarts[0];
+                kfDir  = true;
+            }
+        }
+        else if(File.Exists(basename + "00.0.raw"))
+            kfFile = basename + "00.0.raw";
+        else if(File.Exists(basename + "00.1.raw"))
+            kfFile = basename + "00.1.raw";
+
+        if(kfFile != null)
+        {
+            UpdateStatus("Hashing KryoFlux images...");
+
+            var kfImage  = new KryoFlux();
+            var kfFilter = new ZZZNoFilter();
+            kfFilter.Open(kfFile);
+
+            if(image.Info.Heads <= 2 &&
+               kfImage.Identify(kfFilter))
+            {
+                try
+                {
+                    kfImage.Open(kfFilter);
+                }
+                catch(NotImplementedException) {}
+
+                if(kfImage.Info.Heads == image.Info.Heads)
+                    if(kfImage.Info.Cylinders >= image.Info.Cylinders)
+                    {
+                        List<BlockTrackType> kfBlockTrackTypes = new();
+
+                        ulong currentSector = 0;
+
+                        foreach(KeyValuePair<byte, IFilter> kvp in kfImage.tracks)
+                        {
+                            if(_aborted)
+                                return;
+
+                            var kfBlockTrackType = new BlockTrackType
+                            {
+                                Cylinder = kvp.Key / image.Info.Heads,
+                                Head     = (ushort)(kvp.Key % image.Info.Heads),
+                                Image = new ImageType
+                                {
+                                    format = kfImage.Format,
+                                    Value = kfDir
+                                                ? Path.
+                                                    Combine(Path.GetFileName(Path.GetDirectoryName(kvp.Value.BasePath)),
+                                                            kvp.Value.Filename) : kvp.Value.Filename,
+                                    offset = 0
+                                }
+                            };
+
+                            if(kfBlockTrackType.Cylinder < image.Info.Cylinders)
+                            {
+                                kfBlockTrackType.StartSector    =  currentSector;
+                                currentSector                   += image.Info.SectorsPerTrack;
+                                kfBlockTrackType.EndSector      =  currentSector - 1;
+                                kfBlockTrackType.Sectors        =  image.Info.SectorsPerTrack;
+                                kfBlockTrackType.BytesPerSector =  image.Info.SectorSize;
+                                kfBlockTrackType.Format         =  trkFormat;
+                            }
+
+                            Stream kfStream      = kvp.Value.GetDataForkStream();
+                            byte[] trackContents = new byte[kfStream.Length];
+                            kfStream.Position = 0;
+                            kfStream.Read(trackContents, 0, trackContents.Length);
+                            kfBlockTrackType.Size      = (ulong)trackContents.Length;
+                            kfBlockTrackType.Checksums = Checksum.GetChecksums(trackContents).ToArray();
+
+                            kfBlockTrackTypes.Add(kfBlockTrackType);
+                        }
+
+                        sidecar.BlockMedia[0].Track = kfBlockTrackTypes.OrderBy(t => t.Cylinder).
+                                                                        ThenBy(t => t.Head).ToArray();
+                    }
+                    else
+                        AaruConsole.
+                            ErrorWriteLine("KryoFlux image do not contain same number of tracks ({0}) than disk image ({1}), ignoring...",
+                                           kfImage.Info.Cylinders, image.Info.Cylinders);
+                else
+                    AaruConsole.
+                        ErrorWriteLine("KryoFluximage do not contain same number of heads ({0}) than disk image ({1}), ignoring...",
+                                       kfImage.Info.Heads, image.Info.Heads);
+            }
+        }
+        #endregion
+
+        #region DiscFerret
+        string dfiFilePath = Path.Combine(Path.GetDirectoryName(imagePath),
+                                          Path.GetFileNameWithoutExtension(imagePath) + ".dfi");
+
+        if(_aborted)
+            return;
+
+        if(!File.Exists(dfiFilePath))
+            return;
+
+        var dfiImage  = new DiscFerret();
+        var dfiFilter = new ZZZNoFilter();
+        dfiFilter.Open(dfiFilePath);
+
+        if(!dfiImage.Identify(dfiFilter))
+            return;
+
+        try
+        {
+            dfiImage.Open(dfiFilter);
+        }
+        catch(NotImplementedException) {}
+
+        UpdateStatus("Hashing DiscFerret image...");
+
+        if(image.Info.Heads == dfiImage.Info.Heads)
+            if(dfiImage.Info.Cylinders >= image.Info.Cylinders)
+            {
+                List<BlockTrackType> dfiBlockTrackTypes = new();
+                ulong                currentSector      = 0;
+                Stream               dfiStream          = dfiFilter.GetDataForkStream();
+
+                foreach(int t in dfiImage.TrackOffsets.Keys)
+                {
+                    if(_aborted)
+                        return;
+
+                    var dfiBlockTrackType = new BlockTrackType
+                    {
+                        Cylinder = (uint)(t   / image.Info.Heads),
+                        Head     = (ushort)(t % image.Info.Heads),
+                        Image = new ImageType
+                        {
+                            format = dfiImage.Format,
+                            Value  = Path.GetFileName(dfiFilePath)
+                        }
+                    };
+
+                    if(dfiBlockTrackType.Cylinder < image.Info.Cylinders)
+                    {
+                        dfiBlockTrackType.StartSector    =  currentSector;
+                        currentSector                    += image.Info.SectorsPerTrack;
+                        dfiBlockTrackType.EndSector      =  currentSector - 1;
+                        dfiBlockTrackType.Sectors        =  image.Info.SectorsPerTrack;
+                        dfiBlockTrackType.BytesPerSector =  image.Info.SectorSize;
+                        dfiBlockTrackType.Format         =  trkFormat;
+                    }
+
+                    if(dfiImage.TrackOffsets.TryGetValue(t, out long offset) &&
+                       dfiImage.TrackLengths.TryGetValue(t, out long length))
+                    {
+                        dfiBlockTrackType.Image.offset = (ulong)offset;
+                        byte[] trackContents = new byte[length];
+                        dfiStream.Position = offset;
+                        dfiStream.Read(trackContents, 0, trackContents.Length);
+                        dfiBlockTrackType.Size      = (ulong)trackContents.Length;
+                        dfiBlockTrackType.Checksums = Checksum.GetChecksums(trackContents).ToArray();
+                    }
+
+                    dfiBlockTrackTypes.Add(dfiBlockTrackType);
+                }
+
+                sidecar.BlockMedia[0].Track =
+                    dfiBlockTrackTypes.OrderBy(t => t.Cylinder).ThenBy(t => t.Head).ToArray();
+            }
             else
                 AaruConsole.
-                    ErrorWriteLine("DiscFerret image do not contain same number of heads ({0}) than disk image ({1}), ignoring...",
-                                   dfiImage.Info.Heads, image.Info.Heads);
-            #endregion
+                    ErrorWriteLine("DiscFerret image do not contain same number of tracks ({0}) than disk image ({1}), ignoring...",
+                                   dfiImage.Info.Cylinders, image.Info.Cylinders);
+        else
+            AaruConsole.
+                ErrorWriteLine("DiscFerret image do not contain same number of heads ({0}) than disk image ({1}), ignoring...",
+                               dfiImage.Info.Heads, image.Info.Heads);
+        #endregion
 
-            // TODO: Implement support for getting CHS from SCSI mode pages
-        }
+        // TODO: Implement support for getting CHS from SCSI mode pages
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Sidecar/BlockTape.cs b/Aaru.Core/Sidecar/BlockTape.cs
index 8a74a57b5..d6872f463 100644
--- a/Aaru.Core/Sidecar/BlockTape.cs
+++ b/Aaru.Core/Sidecar/BlockTape.cs
@@ -34,190 +34,189 @@ using System.Collections.Generic;
 using System.IO;
 using Schemas;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+/// <summary>Sidecar operations</summary>
+public sealed partial class Sidecar
 {
-    /// <summary>Sidecar operations</summary>
-    public sealed partial class Sidecar
+    /// <summary>Creates a metadata sidecar for a block tape (e.g. scsi streaming)</summary>
+    /// <param name="files">List of files</param>
+    /// <param name="folderName">Dump path</param>
+    /// <param name="blockSize">Expected block size in bytes</param>
+    public CICMMetadataType BlockTape(string folderName, List<string> files, uint blockSize)
     {
-        /// <summary>Creates a metadata sidecar for a block tape (e.g. scsi streaming)</summary>
-        /// <param name="files">List of files</param>
-        /// <param name="folderName">Dump path</param>
-        /// <param name="blockSize">Expected block size in bytes</param>
-        public CICMMetadataType BlockTape(string folderName, List<string> files, uint blockSize)
+        _sidecar = new CICMMetadataType
         {
-            _sidecar = new CICMMetadataType
+            BlockMedia = new[]
             {
-                BlockMedia = new[]
+                new BlockMediaType
                 {
-                    new BlockMediaType
+                    Image = new ImageType
                     {
-                        Image = new ImageType
+                        format          = "Directory",
+                        offsetSpecified = false,
+                        Value           = folderName
+                    },
+                    Sequence = new SequenceType
+                    {
+                        MediaTitle    = folderName,
+                        MediaSequence = 1,
+                        TotalMedia    = 1
+                    },
+                    PhysicalBlockSize = blockSize,
+                    LogicalBlockSize  = blockSize,
+                    TapeInformation = new[]
+                    {
+                        new TapePartitionType
                         {
-                            format          = "Directory",
-                            offsetSpecified = false,
-                            Value           = folderName
-                        },
-                        Sequence = new SequenceType
-                        {
-                            MediaTitle    = folderName,
-                            MediaSequence = 1,
-                            TotalMedia    = 1
-                        },
-                        PhysicalBlockSize = blockSize,
-                        LogicalBlockSize  = blockSize,
-                        TapeInformation = new[]
-                        {
-                            new TapePartitionType
+                            Image = new ImageType
                             {
-                                Image = new ImageType
-                                {
-                                    format          = "Directory",
-                                    offsetSpecified = false,
-                                    Value           = folderName
-                                }
+                                format          = "Directory",
+                                offsetSpecified = false,
+                                Value           = folderName
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
+        if(_aborted)
+            return _sidecar;
+
+        ulong              currentBlock = 0;
+        ulong              totalSize    = 0;
+        var                tapeWorker   = new Checksum();
+        List<TapeFileType> tapeFiles    = new List<TapeFileType>();
+
+        UpdateStatus("Hashing files...");
+
+        for(int i = 0; i < files.Count; i++)
+        {
             if(_aborted)
                 return _sidecar;
 
-            ulong              currentBlock = 0;
-            ulong              totalSize    = 0;
-            var                tapeWorker   = new Checksum();
-            List<TapeFileType> tapeFiles    = new List<TapeFileType>();
+            _fs = new FileStream(files[i], FileMode.Open, FileAccess.Read);
+            var fileWorker = new Checksum();
 
-            UpdateStatus("Hashing files...");
+            var tapeFile = new TapeFileType
+            {
+                Image = new ImageType
+                {
+                    format = "Raw disk image (sector by sector copy)",
+                    offset = 0,
+                    Value  = Path.GetFileName(files[i])
+                },
+                Size       = (ulong)_fs.Length,
+                BlockSize  = blockSize,
+                StartBlock = currentBlock,
+                Sequence   = (ulong)i
+            };
 
-            for(int i = 0; i < files.Count; i++)
+            const uint sectorsToRead = 512;
+            ulong      sectors       = (ulong)_fs.Length / blockSize;
+            ulong      doneSectors   = 0;
+
+            InitProgress2();
+
+            while(doneSectors < sectors)
             {
                 if(_aborted)
+                {
+                    EndProgress2();
+
                     return _sidecar;
-
-                _fs = new FileStream(files[i], FileMode.Open, FileAccess.Read);
-                var fileWorker = new Checksum();
-
-                var tapeFile = new TapeFileType
-                {
-                    Image = new ImageType
-                    {
-                        format = "Raw disk image (sector by sector copy)",
-                        offset = 0,
-                        Value  = Path.GetFileName(files[i])
-                    },
-                    Size       = (ulong)_fs.Length,
-                    BlockSize  = blockSize,
-                    StartBlock = currentBlock,
-                    Sequence   = (ulong)i
-                };
-
-                const uint sectorsToRead = 512;
-                ulong      sectors       = (ulong)_fs.Length / blockSize;
-                ulong      doneSectors   = 0;
-
-                InitProgress2();
-
-                while(doneSectors < sectors)
-                {
-                    if(_aborted)
-                    {
-                        EndProgress2();
-
-                        return _sidecar;
-                    }
-
-                    byte[] sector;
-
-                    if(sectors - doneSectors >= sectorsToRead)
-                    {
-                        sector = new byte[sectorsToRead * blockSize];
-                        _fs.Read(sector, 0, sector.Length);
-
-                        UpdateProgress2($"Hashing block {doneSectors} of {sectors} on file {i + 1} of {files.Count}",
-                                        (long)doneSectors, (long)sectors);
-
-                        doneSectors += sectorsToRead;
-                    }
-                    else
-                    {
-                        sector = new byte[(uint)(sectors - doneSectors) * blockSize];
-                        _fs.Read(sector, 0, sector.Length);
-
-                        UpdateProgress2($"Hashing block {doneSectors} of {sectors} on file {i + 1} of {files.Count}",
-                                        (long)doneSectors, (long)sectors);
-
-                        doneSectors += sectors - doneSectors;
-                    }
-
-                    fileWorker.Update(sector);
-                    tapeWorker.Update(sector);
                 }
 
-                tapeFile.EndBlock  =  tapeFile.StartBlock + sectors - 1;
-                currentBlock       += sectors;
-                totalSize          += (ulong)_fs.Length;
-                tapeFile.Checksums =  fileWorker.End().ToArray();
-                tapeFiles.Add(tapeFile);
+                byte[] sector;
 
-                EndProgress2();
-            }
+                if(sectors - doneSectors >= sectorsToRead)
+                {
+                    sector = new byte[sectorsToRead * blockSize];
+                    _fs.Read(sector, 0, sector.Length);
 
-            UpdateStatus("Setting metadata...");
-            _sidecar.BlockMedia[0].Checksums                    = tapeWorker.End().ToArray();
-            _sidecar.BlockMedia[0].ContentChecksums             = _sidecar.BlockMedia[0].Checksums;
-            _sidecar.BlockMedia[0].Size                         = totalSize;
-            _sidecar.BlockMedia[0].LogicalBlocks                = currentBlock;
-            _sidecar.BlockMedia[0].TapeInformation[0].EndBlock  = currentBlock - 1;
-            _sidecar.BlockMedia[0].TapeInformation[0].Size      = totalSize;
-            _sidecar.BlockMedia[0].TapeInformation[0].Checksums = _sidecar.BlockMedia[0].Checksums;
-            _sidecar.BlockMedia[0].TapeInformation[0].File      = tapeFiles.ToArray();
+                    UpdateProgress2($"Hashing block {doneSectors} of {sectors} on file {i + 1} of {files.Count}",
+                                    (long)doneSectors, (long)sectors);
 
-            // This is purely for convenience, as typically these kind of data represents QIC tapes
-            if(blockSize == 512)
-            {
-                _sidecar.BlockMedia[0].DiskType = "Quarter-inch cartridge";
-
-                if(totalSize <= 20 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-11";
-                else if(totalSize <= 40 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-40";
-                else if(totalSize <= 60 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-24";
-                else if(totalSize <= 80 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-80";
-                else if(totalSize <= 120 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-120";
-                else if(totalSize <= 150 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-150";
-                else if(totalSize <= 320 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-320";
-                else if(totalSize <= 340 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-3010";
-                else if(totalSize <= 525 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-525";
-                else if(totalSize <= 670 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-3020";
-                else if(totalSize <= 1200 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-3080";
-                else if(totalSize <= 1350 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-1350";
-                else if(totalSize <= (long)4000 * 1048576)
-                    _sidecar.BlockMedia[0].DiskSubType = "QIC-3095";
+                    doneSectors += sectorsToRead;
+                }
                 else
                 {
-                    _sidecar.BlockMedia[0].DiskType    = "Unknown tape";
-                    _sidecar.BlockMedia[0].DiskSubType = "Unknown tape";
+                    sector = new byte[(uint)(sectors - doneSectors) * blockSize];
+                    _fs.Read(sector, 0, sector.Length);
+
+                    UpdateProgress2($"Hashing block {doneSectors} of {sectors} on file {i + 1} of {files.Count}",
+                                    (long)doneSectors, (long)sectors);
+
+                    doneSectors += sectors - doneSectors;
                 }
+
+                fileWorker.Update(sector);
+                tapeWorker.Update(sector);
             }
+
+            tapeFile.EndBlock  =  tapeFile.StartBlock + sectors - 1;
+            currentBlock       += sectors;
+            totalSize          += (ulong)_fs.Length;
+            tapeFile.Checksums =  fileWorker.End().ToArray();
+            tapeFiles.Add(tapeFile);
+
+            EndProgress2();
+        }
+
+        UpdateStatus("Setting metadata...");
+        _sidecar.BlockMedia[0].Checksums                    = tapeWorker.End().ToArray();
+        _sidecar.BlockMedia[0].ContentChecksums             = _sidecar.BlockMedia[0].Checksums;
+        _sidecar.BlockMedia[0].Size                         = totalSize;
+        _sidecar.BlockMedia[0].LogicalBlocks                = currentBlock;
+        _sidecar.BlockMedia[0].TapeInformation[0].EndBlock  = currentBlock - 1;
+        _sidecar.BlockMedia[0].TapeInformation[0].Size      = totalSize;
+        _sidecar.BlockMedia[0].TapeInformation[0].Checksums = _sidecar.BlockMedia[0].Checksums;
+        _sidecar.BlockMedia[0].TapeInformation[0].File      = tapeFiles.ToArray();
+
+        // This is purely for convenience, as typically these kind of data represents QIC tapes
+        if(blockSize == 512)
+        {
+            _sidecar.BlockMedia[0].DiskType = "Quarter-inch cartridge";
+
+            if(totalSize <= 20 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-11";
+            else if(totalSize <= 40 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-40";
+            else if(totalSize <= 60 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-24";
+            else if(totalSize <= 80 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-80";
+            else if(totalSize <= 120 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-120";
+            else if(totalSize <= 150 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-150";
+            else if(totalSize <= 320 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-320";
+            else if(totalSize <= 340 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-3010";
+            else if(totalSize <= 525 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-525";
+            else if(totalSize <= 670 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-3020";
+            else if(totalSize <= 1200 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-3080";
+            else if(totalSize <= 1350 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-1350";
+            else if(totalSize <= (long)4000 * 1048576)
+                _sidecar.BlockMedia[0].DiskSubType = "QIC-3095";
             else
             {
                 _sidecar.BlockMedia[0].DiskType    = "Unknown tape";
                 _sidecar.BlockMedia[0].DiskSubType = "Unknown tape";
             }
-
-            return _sidecar;
         }
+        else
+        {
+            _sidecar.BlockMedia[0].DiskType    = "Unknown tape";
+            _sidecar.BlockMedia[0].DiskSubType = "Unknown tape";
+        }
+
+        return _sidecar;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Sidecar/Events.cs b/Aaru.Core/Sidecar/Events.cs
index 197874c36..f5d8868ca 100644
--- a/Aaru.Core/Sidecar/Events.cs
+++ b/Aaru.Core/Sidecar/Events.cs
@@ -32,47 +32,46 @@
 
 using Aaru.CommonTypes;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+public sealed partial class Sidecar
 {
-    public sealed partial class Sidecar
-    {
-        /// <summary>Initializes a progress indicator (e.g. makes a progress bar visible)</summary>
-        public event InitProgressHandler InitProgressEvent;
-        /// <summary>Updates a progress indicator with text</summary>
-        public event UpdateProgressHandler UpdateProgressEvent;
-        /// <summary>Uninitializes a progress indicator (e.g. adds a newline to the console)</summary>
-        public event EndProgressHandler EndProgressEvent;
-        /// <summary>Initializes a secondary progress indicator (e.g. makes a progress bar visible)</summary>
-        public event InitProgressHandler2 InitProgressEvent2;
-        /// <summary>Event raised to update the values of a determinate progress bar</summary>
-        public event UpdateProgressHandler2 UpdateProgressEvent2;
-        /// <summary>Event raised when the progress bar is not longer needed</summary>
-        public event EndProgressHandler2 EndProgressEvent2;
-        /// <summary>Updates a status indicator</summary>
-        public event UpdateStatusHandler UpdateStatusEvent;
+    /// <summary>Initializes a progress indicator (e.g. makes a progress bar visible)</summary>
+    public event InitProgressHandler InitProgressEvent;
+    /// <summary>Updates a progress indicator with text</summary>
+    public event UpdateProgressHandler UpdateProgressEvent;
+    /// <summary>Uninitializes a progress indicator (e.g. adds a newline to the console)</summary>
+    public event EndProgressHandler EndProgressEvent;
+    /// <summary>Initializes a secondary progress indicator (e.g. makes a progress bar visible)</summary>
+    public event InitProgressHandler2 InitProgressEvent2;
+    /// <summary>Event raised to update the values of a determinate progress bar</summary>
+    public event UpdateProgressHandler2 UpdateProgressEvent2;
+    /// <summary>Event raised when the progress bar is not longer needed</summary>
+    public event EndProgressHandler2 EndProgressEvent2;
+    /// <summary>Updates a status indicator</summary>
+    public event UpdateStatusHandler UpdateStatusEvent;
 
-        /// <summary>Initializes a progress indicator (e.g. makes a progress bar visible)</summary>
-        public void InitProgress() => InitProgressEvent?.Invoke();
+    /// <summary>Initializes a progress indicator (e.g. makes a progress bar visible)</summary>
+    public void InitProgress() => InitProgressEvent?.Invoke();
 
-        /// <summary>Updates a progress indicator with text</summary>
-        public void UpdateProgress(string text, long current, long maximum) =>
-            UpdateProgressEvent?.Invoke(string.Format(text, current, maximum), current, maximum);
+    /// <summary>Updates a progress indicator with text</summary>
+    public void UpdateProgress(string text, long current, long maximum) =>
+        UpdateProgressEvent?.Invoke(string.Format(text, current, maximum), current, maximum);
 
-        /// <summary>Uninitializes a progress indicator (e.g. adds a newline to the console)</summary>
-        public void EndProgress() => EndProgressEvent?.Invoke();
+    /// <summary>Uninitializes a progress indicator (e.g. adds a newline to the console)</summary>
+    public void EndProgress() => EndProgressEvent?.Invoke();
 
-        /// <summary>Initializes a secondary progress indicator (e.g. makes a progress bar visible)</summary>
-        public void InitProgress2() => InitProgressEvent2?.Invoke();
+    /// <summary>Initializes a secondary progress indicator (e.g. makes a progress bar visible)</summary>
+    public void InitProgress2() => InitProgressEvent2?.Invoke();
 
-        /// <summary>Event raised to update the values of a determinate progress bar</summary>
-        public void UpdateProgress2(string text, long current, long maximum) =>
-            UpdateProgressEvent2?.Invoke(string.Format(text, current, maximum), current, maximum);
+    /// <summary>Event raised to update the values of a determinate progress bar</summary>
+    public void UpdateProgress2(string text, long current, long maximum) =>
+        UpdateProgressEvent2?.Invoke(string.Format(text, current, maximum), current, maximum);
 
-        /// <summary>Event raised when the progress bar is not longer needed</summary>
-        public void EndProgress2() => EndProgressEvent2?.Invoke();
+    /// <summary>Event raised when the progress bar is not longer needed</summary>
+    public void EndProgress2() => EndProgressEvent2?.Invoke();
 
-        /// <summary>Updates a status indicator</summary>
-        public void UpdateStatus(string text, params object[] args) =>
-            UpdateStatusEvent?.Invoke(string.Format(text, args));
-    }
+    /// <summary>Updates a status indicator</summary>
+    public void UpdateStatus(string text, params object[] args) =>
+        UpdateStatusEvent?.Invoke(string.Format(text, args));
 }
\ No newline at end of file
diff --git a/Aaru.Core/Sidecar/Files.cs b/Aaru.Core/Sidecar/Files.cs
index 22256c4c2..fa91675e1 100644
--- a/Aaru.Core/Sidecar/Files.cs
+++ b/Aaru.Core/Sidecar/Files.cs
@@ -40,288 +40,287 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 using Schemas;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+public sealed partial class Sidecar
 {
-    public sealed partial class Sidecar
+    FilesystemContentsType Files(IReadOnlyFilesystem filesystem)
     {
-        FilesystemContentsType Files(IReadOnlyFilesystem filesystem)
-        {
-            var contents = new FilesystemContentsType();
+        var contents = new FilesystemContentsType();
 
-            ErrorNumber ret = filesystem.ReadDir("/", out List<string> dirents);
+        ErrorNumber ret = filesystem.ReadDir("/", out List<string> dirents);
+
+        if(ret != ErrorNumber.NoError)
+            return null;
+
+        List<DirectoryType>    directories = new();
+        List<ContentsFileType> files       = new();
+
+        foreach(string dirent in dirents)
+        {
+            ret = filesystem.Stat(dirent, out FileEntryInfo stat);
 
             if(ret != ErrorNumber.NoError)
-                return null;
-
-            List<DirectoryType>    directories = new();
-            List<ContentsFileType> files       = new();
-
-            foreach(string dirent in dirents)
             {
-                ret = filesystem.Stat(dirent, out FileEntryInfo stat);
+                AaruConsole.DebugWriteLine("Create-Sidecar command", "Cannot stat {0}", dirent);
 
-                if(ret != ErrorNumber.NoError)
-                {
-                    AaruConsole.DebugWriteLine("Create-Sidecar command", "Cannot stat {0}", dirent);
-
-                    continue;
-                }
-
-                if(stat.Attributes.HasFlag(FileAttributes.Directory))
-                {
-                    directories.Add(SidecarDirectory(filesystem, "", dirent, stat));
-
-                    continue;
-                }
-
-                files.Add(SidecarFile(filesystem, "", dirent, stat));
+                continue;
             }
 
-            if(files.Count > 0)
-                contents.File = files.OrderBy(f => f.name).ToArray();
+            if(stat.Attributes.HasFlag(FileAttributes.Directory))
+            {
+                directories.Add(SidecarDirectory(filesystem, "", dirent, stat));
 
-            if(directories.Count > 0)
-                contents.Directory = directories.OrderBy(d => d.name).ToArray();
+                continue;
+            }
 
-            return contents;
+            files.Add(SidecarFile(filesystem, "", dirent, stat));
         }
 
-        DirectoryType SidecarDirectory(IReadOnlyFilesystem filesystem, string path, string filename, FileEntryInfo stat)
+        if(files.Count > 0)
+            contents.File = files.OrderBy(f => f.name).ToArray();
+
+        if(directories.Count > 0)
+            contents.Directory = directories.OrderBy(d => d.name).ToArray();
+
+        return contents;
+    }
+
+    DirectoryType SidecarDirectory(IReadOnlyFilesystem filesystem, string path, string filename, FileEntryInfo stat)
+    {
+        var directory = new DirectoryType();
+
+        if(stat.AccessTimeUtc.HasValue)
         {
-            var directory = new DirectoryType();
+            directory.accessTime          = stat.AccessTimeUtc.Value;
+            directory.accessTimeSpecified = true;
+        }
 
-            if(stat.AccessTimeUtc.HasValue)
-            {
-                directory.accessTime          = stat.AccessTimeUtc.Value;
-                directory.accessTimeSpecified = true;
-            }
+        directory.attributes = (ulong)stat.Attributes;
 
-            directory.attributes = (ulong)stat.Attributes;
+        if(stat.BackupTimeUtc.HasValue)
+        {
+            directory.backupTime          = stat.BackupTimeUtc.Value;
+            directory.backupTimeSpecified = true;
+        }
 
-            if(stat.BackupTimeUtc.HasValue)
-            {
-                directory.backupTime          = stat.BackupTimeUtc.Value;
-                directory.backupTimeSpecified = true;
-            }
+        if(stat.CreationTimeUtc.HasValue)
+        {
+            directory.creationTime          = stat.CreationTimeUtc.Value;
+            directory.creationTimeSpecified = true;
+        }
 
-            if(stat.CreationTimeUtc.HasValue)
-            {
-                directory.creationTime          = stat.CreationTimeUtc.Value;
-                directory.creationTimeSpecified = true;
-            }
+        if(stat.DeviceNo.HasValue)
+        {
+            directory.deviceNumber          = stat.DeviceNo.Value;
+            directory.deviceNumberSpecified = true;
+        }
 
-            if(stat.DeviceNo.HasValue)
-            {
-                directory.deviceNumber          = stat.DeviceNo.Value;
-                directory.deviceNumberSpecified = true;
-            }
+        directory.inode = stat.Inode;
 
-            directory.inode = stat.Inode;
+        if(stat.LastWriteTimeUtc.HasValue)
+        {
+            directory.lastWriteTime          = stat.LastWriteTimeUtc.Value;
+            directory.lastWriteTimeSpecified = true;
+        }
 
-            if(stat.LastWriteTimeUtc.HasValue)
-            {
-                directory.lastWriteTime          = stat.LastWriteTimeUtc.Value;
-                directory.lastWriteTimeSpecified = true;
-            }
+        directory.links = stat.Links;
+        directory.name  = filename;
 
-            directory.links = stat.Links;
-            directory.name  = filename;
+        if(stat.GID.HasValue)
+        {
+            directory.posixGroupId          = stat.GID.Value;
+            directory.posixGroupIdSpecified = true;
+        }
 
-            if(stat.GID.HasValue)
-            {
-                directory.posixGroupId          = stat.GID.Value;
-                directory.posixGroupIdSpecified = true;
-            }
+        if(stat.Mode.HasValue)
+        {
+            directory.posixMode          = stat.Mode.Value;
+            directory.posixModeSpecified = true;
+        }
 
-            if(stat.Mode.HasValue)
-            {
-                directory.posixMode          = stat.Mode.Value;
-                directory.posixModeSpecified = true;
-            }
+        if(stat.UID.HasValue)
+        {
+            directory.posixUserId          = stat.UID.Value;
+            directory.posixUserIdSpecified = true;
+        }
 
-            if(stat.UID.HasValue)
-            {
-                directory.posixUserId          = stat.UID.Value;
-                directory.posixUserIdSpecified = true;
-            }
+        if(stat.StatusChangeTimeUtc.HasValue)
+        {
+            directory.statusChangeTime          = stat.StatusChangeTimeUtc.Value;
+            directory.statusChangeTimeSpecified = true;
+        }
 
-            if(stat.StatusChangeTimeUtc.HasValue)
-            {
-                directory.statusChangeTime          = stat.StatusChangeTimeUtc.Value;
-                directory.statusChangeTimeSpecified = true;
-            }
+        ErrorNumber ret = filesystem.ReadDir(path + "/" + filename, out List<string> dirents);
 
-            ErrorNumber ret = filesystem.ReadDir(path + "/" + filename, out List<string> dirents);
+        if(ret != ErrorNumber.NoError)
+            return null;
+
+        List<DirectoryType>    directories = new();
+        List<ContentsFileType> files       = new();
+
+        foreach(string dirent in dirents)
+        {
+            ret = filesystem.Stat(path + "/" + filename + "/" + dirent, out FileEntryInfo entryStat);
 
             if(ret != ErrorNumber.NoError)
-                return null;
-
-            List<DirectoryType>    directories = new();
-            List<ContentsFileType> files       = new();
-
-            foreach(string dirent in dirents)
             {
-                ret = filesystem.Stat(path + "/" + filename + "/" + dirent, out FileEntryInfo entryStat);
+                AaruConsole.DebugWriteLine("Create-Sidecar command", "Cannot stat {0}", dirent);
 
-                if(ret != ErrorNumber.NoError)
-                {
-                    AaruConsole.DebugWriteLine("Create-Sidecar command", "Cannot stat {0}", dirent);
-
-                    continue;
-                }
-
-                if(entryStat.Attributes.HasFlag(FileAttributes.Directory))
-                {
-                    directories.Add(SidecarDirectory(filesystem, path + "/" + filename, dirent, entryStat));
-
-                    continue;
-                }
-
-                files.Add(SidecarFile(filesystem, path + "/" + filename, dirent, entryStat));
+                continue;
             }
 
-            if(files.Count > 0)
-                directory.File = files.OrderBy(f => f.name).ToArray();
+            if(entryStat.Attributes.HasFlag(FileAttributes.Directory))
+            {
+                directories.Add(SidecarDirectory(filesystem, path + "/" + filename, dirent, entryStat));
 
-            if(directories.Count > 0)
-                directory.Directory = directories.OrderBy(d => d.name).ToArray();
+                continue;
+            }
 
-            return directory;
+            files.Add(SidecarFile(filesystem, path + "/" + filename, dirent, entryStat));
         }
 
-        ContentsFileType SidecarFile(IReadOnlyFilesystem filesystem, string path, string filename, FileEntryInfo stat)
+        if(files.Count > 0)
+            directory.File = files.OrderBy(f => f.name).ToArray();
+
+        if(directories.Count > 0)
+            directory.Directory = directories.OrderBy(d => d.name).ToArray();
+
+        return directory;
+    }
+
+    ContentsFileType SidecarFile(IReadOnlyFilesystem filesystem, string path, string filename, FileEntryInfo stat)
+    {
+        var file          = new ContentsFileType();
+        var fileChkWorker = new Checksum();
+
+        if(stat.AccessTimeUtc.HasValue)
         {
-            var file          = new ContentsFileType();
-            var fileChkWorker = new Checksum();
+            file.accessTime          = stat.AccessTimeUtc.Value;
+            file.accessTimeSpecified = true;
+        }
 
-            if(stat.AccessTimeUtc.HasValue)
+        file.attributes = (ulong)stat.Attributes;
+
+        if(stat.BackupTimeUtc.HasValue)
+        {
+            file.backupTime          = stat.BackupTimeUtc.Value;
+            file.backupTimeSpecified = true;
+        }
+
+        if(stat.CreationTimeUtc.HasValue)
+        {
+            file.creationTime          = stat.CreationTimeUtc.Value;
+            file.creationTimeSpecified = true;
+        }
+
+        if(stat.DeviceNo.HasValue)
+        {
+            file.deviceNumber          = stat.DeviceNo.Value;
+            file.deviceNumberSpecified = true;
+        }
+
+        file.inode = stat.Inode;
+
+        if(stat.LastWriteTimeUtc.HasValue)
+        {
+            file.lastWriteTime          = stat.LastWriteTimeUtc.Value;
+            file.lastWriteTimeSpecified = true;
+        }
+
+        file.length = (ulong)stat.Length;
+        file.links  = stat.Links;
+        file.name   = filename;
+
+        if(stat.GID.HasValue)
+        {
+            file.posixGroupId          = stat.GID.Value;
+            file.posixGroupIdSpecified = true;
+        }
+
+        if(stat.Mode.HasValue)
+        {
+            file.posixMode          = stat.Mode.Value;
+            file.posixModeSpecified = true;
+        }
+
+        if(stat.UID.HasValue)
+        {
+            file.posixUserId          = stat.UID.Value;
+            file.posixUserIdSpecified = true;
+        }
+
+        if(stat.StatusChangeTimeUtc.HasValue)
+        {
+            file.statusChangeTime          = stat.StatusChangeTimeUtc.Value;
+            file.statusChangeTimeSpecified = true;
+        }
+
+        byte[] data = Array.Empty<byte>();
+
+        if(stat.Length > 0)
+        {
+            long position = 0;
+            UpdateStatus($"Hashing file {path}/{filename}...");
+            InitProgress2();
+
+            while(position < stat.Length - 1048576)
             {
-                file.accessTime          = stat.AccessTimeUtc.Value;
-                file.accessTimeSpecified = true;
-            }
+                if(_aborted)
+                    return file;
 
-            file.attributes = (ulong)stat.Attributes;
-
-            if(stat.BackupTimeUtc.HasValue)
-            {
-                file.backupTime          = stat.BackupTimeUtc.Value;
-                file.backupTimeSpecified = true;
-            }
-
-            if(stat.CreationTimeUtc.HasValue)
-            {
-                file.creationTime          = stat.CreationTimeUtc.Value;
-                file.creationTimeSpecified = true;
-            }
-
-            if(stat.DeviceNo.HasValue)
-            {
-                file.deviceNumber          = stat.DeviceNo.Value;
-                file.deviceNumberSpecified = true;
-            }
-
-            file.inode = stat.Inode;
-
-            if(stat.LastWriteTimeUtc.HasValue)
-            {
-                file.lastWriteTime          = stat.LastWriteTimeUtc.Value;
-                file.lastWriteTimeSpecified = true;
-            }
-
-            file.length = (ulong)stat.Length;
-            file.links  = stat.Links;
-            file.name   = filename;
-
-            if(stat.GID.HasValue)
-            {
-                file.posixGroupId          = stat.GID.Value;
-                file.posixGroupIdSpecified = true;
-            }
-
-            if(stat.Mode.HasValue)
-            {
-                file.posixMode          = stat.Mode.Value;
-                file.posixModeSpecified = true;
-            }
-
-            if(stat.UID.HasValue)
-            {
-                file.posixUserId          = stat.UID.Value;
-                file.posixUserIdSpecified = true;
-            }
-
-            if(stat.StatusChangeTimeUtc.HasValue)
-            {
-                file.statusChangeTime          = stat.StatusChangeTimeUtc.Value;
-                file.statusChangeTimeSpecified = true;
-            }
-
-            byte[] data = Array.Empty<byte>();
-
-            if(stat.Length > 0)
-            {
-                long position = 0;
-                UpdateStatus($"Hashing file {path}/{filename}...");
-                InitProgress2();
-
-                while(position < stat.Length - 1048576)
-                {
-                    if(_aborted)
-                        return file;
-
-                    data = new byte[1048576];
-                    filesystem.Read(path + "/" + filename, position, 1048576, ref data);
-
-                    UpdateProgress2("Hashing file byte {0} of {1}", position, stat.Length);
-
-                    fileChkWorker.Update(data);
-
-                    position += 1048576;
-                }
-
-                data = new byte[stat.Length - position];
-                filesystem.Read(path + "/" + filename, position, stat.Length - position, ref data);
+                data = new byte[1048576];
+                filesystem.Read(path + "/" + filename, position, 1048576, ref data);
 
                 UpdateProgress2("Hashing file byte {0} of {1}", position, stat.Length);
 
                 fileChkWorker.Update(data);
 
-                EndProgress2();
-
-                file.Checksums = fileChkWorker.End().ToArray();
+                position += 1048576;
             }
-            else
-                file.Checksums = _emptyChecksums;
 
-            ErrorNumber ret = filesystem.ListXAttr(path + "/" + filename, out List<string> xattrs);
+            data = new byte[stat.Length - position];
+            filesystem.Read(path + "/" + filename, position, stat.Length - position, ref data);
+
+            UpdateProgress2("Hashing file byte {0} of {1}", position, stat.Length);
+
+            fileChkWorker.Update(data);
+
+            EndProgress2();
+
+            file.Checksums = fileChkWorker.End().ToArray();
+        }
+        else
+            file.Checksums = _emptyChecksums;
+
+        ErrorNumber ret = filesystem.ListXAttr(path + "/" + filename, out List<string> xattrs);
+
+        if(ret != ErrorNumber.NoError)
+            return file;
+
+        List<ExtendedAttributeType> xattrTypes = new();
+
+        foreach(string xattr in xattrs)
+        {
+            ret = filesystem.GetXattr(path + "/" + filename, xattr, ref data);
 
             if(ret != ErrorNumber.NoError)
-                return file;
+                continue;
 
-            List<ExtendedAttributeType> xattrTypes = new();
+            var xattrChkWorker = new Checksum();
+            xattrChkWorker.Update(data);
 
-            foreach(string xattr in xattrs)
+            xattrTypes.Add(new ExtendedAttributeType
             {
-                ret = filesystem.GetXattr(path + "/" + filename, xattr, ref data);
-
-                if(ret != ErrorNumber.NoError)
-                    continue;
-
-                var xattrChkWorker = new Checksum();
-                xattrChkWorker.Update(data);
-
-                xattrTypes.Add(new ExtendedAttributeType
-                {
-                    Checksums = xattrChkWorker.End().ToArray(),
-                    length    = (ulong)data.Length,
-                    name      = xattr
-                });
-            }
-
-            if(xattrTypes.Count > 0)
-                file.ExtendedAttributes = xattrTypes.OrderBy(x => x.name).ToArray();
-
-            return file;
+                Checksums = xattrChkWorker.End().ToArray(),
+                length    = (ulong)data.Length,
+                name      = xattr
+            });
         }
+
+        if(xattrTypes.Count > 0)
+            file.ExtendedAttributes = xattrTypes.OrderBy(x => x.name).ToArray();
+
+        return file;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Sidecar/Helpers.cs b/Aaru.Core/Sidecar/Helpers.cs
index 3d18e273c..8060390e8 100644
--- a/Aaru.Core/Sidecar/Helpers.cs
+++ b/Aaru.Core/Sidecar/Helpers.cs
@@ -30,66 +30,65 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+public sealed partial class Sidecar
 {
-    public sealed partial class Sidecar
+    /// <summary>Converts a LBA to MM:SS:FF string for CDs</summary>
+    /// <param name="lba">LBA</param>
+    /// <returns>MM:SS:FF</returns>
+    static string LbaToMsf(long lba)
     {
-        /// <summary>Converts a LBA to MM:SS:FF string for CDs</summary>
-        /// <param name="lba">LBA</param>
-        /// <returns>MM:SS:FF</returns>
-        static string LbaToMsf(long lba)
+        long m, s, f;
+
+        if(lba >= -150)
         {
-            long m, s, f;
-
-            if(lba >= -150)
-            {
-                m   =  (lba + 150) / (75 * 60);
-                lba -= m           * (75 * 60);
-                s   =  (lba + 150) / 75;
-                lba -= s           * 75;
-                f   =  lba + 150;
-            }
-            else
-            {
-                m   =  (lba + 450150) / (75 * 60);
-                lba -= m              * (75 * 60);
-                s   =  (lba + 450150) / 75;
-                lba -= s              * 75;
-                f   =  lba + 450150;
-            }
-
-            return $"{m}:{s:D2}:{f:D2}";
+            m   =  (lba + 150) / (75 * 60);
+            lba -= m           * (75 * 60);
+            s   =  (lba + 150) / 75;
+            lba -= s           * 75;
+            f   =  lba + 150;
+        }
+        else
+        {
+            m   =  (lba + 450150) / (75 * 60);
+            lba -= m              * (75 * 60);
+            s   =  (lba + 450150) / 75;
+            lba -= s              * 75;
+            f   =  lba + 450150;
         }
 
-        /// <summary>Converts a LBA to MM:SS:FF string for DDCDs</summary>
-        /// <param name="lba">LBA</param>
-        /// <returns>MM:SS:FF</returns>
-        static string DdcdLbaToMsf(long lba)
+        return $"{m}:{s:D2}:{f:D2}";
+    }
+
+    /// <summary>Converts a LBA to MM:SS:FF string for DDCDs</summary>
+    /// <param name="lba">LBA</param>
+    /// <returns>MM:SS:FF</returns>
+    static string DdcdLbaToMsf(long lba)
+    {
+        long h, m, s, f;
+
+        if(lba >= -150)
         {
-            long h, m, s, f;
-
-            if(lba >= -150)
-            {
-                h   =  (lba + 150) / (75 * 60 * 60);
-                lba -= h           * (75 * 60 * 60);
-                m   =  (lba + 150) / (75 * 60);
-                lba -= m           * (75 * 60);
-                s   =  (lba + 150) / 75;
-                lba -= s           * 75;
-                f   =  lba + 150;
-            }
-            else
-            {
-                h   =  (lba + (450150 * 2)) / (75 * 60 * 60);
-                lba -= h                    * (75 * 60 * 60);
-                m   =  (lba + (450150 * 2)) / (75 * 60);
-                lba -= m                    * (75 * 60);
-                s   =  (lba + (450150 * 2)) / 75;
-                lba -= s                    * 75;
-                f   =  lba + (450150 * 2);
-            }
-
-            return string.Format("{3}:{0:D2}:{1:D2}:{2:D2}", m, s, f, h);
+            h   =  (lba + 150) / (75 * 60 * 60);
+            lba -= h           * (75 * 60 * 60);
+            m   =  (lba + 150) / (75 * 60);
+            lba -= m           * (75 * 60);
+            s   =  (lba + 150) / 75;
+            lba -= s           * 75;
+            f   =  lba + 150;
         }
+        else
+        {
+            h   =  (lba + (450150 * 2)) / (75 * 60 * 60);
+            lba -= h                    * (75 * 60 * 60);
+            m   =  (lba + (450150 * 2)) / (75 * 60);
+            lba -= m                    * (75 * 60);
+            s   =  (lba + (450150 * 2)) / 75;
+            lba -= s                    * 75;
+            f   =  lba + (450150 * 2);
+        }
+
+        return string.Format("{3}:{0:D2}:{1:D2}:{2:D2}", m, s, f, h);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Sidecar/OpticalDisc.cs b/Aaru.Core/Sidecar/OpticalDisc.cs
index 91a030311..67658d13d 100644
--- a/Aaru.Core/Sidecar/OpticalDisc.cs
+++ b/Aaru.Core/Sidecar/OpticalDisc.cs
@@ -49,648 +49,581 @@ using MediaType = Aaru.CommonTypes.MediaType;
 using Session = Aaru.CommonTypes.Structs.Session;
 using TrackType = Schemas.TrackType;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+public sealed partial class Sidecar
 {
-    public sealed partial class Sidecar
+    /// <summary>Creates a metadata sidecar for an optical disc (e.g. CD, DVD, GD, BD, XGD, GOD)</summary>
+    /// <param name="image">Image</param>
+    /// <param name="filterId">Filter uuid</param>
+    /// <param name="imagePath">Image path</param>
+    /// <param name="fi">Image file information</param>
+    /// <param name="plugins">Image plugins</param>
+    /// <param name="imgChecksums">List of image checksums</param>
+    /// <param name="sidecar">Metadata sidecar</param>
+    /// <param name="encoding">Encoding to be used for filesystem plugins</param>
+    void OpticalDisc(IOpticalMediaImage image, Guid filterId, string imagePath, FileInfo fi, PluginBase plugins,
+                     List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar, Encoding encoding)
     {
-        /// <summary>Creates a metadata sidecar for an optical disc (e.g. CD, DVD, GD, BD, XGD, GOD)</summary>
-        /// <param name="image">Image</param>
-        /// <param name="filterId">Filter uuid</param>
-        /// <param name="imagePath">Image path</param>
-        /// <param name="fi">Image file information</param>
-        /// <param name="plugins">Image plugins</param>
-        /// <param name="imgChecksums">List of image checksums</param>
-        /// <param name="sidecar">Metadata sidecar</param>
-        /// <param name="encoding">Encoding to be used for filesystem plugins</param>
-        void OpticalDisc(IOpticalMediaImage image, Guid filterId, string imagePath, FileInfo fi, PluginBase plugins,
-                         List<ChecksumType> imgChecksums, ref CICMMetadataType sidecar, Encoding encoding)
+        if(_aborted)
+            return;
+
+        sidecar.OpticalDisc = new[]
+        {
+            new OpticalDiscType
+            {
+                Checksums = imgChecksums.ToArray(),
+                Image = new ImageType
+                {
+                    format          = image.Format,
+                    offset          = 0,
+                    offsetSpecified = true,
+                    Value           = Path.GetFileName(imagePath)
+                },
+                Size = (ulong)fi.Length,
+                Sequence = new SequenceType
+                {
+                    MediaTitle = image.Info.MediaTitle
+                }
+            }
+        };
+
+        if(image.Info.MediaSequence     != 0 &&
+           image.Info.LastMediaSequence != 0)
+        {
+            sidecar.OpticalDisc[0].Sequence.MediaSequence = (uint)image.Info.MediaSequence;
+            sidecar.OpticalDisc[0].Sequence.TotalMedia    = (uint)image.Info.LastMediaSequence;
+        }
+        else
+        {
+            sidecar.OpticalDisc[0].Sequence.MediaSequence = 1;
+            sidecar.OpticalDisc[0].Sequence.TotalMedia    = 1;
+        }
+
+        MediaType   dskType = image.Info.MediaType;
+        ErrorNumber errno;
+
+        UpdateStatus("Hashing media tags...");
+
+        foreach(MediaTagType tagType in image.Info.ReadableMediaTags)
         {
             if(_aborted)
                 return;
 
-            sidecar.OpticalDisc = new[]
+            errno = image.ReadMediaTag(tagType, out byte[] tag);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            Dump.AddMediaTagToSidecar(imagePath, tagType, tag, ref sidecar);
+
+            switch(tagType)
             {
-                new OpticalDiscType
-                {
-                    Checksums = imgChecksums.ToArray(),
-                    Image = new ImageType
+                case MediaTagType.CD_ATIP:
+                    ATIP.CDATIP atip = ATIP.Decode(tag);
+
+                    if(atip != null)
+                        if(atip.DDCD)
+                            dskType = atip.DiscType ? MediaType.DDCDRW : MediaType.DDCDR;
+                        else
+                            dskType = atip.DiscType ? MediaType.CDRW : MediaType.CDR;
+
+                    break;
+                case MediaTagType.DVD_DMI:
+                    if(DMI.IsXbox(tag))
                     {
-                        format          = image.Format,
-                        offset          = 0,
-                        offsetSpecified = true,
-                        Value           = Path.GetFileName(imagePath)
-                    },
-                    Size = (ulong)fi.Length,
-                    Sequence = new SequenceType
-                    {
-                        MediaTitle = image.Info.MediaTitle
+                        dskType = MediaType.XGD;
+
+                        sidecar.OpticalDisc[0].Dimensions = new DimensionsType
+                        {
+                            Diameter  = 120,
+                            Thickness = 1.2
+                        };
                     }
-                }
-            };
+                    else if(DMI.IsXbox360(tag))
+                    {
+                        dskType = MediaType.XGD2;
 
-            if(image.Info.MediaSequence     != 0 &&
-               image.Info.LastMediaSequence != 0)
-            {
-                sidecar.OpticalDisc[0].Sequence.MediaSequence = (uint)image.Info.MediaSequence;
-                sidecar.OpticalDisc[0].Sequence.TotalMedia    = (uint)image.Info.LastMediaSequence;
-            }
-            else
-            {
-                sidecar.OpticalDisc[0].Sequence.MediaSequence = 1;
-                sidecar.OpticalDisc[0].Sequence.TotalMedia    = 1;
-            }
-
-            MediaType   dskType = image.Info.MediaType;
-            ErrorNumber errno;
-
-            UpdateStatus("Hashing media tags...");
-
-            foreach(MediaTagType tagType in image.Info.ReadableMediaTags)
-            {
-                if(_aborted)
-                    return;
-
-                errno = image.ReadMediaTag(tagType, out byte[] tag);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                Dump.AddMediaTagToSidecar(imagePath, tagType, tag, ref sidecar);
-
-                switch(tagType)
-                {
-                    case MediaTagType.CD_ATIP:
-                        ATIP.CDATIP atip = ATIP.Decode(tag);
-
-                        if(atip != null)
-                            if(atip.DDCD)
-                                dskType = atip.DiscType ? MediaType.DDCDRW : MediaType.DDCDR;
-                            else
-                                dskType = atip.DiscType ? MediaType.CDRW : MediaType.CDR;
-
-                        break;
-                    case MediaTagType.DVD_DMI:
-                        if(DMI.IsXbox(tag))
+                        sidecar.OpticalDisc[0].Dimensions = new DimensionsType
                         {
-                            dskType = MediaType.XGD;
+                            Diameter  = 120,
+                            Thickness = 1.2
+                        };
+                    }
 
-                            sidecar.OpticalDisc[0].Dimensions = new DimensionsType
-                            {
-                                Diameter  = 120,
-                                Thickness = 1.2
-                            };
-                        }
-                        else if(DMI.IsXbox360(tag))
+                    break;
+                case MediaTagType.DVD_PFI:
+                    PFI.PhysicalFormatInformation? pfi = PFI.Decode(tag, dskType);
+
+                    if(pfi.HasValue)
+                        if(dskType != MediaType.XGD    &&
+                           dskType != MediaType.XGD2   &&
+                           dskType != MediaType.XGD3   &&
+                           dskType != MediaType.PS2DVD &&
+                           dskType != MediaType.PS3DVD &&
+                           dskType != MediaType.Nuon)
                         {
-                            dskType = MediaType.XGD2;
-
-                            sidecar.OpticalDisc[0].Dimensions = new DimensionsType
+                            switch(pfi.Value.DiskCategory)
                             {
-                                Diameter  = 120,
-                                Thickness = 1.2
-                            };
-                        }
+                                case DiskCategory.DVDPR:
+                                    dskType = MediaType.DVDPR;
 
-                        break;
-                    case MediaTagType.DVD_PFI:
-                        PFI.PhysicalFormatInformation? pfi = PFI.Decode(tag, dskType);
+                                    break;
+                                case DiskCategory.DVDPRDL:
+                                    dskType = MediaType.DVDPRDL;
 
-                        if(pfi.HasValue)
-                            if(dskType != MediaType.XGD    &&
-                               dskType != MediaType.XGD2   &&
-                               dskType != MediaType.XGD3   &&
-                               dskType != MediaType.PS2DVD &&
-                               dskType != MediaType.PS3DVD &&
-                               dskType != MediaType.Nuon)
-                            {
-                                switch(pfi.Value.DiskCategory)
-                                {
-                                    case DiskCategory.DVDPR:
-                                        dskType = MediaType.DVDPR;
+                                    break;
+                                case DiskCategory.DVDPRW:
+                                    dskType = MediaType.DVDPRW;
 
-                                        break;
-                                    case DiskCategory.DVDPRDL:
-                                        dskType = MediaType.DVDPRDL;
+                                    break;
+                                case DiskCategory.DVDPRWDL:
+                                    dskType = MediaType.DVDPRWDL;
 
-                                        break;
-                                    case DiskCategory.DVDPRW:
-                                        dskType = MediaType.DVDPRW;
+                                    break;
+                                case DiskCategory.DVDR:
+                                    dskType = MediaType.DVDR;
 
-                                        break;
-                                    case DiskCategory.DVDPRWDL:
-                                        dskType = MediaType.DVDPRWDL;
+                                    break;
+                                case DiskCategory.DVDRAM:
+                                    dskType = MediaType.DVDRAM;
 
-                                        break;
-                                    case DiskCategory.DVDR:
-                                        dskType = MediaType.DVDR;
+                                    break;
+                                case DiskCategory.DVDROM:
+                                    dskType = MediaType.DVDROM;
 
-                                        break;
-                                    case DiskCategory.DVDRAM:
-                                        dskType = MediaType.DVDRAM;
+                                    break;
+                                case DiskCategory.DVDRW:
+                                    dskType = MediaType.DVDRW;
 
-                                        break;
-                                    case DiskCategory.DVDROM:
-                                        dskType = MediaType.DVDROM;
+                                    break;
+                                case DiskCategory.HDDVDR:
+                                    dskType = MediaType.HDDVDR;
 
-                                        break;
-                                    case DiskCategory.DVDRW:
-                                        dskType = MediaType.DVDRW;
+                                    break;
+                                case DiskCategory.HDDVDRAM:
+                                    dskType = MediaType.HDDVDRAM;
 
-                                        break;
-                                    case DiskCategory.HDDVDR:
-                                        dskType = MediaType.HDDVDR;
+                                    break;
+                                case DiskCategory.HDDVDROM:
+                                    dskType = MediaType.HDDVDROM;
 
-                                        break;
-                                    case DiskCategory.HDDVDRAM:
-                                        dskType = MediaType.HDDVDRAM;
+                                    break;
+                                case DiskCategory.HDDVDRW:
+                                    dskType = MediaType.HDDVDRW;
 
-                                        break;
-                                    case DiskCategory.HDDVDROM:
-                                        dskType = MediaType.HDDVDROM;
+                                    break;
+                                case DiskCategory.Nintendo:
+                                    dskType = MediaType.GOD;
 
-                                        break;
-                                    case DiskCategory.HDDVDRW:
-                                        dskType = MediaType.HDDVDRW;
+                                    break;
+                                case DiskCategory.UMD:
+                                    dskType = MediaType.UMD;
 
-                                        break;
-                                    case DiskCategory.Nintendo:
-                                        dskType = MediaType.GOD;
-
-                                        break;
-                                    case DiskCategory.UMD:
-                                        dskType = MediaType.UMD;
-
-                                        break;
-                                }
-
-                                if(dskType               == MediaType.DVDR &&
-                                   pfi.Value.PartVersion >= 6)
-                                    dskType = MediaType.DVDRDL;
-
-                                if(dskType               == MediaType.DVDRW &&
-                                   pfi.Value.PartVersion >= 15)
-                                    dskType = MediaType.DVDRWDL;
-
-                                if(dskType            == MediaType.GOD &&
-                                   pfi.Value.DiscSize == DVDSize.OneTwenty)
-                                    dskType = MediaType.WOD;
-
-                                sidecar.OpticalDisc[0].Dimensions = new DimensionsType();
-
-                                if(dskType == MediaType.UMD)
-                                {
-                                    sidecar.OpticalDisc[0].Dimensions.Height          = 64;
-                                    sidecar.OpticalDisc[0].Dimensions.HeightSpecified = true;
-                                    sidecar.OpticalDisc[0].Dimensions.Width           = 63;
-                                    sidecar.OpticalDisc[0].Dimensions.WidthSpecified  = true;
-                                    sidecar.OpticalDisc[0].Dimensions.Thickness       = 4;
-                                }
-                                else
-                                    switch(pfi.Value.DiscSize)
-                                    {
-                                        case DVDSize.Eighty:
-                                            sidecar.OpticalDisc[0].Dimensions.Diameter          = 80;
-                                            sidecar.OpticalDisc[0].Dimensions.DiameterSpecified = true;
-                                            sidecar.OpticalDisc[0].Dimensions.Thickness         = 1.2;
-
-                                            break;
-                                        case DVDSize.OneTwenty:
-                                            sidecar.OpticalDisc[0].Dimensions.Diameter          = 120;
-                                            sidecar.OpticalDisc[0].Dimensions.DiameterSpecified = true;
-                                            sidecar.OpticalDisc[0].Dimensions.Thickness         = 1.2;
-
-                                            break;
-                                    }
+                                    break;
                             }
 
-                        break;
-                }
-            }
+                            if(dskType               == MediaType.DVDR &&
+                               pfi.Value.PartVersion >= 6)
+                                dskType = MediaType.DVDRDL;
 
-            try
-            {
-                List<Session> sessions = image.Sessions;
-                sidecar.OpticalDisc[0].Sessions = (uint)(sessions?.Count ?? 1);
-            }
-            catch
-            {
-                sidecar.OpticalDisc[0].Sessions = 1;
-            }
+                            if(dskType               == MediaType.DVDRW &&
+                               pfi.Value.PartVersion >= 15)
+                                dskType = MediaType.DVDRWDL;
 
-            List<Track>     tracks  = image.Tracks;
-            List<TrackType> trksLst = null;
+                            if(dskType            == MediaType.GOD &&
+                               pfi.Value.DiscSize == DVDSize.OneTwenty)
+                                dskType = MediaType.WOD;
 
-            if(tracks != null)
-            {
-                sidecar.OpticalDisc[0].Tracks    = new uint[1];
-                sidecar.OpticalDisc[0].Tracks[0] = (uint)tracks.Count;
-                trksLst                          = new List<TrackType>();
-            }
+                            sidecar.OpticalDisc[0].Dimensions = new DimensionsType();
 
-            if(sidecar.OpticalDisc[0].Dimensions == null &&
-               image.Info.MediaType              != MediaType.Unknown)
-                sidecar.OpticalDisc[0].Dimensions = Dimensions.DimensionsFromMediaType(image.Info.MediaType);
+                            if(dskType == MediaType.UMD)
+                            {
+                                sidecar.OpticalDisc[0].Dimensions.Height          = 64;
+                                sidecar.OpticalDisc[0].Dimensions.HeightSpecified = true;
+                                sidecar.OpticalDisc[0].Dimensions.Width           = 63;
+                                sidecar.OpticalDisc[0].Dimensions.WidthSpecified  = true;
+                                sidecar.OpticalDisc[0].Dimensions.Thickness       = 4;
+                            }
+                            else
+                                switch(pfi.Value.DiscSize)
+                                {
+                                    case DVDSize.Eighty:
+                                        sidecar.OpticalDisc[0].Dimensions.Diameter          = 80;
+                                        sidecar.OpticalDisc[0].Dimensions.DiameterSpecified = true;
+                                        sidecar.OpticalDisc[0].Dimensions.Thickness         = 1.2;
 
-            if(_aborted)
-                return;
+                                        break;
+                                    case DVDSize.OneTwenty:
+                                        sidecar.OpticalDisc[0].Dimensions.Diameter          = 120;
+                                        sidecar.OpticalDisc[0].Dimensions.DiameterSpecified = true;
+                                        sidecar.OpticalDisc[0].Dimensions.Thickness         = 1.2;
 
-            InitProgress();
-
-            UpdateStatus("Checking filesystems");
-            List<Partition> partitions = Partitions.GetAll(image);
-            Partitions.AddSchemesToStats(partitions);
-
-            UpdateStatus("Hashing tracks...");
-
-            foreach(Track trk in tracks)
-            {
-                if(_aborted)
-                {
-                    EndProgress();
-
-                    return;
-                }
-
-                var xmlTrk = new TrackType();
-
-                switch(trk.Type)
-                {
-                    case CommonTypes.Enums.TrackType.Audio:
-                        xmlTrk.TrackType1 = TrackTypeTrackType.audio;
-
-                        break;
-                    case CommonTypes.Enums.TrackType.CdMode2Form2:
-                        xmlTrk.TrackType1 = TrackTypeTrackType.m2f2;
-
-                        break;
-                    case CommonTypes.Enums.TrackType.CdMode2Formless:
-                        xmlTrk.TrackType1 = TrackTypeTrackType.mode2;
-
-                        break;
-                    case CommonTypes.Enums.TrackType.CdMode2Form1:
-                        xmlTrk.TrackType1 = TrackTypeTrackType.m2f1;
-
-                        break;
-                    case CommonTypes.Enums.TrackType.CdMode1:
-                        xmlTrk.TrackType1 = TrackTypeTrackType.mode1;
-
-                        break;
-                    case CommonTypes.Enums.TrackType.Data:
-                        switch(sidecar.OpticalDisc[0].DiscType)
-                        {
-                            case "BD":
-                                xmlTrk.TrackType1 = TrackTypeTrackType.bluray;
-
-                                break;
-                            case "DDCD":
-                                xmlTrk.TrackType1 = TrackTypeTrackType.ddcd;
-
-                                break;
-                            case "DVD":
-                                xmlTrk.TrackType1 = TrackTypeTrackType.dvd;
-
-                                break;
-                            case "HD DVD":
-                                xmlTrk.TrackType1 = TrackTypeTrackType.hddvd;
-
-                                break;
-                            default:
-                                xmlTrk.TrackType1 = TrackTypeTrackType.mode1;
-
-                                break;
+                                        break;
+                                }
                         }
 
-                        break;
+                    break;
+            }
+        }
+
+        try
+        {
+            List<Session> sessions = image.Sessions;
+            sidecar.OpticalDisc[0].Sessions = (uint)(sessions?.Count ?? 1);
+        }
+        catch
+        {
+            sidecar.OpticalDisc[0].Sessions = 1;
+        }
+
+        List<Track>     tracks  = image.Tracks;
+        List<TrackType> trksLst = null;
+
+        if(tracks != null)
+        {
+            sidecar.OpticalDisc[0].Tracks    = new uint[1];
+            sidecar.OpticalDisc[0].Tracks[0] = (uint)tracks.Count;
+            trksLst                          = new List<TrackType>();
+        }
+
+        if(sidecar.OpticalDisc[0].Dimensions == null &&
+           image.Info.MediaType              != MediaType.Unknown)
+            sidecar.OpticalDisc[0].Dimensions = Dimensions.DimensionsFromMediaType(image.Info.MediaType);
+
+        if(_aborted)
+            return;
+
+        InitProgress();
+
+        UpdateStatus("Checking filesystems");
+        List<Partition> partitions = Partitions.GetAll(image);
+        Partitions.AddSchemesToStats(partitions);
+
+        UpdateStatus("Hashing tracks...");
+
+        foreach(Track trk in tracks)
+        {
+            if(_aborted)
+            {
+                EndProgress();
+
+                return;
+            }
+
+            var xmlTrk = new TrackType();
+
+            switch(trk.Type)
+            {
+                case CommonTypes.Enums.TrackType.Audio:
+                    xmlTrk.TrackType1 = TrackTypeTrackType.audio;
+
+                    break;
+                case CommonTypes.Enums.TrackType.CdMode2Form2:
+                    xmlTrk.TrackType1 = TrackTypeTrackType.m2f2;
+
+                    break;
+                case CommonTypes.Enums.TrackType.CdMode2Formless:
+                    xmlTrk.TrackType1 = TrackTypeTrackType.mode2;
+
+                    break;
+                case CommonTypes.Enums.TrackType.CdMode2Form1:
+                    xmlTrk.TrackType1 = TrackTypeTrackType.m2f1;
+
+                    break;
+                case CommonTypes.Enums.TrackType.CdMode1:
+                    xmlTrk.TrackType1 = TrackTypeTrackType.mode1;
+
+                    break;
+                case CommonTypes.Enums.TrackType.Data:
+                    switch(sidecar.OpticalDisc[0].DiscType)
+                    {
+                        case "BD":
+                            xmlTrk.TrackType1 = TrackTypeTrackType.bluray;
+
+                            break;
+                        case "DDCD":
+                            xmlTrk.TrackType1 = TrackTypeTrackType.ddcd;
+
+                            break;
+                        case "DVD":
+                            xmlTrk.TrackType1 = TrackTypeTrackType.dvd;
+
+                            break;
+                        case "HD DVD":
+                            xmlTrk.TrackType1 = TrackTypeTrackType.hddvd;
+
+                            break;
+                        default:
+                            xmlTrk.TrackType1 = TrackTypeTrackType.mode1;
+
+                            break;
+                    }
+
+                    break;
+            }
+
+            xmlTrk.Sequence = new TrackSequenceType
+            {
+                Session     = trk.Session,
+                TrackNumber = trk.Sequence
+            };
+
+            xmlTrk.StartSector = trk.StartSector;
+            xmlTrk.EndSector   = trk.EndSector;
+
+            int idx0 = -1;
+
+            if(trk.Indexes?.TryGetValue(0, out idx0) == true &&
+               idx0                                  >= 0)
+                xmlTrk.StartSector = (ulong)idx0;
+
+            switch(sidecar.OpticalDisc[0].DiscType)
+            {
+                case "CD":
+                case "GD":
+                    xmlTrk.StartMSF = LbaToMsf((long)xmlTrk.StartSector);
+                    xmlTrk.EndMSF   = LbaToMsf((long)xmlTrk.EndSector);
+
+                    break;
+                case "DDCD":
+                    xmlTrk.StartMSF = DdcdLbaToMsf((long)xmlTrk.StartSector);
+                    xmlTrk.EndMSF   = DdcdLbaToMsf((long)xmlTrk.EndSector);
+
+                    break;
+            }
+
+            xmlTrk.Image = new ImageType
+            {
+                Value  = Path.GetFileName(trk.File),
+                format = trk.FileType
+            };
+
+            if(trk.FileOffset > 0)
+            {
+                xmlTrk.Image.offset          = trk.FileOffset;
+                xmlTrk.Image.offsetSpecified = true;
+            }
+
+            xmlTrk.Size = (xmlTrk.EndSector - xmlTrk.StartSector + 1) * (ulong)trk.RawBytesPerSector;
+
+            xmlTrk.BytesPerSector = (uint)trk.BytesPerSector;
+
+            uint  sectorsToRead = 512;
+            ulong sectors       = xmlTrk.EndSector - xmlTrk.StartSector + 1;
+            ulong doneSectors   = 0;
+
+            // If there is only one track, and it's the same as the image file (e.g. ".iso" files), don't re-checksum.
+            if(image.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000") &&
+
+               // Only if filter is none...
+               (filterId == new Guid("12345678-AAAA-BBBB-CCCC-123456789000") ||
+
+                // ...or AppleDouble
+                filterId == new Guid("1b2165ee-c9df-4b21-bbbb-9e5892b2df4d")))
+                xmlTrk.Checksums = sidecar.OpticalDisc[0].Checksums;
+            else
+            {
+                UpdateProgress("Track {0} of {1}", trk.Sequence, tracks.Count);
+
+                // For fast debugging, skip checksum
+                //goto skipChecksum;
+
+                var trkChkWorker = new Checksum();
+
+                InitProgress2();
+
+                while(doneSectors < sectors)
+                {
+                    if(_aborted)
+                    {
+                        EndProgress();
+                        EndProgress2();
+
+                        return;
+                    }
+
+                    byte[] sector;
+
+                    if(sectors - doneSectors >= sectorsToRead)
+                    {
+                        errno = image.ReadSectorsLong(doneSectors, sectorsToRead, xmlTrk.Sequence.TrackNumber,
+                                                      out sector);
+
+                        UpdateProgress2("Hashing sector {0} of {1}", (long)doneSectors,
+                                        (long)(trk.EndSector - trk.StartSector + 1));
+
+                        if(errno != ErrorNumber.NoError)
+                        {
+                            UpdateStatus($"Error {errno} reading sector {doneSectors}");
+                            EndProgress2();
+
+                            return;
+                        }
+
+                        doneSectors += sectorsToRead;
+                    }
+                    else
+                    {
+                        errno = image.ReadSectorsLong(doneSectors, (uint)(sectors - doneSectors),
+                                                      xmlTrk.Sequence.TrackNumber, out sector);
+
+                        UpdateProgress2("Hashing sector {0} of {1}", (long)doneSectors,
+                                        (long)(trk.EndSector - trk.StartSector + 1));
+
+                        if(errno != ErrorNumber.NoError)
+                        {
+                            UpdateStatus($"Error {errno} reading sector {doneSectors}");
+                            EndProgress2();
+
+                            return;
+                        }
+
+                        doneSectors += sectors - doneSectors;
+                    }
+
+                    trkChkWorker.Update(sector);
                 }
 
-                xmlTrk.Sequence = new TrackSequenceType
+                List<ChecksumType> trkChecksums = trkChkWorker.End();
+
+                xmlTrk.Checksums = trkChecksums.ToArray();
+
+                EndProgress2();
+            }
+
+            if(trk.SubchannelType != TrackSubchannelType.None)
+            {
+                xmlTrk.SubChannel = new SubChannelType
                 {
-                    Session     = trk.Session,
-                    TrackNumber = trk.Sequence
+                    Image = new ImageType
+                    {
+                        Value = trk.SubchannelFile
+                    },
+
+                    // TODO: Packed subchannel has different size?
+                    Size = (xmlTrk.EndSector - xmlTrk.StartSector + 1) * 96
                 };
 
-                xmlTrk.StartSector = trk.StartSector;
-                xmlTrk.EndSector   = trk.EndSector;
-
-                int idx0 = -1;
-
-                if(trk.Indexes?.TryGetValue(0, out idx0) == true &&
-                   idx0                                  >= 0)
-                    xmlTrk.StartSector = (ulong)idx0;
-
-                switch(sidecar.OpticalDisc[0].DiscType)
+                switch(trk.SubchannelType)
                 {
-                    case "CD":
-                    case "GD":
-                        xmlTrk.StartMSF = LbaToMsf((long)xmlTrk.StartSector);
-                        xmlTrk.EndMSF   = LbaToMsf((long)xmlTrk.EndSector);
+                    case TrackSubchannelType.Packed:
+                    case TrackSubchannelType.PackedInterleaved:
+                        xmlTrk.SubChannel.Image.format = "rw";
 
                         break;
-                    case "DDCD":
-                        xmlTrk.StartMSF = DdcdLbaToMsf((long)xmlTrk.StartSector);
-                        xmlTrk.EndMSF   = DdcdLbaToMsf((long)xmlTrk.EndSector);
+                    case TrackSubchannelType.Raw:
+                    case TrackSubchannelType.RawInterleaved:
+                        xmlTrk.SubChannel.Image.format = "rw_raw";
+
+                        break;
+                    case TrackSubchannelType.Q16:
+                    case TrackSubchannelType.Q16Interleaved:
+                        xmlTrk.SubChannel.Image.format = "q16";
 
                         break;
                 }
 
-                xmlTrk.Image = new ImageType
-                {
-                    Value  = Path.GetFileName(trk.File),
-                    format = trk.FileType
-                };
-
                 if(trk.FileOffset > 0)
                 {
-                    xmlTrk.Image.offset          = trk.FileOffset;
-                    xmlTrk.Image.offsetSpecified = true;
+                    xmlTrk.SubChannel.Image.offset          = trk.SubchannelOffset;
+                    xmlTrk.SubChannel.Image.offsetSpecified = true;
                 }
 
-                xmlTrk.Size = (xmlTrk.EndSector - xmlTrk.StartSector + 1) * (ulong)trk.RawBytesPerSector;
+                var subChkWorker = new Checksum();
 
-                xmlTrk.BytesPerSector = (uint)trk.BytesPerSector;
+                sectors     = xmlTrk.EndSector - xmlTrk.StartSector + 1;
+                doneSectors = 0;
 
-                uint  sectorsToRead = 512;
-                ulong sectors       = xmlTrk.EndSector - xmlTrk.StartSector + 1;
-                ulong doneSectors   = 0;
+                InitProgress2();
 
-                // If there is only one track, and it's the same as the image file (e.g. ".iso" files), don't re-checksum.
-                if(image.Id == new Guid("12345678-AAAA-BBBB-CCCC-123456789000") &&
-
-                   // Only if filter is none...
-                   (filterId == new Guid("12345678-AAAA-BBBB-CCCC-123456789000") ||
-
-                    // ...or AppleDouble
-                    filterId == new Guid("1b2165ee-c9df-4b21-bbbb-9e5892b2df4d")))
-                    xmlTrk.Checksums = sidecar.OpticalDisc[0].Checksums;
-                else
+                while(doneSectors < sectors)
                 {
-                    UpdateProgress("Track {0} of {1}", trk.Sequence, tracks.Count);
-
-                    // For fast debugging, skip checksum
-                    //goto skipChecksum;
-
-                    var trkChkWorker = new Checksum();
-
-                    InitProgress2();
-
-                    while(doneSectors < sectors)
+                    if(_aborted)
                     {
-                        if(_aborted)
+                        EndProgress();
+                        EndProgress2();
+
+                        return;
+                    }
+
+                    byte[] sector;
+
+                    if(sectors - doneSectors >= sectorsToRead)
+                    {
+                        errno = image.ReadSectorsTag(doneSectors, sectorsToRead, xmlTrk.Sequence.TrackNumber,
+                                                     SectorTagType.CdSectorSubchannel, out sector);
+
+                        UpdateProgress2("Hashing subchannel sector {0} of {1}", (long)doneSectors,
+                                        (long)(trk.EndSector - trk.StartSector + 1));
+
+                        if(errno != ErrorNumber.NoError)
                         {
-                            EndProgress();
+                            UpdateStatus($"Error {errno} reading sector {doneSectors}");
                             EndProgress2();
 
                             return;
                         }
 
-                        byte[] sector;
-
-                        if(sectors - doneSectors >= sectorsToRead)
-                        {
-                            errno = image.ReadSectorsLong(doneSectors, sectorsToRead, xmlTrk.Sequence.TrackNumber,
-                                                          out sector);
-
-                            UpdateProgress2("Hashing sector {0} of {1}", (long)doneSectors,
-                                            (long)(trk.EndSector - trk.StartSector + 1));
-
-                            if(errno != ErrorNumber.NoError)
-                            {
-                                UpdateStatus($"Error {errno} reading sector {doneSectors}");
-                                EndProgress2();
-
-                                return;
-                            }
-
-                            doneSectors += sectorsToRead;
-                        }
-                        else
-                        {
-                            errno = image.ReadSectorsLong(doneSectors, (uint)(sectors - doneSectors),
-                                                          xmlTrk.Sequence.TrackNumber, out sector);
-
-                            UpdateProgress2("Hashing sector {0} of {1}", (long)doneSectors,
-                                            (long)(trk.EndSector - trk.StartSector + 1));
-
-                            if(errno != ErrorNumber.NoError)
-                            {
-                                UpdateStatus($"Error {errno} reading sector {doneSectors}");
-                                EndProgress2();
-
-                                return;
-                            }
-
-                            doneSectors += sectors - doneSectors;
-                        }
-
-                        trkChkWorker.Update(sector);
+                        doneSectors += sectorsToRead;
                     }
-
-                    List<ChecksumType> trkChecksums = trkChkWorker.End();
-
-                    xmlTrk.Checksums = trkChecksums.ToArray();
-
-                    EndProgress2();
-                }
-
-                if(trk.SubchannelType != TrackSubchannelType.None)
-                {
-                    xmlTrk.SubChannel = new SubChannelType
+                    else
                     {
-                        Image = new ImageType
+                        errno = image.ReadSectorsTag(doneSectors, (uint)(sectors - doneSectors),
+                                                     xmlTrk.Sequence.TrackNumber, SectorTagType.CdSectorSubchannel,
+                                                     out sector);
+
+                        UpdateProgress2("Hashing subchannel sector {0} of {1}", (long)doneSectors,
+                                        (long)(trk.EndSector - trk.StartSector + 1));
+
+                        if(errno != ErrorNumber.NoError)
                         {
-                            Value = trk.SubchannelFile
-                        },
-
-                        // TODO: Packed subchannel has different size?
-                        Size = (xmlTrk.EndSector - xmlTrk.StartSector + 1) * 96
-                    };
-
-                    switch(trk.SubchannelType)
-                    {
-                        case TrackSubchannelType.Packed:
-                        case TrackSubchannelType.PackedInterleaved:
-                            xmlTrk.SubChannel.Image.format = "rw";
-
-                            break;
-                        case TrackSubchannelType.Raw:
-                        case TrackSubchannelType.RawInterleaved:
-                            xmlTrk.SubChannel.Image.format = "rw_raw";
-
-                            break;
-                        case TrackSubchannelType.Q16:
-                        case TrackSubchannelType.Q16Interleaved:
-                            xmlTrk.SubChannel.Image.format = "q16";
-
-                            break;
-                    }
-
-                    if(trk.FileOffset > 0)
-                    {
-                        xmlTrk.SubChannel.Image.offset          = trk.SubchannelOffset;
-                        xmlTrk.SubChannel.Image.offsetSpecified = true;
-                    }
-
-                    var subChkWorker = new Checksum();
-
-                    sectors     = xmlTrk.EndSector - xmlTrk.StartSector + 1;
-                    doneSectors = 0;
-
-                    InitProgress2();
-
-                    while(doneSectors < sectors)
-                    {
-                        if(_aborted)
-                        {
-                            EndProgress();
+                            UpdateStatus($"Error {errno} reading sector {doneSectors}");
                             EndProgress2();
 
                             return;
                         }
 
-                        byte[] sector;
-
-                        if(sectors - doneSectors >= sectorsToRead)
-                        {
-                            errno = image.ReadSectorsTag(doneSectors, sectorsToRead, xmlTrk.Sequence.TrackNumber,
-                                                         SectorTagType.CdSectorSubchannel, out sector);
-
-                            UpdateProgress2("Hashing subchannel sector {0} of {1}", (long)doneSectors,
-                                            (long)(trk.EndSector - trk.StartSector + 1));
-
-                            if(errno != ErrorNumber.NoError)
-                            {
-                                UpdateStatus($"Error {errno} reading sector {doneSectors}");
-                                EndProgress2();
-
-                                return;
-                            }
-
-                            doneSectors += sectorsToRead;
-                        }
-                        else
-                        {
-                            errno = image.ReadSectorsTag(doneSectors, (uint)(sectors - doneSectors),
-                                                         xmlTrk.Sequence.TrackNumber, SectorTagType.CdSectorSubchannel,
-                                                         out sector);
-
-                            UpdateProgress2("Hashing subchannel sector {0} of {1}", (long)doneSectors,
-                                            (long)(trk.EndSector - trk.StartSector + 1));
-
-                            if(errno != ErrorNumber.NoError)
-                            {
-                                UpdateStatus($"Error {errno} reading sector {doneSectors}");
-                                EndProgress2();
-
-                                return;
-                            }
-
-                            doneSectors += sectors - doneSectors;
-                        }
-
-                        subChkWorker.Update(sector);
+                        doneSectors += sectors - doneSectors;
                     }
 
-                    List<ChecksumType> subChecksums = subChkWorker.End();
-
-                    xmlTrk.SubChannel.Checksums = subChecksums.ToArray();
-
-                    EndProgress2();
+                    subChkWorker.Update(sector);
                 }
 
-                // For fast debugging, skip checksum
-                //skipChecksum:
+                List<ChecksumType> subChecksums = subChkWorker.End();
 
-                List<Partition> trkPartitions = partitions.
-                                                Where(p => p.Start >= trk.StartSector && p.End <= trk.EndSector).
-                                                ToList();
+                xmlTrk.SubChannel.Checksums = subChecksums.ToArray();
 
-                xmlTrk.FileSystemInformation = new PartitionType[1];
+                EndProgress2();
+            }
 
-                if(trkPartitions.Count > 0)
+            // For fast debugging, skip checksum
+            //skipChecksum:
+
+            List<Partition> trkPartitions = partitions.
+                                            Where(p => p.Start >= trk.StartSector && p.End <= trk.EndSector).
+                                            ToList();
+
+            xmlTrk.FileSystemInformation = new PartitionType[1];
+
+            if(trkPartitions.Count > 0)
+            {
+                xmlTrk.FileSystemInformation = new PartitionType[trkPartitions.Count];
+
+                for(int i = 0; i < trkPartitions.Count; i++)
                 {
-                    xmlTrk.FileSystemInformation = new PartitionType[trkPartitions.Count];
-
-                    for(int i = 0; i < trkPartitions.Count; i++)
+                    xmlTrk.FileSystemInformation[i] = new PartitionType
                     {
-                        xmlTrk.FileSystemInformation[i] = new PartitionType
-                        {
-                            Description = trkPartitions[i].Description,
-                            EndSector   = trkPartitions[i].End,
-                            Name        = trkPartitions[i].Name,
-                            Sequence    = (uint)trkPartitions[i].Sequence,
-                            StartSector = trkPartitions[i].Start,
-                            Type        = trkPartitions[i].Type
-                        };
-
-                        List<FileSystemType> lstFs = new();
-
-                        foreach(IFilesystem plugin in plugins.PluginsList.Values)
-                            try
-                            {
-                                if(_aborted)
-                                {
-                                    EndProgress();
-
-                                    return;
-                                }
-
-                                if(!plugin.Identify(image, trkPartitions[i]))
-                                    continue;
-
-                                plugin.GetInformation(image, trkPartitions[i], out _, encoding);
-                                lstFs.Add(plugin.XmlFsType);
-                                Statistics.AddFilesystem(plugin.XmlFsType.Type);
-
-                                switch(plugin.XmlFsType.Type)
-                                {
-                                    case "Opera":
-                                        dskType = MediaType.ThreeDO;
-
-                                        break;
-                                    case "PC Engine filesystem":
-                                        dskType = MediaType.SuperCDROM2;
-
-                                        break;
-                                    case "Nintendo Wii filesystem":
-                                        dskType = MediaType.WOD;
-
-                                        break;
-                                    case "Nintendo Gamecube filesystem":
-                                        dskType = MediaType.GOD;
-
-                                        break;
-                                }
-                            }
-                            #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
-                            catch
-                                #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
-                            {
-                                //AaruConsole.DebugWriteLine("Create-sidecar command", "Plugin {0} crashed", _plugin.Name);
-                            }
-
-                        if(lstFs.Count > 0)
-                            xmlTrk.FileSystemInformation[i].FileSystems = lstFs.ToArray();
-                    }
-                }
-                else
-                {
-                    xmlTrk.FileSystemInformation[0] = new PartitionType
-                    {
-                        EndSector   = xmlTrk.EndSector,
-                        StartSector = xmlTrk.StartSector
+                        Description = trkPartitions[i].Description,
+                        EndSector   = trkPartitions[i].End,
+                        Name        = trkPartitions[i].Name,
+                        Sequence    = (uint)trkPartitions[i].Sequence,
+                        StartSector = trkPartitions[i].Start,
+                        Type        = trkPartitions[i].Type
                     };
 
                     List<FileSystemType> lstFs = new();
 
-                    var xmlPart = new Partition
-                    {
-                        Start    = xmlTrk.StartSector,
-                        Length   = xmlTrk.EndSector - xmlTrk.StartSector + 1,
-                        Type     = xmlTrk.TrackType1.ToString(),
-                        Size     = xmlTrk.Size,
-                        Sequence = xmlTrk.Sequence.TrackNumber
-                    };
-
                     foreach(IFilesystem plugin in plugins.PluginsList.Values)
                         try
                         {
@@ -701,10 +634,10 @@ namespace Aaru.Core
                                 return;
                             }
 
-                            if(!plugin.Identify(image, xmlPart))
+                            if(!plugin.Identify(image, trkPartitions[i]))
                                 continue;
 
-                            plugin.GetInformation(image, xmlPart, out _, encoding);
+                            plugin.GetInformation(image, trkPartitions[i], out _, encoding);
                             lstFs.Add(plugin.XmlFsType);
                             Statistics.AddFilesystem(plugin.XmlFsType.Type);
 
@@ -736,93 +669,159 @@ namespace Aaru.Core
                         }
 
                     if(lstFs.Count > 0)
-                        xmlTrk.FileSystemInformation[0].FileSystems = lstFs.ToArray();
+                        xmlTrk.FileSystemInformation[i].FileSystems = lstFs.ToArray();
                 }
-
-                errno = image.ReadSectorTag(trk.Sequence, SectorTagType.CdTrackIsrc, out byte[] isrcData);
-
-                if(errno == ErrorNumber.NoError)
-                    xmlTrk.ISRC = Encoding.UTF8.GetString(isrcData);
-
-                errno = image.ReadSectorTag(trk.Sequence, SectorTagType.CdTrackFlags, out byte[] flagsData);
-
-                if(errno == ErrorNumber.NoError)
-                {
-                    var trackFlags = (CdFlags)flagsData[0];
-
-                    xmlTrk.Flags = new TrackFlagsType
-                    {
-                        PreEmphasis   = trackFlags.HasFlag(CdFlags.PreEmphasis),
-                        CopyPermitted = trackFlags.HasFlag(CdFlags.CopyPermitted),
-                        Data          = trackFlags.HasFlag(CdFlags.DataTrack),
-                        Quadraphonic  = trackFlags.HasFlag(CdFlags.FourChannel)
-                    };
-                }
-
-                if(trk.Indexes?.Count > 0)
-                {
-                    xmlTrk.Indexes = trk.Indexes?.OrderBy(i => i.Key).Select(i => new TrackIndexType
-                    {
-                        index = i.Key,
-                        Value = i.Value
-                    }).ToArray();
-                }
-
-                trksLst.Add(xmlTrk);
             }
-
-            EndProgress();
-
-            if(trksLst != null)
-                sidecar.OpticalDisc[0].Track = trksLst.ToArray();
-
-            // All XGD3 all have the same number of blocks
-            if(dskType                             == MediaType.XGD2 &&
-               sidecar.OpticalDisc[0].Track.Length == 1)
+            else
             {
-                ulong blocks = sidecar.OpticalDisc[0].Track[0].EndSector - sidecar.OpticalDisc[0].Track[0].StartSector +
-                               1;
-
-                if(blocks == 25063   || // Locked (or non compatible drive)
-                   blocks == 4229664 || // Xtreme unlock
-                   blocks == 4246304)   // Wxripper unlock
-                    dskType = MediaType.XGD3;
-            }
-
-            (string type, string subType) discType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
-            sidecar.OpticalDisc[0].DiscType    = discType.type;
-            sidecar.OpticalDisc[0].DiscSubType = discType.subType;
-            Statistics.AddMedia(dskType, false);
-
-            if(image.DumpHardware != null)
-                sidecar.OpticalDisc[0].DumpHardwareArray = image.DumpHardware.ToArray();
-            else if(!string.IsNullOrEmpty(image.Info.DriveManufacturer)     ||
-                    !string.IsNullOrEmpty(image.Info.DriveModel)            ||
-                    !string.IsNullOrEmpty(image.Info.DriveFirmwareRevision) ||
-                    !string.IsNullOrEmpty(image.Info.DriveSerialNumber))
-                sidecar.OpticalDisc[0].DumpHardwareArray = new[]
+                xmlTrk.FileSystemInformation[0] = new PartitionType
                 {
-                    new DumpHardwareType
+                    EndSector   = xmlTrk.EndSector,
+                    StartSector = xmlTrk.StartSector
+                };
+
+                List<FileSystemType> lstFs = new();
+
+                var xmlPart = new Partition
+                {
+                    Start    = xmlTrk.StartSector,
+                    Length   = xmlTrk.EndSector - xmlTrk.StartSector + 1,
+                    Type     = xmlTrk.TrackType1.ToString(),
+                    Size     = xmlTrk.Size,
+                    Sequence = xmlTrk.Sequence.TrackNumber
+                };
+
+                foreach(IFilesystem plugin in plugins.PluginsList.Values)
+                    try
                     {
-                        Extents = new[]
+                        if(_aborted)
                         {
-                            new ExtentType
-                            {
-                                Start = 0,
-                                End   = image.Info.Sectors
-                            }
-                        },
-                        Manufacturer = image.Info.DriveManufacturer,
-                        Model        = image.Info.DriveModel,
-                        Firmware     = image.Info.DriveFirmwareRevision,
-                        Serial       = image.Info.DriveSerialNumber,
-                        Software = new SoftwareType
+                            EndProgress();
+
+                            return;
+                        }
+
+                        if(!plugin.Identify(image, xmlPart))
+                            continue;
+
+                        plugin.GetInformation(image, xmlPart, out _, encoding);
+                        lstFs.Add(plugin.XmlFsType);
+                        Statistics.AddFilesystem(plugin.XmlFsType.Type);
+
+                        switch(plugin.XmlFsType.Type)
                         {
-                            Name    = image.Info.Application,
-                            Version = image.Info.ApplicationVersion
+                            case "Opera":
+                                dskType = MediaType.ThreeDO;
+
+                                break;
+                            case "PC Engine filesystem":
+                                dskType = MediaType.SuperCDROM2;
+
+                                break;
+                            case "Nintendo Wii filesystem":
+                                dskType = MediaType.WOD;
+
+                                break;
+                            case "Nintendo Gamecube filesystem":
+                                dskType = MediaType.GOD;
+
+                                break;
                         }
                     }
+                    #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
+                    catch
+                        #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
+                    {
+                        //AaruConsole.DebugWriteLine("Create-sidecar command", "Plugin {0} crashed", _plugin.Name);
+                    }
+
+                if(lstFs.Count > 0)
+                    xmlTrk.FileSystemInformation[0].FileSystems = lstFs.ToArray();
+            }
+
+            errno = image.ReadSectorTag(trk.Sequence, SectorTagType.CdTrackIsrc, out byte[] isrcData);
+
+            if(errno == ErrorNumber.NoError)
+                xmlTrk.ISRC = Encoding.UTF8.GetString(isrcData);
+
+            errno = image.ReadSectorTag(trk.Sequence, SectorTagType.CdTrackFlags, out byte[] flagsData);
+
+            if(errno == ErrorNumber.NoError)
+            {
+                var trackFlags = (CdFlags)flagsData[0];
+
+                xmlTrk.Flags = new TrackFlagsType
+                {
+                    PreEmphasis   = trackFlags.HasFlag(CdFlags.PreEmphasis),
+                    CopyPermitted = trackFlags.HasFlag(CdFlags.CopyPermitted),
+                    Data          = trackFlags.HasFlag(CdFlags.DataTrack),
+                    Quadraphonic  = trackFlags.HasFlag(CdFlags.FourChannel)
                 };
+            }
+
+            if(trk.Indexes?.Count > 0)
+            {
+                xmlTrk.Indexes = trk.Indexes?.OrderBy(i => i.Key).Select(i => new TrackIndexType
+                {
+                    index = i.Key,
+                    Value = i.Value
+                }).ToArray();
+            }
+
+            trksLst.Add(xmlTrk);
         }
+
+        EndProgress();
+
+        if(trksLst != null)
+            sidecar.OpticalDisc[0].Track = trksLst.ToArray();
+
+        // All XGD3 all have the same number of blocks
+        if(dskType                             == MediaType.XGD2 &&
+           sidecar.OpticalDisc[0].Track.Length == 1)
+        {
+            ulong blocks = sidecar.OpticalDisc[0].Track[0].EndSector - sidecar.OpticalDisc[0].Track[0].StartSector +
+                           1;
+
+            if(blocks == 25063   || // Locked (or non compatible drive)
+               blocks == 4229664 || // Xtreme unlock
+               blocks == 4246304)   // Wxripper unlock
+                dskType = MediaType.XGD3;
+        }
+
+        (string type, string subType) discType = CommonTypes.Metadata.MediaType.MediaTypeToString(dskType);
+        sidecar.OpticalDisc[0].DiscType    = discType.type;
+        sidecar.OpticalDisc[0].DiscSubType = discType.subType;
+        Statistics.AddMedia(dskType, false);
+
+        if(image.DumpHardware != null)
+            sidecar.OpticalDisc[0].DumpHardwareArray = image.DumpHardware.ToArray();
+        else if(!string.IsNullOrEmpty(image.Info.DriveManufacturer)     ||
+                !string.IsNullOrEmpty(image.Info.DriveModel)            ||
+                !string.IsNullOrEmpty(image.Info.DriveFirmwareRevision) ||
+                !string.IsNullOrEmpty(image.Info.DriveSerialNumber))
+            sidecar.OpticalDisc[0].DumpHardwareArray = new[]
+            {
+                new DumpHardwareType
+                {
+                    Extents = new[]
+                    {
+                        new ExtentType
+                        {
+                            Start = 0,
+                            End   = image.Info.Sectors
+                        }
+                    },
+                    Manufacturer = image.Info.DriveManufacturer,
+                    Model        = image.Info.DriveModel,
+                    Firmware     = image.Info.DriveFirmwareRevision,
+                    Serial       = image.Info.DriveSerialNumber,
+                    Software = new SoftwareType
+                    {
+                        Name    = image.Info.Application,
+                        Version = image.Info.ApplicationVersion
+                    }
+                }
+            };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Core/Spectre.cs b/Aaru.Core/Spectre.cs
index 08bec295f..1f1232376 100644
--- a/Aaru.Core/Spectre.cs
+++ b/Aaru.Core/Spectre.cs
@@ -1,11 +1,10 @@
 using System;
 using Spectre.Console;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+public static class Spectre
 {
-    public static class Spectre
-    {
-        public static void ProgressSingleSpinner(Action<ProgressContext> action) => AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-            Columns(new TaskDescriptionColumn(), new SpinnerColumn()).Start(action);
-    }
+    public static void ProgressSingleSpinner(Action<ProgressContext> action) => AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+        Columns(new TaskDescriptionColumn(), new SpinnerColumn()).Start(action);
 }
\ No newline at end of file
diff --git a/Aaru.Core/Statistics.cs b/Aaru.Core/Statistics.cs
index fdba38c87..589ff51a5 100644
--- a/Aaru.Core/Statistics.cs
+++ b/Aaru.Core/Statistics.cs
@@ -52,1431 +52,1430 @@ using MediaType = Aaru.CommonTypes.MediaType;
 using OperatingSystem = Aaru.Database.Models.OperatingSystem;
 using Version = Aaru.Database.Models.Version;
 
-namespace Aaru.Core
+namespace Aaru.Core;
+
+/// <summary>Handles anonymous usage statistics</summary>
+public static class Statistics
 {
-    /// <summary>Handles anonymous usage statistics</summary>
-    public static class Statistics
+    /// <summary>Statistics file semaphore</summary>
+    static bool _submitStatsLock;
+
+    /// <summary>Loads saved statistics from disk</summary>
+    public static void LoadStats()
     {
-        /// <summary>Statistics file semaphore</summary>
-        static bool _submitStatsLock;
-
-        /// <summary>Loads saved statistics from disk</summary>
-        public static void LoadStats()
+        try
         {
-            try
-            {
-                using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-                if(File.Exists(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml")))
-                    try
-                    {
-                        var allStats = new Stats();
-                        var xs       = new XmlSerializer(allStats.GetType());
-
-                        var sr = new StreamReader(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"));
-
-                        allStats = (Stats)xs.Deserialize(sr);
-                        sr.Close();
-
-                        if(allStats.Commands?.Analyze > 0)
-                        {
-                            Command command = ctx.Commands.FirstOrDefault(c => c.Name == "fs-info" && c.Synchronized) ??
-                                              new Command
-                                              {
-                                                  Name         = "fs-info",
-                                                  Synchronized = true
-                                              };
-
-                            command.Count += (ulong)allStats.Commands.Analyze;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.Checksum > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "checksum" && c.Synchronized) ?? new Command
-                                {
-                                    Name         = "checksum",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.Checksum;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.Compare > 0)
-                        {
-                            Command command = ctx.Commands.FirstOrDefault(c => c.Name == "compare" && c.Synchronized) ??
-                                              new Command
-                                              {
-                                                  Name         = "compare",
-                                                  Synchronized = true
-                                              };
-
-                            command.Count += (ulong)allStats.Commands.Compare;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.ConvertImage > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "convert-image" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "convert-image",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.ConvertImage;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.CreateSidecar > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "create-sidecar" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "create-sidecar",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.CreateSidecar;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.Decode > 0)
-                        {
-                            Command command = ctx.Commands.FirstOrDefault(c => c.Name == "decode" && c.Synchronized) ??
-                                              new Command
-                                              {
-                                                  Name         = "decode",
-                                                  Synchronized = true
-                                              };
-
-                            command.Count += (ulong)allStats.Commands.Decode;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.DeviceInfo > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "device-info" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "device-info",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.DeviceInfo;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.DeviceReport > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "device-report" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "device-report",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.DeviceReport;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.DumpMedia > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "dump-media" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "dump-media",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.DumpMedia;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.Entropy > 0)
-                        {
-                            Command command = ctx.Commands.FirstOrDefault(c => c.Name == "entropy" && c.Synchronized) ??
-                                              new Command
-                                              {
-                                                  Name         = "entropy",
-                                                  Synchronized = true
-                                              };
-
-                            command.Count += (ulong)allStats.Commands.Entropy;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.ExtractFiles > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "extract-files" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "extract-files",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.ExtractFiles;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.Formats > 0)
-                        {
-                            Command command = ctx.Commands.FirstOrDefault(c => c.Name == "formats" && c.Synchronized) ??
-                                              new Command
-                                              {
-                                                  Name         = "formats",
-                                                  Synchronized = true
-                                              };
-
-                            command.Count += (ulong)allStats.Commands.Formats;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.ImageInfo > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "image-info" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "image-info",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.ImageInfo;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.ListDevices > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "list-devices" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "list-devices",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.ListDevices;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.ListEncodings > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "list-encodings" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "list-encodings",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.ListEncodings;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.Ls > 0)
-                        {
-                            Command command = ctx.Commands.FirstOrDefault(c => c.Name == "ls" && c.Synchronized) ??
-                                              new Command
-                                              {
-                                                  Name         = "ls",
-                                                  Synchronized = true
-                                              };
-
-                            command.Count += (ulong)allStats.Commands.Ls;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.MediaInfo > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "media-info" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "media-info",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.MediaInfo;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.MediaScan > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "media-scan" && c.Synchronized) ??
-                                new Command
-                                {
-                                    Name         = "media-scan",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.MediaScan;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.PrintHex > 0)
-                        {
-                            Command command =
-                                ctx.Commands.FirstOrDefault(c => c.Name == "printhex" && c.Synchronized) ?? new Command
-                                {
-                                    Name         = "printhex",
-                                    Synchronized = true
-                                };
-
-                            command.Count += (ulong)allStats.Commands.PrintHex;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.Commands?.Verify > 0)
-                        {
-                            Command command = ctx.Commands.FirstOrDefault(c => c.Name == "verify" && c.Synchronized) ??
-                                              new Command
-                                              {
-                                                  Name         = "verify",
-                                                  Synchronized = true
-                                              };
-
-                            command.Count += (ulong)allStats.Commands.Verify;
-                            ctx.Commands.Update(command);
-                        }
-
-                        if(allStats.OperatingSystems != null)
-                            foreach(OsStats operatingSystem in allStats.OperatingSystems)
-                            {
-                                if(string.IsNullOrWhiteSpace(operatingSystem.name) ||
-                                   string.IsNullOrWhiteSpace(operatingSystem.version))
-                                    continue;
-
-                                OperatingSystem existing =
-                                    ctx.OperatingSystems.FirstOrDefault(c => c.Name    == operatingSystem.name    &&
-                                                                             c.Version == operatingSystem.version &&
-                                                                             c.Synchronized) ?? new OperatingSystem
-                                    {
-                                        Name         = operatingSystem.name,
-                                        Version      = operatingSystem.version,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count += (ulong)operatingSystem.Value;
-                                ctx.OperatingSystems.Update(existing);
-                            }
-
-                        if(allStats.Versions != null)
-                            foreach(NameValueStats nvs in allStats.Versions)
-                            {
-                                if(string.IsNullOrWhiteSpace(nvs.name))
-                                    continue;
-
-                                Version existing =
-                                    ctx.Versions.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
-                                    new Version
-                                    {
-                                        Name         = nvs.name,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count += (ulong)nvs.Value;
-                                ctx.Versions.Update(existing);
-                            }
-
-                        if(allStats.Filesystems != null)
-                            foreach(NameValueStats nvs in allStats.Filesystems)
-                            {
-                                if(string.IsNullOrWhiteSpace(nvs.name))
-                                    continue;
-
-                                Filesystem existing =
-                                    ctx.Filesystems.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
-                                    new Filesystem
-                                    {
-                                        Name         = nvs.name,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count += (ulong)nvs.Value;
-                                ctx.Filesystems.Update(existing);
-                            }
-
-                        if(allStats.Partitions != null)
-                            foreach(NameValueStats nvs in allStats.Partitions)
-                            {
-                                if(string.IsNullOrWhiteSpace(nvs.name))
-                                    continue;
-
-                                Partition existing =
-                                    ctx.Partitions.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
-                                    new Partition
-                                    {
-                                        Name         = nvs.name,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count += (ulong)nvs.Value;
-                                ctx.Partitions.Update(existing);
-                            }
-
-                        if(allStats.Filesystems != null)
-                            foreach(NameValueStats nvs in allStats.Filesystems)
-                            {
-                                if(string.IsNullOrWhiteSpace(nvs.name))
-                                    continue;
-
-                                Filesystem existing =
-                                    ctx.Filesystems.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
-                                    new Filesystem
-                                    {
-                                        Name         = nvs.name,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count += (ulong)nvs.Value;
-                                ctx.Filesystems.Update(existing);
-                            }
-
-                        if(allStats.MediaImages != null)
-                            foreach(NameValueStats nvs in allStats.MediaImages)
-                            {
-                                if(string.IsNullOrWhiteSpace(nvs.name))
-                                    continue;
-
-                                MediaFormat existing =
-                                    ctx.MediaFormats.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
-                                    new MediaFormat
-                                    {
-                                        Name         = nvs.name,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count += (ulong)nvs.Value;
-                                ctx.MediaFormats.Update(existing);
-                            }
-
-                        if(allStats.Filters != null)
-                            foreach(NameValueStats nvs in allStats.Filters)
-                            {
-                                if(string.IsNullOrWhiteSpace(nvs.name))
-                                    continue;
-
-                                Filter existing =
-                                    ctx.Filters.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ?? new Filter
-                                    {
-                                        Name         = nvs.name,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count += (ulong)nvs.Value;
-                                ctx.Filters.Update(existing);
-                            }
-
-                        if(allStats.Devices != null)
-                            foreach(DeviceStats device in allStats.Devices)
-                            {
-                                if(ctx.SeenDevices.Any(d => d.Manufacturer == device.Manufacturer &&
-                                                            d.Model == device.Model && d.Revision == device.Revision &&
-                                                            d.Bus == device.Bus))
-                                    continue;
-
-                                ctx.SeenDevices.Add(new DeviceStat
-                                {
-                                    Bus          = device.Bus,
-                                    Manufacturer = device.Manufacturer,
-                                    Model        = device.Model,
-                                    Revision     = device.Revision,
-                                    Synchronized = true
-                                });
-                            }
-
-                        if(allStats.Medias != null)
-                            foreach(MediaStats media in allStats.Medias)
-                            {
-                                if(string.IsNullOrWhiteSpace(media.type))
-                                    continue;
-
-                                Database.Models.Media existing =
-                                    ctx.Medias.FirstOrDefault(c => c.Type == media.type && c.Real == media.real &&
-                                                                   c.Synchronized) ?? new Database.Models.Media
-                                    {
-                                        Type         = media.type,
-                                        Real         = media.real,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count += (ulong)media.Value;
-                                ctx.Medias.Update(existing);
-                            }
-
-                        ctx.SaveChanges();
-                        File.Delete(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"));
-                    }
-                    catch
-                    {
-                        // Do not care about it
-                    }
-
-                if(Settings.Settings.Current.Stats == null)
-                    return;
-
-                ctx.OperatingSystems.Add(new OperatingSystem
-                {
-                    Name         = DetectOS.GetRealPlatformID().ToString(),
-                    Synchronized = false,
-                    Version      = DetectOS.GetVersion(),
-                    Count        = 1
-                });
-
-                ctx.Versions.Add(new Version
-                {
-                    Name         = CommonTypes.Interop.Version.GetVersion(),
-                    Synchronized = false,
-                    Count        = 1
-                });
-
-                ctx.SaveChanges();
-            }
-            catch(SqliteException ex)
-            {
-                AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
-                AaruConsole.DebugWriteLine("Stats", "{0}", ex);
-            }
-        }
-
-        /// <summary>Saves statistics to disk</summary>
-        public static void SaveStats()
-        {
-            try
-            {
-                using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-                ctx.SaveChanges();
-            }
-            catch(SqliteException ex)
-            {
-                AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
-                AaruConsole.DebugWriteLine("Stats", "{0}", ex);
-            }
-
-            if(Settings.Settings.Current.Stats is { ShareStats: true })
-                SubmitStats();
-        }
-
-        /// <summary>Submits statistics to Aaru.Server</summary>
-        static void SubmitStats()
-        {
-            var submitThread = new Thread(() =>
-            {
-                using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
+            if(File.Exists(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml")))
                 try
                 {
-                    if(_submitStatsLock)
-                        return;
+                    var allStats = new Stats();
+                    var xs       = new XmlSerializer(allStats.GetType());
 
-                    _submitStatsLock = true;
+                    var sr = new StreamReader(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"));
 
-                    if(ctx.Commands.Any(c => !c.Synchronized)            ||
-                       ctx.Filesystems.Any(c => !c.Synchronized)         ||
-                       ctx.Filters.Any(c => !c.Synchronized)             ||
-                       ctx.MediaFormats.Any(c => !c.Synchronized)        ||
-                       ctx.Partitions.Any(c => !c.Synchronized)          ||
-                       ctx.Medias.Any(c => !c.Synchronized)              ||
-                       ctx.SeenDevices.Any(c => !c.Synchronized)         ||
-                       ctx.OperatingSystems.Any(c => !c.Synchronized)    ||
-                       ctx.Versions.Any(c => !c.Synchronized)            ||
-                       ctx.RemoteApplications.Any(c => !c.Synchronized)  ||
-                       ctx.RemoteArchitectures.Any(c => !c.Synchronized) ||
-                       ctx.RemoteOperatingSystems.Any(c => !c.Synchronized))
+                    allStats = (Stats)xs.Deserialize(sr);
+                    sr.Close();
+
+                    if(allStats.Commands?.Analyze > 0)
                     {
-                        var dto = new StatsDto();
+                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "fs-info" && c.Synchronized) ??
+                                          new Command
+                                          {
+                                              Name         = "fs-info",
+                                              Synchronized = true
+                                          };
 
-                        if(ctx.Commands.Any(c => !c.Synchronized))
+                        command.Count += (ulong)allStats.Commands.Analyze;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.Checksum > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "checksum" && c.Synchronized) ?? new Command
+                            {
+                                Name         = "checksum",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.Checksum;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.Compare > 0)
+                    {
+                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "compare" && c.Synchronized) ??
+                                          new Command
+                                          {
+                                              Name         = "compare",
+                                              Synchronized = true
+                                          };
+
+                        command.Count += (ulong)allStats.Commands.Compare;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.ConvertImage > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "convert-image" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "convert-image",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.ConvertImage;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.CreateSidecar > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "create-sidecar" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "create-sidecar",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.CreateSidecar;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.Decode > 0)
+                    {
+                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "decode" && c.Synchronized) ??
+                                          new Command
+                                          {
+                                              Name         = "decode",
+                                              Synchronized = true
+                                          };
+
+                        command.Count += (ulong)allStats.Commands.Decode;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.DeviceInfo > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "device-info" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "device-info",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.DeviceInfo;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.DeviceReport > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "device-report" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "device-report",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.DeviceReport;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.DumpMedia > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "dump-media" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "dump-media",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.DumpMedia;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.Entropy > 0)
+                    {
+                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "entropy" && c.Synchronized) ??
+                                          new Command
+                                          {
+                                              Name         = "entropy",
+                                              Synchronized = true
+                                          };
+
+                        command.Count += (ulong)allStats.Commands.Entropy;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.ExtractFiles > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "extract-files" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "extract-files",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.ExtractFiles;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.Formats > 0)
+                    {
+                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "formats" && c.Synchronized) ??
+                                          new Command
+                                          {
+                                              Name         = "formats",
+                                              Synchronized = true
+                                          };
+
+                        command.Count += (ulong)allStats.Commands.Formats;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.ImageInfo > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "image-info" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "image-info",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.ImageInfo;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.ListDevices > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "list-devices" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "list-devices",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.ListDevices;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.ListEncodings > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "list-encodings" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "list-encodings",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.ListEncodings;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.Ls > 0)
+                    {
+                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "ls" && c.Synchronized) ??
+                                          new Command
+                                          {
+                                              Name         = "ls",
+                                              Synchronized = true
+                                          };
+
+                        command.Count += (ulong)allStats.Commands.Ls;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.MediaInfo > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "media-info" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "media-info",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.MediaInfo;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.MediaScan > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "media-scan" && c.Synchronized) ??
+                            new Command
+                            {
+                                Name         = "media-scan",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.MediaScan;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.PrintHex > 0)
+                    {
+                        Command command =
+                            ctx.Commands.FirstOrDefault(c => c.Name == "printhex" && c.Synchronized) ?? new Command
+                            {
+                                Name         = "printhex",
+                                Synchronized = true
+                            };
+
+                        command.Count += (ulong)allStats.Commands.PrintHex;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.Commands?.Verify > 0)
+                    {
+                        Command command = ctx.Commands.FirstOrDefault(c => c.Name == "verify" && c.Synchronized) ??
+                                          new Command
+                                          {
+                                              Name         = "verify",
+                                              Synchronized = true
+                                          };
+
+                        command.Count += (ulong)allStats.Commands.Verify;
+                        ctx.Commands.Update(command);
+                    }
+
+                    if(allStats.OperatingSystems != null)
+                        foreach(OsStats operatingSystem in allStats.OperatingSystems)
                         {
-                            dto.Commands = new List<NameValueStats>();
+                            if(string.IsNullOrWhiteSpace(operatingSystem.name) ||
+                               string.IsNullOrWhiteSpace(operatingSystem.version))
+                                continue;
 
-                            foreach(string nvs in ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                                dto.Commands.Add(new NameValueStats
+                            OperatingSystem existing =
+                                ctx.OperatingSystems.FirstOrDefault(c => c.Name    == operatingSystem.name    &&
+                                                                         c.Version == operatingSystem.version &&
+                                                                         c.Synchronized) ?? new OperatingSystem
                                 {
-                                    name  = nvs,
-                                    Value = ctx.Commands.LongCount(c => !c.Synchronized && c.Name == nvs)
+                                    Name         = operatingSystem.name,
+                                    Version      = operatingSystem.version,
+                                    Synchronized = true
+                                };
+
+                            existing.Count += (ulong)operatingSystem.Value;
+                            ctx.OperatingSystems.Update(existing);
+                        }
+
+                    if(allStats.Versions != null)
+                        foreach(NameValueStats nvs in allStats.Versions)
+                        {
+                            if(string.IsNullOrWhiteSpace(nvs.name))
+                                continue;
+
+                            Version existing =
+                                ctx.Versions.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
+                                new Version
+                                {
+                                    Name         = nvs.name,
+                                    Synchronized = true
+                                };
+
+                            existing.Count += (ulong)nvs.Value;
+                            ctx.Versions.Update(existing);
+                        }
+
+                    if(allStats.Filesystems != null)
+                        foreach(NameValueStats nvs in allStats.Filesystems)
+                        {
+                            if(string.IsNullOrWhiteSpace(nvs.name))
+                                continue;
+
+                            Filesystem existing =
+                                ctx.Filesystems.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
+                                new Filesystem
+                                {
+                                    Name         = nvs.name,
+                                    Synchronized = true
+                                };
+
+                            existing.Count += (ulong)nvs.Value;
+                            ctx.Filesystems.Update(existing);
+                        }
+
+                    if(allStats.Partitions != null)
+                        foreach(NameValueStats nvs in allStats.Partitions)
+                        {
+                            if(string.IsNullOrWhiteSpace(nvs.name))
+                                continue;
+
+                            Partition existing =
+                                ctx.Partitions.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
+                                new Partition
+                                {
+                                    Name         = nvs.name,
+                                    Synchronized = true
+                                };
+
+                            existing.Count += (ulong)nvs.Value;
+                            ctx.Partitions.Update(existing);
+                        }
+
+                    if(allStats.Filesystems != null)
+                        foreach(NameValueStats nvs in allStats.Filesystems)
+                        {
+                            if(string.IsNullOrWhiteSpace(nvs.name))
+                                continue;
+
+                            Filesystem existing =
+                                ctx.Filesystems.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
+                                new Filesystem
+                                {
+                                    Name         = nvs.name,
+                                    Synchronized = true
+                                };
+
+                            existing.Count += (ulong)nvs.Value;
+                            ctx.Filesystems.Update(existing);
+                        }
+
+                    if(allStats.MediaImages != null)
+                        foreach(NameValueStats nvs in allStats.MediaImages)
+                        {
+                            if(string.IsNullOrWhiteSpace(nvs.name))
+                                continue;
+
+                            MediaFormat existing =
+                                ctx.MediaFormats.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ??
+                                new MediaFormat
+                                {
+                                    Name         = nvs.name,
+                                    Synchronized = true
+                                };
+
+                            existing.Count += (ulong)nvs.Value;
+                            ctx.MediaFormats.Update(existing);
+                        }
+
+                    if(allStats.Filters != null)
+                        foreach(NameValueStats nvs in allStats.Filters)
+                        {
+                            if(string.IsNullOrWhiteSpace(nvs.name))
+                                continue;
+
+                            Filter existing =
+                                ctx.Filters.FirstOrDefault(c => c.Name == nvs.name && c.Synchronized) ?? new Filter
+                                {
+                                    Name         = nvs.name,
+                                    Synchronized = true
+                                };
+
+                            existing.Count += (ulong)nvs.Value;
+                            ctx.Filters.Update(existing);
+                        }
+
+                    if(allStats.Devices != null)
+                        foreach(DeviceStats device in allStats.Devices)
+                        {
+                            if(ctx.SeenDevices.Any(d => d.Manufacturer == device.Manufacturer &&
+                                                        d.Model == device.Model && d.Revision == device.Revision &&
+                                                        d.Bus == device.Bus))
+                                continue;
+
+                            ctx.SeenDevices.Add(new DeviceStat
+                            {
+                                Bus          = device.Bus,
+                                Manufacturer = device.Manufacturer,
+                                Model        = device.Model,
+                                Revision     = device.Revision,
+                                Synchronized = true
+                            });
+                        }
+
+                    if(allStats.Medias != null)
+                        foreach(MediaStats media in allStats.Medias)
+                        {
+                            if(string.IsNullOrWhiteSpace(media.type))
+                                continue;
+
+                            Database.Models.Media existing =
+                                ctx.Medias.FirstOrDefault(c => c.Type == media.type && c.Real == media.real &&
+                                                               c.Synchronized) ?? new Database.Models.Media
+                                {
+                                    Type         = media.type,
+                                    Real         = media.real,
+                                    Synchronized = true
+                                };
+
+                            existing.Count += (ulong)media.Value;
+                            ctx.Medias.Update(existing);
+                        }
+
+                    ctx.SaveChanges();
+                    File.Delete(Path.Combine(Settings.Settings.StatsPath, "Statistics.xml"));
+                }
+                catch
+                {
+                    // Do not care about it
+                }
+
+            if(Settings.Settings.Current.Stats == null)
+                return;
+
+            ctx.OperatingSystems.Add(new OperatingSystem
+            {
+                Name         = DetectOS.GetRealPlatformID().ToString(),
+                Synchronized = false,
+                Version      = DetectOS.GetVersion(),
+                Count        = 1
+            });
+
+            ctx.Versions.Add(new Version
+            {
+                Name         = CommonTypes.Interop.Version.GetVersion(),
+                Synchronized = false,
+                Count        = 1
+            });
+
+            ctx.SaveChanges();
+        }
+        catch(SqliteException ex)
+        {
+            AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
+            AaruConsole.DebugWriteLine("Stats", "{0}", ex);
+        }
+    }
+
+    /// <summary>Saves statistics to disk</summary>
+    public static void SaveStats()
+    {
+        try
+        {
+            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+
+            ctx.SaveChanges();
+        }
+        catch(SqliteException ex)
+        {
+            AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
+            AaruConsole.DebugWriteLine("Stats", "{0}", ex);
+        }
+
+        if(Settings.Settings.Current.Stats is { ShareStats: true })
+            SubmitStats();
+    }
+
+    /// <summary>Submits statistics to Aaru.Server</summary>
+    static void SubmitStats()
+    {
+        var submitThread = new Thread(() =>
+        {
+            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+
+            try
+            {
+                if(_submitStatsLock)
+                    return;
+
+                _submitStatsLock = true;
+
+                if(ctx.Commands.Any(c => !c.Synchronized)            ||
+                   ctx.Filesystems.Any(c => !c.Synchronized)         ||
+                   ctx.Filters.Any(c => !c.Synchronized)             ||
+                   ctx.MediaFormats.Any(c => !c.Synchronized)        ||
+                   ctx.Partitions.Any(c => !c.Synchronized)          ||
+                   ctx.Medias.Any(c => !c.Synchronized)              ||
+                   ctx.SeenDevices.Any(c => !c.Synchronized)         ||
+                   ctx.OperatingSystems.Any(c => !c.Synchronized)    ||
+                   ctx.Versions.Any(c => !c.Synchronized)            ||
+                   ctx.RemoteApplications.Any(c => !c.Synchronized)  ||
+                   ctx.RemoteArchitectures.Any(c => !c.Synchronized) ||
+                   ctx.RemoteOperatingSystems.Any(c => !c.Synchronized))
+                {
+                    var dto = new StatsDto();
+
+                    if(ctx.Commands.Any(c => !c.Synchronized))
+                    {
+                        dto.Commands = new List<NameValueStats>();
+
+                        foreach(string nvs in ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                            dto.Commands.Add(new NameValueStats
+                            {
+                                name  = nvs,
+                                Value = ctx.Commands.LongCount(c => !c.Synchronized && c.Name == nvs)
+                            });
+                    }
+
+                    if(ctx.Filesystems.Any(c => !c.Synchronized))
+                    {
+                        dto.Filesystems = new List<NameValueStats>();
+
+                        foreach(string nvs in ctx.Filesystems.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                            dto.Filesystems.Add(new NameValueStats
+                            {
+                                name  = nvs,
+                                Value = ctx.Filesystems.LongCount(c => !c.Synchronized && c.Name == nvs)
+                            });
+                    }
+
+                    if(ctx.Filters.Any(c => !c.Synchronized))
+                    {
+                        dto.Filters = new List<NameValueStats>();
+
+                        foreach(string nvs in ctx.Filters.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                            dto.Filters.Add(new NameValueStats
+                            {
+                                name  = nvs,
+                                Value = ctx.Filters.LongCount(c => !c.Synchronized && c.Name == nvs)
+                            });
+                    }
+
+                    if(ctx.MediaFormats.Any(c => !c.Synchronized))
+                    {
+                        dto.MediaFormats = new List<NameValueStats>();
+
+                        foreach(string nvs in ctx.MediaFormats.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                            dto.MediaFormats.Add(new NameValueStats
+                            {
+                                name  = nvs,
+                                Value = ctx.MediaFormats.LongCount(c => !c.Synchronized && c.Name == nvs)
+                            });
+                    }
+
+                    if(ctx.Partitions.Any(c => !c.Synchronized))
+                    {
+                        dto.Partitions = new List<NameValueStats>();
+
+                        foreach(string nvs in ctx.Partitions.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                            dto.Partitions.Add(new NameValueStats
+                            {
+                                name  = nvs,
+                                Value = ctx.Partitions.LongCount(c => !c.Synchronized && c.Name == nvs)
+                            });
+                    }
+
+                    if(ctx.Versions.Any(c => !c.Synchronized))
+                    {
+                        dto.Versions = new List<NameValueStats>();
+
+                        foreach(string nvs in ctx.Versions.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                            dto.Versions.Add(new NameValueStats
+                            {
+                                name  = nvs,
+                                Value = ctx.Versions.LongCount(c => !c.Synchronized && c.Name == nvs)
+                            });
+                    }
+
+                    if(ctx.Medias.Any(c => !c.Synchronized))
+                    {
+                        dto.Medias = new List<MediaStats>();
+
+                        foreach(string media in ctx.Medias.Where(c => !c.Synchronized).Select(c => c.Type).
+                                                    Distinct())
+                        {
+                            if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && c.Real))
+                                dto.Medias.Add(new MediaStats
+                                {
+                                    real  = true,
+                                    type  = media,
+                                    Value = ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && c.Real)
+                                });
+
+                            if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && !c.Real))
+                                dto.Medias.Add(new MediaStats
+                                {
+                                    real  = false,
+                                    type  = media,
+                                    Value = ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && !c.Real)
                                 });
                         }
+                    }
 
-                        if(ctx.Filesystems.Any(c => !c.Synchronized))
+                    if(ctx.SeenDevices.Any(c => !c.Synchronized))
+                    {
+                        dto.Devices = new List<DeviceStats>();
+
+                        foreach(DeviceStat device in ctx.SeenDevices.Where(c => !c.Synchronized))
+                            dto.Devices.Add(new DeviceStats
+                            {
+                                Bus                   = device.Bus,
+                                Manufacturer          = device.Manufacturer,
+                                ManufacturerSpecified = !(device.Manufacturer is null),
+                                Model                 = device.Model,
+                                Revision              = device.Revision
+                            });
+                    }
+
+                    if(ctx.OperatingSystems.Any(c => !c.Synchronized))
+                    {
+                        dto.OperatingSystems = new List<OsStats>();
+
+                        foreach(string osName in ctx.OperatingSystems.Where(c => !c.Synchronized).
+                                                     Select(c => c.Name).Distinct())
                         {
-                            dto.Filesystems = new List<NameValueStats>();
-
-                            foreach(string nvs in ctx.Filesystems.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                                dto.Filesystems.Add(new NameValueStats
+                            foreach(string osVersion in ctx.OperatingSystems.
+                                                            Where(c => !c.Synchronized && c.Name == osName).
+                                                            Select(c => c.Version).Distinct())
+                                dto.OperatingSystems.Add(new OsStats
                                 {
-                                    name  = nvs,
-                                    Value = ctx.Filesystems.LongCount(c => !c.Synchronized && c.Name == nvs)
+                                    name    = osName,
+                                    version = osVersion,
+                                    Value = ctx.OperatingSystems.LongCount(c => !c.Synchronized    &&
+                                                                               c.Name    == osName &&
+                                                                               c.Version == osVersion)
                                 });
                         }
+                    }
 
-                        if(ctx.Filters.Any(c => !c.Synchronized))
+                    if(ctx.RemoteApplications.Any(c => !c.Synchronized))
+                    {
+                        dto.RemoteApplications = new List<OsStats>();
+
+                        foreach(string remoteAppName in ctx.RemoteApplications.Where(c => !c.Synchronized).
+                                                            Select(c => c.Name).Distinct())
                         {
-                            dto.Filters = new List<NameValueStats>();
-
-                            foreach(string nvs in ctx.Filters.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                                dto.Filters.Add(new NameValueStats
+                            foreach(string remoteAppVersion in ctx.RemoteApplications.
+                                                                   Where(c => !c.Synchronized &&
+                                                                              c.Name == remoteAppName).
+                                                                   Select(c => c.Version).Distinct())
+                                dto.RemoteApplications.Add(new OsStats
                                 {
-                                    name  = nvs,
-                                    Value = ctx.Filters.LongCount(c => !c.Synchronized && c.Name == nvs)
+                                    name = remoteAppName,
+                                    version = remoteAppVersion,
+                                    Value = ctx.RemoteApplications.LongCount(c => !c.Synchronized &&
+                                                                                 c.Name == remoteAppName && c.Version == remoteAppVersion)
                                 });
                         }
+                    }
 
-                        if(ctx.MediaFormats.Any(c => !c.Synchronized))
-                        {
-                            dto.MediaFormats = new List<NameValueStats>();
+                    if(ctx.RemoteArchitectures.Any(c => !c.Synchronized))
+                    {
+                        dto.RemoteArchitectures = new List<NameValueStats>();
 
-                            foreach(string nvs in ctx.MediaFormats.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                                dto.MediaFormats.Add(new NameValueStats
-                                {
-                                    name  = nvs,
-                                    Value = ctx.MediaFormats.LongCount(c => !c.Synchronized && c.Name == nvs)
-                                });
-                        }
-
-                        if(ctx.Partitions.Any(c => !c.Synchronized))
-                        {
-                            dto.Partitions = new List<NameValueStats>();
-
-                            foreach(string nvs in ctx.Partitions.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                                dto.Partitions.Add(new NameValueStats
-                                {
-                                    name  = nvs,
-                                    Value = ctx.Partitions.LongCount(c => !c.Synchronized && c.Name == nvs)
-                                });
-                        }
-
-                        if(ctx.Versions.Any(c => !c.Synchronized))
-                        {
-                            dto.Versions = new List<NameValueStats>();
-
-                            foreach(string nvs in ctx.Versions.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                                dto.Versions.Add(new NameValueStats
-                                {
-                                    name  = nvs,
-                                    Value = ctx.Versions.LongCount(c => !c.Synchronized && c.Name == nvs)
-                                });
-                        }
-
-                        if(ctx.Medias.Any(c => !c.Synchronized))
-                        {
-                            dto.Medias = new List<MediaStats>();
-
-                            foreach(string media in ctx.Medias.Where(c => !c.Synchronized).Select(c => c.Type).
-                                                        Distinct())
+                        foreach(string nvs in ctx.RemoteArchitectures.Where(c => !c.Synchronized).
+                                                  Select(c => c.Name).Distinct())
+                            dto.RemoteArchitectures.Add(new NameValueStats
                             {
-                                if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && c.Real))
-                                    dto.Medias.Add(new MediaStats
-                                    {
-                                        real  = true,
-                                        type  = media,
-                                        Value = ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && c.Real)
-                                    });
+                                name  = nvs,
+                                Value = ctx.RemoteArchitectures.LongCount(c => !c.Synchronized && c.Name == nvs)
+                            });
+                    }
 
-                                if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && !c.Real))
-                                    dto.Medias.Add(new MediaStats
-                                    {
-                                        real  = false,
-                                        type  = media,
-                                        Value = ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && !c.Real)
-                                    });
-                            }
-                        }
-
-                        if(ctx.SeenDevices.Any(c => !c.Synchronized))
-                        {
-                            dto.Devices = new List<DeviceStats>();
-
-                            foreach(DeviceStat device in ctx.SeenDevices.Where(c => !c.Synchronized))
-                                dto.Devices.Add(new DeviceStats
-                                {
-                                    Bus                   = device.Bus,
-                                    Manufacturer          = device.Manufacturer,
-                                    ManufacturerSpecified = !(device.Manufacturer is null),
-                                    Model                 = device.Model,
-                                    Revision              = device.Revision
-                                });
-                        }
-
-                        if(ctx.OperatingSystems.Any(c => !c.Synchronized))
-                        {
-                            dto.OperatingSystems = new List<OsStats>();
-
-                            foreach(string osName in ctx.OperatingSystems.Where(c => !c.Synchronized).
-                                                         Select(c => c.Name).Distinct())
-                            {
-                                foreach(string osVersion in ctx.OperatingSystems.
-                                                                Where(c => !c.Synchronized && c.Name == osName).
-                                                                Select(c => c.Version).Distinct())
-                                    dto.OperatingSystems.Add(new OsStats
-                                    {
-                                        name    = osName,
-                                        version = osVersion,
-                                        Value = ctx.OperatingSystems.LongCount(c => !c.Synchronized    &&
-                                                                                   c.Name    == osName &&
-                                                                                   c.Version == osVersion)
-                                    });
-                            }
-                        }
-
-                        if(ctx.RemoteApplications.Any(c => !c.Synchronized))
-                        {
-                            dto.RemoteApplications = new List<OsStats>();
-
-                            foreach(string remoteAppName in ctx.RemoteApplications.Where(c => !c.Synchronized).
-                                                                Select(c => c.Name).Distinct())
-                            {
-                                foreach(string remoteAppVersion in ctx.RemoteApplications.
-                                                                       Where(c => !c.Synchronized &&
-                                                                                 c.Name == remoteAppName).
-                                                                       Select(c => c.Version).Distinct())
-                                    dto.RemoteApplications.Add(new OsStats
-                                    {
-                                        name = remoteAppName,
-                                        version = remoteAppVersion,
-                                        Value = ctx.RemoteApplications.LongCount(c => !c.Synchronized &&
-                                            c.Name == remoteAppName && c.Version == remoteAppVersion)
-                                    });
-                            }
-                        }
-
-                        if(ctx.RemoteArchitectures.Any(c => !c.Synchronized))
-                        {
-                            dto.RemoteArchitectures = new List<NameValueStats>();
-
-                            foreach(string nvs in ctx.RemoteArchitectures.Where(c => !c.Synchronized).
-                                                      Select(c => c.Name).Distinct())
-                                dto.RemoteArchitectures.Add(new NameValueStats
-                                {
-                                    name  = nvs,
-                                    Value = ctx.RemoteArchitectures.LongCount(c => !c.Synchronized && c.Name == nvs)
-                                });
-                        }
-
-                        if(ctx.RemoteOperatingSystems.Any(c => !c.Synchronized))
-                        {
-                            dto.RemoteOperatingSystems = new List<OsStats>();
-
-                            foreach(string remoteOsName in ctx.RemoteOperatingSystems.Where(c => !c.Synchronized).
-                                                               Select(c => c.Name).Distinct())
-                            {
-                                foreach(string remoteOsVersion in ctx.RemoteOperatingSystems.
-                                                                      Where(c => !c.Synchronized &&
-                                                                                c.Name == remoteOsName).
-                                                                      Select(c => c.Version).Distinct())
-                                    dto.RemoteOperatingSystems.Add(new OsStats
-                                    {
-                                        name = remoteOsName,
-                                        version = remoteOsVersion,
-                                        Value = ctx.RemoteOperatingSystems.LongCount(c => !c.Synchronized &&
-                                            c.Name == remoteOsName && c.Version == remoteOsVersion)
-                                    });
-                            }
-                        }
-
-                    #if DEBUG
-                        System.Console.WriteLine("Uploading statistics");
-                    #else
-                            Aaru.Console.AaruConsole.DebugWriteLine("Submit stats", "Uploading statistics");
-                    #endif
-
-                        string json = JsonConvert.SerializeObject(dto, Formatting.Indented, new JsonSerializerSettings
-                        {
-                            NullValueHandling = NullValueHandling.Ignore
-                        });
-
-                        byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
-                        var    request   = WebRequest.Create("https://www.aaru.app/api/uploadstatsv2");
-
-                        ((HttpWebRequest)request).UserAgent = $"Aaru {typeof(Version).Assembly.GetName().Version}";
-
-                        request.Method        = "POST";
-                        request.ContentLength = jsonBytes.Length;
-                        request.ContentType   = "application/json";
-                        Stream reqStream = request.GetRequestStream();
-                        reqStream.Write(jsonBytes, 0, jsonBytes.Length);
-
-                        //jsonStream.CopyTo(reqStream);
-                        reqStream.Close();
-                        WebResponse response = request.GetResponse();
-
-                        if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK)
-                            return;
-
-                        Stream data   = response.GetResponseStream();
-                        var    reader = new StreamReader(data ?? throw new InvalidOperationException());
-
-                        string result = reader.ReadToEnd();
-                        data.Close();
-                        response.Close();
-
-                        if(result != "ok")
-                            return;
-
-                        if(ctx.Commands.Any(c => !c.Synchronized))
-                            foreach(string nvs in ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                            {
-                                Command existing = ctx.Commands.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
-                                                   new Command
-                                                   {
-                                                       Name         = nvs,
-                                                       Synchronized = true
-                                                   };
-
-                                existing.Count += (ulong)ctx.Commands.LongCount(c => !c.Synchronized && c.Name == nvs);
-                                ctx.Commands.Update(existing);
-                                ctx.Commands.RemoveRange(ctx.Commands.Where(c => !c.Synchronized && c.Name == nvs));
-                            }
-
-                        if(ctx.Filesystems.Any(c => !c.Synchronized))
-                            foreach(string nvs in ctx.Filesystems.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                            {
-                                Filesystem existing =
-                                    ctx.Filesystems.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
-                                    new Filesystem
-                                    {
-                                        Name         = nvs,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count +=
-                                    (ulong)ctx.Filesystems.LongCount(c => !c.Synchronized && c.Name == nvs);
-
-                                ctx.Filesystems.Update(existing);
-
-                                ctx.Filesystems.RemoveRange(ctx.Filesystems.Where(c => !c.Synchronized &&
-                                                                c.Name == nvs));
-                            }
-
-                        if(ctx.Filters.Any(c => !c.Synchronized))
-                            foreach(string nvs in ctx.Filters.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                            {
-                                Filter existing = ctx.Filters.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
-                                                  new Filter
-                                                  {
-                                                      Name         = nvs,
-                                                      Synchronized = true
-                                                  };
-
-                                existing.Count += (ulong)ctx.Filters.LongCount(c => !c.Synchronized && c.Name == nvs);
-                                ctx.Filters.Update(existing);
-                                ctx.Filters.RemoveRange(ctx.Filters.Where(c => !c.Synchronized && c.Name == nvs));
-                            }
-
-                        if(ctx.MediaFormats.Any(c => !c.Synchronized))
-                            foreach(string nvs in ctx.MediaFormats.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                            {
-                                MediaFormat existing =
-                                    ctx.MediaFormats.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
-                                    new MediaFormat
-                                    {
-                                        Name         = nvs,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count +=
-                                    (ulong)ctx.MediaFormats.LongCount(c => !c.Synchronized && c.Name == nvs);
-
-                                ctx.MediaFormats.Update(existing);
-
-                                ctx.MediaFormats.RemoveRange(ctx.MediaFormats.Where(c => !c.Synchronized &&
-                                                                 c.Name == nvs));
-                            }
-
-                        if(ctx.Partitions.Any(c => !c.Synchronized))
-                            foreach(string nvs in ctx.Partitions.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                            {
-                                Partition existing =
-                                    ctx.Partitions.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ?? new Partition
-                                    {
-                                        Name         = nvs,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count +=
-                                    (ulong)ctx.Partitions.LongCount(c => !c.Synchronized && c.Name == nvs);
-
-                                ctx.Partitions.Update(existing);
-                                ctx.Partitions.RemoveRange(ctx.Partitions.Where(c => !c.Synchronized && c.Name == nvs));
-                            }
-
-                        if(ctx.Versions.Any(c => !c.Synchronized))
-                            foreach(string nvs in ctx.Versions.Where(c => !c.Synchronized).Select(c => c.Name).
-                                                      Distinct())
-                            {
-                                Version existing = ctx.Versions.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
-                                                   new Version
-                                                   {
-                                                       Name         = nvs,
-                                                       Synchronized = true
-                                                   };
-
-                                existing.Count += (ulong)ctx.Versions.LongCount(c => !c.Synchronized && c.Name == nvs);
-                                ctx.Versions.Update(existing);
-                                ctx.Versions.RemoveRange(ctx.Versions.Where(c => !c.Synchronized && c.Name == nvs));
-                            }
-
-                        if(ctx.Medias.Any(c => !c.Synchronized))
-                            foreach(string media in ctx.Medias.Where(c => !c.Synchronized).Select(c => c.Type).
-                                                        Distinct())
-                            {
-                                if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && c.Real))
-                                {
-                                    Database.Models.Media existing =
-                                        ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media && c.Real) ??
-                                        new Database.Models.Media
-                                        {
-                                            Synchronized = true,
-                                            Type         = media,
-                                            Real         = true
-                                        };
-
-                                    existing.Count +=
-                                        (ulong)ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && c.Real);
-
-                                    ctx.Medias.Update(existing);
-
-                                    ctx.Medias.RemoveRange(ctx.Medias.Where(c => !c.Synchronized && c.Type == media &&
-                                                                                c.Real));
-                                }
-
-                                if(!ctx.Medias.Any(c => !c.Synchronized && c.Type == media && !c.Real))
-                                    continue;
-
-                                {
-                                    Database.Models.Media existing =
-                                        ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media && !c.Real) ??
-                                        new Database.Models.Media
-                                        {
-                                            Synchronized = true,
-                                            Type         = media,
-                                            Real         = false
-                                        };
-
-                                    existing.Count +=
-                                        (ulong)ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && !c.Real);
-
-                                    ctx.Medias.Update(existing);
-
-                                    ctx.Medias.RemoveRange(ctx.Medias.Where(c => !c.Synchronized && c.Type == media &&
-                                                                                !c.Real));
-                                }
-                            }
-
-                        if(ctx.SeenDevices.Any(c => !c.Synchronized))
-                            foreach(DeviceStat device in ctx.SeenDevices.Where(c => !c.Synchronized))
-                            {
-                                device.Synchronized = true;
-                                ctx.Update(device);
-                            }
-
-                        if(ctx.OperatingSystems.Any(c => !c.Synchronized))
-                            foreach(string osName in ctx.OperatingSystems.Where(c => !c.Synchronized).
-                                                         Select(c => c.Name).Distinct())
-                            {
-                                foreach(string osVersion in ctx.OperatingSystems.
-                                                                Where(c => !c.Synchronized && c.Name == osName).
-                                                                Select(c => c.Version).Distinct())
-                                {
-                                    OperatingSystem existing =
-                                        ctx.OperatingSystems.FirstOrDefault(c => c.Synchronized && c.Name == osName &&
-                                                                                c.Version == osVersion) ??
-                                        new OperatingSystem
-                                        {
-                                            Synchronized = true,
-                                            Version      = osVersion,
-                                            Name         = osName
-                                        };
-
-                                    existing.Count +=
-                                        (ulong)ctx.OperatingSystems.LongCount(c => !c.Synchronized    &&
-                                                                                  c.Name    == osName &&
-                                                                                  c.Version == osVersion);
-
-                                    ctx.OperatingSystems.Update(existing);
-
-                                    ctx.OperatingSystems.RemoveRange(ctx.OperatingSystems.Where(c => !c.Synchronized &&
-                                                                         c.Name    == osName                         &&
-                                                                         c.Version == osVersion));
-                                }
-                            }
-
-                        if(ctx.RemoteApplications.Any(c => !c.Synchronized))
-                            foreach(string remoteAppName in ctx.RemoteApplications.Where(c => !c.Synchronized).
-                                                                Select(c => c.Name).Distinct())
-                            {
-                                foreach(string remoteAppVersion in ctx.RemoteApplications.
-                                                                       Where(c => !c.Synchronized &&
-                                                                                 c.Name == remoteAppName).
-                                                                       Select(c => c.Version).Distinct())
-                                {
-                                    RemoteApplication existing =
-                                        ctx.RemoteApplications.FirstOrDefault(c => c.Synchronized            &&
-                                                                                  c.Name    == remoteAppName &&
-                                                                                  c.Version == remoteAppVersion) ??
-                                        new RemoteApplication
-                                        {
-                                            Synchronized = true,
-                                            Version      = remoteAppVersion,
-                                            Name         = remoteAppName
-                                        };
-
-                                    existing.Count +=
-                                        (ulong)ctx.RemoteApplications.LongCount(c => !c.Synchronized           &&
-                                                                                    c.Name    == remoteAppName &&
-                                                                                    c.Version == remoteAppVersion);
-
-                                    ctx.RemoteApplications.Update(existing);
-
-                                    ctx.RemoteApplications.RemoveRange(ctx.RemoteApplications.Where(c =>
-                                                                           !c.Synchronized            &&
-                                                                           c.Name    == remoteAppName &&
-                                                                           c.Version == remoteAppVersion));
-                                }
-                            }
-
-                        if(ctx.RemoteArchitectures.Any(c => !c.Synchronized))
-                            foreach(string nvs in ctx.RemoteArchitectures.Where(c => !c.Synchronized).
-                                                      Select(c => c.Name).Distinct())
-                            {
-                                RemoteArchitecture existing =
-                                    ctx.RemoteArchitectures.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
-                                    new RemoteArchitecture
-                                    {
-                                        Name         = nvs,
-                                        Synchronized = true
-                                    };
-
-                                existing.Count +=
-                                    (ulong)ctx.RemoteArchitectures.LongCount(c => !c.Synchronized && c.Name == nvs);
-
-                                ctx.RemoteArchitectures.Update(existing);
-
-                                ctx.RemoteArchitectures.RemoveRange(ctx.RemoteArchitectures.
-                                                                        Where(c => !c.Synchronized && c.Name == nvs));
-                            }
+                    if(ctx.RemoteOperatingSystems.Any(c => !c.Synchronized))
+                    {
+                        dto.RemoteOperatingSystems = new List<OsStats>();
 
                         foreach(string remoteOsName in ctx.RemoteOperatingSystems.Where(c => !c.Synchronized).
                                                            Select(c => c.Name).Distinct())
                         {
                             foreach(string remoteOsVersion in ctx.RemoteOperatingSystems.
-                                                                  Where(c => !c.Synchronized && c.Name == remoteOsName).
+                                                                  Where(c => !c.Synchronized &&
+                                                                             c.Name == remoteOsName).
                                                                   Select(c => c.Version).Distinct())
+                                dto.RemoteOperatingSystems.Add(new OsStats
+                                {
+                                    name = remoteOsName,
+                                    version = remoteOsVersion,
+                                    Value = ctx.RemoteOperatingSystems.LongCount(c => !c.Synchronized &&
+                                        c.Name == remoteOsName && c.Version == remoteOsVersion)
+                                });
+                        }
+                    }
+
+                #if DEBUG
+                    System.Console.WriteLine("Uploading statistics");
+                #else
+                            Aaru.Console.AaruConsole.DebugWriteLine("Submit stats", "Uploading statistics");
+                #endif
+
+                    string json = JsonConvert.SerializeObject(dto, Formatting.Indented, new JsonSerializerSettings
+                    {
+                        NullValueHandling = NullValueHandling.Ignore
+                    });
+
+                    byte[] jsonBytes = Encoding.UTF8.GetBytes(json);
+                    var    request   = WebRequest.Create("https://www.aaru.app/api/uploadstatsv2");
+
+                    ((HttpWebRequest)request).UserAgent = $"Aaru {typeof(Version).Assembly.GetName().Version}";
+
+                    request.Method        = "POST";
+                    request.ContentLength = jsonBytes.Length;
+                    request.ContentType   = "application/json";
+                    Stream reqStream = request.GetRequestStream();
+                    reqStream.Write(jsonBytes, 0, jsonBytes.Length);
+
+                    //jsonStream.CopyTo(reqStream);
+                    reqStream.Close();
+                    WebResponse response = request.GetResponse();
+
+                    if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK)
+                        return;
+
+                    Stream data   = response.GetResponseStream();
+                    var    reader = new StreamReader(data ?? throw new InvalidOperationException());
+
+                    string result = reader.ReadToEnd();
+                    data.Close();
+                    response.Close();
+
+                    if(result != "ok")
+                        return;
+
+                    if(ctx.Commands.Any(c => !c.Synchronized))
+                        foreach(string nvs in ctx.Commands.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                        {
+                            Command existing = ctx.Commands.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
+                                               new Command
+                                               {
+                                                   Name         = nvs,
+                                                   Synchronized = true
+                                               };
+
+                            existing.Count += (ulong)ctx.Commands.LongCount(c => !c.Synchronized && c.Name == nvs);
+                            ctx.Commands.Update(existing);
+                            ctx.Commands.RemoveRange(ctx.Commands.Where(c => !c.Synchronized && c.Name == nvs));
+                        }
+
+                    if(ctx.Filesystems.Any(c => !c.Synchronized))
+                        foreach(string nvs in ctx.Filesystems.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                        {
+                            Filesystem existing =
+                                ctx.Filesystems.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
+                                new Filesystem
+                                {
+                                    Name         = nvs,
+                                    Synchronized = true
+                                };
+
+                            existing.Count +=
+                                (ulong)ctx.Filesystems.LongCount(c => !c.Synchronized && c.Name == nvs);
+
+                            ctx.Filesystems.Update(existing);
+
+                            ctx.Filesystems.RemoveRange(ctx.Filesystems.Where(c => !c.Synchronized &&
+                                                                                  c.Name == nvs));
+                        }
+
+                    if(ctx.Filters.Any(c => !c.Synchronized))
+                        foreach(string nvs in ctx.Filters.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                        {
+                            Filter existing = ctx.Filters.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
+                                              new Filter
+                                              {
+                                                  Name         = nvs,
+                                                  Synchronized = true
+                                              };
+
+                            existing.Count += (ulong)ctx.Filters.LongCount(c => !c.Synchronized && c.Name == nvs);
+                            ctx.Filters.Update(existing);
+                            ctx.Filters.RemoveRange(ctx.Filters.Where(c => !c.Synchronized && c.Name == nvs));
+                        }
+
+                    if(ctx.MediaFormats.Any(c => !c.Synchronized))
+                        foreach(string nvs in ctx.MediaFormats.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                        {
+                            MediaFormat existing =
+                                ctx.MediaFormats.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
+                                new MediaFormat
+                                {
+                                    Name         = nvs,
+                                    Synchronized = true
+                                };
+
+                            existing.Count +=
+                                (ulong)ctx.MediaFormats.LongCount(c => !c.Synchronized && c.Name == nvs);
+
+                            ctx.MediaFormats.Update(existing);
+
+                            ctx.MediaFormats.RemoveRange(ctx.MediaFormats.Where(c => !c.Synchronized &&
+                                                                                    c.Name == nvs));
+                        }
+
+                    if(ctx.Partitions.Any(c => !c.Synchronized))
+                        foreach(string nvs in ctx.Partitions.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                        {
+                            Partition existing =
+                                ctx.Partitions.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ?? new Partition
+                                {
+                                    Name         = nvs,
+                                    Synchronized = true
+                                };
+
+                            existing.Count +=
+                                (ulong)ctx.Partitions.LongCount(c => !c.Synchronized && c.Name == nvs);
+
+                            ctx.Partitions.Update(existing);
+                            ctx.Partitions.RemoveRange(ctx.Partitions.Where(c => !c.Synchronized && c.Name == nvs));
+                        }
+
+                    if(ctx.Versions.Any(c => !c.Synchronized))
+                        foreach(string nvs in ctx.Versions.Where(c => !c.Synchronized).Select(c => c.Name).
+                                                  Distinct())
+                        {
+                            Version existing = ctx.Versions.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
+                                               new Version
+                                               {
+                                                   Name         = nvs,
+                                                   Synchronized = true
+                                               };
+
+                            existing.Count += (ulong)ctx.Versions.LongCount(c => !c.Synchronized && c.Name == nvs);
+                            ctx.Versions.Update(existing);
+                            ctx.Versions.RemoveRange(ctx.Versions.Where(c => !c.Synchronized && c.Name == nvs));
+                        }
+
+                    if(ctx.Medias.Any(c => !c.Synchronized))
+                        foreach(string media in ctx.Medias.Where(c => !c.Synchronized).Select(c => c.Type).
+                                                    Distinct())
+                        {
+                            if(ctx.Medias.Any(c => !c.Synchronized && c.Type == media && c.Real))
                             {
-                                RemoteOperatingSystem existing =
-                                    ctx.RemoteOperatingSystems.FirstOrDefault(c => c.Synchronized           &&
-                                                                                  c.Name    == remoteOsName &&
-                                                                                  c.Version == remoteOsVersion) ??
-                                    new RemoteOperatingSystem
+                                Database.Models.Media existing =
+                                    ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media && c.Real) ??
+                                    new Database.Models.Media
                                     {
                                         Synchronized = true,
-                                        Version      = remoteOsVersion,
-                                        Name         = remoteOsName
+                                        Type         = media,
+                                        Real         = true
                                     };
 
                                 existing.Count +=
-                                    (ulong)ctx.RemoteOperatingSystems.LongCount(c => !c.Synchronized          &&
-                                                                                    c.Name    == remoteOsName &&
-                                                                                    c.Version == remoteOsVersion);
+                                    (ulong)ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && c.Real);
 
-                                ctx.RemoteOperatingSystems.Update(existing);
+                                ctx.Medias.Update(existing);
 
-                                ctx.RemoteOperatingSystems.RemoveRange(ctx.RemoteOperatingSystems.Where(c =>
-                                                                           !c.Synchronized           &&
-                                                                           c.Name    == remoteOsName &&
-                                                                           c.Version == remoteOsVersion));
+                                ctx.Medias.RemoveRange(ctx.Medias.Where(c => !c.Synchronized && c.Type == media &&
+                                                                             c.Real));
+                            }
+
+                            if(!ctx.Medias.Any(c => !c.Synchronized && c.Type == media && !c.Real))
+                                continue;
+
+                            {
+                                Database.Models.Media existing =
+                                    ctx.Medias.FirstOrDefault(c => c.Synchronized && c.Type == media && !c.Real) ??
+                                    new Database.Models.Media
+                                    {
+                                        Synchronized = true,
+                                        Type         = media,
+                                        Real         = false
+                                    };
+
+                                existing.Count +=
+                                    (ulong)ctx.Medias.LongCount(c => !c.Synchronized && c.Type == media && !c.Real);
+
+                                ctx.Medias.Update(existing);
+
+                                ctx.Medias.RemoveRange(ctx.Medias.Where(c => !c.Synchronized && c.Type == media &&
+                                                                             !c.Real));
                             }
                         }
 
-                        ctx.SaveChanges();
+                    if(ctx.SeenDevices.Any(c => !c.Synchronized))
+                        foreach(DeviceStat device in ctx.SeenDevices.Where(c => !c.Synchronized))
+                        {
+                            device.Synchronized = true;
+                            ctx.Update(device);
+                        }
+
+                    if(ctx.OperatingSystems.Any(c => !c.Synchronized))
+                        foreach(string osName in ctx.OperatingSystems.Where(c => !c.Synchronized).
+                                                     Select(c => c.Name).Distinct())
+                        {
+                            foreach(string osVersion in ctx.OperatingSystems.
+                                                            Where(c => !c.Synchronized && c.Name == osName).
+                                                            Select(c => c.Version).Distinct())
+                            {
+                                OperatingSystem existing =
+                                    ctx.OperatingSystems.FirstOrDefault(c => c.Synchronized && c.Name == osName &&
+                                                                             c.Version                == osVersion) ??
+                                    new OperatingSystem
+                                    {
+                                        Synchronized = true,
+                                        Version      = osVersion,
+                                        Name         = osName
+                                    };
+
+                                existing.Count +=
+                                    (ulong)ctx.OperatingSystems.LongCount(c => !c.Synchronized     &&
+                                                                               c.Name    == osName &&
+                                                                               c.Version == osVersion);
+
+                                ctx.OperatingSystems.Update(existing);
+
+                                ctx.OperatingSystems.RemoveRange(ctx.OperatingSystems.Where(c => !c.Synchronized &&
+                                                                     c.Name    == osName                         &&
+                                                                     c.Version == osVersion));
+                            }
+                        }
+
+                    if(ctx.RemoteApplications.Any(c => !c.Synchronized))
+                        foreach(string remoteAppName in ctx.RemoteApplications.Where(c => !c.Synchronized).
+                                                            Select(c => c.Name).Distinct())
+                        {
+                            foreach(string remoteAppVersion in ctx.RemoteApplications.
+                                                                   Where(c => !c.Synchronized &&
+                                                                              c.Name == remoteAppName).
+                                                                   Select(c => c.Version).Distinct())
+                            {
+                                RemoteApplication existing =
+                                    ctx.RemoteApplications.FirstOrDefault(c => c.Synchronized             &&
+                                                                               c.Name    == remoteAppName &&
+                                                                               c.Version == remoteAppVersion) ??
+                                    new RemoteApplication
+                                    {
+                                        Synchronized = true,
+                                        Version      = remoteAppVersion,
+                                        Name         = remoteAppName
+                                    };
+
+                                existing.Count +=
+                                    (ulong)ctx.RemoteApplications.LongCount(c => !c.Synchronized           &&
+                                                                                c.Name    == remoteAppName &&
+                                                                                c.Version == remoteAppVersion);
+
+                                ctx.RemoteApplications.Update(existing);
+
+                                ctx.RemoteApplications.RemoveRange(ctx.RemoteApplications.Where(c =>
+                                                                       !c.Synchronized            &&
+                                                                       c.Name    == remoteAppName &&
+                                                                       c.Version == remoteAppVersion));
+                            }
+                        }
+
+                    if(ctx.RemoteArchitectures.Any(c => !c.Synchronized))
+                        foreach(string nvs in ctx.RemoteArchitectures.Where(c => !c.Synchronized).
+                                                  Select(c => c.Name).Distinct())
+                        {
+                            RemoteArchitecture existing =
+                                ctx.RemoteArchitectures.FirstOrDefault(c => c.Synchronized && c.Name == nvs) ??
+                                new RemoteArchitecture
+                                {
+                                    Name         = nvs,
+                                    Synchronized = true
+                                };
+
+                            existing.Count +=
+                                (ulong)ctx.RemoteArchitectures.LongCount(c => !c.Synchronized && c.Name == nvs);
+
+                            ctx.RemoteArchitectures.Update(existing);
+
+                            ctx.RemoteArchitectures.RemoveRange(ctx.RemoteArchitectures.
+                                                                    Where(c => !c.Synchronized && c.Name == nvs));
+                        }
+
+                    foreach(string remoteOsName in ctx.RemoteOperatingSystems.Where(c => !c.Synchronized).
+                                                       Select(c => c.Name).Distinct())
+                    {
+                        foreach(string remoteOsVersion in ctx.RemoteOperatingSystems.
+                                                              Where(c => !c.Synchronized && c.Name == remoteOsName).
+                                                              Select(c => c.Version).Distinct())
+                        {
+                            RemoteOperatingSystem existing =
+                                ctx.RemoteOperatingSystems.FirstOrDefault(c => c.Synchronized            &&
+                                                                               c.Name    == remoteOsName &&
+                                                                               c.Version == remoteOsVersion) ??
+                                new RemoteOperatingSystem
+                                {
+                                    Synchronized = true,
+                                    Version      = remoteOsVersion,
+                                    Name         = remoteOsName
+                                };
+
+                            existing.Count +=
+                                (ulong)ctx.RemoteOperatingSystems.LongCount(c => !c.Synchronized          &&
+                                                                                c.Name    == remoteOsName &&
+                                                                                c.Version == remoteOsVersion);
+
+                            ctx.RemoteOperatingSystems.Update(existing);
+
+                            ctx.RemoteOperatingSystems.RemoveRange(ctx.RemoteOperatingSystems.Where(c =>
+                                                                       !c.Synchronized           &&
+                                                                       c.Name    == remoteOsName &&
+                                                                       c.Version == remoteOsVersion));
+                        }
                     }
+
+                    ctx.SaveChanges();
+                }
+            }
+            catch(WebException)
+            {
+                // Can't connect to the server, do nothing
+            }
+            catch(DbUpdateConcurrencyException)
+            {
+                // Ignore db concurrency errors
+            }
+
+            // ReSharper disable once RedundantCatchClause
+            catch
+            {
+            #if DEBUG
+                _submitStatsLock = false;
+
+                if(Debugger.IsAttached)
+                    throw;
+            #endif
+            }
+
+            IEnumerable<string> statsFiles =
+                Directory.EnumerateFiles(Settings.Settings.StatsPath, "PartialStats_*.xml",
+                                         SearchOption.TopDirectoryOnly);
+
+            foreach(string statsFile in statsFiles)
+                try
+                {
+                    if(!File.Exists(statsFile))
+                        continue;
+
+                    var stats = new Stats();
+
+                    // This can execute before debug console has been inited
+                #if DEBUG
+                    System.Console.WriteLine("Uploading partial statistics file {0}", statsFile);
+                #else
+                    Aaru.Console.AaruConsole.DebugWriteLine("Submit stats", "Uploading partial statistics file {0}", statsFile);
+                #endif
+
+                    var fs = new FileStream(statsFile, FileMode.Open, FileAccess.Read);
+                    var xs = new XmlSerializer(stats.GetType());
+                    xs.Deserialize(fs); // Just to test validity of stats file
+                    fs.Seek(0, SeekOrigin.Begin);
+
+                    var request = WebRequest.Create("https://www.aaru.app/api/uploadstats");
+
+                    ((HttpWebRequest)request).UserAgent =
+                        $"Aaru {typeof(CommonTypes.Interop.Version).Assembly.GetName().Version}";
+
+                    request.Method        = "POST";
+                    request.ContentLength = fs.Length;
+                    request.ContentType   = "application/xml";
+                    Stream reqStream = request.GetRequestStream();
+                    fs.CopyTo(reqStream);
+                    reqStream.Close();
+                    WebResponse response = request.GetResponse();
+
+                    if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK)
+                        return;
+
+                    Stream data   = response.GetResponseStream();
+                    var    reader = new StreamReader(data ?? throw new InvalidOperationException());
+
+                    string responseFromServer = reader.ReadToEnd();
+                    data.Close();
+                    response.Close();
+                    fs.Close();
+
+                    if(responseFromServer == "ok")
+                        File.Delete(statsFile);
                 }
                 catch(WebException)
                 {
-                    // Can't connect to the server, do nothing
+                    // Can't connect to the server, postpone til next try
+                    break;
                 }
-                catch(DbUpdateConcurrencyException)
-                {
-                    // Ignore db concurrency errors
-                }
-
-                // ReSharper disable once RedundantCatchClause
                 catch
                 {
                 #if DEBUG
+                    if(!Debugger.IsAttached)
+                        continue;
+
                     _submitStatsLock = false;
 
-                    if(Debugger.IsAttached)
-                        throw;
+                    throw;
                 #endif
                 }
 
-                IEnumerable<string> statsFiles =
-                    Directory.EnumerateFiles(Settings.Settings.StatsPath, "PartialStats_*.xml",
-                                             SearchOption.TopDirectoryOnly);
+            _submitStatsLock = false;
+        });
 
-                foreach(string statsFile in statsFiles)
-                    try
-                    {
-                        if(!File.Exists(statsFile))
-                            continue;
+        submitThread.Start();
+    }
 
-                        var stats = new Stats();
+    /// <summary>Adds the execution of a command to statistics</summary>
+    /// <param name="command">Command</param>
+    public static void AddCommand(string command)
+    {
+        if(string.IsNullOrWhiteSpace(command))
+            return;
 
-                        // This can execute before debug console has been inited
-                    #if DEBUG
-                        System.Console.WriteLine("Uploading partial statistics file {0}", statsFile);
-                    #else
-                    Aaru.Console.AaruConsole.DebugWriteLine("Submit stats", "Uploading partial statistics file {0}", statsFile);
-                    #endif
+        if(Settings.Settings.Current.Stats == null ||
+           !Settings.Settings.Current.Stats.DeviceStats)
+            return;
 
-                        var fs = new FileStream(statsFile, FileMode.Open, FileAccess.Read);
-                        var xs = new XmlSerializer(stats.GetType());
-                        xs.Deserialize(fs); // Just to test validity of stats file
-                        fs.Seek(0, SeekOrigin.Begin);
+        using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
-                        var request = WebRequest.Create("https://www.aaru.app/api/uploadstats");
-
-                        ((HttpWebRequest)request).UserAgent =
-                            $"Aaru {typeof(CommonTypes.Interop.Version).Assembly.GetName().Version}";
-
-                        request.Method        = "POST";
-                        request.ContentLength = fs.Length;
-                        request.ContentType   = "application/xml";
-                        Stream reqStream = request.GetRequestStream();
-                        fs.CopyTo(reqStream);
-                        reqStream.Close();
-                        WebResponse response = request.GetResponse();
-
-                        if(((HttpWebResponse)response).StatusCode != HttpStatusCode.OK)
-                            return;
-
-                        Stream data   = response.GetResponseStream();
-                        var    reader = new StreamReader(data ?? throw new InvalidOperationException());
-
-                        string responseFromServer = reader.ReadToEnd();
-                        data.Close();
-                        response.Close();
-                        fs.Close();
-
-                        if(responseFromServer == "ok")
-                            File.Delete(statsFile);
-                    }
-                    catch(WebException)
-                    {
-                        // Can't connect to the server, postpone til next try
-                        break;
-                    }
-                    catch
-                    {
-                    #if DEBUG
-                        if(!Debugger.IsAttached)
-                            continue;
-
-                        _submitStatsLock = false;
-
-                        throw;
-                    #endif
-                    }
-
-                _submitStatsLock = false;
-            });
-
-            submitThread.Start();
-        }
-
-        /// <summary>Adds the execution of a command to statistics</summary>
-        /// <param name="command">Command</param>
-        public static void AddCommand(string command)
+        ctx.Commands.Add(new Command
         {
-            if(string.IsNullOrWhiteSpace(command))
-                return;
+            Name         = command,
+            Synchronized = false,
+            Count        = 1
+        });
 
-            if(Settings.Settings.Current.Stats == null ||
-               !Settings.Settings.Current.Stats.DeviceStats)
-                return;
-
-            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-            ctx.Commands.Add(new Command
-            {
-                Name         = command,
-                Synchronized = false,
-                Count        = 1
-            });
-
-            try
-            {
-                ctx.SaveChanges();
-            }
-            catch(SqliteException ex)
-            {
-                AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
-                AaruConsole.DebugWriteLine("Stats", "{0}", ex);
-            }
-        }
-
-        /// <summary>Adds a new filesystem to statistics</summary>
-        /// <param name="filesystem">Filesystem name</param>
-        public static void AddFilesystem(string filesystem)
+        try
         {
-            if(string.IsNullOrWhiteSpace(filesystem))
-                return;
-
-            if(Settings.Settings.Current.Stats == null ||
-               !Settings.Settings.Current.Stats.FilesystemStats)
-                return;
-
-            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-            ctx.Filesystems.Add(new Filesystem
-            {
-                Name         = filesystem,
-                Synchronized = false,
-                Count        = 1
-            });
-
-            try
-            {
-                ctx.SaveChanges();
-            }
-            catch(SqliteException ex)
-            {
-                AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
-                AaruConsole.DebugWriteLine("Stats", "{0}", ex);
-            }
+            ctx.SaveChanges();
         }
-
-        /// <summary>Adds a new partition scheme to statistics</summary>
-        /// <param name="partition">Partition scheme name</param>
-        internal static void AddPartition(string partition)
+        catch(SqliteException ex)
         {
-            if(string.IsNullOrWhiteSpace(partition))
-                return;
-
-            if(Settings.Settings.Current.Stats == null ||
-               !Settings.Settings.Current.Stats.PartitionStats)
-                return;
-
-            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-            ctx.Partitions.Add(new Partition
-            {
-                Name         = partition,
-                Synchronized = false,
-                Count        = 1
-            });
-
-            try
-            {
-                ctx.SaveChanges();
-            }
-            catch(SqliteException ex)
-            {
-                AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
-                AaruConsole.DebugWriteLine("Stats", "{0}", ex);
-            }
+            AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
+            AaruConsole.DebugWriteLine("Stats", "{0}", ex);
         }
+    }
 
-        /// <summary>Adds a new filter to statistics</summary>
-        /// <param name="filter">Filter name</param>
-        public static void AddFilter(string filter)
+    /// <summary>Adds a new filesystem to statistics</summary>
+    /// <param name="filesystem">Filesystem name</param>
+    public static void AddFilesystem(string filesystem)
+    {
+        if(string.IsNullOrWhiteSpace(filesystem))
+            return;
+
+        if(Settings.Settings.Current.Stats == null ||
+           !Settings.Settings.Current.Stats.FilesystemStats)
+            return;
+
+        using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+
+        ctx.Filesystems.Add(new Filesystem
         {
-            if(string.IsNullOrWhiteSpace(filter))
-                return;
+            Name         = filesystem,
+            Synchronized = false,
+            Count        = 1
+        });
 
-            if(Settings.Settings.Current.Stats == null ||
-               !Settings.Settings.Current.Stats.FilterStats)
-                return;
-
-            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-            ctx.Filters.Add(new Filter
-            {
-                Name         = filter,
-                Synchronized = false,
-                Count        = 1
-            });
-
-            try
-            {
-                ctx.SaveChanges();
-            }
-            catch(SqliteException ex)
-            {
-                AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
-                AaruConsole.DebugWriteLine("Stats", "{0}", ex);
-            }
+        try
+        {
+            ctx.SaveChanges();
         }
-
-        /// <summary>Ads a new media image to statistics</summary>
-        /// <param name="format">Media image name</param>
-        public static void AddMediaFormat(string format)
+        catch(SqliteException ex)
         {
-            if(string.IsNullOrWhiteSpace(format))
-                return;
-
-            if(Settings.Settings.Current.Stats == null ||
-               !Settings.Settings.Current.Stats.MediaImageStats)
-                return;
-
-            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-            ctx.MediaFormats.Add(new MediaFormat
-            {
-                Name         = format,
-                Synchronized = false,
-                Count        = 1
-            });
-
-            try
-            {
-                ctx.SaveChanges();
-            }
-            catch(SqliteException ex)
-            {
-                AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
-                AaruConsole.DebugWriteLine("Stats", "{0}", ex);
-            }
+            AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
+            AaruConsole.DebugWriteLine("Stats", "{0}", ex);
         }
+    }
 
-        /// <summary>Adds a new device to statistics</summary>
-        /// <param name="dev">Device</param>
-        public static void AddDevice(Device dev)
+    /// <summary>Adds a new partition scheme to statistics</summary>
+    /// <param name="partition">Partition scheme name</param>
+    internal static void AddPartition(string partition)
+    {
+        if(string.IsNullOrWhiteSpace(partition))
+            return;
+
+        if(Settings.Settings.Current.Stats == null ||
+           !Settings.Settings.Current.Stats.PartitionStats)
+            return;
+
+        using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+
+        ctx.Partitions.Add(new Partition
         {
-            if(Settings.Settings.Current.Stats == null ||
-               !Settings.Settings.Current.Stats.DeviceStats)
-                return;
+            Name         = partition,
+            Synchronized = false,
+            Count        = 1
+        });
 
-            string deviceBus;
-
-            if(dev.IsUsb)
-                deviceBus = "USB";
-            else if(dev.IsFireWire)
-                deviceBus = "FireWire";
-            else
-                deviceBus = dev.Type.ToString();
-
-            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-            if(ctx.SeenDevices.Any(d => d.Manufacturer == dev.Manufacturer     && d.Model == dev.Model &&
-                                        d.Revision     == dev.FirmwareRevision && d.Bus   == deviceBus))
-                return;
-
-            ctx.SeenDevices.Add(new DeviceStat
-            {
-                Bus          = deviceBus,
-                Manufacturer = dev.Manufacturer,
-                Model        = dev.Model,
-                Revision     = dev.FirmwareRevision,
-                Synchronized = false
-            });
-
-            try
-            {
-                ctx.SaveChanges();
-            }
-            catch(SqliteException ex)
-            {
-                AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
-                AaruConsole.DebugWriteLine("Stats", "{0}", ex);
-            }
+        try
+        {
+            ctx.SaveChanges();
         }
-
-        /// <summary>Adds a new media type to statistics</summary>
-        /// <param name="type">Media type</param>
-        /// <param name="real">Set if media was found on a real device, otherwise found on a media image</param>
-        public static void AddMedia(MediaType type, bool real)
+        catch(SqliteException ex)
         {
-            if(Settings.Settings.Current.Stats == null ||
-               !Settings.Settings.Current.Stats.MediaStats)
-                return;
-
-            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-            ctx.Medias.Add(new Database.Models.Media
-            {
-                Real         = real,
-                Synchronized = false,
-                Type         = type.ToString(),
-                Count        = 1
-            });
-
-            try
-            {
-                ctx.SaveChanges();
-            }
-            catch(SqliteException ex)
-            {
-                AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
-                AaruConsole.DebugWriteLine("Stats", "{0}", ex);
-            }
+            AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
+            AaruConsole.DebugWriteLine("Stats", "{0}", ex);
         }
+    }
 
-        /// <summary>Adds a new remote to statistics</summary>
-        public static void AddRemote(string serverApplication, string serverVersion, string serverOperatingSystem,
-                                     string serverOperatingSystemVersion, string serverArchitecture)
+    /// <summary>Adds a new filter to statistics</summary>
+    /// <param name="filter">Filter name</param>
+    public static void AddFilter(string filter)
+    {
+        if(string.IsNullOrWhiteSpace(filter))
+            return;
+
+        if(Settings.Settings.Current.Stats == null ||
+           !Settings.Settings.Current.Stats.FilterStats)
+            return;
+
+        using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+
+        ctx.Filters.Add(new Filter
         {
-            if(Settings.Settings.Current.Stats == null ||
-               !Settings.Settings.Current.Stats.MediaStats)
-                return;
+            Name         = filter,
+            Synchronized = false,
+            Count        = 1
+        });
 
-            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+        try
+        {
+            ctx.SaveChanges();
+        }
+        catch(SqliteException ex)
+        {
+            AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
+            AaruConsole.DebugWriteLine("Stats", "{0}", ex);
+        }
+    }
 
-            ctx.RemoteApplications.Add(new RemoteApplication
-            {
-                Count        = 1,
-                Name         = serverApplication,
-                Synchronized = false,
-                Version      = serverVersion
-            });
+    /// <summary>Ads a new media image to statistics</summary>
+    /// <param name="format">Media image name</param>
+    public static void AddMediaFormat(string format)
+    {
+        if(string.IsNullOrWhiteSpace(format))
+            return;
 
-            ctx.RemoteArchitectures.Add(new RemoteArchitecture
-            {
-                Count        = 1,
-                Name         = serverArchitecture,
-                Synchronized = false
-            });
+        if(Settings.Settings.Current.Stats == null ||
+           !Settings.Settings.Current.Stats.MediaImageStats)
+            return;
 
-            ctx.RemoteOperatingSystems.Add(new RemoteOperatingSystem
-            {
-                Count        = 1,
-                Name         = serverOperatingSystem,
-                Synchronized = false,
-                Version      = serverOperatingSystemVersion
-            });
+        using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
-            try
-            {
-                ctx.SaveChanges();
-            }
-            catch(SqliteException ex)
-            {
-                AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
-                AaruConsole.DebugWriteLine("Stats", "{0}", ex);
-            }
+        ctx.MediaFormats.Add(new MediaFormat
+        {
+            Name         = format,
+            Synchronized = false,
+            Count        = 1
+        });
+
+        try
+        {
+            ctx.SaveChanges();
+        }
+        catch(SqliteException ex)
+        {
+            AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
+            AaruConsole.DebugWriteLine("Stats", "{0}", ex);
+        }
+    }
+
+    /// <summary>Adds a new device to statistics</summary>
+    /// <param name="dev">Device</param>
+    public static void AddDevice(Device dev)
+    {
+        if(Settings.Settings.Current.Stats == null ||
+           !Settings.Settings.Current.Stats.DeviceStats)
+            return;
+
+        string deviceBus;
+
+        if(dev.IsUsb)
+            deviceBus = "USB";
+        else if(dev.IsFireWire)
+            deviceBus = "FireWire";
+        else
+            deviceBus = dev.Type.ToString();
+
+        using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+
+        if(ctx.SeenDevices.Any(d => d.Manufacturer == dev.Manufacturer     && d.Model == dev.Model &&
+                                    d.Revision     == dev.FirmwareRevision && d.Bus   == deviceBus))
+            return;
+
+        ctx.SeenDevices.Add(new DeviceStat
+        {
+            Bus          = deviceBus,
+            Manufacturer = dev.Manufacturer,
+            Model        = dev.Model,
+            Revision     = dev.FirmwareRevision,
+            Synchronized = false
+        });
+
+        try
+        {
+            ctx.SaveChanges();
+        }
+        catch(SqliteException ex)
+        {
+            AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
+            AaruConsole.DebugWriteLine("Stats", "{0}", ex);
+        }
+    }
+
+    /// <summary>Adds a new media type to statistics</summary>
+    /// <param name="type">Media type</param>
+    /// <param name="real">Set if media was found on a real device, otherwise found on a media image</param>
+    public static void AddMedia(MediaType type, bool real)
+    {
+        if(Settings.Settings.Current.Stats == null ||
+           !Settings.Settings.Current.Stats.MediaStats)
+            return;
+
+        using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+
+        ctx.Medias.Add(new Database.Models.Media
+        {
+            Real         = real,
+            Synchronized = false,
+            Type         = type.ToString(),
+            Count        = 1
+        });
+
+        try
+        {
+            ctx.SaveChanges();
+        }
+        catch(SqliteException ex)
+        {
+            AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
+            AaruConsole.DebugWriteLine("Stats", "{0}", ex);
+        }
+    }
+
+    /// <summary>Adds a new remote to statistics</summary>
+    public static void AddRemote(string serverApplication, string serverVersion, string serverOperatingSystem,
+                                 string serverOperatingSystemVersion, string serverArchitecture)
+    {
+        if(Settings.Settings.Current.Stats == null ||
+           !Settings.Settings.Current.Stats.MediaStats)
+            return;
+
+        using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+
+        ctx.RemoteApplications.Add(new RemoteApplication
+        {
+            Count        = 1,
+            Name         = serverApplication,
+            Synchronized = false,
+            Version      = serverVersion
+        });
+
+        ctx.RemoteArchitectures.Add(new RemoteArchitecture
+        {
+            Count        = 1,
+            Name         = serverArchitecture,
+            Synchronized = false
+        });
+
+        ctx.RemoteOperatingSystems.Add(new RemoteOperatingSystem
+        {
+            Count        = 1,
+            Name         = serverOperatingSystem,
+            Synchronized = false,
+            Version      = serverOperatingSystemVersion
+        });
+
+        try
+        {
+            ctx.SaveChanges();
+        }
+        catch(SqliteException ex)
+        {
+            AaruConsole.DebugWriteLine("Stats", "Exception while trying to save statistics:");
+            AaruConsole.DebugWriteLine("Stats", "{0}", ex);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Database/ContextFactory.cs b/Aaru.Database/ContextFactory.cs
index 090c02a69..ec39e035e 100644
--- a/Aaru.Database/ContextFactory.cs
+++ b/Aaru.Database/ContextFactory.cs
@@ -32,16 +32,15 @@
 
 using Microsoft.EntityFrameworkCore.Design;
 
-namespace Aaru.Database
+namespace Aaru.Database;
+
+/// <inheritdoc />
+/// <summary>Database context factory, for design time</summary>
+public class AaruContextFactory : IDesignTimeDbContextFactory<AaruContext>
 {
     /// <inheritdoc />
-    /// <summary>Database context factory, for design time</summary>
-    public class AaruContextFactory : IDesignTimeDbContextFactory<AaruContext>
-    {
-        /// <inheritdoc />
-        /// <summary>Creates a database context</summary>
-        /// <param name="args">Ignored parameters</param>
-        /// <returns>A database context</returns>
-        public AaruContext CreateDbContext(string[] args) => AaruContext.Create("aaru.db");
-    }
+    /// <summary>Creates a database context</summary>
+    /// <param name="args">Ignored parameters</param>
+    /// <returns>A database context</returns>
+    public AaruContext CreateDbContext(string[] args) => AaruContext.Create("aaru.db");
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/BaseModel.cs b/Aaru.Database/Models/BaseModel.cs
index 02189e377..4aaf1388b 100644
--- a/Aaru.Database/Models/BaseModel.cs
+++ b/Aaru.Database/Models/BaseModel.cs
@@ -32,13 +32,12 @@
 
 using System.ComponentModel.DataAnnotations;
 
-namespace Aaru.Database.Models
+namespace Aaru.Database.Models;
+
+/// <summary>Base database model</summary>
+public abstract class BaseModel
 {
-    /// <summary>Base database model</summary>
-    public abstract class BaseModel
-    {
-        /// <summary>Database ID</summary>
-        [Key]
-        public int Id { get; set; }
-    }
+    /// <summary>Database ID</summary>
+    [Key]
+    public int Id { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/BaseOperatingSystem.cs b/Aaru.Database/Models/BaseOperatingSystem.cs
index 3ddecfe0e..307403f74 100644
--- a/Aaru.Database/Models/BaseOperatingSystem.cs
+++ b/Aaru.Database/Models/BaseOperatingSystem.cs
@@ -30,19 +30,18 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Operating system statistics</summary>
+public abstract class BaseOperatingSystem : BaseModel
 {
-    /// <inheritdoc />
-    /// <summary>Operating system statistics</summary>
-    public abstract class BaseOperatingSystem : BaseModel
-    {
-        /// <summary>Operating system name</summary>
-        public string Name { get; set; }
-        /// <summary>Operating system version</summary>
-        public string Version { get; set; }
-        /// <summary>Has already been synchronized with Aaru's server</summary>
-        public bool Synchronized { get; set; }
-        /// <summary>Statistical count</summary>
-        public ulong Count { get; set; }
-    }
+    /// <summary>Operating system name</summary>
+    public string Name { get; set; }
+    /// <summary>Operating system version</summary>
+    public string Version { get; set; }
+    /// <summary>Has already been synchronized with Aaru's server</summary>
+    public bool Synchronized { get; set; }
+    /// <summary>Statistical count</summary>
+    public ulong Count { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/CdOffset.cs b/Aaru.Database/Models/CdOffset.cs
index 5433e1605..266f1b99c 100644
--- a/Aaru.Database/Models/CdOffset.cs
+++ b/Aaru.Database/Models/CdOffset.cs
@@ -32,48 +32,47 @@
 
 using System;
 
-namespace Aaru.Database.Models
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>CD read offset</summary>
+public class CdOffset : CommonTypes.Metadata.CdOffset
 {
-    /// <inheritdoc />
-    /// <summary>CD read offset</summary>
-    public class CdOffset : CommonTypes.Metadata.CdOffset
+    /// <summary>Builds an empty CD read offset</summary>
+    public CdOffset() {}
+
+    /// <summary>Builds a CD read offset with the specified parameters</summary>
+    /// <param name="manufacturer">Manufacturer</param>
+    /// <param name="model">Model</param>
+    /// <param name="offset">Read offset</param>
+    /// <param name="submissions">Number of submissions</param>
+    /// <param name="agreement">Percentage of agreement of submissions</param>
+    public CdOffset(string manufacturer, string model, short offset, int submissions, float agreement)
     {
-        /// <summary>Builds an empty CD read offset</summary>
-        public CdOffset() {}
-
-        /// <summary>Builds a CD read offset with the specified parameters</summary>
-        /// <param name="manufacturer">Manufacturer</param>
-        /// <param name="model">Model</param>
-        /// <param name="offset">Read offset</param>
-        /// <param name="submissions">Number of submissions</param>
-        /// <param name="agreement">Percentage of agreement of submissions</param>
-        public CdOffset(string manufacturer, string model, short offset, int submissions, float agreement)
-        {
-            Manufacturer = manufacturer;
-            Model        = model;
-            Offset       = offset;
-            Submissions  = submissions;
-            Agreement    = agreement;
-            AddedWhen    = ModifiedWhen = DateTime.UtcNow;
-        }
-
-        /// <summary>Builds a CD read offset from the metadata type</summary>
-        /// <param name="offset">Read offset metadata</param>
-        public CdOffset(CommonTypes.Metadata.CdOffset offset)
-        {
-            Manufacturer = offset.Manufacturer;
-            Model        = offset.Model;
-            Offset       = offset.Offset;
-            Submissions  = offset.Submissions;
-            Agreement    = offset.Agreement;
-            AddedWhen    = ModifiedWhen = DateTime.UtcNow;
-        }
-
-        /// <summary>Database ID</summary>
-        public int Id { get; set; }
-        /// <summary>Date when model has been added to the database</summary>
-        public DateTime AddedWhen { get; set; }
-        /// <summary>Date when model was last modified</summary>
-        public DateTime ModifiedWhen { get; set; }
+        Manufacturer = manufacturer;
+        Model        = model;
+        Offset       = offset;
+        Submissions  = submissions;
+        Agreement    = agreement;
+        AddedWhen    = ModifiedWhen = DateTime.UtcNow;
     }
+
+    /// <summary>Builds a CD read offset from the metadata type</summary>
+    /// <param name="offset">Read offset metadata</param>
+    public CdOffset(CommonTypes.Metadata.CdOffset offset)
+    {
+        Manufacturer = offset.Manufacturer;
+        Model        = offset.Model;
+        Offset       = offset.Offset;
+        Submissions  = offset.Submissions;
+        Agreement    = offset.Agreement;
+        AddedWhen    = ModifiedWhen = DateTime.UtcNow;
+    }
+
+    /// <summary>Database ID</summary>
+    public int Id { get; set; }
+    /// <summary>Date when model has been added to the database</summary>
+    public DateTime AddedWhen { get; set; }
+    /// <summary>Date when model was last modified</summary>
+    public DateTime ModifiedWhen { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/Command.cs b/Aaru.Database/Models/Command.cs
index 9100145b7..d280bfc12 100644
--- a/Aaru.Database/Models/Command.cs
+++ b/Aaru.Database/Models/Command.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
-{
-    /// <inheritdoc />
-    /// <summary>Command statistics.</summary>
-    public class Command : NameCountModel {}
-}
\ No newline at end of file
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Command statistics.</summary>
+public class Command : NameCountModel {}
\ No newline at end of file
diff --git a/Aaru.Database/Models/Device.cs b/Aaru.Database/Models/Device.cs
index 1b3b2a915..605b1fa05 100644
--- a/Aaru.Database/Models/Device.cs
+++ b/Aaru.Database/Models/Device.cs
@@ -35,45 +35,44 @@ using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
 using Aaru.CommonTypes.Metadata;
 
-namespace Aaru.Database.Models
+namespace Aaru.Database.Models;
+
+/// <summary>Known device</summary>
+public class Device : DeviceReportV2
 {
-    /// <summary>Known device</summary>
-    public class Device : DeviceReportV2
+    /// <summary>Builds an empty device</summary>
+    public Device() => LastSynchronized = DateTime.UtcNow;
+
+    /// <summary>Builds a device from a device report</summary>
+    /// <param name="report">Device report</param>
+    [SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")]
+    public Device(DeviceReportV2 report)
     {
-        /// <summary>Builds an empty device</summary>
-        public Device() => LastSynchronized = DateTime.UtcNow;
-
-        /// <summary>Builds a device from a device report</summary>
-        /// <param name="report">Device report</param>
-        [SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")]
-        public Device(DeviceReportV2 report)
-        {
-            ATA                       = report.ATA;
-            ATAPI                     = report.ATAPI;
-            CompactFlash              = report.CompactFlash;
-            FireWire                  = report.FireWire;
-            LastSynchronized          = DateTime.UtcNow;
-            MultiMediaCard            = report.MultiMediaCard;
-            PCMCIA                    = report.PCMCIA;
-            SCSI                      = report.SCSI;
-            SecureDigital             = report.SecureDigital;
-            USB                       = report.USB;
-            Manufacturer              = report.Manufacturer;
-            Model                     = report.Model;
-            Revision                  = report.Revision;
-            Type                      = report.Type;
-            GdRomSwapDiscCapabilities = report.GdRomSwapDiscCapabilities;
-        }
-
-        /// <summary>When this known device was last synchronized with the server</summary>
-        public DateTime LastSynchronized { get; set; }
-
-        /// <summary>Optimal number of blocks to read at once</summary>
-        [DefaultValue(0)]
-        public int OptimalMultipleSectorsRead { get; set; }
-
-        /// <summary>Can read GD-ROM using swap trick?</summary>
-        [DefaultValue(null)]
-        public bool? CanReadGdRomUsingSwapDisc { get; set; }
+        ATA                       = report.ATA;
+        ATAPI                     = report.ATAPI;
+        CompactFlash              = report.CompactFlash;
+        FireWire                  = report.FireWire;
+        LastSynchronized          = DateTime.UtcNow;
+        MultiMediaCard            = report.MultiMediaCard;
+        PCMCIA                    = report.PCMCIA;
+        SCSI                      = report.SCSI;
+        SecureDigital             = report.SecureDigital;
+        USB                       = report.USB;
+        Manufacturer              = report.Manufacturer;
+        Model                     = report.Model;
+        Revision                  = report.Revision;
+        Type                      = report.Type;
+        GdRomSwapDiscCapabilities = report.GdRomSwapDiscCapabilities;
     }
+
+    /// <summary>When this known device was last synchronized with the server</summary>
+    public DateTime LastSynchronized { get; set; }
+
+    /// <summary>Optimal number of blocks to read at once</summary>
+    [DefaultValue(0)]
+    public int OptimalMultipleSectorsRead { get; set; }
+
+    /// <summary>Can read GD-ROM using swap trick?</summary>
+    [DefaultValue(null)]
+    public bool? CanReadGdRomUsingSwapDisc { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/DeviceStat.cs b/Aaru.Database/Models/DeviceStat.cs
index 719981925..3ec61b6cb 100644
--- a/Aaru.Database/Models/DeviceStat.cs
+++ b/Aaru.Database/Models/DeviceStat.cs
@@ -30,21 +30,20 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Device found in usage</summary>
+public class DeviceStat : BaseModel
 {
-    /// <inheritdoc />
-    /// <summary>Device found in usage</summary>
-    public class DeviceStat : BaseModel
-    {
-        /// <summary>Manufacturer</summary>
-        public string Manufacturer { get; set; }
-        /// <summary>Model</summary>
-        public string Model { get; set; }
-        /// <summary>Revision or firmware version</summary>
-        public string Revision { get; set; }
-        /// <summary>Bus</summary>
-        public string Bus { get; set; }
-        /// <summary>Has already been synchronized with Aaru's server</summary>
-        public bool Synchronized { get; set; }
-    }
+    /// <summary>Manufacturer</summary>
+    public string Manufacturer { get; set; }
+    /// <summary>Model</summary>
+    public string Model { get; set; }
+    /// <summary>Revision or firmware version</summary>
+    public string Revision { get; set; }
+    /// <summary>Bus</summary>
+    public string Bus { get; set; }
+    /// <summary>Has already been synchronized with Aaru's server</summary>
+    public bool Synchronized { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/Filesystem.cs b/Aaru.Database/Models/Filesystem.cs
index 275ab9447..516c52330 100644
--- a/Aaru.Database/Models/Filesystem.cs
+++ b/Aaru.Database/Models/Filesystem.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
-{
-    /// <inheritdoc />
-    /// <summary>Filesystem found</summary>
-    public class Filesystem : NameCountModel {}
-}
\ No newline at end of file
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Filesystem found</summary>
+public class Filesystem : NameCountModel {}
\ No newline at end of file
diff --git a/Aaru.Database/Models/Filter.cs b/Aaru.Database/Models/Filter.cs
index 44749399c..082f44285 100644
--- a/Aaru.Database/Models/Filter.cs
+++ b/Aaru.Database/Models/Filter.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
-{
-    /// <inheritdoc />
-    /// <summary>Filter used</summary>
-    public class Filter : NameCountModel {}
-}
\ No newline at end of file
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Filter used</summary>
+public class Filter : NameCountModel {}
\ No newline at end of file
diff --git a/Aaru.Database/Models/Media.cs b/Aaru.Database/Models/Media.cs
index 9e7256ed4..9bf096d47 100644
--- a/Aaru.Database/Models/Media.cs
+++ b/Aaru.Database/Models/Media.cs
@@ -30,19 +30,18 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Media type found</summary>
+public class Media : BaseModel
 {
-    /// <inheritdoc />
-    /// <summary>Media type found</summary>
-    public class Media : BaseModel
-    {
-        /// <summary>Media type name</summary>
-        public string Type { get; set; }
-        /// <summary>Found physically, or in image</summary>
-        public bool Real { get; set; }
-        /// <summary>Has already been synchronized with Aaru's server</summary>
-        public bool Synchronized { get; set; }
-        /// <summary>Count of times found</summary>
-        public ulong Count { get; set; }
-    }
+    /// <summary>Media type name</summary>
+    public string Type { get; set; }
+    /// <summary>Found physically, or in image</summary>
+    public bool Real { get; set; }
+    /// <summary>Has already been synchronized with Aaru's server</summary>
+    public bool Synchronized { get; set; }
+    /// <summary>Count of times found</summary>
+    public ulong Count { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/MediaFormat.cs b/Aaru.Database/Models/MediaFormat.cs
index a1f99e026..804344375 100644
--- a/Aaru.Database/Models/MediaFormat.cs
+++ b/Aaru.Database/Models/MediaFormat.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
-{
-    /// <inheritdoc />
-    /// <summary>Media image format</summary>
-    public class MediaFormat : NameCountModel {}
-}
\ No newline at end of file
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Media image format</summary>
+public class MediaFormat : NameCountModel {}
\ No newline at end of file
diff --git a/Aaru.Database/Models/NameCountModel.cs b/Aaru.Database/Models/NameCountModel.cs
index c2b91620c..6d0d0c90b 100644
--- a/Aaru.Database/Models/NameCountModel.cs
+++ b/Aaru.Database/Models/NameCountModel.cs
@@ -30,17 +30,16 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Model for name-count values.</summary>
+public abstract class NameCountModel : BaseModel
 {
-    /// <inheritdoc />
-    /// <summary>Model for name-count values.</summary>
-    public abstract class NameCountModel : BaseModel
-    {
-        /// <summary>Value name</summary>
-        public string Name { get; set; }
-        /// <summary>Has already been synchronized with Aaru's server</summary>
-        public bool Synchronized { get; set; }
-        /// <summary>Value count</summary>
-        public ulong Count { get; set; }
-    }
+    /// <summary>Value name</summary>
+    public string Name { get; set; }
+    /// <summary>Has already been synchronized with Aaru's server</summary>
+    public bool Synchronized { get; set; }
+    /// <summary>Value count</summary>
+    public ulong Count { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/OperatingSystem.cs b/Aaru.Database/Models/OperatingSystem.cs
index 58387620d..a15980f4e 100644
--- a/Aaru.Database/Models/OperatingSystem.cs
+++ b/Aaru.Database/Models/OperatingSystem.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
-{
-    /// <inheritdoc />
-    /// <summary>Operating system</summary>
-    public class OperatingSystem : BaseOperatingSystem {}
-}
\ No newline at end of file
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Operating system</summary>
+public class OperatingSystem : BaseOperatingSystem {}
\ No newline at end of file
diff --git a/Aaru.Database/Models/Partition.cs b/Aaru.Database/Models/Partition.cs
index 082b69008..15919a6ef 100644
--- a/Aaru.Database/Models/Partition.cs
+++ b/Aaru.Database/Models/Partition.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
-{
-    /// <inheritdoc />
-    /// <summary>Partitioning scheme</summary>
-    public class Partition : NameCountModel {}
-}
\ No newline at end of file
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Partitioning scheme</summary>
+public class Partition : NameCountModel {}
\ No newline at end of file
diff --git a/Aaru.Database/Models/RemoteApplication.cs b/Aaru.Database/Models/RemoteApplication.cs
index 641b38cf6..a42bc609b 100644
--- a/Aaru.Database/Models/RemoteApplication.cs
+++ b/Aaru.Database/Models/RemoteApplication.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
-{
-    /// <inheritdoc />
-    /// <summary>Remote application</summary>
-    public class RemoteApplication : BaseOperatingSystem {}
-}
\ No newline at end of file
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Remote application</summary>
+public class RemoteApplication : BaseOperatingSystem {}
\ No newline at end of file
diff --git a/Aaru.Database/Models/RemoteArchitecture.cs b/Aaru.Database/Models/RemoteArchitecture.cs
index 814a7667c..6aa2556a5 100644
--- a/Aaru.Database/Models/RemoteArchitecture.cs
+++ b/Aaru.Database/Models/RemoteArchitecture.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
-{
-    /// <inheritdoc />
-    /// <summary>Remote architecture</summary>
-    public class RemoteArchitecture : NameCountModel {}
-}
\ No newline at end of file
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Remote architecture</summary>
+public class RemoteArchitecture : NameCountModel {}
\ No newline at end of file
diff --git a/Aaru.Database/Models/RemoteOperatingSystem.cs b/Aaru.Database/Models/RemoteOperatingSystem.cs
index dbe42fe25..56a8be39b 100644
--- a/Aaru.Database/Models/RemoteOperatingSystem.cs
+++ b/Aaru.Database/Models/RemoteOperatingSystem.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
-{
-    /// <inheritdoc />
-    /// <summary>Remote operating system</summary>
-    public class RemoteOperatingSystem : BaseOperatingSystem {}
-}
\ No newline at end of file
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Remote operating system</summary>
+public class RemoteOperatingSystem : BaseOperatingSystem {}
\ No newline at end of file
diff --git a/Aaru.Database/Models/Report.cs b/Aaru.Database/Models/Report.cs
index 4d075a3c2..6c4fb5486 100644
--- a/Aaru.Database/Models/Report.cs
+++ b/Aaru.Database/Models/Report.cs
@@ -34,43 +34,42 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using Aaru.CommonTypes.Metadata;
 
-namespace Aaru.Database.Models
+namespace Aaru.Database.Models;
+
+/// <summary>Device report</summary>
+public class Report : DeviceReportV2
 {
-    /// <summary>Device report</summary>
-    public class Report : DeviceReportV2
+    /// <summary>Builds an empty device report</summary>
+    public Report()
     {
-        /// <summary>Builds an empty device report</summary>
-        public Report()
-        {
-            Created  = DateTime.UtcNow;
-            Uploaded = false;
-        }
-
-        /// <summary>Builds a device report model from a device report</summary>
-        /// <param name="report">Device report</param>
-        [SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")]
-        public Report(DeviceReportV2 report)
-        {
-            ATA            = report.ATA;
-            ATAPI          = report.ATAPI;
-            CompactFlash   = report.CompactFlash;
-            FireWire       = report.FireWire;
-            Created        = DateTime.UtcNow;
-            MultiMediaCard = report.MultiMediaCard;
-            PCMCIA         = report.PCMCIA;
-            SCSI           = report.SCSI;
-            SecureDigital  = report.SecureDigital;
-            USB            = report.USB;
-            Uploaded       = false;
-            Manufacturer   = report.Manufacturer;
-            Model          = report.Model;
-            Revision       = report.Revision;
-            Type           = report.Type;
-        }
-
-        /// <summary>Date when the device report was created</summary>
-        public DateTime Created { get; set; }
-        /// <summary>If this model has already been upload</summary>
-        public bool Uploaded { get; set; }
+        Created  = DateTime.UtcNow;
+        Uploaded = false;
     }
+
+    /// <summary>Builds a device report model from a device report</summary>
+    /// <param name="report">Device report</param>
+    [SuppressMessage("ReSharper", "VirtualMemberCallInConstructor")]
+    public Report(DeviceReportV2 report)
+    {
+        ATA            = report.ATA;
+        ATAPI          = report.ATAPI;
+        CompactFlash   = report.CompactFlash;
+        FireWire       = report.FireWire;
+        Created        = DateTime.UtcNow;
+        MultiMediaCard = report.MultiMediaCard;
+        PCMCIA         = report.PCMCIA;
+        SCSI           = report.SCSI;
+        SecureDigital  = report.SecureDigital;
+        USB            = report.USB;
+        Uploaded       = false;
+        Manufacturer   = report.Manufacturer;
+        Model          = report.Model;
+        Revision       = report.Revision;
+        Type           = report.Type;
+    }
+
+    /// <summary>Date when the device report was created</summary>
+    public DateTime Created { get; set; }
+    /// <summary>If this model has already been upload</summary>
+    public bool Uploaded { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/UsbProduct.cs b/Aaru.Database/Models/UsbProduct.cs
index ef430157a..9b05b8fa1 100644
--- a/Aaru.Database/Models/UsbProduct.cs
+++ b/Aaru.Database/Models/UsbProduct.cs
@@ -33,40 +33,39 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-namespace Aaru.Database.Models
+namespace Aaru.Database.Models;
+
+/// <summary>USB product</summary>
+public class UsbProduct
 {
-    /// <summary>USB product</summary>
-    public class UsbProduct
+    /// <summary>Builds an empty USB product</summary>
+    public UsbProduct() {}
+
+    /// <summary>Builds a USB product with the specified parameters</summary>
+    /// <param name="vendorId">Vendor ID</param>
+    /// <param name="id">Product ID</param>
+    /// <param name="product">Product name</param>
+    public UsbProduct(ushort vendorId, ushort id, string product)
     {
-        /// <summary>Builds an empty USB product</summary>
-        public UsbProduct() {}
-
-        /// <summary>Builds a USB product with the specified parameters</summary>
-        /// <param name="vendorId">Vendor ID</param>
-        /// <param name="id">Product ID</param>
-        /// <param name="product">Product name</param>
-        public UsbProduct(ushort vendorId, ushort id, string product)
-        {
-            VendorId  = vendorId;
-            ProductId = id;
-            Product   = product;
-            AddedWhen = ModifiedWhen = DateTime.UtcNow;
-        }
-
-        /// <summary>Database ID</summary>
-        [Key]
-        public int Id { get; set; }
-        /// <summary>Product ID</summary>
-        public ushort ProductId { get; set; }
-        /// <summary>Product name</summary>
-        public string Product { get; set; }
-        /// <summary>Date when model has been added to the database</summary>
-        public DateTime AddedWhen { get; set; }
-        /// <summary>Date when model was last modified</summary>
-        public DateTime ModifiedWhen { get; set; }
-        /// <summary>USB vendor ID</summary>
-        public ushort VendorId { get; set; }
-        /// <summary>Database link to USB vendor</summary>
-        public virtual UsbVendor Vendor { get; set; }
+        VendorId  = vendorId;
+        ProductId = id;
+        Product   = product;
+        AddedWhen = ModifiedWhen = DateTime.UtcNow;
     }
+
+    /// <summary>Database ID</summary>
+    [Key]
+    public int Id { get; set; }
+    /// <summary>Product ID</summary>
+    public ushort ProductId { get; set; }
+    /// <summary>Product name</summary>
+    public string Product { get; set; }
+    /// <summary>Date when model has been added to the database</summary>
+    public DateTime AddedWhen { get; set; }
+    /// <summary>Date when model was last modified</summary>
+    public DateTime ModifiedWhen { get; set; }
+    /// <summary>USB vendor ID</summary>
+    public ushort VendorId { get; set; }
+    /// <summary>Database link to USB vendor</summary>
+    public virtual UsbVendor Vendor { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/UsbVendor.cs b/Aaru.Database/Models/UsbVendor.cs
index 0246428f7..253826ee1 100644
--- a/Aaru.Database/Models/UsbVendor.cs
+++ b/Aaru.Database/Models/UsbVendor.cs
@@ -34,35 +34,34 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
-namespace Aaru.Database.Models
+namespace Aaru.Database.Models;
+
+/// <summary>USB vendor</summary>
+public class UsbVendor
 {
-    /// <summary>USB vendor</summary>
-    public class UsbVendor
+    /// <summary>Builds an empty USB vendor</summary>
+    public UsbVendor() {}
+
+    /// <summary>Builds a USB vendor with the specified parameters</summary>
+    /// <param name="id">Vendor ID</param>
+    /// <param name="vendor">Vendor name</param>
+    public UsbVendor(ushort id, string vendor)
     {
-        /// <summary>Builds an empty USB vendor</summary>
-        public UsbVendor() {}
-
-        /// <summary>Builds a USB vendor with the specified parameters</summary>
-        /// <param name="id">Vendor ID</param>
-        /// <param name="vendor">Vendor name</param>
-        public UsbVendor(ushort id, string vendor)
-        {
-            Id        = id;
-            Vendor    = vendor;
-            AddedWhen = ModifiedWhen = DateTime.UtcNow;
-        }
-
-        /// <summary>Database ID</summary>
-        [Key]
-        public ushort Id { get; set; }
-        /// <summary>Vendor name</summary>
-        public string Vendor { get; set; }
-        /// <summary>Date when model has been added to the database</summary>
-        public DateTime AddedWhen { get; set; }
-        /// <summary>Date when model was last modified</summary>
-        public DateTime ModifiedWhen { get; set; }
-
-        /// <summary>List of products from this vendor</summary>
-        public virtual ICollection<UsbProduct> Products { get; set; }
+        Id        = id;
+        Vendor    = vendor;
+        AddedWhen = ModifiedWhen = DateTime.UtcNow;
     }
+
+    /// <summary>Database ID</summary>
+    [Key]
+    public ushort Id { get; set; }
+    /// <summary>Vendor name</summary>
+    public string Vendor { get; set; }
+    /// <summary>Date when model has been added to the database</summary>
+    public DateTime AddedWhen { get; set; }
+    /// <summary>Date when model was last modified</summary>
+    public DateTime ModifiedWhen { get; set; }
+
+    /// <summary>List of products from this vendor</summary>
+    public virtual ICollection<UsbProduct> Products { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Database/Models/Version.cs b/Aaru.Database/Models/Version.cs
index 118263d3e..09f070fca 100644
--- a/Aaru.Database/Models/Version.cs
+++ b/Aaru.Database/Models/Version.cs
@@ -30,9 +30,8 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Database.Models
-{
-    /// <inheritdoc />
-    /// <summary>Aaru version</summary>
-    public class Version : NameCountModel {}
-}
\ No newline at end of file
+namespace Aaru.Database.Models;
+
+/// <inheritdoc />
+/// <summary>Aaru version</summary>
+public class Version : NameCountModel {}
\ No newline at end of file
diff --git a/Aaru.Devices/Command.cs b/Aaru.Devices/Command.cs
index 84819dd07..b3e349e7e 100644
--- a/Aaru.Devices/Command.cs
+++ b/Aaru.Devices/Command.cs
@@ -39,407 +39,406 @@ using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 
 // ReSharper disable UnusedMember.Global
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+internal static class Command
 {
-    internal static class Command
+    /// <summary>Sends a SCSI command</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="cdb">SCSI CDB</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="senseBuffer">Buffer with the SCSI sense</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="direction">SCSI command transfer direction</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense">
+    ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
+    ///     sense
+    /// </param>
+    /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
+    internal static int SendScsiCommand(object fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer,
+                                        uint timeout, ScsiDirection direction, out double duration, out bool sense)
     {
-        /// <summary>Sends a SCSI command</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="cdb">SCSI CDB</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="senseBuffer">Buffer with the SCSI sense</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="direction">SCSI command transfer direction</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense">
-        ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
-        ///     sense
-        /// </param>
-        /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendScsiCommand(object fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer,
-                                            uint timeout, ScsiDirection direction, out double duration, out bool sense)
-        {
-            PlatformID ptId = DetectOS.GetRealPlatformID();
+        PlatformID ptId = DetectOS.GetRealPlatformID();
 
-            return SendScsiCommand(ptId, fd, cdb, ref buffer, out senseBuffer, timeout, direction, out duration,
-                                   out sense);
-        }
+        return SendScsiCommand(ptId, fd, cdb, ref buffer, out senseBuffer, timeout, direction, out duration,
+                               out sense);
+    }
 
-        /// <summary>Sends a SCSI command</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="ptId">Platform ID for executing the command</param>
-        /// <param name="fd">File handle</param>
-        /// <param name="cdb">SCSI CDB</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="senseBuffer">Buffer with the SCSI sense</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="direction">SCSI command transfer direction</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense">
-        ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
-        ///     sense
-        /// </param>
-        /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendScsiCommand(PlatformID ptId, object fd, byte[] cdb, ref byte[] buffer,
-                                            out byte[] senseBuffer, uint timeout, ScsiDirection direction,
-                                            out double duration, out bool sense)
+    /// <summary>Sends a SCSI command</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="ptId">Platform ID for executing the command</param>
+    /// <param name="fd">File handle</param>
+    /// <param name="cdb">SCSI CDB</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="senseBuffer">Buffer with the SCSI sense</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="direction">SCSI command transfer direction</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense">
+    ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
+    ///     sense
+    /// </param>
+    /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
+    internal static int SendScsiCommand(PlatformID ptId, object fd, byte[] cdb, ref byte[] buffer,
+                                        out byte[] senseBuffer, uint timeout, ScsiDirection direction,
+                                        out double duration, out bool sense)
+    {
+        switch(ptId)
         {
-            switch(ptId)
+            case PlatformID.Win32NT:
             {
-                case PlatformID.Win32NT:
+                ScsiIoctlDirection dir;
+
+                switch(direction)
                 {
-                    ScsiIoctlDirection dir;
+                    case ScsiDirection.In:
+                        dir = ScsiIoctlDirection.In;
 
-                    switch(direction)
-                    {
-                        case ScsiDirection.In:
-                            dir = ScsiIoctlDirection.In;
+                        break;
+                    case ScsiDirection.Out:
+                        dir = ScsiIoctlDirection.Out;
 
-                            break;
-                        case ScsiDirection.Out:
-                            dir = ScsiIoctlDirection.Out;
+                        break;
+                    default:
+                        dir = ScsiIoctlDirection.Unspecified;
 
-                            break;
-                        default:
-                            dir = ScsiIoctlDirection.Unspecified;
-
-                            break;
-                    }
-
-                    return Windows.Command.SendScsiCommand((SafeFileHandle)fd, cdb, ref buffer, out senseBuffer,
-                                                           timeout, dir, out duration, out sense);
+                        break;
                 }
-                case PlatformID.Linux:
+
+                return Windows.Command.SendScsiCommand((SafeFileHandle)fd, cdb, ref buffer, out senseBuffer,
+                                                       timeout, dir, out duration, out sense);
+            }
+            case PlatformID.Linux:
+            {
+                Linux.ScsiIoctlDirection dir;
+
+                switch(direction)
                 {
-                    Linux.ScsiIoctlDirection dir;
+                    case ScsiDirection.In:
+                        dir = Linux.ScsiIoctlDirection.In;
 
-                    switch(direction)
-                    {
-                        case ScsiDirection.In:
-                            dir = Linux.ScsiIoctlDirection.In;
+                        break;
+                    case ScsiDirection.Out:
+                        dir = Linux.ScsiIoctlDirection.Out;
 
-                            break;
-                        case ScsiDirection.Out:
-                            dir = Linux.ScsiIoctlDirection.Out;
+                        break;
+                    case ScsiDirection.Bidirectional:
+                        dir = Linux.ScsiIoctlDirection.Unspecified;
 
-                            break;
-                        case ScsiDirection.Bidirectional:
-                            dir = Linux.ScsiIoctlDirection.Unspecified;
+                        break;
+                    case ScsiDirection.None:
+                        dir = Linux.ScsiIoctlDirection.None;
 
-                            break;
-                        case ScsiDirection.None:
-                            dir = Linux.ScsiIoctlDirection.None;
+                        break;
+                    default:
+                        dir = Linux.ScsiIoctlDirection.Unknown;
 
-                            break;
-                        default:
-                            dir = Linux.ScsiIoctlDirection.Unknown;
-
-                            break;
-                    }
-
-                    return Linux.Command.SendScsiCommand((int)fd, cdb, ref buffer, out senseBuffer, timeout, dir,
-                                                         out duration, out sense);
+                        break;
                 }
-                default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
+
+                return Linux.Command.SendScsiCommand((int)fd, cdb, ref buffer, out senseBuffer, timeout, dir,
+                                                     out duration, out sense);
             }
+            default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
         }
+    }
 
-        /// <summary>Sends an ATA command in CHS format</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
-        /// <param name="registers">Registers to send to the device</param>
-        /// <param name="errorRegisters">Registers returned by the device</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        /// <param name="transferRegister">What register contains the transfer length</param>
-        /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
-        /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendAtaCommand(object fd, AtaRegistersChs registers,
-                                           out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
-                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
-                                           bool transferBlocks, out double duration, out bool sense)
+    /// <summary>Sends an ATA command in CHS format</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
+    /// <param name="registers">Registers to send to the device</param>
+    /// <param name="errorRegisters">Registers returned by the device</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    /// <param name="transferRegister">What register contains the transfer length</param>
+    /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
+    /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
+    internal static int SendAtaCommand(object fd, AtaRegistersChs registers,
+                                       out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
+                                       AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                       bool transferBlocks, out double duration, out bool sense)
+    {
+        PlatformID ptId = DetectOS.GetRealPlatformID();
+
+        return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                              timeout, transferBlocks, out duration, out sense);
+    }
+
+    /// <summary>Sends an ATA command in CHS format</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="ptId">Platform ID for executing the command</param>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
+    /// <param name="registers">Registers to send to the device</param>
+    /// <param name="errorRegisters">Registers returned by the device</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    /// <param name="transferRegister">What register contains the transfer length</param>
+    /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
+    /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
+    internal static int SendAtaCommand(PlatformID ptId, object fd, AtaRegistersChs registers,
+                                       out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
+                                       AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                       bool transferBlocks, out double duration, out bool sense)
+    {
+        switch(ptId)
         {
-            PlatformID ptId = DetectOS.GetRealPlatformID();
-
-            return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister, ref buffer,
-                                  timeout, transferBlocks, out duration, out sense);
-        }
-
-        /// <summary>Sends an ATA command in CHS format</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="ptId">Platform ID for executing the command</param>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
-        /// <param name="registers">Registers to send to the device</param>
-        /// <param name="errorRegisters">Registers returned by the device</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        /// <param name="transferRegister">What register contains the transfer length</param>
-        /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
-        /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendAtaCommand(PlatformID ptId, object fd, AtaRegistersChs registers,
-                                           out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
-                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
-                                           bool transferBlocks, out double duration, out bool sense)
-        {
-            switch(ptId)
+            case PlatformID.Win32NT:
             {
-                case PlatformID.Win32NT:
-                {
-                    if((Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
-                        (Environment.OSVersion.ServicePack == "Service Pack 1" ||
-                         Environment.OSVersion.ServicePack == "")) ||
-                       (Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0))
-                        throw new InvalidOperationException("Windows XP or earlier is not supported.");
+                if((Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
+                    (Environment.OSVersion.ServicePack == "Service Pack 1" ||
+                     Environment.OSVersion.ServicePack == "")) ||
+                   (Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0))
+                    throw new InvalidOperationException("Windows XP or earlier is not supported.");
 
-                    // Windows NT 4 or earlier, requires special ATA pass thru SCSI. But Aaru cannot run there (or can it?)
-                    if(Environment.OSVersion.Version.Major <= 4)
-                        throw new InvalidOperationException("Windows NT 4.0 or earlier is not supported.");
+                // Windows NT 4 or earlier, requires special ATA pass thru SCSI. But Aaru cannot run there (or can it?)
+                if(Environment.OSVersion.Version.Major <= 4)
+                    throw new InvalidOperationException("Windows NT 4.0 or earlier is not supported.");
 
-                    return Windows.Command.SendAtaCommand((SafeFileHandle)fd, registers, out errorRegisters, protocol,
-                                                          ref buffer, timeout, out duration, out sense);
-                }
-                case PlatformID.Linux:
-                {
-                    return Linux.Command.SendAtaCommand((int)fd, registers, out errorRegisters, protocol,
-                                                        transferRegister, ref buffer, timeout, transferBlocks,
-                                                        out duration, out sense);
-                }
-                default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
+                return Windows.Command.SendAtaCommand((SafeFileHandle)fd, registers, out errorRegisters, protocol,
+                                                      ref buffer, timeout, out duration, out sense);
             }
-        }
-
-        /// <summary>Sends an ATA command in CHS format</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
-        /// <param name="registers">Registers to send to the device</param>
-        /// <param name="errorRegisters">Registers returned by the device</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        /// <param name="transferRegister">What register contains the transfer length</param>
-        /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
-        /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendAtaCommand(object fd, AtaRegistersLba28 registers,
-                                           out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
-                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
-                                           bool transferBlocks, out double duration, out bool sense)
-        {
-            PlatformID ptId = DetectOS.GetRealPlatformID();
-
-            return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister, ref buffer,
-                                  timeout, transferBlocks, out duration, out sense);
-        }
-
-        /// <summary>Sends an ATA command in 28-bit LBA format</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="ptId">Platform ID for executing the command</param>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
-        /// <param name="registers">Registers to send to the device</param>
-        /// <param name="errorRegisters">Registers returned by the device</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        /// <param name="transferRegister">What register contains the transfer length</param>
-        /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
-        /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendAtaCommand(PlatformID ptId, object fd, AtaRegistersLba28 registers,
-                                           out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
-                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
-                                           bool transferBlocks, out double duration, out bool sense)
-        {
-            switch(ptId)
+            case PlatformID.Linux:
             {
-                case PlatformID.Win32NT:
-                {
-                    if((Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
-                        (Environment.OSVersion.ServicePack == "Service Pack 1" ||
-                         Environment.OSVersion.ServicePack == "")) ||
-                       (Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0))
-                        throw new InvalidOperationException("Windows XP or earlier is not supported.");
-
-                    // Windows NT 4 or earlier, requires special ATA pass thru SCSI. But Aaru cannot run there (or can it?)
-                    if(Environment.OSVersion.Version.Major <= 4)
-                        throw new InvalidOperationException("Windows NT 4.0 or earlier is not supported.");
-
-                    return Windows.Command.SendAtaCommand((SafeFileHandle)fd, registers, out errorRegisters, protocol,
-                                                          ref buffer, timeout, out duration, out sense);
-                }
-                case PlatformID.Linux:
-                {
-                    return Linux.Command.SendAtaCommand((int)fd, registers, out errorRegisters, protocol,
-                                                        transferRegister, ref buffer, timeout, transferBlocks,
-                                                        out duration, out sense);
-                }
-                default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
+                return Linux.Command.SendAtaCommand((int)fd, registers, out errorRegisters, protocol,
+                                                    transferRegister, ref buffer, timeout, transferBlocks,
+                                                    out duration, out sense);
             }
+            default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
         }
+    }
 
-        /// <summary>Sends an ATA command in 48-bit LBA format</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
-        /// <param name="registers">Registers to send to the device</param>
-        /// <param name="errorRegisters">Registers returned by the device</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        /// <param name="transferRegister">What register contains the transfer length</param>
-        /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
-        /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendAtaCommand(object fd, AtaRegistersLba48 registers,
-                                           out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
-                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
-                                           bool transferBlocks, out double duration, out bool sense)
+    /// <summary>Sends an ATA command in CHS format</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
+    /// <param name="registers">Registers to send to the device</param>
+    /// <param name="errorRegisters">Registers returned by the device</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    /// <param name="transferRegister">What register contains the transfer length</param>
+    /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
+    /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
+    internal static int SendAtaCommand(object fd, AtaRegistersLba28 registers,
+                                       out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
+                                       AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                       bool transferBlocks, out double duration, out bool sense)
+    {
+        PlatformID ptId = DetectOS.GetRealPlatformID();
+
+        return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                              timeout, transferBlocks, out duration, out sense);
+    }
+
+    /// <summary>Sends an ATA command in 28-bit LBA format</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="ptId">Platform ID for executing the command</param>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
+    /// <param name="registers">Registers to send to the device</param>
+    /// <param name="errorRegisters">Registers returned by the device</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    /// <param name="transferRegister">What register contains the transfer length</param>
+    /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
+    /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
+    internal static int SendAtaCommand(PlatformID ptId, object fd, AtaRegistersLba28 registers,
+                                       out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
+                                       AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                       bool transferBlocks, out double duration, out bool sense)
+    {
+        switch(ptId)
         {
-            PlatformID ptId = DetectOS.GetRealPlatformID();
-
-            return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister, ref buffer,
-                                  timeout, transferBlocks, out duration, out sense);
-        }
-
-        /// <summary>Sends an ATA command in 48-bit format</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="ptId">Platform ID for executing the command</param>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
-        /// <param name="registers">Registers to send to the device</param>
-        /// <param name="errorRegisters">Registers returned by the device</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        /// <param name="transferRegister">What register contains the transfer length</param>
-        /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
-        /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendAtaCommand(PlatformID ptId, object fd, AtaRegistersLba48 registers,
-                                           out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
-                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
-                                           bool transferBlocks, out double duration, out bool sense)
-        {
-            switch(ptId)
+            case PlatformID.Win32NT:
             {
-                case PlatformID.Win32NT:
-                    // No check for Windows version. A 48-bit ATA disk simply does not work on earlier systems
-                    return Windows.Command.SendAtaCommand((SafeFileHandle)fd, registers, out errorRegisters, protocol,
-                                                          ref buffer, timeout, out duration, out sense);
-                case PlatformID.Linux:
-                    return Linux.Command.SendAtaCommand((int)fd, registers, out errorRegisters, protocol,
-                                                        transferRegister, ref buffer, timeout, transferBlocks,
-                                                        out duration, out sense);
-                default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
+                if((Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 1 &&
+                    (Environment.OSVersion.ServicePack == "Service Pack 1" ||
+                     Environment.OSVersion.ServicePack == "")) ||
+                   (Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor == 0))
+                    throw new InvalidOperationException("Windows XP or earlier is not supported.");
+
+                // Windows NT 4 or earlier, requires special ATA pass thru SCSI. But Aaru cannot run there (or can it?)
+                if(Environment.OSVersion.Version.Major <= 4)
+                    throw new InvalidOperationException("Windows NT 4.0 or earlier is not supported.");
+
+                return Windows.Command.SendAtaCommand((SafeFileHandle)fd, registers, out errorRegisters, protocol,
+                                                      ref buffer, timeout, out duration, out sense);
             }
-        }
-
-        /// <summary>Sends a MMC/SD command</summary>
-        /// <returns>The result of the command.</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="command">MMC/SD opcode</param>
-        /// <param name="buffer">Buffer for MMC/SD command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
-        /// <param name="write"><c>True</c> if data is sent from host to card</param>
-        /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
-        /// <param name="flags">Flags indicating kind and place of response</param>
-        /// <param name="blocks">How many blocks to transfer</param>
-        /// <param name="argument">Command argument</param>
-        /// <param name="response">Response registers</param>
-        /// <param name="blockSize">Size of block in bytes</param>
-        /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendMmcCommand(object fd, MmcCommands command, bool write, bool isApplication,
-                                           MmcFlags flags, uint argument, uint blockSize, uint blocks,
-                                           ref byte[] buffer, out uint[] response, out double duration, out bool sense,
-                                           uint timeout = 0)
-        {
-            PlatformID ptId = DetectOS.GetRealPlatformID();
-
-            return SendMmcCommand(ptId, (int)fd, command, write, isApplication, flags, argument, blockSize, blocks,
-                                  ref buffer, out response, out duration, out sense, timeout);
-        }
-
-        /// <summary>Sends a MMC/SD command</summary>
-        /// <returns>The result of the command.</returns>
-        /// <param name="ptId">Platform ID for executing the command</param>
-        /// <param name="fd">File handle</param>
-        /// <param name="command">MMC/SD opcode</param>
-        /// <param name="buffer">Buffer for MMC/SD command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
-        /// <param name="write"><c>True</c> if data is sent from host to card</param>
-        /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
-        /// <param name="flags">Flags indicating kind and place of response</param>
-        /// <param name="blocks">How many blocks to transfer</param>
-        /// <param name="argument">Command argument</param>
-        /// <param name="response">Response registers</param>
-        /// <param name="blockSize">Size of block in bytes</param>
-        /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
-        internal static int SendMmcCommand(PlatformID ptId, object fd, MmcCommands command, bool write,
-                                           bool isApplication, MmcFlags flags, uint argument, uint blockSize,
-                                           uint blocks, ref byte[] buffer, out uint[] response, out double duration,
-                                           out bool sense, uint timeout = 0)
-        {
-            switch(ptId)
+            case PlatformID.Linux:
             {
-                case PlatformID.Win32NT:
-                    return Windows.Command.SendMmcCommand((SafeFileHandle)fd, command, write, isApplication, flags,
-                                                          argument, blockSize, blocks, ref buffer, out response,
-                                                          out duration, out sense, timeout);
-                case PlatformID.Linux:
-                    return Linux.Command.SendMmcCommand((int)fd, command, write, isApplication, flags, argument,
-                                                        blockSize, blocks, ref buffer, out response, out duration,
-                                                        out sense, timeout);
-                default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
+                return Linux.Command.SendAtaCommand((int)fd, registers, out errorRegisters, protocol,
+                                                    transferRegister, ref buffer, timeout, transferBlocks,
+                                                    out duration, out sense);
             }
+            default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
         }
+    }
 
-        internal static int SendMultipleMmcCommands(PlatformID ptId, object fd, Device.MmcSingleCommand[] commands,
-                                                    out double duration, out bool sense, uint timeout = 0)
+    /// <summary>Sends an ATA command in 48-bit LBA format</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
+    /// <param name="registers">Registers to send to the device</param>
+    /// <param name="errorRegisters">Registers returned by the device</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    /// <param name="transferRegister">What register contains the transfer length</param>
+    /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
+    /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
+    internal static int SendAtaCommand(object fd, AtaRegistersLba48 registers,
+                                       out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
+                                       AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                       bool transferBlocks, out double duration, out bool sense)
+    {
+        PlatformID ptId = DetectOS.GetRealPlatformID();
+
+        return SendAtaCommand(ptId, fd, registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                              timeout, transferBlocks, out duration, out sense);
+    }
+
+    /// <summary>Sends an ATA command in 48-bit format</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="ptId">Platform ID for executing the command</param>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA returned non-OK status</param>
+    /// <param name="registers">Registers to send to the device</param>
+    /// <param name="errorRegisters">Registers returned by the device</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    /// <param name="transferRegister">What register contains the transfer length</param>
+    /// <param name="transferBlocks">Set to <c>true</c> if the transfer length is in block, otherwise it is in bytes</param>
+    /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
+    internal static int SendAtaCommand(PlatformID ptId, object fd, AtaRegistersLba48 registers,
+                                       out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
+                                       AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                       bool transferBlocks, out double duration, out bool sense)
+    {
+        switch(ptId)
         {
-            switch(ptId)
-            {
-                case PlatformID.Win32NT:
-                    return Windows.Command.SendMultipleMmcCommands((SafeFileHandle)fd, commands, out duration,
-                                                                   out sense, timeout);
-                case PlatformID.Linux:
-                    return Linux.Command.SendMultipleMmcCommands((int)fd, commands, out duration, out sense, timeout);
-                default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
-            }
+            case PlatformID.Win32NT:
+                // No check for Windows version. A 48-bit ATA disk simply does not work on earlier systems
+                return Windows.Command.SendAtaCommand((SafeFileHandle)fd, registers, out errorRegisters, protocol,
+                                                      ref buffer, timeout, out duration, out sense);
+            case PlatformID.Linux:
+                return Linux.Command.SendAtaCommand((int)fd, registers, out errorRegisters, protocol,
+                                                    transferRegister, ref buffer, timeout, transferBlocks,
+                                                    out duration, out sense);
+            default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
         }
+    }
 
-        internal static int ReOpen(PlatformID ptId, string devicePath, object fd, out object newFd)
+    /// <summary>Sends a MMC/SD command</summary>
+    /// <returns>The result of the command.</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="command">MMC/SD opcode</param>
+    /// <param name="buffer">Buffer for MMC/SD command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
+    /// <param name="write"><c>True</c> if data is sent from host to card</param>
+    /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
+    /// <param name="flags">Flags indicating kind and place of response</param>
+    /// <param name="blocks">How many blocks to transfer</param>
+    /// <param name="argument">Command argument</param>
+    /// <param name="response">Response registers</param>
+    /// <param name="blockSize">Size of block in bytes</param>
+    /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
+    internal static int SendMmcCommand(object fd, MmcCommands command, bool write, bool isApplication,
+                                       MmcFlags flags, uint argument, uint blockSize, uint blocks,
+                                       ref byte[] buffer, out uint[] response, out double duration, out bool sense,
+                                       uint timeout = 0)
+    {
+        PlatformID ptId = DetectOS.GetRealPlatformID();
+
+        return SendMmcCommand(ptId, (int)fd, command, write, isApplication, flags, argument, blockSize, blocks,
+                              ref buffer, out response, out duration, out sense, timeout);
+    }
+
+    /// <summary>Sends a MMC/SD command</summary>
+    /// <returns>The result of the command.</returns>
+    /// <param name="ptId">Platform ID for executing the command</param>
+    /// <param name="fd">File handle</param>
+    /// <param name="command">MMC/SD opcode</param>
+    /// <param name="buffer">Buffer for MMC/SD command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
+    /// <param name="write"><c>True</c> if data is sent from host to card</param>
+    /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
+    /// <param name="flags">Flags indicating kind and place of response</param>
+    /// <param name="blocks">How many blocks to transfer</param>
+    /// <param name="argument">Command argument</param>
+    /// <param name="response">Response registers</param>
+    /// <param name="blockSize">Size of block in bytes</param>
+    /// <exception cref="InvalidOperationException">If the specified platform is not supported</exception>
+    internal static int SendMmcCommand(PlatformID ptId, object fd, MmcCommands command, bool write,
+                                       bool isApplication, MmcFlags flags, uint argument, uint blockSize,
+                                       uint blocks, ref byte[] buffer, out uint[] response, out double duration,
+                                       out bool sense, uint timeout = 0)
+    {
+        switch(ptId)
         {
-            switch(ptId)
-            {
-                case PlatformID.Win32NT: return Windows.Command.ReOpen(devicePath, (SafeFileHandle)fd, out newFd);
-                case PlatformID.Linux:   return Linux.Command.ReOpen(devicePath, (int)fd, out newFd);
-                default:                 throw new InvalidOperationException($"Platform {ptId} not yet supported.");
-            }
+            case PlatformID.Win32NT:
+                return Windows.Command.SendMmcCommand((SafeFileHandle)fd, command, write, isApplication, flags,
+                                                      argument, blockSize, blocks, ref buffer, out response,
+                                                      out duration, out sense, timeout);
+            case PlatformID.Linux:
+                return Linux.Command.SendMmcCommand((int)fd, command, write, isApplication, flags, argument,
+                                                    blockSize, blocks, ref buffer, out response, out duration,
+                                                    out sense, timeout);
+            default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
         }
+    }
 
-        internal static int BufferedOsRead(PlatformID ptId, object fd, out byte[] buffer, long offset, uint length,
-                                           out double duration)
+    internal static int SendMultipleMmcCommands(PlatformID ptId, object fd, Device.MmcSingleCommand[] commands,
+                                                out double duration, out bool sense, uint timeout = 0)
+    {
+        switch(ptId)
         {
-            switch(ptId)
-            {
-                case PlatformID.Win32NT:
-                    return Windows.Command.BufferedOsRead((SafeFileHandle)fd, out buffer, offset, length, out duration);
-                case PlatformID.Linux:
-                    return Linux.Command.BufferedOsRead((int)fd, out buffer, offset, length, out duration);
-                default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
-            }
+            case PlatformID.Win32NT:
+                return Windows.Command.SendMultipleMmcCommands((SafeFileHandle)fd, commands, out duration,
+                                                               out sense, timeout);
+            case PlatformID.Linux:
+                return Linux.Command.SendMultipleMmcCommands((int)fd, commands, out duration, out sense, timeout);
+            default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
+        }
+    }
+
+    internal static int ReOpen(PlatformID ptId, string devicePath, object fd, out object newFd)
+    {
+        switch(ptId)
+        {
+            case PlatformID.Win32NT: return Windows.Command.ReOpen(devicePath, (SafeFileHandle)fd, out newFd);
+            case PlatformID.Linux:   return Linux.Command.ReOpen(devicePath, (int)fd, out newFd);
+            default:                 throw new InvalidOperationException($"Platform {ptId} not yet supported.");
+        }
+    }
+
+    internal static int BufferedOsRead(PlatformID ptId, object fd, out byte[] buffer, long offset, uint length,
+                                       out double duration)
+    {
+        switch(ptId)
+        {
+            case PlatformID.Win32NT:
+                return Windows.Command.BufferedOsRead((SafeFileHandle)fd, out buffer, offset, length, out duration);
+            case PlatformID.Linux:
+                return Linux.Command.BufferedOsRead((int)fd, out buffer, offset, length, out duration);
+            default: throw new InvalidOperationException($"Platform {ptId} not yet supported.");
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/AtaCommands/Ata28.cs b/Aaru.Devices/Device/AtaCommands/Ata28.cs
index e83504df1..4f1ac5261 100644
--- a/Aaru.Devices/Device/AtaCommands/Ata28.cs
+++ b/Aaru.Devices/Device/AtaCommands/Ata28.cs
@@ -34,317 +34,316 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Reads the drive buffer using PIO transfer</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadBuffer(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint timeout,
+                           out double duration)
     {
-        /// <summary>Reads the drive buffer using PIO transfer</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadBuffer(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint timeout,
-                               out double duration)
+        buffer = new byte[512];
+
+        var registers = new AtaRegistersLba28
         {
-            buffer = new byte[512];
+            Command = (byte)AtaCommands.ReadBuffer
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.ReadBuffer
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "READ BUFFER took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "READ BUFFER took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
+    /// <summary>Reads the drive buffer using DMA transfer</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadBufferDma(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint timeout,
+                              out double duration)
+    {
+        buffer = new byte[512];
+
+        var registers = new AtaRegistersLba28
+        {
+            Command = (byte)AtaCommands.ReadBufferDma
+        };
+
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.NoTransfer,
+                                   ref buffer, timeout, false, out duration, out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("ATA Device", "READ BUFFER DMA took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads sectors using 28-bit addressing and DMA transfer, retrying on error</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="lba">LBA of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadDma(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
+                        uint timeout, out double duration) =>
+        ReadDma(out buffer, out statusRegisters, true, lba, count, timeout, out duration);
+
+    /// <summary>Reads sectors using 48-bit addressing and DMA transfer</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="retry">Retry on error</param>
+    /// <param name="lba">LBA of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadDma(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool retry, uint lba,
+                        byte count, uint timeout, out double duration)
+    {
+        buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
+
+        var registers = new AtaRegistersLba28
+        {
+            SectorCount = count,
+            DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
+            LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
+            LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
+            LbaLow      = (byte)((lba & 0xFF)      / 0x1),
+            Command     = retry ? (byte)AtaCommands.ReadDmaRetry : (byte)AtaCommands.ReadDma
+        };
+
+        registers.DeviceHead += 0x40;
+
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
+                                   ref buffer, timeout, true, out duration, out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("ATA Device", "READ DMA took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>
+    ///     Reads sectors using 28-bit addressing and PIO transfer, sending an interrupt only after all the sectors have
+    ///     been transferred
+    /// </summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="lba">LBA of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
+                             uint timeout, out double duration)
+    {
+        buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
+
+        var registers = new AtaRegistersLba28
+        {
+            Command     = (byte)AtaCommands.ReadMultiple,
+            SectorCount = count,
+            DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
+            LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
+            LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
+            LbaLow      = (byte)((lba & 0xFF)      / 0x1)
+        };
+
+        registers.DeviceHead += 0x40;
+
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
+                                   out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("ATA Device", "READ MULTIPLE took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads native max address using 28-bit addressing</summary>
+    /// <param name="lba">Maximum addressable block</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadNativeMaxAddress(out uint lba, out AtaErrorRegistersLba28 statusRegisters, uint timeout,
+                                     out double duration)
+    {
+        lba = 0;
+        byte[] buffer = Array.Empty<byte>();
+
+        var registers = new AtaRegistersLba28
+        {
+            Command = (byte)AtaCommands.ReadNativeMaxAddress
+        };
+
+        registers.DeviceHead += 0x40;
+
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
+
+        Error = LastError != 0;
+
+        if((statusRegisters.Status & 0x23) == 0)
+        {
+            lba += (uint)(statusRegisters.DeviceHead & 0xF);
+            lba *= 0x1000000;
+            lba += (uint)(statusRegisters.LbaHigh << 16);
+            lba += (uint)(statusRegisters.LbaMid  << 8);
+            lba += statusRegisters.LbaLow;
         }
 
-        /// <summary>Reads the drive buffer using DMA transfer</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadBufferDma(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint timeout,
-                                  out double duration)
+        AaruConsole.DebugWriteLine("ATA Device", "READ NATIVE MAX ADDRESS took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads sectors using 28-bit addressing and PIO transfer, retrying on error</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="lba">LBA of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool Read(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
+                     uint timeout, out double duration) =>
+        Read(out buffer, out statusRegisters, true, lba, count, timeout, out duration);
+
+    /// <summary>Reads sectors using 28-bit addressing and PIO transfer, retrying on error</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="retry">Retry on error</param>
+    /// <param name="lba">LBA of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool Read(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool retry, uint lba,
+                     byte count, uint timeout, out double duration)
+    {
+        buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
+
+        var registers = new AtaRegistersLba28
         {
-            buffer = new byte[512];
+            SectorCount = count,
+            DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
+            LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
+            LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
+            LbaLow      = (byte)((lba & 0xFF)      / 0x1),
+            Command     = retry ? (byte)AtaCommands.ReadRetry : (byte)AtaCommands.Read
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.ReadBufferDma
-            };
+        registers.DeviceHead += 0x40;
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.NoTransfer,
-                                       ref buffer, timeout, false, out duration, out bool sense);
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("ATA Device", "READ BUFFER DMA took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("ATA Device", "READ SECTORS took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
+    }
 
-        /// <summary>Reads sectors using 28-bit addressing and DMA transfer, retrying on error</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="lba">LBA of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
-                            uint timeout, out double duration) =>
-            ReadDma(out buffer, out statusRegisters, true, lba, count, timeout, out duration);
-
-        /// <summary>Reads sectors using 48-bit addressing and DMA transfer</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="retry">Retry on error</param>
-        /// <param name="lba">LBA of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool retry, uint lba,
-                            byte count, uint timeout, out double duration)
-        {
-            buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
-
-            var registers = new AtaRegistersLba28
-            {
-                SectorCount = count,
-                DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow      = (byte)((lba & 0xFF)      / 0x1),
-                Command     = retry ? (byte)AtaCommands.ReadDmaRetry : (byte)AtaCommands.ReadDma
-            };
-
-            registers.DeviceHead += 0x40;
-
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
-                                       ref buffer, timeout, true, out duration, out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("ATA Device", "READ DMA took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>
-        ///     Reads sectors using 28-bit addressing and PIO transfer, sending an interrupt only after all the sectors have
-        ///     been transferred
-        /// </summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="lba">LBA of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
-                                 uint timeout, out double duration)
-        {
-            buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
-
-            var registers = new AtaRegistersLba28
-            {
-                Command     = (byte)AtaCommands.ReadMultiple,
-                SectorCount = count,
-                DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow      = (byte)((lba & 0xFF)      / 0x1)
-            };
-
-            registers.DeviceHead += 0x40;
-
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
-                                       out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("ATA Device", "READ MULTIPLE took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads native max address using 28-bit addressing</summary>
-        /// <param name="lba">Maximum addressable block</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadNativeMaxAddress(out uint lba, out AtaErrorRegistersLba28 statusRegisters, uint timeout,
-                                         out double duration)
-        {
-            lba = 0;
-            byte[] buffer = Array.Empty<byte>();
-
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.ReadNativeMaxAddress
-            };
-
-            registers.DeviceHead += 0x40;
-
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
-
-            Error = LastError != 0;
-
-            if((statusRegisters.Status & 0x23) == 0)
-            {
-                lba += (uint)(statusRegisters.DeviceHead & 0xF);
-                lba *= 0x1000000;
-                lba += (uint)(statusRegisters.LbaHigh << 16);
-                lba += (uint)(statusRegisters.LbaMid  << 8);
-                lba += statusRegisters.LbaLow;
-            }
-
-            AaruConsole.DebugWriteLine("ATA Device", "READ NATIVE MAX ADDRESS took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads sectors using 28-bit addressing and PIO transfer, retrying on error</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="lba">LBA of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool Read(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, byte count,
+    /// <summary>Reads a long sector using 28-bit addressing and PIO transfer, retrying on error</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="lba">LBA of read start</param>
+    /// <param name="blockSize">Size in bytes of the long sector</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadLong(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, uint blockSize,
                          uint timeout, out double duration) =>
-            Read(out buffer, out statusRegisters, true, lba, count, timeout, out duration);
+        ReadLong(out buffer, out statusRegisters, true, lba, blockSize, timeout, out duration);
 
-        /// <summary>Reads sectors using 28-bit addressing and PIO transfer, retrying on error</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="retry">Retry on error</param>
-        /// <param name="lba">LBA of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool Read(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool retry, uint lba,
-                         byte count, uint timeout, out double duration)
+    /// <summary>Reads a long sector using 28-bit addressing and PIO transfer, retrying on error</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="retry">Retry on error</param>
+    /// <param name="lba">LBA of read start</param>
+    /// <param name="blockSize">Size in bytes of the long sector</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadLong(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool retry, uint lba,
+                         uint blockSize, uint timeout, out double duration)
+    {
+        buffer = new byte[blockSize];
+
+        var registers = new AtaRegistersLba28
         {
-            buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
+            SectorCount = 1,
+            DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
+            LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
+            LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
+            LbaLow      = (byte)((lba & 0xFF)      / 0x1),
+            Command     = retry ? (byte)AtaCommands.ReadLongRetry : (byte)AtaCommands.ReadLong
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                SectorCount = count,
-                DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow      = (byte)((lba & 0xFF)      / 0x1),
-                Command     = retry ? (byte)AtaCommands.ReadRetry : (byte)AtaCommands.Read
-            };
+        registers.DeviceHead += 0x40;
 
-            registers.DeviceHead += 0x40;
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "READ LONG took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "READ SECTORS took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Sets the reading mechanism ready to read the specified block using 28-bit LBA addressing</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="lba">LBA to position reading mechanism ready to read</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool Seek(out AtaErrorRegistersLba28 statusRegisters, uint lba, uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Reads a long sector using 28-bit addressing and PIO transfer, retrying on error</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="lba">LBA of read start</param>
-        /// <param name="blockSize">Size in bytes of the long sector</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba, uint blockSize,
-                             uint timeout, out double duration) =>
-            ReadLong(out buffer, out statusRegisters, true, lba, blockSize, timeout, out duration);
-
-        /// <summary>Reads a long sector using 28-bit addressing and PIO transfer, retrying on error</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="retry">Retry on error</param>
-        /// <param name="lba">LBA of read start</param>
-        /// <param name="blockSize">Size in bytes of the long sector</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, bool retry, uint lba,
-                             uint blockSize, uint timeout, out double duration)
+        var registers = new AtaRegistersLba28
         {
-            buffer = new byte[blockSize];
+            Command    = (byte)AtaCommands.Seek,
+            DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
+            LbaHigh    = (byte)((lba & 0xFF0000)  / 0x10000),
+            LbaMid     = (byte)((lba & 0xFF00)    / 0x100),
+            LbaLow     = (byte)((lba & 0xFF)      / 0x1)
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                SectorCount = 1,
-                DeviceHead  = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh     = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid      = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow      = (byte)((lba & 0xFF)      / 0x1),
-                Command     = retry ? (byte)AtaCommands.ReadLongRetry : (byte)AtaCommands.ReadLong
-            };
+        registers.DeviceHead += 0x40;
 
-            registers.DeviceHead += 0x40;
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SEEK took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "READ LONG took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sets the reading mechanism ready to read the specified block using 28-bit LBA addressing</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="lba">LBA to position reading mechanism ready to read</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool Seek(out AtaErrorRegistersLba28 statusRegisters, uint lba, uint timeout, out double duration)
-        {
-            byte[] buffer = Array.Empty<byte>();
-
-            var registers = new AtaRegistersLba28
-            {
-                Command    = (byte)AtaCommands.Seek,
-                DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh    = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid     = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow     = (byte)((lba & 0xFF)      / 0x1)
-            };
-
-            registers.DeviceHead += 0x40;
-
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("ATA Device", "SEEK took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/AtaCommands/Ata48.cs b/Aaru.Devices/Device/AtaCommands/Ata48.cs
index 2c399d82d..8c6fdc2d1 100644
--- a/Aaru.Devices/Device/AtaCommands/Ata48.cs
+++ b/Aaru.Devices/Device/AtaCommands/Ata48.cs
@@ -34,274 +34,273 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Gets native max address using 48-bit addressing</summary>
+    /// <param name="lba">Maximum addressable block</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool GetNativeMaxAddressExt(out ulong lba, out AtaErrorRegistersLba48 statusRegisters, uint timeout,
+                                       out double duration)
     {
-        /// <summary>Gets native max address using 48-bit addressing</summary>
-        /// <param name="lba">Maximum addressable block</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool GetNativeMaxAddressExt(out ulong lba, out AtaErrorRegistersLba48 statusRegisters, uint timeout,
-                                           out double duration)
+        lba = 0;
+        byte[] buffer = Array.Empty<byte>();
+
+        var registers = new AtaRegistersLba48
         {
-            lba = 0;
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.NativeMaxAddress,
+            Feature = 0x0000
+        };
 
-            var registers = new AtaRegistersLba48
-            {
-                Command = (byte)AtaCommands.NativeMaxAddress,
-                Feature = 0x0000
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        if((statusRegisters.Status & 0x23) == 0)
+        {
+            lba = (ulong)((statusRegisters.LbaHighCurrent << 16) + (statusRegisters.LbaMidCurrent << 8) +
+                          statusRegisters.LbaLowCurrent);
 
-            if((statusRegisters.Status & 0x23) == 0)
-            {
-                lba = (ulong)((statusRegisters.LbaHighCurrent << 16) + (statusRegisters.LbaMidCurrent << 8) +
-                              statusRegisters.LbaLowCurrent);
+            lba <<= 24;
 
-                lba <<= 24;
-
-                lba += (ulong)((statusRegisters.LbaHighPrevious << 16) + (statusRegisters.LbaMidPrevious << 8) +
-                               statusRegisters.LbaLowPrevious);
-            }
-
-            AaruConsole.DebugWriteLine("ATA Device", "GET NATIVE MAX ADDRESS EXT took {0} ms.", duration);
-
-            return sense;
+            lba += (ulong)((statusRegisters.LbaHighPrevious << 16) + (statusRegisters.LbaMidPrevious << 8) +
+                           statusRegisters.LbaLowPrevious);
         }
 
-        /// <summary>Reads sectors using 48-bit addressing and DMA transfer</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="lba">LBA of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 65536 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
-                            uint timeout, out double duration)
+        AaruConsole.DebugWriteLine("ATA Device", "GET NATIVE MAX ADDRESS EXT took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads sectors using 48-bit addressing and DMA transfer</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="lba">LBA of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 65536 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadDma(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
+                        uint timeout, out double duration)
+    {
+        buffer = count == 0 ? new byte[512 * 65536] : new byte[512 * count];
+
+        var registers = new AtaRegistersLba48
         {
-            buffer = count == 0 ? new byte[512 * 65536] : new byte[512 * count];
+            Command         = (byte)AtaCommands.ReadDmaExt,
+            SectorCount     = count,
+            LbaHighPrevious = (byte)((lba & 0xFF0000000000) / 0x10000000000),
+            LbaMidPrevious  = (byte)((lba & 0xFF00000000)   / 0x100000000),
+            LbaLowPrevious  = (byte)((lba & 0xFF000000)     / 0x1000000),
+            LbaHighCurrent  = (byte)((lba & 0xFF0000)       / 0x10000),
+            LbaMidCurrent   = (byte)((lba & 0xFF00)         / 0x100),
+            LbaLowCurrent   = (byte)(lba & 0xFF)
+        };
 
-            var registers = new AtaRegistersLba48
-            {
-                Command         = (byte)AtaCommands.ReadDmaExt,
-                SectorCount     = count,
-                LbaHighPrevious = (byte)((lba & 0xFF0000000000) / 0x10000000000),
-                LbaMidPrevious  = (byte)((lba & 0xFF00000000)   / 0x100000000),
-                LbaLowPrevious  = (byte)((lba & 0xFF000000)     / 0x1000000),
-                LbaHighCurrent  = (byte)((lba & 0xFF0000)       / 0x10000),
-                LbaMidCurrent   = (byte)((lba & 0xFF00)         / 0x100),
-                LbaLowCurrent   = (byte)(lba & 0xFF)
-            };
+        registers.DeviceHead += 0x40;
 
-            registers.DeviceHead += 0x40;
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
+                                   ref buffer, timeout, true, out duration, out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
-                                       ref buffer, timeout, true, out duration, out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "READ DMA EXT took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "READ DMA EXT took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
+    /// <summary>Reads a drive log using PIO transfer</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="logAddress">Log address</param>
+    /// <param name="pageNumber">Log page number</param>
+    /// <param name="count">How log blocks to read</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadLog(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, byte logAddress,
+                        ushort pageNumber, ushort count, uint timeout, out double duration)
+    {
+        buffer = new byte[512 * count];
+
+        var registers = new AtaRegistersLba48
+        {
+            Command        = (byte)AtaCommands.ReadLogExt,
+            SectorCount    = count,
+            LbaMidCurrent  = (byte)(pageNumber & 0xFF),
+            LbaMidPrevious = (byte)((pageNumber & 0xFF00) / 0x100)
+        };
+
+        registers.LbaLowCurrent = logAddress;
+
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
+                                   out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("ATA Device", "READ LOG EXT took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads a drive log using DMA transfer</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="logAddress">Log address</param>
+    /// <param name="pageNumber">Log page number</param>
+    /// <param name="count">How log blocks to read</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadLogDma(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, byte logAddress,
+                           ushort pageNumber, ushort count, uint timeout, out double duration)
+    {
+        buffer = new byte[512 * count];
+
+        var registers = new AtaRegistersLba48
+        {
+            Command        = (byte)AtaCommands.ReadLogDmaExt,
+            SectorCount    = count,
+            LbaMidCurrent  = (byte)(pageNumber & 0xFF),
+            LbaMidPrevious = (byte)((pageNumber & 0xFF00) / 0x100)
+        };
+
+        registers.LbaLowCurrent = logAddress;
+
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
+                                   ref buffer, timeout, true, out duration, out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("ATA Device", "READ LOG DMA EXT took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>
+    ///     Reads sectors using 48-bit addressing and PIO transfer, sending an interrupt only after all the sectors have
+    ///     been transferred
+    /// </summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="lba">LBA of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
+                             uint timeout, out double duration)
+    {
+        buffer = count == 0 ? new byte[512 * 65536] : new byte[512 * count];
+
+        var registers = new AtaRegistersLba48
+        {
+            Command         = (byte)AtaCommands.ReadMultipleExt,
+            SectorCount     = count,
+            LbaHighPrevious = (byte)((lba & 0xFF0000000000) / 0x10000000000),
+            LbaMidPrevious  = (byte)((lba & 0xFF00000000)   / 0x100000000),
+            LbaLowPrevious  = (byte)((lba & 0xFF000000)     / 0x1000000),
+            LbaHighCurrent  = (byte)((lba & 0xFF0000)       / 0x10000),
+            LbaMidCurrent   = (byte)((lba & 0xFF00)         / 0x100),
+            LbaLowCurrent   = (byte)(lba & 0xFF)
+        };
+
+        registers.DeviceHead += 0x40;
+
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
+                                   out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("ATA Device", "READ MULTIPLE EXT took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads native max address using 48-bit addressing</summary>
+    /// <param name="lba">Maximum addressable block</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadNativeMaxAddress(out ulong lba, out AtaErrorRegistersLba48 statusRegisters, uint timeout,
+                                     out double duration)
+    {
+        lba = 0;
+        byte[] buffer = Array.Empty<byte>();
+
+        var registers = new AtaRegistersLba48
+        {
+            Command = (byte)AtaCommands.ReadNativeMaxAddressExt
+        };
+
+        registers.DeviceHead += 0x40;
+
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
+
+        Error = LastError != 0;
+
+        if((statusRegisters.Status & 0x23) == 0)
+        {
+            lba = (ulong)((statusRegisters.LbaHighCurrent << 16) + (statusRegisters.LbaMidCurrent << 8) +
+                          statusRegisters.LbaLowCurrent);
+
+            lba <<= 24;
+
+            lba += (ulong)((statusRegisters.LbaHighPrevious << 16) + (statusRegisters.LbaMidPrevious << 8) +
+                           statusRegisters.LbaLowPrevious);
         }
 
-        /// <summary>Reads a drive log using PIO transfer</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="logAddress">Log address</param>
-        /// <param name="pageNumber">Log page number</param>
-        /// <param name="count">How log blocks to read</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadLog(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, byte logAddress,
-                            ushort pageNumber, ushort count, uint timeout, out double duration)
+        AaruConsole.DebugWriteLine("ATA Device", "READ NATIVE MAX ADDRESS EXT took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads sectors using 48-bit addressing and PIO transfer</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="lba">LBA of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool Read(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
+                     uint timeout, out double duration)
+    {
+        buffer = count == 0 ? new byte[512 * 65536] : new byte[512 * count];
+
+        var registers = new AtaRegistersLba48
         {
-            buffer = new byte[512 * count];
+            Command         = (byte)AtaCommands.ReadExt,
+            SectorCount     = count,
+            LbaHighPrevious = (byte)((lba & 0xFF0000000000) / 0x10000000000),
+            LbaMidPrevious  = (byte)((lba & 0xFF00000000)   / 0x100000000),
+            LbaLowPrevious  = (byte)((lba & 0xFF000000)     / 0x1000000),
+            LbaHighCurrent  = (byte)((lba & 0xFF0000)       / 0x10000),
+            LbaMidCurrent   = (byte)((lba & 0xFF00)         / 0x100),
+            LbaLowCurrent   = (byte)(lba & 0xFF)
+        };
 
-            var registers = new AtaRegistersLba48
-            {
-                Command        = (byte)AtaCommands.ReadLogExt,
-                SectorCount    = count,
-                LbaMidCurrent  = (byte)(pageNumber & 0xFF),
-                LbaMidPrevious = (byte)((pageNumber & 0xFF00) / 0x100)
-            };
+        registers.DeviceHead += 0x40;
 
-            registers.LbaLowCurrent = logAddress;
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "READ SECTORS EXT took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "READ LOG EXT took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads a drive log using DMA transfer</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="logAddress">Log address</param>
-        /// <param name="pageNumber">Log page number</param>
-        /// <param name="count">How log blocks to read</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadLogDma(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, byte logAddress,
-                               ushort pageNumber, ushort count, uint timeout, out double duration)
-        {
-            buffer = new byte[512 * count];
-
-            var registers = new AtaRegistersLba48
-            {
-                Command        = (byte)AtaCommands.ReadLogDmaExt,
-                SectorCount    = count,
-                LbaMidCurrent  = (byte)(pageNumber & 0xFF),
-                LbaMidPrevious = (byte)((pageNumber & 0xFF00) / 0x100)
-            };
-
-            registers.LbaLowCurrent = logAddress;
-
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
-                                       ref buffer, timeout, true, out duration, out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("ATA Device", "READ LOG DMA EXT took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>
-        ///     Reads sectors using 48-bit addressing and PIO transfer, sending an interrupt only after all the sectors have
-        ///     been transferred
-        /// </summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="lba">LBA of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
-                                 uint timeout, out double duration)
-        {
-            buffer = count == 0 ? new byte[512 * 65536] : new byte[512 * count];
-
-            var registers = new AtaRegistersLba48
-            {
-                Command         = (byte)AtaCommands.ReadMultipleExt,
-                SectorCount     = count,
-                LbaHighPrevious = (byte)((lba & 0xFF0000000000) / 0x10000000000),
-                LbaMidPrevious  = (byte)((lba & 0xFF00000000)   / 0x100000000),
-                LbaLowPrevious  = (byte)((lba & 0xFF000000)     / 0x1000000),
-                LbaHighCurrent  = (byte)((lba & 0xFF0000)       / 0x10000),
-                LbaMidCurrent   = (byte)((lba & 0xFF00)         / 0x100),
-                LbaLowCurrent   = (byte)(lba & 0xFF)
-            };
-
-            registers.DeviceHead += 0x40;
-
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
-                                       out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("ATA Device", "READ MULTIPLE EXT took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads native max address using 48-bit addressing</summary>
-        /// <param name="lba">Maximum addressable block</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadNativeMaxAddress(out ulong lba, out AtaErrorRegistersLba48 statusRegisters, uint timeout,
-                                         out double duration)
-        {
-            lba = 0;
-            byte[] buffer = Array.Empty<byte>();
-
-            var registers = new AtaRegistersLba48
-            {
-                Command = (byte)AtaCommands.ReadNativeMaxAddressExt
-            };
-
-            registers.DeviceHead += 0x40;
-
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
-
-            Error = LastError != 0;
-
-            if((statusRegisters.Status & 0x23) == 0)
-            {
-                lba = (ulong)((statusRegisters.LbaHighCurrent << 16) + (statusRegisters.LbaMidCurrent << 8) +
-                              statusRegisters.LbaLowCurrent);
-
-                lba <<= 24;
-
-                lba += (ulong)((statusRegisters.LbaHighPrevious << 16) + (statusRegisters.LbaMidPrevious << 8) +
-                               statusRegisters.LbaLowPrevious);
-            }
-
-            AaruConsole.DebugWriteLine("ATA Device", "READ NATIVE MAX ADDRESS EXT took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads sectors using 48-bit addressing and PIO transfer</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="lba">LBA of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool Read(out byte[] buffer, out AtaErrorRegistersLba48 statusRegisters, ulong lba, ushort count,
-                         uint timeout, out double duration)
-        {
-            buffer = count == 0 ? new byte[512 * 65536] : new byte[512 * count];
-
-            var registers = new AtaRegistersLba48
-            {
-                Command         = (byte)AtaCommands.ReadExt,
-                SectorCount     = count,
-                LbaHighPrevious = (byte)((lba & 0xFF0000000000) / 0x10000000000),
-                LbaMidPrevious  = (byte)((lba & 0xFF00000000)   / 0x100000000),
-                LbaLowPrevious  = (byte)((lba & 0xFF000000)     / 0x1000000),
-                LbaHighCurrent  = (byte)((lba & 0xFF0000)       / 0x10000),
-                LbaMidCurrent   = (byte)((lba & 0xFF00)         / 0x100),
-                LbaLowCurrent   = (byte)(lba & 0xFF)
-            };
-
-            registers.DeviceHead += 0x40;
-
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
-                                       out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("ATA Device", "READ SECTORS EXT took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/AtaCommands/AtaCHS.cs b/Aaru.Devices/Device/AtaCommands/AtaCHS.cs
index 6ae9a79ec..7dc66d2b9 100644
--- a/Aaru.Devices/Device/AtaCommands/AtaCHS.cs
+++ b/Aaru.Devices/Device/AtaCommands/AtaCHS.cs
@@ -34,404 +34,403 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sends the ATA IDENTIFY DEVICE command to the device, using default device timeout</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="statusRegisters">Status registers.</param>
+    public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters) =>
+        AtaIdentify(out buffer, out statusRegisters, Timeout);
+
+    /// <summary>Sends the ATA IDENTIFY DEVICE command to the device, using default device timeout</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="statusRegisters">Status registers.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, out double duration) =>
+        AtaIdentify(out buffer, out statusRegisters, Timeout, out duration);
+
+    /// <summary>Sends the ATA IDENTIFY DEVICE command to the device</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="statusRegisters">Status registers.</param>
+    /// <param name="timeout">Timeout.</param>
+    public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, uint timeout) =>
+        AtaIdentify(out buffer, out statusRegisters, timeout, out _);
+
+    /// <summary>Sends the ATA IDENTIFY DEVICE command to the device</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="statusRegisters">Status registers.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, uint timeout,
+                            out double duration)
     {
-        /// <summary>Sends the ATA IDENTIFY DEVICE command to the device, using default device timeout</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="statusRegisters">Status registers.</param>
-        public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters) =>
-            AtaIdentify(out buffer, out statusRegisters, Timeout);
+        buffer = new byte[512];
 
-        /// <summary>Sends the ATA IDENTIFY DEVICE command to the device, using default device timeout</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="statusRegisters">Status registers.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, out double duration) =>
-            AtaIdentify(out buffer, out statusRegisters, Timeout, out duration);
-
-        /// <summary>Sends the ATA IDENTIFY DEVICE command to the device</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="statusRegisters">Status registers.</param>
-        /// <param name="timeout">Timeout.</param>
-        public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, uint timeout) =>
-            AtaIdentify(out buffer, out statusRegisters, timeout, out _);
-
-        /// <summary>Sends the ATA IDENTIFY DEVICE command to the device</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="statusRegisters">Status registers.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, uint timeout,
-                                out double duration)
+        var registers = new AtaRegistersChs
         {
-            buffer = new byte[512];
+            Command = (byte)AtaCommands.IdentifyDevice
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command = (byte)AtaCommands.IdentifyDevice
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "IDENTIFY DEVICE took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "IDENTIFY DEVICE took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Reads sectors using CHS addressing and DMA transfer, retrying on error</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="cylinder">Cylinder of read start</param>
+    /// <param name="head">Head of read start</param>
+    /// <param name="sector">Sector of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadDma(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head,
+                        byte sector, byte count, uint timeout, out double duration) =>
+        ReadDma(out buffer, out statusRegisters, true, cylinder, head, sector, count, timeout, out duration);
 
-        /// <summary>Reads sectors using CHS addressing and DMA transfer, retrying on error</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="cylinder">Cylinder of read start</param>
-        /// <param name="head">Head of read start</param>
-        /// <param name="sector">Sector of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head,
-                            byte sector, byte count, uint timeout, out double duration) =>
-            ReadDma(out buffer, out statusRegisters, true, cylinder, head, sector, count, timeout, out duration);
+    /// <summary>Reads sectors using CHS addressing and DMA transfer</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="retry">Retry on error</param>
+    /// <param name="cylinder">Cylinder of read start</param>
+    /// <param name="head">Head of read start</param>
+    /// <param name="sector">Sector of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadDma(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, bool retry, ushort cylinder,
+                        byte head, byte sector, byte count, uint timeout, out double duration)
+    {
+        buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
 
-        /// <summary>Reads sectors using CHS addressing and DMA transfer</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="retry">Retry on error</param>
-        /// <param name="cylinder">Cylinder of read start</param>
-        /// <param name="head">Head of read start</param>
-        /// <param name="sector">Sector of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadDma(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, bool retry, ushort cylinder,
-                            byte head, byte sector, byte count, uint timeout, out double duration)
+        var registers = new AtaRegistersChs
         {
-            buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
+            SectorCount  = count,
+            CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+            CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
+            DeviceHead   = (byte)(head & 0x0F),
+            Sector       = sector,
+            Command      = retry ? (byte)AtaCommands.ReadDmaRetry : (byte)AtaCommands.ReadDma
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                SectorCount  = count,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector,
-                Command      = retry ? (byte)AtaCommands.ReadDmaRetry : (byte)AtaCommands.ReadDma
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
+                                   ref buffer, timeout, true, out duration, out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.Dma, AtaTransferRegister.SectorCount,
-                                       ref buffer, timeout, true, out duration, out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "READ DMA took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "READ DMA took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>
+    ///     Reads sectors using CHS addressing and PIO transfer, sending an interrupt only after all the sectors have been
+    ///     transferred
+    /// </summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="cylinder">Cylinder of read start</param>
+    /// <param name="head">Head of read start</param>
+    /// <param name="sector">Sector of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadMultiple(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder,
+                             byte head, byte sector, byte count, uint timeout, out double duration)
+    {
+        buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
 
-        /// <summary>
-        ///     Reads sectors using CHS addressing and PIO transfer, sending an interrupt only after all the sectors have been
-        ///     transferred
-        /// </summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="cylinder">Cylinder of read start</param>
-        /// <param name="head">Head of read start</param>
-        /// <param name="sector">Sector of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadMultiple(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder,
-                                 byte head, byte sector, byte count, uint timeout, out double duration)
+        var registers = new AtaRegistersChs
         {
-            buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
+            Command      = (byte)AtaCommands.ReadMultiple,
+            SectorCount  = count,
+            CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+            CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
+            DeviceHead   = (byte)(head & 0x0F),
+            Sector       = sector
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command      = (byte)AtaCommands.ReadMultiple,
-                SectorCount  = count,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "READ MULTIPLE took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "READ MULTIPLE took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Reads sectors using CHS addressing and PIO transfer, retrying on error</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="cylinder">Cylinder of read start</param>
+    /// <param name="head">Head of read start</param>
+    /// <param name="sector">Sector of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool Read(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head,
+                     byte sector, byte count, uint timeout, out double duration) =>
+        Read(out buffer, out statusRegisters, true, cylinder, head, sector, count, timeout, out duration);
 
-        /// <summary>Reads sectors using CHS addressing and PIO transfer, retrying on error</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="cylinder">Cylinder of read start</param>
-        /// <param name="head">Head of read start</param>
-        /// <param name="sector">Sector of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool Read(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head,
-                         byte sector, byte count, uint timeout, out double duration) =>
-            Read(out buffer, out statusRegisters, true, cylinder, head, sector, count, timeout, out duration);
+    /// <summary>Reads sectors using CHS addressing and PIO transfer</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="retry">Retry on error</param>
+    /// <param name="cylinder">Cylinder of read start</param>
+    /// <param name="head">Head of read start</param>
+    /// <param name="sector">Sector of read start</param>
+    /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool Read(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, bool retry, ushort cylinder,
+                     byte head, byte sector, byte count, uint timeout, out double duration)
+    {
+        buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
 
-        /// <summary>Reads sectors using CHS addressing and PIO transfer</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="retry">Retry on error</param>
-        /// <param name="cylinder">Cylinder of read start</param>
-        /// <param name="head">Head of read start</param>
-        /// <param name="sector">Sector of read start</param>
-        /// <param name="count">How many blocks to read, or 0 to indicate 256 blocks</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool Read(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, bool retry, ushort cylinder,
-                         byte head, byte sector, byte count, uint timeout, out double duration)
+        var registers = new AtaRegistersChs
         {
-            buffer = count == 0 ? new byte[512 * 256] : new byte[512 * count];
+            Command      = retry ? (byte)AtaCommands.ReadRetry : (byte)AtaCommands.Read,
+            SectorCount  = count,
+            CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+            CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
+            DeviceHead   = (byte)(head & 0x0F),
+            Sector       = sector
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command      = retry ? (byte)AtaCommands.ReadRetry : (byte)AtaCommands.Read,
-                SectorCount  = count,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "READ SECTORS took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "READ SECTORS took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Reads a long sector using CHS addressing and PIO transfer, retrying on error</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="cylinder">Cylinder of read start</param>
+    /// <param name="head">Head of read start</param>
+    /// <param name="sector">Sector of read start</param>
+    /// <param name="blockSize">Size in bytes of the long sector</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadLong(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head,
+                         byte sector, uint blockSize, uint timeout, out double duration) =>
+        ReadLong(out buffer, out statusRegisters, true, cylinder, head, sector, blockSize, timeout, out duration);
 
-        /// <summary>Reads a long sector using CHS addressing and PIO transfer, retrying on error</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="cylinder">Cylinder of read start</param>
-        /// <param name="head">Head of read start</param>
-        /// <param name="sector">Sector of read start</param>
-        /// <param name="blockSize">Size in bytes of the long sector</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head,
-                             byte sector, uint blockSize, uint timeout, out double duration) =>
-            ReadLong(out buffer, out statusRegisters, true, cylinder, head, sector, blockSize, timeout, out duration);
+    /// <summary>Reads a long sector using CHS addressing and PIO transfer, retrying on error</summary>
+    /// <param name="buffer">Buffer that contains the read data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="retry">Retry on error</param>
+    /// <param name="cylinder">Cylinder of read start</param>
+    /// <param name="head">Head of read start</param>
+    /// <param name="sector">Sector of read start</param>
+    /// <param name="blockSize">Size in bytes of the long sector</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadLong(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, bool retry, ushort cylinder,
+                         byte head, byte sector, uint blockSize, uint timeout, out double duration)
+    {
+        buffer = new byte[blockSize];
 
-        /// <summary>Reads a long sector using CHS addressing and PIO transfer, retrying on error</summary>
-        /// <param name="buffer">Buffer that contains the read data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="retry">Retry on error</param>
-        /// <param name="cylinder">Cylinder of read start</param>
-        /// <param name="head">Head of read start</param>
-        /// <param name="sector">Sector of read start</param>
-        /// <param name="blockSize">Size in bytes of the long sector</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadLong(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, bool retry, ushort cylinder,
-                             byte head, byte sector, uint blockSize, uint timeout, out double duration)
+        var registers = new AtaRegistersChs
         {
-            buffer = new byte[blockSize];
+            Command      = retry ? (byte)AtaCommands.ReadLongRetry : (byte)AtaCommands.ReadLong,
+            SectorCount  = 1,
+            CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+            CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
+            DeviceHead   = (byte)(head & 0x0F),
+            Sector       = sector
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command      = retry ? (byte)AtaCommands.ReadLongRetry : (byte)AtaCommands.ReadLong,
-                SectorCount  = 1,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.SectorCount, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "READ LONG took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "READ LONG took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Sets the reading mechanism ready to read the specified block using CHS addressing</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="cylinder">Cylinder to position reading mechanism ready to read</param>
+    /// <param name="head">Head to position reading mechanism ready to read</param>
+    /// <param name="sector">Sector to position reading mechanism ready to read</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool Seek(out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head, byte sector,
+                     uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Sets the reading mechanism ready to read the specified block using CHS addressing</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="cylinder">Cylinder to position reading mechanism ready to read</param>
-        /// <param name="head">Head to position reading mechanism ready to read</param>
-        /// <param name="sector">Sector to position reading mechanism ready to read</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool Seek(out AtaErrorRegistersChs statusRegisters, ushort cylinder, byte head, byte sector,
-                         uint timeout, out double duration)
+        var registers = new AtaRegistersChs
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command      = (byte)AtaCommands.Seek,
+            CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+            CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
+            DeviceHead   = (byte)(head & 0x0F),
+            Sector       = sector
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command      = (byte)AtaCommands.Seek,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SEEK took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "SEEK took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Enables drive features</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="feature">Feature to enable</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SetFeatures(out AtaErrorRegistersChs statusRegisters, AtaFeatures feature, uint timeout,
+                            out double duration) =>
+        SetFeatures(out statusRegisters, feature, 0, 0, 0, 0, timeout, out duration);
 
-        /// <summary>Enables drive features</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="feature">Feature to enable</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SetFeatures(out AtaErrorRegistersChs statusRegisters, AtaFeatures feature, uint timeout,
-                                out double duration) =>
-            SetFeatures(out statusRegisters, feature, 0, 0, 0, 0, timeout, out duration);
+    /// <summary>Enables drive features</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="feature">Feature to enable</param>
+    /// <param name="cylinder">Value for the cylinder register</param>
+    /// <param name="head">Value for the head register</param>
+    /// <param name="sector">Value for the sector register</param>
+    /// <param name="sectorCount">Value for the sector count register</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SetFeatures(out AtaErrorRegistersChs statusRegisters, AtaFeatures feature, ushort cylinder,
+                            byte head, byte sector, byte sectorCount, uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Enables drive features</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="feature">Feature to enable</param>
-        /// <param name="cylinder">Value for the cylinder register</param>
-        /// <param name="head">Value for the head register</param>
-        /// <param name="sector">Value for the sector register</param>
-        /// <param name="sectorCount">Value for the sector count register</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SetFeatures(out AtaErrorRegistersChs statusRegisters, AtaFeatures feature, ushort cylinder,
-                                byte head, byte sector, byte sectorCount, uint timeout, out double duration)
+        var registers = new AtaRegistersChs
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command      = (byte)AtaCommands.SetFeatures,
+            CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+            CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
+            DeviceHead   = (byte)(head & 0x0F),
+            Sector       = sector,
+            SectorCount  = sectorCount,
+            Feature      = (byte)feature
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command      = (byte)AtaCommands.SetFeatures,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                DeviceHead   = (byte)(head & 0x0F),
-                Sector       = sector,
-                SectorCount  = sectorCount,
-                Feature      = (byte)feature
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SET FEATURES took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "SET FEATURES took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Prevents ejection of the media inserted in the drive</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool DoorLock(out AtaErrorRegistersChs statusRegisters, uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Prevents ejection of the media inserted in the drive</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool DoorLock(out AtaErrorRegistersChs statusRegisters, uint timeout, out double duration)
+        var registers = new AtaRegistersChs
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.DoorLock
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command = (byte)AtaCommands.DoorLock
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "DOOR LOCK took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "DOOR LOCK took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Allows ejection of the media inserted in the drive</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool DoorUnlock(out AtaErrorRegistersChs statusRegisters, uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Allows ejection of the media inserted in the drive</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool DoorUnlock(out AtaErrorRegistersChs statusRegisters, uint timeout, out double duration)
+        var registers = new AtaRegistersChs
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.DoorUnLock
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command = (byte)AtaCommands.DoorUnLock
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "DOOR UNLOCK took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "DOOR UNLOCK took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Ejects the media inserted in the drive</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool MediaEject(out AtaErrorRegistersChs statusRegisters, uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Ejects the media inserted in the drive</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool MediaEject(out AtaErrorRegistersChs statusRegisters, uint timeout, out double duration)
+        var registers = new AtaRegistersChs
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.MediaEject
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command = (byte)AtaCommands.MediaEject
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, true, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "MEDIA EJECT took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "MEDIA EJECT took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/AtaCommands/Atapi.cs b/Aaru.Devices/Device/AtaCommands/Atapi.cs
index 28b70fd06..352e9c653 100644
--- a/Aaru.Devices/Device/AtaCommands/Atapi.cs
+++ b/Aaru.Devices/Device/AtaCommands/Atapi.cs
@@ -33,58 +33,57 @@
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device, using default device timeout</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="statusRegisters">Status registers.</param>
+    public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters) =>
+        AtapiIdentify(out buffer, out statusRegisters, Timeout);
+
+    /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device, using default device timeout</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="statusRegisters">Status registers.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, out double duration) =>
+        AtapiIdentify(out buffer, out statusRegisters, Timeout, out duration);
+
+    /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="statusRegisters">Status registers.</param>
+    /// <param name="timeout">Timeout.</param>
+    public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, uint timeout) =>
+        AtapiIdentify(out buffer, out statusRegisters, timeout, out _);
+
+    /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="statusRegisters">Status registers.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, uint timeout,
+                              out double duration)
     {
-        /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device, using default device timeout</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="statusRegisters">Status registers.</param>
-        public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters) =>
-            AtapiIdentify(out buffer, out statusRegisters, Timeout);
+        buffer = new byte[512];
 
-        /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device, using default device timeout</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="statusRegisters">Status registers.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, out double duration) =>
-            AtapiIdentify(out buffer, out statusRegisters, Timeout, out duration);
-
-        /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="statusRegisters">Status registers.</param>
-        /// <param name="timeout">Timeout.</param>
-        public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, uint timeout) =>
-            AtapiIdentify(out buffer, out statusRegisters, timeout, out _);
-
-        /// <summary>Sends the ATA IDENTIFY PACKET DEVICE command to the device</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="statusRegisters" /> contains the error registers.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="statusRegisters">Status registers.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, uint timeout,
-                                  out double duration)
+        var registers = new AtaRegistersChs
         {
-            buffer = new byte[512];
+            Command = (byte)AtaCommands.IdentifyPacketDevice
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command = (byte)AtaCommands.IdentifyPacketDevice
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "IDENTIFY PACKET DEVICE took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "IDENTIFY PACKET DEVICE took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/AtaCommands/Cfa.cs b/Aaru.Devices/Device/AtaCommands/Cfa.cs
index 54964094d..20a168187 100644
--- a/Aaru.Devices/Device/AtaCommands/Cfa.cs
+++ b/Aaru.Devices/Device/AtaCommands/Cfa.cs
@@ -34,105 +34,104 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Requests to translate an LBA to a card physical address</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="lba">LBA to start reading from</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool TranslateSector(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba,
+                                uint timeout, out double duration)
     {
-        /// <summary>Requests to translate an LBA to a card physical address</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="lba">LBA to start reading from</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool TranslateSector(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint lba,
-                                    uint timeout, out double duration)
+        buffer = new byte[512];
+
+        var registers = new AtaRegistersLba28
         {
-            buffer = new byte[512];
+            Command    = (byte)AtaCommands.TranslateSector,
+            DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
+            LbaHigh    = (byte)((lba & 0xFF0000)  / 0x10000),
+            LbaMid     = (byte)((lba & 0xFF00)    / 0x100),
+            LbaLow     = (byte)((lba & 0xFF)      / 0x1)
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command    = (byte)AtaCommands.TranslateSector,
-                DeviceHead = (byte)((lba & 0xF000000) / 0x1000000),
-                LbaHigh    = (byte)((lba & 0xFF0000)  / 0x10000),
-                LbaMid     = (byte)((lba & 0xFF00)    / 0x100),
-                LbaLow     = (byte)((lba & 0xFF)      / 0x1)
-            };
+        registers.DeviceHead += 0x40;
 
-            registers.DeviceHead += 0x40;
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "CFA TRANSLATE SECTOR took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "CFA TRANSLATE SECTOR took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Requests to translate a CHS to a card physical address</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="cylinder">Cylinder</param>
+    /// <param name="head">Head</param>
+    /// <param name="sector">Sector</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool TranslateSector(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder,
+                                byte head, byte sector, uint timeout, out double duration)
+    {
+        buffer = new byte[512];
 
-        /// <summary>Requests to translate a CHS to a card physical address</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="cylinder">Cylinder</param>
-        /// <param name="head">Head</param>
-        /// <param name="sector">Sector</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool TranslateSector(out byte[] buffer, out AtaErrorRegistersChs statusRegisters, ushort cylinder,
-                                    byte head, byte sector, uint timeout, out double duration)
+        var registers = new AtaRegistersChs
         {
-            buffer = new byte[512];
+            Command      = (byte)AtaCommands.TranslateSector,
+            CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
+            CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
+            Sector       = sector,
+            DeviceHead   = (byte)(head & 0x0F)
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command      = (byte)AtaCommands.TranslateSector,
-                CylinderHigh = (byte)((cylinder & 0xFF00) / 0x100),
-                CylinderLow  = (byte)((cylinder & 0xFF)   / 0x1),
-                Sector       = sector,
-                DeviceHead   = (byte)(head & 0x0F)
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "CFA TRANSLATE SECTOR took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "CFA TRANSLATE SECTOR took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Requests an extended error code</summary>
+    /// <param name="errorCode">Error code</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool RequestExtendedErrorCode(out byte errorCode, out AtaErrorRegistersLba28 statusRegisters,
+                                         uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Requests an extended error code</summary>
-        /// <param name="errorCode">Error code</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool RequestExtendedErrorCode(out byte errorCode, out AtaErrorRegistersLba28 statusRegisters,
-                                             uint timeout, out double duration)
+        var registers = new AtaRegistersLba28
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.RequestSense
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.RequestSense
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        errorCode = statusRegisters.Error;
 
-            errorCode = statusRegisters.Error;
+        AaruConsole.DebugWriteLine("ATA Device", "CFA REQUEST EXTENDED ERROR CODE took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "CFA REQUEST EXTENDED ERROR CODE took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/AtaCommands/MCPT.cs b/Aaru.Devices/Device/AtaCommands/MCPT.cs
index de98128fc..65a357398 100644
--- a/Aaru.Devices/Device/AtaCommands/MCPT.cs
+++ b/Aaru.Devices/Device/AtaCommands/MCPT.cs
@@ -34,54 +34,53 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Enables media card pass through</summary>
+    /// <param name="statusRegisters">Status registers.</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool EnableMediaCardPassThrough(out AtaErrorRegistersChs statusRegisters, uint timeout,
+                                           out double duration) =>
+        CheckMediaCardType(1, out statusRegisters, timeout, out duration);
+
+    /// <summary>Disables media card pass through</summary>
+    /// <param name="statusRegisters">Status registers.</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool DisableMediaCardPassThrough(out AtaErrorRegistersChs statusRegisters, uint timeout,
+                                            out double duration) =>
+        CheckMediaCardType(0, out statusRegisters, timeout, out duration);
+
+    /// <summary>Checks media card pass through</summary>
+    /// <param name="feature">Feature</param>
+    /// <param name="statusRegisters">Status registers.</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool CheckMediaCardType(byte feature, out AtaErrorRegistersChs statusRegisters, uint timeout,
+                                   out double duration)
     {
-        /// <summary>Enables media card pass through</summary>
-        /// <param name="statusRegisters">Status registers.</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool EnableMediaCardPassThrough(out AtaErrorRegistersChs statusRegisters, uint timeout,
-                                               out double duration) =>
-            CheckMediaCardType(1, out statusRegisters, timeout, out duration);
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Disables media card pass through</summary>
-        /// <param name="statusRegisters">Status registers.</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool DisableMediaCardPassThrough(out AtaErrorRegistersChs statusRegisters, uint timeout,
-                                                out double duration) =>
-            CheckMediaCardType(0, out statusRegisters, timeout, out duration);
-
-        /// <summary>Checks media card pass through</summary>
-        /// <param name="feature">Feature</param>
-        /// <param name="statusRegisters">Status registers.</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool CheckMediaCardType(byte feature, out AtaErrorRegistersChs statusRegisters, uint timeout,
-                                       out double duration)
+        var registers = new AtaRegistersChs
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.CheckMediaCardType,
+            Feature = feature
+        };
 
-            var registers = new AtaRegistersChs
-            {
-                Command = (byte)AtaCommands.CheckMediaCardType,
-                Feature = feature
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "CHECK MEDIA CARD TYPE took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "CHECK MEDIA CARD TYPE took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/AtaCommands/Smart.cs b/Aaru.Devices/Device/AtaCommands/Smart.cs
index 2cb4ef7b0..f24686614 100644
--- a/Aaru.Devices/Device/AtaCommands/Smart.cs
+++ b/Aaru.Devices/Device/AtaCommands/Smart.cs
@@ -34,244 +34,243 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.ATA;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Disables S.M.A.R.T.</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SmartDisable(out AtaErrorRegistersLba28 statusRegisters, uint timeout, out double duration)
     {
-        /// <summary>Disables S.M.A.R.T.</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SmartDisable(out AtaErrorRegistersLba28 statusRegisters, uint timeout, out double duration)
+        byte[] buffer = Array.Empty<byte>();
+
+        var registers = new AtaRegistersLba28
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.Smart,
+            Feature = (byte)AtaSmartSubCommands.Disable,
+            LbaHigh = 0xC2,
+            LbaMid  = 0x4F
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.Disable,
-                LbaHigh = 0xC2,
-                LbaMid  = 0x4F
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SMART DISABLE OPERATIONS took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "SMART DISABLE OPERATIONS took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Enables auto-saving of S.M.A.R.T. attributes</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SmartEnableAttributeAutosave(out AtaErrorRegistersLba28 statusRegisters, uint timeout,
+                                             out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Enables auto-saving of S.M.A.R.T. attributes</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SmartEnableAttributeAutosave(out AtaErrorRegistersLba28 statusRegisters, uint timeout,
-                                                 out double duration)
+        var registers = new AtaRegistersLba28
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command     = (byte)AtaCommands.Smart,
+            Feature     = (byte)AtaSmartSubCommands.EnableDisableAttributeAutosave,
+            LbaHigh     = 0xC2,
+            LbaMid      = 0x4F,
+            SectorCount = 0xF1
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command     = (byte)AtaCommands.Smart,
-                Feature     = (byte)AtaSmartSubCommands.EnableDisableAttributeAutosave,
-                LbaHigh     = 0xC2,
-                LbaMid      = 0x4F,
-                SectorCount = 0xF1
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SMART ENABLE ATTRIBUTE AUTOSAVE took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "SMART ENABLE ATTRIBUTE AUTOSAVE took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Disables auto-saving of S.M.A.R.T. attributes</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SmartDisableAttributeAutosave(out AtaErrorRegistersLba28 statusRegisters, uint timeout,
+                                              out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Disables auto-saving of S.M.A.R.T. attributes</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SmartDisableAttributeAutosave(out AtaErrorRegistersLba28 statusRegisters, uint timeout,
-                                                  out double duration)
+        var registers = new AtaRegistersLba28
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.Smart,
+            Feature = (byte)AtaSmartSubCommands.EnableDisableAttributeAutosave,
+            LbaHigh = 0xC2,
+            LbaMid  = 0x4F
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.EnableDisableAttributeAutosave,
-                LbaHigh = 0xC2,
-                LbaMid  = 0x4F
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SMART DISABLE ATTRIBUTE AUTOSAVE took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "SMART DISABLE ATTRIBUTE AUTOSAVE took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Enables S.M.A.R.T.</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SmartEnable(out AtaErrorRegistersLba28 statusRegisters, uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Enables S.M.A.R.T.</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SmartEnable(out AtaErrorRegistersLba28 statusRegisters, uint timeout, out double duration)
+        var registers = new AtaRegistersLba28
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.Smart,
+            Feature = (byte)AtaSmartSubCommands.Enable,
+            LbaHigh = 0xC2,
+            LbaMid  = 0x4F
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.Enable,
-                LbaHigh = 0xC2,
-                LbaMid  = 0x4F
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SMART ENABLE OPERATIONS took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "SMART ENABLE OPERATIONS took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Requests drive to execute offline immediate S.M.A.R.T. test</summary>
+    /// <param name="subcommand">Subcommand</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SmartExecuteOffLineImmediate(out AtaErrorRegistersLba28 statusRegisters, byte subcommand,
+                                             uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Requests drive to execute offline immediate S.M.A.R.T. test</summary>
-        /// <param name="subcommand">Subcommand</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SmartExecuteOffLineImmediate(out AtaErrorRegistersLba28 statusRegisters, byte subcommand,
-                                                 uint timeout, out double duration)
+        var registers = new AtaRegistersLba28
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.Smart,
+            Feature = (byte)AtaSmartSubCommands.ExecuteOfflineImmediate,
+            LbaHigh = 0xC2,
+            LbaMid  = 0x4F,
+            LbaLow  = subcommand
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.ExecuteOfflineImmediate,
-                LbaHigh = 0xC2,
-                LbaMid  = 0x4F,
-                LbaLow  = subcommand
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SMART EXECUTE OFF-LINE IMMEDIATE took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "SMART EXECUTE OFF-LINE IMMEDIATE took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Reads S.M.A.R.T. data</summary>
+    /// <param name="buffer">Buffer containing data</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SmartReadData(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint timeout,
+                              out double duration)
+    {
+        buffer = new byte[512];
 
-        /// <summary>Reads S.M.A.R.T. data</summary>
-        /// <param name="buffer">Buffer containing data</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SmartReadData(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, uint timeout,
-                                  out double duration)
+        var registers = new AtaRegistersLba28
         {
-            buffer = new byte[512];
+            Command = (byte)AtaCommands.Smart,
+            Feature = (byte)AtaSmartSubCommands.ReadData,
+            LbaHigh = 0xC2,
+            LbaMid  = 0x4F
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.ReadData,
-                LbaHigh = 0xC2,
-                LbaMid  = 0x4F
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SMART READ DATA took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "SMART READ DATA took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Reads S.M.A.R.T. log</summary>
+    /// <param name="buffer">Buffer containing log</param>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="logAddress">Log address</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SmartReadLog(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, byte logAddress,
+                             uint timeout, out double duration)
+    {
+        buffer = new byte[512];
 
-        /// <summary>Reads S.M.A.R.T. log</summary>
-        /// <param name="buffer">Buffer containing log</param>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="logAddress">Log address</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SmartReadLog(out byte[] buffer, out AtaErrorRegistersLba28 statusRegisters, byte logAddress,
-                                 uint timeout, out double duration)
+        var registers = new AtaRegistersLba28
         {
-            buffer = new byte[512];
+            Command = (byte)AtaCommands.Smart,
+            Feature = (byte)AtaSmartSubCommands.ReadLog,
+            LbaHigh = 0xC2,
+            LbaMid  = 0x4F,
+            LbaLow  = logAddress
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.ReadLog,
-                LbaHigh = 0xC2,
-                LbaMid  = 0x4F,
-                LbaLow  = logAddress
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.PioIn,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SMART READ LOG took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "SMART READ LOG took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Retrieves S.M.A.R.T. status</summary>
+    /// <param name="statusRegisters">Returned status registers</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SmartReturnStatus(out AtaErrorRegistersLba28 statusRegisters, uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Retrieves S.M.A.R.T. status</summary>
-        /// <param name="statusRegisters">Returned status registers</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SmartReturnStatus(out AtaErrorRegistersLba28 statusRegisters, uint timeout, out double duration)
+        var registers = new AtaRegistersLba28
         {
-            byte[] buffer = Array.Empty<byte>();
+            Command = (byte)AtaCommands.Smart,
+            Feature = (byte)AtaSmartSubCommands.ReturnStatus,
+            LbaHigh = 0xC2,
+            LbaMid  = 0x4F
+        };
 
-            var registers = new AtaRegistersLba28
-            {
-                Command = (byte)AtaCommands.Smart,
-                Feature = (byte)AtaSmartSubCommands.ReturnStatus,
-                LbaHigh = 0xC2,
-                LbaMid  = 0x4F
-            };
+        LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
+                                   AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
+                                   out bool sense);
 
-            LastError = SendAtaCommand(registers, out statusRegisters, AtaProtocol.NonData,
-                                       AtaTransferRegister.NoTransfer, ref buffer, timeout, false, out duration,
-                                       out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("ATA Device", "SMART RETURN STATUS took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("ATA Device", "SMART RETURN STATUS took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/Commands.cs b/Aaru.Devices/Device/Commands.cs
index 22f9a9f21..e40791a8f 100644
--- a/Aaru.Devices/Device/Commands.cs
+++ b/Aaru.Devices/Device/Commands.cs
@@ -34,319 +34,318 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using Aaru.Decoders.ATA;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+public sealed partial class Device
 {
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    public sealed partial class Device
+    /// <summary>Sends a SCSI command to this device</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="cdb">SCSI CDB</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="senseBuffer">Buffer with the SCSI sense</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="direction">SCSI command transfer direction</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense">
+    ///     <c>True</c> if SCSI command returned non-OK status and <paramref name="senseBuffer" /> contains
+    ///     SCSI sense
+    /// </param>
+    public int SendScsiCommand(byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
+                               ScsiDirection direction, out double duration, out bool sense)
     {
-        /// <summary>Sends a SCSI command to this device</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="cdb">SCSI CDB</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="senseBuffer">Buffer with the SCSI sense</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="direction">SCSI command transfer direction</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense">
-        ///     <c>True</c> if SCSI command returned non-OK status and <paramref name="senseBuffer" /> contains
-        ///     SCSI sense
-        /// </param>
-        public int SendScsiCommand(byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
-                                   ScsiDirection direction, out double duration, out bool sense)
+        // We need a timeout
+        if(timeout == 0)
+            timeout = Timeout > 0 ? Timeout : 15;
+
+        if(!(_remote is null))
+            return _remote.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, direction, out duration,
+                                           out sense);
+
+        return Command.SendScsiCommand(PlatformId, FileHandle, cdb, ref buffer, out senseBuffer, timeout, direction,
+                                       out duration, out sense);
+    }
+
+    /// <summary>Sends an ATA/ATAPI command to this device using CHS addressing</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="registers">ATA registers.</param>
+    /// <param name="errorRegisters">Status/error registers.</param>
+    /// <param name="protocol">ATA Protocol.</param>
+    /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
+    /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="transferBlocks">
+    ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
+    ///     bytes.
+    /// </param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
+    public int SendAtaCommand(AtaRegistersChs registers, out AtaErrorRegistersChs errorRegisters,
+                              AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                              uint timeout, bool transferBlocks, out double duration, out bool sense)
+    {
+        // We need a timeout
+        if(timeout == 0)
+            timeout = Timeout > 0 ? Timeout : 15;
+
+        if(!(_remote is null))
+            return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                                          timeout, transferBlocks, out duration, out sense);
+
+        return Command.SendAtaCommand(PlatformId, FileHandle, registers, out errorRegisters, protocol,
+                                      transferRegister, ref buffer, timeout, transferBlocks, out duration,
+                                      out sense);
+    }
+
+    /// <summary>Sends an ATA/ATAPI command to this device using 28-bit LBA addressing</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="registers">ATA registers.</param>
+    /// <param name="errorRegisters">Status/error registers.</param>
+    /// <param name="protocol">ATA Protocol.</param>
+    /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
+    /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="transferBlocks">
+    ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
+    ///     bytes.
+    /// </param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
+    public int SendAtaCommand(AtaRegistersLba28 registers, out AtaErrorRegistersLba28 errorRegisters,
+                              AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                              uint timeout, bool transferBlocks, out double duration, out bool sense)
+    {
+        // We need a timeout
+        if(timeout == 0)
+            timeout = Timeout > 0 ? Timeout : 15;
+
+        if(!(_remote is null))
+            return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                                          timeout, transferBlocks, out duration, out sense);
+
+        return Command.SendAtaCommand(PlatformId, FileHandle, registers, out errorRegisters, protocol,
+                                      transferRegister, ref buffer, timeout, transferBlocks, out duration,
+                                      out sense);
+    }
+
+    /// <summary>Sends an ATA/ATAPI command to this device using 48-bit LBA addressing</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="registers">ATA registers.</param>
+    /// <param name="errorRegisters">Status/error registers.</param>
+    /// <param name="protocol">ATA Protocol.</param>
+    /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
+    /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="transferBlocks">
+    ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
+    ///     bytes.
+    /// </param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
+    public int SendAtaCommand(AtaRegistersLba48 registers, out AtaErrorRegistersLba48 errorRegisters,
+                              AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                              uint timeout, bool transferBlocks, out double duration, out bool sense)
+    {
+        // We need a timeout
+        if(timeout == 0)
+            timeout = Timeout > 0 ? Timeout : 15;
+
+        if(!(_remote is null))
+            return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
+                                          timeout, transferBlocks, out duration, out sense);
+
+        return Command.SendAtaCommand(PlatformId, FileHandle, registers, out errorRegisters, protocol,
+                                      transferRegister, ref buffer, timeout, transferBlocks, out duration,
+                                      out sense);
+    }
+
+    /// <summary>Sends a MMC/SD command to this device</summary>
+    /// <returns>The result of the command.</returns>
+    /// <param name="command">MMC/SD opcode</param>
+    /// <param name="buffer">Buffer for MMC/SD command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
+    /// <param name="write"><c>True</c> if data is sent from host to card</param>
+    /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
+    /// <param name="flags">Flags indicating kind and place of response</param>
+    /// <param name="blocks">How many blocks to transfer</param>
+    /// <param name="argument">Command argument</param>
+    /// <param name="response">Response registers</param>
+    /// <param name="blockSize">Size of block in bytes</param>
+    public int SendMmcCommand(MmcCommands command, bool write, bool isApplication, MmcFlags flags, uint argument,
+                              uint blockSize, uint blocks, ref byte[] buffer, out uint[] response,
+                              out double duration, out bool sense, uint timeout = 15)
+    {
+        // We need a timeout
+        if(timeout == 0)
+            timeout = Timeout > 0 ? Timeout : 15;
+
+        switch(command)
         {
-            // We need a timeout
-            if(timeout == 0)
-                timeout = Timeout > 0 ? Timeout : 15;
-
-            if(!(_remote is null))
-                return _remote.SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, direction, out duration,
-                                               out sense);
-
-            return Command.SendScsiCommand(PlatformId, FileHandle, cdb, ref buffer, out senseBuffer, timeout, direction,
-                                           out duration, out sense);
-        }
-
-        /// <summary>Sends an ATA/ATAPI command to this device using CHS addressing</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="registers">ATA registers.</param>
-        /// <param name="errorRegisters">Status/error registers.</param>
-        /// <param name="protocol">ATA Protocol.</param>
-        /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
-        /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="transferBlocks">
-        ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
-        ///     bytes.
-        /// </param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
-        public int SendAtaCommand(AtaRegistersChs registers, out AtaErrorRegistersChs errorRegisters,
-                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
-                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
-        {
-            // We need a timeout
-            if(timeout == 0)
-                timeout = Timeout > 0 ? Timeout : 15;
-
-            if(!(_remote is null))
-                return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
-                                              timeout, transferBlocks, out duration, out sense);
-
-            return Command.SendAtaCommand(PlatformId, FileHandle, registers, out errorRegisters, protocol,
-                                          transferRegister, ref buffer, timeout, transferBlocks, out duration,
-                                          out sense);
-        }
-
-        /// <summary>Sends an ATA/ATAPI command to this device using 28-bit LBA addressing</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="registers">ATA registers.</param>
-        /// <param name="errorRegisters">Status/error registers.</param>
-        /// <param name="protocol">ATA Protocol.</param>
-        /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
-        /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="transferBlocks">
-        ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
-        ///     bytes.
-        /// </param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
-        public int SendAtaCommand(AtaRegistersLba28 registers, out AtaErrorRegistersLba28 errorRegisters,
-                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
-                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
-        {
-            // We need a timeout
-            if(timeout == 0)
-                timeout = Timeout > 0 ? Timeout : 15;
-
-            if(!(_remote is null))
-                return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
-                                              timeout, transferBlocks, out duration, out sense);
-
-            return Command.SendAtaCommand(PlatformId, FileHandle, registers, out errorRegisters, protocol,
-                                          transferRegister, ref buffer, timeout, transferBlocks, out duration,
-                                          out sense);
-        }
-
-        /// <summary>Sends an ATA/ATAPI command to this device using 48-bit LBA addressing</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="registers">ATA registers.</param>
-        /// <param name="errorRegisters">Status/error registers.</param>
-        /// <param name="protocol">ATA Protocol.</param>
-        /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
-        /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="transferBlocks">
-        ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
-        ///     bytes.
-        /// </param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
-        public int SendAtaCommand(AtaRegistersLba48 registers, out AtaErrorRegistersLba48 errorRegisters,
-                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
-                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
-        {
-            // We need a timeout
-            if(timeout == 0)
-                timeout = Timeout > 0 ? Timeout : 15;
-
-            if(!(_remote is null))
-                return _remote.SendAtaCommand(registers, out errorRegisters, protocol, transferRegister, ref buffer,
-                                              timeout, transferBlocks, out duration, out sense);
-
-            return Command.SendAtaCommand(PlatformId, FileHandle, registers, out errorRegisters, protocol,
-                                          transferRegister, ref buffer, timeout, transferBlocks, out duration,
-                                          out sense);
-        }
-
-        /// <summary>Sends a MMC/SD command to this device</summary>
-        /// <returns>The result of the command.</returns>
-        /// <param name="command">MMC/SD opcode</param>
-        /// <param name="buffer">Buffer for MMC/SD command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
-        /// <param name="write"><c>True</c> if data is sent from host to card</param>
-        /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
-        /// <param name="flags">Flags indicating kind and place of response</param>
-        /// <param name="blocks">How many blocks to transfer</param>
-        /// <param name="argument">Command argument</param>
-        /// <param name="response">Response registers</param>
-        /// <param name="blockSize">Size of block in bytes</param>
-        public int SendMmcCommand(MmcCommands command, bool write, bool isApplication, MmcFlags flags, uint argument,
-                                  uint blockSize, uint blocks, ref byte[] buffer, out uint[] response,
-                                  out double duration, out bool sense, uint timeout = 15)
-        {
-            // We need a timeout
-            if(timeout == 0)
-                timeout = Timeout > 0 ? Timeout : 15;
-
-            switch(command)
+            case MmcCommands.SendCid when _cachedCid != null:
             {
-                case MmcCommands.SendCid when _cachedCid != null:
-                {
-                    DateTime start = DateTime.Now;
-                    buffer = new byte[_cachedCid.Length];
-                    Array.Copy(_cachedCid, buffer, buffer.Length);
-                    response = new uint[4];
-                    sense    = false;
-                    DateTime end = DateTime.Now;
-                    duration = (end - start).TotalMilliseconds;
+                DateTime start = DateTime.Now;
+                buffer = new byte[_cachedCid.Length];
+                Array.Copy(_cachedCid, buffer, buffer.Length);
+                response = new uint[4];
+                sense    = false;
+                DateTime end = DateTime.Now;
+                duration = (end - start).TotalMilliseconds;
 
-                    return 0;
-                }
-                case MmcCommands.SendCsd when _cachedCid != null:
-                {
-                    DateTime start = DateTime.Now;
-                    buffer = new byte[_cachedCsd.Length];
-                    Array.Copy(_cachedCsd, buffer, buffer.Length);
-                    response = new uint[4];
-                    sense    = false;
-                    DateTime end = DateTime.Now;
-                    duration = (end - start).TotalMilliseconds;
-
-                    return 0;
-                }
-                case (MmcCommands)SecureDigitalCommands.SendScr when _cachedScr != null:
-                {
-                    DateTime start = DateTime.Now;
-                    buffer = new byte[_cachedScr.Length];
-                    Array.Copy(_cachedScr, buffer, buffer.Length);
-                    response = new uint[4];
-                    sense    = false;
-                    DateTime end = DateTime.Now;
-                    duration = (end - start).TotalMilliseconds;
-
-                    return 0;
-                }
-                case (MmcCommands)SecureDigitalCommands.SendOperatingCondition when _cachedOcr != null:
-                case MmcCommands.SendOpCond when _cachedOcr                                    != null:
-                {
-                    DateTime start = DateTime.Now;
-                    buffer = new byte[_cachedOcr.Length];
-                    Array.Copy(_cachedOcr, buffer, buffer.Length);
-                    response = new uint[4];
-                    sense    = false;
-                    DateTime end = DateTime.Now;
-                    duration = (end - start).TotalMilliseconds;
-
-                    return 0;
-                }
+                return 0;
             }
-
-            return _remote is null
-                       ? Command.SendMmcCommand(PlatformId, FileHandle, command, write, isApplication, flags, argument,
-                                                blockSize, blocks, ref buffer, out response, out duration, out sense,
-                                                timeout) : _remote.SendMmcCommand(command, write, isApplication, flags,
-                           argument, blockSize, blocks, ref buffer, out response, out duration, out sense,
-                           timeout);
-        }
-
-        /// <summary>Encapsulates a single MMC command to send in a queue</summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "MemberCanBeInternal")]
-        public class MmcSingleCommand
-        {
-            /// <summary>Command argument</summary>
-            public uint argument;
-            /// <summary>How many blocks to transfer</summary>
-            public uint blocks;
-            /// <summary>Size of block in bytes</summary>
-            public uint blockSize;
-            /// <summary>Buffer for MMC/SD command response</summary>
-            public byte[] buffer;
-            /// <summary>MMC/SD opcode</summary>
-            public MmcCommands command;
-            /// <summary>Flags indicating kind and place of response</summary>
-            public MmcFlags flags;
-            /// <summary><c>True</c> if command should be preceded with CMD55</summary>
-            public bool isApplication;
-            /// <summary>Response registers</summary>
-            public uint[] response;
-            /// <summary><c>True</c> if data is sent from host to card</summary>
-            public bool write;
-        }
-
-        /// <summary>
-        ///     Concatenates a queue of commands to be send to a remote SecureDigital or MultiMediaCard attached to an SDHCI
-        ///     controller
-        /// </summary>
-        /// <param name="commands">List of commands</param>
-        /// <param name="duration">Duration to execute all commands, in milliseconds</param>
-        /// <param name="sense">Set to <c>true</c> if any of the commands returned an error status, <c>false</c> otherwise</param>
-        /// <param name="timeout">Maximum allowed time to execute a single command</param>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        public int SendMultipleMmcCommands(MmcSingleCommand[] commands, out double duration, out bool sense,
-                                           uint timeout = 15)
-        {
-            // We need a timeout
-            if(timeout == 0)
-                timeout = Timeout > 0 ? Timeout : 15;
-
-            if(_remote is null)
-                return Command.SendMultipleMmcCommands(PlatformId, FileHandle, commands, out duration, out sense,
-                                                       timeout);
-
-            if(_remote.ServerProtocolVersion >= 2)
-                return _remote.SendMultipleMmcCommands(commands, out duration, out sense, timeout);
-
-            int error = 0;
-            duration = 0;
-            sense    = false;
-
-            foreach(MmcSingleCommand command in commands)
+            case MmcCommands.SendCsd when _cachedCid != null:
             {
-                int singleError = _remote.SendMmcCommand(command.command, command.write, command.isApplication,
-                                                         command.flags, command.argument, command.blockSize,
-                                                         command.blocks, ref command.buffer, out command.response,
-                                                         out double cmdDuration, out bool cmdSense, timeout);
+                DateTime start = DateTime.Now;
+                buffer = new byte[_cachedCsd.Length];
+                Array.Copy(_cachedCsd, buffer, buffer.Length);
+                response = new uint[4];
+                sense    = false;
+                DateTime end = DateTime.Now;
+                duration = (end - start).TotalMilliseconds;
 
-                if(error       == 0 &&
-                   singleError != 0)
-                    error = singleError;
-
-                duration += cmdDuration;
-
-                if(cmdSense)
-                    sense = true;
+                return 0;
             }
+            case (MmcCommands)SecureDigitalCommands.SendScr when _cachedScr != null:
+            {
+                DateTime start = DateTime.Now;
+                buffer = new byte[_cachedScr.Length];
+                Array.Copy(_cachedScr, buffer, buffer.Length);
+                response = new uint[4];
+                sense    = false;
+                DateTime end = DateTime.Now;
+                duration = (end - start).TotalMilliseconds;
 
-            return error;
+                return 0;
+            }
+            case (MmcCommands)SecureDigitalCommands.SendOperatingCondition when _cachedOcr != null:
+            case MmcCommands.SendOpCond when _cachedOcr                                    != null:
+            {
+                DateTime start = DateTime.Now;
+                buffer = new byte[_cachedOcr.Length];
+                Array.Copy(_cachedOcr, buffer, buffer.Length);
+                response = new uint[4];
+                sense    = false;
+                DateTime end = DateTime.Now;
+                duration = (end - start).TotalMilliseconds;
+
+                return 0;
+            }
         }
 
-        /// <summary>Closes then immediately reopens a device</summary>
-        /// <returns>Returned error number if any</returns>
-        public bool ReOpen()
+        return _remote is null
+                   ? Command.SendMmcCommand(PlatformId, FileHandle, command, write, isApplication, flags, argument,
+                                            blockSize, blocks, ref buffer, out response, out duration, out sense,
+                                            timeout) : _remote.SendMmcCommand(command, write, isApplication, flags,
+                                                                              argument, blockSize, blocks, ref buffer, out response, out duration, out sense,
+                                                                              timeout);
+    }
+
+    /// <summary>Encapsulates a single MMC command to send in a queue</summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "MemberCanBeInternal")]
+    public class MmcSingleCommand
+    {
+        /// <summary>Command argument</summary>
+        public uint argument;
+        /// <summary>How many blocks to transfer</summary>
+        public uint blocks;
+        /// <summary>Size of block in bytes</summary>
+        public uint blockSize;
+        /// <summary>Buffer for MMC/SD command response</summary>
+        public byte[] buffer;
+        /// <summary>MMC/SD opcode</summary>
+        public MmcCommands command;
+        /// <summary>Flags indicating kind and place of response</summary>
+        public MmcFlags flags;
+        /// <summary><c>True</c> if command should be preceded with CMD55</summary>
+        public bool isApplication;
+        /// <summary>Response registers</summary>
+        public uint[] response;
+        /// <summary><c>True</c> if data is sent from host to card</summary>
+        public bool write;
+    }
+
+    /// <summary>
+    ///     Concatenates a queue of commands to be send to a remote SecureDigital or MultiMediaCard attached to an SDHCI
+    ///     controller
+    /// </summary>
+    /// <param name="commands">List of commands</param>
+    /// <param name="duration">Duration to execute all commands, in milliseconds</param>
+    /// <param name="sense">Set to <c>true</c> if any of the commands returned an error status, <c>false</c> otherwise</param>
+    /// <param name="timeout">Maximum allowed time to execute a single command</param>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    public int SendMultipleMmcCommands(MmcSingleCommand[] commands, out double duration, out bool sense,
+                                       uint timeout = 15)
+    {
+        // We need a timeout
+        if(timeout == 0)
+            timeout = Timeout > 0 ? Timeout : 15;
+
+        if(_remote is null)
+            return Command.SendMultipleMmcCommands(PlatformId, FileHandle, commands, out duration, out sense,
+                                                   timeout);
+
+        if(_remote.ServerProtocolVersion >= 2)
+            return _remote.SendMultipleMmcCommands(commands, out duration, out sense, timeout);
+
+        int error = 0;
+        duration = 0;
+        sense    = false;
+
+        foreach(MmcSingleCommand command in commands)
         {
-            if(!(_remote is null))
-                return _remote.ReOpen();
+            int singleError = _remote.SendMmcCommand(command.command, command.write, command.isApplication,
+                                                     command.flags, command.argument, command.blockSize,
+                                                     command.blocks, ref command.buffer, out command.response,
+                                                     out double cmdDuration, out bool cmdSense, timeout);
 
-            int ret = Command.ReOpen(PlatformId, _devicePath, FileHandle, out object newFileHandle);
+            if(error       == 0 &&
+               singleError != 0)
+                error = singleError;
 
-            FileHandle = newFileHandle;
+            duration += cmdDuration;
 
-            Error     = ret != 0;
-            LastError = ret;
-
-            return Error;
+            if(cmdSense)
+                sense = true;
         }
 
-        /// <summary>Reads data using operating system buffers.</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="offset">Offset in remote device to start reading, in bytes</param>
-        /// <param name="length">Number of bytes to read</param>
-        /// <param name="duration">Total time in milliseconds the reading took</param>
-        /// <returns><c>true</c> if there was an error, <c>false</c> otherwise</returns>
-        public bool BufferedOsRead(out byte[] buffer, long offset, uint length, out double duration)
-        {
-            if(!(_remote is null))
-                return _remote.BufferedOsRead(out buffer, offset, length, out duration);
+        return error;
+    }
 
-            int ret = Command.BufferedOsRead(PlatformId, FileHandle, out buffer, offset, length, out duration);
+    /// <summary>Closes then immediately reopens a device</summary>
+    /// <returns>Returned error number if any</returns>
+    public bool ReOpen()
+    {
+        if(!(_remote is null))
+            return _remote.ReOpen();
 
-            Error     = ret != 0;
-            LastError = ret;
+        int ret = Command.ReOpen(PlatformId, _devicePath, FileHandle, out object newFileHandle);
 
-            return Error;
-        }
+        FileHandle = newFileHandle;
+
+        Error     = ret != 0;
+        LastError = ret;
+
+        return Error;
+    }
+
+    /// <summary>Reads data using operating system buffers.</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="offset">Offset in remote device to start reading, in bytes</param>
+    /// <param name="length">Number of bytes to read</param>
+    /// <param name="duration">Total time in milliseconds the reading took</param>
+    /// <returns><c>true</c> if there was an error, <c>false</c> otherwise</returns>
+    public bool BufferedOsRead(out byte[] buffer, long offset, uint length, out double duration)
+    {
+        if(!(_remote is null))
+            return _remote.BufferedOsRead(out buffer, offset, length, out duration);
+
+        int ret = Command.BufferedOsRead(PlatformId, FileHandle, out buffer, offset, length, out duration);
+
+        Error     = ret != 0;
+        LastError = ret;
+
+        return Error;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/Constructor.cs b/Aaru.Devices/Device/Constructor.cs
index 1b9f75040..c812d2dbc 100644
--- a/Aaru.Devices/Device/Constructor.cs
+++ b/Aaru.Devices/Device/Constructor.cs
@@ -56,887 +56,886 @@ using Marshal = System.Runtime.InteropServices.Marshal;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 using VendorString = Aaru.Decoders.SecureDigital.VendorString;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+/// <summary>Implements a device or media containing drive</summary>
+[SuppressMessage("ReSharper", "MemberCanBePrivate.Global"), SuppressMessage("ReSharper", "UnusedMember.Global"),
+ SuppressMessage("ReSharper", "UnusedMethodReturnValue.Global")]
+public sealed partial class Device
 {
-    /// <summary>Implements a device or media containing drive</summary>
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global"), SuppressMessage("ReSharper", "UnusedMember.Global"),
-     SuppressMessage("ReSharper", "UnusedMethodReturnValue.Global")]
-    public sealed partial class Device
+    /// <summary>Opens the device for sending direct commands</summary>
+    /// <param name="devicePath">Device path</param>
+    public Device(string devicePath)
     {
-        /// <summary>Opens the device for sending direct commands</summary>
-        /// <param name="devicePath">Device path</param>
-        public Device(string devicePath)
+        PlatformId  = DetectOS.GetRealPlatformID();
+        Timeout     = 15;
+        Error       = false;
+        IsRemovable = false;
+        _devicePath = devicePath;
+
+        Uri aaruUri;
+
+        try
         {
-            PlatformId  = DetectOS.GetRealPlatformID();
-            Timeout     = 15;
-            Error       = false;
-            IsRemovable = false;
-            _devicePath = devicePath;
+            aaruUri = new Uri(devicePath);
+        }
+        catch(Exception)
+        {
+            // Ignore, treat as local path below
+            aaruUri = null;
+        }
 
-            Uri aaruUri;
+        if(aaruUri?.Scheme == "dic" ||
+           aaruUri?.Scheme == "aaru")
+        {
+            devicePath = aaruUri.AbsolutePath;
 
-            try
+            if(devicePath.StartsWith('/'))
+                devicePath = devicePath.Substring(1);
+
+            if(devicePath.StartsWith("dev", StringComparison.Ordinal))
+                devicePath = $"/{devicePath}";
+
+            _remote = new Remote.Remote(aaruUri);
+
+            Error     = !_remote.Open(devicePath, out int errno);
+            LastError = errno;
+        }
+        else
+        {
+            switch(PlatformId)
             {
-                aaruUri = new Uri(devicePath);
-            }
-            catch(Exception)
-            {
-                // Ignore, treat as local path below
-                aaruUri = null;
-            }
-
-            if(aaruUri?.Scheme == "dic" ||
-               aaruUri?.Scheme == "aaru")
-            {
-                devicePath = aaruUri.AbsolutePath;
-
-                if(devicePath.StartsWith('/'))
-                    devicePath = devicePath.Substring(1);
-
-                if(devicePath.StartsWith("dev", StringComparison.Ordinal))
-                    devicePath = $"/{devicePath}";
-
-                _remote = new Remote.Remote(aaruUri);
-
-                Error     = !_remote.Open(devicePath, out int errno);
-                LastError = errno;
-            }
-            else
-            {
-                switch(PlatformId)
+                case PlatformID.Win32NT:
                 {
-                    case PlatformID.Win32NT:
+                    FileHandle = Extern.CreateFile(devicePath, FileAccess.GenericRead | FileAccess.GenericWrite,
+                                                   FileShare.Read                     | FileShare.Write, IntPtr.Zero,
+                                                   FileMode.OpenExisting, FileAttributes.Normal, IntPtr.Zero);
+
+                    if(((SafeFileHandle)FileHandle).IsInvalid)
                     {
-                        FileHandle = Extern.CreateFile(devicePath, FileAccess.GenericRead | FileAccess.GenericWrite,
-                                                       FileShare.Read | FileShare.Write, IntPtr.Zero,
-                                                       FileMode.OpenExisting, FileAttributes.Normal, IntPtr.Zero);
-
-                        if(((SafeFileHandle)FileHandle).IsInvalid)
-                        {
-                            Error     = true;
-                            LastError = Marshal.GetLastWin32Error();
-                        }
-
-                        break;
+                        Error     = true;
+                        LastError = Marshal.GetLastWin32Error();
                     }
-                    case PlatformID.Linux:
-                    {
-                        FileHandle =
-                            Linux.Extern.open(devicePath,
-                                              FileFlags.ReadWrite | FileFlags.NonBlocking | FileFlags.CreateNew);
 
-                        if((int)FileHandle < 0)
-                        {
-                            LastError = Marshal.GetLastWin32Error();
-
-                            if(LastError == 13 ||
-                               LastError == 30) // EACCES or EROFS
-                            {
-                                FileHandle = Linux.Extern.open(devicePath, FileFlags.Readonly | FileFlags.NonBlocking);
-
-                                if((int)FileHandle < 0)
-                                {
-                                    Error     = true;
-                                    LastError = Marshal.GetLastWin32Error();
-                                }
-                            }
-                            else
-                            {
-                                Error = true;
-                            }
-
-                            LastError = Marshal.GetLastWin32Error();
-                        }
-
-                        break;
-                    }
-                    default: throw new DeviceException($"Platform {PlatformId} not supported.");
+                    break;
                 }
-            }
+                case PlatformID.Linux:
+                {
+                    FileHandle =
+                        Linux.Extern.open(devicePath,
+                                          FileFlags.ReadWrite | FileFlags.NonBlocking | FileFlags.CreateNew);
 
-            if(Error)
-                throw new DeviceException(LastError);
+                    if((int)FileHandle < 0)
+                    {
+                        LastError = Marshal.GetLastWin32Error();
 
-            // Seems ioctl(2) does not allow the atomicity needed
-            if(_remote is null)
-            {
-                if(PlatformId == PlatformID.Linux)
-                    _readMultipleBlockCannotSetBlockCount = true;
+                        if(LastError == 13 ||
+                           LastError == 30) // EACCES or EROFS
+                        {
+                            FileHandle = Linux.Extern.open(devicePath, FileFlags.Readonly | FileFlags.NonBlocking);
+
+                            if((int)FileHandle < 0)
+                            {
+                                Error     = true;
+                                LastError = Marshal.GetLastWin32Error();
+                            }
+                        }
+                        else
+                        {
+                            Error = true;
+                        }
+
+                        LastError = Marshal.GetLastWin32Error();
+                    }
+
+                    break;
+                }
+                default: throw new DeviceException($"Platform {PlatformId} not supported.");
             }
-            else if(_remote.ServerOperatingSystem == "Linux")
+        }
+
+        if(Error)
+            throw new DeviceException(LastError);
+
+        // Seems ioctl(2) does not allow the atomicity needed
+        if(_remote is null)
+        {
+            if(PlatformId == PlatformID.Linux)
                 _readMultipleBlockCannotSetBlockCount = true;
+        }
+        else if(_remote.ServerOperatingSystem == "Linux")
+            _readMultipleBlockCannotSetBlockCount = true;
 
-            Type     = DeviceType.Unknown;
-            ScsiType = PeripheralDeviceTypes.UnknownDevice;
+        Type     = DeviceType.Unknown;
+        ScsiType = PeripheralDeviceTypes.UnknownDevice;
 
-            byte[] ataBuf;
-            byte[] inqBuf = null;
+        byte[] ataBuf;
+        byte[] inqBuf = null;
 
-            if(Error)
-                throw new DeviceException(LastError);
+        if(Error)
+            throw new DeviceException(LastError);
 
-            bool scsiSense = true;
+        bool scsiSense = true;
 
-            if(_remote is null)
+        if(_remote is null)
+        {
+            // Windows is answering SCSI INQUIRY for all device types so it needs to be detected first
+            switch(PlatformId)
             {
-                // Windows is answering SCSI INQUIRY for all device types so it needs to be detected first
-                switch(PlatformId)
-                {
-                    case PlatformID.Win32NT:
-                        var query = new StoragePropertyQuery();
-                        query.PropertyId           = StoragePropertyId.Device;
-                        query.QueryType            = StorageQueryType.Standard;
-                        query.AdditionalParameters = new byte[1];
+                case PlatformID.Win32NT:
+                    var query = new StoragePropertyQuery();
+                    query.PropertyId           = StoragePropertyId.Device;
+                    query.QueryType            = StorageQueryType.Standard;
+                    query.AdditionalParameters = new byte[1];
 
-                        IntPtr descriptorPtr = Marshal.AllocHGlobal(1000);
-                        byte[] descriptorB   = new byte[1000];
+                    IntPtr descriptorPtr = Marshal.AllocHGlobal(1000);
+                    byte[] descriptorB   = new byte[1000];
 
-                        uint returned = 0;
-                        int  error    = 0;
+                    uint returned = 0;
+                    int  error    = 0;
 
-                        bool hasError = !Extern.DeviceIoControlStorageQuery((SafeFileHandle)FileHandle,
-                                                                            WindowsIoctl.IoctlStorageQueryProperty,
-                                                                            ref query, (uint)Marshal.SizeOf(query),
-                                                                            descriptorPtr, 1000, ref returned,
-                                                                            IntPtr.Zero);
+                    bool hasError = !Extern.DeviceIoControlStorageQuery((SafeFileHandle)FileHandle,
+                                                                        WindowsIoctl.IoctlStorageQueryProperty,
+                                                                        ref query, (uint)Marshal.SizeOf(query),
+                                                                        descriptorPtr, 1000, ref returned,
+                                                                        IntPtr.Zero);
 
-                        if(hasError)
-                            error = Marshal.GetLastWin32Error();
+                    if(hasError)
+                        error = Marshal.GetLastWin32Error();
 
-                        Marshal.Copy(descriptorPtr, descriptorB, 0, 1000);
+                    Marshal.Copy(descriptorPtr, descriptorB, 0, 1000);
 
-                        if(!hasError &&
-                           error == 0)
+                    if(!hasError &&
+                       error == 0)
+                    {
+                        var descriptor = new StorageDeviceDescriptor
                         {
-                            var descriptor = new StorageDeviceDescriptor
-                            {
-                                Version               = BitConverter.ToUInt32(descriptorB, 0),
-                                Size                  = BitConverter.ToUInt32(descriptorB, 4),
-                                DeviceType            = descriptorB[8],
-                                DeviceTypeModifier    = descriptorB[9],
-                                RemovableMedia        = descriptorB[10] > 0,
-                                CommandQueueing       = descriptorB[11] > 0,
-                                VendorIdOffset        = BitConverter.ToInt32(descriptorB, 12),
-                                ProductIdOffset       = BitConverter.ToInt32(descriptorB, 16),
-                                ProductRevisionOffset = BitConverter.ToInt32(descriptorB, 20),
-                                SerialNumberOffset    = BitConverter.ToInt32(descriptorB, 24),
-                                BusType               = (StorageBusType)BitConverter.ToUInt32(descriptorB, 28),
-                                RawPropertiesLength   = BitConverter.ToUInt32(descriptorB, 32)
-                            };
+                            Version               = BitConverter.ToUInt32(descriptorB, 0),
+                            Size                  = BitConverter.ToUInt32(descriptorB, 4),
+                            DeviceType            = descriptorB[8],
+                            DeviceTypeModifier    = descriptorB[9],
+                            RemovableMedia        = descriptorB[10] > 0,
+                            CommandQueueing       = descriptorB[11] > 0,
+                            VendorIdOffset        = BitConverter.ToInt32(descriptorB, 12),
+                            ProductIdOffset       = BitConverter.ToInt32(descriptorB, 16),
+                            ProductRevisionOffset = BitConverter.ToInt32(descriptorB, 20),
+                            SerialNumberOffset    = BitConverter.ToInt32(descriptorB, 24),
+                            BusType               = (StorageBusType)BitConverter.ToUInt32(descriptorB, 28),
+                            RawPropertiesLength   = BitConverter.ToUInt32(descriptorB, 32)
+                        };
 
-                            descriptor.RawDeviceProperties = new byte[descriptor.RawPropertiesLength];
+                        descriptor.RawDeviceProperties = new byte[descriptor.RawPropertiesLength];
 
-                            Array.Copy(descriptorB, 36, descriptor.RawDeviceProperties, 0,
-                                       descriptor.RawPropertiesLength);
+                        Array.Copy(descriptorB, 36, descriptor.RawDeviceProperties, 0,
+                                   descriptor.RawPropertiesLength);
 
-                            switch(descriptor.BusType)
-                            {
-                                case StorageBusType.SCSI:
-                                case StorageBusType.SSA:
-                                case StorageBusType.Fibre:
-                                case StorageBusType.iSCSI:
-                                case StorageBusType.SAS:
-                                    Type = DeviceType.SCSI;
-
-                                    break;
-                                case StorageBusType.FireWire:
-                                    IsFireWire = true;
-                                    Type       = DeviceType.SCSI;
-
-                                    break;
-                                case StorageBusType.USB:
-                                    IsUsb = true;
-                                    Type  = DeviceType.SCSI;
-
-                                    break;
-                                case StorageBusType.ATAPI:
-                                    Type = DeviceType.ATAPI;
-
-                                    break;
-                                case StorageBusType.ATA:
-                                case StorageBusType.SATA:
-                                    Type = DeviceType.ATA;
-
-                                    break;
-                                case StorageBusType.MultiMediaCard:
-                                    Type = DeviceType.MMC;
-
-                                    break;
-                                case StorageBusType.SecureDigital:
-                                    Type = DeviceType.SecureDigital;
-
-                                    break;
-                                case StorageBusType.NVMe:
-                                    Type = DeviceType.NVMe;
-
-                                    break;
-                            }
-
-                            switch(Type)
-                            {
-                                case DeviceType.SCSI:
-                                case DeviceType.ATAPI:
-                                    scsiSense = ScsiInquiry(out inqBuf, out _);
-
-                                    break;
-                                case DeviceType.ATA:
-                                    bool atapiSense = AtapiIdentify(out ataBuf, out _);
-
-                                    if(!atapiSense)
-                                    {
-                                        Type = DeviceType.ATAPI;
-                                        Identify.IdentifyDevice? ataid = Identify.Decode(ataBuf);
-
-                                        if(ataid.HasValue)
-                                            scsiSense = ScsiInquiry(out inqBuf, out _);
-                                    }
-                                    else
-                                    {
-                                        Manufacturer = "ATA";
-                                    }
-
-                                    break;
-                            }
-                        }
-
-                        Marshal.FreeHGlobal(descriptorPtr);
-
-                        if(Windows.Command.IsSdhci((SafeFileHandle)FileHandle))
+                        switch(descriptor.BusType)
                         {
-                            byte[] sdBuffer = new byte[16];
+                            case StorageBusType.SCSI:
+                            case StorageBusType.SSA:
+                            case StorageBusType.Fibre:
+                            case StorageBusType.iSCSI:
+                            case StorageBusType.SAS:
+                                Type = DeviceType.SCSI;
 
-                            LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, MmcCommands.SendCsd,
-                                                                       false, false,
-                                                                       MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 |
-                                                                       MmcFlags.CommandAc, 0, 16, 1, ref sdBuffer,
-                                                                       out _, out _, out bool sense);
+                                break;
+                            case StorageBusType.FireWire:
+                                IsFireWire = true;
+                                Type       = DeviceType.SCSI;
 
-                            if(!sense)
-                            {
-                                _cachedCsd = new byte[16];
-                                Array.Copy(sdBuffer, 0, _cachedCsd, 0, 16);
-                            }
+                                break;
+                            case StorageBusType.USB:
+                                IsUsb = true;
+                                Type  = DeviceType.SCSI;
 
-                            sdBuffer = new byte[16];
+                                break;
+                            case StorageBusType.ATAPI:
+                                Type = DeviceType.ATAPI;
 
-                            LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, MmcCommands.SendCid,
-                                                                       false, false,
-                                                                       MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 |
-                                                                       MmcFlags.CommandAc, 0, 16, 1, ref sdBuffer,
-                                                                       out _, out _, out sense);
+                                break;
+                            case StorageBusType.ATA:
+                            case StorageBusType.SATA:
+                                Type = DeviceType.ATA;
 
-                            if(!sense)
-                            {
-                                _cachedCid = new byte[16];
-                                Array.Copy(sdBuffer, 0, _cachedCid, 0, 16);
-                            }
+                                break;
+                            case StorageBusType.MultiMediaCard:
+                                Type = DeviceType.MMC;
 
-                            sdBuffer = new byte[8];
+                                break;
+                            case StorageBusType.SecureDigital:
+                                Type = DeviceType.SecureDigital;
 
-                            LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle,
-                                                                       (MmcCommands)SecureDigitalCommands.SendScr,
-                                                                       false, true,
-                                                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 |
-                                                                       MmcFlags.CommandAdtc, 0, 8, 1, ref sdBuffer,
-                                                                       out _, out _, out sense);
+                                break;
+                            case StorageBusType.NVMe:
+                                Type = DeviceType.NVMe;
 
-                            if(!sense)
-                            {
-                                _cachedScr = new byte[8];
-                                Array.Copy(sdBuffer, 0, _cachedScr, 0, 8);
-                            }
-
-                            sdBuffer = new byte[4];
-
-                            LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle,
-                                                                       _cachedScr != null
-                                                                           ? (MmcCommands)SecureDigitalCommands.
-                                                                               SendOperatingCondition
-                                                                           : MmcCommands.SendOpCond, false, true,
-                                                                       MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 |
-                                                                       MmcFlags.CommandBcr, 0, 4, 1, ref sdBuffer,
-                                                                       out _, out _, out sense);
-
-                            if(!sense)
-                            {
-                                _cachedScr = new byte[4];
-                                Array.Copy(sdBuffer, 0, _cachedScr, 0, 4);
-                            }
-                        }
-
-                        break;
-                    case PlatformID.Linux:
-                        if(devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
-                           devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
-                           devicePath.StartsWith("/dev/st", StringComparison.Ordinal) ||
-                           devicePath.StartsWith("/dev/sg", StringComparison.Ordinal))
-                        {
-                            scsiSense = ScsiInquiry(out inqBuf, out _);
-                        }
-
-                        // MultiMediaCard and SecureDigital go here
-                        else if(devicePath.StartsWith("/dev/mmcblk", StringComparison.Ordinal))
-                        {
-                            string devPath = devicePath.Substring(5);
-
-                            if(File.Exists("/sys/block/" + devPath + "/device/csd"))
-                            {
-                                int len = ConvertFromFileHexAscii("/sys/block/" + devPath + "/device/csd",
-                                                                  out _cachedCsd);
-
-                                if(len == 0)
-                                    _cachedCsd = null;
-                            }
-
-                            if(File.Exists("/sys/block/" + devPath + "/device/cid"))
-                            {
-                                int len = ConvertFromFileHexAscii("/sys/block/" + devPath + "/device/cid",
-                                                                  out _cachedCid);
-
-                                if(len == 0)
-                                    _cachedCid = null;
-                            }
-
-                            if(File.Exists("/sys/block/" + devPath + "/device/scr"))
-                            {
-                                int len = ConvertFromFileHexAscii("/sys/block/" + devPath + "/device/scr",
-                                                                  out _cachedScr);
-
-                                if(len == 0)
-                                    _cachedScr = null;
-                            }
-
-                            if(File.Exists("/sys/block/" + devPath + "/device/ocr"))
-                            {
-                                int len = ConvertFromFileHexAscii("/sys/block/" + devPath + "/device/ocr",
-                                                                  out _cachedOcr);
-
-                                if(len == 0)
-                                    _cachedOcr = null;
-                            }
-                        }
-
-                        break;
-                    default:
-                        scsiSense = ScsiInquiry(out inqBuf, out _);
-
-                        break;
-                }
-            }
-            else
-            {
-                Type = _remote.GetDeviceType();
-
-                switch(Type)
-                {
-                    case DeviceType.ATAPI:
-                    case DeviceType.SCSI:
-                        scsiSense = ScsiInquiry(out inqBuf, out _);
-
-                        break;
-                    case DeviceType.SecureDigital:
-                    case DeviceType.MMC:
-                        if(!_remote.GetSdhciRegisters(out _cachedCsd, out _cachedCid, out _cachedOcr, out _cachedScr))
-                        {
-                            Type     = DeviceType.SCSI;
-                            ScsiType = PeripheralDeviceTypes.DirectAccess;
-                        }
-
-                        break;
-                }
-            }
-
-            #region SecureDigital / MultiMediaCard
-            if(_cachedCid != null)
-            {
-                ScsiType    = PeripheralDeviceTypes.DirectAccess;
-                IsRemovable = false;
-
-                if(_cachedScr != null)
-                {
-                    Type = DeviceType.SecureDigital;
-                    CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(_cachedCid);
-                    Manufacturer = VendorString.Prettify(decoded.Manufacturer);
-                    Model        = decoded.ProductName;
-
-                    FirmwareRevision =
-                        $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
-
-                    Serial = $"{decoded.ProductSerialNumber}";
-                }
-                else
-                {
-                    Type = DeviceType.MMC;
-                    Decoders.MMC.CID decoded = Decoders.MMC.Decoders.DecodeCID(_cachedCid);
-                    Manufacturer = Decoders.MMC.VendorString.Prettify(decoded.Manufacturer);
-                    Model        = decoded.ProductName;
-
-                    FirmwareRevision =
-                        $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
-
-                    Serial = $"{decoded.ProductSerialNumber}";
-                }
-
-                return;
-            }
-            #endregion SecureDigital / MultiMediaCard
-
-            #region USB
-            if(_remote is null)
-            {
-                switch(PlatformId)
-                {
-                    case PlatformID.Linux:
-                        if(devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
-                           devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
-                           devicePath.StartsWith("/dev/st", StringComparison.Ordinal))
-                        {
-                            string devPath = devicePath.Substring(5);
-
-                            if(Directory.Exists("/sys/block/" + devPath))
-                            {
-                                string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
-
-                                if(!string.IsNullOrEmpty(resolvedLink))
-                                {
-                                    resolvedLink = "/sys" + resolvedLink.Substring(2);
-
-                                    while(resolvedLink.Contains("usb"))
-                                    {
-                                        resolvedLink = Path.GetDirectoryName(resolvedLink);
-
-                                        if(!File.Exists(resolvedLink + "/descriptors") ||
-                                           !File.Exists(resolvedLink + "/idProduct")   ||
-                                           !File.Exists(resolvedLink + "/idVendor"))
-                                            continue;
-
-                                        var usbFs = new FileStream(resolvedLink + "/descriptors",
-                                                                   System.IO.FileMode.Open, System.IO.FileAccess.Read);
-
-                                        byte[] usbBuf   = new byte[65536];
-                                        int    usbCount = usbFs.Read(usbBuf, 0, 65536);
-                                        UsbDescriptors = new byte[usbCount];
-                                        Array.Copy(usbBuf, 0, UsbDescriptors, 0, usbCount);
-                                        usbFs.Close();
-
-                                        var    usbSr   = new StreamReader(resolvedLink + "/idProduct");
-                                        string usbTemp = usbSr.ReadToEnd();
-
-                                        ushort.TryParse(usbTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                                                        out _usbProduct);
-
-                                        usbSr.Close();
-
-                                        usbSr   = new StreamReader(resolvedLink + "/idVendor");
-                                        usbTemp = usbSr.ReadToEnd();
-
-                                        ushort.TryParse(usbTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                                                        out _usbVendor);
-
-                                        usbSr.Close();
-
-                                        if(File.Exists(resolvedLink + "/manufacturer"))
-                                        {
-                                            usbSr                 = new StreamReader(resolvedLink + "/manufacturer");
-                                            UsbManufacturerString = usbSr.ReadToEnd().Trim();
-                                            usbSr.Close();
-                                        }
-
-                                        if(File.Exists(resolvedLink + "/product"))
-                                        {
-                                            usbSr            = new StreamReader(resolvedLink + "/product");
-                                            UsbProductString = usbSr.ReadToEnd().Trim();
-                                            usbSr.Close();
-                                        }
-
-                                        if(File.Exists(resolvedLink + "/serial"))
-                                        {
-                                            usbSr           = new StreamReader(resolvedLink + "/serial");
-                                            UsbSerialString = usbSr.ReadToEnd().Trim();
-                                            usbSr.Close();
-                                        }
-
-                                        IsUsb = true;
-
-                                        break;
-                                    }
-                                }
-                            }
-                        }
-
-                        break;
-                    case PlatformID.Win32NT:
-                        Usb.UsbDevice usbDevice = null;
-
-                        // I have to search for USB disks, floppies and CD-ROMs as separate device types
-                        foreach(string devGuid in new[]
-                        {
-                            Usb.GuidDevinterfaceFloppy, Usb.GuidDevinterfaceCdrom, Usb.GuidDevinterfaceDisk,
-                            Usb.GuidDevinterfaceTape
-                        })
-                        {
-                            usbDevice = Usb.FindDrivePath(devicePath, devGuid);
-
-                            if(usbDevice != null)
                                 break;
                         }
 
-                        if(usbDevice != null)
+                        switch(Type)
                         {
-                            UsbDescriptors        = usbDevice.BinaryDescriptors;
-                            _usbVendor            = (ushort)usbDevice.DeviceDescriptor.idVendor;
-                            _usbProduct           = (ushort)usbDevice.DeviceDescriptor.idProduct;
-                            UsbManufacturerString = usbDevice.Manufacturer;
-                            UsbProductString      = usbDevice.Product;
+                            case DeviceType.SCSI:
+                            case DeviceType.ATAPI:
+                                scsiSense = ScsiInquiry(out inqBuf, out _);
 
-                            UsbSerialString =
-                                usbDevice.
-                                    SerialNumber; // This is incorrect filled by Windows with SCSI/ATA serial number
+                                break;
+                            case DeviceType.ATA:
+                                bool atapiSense = AtapiIdentify(out ataBuf, out _);
+
+                                if(!atapiSense)
+                                {
+                                    Type = DeviceType.ATAPI;
+                                    Identify.IdentifyDevice? ataid = Identify.Decode(ataBuf);
+
+                                    if(ataid.HasValue)
+                                        scsiSense = ScsiInquiry(out inqBuf, out _);
+                                }
+                                else
+                                {
+                                    Manufacturer = "ATA";
+                                }
+
+                                break;
+                        }
+                    }
+
+                    Marshal.FreeHGlobal(descriptorPtr);
+
+                    if(Windows.Command.IsSdhci((SafeFileHandle)FileHandle))
+                    {
+                        byte[] sdBuffer = new byte[16];
+
+                        LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, MmcCommands.SendCsd,
+                                                                   false, false,
+                                                                   MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 |
+                                                                   MmcFlags.CommandAc, 0, 16, 1, ref sdBuffer,
+                                                                   out _, out _, out bool sense);
+
+                        if(!sense)
+                        {
+                            _cachedCsd = new byte[16];
+                            Array.Copy(sdBuffer, 0, _cachedCsd, 0, 16);
                         }
 
-                        break;
-                    default:
-                        IsUsb = false;
+                        sdBuffer = new byte[16];
 
-                        break;
-                }
-            }
-            else
-            {
-                if(_remote.GetUsbData(out byte[] remoteUsbDescriptors, out ushort remoteUsbVendor,
-                                      out ushort remoteUsbProduct, out string remoteUsbManufacturer,
-                                      out string remoteUsbProductString, out string remoteUsbSerial))
-                {
-                    IsUsb                 = true;
-                    UsbDescriptors        = remoteUsbDescriptors;
-                    _usbVendor            = remoteUsbVendor;
-                    _usbProduct           = remoteUsbProduct;
-                    UsbManufacturerString = remoteUsbManufacturer;
-                    UsbProductString      = remoteUsbProductString;
-                    UsbSerialString       = remoteUsbSerial;
-                }
-            }
-            #endregion USB
+                        LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle, MmcCommands.SendCid,
+                                                                   false, false,
+                                                                   MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 |
+                                                                   MmcFlags.CommandAc, 0, 16, 1, ref sdBuffer,
+                                                                   out _, out _, out sense);
 
-            #region FireWire
-            if(!(_remote is null))
-            {
-                if(_remote.GetFireWireData(out _firewireVendor, out _firewireModel, out _firewireGuid,
-                                           out string remoteFireWireVendorName, out string remoteFireWireModelName))
-                {
-                    IsFireWire         = true;
-                    FireWireVendorName = remoteFireWireVendorName;
-                    FireWireModelName  = remoteFireWireModelName;
-                }
-            }
-            else
-            {
-                if(PlatformId == PlatformID.Linux)
-                {
+                        if(!sense)
+                        {
+                            _cachedCid = new byte[16];
+                            Array.Copy(sdBuffer, 0, _cachedCid, 0, 16);
+                        }
+
+                        sdBuffer = new byte[8];
+
+                        LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle,
+                                                                   (MmcCommands)SecureDigitalCommands.SendScr,
+                                                                   false, true,
+                                                                   MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 |
+                                                                   MmcFlags.CommandAdtc, 0, 8, 1, ref sdBuffer,
+                                                                   out _, out _, out sense);
+
+                        if(!sense)
+                        {
+                            _cachedScr = new byte[8];
+                            Array.Copy(sdBuffer, 0, _cachedScr, 0, 8);
+                        }
+
+                        sdBuffer = new byte[4];
+
+                        LastError = Windows.Command.SendMmcCommand((SafeFileHandle)FileHandle,
+                                                                   _cachedScr != null
+                                                                       ? (MmcCommands)SecureDigitalCommands.
+                                                                           SendOperatingCondition
+                                                                       : MmcCommands.SendOpCond, false, true,
+                                                                   MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 |
+                                                                   MmcFlags.CommandBcr, 0, 4, 1, ref sdBuffer,
+                                                                   out _, out _, out sense);
+
+                        if(!sense)
+                        {
+                            _cachedScr = new byte[4];
+                            Array.Copy(sdBuffer, 0, _cachedScr, 0, 4);
+                        }
+                    }
+
+                    break;
+                case PlatformID.Linux:
                     if(devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
                        devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
-                       devicePath.StartsWith("/dev/st", StringComparison.Ordinal))
+                       devicePath.StartsWith("/dev/st", StringComparison.Ordinal) ||
+                       devicePath.StartsWith("/dev/sg", StringComparison.Ordinal))
+                    {
+                        scsiSense = ScsiInquiry(out inqBuf, out _);
+                    }
+
+                    // MultiMediaCard and SecureDigital go here
+                    else if(devicePath.StartsWith("/dev/mmcblk", StringComparison.Ordinal))
                     {
                         string devPath = devicePath.Substring(5);
 
-                        if(Directory.Exists("/sys/block/" + devPath))
+                        if(File.Exists("/sys/block/" + devPath + "/device/csd"))
                         {
-                            string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
-                            resolvedLink = "/sys" + resolvedLink.Substring(2);
+                            int len = ConvertFromFileHexAscii("/sys/block/" + devPath + "/device/csd",
+                                                              out _cachedCsd);
 
-                            if(!string.IsNullOrEmpty(resolvedLink))
-                                while(resolvedLink.Contains("firewire"))
-                                {
-                                    resolvedLink = Path.GetDirectoryName(resolvedLink);
+                            if(len == 0)
+                                _cachedCsd = null;
+                        }
 
-                                    if(!File.Exists(resolvedLink + "/model")  ||
-                                       !File.Exists(resolvedLink + "/vendor") ||
-                                       !File.Exists(resolvedLink + "/guid"))
-                                        continue;
+                        if(File.Exists("/sys/block/" + devPath + "/device/cid"))
+                        {
+                            int len = ConvertFromFileHexAscii("/sys/block/" + devPath + "/device/cid",
+                                                              out _cachedCid);
 
-                                    var    fwSr   = new StreamReader(resolvedLink + "/model");
-                                    string fwTemp = fwSr.ReadToEnd();
+                            if(len == 0)
+                                _cachedCid = null;
+                        }
 
-                                    uint.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                                                  out _firewireModel);
+                        if(File.Exists("/sys/block/" + devPath + "/device/scr"))
+                        {
+                            int len = ConvertFromFileHexAscii("/sys/block/" + devPath + "/device/scr",
+                                                              out _cachedScr);
 
-                                    fwSr.Close();
+                            if(len == 0)
+                                _cachedScr = null;
+                        }
 
-                                    fwSr   = new StreamReader(resolvedLink + "/vendor");
-                                    fwTemp = fwSr.ReadToEnd();
+                        if(File.Exists("/sys/block/" + devPath + "/device/ocr"))
+                        {
+                            int len = ConvertFromFileHexAscii("/sys/block/" + devPath + "/device/ocr",
+                                                              out _cachedOcr);
 
-                                    uint.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                                                  out _firewireVendor);
-
-                                    fwSr.Close();
-
-                                    fwSr   = new StreamReader(resolvedLink + "/guid");
-                                    fwTemp = fwSr.ReadToEnd();
-
-                                    ulong.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
-                                                   out _firewireGuid);
-
-                                    fwSr.Close();
-
-                                    if(File.Exists(resolvedLink + "/model_name"))
-                                    {
-                                        fwSr              = new StreamReader(resolvedLink + "/model_name");
-                                        FireWireModelName = fwSr.ReadToEnd().Trim();
-                                        fwSr.Close();
-                                    }
-
-                                    if(File.Exists(resolvedLink + "/vendor_name"))
-                                    {
-                                        fwSr               = new StreamReader(resolvedLink + "/vendor_name");
-                                        FireWireVendorName = fwSr.ReadToEnd().Trim();
-                                        fwSr.Close();
-                                    }
-
-                                    IsFireWire = true;
-
-                                    break;
-                                }
+                            if(len == 0)
+                                _cachedOcr = null;
                         }
                     }
-                }
 
-                // TODO: Implement for other operating systems
-                else
-                {
-                    IsFireWire = false;
-                }
+                    break;
+                default:
+                    scsiSense = ScsiInquiry(out inqBuf, out _);
+
+                    break;
             }
-            #endregion FireWire
-
-            #region PCMCIA
-            if(_remote is null)
-            {
-                if(PlatformId == PlatformID.Linux)
-                {
-                    if(devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
-                       devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
-                       devicePath.StartsWith("/dev/st", StringComparison.Ordinal))
-                    {
-                        string devPath = devicePath.Substring(5);
-
-                        if(Directory.Exists("/sys/block/" + devPath))
-                        {
-                            string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
-                            resolvedLink = "/sys" + resolvedLink.Substring(2);
-
-                            if(!string.IsNullOrEmpty(resolvedLink))
-                                while(resolvedLink.Contains("/sys/devices"))
-                                {
-                                    resolvedLink = Path.GetDirectoryName(resolvedLink);
-
-                                    if(!Directory.Exists(resolvedLink + "/pcmcia_socket"))
-                                        continue;
-
-                                    string[] subdirs = Directory.GetDirectories(resolvedLink + "/pcmcia_socket",
-                                                                                    "pcmcia_socket*",
-                                                                                    SearchOption.TopDirectoryOnly);
-
-                                    if(subdirs.Length <= 0)
-                                        continue;
-
-                                    string possibleDir = Path.Combine(resolvedLink, "pcmcia_socket", subdirs[0]);
-
-                                    if(!File.Exists(possibleDir + "/card_type") ||
-                                       !File.Exists(possibleDir + "/cis"))
-                                        continue;
-
-                                    var cisFs = new FileStream(possibleDir + "/cis", System.IO.FileMode.Open,
-                                                               System.IO.FileAccess.Read);
-
-                                    byte[] cisBuf   = new byte[65536];
-                                    int    cisCount = cisFs.Read(cisBuf, 0, 65536);
-                                    Cis = new byte[cisCount];
-                                    Array.Copy(cisBuf, 0, Cis, 0, cisCount);
-                                    cisFs.Close();
-
-                                    IsPcmcia = true;
-
-                                    break;
-                                }
-                        }
-                    }
-                }
-
-                // TODO: Implement for other operating systems
-                else
-                {
-                    IsPcmcia = false;
-                }
-            }
-            else
-            {
-                if(_remote.GetPcmciaData(out byte[] cisBuf))
-                {
-                    IsPcmcia = true;
-                    Cis      = cisBuf;
-                }
-            }
-            #endregion PCMCIA
-
-            if(!scsiSense)
-            {
-                Inquiry? inquiry = Inquiry.Decode(inqBuf);
-
-                Type = DeviceType.SCSI;
-                bool serialSense = ScsiInquiry(out inqBuf, out _, 0x80);
-
-                if(!serialSense)
-                    Serial = EVPD.DecodePage80(inqBuf);
-
-                if(inquiry.HasValue)
-                {
-                    string tmp = StringHandlers.CToString(inquiry.Value.ProductRevisionLevel);
-
-                    if(tmp != null)
-                        FirmwareRevision = tmp.Trim();
-
-                    tmp = StringHandlers.CToString(inquiry.Value.ProductIdentification);
-
-                    if(tmp != null)
-                        Model = tmp.Trim();
-
-                    tmp = StringHandlers.CToString(inquiry.Value.VendorIdentification);
-
-                    if(tmp != null)
-                        Manufacturer = tmp.Trim();
-
-                    IsRemovable = inquiry.Value.RMB;
-
-                    ScsiType = (PeripheralDeviceTypes)inquiry.Value.PeripheralDeviceType;
-                }
-
-                bool atapiSense = AtapiIdentify(out ataBuf, out _);
-
-                if(!atapiSense)
-                {
-                    Type = DeviceType.ATAPI;
-                    Identify.IdentifyDevice? ataId = Identify.Decode(ataBuf);
-
-                    if(ataId.HasValue)
-                        Serial = ataId.Value.SerialNumber;
-                }
-
-                LastError = 0;
-                Error     = false;
-            }
-
-            if((scsiSense && !(IsUsb || IsFireWire)) ||
-               Manufacturer == "ATA")
-            {
-                bool ataSense = AtaIdentify(out ataBuf, out _);
-
-                if(!ataSense)
-                {
-                    Type = DeviceType.ATA;
-                    Identify.IdentifyDevice? ataid = Identify.Decode(ataBuf);
-
-                    if(ataid.HasValue)
-                    {
-                        string[] separated = ataid.Value.Model.Split(' ');
-
-                        if(separated.Length == 1)
-                        {
-                            Model = separated[0];
-                        }
-                        else
-                        {
-                            Manufacturer = separated[0];
-                            Model        = separated[^1];
-                        }
-
-                        FirmwareRevision = ataid.Value.FirmwareRevision;
-                        Serial           = ataid.Value.SerialNumber;
-
-                        ScsiType = PeripheralDeviceTypes.DirectAccess;
-
-                        if((ushort)ataid.Value.GeneralConfiguration != 0x848A)
-                            IsRemovable |=
-                                (ataid.Value.GeneralConfiguration & Identify.GeneralConfigurationBit.Removable) ==
-                                Identify.GeneralConfigurationBit.Removable;
-                        else
-                            IsCompactFlash = true;
-                    }
-                }
-            }
-
-            if(Type == DeviceType.Unknown)
-            {
-                Manufacturer     = null;
-                Model            = null;
-                FirmwareRevision = null;
-                Serial           = null;
-            }
-
-            if(IsUsb)
-            {
-                if(string.IsNullOrEmpty(Manufacturer))
-                    Manufacturer = UsbManufacturerString;
-
-                if(string.IsNullOrEmpty(Model))
-                    Model = UsbProductString;
-
-                if(string.IsNullOrEmpty(Serial))
-                    Serial = UsbSerialString;
-                else
-                    foreach(char c in Serial.Where(c => !char.IsControl(c)))
-                        Serial = $"{Serial}{(uint)c:X2}";
-            }
-
-            if(IsFireWire)
-            {
-                if(string.IsNullOrEmpty(Manufacturer))
-                    Manufacturer = FireWireVendorName;
-
-                if(string.IsNullOrEmpty(Model))
-                    Model = FireWireModelName;
-
-                if(string.IsNullOrEmpty(Serial))
-                    Serial = $"{_firewireGuid:X16}";
-                else
-                    foreach(char c in Serial.Where(c => !char.IsControl(c)))
-                        Serial = $"{Serial}{(uint)c:X2}";
-            }
-
-            // Some optical drives are not getting the correct serial, and IDENTIFY PACKET DEVICE is blocked without
-            // administrator privileges
-            if(ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
-                return;
-
-            bool featureSense = GetConfiguration(out byte[] featureBuffer, out _, 0x0108, MmcGetConfigurationRt.Single,
-                                                 Timeout, out _);
-
-            if(featureSense)
-                return;
-
-            Features.SeparatedFeatures features = Features.Separate(featureBuffer);
-
-            if(features.Descriptors?.Length != 1 ||
-               features.Descriptors[0].Code != 0x0108)
-                return;
-
-            Feature_0108? serialFeature = Features.Decode_0108(features.Descriptors[0].Data);
-
-            if(serialFeature is null)
-                return;
-
-            Serial = serialFeature.Value.Serial;
         }
-
-        static int ConvertFromFileHexAscii(string file, out byte[] outBuf)
+        else
         {
-            var    sr  = new StreamReader(file);
-            string ins = sr.ReadToEnd().Trim();
+            Type = _remote.GetDeviceType();
 
-            int count = Helpers.Marshal.ConvertFromHexAscii(ins, out outBuf);
+            switch(Type)
+            {
+                case DeviceType.ATAPI:
+                case DeviceType.SCSI:
+                    scsiSense = ScsiInquiry(out inqBuf, out _);
 
-            sr.Close();
+                    break;
+                case DeviceType.SecureDigital:
+                case DeviceType.MMC:
+                    if(!_remote.GetSdhciRegisters(out _cachedCsd, out _cachedCid, out _cachedOcr, out _cachedScr))
+                    {
+                        Type     = DeviceType.SCSI;
+                        ScsiType = PeripheralDeviceTypes.DirectAccess;
+                    }
 
-            return count;
+                    break;
+            }
         }
+
+        #region SecureDigital / MultiMediaCard
+        if(_cachedCid != null)
+        {
+            ScsiType    = PeripheralDeviceTypes.DirectAccess;
+            IsRemovable = false;
+
+            if(_cachedScr != null)
+            {
+                Type = DeviceType.SecureDigital;
+                CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(_cachedCid);
+                Manufacturer = VendorString.Prettify(decoded.Manufacturer);
+                Model        = decoded.ProductName;
+
+                FirmwareRevision =
+                    $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
+
+                Serial = $"{decoded.ProductSerialNumber}";
+            }
+            else
+            {
+                Type = DeviceType.MMC;
+                Decoders.MMC.CID decoded = Decoders.MMC.Decoders.DecodeCID(_cachedCid);
+                Manufacturer = Decoders.MMC.VendorString.Prettify(decoded.Manufacturer);
+                Model        = decoded.ProductName;
+
+                FirmwareRevision =
+                    $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
+
+                Serial = $"{decoded.ProductSerialNumber}";
+            }
+
+            return;
+        }
+        #endregion SecureDigital / MultiMediaCard
+
+        #region USB
+        if(_remote is null)
+        {
+            switch(PlatformId)
+            {
+                case PlatformID.Linux:
+                    if(devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
+                       devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
+                       devicePath.StartsWith("/dev/st", StringComparison.Ordinal))
+                    {
+                        string devPath = devicePath.Substring(5);
+
+                        if(Directory.Exists("/sys/block/" + devPath))
+                        {
+                            string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
+
+                            if(!string.IsNullOrEmpty(resolvedLink))
+                            {
+                                resolvedLink = "/sys" + resolvedLink.Substring(2);
+
+                                while(resolvedLink.Contains("usb"))
+                                {
+                                    resolvedLink = Path.GetDirectoryName(resolvedLink);
+
+                                    if(!File.Exists(resolvedLink + "/descriptors") ||
+                                       !File.Exists(resolvedLink + "/idProduct")   ||
+                                       !File.Exists(resolvedLink + "/idVendor"))
+                                        continue;
+
+                                    var usbFs = new FileStream(resolvedLink + "/descriptors",
+                                                               System.IO.FileMode.Open, System.IO.FileAccess.Read);
+
+                                    byte[] usbBuf   = new byte[65536];
+                                    int    usbCount = usbFs.Read(usbBuf, 0, 65536);
+                                    UsbDescriptors = new byte[usbCount];
+                                    Array.Copy(usbBuf, 0, UsbDescriptors, 0, usbCount);
+                                    usbFs.Close();
+
+                                    var    usbSr   = new StreamReader(resolvedLink + "/idProduct");
+                                    string usbTemp = usbSr.ReadToEnd();
+
+                                    ushort.TryParse(usbTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
+                                                    out _usbProduct);
+
+                                    usbSr.Close();
+
+                                    usbSr   = new StreamReader(resolvedLink + "/idVendor");
+                                    usbTemp = usbSr.ReadToEnd();
+
+                                    ushort.TryParse(usbTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
+                                                    out _usbVendor);
+
+                                    usbSr.Close();
+
+                                    if(File.Exists(resolvedLink + "/manufacturer"))
+                                    {
+                                        usbSr                 = new StreamReader(resolvedLink + "/manufacturer");
+                                        UsbManufacturerString = usbSr.ReadToEnd().Trim();
+                                        usbSr.Close();
+                                    }
+
+                                    if(File.Exists(resolvedLink + "/product"))
+                                    {
+                                        usbSr            = new StreamReader(resolvedLink + "/product");
+                                        UsbProductString = usbSr.ReadToEnd().Trim();
+                                        usbSr.Close();
+                                    }
+
+                                    if(File.Exists(resolvedLink + "/serial"))
+                                    {
+                                        usbSr           = new StreamReader(resolvedLink + "/serial");
+                                        UsbSerialString = usbSr.ReadToEnd().Trim();
+                                        usbSr.Close();
+                                    }
+
+                                    IsUsb = true;
+
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    break;
+                case PlatformID.Win32NT:
+                    Usb.UsbDevice usbDevice = null;
+
+                    // I have to search for USB disks, floppies and CD-ROMs as separate device types
+                    foreach(string devGuid in new[]
+                            {
+                                Usb.GuidDevinterfaceFloppy, Usb.GuidDevinterfaceCdrom, Usb.GuidDevinterfaceDisk,
+                                Usb.GuidDevinterfaceTape
+                            })
+                    {
+                        usbDevice = Usb.FindDrivePath(devicePath, devGuid);
+
+                        if(usbDevice != null)
+                            break;
+                    }
+
+                    if(usbDevice != null)
+                    {
+                        UsbDescriptors        = usbDevice.BinaryDescriptors;
+                        _usbVendor            = (ushort)usbDevice.DeviceDescriptor.idVendor;
+                        _usbProduct           = (ushort)usbDevice.DeviceDescriptor.idProduct;
+                        UsbManufacturerString = usbDevice.Manufacturer;
+                        UsbProductString      = usbDevice.Product;
+
+                        UsbSerialString =
+                            usbDevice.
+                                SerialNumber; // This is incorrect filled by Windows with SCSI/ATA serial number
+                    }
+
+                    break;
+                default:
+                    IsUsb = false;
+
+                    break;
+            }
+        }
+        else
+        {
+            if(_remote.GetUsbData(out byte[] remoteUsbDescriptors, out ushort remoteUsbVendor,
+                                  out ushort remoteUsbProduct, out string remoteUsbManufacturer,
+                                  out string remoteUsbProductString, out string remoteUsbSerial))
+            {
+                IsUsb                 = true;
+                UsbDescriptors        = remoteUsbDescriptors;
+                _usbVendor            = remoteUsbVendor;
+                _usbProduct           = remoteUsbProduct;
+                UsbManufacturerString = remoteUsbManufacturer;
+                UsbProductString      = remoteUsbProductString;
+                UsbSerialString       = remoteUsbSerial;
+            }
+        }
+        #endregion USB
+
+        #region FireWire
+        if(!(_remote is null))
+        {
+            if(_remote.GetFireWireData(out _firewireVendor, out _firewireModel, out _firewireGuid,
+                                       out string remoteFireWireVendorName, out string remoteFireWireModelName))
+            {
+                IsFireWire         = true;
+                FireWireVendorName = remoteFireWireVendorName;
+                FireWireModelName  = remoteFireWireModelName;
+            }
+        }
+        else
+        {
+            if(PlatformId == PlatformID.Linux)
+            {
+                if(devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
+                   devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
+                   devicePath.StartsWith("/dev/st", StringComparison.Ordinal))
+                {
+                    string devPath = devicePath.Substring(5);
+
+                    if(Directory.Exists("/sys/block/" + devPath))
+                    {
+                        string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
+                        resolvedLink = "/sys" + resolvedLink.Substring(2);
+
+                        if(!string.IsNullOrEmpty(resolvedLink))
+                            while(resolvedLink.Contains("firewire"))
+                            {
+                                resolvedLink = Path.GetDirectoryName(resolvedLink);
+
+                                if(!File.Exists(resolvedLink + "/model")  ||
+                                   !File.Exists(resolvedLink + "/vendor") ||
+                                   !File.Exists(resolvedLink + "/guid"))
+                                    continue;
+
+                                var    fwSr   = new StreamReader(resolvedLink + "/model");
+                                string fwTemp = fwSr.ReadToEnd();
+
+                                uint.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
+                                              out _firewireModel);
+
+                                fwSr.Close();
+
+                                fwSr   = new StreamReader(resolvedLink + "/vendor");
+                                fwTemp = fwSr.ReadToEnd();
+
+                                uint.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
+                                              out _firewireVendor);
+
+                                fwSr.Close();
+
+                                fwSr   = new StreamReader(resolvedLink + "/guid");
+                                fwTemp = fwSr.ReadToEnd();
+
+                                ulong.TryParse(fwTemp, NumberStyles.HexNumber, CultureInfo.InvariantCulture,
+                                               out _firewireGuid);
+
+                                fwSr.Close();
+
+                                if(File.Exists(resolvedLink + "/model_name"))
+                                {
+                                    fwSr              = new StreamReader(resolvedLink + "/model_name");
+                                    FireWireModelName = fwSr.ReadToEnd().Trim();
+                                    fwSr.Close();
+                                }
+
+                                if(File.Exists(resolvedLink + "/vendor_name"))
+                                {
+                                    fwSr               = new StreamReader(resolvedLink + "/vendor_name");
+                                    FireWireVendorName = fwSr.ReadToEnd().Trim();
+                                    fwSr.Close();
+                                }
+
+                                IsFireWire = true;
+
+                                break;
+                            }
+                    }
+                }
+            }
+
+            // TODO: Implement for other operating systems
+            else
+            {
+                IsFireWire = false;
+            }
+        }
+        #endregion FireWire
+
+        #region PCMCIA
+        if(_remote is null)
+        {
+            if(PlatformId == PlatformID.Linux)
+            {
+                if(devicePath.StartsWith("/dev/sd", StringComparison.Ordinal) ||
+                   devicePath.StartsWith("/dev/sr", StringComparison.Ordinal) ||
+                   devicePath.StartsWith("/dev/st", StringComparison.Ordinal))
+                {
+                    string devPath = devicePath.Substring(5);
+
+                    if(Directory.Exists("/sys/block/" + devPath))
+                    {
+                        string resolvedLink = Linux.Command.ReadLink("/sys/block/" + devPath);
+                        resolvedLink = "/sys" + resolvedLink.Substring(2);
+
+                        if(!string.IsNullOrEmpty(resolvedLink))
+                            while(resolvedLink.Contains("/sys/devices"))
+                            {
+                                resolvedLink = Path.GetDirectoryName(resolvedLink);
+
+                                if(!Directory.Exists(resolvedLink + "/pcmcia_socket"))
+                                    continue;
+
+                                string[] subdirs = Directory.GetDirectories(resolvedLink + "/pcmcia_socket",
+                                                                            "pcmcia_socket*",
+                                                                            SearchOption.TopDirectoryOnly);
+
+                                if(subdirs.Length <= 0)
+                                    continue;
+
+                                string possibleDir = Path.Combine(resolvedLink, "pcmcia_socket", subdirs[0]);
+
+                                if(!File.Exists(possibleDir + "/card_type") ||
+                                   !File.Exists(possibleDir + "/cis"))
+                                    continue;
+
+                                var cisFs = new FileStream(possibleDir + "/cis", System.IO.FileMode.Open,
+                                                           System.IO.FileAccess.Read);
+
+                                byte[] cisBuf   = new byte[65536];
+                                int    cisCount = cisFs.Read(cisBuf, 0, 65536);
+                                Cis = new byte[cisCount];
+                                Array.Copy(cisBuf, 0, Cis, 0, cisCount);
+                                cisFs.Close();
+
+                                IsPcmcia = true;
+
+                                break;
+                            }
+                    }
+                }
+            }
+
+            // TODO: Implement for other operating systems
+            else
+            {
+                IsPcmcia = false;
+            }
+        }
+        else
+        {
+            if(_remote.GetPcmciaData(out byte[] cisBuf))
+            {
+                IsPcmcia = true;
+                Cis      = cisBuf;
+            }
+        }
+        #endregion PCMCIA
+
+        if(!scsiSense)
+        {
+            Inquiry? inquiry = Inquiry.Decode(inqBuf);
+
+            Type = DeviceType.SCSI;
+            bool serialSense = ScsiInquiry(out inqBuf, out _, 0x80);
+
+            if(!serialSense)
+                Serial = EVPD.DecodePage80(inqBuf);
+
+            if(inquiry.HasValue)
+            {
+                string tmp = StringHandlers.CToString(inquiry.Value.ProductRevisionLevel);
+
+                if(tmp != null)
+                    FirmwareRevision = tmp.Trim();
+
+                tmp = StringHandlers.CToString(inquiry.Value.ProductIdentification);
+
+                if(tmp != null)
+                    Model = tmp.Trim();
+
+                tmp = StringHandlers.CToString(inquiry.Value.VendorIdentification);
+
+                if(tmp != null)
+                    Manufacturer = tmp.Trim();
+
+                IsRemovable = inquiry.Value.RMB;
+
+                ScsiType = (PeripheralDeviceTypes)inquiry.Value.PeripheralDeviceType;
+            }
+
+            bool atapiSense = AtapiIdentify(out ataBuf, out _);
+
+            if(!atapiSense)
+            {
+                Type = DeviceType.ATAPI;
+                Identify.IdentifyDevice? ataId = Identify.Decode(ataBuf);
+
+                if(ataId.HasValue)
+                    Serial = ataId.Value.SerialNumber;
+            }
+
+            LastError = 0;
+            Error     = false;
+        }
+
+        if((scsiSense && !(IsUsb || IsFireWire)) ||
+           Manufacturer == "ATA")
+        {
+            bool ataSense = AtaIdentify(out ataBuf, out _);
+
+            if(!ataSense)
+            {
+                Type = DeviceType.ATA;
+                Identify.IdentifyDevice? ataid = Identify.Decode(ataBuf);
+
+                if(ataid.HasValue)
+                {
+                    string[] separated = ataid.Value.Model.Split(' ');
+
+                    if(separated.Length == 1)
+                    {
+                        Model = separated[0];
+                    }
+                    else
+                    {
+                        Manufacturer = separated[0];
+                        Model        = separated[^1];
+                    }
+
+                    FirmwareRevision = ataid.Value.FirmwareRevision;
+                    Serial           = ataid.Value.SerialNumber;
+
+                    ScsiType = PeripheralDeviceTypes.DirectAccess;
+
+                    if((ushort)ataid.Value.GeneralConfiguration != 0x848A)
+                        IsRemovable |=
+                            (ataid.Value.GeneralConfiguration & Identify.GeneralConfigurationBit.Removable) ==
+                            Identify.GeneralConfigurationBit.Removable;
+                    else
+                        IsCompactFlash = true;
+                }
+            }
+        }
+
+        if(Type == DeviceType.Unknown)
+        {
+            Manufacturer     = null;
+            Model            = null;
+            FirmwareRevision = null;
+            Serial           = null;
+        }
+
+        if(IsUsb)
+        {
+            if(string.IsNullOrEmpty(Manufacturer))
+                Manufacturer = UsbManufacturerString;
+
+            if(string.IsNullOrEmpty(Model))
+                Model = UsbProductString;
+
+            if(string.IsNullOrEmpty(Serial))
+                Serial = UsbSerialString;
+            else
+                foreach(char c in Serial.Where(c => !char.IsControl(c)))
+                    Serial = $"{Serial}{(uint)c:X2}";
+        }
+
+        if(IsFireWire)
+        {
+            if(string.IsNullOrEmpty(Manufacturer))
+                Manufacturer = FireWireVendorName;
+
+            if(string.IsNullOrEmpty(Model))
+                Model = FireWireModelName;
+
+            if(string.IsNullOrEmpty(Serial))
+                Serial = $"{_firewireGuid:X16}";
+            else
+                foreach(char c in Serial.Where(c => !char.IsControl(c)))
+                    Serial = $"{Serial}{(uint)c:X2}";
+        }
+
+        // Some optical drives are not getting the correct serial, and IDENTIFY PACKET DEVICE is blocked without
+        // administrator privileges
+        if(ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
+            return;
+
+        bool featureSense = GetConfiguration(out byte[] featureBuffer, out _, 0x0108, MmcGetConfigurationRt.Single,
+                                             Timeout, out _);
+
+        if(featureSense)
+            return;
+
+        Features.SeparatedFeatures features = Features.Separate(featureBuffer);
+
+        if(features.Descriptors?.Length != 1 ||
+           features.Descriptors[0].Code != 0x0108)
+            return;
+
+        Feature_0108? serialFeature = Features.Decode_0108(features.Descriptors[0].Data);
+
+        if(serialFeature is null)
+            return;
+
+        Serial = serialFeature.Value.Serial;
+    }
+
+    static int ConvertFromFileHexAscii(string file, out byte[] outBuf)
+    {
+        var    sr  = new StreamReader(file);
+        string ins = sr.ReadToEnd().Trim();
+
+        int count = Helpers.Marshal.ConvertFromHexAscii(ins, out outBuf);
+
+        sr.Close();
+
+        return count;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/Destructor.cs b/Aaru.Devices/Device/Destructor.cs
index f717dc1ea..aa53c500f 100644
--- a/Aaru.Devices/Device/Destructor.cs
+++ b/Aaru.Devices/Device/Destructor.cs
@@ -34,43 +34,42 @@ using Aaru.CommonTypes.Interop;
 using Aaru.Devices.Linux;
 using Microsoft.Win32.SafeHandles;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>
+    ///     Releases unmanaged resources and performs other cleanup operations before the <see cref="Device" /> is
+    ///     reclaimed by garbage collection.
+    /// </summary>
+    ~Device() => Close();
+
+    /// <summary>Closes a device</summary>
+    public void Close()
     {
-        /// <summary>
-        ///     Releases unmanaged resources and performs other cleanup operations before the <see cref="Device" /> is
-        ///     reclaimed by garbage collection.
-        /// </summary>
-        ~Device() => Close();
-
-        /// <summary>Closes a device</summary>
-        public void Close()
+        if(_remote != null)
         {
-            if(_remote != null)
-            {
-                _remote.Close();
-                _remote.Disconnect();
+            _remote.Close();
+            _remote.Disconnect();
 
-                return;
-            }
-
-            if(FileHandle == null)
-                return;
-
-            switch(PlatformId)
-            {
-                case PlatformID.Win32NT:
-                    (FileHandle as SafeFileHandle)?.Close();
-
-                    break;
-                case PlatformID.Linux:
-                    Extern.close((int)FileHandle);
-
-                    break;
-            }
-
-            FileHandle = null;
+            return;
         }
+
+        if(FileHandle == null)
+            return;
+
+        switch(PlatformId)
+        {
+            case PlatformID.Win32NT:
+                (FileHandle as SafeFileHandle)?.Close();
+
+                break;
+            case PlatformID.Linux:
+                Extern.close((int)FileHandle);
+
+                break;
+        }
+
+        FileHandle = null;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/DeviceException.cs b/Aaru.Devices/Device/DeviceException.cs
index 5fcadbbf4..5f496763c 100644
--- a/Aaru.Devices/Device/DeviceException.cs
+++ b/Aaru.Devices/Device/DeviceException.cs
@@ -32,17 +32,16 @@
 
 using System;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+/// <inheritdoc />
+/// <summary>Exception to be returned by the device constructor</summary>
+public sealed class DeviceException : Exception
 {
-    /// <inheritdoc />
-    /// <summary>Exception to be returned by the device constructor</summary>
-    public sealed class DeviceException : Exception
-    {
-        internal DeviceException(string message) : base(message) {}
+    internal DeviceException(string message) : base(message) {}
 
-        internal DeviceException(int lastError) => LastError = lastError;
+    internal DeviceException(int lastError) => LastError = lastError;
 
-        /// <summary>Last error sent by the operating systen</summary>
-        public int LastError { get; }
-    }
+    /// <summary>Last error sent by the operating systen</summary>
+    public int LastError { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/List.cs b/Aaru.Devices/Device/List.cs
index 97222cb52..1c988601a 100644
--- a/Aaru.Devices/Device/List.cs
+++ b/Aaru.Devices/Device/List.cs
@@ -36,111 +36,110 @@ using Aaru.CommonTypes.Interop;
 using Aaru.Console;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+/// <summary>Contains device information</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct DeviceInfo
 {
-    /// <summary>Contains device information</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct DeviceInfo
+    /// <summary>Device path</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
+    public string Path;
+
+    /// <summary>Device vendor or manufacturer</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string Vendor;
+
+    /// <summary>Device model or product name</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string Model;
+
+    /// <summary>Device serial number</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string Serial;
+
+    /// <summary>Bus the device is attached to</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string Bus;
+
+    /// <summary>
+    ///     Set to <c>true</c> if Aaru can send commands to the device in the current machine or remote, <c>false</c>
+    ///     otherwise
+    /// </summary>
+    [MarshalAs(UnmanagedType.U1)]
+    public bool Supported;
+
+    /// <summary>Padding</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+    public readonly byte[] Padding;
+}
+
+public sealed partial class Device
+{
+    /// <summary>Lists devices attached to current machine</summary>
+    /// <returns>List of devices</returns>
+    public static DeviceInfo[] ListDevices() => ListDevices(out _, out _, out _, out _, out _, out _);
+
+    /// <summary>Lists devices attached to current machine or specified remote</summary>
+    /// <param name="isRemote">Is remote</param>
+    /// <param name="serverApplication">Remote application</param>
+    /// <param name="serverVersion">Remote application version</param>
+    /// <param name="serverOperatingSystem">Remote operating system name</param>
+    /// <param name="serverOperatingSystemVersion">Remote operating system version</param>
+    /// <param name="serverArchitecture">Remote architecture</param>
+    /// <param name="aaruRemote">Remote URI</param>
+    /// <returns>List of devices</returns>
+    /// <exception cref="InvalidOperationException"></exception>
+    public static DeviceInfo[] ListDevices(out bool isRemote, out string serverApplication,
+                                           out string serverVersion, out string serverOperatingSystem,
+                                           out string serverOperatingSystemVersion, out string serverArchitecture,
+                                           string aaruRemote = null)
     {
-        /// <summary>Device path</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
-        public string Path;
+        isRemote                     = false;
+        serverApplication            = null;
+        serverVersion                = null;
+        serverOperatingSystem        = null;
+        serverOperatingSystemVersion = null;
+        serverArchitecture           = null;
 
-        /// <summary>Device vendor or manufacturer</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string Vendor;
-
-        /// <summary>Device model or product name</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string Model;
-
-        /// <summary>Device serial number</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string Serial;
-
-        /// <summary>Bus the device is attached to</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string Bus;
-
-        /// <summary>
-        ///     Set to <c>true</c> if Aaru can send commands to the device in the current machine or remote, <c>false</c>
-        ///     otherwise
-        /// </summary>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool Supported;
-
-        /// <summary>Padding</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-        public readonly byte[] Padding;
-    }
-
-    public sealed partial class Device
-    {
-        /// <summary>Lists devices attached to current machine</summary>
-        /// <returns>List of devices</returns>
-        public static DeviceInfo[] ListDevices() => ListDevices(out _, out _, out _, out _, out _, out _);
-
-        /// <summary>Lists devices attached to current machine or specified remote</summary>
-        /// <param name="isRemote">Is remote</param>
-        /// <param name="serverApplication">Remote application</param>
-        /// <param name="serverVersion">Remote application version</param>
-        /// <param name="serverOperatingSystem">Remote operating system name</param>
-        /// <param name="serverOperatingSystemVersion">Remote operating system version</param>
-        /// <param name="serverArchitecture">Remote architecture</param>
-        /// <param name="aaruRemote">Remote URI</param>
-        /// <returns>List of devices</returns>
-        /// <exception cref="InvalidOperationException"></exception>
-        public static DeviceInfo[] ListDevices(out bool isRemote, out string serverApplication,
-                                               out string serverVersion, out string serverOperatingSystem,
-                                               out string serverOperatingSystemVersion, out string serverArchitecture,
-                                               string aaruRemote = null)
-        {
-            isRemote                     = false;
-            serverApplication            = null;
-            serverVersion                = null;
-            serverOperatingSystem        = null;
-            serverOperatingSystemVersion = null;
-            serverArchitecture           = null;
-
-            if(aaruRemote is null)
-                switch(DetectOS.GetRealPlatformID())
-                {
-                    case PlatformID.Win32NT: return Windows.ListDevices.GetList();
-                    case PlatformID.Linux:   return Linux.ListDevices.GetList();
-                    default:
-                        throw new
-                            InvalidOperationException($"Platform {DetectOS.GetRealPlatformID()} not yet supported.");
-                }
-
-            try
+        if(aaruRemote is null)
+            switch(DetectOS.GetRealPlatformID())
             {
-                var aaruUri = new Uri(aaruRemote);
-
-                if(aaruUri.Scheme != "aaru" &&
-                   aaruUri.Scheme != "dic")
-                {
-                    AaruConsole.ErrorWriteLine("Invalid remote URI.");
-
-                    return Array.Empty<DeviceInfo>();
-                }
-
-                using var remote = new Remote.Remote(aaruUri);
-
-                isRemote                     = true;
-                serverApplication            = remote.ServerApplication;
-                serverVersion                = remote.ServerVersion;
-                serverOperatingSystem        = remote.ServerOperatingSystem;
-                serverOperatingSystemVersion = remote.ServerOperatingSystemVersion;
-                serverArchitecture           = remote.ServerArchitecture;
-
-                return remote.ListDevices();
+                case PlatformID.Win32NT: return Windows.ListDevices.GetList();
+                case PlatformID.Linux:   return Linux.ListDevices.GetList();
+                default:
+                    throw new
+                        InvalidOperationException($"Platform {DetectOS.GetRealPlatformID()} not yet supported.");
             }
-            catch(Exception)
+
+        try
+        {
+            var aaruUri = new Uri(aaruRemote);
+
+            if(aaruUri.Scheme != "aaru" &&
+               aaruUri.Scheme != "dic")
             {
-                AaruConsole.ErrorWriteLine("Error connecting to host.");
+                AaruConsole.ErrorWriteLine("Invalid remote URI.");
 
                 return Array.Empty<DeviceInfo>();
             }
+
+            using var remote = new Remote.Remote(aaruUri);
+
+            isRemote                     = true;
+            serverApplication            = remote.ServerApplication;
+            serverVersion                = remote.ServerVersion;
+            serverOperatingSystem        = remote.ServerOperatingSystem;
+            serverOperatingSystemVersion = remote.ServerOperatingSystemVersion;
+            serverArchitecture           = remote.ServerArchitecture;
+
+            return remote.ListDevices();
+        }
+        catch(Exception)
+        {
+            AaruConsole.ErrorWriteLine("Error connecting to host.");
+
+            return Array.Empty<DeviceInfo>();
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/MmcCommands/MMC.cs b/Aaru.Devices/Device/MmcCommands/MMC.cs
index 71e3194c1..7046dd014 100644
--- a/Aaru.Devices/Device/MmcCommands/MMC.cs
+++ b/Aaru.Devices/Device/MmcCommands/MMC.cs
@@ -33,358 +33,357 @@
 using System;
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Reads the CSD register from a SecureDigital or MultiMediaCard device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadCsd(out byte[] buffer, out uint[] response, uint timeout, out double duration)
     {
-        /// <summary>Reads the CSD register from a SecureDigital or MultiMediaCard device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadCsd(out byte[] buffer, out uint[] response, uint timeout, out double duration)
+        buffer = new byte[16];
+
+        LastError = SendMmcCommand(MmcCommands.SendCsd, false, false,
+                                   MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0, 16, 1,
+                                   ref buffer, out response, out duration, out bool sense, timeout);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("MMC Device", "SEND_CSD took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads the CID register from a SecureDigital or MultiMediaCard device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadCid(out byte[] buffer, out uint[] response, uint timeout, out double duration)
+    {
+        buffer = new byte[16];
+
+        LastError = SendMmcCommand(MmcCommands.SendCid, false, false,
+                                   MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0, 16, 1,
+                                   ref buffer, out response, out duration, out bool sense, timeout);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("MMC Device", "SEND_CID took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads the OCR register from a MultiMediaCard device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadOcr(out byte[] buffer, out uint[] response, uint timeout, out double duration)
+    {
+        buffer = new byte[4];
+
+        LastError = SendMmcCommand(MmcCommands.SendOpCond, false, true,
+                                   MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 | MmcFlags.CommandBcr, 0, 4, 1,
+                                   ref buffer, out response, out duration, out bool sense, timeout);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SecureDigital Device", "SEND_OP_COND took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads the extended CSD from a MultiMediaCard device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadExtendedCsd(out byte[] buffer, out uint[] response, uint timeout, out double duration)
+    {
+        buffer = new byte[512];
+
+        LastError = SendMmcCommand(MmcCommands.SendExtCsd, false, false,
+                                   MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 512, 1,
+                                   ref buffer, out response, out duration, out bool sense, timeout);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("MMC Device", "SEND_EXT_CSD took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sets the block length for transfers from a SecureDigital or MultiMediaCard device</summary>
+    /// <param name="length">Block length in bytes</param>
+    /// <param name="response">Response</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool SetBlockLength(uint length, out uint[] response, uint timeout, out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
+
+        LastError = SendMmcCommand(MmcCommands.SetBlocklen, false, false,
+                                   MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc, length, 0, 0,
+                                   ref buffer, out response, out duration, out bool sense, timeout);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("MMC Device", "SET_BLOCKLEN took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads blocks from a SecureDigital or MultiMediaCard device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="lba">LBA to start reading from</param>
+    /// <param name="blockSize">Block size in bytes</param>
+    /// <param name="transferLength">Number of bytes to transfer</param>
+    /// <param name="byteAddressed">Card is byte-addressed</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool Read(out byte[] buffer, out uint[] response, uint lba, uint blockSize, ushort transferLength,
+                     bool byteAddressed, uint timeout, out double duration)
+    {
+        bool sense = true;
+        buffer   = null;
+        response = null;
+        duration = -1;
+
+        if(transferLength <= 1)
+            return ReadSingleBlock(out buffer, out response, lba, blockSize, byteAddressed, timeout, out duration);
+
+        if(!_readMultipleBlockCannotSetBlockCount)
+            sense = ReadMultipleBlock(out buffer, out response, lba, blockSize, transferLength, byteAddressed,
+                                      timeout, out duration);
+
+        if(_readMultipleBlockCannotSetBlockCount)
+            return ReadMultipleUsingSingle(out buffer, out response, lba, blockSize, transferLength, byteAddressed,
+                                           timeout, out duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads a single block from a SecureDigital or MultiMediaCard device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="lba">LBA to start reading from</param>
+    /// <param name="blockSize">Block size in bytes</param>
+    /// <param name="byteAddressed">Card is byte-addressed</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadSingleBlock(out byte[] buffer, out uint[] response, uint lba, uint blockSize,
+                                bool byteAddressed, uint timeout, out double duration)
+    {
+        uint address;
+        buffer   = new byte[blockSize];
+        response = null;
+
+        if(byteAddressed)
+            address = lba * blockSize;
+        else
+            address = lba;
+
+        LastError = SendMmcCommand(MmcCommands.ReadSingleBlock, false, false,
+                                   MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, address,
+                                   blockSize, 1, ref buffer, out response, out duration, out bool sense, timeout);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("MMC Device", "READ_SINGLE_BLOCK took {0} ms.", duration);
+
+        return sense;
+    }
+
+    static bool _readMultipleBlockCannotSetBlockCount;
+
+    /// <summary>Reads multiple blocks from a SecureDigital or MultiMediaCard device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="lba">LBA to start reading from</param>
+    /// <param name="blockSize">Block size in bytes</param>
+    /// <param name="transferLength">Number of bytes to transfer</param>
+    /// <param name="byteAddressed">Card is byte-addressed</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadMultipleBlock(out byte[] buffer, out uint[] response, uint lba, uint blockSize,
+                                  ushort transferLength, bool byteAddressed, uint timeout, out double duration)
+    {
+        buffer = new byte[transferLength * blockSize];
+        double setDuration = 0;
+        uint   address;
+        response = null;
+
+        if(byteAddressed)
+            address = lba * blockSize;
+        else
+            address = lba;
+
+        LastError = SendMmcCommand(MmcCommands.ReadMultipleBlock, false, false,
+                                   MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, address,
+                                   blockSize, transferLength, ref buffer, out response, out duration,
+                                   out bool sense, timeout);
+
+        Error = LastError != 0;
+
+        if(transferLength > 1)
         {
-            buffer = new byte[16];
-
-            LastError = SendMmcCommand(MmcCommands.SendCsd, false, false,
-                                       MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0, 16, 1,
-                                       ref buffer, out response, out duration, out bool sense, timeout);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("MMC Device", "SEND_CSD took {0} ms.", duration);
-
-            return sense;
+            duration += setDuration;
+            AaruConsole.DebugWriteLine("MMC Device", "READ_MULTIPLE_BLOCK took {0} ms.", duration);
         }
+        else
+            AaruConsole.DebugWriteLine("MMC Device", "READ_SINGLE_BLOCK took {0} ms.", duration);
 
-        /// <summary>Reads the CID register from a SecureDigital or MultiMediaCard device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadCid(out byte[] buffer, out uint[] response, uint timeout, out double duration)
-        {
-            buffer = new byte[16];
+        return sense;
+    }
 
-            LastError = SendMmcCommand(MmcCommands.SendCid, false, false,
-                                       MmcFlags.ResponseSpiR2 | MmcFlags.ResponseR2 | MmcFlags.CommandAc, 0, 16, 1,
-                                       ref buffer, out response, out duration, out bool sense, timeout);
+    /// <summary>Reads blocks using a single block read from a SecureDigital or MultiMediaCard device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="lba">LBA to start reading from</param>
+    /// <param name="blockSize">Block size in bytes</param>
+    /// <param name="transferLength">Number of bytes to transfer</param>
+    /// <param name="byteAddressed">Card is byte-addressed</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadMultipleUsingSingle(out byte[] buffer, out uint[] response, uint lba, uint blockSize,
+                                        ushort transferLength, bool byteAddressed, uint timeout,
+                                        out double duration)
+    {
+        buffer = new byte[transferLength * blockSize];
+        byte[] blockBuffer = new byte[blockSize];
+        duration = 0;
+        bool sense = true;
+        response = null;
 
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("MMC Device", "SEND_CID took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads the OCR register from a MultiMediaCard device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadOcr(out byte[] buffer, out uint[] response, uint timeout, out double duration)
-        {
-            buffer = new byte[4];
-
-            LastError = SendMmcCommand(MmcCommands.SendOpCond, false, true,
-                                       MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 | MmcFlags.CommandBcr, 0, 4, 1,
-                                       ref buffer, out response, out duration, out bool sense, timeout);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SecureDigital Device", "SEND_OP_COND took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads the extended CSD from a MultiMediaCard device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadExtendedCsd(out byte[] buffer, out uint[] response, uint timeout, out double duration)
-        {
-            buffer = new byte[512];
-
-            LastError = SendMmcCommand(MmcCommands.SendExtCsd, false, false,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 512, 1,
-                                       ref buffer, out response, out duration, out bool sense, timeout);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("MMC Device", "SEND_EXT_CSD took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sets the block length for transfers from a SecureDigital or MultiMediaCard device</summary>
-        /// <param name="length">Block length in bytes</param>
-        /// <param name="response">Response</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool SetBlockLength(uint length, out uint[] response, uint timeout, out double duration)
-        {
-            byte[] buffer = Array.Empty<byte>();
-
-            LastError = SendMmcCommand(MmcCommands.SetBlocklen, false, false,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc, length, 0, 0,
-                                       ref buffer, out response, out duration, out bool sense, timeout);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("MMC Device", "SET_BLOCKLEN took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads blocks from a SecureDigital or MultiMediaCard device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="lba">LBA to start reading from</param>
-        /// <param name="blockSize">Block size in bytes</param>
-        /// <param name="transferLength">Number of bytes to transfer</param>
-        /// <param name="byteAddressed">Card is byte-addressed</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool Read(out byte[] buffer, out uint[] response, uint lba, uint blockSize, ushort transferLength,
-                         bool byteAddressed, uint timeout, out double duration)
-        {
-            bool sense = true;
-            buffer   = null;
-            response = null;
-            duration = -1;
-
-            if(transferLength <= 1)
-                return ReadSingleBlock(out buffer, out response, lba, blockSize, byteAddressed, timeout, out duration);
-
-            if(!_readMultipleBlockCannotSetBlockCount)
-                sense = ReadMultipleBlock(out buffer, out response, lba, blockSize, transferLength, byteAddressed,
-                                          timeout, out duration);
-
-            if(_readMultipleBlockCannotSetBlockCount)
-                return ReadMultipleUsingSingle(out buffer, out response, lba, blockSize, transferLength, byteAddressed,
-                                               timeout, out duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads a single block from a SecureDigital or MultiMediaCard device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="lba">LBA to start reading from</param>
-        /// <param name="blockSize">Block size in bytes</param>
-        /// <param name="byteAddressed">Card is byte-addressed</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadSingleBlock(out byte[] buffer, out uint[] response, uint lba, uint blockSize,
-                                    bool byteAddressed, uint timeout, out double duration)
+        for(uint i = 0; i < transferLength; i++)
         {
             uint address;
-            buffer   = new byte[blockSize];
-            response = null;
 
             if(byteAddressed)
-                address = lba * blockSize;
+                address = (lba + i) * blockSize;
             else
-                address = lba;
+                address = lba + i;
 
             LastError = SendMmcCommand(MmcCommands.ReadSingleBlock, false, false,
                                        MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, address,
-                                       blockSize, 1, ref buffer, out response, out duration, out bool sense, timeout);
+                                       blockSize, 1, ref blockBuffer, out response, out double blockDuration,
+                                       out sense, timeout);
 
             Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("MMC Device", "READ_SINGLE_BLOCK took {0} ms.", duration);
+            duration += blockDuration;
 
-            return sense;
+            if(Error || sense)
+                break;
+
+            Array.Copy(blockBuffer, 0, buffer, i * blockSize, blockSize);
         }
 
-        static bool _readMultipleBlockCannotSetBlockCount;
+        AaruConsole.DebugWriteLine("MMC Device", "Multiple READ_SINGLE_BLOCKs took {0} ms.", duration);
 
-        /// <summary>Reads multiple blocks from a SecureDigital or MultiMediaCard device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="lba">LBA to start reading from</param>
-        /// <param name="blockSize">Block size in bytes</param>
-        /// <param name="transferLength">Number of bytes to transfer</param>
-        /// <param name="byteAddressed">Card is byte-addressed</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadMultipleBlock(out byte[] buffer, out uint[] response, uint lba, uint blockSize,
-                                      ushort transferLength, bool byteAddressed, uint timeout, out double duration)
+        return sense;
+    }
+
+    /// <summary>Reads status register from a MultiMediaCard device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadStatus(out byte[] buffer, out uint[] response, uint timeout, out double duration)
+    {
+        buffer = new byte[4];
+
+        LastError = SendMmcCommand(MmcCommands.SendStatus, false, true,
+                                   MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc, 0, 4, 1,
+                                   ref buffer, out response, out duration, out bool sense, timeout);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SecureDigital Device", "SEND_STATUS took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads blocks with block count from a SecureDigital or MultiMediaCard device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="lba">LBA to start reading from</param>
+    /// <param name="blockSize">Block size in bytes</param>
+    /// <param name="transferLength">Number of bytes to transfer</param>
+    /// <param name="byteAddressed">Card is byte-addressed</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadWithBlockCount(out byte[] buffer, out uint[] response, uint lba, uint blockSize,
+                                   ushort transferLength, bool byteAddressed, uint timeout, out double duration)
+    {
+        uint               address  = byteAddressed ? lba * blockSize : lba;
+        MmcSingleCommand[] commands = new MmcSingleCommand[3];
+
+        // SET_BLOCK_COUNT
+        commands[0] = new MmcSingleCommand
         {
-            buffer = new byte[transferLength * blockSize];
-            double setDuration = 0;
-            uint   address;
-            response = null;
+            command       = MmcCommands.SetBlockCount,
+            write         = false,
+            isApplication = false,
+            flags         = MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc,
+            argument      = transferLength,
+            blockSize     = 0,
+            blocks        = 0,
+            buffer        = Array.Empty<byte>()
+        };
 
-            if(byteAddressed)
-                address = lba * blockSize;
-            else
-                address = lba;
-
-            LastError = SendMmcCommand(MmcCommands.ReadMultipleBlock, false, false,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, address,
-                                       blockSize, transferLength, ref buffer, out response, out duration,
-                                       out bool sense, timeout);
-
-            Error = LastError != 0;
-
-            if(transferLength > 1)
-            {
-                duration += setDuration;
-                AaruConsole.DebugWriteLine("MMC Device", "READ_MULTIPLE_BLOCK took {0} ms.", duration);
-            }
-            else
-                AaruConsole.DebugWriteLine("MMC Device", "READ_SINGLE_BLOCK took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads blocks using a single block read from a SecureDigital or MultiMediaCard device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="lba">LBA to start reading from</param>
-        /// <param name="blockSize">Block size in bytes</param>
-        /// <param name="transferLength">Number of bytes to transfer</param>
-        /// <param name="byteAddressed">Card is byte-addressed</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadMultipleUsingSingle(out byte[] buffer, out uint[] response, uint lba, uint blockSize,
-                                            ushort transferLength, bool byteAddressed, uint timeout,
-                                            out double duration)
+        // READ_MULTIPLE_BLOCK
+        commands[1] = new MmcSingleCommand
         {
-            buffer = new byte[transferLength * blockSize];
-            byte[] blockBuffer = new byte[blockSize];
-            duration = 0;
-            bool sense = true;
-            response = null;
+            command       = MmcCommands.ReadMultipleBlock,
+            write         = false,
+            isApplication = false,
+            flags         = MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc,
+            argument      = address,
+            blockSize     = blockSize,
+            blocks        = transferLength,
+            buffer        = new byte[transferLength * blockSize]
+        };
 
-            for(uint i = 0; i < transferLength; i++)
-            {
-                uint address;
-
-                if(byteAddressed)
-                    address = (lba + i) * blockSize;
-                else
-                    address = lba + i;
-
-                LastError = SendMmcCommand(MmcCommands.ReadSingleBlock, false, false,
-                                           MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, address,
-                                           blockSize, 1, ref blockBuffer, out response, out double blockDuration,
-                                           out sense, timeout);
-
-                Error = LastError != 0;
-
-                duration += blockDuration;
-
-                if(Error || sense)
-                    break;
-
-                Array.Copy(blockBuffer, 0, buffer, i * blockSize, blockSize);
-            }
-
-            AaruConsole.DebugWriteLine("MMC Device", "Multiple READ_SINGLE_BLOCKs took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads status register from a MultiMediaCard device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadStatus(out byte[] buffer, out uint[] response, uint timeout, out double duration)
+        // STOP_TRANSMISSION
+        // Needed if the previous command fails
+        commands[2] = new MmcSingleCommand
         {
-            buffer = new byte[4];
+            command       = MmcCommands.StopTransmission,
+            write         = false,
+            isApplication = false,
+            flags         = MmcFlags.ResponseSpiR1B | MmcFlags.ResponseR1B | MmcFlags.CommandAc,
+            argument      = 0,
+            blockSize     = 0,
+            blocks        = 0,
+            buffer        = Array.Empty<byte>()
+        };
 
-            LastError = SendMmcCommand(MmcCommands.SendStatus, false, true,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc, 0, 4, 1,
-                                       ref buffer, out response, out duration, out bool sense, timeout);
+        LastError = SendMultipleMmcCommands(commands, out duration, out bool sense, timeout);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SecureDigital Device", "SEND_STATUS took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SecureDigital Device", "READ_MULTIPLE_BLOCK took {0} ms.", duration);
 
-            return sense;
-        }
+        buffer   = commands[1].buffer;
+        response = commands[1].response;
 
-        /// <summary>Reads blocks with block count from a SecureDigital or MultiMediaCard device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="lba">LBA to start reading from</param>
-        /// <param name="blockSize">Block size in bytes</param>
-        /// <param name="transferLength">Number of bytes to transfer</param>
-        /// <param name="byteAddressed">Card is byte-addressed</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadWithBlockCount(out byte[] buffer, out uint[] response, uint lba, uint blockSize,
-                                       ushort transferLength, bool byteAddressed, uint timeout, out double duration)
-        {
-            uint               address  = byteAddressed ? lba * blockSize : lba;
-            MmcSingleCommand[] commands = new MmcSingleCommand[3];
-
-            // SET_BLOCK_COUNT
-            commands[0] = new MmcSingleCommand
-            {
-                command       = MmcCommands.SetBlockCount,
-                write         = false,
-                isApplication = false,
-                flags         = MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAc,
-                argument      = transferLength,
-                blockSize     = 0,
-                blocks        = 0,
-                buffer        = Array.Empty<byte>()
-            };
-
-            // READ_MULTIPLE_BLOCK
-            commands[1] = new MmcSingleCommand
-            {
-                command       = MmcCommands.ReadMultipleBlock,
-                write         = false,
-                isApplication = false,
-                flags         = MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc,
-                argument      = address,
-                blockSize     = blockSize,
-                blocks        = transferLength,
-                buffer        = new byte[transferLength * blockSize]
-            };
-
-            // STOP_TRANSMISSION
-            // Needed if the previous command fails
-            commands[2] = new MmcSingleCommand
-            {
-                command       = MmcCommands.StopTransmission,
-                write         = false,
-                isApplication = false,
-                flags         = MmcFlags.ResponseSpiR1B | MmcFlags.ResponseR1B | MmcFlags.CommandAc,
-                argument      = 0,
-                blockSize     = 0,
-                blocks        = 0,
-                buffer        = Array.Empty<byte>()
-            };
-
-            LastError = SendMultipleMmcCommands(commands, out duration, out bool sense, timeout);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SecureDigital Device", "READ_MULTIPLE_BLOCK took {0} ms.", duration);
-
-            buffer   = commands[1].buffer;
-            response = commands[1].response;
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/MmcCommands/SecureDigital.cs b/Aaru.Devices/Device/MmcCommands/SecureDigital.cs
index 0df3e3bd6..ca0f50a44 100644
--- a/Aaru.Devices/Device/MmcCommands/SecureDigital.cs
+++ b/Aaru.Devices/Device/MmcCommands/SecureDigital.cs
@@ -32,71 +32,70 @@
 
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Reads the status register from a SecureDigital device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadSdStatus(out byte[] buffer, out uint[] response, uint timeout, out double duration)
     {
-        /// <summary>Reads the status register from a SecureDigital device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadSdStatus(out byte[] buffer, out uint[] response, uint timeout, out double duration)
-        {
-            buffer = new byte[64];
+        buffer = new byte[64];
 
-            LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendStatus, false, true,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 64, 1,
-                                       ref buffer, out response, out duration, out bool sense, timeout);
+        LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendStatus, false, true,
+                                   MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 64, 1,
+                                   ref buffer, out response, out duration, out bool sense, timeout);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SecureDigital Device", "SD_STATUS took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SecureDigital Device", "SD_STATUS took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
+    }
 
-        /// <summary>Reads the OCR register from a SecureDigital device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadSdocr(out byte[] buffer, out uint[] response, uint timeout, out double duration)
-        {
-            buffer = new byte[4];
+    /// <summary>Reads the OCR register from a SecureDigital device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadSdocr(out byte[] buffer, out uint[] response, uint timeout, out double duration)
+    {
+        buffer = new byte[4];
 
-            LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendOperatingCondition, false, true,
-                                       MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 | MmcFlags.CommandBcr, 0, 4, 1,
-                                       ref buffer, out response, out duration, out bool sense, timeout);
+        LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendOperatingCondition, false, true,
+                                   MmcFlags.ResponseSpiR3 | MmcFlags.ResponseR3 | MmcFlags.CommandBcr, 0, 4, 1,
+                                   ref buffer, out response, out duration, out bool sense, timeout);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SecureDigital Device", "SD_SEND_OP_COND took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SecureDigital Device", "SD_SEND_OP_COND took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
+    }
 
-        /// <summary>Reads the SCR register from a SecureDigital device</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="response">Response</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool ReadScr(out byte[] buffer, out uint[] response, uint timeout, out double duration)
-        {
-            buffer = new byte[8];
+    /// <summary>Reads the SCR register from a SecureDigital device</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="response">Response</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool ReadScr(out byte[] buffer, out uint[] response, uint timeout, out double duration)
+    {
+        buffer = new byte[8];
 
-            LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendScr, false, true,
-                                       MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 8, 1,
-                                       ref buffer, out response, out duration, out bool sense, timeout);
+        LastError = SendMmcCommand((MmcCommands)SecureDigitalCommands.SendScr, false, true,
+                                   MmcFlags.ResponseSpiR1 | MmcFlags.ResponseR1 | MmcFlags.CommandAdtc, 0, 8, 1,
+                                   ref buffer, out response, out duration, out bool sense, timeout);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SecureDigital Device", "SEND_SCR took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SecureDigital Device", "SEND_SCR took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/Adaptec.cs b/Aaru.Devices/Device/ScsiCommands/Adaptec.cs
index 777f3874b..c8ed7221b 100644
--- a/Aaru.Devices/Device/ScsiCommands/Adaptec.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Adaptec.cs
@@ -34,179 +34,178 @@
 using System;
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="lba">SCSI Logical Block Address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AdaptecTranslate(out byte[] buffer, out byte[] senseBuffer, uint lba, uint timeout,
+                                 out double duration) =>
+        AdaptecTranslate(out buffer, out senseBuffer, false, lba, timeout, out duration);
+
+    /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="drive1">If set to <c>true</c> request the data from drive 1.</param>
+    /// <param name="lba">SCSI Logical Block Address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AdaptecTranslate(out byte[] buffer, out byte[] senseBuffer, bool drive1, uint lba, uint timeout,
+                                 out double duration)
     {
-        /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="lba">SCSI Logical Block Address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AdaptecTranslate(out byte[] buffer, out byte[] senseBuffer, uint lba, uint timeout,
-                                     out double duration) =>
-            AdaptecTranslate(out buffer, out senseBuffer, false, lba, timeout, out duration);
+        buffer = new byte[8];
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
 
-        /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="drive1">If set to <c>true</c> request the data from drive 1.</param>
-        /// <param name="lba">SCSI Logical Block Address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AdaptecTranslate(out byte[] buffer, out byte[] senseBuffer, bool drive1, uint lba, uint timeout,
-                                     out double duration)
-        {
-            buffer = new byte[8];
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
+        cdb[0] = (byte)ScsiCommands.AdaptecTranslate;
+        cdb[1] = (byte)((lba & 0x1F0000) >> 16);
+        cdb[2] = (byte)((lba & 0xFF00)   >> 8);
+        cdb[3] = (byte)(lba & 0xFF);
 
-            cdb[0] = (byte)ScsiCommands.AdaptecTranslate;
-            cdb[1] = (byte)((lba & 0x1F0000) >> 16);
-            cdb[2] = (byte)((lba & 0xFF00)   >> 8);
-            cdb[3] = (byte)(lba & 0xFF);
+        if(drive1)
+            cdb[1] += 0x20;
 
-            if(drive1)
-                cdb[1] += 0x20;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC TRANSLATE took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC TRANSLATE took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Sets the error threshold</summary>
+    /// <returns><c>true</c>, if set error threshold was adapteced, <c>false</c> otherwise.</returns>
+    /// <param name="threshold">Threshold. 0 to disable error reporting.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool
+        AdaptecSetErrorThreshold(byte threshold, out byte[] senseBuffer, uint timeout, out double duration) =>
+        AdaptecSetErrorThreshold(threshold, out senseBuffer, false, timeout, out duration);
 
-        /// <summary>Sets the error threshold</summary>
-        /// <returns><c>true</c>, if set error threshold was adapteced, <c>false</c> otherwise.</returns>
-        /// <param name="threshold">Threshold. 0 to disable error reporting.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool
-            AdaptecSetErrorThreshold(byte threshold, out byte[] senseBuffer, uint timeout, out double duration) =>
-            AdaptecSetErrorThreshold(threshold, out senseBuffer, false, timeout, out duration);
+    /// <summary>Sets the error threshold</summary>
+    /// <returns><c>true</c>, if set error threshold was adapteced, <c>false</c> otherwise.</returns>
+    /// <param name="threshold">Threshold. 0 to disable error reporting.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="drive1">If set to <c>true</c> set the threshold from drive 1.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AdaptecSetErrorThreshold(byte threshold, out byte[] senseBuffer, bool drive1, uint timeout,
+                                         out double duration)
+    {
+        byte[] buffer = new byte[1];
+        buffer[0] = threshold;
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
 
-        /// <summary>Sets the error threshold</summary>
-        /// <returns><c>true</c>, if set error threshold was adapteced, <c>false</c> otherwise.</returns>
-        /// <param name="threshold">Threshold. 0 to disable error reporting.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="drive1">If set to <c>true</c> set the threshold from drive 1.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AdaptecSetErrorThreshold(byte threshold, out byte[] senseBuffer, bool drive1, uint timeout,
-                                             out double duration)
-        {
-            byte[] buffer = new byte[1];
-            buffer[0] = threshold;
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
+        cdb[0] = (byte)ScsiCommands.AdaptecSetErrorThreshold;
 
-            cdb[0] = (byte)ScsiCommands.AdaptecSetErrorThreshold;
+        if(drive1)
+            cdb[1] += 0x20;
 
-            if(drive1)
-                cdb[1] += 0x20;
+        cdb[4] = 1;
 
-            cdb[4] = 1;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
+                                    out bool sense);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
-                                        out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC SET ERROR THRESHOLD took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC SET ERROR THRESHOLD took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Requests the usage, seek and error counters, and resets them</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AdaptecReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, uint timeout,
+                                        out double duration) =>
+        AdaptecReadUsageCounter(out buffer, out senseBuffer, false, timeout, out duration);
 
-        /// <summary>Requests the usage, seek and error counters, and resets them</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AdaptecReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, uint timeout,
-                                            out double duration) =>
-            AdaptecReadUsageCounter(out buffer, out senseBuffer, false, timeout, out duration);
+    /// <summary>Requests the usage, seek and error counters, and resets them</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="drive1">If set to <c>true</c> get the counters from drive 1.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AdaptecReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, bool drive1, uint timeout,
+                                        out double duration)
+    {
+        buffer = new byte[9];
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
 
-        /// <summary>Requests the usage, seek and error counters, and resets them</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="drive1">If set to <c>true</c> get the counters from drive 1.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AdaptecReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, bool drive1, uint timeout,
-                                            out double duration)
-        {
-            buffer = new byte[9];
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
+        cdb[0] = (byte)ScsiCommands.AdaptecTranslate;
 
-            cdb[0] = (byte)ScsiCommands.AdaptecTranslate;
+        if(drive1)
+            cdb[1] += 0x20;
 
-            if(drive1)
-                cdb[1] += 0x20;
+        cdb[4] = (byte)buffer.Length;
 
-            cdb[4] = (byte)buffer.Length;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC READ/RESET USAGE COUNTER took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC READ/RESET USAGE COUNTER took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Fills the Adaptec controller RAM with 1K bytes of data</summary>
+    /// <param name="buffer">Data to fill the buffer with.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AdaptecWriteBuffer(byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        byte[] oneKBuffer = new byte[1024];
+        Array.Copy(buffer, 0, oneKBuffer, 0, buffer.Length < 1024 ? buffer.Length : 1024);
 
-        /// <summary>Fills the Adaptec controller RAM with 1K bytes of data</summary>
-        /// <param name="buffer">Data to fill the buffer with.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AdaptecWriteBuffer(byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            byte[] oneKBuffer = new byte[1024];
-            Array.Copy(buffer, 0, oneKBuffer, 0, buffer.Length < 1024 ? buffer.Length : 1024);
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
 
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
+        cdb[0] = (byte)ScsiCommands.AdaptecWriteBuffer;
 
-            cdb[0] = (byte)ScsiCommands.AdaptecWriteBuffer;
+        LastError = SendScsiCommand(cdb, ref oneKBuffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
+                                    out bool sense);
 
-            LastError = SendScsiCommand(cdb, ref oneKBuffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
-                                        out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC WRITE DATA BUFFER took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC WRITE DATA BUFFER took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Reads 1K bytes of data from the Adaptec controller RAM</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool AdaptecReadBuffer(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        buffer = new byte[1024];
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
 
-        /// <summary>Reads 1K bytes of data from the Adaptec controller RAM</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool AdaptecReadBuffer(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            buffer = new byte[1024];
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
+        cdb[0] = (byte)ScsiCommands.AdaptecReadBuffer;
 
-            cdb[0] = (byte)ScsiCommands.AdaptecReadBuffer;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC READ DATA BUFFER took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "ADAPTEC READ DATA BUFFER took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs b/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs
index 6b99b17cd..5071ccd05 100644
--- a/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs
+++ b/Aaru.Devices/Device/ScsiCommands/ArchiveCorp.cs
@@ -33,76 +33,75 @@
 using System;
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="lba">Address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ArchiveCorpRequestBlockAddress(out byte[] buffer, out byte[] senseBuffer, uint lba, uint timeout,
+                                               out double duration)
     {
-        /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="lba">Address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ArchiveCorpRequestBlockAddress(out byte[] buffer, out byte[] senseBuffer, uint lba, uint timeout,
-                                                   out double duration)
-        {
-            buffer = new byte[3];
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
+        buffer = new byte[3];
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
 
-            cdb[0] = (byte)ScsiCommands.ArchiveRequestBlockAddress;
-            cdb[1] = (byte)((lba & 0x1F0000) >> 16);
-            cdb[2] = (byte)((lba & 0xFF00)   >> 8);
-            cdb[3] = (byte)(lba & 0xFF);
-            cdb[4] = 3;
+        cdb[0] = (byte)ScsiCommands.ArchiveRequestBlockAddress;
+        cdb[1] = (byte)((lba & 0x1F0000) >> 16);
+        cdb[2] = (byte)((lba & 0xFF00)   >> 8);
+        cdb[3] = (byte)(lba & 0xFF);
+        cdb[4] = 3;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "ARCHIVE CORP. REQUEST BLOCK ADDRESS took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "ARCHIVE CORP. REQUEST BLOCK ADDRESS took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
+    }
 
-        /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="lba">Logical Block Address, starting from 1.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ArchiveCorpSeekBlock(out byte[] senseBuffer, uint lba, uint timeout, out double duration) =>
-            ArchiveCorpSeekBlock(out senseBuffer, false, lba, timeout, out duration);
+    /// <summary>Gets the underlying drive cylinder, head and index bytes for the specified SCSI LBA.</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="lba">Logical Block Address, starting from 1.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ArchiveCorpSeekBlock(out byte[] senseBuffer, uint lba, uint timeout, out double duration) =>
+        ArchiveCorpSeekBlock(out senseBuffer, false, lba, timeout, out duration);
 
-        /// <summary>Positions the tape at the specified block address</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
-        /// <param name="lba">Logical Block Address, starting from 1.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ArchiveCorpSeekBlock(out byte[] senseBuffer, bool immediate, uint lba, uint timeout,
-                                         out double duration)
-        {
-            byte[] buffer = Array.Empty<byte>();
-            byte[] cdb    = new byte[6];
-            senseBuffer = new byte[64];
+    /// <summary>Positions the tape at the specified block address</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
+    /// <param name="lba">Logical Block Address, starting from 1.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ArchiveCorpSeekBlock(out byte[] senseBuffer, bool immediate, uint lba, uint timeout,
+                                     out double duration)
+    {
+        byte[] buffer = Array.Empty<byte>();
+        byte[] cdb    = new byte[6];
+        senseBuffer = new byte[64];
 
-            cdb[0] = (byte)ScsiCommands.ArchiveSeekBlock;
-            cdb[1] = (byte)((lba & 0x1F0000) >> 16);
-            cdb[2] = (byte)((lba & 0xFF00)   >> 8);
-            cdb[3] = (byte)(lba & 0xFF);
+        cdb[0] = (byte)ScsiCommands.ArchiveSeekBlock;
+        cdb[1] = (byte)((lba & 0x1F0000) >> 16);
+        cdb[2] = (byte)((lba & 0xFF00)   >> 8);
+        cdb[3] = (byte)(lba & 0xFF);
 
-            if(immediate)
-                cdb[1] += 0x01;
+        if(immediate)
+            cdb[1] += 0x01;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "ARCHIVE CORP. SEEK BLOCK took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "ARCHIVE CORP. SEEK BLOCK took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/Certance.cs b/Aaru.Devices/Device/ScsiCommands/Certance.cs
index d52a3945a..1a6953d44 100644
--- a/Aaru.Devices/Device/ScsiCommands/Certance.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Certance.cs
@@ -34,49 +34,48 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+public sealed partial class Device
 {
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    public sealed partial class Device
+    /// <summary>Parks the load arm in preparation for transport</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool CertancePark(out byte[] senseBuffer, uint timeout, out double duration) =>
+        CertanceParkUnpark(out senseBuffer, true, timeout, out duration);
+
+    /// <summary>Unparks the load arm prior to operation</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool CertanceUnpark(out byte[] senseBuffer, uint timeout, out double duration) =>
+        CertanceParkUnpark(out senseBuffer, false, timeout, out duration);
+
+    /// <summary>Parks the load arm in preparation for transport or unparks it prior to operation</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="park">If set to <c>true</c>, parks the load arm</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool CertanceParkUnpark(out byte[] senseBuffer, bool park, uint timeout, out double duration)
     {
-        /// <summary>Parks the load arm in preparation for transport</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool CertancePark(out byte[] senseBuffer, uint timeout, out double duration) =>
-            CertanceParkUnpark(out senseBuffer, true, timeout, out duration);
+        byte[] buffer = Array.Empty<byte>();
+        byte[] cdb    = new byte[6];
+        senseBuffer = new byte[64];
 
-        /// <summary>Unparks the load arm prior to operation</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool CertanceUnpark(out byte[] senseBuffer, uint timeout, out double duration) =>
-            CertanceParkUnpark(out senseBuffer, false, timeout, out duration);
+        cdb[0] = (byte)ScsiCommands.CertanceParkUnpark;
 
-        /// <summary>Parks the load arm in preparation for transport or unparks it prior to operation</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="park">If set to <c>true</c>, parks the load arm</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool CertanceParkUnpark(out byte[] senseBuffer, bool park, uint timeout, out double duration)
-        {
-            byte[] buffer = Array.Empty<byte>();
-            byte[] cdb    = new byte[6];
-            senseBuffer = new byte[64];
+        if(park)
+            cdb[4] = 1;
 
-            cdb[0] = (byte)ScsiCommands.CertanceParkUnpark;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
 
-            if(park)
-                cdb[4] = 1;
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
+        AaruConsole.DebugWriteLine("SCSI Device", "CERTANCE PARK UNPARK took {0} ms.", duration);
 
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "CERTANCE PARK UNPARK took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
index 29cfe1e70..1d748cd23 100644
--- a/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Fujitsu.cs
@@ -35,77 +35,76 @@ using System.Text;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sets the data for the integrated display</summary>
+    /// <param name="senseBuffer">Returned SENSE buffer</param>
+    /// <param name="flash">If the display should start flashing</param>
+    /// <param name="mode">Display mode</param>
+    /// <param name="firstHalf">String to be shown in the first line of the display</param>
+    /// <param name="secondHalf">String to be shown in the second line of the display</param>
+    /// <param name="timeout">Timeout to wait for command execution</param>
+    /// <param name="duration">Time the device took to execute the command in milliseconds</param>
+    /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
+    public bool FujitsuDisplay(out byte[] senseBuffer, bool flash, FujitsuDisplayModes mode, string firstHalf,
+                               string secondHalf, uint timeout, out double duration)
     {
-        /// <summary>Sets the data for the integrated display</summary>
-        /// <param name="senseBuffer">Returned SENSE buffer</param>
-        /// <param name="flash">If the display should start flashing</param>
-        /// <param name="mode">Display mode</param>
-        /// <param name="firstHalf">String to be shown in the first line of the display</param>
-        /// <param name="secondHalf">String to be shown in the second line of the display</param>
-        /// <param name="timeout">Timeout to wait for command execution</param>
-        /// <param name="duration">Time the device took to execute the command in milliseconds</param>
-        /// <returns><c>true</c> if the device set an error condition, <c>false</c> otherwise</returns>
-        public bool FujitsuDisplay(out byte[] senseBuffer, bool flash, FujitsuDisplayModes mode, string firstHalf,
-                                   string secondHalf, uint timeout, out double duration)
+        byte[] tmp;
+        byte[] firstHalfBytes  = new byte[8];
+        byte[] secondHalfBytes = new byte[8];
+        byte[] buffer          = new byte[17];
+        bool   displayLen      = false;
+        bool   halfMsg         = false;
+        byte[] cdb             = new byte[10];
+
+        if(!string.IsNullOrWhiteSpace(firstHalf))
         {
-            byte[] tmp;
-            byte[] firstHalfBytes  = new byte[8];
-            byte[] secondHalfBytes = new byte[8];
-            byte[] buffer          = new byte[17];
-            bool   displayLen      = false;
-            bool   halfMsg         = false;
-            byte[] cdb             = new byte[10];
-
-            if(!string.IsNullOrWhiteSpace(firstHalf))
-            {
-                tmp = Encoding.ASCII.GetBytes(firstHalf);
-                Array.Copy(tmp, 0, firstHalfBytes, 0, 8);
-            }
-
-            if(!string.IsNullOrWhiteSpace(secondHalf))
-            {
-                tmp = Encoding.ASCII.GetBytes(secondHalf);
-                Array.Copy(tmp, 0, secondHalfBytes, 0, 8);
-            }
-
-            if(mode != FujitsuDisplayModes.Half)
-                if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
-                   !ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
-                    displayLen = true;
-                else if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
-                        ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
-                    halfMsg = true;
-
-            buffer[0] = (byte)((byte)mode << 5);
-
-            if(displayLen)
-                buffer[0] += 0x10;
-
-            if(flash)
-                buffer[0] += 0x08;
-
-            if(halfMsg)
-                buffer[0] += 0x04;
-
-            buffer[0] += 0x01; // Always ASCII
-
-            Array.Copy(firstHalfBytes, 0, buffer, 1, 8);
-            Array.Copy(secondHalfBytes, 0, buffer, 9, 8);
-
-            cdb[0] = (byte)ScsiCommands.FujitsuDisplay;
-            cdb[6] = (byte)buffer.Length;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "FUJITSU DISPLAY took {0} ms.", duration);
-
-            return sense;
+            tmp = Encoding.ASCII.GetBytes(firstHalf);
+            Array.Copy(tmp, 0, firstHalfBytes, 0, 8);
         }
+
+        if(!string.IsNullOrWhiteSpace(secondHalf))
+        {
+            tmp = Encoding.ASCII.GetBytes(secondHalf);
+            Array.Copy(tmp, 0, secondHalfBytes, 0, 8);
+        }
+
+        if(mode != FujitsuDisplayModes.Half)
+            if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
+               !ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
+                displayLen = true;
+            else if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(firstHalfBytes) &&
+                    ArrayHelpers.ArrayIsNullOrWhiteSpace(secondHalfBytes))
+                halfMsg = true;
+
+        buffer[0] = (byte)((byte)mode << 5);
+
+        if(displayLen)
+            buffer[0] += 0x10;
+
+        if(flash)
+            buffer[0] += 0x08;
+
+        if(halfMsg)
+            buffer[0] += 0x04;
+
+        buffer[0] += 0x01; // Always ASCII
+
+        Array.Copy(firstHalfBytes, 0, buffer, 1, 8);
+        Array.Copy(secondHalfBytes, 0, buffer, 9, 8);
+
+        cdb[0] = (byte)ScsiCommands.FujitsuDisplay;
+        cdb[6] = (byte)buffer.Length;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "FUJITSU DISPLAY took {0} ms.", duration);
+
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs b/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs
index c2a54fcbf..e7f67c7dd 100644
--- a/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs
+++ b/Aaru.Devices/Device/ScsiCommands/HL-DT-ST.cs
@@ -32,45 +32,44 @@
 
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Reads a "raw" sector from DVD on HL-DT-ST drives.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the HL-DT-ST READ DVD (RAW) response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Start block address.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    public bool HlDtStReadRawDvd(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength,
+                                 uint timeout, out double duration)
     {
-        /// <summary>Reads a "raw" sector from DVD on HL-DT-ST drives.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the HL-DT-ST READ DVD (RAW) response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Start block address.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        public bool HlDtStReadRawDvd(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength,
-                                     uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-            buffer = new byte[2064 * transferLength];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+        buffer = new byte[2064 * transferLength];
 
-            cdb[0]  = (byte)ScsiCommands.HlDtStVendor;
-            cdb[1]  = 0x48;
-            cdb[2]  = 0x49;
-            cdb[3]  = 0x54;
-            cdb[4]  = 0x01;
-            cdb[6]  = (byte)((lba & 0xFF000000) >> 24);
-            cdb[7]  = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[8]  = (byte)((lba & 0xFF00)     >> 8);
-            cdb[9]  = (byte)(lba & 0xFF);
-            cdb[10] = (byte)((buffer.Length & 0xFF00) >> 8);
-            cdb[11] = (byte)(buffer.Length & 0xFF);
+        cdb[0]  = (byte)ScsiCommands.HlDtStVendor;
+        cdb[1]  = 0x48;
+        cdb[2]  = 0x49;
+        cdb[3]  = 0x54;
+        cdb[4]  = 0x01;
+        cdb[6]  = (byte)((lba & 0xFF000000) >> 24);
+        cdb[7]  = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[8]  = (byte)((lba & 0xFF00)     >> 8);
+        cdb[9]  = (byte)(lba & 0xFF);
+        cdb[10] = (byte)((buffer.Length & 0xFF00) >> 8);
+        cdb[11] = (byte)(buffer.Length & 0xFF);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "HL-DT-ST READ DVD (RAW) took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "HL-DT-ST READ DVD (RAW) took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/HP.cs b/Aaru.Devices/Device/ScsiCommands/HP.cs
index 73630b513..e32e09f73 100644
--- a/Aaru.Devices/Device/ScsiCommands/HP.cs
+++ b/Aaru.Devices/Device/ScsiCommands/HP.cs
@@ -32,74 +32,73 @@
 
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sends the HP READ LONG vendor command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="relAddr">If set to <c>true</c> address contain two's complement offset from last read address.</param>
+    /// <param name="address">PBA/LBA to read.</param>
+    /// <param name="blockBytes">How many bytes per block.</param>
+    /// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool HpReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address, ushort blockBytes,
+                           bool pba, uint timeout, out double duration) =>
+        HpReadLong(out buffer, out senseBuffer, relAddr, address, 0, blockBytes, pba, false, timeout, out duration);
+
+    /// <summary>Sends the HP READ LONG vendor command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="relAddr">If set to <c>true</c> address contain two's complement offset from last read address.</param>
+    /// <param name="address">PBA/LBA to read.</param>
+    /// <param name="transferLen">How many blocks/bytes to read.</param>
+    /// <param name="blockBytes">How many bytes per block.</param>
+    /// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
+    /// <param name="sectorCount">
+    ///     If set to <c>true</c> <paramref name="transferLen" /> is a count of secors to read. Otherwise
+    ///     it will be ignored
+    /// </param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool HpReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address,
+                           ushort transferLen, ushort blockBytes, bool pba, bool sectorCount, uint timeout,
+                           out double duration)
     {
-        /// <summary>Sends the HP READ LONG vendor command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="relAddr">If set to <c>true</c> address contain two's complement offset from last read address.</param>
-        /// <param name="address">PBA/LBA to read.</param>
-        /// <param name="blockBytes">How many bytes per block.</param>
-        /// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool HpReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address, ushort blockBytes,
-                               bool pba, uint timeout, out double duration) =>
-            HpReadLong(out buffer, out senseBuffer, relAddr, address, 0, blockBytes, pba, false, timeout, out duration);
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
 
-        /// <summary>Sends the HP READ LONG vendor command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="relAddr">If set to <c>true</c> address contain two's complement offset from last read address.</param>
-        /// <param name="address">PBA/LBA to read.</param>
-        /// <param name="transferLen">How many blocks/bytes to read.</param>
-        /// <param name="blockBytes">How many bytes per block.</param>
-        /// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
-        /// <param name="sectorCount">
-        ///     If set to <c>true</c> <paramref name="transferLen" /> is a count of secors to read. Otherwise
-        ///     it will be ignored
-        /// </param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool HpReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address,
-                               ushort transferLen, ushort blockBytes, bool pba, bool sectorCount, uint timeout,
-                               out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
+        cdb[0] = (byte)ScsiCommands.ReadLong;
 
-            cdb[0] = (byte)ScsiCommands.ReadLong;
+        if(relAddr)
+            cdb[1] += 0x01;
 
-            if(relAddr)
-                cdb[1] += 0x01;
+        cdb[2] = (byte)((address & 0xFF000000) >> 24);
+        cdb[3] = (byte)((address & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((address & 0xFF00)     >> 8);
+        cdb[5] = (byte)(address & 0xFF);
+        cdb[7] = (byte)((transferLen & 0xFF00) >> 8);
+        cdb[8] = (byte)(transferLen & 0xFF);
 
-            cdb[2] = (byte)((address & 0xFF000000) >> 24);
-            cdb[3] = (byte)((address & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((address & 0xFF00)     >> 8);
-            cdb[5] = (byte)(address & 0xFF);
-            cdb[7] = (byte)((transferLen & 0xFF00) >> 8);
-            cdb[8] = (byte)(transferLen & 0xFF);
+        if(pba)
+            cdb[9] += 0x80;
 
-            if(pba)
-                cdb[9] += 0x80;
+        if(sectorCount)
+            cdb[9] += 0x40;
 
-            if(sectorCount)
-                cdb[9] += 0x40;
+        buffer = sectorCount ? new byte[blockBytes * transferLen] : new byte[transferLen];
 
-            buffer = sectorCount ? new byte[blockBytes * transferLen] : new byte[transferLen];
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("SCSI Device", "HP READ LONG took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "HP READ LONG took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/Kreon.cs b/Aaru.Devices/Device/ScsiCommands/Kreon.cs
index 61bd3b426..43c4d7d4a 100644
--- a/Aaru.Devices/Device/ScsiCommands/Kreon.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Kreon.cs
@@ -33,213 +33,212 @@
 using System;
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sets the drive to the xtreme unlocked state</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool KreonDeprecatedUnlock(out byte[] senseBuffer, uint timeout, out double duration)
     {
-        /// <summary>Sets the drive to the xtreme unlocked state</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool KreonDeprecatedUnlock(out byte[] senseBuffer, uint timeout, out double duration)
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = Array.Empty<byte>();
+
+        cdb[0] = (byte)ScsiCommands.KreonCommand;
+        cdb[1] = 0x08;
+        cdb[2] = 0x01;
+        cdb[3] = 0x01;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "KREON DEPRECATED UNLOCK took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sets the drive to the locked state.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool KreonLock(out byte[] senseBuffer, uint timeout, out double duration) =>
+        KreonSetLockState(out senseBuffer, KreonLockStates.Locked, timeout, out duration);
+
+    /// <summary>Sets the drive to the xtreme unlocked state</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool KreonUnlockXtreme(out byte[] senseBuffer, uint timeout, out double duration) =>
+        KreonSetLockState(out senseBuffer, KreonLockStates.Xtreme, timeout, out duration);
+
+    /// <summary>Sets the drive to the wxripper unlocked state</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool KreonUnlockWxripper(out byte[] senseBuffer, uint timeout, out double duration) =>
+        KreonSetLockState(out senseBuffer, KreonLockStates.Wxripper, timeout, out duration);
+
+    /// <summary>Sets the drive to the specified lock state</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    /// <param name="state">Lock state</param>
+    public bool KreonSetLockState(out byte[] senseBuffer, KreonLockStates state, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = Array.Empty<byte>();
+
+        cdb[0] = (byte)ScsiCommands.KreonCommand;
+        cdb[1] = 0x08;
+        cdb[2] = 0x01;
+        cdb[3] = 0x11;
+        cdb[4] = (byte)state;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "KREON SET LOCK STATE took {0} ms.", duration);
+
+        return sense || Error;
+    }
+
+    /// <summary>Gets a list of supported features</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    /// <param name="features">Features supported by drive.</param>
+    public bool KreonGetFeatureList(out byte[] senseBuffer, out KreonFeatures features, uint timeout,
+                                    out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = new byte[26];
+        features = 0;
+
+        cdb[0] = (byte)ScsiCommands.KreonCommand;
+        cdb[1] = 0x08;
+        cdb[2] = 0x01;
+        cdb[3] = 0x10;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "KREON GET FEATURE LIST took {0} ms.", duration);
+
+        if(sense)
+            return true;
+
+        if(buffer[0] != 0xA5 ||
+           buffer[1] != 0x5A ||
+           buffer[2] != 0x5A ||
+           buffer[3] != 0xA5)
+            return true;
+
+        for(int i = 4; i < 26; i += 2)
         {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = Array.Empty<byte>();
+            ushort feature = BitConverter.ToUInt16(buffer, i);
 
-            cdb[0] = (byte)ScsiCommands.KreonCommand;
-            cdb[1] = 0x08;
-            cdb[2] = 0x01;
-            cdb[3] = 0x01;
+            if(feature == 0x0000)
+                break;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "KREON DEPRECATED UNLOCK took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sets the drive to the locked state.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool KreonLock(out byte[] senseBuffer, uint timeout, out double duration) =>
-            KreonSetLockState(out senseBuffer, KreonLockStates.Locked, timeout, out duration);
-
-        /// <summary>Sets the drive to the xtreme unlocked state</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool KreonUnlockXtreme(out byte[] senseBuffer, uint timeout, out double duration) =>
-            KreonSetLockState(out senseBuffer, KreonLockStates.Xtreme, timeout, out duration);
-
-        /// <summary>Sets the drive to the wxripper unlocked state</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool KreonUnlockWxripper(out byte[] senseBuffer, uint timeout, out double duration) =>
-            KreonSetLockState(out senseBuffer, KreonLockStates.Wxripper, timeout, out duration);
-
-        /// <summary>Sets the drive to the specified lock state</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        /// <param name="state">Lock state</param>
-        public bool KreonSetLockState(out byte[] senseBuffer, KreonLockStates state, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = Array.Empty<byte>();
-
-            cdb[0] = (byte)ScsiCommands.KreonCommand;
-            cdb[1] = 0x08;
-            cdb[2] = 0x01;
-            cdb[3] = 0x11;
-            cdb[4] = (byte)state;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "KREON SET LOCK STATE took {0} ms.", duration);
-
-            return sense || Error;
-        }
-
-        /// <summary>Gets a list of supported features</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        /// <param name="features">Features supported by drive.</param>
-        public bool KreonGetFeatureList(out byte[] senseBuffer, out KreonFeatures features, uint timeout,
-                                        out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = new byte[26];
-            features = 0;
-
-            cdb[0] = (byte)ScsiCommands.KreonCommand;
-            cdb[1] = 0x08;
-            cdb[2] = 0x01;
-            cdb[3] = 0x10;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "KREON GET FEATURE LIST took {0} ms.", duration);
-
-            if(sense)
-                return true;
-
-            if(buffer[0] != 0xA5 ||
-               buffer[1] != 0x5A ||
-               buffer[2] != 0x5A ||
-               buffer[3] != 0xA5)
-                return true;
-
-            for(int i = 4; i < 26; i += 2)
+            switch(feature)
             {
-                ushort feature = BitConverter.ToUInt16(buffer, i);
+                case 0x0001:
+                    features |= KreonFeatures.XtremeUnlock360;
 
-                if(feature == 0x0000)
                     break;
+                case 0x0101:
+                    features |= KreonFeatures.WxripperUnlock360;
 
-                switch(feature)
-                {
-                    case 0x0001:
-                        features |= KreonFeatures.XtremeUnlock360;
+                    break;
+                case 0x2001:
+                    features |= KreonFeatures.DecryptSs360;
 
-                        break;
-                    case 0x0101:
-                        features |= KreonFeatures.WxripperUnlock360;
+                    break;
+                case 0x2101:
+                    features |= KreonFeatures.ChallengeResponse360;
 
-                        break;
-                    case 0x2001:
-                        features |= KreonFeatures.DecryptSs360;
+                    break;
+                case 0x0002:
+                    features |= KreonFeatures.XtremeUnlock;
 
-                        break;
-                    case 0x2101:
-                        features |= KreonFeatures.ChallengeResponse360;
+                    break;
+                case 0x0102:
+                    features |= KreonFeatures.WxripperUnlock;
 
-                        break;
-                    case 0x0002:
-                        features |= KreonFeatures.XtremeUnlock;
+                    break;
+                case 0x2002:
+                    features |= KreonFeatures.DecryptSs;
 
-                        break;
-                    case 0x0102:
-                        features |= KreonFeatures.WxripperUnlock;
+                    break;
+                case 0x2102:
+                    features |= KreonFeatures.ChallengeResponse;
 
-                        break;
-                    case 0x2002:
-                        features |= KreonFeatures.DecryptSs;
+                    break;
+                case 0x00F0:
+                    features |= KreonFeatures.Lock;
 
-                        break;
-                    case 0x2102:
-                        features |= KreonFeatures.ChallengeResponse;
+                    break;
+                case 0x01F0:
+                    features |= KreonFeatures.ErrorSkipping;
 
-                        break;
-                    case 0x00F0:
-                        features |= KreonFeatures.Lock;
-
-                        break;
-                    case 0x01F0:
-                        features |= KreonFeatures.ErrorSkipping;
-
-                        break;
-                }
+                    break;
             }
-
-            return false;
         }
 
-        /// <summary>Gets the SS sector.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        /// <param name="buffer">The SS sector.</param>
-        /// <param name="requestNumber">Request number.</param>
-        public bool KreonExtractSs(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration,
-                                   byte requestNumber = 0x00)
-        {
-            buffer = new byte[2048];
-            byte[] cdb = new byte[12];
-            senseBuffer = new byte[64];
+        return false;
+    }
 
-            cdb[0]  = (byte)ScsiCommands.KreonSsCommand;
-            cdb[1]  = 0x00;
-            cdb[2]  = 0xFF;
-            cdb[3]  = 0x02;
-            cdb[4]  = 0xFD;
-            cdb[5]  = 0xFF;
-            cdb[6]  = 0xFE;
-            cdb[7]  = 0x00;
-            cdb[8]  = 0x08;
-            cdb[9]  = 0x00;
-            cdb[10] = requestNumber;
-            cdb[11] = 0xC0;
+    /// <summary>Gets the SS sector.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    /// <param name="buffer">The SS sector.</param>
+    /// <param name="requestNumber">Request number.</param>
+    public bool KreonExtractSs(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration,
+                               byte requestNumber = 0x00)
+    {
+        buffer = new byte[2048];
+        byte[] cdb = new byte[12];
+        senseBuffer = new byte[64];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        cdb[0]  = (byte)ScsiCommands.KreonSsCommand;
+        cdb[1]  = 0x00;
+        cdb[2]  = 0xFF;
+        cdb[3]  = 0x02;
+        cdb[4]  = 0xFD;
+        cdb[5]  = 0xFF;
+        cdb[6]  = 0xFE;
+        cdb[7]  = 0x00;
+        cdb[8]  = 0x08;
+        cdb[9]  = 0x00;
+        cdb[10] = requestNumber;
+        cdb[11] = 0xC0;
 
-            Error = LastError != 0;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "KREON EXTRACT SS took {0} ms.", duration);
+        Error = LastError != 0;
 
-            return sense || Error;
-        }
+        AaruConsole.DebugWriteLine("SCSI Device", "KREON EXTRACT SS took {0} ms.", duration);
+
+        return sense || Error;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/MMC.cs b/Aaru.Devices/Device/ScsiCommands/MMC.cs
index 59cd7b08d..96bf0972c 100644
--- a/Aaru.Devices/Device/ScsiCommands/MMC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/MMC.cs
@@ -35,303 +35,287 @@ using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sends the MMC GET CONFIGURATION command for all Features</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI GET CONFIGURATION response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool GetConfiguration(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        GetConfiguration(out buffer, out senseBuffer, 0x0000, MmcGetConfigurationRt.All, timeout, out duration);
+
+    /// <summary>Sends the MMC GET CONFIGURATION command for all Features starting with specified one</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI GET CONFIGURATION response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="startingFeatureNumber">Feature number where the feature list should start from</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool GetConfiguration(out byte[] buffer, out byte[] senseBuffer, ushort startingFeatureNumber,
+                                 uint timeout, out double duration) =>
+        GetConfiguration(out buffer, out senseBuffer, startingFeatureNumber, MmcGetConfigurationRt.All, timeout,
+                         out duration);
+
+    /// <summary>Sends the MMC GET CONFIGURATION command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI GET CONFIGURATION response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="startingFeatureNumber">Starting Feature number.</param>
+    /// <param name="rt">Return type, <see cref="MmcGetConfigurationRt" />.</param>
+    public bool GetConfiguration(out byte[] buffer, out byte[] senseBuffer, ushort startingFeatureNumber,
+                                 MmcGetConfigurationRt rt, uint timeout, out double duration)
     {
-        /// <summary>Sends the MMC GET CONFIGURATION command for all Features</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI GET CONFIGURATION response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool GetConfiguration(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            GetConfiguration(out buffer, out senseBuffer, 0x0000, MmcGetConfigurationRt.All, timeout, out duration);
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+        buffer = new byte[8];
 
-        /// <summary>Sends the MMC GET CONFIGURATION command for all Features starting with specified one</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI GET CONFIGURATION response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="startingFeatureNumber">Feature number where the feature list should start from</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool GetConfiguration(out byte[] buffer, out byte[] senseBuffer, ushort startingFeatureNumber,
-                                     uint timeout, out double duration) =>
-            GetConfiguration(out buffer, out senseBuffer, startingFeatureNumber, MmcGetConfigurationRt.All, timeout,
-                             out duration);
+        cdb[0] = (byte)ScsiCommands.GetConfiguration;
+        cdb[1] = (byte)((byte)rt & 0x03);
+        cdb[2] = (byte)((startingFeatureNumber & 0xFF00) >> 8);
+        cdb[3] = (byte)(startingFeatureNumber & 0xFF);
+        cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8);
+        cdb[8] = (byte)(buffer.Length & 0xFF);
+        cdb[9] = 0;
 
-        /// <summary>Sends the MMC GET CONFIGURATION command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI GET CONFIGURATION response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="startingFeatureNumber">Starting Feature number.</param>
-        /// <param name="rt">Return type, <see cref="MmcGetConfigurationRt" />.</param>
-        public bool GetConfiguration(out byte[] buffer, out byte[] senseBuffer, ushort startingFeatureNumber,
-                                     MmcGetConfigurationRt rt, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-            buffer = new byte[8];
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            cdb[0] = (byte)ScsiCommands.GetConfiguration;
-            cdb[1] = (byte)((byte)rt & 0x03);
-            cdb[2] = (byte)((startingFeatureNumber & 0xFF00) >> 8);
-            cdb[3] = (byte)(startingFeatureNumber & 0xFF);
-            cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8);
-            cdb[8] = (byte)(buffer.Length & 0xFF);
-            cdb[9] = 0;
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        if(sense)
+            return true;
 
-            Error = LastError != 0;
+        ushort confLength = (ushort)((buffer[2] << 8) + buffer[3] + 4);
+        buffer      = new byte[confLength];
+        cdb[7]      = (byte)((buffer.Length & 0xFF00) >> 8);
+        cdb[8]      = (byte)(buffer.Length & 0xFF);
+        senseBuffer = new byte[64];
 
-            if(sense)
-                return true;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out sense);
 
-            ushort confLength = (ushort)((buffer[2] << 8) + buffer[3] + 4);
-            buffer      = new byte[confLength];
-            cdb[7]      = (byte)((buffer.Length & 0xFF00) >> 8);
-            cdb[8]      = (byte)(buffer.Length & 0xFF);
-            senseBuffer = new byte[64];
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out sense);
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "GET CONFIGURATION (Starting Feature Number: {1}, Return Type: {2}, Sense: {3}, Last Error: {4}) took {0} ms.",
+                                   duration, startingFeatureNumber, rt, sense, LastError);
 
-            Error = LastError != 0;
+        return sense;
+    }
 
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "GET CONFIGURATION (Starting Feature Number: {1}, Return Type: {2}, Sense: {3}, Last Error: {4}) took {0} ms.",
-                                       duration, startingFeatureNumber, rt, sense, LastError);
+    /// <summary>Sends the MMC READ DISC STRUCTURE command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ DISC STRUCTURE response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="mediaType">Medium type for requested disc structure</param>
+    /// <param name="address">Medium address for requested disc structure</param>
+    /// <param name="layerNumber">Medium layer for requested disc structure</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="format">Which disc structure are we requesting</param>
+    /// <param name="agid">AGID used in medium copy protection</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadDiscStructure(out byte[] buffer, out byte[] senseBuffer, MmcDiscStructureMediaType mediaType,
+                                  uint address, byte layerNumber, MmcDiscStructureFormat format, byte agid,
+                                  uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+        buffer = new byte[8];
 
-            return sense;
-        }
+        cdb[0]  = (byte)ScsiCommands.ReadDiscStructure;
+        cdb[1]  = (byte)((byte)mediaType & 0x0F);
+        cdb[2]  = (byte)((address & 0xFF000000) >> 24);
+        cdb[3]  = (byte)((address & 0xFF0000)   >> 16);
+        cdb[4]  = (byte)((address & 0xFF00)     >> 8);
+        cdb[5]  = (byte)(address & 0xFF);
+        cdb[6]  = layerNumber;
+        cdb[7]  = (byte)format;
+        cdb[8]  = (byte)((buffer.Length & 0xFF00) >> 8);
+        cdb[9]  = (byte)(buffer.Length & 0xFF);
+        cdb[10] = (byte)((agid & 0x03) << 6);
 
-        /// <summary>Sends the MMC READ DISC STRUCTURE command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ DISC STRUCTURE response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="mediaType">Medium type for requested disc structure</param>
-        /// <param name="address">Medium address for requested disc structure</param>
-        /// <param name="layerNumber">Medium layer for requested disc structure</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="format">Which disc structure are we requesting</param>
-        /// <param name="agid">AGID used in medium copy protection</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadDiscStructure(out byte[] buffer, out byte[] senseBuffer, MmcDiscStructureMediaType mediaType,
-                                      uint address, byte layerNumber, MmcDiscStructureFormat format, byte agid,
-                                      uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-            buffer = new byte[8];
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            cdb[0]  = (byte)ScsiCommands.ReadDiscStructure;
-            cdb[1]  = (byte)((byte)mediaType & 0x0F);
-            cdb[2]  = (byte)((address & 0xFF000000) >> 24);
-            cdb[3]  = (byte)((address & 0xFF0000)   >> 16);
-            cdb[4]  = (byte)((address & 0xFF00)     >> 8);
-            cdb[5]  = (byte)(address & 0xFF);
-            cdb[6]  = layerNumber;
-            cdb[7]  = (byte)format;
-            cdb[8]  = (byte)((buffer.Length & 0xFF00) >> 8);
-            cdb[9]  = (byte)(buffer.Length & 0xFF);
-            cdb[10] = (byte)((agid & 0x03) << 6);
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        if(sense)
+            return true;
 
-            Error = LastError != 0;
+        ushort strctLength = (ushort)((buffer[0] << 8) + buffer[1] + 2);
 
-            if(sense)
-                return true;
+        // WORKAROUND: Some drives return incorrect length information. As these structures are fixed length just apply known length.
+        if(mediaType == MmcDiscStructureMediaType.Bd)
+            switch(format)
+            {
+                case MmcDiscStructureFormat.DiscInformation:
+                    buffer = new byte[4100];
 
-            ushort strctLength = (ushort)((buffer[0] << 8) + buffer[1] + 2);
+                    break;
+                case MmcDiscStructureFormat.BdBurstCuttingArea:
+                    buffer = new byte[68];
 
-            // WORKAROUND: Some drives return incorrect length information. As these structures are fixed length just apply known length.
-            if(mediaType == MmcDiscStructureMediaType.Bd)
-                switch(format)
-                {
-                    case MmcDiscStructureFormat.DiscInformation:
-                        buffer = new byte[4100];
+                    break;
+                case MmcDiscStructureFormat.BdDds:
+                    buffer = new byte[strctLength < 100 ? 100 : strctLength];
 
-                        break;
-                    case MmcDiscStructureFormat.BdBurstCuttingArea:
-                        buffer = new byte[68];
+                    break;
+                case MmcDiscStructureFormat.CartridgeStatus:
+                    buffer = new byte[8];
 
-                        break;
-                    case MmcDiscStructureFormat.BdDds:
-                        buffer = new byte[strctLength < 100 ? 100 : strctLength];
+                    break;
+                case MmcDiscStructureFormat.BdSpareAreaInformation:
+                    buffer = new byte[16];
 
-                        break;
-                    case MmcDiscStructureFormat.CartridgeStatus:
-                        buffer = new byte[8];
+                    break;
+                default:
+                    buffer = new byte[strctLength];
 
-                        break;
-                    case MmcDiscStructureFormat.BdSpareAreaInformation:
-                        buffer = new byte[16];
-
-                        break;
-                    default:
-                        buffer = new byte[strctLength];
-
-                        break;
-                }
-            else
-                buffer = new byte[strctLength];
-
-            cdb[8]      = (byte)((buffer.Length & 0xFF00) >> 8);
-            cdb[9]      = (byte)(buffer.Length & 0xFF);
-            senseBuffer = new byte[64];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "READ DISC STRUCTURE (Media Type: {1}, Address: {2}, Layer Number: {3}, Format: {4}, AGID: {5}, Sense: {6}, Last Error: {7}) took {0} ms.",
-                                       duration, mediaType, address, layerNumber, format, agid, sense, LastError);
-
-            return sense;
-        }
-
-        /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get formatted TOC from disc, in MM:SS:FF format</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="track">Start TOC from this track</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadToc(out byte[] buffer, out byte[] senseBuffer, byte track, uint timeout, out double duration) =>
-            ReadTocPmaAtip(out buffer, out senseBuffer, true, 0, track, timeout, out duration);
-
-        /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get formatted TOC from disc</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="msf">If <c>true</c>, request data in MM:SS:FF units, otherwise, in blocks</param>
-        /// <param name="track">Start TOC from this track</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadToc(out byte[] buffer, out byte[] senseBuffer, bool msf, byte track, uint timeout,
-                            out double duration) =>
-            ReadTocPmaAtip(out buffer, out senseBuffer, msf, 0, track, timeout, out duration);
-
-        /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get multi-session information, in MM:SS:FF format</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadSessionInfo(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ReadTocPmaAtip(out buffer, out senseBuffer, true, 1, 0, timeout, out duration);
-
-        /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get multi-session information</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="msf">If <c>true</c>, request data in MM:SS:FF units, otherwise, in blocks</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadSessionInfo(out byte[] buffer, out byte[] senseBuffer, bool msf, uint timeout,
-                                    out double duration) =>
-            ReadTocPmaAtip(out buffer, out senseBuffer, msf, 1, 0, timeout, out duration);
-
-        /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get raw TOC subchannels</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sessionNumber">Session which TOC to get</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadRawToc(out byte[] buffer, out byte[] senseBuffer, byte sessionNumber, uint timeout,
-                               out double duration) =>
-            ReadTocPmaAtip(out buffer, out senseBuffer, true, 2, sessionNumber, timeout, out duration);
-
-        /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get PMA</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadPma(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ReadTocPmaAtip(out buffer, out senseBuffer, true, 3, 0, timeout, out duration);
-
-        /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get ATIP</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadAtip(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ReadTocPmaAtip(out buffer, out senseBuffer, true, 4, 0, timeout, out duration);
-
-        /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get Lead-In CD-TEXT</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadCdText(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ReadTocPmaAtip(out buffer, out senseBuffer, true, 5, 0, timeout, out duration);
-
-        /// <summary>Sends the MMC READ TOC/PMA/ATIP command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="msf">If <c>true</c>, request data in MM:SS:FF units, otherwise, in blocks</param>
-        /// <param name="format">What structure is requested</param>
-        /// <param name="trackSessionNumber">Track/Session number</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadTocPmaAtip(out byte[] buffer, out byte[] senseBuffer, bool msf, byte format,
-                                   byte trackSessionNumber, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-
-            byte[] tmpBuffer = (format & 0x0F) == 5 ? new byte[32768] : new byte[1536];
-
-            cdb[0] = (byte)ScsiCommands.ReadTocPmaAtip;
-
-            if(msf)
-                cdb[1] = 0x02;
-
-            cdb[2] = (byte)(format & 0x0F);
-            cdb[6] = trackSessionNumber;
-            cdb[7] = (byte)((tmpBuffer.Length & 0xFF00) >> 8);
-            cdb[8] = (byte)(tmpBuffer.Length & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref tmpBuffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            uint strctLength = (uint)((tmpBuffer[0] << 8) + tmpBuffer[1] + 2);
+                    break;
+            }
+        else
             buffer = new byte[strctLength];
 
-            if(buffer.Length <= tmpBuffer.Length)
-            {
-                Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length);
+        cdb[8]      = (byte)((buffer.Length & 0xFF00) >> 8);
+        cdb[9]      = (byte)(buffer.Length & 0xFF);
+        senseBuffer = new byte[64];
 
-                AaruConsole.DebugWriteLine("SCSI Device",
-                                           "READ TOC/PMA/ATIP took (MSF: {1}, Format: {2}, Track/Session Number: {3}, Sense: {4}, LastError: {5}) {0} ms.",
-                                           duration, msf, format, trackSessionNumber, sense, LastError);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out sense);
 
-                return sense;
-            }
+        Error = LastError != 0;
 
-            double tmpDuration = duration;
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "READ DISC STRUCTURE (Media Type: {1}, Address: {2}, Layer Number: {3}, Format: {4}, AGID: {5}, Sense: {6}, Last Error: {7}) took {0} ms.",
+                                   duration, mediaType, address, layerNumber, format, agid, sense, LastError);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out sense);
+        return sense;
+    }
 
-            Error = LastError != 0;
+    /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get formatted TOC from disc, in MM:SS:FF format</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="track">Start TOC from this track</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadToc(out byte[] buffer, out byte[] senseBuffer, byte track, uint timeout, out double duration) =>
+        ReadTocPmaAtip(out buffer, out senseBuffer, true, 0, track, timeout, out duration);
 
-            duration += tmpDuration;
+    /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get formatted TOC from disc</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="msf">If <c>true</c>, request data in MM:SS:FF units, otherwise, in blocks</param>
+    /// <param name="track">Start TOC from this track</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadToc(out byte[] buffer, out byte[] senseBuffer, bool msf, byte track, uint timeout,
+                        out double duration) =>
+        ReadTocPmaAtip(out buffer, out senseBuffer, msf, 0, track, timeout, out duration);
+
+    /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get multi-session information, in MM:SS:FF format</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadSessionInfo(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ReadTocPmaAtip(out buffer, out senseBuffer, true, 1, 0, timeout, out duration);
+
+    /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get multi-session information</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="msf">If <c>true</c>, request data in MM:SS:FF units, otherwise, in blocks</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadSessionInfo(out byte[] buffer, out byte[] senseBuffer, bool msf, uint timeout,
+                                out double duration) =>
+        ReadTocPmaAtip(out buffer, out senseBuffer, msf, 1, 0, timeout, out duration);
+
+    /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get raw TOC subchannels</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sessionNumber">Session which TOC to get</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadRawToc(out byte[] buffer, out byte[] senseBuffer, byte sessionNumber, uint timeout,
+                           out double duration) =>
+        ReadTocPmaAtip(out buffer, out senseBuffer, true, 2, sessionNumber, timeout, out duration);
+
+    /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get PMA</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadPma(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ReadTocPmaAtip(out buffer, out senseBuffer, true, 3, 0, timeout, out duration);
+
+    /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get ATIP</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadAtip(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ReadTocPmaAtip(out buffer, out senseBuffer, true, 4, 0, timeout, out duration);
+
+    /// <summary>Sends the MMC READ TOC/PMA/ATIP command to get Lead-In CD-TEXT</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadCdText(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ReadTocPmaAtip(out buffer, out senseBuffer, true, 5, 0, timeout, out duration);
+
+    /// <summary>Sends the MMC READ TOC/PMA/ATIP command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ TOC/PMA/ATIP response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="msf">If <c>true</c>, request data in MM:SS:FF units, otherwise, in blocks</param>
+    /// <param name="format">What structure is requested</param>
+    /// <param name="trackSessionNumber">Track/Session number</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadTocPmaAtip(out byte[] buffer, out byte[] senseBuffer, bool msf, byte format,
+                               byte trackSessionNumber, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+
+        byte[] tmpBuffer = (format & 0x0F) == 5 ? new byte[32768] : new byte[1536];
+
+        cdb[0] = (byte)ScsiCommands.ReadTocPmaAtip;
+
+        if(msf)
+            cdb[1] = 0x02;
+
+        cdb[2] = (byte)(format & 0x0F);
+        cdb[6] = trackSessionNumber;
+        cdb[7] = (byte)((tmpBuffer.Length & 0xFF00) >> 8);
+        cdb[8] = (byte)(tmpBuffer.Length & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref tmpBuffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        uint strctLength = (uint)((tmpBuffer[0] << 8) + tmpBuffer[1] + 2);
+        buffer = new byte[strctLength];
+
+        if(buffer.Length <= tmpBuffer.Length)
+        {
+            Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length);
 
             AaruConsole.DebugWriteLine("SCSI Device",
                                        "READ TOC/PMA/ATIP took (MSF: {1}, Format: {2}, Track/Session Number: {3}, Sense: {4}, LastError: {5}) {0} ms.",
@@ -340,482 +324,497 @@ namespace Aaru.Devices
             return sense;
         }
 
-        /// <summary>Sends the MMC READ DISC INFORMATION command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ DISC INFORMATION response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadDiscInformation(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ReadDiscInformation(out buffer, out senseBuffer, MmcDiscInformationDataTypes.DiscInformation, timeout,
-                                out duration);
+        double tmpDuration = duration;
 
-        /// <summary>Sends the MMC READ DISC INFORMATION command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ DISC INFORMATION response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="dataType">Which disc information to read</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadDiscInformation(out byte[] buffer, out byte[] senseBuffer, MmcDiscInformationDataTypes dataType,
-                                        uint timeout, out double duration)
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out sense);
+
+        Error = LastError != 0;
+
+        duration += tmpDuration;
+
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "READ TOC/PMA/ATIP took (MSF: {1}, Format: {2}, Track/Session Number: {3}, Sense: {4}, LastError: {5}) {0} ms.",
+                                   duration, msf, format, trackSessionNumber, sense, LastError);
+
+        return sense;
+    }
+
+    /// <summary>Sends the MMC READ DISC INFORMATION command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ DISC INFORMATION response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadDiscInformation(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ReadDiscInformation(out buffer, out senseBuffer, MmcDiscInformationDataTypes.DiscInformation, timeout,
+                            out duration);
+
+    /// <summary>Sends the MMC READ DISC INFORMATION command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ DISC INFORMATION response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="dataType">Which disc information to read</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadDiscInformation(out byte[] buffer, out byte[] senseBuffer, MmcDiscInformationDataTypes dataType,
+                                    uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb       = new byte[10];
+        byte[] tmpBuffer = new byte[804];
+
+        cdb[0] = (byte)ScsiCommands.ReadDiscInformation;
+        cdb[1] = (byte)dataType;
+        cdb[7] = (byte)((tmpBuffer.Length & 0xFF00) >> 8);
+        cdb[8] = (byte)(tmpBuffer.Length & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref tmpBuffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        uint strctLength = (uint)((tmpBuffer[0] << 8) + tmpBuffer[1] + 2);
+
+        if(strctLength > tmpBuffer.Length)
+            strctLength = (uint)tmpBuffer.Length;
+
+        buffer = new byte[strctLength];
+        Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length);
+
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "READ DISC INFORMATION (Data Type: {1}, Sense: {2}, Last Error: {3}) took {0} ms.",
+                                   duration, dataType, sense, LastError);
+
+        return sense;
+    }
+
+    /// <summary>Sends the MMC READ CD command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the MMC READ CD response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Start block address.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    /// <param name="blockSize">Block size.</param>
+    /// <param name="expectedSectorType">Expected sector type.</param>
+    /// <param name="dap">If set to <c>true</c> CD-DA should be modified by mute and interpolation</param>
+    /// <param name="relAddr">If set to <c>true</c> address is relative to current position.</param>
+    /// <param name="sync">If set to <c>true</c> we request the sync bytes for data sectors.</param>
+    /// <param name="headerCodes">Header codes.</param>
+    /// <param name="userData">If set to <c>true</c> we request the user data.</param>
+    /// <param name="edcEcc">If set to <c>true</c> we request the EDC/ECC fields for data sectors.</param>
+    /// <param name="c2Error">C2 error options.</param>
+    /// <param name="subchannel">Subchannel selection.</param>
+    public bool ReadCd(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint transferLength,
+                       MmcSectorTypes expectedSectorType, bool dap, bool relAddr, bool sync,
+                       MmcHeaderCodes headerCodes, bool userData, bool edcEcc, MmcErrorField c2Error,
+                       MmcSubchannel subchannel, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0] = (byte)ScsiCommands.ReadCd;
+        cdb[1] = (byte)((byte)expectedSectorType << 2);
+
+        if(dap)
+            cdb[1] += 0x02;
+
+        if(relAddr)
+            cdb[1] += 0x01;
+
+        cdb[2] =  (byte)((lba & 0xFF000000) >> 24);
+        cdb[3] =  (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4] =  (byte)((lba & 0xFF00)     >> 8);
+        cdb[5] =  (byte)(lba & 0xFF);
+        cdb[6] =  (byte)((transferLength & 0xFF0000) >> 16);
+        cdb[7] =  (byte)((transferLength & 0xFF00)   >> 8);
+        cdb[8] =  (byte)(transferLength & 0xFF);
+        cdb[9] =  (byte)((byte)c2Error     << 1);
+        cdb[9] += (byte)((byte)headerCodes << 5);
+
+        if(sync)
+            cdb[9] += 0x80;
+
+        if(userData)
+            cdb[9] += 0x10;
+
+        if(edcEcc)
+            cdb[9] += 0x08;
+
+        cdb[10] = (byte)subchannel;
+
+        buffer = new byte[blockSize * transferLength];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "READ CD (LBA: {1}, Block Size: {2}, Transfer Length: {3}, Expected Sector Type: {4}, DAP: {5}, Relative Address: {6}, Sync: {7}, Headers: {8}, User Data: {9}, ECC/EDC: {10}, C2: {11}, Subchannel: {12}, Sense: {13}, Last Error: {14}) took {0} ms.",
+                                   duration, lba, blockSize, transferLength, expectedSectorType, dap, relAddr, sync,
+                                   headerCodes, userData, edcEcc, c2Error, subchannel, sense, LastError);
+
+        return sense;
+    }
+
+    /// <summary>Sends the MMC READ CD MSF command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the MMC READ CD MSF response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="startMsf">Start MM:SS:FF of read encoded as 0x00MMSSFF.</param>
+    /// <param name="endMsf">End MM:SS:FF of read encoded as 0x00MMSSFF.</param>
+    /// <param name="blockSize">Block size.</param>
+    /// <param name="expectedSectorType">Expected sector type.</param>
+    /// <param name="dap">If set to <c>true</c> CD-DA should be modified by mute and interpolation</param>
+    /// <param name="sync">If set to <c>true</c> we request the sync bytes for data sectors.</param>
+    /// <param name="headerCodes">Header codes.</param>
+    /// <param name="userData">If set to <c>true</c> we request the user data.</param>
+    /// <param name="edcEcc">If set to <c>true</c> we request the EDC/ECC fields for data sectors.</param>
+    /// <param name="c2Error">C2 error options.</param>
+    /// <param name="subchannel">Subchannel selection.</param>
+    public bool ReadCdMsf(out byte[] buffer, out byte[] senseBuffer, uint startMsf, uint endMsf, uint blockSize,
+                          MmcSectorTypes expectedSectorType, bool dap, bool sync, MmcHeaderCodes headerCodes,
+                          bool userData, bool edcEcc, MmcErrorField c2Error, MmcSubchannel subchannel, uint timeout,
+                          out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0] = (byte)ScsiCommands.ReadCdMsf;
+        cdb[1] = (byte)((byte)expectedSectorType << 2);
+
+        if(dap)
+            cdb[1] += 0x02;
+
+        cdb[3] =  (byte)((startMsf & 0xFF0000) >> 16);
+        cdb[4] =  (byte)((startMsf & 0xFF00)   >> 8);
+        cdb[5] =  (byte)(startMsf & 0xFF);
+        cdb[6] =  (byte)((endMsf & 0xFF0000) >> 16);
+        cdb[7] =  (byte)((endMsf & 0xFF00)   >> 8);
+        cdb[8] =  (byte)(endMsf & 0xFF);
+        cdb[9] =  (byte)((byte)c2Error     << 1);
+        cdb[9] += (byte)((byte)headerCodes << 5);
+
+        if(sync)
+            cdb[9] += 0x80;
+
+        if(userData)
+            cdb[9] += 0x10;
+
+        if(edcEcc)
+            cdb[9] += 0x08;
+
+        cdb[10] = (byte)subchannel;
+
+        uint transferLength = (uint)(((cdb[6] - cdb[3]) * 60 * 75) + ((cdb[7] - cdb[4]) * 75) + (cdb[8] - cdb[5]));
+
+        buffer = new byte[blockSize * transferLength];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "READ CD MSF (Start MSF: {1}, End MSF: {2}, Block Size: {3}, Expected Sector Type: {4}, DAP: {5}, Sync: {6}, Headers: {7}, User Data: {8}, ECC/EDC: {9}, C2: {10}, Subchannel: {11}, Sense: {12}, LastError: {13}) took {0} ms.",
+                                   duration, startMsf, endMsf, blockSize, expectedSectorType, dap, sync,
+                                   headerCodes, userData, edcEcc, c2Error, subchannel, sense, LastError);
+
+        return sense;
+    }
+
+    /// <summary>Prevents ejection of the media inserted in the drive</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool PreventMediumRemoval(out byte[] senseBuffer, uint timeout, out double duration) =>
+        PreventAllowMediumRemoval(out senseBuffer, false, true, timeout, out duration);
+
+    /// <summary>Allows ejection of the media inserted in the drive</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool AllowMediumRemoval(out byte[] senseBuffer, uint timeout, out double duration) =>
+        PreventAllowMediumRemoval(out senseBuffer, false, false, timeout, out duration);
+
+    /// <summary>Prevents or allows ejection of the media inserted in the drive</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="persistent">Persistent.</param>
+    /// <param name="prevent">Prevent.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool PreventAllowMediumRemoval(out byte[] senseBuffer, bool persistent, bool prevent, uint timeout,
+                                          out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = Array.Empty<byte>();
+
+        cdb[0] = (byte)ScsiCommands.PreventAllowMediumRemoval;
+
+        if(prevent)
+            cdb[4] += 0x01;
+
+        if(persistent)
+            cdb[4] += 0x02;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "PREVENT ALLOW MEDIUM REMOVAL (Persistent: {1}, Prevent: {2}, Sense: {3}, LastError: {4}) took {0} ms.",
+                                   duration, persistent, prevent, sense, LastError);
+
+        return sense;
+    }
+
+    /// <summary>Loads the media tray</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool LoadTray(out byte[] senseBuffer, uint timeout, out double duration) =>
+        StartStopUnit(out senseBuffer, false, 0, 0, false, true, true, timeout, out duration);
+
+    /// <summary>Ejects the media or its tray</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool EjectTray(out byte[] senseBuffer, uint timeout, out double duration) =>
+        StartStopUnit(out senseBuffer, false, 0, 0, false, true, false, timeout, out duration);
+
+    /// <summary>Starts the drive's reading mechanism</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool StartUnit(out byte[] senseBuffer, uint timeout, out double duration) =>
+        StartStopUnit(out senseBuffer, false, 0, 0, false, false, true, timeout, out duration);
+
+    /// <summary>Stops the drive's reading mechanism</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool StopUnit(out byte[] senseBuffer, uint timeout, out double duration) =>
+        StartStopUnit(out senseBuffer, false, 0, 0, false, false, false, timeout, out duration);
+
+    /// <summary>Starts or stops the drive's reading mechanism or tray</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="immediate">Return from execution immediately</param>
+    /// <param name="formatLayer">Choose density layer for hybrid discs</param>
+    /// <param name="powerConditions">Power condition</param>
+    /// <param name="changeFormatLayer">Change format layer</param>
+    /// <param name="loadEject">Loads or ejects the media</param>
+    /// <param name="start">Starts the mechanism</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool StartStopUnit(out byte[] senseBuffer, bool immediate, byte formatLayer, byte powerConditions,
+                              bool changeFormatLayer, bool loadEject, bool start, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = Array.Empty<byte>();
+
+        cdb[0] = (byte)ScsiCommands.StartStopUnit;
+
+        if(immediate)
+            cdb[1] += 0x01;
+
+        if(changeFormatLayer)
         {
-            senseBuffer = new byte[64];
-            byte[] cdb       = new byte[10];
-            byte[] tmpBuffer = new byte[804];
-
-            cdb[0] = (byte)ScsiCommands.ReadDiscInformation;
-            cdb[1] = (byte)dataType;
-            cdb[7] = (byte)((tmpBuffer.Length & 0xFF00) >> 8);
-            cdb[8] = (byte)(tmpBuffer.Length & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref tmpBuffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            uint strctLength = (uint)((tmpBuffer[0] << 8) + tmpBuffer[1] + 2);
-
-            if(strctLength > tmpBuffer.Length)
-                strctLength = (uint)tmpBuffer.Length;
-
-            buffer = new byte[strctLength];
-            Array.Copy(tmpBuffer, 0, buffer, 0, buffer.Length);
-
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "READ DISC INFORMATION (Data Type: {1}, Sense: {2}, Last Error: {3}) took {0} ms.",
-                                       duration, dataType, sense, LastError);
-
-            return sense;
+            cdb[3] =  (byte)(formatLayer & 0x03);
+            cdb[4] += 0x04;
         }
-
-        /// <summary>Sends the MMC READ CD command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the MMC READ CD response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Start block address.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        /// <param name="blockSize">Block size.</param>
-        /// <param name="expectedSectorType">Expected sector type.</param>
-        /// <param name="dap">If set to <c>true</c> CD-DA should be modified by mute and interpolation</param>
-        /// <param name="relAddr">If set to <c>true</c> address is relative to current position.</param>
-        /// <param name="sync">If set to <c>true</c> we request the sync bytes for data sectors.</param>
-        /// <param name="headerCodes">Header codes.</param>
-        /// <param name="userData">If set to <c>true</c> we request the user data.</param>
-        /// <param name="edcEcc">If set to <c>true</c> we request the EDC/ECC fields for data sectors.</param>
-        /// <param name="c2Error">C2 error options.</param>
-        /// <param name="subchannel">Subchannel selection.</param>
-        public bool ReadCd(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint transferLength,
-                           MmcSectorTypes expectedSectorType, bool dap, bool relAddr, bool sync,
-                           MmcHeaderCodes headerCodes, bool userData, bool edcEcc, MmcErrorField c2Error,
-                           MmcSubchannel subchannel, uint timeout, out double duration)
+        else
         {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0] = (byte)ScsiCommands.ReadCd;
-            cdb[1] = (byte)((byte)expectedSectorType << 2);
-
-            if(dap)
-                cdb[1] += 0x02;
-
-            if(relAddr)
-                cdb[1] += 0x01;
-
-            cdb[2] =  (byte)((lba & 0xFF000000) >> 24);
-            cdb[3] =  (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4] =  (byte)((lba & 0xFF00)     >> 8);
-            cdb[5] =  (byte)(lba & 0xFF);
-            cdb[6] =  (byte)((transferLength & 0xFF0000) >> 16);
-            cdb[7] =  (byte)((transferLength & 0xFF00)   >> 8);
-            cdb[8] =  (byte)(transferLength & 0xFF);
-            cdb[9] =  (byte)((byte)c2Error     << 1);
-            cdb[9] += (byte)((byte)headerCodes << 5);
-
-            if(sync)
-                cdb[9] += 0x80;
-
-            if(userData)
-                cdb[9] += 0x10;
-
-            if(edcEcc)
-                cdb[9] += 0x08;
-
-            cdb[10] = (byte)subchannel;
-
-            buffer = new byte[blockSize * transferLength];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "READ CD (LBA: {1}, Block Size: {2}, Transfer Length: {3}, Expected Sector Type: {4}, DAP: {5}, Relative Address: {6}, Sync: {7}, Headers: {8}, User Data: {9}, ECC/EDC: {10}, C2: {11}, Subchannel: {12}, Sense: {13}, Last Error: {14}) took {0} ms.",
-                                       duration, lba, blockSize, transferLength, expectedSectorType, dap, relAddr, sync,
-                                       headerCodes, userData, edcEcc, c2Error, subchannel, sense, LastError);
-
-            return sense;
-        }
-
-        /// <summary>Sends the MMC READ CD MSF command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the MMC READ CD MSF response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="startMsf">Start MM:SS:FF of read encoded as 0x00MMSSFF.</param>
-        /// <param name="endMsf">End MM:SS:FF of read encoded as 0x00MMSSFF.</param>
-        /// <param name="blockSize">Block size.</param>
-        /// <param name="expectedSectorType">Expected sector type.</param>
-        /// <param name="dap">If set to <c>true</c> CD-DA should be modified by mute and interpolation</param>
-        /// <param name="sync">If set to <c>true</c> we request the sync bytes for data sectors.</param>
-        /// <param name="headerCodes">Header codes.</param>
-        /// <param name="userData">If set to <c>true</c> we request the user data.</param>
-        /// <param name="edcEcc">If set to <c>true</c> we request the EDC/ECC fields for data sectors.</param>
-        /// <param name="c2Error">C2 error options.</param>
-        /// <param name="subchannel">Subchannel selection.</param>
-        public bool ReadCdMsf(out byte[] buffer, out byte[] senseBuffer, uint startMsf, uint endMsf, uint blockSize,
-                              MmcSectorTypes expectedSectorType, bool dap, bool sync, MmcHeaderCodes headerCodes,
-                              bool userData, bool edcEcc, MmcErrorField c2Error, MmcSubchannel subchannel, uint timeout,
-                              out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0] = (byte)ScsiCommands.ReadCdMsf;
-            cdb[1] = (byte)((byte)expectedSectorType << 2);
-
-            if(dap)
-                cdb[1] += 0x02;
-
-            cdb[3] =  (byte)((startMsf & 0xFF0000) >> 16);
-            cdb[4] =  (byte)((startMsf & 0xFF00)   >> 8);
-            cdb[5] =  (byte)(startMsf & 0xFF);
-            cdb[6] =  (byte)((endMsf & 0xFF0000) >> 16);
-            cdb[7] =  (byte)((endMsf & 0xFF00)   >> 8);
-            cdb[8] =  (byte)(endMsf & 0xFF);
-            cdb[9] =  (byte)((byte)c2Error     << 1);
-            cdb[9] += (byte)((byte)headerCodes << 5);
-
-            if(sync)
-                cdb[9] += 0x80;
-
-            if(userData)
-                cdb[9] += 0x10;
-
-            if(edcEcc)
-                cdb[9] += 0x08;
-
-            cdb[10] = (byte)subchannel;
-
-            uint transferLength = (uint)(((cdb[6] - cdb[3]) * 60 * 75) + ((cdb[7] - cdb[4]) * 75) + (cdb[8] - cdb[5]));
-
-            buffer = new byte[blockSize * transferLength];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "READ CD MSF (Start MSF: {1}, End MSF: {2}, Block Size: {3}, Expected Sector Type: {4}, DAP: {5}, Sync: {6}, Headers: {7}, User Data: {8}, ECC/EDC: {9}, C2: {10}, Subchannel: {11}, Sense: {12}, LastError: {13}) took {0} ms.",
-                                       duration, startMsf, endMsf, blockSize, expectedSectorType, dap, sync,
-                                       headerCodes, userData, edcEcc, c2Error, subchannel, sense, LastError);
-
-            return sense;
-        }
-
-        /// <summary>Prevents ejection of the media inserted in the drive</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool PreventMediumRemoval(out byte[] senseBuffer, uint timeout, out double duration) =>
-            PreventAllowMediumRemoval(out senseBuffer, false, true, timeout, out duration);
-
-        /// <summary>Allows ejection of the media inserted in the drive</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool AllowMediumRemoval(out byte[] senseBuffer, uint timeout, out double duration) =>
-            PreventAllowMediumRemoval(out senseBuffer, false, false, timeout, out duration);
-
-        /// <summary>Prevents or allows ejection of the media inserted in the drive</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="persistent">Persistent.</param>
-        /// <param name="prevent">Prevent.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool PreventAllowMediumRemoval(out byte[] senseBuffer, bool persistent, bool prevent, uint timeout,
-                                              out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = Array.Empty<byte>();
-
-            cdb[0] = (byte)ScsiCommands.PreventAllowMediumRemoval;
-
-            if(prevent)
-                cdb[4] += 0x01;
-
-            if(persistent)
+            if(loadEject)
                 cdb[4] += 0x02;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "PREVENT ALLOW MEDIUM REMOVAL (Persistent: {1}, Prevent: {2}, Sense: {3}, LastError: {4}) took {0} ms.",
-                                       duration, persistent, prevent, sense, LastError);
-
-            return sense;
+            if(start)
+                cdb[4] += 0x01;
         }
 
-        /// <summary>Loads the media tray</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool LoadTray(out byte[] senseBuffer, uint timeout, out double duration) =>
-            StartStopUnit(out senseBuffer, false, 0, 0, false, true, true, timeout, out duration);
+        cdb[4] += (byte)((powerConditions & 0x0F) << 4);
 
-        /// <summary>Ejects the media or its tray</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool EjectTray(out byte[] senseBuffer, uint timeout, out double duration) =>
-            StartStopUnit(out senseBuffer, false, 0, 0, false, true, false, timeout, out duration);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
 
-        /// <summary>Starts the drive's reading mechanism</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool StartUnit(out byte[] senseBuffer, uint timeout, out double duration) =>
-            StartStopUnit(out senseBuffer, false, 0, 0, false, false, true, timeout, out duration);
+        Error = LastError != 0;
 
-        /// <summary>Stops the drive's reading mechanism</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool StopUnit(out byte[] senseBuffer, uint timeout, out double duration) =>
-            StartStopUnit(out senseBuffer, false, 0, 0, false, false, false, timeout, out duration);
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "START STOP UNIT (Immediate: {1}, FormatLayer: {2}, Power Conditions: {3}, Change Format Layer: {4}, Load/Eject: {5}, Start: {6}, Sense: {7}, Last Error: {8}) took {0} ms.",
+                                   duration, immediate, formatLayer, powerConditions, changeFormatLayer, loadEject,
+                                   start, sense, LastError);
 
-        /// <summary>Starts or stops the drive's reading mechanism or tray</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="immediate">Return from execution immediately</param>
-        /// <param name="formatLayer">Choose density layer for hybrid discs</param>
-        /// <param name="powerConditions">Power condition</param>
-        /// <param name="changeFormatLayer">Change format layer</param>
-        /// <param name="loadEject">Loads or ejects the media</param>
-        /// <param name="start">Starts the mechanism</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool StartStopUnit(out byte[] senseBuffer, bool immediate, byte formatLayer, byte powerConditions,
-                                  bool changeFormatLayer, bool loadEject, bool start, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = Array.Empty<byte>();
+        return sense;
+    }
 
-            cdb[0] = (byte)ScsiCommands.StartStopUnit;
+    /// <summary>Reads the MCN from a disc</summary>
+    /// <param name="mcn">Decoded MCN.</param>
+    /// <param name="buffer">Buffer containing raw drive response.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    [SuppressMessage("ReSharper", "ShiftExpressionZeroLeftOperand")]
+    public bool ReadMcn(out string mcn, out byte[] buffer, out byte[] senseBuffer, uint timeout,
+                        out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+        mcn = null;
 
-            if(immediate)
-                cdb[1] += 0x01;
+        cdb[0] = (byte)ScsiCommands.ReadSubChannel;
+        cdb[1] = 0;
+        cdb[2] = 0x40;
+        cdb[3] = 0x02;
+        cdb[7] = (23 & 0xFF00) >> 8;
+        cdb[8] = 23 & 0xFF;
 
-            if(changeFormatLayer)
-            {
-                cdb[3] =  (byte)(formatLayer & 0x03);
-                cdb[4] += 0x04;
-            }
-            else
-            {
-                if(loadEject)
-                    cdb[4] += 0x02;
+        buffer = new byte[23];
 
-                if(start)
-                    cdb[4] += 0x01;
-            }
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            cdb[4] += (byte)((powerConditions & 0x0F) << 4);
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "READ READ SUB-CHANNEL (MCN, Sense {1}, Last Error {2}) took {0} ms.", duration,
+                                   sense, LastError);
 
-            Error = LastError != 0;
+        if(!sense &&
+           (buffer[8] & 0x80) == 0x80)
+            mcn = Encoding.ASCII.GetString(buffer, 9, 13);
 
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "START STOP UNIT (Immediate: {1}, FormatLayer: {2}, Power Conditions: {3}, Change Format Layer: {4}, Load/Eject: {5}, Start: {6}, Sense: {7}, Last Error: {8}) took {0} ms.",
-                                       duration, immediate, formatLayer, powerConditions, changeFormatLayer, loadEject,
-                                       start, sense, LastError);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Reads the ISRC from a track</summary>
+    /// <param name="trackNumber">Track number.</param>
+    /// <param name="isrc">Decoded ISRC.</param>
+    /// <param name="buffer">Buffer containing raw drive response.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    [SuppressMessage("ReSharper", "ShiftExpressionZeroLeftOperand")]
+    public bool ReadIsrc(byte trackNumber, out string isrc, out byte[] buffer, out byte[] senseBuffer, uint timeout,
+                         out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+        isrc = null;
 
-        /// <summary>Reads the MCN from a disc</summary>
-        /// <param name="mcn">Decoded MCN.</param>
-        /// <param name="buffer">Buffer containing raw drive response.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        [SuppressMessage("ReSharper", "ShiftExpressionZeroLeftOperand")]
-        public bool ReadMcn(out string mcn, out byte[] buffer, out byte[] senseBuffer, uint timeout,
-                            out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-            mcn = null;
+        cdb[0] = (byte)ScsiCommands.ReadSubChannel;
+        cdb[1] = 0;
+        cdb[2] = 0x40;
+        cdb[3] = 0x03;
+        cdb[6] = trackNumber;
+        cdb[7] = (23 & 0xFF00) >> 8;
+        cdb[8] = 23 & 0xFF;
 
-            cdb[0] = (byte)ScsiCommands.ReadSubChannel;
-            cdb[1] = 0;
-            cdb[2] = 0x40;
-            cdb[3] = 0x02;
-            cdb[7] = (23 & 0xFF00) >> 8;
-            cdb[8] = 23 & 0xFF;
+        buffer = new byte[23];
 
-            buffer = new byte[23];
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "READ READ SUB-CHANNEL (ISRC, Track Number: {1}, Sense: {2}, Last Error: {3}) took {0} ms.",
+                                   duration, trackNumber, sense, LastError);
 
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "READ READ SUB-CHANNEL (MCN, Sense {1}, Last Error {2}) took {0} ms.", duration,
-                                       sense, LastError);
+        if(!sense &&
+           (buffer[8] & 0x80) == 0x80)
+            isrc = Encoding.ASCII.GetString(buffer, 9, 12);
 
-            if(!sense &&
-               (buffer[8] & 0x80) == 0x80)
-                mcn = Encoding.ASCII.GetString(buffer, 9, 13);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Sets the reading speed</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="rotationalControl">Rotational control.</param>
+    /// <param name="readSpeed">Read speed.</param>
+    /// <param name="writeSpeed">Write speed.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool SetCdSpeed(out byte[] senseBuffer, RotationalControl rotationalControl, ushort readSpeed,
+                           ushort writeSpeed, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[12];
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Reads the ISRC from a track</summary>
-        /// <param name="trackNumber">Track number.</param>
-        /// <param name="isrc">Decoded ISRC.</param>
-        /// <param name="buffer">Buffer containing raw drive response.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        [SuppressMessage("ReSharper", "ShiftExpressionZeroLeftOperand")]
-        public bool ReadIsrc(byte trackNumber, out string isrc, out byte[] buffer, out byte[] senseBuffer, uint timeout,
-                             out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-            isrc = null;
+        cdb[0] = (byte)ScsiCommands.SetCdRomSpeed;
+        cdb[1] = (byte)((byte)rotationalControl & 0x03);
+        cdb[2] = (byte)((readSpeed & 0xFF00) >> 8);
+        cdb[3] = (byte)(readSpeed & 0xFF);
+        cdb[4] = (byte)((writeSpeed & 0xFF00) >> 8);
+        cdb[5] = (byte)(writeSpeed & 0xFF);
 
-            cdb[0] = (byte)ScsiCommands.ReadSubChannel;
-            cdb[1] = 0;
-            cdb[2] = 0x40;
-            cdb[3] = 0x03;
-            cdb[6] = trackNumber;
-            cdb[7] = (23 & 0xFF00) >> 8;
-            cdb[8] = 23 & 0xFF;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
 
-            buffer = new byte[23];
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "SET CD SPEED (Rotational Control: {1}, Read Speed: {2}, Write Speed: {3}, Sense: {4}, Last Error: {5}) took {0} ms.",
+                                   duration, rotationalControl, readSpeed, writeSpeed, sense, LastError);
 
-            Error = LastError != 0;
+        return sense;
+    }
 
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "READ READ SUB-CHANNEL (ISRC, Track Number: {1}, Sense: {2}, Last Error: {3}) took {0} ms.",
-                                       duration, trackNumber, sense, LastError);
+    /// <summary>Sends the MMC READ TRACK INFORMATION command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ DISC INFORMATION response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="address">Track/session/sector address</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="open">Report information of non-closed tracks</param>
+    /// <param name="type">Type of information to retrieve</param>
+    public bool ReadTrackInformation(out byte[] buffer, out byte[] senseBuffer, bool open,
+                                     TrackInformationType type, uint address, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+        buffer = new byte[48];
 
-            if(!sense &&
-               (buffer[8] & 0x80) == 0x80)
-                isrc = Encoding.ASCII.GetString(buffer, 9, 12);
+        cdb[0] = (byte)ScsiCommands.ReadTrackInformation;
+        cdb[1] = (byte)((byte)type & 0x3);
+        cdb[2] = (byte)((address & 0xFF000000) >> 24);
+        cdb[3] = (byte)((address & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((address & 0xFF00)     >> 8);
+        cdb[5] = (byte)(address & 0xFF);
+        cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8);
+        cdb[8] = (byte)(buffer.Length & 0xFF);
 
-            return sense;
-        }
+        if(open)
+            cdb[1] += 4;
 
-        /// <summary>Sets the reading speed</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="rotationalControl">Rotational control.</param>
-        /// <param name="readSpeed">Read speed.</param>
-        /// <param name="writeSpeed">Write speed.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool SetCdSpeed(out byte[] senseBuffer, RotationalControl rotationalControl, ushort readSpeed,
-                               ushort writeSpeed, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[12];
-            byte[] buffer = Array.Empty<byte>();
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            cdb[0] = (byte)ScsiCommands.SetCdRomSpeed;
-            cdb[1] = (byte)((byte)rotationalControl & 0x03);
-            cdb[2] = (byte)((readSpeed & 0xFF00) >> 8);
-            cdb[3] = (byte)(readSpeed & 0xFF);
-            cdb[4] = (byte)((writeSpeed & 0xFF00) >> 8);
-            cdb[5] = (byte)(writeSpeed & 0xFF);
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "READ TRACK INFORMATION (Data Type: {1}, Sense: {2}, Last Error: {3}) took {0} ms.",
+                                   duration, type, sense, LastError);
 
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "SET CD SPEED (Rotational Control: {1}, Read Speed: {2}, Write Speed: {3}, Sense: {4}, Last Error: {5}) took {0} ms.",
-                                       duration, rotationalControl, readSpeed, writeSpeed, sense, LastError);
-
-            return sense;
-        }
-
-        /// <summary>Sends the MMC READ TRACK INFORMATION command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ DISC INFORMATION response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="address">Track/session/sector address</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="open">Report information of non-closed tracks</param>
-        /// <param name="type">Type of information to retrieve</param>
-        public bool ReadTrackInformation(out byte[] buffer, out byte[] senseBuffer, bool open,
-                                         TrackInformationType type, uint address, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-            buffer = new byte[48];
-
-            cdb[0] = (byte)ScsiCommands.ReadTrackInformation;
-            cdb[1] = (byte)((byte)type & 0x3);
-            cdb[2] = (byte)((address & 0xFF000000) >> 24);
-            cdb[3] = (byte)((address & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((address & 0xFF00)     >> 8);
-            cdb[5] = (byte)(address & 0xFF);
-            cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8);
-            cdb[8] = (byte)(buffer.Length & 0xFF);
-
-            if(open)
-                cdb[1] += 4;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "READ TRACK INFORMATION (Data Type: {1}, Sense: {2}, Last Error: {3}) took {0} ms.",
-                                       duration, type, sense, LastError);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/MediaTek.cs b/Aaru.Devices/Device/ScsiCommands/MediaTek.cs
index 5a88e781f..7aeaf58ab 100644
--- a/Aaru.Devices/Device/ScsiCommands/MediaTek.cs
+++ b/Aaru.Devices/Device/ScsiCommands/MediaTek.cs
@@ -32,44 +32,43 @@
 
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Reads from the drive's DRAM.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the DRAM contents will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="offset">Starting offset in DRAM memory.</param>
+    /// <param name="length">How much data to retrieve from DRAM.</param>
+    public bool MediaTekReadDram(out byte[] buffer, out byte[] senseBuffer, uint offset, uint length, uint timeout,
+                                 out double duration)
     {
-        /// <summary>Reads from the drive's DRAM.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the DRAM contents will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="offset">Starting offset in DRAM memory.</param>
-        /// <param name="length">How much data to retrieve from DRAM.</param>
-        public bool MediaTekReadDram(out byte[] buffer, out byte[] senseBuffer, uint offset, uint length, uint timeout,
-                                     out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-            buffer = new byte[length];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+        buffer = new byte[length];
 
-            cdb[0] = (byte)ScsiCommands.MediaTekVendorCommand;
-            cdb[1] = 0x06;
-            cdb[2] = (byte)((offset & 0xFF000000) >> 24);
-            cdb[3] = (byte)((offset & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((offset & 0xFF00)     >> 8);
-            cdb[5] = (byte)(offset & 0xFF);
-            cdb[6] = (byte)((length & 0xFF000000) >> 24);
-            cdb[7] = (byte)((length & 0xFF0000)   >> 16);
-            cdb[8] = (byte)((length & 0xFF00)     >> 8);
-            cdb[9] = (byte)(length & 0xFF);
+        cdb[0] = (byte)ScsiCommands.MediaTekVendorCommand;
+        cdb[1] = 0x06;
+        cdb[2] = (byte)((offset & 0xFF000000) >> 24);
+        cdb[3] = (byte)((offset & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((offset & 0xFF00)     >> 8);
+        cdb[5] = (byte)(offset & 0xFF);
+        cdb[6] = (byte)((length & 0xFF000000) >> 24);
+        cdb[7] = (byte)((length & 0xFF0000)   >> 16);
+        cdb[8] = (byte)((length & 0xFF00)     >> 8);
+        cdb[9] = (byte)(length & 0xFF);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "MediaTek READ DRAM took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "MediaTek READ DRAM took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs b/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs
index 2b45cc0b9..d513fc5c1 100644
--- a/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs
+++ b/Aaru.Devices/Device/ScsiCommands/MiniDisc.cs
@@ -35,184 +35,183 @@ using Aaru.Console;
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Reads the data TOC from an MD-DATA</summary>
+    /// <param name="buffer">Buffer where the response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool MiniDiscReadDataTOC(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
     {
-        /// <summary>Reads the data TOC from an MD-DATA</summary>
-        /// <param name="buffer">Buffer where the response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool MiniDiscReadDataTOC(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            ushort transferLength = 2336;
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
+        ushort transferLength = 2336;
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
 
-            cdb[0] = (byte)ScsiCommands.MiniDiscReadDTOC;
+        cdb[0] = (byte)ScsiCommands.MiniDiscReadDTOC;
 
-            cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
-            cdb[8] = (byte)(transferLength & 0xFF);
+        cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
+        cdb[8] = (byte)(transferLength & 0xFF);
 
-            buffer = new byte[transferLength];
+        buffer = new byte[transferLength];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC READ DTOC took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC READ DTOC took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
+    }
 
-        /// <summary>Reads the user TOC from an MD-DATA</summary>
-        /// <param name="buffer">Buffer where the response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sector">TOC sector to read</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool MiniDiscReadUserTOC(out byte[] buffer, out byte[] senseBuffer, uint sector, uint timeout,
-                                        out double duration)
-        {
-            ushort transferLength = 2336;
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
+    /// <summary>Reads the user TOC from an MD-DATA</summary>
+    /// <param name="buffer">Buffer where the response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sector">TOC sector to read</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool MiniDiscReadUserTOC(out byte[] buffer, out byte[] senseBuffer, uint sector, uint timeout,
+                                    out double duration)
+    {
+        ushort transferLength = 2336;
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
 
-            cdb[0] = (byte)ScsiCommands.MiniDiscReadUTOC;
+        cdb[0] = (byte)ScsiCommands.MiniDiscReadUTOC;
 
-            cdb[2] = (byte)((sector & 0xFF000000) >> 24);
-            cdb[3] = (byte)((sector & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((sector & 0xFF00)     >> 8);
-            cdb[5] = (byte)(sector & 0xFF);
-            cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
-            cdb[8] = (byte)(transferLength & 0xFF);
+        cdb[2] = (byte)((sector & 0xFF000000) >> 24);
+        cdb[3] = (byte)((sector & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((sector & 0xFF00)     >> 8);
+        cdb[5] = (byte)(sector & 0xFF);
+        cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
+        cdb[8] = (byte)(transferLength & 0xFF);
 
-            buffer = new byte[transferLength];
+        buffer = new byte[transferLength];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC READ UTOC took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC READ UTOC took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
+    }
 
-        /// <summary>Sends a D5h command to a MD-DATA drive (harmless)</summary>
-        /// <param name="buffer">Buffer where the response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool MiniDiscD5(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            ushort transferLength = 4;
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
+    /// <summary>Sends a D5h command to a MD-DATA drive (harmless)</summary>
+    /// <param name="buffer">Buffer where the response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool MiniDiscD5(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        ushort transferLength = 4;
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
 
-            cdb[0] = (byte)ScsiCommands.MiniDiscD5;
+        cdb[0] = (byte)ScsiCommands.MiniDiscD5;
 
-            cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
-            cdb[8] = (byte)(transferLength & 0xFF);
+        cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
+        cdb[8] = (byte)(transferLength & 0xFF);
 
-            buffer = new byte[transferLength];
+        buffer = new byte[transferLength];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC command D5h took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC command D5h took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
+    }
 
-        /// <summary>Stops playing MiniDisc audio from an MD-DATA drive</summary>
-        /// <param name="buffer">Buffer where the response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool MiniDiscStopPlaying(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
+    /// <summary>Stops playing MiniDisc audio from an MD-DATA drive</summary>
+    /// <param name="buffer">Buffer where the response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool MiniDiscStopPlaying(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
 
-            cdb[0] = (byte)ScsiCommands.MiniDiscStopPlay;
+        cdb[0] = (byte)ScsiCommands.MiniDiscStopPlay;
 
-            buffer = Array.Empty<byte>();
+        buffer = Array.Empty<byte>();
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC STOP PLAY took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC STOP PLAY took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
+    }
 
-        /// <summary>Gets current position while playing MiniDisc audio from an MD-DATA drive</summary>
-        /// <param name="buffer">Buffer where the response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool MiniDiscReadPosition(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            ushort transferLength = 4;
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
+    /// <summary>Gets current position while playing MiniDisc audio from an MD-DATA drive</summary>
+    /// <param name="buffer">Buffer where the response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool MiniDiscReadPosition(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        ushort transferLength = 4;
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
 
-            cdb[0] = (byte)ScsiCommands.MiniDiscReadPosition;
+        cdb[0] = (byte)ScsiCommands.MiniDiscReadPosition;
 
-            cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
-            cdb[8] = (byte)(transferLength & 0xFF);
+        cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
+        cdb[8] = (byte)(transferLength & 0xFF);
 
-            buffer = new byte[transferLength];
+        buffer = new byte[transferLength];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC READ POSITION took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC READ POSITION took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
+    }
 
-        /// <summary>Gets MiniDisc type from an MD-DATA drive</summary>
-        /// <param name="buffer">Buffer where the response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        public bool MiniDiscGetType(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            ushort transferLength = 8;
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
+    /// <summary>Gets MiniDisc type from an MD-DATA drive</summary>
+    /// <param name="buffer">Buffer where the response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    public bool MiniDiscGetType(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        ushort transferLength = 8;
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
 
-            cdb[0] = (byte)ScsiCommands.MiniDiscGetType;
+        cdb[0] = (byte)ScsiCommands.MiniDiscGetType;
 
-            cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
-            cdb[8] = (byte)(transferLength & 0xFF);
+        cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
+        cdb[8] = (byte)(transferLength & 0xFF);
 
-            buffer = new byte[transferLength];
+        buffer = new byte[transferLength];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC GET TYPE took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "MINIDISC GET TYPE took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/NEC.cs b/Aaru.Devices/Device/ScsiCommands/NEC.cs
index f675dd2fc..6e6f02559 100644
--- a/Aaru.Devices/Device/ScsiCommands/NEC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/NEC.cs
@@ -32,42 +32,41 @@
 
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sends the NEC READ CD-DA command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the NEC READ CD-DA response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Start block address.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    public bool NecReadCdDa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength, uint timeout,
+                            out double duration)
     {
-        /// <summary>Sends the NEC READ CD-DA command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the NEC READ CD-DA response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Start block address.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        public bool NecReadCdDa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength, uint timeout,
-                                out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
 
-            cdb[0] = (byte)ScsiCommands.NecReadCdDa;
-            cdb[2] = (byte)((lba & 0xFF000000) >> 24);
-            cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((lba & 0xFF00)     >> 8);
-            cdb[5] = (byte)(lba & 0xFF);
-            cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
-            cdb[8] = (byte)(transferLength & 0xFF);
+        cdb[0] = (byte)ScsiCommands.NecReadCdDa;
+        cdb[2] = (byte)((lba & 0xFF000000) >> 24);
+        cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((lba & 0xFF00)     >> 8);
+        cdb[5] = (byte)(lba & 0xFF);
+        cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
+        cdb[8] = (byte)(transferLength & 0xFF);
 
-            buffer = new byte[2352 * transferLength];
+        buffer = new byte[2352 * transferLength];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "READ CD-DA took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "READ CD-DA took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/Optical.cs b/Aaru.Devices/Device/ScsiCommands/Optical.cs
index 812856c3b..7a737b0e4 100644
--- a/Aaru.Devices/Device/ScsiCommands/Optical.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Optical.cs
@@ -34,100 +34,99 @@ using System;
 using Aaru.Console;
 using Aaru.Decoders.SCSI;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Scan the medium for a contiguous set of written or blank logical blocks</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="relAddr">Set to <c>true</c> if <paramref name="lba" /> is relative</param>
+    /// <param name="lba">Logical block address where to start the search.</param>
+    /// <param name="scanLength">Number of blocks to scan</param>
+    /// <param name="foundBlocks">How many blocks were found</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    /// <param name="written">
+    ///     If set to <c>true</c> drive will search for written blocks, otherwise it will search for blank
+    ///     blocks
+    /// </param>
+    /// <param name="advancedScan">If set to <c>true</c> drive will consider the search area has contiguous blocks</param>
+    /// <param name="reverse">If set to <c>true</c> drive will search in reverse</param>
+    /// <param name="partial">
+    ///     If set to <c>true</c> return even if the total number of blocks requested is not found but the
+    ///     other parameters are met
+    /// </param>
+    /// <param name="requested">Number of contiguous blocks to find</param>
+    /// <param name="foundLba">First LBA found</param>
+    public bool MediumScan(out byte[] senseBuffer, bool written, bool advancedScan, bool reverse, bool partial,
+                           bool relAddr, uint lba, uint requested, uint scanLength, out uint foundLba,
+                           out uint foundBlocks, uint timeout, out double duration)
     {
-        /// <summary>Scan the medium for a contiguous set of written or blank logical blocks</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="relAddr">Set to <c>true</c> if <paramref name="lba" /> is relative</param>
-        /// <param name="lba">Logical block address where to start the search.</param>
-        /// <param name="scanLength">Number of blocks to scan</param>
-        /// <param name="foundBlocks">How many blocks were found</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        /// <param name="written">
-        ///     If set to <c>true</c> drive will search for written blocks, otherwise it will search for blank
-        ///     blocks
-        /// </param>
-        /// <param name="advancedScan">If set to <c>true</c> drive will consider the search area has contiguous blocks</param>
-        /// <param name="reverse">If set to <c>true</c> drive will search in reverse</param>
-        /// <param name="partial">
-        ///     If set to <c>true</c> return even if the total number of blocks requested is not found but the
-        ///     other parameters are met
-        /// </param>
-        /// <param name="requested">Number of contiguous blocks to find</param>
-        /// <param name="foundLba">First LBA found</param>
-        public bool MediumScan(out byte[] senseBuffer, bool written, bool advancedScan, bool reverse, bool partial,
-                               bool relAddr, uint lba, uint requested, uint scanLength, out uint foundLba,
-                               out uint foundBlocks, uint timeout, out double duration)
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[10];
+        byte[] buffer = Array.Empty<byte>();
+        foundLba    = 0;
+        foundBlocks = 0;
+
+        cdb[0] = (byte)ScsiCommands.MediumScan;
+
+        if(written)
+            cdb[1] += 0x10;
+
+        if(advancedScan)
+            cdb[1] += 0x08;
+
+        if(reverse)
+            cdb[1] += 0x04;
+
+        if(partial)
+            cdb[1] += 0x02;
+
+        if(relAddr)
+            cdb[1] += 0x01;
+
+        cdb[2] = (byte)((lba & 0xFF000000) >> 24);
+        cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((lba & 0xFF00)     >> 8);
+        cdb[5] = (byte)(lba & 0xFF);
+
+        if(requested  > 0 ||
+           scanLength > 1)
         {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[10];
-            byte[] buffer = Array.Empty<byte>();
-            foundLba    = 0;
-            foundBlocks = 0;
+            buffer    = new byte[8];
+            buffer[0] = (byte)((requested & 0xFF000000) >> 24);
+            buffer[1] = (byte)((requested & 0xFF0000)   >> 16);
+            buffer[2] = (byte)((requested & 0xFF00)     >> 8);
+            buffer[3] = (byte)(requested & 0xFF);
+            buffer[4] = (byte)((scanLength & 0xFF000000) >> 24);
+            buffer[5] = (byte)((scanLength & 0xFF0000)   >> 16);
+            buffer[6] = (byte)((scanLength & 0xFF00)     >> 8);
+            buffer[7] = (byte)(scanLength & 0xFF);
+            cdb[8]    = 8;
+        }
 
-            cdb[0] = (byte)ScsiCommands.MediumScan;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout,
+                                    buffer.Length == 0 ? ScsiDirection.None : ScsiDirection.Out, out duration,
+                                    out bool sense);
 
-            if(written)
-                cdb[1] += 0x10;
+        Error = LastError != 0;
 
-            if(advancedScan)
-                cdb[1] += 0x08;
+        AaruConsole.DebugWriteLine("SCSI Device", "MEDIUM SCAN took {0} ms.", duration);
 
-            if(reverse)
-                cdb[1] += 0x04;
+        if(Error)
+            return sense;
 
-            if(partial)
-                cdb[1] += 0x02;
+        DecodedSense? decodedSense = Sense.Decode(senseBuffer);
 
-            if(relAddr)
-                cdb[1] += 0x01;
+        switch(decodedSense?.SenseKey)
+        {
+            case SenseKeys.NoSense: return false;
+            case SenseKeys.Equal when decodedSense.Value.Fixed?.InformationValid == true:
+                foundBlocks = decodedSense.Value.Fixed.Value.CommandSpecific;
+                foundLba    = decodedSense.Value.Fixed.Value.Information;
 
-            cdb[2] = (byte)((lba & 0xFF000000) >> 24);
-            cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((lba & 0xFF00)     >> 8);
-            cdb[5] = (byte)(lba & 0xFF);
-
-            if(requested  > 0 ||
-               scanLength > 1)
-            {
-                buffer    = new byte[8];
-                buffer[0] = (byte)((requested & 0xFF000000) >> 24);
-                buffer[1] = (byte)((requested & 0xFF0000)   >> 16);
-                buffer[2] = (byte)((requested & 0xFF00)     >> 8);
-                buffer[3] = (byte)(requested & 0xFF);
-                buffer[4] = (byte)((scanLength & 0xFF000000) >> 24);
-                buffer[5] = (byte)((scanLength & 0xFF0000)   >> 16);
-                buffer[6] = (byte)((scanLength & 0xFF00)     >> 8);
-                buffer[7] = (byte)(scanLength & 0xFF);
-                cdb[8]    = 8;
-            }
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout,
-                                        buffer.Length == 0 ? ScsiDirection.None : ScsiDirection.Out, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "MEDIUM SCAN took {0} ms.", duration);
-
-            if(Error)
-                return sense;
-
-            DecodedSense? decodedSense = Sense.Decode(senseBuffer);
-
-            switch(decodedSense?.SenseKey)
-            {
-                case SenseKeys.NoSense: return false;
-                case SenseKeys.Equal when decodedSense.Value.Fixed?.InformationValid == true:
-                    foundBlocks = decodedSense.Value.Fixed.Value.CommandSpecific;
-                    foundLba    = decodedSense.Value.Fixed.Value.Information;
-
-                    return false;
-                default: return sense;
-            }
+                return false;
+            default: return sense;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/Pioneer.cs b/Aaru.Devices/Device/ScsiCommands/Pioneer.cs
index 26de1638d..880f9d9e3 100644
--- a/Aaru.Devices/Device/ScsiCommands/Pioneer.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Pioneer.cs
@@ -32,139 +32,138 @@
 
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sends the Pioneer READ CD-DA command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the Pioneer READ CD-DA response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Start block address.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    /// <param name="blockSize">Block size.</param>
+    /// <param name="subchannel">Subchannel selection.</param>
+    public bool PioneerReadCdDa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
+                                uint transferLength, PioneerSubchannel subchannel, uint timeout,
+                                out double duration)
     {
-        /// <summary>Sends the Pioneer READ CD-DA command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the Pioneer READ CD-DA response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Start block address.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        /// <param name="blockSize">Block size.</param>
-        /// <param name="subchannel">Subchannel selection.</param>
-        public bool PioneerReadCdDa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
-                                    uint transferLength, PioneerSubchannel subchannel, uint timeout,
-                                    out double duration)
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0]  = (byte)ScsiCommands.ReadCdDa;
+        cdb[2]  = (byte)((lba & 0xFF000000) >> 24);
+        cdb[3]  = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4]  = (byte)((lba & 0xFF00)     >> 8);
+        cdb[5]  = (byte)(lba & 0xFF);
+        cdb[7]  = (byte)((transferLength & 0xFF0000) >> 16);
+        cdb[8]  = (byte)((transferLength & 0xFF00)   >> 8);
+        cdb[9]  = (byte)(transferLength & 0xFF);
+        cdb[10] = (byte)subchannel;
+
+        buffer = new byte[blockSize * transferLength];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-DA took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the Pioneer READ CD-DA MSF command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the Pioneer READ CD-DA MSF response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="startMsf">Start MM:SS:FF of read encoded as 0x00MMSSFF.</param>
+    /// <param name="endMsf">End MM:SS:FF of read encoded as 0x00MMSSFF.</param>
+    /// <param name="blockSize">Block size.</param>
+    /// <param name="subchannel">Subchannel selection.</param>
+    public bool PioneerReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, uint startMsf, uint endMsf,
+                                   uint blockSize, PioneerSubchannel subchannel, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0]  = (byte)ScsiCommands.ReadCdDaMsf;
+        cdb[3]  = (byte)((startMsf & 0xFF0000) >> 16);
+        cdb[4]  = (byte)((startMsf & 0xFF00)   >> 8);
+        cdb[5]  = (byte)(startMsf & 0xFF);
+        cdb[7]  = (byte)((endMsf & 0xFF0000) >> 16);
+        cdb[8]  = (byte)((endMsf & 0xFF00)   >> 8);
+        cdb[9]  = (byte)(endMsf & 0xFF);
+        cdb[10] = (byte)subchannel;
+
+        uint transferLength = (uint)(((cdb[7] - cdb[3]) * 60 * 75) + ((cdb[8] - cdb[4]) * 75) + (cdb[9] - cdb[5]));
+        buffer = new byte[blockSize * transferLength];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-DA MSF took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the Pioneer READ CD-XA command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the Pioneer READ CD-XA response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="errorFlags">
+    ///     If set to <c>true</c>, returns all sector data with 294 bytes of error flags. Superseedes
+    ///     <paramref name="wholeSector" />
+    /// </param>
+    /// <param name="wholeSector">If set to <c>true</c>, returns all 2352 bytes of sector data.</param>
+    /// <param name="lba">Start block address.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    public bool PioneerReadCdXa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength,
+                                bool errorFlags, bool wholeSector, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0] = (byte)ScsiCommands.ReadCdXa;
+        cdb[2] = (byte)((lba & 0xFF000000) >> 24);
+        cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((lba & 0xFF00)     >> 8);
+        cdb[5] = (byte)(lba & 0xFF);
+        cdb[7] = (byte)((transferLength & 0xFF0000) >> 16);
+        cdb[8] = (byte)((transferLength & 0xFF00)   >> 8);
+        cdb[9] = (byte)(transferLength & 0xFF);
+
+        if(errorFlags)
         {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0]  = (byte)ScsiCommands.ReadCdDa;
-            cdb[2]  = (byte)((lba & 0xFF000000) >> 24);
-            cdb[3]  = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4]  = (byte)((lba & 0xFF00)     >> 8);
-            cdb[5]  = (byte)(lba & 0xFF);
-            cdb[7]  = (byte)((transferLength & 0xFF0000) >> 16);
-            cdb[8]  = (byte)((transferLength & 0xFF00)   >> 8);
-            cdb[9]  = (byte)(transferLength & 0xFF);
-            cdb[10] = (byte)subchannel;
-
-            buffer = new byte[blockSize * transferLength];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-DA took {0} ms.", duration);
-
-            return sense;
+            buffer = new byte[2646 * transferLength];
+            cdb[6] = 0x1F;
+        }
+        else if(wholeSector)
+        {
+            buffer = new byte[2352 * transferLength];
+            cdb[6] = 0x0F;
+        }
+        else
+        {
+            buffer = new byte[2048 * transferLength];
+            cdb[6] = 0x00;
         }
 
-        /// <summary>Sends the Pioneer READ CD-DA MSF command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the Pioneer READ CD-DA MSF response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="startMsf">Start MM:SS:FF of read encoded as 0x00MMSSFF.</param>
-        /// <param name="endMsf">End MM:SS:FF of read encoded as 0x00MMSSFF.</param>
-        /// <param name="blockSize">Block size.</param>
-        /// <param name="subchannel">Subchannel selection.</param>
-        public bool PioneerReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, uint startMsf, uint endMsf,
-                                       uint blockSize, PioneerSubchannel subchannel, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            cdb[0]  = (byte)ScsiCommands.ReadCdDaMsf;
-            cdb[3]  = (byte)((startMsf & 0xFF0000) >> 16);
-            cdb[4]  = (byte)((startMsf & 0xFF00)   >> 8);
-            cdb[5]  = (byte)(startMsf & 0xFF);
-            cdb[7]  = (byte)((endMsf & 0xFF0000) >> 16);
-            cdb[8]  = (byte)((endMsf & 0xFF00)   >> 8);
-            cdb[9]  = (byte)(endMsf & 0xFF);
-            cdb[10] = (byte)subchannel;
+        Error = LastError != 0;
 
-            uint transferLength = (uint)(((cdb[7] - cdb[3]) * 60 * 75) + ((cdb[8] - cdb[4]) * 75) + (cdb[9] - cdb[5]));
-            buffer = new byte[blockSize * transferLength];
+        AaruConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-XA took {0} ms.", duration);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-DA MSF took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the Pioneer READ CD-XA command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the Pioneer READ CD-XA response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="errorFlags">
-        ///     If set to <c>true</c>, returns all sector data with 294 bytes of error flags. Superseedes
-        ///     <paramref name="wholeSector" />
-        /// </param>
-        /// <param name="wholeSector">If set to <c>true</c>, returns all 2352 bytes of sector data.</param>
-        /// <param name="lba">Start block address.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        public bool PioneerReadCdXa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength,
-                                    bool errorFlags, bool wholeSector, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0] = (byte)ScsiCommands.ReadCdXa;
-            cdb[2] = (byte)((lba & 0xFF000000) >> 24);
-            cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((lba & 0xFF00)     >> 8);
-            cdb[5] = (byte)(lba & 0xFF);
-            cdb[7] = (byte)((transferLength & 0xFF0000) >> 16);
-            cdb[8] = (byte)((transferLength & 0xFF00)   >> 8);
-            cdb[9] = (byte)(transferLength & 0xFF);
-
-            if(errorFlags)
-            {
-                buffer = new byte[2646 * transferLength];
-                cdb[6] = 0x1F;
-            }
-            else if(wholeSector)
-            {
-                buffer = new byte[2352 * transferLength];
-                cdb[6] = 0x0F;
-            }
-            else
-            {
-                buffer = new byte[2048 * transferLength];
-                cdb[6] = 0x00;
-            }
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PIONEER READ CD-XA took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/Plasmon.cs b/Aaru.Devices/Device/ScsiCommands/Plasmon.cs
index 40b3c3c5e..9eda6bad5 100644
--- a/Aaru.Devices/Device/ScsiCommands/Plasmon.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Plasmon.cs
@@ -32,78 +32,77 @@
 
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sends the Plasmon READ LONG vendor command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the Plasmon READ LONG response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="relAddr">If set to <c>true</c> address contain two's complement offset from last read address.</param>
+    /// <param name="address">PBA/LBA to read.</param>
+    /// <param name="blockBytes">How many bytes per block.</param>
+    /// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address,
+                                ushort blockBytes, bool pba, uint timeout, out double duration) =>
+        HpReadLong(out buffer, out senseBuffer, relAddr, address, 0, blockBytes, pba, false, timeout, out duration);
+
+    /// <summary>Sends the Plasmon READ LONG vendor command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the Plasmon READ LONG response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="relAddr">If set to <c>true</c> address contain two's complement offset from last read address.</param>
+    /// <param name="address">PBA/LBA to read.</param>
+    /// <param name="transferLen">How many blocks/bytes to read.</param>
+    /// <param name="blockBytes">How many bytes per block.</param>
+    /// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
+    /// <param name="sectorCount">
+    ///     If set to <c>true</c> <paramref name="transferLen" /> is a count of secors to read. Otherwise
+    ///     it will be ignored
+    /// </param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address,
+                                ushort transferLen, ushort blockBytes, bool pba, bool sectorCount, uint timeout,
+                                out double duration) =>
+        HpReadLong(out buffer, out senseBuffer, relAddr, address, transferLen, blockBytes, pba, sectorCount,
+                   timeout, out duration);
+
+    /// <summary>Retrieves the logical or physical block address for the specified <paramref name="address" /></summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the block address will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="address">PBA/LBA to read.</param>
+    /// <param name="pba">If set to <c>true</c> address contain a physical block address.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool PlasmonReadSectorLocation(out byte[] buffer, out byte[] senseBuffer, uint address, bool pba,
+                                          uint timeout, out double duration)
     {
-        /// <summary>Sends the Plasmon READ LONG vendor command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the Plasmon READ LONG response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="relAddr">If set to <c>true</c> address contain two's complement offset from last read address.</param>
-        /// <param name="address">PBA/LBA to read.</param>
-        /// <param name="blockBytes">How many bytes per block.</param>
-        /// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address,
-                                    ushort blockBytes, bool pba, uint timeout, out double duration) =>
-            HpReadLong(out buffer, out senseBuffer, relAddr, address, 0, blockBytes, pba, false, timeout, out duration);
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
 
-        /// <summary>Sends the Plasmon READ LONG vendor command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the Plasmon READ LONG response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="relAddr">If set to <c>true</c> address contain two's complement offset from last read address.</param>
-        /// <param name="address">PBA/LBA to read.</param>
-        /// <param name="transferLen">How many blocks/bytes to read.</param>
-        /// <param name="blockBytes">How many bytes per block.</param>
-        /// <param name="pba">If set to <c>true</c> address contain physical block address.</param>
-        /// <param name="sectorCount">
-        ///     If set to <c>true</c> <paramref name="transferLen" /> is a count of secors to read. Otherwise
-        ///     it will be ignored
-        /// </param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address,
-                                    ushort transferLen, ushort blockBytes, bool pba, bool sectorCount, uint timeout,
-                                    out double duration) =>
-            HpReadLong(out buffer, out senseBuffer, relAddr, address, transferLen, blockBytes, pba, sectorCount,
-                       timeout, out duration);
+        cdb[0] = (byte)ScsiCommands.PlasmonReadSectorLocation;
+        cdb[2] = (byte)((address & 0xFF000000) >> 24);
+        cdb[3] = (byte)((address & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((address & 0xFF00)     >> 8);
+        cdb[5] = (byte)(address & 0xFF);
 
-        /// <summary>Retrieves the logical or physical block address for the specified <paramref name="address" /></summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the block address will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="address">PBA/LBA to read.</param>
-        /// <param name="pba">If set to <c>true</c> address contain a physical block address.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool PlasmonReadSectorLocation(out byte[] buffer, out byte[] senseBuffer, uint address, bool pba,
-                                              uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
+        if(pba)
+            cdb[9] += 0x80;
 
-            cdb[0] = (byte)ScsiCommands.PlasmonReadSectorLocation;
-            cdb[2] = (byte)((address & 0xFF000000) >> 24);
-            cdb[3] = (byte)((address & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((address & 0xFF00)     >> 8);
-            cdb[5] = (byte)(address & 0xFF);
+        buffer = new byte[8];
 
-            if(pba)
-                cdb[9] += 0x80;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            buffer = new byte[8];
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        AaruConsole.DebugWriteLine("SCSI Device", "PLASMON READ SECTOR LOCATION took {0} ms.", duration);
 
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLASMON READ SECTOR LOCATION took {0} ms.", duration);
-
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/Plextor.cs b/Aaru.Devices/Device/ScsiCommands/Plextor.cs
index d6496ef15..c805146e2 100644
--- a/Aaru.Devices/Device/ScsiCommands/Plextor.cs
+++ b/Aaru.Devices/Device/ScsiCommands/Plextor.cs
@@ -33,472 +33,471 @@
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sends the Plextor READ CD-DA command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the Plextor READ CD-DA response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Start block address.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    /// <param name="blockSize">Block size.</param>
+    /// <param name="subchannel">Subchannel selection.</param>
+    public bool PlextorReadCdDa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
+                                uint transferLength, PlextorSubchannel subchannel, uint timeout,
+                                out double duration)
     {
-        /// <summary>Sends the Plextor READ CD-DA command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the Plextor READ CD-DA response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Start block address.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        /// <param name="blockSize">Block size.</param>
-        /// <param name="subchannel">Subchannel selection.</param>
-        public bool PlextorReadCdDa(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
-                                    uint transferLength, PlextorSubchannel subchannel, uint timeout,
-                                    out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
 
-            cdb[0]  = (byte)ScsiCommands.ReadCdDa;
-            cdb[2]  = (byte)((lba & 0xFF000000) >> 24);
-            cdb[3]  = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4]  = (byte)((lba & 0xFF00)     >> 8);
-            cdb[5]  = (byte)(lba & 0xFF);
-            cdb[6]  = (byte)((transferLength & 0xFF000000) >> 24);
-            cdb[7]  = (byte)((transferLength & 0xFF0000)   >> 16);
-            cdb[8]  = (byte)((transferLength & 0xFF00)     >> 8);
-            cdb[9]  = (byte)(transferLength & 0xFF);
-            cdb[10] = (byte)subchannel;
+        cdb[0]  = (byte)ScsiCommands.ReadCdDa;
+        cdb[2]  = (byte)((lba & 0xFF000000) >> 24);
+        cdb[3]  = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4]  = (byte)((lba & 0xFF00)     >> 8);
+        cdb[5]  = (byte)(lba & 0xFF);
+        cdb[6]  = (byte)((transferLength & 0xFF000000) >> 24);
+        cdb[7]  = (byte)((transferLength & 0xFF0000)   >> 16);
+        cdb[8]  = (byte)((transferLength & 0xFF00)     >> 8);
+        cdb[9]  = (byte)(transferLength & 0xFF);
+        cdb[10] = (byte)subchannel;
 
-            buffer = new byte[blockSize * transferLength];
+        buffer = new byte[blockSize * transferLength];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device",
-                                       "Plextor READ CD-DA (LBA: {1}, Block Size: {2}, Transfer Length: {3}, Subchannel: {4}, Sense: {5}, Last Error: {6}) took {0} ms.",
-                                       duration, lba, blockSize, transferLength, subchannel, sense, LastError);
+        AaruConsole.DebugWriteLine("SCSI Device",
+                                   "Plextor READ CD-DA (LBA: {1}, Block Size: {2}, Transfer Length: {3}, Subchannel: {4}, Sense: {5}, Last Error: {6}) took {0} ms.",
+                                   duration, lba, blockSize, transferLength, subchannel, sense, LastError);
 
+        return sense;
+    }
+
+    /// <summary>Reads a "raw" sector from DVD on Plextor drives. Does it reading drive's cache.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the Plextor READ DVD (RAW) response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Start block address.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    public bool PlextorReadRawDvd(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength,
+                                  uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+        buffer = new byte[2064 * transferLength];
+
+        cdb[0] = (byte)ScsiCommands.ReadBuffer;
+        cdb[1] = 0x02;
+        cdb[3] = (byte)((lba & 0xFF0000) >> 16);
+        cdb[4] = (byte)((lba & 0xFF00)   >> 8);
+        cdb[5] = (byte)(lba & 0xFF);
+        cdb[3] = (byte)((buffer.Length & 0xFF0000) >> 16);
+        cdb[4] = (byte)((buffer.Length & 0xFF00)   >> 8);
+        cdb[5] = (byte)(buffer.Length & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "Plextor READ DVD (RAW) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads the statistics EEPROM from Plextor CD recorders</summary>
+    /// <returns><c>true</c>, if EEPROM is correctly read, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorReadEepromCdr(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        buffer      = new byte[256];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0] = (byte)ScsiCommands.PlextorReadEeprom;
+        cdb[8] = 1;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR READ EEPROM took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads the statistics EEPROM from Plextor PX-708 and PX-712 recorders</summary>
+    /// <returns><c>true</c>, if EEPROM is correctly read, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorReadEeprom(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        buffer      = new byte[512];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0] = (byte)ScsiCommands.PlextorReadEeprom;
+        cdb[8] = 2;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR READ EEPROM took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads a block from the statistics EEPROM from Plextor DVD recorders</summary>
+    /// <returns><c>true</c>, if EEPROM is correctly read, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="block">EEPROM block to read</param>
+    /// <param name="blockSize">How many bytes are in the EEPROM block</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorReadEepromBlock(out byte[] buffer, out byte[] senseBuffer, byte block, ushort blockSize,
+                                       uint timeout, out double duration)
+    {
+        buffer      = new byte[blockSize];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0] = (byte)ScsiCommands.PlextorReadEeprom;
+        cdb[1] = 1;
+        cdb[7] = block;
+        cdb[8] = (byte)((blockSize & 0xFF00) >> 8);
+        cdb[9] = (byte)(blockSize & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR READ EEPROM took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Gets speeds set by Plextor PoweRec</summary>
+    /// <returns><c>true</c>, if speeds were got correctly, <c>false</c> otherwise.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="selected">Selected write speed.</param>
+    /// <param name="max">Max speed for currently inserted media.</param>
+    /// <param name="last">Last actual speed.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorGetSpeeds(out byte[] senseBuffer, out ushort selected, out ushort max, out ushort last,
+                                 uint timeout, out double duration)
+    {
+        byte[] buf = new byte[10];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        selected = 0;
+        max      = 0;
+        last     = 0;
+
+        cdb[0] = (byte)ScsiCommands.PlextorPoweRec;
+        cdb[9] = (byte)buf.Length;
+
+        LastError = SendScsiCommand(cdb, ref buf, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR POWEREC GET SPEEDS took {0} ms.", duration);
+
+        if(sense || Error)
             return sense;
-        }
 
-        /// <summary>Reads a "raw" sector from DVD on Plextor drives. Does it reading drive's cache.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the Plextor READ DVD (RAW) response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Start block address.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        public bool PlextorReadRawDvd(out byte[] buffer, out byte[] senseBuffer, uint lba, uint transferLength,
-                                      uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-            buffer = new byte[2064 * transferLength];
+        selected = BigEndianBitConverter.ToUInt16(buf, 4);
+        max      = BigEndianBitConverter.ToUInt16(buf, 6);
+        last     = BigEndianBitConverter.ToUInt16(buf, 8);
 
-            cdb[0] = (byte)ScsiCommands.ReadBuffer;
-            cdb[1] = 0x02;
-            cdb[3] = (byte)((lba & 0xFF0000) >> 16);
-            cdb[4] = (byte)((lba & 0xFF00)   >> 8);
-            cdb[5] = (byte)(lba & 0xFF);
-            cdb[3] = (byte)((buffer.Length & 0xFF0000) >> 16);
-            cdb[4] = (byte)((buffer.Length & 0xFF00)   >> 8);
-            cdb[5] = (byte)(buffer.Length & 0xFF);
+        return false;
+    }
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+    /// <summary>Gets the Plextor PoweRec status</summary>
+    /// <returns><c>true</c>, if PoweRec is supported, <c>false</c> otherwise.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="enabled">PoweRec is enabled.</param>
+    /// <param name="speed">PoweRec recommended speed.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorGetPoweRec(out byte[] senseBuffer, out bool enabled, out ushort speed, uint timeout,
+                                  out double duration)
+    {
+        byte[] buf = new byte[8];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
 
-            Error = LastError != 0;
+        enabled = false;
+        speed   = 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "Plextor READ DVD (RAW) took {0} ms.", duration);
+        cdb[0] = (byte)ScsiCommands.PlextorExtend2;
+        cdb[1] = (byte)PlextorSubCommands.GetMode;
+        cdb[9] = (byte)buf.Length;
 
+        LastError = SendScsiCommand(cdb, ref buf, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR POWEREC GET SPEEDS took {0} ms.", duration);
+
+        if(sense || Error)
             return sense;
-        }
-
-        /// <summary>Reads the statistics EEPROM from Plextor CD recorders</summary>
-        /// <returns><c>true</c>, if EEPROM is correctly read, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorReadEepromCdr(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            buffer      = new byte[256];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0] = (byte)ScsiCommands.PlextorReadEeprom;
-            cdb[8] = 1;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR READ EEPROM took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads the statistics EEPROM from Plextor PX-708 and PX-712 recorders</summary>
-        /// <returns><c>true</c>, if EEPROM is correctly read, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorReadEeprom(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            buffer      = new byte[512];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0] = (byte)ScsiCommands.PlextorReadEeprom;
-            cdb[8] = 2;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR READ EEPROM took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads a block from the statistics EEPROM from Plextor DVD recorders</summary>
-        /// <returns><c>true</c>, if EEPROM is correctly read, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="block">EEPROM block to read</param>
-        /// <param name="blockSize">How many bytes are in the EEPROM block</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorReadEepromBlock(out byte[] buffer, out byte[] senseBuffer, byte block, ushort blockSize,
-                                           uint timeout, out double duration)
-        {
-            buffer      = new byte[blockSize];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0] = (byte)ScsiCommands.PlextorReadEeprom;
-            cdb[1] = 1;
-            cdb[7] = block;
-            cdb[8] = (byte)((blockSize & 0xFF00) >> 8);
-            cdb[9] = (byte)(blockSize & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR READ EEPROM took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Gets speeds set by Plextor PoweRec</summary>
-        /// <returns><c>true</c>, if speeds were got correctly, <c>false</c> otherwise.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="selected">Selected write speed.</param>
-        /// <param name="max">Max speed for currently inserted media.</param>
-        /// <param name="last">Last actual speed.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorGetSpeeds(out byte[] senseBuffer, out ushort selected, out ushort max, out ushort last,
-                                     uint timeout, out double duration)
-        {
-            byte[] buf = new byte[10];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            selected = 0;
-            max      = 0;
-            last     = 0;
-
-            cdb[0] = (byte)ScsiCommands.PlextorPoweRec;
-            cdb[9] = (byte)buf.Length;
-
-            LastError = SendScsiCommand(cdb, ref buf, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR POWEREC GET SPEEDS took {0} ms.", duration);
-
-            if(sense || Error)
-                return sense;
-
-            selected = BigEndianBitConverter.ToUInt16(buf, 4);
-            max      = BigEndianBitConverter.ToUInt16(buf, 6);
-            last     = BigEndianBitConverter.ToUInt16(buf, 8);
-
-            return false;
-        }
-
-        /// <summary>Gets the Plextor PoweRec status</summary>
-        /// <returns><c>true</c>, if PoweRec is supported, <c>false</c> otherwise.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="enabled">PoweRec is enabled.</param>
-        /// <param name="speed">PoweRec recommended speed.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorGetPoweRec(out byte[] senseBuffer, out bool enabled, out ushort speed, uint timeout,
-                                      out double duration)
-        {
-            byte[] buf = new byte[8];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            enabled = false;
-            speed   = 0;
-
-            cdb[0] = (byte)ScsiCommands.PlextorExtend2;
-            cdb[1] = (byte)PlextorSubCommands.GetMode;
-            cdb[9] = (byte)buf.Length;
-
-            LastError = SendScsiCommand(cdb, ref buf, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR POWEREC GET SPEEDS took {0} ms.", duration);
-
-            if(sense || Error)
-                return sense;
-
-            enabled = buf[2] != 0;
-            speed   = BigEndianBitConverter.ToUInt16(buf, 4);
-
-            return false;
-        }
-
-        /// <summary>Gets the Plextor SilentMode status</summary>
-        /// <returns><c>true</c>, if SilentMode is supported, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorGetSilentMode(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            buffer      = new byte[8];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0]  = (byte)ScsiCommands.PlextorExtend;
-            cdb[1]  = (byte)PlextorSubCommands.GetMode;
-            cdb[2]  = (byte)PlextorSubCommands.Silent;
-            cdb[3]  = 4;
-            cdb[10] = (byte)buffer.Length;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET SILENT MODE took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Gets the Plextor GigaRec status</summary>
-        /// <returns><c>true</c>, if GigaRec is supported, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorGetGigaRec(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            buffer      = new byte[8];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0]  = (byte)ScsiCommands.PlextorExtend;
-            cdb[1]  = (byte)PlextorSubCommands.GetMode;
-            cdb[2]  = (byte)PlextorSubCommands.GigaRec;
-            cdb[10] = (byte)buffer.Length;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET GIGAREC took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Gets the Plextor VariRec status</summary>
-        /// <returns><c>true</c>, if VariRec is supported, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="dvd">Set if request is for DVD.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorGetVariRec(out byte[] buffer, out byte[] senseBuffer, bool dvd, uint timeout,
-                                      out double duration)
-        {
-            buffer      = new byte[8];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0]  = (byte)ScsiCommands.PlextorExtend;
-            cdb[1]  = (byte)PlextorSubCommands.GetMode;
-            cdb[2]  = (byte)PlextorSubCommands.VariRec;
-            cdb[10] = (byte)buffer.Length;
-
-            if(dvd)
-                cdb[3] = 0x12;
-            else
-                cdb[3] = 0x02;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET VARIREC took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Gets the Plextor SecuRec status</summary>
-        /// <returns><c>true</c>, if SecuRec is supported, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorGetSecuRec(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            buffer      = new byte[8];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0]  = (byte)ScsiCommands.PlextorExtend;
-            cdb[2]  = (byte)PlextorSubCommands.SecuRec;
-            cdb[10] = (byte)buffer.Length;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET SECUREC took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Gets the Plextor SpeedRead status</summary>
-        /// <returns><c>true</c>, if SpeedRead is supported, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorGetSpeedRead(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            buffer      = new byte[8];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0]  = (byte)ScsiCommands.PlextorExtend;
-            cdb[1]  = (byte)PlextorSubCommands.GetMode;
-            cdb[2]  = (byte)PlextorSubCommands.SpeedRead;
-            cdb[10] = (byte)buffer.Length;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET SPEEDREAD took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Gets the Plextor CD-R and multi-session hiding status</summary>
-        /// <returns><c>true</c>, if CD-R and multi-session hiding is supported, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorGetHiding(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            buffer      = new byte[8];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0] = (byte)ScsiCommands.PlextorExtend;
-            cdb[1] = (byte)PlextorSubCommands.GetMode;
-            cdb[2] = (byte)PlextorSubCommands.SessionHide;
-            cdb[9] = (byte)buffer.Length;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET SINGLE-SESSION / HIDE CD-R took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Gets the Plextor DVD+ book bitsetting status</summary>
-        /// <returns><c>true</c>, if DVD+ book bitsetting is supported, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="dualLayer">Set if bitset is for dual layer discs.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorGetBitsetting(out byte[] buffer, out byte[] senseBuffer, bool dualLayer, uint timeout,
-                                         out double duration)
-        {
-            buffer      = new byte[8];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0] = (byte)ScsiCommands.PlextorExtend;
-            cdb[1] = (byte)PlextorSubCommands.GetMode;
-            cdb[2] = (byte)PlextorSubCommands.BitSet;
-            cdb[9] = (byte)buffer.Length;
-
-            if(dualLayer)
-                cdb[3] = (byte)PlextorSubCommands.BitSetRdl;
-            else
-                cdb[3] = (byte)PlextorSubCommands.BitSetR;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET BOOK BITSETTING took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Gets the Plextor DVD+ test writing status</summary>
-        /// <returns><c>true</c>, if DVD+ test writing is supported, <c>false</c> otherwise.</returns>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool PlextorGetTestWriteDvdPlus(out byte[] buffer, out byte[] senseBuffer, uint timeout,
-                                               out double duration)
-        {
-            buffer      = new byte[8];
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0]  = (byte)ScsiCommands.PlextorExtend;
-            cdb[1]  = (byte)PlextorSubCommands.GetMode;
-            cdb[2]  = (byte)PlextorSubCommands.TestWriteDvdPlus;
-            cdb[10] = (byte)buffer.Length;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET TEST WRITE DVD+ took {0} ms.", duration);
-
-            return sense;
-        }
+
+        enabled = buf[2] != 0;
+        speed   = BigEndianBitConverter.ToUInt16(buf, 4);
+
+        return false;
+    }
+
+    /// <summary>Gets the Plextor SilentMode status</summary>
+    /// <returns><c>true</c>, if SilentMode is supported, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorGetSilentMode(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        buffer      = new byte[8];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0]  = (byte)ScsiCommands.PlextorExtend;
+        cdb[1]  = (byte)PlextorSubCommands.GetMode;
+        cdb[2]  = (byte)PlextorSubCommands.Silent;
+        cdb[3]  = 4;
+        cdb[10] = (byte)buffer.Length;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET SILENT MODE took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Gets the Plextor GigaRec status</summary>
+    /// <returns><c>true</c>, if GigaRec is supported, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorGetGigaRec(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        buffer      = new byte[8];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0]  = (byte)ScsiCommands.PlextorExtend;
+        cdb[1]  = (byte)PlextorSubCommands.GetMode;
+        cdb[2]  = (byte)PlextorSubCommands.GigaRec;
+        cdb[10] = (byte)buffer.Length;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET GIGAREC took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Gets the Plextor VariRec status</summary>
+    /// <returns><c>true</c>, if VariRec is supported, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="dvd">Set if request is for DVD.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorGetVariRec(out byte[] buffer, out byte[] senseBuffer, bool dvd, uint timeout,
+                                  out double duration)
+    {
+        buffer      = new byte[8];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0]  = (byte)ScsiCommands.PlextorExtend;
+        cdb[1]  = (byte)PlextorSubCommands.GetMode;
+        cdb[2]  = (byte)PlextorSubCommands.VariRec;
+        cdb[10] = (byte)buffer.Length;
+
+        if(dvd)
+            cdb[3] = 0x12;
+        else
+            cdb[3] = 0x02;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET VARIREC took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Gets the Plextor SecuRec status</summary>
+    /// <returns><c>true</c>, if SecuRec is supported, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorGetSecuRec(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        buffer      = new byte[8];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0]  = (byte)ScsiCommands.PlextorExtend;
+        cdb[2]  = (byte)PlextorSubCommands.SecuRec;
+        cdb[10] = (byte)buffer.Length;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET SECUREC took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Gets the Plextor SpeedRead status</summary>
+    /// <returns><c>true</c>, if SpeedRead is supported, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorGetSpeedRead(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        buffer      = new byte[8];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0]  = (byte)ScsiCommands.PlextorExtend;
+        cdb[1]  = (byte)PlextorSubCommands.GetMode;
+        cdb[2]  = (byte)PlextorSubCommands.SpeedRead;
+        cdb[10] = (byte)buffer.Length;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET SPEEDREAD took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Gets the Plextor CD-R and multi-session hiding status</summary>
+    /// <returns><c>true</c>, if CD-R and multi-session hiding is supported, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorGetHiding(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        buffer      = new byte[8];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0] = (byte)ScsiCommands.PlextorExtend;
+        cdb[1] = (byte)PlextorSubCommands.GetMode;
+        cdb[2] = (byte)PlextorSubCommands.SessionHide;
+        cdb[9] = (byte)buffer.Length;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET SINGLE-SESSION / HIDE CD-R took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Gets the Plextor DVD+ book bitsetting status</summary>
+    /// <returns><c>true</c>, if DVD+ book bitsetting is supported, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="dualLayer">Set if bitset is for dual layer discs.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorGetBitsetting(out byte[] buffer, out byte[] senseBuffer, bool dualLayer, uint timeout,
+                                     out double duration)
+    {
+        buffer      = new byte[8];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0] = (byte)ScsiCommands.PlextorExtend;
+        cdb[1] = (byte)PlextorSubCommands.GetMode;
+        cdb[2] = (byte)PlextorSubCommands.BitSet;
+        cdb[9] = (byte)buffer.Length;
+
+        if(dualLayer)
+            cdb[3] = (byte)PlextorSubCommands.BitSetRdl;
+        else
+            cdb[3] = (byte)PlextorSubCommands.BitSetR;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET BOOK BITSETTING took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Gets the Plextor DVD+ test writing status</summary>
+    /// <returns><c>true</c>, if DVD+ test writing is supported, <c>false</c> otherwise.</returns>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool PlextorGetTestWriteDvdPlus(out byte[] buffer, out byte[] senseBuffer, uint timeout,
+                                           out double duration)
+    {
+        buffer      = new byte[8];
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0]  = (byte)ScsiCommands.PlextorExtend;
+        cdb[1]  = (byte)PlextorSubCommands.GetMode;
+        cdb[2]  = (byte)PlextorSubCommands.TestWriteDvdPlus;
+        cdb[10] = (byte)buffer.Length;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PLEXTOR GET TEST WRITE DVD+ took {0} ms.", duration);
+
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/SBC.cs b/Aaru.Devices/Device/ScsiCommands/SBC.cs
index 49ae076ea..840e8a671 100644
--- a/Aaru.Devices/Device/ScsiCommands/SBC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SBC.cs
@@ -33,404 +33,403 @@
 using System;
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Sends the SBC READ (6) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Starting block.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    public bool Read6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint timeout,
+                      out double duration) =>
+        Read6(out buffer, out senseBuffer, lba, blockSize, 1, timeout, out duration);
+
+    /// <summary>Sends the SBC READ (6) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Starting block.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    public bool Read6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, byte transferLength,
+                      uint timeout, out double duration)
     {
-        /// <summary>Sends the SBC READ (6) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Starting block.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        public bool Read6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint timeout,
-                          out double duration) =>
-            Read6(out buffer, out senseBuffer, lba, blockSize, 1, timeout, out duration);
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[6];
 
-        /// <summary>Sends the SBC READ (6) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Starting block.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        public bool Read6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, byte transferLength,
-                          uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[6];
+        cdb[0] = (byte)ScsiCommands.Read6;
+        cdb[1] = (byte)((lba & 0x1F0000) >> 16);
+        cdb[2] = (byte)((lba & 0xFF00)   >> 8);
+        cdb[3] = (byte)(lba & 0xFF);
+        cdb[4] = transferLength;
 
-            cdb[0] = (byte)ScsiCommands.Read6;
-            cdb[1] = (byte)((lba & 0x1F0000) >> 16);
-            cdb[2] = (byte)((lba & 0xFF00)   >> 8);
-            cdb[3] = (byte)(lba & 0xFF);
-            cdb[4] = transferLength;
+        if(transferLength == 0)
+            buffer = new byte[256 * blockSize];
+        else
+            buffer = new byte[transferLength * blockSize];
 
-            if(transferLength == 0)
-                buffer = new byte[256 * blockSize];
-            else
-                buffer = new byte[transferLength * blockSize];
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        AaruConsole.DebugWriteLine("SCSI Device", "READ (6) took {0} ms.", duration);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "READ (6) took {0} ms.", duration);
+        return sense;
+    }
 
-            return sense;
-        }
+    /// <summary>Sends the SBC READ (10) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="rdprotect">Instructs the drive how to check for protection information on the medium.</param>
+    /// <param name="dpo">
+    ///     If set to <c>true</c> requested blocks shall be assigned the lowest retention priority on cache
+    ///     fetch/retain.
+    /// </param>
+    /// <param name="fua">If set to <c>true</c> requested blocks MUST bu read from medium and not the cache.</param>
+    /// <param name="fuaNv">
+    ///     If set to <c>true</c> requested blocks will be returned from non-volatile cache. If they're not
+    ///     present they shall be stored there.
+    /// </param>
+    /// <param name="lba">Starting block.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="groupNumber">Group number where attributes associated with this command should be collected.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    /// <param name="relAddr">If set to <c>true</c> address is relative to current position.</param>
+    public bool Read10(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua, bool fuaNv,
+                       bool relAddr, uint lba, uint blockSize, byte groupNumber, ushort transferLength,
+                       uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
 
-        /// <summary>Sends the SBC READ (10) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="rdprotect">Instructs the drive how to check for protection information on the medium.</param>
-        /// <param name="dpo">
-        ///     If set to <c>true</c> requested blocks shall be assigned the lowest retention priority on cache
-        ///     fetch/retain.
-        /// </param>
-        /// <param name="fua">If set to <c>true</c> requested blocks MUST bu read from medium and not the cache.</param>
-        /// <param name="fuaNv">
-        ///     If set to <c>true</c> requested blocks will be returned from non-volatile cache. If they're not
-        ///     present they shall be stored there.
-        /// </param>
-        /// <param name="lba">Starting block.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="groupNumber">Group number where attributes associated with this command should be collected.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        /// <param name="relAddr">If set to <c>true</c> address is relative to current position.</param>
-        public bool Read10(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua, bool fuaNv,
-                           bool relAddr, uint lba, uint blockSize, byte groupNumber, ushort transferLength,
+        cdb[0] = (byte)ScsiCommands.Read10;
+        cdb[1] = (byte)((rdprotect & 0x07) << 5);
+
+        if(dpo)
+            cdb[1] += 0x10;
+
+        if(fua)
+            cdb[1] += 0x08;
+
+        if(fuaNv)
+            cdb[1] += 0x02;
+
+        if(relAddr)
+            cdb[1] += 0x01;
+
+        cdb[2] = (byte)((lba & 0xFF000000) >> 24);
+        cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((lba & 0xFF00)     >> 8);
+        cdb[5] = (byte)(lba         & 0xFF);
+        cdb[6] = (byte)(groupNumber & 0x1F);
+        cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
+        cdb[8] = (byte)(transferLength & 0xFF);
+
+        buffer = new byte[transferLength * blockSize];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ (10) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the SBC READ (12) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="rdprotect">Instructs the drive how to check for protection information on the medium.</param>
+    /// <param name="dpo">
+    ///     If set to <c>true</c> requested blocks shall be assigned the lowest retention priority on cache
+    ///     fetch/retain.
+    /// </param>
+    /// <param name="fua">If set to <c>true</c> requested blocks MUST bu read from medium and not the cache.</param>
+    /// <param name="fuaNv">
+    ///     If set to <c>true</c> requested blocks will be returned from non-volatile cache. If they're not
+    ///     present they shall be stored there.
+    /// </param>
+    /// <param name="lba">Starting block.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="groupNumber">Group number where attributes associated with this command should be collected.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    /// <param name="streaming">If set to <c>true</c> the stream playback operation should be used (MMC only).</param>
+    /// <param name="relAddr">If set to <c>true</c> address is relative to current position.</param>
+    public bool Read12(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua, bool fuaNv,
+                       bool relAddr, uint lba, uint blockSize, byte groupNumber, uint transferLength,
+                       bool streaming, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+
+        cdb[0] = (byte)ScsiCommands.Read12;
+        cdb[1] = (byte)((rdprotect & 0x07) << 5);
+
+        if(dpo)
+            cdb[1] += 0x10;
+
+        if(fua)
+            cdb[1] += 0x08;
+
+        if(fuaNv)
+            cdb[1] += 0x02;
+
+        if(relAddr)
+            cdb[1] += 0x01;
+
+        cdb[2]  = (byte)((lba & 0xFF000000) >> 24);
+        cdb[3]  = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4]  = (byte)((lba & 0xFF00)     >> 8);
+        cdb[5]  = (byte)(lba & 0xFF);
+        cdb[6]  = (byte)((transferLength & 0xFF000000) >> 24);
+        cdb[7]  = (byte)((transferLength & 0xFF0000)   >> 16);
+        cdb[8]  = (byte)((transferLength & 0xFF00)     >> 8);
+        cdb[9]  = (byte)(transferLength & 0xFF);
+        cdb[10] = (byte)(groupNumber    & 0x1F);
+
+        if(streaming)
+            cdb[10] += 0x80;
+
+        buffer = new byte[transferLength * blockSize];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ (12) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the SBC READ (16) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="rdprotect">Instructs the drive how to check for protection information on the medium.</param>
+    /// <param name="dpo">
+    ///     If set to <c>true</c> requested blocks shall be assigned the lowest retention priority on cache
+    ///     fetch/retain.
+    /// </param>
+    /// <param name="fua">If set to <c>true</c> requested blocks MUST bu read from medium and not the cache.</param>
+    /// <param name="fuaNv">
+    ///     If set to <c>true</c> requested blocks will be returned from non-volatile cache. If they're not
+    ///     present they shall be stored there.
+    /// </param>
+    /// <param name="lba">Starting block.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="groupNumber">Group number where attributes associated with this command should be collected.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    /// <param name="streaming">If set to <c>true</c> the stream playback operation should be used (MMC only).</param>
+    public bool Read16(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua, bool fuaNv,
+                       ulong lba, uint blockSize, byte groupNumber, uint transferLength, bool streaming,
+                       uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb      = new byte[16];
+        byte[] lbaBytes = BitConverter.GetBytes(lba);
+
+        cdb[0] = (byte)ScsiCommands.Read16;
+        cdb[1] = (byte)((rdprotect & 0x07) << 5);
+
+        if(dpo)
+            cdb[1] += 0x10;
+
+        if(fua)
+            cdb[1] += 0x08;
+
+        if(fuaNv)
+            cdb[1] += 0x02;
+
+        cdb[2]  = lbaBytes[7];
+        cdb[3]  = lbaBytes[6];
+        cdb[4]  = lbaBytes[5];
+        cdb[5]  = lbaBytes[4];
+        cdb[6]  = lbaBytes[3];
+        cdb[7]  = lbaBytes[2];
+        cdb[8]  = lbaBytes[1];
+        cdb[9]  = lbaBytes[0];
+        cdb[10] = (byte)((transferLength & 0xFF000000) >> 24);
+        cdb[11] = (byte)((transferLength & 0xFF0000)   >> 16);
+        cdb[12] = (byte)((transferLength & 0xFF00)     >> 8);
+        cdb[13] = (byte)(transferLength & 0xFF);
+        cdb[14] = (byte)(groupNumber    & 0x1F);
+
+        if(streaming)
+            cdb[14] += 0x80;
+
+        buffer = new byte[transferLength * blockSize];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ (16) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the SBC READ LONG (10) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="relAddr"></param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="correct">If set to <c>true</c> ask the drive to try to correct errors in the sector.</param>
+    /// <param name="lba">LBA to read.</param>
+    /// <param name="transferBytes">
+    ///     How many bytes to read. If the number is not exactly the drive's size, the command will
+    ///     fail and incidate a delta of the size in SENSE.
+    /// </param>
+    public bool ReadLong10(out byte[] buffer, out byte[] senseBuffer, bool correct, bool relAddr, uint lba,
+                           ushort transferBytes, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+
+        cdb[0] = (byte)ScsiCommands.ReadLong;
+
+        if(correct)
+            cdb[1] += 0x02;
+
+        if(relAddr)
+            cdb[1] += 0x01;
+
+        cdb[2] = (byte)((lba & 0xFF000000) >> 24);
+        cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((lba & 0xFF00)     >> 8);
+        cdb[5] = (byte)(lba & 0xFF);
+        cdb[7] = (byte)((transferBytes & 0xFF00) >> 8);
+        cdb[8] = (byte)(transferBytes & 0xFF);
+
+        buffer = new byte[transferBytes];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ LONG (10) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the SBC READ LONG (16) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="correct">If set to <c>true</c> ask the drive to try to correct errors in the sector.</param>
+    /// <param name="lba">LBA to read.</param>
+    /// <param name="transferBytes">
+    ///     How many bytes to read. If the number is not exactly the drive's size, the command will
+    ///     fail and incidate a delta of the size in SENSE.
+    /// </param>
+    public bool ReadLong16(out byte[] buffer, out byte[] senseBuffer, bool correct, ulong lba, uint transferBytes,
                            uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-
-            cdb[0] = (byte)ScsiCommands.Read10;
-            cdb[1] = (byte)((rdprotect & 0x07) << 5);
-
-            if(dpo)
-                cdb[1] += 0x10;
-
-            if(fua)
-                cdb[1] += 0x08;
-
-            if(fuaNv)
-                cdb[1] += 0x02;
-
-            if(relAddr)
-                cdb[1] += 0x01;
-
-            cdb[2] = (byte)((lba & 0xFF000000) >> 24);
-            cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((lba & 0xFF00)     >> 8);
-            cdb[5] = (byte)(lba         & 0xFF);
-            cdb[6] = (byte)(groupNumber & 0x1F);
-            cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
-            cdb[8] = (byte)(transferLength & 0xFF);
-
-            buffer = new byte[transferLength * blockSize];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ (10) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the SBC READ (12) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="rdprotect">Instructs the drive how to check for protection information on the medium.</param>
-        /// <param name="dpo">
-        ///     If set to <c>true</c> requested blocks shall be assigned the lowest retention priority on cache
-        ///     fetch/retain.
-        /// </param>
-        /// <param name="fua">If set to <c>true</c> requested blocks MUST bu read from medium and not the cache.</param>
-        /// <param name="fuaNv">
-        ///     If set to <c>true</c> requested blocks will be returned from non-volatile cache. If they're not
-        ///     present they shall be stored there.
-        /// </param>
-        /// <param name="lba">Starting block.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="groupNumber">Group number where attributes associated with this command should be collected.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        /// <param name="streaming">If set to <c>true</c> the stream playback operation should be used (MMC only).</param>
-        /// <param name="relAddr">If set to <c>true</c> address is relative to current position.</param>
-        public bool Read12(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua, bool fuaNv,
-                           bool relAddr, uint lba, uint blockSize, byte groupNumber, uint transferLength,
-                           bool streaming, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-
-            cdb[0] = (byte)ScsiCommands.Read12;
-            cdb[1] = (byte)((rdprotect & 0x07) << 5);
-
-            if(dpo)
-                cdb[1] += 0x10;
-
-            if(fua)
-                cdb[1] += 0x08;
-
-            if(fuaNv)
-                cdb[1] += 0x02;
-
-            if(relAddr)
-                cdb[1] += 0x01;
-
-            cdb[2]  = (byte)((lba & 0xFF000000) >> 24);
-            cdb[3]  = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4]  = (byte)((lba & 0xFF00)     >> 8);
-            cdb[5]  = (byte)(lba & 0xFF);
-            cdb[6]  = (byte)((transferLength & 0xFF000000) >> 24);
-            cdb[7]  = (byte)((transferLength & 0xFF0000)   >> 16);
-            cdb[8]  = (byte)((transferLength & 0xFF00)     >> 8);
-            cdb[9]  = (byte)(transferLength & 0xFF);
-            cdb[10] = (byte)(groupNumber    & 0x1F);
-
-            if(streaming)
-                cdb[10] += 0x80;
-
-            buffer = new byte[transferLength * blockSize];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ (12) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the SBC READ (16) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="rdprotect">Instructs the drive how to check for protection information on the medium.</param>
-        /// <param name="dpo">
-        ///     If set to <c>true</c> requested blocks shall be assigned the lowest retention priority on cache
-        ///     fetch/retain.
-        /// </param>
-        /// <param name="fua">If set to <c>true</c> requested blocks MUST bu read from medium and not the cache.</param>
-        /// <param name="fuaNv">
-        ///     If set to <c>true</c> requested blocks will be returned from non-volatile cache. If they're not
-        ///     present they shall be stored there.
-        /// </param>
-        /// <param name="lba">Starting block.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="groupNumber">Group number where attributes associated with this command should be collected.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        /// <param name="streaming">If set to <c>true</c> the stream playback operation should be used (MMC only).</param>
-        public bool Read16(out byte[] buffer, out byte[] senseBuffer, byte rdprotect, bool dpo, bool fua, bool fuaNv,
-                           ulong lba, uint blockSize, byte groupNumber, uint transferLength, bool streaming,
-                           uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb      = new byte[16];
-            byte[] lbaBytes = BitConverter.GetBytes(lba);
-
-            cdb[0] = (byte)ScsiCommands.Read16;
-            cdb[1] = (byte)((rdprotect & 0x07) << 5);
-
-            if(dpo)
-                cdb[1] += 0x10;
-
-            if(fua)
-                cdb[1] += 0x08;
-
-            if(fuaNv)
-                cdb[1] += 0x02;
-
-            cdb[2]  = lbaBytes[7];
-            cdb[3]  = lbaBytes[6];
-            cdb[4]  = lbaBytes[5];
-            cdb[5]  = lbaBytes[4];
-            cdb[6]  = lbaBytes[3];
-            cdb[7]  = lbaBytes[2];
-            cdb[8]  = lbaBytes[1];
-            cdb[9]  = lbaBytes[0];
-            cdb[10] = (byte)((transferLength & 0xFF000000) >> 24);
-            cdb[11] = (byte)((transferLength & 0xFF0000)   >> 16);
-            cdb[12] = (byte)((transferLength & 0xFF00)     >> 8);
-            cdb[13] = (byte)(transferLength & 0xFF);
-            cdb[14] = (byte)(groupNumber    & 0x1F);
-
-            if(streaming)
-                cdb[14] += 0x80;
-
-            buffer = new byte[transferLength * blockSize];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ (16) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the SBC READ LONG (10) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="relAddr"></param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="correct">If set to <c>true</c> ask the drive to try to correct errors in the sector.</param>
-        /// <param name="lba">LBA to read.</param>
-        /// <param name="transferBytes">
-        ///     How many bytes to read. If the number is not exactly the drive's size, the command will
-        ///     fail and incidate a delta of the size in SENSE.
-        /// </param>
-        public bool ReadLong10(out byte[] buffer, out byte[] senseBuffer, bool correct, bool relAddr, uint lba,
-                               ushort transferBytes, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-
-            cdb[0] = (byte)ScsiCommands.ReadLong;
-
-            if(correct)
-                cdb[1] += 0x02;
-
-            if(relAddr)
-                cdb[1] += 0x01;
-
-            cdb[2] = (byte)((lba & 0xFF000000) >> 24);
-            cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((lba & 0xFF00)     >> 8);
-            cdb[5] = (byte)(lba & 0xFF);
-            cdb[7] = (byte)((transferBytes & 0xFF00) >> 8);
-            cdb[8] = (byte)(transferBytes & 0xFF);
-
-            buffer = new byte[transferBytes];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ LONG (10) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the SBC READ LONG (16) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ LONG response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="correct">If set to <c>true</c> ask the drive to try to correct errors in the sector.</param>
-        /// <param name="lba">LBA to read.</param>
-        /// <param name="transferBytes">
-        ///     How many bytes to read. If the number is not exactly the drive's size, the command will
-        ///     fail and incidate a delta of the size in SENSE.
-        /// </param>
-        public bool ReadLong16(out byte[] buffer, out byte[] senseBuffer, bool correct, ulong lba, uint transferBytes,
-                               uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb      = new byte[16];
-            byte[] lbaBytes = BitConverter.GetBytes(lba);
-
-            cdb[0]  = (byte)ScsiCommands.ServiceActionIn;
-            cdb[1]  = (byte)ScsiServiceActions.ReadLong16;
-            cdb[2]  = lbaBytes[7];
-            cdb[3]  = lbaBytes[6];
-            cdb[4]  = lbaBytes[5];
-            cdb[5]  = lbaBytes[4];
-            cdb[6]  = lbaBytes[3];
-            cdb[7]  = lbaBytes[2];
-            cdb[8]  = lbaBytes[1];
-            cdb[9]  = lbaBytes[0];
-            cdb[12] = (byte)((transferBytes & 0xFF00) >> 8);
-            cdb[13] = (byte)(transferBytes & 0xFF);
-
-            if(correct)
-                cdb[14] += 0x01;
-
-            buffer = new byte[transferBytes];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ LONG (16) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Moves the device reading element to the specified block address</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="lba">LBA.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Seek6(out byte[] senseBuffer, uint lba, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = Array.Empty<byte>();
-
-            cdb[0] = (byte)ScsiCommands.Seek6;
-            cdb[1] = (byte)((lba & 0x1F0000) >> 16);
-            cdb[2] = (byte)((lba & 0xFF00)   >> 8);
-            cdb[3] = (byte)(lba & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "SEEK (6) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Moves the device reading element to the specified block address</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="lba">LBA.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Seek10(out byte[] senseBuffer, uint lba, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[10];
-            byte[] buffer = Array.Empty<byte>();
-
-            cdb[0] = (byte)ScsiCommands.Seek10;
-            cdb[2] = (byte)((lba & 0xFF000000) >> 24);
-            cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((lba & 0xFF00)     >> 8);
-            cdb[5] = (byte)(lba & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "SEEK (10) took {0} ms.", duration);
-
-            return sense;
-        }
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb      = new byte[16];
+        byte[] lbaBytes = BitConverter.GetBytes(lba);
+
+        cdb[0]  = (byte)ScsiCommands.ServiceActionIn;
+        cdb[1]  = (byte)ScsiServiceActions.ReadLong16;
+        cdb[2]  = lbaBytes[7];
+        cdb[3]  = lbaBytes[6];
+        cdb[4]  = lbaBytes[5];
+        cdb[5]  = lbaBytes[4];
+        cdb[6]  = lbaBytes[3];
+        cdb[7]  = lbaBytes[2];
+        cdb[8]  = lbaBytes[1];
+        cdb[9]  = lbaBytes[0];
+        cdb[12] = (byte)((transferBytes & 0xFF00) >> 8);
+        cdb[13] = (byte)(transferBytes & 0xFF);
+
+        if(correct)
+            cdb[14] += 0x01;
+
+        buffer = new byte[transferBytes];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ LONG (16) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Moves the device reading element to the specified block address</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="lba">LBA.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Seek6(out byte[] senseBuffer, uint lba, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = Array.Empty<byte>();
+
+        cdb[0] = (byte)ScsiCommands.Seek6;
+        cdb[1] = (byte)((lba & 0x1F0000) >> 16);
+        cdb[2] = (byte)((lba & 0xFF00)   >> 8);
+        cdb[3] = (byte)(lba & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "SEEK (6) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Moves the device reading element to the specified block address</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="lba">LBA.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Seek10(out byte[] senseBuffer, uint lba, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[10];
+        byte[] buffer = Array.Empty<byte>();
+
+        cdb[0] = (byte)ScsiCommands.Seek10;
+        cdb[2] = (byte)((lba & 0xFF000000) >> 24);
+        cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((lba & 0xFF00)     >> 8);
+        cdb[5] = (byte)(lba & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "SEEK (10) took {0} ms.", duration);
+
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/SMC.cs b/Aaru.Devices/Device/ScsiCommands/SMC.cs
index d8b467be2..ba5e7b9f7 100644
--- a/Aaru.Devices/Device/ScsiCommands/SMC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SMC.cs
@@ -32,71 +32,70 @@
 
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Reads an attribute from the medium auxiliary memory, or reports which elements in the changer contain one</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
+    /// <param name="element">Element address.</param>
+    /// <param name="elementType">Element type.</param>
+    /// <param name="volume">Volume number.</param>
+    /// <param name="partition">Partition number.</param>
+    /// <param name="firstAttribute">First attribute identificator.</param>
+    /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, ushort element,
+                              byte elementType, byte volume, byte partition, ushort firstAttribute, bool cache,
+                              uint timeout, out double duration)
     {
-        /// <summary>Reads an attribute from the medium auxiliary memory, or reports which elements in the changer contain one</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
-        /// <param name="element">Element address.</param>
-        /// <param name="elementType">Element type.</param>
-        /// <param name="volume">Volume number.</param>
-        /// <param name="partition">Partition number.</param>
-        /// <param name="firstAttribute">First attribute identificator.</param>
-        /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, ushort element,
-                                  byte elementType, byte volume, byte partition, ushort firstAttribute, bool cache,
-                                  uint timeout, out double duration)
-        {
-            buffer = new byte[256];
-            byte[] cdb = new byte[16];
-            senseBuffer = new byte[64];
+        buffer = new byte[256];
+        byte[] cdb = new byte[16];
+        senseBuffer = new byte[64];
 
-            cdb[0]  = (byte)ScsiCommands.ReadAttribute;
-            cdb[1]  = (byte)((byte)action & 0x1F);
-            cdb[2]  = (byte)((element & 0xFF00) >> 8);
-            cdb[3]  = (byte)(element     & 0xFF);
-            cdb[4]  = (byte)(elementType & 0x0F);
-            cdb[5]  = volume;
-            cdb[7]  = partition;
-            cdb[8]  = (byte)((firstAttribute & 0xFF00) >> 8);
-            cdb[9]  = (byte)(firstAttribute & 0xFF);
-            cdb[10] = (byte)((buffer.Length & 0xFF000000) >> 24);
-            cdb[11] = (byte)((buffer.Length & 0xFF0000)   >> 16);
-            cdb[12] = (byte)((buffer.Length & 0xFF00)     >> 8);
-            cdb[13] = (byte)(buffer.Length & 0xFF);
+        cdb[0]  = (byte)ScsiCommands.ReadAttribute;
+        cdb[1]  = (byte)((byte)action & 0x1F);
+        cdb[2]  = (byte)((element & 0xFF00) >> 8);
+        cdb[3]  = (byte)(element     & 0xFF);
+        cdb[4]  = (byte)(elementType & 0x0F);
+        cdb[5]  = volume;
+        cdb[7]  = partition;
+        cdb[8]  = (byte)((firstAttribute & 0xFF00) >> 8);
+        cdb[9]  = (byte)(firstAttribute & 0xFF);
+        cdb[10] = (byte)((buffer.Length & 0xFF000000) >> 24);
+        cdb[11] = (byte)((buffer.Length & 0xFF0000)   >> 16);
+        cdb[12] = (byte)((buffer.Length & 0xFF00)     >> 8);
+        cdb[13] = (byte)(buffer.Length & 0xFF);
 
-            if(cache)
-                cdb[14] += 0x01;
+        if(cache)
+            cdb[14] += 0x01;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            if(sense)
-                return true;
+        if(sense)
+            return true;
 
-            uint attrLen = (uint)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3] + 4);
-            buffer      = new byte[attrLen];
-            cdb[10]     = (byte)((buffer.Length & 0xFF000000) >> 24);
-            cdb[11]     = (byte)((buffer.Length & 0xFF0000)   >> 16);
-            cdb[12]     = (byte)((buffer.Length & 0xFF00)     >> 8);
-            cdb[13]     = (byte)(buffer.Length & 0xFF);
-            senseBuffer = new byte[64];
+        uint attrLen = (uint)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3] + 4);
+        buffer      = new byte[attrLen];
+        cdb[10]     = (byte)((buffer.Length & 0xFF000000) >> 24);
+        cdb[11]     = (byte)((buffer.Length & 0xFF0000)   >> 16);
+        cdb[12]     = (byte)((buffer.Length & 0xFF00)     >> 8);
+        cdb[13]     = (byte)(buffer.Length & 0xFF);
+        senseBuffer = new byte[64];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "READ ATTRIBUTE took {0} ms.", duration);
+        AaruConsole.DebugWriteLine("SCSI Device", "READ ATTRIBUTE took {0} ms.", duration);
 
-            return sense;
-        }
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/SPC.cs b/Aaru.Devices/Device/ScsiCommands/SPC.cs
index 28aaef8b6..ecbbd1f91 100644
--- a/Aaru.Devices/Device/ScsiCommands/SPC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SPC.cs
@@ -35,785 +35,784 @@ using System.Diagnostics.CodeAnalysis;
 using Aaru.Console;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+[SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+public sealed partial class Device
 {
-    [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    public sealed partial class Device
+    /// <summary>Sends the SPC INQUIRY command to the device using default device timeout.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer) =>
+        ScsiInquiry(out buffer, out senseBuffer, Timeout);
+
+    /// <summary>Sends the SPC INQUIRY command to the device using default device timeout.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, out double duration) =>
+        ScsiInquiry(out buffer, out senseBuffer, Timeout, out duration);
+
+    /// <summary>Sends the SPC INQUIRY command to the device.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, uint timeout) =>
+        ScsiInquiry(out buffer, out senseBuffer, timeout, out _);
+
+    /// <summary>Sends the SPC INQUIRY command to the device.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
     {
-        /// <summary>Sends the SPC INQUIRY command to the device using default device timeout.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer) =>
-            ScsiInquiry(out buffer, out senseBuffer, Timeout);
+        buffer      = new byte[36];
+        senseBuffer = new byte[64];
 
-        /// <summary>Sends the SPC INQUIRY command to the device using default device timeout.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, out double duration) =>
-            ScsiInquiry(out buffer, out senseBuffer, Timeout, out duration);
-
-        /// <summary>Sends the SPC INQUIRY command to the device.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, uint timeout) =>
-            ScsiInquiry(out buffer, out senseBuffer, timeout, out _);
-
-        /// <summary>Sends the SPC INQUIRY command to the device.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+        byte[] cdb =
         {
-            buffer      = new byte[36];
-            senseBuffer = new byte[64];
+            (byte)ScsiCommands.Inquiry, 0, 0, 0, 36, 0
+        };
 
-            byte[] cdb =
-            {
-                (byte)ScsiCommands.Inquiry, 0, 0, 0, 36, 0
-            };
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        Error = LastError != 0;
 
-            Error = LastError != 0;
+        if(sense)
+            return true;
 
-            if(sense)
-                return true;
+        byte pagesLength = (byte)(buffer[4] + 5);
 
-            byte pagesLength = (byte)(buffer[4] + 5);
-
-            cdb = new byte[]
-            {
-                (byte)ScsiCommands.Inquiry, 0, 0, 0, pagesLength, 0
-            };
-
-            buffer      = new byte[pagesLength];
-            senseBuffer = new byte[64];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "INQUIRY took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>
-        ///     Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page using default device
-        ///     timeout.
-        /// </summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="page">The Extended Vital Product Data</param>
-        public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, byte page) =>
-            ScsiInquiry(out buffer, out senseBuffer, page, Timeout);
-
-        /// <summary>
-        ///     Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page using default device
-        ///     timeout.
-        /// </summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="page">The Extended Vital Product Data</param>
-        public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, byte page, out double duration) =>
-            ScsiInquiry(out buffer, out senseBuffer, page, Timeout, out duration);
-
-        /// <summary>Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="page">The Extended Vital Product Data</param>
-        public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, byte page, uint timeout) =>
-            ScsiInquiry(out buffer, out senseBuffer, page, timeout, out _);
-
-        /// <summary>Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page.</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="page">The Extended Vital Product Data</param>
-        public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, byte page, uint timeout, out double duration)
+        cdb = new byte[]
         {
-            buffer      = new byte[36];
-            senseBuffer = new byte[64];
+            (byte)ScsiCommands.Inquiry, 0, 0, 0, pagesLength, 0
+        };
 
-            byte[] cdb =
-            {
-                (byte)ScsiCommands.Inquiry, 1, page, 0, 36, 0
-            };
+        buffer      = new byte[pagesLength];
+        senseBuffer = new byte[64];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out sense);
 
-            Error = LastError != 0;
+        Error = LastError != 0;
 
-            if(sense)
-                return true;
+        AaruConsole.DebugWriteLine("SCSI Device", "INQUIRY took {0} ms.", duration);
 
-            // This is because INQ was returned instead of EVPD
-            if(buffer[1] != page)
-                return true;
+        return sense;
+    }
 
-            byte pagesLength = (byte)(buffer[3] + 4);
+    /// <summary>
+    ///     Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page using default device
+    ///     timeout.
+    /// </summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="page">The Extended Vital Product Data</param>
+    public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, byte page) =>
+        ScsiInquiry(out buffer, out senseBuffer, page, Timeout);
 
-            cdb = new byte[]
-            {
-                (byte)ScsiCommands.Inquiry, 1, page, 0, pagesLength, 0
-            };
+    /// <summary>
+    ///     Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page using default device
+    ///     timeout.
+    /// </summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="page">The Extended Vital Product Data</param>
+    public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, byte page, out double duration) =>
+        ScsiInquiry(out buffer, out senseBuffer, page, Timeout, out duration);
 
-            buffer      = new byte[pagesLength];
-            senseBuffer = new byte[64];
+    /// <summary>Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="page">The Extended Vital Product Data</param>
+    public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, byte page, uint timeout) =>
+        ScsiInquiry(out buffer, out senseBuffer, page, timeout, out _);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out sense);
+    /// <summary>Sends the SPC INQUIRY command to the device with an Extended Vital Product Data page.</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI INQUIRY response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="page">The Extended Vital Product Data</param>
+    public bool ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, byte page, uint timeout, out double duration)
+    {
+        buffer      = new byte[36];
+        senseBuffer = new byte[64];
 
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "INQUIRY took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the SPC TEST UNIT READY command to the device</summary>
-        /// <returns><c>true</c>, if unit is NOT ready, <c>false</c> otherwise.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ScsiTestUnitReady(out byte[] senseBuffer, uint timeout, out double duration)
+        byte[] cdb =
         {
-            senseBuffer = new byte[64];
+            (byte)ScsiCommands.Inquiry, 1, page, 0, 36, 0
+        };
 
-            byte[] cdb =
-            {
-                (byte)ScsiCommands.TestUnitReady, 0, 0, 0, 0, 0
-            };
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            byte[] buffer = Array.Empty<byte>();
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
+        if(sense)
+            return true;
 
-            Error = LastError != 0;
+        // This is because INQ was returned instead of EVPD
+        if(buffer[1] != page)
+            return true;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "TEST UNIT READY took {0} ms.", duration);
+        byte pagesLength = (byte)(buffer[3] + 4);
 
-            return sense;
-        }
-
-        /// <summary>Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-1</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI MODE SENSE(6) response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ModeSense(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ModeSense6(out buffer, out senseBuffer, false, ScsiModeSensePageControl.Current, 0, 0, timeout,
-                       out duration);
-
-        /// <summary>Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-2</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI MODE SENSE(6) response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
-        /// <param name="pageControl">Page control.</param>
-        /// <param name="pageCode">Page code.</param>
-        public bool ModeSense6(out byte[] buffer, out byte[] senseBuffer, bool dbd,
-                               ScsiModeSensePageControl pageControl, byte pageCode, uint timeout,
-                               out double duration) => ModeSense6(out buffer, out senseBuffer, dbd, pageControl,
-                                                                  pageCode, 0, timeout, out duration);
-
-        /// <summary>Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-3 SPC-3</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI MODE SENSE(6) response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
-        /// <param name="pageControl">Page control.</param>
-        /// <param name="pageCode">Page code.</param>
-        /// <param name="subPageCode">Sub-page code.</param>
-        public bool ModeSense6(out byte[] buffer, out byte[] senseBuffer, bool dbd,
-                               ScsiModeSensePageControl pageControl, byte pageCode, byte subPageCode, uint timeout,
-                               out double duration)
+        cdb = new byte[]
         {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[6];
-            buffer = new byte[255];
+            (byte)ScsiCommands.Inquiry, 1, page, 0, pagesLength, 0
+        };
 
-            cdb[0] = (byte)ScsiCommands.ModeSense;
+        buffer      = new byte[pagesLength];
+        senseBuffer = new byte[64];
 
-            if(dbd)
-                cdb[1] = 0x08;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out sense);
 
-            cdb[2] |= (byte)pageControl;
-            cdb[2] |= (byte)(pageCode & 0x3F);
-            cdb[3] =  subPageCode;
-            cdb[4] =  (byte)buffer.Length;
-            cdb[5] =  0;
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        AaruConsole.DebugWriteLine("SCSI Device", "INQUIRY took {0} ms.", duration);
 
-            Error = LastError != 0;
+        return sense;
+    }
 
-            if(sense)
-                return true;
+    /// <summary>Sends the SPC TEST UNIT READY command to the device</summary>
+    /// <returns><c>true</c>, if unit is NOT ready, <c>false</c> otherwise.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ScsiTestUnitReady(out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
 
-            byte modeLength = (byte)(buffer[0] + 1);
-            buffer      = new byte[modeLength];
-            cdb[4]      = (byte)buffer.Length;
-            senseBuffer = new byte[64];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "MODE SENSE(6) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-2</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI MODE SENSE(10) response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
-        /// <param name="pageControl">Page control.</param>
-        /// <param name="pageCode">Page code.</param>
-        public bool ModeSense10(out byte[] buffer, out byte[] senseBuffer, bool dbd,
-                                ScsiModeSensePageControl pageControl, byte pageCode, uint timeout,
-                                out double duration) => ModeSense10(out buffer, out senseBuffer, false, dbd,
-                                                                    pageControl, pageCode, 0, timeout, out duration);
-
-        /// <summary>Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-3 SPC-2</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI MODE SENSE(10) response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
-        /// <param name="pageControl">Page control.</param>
-        /// <param name="pageCode">Page code.</param>
-        /// <param name="llbaa">If set means 64-bit LBAs are accepted by the caller.</param>
-        public bool ModeSense10(out byte[] buffer, out byte[] senseBuffer, bool llbaa, bool dbd,
-                                ScsiModeSensePageControl pageControl, byte pageCode, uint timeout,
-                                out double duration) => ModeSense10(out buffer, out senseBuffer, llbaa, dbd,
-                                                                    pageControl, pageCode, 0, timeout, out duration);
-
-        /// <summary>Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-3 SPC-3</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI MODE SENSE(10) response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
-        /// <param name="pageControl">Page control.</param>
-        /// <param name="pageCode">Page code.</param>
-        /// <param name="subPageCode">Sub-page code.</param>
-        /// <param name="llbaa">If set means 64-bit LBAs are accepted by the caller.</param>
-        public bool ModeSense10(out byte[] buffer, out byte[] senseBuffer, bool llbaa, bool dbd,
-                                ScsiModeSensePageControl pageControl, byte pageCode, byte subPageCode, uint timeout,
-                                out double duration)
+        byte[] cdb =
         {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-            buffer = new byte[4096];
+            (byte)ScsiCommands.TestUnitReady, 0, 0, 0, 0, 0
+        };
 
-            cdb[0] = (byte)ScsiCommands.ModeSense10;
+        byte[] buffer = Array.Empty<byte>();
 
-            if(llbaa)
-                cdb[1] |= 0x10;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
 
-            if(dbd)
-                cdb[1] |= 0x08;
+        Error = LastError != 0;
 
-            cdb[2] |= (byte)pageControl;
-            cdb[2] |= (byte)(pageCode & 0x3F);
-            cdb[3] =  subPageCode;
-            cdb[7] =  (byte)((buffer.Length & 0xFF00) >> 8);
-            cdb[8] =  (byte)(buffer.Length & 0xFF);
-            cdb[9] =  0;
+        AaruConsole.DebugWriteLine("SCSI Device", "TEST UNIT READY took {0} ms.", duration);
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
+        return sense;
+    }
 
-            Error = LastError != 0;
+    /// <summary>Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-1</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI MODE SENSE(6) response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ModeSense(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ModeSense6(out buffer, out senseBuffer, false, ScsiModeSensePageControl.Current, 0, 0, timeout,
+                   out duration);
 
-            if(sense)
-                return true;
+    /// <summary>Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-2</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI MODE SENSE(6) response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
+    /// <param name="pageControl">Page control.</param>
+    /// <param name="pageCode">Page code.</param>
+    public bool ModeSense6(out byte[] buffer, out byte[] senseBuffer, bool dbd,
+                           ScsiModeSensePageControl pageControl, byte pageCode, uint timeout,
+                           out double duration) => ModeSense6(out buffer, out senseBuffer, dbd, pageControl,
+                                                              pageCode, 0, timeout, out duration);
 
-            ushort modeLength = (ushort)((buffer[0] << 8) + buffer[1] + 2);
-            buffer      = new byte[modeLength];
-            cdb[7]      = (byte)((buffer.Length & 0xFF00) >> 8);
-            cdb[8]      = (byte)(buffer.Length & 0xFF);
-            senseBuffer = new byte[64];
+    /// <summary>Sends the SPC MODE SENSE(6) command to the device as introduced in SCSI-3 SPC-3</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI MODE SENSE(6) response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
+    /// <param name="pageControl">Page control.</param>
+    /// <param name="pageCode">Page code.</param>
+    /// <param name="subPageCode">Sub-page code.</param>
+    public bool ModeSense6(out byte[] buffer, out byte[] senseBuffer, bool dbd,
+                           ScsiModeSensePageControl pageControl, byte pageCode, byte subPageCode, uint timeout,
+                           out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[6];
+        buffer = new byte[255];
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out sense);
+        cdb[0] = (byte)ScsiCommands.ModeSense;
 
-            Error = LastError != 0;
+        if(dbd)
+            cdb[1] = 0x08;
 
-            AaruConsole.DebugWriteLine("SCSI Device", "MODE SENSE(10) took {0} ms.", duration);
+        cdb[2] |= (byte)pageControl;
+        cdb[2] |= (byte)(pageCode & 0x3F);
+        cdb[3] =  subPageCode;
+        cdb[4] =  (byte)buffer.Length;
+        cdb[5] =  0;
 
-            return sense;
-        }
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-        /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command to prevent medium removal</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool SpcPreventMediumRemoval(out byte[] senseBuffer, uint timeout, out double duration) =>
-            SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Prevent, timeout, out duration);
+        Error = LastError != 0;
 
-        /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command to allow medium removal</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool SpcAllowMediumRemoval(out byte[] senseBuffer, uint timeout, out double duration) =>
-            SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration);
+        if(sense)
+            return true;
 
-        /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="prevent"><c>true</c> to prevent medium removal, <c>false</c> to allow it.</param>
-        public bool SpcPreventAllowMediumRemoval(out byte[] senseBuffer, bool prevent, uint timeout,
-                                                 out double duration)
+        byte modeLength = (byte)(buffer[0] + 1);
+        buffer      = new byte[modeLength];
+        cdb[4]      = (byte)buffer.Length;
+        senseBuffer = new byte[64];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "MODE SENSE(6) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-2</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI MODE SENSE(10) response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
+    /// <param name="pageControl">Page control.</param>
+    /// <param name="pageCode">Page code.</param>
+    public bool ModeSense10(out byte[] buffer, out byte[] senseBuffer, bool dbd,
+                            ScsiModeSensePageControl pageControl, byte pageCode, uint timeout,
+                            out double duration) => ModeSense10(out buffer, out senseBuffer, false, dbd,
+                                                                pageControl, pageCode, 0, timeout, out duration);
+
+    /// <summary>Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-3 SPC-2</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI MODE SENSE(10) response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
+    /// <param name="pageControl">Page control.</param>
+    /// <param name="pageCode">Page code.</param>
+    /// <param name="llbaa">If set means 64-bit LBAs are accepted by the caller.</param>
+    public bool ModeSense10(out byte[] buffer, out byte[] senseBuffer, bool llbaa, bool dbd,
+                            ScsiModeSensePageControl pageControl, byte pageCode, uint timeout,
+                            out double duration) => ModeSense10(out buffer, out senseBuffer, llbaa, dbd,
+                                                                pageControl, pageCode, 0, timeout, out duration);
+
+    /// <summary>Sends the SPC MODE SENSE(10) command to the device as introduced in SCSI-3 SPC-3</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI MODE SENSE(10) response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="dbd">If set to <c>true</c> device MUST not return any block descriptor.</param>
+    /// <param name="pageControl">Page control.</param>
+    /// <param name="pageCode">Page code.</param>
+    /// <param name="subPageCode">Sub-page code.</param>
+    /// <param name="llbaa">If set means 64-bit LBAs are accepted by the caller.</param>
+    public bool ModeSense10(out byte[] buffer, out byte[] senseBuffer, bool llbaa, bool dbd,
+                            ScsiModeSensePageControl pageControl, byte pageCode, byte subPageCode, uint timeout,
+                            out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+        buffer = new byte[4096];
+
+        cdb[0] = (byte)ScsiCommands.ModeSense10;
+
+        if(llbaa)
+            cdb[1] |= 0x10;
+
+        if(dbd)
+            cdb[1] |= 0x08;
+
+        cdb[2] |= (byte)pageControl;
+        cdb[2] |= (byte)(pageCode & 0x3F);
+        cdb[3] =  subPageCode;
+        cdb[7] =  (byte)((buffer.Length & 0xFF00) >> 8);
+        cdb[8] =  (byte)(buffer.Length & 0xFF);
+        cdb[9] =  0;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        if(sense)
+            return true;
+
+        ushort modeLength = (ushort)((buffer[0] << 8) + buffer[1] + 2);
+        buffer      = new byte[modeLength];
+        cdb[7]      = (byte)((buffer.Length & 0xFF00) >> 8);
+        cdb[8]      = (byte)(buffer.Length & 0xFF);
+        senseBuffer = new byte[64];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "MODE SENSE(10) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command to prevent medium removal</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool SpcPreventMediumRemoval(out byte[] senseBuffer, uint timeout, out double duration) =>
+        SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Prevent, timeout, out duration);
+
+    /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command to allow medium removal</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool SpcAllowMediumRemoval(out byte[] senseBuffer, uint timeout, out double duration) =>
+        SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration);
+
+    /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="prevent"><c>true</c> to prevent medium removal, <c>false</c> to allow it.</param>
+    public bool SpcPreventAllowMediumRemoval(out byte[] senseBuffer, bool prevent, uint timeout,
+                                             out double duration)
+    {
+        if(prevent)
+            return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Prevent, timeout,
+                                                out duration);
+
+        return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration);
+    }
+
+    /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="preventMode">Prevention mode.</param>
+    public bool SpcPreventAllowMediumRemoval(out byte[] senseBuffer, ScsiPreventAllowMode preventMode, uint timeout,
+                                             out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = Array.Empty<byte>();
+
+        cdb[0] = (byte)ScsiCommands.PreventAllowMediumRemoval;
+        cdb[4] = (byte)((byte)preventMode & 0x03);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "PREVENT ALLOW MEDIUM REMOVAL took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the SPC READ CAPACITY command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ CAPACITY response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadCapacity(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ReadCapacity(out buffer, out senseBuffer, false, 0, false, timeout, out duration);
+
+    /// <summary>Sends the SPC READ CAPACITY command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ CAPACITY response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="relAddr">Indicates that <paramref name="address" /> is relative to current medium position</param>
+    /// <param name="address">Address where information is requested from, only valid if <paramref name="pmi" /> is set</param>
+    /// <param name="pmi">If set, it is requesting partial media capacity</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadCapacity(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address, bool pmi,
+                             uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+        buffer = new byte[8];
+
+        cdb[0] = (byte)ScsiCommands.ReadCapacity;
+
+        if(pmi)
         {
-            if(prevent)
-                return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Prevent, timeout,
-                                                    out duration);
+            cdb[8] = 0x01;
 
-            return SpcPreventAllowMediumRemoval(out senseBuffer, ScsiPreventAllowMode.Allow, timeout, out duration);
-        }
-
-        /// <summary>Sends the SPC PREVENT ALLOW MEDIUM REMOVAL command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="preventMode">Prevention mode.</param>
-        public bool SpcPreventAllowMediumRemoval(out byte[] senseBuffer, ScsiPreventAllowMode preventMode, uint timeout,
-                                                 out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = Array.Empty<byte>();
-
-            cdb[0] = (byte)ScsiCommands.PreventAllowMediumRemoval;
-            cdb[4] = (byte)((byte)preventMode & 0x03);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "PREVENT ALLOW MEDIUM REMOVAL took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the SPC READ CAPACITY command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ CAPACITY response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadCapacity(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ReadCapacity(out buffer, out senseBuffer, false, 0, false, timeout, out duration);
-
-        /// <summary>Sends the SPC READ CAPACITY command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ CAPACITY response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="relAddr">Indicates that <paramref name="address" /> is relative to current medium position</param>
-        /// <param name="address">Address where information is requested from, only valid if <paramref name="pmi" /> is set</param>
-        /// <param name="pmi">If set, it is requesting partial media capacity</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadCapacity(out byte[] buffer, out byte[] senseBuffer, bool relAddr, uint address, bool pmi,
-                                 uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-            buffer = new byte[8];
-
-            cdb[0] = (byte)ScsiCommands.ReadCapacity;
-
-            if(pmi)
-            {
-                cdb[8] = 0x01;
-
-                if(relAddr)
-                    cdb[1] = 0x01;
-
-                cdb[2] = (byte)((address & 0xFF000000) >> 24);
-                cdb[3] = (byte)((address & 0xFF0000)   >> 16);
-                cdb[4] = (byte)((address & 0xFF00)     >> 8);
-                cdb[5] = (byte)(address & 0xFF);
-            }
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ CAPACITY took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the SPC READ CAPACITY(16) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ CAPACITY(16) response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadCapacity16(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ReadCapacity16(out buffer, out senseBuffer, 0, false, timeout, out duration);
-
-        /// <summary>Sends the SPC READ CAPACITY(16) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ CAPACITY(16) response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="address">Address where information is requested from, only valid if <paramref name="pmi" /> is set</param>
-        /// <param name="pmi">If set, it is requesting partial media capacity</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadCapacity16(out byte[] buffer, out byte[] senseBuffer, ulong address, bool pmi, uint timeout,
-                                   out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[16];
-            buffer = new byte[32];
-
-            cdb[0] = (byte)ScsiCommands.ServiceActionIn;
-            cdb[1] = (byte)ScsiServiceActions.ReadCapacity16;
-
-            if(pmi)
-            {
-                cdb[14] = 0x01;
-                byte[] temp = BitConverter.GetBytes(address);
-                cdb[2] = temp[7];
-                cdb[3] = temp[6];
-                cdb[4] = temp[5];
-                cdb[5] = temp[4];
-                cdb[6] = temp[3];
-                cdb[7] = temp[2];
-                cdb[8] = temp[1];
-                cdb[9] = temp[0];
-            }
-
-            cdb[10] = (byte)((buffer.Length & 0xFF000000) >> 24);
-            cdb[11] = (byte)((buffer.Length & 0xFF0000)   >> 16);
-            cdb[12] = (byte)((buffer.Length & 0xFF00)     >> 8);
-            cdb[13] = (byte)(buffer.Length & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ CAPACITY(16) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the SPC READ MEDIA SERIAL NUMBER command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ MEDIA SERIAL NUMBER response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        public bool ReadMediaSerialNumber(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[12];
-            buffer = new byte[4];
-
-            cdb[0] = (byte)ScsiCommands.ReadSerialNumber;
-            cdb[1] = 0x01;
-            cdb[6] = (byte)((buffer.Length & 0xFF000000) >> 24);
-            cdb[7] = (byte)((buffer.Length & 0xFF0000)   >> 16);
-            cdb[8] = (byte)((buffer.Length & 0xFF00)     >> 8);
-            cdb[9] = (byte)(buffer.Length & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            if(sense)
-                return true;
-
-            uint strctLength = (uint)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3] + 4);
-            buffer      = new byte[strctLength];
-            cdb[6]      = (byte)((buffer.Length & 0xFF000000) >> 24);
-            cdb[7]      = (byte)((buffer.Length & 0xFF0000)   >> 16);
-            cdb[8]      = (byte)((buffer.Length & 0xFF00)     >> 8);
-            cdb[9]      = (byte)(buffer.Length & 0xFF);
-            senseBuffer = new byte[64];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ MEDIA SERIAL NUMBER took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
-        /// <param name="partition">Partition number.</param>
-        /// <param name="firstAttribute">First attribute identifier.</param>
-        /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte partition,
-                                  ushort firstAttribute, bool cache, uint timeout, out double duration) =>
-            ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, partition, firstAttribute, cache, timeout,
-                          out duration);
-
-        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
-        /// <param name="firstAttribute">First attribute identifier.</param>
-        /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
-                                  ushort firstAttribute, bool cache, uint timeout, out double duration) =>
-            ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, 0, firstAttribute, cache, timeout,
-                          out duration);
-
-        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
-        /// <param name="partition">Partition number.</param>
-        /// <param name="firstAttribute">First attribute identifier.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte partition,
-                                  ushort firstAttribute, uint timeout, out double duration) =>
-            ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, partition, firstAttribute, false, timeout,
-                          out duration);
-
-        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
-        /// <param name="firstAttribute">First attribute identifier.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
-                                  ushort firstAttribute, uint timeout, out double duration) =>
-            ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, 0, firstAttribute, false, timeout,
-                          out duration);
-
-        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
-        /// <param name="volume">Volume number.</param>
-        /// <param name="partition">Partition number.</param>
-        /// <param name="firstAttribute">First attribute identifier.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte volume,
-                                  byte partition, ushort firstAttribute, uint timeout, out double duration) =>
-            ReadAttribute(out buffer, out senseBuffer, action, 0, 0, volume, partition, firstAttribute, false, timeout,
-                          out duration);
-
-        /// <summary>Reads an attribute from the medium auxiliary memory</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
-        /// <param name="volume">Volume number.</param>
-        /// <param name="partition">Partition number.</param>
-        /// <param name="firstAttribute">First attribute identifier.</param>
-        /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte volume,
-                                  byte partition, ushort firstAttribute, bool cache, uint timeout,
-                                  out double duration) =>
-            ReadAttribute(out buffer, out senseBuffer, action, 0, 0, volume, partition, firstAttribute, cache, timeout,
-                          out duration);
-
-        /// <summary>Sends the SPC MODE SELECT(6) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer with the data to be sent to the device</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="savePages">Set to save pages between resets.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="pageFormat">Set if page is formatted.</param>
-        public bool ModeSelect(byte[] buffer, out byte[] senseBuffer, bool pageFormat, bool savePages, uint timeout,
-                               out double duration)
-        {
-            senseBuffer = new byte[64];
-
-            // Prevent overflows
-            if(buffer.Length > 255)
-            {
-                if(PlatformId != PlatformID.Win32NT      &&
-                   PlatformId != PlatformID.Win32S       &&
-                   PlatformId != PlatformID.Win32Windows &&
-                   PlatformId != PlatformID.WinCE        &&
-                   PlatformId != PlatformID.WindowsPhone &&
-                   PlatformId != PlatformID.Xbox)
-                    LastError = 75;
-                else
-                    LastError = 111;
-
-                Error    = true;
-                duration = 0;
-
-                return true;
-            }
-
-            byte[] cdb = new byte[6];
-
-            cdb[0] = (byte)ScsiCommands.ModeSelect;
-
-            if(pageFormat)
-                cdb[1] += 0x10;
-
-            if(savePages)
-                cdb[1] += 0x01;
-
-            cdb[4] = (byte)buffer.Length;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "MODE SELECT(6) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Sends the SPC MODE SELECT(10) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer with the data to be sent to the device</param>
-        /// <param name="savePages">Set to save pages between resets.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="pageFormat">Set if page is formatted.</param>
-        public bool ModeSelect10(byte[] buffer, out byte[] senseBuffer, bool pageFormat, bool savePages, uint timeout,
-                                 out double duration)
-        {
-            senseBuffer = new byte[64];
-
-            // Prevent overflows
-            if(buffer.Length > 65535)
-            {
-                if(PlatformId != PlatformID.Win32NT      &&
-                   PlatformId != PlatformID.Win32S       &&
-                   PlatformId != PlatformID.Win32Windows &&
-                   PlatformId != PlatformID.WinCE        &&
-                   PlatformId != PlatformID.WindowsPhone &&
-                   PlatformId != PlatformID.Xbox)
-                    LastError = 75;
-                else
-                    LastError = 111;
-
-                Error    = true;
-                duration = 0;
-
-                return true;
-            }
-
-            byte[] cdb = new byte[10];
-
-            cdb[0] = (byte)ScsiCommands.ModeSelect10;
-
-            if(pageFormat)
-                cdb[1] += 0x10;
-
-            if(savePages)
-                cdb[1] += 0x01;
-
-            cdb[7] = (byte)((buffer.Length & 0xFF00) << 8);
-            cdb[8] = (byte)(buffer.Length & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "MODE SELECT(10) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Requests the device fixed sense</summary>
-        /// <param name="buffer">Sense buffer</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed.</returns>
-        public bool RequestSense(out byte[] buffer, uint timeout, out double duration) =>
-            RequestSense(false, out buffer, timeout, out duration);
-
-        /// <summary>Requests the device sense</summary>
-        /// <param name="descriptor">Request a descriptor sense</param>
-        /// <param name="buffer">Sense buffer</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <returns><c>true</c> if the command failed.</returns>
-        public bool RequestSense(bool descriptor, out byte[] buffer, uint timeout, out double duration)
-        {
-            byte[] cdb = new byte[6];
-            buffer = new byte[252];
-
-            cdb[0] = (byte)ScsiCommands.RequestSense;
-
-            if(descriptor)
+            if(relAddr)
                 cdb[1] = 0x01;
 
-            cdb[2] = 0;
-            cdb[3] = 0;
-            cdb[4] = (byte)buffer.Length;
-            cdb[5] = 0;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out _, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "REQUEST SENSE took {0} ms.", duration);
-
-            return sense;
+            cdb[2] = (byte)((address & 0xFF000000) >> 24);
+            cdb[3] = (byte)((address & 0xFF0000)   >> 16);
+            cdb[4] = (byte)((address & 0xFF00)     >> 8);
+            cdb[5] = (byte)(address & 0xFF);
         }
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ CAPACITY took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the SPC READ CAPACITY(16) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ CAPACITY(16) response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadCapacity16(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ReadCapacity16(out buffer, out senseBuffer, 0, false, timeout, out duration);
+
+    /// <summary>Sends the SPC READ CAPACITY(16) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ CAPACITY(16) response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="address">Address where information is requested from, only valid if <paramref name="pmi" /> is set</param>
+    /// <param name="pmi">If set, it is requesting partial media capacity</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadCapacity16(out byte[] buffer, out byte[] senseBuffer, ulong address, bool pmi, uint timeout,
+                               out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[16];
+        buffer = new byte[32];
+
+        cdb[0] = (byte)ScsiCommands.ServiceActionIn;
+        cdb[1] = (byte)ScsiServiceActions.ReadCapacity16;
+
+        if(pmi)
+        {
+            cdb[14] = 0x01;
+            byte[] temp = BitConverter.GetBytes(address);
+            cdb[2] = temp[7];
+            cdb[3] = temp[6];
+            cdb[4] = temp[5];
+            cdb[5] = temp[4];
+            cdb[6] = temp[3];
+            cdb[7] = temp[2];
+            cdb[8] = temp[1];
+            cdb[9] = temp[0];
+        }
+
+        cdb[10] = (byte)((buffer.Length & 0xFF000000) >> 24);
+        cdb[11] = (byte)((buffer.Length & 0xFF0000)   >> 16);
+        cdb[12] = (byte)((buffer.Length & 0xFF00)     >> 8);
+        cdb[13] = (byte)(buffer.Length & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ CAPACITY(16) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the SPC READ MEDIA SERIAL NUMBER command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ MEDIA SERIAL NUMBER response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    public bool ReadMediaSerialNumber(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[12];
+        buffer = new byte[4];
+
+        cdb[0] = (byte)ScsiCommands.ReadSerialNumber;
+        cdb[1] = 0x01;
+        cdb[6] = (byte)((buffer.Length & 0xFF000000) >> 24);
+        cdb[7] = (byte)((buffer.Length & 0xFF0000)   >> 16);
+        cdb[8] = (byte)((buffer.Length & 0xFF00)     >> 8);
+        cdb[9] = (byte)(buffer.Length & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        if(sense)
+            return true;
+
+        uint strctLength = (uint)((buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3] + 4);
+        buffer      = new byte[strctLength];
+        cdb[6]      = (byte)((buffer.Length & 0xFF000000) >> 24);
+        cdb[7]      = (byte)((buffer.Length & 0xFF0000)   >> 16);
+        cdb[8]      = (byte)((buffer.Length & 0xFF00)     >> 8);
+        cdb[9]      = (byte)(buffer.Length & 0xFF);
+        senseBuffer = new byte[64];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ MEDIA SERIAL NUMBER took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads an attribute from the medium auxiliary memory</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
+    /// <param name="partition">Partition number.</param>
+    /// <param name="firstAttribute">First attribute identifier.</param>
+    /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte partition,
+                              ushort firstAttribute, bool cache, uint timeout, out double duration) =>
+        ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, partition, firstAttribute, cache, timeout,
+                      out duration);
+
+    /// <summary>Reads an attribute from the medium auxiliary memory</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
+    /// <param name="firstAttribute">First attribute identifier.</param>
+    /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
+                              ushort firstAttribute, bool cache, uint timeout, out double duration) =>
+        ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, 0, firstAttribute, cache, timeout,
+                      out duration);
+
+    /// <summary>Reads an attribute from the medium auxiliary memory</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
+    /// <param name="partition">Partition number.</param>
+    /// <param name="firstAttribute">First attribute identifier.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte partition,
+                              ushort firstAttribute, uint timeout, out double duration) =>
+        ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, partition, firstAttribute, false, timeout,
+                      out duration);
+
+    /// <summary>Reads an attribute from the medium auxiliary memory</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
+    /// <param name="firstAttribute">First attribute identifier.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action,
+                              ushort firstAttribute, uint timeout, out double duration) =>
+        ReadAttribute(out buffer, out senseBuffer, action, 0, 0, 0, 0, firstAttribute, false, timeout,
+                      out duration);
+
+    /// <summary>Reads an attribute from the medium auxiliary memory</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
+    /// <param name="volume">Volume number.</param>
+    /// <param name="partition">Partition number.</param>
+    /// <param name="firstAttribute">First attribute identifier.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte volume,
+                              byte partition, ushort firstAttribute, uint timeout, out double duration) =>
+        ReadAttribute(out buffer, out senseBuffer, action, 0, 0, volume, partition, firstAttribute, false, timeout,
+                      out duration);
+
+    /// <summary>Reads an attribute from the medium auxiliary memory</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="action">What to do, <see cref="ScsiAttributeAction" />.</param>
+    /// <param name="volume">Volume number.</param>
+    /// <param name="partition">Partition number.</param>
+    /// <param name="firstAttribute">First attribute identifier.</param>
+    /// <param name="cache">If set to <c>true</c> device can return cached data.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadAttribute(out byte[] buffer, out byte[] senseBuffer, ScsiAttributeAction action, byte volume,
+                              byte partition, ushort firstAttribute, bool cache, uint timeout,
+                              out double duration) =>
+        ReadAttribute(out buffer, out senseBuffer, action, 0, 0, volume, partition, firstAttribute, cache, timeout,
+                      out duration);
+
+    /// <summary>Sends the SPC MODE SELECT(6) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer with the data to be sent to the device</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="savePages">Set to save pages between resets.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="pageFormat">Set if page is formatted.</param>
+    public bool ModeSelect(byte[] buffer, out byte[] senseBuffer, bool pageFormat, bool savePages, uint timeout,
+                           out double duration)
+    {
+        senseBuffer = new byte[64];
+
+        // Prevent overflows
+        if(buffer.Length > 255)
+        {
+            if(PlatformId != PlatformID.Win32NT      &&
+               PlatformId != PlatformID.Win32S       &&
+               PlatformId != PlatformID.Win32Windows &&
+               PlatformId != PlatformID.WinCE        &&
+               PlatformId != PlatformID.WindowsPhone &&
+               PlatformId != PlatformID.Xbox)
+                LastError = 75;
+            else
+                LastError = 111;
+
+            Error    = true;
+            duration = 0;
+
+            return true;
+        }
+
+        byte[] cdb = new byte[6];
+
+        cdb[0] = (byte)ScsiCommands.ModeSelect;
+
+        if(pageFormat)
+            cdb[1] += 0x10;
+
+        if(savePages)
+            cdb[1] += 0x01;
+
+        cdb[4] = (byte)buffer.Length;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "MODE SELECT(6) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Sends the SPC MODE SELECT(10) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer with the data to be sent to the device</param>
+    /// <param name="savePages">Set to save pages between resets.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="pageFormat">Set if page is formatted.</param>
+    public bool ModeSelect10(byte[] buffer, out byte[] senseBuffer, bool pageFormat, bool savePages, uint timeout,
+                             out double duration)
+    {
+        senseBuffer = new byte[64];
+
+        // Prevent overflows
+        if(buffer.Length > 65535)
+        {
+            if(PlatformId != PlatformID.Win32NT      &&
+               PlatformId != PlatformID.Win32S       &&
+               PlatformId != PlatformID.Win32Windows &&
+               PlatformId != PlatformID.WinCE        &&
+               PlatformId != PlatformID.WindowsPhone &&
+               PlatformId != PlatformID.Xbox)
+                LastError = 75;
+            else
+                LastError = 111;
+
+            Error    = true;
+            duration = 0;
+
+            return true;
+        }
+
+        byte[] cdb = new byte[10];
+
+        cdb[0] = (byte)ScsiCommands.ModeSelect10;
+
+        if(pageFormat)
+            cdb[1] += 0x10;
+
+        if(savePages)
+            cdb[1] += 0x01;
+
+        cdb[7] = (byte)((buffer.Length & 0xFF00) << 8);
+        cdb[8] = (byte)(buffer.Length & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.Out, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "MODE SELECT(10) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Requests the device fixed sense</summary>
+    /// <param name="buffer">Sense buffer</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed.</returns>
+    public bool RequestSense(out byte[] buffer, uint timeout, out double duration) =>
+        RequestSense(false, out buffer, timeout, out duration);
+
+    /// <summary>Requests the device sense</summary>
+    /// <param name="descriptor">Request a descriptor sense</param>
+    /// <param name="buffer">Sense buffer</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <returns><c>true</c> if the command failed.</returns>
+    public bool RequestSense(bool descriptor, out byte[] buffer, uint timeout, out double duration)
+    {
+        byte[] cdb = new byte[6];
+        buffer = new byte[252];
+
+        cdb[0] = (byte)ScsiCommands.RequestSense;
+
+        if(descriptor)
+            cdb[1] = 0x01;
+
+        cdb[2] = 0;
+        cdb[3] = 0;
+        cdb[4] = (byte)buffer.Length;
+        cdb[5] = 0;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out _, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "REQUEST SENSE took {0} ms.", duration);
+
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/SSC.cs b/Aaru.Devices/Device/ScsiCommands/SSC.cs
index 6099ba489..8ef85d29f 100644
--- a/Aaru.Devices/Device/ScsiCommands/SSC.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SSC.cs
@@ -33,953 +33,952 @@
 using System;
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    /// <summary>Prepares the medium for reading</summary>
+    /// <returns><c>true</c>, if load was successful, <c>false</c> otherwise.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Load(out byte[] senseBuffer, uint timeout, out double duration) =>
+        LoadUnload(out senseBuffer, false, true, false, false, false, timeout, out duration);
+
+    /// <summary>Prepares the medium for ejection</summary>
+    /// <returns><c>true</c>, if unload was successful, <c>false</c> otherwise.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Unload(out byte[] senseBuffer, uint timeout, out double duration) =>
+        LoadUnload(out senseBuffer, false, false, false, false, false, timeout, out duration);
+
+    /// <summary>Prepares the medium for reading or ejection</summary>
+    /// <returns><c>true</c>, if load/unload was successful, <c>false</c> otherwise.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
+    /// <param name="load">If set to <c>true</c> load the medium for reading.</param>
+    /// <param name="retense">If set to <c>true</c> retense the tape.</param>
+    /// <param name="endOfTape">If set to <c>true</c> move the medium to the EOT mark.</param>
+    /// <param name="hold">
+    ///     If set to <c>true</c> and <paramref name="load" /> is also set to <c>true</c>, moves the medium to
+    ///     the drive but does not prepare it for reading.
+    /// </param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool LoadUnload(out byte[] senseBuffer, bool immediate, bool load, bool retense, bool endOfTape,
+                           bool hold, uint timeout, out double duration)
     {
-        /// <summary>Prepares the medium for reading</summary>
-        /// <returns><c>true</c>, if load was successful, <c>false</c> otherwise.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Load(out byte[] senseBuffer, uint timeout, out double duration) =>
-            LoadUnload(out senseBuffer, false, true, false, false, false, timeout, out duration);
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Prepares the medium for ejection</summary>
-        /// <returns><c>true</c>, if unload was successful, <c>false</c> otherwise.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Unload(out byte[] senseBuffer, uint timeout, out double duration) =>
-            LoadUnload(out senseBuffer, false, false, false, false, false, timeout, out duration);
+        cdb[0] = (byte)ScsiCommands.LoadUnload;
 
-        /// <summary>Prepares the medium for reading or ejection</summary>
-        /// <returns><c>true</c>, if load/unload was successful, <c>false</c> otherwise.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
-        /// <param name="load">If set to <c>true</c> load the medium for reading.</param>
-        /// <param name="retense">If set to <c>true</c> retense the tape.</param>
-        /// <param name="endOfTape">If set to <c>true</c> move the medium to the EOT mark.</param>
-        /// <param name="hold">
-        ///     If set to <c>true</c> and <paramref name="load" /> is also set to <c>true</c>, moves the medium to
-        ///     the drive but does not prepare it for reading.
-        /// </param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool LoadUnload(out byte[] senseBuffer, bool immediate, bool load, bool retense, bool endOfTape,
-                               bool hold, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = Array.Empty<byte>();
+        if(immediate)
+            cdb[1] = 0x01;
 
-            cdb[0] = (byte)ScsiCommands.LoadUnload;
+        if(load)
+            cdb[4] += 0x01;
 
-            if(immediate)
-                cdb[1] = 0x01;
+        if(retense)
+            cdb[4] += 0x02;
 
-            if(load)
-                cdb[4] += 0x01;
+        if(endOfTape)
+            cdb[4] += 0x04;
 
-            if(retense)
-                cdb[4] += 0x02;
+        if(hold)
+            cdb[4] += 0x08;
 
-            if(endOfTape)
-                cdb[4] += 0x04;
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
 
-            if(hold)
-                cdb[4] += 0x08;
+        Error = LastError != 0;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
+        AaruConsole.DebugWriteLine("SCSI Device", "LOAD UNLOAD (6) took {0} ms.", duration);
 
-            Error = LastError != 0;
+        return sense;
+    }
 
-            AaruConsole.DebugWriteLine("SCSI Device", "LOAD UNLOAD (6) took {0} ms.", duration);
+    /// <summary>Positions the medium to the specified block in the current partition</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="lba">Logical block address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Locate(out byte[] senseBuffer, uint lba, uint timeout, out double duration) =>
+        Locate(out senseBuffer, false, false, false, 0, lba, timeout, out duration);
 
-            return sense;
-        }
+    /// <summary>Positions the medium to the specified block in the specified partition</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="partition">Partition to position to.</param>
+    /// <param name="lba">Logical block address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Locate(out byte[] senseBuffer, byte partition, uint lba, uint timeout, out double duration) =>
+        Locate(out senseBuffer, false, false, false, partition, lba, timeout, out duration);
 
-        /// <summary>Positions the medium to the specified block in the current partition</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="lba">Logical block address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Locate(out byte[] senseBuffer, uint lba, uint timeout, out double duration) =>
-            Locate(out senseBuffer, false, false, false, 0, lba, timeout, out duration);
+    /// <summary>Positions the medium to the specified block in the current partition</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
+    /// <param name="lba">Logical block address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Locate(out byte[] senseBuffer, bool immediate, uint lba, uint timeout, out double duration) =>
+        Locate(out senseBuffer, immediate, false, false, 0, lba, timeout, out duration);
 
-        /// <summary>Positions the medium to the specified block in the specified partition</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="partition">Partition to position to.</param>
-        /// <param name="lba">Logical block address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Locate(out byte[] senseBuffer, byte partition, uint lba, uint timeout, out double duration) =>
-            Locate(out senseBuffer, false, false, false, partition, lba, timeout, out duration);
+    /// <summary>Positions the medium to the specified block in the specified partition</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
+    /// <param name="partition">Partition to position to.</param>
+    /// <param name="lba">Logical block address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Locate(out byte[] senseBuffer, bool immediate, byte partition, uint lba, uint timeout,
+                       out double duration) => Locate(out senseBuffer, immediate, false, false, partition, lba,
+                                                      timeout, out duration);
 
-        /// <summary>Positions the medium to the specified block in the current partition</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
-        /// <param name="lba">Logical block address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Locate(out byte[] senseBuffer, bool immediate, uint lba, uint timeout, out double duration) =>
-            Locate(out senseBuffer, immediate, false, false, 0, lba, timeout, out duration);
+    /// <summary>Positions the medium to the specified object identifier</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
+    /// <param name="blockType">If set to <c>true</c> object identifier is vendor specified.</param>
+    /// <param name="changePartition">If set to <c>true</c> change partition.</param>
+    /// <param name="partition">Partition to position to.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Locate(out byte[] senseBuffer, bool immediate, bool blockType, bool changePartition, byte partition,
+                       uint objectId, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[10];
+        byte[] buffer = Array.Empty<byte>();
 
-        /// <summary>Positions the medium to the specified block in the specified partition</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
-        /// <param name="partition">Partition to position to.</param>
-        /// <param name="lba">Logical block address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Locate(out byte[] senseBuffer, bool immediate, byte partition, uint lba, uint timeout,
-                           out double duration) => Locate(out senseBuffer, immediate, false, false, partition, lba,
+        cdb[0] = (byte)ScsiCommands.Locate;
+
+        if(immediate)
+            cdb[1] += 0x01;
+
+        if(changePartition)
+            cdb[1] += 0x02;
+
+        if(blockType)
+            cdb[1] += 0x04;
+
+        cdb[3] = (byte)((objectId & 0xFF000000) >> 24);
+        cdb[4] = (byte)((objectId & 0xFF0000)   >> 16);
+        cdb[5] = (byte)((objectId & 0xFF00)     >> 8);
+        cdb[6] = (byte)(objectId & 0xFF);
+        cdb[8] = partition;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "LOCATE (10) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Positions the medium to the specified block in the current partition</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="lba">Logical block address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Locate16(out byte[] senseBuffer, ulong lba, uint timeout, out double duration) =>
+        Locate16(out senseBuffer, false, false, SscLogicalIdTypes.ObjectId, false, 0, lba, timeout, out duration);
+
+    /// <summary>Positions the medium to the specified block in the specified partition</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="partition">Partition to position to.</param>
+    /// <param name="lba">Logical block address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Locate16(out byte[] senseBuffer, byte partition, ulong lba, uint timeout, out double duration) =>
+        Locate16(out senseBuffer, false, false, SscLogicalIdTypes.ObjectId, false, partition, lba, timeout,
+                 out duration);
+
+    /// <summary>Positions the medium to the specified block in the current partition</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
+    /// <param name="lba">Logical block address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Locate16(out byte[] senseBuffer, bool immediate, ulong lba, uint timeout, out double duration) =>
+        Locate16(out senseBuffer, immediate, false, SscLogicalIdTypes.ObjectId, false, 0, lba, timeout,
+                 out duration);
+
+    /// <summary>Positions the medium to the specified block in the specified partition</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
+    /// <param name="partition">Partition to position to.</param>
+    /// <param name="lba">Logical block address.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Locate16(out byte[] senseBuffer, bool immediate, byte partition, ulong lba, uint timeout,
+                         out double duration) => Locate16(out senseBuffer, immediate, false,
+                                                          SscLogicalIdTypes.ObjectId, false, partition, lba,
                                                           timeout, out duration);
 
-        /// <summary>Positions the medium to the specified object identifier</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
-        /// <param name="blockType">If set to <c>true</c> object identifier is vendor specified.</param>
-        /// <param name="changePartition">If set to <c>true</c> change partition.</param>
-        /// <param name="partition">Partition to position to.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Locate(out byte[] senseBuffer, bool immediate, bool blockType, bool changePartition, byte partition,
-                           uint objectId, uint timeout, out double duration)
+    /// <summary>Positions the medium to the specified object identifier</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
+    /// <param name="changePartition">If set to <c>true</c> change partition.</param>
+    /// <param name="destType">Destination type.</param>
+    /// <param name="bam">If set to <c>true</c> objectId is explicit.</param>
+    /// <param name="partition">Partition to position to.</param>
+    /// <param name="identifier">Destination identifier.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Locate16(out byte[] senseBuffer, bool immediate, bool changePartition, SscLogicalIdTypes destType,
+                         bool bam, byte partition, ulong identifier, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb     = new byte[16];
+        byte[] buffer  = Array.Empty<byte>();
+        byte[] idBytes = BitConverter.GetBytes(identifier);
+
+        cdb[0] = (byte)ScsiCommands.Locate16;
+        cdb[1] = (byte)((byte)destType << 3);
+
+        if(immediate)
+            cdb[1] += 0x01;
+
+        if(changePartition)
+            cdb[1] += 0x02;
+
+        if(bam)
+            cdb[2] = 0x01;
+
+        cdb[3] = partition;
+
+        cdb[4]  = idBytes[7];
+        cdb[5]  = idBytes[6];
+        cdb[6]  = idBytes[5];
+        cdb[7]  = idBytes[4];
+        cdb[8]  = idBytes[3];
+        cdb[9]  = idBytes[2];
+        cdb[10] = idBytes[1];
+        cdb[11] = idBytes[0];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "LOCATE (16) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /*/// <summary>
+    /// Reads the specified number of blocks from the medium
+    /// </summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Read6(out byte[] buffer, out byte[] senseBuffer, uint blocks, uint blockSize, uint timeout, out double duration)
+    {
+        return Read6(out buffer, out senseBuffer, false, true, blocks, blockSize, timeout, out duration);
+    }*/
+
+    /// <summary>Reads the specified number of bytes or of blocks from the medium</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
+    /// <param name="transferLen">How many bytes to read.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Read6(out byte[] buffer, out byte[] senseBuffer, bool sili, uint transferLen, uint blockSize,
+                      uint timeout, out double duration) => Read6(out buffer, out senseBuffer, sili, false,
+                                                                  transferLen, blockSize, timeout, out duration);
+
+    /// <summary>Reads the specified number of bytes or of blocks from the medium</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sili">
+    ///     If set to <c>true</c> suppress the incorrect-length indication. Cannot be set while
+    ///     <paramref name="fixedLen" /> is set also.
+    /// </param>
+    /// <param name="fixedLen">
+    ///     If set to <c>true</c> <paramref name="transferLen" /> indicates how many blocks to read of a
+    ///     fixed size.
+    /// </param>
+    /// <param name="transferLen">Transfer length in blocks or bytes depending of <paramref name="fixedLen" /> status.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Read6(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen, uint transferLen,
+                      uint blockSize, uint timeout, out double duration)
+    {
+        buffer = fixedLen ? new byte[blockSize * transferLen] : new byte[transferLen];
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
+
+        cdb[0] = (byte)ScsiCommands.Read6;
+
+        if(fixedLen)
+            cdb[1] += 0x01;
+
+        if(sili)
+            cdb[1] += 0x02;
+
+        cdb[2] = (byte)((transferLen & 0xFF0000) >> 16);
+        cdb[3] = (byte)((transferLen & 0xFF00)   >> 8);
+        cdb[4] = (byte)(transferLen & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ (6) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads a number of fixed-length blocks starting at specified object</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Object size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, ulong objectId, uint blocks,
+                       uint blockSize, uint timeout, out double duration) =>
+        Read16(out buffer, out senseBuffer, sili, false, 0, objectId, blocks, blockSize, timeout, out duration);
+
+    /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
+    /// <param name="partition">Partition to read object from.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Object size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, byte partition, ulong objectId,
+                       uint blocks, uint blockSize, uint timeout, out double duration) =>
+        Read16(out buffer, out senseBuffer, sili, false, partition, objectId, blocks, blockSize, timeout,
+               out duration);
+
+    /// <summary>Reads a number of fixed-length blocks starting at specified object</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Object size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Read16(out byte[] buffer, out byte[] senseBuffer, ulong objectId, uint blocks, uint blockSize,
+                       uint timeout, out double duration) =>
+        Read16(out buffer, out senseBuffer, false, true, 0, objectId, blocks, blockSize, timeout, out duration);
+
+    /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="partition">Partition to read object from.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Object size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Read16(out byte[] buffer, out byte[] senseBuffer, byte partition, ulong objectId, uint blocks,
+                       uint blockSize, uint timeout, out double duration) =>
+        Read16(out buffer, out senseBuffer, false, true, partition, objectId, blocks, blockSize, timeout,
+               out duration);
+
+    /// <summary>Reads a number of bytes or objects starting at specified object from the specified partition</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sili">
+    ///     If set to <c>true</c> suppress the incorrect-length indication. Cannot be set while
+    ///     <paramref name="fixedLen" /> is set also.
+    /// </param>
+    /// <param name="fixedLen">
+    ///     If set to <c>true</c> <paramref name="transferLen" /> indicates how many blocks to read of a
+    ///     fixed size.
+    /// </param>
+    /// <param name="partition">Partition to read object from.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="transferLen">Transfer length in blocks or bytes depending of <paramref name="fixedLen" /> status.</param>
+    /// <param name="objectSize">Object size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen, byte partition,
+                       ulong objectId, uint transferLen, uint objectSize, uint timeout, out double duration)
+    {
+        buffer = fixedLen ? new byte[objectSize * transferLen] : new byte[transferLen];
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
+        byte[] idBytes = BitConverter.GetBytes(objectId);
+
+        cdb[0] = (byte)ScsiCommands.Read16;
+
+        if(fixedLen)
+            cdb[1] += 0x01;
+
+        if(sili)
+            cdb[1] += 0x02;
+
+        cdb[3]  = partition;
+        cdb[4]  = idBytes[7];
+        cdb[5]  = idBytes[6];
+        cdb[6]  = idBytes[5];
+        cdb[7]  = idBytes[4];
+        cdb[8]  = idBytes[3];
+        cdb[9]  = idBytes[2];
+        cdb[10] = idBytes[1];
+        cdb[11] = idBytes[0];
+        cdb[12] = (byte)((transferLen & 0xFF0000) >> 16);
+        cdb[13] = (byte)((transferLen & 0xFF00)   >> 8);
+        cdb[14] = (byte)(transferLen & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ (16) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Requests the drive the maximum and minimum block size</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadBlockLimits(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
+    {
+        buffer = new byte[6];
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
+
+        cdb[0] = (byte)ScsiCommands.ReadBlockLimits;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ BLOCK LIMITS took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reports current reading/writing elements position on the medium</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadPosition(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ReadPosition(out buffer, out senseBuffer, SscPositionForms.Short, timeout, out duration);
+
+    /// <summary>Reports current reading/writing elements position on the medium using 32 bytes response</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadPositionLong(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ReadPosition(out buffer, out senseBuffer, SscPositionForms.Long, timeout, out duration);
+
+    /// <summary>Reports current reading/writing elements position on the medium</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="vendorType">Requests the position to be given in vendor-specified meaning.</param>
+    /// <param name="longForm">Requests the response to be 32 bytes format.</param>
+    /// <param name="totalPosition">Requests current logical position.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadPosition(out byte[] buffer, out byte[] senseBuffer, bool vendorType, bool longForm,
+                             bool totalPosition, uint timeout, out double duration)
+    {
+        byte responseForm = 0;
+
+        if(vendorType)
+            responseForm += 0x01;
+
+        if(longForm)
+            responseForm += 0x02;
+
+        if(totalPosition)
+            responseForm += 0x04;
+
+        return ReadPosition(out buffer, out senseBuffer, (SscPositionForms)responseForm, timeout, out duration);
+    }
+
+    /// <summary>Reports current reading/writing elements position on the medium</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="responseForm">Response form.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadPosition(out byte[] buffer, out byte[] senseBuffer, SscPositionForms responseForm, uint timeout,
+                             out double duration)
+    {
+        switch(responseForm)
         {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[10];
-            byte[] buffer = Array.Empty<byte>();
+            case SscPositionForms.Long:
+            case SscPositionForms.OldLong:
+            case SscPositionForms.OldLongTclpVendor:
+            case SscPositionForms.OldLongVendor:
+            case SscPositionForms.Extended:
+                buffer = new byte[32];
 
-            cdb[0] = (byte)ScsiCommands.Locate;
+                break;
+            case SscPositionForms.OldTclp:
+            case SscPositionForms.OldTclpVendor:
+            case SscPositionForms.Short:
+            case SscPositionForms.VendorShort:
+                buffer = new byte[20];
 
-            if(immediate)
-                cdb[1] += 0x01;
+                break;
+            default:
+                buffer = new byte[32]; // Invalid
 
-            if(changePartition)
-                cdb[1] += 0x02;
-
-            if(blockType)
-                cdb[1] += 0x04;
-
-            cdb[3] = (byte)((objectId & 0xFF000000) >> 24);
-            cdb[4] = (byte)((objectId & 0xFF0000)   >> 16);
-            cdb[5] = (byte)((objectId & 0xFF00)     >> 8);
-            cdb[6] = (byte)(objectId & 0xFF);
-            cdb[8] = partition;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "LOCATE (10) took {0} ms.", duration);
-
-            return sense;
+                break;
         }
 
-        /// <summary>Positions the medium to the specified block in the current partition</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="lba">Logical block address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Locate16(out byte[] senseBuffer, ulong lba, uint timeout, out double duration) =>
-            Locate16(out senseBuffer, false, false, SscLogicalIdTypes.ObjectId, false, 0, lba, timeout, out duration);
+        byte[] cdb = new byte[10];
+        senseBuffer = new byte[64];
 
-        /// <summary>Positions the medium to the specified block in the specified partition</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="partition">Partition to position to.</param>
-        /// <param name="lba">Logical block address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Locate16(out byte[] senseBuffer, byte partition, ulong lba, uint timeout, out double duration) =>
-            Locate16(out senseBuffer, false, false, SscLogicalIdTypes.ObjectId, false, partition, lba, timeout,
-                     out duration);
+        cdb[0] = (byte)ScsiCommands.ReadPosition;
+        cdb[1] = (byte)((byte)responseForm & 0x1F);
 
-        /// <summary>Positions the medium to the specified block in the current partition</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
-        /// <param name="lba">Logical block address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Locate16(out byte[] senseBuffer, bool immediate, ulong lba, uint timeout, out double duration) =>
-            Locate16(out senseBuffer, immediate, false, SscLogicalIdTypes.ObjectId, false, 0, lba, timeout,
-                     out duration);
-
-        /// <summary>Positions the medium to the specified block in the specified partition</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
-        /// <param name="partition">Partition to position to.</param>
-        /// <param name="lba">Logical block address.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Locate16(out byte[] senseBuffer, bool immediate, byte partition, ulong lba, uint timeout,
-                             out double duration) => Locate16(out senseBuffer, immediate, false,
-                                                              SscLogicalIdTypes.ObjectId, false, partition, lba,
-                                                              timeout, out duration);
-
-        /// <summary>Positions the medium to the specified object identifier</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="immediate">If set to <c>true</c>, return from the command immediately.</param>
-        /// <param name="changePartition">If set to <c>true</c> change partition.</param>
-        /// <param name="destType">Destination type.</param>
-        /// <param name="bam">If set to <c>true</c> objectId is explicit.</param>
-        /// <param name="partition">Partition to position to.</param>
-        /// <param name="identifier">Destination identifier.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Locate16(out byte[] senseBuffer, bool immediate, bool changePartition, SscLogicalIdTypes destType,
-                             bool bam, byte partition, ulong identifier, uint timeout, out double duration)
+        if(responseForm == SscPositionForms.Extended)
         {
-            senseBuffer = new byte[64];
-            byte[] cdb     = new byte[16];
-            byte[] buffer  = Array.Empty<byte>();
-            byte[] idBytes = BitConverter.GetBytes(identifier);
-
-            cdb[0] = (byte)ScsiCommands.Locate16;
-            cdb[1] = (byte)((byte)destType << 3);
-
-            if(immediate)
-                cdb[1] += 0x01;
-
-            if(changePartition)
-                cdb[1] += 0x02;
-
-            if(bam)
-                cdb[2] = 0x01;
-
-            cdb[3] = partition;
-
-            cdb[4]  = idBytes[7];
-            cdb[5]  = idBytes[6];
-            cdb[6]  = idBytes[5];
-            cdb[7]  = idBytes[4];
-            cdb[8]  = idBytes[3];
-            cdb[9]  = idBytes[2];
-            cdb[10] = idBytes[1];
-            cdb[11] = idBytes[0];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "LOCATE (16) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /*/// <summary>
-        /// Reads the specified number of blocks from the medium
-        /// </summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Read6(out byte[] buffer, out byte[] senseBuffer, uint blocks, uint blockSize, uint timeout, out double duration)
-        {
-            return Read6(out buffer, out senseBuffer, false, true, blocks, blockSize, timeout, out duration);
-        }*/
-
-        /// <summary>Reads the specified number of bytes or of blocks from the medium</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
-        /// <param name="transferLen">How many bytes to read.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Read6(out byte[] buffer, out byte[] senseBuffer, bool sili, uint transferLen, uint blockSize,
-                          uint timeout, out double duration) => Read6(out buffer, out senseBuffer, sili, false,
-                                                                      transferLen, blockSize, timeout, out duration);
-
-        /// <summary>Reads the specified number of bytes or of blocks from the medium</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sili">
-        ///     If set to <c>true</c> suppress the incorrect-length indication. Cannot be set while
-        ///     <paramref name="fixedLen" /> is set also.
-        /// </param>
-        /// <param name="fixedLen">
-        ///     If set to <c>true</c> <paramref name="transferLen" /> indicates how many blocks to read of a
-        ///     fixed size.
-        /// </param>
-        /// <param name="transferLen">Transfer length in blocks or bytes depending of <paramref name="fixedLen" /> status.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Read6(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen, uint transferLen,
-                          uint blockSize, uint timeout, out double duration)
-        {
-            buffer = fixedLen ? new byte[blockSize * transferLen] : new byte[transferLen];
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
-
-            cdb[0] = (byte)ScsiCommands.Read6;
-
-            if(fixedLen)
-                cdb[1] += 0x01;
-
-            if(sili)
-                cdb[1] += 0x02;
-
-            cdb[2] = (byte)((transferLen & 0xFF0000) >> 16);
-            cdb[3] = (byte)((transferLen & 0xFF00)   >> 8);
-            cdb[4] = (byte)(transferLen & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ (6) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads a number of fixed-length blocks starting at specified object</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Object size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, ulong objectId, uint blocks,
-                           uint blockSize, uint timeout, out double duration) =>
-            Read16(out buffer, out senseBuffer, sili, false, 0, objectId, blocks, blockSize, timeout, out duration);
-
-        /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
-        /// <param name="partition">Partition to read object from.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Object size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, byte partition, ulong objectId,
-                           uint blocks, uint blockSize, uint timeout, out double duration) =>
-            Read16(out buffer, out senseBuffer, sili, false, partition, objectId, blocks, blockSize, timeout,
-                   out duration);
-
-        /// <summary>Reads a number of fixed-length blocks starting at specified object</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Object size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Read16(out byte[] buffer, out byte[] senseBuffer, ulong objectId, uint blocks, uint blockSize,
-                           uint timeout, out double duration) =>
-            Read16(out buffer, out senseBuffer, false, true, 0, objectId, blocks, blockSize, timeout, out duration);
-
-        /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="partition">Partition to read object from.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Object size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Read16(out byte[] buffer, out byte[] senseBuffer, byte partition, ulong objectId, uint blocks,
-                           uint blockSize, uint timeout, out double duration) =>
-            Read16(out buffer, out senseBuffer, false, true, partition, objectId, blocks, blockSize, timeout,
-                   out duration);
-
-        /// <summary>Reads a number of bytes or objects starting at specified object from the specified partition</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sili">
-        ///     If set to <c>true</c> suppress the incorrect-length indication. Cannot be set while
-        ///     <paramref name="fixedLen" /> is set also.
-        /// </param>
-        /// <param name="fixedLen">
-        ///     If set to <c>true</c> <paramref name="transferLen" /> indicates how many blocks to read of a
-        ///     fixed size.
-        /// </param>
-        /// <param name="partition">Partition to read object from.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="transferLen">Transfer length in blocks or bytes depending of <paramref name="fixedLen" /> status.</param>
-        /// <param name="objectSize">Object size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Read16(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen, byte partition,
-                           ulong objectId, uint transferLen, uint objectSize, uint timeout, out double duration)
-        {
-            buffer = fixedLen ? new byte[objectSize * transferLen] : new byte[transferLen];
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
-            byte[] idBytes = BitConverter.GetBytes(objectId);
-
-            cdb[0] = (byte)ScsiCommands.Read16;
-
-            if(fixedLen)
-                cdb[1] += 0x01;
-
-            if(sili)
-                cdb[1] += 0x02;
-
-            cdb[3]  = partition;
-            cdb[4]  = idBytes[7];
-            cdb[5]  = idBytes[6];
-            cdb[6]  = idBytes[5];
-            cdb[7]  = idBytes[4];
-            cdb[8]  = idBytes[3];
-            cdb[9]  = idBytes[2];
-            cdb[10] = idBytes[1];
-            cdb[11] = idBytes[0];
-            cdb[12] = (byte)((transferLen & 0xFF0000) >> 16);
-            cdb[13] = (byte)((transferLen & 0xFF00)   >> 8);
-            cdb[14] = (byte)(transferLen & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ (16) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Requests the drive the maximum and minimum block size</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadBlockLimits(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration)
-        {
-            buffer = new byte[6];
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
-
-            cdb[0] = (byte)ScsiCommands.ReadBlockLimits;
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ BLOCK LIMITS took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reports current reading/writing elements position on the medium</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadPosition(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ReadPosition(out buffer, out senseBuffer, SscPositionForms.Short, timeout, out duration);
-
-        /// <summary>Reports current reading/writing elements position on the medium using 32 bytes response</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadPositionLong(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ReadPosition(out buffer, out senseBuffer, SscPositionForms.Long, timeout, out duration);
-
-        /// <summary>Reports current reading/writing elements position on the medium</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="vendorType">Requests the position to be given in vendor-specified meaning.</param>
-        /// <param name="longForm">Requests the response to be 32 bytes format.</param>
-        /// <param name="totalPosition">Requests current logical position.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadPosition(out byte[] buffer, out byte[] senseBuffer, bool vendorType, bool longForm,
-                                 bool totalPosition, uint timeout, out double duration)
-        {
-            byte responseForm = 0;
-
-            if(vendorType)
-                responseForm += 0x01;
-
-            if(longForm)
-                responseForm += 0x02;
-
-            if(totalPosition)
-                responseForm += 0x04;
-
-            return ReadPosition(out buffer, out senseBuffer, (SscPositionForms)responseForm, timeout, out duration);
-        }
-
-        /// <summary>Reports current reading/writing elements position on the medium</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="responseForm">Response form.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadPosition(out byte[] buffer, out byte[] senseBuffer, SscPositionForms responseForm, uint timeout,
-                                 out double duration)
-        {
-            switch(responseForm)
-            {
-                case SscPositionForms.Long:
-                case SscPositionForms.OldLong:
-                case SscPositionForms.OldLongTclpVendor:
-                case SscPositionForms.OldLongVendor:
-                case SscPositionForms.Extended:
-                    buffer = new byte[32];
-
-                    break;
-                case SscPositionForms.OldTclp:
-                case SscPositionForms.OldTclpVendor:
-                case SscPositionForms.Short:
-                case SscPositionForms.VendorShort:
-                    buffer = new byte[20];
-
-                    break;
-                default:
-                    buffer = new byte[32]; // Invalid
-
-                    break;
-            }
-
-            byte[] cdb = new byte[10];
-            senseBuffer = new byte[64];
-
-            cdb[0] = (byte)ScsiCommands.ReadPosition;
-            cdb[1] = (byte)((byte)responseForm & 0x1F);
-
-            if(responseForm == SscPositionForms.Extended)
-            {
-                cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8);
-                cdb[8] = (byte)(buffer.Length & 0xFF);
-            }
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ POSITION took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads the specified number of blocks from the medium, backwards</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadReverse6(out byte[] buffer, out byte[] senseBuffer, uint blocks, uint blockSize, uint timeout,
-                                 out double duration) =>
-            ReadReverse6(out buffer, out senseBuffer, false, false, true, blocks, blockSize, timeout, out duration);
-
-        /// <summary>Reads the specified number of bytes or of blocks from the medium, backwards</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
-        /// <param name="transferLen">How many bytes to read.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadReverse6(out byte[] buffer, out byte[] senseBuffer, bool sili, uint transferLen, uint blockSize,
-                                 uint timeout, out double duration) =>
-            ReadReverse6(out buffer, out senseBuffer, false, sili, false, transferLen, blockSize, timeout,
-                         out duration);
-
-        /// <summary>Reads the specified number of bytes or of blocks from the medium, backwards</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="byteOrder">If set to <c>true</c> drive should un-reverse the blocks and bytes</param>
-        /// <param name="sili">
-        ///     If set to <c>true</c> suppress the incorrect-length indication. Cannot be set while
-        ///     <paramref name="fixedLen" /> is set also.
-        /// </param>
-        /// <param name="fixedLen">
-        ///     If set to <c>true</c> <paramref name="transferLen" /> indicates how many blocks to read of a
-        ///     fixed size.
-        /// </param>
-        /// <param name="transferLen">Transfer length in blocks or bytes depending of <paramref name="fixedLen" /> status.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadReverse6(out byte[] buffer, out byte[] senseBuffer, bool byteOrder, bool sili, bool fixedLen,
-                                 uint transferLen, uint blockSize, uint timeout, out double duration)
-        {
-            buffer = fixedLen ? new byte[blockSize * transferLen] : new byte[transferLen];
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
-
-            cdb[0] = (byte)ScsiCommands.ReadReverse;
-
-            if(fixedLen)
-                cdb[1] += 0x01;
-
-            if(sili)
-                cdb[1] += 0x02;
-
-            if(byteOrder)
-                cdb[1] += 0x04;
-
-            cdb[2] = (byte)((transferLen & 0xFF0000) >> 16);
-            cdb[3] = (byte)((transferLen & 0xFF00)   >> 8);
-            cdb[4] = (byte)(transferLen & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ REVERSE (6) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads a number of fixed-length blocks starting at specified object, backwards</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Object size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool sili, ulong objectId, uint blocks,
-                                  uint blockSize, uint timeout, out double duration) =>
-            ReadReverse16(out buffer, out senseBuffer, false, sili, false, 0, objectId, blocks, blockSize, timeout,
-                          out duration);
-
-        /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition, backwards</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
-        /// <param name="partition">Partition to read object from.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Object size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool sili, byte partition, ulong objectId,
-                                  uint blocks, uint blockSize, uint timeout, out double duration) =>
-            ReadReverse16(out buffer, out senseBuffer, false, sili, false, partition, objectId, blocks, blockSize,
-                          timeout, out duration);
-
-        /// <summary>Reads a number of fixed-length blocks starting at specified object, backwards</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Object size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, ulong objectId, uint blocks,
-                                  uint blockSize, uint timeout, out double duration) =>
-            ReadReverse16(out buffer, out senseBuffer, false, false, true, 0, objectId, blocks, blockSize, timeout,
-                          out duration);
-
-        /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition, backwards</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="partition">Partition to read object from.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Object size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, byte partition, ulong objectId,
-                                  uint blocks, uint blockSize, uint timeout, out double duration) =>
-            ReadReverse16(out buffer, out senseBuffer, false, false, true, partition, objectId, blocks, blockSize,
-                          timeout, out duration);
-
-        /// <summary>Reads a number of bytes or objects starting at specified object from the specified partition, backwards</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="byteOrder">If set to <c>true</c> drive should un-reverse the blocks and bytes</param>
-        /// <param name="sili">
-        ///     If set to <c>true</c> suppress the incorrect-length indication. Cannot be set while
-        ///     <paramref name="fixedLen" /> is set also.
-        /// </param>
-        /// <param name="fixedLen">
-        ///     If set to <c>true</c> <paramref name="transferLen" /> indicates how many blocks to read of a
-        ///     fixed size.
-        /// </param>
-        /// <param name="partition">Partition to read object from.</param>
-        /// <param name="objectId">Object identifier.</param>
-        /// <param name="transferLen">Transfer length in blocks or bytes depending of <paramref name="fixedLen" /> status.</param>
-        /// <param name="objectSize">Object size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool byteOrder, bool sili, bool fixedLen,
-                                  byte partition, ulong objectId, uint transferLen, uint objectSize, uint timeout,
-                                  out double duration)
-        {
-            buffer = fixedLen ? new byte[objectSize * transferLen] : new byte[transferLen];
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
-            byte[] idBytes = BitConverter.GetBytes(objectId);
-
-            cdb[0] = (byte)ScsiCommands.Read16;
-
-            if(fixedLen)
-                cdb[1] += 0x01;
-
-            if(sili)
-                cdb[1] += 0x02;
-
-            if(byteOrder)
-                cdb[1] += 0x04;
-
-            cdb[3]  = partition;
-            cdb[4]  = idBytes[7];
-            cdb[5]  = idBytes[6];
-            cdb[6]  = idBytes[5];
-            cdb[7]  = idBytes[4];
-            cdb[8]  = idBytes[3];
-            cdb[9]  = idBytes[2];
-            cdb[10] = idBytes[1];
-            cdb[11] = idBytes[0];
-            cdb[12] = (byte)((transferLen & 0xFF0000) >> 16);
-            cdb[13] = (byte)((transferLen & 0xFF00)   >> 8);
-            cdb[14] = (byte)(transferLen & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "READ REVERSE (16) took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Reads the specified number of blocks from the device's buffer</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="blocks">How many blocks to read.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, uint blocks, uint blockSize,
-                                        uint timeout, out double duration) =>
-            RecoverBufferedData(out buffer, out senseBuffer, false, true, blocks, blockSize, timeout, out duration);
-
-        /// <summary>Reads the specified number of bytes or of blocks from the device's buffer</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
-        /// <param name="transferLen">How many bytes to read.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, bool sili, uint transferLen,
-                                        uint blockSize, uint timeout, out double duration) =>
-            RecoverBufferedData(out buffer, out senseBuffer, sili, false, transferLen, blockSize, timeout,
-                                out duration);
-
-        /// <summary>Reads the specified number of bytes or of blocks from the device's buffer</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="sili">
-        ///     If set to <c>true</c> suppress the incorrect-length indication. Cannot be set while
-        ///     <paramref name="fixedLen" /> is set also.
-        /// </param>
-        /// <param name="fixedLen">
-        ///     If set to <c>true</c> <paramref name="transferLen" /> indicates how many blocks to read of a
-        ///     fixed size.
-        /// </param>
-        /// <param name="transferLen">Transfer length in blocks or bytes depending of <paramref name="fixedLen" /> status.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen,
-                                        uint transferLen, uint blockSize, uint timeout, out double duration)
-        {
-            buffer = fixedLen ? new byte[blockSize * transferLen] : new byte[transferLen];
-            byte[] cdb = new byte[6];
-            senseBuffer = new byte[64];
-
-            cdb[0] = (byte)ScsiCommands.RecoverBufferedData;
-
-            if(fixedLen)
-                cdb[1] += 0x01;
-
-            if(sili)
-                cdb[1] += 0x02;
-
-            cdb[2] = (byte)((transferLen & 0xFF0000) >> 16);
-            cdb[3] = (byte)((transferLen & 0xFF00)   >> 8);
-            cdb[4] = (byte)(transferLen & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "RECOVER BUFFERED DATA took {0} ms.", duration);
-
-            return sense;
-        }
-
-        /// <summary>Requests the device to return descriptors for supported densities or medium types</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool
-            ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
-            ReportDensitySupport(out buffer, out senseBuffer, false, false, timeout, out duration);
-
-        /// <summary>Requests the device to return descriptors for supported densities or medium types</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="currentMedia">If set to <c>true</c> descriptors should apply to currently inserted media.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, bool currentMedia, uint timeout,
-                                         out double duration) =>
-            ReportDensitySupport(out buffer, out senseBuffer, false, currentMedia, timeout, out duration);
-
-        /// <summary>Requests the device to return descriptors for supported densities or medium types</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="mediumType">If set to <c>true</c> descriptors should be about medium types.</param>
-        /// <param name="currentMedia">If set to <c>true</c> descriptors should apply to currently inserted media.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, bool mediumType, bool currentMedia,
-                                         uint timeout, out double duration)
-        {
-            buffer = new byte[256];
-            byte[] cdb = new byte[10];
-            senseBuffer = new byte[64];
-
-            cdb[0] = (byte)ScsiCommands.ReportDensitySupport;
-
-            if(currentMedia)
-                cdb[1] += 0x01;
-
-            if(mediumType)
-                cdb[1] += 0x02;
-
             cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8);
             cdb[8] = (byte)(buffer.Length & 0xFF);
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out bool sense);
-
-            Error = LastError != 0;
-
-            if(sense)
-                return true;
-
-            ushort availableLength = (ushort)((buffer[0] << 8) + buffer[1] + 2);
-            buffer      = new byte[availableLength];
-            cdb[7]      = (byte)((buffer.Length & 0xFF00) >> 8);
-            cdb[8]      = (byte)(buffer.Length & 0xFF);
-            senseBuffer = new byte[64];
-
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                        out sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "REPORT DENSITY SUPPORT took {0} ms.", duration);
-
-            return sense;
         }
 
-        /// <summary>Positions the reading/writing element to the beginning of current partition</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Rewind(out byte[] senseBuffer, uint timeout, out double duration) =>
-            Rewind(out senseBuffer, false, timeout, out duration);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-        /// <summary>Positions the reading/writing element to the beginning of current partition</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="immediate">If set to <c>true</c> return from the command immediately.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool Rewind(out byte[] senseBuffer, bool immediate, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = Array.Empty<byte>();
+        Error = LastError != 0;
 
-            cdb[0] = (byte)ScsiCommands.Rewind;
+        AaruConsole.DebugWriteLine("SCSI Device", "READ POSITION took {0} ms.", duration);
 
-            if(immediate)
-                cdb[1] += 0x01;
+        return sense;
+    }
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
+    /// <summary>Reads the specified number of blocks from the medium, backwards</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadReverse6(out byte[] buffer, out byte[] senseBuffer, uint blocks, uint blockSize, uint timeout,
+                             out double duration) =>
+        ReadReverse6(out buffer, out senseBuffer, false, false, true, blocks, blockSize, timeout, out duration);
 
-            Error = LastError != 0;
+    /// <summary>Reads the specified number of bytes or of blocks from the medium, backwards</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
+    /// <param name="transferLen">How many bytes to read.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadReverse6(out byte[] buffer, out byte[] senseBuffer, bool sili, uint transferLen, uint blockSize,
+                             uint timeout, out double duration) =>
+        ReadReverse6(out buffer, out senseBuffer, false, sili, false, transferLen, blockSize, timeout,
+                     out duration);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "REWIND took {0} ms.", duration);
+    /// <summary>Reads the specified number of bytes or of blocks from the medium, backwards</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="byteOrder">If set to <c>true</c> drive should un-reverse the blocks and bytes</param>
+    /// <param name="sili">
+    ///     If set to <c>true</c> suppress the incorrect-length indication. Cannot be set while
+    ///     <paramref name="fixedLen" /> is set also.
+    /// </param>
+    /// <param name="fixedLen">
+    ///     If set to <c>true</c> <paramref name="transferLen" /> indicates how many blocks to read of a
+    ///     fixed size.
+    /// </param>
+    /// <param name="transferLen">Transfer length in blocks or bytes depending of <paramref name="fixedLen" /> status.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadReverse6(out byte[] buffer, out byte[] senseBuffer, bool byteOrder, bool sili, bool fixedLen,
+                             uint transferLen, uint blockSize, uint timeout, out double duration)
+    {
+        buffer = fixedLen ? new byte[blockSize * transferLen] : new byte[transferLen];
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
 
-            return sense;
-        }
+        cdb[0] = (byte)ScsiCommands.ReadReverse;
 
-        /// <summary>Selects the specified track</summary>
-        /// <returns><c>true</c>, if select was tracked, <c>false</c> otherwise.</returns>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="track">Track.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool TrackSelect(out byte[] senseBuffer, byte track, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = Array.Empty<byte>();
+        if(fixedLen)
+            cdb[1] += 0x01;
 
-            cdb[0] = (byte)ScsiCommands.TrackSelect;
-            cdb[5] = track;
+        if(sili)
+            cdb[1] += 0x02;
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
+        if(byteOrder)
+            cdb[1] += 0x04;
 
-            Error = LastError != 0;
+        cdb[2] = (byte)((transferLen & 0xFF0000) >> 16);
+        cdb[3] = (byte)((transferLen & 0xFF00)   >> 8);
+        cdb[4] = (byte)(transferLen & 0xFF);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "TRACK SELECT took {0} ms.", duration);
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
 
-            return sense;
-        }
+        Error = LastError != 0;
 
-        /// <summary>Writes a space mark in the media</summary>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="code">Space type code.</param>
-        /// <param name="count">How many marks to write</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        /// <returns><c>true</c>, if select was tracked, <c>false</c> otherwise.</returns>
-        public bool Space(out byte[] senseBuffer, SscSpaceCodes code, int count, uint timeout, out double duration)
-        {
-            senseBuffer = new byte[64];
-            byte[] cdb    = new byte[6];
-            byte[] buffer = Array.Empty<byte>();
-            byte[] countB = BitConverter.GetBytes(count);
+        AaruConsole.DebugWriteLine("SCSI Device", "READ REVERSE (6) took {0} ms.", duration);
 
-            cdb[0] = (byte)ScsiCommands.Space;
-            cdb[1] = (byte)((byte)code & 0x0F);
-            cdb[2] = countB[2];
-            cdb[3] = countB[1];
-            cdb[4] = countB[0];
+        return sense;
+    }
 
-            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                        out bool sense);
+    /// <summary>Reads a number of fixed-length blocks starting at specified object, backwards</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Object size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool sili, ulong objectId, uint blocks,
+                              uint blockSize, uint timeout, out double duration) =>
+        ReadReverse16(out buffer, out senseBuffer, false, sili, false, 0, objectId, blocks, blockSize, timeout,
+                      out duration);
 
-            Error = LastError != 0;
+    /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition, backwards</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
+    /// <param name="partition">Partition to read object from.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Object size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool sili, byte partition, ulong objectId,
+                              uint blocks, uint blockSize, uint timeout, out double duration) =>
+        ReadReverse16(out buffer, out senseBuffer, false, sili, false, partition, objectId, blocks, blockSize,
+                      timeout, out duration);
 
-            AaruConsole.DebugWriteLine("SCSI Device", "SPACE took {0} ms.", duration);
+    /// <summary>Reads a number of fixed-length blocks starting at specified object, backwards</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Object size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, ulong objectId, uint blocks,
+                              uint blockSize, uint timeout, out double duration) =>
+        ReadReverse16(out buffer, out senseBuffer, false, false, true, 0, objectId, blocks, blockSize, timeout,
+                      out duration);
 
-            return sense;
-        }
+    /// <summary>Reads a number of fixed-length blocks starting at specified block from the specified partition, backwards</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="partition">Partition to read object from.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Object size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, byte partition, ulong objectId,
+                              uint blocks, uint blockSize, uint timeout, out double duration) =>
+        ReadReverse16(out buffer, out senseBuffer, false, false, true, partition, objectId, blocks, blockSize,
+                      timeout, out duration);
+
+    /// <summary>Reads a number of bytes or objects starting at specified object from the specified partition, backwards</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="byteOrder">If set to <c>true</c> drive should un-reverse the blocks and bytes</param>
+    /// <param name="sili">
+    ///     If set to <c>true</c> suppress the incorrect-length indication. Cannot be set while
+    ///     <paramref name="fixedLen" /> is set also.
+    /// </param>
+    /// <param name="fixedLen">
+    ///     If set to <c>true</c> <paramref name="transferLen" /> indicates how many blocks to read of a
+    ///     fixed size.
+    /// </param>
+    /// <param name="partition">Partition to read object from.</param>
+    /// <param name="objectId">Object identifier.</param>
+    /// <param name="transferLen">Transfer length in blocks or bytes depending of <paramref name="fixedLen" /> status.</param>
+    /// <param name="objectSize">Object size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReadReverse16(out byte[] buffer, out byte[] senseBuffer, bool byteOrder, bool sili, bool fixedLen,
+                              byte partition, ulong objectId, uint transferLen, uint objectSize, uint timeout,
+                              out double duration)
+    {
+        buffer = fixedLen ? new byte[objectSize * transferLen] : new byte[transferLen];
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
+        byte[] idBytes = BitConverter.GetBytes(objectId);
+
+        cdb[0] = (byte)ScsiCommands.Read16;
+
+        if(fixedLen)
+            cdb[1] += 0x01;
+
+        if(sili)
+            cdb[1] += 0x02;
+
+        if(byteOrder)
+            cdb[1] += 0x04;
+
+        cdb[3]  = partition;
+        cdb[4]  = idBytes[7];
+        cdb[5]  = idBytes[6];
+        cdb[6]  = idBytes[5];
+        cdb[7]  = idBytes[4];
+        cdb[8]  = idBytes[3];
+        cdb[9]  = idBytes[2];
+        cdb[10] = idBytes[1];
+        cdb[11] = idBytes[0];
+        cdb[12] = (byte)((transferLen & 0xFF0000) >> 16);
+        cdb[13] = (byte)((transferLen & 0xFF00)   >> 8);
+        cdb[14] = (byte)(transferLen & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "READ REVERSE (16) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Reads the specified number of blocks from the device's buffer</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="blocks">How many blocks to read.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, uint blocks, uint blockSize,
+                                    uint timeout, out double duration) =>
+        RecoverBufferedData(out buffer, out senseBuffer, false, true, blocks, blockSize, timeout, out duration);
+
+    /// <summary>Reads the specified number of bytes or of blocks from the device's buffer</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sili">If set to <c>true</c> suppress the incorrect-length indication.</param>
+    /// <param name="transferLen">How many bytes to read.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, bool sili, uint transferLen,
+                                    uint blockSize, uint timeout, out double duration) =>
+        RecoverBufferedData(out buffer, out senseBuffer, sili, false, transferLen, blockSize, timeout,
+                            out duration);
+
+    /// <summary>Reads the specified number of bytes or of blocks from the device's buffer</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="sili">
+    ///     If set to <c>true</c> suppress the incorrect-length indication. Cannot be set while
+    ///     <paramref name="fixedLen" /> is set also.
+    /// </param>
+    /// <param name="fixedLen">
+    ///     If set to <c>true</c> <paramref name="transferLen" /> indicates how many blocks to read of a
+    ///     fixed size.
+    /// </param>
+    /// <param name="transferLen">Transfer length in blocks or bytes depending of <paramref name="fixedLen" /> status.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, bool sili, bool fixedLen,
+                                    uint transferLen, uint blockSize, uint timeout, out double duration)
+    {
+        buffer = fixedLen ? new byte[blockSize * transferLen] : new byte[transferLen];
+        byte[] cdb = new byte[6];
+        senseBuffer = new byte[64];
+
+        cdb[0] = (byte)ScsiCommands.RecoverBufferedData;
+
+        if(fixedLen)
+            cdb[1] += 0x01;
+
+        if(sili)
+            cdb[1] += 0x02;
+
+        cdb[2] = (byte)((transferLen & 0xFF0000) >> 16);
+        cdb[3] = (byte)((transferLen & 0xFF00)   >> 8);
+        cdb[4] = (byte)(transferLen & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "RECOVER BUFFERED DATA took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Requests the device to return descriptors for supported densities or medium types</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool
+        ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, uint timeout, out double duration) =>
+        ReportDensitySupport(out buffer, out senseBuffer, false, false, timeout, out duration);
+
+    /// <summary>Requests the device to return descriptors for supported densities or medium types</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="currentMedia">If set to <c>true</c> descriptors should apply to currently inserted media.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, bool currentMedia, uint timeout,
+                                     out double duration) =>
+        ReportDensitySupport(out buffer, out senseBuffer, false, currentMedia, timeout, out duration);
+
+    /// <summary>Requests the device to return descriptors for supported densities or medium types</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="mediumType">If set to <c>true</c> descriptors should be about medium types.</param>
+    /// <param name="currentMedia">If set to <c>true</c> descriptors should apply to currently inserted media.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, bool mediumType, bool currentMedia,
+                                     uint timeout, out double duration)
+    {
+        buffer = new byte[256];
+        byte[] cdb = new byte[10];
+        senseBuffer = new byte[64];
+
+        cdb[0] = (byte)ScsiCommands.ReportDensitySupport;
+
+        if(currentMedia)
+            cdb[1] += 0x01;
+
+        if(mediumType)
+            cdb[1] += 0x02;
+
+        cdb[7] = (byte)((buffer.Length & 0xFF00) >> 8);
+        cdb[8] = (byte)(buffer.Length & 0xFF);
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        if(sense)
+            return true;
+
+        ushort availableLength = (ushort)((buffer[0] << 8) + buffer[1] + 2);
+        buffer      = new byte[availableLength];
+        cdb[7]      = (byte)((buffer.Length & 0xFF00) >> 8);
+        cdb[8]      = (byte)(buffer.Length & 0xFF);
+        senseBuffer = new byte[64];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                    out sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "REPORT DENSITY SUPPORT took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Positions the reading/writing element to the beginning of current partition</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Rewind(out byte[] senseBuffer, uint timeout, out double duration) =>
+        Rewind(out senseBuffer, false, timeout, out duration);
+
+    /// <summary>Positions the reading/writing element to the beginning of current partition</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="immediate">If set to <c>true</c> return from the command immediately.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool Rewind(out byte[] senseBuffer, bool immediate, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = Array.Empty<byte>();
+
+        cdb[0] = (byte)ScsiCommands.Rewind;
+
+        if(immediate)
+            cdb[1] += 0x01;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "REWIND took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Selects the specified track</summary>
+    /// <returns><c>true</c>, if select was tracked, <c>false</c> otherwise.</returns>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="track">Track.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool TrackSelect(out byte[] senseBuffer, byte track, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = Array.Empty<byte>();
+
+        cdb[0] = (byte)ScsiCommands.TrackSelect;
+        cdb[5] = track;
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "TRACK SELECT took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Writes a space mark in the media</summary>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="code">Space type code.</param>
+    /// <param name="count">How many marks to write</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    /// <returns><c>true</c>, if select was tracked, <c>false</c> otherwise.</returns>
+    public bool Space(out byte[] senseBuffer, SscSpaceCodes code, int count, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb    = new byte[6];
+        byte[] buffer = Array.Empty<byte>();
+        byte[] countB = BitConverter.GetBytes(count);
+
+        cdb[0] = (byte)ScsiCommands.Space;
+        cdb[1] = (byte)((byte)code & 0x0F);
+        cdb[2] = countB[2];
+        cdb[3] = countB[1];
+        cdb[4] = countB[0];
+
+        LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                    out bool sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "SPACE took {0} ms.", duration);
+
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs
index 9f0313fd5..dfb4763ca 100644
--- a/Aaru.Devices/Device/ScsiCommands/SyQuest.cs
+++ b/Aaru.Devices/Device/ScsiCommands/SyQuest.cs
@@ -33,166 +33,165 @@
 using System;
 using Aaru.Console;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
-    {
-        /// <summary>Sends the SyQuest READ (6) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Starting block.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        public bool SyQuestRead6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint timeout,
+    /// <summary>Sends the SyQuest READ (6) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Starting block.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    public bool SyQuestRead6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint timeout,
+                             out double duration) =>
+        SyQuestRead6(out buffer, out senseBuffer, lba, blockSize, 1, false, false, timeout, out duration);
+
+    /// <summary>Sends the SyQuest READ LONG (6) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Starting block.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    public bool SyQuestReadLong6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint timeout,
                                  out double duration) =>
-            SyQuestRead6(out buffer, out senseBuffer, lba, blockSize, 1, false, false, timeout, out duration);
+        SyQuestRead6(out buffer, out senseBuffer, lba, blockSize, 1, false, true, timeout, out duration);
 
-        /// <summary>Sends the SyQuest READ LONG (6) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Starting block.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        public bool SyQuestReadLong6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint timeout,
-                                     out double duration) =>
-            SyQuestRead6(out buffer, out senseBuffer, lba, blockSize, 1, false, true, timeout, out duration);
+    /// <summary>Sends the SyQuest READ (6) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Starting block.</param>
+    /// <param name="inhibitDma">If set to <c>true</c>, block will not be transfer and will reside in the drive's buffer.</param>
+    /// <param name="readLong">If set to <c>true</c> drive will return ECC bytes and disable error detection.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    public bool SyQuestRead6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
+                             byte transferLength, bool inhibitDma, bool readLong, uint timeout, out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[6];
+        bool   sense;
 
-        /// <summary>Sends the SyQuest READ (6) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Starting block.</param>
-        /// <param name="inhibitDma">If set to <c>true</c>, block will not be transfer and will reside in the drive's buffer.</param>
-        /// <param name="readLong">If set to <c>true</c> drive will return ECC bytes and disable error detection.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        public bool SyQuestRead6(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
-                                 byte transferLength, bool inhibitDma, bool readLong, uint timeout, out double duration)
+        cdb[0] = (byte)ScsiCommands.Read6;
+        cdb[1] = (byte)((lba & 0x1F0000) >> 16);
+        cdb[2] = (byte)((lba & 0xFF00)   >> 8);
+        cdb[3] = (byte)(lba & 0xFF);
+        cdb[4] = transferLength;
+
+        if(inhibitDma)
+            cdb[5] += 0x80;
+
+        if(readLong)
+            cdb[5] += 0x40;
+
+        if(!inhibitDma &&
+           !readLong)
+            buffer = transferLength == 0 ? new byte[256 * blockSize] : new byte[transferLength * blockSize];
+        else if(readLong)
         {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[6];
-            bool   sense;
-
-            cdb[0] = (byte)ScsiCommands.Read6;
-            cdb[1] = (byte)((lba & 0x1F0000) >> 16);
-            cdb[2] = (byte)((lba & 0xFF00)   >> 8);
-            cdb[3] = (byte)(lba & 0xFF);
-            cdb[4] = transferLength;
-
-            if(inhibitDma)
-                cdb[5] += 0x80;
-
-            if(readLong)
-                cdb[5] += 0x40;
-
-            if(!inhibitDma &&
-               !readLong)
-                buffer = transferLength == 0 ? new byte[256 * blockSize] : new byte[transferLength * blockSize];
-            else if(readLong)
-            {
-                buffer = new byte[blockSize];
-                cdb[4] = 1;
-            }
-            else
-                buffer = Array.Empty<byte>();
-
-            if(!inhibitDma)
-                LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                            out sense);
-            else
-                LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                            out sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "SYQUEST READ (6) took {0} ms.", duration);
-
-            return sense;
+            buffer = new byte[blockSize];
+            cdb[4] = 1;
         }
+        else
+            buffer = Array.Empty<byte>();
 
-        /// <summary>Requests the usage, seek and error counters, and resets them</summary>
-        /// <param name="buffer">Buffer.</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout.</param>
-        /// <param name="duration">Duration.</param>
-        public bool SyQuestReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, uint timeout,
-                                            out double duration) =>
-            AdaptecReadUsageCounter(out buffer, out senseBuffer, false, timeout, out duration);
+        if(!inhibitDma)
+            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                        out sense);
+        else
+            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                        out sense);
 
-        /// <summary>Sends the SyQuest READ LONG (10) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Starting block.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        public bool SyQuestReadLong10(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint timeout,
-                                      out double duration) =>
-            SyQuestRead10(out buffer, out senseBuffer, lba, blockSize, 1, false, true, timeout, out duration);
+        Error = LastError != 0;
 
-        /// <summary>Sends the SyQuest READ (10) command</summary>
-        /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
-        /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
-        /// <param name="senseBuffer">Sense buffer.</param>
-        /// <param name="timeout">Timeout in seconds.</param>
-        /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
-        /// <param name="lba">Starting block.</param>
-        /// <param name="inhibitDma">If set to <c>true</c>, block will not be transfer and will reside in the drive's buffer.</param>
-        /// <param name="readLong">If set to <c>true</c> drive will return ECC bytes and disable error detection.</param>
-        /// <param name="blockSize">Block size in bytes.</param>
-        /// <param name="transferLength">How many blocks to read.</param>
-        public bool SyQuestRead10(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
-                                  ushort transferLength, bool inhibitDma, bool readLong, uint timeout,
-                                  out double duration)
+        AaruConsole.DebugWriteLine("SCSI Device", "SYQUEST READ (6) took {0} ms.", duration);
+
+        return sense;
+    }
+
+    /// <summary>Requests the usage, seek and error counters, and resets them</summary>
+    /// <param name="buffer">Buffer.</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout.</param>
+    /// <param name="duration">Duration.</param>
+    public bool SyQuestReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, uint timeout,
+                                        out double duration) =>
+        AdaptecReadUsageCounter(out buffer, out senseBuffer, false, timeout, out duration);
+
+    /// <summary>Sends the SyQuest READ LONG (10) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Starting block.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    public bool SyQuestReadLong10(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize, uint timeout,
+                                  out double duration) =>
+        SyQuestRead10(out buffer, out senseBuffer, lba, blockSize, 1, false, true, timeout, out duration);
+
+    /// <summary>Sends the SyQuest READ (10) command</summary>
+    /// <returns><c>true</c> if the command failed and <paramref name="senseBuffer" /> contains the sense buffer.</returns>
+    /// <param name="buffer">Buffer where the SCSI READ response will be stored</param>
+    /// <param name="senseBuffer">Sense buffer.</param>
+    /// <param name="timeout">Timeout in seconds.</param>
+    /// <param name="duration">Duration in milliseconds it took for the device to execute the command.</param>
+    /// <param name="lba">Starting block.</param>
+    /// <param name="inhibitDma">If set to <c>true</c>, block will not be transfer and will reside in the drive's buffer.</param>
+    /// <param name="readLong">If set to <c>true</c> drive will return ECC bytes and disable error detection.</param>
+    /// <param name="blockSize">Block size in bytes.</param>
+    /// <param name="transferLength">How many blocks to read.</param>
+    public bool SyQuestRead10(out byte[] buffer, out byte[] senseBuffer, uint lba, uint blockSize,
+                              ushort transferLength, bool inhibitDma, bool readLong, uint timeout,
+                              out double duration)
+    {
+        senseBuffer = new byte[64];
+        byte[] cdb = new byte[10];
+        bool   sense;
+
+        cdb[0] = (byte)ScsiCommands.Read10;
+        cdb[2] = (byte)((lba & 0xFF000000) >> 24);
+        cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
+        cdb[4] = (byte)((lba & 0xFF00)     >> 8);
+        cdb[5] = (byte)(lba & 0xFF);
+        cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
+        cdb[8] = (byte)(transferLength & 0xFF);
+
+        if(inhibitDma)
+            cdb[9] += 0x80;
+
+        if(readLong)
+            cdb[9] += 0x40;
+
+        if(!inhibitDma &&
+           !readLong)
+            buffer = new byte[transferLength * blockSize];
+        else if(readLong)
         {
-            senseBuffer = new byte[64];
-            byte[] cdb = new byte[10];
-            bool   sense;
-
-            cdb[0] = (byte)ScsiCommands.Read10;
-            cdb[2] = (byte)((lba & 0xFF000000) >> 24);
-            cdb[3] = (byte)((lba & 0xFF0000)   >> 16);
-            cdb[4] = (byte)((lba & 0xFF00)     >> 8);
-            cdb[5] = (byte)(lba & 0xFF);
-            cdb[7] = (byte)((transferLength & 0xFF00) >> 8);
-            cdb[8] = (byte)(transferLength & 0xFF);
-
-            if(inhibitDma)
-                cdb[9] += 0x80;
-
-            if(readLong)
-                cdb[9] += 0x40;
-
-            if(!inhibitDma &&
-               !readLong)
-                buffer = new byte[transferLength * blockSize];
-            else if(readLong)
-            {
-                buffer = new byte[blockSize];
-                cdb[4] = 1;
-            }
-            else
-                buffer = Array.Empty<byte>();
-
-            if(!inhibitDma)
-                LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
-                                            out sense);
-            else
-                LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
-                                            out sense);
-
-            Error = LastError != 0;
-
-            AaruConsole.DebugWriteLine("SCSI Device", "SYQUEST READ (10) took {0} ms.", duration);
-
-            return sense;
+            buffer = new byte[blockSize];
+            cdb[4] = 1;
         }
+        else
+            buffer = Array.Empty<byte>();
+
+        if(!inhibitDma)
+            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.In, out duration,
+                                        out sense);
+        else
+            LastError = SendScsiCommand(cdb, ref buffer, out senseBuffer, timeout, ScsiDirection.None, out duration,
+                                        out sense);
+
+        Error = LastError != 0;
+
+        AaruConsole.DebugWriteLine("SCSI Device", "SYQUEST READ (10) took {0} ms.", duration);
+
+        return sense;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Device/Variables.cs b/Aaru.Devices/Device/Variables.cs
index 0f65a2674..ce6462955 100644
--- a/Aaru.Devices/Device/Variables.cs
+++ b/Aaru.Devices/Device/Variables.cs
@@ -34,162 +34,161 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interop;
 using Aaru.CommonTypes.Structs.Devices.SCSI;
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+public sealed partial class Device
 {
-    public sealed partial class Device
+    readonly ushort _usbVendor;
+    readonly ushort _usbProduct;
+    readonly ulong  _firewireGuid;
+    readonly uint   _firewireModel;
+    readonly uint   _firewireVendor;
+
+    // MMC and SecureDigital, values that need to be get with card idle, something that may
+    // not be possible to do but usually is already done by the SDHCI driver.
+    readonly byte[] _cachedCsd;
+    readonly byte[] _cachedCid;
+    readonly byte[] _cachedScr;
+    readonly byte[] _cachedOcr;
+
+    /// <summary>Gets the Platform ID for this device</summary>
+    /// <value>The Platform ID</value>
+    public PlatformID PlatformId { get; }
+
+    /// <summary>Gets the file handle representing this device</summary>
+    /// <value>The file handle</value>
+    public object FileHandle { get; private set; }
+
+    /// <summary>Gets or sets the standard timeout for commands sent to this device</summary>
+    /// <value>The timeout in seconds</value>
+    public uint Timeout { get; }
+
+    /// <summary>Gets a value indicating whether this <see cref="Device" /> is in error.</summary>
+    /// <value><c>true</c> if error; otherwise, <c>false</c>.</value>
+    public bool Error { get; private set; }
+
+    /// <summary>Gets the last error number.</summary>
+    /// <value>The last error.</value>
+    public int LastError { get; private set; }
+
+    /// <summary>Gets the device type.</summary>
+    /// <value>The device type.</value>
+    public DeviceType Type { get; }
+
+    /// <summary>Gets the device's manufacturer</summary>
+    /// <value>The manufacturer.</value>
+    public string Manufacturer { get; }
+
+    /// <summary>Gets the device model</summary>
+    /// <value>The model.</value>
+    public string Model { get; }
+
+    /// <summary>Gets the device's firmware version.</summary>
+    /// <value>The firmware version.</value>
+    public string FirmwareRevision { get; }
+
+    /// <summary>Gets the device's serial number.</summary>
+    /// <value>The serial number.</value>
+    public string Serial { get; }
+
+    /// <summary>Gets the device's SCSI peripheral device type</summary>
+    /// <value>The SCSI peripheral device type.</value>
+    public PeripheralDeviceTypes ScsiType { get; }
+
+    /// <summary>Gets a value indicating whether this device's media is removable.</summary>
+    /// <value><c>true</c> if this device's media is removable; otherwise, <c>false</c>.</value>
+    public bool IsRemovable { get; }
+
+    /// <summary>Gets a value indicating whether this device is attached via USB.</summary>
+    /// <value><c>true</c> if this device is attached via USB; otherwise, <c>false</c>.</value>
+    public bool IsUsb { get; }
+
+    /// <summary>Gets the USB vendor ID.</summary>
+    /// <value>The USB vendor ID.</value>
+    public ushort UsbVendorId => _usbVendor;
+
+    /// <summary>Gets the USB product ID.</summary>
+    /// <value>The USB product ID.</value>
+    public ushort UsbProductId => _usbProduct;
+
+    /// <summary>Gets the USB descriptors.</summary>
+    /// <value>The USB descriptors.</value>
+    public byte[] UsbDescriptors { get; }
+
+    /// <summary>Gets the USB manufacturer string.</summary>
+    /// <value>The USB manufacturer string.</value>
+    public string UsbManufacturerString { get; }
+
+    /// <summary>Gets the USB product string.</summary>
+    /// <value>The USB product string.</value>
+    public string UsbProductString { get; }
+
+    /// <summary>Gets the USB serial string.</summary>
+    /// <value>The USB serial string.</value>
+    public string UsbSerialString { get; }
+
+    /// <summary>Gets a value indicating whether this device is attached via FireWire.</summary>
+    /// <value><c>true</c> if this device is attached via FireWire; otherwise, <c>false</c>.</value>
+    public bool IsFireWire { get; }
+
+    /// <summary>Gets the FireWire GUID</summary>
+    /// <value>The FireWire GUID.</value>
+    public ulong FireWireGuid => _firewireGuid;
+
+    /// <summary>Gets the FireWire model number</summary>
+    /// <value>The FireWire model.</value>
+    public uint FireWireModel => _firewireModel;
+
+    /// <summary>Gets the FireWire model name.</summary>
+    /// <value>The FireWire model name.</value>
+    public string FireWireModelName { get; }
+
+    /// <summary>Gets the FireWire vendor number.</summary>
+    /// <value>The FireWire vendor number.</value>
+    public uint FireWireVendor => _firewireVendor;
+
+    /// <summary>Gets the FireWire vendor name.</summary>
+    /// <value>The FireWire vendor name.</value>
+    public string FireWireVendorName { get; }
+
+    /// <summary>Gets a value indicating whether this device is a CompactFlash device.</summary>
+    /// <value><c>true</c> if this device is a CompactFlash device; otherwise, <c>false</c>.</value>
+    public bool IsCompactFlash { get; }
+
+    /// <summary>Gets a value indicating whether this device is a PCMCIA device.</summary>
+    /// <value><c>true</c> if this device is a PCMCIA device; otherwise, <c>false</c>.</value>
+    public bool IsPcmcia { get; }
+
+    /// <summary>Contains the PCMCIA CIS if applicable</summary>
+    public byte[] Cis { get; }
+
+    readonly Remote.Remote _remote;
+    bool?                  _isRemoteAdmin;
+    readonly string        _devicePath;
+
+    /// <summary>Returns if remote is running under administrative (aka root) privileges</summary>
+    public bool IsRemoteAdmin
     {
-        readonly ushort _usbVendor;
-        readonly ushort _usbProduct;
-        readonly ulong  _firewireGuid;
-        readonly uint   _firewireModel;
-        readonly uint   _firewireVendor;
-
-        // MMC and SecureDigital, values that need to be get with card idle, something that may
-        // not be possible to do but usually is already done by the SDHCI driver.
-        readonly byte[] _cachedCsd;
-        readonly byte[] _cachedCid;
-        readonly byte[] _cachedScr;
-        readonly byte[] _cachedOcr;
-
-        /// <summary>Gets the Platform ID for this device</summary>
-        /// <value>The Platform ID</value>
-        public PlatformID PlatformId { get; }
-
-        /// <summary>Gets the file handle representing this device</summary>
-        /// <value>The file handle</value>
-        public object FileHandle { get; private set; }
-
-        /// <summary>Gets or sets the standard timeout for commands sent to this device</summary>
-        /// <value>The timeout in seconds</value>
-        public uint Timeout { get; }
-
-        /// <summary>Gets a value indicating whether this <see cref="Device" /> is in error.</summary>
-        /// <value><c>true</c> if error; otherwise, <c>false</c>.</value>
-        public bool Error { get; private set; }
-
-        /// <summary>Gets the last error number.</summary>
-        /// <value>The last error.</value>
-        public int LastError { get; private set; }
-
-        /// <summary>Gets the device type.</summary>
-        /// <value>The device type.</value>
-        public DeviceType Type { get; }
-
-        /// <summary>Gets the device's manufacturer</summary>
-        /// <value>The manufacturer.</value>
-        public string Manufacturer { get; }
-
-        /// <summary>Gets the device model</summary>
-        /// <value>The model.</value>
-        public string Model { get; }
-
-        /// <summary>Gets the device's firmware version.</summary>
-        /// <value>The firmware version.</value>
-        public string FirmwareRevision { get; }
-
-        /// <summary>Gets the device's serial number.</summary>
-        /// <value>The serial number.</value>
-        public string Serial { get; }
-
-        /// <summary>Gets the device's SCSI peripheral device type</summary>
-        /// <value>The SCSI peripheral device type.</value>
-        public PeripheralDeviceTypes ScsiType { get; }
-
-        /// <summary>Gets a value indicating whether this device's media is removable.</summary>
-        /// <value><c>true</c> if this device's media is removable; otherwise, <c>false</c>.</value>
-        public bool IsRemovable { get; }
-
-        /// <summary>Gets a value indicating whether this device is attached via USB.</summary>
-        /// <value><c>true</c> if this device is attached via USB; otherwise, <c>false</c>.</value>
-        public bool IsUsb { get; }
-
-        /// <summary>Gets the USB vendor ID.</summary>
-        /// <value>The USB vendor ID.</value>
-        public ushort UsbVendorId => _usbVendor;
-
-        /// <summary>Gets the USB product ID.</summary>
-        /// <value>The USB product ID.</value>
-        public ushort UsbProductId => _usbProduct;
-
-        /// <summary>Gets the USB descriptors.</summary>
-        /// <value>The USB descriptors.</value>
-        public byte[] UsbDescriptors { get; }
-
-        /// <summary>Gets the USB manufacturer string.</summary>
-        /// <value>The USB manufacturer string.</value>
-        public string UsbManufacturerString { get; }
-
-        /// <summary>Gets the USB product string.</summary>
-        /// <value>The USB product string.</value>
-        public string UsbProductString { get; }
-
-        /// <summary>Gets the USB serial string.</summary>
-        /// <value>The USB serial string.</value>
-        public string UsbSerialString { get; }
-
-        /// <summary>Gets a value indicating whether this device is attached via FireWire.</summary>
-        /// <value><c>true</c> if this device is attached via FireWire; otherwise, <c>false</c>.</value>
-        public bool IsFireWire { get; }
-
-        /// <summary>Gets the FireWire GUID</summary>
-        /// <value>The FireWire GUID.</value>
-        public ulong FireWireGuid => _firewireGuid;
-
-        /// <summary>Gets the FireWire model number</summary>
-        /// <value>The FireWire model.</value>
-        public uint FireWireModel => _firewireModel;
-
-        /// <summary>Gets the FireWire model name.</summary>
-        /// <value>The FireWire model name.</value>
-        public string FireWireModelName { get; }
-
-        /// <summary>Gets the FireWire vendor number.</summary>
-        /// <value>The FireWire vendor number.</value>
-        public uint FireWireVendor => _firewireVendor;
-
-        /// <summary>Gets the FireWire vendor name.</summary>
-        /// <value>The FireWire vendor name.</value>
-        public string FireWireVendorName { get; }
-
-        /// <summary>Gets a value indicating whether this device is a CompactFlash device.</summary>
-        /// <value><c>true</c> if this device is a CompactFlash device; otherwise, <c>false</c>.</value>
-        public bool IsCompactFlash { get; }
-
-        /// <summary>Gets a value indicating whether this device is a PCMCIA device.</summary>
-        /// <value><c>true</c> if this device is a PCMCIA device; otherwise, <c>false</c>.</value>
-        public bool IsPcmcia { get; }
-
-        /// <summary>Contains the PCMCIA CIS if applicable</summary>
-        public byte[] Cis { get; }
-
-        readonly Remote.Remote _remote;
-        bool?                  _isRemoteAdmin;
-        readonly string        _devicePath;
-
-        /// <summary>Returns if remote is running under administrative (aka root) privileges</summary>
-        public bool IsRemoteAdmin
+        get
         {
-            get
-            {
-                _isRemoteAdmin ??= _remote.IsRoot;
+            _isRemoteAdmin ??= _remote.IsRoot;
 
-                return _isRemoteAdmin == true;
-            }
+            return _isRemoteAdmin == true;
         }
-
-        /// <summary>Current device is remote</summary>
-        public bool IsRemote => _remote != null;
-        /// <summary>Remote application</summary>
-        public string RemoteApplication => _remote?.ServerApplication;
-        /// <summary>Remote application server</summary>
-        public string RemoteVersion => _remote?.ServerVersion;
-        /// <summary>Remote operating system name</summary>
-        public string RemoteOperatingSystem => _remote?.ServerOperatingSystem;
-        /// <summary>Remote operating system version</summary>
-        public string RemoteOperatingSystemVersion => _remote?.ServerOperatingSystemVersion;
-        /// <summary>Remote architecture</summary>
-        public string RemoteArchitecture => _remote?.ServerArchitecture;
-        /// <summary>Remote protocol version</summary>
-        public int RemoteProtocolVersion => _remote?.ServerProtocolVersion ?? 0;
     }
+
+    /// <summary>Current device is remote</summary>
+    public bool IsRemote => _remote != null;
+    /// <summary>Remote application</summary>
+    public string RemoteApplication => _remote?.ServerApplication;
+    /// <summary>Remote application server</summary>
+    public string RemoteVersion => _remote?.ServerVersion;
+    /// <summary>Remote operating system name</summary>
+    public string RemoteOperatingSystem => _remote?.ServerOperatingSystem;
+    /// <summary>Remote operating system version</summary>
+    public string RemoteOperatingSystemVersion => _remote?.ServerOperatingSystemVersion;
+    /// <summary>Remote architecture</summary>
+    public string RemoteArchitecture => _remote?.ServerArchitecture;
+    /// <summary>Remote protocol version</summary>
+    public int RemoteProtocolVersion => _remote?.ServerProtocolVersion ?? 0;
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Enums.cs b/Aaru.Devices/Enums.cs
index 9f7dc4fc8..4f4e38163 100644
--- a/Aaru.Devices/Enums.cs
+++ b/Aaru.Devices/Enums.cs
@@ -41,2864 +41,2863 @@ using System.Diagnostics.CodeAnalysis;
 // ReSharper disable MemberCanBeInternal
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Devices
+namespace Aaru.Devices;
+
+#region ATA Commands
+/// <summary>All known ATA commands</summary>
+public enum AtaCommands : byte
 {
-    #region ATA Commands
-    /// <summary>All known ATA commands</summary>
-    public enum AtaCommands : byte
-    {
-        #region Commands defined on Western Digital WD1000 Winchester Disk Controller
-        /// <summary>Formats a track</summary>
-        FormatTrack = 0x50,
+    #region Commands defined on Western Digital WD1000 Winchester Disk Controller
+    /// <summary>Formats a track</summary>
+    FormatTrack = 0x50,
 
-        /// <summary>Reads sectors</summary>
-        ReadOld = 0x20,
+    /// <summary>Reads sectors</summary>
+    ReadOld = 0x20,
 
-        /// <summary>Reads sectors using DMA</summary>
-        ReadDmaOld = 0x28,
+    /// <summary>Reads sectors using DMA</summary>
+    ReadDmaOld = 0x28,
 
-        /// <summary>Calibrates the position of the heads Includes all commands from 0x10 to 0x1F</summary>
-        Restore = 0x10,
+    /// <summary>Calibrates the position of the heads Includes all commands from 0x10 to 0x1F</summary>
+    Restore = 0x10,
 
-        /// <summary>Seeks to a certain cylinder</summary>
-        Seek = 0x70,
+    /// <summary>Seeks to a certain cylinder</summary>
+    Seek = 0x70,
 
-        /// <summary>Writes sectors</summary>
-        WriteOld = 0x30,
-        #endregion Commands defined on Western Digital WD1000 Winchester Disk Controller
+    /// <summary>Writes sectors</summary>
+    WriteOld = 0x30,
+    #endregion Commands defined on Western Digital WD1000 Winchester Disk Controller
 
-        #region Commands defined on ATA rev. 4c
-        /// <summary>Acknowledges media change</summary>
-        AckMediaChange = 0xDB,
+    #region Commands defined on ATA rev. 4c
+    /// <summary>Acknowledges media change</summary>
+    AckMediaChange = 0xDB,
 
-        /// <summary>Sends vendor-specific information that may be required in order to pass diagnostics</summary>
-        PostBoot = 0xDC,
+    /// <summary>Sends vendor-specific information that may be required in order to pass diagnostics</summary>
+    PostBoot = 0xDC,
 
-        /// <summary>Prepares a removable drive to respond to boot</summary>
-        PreBoot = 0xDD,
+    /// <summary>Prepares a removable drive to respond to boot</summary>
+    PreBoot = 0xDD,
 
-        /// <summary>Checks drive power mode</summary>
-        CheckPowerMode = 0xE5,
+    /// <summary>Checks drive power mode</summary>
+    CheckPowerMode = 0xE5,
 
-        /// <summary>Checks drive power mode</summary>
-        CheckPowerModeAlternate = 0x98,
+    /// <summary>Checks drive power mode</summary>
+    CheckPowerModeAlternate = 0x98,
 
-        /// <summary>Locks the door of the drive</summary>
-        DoorLock = 0xDE,
+    /// <summary>Locks the door of the drive</summary>
+    DoorLock = 0xDE,
 
-        /// <summary>Unlocks the door of the drive</summary>
-        DoorUnLock = 0xDF,
+    /// <summary>Unlocks the door of the drive</summary>
+    DoorUnLock = 0xDF,
 
-        /// <summary>Executes internal drive diagnostics</summary>
-        ExecuteDriveDiagnostic = 0x90,
+    /// <summary>Executes internal drive diagnostics</summary>
+    ExecuteDriveDiagnostic = 0x90,
 
-        /// <summary>Gets a sector containing drive identification and capabilities</summary>
-        IdentifyDrive = 0xEC,
+    /// <summary>Gets a sector containing drive identification and capabilities</summary>
+    IdentifyDrive = 0xEC,
 
-        /// <summary>Requests the drive to enter idle status</summary>
-        Idle = 0xE3,
+    /// <summary>Requests the drive to enter idle status</summary>
+    Idle = 0xE3,
 
-        /// <summary>Requests the drive to enter idle status</summary>
-        IdleAlternate = 0x97,
+    /// <summary>Requests the drive to enter idle status</summary>
+    IdleAlternate = 0x97,
 
-        /// <summary>Requests the drive to enter idle status immediately</summary>
-        IdleImmediate = 0xE1,
+    /// <summary>Requests the drive to enter idle status immediately</summary>
+    IdleImmediate = 0xE1,
 
-        /// <summary>Requests the drive to enter idle status immediately</summary>
-        IdleImmediateAlternate = 0x95,
+    /// <summary>Requests the drive to enter idle status immediately</summary>
+    IdleImmediateAlternate = 0x95,
 
-        /// <summary>Changes heads and sectors per cylinder for the drive</summary>
-        InitializeDriveParameters = 0x91,
+    /// <summary>Changes heads and sectors per cylinder for the drive</summary>
+    InitializeDriveParameters = 0x91,
 
-        /// <summary>Does nothing</summary>
-        Nop = 0x00,
+    /// <summary>Does nothing</summary>
+    Nop = 0x00,
 
-        /// <summary>Reads sectors using PIO transfer</summary>
-        Read = 0x21,
+    /// <summary>Reads sectors using PIO transfer</summary>
+    Read = 0x21,
 
-        /// <summary>Reads the content of the drive's buffer</summary>
-        ReadBuffer = 0xE4,
+    /// <summary>Reads the content of the drive's buffer</summary>
+    ReadBuffer = 0xE4,
 
-        /// <summary>Reads sectors using DMA transfer</summary>
-        ReadDma = 0xC9,
+    /// <summary>Reads sectors using DMA transfer</summary>
+    ReadDma = 0xC9,
 
-        /// <summary>Reads sectors using DMA transfer, retrying on error</summary>
-        ReadDmaRetry = 0xC8,
+    /// <summary>Reads sectors using DMA transfer, retrying on error</summary>
+    ReadDmaRetry = 0xC8,
 
-        /// <summary>Reads a sector including ECC bytes without checking them</summary>
-        ReadLong = 0x23,
+    /// <summary>Reads a sector including ECC bytes without checking them</summary>
+    ReadLong = 0x23,
 
-        /// <summary>Reads a sector including ECC bytes without checking them, retrying on error</summary>
-        ReadLongRetry = 0x22,
+    /// <summary>Reads a sector including ECC bytes without checking them, retrying on error</summary>
+    ReadLongRetry = 0x22,
 
-        /// <summary>Reads multiple sectors generating interrupts at block transfers</summary>
-        ReadMultiple = 0xC4,
+    /// <summary>Reads multiple sectors generating interrupts at block transfers</summary>
+    ReadMultiple = 0xC4,
 
-        /// <summary>Reads sectors using PIO transfer, retrying on error</summary>
-        ReadRetry = 0x20,
+    /// <summary>Reads sectors using PIO transfer, retrying on error</summary>
+    ReadRetry = 0x20,
 
-        /// <summary>Verifies sectors readability without transferring them</summary>
-        ReadVerify = 0x41,
+    /// <summary>Verifies sectors readability without transferring them</summary>
+    ReadVerify = 0x41,
 
-        /// <summary>Verifies sectors readability without transferring them, retrying on error</summary>
-        ReadVerifyRetry = 0x40,
+    /// <summary>Verifies sectors readability without transferring them, retrying on error</summary>
+    ReadVerifyRetry = 0x40,
 
-        /// <summary>Moves the heads to cylinder 0</summary>
-        Recalibrate = Restore,
+    /// <summary>Moves the heads to cylinder 0</summary>
+    Recalibrate = Restore,
 
-        /// <summary>Sets drive parameters</summary>
-        SetFeatures = 0xEF,
-
-        /// <summary>
-        ///     Enables <see cref="ReadMultiple" /> and <see cref="WriteMultiple" /> and sets the block length for these
-        ///     commands
-        /// </summary>
-        SetMultipleMode = 0xC6,
-
-        /// <summary>Causes the drive to stop and sleep until a hardware or software reset</summary>
-        Sleep = 0xE6,
-
-        /// <summary>Causes the drive to stop and sleep until a hardware or software reset</summary>
-        SleepAlternate = 0x99,
-
-        /// <summary>Sets the drive to enter Standby mode</summary>
-        Standby = 0xE2,
-
-        /// <summary>Sets the drive to enter Standby mode</summary>
-        StandbyAlternate = 0x96,
-
-        /// <summary>Sets the drive to enter Standby mode, immediately</summary>
-        StandbyImmediate = 0xE0,
-
-        /// <summary>Sets the drive to enter Standby mode, immediately</summary>
-        StandbyImmediateAlternate = 0x94,
-
-        /// <summary>Writes sectors using PIO transfer</summary>
-        Write = 0x31,
-
-        /// <summary>Writes data to the drive's sector buffer</summary>
-        WriteBuffer = 0xE8,
-
-        /// <summary>Writes sectors using DMA transfer</summary>
-        WriteDma = 0xCB,
-
-        /// <summary>Writes sectors using DMA transfer, retrying on error</summary>
-        WriteDmaRetry = 0xCA,
-
-        /// <summary>Writes sectors with custom ECC</summary>
-        WriteLong = 0x33,
-
-        /// <summary>Writes sectors with custom ECC, retrying on error</summary>
-        WriteLongRetry = 0x32,
-
-        /// <summary>Writes several sectors at once setting interrupts on end of block</summary>
-        WriteMultiple = 0xC5,
-
-        /// <summary>Writes the same data to several sector</summary>
-        WriteSame = 0xE9,
-
-        /// <summary>Writes sectors using PIO transfer, retrying on error</summary>
-        WriteRetry = 0x30,
-
-        /// <summary>Writes sectors verifying them immediately after write</summary>
-        WriteVerify = 0x3C,
-
-        /// <summary>Unknown vendor command</summary>
-        Vendor_8X = 0x80,
-
-        /// <summary>Unknown vendor command</summary>
-        Vendor_9A = 0x9A,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorC0 = 0xC0,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorC1 = 0xC1,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorC2 = 0xC2,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorC3 = 0xC3,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorF0 = 0xF0,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorF1 = 0xF1,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorF2 = 0xF2,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorF3 = 0xF3,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorF4 = 0xF4,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorF5 = 0xF5,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorF6 = 0xF6,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorF7 = 0xF7,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorF8 = 0xF8,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorF9 = 0xF9,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorFa = 0xFA,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorFb = 0xFB,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorFc = 0xFC,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorFd = 0xFD,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorFe = 0xFE,
-
-        /// <summary>Unknown vendor command</summary>
-        VendorFf = 0xFF,
-        #endregion Commands defined on ATA rev. 4c
-
-        #region Commands defined on ATA-2 rev. 4c
-        /// <summary>Alters the device microcode</summary>
-        DownloadMicrocode = 0x92,
-
-        /// <summary>Ejects the removable medium on the device</summary>
-        MediaEject = 0xED,
-        #endregion Commands defined on ATA-2 rev. 4c
-
-        #region Commands defined on ATA-3 rev. 7b
-        /// <summary>Gets a sector containing drive identification and capabilities</summary>
-        IdentifyDriveDma = 0xEE,
-
-        /// <summary>Disables the security lock</summary>
-        SecurityDisablePassword = 0xF6,
-
-        /// <summary>Enables usage of <see cref="SecurityEraseUnit" /> command</summary>
-        SecurityErasePrepare = 0xF3,
-
-        /// <summary>Erases all user data and disables the security lock</summary>
-        SecurityEraseUnit = 0xF4,
-
-        /// <summary>Sets the security freeze lock preventing any security command from working until hardware reset</summary>
-        SecurityFreezeLock = 0xF5,
-
-        /// <summary>Sets the device user or master password</summary>
-        SecuritySetPassword = 0xF1,
-
-        /// <summary>Unlocks device</summary>
-        SecurityUnlock = 0xF2,
-
-        /// <summary>SMART operations</summary>
-        Smart = 0xB0,
-        #endregion Commands defined on ATA-3 rev. 7b
-
-        #region Commands defined on CompactFlash Specification
-        /// <summary>Pre-erases and conditions data sectors</summary>
-        EraseSectors = 0xC0,
-
-        /// <summary>Requests extended error information</summary>
-        RequestSense = 0x03,
-
-        /// <summary>Provides a way to determine the exact number of times a sector has been erases and programmed</summary>
-        TranslateSector = 0x87,
-
-        /// <summary>
-        ///     For CompactFlash cards that do not support security mode, this commands is equal to <see cref="Nop" /> For
-        ///     those that do, this command is equal to <see cref="SecurityFreezeLock" />
-        /// </summary>
-        WearLevel = 0xF5,
-
-        /// <summary>Writes a block of sectors without erasing them previously</summary>
-        WriteMultipleWithoutErase = 0xCD,
-
-        /// <summary>Writes sectors without erasing them previously</summary>
-        WriteWithoutErase = 0x38,
-        #endregion Commands defined on CompactFlash Specification
-
-        #region Commands defined on ATA/ATAPI-4 rev. 18
-        /// <summary>Resets a device</summary>
-        DeviceReset = 0x08,
-
-        /// <summary>Requests the device to flush the write cache and write it to the media</summary>
-        FlushCache = 0xE7,
-
-        /// <summary>Gets media status</summary>
-        GetMediaStatus = 0xDA,
-
-        /// <summary>Gets a sector containing drive identification and capabilities, for ATA devices</summary>
-        IdentifyDevice = IdentifyDrive,
-
-        /// <summary>Gets a sector containing drive identification and capabilities, for ATAPI devices</summary>
-        IdentifyPacketDevice = 0xA1,
-
-        /// <summary>Locks the media on the device</summary>
-        MediaLock = DoorLock,
-
-        /// <summary>Unlocks the media on the device</summary>
-        MediaUnLock = DoorUnLock,
-
-        /// <summary>Sends a command packet</summary>
-        Packet = 0xA0,
-
-        /// <summary>Queues a read of sectors</summary>
-        ReadDmaQueued = 0xC7,
-
-        /// <summary>Returns the native maximum address in factory default condition</summary>
-        ReadNativeMaxAddress = 0xF8,
-
-        /// <summary>Used to provide data transfer and/or status of a previous command (queue or packet)</summary>
-        Service = 0xA2,
-
-        /// <summary>Redefines the maximum user-accessible address space</summary>
-        SetMaxAddress = 0xF9,
-
-        /// <summary>Queues a write of sectors</summary>
-        WriteDmaQueued = 0xCC,
-        #endregion Commands defined on ATA/ATAPI-4 rev. 18
-
-        #region Commands defined on ATA/ATAPI-6 rev. 3b
-        /// <summary>Determines if the device supports the Media Card Pass Through Command feature set</summary>
-        CheckMediaCardType = 0xD1,
-
-        /// <summary>Device Configuration Overlay feature set</summary>
-        DeviceConfiguration = 0xB1,
-
-        /// <summary>Requests the device to flush the write cache and write it to the media (48-bit)</summary>
-        FlushCacheExt = 0xEA,
-
-        /// <summary>Reads sectors using DMA transfer, retrying on error (48-bit)</summary>
-        ReadDmaExt = 0x25,
-
-        /// <summary>(48-bit) Queues a read of sectors</summary>
-        ReadDmaQueuedExt = 0x26,
-
-        /// <summary>Reads sectors using PIO transfer, retrying on error (48-bit)</summary>
-        ReadExt = 0x24,
-
-        /// <summary>Returns the indicated log to the host (48-bit)</summary>
-        ReadLogExt = 0x2F,
-
-        /// <summary>Reads multiple sectors generating interrupts at block transfers (48-bit)</summary>
-        ReadMultipleExt = 0x29,
-
-        /// <summary>Returns the native maximum address in factory default condition (48-bit)</summary>
-        ReadNativeMaxAddressExt = 0x27,
-
-        /// <summary>Verifies sectors readability without transferring them, retrying on error (48-bit)</summary>
-        ReadVerifyExt = 0x42,
-
-        /// <summary>Sends a SET MAX subcommand, <see cref="AtaSetMaxSubCommands" /></summary>
-        SetMaxCommands = 0xF9,
-
-        /// <summary>Redefines the maximum user-accessible address space (48-bit)</summary>
-        SetMaxAddressExt = 0x37,
-
-        /// <summary>Writes sectors using DMA transfer, retrying on error (48-bit)</summary>
-        WriteDmaExt = 0x35,
-
-        /// <summary>Queues a write of sectors (48-bit)</summary>
-        WriteDmaQueuedExt = 0x36,
-
-        /// <summary>Writes sectors using PIO transfer, retrying on error (48-bit)</summary>
-        WriteExt = 0x34,
-
-        /// <summary>Writes data to the indicated log (48-bit)</summary>
-        WriteLogExt = 0x3F,
-
-        /// <summary>Writes several sectors at once setting interrupts on end of block (48-bit)</summary>
-        WriteMultipleExt = 0x39,
-        #endregion Commands defined on ATA/ATAPI-6 rev. 3b
-
-        #region Commands defined on ATA/ATAPI-7 rev. 4b
-        /// <summary>Configures the operating parameters for a stream</summary>
-        ConfigureStream = 0x51,
-
-        /// <summary>Reads data on an allotted time using DMA</summary>
-        ReadStreamDmaExt = 0x2A,
-
-        /// <summary>Reads data on an allotted time using PIO</summary>
-        ReadStreamExt = 0x2B,
-
-        /// <summary>Writes data on an allotted time using DMA</summary>
-        WriteStreamDmaExt = 0x3A,
-
-        /// <summary>Writes data on an allotted time using PIO</summary>
-        WriteStreamExt = 0x3B,
-        #endregion Commands defined on ATA/ATAPI-7 rev. 4b
-
-        #region Commands defined on ATA/ATAPI-8 rev. 3f
-        /// <summary>Sends a Non Volatile Cache subcommand. <see cref="AtaNonVolatileCacheSubCommands" /></summary>
-        NonVolatileCacheCommand = 0xB6,
-
-        /// <summary>Retrieves security protocol information or the results from <see cref="TrustedSend" /> commands</summary>
-        TrustedReceive = 0x5C,
-
-        /// <summary>
-        ///     Retrieves security protocol information or the results from <see cref="TrustedSend" /> commands, using DMA
-        ///     transfers
-        /// </summary>
-        TrustedReceiveDma = 0x5D,
-
-        /// <summary>Sends one or more Security Protocol commands</summary>
-        TrustedSend = 0x5E,
-
-        /// <summary>Sends one or more Security Protocol commands, using DMA transfers</summary>
-        TrustedSendDma = 0x5F,
-
-        /// <summary>Writes sectors using DMA transfer, retrying on error (48-bit), not returning until the operation is complete</summary>
-        WriteDmaFuaExt = 0x3D,
-
-        /// <summary>Queues a write of sectors (48-bit), not returning until the operation is complete</summary>
-        WriteDmaQueuedFuaExt = 0x3E,
-
-        /// <summary>
-        ///     Writes several sectors at once setting interrupts on end of block (48-bit), not returning until the operation
-        ///     is complete
-        /// </summary>
-        WriteMultipleFuaExt = 0xCE,
-
-        /// <summary>Writes a sector that will give an uncorrectable error on any read operation</summary>
-        WriteUncorrectableExt = 0x45,
-        #endregion Commands defined on ATA/ATAPI-8 rev. 3f
-
-        #region Commands defined on ATA/ATAPI Command Set 2 (ACS-2) rev. 2
-        /// <summary>Provides information for device optimization In SSDs, this contains trimming</summary>
-        DataSetManagement = 0x06,
-
-        /// <summary>Alters the device microcode, using DMA transfers</summary>
-        DownloadMicrocodeDma = 0x93,
-
-        /// <summary>Reads the content of the drive's buffer, using DMA transfers</summary>
-        ReadBufferDma = 0xE9,
-
-        /// <summary>Reads sectors using NCQ</summary>
-        ReadFpDmaQueued = 0x60,
-
-        /// <summary>Returns the indicated log to the host (48-bit)</summary>
-        ReadLogDmaExt = 0x47,
-
-        /// <summary>Requests SPC-4 style error data</summary>
-        RequestSenseDataExt = 0x0B, SanitizeCommands = 0xB4,
-
-        /// <summary>Executes a Security Protocol command that does not require a transfer of data</summary>
-        TrustedNonData = 0x5B,
-
-        /// <summary>Writes data to the drive's sector buffer, using DMA transfers</summary>
-        WriteBufferDma = 0xE8,
-
-        /// <summary>Writes sectors using NCQ</summary>
-        WriteFpDmaQueued = 0x61,
-        #endregion Commands defined on ATA/ATAPI Command Set 2 (ACS-2) rev. 2
-
-        #region Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
-        /// <summary>Sends <see cref="AtaNcqQueueManagementSubcommands" /></summary>
-        NcqQueueManagement = 0x63,
-
-        /// <summary>Sets the device date and time</summary>
-        SetDateAndTimeExt = 0x77,
-        #endregion Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
-
-        #region Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 6
-        NativeMaxAddress = 0x78
-        #endregion Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 6
-    }
-    #endregion ATA Commands
-
-    #region ATA SMART SubCommands
-    /// <summary>All known ATA SMART sub-commands</summary>
-    public enum AtaSmartSubCommands : byte
-    {
-        #region Commands defined on ATA-3 rev. 7b
-        /// <summary>Disables all SMART capabilities</summary>
-        Disable = 0xD9,
-
-        /// <summary>Enables/disables SMART attribute autosaving</summary>
-        EnableDisableAttributeAutosave = 0xD2,
-
-        /// <summary>Enables all SMART capabilities</summary>
-        Enable = 0xD8,
-
-        /// <summary>Returns the device's SMART attributes thresholds</summary>
-        ReadAttributeThresholds = 0xD1,
-
-        /// <summary>Returns the device's SMART attributes values</summary>
-        ReadAttributeValues = 0xD0,
-
-        /// <summary>Communicates device reliability status</summary>
-        ReturnStatus = 0xDA,
-
-        /// <summary>Saves any attribute values immediately</summary>
-        SaveAttributeValues = 0xD3,
-        #endregion Commands defined on ATA-3 rev. 7b
-
-        #region Commands defined on ATA/ATAPI-4 rev. 18
-        /// <summary>Causes the device to immediately initiate a SMART data collection and saves it to the device</summary>
-        ExecuteOfflineImmediate = 0xD4,
-
-        /// <summary>Returns the device's SMART attributes values</summary>
-        ReadData = ReadAttributeValues,
-        #endregion Commands defined on ATA/ATAPI-4 rev. 18
-
-        #region Commands defined on ATA/ATAPI-5 rev. 3
-        /// <summary>Returns the indicated log to the host</summary>
-        ReadLog = 0xD5,
-
-        /// <summary>Writes data to the indicated log</summary>
-        WriteLog = 0xD6
-        #endregion Commands defined on ATA/ATAPI-5 rev. 3
-    }
-    #endregion ATA SMART SubCommands
-
-    #region ATA Device Configuration Overlay SubCommands
-    /// <summary>All known ATA DEVICE CONFIGURATION sub-commands</summary>
-    public enum AtaDeviceConfigurationSubCommands : byte
-    {
-        #region Commands defined on ATA/ATAPI-6 rev. 3b
-        /// <summary>Disables any change made by <see cref="Set" /></summary>
-        Restore = 0xC0,
-
-        /// <summary>Prevents any <see cref="AtaDeviceConfigurationSubCommands" /> from working until a power down cycle.</summary>
-        FreezeLock = 0xC1,
-
-        /// <summary>Indicates the selectable commands, modes, and feature sets the device supports</summary>
-        Identify = 0xC2,
-
-        /// <summary>Modifies the commands, modes and features sets the device will obey to</summary>
-        Set = 0xC3
-        #endregion Commands defined on ATA/ATAPI-6 rev. 3b
-    }
-    #endregion ATA Device Configuration Overlay SubCommands
-
-    #region ATA SET MAX SubCommands
-    /// <summary>All known ATA SET MAX sub-commands</summary>
-    public enum AtaSetMaxSubCommands : byte
-    {
-        #region Commands defined on ATA/ATAPI-6 rev. 3b
-        /// <summary>Redefines the maximum user-accessible address space</summary>
-        Address = 0x00,
-
-        /// <summary>Disables any other <see cref="AtaSetMaxSubCommands" /> until power cycle</summary>
-        FreezeLock = 0x04,
-
-        /// <summary>
-        ///     Disables any other <see cref="AtaSetMaxSubCommands" /> except <see cref="UnLock" /> and
-        ///     <see cref="FreezeLock" /> until power cycle
-        /// </summary>
-        Lock = 0x02,
-
-        /// <summary>Sets the device password</summary>
-        SetPassword = 0x01,
-
-        /// <summary>Disables <see cref="Lock" /></summary>
-        UnLock = 0x03,
-        #endregion Commands defined on ATA/ATAPI-6 rev. 3b
-    }
-    #endregion ATA SET MAX SubCommands
-
-    #region ATA Non Volatile Cache SubCommands
-    /// <summary>All known ATA NV CACHE sub-commands</summary>
-    public enum AtaNonVolatileCacheSubCommands : byte
-    {
-        #region Commands defined on ATA/ATAPI-8 rev. 3f
-        /// <summary>Adds the specified LBA to the Non Volatile Cache</summary>
-        AddLbaToNvCache = 0x10,
-
-        /// <summary>Ensures there is enough free space in the Non Volatile Cache</summary>
-        FlushNvCache = 0x14,
-
-        /// <summary>Requests a list of LBAs actually stored in the Non Volatile Cache</summary>
-        QueryNvCachePinnedSet = 0x12,
-
-        /// <summary>Requests a list of LBAs accessed but not in the Non Volatile Cache</summary>
-        QueryNvCacheMisses = 0x13,
-
-        /// <summary>Removes the specified LBA from the Non Volatile Cache Pinned Set</summary>
-        RemoveLbaFromNvCache = 0x11,
-
-        /// <summary>Disables the Non Volatile Cache Power Mode <see cref="SetNvCachePowerMode" /></summary>
-        ReturnFromNvCachePowerMode = 0x01,
-
-        /// <summary>
-        ///     Enables the Non Volatile Cache Power Mode, so the device tries to serve all accesses from the Non Volatile
-        ///     Cache
-        /// </summary>
-        SetNvCachePowerMode = 0x00
-        #endregion Commands defined on ATA/ATAPI-8 rev. 3f
-    }
-    #endregion ATA Non Volatile Cache SubCommands
-
-    #region ATA Sanitize SubCommands
-    /// <summary>All known ATA SANITIZE sub-commands</summary>
-    public enum AtaSanitizeSubCommands : ushort
-    {
-        #region Commands defined on ATA/ATAPI Command Set 2 (ACS-2) rev. 2
-        /// <summary>Causes a block erase on all user data</summary>
-        BlockEraseExt = 0x0012,
-
-        /// <summary>Changes the internal encryption keys. Renders user data unusable</summary>
-        CryptoScrambleExt = 0x0011,
-
-        /// <summary>Fills user data with specified pattern</summary>
-        OverwriteExt = 0x0014,
-
-        /// <summary>Disables all <see cref="AtaSanitizeSubCommands" /> except <see cref="Status" /></summary>
-        FreezeLockExt = 0x0020,
-
-        /// <summary>Gets the status of the sanitizing</summary>
-        Status = 0x0000,
-        #endregion Commands defined on ATA/ATAPI Command Set 2 (ACS-2) rev. 2
-
-        #region Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
-        /// <summary>Disables the <see cref="FreezeLockExt" /> command</summary>
-        AntiFreezeLockExt = 0x0040
-        #endregion Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
-    }
-    #endregion ATA Sanitize SubCommands
-
-    #region ATA NCQ Queue Management SubCommands
-    /// <summary>All known ATA NCQ QUEUE MANAGEMENT sub-commands</summary>
-    public enum AtaNcqQueueManagementSubcommands : byte
-    {
-        #region Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
-        /// <summary>Aborts pending NCQ commands</summary>
-        AbortNcqQueue = 0x00,
-
-        /// <summary>Controls how NCQ Streaming commands are processed by the device</summary>
-        DeadlineHandling = 0x01,
-        #endregion Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
-    }
-    #endregion ATA NCQ Queue Management SubCommands
+    /// <summary>Sets drive parameters</summary>
+    SetFeatures = 0xEF,
 
     /// <summary>
-    ///     All known SASI commands Commands 0x00 to 0x1F are 6-byte Commands 0x20 to 0x3F are 10-byte Commands 0x40 to
-    ///     0x5F are 8-byte Commands 0xA0 to 0xBF are 12-byte
+    ///     Enables <see cref="ReadMultiple" /> and <see cref="WriteMultiple" /> and sets the block length for these
+    ///     commands
     /// </summary>
-    #region SASI Commands
-    public enum SasiCommands : byte
-    {
-        #region SASI Class 0 commands
-        /// <summary>Returns zero status if requested unit is on and ready. SASI rev. 0a</summary>
-        TestUnitReady = 0x00,
+    SetMultipleMode = 0xC6,
 
-        /// <summary>Sets the unit to a specific known state. SASI rev. 0a</summary>
-        RezeroUnit = 0x01,
+    /// <summary>Causes the drive to stop and sleep until a hardware or software reset</summary>
+    Sleep = 0xE6,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        RequestSyndrome = 0x02,
+    /// <summary>Causes the drive to stop and sleep until a hardware or software reset</summary>
+    SleepAlternate = 0x99,
 
-        /// <summary>Returns unit sense. SASI rev. 0a</summary>
-        RequestSense = 0x03,
+    /// <summary>Sets the drive to enter Standby mode</summary>
+    Standby = 0xE2,
 
-        /// <summary>Formats the entire media. SASI rev. 0a</summary>
-        FormatUnit = 0x04,
+    /// <summary>Sets the drive to enter Standby mode</summary>
+    StandbyAlternate = 0x96,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        CheckTrackFormat = 0x05,
+    /// <summary>Sets the drive to enter Standby mode, immediately</summary>
+    StandbyImmediate = 0xE0,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        FormatTrack = 0x06,
+    /// <summary>Sets the drive to enter Standby mode, immediately</summary>
+    StandbyImmediateAlternate = 0x94,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        FormatBadTrack = 0x06,
+    /// <summary>Writes sectors using PIO transfer</summary>
+    Write = 0x31,
 
-        /// <summary>Reads a block from the device. SASI rev. 0a</summary>
-        Read = 0x08,
+    /// <summary>Writes data to the drive's sector buffer</summary>
+    WriteBuffer = 0xE8,
 
-        /// <summary>SASI rev. 0a Unknown</summary>
-        WriteProtectSector = 0x09,
+    /// <summary>Writes sectors using DMA transfer</summary>
+    WriteDma = 0xCB,
 
-        /// <summary>Writes a block to the device. SASI rev. 0a</summary>
-        Write = 0x0A,
+    /// <summary>Writes sectors using DMA transfer, retrying on error</summary>
+    WriteDmaRetry = 0xCA,
 
-        /// <summary>Moves the device reading mechanism to the specified block. SASI rev. 0a</summary>
-        Seek = 0x0B,
+    /// <summary>Writes sectors with custom ECC</summary>
+    WriteLong = 0x33,
 
-        /// <summary>Found on a vendor source code</summary>
-        InitDriveCharacteristics = 0x0C,
+    /// <summary>Writes sectors with custom ECC, retrying on error</summary>
+    WriteLongRetry = 0x32,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        VerifyRestore = 0x0D,
+    /// <summary>Writes several sectors at once setting interrupts on end of block</summary>
+    WriteMultiple = 0xC5,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        AssignAlternateDiskTrack = 0x0E,
+    /// <summary>Writes the same data to several sector</summary>
+    WriteSame = 0xE9,
 
-        /// <summary>Writes a File Mark on the device. SASI rev. 0c</summary>
-        WriteFileMark = 0x0F,
+    /// <summary>Writes sectors using PIO transfer, retrying on error</summary>
+    WriteRetry = 0x30,
 
-        /// <summary>Reserves the device for use by the initiator. SASI rev. 0a</summary>
-        ReserveUnitOld = 0x12,
+    /// <summary>Writes sectors verifying them immediately after write</summary>
+    WriteVerify = 0x3C,
 
-        /// <summary>Gets information about a device ANSI X3T9.3 No. 185 (SASI)</summary>
-        Inquiry = 0x12,
+    /// <summary>Unknown vendor command</summary>
+    Vendor_8X = 0x80,
 
-        /// <summary>Release the device from the reservation. SASI rev. 0a</summary>
-        ReleaseUnitOld = 0x13,
+    /// <summary>Unknown vendor command</summary>
+    Vendor_9A = 0x9A,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        WriteProtectDrive = 0x14,
+    /// <summary>Unknown vendor command</summary>
+    VendorC0 = 0xC0,
 
-        /// <summary>Writes and verifies blocks to the device. SASI rev. 0c</summary>
-        WriteAndVerifyOld = 0x14,
+    /// <summary>Unknown vendor command</summary>
+    VendorC1 = 0xC1,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        ReleaseWriteProtect = 0x15,
+    /// <summary>Unknown vendor command</summary>
+    VendorC2 = 0xC2,
 
-        /// <summary>Verifies blocks. SASI rev. 0c</summary>
-        VerifyOld = 0x15,
+    /// <summary>Unknown vendor command</summary>
+    VendorC3 = 0xC3,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        ReadNoSeek = 0x16,
+    /// <summary>Unknown vendor command</summary>
+    VendorF0 = 0xF0,
 
-        /// <summary>Gets the number of blocks in device. SASI rev. 0c</summary>
-        ReadCapacityOld = 0x16,
+    /// <summary>Unknown vendor command</summary>
+    VendorF1 = 0xF1,
 
-        /// <summary>Reserves the device for use by the initiator. ANSI X3T9.3 No. 185 (SASI)</summary>
-        ReserveUnit = 0x16,
+    /// <summary>Unknown vendor command</summary>
+    VendorF2 = 0xF2,
 
-        /// <summary>Release the device from the reservation. ANSI X3T9.3 No. 185 (SASI)</summary>
-        ReleaseUnit = 0x17,
+    /// <summary>Unknown vendor command</summary>
+    VendorF3 = 0xF3,
 
-        /// <summary>Searches data on blocks SASI rev. 0a</summary>
-        SearchDataEqualOld = 0x17,
+    /// <summary>Unknown vendor command</summary>
+    VendorF4 = 0xF4,
 
-        /// <summary>Searches data on blocks using major than or equal comparison SASI rev. 0a</summary>
-        SearchDataHighOld = 0x18,
+    /// <summary>Unknown vendor command</summary>
+    VendorF5 = 0xF5,
 
-        /// <summary>Searches data on blocks using minor than or equal comparison SASI rev. 0a</summary>
-        SearchDataLowOld = 0x19,
+    /// <summary>Unknown vendor command</summary>
+    VendorF6 = 0xF6,
 
-        /// <summary>Reads analysis data from a device SASI rev. 0a</summary>
-        ReadDiagnosticOld = 0x1A,
+    /// <summary>Unknown vendor command</summary>
+    VendorF7 = 0xF7,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        VerifyData = 0x1B,
+    /// <summary>Unknown vendor command</summary>
+    VendorF8 = 0xF8,
 
-        /// <summary>Requests a device to run a diagnostic SASI rev. 0c</summary>
-        WriteDiagnosticOld = 0x1B,
+    /// <summary>Unknown vendor command</summary>
+    VendorF9 = 0xF9,
 
-        /// <summary>Requests the data after completion of a <see cref="WriteDiagnostic" /> ANSI X3T9.3 No. 185 (SASI)</summary>
-        ReadDiagnostic = 0x1C,
+    /// <summary>Unknown vendor command</summary>
+    VendorFa = 0xFA,
 
-        /// <summary>Requests the device to perform diagnostics ANSI X3T9.3 No. 185 (SASI)</summary>
-        WriteDiagnostic = 0x1D,
+    /// <summary>Unknown vendor command</summary>
+    VendorFb = 0xFB,
 
-        /// <summary>Gets information about a device SASI rev. 0c</summary>
-        InquiryOld = 0x1F,
-        #endregion SASI Class 0 commands
+    /// <summary>Unknown vendor command</summary>
+    VendorFc = 0xFC,
 
-        #region SASI Class 1 commands
-        /// <summary>SASI rev. 0a Unknown</summary>
-        Copy = 0x20,
+    /// <summary>Unknown vendor command</summary>
+    VendorFd = 0xFD,
 
-        /// <summary>SASI rev. 0a Unknown</summary>
-        Restore = 0x21,
+    /// <summary>Unknown vendor command</summary>
+    VendorFe = 0xFE,
 
-        /// <summary>SASI rev. 0a Unknown</summary>
-        Backup = 0x22,
+    /// <summary>Unknown vendor command</summary>
+    VendorFf = 0xFF,
+    #endregion Commands defined on ATA rev. 4c
 
-        /// <summary>SASI rev. 0a Unknown</summary>
-        SetBlockLimitsOlder = 0x26,
+    #region Commands defined on ATA-2 rev. 4c
+    /// <summary>Alters the device microcode</summary>
+    DownloadMicrocode = 0x92,
 
-        /// <summary>Sets write or read limits from a specified block SASI rev. 0c</summary>
-        SetBlockLimitsOld = 0x28,
+    /// <summary>Ejects the removable medium on the device</summary>
+    MediaEject = 0xED,
+    #endregion Commands defined on ATA-2 rev. 4c
 
-        /// <summary>Reads blocks from device ANSI X3T9.3 No. 185 (SASI)</summary>
-        ExtendedAddressRead = 0x28,
+    #region Commands defined on ATA-3 rev. 7b
+    /// <summary>Gets a sector containing drive identification and capabilities</summary>
+    IdentifyDriveDma = 0xEE,
 
-        /// <summary>Writes blocks to the device ANSI X3T9.3 No. 185 (SASI)</summary>
-        ExtendedAddressWrite = 0x2A,
+    /// <summary>Disables the security lock</summary>
+    SecurityDisablePassword = 0xF6,
 
-        /// <summary>Writes blocks to the device and then verifies them ANSI X3T9.3 No. 185 (SASI)</summary>
-        WriteAndVerify = 0x2E,
+    /// <summary>Enables usage of <see cref="SecurityEraseUnit" /> command</summary>
+    SecurityErasePrepare = 0xF3,
 
-        /// <summary>Verifies blocks on the device ANSI X3T9.3 No. 185 (SASI)</summary>
-        Verify = 0x2F,
+    /// <summary>Erases all user data and disables the security lock</summary>
+    SecurityEraseUnit = 0xF4,
 
-        /// <summary>Searches data on blocks ANSI X3T9.3 No. 185 (SASI)</summary>
-        SearchDataEqual = 0x31,
+    /// <summary>Sets the security freeze lock preventing any security command from working until hardware reset</summary>
+    SecurityFreezeLock = 0xF5,
 
-        /// <summary>Searches data on blocks using major than or equal comparison ANSI X3T9.3 No. 185 (SASI)</summary>
-        SearchDataHigh = 0x30,
+    /// <summary>Sets the device user or master password</summary>
+    SecuritySetPassword = 0xF1,
 
-        /// <summary>Searches data on blocks using minor than or equal comparison ANSI X3T9.3 No. 185 (SASI)</summary>
-        SearchDataLow = 0x32,
-        #endregion SASI Class 1 commands
+    /// <summary>Unlocks device</summary>
+    SecurityUnlock = 0xF2,
 
-        #region SASI Class 2 commands
-        /// <summary>Unknown SASI rev. 0a</summary>
-        Load = 0x40,
+    /// <summary>SMART operations</summary>
+    Smart = 0xB0,
+    #endregion Commands defined on ATA-3 rev. 7b
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        Unload = 0x41,
+    #region Commands defined on CompactFlash Specification
+    /// <summary>Pre-erases and conditions data sectors</summary>
+    EraseSectors = 0xC0,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        Rewind = 0x42,
+    /// <summary>Requests extended error information</summary>
+    RequestSense = 0x03,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        SpaceForward = 0x43,
+    /// <summary>Provides a way to determine the exact number of times a sector has been erases and programmed</summary>
+    TranslateSector = 0x87,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        SpaceForwardFileMark = 0x44,
+    /// <summary>
+    ///     For CompactFlash cards that do not support security mode, this commands is equal to <see cref="Nop" /> For
+    ///     those that do, this command is equal to <see cref="SecurityFreezeLock" />
+    /// </summary>
+    WearLevel = 0xF5,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        SpaceReverse = 0x45,
+    /// <summary>Writes a block of sectors without erasing them previously</summary>
+    WriteMultipleWithoutErase = 0xCD,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        SpaceReverseFileMark = 0x46,
+    /// <summary>Writes sectors without erasing them previously</summary>
+    WriteWithoutErase = 0x38,
+    #endregion Commands defined on CompactFlash Specification
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        TrackSelect = 0x47,
+    #region Commands defined on ATA/ATAPI-4 rev. 18
+    /// <summary>Resets a device</summary>
+    DeviceReset = 0x08,
 
-        /// <summary>Reads blocks from device SASI rev. 0a</summary>
-        Read8 = 0x48,
+    /// <summary>Requests the device to flush the write cache and write it to the media</summary>
+    FlushCache = 0xE7,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        ReadVerify = 0x49,
+    /// <summary>Gets media status</summary>
+    GetMediaStatus = 0xDA,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        ReadDiagnosticClass2 = 0x4A,
+    /// <summary>Gets a sector containing drive identification and capabilities, for ATA devices</summary>
+    IdentifyDevice = IdentifyDrive,
 
-        /// <summary>Writes blocks to device SASI rev. 0a</summary>
-        Write8 = 0x4B,
+    /// <summary>Gets a sector containing drive identification and capabilities, for ATAPI devices</summary>
+    IdentifyPacketDevice = 0xA1,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        WriteFileMarkClass2 = 0x4C,
+    /// <summary>Locks the media on the device</summary>
+    MediaLock = DoorLock,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        WriteExtended = 0x4D,
+    /// <summary>Unlocks the media on the device</summary>
+    MediaUnLock = DoorUnLock,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        WriteExtendedFileMark = 0x4E,
+    /// <summary>Sends a command packet</summary>
+    Packet = 0xA0,
 
-        /// <summary>Unknown SASI rev. 0a</summary>
-        WriteErase = 0x4F,
+    /// <summary>Queues a read of sectors</summary>
+    ReadDmaQueued = 0xC7,
 
-        /// <summary>Writes and verifies blocks to the device. SASI rev. 0c</summary>
-        WriteVerify8 = 0x54,
+    /// <summary>Returns the native maximum address in factory default condition</summary>
+    ReadNativeMaxAddress = 0xF8,
 
-        /// <summary>Verifies blocks. SASI rev. 0c</summary>
-        Verify8 = 0x55,
+    /// <summary>Used to provide data transfer and/or status of a previous command (queue or packet)</summary>
+    Service = 0xA2,
 
-        /// <summary>Searches data on blocks using major than or equal comparison SASI rev. 0c</summary>
-        SearchDataHigh8 = 0x57,
+    /// <summary>Redefines the maximum user-accessible address space</summary>
+    SetMaxAddress = 0xF9,
 
-        /// <summary>Searches data on blocks SASI rev. 0c</summary>
-        SearchDataEqual8 = 0x58,
+    /// <summary>Queues a write of sectors</summary>
+    WriteDmaQueued = 0xCC,
+    #endregion Commands defined on ATA/ATAPI-4 rev. 18
 
-        /// <summary>Searches data on blocks using minor than or equal comparison SASI rev. 0c</summary>
-        SearchDataLow8 = 0x59,
-        #endregion SASI Class 2 commands
+    #region Commands defined on ATA/ATAPI-6 rev. 3b
+    /// <summary>Determines if the device supports the Media Card Pass Through Command feature set</summary>
+    CheckMediaCardType = 0xD1,
 
-        #region SASI Class 3 commands
-        /// <summary>SASI rev. 0a</summary>
-        Skip = 0x60,
+    /// <summary>Device Configuration Overlay feature set</summary>
+    DeviceConfiguration = 0xB1,
 
-        /// <summary>SASI rev. 0a</summary>
-        Space = 0x61,
+    /// <summary>Requests the device to flush the write cache and write it to the media (48-bit)</summary>
+    FlushCacheExt = 0xEA,
 
-        /// <summary>SASI rev. 0a</summary>
-        Return = 0x62,
+    /// <summary>Reads sectors using DMA transfer, retrying on error (48-bit)</summary>
+    ReadDmaExt = 0x25,
 
-        /// <summary>SASI rev. 0a</summary>
-        Tab = 0x63,
+    /// <summary>(48-bit) Queues a read of sectors</summary>
+    ReadDmaQueuedExt = 0x26,
 
-        /// <summary>SASI rev. 0a</summary>
-        ReadControl = 0x64,
+    /// <summary>Reads sectors using PIO transfer, retrying on error (48-bit)</summary>
+    ReadExt = 0x24,
 
-        /// <summary>SASI rev. 0a</summary>
-        Write3 = 0x65,
+    /// <summary>Returns the indicated log to the host (48-bit)</summary>
+    ReadLogExt = 0x2F,
 
-        /// <summary>SASI rev. 0a</summary>
-        WriteControl = 0x66,
-        #endregion SASI Class 3 commands
+    /// <summary>Reads multiple sectors generating interrupts at block transfers (48-bit)</summary>
+    ReadMultipleExt = 0x29,
 
-        #region SASI Class 5 commands
-        /// <summary>Gets the number of blocks in device. ANSI X3T9.3 No. 185 (SASI)</summary>
-        ReadCapacity = 0xA5,
+    /// <summary>Returns the native maximum address in factory default condition (48-bit)</summary>
+    ReadNativeMaxAddressExt = 0x27,
 
-        /// <summary>Sets write or read limits from a specified block ANSI X3T9.3 No. 185 (SASI)</summary>
-        SetBlockLimits = 0xA9,
-        #endregion SASI Class 5 commands
+    /// <summary>Verifies sectors readability without transferring them, retrying on error (48-bit)</summary>
+    ReadVerifyExt = 0x42,
 
-        #region SASI Class 6 commands
-        /// <summary>SASI rev. 0a</summary>
-        DefineFloppyDiskTrackFormat = 0xC0,
+    /// <summary>Sends a SET MAX subcommand, <see cref="AtaSetMaxSubCommands" /></summary>
+    SetMaxCommands = 0xF9,
 
-        /// <summary>Unknown vendor command in X68000</summary>
-        Specify = 0xC2,
+    /// <summary>Redefines the maximum user-accessible address space (48-bit)</summary>
+    SetMaxAddressExt = 0x37,
 
-        /// <summary>SASI rev. 0a</summary>
-        FormatDriveErrorMap = 0xC4,
+    /// <summary>Writes sectors using DMA transfer, retrying on error (48-bit)</summary>
+    WriteDmaExt = 0x35,
 
-        /// <summary>SASI rev. 0a</summary>
-        ReadErrorMap = 0xC5,
+    /// <summary>Queues a write of sectors (48-bit)</summary>
+    WriteDmaQueuedExt = 0x36,
 
-        /// <summary>SASI rev. 0a</summary>
-        ReadDriveType = 0xC6,
-        #endregion SASI Class 6 commands
+    /// <summary>Writes sectors using PIO transfer, retrying on error (48-bit)</summary>
+    WriteExt = 0x34,
 
-        #region SASI Class 7 commands
-        /// <summary>SASI rev. 0a</summary>
-        RamDiagnostic = 0xE0,
+    /// <summary>Writes data to the indicated log (48-bit)</summary>
+    WriteLogExt = 0x3F,
 
-        /// <summary>SASI rev. 0a</summary>
-        WriteEcc = 0xE1,
+    /// <summary>Writes several sectors at once setting interrupts on end of block (48-bit)</summary>
+    WriteMultipleExt = 0x39,
+    #endregion Commands defined on ATA/ATAPI-6 rev. 3b
 
-        /// <summary>SASI rev. 0a</summary>
-        ReadId = 0xE2,
+    #region Commands defined on ATA/ATAPI-7 rev. 4b
+    /// <summary>Configures the operating parameters for a stream</summary>
+    ConfigureStream = 0x51,
 
-        /// <summary>SASI rev. 0a</summary>
-        DriveDiagnostic = 0xE3,
+    /// <summary>Reads data on an allotted time using DMA</summary>
+    ReadStreamDmaExt = 0x2A,
 
-        /// <summary>Found on a vendor source code</summary>
-        ControllerDiagnostic = 0xE4,
+    /// <summary>Reads data on an allotted time using PIO</summary>
+    ReadStreamExt = 0x2B,
 
-        /// <summary>Found on a vendor document</summary>
-        ReadLong = 0xE5,
+    /// <summary>Writes data on an allotted time using DMA</summary>
+    WriteStreamDmaExt = 0x3A,
 
-        /// <summary>Found on a vendor document</summary>
-        WriteLong = 0xE6
-        #endregion SASI Class 7 commands
-    }
-    #endregion SASI Commands
+    /// <summary>Writes data on an allotted time using PIO</summary>
+    WriteStreamExt = 0x3B,
+    #endregion Commands defined on ATA/ATAPI-7 rev. 4b
 
-    #region SCSI Commands
-    /// <summary>All known SCSI and ATAPI commands</summary>
-    public enum ScsiCommands : byte
-    {
-        #region SCSI Primary Commands (SPC)
-        /// <summary>Commands used to obtain information about the access controls that are active SPC-4 rev. 16</summary>
-        AccessControlIn = 0x86,
+    #region Commands defined on ATA/ATAPI-8 rev. 3f
+    /// <summary>Sends a Non Volatile Cache subcommand. <see cref="AtaNonVolatileCacheSubCommands" /></summary>
+    NonVolatileCacheCommand = 0xB6,
 
-        /// <summary>Commands used to limit or grant access to LUNs SPC-4 rev. 16</summary>
-        AccessControlOut = 0x87,
+    /// <summary>Retrieves security protocol information or the results from <see cref="TrustedSend" /> commands</summary>
+    TrustedReceive = 0x5C,
 
-        /// <summary>Modifies the operating definition of the device with respect to commands. SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ChangeDefinition = 0x40,
+    /// <summary>
+    ///     Retrieves security protocol information or the results from <see cref="TrustedSend" /> commands, using DMA
+    ///     transfers
+    /// </summary>
+    TrustedReceiveDma = 0x5D,
 
-        /// <summary>Compares data between two devices ECMA-111 (SCSI-1)</summary>
-        Compare = 0x39,
+    /// <summary>Sends one or more Security Protocol commands</summary>
+    TrustedSend = 0x5E,
 
-        /// <summary>Copies data between two devices ECMA-111 (SCSI-1)</summary>
-        Copy = 0x18,
+    /// <summary>Sends one or more Security Protocol commands, using DMA transfers</summary>
+    TrustedSendDma = 0x5F,
 
-        /// <summary>Copies data between two devices and verifies the copy is correct. ECMA-111 (SCSI-1)</summary>
-        CopyAndVerify = 0x3A,
+    /// <summary>Writes sectors using DMA transfer, retrying on error (48-bit), not returning until the operation is complete</summary>
+    WriteDmaFuaExt = 0x3D,
 
-        /// <summary>Copies data between two devices SPC-2 rev. 20</summary>
-        ExtendedCopy = 0x83,
+    /// <summary>Queues a write of sectors (48-bit), not returning until the operation is complete</summary>
+    WriteDmaQueuedFuaExt = 0x3E,
 
-        /// <summary>Requests information about the device ECMA-111 (SCSI-1)</summary>
-        Inquiry = SasiCommands.Inquiry,
+    /// <summary>
+    ///     Writes several sectors at once setting interrupts on end of block (48-bit), not returning until the operation
+    ///     is complete
+    /// </summary>
+    WriteMultipleFuaExt = 0xCE,
 
-        /// <summary>Manages device statistics SCSI-2 X3T9.2/375R rev. 10l</summary>
-        LogSelect = 0x4C,
+    /// <summary>Writes a sector that will give an uncorrectable error on any read operation</summary>
+    WriteUncorrectableExt = 0x45,
+    #endregion Commands defined on ATA/ATAPI-8 rev. 3f
 
-        /// <summary>Gets device statistics SCSI-2 X3T9.2/375R rev. 10l</summary>
-        LogSense = 0x4D,
+    #region Commands defined on ATA/ATAPI Command Set 2 (ACS-2) rev. 2
+    /// <summary>Provides information for device optimization In SSDs, this contains trimming</summary>
+    DataSetManagement = 0x06,
 
-        /// <summary>Retrieves management protocol information SPC-2 rev. 20</summary>
-        ManagementProtocolIn = 0xA3,
+    /// <summary>Alters the device microcode, using DMA transfers</summary>
+    DownloadMicrocodeDma = 0x93,
 
-        /// <summary>Transfers management protocol information SPC-2 rev. 20</summary>
-        ManagementProtocolOut = 0xA4,
+    /// <summary>Reads the content of the drive's buffer, using DMA transfers</summary>
+    ReadBufferDma = 0xE9,
 
-        /// <summary>Sets device parameters ECMA-111 (SCSI-1)</summary>
-        ModeSelect = 0x15,
+    /// <summary>Reads sectors using NCQ</summary>
+    ReadFpDmaQueued = 0x60,
 
-        /// <summary>Sets device parameters SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ModeSelect10 = 0x55,
+    /// <summary>Returns the indicated log to the host (48-bit)</summary>
+    ReadLogDmaExt = 0x47,
 
-        /// <summary>Gets device parameters ECMA-111 (SCSI-1)</summary>
-        ModeSense = 0x1A,
+    /// <summary>Requests SPC-4 style error data</summary>
+    RequestSenseDataExt = 0x0B, SanitizeCommands = 0xB4,
 
-        /// <summary>Gets device parameters SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ModeSense10 = 0x5A,
+    /// <summary>Executes a Security Protocol command that does not require a transfer of data</summary>
+    TrustedNonData = 0x5B,
 
-        /// <summary>Obtains information about persistent reservations and reservation keys SPC-1 rev. 10</summary>
-        PersistentReserveIn = 0x5E,
+    /// <summary>Writes data to the drive's sector buffer, using DMA transfers</summary>
+    WriteBufferDma = 0xE8,
 
-        /// <summary>Reserves a LUN or an extent within a LUN for exclusive or shared use SPC-1 rev. 10</summary>
-        PersistentReserveOut = 0x5F,
+    /// <summary>Writes sectors using NCQ</summary>
+    WriteFpDmaQueued = 0x61,
+    #endregion Commands defined on ATA/ATAPI Command Set 2 (ACS-2) rev. 2
 
-        /// <summary>Requests the device to disable or enable the removal of the medium inside it ECMA-111 (SCSI-1)</summary>
-        PreventAllowMediumRemoval = 0x1E,
+    #region Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
+    /// <summary>Sends <see cref="AtaNcqQueueManagementSubcommands" /></summary>
+    NcqQueueManagement = 0x63,
 
-        /// <summary>Reads attribute values from medium auxiliary memory SPC-3 rev. 21b</summary>
-        ReadAttribute = 0x8C,
+    /// <summary>Sets the device date and time</summary>
+    SetDateAndTimeExt = 0x77,
+    #endregion Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
 
-        /// <summary>Reads the device buffer SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ReadBuffer = 0x3C,
+    #region Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 6
+    NativeMaxAddress = 0x78
+    #endregion Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 6
+}
+#endregion ATA Commands
+
+#region ATA SMART SubCommands
+/// <summary>All known ATA SMART sub-commands</summary>
+public enum AtaSmartSubCommands : byte
+{
+    #region Commands defined on ATA-3 rev. 7b
+    /// <summary>Disables all SMART capabilities</summary>
+    Disable = 0xD9,
 
-        /// <summary>Reads the media serial number SPC-3 rev. 21b</summary>
-        ReadSerialNumber = 0xAB,
+    /// <summary>Enables/disables SMART attribute autosaving</summary>
+    EnableDisableAttributeAutosave = 0xD2,
 
-        /// <summary>Receives information about a previous or current <see cref="ExtendedCopy" /> SPC-2 rev. 20</summary>
-        ReceiveCopyResults = 0x84,
+    /// <summary>Enables all SMART capabilities</summary>
+    Enable = 0xD8,
 
-        /// <summary>Requests the data after completion of a <see cref="SendDiagnostic" /> ECMA-111 (SCSI-1)</summary>
-        ReceiveDiagnostic = SasiCommands.ReadDiagnostic,
+    /// <summary>Returns the device's SMART attributes thresholds</summary>
+    ReadAttributeThresholds = 0xD1,
+
+    /// <summary>Returns the device's SMART attributes values</summary>
+    ReadAttributeValues = 0xD0,
+
+    /// <summary>Communicates device reliability status</summary>
+    ReturnStatus = 0xDA,
+
+    /// <summary>Saves any attribute values immediately</summary>
+    SaveAttributeValues = 0xD3,
+    #endregion Commands defined on ATA-3 rev. 7b
+
+    #region Commands defined on ATA/ATAPI-4 rev. 18
+    /// <summary>Causes the device to immediately initiate a SMART data collection and saves it to the device</summary>
+    ExecuteOfflineImmediate = 0xD4,
+
+    /// <summary>Returns the device's SMART attributes values</summary>
+    ReadData = ReadAttributeValues,
+    #endregion Commands defined on ATA/ATAPI-4 rev. 18
+
+    #region Commands defined on ATA/ATAPI-5 rev. 3
+    /// <summary>Returns the indicated log to the host</summary>
+    ReadLog = 0xD5,
+
+    /// <summary>Writes data to the indicated log</summary>
+    WriteLog = 0xD6
+    #endregion Commands defined on ATA/ATAPI-5 rev. 3
+}
+#endregion ATA SMART SubCommands
+
+#region ATA Device Configuration Overlay SubCommands
+/// <summary>All known ATA DEVICE CONFIGURATION sub-commands</summary>
+public enum AtaDeviceConfigurationSubCommands : byte
+{
+    #region Commands defined on ATA/ATAPI-6 rev. 3b
+    /// <summary>Disables any change made by <see cref="Set" /></summary>
+    Restore = 0xC0,
+
+    /// <summary>Prevents any <see cref="AtaDeviceConfigurationSubCommands" /> from working until a power down cycle.</summary>
+    FreezeLock = 0xC1,
+
+    /// <summary>Indicates the selectable commands, modes, and feature sets the device supports</summary>
+    Identify = 0xC2,
+
+    /// <summary>Modifies the commands, modes and features sets the device will obey to</summary>
+    Set = 0xC3
+    #endregion Commands defined on ATA/ATAPI-6 rev. 3b
+}
+#endregion ATA Device Configuration Overlay SubCommands
+
+#region ATA SET MAX SubCommands
+/// <summary>All known ATA SET MAX sub-commands</summary>
+public enum AtaSetMaxSubCommands : byte
+{
+    #region Commands defined on ATA/ATAPI-6 rev. 3b
+    /// <summary>Redefines the maximum user-accessible address space</summary>
+    Address = 0x00,
+
+    /// <summary>Disables any other <see cref="AtaSetMaxSubCommands" /> until power cycle</summary>
+    FreezeLock = 0x04,
+
+    /// <summary>
+    ///     Disables any other <see cref="AtaSetMaxSubCommands" /> except <see cref="UnLock" /> and
+    ///     <see cref="FreezeLock" /> until power cycle
+    /// </summary>
+    Lock = 0x02,
+
+    /// <summary>Sets the device password</summary>
+    SetPassword = 0x01,
+
+    /// <summary>Disables <see cref="Lock" /></summary>
+    UnLock = 0x03,
+    #endregion Commands defined on ATA/ATAPI-6 rev. 3b
+}
+#endregion ATA SET MAX SubCommands
+
+#region ATA Non Volatile Cache SubCommands
+/// <summary>All known ATA NV CACHE sub-commands</summary>
+public enum AtaNonVolatileCacheSubCommands : byte
+{
+    #region Commands defined on ATA/ATAPI-8 rev. 3f
+    /// <summary>Adds the specified LBA to the Non Volatile Cache</summary>
+    AddLbaToNvCache = 0x10,
+
+    /// <summary>Ensures there is enough free space in the Non Volatile Cache</summary>
+    FlushNvCache = 0x14,
+
+    /// <summary>Requests a list of LBAs actually stored in the Non Volatile Cache</summary>
+    QueryNvCachePinnedSet = 0x12,
+
+    /// <summary>Requests a list of LBAs accessed but not in the Non Volatile Cache</summary>
+    QueryNvCacheMisses = 0x13,
+
+    /// <summary>Removes the specified LBA from the Non Volatile Cache Pinned Set</summary>
+    RemoveLbaFromNvCache = 0x11,
+
+    /// <summary>Disables the Non Volatile Cache Power Mode <see cref="SetNvCachePowerMode" /></summary>
+    ReturnFromNvCachePowerMode = 0x01,
+
+    /// <summary>
+    ///     Enables the Non Volatile Cache Power Mode, so the device tries to serve all accesses from the Non Volatile
+    ///     Cache
+    /// </summary>
+    SetNvCachePowerMode = 0x00
+    #endregion Commands defined on ATA/ATAPI-8 rev. 3f
+}
+#endregion ATA Non Volatile Cache SubCommands
+
+#region ATA Sanitize SubCommands
+/// <summary>All known ATA SANITIZE sub-commands</summary>
+public enum AtaSanitizeSubCommands : ushort
+{
+    #region Commands defined on ATA/ATAPI Command Set 2 (ACS-2) rev. 2
+    /// <summary>Causes a block erase on all user data</summary>
+    BlockEraseExt = 0x0012,
+
+    /// <summary>Changes the internal encryption keys. Renders user data unusable</summary>
+    CryptoScrambleExt = 0x0011,
+
+    /// <summary>Fills user data with specified pattern</summary>
+    OverwriteExt = 0x0014,
+
+    /// <summary>Disables all <see cref="AtaSanitizeSubCommands" /> except <see cref="Status" /></summary>
+    FreezeLockExt = 0x0020,
+
+    /// <summary>Gets the status of the sanitizing</summary>
+    Status = 0x0000,
+    #endregion Commands defined on ATA/ATAPI Command Set 2 (ACS-2) rev. 2
+
+    #region Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
+    /// <summary>Disables the <see cref="FreezeLockExt" /> command</summary>
+    AntiFreezeLockExt = 0x0040
+    #endregion Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
+}
+#endregion ATA Sanitize SubCommands
 
-        /// <summary>Releases a previously reserved LUN or extents ECMA-111 (SCSI-1)</summary>
-        Release = SasiCommands.ReleaseUnit,
+#region ATA NCQ Queue Management SubCommands
+/// <summary>All known ATA NCQ QUEUE MANAGEMENT sub-commands</summary>
+public enum AtaNcqQueueManagementSubcommands : byte
+{
+    #region Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
+    /// <summary>Aborts pending NCQ commands</summary>
+    AbortNcqQueue = 0x00,
 
-        /// <summary>Releases a previously reserved LUN or extents SPC-1 rev. 10</summary>
-        Release10 = 0x57,
+    /// <summary>Controls how NCQ Streaming commands are processed by the device</summary>
+    DeadlineHandling = 0x01,
+    #endregion Commands defined on ATA/ATAPI Command Set 3 (ACS-3) rev. 5
+}
+#endregion ATA NCQ Queue Management SubCommands
 
-        /// <summary>Requests the LUNs that are present on the device SPC-1 rev. 10</summary>
-        ReportLuns = 0xA0,
+/// <summary>
+///     All known SASI commands Commands 0x00 to 0x1F are 6-byte Commands 0x20 to 0x3F are 10-byte Commands 0x40 to
+///     0x5F are 8-byte Commands 0xA0 to 0xBF are 12-byte
+/// </summary>
+#region SASI Commands
+public enum SasiCommands : byte
+{
+    #region SASI Class 0 commands
+    /// <summary>Returns zero status if requested unit is on and ready. SASI rev. 0a</summary>
+    TestUnitReady = 0x00,
 
-        /// <summary>Requests the device's sense ECMA-111 (SCSI-1)</summary>
-        RequestSense = SasiCommands.RequestSense,
+    /// <summary>Sets the unit to a specific known state. SASI rev. 0a</summary>
+    RezeroUnit = 0x01,
 
-        /// <summary>Reserves a LUN or extent ECMA-111 (SCSI-1)</summary>
-        Reserve = SasiCommands.ReserveUnit,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    RequestSyndrome = 0x02,
 
-        /// <summary>Reserves a LUN or extent SPC-1 rev. 10</summary>
-        Reserve10 = 0x56,
+    /// <summary>Returns unit sense. SASI rev. 0a</summary>
+    RequestSense = 0x03,
 
-        /// <summary>Retrieves security protocol information SPC-4 rev. 16</summary>
-        SecurityProtocolIn = 0xA2,
+    /// <summary>Formats the entire media. SASI rev. 0a</summary>
+    FormatUnit = 0x04,
 
-        /// <summary>Transfers security protocol information SPC-4 rev. 16</summary>
-        SecurityProtocolOut = 0xB5,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    CheckTrackFormat = 0x05,
 
-        /// <summary>Requests the device to perform diagnostics ECMA-111 (SCSI-1)</summary>
-        SendDiagnostic = SasiCommands.WriteDiagnostic,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    FormatTrack = 0x06,
 
-        /// <summary>Extended commands SPC-4</summary>
-        ServiceActionIn = 0x9E,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    FormatBadTrack = 0x06,
 
-        /// <summary>Extended commands SPC-4</summary>
-        ServiceActionOut = 0x9F,
+    /// <summary>Reads a block from the device. SASI rev. 0a</summary>
+    Read = 0x08,
 
-        /// <summary>Checks if a LUN is ready to access its medium ECMA-111 (SCSI-1)</summary>
-        TestUnitReady = SasiCommands.TestUnitReady,
+    /// <summary>SASI rev. 0a Unknown</summary>
+    WriteProtectSector = 0x09,
 
-        /// <summary>Writes attribute values to medium auxiliary memory SPC-3 rev. 21b</summary>
-        WriteAttribute = 0x8D,
+    /// <summary>Writes a block to the device. SASI rev. 0a</summary>
+    Write = 0x0A,
 
-        /// <summary>Writes to the device's buffer SCSI-2 X3T9.2/375R rev. 10l</summary>
-        WriteBuffer = 0x3B,
-        #endregion SCSI Primary Commands (SPC)
+    /// <summary>Moves the device reading mechanism to the specified block. SASI rev. 0a</summary>
+    Seek = 0x0B,
 
-        #region SCSI Block Commands (SBC)
-        /// <summary>Compares blocks with sent data, and if equal, writes those block to device, atomically SBC-3 rev. 25</summary>
-        CompareAndWrite = 0x89,
+    /// <summary>Found on a vendor source code</summary>
+    InitDriveCharacteristics = 0x0C,
 
-        /// <summary>Formats the medium into addressable logical blocks ECMA-111 (SCSI-1)</summary>
-        FormatUnit = SasiCommands.FormatUnit, FormatWithPreset = 0x38,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    VerifyRestore = 0x0D,
 
-        /// <summary>Locks blocks from eviction of device's cache SCSI-2 X3T9.2/375R rev. 10l</summary>
-        LockUnlockCache = 0x36,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    AssignAlternateDiskTrack = 0x0E,
 
-        /// <summary>Locks blocks from eviction of device's cache SBC-2 rev. 4</summary>
-        LockUnlockCache16 = 0x92,
+    /// <summary>Writes a File Mark on the device. SASI rev. 0c</summary>
+    WriteFileMark = 0x0F,
 
-        /// <summary>
-        ///     Requests the device to perform the following uninterrupted series of actions: 1.- Read the specified blocks
-        ///     2.- Transfer blocks from the data out buffer 3.- Perform an OR operation between the read blocks and the buffer 4.-
-        ///     Write the buffer to the blocks SBC-3 rev. 16
-        /// </summary>
-        OrWrite = 0x8B,
+    /// <summary>Reserves the device for use by the initiator. SASI rev. 0a</summary>
+    ReserveUnitOld = 0x12,
 
-        /// <summary>Transfers requested blocks to devices' cache SCSI-2 X3T9.2/375R rev. 10l</summary>
-        PreFetch = 0x34,
+    /// <summary>Gets information about a device ANSI X3T9.3 No. 185 (SASI)</summary>
+    Inquiry = 0x12,
 
-        /// <summary>Transfers requested blocks to devices' cache SBC-3 rev. 16</summary>
-        PreFetch16 = 0x90,
+    /// <summary>Release the device from the reservation. SASI rev. 0a</summary>
+    ReleaseUnitOld = 0x13,
 
-        /// <summary>Reads blocks from device ECMA-111 (SCSI-1)</summary>
-        Read = SasiCommands.Read,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    WriteProtectDrive = 0x14,
 
-        /// <summary>Reads blocks from device ECMA-111 (SCSI-1)</summary>
-        Read10 = SasiCommands.ExtendedAddressRead,
+    /// <summary>Writes and verifies blocks to the device. SASI rev. 0c</summary>
+    WriteAndVerifyOld = 0x14,
 
-        /// <summary>Reads blocks from device SBC-2 rev. 4</summary>
-        Read16 = 0x88,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    ReleaseWriteProtect = 0x15,
 
-        /// <summary>Gets device capacity ECMA-111 (SCSI-1)</summary>
-        ReadCapacity = 0x25,
+    /// <summary>Verifies blocks. SASI rev. 0c</summary>
+    VerifyOld = 0x15,
 
-        /// <summary>Gets device's defect data SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ReadDefectData = 0x37,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    ReadNoSeek = 0x16,
 
-        /// <summary>
-        ///     Reads blocks from device in a vendor-specific way that should include the ECC alongside the data SCSI-2
-        ///     X3T9.2/375R rev. 10l
-        /// </summary>
-        ReadLong = 0x3E,
+    /// <summary>Gets the number of blocks in device. SASI rev. 0c</summary>
+    ReadCapacityOld = 0x16,
 
-        /// <summary>Requests the device to reassign the defective blocks to another area of the medium ECMA-111 (SCSI-1)</summary>
-        ReassignBlocks = 0x07,
+    /// <summary>Reserves the device for use by the initiator. ANSI X3T9.3 No. 185 (SASI)</summary>
+    ReserveUnit = 0x16,
 
-        /// <summary>Requests the target write to the medium the XOR data generated from the specified source devices SBC-1 rev. 8c</summary>
-        Rebuild = 0x81,
+    /// <summary>Release the device from the reservation. ANSI X3T9.3 No. 185 (SASI)</summary>
+    ReleaseUnit = 0x17,
 
-        /// <summary>
-        ///     Requests the target write to the buffer the XOR data from its own medium and the specified source devices
-        ///     SBC-1 rev. 8c
-        /// </summary>
-        Regenerate = 0x82,
+    /// <summary>Searches data on blocks SASI rev. 0a</summary>
+    SearchDataEqualOld = 0x17,
 
-        /// <summary>Requests the device to set the LUN in a vendor specific state ECMA-111 (SCSI-1)</summary>
-        RezeroUnit = SasiCommands.RezeroUnit, Sanitize = 0x48,
+    /// <summary>Searches data on blocks using major than or equal comparison SASI rev. 0a</summary>
+    SearchDataHighOld = 0x18,
 
-        /// <summary>Searches data on blocks ECMA-111 (SCSI-1)</summary>
-        SearchDataEqual = SasiCommands.SearchDataEqual,
+    /// <summary>Searches data on blocks using minor than or equal comparison SASI rev. 0a</summary>
+    SearchDataLowOld = 0x19,
 
-        /// <summary>Searches data on blocks using major than or equal comparison ECMA-111 (SCSI-1)</summary>
-        SearchDataHigh = SasiCommands.SearchDataHigh,
+    /// <summary>Reads analysis data from a device SASI rev. 0a</summary>
+    ReadDiagnosticOld = 0x1A,
 
-        /// <summary>Searches data on blocks using minor than or equal comparison ECMA-111 (SCSI-1)</summary>
-        SearchDataLow = SasiCommands.SearchDataLow,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    VerifyData = 0x1B,
 
-        /// <summary>Requests the device to seek to a specified blocks ECMA-111 (SCSI-1)</summary>
-        Seek = SasiCommands.Seek,
+    /// <summary>Requests a device to run a diagnostic SASI rev. 0c</summary>
+    WriteDiagnosticOld = 0x1B,
 
-        /// <summary>Requests the device to seek to a specified blocks ECMA-111 (SCSI-1)</summary>
-        Seek10 = 0x2B,
+    /// <summary>Requests the data after completion of a <see cref="WriteDiagnostic" /> ANSI X3T9.3 No. 185 (SASI)</summary>
+    ReadDiagnostic = 0x1C,
 
-        /// <summary>Defines the range within which subsequent linked commands may operate ECMA-111 (SCSI-1)</summary>
-        SetLimits = 0x33,
+    /// <summary>Requests the device to perform diagnostics ANSI X3T9.3 No. 185 (SASI)</summary>
+    WriteDiagnostic = 0x1D,
 
-        /// <summary>Requests the device to enable or disable the LUN for media access operations ECMA-111 (SCSI-1)</summary>
-        StartStopUnit = 0x1B,
+    /// <summary>Gets information about a device SASI rev. 0c</summary>
+    InquiryOld = 0x1F,
+    #endregion SASI Class 0 commands
 
-        /// <summary>Ensures that the blocks in the cache are written to the medium SCSI-2 X3T9.2/375R rev. 10l</summary>
-        SynchronizeCache = 0x35,
+    #region SASI Class 1 commands
+    /// <summary>SASI rev. 0a Unknown</summary>
+    Copy = 0x20,
 
-        /// <summary>Ensures that the blocks in the cache are written to the medium SBC-2 rev. 4</summary>
-        SynchronizeCache16 = 0x91,
+    /// <summary>SASI rev. 0a Unknown</summary>
+    Restore = 0x21,
 
-        /// <summary>Unmaps one or more LBAs In SSDs, this is trimming SBC-3 rev. 25</summary>
-        Unmap = 0x42,
+    /// <summary>SASI rev. 0a Unknown</summary>
+    Backup = 0x22,
 
-        /// <summary>Verifies blocks on the device ECMA-111 (SCSI-1)</summary>
-        Verify10 = SasiCommands.Verify,
+    /// <summary>SASI rev. 0a Unknown</summary>
+    SetBlockLimitsOlder = 0x26,
 
-        /// <summary>Verifies blocks on the device SBC-2 rev. 4</summary>
-        Verify16 = 0x8F,
+    /// <summary>Sets write or read limits from a specified block SASI rev. 0c</summary>
+    SetBlockLimitsOld = 0x28,
 
-        /// <summary>Writes blocks to the device ECMA-111 (SCSI-1)</summary>
-        Write = SasiCommands.Write,
+    /// <summary>Reads blocks from device ANSI X3T9.3 No. 185 (SASI)</summary>
+    ExtendedAddressRead = 0x28,
 
-        /// <summary>Writes blocks to the device ECMA-111 (SCSI-1)</summary>
-        Write10 = SasiCommands.ExtendedAddressWrite,
+    /// <summary>Writes blocks to the device ANSI X3T9.3 No. 185 (SASI)</summary>
+    ExtendedAddressWrite = 0x2A,
 
-        /// <summary>Writes blocks to the device SBC-2 rev. 4</summary>
-        Write16 = 0x8A,
+    /// <summary>Writes blocks to the device and then verifies them ANSI X3T9.3 No. 185 (SASI)</summary>
+    WriteAndVerify = 0x2E,
 
-        /// <summary>Writes blocks to the device and then verifies them ECMA-111 (SCSI-1)</summary>
-        WriteAndVerify = SasiCommands.WriteAndVerify,
+    /// <summary>Verifies blocks on the device ANSI X3T9.3 No. 185 (SASI)</summary>
+    Verify = 0x2F,
 
-        /// <summary>Writes blocks to the device and then verifies them SBC-2 rev. 4</summary>
-        WriteAndVerify16 = 0x8E,
+    /// <summary>Searches data on blocks ANSI X3T9.3 No. 185 (SASI)</summary>
+    SearchDataEqual = 0x31,
 
-        /// <summary>
-        ///     Writes blocks to the device with a vendor specified format that shall include the ECC alongside the data
-        ///     SCSI-2 X3T9.2/375R rev. 10l
-        /// </summary>
-        WriteLong = 0x3F,
+    /// <summary>Searches data on blocks using major than or equal comparison ANSI X3T9.3 No. 185 (SASI)</summary>
+    SearchDataHigh = 0x30,
 
-        /// <summary>Writes a single block several times SCSI-2 X3T9.2/375R rev. 10l</summary>
-        WriteSame = 0x41,
+    /// <summary>Searches data on blocks using minor than or equal comparison ANSI X3T9.3 No. 185 (SASI)</summary>
+    SearchDataLow = 0x32,
+    #endregion SASI Class 1 commands
 
-        /// <summary>Writes a single block several times SBC-2 rev. 4</summary>
-        WriteSame16 = 0x93,
+    #region SASI Class 2 commands
+    /// <summary>Unknown SASI rev. 0a</summary>
+    Load = 0x40,
 
-        /// <summary>Requests XOR data generated by an <see cref="XdWrite" /> or <see cref="Regenerate" /> command SBC-1 rev. 8c</summary>
-        XdRead = 0x52,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    Unload = 0x41,
 
-        /// <summary>
-        ///     XORs the data sent with data on the medium and stores it until an <see cref="XdRead" /> is issued SBC-1 rev.
-        ///     8c
-        /// </summary>
-        XdWrite = 0x50,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    Rewind = 0x42,
 
-        /// <summary>
-        ///     XORs the data sent with data on the medium and stores it until an <see cref="XdRead" /> is issued SBC-1 rev.
-        ///     8c
-        /// </summary>
-        XdWrite16 = 0x80,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    SpaceForward = 0x43,
 
-        /// <summary>Requests the target to XOR the sent data with the data on the medium and return the results</summary>
-        XdWriteRead = 0x53,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    SpaceForwardFileMark = 0x44,
 
-        /// <summary>
-        ///     Requests the target to XOR the data transferred with the data on the medium and writes it to the medium SBC-1
-        ///     rev. 8c
-        /// </summary>
-        XpWrite = 0x51,
-        #endregion SCSI Block Commands (SBC)
+    /// <summary>Unknown SASI rev. 0a</summary>
+    SpaceReverse = 0x45,
 
-        #region SCSI Streaming Commands (SSC)
-        /// <summary>Prepares the medium for use by the LUN SSC-1 rev. 22</summary>
-        FormatMedium = 0x04,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    SpaceReverseFileMark = 0x46,
 
-        /// <summary>Erases part of all of the medium from the current position ECMA-111 (SCSI-1)</summary>
-        Erase = 0x19,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    TrackSelect = 0x47,
 
-        /// <summary>Enables or disables the LUN for further operations ECMA-111 (SCSI-1)</summary>
-        LoadUnload = 0x1B,
+    /// <summary>Reads blocks from device SASI rev. 0a</summary>
+    Read8 = 0x48,
 
-        /// <summary>Positions the LUN to a specified block in a specified partition SCSI-2 X3T9.2/375R rev. 10l</summary>
-        Locate = 0x2B,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    ReadVerify = 0x49,
 
-        /// <summary>Positions the LUN to a specified block in a specified partition SSC-2 rev. 09</summary>
-        Locate16 = 0x92,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    ReadDiagnosticClass2 = 0x4A,
 
-        /// <summary>Requests the block length limits capability ECMA-111 (SCSI-1)</summary>
-        ReadBlockLimits = 0x05,
+    /// <summary>Writes blocks to device SASI rev. 0a</summary>
+    Write8 = 0x4B,
 
-        /// <summary>Reads the current position SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ReadPosition = 0x34,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    WriteFileMarkClass2 = 0x4C,
 
-        /// <summary>Reads blocks from the device, in reverse order ECMA-111 (SCSI-1)</summary>
-        ReadReverse = 0x0F,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    WriteExtended = 0x4D,
 
-        /// <summary>
-        ///     Retrieves data from the device buffer that has not been successfully written to the medium (or printed)
-        ///     ECMA-111 (SCSI-1)
-        /// </summary>
-        RecoverBufferedData = 0x14,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    WriteExtendedFileMark = 0x4E,
 
-        /// <summary>Requests information regarding the supported densities for the logical unit SSC-1 rev. 22</summary>
-        ReportDensitySupport = 0x44,
+    /// <summary>Unknown SASI rev. 0a</summary>
+    WriteErase = 0x4F,
 
-        /// <summary>Seeks the medium to the beginning of partition in current partition ECMA-111 (SCSI-1)</summary>
-        Rewind = 0x01,
+    /// <summary>Writes and verifies blocks to the device. SASI rev. 0c</summary>
+    WriteVerify8 = 0x54,
 
-        /// <summary>A variety of positioning functions ECMA-111 (SCSI-1)</summary>
-        Space = 0x11,
+    /// <summary>Verifies blocks. SASI rev. 0c</summary>
+    Verify8 = 0x55,
 
-        /// <summary>A variety of positioning functions SSC-2 rev. 09</summary>
-        Space16 = 0x91,
+    /// <summary>Searches data on blocks using major than or equal comparison SASI rev. 0c</summary>
+    SearchDataHigh8 = 0x57,
 
-        /// <summary>Selects the specified track ECMA-111 (SCSI-1)</summary>
-        TrackSelect = 0x0B,
+    /// <summary>Searches data on blocks SASI rev. 0c</summary>
+    SearchDataEqual8 = 0x58,
 
-        /// <summary>Verifies one or more blocks from the next one ECMA-111 (SCSI-1)</summary>
-        Verify = 0x13,
+    /// <summary>Searches data on blocks using minor than or equal comparison SASI rev. 0c</summary>
+    SearchDataLow8 = 0x59,
+    #endregion SASI Class 2 commands
 
-        /// <summary>Writes the specified number of filemarks or setmarks in the current position ECMA-111 (SCSI-1)</summary>
-        WriteFileMarks = 0x10,
-        #endregion SCSI Streaming Commands (SSC)
+    #region SASI Class 3 commands
+    /// <summary>SASI rev. 0a</summary>
+    Skip = 0x60,
 
-        #region SCSI Streaming Commands for Printers (SSC)
-        /// <summary>
-        ///     Assures that the data in the buffer has been printed, or, for other devices, written to media ECMA-111
-        ///     (SCSI-1)
-        /// </summary>
-        FlushBuffer = 0x10,
+    /// <summary>SASI rev. 0a</summary>
+    Space = 0x61,
 
-        /// <summary>Specifies forms or fronts ECMA-111 (SCSI-1)</summary>
-        Format = 0x04,
+    /// <summary>SASI rev. 0a</summary>
+    Return = 0x62,
 
-        /// <summary>Transfers data to be printed ECMA-111 (SCSI-1)</summary>
-        Print = 0x0A,
+    /// <summary>SASI rev. 0a</summary>
+    Tab = 0x63,
 
-        /// <summary>Transfers data to be printed with a slew value ECMA-111 (SCSI-1)</summary>
-        SlewAndPrint = 0x0B,
+    /// <summary>SASI rev. 0a</summary>
+    ReadControl = 0x64,
 
-        /// <summary>Halts printing ECMA-111 (SCSI-1)</summary>
-        StopPrint = 0x1B,
+    /// <summary>SASI rev. 0a</summary>
+    Write3 = 0x65,
 
-        /// <summary>
-        ///     Assures that the data in the buffer has been printed, or, for other devices, written to media SCSI-2
-        ///     X3T9.2/375R rev. 10l
-        /// </summary>
-        SynchronizeBuffer = FlushBuffer,
-        #endregion SCSI Streaming Commands for Printers (SSC)
+    /// <summary>SASI rev. 0a</summary>
+    WriteControl = 0x66,
+    #endregion SASI Class 3 commands
 
-        #region SCSI Processor Commands
-        /// <summary>Transfers data from the device ECMA-111 (SCSI-1)</summary>
-        Receive = 0x08,
+    #region SASI Class 5 commands
+    /// <summary>Gets the number of blocks in device. ANSI X3T9.3 No. 185 (SASI)</summary>
+    ReadCapacity = 0xA5,
 
-        /// <summary>Sends data to the device ECMA-111 (SCSI-1)</summary>
-        Send = 0x0A,
-        #endregion SCSI Processor Commands
+    /// <summary>Sets write or read limits from a specified block ANSI X3T9.3 No. 185 (SASI)</summary>
+    SetBlockLimits = 0xA9,
+    #endregion SASI Class 5 commands
 
-        #region SCSI Multimedia Commands (MMC)
-        /// <summary>Erases any part of a CD-RW MMC-1 rev. 9</summary>
-        Blank = 0xA1,
+    #region SASI Class 6 commands
+    /// <summary>SASI rev. 0a</summary>
+    DefineFloppyDiskTrackFormat = 0xC0,
 
-        /// <summary>Closes a track or session MMC-1 rev. 9</summary>
-        CloseTrackSession = 0x5B,
+    /// <summary>Unknown vendor command in X68000</summary>
+    Specify = 0xC2,
 
-        /// <summary>
-        ///     Gets information about the overall capabilities of the device and the current capabilities of the device MMC-2
-        ///     rev. 11a
-        /// </summary>
-        GetConfiguration = 0x46,
+    /// <summary>SASI rev. 0a</summary>
+    FormatDriveErrorMap = 0xC4,
 
-        /// <summary>Requests the LUN to report events and statuses MMC-2 rev. 11a</summary>
-        GetEventStatusNotification = 0x4A,
+    /// <summary>SASI rev. 0a</summary>
+    ReadErrorMap = 0xC5,
 
-        /// <summary>Provides a method to profile the performance of the drive MMC-2 rev. 11a</summary>
-        GetPerformance = 0xAC,
+    /// <summary>SASI rev. 0a</summary>
+    ReadDriveType = 0xC6,
+    #endregion SASI Class 6 commands
 
-        /// <summary>Requests the device changer to load or unload a disc MMC-1 rev. 9</summary>
-        LoadUnloadCd = 0xA6,
+    #region SASI Class 7 commands
+    /// <summary>SASI rev. 0a</summary>
+    RamDiagnostic = 0xE0,
 
-        /// <summary>Requests the device changer to load or unload a disc MMC-2 rev. 11a</summary>
-        LoadUnloadMedium = 0xA6,
+    /// <summary>SASI rev. 0a</summary>
+    WriteEcc = 0xE1,
 
-        /// <summary>Requests information about the current status of the CD device, including any changer mechanism MMC-1 rev. 9</summary>
-        MechanicalStatus = 0xBD,
+    /// <summary>SASI rev. 0a</summary>
+    ReadId = 0xE2,
 
-        /// <summary>Requests the device to start or stop an audio play operation SCSI-2 X3T9.2/375R rev. 10l</summary>
-        PauseResume = 0x4B,
+    /// <summary>SASI rev. 0a</summary>
+    DriveDiagnostic = 0xE3,
 
-        /// <summary>Begins an audio playback SCSI-2 X3T9.2/375R rev. 10l</summary>
-        PlayAudio = 0x45,
+    /// <summary>Found on a vendor source code</summary>
+    ControllerDiagnostic = 0xE4,
 
-        /// <summary>Begins an audio playback SCSI-2 X3T9.2/375R rev. 10l</summary>
-        PlayAudio12 = 0xA5,
+    /// <summary>Found on a vendor document</summary>
+    ReadLong = 0xE5,
 
-        /// <summary>Begins an audio playback using MSF addressing SCSI-2 X3T9.2/375R rev. 10l</summary>
-        PlayAudioMsf = 0x47,
+    /// <summary>Found on a vendor document</summary>
+    WriteLong = 0xE6
+    #endregion SASI Class 7 commands
+}
+#endregion SASI Commands
 
-        /// <summary>Begins an audio playback from the specified index of the specified track SCSI-2 X3T9.2/375R rev. 10l</summary>
-        PlayAudioTrackIndex = 0x48,
+#region SCSI Commands
+/// <summary>All known SCSI and ATAPI commands</summary>
+public enum ScsiCommands : byte
+{
+    #region SCSI Primary Commands (SPC)
+    /// <summary>Commands used to obtain information about the access controls that are active SPC-4 rev. 16</summary>
+    AccessControlIn = 0x86,
 
-        /// <summary>Begins an audio playback from the position relative of a track SCSI-2 X3T9.2/375R rev. 10l</summary>
-        PlayTrackRelative = 0x49,
+    /// <summary>Commands used to limit or grant access to LUNs SPC-4 rev. 16</summary>
+    AccessControlOut = 0x87,
 
-        /// <summary>Begins an audio playback from the position relative of a track SCSI-2 X3T9.2/375R rev. 10l</summary>
-        PlayTrackRelative12 = 0xA9,
+    /// <summary>Modifies the operating definition of the device with respect to commands. SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ChangeDefinition = 0x40,
 
-        /// <summary>Reports the total and blank area of the device buffer MMC-1 rev. 9</summary>
-        ReadBufferCapacity = 0x5C,
+    /// <summary>Compares data between two devices ECMA-111 (SCSI-1)</summary>
+    Compare = 0x39,
 
-        /// <summary>Reads a block from a CD with any of the requested CD data streams MMC-1 rev. 9</summary>
-        ReadCd = 0xBE,
+    /// <summary>Copies data between two devices ECMA-111 (SCSI-1)</summary>
+    Copy = 0x18,
 
-        /// <summary>Reads a block from a CD with any of the requested CD data streams using MSF addressing MMC-1 rev. 9</summary>
-        ReadCdMsf = 0xB9,
+    /// <summary>Copies data between two devices and verifies the copy is correct. ECMA-111 (SCSI-1)</summary>
+    CopyAndVerify = 0x3A,
 
-        /// <summary>Returns the recorded size of the CD MMC-1 rev. 9</summary>
-        ReadCdRecordedCapacity = 0x25,
+    /// <summary>Copies data between two devices SPC-2 rev. 20</summary>
+    ExtendedCopy = 0x83,
 
-        /// <summary>Gets information about all discs: CD-ROM, CD-R and CD-RW MMC-1 rev. 9</summary>
-        ReadDiscInformation = 0x51,
+    /// <summary>Requests information about the device ECMA-111 (SCSI-1)</summary>
+    Inquiry = SasiCommands.Inquiry,
 
-        /// <summary>Reads areas from the DVD or BD media MMC-5 rev. 2c</summary>
-        ReadDiscStructure = 0xAD,
+    /// <summary>Manages device statistics SCSI-2 X3T9.2/375R rev. 10l</summary>
+    LogSelect = 0x4C,
 
-        /// <summary>Reads areas from the DVD media MMC-2 rev. 11a</summary>
-        ReadDvdStructure = 0xAD,
+    /// <summary>Gets device statistics SCSI-2 X3T9.2/375R rev. 10l</summary>
+    LogSense = 0x4D,
 
-        /// <summary>Requests a list of the possible format capacities for an installed random-writable media MMC-2 rev. 11a</summary>
-        ReadFormatCapacities = 0x23,
+    /// <summary>Retrieves management protocol information SPC-2 rev. 20</summary>
+    ManagementProtocolIn = 0xA3,
 
-        /// <summary>Reads the data block header of the specified CD-ROM block SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ReadHeader = 0x44,
+    /// <summary>Transfers management protocol information SPC-2 rev. 20</summary>
+    ManagementProtocolOut = 0xA4,
 
-        /// <summary>Reads the mastering information from a Master CD. MMC-1 rev. 9</summary>
-        ReadMasterCue = 0x59,
+    /// <summary>Sets device parameters ECMA-111 (SCSI-1)</summary>
+    ModeSelect = 0x15,
 
-        /// <summary>Requests the Q subchannel and the current audio playback status SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ReadSubChannel = 0x42,
+    /// <summary>Sets device parameters SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ModeSelect10 = 0x55,
 
-        /// <summary>Requests the medium TOC, PMA or ATIP from the device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ReadTocPmaAtip = 0x43,
+    /// <summary>Gets device parameters ECMA-111 (SCSI-1)</summary>
+    ModeSense = 0x1A,
 
-        /// <summary>Gets information about a track regardless of its status MMC-1 rev. 9</summary>
-        ReadTrackInformation = 0x52,
+    /// <summary>Gets device parameters SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ModeSense10 = 0x5A,
 
-        /// <summary>Repairs an incomplete ECC block at the end of an RZone Mt. Fuji ver. 7 rev. 1.21</summary>
-        RepairRZone = 0x58,
+    /// <summary>Obtains information about persistent reservations and reservation keys SPC-1 rev. 10</summary>
+    PersistentReserveIn = 0x5E,
 
-        /// <summary>Repairs an incomplete packet at the end of a packet writing track MMC-1 rev. 9</summary>
-        RepairTrack = 0x58,
+    /// <summary>Reserves a LUN or an extent within a LUN for exclusive or shared use SPC-1 rev. 10</summary>
+    PersistentReserveOut = 0x5F,
 
-        /// <summary>
-        ///     Requests the start of the authentication process and provides data necessary for authentication and for
-        ///     generating a Bus Key MMC-2 rev. 11a
-        /// </summary>
-        ReportKey = 0xA4,
+    /// <summary>Requests the device to disable or enable the removal of the medium inside it ECMA-111 (SCSI-1)</summary>
+    PreventAllowMediumRemoval = 0x1E,
 
-        /// <summary>Reserves disc space for a track MMC-1 rev. 9</summary>
-        ReserveTrack = 0x53,
+    /// <summary>Reads attribute values from medium auxiliary memory SPC-3 rev. 21b</summary>
+    ReadAttribute = 0x8C,
 
-        /// <summary>
-        ///     Fast-forwards or fast-reverses the audio playback to the specified block. Stops if it encounters a data track
-        ///     MMC-1 rev. 9
-        /// </summary>
-        ScanMmc = 0xBA,
+    /// <summary>Reads the device buffer SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ReadBuffer = 0x3C,
 
-        /// <summary>Sends a cue sheet for session-at-once recording MMC-1 rev. 9</summary>
-        SendCueSheet = 0x5D,
+    /// <summary>Reads the media serial number SPC-3 rev. 21b</summary>
+    ReadSerialNumber = 0xAB,
 
-        /// <summary>Transfer a DVD or BD structure for media writing MMC-5 rev. 2c</summary>
-        SendDiscStructure = 0xAD,
+    /// <summary>Receives information about a previous or current <see cref="ExtendedCopy" /> SPC-2 rev. 20</summary>
+    ReceiveCopyResults = 0x84,
 
-        /// <summary>Transfer a DVD structure for media writing MMC-2 rev. 11a</summary>
-        SendDvdStructure = 0xAD,
+    /// <summary>Requests the data after completion of a <see cref="SendDiagnostic" /> ECMA-111 (SCSI-1)</summary>
+    ReceiveDiagnostic = SasiCommands.ReadDiagnostic,
 
-        /// <summary>Requests the LUN to process an event MMC-2 rev. 11a</summary>
-        SendEvent = 0xA2,
+    /// <summary>Releases a previously reserved LUN or extents ECMA-111 (SCSI-1)</summary>
+    Release = SasiCommands.ReleaseUnit,
 
-        /// <summary>Provides data necessary for authentication and for generating a Bus Key MMC-2 rev. 11a</summary>
-        SendKey = 0xA3,
+    /// <summary>Releases a previously reserved LUN or extents SPC-1 rev. 10</summary>
+    Release10 = 0x57,
 
-        /// <summary>Restores the Optimum Power Calibration values to the drive for a specific disc MMC-1 rev. 9</summary>
-        SendOpcInformation = 0x54,
+    /// <summary>Requests the LUNs that are present on the device SPC-1 rev. 10</summary>
+    ReportLuns = 0xA0,
 
-        /// <summary>Sets the spindle speed to be used while reading/writing data to a CD MMC-1 rev. 9</summary>
-        SetCdRomSpeed = 0xBB,
+    /// <summary>Requests the device's sense ECMA-111 (SCSI-1)</summary>
+    RequestSense = SasiCommands.RequestSense,
 
-        /// <summary>Requests the LUN to perform read ahead caching operations from the specified block MMC-2 rev. 11a</summary>
-        SetReadAhead = 0xA7,
+    /// <summary>Reserves a LUN or extent ECMA-111 (SCSI-1)</summary>
+    Reserve = SasiCommands.ReserveUnit,
 
-        /// <summary>Indicates the LUN to try to achieve a specified performance MMC-2 rev. 11a</summary>
-        SetStreaming = 0xB6,
+    /// <summary>Reserves a LUN or extent SPC-1 rev. 10</summary>
+    Reserve10 = 0x56,
 
-        /// <summary>Stops a scan and continues audio playback from current scanning position MMC-1 rev. 9</summary>
-        StopPlayScan = 0x4E,
-        #endregion SCSI Multimedia Commands (MMC)
+    /// <summary>Retrieves security protocol information SPC-4 rev. 16</summary>
+    SecurityProtocolIn = 0xA2,
 
-        #region SCSI Scanner Commands
-        /// <summary>Gets information about the data buffer SCSI-2 X3T9.2/375R rev. 10l</summary>
-        GetDataBufferStatus = 0x34,
+    /// <summary>Transfers security protocol information SPC-4 rev. 16</summary>
+    SecurityProtocolOut = 0xB5,
 
-        /// <summary>Gets information about previously defined windows SCSI-2 X3T9.2/375R rev. 10l</summary>
-        GetWindow = 0x25,
+    /// <summary>Requests the device to perform diagnostics ECMA-111 (SCSI-1)</summary>
+    SendDiagnostic = SasiCommands.WriteDiagnostic,
 
-        /// <summary>Provides positioning functions SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ObjectPosition = 0x31,
+    /// <summary>Extended commands SPC-4</summary>
+    ServiceActionIn = 0x9E,
 
-        /// <summary>Begins a scan operation SCSI-2 X3T9.2/375R rev. 10l</summary>
-        Scan = 0x1B,
+    /// <summary>Extended commands SPC-4</summary>
+    ServiceActionOut = 0x9F,
 
-        /// <summary>Specifies one or more windows within the device's scanning range SCSI-2 X3T9.2/375R rev. 10l</summary>
-        SetWindow = 0x24,
+    /// <summary>Checks if a LUN is ready to access its medium ECMA-111 (SCSI-1)</summary>
+    TestUnitReady = SasiCommands.TestUnitReady,
 
-        /// <summary>Sends data to the device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        Send10 = 0x2A,
-        #endregion SCSI Scanner Commands
+    /// <summary>Writes attribute values to medium auxiliary memory SPC-3 rev. 21b</summary>
+    WriteAttribute = 0x8D,
 
-        #region SCSI Block Commands for Optical Media (SBC)
-        /// <summary>Erases the specified number of blocks</summary>
-        Erase10 = 0x2C,
+    /// <summary>Writes to the device's buffer SCSI-2 X3T9.2/375R rev. 10l</summary>
+    WriteBuffer = 0x3B,
+    #endregion SCSI Primary Commands (SPC)
 
-        /// <summary>Erases the specified number of blocks</summary>
-        Erase12 = 0xAC,
+    #region SCSI Block Commands (SBC)
+    /// <summary>Compares blocks with sent data, and if equal, writes those block to device, atomically SBC-3 rev. 25</summary>
+    CompareAndWrite = 0x89,
 
-        /// <summary>Searches the medium for a contiguous set of written or blank blocks</summary>
-        MediumScan = 0x38,
+    /// <summary>Formats the medium into addressable logical blocks ECMA-111 (SCSI-1)</summary>
+    FormatUnit = SasiCommands.FormatUnit, FormatWithPreset = 0x38,
 
-        /// <summary>Reads blocks from device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        Read12 = 0xA8,
+    /// <summary>Locks blocks from eviction of device's cache SCSI-2 X3T9.2/375R rev. 10l</summary>
+    LockUnlockCache = 0x36,
 
-        /// <summary>Gets medium's defect data SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ReadDefectData12 = 0xB7,
+    /// <summary>Locks blocks from eviction of device's cache SBC-2 rev. 4</summary>
+    LockUnlockCache16 = 0x92,
 
-        /// <summary>Gets the maximum generation address for the specified block</summary>
-        ReadGeneration = 0x29,
+    /// <summary>
+    ///     Requests the device to perform the following uninterrupted series of actions: 1.- Read the specified blocks
+    ///     2.- Transfer blocks from the data out buffer 3.- Perform an OR operation between the read blocks and the buffer 4.-
+    ///     Write the buffer to the blocks SBC-3 rev. 16
+    /// </summary>
+    OrWrite = 0x8B,
 
-        /// <summary>Reads a specified generation of a specified block</summary>
-        ReadUpdatedBlock = 0x2D,
+    /// <summary>Transfers requested blocks to devices' cache SCSI-2 X3T9.2/375R rev. 10l</summary>
+    PreFetch = 0x34,
 
-        /// <summary>Searches data on blocks SCSI-2 X3T9.2/375R rev. 10l</summary>
-        SearchDataEqual12 = 0xB1,
+    /// <summary>Transfers requested blocks to devices' cache SBC-3 rev. 16</summary>
+    PreFetch16 = 0x90,
 
-        /// <summary>Searches data on blocks using major than or equal comparison SCSI-2 X3T9.2/375R rev. 10l</summary>
-        SearchDataHigh12 = 0xB0,
+    /// <summary>Reads blocks from device ECMA-111 (SCSI-1)</summary>
+    Read = SasiCommands.Read,
 
-        /// <summary>Searches data on blocks using minor than or equal comparison SCSI-2 X3T9.2/375R rev. 10l</summary>
-        SearchDataLow12 = 0xB2,
+    /// <summary>Reads blocks from device ECMA-111 (SCSI-1)</summary>
+    Read10 = SasiCommands.ExtendedAddressRead,
 
-        /// <summary>Defines the range within which subsequent linked commands may operate SCSI-2 X3T9.2/375R rev. 10l</summary>
-        SetLimits12 = 0xB3,
+    /// <summary>Reads blocks from device SBC-2 rev. 4</summary>
+    Read16 = 0x88,
 
-        /// <summary>Replaces a block with data</summary>
-        UpdateBlock = 0x3D,
+    /// <summary>Gets device capacity ECMA-111 (SCSI-1)</summary>
+    ReadCapacity = 0x25,
 
-        /// <summary>Verifies blocks on the device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        Verify12 = 0xAF,
+    /// <summary>Gets device's defect data SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ReadDefectData = 0x37,
 
-        /// <summary>Writes blocks to the device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        Write12 = 0xAA,
+    /// <summary>
+    ///     Reads blocks from device in a vendor-specific way that should include the ECC alongside the data SCSI-2
+    ///     X3T9.2/375R rev. 10l
+    /// </summary>
+    ReadLong = 0x3E,
 
-        /// <summary>Writes blocks to the device and then verifies them SCSI-2 X3T9.2/375R rev. 10l</summary>
-        WriteAndVerify12 = 0xAE,
-        #endregion SCSI Block Commands for Optical Media (SBC)
+    /// <summary>Requests the device to reassign the defective blocks to another area of the medium ECMA-111 (SCSI-1)</summary>
+    ReassignBlocks = 0x07,
 
-        #region SCSI Medium Changer Commands (SMC)
-        /// <summary>
-        ///     Provides a means to exchange the medium in the source element with the medium at destination element SCSI-2
-        ///     X3T9.2/375R rev. 10l
-        /// </summary>
-        ExchangeMedium = 0xA6,
+    /// <summary>Requests the target write to the medium the XOR data generated from the specified source devices SBC-1 rev. 8c</summary>
+    Rebuild = 0x81,
 
-        /// <summary>Checks all elements for medium and any other relevant status SCSI-2 X3T9.2/375R rev. 10l</summary>
-        InitializeElementStatus = 0x07,
+    /// <summary>
+    ///     Requests the target write to the buffer the XOR data from its own medium and the specified source devices
+    ///     SBC-1 rev. 8c
+    /// </summary>
+    Regenerate = 0x82,
 
-        /// <summary>Checks all elements for medium and any other relevant status in the specified range of elements SMC-2 rev. 7</summary>
-        InitializeElementStatusWithRange = 0x37,
+    /// <summary>Requests the device to set the LUN in a vendor specific state ECMA-111 (SCSI-1)</summary>
+    RezeroUnit = SasiCommands.RezeroUnit, Sanitize = 0x48,
 
-        /// <summary>Moves a medium from an element to another SCSI-2 X3T9.2/375R rev. 10l</summary>
-        MoveMedium = 0xA5,
+    /// <summary>Searches data on blocks ECMA-111 (SCSI-1)</summary>
+    SearchDataEqual = SasiCommands.SearchDataEqual,
 
-        /// <summary>Moves a medium that's currently attached to another element SPC-1 rev. 10</summary>
-        MoveMediumAttached = 0xA7,
+    /// <summary>Searches data on blocks using major than or equal comparison ECMA-111 (SCSI-1)</summary>
+    SearchDataHigh = SasiCommands.SearchDataHigh,
 
-        /// <summary>Provides a method to change the open/closed state of the specified import/export element SMC-3 rev. 12</summary>
-        OpenCloseImportExportElement = 0x1B,
+    /// <summary>Searches data on blocks using minor than or equal comparison ECMA-111 (SCSI-1)</summary>
+    SearchDataLow = SasiCommands.SearchDataLow,
 
-        /// <summary>Positions the transport element in front of the destination element SCSI-2 X3T9.2/375R rev. 10l</summary>
-        PositionToElement = 0x2B,
+    /// <summary>Requests the device to seek to a specified blocks ECMA-111 (SCSI-1)</summary>
+    Seek = SasiCommands.Seek,
 
-        /// <summary>Requests the status of the elements SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ReadElementStatus = 0xB8,
+    /// <summary>Requests the device to seek to a specified blocks ECMA-111 (SCSI-1)</summary>
+    Seek10 = 0x2B,
 
-        /// <summary>Requests the status of the attached element SPC-1 rev. 10</summary>
-        ReadElementStatusAttached = 0xB4,
+    /// <summary>Defines the range within which subsequent linked commands may operate ECMA-111 (SCSI-1)</summary>
+    SetLimits = 0x33,
 
-        /// <summary>Releases a reserved LUN SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ReleaseElement = 0x17,
+    /// <summary>Requests the device to enable or disable the LUN for media access operations ECMA-111 (SCSI-1)</summary>
+    StartStopUnit = 0x1B,
 
-        /// <summary>Releases a reserved LUN SMC-1 rev. 10a</summary>
-        ReleaseElement10 = 0x57,
+    /// <summary>Ensures that the blocks in the cache are written to the medium SCSI-2 X3T9.2/375R rev. 10l</summary>
+    SynchronizeCache = 0x35,
 
-        /// <summary>Requests information regarding the supported volume types for the device SMC-3 rev. 12</summary>
-        ReportVolumeTypesSupported = 0x44,
+    /// <summary>Ensures that the blocks in the cache are written to the medium SBC-2 rev. 4</summary>
+    SynchronizeCache16 = 0x91,
 
-        /// <summary>Gets the results of <see cref="SendVolumeTag" /> SCSI-2 X3T9.2/375R rev. 10l</summary>
-        RequestVolumeElementAddress = 0xB5,
+    /// <summary>Unmaps one or more LBAs In SSDs, this is trimming SBC-3 rev. 25</summary>
+    Unmap = 0x42,
 
-        /// <summary>Reserves a LUN SCSI-2 X3T9.2/375R rev. 10l</summary>
-        ReserveElement = 0x16,
+    /// <summary>Verifies blocks on the device ECMA-111 (SCSI-1)</summary>
+    Verify10 = SasiCommands.Verify,
 
-        /// <summary>Reserves a LUN SMC-1 rev. 10a</summary>
-        ReserveElement10 = 0x56,
+    /// <summary>Verifies blocks on the device SBC-2 rev. 4</summary>
+    Verify16 = 0x8F,
 
-        /// <summary>
-        ///     Transfers a volume tag template to be searched or new volume tag information for one or more elements SCSI-2
-        ///     X3T9.2/375R rev. 10l
-        /// </summary>
-        SendVolumeTag = 0xB6,
-        #endregion SCSI Medium Changer Commands (SMC)
+    /// <summary>Writes blocks to the device ECMA-111 (SCSI-1)</summary>
+    Write = SasiCommands.Write,
 
-        #region SCSI Communication Commands
-        /// <summary>Gets data from the device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        GetMessage = 0x08,
+    /// <summary>Writes blocks to the device ECMA-111 (SCSI-1)</summary>
+    Write10 = SasiCommands.ExtendedAddressWrite,
 
-        /// <summary>Gets data from the device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        GetMessage10 = 0x28,
+    /// <summary>Writes blocks to the device SBC-2 rev. 4</summary>
+    Write16 = 0x8A,
 
-        /// <summary>Gets data from the device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        GetMessage12 = 0xA8,
+    /// <summary>Writes blocks to the device and then verifies them ECMA-111 (SCSI-1)</summary>
+    WriteAndVerify = SasiCommands.WriteAndVerify,
 
-        /// <summary>Sends data to the device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        SendMessage = 0x0A,
+    /// <summary>Writes blocks to the device and then verifies them SBC-2 rev. 4</summary>
+    WriteAndVerify16 = 0x8E,
 
-        /// <summary>Sends data to the device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        SendMessage10 = 0x2A,
+    /// <summary>
+    ///     Writes blocks to the device with a vendor specified format that shall include the ECC alongside the data
+    ///     SCSI-2 X3T9.2/375R rev. 10l
+    /// </summary>
+    WriteLong = 0x3F,
 
-        /// <summary>Sends data to the device SCSI-2 X3T9.2/375R rev. 10l</summary>
-        SendMessage12 = 0xAA,
-        #endregion SCSI Communication Commands
+    /// <summary>Writes a single block several times SCSI-2 X3T9.2/375R rev. 10l</summary>
+    WriteSame = 0x41,
 
-        #region SCSI Controller Commands
-        /// <summary>Commands that get information about redundancy groups SCC-2 rev. 4</summary>
-        RedundancyGroupIn = 0xBA,
+    /// <summary>Writes a single block several times SBC-2 rev. 4</summary>
+    WriteSame16 = 0x93,
 
-        /// <summary>Commands that set information about redundancy groups SCC-2 rev. 4</summary>
-        RedundancyGroupOut = 0xBB,
+    /// <summary>Requests XOR data generated by an <see cref="XdWrite" /> or <see cref="Regenerate" /> command SBC-1 rev. 8c</summary>
+    XdRead = 0x52,
 
-        /// <summary>Commands that get information about volume sets SCC-2 rev. 4</summary>
-        VolumeSetIn = 0xBE,
+    /// <summary>
+    ///     XORs the data sent with data on the medium and stores it until an <see cref="XdRead" /> is issued SBC-1 rev.
+    ///     8c
+    /// </summary>
+    XdWrite = 0x50,
 
-        /// <summary>Commands that set information about volume sets SCC-2 rev. 4</summary>
-        VolumeSetOut = 0xBF,
-        #endregion SCSI Controller Commands
+    /// <summary>
+    ///     XORs the data sent with data on the medium and stores it until an <see cref="XdRead" /> is issued SBC-1 rev.
+    ///     8c
+    /// </summary>
+    XdWrite16 = 0x80,
 
-        #region Pioneer CD-ROM SCSI-2 Command Set
-        /// <summary>Scans for a block playing a block on each track cross</summary>
-        AudioScan = 0xCD,
+    /// <summary>Requests the target to XOR the sent data with the data on the medium and return the results</summary>
+    XdWriteRead = 0x53,
 
-        /// <summary>Requests the drive the status from the previous WriteCDP command.</summary>
-        ReadCdp = 0xE4,
+    /// <summary>
+    ///     Requests the target to XOR the data transferred with the data on the medium and writes it to the medium SBC-1
+    ///     rev. 8c
+    /// </summary>
+    XpWrite = 0x51,
+    #endregion SCSI Block Commands (SBC)
 
-        /// <summary>Requests status from the drive</summary>
-        ReadDriveStatus = 0xE0,
+    #region SCSI Streaming Commands (SSC)
+    /// <summary>Prepares the medium for use by the LUN SSC-1 rev. 22</summary>
+    FormatMedium = 0x04,
 
-        /// <summary>Reads CD-DA data and/or subcode data</summary>
-        ReadCdDa = 0xD8,
+    /// <summary>Erases part of all of the medium from the current position ECMA-111 (SCSI-1)</summary>
+    Erase = 0x19,
 
-        /// <summary>Reads CD-DA data and/or subcode data using MSF addressing</summary>
-        ReadCdDaMsf = 0xD9,
+    /// <summary>Enables or disables the LUN for further operations ECMA-111 (SCSI-1)</summary>
+    LoadUnload = 0x1B,
 
-        /// <summary>Reads CD-XA data</summary>
-        ReadCdXa = 0xDB,
+    /// <summary>Positions the LUN to a specified block in a specified partition SCSI-2 X3T9.2/375R rev. 10l</summary>
+    Locate = 0x2B,
 
-        /// <summary>Reads all subcode data</summary>
-        ReadAllSubCode = 0xDF,
+    /// <summary>Positions the LUN to a specified block in a specified partition SSC-2 rev. 09</summary>
+    Locate16 = 0x92,
 
-        /// <summary>Sets the spindle speed to be used while reading/writing data to a CD</summary>
-        SetCdSpeed = 0xDA, WriteCdp = 0xE3,
-        #endregion
+    /// <summary>Requests the block length limits capability ECMA-111 (SCSI-1)</summary>
+    ReadBlockLimits = 0x05,
 
-        #region ATA Command Pass-Through
-        /// <summary>Sends a 24-bit ATA command to the device Clashes with <see cref="Blank" /> ATA CPT rev. 8a</summary>
-        AtaPassThrough = 0xA1,
+    /// <summary>Reads the current position SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ReadPosition = 0x34,
 
-        /// <summary>Sends a 48-bit ATA command to the device ATA CPT rev. 8a</summary>
-        AtaPassThrough16 = 0x85,
-        #endregion ATA Command Pass-Through
+    /// <summary>Reads blocks from the device, in reverse order ECMA-111 (SCSI-1)</summary>
+    ReadReverse = 0x0F,
 
-        #region 6-byte CDB aliases
-        ModeSelect6 = ModeSelect, ModeSense6 = ModeSense, Read6 = Read,
-        Seek6       = Seek, Write6           = Write,
-        #endregion 6-byte CDB aliases
+    /// <summary>
+    ///     Retrieves data from the device buffer that has not been successfully written to the medium (or printed)
+    ///     ECMA-111 (SCSI-1)
+    /// </summary>
+    RecoverBufferedData = 0x14,
 
-        #region SCSI Zoned Block Commands
-        /// <summary>ZBC commands with host->device information</summary>
-        ZbcOut = 0x94,
+    /// <summary>Requests information regarding the supported densities for the logical unit SSC-1 rev. 22</summary>
+    ReportDensitySupport = 0x44,
 
-        /// <summary>ZBC commands with device->host information</summary>
-        ZbcIn = 0x95,
-        #endregion
+    /// <summary>Seeks the medium to the beginning of partition in current partition ECMA-111 (SCSI-1)</summary>
+    Rewind = 0x01,
 
-        #region SCSI Commands with unknown meaning, mostly vendor specific
-        SetCdSpeedUnk              = 0xB8, WriteCdMsf    = 0xA2, WriteCd          = 0xAA,
-        ReadDefectTag              = 0xB7, PlayCd        = 0xBC, SpareIn          = 0xBC,
-        SpareOut                   = 0xBD, WriteStream16 = 0x9A, WriteAtomic      = 0x9C,
-        ServiceActionBidirectional = 0x9D, WriteLong2    = 0xEA, UnknownCdCommand = 0xD4,
-        UnknownCdCommand2          = 0xD5,
-        #endregion SCSI Commands with unknown meaning, mostly vendor specific
+    /// <summary>A variety of positioning functions ECMA-111 (SCSI-1)</summary>
+    Space = 0x11,
 
-        #region SEGA Packet Interface (all are 12-byte CDB)
-        /// <summary>Verifies that the device can be accessed Sega SPI ver. 1.30</summary>
-        SegaTestUnit = TestUnitReady,
+    /// <summary>A variety of positioning functions SSC-2 rev. 09</summary>
+    Space16 = 0x91,
 
-        /// <summary>Gets current CD status Sega SPI ver. 1.30</summary>
-        SegaRequestStatus = 0x10,
+    /// <summary>Selects the specified track ECMA-111 (SCSI-1)</summary>
+    TrackSelect = 0x0B,
 
-        /// <summary>Gets CD block mode info Sega SPI ver. 1.30</summary>
-        SegaRequestMode = 0x11,
+    /// <summary>Verifies one or more blocks from the next one ECMA-111 (SCSI-1)</summary>
+    Verify = 0x13,
 
-        /// <summary>Sets CD block mode Sega SPI ver. 1.30</summary>
-        SegaSetMode = 0x12,
+    /// <summary>Writes the specified number of filemarks or setmarks in the current position ECMA-111 (SCSI-1)</summary>
+    WriteFileMarks = 0x10,
+    #endregion SCSI Streaming Commands (SSC)
 
-        /// <summary>Requests device error info Sega SPI ver. 1.30</summary>
-        SegaRequestError = 0x13,
+    #region SCSI Streaming Commands for Printers (SSC)
+    /// <summary>
+    ///     Assures that the data in the buffer has been printed, or, for other devices, written to media ECMA-111
+    ///     (SCSI-1)
+    /// </summary>
+    FlushBuffer = 0x10,
 
-        /// <summary>Gets disc TOC Sega SPI ver. 1.30</summary>
-        SegaGetToc = 0x14,
+    /// <summary>Specifies forms or fronts ECMA-111 (SCSI-1)</summary>
+    Format = 0x04,
 
-        /// <summary>Gets specified session data Sega SPI ver. 1.30</summary>
-        SegaRequestSession = 0x15,
+    /// <summary>Transfers data to be printed ECMA-111 (SCSI-1)</summary>
+    Print = 0x0A,
 
-        /// <summary>
-        ///     Stops the drive and opens the drive tray, or, on manual trays, stays busy until it is opened Sega SPI ver.
-        ///     1.30
-        /// </summary>
-        SegaOpenTray = 0x16,
+    /// <summary>Transfers data to be printed with a slew value ECMA-111 (SCSI-1)</summary>
+    SlewAndPrint = 0x0B,
 
-        /// <summary>Starts audio playback Sega SPI ver. 1.30</summary>
-        SegaPlayCd = 0x20,
+    /// <summary>Halts printing ECMA-111 (SCSI-1)</summary>
+    StopPrint = 0x1B,
 
-        /// <summary>Moves drive pickup to specified block Sega SPI ver. 1.30</summary>
-        SegaSeek = 0x21,
+    /// <summary>
+    ///     Assures that the data in the buffer has been printed, or, for other devices, written to media SCSI-2
+    ///     X3T9.2/375R rev. 10l
+    /// </summary>
+    SynchronizeBuffer = FlushBuffer,
+    #endregion SCSI Streaming Commands for Printers (SSC)
 
-        /// <summary>
-        ///     Fast-forwards or fast-reverses until Lead-In or Lead-Out arrive, or until another command is issued Sega SPI
-        ///     ver. 1.30
-        /// </summary>
-        SegaScan = 0x22,
+    #region SCSI Processor Commands
+    /// <summary>Transfers data from the device ECMA-111 (SCSI-1)</summary>
+    Receive = 0x08,
 
-        /// <summary>Reads blocks from the disc Sega SPI ver. 1.30</summary>
-        SegaRead = 0x30,
+    /// <summary>Sends data to the device ECMA-111 (SCSI-1)</summary>
+    Send = 0x0A,
+    #endregion SCSI Processor Commands
 
-        /// <summary>Reads blocks from the disc seeking to another position at end Sega SPI ver. 1.30</summary>
-        SegaRead2 = 0x31,
+    #region SCSI Multimedia Commands (MMC)
+    /// <summary>Erases any part of a CD-RW MMC-1 rev. 9</summary>
+    Blank = 0xA1,
 
-        /// <summary>Reads disc subcode Sega SPI ver. 1.30</summary>
-        SegaGetSubcode = 0x40,
-        #endregion SEGA Packet Interface (all are 12-byte CDB)
+    /// <summary>Closes a track or session MMC-1 rev. 9</summary>
+    CloseTrackSession = 0x5B,
 
-        /// <summary>Variable sized Command Description Block SPC-4 rev. 16</summary>
-        VariableSizedCdb = 0x7F,
+    /// <summary>
+    ///     Gets information about the overall capabilities of the device and the current capabilities of the device MMC-2
+    ///     rev. 11a
+    /// </summary>
+    GetConfiguration = 0x46,
 
-        #region Plextor vendor commands
-        /// <summary>Sends extended commands (like SpeedRead) to Plextor drives</summary>
-        PlextorExtend = 0xE9,
-
-        /// <summary>Command for Plextor PoweRec</summary>
-        PlextorPoweRec = 0xEB,
-
-        /// <summary>Sends extended commands (like PoweRec) to Plextor drives</summary>
-        PlextorExtend2 = 0xED,
-
-        /// <summary>Resets Plextor drives</summary>
-        PlextorReset = 0xEE,
-
-        /// <summary>Reads drive statistics from Plextor drives EEPROM</summary>
-        PlextorReadEeprom = 0xF1,
-        #endregion Plextor vendor commands
-
-        #region HL-DT-ST vendor commands
-        /// <summary>Sends debugging commands to HL-DT-ST DVD drives</summary>
-        HlDtStVendor = 0xE7,
-        #endregion HL-DT-ST vendor commands
-
-        #region NEC vendor commands
-        /// <summary>Reads CD-DA data</summary>
-        NecReadCdDa = 0xD4,
-        #endregion NEC vendor commands
-
-        #region Adaptec vendor commands
-        /// <summary>Translates a SCSI LBA to a drive's CHS</summary>
-        AdaptecTranslate = 0x0F,
-
-        /// <summary>Configures Adaptec controller error threshold</summary>
-        AdaptecSetErrorThreshold = 0x10,
-
-        /// <summary>Reads and resets error and statistical counters</summary>
-        AdaptecReadCounters = 0x11,
-
-        /// <summary>Writes to controller's RAM</summary>
-        AdaptecWriteBuffer = 0x13,
-
-        /// <summary>Reads controller's RAM</summary>
-        AdaptecReadBuffer = 0x14,
-        #endregion Adaptec vendor commands
-
-        #region Archive Corp. vendor commands
-        /// <summary>Gets current position's block address</summary>
-        ArchiveRequestBlockAddress = 0x02,
-
-        /// <summary>Seeks to specified block address</summary>
-        ArchiveSeekBlock = 0x0C,
-        #endregion Archive Corp. vendor commands
+    /// <summary>Requests the LUN to report events and statuses MMC-2 rev. 11a</summary>
+    GetEventStatusNotification = 0x4A,
 
-        #region Certance vendor commands
-        /// <summary>Parks the load arm in preparation for transport</summary>
-        CertanceParkUnpark = 0x06,
-        #endregion Certance vendor commands
+    /// <summary>Provides a method to profile the performance of the drive MMC-2 rev. 11a</summary>
+    GetPerformance = 0xAC,
 
-        #region Fujitsu vendor commands
-        /// <summary>Used to check the controller's data and control path</summary>
-        FujitsuLoopWriteToRead = 0xC1,
+    /// <summary>Requests the device changer to load or unload a disc MMC-1 rev. 9</summary>
+    LoadUnloadCd = 0xA6,
 
-        /// <summary>Used to display a message on the operator panel</summary>
-        FujitsuDisplay = 0xCF,
-        #endregion Fujitsu vendor commands
+    /// <summary>Requests the device changer to load or unload a disc MMC-2 rev. 11a</summary>
+    LoadUnloadMedium = 0xA6,
 
-        #region M-Systems vendor commands
-        /// <summary>Securely erases all flash blocks, including defective, spared and unused</summary>
-        MSystemsSecurityErase = 0xFF,
+    /// <summary>Requests information about the current status of the CD device, including any changer mechanism MMC-1 rev. 9</summary>
+    MechanicalStatus = 0xBD,
 
-        /// <summary>Securely erases all flash blocks, including defective, spared and unused</summary>
-        MSystemsSecurityEraseOld = 0xDF,
-        #endregion M-Systems vendor commands
+    /// <summary>Requests the device to start or stop an audio play operation SCSI-2 X3T9.2/375R rev. 10l</summary>
+    PauseResume = 0x4B,
 
-        #region Plasmon vendor commands
-        /// <summary>Retrieves sector address</summary>
-        PlasmonReadSectorLocation = 0xE6,
+    /// <summary>Begins an audio playback SCSI-2 X3T9.2/375R rev. 10l</summary>
+    PlayAudio = 0x45,
 
-        /// <summary>Makes a Compliant WORM block completely unreadable</summary>
-        PlasmonShred = 0xEE,
-        #endregion Plasmon vendor commands
+    /// <summary>Begins an audio playback SCSI-2 X3T9.2/375R rev. 10l</summary>
+    PlayAudio12 = 0xA5,
 
-        #region Kreon vendor commands
-        /// <summary>Most Kreon commands start with this</summary>
-        KreonCommand = 0xFF,
+    /// <summary>Begins an audio playback using MSF addressing SCSI-2 X3T9.2/375R rev. 10l</summary>
+    PlayAudioMsf = 0x47,
 
-        /// <summary>Kreon extract Security Sectors command start with this</summary>
-        KreonSsCommand = 0xAD,
-        #endregion Kreon vendor commands
+    /// <summary>Begins an audio playback from the specified index of the specified track SCSI-2 X3T9.2/375R rev. 10l</summary>
+    PlayAudioTrackIndex = 0x48,
 
-        #region MiniDisc vendor commands
-        /// <summary>Gets some list of pointers only present on MD-DATA discs</summary>
-        MiniDiscReadDTOC = 0xD1,
-        /// <summary>Writes some list of pointers only present on MD-DATA discs</summary>
-        MiniDiscWriteDTOC = 0xD2,
-        /// <summary>Reads UTOC</summary>
-        MiniDiscReadUTOC = 0xD4,
-        /// <summary>Unknown, returns 4 empty bytes</summary>
-        MiniDiscD5 = 0xD5,
-        /// <summary>Stops playing audio</summary>
-        MiniDiscStopPlay = 0xD6,
-        /// <summary>Gets current audio playing position</summary>
-        MiniDiscReadPosition = 0xD7,
-        /// <summary>Gets some values that are identical amongst audio discs and data discs, different between them</summary>
-        MiniDiscGetType = 0xD8,
-        #endregion
+    /// <summary>Begins an audio playback from the position relative of a track SCSI-2 X3T9.2/375R rev. 10l</summary>
+    PlayTrackRelative = 0x49,
 
-        #region MediaTek vendor commands
-        MediaTekVendorCommand = 0xF1
-        #endregion
-    }
-    #endregion SCSI Commands
-
-    /// <summary>SCSI command transfer direction</summary>
-    public enum ScsiDirection
-    {
-        /// <summary>No data transfer happens</summary>
-        None = 0,
-
-        /// <summary>From host to device</summary>
-        Out = 1,
-
-        /// <summary>From device to host</summary>
-        In = 2,
-
-        /// <summary>Bidirectional device/host</summary>
-        Bidirectional = 3,
-
-        /// <summary>Unspecified</summary>
-        Unspecified = -1
-    }
-
-    #region SCSI's ATA Command Pass-Through
-    public enum AtaProtocol : byte
-    {
-        /// <summary>Requests a device hard reset (pin 1)</summary>
-        HardReset = 0,
-
-        /// <summary>Requests a device soft reset (COMRESET issue)</summary>
-        SoftReset = 1,
-
-        /// <summary>No data is to be transferred</summary>
-        NonData = 3,
-
-        /// <summary>Requests a device->host transfer using PIO</summary>
-        PioIn = 4,
-
-        /// <summary>Requests a host->device transfer using PIO</summary>
-        PioOut = 5,
-
-        /// <summary>Requests a DMA transfer</summary>
-        Dma = 6,
-
-        /// <summary>Requests to queue a DMA transfer</summary>
-        DmaQueued = 7,
-
-        /// <summary>Requests device diagnostics</summary>
-        DeviceDiagnostic = 8,
-
-        /// <summary>Requests device reset</summary>
-        DeviceReset = 9,
-
-        /// <summary>Requests a device->host transfer using UltraDMA</summary>
-        UDmaIn = 10,
-
-        /// <summary>Requests a host->device transfer using UltraDMA</summary>
-        UDmaOut = 11,
-
-        /// <summary>Unknown Serial ATA</summary>
-        FpDma = 12,
-
-        /// <summary>Requests the Extended ATA Status Return Descriptor</summary>
-        ReturnResponse = 15
-    }
-
-    /// <summary>Indicates the STL which ATA register contains the length of data to be transferred</summary>
-    public enum AtaTransferRegister : byte
-    {
-        /// <summary>There is no transfer</summary>
-        NoTransfer = 0,
-
-        /// <summary>FEATURE register contains the data length</summary>
-        Feature = 1,
-
-        /// <summary>SECTOR_COUNT register contains the data length</summary>
-        SectorCount = 2,
-
-        /// <summary>The STPSIU contains the data length</summary>
-        Sptsiu = 3
-    }
-    #endregion SCSI's ATA Command Pass-Through
-
-    /// <summary>ZBC sub-commands, mask 0x1F</summary>
-    public enum ZbcSubCommands : byte
-    {
-        /// <summary>Returns list with zones of specified types</summary>
-        ReportZones = 0x00,
+    /// <summary>Begins an audio playback from the position relative of a track SCSI-2 X3T9.2/375R rev. 10l</summary>
+    PlayTrackRelative12 = 0xA9,
 
-        /// <summary>Closes a zone</summary>
-        CloseZone = 0x01,
+    /// <summary>Reports the total and blank area of the device buffer MMC-1 rev. 9</summary>
+    ReadBufferCapacity = 0x5C,
 
-        /// <summary>Finishes a zone</summary>
-        FinishZone = 0x02,
+    /// <summary>Reads a block from a CD with any of the requested CD data streams MMC-1 rev. 9</summary>
+    ReadCd = 0xBE,
 
-        /// <summary>Opens a zone</summary>
-        OpenZone = 0x03,
+    /// <summary>Reads a block from a CD with any of the requested CD data streams using MSF addressing MMC-1 rev. 9</summary>
+    ReadCdMsf = 0xB9,
 
-        /// <summary>Resets zone's write pointer to zone start</summary>
-        ResetWritePointer = 0x04,
+    /// <summary>Returns the recorded size of the CD MMC-1 rev. 9</summary>
+    ReadCdRecordedCapacity = 0x25,
 
-        /// <summary>Requests device to transfer parameters describing realms</summary>
-        ReportRealms = 0x06,
-        /// <summary>Requests device to transfer parameters describing the zone domains structure</summary>
-        ReportZoneDomains = 0x07,
-        /// <summary>Requests device to perform a zone activation operation</summary>
-        ZoneActivate = 0x08,
-        /// <summary>Requests information about a zone</summary>
-        ZoneQuery = 0x09,
-        /// <summary>Requests device to perform sequentialize zone operations</summary>
-        SequentializeZone = 0x10
-    }
+    /// <summary>Gets information about all discs: CD-ROM, CD-R and CD-RW MMC-1 rev. 9</summary>
+    ReadDiscInformation = 0x51,
 
-    /// <summary>MODE SENSE page control, mask 0xC0</summary>
-    public enum ScsiModeSensePageControl : byte
-    {
-        /// <summary>Current values</summary>
-        Current = 0x00,
+    /// <summary>Reads areas from the DVD or BD media MMC-5 rev. 2c</summary>
+    ReadDiscStructure = 0xAD,
 
-        /// <summary>Changeable values</summary>
-        Changeable = 0x40,
+    /// <summary>Reads areas from the DVD media MMC-2 rev. 11a</summary>
+    ReadDvdStructure = 0xAD,
 
-        /// <summary>Default values</summary>
-        Default = 0x80,
+    /// <summary>Requests a list of the possible format capacities for an installed random-writable media MMC-2 rev. 11a</summary>
+    ReadFormatCapacities = 0x23,
 
-        /// <summary>Saved values</summary>
-        Saved = 0xC0
-    }
+    /// <summary>Reads the data block header of the specified CD-ROM block SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ReadHeader = 0x44,
 
-    public enum ScsiPreventAllowMode : byte
-    {
-        /// <summary>Allows medium removal from data transport and from medium changer</summary>
-        Allow = 0x00,
+    /// <summary>Reads the mastering information from a Master CD. MMC-1 rev. 9</summary>
+    ReadMasterCue = 0x59,
 
-        /// <summary>Prevents medium removal from data transport but allows it from medium changer</summary>
-        Prevent = 0x01,
+    /// <summary>Requests the Q subchannel and the current audio playback status SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ReadSubChannel = 0x42,
 
-        /// <summary>Allows medium removal from data transport but prevents it from medium changer</summary>
-        PreventChanger = 0x02,
+    /// <summary>Requests the medium TOC, PMA or ATIP from the device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ReadTocPmaAtip = 0x43,
 
-        /// <summary>Prevents medium removal from both data transport and medium changer</summary>
-        PreventAll = 0x03
-    }
+    /// <summary>Gets information about a track regardless of its status MMC-1 rev. 9</summary>
+    ReadTrackInformation = 0x52,
 
-    public enum MmcGetConfigurationRt : byte
-    {
-        /// <summary>Drive shall return the Feature Header and all Feature Descriptors</summary>
-        All = 0x00,
+    /// <summary>Repairs an incomplete ECC block at the end of an RZone Mt. Fuji ver. 7 rev. 1.21</summary>
+    RepairRZone = 0x58,
 
-        /// <summary>Drive shall return the Feature Header and current Feature Descriptors</summary>
-        Current = 0x01,
+    /// <summary>Repairs an incomplete packet at the end of a packet writing track MMC-1 rev. 9</summary>
+    RepairTrack = 0x58,
 
-        /// <summary>Drive shall return only the Feature Header with the chosen Feature Descriptor</summary>
-        Single = 0x02, Reserved = 0x03
-    }
+    /// <summary>
+    ///     Requests the start of the authentication process and provides data necessary for authentication and for
+    ///     generating a Bus Key MMC-2 rev. 11a
+    /// </summary>
+    ReportKey = 0xA4,
 
-    public enum MmcDiscStructureMediaType : byte
-    {
-        /// <summary>Disc Structures for DVD and HD DVD</summary>
-        Dvd = 0x00,
+    /// <summary>Reserves disc space for a track MMC-1 rev. 9</summary>
+    ReserveTrack = 0x53,
 
-        /// <summary>Disc Structures for BD</summary>
-        Bd = 0x01
-    }
+    /// <summary>
+    ///     Fast-forwards or fast-reverses the audio playback to the specified block. Stops if it encounters a data track
+    ///     MMC-1 rev. 9
+    /// </summary>
+    ScanMmc = 0xBA,
 
-    public enum MmcDiscStructureFormat : byte
-    {
-        // Generic Format Codes
+    /// <summary>Sends a cue sheet for session-at-once recording MMC-1 rev. 9</summary>
+    SendCueSheet = 0x5D,
 
-        /// <summary>AACS Volume Identifier</summary>
-        AacsVolId = 0x80,
+    /// <summary>Transfer a DVD or BD structure for media writing MMC-5 rev. 2c</summary>
+    SendDiscStructure = 0xAD,
 
-        /// <summary>AACS Pre-recorded Media Serial Number</summary>
-        AacsMediaSerial = 0x81,
+    /// <summary>Transfer a DVD structure for media writing MMC-2 rev. 11a</summary>
+    SendDvdStructure = 0xAD,
 
-        /// <summary>AACS Media Identifier</summary>
-        AacsMediaId = 0x82,
+    /// <summary>Requests the LUN to process an event MMC-2 rev. 11a</summary>
+    SendEvent = 0xA2,
 
-        /// <summary>AACS Lead-in Media Key Block</summary>
-        Aacsmkb = 0x83,
+    /// <summary>Provides data necessary for authentication and for generating a Bus Key MMC-2 rev. 11a</summary>
+    SendKey = 0xA3,
 
-        /// <summary>AACS Data Keys</summary>
-        AacsDataKeys = 0x84,
+    /// <summary>Restores the Optimum Power Calibration values to the drive for a specific disc MMC-1 rev. 9</summary>
+    SendOpcInformation = 0x54,
 
-        /// <summary>AACS LBA extents</summary>
-        AacslbaExtents = 0x85,
+    /// <summary>Sets the spindle speed to be used while reading/writing data to a CD MMC-1 rev. 9</summary>
+    SetCdRomSpeed = 0xBB,
 
-        /// <summary>CPRM Media Key Block specified by AACS</summary>
-        Aacsmkbcprm = 0x86,
+    /// <summary>Requests the LUN to perform read ahead caching operations from the specified block MMC-2 rev. 11a</summary>
+    SetReadAhead = 0xA7,
 
-        /// <summary>Recognized format layers</summary>
-        RecognizedFormatLayers = 0x90,
+    /// <summary>Indicates the LUN to try to achieve a specified performance MMC-2 rev. 11a</summary>
+    SetStreaming = 0xB6,
 
-        /// <summary>Write protection status</summary>
-        WriteProtectionStatus = 0xC0,
+    /// <summary>Stops a scan and continues audio playback from current scanning position MMC-1 rev. 9</summary>
+    StopPlayScan = 0x4E,
+    #endregion SCSI Multimedia Commands (MMC)
 
-        /// <summary>READ/SEND DISC STRUCTURE capability list</summary>
-        CapabilityList = 0xFF,
+    #region SCSI Scanner Commands
+    /// <summary>Gets information about the data buffer SCSI-2 X3T9.2/375R rev. 10l</summary>
+    GetDataBufferStatus = 0x34,
 
-        // DVD Disc Structures
-        /// <summary>DVD Lead-in Physical Information</summary>
-        PhysicalInformation = 0x00,
+    /// <summary>Gets information about previously defined windows SCSI-2 X3T9.2/375R rev. 10l</summary>
+    GetWindow = 0x25,
 
-        /// <summary>DVD Lead-in Copyright Information</summary>
-        CopyrightInformation = 0x01,
+    /// <summary>Provides positioning functions SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ObjectPosition = 0x31,
 
-        /// <summary>CSS/CPPM Disc key</summary>
-        DiscKey = 0x02,
+    /// <summary>Begins a scan operation SCSI-2 X3T9.2/375R rev. 10l</summary>
+    Scan = 0x1B,
 
-        /// <summary>DVD Burst Cutting Area</summary>
-        BurstCuttingArea = 0x03,
+    /// <summary>Specifies one or more windows within the device's scanning range SCSI-2 X3T9.2/375R rev. 10l</summary>
+    SetWindow = 0x24,
 
-        /// <summary>DVD Lead-in Disc Manufacturing Information</summary>
-        DiscManufacturingInformation = 0x04,
+    /// <summary>Sends data to the device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    Send10 = 0x2A,
+    #endregion SCSI Scanner Commands
 
-        /// <summary>DVD Copyright Information from specified sector</summary>
-        SectorCopyrightInformation = 0x05,
+    #region SCSI Block Commands for Optical Media (SBC)
+    /// <summary>Erases the specified number of blocks</summary>
+    Erase10 = 0x2C,
 
-        /// <summary>CSS/CPPM Media Identifier</summary>
-        MediaIdentifier = 0x06,
+    /// <summary>Erases the specified number of blocks</summary>
+    Erase12 = 0xAC,
 
-        /// <summary>CSS/CPPM Media Key Block</summary>
-        MediaKeyBlock = 0x07,
+    /// <summary>Searches the medium for a contiguous set of written or blank blocks</summary>
+    MediumScan = 0x38,
 
-        /// <summary>DDS from DVD-RAM</summary>
-        DvdramDds = 0x08,
+    /// <summary>Reads blocks from device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    Read12 = 0xA8,
 
-        /// <summary>DVD-RAM Medium Status</summary>
-        DvdramMediumStatus = 0x09,
+    /// <summary>Gets medium's defect data SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ReadDefectData12 = 0xB7,
 
-        /// <summary>DVD-RAM Spare Area Information</summary>
-        DvdramSpareAreaInformation = 0x0A,
+    /// <summary>Gets the maximum generation address for the specified block</summary>
+    ReadGeneration = 0x29,
 
-        /// <summary>DVD-RAM Recording Type Information</summary>
-        DvdramRecordingType = 0x0B,
+    /// <summary>Reads a specified generation of a specified block</summary>
+    ReadUpdatedBlock = 0x2D,
 
-        /// <summary>DVD-R/-RW RMD in last Border-out</summary>
-        LastBorderOutRmd = 0x0C,
+    /// <summary>Searches data on blocks SCSI-2 X3T9.2/375R rev. 10l</summary>
+    SearchDataEqual12 = 0xB1,
 
-        /// <summary>Specified RMD from last recorded Border-out</summary>
-        SpecifiedRmd = 0x0D,
+    /// <summary>Searches data on blocks using major than or equal comparison SCSI-2 X3T9.2/375R rev. 10l</summary>
+    SearchDataHigh12 = 0xB0,
 
-        /// <summary>DVD-R/-RW Lead-in pre-recorded information</summary>
-        PreRecordedInfo = 0x0E,
+    /// <summary>Searches data on blocks using minor than or equal comparison SCSI-2 X3T9.2/375R rev. 10l</summary>
+    SearchDataLow12 = 0xB2,
 
-        /// <summary>DVD-R/-RW Media Identifier</summary>
-        DvdrMediaIdentifier = 0x0F,
+    /// <summary>Defines the range within which subsequent linked commands may operate SCSI-2 X3T9.2/375R rev. 10l</summary>
+    SetLimits12 = 0xB3,
 
-        /// <summary>DVD-R/-RW Physical Format Information</summary>
-        DvdrPhysicalInformation = 0x10,
+    /// <summary>Replaces a block with data</summary>
+    UpdateBlock = 0x3D,
 
-        /// <summary>ADIP</summary>
-        Adip = 0x11,
+    /// <summary>Verifies blocks on the device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    Verify12 = 0xAF,
 
-        /// <summary>HD DVD Lead-in Copyright Protection Information</summary>
-        HddvdCopyrightInformation = 0x12,
+    /// <summary>Writes blocks to the device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    Write12 = 0xAA,
 
-        /// <summary>AACS Lead-in Copyright Data Section</summary>
-        DvdAacs = 0x15,
+    /// <summary>Writes blocks to the device and then verifies them SCSI-2 X3T9.2/375R rev. 10l</summary>
+    WriteAndVerify12 = 0xAE,
+    #endregion SCSI Block Commands for Optical Media (SBC)
 
-        /// <summary>HD DVD-R Medium Status</summary>
-        HddvdrMediumStatus = 0x19,
+    #region SCSI Medium Changer Commands (SMC)
+    /// <summary>
+    ///     Provides a means to exchange the medium in the source element with the medium at destination element SCSI-2
+    ///     X3T9.2/375R rev. 10l
+    /// </summary>
+    ExchangeMedium = 0xA6,
 
-        /// <summary>HD DVD-R Last recorded RMD in the latest RMZ</summary>
-        HddvdrLastRmd = 0x1A,
+    /// <summary>Checks all elements for medium and any other relevant status SCSI-2 X3T9.2/375R rev. 10l</summary>
+    InitializeElementStatus = 0x07,
 
-        /// <summary>DVD+/-R DL and DVD-Download DL layer capacity</summary>
-        DvdrLayerCapacity = 0x20,
+    /// <summary>Checks all elements for medium and any other relevant status in the specified range of elements SMC-2 rev. 7</summary>
+    InitializeElementStatusWithRange = 0x37,
 
-        /// <summary>DVD-R DL Middle Zone start address</summary>
-        MiddleZoneStart = 0x21,
+    /// <summary>Moves a medium from an element to another SCSI-2 X3T9.2/375R rev. 10l</summary>
+    MoveMedium = 0xA5,
 
-        /// <summary>DVD-R DL Jump Interval Size</summary>
-        JumpIntervalSize = 0x22,
+    /// <summary>Moves a medium that's currently attached to another element SPC-1 rev. 10</summary>
+    MoveMediumAttached = 0xA7,
 
-        /// <summary>DVD-R DL Start LBA of the manual layer jump</summary>
-        ManualLayerJumpStartLba = 0x23,
+    /// <summary>Provides a method to change the open/closed state of the specified import/export element SMC-3 rev. 12</summary>
+    OpenCloseImportExportElement = 0x1B,
 
-        /// <summary>DVD-R DL Remapping information of the specified Anchor Point</summary>
-        RemapAnchorPoint = 0x24,
+    /// <summary>Positions the transport element in front of the destination element SCSI-2 X3T9.2/375R rev. 10l</summary>
+    PositionToElement = 0x2B,
 
-        /// <summary>Disc Control Block</summary>
-        Dcb = 0x30,
+    /// <summary>Requests the status of the elements SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ReadElementStatus = 0xB8,
 
-        // BD Disc Structures
-        /// <summary>Blu-ray Disc Information</summary>
-        DiscInformation = 0x00,
+    /// <summary>Requests the status of the attached element SPC-1 rev. 10</summary>
+    ReadElementStatusAttached = 0xB4,
 
-        /// <summary>Blu-ray Burst Cutting Area</summary>
-        BdBurstCuttingArea = 0x03,
+    /// <summary>Releases a reserved LUN SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ReleaseElement = 0x17,
 
-        /// <summary>Blu-ray DDS</summary>
-        BdDds = 0x08,
+    /// <summary>Releases a reserved LUN SMC-1 rev. 10a</summary>
+    ReleaseElement10 = 0x57,
 
-        /// <summary>Blu-ray Cartridge Status</summary>
-        CartridgeStatus = 0x09,
+    /// <summary>Requests information regarding the supported volume types for the device SMC-3 rev. 12</summary>
+    ReportVolumeTypesSupported = 0x44,
 
-        /// <summary>Blu-ray Spare Area Information</summary>
-        BdSpareAreaInformation = 0x0A,
+    /// <summary>Gets the results of <see cref="SendVolumeTag" /> SCSI-2 X3T9.2/375R rev. 10l</summary>
+    RequestVolumeElementAddress = 0xB5,
 
-        /// <summary>Unmodified DFL</summary>
-        RawDfl = 0x12,
+    /// <summary>Reserves a LUN SCSI-2 X3T9.2/375R rev. 10l</summary>
+    ReserveElement = 0x16,
 
-        /// <summary>Physical Access Control</summary>
-        Pac = 0x30
-    }
+    /// <summary>Reserves a LUN SMC-1 rev. 10a</summary>
+    ReserveElement10 = 0x56,
 
-    public enum ScsiServiceActions : byte
-    {
-        // SERVICE ACTION IN
+    /// <summary>
+    ///     Transfers a volume tag template to be searched or new volume tag information for one or more elements SCSI-2
+    ///     X3T9.2/375R rev. 10l
+    /// </summary>
+    SendVolumeTag = 0xB6,
+    #endregion SCSI Medium Changer Commands (SMC)
 
-        /// <summary>Requests parameter data describing provisioning status for the specified LBA SBC-3 rev. 25</summary>
-        GetLbaStatus = 0x12,
+    #region SCSI Communication Commands
+    /// <summary>Gets data from the device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    GetMessage = 0x08,
 
-        /// <summary>Gets device capacity SBC-2 rev. 4</summary>
-        ReadCapacity16 = 0x10,
+    /// <summary>Gets data from the device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    GetMessage10 = 0x28,
 
-        /// <summary>Reads blocks from device in a vendor-specific way that should include the ECC alongside the data SBC-2 rev. 4</summary>
-        ReadLong16 = 0x11,
+    /// <summary>Gets data from the device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    GetMessage12 = 0xA8,
 
-        /// <summary>Requests information indicating the user data segments on the ports and LUNs to access them SBC-3 rev. 25</summary>
-        ReportReferrals = 0x13,
+    /// <summary>Sends data to the device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    SendMessage = 0x0A,
 
-        // SERVICE ACTION OUT
+    /// <summary>Sends data to the device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    SendMessage10 = 0x2A,
 
-        /// <summary>
-        ///     Writes blocks to the device with a vendor specified format that shall include the ECC alongside the data SBC-2
-        ///     rev. 4
-        /// </summary>
-        WriteLong16 = ReadLong16
-    }
+    /// <summary>Sends data to the device SCSI-2 X3T9.2/375R rev. 10l</summary>
+    SendMessage12 = 0xAA,
+    #endregion SCSI Communication Commands
 
-    public enum MmcDiscInformationDataTypes : byte
-    {
-        /// <summary>Standard Disc Information</summary>
-        DiscInformation = 0x00,
+    #region SCSI Controller Commands
+    /// <summary>Commands that get information about redundancy groups SCC-2 rev. 4</summary>
+    RedundancyGroupIn = 0xBA,
 
-        /// <summary>Track Resources Information</summary>
-        TrackResources = 0x01,
+    /// <summary>Commands that set information about redundancy groups SCC-2 rev. 4</summary>
+    RedundancyGroupOut = 0xBB,
 
-        /// <summary>POW Resources Information</summary>
-        PowResources = 0x02
-    }
+    /// <summary>Commands that get information about volume sets SCC-2 rev. 4</summary>
+    VolumeSetIn = 0xBE,
 
-    public enum MmcSectorTypes : byte
-    {
-        /// <summary>No checking of data type is performed</summary>
-        AllTypes = 0x00,
+    /// <summary>Commands that set information about volume sets SCC-2 rev. 4</summary>
+    VolumeSetOut = 0xBF,
+    #endregion SCSI Controller Commands
 
-        /// <summary>Only CD-DA sectors shall be returned</summary>
-        Cdda = 0x01,
+    #region Pioneer CD-ROM SCSI-2 Command Set
+    /// <summary>Scans for a block playing a block on each track cross</summary>
+    AudioScan = 0xCD,
 
-        /// <summary>Only Mode 1 sectors shall be returned</summary>
-        Mode1 = 0x02,
+    /// <summary>Requests the drive the status from the previous WriteCDP command.</summary>
+    ReadCdp = 0xE4,
 
-        /// <summary>Only Mode 2 formless sectors shall be returned</summary>
-        Mode2 = 0x03,
+    /// <summary>Requests status from the drive</summary>
+    ReadDriveStatus = 0xE0,
 
-        /// <summary>Only Mode 2 Form 1 sectors shall be returned</summary>
-        Mode2Form1 = 0x04,
+    /// <summary>Reads CD-DA data and/or subcode data</summary>
+    ReadCdDa = 0xD8,
 
-        /// <summary>Only Mode 2 Form 2 sectors shall be returned</summary>
-        Mode2Form2 = 0x05
-    }
+    /// <summary>Reads CD-DA data and/or subcode data using MSF addressing</summary>
+    ReadCdDaMsf = 0xD9,
 
-    public enum MmcHeaderCodes : byte
-    {
-        /// <summary>No header information shall be returned</summary>
-        None = 0x00,
+    /// <summary>Reads CD-XA data</summary>
+    ReadCdXa = 0xDB,
 
-        /// <summary>Only the four byte header shall be returned</summary>
-        HeaderOnly = 0x01,
+    /// <summary>Reads all subcode data</summary>
+    ReadAllSubCode = 0xDF,
 
-        /// <summary>Only the mode 2 form x subheader shall be returned</summary>
-        SubHeaderOnly = 0x02,
+    /// <summary>Sets the spindle speed to be used while reading/writing data to a CD</summary>
+    SetCdSpeed = 0xDA, WriteCdp = 0xE3,
+    #endregion
 
-        /// <summary>Return both header and subheader</summary>
-        AllHeaders = 0x03
-    }
+    #region ATA Command Pass-Through
+    /// <summary>Sends a 24-bit ATA command to the device Clashes with <see cref="Blank" /> ATA CPT rev. 8a</summary>
+    AtaPassThrough = 0xA1,
 
-    public enum MmcErrorField : byte
-    {
-        /// <summary>No error information is returned</summary>
-        None = 0x00,
+    /// <summary>Sends a 48-bit ATA command to the device ATA CPT rev. 8a</summary>
+    AtaPassThrough16 = 0x85,
+    #endregion ATA Command Pass-Through
 
-        /// <summary>The C2 pointer bits will be included</summary>
-        C2Pointers = 0x01,
+    #region 6-byte CDB aliases
+    ModeSelect6 = ModeSelect, ModeSense6 = ModeSense, Read6 = Read,
+    Seek6       = Seek, Write6           = Write,
+    #endregion 6-byte CDB aliases
 
-        /// <summary>The C2 pointer bits will be included as well as the block error byte with a padding byte</summary>
-        C2PointersAndBlock = 0x02
-    }
+    #region SCSI Zoned Block Commands
+    /// <summary>ZBC commands with host->device information</summary>
+    ZbcOut = 0x94,
 
-    public enum MmcSubchannel : byte
-    {
-        /// <summary>No subchannel shall be returned</summary>
-        None = 0x00,
+    /// <summary>ZBC commands with device->host information</summary>
+    ZbcIn = 0x95,
+    #endregion
 
-        /// <summary>The raw P to W subchannel data shall be transferred</summary>
-        Raw = 0x01,
+    #region SCSI Commands with unknown meaning, mostly vendor specific
+    SetCdSpeedUnk              = 0xB8, WriteCdMsf    = 0xA2, WriteCd          = 0xAA,
+    ReadDefectTag              = 0xB7, PlayCd        = 0xBC, SpareIn          = 0xBC,
+    SpareOut                   = 0xBD, WriteStream16 = 0x9A, WriteAtomic      = 0x9C,
+    ServiceActionBidirectional = 0x9D, WriteLong2    = 0xEA, UnknownCdCommand = 0xD4,
+    UnknownCdCommand2          = 0xD5,
+    #endregion SCSI Commands with unknown meaning, mostly vendor specific
 
-        /// <summary>Q data shall be transferred</summary>
-        Q16 = 0x02,
+    #region SEGA Packet Interface (all are 12-byte CDB)
+    /// <summary>Verifies that the device can be accessed Sega SPI ver. 1.30</summary>
+    SegaTestUnit = TestUnitReady,
 
-        /// <summary>De-interleaved and error-corrected R to W subchannel data shall be transferred</summary>
-        Rw = 0x04
-    }
+    /// <summary>Gets current CD status Sega SPI ver. 1.30</summary>
+    SegaRequestStatus = 0x10,
 
-    public enum PioneerSubchannel : byte
-    {
-        /// <summary>No subchannel shall be returned</summary>
-        None = 0x00,
+    /// <summary>Gets CD block mode info Sega SPI ver. 1.30</summary>
+    SegaRequestMode = 0x11,
 
-        /// <summary>Q data shall be transferred</summary>
-        Q16 = 0x01,
+    /// <summary>Sets CD block mode Sega SPI ver. 1.30</summary>
+    SegaSetMode = 0x12,
 
-        /// <summary>The raw P to W subchannel data shall be transferred</summary>
-        All = 0x02,
+    /// <summary>Requests device error info Sega SPI ver. 1.30</summary>
+    SegaRequestError = 0x13,
 
-        /// <summary>The raw P to W subchannel data shall be transferred WITHOUT user data</summary>
-        Only = 0x03
-    }
+    /// <summary>Gets disc TOC Sega SPI ver. 1.30</summary>
+    SegaGetToc = 0x14,
 
-    public enum PlextorSubchannel : byte
-    {
-        /// <summary>No subchannel shall be returned</summary>
-        None = 0x00,
+    /// <summary>Gets specified session data Sega SPI ver. 1.30</summary>
+    SegaRequestSession = 0x15,
 
-        /// <summary>Q data shall be transferred</summary>
-        Q16 = 0x01,
+    /// <summary>
+    ///     Stops the drive and opens the drive tray, or, on manual trays, stays busy until it is opened Sega SPI ver.
+    ///     1.30
+    /// </summary>
+    SegaOpenTray = 0x16,
 
-        /// <summary>The packed and corrected P to W subchannel data shall be transferred</summary>
-        Pack = 0x02,
+    /// <summary>Starts audio playback Sega SPI ver. 1.30</summary>
+    SegaPlayCd = 0x20,
 
-        /// <summary>The raw P to W subchannel data shall be transferred</summary>
-        All = 0x03,
+    /// <summary>Moves drive pickup to specified block Sega SPI ver. 1.30</summary>
+    SegaSeek = 0x21,
 
-        /// <summary>The raw P to W subchannel data, plus C2 error data shall be transferred</summary>
-        RawC2 = 0x08
-    }
+    /// <summary>
+    ///     Fast-forwards or fast-reverses until Lead-In or Lead-Out arrive, or until another command is issued Sega SPI
+    ///     ver. 1.30
+    /// </summary>
+    SegaScan = 0x22,
 
-    public enum PlextorSubCommands : byte
-    {
-        /// <summary>Gets Plextor mode</summary>
-        GetMode = 0x00,
+    /// <summary>Reads blocks from the disc Sega SPI ver. 1.30</summary>
+    SegaRead = 0x30,
 
-        /// <summary>Sets Plextor mode</summary>
-        SetMode = 0x10,
+    /// <summary>Reads blocks from the disc seeking to another position at end Sega SPI ver. 1.30</summary>
+    SegaRead2 = 0x31,
 
-        /// <summary>Plextor force single session or hide CD-R</summary>
-        SessionHide = 0x01,
+    /// <summary>Reads disc subcode Sega SPI ver. 1.30</summary>
+    SegaGetSubcode = 0x40,
+    #endregion SEGA Packet Interface (all are 12-byte CDB)
 
-        /// <summary>Plextor VariRec</summary>
-        VariRec = 0x02,
+    /// <summary>Variable sized Command Description Block SPC-4 rev. 16</summary>
+    VariableSizedCdb = 0x7F,
 
-        /// <summary>Plextor GigaRec</summary>
-        GigaRec = 0x04,
+    #region Plextor vendor commands
+    /// <summary>Sends extended commands (like SpeedRead) to Plextor drives</summary>
+    PlextorExtend = 0xE9,
+
+    /// <summary>Command for Plextor PoweRec</summary>
+    PlextorPoweRec = 0xEB,
+
+    /// <summary>Sends extended commands (like PoweRec) to Plextor drives</summary>
+    PlextorExtend2 = 0xED,
+
+    /// <summary>Resets Plextor drives</summary>
+    PlextorReset = 0xEE,
+
+    /// <summary>Reads drive statistics from Plextor drives EEPROM</summary>
+    PlextorReadEeprom = 0xF1,
+    #endregion Plextor vendor commands
+
+    #region HL-DT-ST vendor commands
+    /// <summary>Sends debugging commands to HL-DT-ST DVD drives</summary>
+    HlDtStVendor = 0xE7,
+    #endregion HL-DT-ST vendor commands
+
+    #region NEC vendor commands
+    /// <summary>Reads CD-DA data</summary>
+    NecReadCdDa = 0xD4,
+    #endregion NEC vendor commands
+
+    #region Adaptec vendor commands
+    /// <summary>Translates a SCSI LBA to a drive's CHS</summary>
+    AdaptecTranslate = 0x0F,
+
+    /// <summary>Configures Adaptec controller error threshold</summary>
+    AdaptecSetErrorThreshold = 0x10,
+
+    /// <summary>Reads and resets error and statistical counters</summary>
+    AdaptecReadCounters = 0x11,
+
+    /// <summary>Writes to controller's RAM</summary>
+    AdaptecWriteBuffer = 0x13,
+
+    /// <summary>Reads controller's RAM</summary>
+    AdaptecReadBuffer = 0x14,
+    #endregion Adaptec vendor commands
+
+    #region Archive Corp. vendor commands
+    /// <summary>Gets current position's block address</summary>
+    ArchiveRequestBlockAddress = 0x02,
+
+    /// <summary>Seeks to specified block address</summary>
+    ArchiveSeekBlock = 0x0C,
+    #endregion Archive Corp. vendor commands
 
-        /// <summary>Plextor acoustic management (disc related)</summary>
-        SilentDisc = 0x06,
+    #region Certance vendor commands
+    /// <summary>Parks the load arm in preparation for transport</summary>
+    CertanceParkUnpark = 0x06,
+    #endregion Certance vendor commands
 
-        /// <summary>Plextor acoustic management (tra related)</summary>
-        SilentTray = 0x07,
+    #region Fujitsu vendor commands
+    /// <summary>Used to check the controller's data and control path</summary>
+    FujitsuLoopWriteToRead = 0xC1,
 
-        /// <summary>Plextor acoustic management</summary>
-        Silent = 0x08,
+    /// <summary>Used to display a message on the operator panel</summary>
+    FujitsuDisplay = 0xCF,
+    #endregion Fujitsu vendor commands
 
-        /// <summary>Plextor test write DVD+</summary>
-        TestWriteDvdPlus = 0x21,
+    #region M-Systems vendor commands
+    /// <summary>Securely erases all flash blocks, including defective, spared and unused</summary>
+    MSystemsSecurityErase = 0xFF,
 
-        /// <summary>Plextor book setting</summary>
-        BitSet = 0x22,
+    /// <summary>Securely erases all flash blocks, including defective, spared and unused</summary>
+    MSystemsSecurityEraseOld = 0xDF,
+    #endregion M-Systems vendor commands
 
-        /// <summary>Plextor SecuRec</summary>
-        SecuRec = 0xD5,
+    #region Plasmon vendor commands
+    /// <summary>Retrieves sector address</summary>
+    PlasmonReadSectorLocation = 0xE6,
 
-        /// <summary>Book setting for DVD+R</summary>
-        BitSetR = 0x0A,
+    /// <summary>Makes a Compliant WORM block completely unreadable</summary>
+    PlasmonShred = 0xEE,
+    #endregion Plasmon vendor commands
 
-        /// <summary>Book setting for DVD+R DL</summary>
-        BitSetRdl = 0x0E,
+    #region Kreon vendor commands
+    /// <summary>Most Kreon commands start with this</summary>
+    KreonCommand = 0xFF,
 
-        /// <summary>Plextor SpeedRead</summary>
-        SpeedRead = 0xBB
-    }
+    /// <summary>Kreon extract Security Sectors command start with this</summary>
+    KreonSsCommand = 0xAD,
+    #endregion Kreon vendor commands
 
-    public enum SscLogicalIdTypes : byte
-    {
-        /// <summary>Logical object identifier</summary>
-        ObjectId = 0,
+    #region MiniDisc vendor commands
+    /// <summary>Gets some list of pointers only present on MD-DATA discs</summary>
+    MiniDiscReadDTOC = 0xD1,
+    /// <summary>Writes some list of pointers only present on MD-DATA discs</summary>
+    MiniDiscWriteDTOC = 0xD2,
+    /// <summary>Reads UTOC</summary>
+    MiniDiscReadUTOC = 0xD4,
+    /// <summary>Unknown, returns 4 empty bytes</summary>
+    MiniDiscD5 = 0xD5,
+    /// <summary>Stops playing audio</summary>
+    MiniDiscStopPlay = 0xD6,
+    /// <summary>Gets current audio playing position</summary>
+    MiniDiscReadPosition = 0xD7,
+    /// <summary>Gets some values that are identical amongst audio discs and data discs, different between them</summary>
+    MiniDiscGetType = 0xD8,
+    #endregion
 
-        /// <summary>Logical file identifier</summary>
-        FileId = 1,
+    #region MediaTek vendor commands
+    MediaTekVendorCommand = 0xF1
+    #endregion
+}
+#endregion SCSI Commands
+
+/// <summary>SCSI command transfer direction</summary>
+public enum ScsiDirection
+{
+    /// <summary>No data transfer happens</summary>
+    None = 0,
+
+    /// <summary>From host to device</summary>
+    Out = 1,
+
+    /// <summary>From device to host</summary>
+    In = 2,
+
+    /// <summary>Bidirectional device/host</summary>
+    Bidirectional = 3,
+
+    /// <summary>Unspecified</summary>
+    Unspecified = -1
+}
+
+#region SCSI's ATA Command Pass-Through
+public enum AtaProtocol : byte
+{
+    /// <summary>Requests a device hard reset (pin 1)</summary>
+    HardReset = 0,
+
+    /// <summary>Requests a device soft reset (COMRESET issue)</summary>
+    SoftReset = 1,
+
+    /// <summary>No data is to be transferred</summary>
+    NonData = 3,
+
+    /// <summary>Requests a device->host transfer using PIO</summary>
+    PioIn = 4,
+
+    /// <summary>Requests a host->device transfer using PIO</summary>
+    PioOut = 5,
+
+    /// <summary>Requests a DMA transfer</summary>
+    Dma = 6,
+
+    /// <summary>Requests to queue a DMA transfer</summary>
+    DmaQueued = 7,
+
+    /// <summary>Requests device diagnostics</summary>
+    DeviceDiagnostic = 8,
+
+    /// <summary>Requests device reset</summary>
+    DeviceReset = 9,
+
+    /// <summary>Requests a device->host transfer using UltraDMA</summary>
+    UDmaIn = 10,
+
+    /// <summary>Requests a host->device transfer using UltraDMA</summary>
+    UDmaOut = 11,
+
+    /// <summary>Unknown Serial ATA</summary>
+    FpDma = 12,
+
+    /// <summary>Requests the Extended ATA Status Return Descriptor</summary>
+    ReturnResponse = 15
+}
+
+/// <summary>Indicates the STL which ATA register contains the length of data to be transferred</summary>
+public enum AtaTransferRegister : byte
+{
+    /// <summary>There is no transfer</summary>
+    NoTransfer = 0,
+
+    /// <summary>FEATURE register contains the data length</summary>
+    Feature = 1,
+
+    /// <summary>SECTOR_COUNT register contains the data length</summary>
+    SectorCount = 2,
+
+    /// <summary>The STPSIU contains the data length</summary>
+    Sptsiu = 3
+}
+#endregion SCSI's ATA Command Pass-Through
+
+/// <summary>ZBC sub-commands, mask 0x1F</summary>
+public enum ZbcSubCommands : byte
+{
+    /// <summary>Returns list with zones of specified types</summary>
+    ReportZones = 0x00,
 
-        /// <summary>Logical set identifier</summary>
-        SetId = 2,
+    /// <summary>Closes a zone</summary>
+    CloseZone = 0x01,
 
-        /// <summary>Reserved</summary>
-        Reserved = 3
-    }
+    /// <summary>Finishes a zone</summary>
+    FinishZone = 0x02,
 
-    public enum SscPositionForms : byte
-    {
-        /// <summary>20 bytes using logical block addresses</summary>
-        Short = 0,
+    /// <summary>Opens a zone</summary>
+    OpenZone = 0x03,
 
-        /// <summary>20 bytes using vendor-specified values</summary>
-        VendorShort = 1,
+    /// <summary>Resets zone's write pointer to zone start</summary>
+    ResetWritePointer = 0x04,
 
-        /// <summary>Equivalent to <see cref="Long" /> on SSC-1</summary>
-        OldLong = 2,
+    /// <summary>Requests device to transfer parameters describing realms</summary>
+    ReportRealms = 0x06,
+    /// <summary>Requests device to transfer parameters describing the zone domains structure</summary>
+    ReportZoneDomains = 0x07,
+    /// <summary>Requests device to perform a zone activation operation</summary>
+    ZoneActivate = 0x08,
+    /// <summary>Requests information about a zone</summary>
+    ZoneQuery = 0x09,
+    /// <summary>Requests device to perform sequentialize zone operations</summary>
+    SequentializeZone = 0x10
+}
 
-        /// <summary>Invalid: Equivalent to LONG + BT on SSC-1</summary>
-        OldLongVendor = 3,
+/// <summary>MODE SENSE page control, mask 0xC0</summary>
+public enum ScsiModeSensePageControl : byte
+{
+    /// <summary>Current values</summary>
+    Current = 0x00,
 
-        /// <summary>Invalid: Equivalent to TCLP on SSC-1</summary>
-        OldTclp = 4,
+    /// <summary>Changeable values</summary>
+    Changeable = 0x40,
 
-        /// <summary>Invalid: Equivalent to TCLP + BT on SSC-1</summary>
-        OldTclpVendor = 5,
+    /// <summary>Default values</summary>
+    Default = 0x80,
 
-        /// <summary>32 bytes</summary>
-        Long = 6,
+    /// <summary>Saved values</summary>
+    Saved = 0xC0
+}
 
-        /// <summary>Invalid: Equivalent to TCLP + LONG + BT on SSC-1</summary>
-        OldLongTclpVendor = 7,
+public enum ScsiPreventAllowMode : byte
+{
+    /// <summary>Allows medium removal from data transport and from medium changer</summary>
+    Allow = 0x00,
 
-        /// <summary>From 28 bytes to allocation length</summary>
-        Extended = 8
-    }
+    /// <summary>Prevents medium removal from data transport but allows it from medium changer</summary>
+    Prevent = 0x01,
 
-    public enum ScsiAttributeAction : byte
-    {
-        /// <summary>Return attribute values</summary>
-        Values = 0,
+    /// <summary>Allows medium removal from data transport but prevents it from medium changer</summary>
+    PreventChanger = 0x02,
 
-        /// <summary>Return a list of available attributes</summary>
-        List = 1,
+    /// <summary>Prevents medium removal from both data transport and medium changer</summary>
+    PreventAll = 0x03
+}
 
-        /// <summary>Returns a list of known logical volume numbers</summary>
-        VolumeList = 2,
+public enum MmcGetConfigurationRt : byte
+{
+    /// <summary>Drive shall return the Feature Header and all Feature Descriptors</summary>
+    All = 0x00,
 
-        /// <summary>Returns a list of known partition numbers</summary>
-        PartitionList = 3,
+    /// <summary>Drive shall return the Feature Header and current Feature Descriptors</summary>
+    Current = 0x01,
 
-        /// <summary>Returns a list of elements containing volumes with MAM</summary>
-        ElementList = 4,
+    /// <summary>Drive shall return only the Feature Header with the chosen Feature Descriptor</summary>
+    Single = 0x02, Reserved = 0x03
+}
 
-        /// <summary>Returns a list of supported attribute identifiers</summary>
-        Supported = 5
-    }
+public enum MmcDiscStructureMediaType : byte
+{
+    /// <summary>Disc Structures for DVD and HD DVD</summary>
+    Dvd = 0x00,
 
-    public enum FujitsuDisplayModes : byte
-    {
-        /// <summary>Message is displayed until next tape operation starts</summary>
-        Idle = 0,
+    /// <summary>Disc Structures for BD</summary>
+    Bd = 0x01
+}
 
-        /// <summary>Message is displayed only if a cartridge is inserted, until its removal</summary>
-        Cart = 1,
+public enum MmcDiscStructureFormat : byte
+{
+    // Generic Format Codes
 
-        /// <summary>Message is only displayed when drive is ready</summary>
-        Ready = 2,
+    /// <summary>AACS Volume Identifier</summary>
+    AacsVolId = 0x80,
 
-        /// <summary>Cancels current display</summary>
-        Cancel = 3,
+    /// <summary>AACS Pre-recorded Media Serial Number</summary>
+    AacsMediaSerial = 0x81,
 
-        /// <summary>
-        ///     Message is displayed only if a cartridge is inserted. When removed, only second half of the message is
-        ///     displayed.
-        /// </summary>
-        Half = 7
-    }
+    /// <summary>AACS Media Identifier</summary>
+    AacsMediaId = 0x82,
 
-    // TODO: Check obsoletes
-    public enum SscSpaceCodes : byte
-    {
-        /// <summary>Logical blocks</summary>
-        LogicalBlock = 0,
+    /// <summary>AACS Lead-in Media Key Block</summary>
+    Aacsmkb = 0x83,
 
-        /// <summary>Filemarks</summary>
-        Filemark = 1,
+    /// <summary>AACS Data Keys</summary>
+    AacsDataKeys = 0x84,
 
-        /// <summary>Sequential filemarks</summary>
-        SequentialFilemark = 2,
+    /// <summary>AACS LBA extents</summary>
+    AacslbaExtents = 0x85,
 
-        /// <summary>End-of-data</summary>
-        EndOfData = 3, Obsolete1 = 4, Obsolete2 = 5
-    }
+    /// <summary>CPRM Media Key Block specified by AACS</summary>
+    Aacsmkbcprm = 0x86,
 
-    /// <summary>MMC / SecureDigital commands</summary>
-    public enum MmcCommands : byte
-    {
-        #region Class 1 MMC Commands (Basic and read-stream)
-        /// <summary>Resets device to idle (BC)</summary>
-        GoIdle = 0,
+    /// <summary>Recognized format layers</summary>
+    RecognizedFormatLayers = 0x90,
 
-        /// <summary>Resets the device to pre-idle (BC)</summary>
-        GoPreIdleState = 0,
+    /// <summary>Write protection status</summary>
+    WriteProtectionStatus = 0xC0,
 
-        /// <summary>Initiate alternative boot operation</summary>
-        BootInitiation = 0,
+    /// <summary>READ/SEND DISC STRUCTURE capability list</summary>
+    CapabilityList = 0xFF,
 
-        /// <summary>Asks device in idle state to send their operation conditions in response (BCR, R3)</summary>
-        SendOpCond = 1,
+    // DVD Disc Structures
+    /// <summary>DVD Lead-in Physical Information</summary>
+    PhysicalInformation = 0x00,
 
-        /// <summary>Asks device to send their CID numbers (BCR, R2)</summary>
-        AllSendCid = 2,
+    /// <summary>DVD Lead-in Copyright Information</summary>
+    CopyrightInformation = 0x01,
 
-        /// <summary>Assigns a relative address to the device (AC, R1)</summary>
-        SetRelativeAddress = 3,
+    /// <summary>CSS/CPPM Disc key</summary>
+    DiscKey = 0x02,
 
-        /// <summary>Programs the DSR of the device (BC)</summary>
-        SetDsr = 4,
+    /// <summary>DVD Burst Cutting Area</summary>
+    BurstCuttingArea = 0x03,
 
-        /// <summary>Toggles the device between sleep and standby (AC, R1b)</summary>
-        SleepAwake = 5,
+    /// <summary>DVD Lead-in Disc Manufacturing Information</summary>
+    DiscManufacturingInformation = 0x04,
 
-        /// <summary>Switches device mode of operation (AC, R1b)</summary>
-        Switch = 6,
+    /// <summary>DVD Copyright Information from specified sector</summary>
+    SectorCopyrightInformation = 0x05,
 
-        /// <summary>
-        ///     Toggles a device between the stand-by and transfer stats or between the programming and disconnect states (AC,
-        ///     R1b)
-        /// </summary>
-        SelectCard = 7,
+    /// <summary>CSS/CPPM Media Identifier</summary>
+    MediaIdentifier = 0x06,
 
-        /// <summary>Asks device to send its extended card-specific data (ExtCSD) (ADTC, R1)</summary>
-        SendExtCsd = 8,
+    /// <summary>CSS/CPPM Media Key Block</summary>
+    MediaKeyBlock = 0x07,
 
-        /// <summary>Asks device to send its card-specific data (CSD) (AC, R2)</summary>
-        SendCsd = 9,
+    /// <summary>DDS from DVD-RAM</summary>
+    DvdramDds = 0x08,
 
-        /// <summary>Asks device to send its card identification (CID) (AC, R2)</summary>
-        SendCid = 10,
+    /// <summary>DVD-RAM Medium Status</summary>
+    DvdramMediumStatus = 0x09,
 
-        /// <summary>
-        ///     Reads data stream from device, starting at given address, until a <see cref="StopTransmission" /> follows
-        ///     (ADTC, R1)
-        /// </summary>
-        [Obsolete]
-        ReadDatUntilStop = 11,
+    /// <summary>DVD-RAM Spare Area Information</summary>
+    DvdramSpareAreaInformation = 0x0A,
 
-        /// <summary>Terminates a read/write stream/multiple block operation (AC, R1 / R1b)</summary>
-        StopTransmission = 12,
+    /// <summary>DVD-RAM Recording Type Information</summary>
+    DvdramRecordingType = 0x0B,
 
-        /// <summary>Asks device to send its status register (AC, R1)</summary>
-        SendStatus = 13,
+    /// <summary>DVD-R/-RW RMD in last Border-out</summary>
+    LastBorderOutRmd = 0x0C,
 
-        /// <summary>The host reads the reversed bus testing data pattern from a device (ADTC, R1)</summary>
-        BusTestRead = 14,
+    /// <summary>Specified RMD from last recorded Border-out</summary>
+    SpecifiedRmd = 0x0D,
 
-        /// <summary>Sets the card to inactive state (AC)</summary>
-        GoInactiveState = 15,
+    /// <summary>DVD-R/-RW Lead-in pre-recorded information</summary>
+    PreRecordedInfo = 0x0E,
 
-        /// <summary>The host sends the bus testing data pattern to a device (ADTC, R1)</summary>
-        BusTestWrite = 19, SpiReadOcr = 58, SpicrcOnOff = 59,
-        #endregion Class 1 MMC Commands (Basic and read-stream)
+    /// <summary>DVD-R/-RW Media Identifier</summary>
+    DvdrMediaIdentifier = 0x0F,
 
-        #region Class 2 MMC Commands (Block-oriented read)
-        /// <summary>Sets the block length in bytes (AC, R1)</summary>
-        SetBlocklen = 16,
+    /// <summary>DVD-R/-RW Physical Format Information</summary>
+    DvdrPhysicalInformation = 0x10,
 
-        /// <summary>Reads a block (ADTC, R1)</summary>
-        ReadSingleBlock = 17,
+    /// <summary>ADIP</summary>
+    Adip = 0x11,
 
-        /// <summary>Transfers data blocks from card to host until interrupted (ADTC, R1)</summary>
-        ReadMultipleBlock = 18,
+    /// <summary>HD DVD Lead-in Copyright Protection Information</summary>
+    HddvdCopyrightInformation = 0x12,
 
-        /// <summary>128 blocks of tuning pattern is sent for HS200 optimal sampling point detection (ADTC, R1)</summary>
-        SendTuningBlockHs200 = 21,
-        #endregion Class 2 MMC Commands (Block-oriented read)
+    /// <summary>AACS Lead-in Copyright Data Section</summary>
+    DvdAacs = 0x15,
 
-        #region Class 3 MMC Commands (Stream write)
-        /// <summary>Writes data stream from host until a <see cref="StopTransmission" /> follows (ADTC, R1)</summary>
-        [Obsolete]
-        WriteDatUntilStop = 20,
-        #endregion Class 3 MMC Commands (Stream write)
+    /// <summary>HD DVD-R Medium Status</summary>
+    HddvdrMediumStatus = 0x19,
 
-        #region Class 4 MMC Commands (Block-oriented write)
-        /// <summary>
-        ///     Defines the number of blocks which are going to be transferred in the immediately succeeding multiple block
-        ///     command (AC, R1)
-        /// </summary>
-        SetBlockCount = 23,
+    /// <summary>HD DVD-R Last recorded RMD in the latest RMZ</summary>
+    HddvdrLastRmd = 0x1A,
 
-        /// <summary>Writes a block (ADTC, R1)</summary>
-        WriteBlock = 24,
+    /// <summary>DVD+/-R DL and DVD-Download DL layer capacity</summary>
+    DvdrLayerCapacity = 0x20,
 
-        /// <summary>Continuously writes blocks until interrupted (ADTC, R1)</summary>
-        WriteMultipleBlock = 25,
+    /// <summary>DVD-R DL Middle Zone start address</summary>
+    MiddleZoneStart = 0x21,
 
-        /// <summary>Programs the Card Information register (ADTC, R1)</summary>
-        ProgramCid = 26,
+    /// <summary>DVD-R DL Jump Interval Size</summary>
+    JumpIntervalSize = 0x22,
 
-        /// <summary>Programs the programmable bits of the CSD (ADTC, R1)</summary>
-        ProgramCsd = 27,
+    /// <summary>DVD-R DL Start LBA of the manual layer jump</summary>
+    ManualLayerJumpStartLba = 0x23,
 
-        /// <summary>Sets the real time clock according to information in block (ADTC, R1)</summary>
-        SetTime = 49,
-        #endregion Class 4 MMC Commands (Block-oriented write)
+    /// <summary>DVD-R DL Remapping information of the specified Anchor Point</summary>
+    RemapAnchorPoint = 0x24,
 
-        #region Class 5 MMC Commands (Erase)
-        /// <summary>Sets the address of the first erase group (AC, R1)</summary>
-        EraseGroupStart = 35,
+    /// <summary>Disc Control Block</summary>
+    Dcb = 0x30,
 
-        /// <summary>Sets the address of the last erase group (AC, R1)</summary>
-        EraseGroupEnd = 36,
+    // BD Disc Structures
+    /// <summary>Blu-ray Disc Information</summary>
+    DiscInformation = 0x00,
 
-        /// <summary>Erases previously selected write blocks (AC, R1b)</summary>
-        Erase = 38,
-        #endregion Class 5 MMC Commands (Erase)
+    /// <summary>Blu-ray Burst Cutting Area</summary>
+    BdBurstCuttingArea = 0x03,
 
-        #region Class 6 MMC Commands (Block-oriented write protection)
-        /// <summary>Sets the write protection bit (AC, R1b)</summary>
-        SetWriteProtect = 28,
+    /// <summary>Blu-ray DDS</summary>
+    BdDds = 0x08,
 
-        /// <summary>Clears the write protection bit (AC, R1b)</summary>
-        ClearWriteProtect = 29,
+    /// <summary>Blu-ray Cartridge Status</summary>
+    CartridgeStatus = 0x09,
 
-        /// <summary>Asks the device to send the status of the write protection bit (ADTC, R1)</summary>
-        SendWriteProtect = 30,
+    /// <summary>Blu-ray Spare Area Information</summary>
+    BdSpareAreaInformation = 0x0A,
 
-        /// <summary>Sends the type of write protection that is set for the different write protection groups (ADTC, R1)</summary>
-        SentWriteProtectType = 31,
-        #endregion Class 6 MMC Commands (Block-oriented write protection)
+    /// <summary>Unmodified DFL</summary>
+    RawDfl = 0x12,
 
-        #region Class 7 MMC Commands (Lock)
-        /// <summary>Used to set/reset the password or lock/unlock the card (ADTC, R1b)</summary>
-        LockUnlock = 42,
-        #endregion Class 7 MMC Commands (Lock)
+    /// <summary>Physical Access Control</summary>
+    Pac = 0x30
+}
 
-        #region Class 8 MMC Commands (Application-specific)
-        /// <summary>Indicates the card that the next command is an application specific command (AC, R1)</summary>
-        ApplicationCommand = 55,
+public enum ScsiServiceActions : byte
+{
+    // SERVICE ACTION IN
 
-        /// <summary>Transfers a data block to/from the card for general purpose / application specific commands (ADTC, R1b)</summary>
-        GenericCommand = 56,
-        #endregion Class 8 MMC Commands (Application-specific)
+    /// <summary>Requests parameter data describing provisioning status for the specified LBA SBC-3 rev. 25</summary>
+    GetLbaStatus = 0x12,
 
-        #region Class 9 MMC Commands (I/O mode)
-        /// <summary>
-        ///     Used to write and read 8 bit data field, used to access application dependent registers not defined in MMC
-        ///     standard (AC, R4)
-        /// </summary>
-        FastIo = 39,
-
-        /// <summary>Sets the system into interrupt mode (BCR, R5)</summary>
-        GoIrqState = 40,
-        #endregion Class 9 MMC Commands (I/O mode)
-
-        #region Class 10 MMC Commands (Security Protocols)
-        /// <summary>Reads data blocks (ADTC, R1)</summary>
-        ProtocolRead = 53,
-
-        /// <summary>Writes data blocks (ADTC, R1)</summary>
-        ProtocolWrite = 54,
-        #endregion Class 10 MMC Commands (Security Protocols)
-
-        #region Class 11 MMC Commands (Command Queue)
-        /// <summary>Defines data direction, priority, task ID and block count of queued task (AC, R1)</summary>
-        QueuedTaskParameters = 44,
-
-        /// <summary>Defines the block address of queued task (AC, R1)</summary>
-        QueuedTaskAddress = 45,
-
-        /// <summary>Executes the task queue for reading (ADTC, R1)</summary>
-        ExecuteTaskRead = 46,
-
-        /// <summary>Executes the task queue for writing (ADTC, R1)</summary>
-        ExecuteTaskWrite = 47,
-
-        /// <summary>Manages queues and tasks (AC, R1b)</summary>
-        CmdQTaskManagement = 48,
-        #endregion Class 11 MMC Commands (Command Queue)
-
-        #region Class 1 SecureDigital Commands (Basic)
-        /// <summary>Sends SD interface condition (BCR, R7)</summary>
-        SendInterfaceCondition = 8,
-
-        /// <summary>Switch to 1.8V bus signaling level (AC, R1)</summary>
-        VoltageSwitch = 11,
-        #endregion Class 1 SecureDigital Commands (Basic)
+    /// <summary>Gets device capacity SBC-2 rev. 4</summary>
+    ReadCapacity16 = 0x10,
 
-        #region Class 2 SecureDigital Commands (Block-oriented read)
-        /// <summary>64 bytes of tuning pattern is sent for SDR50 and SDR104 optimal sampling point detection (ADTC, R1)</summary>
-        SendTuningBlock = 19,
+    /// <summary>Reads blocks from device in a vendor-specific way that should include the ECC alongside the data SBC-2 rev. 4</summary>
+    ReadLong16 = 0x11,
 
-        /// <summary>Speed class control command (AC, R1b)</summary>
-        SpeedClassControl = 20,
-        #endregion Class 2 SecureDigital Commands (Block-oriented read)
+    /// <summary>Requests information indicating the user data segments on the ports and LUNs to access them SBC-3 rev. 25</summary>
+    ReportReferrals = 0x13,
 
-        #region Class 11 SecureDigital Commands (Function Extension)
-        /// <summary>Single block read type (ADTC, R1)</summary>
-        ReadExtraSingle = 48,
+    // SERVICE ACTION OUT
 
-        /// <summary>Single block write type (ADTC, R1)</summary>
-        WriteExtraSingle = 49,
+    /// <summary>
+    ///     Writes blocks to the device with a vendor specified format that shall include the ECC alongside the data SBC-2
+    ///     rev. 4
+    /// </summary>
+    WriteLong16 = ReadLong16
+}
 
-        /// <summary>Multiple block read type (ADTC, R1)</summary>
-        ReadExtraMulti = 58,
+public enum MmcDiscInformationDataTypes : byte
+{
+    /// <summary>Standard Disc Information</summary>
+    DiscInformation = 0x00,
 
-        /// <summary>Multiple block write type (ADTC, R1)</summary>
-        WriteExtraMulti = 59,
-        #endregion Class 11 SecureDigital Commands (Function Extension)
-    }
+    /// <summary>Track Resources Information</summary>
+    TrackResources = 0x01,
 
-    /// <summary>SecureDigital application-specific commands</summary>
-    public enum SecureDigitalCommands : byte
-    {
-        /// <summary>Defines the data bus width to be used for data transfer (AC, R1)</summary>
-        SetBusWidth = 6,
+    /// <summary>POW Resources Information</summary>
+    PowResources = 0x02
+}
 
-        /// <summary>Sends the SD status register (ADTC, R1)</summary>
-        SendStatus = 13,
+public enum MmcSectorTypes : byte
+{
+    /// <summary>No checking of data type is performed</summary>
+    AllTypes = 0x00,
 
-        /// <summary>Send the number of the written write blocks (ADTC, R1)</summary>
-        SendNumWriteBlocks = 22,
+    /// <summary>Only CD-DA sectors shall be returned</summary>
+    Cdda = 0x01,
 
-        /// <summary>Set the number of write blocks to be pre-erased before writing (AC, R1)</summary>
-        SetWriteBlockEraseCount = 23,
+    /// <summary>Only Mode 1 sectors shall be returned</summary>
+    Mode1 = 0x02,
 
-        /// <summary>Sends host capacity support information and asks the card to send its operating condition register (BCR, R3)</summary>
-        SendOperatingCondition = 41,
+    /// <summary>Only Mode 2 formless sectors shall be returned</summary>
+    Mode2 = 0x03,
 
-        /// <summary>Connects/Disconnects the 50 kOhm pull-up resistor on CD/DAT3 pin of card (AC, R1)</summary>
-        SetClearCardDetect = 42,
+    /// <summary>Only Mode 2 Form 1 sectors shall be returned</summary>
+    Mode2Form1 = 0x04,
 
-        /// <summary>Reads the SD Configuration Register SCR (ADTC, R1)</summary>
-        SendScr = 51
-    }
+    /// <summary>Only Mode 2 Form 2 sectors shall be returned</summary>
+    Mode2Form2 = 0x05
+}
 
-    [Flags, SuppressMessage("ReSharper", "ShiftExpressionZeroLeftOperand")]
-    public enum MmcFlags : uint
-    {
-        ResponsePresent = 1 << 0, Response136 = 1 << 1, ResponseCrc = 1 << 2,
-        ResponseBusy    = 1 << 3, ResponseOpcode = 1 << 4, CommandMask = 3 << 5,
-        CommandAc       = 0 << 5, CommandAdtc = 1 << 5, CommandBc = 2 << 5,
-        CommandBcr      = 3 << 5, ResponseSpiS1 = 1 << 7, ResponseSpiS2 = 1 << 8,
-        ResponseSpiB4   = 1 << 9, ResponseSpiBusy = 1 << 10, ResponseNone = 0,
-        ResponseR1      = ResponsePresent | ResponseCrc | ResponseOpcode,
-        ResponseR1B     = ResponsePresent | ResponseCrc | ResponseOpcode | ResponseBusy,
-        ResponseR2      = ResponsePresent | Response136 | ResponseCrc, ResponseR3 = ResponsePresent,
-        ResponseR4      = ResponsePresent, ResponseR5 = ResponsePresent | ResponseCrc | ResponseOpcode,
-        ResponseR6      = ResponsePresent | ResponseCrc | ResponseOpcode,
-        ResponseR7      = ResponsePresent | ResponseCrc | ResponseOpcode, ResponseSpiR1 = ResponseSpiS1,
-        ResponseSpiR1B  = ResponseSpiS1 | ResponseSpiBusy, ResponseSpiR2 = ResponseSpiS1 | ResponseSpiS2,
-        ResponseSpiR3   = ResponseSpiS1 | ResponseSpiB4, ResponseSpiR4 = ResponseSpiS1 | ResponseSpiB4,
-        ResponseSpiR5   = ResponseSpiS1 | ResponseSpiS2, ResponseSpiR7 = ResponseSpiS1 | ResponseSpiB4
-    }
+public enum MmcHeaderCodes : byte
+{
+    /// <summary>No header information shall be returned</summary>
+    None = 0x00,
 
-    [Flags]
-    public enum KreonFeatures
-    {
-        /// <summary>Drive can set the xtreme unlock state with Xbox 360 discs</summary>
-        XtremeUnlock360,
+    /// <summary>Only the four byte header shall be returned</summary>
+    HeaderOnly = 0x01,
 
-        /// <summary>Drive can set the wxripper unlock state with Xbox 360 discs</summary>
-        WxripperUnlock360,
+    /// <summary>Only the mode 2 form x subheader shall be returned</summary>
+    SubHeaderOnly = 0x02,
 
-        /// <summary>Drive can read and decrypt the SS from Xbox 360 discs</summary>
-        DecryptSs360,
+    /// <summary>Return both header and subheader</summary>
+    AllHeaders = 0x03
+}
 
-        /// <summary>Drive has full challenge response capabilities with Xbox 360 discs</summary>
-        ChallengeResponse360,
+public enum MmcErrorField : byte
+{
+    /// <summary>No error information is returned</summary>
+    None = 0x00,
 
-        /// <summary>Drive can set the xtreme unlock state with Xbox discs</summary>
-        XtremeUnlock,
+    /// <summary>The C2 pointer bits will be included</summary>
+    C2Pointers = 0x01,
 
-        /// <summary>Drive can set the wxripper unlock state with Xbox discs</summary>
-        WxripperUnlock,
+    /// <summary>The C2 pointer bits will be included as well as the block error byte with a padding byte</summary>
+    C2PointersAndBlock = 0x02
+}
 
-        /// <summary>Drive can read and decrypt the SS from Xbox discs</summary>
-        DecryptSs,
+public enum MmcSubchannel : byte
+{
+    /// <summary>No subchannel shall be returned</summary>
+    None = 0x00,
 
-        /// <summary>Drive has full challenge response capabilities with Xbox discs</summary>
-        ChallengeResponse,
+    /// <summary>The raw P to W subchannel data shall be transferred</summary>
+    Raw = 0x01,
 
-        /// <summary>Drive supports the locked state</summary>
-        Lock,
+    /// <summary>Q data shall be transferred</summary>
+    Q16 = 0x02,
 
-        /// <summary>Drive supports skipping read errors</summary>
-        ErrorSkipping
-    }
+    /// <summary>De-interleaved and error-corrected R to W subchannel data shall be transferred</summary>
+    Rw = 0x04
+}
 
-    public enum AtaFeatures : byte
-    {
-        /// <summary>Enable 8-bit data transfers</summary>
-        Enable8Bit = 0x01,
+public enum PioneerSubchannel : byte
+{
+    /// <summary>No subchannel shall be returned</summary>
+    None = 0x00,
 
-        /// <summary>Enable write cache</summary>
-        EnableWriteCache = 0x02,
+    /// <summary>Q data shall be transferred</summary>
+    Q16 = 0x01,
 
-        /// <summary>Set transfer mode based on value in sector count register</summary>
-        SetTransferMode = 0x03,
+    /// <summary>The raw P to W subchannel data shall be transferred</summary>
+    All = 0x02,
 
-        /// <summary>Enable all automatic defect reassignment</summary>
-        EnableDefectReassignment = 0x04,
+    /// <summary>The raw P to W subchannel data shall be transferred WITHOUT user data</summary>
+    Only = 0x03
+}
 
-        /// <summary>Enable advanced power management</summary>
-        EnableApm = 0x05,
+public enum PlextorSubchannel : byte
+{
+    /// <summary>No subchannel shall be returned</summary>
+    None = 0x00,
 
-        /// <summary>Enable Power-Up In Standby feature set</summary>
-        EnablePowerUpInStandby = 0x06,
+    /// <summary>Q data shall be transferred</summary>
+    Q16 = 0x01,
 
-        /// <summary>Power-Up In Standby feature set device spin-up</summary>
-        PowerUpInStandByFeature = 0x07,
+    /// <summary>The packed and corrected P to W subchannel data shall be transferred</summary>
+    Pack = 0x02,
 
-        /// <summary>Reserved for Address offset reserved area boot method technical report</summary>
-        AddressOffsetReserved = 0x09,
+    /// <summary>The raw P to W subchannel data shall be transferred</summary>
+    All = 0x03,
 
-        /// <summary>Enable CFA power mode 1</summary>
-        EnableCfaPowerMode1 = 0x0A,
+    /// <summary>The raw P to W subchannel data, plus C2 error data shall be transferred</summary>
+    RawC2 = 0x08
+}
 
-        /// <summary>Enable Write-Read-Verify feature set</summary>
-        EnableWriteReadVerify = 0x0B,
+public enum PlextorSubCommands : byte
+{
+    /// <summary>Gets Plextor mode</summary>
+    GetMode = 0x00,
 
-        /// <summary>Enable use of SATA feature</summary>
-        EnableSataFeature = 0x10,
+    /// <summary>Sets Plextor mode</summary>
+    SetMode = 0x10,
 
-        /// <summary>Disable Media Status Notification</summary>
-        DisableMediaStatusNotification = 0x31,
+    /// <summary>Plextor force single session or hide CD-R</summary>
+    SessionHide = 0x01,
 
-        /// <summary>Disable retry</summary>
-        DisableRetry = 0x33,
+    /// <summary>Plextor VariRec</summary>
+    VariRec = 0x02,
 
-        /// <summary>Enable Free-fall Control</summary>
-        EnableFreeFall = 0x41,
+    /// <summary>Plextor GigaRec</summary>
+    GigaRec = 0x04,
 
-        /// <summary>Enable Automatic Acoustic Management feature set</summary>
-        EnableAam = 0x42,
+    /// <summary>Plextor acoustic management (disc related)</summary>
+    SilentDisc = 0x06,
 
-        /// <summary>Set Maximum Host Interface Sector Times</summary>
-        SetMaximumHostInterfaceSectorTimes = 0x43,
+    /// <summary>Plextor acoustic management (tra related)</summary>
+    SilentTray = 0x07,
 
-        /// <summary>Vendor unique length of ECC on read long/write long commands</summary>
-        EnableReadLongVendorLength = 0x44,
+    /// <summary>Plextor acoustic management</summary>
+    Silent = 0x08,
 
-        /// <summary>Extended Power conditions</summary>
-        ExtendedPowerConditions = 0x4A,
+    /// <summary>Plextor test write DVD+</summary>
+    TestWriteDvdPlus = 0x21,
 
-        /// <summary>Set cache segments to sector count register value</summary>
-        SetCacheSegments = 0x54,
+    /// <summary>Plextor book setting</summary>
+    BitSet = 0x22,
 
-        /// <summary>Disable read look-ahead feature</summary>
-        DisableReadLookAhead = 0x55,
+    /// <summary>Plextor SecuRec</summary>
+    SecuRec = 0xD5,
 
-        /// <summary>Enable release interrupt</summary>
-        EnableReleaseInterrupt = 0x5D,
+    /// <summary>Book setting for DVD+R</summary>
+    BitSetR = 0x0A,
 
-        /// <summary>Enable SERVICE interrupt</summary>
-        EnableServiceInterrupt = 0x5E,
+    /// <summary>Book setting for DVD+R DL</summary>
+    BitSetRdl = 0x0E,
 
-        /// <summary>Long Physical Sector Alignment Error Reporting Control</summary>
-        LongPhysicalSectorErrorControl = 0x62,
+    /// <summary>Plextor SpeedRead</summary>
+    SpeedRead = 0xBB
+}
 
-        /// <summary>Enable/Disable the DSN feature set</summary>
-        DsnFeature = 0x63,
+public enum SscLogicalIdTypes : byte
+{
+    /// <summary>Logical object identifier</summary>
+    ObjectId = 0,
 
-        /// <summary>Disable reverting to power on defaults</summary>
-        DisableRevertToDefaults = 0x66,
+    /// <summary>Logical file identifier</summary>
+    FileId = 1,
 
-        /// <summary>Disable ECC</summary>
-        DisableEcc = 0x77,
+    /// <summary>Logical set identifier</summary>
+    SetId = 2,
 
-        /// <summary>Disable 8-bit data transfers</summary>
-        Disable8Bit = 0x81,
+    /// <summary>Reserved</summary>
+    Reserved = 3
+}
 
-        /// <summary>Disable write cache</summary>
-        DisableWriteCache = 0x82,
+public enum SscPositionForms : byte
+{
+    /// <summary>20 bytes using logical block addresses</summary>
+    Short = 0,
 
-        /// <summary>Disable all automatic defect reassignment</summary>
-        DisableDefectReassignment = 0x84,
+    /// <summary>20 bytes using vendor-specified values</summary>
+    VendorShort = 1,
 
-        /// <summary>Disable advanced power management</summary>
-        DisableApm = 0x85,
+    /// <summary>Equivalent to <see cref="Long" /> on SSC-1</summary>
+    OldLong = 2,
 
-        /// <summary>Disable Power-Up In Standby feature set</summary>
-        DisablePowerUpInStandby = 0x86,
+    /// <summary>Invalid: Equivalent to LONG + BT on SSC-1</summary>
+    OldLongVendor = 3,
 
-        /// <summary>Enable ECC</summary>
-        EnableEcc = 0x88,
+    /// <summary>Invalid: Equivalent to TCLP on SSC-1</summary>
+    OldTclp = 4,
 
-        /// <summary>Reserved for Address offset reserved area boot method technical report</summary>
-        AddressOffsetReserved2 = 0x89,
+    /// <summary>Invalid: Equivalent to TCLP + BT on SSC-1</summary>
+    OldTclpVendor = 5,
 
-        /// <summary>Disable CFA power mode 1</summary>
-        DisableCfaPowerMode1 = 0x8A,
+    /// <summary>32 bytes</summary>
+    Long = 6,
 
-        /// <summary>Disable Write-Read-Verify feature set</summary>
-        DisableWriteReadVerify = 0x8B,
+    /// <summary>Invalid: Equivalent to TCLP + LONG + BT on SSC-1</summary>
+    OldLongTclpVendor = 7,
 
-        /// <summary>Disable use of SATA feature</summary>
-        DisableSataFeature = 0x90,
+    /// <summary>From 28 bytes to allocation length</summary>
+    Extended = 8
+}
 
-        /// <summary>Enable Media Status Notification</summary>
-        EnableMediaStatusNotification = 0x95,
+public enum ScsiAttributeAction : byte
+{
+    /// <summary>Return attribute values</summary>
+    Values = 0,
 
-        /// <summary>Enable retries</summary>
-        EnableRetries = 0x99,
+    /// <summary>Return a list of available attributes</summary>
+    List = 1,
 
-        /// <summary>Set device maximum average current</summary>
-        SetMaximumAverageCurrent = 0x9A,
+    /// <summary>Returns a list of known logical volume numbers</summary>
+    VolumeList = 2,
 
-        /// <summary>Enable read look-ahead feature</summary>
-        EnableReadLookAhead = 0xAA,
+    /// <summary>Returns a list of known partition numbers</summary>
+    PartitionList = 3,
 
-        /// <summary>Set maximum prefetch using sector count register value</summary>
-        SetMaximumPrefetch = 0xAB,
+    /// <summary>Returns a list of elements containing volumes with MAM</summary>
+    ElementList = 4,
 
-        /// <summary>4 bytes of ECC apply on read long/write long commands</summary>
-        DisableReadLongVendorLength = 0xBB,
+    /// <summary>Returns a list of supported attribute identifiers</summary>
+    Supported = 5
+}
 
-        /// <summary>Disable Free-fall Control</summary>
-        DisableFreeFall = 0xC1,
+public enum FujitsuDisplayModes : byte
+{
+    /// <summary>Message is displayed until next tape operation starts</summary>
+    Idle = 0,
 
-        /// <summary>Disable Automatic Acoustic Management feature set</summary>
-        DisableAam = 0xC2,
+    /// <summary>Message is displayed only if a cartridge is inserted, until its removal</summary>
+    Cart = 1,
 
-        /// <summary>Enable/Disable the Sense Data Reporting feature set</summary>
-        SenseDataReporting = 0xC3,
+    /// <summary>Message is only displayed when drive is ready</summary>
+    Ready = 2,
 
-        /// <summary>Enable reverting to power on defaults</summary>
-        EnableRevertToDefaults = 0xCC,
+    /// <summary>Cancels current display</summary>
+    Cancel = 3,
 
-        /// <summary>Disable release interrupt</summary>
-        DisableReleaseInterrupt = 0xDD,
+    /// <summary>
+    ///     Message is displayed only if a cartridge is inserted. When removed, only second half of the message is
+    ///     displayed.
+    /// </summary>
+    Half = 7
+}
 
-        /// <summary>Disable SERVICE interrupt</summary>
-        DisableServiceInterrupt = 0xDE, VendorSpecific = 0xE0
-    }
+// TODO: Check obsoletes
+public enum SscSpaceCodes : byte
+{
+    /// <summary>Logical blocks</summary>
+    LogicalBlock = 0,
 
-    public enum KreonLockStates : byte
-    {
-        Locked = 0, Xtreme = 1, Wxripper = 2
-    }
+    /// <summary>Filemarks</summary>
+    Filemark = 1,
 
-    public enum RotationalControl : byte
-    {
-        ClvAndImpureCav = 0, PureCav = 1
-    }
+    /// <summary>Sequential filemarks</summary>
+    SequentialFilemark = 2,
 
-    public enum TrackInformationType : byte
-    {
-        LogicalBlockAddress = 0, LogicalTrackNumber = 1, SessionNumber = 2
-    }
+    /// <summary>End-of-data</summary>
+    EndOfData = 3, Obsolete1 = 4, Obsolete2 = 5
+}
 
-    public enum CssReportKeyFormat : byte
-    {
-        AgidForCssCppm = 0x00, ChallengeKey   = 0x01, Key1     = 0x02,
-        TitleKey       = 0x04, Asf            = 0x05, RpcState = 0x08,
-        AgidForCprm    = 0x11, InvalidateAgid = 0x3f
-    }
+/// <summary>MMC / SecureDigital commands</summary>
+public enum MmcCommands : byte
+{
+    #region Class 1 MMC Commands (Basic and read-stream)
+    /// <summary>Resets device to idle (BC)</summary>
+    GoIdle = 0,
 
-    public enum CssSendKeyFormat : byte
-    {
-        ChallengeKey   = 0x01, Key2 = 0x03, RpcStructure = 0x06,
-        InvalidateAgid = 0x3f
-    }
+    /// <summary>Resets the device to pre-idle (BC)</summary>
+    GoPreIdleState = 0,
+
+    /// <summary>Initiate alternative boot operation</summary>
+    BootInitiation = 0,
+
+    /// <summary>Asks device in idle state to send their operation conditions in response (BCR, R3)</summary>
+    SendOpCond = 1,
+
+    /// <summary>Asks device to send their CID numbers (BCR, R2)</summary>
+    AllSendCid = 2,
+
+    /// <summary>Assigns a relative address to the device (AC, R1)</summary>
+    SetRelativeAddress = 3,
+
+    /// <summary>Programs the DSR of the device (BC)</summary>
+    SetDsr = 4,
+
+    /// <summary>Toggles the device between sleep and standby (AC, R1b)</summary>
+    SleepAwake = 5,
+
+    /// <summary>Switches device mode of operation (AC, R1b)</summary>
+    Switch = 6,
+
+    /// <summary>
+    ///     Toggles a device between the stand-by and transfer stats or between the programming and disconnect states (AC,
+    ///     R1b)
+    /// </summary>
+    SelectCard = 7,
+
+    /// <summary>Asks device to send its extended card-specific data (ExtCSD) (ADTC, R1)</summary>
+    SendExtCsd = 8,
+
+    /// <summary>Asks device to send its card-specific data (CSD) (AC, R2)</summary>
+    SendCsd = 9,
+
+    /// <summary>Asks device to send its card identification (CID) (AC, R2)</summary>
+    SendCid = 10,
+
+    /// <summary>
+    ///     Reads data stream from device, starting at given address, until a <see cref="StopTransmission" /> follows
+    ///     (ADTC, R1)
+    /// </summary>
+    [Obsolete]
+    ReadDatUntilStop = 11,
+
+    /// <summary>Terminates a read/write stream/multiple block operation (AC, R1 / R1b)</summary>
+    StopTransmission = 12,
+
+    /// <summary>Asks device to send its status register (AC, R1)</summary>
+    SendStatus = 13,
+
+    /// <summary>The host reads the reversed bus testing data pattern from a device (ADTC, R1)</summary>
+    BusTestRead = 14,
+
+    /// <summary>Sets the card to inactive state (AC)</summary>
+    GoInactiveState = 15,
+
+    /// <summary>The host sends the bus testing data pattern to a device (ADTC, R1)</summary>
+    BusTestWrite = 19, SpiReadOcr = 58, SpicrcOnOff = 59,
+    #endregion Class 1 MMC Commands (Basic and read-stream)
+
+    #region Class 2 MMC Commands (Block-oriented read)
+    /// <summary>Sets the block length in bytes (AC, R1)</summary>
+    SetBlocklen = 16,
+
+    /// <summary>Reads a block (ADTC, R1)</summary>
+    ReadSingleBlock = 17,
+
+    /// <summary>Transfers data blocks from card to host until interrupted (ADTC, R1)</summary>
+    ReadMultipleBlock = 18,
+
+    /// <summary>128 blocks of tuning pattern is sent for HS200 optimal sampling point detection (ADTC, R1)</summary>
+    SendTuningBlockHs200 = 21,
+    #endregion Class 2 MMC Commands (Block-oriented read)
+
+    #region Class 3 MMC Commands (Stream write)
+    /// <summary>Writes data stream from host until a <see cref="StopTransmission" /> follows (ADTC, R1)</summary>
+    [Obsolete]
+    WriteDatUntilStop = 20,
+    #endregion Class 3 MMC Commands (Stream write)
+
+    #region Class 4 MMC Commands (Block-oriented write)
+    /// <summary>
+    ///     Defines the number of blocks which are going to be transferred in the immediately succeeding multiple block
+    ///     command (AC, R1)
+    /// </summary>
+    SetBlockCount = 23,
+
+    /// <summary>Writes a block (ADTC, R1)</summary>
+    WriteBlock = 24,
+
+    /// <summary>Continuously writes blocks until interrupted (ADTC, R1)</summary>
+    WriteMultipleBlock = 25,
+
+    /// <summary>Programs the Card Information register (ADTC, R1)</summary>
+    ProgramCid = 26,
+
+    /// <summary>Programs the programmable bits of the CSD (ADTC, R1)</summary>
+    ProgramCsd = 27,
+
+    /// <summary>Sets the real time clock according to information in block (ADTC, R1)</summary>
+    SetTime = 49,
+    #endregion Class 4 MMC Commands (Block-oriented write)
+
+    #region Class 5 MMC Commands (Erase)
+    /// <summary>Sets the address of the first erase group (AC, R1)</summary>
+    EraseGroupStart = 35,
+
+    /// <summary>Sets the address of the last erase group (AC, R1)</summary>
+    EraseGroupEnd = 36,
+
+    /// <summary>Erases previously selected write blocks (AC, R1b)</summary>
+    Erase = 38,
+    #endregion Class 5 MMC Commands (Erase)
+
+    #region Class 6 MMC Commands (Block-oriented write protection)
+    /// <summary>Sets the write protection bit (AC, R1b)</summary>
+    SetWriteProtect = 28,
+
+    /// <summary>Clears the write protection bit (AC, R1b)</summary>
+    ClearWriteProtect = 29,
+
+    /// <summary>Asks the device to send the status of the write protection bit (ADTC, R1)</summary>
+    SendWriteProtect = 30,
+
+    /// <summary>Sends the type of write protection that is set for the different write protection groups (ADTC, R1)</summary>
+    SentWriteProtectType = 31,
+    #endregion Class 6 MMC Commands (Block-oriented write protection)
+
+    #region Class 7 MMC Commands (Lock)
+    /// <summary>Used to set/reset the password or lock/unlock the card (ADTC, R1b)</summary>
+    LockUnlock = 42,
+    #endregion Class 7 MMC Commands (Lock)
+
+    #region Class 8 MMC Commands (Application-specific)
+    /// <summary>Indicates the card that the next command is an application specific command (AC, R1)</summary>
+    ApplicationCommand = 55,
+
+    /// <summary>Transfers a data block to/from the card for general purpose / application specific commands (ADTC, R1b)</summary>
+    GenericCommand = 56,
+    #endregion Class 8 MMC Commands (Application-specific)
+
+    #region Class 9 MMC Commands (I/O mode)
+    /// <summary>
+    ///     Used to write and read 8 bit data field, used to access application dependent registers not defined in MMC
+    ///     standard (AC, R4)
+    /// </summary>
+    FastIo = 39,
+
+    /// <summary>Sets the system into interrupt mode (BCR, R5)</summary>
+    GoIrqState = 40,
+    #endregion Class 9 MMC Commands (I/O mode)
+
+    #region Class 10 MMC Commands (Security Protocols)
+    /// <summary>Reads data blocks (ADTC, R1)</summary>
+    ProtocolRead = 53,
+
+    /// <summary>Writes data blocks (ADTC, R1)</summary>
+    ProtocolWrite = 54,
+    #endregion Class 10 MMC Commands (Security Protocols)
+
+    #region Class 11 MMC Commands (Command Queue)
+    /// <summary>Defines data direction, priority, task ID and block count of queued task (AC, R1)</summary>
+    QueuedTaskParameters = 44,
+
+    /// <summary>Defines the block address of queued task (AC, R1)</summary>
+    QueuedTaskAddress = 45,
+
+    /// <summary>Executes the task queue for reading (ADTC, R1)</summary>
+    ExecuteTaskRead = 46,
+
+    /// <summary>Executes the task queue for writing (ADTC, R1)</summary>
+    ExecuteTaskWrite = 47,
+
+    /// <summary>Manages queues and tasks (AC, R1b)</summary>
+    CmdQTaskManagement = 48,
+    #endregion Class 11 MMC Commands (Command Queue)
+
+    #region Class 1 SecureDigital Commands (Basic)
+    /// <summary>Sends SD interface condition (BCR, R7)</summary>
+    SendInterfaceCondition = 8,
+
+    /// <summary>Switch to 1.8V bus signaling level (AC, R1)</summary>
+    VoltageSwitch = 11,
+    #endregion Class 1 SecureDigital Commands (Basic)
+
+    #region Class 2 SecureDigital Commands (Block-oriented read)
+    /// <summary>64 bytes of tuning pattern is sent for SDR50 and SDR104 optimal sampling point detection (ADTC, R1)</summary>
+    SendTuningBlock = 19,
+
+    /// <summary>Speed class control command (AC, R1b)</summary>
+    SpeedClassControl = 20,
+    #endregion Class 2 SecureDigital Commands (Block-oriented read)
+
+    #region Class 11 SecureDigital Commands (Function Extension)
+    /// <summary>Single block read type (ADTC, R1)</summary>
+    ReadExtraSingle = 48,
+
+    /// <summary>Single block write type (ADTC, R1)</summary>
+    WriteExtraSingle = 49,
+
+    /// <summary>Multiple block read type (ADTC, R1)</summary>
+    ReadExtraMulti = 58,
+
+    /// <summary>Multiple block write type (ADTC, R1)</summary>
+    WriteExtraMulti = 59,
+    #endregion Class 11 SecureDigital Commands (Function Extension)
+}
+
+/// <summary>SecureDigital application-specific commands</summary>
+public enum SecureDigitalCommands : byte
+{
+    /// <summary>Defines the data bus width to be used for data transfer (AC, R1)</summary>
+    SetBusWidth = 6,
+
+    /// <summary>Sends the SD status register (ADTC, R1)</summary>
+    SendStatus = 13,
+
+    /// <summary>Send the number of the written write blocks (ADTC, R1)</summary>
+    SendNumWriteBlocks = 22,
+
+    /// <summary>Set the number of write blocks to be pre-erased before writing (AC, R1)</summary>
+    SetWriteBlockEraseCount = 23,
+
+    /// <summary>Sends host capacity support information and asks the card to send its operating condition register (BCR, R3)</summary>
+    SendOperatingCondition = 41,
+
+    /// <summary>Connects/Disconnects the 50 kOhm pull-up resistor on CD/DAT3 pin of card (AC, R1)</summary>
+    SetClearCardDetect = 42,
+
+    /// <summary>Reads the SD Configuration Register SCR (ADTC, R1)</summary>
+    SendScr = 51
+}
+
+[Flags, SuppressMessage("ReSharper", "ShiftExpressionZeroLeftOperand")]
+public enum MmcFlags : uint
+{
+    ResponsePresent = 1 << 0, Response136 = 1 << 1, ResponseCrc = 1 << 2,
+    ResponseBusy    = 1 << 3, ResponseOpcode = 1 << 4, CommandMask = 3 << 5,
+    CommandAc       = 0 << 5, CommandAdtc = 1 << 5, CommandBc = 2 << 5,
+    CommandBcr      = 3 << 5, ResponseSpiS1 = 1 << 7, ResponseSpiS2 = 1 << 8,
+    ResponseSpiB4   = 1 << 9, ResponseSpiBusy = 1 << 10, ResponseNone = 0,
+    ResponseR1      = ResponsePresent | ResponseCrc | ResponseOpcode,
+    ResponseR1B     = ResponsePresent | ResponseCrc | ResponseOpcode | ResponseBusy,
+    ResponseR2      = ResponsePresent | Response136 | ResponseCrc, ResponseR3 = ResponsePresent,
+    ResponseR4      = ResponsePresent, ResponseR5 = ResponsePresent | ResponseCrc | ResponseOpcode,
+    ResponseR6      = ResponsePresent | ResponseCrc | ResponseOpcode,
+    ResponseR7      = ResponsePresent | ResponseCrc | ResponseOpcode, ResponseSpiR1 = ResponseSpiS1,
+    ResponseSpiR1B  = ResponseSpiS1 | ResponseSpiBusy, ResponseSpiR2 = ResponseSpiS1 | ResponseSpiS2,
+    ResponseSpiR3   = ResponseSpiS1 | ResponseSpiB4, ResponseSpiR4 = ResponseSpiS1 | ResponseSpiB4,
+    ResponseSpiR5   = ResponseSpiS1 | ResponseSpiS2, ResponseSpiR7 = ResponseSpiS1 | ResponseSpiB4
+}
+
+[Flags]
+public enum KreonFeatures
+{
+    /// <summary>Drive can set the xtreme unlock state with Xbox 360 discs</summary>
+    XtremeUnlock360,
+
+    /// <summary>Drive can set the wxripper unlock state with Xbox 360 discs</summary>
+    WxripperUnlock360,
+
+    /// <summary>Drive can read and decrypt the SS from Xbox 360 discs</summary>
+    DecryptSs360,
+
+    /// <summary>Drive has full challenge response capabilities with Xbox 360 discs</summary>
+    ChallengeResponse360,
+
+    /// <summary>Drive can set the xtreme unlock state with Xbox discs</summary>
+    XtremeUnlock,
+
+    /// <summary>Drive can set the wxripper unlock state with Xbox discs</summary>
+    WxripperUnlock,
+
+    /// <summary>Drive can read and decrypt the SS from Xbox discs</summary>
+    DecryptSs,
+
+    /// <summary>Drive has full challenge response capabilities with Xbox discs</summary>
+    ChallengeResponse,
+
+    /// <summary>Drive supports the locked state</summary>
+    Lock,
+
+    /// <summary>Drive supports skipping read errors</summary>
+    ErrorSkipping
+}
+
+public enum AtaFeatures : byte
+{
+    /// <summary>Enable 8-bit data transfers</summary>
+    Enable8Bit = 0x01,
+
+    /// <summary>Enable write cache</summary>
+    EnableWriteCache = 0x02,
+
+    /// <summary>Set transfer mode based on value in sector count register</summary>
+    SetTransferMode = 0x03,
+
+    /// <summary>Enable all automatic defect reassignment</summary>
+    EnableDefectReassignment = 0x04,
+
+    /// <summary>Enable advanced power management</summary>
+    EnableApm = 0x05,
+
+    /// <summary>Enable Power-Up In Standby feature set</summary>
+    EnablePowerUpInStandby = 0x06,
+
+    /// <summary>Power-Up In Standby feature set device spin-up</summary>
+    PowerUpInStandByFeature = 0x07,
+
+    /// <summary>Reserved for Address offset reserved area boot method technical report</summary>
+    AddressOffsetReserved = 0x09,
+
+    /// <summary>Enable CFA power mode 1</summary>
+    EnableCfaPowerMode1 = 0x0A,
+
+    /// <summary>Enable Write-Read-Verify feature set</summary>
+    EnableWriteReadVerify = 0x0B,
+
+    /// <summary>Enable use of SATA feature</summary>
+    EnableSataFeature = 0x10,
+
+    /// <summary>Disable Media Status Notification</summary>
+    DisableMediaStatusNotification = 0x31,
+
+    /// <summary>Disable retry</summary>
+    DisableRetry = 0x33,
+
+    /// <summary>Enable Free-fall Control</summary>
+    EnableFreeFall = 0x41,
+
+    /// <summary>Enable Automatic Acoustic Management feature set</summary>
+    EnableAam = 0x42,
+
+    /// <summary>Set Maximum Host Interface Sector Times</summary>
+    SetMaximumHostInterfaceSectorTimes = 0x43,
+
+    /// <summary>Vendor unique length of ECC on read long/write long commands</summary>
+    EnableReadLongVendorLength = 0x44,
+
+    /// <summary>Extended Power conditions</summary>
+    ExtendedPowerConditions = 0x4A,
+
+    /// <summary>Set cache segments to sector count register value</summary>
+    SetCacheSegments = 0x54,
+
+    /// <summary>Disable read look-ahead feature</summary>
+    DisableReadLookAhead = 0x55,
+
+    /// <summary>Enable release interrupt</summary>
+    EnableReleaseInterrupt = 0x5D,
+
+    /// <summary>Enable SERVICE interrupt</summary>
+    EnableServiceInterrupt = 0x5E,
+
+    /// <summary>Long Physical Sector Alignment Error Reporting Control</summary>
+    LongPhysicalSectorErrorControl = 0x62,
+
+    /// <summary>Enable/Disable the DSN feature set</summary>
+    DsnFeature = 0x63,
+
+    /// <summary>Disable reverting to power on defaults</summary>
+    DisableRevertToDefaults = 0x66,
+
+    /// <summary>Disable ECC</summary>
+    DisableEcc = 0x77,
+
+    /// <summary>Disable 8-bit data transfers</summary>
+    Disable8Bit = 0x81,
+
+    /// <summary>Disable write cache</summary>
+    DisableWriteCache = 0x82,
+
+    /// <summary>Disable all automatic defect reassignment</summary>
+    DisableDefectReassignment = 0x84,
+
+    /// <summary>Disable advanced power management</summary>
+    DisableApm = 0x85,
+
+    /// <summary>Disable Power-Up In Standby feature set</summary>
+    DisablePowerUpInStandby = 0x86,
+
+    /// <summary>Enable ECC</summary>
+    EnableEcc = 0x88,
+
+    /// <summary>Reserved for Address offset reserved area boot method technical report</summary>
+    AddressOffsetReserved2 = 0x89,
+
+    /// <summary>Disable CFA power mode 1</summary>
+    DisableCfaPowerMode1 = 0x8A,
+
+    /// <summary>Disable Write-Read-Verify feature set</summary>
+    DisableWriteReadVerify = 0x8B,
+
+    /// <summary>Disable use of SATA feature</summary>
+    DisableSataFeature = 0x90,
+
+    /// <summary>Enable Media Status Notification</summary>
+    EnableMediaStatusNotification = 0x95,
+
+    /// <summary>Enable retries</summary>
+    EnableRetries = 0x99,
+
+    /// <summary>Set device maximum average current</summary>
+    SetMaximumAverageCurrent = 0x9A,
+
+    /// <summary>Enable read look-ahead feature</summary>
+    EnableReadLookAhead = 0xAA,
+
+    /// <summary>Set maximum prefetch using sector count register value</summary>
+    SetMaximumPrefetch = 0xAB,
+
+    /// <summary>4 bytes of ECC apply on read long/write long commands</summary>
+    DisableReadLongVendorLength = 0xBB,
+
+    /// <summary>Disable Free-fall Control</summary>
+    DisableFreeFall = 0xC1,
+
+    /// <summary>Disable Automatic Acoustic Management feature set</summary>
+    DisableAam = 0xC2,
+
+    /// <summary>Enable/Disable the Sense Data Reporting feature set</summary>
+    SenseDataReporting = 0xC3,
+
+    /// <summary>Enable reverting to power on defaults</summary>
+    EnableRevertToDefaults = 0xCC,
+
+    /// <summary>Disable release interrupt</summary>
+    DisableReleaseInterrupt = 0xDD,
+
+    /// <summary>Disable SERVICE interrupt</summary>
+    DisableServiceInterrupt = 0xDE, VendorSpecific = 0xE0
+}
+
+public enum KreonLockStates : byte
+{
+    Locked = 0, Xtreme = 1, Wxripper = 2
+}
+
+public enum RotationalControl : byte
+{
+    ClvAndImpureCav = 0, PureCav = 1
+}
+
+public enum TrackInformationType : byte
+{
+    LogicalBlockAddress = 0, LogicalTrackNumber = 1, SessionNumber = 2
+}
+
+public enum CssReportKeyFormat : byte
+{
+    AgidForCssCppm = 0x00, ChallengeKey   = 0x01, Key1     = 0x02,
+    TitleKey       = 0x04, Asf            = 0x05, RpcState = 0x08,
+    AgidForCprm    = 0x11, InvalidateAgid = 0x3f
+}
+
+public enum CssSendKeyFormat : byte
+{
+    ChallengeKey   = 0x01, Key2 = 0x03, RpcStructure = 0x06,
+    InvalidateAgid = 0x3f
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Linux/Command.cs b/Aaru.Devices/Linux/Command.cs
index 0576d80a5..50fca0ceb 100644
--- a/Aaru.Devices/Linux/Command.cs
+++ b/Aaru.Devices/Linux/Command.cs
@@ -37,386 +37,450 @@ using System.Text;
 using Aaru.CommonTypes.Interop;
 using Aaru.Decoders.ATA;
 
-namespace Aaru.Devices.Linux
+namespace Aaru.Devices.Linux;
+
+internal static class Command
 {
-    internal static class Command
+    /// <summary>Sends a SCSI command</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="cdb">SCSI CDB</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="senseBuffer">Buffer with the SCSI sense</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="direction">SCSI command transfer direction</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense">
+    ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
+    ///     sense
+    /// </param>
+    internal static int SendScsiCommand(int fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
+                                        ScsiIoctlDirection direction, out double duration, out bool sense)
     {
-        /// <summary>Sends a SCSI command</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="cdb">SCSI CDB</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="senseBuffer">Buffer with the SCSI sense</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="direction">SCSI command transfer direction</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense">
-        ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
-        ///     sense
-        /// </param>
-        internal static int SendScsiCommand(int fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
-                                            ScsiIoctlDirection direction, out double duration, out bool sense)
+        senseBuffer = null;
+        duration    = 0;
+        sense       = false;
+
+        if(buffer == null)
+            return -1;
+
+        var ioHdr = new SgIoHdrT();
+
+        senseBuffer = new byte[64];
+
+        ioHdr.interface_id    = 'S';
+        ioHdr.cmd_len         = (byte)cdb.Length;
+        ioHdr.mx_sb_len       = (byte)senseBuffer.Length;
+        ioHdr.dxfer_direction = direction;
+        ioHdr.dxfer_len       = (uint)buffer.Length;
+        ioHdr.dxferp          = Marshal.AllocHGlobal(buffer.Length);
+        ioHdr.cmdp            = Marshal.AllocHGlobal(cdb.Length);
+        ioHdr.sbp             = Marshal.AllocHGlobal(senseBuffer.Length);
+        ioHdr.timeout         = timeout * 1000;
+        ioHdr.flags           = (uint)SgFlags.DirectIo;
+
+        Marshal.Copy(buffer, 0, ioHdr.dxferp, buffer.Length);
+        Marshal.Copy(cdb, 0, ioHdr.cmdp, cdb.Length);
+        Marshal.Copy(senseBuffer, 0, ioHdr.sbp, senseBuffer.Length);
+
+        DateTime start = DateTime.UtcNow;
+        int      error = Extern.ioctlSg(fd, LinuxIoctl.SgIo, ref ioHdr);
+        DateTime end   = DateTime.UtcNow;
+
+        if(error < 0)
+            error = Marshal.GetLastWin32Error();
+
+        Marshal.Copy(ioHdr.dxferp, buffer, 0, buffer.Length);
+        Marshal.Copy(ioHdr.cmdp, cdb, 0, cdb.Length);
+        Marshal.Copy(ioHdr.sbp, senseBuffer, 0, senseBuffer.Length);
+
+        sense |= (ioHdr.info & SgInfo.OkMask) != SgInfo.Ok;
+
+        duration = ioHdr.duration > 0 ? ioHdr.duration : (end - start).TotalMilliseconds;
+
+        Marshal.FreeHGlobal(ioHdr.dxferp);
+        Marshal.FreeHGlobal(ioHdr.cmdp);
+        Marshal.FreeHGlobal(ioHdr.sbp);
+
+        return error;
+    }
+
+    /// <summary>Converts ATA protocol to SG_IO direction</summary>
+    /// <param name="protocol">ATA protocol</param>
+    /// <returns>SG_IO direction</returns>
+    static ScsiIoctlDirection AtaProtocolToScsiDirection(AtaProtocol protocol)
+    {
+        switch(protocol)
         {
-            senseBuffer = null;
-            duration    = 0;
-            sense       = false;
-
-            if(buffer == null)
-                return -1;
-
-            var ioHdr = new SgIoHdrT();
-
-            senseBuffer = new byte[64];
-
-            ioHdr.interface_id    = 'S';
-            ioHdr.cmd_len         = (byte)cdb.Length;
-            ioHdr.mx_sb_len       = (byte)senseBuffer.Length;
-            ioHdr.dxfer_direction = direction;
-            ioHdr.dxfer_len       = (uint)buffer.Length;
-            ioHdr.dxferp          = Marshal.AllocHGlobal(buffer.Length);
-            ioHdr.cmdp            = Marshal.AllocHGlobal(cdb.Length);
-            ioHdr.sbp             = Marshal.AllocHGlobal(senseBuffer.Length);
-            ioHdr.timeout         = timeout * 1000;
-            ioHdr.flags           = (uint)SgFlags.DirectIo;
-
-            Marshal.Copy(buffer, 0, ioHdr.dxferp, buffer.Length);
-            Marshal.Copy(cdb, 0, ioHdr.cmdp, cdb.Length);
-            Marshal.Copy(senseBuffer, 0, ioHdr.sbp, senseBuffer.Length);
-
-            DateTime start = DateTime.UtcNow;
-            int      error = Extern.ioctlSg(fd, LinuxIoctl.SgIo, ref ioHdr);
-            DateTime end   = DateTime.UtcNow;
-
-            if(error < 0)
-                error = Marshal.GetLastWin32Error();
-
-            Marshal.Copy(ioHdr.dxferp, buffer, 0, buffer.Length);
-            Marshal.Copy(ioHdr.cmdp, cdb, 0, cdb.Length);
-            Marshal.Copy(ioHdr.sbp, senseBuffer, 0, senseBuffer.Length);
-
-            sense |= (ioHdr.info & SgInfo.OkMask) != SgInfo.Ok;
-
-            duration = ioHdr.duration > 0 ? ioHdr.duration : (end - start).TotalMilliseconds;
-
-            Marshal.FreeHGlobal(ioHdr.dxferp);
-            Marshal.FreeHGlobal(ioHdr.cmdp);
-            Marshal.FreeHGlobal(ioHdr.sbp);
-
-            return error;
+            case AtaProtocol.DeviceDiagnostic:
+            case AtaProtocol.DeviceReset:
+            case AtaProtocol.HardReset:
+            case AtaProtocol.NonData:
+            case AtaProtocol.SoftReset:
+            case AtaProtocol.ReturnResponse: return ScsiIoctlDirection.None;
+            case AtaProtocol.PioIn:
+            case AtaProtocol.UDmaIn: return ScsiIoctlDirection.In;
+            case AtaProtocol.PioOut:
+            case AtaProtocol.UDmaOut: return ScsiIoctlDirection.Out;
+            default: return ScsiIoctlDirection.Unspecified;
         }
+    }
 
-        /// <summary>Converts ATA protocol to SG_IO direction</summary>
-        /// <param name="protocol">ATA protocol</param>
-        /// <returns>SG_IO direction</returns>
-        static ScsiIoctlDirection AtaProtocolToScsiDirection(AtaProtocol protocol)
+    /// <summary>Sends an ATA command in CHS mode</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
+    /// <param name="registers">Registers to send to drive</param>
+    /// <param name="errorRegisters">Registers returned by drive</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    /// <param name="transferRegister">Which register contains the transfer count</param>
+    /// <param name="transferBlocks">Set to <c>true</c> if the transfer count is in blocks, otherwise it is in bytes</param>
+    internal static int SendAtaCommand(int fd, AtaRegistersChs registers, out AtaErrorRegistersChs errorRegisters,
+                                       AtaProtocol protocol, AtaTransferRegister transferRegister,
+                                       ref byte[] buffer, uint timeout, bool transferBlocks, out double duration,
+                                       out bool sense)
+    {
+        duration       = 0;
+        sense          = false;
+        errorRegisters = new AtaErrorRegistersChs();
+
+        if(buffer == null)
+            return -1;
+
+        byte[] cdb = new byte[16];
+        cdb[0] = (byte)ScsiCommands.AtaPassThrough16;
+        cdb[1] = (byte)(((byte)protocol << 1) & 0x1E);
+
+        if(transferRegister != AtaTransferRegister.NoTransfer &&
+           protocol         != AtaProtocol.NonData)
         {
             switch(protocol)
             {
-                case AtaProtocol.DeviceDiagnostic:
-                case AtaProtocol.DeviceReset:
-                case AtaProtocol.HardReset:
-                case AtaProtocol.NonData:
-                case AtaProtocol.SoftReset:
-                case AtaProtocol.ReturnResponse: return ScsiIoctlDirection.None;
                 case AtaProtocol.PioIn:
-                case AtaProtocol.UDmaIn: return ScsiIoctlDirection.In;
-                case AtaProtocol.PioOut:
-                case AtaProtocol.UDmaOut: return ScsiIoctlDirection.Out;
-                default: return ScsiIoctlDirection.Unspecified;
+                case AtaProtocol.UDmaIn:
+                    cdb[2] = 0x08;
+
+                    break;
+                default:
+                    cdb[2] = 0x00;
+
+                    break;
             }
+
+            if(transferBlocks)
+                cdb[2] |= 0x04;
+
+            cdb[2] |= (byte)((int)transferRegister & 0x03);
         }
 
-        /// <summary>Sends an ATA command in CHS mode</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
-        /// <param name="registers">Registers to send to drive</param>
-        /// <param name="errorRegisters">Registers returned by drive</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        /// <param name="transferRegister">Which register contains the transfer count</param>
-        /// <param name="transferBlocks">Set to <c>true</c> if the transfer count is in blocks, otherwise it is in bytes</param>
-        internal static int SendAtaCommand(int fd, AtaRegistersChs registers, out AtaErrorRegistersChs errorRegisters,
-                                           AtaProtocol protocol, AtaTransferRegister transferRegister,
-                                           ref byte[] buffer, uint timeout, bool transferBlocks, out double duration,
-                                           out bool sense)
-        {
-            duration       = 0;
-            sense          = false;
-            errorRegisters = new AtaErrorRegistersChs();
+        //cdb[2] |= 0x20;
 
-            if(buffer == null)
-                return -1;
+        cdb[4]  = registers.Feature;
+        cdb[6]  = registers.SectorCount;
+        cdb[8]  = registers.Sector;
+        cdb[10] = registers.CylinderLow;
+        cdb[12] = registers.CylinderHigh;
+        cdb[13] = registers.DeviceHead;
+        cdb[14] = registers.Command;
 
-            byte[] cdb = new byte[16];
-            cdb[0] = (byte)ScsiCommands.AtaPassThrough16;
-            cdb[1] = (byte)(((byte)protocol << 1) & 0x1E);
-
-            if(transferRegister != AtaTransferRegister.NoTransfer &&
-               protocol         != AtaProtocol.NonData)
-            {
-                switch(protocol)
-                {
-                    case AtaProtocol.PioIn:
-                    case AtaProtocol.UDmaIn:
-                        cdb[2] = 0x08;
-
-                        break;
-                    default:
-                        cdb[2] = 0x00;
-
-                        break;
-                }
-
-                if(transferBlocks)
-                    cdb[2] |= 0x04;
-
-                cdb[2] |= (byte)((int)transferRegister & 0x03);
-            }
-
-            //cdb[2] |= 0x20;
-
-            cdb[4]  = registers.Feature;
-            cdb[6]  = registers.SectorCount;
-            cdb[8]  = registers.Sector;
-            cdb[10] = registers.CylinderLow;
-            cdb[12] = registers.CylinderHigh;
-            cdb[13] = registers.DeviceHead;
-            cdb[14] = registers.Command;
-
-            int error = SendScsiCommand(fd, cdb, ref buffer, out byte[] senseBuffer, timeout,
-                                        AtaProtocolToScsiDirection(protocol), out duration, out sense);
-
-            if(senseBuffer.Length < 22 ||
-               (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C))
-                return error;
-
-            errorRegisters.Error = senseBuffer[11];
-
-            errorRegisters.SectorCount  = senseBuffer[13];
-            errorRegisters.Sector       = senseBuffer[15];
-            errorRegisters.CylinderLow  = senseBuffer[17];
-            errorRegisters.CylinderHigh = senseBuffer[19];
-            errorRegisters.DeviceHead   = senseBuffer[20];
-            errorRegisters.Status       = senseBuffer[21];
-
-            sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
+        int error = SendScsiCommand(fd, cdb, ref buffer, out byte[] senseBuffer, timeout,
+                                    AtaProtocolToScsiDirection(protocol), out duration, out sense);
 
+        if(senseBuffer.Length < 22 ||
+           (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C))
             return error;
-        }
 
-        /// <summary>Sends an ATA command in 28-bit LBA mode</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
-        /// <param name="registers">Registers to send to drive</param>
-        /// <param name="errorRegisters">Registers returned by drive</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        /// <param name="transferRegister">Which register contains the transfer count</param>
-        /// <param name="transferBlocks">Set to <c>true</c> if the transfer count is in blocks, otherwise it is in bytes</param>
-        internal static int SendAtaCommand(int fd, AtaRegistersLba28 registers,
-                                           out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
-                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
-                                           bool transferBlocks, out double duration, out bool sense)
+        errorRegisters.Error = senseBuffer[11];
+
+        errorRegisters.SectorCount  = senseBuffer[13];
+        errorRegisters.Sector       = senseBuffer[15];
+        errorRegisters.CylinderLow  = senseBuffer[17];
+        errorRegisters.CylinderHigh = senseBuffer[19];
+        errorRegisters.DeviceHead   = senseBuffer[20];
+        errorRegisters.Status       = senseBuffer[21];
+
+        sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
+
+        return error;
+    }
+
+    /// <summary>Sends an ATA command in 28-bit LBA mode</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
+    /// <param name="registers">Registers to send to drive</param>
+    /// <param name="errorRegisters">Registers returned by drive</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    /// <param name="transferRegister">Which register contains the transfer count</param>
+    /// <param name="transferBlocks">Set to <c>true</c> if the transfer count is in blocks, otherwise it is in bytes</param>
+    internal static int SendAtaCommand(int fd, AtaRegistersLba28 registers,
+                                       out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
+                                       AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                       bool transferBlocks, out double duration, out bool sense)
+    {
+        duration       = 0;
+        sense          = false;
+        errorRegisters = new AtaErrorRegistersLba28();
+
+        if(buffer == null)
+            return -1;
+
+        byte[] cdb = new byte[16];
+        cdb[0] = (byte)ScsiCommands.AtaPassThrough16;
+        cdb[1] = (byte)(((byte)protocol << 1) & 0x1E);
+
+        if(transferRegister != AtaTransferRegister.NoTransfer &&
+           protocol         != AtaProtocol.NonData)
         {
-            duration       = 0;
-            sense          = false;
-            errorRegisters = new AtaErrorRegistersLba28();
-
-            if(buffer == null)
-                return -1;
-
-            byte[] cdb = new byte[16];
-            cdb[0] = (byte)ScsiCommands.AtaPassThrough16;
-            cdb[1] = (byte)(((byte)protocol << 1) & 0x1E);
-
-            if(transferRegister != AtaTransferRegister.NoTransfer &&
-               protocol         != AtaProtocol.NonData)
+            switch(protocol)
             {
-                switch(protocol)
-                {
-                    case AtaProtocol.PioIn:
-                    case AtaProtocol.UDmaIn:
-                        cdb[2] = 0x08;
+                case AtaProtocol.PioIn:
+                case AtaProtocol.UDmaIn:
+                    cdb[2] = 0x08;
 
-                        break;
-                    default:
-                        cdb[2] = 0x00;
+                    break;
+                default:
+                    cdb[2] = 0x00;
 
-                        break;
-                }
-
-                if(transferBlocks)
-                    cdb[2] |= 0x04;
-
-                cdb[2] |= (byte)((int)transferRegister & 0x03);
+                    break;
             }
 
-            cdb[2] |= 0x20;
+            if(transferBlocks)
+                cdb[2] |= 0x04;
 
-            cdb[4]  = registers.Feature;
-            cdb[6]  = registers.SectorCount;
-            cdb[8]  = registers.LbaLow;
-            cdb[10] = registers.LbaMid;
-            cdb[12] = registers.LbaHigh;
-            cdb[13] = registers.DeviceHead;
-            cdb[14] = registers.Command;
-
-            int error = SendScsiCommand(fd, cdb, ref buffer, out byte[] senseBuffer, timeout,
-                                        AtaProtocolToScsiDirection(protocol), out duration, out sense);
-
-            if(senseBuffer.Length < 22 ||
-               (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C))
-                return error;
-
-            errorRegisters.Error = senseBuffer[11];
-
-            errorRegisters.SectorCount = senseBuffer[13];
-            errorRegisters.LbaLow      = senseBuffer[15];
-            errorRegisters.LbaMid      = senseBuffer[17];
-            errorRegisters.LbaHigh     = senseBuffer[19];
-            errorRegisters.DeviceHead  = senseBuffer[20];
-            errorRegisters.Status      = senseBuffer[21];
-
-            sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
-
-            return error;
+            cdb[2] |= (byte)((int)transferRegister & 0x03);
         }
 
-        /// <summary>Sends an ATA command in 48-bit LBA mode</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
-        /// <param name="registers">Registers to send to drive</param>
-        /// <param name="errorRegisters">Registers returned by drive</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        /// <param name="transferRegister">Which register contains the transfer count</param>
-        /// <param name="transferBlocks">Set to <c>true</c> if the transfer count is in blocks, otherwise it is in bytes</param>
-        internal static int SendAtaCommand(int fd, AtaRegistersLba48 registers,
-                                           out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
-                                           AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
-                                           bool transferBlocks, out double duration, out bool sense)
+        cdb[2] |= 0x20;
+
+        cdb[4]  = registers.Feature;
+        cdb[6]  = registers.SectorCount;
+        cdb[8]  = registers.LbaLow;
+        cdb[10] = registers.LbaMid;
+        cdb[12] = registers.LbaHigh;
+        cdb[13] = registers.DeviceHead;
+        cdb[14] = registers.Command;
+
+        int error = SendScsiCommand(fd, cdb, ref buffer, out byte[] senseBuffer, timeout,
+                                    AtaProtocolToScsiDirection(protocol), out duration, out sense);
+
+        if(senseBuffer.Length < 22 ||
+           (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C))
+            return error;
+
+        errorRegisters.Error = senseBuffer[11];
+
+        errorRegisters.SectorCount = senseBuffer[13];
+        errorRegisters.LbaLow      = senseBuffer[15];
+        errorRegisters.LbaMid      = senseBuffer[17];
+        errorRegisters.LbaHigh     = senseBuffer[19];
+        errorRegisters.DeviceHead  = senseBuffer[20];
+        errorRegisters.Status      = senseBuffer[21];
+
+        sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
+
+        return error;
+    }
+
+    /// <summary>Sends an ATA command in 48-bit LBA mode</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
+    /// <param name="registers">Registers to send to drive</param>
+    /// <param name="errorRegisters">Registers returned by drive</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    /// <param name="transferRegister">Which register contains the transfer count</param>
+    /// <param name="transferBlocks">Set to <c>true</c> if the transfer count is in blocks, otherwise it is in bytes</param>
+    internal static int SendAtaCommand(int fd, AtaRegistersLba48 registers,
+                                       out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
+                                       AtaTransferRegister transferRegister, ref byte[] buffer, uint timeout,
+                                       bool transferBlocks, out double duration, out bool sense)
+    {
+        duration       = 0;
+        sense          = false;
+        errorRegisters = new AtaErrorRegistersLba48();
+
+        if(buffer == null)
+            return -1;
+
+        byte[] cdb = new byte[16];
+        cdb[0] =  (byte)ScsiCommands.AtaPassThrough16;
+        cdb[1] =  (byte)(((byte)protocol << 1) & 0x1E);
+        cdb[1] |= 0x01;
+
+        if(transferRegister != AtaTransferRegister.NoTransfer &&
+           protocol         != AtaProtocol.NonData)
         {
-            duration       = 0;
-            sense          = false;
-            errorRegisters = new AtaErrorRegistersLba48();
-
-            if(buffer == null)
-                return -1;
-
-            byte[] cdb = new byte[16];
-            cdb[0] =  (byte)ScsiCommands.AtaPassThrough16;
-            cdb[1] =  (byte)(((byte)protocol << 1) & 0x1E);
-            cdb[1] |= 0x01;
-
-            if(transferRegister != AtaTransferRegister.NoTransfer &&
-               protocol         != AtaProtocol.NonData)
+            switch(protocol)
             {
-                switch(protocol)
-                {
-                    case AtaProtocol.PioIn:
-                    case AtaProtocol.UDmaIn:
-                        cdb[2] = 0x08;
+                case AtaProtocol.PioIn:
+                case AtaProtocol.UDmaIn:
+                    cdb[2] = 0x08;
 
-                        break;
-                    default:
-                        cdb[2] = 0x00;
+                    break;
+                default:
+                    cdb[2] = 0x00;
 
-                        break;
-                }
-
-                if(transferBlocks)
-                    cdb[2] |= 0x04;
-
-                cdb[2] |= (byte)((int)transferRegister & 0x03);
+                    break;
             }
 
-            cdb[2] |= 0x20;
+            if(transferBlocks)
+                cdb[2] |= 0x04;
 
-            cdb[3]  = (byte)((registers.Feature & 0xFF00) >> 8);
-            cdb[4]  = (byte)(registers.Feature & 0xFF);
-            cdb[5]  = (byte)((registers.SectorCount & 0xFF00) >> 8);
-            cdb[6]  = (byte)(registers.SectorCount & 0xFF);
-            cdb[7]  = registers.LbaLowPrevious;
-            cdb[8]  = registers.LbaLowCurrent;
-            cdb[9]  = registers.LbaMidPrevious;
-            cdb[10] = registers.LbaMidCurrent;
-            cdb[11] = registers.LbaHighPrevious;
-            cdb[12] = registers.LbaHighCurrent;
-            cdb[13] = registers.DeviceHead;
-            cdb[14] = registers.Command;
-
-            int error = SendScsiCommand(fd, cdb, ref buffer, out byte[] senseBuffer, timeout,
-                                        AtaProtocolToScsiDirection(protocol), out duration, out sense);
-
-            if(senseBuffer.Length < 22 ||
-               (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C))
-                return error;
-
-            errorRegisters.Error = senseBuffer[11];
-
-            errorRegisters.SectorCount     = (ushort)((senseBuffer[12] << 8) + senseBuffer[13]);
-            errorRegisters.LbaLowPrevious  = senseBuffer[14];
-            errorRegisters.LbaLowCurrent   = senseBuffer[15];
-            errorRegisters.LbaMidPrevious  = senseBuffer[16];
-            errorRegisters.LbaMidCurrent   = senseBuffer[17];
-            errorRegisters.LbaHighPrevious = senseBuffer[18];
-            errorRegisters.LbaHighCurrent  = senseBuffer[19];
-            errorRegisters.DeviceHead      = senseBuffer[20];
-            errorRegisters.Status          = senseBuffer[21];
-
-            sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
-
-            sense |= error != 0;
-
-            return error;
+            cdb[2] |= (byte)((int)transferRegister & 0x03);
         }
 
-        /// <summary>Sends a MMC/SD command</summary>
-        /// <returns>The result of the command.</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="command">MMC/SD opcode</param>
-        /// <param name="buffer">Buffer for MMC/SD command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
-        /// <param name="write"><c>True</c> if data is sent from host to card</param>
-        /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
-        /// <param name="flags">Flags indicating kind and place of response</param>
-        /// <param name="blocks">How many blocks to transfer</param>
-        /// <param name="argument">Command argument</param>
-        /// <param name="response">Response registers</param>
-        /// <param name="blockSize">Size of block in bytes</param>
-        internal static int SendMmcCommand(int fd, MmcCommands command, bool write, bool isApplication, MmcFlags flags,
-                                           uint argument, uint blockSize, uint blocks, ref byte[] buffer,
-                                           out uint[] response, out double duration, out bool sense, uint timeout = 0)
+        cdb[2] |= 0x20;
+
+        cdb[3]  = (byte)((registers.Feature & 0xFF00) >> 8);
+        cdb[4]  = (byte)(registers.Feature & 0xFF);
+        cdb[5]  = (byte)((registers.SectorCount & 0xFF00) >> 8);
+        cdb[6]  = (byte)(registers.SectorCount & 0xFF);
+        cdb[7]  = registers.LbaLowPrevious;
+        cdb[8]  = registers.LbaLowCurrent;
+        cdb[9]  = registers.LbaMidPrevious;
+        cdb[10] = registers.LbaMidCurrent;
+        cdb[11] = registers.LbaHighPrevious;
+        cdb[12] = registers.LbaHighCurrent;
+        cdb[13] = registers.DeviceHead;
+        cdb[14] = registers.Command;
+
+        int error = SendScsiCommand(fd, cdb, ref buffer, out byte[] senseBuffer, timeout,
+                                    AtaProtocolToScsiDirection(protocol), out duration, out sense);
+
+        if(senseBuffer.Length < 22 ||
+           (senseBuffer[8] != 0x09 && senseBuffer[9] != 0x0C))
+            return error;
+
+        errorRegisters.Error = senseBuffer[11];
+
+        errorRegisters.SectorCount     = (ushort)((senseBuffer[12] << 8) + senseBuffer[13]);
+        errorRegisters.LbaLowPrevious  = senseBuffer[14];
+        errorRegisters.LbaLowCurrent   = senseBuffer[15];
+        errorRegisters.LbaMidPrevious  = senseBuffer[16];
+        errorRegisters.LbaMidCurrent   = senseBuffer[17];
+        errorRegisters.LbaHighPrevious = senseBuffer[18];
+        errorRegisters.LbaHighCurrent  = senseBuffer[19];
+        errorRegisters.DeviceHead      = senseBuffer[20];
+        errorRegisters.Status          = senseBuffer[21];
+
+        sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
+
+        sense |= error != 0;
+
+        return error;
+    }
+
+    /// <summary>Sends a MMC/SD command</summary>
+    /// <returns>The result of the command.</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="command">MMC/SD opcode</param>
+    /// <param name="buffer">Buffer for MMC/SD command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
+    /// <param name="write"><c>True</c> if data is sent from host to card</param>
+    /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
+    /// <param name="flags">Flags indicating kind and place of response</param>
+    /// <param name="blocks">How many blocks to transfer</param>
+    /// <param name="argument">Command argument</param>
+    /// <param name="response">Response registers</param>
+    /// <param name="blockSize">Size of block in bytes</param>
+    internal static int SendMmcCommand(int fd, MmcCommands command, bool write, bool isApplication, MmcFlags flags,
+                                       uint argument, uint blockSize, uint blocks, ref byte[] buffer,
+                                       out uint[] response, out double duration, out bool sense, uint timeout = 0)
+    {
+        response = null;
+        duration = 0;
+        sense    = false;
+
+        if(buffer == null)
+            return -1;
+
+        var ioCmd = new MmcIocCmd();
+
+        IntPtr bufPtr = Marshal.AllocHGlobal(buffer.Length);
+
+        ioCmd.write_flag = write;
+        ioCmd.is_ascmd   = isApplication;
+        ioCmd.opcode     = (uint)command;
+        ioCmd.arg        = argument;
+        ioCmd.flags      = flags;
+        ioCmd.blksz      = blockSize;
+        ioCmd.blocks     = blocks;
+
+        if(timeout > 0)
         {
-            response = null;
-            duration = 0;
-            sense    = false;
+            ioCmd.data_timeout_ns = timeout * 1000000000;
+            ioCmd.cmd_timeout_ms  = timeout * 1000;
+        }
 
-            if(buffer == null)
-                return -1;
+        ioCmd.data_ptr = (ulong)bufPtr;
 
+        Marshal.Copy(buffer, 0, bufPtr, buffer.Length);
+
+        DateTime start = DateTime.UtcNow;
+        int      error = Extern.ioctlMmc(fd, LinuxIoctl.MmcIocCmd, ref ioCmd);
+        DateTime end   = DateTime.UtcNow;
+
+        sense |= error < 0;
+
+        if(error < 0)
+            error = Marshal.GetLastWin32Error();
+
+        Marshal.Copy(bufPtr, buffer, 0, buffer.Length);
+
+        response = ioCmd.response;
+        duration = (end - start).TotalMilliseconds;
+
+        Marshal.FreeHGlobal(bufPtr);
+
+        return error;
+    }
+
+    internal static int SendMultipleMmcCommands(int fd, Device.MmcSingleCommand[] commands, out double duration,
+                                                out bool sense, uint timeout = 0)
+    {
+        duration = 0;
+        sense    = false;
+        int off;
+
+        // Create array for buffers
+        IntPtr[] bufferPointers = new IntPtr[commands.Length];
+
+        // Allocate memory for the array for commands
+        byte[] ioMultiCmd = new byte[sizeof(ulong) + (Marshal.SizeOf<MmcIocCmd>() * commands.Length)];
+
+        // First value of array is uint64 with count of commands
+        Array.Copy(BitConverter.GetBytes((ulong)commands.Length), 0, ioMultiCmd, 0, sizeof(ulong));
+
+        off = sizeof(ulong);
+
+        for(int i = 0; i < commands.Length; i++)
+        {
+            // Create command
             var ioCmd = new MmcIocCmd();
 
-            IntPtr bufPtr = Marshal.AllocHGlobal(buffer.Length);
+            // Allocate buffer
+            bufferPointers[i] = Marshal.AllocHGlobal(commands[i].buffer.Length);
 
-            ioCmd.write_flag = write;
-            ioCmd.is_ascmd   = isApplication;
-            ioCmd.opcode     = (uint)command;
-            ioCmd.arg        = argument;
-            ioCmd.flags      = flags;
-            ioCmd.blksz      = blockSize;
-            ioCmd.blocks     = blocks;
+            // Define command
+            ioCmd.write_flag = commands[i].write;
+            ioCmd.is_ascmd   = commands[i].isApplication;
+            ioCmd.opcode     = (uint)commands[i].command;
+            ioCmd.arg        = commands[i].argument;
+            ioCmd.flags      = commands[i].flags;
+            ioCmd.blksz      = commands[i].blockSize;
+            ioCmd.blocks     = commands[i].blocks;
 
             if(timeout > 0)
             {
@@ -424,223 +488,158 @@ namespace Aaru.Devices.Linux
                 ioCmd.cmd_timeout_ms  = timeout * 1000;
             }
 
-            ioCmd.data_ptr = (ulong)bufPtr;
+            ioCmd.data_ptr = (ulong)bufferPointers[i];
 
-            Marshal.Copy(buffer, 0, bufPtr, buffer.Length);
+            // Copy buffer to unmanaged space
+            Marshal.Copy(commands[i].buffer, 0, bufferPointers[i], commands[i].buffer.Length);
 
-            DateTime start = DateTime.UtcNow;
-            int      error = Extern.ioctlMmc(fd, LinuxIoctl.MmcIocCmd, ref ioCmd);
-            DateTime end   = DateTime.UtcNow;
+            // Copy command to array
+            byte[] ioCmdBytes = Helpers.Marshal.StructureToByteArrayLittleEndian(ioCmd);
+            Array.Copy(ioCmdBytes, 0, ioMultiCmd, off, Marshal.SizeOf<MmcIocCmd>());
 
-            sense |= error < 0;
+            // Advance pointer
+            off += Marshal.SizeOf<MmcIocCmd>();
+        }
 
-            if(error < 0)
-                error = Marshal.GetLastWin32Error();
+        // Allocate unmanaged memory for array of commands
+        IntPtr ioMultiCmdPtr = Marshal.AllocHGlobal(ioMultiCmd.Length);
 
-            Marshal.Copy(bufPtr, buffer, 0, buffer.Length);
+        // Copy array of commands to unmanaged memory
+        Marshal.Copy(ioMultiCmd, 0, ioMultiCmdPtr, ioMultiCmd.Length);
 
-            response = ioCmd.response;
+        // Send command
+        DateTime start = DateTime.UtcNow;
+        int      error = Extern.ioctlMmcMulti(fd, LinuxIoctl.MmcIocMultiCmd, ioMultiCmdPtr);
+        DateTime end   = DateTime.UtcNow;
+
+        sense |= error < 0;
+
+        if(error < 0)
+            error = Marshal.GetLastWin32Error();
+
+        duration = (end - start).TotalMilliseconds;
+
+        off = sizeof(ulong);
+
+        // Copy array from unmanaged memory
+        Marshal.Copy(ioMultiCmdPtr, ioMultiCmd, 0, ioMultiCmd.Length);
+
+        // TODO: Use real pointers this is too slow
+        for(int i = 0; i < commands.Length; i++)
+        {
+            byte[] tmp = new byte[Marshal.SizeOf<MmcIocCmd>()];
+
+            // Copy command to managed space
+            Array.Copy(ioMultiCmd, off, tmp, 0, tmp.Length);
+            MmcIocCmd command = Helpers.Marshal.ByteArrayToStructureLittleEndian<MmcIocCmd>(tmp);
+
+            // Copy response
+            commands[i].response = command.response;
+
+            // Copy buffer to managed space
+            Marshal.Copy(bufferPointers[i], commands[i].buffer, 0, commands[i].buffer.Length);
+
+            // Free buffer
+            Marshal.FreeHGlobal(bufferPointers[i]);
+
+            // Advance pointer
+            off += Marshal.SizeOf<MmcIocCmd>();
+        }
+
+        // Free unmanaged memory
+        Marshal.FreeHGlobal(ioMultiCmdPtr);
+
+        return error;
+    }
+
+    internal static int ReOpen(string devicePath, int fd, out object newFd)
+    {
+        newFd = -1;
+
+        int ret = Extern.close(fd);
+
+        if(ret < 0)
+            return Marshal.GetLastWin32Error();
+
+        newFd = Extern.open(devicePath, FileFlags.ReadWrite | FileFlags.NonBlocking | FileFlags.CreateNew);
+
+        if((int)newFd >= 0)
+            return 0;
+
+        int error = Marshal.GetLastWin32Error();
+
+        if(error != 13 &&
+           error != 30)
+            return Marshal.GetLastWin32Error();
+
+        newFd = Extern.open(devicePath, FileFlags.Readonly | FileFlags.NonBlocking);
+
+        return (int)newFd < 0 ? Marshal.GetLastWin32Error() : 0;
+    }
+
+    /// <summary>Reads the contents of a symbolic link</summary>
+    /// <param name="path">Path to the symbolic link</param>
+    /// <returns>Contents of the symbolic link</returns>
+    internal static string ReadLink(string path)
+    {
+        IntPtr buf = Marshal.AllocHGlobal(4096);
+        int    resultSize;
+
+        if(DetectOS.Is64Bit)
+        {
+            long result64 = Extern.readlink64(path, buf, 4096);
+
+            if(result64 <= 0)
+                return null;
+
+            resultSize = (int)result64;
+        }
+        else
+        {
+            int result = Extern.readlink(path, buf, 4096);
+
+            if(result <= 0)
+                return null;
+
+            resultSize = result;
+        }
+
+        byte[] resultString = new byte[resultSize];
+        Marshal.Copy(buf, resultString, 0, resultSize);
+        Marshal.FreeHGlobal(buf);
+
+        return Encoding.ASCII.GetString(resultString);
+    }
+
+    internal static int BufferedOsRead(int fd, out byte[] buffer, long offset, uint length, out double duration)
+    {
+        buffer = new byte[length];
+
+        DateTime start = DateTime.Now;
+
+        long sense = Extern.lseek(fd, offset, SeekWhence.Begin);
+
+        DateTime end = DateTime.Now;
+
+        if(sense < 0)
+        {
             duration = (end - start).TotalMilliseconds;
 
-            Marshal.FreeHGlobal(bufPtr);
-
-            return error;
+            return Marshal.GetLastWin32Error();
         }
 
-        internal static int SendMultipleMmcCommands(int fd, Device.MmcSingleCommand[] commands, out double duration,
-                                                    out bool sense, uint timeout = 0)
-        {
-            duration = 0;
-            sense    = false;
-            int off;
+        sense = DetectOS.Is64Bit ? Extern.read64(fd, buffer, length) : Extern.read(fd, buffer, (int)length);
 
-            // Create array for buffers
-            IntPtr[] bufferPointers = new IntPtr[commands.Length];
+        end      = DateTime.Now;
+        duration = (end - start).TotalMilliseconds;
 
-            // Allocate memory for the array for commands
-            byte[] ioMultiCmd = new byte[sizeof(ulong) + (Marshal.SizeOf<MmcIocCmd>() * commands.Length)];
+        int errno = Marshal.GetLastWin32Error();
 
-            // First value of array is uint64 with count of commands
-            Array.Copy(BitConverter.GetBytes((ulong)commands.Length), 0, ioMultiCmd, 0, sizeof(ulong));
+        if(sense == length)
+            errno = 0;
+        else if(errno == 0)
+            errno = -22;
 
-            off = sizeof(ulong);
-
-            for(int i = 0; i < commands.Length; i++)
-            {
-                // Create command
-                var ioCmd = new MmcIocCmd();
-
-                // Allocate buffer
-                bufferPointers[i] = Marshal.AllocHGlobal(commands[i].buffer.Length);
-
-                // Define command
-                ioCmd.write_flag = commands[i].write;
-                ioCmd.is_ascmd   = commands[i].isApplication;
-                ioCmd.opcode     = (uint)commands[i].command;
-                ioCmd.arg        = commands[i].argument;
-                ioCmd.flags      = commands[i].flags;
-                ioCmd.blksz      = commands[i].blockSize;
-                ioCmd.blocks     = commands[i].blocks;
-
-                if(timeout > 0)
-                {
-                    ioCmd.data_timeout_ns = timeout * 1000000000;
-                    ioCmd.cmd_timeout_ms  = timeout * 1000;
-                }
-
-                ioCmd.data_ptr = (ulong)bufferPointers[i];
-
-                // Copy buffer to unmanaged space
-                Marshal.Copy(commands[i].buffer, 0, bufferPointers[i], commands[i].buffer.Length);
-
-                // Copy command to array
-                byte[] ioCmdBytes = Helpers.Marshal.StructureToByteArrayLittleEndian(ioCmd);
-                Array.Copy(ioCmdBytes, 0, ioMultiCmd, off, Marshal.SizeOf<MmcIocCmd>());
-
-                // Advance pointer
-                off += Marshal.SizeOf<MmcIocCmd>();
-            }
-
-            // Allocate unmanaged memory for array of commands
-            IntPtr ioMultiCmdPtr = Marshal.AllocHGlobal(ioMultiCmd.Length);
-
-            // Copy array of commands to unmanaged memory
-            Marshal.Copy(ioMultiCmd, 0, ioMultiCmdPtr, ioMultiCmd.Length);
-
-            // Send command
-            DateTime start = DateTime.UtcNow;
-            int      error = Extern.ioctlMmcMulti(fd, LinuxIoctl.MmcIocMultiCmd, ioMultiCmdPtr);
-            DateTime end   = DateTime.UtcNow;
-
-            sense |= error < 0;
-
-            if(error < 0)
-                error = Marshal.GetLastWin32Error();
-
-            duration = (end - start).TotalMilliseconds;
-
-            off = sizeof(ulong);
-
-            // Copy array from unmanaged memory
-            Marshal.Copy(ioMultiCmdPtr, ioMultiCmd, 0, ioMultiCmd.Length);
-
-            // TODO: Use real pointers this is too slow
-            for(int i = 0; i < commands.Length; i++)
-            {
-                byte[] tmp = new byte[Marshal.SizeOf<MmcIocCmd>()];
-
-                // Copy command to managed space
-                Array.Copy(ioMultiCmd, off, tmp, 0, tmp.Length);
-                MmcIocCmd command = Helpers.Marshal.ByteArrayToStructureLittleEndian<MmcIocCmd>(tmp);
-
-                // Copy response
-                commands[i].response = command.response;
-
-                // Copy buffer to managed space
-                Marshal.Copy(bufferPointers[i], commands[i].buffer, 0, commands[i].buffer.Length);
-
-                // Free buffer
-                Marshal.FreeHGlobal(bufferPointers[i]);
-
-                // Advance pointer
-                off += Marshal.SizeOf<MmcIocCmd>();
-            }
-
-            // Free unmanaged memory
-            Marshal.FreeHGlobal(ioMultiCmdPtr);
-
-            return error;
-        }
-
-        internal static int ReOpen(string devicePath, int fd, out object newFd)
-        {
-            newFd = -1;
-
-            int ret = Extern.close(fd);
-
-            if(ret < 0)
-                return Marshal.GetLastWin32Error();
-
-            newFd = Extern.open(devicePath, FileFlags.ReadWrite | FileFlags.NonBlocking | FileFlags.CreateNew);
-
-            if((int)newFd >= 0)
-                return 0;
-
-            int error = Marshal.GetLastWin32Error();
-
-            if(error != 13 &&
-               error != 30)
-                return Marshal.GetLastWin32Error();
-
-            newFd = Extern.open(devicePath, FileFlags.Readonly | FileFlags.NonBlocking);
-
-            return (int)newFd < 0 ? Marshal.GetLastWin32Error() : 0;
-        }
-
-        /// <summary>Reads the contents of a symbolic link</summary>
-        /// <param name="path">Path to the symbolic link</param>
-        /// <returns>Contents of the symbolic link</returns>
-        internal static string ReadLink(string path)
-        {
-            IntPtr buf = Marshal.AllocHGlobal(4096);
-            int    resultSize;
-
-            if(DetectOS.Is64Bit)
-            {
-                long result64 = Extern.readlink64(path, buf, 4096);
-
-                if(result64 <= 0)
-                    return null;
-
-                resultSize = (int)result64;
-            }
-            else
-            {
-                int result = Extern.readlink(path, buf, 4096);
-
-                if(result <= 0)
-                    return null;
-
-                resultSize = result;
-            }
-
-            byte[] resultString = new byte[resultSize];
-            Marshal.Copy(buf, resultString, 0, resultSize);
-            Marshal.FreeHGlobal(buf);
-
-            return Encoding.ASCII.GetString(resultString);
-        }
-
-        internal static int BufferedOsRead(int fd, out byte[] buffer, long offset, uint length, out double duration)
-        {
-            buffer = new byte[length];
-
-            DateTime start = DateTime.Now;
-
-            long sense = Extern.lseek(fd, offset, SeekWhence.Begin);
-
-            DateTime end = DateTime.Now;
-
-            if(sense < 0)
-            {
-                duration = (end - start).TotalMilliseconds;
-
-                return Marshal.GetLastWin32Error();
-            }
-
-            sense = DetectOS.Is64Bit ? Extern.read64(fd, buffer, length) : Extern.read(fd, buffer, (int)length);
-
-            end      = DateTime.Now;
-            duration = (end - start).TotalMilliseconds;
-
-            int errno = Marshal.GetLastWin32Error();
-
-            if(sense == length)
-                errno = 0;
-            else if(errno == 0)
-                errno = -22;
-
-            return errno;
-        }
+        return errno;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Linux/Enums.cs b/Aaru.Devices/Linux/Enums.cs
index 9522a6de1..2d71df4f3 100644
--- a/Aaru.Devices/Linux/Enums.cs
+++ b/Aaru.Devices/Linux/Enums.cs
@@ -33,101 +33,100 @@
 
 using System;
 
-namespace Aaru.Devices.Linux
+namespace Aaru.Devices.Linux;
+
+[Flags]
+internal enum FileFlags
 {
-    [Flags]
-    internal enum FileFlags
-    {
-        /// <summary>O_RDONLY</summary>
-        Readonly = 0x0,
-        /// <summary>O_WRONLY</summary>
-        Writeonly = 0x1,
-        /// <summary>O_RDWR</summary>
-        ReadWrite = 0x2,
-        /// <summary>O_CREAT</summary>
-        OpenOrCreate = 0x40,
-        /// <summary>O_EXCL</summary>
-        CreateNew = 0x80,
-        /// <summary>O_NOCTTY</summary>
-        NoControlTty = 0x100,
-        /// <summary>O_TRUNC</summary>
-        Truncate = 0x200,
-        /// <summary>O_APPEND</summary>
-        Append = 0x400,
-        /// <summary>O_NONBLOCK</summary>
-        NonBlocking = 0x800,
-        /// <summary>O_DSYNC</summary>
-        Synchronous = 0x1000,
-        /// <summary>O_ASYNC</summary>
-        Async = 0x2000,
-        /// <summary>O_DIRECT</summary>
-        Direct = 0x4000,
-        /// <summary>O_LARGEFILE</summary>
-        LargeFile = 0x8000,
-        /// <summary>O_DIRECTORY</summary>
-        Directory = 0x10000,
-        /// <summary>O_NOFOLLOW</summary>
-        NoFollowSymlink = 0x20000,
-        /// <summary>O_NOATIME</summary>
-        NoAccessTime = 0x40000,
-        /// <summary>O_CLOEXEC</summary>
-        CloseOnExec = 0x80000
-    }
+    /// <summary>O_RDONLY</summary>
+    Readonly = 0x0,
+    /// <summary>O_WRONLY</summary>
+    Writeonly = 0x1,
+    /// <summary>O_RDWR</summary>
+    ReadWrite = 0x2,
+    /// <summary>O_CREAT</summary>
+    OpenOrCreate = 0x40,
+    /// <summary>O_EXCL</summary>
+    CreateNew = 0x80,
+    /// <summary>O_NOCTTY</summary>
+    NoControlTty = 0x100,
+    /// <summary>O_TRUNC</summary>
+    Truncate = 0x200,
+    /// <summary>O_APPEND</summary>
+    Append = 0x400,
+    /// <summary>O_NONBLOCK</summary>
+    NonBlocking = 0x800,
+    /// <summary>O_DSYNC</summary>
+    Synchronous = 0x1000,
+    /// <summary>O_ASYNC</summary>
+    Async = 0x2000,
+    /// <summary>O_DIRECT</summary>
+    Direct = 0x4000,
+    /// <summary>O_LARGEFILE</summary>
+    LargeFile = 0x8000,
+    /// <summary>O_DIRECTORY</summary>
+    Directory = 0x10000,
+    /// <summary>O_NOFOLLOW</summary>
+    NoFollowSymlink = 0x20000,
+    /// <summary>O_NOATIME</summary>
+    NoAccessTime = 0x40000,
+    /// <summary>O_CLOEXEC</summary>
+    CloseOnExec = 0x80000
+}
 
-    /// <summary>Direction of SCSI transfer</summary>
-    internal enum ScsiIoctlDirection
-    {
-        /// <summary>No data transfer happens SG_DXFER_NONE</summary>
-        None = -1,
-        /// <summary>From host to device SG_DXFER_TO_DEV</summary>
-        Out = -2,
-        /// <summary>From device to host SG_DXFER_FROM_DEV</summary>
-        In = -3,
-        /// <summary>Bidirectional device/host SG_DXFER_TO_FROM_DEV</summary>
-        Unspecified = -4,
-        /// <summary>Unspecified SG_DXFER_UNKNOWN</summary>
-        Unknown = -5
-    }
+/// <summary>Direction of SCSI transfer</summary>
+internal enum ScsiIoctlDirection
+{
+    /// <summary>No data transfer happens SG_DXFER_NONE</summary>
+    None = -1,
+    /// <summary>From host to device SG_DXFER_TO_DEV</summary>
+    Out = -2,
+    /// <summary>From device to host SG_DXFER_FROM_DEV</summary>
+    In = -3,
+    /// <summary>Bidirectional device/host SG_DXFER_TO_FROM_DEV</summary>
+    Unspecified = -4,
+    /// <summary>Unspecified SG_DXFER_UNKNOWN</summary>
+    Unknown = -5
+}
 
-    internal enum LinuxIoctl : uint
-    {
-        // SCSI IOCtls
-        SgGetVersionNum = 0x2282, SgIo = 0x2285,
+internal enum LinuxIoctl : uint
+{
+    // SCSI IOCtls
+    SgGetVersionNum = 0x2282, SgIo = 0x2285,
 
-        // MMC IOCtl
-        MmcIocCmd = 0xC048B300, MmcIocMultiCmd = 0xC008B301
-    }
+    // MMC IOCtl
+    MmcIocCmd = 0xC048B300, MmcIocMultiCmd = 0xC008B301
+}
 
-    [Flags]
-    internal enum SgInfo : uint
-    {
-        /// <summary>Mask to check OK</summary>
-        OkMask = 0x01,
-        /// <summary>No sense or driver noise</summary>
-        Ok = 0x00,
-        /// <summary>Check Condition</summary>
-        CheckCondition = 0x01,
+[Flags]
+internal enum SgInfo : uint
+{
+    /// <summary>Mask to check OK</summary>
+    OkMask = 0x01,
+    /// <summary>No sense or driver noise</summary>
+    Ok = 0x00,
+    /// <summary>Check Condition</summary>
+    CheckCondition = 0x01,
 
-        /// <summary>Direct I/O mask</summary>
-        DirectIoMask = 0x06,
-        /// <summary>Transfer via kernel buffers (or no transfer)</summary>
-        IndirectIo = 0x00,
-        /// <summary>Direct I/O performed</summary>
-        DirectIo = 0x02,
-        /// <summary>Partial direct and partial indirect I/O</summary>
-        MixedIo = 0x04
-    }
+    /// <summary>Direct I/O mask</summary>
+    DirectIoMask = 0x06,
+    /// <summary>Transfer via kernel buffers (or no transfer)</summary>
+    IndirectIo = 0x00,
+    /// <summary>Direct I/O performed</summary>
+    DirectIo = 0x02,
+    /// <summary>Partial direct and partial indirect I/O</summary>
+    MixedIo = 0x04
+}
 
-    [Flags]
-    internal enum SgFlags : uint
-    {
-        DirectIo = 1, UnusedLunInhibit = 2, MmapIo     = 4,
-        NoDxfer  = 0x10000, QAtTail    = 0x10, QAtHead = 0x20
-    }
+[Flags]
+internal enum SgFlags : uint
+{
+    DirectIo = 1, UnusedLunInhibit = 2, MmapIo     = 4,
+    NoDxfer  = 0x10000, QAtTail    = 0x10, QAtHead = 0x20
+}
 
-    internal enum SeekWhence
-    {
-        Begin = 0, Current = 1, End = 2,
-        Data  = 3, Hole    = 4
-    }
+internal enum SeekWhence
+{
+    Begin = 0, Current = 1, End = 2,
+    Data  = 3, Hole    = 4
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Linux/Extern.cs b/Aaru.Devices/Linux/Extern.cs
index 4751488f8..6ab3994e4 100644
--- a/Aaru.Devices/Linux/Extern.cs
+++ b/Aaru.Devices/Linux/Extern.cs
@@ -34,51 +34,50 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Aaru.Devices.Linux
+namespace Aaru.Devices.Linux;
+
+internal static class Extern
 {
-    internal static class Extern
-    {
-        [DllImport("libc", CharSet = CharSet.Ansi, SetLastError = true)]
-        internal static extern int open(string pathname, [MarshalAs(UnmanagedType.U4)] FileFlags flags);
+    [DllImport("libc", CharSet = CharSet.Ansi, SetLastError = true)]
+    internal static extern int open(string pathname, [MarshalAs(UnmanagedType.U4)] FileFlags flags);
 
-        [DllImport("libc")]
-        internal static extern int close(int fd);
+    [DllImport("libc")]
+    internal static extern int close(int fd);
 
-        [DllImport("libc", EntryPoint = "ioctl", SetLastError = true)]
-        internal static extern int ioctlInt(int fd, LinuxIoctl request, out int value);
+    [DllImport("libc", EntryPoint = "ioctl", SetLastError = true)]
+    internal static extern int ioctlInt(int fd, LinuxIoctl request, out int value);
 
-        [DllImport("libc", EntryPoint = "ioctl", SetLastError = true)]
-        internal static extern int ioctlSg(int fd, LinuxIoctl request, ref SgIoHdrT value);
+    [DllImport("libc", EntryPoint = "ioctl", SetLastError = true)]
+    internal static extern int ioctlSg(int fd, LinuxIoctl request, ref SgIoHdrT value);
 
-        [DllImport("libc", EntryPoint = "ioctl", SetLastError = true)]
-        internal static extern int ioctlMmc(int fd, LinuxIoctl request, ref MmcIocCmd value);
+    [DllImport("libc", EntryPoint = "ioctl", SetLastError = true)]
+    internal static extern int ioctlMmc(int fd, LinuxIoctl request, ref MmcIocCmd value);
 
-        [DllImport("libc", CharSet = CharSet.Ansi, SetLastError = true)]
-        internal static extern int readlink(string path, IntPtr buf, int bufsize);
+    [DllImport("libc", CharSet = CharSet.Ansi, SetLastError = true)]
+    internal static extern int readlink(string path, IntPtr buf, int bufsize);
 
-        [DllImport("libc", CharSet = CharSet.Ansi, EntryPoint = "readlink", SetLastError = true)]
-        internal static extern long readlink64(string path, IntPtr buf, long bufsize);
+    [DllImport("libc", CharSet = CharSet.Ansi, EntryPoint = "readlink", SetLastError = true)]
+    internal static extern long readlink64(string path, IntPtr buf, long bufsize);
 
-        [DllImport("libudev", CharSet = CharSet.Ansi, SetLastError = true)]
-        internal static extern IntPtr udev_new();
+    [DllImport("libudev", CharSet = CharSet.Ansi, SetLastError = true)]
+    internal static extern IntPtr udev_new();
 
-        [DllImport("libudev", CharSet = CharSet.Ansi, SetLastError = true)]
-        internal static extern IntPtr udev_device_new_from_subsystem_sysname(
-            IntPtr udev, string subsystem, string sysname);
+    [DllImport("libudev", CharSet = CharSet.Ansi, SetLastError = true)]
+    internal static extern IntPtr udev_device_new_from_subsystem_sysname(
+        IntPtr udev, string subsystem, string sysname);
 
-        [DllImport("libudev", CharSet = CharSet.Ansi, SetLastError = true)]
-        internal static extern string udev_device_get_property_value(IntPtr udevDevice, string key);
+    [DllImport("libudev", CharSet = CharSet.Ansi, SetLastError = true)]
+    internal static extern string udev_device_get_property_value(IntPtr udevDevice, string key);
 
-        [DllImport("libc", EntryPoint = "ioctl", SetLastError = true)]
-        internal static extern int ioctlMmcMulti(int fd, LinuxIoctl request, IntPtr value);
+    [DllImport("libc", EntryPoint = "ioctl", SetLastError = true)]
+    internal static extern int ioctlMmcMulti(int fd, LinuxIoctl request, IntPtr value);
 
-        [DllImport("libc", SetLastError = true)]
-        internal static extern long lseek(int fd, long offset, SeekWhence whence);
+    [DllImport("libc", SetLastError = true)]
+    internal static extern long lseek(int fd, long offset, SeekWhence whence);
 
-        [DllImport("libc", SetLastError = true)]
-        internal static extern int read(int fd, byte[] buf, int count);
+    [DllImport("libc", SetLastError = true)]
+    internal static extern int read(int fd, byte[] buf, int count);
 
-        [DllImport("libc", EntryPoint = "read", SetLastError = true)]
-        internal static extern long read64(int fd, byte[] buf, long count);
-    }
+    [DllImport("libc", EntryPoint = "read", SetLastError = true)]
+    internal static extern long read64(int fd, byte[] buf, long count);
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Linux/ListDevices.cs b/Aaru.Devices/Linux/ListDevices.cs
index efdce1575..9dc914174 100644
--- a/Aaru.Devices/Linux/ListDevices.cs
+++ b/Aaru.Devices/Linux/ListDevices.cs
@@ -34,128 +34,127 @@ using System;
 using System.IO;
 using System.Text;
 
-namespace Aaru.Devices.Linux
+namespace Aaru.Devices.Linux;
+
+internal static class ListDevices
 {
-    internal static class ListDevices
+    const string PATH_SYS_DEVBLOCK = "/sys/block/";
+
+    /// <summary>Gets a list of all known storage devices on Linux</summary>
+    /// <returns>List of devices</returns>
+    internal static DeviceInfo[] GetList()
     {
-        const string PATH_SYS_DEVBLOCK = "/sys/block/";
+        string[] sysdevs = Directory.GetFileSystemEntries(PATH_SYS_DEVBLOCK, "*", SearchOption.TopDirectoryOnly);
 
-        /// <summary>Gets a list of all known storage devices on Linux</summary>
-        /// <returns>List of devices</returns>
-        internal static DeviceInfo[] GetList()
+        DeviceInfo[] devices = new DeviceInfo[sysdevs.Length];
+        bool         hasUdev;
+
+        IntPtr udev = IntPtr.Zero;
+
+        try
         {
-            string[] sysdevs = Directory.GetFileSystemEntries(PATH_SYS_DEVBLOCK, "*", SearchOption.TopDirectoryOnly);
-
-            DeviceInfo[] devices = new DeviceInfo[sysdevs.Length];
-            bool         hasUdev;
-
-            IntPtr udev = IntPtr.Zero;
-
-            try
-            {
-                udev    = Extern.udev_new();
-                hasUdev = udev != IntPtr.Zero;
-            }
-            catch
-            {
-                hasUdev = false;
-            }
-
-            for(int i = 0; i < sysdevs.Length; i++)
-            {
-                devices[i] = new DeviceInfo
-                {
-                    Path = "/dev/" + Path.GetFileName(sysdevs[i])
-                };
-
-                if(hasUdev)
-                {
-                    IntPtr udevDev =
-                        Extern.udev_device_new_from_subsystem_sysname(udev, "block", Path.GetFileName(sysdevs[i]));
-
-                    devices[i].Vendor = Extern.udev_device_get_property_value(udevDev, "ID_VENDOR");
-                    devices[i].Model  = Extern.udev_device_get_property_value(udevDev, "ID_MODEL");
-
-                    if(!string.IsNullOrEmpty(devices[i].Model))
-                        devices[i].Model = devices[i].Model.Replace('_', ' ');
-
-                    devices[i].Serial = Extern.udev_device_get_property_value(udevDev, "ID_SCSI_SERIAL");
-
-                    if(string.IsNullOrEmpty(devices[i].Serial))
-                        devices[i].Serial = Extern.udev_device_get_property_value(udevDev, "ID_SERIAL_SHORT");
-
-                    devices[i].Bus = Extern.udev_device_get_property_value(udevDev, "ID_BUS");
-                }
-
-                StreamReader sr;
-
-                if(File.Exists(Path.Combine(sysdevs[i], "device/vendor")) &&
-                   string.IsNullOrEmpty(devices[i].Vendor))
-                {
-                    sr                = new StreamReader(Path.Combine(sysdevs[i], "device/vendor"), Encoding.ASCII);
-                    devices[i].Vendor = sr.ReadLine()?.Trim();
-                }
-                else if(devices[i].Path.StartsWith("/dev/loop", StringComparison.CurrentCulture))
-                    devices[i].Vendor = "Linux";
-
-                if(File.Exists(Path.Combine(sysdevs[i], "device/model")) &&
-                   (string.IsNullOrEmpty(devices[i].Model) || devices[i].Bus == "ata"))
-                {
-                    sr               = new StreamReader(Path.Combine(sysdevs[i], "device/model"), Encoding.ASCII);
-                    devices[i].Model = sr.ReadLine()?.Trim();
-                }
-                else if(devices[i].Path.StartsWith("/dev/loop", StringComparison.CurrentCulture))
-                    devices[i].Model = "Linux";
-
-                if(File.Exists(Path.Combine(sysdevs[i], "device/serial")) &&
-                   string.IsNullOrEmpty(devices[i].Serial))
-                {
-                    sr                = new StreamReader(Path.Combine(sysdevs[i], "device/serial"), Encoding.ASCII);
-                    devices[i].Serial = sr.ReadLine()?.Trim();
-                }
-
-                if(string.IsNullOrEmpty(devices[i].Vendor) ||
-                   devices[i].Vendor == "ATA")
-                    if(devices[i].Model != null)
-                    {
-                        string[] pieces = devices[i].Model.Split(' ');
-
-                        if(pieces.Length > 1)
-                        {
-                            devices[i].Vendor = pieces[0];
-                            devices[i].Model  = devices[i].Model.Substring(pieces[0].Length + 1);
-                        }
-                    }
-
-                // TODO: Get better device type from sysfs paths
-                if(string.IsNullOrEmpty(devices[i].Bus))
-                {
-                    if(devices[i].Path.StartsWith("/dev/loop", StringComparison.CurrentCulture))
-                        devices[i].Bus = "loop";
-                    else if(devices[i].Path.StartsWith("/dev/nvme", StringComparison.CurrentCulture))
-                        devices[i].Bus = "NVMe";
-                    else if(devices[i].Path.StartsWith("/dev/mmc", StringComparison.CurrentCulture))
-                        devices[i].Bus = "MMC/SD";
-                }
-                else
-                    devices[i].Bus = devices[i].Bus.ToUpper();
-
-                switch(devices[i].Bus)
-                {
-                    case "ATA":
-                    case "ATAPI":
-                    case "SCSI":
-                    case "USB":
-                    case "PCMCIA":
-                    case "FireWire":
-                    case "MMC/SD":
-                        devices[i].Supported = true;
-
-                        break;
-                }
-            }
-
-            return devices;
+            udev    = Extern.udev_new();
+            hasUdev = udev != IntPtr.Zero;
         }
+        catch
+        {
+            hasUdev = false;
+        }
+
+        for(int i = 0; i < sysdevs.Length; i++)
+        {
+            devices[i] = new DeviceInfo
+            {
+                Path = "/dev/" + Path.GetFileName(sysdevs[i])
+            };
+
+            if(hasUdev)
+            {
+                IntPtr udevDev =
+                    Extern.udev_device_new_from_subsystem_sysname(udev, "block", Path.GetFileName(sysdevs[i]));
+
+                devices[i].Vendor = Extern.udev_device_get_property_value(udevDev, "ID_VENDOR");
+                devices[i].Model  = Extern.udev_device_get_property_value(udevDev, "ID_MODEL");
+
+                if(!string.IsNullOrEmpty(devices[i].Model))
+                    devices[i].Model = devices[i].Model.Replace('_', ' ');
+
+                devices[i].Serial = Extern.udev_device_get_property_value(udevDev, "ID_SCSI_SERIAL");
+
+                if(string.IsNullOrEmpty(devices[i].Serial))
+                    devices[i].Serial = Extern.udev_device_get_property_value(udevDev, "ID_SERIAL_SHORT");
+
+                devices[i].Bus = Extern.udev_device_get_property_value(udevDev, "ID_BUS");
+            }
+
+            StreamReader sr;
+
+            if(File.Exists(Path.Combine(sysdevs[i], "device/vendor")) &&
+               string.IsNullOrEmpty(devices[i].Vendor))
+            {
+                sr                = new StreamReader(Path.Combine(sysdevs[i], "device/vendor"), Encoding.ASCII);
+                devices[i].Vendor = sr.ReadLine()?.Trim();
+            }
+            else if(devices[i].Path.StartsWith("/dev/loop", StringComparison.CurrentCulture))
+                devices[i].Vendor = "Linux";
+
+            if(File.Exists(Path.Combine(sysdevs[i], "device/model")) &&
+               (string.IsNullOrEmpty(devices[i].Model) || devices[i].Bus == "ata"))
+            {
+                sr               = new StreamReader(Path.Combine(sysdevs[i], "device/model"), Encoding.ASCII);
+                devices[i].Model = sr.ReadLine()?.Trim();
+            }
+            else if(devices[i].Path.StartsWith("/dev/loop", StringComparison.CurrentCulture))
+                devices[i].Model = "Linux";
+
+            if(File.Exists(Path.Combine(sysdevs[i], "device/serial")) &&
+               string.IsNullOrEmpty(devices[i].Serial))
+            {
+                sr                = new StreamReader(Path.Combine(sysdevs[i], "device/serial"), Encoding.ASCII);
+                devices[i].Serial = sr.ReadLine()?.Trim();
+            }
+
+            if(string.IsNullOrEmpty(devices[i].Vendor) ||
+               devices[i].Vendor == "ATA")
+                if(devices[i].Model != null)
+                {
+                    string[] pieces = devices[i].Model.Split(' ');
+
+                    if(pieces.Length > 1)
+                    {
+                        devices[i].Vendor = pieces[0];
+                        devices[i].Model  = devices[i].Model.Substring(pieces[0].Length + 1);
+                    }
+                }
+
+            // TODO: Get better device type from sysfs paths
+            if(string.IsNullOrEmpty(devices[i].Bus))
+            {
+                if(devices[i].Path.StartsWith("/dev/loop", StringComparison.CurrentCulture))
+                    devices[i].Bus = "loop";
+                else if(devices[i].Path.StartsWith("/dev/nvme", StringComparison.CurrentCulture))
+                    devices[i].Bus = "NVMe";
+                else if(devices[i].Path.StartsWith("/dev/mmc", StringComparison.CurrentCulture))
+                    devices[i].Bus = "MMC/SD";
+            }
+            else
+                devices[i].Bus = devices[i].Bus.ToUpper();
+
+            switch(devices[i].Bus)
+            {
+                case "ATA":
+                case "ATAPI":
+                case "SCSI":
+                case "USB":
+                case "PCMCIA":
+                case "FireWire":
+                case "MMC/SD":
+                    devices[i].Supported = true;
+
+                    break;
+            }
+        }
+
+        return devices;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Linux/Structs.cs b/Aaru.Devices/Linux/Structs.cs
index 0087018b1..8a533e088 100644
--- a/Aaru.Devices/Linux/Structs.cs
+++ b/Aaru.Devices/Linux/Structs.cs
@@ -35,73 +35,72 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.Devices.Linux
-{
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct SgIoHdrT
-    {
-        /// <summary>Always 'S' for SG v3</summary>
-        public int interface_id;                   /* [i] 'S' (required) */
-        public ScsiIoctlDirection dxfer_direction; /* [i] */
-        public byte               cmd_len;         /* [i] */
-        public byte               mx_sb_len;       /* [i] */
-        public ushort             iovec_count;     /* [i] */
-        public uint               dxfer_len;       /* [i] */
-        public IntPtr             dxferp;          /* [i], [*io] */
-        public IntPtr             cmdp;            /* [i], [*i]  */
-        public IntPtr             sbp;             /* [i], [*o]  */
-        public uint               timeout;         /* [i] unit: millisecs */
-        public uint               flags;           /* [i] */
-        public int                pack_id;         /* [i->o] */
-        public IntPtr             usr_ptr;         /* [i->o] */
-        public byte               status;          /* [o] */
-        public byte               masked_status;   /* [o] */
-        public byte               msg_status;      /* [o] */
-        public byte               sb_len_wr;       /* [o] */
-        public ushort             host_status;     /* [o] */
-        public ushort             driver_status;   /* [o] */
-        public int                resid;           /* [o] */
-        public uint               duration;        /* [o] */
-        public SgInfo             info;            /* [o] */
-    }
+namespace Aaru.Devices.Linux;
 
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct MmcIocCmd
-    {
-        /// <summary>Implies direction of data. true = write, false = read</summary>
-        public bool write_flag;
-        /// <summary>Application-specific command. true = precede with CMD55</summary>
-        public bool is_ascmd;
-        public uint opcode;
-        public uint arg;
-        /// <summary>CMD response</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-        public uint[] response;
-        public MmcFlags flags;
-        public uint     blksz;
-        public uint     blocks;
-        /// <summary>
-        ///     Sleep at least <see cref="postsleep_min_us" /> useconds, and at most <see cref="postsleep_max_us" /> useconds
-        ///     *after* issuing command.Needed for some read commands for which cards have no other way of indicating they're ready
-        ///     for the next command (i.e. there is no equivalent of a "busy" indicator for read operations).
-        /// </summary>
-        public uint postsleep_min_us;
-        /// <summary>
-        ///     Sleep at least <see cref="postsleep_min_us" /> useconds, and at most <see cref="postsleep_max_us" /> useconds
-        ///     *after* issuing command.Needed for some read commands for which cards have no other way of indicating they're ready
-        ///     for the next command (i.e. there is no equivalent of a "busy" indicator for read operations).
-        /// </summary>
-        public uint postsleep_max_us;
-        /// <summary>Override driver-computed timeouts.</summary>
-        public uint data_timeout_ns;
-        /// <summary>Override driver-computed timeouts.</summary>
-        public uint cmd_timeout_ms;
-        /// <summary>
-        ///     For 64-bit machines <see cref="data_ptr" /> , wants to be 8-byte aligned.Make sure this struct is the same
-        ///     size when built for 32-bit.
-        /// </summary>
-        public uint __pad;
-        /// <summary>DAT buffer</summary>
-        public ulong data_ptr;
-    }
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct SgIoHdrT
+{
+    /// <summary>Always 'S' for SG v3</summary>
+    public int interface_id;                   /* [i] 'S' (required) */
+    public ScsiIoctlDirection dxfer_direction; /* [i] */
+    public byte               cmd_len;         /* [i] */
+    public byte               mx_sb_len;       /* [i] */
+    public ushort             iovec_count;     /* [i] */
+    public uint               dxfer_len;       /* [i] */
+    public IntPtr             dxferp;          /* [i], [*io] */
+    public IntPtr             cmdp;            /* [i], [*i]  */
+    public IntPtr             sbp;             /* [i], [*o]  */
+    public uint               timeout;         /* [i] unit: millisecs */
+    public uint               flags;           /* [i] */
+    public int                pack_id;         /* [i->o] */
+    public IntPtr             usr_ptr;         /* [i->o] */
+    public byte               status;          /* [o] */
+    public byte               masked_status;   /* [o] */
+    public byte               msg_status;      /* [o] */
+    public byte               sb_len_wr;       /* [o] */
+    public ushort             host_status;     /* [o] */
+    public ushort             driver_status;   /* [o] */
+    public int                resid;           /* [o] */
+    public uint               duration;        /* [o] */
+    public SgInfo             info;            /* [o] */
+}
+
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct MmcIocCmd
+{
+    /// <summary>Implies direction of data. true = write, false = read</summary>
+    public bool write_flag;
+    /// <summary>Application-specific command. true = precede with CMD55</summary>
+    public bool is_ascmd;
+    public uint opcode;
+    public uint arg;
+    /// <summary>CMD response</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+    public uint[] response;
+    public MmcFlags flags;
+    public uint     blksz;
+    public uint     blocks;
+    /// <summary>
+    ///     Sleep at least <see cref="postsleep_min_us" /> useconds, and at most <see cref="postsleep_max_us" /> useconds
+    ///     *after* issuing command.Needed for some read commands for which cards have no other way of indicating they're ready
+    ///     for the next command (i.e. there is no equivalent of a "busy" indicator for read operations).
+    /// </summary>
+    public uint postsleep_min_us;
+    /// <summary>
+    ///     Sleep at least <see cref="postsleep_min_us" /> useconds, and at most <see cref="postsleep_max_us" /> useconds
+    ///     *after* issuing command.Needed for some read commands for which cards have no other way of indicating they're ready
+    ///     for the next command (i.e. there is no equivalent of a "busy" indicator for read operations).
+    /// </summary>
+    public uint postsleep_max_us;
+    /// <summary>Override driver-computed timeouts.</summary>
+    public uint data_timeout_ns;
+    /// <summary>Override driver-computed timeouts.</summary>
+    public uint cmd_timeout_ms;
+    /// <summary>
+    ///     For 64-bit machines <see cref="data_ptr" /> , wants to be 8-byte aligned.Make sure this struct is the same
+    ///     size when built for 32-bit.
+    /// </summary>
+    public uint __pad;
+    /// <summary>DAT buffer</summary>
+    public ulong data_ptr;
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Remote/Consts.cs b/Aaru.Devices/Remote/Consts.cs
index 35ff4d463..a1f43bac4 100644
--- a/Aaru.Devices/Remote/Consts.cs
+++ b/Aaru.Devices/Remote/Consts.cs
@@ -30,18 +30,17 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Devices.Remote
+namespace Aaru.Devices.Remote;
+
+/// <summary>AaruRemote protocol constants</summary>
+public class Consts
 {
-    /// <summary>AaruRemote protocol constants</summary>
-    public class Consts
-    {
-        /// <summary>Primary unique packet identifier</summary>
-        public const uint REMOTE_ID = 0x52434944; // "DICR"
-        /// <summary>Secondary unique packet identifier</summary>
-        public const uint PACKET_ID = 0x544B4350; // "PCKT"
-        /// <summary>Default packet version</summary>
-        public const int PACKET_VERSION = 1;
-        /// <summary>Maximum supported protocol version</summary>
-        public const int MAX_PROTOCOL = 2;
-    }
+    /// <summary>Primary unique packet identifier</summary>
+    public const uint REMOTE_ID = 0x52434944; // "DICR"
+    /// <summary>Secondary unique packet identifier</summary>
+    public const uint PACKET_ID = 0x544B4350; // "PCKT"
+    /// <summary>Default packet version</summary>
+    public const int PACKET_VERSION = 1;
+    /// <summary>Maximum supported protocol version</summary>
+    public const int MAX_PROTOCOL = 2;
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Remote/Enums.cs b/Aaru.Devices/Remote/Enums.cs
index 9077d91a9..26442ce56 100644
--- a/Aaru.Devices/Remote/Enums.cs
+++ b/Aaru.Devices/Remote/Enums.cs
@@ -30,44 +30,43 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Devices.Remote
-{
-    /// <summary>Packet type enumeration</summary>
-    public enum AaruPacketType : sbyte
-    {
-        #pragma warning disable 1591
-        Nop                       = -1, Hello                   = 1, CommandListDevices        = 2,
-        ResponseListDevices       = 3, CommandOpen              = 4, CommandScsi               = 5,
-        ResponseScsi              = 6, CommandAtaChs            = 7, ResponseAtaChs            = 8,
-        CommandAtaLba28           = 9, ResponseAtaLba28         = 10, CommandAtaLba48          = 11,
-        ResponseAtaLba48          = 12, CommandSdhci            = 13, ResponseSdhci            = 14,
-        CommandGetType            = 15, ResponseGetType         = 16, CommandGetSdhciRegisters = 17,
-        ResponseGetSdhciRegisters = 18, CommandGetUsbData       = 19, ResponseGetUsbData       = 20,
-        CommandGetFireWireData    = 21, ResponseGetFireWireData = 22, CommandGetPcmciaData     = 23,
-        ResponseGetPcmciaData     = 24, CommandCloseDevice      = 25, CommandAmIRoot           = 26,
-        ResponseAmIRoot           = 27, MultiCommandSdhci       = 28, ResponseMultiSdhci       = 29,
-        CommandReOpenDevice       = 30, CommandOsRead           = 31, ResponseOsRead           = 32
-        #pragma warning restore 1591
-    }
+namespace Aaru.Devices.Remote;
 
-    /// <summary>Reasons for non-data request or response</summary>
-    public enum AaruNopReason : byte
-    {
-        /// <summary>Request or response has arrived unexpectedly</summary>
-        OutOfOrder = 0,
-        /// <summary>Packet or version of packet is not implemented</summary>
-        NotImplemented = 1,
-        /// <summary>Unknown or non-recognized packet</summary>
-        NotRecognized = 2,
-        /// <summary>Error trying to get list of devices</summary>
-        ErrorListDevices = 3,
-        /// <summary>Device opened correctly</summary>
-        OpenOk = 4,
-        /// <summary>An error occurred opening the device</summary>
-        OpenError = 5,
-        /// <summary>Device re-opened correctly</summary>
-        ReOpenOk = 6,
-        /// <summary>An error occurred closing the device</summary>
-        CloseError = 7
-    }
+/// <summary>Packet type enumeration</summary>
+public enum AaruPacketType : sbyte
+{
+    #pragma warning disable 1591
+    Nop                       = -1, Hello                   = 1, CommandListDevices        = 2,
+    ResponseListDevices       = 3, CommandOpen              = 4, CommandScsi               = 5,
+    ResponseScsi              = 6, CommandAtaChs            = 7, ResponseAtaChs            = 8,
+    CommandAtaLba28           = 9, ResponseAtaLba28         = 10, CommandAtaLba48          = 11,
+    ResponseAtaLba48          = 12, CommandSdhci            = 13, ResponseSdhci            = 14,
+    CommandGetType            = 15, ResponseGetType         = 16, CommandGetSdhciRegisters = 17,
+    ResponseGetSdhciRegisters = 18, CommandGetUsbData       = 19, ResponseGetUsbData       = 20,
+    CommandGetFireWireData    = 21, ResponseGetFireWireData = 22, CommandGetPcmciaData     = 23,
+    ResponseGetPcmciaData     = 24, CommandCloseDevice      = 25, CommandAmIRoot           = 26,
+    ResponseAmIRoot           = 27, MultiCommandSdhci       = 28, ResponseMultiSdhci       = 29,
+    CommandReOpenDevice       = 30, CommandOsRead           = 31, ResponseOsRead           = 32
+    #pragma warning restore 1591
+}
+
+/// <summary>Reasons for non-data request or response</summary>
+public enum AaruNopReason : byte
+{
+    /// <summary>Request or response has arrived unexpectedly</summary>
+    OutOfOrder = 0,
+    /// <summary>Packet or version of packet is not implemented</summary>
+    NotImplemented = 1,
+    /// <summary>Unknown or non-recognized packet</summary>
+    NotRecognized = 2,
+    /// <summary>Error trying to get list of devices</summary>
+    ErrorListDevices = 3,
+    /// <summary>Device opened correctly</summary>
+    OpenOk = 4,
+    /// <summary>An error occurred opening the device</summary>
+    OpenError = 5,
+    /// <summary>Device re-opened correctly</summary>
+    ReOpenOk = 6,
+    /// <summary>An error occurred closing the device</summary>
+    CloseError = 7
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Remote/Remote.cs b/Aaru.Devices/Remote/Remote.cs
index ddfcecbc0..6a2ba86a3 100644
--- a/Aaru.Devices/Remote/Remote.cs
+++ b/Aaru.Devices/Remote/Remote.cs
@@ -46,337 +46,79 @@ using Version = Aaru.CommonTypes.Interop.Version;
 
 // ReSharper disable MemberCanBeInternal
 
-namespace Aaru.Devices.Remote
+namespace Aaru.Devices.Remote;
+
+/// <inheritdoc />
+/// <summary>Handles communication with a remote device that's connected using the AaruRemote protocol</summary>
+public class Remote : IDisposable
 {
-    /// <inheritdoc />
-    /// <summary>Handles communication with a remote device that's connected using the AaruRemote protocol</summary>
-    public class Remote : IDisposable
+    readonly string _host;
+    readonly Socket _socket;
+
+    /// <summary>Connects using TCP/IP to the specified remote</summary>
+    /// <param name="uri">URI of the remote</param>
+    /// <exception cref="ArgumentException">Unsupported or invalid remote protocol.</exception>
+    /// <exception cref="SocketException">Host not found.</exception>
+    /// <exception cref="IOException">Network error.</exception>
+    public Remote(Uri uri)
     {
-        readonly string _host;
-        readonly Socket _socket;
+        if(uri.Scheme != "aaru" &&
+           uri.Scheme != "dic")
+            throw new ArgumentException("Invalid remote protocol.", nameof(uri.Scheme));
 
-        /// <summary>Connects using TCP/IP to the specified remote</summary>
-        /// <param name="uri">URI of the remote</param>
-        /// <exception cref="ArgumentException">Unsupported or invalid remote protocol.</exception>
-        /// <exception cref="SocketException">Host not found.</exception>
-        /// <exception cref="IOException">Network error.</exception>
-        public Remote(Uri uri)
+        _host = uri.DnsSafeHost;
+
+        if(!IPAddress.TryParse(_host, out IPAddress ipAddress))
         {
-            if(uri.Scheme != "aaru" &&
-               uri.Scheme != "dic")
-                throw new ArgumentException("Invalid remote protocol.", nameof(uri.Scheme));
+            IPHostEntry ipHostEntry = Dns.GetHostEntry(_host);
 
-            _host = uri.DnsSafeHost;
+            ipAddress = ipHostEntry.AddressList.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork);
+        }
 
-            if(!IPAddress.TryParse(_host, out IPAddress ipAddress))
-            {
-                IPHostEntry ipHostEntry = Dns.GetHostEntry(_host);
+        if(ipAddress is null)
+        {
+            AaruConsole.ErrorWriteLine("Host not found");
 
-                ipAddress = ipHostEntry.AddressList.FirstOrDefault(a => a.AddressFamily == AddressFamily.InterNetwork);
-            }
+            throw new SocketException(11001);
+        }
 
-            if(ipAddress is null)
-            {
-                AaruConsole.ErrorWriteLine("Host not found");
+        var ipEndPoint = new IPEndPoint(ipAddress, uri.Port > 0 ? uri.Port : 6666);
+        _socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
 
-                throw new SocketException(11001);
-            }
+        _socket.Connect(ipEndPoint);
 
-            var ipEndPoint = new IPEndPoint(ipAddress, uri.Port > 0 ? uri.Port : 6666);
-            _socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+        AaruConsole.WriteLine("Connected to {0}", uri.Host);
 
-            _socket.Connect(ipEndPoint);
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
 
-            AaruConsole.WriteLine("Connected to {0}", uri.Host);
+        int len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
 
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            int len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                throw new IOException();
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                throw new ArgumentException();
-            }
-
-            byte[] buf;
-
-            if(hdr.packetType != AaruPacketType.Hello)
-            {
-                if(hdr.packetType != AaruPacketType.Nop)
-                {
-                    AaruConsole.ErrorWriteLine("Expected Hello Packet, got packet type {0}...", hdr.packetType);
-
-                    throw new ArgumentException();
-                }
-
-                buf = new byte[hdr.len];
-                len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-                if(len < buf.Length)
-                {
-                    AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                    throw new IOException();
-                }
-
-                AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
-
-                AaruConsole.ErrorWriteLine($"{nop.reason}");
-
-                throw new ArgumentException();
-            }
-
-            if(hdr.version != Consts.PACKET_VERSION)
-            {
-                AaruConsole.ErrorWriteLine("Unrecognized packet version...");
-
-                throw new ArgumentException();
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                throw new IOException();
-            }
-
-            AaruPacketHello serverHello = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHello>(buf);
-
-            ServerApplication            = serverHello.application;
-            ServerVersion                = serverHello.version;
-            ServerOperatingSystem        = serverHello.sysname;
-            ServerOperatingSystemVersion = serverHello.release;
-            ServerArchitecture           = serverHello.machine;
-            ServerProtocolVersion        = serverHello.maxProtocol;
-
-            var clientHello = new AaruPacketHello
-            {
-                application = "Aaru",
-                version     = Version.GetVersion(),
-                maxProtocol = Consts.MAX_PROTOCOL,
-                sysname     = DetectOS.GetPlatformName(DetectOS.GetRealPlatformID(), DetectOS.GetVersion()),
-                release     = DetectOS.GetVersion(),
-                machine     = RuntimeInformation.ProcessArchitecture.ToString(),
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketHello>(),
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.Hello
-                }
-            };
-
-            buf = Marshal.StructureToByteArrayLittleEndian(clientHello);
-
-            len = _socket.Send(buf, SocketFlags.None);
-
-            if(len >= buf.Length)
-                return;
-
-            AaruConsole.ErrorWriteLine("Could not write to the network...");
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
 
             throw new IOException();
         }
 
-        /// <summary>Remote server application</summary>
-        public string ServerApplication { get; }
-        /// <summary>Remote server application version</summary>
-        public string ServerVersion { get; }
-        /// <summary>Remote server operating system</summary>
-        public string ServerOperatingSystem { get; }
-        /// <summary>Remote server operating system version</summary>
-        public string ServerOperatingSystemVersion { get; }
-        /// <summary>Remote server architecture</summary>
-        public string ServerArchitecture { get; }
-        /// <summary>Remote server protocol version</summary>
-        public int ServerProtocolVersion { get; }
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
 
-        /// <summary>Is remote running with administrative (aka root) privileges?</summary>
-        public bool IsRoot
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
         {
-            get
-            {
-                var cmdPkt = new AaruPacketCmdAmIRoot
-                {
-                    hdr = new AaruPacketHeader
-                    {
-                        remote_id  = Consts.REMOTE_ID,
-                        packet_id  = Consts.PACKET_ID,
-                        len        = (uint)Marshal.SizeOf<AaruPacketCmdAmIRoot>(),
-                        version    = Consts.PACKET_VERSION,
-                        packetType = AaruPacketType.CommandAmIRoot
-                    }
-                };
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
 
-                byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-
-                int len = _socket.Send(buf, SocketFlags.None);
-
-                if(len != buf.Length)
-                {
-                    AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                    return false;
-                }
-
-                byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-                len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-                if(len < hdrBuf.Length)
-                {
-                    AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                    return false;
-                }
-
-                AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-                if(hdr.remote_id != Consts.REMOTE_ID ||
-                   hdr.packet_id != Consts.PACKET_ID)
-                {
-                    AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                    return false;
-                }
-
-                if(hdr.packetType != AaruPacketType.ResponseAmIRoot)
-                {
-                    AaruConsole.ErrorWriteLine("Expected Am I Root? Response Packet, got packet type {0}...",
-                                               hdr.packetType);
-
-                    return false;
-                }
-
-                buf = new byte[hdr.len];
-                len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-                if(len < buf.Length)
-                {
-                    AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                    return false;
-                }
-
-                AaruPacketResAmIRoot res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAmIRoot>(buf);
-
-                return res.am_i_root != 0;
-            }
+            throw new ArgumentException();
         }
 
-        /// <inheritdoc />
-        public void Dispose() => Disconnect();
+        byte[] buf;
 
-        /// <summary>Disconnects from remote</summary>
-        public void Disconnect()
+        if(hdr.packetType != AaruPacketType.Hello)
         {
-            try
+            if(hdr.packetType != AaruPacketType.Nop)
             {
-                _socket.Shutdown(SocketShutdown.Both);
-                _socket.Close();
-            }
-            catch(ObjectDisposedException)
-            {
-                // Ignore if already disposed
-            }
-        }
+                AaruConsole.ErrorWriteLine("Expected Hello Packet, got packet type {0}...", hdr.packetType);
 
-        /// <summary>Lists devices attached to remote</summary>
-        /// <returns>List of devices</returns>
-        public DeviceInfo[] ListDevices()
-        {
-            var cmdPkt = new AaruPacketCommandListDevices
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketCommandListDevices>(),
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandListDevices
-                }
-            };
-
-            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return Array.Empty<DeviceInfo>();
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return Array.Empty<DeviceInfo>();
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return Array.Empty<DeviceInfo>();
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseListDevices)
-            {
-                if(hdr.packetType != AaruPacketType.Nop)
-                {
-                    AaruConsole.ErrorWriteLine("Expected List Devices Response Packet, got packet type {0}...",
-                                               hdr.packetType);
-
-                    return Array.Empty<DeviceInfo>();
-                }
-
-                buf = new byte[hdr.len];
-                len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-                if(len < buf.Length)
-                {
-                    AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                    return Array.Empty<DeviceInfo>();
-                }
-
-                AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
-
-                AaruConsole.ErrorWriteLine($"{nop.reason}");
-
-                return Array.Empty<DeviceInfo>();
-            }
-
-            if(hdr.version != Consts.PACKET_VERSION)
-            {
-                AaruConsole.ErrorWriteLine("Unrecognized packet version...");
-
-                return Array.Empty<DeviceInfo>();
+                throw new ArgumentException();
             }
 
             buf = new byte[hdr.len];
@@ -386,50 +128,100 @@ namespace Aaru.Devices.Remote
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
 
-                return Array.Empty<DeviceInfo>();
+                throw new IOException();
             }
 
-            AaruPacketResponseListDevices response =
-                Marshal.ByteArrayToStructureLittleEndian<AaruPacketResponseListDevices>(buf);
+            AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
 
-            List<DeviceInfo> devices    = new List<DeviceInfo>();
-            int              offset     = Marshal.SizeOf<AaruPacketResponseListDevices>();
-            int              devInfoLen = Marshal.SizeOf<DeviceInfo>();
+            AaruConsole.ErrorWriteLine($"{nop.reason}");
 
-            for(ushort i = 0; i < response.devices; i++)
-            {
-                DeviceInfo dev = Marshal.ByteArrayToStructureLittleEndian<DeviceInfo>(buf, offset, devInfoLen);
-                dev.Path = dev.Path[0] == '/' ? $"aaru://{_host}{dev.Path}" : $"aaru://{_host}/{dev.Path}";
-                devices.Add(dev);
-                offset += devInfoLen;
-            }
-
-            return devices.ToArray();
+            throw new ArgumentException();
         }
 
-        /// <summary>Opens the specified device path on the remote</summary>
-        /// <param name="devicePath">Device path</param>
-        /// <param name="lastError">Returned error</param>
-        /// <returns><c>true</c> if opened correctly, <c>false</c>otherwise</returns>
-        /// <exception cref="NotImplementedException">
-        ///     Support for the specified device has not yet been implemented in the remote
-        ///     application.
-        /// </exception>
-        public bool Open(string devicePath, out int lastError)
+        if(hdr.version != Consts.PACKET_VERSION)
         {
-            lastError = 0;
+            AaruConsole.ErrorWriteLine("Unrecognized packet version...");
 
-            var cmdPkt = new AaruPacketCommandOpenDevice
+            throw new ArgumentException();
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            throw new IOException();
+        }
+
+        AaruPacketHello serverHello = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHello>(buf);
+
+        ServerApplication            = serverHello.application;
+        ServerVersion                = serverHello.version;
+        ServerOperatingSystem        = serverHello.sysname;
+        ServerOperatingSystemVersion = serverHello.release;
+        ServerArchitecture           = serverHello.machine;
+        ServerProtocolVersion        = serverHello.maxProtocol;
+
+        var clientHello = new AaruPacketHello
+        {
+            application = "Aaru",
+            version     = Version.GetVersion(),
+            maxProtocol = Consts.MAX_PROTOCOL,
+            sysname     = DetectOS.GetPlatformName(DetectOS.GetRealPlatformID(), DetectOS.GetVersion()),
+            release     = DetectOS.GetVersion(),
+            machine     = RuntimeInformation.ProcessArchitecture.ToString(),
+            hdr = new AaruPacketHeader
+            {
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketHello>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.Hello
+            }
+        };
+
+        buf = Marshal.StructureToByteArrayLittleEndian(clientHello);
+
+        len = _socket.Send(buf, SocketFlags.None);
+
+        if(len >= buf.Length)
+            return;
+
+        AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+        throw new IOException();
+    }
+
+    /// <summary>Remote server application</summary>
+    public string ServerApplication { get; }
+    /// <summary>Remote server application version</summary>
+    public string ServerVersion { get; }
+    /// <summary>Remote server operating system</summary>
+    public string ServerOperatingSystem { get; }
+    /// <summary>Remote server operating system version</summary>
+    public string ServerOperatingSystemVersion { get; }
+    /// <summary>Remote server architecture</summary>
+    public string ServerArchitecture { get; }
+    /// <summary>Remote server protocol version</summary>
+    public int ServerProtocolVersion { get; }
+
+    /// <summary>Is remote running with administrative (aka root) privileges?</summary>
+    public bool IsRoot
+    {
+        get
+        {
+            var cmdPkt = new AaruPacketCmdAmIRoot
             {
                 hdr = new AaruPacketHeader
                 {
                     remote_id  = Consts.REMOTE_ID,
                     packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketCommandOpenDevice>(),
+                    len        = (uint)Marshal.SizeOf<AaruPacketCmdAmIRoot>(),
                     version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandOpen
-                },
-                device_path = devicePath
+                    packetType = AaruPacketType.CommandAmIRoot
+                }
             };
 
             byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
@@ -439,7 +231,6 @@ namespace Aaru.Devices.Remote
             if(len != buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not write to the network...");
-                lastError = -1;
 
                 return false;
             }
@@ -451,7 +242,6 @@ namespace Aaru.Devices.Remote
             if(len < hdrBuf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
-                lastError = -1;
 
                 return false;
             }
@@ -462,19 +252,107 @@ namespace Aaru.Devices.Remote
                hdr.packet_id != Consts.PACKET_ID)
             {
                 AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-                lastError = -1;
 
                 return false;
             }
 
+            if(hdr.packetType != AaruPacketType.ResponseAmIRoot)
+            {
+                AaruConsole.ErrorWriteLine("Expected Am I Root? Response Packet, got packet type {0}...",
+                                           hdr.packetType);
+
+                return false;
+            }
+
+            buf = new byte[hdr.len];
+            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+            if(len < buf.Length)
+            {
+                AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+                return false;
+            }
+
+            AaruPacketResAmIRoot res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAmIRoot>(buf);
+
+            return res.am_i_root != 0;
+        }
+    }
+
+    /// <inheritdoc />
+    public void Dispose() => Disconnect();
+
+    /// <summary>Disconnects from remote</summary>
+    public void Disconnect()
+    {
+        try
+        {
+            _socket.Shutdown(SocketShutdown.Both);
+            _socket.Close();
+        }
+        catch(ObjectDisposedException)
+        {
+            // Ignore if already disposed
+        }
+    }
+
+    /// <summary>Lists devices attached to remote</summary>
+    /// <returns>List of devices</returns>
+    public DeviceInfo[] ListDevices()
+    {
+        var cmdPkt = new AaruPacketCommandListDevices
+        {
+            hdr = new AaruPacketHeader
+            {
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketCommandListDevices>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandListDevices
+            }
+        };
+
+        byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return Array.Empty<DeviceInfo>();
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return Array.Empty<DeviceInfo>();
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return Array.Empty<DeviceInfo>();
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseListDevices)
+        {
             if(hdr.packetType != AaruPacketType.Nop)
             {
                 AaruConsole.ErrorWriteLine("Expected List Devices Response Packet, got packet type {0}...",
                                            hdr.packetType);
 
-                lastError = -1;
-
-                return false;
+                return Array.Empty<DeviceInfo>();
             }
 
             buf = new byte[hdr.len];
@@ -483,1481 +361,1602 @@ namespace Aaru.Devices.Remote
             if(len < buf.Length)
             {
                 AaruConsole.ErrorWriteLine("Could not read from the network...");
-                lastError = -1;
 
-                return false;
+                return Array.Empty<DeviceInfo>();
             }
 
             AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
 
-            switch(nop.reasonCode)
-            {
-                case AaruNopReason.OpenOk:         return true;
-                case AaruNopReason.NotImplemented: throw new NotImplementedException($"{nop.reason}");
-            }
-
             AaruConsole.ErrorWriteLine($"{nop.reason}");
-            lastError = nop.errno;
+
+            return Array.Empty<DeviceInfo>();
+        }
+
+        if(hdr.version != Consts.PACKET_VERSION)
+        {
+            AaruConsole.ErrorWriteLine("Unrecognized packet version...");
+
+            return Array.Empty<DeviceInfo>();
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return Array.Empty<DeviceInfo>();
+        }
+
+        AaruPacketResponseListDevices response =
+            Marshal.ByteArrayToStructureLittleEndian<AaruPacketResponseListDevices>(buf);
+
+        List<DeviceInfo> devices    = new List<DeviceInfo>();
+        int              offset     = Marshal.SizeOf<AaruPacketResponseListDevices>();
+        int              devInfoLen = Marshal.SizeOf<DeviceInfo>();
+
+        for(ushort i = 0; i < response.devices; i++)
+        {
+            DeviceInfo dev = Marshal.ByteArrayToStructureLittleEndian<DeviceInfo>(buf, offset, devInfoLen);
+            dev.Path = dev.Path[0] == '/' ? $"aaru://{_host}{dev.Path}" : $"aaru://{_host}/{dev.Path}";
+            devices.Add(dev);
+            offset += devInfoLen;
+        }
+
+        return devices.ToArray();
+    }
+
+    /// <summary>Opens the specified device path on the remote</summary>
+    /// <param name="devicePath">Device path</param>
+    /// <param name="lastError">Returned error</param>
+    /// <returns><c>true</c> if opened correctly, <c>false</c>otherwise</returns>
+    /// <exception cref="NotImplementedException">
+    ///     Support for the specified device has not yet been implemented in the remote
+    ///     application.
+    /// </exception>
+    public bool Open(string devicePath, out int lastError)
+    {
+        lastError = 0;
+
+        var cmdPkt = new AaruPacketCommandOpenDevice
+        {
+            hdr = new AaruPacketHeader
+            {
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketCommandOpenDevice>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandOpen
+            },
+            device_path = devicePath
+        };
+
+        byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+            lastError = -1;
 
             return false;
         }
 
-        /// <summary>Sends a SCSI command to the remote device</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="cdb">SCSI CDB</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="senseBuffer">Buffer with the SCSI sense</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="direction">SCSI command transfer direction</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense">
-        ///     <c>True</c> if SCSI command returned non-OK status and <paramref name="senseBuffer" /> contains
-        ///     SCSI sense
-        /// </param>
-        public int SendScsiCommand(byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
-                                   ScsiDirection direction, out double duration, out bool sense)
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
         {
-            senseBuffer = null;
-            duration    = 0;
-            sense       = true;
-
-            var cmdPkt = new AaruPacketCmdScsi
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandScsi
-                },
-                direction = (int)direction,
-                timeout   = timeout * 1000
-            };
-
-            if(cdb != null)
-                cmdPkt.cdb_len = (uint)cdb.Length;
-
-            if(buffer != null)
-                cmdPkt.buf_len = (uint)buffer.Length;
-
-            cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdScsi>() + cmdPkt.cdb_len + cmdPkt.buf_len);
-
-            byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-            byte[] buf    = new byte[cmdPkt.hdr.len];
-
-            Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdScsi>());
-
-            if(cdb != null)
-                Array.Copy(cdb, 0, buf, Marshal.SizeOf<AaruPacketCmdScsi>(), cmdPkt.cdb_len);
-
-            if(buffer != null)
-                Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdScsi>() + cmdPkt.cdb_len, cmdPkt.buf_len);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return -1;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return -1;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseScsi)
-            {
-                AaruConsole.ErrorWriteLine("Expected SCSI Response Packet, got packet type {0}...", hdr.packetType);
-
-                return -1;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketResScsi res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResScsi>(buf);
-
-            senseBuffer = new byte[res.sense_len];
-            Array.Copy(buf, Marshal.SizeOf<AaruPacketResScsi>(), senseBuffer, 0, res.sense_len);
-            buffer = new byte[res.buf_len];
-            Array.Copy(buf, Marshal.SizeOf<AaruPacketResScsi>() + res.sense_len, buffer, 0, res.buf_len);
-            duration = res.duration;
-            sense    = res.sense != 0;
-
-            return (int)res.error_no;
-        }
-
-        /// <summary>Sends an ATA/ATAPI command to the remote device using CHS addressing</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="registers">ATA registers.</param>
-        /// <param name="errorRegisters">Status/error registers.</param>
-        /// <param name="protocol">ATA Protocol.</param>
-        /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
-        /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="transferBlocks">
-        ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
-        ///     bytes.
-        /// </param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
-        public int SendAtaCommand(AtaRegistersChs registers, out AtaErrorRegistersChs errorRegisters,
-                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
-                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
-        {
-            duration       = 0;
-            sense          = true;
-            errorRegisters = new AtaErrorRegistersChs();
-
-            var cmdPkt = new AaruPacketCmdAtaChs
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandAtaChs
-                },
-                registers        = registers,
-                protocol         = (byte)protocol,
-                transferRegister = (byte)transferRegister,
-                transferBlocks   = transferBlocks,
-                timeout          = timeout * 1000
-            };
-
-            if(buffer != null)
-                cmdPkt.buf_len = (uint)buffer.Length;
-
-            cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdAtaChs>() + cmdPkt.buf_len);
-
-            byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-            byte[] buf    = new byte[cmdPkt.hdr.len];
-
-            Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdAtaChs>());
-
-            if(buffer != null)
-                Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdAtaChs>(), cmdPkt.buf_len);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return -1;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return -1;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseAtaChs)
-            {
-                AaruConsole.ErrorWriteLine("Expected ATA CHS Response Packet, got packet type {0}...", hdr.packetType);
-
-                return -1;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketResAtaChs res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaChs>(buf);
-
-            buffer = new byte[res.buf_len];
-            Array.Copy(buf, Marshal.SizeOf<AaruPacketResAtaChs>(), buffer, 0, res.buf_len);
-            duration       = res.duration;
-            sense          = res.sense != 0;
-            errorRegisters = res.registers;
-
-            return (int)res.error_no;
-        }
-
-        /// <summary>Sends an ATA/ATAPI command to the remote device using 28-bit LBA addressing</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="registers">ATA registers.</param>
-        /// <param name="errorRegisters">Status/error registers.</param>
-        /// <param name="protocol">ATA Protocol.</param>
-        /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
-        /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="transferBlocks">
-        ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
-        ///     bytes.
-        /// </param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
-        public int SendAtaCommand(AtaRegistersLba28 registers, out AtaErrorRegistersLba28 errorRegisters,
-                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
-                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
-        {
-            duration       = 0;
-            sense          = true;
-            errorRegisters = new AtaErrorRegistersLba28();
-
-            var cmdPkt = new AaruPacketCmdAtaLba28
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandAtaLba28
-                },
-                registers        = registers,
-                protocol         = (byte)protocol,
-                transferRegister = (byte)transferRegister,
-                transferBlocks   = transferBlocks,
-                timeout          = timeout * 1000
-            };
-
-            if(buffer != null)
-                cmdPkt.buf_len = (uint)buffer.Length;
-
-            cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdAtaLba28>() + cmdPkt.buf_len);
-
-            byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-            byte[] buf    = new byte[cmdPkt.hdr.len];
-
-            Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdAtaLba28>());
-
-            if(buffer != null)
-                Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdAtaLba28>(), cmdPkt.buf_len);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return -1;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return -1;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseAtaLba28)
-            {
-                AaruConsole.ErrorWriteLine("Expected ATA LBA28 Response Packet, got packet type {0}...",
-                                           hdr.packetType);
-
-                return -1;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketResAtaLba28 res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaLba28>(buf);
-
-            buffer = new byte[res.buf_len];
-            Array.Copy(buf, Marshal.SizeOf<AaruPacketResAtaLba28>(), buffer, 0, res.buf_len);
-            duration       = res.duration;
-            sense          = res.sense != 0;
-            errorRegisters = res.registers;
-
-            return (int)res.error_no;
-        }
-
-        /// <summary>Sends an ATA/ATAPI command to the remote device using 48-bit LBA addressing</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="registers">ATA registers.</param>
-        /// <param name="errorRegisters">Status/error registers.</param>
-        /// <param name="protocol">ATA Protocol.</param>
-        /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
-        /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="transferBlocks">
-        ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
-        ///     bytes.
-        /// </param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
-        public int SendAtaCommand(AtaRegistersLba48 registers, out AtaErrorRegistersLba48 errorRegisters,
-                                  AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
-                                  uint timeout, bool transferBlocks, out double duration, out bool sense)
-        {
-            duration       = 0;
-            sense          = true;
-            errorRegisters = new AtaErrorRegistersLba48();
-
-            var cmdPkt = new AaruPacketCmdAtaLba48
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandAtaLba48
-                },
-                registers        = registers,
-                protocol         = (byte)protocol,
-                transferRegister = (byte)transferRegister,
-                transferBlocks   = transferBlocks,
-                timeout          = timeout * 1000
-            };
-
-            if(buffer != null)
-                cmdPkt.buf_len = (uint)buffer.Length;
-
-            cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdAtaLba48>() + cmdPkt.buf_len);
-
-            byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-            byte[] buf    = new byte[cmdPkt.hdr.len];
-
-            Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdAtaLba48>());
-
-            if(buffer != null)
-                Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdAtaLba48>(), cmdPkt.buf_len);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return -1;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return -1;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseAtaLba48)
-            {
-                AaruConsole.ErrorWriteLine("Expected ATA LBA48 Response Packet, got packet type {0}...",
-                                           hdr.packetType);
-
-                return -1;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketResAtaLba48 res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaLba48>(buf);
-
-            buffer = new byte[res.buf_len];
-            Array.Copy(buf, Marshal.SizeOf<AaruPacketResAtaLba48>(), buffer, 0, res.buf_len);
-            duration       = res.duration;
-            sense          = res.sense != 0;
-            errorRegisters = res.registers;
-
-            return (int)res.error_no;
-        }
-
-        /// <summary>Sends a MMC/SD command to the remote device</summary>
-        /// <returns>The result of the command.</returns>
-        /// <param name="command">MMC/SD opcode</param>
-        /// <param name="buffer">Buffer for MMC/SD command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
-        /// <param name="write"><c>True</c> if data is sent from host to card</param>
-        /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
-        /// <param name="flags">Flags indicating kind and place of response</param>
-        /// <param name="blocks">How many blocks to transfer</param>
-        /// <param name="argument">Command argument</param>
-        /// <param name="response">Response registers</param>
-        /// <param name="blockSize">Size of block in bytes</param>
-        public int SendMmcCommand(MmcCommands command, bool write, bool isApplication, MmcFlags flags, uint argument,
-                                  uint blockSize, uint blocks, ref byte[] buffer, out uint[] response,
-                                  out double duration, out bool sense, uint timeout = 0)
-        {
-            duration = 0;
-            sense    = true;
-            response = null;
-
-            var cmdPkt = new AaruPacketCmdSdhci
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandSdhci
-                },
-                command = new AaruCmdSdhci
-                {
-                    command     = command,
-                    write       = write,
-                    application = isApplication,
-                    flags       = flags,
-                    argument    = argument,
-                    block_size  = blockSize,
-                    blocks      = blocks,
-                    timeout     = timeout * 1000
-                }
-            };
-
-            if(buffer != null)
-                cmdPkt.command.buf_len = (uint)buffer.Length;
-
-            cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdSdhci>() + cmdPkt.command.buf_len);
-
-            byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-            byte[] buf    = new byte[cmdPkt.hdr.len];
-
-            Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdSdhci>());
-
-            if(buffer != null)
-                Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdSdhci>(), cmdPkt.command.buf_len);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return -1;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return -1;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseSdhci)
-            {
-                AaruConsole.ErrorWriteLine("Expected SDHCI Response Packet, got packet type {0}...", hdr.packetType);
-
-                return -1;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketResSdhci res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResSdhci>(buf);
-
-            buffer = new byte[res.res.buf_len];
-            Array.Copy(buf, Marshal.SizeOf<AaruPacketResSdhci>(), buffer, 0, res.res.buf_len);
-            duration    = res.res.duration;
-            sense       = res.res.sense != 0;
-            response    = new uint[4];
-            response[0] = res.res.response[0];
-            response[1] = res.res.response[1];
-            response[2] = res.res.response[2];
-            response[3] = res.res.response[3];
-
-            return (int)res.res.error_no;
-        }
-
-        /// <summary>Gets the <see cref="DeviceType" /> for the remote device</summary>
-        /// <returns>
-        ///     <see cref="DeviceType" />
-        /// </returns>
-        public DeviceType GetDeviceType()
-        {
-            var cmdPkt = new AaruPacketCmdGetDeviceType
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketCmdGetDeviceType>(),
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandGetType
-                }
-            };
-
-            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return DeviceType.Unknown;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return DeviceType.Unknown;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return DeviceType.Unknown;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseGetType)
-            {
-                AaruConsole.ErrorWriteLine("Expected Device Type Response Packet, got packet type {0}...",
-                                           hdr.packetType);
-
-                return DeviceType.Unknown;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return DeviceType.Unknown;
-            }
-
-            AaruPacketResGetDeviceType res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetDeviceType>(buf);
-
-            return res.device_type;
-        }
-
-        /// <summary>Retrieves the SDHCI registers from the remote device</summary>
-        /// <param name="csd">CSD register</param>
-        /// <param name="cid">CID register</param>
-        /// <param name="ocr">OCR register</param>
-        /// <param name="scr">SCR register</param>
-        /// <returns><c>true</c> if the device is attached to an SDHCI controller, <c>false</c> otherwise</returns>
-        public bool GetSdhciRegisters(out byte[] csd, out byte[] cid, out byte[] ocr, out byte[] scr)
-        {
-            csd = null;
-            cid = null;
-            ocr = null;
-            scr = null;
-
-            var cmdPkt = new AaruPacketCmdGetSdhciRegisters
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketCmdGetSdhciRegisters>(),
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandGetSdhciRegisters
-                }
-            };
-
-            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return false;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return false;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseGetSdhciRegisters)
-            {
-                AaruConsole.ErrorWriteLine("Expected Device Type Response Packet, got packet type {0}...",
-                                           hdr.packetType);
-
-                return false;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
-            }
-
-            AaruPacketResGetSdhciRegisters res =
-                Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetSdhciRegisters>(buf);
-
-            if(res.csd_len > 0)
-            {
-                if(res.csd_len > 16)
-                    res.csd_len = 16;
-
-                csd = new byte[res.csd_len];
-
-                Array.Copy(res.csd, 0, csd, 0, res.csd_len);
-            }
-
-            if(res.cid_len > 0)
-            {
-                if(res.cid_len > 16)
-                    res.cid_len = 16;
-
-                cid = new byte[res.cid_len];
-
-                Array.Copy(res.cid, 0, cid, 0, res.cid_len);
-            }
-
-            if(res.ocr_len > 0)
-            {
-                if(res.ocr_len > 16)
-                    res.ocr_len = 16;
-
-                ocr = new byte[res.ocr_len];
-
-                Array.Copy(res.ocr, 0, ocr, 0, res.ocr_len);
-            }
-
-            if(res.scr_len > 0)
-            {
-                if(res.scr_len > 16)
-                    res.scr_len = 16;
-
-                scr = new byte[res.scr_len];
-
-                Array.Copy(res.scr, 0, scr, 0, res.scr_len);
-            }
-
-            return res.isSdhci;
-        }
-
-        /// <summary>Gets the USB data from the remote device</summary>
-        /// <param name="descriptors">USB descriptors</param>
-        /// <param name="idVendor">USB vendor ID</param>
-        /// <param name="idProduct">USB product ID</param>
-        /// <param name="manufacturer">USB manufacturer string</param>
-        /// <param name="product">USB product string</param>
-        /// <param name="serial">USB serial number string</param>
-        /// <returns><c>true</c> if the device is attached via USB, <c>false</c> otherwise</returns>
-        public bool GetUsbData(out byte[] descriptors, out ushort idVendor, out ushort idProduct,
-                               out string manufacturer, out string product, out string serial)
-        {
-            descriptors  = null;
-            idVendor     = 0;
-            idProduct    = 0;
-            manufacturer = null;
-            product      = null;
-            serial       = null;
-
-            var cmdPkt = new AaruPacketCmdGetUsbData
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketCmdGetUsbData>(),
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandGetUsbData
-                }
-            };
-
-            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return false;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return false;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseGetUsbData)
-            {
-                AaruConsole.ErrorWriteLine("Expected USB Data Response Packet, got packet type {0}...", hdr.packetType);
-
-                return false;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
-            }
-
-            AaruPacketResGetUsbData res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetUsbData>(buf);
-
-            if(!res.isUsb)
-                return false;
-
-            descriptors = new byte[res.descLen];
-            Array.Copy(res.descriptors, 0, descriptors, 0, res.descLen);
-            idVendor     = res.idVendor;
-            idProduct    = res.idProduct;
-            manufacturer = res.manufacturer;
-            product      = res.product;
-            serial       = res.serial;
-
-            return true;
-        }
-
-        /// <summary>Gets the FireWire data from the remote device</summary>
-        /// <param name="idVendor">FireWire vendor ID</param>
-        /// <param name="idProduct">FireWire product ID</param>
-        /// <param name="vendor">FireWire vendor string</param>
-        /// <param name="model">FireWire model string</param>
-        /// <param name="guid">FireWire GUID</param>
-        /// <returns><c>true</c> if the device is attached via FireWire, <c>false</c> otherwise</returns>
-        public bool GetFireWireData(out uint idVendor, out uint idProduct, out ulong guid, out string vendor,
-                                    out string model)
-        {
-            idVendor  = 0;
-            idProduct = 0;
-            guid      = 0;
-            vendor    = null;
-            model     = null;
-
-            var cmdPkt = new AaruPacketCmdGetFireWireData
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketCmdGetFireWireData>(),
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandGetFireWireData
-                }
-            };
-
-            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return false;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return false;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseGetFireWireData)
-            {
-                AaruConsole.ErrorWriteLine("Expected FireWire Data Response Packet, got packet type {0}...",
-                                           hdr.packetType);
-
-                return false;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
-            }
-
-            AaruPacketResGetFireWireData res =
-                Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetFireWireData>(buf);
-
-            if(!res.isFireWire)
-                return false;
-
-            idVendor  = res.idVendor;
-            idProduct = res.idModel;
-            guid      = res.guid;
-            vendor    = res.vendor;
-            model     = res.model;
-
-            return true;
-        }
-
-        /// <summary>Gets the PCMCIA/CardBus data from the remote device</summary>
-        /// <param name="cis">Card Information Structure</param>
-        /// <returns><c>true</c> if the device is attached via PCMCIA or CardBus, <c>false</c> otherwise</returns>
-        public bool GetPcmciaData(out byte[] cis)
-        {
-            cis = null;
-
-            var cmdPkt = new AaruPacketCmdGetPcmciaData
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketCmdGetPcmciaData>(),
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandGetPcmciaData
-                }
-            };
-
-            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return false;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return false;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseGetPcmciaData)
-            {
-                AaruConsole.ErrorWriteLine("Expected PCMCIA Data Response Packet, got packet type {0}...",
-                                           hdr.packetType);
-
-                return false;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
-            }
-
-            AaruPacketResGetPcmciaData res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetPcmciaData>(buf);
-
-            if(!res.isPcmcia)
-                return false;
-
-            cis = res.cis;
-
-            return true;
-        }
-
-        /// <summary>Receives data from a socket into a buffer</summary>
-        /// <param name="socket">Socket</param>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="size">Expected total size in bytes</param>
-        /// <param name="socketFlags">Socket flags</param>
-        /// <returns>Retrieved number of bytes</returns>
-        static int Receive(Socket socket, byte[] buffer, int size, SocketFlags socketFlags)
-        {
-            int offset = 0;
-
-            while(size > 0)
-            {
-                int got = socket.Receive(buffer, offset, size, socketFlags);
-
-                if(got <= 0)
-                    break;
-
-                offset += got;
-                size   -= got;
-            }
-
-            return offset;
-        }
-
-        /// <summary>Closes the remote device, without closing the network connection</summary>
-        public void Close()
-        {
-            var cmdPkt = new AaruPacketCmdClose
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketCmdClose>(),
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandCloseDevice
-                }
-            };
-
-            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-
-            try
-            {
-                _socket.Send(buf, SocketFlags.None);
-            }
-            catch(ObjectDisposedException)
-            {
-                // Ignore if already disposed
-            }
-        }
-
-        /// <summary>
-        ///     Concatenates a queue of commands to be send to a remote SecureDigital or MultiMediaCard attached to an SDHCI
-        ///     controller
-        /// </summary>
-        /// <param name="commands">List of commands</param>
-        /// <param name="duration">Duration to execute all commands, in milliseconds</param>
-        /// <param name="sense">Set to <c>true</c> if any of the commands returned an error status, <c>false</c> otherwise</param>
-        /// <param name="timeout">Maximum allowed time to execute a single command</param>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        public int SendMultipleMmcCommands(Device.MmcSingleCommand[] commands, out double duration, out bool sense,
-                                           uint timeout = 0)
-        {
-            if(ServerProtocolVersion < 2)
-                return SendMultipleMmcCommandsV1(commands, out duration, out sense, timeout);
-
-            sense    = false;
-            duration = 0;
-
-            long packetSize = Marshal.SizeOf<AaruPacketMultiCmdSdhci>() +
-                              (Marshal.SizeOf<AaruCmdSdhci>() * commands.LongLength);
-
-            foreach(Device.MmcSingleCommand command in commands)
-                packetSize += command.buffer?.Length ?? 0;
-
-            var packet = new AaruPacketMultiCmdSdhci
-            {
-                cmd_count = (ulong)commands.LongLength,
-                hdr = new AaruPacketHeader
-                {
-                    len        = (uint)packetSize,
-                    packetType = AaruPacketType.MultiCommandSdhci,
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    version    = Consts.PACKET_VERSION
-                }
-            };
-
-            byte[] buf = new byte[packetSize];
-            byte[] tmp = Marshal.StructureToByteArrayLittleEndian(packet);
-
-            Array.Copy(tmp, 0, buf, 0, tmp.Length);
-
-            int off = tmp.Length;
-
-            foreach(AaruCmdSdhci cmd in commands.Select(command => new AaruCmdSdhci
-            {
-                application = command.isApplication,
-                argument    = command.argument,
-                block_size  = command.blockSize,
-                blocks      = command.blocks,
-                buf_len     = (uint)(command.buffer?.Length ?? 0),
-                command     = command.command,
-                flags       = command.flags,
-                timeout     = timeout,
-                write       = command.write
-            }))
-            {
-                tmp = Marshal.StructureToByteArrayLittleEndian(cmd);
-                Array.Copy(tmp, 0, buf, off, tmp.Length);
-
-                off += tmp.Length;
-            }
-
-            foreach(Device.MmcSingleCommand command in commands.Where(command => (command.buffer?.Length ?? 0) != 0))
-            {
-                Array.Copy(command.buffer, 0, buf, off, command.buffer.Length);
-
-                off += command.buffer.Length;
-            }
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return -1;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return -1;
-            }
-
-            if(hdr.packetType != AaruPacketType.ResponseMultiSdhci)
-            {
-                AaruConsole.ErrorWriteLine("Expected multi MMC/SD command Response Packet, got packet type {0}...",
-                                           hdr.packetType);
-
-                return -1;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return -1;
-            }
-
-            AaruPacketMultiCmdSdhci res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketMultiCmdSdhci>(buf);
-
-            if(res.cmd_count != (ulong)commands.Length)
-            {
-                AaruConsole.ErrorWriteLine("Expected the response to {0} SD/MMC commands, but got {1} responses...",
-                                           commands.Length, res.cmd_count);
-
-                return -1;
-            }
-
-            off = Marshal.SizeOf<AaruPacketMultiCmdSdhci>();
-
-            int error = 0;
-
-            foreach(Device.MmcSingleCommand command in commands)
-            {
-                AaruResSdhci cmdRes =
-                    Marshal.ByteArrayToStructureLittleEndian<AaruResSdhci>(buf, off, Marshal.SizeOf<AaruResSdhci>());
-
-                command.response =  cmdRes.response;
-                duration         += cmdRes.duration;
-
-                if(cmdRes.error_no != 0 &&
-                   error           == 0)
-                    error = (int)cmdRes.error_no;
-
-                if(cmdRes.sense != 0)
-                    sense = true;
-
-                if(cmdRes.buf_len > 0)
-                    command.buffer = new byte[cmdRes.buf_len];
-
-                off += Marshal.SizeOf<AaruResSdhci>();
-            }
-
-            foreach(Device.MmcSingleCommand command in commands)
-            {
-                Array.Copy(buf, off, command.buffer, 0, command.buffer.Length);
-                off += command.buffer.Length;
-            }
-
-            return error;
-        }
-
-        /// <summary>
-        ///     Concatenates a queue of commands to be send to a remote SecureDigital or MultiMediaCard attached to an SDHCI
-        ///     controller, using protocol version 1 without specific support for such a queueing
-        /// </summary>
-        /// <param name="commands">List of commands</param>
-        /// <param name="duration">Duration to execute all commands, in milliseconds</param>
-        /// <param name="sense">Set to <c>true</c> if any of the commands returned an error status, <c>false</c> otherwise</param>
-        /// <param name="timeout">Maximum allowed time to execute a single command</param>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        int SendMultipleMmcCommandsV1(Device.MmcSingleCommand[] commands, out double duration, out bool sense,
-                                      uint timeout)
-        {
-            sense    = false;
-            duration = 0;
-            int error = 0;
-
-            foreach(Device.MmcSingleCommand command in commands)
-            {
-                error = SendMmcCommand(command.command, command.write, command.isApplication, command.flags,
-                                       command.argument, command.blockSize, command.blocks, ref command.buffer,
-                                       out command.response, out double cmdDuration, out bool cmdSense, timeout);
-
-                if(cmdSense)
-                    sense = true;
-
-                duration += cmdDuration;
-            }
-
-            return error;
-        }
-
-        /// <summary>Closes then immediately reopens a remote device</summary>
-        /// <returns>Returned error number if any</returns>
-        public bool ReOpen()
-        {
-            if(ServerProtocolVersion < 2)
-                return false;
-
-            var cmdPkt = new AaruPacketCmdReOpen
-            {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketCmdReOpen>(),
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandReOpenDevice
-                }
-            };
-
-            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
-
-            int len = _socket.Send(buf, SocketFlags.None);
-
-            if(len != buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
-
-                return false;
-            }
-
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
-
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
-
-            if(len < hdrBuf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
-            }
-
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
-
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
-            {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return false;
-            }
-
-            if(hdr.packetType != AaruPacketType.Nop)
-            {
-                AaruConsole.ErrorWriteLine("Expected NOP Packet, got packet type {0}...", hdr.packetType);
-
-                return false;
-            }
-
-            if(hdr.version != Consts.PACKET_VERSION)
-            {
-                AaruConsole.ErrorWriteLine("Unrecognized packet version...");
-
-                return false;
-            }
-
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
-
-            if(len < buf.Length)
-            {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
-            }
-
-            AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
-
-            switch(nop.reasonCode)
-            {
-                case AaruNopReason.ReOpenOk: return true;
-                case AaruNopReason.CloseError:
-                case AaruNopReason.OpenError:
-                    AaruConsole.ErrorWriteLine("ReOpen error closing device...");
-
-                    break;
-                default:
-                    AaruConsole.ErrorWriteLine("ReOpen error {0} with reason: {1}...", nop.errno, nop.reason);
-
-                    break;
-            }
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+            lastError = -1;
 
             return false;
         }
 
-        /// <summary>Reads data using operating system buffers.</summary>
-        /// <param name="buffer">Data buffer</param>
-        /// <param name="offset">Offset in remote device to start reading, in bytes</param>
-        /// <param name="length">Number of bytes to read</param>
-        /// <param name="duration">Total time in milliseconds the reading took</param>
-        /// <returns><c>true</c> if there was an error, <c>false</c> otherwise</returns>
-        public bool BufferedOsRead(out byte[] buffer, long offset, uint length, out double duration)
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
         {
-            duration = 0;
-            buffer   = null;
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+            lastError = -1;
 
-            if(ServerProtocolVersion < 2)
-                return false;
+            return false;
+        }
 
-            var cmdPkt = new AaruPacketCmdOsRead
+        if(hdr.packetType != AaruPacketType.Nop)
+        {
+            AaruConsole.ErrorWriteLine("Expected List Devices Response Packet, got packet type {0}...",
+                                       hdr.packetType);
+
+            lastError = -1;
+
+            return false;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+            lastError = -1;
+
+            return false;
+        }
+
+        AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
+
+        switch(nop.reasonCode)
+        {
+            case AaruNopReason.OpenOk:         return true;
+            case AaruNopReason.NotImplemented: throw new NotImplementedException($"{nop.reason}");
+        }
+
+        AaruConsole.ErrorWriteLine($"{nop.reason}");
+        lastError = nop.errno;
+
+        return false;
+    }
+
+    /// <summary>Sends a SCSI command to the remote device</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="cdb">SCSI CDB</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="senseBuffer">Buffer with the SCSI sense</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="direction">SCSI command transfer direction</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense">
+    ///     <c>True</c> if SCSI command returned non-OK status and <paramref name="senseBuffer" /> contains
+    ///     SCSI sense
+    /// </param>
+    public int SendScsiCommand(byte[] cdb, ref byte[] buffer, out byte[] senseBuffer, uint timeout,
+                               ScsiDirection direction, out double duration, out bool sense)
+    {
+        senseBuffer = null;
+        duration    = 0;
+        sense       = true;
+
+        var cmdPkt = new AaruPacketCmdScsi
+        {
+            hdr = new AaruPacketHeader
             {
-                hdr = new AaruPacketHeader
-                {
-                    remote_id  = Consts.REMOTE_ID,
-                    packet_id  = Consts.PACKET_ID,
-                    len        = (uint)Marshal.SizeOf<AaruPacketCmdOsRead>(),
-                    version    = Consts.PACKET_VERSION,
-                    packetType = AaruPacketType.CommandOsRead
-                },
-                length = length,
-                offset = (ulong)offset
-            };
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandScsi
+            },
+            direction = (int)direction,
+            timeout   = timeout * 1000
+        };
 
-            byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+        if(cdb != null)
+            cmdPkt.cdb_len = (uint)cdb.Length;
 
-            int len = _socket.Send(buf, SocketFlags.None);
+        if(buffer != null)
+            cmdPkt.buf_len = (uint)buffer.Length;
 
-            if(len != buf.Length)
+        cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdScsi>() + cmdPkt.cdb_len + cmdPkt.buf_len);
+
+        byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+        byte[] buf    = new byte[cmdPkt.hdr.len];
+
+        Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdScsi>());
+
+        if(cdb != null)
+            Array.Copy(cdb, 0, buf, Marshal.SizeOf<AaruPacketCmdScsi>(), cmdPkt.cdb_len);
+
+        if(buffer != null)
+            Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdScsi>() + cmdPkt.cdb_len, cmdPkt.buf_len);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return -1;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return -1;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseScsi)
+        {
+            AaruConsole.ErrorWriteLine("Expected SCSI Response Packet, got packet type {0}...", hdr.packetType);
+
+            return -1;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketResScsi res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResScsi>(buf);
+
+        senseBuffer = new byte[res.sense_len];
+        Array.Copy(buf, Marshal.SizeOf<AaruPacketResScsi>(), senseBuffer, 0, res.sense_len);
+        buffer = new byte[res.buf_len];
+        Array.Copy(buf, Marshal.SizeOf<AaruPacketResScsi>() + res.sense_len, buffer, 0, res.buf_len);
+        duration = res.duration;
+        sense    = res.sense != 0;
+
+        return (int)res.error_no;
+    }
+
+    /// <summary>Sends an ATA/ATAPI command to the remote device using CHS addressing</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="registers">ATA registers.</param>
+    /// <param name="errorRegisters">Status/error registers.</param>
+    /// <param name="protocol">ATA Protocol.</param>
+    /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
+    /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="transferBlocks">
+    ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
+    ///     bytes.
+    /// </param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
+    public int SendAtaCommand(AtaRegistersChs registers, out AtaErrorRegistersChs errorRegisters,
+                              AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                              uint timeout, bool transferBlocks, out double duration, out bool sense)
+    {
+        duration       = 0;
+        sense          = true;
+        errorRegisters = new AtaErrorRegistersChs();
+
+        var cmdPkt = new AaruPacketCmdAtaChs
+        {
+            hdr = new AaruPacketHeader
             {
-                AaruConsole.ErrorWriteLine("Could not write to the network...");
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandAtaChs
+            },
+            registers        = registers,
+            protocol         = (byte)protocol,
+            transferRegister = (byte)transferRegister,
+            transferBlocks   = transferBlocks,
+            timeout          = timeout * 1000
+        };
 
-                return false;
+        if(buffer != null)
+            cmdPkt.buf_len = (uint)buffer.Length;
+
+        cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdAtaChs>() + cmdPkt.buf_len);
+
+        byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+        byte[] buf    = new byte[cmdPkt.hdr.len];
+
+        Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdAtaChs>());
+
+        if(buffer != null)
+            Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdAtaChs>(), cmdPkt.buf_len);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return -1;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return -1;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseAtaChs)
+        {
+            AaruConsole.ErrorWriteLine("Expected ATA CHS Response Packet, got packet type {0}...", hdr.packetType);
+
+            return -1;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketResAtaChs res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaChs>(buf);
+
+        buffer = new byte[res.buf_len];
+        Array.Copy(buf, Marshal.SizeOf<AaruPacketResAtaChs>(), buffer, 0, res.buf_len);
+        duration       = res.duration;
+        sense          = res.sense != 0;
+        errorRegisters = res.registers;
+
+        return (int)res.error_no;
+    }
+
+    /// <summary>Sends an ATA/ATAPI command to the remote device using 28-bit LBA addressing</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="registers">ATA registers.</param>
+    /// <param name="errorRegisters">Status/error registers.</param>
+    /// <param name="protocol">ATA Protocol.</param>
+    /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
+    /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="transferBlocks">
+    ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
+    ///     bytes.
+    /// </param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
+    public int SendAtaCommand(AtaRegistersLba28 registers, out AtaErrorRegistersLba28 errorRegisters,
+                              AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                              uint timeout, bool transferBlocks, out double duration, out bool sense)
+    {
+        duration       = 0;
+        sense          = true;
+        errorRegisters = new AtaErrorRegistersLba28();
+
+        var cmdPkt = new AaruPacketCmdAtaLba28
+        {
+            hdr = new AaruPacketHeader
+            {
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandAtaLba28
+            },
+            registers        = registers,
+            protocol         = (byte)protocol,
+            transferRegister = (byte)transferRegister,
+            transferBlocks   = transferBlocks,
+            timeout          = timeout * 1000
+        };
+
+        if(buffer != null)
+            cmdPkt.buf_len = (uint)buffer.Length;
+
+        cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdAtaLba28>() + cmdPkt.buf_len);
+
+        byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+        byte[] buf    = new byte[cmdPkt.hdr.len];
+
+        Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdAtaLba28>());
+
+        if(buffer != null)
+            Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdAtaLba28>(), cmdPkt.buf_len);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return -1;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return -1;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseAtaLba28)
+        {
+            AaruConsole.ErrorWriteLine("Expected ATA LBA28 Response Packet, got packet type {0}...",
+                                       hdr.packetType);
+
+            return -1;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketResAtaLba28 res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaLba28>(buf);
+
+        buffer = new byte[res.buf_len];
+        Array.Copy(buf, Marshal.SizeOf<AaruPacketResAtaLba28>(), buffer, 0, res.buf_len);
+        duration       = res.duration;
+        sense          = res.sense != 0;
+        errorRegisters = res.registers;
+
+        return (int)res.error_no;
+    }
+
+    /// <summary>Sends an ATA/ATAPI command to the remote device using 48-bit LBA addressing</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="registers">ATA registers.</param>
+    /// <param name="errorRegisters">Status/error registers.</param>
+    /// <param name="protocol">ATA Protocol.</param>
+    /// <param name="transferRegister">Indicates which register indicates the transfer length</param>
+    /// <param name="buffer">Buffer for ATA/ATAPI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="transferBlocks">
+    ///     If set to <c>true</c>, transfer is indicated in blocks, otherwise, it is indicated in
+    ///     bytes.
+    /// </param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA/ATAPI command returned non-OK status</param>
+    public int SendAtaCommand(AtaRegistersLba48 registers, out AtaErrorRegistersLba48 errorRegisters,
+                              AtaProtocol protocol, AtaTransferRegister transferRegister, ref byte[] buffer,
+                              uint timeout, bool transferBlocks, out double duration, out bool sense)
+    {
+        duration       = 0;
+        sense          = true;
+        errorRegisters = new AtaErrorRegistersLba48();
+
+        var cmdPkt = new AaruPacketCmdAtaLba48
+        {
+            hdr = new AaruPacketHeader
+            {
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandAtaLba48
+            },
+            registers        = registers,
+            protocol         = (byte)protocol,
+            transferRegister = (byte)transferRegister,
+            transferBlocks   = transferBlocks,
+            timeout          = timeout * 1000
+        };
+
+        if(buffer != null)
+            cmdPkt.buf_len = (uint)buffer.Length;
+
+        cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdAtaLba48>() + cmdPkt.buf_len);
+
+        byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+        byte[] buf    = new byte[cmdPkt.hdr.len];
+
+        Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdAtaLba48>());
+
+        if(buffer != null)
+            Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdAtaLba48>(), cmdPkt.buf_len);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return -1;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return -1;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseAtaLba48)
+        {
+            AaruConsole.ErrorWriteLine("Expected ATA LBA48 Response Packet, got packet type {0}...",
+                                       hdr.packetType);
+
+            return -1;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketResAtaLba48 res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResAtaLba48>(buf);
+
+        buffer = new byte[res.buf_len];
+        Array.Copy(buf, Marshal.SizeOf<AaruPacketResAtaLba48>(), buffer, 0, res.buf_len);
+        duration       = res.duration;
+        sense          = res.sense != 0;
+        errorRegisters = res.registers;
+
+        return (int)res.error_no;
+    }
+
+    /// <summary>Sends a MMC/SD command to the remote device</summary>
+    /// <returns>The result of the command.</returns>
+    /// <param name="command">MMC/SD opcode</param>
+    /// <param name="buffer">Buffer for MMC/SD command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
+    /// <param name="write"><c>True</c> if data is sent from host to card</param>
+    /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
+    /// <param name="flags">Flags indicating kind and place of response</param>
+    /// <param name="blocks">How many blocks to transfer</param>
+    /// <param name="argument">Command argument</param>
+    /// <param name="response">Response registers</param>
+    /// <param name="blockSize">Size of block in bytes</param>
+    public int SendMmcCommand(MmcCommands command, bool write, bool isApplication, MmcFlags flags, uint argument,
+                              uint blockSize, uint blocks, ref byte[] buffer, out uint[] response,
+                              out double duration, out bool sense, uint timeout = 0)
+    {
+        duration = 0;
+        sense    = true;
+        response = null;
+
+        var cmdPkt = new AaruPacketCmdSdhci
+        {
+            hdr = new AaruPacketHeader
+            {
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandSdhci
+            },
+            command = new AaruCmdSdhci
+            {
+                command     = command,
+                write       = write,
+                application = isApplication,
+                flags       = flags,
+                argument    = argument,
+                block_size  = blockSize,
+                blocks      = blocks,
+                timeout     = timeout * 1000
             }
+        };
 
-            byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+        if(buffer != null)
+            cmdPkt.command.buf_len = (uint)buffer.Length;
 
-            len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+        cmdPkt.hdr.len = (uint)(Marshal.SizeOf<AaruPacketCmdSdhci>() + cmdPkt.command.buf_len);
 
-            if(len < hdrBuf.Length)
+        byte[] pktBuf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+        byte[] buf    = new byte[cmdPkt.hdr.len];
+
+        Array.Copy(pktBuf, 0, buf, 0, Marshal.SizeOf<AaruPacketCmdSdhci>());
+
+        if(buffer != null)
+            Array.Copy(buffer, 0, buf, Marshal.SizeOf<AaruPacketCmdSdhci>(), cmdPkt.command.buf_len);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return -1;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return -1;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseSdhci)
+        {
+            AaruConsole.ErrorWriteLine("Expected SDHCI Response Packet, got packet type {0}...", hdr.packetType);
+
+            return -1;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketResSdhci res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResSdhci>(buf);
+
+        buffer = new byte[res.res.buf_len];
+        Array.Copy(buf, Marshal.SizeOf<AaruPacketResSdhci>(), buffer, 0, res.res.buf_len);
+        duration    = res.res.duration;
+        sense       = res.res.sense != 0;
+        response    = new uint[4];
+        response[0] = res.res.response[0];
+        response[1] = res.res.response[1];
+        response[2] = res.res.response[2];
+        response[3] = res.res.response[3];
+
+        return (int)res.res.error_no;
+    }
+
+    /// <summary>Gets the <see cref="DeviceType" /> for the remote device</summary>
+    /// <returns>
+    ///     <see cref="DeviceType" />
+    /// </returns>
+    public DeviceType GetDeviceType()
+    {
+        var cmdPkt = new AaruPacketCmdGetDeviceType
+        {
+            hdr = new AaruPacketHeader
             {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketCmdGetDeviceType>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandGetType
             }
+        };
 
-            AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+        byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            if(hdr.remote_id != Consts.REMOTE_ID ||
-               hdr.packet_id != Consts.PACKET_ID)
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return DeviceType.Unknown;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return DeviceType.Unknown;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return DeviceType.Unknown;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseGetType)
+        {
+            AaruConsole.ErrorWriteLine("Expected Device Type Response Packet, got packet type {0}...",
+                                       hdr.packetType);
+
+            return DeviceType.Unknown;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return DeviceType.Unknown;
+        }
+
+        AaruPacketResGetDeviceType res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetDeviceType>(buf);
+
+        return res.device_type;
+    }
+
+    /// <summary>Retrieves the SDHCI registers from the remote device</summary>
+    /// <param name="csd">CSD register</param>
+    /// <param name="cid">CID register</param>
+    /// <param name="ocr">OCR register</param>
+    /// <param name="scr">SCR register</param>
+    /// <returns><c>true</c> if the device is attached to an SDHCI controller, <c>false</c> otherwise</returns>
+    public bool GetSdhciRegisters(out byte[] csd, out byte[] cid, out byte[] ocr, out byte[] scr)
+    {
+        csd = null;
+        cid = null;
+        ocr = null;
+        scr = null;
+
+        var cmdPkt = new AaruPacketCmdGetSdhciRegisters
+        {
+            hdr = new AaruPacketHeader
             {
-                AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
-
-                return false;
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketCmdGetSdhciRegisters>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandGetSdhciRegisters
             }
+        };
 
-            if(hdr.packetType != AaruPacketType.ResponseOsRead)
+        byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return false;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return false;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseGetSdhciRegisters)
+        {
+            AaruConsole.ErrorWriteLine("Expected Device Type Response Packet, got packet type {0}...",
+                                       hdr.packetType);
+
+            return false;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketResGetSdhciRegisters res =
+            Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetSdhciRegisters>(buf);
+
+        if(res.csd_len > 0)
+        {
+            if(res.csd_len > 16)
+                res.csd_len = 16;
+
+            csd = new byte[res.csd_len];
+
+            Array.Copy(res.csd, 0, csd, 0, res.csd_len);
+        }
+
+        if(res.cid_len > 0)
+        {
+            if(res.cid_len > 16)
+                res.cid_len = 16;
+
+            cid = new byte[res.cid_len];
+
+            Array.Copy(res.cid, 0, cid, 0, res.cid_len);
+        }
+
+        if(res.ocr_len > 0)
+        {
+            if(res.ocr_len > 16)
+                res.ocr_len = 16;
+
+            ocr = new byte[res.ocr_len];
+
+            Array.Copy(res.ocr, 0, ocr, 0, res.ocr_len);
+        }
+
+        if(res.scr_len > 0)
+        {
+            if(res.scr_len > 16)
+                res.scr_len = 16;
+
+            scr = new byte[res.scr_len];
+
+            Array.Copy(res.scr, 0, scr, 0, res.scr_len);
+        }
+
+        return res.isSdhci;
+    }
+
+    /// <summary>Gets the USB data from the remote device</summary>
+    /// <param name="descriptors">USB descriptors</param>
+    /// <param name="idVendor">USB vendor ID</param>
+    /// <param name="idProduct">USB product ID</param>
+    /// <param name="manufacturer">USB manufacturer string</param>
+    /// <param name="product">USB product string</param>
+    /// <param name="serial">USB serial number string</param>
+    /// <returns><c>true</c> if the device is attached via USB, <c>false</c> otherwise</returns>
+    public bool GetUsbData(out byte[] descriptors, out ushort idVendor, out ushort idProduct,
+                           out string manufacturer, out string product, out string serial)
+    {
+        descriptors  = null;
+        idVendor     = 0;
+        idProduct    = 0;
+        manufacturer = null;
+        product      = null;
+        serial       = null;
+
+        var cmdPkt = new AaruPacketCmdGetUsbData
+        {
+            hdr = new AaruPacketHeader
             {
-                AaruConsole.ErrorWriteLine("Expected OS Read Response Packet, got packet type {0}...", hdr.packetType);
-
-                return false;
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketCmdGetUsbData>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandGetUsbData
             }
+        };
 
-            if(hdr.version != Consts.PACKET_VERSION)
+        byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return false;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return false;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseGetUsbData)
+        {
+            AaruConsole.ErrorWriteLine("Expected USB Data Response Packet, got packet type {0}...", hdr.packetType);
+
+            return false;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketResGetUsbData res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetUsbData>(buf);
+
+        if(!res.isUsb)
+            return false;
+
+        descriptors = new byte[res.descLen];
+        Array.Copy(res.descriptors, 0, descriptors, 0, res.descLen);
+        idVendor     = res.idVendor;
+        idProduct    = res.idProduct;
+        manufacturer = res.manufacturer;
+        product      = res.product;
+        serial       = res.serial;
+
+        return true;
+    }
+
+    /// <summary>Gets the FireWire data from the remote device</summary>
+    /// <param name="idVendor">FireWire vendor ID</param>
+    /// <param name="idProduct">FireWire product ID</param>
+    /// <param name="vendor">FireWire vendor string</param>
+    /// <param name="model">FireWire model string</param>
+    /// <param name="guid">FireWire GUID</param>
+    /// <returns><c>true</c> if the device is attached via FireWire, <c>false</c> otherwise</returns>
+    public bool GetFireWireData(out uint idVendor, out uint idProduct, out ulong guid, out string vendor,
+                                out string model)
+    {
+        idVendor  = 0;
+        idProduct = 0;
+        guid      = 0;
+        vendor    = null;
+        model     = null;
+
+        var cmdPkt = new AaruPacketCmdGetFireWireData
+        {
+            hdr = new AaruPacketHeader
             {
-                AaruConsole.ErrorWriteLine("Unrecognized packet version...");
-
-                return false;
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketCmdGetFireWireData>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandGetFireWireData
             }
+        };
 
-            buf = new byte[hdr.len];
-            len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+        byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            if(len < buf.Length)
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return false;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return false;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseGetFireWireData)
+        {
+            AaruConsole.ErrorWriteLine("Expected FireWire Data Response Packet, got packet type {0}...",
+                                       hdr.packetType);
+
+            return false;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketResGetFireWireData res =
+            Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetFireWireData>(buf);
+
+        if(!res.isFireWire)
+            return false;
+
+        idVendor  = res.idVendor;
+        idProduct = res.idModel;
+        guid      = res.guid;
+        vendor    = res.vendor;
+        model     = res.model;
+
+        return true;
+    }
+
+    /// <summary>Gets the PCMCIA/CardBus data from the remote device</summary>
+    /// <param name="cis">Card Information Structure</param>
+    /// <returns><c>true</c> if the device is attached via PCMCIA or CardBus, <c>false</c> otherwise</returns>
+    public bool GetPcmciaData(out byte[] cis)
+    {
+        cis = null;
+
+        var cmdPkt = new AaruPacketCmdGetPcmciaData
+        {
+            hdr = new AaruPacketHeader
             {
-                AaruConsole.ErrorWriteLine("Could not read from the network...");
-
-                return false;
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketCmdGetPcmciaData>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandGetPcmciaData
             }
+        };
 
-            AaruPacketResOsRead osRead = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResOsRead>(buf);
+        byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            duration = osRead.duration;
+        int len = _socket.Send(buf, SocketFlags.None);
 
-            if(osRead.errno != 0)
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return false;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return false;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseGetPcmciaData)
+        {
+            AaruConsole.ErrorWriteLine("Expected PCMCIA Data Response Packet, got packet type {0}...",
+                                       hdr.packetType);
+
+            return false;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketResGetPcmciaData res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResGetPcmciaData>(buf);
+
+        if(!res.isPcmcia)
+            return false;
+
+        cis = res.cis;
+
+        return true;
+    }
+
+    /// <summary>Receives data from a socket into a buffer</summary>
+    /// <param name="socket">Socket</param>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="size">Expected total size in bytes</param>
+    /// <param name="socketFlags">Socket flags</param>
+    /// <returns>Retrieved number of bytes</returns>
+    static int Receive(Socket socket, byte[] buffer, int size, SocketFlags socketFlags)
+    {
+        int offset = 0;
+
+        while(size > 0)
+        {
+            int got = socket.Receive(buffer, offset, size, socketFlags);
+
+            if(got <= 0)
+                break;
+
+            offset += got;
+            size   -= got;
+        }
+
+        return offset;
+    }
+
+    /// <summary>Closes the remote device, without closing the network connection</summary>
+    public void Close()
+    {
+        var cmdPkt = new AaruPacketCmdClose
+        {
+            hdr = new AaruPacketHeader
             {
-                AaruConsole.ErrorWriteLine("Remote error {0} in OS Read...", osRead.errno);
-
-                return false;
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketCmdClose>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandCloseDevice
             }
+        };
 
-            buffer = new byte[length];
-            Array.Copy(buf, Marshal.SizeOf<AaruPacketResOsRead>(), buffer, 0, length);
+        byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
 
-            return true;
+        try
+        {
+            _socket.Send(buf, SocketFlags.None);
+        }
+        catch(ObjectDisposedException)
+        {
+            // Ignore if already disposed
         }
     }
+
+    /// <summary>
+    ///     Concatenates a queue of commands to be send to a remote SecureDigital or MultiMediaCard attached to an SDHCI
+    ///     controller
+    /// </summary>
+    /// <param name="commands">List of commands</param>
+    /// <param name="duration">Duration to execute all commands, in milliseconds</param>
+    /// <param name="sense">Set to <c>true</c> if any of the commands returned an error status, <c>false</c> otherwise</param>
+    /// <param name="timeout">Maximum allowed time to execute a single command</param>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    public int SendMultipleMmcCommands(Device.MmcSingleCommand[] commands, out double duration, out bool sense,
+                                       uint timeout = 0)
+    {
+        if(ServerProtocolVersion < 2)
+            return SendMultipleMmcCommandsV1(commands, out duration, out sense, timeout);
+
+        sense    = false;
+        duration = 0;
+
+        long packetSize = Marshal.SizeOf<AaruPacketMultiCmdSdhci>() +
+                          (Marshal.SizeOf<AaruCmdSdhci>() * commands.LongLength);
+
+        foreach(Device.MmcSingleCommand command in commands)
+            packetSize += command.buffer?.Length ?? 0;
+
+        var packet = new AaruPacketMultiCmdSdhci
+        {
+            cmd_count = (ulong)commands.LongLength,
+            hdr = new AaruPacketHeader
+            {
+                len        = (uint)packetSize,
+                packetType = AaruPacketType.MultiCommandSdhci,
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                version    = Consts.PACKET_VERSION
+            }
+        };
+
+        byte[] buf = new byte[packetSize];
+        byte[] tmp = Marshal.StructureToByteArrayLittleEndian(packet);
+
+        Array.Copy(tmp, 0, buf, 0, tmp.Length);
+
+        int off = tmp.Length;
+
+        foreach(AaruCmdSdhci cmd in commands.Select(command => new AaruCmdSdhci
+                {
+                    application = command.isApplication,
+                    argument    = command.argument,
+                    block_size  = command.blockSize,
+                    blocks      = command.blocks,
+                    buf_len     = (uint)(command.buffer?.Length ?? 0),
+                    command     = command.command,
+                    flags       = command.flags,
+                    timeout     = timeout,
+                    write       = command.write
+                }))
+        {
+            tmp = Marshal.StructureToByteArrayLittleEndian(cmd);
+            Array.Copy(tmp, 0, buf, off, tmp.Length);
+
+            off += tmp.Length;
+        }
+
+        foreach(Device.MmcSingleCommand command in commands.Where(command => (command.buffer?.Length ?? 0) != 0))
+        {
+            Array.Copy(command.buffer, 0, buf, off, command.buffer.Length);
+
+            off += command.buffer.Length;
+        }
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return -1;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return -1;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseMultiSdhci)
+        {
+            AaruConsole.ErrorWriteLine("Expected multi MMC/SD command Response Packet, got packet type {0}...",
+                                       hdr.packetType);
+
+            return -1;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return -1;
+        }
+
+        AaruPacketMultiCmdSdhci res = Marshal.ByteArrayToStructureLittleEndian<AaruPacketMultiCmdSdhci>(buf);
+
+        if(res.cmd_count != (ulong)commands.Length)
+        {
+            AaruConsole.ErrorWriteLine("Expected the response to {0} SD/MMC commands, but got {1} responses...",
+                                       commands.Length, res.cmd_count);
+
+            return -1;
+        }
+
+        off = Marshal.SizeOf<AaruPacketMultiCmdSdhci>();
+
+        int error = 0;
+
+        foreach(Device.MmcSingleCommand command in commands)
+        {
+            AaruResSdhci cmdRes =
+                Marshal.ByteArrayToStructureLittleEndian<AaruResSdhci>(buf, off, Marshal.SizeOf<AaruResSdhci>());
+
+            command.response =  cmdRes.response;
+            duration         += cmdRes.duration;
+
+            if(cmdRes.error_no != 0 &&
+               error           == 0)
+                error = (int)cmdRes.error_no;
+
+            if(cmdRes.sense != 0)
+                sense = true;
+
+            if(cmdRes.buf_len > 0)
+                command.buffer = new byte[cmdRes.buf_len];
+
+            off += Marshal.SizeOf<AaruResSdhci>();
+        }
+
+        foreach(Device.MmcSingleCommand command in commands)
+        {
+            Array.Copy(buf, off, command.buffer, 0, command.buffer.Length);
+            off += command.buffer.Length;
+        }
+
+        return error;
+    }
+
+    /// <summary>
+    ///     Concatenates a queue of commands to be send to a remote SecureDigital or MultiMediaCard attached to an SDHCI
+    ///     controller, using protocol version 1 without specific support for such a queueing
+    /// </summary>
+    /// <param name="commands">List of commands</param>
+    /// <param name="duration">Duration to execute all commands, in milliseconds</param>
+    /// <param name="sense">Set to <c>true</c> if any of the commands returned an error status, <c>false</c> otherwise</param>
+    /// <param name="timeout">Maximum allowed time to execute a single command</param>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    int SendMultipleMmcCommandsV1(Device.MmcSingleCommand[] commands, out double duration, out bool sense,
+                                  uint timeout)
+    {
+        sense    = false;
+        duration = 0;
+        int error = 0;
+
+        foreach(Device.MmcSingleCommand command in commands)
+        {
+            error = SendMmcCommand(command.command, command.write, command.isApplication, command.flags,
+                                   command.argument, command.blockSize, command.blocks, ref command.buffer,
+                                   out command.response, out double cmdDuration, out bool cmdSense, timeout);
+
+            if(cmdSense)
+                sense = true;
+
+            duration += cmdDuration;
+        }
+
+        return error;
+    }
+
+    /// <summary>Closes then immediately reopens a remote device</summary>
+    /// <returns>Returned error number if any</returns>
+    public bool ReOpen()
+    {
+        if(ServerProtocolVersion < 2)
+            return false;
+
+        var cmdPkt = new AaruPacketCmdReOpen
+        {
+            hdr = new AaruPacketHeader
+            {
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketCmdReOpen>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandReOpenDevice
+            }
+        };
+
+        byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return false;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return false;
+        }
+
+        if(hdr.packetType != AaruPacketType.Nop)
+        {
+            AaruConsole.ErrorWriteLine("Expected NOP Packet, got packet type {0}...", hdr.packetType);
+
+            return false;
+        }
+
+        if(hdr.version != Consts.PACKET_VERSION)
+        {
+            AaruConsole.ErrorWriteLine("Unrecognized packet version...");
+
+            return false;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketNop nop = Marshal.ByteArrayToStructureLittleEndian<AaruPacketNop>(buf);
+
+        switch(nop.reasonCode)
+        {
+            case AaruNopReason.ReOpenOk: return true;
+            case AaruNopReason.CloseError:
+            case AaruNopReason.OpenError:
+                AaruConsole.ErrorWriteLine("ReOpen error closing device...");
+
+                break;
+            default:
+                AaruConsole.ErrorWriteLine("ReOpen error {0} with reason: {1}...", nop.errno, nop.reason);
+
+                break;
+        }
+
+        return false;
+    }
+
+    /// <summary>Reads data using operating system buffers.</summary>
+    /// <param name="buffer">Data buffer</param>
+    /// <param name="offset">Offset in remote device to start reading, in bytes</param>
+    /// <param name="length">Number of bytes to read</param>
+    /// <param name="duration">Total time in milliseconds the reading took</param>
+    /// <returns><c>true</c> if there was an error, <c>false</c> otherwise</returns>
+    public bool BufferedOsRead(out byte[] buffer, long offset, uint length, out double duration)
+    {
+        duration = 0;
+        buffer   = null;
+
+        if(ServerProtocolVersion < 2)
+            return false;
+
+        var cmdPkt = new AaruPacketCmdOsRead
+        {
+            hdr = new AaruPacketHeader
+            {
+                remote_id  = Consts.REMOTE_ID,
+                packet_id  = Consts.PACKET_ID,
+                len        = (uint)Marshal.SizeOf<AaruPacketCmdOsRead>(),
+                version    = Consts.PACKET_VERSION,
+                packetType = AaruPacketType.CommandOsRead
+            },
+            length = length,
+            offset = (ulong)offset
+        };
+
+        byte[] buf = Marshal.StructureToByteArrayLittleEndian(cmdPkt);
+
+        int len = _socket.Send(buf, SocketFlags.None);
+
+        if(len != buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not write to the network...");
+
+            return false;
+        }
+
+        byte[] hdrBuf = new byte[Marshal.SizeOf<AaruPacketHeader>()];
+
+        len = Receive(_socket, hdrBuf, hdrBuf.Length, SocketFlags.Peek);
+
+        if(len < hdrBuf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketHeader hdr = Marshal.ByteArrayToStructureLittleEndian<AaruPacketHeader>(hdrBuf);
+
+        if(hdr.remote_id != Consts.REMOTE_ID ||
+           hdr.packet_id != Consts.PACKET_ID)
+        {
+            AaruConsole.ErrorWriteLine("Received data is not an Aaru Remote Packet...");
+
+            return false;
+        }
+
+        if(hdr.packetType != AaruPacketType.ResponseOsRead)
+        {
+            AaruConsole.ErrorWriteLine("Expected OS Read Response Packet, got packet type {0}...", hdr.packetType);
+
+            return false;
+        }
+
+        if(hdr.version != Consts.PACKET_VERSION)
+        {
+            AaruConsole.ErrorWriteLine("Unrecognized packet version...");
+
+            return false;
+        }
+
+        buf = new byte[hdr.len];
+        len = Receive(_socket, buf, buf.Length, SocketFlags.None);
+
+        if(len < buf.Length)
+        {
+            AaruConsole.ErrorWriteLine("Could not read from the network...");
+
+            return false;
+        }
+
+        AaruPacketResOsRead osRead = Marshal.ByteArrayToStructureLittleEndian<AaruPacketResOsRead>(buf);
+
+        duration = osRead.duration;
+
+        if(osRead.errno != 0)
+        {
+            AaruConsole.ErrorWriteLine("Remote error {0} in OS Read...", osRead.errno);
+
+            return false;
+        }
+
+        buffer = new byte[length];
+        Array.Copy(buf, Marshal.SizeOf<AaruPacketResOsRead>(), buffer, 0, length);
+
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Remote/Structs.cs b/Aaru.Devices/Remote/Structs.cs
index 5276d448a..249d19a48 100644
--- a/Aaru.Devices/Remote/Structs.cs
+++ b/Aaru.Devices/Remote/Structs.cs
@@ -39,583 +39,582 @@ using Aaru.Decoders.ATA;
 // ReSharper disable FieldCanBeMadeReadOnly.Global
 // ReSharper disable IdentifierTypo
 
-namespace Aaru.Devices.Remote
+namespace Aaru.Devices.Remote;
+
+/// <summary>Header for any Aaru remote packet</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketHeader
 {
-    /// <summary>Header for any Aaru remote packet</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketHeader
-    {
-        /// <summary>Unique Aaru packet identifier (primary)</summary>
-        public uint remote_id;
-        /// <summary>Unique Aaru packet identifier (secondary)</summary>
-        public uint packet_id;
-        /// <summary>Packet length</summary>
-        public uint len;
-        /// <summary>Packet version</summary>
-        public byte version;
-        /// <summary>Unique Aaru packet type identifier</summary>
-        public AaruPacketType packetType;
-        /// <summary>Spare for expansion (or alignment)</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-        public readonly byte[] spare;
-    }
+    /// <summary>Unique Aaru packet identifier (primary)</summary>
+    public uint remote_id;
+    /// <summary>Unique Aaru packet identifier (secondary)</summary>
+    public uint packet_id;
+    /// <summary>Packet length</summary>
+    public uint len;
+    /// <summary>Packet version</summary>
+    public byte version;
+    /// <summary>Unique Aaru packet type identifier</summary>
+    public AaruPacketType packetType;
+    /// <summary>Spare for expansion (or alignment)</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+    public readonly byte[] spare;
+}
 
-    /// <summary>Hello packet, identifies a remote initiator with a responder</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketHello
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Application name</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
-        public string application;
-        /// <summary>Application version</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
-        public string version;
-        /// <summary>Maximum supported protocol version</summary>
-        public byte maxProtocol;
-        /// <summary>Spare for expansion (or alignment)</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-        public readonly byte[] spare;
-        /// <summary>Operating system name</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string sysname;
-        /// <summary>Operating system version / release</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string release;
-        /// <summary>Operating system machine / architecture</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string machine;
-    }
+/// <summary>Hello packet, identifies a remote initiator with a responder</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketHello
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Application name</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
+    public string application;
+    /// <summary>Application version</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
+    public string version;
+    /// <summary>Maximum supported protocol version</summary>
+    public byte maxProtocol;
+    /// <summary>Spare for expansion (or alignment)</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+    public readonly byte[] spare;
+    /// <summary>Operating system name</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string sysname;
+    /// <summary>Operating system version / release</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string release;
+    /// <summary>Operating system machine / architecture</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string machine;
+}
 
-    /// <summary>Request a list of device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCommandListDevices
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-    }
+/// <summary>Request a list of device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCommandListDevices
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+}
 
-    /// <summary>Returns the requested list of devices</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public readonly struct AaruPacketResponseListDevices
-    {
-        /// <summary>Packet header</summary>
-        public readonly AaruPacketHeader hdr;
-        /// <summary>How many device descriptors follows this structure in the packet</summary>
-        public readonly ushort devices;
-    }
+/// <summary>Returns the requested list of devices</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public readonly struct AaruPacketResponseListDevices
+{
+    /// <summary>Packet header</summary>
+    public readonly AaruPacketHeader hdr;
+    /// <summary>How many device descriptors follows this structure in the packet</summary>
+    public readonly ushort devices;
+}
 
-    /// <summary>Sends a request or returns a response that requires no intervention or further processing</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketNop
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Reason code</summary>
-        public AaruNopReason reasonCode;
-        /// <summary>Spare for expansion (or alignment)</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-        public readonly byte[] spare;
-        /// <summary>Reason name</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string reason;
-        /// <summary>Operating system error number</summary>
-        public int errno;
-    }
+/// <summary>Sends a request or returns a response that requires no intervention or further processing</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketNop
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Reason code</summary>
+    public AaruNopReason reasonCode;
+    /// <summary>Spare for expansion (or alignment)</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+    public readonly byte[] spare;
+    /// <summary>Reason name</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string reason;
+    /// <summary>Operating system error number</summary>
+    public int errno;
+}
 
-    /// <summary>Requests to open a device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCommandOpenDevice
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Device path</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
-        public string device_path;
-    }
+/// <summary>Requests to open a device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCommandOpenDevice
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Device path</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 1024)]
+    public string device_path;
+}
 
-    /// <summary>
-    ///     Requests remote to send a command to a SCSI device. This header is followed by the CDB and after it comes the
-    ///     buffer.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdScsi
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Length in bytes of the CDB that follows this structure</summary>
-        public uint cdb_len;
-        /// <summary>Length in bytes of the buffer that follows the CDB</summary>
-        public uint buf_len;
-        /// <summary>Direction of SCSI data transfer</summary>
-        public int direction;
-        /// <summary>Timeout waiting for device to respond to command</summary>
-        public uint timeout;
-    }
+/// <summary>
+///     Requests remote to send a command to a SCSI device. This header is followed by the CDB and after it comes the
+///     buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdScsi
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Length in bytes of the CDB that follows this structure</summary>
+    public uint cdb_len;
+    /// <summary>Length in bytes of the buffer that follows the CDB</summary>
+    public uint buf_len;
+    /// <summary>Direction of SCSI data transfer</summary>
+    public int direction;
+    /// <summary>Timeout waiting for device to respond to command</summary>
+    public uint timeout;
+}
 
-    /// <summary>
-    ///     Returns the response from a command sent to a SCSI device. This structure is followed by the buffer containing
-    ///     the REQUEST SENSE response and this is followed by the data buffer.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResScsi
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Size the REQUEST SENSE buffer that follows this structure</summary>
-        public uint sense_len;
-        /// <summary>Length in bytes of the data buffer that follows the sense buffer</summary>
-        public uint buf_len;
-        /// <summary>Time in milliseconds it took for the device to execute the command</summary>
-        public uint duration;
-        /// <summary>Set to anything different of zero if there was a SENSE returned</summary>
-        public uint sense;
-        /// <summary>Set to the remote operating system error number</summary>
-        public uint error_no;
-    }
+/// <summary>
+///     Returns the response from a command sent to a SCSI device. This structure is followed by the buffer containing
+///     the REQUEST SENSE response and this is followed by the data buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResScsi
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Size the REQUEST SENSE buffer that follows this structure</summary>
+    public uint sense_len;
+    /// <summary>Length in bytes of the data buffer that follows the sense buffer</summary>
+    public uint buf_len;
+    /// <summary>Time in milliseconds it took for the device to execute the command</summary>
+    public uint duration;
+    /// <summary>Set to anything different of zero if there was a SENSE returned</summary>
+    public uint sense;
+    /// <summary>Set to the remote operating system error number</summary>
+    public uint error_no;
+}
 
-    /// <summary>
-    ///     Requests remote to send a command to an ATA device using the CHS command set. This header is followed by the
-    ///     data buffer.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdAtaChs
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Length in bytes of the data buffer</summary>
-        public uint buf_len;
-        /// <summary>Registers to set in the ATA device</summary>
-        public AtaRegistersChs registers;
-        /// <summary>ATA protocol code</summary>
-        public byte protocol;
-        /// <summary>ATA transfer register indicator</summary>
-        public byte transferRegister;
-        /// <summary>Set to <c>true</c> to transfer blocks, <c>false</c> to transfer bytes</summary>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool transferBlocks;
-        /// <summary>Spare for expansion (or alignment)</summary>
-        public byte spare;
-        /// <summary>Timeout waiting for device to respond to command</summary>
-        public uint timeout;
-    }
+/// <summary>
+///     Requests remote to send a command to an ATA device using the CHS command set. This header is followed by the
+///     data buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdAtaChs
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Length in bytes of the data buffer</summary>
+    public uint buf_len;
+    /// <summary>Registers to set in the ATA device</summary>
+    public AtaRegistersChs registers;
+    /// <summary>ATA protocol code</summary>
+    public byte protocol;
+    /// <summary>ATA transfer register indicator</summary>
+    public byte transferRegister;
+    /// <summary>Set to <c>true</c> to transfer blocks, <c>false</c> to transfer bytes</summary>
+    [MarshalAs(UnmanagedType.U1)]
+    public bool transferBlocks;
+    /// <summary>Spare for expansion (or alignment)</summary>
+    public byte spare;
+    /// <summary>Timeout waiting for device to respond to command</summary>
+    public uint timeout;
+}
 
-    /// <summary>
-    ///     Returns the response from a command sent to an ATA device using the CHS command set. This structure is
-    ///     followed by the data buffer.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResAtaChs
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Length in bytes of the data buffer</summary>
-        public uint buf_len;
-        /// <summary>Registers as set back by the ATA device</summary>
-        public AtaErrorRegistersChs registers;
-        /// <summary>Time in milliseconds it took for the device to execute the command</summary>
-        public uint duration;
-        /// <summary>Set to anything different of zero if the device set an error condition</summary>
-        public uint sense;
-        /// <summary>Set to the remote operating system error number</summary>
-        public uint error_no;
-    }
+/// <summary>
+///     Returns the response from a command sent to an ATA device using the CHS command set. This structure is
+///     followed by the data buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResAtaChs
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Length in bytes of the data buffer</summary>
+    public uint buf_len;
+    /// <summary>Registers as set back by the ATA device</summary>
+    public AtaErrorRegistersChs registers;
+    /// <summary>Time in milliseconds it took for the device to execute the command</summary>
+    public uint duration;
+    /// <summary>Set to anything different of zero if the device set an error condition</summary>
+    public uint sense;
+    /// <summary>Set to the remote operating system error number</summary>
+    public uint error_no;
+}
 
-    /// <summary>
-    ///     Requests remote to send a command to an ATA device using the 28-bit command set. This header is followed by
-    ///     the data buffer.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdAtaLba28
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Length in bytes of the data buffer</summary>
-        public uint buf_len;
-        /// <summary>Registers to set in the ATA device</summary>
-        public AtaRegistersLba28 registers;
-        /// <summary>ATA protocol code</summary>
-        public byte protocol;
-        /// <summary>ATA transfer register indicator</summary>
-        public byte transferRegister;
-        /// <summary>Set to <c>true</c> to transfer blocks, <c>false</c> to transfer bytes</summary>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool transferBlocks;
-        /// <summary>Spare for expansion (or alignment)</summary>
-        public byte spare;
-        /// <summary>Timeout waiting for device to respond to command</summary>
-        public uint timeout;
-    }
+/// <summary>
+///     Requests remote to send a command to an ATA device using the 28-bit command set. This header is followed by
+///     the data buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdAtaLba28
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Length in bytes of the data buffer</summary>
+    public uint buf_len;
+    /// <summary>Registers to set in the ATA device</summary>
+    public AtaRegistersLba28 registers;
+    /// <summary>ATA protocol code</summary>
+    public byte protocol;
+    /// <summary>ATA transfer register indicator</summary>
+    public byte transferRegister;
+    /// <summary>Set to <c>true</c> to transfer blocks, <c>false</c> to transfer bytes</summary>
+    [MarshalAs(UnmanagedType.U1)]
+    public bool transferBlocks;
+    /// <summary>Spare for expansion (or alignment)</summary>
+    public byte spare;
+    /// <summary>Timeout waiting for device to respond to command</summary>
+    public uint timeout;
+}
 
-    /// <summary>
-    ///     Returns the response from a command sent to an ATA device using the 28-bit LBA command set. This structure is
-    ///     followed by the data buffer.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResAtaLba28
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Length in bytes of the data buffer</summary>
-        public uint buf_len;
-        /// <summary>Registers as set back by the ATA device</summary>
-        public AtaErrorRegistersLba28 registers;
-        /// <summary>Time in milliseconds it took for the device to execute the command</summary>
-        public uint duration;
-        /// <summary>Set to anything different of zero if the device set an error condition</summary>
-        public uint sense;
-        /// <summary>Set to the remote operating system error number</summary>
-        public uint error_no;
-    }
+/// <summary>
+///     Returns the response from a command sent to an ATA device using the 28-bit LBA command set. This structure is
+///     followed by the data buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResAtaLba28
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Length in bytes of the data buffer</summary>
+    public uint buf_len;
+    /// <summary>Registers as set back by the ATA device</summary>
+    public AtaErrorRegistersLba28 registers;
+    /// <summary>Time in milliseconds it took for the device to execute the command</summary>
+    public uint duration;
+    /// <summary>Set to anything different of zero if the device set an error condition</summary>
+    public uint sense;
+    /// <summary>Set to the remote operating system error number</summary>
+    public uint error_no;
+}
 
-    /// <summary>
-    ///     Requests remote to send a command to an ATA device using the 48-bit command set. This header is followed by
-    ///     the data buffer.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdAtaLba48
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Length in bytes of the data buffer</summary>
-        public uint buf_len;
-        /// <summary>Registers to set in the ATA device</summary>
-        public AtaRegistersLba48 registers;
-        /// <summary>ATA protocol code</summary>
-        public byte protocol;
-        /// <summary>ATA transfer register indicator</summary>
-        public byte transferRegister;
-        /// <summary>Set to <c>true</c> to transfer blocks, <c>false</c> to transfer bytes</summary>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool transferBlocks;
-        /// <summary>Spare for expansion (or alignment)</summary>
-        public byte spare;
-        /// <summary>Timeout waiting for device to respond to command</summary>
-        public uint timeout;
-    }
+/// <summary>
+///     Requests remote to send a command to an ATA device using the 48-bit command set. This header is followed by
+///     the data buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdAtaLba48
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Length in bytes of the data buffer</summary>
+    public uint buf_len;
+    /// <summary>Registers to set in the ATA device</summary>
+    public AtaRegistersLba48 registers;
+    /// <summary>ATA protocol code</summary>
+    public byte protocol;
+    /// <summary>ATA transfer register indicator</summary>
+    public byte transferRegister;
+    /// <summary>Set to <c>true</c> to transfer blocks, <c>false</c> to transfer bytes</summary>
+    [MarshalAs(UnmanagedType.U1)]
+    public bool transferBlocks;
+    /// <summary>Spare for expansion (or alignment)</summary>
+    public byte spare;
+    /// <summary>Timeout waiting for device to respond to command</summary>
+    public uint timeout;
+}
 
-    /// <summary>
-    ///     Returns the response from a command sent to an ATA device using the 48-bit LBA command set. This structure is
-    ///     followed by the data buffer.
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResAtaLba48
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Length in bytes of the data buffer</summary>
-        public uint buf_len;
-        /// <summary>Registers as set back by the ATA device</summary>
-        public AtaErrorRegistersLba48 registers;
-        /// <summary>Time in milliseconds it took for the device to execute the command</summary>
-        public uint duration;
-        /// <summary>Set to anything different of zero if the device set an error condition</summary>
-        public uint sense;
-        /// <summary>Set to the remote operating system error number</summary>
-        public uint error_no;
-    }
+/// <summary>
+///     Returns the response from a command sent to an ATA device using the 48-bit LBA command set. This structure is
+///     followed by the data buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResAtaLba48
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Length in bytes of the data buffer</summary>
+    public uint buf_len;
+    /// <summary>Registers as set back by the ATA device</summary>
+    public AtaErrorRegistersLba48 registers;
+    /// <summary>Time in milliseconds it took for the device to execute the command</summary>
+    public uint duration;
+    /// <summary>Set to anything different of zero if the device set an error condition</summary>
+    public uint sense;
+    /// <summary>Set to the remote operating system error number</summary>
+    public uint error_no;
+}
 
+/// <summary>SecureDigital or MultiMediaCard command description</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruCmdSdhci
+{
+    /// <summary>Command</summary>
+    public MmcCommands command;
+    /// <summary>Set to <c>true</c> if the command writes to the device, <c>false</c> otherwise</summary>
+    [MarshalAs(UnmanagedType.U1)]
+    public bool write;
+    /// <summary>Set to <c>true</c> if it is an application command, <c>false</c> otherwise</summary>
+    [MarshalAs(UnmanagedType.U1)]
+    public bool application;
+    /// <summary>Flags</summary>
+    public MmcFlags flags;
+    /// <summary>Argument</summary>
+    public uint argument;
+    /// <summary>Block size</summary>
+    public uint block_size;
+    /// <summary>Number of blocks to transfer</summary>
+    public uint blocks;
+    /// <summary>Length in bytes of the data buffer</summary>
+    public uint buf_len;
+    /// <summary>Timeout waiting for device to respond to command</summary>
+    public uint timeout;
+}
+
+/// <summary>
+///     Requests remote to send a command to a SecureDigital or MultiMediaCard device attached using a SDHCI
+///     controller. This structure is followed by the data buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdSdhci
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
     /// <summary>SecureDigital or MultiMediaCard command description</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruCmdSdhci
-    {
-        /// <summary>Command</summary>
-        public MmcCommands command;
-        /// <summary>Set to <c>true</c> if the command writes to the device, <c>false</c> otherwise</summary>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool write;
-        /// <summary>Set to <c>true</c> if it is an application command, <c>false</c> otherwise</summary>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool application;
-        /// <summary>Flags</summary>
-        public MmcFlags flags;
-        /// <summary>Argument</summary>
-        public uint argument;
-        /// <summary>Block size</summary>
-        public uint block_size;
-        /// <summary>Number of blocks to transfer</summary>
-        public uint blocks;
-        /// <summary>Length in bytes of the data buffer</summary>
-        public uint buf_len;
-        /// <summary>Timeout waiting for device to respond to command</summary>
-        public uint timeout;
-    }
+    public AaruCmdSdhci command;
+}
 
+/// <summary>
+///     Returns the response from a command sent to a SecureDigital or MultiMediaCard device attached to a SDHCI
+///     controller. This structure is followed by the data buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruResSdhci
+{
+    /// <summary>Length in bytes of the data buffer</summary>
+    public uint buf_len;
+
+    /// <summary>Response registers</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+    public uint[] response;
+
+    /// <summary>Time in milliseconds it took for the device to execute the command</summary>
+    public uint duration;
+    /// <summary>Set to anything different of zero if the device set an error condition</summary>
+    public uint sense;
+    /// <summary>Set to the remote operating system error number</summary>
+    public uint error_no;
+}
+
+/// <summary>
+///     Returns the response from a command sent to a SecureDigital or MultiMediaCard device attached to a SDHCI
+///     controller. This structure is followed by the data buffer.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResSdhci
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Response</summary>
+    public AaruResSdhci res;
+}
+
+/// <summary>Requests the Aaru device type for the opened device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdGetDeviceType
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+}
+
+/// <summary>Returns the Aaru device type for the opened device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResGetDeviceType
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Aaru's device type</summary>
+    public DeviceType device_type;
+}
+
+/// <summary>Requests the registers of a SecureDigital or MultiMediaCard attached to an SDHCI controller</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdGetSdhciRegisters
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+}
+
+/// <summary>Returns the registers of a SecureDigital or MultiMediaCard attached to an SDHCI controller</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResGetSdhciRegisters
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
     /// <summary>
-    ///     Requests remote to send a command to a SecureDigital or MultiMediaCard device attached using a SDHCI
-    ///     controller. This structure is followed by the data buffer.
+    ///     <c>true</c> if the device is attached to an SDHCI controller and the rest of the fields on this packet are
+    ///     valid, <c>false</c> otherwise
     /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdSdhci
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>SecureDigital or MultiMediaCard command description</summary>
-        public AaruCmdSdhci command;
-    }
+    [MarshalAs(UnmanagedType.U1)]
+    public bool isSdhci;
+    /// <summary>CSD registers</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+    public byte[] csd;
+    /// <summary>CID registers</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+    public byte[] cid;
+    /// <summary>OCR registers</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+    public byte[] ocr;
+    /// <summary>SCR registers</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+    public byte[] scr;
+    /// <summary>Length of the CSD registers</summary>
+    public uint csd_len;
+    /// <summary>Length of the CID registers</summary>
+    public uint cid_len;
+    /// <summary>Length of the OCR registers</summary>
+    public uint ocr_len;
+    /// <summary>Length of the SCR registers</summary>
+    public uint scr_len;
+}
 
+/// <summary>Requests information about the USB connection of the opened device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdGetUsbData
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+}
+
+/// <summary>Returns information about the USB connection of the opened device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResGetUsbData
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
     /// <summary>
-    ///     Returns the response from a command sent to a SecureDigital or MultiMediaCard device attached to a SDHCI
-    ///     controller. This structure is followed by the data buffer.
+    ///     <c>true</c> if the device is attached using USB and the rest of the fields on this packet are valid,
+    ///     <c>false</c> otherwise
     /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruResSdhci
-    {
-        /// <summary>Length in bytes of the data buffer</summary>
-        public uint buf_len;
+    [MarshalAs(UnmanagedType.U1)]
+    public bool isUsb;
+    /// <summary>Length of the descriptors</summary>
+    public ushort descLen;
+    /// <summary>Raw USB descriptors</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 65536)]
+    public byte[] descriptors;
+    /// <summary>USB vendor ID</summary>
+    public ushort idVendor;
+    /// <summary>USB product ID</summary>
+    public ushort idProduct;
+    /// <summary>USB manufacturer string</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string manufacturer;
+    /// <summary>USB product string</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string product;
+    /// <summary>USB serial number string</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string serial;
+}
 
-        /// <summary>Response registers</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-        public uint[] response;
-
-        /// <summary>Time in milliseconds it took for the device to execute the command</summary>
-        public uint duration;
-        /// <summary>Set to anything different of zero if the device set an error condition</summary>
-        public uint sense;
-        /// <summary>Set to the remote operating system error number</summary>
-        public uint error_no;
-    }
+/// <summary>Requests information about the FireWire connection of the opened device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdGetFireWireData
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+}
 
+/// <summary>Returns information about the FireWire connection of the opened device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResGetFireWireData
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
     /// <summary>
-    ///     Returns the response from a command sent to a SecureDigital or MultiMediaCard device attached to a SDHCI
-    ///     controller. This structure is followed by the data buffer.
+    ///     <c>true</c> if the device is attached using FireWire and the rest of the fields on this packet are valid,
+    ///     <c>false</c> otherwise
     /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResSdhci
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Response</summary>
-        public AaruResSdhci res;
-    }
+    [MarshalAs(UnmanagedType.U1)]
+    public bool isFireWire;
+    /// <summary>FireWire model ID</summary>
+    public uint idModel;
+    /// <summary>FireWire vendor ID</summary>
+    public uint idVendor;
+    /// <summary>FireWire's device GUID</summary>
+    public ulong guid;
+    /// <summary>FireWire vendor string</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string vendor;
+    /// <summary>FireWire model string</summary>
+    [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+    public string model;
+}
 
-    /// <summary>Requests the Aaru device type for the opened device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdGetDeviceType
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-    }
+/// <summary>Requests information about the PCMCIA or CardBus connection of the opened device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdGetPcmciaData
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+}
 
-    /// <summary>Returns the Aaru device type for the opened device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResGetDeviceType
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Aaru's device type</summary>
-        public DeviceType device_type;
-    }
+/// <summary>Returns information about the PCMCIA or CardBus connection of the opened device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResGetPcmciaData
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>
+    ///     <c>true</c> if the device is a PCMCIA or CardBus device and the rest of the fields on this packet are valid,
+    ///     <c>false</c> otherwise
+    /// </summary>
+    [MarshalAs(UnmanagedType.U1)]
+    public bool isPcmcia;
+    /// <summary>CIS buffer length</summary>
+    public ushort cis_len;
+    /// <summary>CIS buffer</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 65536)]
+    public byte[] cis;
+}
 
-    /// <summary>Requests the registers of a SecureDigital or MultiMediaCard attached to an SDHCI controller</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdGetSdhciRegisters
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-    }
+/// <summary>Requests to close the currently opened device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdClose
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+}
 
-    /// <summary>Returns the registers of a SecureDigital or MultiMediaCard attached to an SDHCI controller</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResGetSdhciRegisters
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>
-        ///     <c>true</c> if the device is attached to an SDHCI controller and the rest of the fields on this packet are
-        ///     valid, <c>false</c> otherwise
-        /// </summary>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool isSdhci;
-        /// <summary>CSD registers</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-        public byte[] csd;
-        /// <summary>CID registers</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-        public byte[] cid;
-        /// <summary>OCR registers</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-        public byte[] ocr;
-        /// <summary>SCR registers</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-        public byte[] scr;
-        /// <summary>Length of the CSD registers</summary>
-        public uint csd_len;
-        /// <summary>Length of the CID registers</summary>
-        public uint cid_len;
-        /// <summary>Length of the OCR registers</summary>
-        public uint ocr_len;
-        /// <summary>Length of the SCR registers</summary>
-        public uint scr_len;
-    }
+/// <summary>Requests to know if the remote is running with administrative (aka root) privileges</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdAmIRoot
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+}
 
-    /// <summary>Requests information about the USB connection of the opened device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdGetUsbData
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-    }
+/// <summary>Returns if the remote is running with administrative (aka root) privileges</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResAmIRoot
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Set to any value different of 0 to indicate the remote is running with administrative (aka root) privileges</summary>
+    public uint am_i_root;
+}
 
-    /// <summary>Returns information about the USB connection of the opened device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResGetUsbData
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>
-        ///     <c>true</c> if the device is attached using USB and the rest of the fields on this packet are valid,
-        ///     <c>false</c> otherwise
-        /// </summary>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool isUsb;
-        /// <summary>Length of the descriptors</summary>
-        public ushort descLen;
-        /// <summary>Raw USB descriptors</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 65536)]
-        public byte[] descriptors;
-        /// <summary>USB vendor ID</summary>
-        public ushort idVendor;
-        /// <summary>USB product ID</summary>
-        public ushort idProduct;
-        /// <summary>USB manufacturer string</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string manufacturer;
-        /// <summary>USB product string</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string product;
-        /// <summary>USB serial number string</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string serial;
-    }
+/// <summary>Initiates a multiple command block with the SDHCI controller the SecureDigital or MultiMediaCard is attached</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketMultiCmdSdhci
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>How many commands to queue</summary>
+    public ulong cmd_count;
+}
 
-    /// <summary>Requests information about the FireWire connection of the opened device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdGetFireWireData
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-    }
+/// <summary>Closes and then re-opens the same device</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdReOpen
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+}
 
-    /// <summary>Returns information about the FireWire connection of the opened device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResGetFireWireData
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>
-        ///     <c>true</c> if the device is attached using FireWire and the rest of the fields on this packet are valid,
-        ///     <c>false</c> otherwise
-        /// </summary>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool isFireWire;
-        /// <summary>FireWire model ID</summary>
-        public uint idModel;
-        /// <summary>FireWire vendor ID</summary>
-        public uint idVendor;
-        /// <summary>FireWire's device GUID</summary>
-        public ulong guid;
-        /// <summary>FireWire vendor string</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string vendor;
-        /// <summary>FireWire model string</summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-        public string model;
-    }
+/// <summary>Reads data using operating system buffers</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketCmdOsRead
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Device offset where to read</summary>
+    public ulong offset;
+    /// <summary>Number of bytes to read</summary>
+    public uint length;
+}
 
-    /// <summary>Requests information about the PCMCIA or CardBus connection of the opened device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdGetPcmciaData
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-    }
-
-    /// <summary>Returns information about the PCMCIA or CardBus connection of the opened device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResGetPcmciaData
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>
-        ///     <c>true</c> if the device is a PCMCIA or CardBus device and the rest of the fields on this packet are valid,
-        ///     <c>false</c> otherwise
-        /// </summary>
-        [MarshalAs(UnmanagedType.U1)]
-        public bool isPcmcia;
-        /// <summary>CIS buffer length</summary>
-        public ushort cis_len;
-        /// <summary>CIS buffer</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 65536)]
-        public byte[] cis;
-    }
-
-    /// <summary>Requests to close the currently opened device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdClose
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-    }
-
-    /// <summary>Requests to know if the remote is running with administrative (aka root) privileges</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdAmIRoot
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-    }
-
-    /// <summary>Returns if the remote is running with administrative (aka root) privileges</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResAmIRoot
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Set to any value different of 0 to indicate the remote is running with administrative (aka root) privileges</summary>
-        public uint am_i_root;
-    }
-
-    /// <summary>Initiates a multiple command block with the SDHCI controller the SecureDigital or MultiMediaCard is attached</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketMultiCmdSdhci
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>How many commands to queue</summary>
-        public ulong cmd_count;
-    }
-
-    /// <summary>Closes and then re-opens the same device</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdReOpen
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-    }
-
-    /// <summary>Reads data using operating system buffers</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketCmdOsRead
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Device offset where to read</summary>
-        public ulong offset;
-        /// <summary>Number of bytes to read</summary>
-        public uint length;
-    }
-
-    /// <summary>Returns data read using operating system buffers. This structure is followed by the data buffer.</summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-    public struct AaruPacketResOsRead
-    {
-        /// <summary>Packet header</summary>
-        public AaruPacketHeader hdr;
-        /// <summary>Set to the remote operating system error number</summary>
-        public int errno;
-        /// <summary>Time in milliseconds it took for the device to execute the command</summary>
-        public uint duration;
-    }
+/// <summary>Returns data read using operating system buffers. This structure is followed by the data buffer.</summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+public struct AaruPacketResOsRead
+{
+    /// <summary>Packet header</summary>
+    public AaruPacketHeader hdr;
+    /// <summary>Set to the remote operating system error number</summary>
+    public int errno;
+    /// <summary>Time in milliseconds it took for the device to execute the command</summary>
+    public uint duration;
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Windows/Command.cs b/Aaru.Devices/Windows/Command.cs
index 9c1e395ba..8ffe796b0 100644
--- a/Aaru.Devices/Windows/Command.cs
+++ b/Aaru.Devices/Windows/Command.cs
@@ -37,594 +37,593 @@ using System.Runtime.InteropServices;
 using Aaru.Decoders.ATA;
 using Microsoft.Win32.SafeHandles;
 
-namespace Aaru.Devices.Windows
+namespace Aaru.Devices.Windows;
+
+[SuppressMessage("ReSharper", "UnusedParameter.Global")]
+internal static class Command
 {
-    [SuppressMessage("ReSharper", "UnusedParameter.Global")]
-    internal static class Command
+    /// <summary>Sends a SCSI command</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="cdb">SCSI CDB</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="senseBuffer">Buffer with the SCSI sense</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="direction">SCSI command transfer direction</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense">
+    ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
+    ///     sense
+    /// </param>
+    internal static int SendScsiCommand(SafeFileHandle fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer,
+                                        uint timeout, ScsiIoctlDirection direction, out double duration,
+                                        out bool sense)
     {
-        /// <summary>Sends a SCSI command</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="cdb">SCSI CDB</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="senseBuffer">Buffer with the SCSI sense</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="direction">SCSI command transfer direction</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense">
-        ///     <c>True</c> if SCSI error returned non-OK status and <paramref name="senseBuffer" /> contains SCSI
-        ///     sense
-        /// </param>
-        internal static int SendScsiCommand(SafeFileHandle fd, byte[] cdb, ref byte[] buffer, out byte[] senseBuffer,
-                                            uint timeout, ScsiIoctlDirection direction, out double duration,
-                                            out bool sense)
+        senseBuffer = null;
+        duration    = 0;
+        sense       = false;
+
+        if(buffer == null)
+            return -1;
+
+        var sptdSb = new ScsiPassThroughDirectAndSenseBuffer
         {
-            senseBuffer = null;
-            duration    = 0;
-            sense       = false;
-
-            if(buffer == null)
-                return -1;
-
-            var sptdSb = new ScsiPassThroughDirectAndSenseBuffer
+            SenseBuf = new byte[32],
+            sptd = new ScsiPassThroughDirect
             {
-                SenseBuf = new byte[32],
-                sptd = new ScsiPassThroughDirect
-                {
-                    Cdb                = new byte[16],
-                    CdbLength          = (byte)cdb.Length,
-                    SenseInfoLength    = 32,
-                    DataIn             = direction,
-                    DataTransferLength = (uint)buffer.Length,
-                    TimeOutValue       = timeout,
-                    DataBuffer         = Marshal.AllocHGlobal(buffer.Length)
-                }
-            };
-
-            sptdSb.sptd.Length          = (ushort)Marshal.SizeOf(sptdSb.sptd);
-            sptdSb.sptd.SenseInfoOffset = (uint)Marshal.SizeOf(sptdSb.sptd);
-            Array.Copy(cdb, sptdSb.sptd.Cdb, cdb.Length);
-
-            uint k     = 0;
-            int  error = 0;
-
-            Marshal.Copy(buffer, 0, sptdSb.sptd.DataBuffer, buffer.Length);
-
-            DateTime start = DateTime.Now;
-
-            bool hasError = !Extern.DeviceIoControlScsi(fd, WindowsIoctl.IoctlScsiPassThroughDirect, ref sptdSb,
-                                                        (uint)Marshal.SizeOf(sptdSb), ref sptdSb,
-                                                        (uint)Marshal.SizeOf(sptdSb), ref k, IntPtr.Zero);
-
-            DateTime end = DateTime.Now;
-
-            if(hasError)
-                error = Marshal.GetLastWin32Error();
-
-            Marshal.Copy(sptdSb.sptd.DataBuffer, buffer, 0, buffer.Length);
-
-            sense |= sptdSb.sptd.ScsiStatus != 0;
-
-            senseBuffer = new byte[64];
-            Array.Copy(sptdSb.SenseBuf, senseBuffer, 32);
-
-            duration = (end - start).TotalMilliseconds;
-
-            Marshal.FreeHGlobal(sptdSb.sptd.DataBuffer);
-
-            return error;
-        }
-
-        /// <summary>Sends an ATA command in CHS mode</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
-        /// <param name="registers">Registers to send to drive</param>
-        /// <param name="errorRegisters">Registers returned by drive</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        internal static int SendAtaCommand(SafeFileHandle fd, AtaRegistersChs registers,
-                                           out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
-                                           ref byte[] buffer, uint timeout, out double duration, out bool sense)
-        {
-            duration       = 0;
-            sense          = false;
-            errorRegisters = new AtaErrorRegistersChs();
-
-            if(buffer == null)
-                return -1;
-
-            var aptd = new AtaPassThroughDirect
-            {
-                TimeOutValue       = timeout,
-                DataBuffer         = Marshal.AllocHGlobal(buffer.Length),
-                Length             = (ushort)Marshal.SizeOf(typeof(AtaPassThroughDirect)),
+                Cdb                = new byte[16],
+                CdbLength          = (byte)cdb.Length,
+                SenseInfoLength    = 32,
+                DataIn             = direction,
                 DataTransferLength = (uint)buffer.Length,
-                PreviousTaskFile   = new AtaTaskFile(),
-                CurrentTaskFile = new AtaTaskFile
-                {
-                    Command      = registers.Command,
-                    CylinderHigh = registers.CylinderHigh,
-                    CylinderLow  = registers.CylinderLow,
-                    DeviceHead   = registers.DeviceHead,
-                    Features     = registers.Feature,
-                    SectorCount  = registers.SectorCount,
-                    SectorNumber = registers.Sector
-                }
-            };
-
-            switch(protocol)
-            {
-                case AtaProtocol.PioIn:
-                case AtaProtocol.UDmaIn:
-                case AtaProtocol.Dma:
-                    aptd.AtaFlags = AtaFlags.DataIn;
-
-                    break;
-                case AtaProtocol.PioOut:
-                case AtaProtocol.UDmaOut:
-                    aptd.AtaFlags = AtaFlags.DataOut;
-
-                    break;
-            }
-
-            switch(protocol)
-            {
-                case AtaProtocol.Dma:
-                case AtaProtocol.DmaQueued:
-                case AtaProtocol.FpDma:
-                case AtaProtocol.UDmaIn:
-                case AtaProtocol.UDmaOut:
-                    aptd.AtaFlags |= AtaFlags.Dma;
-
-                    break;
-            }
-
-            // Unknown if needed
-            aptd.AtaFlags |= AtaFlags.DrdyRequired;
-
-            uint k     = 0;
-            int  error = 0;
-
-            Marshal.Copy(buffer, 0, aptd.DataBuffer, buffer.Length);
-
-            DateTime start = DateTime.Now;
-
-            sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThroughDirect, ref aptd,
-                                               (uint)Marshal.SizeOf(aptd), ref aptd, (uint)Marshal.SizeOf(aptd), ref k,
-                                               IntPtr.Zero);
-
-            DateTime end = DateTime.Now;
-
-            if(sense)
-                error = Marshal.GetLastWin32Error();
-
-            Marshal.Copy(aptd.DataBuffer, buffer, 0, buffer.Length);
-
-            duration = (end - start).TotalMilliseconds;
-
-            errorRegisters.CylinderHigh = aptd.CurrentTaskFile.CylinderHigh;
-            errorRegisters.CylinderLow  = aptd.CurrentTaskFile.CylinderLow;
-            errorRegisters.DeviceHead   = aptd.CurrentTaskFile.DeviceHead;
-            errorRegisters.Error        = aptd.CurrentTaskFile.Error;
-            errorRegisters.Sector       = aptd.CurrentTaskFile.SectorNumber;
-            errorRegisters.SectorCount  = aptd.CurrentTaskFile.SectorCount;
-            errorRegisters.Status       = aptd.CurrentTaskFile.Status;
-
-            sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
-
-            Marshal.FreeHGlobal(aptd.DataBuffer);
-
-            return error;
-        }
-
-        /// <summary>Sends an ATA command in 28-bit LBA mode</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
-        /// <param name="registers">Registers to send to drive</param>
-        /// <param name="errorRegisters">Registers returned by drive</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        internal static int SendAtaCommand(SafeFileHandle fd, AtaRegistersLba28 registers,
-                                           out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
-                                           ref byte[] buffer, uint timeout, out double duration, out bool sense)
-        {
-            duration       = 0;
-            sense          = false;
-            errorRegisters = new AtaErrorRegistersLba28();
-
-            if(buffer == null)
-                return -1;
-
-            var aptd = new AtaPassThroughDirect
-            {
                 TimeOutValue       = timeout,
-                DataBuffer         = Marshal.AllocHGlobal(buffer.Length),
-                Length             = (ushort)Marshal.SizeOf(typeof(AtaPassThroughDirect)),
-                DataTransferLength = (uint)buffer.Length,
-                PreviousTaskFile   = new AtaTaskFile(),
-                CurrentTaskFile = new AtaTaskFile
-                {
-                    Command      = registers.Command,
-                    CylinderHigh = registers.LbaHigh,
-                    CylinderLow  = registers.LbaMid,
-                    DeviceHead   = registers.DeviceHead,
-                    Features     = registers.Feature,
-                    SectorCount  = registers.SectorCount,
-                    SectorNumber = registers.LbaLow
-                }
-            };
-
-            switch(protocol)
-            {
-                case AtaProtocol.PioIn:
-                case AtaProtocol.UDmaIn:
-                case AtaProtocol.Dma:
-                    aptd.AtaFlags = AtaFlags.DataIn;
-
-                    break;
-                case AtaProtocol.PioOut:
-                case AtaProtocol.UDmaOut:
-                    aptd.AtaFlags = AtaFlags.DataOut;
-
-                    break;
+                DataBuffer         = Marshal.AllocHGlobal(buffer.Length)
             }
+        };
 
-            switch(protocol)
+        sptdSb.sptd.Length          = (ushort)Marshal.SizeOf(sptdSb.sptd);
+        sptdSb.sptd.SenseInfoOffset = (uint)Marshal.SizeOf(sptdSb.sptd);
+        Array.Copy(cdb, sptdSb.sptd.Cdb, cdb.Length);
+
+        uint k     = 0;
+        int  error = 0;
+
+        Marshal.Copy(buffer, 0, sptdSb.sptd.DataBuffer, buffer.Length);
+
+        DateTime start = DateTime.Now;
+
+        bool hasError = !Extern.DeviceIoControlScsi(fd, WindowsIoctl.IoctlScsiPassThroughDirect, ref sptdSb,
+                                                    (uint)Marshal.SizeOf(sptdSb), ref sptdSb,
+                                                    (uint)Marshal.SizeOf(sptdSb), ref k, IntPtr.Zero);
+
+        DateTime end = DateTime.Now;
+
+        if(hasError)
+            error = Marshal.GetLastWin32Error();
+
+        Marshal.Copy(sptdSb.sptd.DataBuffer, buffer, 0, buffer.Length);
+
+        sense |= sptdSb.sptd.ScsiStatus != 0;
+
+        senseBuffer = new byte[64];
+        Array.Copy(sptdSb.SenseBuf, senseBuffer, 32);
+
+        duration = (end - start).TotalMilliseconds;
+
+        Marshal.FreeHGlobal(sptdSb.sptd.DataBuffer);
+
+        return error;
+    }
+
+    /// <summary>Sends an ATA command in CHS mode</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
+    /// <param name="registers">Registers to send to drive</param>
+    /// <param name="errorRegisters">Registers returned by drive</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    internal static int SendAtaCommand(SafeFileHandle fd, AtaRegistersChs registers,
+                                       out AtaErrorRegistersChs errorRegisters, AtaProtocol protocol,
+                                       ref byte[] buffer, uint timeout, out double duration, out bool sense)
+    {
+        duration       = 0;
+        sense          = false;
+        errorRegisters = new AtaErrorRegistersChs();
+
+        if(buffer == null)
+            return -1;
+
+        var aptd = new AtaPassThroughDirect
+        {
+            TimeOutValue       = timeout,
+            DataBuffer         = Marshal.AllocHGlobal(buffer.Length),
+            Length             = (ushort)Marshal.SizeOf(typeof(AtaPassThroughDirect)),
+            DataTransferLength = (uint)buffer.Length,
+            PreviousTaskFile   = new AtaTaskFile(),
+            CurrentTaskFile = new AtaTaskFile
             {
-                case AtaProtocol.Dma:
-                case AtaProtocol.DmaQueued:
-                case AtaProtocol.FpDma:
-                case AtaProtocol.UDmaIn:
-                case AtaProtocol.UDmaOut:
-                    aptd.AtaFlags |= AtaFlags.Dma;
-
-                    break;
+                Command      = registers.Command,
+                CylinderHigh = registers.CylinderHigh,
+                CylinderLow  = registers.CylinderLow,
+                DeviceHead   = registers.DeviceHead,
+                Features     = registers.Feature,
+                SectorCount  = registers.SectorCount,
+                SectorNumber = registers.Sector
             }
+        };
 
-            // Unknown if needed
-            aptd.AtaFlags |= AtaFlags.DrdyRequired;
+        switch(protocol)
+        {
+            case AtaProtocol.PioIn:
+            case AtaProtocol.UDmaIn:
+            case AtaProtocol.Dma:
+                aptd.AtaFlags = AtaFlags.DataIn;
 
-            uint k     = 0;
-            int  error = 0;
+                break;
+            case AtaProtocol.PioOut:
+            case AtaProtocol.UDmaOut:
+                aptd.AtaFlags = AtaFlags.DataOut;
 
-            Marshal.Copy(buffer, 0, aptd.DataBuffer, buffer.Length);
+                break;
+        }
 
-            DateTime start = DateTime.Now;
+        switch(protocol)
+        {
+            case AtaProtocol.Dma:
+            case AtaProtocol.DmaQueued:
+            case AtaProtocol.FpDma:
+            case AtaProtocol.UDmaIn:
+            case AtaProtocol.UDmaOut:
+                aptd.AtaFlags |= AtaFlags.Dma;
 
-            sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThroughDirect, ref aptd,
-                                               (uint)Marshal.SizeOf(aptd), ref aptd, (uint)Marshal.SizeOf(aptd), ref k,
-                                               IntPtr.Zero);
+                break;
+        }
 
-            DateTime end = DateTime.Now;
+        // Unknown if needed
+        aptd.AtaFlags |= AtaFlags.DrdyRequired;
 
-            if(sense)
-                error = Marshal.GetLastWin32Error();
+        uint k     = 0;
+        int  error = 0;
 
-            Marshal.Copy(aptd.DataBuffer, buffer, 0, buffer.Length);
+        Marshal.Copy(buffer, 0, aptd.DataBuffer, buffer.Length);
 
+        DateTime start = DateTime.Now;
+
+        sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThroughDirect, ref aptd,
+                                           (uint)Marshal.SizeOf(aptd), ref aptd, (uint)Marshal.SizeOf(aptd), ref k,
+                                           IntPtr.Zero);
+
+        DateTime end = DateTime.Now;
+
+        if(sense)
+            error = Marshal.GetLastWin32Error();
+
+        Marshal.Copy(aptd.DataBuffer, buffer, 0, buffer.Length);
+
+        duration = (end - start).TotalMilliseconds;
+
+        errorRegisters.CylinderHigh = aptd.CurrentTaskFile.CylinderHigh;
+        errorRegisters.CylinderLow  = aptd.CurrentTaskFile.CylinderLow;
+        errorRegisters.DeviceHead   = aptd.CurrentTaskFile.DeviceHead;
+        errorRegisters.Error        = aptd.CurrentTaskFile.Error;
+        errorRegisters.Sector       = aptd.CurrentTaskFile.SectorNumber;
+        errorRegisters.SectorCount  = aptd.CurrentTaskFile.SectorCount;
+        errorRegisters.Status       = aptd.CurrentTaskFile.Status;
+
+        sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
+
+        Marshal.FreeHGlobal(aptd.DataBuffer);
+
+        return error;
+    }
+
+    /// <summary>Sends an ATA command in 28-bit LBA mode</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
+    /// <param name="registers">Registers to send to drive</param>
+    /// <param name="errorRegisters">Registers returned by drive</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    internal static int SendAtaCommand(SafeFileHandle fd, AtaRegistersLba28 registers,
+                                       out AtaErrorRegistersLba28 errorRegisters, AtaProtocol protocol,
+                                       ref byte[] buffer, uint timeout, out double duration, out bool sense)
+    {
+        duration       = 0;
+        sense          = false;
+        errorRegisters = new AtaErrorRegistersLba28();
+
+        if(buffer == null)
+            return -1;
+
+        var aptd = new AtaPassThroughDirect
+        {
+            TimeOutValue       = timeout,
+            DataBuffer         = Marshal.AllocHGlobal(buffer.Length),
+            Length             = (ushort)Marshal.SizeOf(typeof(AtaPassThroughDirect)),
+            DataTransferLength = (uint)buffer.Length,
+            PreviousTaskFile   = new AtaTaskFile(),
+            CurrentTaskFile = new AtaTaskFile
+            {
+                Command      = registers.Command,
+                CylinderHigh = registers.LbaHigh,
+                CylinderLow  = registers.LbaMid,
+                DeviceHead   = registers.DeviceHead,
+                Features     = registers.Feature,
+                SectorCount  = registers.SectorCount,
+                SectorNumber = registers.LbaLow
+            }
+        };
+
+        switch(protocol)
+        {
+            case AtaProtocol.PioIn:
+            case AtaProtocol.UDmaIn:
+            case AtaProtocol.Dma:
+                aptd.AtaFlags = AtaFlags.DataIn;
+
+                break;
+            case AtaProtocol.PioOut:
+            case AtaProtocol.UDmaOut:
+                aptd.AtaFlags = AtaFlags.DataOut;
+
+                break;
+        }
+
+        switch(protocol)
+        {
+            case AtaProtocol.Dma:
+            case AtaProtocol.DmaQueued:
+            case AtaProtocol.FpDma:
+            case AtaProtocol.UDmaIn:
+            case AtaProtocol.UDmaOut:
+                aptd.AtaFlags |= AtaFlags.Dma;
+
+                break;
+        }
+
+        // Unknown if needed
+        aptd.AtaFlags |= AtaFlags.DrdyRequired;
+
+        uint k     = 0;
+        int  error = 0;
+
+        Marshal.Copy(buffer, 0, aptd.DataBuffer, buffer.Length);
+
+        DateTime start = DateTime.Now;
+
+        sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThroughDirect, ref aptd,
+                                           (uint)Marshal.SizeOf(aptd), ref aptd, (uint)Marshal.SizeOf(aptd), ref k,
+                                           IntPtr.Zero);
+
+        DateTime end = DateTime.Now;
+
+        if(sense)
+            error = Marshal.GetLastWin32Error();
+
+        Marshal.Copy(aptd.DataBuffer, buffer, 0, buffer.Length);
+
+        duration = (end - start).TotalMilliseconds;
+
+        errorRegisters.LbaHigh     = aptd.CurrentTaskFile.CylinderHigh;
+        errorRegisters.LbaMid      = aptd.CurrentTaskFile.CylinderLow;
+        errorRegisters.DeviceHead  = aptd.CurrentTaskFile.DeviceHead;
+        errorRegisters.Error       = aptd.CurrentTaskFile.Error;
+        errorRegisters.LbaLow      = aptd.CurrentTaskFile.SectorNumber;
+        errorRegisters.SectorCount = aptd.CurrentTaskFile.SectorCount;
+        errorRegisters.Status      = aptd.CurrentTaskFile.Status;
+
+        sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
+
+        Marshal.FreeHGlobal(aptd.DataBuffer);
+
+        return error;
+    }
+
+    /// <summary>Sends an ATA command in 48-bit LBA mode</summary>
+    /// <returns>0 if no error occurred, otherwise, errno</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="buffer">Buffer for SCSI command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
+    /// <param name="registers">Registers to send to drive</param>
+    /// <param name="errorRegisters">Registers returned by drive</param>
+    /// <param name="protocol">ATA protocol to use</param>
+    internal static int SendAtaCommand(SafeFileHandle fd, AtaRegistersLba48 registers,
+                                       out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
+                                       ref byte[] buffer, uint timeout, out double duration, out bool sense)
+    {
+        duration       = 0;
+        sense          = false;
+        errorRegisters = new AtaErrorRegistersLba48();
+
+        if(buffer == null)
+            return -1;
+
+        var aptd = new AtaPassThroughDirect
+        {
+            TimeOutValue       = timeout,
+            DataBuffer         = Marshal.AllocHGlobal(buffer.Length),
+            Length             = (ushort)Marshal.SizeOf(typeof(AtaPassThroughDirect)),
+            DataTransferLength = (uint)buffer.Length,
+            PreviousTaskFile = new AtaTaskFile
+            {
+                CylinderHigh = registers.LbaHighPrevious,
+                CylinderLow  = registers.LbaMidPrevious,
+                Features     = (byte)((registers.Feature     & 0xFF00) >> 8),
+                SectorCount  = (byte)((registers.SectorCount & 0xFF00) >> 8),
+                SectorNumber = registers.LbaLowPrevious
+            },
+            CurrentTaskFile = new AtaTaskFile
+            {
+                Command      = registers.Command,
+                CylinderHigh = registers.LbaHighCurrent,
+                CylinderLow  = registers.LbaMidCurrent,
+                DeviceHead   = registers.DeviceHead,
+                Features     = (byte)(registers.Feature     & 0xFF),
+                SectorCount  = (byte)(registers.SectorCount & 0xFF),
+                SectorNumber = registers.LbaLowCurrent
+            }
+        };
+
+        switch(protocol)
+        {
+            case AtaProtocol.PioIn:
+            case AtaProtocol.UDmaIn:
+            case AtaProtocol.Dma:
+                aptd.AtaFlags = AtaFlags.DataIn;
+
+                break;
+            case AtaProtocol.PioOut:
+            case AtaProtocol.UDmaOut:
+                aptd.AtaFlags = AtaFlags.DataOut;
+
+                break;
+        }
+
+        switch(protocol)
+        {
+            case AtaProtocol.Dma:
+            case AtaProtocol.DmaQueued:
+            case AtaProtocol.FpDma:
+            case AtaProtocol.UDmaIn:
+            case AtaProtocol.UDmaOut:
+                aptd.AtaFlags |= AtaFlags.Dma;
+
+                break;
+        }
+
+        aptd.AtaFlags |= AtaFlags.ExtendedCommand;
+
+        // Unknown if needed
+        aptd.AtaFlags |= AtaFlags.DrdyRequired;
+
+        uint k     = 0;
+        int  error = 0;
+
+        Marshal.Copy(buffer, 0, aptd.DataBuffer, buffer.Length);
+
+        DateTime start = DateTime.Now;
+
+        sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThroughDirect, ref aptd,
+                                           (uint)Marshal.SizeOf(aptd), ref aptd, (uint)Marshal.SizeOf(aptd), ref k,
+                                           IntPtr.Zero);
+
+        DateTime end = DateTime.Now;
+
+        if(sense)
+            error = Marshal.GetLastWin32Error();
+
+        Marshal.Copy(aptd.DataBuffer, buffer, 0, buffer.Length);
+
+        duration = (end - start).TotalMilliseconds;
+
+        errorRegisters.SectorCount = (ushort)((aptd.PreviousTaskFile.SectorCount << 8) +
+                                              aptd.CurrentTaskFile.SectorCount);
+
+        errorRegisters.LbaLowPrevious  = aptd.PreviousTaskFile.SectorNumber;
+        errorRegisters.LbaMidPrevious  = aptd.PreviousTaskFile.CylinderLow;
+        errorRegisters.LbaHighPrevious = aptd.PreviousTaskFile.CylinderHigh;
+        errorRegisters.LbaLowCurrent   = aptd.CurrentTaskFile.SectorNumber;
+        errorRegisters.LbaMidCurrent   = aptd.CurrentTaskFile.CylinderLow;
+        errorRegisters.LbaHighCurrent  = aptd.CurrentTaskFile.CylinderHigh;
+        errorRegisters.DeviceHead      = aptd.CurrentTaskFile.DeviceHead;
+        errorRegisters.Error           = aptd.CurrentTaskFile.Error;
+        errorRegisters.Status          = aptd.CurrentTaskFile.Status;
+
+        sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
+
+        Marshal.FreeHGlobal(aptd.DataBuffer);
+
+        return error;
+    }
+
+    /// <summary>Returns true if the specified handle is controlled by a SFFDISK (aka SDHCI) driver</summary>
+    /// <param name="fd">Device handle</param>
+    /// <returns><c>true</c> if SDHCI, false otherwise</returns>
+    internal static bool IsSdhci(SafeFileHandle fd)
+    {
+        var queryData1 = new SffdiskQueryDeviceProtocolData();
+        queryData1.size = (ushort)Marshal.SizeOf(queryData1);
+
+        Extern.DeviceIoControl(fd, WindowsIoctl.IoctlSffdiskQueryDeviceProtocol, IntPtr.Zero, 0, ref queryData1,
+                               queryData1.size, out _, IntPtr.Zero);
+
+        return queryData1.protocolGuid.Equals(Consts.GuidSffProtocolSd) ||
+               queryData1.protocolGuid.Equals(Consts.GuidSffProtocolMmc);
+    }
+
+    /// <summary>Sends a MMC/SD command</summary>
+    /// <returns>The result of the command.</returns>
+    /// <param name="fd">File handle</param>
+    /// <param name="command">MMC/SD opcode</param>
+    /// <param name="buffer">Buffer for MMC/SD command response</param>
+    /// <param name="timeout">Timeout in seconds</param>
+    /// <param name="duration">Time it took to execute the command in milliseconds</param>
+    /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
+    /// <param name="write"><c>True</c> if data is sent from host to card</param>
+    /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
+    /// <param name="flags">Flags indicating kind and place of response</param>
+    /// <param name="blocks">How many blocks to transfer</param>
+    /// <param name="argument">Command argument</param>
+    /// <param name="response">Response registers</param>
+    /// <param name="blockSize">Size of block in bytes</param>
+    internal static int SendMmcCommand(SafeFileHandle fd, MmcCommands command, bool write, bool isApplication,
+                                       MmcFlags flags, uint argument, uint blockSize, uint blocks,
+                                       ref byte[] buffer, out uint[] response, out double duration, out bool sense,
+                                       uint timeout = 0)
+    {
+        var commandData       = new SffdiskDeviceCommandData();
+        var commandDescriptor = new SdCmdDescriptor();
+        commandData.size                    = (ushort)Marshal.SizeOf(commandData);
+        commandData.command                 = SffdiskDcmd.DeviceCommand;
+        commandData.protocolArgumentSize    = (ushort)Marshal.SizeOf(commandDescriptor);
+        commandData.deviceDataBufferSize    = blockSize * blocks;
+        commandDescriptor.commandCode       = (byte)command;
+        commandDescriptor.cmdClass          = isApplication ? SdCommandClass.AppCmd : SdCommandClass.Standard;
+        commandDescriptor.transferDirection = write ? SdTransferDirection.Write : SdTransferDirection.Read;
+
+        commandDescriptor.transferType = flags.HasFlag(MmcFlags.CommandAdtc)
+                                             ? command == MmcCommands.ReadMultipleBlock
+                                                   ? SdTransferType.MultiBlock
+                                                   : SdTransferType.SingleBlock : SdTransferType.CmdOnly;
+
+        commandDescriptor.responseType = 0;
+
+        if(flags.HasFlag(MmcFlags.ResponseR1) ||
+           flags.HasFlag(MmcFlags.ResponseSpiR1))
+            commandDescriptor.responseType = SdResponseType.R1;
+
+        if(flags.HasFlag(MmcFlags.ResponseR1B) ||
+           flags.HasFlag(MmcFlags.ResponseSpiR1B))
+            commandDescriptor.responseType = SdResponseType.R1b;
+
+        if(flags.HasFlag(MmcFlags.ResponseR2) ||
+           flags.HasFlag(MmcFlags.ResponseSpiR2))
+            commandDescriptor.responseType = SdResponseType.R2;
+
+        if(flags.HasFlag(MmcFlags.ResponseR3) ||
+           flags.HasFlag(MmcFlags.ResponseSpiR3))
+            commandDescriptor.responseType = SdResponseType.R3;
+
+        if(flags.HasFlag(MmcFlags.ResponseR4) ||
+           flags.HasFlag(MmcFlags.ResponseSpiR4))
+            commandDescriptor.responseType = SdResponseType.R4;
+
+        if(flags.HasFlag(MmcFlags.ResponseR5) ||
+           flags.HasFlag(MmcFlags.ResponseSpiR5))
+            commandDescriptor.responseType = SdResponseType.R5;
+
+        if(flags.HasFlag(MmcFlags.ResponseR6))
+            commandDescriptor.responseType = SdResponseType.R6;
+
+        byte[] commandB = new byte[commandData.size + commandData.protocolArgumentSize +
+                                   commandData.deviceDataBufferSize];
+
+        Array.Copy(buffer, 0, commandB, commandData.size + commandData.protocolArgumentSize, buffer.Length);
+        IntPtr hBuf = Marshal.AllocHGlobal(commandB.Length);
+        Marshal.StructureToPtr(commandData, hBuf, true);
+        var descriptorOffset = IntPtr.Add(hBuf, commandData.size);
+        Marshal.StructureToPtr(commandDescriptor, descriptorOffset, true);
+        Marshal.Copy(hBuf, commandB, 0, commandB.Length);
+        Marshal.FreeHGlobal(hBuf);
+
+        int      error = 0;
+        DateTime start = DateTime.Now;
+
+        sense = !Extern.DeviceIoControl(fd, WindowsIoctl.IoctlSffdiskDeviceCommand, commandB, (uint)commandB.Length,
+                                        commandB, (uint)commandB.Length, out _, IntPtr.Zero);
+
+        DateTime end = DateTime.Now;
+
+        if(sense)
+            error = Marshal.GetLastWin32Error();
+
+        buffer = new byte[blockSize * blocks];
+        Buffer.BlockCopy(commandB, commandB.Length - buffer.Length, buffer, 0, buffer.Length);
+
+        response = new uint[4];
+        duration = (end - start).TotalMilliseconds;
+
+        return error;
+    }
+
+    internal static int SendMultipleMmcCommands(SafeFileHandle fd, Device.MmcSingleCommand[] commands,
+                                                out double duration, out bool sense, uint timeout = 0)
+    {
+        int error = 0;
+        duration = 0;
+        sense    = false;
+
+        if(commands.Length     == 3                             &&
+           commands[0].command == MmcCommands.SetBlocklen       &&
+           commands[1].command == MmcCommands.ReadMultipleBlock &&
+           commands[2].command == MmcCommands.StopTransmission)
+            return SendMmcCommand(fd, commands[1].command, commands[1].write, commands[1].isApplication,
+                                  commands[1].flags, commands[1].argument, commands[1].blockSize,
+                                  commands[1].blocks, ref commands[1].buffer, out commands[1].response,
+                                  out duration, out sense, timeout);
+
+        foreach(Device.MmcSingleCommand command in commands)
+        {
+            int singleError = SendMmcCommand(fd, command.command, command.write, command.isApplication,
+                                             command.flags, command.argument, command.blockSize, command.blocks,
+                                             ref command.buffer, out command.response, out double cmdDuration,
+                                             out bool cmdSense, timeout);
+
+            if(error       == 0 &&
+               singleError != 0)
+                error = singleError;
+
+            duration += cmdDuration;
+
+            if(cmdSense)
+                sense = true;
+        }
+
+        return error;
+    }
+
+    internal static int ReOpen(string devicePath, SafeFileHandle fd, out object newFd)
+    {
+        Extern.CloseHandle(fd);
+
+        newFd = Extern.CreateFile(devicePath, FileAccess.GenericRead | FileAccess.GenericWrite,
+                                  FileShare.Read | FileShare.Write, IntPtr.Zero, FileMode.OpenExisting,
+                                  FileAttributes.Normal, IntPtr.Zero);
+
+        return ((SafeFileHandle)newFd).IsInvalid ? Marshal.GetLastWin32Error() : 0;
+    }
+
+    internal static int BufferedOsRead(SafeFileHandle fd, out byte[] buffer, long offset, uint length,
+                                       out double duration)
+    {
+        buffer = new byte[length];
+
+        DateTime start = DateTime.Now;
+
+        bool sense = !Extern.SetFilePointerEx(fd, offset, out _, MoveMethod.Begin);
+
+        DateTime end = DateTime.Now;
+
+        if(sense)
+        {
             duration = (end - start).TotalMilliseconds;
 
-            errorRegisters.LbaHigh     = aptd.CurrentTaskFile.CylinderHigh;
-            errorRegisters.LbaMid      = aptd.CurrentTaskFile.CylinderLow;
-            errorRegisters.DeviceHead  = aptd.CurrentTaskFile.DeviceHead;
-            errorRegisters.Error       = aptd.CurrentTaskFile.Error;
-            errorRegisters.LbaLow      = aptd.CurrentTaskFile.SectorNumber;
-            errorRegisters.SectorCount = aptd.CurrentTaskFile.SectorCount;
-            errorRegisters.Status      = aptd.CurrentTaskFile.Status;
-
-            sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
-
-            Marshal.FreeHGlobal(aptd.DataBuffer);
-
-            return error;
+            return Marshal.GetLastWin32Error();
         }
 
-        /// <summary>Sends an ATA command in 48-bit LBA mode</summary>
-        /// <returns>0 if no error occurred, otherwise, errno</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="buffer">Buffer for SCSI command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if ATA error returned non-OK status</param>
-        /// <param name="registers">Registers to send to drive</param>
-        /// <param name="errorRegisters">Registers returned by drive</param>
-        /// <param name="protocol">ATA protocol to use</param>
-        internal static int SendAtaCommand(SafeFileHandle fd, AtaRegistersLba48 registers,
-                                           out AtaErrorRegistersLba48 errorRegisters, AtaProtocol protocol,
-                                           ref byte[] buffer, uint timeout, out double duration, out bool sense)
-        {
-            duration       = 0;
-            sense          = false;
-            errorRegisters = new AtaErrorRegistersLba48();
+        sense = !Extern.ReadFile(fd, buffer, length, out _, IntPtr.Zero);
 
-            if(buffer == null)
-                return -1;
+        end      = DateTime.Now;
+        duration = (end - start).TotalMilliseconds;
 
-            var aptd = new AtaPassThroughDirect
-            {
-                TimeOutValue       = timeout,
-                DataBuffer         = Marshal.AllocHGlobal(buffer.Length),
-                Length             = (ushort)Marshal.SizeOf(typeof(AtaPassThroughDirect)),
-                DataTransferLength = (uint)buffer.Length,
-                PreviousTaskFile = new AtaTaskFile
-                {
-                    CylinderHigh = registers.LbaHighPrevious,
-                    CylinderLow  = registers.LbaMidPrevious,
-                    Features     = (byte)((registers.Feature     & 0xFF00) >> 8),
-                    SectorCount  = (byte)((registers.SectorCount & 0xFF00) >> 8),
-                    SectorNumber = registers.LbaLowPrevious
-                },
-                CurrentTaskFile = new AtaTaskFile
-                {
-                    Command      = registers.Command,
-                    CylinderHigh = registers.LbaHighCurrent,
-                    CylinderLow  = registers.LbaMidCurrent,
-                    DeviceHead   = registers.DeviceHead,
-                    Features     = (byte)(registers.Feature     & 0xFF),
-                    SectorCount  = (byte)(registers.SectorCount & 0xFF),
-                    SectorNumber = registers.LbaLowCurrent
-                }
-            };
-
-            switch(protocol)
-            {
-                case AtaProtocol.PioIn:
-                case AtaProtocol.UDmaIn:
-                case AtaProtocol.Dma:
-                    aptd.AtaFlags = AtaFlags.DataIn;
-
-                    break;
-                case AtaProtocol.PioOut:
-                case AtaProtocol.UDmaOut:
-                    aptd.AtaFlags = AtaFlags.DataOut;
-
-                    break;
-            }
-
-            switch(protocol)
-            {
-                case AtaProtocol.Dma:
-                case AtaProtocol.DmaQueued:
-                case AtaProtocol.FpDma:
-                case AtaProtocol.UDmaIn:
-                case AtaProtocol.UDmaOut:
-                    aptd.AtaFlags |= AtaFlags.Dma;
-
-                    break;
-            }
-
-            aptd.AtaFlags |= AtaFlags.ExtendedCommand;
-
-            // Unknown if needed
-            aptd.AtaFlags |= AtaFlags.DrdyRequired;
-
-            uint k     = 0;
-            int  error = 0;
-
-            Marshal.Copy(buffer, 0, aptd.DataBuffer, buffer.Length);
-
-            DateTime start = DateTime.Now;
-
-            sense = !Extern.DeviceIoControlAta(fd, WindowsIoctl.IoctlAtaPassThroughDirect, ref aptd,
-                                               (uint)Marshal.SizeOf(aptd), ref aptd, (uint)Marshal.SizeOf(aptd), ref k,
-                                               IntPtr.Zero);
-
-            DateTime end = DateTime.Now;
-
-            if(sense)
-                error = Marshal.GetLastWin32Error();
-
-            Marshal.Copy(aptd.DataBuffer, buffer, 0, buffer.Length);
-
-            duration = (end - start).TotalMilliseconds;
-
-            errorRegisters.SectorCount = (ushort)((aptd.PreviousTaskFile.SectorCount << 8) +
-                                                  aptd.CurrentTaskFile.SectorCount);
-
-            errorRegisters.LbaLowPrevious  = aptd.PreviousTaskFile.SectorNumber;
-            errorRegisters.LbaMidPrevious  = aptd.PreviousTaskFile.CylinderLow;
-            errorRegisters.LbaHighPrevious = aptd.PreviousTaskFile.CylinderHigh;
-            errorRegisters.LbaLowCurrent   = aptd.CurrentTaskFile.SectorNumber;
-            errorRegisters.LbaMidCurrent   = aptd.CurrentTaskFile.CylinderLow;
-            errorRegisters.LbaHighCurrent  = aptd.CurrentTaskFile.CylinderHigh;
-            errorRegisters.DeviceHead      = aptd.CurrentTaskFile.DeviceHead;
-            errorRegisters.Error           = aptd.CurrentTaskFile.Error;
-            errorRegisters.Status          = aptd.CurrentTaskFile.Status;
-
-            sense = errorRegisters.Error != 0 || (errorRegisters.Status & 0xA5) != 0;
-
-            Marshal.FreeHGlobal(aptd.DataBuffer);
-
-            return error;
-        }
-
-        /// <summary>Returns true if the specified handle is controlled by a SFFDISK (aka SDHCI) driver</summary>
-        /// <param name="fd">Device handle</param>
-        /// <returns><c>true</c> if SDHCI, false otherwise</returns>
-        internal static bool IsSdhci(SafeFileHandle fd)
-        {
-            var queryData1 = new SffdiskQueryDeviceProtocolData();
-            queryData1.size = (ushort)Marshal.SizeOf(queryData1);
-
-            Extern.DeviceIoControl(fd, WindowsIoctl.IoctlSffdiskQueryDeviceProtocol, IntPtr.Zero, 0, ref queryData1,
-                                   queryData1.size, out _, IntPtr.Zero);
-
-            return queryData1.protocolGuid.Equals(Consts.GuidSffProtocolSd) ||
-                   queryData1.protocolGuid.Equals(Consts.GuidSffProtocolMmc);
-        }
-
-        /// <summary>Sends a MMC/SD command</summary>
-        /// <returns>The result of the command.</returns>
-        /// <param name="fd">File handle</param>
-        /// <param name="command">MMC/SD opcode</param>
-        /// <param name="buffer">Buffer for MMC/SD command response</param>
-        /// <param name="timeout">Timeout in seconds</param>
-        /// <param name="duration">Time it took to execute the command in milliseconds</param>
-        /// <param name="sense"><c>True</c> if MMC/SD returned non-OK status</param>
-        /// <param name="write"><c>True</c> if data is sent from host to card</param>
-        /// <param name="isApplication"><c>True</c> if command should be preceded with CMD55</param>
-        /// <param name="flags">Flags indicating kind and place of response</param>
-        /// <param name="blocks">How many blocks to transfer</param>
-        /// <param name="argument">Command argument</param>
-        /// <param name="response">Response registers</param>
-        /// <param name="blockSize">Size of block in bytes</param>
-        internal static int SendMmcCommand(SafeFileHandle fd, MmcCommands command, bool write, bool isApplication,
-                                           MmcFlags flags, uint argument, uint blockSize, uint blocks,
-                                           ref byte[] buffer, out uint[] response, out double duration, out bool sense,
-                                           uint timeout = 0)
-        {
-            var commandData       = new SffdiskDeviceCommandData();
-            var commandDescriptor = new SdCmdDescriptor();
-            commandData.size                    = (ushort)Marshal.SizeOf(commandData);
-            commandData.command                 = SffdiskDcmd.DeviceCommand;
-            commandData.protocolArgumentSize    = (ushort)Marshal.SizeOf(commandDescriptor);
-            commandData.deviceDataBufferSize    = blockSize * blocks;
-            commandDescriptor.commandCode       = (byte)command;
-            commandDescriptor.cmdClass          = isApplication ? SdCommandClass.AppCmd : SdCommandClass.Standard;
-            commandDescriptor.transferDirection = write ? SdTransferDirection.Write : SdTransferDirection.Read;
-
-            commandDescriptor.transferType = flags.HasFlag(MmcFlags.CommandAdtc)
-                                                 ? command == MmcCommands.ReadMultipleBlock
-                                                       ? SdTransferType.MultiBlock
-                                                       : SdTransferType.SingleBlock : SdTransferType.CmdOnly;
-
-            commandDescriptor.responseType = 0;
-
-            if(flags.HasFlag(MmcFlags.ResponseR1) ||
-               flags.HasFlag(MmcFlags.ResponseSpiR1))
-                commandDescriptor.responseType = SdResponseType.R1;
-
-            if(flags.HasFlag(MmcFlags.ResponseR1B) ||
-               flags.HasFlag(MmcFlags.ResponseSpiR1B))
-                commandDescriptor.responseType = SdResponseType.R1b;
-
-            if(flags.HasFlag(MmcFlags.ResponseR2) ||
-               flags.HasFlag(MmcFlags.ResponseSpiR2))
-                commandDescriptor.responseType = SdResponseType.R2;
-
-            if(flags.HasFlag(MmcFlags.ResponseR3) ||
-               flags.HasFlag(MmcFlags.ResponseSpiR3))
-                commandDescriptor.responseType = SdResponseType.R3;
-
-            if(flags.HasFlag(MmcFlags.ResponseR4) ||
-               flags.HasFlag(MmcFlags.ResponseSpiR4))
-                commandDescriptor.responseType = SdResponseType.R4;
-
-            if(flags.HasFlag(MmcFlags.ResponseR5) ||
-               flags.HasFlag(MmcFlags.ResponseSpiR5))
-                commandDescriptor.responseType = SdResponseType.R5;
-
-            if(flags.HasFlag(MmcFlags.ResponseR6))
-                commandDescriptor.responseType = SdResponseType.R6;
-
-            byte[] commandB = new byte[commandData.size + commandData.protocolArgumentSize +
-                                       commandData.deviceDataBufferSize];
-
-            Array.Copy(buffer, 0, commandB, commandData.size + commandData.protocolArgumentSize, buffer.Length);
-            IntPtr hBuf = Marshal.AllocHGlobal(commandB.Length);
-            Marshal.StructureToPtr(commandData, hBuf, true);
-            var descriptorOffset = IntPtr.Add(hBuf, commandData.size);
-            Marshal.StructureToPtr(commandDescriptor, descriptorOffset, true);
-            Marshal.Copy(hBuf, commandB, 0, commandB.Length);
-            Marshal.FreeHGlobal(hBuf);
-
-            int      error = 0;
-            DateTime start = DateTime.Now;
-
-            sense = !Extern.DeviceIoControl(fd, WindowsIoctl.IoctlSffdiskDeviceCommand, commandB, (uint)commandB.Length,
-                                            commandB, (uint)commandB.Length, out _, IntPtr.Zero);
-
-            DateTime end = DateTime.Now;
-
-            if(sense)
-                error = Marshal.GetLastWin32Error();
-
-            buffer = new byte[blockSize * blocks];
-            Buffer.BlockCopy(commandB, commandB.Length - buffer.Length, buffer, 0, buffer.Length);
-
-            response = new uint[4];
-            duration = (end - start).TotalMilliseconds;
-
-            return error;
-        }
-
-        internal static int SendMultipleMmcCommands(SafeFileHandle fd, Device.MmcSingleCommand[] commands,
-                                                    out double duration, out bool sense, uint timeout = 0)
-        {
-            int error = 0;
-            duration = 0;
-            sense    = false;
-
-            if(commands.Length     == 3                             &&
-               commands[0].command == MmcCommands.SetBlocklen       &&
-               commands[1].command == MmcCommands.ReadMultipleBlock &&
-               commands[2].command == MmcCommands.StopTransmission)
-                return SendMmcCommand(fd, commands[1].command, commands[1].write, commands[1].isApplication,
-                                      commands[1].flags, commands[1].argument, commands[1].blockSize,
-                                      commands[1].blocks, ref commands[1].buffer, out commands[1].response,
-                                      out duration, out sense, timeout);
-
-            foreach(Device.MmcSingleCommand command in commands)
-            {
-                int singleError = SendMmcCommand(fd, command.command, command.write, command.isApplication,
-                                                 command.flags, command.argument, command.blockSize, command.blocks,
-                                                 ref command.buffer, out command.response, out double cmdDuration,
-                                                 out bool cmdSense, timeout);
-
-                if(error       == 0 &&
-                   singleError != 0)
-                    error = singleError;
-
-                duration += cmdDuration;
-
-                if(cmdSense)
-                    sense = true;
-            }
-
-            return error;
-        }
-
-        internal static int ReOpen(string devicePath, SafeFileHandle fd, out object newFd)
-        {
-            Extern.CloseHandle(fd);
-
-            newFd = Extern.CreateFile(devicePath, FileAccess.GenericRead | FileAccess.GenericWrite,
-                                      FileShare.Read | FileShare.Write, IntPtr.Zero, FileMode.OpenExisting,
-                                      FileAttributes.Normal, IntPtr.Zero);
-
-            return ((SafeFileHandle)newFd).IsInvalid ? Marshal.GetLastWin32Error() : 0;
-        }
-
-        internal static int BufferedOsRead(SafeFileHandle fd, out byte[] buffer, long offset, uint length,
-                                           out double duration)
-        {
-            buffer = new byte[length];
-
-            DateTime start = DateTime.Now;
-
-            bool sense = !Extern.SetFilePointerEx(fd, offset, out _, MoveMethod.Begin);
-
-            DateTime end = DateTime.Now;
-
-            if(sense)
-            {
-                duration = (end - start).TotalMilliseconds;
-
-                return Marshal.GetLastWin32Error();
-            }
-
-            sense = !Extern.ReadFile(fd, buffer, length, out _, IntPtr.Zero);
-
-            end      = DateTime.Now;
-            duration = (end - start).TotalMilliseconds;
-
-            return sense ? Marshal.GetLastWin32Error() : 0;
-        }
+        return sense ? Marshal.GetLastWin32Error() : 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Windows/Enums.cs b/Aaru.Devices/Windows/Enums.cs
index d01bbadee..e57f59d77 100644
--- a/Aaru.Devices/Windows/Enums.cs
+++ b/Aaru.Devices/Windows/Enums.cs
@@ -36,329 +36,328 @@ using System.Diagnostics.CodeAnalysis;
 
 // ReSharper disable UnusedMember.Global
 
-namespace Aaru.Devices.Windows
+namespace Aaru.Devices.Windows;
+
+[Flags]
+internal enum FileAttributes : uint
 {
-    [Flags]
-    internal enum FileAttributes : uint
-    {
-        /// <summary>FILE_ATTRIBUTE_ARCHIVE</summary>
-        Archive = 0x20,
+    /// <summary>FILE_ATTRIBUTE_ARCHIVE</summary>
+    Archive = 0x20,
 
-        /// <summary>FILE_ATTRIBUTE_COMPRESSED</summary>
-        Compressed = 0x800,
+    /// <summary>FILE_ATTRIBUTE_COMPRESSED</summary>
+    Compressed = 0x800,
 
-        /// <summary>FILE_ATTRIBUTE_DEVICE</summary>
-        Device = 0x40,
+    /// <summary>FILE_ATTRIBUTE_DEVICE</summary>
+    Device = 0x40,
 
-        /// <summary>FILE_ATTRIBUTE_DIRECTORY</summary>
-        Directory = 0x10,
+    /// <summary>FILE_ATTRIBUTE_DIRECTORY</summary>
+    Directory = 0x10,
 
-        /// <summary>FILE_ATTRIBUTE_ENCRYPTED</summary>
-        Encrypted = 0x4000,
+    /// <summary>FILE_ATTRIBUTE_ENCRYPTED</summary>
+    Encrypted = 0x4000,
 
-        /// <summary>FILE_ATTRIBUTE_HIDDEN</summary>
-        Hidden = 0x02,
+    /// <summary>FILE_ATTRIBUTE_HIDDEN</summary>
+    Hidden = 0x02,
 
-        /// <summary>FILE_ATTRIBUTE_INTEGRITY_STREAM</summary>
-        IntegrityStream = 0x8000,
+    /// <summary>FILE_ATTRIBUTE_INTEGRITY_STREAM</summary>
+    IntegrityStream = 0x8000,
 
-        /// <summary>FILE_ATTRIBUTE_NORMAL</summary>
-        Normal = 0x80,
+    /// <summary>FILE_ATTRIBUTE_NORMAL</summary>
+    Normal = 0x80,
 
-        /// <summary>FILE_ATTRIBUTE_NOT_CONTENT_INDEXED</summary>
-        NotContentIndexed = 0x2000,
+    /// <summary>FILE_ATTRIBUTE_NOT_CONTENT_INDEXED</summary>
+    NotContentIndexed = 0x2000,
 
-        /// <summary>FILE_ATTRIBUTE_NO_SCRUB_DATA</summary>
-        NoScrubData = 0x20000,
+    /// <summary>FILE_ATTRIBUTE_NO_SCRUB_DATA</summary>
+    NoScrubData = 0x20000,
 
-        /// <summary>FILE_ATTRIBUTE_OFFLINE</summary>
-        Offline = 0x1000,
+    /// <summary>FILE_ATTRIBUTE_OFFLINE</summary>
+    Offline = 0x1000,
 
-        /// <summary>FILE_ATTRIBUTE_READONLY</summary>
-        Readonly = 0x01,
+    /// <summary>FILE_ATTRIBUTE_READONLY</summary>
+    Readonly = 0x01,
 
-        /// <summary>FILE_ATTRIBUTE_REPARSE_POINT</summary>
-        ReparsePoint = 0x400,
+    /// <summary>FILE_ATTRIBUTE_REPARSE_POINT</summary>
+    ReparsePoint = 0x400,
 
-        /// <summary>FILE_ATTRIBUTE_SPARSE_FILE</summary>
-        SparseFile = 0x200,
+    /// <summary>FILE_ATTRIBUTE_SPARSE_FILE</summary>
+    SparseFile = 0x200,
 
-        /// <summary>FILE_ATTRIBUTE_SYSTEM</summary>
-        System = 0x04,
+    /// <summary>FILE_ATTRIBUTE_SYSTEM</summary>
+    System = 0x04,
 
-        /// <summary>FILE_ATTRIBUTE_TEMPORARY</summary>
-        Temporary = 0x100,
+    /// <summary>FILE_ATTRIBUTE_TEMPORARY</summary>
+    Temporary = 0x100,
 
-        /// <summary>FILE_ATTRIBUTE_VIRTUAL</summary>
-        Virtual = 0x10000,
+    /// <summary>FILE_ATTRIBUTE_VIRTUAL</summary>
+    Virtual = 0x10000,
 
-        /// <summary>FILE_FLAG_BACKUP_SEMANTICS</summary>
-        BackupSemantics = 0x02000000,
+    /// <summary>FILE_FLAG_BACKUP_SEMANTICS</summary>
+    BackupSemantics = 0x02000000,
 
-        /// <summary>FILE_FLAG_DELETE_ON_CLOSE</summary>
-        DeleteOnClose = 0x04000000,
+    /// <summary>FILE_FLAG_DELETE_ON_CLOSE</summary>
+    DeleteOnClose = 0x04000000,
 
-        /// <summary>FILE_FLAG_NO_BUFFERING</summary>
-        NoBuffering = 0x20000000,
+    /// <summary>FILE_FLAG_NO_BUFFERING</summary>
+    NoBuffering = 0x20000000,
 
-        /// <summary>FILE_FLAG_OPEN_NO_RECALL</summary>
-        OpenNoRecall = 0x00100000,
+    /// <summary>FILE_FLAG_OPEN_NO_RECALL</summary>
+    OpenNoRecall = 0x00100000,
 
-        /// <summary>FILE_FLAG_OPEN_REPARSE_POINT</summary>
-        OpenReparsePoint = 0x00200000,
+    /// <summary>FILE_FLAG_OPEN_REPARSE_POINT</summary>
+    OpenReparsePoint = 0x00200000,
 
-        /// <summary>FILE_FLAG_OVERLAPPED</summary>
-        Overlapped = 0x40000000,
+    /// <summary>FILE_FLAG_OVERLAPPED</summary>
+    Overlapped = 0x40000000,
 
-        /// <summary>FILE_FLAG_POSIX_SEMANTICS</summary>
-        PosixSemantics = 0x0100000,
+    /// <summary>FILE_FLAG_POSIX_SEMANTICS</summary>
+    PosixSemantics = 0x0100000,
 
-        /// <summary>FILE_FLAG_RANDOM_ACCESS</summary>
-        RandomAccess = 0x10000000,
+    /// <summary>FILE_FLAG_RANDOM_ACCESS</summary>
+    RandomAccess = 0x10000000,
 
-        /// <summary>FILE_FLAG_SESSION_AWARE</summary>
-        SessionAware = 0x00800000,
+    /// <summary>FILE_FLAG_SESSION_AWARE</summary>
+    SessionAware = 0x00800000,
 
-        /// <summary>FILE_FLAG_SEQUENTIAL_SCAN</summary>
-        SequentialScan = 0x08000000,
+    /// <summary>FILE_FLAG_SEQUENTIAL_SCAN</summary>
+    SequentialScan = 0x08000000,
 
-        /// <summary>FILE_FLAG_WRITE_THROUGH</summary>
-        WriteThrough = 0x80000000
-    }
+    /// <summary>FILE_FLAG_WRITE_THROUGH</summary>
+    WriteThrough = 0x80000000
+}
 
-    [Flags]
-    internal enum FileAccess : uint
-    {
-        /// <summary>FILE_READ_DATA</summary>
-        ReadData = 0x0001,
+[Flags]
+internal enum FileAccess : uint
+{
+    /// <summary>FILE_READ_DATA</summary>
+    ReadData = 0x0001,
 
-        /// <summary>FILE_LIST_DIRECTORY</summary>
-        ListDirectory = ReadData,
+    /// <summary>FILE_LIST_DIRECTORY</summary>
+    ListDirectory = ReadData,
 
-        /// <summary>FILE_WRITE_DATA</summary>
-        WriteData = 0x0002,
+    /// <summary>FILE_WRITE_DATA</summary>
+    WriteData = 0x0002,
 
-        /// <summary>FILE_ADD_FILE</summary>
-        AddFile = WriteData,
+    /// <summary>FILE_ADD_FILE</summary>
+    AddFile = WriteData,
 
-        /// <summary>FILE_APPEND_DATA</summary>
-        AppendData = 0x0004,
+    /// <summary>FILE_APPEND_DATA</summary>
+    AppendData = 0x0004,
 
-        /// <summary>FILE_ADD_SUBDIRECTORY</summary>
-        AddSubdirectory = AppendData,
+    /// <summary>FILE_ADD_SUBDIRECTORY</summary>
+    AddSubdirectory = AppendData,
 
-        /// <summary>FILE_CREATE_PIPE_INSTANCE</summary>
-        CreatePipeInstance = AppendData,
+    /// <summary>FILE_CREATE_PIPE_INSTANCE</summary>
+    CreatePipeInstance = AppendData,
 
-        /// <summary>FILE_READ_EA</summary>
-        ReadEa = 0x0008,
+    /// <summary>FILE_READ_EA</summary>
+    ReadEa = 0x0008,
 
-        /// <summary>FILE_WRITE_EA</summary>
-        WriteEa = 0x0010,
+    /// <summary>FILE_WRITE_EA</summary>
+    WriteEa = 0x0010,
 
-        /// <summary>FILE_EXECUTE</summary>
-        Execute = 0x0020,
+    /// <summary>FILE_EXECUTE</summary>
+    Execute = 0x0020,
 
-        /// <summary>FILE_TRAVERSE</summary>
-        Traverse = Execute,
+    /// <summary>FILE_TRAVERSE</summary>
+    Traverse = Execute,
 
-        /// <summary>FILE_DELETE_CHILD</summary>
-        DeleteChild = 0x0040,
+    /// <summary>FILE_DELETE_CHILD</summary>
+    DeleteChild = 0x0040,
 
-        /// <summary>FILE_READ_ATTRIBUTES</summary>
-        ReadAttributes = 0x0080,
+    /// <summary>FILE_READ_ATTRIBUTES</summary>
+    ReadAttributes = 0x0080,
 
-        /// <summary>FILE_WRITE_ATTRIBUTES</summary>
-        WriteAttributes = 0x0100,
+    /// <summary>FILE_WRITE_ATTRIBUTES</summary>
+    WriteAttributes = 0x0100,
 
-        /// <summary>GENERIC_READ</summary>
-        GenericRead = 0x80000000,
+    /// <summary>GENERIC_READ</summary>
+    GenericRead = 0x80000000,
 
-        /// <summary>GENERIC_WRITE</summary>
-        GenericWrite = 0x40000000,
+    /// <summary>GENERIC_WRITE</summary>
+    GenericWrite = 0x40000000,
 
-        /// <summary>GENERIC_EXECUTE</summary>
-        GenericExecute = 0x20000000,
+    /// <summary>GENERIC_EXECUTE</summary>
+    GenericExecute = 0x20000000,
 
-        /// <summary>GENERIC_ALL</summary>
-        GenericAll = 0x10000000
-    }
+    /// <summary>GENERIC_ALL</summary>
+    GenericAll = 0x10000000
+}
 
-    [Flags]
-    internal enum FileShare : uint
-    {
-        /// <summary>FILE_SHARE_NONE</summary>
-        None = 0x00,
+[Flags]
+internal enum FileShare : uint
+{
+    /// <summary>FILE_SHARE_NONE</summary>
+    None = 0x00,
 
-        /// <summary>FILE_SHARE_READ</summary>
-        Read = 0x01,
+    /// <summary>FILE_SHARE_READ</summary>
+    Read = 0x01,
 
-        /// <summary>FILE_SHARE_WRITE</summary>
-        Write = 0x02,
+    /// <summary>FILE_SHARE_WRITE</summary>
+    Write = 0x02,
 
-        /// <summary>FILE_SHARE_DELETE</summary>
-        Delete = 0x03
-    }
+    /// <summary>FILE_SHARE_DELETE</summary>
+    Delete = 0x03
+}
 
-    [Flags]
-    internal enum FileMode : uint
-    {
-        /// <summary>NEW</summary>
-        New = 0x01,
+[Flags]
+internal enum FileMode : uint
+{
+    /// <summary>NEW</summary>
+    New = 0x01,
 
-        /// <summary>CREATE_ALWAYS</summary>
-        CreateAlways = 0x02,
+    /// <summary>CREATE_ALWAYS</summary>
+    CreateAlways = 0x02,
 
-        /// <summary>OPEN_EXISTING</summary>
-        OpenExisting = 0x03,
+    /// <summary>OPEN_EXISTING</summary>
+    OpenExisting = 0x03,
 
-        /// <summary>OPEN_ALWAYS</summary>
-        OpenAlways = 0x04,
+    /// <summary>OPEN_ALWAYS</summary>
+    OpenAlways = 0x04,
 
-        /// <summary>TRUNCATE_EXISTING</summary>
-        TruncateExisting = 0x05
-    }
+    /// <summary>TRUNCATE_EXISTING</summary>
+    TruncateExisting = 0x05
+}
 
-    /// <summary>Direction of SCSI transfer</summary>
-    internal enum ScsiIoctlDirection : byte
-    {
-        /// <summary>From host to device SCSI_IOCTL_DATA_OUT</summary>
-        Out = 0,
+/// <summary>Direction of SCSI transfer</summary>
+internal enum ScsiIoctlDirection : byte
+{
+    /// <summary>From host to device SCSI_IOCTL_DATA_OUT</summary>
+    Out = 0,
 
-        /// <summary>From device to host SCSI_IOCTL_DATA_IN</summary>
-        In = 1,
+    /// <summary>From device to host SCSI_IOCTL_DATA_IN</summary>
+    In = 1,
 
-        /// <summary>Unspecified direction, or bidirectional, or no data SCSI_IOCTL_DATA_UNSPECIFIED</summary>
-        Unspecified = 2
-    }
+    /// <summary>Unspecified direction, or bidirectional, or no data SCSI_IOCTL_DATA_UNSPECIFIED</summary>
+    Unspecified = 2
+}
 
-    internal enum WindowsIoctl : uint
-    {
-        IoctlAtaPassThrough = 0x4D02C, IoctlAtaPassThroughDirect = 0x4D030,
-
-        /// <summary>ScsiPassThrough</summary>
-        IoctlScsiPassThrough = 0x4D004,
-
-        /// <summary>ScsiPassThroughDirect</summary>
-        IoctlScsiPassThroughDirect = 0x4D014,
-
-        /// <summary>ScsiGetAddress</summary>
-        IoctlScsiGetAddress = 0x41018, IoctlStorageQueryProperty = 0x2D1400, IoctlIdePassThrough             = 0x4D028,
-        IoctlStorageGetDeviceNumber                              = 0x2D1080, IoctlSffdiskQueryDeviceProtocol = 0x71E80,
-        IoctlSffdiskDeviceCommand                                = 0x79E84
-    }
-
-    [Flags]
-    internal enum AtaFlags : ushort
-    {
-        /// <summary>ATA_FLAGS_DRDY_REQUIRED</summary>
-        DrdyRequired = 0x01,
-
-        /// <summary>ATA_FLAGS_DATA_IN</summary>
-        DataIn = 0x02,
-
-        /// <summary>ATA_FLAGS_DATA_OUT</summary>
-        DataOut = 0x04,
-
-        /// <summary>ATA_FLAGS_48BIT_COMMAND</summary>
-        ExtendedCommand = 0x08,
-
-        /// <summary>ATA_FLAGS_USE_DMA</summary>
-        Dma = 0x10,
-
-        /// <summary>ATA_FLAGS_NO_MULTIPLE</summary>
-        NoMultiple = 0x20
-    }
-
-    internal enum StoragePropertyId
-    {
-        Device           = 0, Adapter      = 1, Id              = 2,
-        UniqueId         = 3, WriteCache   = 4, Miniport        = 5,
-        AccessAlignment  = 6, SeekPenalty  = 7, Trim            = 8,
-        WriteAggregation = 9, Telemetry    = 10, LbProvisioning = 11,
-        Power            = 12, Copyoffload = 13, Resiliency     = 14
-    }
-
-    internal enum StorageQueryType
-    {
-        Standard = 0, Exists = 1, Mask = 2,
-        Max      = 3
-    }
-
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    internal enum StorageBusType
-    {
-        Unknown           = 0, SCSI             = 1, ATAPI        = 2,
-        ATA               = 3, FireWire         = 4, SSA          = 5,
-        Fibre             = 6, USB              = 7, RAID         = 8,
-        iSCSI             = 9, SAS              = 0xA, SATA       = 0xB,
-        SecureDigital     = 0xC, MultiMediaCard = 0xD, Virtual    = 0xE,
-        FileBackedVirtual = 0xF, Spaces         = 16, SCM         = 18,
-        UFS               = 19, Max             = 20, MaxReserved = 127,
-        NVMe              = 0x11
-    }
-
-    [Flags]
-    internal enum DeviceGetClassFlags : uint
-    {
-        /// <summary>DIGCF_DEFAULT</summary>
-        Default = 0x01,
-
-        /// <summary>DIGCF_PRESENT</summary>
-        Present = 0x02,
-
-        /// <summary>DIGCF_ALLCLASSES</summary>
-        AllClasses = 0x04,
-
-        /// <summary>DIGCF_PROFILE</summary>
-        Profile = 0x08,
-
-        /// <summary>DIGCF_DEVICEINTERFACE</summary>
-        DeviceInterface = 0x10
-    }
-
-    internal enum SdCommandClass : uint
-    {
-        Standard, AppCmd
-    }
-
-    internal enum SdTransferDirection : uint
-    {
-        Unspecified, Read, Write
-    }
-
-    internal enum SdTransferType : uint
-    {
-        Unspecified, CmdOnly, SingleBlock,
-        MultiBlock, MultiBlockNoCmd12
-    }
-
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    internal enum SdResponseType : uint
-    {
-        Unspecified, None, R1,
-        R1b, R2, R3,
-        R4, R5, R5b,
-        R6
-    }
-
-    internal enum SffdiskDcmd : uint
-    {
-        GetVersion, LockChannel, UnlockChannel,
-        DeviceCommand
-    }
-
-    internal static class Consts
-    {
-        public static Guid GuidSffProtocolSd  = new Guid("AD7536A8-D055-4C40-AA4D-96312DDB6B38");
-        public static Guid GuidSffProtocolMmc = new Guid("77274D3F-2365-4491-A030-8BB44AE60097");
-
-        public static Guid GuidDevinterfaceDisk =
-            new Guid(0x53F56307, 0xB6BF, 0x11D0, 0x94, 0xF2, 0x00, 0xA0, 0xC9, 0x1E, 0xFB, 0x8B);
-    }
-
-    internal enum MoveMethod : uint
-    {
-        Begin = 0, Current = 1, End = 2
-    }
+internal enum WindowsIoctl : uint
+{
+    IoctlAtaPassThrough = 0x4D02C, IoctlAtaPassThroughDirect = 0x4D030,
+
+    /// <summary>ScsiPassThrough</summary>
+    IoctlScsiPassThrough = 0x4D004,
+
+    /// <summary>ScsiPassThroughDirect</summary>
+    IoctlScsiPassThroughDirect = 0x4D014,
+
+    /// <summary>ScsiGetAddress</summary>
+    IoctlScsiGetAddress = 0x41018, IoctlStorageQueryProperty = 0x2D1400, IoctlIdePassThrough             = 0x4D028,
+    IoctlStorageGetDeviceNumber                              = 0x2D1080, IoctlSffdiskQueryDeviceProtocol = 0x71E80,
+    IoctlSffdiskDeviceCommand                                = 0x79E84
+}
+
+[Flags]
+internal enum AtaFlags : ushort
+{
+    /// <summary>ATA_FLAGS_DRDY_REQUIRED</summary>
+    DrdyRequired = 0x01,
+
+    /// <summary>ATA_FLAGS_DATA_IN</summary>
+    DataIn = 0x02,
+
+    /// <summary>ATA_FLAGS_DATA_OUT</summary>
+    DataOut = 0x04,
+
+    /// <summary>ATA_FLAGS_48BIT_COMMAND</summary>
+    ExtendedCommand = 0x08,
+
+    /// <summary>ATA_FLAGS_USE_DMA</summary>
+    Dma = 0x10,
+
+    /// <summary>ATA_FLAGS_NO_MULTIPLE</summary>
+    NoMultiple = 0x20
+}
+
+internal enum StoragePropertyId
+{
+    Device           = 0, Adapter      = 1, Id              = 2,
+    UniqueId         = 3, WriteCache   = 4, Miniport        = 5,
+    AccessAlignment  = 6, SeekPenalty  = 7, Trim            = 8,
+    WriteAggregation = 9, Telemetry    = 10, LbProvisioning = 11,
+    Power            = 12, Copyoffload = 13, Resiliency     = 14
+}
+
+internal enum StorageQueryType
+{
+    Standard = 0, Exists = 1, Mask = 2,
+    Max      = 3
+}
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+internal enum StorageBusType
+{
+    Unknown           = 0, SCSI             = 1, ATAPI        = 2,
+    ATA               = 3, FireWire         = 4, SSA          = 5,
+    Fibre             = 6, USB              = 7, RAID         = 8,
+    iSCSI             = 9, SAS              = 0xA, SATA       = 0xB,
+    SecureDigital     = 0xC, MultiMediaCard = 0xD, Virtual    = 0xE,
+    FileBackedVirtual = 0xF, Spaces         = 16, SCM         = 18,
+    UFS               = 19, Max             = 20, MaxReserved = 127,
+    NVMe              = 0x11
+}
+
+[Flags]
+internal enum DeviceGetClassFlags : uint
+{
+    /// <summary>DIGCF_DEFAULT</summary>
+    Default = 0x01,
+
+    /// <summary>DIGCF_PRESENT</summary>
+    Present = 0x02,
+
+    /// <summary>DIGCF_ALLCLASSES</summary>
+    AllClasses = 0x04,
+
+    /// <summary>DIGCF_PROFILE</summary>
+    Profile = 0x08,
+
+    /// <summary>DIGCF_DEVICEINTERFACE</summary>
+    DeviceInterface = 0x10
+}
+
+internal enum SdCommandClass : uint
+{
+    Standard, AppCmd
+}
+
+internal enum SdTransferDirection : uint
+{
+    Unspecified, Read, Write
+}
+
+internal enum SdTransferType : uint
+{
+    Unspecified, CmdOnly, SingleBlock,
+    MultiBlock, MultiBlockNoCmd12
+}
+
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+internal enum SdResponseType : uint
+{
+    Unspecified, None, R1,
+    R1b, R2, R3,
+    R4, R5, R5b,
+    R6
+}
+
+internal enum SffdiskDcmd : uint
+{
+    GetVersion, LockChannel, UnlockChannel,
+    DeviceCommand
+}
+
+internal static class Consts
+{
+    public static Guid GuidSffProtocolSd  = new Guid("AD7536A8-D055-4C40-AA4D-96312DDB6B38");
+    public static Guid GuidSffProtocolMmc = new Guid("77274D3F-2365-4491-A030-8BB44AE60097");
+
+    public static Guid GuidDevinterfaceDisk =
+        new Guid(0x53F56307, 0xB6BF, 0x11D0, 0x94, 0xF2, 0x00, 0xA0, 0xC9, 0x1E, 0xFB, 0x8B);
+}
+
+internal enum MoveMethod : uint
+{
+    Begin = 0, Current = 1, End = 2
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Windows/Extern.cs b/Aaru.Devices/Windows/Extern.cs
index 595cdb299..4bdcb5975 100644
--- a/Aaru.Devices/Windows/Extern.cs
+++ b/Aaru.Devices/Windows/Extern.cs
@@ -35,90 +35,89 @@ using System;
 using System.Runtime.InteropServices;
 using Microsoft.Win32.SafeHandles;
 
-namespace Aaru.Devices.Windows
+namespace Aaru.Devices.Windows;
+
+internal static class Extern
 {
-    internal static class Extern
-    {
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        internal static extern SafeFileHandle CreateFile([MarshalAs(UnmanagedType.LPTStr)] string filename,
-                                                         [MarshalAs(UnmanagedType.U4)] FileAccess access,
-                                                         [MarshalAs(UnmanagedType.U4)] FileShare share,
-                                                         IntPtr securityAttributes, // optional SECURITY_ATTRIBUTES struct or IntPtr.Zero
-                                                         [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
-                                                         [MarshalAs(UnmanagedType.U4)]
-                                                         FileAttributes flagsAndAttributes, IntPtr templateFile);
+    [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    internal static extern SafeFileHandle CreateFile([MarshalAs(UnmanagedType.LPTStr)] string filename,
+                                                     [MarshalAs(UnmanagedType.U4)] FileAccess access,
+                                                     [MarshalAs(UnmanagedType.U4)] FileShare share,
+                                                     IntPtr securityAttributes, // optional SECURITY_ATTRIBUTES struct or IntPtr.Zero
+                                                     [MarshalAs(UnmanagedType.U4)] FileMode creationDisposition,
+                                                     [MarshalAs(UnmanagedType.U4)]
+                                                     FileAttributes flagsAndAttributes, IntPtr templateFile);
 
-        [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControlScsi(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
-                                                        ref ScsiPassThroughDirectAndSenseBuffer inBuffer,
-                                                        uint nInBufferSize,
-                                                        ref ScsiPassThroughDirectAndSenseBuffer outBuffer,
-                                                        uint nOutBufferSize, ref uint pBytesReturned,
-                                                        IntPtr overlapped);
+    [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
+    internal static extern bool DeviceIoControlScsi(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
+                                                    ref ScsiPassThroughDirectAndSenseBuffer inBuffer,
+                                                    uint nInBufferSize,
+                                                    ref ScsiPassThroughDirectAndSenseBuffer outBuffer,
+                                                    uint nOutBufferSize, ref uint pBytesReturned,
+                                                    IntPtr overlapped);
 
-        [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControlAta(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
-                                                       ref AtaPassThroughDirect inBuffer, uint nInBufferSize,
-                                                       ref AtaPassThroughDirect outBuffer, uint nOutBufferSize,
-                                                       ref uint pBytesReturned, IntPtr overlapped);
+    [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
+    internal static extern bool DeviceIoControlAta(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
+                                                   ref AtaPassThroughDirect inBuffer, uint nInBufferSize,
+                                                   ref AtaPassThroughDirect outBuffer, uint nOutBufferSize,
+                                                   ref uint pBytesReturned, IntPtr overlapped);
 
-        [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControlStorageQuery(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
-                                                                ref StoragePropertyQuery inBuffer, uint nInBufferSize,
-                                                                IntPtr outBuffer, uint nOutBufferSize,
-                                                                ref uint pBytesReturned, IntPtr overlapped);
+    [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
+    internal static extern bool DeviceIoControlStorageQuery(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
+                                                            ref StoragePropertyQuery inBuffer, uint nInBufferSize,
+                                                            IntPtr outBuffer, uint nOutBufferSize,
+                                                            ref uint pBytesReturned, IntPtr overlapped);
 
-        [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControlIde(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
-                                                       ref IdePassThroughDirect inBuffer, uint nInBufferSize,
-                                                       ref IdePassThroughDirect outBuffer, uint nOutBufferSize,
-                                                       ref uint pBytesReturned, IntPtr overlapped);
+    [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
+    internal static extern bool DeviceIoControlIde(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
+                                                   ref IdePassThroughDirect inBuffer, uint nInBufferSize,
+                                                   ref IdePassThroughDirect outBuffer, uint nOutBufferSize,
+                                                   ref uint pBytesReturned, IntPtr overlapped);
 
-        [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControlGetDeviceNumber(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
-                                                                   IntPtr inBuffer, uint nInBufferSize,
-                                                                   ref StorageDeviceNumber outBuffer,
-                                                                   uint nOutBufferSize, ref uint pBytesReturned,
-                                                                   IntPtr overlapped);
+    [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
+    internal static extern bool DeviceIoControlGetDeviceNumber(SafeFileHandle hDevice, WindowsIoctl ioControlCode,
+                                                               IntPtr inBuffer, uint nInBufferSize,
+                                                               ref StorageDeviceNumber outBuffer,
+                                                               uint nOutBufferSize, ref uint pBytesReturned,
+                                                               IntPtr overlapped);
 
-        [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControl(SafeFileHandle hDevice, WindowsIoctl ioControlCode, IntPtr inBuffer,
-                                                    uint nInBufferSize, ref SffdiskQueryDeviceProtocolData outBuffer,
-                                                    uint nOutBufferSize, out uint pBytesReturned, IntPtr overlapped);
+    [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
+    internal static extern bool DeviceIoControl(SafeFileHandle hDevice, WindowsIoctl ioControlCode, IntPtr inBuffer,
+                                                uint nInBufferSize, ref SffdiskQueryDeviceProtocolData outBuffer,
+                                                uint nOutBufferSize, out uint pBytesReturned, IntPtr overlapped);
 
-        [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
-        internal static extern bool DeviceIoControl(SafeFileHandle hDevice, WindowsIoctl ioControlCode, byte[] inBuffer,
-                                                    uint nInBufferSize, byte[] outBuffer, uint nOutBufferSize,
-                                                    out uint pBytesReturned, IntPtr overlapped);
+    [DllImport("Kernel32.dll", SetLastError = true, EntryPoint = "DeviceIoControl", CharSet = CharSet.Auto)]
+    internal static extern bool DeviceIoControl(SafeFileHandle hDevice, WindowsIoctl ioControlCode, byte[] inBuffer,
+                                                uint nInBufferSize, byte[] outBuffer, uint nOutBufferSize,
+                                                out uint pBytesReturned, IntPtr overlapped);
 
-        [DllImport("setupapi.dll", CharSet = CharSet.Auto)]
-        internal static extern SafeFileHandle SetupDiGetClassDevs(ref Guid classGuid, IntPtr enumerator,
-                                                                  IntPtr hwndParent, DeviceGetClassFlags flags);
+    [DllImport("setupapi.dll", CharSet = CharSet.Auto)]
+    internal static extern SafeFileHandle SetupDiGetClassDevs(ref Guid classGuid, IntPtr enumerator,
+                                                              IntPtr hwndParent, DeviceGetClassFlags flags);
 
-        [DllImport("setupapi.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern bool SetupDiEnumDeviceInterfaces(SafeFileHandle hDevInfo, IntPtr devInfo,
-                                                              ref Guid interfaceClassGuid, uint memberIndex,
-                                                              ref DeviceInterfaceData deviceInterfaceData);
+    [DllImport("setupapi.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    public static extern bool SetupDiEnumDeviceInterfaces(SafeFileHandle hDevInfo, IntPtr devInfo,
+                                                          ref Guid interfaceClassGuid, uint memberIndex,
+                                                          ref DeviceInterfaceData deviceInterfaceData);
 
-        [DllImport("setupapi.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern bool SetupDiGetDeviceInterfaceDetail(SafeFileHandle hDevInfo,
-                                                                  ref DeviceInterfaceData deviceInterfaceData,
-                                                                  IntPtr deviceInterfaceDetailData,
-                                                                  uint deviceInterfaceDetailDataSize,
-                                                                  ref uint requiredSize, IntPtr deviceInfoData);
+    [DllImport("setupapi.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    public static extern bool SetupDiGetDeviceInterfaceDetail(SafeFileHandle hDevInfo,
+                                                              ref DeviceInterfaceData deviceInterfaceData,
+                                                              IntPtr deviceInterfaceDetailData,
+                                                              uint deviceInterfaceDetailDataSize,
+                                                              ref uint requiredSize, IntPtr deviceInfoData);
 
-        [DllImport("setupapi.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern bool SetupDiDestroyDeviceInfoList(SafeFileHandle hDevInfo);
+    [DllImport("setupapi.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    public static extern bool SetupDiDestroyDeviceInfoList(SafeFileHandle hDevInfo);
 
-        [DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        internal static extern bool CloseHandle(SafeFileHandle hDevice);
+    [DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    internal static extern bool CloseHandle(SafeFileHandle hDevice);
 
-        [DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool SetFilePointerEx(SafeFileHandle hFile, long liDistanceToMove,
-                                                   out long lpNewFilePointer, MoveMethod dwMoveMethod);
+    [DllImport("Kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    public static extern bool SetFilePointerEx(SafeFileHandle hFile, long liDistanceToMove,
+                                               out long lpNewFilePointer, MoveMethod dwMoveMethod);
 
-        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        public static extern bool ReadFile(SafeFileHandle hFile, byte[] lpBuffer, uint nNumberOfBytesToRead,
-                                           out uint lpNumberOfBytesRead, IntPtr lpOverlapped);
-    }
+    [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    public static extern bool ReadFile(SafeFileHandle hFile, byte[] lpBuffer, uint nNumberOfBytesToRead,
+                                       out uint lpNumberOfBytesRead, IntPtr lpOverlapped);
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Windows/ListDevices.cs b/Aaru.Devices/Windows/ListDevices.cs
index 1cf2947a4..f854fcbca 100644
--- a/Aaru.Devices/Windows/ListDevices.cs
+++ b/Aaru.Devices/Windows/ListDevices.cs
@@ -40,186 +40,185 @@ using Aaru.Helpers;
 using Microsoft.Win32.SafeHandles;
 using Marshal = System.Runtime.InteropServices.Marshal;
 
-namespace Aaru.Devices.Windows
+namespace Aaru.Devices.Windows;
+
+internal static class ListDevices
 {
-    internal static class ListDevices
+    /// <summary>Converts a hex dump string to the ASCII string it represents</summary>
+    /// <param name="hex">Hex dump</param>
+    /// <returns>Decoded string</returns>
+    static string HexStringToString(string hex)
     {
-        /// <summary>Converts a hex dump string to the ASCII string it represents</summary>
-        /// <param name="hex">Hex dump</param>
-        /// <returns>Decoded string</returns>
-        static string HexStringToString(string hex)
+        var          result   = new StringBuilder();
+        const string HEXTABLE = "0123456789abcdef";
+
+        for(int i = 0; i < hex.Length / 2; i++)
+            result.Append((char)((16 * HEXTABLE.IndexOf(hex[2 * i])) + HEXTABLE.IndexOf(hex[(2 * i) + 1])));
+
+        return result.ToString();
+    }
+
+    /// <summary>Gets a list of all known storage devices on Windows</summary>
+    /// <returns>List of devices</returns>
+    [SuppressMessage("ReSharper", "RedundantCatchClause")]
+    internal static DeviceInfo[] GetList()
+    {
+        List<string> deviceIDs = new List<string>();
+
+        try
         {
-            var          result   = new StringBuilder();
-            const string HEXTABLE = "0123456789abcdef";
+            var mgmtObjSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive");
 
-            for(int i = 0; i < hex.Length / 2; i++)
-                result.Append((char)((16 * HEXTABLE.IndexOf(hex[2 * i])) + HEXTABLE.IndexOf(hex[(2 * i) + 1])));
+            ManagementObjectCollection objCol = mgmtObjSearcher.Get();
 
-            return result.ToString();
+            deviceIDs.AddRange(from ManagementObject drive in objCol select (string)drive["DeviceID"]);
+
+            mgmtObjSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_TapeDrive");
+            objCol          = mgmtObjSearcher.Get();
+
+            deviceIDs.AddRange(from ManagementObject drive in objCol select (string)drive["DeviceID"]);
+
+            mgmtObjSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_CDROMDrive");
+            objCol          = mgmtObjSearcher.Get();
+
+            deviceIDs.AddRange(from ManagementObject drive in objCol select (string)drive["Drive"]);
         }
-
-        /// <summary>Gets a list of all known storage devices on Windows</summary>
-        /// <returns>List of devices</returns>
-        [SuppressMessage("ReSharper", "RedundantCatchClause")]
-        internal static DeviceInfo[] GetList()
+        catch(Exception)
         {
-            List<string> deviceIDs = new List<string>();
-
-            try
-            {
-                var mgmtObjSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_DiskDrive");
-
-                ManagementObjectCollection objCol = mgmtObjSearcher.Get();
-
-                deviceIDs.AddRange(from ManagementObject drive in objCol select (string)drive["DeviceID"]);
-
-                mgmtObjSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_TapeDrive");
-                objCol          = mgmtObjSearcher.Get();
-
-                deviceIDs.AddRange(from ManagementObject drive in objCol select (string)drive["DeviceID"]);
-
-                mgmtObjSearcher = new ManagementObjectSearcher("SELECT * FROM Win32_CDROMDrive");
-                objCol          = mgmtObjSearcher.Get();
-
-                deviceIDs.AddRange(from ManagementObject drive in objCol select (string)drive["Drive"]);
-            }
-            catch(Exception)
-            {
-            #if DEBUG
-                throw;
-            #else
+        #if DEBUG
+            throw;
+        #else
                 return null;
-            #endif
-            }
-
-            List<DeviceInfo> devList = new List<DeviceInfo>();
-
-            foreach(string devId in deviceIDs)
-            {
-                if(devId is null)
-                    continue;
-
-                string physId = devId;
-
-                // TODO: This can be done better
-                if(devId.Length == 2 &&
-                   devId[1]     == ':')
-                    physId = "\\\\?\\" + devId;
-
-                SafeFileHandle fd = Extern.CreateFile(physId, 0, FileShare.Read | FileShare.Write, IntPtr.Zero,
-                                                      FileMode.OpenExisting, 0, IntPtr.Zero);
-
-                if(fd.IsInvalid)
-                    continue;
-
-                var query = new StoragePropertyQuery
-                {
-                    PropertyId           = StoragePropertyId.Device,
-                    QueryType            = StorageQueryType.Standard,
-                    AdditionalParameters = new byte[1]
-                };
-
-                //StorageDeviceDescriptor descriptor = new StorageDeviceDescriptor();
-                //descriptor.RawDeviceProperties = new byte[16384];
-
-                IntPtr descriptorPtr = Marshal.AllocHGlobal(1000);
-                byte[] descriptorB   = new byte[1000];
-
-                uint returned = 0;
-                int  error    = 0;
-
-                bool hasError = !Extern.DeviceIoControlStorageQuery(fd, WindowsIoctl.IoctlStorageQueryProperty,
-                                                                    ref query, (uint)Marshal.SizeOf(query),
-                                                                    descriptorPtr, 1000, ref returned, IntPtr.Zero);
-
-                if(hasError)
-                    error = Marshal.GetLastWin32Error();
-
-                Marshal.Copy(descriptorPtr, descriptorB, 0, 1000);
-
-                if(hasError && error != 0)
-                    continue;
-
-                var descriptor = new StorageDeviceDescriptor
-                {
-                    Version               = BitConverter.ToUInt32(descriptorB, 0),
-                    Size                  = BitConverter.ToUInt32(descriptorB, 4),
-                    DeviceType            = descriptorB[8],
-                    DeviceTypeModifier    = descriptorB[9],
-                    RemovableMedia        = BitConverter.ToBoolean(descriptorB, 10),
-                    CommandQueueing       = BitConverter.ToBoolean(descriptorB, 11),
-                    VendorIdOffset        = BitConverter.ToInt32(descriptorB, 12),
-                    ProductIdOffset       = BitConverter.ToInt32(descriptorB, 16),
-                    ProductRevisionOffset = BitConverter.ToInt32(descriptorB, 20),
-                    SerialNumberOffset    = BitConverter.ToInt32(descriptorB, 24),
-                    BusType               = (StorageBusType)BitConverter.ToUInt32(descriptorB, 28),
-                    RawPropertiesLength   = BitConverter.ToUInt32(descriptorB, 32)
-                };
-
-                var info = new DeviceInfo
-                {
-                    Path = physId,
-                    Bus  = descriptor.BusType.ToString()
-                };
-
-                if(descriptor.VendorIdOffset > 0)
-                    info.Vendor =
-                        StringHandlers.CToString(descriptorB, Encoding.ASCII, start: descriptor.VendorIdOffset);
-
-                if(descriptor.ProductIdOffset > 0)
-                    info.Model =
-                        StringHandlers.CToString(descriptorB, Encoding.ASCII, start: descriptor.ProductIdOffset);
-
-                // TODO: Get serial number of SCSI and USB devices, probably also FireWire (untested)
-                if(descriptor.SerialNumberOffset > 0)
-                {
-                    info.Serial =
-                        StringHandlers.CToString(descriptorB, Encoding.ASCII, start: descriptor.SerialNumberOffset);
-
-                    // fix any serial numbers that are returned as hex-strings
-                    if(Array.TrueForAll(info.Serial.ToCharArray(), c => "0123456789abcdef".IndexOf(c) >= 0) &&
-                       info.Serial.Length == 40)
-                        info.Serial = HexStringToString(info.Serial).Trim();
-                }
-
-                if(string.IsNullOrEmpty(info.Vendor) ||
-                   info.Vendor == "ATA")
-                {
-                    string[] pieces = info.Model?.Split(' ');
-
-                    if(pieces?.Length > 1)
-                    {
-                        info.Vendor = pieces[0];
-                        info.Model  = info.Model.Substring(pieces[0].Length + 1);
-                    }
-                }
-
-                switch(descriptor.BusType)
-                {
-                    case StorageBusType.SCSI:
-                    case StorageBusType.ATAPI:
-                    case StorageBusType.ATA:
-                    case StorageBusType.FireWire:
-                    case StorageBusType.SSA:
-                    case StorageBusType.Fibre:
-                    case StorageBusType.USB:
-                    case StorageBusType.iSCSI:
-                    case StorageBusType.SAS:
-                    case StorageBusType.SATA:
-                    case StorageBusType.SecureDigital:
-                    case StorageBusType.MultiMediaCard:
-                        info.Supported = true;
-
-                        break;
-                }
-
-                Marshal.FreeHGlobal(descriptorPtr);
-                devList.Add(info);
-            }
-
-            DeviceInfo[] devices = devList.ToArray();
-
-            return devices;
+        #endif
         }
+
+        List<DeviceInfo> devList = new List<DeviceInfo>();
+
+        foreach(string devId in deviceIDs)
+        {
+            if(devId is null)
+                continue;
+
+            string physId = devId;
+
+            // TODO: This can be done better
+            if(devId.Length == 2 &&
+               devId[1]     == ':')
+                physId = "\\\\?\\" + devId;
+
+            SafeFileHandle fd = Extern.CreateFile(physId, 0, FileShare.Read | FileShare.Write, IntPtr.Zero,
+                                                  FileMode.OpenExisting, 0, IntPtr.Zero);
+
+            if(fd.IsInvalid)
+                continue;
+
+            var query = new StoragePropertyQuery
+            {
+                PropertyId           = StoragePropertyId.Device,
+                QueryType            = StorageQueryType.Standard,
+                AdditionalParameters = new byte[1]
+            };
+
+            //StorageDeviceDescriptor descriptor = new StorageDeviceDescriptor();
+            //descriptor.RawDeviceProperties = new byte[16384];
+
+            IntPtr descriptorPtr = Marshal.AllocHGlobal(1000);
+            byte[] descriptorB   = new byte[1000];
+
+            uint returned = 0;
+            int  error    = 0;
+
+            bool hasError = !Extern.DeviceIoControlStorageQuery(fd, WindowsIoctl.IoctlStorageQueryProperty,
+                                                                ref query, (uint)Marshal.SizeOf(query),
+                                                                descriptorPtr, 1000, ref returned, IntPtr.Zero);
+
+            if(hasError)
+                error = Marshal.GetLastWin32Error();
+
+            Marshal.Copy(descriptorPtr, descriptorB, 0, 1000);
+
+            if(hasError && error != 0)
+                continue;
+
+            var descriptor = new StorageDeviceDescriptor
+            {
+                Version               = BitConverter.ToUInt32(descriptorB, 0),
+                Size                  = BitConverter.ToUInt32(descriptorB, 4),
+                DeviceType            = descriptorB[8],
+                DeviceTypeModifier    = descriptorB[9],
+                RemovableMedia        = BitConverter.ToBoolean(descriptorB, 10),
+                CommandQueueing       = BitConverter.ToBoolean(descriptorB, 11),
+                VendorIdOffset        = BitConverter.ToInt32(descriptorB, 12),
+                ProductIdOffset       = BitConverter.ToInt32(descriptorB, 16),
+                ProductRevisionOffset = BitConverter.ToInt32(descriptorB, 20),
+                SerialNumberOffset    = BitConverter.ToInt32(descriptorB, 24),
+                BusType               = (StorageBusType)BitConverter.ToUInt32(descriptorB, 28),
+                RawPropertiesLength   = BitConverter.ToUInt32(descriptorB, 32)
+            };
+
+            var info = new DeviceInfo
+            {
+                Path = physId,
+                Bus  = descriptor.BusType.ToString()
+            };
+
+            if(descriptor.VendorIdOffset > 0)
+                info.Vendor =
+                    StringHandlers.CToString(descriptorB, Encoding.ASCII, start: descriptor.VendorIdOffset);
+
+            if(descriptor.ProductIdOffset > 0)
+                info.Model =
+                    StringHandlers.CToString(descriptorB, Encoding.ASCII, start: descriptor.ProductIdOffset);
+
+            // TODO: Get serial number of SCSI and USB devices, probably also FireWire (untested)
+            if(descriptor.SerialNumberOffset > 0)
+            {
+                info.Serial =
+                    StringHandlers.CToString(descriptorB, Encoding.ASCII, start: descriptor.SerialNumberOffset);
+
+                // fix any serial numbers that are returned as hex-strings
+                if(Array.TrueForAll(info.Serial.ToCharArray(), c => "0123456789abcdef".IndexOf(c) >= 0) &&
+                   info.Serial.Length == 40)
+                    info.Serial = HexStringToString(info.Serial).Trim();
+            }
+
+            if(string.IsNullOrEmpty(info.Vendor) ||
+               info.Vendor == "ATA")
+            {
+                string[] pieces = info.Model?.Split(' ');
+
+                if(pieces?.Length > 1)
+                {
+                    info.Vendor = pieces[0];
+                    info.Model  = info.Model.Substring(pieces[0].Length + 1);
+                }
+            }
+
+            switch(descriptor.BusType)
+            {
+                case StorageBusType.SCSI:
+                case StorageBusType.ATAPI:
+                case StorageBusType.ATA:
+                case StorageBusType.FireWire:
+                case StorageBusType.SSA:
+                case StorageBusType.Fibre:
+                case StorageBusType.USB:
+                case StorageBusType.iSCSI:
+                case StorageBusType.SAS:
+                case StorageBusType.SATA:
+                case StorageBusType.SecureDigital:
+                case StorageBusType.MultiMediaCard:
+                    info.Supported = true;
+
+                    break;
+            }
+
+            Marshal.FreeHGlobal(descriptorPtr);
+            devList.Add(info);
+        }
+
+        DeviceInfo[] devices = devList.ToArray();
+
+        return devices;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Windows/Structs.cs b/Aaru.Devices/Windows/Structs.cs
index b141a8020..b80671940 100644
--- a/Aaru.Devices/Windows/Structs.cs
+++ b/Aaru.Devices/Windows/Structs.cs
@@ -35,234 +35,233 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.Devices.Windows
+namespace Aaru.Devices.Windows;
+
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct ScsiPassThroughDirect
 {
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct ScsiPassThroughDirect
-    {
-        public ushort Length;
-        public byte   ScsiStatus;
-        public byte   PathId;
-        public byte   TargetId;
-        public byte   Lun;
-        public byte   CdbLength;
-        public byte   SenseInfoLength;
-        [MarshalAs(UnmanagedType.U1)]
-        public ScsiIoctlDirection DataIn;
-        public uint   DataTransferLength;
-        public uint   TimeOutValue;
-        public IntPtr DataBuffer;
-        public uint   SenseInfoOffset;
+    public ushort Length;
+    public byte   ScsiStatus;
+    public byte   PathId;
+    public byte   TargetId;
+    public byte   Lun;
+    public byte   CdbLength;
+    public byte   SenseInfoLength;
+    [MarshalAs(UnmanagedType.U1)]
+    public ScsiIoctlDirection DataIn;
+    public uint   DataTransferLength;
+    public uint   TimeOutValue;
+    public IntPtr DataBuffer;
+    public uint   SenseInfoOffset;
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-        public byte[] Cdb;
-    }
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+    public byte[] Cdb;
+}
 
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct ScsiPassThroughDirectAndSenseBuffer
-    {
-        public ScsiPassThroughDirect sptd;
+[StructLayout(LayoutKind.Sequential)]
+internal struct ScsiPassThroughDirectAndSenseBuffer
+{
+    public ScsiPassThroughDirect sptd;
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-        public byte[] SenseBuf;
-    }
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+    public byte[] SenseBuf;
+}
 
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct AtaPassThroughDirect
-    {
-        /// <summary>Length in bytes of this structure</summary>
-        public ushort Length;
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct AtaPassThroughDirect
+{
+    /// <summary>Length in bytes of this structure</summary>
+    public ushort Length;
 
-        /// <summary>Indicates transfer direction and kind of operation</summary>
-        [MarshalAs(UnmanagedType.U2)]
-        public AtaFlags AtaFlags;
+    /// <summary>Indicates transfer direction and kind of operation</summary>
+    [MarshalAs(UnmanagedType.U2)]
+    public AtaFlags AtaFlags;
 
-        /// <summary>Indicates IDE port or bus, set by driver</summary>
-        public byte PathId;
+    /// <summary>Indicates IDE port or bus, set by driver</summary>
+    public byte PathId;
 
-        /// <summary>Indicates target device on bus, set by driver</summary>
-        public byte TargetId;
+    /// <summary>Indicates target device on bus, set by driver</summary>
+    public byte TargetId;
 
-        /// <summary>Indicates logical unit number of device, set by driver</summary>
-        public byte Lun;
+    /// <summary>Indicates logical unit number of device, set by driver</summary>
+    public byte Lun;
 
-        /// <summary>Reserved</summary>
-        public byte ReservedAsUchar;
+    /// <summary>Reserved</summary>
+    public byte ReservedAsUchar;
 
-        /// <summary>Data transfer length in bytes</summary>
-        public uint DataTransferLength;
+    /// <summary>Data transfer length in bytes</summary>
+    public uint DataTransferLength;
 
-        /// <summary>Timeout value in seconds</summary>
-        public uint TimeOutValue;
+    /// <summary>Timeout value in seconds</summary>
+    public uint TimeOutValue;
 
-        /// <summary>Reserved</summary>
-        public uint ReservedAsUlong;
+    /// <summary>Reserved</summary>
+    public uint ReservedAsUlong;
 
-        /// <summary>Pointer to data buffer</summary>
-        public IntPtr DataBuffer;
+    /// <summary>Pointer to data buffer</summary>
+    public IntPtr DataBuffer;
 
-        /// <summary>Previous ATA registers, for LBA48</summary>
-        public AtaTaskFile PreviousTaskFile;
+    /// <summary>Previous ATA registers, for LBA48</summary>
+    public AtaTaskFile PreviousTaskFile;
 
-        /// <summary>ATA registers</summary>
-        public AtaTaskFile CurrentTaskFile;
-    }
+    /// <summary>ATA registers</summary>
+    public AtaTaskFile CurrentTaskFile;
+}
 
-    [StructLayout(LayoutKind.Explicit), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct AtaTaskFile
-    {
-        // Fields for commands sent
-        [FieldOffset(0)]
-        public byte Features;
-        [FieldOffset(6)]
-        public byte Command;
+[StructLayout(LayoutKind.Explicit), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct AtaTaskFile
+{
+    // Fields for commands sent
+    [FieldOffset(0)]
+    public byte Features;
+    [FieldOffset(6)]
+    public byte Command;
 
-        // Fields on command return
-        [FieldOffset(0)]
-        public byte Error;
-        [FieldOffset(6)]
-        public byte Status;
+    // Fields on command return
+    [FieldOffset(0)]
+    public byte Error;
+    [FieldOffset(6)]
+    public byte Status;
 
-        // Common fields
-        [FieldOffset(1)]
-        public byte SectorCount;
-        [FieldOffset(2)]
-        public byte SectorNumber;
-        [FieldOffset(3)]
-        public byte CylinderLow;
-        [FieldOffset(4)]
-        public byte CylinderHigh;
-        [FieldOffset(5)]
-        public byte DeviceHead;
-        [FieldOffset(7)]
-        public byte Reserved;
-    }
+    // Common fields
+    [FieldOffset(1)]
+    public byte SectorCount;
+    [FieldOffset(2)]
+    public byte SectorNumber;
+    [FieldOffset(3)]
+    public byte CylinderLow;
+    [FieldOffset(4)]
+    public byte CylinderHigh;
+    [FieldOffset(5)]
+    public byte DeviceHead;
+    [FieldOffset(7)]
+    public byte Reserved;
+}
 
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct StoragePropertyQuery
-    {
-        [MarshalAs(UnmanagedType.U4)]
-        public StoragePropertyId PropertyId;
-        [MarshalAs(UnmanagedType.U4)]
-        public StorageQueryType QueryType;
+[StructLayout(LayoutKind.Sequential)]
+internal struct StoragePropertyQuery
+{
+    [MarshalAs(UnmanagedType.U4)]
+    public StoragePropertyId PropertyId;
+    [MarshalAs(UnmanagedType.U4)]
+    public StorageQueryType QueryType;
 
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
-        public byte[] AdditionalParameters;
-    }
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
+    public byte[] AdditionalParameters;
+}
 
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct StorageDescriptorHeader
-    {
-        public uint Version;
-        public uint Size;
-    }
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct StorageDescriptorHeader
+{
+    public uint Version;
+    public uint Size;
+}
 
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct StorageDeviceDescriptor
-    {
-        public uint Version;
-        public uint Size;
-        public byte DeviceType;
-        public byte DeviceTypeModifier;
-        [MarshalAs(UnmanagedType.U1)]
-        public bool RemovableMedia;
-        [MarshalAs(UnmanagedType.U1)]
-        public bool CommandQueueing;
-        public int            VendorIdOffset;
-        public int            ProductIdOffset;
-        public int            ProductRevisionOffset;
-        public int            SerialNumberOffset;
-        public StorageBusType BusType;
-        public uint           RawPropertiesLength;
-        public byte[]         RawDeviceProperties;
-    }
+[StructLayout(LayoutKind.Sequential)]
+internal struct StorageDeviceDescriptor
+{
+    public uint Version;
+    public uint Size;
+    public byte DeviceType;
+    public byte DeviceTypeModifier;
+    [MarshalAs(UnmanagedType.U1)]
+    public bool RemovableMedia;
+    [MarshalAs(UnmanagedType.U1)]
+    public bool CommandQueueing;
+    public int            VendorIdOffset;
+    public int            ProductIdOffset;
+    public int            ProductRevisionOffset;
+    public int            SerialNumberOffset;
+    public StorageBusType BusType;
+    public uint           RawPropertiesLength;
+    public byte[]         RawDeviceProperties;
+}
 
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct IdePassThroughDirect
-    {
-        /// <summary>ATA registers</summary>
-        public AtaTaskFile CurrentTaskFile;
+[StructLayout(LayoutKind.Sequential)]
+internal struct IdePassThroughDirect
+{
+    /// <summary>ATA registers</summary>
+    public AtaTaskFile CurrentTaskFile;
 
-        /// <summary>Size of data buffer</summary>
-        public uint DataBufferSize;
+    /// <summary>Size of data buffer</summary>
+    public uint DataBufferSize;
 
-        /// <summary>Data buffer</summary>
-        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-        public byte[] DataBuffer;
-    }
+    /// <summary>Data buffer</summary>
+    [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
+    public byte[] DataBuffer;
+}
 
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct StorageDeviceNumber
-    {
-        public int deviceType;
-        public int deviceNumber;
-        public int partitionNumber;
-    }
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct StorageDeviceNumber
+{
+    public int deviceType;
+    public int deviceNumber;
+    public int partitionNumber;
+}
 
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct DeviceInfoData
-    {
-        public int    cbSize;
-        public Guid   classGuid;
-        public uint   devInst;
-        public IntPtr reserved;
-    }
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct DeviceInfoData
+{
+    public int    cbSize;
+    public Guid   classGuid;
+    public uint   devInst;
+    public IntPtr reserved;
+}
 
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct DeviceInterfaceData
-    {
-        public   int    cbSize;
-        public   Guid   interfaceClassGuid;
-        public   uint   flags;
-        readonly IntPtr reserved;
-    }
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct DeviceInterfaceData
+{
+    public   int    cbSize;
+    public   Guid   interfaceClassGuid;
+    public   uint   flags;
+    readonly IntPtr reserved;
+}
 
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct UsbSetupPacket
-    {
-        public byte  bmRequest;
-        public byte  bRequest;
-        public short wValue;
-        public short wIndex;
-        public short wLength;
-    }
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct UsbSetupPacket
+{
+    public byte  bmRequest;
+    public byte  bRequest;
+    public short wValue;
+    public short wIndex;
+    public short wLength;
+}
 
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct UsbDescriptorRequest
-    {
-        public int ConnectionIndex;
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct UsbDescriptorRequest
+{
+    public int ConnectionIndex;
 
-        public UsbSetupPacket SetupPacket;
+    public UsbSetupPacket SetupPacket;
 
-        //public byte[] Data;
-    }
+    //public byte[] Data;
+}
 
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct SffdiskQueryDeviceProtocolData
-    {
-        public ushort size;
-        public ushort reserved;
-        public Guid   protocolGuid;
-    }
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct SffdiskQueryDeviceProtocolData
+{
+    public ushort size;
+    public ushort reserved;
+    public Guid   protocolGuid;
+}
 
-    [StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-    internal struct SffdiskDeviceCommandData
-    {
-        public ushort      size;
-        public ushort      reserved;
-        public SffdiskDcmd command;
-        public ushort      protocolArgumentSize;
-        public uint        deviceDataBufferSize;
-        public uint        information;
-    }
+[StructLayout(LayoutKind.Sequential), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+internal struct SffdiskDeviceCommandData
+{
+    public ushort      size;
+    public ushort      reserved;
+    public SffdiskDcmd command;
+    public ushort      protocolArgumentSize;
+    public uint        deviceDataBufferSize;
+    public uint        information;
+}
 
-    [StructLayout(LayoutKind.Sequential)]
-    internal struct SdCmdDescriptor
-    {
-        public byte                commandCode;
-        public SdCommandClass      cmdClass;
-        public SdTransferDirection transferDirection;
-        public SdTransferType      transferType;
-        public SdResponseType      responseType;
-    }
+[StructLayout(LayoutKind.Sequential)]
+internal struct SdCmdDescriptor
+{
+    public byte                commandCode;
+    public SdCommandClass      cmdClass;
+    public SdTransferDirection transferDirection;
+    public SdTransferType      transferType;
+    public SdResponseType      responseType;
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Windows/Usb.cs b/Aaru.Devices/Windows/Usb.cs
index f579707cd..a7f437c8a 100644
--- a/Aaru.Devices/Windows/Usb.cs
+++ b/Aaru.Devices/Windows/Usb.cs
@@ -38,1050 +38,1049 @@ using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Aaru.Devices.Windows
+namespace Aaru.Devices.Windows;
+
+// TODO: Even after cleaning, refactoring and xml-documenting, this code needs some love
+/// <summary>Implements functions for getting and accessing information from the USB bus</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")]
+internal static partial class Usb
 {
-    // TODO: Even after cleaning, refactoring and xml-documenting, this code needs some love
-    /// <summary>Implements functions for getting and accessing information from the USB bus</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")]
-    internal static partial class Usb
+    /// <summary>Return a list of USB Host Controllers</summary>
+    /// <returns>List of USB Host Controllers</returns>
+    static IEnumerable<UsbController> GetHostControllers()
     {
-        /// <summary>Return a list of USB Host Controllers</summary>
-        /// <returns>List of USB Host Controllers</returns>
-        static IEnumerable<UsbController> GetHostControllers()
+        List<UsbController> hostList = new List<UsbController>();
+        var                 hostGuid = new Guid(GUID_DEVINTERFACE_HUBCONTROLLER);
+
+        // We start at the "root" of the device tree and look for all
+        // devices that match the interface GUID of a Hub Controller
+        IntPtr h = SetupDiGetClassDevs(ref hostGuid, 0, IntPtr.Zero, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+
+        if(h == INVALID_HANDLE_VALUE)
+            return new ReadOnlyCollection<UsbController>(hostList);
+
+        IntPtr ptrBuf = Marshal.AllocHGlobal(BUFFER_SIZE);
+        bool   success;
+        int    i = 0;
+
+        do
         {
-            List<UsbController> hostList = new List<UsbController>();
-            var                 hostGuid = new Guid(GUID_DEVINTERFACE_HUBCONTROLLER);
-
-            // We start at the "root" of the device tree and look for all
-            // devices that match the interface GUID of a Hub Controller
-            IntPtr h = SetupDiGetClassDevs(ref hostGuid, 0, IntPtr.Zero, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
-
-            if(h == INVALID_HANDLE_VALUE)
-                return new ReadOnlyCollection<UsbController>(hostList);
-
-            IntPtr ptrBuf = Marshal.AllocHGlobal(BUFFER_SIZE);
-            bool   success;
-            int    i = 0;
-
-            do
+            var host = new UsbController
             {
-                var host = new UsbController
+                ControllerIndex = i
+            };
+
+            // create a Device Interface Data structure
+            var dia = new SpDeviceInterfaceData();
+            dia.cbSize = Marshal.SizeOf(dia);
+
+            // start the enumeration
+            success = SetupDiEnumDeviceInterfaces(h, IntPtr.Zero, ref hostGuid, i, ref dia);
+
+            if(success)
+            {
+                // build a DevInfo Data structure
+                var da = new SpDevinfoData();
+                da.cbSize = Marshal.SizeOf(da);
+
+                // build a Device Interface Detail Data structure
+                var didd = new SpDeviceInterfaceDetailData
                 {
-                    ControllerIndex = i
+                    cbSize = 4 + Marshal.SystemDefaultCharSize
                 };
 
-                // create a Device Interface Data structure
-                var dia = new SpDeviceInterfaceData();
-                dia.cbSize = Marshal.SizeOf(dia);
+                // trust me :)
 
-                // start the enumeration
-                success = SetupDiEnumDeviceInterfaces(h, IntPtr.Zero, ref hostGuid, i, ref dia);
+                // now we can get some more detailed information
+                int       nRequiredSize = 0;
+                const int N_BYTES       = BUFFER_SIZE;
 
-                if(success)
+                if(SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, N_BYTES, ref nRequiredSize, ref da))
                 {
-                    // build a DevInfo Data structure
-                    var da = new SpDevinfoData();
-                    da.cbSize = Marshal.SizeOf(da);
+                    host.ControllerDevicePath = didd.DevicePath;
 
-                    // build a Device Interface Detail Data structure
-                    var didd = new SpDeviceInterfaceDetailData
-                    {
-                        cbSize = 4 + Marshal.SystemDefaultCharSize
-                    };
-
-                    // trust me :)
-
-                    // now we can get some more detailed information
-                    int       nRequiredSize = 0;
-                    const int N_BYTES       = BUFFER_SIZE;
-
-                    if(SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, N_BYTES, ref nRequiredSize, ref da))
-                    {
-                        host.ControllerDevicePath = didd.DevicePath;
-
-                        // get the Device Description and DriverKeyName
-                        int requiredSize = 0;
-                        int regType      = REG_SZ;
-
-                        if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DEVICEDESC, ref regType, ptrBuf,
-                                                            BUFFER_SIZE, ref requiredSize))
-                            host.ControllerDeviceDesc = Marshal.PtrToStringAuto(ptrBuf);
-
-                        if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DRIVER, ref regType, ptrBuf, BUFFER_SIZE,
-                                                            ref requiredSize))
-                            host.ControllerDriverKeyName = Marshal.PtrToStringAuto(ptrBuf);
-                    }
-
-                    hostList.Add(host);
-                }
-
-                i++;
-            } while(success);
-
-            Marshal.FreeHGlobal(ptrBuf);
-            SetupDiDestroyDeviceInfoList(h);
-
-            // convert it into a Collection
-            return new ReadOnlyCollection<UsbController>(hostList);
-        }
-
-        /// <summary>private function for finding a USB device's Description</summary>
-        /// <param name="driverKeyName">Device driver key name</param>
-        /// <returns>USB device description</returns>
-        static string GetDescriptionByKeyName(string driverKeyName)
-        {
-            string       ans      = "";
-            const string DEV_ENUM = REGSTR_KEY_USB;
-
-            // Use the "enumerator form" of the SetupDiGetClassDevs API
-            // to generate a list of all USB devices
-            IntPtr h = SetupDiGetClassDevs(0, DEV_ENUM, IntPtr.Zero, DIGCF_PRESENT | DIGCF_ALLCLASSES);
-
-            if(h == INVALID_HANDLE_VALUE)
-                return ans;
-
-            IntPtr ptrBuf = Marshal.AllocHGlobal(BUFFER_SIZE);
-
-            bool success;
-            int  i = 0;
-
-            do
-            {
-                // create a Device Interface Data structure
-                var da = new SpDevinfoData();
-                da.cbSize = Marshal.SizeOf(da);
-
-                // start the enumeration
-                success = SetupDiEnumDeviceInfo(h, i, ref da);
-
-                if(success)
-                {
-                    int    requiredSize = 0;
-                    int    regType      = REG_SZ;
-                    string keyName      = "";
-
-                    if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DRIVER, ref regType, ptrBuf, BUFFER_SIZE,
-                                                        ref requiredSize))
-                        keyName = Marshal.PtrToStringAuto(ptrBuf);
-
-                    // is it a match?
-                    if(keyName == driverKeyName)
-                    {
-                        if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DEVICEDESC, ref regType, ptrBuf,
-                                                            BUFFER_SIZE, ref requiredSize))
-                            ans = Marshal.PtrToStringAuto(ptrBuf);
-
-                        break;
-                    }
-                }
-
-                i++;
-            } while(success);
-
-            Marshal.FreeHGlobal(ptrBuf);
-            SetupDiDestroyDeviceInfoList(h);
-
-            return ans;
-        }
-
-        /// <summary>private function for finding a USB device's Instance ID</summary>
-        /// <param name="driverKeyName">Device driver key name</param>
-        /// <returns>Device instance ID</returns>
-        static string GetInstanceIdByKeyName(string driverKeyName)
-        {
-            string       ans      = "";
-            const string DEV_ENUM = REGSTR_KEY_USB;
-
-            // Use the "enumerator form" of the SetupDiGetClassDevs API
-            // to generate a list of all USB devices
-            IntPtr h = SetupDiGetClassDevs(0, DEV_ENUM, IntPtr.Zero, DIGCF_PRESENT | DIGCF_ALLCLASSES);
-
-            if(h == INVALID_HANDLE_VALUE)
-                return ans;
-
-            IntPtr ptrBuf = Marshal.AllocHGlobal(BUFFER_SIZE);
-
-            bool success;
-            int  i = 0;
-
-            do
-            {
-                // create a Device Interface Data structure
-                var da = new SpDevinfoData();
-                da.cbSize = Marshal.SizeOf(da);
-
-                // start the enumeration
-                success = SetupDiEnumDeviceInfo(h, i, ref da);
-
-                if(success)
-                {
+                    // get the Device Description and DriverKeyName
                     int requiredSize = 0;
                     int regType      = REG_SZ;
 
-                    string keyName = "";
+                    if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DEVICEDESC, ref regType, ptrBuf,
+                                                        BUFFER_SIZE, ref requiredSize))
+                        host.ControllerDeviceDesc = Marshal.PtrToStringAuto(ptrBuf);
 
                     if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DRIVER, ref regType, ptrBuf, BUFFER_SIZE,
                                                         ref requiredSize))
-                        keyName = Marshal.PtrToStringAuto(ptrBuf);
-
-                    // is it a match?
-                    if(keyName == driverKeyName)
-                    {
-                        const int N_BYTES = BUFFER_SIZE;
-                        var       sb      = new StringBuilder(N_BYTES);
-                        SetupDiGetDeviceInstanceId(h, ref da, sb, N_BYTES, out requiredSize);
-                        ans = sb.ToString();
-
-                        break;
-                    }
+                        host.ControllerDriverKeyName = Marshal.PtrToStringAuto(ptrBuf);
                 }
 
-                i++;
-            } while(success);
+                hostList.Add(host);
+            }
 
-            Marshal.FreeHGlobal(ptrBuf);
-            SetupDiDestroyDeviceInfoList(h);
+            i++;
+        } while(success);
 
+        Marshal.FreeHGlobal(ptrBuf);
+        SetupDiDestroyDeviceInfoList(h);
+
+        // convert it into a Collection
+        return new ReadOnlyCollection<UsbController>(hostList);
+    }
+
+    /// <summary>private function for finding a USB device's Description</summary>
+    /// <param name="driverKeyName">Device driver key name</param>
+    /// <returns>USB device description</returns>
+    static string GetDescriptionByKeyName(string driverKeyName)
+    {
+        string       ans      = "";
+        const string DEV_ENUM = REGSTR_KEY_USB;
+
+        // Use the "enumerator form" of the SetupDiGetClassDevs API
+        // to generate a list of all USB devices
+        IntPtr h = SetupDiGetClassDevs(0, DEV_ENUM, IntPtr.Zero, DIGCF_PRESENT | DIGCF_ALLCLASSES);
+
+        if(h == INVALID_HANDLE_VALUE)
             return ans;
-        }
 
-        /// <summary>Represents a USB Host Controller</summary>
-        sealed class UsbController
+        IntPtr ptrBuf = Marshal.AllocHGlobal(BUFFER_SIZE);
+
+        bool success;
+        int  i = 0;
+
+        do
         {
-            internal string ControllerDriverKeyName, ControllerDevicePath, ControllerDeviceDesc;
-            internal int    ControllerIndex;
+            // create a Device Interface Data structure
+            var da = new SpDevinfoData();
+            da.cbSize = Marshal.SizeOf(da);
 
-            /// <summary>A simple default constructor</summary>
-            internal UsbController()
+            // start the enumeration
+            success = SetupDiEnumDeviceInfo(h, i, ref da);
+
+            if(success)
             {
-                ControllerIndex         = 0;
-                ControllerDevicePath    = "";
-                ControllerDeviceDesc    = "";
-                ControllerDriverKeyName = "";
+                int    requiredSize = 0;
+                int    regType      = REG_SZ;
+                string keyName      = "";
+
+                if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DRIVER, ref regType, ptrBuf, BUFFER_SIZE,
+                                                    ref requiredSize))
+                    keyName = Marshal.PtrToStringAuto(ptrBuf);
+
+                // is it a match?
+                if(keyName == driverKeyName)
+                {
+                    if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DEVICEDESC, ref regType, ptrBuf,
+                                                        BUFFER_SIZE, ref requiredSize))
+                        ans = Marshal.PtrToStringAuto(ptrBuf);
+
+                    break;
+                }
             }
 
-            /// <summary>Return the index of the instance</summary>
-            internal int Index => ControllerIndex;
+            i++;
+        } while(success);
 
-            /// <summary>
-            ///     Return the Device Path, such as "\\?\pci#ven_10de&amp;dev_005a&amp;subsys_815a1043&amp;rev_a2#3&267a616a&0&
-            ///     58#{3abf6f2d-71c4-462a-8a92-1e6861e6af27}"
-            /// </summary>
-            internal string DevicePath => ControllerDevicePath;
+        Marshal.FreeHGlobal(ptrBuf);
+        SetupDiDestroyDeviceInfoList(h);
 
-            /// <summary>The DriverKeyName may be useful as a search key</summary>
-            internal string DriverKeyName => ControllerDriverKeyName;
+        return ans;
+    }
 
-            /// <summary>Return the Friendly Name, such as "VIA USB Enhanced Host Controller"</summary>
-            internal string Name => ControllerDeviceDesc;
+    /// <summary>private function for finding a USB device's Instance ID</summary>
+    /// <param name="driverKeyName">Device driver key name</param>
+    /// <returns>Device instance ID</returns>
+    static string GetInstanceIdByKeyName(string driverKeyName)
+    {
+        string       ans      = "";
+        const string DEV_ENUM = REGSTR_KEY_USB;
 
-            /// <summary>Return Root Hub for this Controller</summary>
-            internal UsbHub GetRootHub()
+        // Use the "enumerator form" of the SetupDiGetClassDevs API
+        // to generate a list of all USB devices
+        IntPtr h = SetupDiGetClassDevs(0, DEV_ENUM, IntPtr.Zero, DIGCF_PRESENT | DIGCF_ALLCLASSES);
+
+        if(h == INVALID_HANDLE_VALUE)
+            return ans;
+
+        IntPtr ptrBuf = Marshal.AllocHGlobal(BUFFER_SIZE);
+
+        bool success;
+        int  i = 0;
+
+        do
+        {
+            // create a Device Interface Data structure
+            var da = new SpDevinfoData();
+            da.cbSize = Marshal.SizeOf(da);
+
+            // start the enumeration
+            success = SetupDiEnumDeviceInfo(h, i, ref da);
+
+            if(success)
             {
-                IntPtr h, h2;
+                int requiredSize = 0;
+                int regType      = REG_SZ;
 
-                var root = new UsbHub
+                string keyName = "";
+
+                if(SetupDiGetDeviceRegistryProperty(h, ref da, SPDRP_DRIVER, ref regType, ptrBuf, BUFFER_SIZE,
+                                                    ref requiredSize))
+                    keyName = Marshal.PtrToStringAuto(ptrBuf);
+
+                // is it a match?
+                if(keyName == driverKeyName)
                 {
-                    HubIsRootHub  = true,
-                    HubDeviceDesc = "Root Hub"
-                };
+                    const int N_BYTES = BUFFER_SIZE;
+                    var       sb      = new StringBuilder(N_BYTES);
+                    SetupDiGetDeviceInstanceId(h, ref da, sb, N_BYTES, out requiredSize);
+                    ans = sb.ToString();
 
-                // Open a handle to the Host Controller
-                h = CreateFile(ControllerDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
-                               IntPtr.Zero);
-
-                if(h == INVALID_HANDLE_VALUE)
-                    return root;
-
-                var    hubName    = new UsbRootHubName();
-                int    nBytes     = Marshal.SizeOf(hubName);
-                IntPtr ptrHubName = Marshal.AllocHGlobal(nBytes);
-
-                // get the Hub Name
-                if(DeviceIoControl(h, IOCTL_USB_GET_ROOT_HUB_NAME, ptrHubName, nBytes, ptrHubName, nBytes, out _,
-                                   IntPtr.Zero))
-                {
-                    hubName            = (UsbRootHubName)Marshal.PtrToStructure(ptrHubName, typeof(UsbRootHubName));
-                    root.HubDevicePath = @"\\.\" + hubName.RootHubName;
+                    break;
                 }
+            }
 
-                // TODO: Get DriverKeyName for Root Hub
+            i++;
+        } while(success);
 
-                // Now let's open the Hub (based upon the HubName we got above)
-                h2 = CreateFile(root.HubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
-                                IntPtr.Zero);
+        Marshal.FreeHGlobal(ptrBuf);
+        SetupDiDestroyDeviceInfoList(h);
 
-                if(h2 != INVALID_HANDLE_VALUE)
-                {
-                    var nodeInfo = new UsbNodeInformation
-                    {
-                        NodeType = (int)UsbHubNode.UsbHub
-                    };
+        return ans;
+    }
 
-                    nBytes = Marshal.SizeOf(nodeInfo);
-                    IntPtr ptrNodeInfo = Marshal.AllocHGlobal(nBytes);
-                    Marshal.StructureToPtr(nodeInfo, ptrNodeInfo, true);
+    /// <summary>Represents a USB Host Controller</summary>
+    sealed class UsbController
+    {
+        internal string ControllerDriverKeyName, ControllerDevicePath, ControllerDeviceDesc;
+        internal int    ControllerIndex;
 
-                    // get the Hub Information
-                    if(DeviceIoControl(h2, IOCTL_USB_GET_NODE_INFORMATION, ptrNodeInfo, nBytes, ptrNodeInfo, nBytes,
-                                       out _, IntPtr.Zero))
-                    {
-                        nodeInfo = (UsbNodeInformation)Marshal.PtrToStructure(ptrNodeInfo, typeof(UsbNodeInformation));
+        /// <summary>A simple default constructor</summary>
+        internal UsbController()
+        {
+            ControllerIndex         = 0;
+            ControllerDevicePath    = "";
+            ControllerDeviceDesc    = "";
+            ControllerDriverKeyName = "";
+        }
 
-                        root.HubIsBusPowered = Convert.ToBoolean(nodeInfo.HubInformation.HubIsBusPowered);
-                        root.HubPortCount    = nodeInfo.HubInformation.HubDescriptor.bNumberOfPorts;
-                    }
+        /// <summary>Return the index of the instance</summary>
+        internal int Index => ControllerIndex;
 
-                    Marshal.FreeHGlobal(ptrNodeInfo);
-                    CloseHandle(h2);
-                }
+        /// <summary>
+        ///     Return the Device Path, such as "\\?\pci#ven_10de&amp;dev_005a&amp;subsys_815a1043&amp;rev_a2#3&267a616a&0&
+        ///     58#{3abf6f2d-71c4-462a-8a92-1e6861e6af27}"
+        /// </summary>
+        internal string DevicePath => ControllerDevicePath;
 
-                Marshal.FreeHGlobal(ptrHubName);
-                CloseHandle(h);
+        /// <summary>The DriverKeyName may be useful as a search key</summary>
+        internal string DriverKeyName => ControllerDriverKeyName;
 
+        /// <summary>Return the Friendly Name, such as "VIA USB Enhanced Host Controller"</summary>
+        internal string Name => ControllerDeviceDesc;
+
+        /// <summary>Return Root Hub for this Controller</summary>
+        internal UsbHub GetRootHub()
+        {
+            IntPtr h, h2;
+
+            var root = new UsbHub
+            {
+                HubIsRootHub  = true,
+                HubDeviceDesc = "Root Hub"
+            };
+
+            // Open a handle to the Host Controller
+            h = CreateFile(ControllerDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
+                           IntPtr.Zero);
+
+            if(h == INVALID_HANDLE_VALUE)
                 return root;
-            }
-        }
 
-        /// <summary>The Hub class</summary>
-        internal class UsbHub
-        {
-            internal string HubDriverKey,    HubDevicePath, HubDeviceDesc;
-            internal bool   HubIsBusPowered, HubIsRootHub;
-            internal string HubManufacturer, HubProduct, HubSerialNumber, HubInstanceId;
-            internal int    HubPortCount;
+            var    hubName    = new UsbRootHubName();
+            int    nBytes     = Marshal.SizeOf(hubName);
+            IntPtr ptrHubName = Marshal.AllocHGlobal(nBytes);
 
-            /// <summary>a simple default constructor</summary>
-            internal UsbHub()
+            // get the Hub Name
+            if(DeviceIoControl(h, IOCTL_USB_GET_ROOT_HUB_NAME, ptrHubName, nBytes, ptrHubName, nBytes, out _,
+                               IntPtr.Zero))
             {
-                HubPortCount    = 0;
-                HubDevicePath   = "";
-                HubDeviceDesc   = "";
-                HubDriverKey    = "";
-                HubIsBusPowered = false;
-                HubIsRootHub    = false;
-                HubManufacturer = "";
-                HubProduct      = "";
-                HubSerialNumber = "";
-                HubInstanceId   = "";
+                hubName            = (UsbRootHubName)Marshal.PtrToStructure(ptrHubName, typeof(UsbRootHubName));
+                root.HubDevicePath = @"\\.\" + hubName.RootHubName;
             }
 
-            /// <summary>return Port Count</summary>
-            internal int PortCount => HubPortCount;
+            // TODO: Get DriverKeyName for Root Hub
 
-            /// <summary>
-            ///     return the Device Path, such as "\\?\pci#ven_10de&amp;dev_005a&amp;subsys_815a1043&amp;rev_a2#3&267a616a&0&
-            ///     58#{3abf6f2d-71c4-462a-8a92-1e6861e6af27}"
-            /// </summary>
-            internal string DevicePath => HubDevicePath;
+            // Now let's open the Hub (based upon the HubName we got above)
+            h2 = CreateFile(root.HubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
+                            IntPtr.Zero);
 
-            /// <summary>The DriverKey may be useful as a search key</summary>
-            internal string DriverKey => HubDriverKey;
-
-            /// <summary>return the Friendly Name, such as "VIA USB Enhanced Host Controller"</summary>
-            internal string Name => HubDeviceDesc;
-
-            /// <summary>the device path of this device</summary>
-            internal string InstanceId => HubInstanceId;
-
-            /// <summary>is is this a self-powered hub?</summary>
-            internal bool IsBusPowered => HubIsBusPowered;
-
-            /// <summary>is this a root hub?</summary>
-            internal bool IsRootHub => HubIsRootHub;
-
-            internal string Manufacturer => HubManufacturer;
-
-            internal string Product => HubProduct;
-
-            internal string SerialNumber => HubSerialNumber;
-
-            /// <summary>return a list of the down stream ports</summary>
-            /// <returns>List of downstream ports</returns>
-            internal IEnumerable<UsbPort> GetPorts()
+            if(h2 != INVALID_HANDLE_VALUE)
             {
-                List<UsbPort> portList = new List<UsbPort>();
-
-                // Open a handle to the Hub device
-                IntPtr h = CreateFile(HubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
-                                      IntPtr.Zero);
-
-                if(h == INVALID_HANDLE_VALUE)
-                    return new ReadOnlyCollection<UsbPort>(portList);
-
-                int    nBytes            = Marshal.SizeOf(typeof(UsbNodeConnectionInformationEx));
-                IntPtr ptrNodeConnection = Marshal.AllocHGlobal(nBytes);
-
-                // loop thru all of the ports on the hub
-                // BTW: Ports are numbered starting at 1
-                for(int i = 1; i <= HubPortCount; i++)
+                var nodeInfo = new UsbNodeInformation
                 {
-                    var nodeConnection = new UsbNodeConnectionInformationEx
-                    {
-                        ConnectionIndex = i
-                    };
-
-                    Marshal.StructureToPtr(nodeConnection, ptrNodeConnection, true);
-
-                    if(!DeviceIoControl(h, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX, ptrNodeConnection, nBytes,
-                                        ptrNodeConnection, nBytes, out _, IntPtr.Zero))
-                        continue;
-
-                    nodeConnection =
-                        (UsbNodeConnectionInformationEx)Marshal.PtrToStructure(ptrNodeConnection,
-                                                                               typeof(UsbNodeConnectionInformationEx));
-
-                    // load up the USBPort class
-                    var port = new UsbPort
-                    {
-                        PortPortNumber    = i,
-                        PortHubDevicePath = HubDevicePath,
-                        PortStatus        = ((UsbConnectionStatus)nodeConnection.ConnectionStatus).ToString(),
-                        PortSpeed         = ((UsbDeviceSpeed)nodeConnection.Speed).ToString(),
-                        PortIsDeviceConnected =
-                            nodeConnection.ConnectionStatus == (int)UsbConnectionStatus.DeviceConnected,
-                        PortIsHub            = Convert.ToBoolean(nodeConnection.DeviceIsHub),
-                        PortDeviceDescriptor = nodeConnection.DeviceDescriptor
-                    };
-
-                    // add it to the list
-                    portList.Add(port);
-                }
-
-                Marshal.FreeHGlobal(ptrNodeConnection);
-                CloseHandle(h);
-
-                // convert it into a Collection
-                return new ReadOnlyCollection<UsbPort>(portList);
-            }
-        }
-
-        /// <summary>Represents an USB port</summary>
-        internal class UsbPort
-        {
-            internal UsbDeviceDescriptor PortDeviceDescriptor;
-            internal bool                PortIsHub, PortIsDeviceConnected;
-            internal int                 PortPortNumber;
-            internal string              PortStatus, PortHubDevicePath, PortSpeed;
-
-            /// <summary>a simple default constructor</summary>
-            internal UsbPort()
-            {
-                PortPortNumber        = 0;
-                PortStatus            = "";
-                PortHubDevicePath     = "";
-                PortSpeed             = "";
-                PortIsHub             = false;
-                PortIsDeviceConnected = false;
-            }
-
-            /// <summary>return Port Index of the Hub</summary>
-            internal int PortNumber => PortPortNumber;
-
-            /// <summary>return the Device Path of the Hub</summary>
-            internal string HubDevicePath => PortHubDevicePath;
-
-            /// <summary>the status (see USB_CONNECTION_STATUS above)</summary>
-            internal string Status => PortStatus;
-
-            /// <summary>the speed of the connection (see USB_DEVICE_SPEED above)</summary>
-            internal string Speed => PortSpeed;
-
-            /// <summary>is this a downstream external hub?</summary>
-            internal bool IsHub => PortIsHub;
-
-            /// <summary>is anybody home?</summary>
-            internal bool IsDeviceConnected => PortIsDeviceConnected;
-
-            /// <summary>return a down stream external hub</summary>
-            /// <returns>Downstream external hub</returns>
-            internal UsbDevice GetDevice()
-            {
-                if(!PortIsDeviceConnected)
-                    return null;
-
-                // Copy over some values from the Port class
-                // Ya know, I've given some thought about making Device a derived class...
-                var device = new UsbDevice
-                {
-                    DevicePortNumber    = PortPortNumber,
-                    DeviceHubDevicePath = PortHubDevicePath,
-                    DeviceDescriptor    = PortDeviceDescriptor
+                    NodeType = (int)UsbHubNode.UsbHub
                 };
 
-                // Open a handle to the Hub device
-                IntPtr h = CreateFile(PortHubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
-                                      IntPtr.Zero);
+                nBytes = Marshal.SizeOf(nodeInfo);
+                IntPtr ptrNodeInfo = Marshal.AllocHGlobal(nBytes);
+                Marshal.StructureToPtr(nodeInfo, ptrNodeInfo, true);
 
-                if(h == INVALID_HANDLE_VALUE)
-                    return device;
-
-                int nBytesReturned;
-                int nBytes = BUFFER_SIZE;
-
-                // We use this to zero fill a buffer
-                string nullString = new string((char)0, BUFFER_SIZE / Marshal.SystemDefaultCharSize);
-
-                // The iManufacturer, iProduct and iSerialNumber entries in the
-                // Device Descriptor are really just indexes.  So, we have to
-                // request a String Descriptor to get the values for those strings.
-
-                if(PortDeviceDescriptor.iManufacturer > 0)
+                // get the Hub Information
+                if(DeviceIoControl(h2, IOCTL_USB_GET_NODE_INFORMATION, ptrNodeInfo, nBytes, ptrNodeInfo, nBytes,
+                                   out _, IntPtr.Zero))
                 {
-                    // build a request for string descriptor
-                    var request = new UsbDescriptorRequest
-                    {
-                        ConnectionIndex = PortPortNumber,
-                        SetupPacket =
-                        {
-                            // Language Code
-                            wIndex = 0x409,
-                            wValue = (short)((USB_STRING_DESCRIPTOR_TYPE << 8) + PortDeviceDescriptor.iManufacturer)
-                        }
-                    };
+                    nodeInfo = (UsbNodeInformation)Marshal.PtrToStructure(ptrNodeInfo, typeof(UsbNodeInformation));
 
-                    request.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(request));
-
-                    // Geez, I wish C# had a Marshal.MemSet() method
-                    IntPtr ptrRequest = Marshal.StringToHGlobalAuto(nullString);
-                    Marshal.StructureToPtr(request, ptrRequest, true);
-
-                    // Use an IOCTL call to request the String Descriptor
-                    if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes, ptrRequest,
-                                       nBytes, out nBytesReturned, IntPtr.Zero))
-                    {
-                        // The location of the string descriptor is immediately after
-                        // the Request structure.  Because this location is not "covered"
-                        // by the structure allocation, we're forced to zero out this
-                        // chunk of memory by using the StringToHGlobalAuto() hack above
-                        var ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
-
-                        var stringDesc =
-                            (UsbStringDescriptor)Marshal.PtrToStructure(ptrStringDesc, typeof(UsbStringDescriptor));
-
-                        device.DeviceManufacturer = stringDesc.bString;
-                    }
-
-                    Marshal.FreeHGlobal(ptrRequest);
+                    root.HubIsBusPowered = Convert.ToBoolean(nodeInfo.HubInformation.HubIsBusPowered);
+                    root.HubPortCount    = nodeInfo.HubInformation.HubDescriptor.bNumberOfPorts;
                 }
 
-                if(PortDeviceDescriptor.iProduct > 0)
+                Marshal.FreeHGlobal(ptrNodeInfo);
+                CloseHandle(h2);
+            }
+
+            Marshal.FreeHGlobal(ptrHubName);
+            CloseHandle(h);
+
+            return root;
+        }
+    }
+
+    /// <summary>The Hub class</summary>
+    internal class UsbHub
+    {
+        internal string HubDriverKey,    HubDevicePath, HubDeviceDesc;
+        internal bool   HubIsBusPowered, HubIsRootHub;
+        internal string HubManufacturer, HubProduct, HubSerialNumber, HubInstanceId;
+        internal int    HubPortCount;
+
+        /// <summary>a simple default constructor</summary>
+        internal UsbHub()
+        {
+            HubPortCount    = 0;
+            HubDevicePath   = "";
+            HubDeviceDesc   = "";
+            HubDriverKey    = "";
+            HubIsBusPowered = false;
+            HubIsRootHub    = false;
+            HubManufacturer = "";
+            HubProduct      = "";
+            HubSerialNumber = "";
+            HubInstanceId   = "";
+        }
+
+        /// <summary>return Port Count</summary>
+        internal int PortCount => HubPortCount;
+
+        /// <summary>
+        ///     return the Device Path, such as "\\?\pci#ven_10de&amp;dev_005a&amp;subsys_815a1043&amp;rev_a2#3&267a616a&0&
+        ///     58#{3abf6f2d-71c4-462a-8a92-1e6861e6af27}"
+        /// </summary>
+        internal string DevicePath => HubDevicePath;
+
+        /// <summary>The DriverKey may be useful as a search key</summary>
+        internal string DriverKey => HubDriverKey;
+
+        /// <summary>return the Friendly Name, such as "VIA USB Enhanced Host Controller"</summary>
+        internal string Name => HubDeviceDesc;
+
+        /// <summary>the device path of this device</summary>
+        internal string InstanceId => HubInstanceId;
+
+        /// <summary>is is this a self-powered hub?</summary>
+        internal bool IsBusPowered => HubIsBusPowered;
+
+        /// <summary>is this a root hub?</summary>
+        internal bool IsRootHub => HubIsRootHub;
+
+        internal string Manufacturer => HubManufacturer;
+
+        internal string Product => HubProduct;
+
+        internal string SerialNumber => HubSerialNumber;
+
+        /// <summary>return a list of the down stream ports</summary>
+        /// <returns>List of downstream ports</returns>
+        internal IEnumerable<UsbPort> GetPorts()
+        {
+            List<UsbPort> portList = new List<UsbPort>();
+
+            // Open a handle to the Hub device
+            IntPtr h = CreateFile(HubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
+                                  IntPtr.Zero);
+
+            if(h == INVALID_HANDLE_VALUE)
+                return new ReadOnlyCollection<UsbPort>(portList);
+
+            int    nBytes            = Marshal.SizeOf(typeof(UsbNodeConnectionInformationEx));
+            IntPtr ptrNodeConnection = Marshal.AllocHGlobal(nBytes);
+
+            // loop thru all of the ports on the hub
+            // BTW: Ports are numbered starting at 1
+            for(int i = 1; i <= HubPortCount; i++)
+            {
+                var nodeConnection = new UsbNodeConnectionInformationEx
                 {
-                    // build a request for string descriptor
-                    var request = new UsbDescriptorRequest
-                    {
-                        ConnectionIndex = PortPortNumber,
-                        SetupPacket =
-                        {
-                            // Language Code
-                            wIndex = 0x409,
-                            wValue = (short)((USB_STRING_DESCRIPTOR_TYPE << 8) + PortDeviceDescriptor.iProduct)
-                        }
-                    };
+                    ConnectionIndex = i
+                };
 
-                    request.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(request));
+                Marshal.StructureToPtr(nodeConnection, ptrNodeConnection, true);
 
-                    // Geez, I wish C# had a Marshal.MemSet() method
-                    IntPtr ptrRequest = Marshal.StringToHGlobalAuto(nullString);
-                    Marshal.StructureToPtr(request, ptrRequest, true);
+                if(!DeviceIoControl(h, IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX, ptrNodeConnection, nBytes,
+                                    ptrNodeConnection, nBytes, out _, IntPtr.Zero))
+                    continue;
 
-                    // Use an IOCTL call to request the String Descriptor
-                    if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes, ptrRequest,
-                                       nBytes, out nBytesReturned, IntPtr.Zero))
-                    {
-                        // the location of the string descriptor is immediately after the Request structure
-                        var ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
+                nodeConnection =
+                    (UsbNodeConnectionInformationEx)Marshal.PtrToStructure(ptrNodeConnection,
+                                                                           typeof(UsbNodeConnectionInformationEx));
 
-                        var stringDesc =
-                            (UsbStringDescriptor)Marshal.PtrToStructure(ptrStringDesc, typeof(UsbStringDescriptor));
-
-                        device.DeviceProduct = stringDesc.bString;
-                    }
-
-                    Marshal.FreeHGlobal(ptrRequest);
-                }
-
-                if(PortDeviceDescriptor.iSerialNumber > 0)
+                // load up the USBPort class
+                var port = new UsbPort
                 {
-                    // build a request for string descriptor
-                    var request = new UsbDescriptorRequest
-                    {
-                        ConnectionIndex = PortPortNumber,
-                        SetupPacket =
-                        {
-                            // Language Code
-                            wIndex = 0x409,
-                            wValue = (short)((USB_STRING_DESCRIPTOR_TYPE << 8) + PortDeviceDescriptor.iSerialNumber)
-                        }
-                    };
+                    PortPortNumber    = i,
+                    PortHubDevicePath = HubDevicePath,
+                    PortStatus        = ((UsbConnectionStatus)nodeConnection.ConnectionStatus).ToString(),
+                    PortSpeed         = ((UsbDeviceSpeed)nodeConnection.Speed).ToString(),
+                    PortIsDeviceConnected =
+                        nodeConnection.ConnectionStatus == (int)UsbConnectionStatus.DeviceConnected,
+                    PortIsHub            = Convert.ToBoolean(nodeConnection.DeviceIsHub),
+                    PortDeviceDescriptor = nodeConnection.DeviceDescriptor
+                };
 
-                    request.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(request));
+                // add it to the list
+                portList.Add(port);
+            }
 
-                    // Geez, I wish C# had a Marshal.MemSet() method
-                    IntPtr ptrRequest = Marshal.StringToHGlobalAuto(nullString);
-                    Marshal.StructureToPtr(request, ptrRequest, true);
+            Marshal.FreeHGlobal(ptrNodeConnection);
+            CloseHandle(h);
 
-                    // Use an IOCTL call to request the String Descriptor
-                    if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes, ptrRequest,
-                                       nBytes, out nBytesReturned, IntPtr.Zero))
-                    {
-                        // the location of the string descriptor is immediately after the Request structure
-                        var ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
+            // convert it into a Collection
+            return new ReadOnlyCollection<UsbPort>(portList);
+        }
+    }
 
-                        var stringDesc =
-                            (UsbStringDescriptor)Marshal.PtrToStructure(ptrStringDesc, typeof(UsbStringDescriptor));
+    /// <summary>Represents an USB port</summary>
+    internal class UsbPort
+    {
+        internal UsbDeviceDescriptor PortDeviceDescriptor;
+        internal bool                PortIsHub, PortIsDeviceConnected;
+        internal int                 PortPortNumber;
+        internal string              PortStatus, PortHubDevicePath, PortSpeed;
 
-                        device.DeviceSerialNumber = stringDesc.bString;
-                    }
+        /// <summary>a simple default constructor</summary>
+        internal UsbPort()
+        {
+            PortPortNumber        = 0;
+            PortStatus            = "";
+            PortHubDevicePath     = "";
+            PortSpeed             = "";
+            PortIsHub             = false;
+            PortIsDeviceConnected = false;
+        }
 
-                    Marshal.FreeHGlobal(ptrRequest);
-                }
+        /// <summary>return Port Index of the Hub</summary>
+        internal int PortNumber => PortPortNumber;
 
-                // build a request for configuration descriptor
-                var dcrRequest = new UsbDescriptorRequest
+        /// <summary>return the Device Path of the Hub</summary>
+        internal string HubDevicePath => PortHubDevicePath;
+
+        /// <summary>the status (see USB_CONNECTION_STATUS above)</summary>
+        internal string Status => PortStatus;
+
+        /// <summary>the speed of the connection (see USB_DEVICE_SPEED above)</summary>
+        internal string Speed => PortSpeed;
+
+        /// <summary>is this a downstream external hub?</summary>
+        internal bool IsHub => PortIsHub;
+
+        /// <summary>is anybody home?</summary>
+        internal bool IsDeviceConnected => PortIsDeviceConnected;
+
+        /// <summary>return a down stream external hub</summary>
+        /// <returns>Downstream external hub</returns>
+        internal UsbDevice GetDevice()
+        {
+            if(!PortIsDeviceConnected)
+                return null;
+
+            // Copy over some values from the Port class
+            // Ya know, I've given some thought about making Device a derived class...
+            var device = new UsbDevice
+            {
+                DevicePortNumber    = PortPortNumber,
+                DeviceHubDevicePath = PortHubDevicePath,
+                DeviceDescriptor    = PortDeviceDescriptor
+            };
+
+            // Open a handle to the Hub device
+            IntPtr h = CreateFile(PortHubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
+                                  IntPtr.Zero);
+
+            if(h == INVALID_HANDLE_VALUE)
+                return device;
+
+            int nBytesReturned;
+            int nBytes = BUFFER_SIZE;
+
+            // We use this to zero fill a buffer
+            string nullString = new string((char)0, BUFFER_SIZE / Marshal.SystemDefaultCharSize);
+
+            // The iManufacturer, iProduct and iSerialNumber entries in the
+            // Device Descriptor are really just indexes.  So, we have to
+            // request a String Descriptor to get the values for those strings.
+
+            if(PortDeviceDescriptor.iManufacturer > 0)
+            {
+                // build a request for string descriptor
+                var request = new UsbDescriptorRequest
                 {
                     ConnectionIndex = PortPortNumber,
                     SetupPacket =
                     {
-                        wIndex = 0,
-                        wValue = USB_CONFIGURATION_DESCRIPTOR_TYPE << 8
+                        // Language Code
+                        wIndex = 0x409,
+                        wValue = (short)((USB_STRING_DESCRIPTOR_TYPE << 8) + PortDeviceDescriptor.iManufacturer)
                     }
                 };
 
-                dcrRequest.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(dcrRequest));
+                request.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(request));
 
                 // Geez, I wish C# had a Marshal.MemSet() method
-                IntPtr dcrPtrRequest = Marshal.StringToHGlobalAuto(nullString);
-                Marshal.StructureToPtr(dcrRequest, dcrPtrRequest, true);
+                IntPtr ptrRequest = Marshal.StringToHGlobalAuto(nullString);
+                Marshal.StructureToPtr(request, ptrRequest, true);
 
                 // Use an IOCTL call to request the String Descriptor
-                if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, dcrPtrRequest, nBytes,
-                                   dcrPtrRequest, nBytes, out nBytesReturned, IntPtr.Zero))
-                {
-                    var ptrStringDesc = IntPtr.Add(dcrPtrRequest, Marshal.SizeOf(dcrRequest));
-                    device.BinaryDeviceDescriptors = new byte[nBytesReturned];
-                    Marshal.Copy(ptrStringDesc, device.BinaryDeviceDescriptors, 0, nBytesReturned);
-                }
-
-                Marshal.FreeHGlobal(dcrPtrRequest);
-
-                // Get the Driver Key Name (usefull in locating a device)
-                var driverKey = new UsbNodeConnectionDriverkeyName
-                {
-                    ConnectionIndex = PortPortNumber
-                };
-
-                nBytes = Marshal.SizeOf(driverKey);
-                IntPtr ptrDriverKey = Marshal.AllocHGlobal(nBytes);
-                Marshal.StructureToPtr(driverKey, ptrDriverKey, true);
-
-                // Use an IOCTL call to request the Driver Key Name
-                if(DeviceIoControl(h, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME, ptrDriverKey, nBytes, ptrDriverKey,
+                if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes, ptrRequest,
                                    nBytes, out nBytesReturned, IntPtr.Zero))
                 {
-                    driverKey = (UsbNodeConnectionDriverkeyName)Marshal.PtrToStructure(ptrDriverKey,
-                        typeof(UsbNodeConnectionDriverkeyName));
+                    // The location of the string descriptor is immediately after
+                    // the Request structure.  Because this location is not "covered"
+                    // by the structure allocation, we're forced to zero out this
+                    // chunk of memory by using the StringToHGlobalAuto() hack above
+                    var ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
 
-                    device.DeviceDriverKey = driverKey.DriverKeyName;
+                    var stringDesc =
+                        (UsbStringDescriptor)Marshal.PtrToStructure(ptrStringDesc, typeof(UsbStringDescriptor));
 
-                    // use the DriverKeyName to get the Device Description and Instance ID
-                    device.DeviceName       = GetDescriptionByKeyName(device.DeviceDriverKey);
-                    device.DeviceInstanceId = GetInstanceIdByKeyName(device.DeviceDriverKey);
+                    device.DeviceManufacturer = stringDesc.bString;
                 }
 
-                Marshal.FreeHGlobal(ptrDriverKey);
-                CloseHandle(h);
-
-                return device;
+                Marshal.FreeHGlobal(ptrRequest);
             }
 
-            /// <summary>return a down stream external hub</summary>
-            /// <returns>Downstream external hub</returns>
-            internal UsbHub GetHub()
+            if(PortDeviceDescriptor.iProduct > 0)
             {
-                if(!PortIsHub)
-                    return null;
-
-                var    hub = new UsbHub();
-                IntPtr h, h2;
-                hub.HubIsRootHub  = false;
-                hub.HubDeviceDesc = "External Hub";
-
-                // Open a handle to the Host Controller
-                h = CreateFile(PortHubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
-                               IntPtr.Zero);
-
-                if(h == INVALID_HANDLE_VALUE)
-                    return hub;
-
-                // Get the DevicePath for downstream hub
-                var nodeName = new UsbNodeConnectionName
+                // build a request for string descriptor
+                var request = new UsbDescriptorRequest
                 {
-                    ConnectionIndex = PortPortNumber
+                    ConnectionIndex = PortPortNumber,
+                    SetupPacket =
+                    {
+                        // Language Code
+                        wIndex = 0x409,
+                        wValue = (short)((USB_STRING_DESCRIPTOR_TYPE << 8) + PortDeviceDescriptor.iProduct)
+                    }
                 };
 
-                int    nBytes      = Marshal.SizeOf(nodeName);
-                IntPtr ptrNodeName = Marshal.AllocHGlobal(nBytes);
-                Marshal.StructureToPtr(nodeName, ptrNodeName, true);
+                request.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(request));
 
-                // Use an IOCTL call to request the Node Name
-                if(DeviceIoControl(h, IOCTL_USB_GET_NODE_CONNECTION_NAME, ptrNodeName, nBytes, ptrNodeName, nBytes,
+                // Geez, I wish C# had a Marshal.MemSet() method
+                IntPtr ptrRequest = Marshal.StringToHGlobalAuto(nullString);
+                Marshal.StructureToPtr(request, ptrRequest, true);
+
+                // Use an IOCTL call to request the String Descriptor
+                if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes, ptrRequest,
+                                   nBytes, out nBytesReturned, IntPtr.Zero))
+                {
+                    // the location of the string descriptor is immediately after the Request structure
+                    var ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
+
+                    var stringDesc =
+                        (UsbStringDescriptor)Marshal.PtrToStructure(ptrStringDesc, typeof(UsbStringDescriptor));
+
+                    device.DeviceProduct = stringDesc.bString;
+                }
+
+                Marshal.FreeHGlobal(ptrRequest);
+            }
+
+            if(PortDeviceDescriptor.iSerialNumber > 0)
+            {
+                // build a request for string descriptor
+                var request = new UsbDescriptorRequest
+                {
+                    ConnectionIndex = PortPortNumber,
+                    SetupPacket =
+                    {
+                        // Language Code
+                        wIndex = 0x409,
+                        wValue = (short)((USB_STRING_DESCRIPTOR_TYPE << 8) + PortDeviceDescriptor.iSerialNumber)
+                    }
+                };
+
+                request.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(request));
+
+                // Geez, I wish C# had a Marshal.MemSet() method
+                IntPtr ptrRequest = Marshal.StringToHGlobalAuto(nullString);
+                Marshal.StructureToPtr(request, ptrRequest, true);
+
+                // Use an IOCTL call to request the String Descriptor
+                if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, ptrRequest, nBytes, ptrRequest,
+                                   nBytes, out nBytesReturned, IntPtr.Zero))
+                {
+                    // the location of the string descriptor is immediately after the Request structure
+                    var ptrStringDesc = IntPtr.Add(ptrRequest, Marshal.SizeOf(request));
+
+                    var stringDesc =
+                        (UsbStringDescriptor)Marshal.PtrToStructure(ptrStringDesc, typeof(UsbStringDescriptor));
+
+                    device.DeviceSerialNumber = stringDesc.bString;
+                }
+
+                Marshal.FreeHGlobal(ptrRequest);
+            }
+
+            // build a request for configuration descriptor
+            var dcrRequest = new UsbDescriptorRequest
+            {
+                ConnectionIndex = PortPortNumber,
+                SetupPacket =
+                {
+                    wIndex = 0,
+                    wValue = USB_CONFIGURATION_DESCRIPTOR_TYPE << 8
+                }
+            };
+
+            dcrRequest.SetupPacket.wLength = (short)(nBytes - Marshal.SizeOf(dcrRequest));
+
+            // Geez, I wish C# had a Marshal.MemSet() method
+            IntPtr dcrPtrRequest = Marshal.StringToHGlobalAuto(nullString);
+            Marshal.StructureToPtr(dcrRequest, dcrPtrRequest, true);
+
+            // Use an IOCTL call to request the String Descriptor
+            if(DeviceIoControl(h, IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION, dcrPtrRequest, nBytes,
+                               dcrPtrRequest, nBytes, out nBytesReturned, IntPtr.Zero))
+            {
+                var ptrStringDesc = IntPtr.Add(dcrPtrRequest, Marshal.SizeOf(dcrRequest));
+                device.BinaryDeviceDescriptors = new byte[nBytesReturned];
+                Marshal.Copy(ptrStringDesc, device.BinaryDeviceDescriptors, 0, nBytesReturned);
+            }
+
+            Marshal.FreeHGlobal(dcrPtrRequest);
+
+            // Get the Driver Key Name (usefull in locating a device)
+            var driverKey = new UsbNodeConnectionDriverkeyName
+            {
+                ConnectionIndex = PortPortNumber
+            };
+
+            nBytes = Marshal.SizeOf(driverKey);
+            IntPtr ptrDriverKey = Marshal.AllocHGlobal(nBytes);
+            Marshal.StructureToPtr(driverKey, ptrDriverKey, true);
+
+            // Use an IOCTL call to request the Driver Key Name
+            if(DeviceIoControl(h, IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME, ptrDriverKey, nBytes, ptrDriverKey,
+                               nBytes, out nBytesReturned, IntPtr.Zero))
+            {
+                driverKey = (UsbNodeConnectionDriverkeyName)Marshal.PtrToStructure(ptrDriverKey,
+                    typeof(UsbNodeConnectionDriverkeyName));
+
+                device.DeviceDriverKey = driverKey.DriverKeyName;
+
+                // use the DriverKeyName to get the Device Description and Instance ID
+                device.DeviceName       = GetDescriptionByKeyName(device.DeviceDriverKey);
+                device.DeviceInstanceId = GetInstanceIdByKeyName(device.DeviceDriverKey);
+            }
+
+            Marshal.FreeHGlobal(ptrDriverKey);
+            CloseHandle(h);
+
+            return device;
+        }
+
+        /// <summary>return a down stream external hub</summary>
+        /// <returns>Downstream external hub</returns>
+        internal UsbHub GetHub()
+        {
+            if(!PortIsHub)
+                return null;
+
+            var    hub = new UsbHub();
+            IntPtr h, h2;
+            hub.HubIsRootHub  = false;
+            hub.HubDeviceDesc = "External Hub";
+
+            // Open a handle to the Host Controller
+            h = CreateFile(PortHubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
+                           IntPtr.Zero);
+
+            if(h == INVALID_HANDLE_VALUE)
+                return hub;
+
+            // Get the DevicePath for downstream hub
+            var nodeName = new UsbNodeConnectionName
+            {
+                ConnectionIndex = PortPortNumber
+            };
+
+            int    nBytes      = Marshal.SizeOf(nodeName);
+            IntPtr ptrNodeName = Marshal.AllocHGlobal(nBytes);
+            Marshal.StructureToPtr(nodeName, ptrNodeName, true);
+
+            // Use an IOCTL call to request the Node Name
+            if(DeviceIoControl(h, IOCTL_USB_GET_NODE_CONNECTION_NAME, ptrNodeName, nBytes, ptrNodeName, nBytes,
+                               out _, IntPtr.Zero))
+            {
+                nodeName = (UsbNodeConnectionName)Marshal.PtrToStructure(ptrNodeName,
+                                                                         typeof(UsbNodeConnectionName));
+
+                hub.HubDevicePath = @"\\.\" + nodeName.NodeName;
+            }
+
+            // Now let's open the Hub (based upon the HubName we got above)
+            h2 = CreateFile(hub.HubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
+                            IntPtr.Zero);
+
+            if(h2 != INVALID_HANDLE_VALUE)
+            {
+                var nodeInfo = new UsbNodeInformation
+                {
+                    NodeType = (int)UsbHubNode.UsbHub
+                };
+
+                nBytes = Marshal.SizeOf(nodeInfo);
+                IntPtr ptrNodeInfo = Marshal.AllocHGlobal(nBytes);
+                Marshal.StructureToPtr(nodeInfo, ptrNodeInfo, true);
+
+                // get the Hub Information
+                if(DeviceIoControl(h2, IOCTL_USB_GET_NODE_INFORMATION, ptrNodeInfo, nBytes, ptrNodeInfo, nBytes,
                                    out _, IntPtr.Zero))
                 {
-                    nodeName = (UsbNodeConnectionName)Marshal.PtrToStructure(ptrNodeName,
-                                                                             typeof(UsbNodeConnectionName));
+                    nodeInfo = (UsbNodeInformation)Marshal.PtrToStructure(ptrNodeInfo, typeof(UsbNodeInformation));
 
-                    hub.HubDevicePath = @"\\.\" + nodeName.NodeName;
+                    hub.HubIsBusPowered = Convert.ToBoolean(nodeInfo.HubInformation.HubIsBusPowered);
+                    hub.HubPortCount    = nodeInfo.HubInformation.HubDescriptor.bNumberOfPorts;
                 }
 
-                // Now let's open the Hub (based upon the HubName we got above)
-                h2 = CreateFile(hub.HubDevicePath, GENERIC_WRITE, FILE_SHARE_WRITE, IntPtr.Zero, OPEN_EXISTING, 0,
-                                IntPtr.Zero);
-
-                if(h2 != INVALID_HANDLE_VALUE)
-                {
-                    var nodeInfo = new UsbNodeInformation
-                    {
-                        NodeType = (int)UsbHubNode.UsbHub
-                    };
-
-                    nBytes = Marshal.SizeOf(nodeInfo);
-                    IntPtr ptrNodeInfo = Marshal.AllocHGlobal(nBytes);
-                    Marshal.StructureToPtr(nodeInfo, ptrNodeInfo, true);
-
-                    // get the Hub Information
-                    if(DeviceIoControl(h2, IOCTL_USB_GET_NODE_INFORMATION, ptrNodeInfo, nBytes, ptrNodeInfo, nBytes,
-                                       out _, IntPtr.Zero))
-                    {
-                        nodeInfo = (UsbNodeInformation)Marshal.PtrToStructure(ptrNodeInfo, typeof(UsbNodeInformation));
-
-                        hub.HubIsBusPowered = Convert.ToBoolean(nodeInfo.HubInformation.HubIsBusPowered);
-                        hub.HubPortCount    = nodeInfo.HubInformation.HubDescriptor.bNumberOfPorts;
-                    }
-
-                    Marshal.FreeHGlobal(ptrNodeInfo);
-                    CloseHandle(h2);
-                }
-
-                // Fill in the missing Manufacture, Product, and SerialNumber values
-                // values by just creating a Device instance and copying the values
-                UsbDevice device = GetDevice();
-                hub.HubInstanceId   = device.DeviceInstanceId;
-                hub.HubManufacturer = device.Manufacturer;
-                hub.HubProduct      = device.Product;
-                hub.HubSerialNumber = device.SerialNumber;
-                hub.HubDriverKey    = device.DriverKey;
-
-                Marshal.FreeHGlobal(ptrNodeName);
-                CloseHandle(h);
-
-                return hub;
-            }
-        }
-
-        /// <summary>Represents an USB device</summary>
-        internal class UsbDevice
-        {
-            internal byte[]              BinaryDeviceDescriptors;
-            internal UsbDeviceDescriptor DeviceDescriptor;
-            internal string              DeviceDriverKey,    DeviceHubDevicePath, DeviceInstanceId, DeviceName;
-            internal string              DeviceManufacturer, DeviceProduct,       DeviceSerialNumber;
-            internal int                 DevicePortNumber;
-
-            /// <summary>a simple default constructor</summary>
-            internal UsbDevice()
-            {
-                DevicePortNumber        = 0;
-                DeviceHubDevicePath     = "";
-                DeviceDriverKey         = "";
-                DeviceManufacturer      = "";
-                DeviceProduct           = "Unknown USB Device";
-                DeviceSerialNumber      = "";
-                DeviceName              = "";
-                DeviceInstanceId        = "";
-                BinaryDeviceDescriptors = null;
+                Marshal.FreeHGlobal(ptrNodeInfo);
+                CloseHandle(h2);
             }
 
-            /// <summary>return Port Index of the Hub</summary>
-            internal int PortNumber => DevicePortNumber;
+            // Fill in the missing Manufacture, Product, and SerialNumber values
+            // values by just creating a Device instance and copying the values
+            UsbDevice device = GetDevice();
+            hub.HubInstanceId   = device.DeviceInstanceId;
+            hub.HubManufacturer = device.Manufacturer;
+            hub.HubProduct      = device.Product;
+            hub.HubSerialNumber = device.SerialNumber;
+            hub.HubDriverKey    = device.DriverKey;
 
-            /// <summary>return the Device Path of the Hub (the parent device)</summary>
-            internal string HubDevicePath => DeviceHubDevicePath;
+            Marshal.FreeHGlobal(ptrNodeName);
+            CloseHandle(h);
 
-            /// <summary>useful as a search key</summary>
-            internal string DriverKey => DeviceDriverKey;
-
-            /// <summary>the device path of this device</summary>
-            internal string InstanceId => DeviceInstanceId;
-
-            /// <summary>the friendly name</summary>
-            internal string Name => DeviceName;
-
-            internal string Manufacturer => DeviceManufacturer;
-
-            internal string Product => DeviceProduct;
-
-            internal string SerialNumber => DeviceSerialNumber;
-
-            internal byte[] BinaryDescriptors => BinaryDeviceDescriptors;
+            return hub;
         }
-
-        #region "API Region"
-        // ********************** Constants ************************
-
-        const           int    GENERIC_WRITE        = 0x40000000;
-        const           int    FILE_SHARE_READ      = 0x1;
-        const           int    FILE_SHARE_WRITE     = 0x2;
-        const           int    OPEN_EXISTING        = 0x3;
-        static readonly IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
-
-        const int IOCTL_GET_HCD_DRIVERKEY_NAME                  = 0x220424;
-        const int IOCTL_USB_GET_ROOT_HUB_NAME                   = 0x220408;
-        const int IOCTL_USB_GET_NODE_INFORMATION                = 0x220408; // same as above... strange, eh?
-        const int IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX  = 0x220448;
-        const int IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION = 0x220410;
-        const int IOCTL_USB_GET_NODE_CONNECTION_NAME            = 0x220414;
-        const int IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME  = 0x220420;
-
-        const int USB_DEVICE_DESCRIPTOR_TYPE        = 0x1;
-        const int USB_CONFIGURATION_DESCRIPTOR_TYPE = 0x2;
-        const int USB_STRING_DESCRIPTOR_TYPE        = 0x3;
-
-        const int BUFFER_SIZE               = 2048;
-        const int MAXIMUM_USB_STRING_LENGTH = 255;
-
-        const string GUID_DEVINTERFACE_HUBCONTROLLER = "3abf6f2d-71c4-462a-8a92-1e6861e6af27";
-        const string REGSTR_KEY_USB                  = "USB";
-        const int    DIGCF_PRESENT                   = 0x2;
-        const int    DIGCF_ALLCLASSES                = 0x4;
-        const int    DIGCF_DEVICEINTERFACE           = 0x10;
-        const int    SPDRP_DRIVER                    = 0x9;
-        const int    SPDRP_DEVICEDESC                = 0x0;
-        const int    REG_SZ                          = 1;
-
-        // ********************** Enumerations ************************
-
-        enum UsbHubNode
-        {
-            UsbHub, UsbMiParent
-        }
-
-        enum UsbConnectionStatus
-        {
-            NoDeviceConnected, DeviceConnected, DeviceFailedEnumeration,
-            DeviceGeneralFailure, DeviceCausedOvercurrent, DeviceNotEnoughPower,
-            DeviceNotEnoughBandwidth, DeviceHubNestedTooDeeply, DeviceInLegacyHub
-        }
-
-        enum UsbDeviceSpeed : byte
-        {
-            UsbLowSpeed, UsbFullSpeed, UsbHighSpeed
-        }
-
-        // ********************** Stuctures ************************
-
-        [StructLayout(LayoutKind.Sequential)]
-        struct SpDevinfoData
-        {
-            internal          int    cbSize;
-            internal readonly Guid   ClassGuid;
-            internal readonly IntPtr DevInst;
-            internal readonly IntPtr Reserved;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        struct SpDeviceInterfaceData
-        {
-            internal          int    cbSize;
-            internal readonly Guid   InterfaceClassGuid;
-            internal readonly int    Flags;
-            internal readonly IntPtr Reserved;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        struct SpDeviceInterfaceDetailData
-        {
-            internal int cbSize;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
-            internal readonly string DevicePath;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        struct UsbHcdDriverkeyName
-        {
-            internal readonly int ActualLength;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
-            internal readonly string DriverKeyName;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        struct UsbRootHubName
-        {
-            internal readonly int ActualLength;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
-            internal readonly string RootHubName;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct UsbHubDescriptor
-        {
-            internal readonly byte  bDescriptorLength;
-            internal readonly byte  bDescriptorType;
-            internal readonly byte  bNumberOfPorts;
-            internal readonly short wHubCharacteristics;
-            internal readonly byte  bPowerOnToPowerGood;
-            internal readonly byte  bHubControlCurrent;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            internal readonly byte[] bRemoveAndPowerMask;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        struct UsbHubInformation
-        {
-            internal readonly UsbHubDescriptor HubDescriptor;
-            internal readonly byte             HubIsBusPowered;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        struct UsbNodeInformation
-        {
-            internal          int               NodeType;
-            internal readonly UsbHubInformation HubInformation; // Yeah, I'm assuming we'll just use the first form
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct UsbNodeConnectionInformationEx
-        {
-            internal          int                 ConnectionIndex;
-            internal readonly UsbDeviceDescriptor DeviceDescriptor;
-            internal readonly byte                CurrentConfigurationValue;
-            internal readonly byte                Speed;
-            internal readonly byte                DeviceIsHub;
-            internal readonly short               DeviceAddress;
-            internal readonly int                 NumberOfOpenPipes;
-
-            internal readonly int ConnectionStatus;
-
-            //internal IntPtr PipeList;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
-        internal struct UsbDeviceDescriptor
-        {
-            internal byte  bLength;
-            internal byte  bDescriptorType;
-            internal short bcdUSB;
-            internal byte  bDeviceClass;
-            internal byte  bDeviceSubClass;
-            internal byte  bDeviceProtocol;
-            internal byte  bMaxPacketSize0;
-            internal short idVendor;
-            internal short idProduct;
-            internal short bcdDevice;
-            internal byte  iManufacturer;
-            internal byte  iProduct;
-            internal byte  iSerialNumber;
-            internal byte  bNumConfigurations;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        struct UsbStringDescriptor
-        {
-            internal readonly byte bLength;
-            internal readonly byte bDescriptorType;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAXIMUM_USB_STRING_LENGTH)]
-            internal readonly string bString;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        struct UsbSetupPacket
-        {
-            internal readonly byte  bmRequest;
-            internal readonly byte  bRequest;
-            internal          short wValue;
-            internal          short wIndex;
-            internal          short wLength;
-        }
-
-        [StructLayout(LayoutKind.Sequential)]
-        struct UsbDescriptorRequest
-        {
-            internal int ConnectionIndex;
-
-            internal UsbSetupPacket SetupPacket;
-
-            //internal byte[] Data;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        struct UsbNodeConnectionName
-        {
-            internal          int ConnectionIndex;
-            internal readonly int ActualLength;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
-            internal readonly string NodeName;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        struct UsbNodeConnectionDriverkeyName // Yes, this is the same as the structure above...
-        {
-            internal          int ConnectionIndex;
-            internal readonly int ActualLength;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
-            internal readonly string DriverKeyName;
-        }
-
-        // ********************** API Definitions ************************
-
-        [DllImport("setupapi.dll", CharSet = CharSet.Auto)]
-        static extern IntPtr SetupDiGetClassDevs( // 1st form using a ClassGUID
-            ref Guid classGuid, int enumerator, IntPtr hwndParent, int flags);
-
-        [DllImport("setupapi.dll", CharSet = CharSet.Auto)] // 2nd form uses an Enumerator
-        static extern IntPtr SetupDiGetClassDevs(int classGuid, string enumerator, IntPtr hwndParent, int flags);
-
-        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool SetupDiEnumDeviceInterfaces(IntPtr deviceInfoSet, IntPtr deviceInfoData,
-                                                       ref Guid interfaceClassGuid, int memberIndex,
-                                                       ref SpDeviceInterfaceData deviceInterfaceData);
-
-        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool SetupDiGetDeviceInterfaceDetail(IntPtr deviceInfoSet,
-                                                           ref SpDeviceInterfaceData deviceInterfaceData,
-                                                           ref SpDeviceInterfaceDetailData deviceInterfaceDetailData,
-                                                           int deviceInterfaceDetailDataSize, ref int requiredSize,
-                                                           ref SpDevinfoData deviceInfoData);
-
-        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool SetupDiGetDeviceRegistryProperty(IntPtr deviceInfoSet, ref SpDevinfoData deviceInfoData,
-                                                            int iProperty, ref int propertyRegDataType,
-                                                            IntPtr propertyBuffer, int propertyBufferSize,
-                                                            ref int requiredSize);
-
-        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool SetupDiEnumDeviceInfo(IntPtr deviceInfoSet, int memberIndex,
-                                                 ref SpDevinfoData deviceInfoData);
-
-        [DllImport("setupapi.dll", SetLastError = true)]
-        static extern bool SetupDiDestroyDeviceInfoList(IntPtr deviceInfoSet);
-
-        [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool SetupDiGetDeviceInstanceId(IntPtr deviceInfoSet, ref SpDevinfoData deviceInfoData,
-                                                      StringBuilder deviceInstanceId, int deviceInstanceIdSize,
-                                                      out int requiredSize);
-
-        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool DeviceIoControl(IntPtr hDevice, int dwIoControlCode, IntPtr lpInBuffer, int nInBufferSize,
-                                           IntPtr lpOutBuffer, int nOutBufferSize, out int lpBytesReturned,
-                                           IntPtr lpOverlapped);
-
-        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern IntPtr CreateFile(string lpFileName, int dwDesiredAccess, int dwShareMode,
-                                        IntPtr lpSecurityAttributes, int dwCreationDisposition,
-                                        int dwFlagsAndAttributes, IntPtr hTemplateFile);
-
-        [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
-        static extern bool CloseHandle(IntPtr hObject);
-        #endregion
     }
+
+    /// <summary>Represents an USB device</summary>
+    internal class UsbDevice
+    {
+        internal byte[]              BinaryDeviceDescriptors;
+        internal UsbDeviceDescriptor DeviceDescriptor;
+        internal string              DeviceDriverKey,    DeviceHubDevicePath, DeviceInstanceId, DeviceName;
+        internal string              DeviceManufacturer, DeviceProduct,       DeviceSerialNumber;
+        internal int                 DevicePortNumber;
+
+        /// <summary>a simple default constructor</summary>
+        internal UsbDevice()
+        {
+            DevicePortNumber        = 0;
+            DeviceHubDevicePath     = "";
+            DeviceDriverKey         = "";
+            DeviceManufacturer      = "";
+            DeviceProduct           = "Unknown USB Device";
+            DeviceSerialNumber      = "";
+            DeviceName              = "";
+            DeviceInstanceId        = "";
+            BinaryDeviceDescriptors = null;
+        }
+
+        /// <summary>return Port Index of the Hub</summary>
+        internal int PortNumber => DevicePortNumber;
+
+        /// <summary>return the Device Path of the Hub (the parent device)</summary>
+        internal string HubDevicePath => DeviceHubDevicePath;
+
+        /// <summary>useful as a search key</summary>
+        internal string DriverKey => DeviceDriverKey;
+
+        /// <summary>the device path of this device</summary>
+        internal string InstanceId => DeviceInstanceId;
+
+        /// <summary>the friendly name</summary>
+        internal string Name => DeviceName;
+
+        internal string Manufacturer => DeviceManufacturer;
+
+        internal string Product => DeviceProduct;
+
+        internal string SerialNumber => DeviceSerialNumber;
+
+        internal byte[] BinaryDescriptors => BinaryDeviceDescriptors;
+    }
+
+    #region "API Region"
+    // ********************** Constants ************************
+
+    const           int    GENERIC_WRITE        = 0x40000000;
+    const           int    FILE_SHARE_READ      = 0x1;
+    const           int    FILE_SHARE_WRITE     = 0x2;
+    const           int    OPEN_EXISTING        = 0x3;
+    static readonly IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
+
+    const int IOCTL_GET_HCD_DRIVERKEY_NAME                  = 0x220424;
+    const int IOCTL_USB_GET_ROOT_HUB_NAME                   = 0x220408;
+    const int IOCTL_USB_GET_NODE_INFORMATION                = 0x220408; // same as above... strange, eh?
+    const int IOCTL_USB_GET_NODE_CONNECTION_INFORMATION_EX  = 0x220448;
+    const int IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION = 0x220410;
+    const int IOCTL_USB_GET_NODE_CONNECTION_NAME            = 0x220414;
+    const int IOCTL_USB_GET_NODE_CONNECTION_DRIVERKEY_NAME  = 0x220420;
+
+    const int USB_DEVICE_DESCRIPTOR_TYPE        = 0x1;
+    const int USB_CONFIGURATION_DESCRIPTOR_TYPE = 0x2;
+    const int USB_STRING_DESCRIPTOR_TYPE        = 0x3;
+
+    const int BUFFER_SIZE               = 2048;
+    const int MAXIMUM_USB_STRING_LENGTH = 255;
+
+    const string GUID_DEVINTERFACE_HUBCONTROLLER = "3abf6f2d-71c4-462a-8a92-1e6861e6af27";
+    const string REGSTR_KEY_USB                  = "USB";
+    const int    DIGCF_PRESENT                   = 0x2;
+    const int    DIGCF_ALLCLASSES                = 0x4;
+    const int    DIGCF_DEVICEINTERFACE           = 0x10;
+    const int    SPDRP_DRIVER                    = 0x9;
+    const int    SPDRP_DEVICEDESC                = 0x0;
+    const int    REG_SZ                          = 1;
+
+    // ********************** Enumerations ************************
+
+    enum UsbHubNode
+    {
+        UsbHub, UsbMiParent
+    }
+
+    enum UsbConnectionStatus
+    {
+        NoDeviceConnected, DeviceConnected, DeviceFailedEnumeration,
+        DeviceGeneralFailure, DeviceCausedOvercurrent, DeviceNotEnoughPower,
+        DeviceNotEnoughBandwidth, DeviceHubNestedTooDeeply, DeviceInLegacyHub
+    }
+
+    enum UsbDeviceSpeed : byte
+    {
+        UsbLowSpeed, UsbFullSpeed, UsbHighSpeed
+    }
+
+    // ********************** Stuctures ************************
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct SpDevinfoData
+    {
+        internal          int    cbSize;
+        internal readonly Guid   ClassGuid;
+        internal readonly IntPtr DevInst;
+        internal readonly IntPtr Reserved;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct SpDeviceInterfaceData
+    {
+        internal          int    cbSize;
+        internal readonly Guid   InterfaceClassGuid;
+        internal readonly int    Flags;
+        internal readonly IntPtr Reserved;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    struct SpDeviceInterfaceDetailData
+    {
+        internal int cbSize;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
+        internal readonly string DevicePath;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    struct UsbHcdDriverkeyName
+    {
+        internal readonly int ActualLength;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
+        internal readonly string DriverKeyName;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    struct UsbRootHubName
+    {
+        internal readonly int ActualLength;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
+        internal readonly string RootHubName;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct UsbHubDescriptor
+    {
+        internal readonly byte  bDescriptorLength;
+        internal readonly byte  bDescriptorType;
+        internal readonly byte  bNumberOfPorts;
+        internal readonly short wHubCharacteristics;
+        internal readonly byte  bPowerOnToPowerGood;
+        internal readonly byte  bHubControlCurrent;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        internal readonly byte[] bRemoveAndPowerMask;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct UsbHubInformation
+    {
+        internal readonly UsbHubDescriptor HubDescriptor;
+        internal readonly byte             HubIsBusPowered;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct UsbNodeInformation
+    {
+        internal          int               NodeType;
+        internal readonly UsbHubInformation HubInformation; // Yeah, I'm assuming we'll just use the first form
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct UsbNodeConnectionInformationEx
+    {
+        internal          int                 ConnectionIndex;
+        internal readonly UsbDeviceDescriptor DeviceDescriptor;
+        internal readonly byte                CurrentConfigurationValue;
+        internal readonly byte                Speed;
+        internal readonly byte                DeviceIsHub;
+        internal readonly short               DeviceAddress;
+        internal readonly int                 NumberOfOpenPipes;
+
+        internal readonly int ConnectionStatus;
+
+        //internal IntPtr PipeList;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "MemberCanBePrivate.Global")]
+    internal struct UsbDeviceDescriptor
+    {
+        internal byte  bLength;
+        internal byte  bDescriptorType;
+        internal short bcdUSB;
+        internal byte  bDeviceClass;
+        internal byte  bDeviceSubClass;
+        internal byte  bDeviceProtocol;
+        internal byte  bMaxPacketSize0;
+        internal short idVendor;
+        internal short idProduct;
+        internal short bcdDevice;
+        internal byte  iManufacturer;
+        internal byte  iProduct;
+        internal byte  iSerialNumber;
+        internal byte  bNumConfigurations;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    struct UsbStringDescriptor
+    {
+        internal readonly byte bLength;
+        internal readonly byte bDescriptorType;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAXIMUM_USB_STRING_LENGTH)]
+        internal readonly string bString;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct UsbSetupPacket
+    {
+        internal readonly byte  bmRequest;
+        internal readonly byte  bRequest;
+        internal          short wValue;
+        internal          short wIndex;
+        internal          short wLength;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct UsbDescriptorRequest
+    {
+        internal int ConnectionIndex;
+
+        internal UsbSetupPacket SetupPacket;
+
+        //internal byte[] Data;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    struct UsbNodeConnectionName
+    {
+        internal          int ConnectionIndex;
+        internal readonly int ActualLength;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
+        internal readonly string NodeName;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+    struct UsbNodeConnectionDriverkeyName // Yes, this is the same as the structure above...
+    {
+        internal          int ConnectionIndex;
+        internal readonly int ActualLength;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = BUFFER_SIZE)]
+        internal readonly string DriverKeyName;
+    }
+
+    // ********************** API Definitions ************************
+
+    [DllImport("setupapi.dll", CharSet = CharSet.Auto)]
+    static extern IntPtr SetupDiGetClassDevs( // 1st form using a ClassGUID
+        ref Guid classGuid, int enumerator, IntPtr hwndParent, int flags);
+
+    [DllImport("setupapi.dll", CharSet = CharSet.Auto)] // 2nd form uses an Enumerator
+    static extern IntPtr SetupDiGetClassDevs(int classGuid, string enumerator, IntPtr hwndParent, int flags);
+
+    [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    static extern bool SetupDiEnumDeviceInterfaces(IntPtr deviceInfoSet, IntPtr deviceInfoData,
+                                                   ref Guid interfaceClassGuid, int memberIndex,
+                                                   ref SpDeviceInterfaceData deviceInterfaceData);
+
+    [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    static extern bool SetupDiGetDeviceInterfaceDetail(IntPtr deviceInfoSet,
+                                                       ref SpDeviceInterfaceData deviceInterfaceData,
+                                                       ref SpDeviceInterfaceDetailData deviceInterfaceDetailData,
+                                                       int deviceInterfaceDetailDataSize, ref int requiredSize,
+                                                       ref SpDevinfoData deviceInfoData);
+
+    [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    static extern bool SetupDiGetDeviceRegistryProperty(IntPtr deviceInfoSet, ref SpDevinfoData deviceInfoData,
+                                                        int iProperty, ref int propertyRegDataType,
+                                                        IntPtr propertyBuffer, int propertyBufferSize,
+                                                        ref int requiredSize);
+
+    [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    static extern bool SetupDiEnumDeviceInfo(IntPtr deviceInfoSet, int memberIndex,
+                                             ref SpDevinfoData deviceInfoData);
+
+    [DllImport("setupapi.dll", SetLastError = true)]
+    static extern bool SetupDiDestroyDeviceInfoList(IntPtr deviceInfoSet);
+
+    [DllImport("setupapi.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    static extern bool SetupDiGetDeviceInstanceId(IntPtr deviceInfoSet, ref SpDevinfoData deviceInfoData,
+                                                  StringBuilder deviceInstanceId, int deviceInstanceIdSize,
+                                                  out int requiredSize);
+
+    [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    static extern bool DeviceIoControl(IntPtr hDevice, int dwIoControlCode, IntPtr lpInBuffer, int nInBufferSize,
+                                       IntPtr lpOutBuffer, int nOutBufferSize, out int lpBytesReturned,
+                                       IntPtr lpOverlapped);
+
+    [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    static extern IntPtr CreateFile(string lpFileName, int dwDesiredAccess, int dwShareMode,
+                                    IntPtr lpSecurityAttributes, int dwCreationDisposition,
+                                    int dwFlagsAndAttributes, IntPtr hTemplateFile);
+
+    [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Auto)]
+    static extern bool CloseHandle(IntPtr hObject);
+    #endregion
 }
\ No newline at end of file
diff --git a/Aaru.Devices/Windows/UsbFunctions.cs b/Aaru.Devices/Windows/UsbFunctions.cs
index a455c64e1..a62500e5b 100644
--- a/Aaru.Devices/Windows/UsbFunctions.cs
+++ b/Aaru.Devices/Windows/UsbFunctions.cs
@@ -35,289 +35,288 @@ using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace Aaru.Devices.Windows
+namespace Aaru.Devices.Windows;
+
+//
+// A place for "higher level" related functions
+// You might not want to keep these in the USB class... your choice
+//
+// TODO: Even after cleaning, refactoring and xml-documenting, this code needs some love
+/// <summary>Implements functions for getting and accessing information from the USB bus</summary>
+internal static partial class Usb
 {
-    //
-    // A place for "higher level" related functions
-    // You might not want to keep these in the USB class... your choice
-    //
-    // TODO: Even after cleaning, refactoring and xml-documenting, this code needs some love
-    /// <summary>Implements functions for getting and accessing information from the USB bus</summary>
-    internal static partial class Usb
+    const          int    IOCTL_STORAGE_GET_DEVICE_NUMBER = 0x2D1080;
+    internal const string GuidDevinterfaceDisk            = "53f56307-b6bf-11d0-94f2-00a0c91efb8b";
+    internal const string GuidDevinterfaceCdrom           = "53f56308-b6bf-11d0-94f2-00a0c91efb8b";
+    internal const string GuidDevinterfaceFloppy          = "53f56311-b6bf-11d0-94f2-00a0c91efb8b";
+    internal const string GuidDevinterfaceTape            = "53f5630b-b6bf-11d0-94f2-00a0c91efb8b";
+
+    /// <summary>Get a list of all connected devices</summary>
+    /// <returns>List of usb devices</returns>
+    internal static List<UsbDevice> GetConnectedDevices()
     {
-        const          int    IOCTL_STORAGE_GET_DEVICE_NUMBER = 0x2D1080;
-        internal const string GuidDevinterfaceDisk            = "53f56307-b6bf-11d0-94f2-00a0c91efb8b";
-        internal const string GuidDevinterfaceCdrom           = "53f56308-b6bf-11d0-94f2-00a0c91efb8b";
-        internal const string GuidDevinterfaceFloppy          = "53f56311-b6bf-11d0-94f2-00a0c91efb8b";
-        internal const string GuidDevinterfaceTape            = "53f5630b-b6bf-11d0-94f2-00a0c91efb8b";
+        List<UsbDevice> devList = new List<UsbDevice>();
 
-        /// <summary>Get a list of all connected devices</summary>
-        /// <returns>List of usb devices</returns>
-        internal static List<UsbDevice> GetConnectedDevices()
-        {
-            List<UsbDevice> devList = new List<UsbDevice>();
+        foreach(UsbController controller in GetHostControllers())
+            ListHub(controller.GetRootHub(), devList);
 
-            foreach(UsbController controller in GetHostControllers())
-                ListHub(controller.GetRootHub(), devList);
+        return devList;
+    }
 
-            return devList;
-        }
-
-        /// <summary>private routine for enumerating a hub</summary>
-        /// <param name="hub">Hub</param>
-        /// <param name="devList">Device list</param>
-        static void ListHub(UsbHub hub, ICollection<UsbDevice> devList)
-        {
-            foreach(UsbPort port in hub.GetPorts())
-                if(port.IsHub)
-                {
-                    ListHub(port.GetHub(), devList);
-                }
-                else
-                {
-                    if(port.IsDeviceConnected)
-                        devList.Add(port.GetDevice());
-                }
-        }
-
-        /// <summary>Find a device based upon it's DriverKeyName</summary>
-        /// <param name="driverKeyName">DriverKeyName</param>
-        /// <returns>USB device</returns>
-        internal static UsbDevice FindDeviceByDriverKeyName(string driverKeyName)
-        {
-            UsbDevice foundDevice = null;
-
-            foreach(UsbController controller in GetHostControllers())
+    /// <summary>private routine for enumerating a hub</summary>
+    /// <param name="hub">Hub</param>
+    /// <param name="devList">Device list</param>
+    static void ListHub(UsbHub hub, ICollection<UsbDevice> devList)
+    {
+        foreach(UsbPort port in hub.GetPorts())
+            if(port.IsHub)
             {
-                SearchHubDriverKeyName(controller.GetRootHub(), ref foundDevice, driverKeyName);
-
-                if(foundDevice != null)
-                    break;
+                ListHub(port.GetHub(), devList);
             }
-
-            return foundDevice;
-        }
-
-        /// <summary>Finds a device connected to a specified hub by it's DriverKeyName</summary>
-        /// <param name="hub">Hub</param>
-        /// <param name="foundDevice">UsbDevice</param>
-        /// <param name="driverKeyName">DriverKeyName</param>
-        static void SearchHubDriverKeyName(UsbHub hub, ref UsbDevice foundDevice, string driverKeyName)
-        {
-            foreach(UsbPort port in hub.GetPorts())
-                if(port.IsHub)
-                {
-                    SearchHubDriverKeyName(port.GetHub(), ref foundDevice, driverKeyName);
-                }
-                else
-                {
-                    if(!port.IsDeviceConnected)
-                        continue;
-
-                    UsbDevice device = port.GetDevice();
-
-                    if(device.DeviceDriverKey != driverKeyName)
-                        continue;
-
-                    foundDevice = device;
-
-                    break;
-                }
-        }
-
-        /// <summary>Find a device based upon it's Instance ID</summary>
-        /// <param name="instanceId">Device instance ID</param>
-        /// <returns>USB device</returns>
-        static UsbDevice FindDeviceByInstanceId(string instanceId)
-        {
-            UsbDevice foundDevice = null;
-
-            foreach(UsbController controller in GetHostControllers())
+            else
             {
-                SearchHubInstanceId(controller.GetRootHub(), ref foundDevice, instanceId);
-
-                if(foundDevice != null)
-                    break;
+                if(port.IsDeviceConnected)
+                    devList.Add(port.GetDevice());
             }
+    }
 
-            return foundDevice;
+    /// <summary>Find a device based upon it's DriverKeyName</summary>
+    /// <param name="driverKeyName">DriverKeyName</param>
+    /// <returns>USB device</returns>
+    internal static UsbDevice FindDeviceByDriverKeyName(string driverKeyName)
+    {
+        UsbDevice foundDevice = null;
+
+        foreach(UsbController controller in GetHostControllers())
+        {
+            SearchHubDriverKeyName(controller.GetRootHub(), ref foundDevice, driverKeyName);
+
+            if(foundDevice != null)
+                break;
         }
 
-        /// <summary>private routine for enumerating a hub</summary>
-        /// <param name="hub">Hub</param>
-        /// <param name="foundDevice">USB device</param>
-        /// <param name="instanceId">Device instance ID</param>
-        static void SearchHubInstanceId(UsbHub hub, ref UsbDevice foundDevice, string instanceId)
-        {
-            foreach(UsbPort port in hub.GetPorts())
-                if(port.IsHub)
-                {
-                    SearchHubInstanceId(port.GetHub(), ref foundDevice, instanceId);
-                }
-                else
-                {
-                    if(!port.IsDeviceConnected)
-                        continue;
+        return foundDevice;
+    }
 
-                    UsbDevice device = port.GetDevice();
-
-                    if(device.InstanceId != instanceId)
-                        continue;
-
-                    foundDevice = device;
-
-                    break;
-                }
-        }
-
-        [DllImport("setupapi.dll")]
-        static extern int CM_Get_Parent(out IntPtr pdnDevInst, IntPtr dnDevInst, int ulFlags);
-
-        [DllImport("setupapi.dll", CharSet = CharSet.Auto)]
-        static extern int CM_Get_Device_ID(IntPtr dnDevInst, IntPtr buffer, int bufferLen, int ulFlags);
-
-        /// <summary>Find a device based upon a Drive Letter</summary>
-        /// <param name="driveLetter">Drive letter</param>
-        /// <param name="deviceGuid">Device GUID</param>
-        /// <returns>USB device</returns>
-        internal static UsbDevice FindDriveLetter(string driveLetter, string deviceGuid)
-        {
-            // We start by getting the unique DeviceNumber of the given
-            // DriveLetter.  We'll use this later to find a matching
-            // DevicePath "symbolic name"
-            int devNum = GetDeviceNumber(@"\\.\" + driveLetter.TrimEnd('\\'));
-
-            return devNum < 0 ? null : FindDeviceNumber(devNum, deviceGuid);
-        }
-
-        /// <summary>Find a device based upon a Drive Path</summary>
-        /// <param name="drivePath">Drive path</param>
-        /// <param name="deviceGuid">Device GUID</param>
-        /// <returns>USB device</returns>
-        internal static UsbDevice FindDrivePath(string drivePath, string deviceGuid)
-        {
-            // We start by getting the unique DeviceNumber of the given
-            // DriveLetter.  We'll use this later to find a matching
-            // DevicePath "symbolic name"
-            int devNum = GetDeviceNumber(drivePath);
-
-            return devNum < 0 ? null : FindDeviceNumber(devNum, deviceGuid);
-        }
-
-        /// <summary>Find a device based upon a Device Number</summary>
-        /// <param name="devNum">Device Number</param>
-        /// <param name="deviceGuid">Device GUID</param>
-        /// <returns>USB device</returns>
-        static UsbDevice FindDeviceNumber(int devNum, string deviceGuid)
-        {
-            UsbDevice foundDevice = null;
-            string    instanceId  = "";
-
-            var diskGuid = new Guid(deviceGuid);
-
-            // We start at the "root" of the device tree and look for all
-            // devices that match the interface GUID of a disk
-            IntPtr h = SetupDiGetClassDevs(ref diskGuid, 0, IntPtr.Zero, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
-
-            if(h != INVALID_HANDLE_VALUE)
+    /// <summary>Finds a device connected to a specified hub by it's DriverKeyName</summary>
+    /// <param name="hub">Hub</param>
+    /// <param name="foundDevice">UsbDevice</param>
+    /// <param name="driverKeyName">DriverKeyName</param>
+    static void SearchHubDriverKeyName(UsbHub hub, ref UsbDevice foundDevice, string driverKeyName)
+    {
+        foreach(UsbPort port in hub.GetPorts())
+            if(port.IsHub)
             {
-                bool success;
-                int  i = 0;
+                SearchHubDriverKeyName(port.GetHub(), ref foundDevice, driverKeyName);
+            }
+            else
+            {
+                if(!port.IsDeviceConnected)
+                    continue;
 
-                do
+                UsbDevice device = port.GetDevice();
+
+                if(device.DeviceDriverKey != driverKeyName)
+                    continue;
+
+                foundDevice = device;
+
+                break;
+            }
+    }
+
+    /// <summary>Find a device based upon it's Instance ID</summary>
+    /// <param name="instanceId">Device instance ID</param>
+    /// <returns>USB device</returns>
+    static UsbDevice FindDeviceByInstanceId(string instanceId)
+    {
+        UsbDevice foundDevice = null;
+
+        foreach(UsbController controller in GetHostControllers())
+        {
+            SearchHubInstanceId(controller.GetRootHub(), ref foundDevice, instanceId);
+
+            if(foundDevice != null)
+                break;
+        }
+
+        return foundDevice;
+    }
+
+    /// <summary>private routine for enumerating a hub</summary>
+    /// <param name="hub">Hub</param>
+    /// <param name="foundDevice">USB device</param>
+    /// <param name="instanceId">Device instance ID</param>
+    static void SearchHubInstanceId(UsbHub hub, ref UsbDevice foundDevice, string instanceId)
+    {
+        foreach(UsbPort port in hub.GetPorts())
+            if(port.IsHub)
+            {
+                SearchHubInstanceId(port.GetHub(), ref foundDevice, instanceId);
+            }
+            else
+            {
+                if(!port.IsDeviceConnected)
+                    continue;
+
+                UsbDevice device = port.GetDevice();
+
+                if(device.InstanceId != instanceId)
+                    continue;
+
+                foundDevice = device;
+
+                break;
+            }
+    }
+
+    [DllImport("setupapi.dll")]
+    static extern int CM_Get_Parent(out IntPtr pdnDevInst, IntPtr dnDevInst, int ulFlags);
+
+    [DllImport("setupapi.dll", CharSet = CharSet.Auto)]
+    static extern int CM_Get_Device_ID(IntPtr dnDevInst, IntPtr buffer, int bufferLen, int ulFlags);
+
+    /// <summary>Find a device based upon a Drive Letter</summary>
+    /// <param name="driveLetter">Drive letter</param>
+    /// <param name="deviceGuid">Device GUID</param>
+    /// <returns>USB device</returns>
+    internal static UsbDevice FindDriveLetter(string driveLetter, string deviceGuid)
+    {
+        // We start by getting the unique DeviceNumber of the given
+        // DriveLetter.  We'll use this later to find a matching
+        // DevicePath "symbolic name"
+        int devNum = GetDeviceNumber(@"\\.\" + driveLetter.TrimEnd('\\'));
+
+        return devNum < 0 ? null : FindDeviceNumber(devNum, deviceGuid);
+    }
+
+    /// <summary>Find a device based upon a Drive Path</summary>
+    /// <param name="drivePath">Drive path</param>
+    /// <param name="deviceGuid">Device GUID</param>
+    /// <returns>USB device</returns>
+    internal static UsbDevice FindDrivePath(string drivePath, string deviceGuid)
+    {
+        // We start by getting the unique DeviceNumber of the given
+        // DriveLetter.  We'll use this later to find a matching
+        // DevicePath "symbolic name"
+        int devNum = GetDeviceNumber(drivePath);
+
+        return devNum < 0 ? null : FindDeviceNumber(devNum, deviceGuid);
+    }
+
+    /// <summary>Find a device based upon a Device Number</summary>
+    /// <param name="devNum">Device Number</param>
+    /// <param name="deviceGuid">Device GUID</param>
+    /// <returns>USB device</returns>
+    static UsbDevice FindDeviceNumber(int devNum, string deviceGuid)
+    {
+        UsbDevice foundDevice = null;
+        string    instanceId  = "";
+
+        var diskGuid = new Guid(deviceGuid);
+
+        // We start at the "root" of the device tree and look for all
+        // devices that match the interface GUID of a disk
+        IntPtr h = SetupDiGetClassDevs(ref diskGuid, 0, IntPtr.Zero, DIGCF_PRESENT | DIGCF_DEVICEINTERFACE);
+
+        if(h != INVALID_HANDLE_VALUE)
+        {
+            bool success;
+            int  i = 0;
+
+            do
+            {
+                // create a Device Interface Data structure
+                var dia = new SpDeviceInterfaceData();
+                dia.cbSize = Marshal.SizeOf(dia);
+
+                // start the enumeration
+                success = SetupDiEnumDeviceInterfaces(h, IntPtr.Zero, ref diskGuid, i, ref dia);
+
+                if(success)
                 {
-                    // create a Device Interface Data structure
-                    var dia = new SpDeviceInterfaceData();
-                    dia.cbSize = Marshal.SizeOf(dia);
+                    // build a DevInfo Data structure
+                    var da = new SpDevinfoData();
+                    da.cbSize = Marshal.SizeOf(da);
 
-                    // start the enumeration
-                    success = SetupDiEnumDeviceInterfaces(h, IntPtr.Zero, ref diskGuid, i, ref dia);
-
-                    if(success)
+                    // build a Device Interface Detail Data structure
+                    var didd = new SpDeviceInterfaceDetailData
                     {
-                        // build a DevInfo Data structure
-                        var da = new SpDevinfoData();
-                        da.cbSize = Marshal.SizeOf(da);
+                        cbSize = 4 + Marshal.SystemDefaultCharSize
+                    }; // trust me :)
 
-                        // build a Device Interface Detail Data structure
-                        var didd = new SpDeviceInterfaceDetailData
+                    // now we can get some more detailed information
+                    int       nRequiredSize = 0;
+                    const int N_BYTES       = BUFFER_SIZE;
+
+                    if(SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, N_BYTES, ref nRequiredSize, ref da))
+                        if(GetDeviceNumber(didd.DevicePath) == devNum)
                         {
-                            cbSize = 4 + Marshal.SystemDefaultCharSize
-                        }; // trust me :)
+                            // current InstanceID is at the "USBSTOR" level, so we
+                            // need up "move up" one level to get to the "USB" level
+                            CM_Get_Parent(out IntPtr ptrPrevious, da.DevInst, 0);
 
-                        // now we can get some more detailed information
-                        int       nRequiredSize = 0;
-                        const int N_BYTES       = BUFFER_SIZE;
+                            // Now we get the InstanceID of the USB level device
+                            IntPtr ptrInstanceBuf = Marshal.AllocHGlobal(N_BYTES);
+                            CM_Get_Device_ID(ptrPrevious, ptrInstanceBuf, N_BYTES, 0);
+                            instanceId = Marshal.PtrToStringAuto(ptrInstanceBuf);
 
-                        if(SetupDiGetDeviceInterfaceDetail(h, ref dia, ref didd, N_BYTES, ref nRequiredSize, ref da))
-                            if(GetDeviceNumber(didd.DevicePath) == devNum)
-                            {
-                                // current InstanceID is at the "USBSTOR" level, so we
-                                // need up "move up" one level to get to the "USB" level
-                                CM_Get_Parent(out IntPtr ptrPrevious, da.DevInst, 0);
+                            Marshal.FreeHGlobal(ptrInstanceBuf);
 
-                                // Now we get the InstanceID of the USB level device
-                                IntPtr ptrInstanceBuf = Marshal.AllocHGlobal(N_BYTES);
-                                CM_Get_Device_ID(ptrPrevious, ptrInstanceBuf, N_BYTES, 0);
-                                instanceId = Marshal.PtrToStringAuto(ptrInstanceBuf);
+                            //System.Console.WriteLine("InstanceId: {0}", instanceId);
+                            //break;
+                        }
+                }
 
-                                Marshal.FreeHGlobal(ptrInstanceBuf);
+                i++;
+            } while(success);
 
-                                //System.Console.WriteLine("InstanceId: {0}", instanceId);
-                                //break;
-                            }
-                    }
-
-                    i++;
-                } while(success);
-
-                SetupDiDestroyDeviceInfoList(h);
-            }
-
-            // Did we find an InterfaceID of a USB device?
-            if(instanceId?.StartsWith("USB\\", StringComparison.Ordinal) == true)
-                foundDevice = FindDeviceByInstanceId(instanceId);
-
-            return foundDevice;
+            SetupDiDestroyDeviceInfoList(h);
         }
 
-        /// <summary>return a unique device number for the given device path</summary>
-        /// <param name="devicePath">Device path</param>
-        /// <returns>Device number</returns>
-        static int GetDeviceNumber(string devicePath)
-        {
-            int ans = -1;
+        // Did we find an InterfaceID of a USB device?
+        if(instanceId?.StartsWith("USB\\", StringComparison.Ordinal) == true)
+            foundDevice = FindDeviceByInstanceId(instanceId);
 
-            IntPtr h = CreateFile(devicePath.TrimEnd('\\'), 0, 0, IntPtr.Zero, OPEN_EXISTING, 0, IntPtr.Zero);
+        return foundDevice;
+    }
 
-            if(h == INVALID_HANDLE_VALUE)
-                return ans;
+    /// <summary>return a unique device number for the given device path</summary>
+    /// <param name="devicePath">Device path</param>
+    /// <returns>Device number</returns>
+    static int GetDeviceNumber(string devicePath)
+    {
+        int ans = -1;
 
-            var    sdn    = new StorageDeviceNumber();
-            int    nBytes = Marshal.SizeOf(sdn);
-            IntPtr ptrSdn = Marshal.AllocHGlobal(nBytes);
-
-            if(DeviceIoControl(h, IOCTL_STORAGE_GET_DEVICE_NUMBER, IntPtr.Zero, 0, ptrSdn, nBytes, out _, IntPtr.Zero))
-            {
-                sdn = (StorageDeviceNumber)Marshal.PtrToStructure(ptrSdn, typeof(StorageDeviceNumber));
-
-                // just my way of combining the relevant parts of the
-                // STORAGE_DEVICE_NUMBER into a single number
-                ans = (sdn.DeviceType << 8) + sdn.DeviceNumber;
-            }
-
-            Marshal.FreeHGlobal(ptrSdn);
-            CloseHandle(h);
+        IntPtr h = CreateFile(devicePath.TrimEnd('\\'), 0, 0, IntPtr.Zero, OPEN_EXISTING, 0, IntPtr.Zero);
 
+        if(h == INVALID_HANDLE_VALUE)
             return ans;
+
+        var    sdn    = new StorageDeviceNumber();
+        int    nBytes = Marshal.SizeOf(sdn);
+        IntPtr ptrSdn = Marshal.AllocHGlobal(nBytes);
+
+        if(DeviceIoControl(h, IOCTL_STORAGE_GET_DEVICE_NUMBER, IntPtr.Zero, 0, ptrSdn, nBytes, out _, IntPtr.Zero))
+        {
+            sdn = (StorageDeviceNumber)Marshal.PtrToStructure(ptrSdn, typeof(StorageDeviceNumber));
+
+            // just my way of combining the relevant parts of the
+            // STORAGE_DEVICE_NUMBER into a single number
+            ans = (sdn.DeviceType << 8) + sdn.DeviceNumber;
         }
 
-        [StructLayout(LayoutKind.Sequential)]
-        readonly struct StorageDeviceNumber
-        {
-            internal readonly int DeviceType;
-            internal readonly int DeviceNumber;
-            internal readonly int PartitionNumber;
-        }
+        Marshal.FreeHGlobal(ptrSdn);
+        CloseHandle(h);
+
+        return ans;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    readonly struct StorageDeviceNumber
+    {
+        internal readonly int DeviceType;
+        internal readonly int DeviceNumber;
+        internal readonly int PartitionNumber;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AODOS.cs b/Aaru.Filesystems/AODOS.cs
index 8c8e0d606..1e41e5683 100644
--- a/Aaru.Filesystems/AODOS.cs
+++ b/Aaru.Filesystems/AODOS.cs
@@ -41,113 +41,112 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information has been extracted looking at available disk images
+// This may be missing fields, or not, I don't know russian so any help is appreciated
+/// <inheritdoc />
+/// <summary>Implements detection of the AO-DOS filesystem</summary>
+public sealed class AODOS : IFilesystem
 {
-    // Information has been extracted looking at available disk images
-    // This may be missing fields, or not, I don't know russian so any help is appreciated
-    /// <inheritdoc />
-    /// <summary>Implements detection of the AO-DOS filesystem</summary>
-    public sealed class AODOS : IFilesystem
+    readonly byte[] _identifier =
     {
-        readonly byte[] _identifier =
+        0x20, 0x41, 0x4F, 0x2D, 0x44, 0x4F, 0x53, 0x20
+    };
+    /// <inheritdoc />
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Alexander Osipov DOS file system";
+    /// <inheritdoc />
+    public Guid Id => new("668E5039-9DDD-442A-BE1B-A315D6E38E26");
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
+    {
+        // Does AO-DOS support hard disks?
+        if(partition.Start > 0)
+            return false;
+
+        // How is it really?
+        if(imagePlugin.Info.SectorSize != 512)
+            return false;
+
+        // Does AO-DOS support any other kind of disk?
+        if(imagePlugin.Info.Sectors != 800 &&
+           imagePlugin.Info.Sectors != 1600)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        BootBlock bb = Marshal.ByteArrayToStructureLittleEndian<BootBlock>(sector);
+
+        return bb.identifier.SequenceEqual(_identifier);
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        information = "";
+        Encoding    = Encoding.GetEncoding("koi8-r");
+        ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        BootBlock bb = Marshal.ByteArrayToStructureLittleEndian<BootBlock>(sector);
+
+        var sbInformation = new StringBuilder();
+
+        sbInformation.AppendLine("Alexander Osipov DOS file system");
+
+        XmlFsType = new FileSystemType
         {
-            0x20, 0x41, 0x4F, 0x2D, 0x44, 0x4F, 0x53, 0x20
+            Type                  = "Alexander Osipov DOS file system",
+            Clusters              = imagePlugin.Info.Sectors,
+            ClusterSize           = imagePlugin.Info.SectorSize,
+            Files                 = bb.files,
+            FilesSpecified        = true,
+            FreeClusters          = imagePlugin.Info.Sectors - bb.usedSectors,
+            FreeClustersSpecified = true,
+            VolumeName            = StringHandlers.SpacePaddedToString(bb.volumeLabel, Encoding),
+            Bootable              = true
         };
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Alexander Osipov DOS file system";
-        /// <inheritdoc />
-        public Guid Id => new("668E5039-9DDD-442A-BE1B-A315D6E38E26");
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            // Does AO-DOS support hard disks?
-            if(partition.Start > 0)
-                return false;
+        sbInformation.AppendFormat("{0} files on volume", bb.files).AppendLine();
+        sbInformation.AppendFormat("{0} used sectors on volume", bb.usedSectors).AppendLine();
 
-            // How is it really?
-            if(imagePlugin.Info.SectorSize != 512)
-                return false;
+        sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(bb.volumeLabel, Encoding)).
+                      AppendLine();
 
-            // Does AO-DOS support any other kind of disk?
-            if(imagePlugin.Info.Sectors != 800 &&
-               imagePlugin.Info.Sectors != 1600)
-                return false;
+        information = sbInformation.ToString();
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            BootBlock bb = Marshal.ByteArrayToStructureLittleEndian<BootBlock>(sector);
-
-            return bb.identifier.SequenceEqual(_identifier);
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            information = "";
-            Encoding    = Encoding.GetEncoding("koi8-r");
-            ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            BootBlock bb = Marshal.ByteArrayToStructureLittleEndian<BootBlock>(sector);
-
-            var sbInformation = new StringBuilder();
-
-            sbInformation.AppendLine("Alexander Osipov DOS file system");
-
-            XmlFsType = new FileSystemType
-            {
-                Type                  = "Alexander Osipov DOS file system",
-                Clusters              = imagePlugin.Info.Sectors,
-                ClusterSize           = imagePlugin.Info.SectorSize,
-                Files                 = bb.files,
-                FilesSpecified        = true,
-                FreeClusters          = imagePlugin.Info.Sectors - bb.usedSectors,
-                FreeClustersSpecified = true,
-                VolumeName            = StringHandlers.SpacePaddedToString(bb.volumeLabel, Encoding),
-                Bootable              = true
-            };
-
-            sbInformation.AppendFormat("{0} files on volume", bb.files).AppendLine();
-            sbInformation.AppendFormat("{0} used sectors on volume", bb.usedSectors).AppendLine();
-
-            sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(bb.volumeLabel, Encoding)).
-                          AppendLine();
-
-            information = sbInformation.ToString();
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BootBlock
-        {
-            /// <summary>A NOP opcode</summary>
-            public readonly byte nop;
-            /// <summary>A branch to real bootloader</summary>
-            public readonly ushort branch;
-            /// <summary>Unused</summary>
-            public readonly byte unused;
-            /// <summary>" AO-DOS "</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] identifier;
-            /// <summary>Volume label</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] volumeLabel;
-            /// <summary>How many files are present in disk</summary>
-            public readonly ushort files;
-            /// <summary>How many sectors are used</summary>
-            public readonly ushort usedSectors;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BootBlock
+    {
+        /// <summary>A NOP opcode</summary>
+        public readonly byte nop;
+        /// <summary>A branch to real bootloader</summary>
+        public readonly ushort branch;
+        /// <summary>Unused</summary>
+        public readonly byte unused;
+        /// <summary>" AO-DOS "</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] identifier;
+        /// <summary>Volume label</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] volumeLabel;
+        /// <summary>How many files are present in disk</summary>
+        public readonly ushort files;
+        /// <summary>How many sectors are used</summary>
+        public readonly ushort usedSectors;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/APFS.cs b/Aaru.Filesystems/APFS.cs
index 0430ad0c6..877371fee 100644
--- a/Aaru.Filesystems/APFS.cs
+++ b/Aaru.Filesystems/APFS.cs
@@ -40,111 +40,110 @@ using Aaru.CommonTypes.Interfaces;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the Apple File System (APFS)</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class APFS : IFilesystem
 {
+    const uint APFS_CONTAINER_MAGIC = 0x4253584E; // "NXSB"
+    const uint APFS_VOLUME_MAGIC    = 0x42535041; // "APSB"
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the Apple File System (APFS)</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class APFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Apple File System";
+    /// <inheritdoc />
+    public Guid Id => new("A4060F9D-2909-42E2-9D95-DB31FA7EA797");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint APFS_CONTAINER_MAGIC = 0x4253584E; // "NXSB"
-        const uint APFS_VOLUME_MAGIC    = 0x42535041; // "APSB"
+        if(partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Apple File System";
-        /// <inheritdoc />
-        public Guid Id => new("A4060F9D-2909-42E2-9D95-DB31FA7EA797");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        ContainerSuperBlock nxSb;
+
+        try
         {
-            if(partition.Start >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            ContainerSuperBlock nxSb;
-
-            try
-            {
-                nxSb = Marshal.ByteArrayToStructureLittleEndian<ContainerSuperBlock>(sector);
-            }
-            catch
-            {
-                return false;
-            }
-
-            return nxSb.magic == APFS_CONTAINER_MAGIC;
+            nxSb = Marshal.ByteArrayToStructureLittleEndian<ContainerSuperBlock>(sector);
+        }
+        catch
+        {
+            return false;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        return nxSb.magic == APFS_CONTAINER_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding = Encoding.UTF8;
+        var sbInformation = new StringBuilder();
+        XmlFsType   = new FileSystemType();
+        information = "";
+
+        if(partition.Start >= partition.End)
+            return;
+
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        ContainerSuperBlock nxSb;
+
+        try
         {
-            Encoding = Encoding.UTF8;
-            var sbInformation = new StringBuilder();
-            XmlFsType   = new FileSystemType();
-            information = "";
-
-            if(partition.Start >= partition.End)
-                return;
-
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            ContainerSuperBlock nxSb;
-
-            try
-            {
-                nxSb = Marshal.ByteArrayToStructureLittleEndian<ContainerSuperBlock>(sector);
-            }
-            catch
-            {
-                return;
-            }
-
-            if(nxSb.magic != APFS_CONTAINER_MAGIC)
-                return;
-
-            sbInformation.AppendLine("Apple File System");
-            sbInformation.AppendLine();
-            sbInformation.AppendFormat("{0} bytes per block", nxSb.blockSize).AppendLine();
-
-            sbInformation.AppendFormat("Container has {0} bytes in {1} blocks", nxSb.containerBlocks * nxSb.blockSize,
-                                       nxSb.containerBlocks).AppendLine();
-
-            information = sbInformation.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Bootable    = false,
-                Clusters    = nxSb.containerBlocks,
-                ClusterSize = nxSb.blockSize,
-                Type        = "Apple File System"
-            };
+            nxSb = Marshal.ByteArrayToStructureLittleEndian<ContainerSuperBlock>(sector);
+        }
+        catch
+        {
+            return;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ContainerSuperBlock
+        if(nxSb.magic != APFS_CONTAINER_MAGIC)
+            return;
+
+        sbInformation.AppendLine("Apple File System");
+        sbInformation.AppendLine();
+        sbInformation.AppendFormat("{0} bytes per block", nxSb.blockSize).AppendLine();
+
+        sbInformation.AppendFormat("Container has {0} bytes in {1} blocks", nxSb.containerBlocks * nxSb.blockSize,
+                                   nxSb.containerBlocks).AppendLine();
+
+        information = sbInformation.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            public readonly ulong unknown1; // Varies between copies of the superblock
-            public readonly ulong unknown2;
-            public readonly ulong unknown3; // Varies by 1 between copies of the superblock
-            public readonly ulong unknown4;
-            public readonly uint  magic;
-            public readonly uint  blockSize;
-            public readonly ulong containerBlocks;
-        }
+            Bootable    = false,
+            Clusters    = nxSb.containerBlocks,
+            ClusterSize = nxSb.blockSize,
+            Type        = "Apple File System"
+        };
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ContainerSuperBlock
+    {
+        public readonly ulong unknown1; // Varies between copies of the superblock
+        public readonly ulong unknown2;
+        public readonly ulong unknown3; // Varies by 1 between copies of the superblock
+        public readonly ulong unknown4;
+        public readonly uint  magic;
+        public readonly uint  blockSize;
+        public readonly ulong containerBlocks;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Acorn.cs b/Aaru.Filesystems/Acorn.cs
index 89dd0c04d..ef78fff63 100644
--- a/Aaru.Filesystems/Acorn.cs
+++ b/Aaru.Filesystems/Acorn.cs
@@ -42,102 +42,334 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of Acorn's Advanced Data Filing System (ADFS)</summary>
+public sealed class AcornADFS : IFilesystem
 {
+    /// <summary>Location for boot block, in bytes</summary>
+    const ulong BOOT_BLOCK_LOCATION = 0xC00;
+    /// <summary>Size of boot block, in bytes</summary>
+    const uint BOOT_BLOCK_SIZE = 0x200;
+    /// <summary>Location of new directory, in bytes</summary>
+    const ulong NEW_DIRECTORY_LOCATION = 0x400;
+    /// <summary>Location of old directory, in bytes</summary>
+    const ulong OLD_DIRECTORY_LOCATION = 0x200;
+    /// <summary>Size of old directory</summary>
+    const uint OLD_DIRECTORY_SIZE = 1280;
+    /// <summary>Size of new directory</summary>
+    const uint NEW_DIRECTORY_SIZE = 2048;
+
+    /// <summary>New directory format magic number, "Nick"</summary>
+    const uint NEW_DIR_MAGIC = 0x6B63694E;
+    /// <summary>Old directory format magic number, "Hugo"</summary>
+    const uint OLD_DIR_MAGIC = 0x6F677548;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of Acorn's Advanced Data Filing System (ADFS)</summary>
-    public sealed class AcornADFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Acorn Advanced Disc Filing System";
+    /// <inheritdoc />
+    public Guid Id => new("BAFC1E50-9C64-4CD3-8400-80628CC27AFA");
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    // TODO: BBC Master hard disks are untested...
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>Location for boot block, in bytes</summary>
-        const ulong BOOT_BLOCK_LOCATION = 0xC00;
-        /// <summary>Size of boot block, in bytes</summary>
-        const uint BOOT_BLOCK_SIZE = 0x200;
-        /// <summary>Location of new directory, in bytes</summary>
-        const ulong NEW_DIRECTORY_LOCATION = 0x400;
-        /// <summary>Location of old directory, in bytes</summary>
-        const ulong OLD_DIRECTORY_LOCATION = 0x200;
-        /// <summary>Size of old directory</summary>
-        const uint OLD_DIRECTORY_SIZE = 1280;
-        /// <summary>Size of new directory</summary>
-        const uint NEW_DIRECTORY_SIZE = 2048;
+        if(partition.Start >= partition.End)
+            return false;
 
-        /// <summary>New directory format magic number, "Nick"</summary>
-        const uint NEW_DIR_MAGIC = 0x6B63694E;
-        /// <summary>Old directory format magic number, "Hugo"</summary>
-        const uint OLD_DIR_MAGIC = 0x6F677548;
+        ulong sbSector;
+        uint  sectorsToRead;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Acorn Advanced Disc Filing System";
-        /// <inheritdoc />
-        public Guid Id => new("BAFC1E50-9C64-4CD3-8400-80628CC27AFA");
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(imagePlugin.Info.SectorSize < 256)
+            return false;
 
-        // TODO: BBC Master hard disks are untested...
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        byte[]      sector;
+        ErrorNumber errno;
+
+        // ADFS-S, ADFS-M, ADFS-L, ADFS-D without partitions
+        if(partition.Start == 0)
         {
-            if(partition.Start >= partition.End)
+            errno = imagePlugin.ReadSector(0, out sector);
+
+            if(errno != ErrorNumber.NoError)
                 return false;
 
-            ulong sbSector;
-            uint  sectorsToRead;
+            byte          oldChk0 = AcornMapChecksum(sector, 255);
+            OldMapSector0 oldMap0 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector0>(sector);
 
-            if(imagePlugin.Info.SectorSize < 256)
+            errno = imagePlugin.ReadSector(1, out sector);
+
+            if(errno != ErrorNumber.NoError)
                 return false;
 
-            byte[]      sector;
-            ErrorNumber errno;
+            byte          oldChk1 = AcornMapChecksum(sector, 255);
+            OldMapSector1 oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(sector);
 
-            // ADFS-S, ADFS-M, ADFS-L, ADFS-D without partitions
-            if(partition.Start == 0)
+            AaruConsole.DebugWriteLine("ADFS Plugin", "oldMap0.checksum = {0}", oldMap0.checksum);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "oldChk0 = {0}", oldChk0);
+
+            // According to documentation map1 MUST start on sector 1. On ADFS-D it starts at 0x100, not on sector 1 (0x400)
+            if(oldMap0.checksum == oldChk0 &&
+               oldMap1.checksum != oldChk1 &&
+               sector.Length    >= 512)
             {
                 errno = imagePlugin.ReadSector(0, out sector);
 
                 if(errno != ErrorNumber.NoError)
                     return false;
 
-                byte          oldChk0 = AcornMapChecksum(sector, 255);
-                OldMapSector0 oldMap0 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector0>(sector);
+                byte[] tmp = new byte[256];
+                Array.Copy(sector, 256, tmp, 0, 256);
+                oldChk1 = AcornMapChecksum(tmp, 255);
+                oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(tmp);
+            }
 
-                errno = imagePlugin.ReadSector(1, out sector);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "oldMap1.checksum = {0}", oldMap1.checksum);
+            AaruConsole.DebugWriteLine("ADFS Plugin", "oldChk1 = {0}", oldChk1);
+
+            if(oldMap0.checksum == oldChk0 &&
+               oldMap1.checksum == oldChk1 &&
+               oldMap0.checksum != 0       &&
+               oldMap1.checksum != 0)
+            {
+                sbSector      = OLD_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
+                sectorsToRead = OLD_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
+
+                if(OLD_DIRECTORY_SIZE % imagePlugin.Info.SectorSize > 0)
+                    sectorsToRead++;
+
+                errno = imagePlugin.ReadSectors(sbSector, sectorsToRead, out sector);
 
                 if(errno != ErrorNumber.NoError)
                     return false;
 
-                byte          oldChk1 = AcornMapChecksum(sector, 255);
-                OldMapSector1 oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(sector);
-
-                AaruConsole.DebugWriteLine("ADFS Plugin", "oldMap0.checksum = {0}", oldMap0.checksum);
-                AaruConsole.DebugWriteLine("ADFS Plugin", "oldChk0 = {0}", oldChk0);
-
-                // According to documentation map1 MUST start on sector 1. On ADFS-D it starts at 0x100, not on sector 1 (0x400)
-                if(oldMap0.checksum == oldChk0 &&
-                   oldMap1.checksum != oldChk1 &&
-                   sector.Length    >= 512)
+                if(sector.Length > OLD_DIRECTORY_SIZE)
                 {
-                    errno = imagePlugin.ReadSector(0, out sector);
-
-                    if(errno != ErrorNumber.NoError)
-                        return false;
-
-                    byte[] tmp = new byte[256];
-                    Array.Copy(sector, 256, tmp, 0, 256);
-                    oldChk1 = AcornMapChecksum(tmp, 255);
-                    oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(tmp);
+                    byte[] tmp = new byte[OLD_DIRECTORY_SIZE];
+                    Array.Copy(sector, 0, tmp, 0, OLD_DIRECTORY_SIZE - 53);
+                    Array.Copy(sector, sector.Length                 - 54, tmp, OLD_DIRECTORY_SIZE - 54, 53);
+                    sector = tmp;
                 }
 
-                AaruConsole.DebugWriteLine("ADFS Plugin", "oldMap1.checksum = {0}", oldMap1.checksum);
-                AaruConsole.DebugWriteLine("ADFS Plugin", "oldChk1 = {0}", oldChk1);
+                OldDirectory oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
+                byte         dirChk  = AcornDirectoryChecksum(sector, (int)OLD_DIRECTORY_SIZE - 1);
 
-                if(oldMap0.checksum == oldChk0 &&
-                   oldMap1.checksum == oldChk1 &&
-                   oldMap0.checksum != 0       &&
-                   oldMap1.checksum != 0)
+                AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.header.magic at 0x200 = {0}",
+                                           oldRoot.header.magic);
+
+                AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.magic at 0x200 = {0}", oldRoot.tail.magic);
+
+                AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.checkByte at 0x200 = {0}",
+                                           oldRoot.tail.checkByte);
+
+                AaruConsole.DebugWriteLine("ADFS Plugin", "dirChk at 0x200 = {0}", dirChk);
+
+                if((oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC) ||
+                   (oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC))
+                    return true;
+
+                // RISC OS says the old directory can't be in the new location, hard disks created by RISC OS 3.10 do that...
+                sbSector      = NEW_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
+                sectorsToRead = NEW_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
+
+                if(NEW_DIRECTORY_SIZE % imagePlugin.Info.SectorSize > 0)
+                    sectorsToRead++;
+
+                errno = imagePlugin.ReadSectors(sbSector, sectorsToRead, out sector);
+
+                if(errno != ErrorNumber.NoError)
+                    return false;
+
+                if(sector.Length > OLD_DIRECTORY_SIZE)
+                {
+                    byte[] tmp = new byte[OLD_DIRECTORY_SIZE];
+                    Array.Copy(sector, 0, tmp, 0, OLD_DIRECTORY_SIZE - 53);
+                    Array.Copy(sector, sector.Length                 - 54, tmp, OLD_DIRECTORY_SIZE - 54, 53);
+                    sector = tmp;
+                }
+
+                oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
+                dirChk  = AcornDirectoryChecksum(sector, (int)OLD_DIRECTORY_SIZE - 1);
+
+                AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.header.magic at 0x400 = {0}",
+                                           oldRoot.header.magic);
+
+                AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.magic at 0x400 = {0}", oldRoot.tail.magic);
+
+                AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.checkByte at 0x400 = {0}",
+                                           oldRoot.tail.checkByte);
+
+                AaruConsole.DebugWriteLine("ADFS Plugin", "dirChk at 0x400 = {0}", dirChk);
+
+                if((oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC) ||
+                   (oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC))
+                    return true;
+            }
+        }
+
+        // Partitioning or not, new formats follow:
+        DiscRecord drSb;
+
+        errno = imagePlugin.ReadSector(partition.Start, out sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        byte newChk = NewMapChecksum(sector);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "newChk = {0}", newChk);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "map.zoneChecksum = {0}", sector[0]);
+
+        sbSector      = BOOT_BLOCK_LOCATION / imagePlugin.Info.SectorSize;
+        sectorsToRead = BOOT_BLOCK_SIZE     / imagePlugin.Info.SectorSize;
+
+        if(BOOT_BLOCK_SIZE % imagePlugin.Info.SectorSize > 0)
+            sectorsToRead++;
+
+        if(sbSector + partition.Start + sectorsToRead >= partition.End)
+            return false;
+
+        errno = imagePlugin.ReadSectors(sbSector + partition.Start, sectorsToRead, out byte[] bootSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        int bootChk = 0;
+
+        if(bootSector.Length < 512)
+            return false;
+
+        for(int i = 0; i < 0x1FF; i++)
+            bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
+
+        AaruConsole.DebugWriteLine("ADFS Plugin", "bootChk = {0}", bootChk);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "bBlock.checksum = {0}", bootSector[0x1FF]);
+
+        if(newChk == sector[0] &&
+           newChk != 0)
+        {
+            NewMap nmap = Marshal.ByteArrayToStructureLittleEndian<NewMap>(sector);
+            drSb = nmap.discRecord;
+        }
+        else if(bootChk == bootSector[0x1FF])
+        {
+            BootBlock bBlock = Marshal.ByteArrayToStructureLittleEndian<BootBlock>(bootSector);
+            drSb = bBlock.discRecord;
+        }
+        else
+            return false;
+
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2secsize = {0}", drSb.log2secsize);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.idlen = {0}", drSb.idlen);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size_high = {0}", drSb.disc_size_high);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size = {0}", drSb.disc_size);
+
+        AaruConsole.DebugWriteLine("ADFS Plugin", "IsNullOrEmpty(drSb.reserved) = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved));
+
+        if(drSb.log2secsize < 8 ||
+           drSb.log2secsize > 10)
+            return false;
+
+        if(drSb.idlen < drSb.log2secsize + 3 ||
+           drSb.idlen > 19)
+            return false;
+
+        if(drSb.disc_size_high >> drSb.log2secsize != 0)
+            return false;
+
+        if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved))
+            return false;
+
+        ulong bytes = drSb.disc_size_high;
+        bytes *= 0x100000000;
+        bytes += drSb.disc_size;
+
+        return bytes <= imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize;
+    }
+
+    // TODO: Find root directory on volumes with DiscRecord
+    // TODO: Support big directories (ADFS-G?)
+    // TODO: Find the real freemap on volumes with DiscRecord, as DiscRecord's discid may be empty but this one isn't
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
+        var sbInformation = new StringBuilder();
+        XmlFsType   = new FileSystemType();
+        information = "";
+        ErrorNumber errno;
+
+        ulong  sbSector;
+        byte[] sector;
+        uint   sectorsToRead;
+        ulong  bytes;
+
+        // ADFS-S, ADFS-M, ADFS-L, ADFS-D without partitions
+        if(partition.Start == 0)
+        {
+            errno = imagePlugin.ReadSector(0, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                return;
+
+            byte          oldChk0 = AcornMapChecksum(sector, 255);
+            OldMapSector0 oldMap0 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector0>(sector);
+
+            errno = imagePlugin.ReadSector(1, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                return;
+
+            byte          oldChk1 = AcornMapChecksum(sector, 255);
+            OldMapSector1 oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(sector);
+
+            // According to documentation map1 MUST start on sector 1. On ADFS-D it starts at 0x100, not on sector 1 (0x400)
+            if(oldMap0.checksum == oldChk0 &&
+               oldMap1.checksum != oldChk1 &&
+               sector.Length    >= 512)
+            {
+                errno = imagePlugin.ReadSector(0, out sector);
+
+                if(errno != ErrorNumber.NoError)
+                    return;
+
+                byte[] tmp = new byte[256];
+                Array.Copy(sector, 256, tmp, 0, 256);
+                oldChk1 = AcornMapChecksum(tmp, 255);
+                oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(tmp);
+            }
+
+            if(oldMap0.checksum == oldChk0 &&
+               oldMap1.checksum == oldChk1 &&
+               oldMap0.checksum != 0       &&
+               oldMap1.checksum != 0)
+            {
+                bytes = (ulong)((oldMap0.size[2] << 16) + (oldMap0.size[1] << 8) + oldMap0.size[0]) * 256;
+                byte[] namebytes = new byte[10];
+
+                for(int i = 0; i < 5; i++)
+                {
+                    namebytes[i * 2]       = oldMap0.name[i];
+                    namebytes[(i * 2) + 1] = oldMap1.name[i];
+                }
+
+                XmlFsType = new FileSystemType
+                {
+                    Bootable    = oldMap1.boot != 0, // Or not?
+                    Clusters    = bytes / imagePlugin.Info.SectorSize,
+                    ClusterSize = imagePlugin.Info.SectorSize,
+                    Type        = "Acorn Advanced Disc Filing System"
+                };
+
+                if(ArrayHelpers.ArrayIsNullOrEmpty(namebytes))
                 {
                     sbSector      = OLD_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
                     sectorsToRead = OLD_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
@@ -148,7 +380,7 @@ namespace Aaru.Filesystems
                     errno = imagePlugin.ReadSectors(sbSector, sectorsToRead, out sector);
 
                     if(errno != ErrorNumber.NoError)
-                        return false;
+                        return;
 
                     if(sector.Length > OLD_DIRECTORY_SIZE)
                     {
@@ -159,222 +391,17 @@ namespace Aaru.Filesystems
                     }
 
                     OldDirectory oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
-                    byte         dirChk  = AcornDirectoryChecksum(sector, (int)OLD_DIRECTORY_SIZE - 1);
 
-                    AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.header.magic at 0x200 = {0}",
-                                               oldRoot.header.magic);
-
-                    AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.magic at 0x200 = {0}", oldRoot.tail.magic);
-
-                    AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.checkByte at 0x200 = {0}",
-                                               oldRoot.tail.checkByte);
-
-                    AaruConsole.DebugWriteLine("ADFS Plugin", "dirChk at 0x200 = {0}", dirChk);
-
-                    if((oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC) ||
-                       (oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC))
-                        return true;
-
-                    // RISC OS says the old directory can't be in the new location, hard disks created by RISC OS 3.10 do that...
-                    sbSector      = NEW_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
-                    sectorsToRead = NEW_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
-
-                    if(NEW_DIRECTORY_SIZE % imagePlugin.Info.SectorSize > 0)
-                        sectorsToRead++;
-
-                    errno = imagePlugin.ReadSectors(sbSector, sectorsToRead, out sector);
-
-                    if(errno != ErrorNumber.NoError)
-                        return false;
-
-                    if(sector.Length > OLD_DIRECTORY_SIZE)
+                    if(oldRoot.header.magic == OLD_DIR_MAGIC &&
+                       oldRoot.tail.magic   == OLD_DIR_MAGIC)
+                        namebytes = oldRoot.tail.name;
+                    else
                     {
-                        byte[] tmp = new byte[OLD_DIRECTORY_SIZE];
-                        Array.Copy(sector, 0, tmp, 0, OLD_DIRECTORY_SIZE - 53);
-                        Array.Copy(sector, sector.Length                 - 54, tmp, OLD_DIRECTORY_SIZE - 54, 53);
-                        sector = tmp;
-                    }
+                        // RISC OS says the old directory can't be in the new location, hard disks created by RISC OS 3.10 do that...
+                        sbSector      = NEW_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
+                        sectorsToRead = NEW_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
 
-                    oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
-                    dirChk  = AcornDirectoryChecksum(sector, (int)OLD_DIRECTORY_SIZE - 1);
-
-                    AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.header.magic at 0x400 = {0}",
-                                               oldRoot.header.magic);
-
-                    AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.magic at 0x400 = {0}", oldRoot.tail.magic);
-
-                    AaruConsole.DebugWriteLine("ADFS Plugin", "oldRoot.tail.checkByte at 0x400 = {0}",
-                                               oldRoot.tail.checkByte);
-
-                    AaruConsole.DebugWriteLine("ADFS Plugin", "dirChk at 0x400 = {0}", dirChk);
-
-                    if((oldRoot.header.magic == OLD_DIR_MAGIC && oldRoot.tail.magic == OLD_DIR_MAGIC) ||
-                       (oldRoot.header.magic == NEW_DIR_MAGIC && oldRoot.tail.magic == NEW_DIR_MAGIC))
-                        return true;
-                }
-            }
-
-            // Partitioning or not, new formats follow:
-            DiscRecord drSb;
-
-            errno = imagePlugin.ReadSector(partition.Start, out sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            byte newChk = NewMapChecksum(sector);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "newChk = {0}", newChk);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "map.zoneChecksum = {0}", sector[0]);
-
-            sbSector      = BOOT_BLOCK_LOCATION / imagePlugin.Info.SectorSize;
-            sectorsToRead = BOOT_BLOCK_SIZE     / imagePlugin.Info.SectorSize;
-
-            if(BOOT_BLOCK_SIZE % imagePlugin.Info.SectorSize > 0)
-                sectorsToRead++;
-
-            if(sbSector + partition.Start + sectorsToRead >= partition.End)
-                return false;
-
-            errno = imagePlugin.ReadSectors(sbSector + partition.Start, sectorsToRead, out byte[] bootSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            int bootChk = 0;
-
-            if(bootSector.Length < 512)
-                return false;
-
-            for(int i = 0; i < 0x1FF; i++)
-                bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
-
-            AaruConsole.DebugWriteLine("ADFS Plugin", "bootChk = {0}", bootChk);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "bBlock.checksum = {0}", bootSector[0x1FF]);
-
-            if(newChk == sector[0] &&
-               newChk != 0)
-            {
-                NewMap nmap = Marshal.ByteArrayToStructureLittleEndian<NewMap>(sector);
-                drSb = nmap.discRecord;
-            }
-            else if(bootChk == bootSector[0x1FF])
-            {
-                BootBlock bBlock = Marshal.ByteArrayToStructureLittleEndian<BootBlock>(bootSector);
-                drSb = bBlock.discRecord;
-            }
-            else
-                return false;
-
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2secsize = {0}", drSb.log2secsize);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.idlen = {0}", drSb.idlen);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size_high = {0}", drSb.disc_size_high);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size = {0}", drSb.disc_size);
-
-            AaruConsole.DebugWriteLine("ADFS Plugin", "IsNullOrEmpty(drSb.reserved) = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved));
-
-            if(drSb.log2secsize < 8 ||
-               drSb.log2secsize > 10)
-                return false;
-
-            if(drSb.idlen < drSb.log2secsize + 3 ||
-               drSb.idlen > 19)
-                return false;
-
-            if(drSb.disc_size_high >> drSb.log2secsize != 0)
-                return false;
-
-            if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved))
-                return false;
-
-            ulong bytes = drSb.disc_size_high;
-            bytes *= 0x100000000;
-            bytes += drSb.disc_size;
-
-            return bytes <= imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize;
-        }
-
-        // TODO: Find root directory on volumes with DiscRecord
-        // TODO: Support big directories (ADFS-G?)
-        // TODO: Find the real freemap on volumes with DiscRecord, as DiscRecord's discid may be empty but this one isn't
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
-            var sbInformation = new StringBuilder();
-            XmlFsType   = new FileSystemType();
-            information = "";
-            ErrorNumber errno;
-
-            ulong  sbSector;
-            byte[] sector;
-            uint   sectorsToRead;
-            ulong  bytes;
-
-            // ADFS-S, ADFS-M, ADFS-L, ADFS-D without partitions
-            if(partition.Start == 0)
-            {
-                errno = imagePlugin.ReadSector(0, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                byte          oldChk0 = AcornMapChecksum(sector, 255);
-                OldMapSector0 oldMap0 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector0>(sector);
-
-                errno = imagePlugin.ReadSector(1, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                byte          oldChk1 = AcornMapChecksum(sector, 255);
-                OldMapSector1 oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(sector);
-
-                // According to documentation map1 MUST start on sector 1. On ADFS-D it starts at 0x100, not on sector 1 (0x400)
-                if(oldMap0.checksum == oldChk0 &&
-                   oldMap1.checksum != oldChk1 &&
-                   sector.Length    >= 512)
-                {
-                    errno = imagePlugin.ReadSector(0, out sector);
-
-                    if(errno != ErrorNumber.NoError)
-                        return;
-
-                    byte[] tmp = new byte[256];
-                    Array.Copy(sector, 256, tmp, 0, 256);
-                    oldChk1 = AcornMapChecksum(tmp, 255);
-                    oldMap1 = Marshal.ByteArrayToStructureLittleEndian<OldMapSector1>(tmp);
-                }
-
-                if(oldMap0.checksum == oldChk0 &&
-                   oldMap1.checksum == oldChk1 &&
-                   oldMap0.checksum != 0       &&
-                   oldMap1.checksum != 0)
-                {
-                    bytes = (ulong)((oldMap0.size[2] << 16) + (oldMap0.size[1] << 8) + oldMap0.size[0]) * 256;
-                    byte[] namebytes = new byte[10];
-
-                    for(int i = 0; i < 5; i++)
-                    {
-                        namebytes[i * 2]       = oldMap0.name[i];
-                        namebytes[(i * 2) + 1] = oldMap1.name[i];
-                    }
-
-                    XmlFsType = new FileSystemType
-                    {
-                        Bootable    = oldMap1.boot != 0, // Or not?
-                        Clusters    = bytes / imagePlugin.Info.SectorSize,
-                        ClusterSize = imagePlugin.Info.SectorSize,
-                        Type        = "Acorn Advanced Disc Filing System"
-                    };
-
-                    if(ArrayHelpers.ArrayIsNullOrEmpty(namebytes))
-                    {
-                        sbSector      = OLD_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
-                        sectorsToRead = OLD_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
-
-                        if(OLD_DIRECTORY_SIZE % imagePlugin.Info.SectorSize > 0)
+                        if(NEW_DIRECTORY_SIZE % imagePlugin.Info.SectorSize > 0)
                             sectorsToRead++;
 
                         errno = imagePlugin.ReadSectors(sbSector, sectorsToRead, out sector);
@@ -386,461 +413,433 @@ namespace Aaru.Filesystems
                         {
                             byte[] tmp = new byte[OLD_DIRECTORY_SIZE];
                             Array.Copy(sector, 0, tmp, 0, OLD_DIRECTORY_SIZE - 53);
-                            Array.Copy(sector, sector.Length                 - 54, tmp, OLD_DIRECTORY_SIZE - 54, 53);
+
+                            Array.Copy(sector, sector.Length - 54, tmp, OLD_DIRECTORY_SIZE - 54, 53);
+
                             sector = tmp;
                         }
 
-                        OldDirectory oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
+                        oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
 
                         if(oldRoot.header.magic == OLD_DIR_MAGIC &&
                            oldRoot.tail.magic   == OLD_DIR_MAGIC)
                             namebytes = oldRoot.tail.name;
                         else
                         {
-                            // RISC OS says the old directory can't be in the new location, hard disks created by RISC OS 3.10 do that...
-                            sbSector      = NEW_DIRECTORY_LOCATION / imagePlugin.Info.SectorSize;
-                            sectorsToRead = NEW_DIRECTORY_SIZE     / imagePlugin.Info.SectorSize;
-
-                            if(NEW_DIRECTORY_SIZE % imagePlugin.Info.SectorSize > 0)
-                                sectorsToRead++;
-
                             errno = imagePlugin.ReadSectors(sbSector, sectorsToRead, out sector);
 
                             if(errno != ErrorNumber.NoError)
                                 return;
 
-                            if(sector.Length > OLD_DIRECTORY_SIZE)
+                            if(sector.Length > NEW_DIRECTORY_SIZE)
                             {
-                                byte[] tmp = new byte[OLD_DIRECTORY_SIZE];
-                                Array.Copy(sector, 0, tmp, 0, OLD_DIRECTORY_SIZE - 53);
+                                byte[] tmp = new byte[NEW_DIRECTORY_SIZE];
+                                Array.Copy(sector, 0, tmp, 0, NEW_DIRECTORY_SIZE - 41);
 
-                                Array.Copy(sector, sector.Length - 54, tmp, OLD_DIRECTORY_SIZE - 54, 53);
+                                Array.Copy(sector, sector.Length - 42, tmp, NEW_DIRECTORY_SIZE - 42, 41);
 
                                 sector = tmp;
                             }
 
-                            oldRoot = Marshal.ByteArrayToStructureLittleEndian<OldDirectory>(sector);
+                            NewDirectory newRoot = Marshal.ByteArrayToStructureLittleEndian<NewDirectory>(sector);
 
-                            if(oldRoot.header.magic == OLD_DIR_MAGIC &&
-                               oldRoot.tail.magic   == OLD_DIR_MAGIC)
-                                namebytes = oldRoot.tail.name;
-                            else
-                            {
-                                errno = imagePlugin.ReadSectors(sbSector, sectorsToRead, out sector);
-
-                                if(errno != ErrorNumber.NoError)
-                                    return;
-
-                                if(sector.Length > NEW_DIRECTORY_SIZE)
-                                {
-                                    byte[] tmp = new byte[NEW_DIRECTORY_SIZE];
-                                    Array.Copy(sector, 0, tmp, 0, NEW_DIRECTORY_SIZE - 41);
-
-                                    Array.Copy(sector, sector.Length - 42, tmp, NEW_DIRECTORY_SIZE - 42, 41);
-
-                                    sector = tmp;
-                                }
-
-                                NewDirectory newRoot = Marshal.ByteArrayToStructureLittleEndian<NewDirectory>(sector);
-
-                                if(newRoot.header.magic == NEW_DIR_MAGIC &&
-                                   newRoot.tail.magic   == NEW_DIR_MAGIC)
-                                    namebytes = newRoot.tail.title;
-                            }
+                            if(newRoot.header.magic == NEW_DIR_MAGIC &&
+                               newRoot.tail.magic   == NEW_DIR_MAGIC)
+                                namebytes = newRoot.tail.title;
                         }
                     }
-
-                    sbInformation.AppendLine("Acorn Advanced Disc Filing System");
-                    sbInformation.AppendLine();
-                    sbInformation.AppendFormat("{0} bytes per sector", imagePlugin.Info.SectorSize).AppendLine();
-                    sbInformation.AppendFormat("Volume has {0} bytes", bytes).AppendLine();
-
-                    sbInformation.AppendFormat("Volume name: {0}", StringHandlers.CToString(namebytes, Encoding)).
-                                  AppendLine();
-
-                    if(oldMap1.discId > 0)
-                    {
-                        XmlFsType.VolumeSerial = $"{oldMap1.discId:X4}";
-                        sbInformation.AppendFormat("Volume ID: {0:X4}", oldMap1.discId).AppendLine();
-                    }
-
-                    if(!ArrayHelpers.ArrayIsNullOrEmpty(namebytes))
-                        XmlFsType.VolumeName = StringHandlers.CToString(namebytes, Encoding);
-
-                    information = sbInformation.ToString();
-
-                    return;
                 }
-            }
 
-            // Partitioning or not, new formats follow:
-            DiscRecord drSb;
+                sbInformation.AppendLine("Acorn Advanced Disc Filing System");
+                sbInformation.AppendLine();
+                sbInformation.AppendFormat("{0} bytes per sector", imagePlugin.Info.SectorSize).AppendLine();
+                sbInformation.AppendFormat("Volume has {0} bytes", bytes).AppendLine();
 
-            errno = imagePlugin.ReadSector(partition.Start, out sector);
+                sbInformation.AppendFormat("Volume name: {0}", StringHandlers.CToString(namebytes, Encoding)).
+                              AppendLine();
+
+                if(oldMap1.discId > 0)
+                {
+                    XmlFsType.VolumeSerial = $"{oldMap1.discId:X4}";
+                    sbInformation.AppendFormat("Volume ID: {0:X4}", oldMap1.discId).AppendLine();
+                }
+
+                if(!ArrayHelpers.ArrayIsNullOrEmpty(namebytes))
+                    XmlFsType.VolumeName = StringHandlers.CToString(namebytes, Encoding);
+
+                information = sbInformation.ToString();
 
-            if(errno != ErrorNumber.NoError)
                 return;
-
-            byte newChk = NewMapChecksum(sector);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "newChk = {0}", newChk);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "map.zoneChecksum = {0}", sector[0]);
-
-            sbSector      = BOOT_BLOCK_LOCATION / imagePlugin.Info.SectorSize;
-            sectorsToRead = BOOT_BLOCK_SIZE     / imagePlugin.Info.SectorSize;
-
-            if(BOOT_BLOCK_SIZE % imagePlugin.Info.SectorSize > 0)
-                sectorsToRead++;
-
-            errno = imagePlugin.ReadSectors(sbSector + partition.Start, sectorsToRead, out byte[] bootSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            int bootChk = 0;
-
-            for(int i = 0; i < 0x1FF; i++)
-                bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
-
-            AaruConsole.DebugWriteLine("ADFS Plugin", "bootChk = {0}", bootChk);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "bBlock.checksum = {0}", bootSector[0x1FF]);
-
-            if(newChk == sector[0] &&
-               newChk != 0)
-            {
-                NewMap nmap = Marshal.ByteArrayToStructureLittleEndian<NewMap>(sector);
-                drSb = nmap.discRecord;
             }
-            else if(bootChk == bootSector[0x1FF])
+        }
+
+        // Partitioning or not, new formats follow:
+        DiscRecord drSb;
+
+        errno = imagePlugin.ReadSector(partition.Start, out sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        byte newChk = NewMapChecksum(sector);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "newChk = {0}", newChk);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "map.zoneChecksum = {0}", sector[0]);
+
+        sbSector      = BOOT_BLOCK_LOCATION / imagePlugin.Info.SectorSize;
+        sectorsToRead = BOOT_BLOCK_SIZE     / imagePlugin.Info.SectorSize;
+
+        if(BOOT_BLOCK_SIZE % imagePlugin.Info.SectorSize > 0)
+            sectorsToRead++;
+
+        errno = imagePlugin.ReadSectors(sbSector + partition.Start, sectorsToRead, out byte[] bootSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        int bootChk = 0;
+
+        for(int i = 0; i < 0x1FF; i++)
+            bootChk = (bootChk & 0xFF) + (bootChk >> 8) + bootSector[i];
+
+        AaruConsole.DebugWriteLine("ADFS Plugin", "bootChk = {0}", bootChk);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "bBlock.checksum = {0}", bootSector[0x1FF]);
+
+        if(newChk == sector[0] &&
+           newChk != 0)
+        {
+            NewMap nmap = Marshal.ByteArrayToStructureLittleEndian<NewMap>(sector);
+            drSb = nmap.discRecord;
+        }
+        else if(bootChk == bootSector[0x1FF])
+        {
+            BootBlock bBlock = Marshal.ByteArrayToStructureLittleEndian<BootBlock>(bootSector);
+            drSb = bBlock.discRecord;
+        }
+        else
+            return;
+
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2secsize = {0}", drSb.log2secsize);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.spt = {0}", drSb.spt);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.heads = {0}", drSb.heads);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.density = {0}", drSb.density);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.idlen = {0}", drSb.idlen);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2bpmb = {0}", drSb.log2bpmb);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.skew = {0}", drSb.skew);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.bootoption = {0}", drSb.bootoption);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.lowsector = {0}", drSb.lowsector);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.nzones = {0}", drSb.nzones);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.zone_spare = {0}", drSb.zone_spare);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.root = {0}", drSb.root);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size = {0}", drSb.disc_size);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_id = {0}", drSb.disc_id);
+
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_name = {0}",
+                                   StringHandlers.CToString(drSb.disc_name, Encoding));
+
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_type = {0}", drSb.disc_type);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size_high = {0}", drSb.disc_size_high);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.flags = {0}", drSb.flags);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.nzones_high = {0}", drSb.nzones_high);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.format_version = {0}", drSb.format_version);
+        AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.root_size = {0}", drSb.root_size);
+
+        if(drSb.log2secsize < 8 ||
+           drSb.log2secsize > 10)
+            return;
+
+        if(drSb.idlen < drSb.log2secsize + 3 ||
+           drSb.idlen > 19)
+            return;
+
+        if(drSb.disc_size_high >> drSb.log2secsize != 0)
+            return;
+
+        if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved))
+            return;
+
+        bytes =  drSb.disc_size_high;
+        bytes *= 0x100000000;
+        bytes += drSb.disc_size;
+
+        ulong zones = drSb.nzones_high;
+        zones *= 0x100000000;
+        zones += drSb.nzones;
+
+        if(bytes > imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize)
+            return;
+
+        XmlFsType = new FileSystemType();
+
+        sbInformation.AppendLine("Acorn Advanced Disc Filing System");
+        sbInformation.AppendLine();
+        sbInformation.AppendFormat("Version {0}", drSb.format_version).AppendLine();
+        sbInformation.AppendFormat("{0} bytes per sector", 1 << drSb.log2secsize).AppendLine();
+        sbInformation.AppendFormat("{0} sectors per track", drSb.spt).AppendLine();
+        sbInformation.AppendFormat("{0} heads", drSb.heads).AppendLine();
+        sbInformation.AppendFormat("Density code: {0}", drSb.density).AppendLine();
+        sbInformation.AppendFormat("Skew: {0}", drSb.skew).AppendLine();
+        sbInformation.AppendFormat("Boot option: {0}", drSb.bootoption).AppendLine();
+
+        // TODO: What the hell is this field refering to?
+        sbInformation.AppendFormat("Root starts at frag {0}", drSb.root).AppendLine();
+
+        //sbInformation.AppendFormat("Root is {0} bytes long", drSb.root_size).AppendLine();
+        sbInformation.AppendFormat("Volume has {0} bytes in {1} zones", bytes, zones).AppendLine();
+        sbInformation.AppendFormat("Volume flags: 0x{0:X4}", drSb.flags).AppendLine();
+
+        if(drSb.disc_id > 0)
+        {
+            XmlFsType.VolumeSerial = $"{drSb.disc_id:X4}";
+            sbInformation.AppendFormat("Volume ID: {0:X4}", drSb.disc_id).AppendLine();
+        }
+
+        if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.disc_name))
+        {
+            string discname = StringHandlers.CToString(drSb.disc_name, Encoding);
+            XmlFsType.VolumeName = discname;
+            sbInformation.AppendFormat("Volume name: {0}", discname).AppendLine();
+        }
+
+        information = sbInformation.ToString();
+
+        XmlFsType.Bootable    |= drSb.bootoption != 0; // Or not?
+        XmlFsType.Clusters    =  bytes / (ulong)(1 << drSb.log2secsize);
+        XmlFsType.ClusterSize =  (uint)(1 << drSb.log2secsize);
+        XmlFsType.Type        =  "Acorn Advanced Disc Filing System";
+    }
+
+    byte AcornMapChecksum(byte[] data, int length)
+    {
+        int sum   = 0;
+        int carry = 0;
+
+        if(length > data.Length)
+            length = data.Length;
+
+        // ADC r0, r0, r1
+        // MOVS r0, r0, LSL #24
+        // MOV r0, r0, LSR #24
+        for(int i = length - 1; i >= 0; i--)
+        {
+            sum += data[i] + carry;
+
+            if(sum > 0xFF)
             {
-                BootBlock bBlock = Marshal.ByteArrayToStructureLittleEndian<BootBlock>(bootSector);
-                drSb = bBlock.discRecord;
+                carry =  1;
+                sum   &= 0xFF;
             }
             else
-                return;
-
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2secsize = {0}", drSb.log2secsize);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.spt = {0}", drSb.spt);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.heads = {0}", drSb.heads);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.density = {0}", drSb.density);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.idlen = {0}", drSb.idlen);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.log2bpmb = {0}", drSb.log2bpmb);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.skew = {0}", drSb.skew);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.bootoption = {0}", drSb.bootoption);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.lowsector = {0}", drSb.lowsector);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.nzones = {0}", drSb.nzones);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.zone_spare = {0}", drSb.zone_spare);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.root = {0}", drSb.root);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size = {0}", drSb.disc_size);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_id = {0}", drSb.disc_id);
-
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_name = {0}",
-                                       StringHandlers.CToString(drSb.disc_name, Encoding));
-
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_type = {0}", drSb.disc_type);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.disc_size_high = {0}", drSb.disc_size_high);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.flags = {0}", drSb.flags);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.nzones_high = {0}", drSb.nzones_high);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.format_version = {0}", drSb.format_version);
-            AaruConsole.DebugWriteLine("ADFS Plugin", "drSb.root_size = {0}", drSb.root_size);
-
-            if(drSb.log2secsize < 8 ||
-               drSb.log2secsize > 10)
-                return;
-
-            if(drSb.idlen < drSb.log2secsize + 3 ||
-               drSb.idlen > 19)
-                return;
-
-            if(drSb.disc_size_high >> drSb.log2secsize != 0)
-                return;
-
-            if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.reserved))
-                return;
-
-            bytes =  drSb.disc_size_high;
-            bytes *= 0x100000000;
-            bytes += drSb.disc_size;
-
-            ulong zones = drSb.nzones_high;
-            zones *= 0x100000000;
-            zones += drSb.nzones;
-
-            if(bytes > imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize)
-                return;
-
-            XmlFsType = new FileSystemType();
-
-            sbInformation.AppendLine("Acorn Advanced Disc Filing System");
-            sbInformation.AppendLine();
-            sbInformation.AppendFormat("Version {0}", drSb.format_version).AppendLine();
-            sbInformation.AppendFormat("{0} bytes per sector", 1 << drSb.log2secsize).AppendLine();
-            sbInformation.AppendFormat("{0} sectors per track", drSb.spt).AppendLine();
-            sbInformation.AppendFormat("{0} heads", drSb.heads).AppendLine();
-            sbInformation.AppendFormat("Density code: {0}", drSb.density).AppendLine();
-            sbInformation.AppendFormat("Skew: {0}", drSb.skew).AppendLine();
-            sbInformation.AppendFormat("Boot option: {0}", drSb.bootoption).AppendLine();
-
-            // TODO: What the hell is this field refering to?
-            sbInformation.AppendFormat("Root starts at frag {0}", drSb.root).AppendLine();
-
-            //sbInformation.AppendFormat("Root is {0} bytes long", drSb.root_size).AppendLine();
-            sbInformation.AppendFormat("Volume has {0} bytes in {1} zones", bytes, zones).AppendLine();
-            sbInformation.AppendFormat("Volume flags: 0x{0:X4}", drSb.flags).AppendLine();
-
-            if(drSb.disc_id > 0)
-            {
-                XmlFsType.VolumeSerial = $"{drSb.disc_id:X4}";
-                sbInformation.AppendFormat("Volume ID: {0:X4}", drSb.disc_id).AppendLine();
-            }
-
-            if(!ArrayHelpers.ArrayIsNullOrEmpty(drSb.disc_name))
-            {
-                string discname = StringHandlers.CToString(drSb.disc_name, Encoding);
-                XmlFsType.VolumeName = discname;
-                sbInformation.AppendFormat("Volume name: {0}", discname).AppendLine();
-            }
-
-            information = sbInformation.ToString();
-
-            XmlFsType.Bootable    |= drSb.bootoption != 0; // Or not?
-            XmlFsType.Clusters    =  bytes / (ulong)(1 << drSb.log2secsize);
-            XmlFsType.ClusterSize =  (uint)(1 << drSb.log2secsize);
-            XmlFsType.Type        =  "Acorn Advanced Disc Filing System";
+                carry = 0;
         }
 
-        byte AcornMapChecksum(byte[] data, int length)
+        return (byte)(sum & 0xFF);
+    }
+
+    static byte NewMapChecksum(byte[] mapBase)
+    {
+        uint rover;
+        uint sumVector0 = 0;
+        uint sumVector1 = 0;
+        uint sumVector2 = 0;
+        uint sumVector3 = 0;
+
+        for(rover = (uint)(mapBase.Length - 4); rover > 0; rover -= 4)
         {
-            int sum   = 0;
-            int carry = 0;
-
-            if(length > data.Length)
-                length = data.Length;
-
-            // ADC r0, r0, r1
-            // MOVS r0, r0, LSL #24
-            // MOV r0, r0, LSR #24
-            for(int i = length - 1; i >= 0; i--)
-            {
-                sum += data[i] + carry;
-
-                if(sum > 0xFF)
-                {
-                    carry =  1;
-                    sum   &= 0xFF;
-                }
-                else
-                    carry = 0;
-            }
-
-            return (byte)(sum & 0xFF);
-        }
-
-        static byte NewMapChecksum(byte[] mapBase)
-        {
-            uint rover;
-            uint sumVector0 = 0;
-            uint sumVector1 = 0;
-            uint sumVector2 = 0;
-            uint sumVector3 = 0;
-
-            for(rover = (uint)(mapBase.Length - 4); rover > 0; rover -= 4)
-            {
-                sumVector0 += mapBase[rover + 0] + (sumVector3 >> 8);
-                sumVector3 &= 0xff;
-                sumVector1 += mapBase[rover + 1] + (sumVector0 >> 8);
-                sumVector0 &= 0xff;
-                sumVector2 += mapBase[rover + 2] + (sumVector1 >> 8);
-                sumVector1 &= 0xff;
-                sumVector3 += mapBase[rover + 3] + (sumVector2 >> 8);
-                sumVector2 &= 0xff;
-            }
-
-            /*
-                    Don't add the check byte when calculating its value
-            */
-            sumVector0 += sumVector3 >> 8;
+            sumVector0 += mapBase[rover + 0] + (sumVector3 >> 8);
+            sumVector3 &= 0xff;
             sumVector1 += mapBase[rover + 1] + (sumVector0 >> 8);
+            sumVector0 &= 0xff;
             sumVector2 += mapBase[rover + 2] + (sumVector1 >> 8);
+            sumVector1 &= 0xff;
             sumVector3 += mapBase[rover + 3] + (sumVector2 >> 8);
-
-            return (byte)((sumVector0 ^ sumVector1 ^ sumVector2 ^ sumVector3) & 0xff);
+            sumVector2 &= 0xff;
         }
 
-        // TODO: This is not correct...
-        static byte AcornDirectoryChecksum(IList<byte> data, int length)
+        /*
+                Don't add the check byte when calculating its value
+        */
+        sumVector0 += sumVector3 >> 8;
+        sumVector1 += mapBase[rover + 1] + (sumVector0 >> 8);
+        sumVector2 += mapBase[rover + 2] + (sumVector1 >> 8);
+        sumVector3 += mapBase[rover + 3] + (sumVector2 >> 8);
+
+        return (byte)((sumVector0 ^ sumVector1 ^ sumVector2 ^ sumVector3) & 0xff);
+    }
+
+    // TODO: This is not correct...
+    static byte AcornDirectoryChecksum(IList<byte> data, int length)
+    {
+        uint sum = 0;
+
+        if(length > data.Count)
+            length = data.Count;
+
+        // EOR r0, r1, r0, ROR #13
+        for(int i = 0; i < length; i++)
         {
-            uint sum = 0;
-
-            if(length > data.Count)
-                length = data.Count;
-
-            // EOR r0, r1, r0, ROR #13
-            for(int i = 0; i < length; i++)
-            {
-                uint carry = sum & 0x1FFF;
-                sum >>= 13;
-                sum ^=  data[i];
-                sum +=  carry << 19;
-            }
-
-            return (byte)(((sum & 0xFF000000) >> 24) ^ ((sum & 0xFF0000) >> 16) ^ ((sum & 0xFF00) >> 8) ^ (sum & 0xFF));
+            uint carry = sum & 0x1FFF;
+            sum >>= 13;
+            sum ^=  data[i];
+            sum +=  carry << 19;
         }
 
-        /// <summary>Boot block, used in hard disks and ADFS-F and higher.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BootBlock
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x1C0)]
-            public readonly byte[] spare;
-            public readonly DiscRecord discRecord;
-            public readonly byte       flags;
-            public readonly ushort     startCylinder;
-            public readonly byte       checksum;
-        }
+        return (byte)(((sum & 0xFF000000) >> 24) ^ ((sum & 0xFF0000) >> 16) ^ ((sum & 0xFF00) >> 8) ^ (sum & 0xFF));
+    }
 
-        /// <summary>Disc record, used in hard disks and ADFS-E and higher.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DiscRecord
-        {
-            public readonly byte   log2secsize;
-            public readonly byte   spt;
-            public readonly byte   heads;
-            public readonly byte   density;
-            public readonly byte   idlen;
-            public readonly byte   log2bpmb;
-            public readonly byte   skew;
-            public readonly byte   bootoption;
-            public readonly byte   lowsector;
-            public readonly byte   nzones;
-            public readonly ushort zone_spare;
-            public readonly uint   root;
-            public readonly uint   disc_size;
-            public readonly ushort disc_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly byte[] disc_name;
-            public readonly uint disc_type;
-            public readonly uint disc_size_high;
-            public readonly byte flags;
-            public readonly byte nzones_high;
-            public readonly uint format_version;
-            public readonly uint root_size;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] reserved;
-        }
+    /// <summary>Boot block, used in hard disks and ADFS-F and higher.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BootBlock
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x1C0)]
+        public readonly byte[] spare;
+        public readonly DiscRecord discRecord;
+        public readonly byte       flags;
+        public readonly ushort     startCylinder;
+        public readonly byte       checksum;
+    }
 
-        /// <summary>Free block map, sector 0, used in ADFS-S, ADFS-L, ADFS-M and ADFS-D</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct OldMapSector0
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 82 * 3)]
-            public readonly byte[] freeStart;
-            public readonly byte reserved;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] name;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] size;
-            public readonly byte checksum;
-        }
+    /// <summary>Disc record, used in hard disks and ADFS-E and higher.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DiscRecord
+    {
+        public readonly byte   log2secsize;
+        public readonly byte   spt;
+        public readonly byte   heads;
+        public readonly byte   density;
+        public readonly byte   idlen;
+        public readonly byte   log2bpmb;
+        public readonly byte   skew;
+        public readonly byte   bootoption;
+        public readonly byte   lowsector;
+        public readonly byte   nzones;
+        public readonly ushort zone_spare;
+        public readonly uint   root;
+        public readonly uint   disc_size;
+        public readonly ushort disc_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly byte[] disc_name;
+        public readonly uint disc_type;
+        public readonly uint disc_size_high;
+        public readonly byte flags;
+        public readonly byte nzones_high;
+        public readonly uint format_version;
+        public readonly uint root_size;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] reserved;
+    }
 
-        /// <summary>Free block map, sector 1, used in ADFS-S, ADFS-L, ADFS-M and ADFS-D</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct OldMapSector1
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 82 * 3)]
-            public readonly byte[] freeStart;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] name;
-            public readonly ushort discId;
-            public readonly byte   boot;
-            public readonly byte   freeEnd;
-            public readonly byte   checksum;
-        }
+    /// <summary>Free block map, sector 0, used in ADFS-S, ADFS-L, ADFS-M and ADFS-D</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct OldMapSector0
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 82 * 3)]
+        public readonly byte[] freeStart;
+        public readonly byte reserved;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] name;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] size;
+        public readonly byte checksum;
+    }
 
-        /// <summary>Free block map, sector 0, used in ADFS-E</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct NewMap
-        {
-            public readonly byte       zoneChecksum;
-            public readonly ushort     freeLink;
-            public readonly byte       crossChecksum;
-            public readonly DiscRecord discRecord;
-        }
+    /// <summary>Free block map, sector 1, used in ADFS-S, ADFS-L, ADFS-M and ADFS-D</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct OldMapSector1
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 82 * 3)]
+        public readonly byte[] freeStart;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] name;
+        public readonly ushort discId;
+        public readonly byte   boot;
+        public readonly byte   freeEnd;
+        public readonly byte   checksum;
+    }
 
-        /// <summary>Directory header, common to "old" and "new" directories</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryHeader
-        {
-            public readonly byte masterSequence;
-            public readonly uint magic;
-        }
+    /// <summary>Free block map, sector 0, used in ADFS-E</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct NewMap
+    {
+        public readonly byte       zoneChecksum;
+        public readonly ushort     freeLink;
+        public readonly byte       crossChecksum;
+        public readonly DiscRecord discRecord;
+    }
 
-        /// <summary>Directory header, common to "old" and "new" directories</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryEntry
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly byte[] name;
-            public readonly uint load;
-            public readonly uint exec;
-            public readonly uint length;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] address;
-            public readonly byte atts;
-        }
+    /// <summary>Directory header, common to "old" and "new" directories</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryHeader
+    {
+        public readonly byte masterSequence;
+        public readonly uint magic;
+    }
 
-        /// <summary>Directory tail, new format</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct NewDirectoryTail
-        {
-            public readonly byte   lastMark;
-            public readonly ushort reserved;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] parent;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 19)]
-            public readonly byte[] title;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly byte[] name;
-            public readonly byte endMasSeq;
-            public readonly uint magic;
-            public readonly byte checkByte;
-        }
+    /// <summary>Directory header, common to "old" and "new" directories</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryEntry
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly byte[] name;
+        public readonly uint load;
+        public readonly uint exec;
+        public readonly uint length;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] address;
+        public readonly byte atts;
+    }
 
-        /// <summary>Directory tail, old format</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct OldDirectoryTail
-        {
-            public readonly byte lastMark;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly byte[] name;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] parent;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 19)]
-            public readonly byte[] title;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public readonly byte[] reserved;
-            public readonly byte endMasSeq;
-            public readonly uint magic;
-            public readonly byte checkByte;
-        }
+    /// <summary>Directory tail, new format</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct NewDirectoryTail
+    {
+        public readonly byte   lastMark;
+        public readonly ushort reserved;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] parent;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 19)]
+        public readonly byte[] title;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly byte[] name;
+        public readonly byte endMasSeq;
+        public readonly uint magic;
+        public readonly byte checkByte;
+    }
 
-        /// <summary>Directory, old format</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct OldDirectory
-        {
-            public readonly DirectoryHeader header;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 47)]
-            public readonly DirectoryEntry[] entries;
-            public readonly OldDirectoryTail tail;
-        }
+    /// <summary>Directory tail, old format</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct OldDirectoryTail
+    {
+        public readonly byte lastMark;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly byte[] name;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] parent;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 19)]
+        public readonly byte[] title;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
+        public readonly byte[] reserved;
+        public readonly byte endMasSeq;
+        public readonly uint magic;
+        public readonly byte checkByte;
+    }
 
-        /// <summary>Directory, new format</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct NewDirectory
-        {
-            public readonly DirectoryHeader header;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 77)]
-            public readonly DirectoryEntry[] entries;
-            public readonly NewDirectoryTail tail;
-        }
+    /// <summary>Directory, old format</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct OldDirectory
+    {
+        public readonly DirectoryHeader header;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 47)]
+        public readonly DirectoryEntry[] entries;
+        public readonly OldDirectoryTail tail;
+    }
+
+    /// <summary>Directory, new format</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct NewDirectory
+    {
+        public readonly DirectoryHeader header;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 77)]
+        public readonly DirectoryEntry[] entries;
+        public readonly NewDirectoryTail tail;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AmigaDOS.cs b/Aaru.Filesystems/AmigaDOS.cs
index 0c67bfc0e..087ed8cea 100644
--- a/Aaru.Filesystems/AmigaDOS.cs
+++ b/Aaru.Filesystems/AmigaDOS.cs
@@ -43,485 +43,484 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of Amiga Fast File System (AFFS)</summary>
+public sealed class AmigaDOSPlugin : IFilesystem
 {
+    const uint FFS_MASK  = 0x444F5300;
+    const uint MUFS_MASK = 0x6D754600;
+
+    const uint TYPE_HEADER  = 2;
+    const uint SUBTYPE_ROOT = 1;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of Amiga Fast File System (AFFS)</summary>
-    public sealed class AmigaDOSPlugin : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Amiga DOS filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("3c882400-208c-427d-a086-9119852a1bc7");
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint FFS_MASK  = 0x444F5300;
-        const uint MUFS_MASK = 0x6D754600;
+        if(partition.Start + 4 >= partition.End)
+            return false;
 
-        const uint TYPE_HEADER  = 2;
-        const uint SUBTYPE_ROOT = 1;
+        // Boot block is unless defined otherwise, 2 blocks
+        // Funny, you may need boot block to find root block if it's not in standard place just to know size of
+        // block size and then read the whole boot block.
+        // However while you can set a block size different from the sector size on formatting, the bootblock block
+        // size for floppies is the sector size, and for RDB is usually is the hard disk sector size,
+        // so this is not entirely wrong...
+        ErrorNumber errno = imagePlugin.ReadSectors(0 + partition.Start, 2, out byte[] sector);
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Amiga DOS filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("3c882400-208c-427d-a086-9119852a1bc7");
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(errno != ErrorNumber.NoError)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        BootBlock bblk = Marshal.ByteArrayToStructureBigEndian<BootBlock>(sector);
+
+        // AROS boot floppies...
+        if(sector.Length               >= 512      &&
+           sector[510]                 == 0x55     &&
+           sector[511]                 == 0xAA     &&
+           (bblk.diskType & FFS_MASK)  != FFS_MASK &&
+           (bblk.diskType & MUFS_MASK) != MUFS_MASK)
         {
-            if(partition.Start + 4 >= partition.End)
-                return false;
-
-            // Boot block is unless defined otherwise, 2 blocks
-            // Funny, you may need boot block to find root block if it's not in standard place just to know size of
-            // block size and then read the whole boot block.
-            // However while you can set a block size different from the sector size on formatting, the bootblock block
-            // size for floppies is the sector size, and for RDB is usually is the hard disk sector size,
-            // so this is not entirely wrong...
-            ErrorNumber errno = imagePlugin.ReadSectors(0 + partition.Start, 2, out byte[] sector);
+            errno = imagePlugin.ReadSectors(1 + partition.Start, 2, out sector);
 
             if(errno != ErrorNumber.NoError)
                 return false;
 
-            BootBlock bblk = Marshal.ByteArrayToStructureBigEndian<BootBlock>(sector);
+            bblk = Marshal.ByteArrayToStructureBigEndian<BootBlock>(sector);
+        }
 
-            // AROS boot floppies...
-            if(sector.Length               >= 512      &&
-               sector[510]                 == 0x55     &&
-               sector[511]                 == 0xAA     &&
-               (bblk.diskType & FFS_MASK)  != FFS_MASK &&
-               (bblk.diskType & MUFS_MASK) != MUFS_MASK)
-            {
-                errno = imagePlugin.ReadSectors(1 + partition.Start, 2, out sector);
+        // Not FFS or MuFS?
+        if((bblk.diskType & FFS_MASK)  != FFS_MASK &&
+           (bblk.diskType & MUFS_MASK) != MUFS_MASK)
+            return false;
 
-                if(errno != ErrorNumber.NoError)
-                    return false;
+        // Clear checksum on sector
+        sector[4] = sector[5] = sector[6] = sector[7] = 0;
+        uint bsum             = AmigaBootChecksum(sector);
 
-                bblk = Marshal.ByteArrayToStructureBigEndian<BootBlock>(sector);
-            }
+        AaruConsole.DebugWriteLine("AmigaDOS plugin", "bblk.checksum = 0x{0:X8}", bblk.checksum);
+        AaruConsole.DebugWriteLine("AmigaDOS plugin", "bsum = 0x{0:X8}", bsum);
 
-            // Not FFS or MuFS?
-            if((bblk.diskType & FFS_MASK)  != FFS_MASK &&
-               (bblk.diskType & MUFS_MASK) != MUFS_MASK)
-                return false;
+        ulong bRootPtr = 0;
+
+        // If bootblock is correct, let's take its rootblock pointer
+        if(bsum == bblk.checksum)
+        {
+            bRootPtr = bblk.root_ptr + partition.Start;
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "Bootblock points to {0} as Rootblock", bRootPtr);
+        }
+
+        ulong[] rootPtrs =
+        {
+            bRootPtr + partition.Start, ((partition.End - partition.Start + 1) / 2) + partition.Start - 2,
+            ((partition.End                             - partition.Start + 1) / 2) + partition.Start - 1,
+            ((partition.End - partition.Start + 1) / 2) + partition.Start,
+            ((partition.End - partition.Start + 1) / 2) + partition.Start + 4
+        };
+
+        var rblk = new RootBlock();
+
+        // So to handle even number of sectors
+        foreach(ulong rootPtr in rootPtrs.Where(rootPtr => rootPtr < partition.End && rootPtr >= partition.Start))
+        {
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "Searching for Rootblock in sector {0}", rootPtr);
+
+            errno = imagePlugin.ReadSector(rootPtr, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            rblk.type = BigEndianBitConverter.ToUInt32(sector, 0x00);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.type = {0}", rblk.type);
+
+            if(rblk.type != TYPE_HEADER)
+                continue;
+
+            rblk.hashTableSize = BigEndianBitConverter.ToUInt32(sector, 0x0C);
+
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.hashTableSize = {0}", rblk.hashTableSize);
+
+            uint blockSize       = (rblk.hashTableSize + 56) * 4;
+            uint sectorsPerBlock = (uint)(blockSize / sector.Length);
+
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "blockSize = {0}", blockSize);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "sectorsPerBlock = {0}", sectorsPerBlock);
+
+            if(blockSize % sector.Length > 0)
+                sectorsPerBlock++;
+
+            if(rootPtr + sectorsPerBlock >= partition.End)
+                continue;
+
+            errno = imagePlugin.ReadSectors(rootPtr, sectorsPerBlock, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
 
             // Clear checksum on sector
-            sector[4] = sector[5] = sector[6] = sector[7] = 0;
-            uint bsum             = AmigaBootChecksum(sector);
+            rblk.checksum = BigEndianBitConverter.ToUInt32(sector, 20);
+            sector[20]    = sector[21] = sector[22] = sector[23] = 0;
+            uint rsum                  = AmigaChecksum(sector);
 
-            AaruConsole.DebugWriteLine("AmigaDOS plugin", "bblk.checksum = 0x{0:X8}", bblk.checksum);
-            AaruConsole.DebugWriteLine("AmigaDOS plugin", "bsum = 0x{0:X8}", bsum);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.checksum = 0x{0:X8}", rblk.checksum);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "rsum = 0x{0:X8}", rsum);
 
-            ulong bRootPtr = 0;
+            rblk.sec_type = BigEndianBitConverter.ToUInt32(sector, sector.Length - 4);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.sec_type = {0}", rblk.sec_type);
 
-            // If bootblock is correct, let's take its rootblock pointer
-            if(bsum == bblk.checksum)
-            {
-                bRootPtr = bblk.root_ptr + partition.Start;
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "Bootblock points to {0} as Rootblock", bRootPtr);
-            }
-
-            ulong[] rootPtrs =
-            {
-                bRootPtr + partition.Start, ((partition.End - partition.Start + 1) / 2) + partition.Start - 2,
-                ((partition.End                             - partition.Start + 1) / 2) + partition.Start - 1,
-                ((partition.End - partition.Start + 1) / 2) + partition.Start,
-                ((partition.End - partition.Start + 1) / 2) + partition.Start + 4
-            };
-
-            var rblk = new RootBlock();
-
-            // So to handle even number of sectors
-            foreach(ulong rootPtr in rootPtrs.Where(rootPtr => rootPtr < partition.End && rootPtr >= partition.Start))
-            {
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "Searching for Rootblock in sector {0}", rootPtr);
-
-                errno = imagePlugin.ReadSector(rootPtr, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                rblk.type = BigEndianBitConverter.ToUInt32(sector, 0x00);
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.type = {0}", rblk.type);
-
-                if(rblk.type != TYPE_HEADER)
-                    continue;
-
-                rblk.hashTableSize = BigEndianBitConverter.ToUInt32(sector, 0x0C);
-
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.hashTableSize = {0}", rblk.hashTableSize);
-
-                uint blockSize       = (rblk.hashTableSize + 56) * 4;
-                uint sectorsPerBlock = (uint)(blockSize / sector.Length);
-
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "blockSize = {0}", blockSize);
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "sectorsPerBlock = {0}", sectorsPerBlock);
-
-                if(blockSize % sector.Length > 0)
-                    sectorsPerBlock++;
-
-                if(rootPtr + sectorsPerBlock >= partition.End)
-                    continue;
-
-                errno = imagePlugin.ReadSectors(rootPtr, sectorsPerBlock, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                // Clear checksum on sector
-                rblk.checksum = BigEndianBitConverter.ToUInt32(sector, 20);
-                sector[20]    = sector[21] = sector[22] = sector[23] = 0;
-                uint rsum                  = AmigaChecksum(sector);
-
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.checksum = 0x{0:X8}", rblk.checksum);
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rsum = 0x{0:X8}", rsum);
-
-                rblk.sec_type = BigEndianBitConverter.ToUInt32(sector, sector.Length - 4);
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rblk.sec_type = {0}", rblk.sec_type);
-
-                if(rblk.sec_type == SUBTYPE_ROOT &&
-                   rblk.checksum == rsum)
-                    return true;
-            }
-
-            return false;
+            if(rblk.sec_type == SUBTYPE_ROOT &&
+               rblk.checksum == rsum)
+                return true;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        return false;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
+        var sbInformation = new StringBuilder();
+        XmlFsType   = new FileSystemType();
+        information = null;
+        ErrorNumber errno = imagePlugin.ReadSectors(0 + partition.Start, 2, out byte[] bootBlockSectors);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        BootBlock bootBlk = Marshal.ByteArrayToStructureBigEndian<BootBlock>(bootBlockSectors);
+        bootBlk.bootCode = new byte[bootBlockSectors.Length - 12];
+        Array.Copy(bootBlockSectors, 12, bootBlk.bootCode, 0, bootBlk.bootCode.Length);
+        bootBlockSectors[4] = bootBlockSectors[5] = bootBlockSectors[6] = bootBlockSectors[7] = 0;
+        uint bsum                                 = AmigaBootChecksum(bootBlockSectors);
+
+        ulong bRootPtr = 0;
+
+        // If bootblock is correct, let's take its rootblock pointer
+        if(bsum == bootBlk.checksum)
         {
-            Encoding = encoding ?? Encoding.GetEncoding("iso-8859-1");
-            var sbInformation = new StringBuilder();
-            XmlFsType   = new FileSystemType();
-            information = null;
-            ErrorNumber errno = imagePlugin.ReadSectors(0 + partition.Start, 2, out byte[] bootBlockSectors);
+            bRootPtr = bootBlk.root_ptr + partition.Start;
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "Bootblock points to {0} as Rootblock", bRootPtr);
+        }
+
+        ulong[] rootPtrs =
+        {
+            bRootPtr + partition.Start, ((partition.End - partition.Start + 1) / 2) + partition.Start - 2,
+            ((partition.End                             - partition.Start + 1) / 2) + partition.Start - 1,
+            ((partition.End - partition.Start + 1) / 2) + partition.Start,
+            ((partition.End - partition.Start + 1) / 2) + partition.Start + 4
+        };
+
+        var    rootBlk         = new RootBlock();
+        byte[] rootBlockSector = null;
+
+        bool rootFound = false;
+        uint blockSize = 0;
+
+        // So to handle even number of sectors
+        foreach(ulong rootPtr in rootPtrs.Where(rootPtr => rootPtr < partition.End && rootPtr >= partition.Start))
+        {
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "Searching for Rootblock in sector {0}", rootPtr);
+
+            errno = imagePlugin.ReadSector(rootPtr, out rootBlockSector);
 
             if(errno != ErrorNumber.NoError)
-                return;
+                continue;
 
-            BootBlock bootBlk = Marshal.ByteArrayToStructureBigEndian<BootBlock>(bootBlockSectors);
-            bootBlk.bootCode = new byte[bootBlockSectors.Length - 12];
-            Array.Copy(bootBlockSectors, 12, bootBlk.bootCode, 0, bootBlk.bootCode.Length);
-            bootBlockSectors[4] = bootBlockSectors[5] = bootBlockSectors[6] = bootBlockSectors[7] = 0;
-            uint bsum                                 = AmigaBootChecksum(bootBlockSectors);
+            rootBlk.type = BigEndianBitConverter.ToUInt32(rootBlockSector, 0x00);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.type = {0}", rootBlk.type);
 
-            ulong bRootPtr = 0;
+            if(rootBlk.type != TYPE_HEADER)
+                continue;
 
-            // If bootblock is correct, let's take its rootblock pointer
-            if(bsum == bootBlk.checksum)
-            {
-                bRootPtr = bootBlk.root_ptr + partition.Start;
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "Bootblock points to {0} as Rootblock", bRootPtr);
-            }
+            rootBlk.hashTableSize = BigEndianBitConverter.ToUInt32(rootBlockSector, 0x0C);
 
-            ulong[] rootPtrs =
-            {
-                bRootPtr + partition.Start, ((partition.End - partition.Start + 1) / 2) + partition.Start - 2,
-                ((partition.End                             - partition.Start + 1) / 2) + partition.Start - 1,
-                ((partition.End - partition.Start + 1) / 2) + partition.Start,
-                ((partition.End - partition.Start + 1) / 2) + partition.Start + 4
-            };
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.hashTableSize = {0}", rootBlk.hashTableSize);
 
-            var    rootBlk         = new RootBlock();
-            byte[] rootBlockSector = null;
+            blockSize = (rootBlk.hashTableSize + 56) * 4;
+            uint sectorsPerBlock = (uint)(blockSize / rootBlockSector.Length);
 
-            bool rootFound = false;
-            uint blockSize = 0;
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "blockSize = {0}", blockSize);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "sectorsPerBlock = {0}", sectorsPerBlock);
 
-            // So to handle even number of sectors
-            foreach(ulong rootPtr in rootPtrs.Where(rootPtr => rootPtr < partition.End && rootPtr >= partition.Start))
-            {
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "Searching for Rootblock in sector {0}", rootPtr);
+            if(blockSize % rootBlockSector.Length > 0)
+                sectorsPerBlock++;
 
-                errno = imagePlugin.ReadSector(rootPtr, out rootBlockSector);
+            if(rootPtr + sectorsPerBlock >= partition.End)
+                continue;
 
-                if(errno != ErrorNumber.NoError)
-                    continue;
+            errno = imagePlugin.ReadSectors(rootPtr, sectorsPerBlock, out rootBlockSector);
 
-                rootBlk.type = BigEndianBitConverter.ToUInt32(rootBlockSector, 0x00);
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.type = {0}", rootBlk.type);
+            if(errno != ErrorNumber.NoError)
+                continue;
 
-                if(rootBlk.type != TYPE_HEADER)
-                    continue;
+            // Clear checksum on sector
+            rootBlk.checksum    = BigEndianBitConverter.ToUInt32(rootBlockSector, 20);
+            rootBlockSector[20] = rootBlockSector[21] = rootBlockSector[22] = rootBlockSector[23] = 0;
+            uint rsum                                 = AmigaChecksum(rootBlockSector);
 
-                rootBlk.hashTableSize = BigEndianBitConverter.ToUInt32(rootBlockSector, 0x0C);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.checksum = 0x{0:X8}", rootBlk.checksum);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "rsum = 0x{0:X8}", rsum);
 
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.hashTableSize = {0}", rootBlk.hashTableSize);
+            rootBlk.sec_type = BigEndianBitConverter.ToUInt32(rootBlockSector, rootBlockSector.Length - 4);
+            AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.sec_type = {0}", rootBlk.sec_type);
 
-                blockSize = (rootBlk.hashTableSize + 56) * 4;
-                uint sectorsPerBlock = (uint)(blockSize / rootBlockSector.Length);
+            if(rootBlk.sec_type != SUBTYPE_ROOT ||
+               rootBlk.checksum != rsum)
+                continue;
 
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "blockSize = {0}", blockSize);
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "sectorsPerBlock = {0}", sectorsPerBlock);
+            errno = imagePlugin.ReadSectors(rootPtr, sectorsPerBlock, out rootBlockSector);
 
-                if(blockSize % rootBlockSector.Length > 0)
-                    sectorsPerBlock++;
+            if(errno != ErrorNumber.NoError)
+                continue;
 
-                if(rootPtr + sectorsPerBlock >= partition.End)
-                    continue;
+            rootFound = true;
 
-                errno = imagePlugin.ReadSectors(rootPtr, sectorsPerBlock, out rootBlockSector);
+            break;
+        }
 
-                if(errno != ErrorNumber.NoError)
-                    continue;
+        if(!rootFound)
+            return;
 
-                // Clear checksum on sector
-                rootBlk.checksum    = BigEndianBitConverter.ToUInt32(rootBlockSector, 20);
-                rootBlockSector[20] = rootBlockSector[21] = rootBlockSector[22] = rootBlockSector[23] = 0;
-                uint rsum                                 = AmigaChecksum(rootBlockSector);
+        rootBlk = MarshalRootBlock(rootBlockSector);
 
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.checksum = 0x{0:X8}", rootBlk.checksum);
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rsum = 0x{0:X8}", rsum);
+        string diskName = StringHandlers.PascalToString(rootBlk.diskName, Encoding);
 
-                rootBlk.sec_type = BigEndianBitConverter.ToUInt32(rootBlockSector, rootBlockSector.Length - 4);
-                AaruConsole.DebugWriteLine("AmigaDOS plugin", "rootBlk.sec_type = {0}", rootBlk.sec_type);
-
-                if(rootBlk.sec_type != SUBTYPE_ROOT ||
-                   rootBlk.checksum != rsum)
-                    continue;
-
-                errno = imagePlugin.ReadSectors(rootPtr, sectorsPerBlock, out rootBlockSector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                rootFound = true;
+        switch(bootBlk.diskType & 0xFF)
+        {
+            case 0:
+                sbInformation.Append("Amiga Original File System");
+                XmlFsType.Type = "Amiga OFS";
 
                 break;
-            }
+            case 1:
+                sbInformation.Append("Amiga Fast File System");
+                XmlFsType.Type = "Amiga FFS";
 
-            if(!rootFound)
-                return;
+                break;
+            case 2:
+                sbInformation.Append("Amiga Original File System with international characters");
+                XmlFsType.Type = "Amiga OFS";
 
-            rootBlk = MarshalRootBlock(rootBlockSector);
+                break;
+            case 3:
+                sbInformation.Append("Amiga Fast File System with international characters");
+                XmlFsType.Type = "Amiga FFS";
 
-            string diskName = StringHandlers.PascalToString(rootBlk.diskName, Encoding);
+                break;
+            case 4:
+                sbInformation.Append("Amiga Original File System with directory cache");
+                XmlFsType.Type = "Amiga OFS";
 
-            switch(bootBlk.diskType & 0xFF)
-            {
-                case 0:
-                    sbInformation.Append("Amiga Original File System");
-                    XmlFsType.Type = "Amiga OFS";
+                break;
+            case 5:
+                sbInformation.Append("Amiga Fast File System with directory cache");
+                XmlFsType.Type = "Amiga FFS";
 
-                    break;
-                case 1:
-                    sbInformation.Append("Amiga Fast File System");
-                    XmlFsType.Type = "Amiga FFS";
+                break;
+            case 6:
+                sbInformation.Append("Amiga Original File System with long filenames");
+                XmlFsType.Type = "Amiga OFS2";
 
-                    break;
-                case 2:
-                    sbInformation.Append("Amiga Original File System with international characters");
-                    XmlFsType.Type = "Amiga OFS";
+                break;
+            case 7:
+                sbInformation.Append("Amiga Fast File System with long filenames");
+                XmlFsType.Type = "Amiga FFS2";
 
-                    break;
-                case 3:
-                    sbInformation.Append("Amiga Fast File System with international characters");
-                    XmlFsType.Type = "Amiga FFS";
-
-                    break;
-                case 4:
-                    sbInformation.Append("Amiga Original File System with directory cache");
-                    XmlFsType.Type = "Amiga OFS";
-
-                    break;
-                case 5:
-                    sbInformation.Append("Amiga Fast File System with directory cache");
-                    XmlFsType.Type = "Amiga FFS";
-
-                    break;
-                case 6:
-                    sbInformation.Append("Amiga Original File System with long filenames");
-                    XmlFsType.Type = "Amiga OFS2";
-
-                    break;
-                case 7:
-                    sbInformation.Append("Amiga Fast File System with long filenames");
-                    XmlFsType.Type = "Amiga FFS2";
-
-                    break;
-            }
-
-            if((bootBlk.diskType & 0x6D754600) == 0x6D754600)
-                sbInformation.Append(", with multi-user patches");
-
-            sbInformation.AppendLine();
-
-            sbInformation.AppendFormat("Volume name: {0}", diskName).AppendLine();
-
-            if(bootBlk.checksum == bsum)
-            {
-                var sha1Ctx = new Sha1Context();
-                sha1Ctx.Update(bootBlk.bootCode);
-                sbInformation.AppendLine("Volume is bootable");
-                sbInformation.AppendFormat("Boot code SHA1 is {0}", sha1Ctx.End()).AppendLine();
-            }
-
-            if(rootBlk.bitmapFlag == 0xFFFFFFFF)
-                sbInformation.AppendLine("Volume bitmap is valid");
-
-            if(rootBlk.bitmapExtensionBlock != 0x00000000 &&
-               rootBlk.bitmapExtensionBlock != 0xFFFFFFFF)
-                sbInformation.AppendFormat("Bitmap extension at block {0}", rootBlk.bitmapExtensionBlock).AppendLine();
-
-            if((bootBlk.diskType & 0xFF) == 4 ||
-               (bootBlk.diskType & 0xFF) == 5)
-                sbInformation.AppendFormat("Directory cache starts at block {0}", rootBlk.extension).AppendLine();
-
-            ulong blocks = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize / blockSize;
-
-            sbInformation.AppendFormat("Volume block size is {0} bytes", blockSize).AppendLine();
-            sbInformation.AppendFormat("Volume has {0} blocks", blocks).AppendLine();
-
-            sbInformation.AppendFormat("Volume created on {0}",
-                                       DateHandlers.AmigaToDateTime(rootBlk.cDays, rootBlk.cMins, rootBlk.cTicks)).
-                          AppendLine();
-
-            sbInformation.AppendFormat("Volume last modified on {0}",
-                                       DateHandlers.AmigaToDateTime(rootBlk.vDays, rootBlk.vMins, rootBlk.vTicks)).
-                          AppendLine();
-
-            sbInformation.AppendFormat("Volume root directory last modified on on {0}",
-                                       DateHandlers.AmigaToDateTime(rootBlk.rDays, rootBlk.rMins, rootBlk.rTicks)).
-                          AppendLine();
-
-            sbInformation.AppendFormat("Root block checksum is 0x{0:X8}", rootBlk.checksum).AppendLine();
-            information = sbInformation.ToString();
-
-            XmlFsType.CreationDate = DateHandlers.AmigaToDateTime(rootBlk.cDays, rootBlk.cMins, rootBlk.cTicks);
-
-            XmlFsType.CreationDateSpecified = true;
-
-            XmlFsType.ModificationDate = DateHandlers.AmigaToDateTime(rootBlk.vDays, rootBlk.vMins, rootBlk.vTicks);
-
-            XmlFsType.ModificationDateSpecified = true;
-            XmlFsType.Dirty                     = rootBlk.bitmapFlag != 0xFFFFFFFF;
-            XmlFsType.Clusters                  = blocks;
-            XmlFsType.ClusterSize               = blockSize;
-            XmlFsType.VolumeName                = diskName;
-            XmlFsType.Bootable                  = bsum == bootBlk.checksum;
-
-            // Useful as a serial
-            XmlFsType.VolumeSerial = $"{rootBlk.checksum:X8}";
+                break;
         }
 
-        static RootBlock MarshalRootBlock(byte[] block)
+        if((bootBlk.diskType & 0x6D754600) == 0x6D754600)
+            sbInformation.Append(", with multi-user patches");
+
+        sbInformation.AppendLine();
+
+        sbInformation.AppendFormat("Volume name: {0}", diskName).AppendLine();
+
+        if(bootBlk.checksum == bsum)
         {
-            byte[] tmp = new byte[228];
-            Array.Copy(block, 0, tmp, 0, 24);
-            Array.Copy(block, block.Length - 200, tmp, 28, 200);
-            RootBlock root = Marshal.ByteArrayToStructureBigEndian<RootBlock>(tmp);
-            root.hashTable = new uint[(block.Length - 224) / 4];
-
-            for(int i = 0; i < root.hashTable.Length; i++)
-                root.hashTable[i] = BigEndianBitConverter.ToUInt32(block, 24 + (i * 4));
-
-            return root;
+            var sha1Ctx = new Sha1Context();
+            sha1Ctx.Update(bootBlk.bootCode);
+            sbInformation.AppendLine("Volume is bootable");
+            sbInformation.AppendFormat("Boot code SHA1 is {0}", sha1Ctx.End()).AppendLine();
         }
 
-        static uint AmigaChecksum(byte[] data)
+        if(rootBlk.bitmapFlag == 0xFFFFFFFF)
+            sbInformation.AppendLine("Volume bitmap is valid");
+
+        if(rootBlk.bitmapExtensionBlock != 0x00000000 &&
+           rootBlk.bitmapExtensionBlock != 0xFFFFFFFF)
+            sbInformation.AppendFormat("Bitmap extension at block {0}", rootBlk.bitmapExtensionBlock).AppendLine();
+
+        if((bootBlk.diskType & 0xFF) == 4 ||
+           (bootBlk.diskType & 0xFF) == 5)
+            sbInformation.AppendFormat("Directory cache starts at block {0}", rootBlk.extension).AppendLine();
+
+        ulong blocks = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize / blockSize;
+
+        sbInformation.AppendFormat("Volume block size is {0} bytes", blockSize).AppendLine();
+        sbInformation.AppendFormat("Volume has {0} blocks", blocks).AppendLine();
+
+        sbInformation.AppendFormat("Volume created on {0}",
+                                   DateHandlers.AmigaToDateTime(rootBlk.cDays, rootBlk.cMins, rootBlk.cTicks)).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Volume last modified on {0}",
+                                   DateHandlers.AmigaToDateTime(rootBlk.vDays, rootBlk.vMins, rootBlk.vTicks)).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Volume root directory last modified on on {0}",
+                                   DateHandlers.AmigaToDateTime(rootBlk.rDays, rootBlk.rMins, rootBlk.rTicks)).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Root block checksum is 0x{0:X8}", rootBlk.checksum).AppendLine();
+        information = sbInformation.ToString();
+
+        XmlFsType.CreationDate = DateHandlers.AmigaToDateTime(rootBlk.cDays, rootBlk.cMins, rootBlk.cTicks);
+
+        XmlFsType.CreationDateSpecified = true;
+
+        XmlFsType.ModificationDate = DateHandlers.AmigaToDateTime(rootBlk.vDays, rootBlk.vMins, rootBlk.vTicks);
+
+        XmlFsType.ModificationDateSpecified = true;
+        XmlFsType.Dirty                     = rootBlk.bitmapFlag != 0xFFFFFFFF;
+        XmlFsType.Clusters                  = blocks;
+        XmlFsType.ClusterSize               = blockSize;
+        XmlFsType.VolumeName                = diskName;
+        XmlFsType.Bootable                  = bsum == bootBlk.checksum;
+
+        // Useful as a serial
+        XmlFsType.VolumeSerial = $"{rootBlk.checksum:X8}";
+    }
+
+    static RootBlock MarshalRootBlock(byte[] block)
+    {
+        byte[] tmp = new byte[228];
+        Array.Copy(block, 0, tmp, 0, 24);
+        Array.Copy(block, block.Length - 200, tmp, 28, 200);
+        RootBlock root = Marshal.ByteArrayToStructureBigEndian<RootBlock>(tmp);
+        root.hashTable = new uint[(block.Length - 224) / 4];
+
+        for(int i = 0; i < root.hashTable.Length; i++)
+            root.hashTable[i] = BigEndianBitConverter.ToUInt32(block, 24 + (i * 4));
+
+        return root;
+    }
+
+    static uint AmigaChecksum(byte[] data)
+    {
+        uint sum = 0;
+
+        for(int i = 0; i < data.Length; i += 4)
+            sum += (uint)((data[i] << 24) + (data[i + 1] << 16) + (data[i + 2] << 8) + data[i + 3]);
+
+        return (uint)-sum;
+    }
+
+    static uint AmigaBootChecksum(byte[] data)
+    {
+        uint sum = 0;
+
+        for(int i = 0; i < data.Length; i += 4)
         {
-            uint sum = 0;
+            uint psum = sum;
 
-            for(int i = 0; i < data.Length; i += 4)
-                sum += (uint)((data[i] << 24) + (data[i + 1] << 16) + (data[i + 2] << 8) + data[i + 3]);
-
-            return (uint)-sum;
+            if((sum += (uint)((data[i] << 24) + (data[i + 1] << 16) + (data[i + 2] << 8) + data[i + 3])) < psum)
+                sum++;
         }
 
-        static uint AmigaBootChecksum(byte[] data)
-        {
-            uint sum = 0;
+        return ~sum;
+    }
 
-            for(int i = 0; i < data.Length; i += 4)
-            {
-                uint psum = sum;
+    /// <summary>Boot block, first 2 sectors</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BootBlock
+    {
+        /// <summary>Offset 0x00, "DOSx" disk type</summary>
+        public readonly uint diskType;
+        /// <summary>Offset 0x04, Checksum</summary>
+        public readonly uint checksum;
+        /// <summary>Offset 0x08, Pointer to root block, mostly invalid</summary>
+        public readonly uint root_ptr;
+        /// <summary>Offset 0x0C, Boot code, til completion. Size is intentionally incorrect to allow marshaling to work.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
+        public byte[] bootCode;
+    }
 
-                if((sum += (uint)((data[i] << 24) + (data[i + 1] << 16) + (data[i + 2] << 8) + data[i + 3])) < psum)
-                    sum++;
-            }
-
-            return ~sum;
-        }
-
-        /// <summary>Boot block, first 2 sectors</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BootBlock
-        {
-            /// <summary>Offset 0x00, "DOSx" disk type</summary>
-            public readonly uint diskType;
-            /// <summary>Offset 0x04, Checksum</summary>
-            public readonly uint checksum;
-            /// <summary>Offset 0x08, Pointer to root block, mostly invalid</summary>
-            public readonly uint root_ptr;
-            /// <summary>Offset 0x0C, Boot code, til completion. Size is intentionally incorrect to allow marshaling to work.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
-            public byte[] bootCode;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct RootBlock
-        {
-            /// <summary>Offset 0x00, block type, value = T_HEADER (2)</summary>
-            public uint type;
-            /// <summary>Offset 0x04, unused</summary>
-            public readonly uint headerKey;
-            /// <summary>Offset 0x08, unused</summary>
-            public readonly uint highSeq;
-            /// <summary>Offset 0x0C, longs used by hash table</summary>
-            public uint hashTableSize;
-            /// <summary>Offset 0x10, unused</summary>
-            public readonly uint firstData;
-            /// <summary>Offset 0x14, Rootblock checksum</summary>
-            public uint checksum;
-            /// <summary>
-            ///     Offset 0x18, Hashtable, size = (block size / 4) - 56 or size = hashTableSize. Size intentionally bad to allow
-            ///     marshalling to work.
-            /// </summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
-            public uint[] hashTable;
-            /// <summary>Offset 0x18+hashTableSize*4+0, bitmap flag, 0xFFFFFFFF if valid</summary>
-            public readonly uint bitmapFlag;
-            /// <summary>Offset 0x18+hashTableSize*4+4, bitmap pages, 25 entries</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 25)]
-            public readonly uint[] bitmapPages;
-            /// <summary>Offset 0x18+hashTableSize*4+104, pointer to bitmap extension block</summary>
-            public readonly uint bitmapExtensionBlock;
-            /// <summary>Offset 0x18+hashTableSize*4+108, last root alteration days since 1978/01/01</summary>
-            public readonly uint rDays;
-            /// <summary>Offset 0x18+hashTableSize*4+112, last root alteration minutes past midnight</summary>
-            public readonly uint rMins;
-            /// <summary>Offset 0x18+hashTableSize*4+116, last root alteration ticks (1/50 secs)</summary>
-            public readonly uint rTicks;
-            /// <summary>Offset 0x18+hashTableSize*4+120, disk name, pascal string, 31 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 31)]
-            public readonly byte[] diskName;
-            /// <summary>Offset 0x18+hashTableSize*4+151, unused</summary>
-            public readonly byte padding;
-            /// <summary>Offset 0x18+hashTableSize*4+152, unused</summary>
-            public readonly uint reserved1;
-            /// <summary>Offset 0x18+hashTableSize*4+156, unused</summary>
-            public readonly uint reserved2;
-            /// <summary>Offset 0x18+hashTableSize*4+160, last disk alteration days since 1978/01/01</summary>
-            public readonly uint vDays;
-            /// <summary>Offset 0x18+hashTableSize*4+164, last disk alteration minutes past midnight</summary>
-            public readonly uint vMins;
-            /// <summary>Offset 0x18+hashTableSize*4+168, last disk alteration ticks (1/50 secs)</summary>
-            public readonly uint vTicks;
-            /// <summary>Offset 0x18+hashTableSize*4+172, filesystem creation days since 1978/01/01</summary>
-            public readonly uint cDays;
-            /// <summary>Offset 0x18+hashTableSize*4+176, filesystem creation minutes since 1978/01/01</summary>
-            public readonly uint cMins;
-            /// <summary>Offset 0x18+hashTableSize*4+180, filesystem creation ticks since 1978/01/01</summary>
-            public readonly uint cTicks;
-            /// <summary>Offset 0x18+hashTableSize*4+184, unused</summary>
-            public readonly uint nextHash;
-            /// <summary>Offset 0x18+hashTableSize*4+188, unused</summary>
-            public readonly uint parentDir;
-            /// <summary>Offset 0x18+hashTableSize*4+192, first directory cache block</summary>
-            public readonly uint extension;
-            /// <summary>Offset 0x18+hashTableSize*4+196, block secondary type = ST_ROOT (1)</summary>
-            public uint sec_type;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct RootBlock
+    {
+        /// <summary>Offset 0x00, block type, value = T_HEADER (2)</summary>
+        public uint type;
+        /// <summary>Offset 0x04, unused</summary>
+        public readonly uint headerKey;
+        /// <summary>Offset 0x08, unused</summary>
+        public readonly uint highSeq;
+        /// <summary>Offset 0x0C, longs used by hash table</summary>
+        public uint hashTableSize;
+        /// <summary>Offset 0x10, unused</summary>
+        public readonly uint firstData;
+        /// <summary>Offset 0x14, Rootblock checksum</summary>
+        public uint checksum;
+        /// <summary>
+        ///     Offset 0x18, Hashtable, size = (block size / 4) - 56 or size = hashTableSize. Size intentionally bad to allow
+        ///     marshalling to work.
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
+        public uint[] hashTable;
+        /// <summary>Offset 0x18+hashTableSize*4+0, bitmap flag, 0xFFFFFFFF if valid</summary>
+        public readonly uint bitmapFlag;
+        /// <summary>Offset 0x18+hashTableSize*4+4, bitmap pages, 25 entries</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 25)]
+        public readonly uint[] bitmapPages;
+        /// <summary>Offset 0x18+hashTableSize*4+104, pointer to bitmap extension block</summary>
+        public readonly uint bitmapExtensionBlock;
+        /// <summary>Offset 0x18+hashTableSize*4+108, last root alteration days since 1978/01/01</summary>
+        public readonly uint rDays;
+        /// <summary>Offset 0x18+hashTableSize*4+112, last root alteration minutes past midnight</summary>
+        public readonly uint rMins;
+        /// <summary>Offset 0x18+hashTableSize*4+116, last root alteration ticks (1/50 secs)</summary>
+        public readonly uint rTicks;
+        /// <summary>Offset 0x18+hashTableSize*4+120, disk name, pascal string, 31 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 31)]
+        public readonly byte[] diskName;
+        /// <summary>Offset 0x18+hashTableSize*4+151, unused</summary>
+        public readonly byte padding;
+        /// <summary>Offset 0x18+hashTableSize*4+152, unused</summary>
+        public readonly uint reserved1;
+        /// <summary>Offset 0x18+hashTableSize*4+156, unused</summary>
+        public readonly uint reserved2;
+        /// <summary>Offset 0x18+hashTableSize*4+160, last disk alteration days since 1978/01/01</summary>
+        public readonly uint vDays;
+        /// <summary>Offset 0x18+hashTableSize*4+164, last disk alteration minutes past midnight</summary>
+        public readonly uint vMins;
+        /// <summary>Offset 0x18+hashTableSize*4+168, last disk alteration ticks (1/50 secs)</summary>
+        public readonly uint vTicks;
+        /// <summary>Offset 0x18+hashTableSize*4+172, filesystem creation days since 1978/01/01</summary>
+        public readonly uint cDays;
+        /// <summary>Offset 0x18+hashTableSize*4+176, filesystem creation minutes since 1978/01/01</summary>
+        public readonly uint cMins;
+        /// <summary>Offset 0x18+hashTableSize*4+180, filesystem creation ticks since 1978/01/01</summary>
+        public readonly uint cTicks;
+        /// <summary>Offset 0x18+hashTableSize*4+184, unused</summary>
+        public readonly uint nextHash;
+        /// <summary>Offset 0x18+hashTableSize*4+188, unused</summary>
+        public readonly uint parentDir;
+        /// <summary>Offset 0x18+hashTableSize*4+192, first directory cache block</summary>
+        public readonly uint extension;
+        /// <summary>Offset 0x18+hashTableSize*4+196, block secondary type = ST_ROOT (1)</summary>
+        public uint sec_type;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleCommon/Consts.cs b/Aaru.Filesystems/AppleCommon/Consts.cs
index 14f539538..9d766cc00 100644
--- a/Aaru.Filesystems/AppleCommon/Consts.cs
+++ b/Aaru.Filesystems/AppleCommon/Consts.cs
@@ -30,19 +30,18 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh
+// https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
+internal static partial class AppleCommon
 {
-    // Information from Inside Macintosh
-    // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
-    internal static partial class AppleCommon
-    {
-        /// <summary>"LK", HFS bootblock magic</summary>
-        internal const ushort BB_MAGIC = 0x4C4B;
-        /// <summary>"BD", HFS magic</summary>
-        internal const ushort HFS_MAGIC = 0x4244;
-        /// <summary>"H+", HFS+ magic</summary>
-        internal const ushort HFSP_MAGIC = 0x482B;
-        /// <summary>"HX", HFSX magic</summary>
-        internal const ushort HFSX_MAGIC = 0x4858;
-    }
+    /// <summary>"LK", HFS bootblock magic</summary>
+    internal const ushort BB_MAGIC = 0x4C4B;
+    /// <summary>"BD", HFS magic</summary>
+    internal const ushort HFS_MAGIC = 0x4244;
+    /// <summary>"H+", HFS+ magic</summary>
+    internal const ushort HFSP_MAGIC = 0x482B;
+    /// <summary>"HX", HFSX magic</summary>
+    internal const ushort HFSX_MAGIC = 0x4858;
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleCommon/Enums.cs b/Aaru.Filesystems/AppleCommon/Enums.cs
index 6e9bd49d8..94f348159 100644
--- a/Aaru.Filesystems/AppleCommon/Enums.cs
+++ b/Aaru.Filesystems/AppleCommon/Enums.cs
@@ -34,68 +34,67 @@ using System;
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh
+// https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
+internal static partial class AppleCommon
 {
-    // Information from Inside Macintosh
-    // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
-    internal static partial class AppleCommon
+    [Flags]
+    internal enum VolumeAttributes : ushort
     {
-        [Flags]
-        internal enum VolumeAttributes : ushort
-        {
-            HardwareLock     = 0x80, Unmounted         = 0x100, SparedBadBlocks = 0x200,
-            DoesNotNeedCache = 0x400, BootInconsistent = 0x800, ReusedIds       = 0x1000,
-            Journaled        = 0x2000, Inconsistent    = 0x4000, SoftwareLock   = 0x8000
-        }
+        HardwareLock     = 0x80, Unmounted         = 0x100, SparedBadBlocks = 0x200,
+        DoesNotNeedCache = 0x400, BootInconsistent = 0x800, ReusedIds       = 0x1000,
+        Journaled        = 0x2000, Inconsistent    = 0x4000, SoftwareLock   = 0x8000
+    }
 
-        [Flags]
-        internal enum FinderFlags : ushort
-        {
-            /// <summary>Is on desktop.</summary>
-            kIsOnDesk = 0x0001,
-            /// <summary>Color mask.</summary>
-            kColor = 0x000E, kRequireSwitchLaunch = 0x0020,
-            /// <summary>If clear, the application needs to write to its resource fork, and therefore cannot be shared on a server.</summary>
-            kIsShared = 0x0040,
-            /// <summary>Extension or control panel with no INIT entries in resource fork.</summary>
-            kHasNoINITs = 0x0080,
-            /// <summary>
-            ///     Clear if the file contains desktop database resources ('BNDL', 'FREF', 'open', 'kind'...) that have not been
-            ///     added yet. Set only by the Finder. Reserved for folders - make sure this bit is cleared for folders.
-            /// </summary>
-            kHasBeenInited = 0x0100,
-            /// <summary>PowerTalk</summary>
-            kAOCE = 0x200, kChanged = 0x0200,
-            /// <summary>Has a custom icon in the resource fork.</summary>
-            kHasCustomIcon = 0x0400,
-            /// <summary>Is a stationery.</summary>
-            kIsStationery = 0x0800,
-            /// <summary>Cannot be renamed.</summary>
-            kNameLocked = 0x1000,
-            /// <summary>Indicates that a file has a BNDL resource or that a folder is displayed as a package.</summary>
-            kHasBundle = 0x2000,
-            /// <summary>Hidden.</summary>
-            kIsInvisible = 0x4000,
-            /// <summary>Is an alias</summary>
-            kIsAlias = 0x8000
-        }
+    [Flags]
+    internal enum FinderFlags : ushort
+    {
+        /// <summary>Is on desktop.</summary>
+        kIsOnDesk = 0x0001,
+        /// <summary>Color mask.</summary>
+        kColor = 0x000E, kRequireSwitchLaunch = 0x0020,
+        /// <summary>If clear, the application needs to write to its resource fork, and therefore cannot be shared on a server.</summary>
+        kIsShared = 0x0040,
+        /// <summary>Extension or control panel with no INIT entries in resource fork.</summary>
+        kHasNoINITs = 0x0080,
+        /// <summary>
+        ///     Clear if the file contains desktop database resources ('BNDL', 'FREF', 'open', 'kind'...) that have not been
+        ///     added yet. Set only by the Finder. Reserved for folders - make sure this bit is cleared for folders.
+        /// </summary>
+        kHasBeenInited = 0x0100,
+        /// <summary>PowerTalk</summary>
+        kAOCE = 0x200, kChanged = 0x0200,
+        /// <summary>Has a custom icon in the resource fork.</summary>
+        kHasCustomIcon = 0x0400,
+        /// <summary>Is a stationery.</summary>
+        kIsStationery = 0x0800,
+        /// <summary>Cannot be renamed.</summary>
+        kNameLocked = 0x1000,
+        /// <summary>Indicates that a file has a BNDL resource or that a folder is displayed as a package.</summary>
+        kHasBundle = 0x2000,
+        /// <summary>Hidden.</summary>
+        kIsInvisible = 0x4000,
+        /// <summary>Is an alias</summary>
+        kIsAlias = 0x8000
+    }
 
-        internal enum FinderFolder : short
-        {
-            fTrash = -3, fDesktop = -2, fDisk = 0
-        }
+    internal enum FinderFolder : short
+    {
+        fTrash = -3, fDesktop = -2, fDisk = 0
+    }
 
-        [Flags]
-        internal enum ExtendedFinderFlags : ushort
-        {
-            /// <summary>If set the other extended flags are ignored.</summary>
-            kExtendedFlagsAreInvalid = 0x8000,
-            /// <summary>Set if the file or folder has a badge resource.</summary>
-            kExtendedFlagHasCustomBadge = 0x0100,
-            /// <summary>Set if the object is marked as busy/incomplete.</summary>
-            kExtendedFlagObjectIsBusy = 0x0080,
-            /// <summary>Set if the file contains routing info resource.</summary>
-            kExtendedFlagHasRoutingInfo = 0x0004
-        }
+    [Flags]
+    internal enum ExtendedFinderFlags : ushort
+    {
+        /// <summary>If set the other extended flags are ignored.</summary>
+        kExtendedFlagsAreInvalid = 0x8000,
+        /// <summary>Set if the file or folder has a badge resource.</summary>
+        kExtendedFlagHasCustomBadge = 0x0100,
+        /// <summary>Set if the object is marked as busy/incomplete.</summary>
+        kExtendedFlagObjectIsBusy = 0x0080,
+        /// <summary>Set if the file contains routing info resource.</summary>
+        kExtendedFlagHasRoutingInfo = 0x0004
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleCommon/Info.cs b/Aaru.Filesystems/AppleCommon/Info.cs
index 98d4df7dc..1b42af281 100644
--- a/Aaru.Filesystems/AppleCommon/Info.cs
+++ b/Aaru.Filesystems/AppleCommon/Info.cs
@@ -33,75 +33,74 @@
 using System.Text;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh
+// https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
+internal static partial class AppleCommon
 {
-    // Information from Inside Macintosh
-    // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
-    internal static partial class AppleCommon
+    internal static string GetBootBlockInformation(byte[] bbSector, Encoding encoding)
     {
-        internal static string GetBootBlockInformation(byte[] bbSector, Encoding encoding)
+        if(bbSector is null ||
+           bbSector.Length < 0x100)
+            return null;
+
+        BootBlock bb = Marshal.ByteArrayToStructureBigEndian<BootBlock>(bbSector);
+
+        if(bb.bbID != BB_MAGIC)
+            return null;
+
+        var sb = new StringBuilder();
+        sb.AppendLine("Boot Block:");
+
+        if((bb.bbVersion & 0x8000) > 0)
         {
-            if(bbSector is null ||
-               bbSector.Length < 0x100)
-                return null;
+            sb.AppendLine("Boot block is in new format.");
 
-            BootBlock bb = Marshal.ByteArrayToStructureBigEndian<BootBlock>(bbSector);
-
-            if(bb.bbID != BB_MAGIC)
-                return null;
-
-            var sb = new StringBuilder();
-            sb.AppendLine("Boot Block:");
-
-            if((bb.bbVersion & 0x8000) > 0)
+            if((bb.bbVersion & 0x4000) > 0)
             {
-                sb.AppendLine("Boot block is in new format.");
-
-                if((bb.bbVersion & 0x4000) > 0)
-                {
-                    sb.AppendLine("Boot block should be executed.");
-
-                    if((bb.bbVersion & 0x2000) > 0)
-                        sb.
-                            AppendFormat("System heap will be extended by {0} bytes and a {1} fraction of the available RAM",
-                                         bb.bbSysHeapExtra, bb.bbSysHeapFract).AppendLine();
-                }
-            }
-            else if((bb.bbVersion & 0xFF) == 0x0D)
                 sb.AppendLine("Boot block should be executed.");
 
-            if(bb.bbPageFlags > 0)
-                sb.AppendLine("Allocate secondary sound buffer at boot.");
-            else if(bb.bbPageFlags < 0)
-                sb.AppendLine("Allocate secondary sound and video buffers at boot.");
-
-            sb.AppendFormat("System filename: {0}", StringHandlers.PascalToString(bb.bbSysName, encoding)).AppendLine();
-
-            sb.AppendFormat("Finder filename: {0}", StringHandlers.PascalToString(bb.bbShellName, encoding)).
-               AppendLine();
-
-            sb.AppendFormat("Debugger filename: {0}", StringHandlers.PascalToString(bb.bbDbg1Name, encoding)).
-               AppendLine();
-
-            sb.AppendFormat("Disassembler filename: {0}", StringHandlers.PascalToString(bb.bbDbg2Name, encoding)).
-               AppendLine();
-
-            sb.AppendFormat("Startup screen filename: {0}", StringHandlers.PascalToString(bb.bbScreenName, encoding)).
-               AppendLine();
-
-            sb.AppendFormat("First program to execute at boot: {0}",
-                            StringHandlers.PascalToString(bb.bbHelloName, encoding)).AppendLine();
-
-            sb.AppendFormat("Clipboard filename: {0}", StringHandlers.PascalToString(bb.bbScrapName, encoding)).
-               AppendLine();
-
-            sb.AppendFormat("Maximum opened files: {0}", bb.bbCntFCBs * 4).AppendLine();
-            sb.AppendFormat("Event queue size: {0}", bb.bbCntEvts).AppendLine();
-            sb.AppendFormat("Heap size with 128KiB of RAM: {0} bytes", bb.bb128KSHeap).AppendLine();
-            sb.AppendFormat("Heap size with 256KiB of RAM: {0} bytes", bb.bb256KSHeap).AppendLine();
-            sb.AppendFormat("Heap size with 512KiB of RAM or more: {0} bytes", bb.bbSysHeapSize).AppendLine();
-
-            return sb.ToString();
+                if((bb.bbVersion & 0x2000) > 0)
+                    sb.
+                        AppendFormat("System heap will be extended by {0} bytes and a {1} fraction of the available RAM",
+                                     bb.bbSysHeapExtra, bb.bbSysHeapFract).AppendLine();
+            }
         }
+        else if((bb.bbVersion & 0xFF) == 0x0D)
+            sb.AppendLine("Boot block should be executed.");
+
+        if(bb.bbPageFlags > 0)
+            sb.AppendLine("Allocate secondary sound buffer at boot.");
+        else if(bb.bbPageFlags < 0)
+            sb.AppendLine("Allocate secondary sound and video buffers at boot.");
+
+        sb.AppendFormat("System filename: {0}", StringHandlers.PascalToString(bb.bbSysName, encoding)).AppendLine();
+
+        sb.AppendFormat("Finder filename: {0}", StringHandlers.PascalToString(bb.bbShellName, encoding)).
+           AppendLine();
+
+        sb.AppendFormat("Debugger filename: {0}", StringHandlers.PascalToString(bb.bbDbg1Name, encoding)).
+           AppendLine();
+
+        sb.AppendFormat("Disassembler filename: {0}", StringHandlers.PascalToString(bb.bbDbg2Name, encoding)).
+           AppendLine();
+
+        sb.AppendFormat("Startup screen filename: {0}", StringHandlers.PascalToString(bb.bbScreenName, encoding)).
+           AppendLine();
+
+        sb.AppendFormat("First program to execute at boot: {0}",
+                        StringHandlers.PascalToString(bb.bbHelloName, encoding)).AppendLine();
+
+        sb.AppendFormat("Clipboard filename: {0}", StringHandlers.PascalToString(bb.bbScrapName, encoding)).
+           AppendLine();
+
+        sb.AppendFormat("Maximum opened files: {0}", bb.bbCntFCBs * 4).AppendLine();
+        sb.AppendFormat("Event queue size: {0}", bb.bbCntEvts).AppendLine();
+        sb.AppendFormat("Heap size with 128KiB of RAM: {0} bytes", bb.bb128KSHeap).AppendLine();
+        sb.AppendFormat("Heap size with 256KiB of RAM: {0} bytes", bb.bb256KSHeap).AppendLine();
+        sb.AppendFormat("Heap size with 512KiB of RAM or more: {0} bytes", bb.bbSysHeapSize).AppendLine();
+
+        return sb.ToString();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleCommon/Structs.cs b/Aaru.Filesystems/AppleCommon/Structs.cs
index 57cbde0ae..ba3fc09b1 100644
--- a/Aaru.Filesystems/AppleCommon/Structs.cs
+++ b/Aaru.Filesystems/AppleCommon/Structs.cs
@@ -34,129 +34,128 @@ using System.Runtime.InteropServices;
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh
+// https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
+internal static partial class AppleCommon
 {
-    // Information from Inside Macintosh
-    // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
-    internal static partial class AppleCommon
+    /// <summary>Should be sectors 0 and 1 in volume, followed by boot code</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BootBlock // Should be sectors 0 and 1 in volume
     {
-        /// <summary>Should be sectors 0 and 1 in volume, followed by boot code</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BootBlock // Should be sectors 0 and 1 in volume
-        {
-            /// <summary>0x000, Signature, 0x4C4B if bootable</summary>
-            public readonly ushort bbID;
-            /// <summary>0x002, Branch</summary>
-            public readonly uint bbEntry;
-            /// <summary>0x007, Boot block version and flags</summary>
-            public readonly ushort bbVersion;
-            /// <summary>0x006, Boot block page flags</summary>
-            public readonly short bbPageFlags;
-            /// <summary>0x00A, System file name (16 bytes)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] bbSysName;
-            /// <summary>0x01A, Finder file name (16 bytes)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] bbShellName;
-            /// <summary>0x02A, Debugger file name (16 bytes)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] bbDbg1Name;
-            /// <summary>0x03A, Disassembler file name (16 bytes)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] bbDbg2Name;
-            /// <summary>0x04A, Startup screen file name (16 bytes)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] bbScreenName;
-            /// <summary>0x05A, First program to execute on boot (16 bytes)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] bbHelloName;
-            /// <summary>0x06A, Clipboard file name (16 bytes)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] bbScrapName;
-            /// <summary>0x07A, 1/4 of maximum opened at a time files</summary>
-            public readonly ushort bbCntFCBs;
-            /// <summary>0x07C, Event queue size</summary>
-            public readonly ushort bbCntEvts;
-            /// <summary>0x07E, Heap size on a Mac with 128KiB of RAM</summary>
-            public readonly uint bb128KSHeap;
-            /// <summary>0x082, Heap size on a Mac with 256KiB of RAM</summary>
-            public readonly uint bb256KSHeap;
-            /// <summary>0x086, Heap size on a Mac with 512KiB of RAM or more</summary>
-            public readonly uint bbSysHeapSize;
-            /// <summary>0x08A, Padding</summary>
-            public readonly ushort filler;
-            /// <summary>0x08C, Additional system heap space</summary>
-            public readonly uint bbSysHeapExtra;
-            /// <summary>0x090, Fraction of RAM for system heap</summary>
-            public readonly uint bbSysHeapFract;
-        }
+        /// <summary>0x000, Signature, 0x4C4B if bootable</summary>
+        public readonly ushort bbID;
+        /// <summary>0x002, Branch</summary>
+        public readonly uint bbEntry;
+        /// <summary>0x007, Boot block version and flags</summary>
+        public readonly ushort bbVersion;
+        /// <summary>0x006, Boot block page flags</summary>
+        public readonly short bbPageFlags;
+        /// <summary>0x00A, System file name (16 bytes)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] bbSysName;
+        /// <summary>0x01A, Finder file name (16 bytes)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] bbShellName;
+        /// <summary>0x02A, Debugger file name (16 bytes)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] bbDbg1Name;
+        /// <summary>0x03A, Disassembler file name (16 bytes)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] bbDbg2Name;
+        /// <summary>0x04A, Startup screen file name (16 bytes)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] bbScreenName;
+        /// <summary>0x05A, First program to execute on boot (16 bytes)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] bbHelloName;
+        /// <summary>0x06A, Clipboard file name (16 bytes)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] bbScrapName;
+        /// <summary>0x07A, 1/4 of maximum opened at a time files</summary>
+        public readonly ushort bbCntFCBs;
+        /// <summary>0x07C, Event queue size</summary>
+        public readonly ushort bbCntEvts;
+        /// <summary>0x07E, Heap size on a Mac with 128KiB of RAM</summary>
+        public readonly uint bb128KSHeap;
+        /// <summary>0x082, Heap size on a Mac with 256KiB of RAM</summary>
+        public readonly uint bb256KSHeap;
+        /// <summary>0x086, Heap size on a Mac with 512KiB of RAM or more</summary>
+        public readonly uint bbSysHeapSize;
+        /// <summary>0x08A, Padding</summary>
+        public readonly ushort filler;
+        /// <summary>0x08C, Additional system heap space</summary>
+        public readonly uint bbSysHeapExtra;
+        /// <summary>0x090, Fraction of RAM for system heap</summary>
+        public readonly uint bbSysHeapFract;
+    }
 
-        internal struct Rect
-        {
-            public ushort top;
-            public ushort left;
-            public ushort bottom;
-            public ushort right;
-        }
+    internal struct Rect
+    {
+        public ushort top;
+        public ushort left;
+        public ushort bottom;
+        public ushort right;
+    }
 
-        internal struct Point
-        {
-            public ushort v;
-            public ushort h;
-        }
+    internal struct Point
+    {
+        public ushort v;
+        public ushort h;
+    }
 
-        internal struct FInfo
-        {
-            /// <summary>The type of the file.</summary>
-            public uint fdType;
-            /// <summary>The file's creator.</summary>
-            public uint fdCreator;
-            /// <summary>Flags.</summary>
-            public FinderFlags fdFlags;
-            /// <summary>File's location in the folder.</summary>
-            public Point fdLocation;
-            /// <summary>Folder file belongs to (used only in flat filesystems like MFS).</summary>
-            public FinderFolder fdFldr;
-        }
+    internal struct FInfo
+    {
+        /// <summary>The type of the file.</summary>
+        public uint fdType;
+        /// <summary>The file's creator.</summary>
+        public uint fdCreator;
+        /// <summary>Flags.</summary>
+        public FinderFlags fdFlags;
+        /// <summary>File's location in the folder.</summary>
+        public Point fdLocation;
+        /// <summary>Folder file belongs to (used only in flat filesystems like MFS).</summary>
+        public FinderFolder fdFldr;
+    }
 
-        internal struct FXInfo
-        {
-            /// <summary>Resource fork ID of file icon.</summary>
-            public ushort fdIconID;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public byte[] fdUnused;
-            /// <summary>Extended flags. If high-bit is set, most significant byte is script code and least significant byte are flags.</summary>
-            public ExtendedFinderFlags fdXFlags;
-            /// <summary>Resource fork ID of directory comment if high bit is clear.</summary>
-            public ushort fdComment;
-            /// <summary>Put away folder ID.</summary>
-            public uint fdPutAway;
-        }
+    internal struct FXInfo
+    {
+        /// <summary>Resource fork ID of file icon.</summary>
+        public ushort fdIconID;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public byte[] fdUnused;
+        /// <summary>Extended flags. If high-bit is set, most significant byte is script code and least significant byte are flags.</summary>
+        public ExtendedFinderFlags fdXFlags;
+        /// <summary>Resource fork ID of directory comment if high bit is clear.</summary>
+        public ushort fdComment;
+        /// <summary>Put away folder ID.</summary>
+        public uint fdPutAway;
+    }
 
-        internal struct DInfo
-        {
-            /// <summary>Position and dimensions of the folder's window.</summary>
-            public Rect frRect;
-            /// <summary>Flags.</summary>
-            public FinderFlags frFlags;
-            /// <summary>Folder's location in the parent folder.</summary>
-            public Point frLocation;
-            /// <summary>Finder view selected for folder.</summary>
-            public ushort frView;
-        }
+    internal struct DInfo
+    {
+        /// <summary>Position and dimensions of the folder's window.</summary>
+        public Rect frRect;
+        /// <summary>Flags.</summary>
+        public FinderFlags frFlags;
+        /// <summary>Folder's location in the parent folder.</summary>
+        public Point frLocation;
+        /// <summary>Finder view selected for folder.</summary>
+        public ushort frView;
+    }
 
-        internal struct DXInfo
-        {
-            /// <summary>Scroll position for icon views.</summary>
-            public Point frScroll;
-            /// <summary>Directory ID chain of open folders.</summary>
-            public uint frOpenChain;
-            /// <summary>Extended flags. If high-bit is set, most significant byte is script code and least significant byte are flags.</summary>
-            public ExtendedFinderFlags frXFlags;
-            /// <summary>Resource fork ID of directory comment if high bit is clear.</summary>
-            public ushort frComment;
-            /// <summary>Put away folder ID.</summary>
-            public uint frPutAway;
-        }
+    internal struct DXInfo
+    {
+        /// <summary>Scroll position for icon views.</summary>
+        public Point frScroll;
+        /// <summary>Directory ID chain of open folders.</summary>
+        public uint frOpenChain;
+        /// <summary>Extended flags. If high-bit is set, most significant byte is script code and least significant byte are flags.</summary>
+        public ExtendedFinderFlags frXFlags;
+        /// <summary>Resource fork ID of directory comment if high bit is clear.</summary>
+        public ushort frComment;
+        /// <summary>Put away folder ID.</summary>
+        public uint frPutAway;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleDOS/AppleDOS.cs b/Aaru.Filesystems/AppleDOS/AppleDOS.cs
index 22817c141..19f7df9aa 100644
--- a/Aaru.Filesystems/AppleDOS/AppleDOS.cs
+++ b/Aaru.Filesystems/AppleDOS/AppleDOS.cs
@@ -36,68 +36,67 @@ using System.Text;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements the Apple DOS 3 filesystem</summary>
+public sealed partial class AppleDOS : IReadOnlyFilesystem
 {
+    bool        _debug;
+    IMediaImage _device;
+    bool        _mounted;
+    int         _sectorsPerTrack;
+    ulong       _start;
+    ulong       _totalFileEntries;
+    bool        _track1UsedByFiles;
+    bool        _track2UsedByFiles;
+    uint        _usedSectors;
+    Vtoc        _vtoc;
+
     /// <inheritdoc />
-    /// <summary>Implements the Apple DOS 3 filesystem</summary>
-    public sealed partial class AppleDOS : IReadOnlyFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Apple DOS File System";
+    /// <inheritdoc />
+    public Guid Id => new("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
+        new (string name, Type type, string description)[]
+            {};
+
+    /// <inheritdoc />
+    public Dictionary<string, string> Namespaces => null;
+
+    static Dictionary<string, string> GetDefaultOptions() => new()
     {
-        bool        _debug;
-        IMediaImage _device;
-        bool        _mounted;
-        int         _sectorsPerTrack;
-        ulong       _start;
-        ulong       _totalFileEntries;
-        bool        _track1UsedByFiles;
-        bool        _track2UsedByFiles;
-        uint        _usedSectors;
-        Vtoc        _vtoc;
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Apple DOS File System";
-        /// <inheritdoc />
-        public Guid Id => new("8658A1E9-B2E7-4BCC-9638-157A31B0A700\n");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[]
-                {};
-
-        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => null;
-
-        static Dictionary<string, string> GetDefaultOptions() => new()
         {
-            {
-                "debug", false.ToString()
-            }
-        };
+            "debug", false.ToString()
+        }
+    };
 
-        #region Caches
-        /// <summary>Caches track/sector lists</summary>
-        Dictionary<string, byte[]> _extentCache;
-        /// <summary>Caches files</summary>
-        Dictionary<string, byte[]> _fileCache;
-        /// <summary>Caches catalog</summary>
-        Dictionary<string, ushort> _catalogCache;
-        /// <summary>Caches file size</summary>
-        Dictionary<string, int> _fileSizeCache;
-        /// <summary>Caches VTOC</summary>
-        byte[] _vtocBlocks;
-        /// <summary>Caches catalog</summary>
-        byte[] _catalogBlocks;
-        /// <summary>Caches boot code</summary>
-        byte[] _bootBlocks;
-        /// <summary>Caches file type</summary>
-        Dictionary<string, byte> _fileTypeCache;
-        /// <summary>Caches locked files</summary>
-        List<string> _lockedFiles;
-        #endregion Caches
-    }
+    #region Caches
+    /// <summary>Caches track/sector lists</summary>
+    Dictionary<string, byte[]> _extentCache;
+    /// <summary>Caches files</summary>
+    Dictionary<string, byte[]> _fileCache;
+    /// <summary>Caches catalog</summary>
+    Dictionary<string, ushort> _catalogCache;
+    /// <summary>Caches file size</summary>
+    Dictionary<string, int> _fileSizeCache;
+    /// <summary>Caches VTOC</summary>
+    byte[] _vtocBlocks;
+    /// <summary>Caches catalog</summary>
+    byte[] _catalogBlocks;
+    /// <summary>Caches boot code</summary>
+    byte[] _bootBlocks;
+    /// <summary>Caches file type</summary>
+    Dictionary<string, byte> _fileTypeCache;
+    /// <summary>Caches locked files</summary>
+    List<string> _lockedFiles;
+    #endregion Caches
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleDOS/Dir.cs b/Aaru.Filesystems/AppleDOS/Dir.cs
index da07cb19c..c68bc2b6e 100644
--- a/Aaru.Filesystems/AppleDOS/Dir.cs
+++ b/Aaru.Filesystems/AppleDOS/Dir.cs
@@ -37,112 +37,111 @@ using System.Linq;
 using Aaru.CommonTypes.Enums;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class AppleDOS
 {
-    public sealed partial class AppleDOS
+    /// <inheritdoc />
+    public ErrorNumber ReadLink(string path, out string dest)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadLink(string path, out string dest)
-        {
-            dest = null;
+        dest = null;
 
-            return !_mounted ? ErrorNumber.AccessDenied : ErrorNumber.NotSupported;
+        return !_mounted ? ErrorNumber.AccessDenied : ErrorNumber.NotSupported;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadDir(string path, out List<string> contents)
+    {
+        contents = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(!string.IsNullOrEmpty(path) &&
+           string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
+            return ErrorNumber.NotSupported;
+
+        contents = _catalogCache.Keys.ToList();
+
+        if(_debug)
+        {
+            contents.Add("$");
+            contents.Add("$Boot");
+            contents.Add("$Vtoc");
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadDir(string path, out List<string> contents)
+        contents.Sort();
+
+        return ErrorNumber.NoError;
+    }
+
+    ErrorNumber ReadCatalog()
+    {
+        var   catalogMs = new MemoryStream();
+        ulong lba       = (ulong)((_vtoc.catalogTrack * _sectorsPerTrack) + _vtoc.catalogSector);
+        _totalFileEntries = 0;
+        _catalogCache     = new Dictionary<string, ushort>();
+        _fileTypeCache    = new Dictionary<string, byte>();
+        _fileSizeCache    = new Dictionary<string, int>();
+        _lockedFiles      = new List<string>();
+
+        if(lba == 0 ||
+           lba > _device.Info.Sectors)
+            return ErrorNumber.InvalidArgument;
+
+        while(lba != 0)
         {
-            contents = null;
+            _usedSectors++;
+            ErrorNumber errno = _device.ReadSector(lba, out byte[] catSectorB);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(!string.IsNullOrEmpty(path) &&
-               string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
-                return ErrorNumber.NotSupported;
-
-            contents = _catalogCache.Keys.ToList();
+            _totalFileEntries += 7;
 
             if(_debug)
+                catalogMs.Write(catSectorB, 0, catSectorB.Length);
+
+            // Read the catalog sector
+            CatalogSector catSector = Marshal.ByteArrayToStructureLittleEndian<CatalogSector>(catSectorB);
+
+            foreach(FileEntry entry in catSector.entries.Where(entry => entry.extentTrack > 0))
             {
-                contents.Add("$");
-                contents.Add("$Boot");
-                contents.Add("$Vtoc");
+                _track1UsedByFiles |= entry.extentTrack == 1;
+                _track2UsedByFiles |= entry.extentTrack == 2;
+
+                byte[] filenameB = new byte[30];
+                ushort ts        = (ushort)((entry.extentTrack << 8) | entry.extentSector);
+
+                // Apple DOS has high byte set over ASCII.
+                for(int i = 0; i < 30; i++)
+                    filenameB[i] = (byte)(entry.filename[i] & 0x7F);
+
+                string filename = StringHandlers.SpacePaddedToString(filenameB, Encoding);
+
+                if(!_catalogCache.ContainsKey(filename))
+                    _catalogCache.Add(filename, ts);
+
+                if(!_fileTypeCache.ContainsKey(filename))
+                    _fileTypeCache.Add(filename, (byte)(entry.typeAndFlags & 0x7F));
+
+                if(!_fileSizeCache.ContainsKey(filename))
+                    _fileSizeCache.Add(filename, entry.length * _vtoc.bytesPerSector);
+
+                if((entry.typeAndFlags & 0x80) == 0x80 &&
+                   !_lockedFiles.Contains(filename))
+                    _lockedFiles.Add(filename);
             }
 
-            contents.Sort();
+            lba = (ulong)((catSector.trackOfNext * _sectorsPerTrack) + catSector.sectorOfNext);
 
-            return ErrorNumber.NoError;
+            if(lba > _device.Info.Sectors)
+                break;
         }
 
-        ErrorNumber ReadCatalog()
-        {
-            var   catalogMs = new MemoryStream();
-            ulong lba       = (ulong)((_vtoc.catalogTrack * _sectorsPerTrack) + _vtoc.catalogSector);
-            _totalFileEntries = 0;
-            _catalogCache     = new Dictionary<string, ushort>();
-            _fileTypeCache    = new Dictionary<string, byte>();
-            _fileSizeCache    = new Dictionary<string, int>();
-            _lockedFiles      = new List<string>();
+        if(_debug)
+            _catalogBlocks = catalogMs.ToArray();
 
-            if(lba == 0 ||
-               lba > _device.Info.Sectors)
-                return ErrorNumber.InvalidArgument;
-
-            while(lba != 0)
-            {
-                _usedSectors++;
-                ErrorNumber errno = _device.ReadSector(lba, out byte[] catSectorB);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                _totalFileEntries += 7;
-
-                if(_debug)
-                    catalogMs.Write(catSectorB, 0, catSectorB.Length);
-
-                // Read the catalog sector
-                CatalogSector catSector = Marshal.ByteArrayToStructureLittleEndian<CatalogSector>(catSectorB);
-
-                foreach(FileEntry entry in catSector.entries.Where(entry => entry.extentTrack > 0))
-                {
-                    _track1UsedByFiles |= entry.extentTrack == 1;
-                    _track2UsedByFiles |= entry.extentTrack == 2;
-
-                    byte[] filenameB = new byte[30];
-                    ushort ts        = (ushort)((entry.extentTrack << 8) | entry.extentSector);
-
-                    // Apple DOS has high byte set over ASCII.
-                    for(int i = 0; i < 30; i++)
-                        filenameB[i] = (byte)(entry.filename[i] & 0x7F);
-
-                    string filename = StringHandlers.SpacePaddedToString(filenameB, Encoding);
-
-                    if(!_catalogCache.ContainsKey(filename))
-                        _catalogCache.Add(filename, ts);
-
-                    if(!_fileTypeCache.ContainsKey(filename))
-                        _fileTypeCache.Add(filename, (byte)(entry.typeAndFlags & 0x7F));
-
-                    if(!_fileSizeCache.ContainsKey(filename))
-                        _fileSizeCache.Add(filename, entry.length * _vtoc.bytesPerSector);
-
-                    if((entry.typeAndFlags & 0x80) == 0x80 &&
-                       !_lockedFiles.Contains(filename))
-                        _lockedFiles.Add(filename);
-                }
-
-                lba = (ulong)((catSector.trackOfNext * _sectorsPerTrack) + catSector.sectorOfNext);
-
-                if(lba > _device.Info.Sectors)
-                    break;
-            }
-
-            if(_debug)
-                _catalogBlocks = catalogMs.ToArray();
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleDOS/File.cs b/Aaru.Filesystems/AppleDOS/File.cs
index 6886d4f66..7faff10e0 100644
--- a/Aaru.Filesystems/AppleDOS/File.cs
+++ b/Aaru.Filesystems/AppleDOS/File.cs
@@ -39,269 +39,268 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class AppleDOS
 {
-    public sealed partial class AppleDOS
+    /// <inheritdoc />
+    public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
     {
-        /// <inheritdoc />
-        public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+        attributes = new FileAttributes();
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            attributes = new FileAttributes();
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        string filename = pathElements[0].ToUpperInvariant();
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
+        if(!_fileCache.ContainsKey(filename))
+            return ErrorNumber.NoSuchFile;
 
-            string filename = pathElements[0].ToUpperInvariant();
+        attributes =  FileAttributes.Extents;
+        attributes |= FileAttributes.File;
 
-            if(!_fileCache.ContainsKey(filename))
-                return ErrorNumber.NoSuchFile;
+        if(_lockedFiles.Contains(filename))
+            attributes |= FileAttributes.ReadOnly;
 
-            attributes =  FileAttributes.Extents;
-            attributes |= FileAttributes.File;
+        if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
+                      string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
+                      string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
+            attributes |= FileAttributes.System;
 
-            if(_lockedFiles.Contains(filename))
-                attributes |= FileAttributes.ReadOnly;
+        return ErrorNumber.NoError;
+    }
 
-            if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
-                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
-                          string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
-                attributes |= FileAttributes.System;
+    /// <inheritdoc />
+    public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
 
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+        string[] pathElements = path.Split(new[]
         {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
+        byte[] file;
+        string filename = pathElements[0].ToUpperInvariant();
 
-            byte[] file;
-            string filename = pathElements[0].ToUpperInvariant();
+        if(filename.Length > 30)
+            return ErrorNumber.NameTooLong;
 
-            if(filename.Length > 30)
-                return ErrorNumber.NameTooLong;
-
-            if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
-                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
-                          string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
-                if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
-                    file = _catalogBlocks;
-                else if(string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)
-                    file = _vtocBlocks;
-                else
-                    file = _bootBlocks;
+        if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
+                      string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
+                      string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
+            if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
+                file = _catalogBlocks;
+            else if(string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)
+                file = _vtocBlocks;
             else
+                file = _bootBlocks;
+        else
+        {
+            if(!_fileCache.TryGetValue(filename, out file))
             {
+                ErrorNumber error = CacheFile(filename);
+
+                if(error != ErrorNumber.NoError)
+                    return error;
+
                 if(!_fileCache.TryGetValue(filename, out file))
-                {
-                    ErrorNumber error = CacheFile(filename);
-
-                    if(error != ErrorNumber.NoError)
-                        return error;
-
-                    if(!_fileCache.TryGetValue(filename, out file))
-                        return ErrorNumber.InvalidArgument;
-                }
+                    return ErrorNumber.InvalidArgument;
             }
-
-            if(offset >= file.Length)
-                return ErrorNumber.InvalidArgument;
-
-            if(size + offset >= file.Length)
-                size = file.Length - offset;
-
-            buf = new byte[size];
-
-            Array.Copy(file, offset, buf, 0, size);
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Stat(string path, out FileEntryInfo stat)
+        if(offset >= file.Length)
+            return ErrorNumber.InvalidArgument;
+
+        if(size + offset >= file.Length)
+            size = file.Length - offset;
+
+        buf = new byte[size];
+
+        Array.Copy(file, offset, buf, 0, size);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Stat(string path, out FileEntryInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            stat = null;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        string filename = pathElements[0].ToUpperInvariant();
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
+        if(filename.Length > 30)
+            return ErrorNumber.NameTooLong;
 
-            string filename = pathElements[0].ToUpperInvariant();
+        if(!_fileCache.ContainsKey(filename))
+            return ErrorNumber.NoSuchFile;
 
-            if(filename.Length > 30)
-                return ErrorNumber.NameTooLong;
+        stat = new FileEntryInfo();
 
-            if(!_fileCache.ContainsKey(filename))
-                return ErrorNumber.NoSuchFile;
+        _fileSizeCache.TryGetValue(filename, out int fileSize);
+        GetAttributes(path, out FileAttributes attrs);
 
-            stat = new FileEntryInfo();
+        if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
+                      string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
+                      string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
+        {
+            if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
+                stat.Length = _catalogBlocks.Length;
+            else if(string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0)
+                stat.Length = _bootBlocks.Length;
+            else if(string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)
+                stat.Length = _vtocBlocks.Length;
 
-            _fileSizeCache.TryGetValue(filename, out int fileSize);
-            GetAttributes(path, out FileAttributes attrs);
-
-            if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
-                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
-                          string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
-            {
-                if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
-                    stat.Length = _catalogBlocks.Length;
-                else if(string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0)
-                    stat.Length = _bootBlocks.Length;
-                else if(string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)
-                    stat.Length = _vtocBlocks.Length;
-
-                stat.Blocks = stat.Length / _vtoc.bytesPerSector;
-            }
-            else
-            {
-                stat.Length = fileSize;
-                stat.Blocks = stat.Length / _vtoc.bytesPerSector;
-            }
-
-            stat.Attributes = attrs;
-            stat.BlockSize  = _vtoc.bytesPerSector;
-            stat.Links      = 1;
-
-            return ErrorNumber.NoError;
+            stat.Blocks = stat.Length / _vtoc.bytesPerSector;
+        }
+        else
+        {
+            stat.Length = fileSize;
+            stat.Blocks = stat.Length / _vtoc.bytesPerSector;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
+        stat.Attributes = attrs;
+        stat.BlockSize  = _vtoc.bytesPerSector;
+        stat.Links      = 1;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
+    {
+        deviceBlock = 0;
+
+        // TODO: Not really important.
+        return !_mounted ? ErrorNumber.AccessDenied : ErrorNumber.NotImplemented;
+    }
+
+    ErrorNumber CacheFile(string path)
+    {
+        string[] pathElements = path.Split(new[]
         {
-            deviceBlock = 0;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            // TODO: Not really important.
-            return !_mounted ? ErrorNumber.AccessDenied : ErrorNumber.NotImplemented;
-        }
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-        ErrorNumber CacheFile(string path)
+        string filename = pathElements[0].ToUpperInvariant();
+
+        if(filename.Length > 30)
+            return ErrorNumber.NameTooLong;
+
+        if(!_catalogCache.TryGetValue(filename, out ushort ts))
+            return ErrorNumber.NoSuchFile;
+
+        ulong  lba           = (ulong)((((ts & 0xFF00) >> 8) * _sectorsPerTrack) + (ts & 0xFF));
+        var    fileMs        = new MemoryStream();
+        var    tsListMs      = new MemoryStream();
+        ushort expectedBlock = 0;
+
+        while(lba != 0)
         {
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
-
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
-
-            string filename = pathElements[0].ToUpperInvariant();
-
-            if(filename.Length > 30)
-                return ErrorNumber.NameTooLong;
-
-            if(!_catalogCache.TryGetValue(filename, out ushort ts))
-                return ErrorNumber.NoSuchFile;
-
-            ulong  lba           = (ulong)((((ts & 0xFF00) >> 8) * _sectorsPerTrack) + (ts & 0xFF));
-            var    fileMs        = new MemoryStream();
-            var    tsListMs      = new MemoryStream();
-            ushort expectedBlock = 0;
-
-            while(lba != 0)
-            {
-                _usedSectors++;
-                ErrorNumber errno = _device.ReadSector(lba, out byte[] tsSectorB);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                if(_debug)
-                    tsListMs.Write(tsSectorB, 0, tsSectorB.Length);
-
-                // Read the track/sector list sector
-                TrackSectorList tsSector = Marshal.ByteArrayToStructureLittleEndian<TrackSectorList>(tsSectorB);
-
-                if(tsSector.sectorOffset > expectedBlock)
-                {
-                    byte[] hole = new byte[(tsSector.sectorOffset - expectedBlock) * _vtoc.bytesPerSector];
-                    fileMs.Write(hole, 0, hole.Length);
-                    expectedBlock = tsSector.sectorOffset;
-                }
-
-                foreach(TrackSectorListEntry entry in tsSector.entries)
-                {
-                    _track1UsedByFiles |= entry.track == 1;
-                    _track2UsedByFiles |= entry.track == 2;
-                    _usedSectors++;
-
-                    ulong blockLba = (ulong)((entry.track * _sectorsPerTrack) + entry.sector);
-
-                    if(blockLba == 0)
-                        break;
-
-                    errno = _device.ReadSector(blockLba, out byte[] fileBlock);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    fileMs.Write(fileBlock, 0, fileBlock.Length);
-                    expectedBlock++;
-                }
-
-                lba = (ulong)((tsSector.nextListTrack * _sectorsPerTrack) + tsSector.nextListSector);
-            }
-
-            if(_fileCache.ContainsKey(filename))
-                _fileCache.Remove(filename);
-
-            if(_extentCache.ContainsKey(filename))
-                _extentCache.Remove(filename);
-
-            _fileCache.Add(filename, fileMs.ToArray());
-            _extentCache.Add(filename, tsListMs.ToArray());
-
-            return ErrorNumber.NoError;
-        }
-
-        ErrorNumber CacheAllFiles()
-        {
-            _fileCache   = new Dictionary<string, byte[]>();
-            _extentCache = new Dictionary<string, byte[]>();
-
-            foreach(ErrorNumber error in _catalogCache.Keys.Select(CacheFile).
-                                                       Where(error => error != ErrorNumber.NoError))
-                return error;
-
-            uint tracksOnBoot = 1;
-
-            if(!_track1UsedByFiles)
-                tracksOnBoot++;
-
-            if(!_track2UsedByFiles)
-                tracksOnBoot++;
-
-            ErrorNumber errno = _device.ReadSectors(0, (uint)(tracksOnBoot * _sectorsPerTrack), out _bootBlocks);
+            _usedSectors++;
+            ErrorNumber errno = _device.ReadSector(lba, out byte[] tsSectorB);
 
             if(errno != ErrorNumber.NoError)
                 return errno;
 
-            _usedSectors += (uint)(_bootBlocks.Length / _vtoc.bytesPerSector);
+            if(_debug)
+                tsListMs.Write(tsSectorB, 0, tsSectorB.Length);
 
-            return ErrorNumber.NoError;
+            // Read the track/sector list sector
+            TrackSectorList tsSector = Marshal.ByteArrayToStructureLittleEndian<TrackSectorList>(tsSectorB);
+
+            if(tsSector.sectorOffset > expectedBlock)
+            {
+                byte[] hole = new byte[(tsSector.sectorOffset - expectedBlock) * _vtoc.bytesPerSector];
+                fileMs.Write(hole, 0, hole.Length);
+                expectedBlock = tsSector.sectorOffset;
+            }
+
+            foreach(TrackSectorListEntry entry in tsSector.entries)
+            {
+                _track1UsedByFiles |= entry.track == 1;
+                _track2UsedByFiles |= entry.track == 2;
+                _usedSectors++;
+
+                ulong blockLba = (ulong)((entry.track * _sectorsPerTrack) + entry.sector);
+
+                if(blockLba == 0)
+                    break;
+
+                errno = _device.ReadSector(blockLba, out byte[] fileBlock);
+
+                if(errno != ErrorNumber.NoError)
+                    return errno;
+
+                fileMs.Write(fileBlock, 0, fileBlock.Length);
+                expectedBlock++;
+            }
+
+            lba = (ulong)((tsSector.nextListTrack * _sectorsPerTrack) + tsSector.nextListSector);
         }
+
+        if(_fileCache.ContainsKey(filename))
+            _fileCache.Remove(filename);
+
+        if(_extentCache.ContainsKey(filename))
+            _extentCache.Remove(filename);
+
+        _fileCache.Add(filename, fileMs.ToArray());
+        _extentCache.Add(filename, tsListMs.ToArray());
+
+        return ErrorNumber.NoError;
+    }
+
+    ErrorNumber CacheAllFiles()
+    {
+        _fileCache   = new Dictionary<string, byte[]>();
+        _extentCache = new Dictionary<string, byte[]>();
+
+        foreach(ErrorNumber error in _catalogCache.Keys.Select(CacheFile).
+                                                   Where(error => error != ErrorNumber.NoError))
+            return error;
+
+        uint tracksOnBoot = 1;
+
+        if(!_track1UsedByFiles)
+            tracksOnBoot++;
+
+        if(!_track2UsedByFiles)
+            tracksOnBoot++;
+
+        ErrorNumber errno = _device.ReadSectors(0, (uint)(tracksOnBoot * _sectorsPerTrack), out _bootBlocks);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        _usedSectors += (uint)(_bootBlocks.Length / _vtoc.bytesPerSector);
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleDOS/Info.cs b/Aaru.Filesystems/AppleDOS/Info.cs
index ab1637877..f638405ab 100644
--- a/Aaru.Filesystems/AppleDOS/Info.cs
+++ b/Aaru.Filesystems/AppleDOS/Info.cs
@@ -39,76 +39,75 @@ using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class AppleDOS
 {
-    public sealed partial class AppleDOS
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(imagePlugin.Info.Sectors != 455 &&
+           imagePlugin.Info.Sectors != 560)
+            return false;
+
+        if(partition.Start             > 0 ||
+           imagePlugin.Info.SectorSize != 256)
+            return false;
+
+        int spt = imagePlugin.Info.Sectors == 455 ? 13 : 16;
+
+        var errno = imagePlugin.ReadSector((ulong)(17 * spt), out byte[] vtocB);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        _vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(vtocB);
+
+        return _vtoc.catalogSector   < spt  && _vtoc.maxTrackSectorPairsPerSector <= 122 &&
+               _vtoc.sectorsPerTrack == spt && _vtoc.bytesPerSector               == 256;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? new Apple2();
+        information = "";
+        var sb = new StringBuilder();
+
+        int spt = imagePlugin.Info.Sectors == 455 ? 13 : 16;
+
+        var errno = imagePlugin.ReadSector((ulong)(17 * spt), out byte[] vtocB);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        _vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(vtocB);
+
+        sb.AppendLine("Apple DOS File System");
+        sb.AppendLine();
+
+        sb.AppendFormat("Catalog starts at sector {0} of track {1}", _vtoc.catalogSector, _vtoc.catalogTrack).
+           AppendLine();
+
+        sb.AppendFormat("File system initialized by DOS release {0}", _vtoc.dosRelease).AppendLine();
+        sb.AppendFormat("Disk volume number {0}", _vtoc.volumeNumber).AppendLine();
+        sb.AppendFormat("Sectors allocated at most in track {0}", _vtoc.lastAllocatedSector).AppendLine();
+        sb.AppendFormat("{0} tracks in volume", _vtoc.tracks).AppendLine();
+        sb.AppendFormat("{0} sectors per track", _vtoc.sectorsPerTrack).AppendLine();
+        sb.AppendFormat("{0} bytes per sector", _vtoc.bytesPerSector).AppendLine();
+
+        sb.AppendFormat("Track allocation is {0}", _vtoc.allocationDirection > 0 ? "forward" : "reverse").
+           AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            if(imagePlugin.Info.Sectors != 455 &&
-               imagePlugin.Info.Sectors != 560)
-                return false;
-
-            if(partition.Start             > 0 ||
-               imagePlugin.Info.SectorSize != 256)
-                return false;
-
-            int spt = imagePlugin.Info.Sectors == 455 ? 13 : 16;
-
-            var errno = imagePlugin.ReadSector((ulong)(17 * spt), out byte[] vtocB);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            _vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(vtocB);
-
-            return _vtoc.catalogSector   < spt  && _vtoc.maxTrackSectorPairsPerSector <= 122 &&
-                   _vtoc.sectorsPerTrack == spt && _vtoc.bytesPerSector               == 256;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? new Apple2();
-            information = "";
-            var sb = new StringBuilder();
-
-            int spt = imagePlugin.Info.Sectors == 455 ? 13 : 16;
-
-            var errno = imagePlugin.ReadSector((ulong)(17 * spt), out byte[] vtocB);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            _vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(vtocB);
-
-            sb.AppendLine("Apple DOS File System");
-            sb.AppendLine();
-
-            sb.AppendFormat("Catalog starts at sector {0} of track {1}", _vtoc.catalogSector, _vtoc.catalogTrack).
-               AppendLine();
-
-            sb.AppendFormat("File system initialized by DOS release {0}", _vtoc.dosRelease).AppendLine();
-            sb.AppendFormat("Disk volume number {0}", _vtoc.volumeNumber).AppendLine();
-            sb.AppendFormat("Sectors allocated at most in track {0}", _vtoc.lastAllocatedSector).AppendLine();
-            sb.AppendFormat("{0} tracks in volume", _vtoc.tracks).AppendLine();
-            sb.AppendFormat("{0} sectors per track", _vtoc.sectorsPerTrack).AppendLine();
-            sb.AppendFormat("{0} bytes per sector", _vtoc.bytesPerSector).AppendLine();
-
-            sb.AppendFormat("Track allocation is {0}", _vtoc.allocationDirection > 0 ? "forward" : "reverse").
-               AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Bootable    = true,
-                Clusters    = imagePlugin.Info.Sectors,
-                ClusterSize = imagePlugin.Info.SectorSize,
-                Type        = "Apple DOS"
-            };
-        }
+            Bootable    = true,
+            Clusters    = imagePlugin.Info.Sectors,
+            ClusterSize = imagePlugin.Info.SectorSize,
+            Type        = "Apple DOS"
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleDOS/Structs.cs b/Aaru.Filesystems/AppleDOS/Structs.cs
index e36475c06..0b6863146 100644
--- a/Aaru.Filesystems/AppleDOS/Structs.cs
+++ b/Aaru.Filesystems/AppleDOS/Structs.cs
@@ -32,79 +32,78 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class AppleDOS
 {
-    public sealed partial class AppleDOS
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Vtoc
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Vtoc
-        {
-            public readonly byte unused1;
-            public readonly byte catalogTrack;
-            public readonly byte catalogSector;
-            public readonly byte dosRelease;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] unused2;
-            public readonly byte volumeNumber;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] unused3;
-            public readonly byte maxTrackSectorPairsPerSector;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] unused4;
-            public readonly byte  lastAllocatedSector;
-            public readonly sbyte allocationDirection;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] unused5;
-            public readonly byte   tracks;
-            public readonly byte   sectorsPerTrack;
-            public readonly ushort bytesPerSector;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 200)]
-            public readonly byte[] bitmap;
-        }
+        public readonly byte unused1;
+        public readonly byte catalogTrack;
+        public readonly byte catalogSector;
+        public readonly byte dosRelease;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] unused2;
+        public readonly byte volumeNumber;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] unused3;
+        public readonly byte maxTrackSectorPairsPerSector;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] unused4;
+        public readonly byte  lastAllocatedSector;
+        public readonly sbyte allocationDirection;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] unused5;
+        public readonly byte   tracks;
+        public readonly byte   sectorsPerTrack;
+        public readonly ushort bytesPerSector;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 200)]
+        public readonly byte[] bitmap;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CatalogSector
-        {
-            public readonly byte unused1;
-            public readonly byte trackOfNext;
-            public readonly byte sectorOfNext;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] unused2;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)]
-            public readonly FileEntry[] entries;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CatalogSector
+    {
+        public readonly byte unused1;
+        public readonly byte trackOfNext;
+        public readonly byte sectorOfNext;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] unused2;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)]
+        public readonly FileEntry[] entries;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct FileEntry
-        {
-            public readonly byte extentTrack;
-            public readonly byte extentSector;
-            public readonly byte typeAndFlags;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 30)]
-            public readonly byte[] filename;
-            public readonly ushort length;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct FileEntry
+    {
+        public readonly byte extentTrack;
+        public readonly byte extentSector;
+        public readonly byte typeAndFlags;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 30)]
+        public readonly byte[] filename;
+        public readonly ushort length;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct TrackSectorList
-        {
-            public readonly byte unused1;
-            public readonly byte nextListTrack;
-            public readonly byte nextListSector;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] unused2;
-            public readonly ushort sectorOffset;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] unused3;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 122)]
-            public readonly TrackSectorListEntry[] entries;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct TrackSectorList
+    {
+        public readonly byte unused1;
+        public readonly byte nextListTrack;
+        public readonly byte nextListSector;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] unused2;
+        public readonly ushort sectorOffset;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] unused3;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 122)]
+        public readonly TrackSectorListEntry[] entries;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct TrackSectorListEntry
-        {
-            public readonly byte track;
-            public readonly byte sector;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct TrackSectorListEntry
+    {
+        public readonly byte track;
+        public readonly byte sector;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleDOS/Super.cs b/Aaru.Filesystems/AppleDOS/Super.cs
index feb2044a7..ff0d91bab 100644
--- a/Aaru.Filesystems/AppleDOS/Super.cs
+++ b/Aaru.Filesystems/AppleDOS/Super.cs
@@ -41,124 +41,123 @@ using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class AppleDOS
 {
-    public sealed partial class AppleDOS
+    /// <inheritdoc />
+    public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                             Dictionary<string, string> options, string @namespace)
     {
-        /// <inheritdoc />
-        public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
-                                 Dictionary<string, string> options, string @namespace)
+        _device  = imagePlugin;
+        _start   = partition.Start;
+        Encoding = encoding ?? new Apple2();
+
+        if(_device.Info.Sectors != 455 &&
+           _device.Info.Sectors != 560)
         {
-            _device  = imagePlugin;
-            _start   = partition.Start;
-            Encoding = encoding ?? new Apple2();
+            AaruConsole.DebugWriteLine("Apple DOS plugin", "Incorrect device size.");
 
-            if(_device.Info.Sectors != 455 &&
-               _device.Info.Sectors != 560)
-            {
-                AaruConsole.DebugWriteLine("Apple DOS plugin", "Incorrect device size.");
-
-                return ErrorNumber.InOutError;
-            }
-
-            if(_start > 0)
-            {
-                AaruConsole.DebugWriteLine("Apple DOS plugin", "Partitions are not supported.");
-
-                return ErrorNumber.InOutError;
-            }
-
-            if(_device.Info.SectorSize != 256)
-            {
-                AaruConsole.DebugWriteLine("Apple DOS plugin", "Incorrect sector size.");
-
-                return ErrorNumber.InOutError;
-            }
-
-            _sectorsPerTrack = _device.Info.Sectors == 455 ? 13 : 16;
-
-            // Read the VTOC
-            ErrorNumber error = _device.ReadSector((ulong)(17 * _sectorsPerTrack), out _vtocBlocks);
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            _vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(_vtocBlocks);
-
-            _track1UsedByFiles = false;
-            _track2UsedByFiles = false;
-            _usedSectors       = 1;
-
-            error = ReadCatalog();
-
-            if(error != ErrorNumber.NoError)
-            {
-                AaruConsole.DebugWriteLine("Apple DOS plugin", "Unable to read catalog.");
-
-                return error;
-            }
-
-            error = CacheAllFiles();
-
-            if(error != ErrorNumber.NoError)
-            {
-                AaruConsole.DebugWriteLine("Apple DOS plugin", "Unable cache all files.");
-
-                return error;
-            }
-
-            // Create XML metadata for mounted filesystem
-            XmlFsType = new FileSystemType
-            {
-                Bootable              = true,
-                Clusters              = _device.Info.Sectors,
-                ClusterSize           = _vtoc.bytesPerSector,
-                Files                 = (ulong)_catalogCache.Count,
-                FilesSpecified        = true,
-                FreeClustersSpecified = true,
-                Type                  = "Apple DOS"
-            };
-
-            XmlFsType.FreeClusters = XmlFsType.Clusters - _usedSectors;
-
-            options ??= GetDefaultOptions();
-
-            if(options.TryGetValue("debug", out string debugString))
-                bool.TryParse(debugString, out _debug);
-
-            _mounted = true;
-
-            return ErrorNumber.NoError;
+            return ErrorNumber.InOutError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Unmount()
+        if(_start > 0)
         {
-            _mounted       = false;
-            _extentCache   = null;
-            _fileCache     = null;
-            _catalogCache  = null;
-            _fileSizeCache = null;
+            AaruConsole.DebugWriteLine("Apple DOS plugin", "Partitions are not supported.");
 
-            return ErrorNumber.NoError;
+            return ErrorNumber.InOutError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber StatFs(out FileSystemInfo stat)
+        if(_device.Info.SectorSize != 256)
         {
-            stat = new FileSystemInfo
-            {
-                Blocks         = _device.Info.Sectors,
-                FilenameLength = 30,
-                Files          = (ulong)_catalogCache.Count,
-                PluginId       = Id,
-                Type           = "Apple DOS"
-            };
+            AaruConsole.DebugWriteLine("Apple DOS plugin", "Incorrect sector size.");
 
-            stat.FreeFiles  = _totalFileEntries - stat.Files;
-            stat.FreeBlocks = stat.Blocks       - _usedSectors;
-
-            return ErrorNumber.NoError;
+            return ErrorNumber.InOutError;
         }
+
+        _sectorsPerTrack = _device.Info.Sectors == 455 ? 13 : 16;
+
+        // Read the VTOC
+        ErrorNumber error = _device.ReadSector((ulong)(17 * _sectorsPerTrack), out _vtocBlocks);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        _vtoc = Marshal.ByteArrayToStructureLittleEndian<Vtoc>(_vtocBlocks);
+
+        _track1UsedByFiles = false;
+        _track2UsedByFiles = false;
+        _usedSectors       = 1;
+
+        error = ReadCatalog();
+
+        if(error != ErrorNumber.NoError)
+        {
+            AaruConsole.DebugWriteLine("Apple DOS plugin", "Unable to read catalog.");
+
+            return error;
+        }
+
+        error = CacheAllFiles();
+
+        if(error != ErrorNumber.NoError)
+        {
+            AaruConsole.DebugWriteLine("Apple DOS plugin", "Unable cache all files.");
+
+            return error;
+        }
+
+        // Create XML metadata for mounted filesystem
+        XmlFsType = new FileSystemType
+        {
+            Bootable              = true,
+            Clusters              = _device.Info.Sectors,
+            ClusterSize           = _vtoc.bytesPerSector,
+            Files                 = (ulong)_catalogCache.Count,
+            FilesSpecified        = true,
+            FreeClustersSpecified = true,
+            Type                  = "Apple DOS"
+        };
+
+        XmlFsType.FreeClusters = XmlFsType.Clusters - _usedSectors;
+
+        options ??= GetDefaultOptions();
+
+        if(options.TryGetValue("debug", out string debugString))
+            bool.TryParse(debugString, out _debug);
+
+        _mounted = true;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Unmount()
+    {
+        _mounted       = false;
+        _extentCache   = null;
+        _fileCache     = null;
+        _catalogCache  = null;
+        _fileSizeCache = null;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber StatFs(out FileSystemInfo stat)
+    {
+        stat = new FileSystemInfo
+        {
+            Blocks         = _device.Info.Sectors,
+            FilenameLength = 30,
+            Files          = (ulong)_catalogCache.Count,
+            PluginId       = Id,
+            Type           = "Apple DOS"
+        };
+
+        stat.FreeFiles  = _totalFileEntries - stat.Files;
+        stat.FreeBlocks = stat.Blocks       - _usedSectors;
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleDOS/Xattr.cs b/Aaru.Filesystems/AppleDOS/Xattr.cs
index 031a7763d..6193b2241 100644
--- a/Aaru.Filesystems/AppleDOS/Xattr.cs
+++ b/Aaru.Filesystems/AppleDOS/Xattr.cs
@@ -35,99 +35,98 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class AppleDOS
 {
-    public sealed partial class AppleDOS
+    /// <inheritdoc />
+    public ErrorNumber ListXAttr(string path, out List<string> xattrs)
     {
-        /// <inheritdoc />
-        public ErrorNumber ListXAttr(string path, out List<string> xattrs)
+        xattrs = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            xattrs = null;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        string filename = pathElements[0].ToUpperInvariant();
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
+        if(filename.Length > 30)
+            return ErrorNumber.NameTooLong;
 
-            string filename = pathElements[0].ToUpperInvariant();
+        xattrs = new List<string>();
 
-            if(filename.Length > 30)
-                return ErrorNumber.NameTooLong;
-
-            xattrs = new List<string>();
-
-            if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
-                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
-                          string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)) {}
-            else
-            {
-                if(!_catalogCache.ContainsKey(filename))
-                    return ErrorNumber.NoSuchFile;
-
-                xattrs.Add("com.apple.dos.type");
-
-                if(_debug)
-                    xattrs.Add("com.apple.dos.tracksectorlist");
-            }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
+        if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
+                      string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
+                      string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0)) {}
+        else
         {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
-
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
-
-            string filename = pathElements[0].ToUpperInvariant();
-
-            if(filename.Length > 30)
-                return ErrorNumber.NameTooLong;
-
-            if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
-                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
-                          string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
-                return ErrorNumber.NoSuchExtendedAttribute;
-
             if(!_catalogCache.ContainsKey(filename))
                 return ErrorNumber.NoSuchFile;
 
-            if(string.Compare(xattr, "com.apple.dos.type", StringComparison.InvariantCulture) == 0)
-            {
-                if(!_fileTypeCache.TryGetValue(filename, out byte type))
-                    return ErrorNumber.InvalidArgument;
+            xattrs.Add("com.apple.dos.type");
 
-                buf    = new byte[1];
-                buf[0] = type;
+            if(_debug)
+                xattrs.Add("com.apple.dos.tracksectorlist");
+        }
 
-                return ErrorNumber.NoError;
-            }
+        return ErrorNumber.NoError;
+    }
 
-            if(string.Compare(xattr, "com.apple.dos.tracksectorlist", StringComparison.InvariantCulture) != 0 ||
-               !_debug)
-                return ErrorNumber.NoSuchExtendedAttribute;
+    /// <inheritdoc />
+    public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
 
-            if(!_extentCache.TryGetValue(filename, out byte[] ts))
+        string[] pathElements = path.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
+
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
+
+        string filename = pathElements[0].ToUpperInvariant();
+
+        if(filename.Length > 30)
+            return ErrorNumber.NameTooLong;
+
+        if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
+                      string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 ||
+                      string.Compare(path, "$Vtoc", StringComparison.InvariantCulture) == 0))
+            return ErrorNumber.NoSuchExtendedAttribute;
+
+        if(!_catalogCache.ContainsKey(filename))
+            return ErrorNumber.NoSuchFile;
+
+        if(string.Compare(xattr, "com.apple.dos.type", StringComparison.InvariantCulture) == 0)
+        {
+            if(!_fileTypeCache.TryGetValue(filename, out byte type))
                 return ErrorNumber.InvalidArgument;
 
-            buf = new byte[ts.Length];
-            Array.Copy(ts, 0, buf, 0, buf.Length);
+            buf    = new byte[1];
+            buf[0] = type;
 
             return ErrorNumber.NoError;
         }
+
+        if(string.Compare(xattr, "com.apple.dos.tracksectorlist", StringComparison.InvariantCulture) != 0 ||
+           !_debug)
+            return ErrorNumber.NoSuchExtendedAttribute;
+
+        if(!_extentCache.TryGetValue(filename, out byte[] ts))
+            return ErrorNumber.InvalidArgument;
+
+        buf = new byte[ts.Length];
+        Array.Copy(ts, 0, buf, 0, buf.Length);
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleHFS/AppleHFS.cs b/Aaru.Filesystems/AppleHFS/AppleHFS.cs
index 7158c88c5..7861b2d33 100644
--- a/Aaru.Filesystems/AppleHFS/AppleHFS.cs
+++ b/Aaru.Filesystems/AppleHFS/AppleHFS.cs
@@ -36,23 +36,22 @@ using System.Text;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh
+// https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
+/// <inheritdoc />
+/// <summary>Implements detection of the Apple Hierarchical File System (HFS)</summary>
+public sealed partial class AppleHFS : IFilesystem
 {
-    // Information from Inside Macintosh
-    // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
     /// <inheritdoc />
-    /// <summary>Implements detection of the Apple Hierarchical File System (HFS)</summary>
-    public sealed partial class AppleHFS : IFilesystem
-    {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Apple Hierarchical File System";
-        /// <inheritdoc />
-        public Guid Id => new Guid("36405F8D-0D26-6ECC-0BBB-1D5225FF404F");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-    }
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Apple Hierarchical File System";
+    /// <inheritdoc />
+    public Guid Id => new Guid("36405F8D-0D26-6ECC-0BBB-1D5225FF404F");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleHFS/Consts.cs b/Aaru.Filesystems/AppleHFS/Consts.cs
index bb0567166..e72676063 100644
--- a/Aaru.Filesystems/AppleHFS/Consts.cs
+++ b/Aaru.Filesystems/AppleHFS/Consts.cs
@@ -34,22 +34,21 @@ using System.Diagnostics.CodeAnalysis;
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh
+// https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class AppleHFS
 {
-    // Information from Inside Macintosh
-    // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class AppleHFS
-    {
-        /// <summary>Parent ID of the root directory.</summary>
-        const uint kRootParentCnid = 1;
-        /// <summary>Directory ID of the root directory.</summary>
-        const uint kRootCnid = 2;
-        /// <summary>File number of the extents file.</summary>
-        const uint kExtentsFileCnid = 3;
-        /// <summary>File number of the catalog file.</summary>
-        const uint kCatalogFileCnid = 4;
-        /// <summary>File number of the bad allocation block file.</summary>
-        const uint kBadBlocksFileCnid = 5;
-    }
+    /// <summary>Parent ID of the root directory.</summary>
+    const uint kRootParentCnid = 1;
+    /// <summary>Directory ID of the root directory.</summary>
+    const uint kRootCnid = 2;
+    /// <summary>File number of the extents file.</summary>
+    const uint kExtentsFileCnid = 3;
+    /// <summary>File number of the catalog file.</summary>
+    const uint kCatalogFileCnid = 4;
+    /// <summary>File number of the bad allocation block file.</summary>
+    const uint kBadBlocksFileCnid = 5;
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleHFS/Enums.cs b/Aaru.Filesystems/AppleHFS/Enums.cs
index 852e7ff58..fca41fc07 100644
--- a/Aaru.Filesystems/AppleHFS/Enums.cs
+++ b/Aaru.Filesystems/AppleHFS/Enums.cs
@@ -34,37 +34,36 @@
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class AppleHFS
 {
-    public sealed partial class AppleHFS
+    enum NodeType : sbyte
     {
-        enum NodeType : sbyte
-        {
-            /// <summary>Index node</summary>
-            ndIndxNode = 0,
-            /// <summary>Header node</summary>
-            ndHdrNode = 1,
-            /// <summary>Map node</summary>
-            ndMapNode = 2,
-            /// <summary>Leaf node</summary>
-            ndLeafNode = -1
-        }
+        /// <summary>Index node</summary>
+        ndIndxNode = 0,
+        /// <summary>Header node</summary>
+        ndHdrNode = 1,
+        /// <summary>Map node</summary>
+        ndMapNode = 2,
+        /// <summary>Leaf node</summary>
+        ndLeafNode = -1
+    }
 
-        enum CatDataType : sbyte
-        {
-            /// <summary>Directory record</summary>
-            cdrDirRec = 1,
-            /// <summary>File record</summary>
-            cdrFilRec = 2,
-            /// <summary>Directory thread record</summary>
-            cdrThdRec = 3,
-            /// <summary>File thread record</summary>
-            cdrFThdRec = 4
-        }
+    enum CatDataType : sbyte
+    {
+        /// <summary>Directory record</summary>
+        cdrDirRec = 1,
+        /// <summary>File record</summary>
+        cdrFilRec = 2,
+        /// <summary>Directory thread record</summary>
+        cdrThdRec = 3,
+        /// <summary>File thread record</summary>
+        cdrFThdRec = 4
+    }
 
-        enum ForkType : sbyte
-        {
-            Data = 0, Resource = -1
-        }
+    enum ForkType : sbyte
+    {
+        Data = 0, Resource = -1
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleHFS/Info.cs b/Aaru.Filesystems/AppleHFS/Info.cs
index f5a76027d..626ed04e3 100644
--- a/Aaru.Filesystems/AppleHFS/Info.cs
+++ b/Aaru.Filesystems/AppleHFS/Info.cs
@@ -39,288 +39,287 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh
+// https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
+public sealed partial class AppleHFS
 {
-    // Information from Inside Macintosh
-    // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
-    public sealed partial class AppleHFS
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(2 + partition.Start >= partition.End)
+            return false;
+
+        byte[]      mdbSector;
+        ushort      drSigWord;
+        ErrorNumber errno;
+
+        if(imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448 ||
+           imagePlugin.Info.SectorSize == 2048)
         {
-            if(2 + partition.Start >= partition.End)
+            errno = imagePlugin.ReadSectors(partition.Start, 2, out mdbSector);
+
+            if(errno != ErrorNumber.NoError)
                 return false;
 
-            byte[]      mdbSector;
-            ushort      drSigWord;
-            ErrorNumber errno;
-
-            if(imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448 ||
-               imagePlugin.Info.SectorSize == 2048)
+            foreach(int offset in new[]
+                    {
+                        0, 0x200, 0x400, 0x600, 0x800, 0xA00
+                    }.Where(offset => mdbSector.Length >= offset + 0x7C + 2))
             {
-                errno = imagePlugin.ReadSectors(partition.Start, 2, out mdbSector);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                foreach(int offset in new[]
-                {
-                    0, 0x200, 0x400, 0x600, 0x800, 0xA00
-                }.Where(offset => mdbSector.Length >= offset + 0x7C + 2))
-                {
-                    drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, offset);
-
-                    if(drSigWord != AppleCommon.HFS_MAGIC)
-                        continue;
-
-                    drSigWord =
-                        BigEndianBitConverter.ToUInt16(mdbSector, offset + 0x7C); // Seek to embedded HFS+ signature
-
-                    return drSigWord != AppleCommon.HFSP_MAGIC;
-                }
-            }
-            else
-            {
-                errno = imagePlugin.ReadSector(2 + partition.Start, out mdbSector);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                if(mdbSector.Length < 0x7C + 2)
-                    return false;
-
-                drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, 0);
+                drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, offset);
 
                 if(drSigWord != AppleCommon.HFS_MAGIC)
-                    return false;
+                    continue;
 
-                drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, 0x7C); // Seek to embedded HFS+ signature
+                drSigWord =
+                    BigEndianBitConverter.ToUInt16(mdbSector, offset + 0x7C); // Seek to embedded HFS+ signature
 
                 return drSigWord != AppleCommon.HFSP_MAGIC;
             }
-
-            return false;
         }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        else
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("macintosh");
-            information = "";
+            errno = imagePlugin.ReadSector(2 + partition.Start, out mdbSector);
 
-            var sb = new StringBuilder();
+            if(errno != ErrorNumber.NoError)
+                return false;
 
-            byte[]      bbSector  = null;
-            byte[]      mdbSector = null;
-            ushort      drSigWord;
-            ErrorNumber errno;
+            if(mdbSector.Length < 0x7C + 2)
+                return false;
 
-            bool apmFromHddOnCd = false;
+            drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, 0);
 
-            if(imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448 ||
-               imagePlugin.Info.SectorSize == 2048)
-            {
-                errno = imagePlugin.ReadSectors(partition.Start, 2, out byte[] tmpSector);
+            if(drSigWord != AppleCommon.HFS_MAGIC)
+                return false;
 
-                if(errno != ErrorNumber.NoError)
-                    return;
+            drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, 0x7C); // Seek to embedded HFS+ signature
 
-                foreach(int offset in new[]
-                {
-                    0, 0x200, 0x400, 0x600, 0x800, 0xA00
-                })
-                {
-                    drSigWord = BigEndianBitConverter.ToUInt16(tmpSector, offset);
-
-                    if(drSigWord != AppleCommon.HFS_MAGIC)
-                        continue;
-
-                    bbSector  = new byte[1024];
-                    mdbSector = new byte[512];
-
-                    if(offset >= 0x400)
-                        Array.Copy(tmpSector, offset - 0x400, bbSector, 0, 1024);
-
-                    Array.Copy(tmpSector, offset, mdbSector, 0, 512);
-                    apmFromHddOnCd = true;
-
-                    break;
-                }
-
-                if(!apmFromHddOnCd)
-                    return;
-            }
-            else
-            {
-                errno = imagePlugin.ReadSector(2 + partition.Start, out mdbSector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, 0);
-
-                if(drSigWord == AppleCommon.HFS_MAGIC)
-                {
-                    errno = imagePlugin.ReadSector(partition.Start, out bbSector);
-
-                    if(errno != ErrorNumber.NoError)
-                        return;
-                }
-                else
-                    return;
-            }
-
-            MasterDirectoryBlock mdb = Marshal.ByteArrayToStructureBigEndian<MasterDirectoryBlock>(mdbSector);
-
-            sb.AppendLine("Apple Hierarchical File System");
-            sb.AppendLine();
-
-            if(apmFromHddOnCd)
-                sb.AppendLine("HFS uses 512 bytes/sector while device uses 2048 bytes/sector.").AppendLine();
-
-            sb.AppendLine("Master Directory Block:");
-            sb.AppendFormat("Creation date: {0}", DateHandlers.MacToDateTime(mdb.drCrDate)).AppendLine();
-            sb.AppendFormat("Last modification date: {0}", DateHandlers.MacToDateTime(mdb.drLsMod)).AppendLine();
-
-            if(mdb.drVolBkUp > 0)
-            {
-                sb.AppendFormat("Last backup date: {0}", DateHandlers.MacToDateTime(mdb.drVolBkUp)).AppendLine();
-                sb.AppendFormat("Backup sequence number: {0}", mdb.drVSeqNum).AppendLine();
-            }
-            else
-                sb.AppendLine("Volume has never been backed up");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.HardwareLock))
-                sb.AppendLine("Volume is locked by hardware.");
-
-            sb.AppendLine(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Unmounted) ? "Volume was unmonted."
-                              : "Volume is mounted.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.SparedBadBlocks))
-                sb.AppendLine("Volume has spared bad blocks.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.DoesNotNeedCache))
-                sb.AppendLine("Volume does not need cache.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.BootInconsistent))
-                sb.AppendLine("Boot volume is inconsistent.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.ReusedIds))
-                sb.AppendLine("There are reused CNIDs.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Journaled))
-                sb.AppendLine("Volume is journaled.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Inconsistent))
-                sb.AppendLine("Volume is seriously inconsistent.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.SoftwareLock))
-                sb.AppendLine("Volume is locked by software.");
-
-            sb.AppendFormat("{0} files on root directory", mdb.drNmFls).AppendLine();
-            sb.AppendFormat("{0} directories on root directory", mdb.drNmRtDirs).AppendLine();
-            sb.AppendFormat("{0} files on volume", mdb.drFilCnt).AppendLine();
-            sb.AppendFormat("{0} directories on volume", mdb.drDirCnt).AppendLine();
-            sb.AppendFormat("Volume write count: {0}", mdb.drWrCnt).AppendLine();
-
-            sb.AppendFormat("Volume bitmap starting sector (in 512-bytes): {0}", mdb.drVBMSt).AppendLine();
-            sb.AppendFormat("Next allocation block: {0}.", mdb.drAllocPtr).AppendLine();
-            sb.AppendFormat("{0} volume allocation blocks.", mdb.drNmAlBlks).AppendLine();
-            sb.AppendFormat("{0} bytes per allocation block.", mdb.drAlBlkSiz).AppendLine();
-            sb.AppendFormat("{0} bytes to allocate when extending a file.", mdb.drClpSiz).AppendLine();
-            sb.AppendFormat("{0} bytes to allocate when extending a Extents B-Tree.", mdb.drXTClpSiz).AppendLine();
-            sb.AppendFormat("{0} bytes to allocate when extending a Catalog B-Tree.", mdb.drCTClpSiz).AppendLine();
-            sb.AppendFormat("Sector of first allocation block: {0}", mdb.drAlBlSt).AppendLine();
-            sb.AppendFormat("Next unused CNID: {0}", mdb.drNxtCNID).AppendLine();
-            sb.AppendFormat("{0} unused allocation blocks.", mdb.drFreeBks).AppendLine();
-
-            sb.AppendFormat("{0} bytes in the Extents B-Tree", mdb.drXTFlSize).AppendLine();
-            sb.AppendFormat("{0} bytes in the Catalog B-Tree", mdb.drCTFlSize).AppendLine();
-
-            sb.AppendFormat("Volume name: {0}", StringHandlers.PascalToString(mdb.drVN, Encoding)).AppendLine();
-
-            sb.AppendLine("Finder info:");
-            sb.AppendFormat("CNID of bootable system's directory: {0}", mdb.drFndrInfo0).AppendLine();
-            sb.AppendFormat("CNID of first-run application's directory: {0}", mdb.drFndrInfo1).AppendLine();
-            sb.AppendFormat("CNID of previously opened directory: {0}", mdb.drFndrInfo2).AppendLine();
-            sb.AppendFormat("CNID of bootable Mac OS 8 or 9 directory: {0}", mdb.drFndrInfo3).AppendLine();
-            sb.AppendFormat("CNID of bootable Mac OS X directory: {0}", mdb.drFndrInfo5).AppendLine();
-
-            if(mdb.drFndrInfo6 != 0 &&
-               mdb.drFndrInfo7 != 0)
-                sb.AppendFormat("Mac OS X Volume ID: {0:X8}{1:X8}", mdb.drFndrInfo6, mdb.drFndrInfo7).AppendLine();
-
-            if(mdb.drEmbedSigWord == AppleCommon.HFSP_MAGIC)
-            {
-                sb.AppendLine("Volume wraps a HFS+ volume.");
-                sb.AppendFormat("Starting block of the HFS+ volume: {0}", mdb.xdrStABNt).AppendLine();
-                sb.AppendFormat("Allocations blocks of the HFS+ volume: {0}", mdb.xdrNumABlks).AppendLine();
-            }
-            else
-            {
-                sb.AppendFormat("{0} blocks in volume cache", mdb.drVCSize).AppendLine();
-                sb.AppendFormat("{0} blocks in volume bitmap cache", mdb.drVBMCSize).AppendLine();
-                sb.AppendFormat("{0} blocks in volume common cache", mdb.drCtlCSize).AppendLine();
-            }
-
-            string bootBlockInfo = AppleCommon.GetBootBlockInformation(bbSector, Encoding);
-
-            if(bootBlockInfo != null)
-            {
-                sb.AppendLine("Volume is bootable.");
-                sb.AppendLine();
-                sb.AppendLine(bootBlockInfo);
-            }
-            else if(mdb.drFndrInfo0 != 0 ||
-                    mdb.drFndrInfo3 != 0 ||
-                    mdb.drFndrInfo5 != 0)
-                sb.AppendLine("Volume is bootable.");
-            else
-                sb.AppendLine("Volume is not bootable.");
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType();
-
-            if(mdb.drVolBkUp > 0)
-            {
-                XmlFsType.BackupDate          = DateHandlers.MacToDateTime(mdb.drVolBkUp);
-                XmlFsType.BackupDateSpecified = true;
-            }
-
-            XmlFsType.Bootable = bootBlockInfo   != null || mdb.drFndrInfo0 != 0 || mdb.drFndrInfo3 != 0 ||
-                                 mdb.drFndrInfo5 != 0;
-
-            XmlFsType.Clusters    = mdb.drNmAlBlks;
-            XmlFsType.ClusterSize = mdb.drAlBlkSiz;
-
-            if(mdb.drCrDate > 0)
-            {
-                XmlFsType.CreationDate          = DateHandlers.MacToDateTime(mdb.drCrDate);
-                XmlFsType.CreationDateSpecified = true;
-            }
-
-            XmlFsType.Dirty                 = !mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Unmounted);
-            XmlFsType.Files                 = mdb.drFilCnt;
-            XmlFsType.FilesSpecified        = true;
-            XmlFsType.FreeClusters          = mdb.drFreeBks;
-            XmlFsType.FreeClustersSpecified = true;
-
-            if(mdb.drLsMod > 0)
-            {
-                XmlFsType.ModificationDate          = DateHandlers.MacToDateTime(mdb.drLsMod);
-                XmlFsType.ModificationDateSpecified = true;
-            }
-
-            XmlFsType.Type       = "HFS";
-            XmlFsType.VolumeName = StringHandlers.PascalToString(mdb.drVN, Encoding);
-
-            if(mdb.drFndrInfo6 != 0 &&
-               mdb.drFndrInfo7 != 0)
-                XmlFsType.VolumeSerial = $"{mdb.drFndrInfo6:X8}{mdb.drFndrInfo7:X8}";
+            return drSigWord != AppleCommon.HFSP_MAGIC;
         }
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("macintosh");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        byte[]      bbSector  = null;
+        byte[]      mdbSector = null;
+        ushort      drSigWord;
+        ErrorNumber errno;
+
+        bool apmFromHddOnCd = false;
+
+        if(imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448 ||
+           imagePlugin.Info.SectorSize == 2048)
+        {
+            errno = imagePlugin.ReadSectors(partition.Start, 2, out byte[] tmpSector);
+
+            if(errno != ErrorNumber.NoError)
+                return;
+
+            foreach(int offset in new[]
+                    {
+                        0, 0x200, 0x400, 0x600, 0x800, 0xA00
+                    })
+            {
+                drSigWord = BigEndianBitConverter.ToUInt16(tmpSector, offset);
+
+                if(drSigWord != AppleCommon.HFS_MAGIC)
+                    continue;
+
+                bbSector  = new byte[1024];
+                mdbSector = new byte[512];
+
+                if(offset >= 0x400)
+                    Array.Copy(tmpSector, offset - 0x400, bbSector, 0, 1024);
+
+                Array.Copy(tmpSector, offset, mdbSector, 0, 512);
+                apmFromHddOnCd = true;
+
+                break;
+            }
+
+            if(!apmFromHddOnCd)
+                return;
+        }
+        else
+        {
+            errno = imagePlugin.ReadSector(2 + partition.Start, out mdbSector);
+
+            if(errno != ErrorNumber.NoError)
+                return;
+
+            drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, 0);
+
+            if(drSigWord == AppleCommon.HFS_MAGIC)
+            {
+                errno = imagePlugin.ReadSector(partition.Start, out bbSector);
+
+                if(errno != ErrorNumber.NoError)
+                    return;
+            }
+            else
+                return;
+        }
+
+        MasterDirectoryBlock mdb = Marshal.ByteArrayToStructureBigEndian<MasterDirectoryBlock>(mdbSector);
+
+        sb.AppendLine("Apple Hierarchical File System");
+        sb.AppendLine();
+
+        if(apmFromHddOnCd)
+            sb.AppendLine("HFS uses 512 bytes/sector while device uses 2048 bytes/sector.").AppendLine();
+
+        sb.AppendLine("Master Directory Block:");
+        sb.AppendFormat("Creation date: {0}", DateHandlers.MacToDateTime(mdb.drCrDate)).AppendLine();
+        sb.AppendFormat("Last modification date: {0}", DateHandlers.MacToDateTime(mdb.drLsMod)).AppendLine();
+
+        if(mdb.drVolBkUp > 0)
+        {
+            sb.AppendFormat("Last backup date: {0}", DateHandlers.MacToDateTime(mdb.drVolBkUp)).AppendLine();
+            sb.AppendFormat("Backup sequence number: {0}", mdb.drVSeqNum).AppendLine();
+        }
+        else
+            sb.AppendLine("Volume has never been backed up");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.HardwareLock))
+            sb.AppendLine("Volume is locked by hardware.");
+
+        sb.AppendLine(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Unmounted) ? "Volume was unmonted."
+                          : "Volume is mounted.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.SparedBadBlocks))
+            sb.AppendLine("Volume has spared bad blocks.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.DoesNotNeedCache))
+            sb.AppendLine("Volume does not need cache.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.BootInconsistent))
+            sb.AppendLine("Boot volume is inconsistent.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.ReusedIds))
+            sb.AppendLine("There are reused CNIDs.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Journaled))
+            sb.AppendLine("Volume is journaled.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Inconsistent))
+            sb.AppendLine("Volume is seriously inconsistent.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.SoftwareLock))
+            sb.AppendLine("Volume is locked by software.");
+
+        sb.AppendFormat("{0} files on root directory", mdb.drNmFls).AppendLine();
+        sb.AppendFormat("{0} directories on root directory", mdb.drNmRtDirs).AppendLine();
+        sb.AppendFormat("{0} files on volume", mdb.drFilCnt).AppendLine();
+        sb.AppendFormat("{0} directories on volume", mdb.drDirCnt).AppendLine();
+        sb.AppendFormat("Volume write count: {0}", mdb.drWrCnt).AppendLine();
+
+        sb.AppendFormat("Volume bitmap starting sector (in 512-bytes): {0}", mdb.drVBMSt).AppendLine();
+        sb.AppendFormat("Next allocation block: {0}.", mdb.drAllocPtr).AppendLine();
+        sb.AppendFormat("{0} volume allocation blocks.", mdb.drNmAlBlks).AppendLine();
+        sb.AppendFormat("{0} bytes per allocation block.", mdb.drAlBlkSiz).AppendLine();
+        sb.AppendFormat("{0} bytes to allocate when extending a file.", mdb.drClpSiz).AppendLine();
+        sb.AppendFormat("{0} bytes to allocate when extending a Extents B-Tree.", mdb.drXTClpSiz).AppendLine();
+        sb.AppendFormat("{0} bytes to allocate when extending a Catalog B-Tree.", mdb.drCTClpSiz).AppendLine();
+        sb.AppendFormat("Sector of first allocation block: {0}", mdb.drAlBlSt).AppendLine();
+        sb.AppendFormat("Next unused CNID: {0}", mdb.drNxtCNID).AppendLine();
+        sb.AppendFormat("{0} unused allocation blocks.", mdb.drFreeBks).AppendLine();
+
+        sb.AppendFormat("{0} bytes in the Extents B-Tree", mdb.drXTFlSize).AppendLine();
+        sb.AppendFormat("{0} bytes in the Catalog B-Tree", mdb.drCTFlSize).AppendLine();
+
+        sb.AppendFormat("Volume name: {0}", StringHandlers.PascalToString(mdb.drVN, Encoding)).AppendLine();
+
+        sb.AppendLine("Finder info:");
+        sb.AppendFormat("CNID of bootable system's directory: {0}", mdb.drFndrInfo0).AppendLine();
+        sb.AppendFormat("CNID of first-run application's directory: {0}", mdb.drFndrInfo1).AppendLine();
+        sb.AppendFormat("CNID of previously opened directory: {0}", mdb.drFndrInfo2).AppendLine();
+        sb.AppendFormat("CNID of bootable Mac OS 8 or 9 directory: {0}", mdb.drFndrInfo3).AppendLine();
+        sb.AppendFormat("CNID of bootable Mac OS X directory: {0}", mdb.drFndrInfo5).AppendLine();
+
+        if(mdb.drFndrInfo6 != 0 &&
+           mdb.drFndrInfo7 != 0)
+            sb.AppendFormat("Mac OS X Volume ID: {0:X8}{1:X8}", mdb.drFndrInfo6, mdb.drFndrInfo7).AppendLine();
+
+        if(mdb.drEmbedSigWord == AppleCommon.HFSP_MAGIC)
+        {
+            sb.AppendLine("Volume wraps a HFS+ volume.");
+            sb.AppendFormat("Starting block of the HFS+ volume: {0}", mdb.xdrStABNt).AppendLine();
+            sb.AppendFormat("Allocations blocks of the HFS+ volume: {0}", mdb.xdrNumABlks).AppendLine();
+        }
+        else
+        {
+            sb.AppendFormat("{0} blocks in volume cache", mdb.drVCSize).AppendLine();
+            sb.AppendFormat("{0} blocks in volume bitmap cache", mdb.drVBMCSize).AppendLine();
+            sb.AppendFormat("{0} blocks in volume common cache", mdb.drCtlCSize).AppendLine();
+        }
+
+        string bootBlockInfo = AppleCommon.GetBootBlockInformation(bbSector, Encoding);
+
+        if(bootBlockInfo != null)
+        {
+            sb.AppendLine("Volume is bootable.");
+            sb.AppendLine();
+            sb.AppendLine(bootBlockInfo);
+        }
+        else if(mdb.drFndrInfo0 != 0 ||
+                mdb.drFndrInfo3 != 0 ||
+                mdb.drFndrInfo5 != 0)
+            sb.AppendLine("Volume is bootable.");
+        else
+            sb.AppendLine("Volume is not bootable.");
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType();
+
+        if(mdb.drVolBkUp > 0)
+        {
+            XmlFsType.BackupDate          = DateHandlers.MacToDateTime(mdb.drVolBkUp);
+            XmlFsType.BackupDateSpecified = true;
+        }
+
+        XmlFsType.Bootable = bootBlockInfo   != null || mdb.drFndrInfo0 != 0 || mdb.drFndrInfo3 != 0 ||
+                             mdb.drFndrInfo5 != 0;
+
+        XmlFsType.Clusters    = mdb.drNmAlBlks;
+        XmlFsType.ClusterSize = mdb.drAlBlkSiz;
+
+        if(mdb.drCrDate > 0)
+        {
+            XmlFsType.CreationDate          = DateHandlers.MacToDateTime(mdb.drCrDate);
+            XmlFsType.CreationDateSpecified = true;
+        }
+
+        XmlFsType.Dirty                 = !mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Unmounted);
+        XmlFsType.Files                 = mdb.drFilCnt;
+        XmlFsType.FilesSpecified        = true;
+        XmlFsType.FreeClusters          = mdb.drFreeBks;
+        XmlFsType.FreeClustersSpecified = true;
+
+        if(mdb.drLsMod > 0)
+        {
+            XmlFsType.ModificationDate          = DateHandlers.MacToDateTime(mdb.drLsMod);
+            XmlFsType.ModificationDateSpecified = true;
+        }
+
+        XmlFsType.Type       = "HFS";
+        XmlFsType.VolumeName = StringHandlers.PascalToString(mdb.drVN, Encoding);
+
+        if(mdb.drFndrInfo6 != 0 &&
+           mdb.drFndrInfo7 != 0)
+            XmlFsType.VolumeSerial = $"{mdb.drFndrInfo6:X8}{mdb.drFndrInfo7:X8}";
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleHFS/Structs.cs b/Aaru.Filesystems/AppleHFS/Structs.cs
index 5cd042460..bab26b050 100644
--- a/Aaru.Filesystems/AppleHFS/Structs.cs
+++ b/Aaru.Filesystems/AppleHFS/Structs.cs
@@ -37,297 +37,296 @@ using System.Runtime.InteropServices;
 // ReSharper disable IdentifierTypo
 // ReSharper disable MemberCanBePrivate.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh
+// https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
+public sealed partial class AppleHFS
 {
-    // Information from Inside Macintosh
-    // https://developer.apple.com/legacy/library/documentation/mac/pdf/Files/File_Manager.pdf
-    public sealed partial class AppleHFS
+    /// <summary>Master Directory Block, should be sector 2 in volume</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MasterDirectoryBlock // Should be sector 2 in volume
     {
-        /// <summary>Master Directory Block, should be sector 2 in volume</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MasterDirectoryBlock // Should be sector 2 in volume
-        {
-            /// <summary>0x000, Signature, 0x4244</summary>
-            public readonly ushort drSigWord;
-            /// <summary>0x002, Volume creation date</summary>
-            public readonly uint drCrDate;
-            /// <summary>0x006, Volume last modification date</summary>
-            public readonly uint drLsMod;
-            /// <summary>0x00A, Volume attributes</summary>
-            public readonly AppleCommon.VolumeAttributes drAtrb;
-            /// <summary>0x00C, Files in root directory</summary>
-            public readonly ushort drNmFls;
-            /// <summary>0x00E, Start 512-byte sector of volume bitmap</summary>
-            public readonly ushort drVBMSt;
-            /// <summary>0x010, Allocation block to begin next allocation</summary>
-            public readonly ushort drAllocPtr;
-            /// <summary>0x012, Allocation blocks</summary>
-            public readonly ushort drNmAlBlks;
-            /// <summary>0x014, Bytes per allocation block</summary>
-            public readonly uint drAlBlkSiz;
-            /// <summary>0x018, Bytes to allocate when extending a file</summary>
-            public readonly uint drClpSiz;
-            /// <summary>0x01C, Start 512-byte sector of first allocation block</summary>
-            public readonly ushort drAlBlSt;
-            /// <summary>0x01E, CNID for next file</summary>
-            public readonly uint drNxtCNID;
-            /// <summary>0x022, Free allocation blocks</summary>
-            public readonly ushort drFreeBks;
-            /// <summary>0x024, Volume name (28 bytes)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 28)]
-            public readonly byte[] drVN;
-            /// <summary>0x040, Volume last backup time</summary>
-            public readonly uint drVolBkUp;
-            /// <summary>0x044, Volume backup sequence number</summary>
-            public readonly ushort drVSeqNum;
-            /// <summary>0x046, Filesystem write count</summary>
-            public readonly uint drWrCnt;
-            /// <summary>0x04A, Bytes to allocate when extending the extents B-Tree</summary>
-            public readonly uint drXTClpSiz;
-            /// <summary>0x04E, Bytes to allocate when extending the catalog B-Tree</summary>
-            public readonly uint drCTClpSiz;
-            /// <summary>0x052, Number of directories in root directory</summary>
-            public readonly ushort drNmRtDirs;
-            /// <summary>0x054, Number of files in the volume</summary>
-            public readonly uint drFilCnt;
-            /// <summary>0x058, Number of directories in the volume</summary>
-            public readonly uint drDirCnt;
-            /// <summary>0x05C, finderInfo[0], CNID for bootable system's directory</summary>
-            public readonly uint drFndrInfo0;
-            /// <summary>0x060, finderInfo[1], CNID of the directory containing the boot application</summary>
-            public readonly uint drFndrInfo1;
-            /// <summary>0x064, finderInfo[2], CNID of the directory that should be opened on boot</summary>
-            public readonly uint drFndrInfo2;
-            /// <summary>0x068, finderInfo[3], CNID for Mac OS 8 or 9 directory</summary>
-            public readonly uint drFndrInfo3;
-            /// <summary>0x06C, finderInfo[4], Reserved</summary>
-            public readonly uint drFndrInfo4;
-            /// <summary>0x070, finderInfo[5], CNID for Mac OS X directory</summary>
-            public readonly uint drFndrInfo5;
-            /// <summary>0x074, finderInfo[6], first part of Mac OS X volume ID</summary>
-            public readonly uint drFndrInfo6;
-            /// <summary>0x078, finderInfo[7], second part of Mac OS X volume ID</summary>
-            public readonly uint drFndrInfo7;
+        /// <summary>0x000, Signature, 0x4244</summary>
+        public readonly ushort drSigWord;
+        /// <summary>0x002, Volume creation date</summary>
+        public readonly uint drCrDate;
+        /// <summary>0x006, Volume last modification date</summary>
+        public readonly uint drLsMod;
+        /// <summary>0x00A, Volume attributes</summary>
+        public readonly AppleCommon.VolumeAttributes drAtrb;
+        /// <summary>0x00C, Files in root directory</summary>
+        public readonly ushort drNmFls;
+        /// <summary>0x00E, Start 512-byte sector of volume bitmap</summary>
+        public readonly ushort drVBMSt;
+        /// <summary>0x010, Allocation block to begin next allocation</summary>
+        public readonly ushort drAllocPtr;
+        /// <summary>0x012, Allocation blocks</summary>
+        public readonly ushort drNmAlBlks;
+        /// <summary>0x014, Bytes per allocation block</summary>
+        public readonly uint drAlBlkSiz;
+        /// <summary>0x018, Bytes to allocate when extending a file</summary>
+        public readonly uint drClpSiz;
+        /// <summary>0x01C, Start 512-byte sector of first allocation block</summary>
+        public readonly ushort drAlBlSt;
+        /// <summary>0x01E, CNID for next file</summary>
+        public readonly uint drNxtCNID;
+        /// <summary>0x022, Free allocation blocks</summary>
+        public readonly ushort drFreeBks;
+        /// <summary>0x024, Volume name (28 bytes)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 28)]
+        public readonly byte[] drVN;
+        /// <summary>0x040, Volume last backup time</summary>
+        public readonly uint drVolBkUp;
+        /// <summary>0x044, Volume backup sequence number</summary>
+        public readonly ushort drVSeqNum;
+        /// <summary>0x046, Filesystem write count</summary>
+        public readonly uint drWrCnt;
+        /// <summary>0x04A, Bytes to allocate when extending the extents B-Tree</summary>
+        public readonly uint drXTClpSiz;
+        /// <summary>0x04E, Bytes to allocate when extending the catalog B-Tree</summary>
+        public readonly uint drCTClpSiz;
+        /// <summary>0x052, Number of directories in root directory</summary>
+        public readonly ushort drNmRtDirs;
+        /// <summary>0x054, Number of files in the volume</summary>
+        public readonly uint drFilCnt;
+        /// <summary>0x058, Number of directories in the volume</summary>
+        public readonly uint drDirCnt;
+        /// <summary>0x05C, finderInfo[0], CNID for bootable system's directory</summary>
+        public readonly uint drFndrInfo0;
+        /// <summary>0x060, finderInfo[1], CNID of the directory containing the boot application</summary>
+        public readonly uint drFndrInfo1;
+        /// <summary>0x064, finderInfo[2], CNID of the directory that should be opened on boot</summary>
+        public readonly uint drFndrInfo2;
+        /// <summary>0x068, finderInfo[3], CNID for Mac OS 8 or 9 directory</summary>
+        public readonly uint drFndrInfo3;
+        /// <summary>0x06C, finderInfo[4], Reserved</summary>
+        public readonly uint drFndrInfo4;
+        /// <summary>0x070, finderInfo[5], CNID for Mac OS X directory</summary>
+        public readonly uint drFndrInfo5;
+        /// <summary>0x074, finderInfo[6], first part of Mac OS X volume ID</summary>
+        public readonly uint drFndrInfo6;
+        /// <summary>0x078, finderInfo[7], second part of Mac OS X volume ID</summary>
+        public readonly uint drFndrInfo7;
 
-            // If wrapping HFS+
-            /// <summary>0x07C, Embedded volume signature, "H+" if HFS+ is embedded ignore following two fields if not</summary>
-            public readonly ushort drEmbedSigWord;
-            /// <summary>0x07E, Starting block number of embedded HFS+ volume</summary>
-            public readonly ushort xdrStABNt;
-            /// <summary>0x080, Allocation blocks used by embedded volume</summary>
-            public readonly ushort xdrNumABlks;
+        // If wrapping HFS+
+        /// <summary>0x07C, Embedded volume signature, "H+" if HFS+ is embedded ignore following two fields if not</summary>
+        public readonly ushort drEmbedSigWord;
+        /// <summary>0x07E, Starting block number of embedded HFS+ volume</summary>
+        public readonly ushort xdrStABNt;
+        /// <summary>0x080, Allocation blocks used by embedded volume</summary>
+        public readonly ushort xdrNumABlks;
 
-            // If not
-            /// <summary>0x07C, Size in blocks of volume cache</summary>
-            public readonly ushort drVCSize;
-            /// <summary>0x07E, Size in blocks of volume bitmap cache</summary>
-            public readonly ushort drVBMCSize;
-            /// <summary>0x080, Size in blocks of volume common cache</summary>
-            public readonly ushort drCtlCSize;
+        // If not
+        /// <summary>0x07C, Size in blocks of volume cache</summary>
+        public readonly ushort drVCSize;
+        /// <summary>0x07E, Size in blocks of volume bitmap cache</summary>
+        public readonly ushort drVBMCSize;
+        /// <summary>0x080, Size in blocks of volume common cache</summary>
+        public readonly ushort drCtlCSize;
 
-            // End of variable variables :D
-            /// <summary>0x082, Bytes in the extents B-Tree 3 HFS extents following, 32 bits each</summary>
-            public readonly uint drXTFlSize;
-            /// <summary>0x092, Bytes in the catalog B-Tree 3 HFS extents following, 32 bits each</summary>
-            public readonly uint drCTFlSize;
-        }
+        // End of variable variables :D
+        /// <summary>0x082, Bytes in the extents B-Tree 3 HFS extents following, 32 bits each</summary>
+        public readonly uint drXTFlSize;
+        /// <summary>0x092, Bytes in the catalog B-Tree 3 HFS extents following, 32 bits each</summary>
+        public readonly uint drCTFlSize;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct NodeDescriptor
-        {
-            /// <summary>A link to the next node of this type, or <c>null</c> if this is the last one.</summary>
-            public readonly uint ndFLink;
-            /// <summary>A link to the previous node of this type, or <c>null</c> if this is the first one.</summary>
-            public readonly uint ndBLink;
-            /// <summary>The type of this node.</summary>
-            public readonly NodeType ndType;
-            /// <summary>The depth of this node in the B*-tree hierarchy. Maximum depth is apparently 8.</summary>
-            public readonly sbyte ndNHeight;
-            /// <summary>The number of records contained in this node.</summary>
-            public readonly ushort ndNRecs;
-            /// <summary>Reserved, should be 0.</summary>
-            public readonly ushort ndResv2;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct NodeDescriptor
+    {
+        /// <summary>A link to the next node of this type, or <c>null</c> if this is the last one.</summary>
+        public readonly uint ndFLink;
+        /// <summary>A link to the previous node of this type, or <c>null</c> if this is the first one.</summary>
+        public readonly uint ndBLink;
+        /// <summary>The type of this node.</summary>
+        public readonly NodeType ndType;
+        /// <summary>The depth of this node in the B*-tree hierarchy. Maximum depth is apparently 8.</summary>
+        public readonly sbyte ndNHeight;
+        /// <summary>The number of records contained in this node.</summary>
+        public readonly ushort ndNRecs;
+        /// <summary>Reserved, should be 0.</summary>
+        public readonly ushort ndResv2;
+    }
 
-        /// <summary>B*-tree header</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BTHdrRed
-        {
-            /// <summary>Current depth of tree.</summary>
-            public readonly ushort bthDepth;
-            /// <summary>Number of root node.</summary>
-            public readonly uint bthRoot;
-            /// <summary>Number of leaf records in tree.</summary>
-            public readonly uint bthNRecs;
-            /// <summary>Number of first leaf node.</summary>
-            public readonly uint bthFNode;
-            /// <summary>Number of last leaf node.</summary>
-            public readonly uint bthLNode;
-            /// <summary>Size of a node.</summary>
-            public readonly ushort bthNodeSize;
-            /// <summary>Maximum length of a key.</summary>
-            public readonly ushort bthKeyLen;
-            /// <summary>Total number of nodes in tree.</summary>
-            public readonly uint bthNNodes;
-            /// <summary>Number of free nodes.</summary>
-            public readonly uint bthFree;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 76)]
-            public readonly sbyte[] bthResv;
-        }
+    /// <summary>B*-tree header</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BTHdrRed
+    {
+        /// <summary>Current depth of tree.</summary>
+        public readonly ushort bthDepth;
+        /// <summary>Number of root node.</summary>
+        public readonly uint bthRoot;
+        /// <summary>Number of leaf records in tree.</summary>
+        public readonly uint bthNRecs;
+        /// <summary>Number of first leaf node.</summary>
+        public readonly uint bthFNode;
+        /// <summary>Number of last leaf node.</summary>
+        public readonly uint bthLNode;
+        /// <summary>Size of a node.</summary>
+        public readonly ushort bthNodeSize;
+        /// <summary>Maximum length of a key.</summary>
+        public readonly ushort bthKeyLen;
+        /// <summary>Total number of nodes in tree.</summary>
+        public readonly uint bthNNodes;
+        /// <summary>Number of free nodes.</summary>
+        public readonly uint bthFree;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 76)]
+        public readonly sbyte[] bthResv;
+    }
 
-        /// <summary>Catalog key record</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CatKeyRec
-        {
-            /// <summary>Key length.</summary>
-            public readonly sbyte ckrKeyLen;
-            /// <summary>Reserved.</summary>
-            public readonly sbyte ckrResrv1;
-            /// <summary>Parent directory ID.</summary>
-            public readonly uint ckrParID;
-            /// <summary>Catalog node name. Full 32 bytes in index nodes but only the needed bytes, padded to word, in leaf nodes.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] ckrCName;
-        }
+    /// <summary>Catalog key record</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CatKeyRec
+    {
+        /// <summary>Key length.</summary>
+        public readonly sbyte ckrKeyLen;
+        /// <summary>Reserved.</summary>
+        public readonly sbyte ckrResrv1;
+        /// <summary>Parent directory ID.</summary>
+        public readonly uint ckrParID;
+        /// <summary>Catalog node name. Full 32 bytes in index nodes but only the needed bytes, padded to word, in leaf nodes.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] ckrCName;
+    }
 
-        /// <summary>Catalog data record header</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CatDataRec
-        {
-            public readonly CatDataType cdrType;
-            public readonly sbyte       cdrResvr2;
-        }
+    /// <summary>Catalog data record header</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CatDataRec
+    {
+        public readonly CatDataType cdrType;
+        public readonly sbyte       cdrResvr2;
+    }
 
-        /// <summary>Directory record</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CdrDirRec
-        {
-            public readonly CatDataRec dirHdr;
-            /// <summary>Directory flags.</summary>
-            public readonly ushort dirFlags;
-            /// <summary>Directory valence.</summary>
-            public readonly ushort dirVal;
-            /// <summary>Directory ID.</summary>
-            public readonly uint dirDirID;
-            /// <summary>Date and time of creation.</summary>
-            public readonly uint dirCrDat;
-            /// <summary>Date and time of last modification.</summary>
-            public readonly uint dirMdDat;
-            /// <summary>Date and time of last backup.</summary>
-            public readonly uint dirBkDat;
-            /// <summary>Finder information.</summary>
-            public readonly AppleCommon.DInfo dirUsrInfo;
-            /// <summary>Additional Finder information.</summary>
-            public readonly AppleCommon.DXInfo dirFndrInfo;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly uint[] dirResrv;
-        }
+    /// <summary>Directory record</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CdrDirRec
+    {
+        public readonly CatDataRec dirHdr;
+        /// <summary>Directory flags.</summary>
+        public readonly ushort dirFlags;
+        /// <summary>Directory valence.</summary>
+        public readonly ushort dirVal;
+        /// <summary>Directory ID.</summary>
+        public readonly uint dirDirID;
+        /// <summary>Date and time of creation.</summary>
+        public readonly uint dirCrDat;
+        /// <summary>Date and time of last modification.</summary>
+        public readonly uint dirMdDat;
+        /// <summary>Date and time of last backup.</summary>
+        public readonly uint dirBkDat;
+        /// <summary>Finder information.</summary>
+        public readonly AppleCommon.DInfo dirUsrInfo;
+        /// <summary>Additional Finder information.</summary>
+        public readonly AppleCommon.DXInfo dirFndrInfo;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly uint[] dirResrv;
+    }
 
-        /// <summary>File record</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CdrFilRec
-        {
-            public readonly CatDataRec filHdr;
-            /// <summary>File flags.</summary>
-            public readonly sbyte filFlags;
-            /// <summary>File type.</summary>
-            public readonly sbyte filType;
-            /// <summary>Finder information.</summary>
-            public readonly AppleCommon.FInfo filUsrWds;
-            /// <summary>File ID.</summary>
-            public readonly uint filFlNum;
-            /// <summary>First allocation block of data fork.</summary>
-            public readonly ushort filStBlk;
-            /// <summary>Logical EOF of data fork.</summary>
-            public readonly uint filLgLen;
-            /// <summary>Physical EOF of data fork.</summary>
-            public readonly uint filPyLen;
-            /// <summary>First allocation block of resource fork.</summary>
-            public readonly ushort filRStBlk;
-            /// <summary>Logical EOF of resource fork.</summary>
-            public readonly uint filRLgLen;
-            /// <summary>Physical EOF of resource fork.</summary>
-            public readonly uint filRPyLen;
-            /// <summary>Date and time of creation.</summary>
-            public readonly uint filCrDat;
-            /// <summary>Date and time of last modification.</summary>
-            public readonly uint filMdDat;
-            /// <summary>Date and time of last backup.</summary>
-            public readonly uint filBkDat;
-            /// <summary>Additional Finder information.</summary>
-            public readonly AppleCommon.FXInfo filFndrInfo;
-            /// <summary>File clump size.</summary>
-            public readonly ushort filClpSize;
-            /// <summary>First data fork extent record.</summary>
-            public readonly ExtDataRec filExtRec;
-            /// <summary>First resource fork extent record.</summary>
-            public readonly ExtDataRec filRExtRec;
-            /// <summary>Reserved</summary>
-            public readonly uint filResrv;
-        }
+    /// <summary>File record</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CdrFilRec
+    {
+        public readonly CatDataRec filHdr;
+        /// <summary>File flags.</summary>
+        public readonly sbyte filFlags;
+        /// <summary>File type.</summary>
+        public readonly sbyte filType;
+        /// <summary>Finder information.</summary>
+        public readonly AppleCommon.FInfo filUsrWds;
+        /// <summary>File ID.</summary>
+        public readonly uint filFlNum;
+        /// <summary>First allocation block of data fork.</summary>
+        public readonly ushort filStBlk;
+        /// <summary>Logical EOF of data fork.</summary>
+        public readonly uint filLgLen;
+        /// <summary>Physical EOF of data fork.</summary>
+        public readonly uint filPyLen;
+        /// <summary>First allocation block of resource fork.</summary>
+        public readonly ushort filRStBlk;
+        /// <summary>Logical EOF of resource fork.</summary>
+        public readonly uint filRLgLen;
+        /// <summary>Physical EOF of resource fork.</summary>
+        public readonly uint filRPyLen;
+        /// <summary>Date and time of creation.</summary>
+        public readonly uint filCrDat;
+        /// <summary>Date and time of last modification.</summary>
+        public readonly uint filMdDat;
+        /// <summary>Date and time of last backup.</summary>
+        public readonly uint filBkDat;
+        /// <summary>Additional Finder information.</summary>
+        public readonly AppleCommon.FXInfo filFndrInfo;
+        /// <summary>File clump size.</summary>
+        public readonly ushort filClpSize;
+        /// <summary>First data fork extent record.</summary>
+        public readonly ExtDataRec filExtRec;
+        /// <summary>First resource fork extent record.</summary>
+        public readonly ExtDataRec filRExtRec;
+        /// <summary>Reserved</summary>
+        public readonly uint filResrv;
+    }
 
-        /// <summary>Directory thread record</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CdrThdRec
-        {
-            public readonly CatDataRec thdHdr;
-            /// <summary>Reserved.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly uint[] thdResrv;
-            /// <summary>Parent ID for this directory.</summary>
-            public readonly uint thdParID;
-            /// <summary>Name of this directory.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] thdCName;
-        }
+    /// <summary>Directory thread record</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CdrThdRec
+    {
+        public readonly CatDataRec thdHdr;
+        /// <summary>Reserved.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly uint[] thdResrv;
+        /// <summary>Parent ID for this directory.</summary>
+        public readonly uint thdParID;
+        /// <summary>Name of this directory.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] thdCName;
+    }
 
-        /// <summary>File thread record</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CdrFThdRec
-        {
-            public readonly CatDataRec fthdHdr;
-            /// <summary>Reserved.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly uint[] fthdResrv;
-            /// <summary>Parent ID for this file.</summary>
-            public readonly uint fthdParID;
-            /// <summary>Name of this file.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] fthdCName;
-        }
+    /// <summary>File thread record</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CdrFThdRec
+    {
+        public readonly CatDataRec fthdHdr;
+        /// <summary>Reserved.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly uint[] fthdResrv;
+        /// <summary>Parent ID for this file.</summary>
+        public readonly uint fthdParID;
+        /// <summary>Name of this file.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] fthdCName;
+    }
 
-        /// <summary>Extent descriptor</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ExtDescriptor
-        {
-            /// <summary>First allocation block</summary>
-            public readonly ushort xdrStABN;
-            /// <summary>Number of allocation blocks</summary>
-            public readonly ushort xdrNumABlks;
-        }
+    /// <summary>Extent descriptor</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ExtDescriptor
+    {
+        /// <summary>First allocation block</summary>
+        public readonly ushort xdrStABN;
+        /// <summary>Number of allocation blocks</summary>
+        public readonly ushort xdrNumABlks;
+    }
 
-        /// <summary>Extent data record</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ExtDataRec
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly ExtDescriptor[] xdr;
-        }
+    /// <summary>Extent data record</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ExtDataRec
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly ExtDescriptor[] xdr;
+    }
 
-        /// <summary>Extent key record</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ExtKeyRec
-        {
-            /// <summary>Key length.</summary>
-            public readonly sbyte xkrKeyLen;
-            /// <summary>Fork type.</summary>
-            public readonly ForkType xkrFkType;
-            /// <summary>File number.</summary>
-            public readonly uint xkrFNum;
-            /// <summary>Starting file allocation block.</summary>
-            public readonly ushort xkrFABN;
-        }
+    /// <summary>Extent key record</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ExtKeyRec
+    {
+        /// <summary>Key length.</summary>
+        public readonly sbyte xkrKeyLen;
+        /// <summary>Fork type.</summary>
+        public readonly ForkType xkrFkType;
+        /// <summary>File number.</summary>
+        public readonly uint xkrFNum;
+        /// <summary>Starting file allocation block.</summary>
+        public readonly ushort xkrFABN;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleHFSPlus.cs b/Aaru.Filesystems/AppleHFSPlus.cs
index 1e991ecec..20e7cb64d 100644
--- a/Aaru.Filesystems/AppleHFSPlus.cs
+++ b/Aaru.Filesystems/AppleHFSPlus.cs
@@ -40,549 +40,548 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Apple TechNote 1150: https://developer.apple.com/legacy/library/technotes/tn/tn1150.html
+/// <inheritdoc />
+/// <summary>Implements detection of Apple Hierarchical File System Plus (HFS+)</summary>
+public sealed class AppleHFSPlus : IFilesystem
 {
-    // Information from Apple TechNote 1150: https://developer.apple.com/legacy/library/technotes/tn/tn1150.html
     /// <inheritdoc />
-    /// <summary>Implements detection of Apple Hierarchical File System Plus (HFS+)</summary>
-    public sealed class AppleHFSPlus : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Apple HFS+ filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("36405F8D-0D26-6EBE-436F-62F0586B4F08");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Apple HFS+ filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("36405F8D-0D26-6EBE-436F-62F0586B4F08");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(2 + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ulong hfspOffset;
+
+        uint sectorsToRead = 0x800 / imagePlugin.Info.SectorSize;
+
+        if(0x800 % imagePlugin.Info.SectorSize > 0)
+            sectorsToRead++;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sectorsToRead, out byte[] vhSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(vhSector.Length < 0x800)
+            return false;
+
+        ushort drSigWord = BigEndianBitConverter.ToUInt16(vhSector, 0x400);
+
+        if(drSigWord == AppleCommon.HFS_MAGIC) // "BD"
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
+            drSigWord = BigEndianBitConverter.ToUInt16(vhSector, 0x47C); // Read embedded HFS+ signature
 
-            ulong hfspOffset;
-
-            uint sectorsToRead = 0x800 / imagePlugin.Info.SectorSize;
-
-            if(0x800 % imagePlugin.Info.SectorSize > 0)
-                sectorsToRead++;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sectorsToRead, out byte[] vhSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(vhSector.Length < 0x800)
-                return false;
-
-            ushort drSigWord = BigEndianBitConverter.ToUInt16(vhSector, 0x400);
-
-            if(drSigWord == AppleCommon.HFS_MAGIC) // "BD"
+            if(drSigWord == AppleCommon.HFSP_MAGIC) // "H+"
             {
-                drSigWord = BigEndianBitConverter.ToUInt16(vhSector, 0x47C); // Read embedded HFS+ signature
+                // ReSharper disable once InconsistentNaming
+                ushort xdrStABNt = BigEndianBitConverter.ToUInt16(vhSector, 0x47E);
 
-                if(drSigWord == AppleCommon.HFSP_MAGIC) // "H+"
-                {
-                    // ReSharper disable once InconsistentNaming
-                    ushort xdrStABNt = BigEndianBitConverter.ToUInt16(vhSector, 0x47E);
+                uint drAlBlkSiz = BigEndianBitConverter.ToUInt32(vhSector, 0x414);
 
-                    uint drAlBlkSiz = BigEndianBitConverter.ToUInt32(vhSector, 0x414);
+                ushort drAlBlSt = BigEndianBitConverter.ToUInt16(vhSector, 0x41C);
 
-                    ushort drAlBlSt = BigEndianBitConverter.ToUInt16(vhSector, 0x41C);
-
-                    hfspOffset = (ulong)(((drAlBlSt * 512) + (xdrStABNt * drAlBlkSiz)) / imagePlugin.Info.SectorSize);
-                }
-                else
-                    hfspOffset = 0;
+                hfspOffset = (ulong)(((drAlBlSt * 512) + (xdrStABNt * drAlBlkSiz)) / imagePlugin.Info.SectorSize);
             }
             else
                 hfspOffset = 0;
-
-            errno = imagePlugin.ReadSectors(partition.Start + hfspOffset, sectorsToRead,
-                                            out vhSector); // Read volume header
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            drSigWord = BigEndianBitConverter.ToUInt16(vhSector, 0x400);
-
-            return drSigWord == AppleCommon.HFSP_MAGIC || drSigWord == AppleCommon.HFSX_MAGIC;
         }
+        else
+            hfspOffset = 0;
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        errno = imagePlugin.ReadSectors(partition.Start + hfspOffset, sectorsToRead,
+                                        out vhSector); // Read volume header
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        drSigWord = BigEndianBitConverter.ToUInt16(vhSector, 0x400);
+
+        return drSigWord == AppleCommon.HFSP_MAGIC || drSigWord == AppleCommon.HFSX_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = Encoding.BigEndianUnicode;
+        information = "";
+
+        var vh = new VolumeHeader();
+
+        ulong hfspOffset;
+        bool  wrapped;
+
+        uint sectorsToRead = 0x800 / imagePlugin.Info.SectorSize;
+
+        if(0x800 % imagePlugin.Info.SectorSize > 0)
+            sectorsToRead++;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sectorsToRead, out byte[] vhSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        ushort drSigWord = BigEndianBitConverter.ToUInt16(vhSector, 0x400);
+
+        if(drSigWord == AppleCommon.HFS_MAGIC) // "BD"
         {
-            Encoding    = Encoding.BigEndianUnicode;
-            information = "";
+            drSigWord = BigEndianBitConverter.ToUInt16(vhSector, 0x47C); // Read embedded HFS+ signature
 
-            var vh = new VolumeHeader();
-
-            ulong hfspOffset;
-            bool  wrapped;
-
-            uint sectorsToRead = 0x800 / imagePlugin.Info.SectorSize;
-
-            if(0x800 % imagePlugin.Info.SectorSize > 0)
-                sectorsToRead++;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sectorsToRead, out byte[] vhSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            ushort drSigWord = BigEndianBitConverter.ToUInt16(vhSector, 0x400);
-
-            if(drSigWord == AppleCommon.HFS_MAGIC) // "BD"
+            if(drSigWord == AppleCommon.HFSP_MAGIC) // "H+"
             {
-                drSigWord = BigEndianBitConverter.ToUInt16(vhSector, 0x47C); // Read embedded HFS+ signature
+                // ReSharper disable once InconsistentNaming
+                ushort xdrStABNt = BigEndianBitConverter.ToUInt16(vhSector, 0x47E);
 
-                if(drSigWord == AppleCommon.HFSP_MAGIC) // "H+"
-                {
-                    // ReSharper disable once InconsistentNaming
-                    ushort xdrStABNt = BigEndianBitConverter.ToUInt16(vhSector, 0x47E);
+                uint drAlBlkSiz = BigEndianBitConverter.ToUInt32(vhSector, 0x414);
 
-                    uint drAlBlkSiz = BigEndianBitConverter.ToUInt32(vhSector, 0x414);
+                ushort drAlBlSt = BigEndianBitConverter.ToUInt16(vhSector, 0x41C);
 
-                    ushort drAlBlSt = BigEndianBitConverter.ToUInt16(vhSector, 0x41C);
-
-                    hfspOffset = (ulong)(((drAlBlSt * 512) + (xdrStABNt * drAlBlkSiz)) / imagePlugin.Info.SectorSize);
-                    wrapped    = true;
-                }
-                else
-                {
-                    hfspOffset = 0;
-                    wrapped    = false;
-                }
+                hfspOffset = (ulong)(((drAlBlSt * 512) + (xdrStABNt * drAlBlkSiz)) / imagePlugin.Info.SectorSize);
+                wrapped    = true;
             }
             else
             {
                 hfspOffset = 0;
                 wrapped    = false;
             }
+        }
+        else
+        {
+            hfspOffset = 0;
+            wrapped    = false;
+        }
 
-            errno = imagePlugin.ReadSectors(partition.Start + hfspOffset, sectorsToRead,
-                                            out vhSector); // Read volume header
+        errno = imagePlugin.ReadSectors(partition.Start + hfspOffset, sectorsToRead,
+                                        out vhSector); // Read volume header
 
-            if(errno != ErrorNumber.NoError)
-                return;
+        if(errno != ErrorNumber.NoError)
+            return;
 
-            vh.signature = BigEndianBitConverter.ToUInt16(vhSector, 0x400);
+        vh.signature = BigEndianBitConverter.ToUInt16(vhSector, 0x400);
 
-            if(vh.signature != AppleCommon.HFSP_MAGIC &&
-               vh.signature != AppleCommon.HFSX_MAGIC)
-                return;
+        if(vh.signature != AppleCommon.HFSP_MAGIC &&
+           vh.signature != AppleCommon.HFSX_MAGIC)
+            return;
 
-            var sb = new StringBuilder();
+        var sb = new StringBuilder();
+
+        if(vh.signature == 0x482B)
+            sb.AppendLine("HFS+ filesystem.");
+
+        if(vh.signature == 0x4858)
+            sb.AppendLine("HFSX filesystem.");
+
+        if(wrapped)
+            sb.AppendLine("Volume is wrapped inside an HFS volume.");
+
+        byte[] tmp = new byte[0x400];
+        Array.Copy(vhSector, 0x400, tmp, 0, 0x400);
+        vhSector = tmp;
+
+        vh = Marshal.ByteArrayToStructureBigEndian<VolumeHeader>(vhSector);
+
+        if(vh.version == 4 ||
+           vh.version == 5)
+        {
+            sb.AppendFormat("Filesystem version is {0}.", vh.version).AppendLine();
+
+            if((vh.attributes & 0x80) == 0x80)
+                sb.AppendLine("Volume is locked on hardware.");
+
+            if((vh.attributes & 0x100) == 0x100)
+                sb.AppendLine("Volume is unmounted.");
+
+            if((vh.attributes & 0x200) == 0x200)
+                sb.AppendLine("There are bad blocks in the extents file.");
+
+            if((vh.attributes & 0x400) == 0x400)
+                sb.AppendLine("Volume does not require cache.");
+
+            if((vh.attributes & 0x800) == 0x800)
+                sb.AppendLine("Volume state is inconsistent.");
+
+            if((vh.attributes & 0x1000) == 0x1000)
+                sb.AppendLine("CNIDs are reused.");
+
+            if((vh.attributes & 0x2000) == 0x2000)
+                sb.AppendLine("Volume is journaled.");
+
+            if((vh.attributes & 0x8000) == 0x8000)
+                sb.AppendLine("Volume is locked on software.");
+
+            sb.AppendFormat("Implementation that last mounted the volume: \"{0}\".",
+                            Encoding.ASCII.GetString(vh.lastMountedVersion)).AppendLine();
+
+            if((vh.attributes & 0x2000) == 0x2000)
+                sb.AppendFormat("Journal starts at allocation block {0}.", vh.journalInfoBlock).AppendLine();
+
+            sb.AppendFormat("Creation date: {0}", DateHandlers.MacToDateTime(vh.createDate)).AppendLine();
+            sb.AppendFormat("Last modification date: {0}", DateHandlers.MacToDateTime(vh.modifyDate)).AppendLine();
+
+            if(vh.backupDate > 0)
+                sb.AppendFormat("Last backup date: {0}", DateHandlers.MacToDateTime(vh.backupDate)).AppendLine();
+            else
+                sb.AppendLine("Volume has never been backed up");
+
+            if(vh.backupDate > 0)
+                sb.AppendFormat("Last check date: {0}", DateHandlers.MacToDateTime(vh.checkedDate)).AppendLine();
+            else
+                sb.AppendLine("Volume has never been checked up");
+
+            sb.AppendFormat("{0} files on volume.", vh.fileCount).AppendLine();
+            sb.AppendFormat("{0} folders on volume.", vh.folderCount).AppendLine();
+            sb.AppendFormat("{0} bytes per allocation block.", vh.blockSize).AppendLine();
+            sb.AppendFormat("{0} allocation blocks.", vh.totalBlocks).AppendLine();
+            sb.AppendFormat("{0} free blocks.", vh.freeBlocks).AppendLine();
+            sb.AppendFormat("Next allocation block: {0}.", vh.nextAllocation).AppendLine();
+            sb.AppendFormat("Resource fork clump size: {0} bytes.", vh.rsrcClumpSize).AppendLine();
+            sb.AppendFormat("Data fork clump size: {0} bytes.", vh.dataClumpSize).AppendLine();
+            sb.AppendFormat("Next unused CNID: {0}.", vh.nextCatalogID).AppendLine();
+            sb.AppendFormat("Volume has been mounted writable {0} times.", vh.writeCount).AppendLine();
+            sb.AppendFormat("Allocation File is {0} bytes.", vh.allocationFile_logicalSize).AppendLine();
+            sb.AppendFormat("Extents File is {0} bytes.", vh.extentsFile_logicalSize).AppendLine();
+            sb.AppendFormat("Catalog File is {0} bytes.", vh.catalogFile_logicalSize).AppendLine();
+            sb.AppendFormat("Attributes File is {0} bytes.", vh.attributesFile_logicalSize).AppendLine();
+            sb.AppendFormat("Startup File is {0} bytes.", vh.startupFile_logicalSize).AppendLine();
+            sb.AppendLine("Finder info:");
+            sb.AppendFormat("CNID of bootable system's directory: {0}", vh.drFndrInfo0).AppendLine();
+            sb.AppendFormat("CNID of first-run application's directory: {0}", vh.drFndrInfo1).AppendLine();
+            sb.AppendFormat("CNID of previously opened directory: {0}", vh.drFndrInfo2).AppendLine();
+            sb.AppendFormat("CNID of bootable Mac OS 8 or 9 directory: {0}", vh.drFndrInfo3).AppendLine();
+            sb.AppendFormat("CNID of bootable Mac OS X directory: {0}", vh.drFndrInfo5).AppendLine();
+
+            if(vh.drFndrInfo6 != 0 &&
+               vh.drFndrInfo7 != 0)
+                sb.AppendFormat("Mac OS X Volume ID: {0:X8}{1:X8}", vh.drFndrInfo6, vh.drFndrInfo7).AppendLine();
+
+            XmlFsType = new FileSystemType();
+
+            if(vh.backupDate > 0)
+            {
+                XmlFsType.BackupDate          = DateHandlers.MacToDateTime(vh.backupDate);
+                XmlFsType.BackupDateSpecified = true;
+            }
+
+            XmlFsType.Bootable    |= vh.drFndrInfo0 != 0 || vh.drFndrInfo3 != 0 || vh.drFndrInfo5 != 0;
+            XmlFsType.Clusters    =  vh.totalBlocks;
+            XmlFsType.ClusterSize =  vh.blockSize;
+
+            if(vh.createDate > 0)
+            {
+                XmlFsType.CreationDate          = DateHandlers.MacToDateTime(vh.createDate);
+                XmlFsType.CreationDateSpecified = true;
+            }
+
+            XmlFsType.Dirty                 = (vh.attributes & 0x100) != 0x100;
+            XmlFsType.Files                 = vh.fileCount;
+            XmlFsType.FilesSpecified        = true;
+            XmlFsType.FreeClusters          = vh.freeBlocks;
+            XmlFsType.FreeClustersSpecified = true;
+
+            if(vh.modifyDate > 0)
+            {
+                XmlFsType.ModificationDate          = DateHandlers.MacToDateTime(vh.modifyDate);
+                XmlFsType.ModificationDateSpecified = true;
+            }
 
             if(vh.signature == 0x482B)
-                sb.AppendLine("HFS+ filesystem.");
+                XmlFsType.Type = "HFS+";
 
             if(vh.signature == 0x4858)
-                sb.AppendLine("HFSX filesystem.");
+                XmlFsType.Type = "HFSX";
 
-            if(wrapped)
-                sb.AppendLine("Volume is wrapped inside an HFS volume.");
+            if(vh.drFndrInfo6 != 0 &&
+               vh.drFndrInfo7 != 0)
+                XmlFsType.VolumeSerial = $"{vh.drFndrInfo6:X8}{vh.drFndrInfo7:X8}";
 
-            byte[] tmp = new byte[0x400];
-            Array.Copy(vhSector, 0x400, tmp, 0, 0x400);
-            vhSector = tmp;
-
-            vh = Marshal.ByteArrayToStructureBigEndian<VolumeHeader>(vhSector);
-
-            if(vh.version == 4 ||
-               vh.version == 5)
-            {
-                sb.AppendFormat("Filesystem version is {0}.", vh.version).AppendLine();
-
-                if((vh.attributes & 0x80) == 0x80)
-                    sb.AppendLine("Volume is locked on hardware.");
-
-                if((vh.attributes & 0x100) == 0x100)
-                    sb.AppendLine("Volume is unmounted.");
-
-                if((vh.attributes & 0x200) == 0x200)
-                    sb.AppendLine("There are bad blocks in the extents file.");
-
-                if((vh.attributes & 0x400) == 0x400)
-                    sb.AppendLine("Volume does not require cache.");
-
-                if((vh.attributes & 0x800) == 0x800)
-                    sb.AppendLine("Volume state is inconsistent.");
-
-                if((vh.attributes & 0x1000) == 0x1000)
-                    sb.AppendLine("CNIDs are reused.");
-
-                if((vh.attributes & 0x2000) == 0x2000)
-                    sb.AppendLine("Volume is journaled.");
-
-                if((vh.attributes & 0x8000) == 0x8000)
-                    sb.AppendLine("Volume is locked on software.");
-
-                sb.AppendFormat("Implementation that last mounted the volume: \"{0}\".",
-                                Encoding.ASCII.GetString(vh.lastMountedVersion)).AppendLine();
-
-                if((vh.attributes & 0x2000) == 0x2000)
-                    sb.AppendFormat("Journal starts at allocation block {0}.", vh.journalInfoBlock).AppendLine();
-
-                sb.AppendFormat("Creation date: {0}", DateHandlers.MacToDateTime(vh.createDate)).AppendLine();
-                sb.AppendFormat("Last modification date: {0}", DateHandlers.MacToDateTime(vh.modifyDate)).AppendLine();
-
-                if(vh.backupDate > 0)
-                    sb.AppendFormat("Last backup date: {0}", DateHandlers.MacToDateTime(vh.backupDate)).AppendLine();
-                else
-                    sb.AppendLine("Volume has never been backed up");
-
-                if(vh.backupDate > 0)
-                    sb.AppendFormat("Last check date: {0}", DateHandlers.MacToDateTime(vh.checkedDate)).AppendLine();
-                else
-                    sb.AppendLine("Volume has never been checked up");
-
-                sb.AppendFormat("{0} files on volume.", vh.fileCount).AppendLine();
-                sb.AppendFormat("{0} folders on volume.", vh.folderCount).AppendLine();
-                sb.AppendFormat("{0} bytes per allocation block.", vh.blockSize).AppendLine();
-                sb.AppendFormat("{0} allocation blocks.", vh.totalBlocks).AppendLine();
-                sb.AppendFormat("{0} free blocks.", vh.freeBlocks).AppendLine();
-                sb.AppendFormat("Next allocation block: {0}.", vh.nextAllocation).AppendLine();
-                sb.AppendFormat("Resource fork clump size: {0} bytes.", vh.rsrcClumpSize).AppendLine();
-                sb.AppendFormat("Data fork clump size: {0} bytes.", vh.dataClumpSize).AppendLine();
-                sb.AppendFormat("Next unused CNID: {0}.", vh.nextCatalogID).AppendLine();
-                sb.AppendFormat("Volume has been mounted writable {0} times.", vh.writeCount).AppendLine();
-                sb.AppendFormat("Allocation File is {0} bytes.", vh.allocationFile_logicalSize).AppendLine();
-                sb.AppendFormat("Extents File is {0} bytes.", vh.extentsFile_logicalSize).AppendLine();
-                sb.AppendFormat("Catalog File is {0} bytes.", vh.catalogFile_logicalSize).AppendLine();
-                sb.AppendFormat("Attributes File is {0} bytes.", vh.attributesFile_logicalSize).AppendLine();
-                sb.AppendFormat("Startup File is {0} bytes.", vh.startupFile_logicalSize).AppendLine();
-                sb.AppendLine("Finder info:");
-                sb.AppendFormat("CNID of bootable system's directory: {0}", vh.drFndrInfo0).AppendLine();
-                sb.AppendFormat("CNID of first-run application's directory: {0}", vh.drFndrInfo1).AppendLine();
-                sb.AppendFormat("CNID of previously opened directory: {0}", vh.drFndrInfo2).AppendLine();
-                sb.AppendFormat("CNID of bootable Mac OS 8 or 9 directory: {0}", vh.drFndrInfo3).AppendLine();
-                sb.AppendFormat("CNID of bootable Mac OS X directory: {0}", vh.drFndrInfo5).AppendLine();
-
-                if(vh.drFndrInfo6 != 0 &&
-                   vh.drFndrInfo7 != 0)
-                    sb.AppendFormat("Mac OS X Volume ID: {0:X8}{1:X8}", vh.drFndrInfo6, vh.drFndrInfo7).AppendLine();
-
-                XmlFsType = new FileSystemType();
-
-                if(vh.backupDate > 0)
-                {
-                    XmlFsType.BackupDate          = DateHandlers.MacToDateTime(vh.backupDate);
-                    XmlFsType.BackupDateSpecified = true;
-                }
-
-                XmlFsType.Bootable    |= vh.drFndrInfo0 != 0 || vh.drFndrInfo3 != 0 || vh.drFndrInfo5 != 0;
-                XmlFsType.Clusters    =  vh.totalBlocks;
-                XmlFsType.ClusterSize =  vh.blockSize;
-
-                if(vh.createDate > 0)
-                {
-                    XmlFsType.CreationDate          = DateHandlers.MacToDateTime(vh.createDate);
-                    XmlFsType.CreationDateSpecified = true;
-                }
-
-                XmlFsType.Dirty                 = (vh.attributes & 0x100) != 0x100;
-                XmlFsType.Files                 = vh.fileCount;
-                XmlFsType.FilesSpecified        = true;
-                XmlFsType.FreeClusters          = vh.freeBlocks;
-                XmlFsType.FreeClustersSpecified = true;
-
-                if(vh.modifyDate > 0)
-                {
-                    XmlFsType.ModificationDate          = DateHandlers.MacToDateTime(vh.modifyDate);
-                    XmlFsType.ModificationDateSpecified = true;
-                }
-
-                if(vh.signature == 0x482B)
-                    XmlFsType.Type = "HFS+";
-
-                if(vh.signature == 0x4858)
-                    XmlFsType.Type = "HFSX";
-
-                if(vh.drFndrInfo6 != 0 &&
-                   vh.drFndrInfo7 != 0)
-                    XmlFsType.VolumeSerial = $"{vh.drFndrInfo6:X8}{vh.drFndrInfo7:X8}";
-
-                XmlFsType.SystemIdentifier = Encoding.ASCII.GetString(vh.lastMountedVersion);
-            }
-            else
-            {
-                sb.AppendFormat("Filesystem version is {0}.", vh.version).AppendLine();
-                sb.AppendLine("This version is not supported yet.");
-            }
-
-            information = sb.ToString();
+            XmlFsType.SystemIdentifier = Encoding.ASCII.GetString(vh.lastMountedVersion);
         }
-
-        /// <summary>HFS+ Volume Header, should be at offset 0x0400 bytes in volume with a size of 532 bytes</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct VolumeHeader
+        else
         {
-            /// <summary>0x000, "H+" for HFS+, "HX" for HFSX</summary>
-            public ushort signature;
-            /// <summary>0x002, 4 for HFS+, 5 for HFSX</summary>
-            public readonly ushort version;
-            /// <summary>0x004, Volume attributes</summary>
-            public readonly uint attributes;
-            /// <summary>
-            ///     0x008, Implementation that last mounted the volume. Reserved by Apple: "8.10" Mac OS 8.1 to 9.2.2 "10.0" Mac
-            ///     OS X "HFSJ" Journaled implementation "fsck" /sbin/fsck
-            /// </summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] lastMountedVersion;
-            /// <summary>0x00C, Allocation block number containing the journal</summary>
-            public readonly uint journalInfoBlock;
-            /// <summary>0x010, Date of volume creation</summary>
-            public readonly uint createDate;
-            /// <summary>0x014, Date of last volume modification</summary>
-            public readonly uint modifyDate;
-            /// <summary>0x018, Date of last backup</summary>
-            public readonly uint backupDate;
-            /// <summary>0x01C, Date of last consistency check</summary>
-            public readonly uint checkedDate;
-            /// <summary>0x020, File on the volume</summary>
-            public readonly uint fileCount;
-            /// <summary>0x024, Folders on the volume</summary>
-            public readonly uint folderCount;
-            /// <summary>0x028, Bytes per allocation block</summary>
-            public readonly uint blockSize;
-            /// <summary>0x02C, Allocation blocks on the volume</summary>
-            public readonly uint totalBlocks;
-            /// <summary>0x030, Free allocation blocks</summary>
-            public readonly uint freeBlocks;
-            /// <summary>0x034, Hint for next allocation block</summary>
-            public readonly uint nextAllocation;
-            /// <summary>0x038, Resource fork clump size</summary>
-            public readonly uint rsrcClumpSize;
-            /// <summary>0x03C, Data fork clump size</summary>
-            public readonly uint dataClumpSize;
-            /// <summary>0x040, Next unused CNID</summary>
-            public readonly uint nextCatalogID;
-            /// <summary>0x044, Times that the volume has been mounted writable</summary>
-            public readonly uint writeCount;
-            /// <summary>0x048, Used text encoding hints</summary>
-            public readonly ulong encodingsBitmap;
-            /// <summary>0x050, finderInfo[0], CNID for bootable system's directory</summary>
-            public readonly uint drFndrInfo0;
-            /// <summary>0x054, finderInfo[1], CNID of the directory containing the boot application</summary>
-            public readonly uint drFndrInfo1;
-            /// <summary>0x058, finderInfo[2], CNID of the directory that should be opened on boot</summary>
-            public readonly uint drFndrInfo2;
-            /// <summary>0x05C, finderInfo[3], CNID for Mac OS 8 or 9 directory</summary>
-            public readonly uint drFndrInfo3;
-            /// <summary>0x060, finderInfo[4], Reserved</summary>
-            public readonly uint drFndrInfo4;
-            /// <summary>0x064, finderInfo[5], CNID for Mac OS X directory</summary>
-            public readonly uint drFndrInfo5;
-            /// <summary>0x068, finderInfo[6], first part of Mac OS X volume ID</summary>
-            public readonly uint drFndrInfo6;
-            /// <summary>0x06C, finderInfo[7], second part of Mac OS X volume ID</summary>
-            public readonly uint drFndrInfo7;
-
-            // HFSPlusForkData     allocationFile;
-            /// <summary>0x070</summary>
-            public readonly ulong allocationFile_logicalSize;
-            /// <summary>0x078</summary>
-            public readonly uint allocationFile_clumpSize;
-            /// <summary>0x07C</summary>
-            public readonly uint allocationFile_totalBlocks;
-            /// <summary>0x080</summary>
-            public readonly uint allocationFile_extents_startBlock0;
-            /// <summary>0x084</summary>
-            public readonly uint allocationFile_extents_blockCount0;
-            /// <summary>0x088</summary>
-            public readonly uint allocationFile_extents_startBlock1;
-            /// <summary>0x08C</summary>
-            public readonly uint allocationFile_extents_blockCount1;
-            /// <summary>0x090</summary>
-            public readonly uint allocationFile_extents_startBlock2;
-            /// <summary>0x094</summary>
-            public readonly uint allocationFile_extents_blockCount2;
-            /// <summary>0x098</summary>
-            public readonly uint allocationFile_extents_startBlock3;
-            /// <summary>0x09C</summary>
-            public readonly uint allocationFile_extents_blockCount3;
-            /// <summary>0x0A0</summary>
-            public readonly uint allocationFile_extents_startBlock4;
-            /// <summary>0x0A4</summary>
-            public readonly uint allocationFile_extents_blockCount4;
-            /// <summary>0x0A8</summary>
-            public readonly uint allocationFile_extents_startBlock5;
-            /// <summary>0x0AC</summary>
-            public readonly uint allocationFile_extents_blockCount5;
-            /// <summary>0x0B0</summary>
-            public readonly uint allocationFile_extents_startBlock6;
-            /// <summary>0x0B4</summary>
-            public readonly uint allocationFile_extents_blockCount6;
-            /// <summary>0x0B8</summary>
-            public readonly uint allocationFile_extents_startBlock7;
-            /// <summary>0x0BC</summary>
-            public readonly uint allocationFile_extents_blockCount7;
-
-            // HFSPlusForkData     extentsFile;
-            /// <summary>0x0C0</summary>
-            public readonly ulong extentsFile_logicalSize;
-            /// <summary>0x0C8</summary>
-            public readonly uint extentsFile_clumpSize;
-            /// <summary>0x0CC</summary>
-            public readonly uint extentsFile_totalBlocks;
-            /// <summary>0x0D0</summary>
-            public readonly uint extentsFile_extents_startBlock0;
-            /// <summary>0x0D4</summary>
-            public readonly uint extentsFile_extents_blockCount0;
-            /// <summary>0x0D8</summary>
-            public readonly uint extentsFile_extents_startBlock1;
-            /// <summary>0x0DC</summary>
-            public readonly uint extentsFile_extents_blockCount1;
-            /// <summary>0x0E0</summary>
-            public readonly uint extentsFile_extents_startBlock2;
-            /// <summary>0x0E4</summary>
-            public readonly uint extentsFile_extents_blockCount2;
-            /// <summary>0x0E8</summary>
-            public readonly uint extentsFile_extents_startBlock3;
-            /// <summary>0x0EC</summary>
-            public readonly uint extentsFile_extents_blockCount3;
-            /// <summary>0x0F0</summary>
-            public readonly uint extentsFile_extents_startBlock4;
-            /// <summary>0x0F4</summary>
-            public readonly uint extentsFile_extents_blockCount4;
-            /// <summary>0x0F8</summary>
-            public readonly uint extentsFile_extents_startBlock5;
-            /// <summary>0x0FC</summary>
-            public readonly uint extentsFile_extents_blockCount5;
-            /// <summary>0x100</summary>
-            public readonly uint extentsFile_extents_startBlock6;
-            /// <summary>0x104</summary>
-            public readonly uint extentsFile_extents_blockCount6;
-            /// <summary>0x108</summary>
-            public readonly uint extentsFile_extents_startBlock7;
-            /// <summary>0x10C</summary>
-            public readonly uint extentsFile_extents_blockCount7;
-
-            // HFSPlusForkData     catalogFile;
-            /// <summary>0x110</summary>
-            public readonly ulong catalogFile_logicalSize;
-            /// <summary>0x118</summary>
-            public readonly uint catalogFile_clumpSize;
-            /// <summary>0x11C</summary>
-            public readonly uint catalogFile_totalBlocks;
-            /// <summary>0x120</summary>
-            public readonly uint catalogFile_extents_startBlock0;
-            /// <summary>0x124</summary>
-            public readonly uint catalogFile_extents_blockCount0;
-            /// <summary>0x128</summary>
-            public readonly uint catalogFile_extents_startBlock1;
-            /// <summary>0x12C</summary>
-            public readonly uint catalogFile_extents_blockCount1;
-            /// <summary>0x130</summary>
-            public readonly uint catalogFile_extents_startBlock2;
-            /// <summary>0x134</summary>
-            public readonly uint catalogFile_extents_blockCount2;
-            /// <summary>0x138</summary>
-            public readonly uint catalogFile_extents_startBlock3;
-            /// <summary>0x13C</summary>
-            public readonly uint catalogFile_extents_blockCount3;
-            /// <summary>0x140</summary>
-            public readonly uint catalogFile_extents_startBlock4;
-            /// <summary>0x144</summary>
-            public readonly uint catalogFile_extents_blockCount4;
-            /// <summary>0x148</summary>
-            public readonly uint catalogFile_extents_startBlock5;
-            /// <summary>0x14C</summary>
-            public readonly uint catalogFile_extents_blockCount5;
-            /// <summary>0x150</summary>
-            public readonly uint catalogFile_extents_startBlock6;
-            /// <summary>0x154</summary>
-            public readonly uint catalogFile_extents_blockCount6;
-            /// <summary>0x158</summary>
-            public readonly uint catalogFile_extents_startBlock7;
-            /// <summary>0x15C</summary>
-            public readonly uint catalogFile_extents_blockCount7;
-
-            // HFSPlusForkData     attributesFile;
-            /// <summary>0x160</summary>
-            public readonly ulong attributesFile_logicalSize;
-            /// <summary>0x168</summary>
-            public readonly uint attributesFile_clumpSize;
-            /// <summary>0x16C</summary>
-            public readonly uint attributesFile_totalBlocks;
-            /// <summary>0x170</summary>
-            public readonly uint attributesFile_extents_startBlock0;
-            /// <summary>0x174</summary>
-            public readonly uint attributesFile_extents_blockCount0;
-            /// <summary>0x178</summary>
-            public readonly uint attributesFile_extents_startBlock1;
-            /// <summary>0x17C</summary>
-            public readonly uint attributesFile_extents_blockCount1;
-            /// <summary>0x180</summary>
-            public readonly uint attributesFile_extents_startBlock2;
-            /// <summary>0x184</summary>
-            public readonly uint attributesFile_extents_blockCount2;
-            /// <summary>0x188</summary>
-            public readonly uint attributesFile_extents_startBlock3;
-            /// <summary>0x18C</summary>
-            public readonly uint attributesFile_extents_blockCount3;
-            /// <summary>0x190</summary>
-            public readonly uint attributesFile_extents_startBlock4;
-            /// <summary>0x194</summary>
-            public readonly uint attributesFile_extents_blockCount4;
-            /// <summary>0x198</summary>
-            public readonly uint attributesFile_extents_startBlock5;
-            /// <summary>0x19C</summary>
-            public readonly uint attributesFile_extents_blockCount5;
-            /// <summary>0x1A0</summary>
-            public readonly uint attributesFile_extents_startBlock6;
-            /// <summary>0x1A4</summary>
-            public readonly uint attributesFile_extents_blockCount6;
-            /// <summary>0x1A8</summary>
-            public readonly uint attributesFile_extents_startBlock7;
-            /// <summary>0x1AC</summary>
-            public readonly uint attributesFile_extents_blockCount7;
-
-            // HFSPlusForkData     startupFile;
-            /// <summary>0x1B0</summary>
-            public readonly ulong startupFile_logicalSize;
-            /// <summary>0x1B8</summary>
-            public readonly uint startupFile_clumpSize;
-            /// <summary>0x1BC</summary>
-            public readonly uint startupFile_totalBlocks;
-            /// <summary>0x1C0</summary>
-            public readonly uint startupFile_extents_startBlock0;
-            /// <summary>0x1C4</summary>
-            public readonly uint startupFile_extents_blockCount0;
-            /// <summary>0x1C8</summary>
-            public readonly uint startupFile_extents_startBlock1;
-            /// <summary>0x1D0</summary>
-            public readonly uint startupFile_extents_blockCount1;
-            /// <summary>0x1D4</summary>
-            public readonly uint startupFile_extents_startBlock2;
-            /// <summary>0x1D8</summary>
-            public readonly uint startupFile_extents_blockCount2;
-            /// <summary>0x1DC</summary>
-            public readonly uint startupFile_extents_startBlock3;
-            /// <summary>0x1E0</summary>
-            public readonly uint startupFile_extents_blockCount3;
-            /// <summary>0x1E4</summary>
-            public readonly uint startupFile_extents_startBlock4;
-            /// <summary>0x1E8</summary>
-            public readonly uint startupFile_extents_blockCount4;
-            /// <summary>0x1EC</summary>
-            public readonly uint startupFile_extents_startBlock5;
-            /// <summary>0x1F0</summary>
-            public readonly uint startupFile_extents_blockCount5;
-            /// <summary>0x1F4</summary>
-            public readonly uint startupFile_extents_startBlock6;
-            /// <summary>0x1F8</summary>
-            public readonly uint startupFile_extents_blockCount6;
-            /// <summary>0x1FC</summary>
-            public readonly uint startupFile_extents_startBlock7;
-            /// <summary>0x200</summary>
-            public readonly uint startupFile_extents_blockCount7;
+            sb.AppendFormat("Filesystem version is {0}.", vh.version).AppendLine();
+            sb.AppendLine("This version is not supported yet.");
         }
+
+        information = sb.ToString();
+    }
+
+    /// <summary>HFS+ Volume Header, should be at offset 0x0400 bytes in volume with a size of 532 bytes</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct VolumeHeader
+    {
+        /// <summary>0x000, "H+" for HFS+, "HX" for HFSX</summary>
+        public ushort signature;
+        /// <summary>0x002, 4 for HFS+, 5 for HFSX</summary>
+        public readonly ushort version;
+        /// <summary>0x004, Volume attributes</summary>
+        public readonly uint attributes;
+        /// <summary>
+        ///     0x008, Implementation that last mounted the volume. Reserved by Apple: "8.10" Mac OS 8.1 to 9.2.2 "10.0" Mac
+        ///     OS X "HFSJ" Journaled implementation "fsck" /sbin/fsck
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] lastMountedVersion;
+        /// <summary>0x00C, Allocation block number containing the journal</summary>
+        public readonly uint journalInfoBlock;
+        /// <summary>0x010, Date of volume creation</summary>
+        public readonly uint createDate;
+        /// <summary>0x014, Date of last volume modification</summary>
+        public readonly uint modifyDate;
+        /// <summary>0x018, Date of last backup</summary>
+        public readonly uint backupDate;
+        /// <summary>0x01C, Date of last consistency check</summary>
+        public readonly uint checkedDate;
+        /// <summary>0x020, File on the volume</summary>
+        public readonly uint fileCount;
+        /// <summary>0x024, Folders on the volume</summary>
+        public readonly uint folderCount;
+        /// <summary>0x028, Bytes per allocation block</summary>
+        public readonly uint blockSize;
+        /// <summary>0x02C, Allocation blocks on the volume</summary>
+        public readonly uint totalBlocks;
+        /// <summary>0x030, Free allocation blocks</summary>
+        public readonly uint freeBlocks;
+        /// <summary>0x034, Hint for next allocation block</summary>
+        public readonly uint nextAllocation;
+        /// <summary>0x038, Resource fork clump size</summary>
+        public readonly uint rsrcClumpSize;
+        /// <summary>0x03C, Data fork clump size</summary>
+        public readonly uint dataClumpSize;
+        /// <summary>0x040, Next unused CNID</summary>
+        public readonly uint nextCatalogID;
+        /// <summary>0x044, Times that the volume has been mounted writable</summary>
+        public readonly uint writeCount;
+        /// <summary>0x048, Used text encoding hints</summary>
+        public readonly ulong encodingsBitmap;
+        /// <summary>0x050, finderInfo[0], CNID for bootable system's directory</summary>
+        public readonly uint drFndrInfo0;
+        /// <summary>0x054, finderInfo[1], CNID of the directory containing the boot application</summary>
+        public readonly uint drFndrInfo1;
+        /// <summary>0x058, finderInfo[2], CNID of the directory that should be opened on boot</summary>
+        public readonly uint drFndrInfo2;
+        /// <summary>0x05C, finderInfo[3], CNID for Mac OS 8 or 9 directory</summary>
+        public readonly uint drFndrInfo3;
+        /// <summary>0x060, finderInfo[4], Reserved</summary>
+        public readonly uint drFndrInfo4;
+        /// <summary>0x064, finderInfo[5], CNID for Mac OS X directory</summary>
+        public readonly uint drFndrInfo5;
+        /// <summary>0x068, finderInfo[6], first part of Mac OS X volume ID</summary>
+        public readonly uint drFndrInfo6;
+        /// <summary>0x06C, finderInfo[7], second part of Mac OS X volume ID</summary>
+        public readonly uint drFndrInfo7;
+
+        // HFSPlusForkData     allocationFile;
+        /// <summary>0x070</summary>
+        public readonly ulong allocationFile_logicalSize;
+        /// <summary>0x078</summary>
+        public readonly uint allocationFile_clumpSize;
+        /// <summary>0x07C</summary>
+        public readonly uint allocationFile_totalBlocks;
+        /// <summary>0x080</summary>
+        public readonly uint allocationFile_extents_startBlock0;
+        /// <summary>0x084</summary>
+        public readonly uint allocationFile_extents_blockCount0;
+        /// <summary>0x088</summary>
+        public readonly uint allocationFile_extents_startBlock1;
+        /// <summary>0x08C</summary>
+        public readonly uint allocationFile_extents_blockCount1;
+        /// <summary>0x090</summary>
+        public readonly uint allocationFile_extents_startBlock2;
+        /// <summary>0x094</summary>
+        public readonly uint allocationFile_extents_blockCount2;
+        /// <summary>0x098</summary>
+        public readonly uint allocationFile_extents_startBlock3;
+        /// <summary>0x09C</summary>
+        public readonly uint allocationFile_extents_blockCount3;
+        /// <summary>0x0A0</summary>
+        public readonly uint allocationFile_extents_startBlock4;
+        /// <summary>0x0A4</summary>
+        public readonly uint allocationFile_extents_blockCount4;
+        /// <summary>0x0A8</summary>
+        public readonly uint allocationFile_extents_startBlock5;
+        /// <summary>0x0AC</summary>
+        public readonly uint allocationFile_extents_blockCount5;
+        /// <summary>0x0B0</summary>
+        public readonly uint allocationFile_extents_startBlock6;
+        /// <summary>0x0B4</summary>
+        public readonly uint allocationFile_extents_blockCount6;
+        /// <summary>0x0B8</summary>
+        public readonly uint allocationFile_extents_startBlock7;
+        /// <summary>0x0BC</summary>
+        public readonly uint allocationFile_extents_blockCount7;
+
+        // HFSPlusForkData     extentsFile;
+        /// <summary>0x0C0</summary>
+        public readonly ulong extentsFile_logicalSize;
+        /// <summary>0x0C8</summary>
+        public readonly uint extentsFile_clumpSize;
+        /// <summary>0x0CC</summary>
+        public readonly uint extentsFile_totalBlocks;
+        /// <summary>0x0D0</summary>
+        public readonly uint extentsFile_extents_startBlock0;
+        /// <summary>0x0D4</summary>
+        public readonly uint extentsFile_extents_blockCount0;
+        /// <summary>0x0D8</summary>
+        public readonly uint extentsFile_extents_startBlock1;
+        /// <summary>0x0DC</summary>
+        public readonly uint extentsFile_extents_blockCount1;
+        /// <summary>0x0E0</summary>
+        public readonly uint extentsFile_extents_startBlock2;
+        /// <summary>0x0E4</summary>
+        public readonly uint extentsFile_extents_blockCount2;
+        /// <summary>0x0E8</summary>
+        public readonly uint extentsFile_extents_startBlock3;
+        /// <summary>0x0EC</summary>
+        public readonly uint extentsFile_extents_blockCount3;
+        /// <summary>0x0F0</summary>
+        public readonly uint extentsFile_extents_startBlock4;
+        /// <summary>0x0F4</summary>
+        public readonly uint extentsFile_extents_blockCount4;
+        /// <summary>0x0F8</summary>
+        public readonly uint extentsFile_extents_startBlock5;
+        /// <summary>0x0FC</summary>
+        public readonly uint extentsFile_extents_blockCount5;
+        /// <summary>0x100</summary>
+        public readonly uint extentsFile_extents_startBlock6;
+        /// <summary>0x104</summary>
+        public readonly uint extentsFile_extents_blockCount6;
+        /// <summary>0x108</summary>
+        public readonly uint extentsFile_extents_startBlock7;
+        /// <summary>0x10C</summary>
+        public readonly uint extentsFile_extents_blockCount7;
+
+        // HFSPlusForkData     catalogFile;
+        /// <summary>0x110</summary>
+        public readonly ulong catalogFile_logicalSize;
+        /// <summary>0x118</summary>
+        public readonly uint catalogFile_clumpSize;
+        /// <summary>0x11C</summary>
+        public readonly uint catalogFile_totalBlocks;
+        /// <summary>0x120</summary>
+        public readonly uint catalogFile_extents_startBlock0;
+        /// <summary>0x124</summary>
+        public readonly uint catalogFile_extents_blockCount0;
+        /// <summary>0x128</summary>
+        public readonly uint catalogFile_extents_startBlock1;
+        /// <summary>0x12C</summary>
+        public readonly uint catalogFile_extents_blockCount1;
+        /// <summary>0x130</summary>
+        public readonly uint catalogFile_extents_startBlock2;
+        /// <summary>0x134</summary>
+        public readonly uint catalogFile_extents_blockCount2;
+        /// <summary>0x138</summary>
+        public readonly uint catalogFile_extents_startBlock3;
+        /// <summary>0x13C</summary>
+        public readonly uint catalogFile_extents_blockCount3;
+        /// <summary>0x140</summary>
+        public readonly uint catalogFile_extents_startBlock4;
+        /// <summary>0x144</summary>
+        public readonly uint catalogFile_extents_blockCount4;
+        /// <summary>0x148</summary>
+        public readonly uint catalogFile_extents_startBlock5;
+        /// <summary>0x14C</summary>
+        public readonly uint catalogFile_extents_blockCount5;
+        /// <summary>0x150</summary>
+        public readonly uint catalogFile_extents_startBlock6;
+        /// <summary>0x154</summary>
+        public readonly uint catalogFile_extents_blockCount6;
+        /// <summary>0x158</summary>
+        public readonly uint catalogFile_extents_startBlock7;
+        /// <summary>0x15C</summary>
+        public readonly uint catalogFile_extents_blockCount7;
+
+        // HFSPlusForkData     attributesFile;
+        /// <summary>0x160</summary>
+        public readonly ulong attributesFile_logicalSize;
+        /// <summary>0x168</summary>
+        public readonly uint attributesFile_clumpSize;
+        /// <summary>0x16C</summary>
+        public readonly uint attributesFile_totalBlocks;
+        /// <summary>0x170</summary>
+        public readonly uint attributesFile_extents_startBlock0;
+        /// <summary>0x174</summary>
+        public readonly uint attributesFile_extents_blockCount0;
+        /// <summary>0x178</summary>
+        public readonly uint attributesFile_extents_startBlock1;
+        /// <summary>0x17C</summary>
+        public readonly uint attributesFile_extents_blockCount1;
+        /// <summary>0x180</summary>
+        public readonly uint attributesFile_extents_startBlock2;
+        /// <summary>0x184</summary>
+        public readonly uint attributesFile_extents_blockCount2;
+        /// <summary>0x188</summary>
+        public readonly uint attributesFile_extents_startBlock3;
+        /// <summary>0x18C</summary>
+        public readonly uint attributesFile_extents_blockCount3;
+        /// <summary>0x190</summary>
+        public readonly uint attributesFile_extents_startBlock4;
+        /// <summary>0x194</summary>
+        public readonly uint attributesFile_extents_blockCount4;
+        /// <summary>0x198</summary>
+        public readonly uint attributesFile_extents_startBlock5;
+        /// <summary>0x19C</summary>
+        public readonly uint attributesFile_extents_blockCount5;
+        /// <summary>0x1A0</summary>
+        public readonly uint attributesFile_extents_startBlock6;
+        /// <summary>0x1A4</summary>
+        public readonly uint attributesFile_extents_blockCount6;
+        /// <summary>0x1A8</summary>
+        public readonly uint attributesFile_extents_startBlock7;
+        /// <summary>0x1AC</summary>
+        public readonly uint attributesFile_extents_blockCount7;
+
+        // HFSPlusForkData     startupFile;
+        /// <summary>0x1B0</summary>
+        public readonly ulong startupFile_logicalSize;
+        /// <summary>0x1B8</summary>
+        public readonly uint startupFile_clumpSize;
+        /// <summary>0x1BC</summary>
+        public readonly uint startupFile_totalBlocks;
+        /// <summary>0x1C0</summary>
+        public readonly uint startupFile_extents_startBlock0;
+        /// <summary>0x1C4</summary>
+        public readonly uint startupFile_extents_blockCount0;
+        /// <summary>0x1C8</summary>
+        public readonly uint startupFile_extents_startBlock1;
+        /// <summary>0x1D0</summary>
+        public readonly uint startupFile_extents_blockCount1;
+        /// <summary>0x1D4</summary>
+        public readonly uint startupFile_extents_startBlock2;
+        /// <summary>0x1D8</summary>
+        public readonly uint startupFile_extents_blockCount2;
+        /// <summary>0x1DC</summary>
+        public readonly uint startupFile_extents_startBlock3;
+        /// <summary>0x1E0</summary>
+        public readonly uint startupFile_extents_blockCount3;
+        /// <summary>0x1E4</summary>
+        public readonly uint startupFile_extents_startBlock4;
+        /// <summary>0x1E8</summary>
+        public readonly uint startupFile_extents_blockCount4;
+        /// <summary>0x1EC</summary>
+        public readonly uint startupFile_extents_startBlock5;
+        /// <summary>0x1F0</summary>
+        public readonly uint startupFile_extents_blockCount5;
+        /// <summary>0x1F4</summary>
+        public readonly uint startupFile_extents_startBlock6;
+        /// <summary>0x1F8</summary>
+        public readonly uint startupFile_extents_blockCount6;
+        /// <summary>0x1FC</summary>
+        public readonly uint startupFile_extents_startBlock7;
+        /// <summary>0x200</summary>
+        public readonly uint startupFile_extents_blockCount7;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleMFS/AppleMFS.cs b/Aaru.Filesystems/AppleMFS/AppleMFS.cs
index 537bcfda5..efe4eda47 100644
--- a/Aaru.Filesystems/AppleMFS/AppleMFS.cs
+++ b/Aaru.Filesystems/AppleMFS/AppleMFS.cs
@@ -36,57 +36,56 @@ using System.Text;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh Volume II
+/// <inheritdoc />
+/// <summary>Implements the Apple Macintosh File System</summary>
+public sealed partial class AppleMFS : IReadOnlyFilesystem
 {
-    // Information from Inside Macintosh Volume II
+    bool                        _mounted;
+    bool                        _debug;
+    IMediaImage                 _device;
+    ulong                       _partitionStart;
+    Dictionary<uint, string>    _idToFilename;
+    Dictionary<uint, FileEntry> _idToEntry;
+    Dictionary<string, uint>    _filenameToId;
+    MasterDirectoryBlock        _volMdb;
+    byte[]                      _bootBlocks;
+    byte[]                      _mdbBlocks;
+    byte[]                      _directoryBlocks;
+    byte[]                      _blockMapBytes;
+    uint[]                      _blockMap;
+    int                         _sectorsPerBlock;
+    byte[]                      _bootTags;
+    byte[]                      _mdbTags;
+    byte[]                      _directoryTags;
+    byte[]                      _bitmapTags;
+
     /// <inheritdoc />
-    /// <summary>Implements the Apple Macintosh File System</summary>
-    public sealed partial class AppleMFS : IReadOnlyFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Apple Macintosh File System";
+    /// <inheritdoc />
+    public Guid Id => new("36405F8D-0D26-4066-6538-5DBF5D065C3A");
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    // TODO: Implement Finder namespace (requires decoding Desktop database)
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
+        new (string name, Type type, string description)[]
+            {};
+
+    /// <inheritdoc />
+    public Dictionary<string, string> Namespaces => null;
+
+    static Dictionary<string, string> GetDefaultOptions() => new()
     {
-        bool                        _mounted;
-        bool                        _debug;
-        IMediaImage                 _device;
-        ulong                       _partitionStart;
-        Dictionary<uint, string>    _idToFilename;
-        Dictionary<uint, FileEntry> _idToEntry;
-        Dictionary<string, uint>    _filenameToId;
-        MasterDirectoryBlock        _volMdb;
-        byte[]                      _bootBlocks;
-        byte[]                      _mdbBlocks;
-        byte[]                      _directoryBlocks;
-        byte[]                      _blockMapBytes;
-        uint[]                      _blockMap;
-        int                         _sectorsPerBlock;
-        byte[]                      _bootTags;
-        byte[]                      _mdbTags;
-        byte[]                      _directoryTags;
-        byte[]                      _bitmapTags;
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Apple Macintosh File System";
-        /// <inheritdoc />
-        public Guid Id => new("36405F8D-0D26-4066-6538-5DBF5D065C3A");
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        // TODO: Implement Finder namespace (requires decoding Desktop database)
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[]
-                {};
-
-        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => null;
-
-        static Dictionary<string, string> GetDefaultOptions() => new()
         {
-            {
-                "debug", false.ToString()
-            }
-        };
-    }
+            "debug", false.ToString()
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleMFS/Consts.cs b/Aaru.Filesystems/AppleMFS/Consts.cs
index 5ea118282..c796b7431 100644
--- a/Aaru.Filesystems/AppleMFS/Consts.cs
+++ b/Aaru.Filesystems/AppleMFS/Consts.cs
@@ -32,21 +32,20 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh Volume II
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class AppleMFS
 {
-    // Information from Inside Macintosh Volume II
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class AppleMFS
-    {
-        const ushort MFS_MAGIC = 0xD2D7;
+    const ushort MFS_MAGIC = 0xD2D7;
 
-        const short DIRID_TRASH    = -3;
-        const short DIRID_DESKTOP  = -2;
-        const short DIRID_TEMPLATE = -1;
-        const short DIRID_ROOT     = 0;
+    const short DIRID_TRASH    = -3;
+    const short DIRID_DESKTOP  = -2;
+    const short DIRID_TEMPLATE = -1;
+    const short DIRID_ROOT     = 0;
 
-        const int BMAP_FREE = 0;
-        const int BMAP_LAST = 1;
-        const int BMAP_DIR  = 0xFFF;
-    }
+    const int BMAP_FREE = 0;
+    const int BMAP_LAST = 1;
+    const int BMAP_DIR  = 0xFFF;
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleMFS/Dir.cs b/Aaru.Filesystems/AppleMFS/Dir.cs
index 9b84acf43..ef26add9f 100644
--- a/Aaru.Filesystems/AppleMFS/Dir.cs
+++ b/Aaru.Filesystems/AppleMFS/Dir.cs
@@ -37,121 +37,120 @@ using Aaru.CommonTypes.Enums;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh Volume II
+public sealed partial class AppleMFS
 {
-    // Information from Inside Macintosh Volume II
-    public sealed partial class AppleMFS
+    /// <inheritdoc />
+    public ErrorNumber ReadDir(string path, out List<string> contents)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadDir(string path, out List<string> contents)
+        contents = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(!string.IsNullOrEmpty(path) &&
+           string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
+            return ErrorNumber.NotSupported;
+
+        contents = _idToFilename.Select(kvp => kvp.Value).ToList();
+
+        if(_debug)
         {
-            contents = null;
+            contents.Add("$");
+            contents.Add("$Bitmap");
+            contents.Add("$MDB");
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            if(!string.IsNullOrEmpty(path) &&
-               string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
-                return ErrorNumber.NotSupported;
-
-            contents = _idToFilename.Select(kvp => kvp.Value).ToList();
-
-            if(_debug)
-            {
-                contents.Add("$");
-                contents.Add("$Bitmap");
-                contents.Add("$MDB");
-
-                if(_bootBlocks != null)
-                    contents.Add("$Boot");
-            }
-
-            contents.Sort();
-
-            return ErrorNumber.NoError;
+            if(_bootBlocks != null)
+                contents.Add("$Boot");
         }
 
-        bool FillDirectory()
+        contents.Sort();
+
+        return ErrorNumber.NoError;
+    }
+
+    bool FillDirectory()
+    {
+        _idToFilename = new Dictionary<uint, string>();
+        _idToEntry    = new Dictionary<uint, FileEntry>();
+        _filenameToId = new Dictionary<string, uint>();
+
+        int offset = 0;
+
+        while(offset + 51 < _directoryBlocks.Length)
         {
-            _idToFilename = new Dictionary<uint, string>();
-            _idToEntry    = new Dictionary<uint, FileEntry>();
-            _filenameToId = new Dictionary<string, uint>();
-
-            int offset = 0;
-
-            while(offset + 51 < _directoryBlocks.Length)
+            var entry = new FileEntry
             {
-                var entry = new FileEntry
-                {
-                    flFlags = (FileFlags)_directoryBlocks[offset + 0]
-                };
+                flFlags = (FileFlags)_directoryBlocks[offset + 0]
+            };
 
-                if(!entry.flFlags.HasFlag(FileFlags.Used))
-                    break;
+            if(!entry.flFlags.HasFlag(FileFlags.Used))
+                break;
 
-                entry.flTyp = _directoryBlocks[offset + 1];
+            entry.flTyp = _directoryBlocks[offset + 1];
 
-                entry.flUsrWds =
-                    Marshal.ByteArrayToStructureBigEndian<AppleCommon.FInfo>(_directoryBlocks, offset + 2, 16);
+            entry.flUsrWds =
+                Marshal.ByteArrayToStructureBigEndian<AppleCommon.FInfo>(_directoryBlocks, offset + 2, 16);
 
-                entry.flFlNum  = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 18);
-                entry.flStBlk  = BigEndianBitConverter.ToUInt16(_directoryBlocks, offset + 22);
-                entry.flLgLen  = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 24);
-                entry.flPyLen  = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 28);
-                entry.flRStBlk = BigEndianBitConverter.ToUInt16(_directoryBlocks, offset + 32);
-                entry.flRLgLen = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 34);
-                entry.flRPyLen = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 38);
-                entry.flCrDat  = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 42);
-                entry.flMdDat  = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 46);
-                entry.flNam    = new byte[_directoryBlocks[offset + 50] + 1];
-                Array.Copy(_directoryBlocks, offset + 50, entry.flNam, 0, entry.flNam.Length);
+            entry.flFlNum  = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 18);
+            entry.flStBlk  = BigEndianBitConverter.ToUInt16(_directoryBlocks, offset + 22);
+            entry.flLgLen  = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 24);
+            entry.flPyLen  = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 28);
+            entry.flRStBlk = BigEndianBitConverter.ToUInt16(_directoryBlocks, offset + 32);
+            entry.flRLgLen = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 34);
+            entry.flRPyLen = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 38);
+            entry.flCrDat  = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 42);
+            entry.flMdDat  = BigEndianBitConverter.ToUInt32(_directoryBlocks, offset + 46);
+            entry.flNam    = new byte[_directoryBlocks[offset + 50] + 1];
+            Array.Copy(_directoryBlocks, offset + 50, entry.flNam, 0, entry.flNam.Length);
 
-                string lowerFilename = StringHandlers.PascalToString(entry.flNam, Encoding).ToLowerInvariant().
-                                                      Replace('/', ':');
+            string lowerFilename = StringHandlers.PascalToString(entry.flNam, Encoding).ToLowerInvariant().
+                                                  Replace('/', ':');
 
-                if(entry.flFlags.HasFlag(FileFlags.Used)     &&
-                   !_idToFilename.ContainsKey(entry.flFlNum) &&
-                   !_idToEntry.ContainsKey(entry.flFlNum)    &&
-                   !_filenameToId.ContainsKey(lowerFilename) &&
-                   entry.flFlNum > 0)
-                {
-                    _idToEntry.Add(entry.flFlNum, entry);
+            if(entry.flFlags.HasFlag(FileFlags.Used)     &&
+               !_idToFilename.ContainsKey(entry.flFlNum) &&
+               !_idToEntry.ContainsKey(entry.flFlNum)    &&
+               !_filenameToId.ContainsKey(lowerFilename) &&
+               entry.flFlNum > 0)
+            {
+                _idToEntry.Add(entry.flFlNum, entry);
 
-                    _idToFilename.Add(entry.flFlNum,
-                                      StringHandlers.PascalToString(entry.flNam, Encoding).Replace('/', ':'));
+                _idToFilename.Add(entry.flFlNum,
+                                  StringHandlers.PascalToString(entry.flNam, Encoding).Replace('/', ':'));
 
-                    _filenameToId.Add(lowerFilename, entry.flFlNum);
+                _filenameToId.Add(lowerFilename, entry.flFlNum);
 
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flFlags = {0}", entry.flFlags);
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flTyp = {0}", entry.flTyp);
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flFlNum = {0}", entry.flFlNum);
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flStBlk = {0}", entry.flStBlk);
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flLgLen = {0}", entry.flLgLen);
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flPyLen = {0}", entry.flPyLen);
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flRStBlk = {0}", entry.flRStBlk);
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flRLgLen = {0}", entry.flRLgLen);
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flRPyLen = {0}", entry.flRPyLen);
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flFlags = {0}", entry.flFlags);
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flTyp = {0}", entry.flTyp);
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flFlNum = {0}", entry.flFlNum);
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flStBlk = {0}", entry.flStBlk);
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flLgLen = {0}", entry.flLgLen);
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flPyLen = {0}", entry.flPyLen);
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flRStBlk = {0}", entry.flRStBlk);
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flRLgLen = {0}", entry.flRLgLen);
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flRPyLen = {0}", entry.flRPyLen);
 
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flCrDat = {0}",
-                                               DateHandlers.MacToDateTime(entry.flCrDat));
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flCrDat = {0}",
+                                           DateHandlers.MacToDateTime(entry.flCrDat));
 
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flMdDat = {0}",
-                                               DateHandlers.MacToDateTime(entry.flMdDat));
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flMdDat = {0}",
+                                           DateHandlers.MacToDateTime(entry.flMdDat));
 
-                    AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flNam0 = {0}",
-                                               StringHandlers.PascalToString(entry.flNam, Encoding));
-                }
-
-                offset += 50 + entry.flNam.Length;
-
-                // "Entries are always an integral number of words"
-                if(offset % 2 != 0)
-                    offset++;
-
-                // TODO: "Entries don't cross logical block boundaries"
+                AaruConsole.DebugWriteLine("DEBUG (AppleMFS plugin)", "entry.flNam0 = {0}",
+                                           StringHandlers.PascalToString(entry.flNam, Encoding));
             }
 
-            return true;
+            offset += 50 + entry.flNam.Length;
+
+            // "Entries are always an integral number of words"
+            if(offset % 2 != 0)
+                offset++;
+
+            // TODO: "Entries don't cross logical block boundaries"
         }
+
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleMFS/File.cs b/Aaru.Filesystems/AppleMFS/File.cs
index f0e899201..f599449ed 100644
--- a/Aaru.Filesystems/AppleMFS/File.cs
+++ b/Aaru.Filesystems/AppleMFS/File.cs
@@ -38,371 +38,370 @@ using Aaru.Console;
 using Aaru.Helpers;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh Volume II
+public sealed partial class AppleMFS
 {
-    // Information from Inside Macintosh Volume II
-    public sealed partial class AppleMFS
+    /// <inheritdoc />
+    public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
     {
-        /// <inheritdoc />
-        public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
+        deviceBlock = new long();
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            deviceBlock = new long();
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            string[] pathElements = path.Split(new[]
+        path = pathElements[0];
+
+        if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
+            return ErrorNumber.NoSuchFile;
+
+        if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
+            return ErrorNumber.NoSuchFile;
+
+        if(fileBlock > entry.flPyLen / _volMdb.drAlBlkSiz)
+            return ErrorNumber.InvalidArgument;
+
+        uint nextBlock = entry.flStBlk;
+        long relBlock  = 0;
+
+        while(true)
+        {
+            if(relBlock == fileBlock)
             {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+                deviceBlock = ((nextBlock - 2) * _sectorsPerBlock) + _volMdb.drAlBlSt + (long)_partitionStart;
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
-
-            path = pathElements[0];
-
-            if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
-                return ErrorNumber.NoSuchFile;
-
-            if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
-                return ErrorNumber.NoSuchFile;
-
-            if(fileBlock > entry.flPyLen / _volMdb.drAlBlkSiz)
-                return ErrorNumber.InvalidArgument;
-
-            uint nextBlock = entry.flStBlk;
-            long relBlock  = 0;
-
-            while(true)
-            {
-                if(relBlock == fileBlock)
-                {
-                    deviceBlock = ((nextBlock - 2) * _sectorsPerBlock) + _volMdb.drAlBlSt + (long)_partitionStart;
-
-                    return ErrorNumber.NoError;
-                }
-
-                if(_blockMap[nextBlock] == BMAP_FREE ||
-                   _blockMap[nextBlock] == BMAP_LAST)
-                    break;
-
-                nextBlock = _blockMap[nextBlock];
-                relBlock++;
+                return ErrorNumber.NoError;
             }
 
-            return ErrorNumber.InOutError;
+            if(_blockMap[nextBlock] == BMAP_FREE ||
+               _blockMap[nextBlock] == BMAP_LAST)
+                break;
+
+            nextBlock = _blockMap[nextBlock];
+            relBlock++;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+        return ErrorNumber.InOutError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+    {
+        attributes = new FileAttributes();
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            attributes = new FileAttributes();
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        path = pathElements[0];
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
+        if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
+            return ErrorNumber.NoSuchFile;
 
-            path = pathElements[0];
+        if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
+            return ErrorNumber.NoSuchFile;
 
-            if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
-                return ErrorNumber.NoSuchFile;
+        if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsAlias))
+            attributes |= FileAttributes.Alias;
 
-            if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
-                return ErrorNumber.NoSuchFile;
+        if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasBundle))
+            attributes |= FileAttributes.Bundle;
 
-            if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsAlias))
-                attributes |= FileAttributes.Alias;
+        if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasBeenInited))
+            attributes |= FileAttributes.HasBeenInited;
 
-            if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasBundle))
-                attributes |= FileAttributes.Bundle;
+        if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasCustomIcon))
+            attributes |= FileAttributes.HasCustomIcon;
 
-            if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasBeenInited))
-                attributes |= FileAttributes.HasBeenInited;
+        if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasNoINITs))
+            attributes |= FileAttributes.HasNoINITs;
 
-            if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasCustomIcon))
-                attributes |= FileAttributes.HasCustomIcon;
+        if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsInvisible))
+            attributes |= FileAttributes.Hidden;
 
-            if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasNoINITs))
-                attributes |= FileAttributes.HasNoINITs;
+        if(entry.flFlags.HasFlag(FileFlags.Locked))
+            attributes |= FileAttributes.Immutable;
 
-            if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsInvisible))
-                attributes |= FileAttributes.Hidden;
+        if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsOnDesk))
+            attributes |= FileAttributes.IsOnDesk;
 
-            if(entry.flFlags.HasFlag(FileFlags.Locked))
-                attributes |= FileAttributes.Immutable;
+        if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsShared))
+            attributes |= FileAttributes.Shared;
 
-            if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsOnDesk))
-                attributes |= FileAttributes.IsOnDesk;
+        if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsStationery))
+            attributes |= FileAttributes.Stationery;
 
-            if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsShared))
-                attributes |= FileAttributes.Shared;
+        if(!attributes.HasFlag(FileAttributes.Alias)  &&
+           !attributes.HasFlag(FileAttributes.Bundle) &&
+           !attributes.HasFlag(FileAttributes.Stationery))
+            attributes |= FileAttributes.File;
 
-            if(entry.flUsrWds.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsStationery))
-                attributes |= FileAttributes.Stationery;
+        attributes |= FileAttributes.BlockUnits;
 
-            if(!attributes.HasFlag(FileAttributes.Alias)  &&
-               !attributes.HasFlag(FileAttributes.Bundle) &&
-               !attributes.HasFlag(FileAttributes.Stationery))
-                attributes |= FileAttributes.File;
+        return ErrorNumber.NoError;
+    }
 
-            attributes |= FileAttributes.BlockUnits;
+    /// <inheritdoc />
+    public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        byte[]      file;
+        ErrorNumber error = ErrorNumber.NoError;
+
+        if(_debug && string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
+            file = _directoryBlocks;
+        else if(_debug                                                                &&
+                string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 &&
+                _bootBlocks                                                      != null)
+            file = _bootBlocks;
+        else if(_debug && string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0)
+            file = _blockMapBytes;
+        else if(_debug && string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0)
+            file = _mdbBlocks;
+        else
+            error = ReadFile(path, out file, false, false);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        if(size == 0)
+        {
+            buf = Array.Empty<byte>();
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+        if(offset >= file.Length)
+            return ErrorNumber.InvalidArgument;
+
+        if(size + offset >= file.Length)
+            size = file.Length - offset;
+
+        buf = new byte[size];
+
+        Array.Copy(file, offset, buf, 0, size);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Stat(string path, out FileEntryInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            byte[]      file;
-            ErrorNumber error = ErrorNumber.NoError;
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            if(_debug && string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
-                file = _directoryBlocks;
-            else if(_debug                                                                &&
-                    string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 &&
-                    _bootBlocks                                                      != null)
-                file = _bootBlocks;
-            else if(_debug && string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0)
-                file = _blockMapBytes;
-            else if(_debug && string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0)
-                file = _mdbBlocks;
-            else
-                error = ReadFile(path, out file, false, false);
+        path = pathElements[0];
 
-            if(error != ErrorNumber.NoError)
-                return error;
+        if(_debug)
+            if(string.Compare(path, "$", StringComparison.InvariantCulture)       == 0 ||
+               string.Compare(path, "$Boot", StringComparison.InvariantCulture)   == 0 ||
+               string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0 ||
+               string.Compare(path, "$MDB", StringComparison.InvariantCulture)    == 0)
+            {
+                stat = new FileEntryInfo
+                {
+                    BlockSize  = _device.Info.SectorSize,
+                    Inode      = 0,
+                    Links      = 1,
+                    Attributes = FileAttributes.System
+                };
 
-            if(size == 0)
+                if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
+                {
+                    stat.Blocks = (_directoryBlocks.Length / stat.BlockSize) +
+                                  (_directoryBlocks.Length % stat.BlockSize);
+
+                    stat.Length = _directoryBlocks.Length;
+                }
+                else if(string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0)
+                {
+                    stat.Blocks = (_blockMapBytes.Length / stat.BlockSize) +
+                                  (_blockMapBytes.Length % stat.BlockSize);
+
+                    stat.Length = _blockMapBytes.Length;
+                }
+                else if(string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 &&
+                        _bootBlocks                                                      != null)
+                {
+                    stat.Blocks = (_bootBlocks.Length / stat.BlockSize) + (_bootBlocks.Length % stat.BlockSize);
+                    stat.Length = _bootBlocks.Length;
+                }
+                else if(string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0)
+                {
+                    stat.Blocks = (_mdbBlocks.Length / stat.BlockSize) + (_mdbBlocks.Length % stat.BlockSize);
+                    stat.Length = _mdbBlocks.Length;
+                }
+                else
+                    return ErrorNumber.InvalidArgument;
+
+                return ErrorNumber.NoError;
+            }
+
+        if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
+            return ErrorNumber.NoSuchFile;
+
+        if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
+            return ErrorNumber.NoSuchFile;
+
+        ErrorNumber error = GetAttributes(path, out FileAttributes attr);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        stat = new FileEntryInfo
+        {
+            Attributes    = attr,
+            Blocks        = entry.flLgLen / _volMdb.drAlBlkSiz,
+            BlockSize     = _volMdb.drAlBlkSiz,
+            CreationTime  = DateHandlers.MacToDateTime(entry.flCrDat),
+            Inode         = entry.flFlNum,
+            LastWriteTime = DateHandlers.MacToDateTime(entry.flMdDat),
+            Length        = entry.flPyLen,
+            Links         = 1
+        };
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadLink(string path, out string dest)
+    {
+        dest = null;
+
+        return ErrorNumber.NotImplemented;
+    }
+
+    ErrorNumber ReadFile(string path, out byte[] buf, bool resourceFork, bool tags)
+    {
+        buf = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
+
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
+
+        path = pathElements[0];
+
+        if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
+            return ErrorNumber.NoSuchFile;
+
+        if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
+            return ErrorNumber.NoSuchFile;
+
+        uint nextBlock;
+
+        if(resourceFork)
+        {
+            if(entry.flRPyLen == 0)
             {
                 buf = Array.Empty<byte>();
 
                 return ErrorNumber.NoError;
             }
 
-            if(offset >= file.Length)
-                return ErrorNumber.InvalidArgument;
+            nextBlock = entry.flRStBlk;
+        }
+        else
+        {
+            if(entry.flPyLen == 0)
+            {
+                buf = Array.Empty<byte>();
 
-            if(size + offset >= file.Length)
-                size = file.Length - offset;
+                return ErrorNumber.NoError;
+            }
 
-            buf = new byte[size];
-
-            Array.Copy(file, offset, buf, 0, size);
-
-            return ErrorNumber.NoError;
+            nextBlock = entry.flStBlk;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Stat(string path, out FileEntryInfo stat)
+        var ms = new MemoryStream();
+
+        do
         {
-            stat = null;
+            byte[]      sectors;
+            ErrorNumber errno;
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            errno =
+                tags
+                    ? _device.
+                        ReadSectorsTag((ulong)((nextBlock - 2) * _sectorsPerBlock) + _volMdb.drAlBlSt + _partitionStart,
+                                       (uint)_sectorsPerBlock, SectorTagType.AppleSectorTag, out sectors)
+                    : _device.
+                        ReadSectors((ulong)((nextBlock - 2) * _sectorsPerBlock) + _volMdb.drAlBlSt + _partitionStart,
+                                    (uint)_sectorsPerBlock, out sectors);
 
-            string[] pathElements = path.Split(new[]
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sectors, 0, sectors.Length);
+
+            if(_blockMap[nextBlock] == BMAP_FREE)
             {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+                AaruConsole.ErrorWriteLine("File truncated at block {0}", nextBlock);
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
+                break;
+            }
 
-            path = pathElements[0];
+            nextBlock = _blockMap[nextBlock];
+        } while(nextBlock > BMAP_LAST);
 
-            if(_debug)
-                if(string.Compare(path, "$", StringComparison.InvariantCulture)       == 0 ||
-                   string.Compare(path, "$Boot", StringComparison.InvariantCulture)   == 0 ||
-                   string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0 ||
-                   string.Compare(path, "$MDB", StringComparison.InvariantCulture)    == 0)
-                {
-                    stat = new FileEntryInfo
-                    {
-                        BlockSize  = _device.Info.SectorSize,
-                        Inode      = 0,
-                        Links      = 1,
-                        Attributes = FileAttributes.System
-                    };
-
-                    if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
-                    {
-                        stat.Blocks = (_directoryBlocks.Length / stat.BlockSize) +
-                                      (_directoryBlocks.Length % stat.BlockSize);
-
-                        stat.Length = _directoryBlocks.Length;
-                    }
-                    else if(string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0)
-                    {
-                        stat.Blocks = (_blockMapBytes.Length / stat.BlockSize) +
-                                      (_blockMapBytes.Length % stat.BlockSize);
-
-                        stat.Length = _blockMapBytes.Length;
-                    }
-                    else if(string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0 &&
-                            _bootBlocks                                                      != null)
-                    {
-                        stat.Blocks = (_bootBlocks.Length / stat.BlockSize) + (_bootBlocks.Length % stat.BlockSize);
-                        stat.Length = _bootBlocks.Length;
-                    }
-                    else if(string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0)
-                    {
-                        stat.Blocks = (_mdbBlocks.Length / stat.BlockSize) + (_mdbBlocks.Length % stat.BlockSize);
-                        stat.Length = _mdbBlocks.Length;
-                    }
-                    else
-                        return ErrorNumber.InvalidArgument;
-
-                    return ErrorNumber.NoError;
-                }
-
-            if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
-                return ErrorNumber.NoSuchFile;
-
-            if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
-                return ErrorNumber.NoSuchFile;
-
-            ErrorNumber error = GetAttributes(path, out FileAttributes attr);
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            stat = new FileEntryInfo
-            {
-                Attributes    = attr,
-                Blocks        = entry.flLgLen / _volMdb.drAlBlkSiz,
-                BlockSize     = _volMdb.drAlBlkSiz,
-                CreationTime  = DateHandlers.MacToDateTime(entry.flCrDat),
-                Inode         = entry.flFlNum,
-                LastWriteTime = DateHandlers.MacToDateTime(entry.flMdDat),
-                Length        = entry.flPyLen,
-                Links         = 1
-            };
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadLink(string path, out string dest)
+        if(tags)
+            buf = ms.ToArray();
+        else
         {
-            dest = null;
-
-            return ErrorNumber.NotImplemented;
-        }
-
-        ErrorNumber ReadFile(string path, out byte[] buf, bool resourceFork, bool tags)
-        {
-            buf = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
-
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
-
-            path = pathElements[0];
-
-            if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
-                return ErrorNumber.NoSuchFile;
-
-            if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
-                return ErrorNumber.NoSuchFile;
-
-            uint nextBlock;
-
             if(resourceFork)
-            {
-                if(entry.flRPyLen == 0)
-                {
-                    buf = Array.Empty<byte>();
-
-                    return ErrorNumber.NoError;
-                }
-
-                nextBlock = entry.flRStBlk;
-            }
-            else
-            {
-                if(entry.flPyLen == 0)
-                {
-                    buf = Array.Empty<byte>();
-
-                    return ErrorNumber.NoError;
-                }
-
-                nextBlock = entry.flStBlk;
-            }
-
-            var ms = new MemoryStream();
-
-            do
-            {
-                byte[]      sectors;
-                ErrorNumber errno;
-
-                errno =
-                    tags
-                        ? _device.
-                            ReadSectorsTag((ulong)((nextBlock - 2) * _sectorsPerBlock) + _volMdb.drAlBlSt + _partitionStart,
-                                           (uint)_sectorsPerBlock, SectorTagType.AppleSectorTag, out sectors)
-                        : _device.
-                            ReadSectors((ulong)((nextBlock - 2) * _sectorsPerBlock) + _volMdb.drAlBlSt + _partitionStart,
-                                        (uint)_sectorsPerBlock, out sectors);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sectors, 0, sectors.Length);
-
-                if(_blockMap[nextBlock] == BMAP_FREE)
-                {
-                    AaruConsole.ErrorWriteLine("File truncated at block {0}", nextBlock);
-
-                    break;
-                }
-
-                nextBlock = _blockMap[nextBlock];
-            } while(nextBlock > BMAP_LAST);
-
-            if(tags)
-                buf = ms.ToArray();
-            else
-            {
-                if(resourceFork)
-                    if(ms.Length < entry.flRLgLen)
-                        buf = ms.ToArray();
-                    else
-                    {
-                        buf = new byte[entry.flRLgLen];
-                        Array.Copy(ms.ToArray(), 0, buf, 0, buf.Length);
-                    }
+                if(ms.Length < entry.flRLgLen)
+                    buf = ms.ToArray();
                 else
                 {
-                    if(ms.Length < entry.flLgLen)
-                        buf = ms.ToArray();
-                    else
-                    {
-                        buf = new byte[entry.flLgLen];
-                        Array.Copy(ms.ToArray(), 0, buf, 0, buf.Length);
-                    }
+                    buf = new byte[entry.flRLgLen];
+                    Array.Copy(ms.ToArray(), 0, buf, 0, buf.Length);
+                }
+            else
+            {
+                if(ms.Length < entry.flLgLen)
+                    buf = ms.ToArray();
+                else
+                {
+                    buf = new byte[entry.flLgLen];
+                    Array.Copy(ms.ToArray(), 0, buf, 0, buf.Length);
                 }
             }
-
-            return ErrorNumber.NoError;
         }
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleMFS/Info.cs b/Aaru.Filesystems/AppleMFS/Info.cs
index 1fbd6b910..92e60ca44 100644
--- a/Aaru.Filesystems/AppleMFS/Info.cs
+++ b/Aaru.Filesystems/AppleMFS/Info.cs
@@ -40,148 +40,147 @@ using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh Volume II
+public sealed partial class AppleMFS
 {
-    // Information from Inside Macintosh Volume II
-    public sealed partial class AppleMFS
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(2 + partition.Start >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] mdbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        ushort drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, 0x000);
+
+        return drSigWord == MFS_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? new MacRoman();
+        information = "";
+
+        var sb = new StringBuilder();
+
+        var mdb = new MasterDirectoryBlock();
+
+        ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] mdbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        mdb.drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, 0x000);
+
+        if(mdb.drSigWord != MFS_MAGIC)
+            return;
+
+        mdb.drCrDate   = BigEndianBitConverter.ToUInt32(mdbSector, 0x002);
+        mdb.drLsBkUp   = BigEndianBitConverter.ToUInt32(mdbSector, 0x006);
+        mdb.drAtrb     = (AppleCommon.VolumeAttributes)BigEndianBitConverter.ToUInt16(mdbSector, 0x00A);
+        mdb.drNmFls    = BigEndianBitConverter.ToUInt16(mdbSector, 0x00C);
+        mdb.drDirSt    = BigEndianBitConverter.ToUInt16(mdbSector, 0x00E);
+        mdb.drBlLen    = BigEndianBitConverter.ToUInt16(mdbSector, 0x010);
+        mdb.drNmAlBlks = BigEndianBitConverter.ToUInt16(mdbSector, 0x012);
+        mdb.drAlBlkSiz = BigEndianBitConverter.ToUInt32(mdbSector, 0x014);
+        mdb.drClpSiz   = BigEndianBitConverter.ToUInt32(mdbSector, 0x018);
+        mdb.drAlBlSt   = BigEndianBitConverter.ToUInt16(mdbSector, 0x01C);
+        mdb.drNxtFNum  = BigEndianBitConverter.ToUInt32(mdbSector, 0x01E);
+        mdb.drFreeBks  = BigEndianBitConverter.ToUInt16(mdbSector, 0x022);
+        mdb.drVNSiz    = mdbSector[0x024];
+        byte[] variableSize = new byte[mdb.drVNSiz + 1];
+        Array.Copy(mdbSector, 0x024, variableSize, 0, mdb.drVNSiz + 1);
+        mdb.drVN = StringHandlers.PascalToString(variableSize, Encoding);
+
+        sb.AppendLine("Apple Macintosh File System");
+        sb.AppendLine();
+        sb.AppendLine("Master Directory Block:");
+        sb.AppendFormat("Creation date: {0}", DateHandlers.MacToDateTime(mdb.drCrDate)).AppendLine();
+        sb.AppendFormat("Last backup date: {0}", DateHandlers.MacToDateTime(mdb.drLsBkUp)).AppendLine();
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.HardwareLock))
+            sb.AppendLine("Volume is locked by hardware.");
+
+        sb.AppendLine(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Unmounted) ? "Volume was unmonted."
+                          : "Volume is mounted.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.SparedBadBlocks))
+            sb.AppendLine("Volume has spared bad blocks.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.DoesNotNeedCache))
+            sb.AppendLine("Volume does not need cache.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.BootInconsistent))
+            sb.AppendLine("Boot volume is inconsistent.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.ReusedIds))
+            sb.AppendLine("There are reused CNIDs.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Inconsistent))
+            sb.AppendLine("Volume is seriously inconsistent.");
+
+        if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.SoftwareLock))
+            sb.AppendLine("Volume is locked by software.");
+
+        sb.AppendFormat("{0} files on volume", mdb.drNmFls).AppendLine();
+        sb.AppendFormat("First directory sector: {0}", mdb.drDirSt).AppendLine();
+        sb.AppendFormat("{0} sectors in directory.", mdb.drBlLen).AppendLine();
+        sb.AppendFormat("{0} volume allocation blocks.", mdb.drNmAlBlks + 1).AppendLine();
+        sb.AppendFormat("Size of allocation blocks: {0} bytes", mdb.drAlBlkSiz).AppendLine();
+        sb.AppendFormat("{0} bytes to allocate.", mdb.drClpSiz).AppendLine();
+        sb.AppendFormat("First allocation block (#2) starts in sector {0}.", mdb.drAlBlSt).AppendLine();
+        sb.AppendFormat("Next unused file number: {0}", mdb.drNxtFNum).AppendLine();
+        sb.AppendFormat("{0} unused allocation blocks.", mdb.drFreeBks).AppendLine();
+        sb.AppendFormat("Volume name: {0}", mdb.drVN).AppendLine();
+
+        string bootBlockInfo = AppleCommon.GetBootBlockInformation(bbSector, Encoding);
+
+        if(bootBlockInfo != null)
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] mdbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            ushort drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, 0x000);
-
-            return drSigWord == MFS_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? new MacRoman();
-            information = "";
-
-            var sb = new StringBuilder();
-
-            var mdb = new MasterDirectoryBlock();
-
-            ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] mdbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            mdb.drSigWord = BigEndianBitConverter.ToUInt16(mdbSector, 0x000);
-
-            if(mdb.drSigWord != MFS_MAGIC)
-                return;
-
-            mdb.drCrDate   = BigEndianBitConverter.ToUInt32(mdbSector, 0x002);
-            mdb.drLsBkUp   = BigEndianBitConverter.ToUInt32(mdbSector, 0x006);
-            mdb.drAtrb     = (AppleCommon.VolumeAttributes)BigEndianBitConverter.ToUInt16(mdbSector, 0x00A);
-            mdb.drNmFls    = BigEndianBitConverter.ToUInt16(mdbSector, 0x00C);
-            mdb.drDirSt    = BigEndianBitConverter.ToUInt16(mdbSector, 0x00E);
-            mdb.drBlLen    = BigEndianBitConverter.ToUInt16(mdbSector, 0x010);
-            mdb.drNmAlBlks = BigEndianBitConverter.ToUInt16(mdbSector, 0x012);
-            mdb.drAlBlkSiz = BigEndianBitConverter.ToUInt32(mdbSector, 0x014);
-            mdb.drClpSiz   = BigEndianBitConverter.ToUInt32(mdbSector, 0x018);
-            mdb.drAlBlSt   = BigEndianBitConverter.ToUInt16(mdbSector, 0x01C);
-            mdb.drNxtFNum  = BigEndianBitConverter.ToUInt32(mdbSector, 0x01E);
-            mdb.drFreeBks  = BigEndianBitConverter.ToUInt16(mdbSector, 0x022);
-            mdb.drVNSiz    = mdbSector[0x024];
-            byte[] variableSize = new byte[mdb.drVNSiz + 1];
-            Array.Copy(mdbSector, 0x024, variableSize, 0, mdb.drVNSiz + 1);
-            mdb.drVN = StringHandlers.PascalToString(variableSize, Encoding);
-
-            sb.AppendLine("Apple Macintosh File System");
+            sb.AppendLine("Volume is bootable.");
             sb.AppendLine();
-            sb.AppendLine("Master Directory Block:");
-            sb.AppendFormat("Creation date: {0}", DateHandlers.MacToDateTime(mdb.drCrDate)).AppendLine();
-            sb.AppendFormat("Last backup date: {0}", DateHandlers.MacToDateTime(mdb.drLsBkUp)).AppendLine();
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.HardwareLock))
-                sb.AppendLine("Volume is locked by hardware.");
-
-            sb.AppendLine(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Unmounted) ? "Volume was unmonted."
-                              : "Volume is mounted.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.SparedBadBlocks))
-                sb.AppendLine("Volume has spared bad blocks.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.DoesNotNeedCache))
-                sb.AppendLine("Volume does not need cache.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.BootInconsistent))
-                sb.AppendLine("Boot volume is inconsistent.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.ReusedIds))
-                sb.AppendLine("There are reused CNIDs.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.Inconsistent))
-                sb.AppendLine("Volume is seriously inconsistent.");
-
-            if(mdb.drAtrb.HasFlag(AppleCommon.VolumeAttributes.SoftwareLock))
-                sb.AppendLine("Volume is locked by software.");
-
-            sb.AppendFormat("{0} files on volume", mdb.drNmFls).AppendLine();
-            sb.AppendFormat("First directory sector: {0}", mdb.drDirSt).AppendLine();
-            sb.AppendFormat("{0} sectors in directory.", mdb.drBlLen).AppendLine();
-            sb.AppendFormat("{0} volume allocation blocks.", mdb.drNmAlBlks + 1).AppendLine();
-            sb.AppendFormat("Size of allocation blocks: {0} bytes", mdb.drAlBlkSiz).AppendLine();
-            sb.AppendFormat("{0} bytes to allocate.", mdb.drClpSiz).AppendLine();
-            sb.AppendFormat("First allocation block (#2) starts in sector {0}.", mdb.drAlBlSt).AppendLine();
-            sb.AppendFormat("Next unused file number: {0}", mdb.drNxtFNum).AppendLine();
-            sb.AppendFormat("{0} unused allocation blocks.", mdb.drFreeBks).AppendLine();
-            sb.AppendFormat("Volume name: {0}", mdb.drVN).AppendLine();
-
-            string bootBlockInfo = AppleCommon.GetBootBlockInformation(bbSector, Encoding);
-
-            if(bootBlockInfo != null)
-            {
-                sb.AppendLine("Volume is bootable.");
-                sb.AppendLine();
-                sb.AppendLine(bootBlockInfo);
-            }
-            else
-                sb.AppendLine("Volume is not bootable.");
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType();
-
-            if(mdb.drLsBkUp > 0)
-            {
-                XmlFsType.BackupDate          = DateHandlers.MacToDateTime(mdb.drLsBkUp);
-                XmlFsType.BackupDateSpecified = true;
-            }
-
-            XmlFsType.Bootable    = bootBlockInfo != null;
-            XmlFsType.Clusters    = mdb.drNmAlBlks;
-            XmlFsType.ClusterSize = mdb.drAlBlkSiz;
-
-            if(mdb.drCrDate > 0)
-            {
-                XmlFsType.CreationDate          = DateHandlers.MacToDateTime(mdb.drCrDate);
-                XmlFsType.CreationDateSpecified = true;
-            }
-
-            XmlFsType.Files                 = mdb.drNmFls;
-            XmlFsType.FilesSpecified        = true;
-            XmlFsType.FreeClusters          = mdb.drFreeBks;
-            XmlFsType.FreeClustersSpecified = true;
-            XmlFsType.Type                  = "MFS";
-            XmlFsType.VolumeName            = mdb.drVN;
+            sb.AppendLine(bootBlockInfo);
         }
+        else
+            sb.AppendLine("Volume is not bootable.");
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType();
+
+        if(mdb.drLsBkUp > 0)
+        {
+            XmlFsType.BackupDate          = DateHandlers.MacToDateTime(mdb.drLsBkUp);
+            XmlFsType.BackupDateSpecified = true;
+        }
+
+        XmlFsType.Bootable    = bootBlockInfo != null;
+        XmlFsType.Clusters    = mdb.drNmAlBlks;
+        XmlFsType.ClusterSize = mdb.drAlBlkSiz;
+
+        if(mdb.drCrDate > 0)
+        {
+            XmlFsType.CreationDate          = DateHandlers.MacToDateTime(mdb.drCrDate);
+            XmlFsType.CreationDateSpecified = true;
+        }
+
+        XmlFsType.Files                 = mdb.drNmFls;
+        XmlFsType.FilesSpecified        = true;
+        XmlFsType.FreeClusters          = mdb.drFreeBks;
+        XmlFsType.FreeClustersSpecified = true;
+        XmlFsType.Type                  = "MFS";
+        XmlFsType.VolumeName            = mdb.drVN;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleMFS/Structs.cs b/Aaru.Filesystems/AppleMFS/Structs.cs
index c4f65f054..45c142792 100644
--- a/Aaru.Filesystems/AppleMFS/Structs.cs
+++ b/Aaru.Filesystems/AppleMFS/Structs.cs
@@ -35,81 +35,80 @@ using System.Diagnostics.CodeAnalysis;
 
 #pragma warning disable 169
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh Volume II
+[SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "NotAccessedField.Local")]
+public sealed partial class AppleMFS
 {
-    // Information from Inside Macintosh Volume II
-    [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "NotAccessedField.Local")]
-    public sealed partial class AppleMFS
+    /// <summary>Master Directory Block, should be at offset 0x0400 bytes in volume</summary>
+    struct MasterDirectoryBlock
     {
-        /// <summary>Master Directory Block, should be at offset 0x0400 bytes in volume</summary>
-        struct MasterDirectoryBlock
-        {
-            /// <summary>0x000, Signature, 0xD2D7</summary>
-            public ushort drSigWord;
-            /// <summary>0x002, Volume creation date</summary>
-            public uint drCrDate;
-            /// <summary>0x006, Volume last backup date</summary>
-            public uint drLsBkUp;
-            /// <summary>0x00A, Volume attributes</summary>
-            public AppleCommon.VolumeAttributes drAtrb;
-            /// <summary>0x00C, Volume number of files</summary>
-            public ushort drNmFls;
-            /// <summary>0x00E, First directory sector</summary>
-            public ushort drDirSt;
-            /// <summary>0x010, Length of directory in sectors</summary>
-            public ushort drBlLen;
-            /// <summary>0x012, Volume allocation blocks</summary>
-            public ushort drNmAlBlks;
-            /// <summary>0x014, Size of allocation blocks</summary>
-            public uint drAlBlkSiz;
-            /// <summary>0x018, Number of bytes to allocate</summary>
-            public uint drClpSiz;
-            /// <summary>0x01C, First allocation block in block map</summary>
-            public ushort drAlBlSt;
-            /// <summary>0x01E. Next unused file number</summary>
-            public uint drNxtFNum;
-            /// <summary>0x022, Number of unused allocation blocks</summary>
-            public ushort drFreeBks;
-            /// <summary>0x024, Length of volume name</summary>
-            public byte drVNSiz;
-            /// <summary>0x025, Characters of volume name</summary>
-            public string drVN;
-        }
+        /// <summary>0x000, Signature, 0xD2D7</summary>
+        public ushort drSigWord;
+        /// <summary>0x002, Volume creation date</summary>
+        public uint drCrDate;
+        /// <summary>0x006, Volume last backup date</summary>
+        public uint drLsBkUp;
+        /// <summary>0x00A, Volume attributes</summary>
+        public AppleCommon.VolumeAttributes drAtrb;
+        /// <summary>0x00C, Volume number of files</summary>
+        public ushort drNmFls;
+        /// <summary>0x00E, First directory sector</summary>
+        public ushort drDirSt;
+        /// <summary>0x010, Length of directory in sectors</summary>
+        public ushort drBlLen;
+        /// <summary>0x012, Volume allocation blocks</summary>
+        public ushort drNmAlBlks;
+        /// <summary>0x014, Size of allocation blocks</summary>
+        public uint drAlBlkSiz;
+        /// <summary>0x018, Number of bytes to allocate</summary>
+        public uint drClpSiz;
+        /// <summary>0x01C, First allocation block in block map</summary>
+        public ushort drAlBlSt;
+        /// <summary>0x01E. Next unused file number</summary>
+        public uint drNxtFNum;
+        /// <summary>0x022, Number of unused allocation blocks</summary>
+        public ushort drFreeBks;
+        /// <summary>0x024, Length of volume name</summary>
+        public byte drVNSiz;
+        /// <summary>0x025, Characters of volume name</summary>
+        public string drVN;
+    }
 
-        [Flags]
-        enum FileFlags : byte
-        {
-            Locked = 0x01, Used = 0x80
-        }
+    [Flags]
+    enum FileFlags : byte
+    {
+        Locked = 0x01, Used = 0x80
+    }
 
-        struct FileEntry
-        {
-            /// <summary>0x00, Entry flags</summary>
-            public FileFlags flFlags;
-            /// <summary>0x01, Version number</summary>
-            public byte flTyp;
-            /// <summary>0x02, FinderInfo</summary>
-            public AppleCommon.FInfo flUsrWds;
-            /// <summary>0x12, file ID</summary>
-            public uint flFlNum;
-            /// <summary>0x16, first allocation block of data fork</summary>
-            public ushort flStBlk;
-            /// <summary>0x18, logical end-of-file of data fork</summary>
-            public uint flLgLen;
-            /// <summary>0x1C, physical end-of-file of data fork</summary>
-            public uint flPyLen;
-            /// <summary>0x20, first allocation block of resource fork</summary>
-            public ushort flRStBlk;
-            /// <summary>0x22, logical end-of-file of resource fork</summary>
-            public uint flRLgLen;
-            /// <summary>0x26, physical end-of-file of resource fork</summary>
-            public uint flRPyLen;
-            /// <summary>0x2A, date and time of creation</summary>
-            public uint flCrDat;
-            /// <summary>0x2E, date and time of last modification</summary>
-            public uint flMdDat;
-            /// <summary>0x32, file name prefixed with length</summary>
-            public byte[] flNam;
-        }
+    struct FileEntry
+    {
+        /// <summary>0x00, Entry flags</summary>
+        public FileFlags flFlags;
+        /// <summary>0x01, Version number</summary>
+        public byte flTyp;
+        /// <summary>0x02, FinderInfo</summary>
+        public AppleCommon.FInfo flUsrWds;
+        /// <summary>0x12, file ID</summary>
+        public uint flFlNum;
+        /// <summary>0x16, first allocation block of data fork</summary>
+        public ushort flStBlk;
+        /// <summary>0x18, logical end-of-file of data fork</summary>
+        public uint flLgLen;
+        /// <summary>0x1C, physical end-of-file of data fork</summary>
+        public uint flPyLen;
+        /// <summary>0x20, first allocation block of resource fork</summary>
+        public ushort flRStBlk;
+        /// <summary>0x22, logical end-of-file of resource fork</summary>
+        public uint flRLgLen;
+        /// <summary>0x26, physical end-of-file of resource fork</summary>
+        public uint flRPyLen;
+        /// <summary>0x2A, date and time of creation</summary>
+        public uint flCrDat;
+        /// <summary>0x2E, date and time of last modification</summary>
+        public uint flMdDat;
+        /// <summary>0x32, file name prefixed with length</summary>
+        public byte[] flNam;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleMFS/Super.cs b/Aaru.Filesystems/AppleMFS/Super.cs
index d37577c68..e49e121a6 100644
--- a/Aaru.Filesystems/AppleMFS/Super.cs
+++ b/Aaru.Filesystems/AppleMFS/Super.cs
@@ -40,205 +40,204 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh Volume II
+public sealed partial class AppleMFS
 {
-    // Information from Inside Macintosh Volume II
-    public sealed partial class AppleMFS
+    const int BYTES_BEFORE_BLOCK_MAP = 64;
+
+    /// <inheritdoc />
+    public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                             Dictionary<string, string> options, string @namespace)
     {
-        const int BYTES_BEFORE_BLOCK_MAP = 64;
+        _device         = imagePlugin;
+        _partitionStart = partition.Start;
+        Encoding        = encoding ?? Encoding.GetEncoding("macintosh");
+        ErrorNumber errno;
 
-        /// <inheritdoc />
-        public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
-                                 Dictionary<string, string> options, string @namespace)
+        options ??= GetDefaultOptions();
+
+        if(options.TryGetValue("debug", out string debugString))
+            bool.TryParse(debugString, out _debug);
+
+        _volMdb = new MasterDirectoryBlock();
+
+        errno = _device.ReadSector(2 + _partitionStart, out _mdbBlocks);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        errno = _device.ReadSector(0 + _partitionStart, out _bootBlocks);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        _volMdb.drSigWord = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x000);
+
+        if(_volMdb.drSigWord != MFS_MAGIC)
+            return ErrorNumber.InvalidArgument;
+
+        _volMdb.drCrDate   = BigEndianBitConverter.ToUInt32(_mdbBlocks, 0x002);
+        _volMdb.drLsBkUp   = BigEndianBitConverter.ToUInt32(_mdbBlocks, 0x006);
+        _volMdb.drAtrb     = (AppleCommon.VolumeAttributes)BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x00A);
+        _volMdb.drNmFls    = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x00C);
+        _volMdb.drDirSt    = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x00E);
+        _volMdb.drBlLen    = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x010);
+        _volMdb.drNmAlBlks = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x012);
+        _volMdb.drAlBlkSiz = BigEndianBitConverter.ToUInt32(_mdbBlocks, 0x014);
+        _volMdb.drClpSiz   = BigEndianBitConverter.ToUInt32(_mdbBlocks, 0x018);
+        _volMdb.drAlBlSt   = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x01C);
+        _volMdb.drNxtFNum  = BigEndianBitConverter.ToUInt32(_mdbBlocks, 0x01E);
+        _volMdb.drFreeBks  = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x022);
+        _volMdb.drVNSiz    = _mdbBlocks[0x024];
+        byte[] variableSize = new byte[_volMdb.drVNSiz + 1];
+        Array.Copy(_mdbBlocks, 0x024, variableSize, 0, _volMdb.drVNSiz + 1);
+        _volMdb.drVN = StringHandlers.PascalToString(variableSize, Encoding);
+
+        errno = _device.ReadSectors(_volMdb.drDirSt + _partitionStart, _volMdb.drBlLen, out _directoryBlocks);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        int bytesInBlockMap = (_volMdb.drNmAlBlks * 12 / 8) + (_volMdb.drNmAlBlks * 12 % 8);
+        int bytesInWholeMdb = bytesInBlockMap               + BYTES_BEFORE_BLOCK_MAP;
+
+        int sectorsInWholeMdb = (bytesInWholeMdb / (int)_device.Info.SectorSize) +
+                                (bytesInWholeMdb % (int)_device.Info.SectorSize);
+
+        errno = _device.ReadSectors(_partitionStart + 2, (uint)sectorsInWholeMdb, out byte[] wholeMdb);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        _blockMapBytes = new byte[bytesInBlockMap];
+        Array.Copy(wholeMdb, BYTES_BEFORE_BLOCK_MAP, _blockMapBytes, 0, _blockMapBytes.Length);
+
+        int offset = 0;
+        _blockMap = new uint[_volMdb.drNmAlBlks + 2 + 1];
+
+        for(int i = 2; i < _volMdb.drNmAlBlks + 2; i += 8)
         {
-            _device         = imagePlugin;
-            _partitionStart = partition.Start;
-            Encoding        = encoding ?? Encoding.GetEncoding("macintosh");
-            ErrorNumber errno;
+            uint tmp1 = 0;
+            uint tmp2 = 0;
+            uint tmp3 = 0;
 
-            options ??= GetDefaultOptions();
+            if(offset + 4 <= _blockMapBytes.Length)
+                tmp1 = BigEndianBitConverter.ToUInt32(_blockMapBytes, offset);
 
-            if(options.TryGetValue("debug", out string debugString))
-                bool.TryParse(debugString, out _debug);
+            if(offset + 4 + 4 <= _blockMapBytes.Length)
+                tmp2 = BigEndianBitConverter.ToUInt32(_blockMapBytes, offset + 4);
 
-            _volMdb = new MasterDirectoryBlock();
+            if(offset + 8 + 4 <= _blockMapBytes.Length)
+                tmp3 = BigEndianBitConverter.ToUInt32(_blockMapBytes, offset + 8);
 
-            errno = _device.ReadSector(2 + _partitionStart, out _mdbBlocks);
+            if(i < _blockMap.Length)
+                _blockMap[i] = (tmp1 & 0xFFF00000) >> 20;
 
-            if(errno != ErrorNumber.NoError)
-                return errno;
+            if(i + 2 < _blockMap.Length)
+                _blockMap[i + 1] = (tmp1 & 0xFFF00) >> 8;
 
-            errno = _device.ReadSector(0 + _partitionStart, out _bootBlocks);
+            if(i + 3 < _blockMap.Length)
+                _blockMap[i + 2] = ((tmp1 & 0xFF) << 4) + ((tmp2 & 0xF0000000) >> 28);
 
-            if(errno != ErrorNumber.NoError)
-                return errno;
+            if(i + 4 < _blockMap.Length)
+                _blockMap[i + 3] = (tmp2 & 0xFFF0000) >> 16;
 
-            _volMdb.drSigWord = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x000);
+            if(i + 5 < _blockMap.Length)
+                _blockMap[i + 4] = (tmp2 & 0xFFF0) >> 4;
 
-            if(_volMdb.drSigWord != MFS_MAGIC)
-                return ErrorNumber.InvalidArgument;
+            if(i + 6 < _blockMap.Length)
+                _blockMap[i + 5] = ((tmp2 & 0xF) << 8) + ((tmp3 & 0xFF000000) >> 24);
 
-            _volMdb.drCrDate   = BigEndianBitConverter.ToUInt32(_mdbBlocks, 0x002);
-            _volMdb.drLsBkUp   = BigEndianBitConverter.ToUInt32(_mdbBlocks, 0x006);
-            _volMdb.drAtrb     = (AppleCommon.VolumeAttributes)BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x00A);
-            _volMdb.drNmFls    = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x00C);
-            _volMdb.drDirSt    = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x00E);
-            _volMdb.drBlLen    = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x010);
-            _volMdb.drNmAlBlks = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x012);
-            _volMdb.drAlBlkSiz = BigEndianBitConverter.ToUInt32(_mdbBlocks, 0x014);
-            _volMdb.drClpSiz   = BigEndianBitConverter.ToUInt32(_mdbBlocks, 0x018);
-            _volMdb.drAlBlSt   = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x01C);
-            _volMdb.drNxtFNum  = BigEndianBitConverter.ToUInt32(_mdbBlocks, 0x01E);
-            _volMdb.drFreeBks  = BigEndianBitConverter.ToUInt16(_mdbBlocks, 0x022);
-            _volMdb.drVNSiz    = _mdbBlocks[0x024];
-            byte[] variableSize = new byte[_volMdb.drVNSiz + 1];
-            Array.Copy(_mdbBlocks, 0x024, variableSize, 0, _volMdb.drVNSiz + 1);
-            _volMdb.drVN = StringHandlers.PascalToString(variableSize, Encoding);
+            if(i + 7 < _blockMap.Length)
+                _blockMap[i + 6] = (tmp3 & 0xFFF000) >> 12;
 
-            errno = _device.ReadSectors(_volMdb.drDirSt + _partitionStart, _volMdb.drBlLen, out _directoryBlocks);
+            if(i + 8 < _blockMap.Length)
+                _blockMap[i + 7] = tmp3 & 0xFFF;
 
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            int bytesInBlockMap = (_volMdb.drNmAlBlks * 12 / 8) + (_volMdb.drNmAlBlks * 12 % 8);
-            int bytesInWholeMdb = bytesInBlockMap               + BYTES_BEFORE_BLOCK_MAP;
-
-            int sectorsInWholeMdb = (bytesInWholeMdb / (int)_device.Info.SectorSize) +
-                                    (bytesInWholeMdb % (int)_device.Info.SectorSize);
-
-            errno = _device.ReadSectors(_partitionStart + 2, (uint)sectorsInWholeMdb, out byte[] wholeMdb);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            _blockMapBytes = new byte[bytesInBlockMap];
-            Array.Copy(wholeMdb, BYTES_BEFORE_BLOCK_MAP, _blockMapBytes, 0, _blockMapBytes.Length);
-
-            int offset = 0;
-            _blockMap = new uint[_volMdb.drNmAlBlks + 2 + 1];
-
-            for(int i = 2; i < _volMdb.drNmAlBlks + 2; i += 8)
-            {
-                uint tmp1 = 0;
-                uint tmp2 = 0;
-                uint tmp3 = 0;
-
-                if(offset + 4 <= _blockMapBytes.Length)
-                    tmp1 = BigEndianBitConverter.ToUInt32(_blockMapBytes, offset);
-
-                if(offset + 4 + 4 <= _blockMapBytes.Length)
-                    tmp2 = BigEndianBitConverter.ToUInt32(_blockMapBytes, offset + 4);
-
-                if(offset + 8 + 4 <= _blockMapBytes.Length)
-                    tmp3 = BigEndianBitConverter.ToUInt32(_blockMapBytes, offset + 8);
-
-                if(i < _blockMap.Length)
-                    _blockMap[i] = (tmp1 & 0xFFF00000) >> 20;
-
-                if(i + 2 < _blockMap.Length)
-                    _blockMap[i + 1] = (tmp1 & 0xFFF00) >> 8;
-
-                if(i + 3 < _blockMap.Length)
-                    _blockMap[i + 2] = ((tmp1 & 0xFF) << 4) + ((tmp2 & 0xF0000000) >> 28);
-
-                if(i + 4 < _blockMap.Length)
-                    _blockMap[i + 3] = (tmp2 & 0xFFF0000) >> 16;
-
-                if(i + 5 < _blockMap.Length)
-                    _blockMap[i + 4] = (tmp2 & 0xFFF0) >> 4;
-
-                if(i + 6 < _blockMap.Length)
-                    _blockMap[i + 5] = ((tmp2 & 0xF) << 8) + ((tmp3 & 0xFF000000) >> 24);
-
-                if(i + 7 < _blockMap.Length)
-                    _blockMap[i + 6] = (tmp3 & 0xFFF000) >> 12;
-
-                if(i + 8 < _blockMap.Length)
-                    _blockMap[i + 7] = tmp3 & 0xFFF;
-
-                offset += 12;
-            }
-
-            if(_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
-            {
-                _device.ReadSectorTag(2 + _partitionStart, SectorTagType.AppleSectorTag, out _mdbTags);
-                _device.ReadSectorTag(0 + _partitionStart, SectorTagType.AppleSectorTag, out _bootTags);
-
-                _device.ReadSectorsTag(_volMdb.drDirSt + _partitionStart, _volMdb.drBlLen, SectorTagType.AppleSectorTag,
-                                       out _directoryTags);
-
-                _device.ReadSectorsTag(_partitionStart + 2, (uint)sectorsInWholeMdb, SectorTagType.AppleSectorTag,
-                                       out _bitmapTags);
-            }
-
-            _sectorsPerBlock = (int)(_volMdb.drAlBlkSiz / _device.Info.SectorSize);
-
-            if(!FillDirectory())
-                return ErrorNumber.InvalidArgument;
-
-            _mounted = true;
-
-            ushort bbSig = BigEndianBitConverter.ToUInt16(_bootBlocks, 0x000);
-
-            if(bbSig != AppleCommon.BB_MAGIC)
-                _bootBlocks = null;
-
-            XmlFsType = new FileSystemType();
-
-            if(_volMdb.drLsBkUp > 0)
-            {
-                XmlFsType.BackupDate          = DateHandlers.MacToDateTime(_volMdb.drLsBkUp);
-                XmlFsType.BackupDateSpecified = true;
-            }
-
-            XmlFsType.Bootable    = bbSig == AppleCommon.BB_MAGIC;
-            XmlFsType.Clusters    = _volMdb.drNmAlBlks;
-            XmlFsType.ClusterSize = _volMdb.drAlBlkSiz;
-
-            if(_volMdb.drCrDate > 0)
-            {
-                XmlFsType.CreationDate          = DateHandlers.MacToDateTime(_volMdb.drCrDate);
-                XmlFsType.CreationDateSpecified = true;
-            }
-
-            XmlFsType.Files                 = _volMdb.drNmFls;
-            XmlFsType.FilesSpecified        = true;
-            XmlFsType.FreeClusters          = _volMdb.drFreeBks;
-            XmlFsType.FreeClustersSpecified = true;
-            XmlFsType.Type                  = "MFS";
-            XmlFsType.VolumeName            = _volMdb.drVN;
-
-            return ErrorNumber.NoError;
+            offset += 12;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Unmount()
+        if(_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
         {
-            _mounted      = false;
-            _idToFilename = null;
-            _idToEntry    = null;
-            _filenameToId = null;
-            _bootBlocks   = null;
+            _device.ReadSectorTag(2 + _partitionStart, SectorTagType.AppleSectorTag, out _mdbTags);
+            _device.ReadSectorTag(0 + _partitionStart, SectorTagType.AppleSectorTag, out _bootTags);
 
-            return ErrorNumber.NoError;
+            _device.ReadSectorsTag(_volMdb.drDirSt + _partitionStart, _volMdb.drBlLen, SectorTagType.AppleSectorTag,
+                                   out _directoryTags);
+
+            _device.ReadSectorsTag(_partitionStart + 2, (uint)sectorsInWholeMdb, SectorTagType.AppleSectorTag,
+                                   out _bitmapTags);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber StatFs(out FileSystemInfo stat)
+        _sectorsPerBlock = (int)(_volMdb.drAlBlkSiz / _device.Info.SectorSize);
+
+        if(!FillDirectory())
+            return ErrorNumber.InvalidArgument;
+
+        _mounted = true;
+
+        ushort bbSig = BigEndianBitConverter.ToUInt16(_bootBlocks, 0x000);
+
+        if(bbSig != AppleCommon.BB_MAGIC)
+            _bootBlocks = null;
+
+        XmlFsType = new FileSystemType();
+
+        if(_volMdb.drLsBkUp > 0)
         {
-            stat = new FileSystemInfo
-            {
-                Blocks         = _volMdb.drNmAlBlks,
-                FilenameLength = 255,
-                Files          = _volMdb.drNmFls,
-                FreeBlocks     = _volMdb.drFreeBks,
-                PluginId       = Id,
-                Type           = "Apple MFS"
-            };
-
-            stat.FreeFiles = uint.MaxValue - stat.Files;
-
-            return ErrorNumber.NoError;
+            XmlFsType.BackupDate          = DateHandlers.MacToDateTime(_volMdb.drLsBkUp);
+            XmlFsType.BackupDateSpecified = true;
         }
+
+        XmlFsType.Bootable    = bbSig == AppleCommon.BB_MAGIC;
+        XmlFsType.Clusters    = _volMdb.drNmAlBlks;
+        XmlFsType.ClusterSize = _volMdb.drAlBlkSiz;
+
+        if(_volMdb.drCrDate > 0)
+        {
+            XmlFsType.CreationDate          = DateHandlers.MacToDateTime(_volMdb.drCrDate);
+            XmlFsType.CreationDateSpecified = true;
+        }
+
+        XmlFsType.Files                 = _volMdb.drNmFls;
+        XmlFsType.FilesSpecified        = true;
+        XmlFsType.FreeClusters          = _volMdb.drFreeBks;
+        XmlFsType.FreeClustersSpecified = true;
+        XmlFsType.Type                  = "MFS";
+        XmlFsType.VolumeName            = _volMdb.drVN;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Unmount()
+    {
+        _mounted      = false;
+        _idToFilename = null;
+        _idToEntry    = null;
+        _filenameToId = null;
+        _bootBlocks   = null;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber StatFs(out FileSystemInfo stat)
+    {
+        stat = new FileSystemInfo
+        {
+            Blocks         = _volMdb.drNmAlBlks,
+            FilenameLength = 255,
+            Files          = _volMdb.drNmFls,
+            FreeBlocks     = _volMdb.drFreeBks,
+            PluginId       = Id,
+            Type           = "Apple MFS"
+        };
+
+        stat.FreeFiles = uint.MaxValue - stat.Files;
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AppleMFS/Xattr.cs b/Aaru.Filesystems/AppleMFS/Xattr.cs
index f75d6a2c5..0a278bc56 100644
--- a/Aaru.Filesystems/AppleMFS/Xattr.cs
+++ b/Aaru.Filesystems/AppleMFS/Xattr.cs
@@ -37,167 +37,166 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Macintosh Volume II
+public sealed partial class AppleMFS
 {
-    // Information from Inside Macintosh Volume II
-    public sealed partial class AppleMFS
+    /// <inheritdoc />
+    public ErrorNumber ListXAttr(string path, out List<string> xattrs)
     {
-        /// <inheritdoc />
-        public ErrorNumber ListXAttr(string path, out List<string> xattrs)
+        xattrs = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            xattrs = null;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            string[] pathElements = path.Split(new[]
+        path = pathElements[0];
+
+        xattrs = new List<string>();
+
+        if(_debug)
+            if(string.Compare(path, "$", StringComparison.InvariantCulture)       == 0 ||
+               string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0 ||
+               string.Compare(path, "$Boot", StringComparison.InvariantCulture)   == 0 ||
+               string.Compare(path, "$MDB", StringComparison.InvariantCulture)    == 0)
             {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
-
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
-
-            path = pathElements[0];
-
-            xattrs = new List<string>();
-
-            if(_debug)
-                if(string.Compare(path, "$", StringComparison.InvariantCulture)       == 0 ||
-                   string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0 ||
-                   string.Compare(path, "$Boot", StringComparison.InvariantCulture)   == 0 ||
-                   string.Compare(path, "$MDB", StringComparison.InvariantCulture)    == 0)
-                {
-                    if(_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
-                        xattrs.Add("com.apple.macintosh.tags");
-
-                    return ErrorNumber.NoError;
-                }
-
-            if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
-                return ErrorNumber.NoSuchFile;
-
-            if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
-                return ErrorNumber.NoSuchFile;
-
-            if(entry.flRLgLen > 0)
-            {
-                xattrs.Add("com.apple.ResourceFork");
-
-                if(_debug && _device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
-                    xattrs.Add("com.apple.ResourceFork.tags");
-            }
-
-            xattrs.Add("com.apple.FinderInfo");
-
-            if(_debug                                                                 &&
-               _device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag) &&
-               entry.flLgLen > 0)
-                xattrs.Add("com.apple.macintosh.tags");
-
-            xattrs.Sort();
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
-        {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
-
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
-
-            path = pathElements[0];
-
-            if(_debug)
-                if(string.Compare(path, "$", StringComparison.InvariantCulture)       == 0 ||
-                   string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0 ||
-                   string.Compare(path, "$Boot", StringComparison.InvariantCulture)   == 0 ||
-                   string.Compare(path, "$MDB", StringComparison.InvariantCulture)    == 0)
-                    if(_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag) &&
-                       string.Compare(xattr, "com.apple.macintosh.tags", StringComparison.InvariantCulture) == 0)
-                    {
-                        if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
-                        {
-                            buf = new byte[_directoryTags.Length];
-                            Array.Copy(_directoryTags, 0, buf, 0, buf.Length);
-
-                            return ErrorNumber.NoError;
-                        }
-
-                        if(string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0)
-                        {
-                            buf = new byte[_bitmapTags.Length];
-                            Array.Copy(_bitmapTags, 0, buf, 0, buf.Length);
-
-                            return ErrorNumber.NoError;
-                        }
-
-                        if(string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0)
-                        {
-                            buf = new byte[_bootTags.Length];
-                            Array.Copy(_bootTags, 0, buf, 0, buf.Length);
-
-                            return ErrorNumber.NoError;
-                        }
-
-                        if(string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0)
-                        {
-                            buf = new byte[_mdbTags.Length];
-                            Array.Copy(_mdbTags, 0, buf, 0, buf.Length);
-
-                            return ErrorNumber.NoError;
-                        }
-                    }
-                    else
-                        return ErrorNumber.NoSuchExtendedAttribute;
-
-            ErrorNumber error;
-
-            if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
-                return ErrorNumber.NoSuchFile;
-
-            if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
-                return ErrorNumber.NoSuchFile;
-
-            if(entry.flRLgLen                                                                     > 0 &&
-               string.Compare(xattr, "com.apple.ResourceFork", StringComparison.InvariantCulture) == 0)
-            {
-                error = ReadFile(path, out buf, true, false);
-
-                return error;
-            }
-
-            if(entry.flRLgLen                                                                          > 0 &&
-               string.Compare(xattr, "com.apple.ResourceFork.tags", StringComparison.InvariantCulture) == 0)
-            {
-                error = ReadFile(path, out buf, true, true);
-
-                return error;
-            }
-
-            if(string.Compare(xattr, "com.apple.FinderInfo", StringComparison.InvariantCulture) == 0)
-            {
-                buf = Marshal.StructureToByteArrayBigEndian(entry.flUsrWds);
+                if(_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
+                    xattrs.Add("com.apple.macintosh.tags");
 
                 return ErrorNumber.NoError;
             }
 
-            if(!_debug                                                                 ||
-               !_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag) ||
-               string.Compare(xattr, "com.apple.macintosh.tags", StringComparison.InvariantCulture) != 0)
-                return ErrorNumber.NoSuchExtendedAttribute;
+        if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
+            return ErrorNumber.NoSuchFile;
 
-            error = ReadFile(path, out buf, false, true);
+        if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
+            return ErrorNumber.NoSuchFile;
+
+        if(entry.flRLgLen > 0)
+        {
+            xattrs.Add("com.apple.ResourceFork");
+
+            if(_debug && _device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
+                xattrs.Add("com.apple.ResourceFork.tags");
+        }
+
+        xattrs.Add("com.apple.FinderInfo");
+
+        if(_debug                                                                 &&
+           _device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag) &&
+           entry.flLgLen > 0)
+            xattrs.Add("com.apple.macintosh.tags");
+
+        xattrs.Sort();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
+
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
+
+        path = pathElements[0];
+
+        if(_debug)
+            if(string.Compare(path, "$", StringComparison.InvariantCulture)       == 0 ||
+               string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0 ||
+               string.Compare(path, "$Boot", StringComparison.InvariantCulture)   == 0 ||
+               string.Compare(path, "$MDB", StringComparison.InvariantCulture)    == 0)
+                if(_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag) &&
+                   string.Compare(xattr, "com.apple.macintosh.tags", StringComparison.InvariantCulture) == 0)
+                {
+                    if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
+                    {
+                        buf = new byte[_directoryTags.Length];
+                        Array.Copy(_directoryTags, 0, buf, 0, buf.Length);
+
+                        return ErrorNumber.NoError;
+                    }
+
+                    if(string.Compare(path, "$Bitmap", StringComparison.InvariantCulture) == 0)
+                    {
+                        buf = new byte[_bitmapTags.Length];
+                        Array.Copy(_bitmapTags, 0, buf, 0, buf.Length);
+
+                        return ErrorNumber.NoError;
+                    }
+
+                    if(string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0)
+                    {
+                        buf = new byte[_bootTags.Length];
+                        Array.Copy(_bootTags, 0, buf, 0, buf.Length);
+
+                        return ErrorNumber.NoError;
+                    }
+
+                    if(string.Compare(path, "$MDB", StringComparison.InvariantCulture) == 0)
+                    {
+                        buf = new byte[_mdbTags.Length];
+                        Array.Copy(_mdbTags, 0, buf, 0, buf.Length);
+
+                        return ErrorNumber.NoError;
+                    }
+                }
+                else
+                    return ErrorNumber.NoSuchExtendedAttribute;
+
+        ErrorNumber error;
+
+        if(!_filenameToId.TryGetValue(path.ToLowerInvariant(), out uint fileId))
+            return ErrorNumber.NoSuchFile;
+
+        if(!_idToEntry.TryGetValue(fileId, out FileEntry entry))
+            return ErrorNumber.NoSuchFile;
+
+        if(entry.flRLgLen                                                                     > 0 &&
+           string.Compare(xattr, "com.apple.ResourceFork", StringComparison.InvariantCulture) == 0)
+        {
+            error = ReadFile(path, out buf, true, false);
 
             return error;
         }
+
+        if(entry.flRLgLen                                                                          > 0 &&
+           string.Compare(xattr, "com.apple.ResourceFork.tags", StringComparison.InvariantCulture) == 0)
+        {
+            error = ReadFile(path, out buf, true, true);
+
+            return error;
+        }
+
+        if(string.Compare(xattr, "com.apple.FinderInfo", StringComparison.InvariantCulture) == 0)
+        {
+            buf = Marshal.StructureToByteArrayBigEndian(entry.flUsrWds);
+
+            return ErrorNumber.NoError;
+        }
+
+        if(!_debug                                                                 ||
+           !_device.Info.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag) ||
+           string.Compare(xattr, "com.apple.macintosh.tags", StringComparison.InvariantCulture) != 0)
+            return ErrorNumber.NoSuchExtendedAttribute;
+
+        error = ReadFile(path, out buf, false, true);
+
+        return error;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/AtheOS.cs b/Aaru.Filesystems/AtheOS.cs
index 520def7c4..f806e6a0e 100644
--- a/Aaru.Filesystems/AtheOS.cs
+++ b/Aaru.Filesystems/AtheOS.cs
@@ -41,214 +41,213 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection for the AtheOS filesystem</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class AtheOS : IFilesystem
 {
+    // Little endian constants (that is, as read by .NET :p)
+    const uint AFS_MAGIC1 = 0x41465331;
+    const uint AFS_MAGIC2 = 0xDD121031;
+    const uint AFS_MAGIC3 = 0x15B6830E;
+
+    // Common constants
+    const uint AFS_SUPERBLOCK_SIZE = 1024;
+    const uint AFS_BOOTBLOCK_SIZE  = AFS_SUPERBLOCK_SIZE;
+
     /// <inheritdoc />
-    /// <summary>Implements detection for the AtheOS filesystem</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class AtheOS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "AtheOS Filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("AAB2C4F1-DC07-49EE-A948-576CC51B58C5");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        // Little endian constants (that is, as read by .NET :p)
-        const uint AFS_MAGIC1 = 0x41465331;
-        const uint AFS_MAGIC2 = 0xDD121031;
-        const uint AFS_MAGIC3 = 0x15B6830E;
+        ulong sector = AFS_BOOTBLOCK_SIZE / imagePlugin.Info.SectorSize;
+        uint  offset = AFS_BOOTBLOCK_SIZE % imagePlugin.Info.SectorSize;
+        uint  run    = 1;
 
-        // Common constants
-        const uint AFS_SUPERBLOCK_SIZE = 1024;
-        const uint AFS_BOOTBLOCK_SIZE  = AFS_SUPERBLOCK_SIZE;
+        if(imagePlugin.Info.SectorSize < AFS_SUPERBLOCK_SIZE)
+            run = AFS_SUPERBLOCK_SIZE / imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "AtheOS Filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("AAB2C4F1-DC07-49EE-A948-576CC51B58C5");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(sector + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ErrorNumber errno = imagePlugin.ReadSectors(sector + partition.Start, run, out byte[] tmp);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        byte[] sbSector = new byte[AFS_SUPERBLOCK_SIZE];
+
+        if(offset + AFS_SUPERBLOCK_SIZE > tmp.Length)
+            return false;
+
+        Array.Copy(tmp, offset, sbSector, 0, AFS_SUPERBLOCK_SIZE);
+
+        uint magic = BitConverter.ToUInt32(sbSector, 0x20);
+
+        return magic == AFS_MAGIC1;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        ulong sector = AFS_BOOTBLOCK_SIZE / imagePlugin.Info.SectorSize;
+        uint  offset = AFS_BOOTBLOCK_SIZE % imagePlugin.Info.SectorSize;
+        uint  run    = 1;
+
+        if(imagePlugin.Info.SectorSize < AFS_SUPERBLOCK_SIZE)
+            run = AFS_SUPERBLOCK_SIZE / imagePlugin.Info.SectorSize;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(sector + partition.Start, run, out byte[] tmp);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        byte[] sbSector = new byte[AFS_SUPERBLOCK_SIZE];
+        Array.Copy(tmp, offset, sbSector, 0, AFS_SUPERBLOCK_SIZE);
+
+        SuperBlock afsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sbSector);
+
+        sb.AppendLine("Atheos filesystem");
+
+        if(afsSb.flags == 1)
+            sb.AppendLine("Filesystem is read-only");
+
+        sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(afsSb.name, Encoding)).AppendLine();
+        sb.AppendFormat("{0} bytes per block", afsSb.block_size).AppendLine();
+
+        sb.AppendFormat("{0} blocks in volume ({1} bytes)", afsSb.num_blocks, afsSb.num_blocks * afsSb.block_size).
+           AppendLine();
+
+        sb.AppendFormat("{0} used blocks ({1} bytes)", afsSb.used_blocks, afsSb.used_blocks * afsSb.block_size).
+           AppendLine();
+
+        sb.AppendFormat("{0} bytes per i-node", afsSb.inode_size).AppendLine();
+
+        sb.AppendFormat("{0} blocks per allocation group ({1} bytes)", afsSb.blocks_per_ag,
+                        afsSb.blocks_per_ag * afsSb.block_size).AppendLine();
+
+        sb.AppendFormat("{0} allocation groups in volume", afsSb.num_ags).AppendLine();
+
+        sb.AppendFormat("Journal resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+                        afsSb.log_blocks_start, afsSb.log_blocks_ag, afsSb.log_blocks_len,
+                        afsSb.log_blocks_len * afsSb.block_size).AppendLine();
+
+        sb.AppendFormat("Journal starts in byte {0} and has {1} bytes in {2} blocks", afsSb.log_start,
+                        afsSb.log_size, afsSb.log_valid_blocks).AppendLine();
+
+        sb.
+            AppendFormat("Root folder's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+                         afsSb.root_dir_start, afsSb.root_dir_ag, afsSb.root_dir_len,
+                         afsSb.root_dir_len * afsSb.block_size).AppendLine();
+
+        sb.
+            AppendFormat("Directory containing files scheduled for deletion's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+                         afsSb.deleted_start, afsSb.deleted_ag, afsSb.deleted_len,
+                         afsSb.deleted_len * afsSb.block_size).AppendLine();
+
+        sb.
+            AppendFormat("Indices' i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+                         afsSb.indices_start, afsSb.indices_ag, afsSb.indices_len,
+                         afsSb.indices_len * afsSb.block_size).AppendLine();
+
+        sb.AppendFormat("{0} blocks for bootloader ({1} bytes)", afsSb.boot_size,
+                        afsSb.boot_size * afsSb.block_size).AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            ulong sector = AFS_BOOTBLOCK_SIZE / imagePlugin.Info.SectorSize;
-            uint  offset = AFS_BOOTBLOCK_SIZE % imagePlugin.Info.SectorSize;
-            uint  run    = 1;
+            Clusters              = (ulong)afsSb.num_blocks,
+            ClusterSize           = afsSb.block_size,
+            Dirty                 = false,
+            FreeClusters          = (ulong)(afsSb.num_blocks - afsSb.used_blocks),
+            FreeClustersSpecified = true,
+            Type                  = "AtheOS filesystem",
+            VolumeName            = StringHandlers.CToString(afsSb.name, Encoding)
+        };
+    }
 
-            if(imagePlugin.Info.SectorSize < AFS_SUPERBLOCK_SIZE)
-                run = AFS_SUPERBLOCK_SIZE / imagePlugin.Info.SectorSize;
-
-            if(sector + partition.Start >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(sector + partition.Start, run, out byte[] tmp);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            byte[] sbSector = new byte[AFS_SUPERBLOCK_SIZE];
-
-            if(offset + AFS_SUPERBLOCK_SIZE > tmp.Length)
-                return false;
-
-            Array.Copy(tmp, offset, sbSector, 0, AFS_SUPERBLOCK_SIZE);
-
-            uint magic = BitConverter.ToUInt32(sbSector, 0x20);
-
-            return magic == AFS_MAGIC1;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-
-            var sb = new StringBuilder();
-
-            ulong sector = AFS_BOOTBLOCK_SIZE / imagePlugin.Info.SectorSize;
-            uint  offset = AFS_BOOTBLOCK_SIZE % imagePlugin.Info.SectorSize;
-            uint  run    = 1;
-
-            if(imagePlugin.Info.SectorSize < AFS_SUPERBLOCK_SIZE)
-                run = AFS_SUPERBLOCK_SIZE / imagePlugin.Info.SectorSize;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(sector + partition.Start, run, out byte[] tmp);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            byte[] sbSector = new byte[AFS_SUPERBLOCK_SIZE];
-            Array.Copy(tmp, offset, sbSector, 0, AFS_SUPERBLOCK_SIZE);
-
-            SuperBlock afsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sbSector);
-
-            sb.AppendLine("Atheos filesystem");
-
-            if(afsSb.flags == 1)
-                sb.AppendLine("Filesystem is read-only");
-
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(afsSb.name, Encoding)).AppendLine();
-            sb.AppendFormat("{0} bytes per block", afsSb.block_size).AppendLine();
-
-            sb.AppendFormat("{0} blocks in volume ({1} bytes)", afsSb.num_blocks, afsSb.num_blocks * afsSb.block_size).
-               AppendLine();
-
-            sb.AppendFormat("{0} used blocks ({1} bytes)", afsSb.used_blocks, afsSb.used_blocks * afsSb.block_size).
-               AppendLine();
-
-            sb.AppendFormat("{0} bytes per i-node", afsSb.inode_size).AppendLine();
-
-            sb.AppendFormat("{0} blocks per allocation group ({1} bytes)", afsSb.blocks_per_ag,
-                            afsSb.blocks_per_ag * afsSb.block_size).AppendLine();
-
-            sb.AppendFormat("{0} allocation groups in volume", afsSb.num_ags).AppendLine();
-
-            sb.AppendFormat("Journal resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
-                            afsSb.log_blocks_start, afsSb.log_blocks_ag, afsSb.log_blocks_len,
-                            afsSb.log_blocks_len * afsSb.block_size).AppendLine();
-
-            sb.AppendFormat("Journal starts in byte {0} and has {1} bytes in {2} blocks", afsSb.log_start,
-                            afsSb.log_size, afsSb.log_valid_blocks).AppendLine();
-
-            sb.
-                AppendFormat("Root folder's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
-                             afsSb.root_dir_start, afsSb.root_dir_ag, afsSb.root_dir_len,
-                             afsSb.root_dir_len * afsSb.block_size).AppendLine();
-
-            sb.
-                AppendFormat("Directory containing files scheduled for deletion's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
-                             afsSb.deleted_start, afsSb.deleted_ag, afsSb.deleted_len,
-                             afsSb.deleted_len * afsSb.block_size).AppendLine();
-
-            sb.
-                AppendFormat("Indices' i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
-                             afsSb.indices_start, afsSb.indices_ag, afsSb.indices_len,
-                             afsSb.indices_len * afsSb.block_size).AppendLine();
-
-            sb.AppendFormat("{0} blocks for bootloader ({1} bytes)", afsSb.boot_size,
-                            afsSb.boot_size * afsSb.block_size).AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Clusters              = (ulong)afsSb.num_blocks,
-                ClusterSize           = afsSb.block_size,
-                Dirty                 = false,
-                FreeClusters          = (ulong)(afsSb.num_blocks - afsSb.used_blocks),
-                FreeClustersSpecified = true,
-                Type                  = "AtheOS filesystem",
-                VolumeName            = StringHandlers.CToString(afsSb.name, Encoding)
-            };
-        }
-
-        /// <summary>Be superblock</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            /// <summary>0x000, Volume name, 32 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] name;
-            /// <summary>0x020, "AFS1", 0x41465331</summary>
-            public readonly uint magic1;
-            /// <summary>0x024, "BIGE", 0x42494745</summary>
-            public readonly uint fs_byte_order;
-            /// <summary>0x028, Bytes per block</summary>
-            public readonly uint block_size;
-            /// <summary>0x02C, 1 &lt;&lt; block_shift == block_size</summary>
-            public readonly uint block_shift;
-            /// <summary>0x030, Blocks in volume</summary>
-            public readonly long num_blocks;
-            /// <summary>0x038, Used blocks in volume</summary>
-            public readonly long used_blocks;
-            /// <summary>0x040, Bytes per inode</summary>
-            public readonly int inode_size;
-            /// <summary>0x044, 0xDD121031</summary>
-            public readonly uint magic2;
-            /// <summary>0x048, Blocks per allocation group</summary>
-            public readonly int blocks_per_ag;
-            /// <summary>0x04C, 1 &lt;&lt; ag_shift == blocks_per_ag</summary>
-            public readonly int ag_shift;
-            /// <summary>0x050, Allocation groups in volume</summary>
-            public readonly int num_ags;
-            /// <summary>0x054, 0x434c454e if clean, 0x44495254 if dirty</summary>
-            public readonly uint flags;
-            /// <summary>0x058, Allocation group of journal</summary>
-            public readonly int log_blocks_ag;
-            /// <summary>0x05C, Start block of journal, inside ag</summary>
-            public readonly ushort log_blocks_start;
-            /// <summary>0x05E, Length in blocks of journal, inside ag</summary>
-            public readonly ushort log_blocks_len;
-            /// <summary>0x060, Start of journal</summary>
-            public readonly long log_start;
-            /// <summary>0x068, Valid block logs</summary>
-            public readonly int log_valid_blocks;
-            /// <summary>0x06C, Log size</summary>
-            public readonly int log_size;
-            /// <summary>0x070, 0x15B6830E</summary>
-            public readonly uint magic3;
-            /// <summary>0x074, Allocation group where root folder's i-node resides</summary>
-            public readonly int root_dir_ag;
-            /// <summary>0x078, Start in ag of root folder's i-node</summary>
-            public readonly ushort root_dir_start;
-            /// <summary>0x07A, As this is part of inode_addr, this is 1</summary>
-            public readonly ushort root_dir_len;
-            /// <summary>0x07C, Allocation group where pending-delete-files' i-node resides</summary>
-            public readonly int deleted_ag;
-            /// <summary>0x080, Start in ag of pending-delete-files' i-node</summary>
-            public readonly ushort deleted_start;
-            /// <summary>0x082, As this is part of inode_addr, this is 1</summary>
-            public readonly ushort deleted_len;
-            /// <summary>0x084, Allocation group where indices' i-node resides</summary>
-            public readonly int indices_ag;
-            /// <summary>0x088, Start in ag of indices' i-node</summary>
-            public readonly ushort indices_start;
-            /// <summary>0x08A, As this is part of inode_addr, this is 1</summary>
-            public readonly ushort indices_len;
-            /// <summary>0x08C, Size of bootloader</summary>
-            public readonly int boot_size;
-        }
+    /// <summary>Be superblock</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        /// <summary>0x000, Volume name, 32 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] name;
+        /// <summary>0x020, "AFS1", 0x41465331</summary>
+        public readonly uint magic1;
+        /// <summary>0x024, "BIGE", 0x42494745</summary>
+        public readonly uint fs_byte_order;
+        /// <summary>0x028, Bytes per block</summary>
+        public readonly uint block_size;
+        /// <summary>0x02C, 1 &lt;&lt; block_shift == block_size</summary>
+        public readonly uint block_shift;
+        /// <summary>0x030, Blocks in volume</summary>
+        public readonly long num_blocks;
+        /// <summary>0x038, Used blocks in volume</summary>
+        public readonly long used_blocks;
+        /// <summary>0x040, Bytes per inode</summary>
+        public readonly int inode_size;
+        /// <summary>0x044, 0xDD121031</summary>
+        public readonly uint magic2;
+        /// <summary>0x048, Blocks per allocation group</summary>
+        public readonly int blocks_per_ag;
+        /// <summary>0x04C, 1 &lt;&lt; ag_shift == blocks_per_ag</summary>
+        public readonly int ag_shift;
+        /// <summary>0x050, Allocation groups in volume</summary>
+        public readonly int num_ags;
+        /// <summary>0x054, 0x434c454e if clean, 0x44495254 if dirty</summary>
+        public readonly uint flags;
+        /// <summary>0x058, Allocation group of journal</summary>
+        public readonly int log_blocks_ag;
+        /// <summary>0x05C, Start block of journal, inside ag</summary>
+        public readonly ushort log_blocks_start;
+        /// <summary>0x05E, Length in blocks of journal, inside ag</summary>
+        public readonly ushort log_blocks_len;
+        /// <summary>0x060, Start of journal</summary>
+        public readonly long log_start;
+        /// <summary>0x068, Valid block logs</summary>
+        public readonly int log_valid_blocks;
+        /// <summary>0x06C, Log size</summary>
+        public readonly int log_size;
+        /// <summary>0x070, 0x15B6830E</summary>
+        public readonly uint magic3;
+        /// <summary>0x074, Allocation group where root folder's i-node resides</summary>
+        public readonly int root_dir_ag;
+        /// <summary>0x078, Start in ag of root folder's i-node</summary>
+        public readonly ushort root_dir_start;
+        /// <summary>0x07A, As this is part of inode_addr, this is 1</summary>
+        public readonly ushort root_dir_len;
+        /// <summary>0x07C, Allocation group where pending-delete-files' i-node resides</summary>
+        public readonly int deleted_ag;
+        /// <summary>0x080, Start in ag of pending-delete-files' i-node</summary>
+        public readonly ushort deleted_start;
+        /// <summary>0x082, As this is part of inode_addr, this is 1</summary>
+        public readonly ushort deleted_len;
+        /// <summary>0x084, Allocation group where indices' i-node resides</summary>
+        public readonly int indices_ag;
+        /// <summary>0x088, Start in ag of indices' i-node</summary>
+        public readonly ushort indices_start;
+        /// <summary>0x08A, As this is part of inode_addr, this is 1</summary>
+        public readonly ushort indices_len;
+        /// <summary>0x08C, Size of bootloader</summary>
+        public readonly int boot_size;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/BFS.cs b/Aaru.Filesystems/BFS.cs
index 778429877..a94b10f34 100644
--- a/Aaru.Filesystems/BFS.cs
+++ b/Aaru.Filesystems/BFS.cs
@@ -41,282 +41,281 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Practical Filesystem Design, ISBN 1-55860-497-9
+/// <inheritdoc />
+/// <summary>Implements detection of the Be (new) filesystem</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class BeFS : IFilesystem
 {
-    // Information from Practical Filesystem Design, ISBN 1-55860-497-9
+    // Little endian constants (that is, as read by .NET :p)
+    const uint BEFS_MAGIC1 = 0x42465331;
+    const uint BEFS_MAGIC2 = 0xDD121031;
+    const uint BEFS_MAGIC3 = 0x15B6830E;
+    const uint BEFS_ENDIAN = 0x42494745;
+
+    // Big endian constants
+    const uint BEFS_CIGAM1 = 0x31534642;
+    const uint BEFS_NAIDNE = 0x45474942;
+
+    // Common constants
+    const uint BEFS_CLEAN = 0x434C454E;
+    const uint BEFS_DIRTY = 0x44495254;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the Be (new) filesystem</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class BeFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Be Filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("dc8572b3-b6ad-46e4-8de9-cbe123ff6672");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        // Little endian constants (that is, as read by .NET :p)
-        const uint BEFS_MAGIC1 = 0x42465331;
-        const uint BEFS_MAGIC2 = 0xDD121031;
-        const uint BEFS_MAGIC3 = 0x15B6830E;
-        const uint BEFS_ENDIAN = 0x42494745;
+        if(2 + partition.Start >= partition.End)
+            return false;
 
-        // Big endian constants
-        const uint BEFS_CIGAM1 = 0x31534642;
-        const uint BEFS_NAIDNE = 0x45474942;
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] sbSector);
 
-        // Common constants
-        const uint BEFS_CLEAN = 0x434C454E;
-        const uint BEFS_DIRTY = 0x44495254;
+        if(errno != ErrorNumber.NoError)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Be Filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("dc8572b3-b6ad-46e4-8de9-cbe123ff6672");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        uint magic   = BitConverter.ToUInt32(sbSector, 0x20);
+        uint magicBe = BigEndianBitConverter.ToUInt32(sbSector, 0x20);
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(magic   == BEFS_MAGIC1 ||
+           magicBe == BEFS_MAGIC1)
+            return true;
+
+        if(sbSector.Length >= 0x400)
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] sbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            uint magic   = BitConverter.ToUInt32(sbSector, 0x20);
-            uint magicBe = BigEndianBitConverter.ToUInt32(sbSector, 0x20);
-
-            if(magic   == BEFS_MAGIC1 ||
-               magicBe == BEFS_MAGIC1)
-                return true;
-
-            if(sbSector.Length >= 0x400)
-            {
-                magic   = BitConverter.ToUInt32(sbSector, 0x220);
-                magicBe = BigEndianBitConverter.ToUInt32(sbSector, 0x220);
-            }
-
-            if(magic   == BEFS_MAGIC1 ||
-               magicBe == BEFS_MAGIC1)
-                return true;
-
-            errno = imagePlugin.ReadSector(1 + partition.Start, out sbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            magic   = BitConverter.ToUInt32(sbSector, 0x20);
-            magicBe = BigEndianBitConverter.ToUInt32(sbSector, 0x20);
-
-            return magic == BEFS_MAGIC1 || magicBe == BEFS_MAGIC1;
+            magic   = BitConverter.ToUInt32(sbSector, 0x220);
+            magicBe = BigEndianBitConverter.ToUInt32(sbSector, 0x220);
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        if(magic   == BEFS_MAGIC1 ||
+           magicBe == BEFS_MAGIC1)
+            return true;
+
+        errno = imagePlugin.ReadSector(1 + partition.Start, out sbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        magic   = BitConverter.ToUInt32(sbSector, 0x20);
+        magicBe = BigEndianBitConverter.ToUInt32(sbSector, 0x20);
+
+        return magic == BEFS_MAGIC1 || magicBe == BEFS_MAGIC1;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        var besb = new SuperBlock();
+
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] sbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        bool littleEndian;
+
+        besb.magic1 = BigEndianBitConverter.ToUInt32(sbSector, 0x20);
+
+        if(besb.magic1 == BEFS_MAGIC1 ||
+           besb.magic1 == BEFS_CIGAM1) // Magic is at offset
+            littleEndian = besb.magic1 == BEFS_CIGAM1;
+        else
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-
-            var sb = new StringBuilder();
-
-            var besb = new SuperBlock();
-
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] sbSector);
+            errno = imagePlugin.ReadSector(1 + partition.Start, out sbSector);
 
             if(errno != ErrorNumber.NoError)
                 return;
 
-            bool littleEndian;
-
             besb.magic1 = BigEndianBitConverter.ToUInt32(sbSector, 0x20);
 
             if(besb.magic1 == BEFS_MAGIC1 ||
-               besb.magic1 == BEFS_CIGAM1) // Magic is at offset
+               besb.magic1 == BEFS_CIGAM1) // There is a boot sector
                 littleEndian = besb.magic1 == BEFS_CIGAM1;
-            else
+            else if(sbSector.Length >= 0x400)
             {
-                errno = imagePlugin.ReadSector(1 + partition.Start, out sbSector);
+                errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] temp);
 
                 if(errno != ErrorNumber.NoError)
                     return;
 
-                besb.magic1 = BigEndianBitConverter.ToUInt32(sbSector, 0x20);
+                besb.magic1 = BigEndianBitConverter.ToUInt32(temp, 0x220);
 
                 if(besb.magic1 == BEFS_MAGIC1 ||
                    besb.magic1 == BEFS_CIGAM1) // There is a boot sector
-                    littleEndian = besb.magic1 == BEFS_CIGAM1;
-                else if(sbSector.Length >= 0x400)
                 {
-                    errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] temp);
-
-                    if(errno != ErrorNumber.NoError)
-                        return;
-
-                    besb.magic1 = BigEndianBitConverter.ToUInt32(temp, 0x220);
-
-                    if(besb.magic1 == BEFS_MAGIC1 ||
-                       besb.magic1 == BEFS_CIGAM1) // There is a boot sector
-                    {
-                        littleEndian = besb.magic1 == BEFS_CIGAM1;
-                        sbSector     = new byte[0x200];
-                        Array.Copy(temp, 0x200, sbSector, 0, 0x200);
-                    }
-                    else
-                        return;
+                    littleEndian = besb.magic1 == BEFS_CIGAM1;
+                    sbSector     = new byte[0x200];
+                    Array.Copy(temp, 0x200, sbSector, 0, 0x200);
                 }
                 else
                     return;
             }
-
-            besb = littleEndian ? Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sbSector)
-                       : Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sbSector);
-
-            sb.AppendLine(littleEndian ? "Little-endian BeFS" : "Big-endian BeFS");
-
-            if(besb.magic1                != BEFS_MAGIC1 ||
-               besb.fs_byte_order         != BEFS_ENDIAN ||
-               besb.magic2                != BEFS_MAGIC2 ||
-               besb.magic3                != BEFS_MAGIC3 ||
-               besb.root_dir_len          != 1           ||
-               besb.indices_len           != 1           ||
-               1 << (int)besb.block_shift != besb.block_size)
-            {
-                sb.AppendLine("Superblock seems corrupt, following information may be incorrect");
-                sb.AppendFormat("Magic 1: 0x{0:X8} (Should be 0x42465331)", besb.magic1).AppendLine();
-                sb.AppendFormat("Magic 2: 0x{0:X8} (Should be 0xDD121031)", besb.magic2).AppendLine();
-                sb.AppendFormat("Magic 3: 0x{0:X8} (Should be 0x15B6830E)", besb.magic3).AppendLine();
-
-                sb.AppendFormat("Filesystem endianness: 0x{0:X8} (Should be 0x42494745)", besb.fs_byte_order).
-                   AppendLine();
-
-                sb.AppendFormat("Root folder's i-node size: {0} blocks (Should be 1)", besb.root_dir_len).AppendLine();
-                sb.AppendFormat("Indices' i-node size: {0} blocks (Should be 1)", besb.indices_len).AppendLine();
-
-                sb.AppendFormat("1 << block_shift == block_size => 1 << {0} == {1} (Should be {2})", besb.block_shift,
-                                1 << (int)besb.block_shift, besb.block_size).AppendLine();
-            }
-
-            switch(besb.flags)
-            {
-                case BEFS_CLEAN:
-                    sb.AppendLine(besb.log_start == besb.log_end ? "Filesystem is clean" : "Filesystem is dirty");
-
-                    break;
-                case BEFS_DIRTY:
-                    sb.AppendLine("Filesystem is dirty");
-
-                    break;
-                default:
-                    sb.AppendFormat("Unknown flags: {0:X8}", besb.flags).AppendLine();
-
-                    break;
-            }
-
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(besb.name, Encoding)).AppendLine();
-            sb.AppendFormat("{0} bytes per block", besb.block_size).AppendLine();
-
-            sb.AppendFormat("{0} blocks in volume ({1} bytes)", besb.num_blocks, besb.num_blocks * besb.block_size).
-               AppendLine();
-
-            sb.AppendFormat("{0} used blocks ({1} bytes)", besb.used_blocks, besb.used_blocks * besb.block_size).
-               AppendLine();
-
-            sb.AppendFormat("{0} bytes per i-node", besb.inode_size).AppendLine();
-
-            sb.AppendFormat("{0} blocks per allocation group ({1} bytes)", besb.blocks_per_ag,
-                            besb.blocks_per_ag * besb.block_size).AppendLine();
-
-            sb.AppendFormat("{0} allocation groups in volume", besb.num_ags).AppendLine();
-
-            sb.AppendFormat("Journal resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
-                            besb.log_blocks_start, besb.log_blocks_ag, besb.log_blocks_len,
-                            besb.log_blocks_len * besb.block_size).AppendLine();
-
-            sb.AppendFormat("Journal starts in byte {0} and ends in byte {1}", besb.log_start, besb.log_end).
-               AppendLine();
-
-            sb.
-                AppendFormat("Root folder's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
-                             besb.root_dir_start, besb.root_dir_ag, besb.root_dir_len,
-                             besb.root_dir_len * besb.block_size).AppendLine();
-
-            sb.
-                AppendFormat("Indices' i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
-                             besb.indices_start, besb.indices_ag, besb.indices_len, besb.indices_len * besb.block_size).
-                AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Clusters              = (ulong)besb.num_blocks,
-                ClusterSize           = besb.block_size,
-                Dirty                 = besb.flags == BEFS_DIRTY,
-                FreeClusters          = (ulong)(besb.num_blocks - besb.used_blocks),
-                FreeClustersSpecified = true,
-                Type                  = "BeFS",
-                VolumeName            = StringHandlers.CToString(besb.name, Encoding)
-            };
+            else
+                return;
         }
 
-        /// <summary>Be superblock</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct SuperBlock
+        besb = littleEndian ? Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sbSector)
+                   : Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sbSector);
+
+        sb.AppendLine(littleEndian ? "Little-endian BeFS" : "Big-endian BeFS");
+
+        if(besb.magic1                != BEFS_MAGIC1 ||
+           besb.fs_byte_order         != BEFS_ENDIAN ||
+           besb.magic2                != BEFS_MAGIC2 ||
+           besb.magic3                != BEFS_MAGIC3 ||
+           besb.root_dir_len          != 1           ||
+           besb.indices_len           != 1           ||
+           1 << (int)besb.block_shift != besb.block_size)
         {
-            /// <summary>0x000, Volume name, 32 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] name;
-            /// <summary>0x020, "BFS1", 0x42465331</summary>
-            public uint magic1;
-            /// <summary>0x024, "BIGE", 0x42494745</summary>
-            public readonly uint fs_byte_order;
-            /// <summary>0x028, Bytes per block</summary>
-            public readonly uint block_size;
-            /// <summary>0x02C, 1 &lt;&lt; block_shift == block_size</summary>
-            public readonly uint block_shift;
-            /// <summary>0x030, Blocks in volume</summary>
-            public readonly long num_blocks;
-            /// <summary>0x038, Used blocks in volume</summary>
-            public readonly long used_blocks;
-            /// <summary>0x040, Bytes per inode</summary>
-            public readonly int inode_size;
-            /// <summary>0x044, 0xDD121031</summary>
-            public readonly uint magic2;
-            /// <summary>0x048, Blocks per allocation group</summary>
-            public readonly int blocks_per_ag;
-            /// <summary>0x04C, 1 &lt;&lt; ag_shift == blocks_per_ag</summary>
-            public readonly int ag_shift;
-            /// <summary>0x050, Allocation groups in volume</summary>
-            public readonly int num_ags;
-            /// <summary>0x054, 0x434c454e if clean, 0x44495254 if dirty</summary>
-            public readonly uint flags;
-            /// <summary>0x058, Allocation group of journal</summary>
-            public readonly int log_blocks_ag;
-            /// <summary>0x05C, Start block of journal, inside ag</summary>
-            public readonly ushort log_blocks_start;
-            /// <summary>0x05E, Length in blocks of journal, inside ag</summary>
-            public readonly ushort log_blocks_len;
-            /// <summary>0x060, Start of journal</summary>
-            public readonly long log_start;
-            /// <summary>0x068, End of journal</summary>
-            public readonly long log_end;
-            /// <summary>0x070, 0x15B6830E</summary>
-            public readonly uint magic3;
-            /// <summary>0x074, Allocation group where root folder's i-node resides</summary>
-            public readonly int root_dir_ag;
-            /// <summary>0x078, Start in ag of root folder's i-node</summary>
-            public readonly ushort root_dir_start;
-            /// <summary>0x07A, As this is part of inode_addr, this is 1</summary>
-            public readonly ushort root_dir_len;
-            /// <summary>0x07C, Allocation group where indices' i-node resides</summary>
-            public readonly int indices_ag;
-            /// <summary>0x080, Start in ag of indices' i-node</summary>
-            public readonly ushort indices_start;
-            /// <summary>0x082, As this is part of inode_addr, this is 1</summary>
-            public readonly ushort indices_len;
+            sb.AppendLine("Superblock seems corrupt, following information may be incorrect");
+            sb.AppendFormat("Magic 1: 0x{0:X8} (Should be 0x42465331)", besb.magic1).AppendLine();
+            sb.AppendFormat("Magic 2: 0x{0:X8} (Should be 0xDD121031)", besb.magic2).AppendLine();
+            sb.AppendFormat("Magic 3: 0x{0:X8} (Should be 0x15B6830E)", besb.magic3).AppendLine();
+
+            sb.AppendFormat("Filesystem endianness: 0x{0:X8} (Should be 0x42494745)", besb.fs_byte_order).
+               AppendLine();
+
+            sb.AppendFormat("Root folder's i-node size: {0} blocks (Should be 1)", besb.root_dir_len).AppendLine();
+            sb.AppendFormat("Indices' i-node size: {0} blocks (Should be 1)", besb.indices_len).AppendLine();
+
+            sb.AppendFormat("1 << block_shift == block_size => 1 << {0} == {1} (Should be {2})", besb.block_shift,
+                            1 << (int)besb.block_shift, besb.block_size).AppendLine();
         }
+
+        switch(besb.flags)
+        {
+            case BEFS_CLEAN:
+                sb.AppendLine(besb.log_start == besb.log_end ? "Filesystem is clean" : "Filesystem is dirty");
+
+                break;
+            case BEFS_DIRTY:
+                sb.AppendLine("Filesystem is dirty");
+
+                break;
+            default:
+                sb.AppendFormat("Unknown flags: {0:X8}", besb.flags).AppendLine();
+
+                break;
+        }
+
+        sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(besb.name, Encoding)).AppendLine();
+        sb.AppendFormat("{0} bytes per block", besb.block_size).AppendLine();
+
+        sb.AppendFormat("{0} blocks in volume ({1} bytes)", besb.num_blocks, besb.num_blocks * besb.block_size).
+           AppendLine();
+
+        sb.AppendFormat("{0} used blocks ({1} bytes)", besb.used_blocks, besb.used_blocks * besb.block_size).
+           AppendLine();
+
+        sb.AppendFormat("{0} bytes per i-node", besb.inode_size).AppendLine();
+
+        sb.AppendFormat("{0} blocks per allocation group ({1} bytes)", besb.blocks_per_ag,
+                        besb.blocks_per_ag * besb.block_size).AppendLine();
+
+        sb.AppendFormat("{0} allocation groups in volume", besb.num_ags).AppendLine();
+
+        sb.AppendFormat("Journal resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+                        besb.log_blocks_start, besb.log_blocks_ag, besb.log_blocks_len,
+                        besb.log_blocks_len * besb.block_size).AppendLine();
+
+        sb.AppendFormat("Journal starts in byte {0} and ends in byte {1}", besb.log_start, besb.log_end).
+           AppendLine();
+
+        sb.
+            AppendFormat("Root folder's i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+                         besb.root_dir_start, besb.root_dir_ag, besb.root_dir_len,
+                         besb.root_dir_len * besb.block_size).AppendLine();
+
+        sb.
+            AppendFormat("Indices' i-node resides in block {0} of allocation group {1} and runs for {2} blocks ({3} bytes)",
+                         besb.indices_start, besb.indices_ag, besb.indices_len, besb.indices_len * besb.block_size).
+            AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
+        {
+            Clusters              = (ulong)besb.num_blocks,
+            ClusterSize           = besb.block_size,
+            Dirty                 = besb.flags == BEFS_DIRTY,
+            FreeClusters          = (ulong)(besb.num_blocks - besb.used_blocks),
+            FreeClustersSpecified = true,
+            Type                  = "BeFS",
+            VolumeName            = StringHandlers.CToString(besb.name, Encoding)
+        };
+    }
+
+    /// <summary>Be superblock</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct SuperBlock
+    {
+        /// <summary>0x000, Volume name, 32 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] name;
+        /// <summary>0x020, "BFS1", 0x42465331</summary>
+        public uint magic1;
+        /// <summary>0x024, "BIGE", 0x42494745</summary>
+        public readonly uint fs_byte_order;
+        /// <summary>0x028, Bytes per block</summary>
+        public readonly uint block_size;
+        /// <summary>0x02C, 1 &lt;&lt; block_shift == block_size</summary>
+        public readonly uint block_shift;
+        /// <summary>0x030, Blocks in volume</summary>
+        public readonly long num_blocks;
+        /// <summary>0x038, Used blocks in volume</summary>
+        public readonly long used_blocks;
+        /// <summary>0x040, Bytes per inode</summary>
+        public readonly int inode_size;
+        /// <summary>0x044, 0xDD121031</summary>
+        public readonly uint magic2;
+        /// <summary>0x048, Blocks per allocation group</summary>
+        public readonly int blocks_per_ag;
+        /// <summary>0x04C, 1 &lt;&lt; ag_shift == blocks_per_ag</summary>
+        public readonly int ag_shift;
+        /// <summary>0x050, Allocation groups in volume</summary>
+        public readonly int num_ags;
+        /// <summary>0x054, 0x434c454e if clean, 0x44495254 if dirty</summary>
+        public readonly uint flags;
+        /// <summary>0x058, Allocation group of journal</summary>
+        public readonly int log_blocks_ag;
+        /// <summary>0x05C, Start block of journal, inside ag</summary>
+        public readonly ushort log_blocks_start;
+        /// <summary>0x05E, Length in blocks of journal, inside ag</summary>
+        public readonly ushort log_blocks_len;
+        /// <summary>0x060, Start of journal</summary>
+        public readonly long log_start;
+        /// <summary>0x068, End of journal</summary>
+        public readonly long log_end;
+        /// <summary>0x070, 0x15B6830E</summary>
+        public readonly uint magic3;
+        /// <summary>0x074, Allocation group where root folder's i-node resides</summary>
+        public readonly int root_dir_ag;
+        /// <summary>0x078, Start in ag of root folder's i-node</summary>
+        public readonly ushort root_dir_start;
+        /// <summary>0x07A, As this is part of inode_addr, this is 1</summary>
+        public readonly ushort root_dir_len;
+        /// <summary>0x07C, Allocation group where indices' i-node resides</summary>
+        public readonly int indices_ag;
+        /// <summary>0x080, Start in ag of indices' i-node</summary>
+        public readonly ushort indices_start;
+        /// <summary>0x082, As this is part of inode_addr, this is 1</summary>
+        public readonly ushort indices_len;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/BTRFS.cs b/Aaru.Filesystems/BTRFS.cs
index 45bb3b9bd..10a0172bc 100644
--- a/Aaru.Filesystems/BTRFS.cs
+++ b/Aaru.Filesystems/BTRFS.cs
@@ -40,242 +40,241 @@ using Aaru.Console;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the b-tree filesystem (btrfs)</summary>
+public sealed class BTRFS : IFilesystem
 {
+    /// <summary>BTRFS magic "_BHRfS_M"</summary>
+    const ulong BTRFS_MAGIC = 0x4D5F53665248425F;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the b-tree filesystem (btrfs)</summary>
-    public sealed class BTRFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "B-tree file system";
+    /// <inheritdoc />
+    public Guid Id => new("C904CF15-5222-446B-B7DB-02EAC5D781B3");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>BTRFS magic "_BHRfS_M"</summary>
-        const ulong BTRFS_MAGIC = 0x4D5F53665248425F;
+        if(partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "B-tree file system";
-        /// <inheritdoc />
-        public Guid Id => new("C904CF15-5222-446B-B7DB-02EAC5D781B3");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ulong sbSectorOff  = 0x10000 / imagePlugin.Info.SectorSize;
+        uint  sbSectorSize = 0x1000  / imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(sbSectorOff + partition.Start >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSectorSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        SuperBlock btrfsSb;
+
+        try
         {
-            if(partition.Start >= partition.End)
-                return false;
-
-            ulong sbSectorOff  = 0x10000 / imagePlugin.Info.SectorSize;
-            uint  sbSectorSize = 0x1000  / imagePlugin.Info.SectorSize;
-
-            if(sbSectorOff + partition.Start >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSectorSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            SuperBlock btrfsSb;
-
-            try
-            {
-                btrfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
-            }
-            catch
-            {
-                return false;
-            }
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "sbSectorOff = {0}", sbSectorOff);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "sbSectorSize = {0}", sbSectorSize);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "partition.PartitionStartSector = {0}", partition.Start);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.magic = 0x{0:X16}", btrfsSb.magic);
-
-            return btrfsSb.magic == BTRFS_MAGIC;
+            btrfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
+        }
+        catch
+        {
+            return false;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "sbSectorOff = {0}", sbSectorOff);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "sbSectorSize = {0}", sbSectorSize);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "partition.PartitionStartSector = {0}", partition.Start);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.magic = 0x{0:X16}", btrfsSb.magic);
+
+        return btrfsSb.magic == BTRFS_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        var sbInformation = new StringBuilder();
+        XmlFsType   = new FileSystemType();
+        information = "";
+
+        ulong sbSectorOff  = 0x10000 / imagePlugin.Info.SectorSize;
+        uint  sbSectorSize = 0x1000  / imagePlugin.Info.SectorSize;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSectorSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        SuperBlock btrfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.checksum = {0}", btrfsSb.checksum);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.uuid = {0}", btrfsSb.uuid);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.pba = {0}", btrfsSb.pba);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.flags = {0}", btrfsSb.flags);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.magic = {0}", btrfsSb.magic);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.generation = {0}", btrfsSb.generation);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_lba = {0}", btrfsSb.root_lba);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_lba = {0}", btrfsSb.chunk_lba);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_lba = {0}", btrfsSb.log_lba);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_root_transid = {0}", btrfsSb.log_root_transid);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.total_bytes = {0}", btrfsSb.total_bytes);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.bytes_used = {0}", btrfsSb.bytes_used);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_dir_objectid = {0}", btrfsSb.root_dir_objectid);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.num_devices = {0}", btrfsSb.num_devices);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.sectorsize = {0}", btrfsSb.sectorsize);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.nodesize = {0}", btrfsSb.nodesize);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.leafsize = {0}", btrfsSb.leafsize);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.stripesize = {0}", btrfsSb.stripesize);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.n = {0}", btrfsSb.n);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_root_generation = {0}",
+                                   btrfsSb.chunk_root_generation);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.compat_flags = 0x{0:X16}", btrfsSb.compat_flags);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.compat_ro_flags = 0x{0:X16}", btrfsSb.compat_ro_flags);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.incompat_flags = 0x{0:X16}", btrfsSb.incompat_flags);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.csum_type = {0}", btrfsSb.csum_type);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_level = {0}", btrfsSb.root_level);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_root_level = {0}", btrfsSb.chunk_root_level);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_root_level = {0}", btrfsSb.log_root_level);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.id = 0x{0:X16}", btrfsSb.dev_item.id);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.bytes = {0}", btrfsSb.dev_item.bytes);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.used = {0}", btrfsSb.dev_item.used);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.optimal_align = {0}",
+                                   btrfsSb.dev_item.optimal_align);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.optimal_width = {0}",
+                                   btrfsSb.dev_item.optimal_width);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.minimal_size = {0}",
+                                   btrfsSb.dev_item.minimal_size);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.type = {0}", btrfsSb.dev_item.type);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.generation = {0}",
+                                   btrfsSb.dev_item.generation);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.start_offset = {0}",
+                                   btrfsSb.dev_item.start_offset);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.dev_group = {0}", btrfsSb.dev_item.dev_group);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.seek_speed = {0}",
+                                   btrfsSb.dev_item.seek_speed);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.bandwitdh = {0}", btrfsSb.dev_item.bandwitdh);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.device_uuid = {0}",
+                                   btrfsSb.dev_item.device_uuid);
+
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.uuid = {0}", btrfsSb.dev_item.uuid);
+        AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.label = {0}", btrfsSb.label);
+
+        sbInformation.AppendLine("B-tree filesystem");
+        sbInformation.AppendFormat("UUID: {0}", btrfsSb.uuid).AppendLine();
+        sbInformation.AppendFormat("This superblock resides on physical block {0}", btrfsSb.pba).AppendLine();
+        sbInformation.AppendFormat("Root tree starts at LBA {0}", btrfsSb.root_lba).AppendLine();
+        sbInformation.AppendFormat("Chunk tree starts at LBA {0}", btrfsSb.chunk_lba).AppendLine();
+        sbInformation.AppendFormat("Log tree starts at LBA {0}", btrfsSb.log_lba).AppendLine();
+
+        sbInformation.AppendFormat("Volume has {0} bytes spanned in {1} devices", btrfsSb.total_bytes,
+                                   btrfsSb.num_devices).AppendLine();
+
+        sbInformation.AppendFormat("Volume has {0} bytes used", btrfsSb.bytes_used).AppendLine();
+        sbInformation.AppendFormat("{0} bytes/sector", btrfsSb.sectorsize).AppendLine();
+        sbInformation.AppendFormat("{0} bytes/node", btrfsSb.nodesize).AppendLine();
+        sbInformation.AppendFormat("{0} bytes/leaf", btrfsSb.leafsize).AppendLine();
+        sbInformation.AppendFormat("{0} bytes/stripe", btrfsSb.stripesize).AppendLine();
+        sbInformation.AppendFormat("Flags: 0x{0:X}", btrfsSb.flags).AppendLine();
+        sbInformation.AppendFormat("Compatible flags: 0x{0:X}", btrfsSb.compat_flags).AppendLine();
+        sbInformation.AppendFormat("Read-only compatible flags: 0x{0:X}", btrfsSb.compat_ro_flags).AppendLine();
+        sbInformation.AppendFormat("Incompatible flags: 0x{0:X}", btrfsSb.incompat_flags).AppendLine();
+        sbInformation.AppendFormat("Device's UUID: {0}", btrfsSb.dev_item.uuid).AppendLine();
+        sbInformation.AppendFormat("Volume label: {0}", btrfsSb.label).AppendLine();
+
+        information = sbInformation.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            Encoding = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            var sbInformation = new StringBuilder();
-            XmlFsType   = new FileSystemType();
-            information = "";
+            Clusters              = btrfsSb.total_bytes / btrfsSb.sectorsize,
+            ClusterSize           = btrfsSb.sectorsize,
+            FreeClustersSpecified = true,
+            VolumeName            = btrfsSb.label,
+            VolumeSerial          = $"{btrfsSb.uuid}",
+            VolumeSetIdentifier   = $"{btrfsSb.dev_item.device_uuid}",
+            Type                  = Name
+        };
 
-            ulong sbSectorOff  = 0x10000 / imagePlugin.Info.SectorSize;
-            uint  sbSectorSize = 0x1000  / imagePlugin.Info.SectorSize;
+        XmlFsType.FreeClusters = XmlFsType.Clusters - (btrfsSb.bytes_used / btrfsSb.sectorsize);
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSectorSize, out byte[] sector);
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x20)]
+        public readonly byte[] checksum;
+        public readonly Guid    uuid;
+        public readonly ulong   pba;
+        public readonly ulong   flags;
+        public readonly ulong   magic;
+        public readonly ulong   generation;
+        public readonly ulong   root_lba;
+        public readonly ulong   chunk_lba;
+        public readonly ulong   log_lba;
+        public readonly ulong   log_root_transid;
+        public readonly ulong   total_bytes;
+        public readonly ulong   bytes_used;
+        public readonly ulong   root_dir_objectid;
+        public readonly ulong   num_devices;
+        public readonly uint    sectorsize;
+        public readonly uint    nodesize;
+        public readonly uint    leafsize;
+        public readonly uint    stripesize;
+        public readonly uint    n;
+        public readonly ulong   chunk_root_generation;
+        public readonly ulong   compat_flags;
+        public readonly ulong   compat_ro_flags;
+        public readonly ulong   incompat_flags;
+        public readonly ushort  csum_type;
+        public readonly byte    root_level;
+        public readonly byte    chunk_root_level;
+        public readonly byte    log_root_level;
+        public readonly DevItem dev_item;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x100)]
+        public readonly string label;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x100)]
+        public readonly byte[] reserved;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x800)]
+        public readonly byte[] chunkpairs;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x4D5)]
+        public readonly byte[] unused;
+    }
 
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            SuperBlock btrfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.checksum = {0}", btrfsSb.checksum);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.uuid = {0}", btrfsSb.uuid);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.pba = {0}", btrfsSb.pba);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.flags = {0}", btrfsSb.flags);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.magic = {0}", btrfsSb.magic);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.generation = {0}", btrfsSb.generation);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_lba = {0}", btrfsSb.root_lba);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_lba = {0}", btrfsSb.chunk_lba);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_lba = {0}", btrfsSb.log_lba);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_root_transid = {0}", btrfsSb.log_root_transid);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.total_bytes = {0}", btrfsSb.total_bytes);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.bytes_used = {0}", btrfsSb.bytes_used);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_dir_objectid = {0}", btrfsSb.root_dir_objectid);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.num_devices = {0}", btrfsSb.num_devices);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.sectorsize = {0}", btrfsSb.sectorsize);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.nodesize = {0}", btrfsSb.nodesize);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.leafsize = {0}", btrfsSb.leafsize);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.stripesize = {0}", btrfsSb.stripesize);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.n = {0}", btrfsSb.n);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_root_generation = {0}",
-                                       btrfsSb.chunk_root_generation);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.compat_flags = 0x{0:X16}", btrfsSb.compat_flags);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.compat_ro_flags = 0x{0:X16}", btrfsSb.compat_ro_flags);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.incompat_flags = 0x{0:X16}", btrfsSb.incompat_flags);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.csum_type = {0}", btrfsSb.csum_type);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.root_level = {0}", btrfsSb.root_level);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.chunk_root_level = {0}", btrfsSb.chunk_root_level);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.log_root_level = {0}", btrfsSb.log_root_level);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.id = 0x{0:X16}", btrfsSb.dev_item.id);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.bytes = {0}", btrfsSb.dev_item.bytes);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.used = {0}", btrfsSb.dev_item.used);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.optimal_align = {0}",
-                                       btrfsSb.dev_item.optimal_align);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.optimal_width = {0}",
-                                       btrfsSb.dev_item.optimal_width);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.minimal_size = {0}",
-                                       btrfsSb.dev_item.minimal_size);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.type = {0}", btrfsSb.dev_item.type);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.generation = {0}",
-                                       btrfsSb.dev_item.generation);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.start_offset = {0}",
-                                       btrfsSb.dev_item.start_offset);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.dev_group = {0}", btrfsSb.dev_item.dev_group);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.seek_speed = {0}",
-                                       btrfsSb.dev_item.seek_speed);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.bandwitdh = {0}", btrfsSb.dev_item.bandwitdh);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.device_uuid = {0}",
-                                       btrfsSb.dev_item.device_uuid);
-
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.dev_item.uuid = {0}", btrfsSb.dev_item.uuid);
-            AaruConsole.DebugWriteLine("BTRFS Plugin", "btrfsSb.label = {0}", btrfsSb.label);
-
-            sbInformation.AppendLine("B-tree filesystem");
-            sbInformation.AppendFormat("UUID: {0}", btrfsSb.uuid).AppendLine();
-            sbInformation.AppendFormat("This superblock resides on physical block {0}", btrfsSb.pba).AppendLine();
-            sbInformation.AppendFormat("Root tree starts at LBA {0}", btrfsSb.root_lba).AppendLine();
-            sbInformation.AppendFormat("Chunk tree starts at LBA {0}", btrfsSb.chunk_lba).AppendLine();
-            sbInformation.AppendFormat("Log tree starts at LBA {0}", btrfsSb.log_lba).AppendLine();
-
-            sbInformation.AppendFormat("Volume has {0} bytes spanned in {1} devices", btrfsSb.total_bytes,
-                                       btrfsSb.num_devices).AppendLine();
-
-            sbInformation.AppendFormat("Volume has {0} bytes used", btrfsSb.bytes_used).AppendLine();
-            sbInformation.AppendFormat("{0} bytes/sector", btrfsSb.sectorsize).AppendLine();
-            sbInformation.AppendFormat("{0} bytes/node", btrfsSb.nodesize).AppendLine();
-            sbInformation.AppendFormat("{0} bytes/leaf", btrfsSb.leafsize).AppendLine();
-            sbInformation.AppendFormat("{0} bytes/stripe", btrfsSb.stripesize).AppendLine();
-            sbInformation.AppendFormat("Flags: 0x{0:X}", btrfsSb.flags).AppendLine();
-            sbInformation.AppendFormat("Compatible flags: 0x{0:X}", btrfsSb.compat_flags).AppendLine();
-            sbInformation.AppendFormat("Read-only compatible flags: 0x{0:X}", btrfsSb.compat_ro_flags).AppendLine();
-            sbInformation.AppendFormat("Incompatible flags: 0x{0:X}", btrfsSb.incompat_flags).AppendLine();
-            sbInformation.AppendFormat("Device's UUID: {0}", btrfsSb.dev_item.uuid).AppendLine();
-            sbInformation.AppendFormat("Volume label: {0}", btrfsSb.label).AppendLine();
-
-            information = sbInformation.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Clusters              = btrfsSb.total_bytes / btrfsSb.sectorsize,
-                ClusterSize           = btrfsSb.sectorsize,
-                FreeClustersSpecified = true,
-                VolumeName            = btrfsSb.label,
-                VolumeSerial          = $"{btrfsSb.uuid}",
-                VolumeSetIdentifier   = $"{btrfsSb.dev_item.device_uuid}",
-                Type                  = Name
-            };
-
-            XmlFsType.FreeClusters = XmlFsType.Clusters - (btrfsSb.bytes_used / btrfsSb.sectorsize);
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x20)]
-            public readonly byte[] checksum;
-            public readonly Guid    uuid;
-            public readonly ulong   pba;
-            public readonly ulong   flags;
-            public readonly ulong   magic;
-            public readonly ulong   generation;
-            public readonly ulong   root_lba;
-            public readonly ulong   chunk_lba;
-            public readonly ulong   log_lba;
-            public readonly ulong   log_root_transid;
-            public readonly ulong   total_bytes;
-            public readonly ulong   bytes_used;
-            public readonly ulong   root_dir_objectid;
-            public readonly ulong   num_devices;
-            public readonly uint    sectorsize;
-            public readonly uint    nodesize;
-            public readonly uint    leafsize;
-            public readonly uint    stripesize;
-            public readonly uint    n;
-            public readonly ulong   chunk_root_generation;
-            public readonly ulong   compat_flags;
-            public readonly ulong   compat_ro_flags;
-            public readonly ulong   incompat_flags;
-            public readonly ushort  csum_type;
-            public readonly byte    root_level;
-            public readonly byte    chunk_root_level;
-            public readonly byte    log_root_level;
-            public readonly DevItem dev_item;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 0x100)]
-            public readonly string label;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x100)]
-            public readonly byte[] reserved;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x800)]
-            public readonly byte[] chunkpairs;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x4D5)]
-            public readonly byte[] unused;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DevItem
-        {
-            public readonly ulong id;
-            public readonly ulong bytes;
-            public readonly ulong used;
-            public readonly uint  optimal_align;
-            public readonly uint  optimal_width;
-            public readonly uint  minimal_size;
-            public readonly ulong type;
-            public readonly ulong generation;
-            public readonly ulong start_offset;
-            public readonly uint  dev_group;
-            public readonly byte  seek_speed;
-            public readonly byte  bandwitdh;
-            public readonly Guid  device_uuid;
-            public readonly Guid  uuid;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DevItem
+    {
+        public readonly ulong id;
+        public readonly ulong bytes;
+        public readonly ulong used;
+        public readonly uint  optimal_align;
+        public readonly uint  optimal_width;
+        public readonly uint  minimal_size;
+        public readonly ulong type;
+        public readonly ulong generation;
+        public readonly ulong start_offset;
+        public readonly uint  dev_group;
+        public readonly byte  seek_speed;
+        public readonly byte  bandwitdh;
+        public readonly Guid  device_uuid;
+        public readonly Guid  uuid;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CBM.cs b/Aaru.Filesystems/CBM.cs
index 3b12e3354..3b13672ce 100644
--- a/Aaru.Filesystems/CBM.cs
+++ b/Aaru.Filesystems/CBM.cs
@@ -42,229 +42,228 @@ using Schemas;
 using Encoding = System.Text.Encoding;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the filesystem used in 8-bit Commodore microcomputers</summary>
+public sealed class CBM : IFilesystem
 {
     /// <inheritdoc />
-    /// <summary>Implements detection of the filesystem used in 8-bit Commodore microcomputers</summary>
-    public sealed class CBM : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Commodore file system";
+    /// <inheritdoc />
+    public Guid Id => new("D104744E-A376-450C-BAC0-1347C93F983B");
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Commodore file system";
-        /// <inheritdoc />
-        public Guid Id => new("D104744E-A376-450C-BAC0-1347C93F983B");
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            if(partition.Start > 0)
-                return false;
-
-            if(imagePlugin.Info.SectorSize != 256)
-                return false;
-
-            if(imagePlugin.Info.Sectors != 683  &&
-               imagePlugin.Info.Sectors != 768  &&
-               imagePlugin.Info.Sectors != 1366 &&
-               imagePlugin.Info.Sectors != 3200)
-                return false;
-
-            byte[] sector;
-
-            if(imagePlugin.Info.Sectors == 3200)
-            {
-                ErrorNumber errno = imagePlugin.ReadSector(1560, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                Header cbmHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(sector);
-
-                if(cbmHdr.diskDosVersion == 0x44 &&
-                   cbmHdr.dosVersion     == 0x33 &&
-                   cbmHdr.diskVersion    == 0x44)
-                    return true;
-            }
-            else
-            {
-                ErrorNumber errno = imagePlugin.ReadSector(357, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                BAM cbmBam = Marshal.ByteArrayToStructureLittleEndian<BAM>(sector);
-
-                if(cbmBam.dosVersion == 0x41                                  &&
-                   (cbmBam.doubleSided == 0x00 || cbmBam.doubleSided == 0x80) &&
-                   cbmBam.unused1        == 0x00                              &&
-                   cbmBam.directoryTrack == 0x12)
-                    return true;
-            }
-
+        if(partition.Start > 0)
             return false;
-        }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        if(imagePlugin.Info.SectorSize != 256)
+            return false;
+
+        if(imagePlugin.Info.Sectors != 683  &&
+           imagePlugin.Info.Sectors != 768  &&
+           imagePlugin.Info.Sectors != 1366 &&
+           imagePlugin.Info.Sectors != 3200)
+            return false;
+
+        byte[] sector;
+
+        if(imagePlugin.Info.Sectors == 3200)
         {
-            Encoding    = new PETSCII();
-            information = "";
-            byte[] sector;
+            ErrorNumber errno = imagePlugin.ReadSector(1560, out sector);
 
-            var sbInformation = new StringBuilder();
+            if(errno != ErrorNumber.NoError)
+                return false;
 
-            sbInformation.AppendLine("Commodore file system");
+            Header cbmHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(sector);
 
-            XmlFsType = new FileSystemType
-            {
-                Type        = "Commodore file system",
-                Clusters    = imagePlugin.Info.Sectors,
-                ClusterSize = 256
-            };
-
-            if(imagePlugin.Info.Sectors == 3200)
-            {
-                ErrorNumber errno = imagePlugin.ReadSector(1560, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                Header cbmHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(sector);
-
-                sbInformation.AppendFormat("Directory starts at track {0} sector {1}", cbmHdr.directoryTrack,
-                                           cbmHdr.directorySector).AppendLine();
-
-                sbInformation.AppendFormat("Disk DOS Version: {0}", Encoding.ASCII.GetString(new[]
-                {
-                    cbmHdr.diskDosVersion
-                })).AppendLine();
-
-                sbInformation.AppendFormat("DOS Version: {0}", Encoding.ASCII.GetString(new[]
-                {
-                    cbmHdr.dosVersion
-                })).AppendLine();
-
-                sbInformation.AppendFormat("Disk Version: {0}", Encoding.ASCII.GetString(new[]
-                {
-                    cbmHdr.diskVersion
-                })).AppendLine();
-
-                sbInformation.AppendFormat("Disk ID: {0}", cbmHdr.diskId).AppendLine();
-
-                sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(cbmHdr.name, Encoding)).
-                              AppendLine();
-
-                XmlFsType.VolumeName   = StringHandlers.CToString(cbmHdr.name, Encoding);
-                XmlFsType.VolumeSerial = $"{cbmHdr.diskId}";
-            }
-            else
-            {
-                ErrorNumber errno = imagePlugin.ReadSector(357, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                BAM cbmBam = Marshal.ByteArrayToStructureLittleEndian<BAM>(sector);
-
-                sbInformation.AppendFormat("Directory starts at track {0} sector {1}", cbmBam.directoryTrack,
-                                           cbmBam.directorySector).AppendLine();
-
-                sbInformation.AppendFormat("Disk DOS type: {0}",
-                                           Encoding.ASCII.GetString(BitConverter.GetBytes(cbmBam.dosType))).
-                              AppendLine();
-
-                sbInformation.AppendFormat("DOS Version: {0}", Encoding.ASCII.GetString(new[]
-                {
-                    cbmBam.dosVersion
-                })).AppendLine();
-
-                sbInformation.AppendFormat("Disk ID: {0}", cbmBam.diskId).AppendLine();
-
-                sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(cbmBam.name, Encoding)).
-                              AppendLine();
-
-                XmlFsType.VolumeName   = StringHandlers.CToString(cbmBam.name, Encoding);
-                XmlFsType.VolumeSerial = $"{cbmBam.diskId}";
-            }
-
-            information = sbInformation.ToString();
+            if(cbmHdr.diskDosVersion == 0x44 &&
+               cbmHdr.dosVersion     == 0x33 &&
+               cbmHdr.diskVersion    == 0x44)
+                return true;
         }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BAM
+        else
         {
-            /// <summary>Track where directory starts</summary>
-            public readonly byte directoryTrack;
-            /// <summary>Sector where directory starts</summary>
-            public readonly byte directorySector;
-            /// <summary>Disk DOS version, 0x41</summary>
-            public readonly byte dosVersion;
-            /// <summary>Set to 0x80 if 1571, 0x00 if not</summary>
-            public readonly byte doubleSided;
-            /// <summary>Block allocation map</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 140)]
-            public readonly byte[] bam;
-            /// <summary>Disk name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] name;
-            /// <summary>Filled with 0xA0</summary>
-            public readonly ushort fill1;
-            /// <summary>Disk ID</summary>
-            public readonly ushort diskId;
-            /// <summary>Filled with 0xA0</summary>
-            public readonly byte fill2;
-            /// <summary>DOS type</summary>
-            public readonly ushort dosType;
-            /// <summary>Filled with 0xA0</summary>
-            public readonly uint fill3;
-            /// <summary>Unused</summary>
-            public readonly byte unused1;
-            /// <summary>Block allocation map for Dolphin DOS extended tracks</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] dolphinBam;
-            /// <summary>Block allocation map for Speed DOS extended tracks</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] speedBam;
-            /// <summary>Unused</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 9)]
-            public readonly byte[] unused2;
-            /// <summary>Free sector count for second side in 1571</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 9)]
-            public readonly byte[] freeCount;
+            ErrorNumber errno = imagePlugin.ReadSector(357, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                return false;
+
+            BAM cbmBam = Marshal.ByteArrayToStructureLittleEndian<BAM>(sector);
+
+            if(cbmBam.dosVersion == 0x41                                  &&
+               (cbmBam.doubleSided == 0x00 || cbmBam.doubleSided == 0x80) &&
+               cbmBam.unused1        == 0x00                              &&
+               cbmBam.directoryTrack == 0x12)
+                return true;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Header
+        return false;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = new PETSCII();
+        information = "";
+        byte[] sector;
+
+        var sbInformation = new StringBuilder();
+
+        sbInformation.AppendLine("Commodore file system");
+
+        XmlFsType = new FileSystemType
         {
-            /// <summary>Track where directory starts</summary>
-            public readonly byte directoryTrack;
-            /// <summary>Sector where directory starts</summary>
-            public readonly byte directorySector;
-            /// <summary>Disk DOS version, 0x44</summary>
-            public readonly byte diskDosVersion;
-            /// <summary>Unusued</summary>
-            public readonly byte unused1;
-            /// <summary>Disk name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] name;
-            /// <summary>Filled with 0xA0</summary>
-            public readonly ushort fill1;
-            /// <summary>Disk ID</summary>
-            public readonly ushort diskId;
-            /// <summary>Filled with 0xA0</summary>
-            public readonly byte fill2;
-            /// <summary>DOS version ('3')</summary>
-            public readonly byte dosVersion;
-            /// <summary>Disk version ('D')</summary>
-            public readonly byte diskVersion;
-            /// <summary>Filled with 0xA0</summary>
-            public readonly short fill3;
+            Type        = "Commodore file system",
+            Clusters    = imagePlugin.Info.Sectors,
+            ClusterSize = 256
+        };
+
+        if(imagePlugin.Info.Sectors == 3200)
+        {
+            ErrorNumber errno = imagePlugin.ReadSector(1560, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                return;
+
+            Header cbmHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(sector);
+
+            sbInformation.AppendFormat("Directory starts at track {0} sector {1}", cbmHdr.directoryTrack,
+                                       cbmHdr.directorySector).AppendLine();
+
+            sbInformation.AppendFormat("Disk DOS Version: {0}", Encoding.ASCII.GetString(new[]
+            {
+                cbmHdr.diskDosVersion
+            })).AppendLine();
+
+            sbInformation.AppendFormat("DOS Version: {0}", Encoding.ASCII.GetString(new[]
+            {
+                cbmHdr.dosVersion
+            })).AppendLine();
+
+            sbInformation.AppendFormat("Disk Version: {0}", Encoding.ASCII.GetString(new[]
+            {
+                cbmHdr.diskVersion
+            })).AppendLine();
+
+            sbInformation.AppendFormat("Disk ID: {0}", cbmHdr.diskId).AppendLine();
+
+            sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(cbmHdr.name, Encoding)).
+                          AppendLine();
+
+            XmlFsType.VolumeName   = StringHandlers.CToString(cbmHdr.name, Encoding);
+            XmlFsType.VolumeSerial = $"{cbmHdr.diskId}";
         }
+        else
+        {
+            ErrorNumber errno = imagePlugin.ReadSector(357, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                return;
+
+            BAM cbmBam = Marshal.ByteArrayToStructureLittleEndian<BAM>(sector);
+
+            sbInformation.AppendFormat("Directory starts at track {0} sector {1}", cbmBam.directoryTrack,
+                                       cbmBam.directorySector).AppendLine();
+
+            sbInformation.AppendFormat("Disk DOS type: {0}",
+                                       Encoding.ASCII.GetString(BitConverter.GetBytes(cbmBam.dosType))).
+                          AppendLine();
+
+            sbInformation.AppendFormat("DOS Version: {0}", Encoding.ASCII.GetString(new[]
+            {
+                cbmBam.dosVersion
+            })).AppendLine();
+
+            sbInformation.AppendFormat("Disk ID: {0}", cbmBam.diskId).AppendLine();
+
+            sbInformation.AppendFormat("Disk name: {0}", StringHandlers.CToString(cbmBam.name, Encoding)).
+                          AppendLine();
+
+            XmlFsType.VolumeName   = StringHandlers.CToString(cbmBam.name, Encoding);
+            XmlFsType.VolumeSerial = $"{cbmBam.diskId}";
+        }
+
+        information = sbInformation.ToString();
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BAM
+    {
+        /// <summary>Track where directory starts</summary>
+        public readonly byte directoryTrack;
+        /// <summary>Sector where directory starts</summary>
+        public readonly byte directorySector;
+        /// <summary>Disk DOS version, 0x41</summary>
+        public readonly byte dosVersion;
+        /// <summary>Set to 0x80 if 1571, 0x00 if not</summary>
+        public readonly byte doubleSided;
+        /// <summary>Block allocation map</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 140)]
+        public readonly byte[] bam;
+        /// <summary>Disk name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] name;
+        /// <summary>Filled with 0xA0</summary>
+        public readonly ushort fill1;
+        /// <summary>Disk ID</summary>
+        public readonly ushort diskId;
+        /// <summary>Filled with 0xA0</summary>
+        public readonly byte fill2;
+        /// <summary>DOS type</summary>
+        public readonly ushort dosType;
+        /// <summary>Filled with 0xA0</summary>
+        public readonly uint fill3;
+        /// <summary>Unused</summary>
+        public readonly byte unused1;
+        /// <summary>Block allocation map for Dolphin DOS extended tracks</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] dolphinBam;
+        /// <summary>Block allocation map for Speed DOS extended tracks</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] speedBam;
+        /// <summary>Unused</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 9)]
+        public readonly byte[] unused2;
+        /// <summary>Free sector count for second side in 1571</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 9)]
+        public readonly byte[] freeCount;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Header
+    {
+        /// <summary>Track where directory starts</summary>
+        public readonly byte directoryTrack;
+        /// <summary>Sector where directory starts</summary>
+        public readonly byte directorySector;
+        /// <summary>Disk DOS version, 0x44</summary>
+        public readonly byte diskDosVersion;
+        /// <summary>Unusued</summary>
+        public readonly byte unused1;
+        /// <summary>Disk name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] name;
+        /// <summary>Filled with 0xA0</summary>
+        public readonly ushort fill1;
+        /// <summary>Disk ID</summary>
+        public readonly ushort diskId;
+        /// <summary>Filled with 0xA0</summary>
+        public readonly byte fill2;
+        /// <summary>DOS version ('3')</summary>
+        public readonly byte dosVersion;
+        /// <summary>Disk version ('D')</summary>
+        public readonly byte diskVersion;
+        /// <summary>Filled with 0xA0</summary>
+        public readonly short fill3;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/CPM.cs b/Aaru.Filesystems/CPM/CPM.cs
index d84b2690c..e62982bd6 100644
--- a/Aaru.Filesystems/CPM/CPM.cs
+++ b/Aaru.Filesystems/CPM/CPM.cs
@@ -37,74 +37,73 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements the CP/M filesystem</summary>
+public sealed partial class CPM : IReadOnlyFilesystem
 {
+    /// <summary>True if <see cref="Identify" /> thinks this is a CP/M filesystem</summary>
+    bool _cpmFound;
+
+    /// <summary>Cached <see cref="FileSystemInfo" /></summary>
+    FileSystemInfo _cpmStat;
+
+    /// <summary>Cached file passwords, decoded</summary>
+    Dictionary<string, byte[]> _decodedPasswordCache;
+
+    /// <summary>Stores all known CP/M disk definitions</summary>
+    CpmDefinitions _definitions;
+    IMediaImage _device;
+    /// <summary>Cached directory listing</summary>
+    List<string> _dirList;
+    /// <summary>CP/M disc parameter block (on-memory)</summary>
+    DiscParameterBlock _dpb;
+    /// <summary>Cached file data</summary>
+    Dictionary<string, byte[]> _fileCache;
+    /// <summary>The volume label, if the CP/M filesystem contains one</summary>
+    string _label;
+    /// <summary>Timestamp in volume label for creation</summary>
+    byte[] _labelCreationDate;
+    /// <summary>Timestamp in volume label for update</summary>
+    byte[] _labelUpdateDate;
+    bool _mounted;
+    /// <summary>Cached file passwords</summary>
+    Dictionary<string, byte[]> _passwordCache;
+    /// <summary>Sector deinterleaving mask</summary>
+    int[] _sectorMask;
+    /// <summary>True if there are CP/M 3 timestamps</summary>
+    bool _standardTimestamps;
+    /// <summary>Cached file <see cref="FileEntryInfo" /></summary>
+    Dictionary<string, FileEntryInfo> _statCache;
+    /// <summary>True if there are timestamps in Z80DOS or DOS+ format</summary>
+    bool _thirdPartyTimestamps;
+    /// <summary>If <see cref="Identify" /> thinks this is a CP/M filesystem, this is the definition for it</summary>
+    CpmDefinition _workingDefinition;
+
     /// <inheritdoc />
-    /// <summary>Implements the CP/M filesystem</summary>
-    public sealed partial class CPM : IReadOnlyFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "CP/M File System";
+    /// <inheritdoc />
+    public Guid Id => new("AA2B8585-41DF-4E3B-8A35-D1A935E2F8A1");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
+        new (string name, Type type, string description)[]
+            {};
+
+    /// <inheritdoc />
+    public Dictionary<string, string> Namespaces => null;
+
+    static Dictionary<string, string> GetDefaultOptions() => new()
     {
-        /// <summary>True if <see cref="Identify" /> thinks this is a CP/M filesystem</summary>
-        bool _cpmFound;
-
-        /// <summary>Cached <see cref="FileSystemInfo" /></summary>
-        FileSystemInfo _cpmStat;
-
-        /// <summary>Cached file passwords, decoded</summary>
-        Dictionary<string, byte[]> _decodedPasswordCache;
-
-        /// <summary>Stores all known CP/M disk definitions</summary>
-        CpmDefinitions _definitions;
-        IMediaImage _device;
-        /// <summary>Cached directory listing</summary>
-        List<string> _dirList;
-        /// <summary>CP/M disc parameter block (on-memory)</summary>
-        DiscParameterBlock _dpb;
-        /// <summary>Cached file data</summary>
-        Dictionary<string, byte[]> _fileCache;
-        /// <summary>The volume label, if the CP/M filesystem contains one</summary>
-        string _label;
-        /// <summary>Timestamp in volume label for creation</summary>
-        byte[] _labelCreationDate;
-        /// <summary>Timestamp in volume label for update</summary>
-        byte[] _labelUpdateDate;
-        bool _mounted;
-        /// <summary>Cached file passwords</summary>
-        Dictionary<string, byte[]> _passwordCache;
-        /// <summary>Sector deinterleaving mask</summary>
-        int[] _sectorMask;
-        /// <summary>True if there are CP/M 3 timestamps</summary>
-        bool _standardTimestamps;
-        /// <summary>Cached file <see cref="FileEntryInfo" /></summary>
-        Dictionary<string, FileEntryInfo> _statCache;
-        /// <summary>True if there are timestamps in Z80DOS or DOS+ format</summary>
-        bool _thirdPartyTimestamps;
-        /// <summary>If <see cref="Identify" /> thinks this is a CP/M filesystem, this is the definition for it</summary>
-        CpmDefinition _workingDefinition;
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "CP/M File System";
-        /// <inheritdoc />
-        public Guid Id => new("AA2B8585-41DF-4E3B-8A35-D1A935E2F8A1");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[]
-                {};
-
-        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => null;
-
-        static Dictionary<string, string> GetDefaultOptions() => new()
         {
-            {
-                "debug", false.ToString()
-            }
-        };
-    }
+            "debug", false.ToString()
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/Consts.cs b/Aaru.Filesystems/CPM/Consts.cs
index 7886e772f..a021bf068 100644
--- a/Aaru.Filesystems/CPM/Consts.cs
+++ b/Aaru.Filesystems/CPM/Consts.cs
@@ -32,33 +32,32 @@
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class CPM
 {
-    public sealed partial class CPM
+    /// <summary>Enumerates the format identification byte used by CP/M-86</summary>
+    enum FormatByte : byte
     {
-        /// <summary>Enumerates the format identification byte used by CP/M-86</summary>
-        enum FormatByte : byte
-        {
-            /// <summary>5.25" double-density single-side 8 sectors/track</summary>
-            k160 = 0,
-            /// <summary>5.25" double-density double-side 8 sectors/track</summary>
-            k320 = 1,
-            /// <summary>5.25" double-density double-side 9 sectors/track</summary>
-            k360 = 0x10,
-            /// <summary>5.25" double-density double-side 9 sectors/track</summary>
-            k360Alt = 0x40,
-            /// <summary>3.5" double-density double-side 9 sectors/track</summary>
-            k720 = 0x11,
-            /// <summary>3.5" double-density double-side 9 sectors/track using FEAT144</summary>
-            f720 = 0x48,
-            /// <summary>5.25" high-density double-side 15 sectors/track using FEAT144</summary>
-            f1200 = 0x0C,
-            /// <summary>3.5" high-density double-side 18 sectors/track using FEAT144</summary>
-            f1440 = 0x90,
-            /// <summary>5.25" double-density double-side 9 sectors/track</summary>
-            k360Alt2 = 0x26,
-            /// <summary>3.5" double-density double-side 9 sectors/track</summary>
-            k720Alt = 0x94
-        }
+        /// <summary>5.25" double-density single-side 8 sectors/track</summary>
+        k160 = 0,
+        /// <summary>5.25" double-density double-side 8 sectors/track</summary>
+        k320 = 1,
+        /// <summary>5.25" double-density double-side 9 sectors/track</summary>
+        k360 = 0x10,
+        /// <summary>5.25" double-density double-side 9 sectors/track</summary>
+        k360Alt = 0x40,
+        /// <summary>3.5" double-density double-side 9 sectors/track</summary>
+        k720 = 0x11,
+        /// <summary>3.5" double-density double-side 9 sectors/track using FEAT144</summary>
+        f720 = 0x48,
+        /// <summary>5.25" high-density double-side 15 sectors/track using FEAT144</summary>
+        f1200 = 0x0C,
+        /// <summary>3.5" high-density double-side 18 sectors/track using FEAT144</summary>
+        f1440 = 0x90,
+        /// <summary>5.25" double-density double-side 9 sectors/track</summary>
+        k360Alt2 = 0x26,
+        /// <summary>3.5" double-density double-side 9 sectors/track</summary>
+        k720Alt = 0x94
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/Definitions.cs b/Aaru.Filesystems/CPM/Definitions.cs
index 2eb069e11..990de5281 100644
--- a/Aaru.Filesystems/CPM/Definitions.cs
+++ b/Aaru.Filesystems/CPM/Definitions.cs
@@ -38,136 +38,135 @@ using System.Reflection;
 using System.Xml;
 using System.Xml.Serialization;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class CPM
 {
-    public sealed partial class CPM
+    /// <summary>Loads all the known CP/M disk definitions from an XML stored as an embedded resource.</summary>
+    /// <returns>The definitions.</returns>
+    bool LoadDefinitions()
     {
-        /// <summary>Loads all the known CP/M disk definitions from an XML stored as an embedded resource.</summary>
-        /// <returns>The definitions.</returns>
-        bool LoadDefinitions()
+        try
         {
-            try
+            var defsReader =
+                XmlReader.Create(Assembly.GetExecutingAssembly().
+                                          GetManifestResourceStream("Aaru.Filesystems.CPM.cpmdefs.xml") ??
+                                 new MemoryStream());
+
+            var defsSerializer = new XmlSerializer(typeof(CpmDefinitions));
+            _definitions = (CpmDefinitions)defsSerializer.Deserialize(defsReader);
+
+            // Patch definitions
+            foreach(CpmDefinition def in _definitions.definitions)
             {
-                var defsReader =
-                    XmlReader.Create(Assembly.GetExecutingAssembly().
-                                              GetManifestResourceStream("Aaru.Filesystems.CPM.cpmdefs.xml") ??
-                                     new MemoryStream());
-
-                var defsSerializer = new XmlSerializer(typeof(CpmDefinitions));
-                _definitions = (CpmDefinitions)defsSerializer.Deserialize(defsReader);
-
-                // Patch definitions
-                foreach(CpmDefinition def in _definitions.definitions)
+                if(def.side1 == null)
                 {
-                    if(def.side1 == null)
+                    def.side1 = new Side
                     {
-                        def.side1 = new Side
-                        {
-                            sideId    = 0,
-                            sectorIds = new int[def.sectorsPerTrack]
-                        };
+                        sideId    = 0,
+                        sectorIds = new int[def.sectorsPerTrack]
+                    };
 
-                        for(int i = 0; i < def.sectorsPerTrack; i++)
-                            def.side1.sectorIds[i] = i + 1;
-                    }
-
-                    if(def.sides != 2 ||
-                       def.side2 != null)
-                        continue;
-
-                    {
-                        def.side2 = new Side
-                        {
-                            sideId    = 1,
-                            sectorIds = new int[def.sectorsPerTrack]
-                        };
-
-                        for(int i = 0; i < def.sectorsPerTrack; i++)
-                            def.side2.sectorIds[i] = i + 1;
-                    }
+                    for(int i = 0; i < def.sectorsPerTrack; i++)
+                        def.side1.sectorIds[i] = i + 1;
                 }
 
-                return true;
-            }
-            catch
-            {
-                return false;
+                if(def.sides != 2 ||
+                   def.side2 != null)
+                    continue;
+
+                {
+                    def.side2 = new Side
+                    {
+                        sideId    = 1,
+                        sectorIds = new int[def.sectorsPerTrack]
+                    };
+
+                    for(int i = 0; i < def.sectorsPerTrack; i++)
+                        def.side2.sectorIds[i] = i + 1;
+                }
             }
+
+            return true;
+        }
+        catch
+        {
+            return false;
         }
     }
+}
 
-    /// <summary>CP/M disk definitions</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed class CpmDefinitions
-    {
-        /// <summary>Timestamp of creation of the CP/M disk definitions list</summary>
-        public DateTime creation;
-        /// <summary>List of all CP/M disk definitions</summary>
-        public List<CpmDefinition> definitions;
-    }
+/// <summary>CP/M disk definitions</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed class CpmDefinitions
+{
+    /// <summary>Timestamp of creation of the CP/M disk definitions list</summary>
+    public DateTime creation;
+    /// <summary>List of all CP/M disk definitions</summary>
+    public List<CpmDefinition> definitions;
+}
 
-    /// <summary>CP/M disk definition</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed class CpmDefinition
-    {
-        /// <summary>Maps the first 16 allocation blocks for reservation, high byte</summary>
-        public int al0;
-        /// <summary>Maps the first 16 allocation blocks for reservation, low byte</summary>
-        public int al1;
-        /// <summary>Controller bitrate</summary>
-        public string bitrate;
-        /// <summary>Block mask for <see cref="bsh" /></summary>
-        public int blm;
-        /// <summary>Left shifts needed to translate allocation block number to lba</summary>
-        public int bsh;
-        /// <summary>Physical bytes per sector</summary>
-        public int bytesPerSector;
-        /// <summary>Comment and description</summary>
-        public string comment;
-        /// <summary>If true, all bytes written on disk are negated</summary>
-        public bool complement;
-        /// <summary>Total cylinders</summary>
-        public int cylinders;
-        /// <summary>Total number of available directory entries</summary>
-        public int drm;
-        /// <summary>Total number of 128 byte records on disk</summary>
-        public int dsm;
-        /// <summary>Encoding, "FM", "MFM", "GCR"</summary>
-        public string encoding;
-        /// <summary>Absolutely unknown?</summary>
-        public bool evenOdd;
-        /// <summary>Extent mask</summary>
-        public int exm;
-        /// <summary>Disk definition label</summary>
-        public string label;
-        /// <summary>Tracks at the beginning of disk reserved for BIOS/BDOS</summary>
-        public int ofs;
-        /// <summary>
-        ///     Cylinder/side ordering. SIDES = change side after each track, CYLINDERS = change side after whole side, EAGLE
-        ///     and COLUMBIA unknown
-        /// </summary>
-        public string order;
-        /// <summary>Physical sectors per side</summary>
-        public int sectorsPerTrack;
-        /// <summary>Description of controller's side 0 (usually, upper side)</summary>
-        public Side side1;
-        /// <summary>Description of controller's side 1 (usually, lower side)</summary>
-        public Side side2;
-        /// <summary>Total sides</summary>
-        public int sides;
-        /// <summary>Physical sector interleaving</summary>
-        public int skew;
-        /// <summary>Sectors at the beginning of disk reserved for BIOS/BDOS</summary>
-        public int sofs;
-    }
+/// <summary>CP/M disk definition</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed class CpmDefinition
+{
+    /// <summary>Maps the first 16 allocation blocks for reservation, high byte</summary>
+    public int al0;
+    /// <summary>Maps the first 16 allocation blocks for reservation, low byte</summary>
+    public int al1;
+    /// <summary>Controller bitrate</summary>
+    public string bitrate;
+    /// <summary>Block mask for <see cref="bsh" /></summary>
+    public int blm;
+    /// <summary>Left shifts needed to translate allocation block number to lba</summary>
+    public int bsh;
+    /// <summary>Physical bytes per sector</summary>
+    public int bytesPerSector;
+    /// <summary>Comment and description</summary>
+    public string comment;
+    /// <summary>If true, all bytes written on disk are negated</summary>
+    public bool complement;
+    /// <summary>Total cylinders</summary>
+    public int cylinders;
+    /// <summary>Total number of available directory entries</summary>
+    public int drm;
+    /// <summary>Total number of 128 byte records on disk</summary>
+    public int dsm;
+    /// <summary>Encoding, "FM", "MFM", "GCR"</summary>
+    public string encoding;
+    /// <summary>Absolutely unknown?</summary>
+    public bool evenOdd;
+    /// <summary>Extent mask</summary>
+    public int exm;
+    /// <summary>Disk definition label</summary>
+    public string label;
+    /// <summary>Tracks at the beginning of disk reserved for BIOS/BDOS</summary>
+    public int ofs;
+    /// <summary>
+    ///     Cylinder/side ordering. SIDES = change side after each track, CYLINDERS = change side after whole side, EAGLE
+    ///     and COLUMBIA unknown
+    /// </summary>
+    public string order;
+    /// <summary>Physical sectors per side</summary>
+    public int sectorsPerTrack;
+    /// <summary>Description of controller's side 0 (usually, upper side)</summary>
+    public Side side1;
+    /// <summary>Description of controller's side 1 (usually, lower side)</summary>
+    public Side side2;
+    /// <summary>Total sides</summary>
+    public int sides;
+    /// <summary>Physical sector interleaving</summary>
+    public int skew;
+    /// <summary>Sectors at the beginning of disk reserved for BIOS/BDOS</summary>
+    public int sofs;
+}
 
-    /// <summary>Side descriptions</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed class Side
-    {
-        /// <summary>Software interleaving mask, [1,3,0,2] means CP/M LBA 0 is physical sector 1, LBA 1 = 3, so on</summary>
-        public int[] sectorIds;
-        /// <summary>Side ID as found in each sector address mark</summary>
-        public int sideId;
-    }
+/// <summary>Side descriptions</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed class Side
+{
+    /// <summary>Software interleaving mask, [1,3,0,2] means CP/M LBA 0 is physical sector 1, LBA 1 = 3, so on</summary>
+    public int[] sectorIds;
+    /// <summary>Side ID as found in each sector address mark</summary>
+    public int sideId;
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/Dir.cs b/Aaru.Filesystems/CPM/Dir.cs
index 987158805..d5afbb0f8 100644
--- a/Aaru.Filesystems/CPM/Dir.cs
+++ b/Aaru.Filesystems/CPM/Dir.cs
@@ -37,93 +37,92 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class CPM
 {
-    public sealed partial class CPM
+    /// <inheritdoc />
+    public ErrorNumber ReadDir(string path, out List<string> contents)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadDir(string path, out List<string> contents)
+        contents = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(!string.IsNullOrEmpty(path) &&
+           string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
+            return ErrorNumber.NotSupported;
+
+        contents = new List<string>(_dirList);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <summary>
+    ///     Checks that the given directory blocks follow the CP/M filesystem directory specification Corrupted
+    ///     directories will fail. FAT directories will false positive if all files start with 0x05, and do not use full
+    ///     extensions, for example: "σAFILE.GZ" (using code page 437)
+    /// </summary>
+    /// <returns>False if the directory does not follow the directory specification</returns>
+    /// <param name="directory">Directory blocks.</param>
+    bool CheckDir(byte[] directory)
+    {
+        try
         {
-            contents = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            if(!string.IsNullOrEmpty(path) &&
-               string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
-                return ErrorNumber.NotSupported;
-
-            contents = new List<string>(_dirList);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <summary>
-        ///     Checks that the given directory blocks follow the CP/M filesystem directory specification Corrupted
-        ///     directories will fail. FAT directories will false positive if all files start with 0x05, and do not use full
-        ///     extensions, for example: "σAFILE.GZ" (using code page 437)
-        /// </summary>
-        /// <returns>False if the directory does not follow the directory specification</returns>
-        /// <param name="directory">Directory blocks.</param>
-        bool CheckDir(byte[] directory)
-        {
-            try
-            {
-                if(directory == null)
-                    return false;
-
-                int fileCount = 0;
-
-                for(int off = 0; off < directory.Length; off += 32)
-                {
-                    DirectoryEntry entry = Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(directory, off, 32);
-
-                    if((entry.statusUser & 0x7F) < 0x20)
-                    {
-                        for(int f = 0; f < 8; f++)
-                            if(entry.filename[f] < 0x20 &&
-                               entry.filename[f] != 0x00)
-                                return false;
-
-                        for(int e = 0; e < 3; e++)
-                            if(entry.extension[e] < 0x20 &&
-                               entry.extension[e] != 0x00)
-                                return false;
-
-                        if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(entry.filename))
-                            fileCount++;
-                    }
-                    else if(entry.statusUser == 0x20)
-                    {
-                        for(int f = 0; f < 8; f++)
-                            if(entry.filename[f] < 0x20 &&
-                               entry.filename[f] != 0x00)
-                                return false;
-
-                        for(int e = 0; e < 3; e++)
-                            if(entry.extension[e] < 0x20 &&
-                               entry.extension[e] != 0x00)
-                                return false;
-
-                        _label             = Encoding.ASCII.GetString(directory, off + 1, 11).Trim();
-                        _labelCreationDate = new byte[4];
-                        _labelUpdateDate   = new byte[4];
-                        Array.Copy(directory, off + 24, _labelCreationDate, 0, 4);
-                        Array.Copy(directory, off + 28, _labelUpdateDate, 0, 4);
-                    }
-                    else if(entry.statusUser == 0x21)
-                        if(directory[off + 1] == 0x00)
-                            _thirdPartyTimestamps = true;
-                        else
-                            _standardTimestamps |= directory[off + 21] == 0x00 && directory[off + 31] == 0x00;
-                }
-
-                return fileCount > 0;
-            }
-            catch
-            {
+            if(directory == null)
                 return false;
+
+            int fileCount = 0;
+
+            for(int off = 0; off < directory.Length; off += 32)
+            {
+                DirectoryEntry entry = Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(directory, off, 32);
+
+                if((entry.statusUser & 0x7F) < 0x20)
+                {
+                    for(int f = 0; f < 8; f++)
+                        if(entry.filename[f] < 0x20 &&
+                           entry.filename[f] != 0x00)
+                            return false;
+
+                    for(int e = 0; e < 3; e++)
+                        if(entry.extension[e] < 0x20 &&
+                           entry.extension[e] != 0x00)
+                            return false;
+
+                    if(!ArrayHelpers.ArrayIsNullOrWhiteSpace(entry.filename))
+                        fileCount++;
+                }
+                else if(entry.statusUser == 0x20)
+                {
+                    for(int f = 0; f < 8; f++)
+                        if(entry.filename[f] < 0x20 &&
+                           entry.filename[f] != 0x00)
+                            return false;
+
+                    for(int e = 0; e < 3; e++)
+                        if(entry.extension[e] < 0x20 &&
+                           entry.extension[e] != 0x00)
+                            return false;
+
+                    _label             = Encoding.ASCII.GetString(directory, off + 1, 11).Trim();
+                    _labelCreationDate = new byte[4];
+                    _labelUpdateDate   = new byte[4];
+                    Array.Copy(directory, off + 24, _labelCreationDate, 0, 4);
+                    Array.Copy(directory, off + 28, _labelUpdateDate, 0, 4);
+                }
+                else if(entry.statusUser == 0x21)
+                    if(directory[off + 1] == 0x00)
+                        _thirdPartyTimestamps = true;
+                    else
+                        _standardTimestamps |= directory[off + 21] == 0x00 && directory[off + 31] == 0x00;
             }
+
+            return fileCount > 0;
+        }
+        catch
+        {
+            return false;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/File.cs b/Aaru.Filesystems/CPM/File.cs
index e226f3b66..ebdfa3991 100644
--- a/Aaru.Filesystems/CPM/File.cs
+++ b/Aaru.Filesystems/CPM/File.cs
@@ -35,133 +35,132 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class CPM
 {
-    public sealed partial class CPM
+    /// <inheritdoc />
+    public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
     {
-        /// <inheritdoc />
-        public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+        attributes = new FileAttributes();
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
+
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
+
+        if(string.IsNullOrEmpty(pathElements[0]) ||
+           string.Compare(pathElements[0], "/", StringComparison.OrdinalIgnoreCase) == 0)
         {
             attributes = new FileAttributes();
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
-
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
-
-            if(string.IsNullOrEmpty(pathElements[0]) ||
-               string.Compare(pathElements[0], "/", StringComparison.OrdinalIgnoreCase) == 0)
-            {
-                attributes = new FileAttributes();
-                attributes = FileAttributes.Directory;
-
-                return ErrorNumber.NoError;
-            }
-
-            if(!_statCache.TryGetValue(pathElements[0].ToUpperInvariant(), out FileEntryInfo fInfo))
-                return ErrorNumber.NoSuchFile;
-
-            attributes = fInfo.Attributes;
+            attributes = FileAttributes.Directory;
 
             return ErrorNumber.NoError;
         }
 
-        // TODO: Implementing this would require storing the interleaving
-        /// <inheritdoc />
-        public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
+        if(!_statCache.TryGetValue(pathElements[0].ToUpperInvariant(), out FileEntryInfo fInfo))
+            return ErrorNumber.NoSuchFile;
+
+        attributes = fInfo.Attributes;
+
+        return ErrorNumber.NoError;
+    }
+
+    // TODO: Implementing this would require storing the interleaving
+    /// <inheritdoc />
+    public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
+    {
+        deviceBlock = 0;
+
+        return !_mounted ? ErrorNumber.AccessDenied : ErrorNumber.NotImplemented;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(size == 0)
         {
-            deviceBlock = 0;
-
-            return !_mounted ? ErrorNumber.AccessDenied : ErrorNumber.NotImplemented;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
-        {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            if(size == 0)
-            {
-                buf = Array.Empty<byte>();
-
-                return ErrorNumber.NoError;
-            }
-
-            if(offset < 0)
-                return ErrorNumber.InvalidArgument;
-
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
-
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
-
-            if(!_fileCache.TryGetValue(pathElements[0].ToUpperInvariant(), out byte[] file))
-                return ErrorNumber.NoSuchFile;
-
-            if(offset >= file.Length)
-                return ErrorNumber.EINVAL;
-
-            if(size + offset >= file.Length)
-                size = file.Length - offset;
-
-            buf = new byte[size];
-            Array.Copy(file, offset, buf, 0, size);
+            buf = Array.Empty<byte>();
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadLink(string path, out string dest)
+        if(offset < 0)
+            return ErrorNumber.InvalidArgument;
+
+        string[] pathElements = path.Split(new[]
         {
-            dest = null;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            return !_mounted ? ErrorNumber.AccessDenied : ErrorNumber.NotSupported;
-        }
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-        /// <inheritdoc />
-        public ErrorNumber Stat(string path, out FileEntryInfo stat)
+        if(!_fileCache.TryGetValue(pathElements[0].ToUpperInvariant(), out byte[] file))
+            return ErrorNumber.NoSuchFile;
+
+        if(offset >= file.Length)
+            return ErrorNumber.EINVAL;
+
+        if(size + offset >= file.Length)
+            size = file.Length - offset;
+
+        buf = new byte[size];
+        Array.Copy(file, offset, buf, 0, size);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadLink(string path, out string dest)
+    {
+        dest = null;
+
+        return !_mounted ? ErrorNumber.AccessDenied : ErrorNumber.NotSupported;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Stat(string path, out FileEntryInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            stat = null;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        if(!string.IsNullOrEmpty(path) &&
+           string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
+            return _statCache.TryGetValue(pathElements[0].ToUpperInvariant(), out stat) ? ErrorNumber.NoError
+                       : ErrorNumber.NoSuchFile;
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
+        stat = new FileEntryInfo
+        {
+            Attributes = FileAttributes.Directory,
+            BlockSize  = XmlFsType.ClusterSize
+        };
 
-            if(!string.IsNullOrEmpty(path) &&
-               string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
-                return _statCache.TryGetValue(pathElements[0].ToUpperInvariant(), out stat) ? ErrorNumber.NoError
-                           : ErrorNumber.NoSuchFile;
+        if(_labelCreationDate != null)
+            stat.CreationTime = DateHandlers.CpmToDateTime(_labelCreationDate);
 
-            stat = new FileEntryInfo
-            {
-                Attributes = FileAttributes.Directory,
-                BlockSize  = XmlFsType.ClusterSize
-            };
+        if(_labelUpdateDate != null)
+            stat.StatusChangeTime = DateHandlers.CpmToDateTime(_labelUpdateDate);
 
-            if(_labelCreationDate != null)
-                stat.CreationTime = DateHandlers.CpmToDateTime(_labelCreationDate);
-
-            if(_labelUpdateDate != null)
-                stat.StatusChangeTime = DateHandlers.CpmToDateTime(_labelUpdateDate);
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/Info.cs b/Aaru.Filesystems/CPM/Info.cs
index 796bb88ca..0f5781c38 100644
--- a/Aaru.Filesystems/CPM/Info.cs
+++ b/Aaru.Filesystems/CPM/Info.cs
@@ -41,214 +41,443 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class CPM
 {
-    public sealed partial class CPM
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ErrorNumber errno = ErrorNumber.NoError;
+
+        // This will only continue on devices with a chance to have ever been used by CP/M while failing on all others
+        // It's ugly, but will stop a lot of false positives
+        switch(imagePlugin.Info.MediaType)
         {
-            ErrorNumber errno = ErrorNumber.NoError;
+            case MediaType.Unknown:
+            case MediaType.Apple32SS:
+            case MediaType.Apple32DS:
+            case MediaType.Apple33SS:
+            case MediaType.Apple33DS:
+            case MediaType.DOS_525_SS_DD_8:
+            case MediaType.DOS_525_SS_DD_9:
+            case MediaType.DOS_525_DS_DD_8:
+            case MediaType.DOS_525_DS_DD_9:
+            case MediaType.DOS_525_HD:
+            case MediaType.DOS_35_SS_DD_8:
+            case MediaType.DOS_35_SS_DD_9:
+            case MediaType.DOS_35_DS_DD_8:
+            case MediaType.DOS_35_DS_DD_9:
+            case MediaType.DOS_35_HD:
+            case MediaType.DOS_35_ED:
+            case MediaType.IBM23FD:
+            case MediaType.IBM33FD_128:
+            case MediaType.IBM33FD_256:
+            case MediaType.IBM33FD_512:
+            case MediaType.IBM43FD_128:
+            case MediaType.IBM43FD_256:
+            case MediaType.IBM53FD_256:
+            case MediaType.IBM53FD_512:
+            case MediaType.IBM53FD_1024:
+            case MediaType.RX01:
+            case MediaType.RX02:
+            case MediaType.RX03:
+            case MediaType.RX50:
+            case MediaType.ACORN_525_SS_SD_40:
+            case MediaType.ACORN_525_SS_SD_80:
+            case MediaType.ACORN_525_SS_DD_40:
+            case MediaType.ACORN_525_SS_DD_80:
+            case MediaType.ACORN_525_DS_DD:
+            case MediaType.ATARI_525_SD:
+            case MediaType.ATARI_525_ED:
+            case MediaType.ATARI_525_DD:
+            case MediaType.CBM_35_DD:
+            case MediaType.CBM_1540:
+            case MediaType.CBM_1540_Ext:
+            case MediaType.CBM_1571:
+            case MediaType.NEC_8_SD:
+            case MediaType.NEC_8_DD:
+            case MediaType.NEC_525_SS:
+            case MediaType.NEC_525_DS:
+            case MediaType.NEC_525_HD:
+            case MediaType.NEC_35_HD_8:
+            case MediaType.NEC_35_HD_15:
+            case MediaType.SHARP_525_9:
+            case MediaType.SHARP_35_9:
+            case MediaType.ECMA_99_8:
+            case MediaType.ECMA_99_15:
+            case MediaType.ECMA_99_26:
+            case MediaType.ECMA_54:
+            case MediaType.ECMA_59:
+            case MediaType.ECMA_66:
+            case MediaType.ECMA_69_8:
+            case MediaType.ECMA_69_15:
+            case MediaType.ECMA_69_26:
+            case MediaType.ECMA_70:
+            case MediaType.ECMA_78:
+            case MediaType.ECMA_78_2:
+            case MediaType.Apricot_35:
+            case MediaType.CompactFloppy:
+            case MediaType.DemiDiskette:
+            case MediaType.QuickDisk:
+            case MediaType.Wafer:
+            case MediaType.ZXMicrodrive:
+            case MediaType.AppleProfile:
+            case MediaType.AppleWidget:
+            case MediaType.AppleHD20:
+            case MediaType.RA60:
+            case MediaType.RA80:
+            case MediaType.RA81:
+            case MediaType.RC25:
+            case MediaType.RD31:
+            case MediaType.RD32:
+            case MediaType.RD51:
+            case MediaType.RD52:
+            case MediaType.RD53:
+            case MediaType.RD54:
+            case MediaType.RK06:
+            case MediaType.RK06_18:
+            case MediaType.RK07:
+            case MediaType.RK07_18:
+            case MediaType.RM02:
+            case MediaType.RM03:
+            case MediaType.RM05:
+            case MediaType.RP02:
+            case MediaType.RP02_18:
+            case MediaType.RP03:
+            case MediaType.RP03_18:
+            case MediaType.RP04:
+            case MediaType.RP04_18:
+            case MediaType.RP05:
+            case MediaType.RP05_18:
+            case MediaType.RP06:
+            case MediaType.RP06_18:
+            case MediaType.GENERIC_HDD:
+            case MediaType.FlashDrive:
+            case MediaType.MetaFloppy_Mod_I:
+            case MediaType.MetaFloppy_Mod_II: break;
+            default: return false;
+        }
 
-            // This will only continue on devices with a chance to have ever been used by CP/M while failing on all others
-            // It's ugly, but will stop a lot of false positives
-            switch(imagePlugin.Info.MediaType)
+        // This will try to identify a CP/M filesystem
+        // However as it contains no identification marks whatsoever it's more something of trial-and-error
+        // As anything can happen, better try{}catch{} than sorry ;)
+        try
+        {
+            byte[] sector;
+            ulong  sectorSize;
+            ulong  firstDirectorySector;
+            byte[] directory = null;
+            _workingDefinition = null;
+            _label             = null;
+
+            // Try Amstrad superblock
+            if(!_cpmFound)
             {
-                case MediaType.Unknown:
-                case MediaType.Apple32SS:
-                case MediaType.Apple32DS:
-                case MediaType.Apple33SS:
-                case MediaType.Apple33DS:
-                case MediaType.DOS_525_SS_DD_8:
-                case MediaType.DOS_525_SS_DD_9:
-                case MediaType.DOS_525_DS_DD_8:
-                case MediaType.DOS_525_DS_DD_9:
-                case MediaType.DOS_525_HD:
-                case MediaType.DOS_35_SS_DD_8:
-                case MediaType.DOS_35_SS_DD_9:
-                case MediaType.DOS_35_DS_DD_8:
-                case MediaType.DOS_35_DS_DD_9:
-                case MediaType.DOS_35_HD:
-                case MediaType.DOS_35_ED:
-                case MediaType.IBM23FD:
-                case MediaType.IBM33FD_128:
-                case MediaType.IBM33FD_256:
-                case MediaType.IBM33FD_512:
-                case MediaType.IBM43FD_128:
-                case MediaType.IBM43FD_256:
-                case MediaType.IBM53FD_256:
-                case MediaType.IBM53FD_512:
-                case MediaType.IBM53FD_1024:
-                case MediaType.RX01:
-                case MediaType.RX02:
-                case MediaType.RX03:
-                case MediaType.RX50:
-                case MediaType.ACORN_525_SS_SD_40:
-                case MediaType.ACORN_525_SS_SD_80:
-                case MediaType.ACORN_525_SS_DD_40:
-                case MediaType.ACORN_525_SS_DD_80:
-                case MediaType.ACORN_525_DS_DD:
-                case MediaType.ATARI_525_SD:
-                case MediaType.ATARI_525_ED:
-                case MediaType.ATARI_525_DD:
-                case MediaType.CBM_35_DD:
-                case MediaType.CBM_1540:
-                case MediaType.CBM_1540_Ext:
-                case MediaType.CBM_1571:
-                case MediaType.NEC_8_SD:
-                case MediaType.NEC_8_DD:
-                case MediaType.NEC_525_SS:
-                case MediaType.NEC_525_DS:
-                case MediaType.NEC_525_HD:
-                case MediaType.NEC_35_HD_8:
-                case MediaType.NEC_35_HD_15:
-                case MediaType.SHARP_525_9:
-                case MediaType.SHARP_35_9:
-                case MediaType.ECMA_99_8:
-                case MediaType.ECMA_99_15:
-                case MediaType.ECMA_99_26:
-                case MediaType.ECMA_54:
-                case MediaType.ECMA_59:
-                case MediaType.ECMA_66:
-                case MediaType.ECMA_69_8:
-                case MediaType.ECMA_69_15:
-                case MediaType.ECMA_69_26:
-                case MediaType.ECMA_70:
-                case MediaType.ECMA_78:
-                case MediaType.ECMA_78_2:
-                case MediaType.Apricot_35:
-                case MediaType.CompactFloppy:
-                case MediaType.DemiDiskette:
-                case MediaType.QuickDisk:
-                case MediaType.Wafer:
-                case MediaType.ZXMicrodrive:
-                case MediaType.AppleProfile:
-                case MediaType.AppleWidget:
-                case MediaType.AppleHD20:
-                case MediaType.RA60:
-                case MediaType.RA80:
-                case MediaType.RA81:
-                case MediaType.RC25:
-                case MediaType.RD31:
-                case MediaType.RD32:
-                case MediaType.RD51:
-                case MediaType.RD52:
-                case MediaType.RD53:
-                case MediaType.RD54:
-                case MediaType.RK06:
-                case MediaType.RK06_18:
-                case MediaType.RK07:
-                case MediaType.RK07_18:
-                case MediaType.RM02:
-                case MediaType.RM03:
-                case MediaType.RM05:
-                case MediaType.RP02:
-                case MediaType.RP02_18:
-                case MediaType.RP03:
-                case MediaType.RP03_18:
-                case MediaType.RP04:
-                case MediaType.RP04_18:
-                case MediaType.RP05:
-                case MediaType.RP05_18:
-                case MediaType.RP06:
-                case MediaType.RP06_18:
-                case MediaType.GENERIC_HDD:
-                case MediaType.FlashDrive:
-                case MediaType.MetaFloppy_Mod_I:
-                case MediaType.MetaFloppy_Mod_II: break;
-                default: return false;
-            }
+                // Read CHS = {0,0,1}
+                errno = imagePlugin.ReadSector(0 + partition.Start, out sector);
 
-            // This will try to identify a CP/M filesystem
-            // However as it contains no identification marks whatsoever it's more something of trial-and-error
-            // As anything can happen, better try{}catch{} than sorry ;)
-            try
-            {
-                byte[] sector;
-                ulong  sectorSize;
-                ulong  firstDirectorySector;
-                byte[] directory = null;
-                _workingDefinition = null;
-                _label             = null;
-
-                // Try Amstrad superblock
-                if(!_cpmFound)
+                if(errno == ErrorNumber.NoError)
                 {
-                    // Read CHS = {0,0,1}
-                    errno = imagePlugin.ReadSector(0 + partition.Start, out sector);
+                    int amsSbOffset = 0;
 
-                    if(errno == ErrorNumber.NoError)
+                    uint sig1 = BitConverter.ToUInt32(sector, 0x2B);
+                    uint sig2 = BitConverter.ToUInt32(sector, 0x33) & 0x00FFFFFF;
+                    uint sig3 = BitConverter.ToUInt32(sector, 0x7C);
+
+                    // PCW16 extended boot record
+                    if(sig1 == 0x4D2F5043 &&
+                       sig2 == 0x004B5344 &&
+                       sig3 == sig1)
+                        amsSbOffset = 0x80;
+
+                    // Read the superblock
+                    AmstradSuperBlock amsSb =
+                        Marshal.ByteArrayToStructureLittleEndian<AmstradSuperBlock>(sector, amsSbOffset, 16);
+
+                    // Check that format byte and sidedness indicate the same number of sizes
+                    if((amsSb.format == 0 && (amsSb.sidedness & 0x02) == 0) ||
+                       (amsSb.format == 2 && (amsSb.sidedness & 0x02) == 1) ||
+                       (amsSb.format == 2 && (amsSb.sidedness & 0x02) == 2))
                     {
-                        int amsSbOffset = 0;
+                        // Calculate device limits
+                        ulong sides       = (ulong)(amsSb.format == 0 ? 1 : 2);
+                        ulong sectorCount = (ulong)(amsSb.tps * amsSb.spt * (byte)sides);
+                        sectorSize = (ulong)(128 << amsSb.psh);
 
-                        uint sig1 = BitConverter.ToUInt32(sector, 0x2B);
-                        uint sig2 = BitConverter.ToUInt32(sector, 0x33) & 0x00FFFFFF;
-                        uint sig3 = BitConverter.ToUInt32(sector, 0x7C);
-
-                        // PCW16 extended boot record
-                        if(sig1 == 0x4D2F5043 &&
-                           sig2 == 0x004B5344 &&
-                           sig3 == sig1)
-                            amsSbOffset = 0x80;
-
-                        // Read the superblock
-                        AmstradSuperBlock amsSb =
-                            Marshal.ByteArrayToStructureLittleEndian<AmstradSuperBlock>(sector, amsSbOffset, 16);
-
-                        // Check that format byte and sidedness indicate the same number of sizes
-                        if((amsSb.format == 0 && (amsSb.sidedness & 0x02) == 0) ||
-                           (amsSb.format == 2 && (amsSb.sidedness & 0x02) == 1) ||
-                           (amsSb.format == 2 && (amsSb.sidedness & 0x02) == 2))
+                        // Compare device limits from superblock to real limits
+                        if(sectorSize  == imagePlugin.Info.SectorSize &&
+                           sectorCount == imagePlugin.Info.Sectors)
                         {
-                            // Calculate device limits
-                            ulong sides       = (ulong)(amsSb.format == 0 ? 1 : 2);
-                            ulong sectorCount = (ulong)(amsSb.tps * amsSb.spt * (byte)sides);
-                            sectorSize = (ulong)(128 << amsSb.psh);
+                            _cpmFound            = true;
+                            firstDirectorySector = (ulong)(amsSb.off * amsSb.spt);
 
-                            // Compare device limits from superblock to real limits
-                            if(sectorSize  == imagePlugin.Info.SectorSize &&
-                               sectorCount == imagePlugin.Info.Sectors)
+                            // Build a DiscParameterBlock
+                            _dpb = new DiscParameterBlock
                             {
-                                _cpmFound            = true;
-                                firstDirectorySector = (ulong)(amsSb.off * amsSb.spt);
+                                al0 = sectorCount == 1440 ? (byte)0xF0 : (byte)0xC0,
+                                spt = amsSb.spt,
+                                bsh = amsSb.bsh
+                            };
 
-                                // Build a DiscParameterBlock
-                                _dpb = new DiscParameterBlock
+                            for(int i = 0; i < _dpb.bsh; i++)
+                                _dpb.blm += (byte)Math.Pow(2, i);
+
+                            if(sectorCount >= 1440)
+                            {
+                                _dpb.cks = 0x40;
+                                _dpb.drm = 0xFF;
+                            }
+                            else
+                            {
+                                _dpb.cks = 0x10;
+                                _dpb.drm = 0x3F;
+                            }
+
+                            _dpb.dsm = 0; // I don't care
+                            _dpb.exm = sectorCount == 2880 ? (byte)1 : (byte)0;
+                            _dpb.off = amsSb.off;
+                            _dpb.psh = amsSb.psh;
+
+                            for(int i = 0; i < _dpb.psh; i++)
+                                _dpb.phm += (byte)Math.Pow(2, i);
+
+                            _dpb.spt = (ushort)(amsSb.spt * (sectorSize              / 128));
+                            uint directoryLength = (uint)(((ulong)_dpb.drm + 1) * 32 / sectorSize);
+
+                            errno = imagePlugin.ReadSectors(firstDirectorySector + partition.Start, directoryLength,
+                                                            out directory);
+
+                            // Build a CP/M disk definition
+                            _workingDefinition = new CpmDefinition
+                            {
+                                al0             = _dpb.al0,
+                                al1             = _dpb.al1,
+                                bitrate         = "LOW",
+                                blm             = _dpb.blm,
+                                bsh             = _dpb.bsh,
+                                bytesPerSector  = 512,
+                                cylinders       = amsSb.tps,
+                                drm             = _dpb.drm,
+                                dsm             = _dpb.dsm,
+                                encoding        = "MFM",
+                                evenOdd         = false,
+                                exm             = _dpb.exm,
+                                label           = null,
+                                comment         = "Amstrad PCW superblock",
+                                ofs             = _dpb.off,
+                                sectorsPerTrack = amsSb.spt,
+                                side1 = new Side
                                 {
-                                    al0 = sectorCount == 1440 ? (byte)0xF0 : (byte)0xC0,
-                                    spt = amsSb.spt,
-                                    bsh = amsSb.bsh
+                                    sideId    = 0,
+                                    sectorIds = new int[amsSb.spt]
+                                }
+                            };
+
+                            for(int si = 0; si < amsSb.spt; si++)
+                                _workingDefinition.side1.sectorIds[si] = si + 1;
+
+                            if(amsSb.format == 2)
+                            {
+                                switch(amsSb.sidedness & 0x02)
+                                {
+                                    case 1:
+                                        _workingDefinition.order = "SIDES";
+
+                                        break;
+                                    case 2:
+                                        _workingDefinition.order = "CYLINDERS";
+
+                                        break;
+                                    default:
+                                        _workingDefinition.order = null;
+
+                                        break;
+                                }
+
+                                _workingDefinition.side2 = new Side
+                                {
+                                    sideId    = 1,
+                                    sectorIds = new int[amsSb.spt]
                                 };
 
-                                for(int i = 0; i < _dpb.bsh; i++)
-                                    _dpb.blm += (byte)Math.Pow(2, i);
+                                for(int si = 0; si < amsSb.spt; si++)
+                                    _workingDefinition.side2.sectorIds[si] = si + 1;
+                            }
+                            else
+                                _workingDefinition.order = null;
 
-                                if(sectorCount >= 1440)
+                            _workingDefinition.skew = 2;
+                            _workingDefinition.sofs = 0;
+
+                            AaruConsole.DebugWriteLine("CP/M Plugin", "Found Amstrad superblock.");
+                        }
+                    }
+                }
+            }
+
+            // Try CP/M-86 superblock for hard disks
+            if(!_cpmFound)
+            {
+                // Read CHS = {0,0,4}
+                errno = imagePlugin.ReadSector(3 + partition.Start, out sector);
+
+                if(errno == ErrorNumber.NoError)
+                {
+                    ushort sum = 0;
+
+                    // Sum of all 16-bit words that make this sector must be 0
+                    for(int i = 0; i < sector.Length; i += 2)
+                        sum += BitConverter.ToUInt16(sector, i);
+
+                    // It may happen that there is a corrupted superblock
+                    // Better to ignore corrupted than to false positive the rest
+                    if(sum == 0)
+                    {
+                        // Read the superblock
+                        HardDiskSuperBlock hddSb =
+                            Marshal.ByteArrayToStructureLittleEndian<HardDiskSuperBlock>(sector);
+
+                        // Calculate volume size
+                        sectorSize = (ulong)(hddSb.recordsPerSector * 128);
+                        ulong sectorsInPartition = (ulong)(hddSb.cylinders * hddSb.heads * hddSb.sectorsPerTrack);
+
+                        ulong startingSector =
+                            (ulong)(((hddSb.firstCylinder * hddSb.heads) + hddSb.heads) * hddSb.sectorsPerTrack);
+
+                        // If volume size corresponds with working partition (this variant will be inside MBR partitioning)
+                        if(sectorSize                           == imagePlugin.Info.SectorSize &&
+                           startingSector                       == partition.Start             &&
+                           sectorsInPartition + partition.Start <= partition.End)
+                        {
+                            _cpmFound            = true;
+                            firstDirectorySector = (ulong)(hddSb.off * hddSb.sectorsPerTrack);
+
+                            // Build a DiscParameterBlock
+                            _dpb = new DiscParameterBlock
+                            {
+                                al0 = (byte)hddSb.al0,
+                                al1 = (byte)hddSb.al1,
+                                blm = hddSb.blm,
+                                bsh = hddSb.bsh,
+                                cks = hddSb.cks,
+                                drm = hddSb.drm,
+                                dsm = hddSb.dsm,
+                                exm = hddSb.exm,
+                                off = hddSb.off,
+
+                                // Needed?
+                                phm = 0,
+
+                                // Needed?
+                                psh = 0,
+                                spt = hddSb.spt
+                            };
+
+                            uint directoryLength = (uint)(((ulong)_dpb.drm + 1) * 32 / sectorSize);
+
+                            errno = imagePlugin.ReadSectors(firstDirectorySector + partition.Start, directoryLength,
+                                                            out directory);
+
+                            AaruConsole.DebugWriteLine("CP/M Plugin", "Found CP/M-86 hard disk superblock.");
+
+                            // Build a CP/M disk definition
+                            _workingDefinition = new CpmDefinition
+                            {
+                                al0             = _dpb.al0,
+                                al1             = _dpb.al1,
+                                bitrate         = "HIGH",
+                                blm             = _dpb.blm,
+                                bsh             = _dpb.bsh,
+                                bytesPerSector  = 512,
+                                cylinders       = hddSb.cylinders,
+                                drm             = _dpb.drm,
+                                dsm             = _dpb.dsm,
+                                encoding        = "MFM",
+                                evenOdd         = false,
+                                exm             = _dpb.exm,
+                                label           = null,
+                                comment         = "CP/M-86 hard disk superblock",
+                                ofs             = _dpb.off,
+                                sectorsPerTrack = hddSb.sectorsPerTrack,
+                                side1 = new Side
                                 {
-                                    _dpb.cks = 0x40;
-                                    _dpb.drm = 0xFF;
-                                }
-                                else
+                                    sideId    = 0,
+                                    sectorIds = new int[hddSb.sectorsPerTrack]
+                                },
+                                order = "SIDES",
+                                side2 = new Side
                                 {
-                                    _dpb.cks = 0x10;
-                                    _dpb.drm = 0x3F;
-                                }
+                                    sideId    = 1,
+                                    sectorIds = new int[hddSb.sectorsPerTrack]
+                                },
+                                skew = 0,
+                                sofs = 0
+                            };
 
-                                _dpb.dsm = 0; // I don't care
-                                _dpb.exm = sectorCount == 2880 ? (byte)1 : (byte)0;
-                                _dpb.off = amsSb.off;
-                                _dpb.psh = amsSb.psh;
+                            for(int si = 0; si < hddSb.sectorsPerTrack; si++)
+                                _workingDefinition.side1.sectorIds[si] = si + 1;
 
-                                for(int i = 0; i < _dpb.psh; i++)
-                                    _dpb.phm += (byte)Math.Pow(2, i);
+                            for(int si = 0; si < hddSb.spt; si++)
+                                _workingDefinition.side2.sectorIds[si] = si + 1;
+                        }
+                    }
+                }
+            }
 
-                                _dpb.spt = (ushort)(amsSb.spt * (sectorSize              / 128));
-                                uint directoryLength = (uint)(((ulong)_dpb.drm + 1) * 32 / sectorSize);
+            // Try CP/M-86 format ID for floppies
+            if(!_cpmFound)
+            {
+                // Read CHS = {0,0,1}
+                errno = imagePlugin.ReadSector(0 + partition.Start, out sector);
 
-                                errno = imagePlugin.ReadSectors(firstDirectorySector + partition.Start, directoryLength,
-                                                                out directory);
+                if(errno == ErrorNumber.NoError)
+                {
+                    byte formatByte;
+
+                    // Check for alternate location of format ID
+                    if(sector.Last() == 0x00 ||
+                       sector.Last() == 0xFF)
+                        if(sector[0x40] == 0x94 ||
+                           sector[0x40] == 0x26)
+                            formatByte = sector[0x40];
+                        else
+                            formatByte = sector.Last();
+                    else
+                        formatByte = sector.Last();
+
+                    uint firstDirectorySector86 = 0;
+
+                    // Check format ID
+                    // If it is one of the known IDs, check disk size corresponds to the one we expect
+                    // If so, build a DiscParameterBlock and a CP/M disk definition
+                    // Will not work on over-formatted disks (40 cylinder volume on an 80 cylinder disk,
+                    // something that happens a lot in IBM PC 5.25" disks)
+                    switch((FormatByte)formatByte)
+                    {
+                        case FormatByte.k160:
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 320)
+                            {
+                                _cpmFound              = true;
+                                firstDirectorySector86 = 8;
+
+                                _dpb = new DiscParameterBlock
+                                {
+                                    al0 = 0xC0,
+                                    al1 = 0,
+                                    blm = 7,
+                                    bsh = 3,
+                                    cks = 0x10,
+                                    drm = 0x3F,
+                                    dsm = 0x9B,
+                                    exm = 0,
+                                    off = 1,
+                                    phm = 3,
+                                    psh = 2,
+                                    spt = 8 * 4
+                                };
 
-                                // Build a CP/M disk definition
                                 _workingDefinition = new CpmDefinition
                                 {
                                     al0             = _dpb.al0,
@@ -257,131 +486,312 @@ namespace Aaru.Filesystems
                                     blm             = _dpb.blm,
                                     bsh             = _dpb.bsh,
                                     bytesPerSector  = 512,
-                                    cylinders       = amsSb.tps,
+                                    cylinders       = 40,
                                     drm             = _dpb.drm,
                                     dsm             = _dpb.dsm,
                                     encoding        = "MFM",
                                     evenOdd         = false,
                                     exm             = _dpb.exm,
                                     label           = null,
-                                    comment         = "Amstrad PCW superblock",
+                                    comment         = "CP/M-86 floppy identifier",
                                     ofs             = _dpb.off,
-                                    sectorsPerTrack = amsSb.spt,
+                                    sectorsPerTrack = 8,
                                     side1 = new Side
                                     {
                                         sideId    = 0,
-                                        sectorIds = new int[amsSb.spt]
-                                    }
+                                        sectorIds = new int[8]
+                                    },
+                                    skew = 0,
+                                    sofs = 0
                                 };
 
-                                for(int si = 0; si < amsSb.spt; si++)
+                                for(int si = 0; si < 8; si++)
                                     _workingDefinition.side1.sectorIds[si] = si + 1;
-
-                                if(amsSb.format == 2)
-                                {
-                                    switch(amsSb.sidedness & 0x02)
-                                    {
-                                        case 1:
-                                            _workingDefinition.order = "SIDES";
-
-                                            break;
-                                        case 2:
-                                            _workingDefinition.order = "CYLINDERS";
-
-                                            break;
-                                        default:
-                                            _workingDefinition.order = null;
-
-                                            break;
-                                    }
-
-                                    _workingDefinition.side2 = new Side
-                                    {
-                                        sideId    = 1,
-                                        sectorIds = new int[amsSb.spt]
-                                    };
-
-                                    for(int si = 0; si < amsSb.spt; si++)
-                                        _workingDefinition.side2.sectorIds[si] = si + 1;
-                                }
-                                else
-                                    _workingDefinition.order = null;
-
-                                _workingDefinition.skew = 2;
-                                _workingDefinition.sofs = 0;
-
-                                AaruConsole.DebugWriteLine("CP/M Plugin", "Found Amstrad superblock.");
                             }
-                        }
-                    }
-                }
 
-                // Try CP/M-86 superblock for hard disks
-                if(!_cpmFound)
-                {
-                    // Read CHS = {0,0,4}
-                    errno = imagePlugin.ReadSector(3 + partition.Start, out sector);
-
-                    if(errno == ErrorNumber.NoError)
-                    {
-                        ushort sum = 0;
-
-                        // Sum of all 16-bit words that make this sector must be 0
-                        for(int i = 0; i < sector.Length; i += 2)
-                            sum += BitConverter.ToUInt16(sector, i);
-
-                        // It may happen that there is a corrupted superblock
-                        // Better to ignore corrupted than to false positive the rest
-                        if(sum == 0)
-                        {
-                            // Read the superblock
-                            HardDiskSuperBlock hddSb =
-                                Marshal.ByteArrayToStructureLittleEndian<HardDiskSuperBlock>(sector);
-
-                            // Calculate volume size
-                            sectorSize = (ulong)(hddSb.recordsPerSector * 128);
-                            ulong sectorsInPartition = (ulong)(hddSb.cylinders * hddSb.heads * hddSb.sectorsPerTrack);
-
-                            ulong startingSector =
-                                (ulong)(((hddSb.firstCylinder * hddSb.heads) + hddSb.heads) * hddSb.sectorsPerTrack);
-
-                            // If volume size corresponds with working partition (this variant will be inside MBR partitioning)
-                            if(sectorSize                           == imagePlugin.Info.SectorSize &&
-                               startingSector                       == partition.Start             &&
-                               sectorsInPartition + partition.Start <= partition.End)
+                            break;
+                        case FormatByte.k320:
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 640)
                             {
-                                _cpmFound            = true;
-                                firstDirectorySector = (ulong)(hddSb.off * hddSb.sectorsPerTrack);
+                                _cpmFound              = true;
+                                firstDirectorySector86 = 16;
 
-                                // Build a DiscParameterBlock
                                 _dpb = new DiscParameterBlock
                                 {
-                                    al0 = (byte)hddSb.al0,
-                                    al1 = (byte)hddSb.al1,
-                                    blm = hddSb.blm,
-                                    bsh = hddSb.bsh,
-                                    cks = hddSb.cks,
-                                    drm = hddSb.drm,
-                                    dsm = hddSb.dsm,
-                                    exm = hddSb.exm,
-                                    off = hddSb.off,
-
-                                    // Needed?
-                                    phm = 0,
-
-                                    // Needed?
-                                    psh = 0,
-                                    spt = hddSb.spt
+                                    al0 = 0x80,
+                                    al1 = 0,
+                                    blm = 0x0F,
+                                    bsh = 4,
+                                    cks = 0x10,
+                                    drm = 0x3F,
+                                    dsm = 0x9D,
+                                    exm = 1,
+                                    off = 2,
+                                    phm = 3,
+                                    psh = 2,
+                                    spt = 8 * 4
                                 };
 
-                                uint directoryLength = (uint)(((ulong)_dpb.drm + 1) * 32 / sectorSize);
+                                _workingDefinition = new CpmDefinition
+                                {
+                                    al0             = _dpb.al0,
+                                    al1             = _dpb.al1,
+                                    bitrate         = "LOW",
+                                    blm             = _dpb.blm,
+                                    bsh             = _dpb.bsh,
+                                    bytesPerSector  = 512,
+                                    cylinders       = 40,
+                                    drm             = _dpb.drm,
+                                    dsm             = _dpb.dsm,
+                                    encoding        = "MFM",
+                                    evenOdd         = false,
+                                    exm             = _dpb.exm,
+                                    label           = null,
+                                    comment         = "CP/M-86 floppy identifier",
+                                    ofs             = _dpb.off,
+                                    sectorsPerTrack = 8,
+                                    side1 = new Side
+                                    {
+                                        sideId    = 0,
+                                        sectorIds = new int[8]
+                                    },
+                                    order = "SIDES",
+                                    side2 = new Side
+                                    {
+                                        sideId    = 1,
+                                        sectorIds = new int[8]
+                                    },
+                                    skew = 0,
+                                    sofs = 0
+                                };
 
-                                errno = imagePlugin.ReadSectors(firstDirectorySector + partition.Start, directoryLength,
-                                                                out directory);
+                                for(int si = 0; si < 8; si++)
+                                    _workingDefinition.side1.sectorIds[si] = si + 1;
 
-                                AaruConsole.DebugWriteLine("CP/M Plugin", "Found CP/M-86 hard disk superblock.");
+                                for(int si = 0; si < 8; si++)
+                                    _workingDefinition.side2.sectorIds[si] = si + 1;
+                            }
+
+                            break;
+                        case FormatByte.k360:
+                        case FormatByte.k360Alt:
+                        case FormatByte.k360Alt2:
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 720)
+                            {
+                                _cpmFound              = true;
+                                firstDirectorySector86 = 36;
+
+                                _dpb = new DiscParameterBlock
+                                {
+                                    al0 = 0x80,
+                                    al1 = 0,
+                                    blm = 0x0F,
+                                    bsh = 4,
+                                    cks = 0x10,
+                                    drm = 0x3F,
+                                    dsm = 0, // Unknown. Needed?
+                                    exm = 1,
+                                    off = 4,
+                                    phm = 3,
+                                    psh = 2,
+                                    spt = 9 * 4
+                                };
+
+                                _workingDefinition = new CpmDefinition
+                                {
+                                    al0             = _dpb.al0,
+                                    al1             = _dpb.al1,
+                                    bitrate         = "LOW",
+                                    blm             = _dpb.blm,
+                                    bsh             = _dpb.bsh,
+                                    bytesPerSector  = 512,
+                                    cylinders       = 40,
+                                    drm             = _dpb.drm,
+                                    dsm             = _dpb.dsm,
+                                    encoding        = "MFM",
+                                    evenOdd         = false,
+                                    exm             = _dpb.exm,
+                                    label           = null,
+                                    comment         = "CP/M-86 floppy identifier",
+                                    ofs             = _dpb.off,
+                                    sectorsPerTrack = 9,
+                                    side1 = new Side
+                                    {
+                                        sideId    = 0,
+                                        sectorIds = new int[9]
+                                    },
+                                    order = "SIDES",
+                                    side2 = new Side
+                                    {
+                                        sideId    = 1,
+                                        sectorIds = new int[9]
+                                    },
+                                    skew = 0,
+                                    sofs = 0
+                                };
+
+                                for(int si = 0; si < 9; si++)
+                                    _workingDefinition.side1.sectorIds[si] = si + 1;
+
+                                for(int si = 0; si < 9; si++)
+                                    _workingDefinition.side2.sectorIds[si] = si + 1;
+                            }
+
+                            break;
+                        case FormatByte.k720:
+                        case FormatByte.k720Alt:
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 1440)
+                            {
+                                _cpmFound              = true;
+                                firstDirectorySector86 = 36;
+
+                                _dpb = new DiscParameterBlock
+                                {
+                                    al0 = 0xF0,
+                                    al1 = 0,
+                                    blm = 0x0F,
+                                    bsh = 4,
+                                    cks = 0x40,
+                                    drm = 0xFF,
+                                    dsm = 0x15E,
+                                    exm = 0,
+                                    off = 4,
+                                    phm = 3,
+                                    psh = 2,
+                                    spt = 9 * 4
+                                };
+
+                                _workingDefinition = new CpmDefinition
+                                {
+                                    al0             = _dpb.al0,
+                                    al1             = _dpb.al1,
+                                    bitrate         = "LOW",
+                                    blm             = _dpb.blm,
+                                    bsh             = _dpb.bsh,
+                                    bytesPerSector  = 512,
+                                    cylinders       = 80,
+                                    drm             = _dpb.drm,
+                                    dsm             = _dpb.dsm,
+                                    encoding        = "MFM",
+                                    evenOdd         = false,
+                                    exm             = _dpb.exm,
+                                    label           = null,
+                                    comment         = "CP/M-86 floppy identifier",
+                                    ofs             = _dpb.off,
+                                    sectorsPerTrack = 9,
+                                    side1 = new Side
+                                    {
+                                        sideId    = 0,
+                                        sectorIds = new int[9]
+                                    },
+                                    order = "SIDES",
+                                    side2 = new Side
+                                    {
+                                        sideId    = 1,
+                                        sectorIds = new int[9]
+                                    },
+                                    skew = 0,
+                                    sofs = 0
+                                };
+
+                                for(int si = 0; si < 9; si++)
+                                    _workingDefinition.side1.sectorIds[si] = si + 1;
+
+                                for(int si = 0; si < 9; si++)
+                                    _workingDefinition.side2.sectorIds[si] = si + 1;
+                            }
+
+                            break;
+                        case FormatByte.f720:
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 1440)
+                            {
+                                _cpmFound              = true;
+                                firstDirectorySector86 = 18;
+
+                                _dpb = new DiscParameterBlock
+                                {
+                                    al0 = 0xF0,
+                                    al1 = 0,
+                                    blm = 0x0F,
+                                    bsh = 4,
+                                    cks = 0x40,
+                                    drm = 0xFF,
+                                    dsm = 0x162,
+                                    exm = 0,
+                                    off = 2,
+                                    phm = 3,
+                                    psh = 2,
+                                    spt = 9 * 4
+                                };
+
+                                _workingDefinition = new CpmDefinition
+                                {
+                                    al0             = _dpb.al0,
+                                    al1             = _dpb.al1,
+                                    bitrate         = "LOW",
+                                    blm             = _dpb.blm,
+                                    bsh             = _dpb.bsh,
+                                    bytesPerSector  = 512,
+                                    cylinders       = 80,
+                                    drm             = _dpb.drm,
+                                    dsm             = _dpb.dsm,
+                                    encoding        = "MFM",
+                                    evenOdd         = false,
+                                    exm             = _dpb.exm,
+                                    label           = null,
+                                    comment         = "CP/M-86 floppy identifier",
+                                    ofs             = _dpb.off,
+                                    sectorsPerTrack = 9,
+                                    side1 = new Side
+                                    {
+                                        sideId    = 0,
+                                        sectorIds = new int[9]
+                                    },
+                                    order = "CYLINDERS",
+                                    side2 = new Side
+                                    {
+                                        sideId    = 1,
+                                        sectorIds = new int[9]
+                                    },
+                                    skew = 0,
+                                    sofs = 0
+                                };
+
+                                for(int si = 0; si < 9; si++)
+                                    _workingDefinition.side1.sectorIds[si] = si + 1;
+
+                                for(int si = 0; si < 9; si++)
+                                    _workingDefinition.side2.sectorIds[si] = si + 1;
+                            }
+
+                            break;
+                        case FormatByte.f1200:
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 2400)
+                            {
+                                _cpmFound              = true;
+                                firstDirectorySector86 = 30;
+
+                                _dpb = new DiscParameterBlock
+                                {
+                                    al0 = 0xC0,
+                                    al1 = 0,
+                                    blm = 0x1F,
+                                    bsh = 5,
+                                    cks = 0x40,
+                                    drm = 0xFF,
+                                    dsm = 0x127,
+                                    exm = 1,
+                                    off = 2,
+                                    phm = 3,
+                                    psh = 2,
+                                    spt = 15 * 4
+                                };
 
-                                // Build a CP/M disk definition
                                 _workingDefinition = new CpmDefinition
                                 {
                                     al0             = _dpb.al0,
@@ -390,888 +800,477 @@ namespace Aaru.Filesystems
                                     blm             = _dpb.blm,
                                     bsh             = _dpb.bsh,
                                     bytesPerSector  = 512,
-                                    cylinders       = hddSb.cylinders,
+                                    cylinders       = 80,
                                     drm             = _dpb.drm,
                                     dsm             = _dpb.dsm,
                                     encoding        = "MFM",
                                     evenOdd         = false,
                                     exm             = _dpb.exm,
                                     label           = null,
-                                    comment         = "CP/M-86 hard disk superblock",
+                                    comment         = "CP/M-86 floppy identifier",
                                     ofs             = _dpb.off,
-                                    sectorsPerTrack = hddSb.sectorsPerTrack,
+                                    sectorsPerTrack = 15,
                                     side1 = new Side
                                     {
                                         sideId    = 0,
-                                        sectorIds = new int[hddSb.sectorsPerTrack]
+                                        sectorIds = new int[15]
                                     },
-                                    order = "SIDES",
+                                    order = "CYLINDERS",
                                     side2 = new Side
                                     {
                                         sideId    = 1,
-                                        sectorIds = new int[hddSb.sectorsPerTrack]
+                                        sectorIds = new int[15]
                                     },
                                     skew = 0,
                                     sofs = 0
                                 };
 
-                                for(int si = 0; si < hddSb.sectorsPerTrack; si++)
+                                for(int si = 0; si < 15; si++)
                                     _workingDefinition.side1.sectorIds[si] = si + 1;
 
-                                for(int si = 0; si < hddSb.spt; si++)
+                                for(int si = 0; si < 15; si++)
                                     _workingDefinition.side2.sectorIds[si] = si + 1;
                             }
-                        }
-                    }
-                }
 
-                // Try CP/M-86 format ID for floppies
-                if(!_cpmFound)
-                {
-                    // Read CHS = {0,0,1}
-                    errno = imagePlugin.ReadSector(0 + partition.Start, out sector);
-
-                    if(errno == ErrorNumber.NoError)
-                    {
-                        byte formatByte;
-
-                        // Check for alternate location of format ID
-                        if(sector.Last() == 0x00 ||
-                           sector.Last() == 0xFF)
-                            if(sector[0x40] == 0x94 ||
-                               sector[0x40] == 0x26)
-                                formatByte = sector[0x40];
-                            else
-                                formatByte = sector.Last();
-                        else
-                            formatByte = sector.Last();
-
-                        uint firstDirectorySector86 = 0;
-
-                        // Check format ID
-                        // If it is one of the known IDs, check disk size corresponds to the one we expect
-                        // If so, build a DiscParameterBlock and a CP/M disk definition
-                        // Will not work on over-formatted disks (40 cylinder volume on an 80 cylinder disk,
-                        // something that happens a lot in IBM PC 5.25" disks)
-                        switch((FormatByte)formatByte)
-                        {
-                            case FormatByte.k160:
-                                if(imagePlugin.Info.SectorSize == 512 &&
-                                   imagePlugin.Info.Sectors    == 320)
-                                {
-                                    _cpmFound              = true;
-                                    firstDirectorySector86 = 8;
-
-                                    _dpb = new DiscParameterBlock
-                                    {
-                                        al0 = 0xC0,
-                                        al1 = 0,
-                                        blm = 7,
-                                        bsh = 3,
-                                        cks = 0x10,
-                                        drm = 0x3F,
-                                        dsm = 0x9B,
-                                        exm = 0,
-                                        off = 1,
-                                        phm = 3,
-                                        psh = 2,
-                                        spt = 8 * 4
-                                    };
-
-                                    _workingDefinition = new CpmDefinition
-                                    {
-                                        al0             = _dpb.al0,
-                                        al1             = _dpb.al1,
-                                        bitrate         = "LOW",
-                                        blm             = _dpb.blm,
-                                        bsh             = _dpb.bsh,
-                                        bytesPerSector  = 512,
-                                        cylinders       = 40,
-                                        drm             = _dpb.drm,
-                                        dsm             = _dpb.dsm,
-                                        encoding        = "MFM",
-                                        evenOdd         = false,
-                                        exm             = _dpb.exm,
-                                        label           = null,
-                                        comment         = "CP/M-86 floppy identifier",
-                                        ofs             = _dpb.off,
-                                        sectorsPerTrack = 8,
-                                        side1 = new Side
-                                        {
-                                            sideId    = 0,
-                                            sectorIds = new int[8]
-                                        },
-                                        skew = 0,
-                                        sofs = 0
-                                    };
-
-                                    for(int si = 0; si < 8; si++)
-                                        _workingDefinition.side1.sectorIds[si] = si + 1;
-                                }
-
-                                break;
-                            case FormatByte.k320:
-                                if(imagePlugin.Info.SectorSize == 512 &&
-                                   imagePlugin.Info.Sectors    == 640)
-                                {
-                                    _cpmFound              = true;
-                                    firstDirectorySector86 = 16;
-
-                                    _dpb = new DiscParameterBlock
-                                    {
-                                        al0 = 0x80,
-                                        al1 = 0,
-                                        blm = 0x0F,
-                                        bsh = 4,
-                                        cks = 0x10,
-                                        drm = 0x3F,
-                                        dsm = 0x9D,
-                                        exm = 1,
-                                        off = 2,
-                                        phm = 3,
-                                        psh = 2,
-                                        spt = 8 * 4
-                                    };
-
-                                    _workingDefinition = new CpmDefinition
-                                    {
-                                        al0             = _dpb.al0,
-                                        al1             = _dpb.al1,
-                                        bitrate         = "LOW",
-                                        blm             = _dpb.blm,
-                                        bsh             = _dpb.bsh,
-                                        bytesPerSector  = 512,
-                                        cylinders       = 40,
-                                        drm             = _dpb.drm,
-                                        dsm             = _dpb.dsm,
-                                        encoding        = "MFM",
-                                        evenOdd         = false,
-                                        exm             = _dpb.exm,
-                                        label           = null,
-                                        comment         = "CP/M-86 floppy identifier",
-                                        ofs             = _dpb.off,
-                                        sectorsPerTrack = 8,
-                                        side1 = new Side
-                                        {
-                                            sideId    = 0,
-                                            sectorIds = new int[8]
-                                        },
-                                        order = "SIDES",
-                                        side2 = new Side
-                                        {
-                                            sideId    = 1,
-                                            sectorIds = new int[8]
-                                        },
-                                        skew = 0,
-                                        sofs = 0
-                                    };
-
-                                    for(int si = 0; si < 8; si++)
-                                        _workingDefinition.side1.sectorIds[si] = si + 1;
-
-                                    for(int si = 0; si < 8; si++)
-                                        _workingDefinition.side2.sectorIds[si] = si + 1;
-                                }
-
-                                break;
-                            case FormatByte.k360:
-                            case FormatByte.k360Alt:
-                            case FormatByte.k360Alt2:
-                                if(imagePlugin.Info.SectorSize == 512 &&
-                                   imagePlugin.Info.Sectors    == 720)
-                                {
-                                    _cpmFound              = true;
-                                    firstDirectorySector86 = 36;
-
-                                    _dpb = new DiscParameterBlock
-                                    {
-                                        al0 = 0x80,
-                                        al1 = 0,
-                                        blm = 0x0F,
-                                        bsh = 4,
-                                        cks = 0x10,
-                                        drm = 0x3F,
-                                        dsm = 0, // Unknown. Needed?
-                                        exm = 1,
-                                        off = 4,
-                                        phm = 3,
-                                        psh = 2,
-                                        spt = 9 * 4
-                                    };
-
-                                    _workingDefinition = new CpmDefinition
-                                    {
-                                        al0             = _dpb.al0,
-                                        al1             = _dpb.al1,
-                                        bitrate         = "LOW",
-                                        blm             = _dpb.blm,
-                                        bsh             = _dpb.bsh,
-                                        bytesPerSector  = 512,
-                                        cylinders       = 40,
-                                        drm             = _dpb.drm,
-                                        dsm             = _dpb.dsm,
-                                        encoding        = "MFM",
-                                        evenOdd         = false,
-                                        exm             = _dpb.exm,
-                                        label           = null,
-                                        comment         = "CP/M-86 floppy identifier",
-                                        ofs             = _dpb.off,
-                                        sectorsPerTrack = 9,
-                                        side1 = new Side
-                                        {
-                                            sideId    = 0,
-                                            sectorIds = new int[9]
-                                        },
-                                        order = "SIDES",
-                                        side2 = new Side
-                                        {
-                                            sideId    = 1,
-                                            sectorIds = new int[9]
-                                        },
-                                        skew = 0,
-                                        sofs = 0
-                                    };
-
-                                    for(int si = 0; si < 9; si++)
-                                        _workingDefinition.side1.sectorIds[si] = si + 1;
-
-                                    for(int si = 0; si < 9; si++)
-                                        _workingDefinition.side2.sectorIds[si] = si + 1;
-                                }
-
-                                break;
-                            case FormatByte.k720:
-                            case FormatByte.k720Alt:
-                                if(imagePlugin.Info.SectorSize == 512 &&
-                                   imagePlugin.Info.Sectors    == 1440)
-                                {
-                                    _cpmFound              = true;
-                                    firstDirectorySector86 = 36;
-
-                                    _dpb = new DiscParameterBlock
-                                    {
-                                        al0 = 0xF0,
-                                        al1 = 0,
-                                        blm = 0x0F,
-                                        bsh = 4,
-                                        cks = 0x40,
-                                        drm = 0xFF,
-                                        dsm = 0x15E,
-                                        exm = 0,
-                                        off = 4,
-                                        phm = 3,
-                                        psh = 2,
-                                        spt = 9 * 4
-                                    };
-
-                                    _workingDefinition = new CpmDefinition
-                                    {
-                                        al0             = _dpb.al0,
-                                        al1             = _dpb.al1,
-                                        bitrate         = "LOW",
-                                        blm             = _dpb.blm,
-                                        bsh             = _dpb.bsh,
-                                        bytesPerSector  = 512,
-                                        cylinders       = 80,
-                                        drm             = _dpb.drm,
-                                        dsm             = _dpb.dsm,
-                                        encoding        = "MFM",
-                                        evenOdd         = false,
-                                        exm             = _dpb.exm,
-                                        label           = null,
-                                        comment         = "CP/M-86 floppy identifier",
-                                        ofs             = _dpb.off,
-                                        sectorsPerTrack = 9,
-                                        side1 = new Side
-                                        {
-                                            sideId    = 0,
-                                            sectorIds = new int[9]
-                                        },
-                                        order = "SIDES",
-                                        side2 = new Side
-                                        {
-                                            sideId    = 1,
-                                            sectorIds = new int[9]
-                                        },
-                                        skew = 0,
-                                        sofs = 0
-                                    };
-
-                                    for(int si = 0; si < 9; si++)
-                                        _workingDefinition.side1.sectorIds[si] = si + 1;
-
-                                    for(int si = 0; si < 9; si++)
-                                        _workingDefinition.side2.sectorIds[si] = si + 1;
-                                }
-
-                                break;
-                            case FormatByte.f720:
-                                if(imagePlugin.Info.SectorSize == 512 &&
-                                   imagePlugin.Info.Sectors    == 1440)
-                                {
-                                    _cpmFound              = true;
-                                    firstDirectorySector86 = 18;
-
-                                    _dpb = new DiscParameterBlock
-                                    {
-                                        al0 = 0xF0,
-                                        al1 = 0,
-                                        blm = 0x0F,
-                                        bsh = 4,
-                                        cks = 0x40,
-                                        drm = 0xFF,
-                                        dsm = 0x162,
-                                        exm = 0,
-                                        off = 2,
-                                        phm = 3,
-                                        psh = 2,
-                                        spt = 9 * 4
-                                    };
-
-                                    _workingDefinition = new CpmDefinition
-                                    {
-                                        al0             = _dpb.al0,
-                                        al1             = _dpb.al1,
-                                        bitrate         = "LOW",
-                                        blm             = _dpb.blm,
-                                        bsh             = _dpb.bsh,
-                                        bytesPerSector  = 512,
-                                        cylinders       = 80,
-                                        drm             = _dpb.drm,
-                                        dsm             = _dpb.dsm,
-                                        encoding        = "MFM",
-                                        evenOdd         = false,
-                                        exm             = _dpb.exm,
-                                        label           = null,
-                                        comment         = "CP/M-86 floppy identifier",
-                                        ofs             = _dpb.off,
-                                        sectorsPerTrack = 9,
-                                        side1 = new Side
-                                        {
-                                            sideId    = 0,
-                                            sectorIds = new int[9]
-                                        },
-                                        order = "CYLINDERS",
-                                        side2 = new Side
-                                        {
-                                            sideId    = 1,
-                                            sectorIds = new int[9]
-                                        },
-                                        skew = 0,
-                                        sofs = 0
-                                    };
-
-                                    for(int si = 0; si < 9; si++)
-                                        _workingDefinition.side1.sectorIds[si] = si + 1;
-
-                                    for(int si = 0; si < 9; si++)
-                                        _workingDefinition.side2.sectorIds[si] = si + 1;
-                                }
-
-                                break;
-                            case FormatByte.f1200:
-                                if(imagePlugin.Info.SectorSize == 512 &&
-                                   imagePlugin.Info.Sectors    == 2400)
-                                {
-                                    _cpmFound              = true;
-                                    firstDirectorySector86 = 30;
-
-                                    _dpb = new DiscParameterBlock
-                                    {
-                                        al0 = 0xC0,
-                                        al1 = 0,
-                                        blm = 0x1F,
-                                        bsh = 5,
-                                        cks = 0x40,
-                                        drm = 0xFF,
-                                        dsm = 0x127,
-                                        exm = 1,
-                                        off = 2,
-                                        phm = 3,
-                                        psh = 2,
-                                        spt = 15 * 4
-                                    };
-
-                                    _workingDefinition = new CpmDefinition
-                                    {
-                                        al0             = _dpb.al0,
-                                        al1             = _dpb.al1,
-                                        bitrate         = "HIGH",
-                                        blm             = _dpb.blm,
-                                        bsh             = _dpb.bsh,
-                                        bytesPerSector  = 512,
-                                        cylinders       = 80,
-                                        drm             = _dpb.drm,
-                                        dsm             = _dpb.dsm,
-                                        encoding        = "MFM",
-                                        evenOdd         = false,
-                                        exm             = _dpb.exm,
-                                        label           = null,
-                                        comment         = "CP/M-86 floppy identifier",
-                                        ofs             = _dpb.off,
-                                        sectorsPerTrack = 15,
-                                        side1 = new Side
-                                        {
-                                            sideId    = 0,
-                                            sectorIds = new int[15]
-                                        },
-                                        order = "CYLINDERS",
-                                        side2 = new Side
-                                        {
-                                            sideId    = 1,
-                                            sectorIds = new int[15]
-                                        },
-                                        skew = 0,
-                                        sofs = 0
-                                    };
-
-                                    for(int si = 0; si < 15; si++)
-                                        _workingDefinition.side1.sectorIds[si] = si + 1;
-
-                                    for(int si = 0; si < 15; si++)
-                                        _workingDefinition.side2.sectorIds[si] = si + 1;
-                                }
-
-                                break;
-                            case FormatByte.f1440:
-                                if(imagePlugin.Info.SectorSize == 512 &&
-                                   imagePlugin.Info.Sectors    == 2880)
-                                {
-                                    _cpmFound              = true;
-                                    firstDirectorySector86 = 36;
-
-                                    _dpb = new DiscParameterBlock
-                                    {
-                                        al0 = 0xC0,
-                                        al1 = 0,
-                                        blm = 0x1F,
-                                        bsh = 5,
-                                        cks = 0x40,
-                                        drm = 0xFF,
-                                        dsm = 0x162,
-                                        exm = 1,
-                                        off = 2,
-                                        phm = 3,
-                                        psh = 2,
-                                        spt = 18 * 4
-                                    };
-
-                                    _workingDefinition = new CpmDefinition
-                                    {
-                                        al0             = _dpb.al0,
-                                        al1             = _dpb.al1,
-                                        bitrate         = "LOW",
-                                        blm             = _dpb.blm,
-                                        bsh             = _dpb.bsh,
-                                        bytesPerSector  = 512,
-                                        cylinders       = 80,
-                                        drm             = _dpb.drm,
-                                        dsm             = _dpb.dsm,
-                                        encoding        = "MFM",
-                                        evenOdd         = false,
-                                        exm             = _dpb.exm,
-                                        label           = null,
-                                        comment         = "CP/M-86 floppy identifier",
-                                        ofs             = _dpb.off,
-                                        sectorsPerTrack = 18,
-                                        side1 = new Side
-                                        {
-                                            sideId    = 0,
-                                            sectorIds = new int[18]
-                                        },
-                                        order = "CYLINDERS",
-                                        side2 = new Side
-                                        {
-                                            sideId    = 1,
-                                            sectorIds = new int[18]
-                                        },
-                                        skew = 0,
-                                        sofs = 0
-                                    };
-
-                                    for(int si = 0; si < 18; si++)
-                                        _workingDefinition.side1.sectorIds[si] = si + 1;
-
-                                    for(int si = 0; si < 18; si++)
-                                        _workingDefinition.side2.sectorIds[si] = si + 1;
-                                }
-
-                                break;
-                        }
-
-                        if(_cpmFound)
-                        {
-                            uint directoryLength = (uint)(((ulong)_dpb.drm + 1) * 32 / imagePlugin.Info.SectorSize);
-
-                            errno = imagePlugin.ReadSectors(firstDirectorySector86 + partition.Start, directoryLength,
-                                                            out directory);
-
-                            AaruConsole.DebugWriteLine("CP/M Plugin", "Found CP/M-86 floppy identifier.");
-                        }
-                    }
-                }
-
-                // One of the few CP/M filesystem marks has been found, try for correcteness checking the whole directory
-                if(_cpmFound)
-                {
-                    if(CheckDir(directory))
-                    {
-                        AaruConsole.DebugWriteLine("CP/M Plugin", "First directory block seems correct.");
-
-                        return true;
-                    }
-
-                    _cpmFound = false;
-                }
-
-                // Try all definitions
-                if(!_cpmFound)
-                {
-                    // Load all definitions
-                    AaruConsole.DebugWriteLine("CP/M Plugin", "Trying to load definitions.");
-
-                    if(LoadDefinitions()                      &&
-                       _definitions?.definitions      != null &&
-                       _definitions.definitions.Count > 0)
-                    {
-                        AaruConsole.DebugWriteLine("CP/M Plugin", "Trying all known definitions.");
-
-                        foreach(CpmDefinition def in from def in _definitions.definitions let sectors =
-                                                         (ulong)(def.cylinders * def.sides * def.sectorsPerTrack)
-                                                     where sectors            == imagePlugin.Info.Sectors &&
-                                                           def.bytesPerSector == imagePlugin.Info.SectorSize select def)
-                        {
-                            // Definition seems to describe current disk, at least, same number of volume sectors and bytes per sector
-                            AaruConsole.DebugWriteLine("CP/M Plugin", "Trying definition \"{0}\"", def.comment);
-                            ulong offset;
-
-                            if(def.sofs != 0)
-                                offset = (ulong)def.sofs;
-                            else
-                                offset = (ulong)(def.ofs * def.sectorsPerTrack);
-
-                            int dirLen = (def.drm + 1) * 32 / def.bytesPerSector;
-
-                            if(def.sides == 1)
+                            break;
+                        case FormatByte.f1440:
+                            if(imagePlugin.Info.SectorSize == 512 &&
+                               imagePlugin.Info.Sectors    == 2880)
                             {
-                                _sectorMask = new int[def.side1.sectorIds.Length];
-
-                                for(int m = 0; m < _sectorMask.Length; m++)
-                                    _sectorMask[m] = def.side1.sectorIds[m] - def.side1.sectorIds[0];
-                            }
-                            else
-                            {
-                                // Head changes after every track
-                                if(string.Compare(def.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0)
-                                {
-                                    _sectorMask = new int[def.side1.sectorIds.Length + def.side2.sectorIds.Length];
-
-                                    for(int m = 0; m < def.side1.sectorIds.Length; m++)
-                                        _sectorMask[m] = def.side1.sectorIds[m] - def.side1.sectorIds[0];
-
-                                    // Skip first track (first side)
-                                    for(int m = 0; m < def.side2.sectorIds.Length; m++)
-                                        _sectorMask[m + def.side1.sectorIds.Length] =
-                                            def.side2.sectorIds[m] - def.side2.sectorIds[0] +
-                                            def.side1.sectorIds.Length;
-                                }
-
-                                // Head changes after whole side
-                                else if(string.Compare(def.order, "CYLINDERS",
-                                                       StringComparison.InvariantCultureIgnoreCase) == 0)
-                                {
-                                    for(int m = 0; m < def.side1.sectorIds.Length; m++)
-                                        _sectorMask[m] = def.side1.sectorIds[m] - def.side1.sectorIds[0];
-
-                                    // Skip first track (first side) and first track (second side)
-                                    for(int m = 0; m < def.side1.sectorIds.Length; m++)
-                                        _sectorMask[m + def.side1.sectorIds.Length] =
-                                            def.side1.sectorIds[m] - def.side1.sectorIds[0] +
-                                            def.side1.sectorIds.Length + def.side2.sectorIds.Length;
-                                }
-
-                                // TODO: Implement COLUMBIA ordering
-                                else if(string.Compare(def.order, "COLUMBIA",
-                                                       StringComparison.InvariantCultureIgnoreCase) == 0)
-                                {
-                                    AaruConsole.DebugWriteLine("CP/M Plugin",
-                                                               "Don't know how to handle COLUMBIA ordering, not proceeding with this definition.");
-
-                                    continue;
-                                }
-
-                                // TODO: Implement EAGLE ordering
-                                else if(string.Compare(def.order, "EAGLE",
-                                                       StringComparison.InvariantCultureIgnoreCase) == 0)
-                                {
-                                    AaruConsole.DebugWriteLine("CP/M Plugin",
-                                                               "Don't know how to handle EAGLE ordering, not proceeding with this definition.");
-
-                                    continue;
-                                }
-                                else
-                                {
-                                    AaruConsole.DebugWriteLine("CP/M Plugin",
-                                                               "Unknown order type \"{0}\", not proceeding with this definition.",
-                                                               def.order);
-
-                                    continue;
-                                }
-                            }
-
-                            // Read the directory marked by this definition
-                            var ms = new MemoryStream();
-
-                            for(int p = 0; p < dirLen; p++)
-                            {
-                                errno =
-                                    imagePlugin.
-                                        ReadSector((ulong)((int)offset + (int)partition.Start + (p / _sectorMask.Length * _sectorMask.Length) + _sectorMask[p % _sectorMask.Length]),
-                                                   out byte[] dirSector);
-
-                                if(errno != ErrorNumber.NoError)
-                                    break;
-
-                                ms.Write(dirSector, 0, dirSector.Length);
-                            }
-
-                            directory = ms.ToArray();
-
-                            if(def.evenOdd)
-                                AaruConsole.DebugWriteLine("CP/M Plugin",
-                                                           "Definition contains EVEN-ODD field, with unknown meaning, detection may be wrong.");
-
-                            // Complement of the directory bytes if needed
-                            if(def.complement)
-                                for(int b = 0; b < directory.Length; b++)
-                                    directory[b] = (byte)(~directory[b] & 0xFF);
-
-                            // Check the directory
-                            if(CheckDir(directory))
-                            {
-                                AaruConsole.DebugWriteLine("CP/M Plugin", "Definition \"{0}\" has a correct directory",
-                                                           def.comment);
-
-                                // Build a Disc Parameter Block
-                                _workingDefinition = def;
+                                _cpmFound              = true;
+                                firstDirectorySector86 = 36;
 
                                 _dpb = new DiscParameterBlock
                                 {
-                                    al0 = (byte)def.al0,
-                                    al1 = (byte)def.al1,
-                                    blm = (byte)def.blm,
-                                    bsh = (byte)def.bsh,
-
-                                    // Needed?
-                                    cks = 0,
-                                    drm = (ushort)def.drm,
-                                    dsm = (ushort)def.dsm,
-                                    exm = (byte)def.exm,
-                                    off = (ushort)def.ofs,
-                                    spt = (ushort)(def.sectorsPerTrack * def.bytesPerSector / 128)
+                                    al0 = 0xC0,
+                                    al1 = 0,
+                                    blm = 0x1F,
+                                    bsh = 5,
+                                    cks = 0x40,
+                                    drm = 0xFF,
+                                    dsm = 0x162,
+                                    exm = 1,
+                                    off = 2,
+                                    phm = 3,
+                                    psh = 2,
+                                    spt = 18 * 4
                                 };
 
-                                switch(def.bytesPerSector)
+                                _workingDefinition = new CpmDefinition
                                 {
-                                    case 128:
-                                        _dpb.psh = 0;
-                                        _dpb.phm = 0;
+                                    al0             = _dpb.al0,
+                                    al1             = _dpb.al1,
+                                    bitrate         = "LOW",
+                                    blm             = _dpb.blm,
+                                    bsh             = _dpb.bsh,
+                                    bytesPerSector  = 512,
+                                    cylinders       = 80,
+                                    drm             = _dpb.drm,
+                                    dsm             = _dpb.dsm,
+                                    encoding        = "MFM",
+                                    evenOdd         = false,
+                                    exm             = _dpb.exm,
+                                    label           = null,
+                                    comment         = "CP/M-86 floppy identifier",
+                                    ofs             = _dpb.off,
+                                    sectorsPerTrack = 18,
+                                    side1 = new Side
+                                    {
+                                        sideId    = 0,
+                                        sectorIds = new int[18]
+                                    },
+                                    order = "CYLINDERS",
+                                    side2 = new Side
+                                    {
+                                        sideId    = 1,
+                                        sectorIds = new int[18]
+                                    },
+                                    skew = 0,
+                                    sofs = 0
+                                };
 
-                                        break;
-                                    case 256:
-                                        _dpb.psh = 1;
-                                        _dpb.phm = 1;
+                                for(int si = 0; si < 18; si++)
+                                    _workingDefinition.side1.sectorIds[si] = si + 1;
 
-                                        break;
-                                    case 512:
-                                        _dpb.psh = 2;
-                                        _dpb.phm = 3;
-
-                                        break;
-                                    case 1024:
-                                        _dpb.psh = 3;
-                                        _dpb.phm = 7;
-
-                                        break;
-                                    case 2048:
-                                        _dpb.psh = 4;
-                                        _dpb.phm = 15;
-
-                                        break;
-                                    case 4096:
-                                        _dpb.psh = 5;
-                                        _dpb.phm = 31;
-
-                                        break;
-                                    case 8192:
-                                        _dpb.psh = 6;
-                                        _dpb.phm = 63;
-
-                                        break;
-                                    case 16384:
-                                        _dpb.psh = 7;
-                                        _dpb.phm = 127;
-
-                                        break;
-                                    case 32768:
-                                        _dpb.psh = 8;
-                                        _dpb.phm = 255;
-
-                                        break;
-                                }
-
-                                _cpmFound          = true;
-                                _workingDefinition = def;
-
-                                return true;
+                                for(int si = 0; si < 18; si++)
+                                    _workingDefinition.side2.sectorIds[si] = si + 1;
                             }
 
-                            _label             = null;
-                            _labelCreationDate = null;
-                            _labelUpdateDate   = null;
-                        }
+                            break;
+                    }
+
+                    if(_cpmFound)
+                    {
+                        uint directoryLength = (uint)(((ulong)_dpb.drm + 1) * 32 / imagePlugin.Info.SectorSize);
+
+                        errno = imagePlugin.ReadSectors(firstDirectorySector86 + partition.Start, directoryLength,
+                                                        out directory);
+
+                        AaruConsole.DebugWriteLine("CP/M Plugin", "Found CP/M-86 floppy identifier.");
                     }
                 }
-
-                // Clear class variables
-                _cpmFound             = false;
-                _workingDefinition    = null;
-                _dpb                  = null;
-                _label                = null;
-                _standardTimestamps   = false;
-                _thirdPartyTimestamps = false;
-
-                return false;
             }
-            catch
+
+            // One of the few CP/M filesystem marks has been found, try for correcteness checking the whole directory
+            if(_cpmFound)
             {
-                //throw ex;
-                return false;
+                if(CheckDir(directory))
+                {
+                    AaruConsole.DebugWriteLine("CP/M Plugin", "First directory block seems correct.");
+
+                    return true;
+                }
+
+                _cpmFound = false;
             }
+
+            // Try all definitions
+            if(!_cpmFound)
+            {
+                // Load all definitions
+                AaruConsole.DebugWriteLine("CP/M Plugin", "Trying to load definitions.");
+
+                if(LoadDefinitions()                      &&
+                   _definitions?.definitions      != null &&
+                   _definitions.definitions.Count > 0)
+                {
+                    AaruConsole.DebugWriteLine("CP/M Plugin", "Trying all known definitions.");
+
+                    foreach(CpmDefinition def in from def in _definitions.definitions let sectors =
+                                                     (ulong)(def.cylinders * def.sides * def.sectorsPerTrack)
+                                                 where sectors            == imagePlugin.Info.Sectors &&
+                                                       def.bytesPerSector == imagePlugin.Info.SectorSize select def)
+                    {
+                        // Definition seems to describe current disk, at least, same number of volume sectors and bytes per sector
+                        AaruConsole.DebugWriteLine("CP/M Plugin", "Trying definition \"{0}\"", def.comment);
+                        ulong offset;
+
+                        if(def.sofs != 0)
+                            offset = (ulong)def.sofs;
+                        else
+                            offset = (ulong)(def.ofs * def.sectorsPerTrack);
+
+                        int dirLen = (def.drm + 1) * 32 / def.bytesPerSector;
+
+                        if(def.sides == 1)
+                        {
+                            _sectorMask = new int[def.side1.sectorIds.Length];
+
+                            for(int m = 0; m < _sectorMask.Length; m++)
+                                _sectorMask[m] = def.side1.sectorIds[m] - def.side1.sectorIds[0];
+                        }
+                        else
+                        {
+                            // Head changes after every track
+                            if(string.Compare(def.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0)
+                            {
+                                _sectorMask = new int[def.side1.sectorIds.Length + def.side2.sectorIds.Length];
+
+                                for(int m = 0; m < def.side1.sectorIds.Length; m++)
+                                    _sectorMask[m] = def.side1.sectorIds[m] - def.side1.sectorIds[0];
+
+                                // Skip first track (first side)
+                                for(int m = 0; m < def.side2.sectorIds.Length; m++)
+                                    _sectorMask[m + def.side1.sectorIds.Length] =
+                                        def.side2.sectorIds[m] - def.side2.sectorIds[0] +
+                                        def.side1.sectorIds.Length;
+                            }
+
+                            // Head changes after whole side
+                            else if(string.Compare(def.order, "CYLINDERS",
+                                                   StringComparison.InvariantCultureIgnoreCase) == 0)
+                            {
+                                for(int m = 0; m < def.side1.sectorIds.Length; m++)
+                                    _sectorMask[m] = def.side1.sectorIds[m] - def.side1.sectorIds[0];
+
+                                // Skip first track (first side) and first track (second side)
+                                for(int m = 0; m < def.side1.sectorIds.Length; m++)
+                                    _sectorMask[m + def.side1.sectorIds.Length] =
+                                        def.side1.sectorIds[m] - def.side1.sectorIds[0] +
+                                        def.side1.sectorIds.Length                      + def.side2.sectorIds.Length;
+                            }
+
+                            // TODO: Implement COLUMBIA ordering
+                            else if(string.Compare(def.order, "COLUMBIA",
+                                                   StringComparison.InvariantCultureIgnoreCase) == 0)
+                            {
+                                AaruConsole.DebugWriteLine("CP/M Plugin",
+                                                           "Don't know how to handle COLUMBIA ordering, not proceeding with this definition.");
+
+                                continue;
+                            }
+
+                            // TODO: Implement EAGLE ordering
+                            else if(string.Compare(def.order, "EAGLE",
+                                                   StringComparison.InvariantCultureIgnoreCase) == 0)
+                            {
+                                AaruConsole.DebugWriteLine("CP/M Plugin",
+                                                           "Don't know how to handle EAGLE ordering, not proceeding with this definition.");
+
+                                continue;
+                            }
+                            else
+                            {
+                                AaruConsole.DebugWriteLine("CP/M Plugin",
+                                                           "Unknown order type \"{0}\", not proceeding with this definition.",
+                                                           def.order);
+
+                                continue;
+                            }
+                        }
+
+                        // Read the directory marked by this definition
+                        var ms = new MemoryStream();
+
+                        for(int p = 0; p < dirLen; p++)
+                        {
+                            errno =
+                                imagePlugin.
+                                    ReadSector((ulong)((int)offset + (int)partition.Start + (p / _sectorMask.Length * _sectorMask.Length) + _sectorMask[p % _sectorMask.Length]),
+                                               out byte[] dirSector);
+
+                            if(errno != ErrorNumber.NoError)
+                                break;
+
+                            ms.Write(dirSector, 0, dirSector.Length);
+                        }
+
+                        directory = ms.ToArray();
+
+                        if(def.evenOdd)
+                            AaruConsole.DebugWriteLine("CP/M Plugin",
+                                                       "Definition contains EVEN-ODD field, with unknown meaning, detection may be wrong.");
+
+                        // Complement of the directory bytes if needed
+                        if(def.complement)
+                            for(int b = 0; b < directory.Length; b++)
+                                directory[b] = (byte)(~directory[b] & 0xFF);
+
+                        // Check the directory
+                        if(CheckDir(directory))
+                        {
+                            AaruConsole.DebugWriteLine("CP/M Plugin", "Definition \"{0}\" has a correct directory",
+                                                       def.comment);
+
+                            // Build a Disc Parameter Block
+                            _workingDefinition = def;
+
+                            _dpb = new DiscParameterBlock
+                            {
+                                al0 = (byte)def.al0,
+                                al1 = (byte)def.al1,
+                                blm = (byte)def.blm,
+                                bsh = (byte)def.bsh,
+
+                                // Needed?
+                                cks = 0,
+                                drm = (ushort)def.drm,
+                                dsm = (ushort)def.dsm,
+                                exm = (byte)def.exm,
+                                off = (ushort)def.ofs,
+                                spt = (ushort)(def.sectorsPerTrack * def.bytesPerSector / 128)
+                            };
+
+                            switch(def.bytesPerSector)
+                            {
+                                case 128:
+                                    _dpb.psh = 0;
+                                    _dpb.phm = 0;
+
+                                    break;
+                                case 256:
+                                    _dpb.psh = 1;
+                                    _dpb.phm = 1;
+
+                                    break;
+                                case 512:
+                                    _dpb.psh = 2;
+                                    _dpb.phm = 3;
+
+                                    break;
+                                case 1024:
+                                    _dpb.psh = 3;
+                                    _dpb.phm = 7;
+
+                                    break;
+                                case 2048:
+                                    _dpb.psh = 4;
+                                    _dpb.phm = 15;
+
+                                    break;
+                                case 4096:
+                                    _dpb.psh = 5;
+                                    _dpb.phm = 31;
+
+                                    break;
+                                case 8192:
+                                    _dpb.psh = 6;
+                                    _dpb.phm = 63;
+
+                                    break;
+                                case 16384:
+                                    _dpb.psh = 7;
+                                    _dpb.phm = 127;
+
+                                    break;
+                                case 32768:
+                                    _dpb.psh = 8;
+                                    _dpb.phm = 255;
+
+                                    break;
+                            }
+
+                            _cpmFound          = true;
+                            _workingDefinition = def;
+
+                            return true;
+                        }
+
+                        _label             = null;
+                        _labelCreationDate = null;
+                        _labelUpdateDate   = null;
+                    }
+                }
+            }
+
+            // Clear class variables
+            _cpmFound             = false;
+            _workingDefinition    = null;
+            _dpb                  = null;
+            _label                = null;
+            _standardTimestamps   = false;
+            _thirdPartyTimestamps = false;
+
+            return false;
         }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        catch
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("IBM437");
-            information = "";
-
-            // As the identification is so complex, just call Identify() and relay on its findings
-            if(!Identify(imagePlugin, partition) ||
-               !_cpmFound                        ||
-               _workingDefinition == null        ||
-               _dpb               == null)
-                return;
-
-            var sb = new StringBuilder();
-            sb.AppendLine("CP/M filesystem");
-
-            if(!string.IsNullOrEmpty(_workingDefinition.comment))
-                sb.AppendFormat("Identified as {0}", _workingDefinition.comment).AppendLine();
-
-            sb.AppendFormat("Volume block is {0} bytes", 128 << _dpb.bsh).AppendLine();
-
-            if(_dpb.dsm > 0)
-                sb.AppendFormat("Volume contains {0} blocks ({1} bytes)", _dpb.dsm, _dpb.dsm * (128 << _dpb.bsh)).
-                   AppendLine();
-
-            sb.AppendFormat("Volume contains {0} directory entries", _dpb.drm + 1).AppendLine();
-
-            if(_workingDefinition.sofs > 0)
-                sb.AppendFormat("Volume reserves {0} sectors for system", _workingDefinition.sofs).AppendLine();
-            else
-                sb.AppendFormat("Volume reserves {1} tracks ({0} sectors) for system",
-                                _workingDefinition.ofs * _workingDefinition.sectorsPerTrack, _workingDefinition.ofs).
-                   AppendLine();
-
-            if(_workingDefinition.side1.sectorIds.Length >= 2)
-            {
-                int interleaveSide1 = _workingDefinition.side1.sectorIds[1] - _workingDefinition.side1.sectorIds[0];
-
-                if(interleaveSide1 > 1)
-                    sb.AppendFormat("Side 0 uses {0}:1 software interleaving", interleaveSide1).AppendLine();
-            }
-
-            if(_workingDefinition.sides == 2)
-            {
-                if(_workingDefinition.side2.sectorIds.Length >= 2)
-                {
-                    int interleaveSide2 = _workingDefinition.side2.sectorIds[1] - _workingDefinition.side2.sectorIds[0];
-
-                    if(interleaveSide2 > 1)
-                        sb.AppendFormat("Side 1 uses {0}:1 software interleaving", interleaveSide2).AppendLine();
-                }
-
-                switch(_workingDefinition.order)
-                {
-                    case "SIDES":
-                        sb.AppendLine("Head changes after each whole track");
-
-                        break;
-                    case "CYLINDERS":
-                        sb.AppendLine("Head changes after whole side");
-
-                        break;
-                    default:
-                        sb.AppendFormat("Unknown how {0} side ordering works", _workingDefinition.order).AppendLine();
-
-                        break;
-                }
-            }
-
-            if(_workingDefinition.skew > 0)
-                sb.AppendFormat("Device uses {0}:1 hardware interleaving", _workingDefinition.skew).AppendLine();
-
-            if(_workingDefinition.sofs > 0)
-                sb.AppendFormat("BSH {0} BLM {1} EXM {2} DSM {3} DRM {4} AL0 {5:X2}H AL1 {6:X2}H SOFS {7}", _dpb.bsh,
-                                _dpb.blm, _dpb.exm, _dpb.dsm, _dpb.drm, _dpb.al0, _dpb.al1, _workingDefinition.sofs).
-                   AppendLine();
-            else
-                sb.AppendFormat("BSH {0} BLM {1} EXM {2} DSM {3} DRM {4} AL0 {5:X2}H AL1 {6:X2}H OFS {7}", _dpb.bsh,
-                                _dpb.blm, _dpb.exm, _dpb.dsm, _dpb.drm, _dpb.al0, _dpb.al1, _workingDefinition.ofs).
-                   AppendLine();
-
-            if(_label != null)
-                sb.AppendFormat("Volume label {0}", _label).AppendLine();
-
-            if(_standardTimestamps)
-                sb.AppendLine("Volume uses standard CP/M timestamps");
-
-            if(_thirdPartyTimestamps)
-                sb.AppendLine("Volume uses third party timestamps");
-
-            if(_labelCreationDate != null)
-                sb.AppendFormat("Volume created on {0}", DateHandlers.CpmToDateTime(_labelCreationDate)).AppendLine();
-
-            if(_labelUpdateDate != null)
-                sb.AppendFormat("Volume updated on {0}", DateHandlers.CpmToDateTime(_labelUpdateDate)).AppendLine();
-
-            XmlFsType             =  new FileSystemType();
-            XmlFsType.Bootable    |= _workingDefinition.sofs > 0 || _workingDefinition.ofs > 0;
-            XmlFsType.ClusterSize =  (uint)(128 << _dpb.bsh);
-
-            if(_dpb.dsm > 0)
-                XmlFsType.Clusters = _dpb.dsm;
-            else
-                XmlFsType.Clusters = partition.End - partition.Start;
-
-            if(_labelCreationDate != null)
-            {
-                XmlFsType.CreationDate          = DateHandlers.CpmToDateTime(_labelCreationDate);
-                XmlFsType.CreationDateSpecified = true;
-            }
-
-            if(_labelUpdateDate != null)
-            {
-                XmlFsType.ModificationDate          = DateHandlers.CpmToDateTime(_labelUpdateDate);
-                XmlFsType.ModificationDateSpecified = true;
-            }
-
-            XmlFsType.Type       = "CP/M";
-            XmlFsType.VolumeName = _label;
-
-            information = sb.ToString();
+            //throw ex;
+            return false;
         }
     }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("IBM437");
+        information = "";
+
+        // As the identification is so complex, just call Identify() and relay on its findings
+        if(!Identify(imagePlugin, partition) ||
+           !_cpmFound                        ||
+           _workingDefinition == null        ||
+           _dpb               == null)
+            return;
+
+        var sb = new StringBuilder();
+        sb.AppendLine("CP/M filesystem");
+
+        if(!string.IsNullOrEmpty(_workingDefinition.comment))
+            sb.AppendFormat("Identified as {0}", _workingDefinition.comment).AppendLine();
+
+        sb.AppendFormat("Volume block is {0} bytes", 128 << _dpb.bsh).AppendLine();
+
+        if(_dpb.dsm > 0)
+            sb.AppendFormat("Volume contains {0} blocks ({1} bytes)", _dpb.dsm, _dpb.dsm * (128 << _dpb.bsh)).
+               AppendLine();
+
+        sb.AppendFormat("Volume contains {0} directory entries", _dpb.drm + 1).AppendLine();
+
+        if(_workingDefinition.sofs > 0)
+            sb.AppendFormat("Volume reserves {0} sectors for system", _workingDefinition.sofs).AppendLine();
+        else
+            sb.AppendFormat("Volume reserves {1} tracks ({0} sectors) for system",
+                            _workingDefinition.ofs * _workingDefinition.sectorsPerTrack, _workingDefinition.ofs).
+               AppendLine();
+
+        if(_workingDefinition.side1.sectorIds.Length >= 2)
+        {
+            int interleaveSide1 = _workingDefinition.side1.sectorIds[1] - _workingDefinition.side1.sectorIds[0];
+
+            if(interleaveSide1 > 1)
+                sb.AppendFormat("Side 0 uses {0}:1 software interleaving", interleaveSide1).AppendLine();
+        }
+
+        if(_workingDefinition.sides == 2)
+        {
+            if(_workingDefinition.side2.sectorIds.Length >= 2)
+            {
+                int interleaveSide2 = _workingDefinition.side2.sectorIds[1] - _workingDefinition.side2.sectorIds[0];
+
+                if(interleaveSide2 > 1)
+                    sb.AppendFormat("Side 1 uses {0}:1 software interleaving", interleaveSide2).AppendLine();
+            }
+
+            switch(_workingDefinition.order)
+            {
+                case "SIDES":
+                    sb.AppendLine("Head changes after each whole track");
+
+                    break;
+                case "CYLINDERS":
+                    sb.AppendLine("Head changes after whole side");
+
+                    break;
+                default:
+                    sb.AppendFormat("Unknown how {0} side ordering works", _workingDefinition.order).AppendLine();
+
+                    break;
+            }
+        }
+
+        if(_workingDefinition.skew > 0)
+            sb.AppendFormat("Device uses {0}:1 hardware interleaving", _workingDefinition.skew).AppendLine();
+
+        if(_workingDefinition.sofs > 0)
+            sb.AppendFormat("BSH {0} BLM {1} EXM {2} DSM {3} DRM {4} AL0 {5:X2}H AL1 {6:X2}H SOFS {7}", _dpb.bsh,
+                            _dpb.blm, _dpb.exm, _dpb.dsm, _dpb.drm, _dpb.al0, _dpb.al1, _workingDefinition.sofs).
+               AppendLine();
+        else
+            sb.AppendFormat("BSH {0} BLM {1} EXM {2} DSM {3} DRM {4} AL0 {5:X2}H AL1 {6:X2}H OFS {7}", _dpb.bsh,
+                            _dpb.blm, _dpb.exm, _dpb.dsm, _dpb.drm, _dpb.al0, _dpb.al1, _workingDefinition.ofs).
+               AppendLine();
+
+        if(_label != null)
+            sb.AppendFormat("Volume label {0}", _label).AppendLine();
+
+        if(_standardTimestamps)
+            sb.AppendLine("Volume uses standard CP/M timestamps");
+
+        if(_thirdPartyTimestamps)
+            sb.AppendLine("Volume uses third party timestamps");
+
+        if(_labelCreationDate != null)
+            sb.AppendFormat("Volume created on {0}", DateHandlers.CpmToDateTime(_labelCreationDate)).AppendLine();
+
+        if(_labelUpdateDate != null)
+            sb.AppendFormat("Volume updated on {0}", DateHandlers.CpmToDateTime(_labelUpdateDate)).AppendLine();
+
+        XmlFsType             =  new FileSystemType();
+        XmlFsType.Bootable    |= _workingDefinition.sofs > 0 || _workingDefinition.ofs > 0;
+        XmlFsType.ClusterSize =  (uint)(128 << _dpb.bsh);
+
+        if(_dpb.dsm > 0)
+            XmlFsType.Clusters = _dpb.dsm;
+        else
+            XmlFsType.Clusters = partition.End - partition.Start;
+
+        if(_labelCreationDate != null)
+        {
+            XmlFsType.CreationDate          = DateHandlers.CpmToDateTime(_labelCreationDate);
+            XmlFsType.CreationDateSpecified = true;
+        }
+
+        if(_labelUpdateDate != null)
+        {
+            XmlFsType.ModificationDate          = DateHandlers.CpmToDateTime(_labelUpdateDate);
+            XmlFsType.ModificationDateSpecified = true;
+        }
+
+        XmlFsType.Type       = "CP/M";
+        XmlFsType.VolumeName = _label;
+
+        information = sb.ToString();
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/Structs.cs b/Aaru.Filesystems/CPM/Structs.cs
index 79a0efc23..80339a4c4 100644
--- a/Aaru.Filesystems/CPM/Structs.cs
+++ b/Aaru.Filesystems/CPM/Structs.cs
@@ -35,336 +35,335 @@ using System.Runtime.InteropServices;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class CPM
 {
-    public sealed partial class CPM
+    /// <summary>Most of the times this structure is hard wired or generated by CP/M, not stored on disk</summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    class DiscParameterBlock
     {
-        /// <summary>Most of the times this structure is hard wired or generated by CP/M, not stored on disk</summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        class DiscParameterBlock
-        {
-            /// <summary>First byte of allocation bitmap</summary>
-            public byte al0;
-            /// <summary>Second byte of allocation bitmap</summary>
-            public byte al1;
-            /// <summary>Block mask</summary>
-            public byte blm;
-            /// <summary>Block shift</summary>
-            public byte bsh;
-            /// <summary>Checksum vector size</summary>
-            public ushort cks;
-            /// <summary>Directory entries - 1</summary>
-            public ushort drm;
-            /// <summary>Blocks on disk - 1</summary>
-            public ushort dsm;
-            /// <summary>Extent mask</summary>
-            public byte exm;
-            /// <summary>Reserved tracks</summary>
-            public ushort off;
-            /// <summary>Physical sector mask</summary>
-            public byte phm;
-            /// <summary>Physical sector shift</summary>
-            public byte psh;
-            /// <summary>Sectors per track</summary>
-            public ushort spt;
-        }
+        /// <summary>First byte of allocation bitmap</summary>
+        public byte al0;
+        /// <summary>Second byte of allocation bitmap</summary>
+        public byte al1;
+        /// <summary>Block mask</summary>
+        public byte blm;
+        /// <summary>Block shift</summary>
+        public byte bsh;
+        /// <summary>Checksum vector size</summary>
+        public ushort cks;
+        /// <summary>Directory entries - 1</summary>
+        public ushort drm;
+        /// <summary>Blocks on disk - 1</summary>
+        public ushort dsm;
+        /// <summary>Extent mask</summary>
+        public byte exm;
+        /// <summary>Reserved tracks</summary>
+        public ushort off;
+        /// <summary>Physical sector mask</summary>
+        public byte phm;
+        /// <summary>Physical sector shift</summary>
+        public byte psh;
+        /// <summary>Sectors per track</summary>
+        public ushort spt;
+    }
 
-        /// <summary>Amstrad superblock, for PCW</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AmstradSuperBlock
-        {
-            /// <summary>Format ID. 0 single-side, 3 double-side. 1 and 2 are for CPC but they don't use the superblock</summary>
-            public readonly byte format;
-            /// <summary>Gives information about side ordering</summary>
-            public readonly byte sidedness;
-            /// <summary>Tracks per side, aka, cylinders</summary>
-            public readonly byte tps;
-            /// <summary>Sectors per track</summary>
-            public readonly byte spt;
-            /// <summary>Physical sector shift</summary>
-            public readonly byte psh;
-            /// <summary>Reserved tracks</summary>
-            public readonly byte off;
-            /// <summary>Block size shift</summary>
-            public readonly byte bsh;
-            /// <summary>How many blocks does the directory take</summary>
-            public readonly byte dirBlocks;
-            /// <summary>GAP#3 length (intersector)</summary>
-            public readonly byte gapLen;
-            /// <summary>GAP#4 length (end-of-track)</summary>
-            public readonly byte formatGap;
-            /// <summary>Must be 0</summary>
-            public readonly byte zero1;
-            /// <summary>Must be 0</summary>
-            public readonly byte zero2;
-            /// <summary>Must be 0</summary>
-            public readonly byte zero3;
-            /// <summary>Must be 0</summary>
-            public readonly byte zero4;
-            /// <summary>Must be 0</summary>
-            public readonly byte zero5;
-            /// <summary>Indicates machine the boot code following the superblock is designed to boot</summary>
-            public readonly byte fiddle;
-        }
+    /// <summary>Amstrad superblock, for PCW</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AmstradSuperBlock
+    {
+        /// <summary>Format ID. 0 single-side, 3 double-side. 1 and 2 are for CPC but they don't use the superblock</summary>
+        public readonly byte format;
+        /// <summary>Gives information about side ordering</summary>
+        public readonly byte sidedness;
+        /// <summary>Tracks per side, aka, cylinders</summary>
+        public readonly byte tps;
+        /// <summary>Sectors per track</summary>
+        public readonly byte spt;
+        /// <summary>Physical sector shift</summary>
+        public readonly byte psh;
+        /// <summary>Reserved tracks</summary>
+        public readonly byte off;
+        /// <summary>Block size shift</summary>
+        public readonly byte bsh;
+        /// <summary>How many blocks does the directory take</summary>
+        public readonly byte dirBlocks;
+        /// <summary>GAP#3 length (intersector)</summary>
+        public readonly byte gapLen;
+        /// <summary>GAP#4 length (end-of-track)</summary>
+        public readonly byte formatGap;
+        /// <summary>Must be 0</summary>
+        public readonly byte zero1;
+        /// <summary>Must be 0</summary>
+        public readonly byte zero2;
+        /// <summary>Must be 0</summary>
+        public readonly byte zero3;
+        /// <summary>Must be 0</summary>
+        public readonly byte zero4;
+        /// <summary>Must be 0</summary>
+        public readonly byte zero5;
+        /// <summary>Indicates machine the boot code following the superblock is designed to boot</summary>
+        public readonly byte fiddle;
+    }
 
-        /// <summary>Superblock found on CP/M-86 hard disk volumes</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HardDiskSuperBlock
-        {
-            /// <summary>Value so the sum of all the superblock's sector bytes taken as 16-bit values gives 0</summary>
-            public readonly ushort checksum;
-            /// <summary>Copyright string</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x1F)]
-            public readonly byte[] copyright;
-            /// <summary>First cylinder of disk where this volume resides</summary>
-            public readonly ushort firstCylinder;
-            /// <summary>How many cylinders does this volume span</summary>
-            public readonly ushort cylinders;
-            /// <summary>Heads on hard disk</summary>
-            public readonly byte heads;
-            /// <summary>Sectors per track</summary>
-            public readonly byte sectorsPerTrack;
-            /// <summary>Flags, only use by CCP/M where bit 0 equals verify on write</summary>
-            public readonly byte flags;
-            /// <summary>Sector size / 128</summary>
-            public readonly byte recordsPerSector;
-            /// <summary>
-            ///     <see cref="DiscParameterBlock.spt" />
-            /// </summary>
-            public readonly ushort spt;
-            /// <summary>
-            ///     <see cref="DiscParameterBlock.bsh" />
-            /// </summary>
-            public readonly byte bsh;
-            /// <summary>
-            ///     <see cref="DiscParameterBlock.blm" />
-            /// </summary>
-            public readonly byte blm;
-            /// <summary>
-            ///     <see cref="DiscParameterBlock.exm" />
-            /// </summary>
-            public readonly byte exm;
-            /// <summary>
-            ///     <see cref="DiscParameterBlock.dsm" />
-            /// </summary>
-            public readonly ushort dsm;
-            /// <summary>
-            ///     <see cref="DiscParameterBlock.drm" />
-            /// </summary>
-            public readonly ushort drm;
-            /// <summary>
-            ///     <see cref="DiscParameterBlock.al0" />
-            /// </summary>
-            public readonly ushort al0;
-            /// <summary>
-            ///     <see cref="DiscParameterBlock.al1" />
-            /// </summary>
-            public readonly ushort al1;
-            /// <summary>
-            ///     <see cref="DiscParameterBlock.cks" />
-            /// </summary>
-            public readonly ushort cks;
-            /// <summary>
-            ///     <see cref="DiscParameterBlock.off" />
-            /// </summary>
-            public readonly ushort off;
-            /// <summary>Must be zero</summary>
-            public readonly ushort zero1;
-            /// <summary>Must be zero</summary>
-            public readonly ushort zero2;
-            /// <summary>Must be zero</summary>
-            public readonly ushort zero3;
-            /// <summary>Must be zero</summary>
-            public readonly ushort zero4;
-            /// <summary>How many 128 bytes are in a block</summary>
-            public readonly ushort recordsPerBlock;
-            /// <summary>Maximum number of bad blocks in the bad block list</summary>
-            public readonly ushort badBlockWordsMax;
-            /// <summary>Used number of bad blocks in the bad block list</summary>
-            public readonly ushort badBlockWords;
-            /// <summary>First block after the blocks reserved for bad block substitution</summary>
-            public readonly ushort firstSub;
-        }
+    /// <summary>Superblock found on CP/M-86 hard disk volumes</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HardDiskSuperBlock
+    {
+        /// <summary>Value so the sum of all the superblock's sector bytes taken as 16-bit values gives 0</summary>
+        public readonly ushort checksum;
+        /// <summary>Copyright string</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x1F)]
+        public readonly byte[] copyright;
+        /// <summary>First cylinder of disk where this volume resides</summary>
+        public readonly ushort firstCylinder;
+        /// <summary>How many cylinders does this volume span</summary>
+        public readonly ushort cylinders;
+        /// <summary>Heads on hard disk</summary>
+        public readonly byte heads;
+        /// <summary>Sectors per track</summary>
+        public readonly byte sectorsPerTrack;
+        /// <summary>Flags, only use by CCP/M where bit 0 equals verify on write</summary>
+        public readonly byte flags;
+        /// <summary>Sector size / 128</summary>
+        public readonly byte recordsPerSector;
+        /// <summary>
+        ///     <see cref="DiscParameterBlock.spt" />
+        /// </summary>
+        public readonly ushort spt;
+        /// <summary>
+        ///     <see cref="DiscParameterBlock.bsh" />
+        /// </summary>
+        public readonly byte bsh;
+        /// <summary>
+        ///     <see cref="DiscParameterBlock.blm" />
+        /// </summary>
+        public readonly byte blm;
+        /// <summary>
+        ///     <see cref="DiscParameterBlock.exm" />
+        /// </summary>
+        public readonly byte exm;
+        /// <summary>
+        ///     <see cref="DiscParameterBlock.dsm" />
+        /// </summary>
+        public readonly ushort dsm;
+        /// <summary>
+        ///     <see cref="DiscParameterBlock.drm" />
+        /// </summary>
+        public readonly ushort drm;
+        /// <summary>
+        ///     <see cref="DiscParameterBlock.al0" />
+        /// </summary>
+        public readonly ushort al0;
+        /// <summary>
+        ///     <see cref="DiscParameterBlock.al1" />
+        /// </summary>
+        public readonly ushort al1;
+        /// <summary>
+        ///     <see cref="DiscParameterBlock.cks" />
+        /// </summary>
+        public readonly ushort cks;
+        /// <summary>
+        ///     <see cref="DiscParameterBlock.off" />
+        /// </summary>
+        public readonly ushort off;
+        /// <summary>Must be zero</summary>
+        public readonly ushort zero1;
+        /// <summary>Must be zero</summary>
+        public readonly ushort zero2;
+        /// <summary>Must be zero</summary>
+        public readonly ushort zero3;
+        /// <summary>Must be zero</summary>
+        public readonly ushort zero4;
+        /// <summary>How many 128 bytes are in a block</summary>
+        public readonly ushort recordsPerBlock;
+        /// <summary>Maximum number of bad blocks in the bad block list</summary>
+        public readonly ushort badBlockWordsMax;
+        /// <summary>Used number of bad blocks in the bad block list</summary>
+        public readonly ushort badBlockWords;
+        /// <summary>First block after the blocks reserved for bad block substitution</summary>
+        public readonly ushort firstSub;
+    }
 
-        /// <summary>Volume label entry</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct LabelEntry
-        {
-            /// <summary>Must be 0x20</summary>
-            public readonly byte signature;
-            /// <summary>Label in ASCII</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] label;
-            /// <summary>
-            ///     Label flags. Bit 0 = label exists, bit 4 = creation timestamp, bit 5 = modification timestamp, bit 6 = access
-            ///     timestamp, bit 7 = password enabled
-            /// </summary>
-            public readonly byte flags;
-            /// <summary>Password decoder byte</summary>
-            public readonly byte passwordDecoder;
-            /// <summary>Must be 0</summary>
-            public readonly ushort reserved;
-            /// <summary>Password XOR'ed with <see cref="passwordDecoder" /></summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] password;
-            /// <summary>Label creation time</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] ctime;
-            /// <summary>Label modification time</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] mtime;
-        }
+    /// <summary>Volume label entry</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct LabelEntry
+    {
+        /// <summary>Must be 0x20</summary>
+        public readonly byte signature;
+        /// <summary>Label in ASCII</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] label;
+        /// <summary>
+        ///     Label flags. Bit 0 = label exists, bit 4 = creation timestamp, bit 5 = modification timestamp, bit 6 = access
+        ///     timestamp, bit 7 = password enabled
+        /// </summary>
+        public readonly byte flags;
+        /// <summary>Password decoder byte</summary>
+        public readonly byte passwordDecoder;
+        /// <summary>Must be 0</summary>
+        public readonly ushort reserved;
+        /// <summary>Password XOR'ed with <see cref="passwordDecoder" /></summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] password;
+        /// <summary>Label creation time</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] ctime;
+        /// <summary>Label modification time</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] mtime;
+    }
 
-        /// <summary>CP/M 3 timestamp entry</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DateEntry
-        {
-            /// <summary>Must be 0x21</summary>
-            public readonly byte signature;
-            /// <summary>File 1 create/access timestamp</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] date1;
-            /// <summary>File 1 modification timestamp</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] date2;
-            /// <summary>File 1 password mode</summary>
-            public readonly byte mode1;
-            public readonly byte zero1;
-            /// <summary>File 2 create/access timestamp</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] date3;
-            /// <summary>File 2 modification timestamp</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] date4;
-            /// <summary>File 2 password mode</summary>
-            public readonly byte mode2;
-            public readonly byte zero2;
-            /// <summary>File 3 create/access timestamp</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] date5;
-            /// <summary>File 3 modification timestamp</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] date6;
-            /// <summary>File 3 password mode</summary>
-            public readonly byte mode3;
-            public readonly ushort zero3;
-        }
+    /// <summary>CP/M 3 timestamp entry</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DateEntry
+    {
+        /// <summary>Must be 0x21</summary>
+        public readonly byte signature;
+        /// <summary>File 1 create/access timestamp</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] date1;
+        /// <summary>File 1 modification timestamp</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] date2;
+        /// <summary>File 1 password mode</summary>
+        public readonly byte mode1;
+        public readonly byte zero1;
+        /// <summary>File 2 create/access timestamp</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] date3;
+        /// <summary>File 2 modification timestamp</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] date4;
+        /// <summary>File 2 password mode</summary>
+        public readonly byte mode2;
+        public readonly byte zero2;
+        /// <summary>File 3 create/access timestamp</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] date5;
+        /// <summary>File 3 modification timestamp</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] date6;
+        /// <summary>File 3 password mode</summary>
+        public readonly byte mode3;
+        public readonly ushort zero3;
+    }
 
-        /// <summary>Password entry</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct PasswordEntry
-        {
-            /// <summary>16 + user number</summary>
-            public readonly byte userNumber;
-            /// <summary>Filename</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] filename;
-            /// <summary>Extension</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] extension;
-            /// <summary>Password mode. Bit 7 = required for read, bit 6 = required for write, bit 5 = required for delete</summary>
-            public readonly byte mode;
-            /// <summary>Password decoder byte</summary>
-            public readonly byte passwordDecoder;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] reserved;
-            /// <summary>Password XOR'ed with <see cref="passwordDecoder" /></summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] password;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] reserved2;
-        }
+    /// <summary>Password entry</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct PasswordEntry
+    {
+        /// <summary>16 + user number</summary>
+        public readonly byte userNumber;
+        /// <summary>Filename</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] filename;
+        /// <summary>Extension</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] extension;
+        /// <summary>Password mode. Bit 7 = required for read, bit 6 = required for write, bit 5 = required for delete</summary>
+        public readonly byte mode;
+        /// <summary>Password decoder byte</summary>
+        public readonly byte passwordDecoder;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] reserved;
+        /// <summary>Password XOR'ed with <see cref="passwordDecoder" /></summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] password;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] reserved2;
+    }
 
-        /// <summary>Timestamp for Z80DOS or DOS+</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct TrdPartyDateEntry
-        {
-            /// <summary>Must be 0x21</summary>
-            public readonly byte signature;
-            public readonly byte zero;
-            /// <summary>Creation year for file 1</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] create1;
-            /// <summary>Modification time for file 1</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] modify1;
-            /// <summary>Access time for file 1</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] access1;
-            /// <summary>Creation year for file 2</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] create2;
-            /// <summary>Modification time for file 2</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] modify2;
-            /// <summary>Access time for file 2</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] access2;
-            /// <summary>Creation year for file 3</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] create3;
-            /// <summary>Modification time for file 3</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] modify3;
-            /// <summary>Access time for file 3</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] access3;
-        }
+    /// <summary>Timestamp for Z80DOS or DOS+</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct TrdPartyDateEntry
+    {
+        /// <summary>Must be 0x21</summary>
+        public readonly byte signature;
+        public readonly byte zero;
+        /// <summary>Creation year for file 1</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] create1;
+        /// <summary>Modification time for file 1</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] modify1;
+        /// <summary>Access time for file 1</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] access1;
+        /// <summary>Creation year for file 2</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] create2;
+        /// <summary>Modification time for file 2</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] modify2;
+        /// <summary>Access time for file 2</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] access2;
+        /// <summary>Creation year for file 3</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] create3;
+        /// <summary>Modification time for file 3</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] modify3;
+        /// <summary>Access time for file 3</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] access3;
+    }
 
-        /// <summary>Directory entry for &lt;256 allocation blocks</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryEntry
-        {
-            /// <summary>User number. Bit 7 set in CP/M 1 means hidden</summary>
-            public readonly byte statusUser;
-            /// <summary>Filename and bit 7 as flags</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] filename;
-            /// <summary>Extension and bit 7 as flags</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] extension;
-            /// <summary>Low byte of extent number</summary>
-            public readonly byte extentCounter;
-            /// <summary>
-            ///     Last record bytes. In some implementations it means how many bytes are used in the last record, in others how
-            ///     many bytes are free. It always refer to 128 byte records even if blocks are way bigger, so it's mostly useless.
-            /// </summary>
-            public readonly byte lastRecordBytes;
-            /// <summary>High byte of extent number</summary>
-            public readonly byte extentCounterHigh;
-            /// <summary>How many records are used in this entry. 0x80 if all are used.</summary>
-            public readonly byte records;
-            /// <summary>Allocation blocks</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] allocations;
-        }
+    /// <summary>Directory entry for &lt;256 allocation blocks</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryEntry
+    {
+        /// <summary>User number. Bit 7 set in CP/M 1 means hidden</summary>
+        public readonly byte statusUser;
+        /// <summary>Filename and bit 7 as flags</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] filename;
+        /// <summary>Extension and bit 7 as flags</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] extension;
+        /// <summary>Low byte of extent number</summary>
+        public readonly byte extentCounter;
+        /// <summary>
+        ///     Last record bytes. In some implementations it means how many bytes are used in the last record, in others how
+        ///     many bytes are free. It always refer to 128 byte records even if blocks are way bigger, so it's mostly useless.
+        /// </summary>
+        public readonly byte lastRecordBytes;
+        /// <summary>High byte of extent number</summary>
+        public readonly byte extentCounterHigh;
+        /// <summary>How many records are used in this entry. 0x80 if all are used.</summary>
+        public readonly byte records;
+        /// <summary>Allocation blocks</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] allocations;
+    }
 
-        /// <summary>Directory entry for &gt;256 allocation blocks</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryEntry16
-        {
-            /// <summary>User number. Bit 7 set in CP/M 1 means hidden</summary>
-            public readonly byte statusUser;
-            /// <summary>Filename and bit 7 as flags</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] filename;
-            /// <summary>Extension and bit 7 as flags</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] extension;
-            /// <summary>Low byte of extent number</summary>
-            public readonly byte extentCounter;
-            /// <summary>
-            ///     Last record bytes. In some implementations it means how many bytes are used in the last record, in others how
-            ///     many bytes are free. It always refer to 128 byte records even if blocks are way bigger, so it's mostly useless.
-            /// </summary>
-            public readonly byte lastRecordBytes;
-            /// <summary>High byte of extent number</summary>
-            public readonly byte extentCounterHigh;
-            /// <summary>How many records are used in this entry. 0x80 if all are used.</summary>
-            public readonly byte records;
-            /// <summary>Allocation blocks</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly ushort[] allocations;
-        }
+    /// <summary>Directory entry for &gt;256 allocation blocks</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryEntry16
+    {
+        /// <summary>User number. Bit 7 set in CP/M 1 means hidden</summary>
+        public readonly byte statusUser;
+        /// <summary>Filename and bit 7 as flags</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] filename;
+        /// <summary>Extension and bit 7 as flags</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] extension;
+        /// <summary>Low byte of extent number</summary>
+        public readonly byte extentCounter;
+        /// <summary>
+        ///     Last record bytes. In some implementations it means how many bytes are used in the last record, in others how
+        ///     many bytes are free. It always refer to 128 byte records even if blocks are way bigger, so it's mostly useless.
+        /// </summary>
+        public readonly byte lastRecordBytes;
+        /// <summary>High byte of extent number</summary>
+        public readonly byte extentCounterHigh;
+        /// <summary>How many records are used in this entry. 0x80 if all are used.</summary>
+        public readonly byte records;
+        /// <summary>Allocation blocks</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly ushort[] allocations;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/Super.cs b/Aaru.Filesystems/CPM/Super.cs
index 919b608a9..133d31ebb 100644
--- a/Aaru.Filesystems/CPM/Super.cs
+++ b/Aaru.Filesystems/CPM/Super.cs
@@ -47,447 +47,239 @@ using Schemas;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class CPM
 {
-    public sealed partial class CPM
+    /// <inheritdoc />
+    public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                             Dictionary<string, string> options, string @namespace)
     {
-        /// <inheritdoc />
-        public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
-                                 Dictionary<string, string> options, string @namespace)
+        _device  = imagePlugin;
+        Encoding = encoding ?? Encoding.GetEncoding("IBM437");
+
+        // As the identification is so complex, just call Identify() and relay on its findings
+        if(!Identify(_device, partition) ||
+           !_cpmFound                    ||
+           _workingDefinition == null    ||
+           _dpb               == null)
+            return ErrorNumber.InvalidArgument;
+
+        // Build the software interleaving sector mask
+        if(_workingDefinition.sides == 1)
         {
-            _device  = imagePlugin;
-            Encoding = encoding ?? Encoding.GetEncoding("IBM437");
+            _sectorMask = new int[_workingDefinition.side1.sectorIds.Length];
 
-            // As the identification is so complex, just call Identify() and relay on its findings
-            if(!Identify(_device, partition) ||
-               !_cpmFound                    ||
-               _workingDefinition == null    ||
-               _dpb               == null)
-                return ErrorNumber.InvalidArgument;
-
-            // Build the software interleaving sector mask
-            if(_workingDefinition.sides == 1)
+            for(int m = 0; m < _sectorMask.Length; m++)
+                _sectorMask[m] = _workingDefinition.side1.sectorIds[m] - _workingDefinition.side1.sectorIds[0];
+        }
+        else
+        {
+            // Head changes after every track
+            if(string.Compare(_workingDefinition.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0)
             {
-                _sectorMask = new int[_workingDefinition.side1.sectorIds.Length];
+                _sectorMask = new int[_workingDefinition.side1.sectorIds.Length +
+                                      _workingDefinition.side2.sectorIds.Length];
 
-                for(int m = 0; m < _sectorMask.Length; m++)
+                for(int m = 0; m < _workingDefinition.side1.sectorIds.Length; m++)
                     _sectorMask[m] = _workingDefinition.side1.sectorIds[m] - _workingDefinition.side1.sectorIds[0];
+
+                // Skip first track (first side)
+                for(int m = 0; m < _workingDefinition.side2.sectorIds.Length; m++)
+                    _sectorMask[m + _workingDefinition.side1.sectorIds.Length] =
+                        _workingDefinition.side2.sectorIds[m] - _workingDefinition.side2.sectorIds[0] +
+                        _workingDefinition.side1.sectorIds.Length;
+            }
+
+            // Head changes after whole side
+            else if(string.Compare(_workingDefinition.order, "CYLINDERS",
+                                   StringComparison.InvariantCultureIgnoreCase) == 0)
+            {
+                for(int m = 0; m < _workingDefinition.side1.sectorIds.Length; m++)
+                    _sectorMask[m] = _workingDefinition.side1.sectorIds[m] - _workingDefinition.side1.sectorIds[0];
+
+                // Skip first track (first side) and first track (second side)
+                for(int m = 0; m < _workingDefinition.side1.sectorIds.Length; m++)
+                    _sectorMask[m + _workingDefinition.side1.sectorIds.Length] =
+                        _workingDefinition.side1.sectorIds[m] - _workingDefinition.side1.sectorIds[0] +
+                        _workingDefinition.side1.sectorIds.Length + _workingDefinition.side2.sectorIds.Length;
+
+                // TODO: Implement CYLINDERS ordering
+                AaruConsole.DebugWriteLine("CP/M Plugin", "CYLINDERS ordering not yet implemented.");
+
+                return ErrorNumber.NotImplemented;
+            }
+
+            // TODO: Implement COLUMBIA ordering
+            else if(string.Compare(_workingDefinition.order, "COLUMBIA",
+                                   StringComparison.InvariantCultureIgnoreCase) == 0)
+            {
+                AaruConsole.DebugWriteLine("CP/M Plugin",
+                                           "Don't know how to handle COLUMBIA ordering, not proceeding with this definition.");
+
+                return ErrorNumber.NotImplemented;
+            }
+
+            // TODO: Implement EAGLE ordering
+            else if(string.Compare(_workingDefinition.order, "EAGLE",
+                                   StringComparison.InvariantCultureIgnoreCase) == 0)
+            {
+                AaruConsole.DebugWriteLine("CP/M Plugin",
+                                           "Don't know how to handle EAGLE ordering, not proceeding with this definition.");
+
+                return ErrorNumber.NotImplemented;
             }
             else
             {
-                // Head changes after every track
-                if(string.Compare(_workingDefinition.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0)
-                {
-                    _sectorMask = new int[_workingDefinition.side1.sectorIds.Length +
-                                          _workingDefinition.side2.sectorIds.Length];
+                AaruConsole.DebugWriteLine("CP/M Plugin",
+                                           "Unknown order type \"{0}\", not proceeding with this definition.",
+                                           _workingDefinition.order);
 
-                    for(int m = 0; m < _workingDefinition.side1.sectorIds.Length; m++)
-                        _sectorMask[m] = _workingDefinition.side1.sectorIds[m] - _workingDefinition.side1.sectorIds[0];
-
-                    // Skip first track (first side)
-                    for(int m = 0; m < _workingDefinition.side2.sectorIds.Length; m++)
-                        _sectorMask[m + _workingDefinition.side1.sectorIds.Length] =
-                            _workingDefinition.side2.sectorIds[m] - _workingDefinition.side2.sectorIds[0] +
-                            _workingDefinition.side1.sectorIds.Length;
-                }
-
-                // Head changes after whole side
-                else if(string.Compare(_workingDefinition.order, "CYLINDERS",
-                                       StringComparison.InvariantCultureIgnoreCase) == 0)
-                {
-                    for(int m = 0; m < _workingDefinition.side1.sectorIds.Length; m++)
-                        _sectorMask[m] = _workingDefinition.side1.sectorIds[m] - _workingDefinition.side1.sectorIds[0];
-
-                    // Skip first track (first side) and first track (second side)
-                    for(int m = 0; m < _workingDefinition.side1.sectorIds.Length; m++)
-                        _sectorMask[m + _workingDefinition.side1.sectorIds.Length] =
-                            _workingDefinition.side1.sectorIds[m] - _workingDefinition.side1.sectorIds[0] +
-                            _workingDefinition.side1.sectorIds.Length + _workingDefinition.side2.sectorIds.Length;
-
-                    // TODO: Implement CYLINDERS ordering
-                    AaruConsole.DebugWriteLine("CP/M Plugin", "CYLINDERS ordering not yet implemented.");
-
-                    return ErrorNumber.NotImplemented;
-                }
-
-                // TODO: Implement COLUMBIA ordering
-                else if(string.Compare(_workingDefinition.order, "COLUMBIA",
-                                       StringComparison.InvariantCultureIgnoreCase) == 0)
-                {
-                    AaruConsole.DebugWriteLine("CP/M Plugin",
-                                               "Don't know how to handle COLUMBIA ordering, not proceeding with this definition.");
-
-                    return ErrorNumber.NotImplemented;
-                }
-
-                // TODO: Implement EAGLE ordering
-                else if(string.Compare(_workingDefinition.order, "EAGLE",
-                                       StringComparison.InvariantCultureIgnoreCase) == 0)
-                {
-                    AaruConsole.DebugWriteLine("CP/M Plugin",
-                                               "Don't know how to handle EAGLE ordering, not proceeding with this definition.");
-
-                    return ErrorNumber.NotImplemented;
-                }
-                else
-                {
-                    AaruConsole.DebugWriteLine("CP/M Plugin",
-                                               "Unknown order type \"{0}\", not proceeding with this definition.",
-                                               _workingDefinition.order);
-
-                    return ErrorNumber.NotSupported;
-                }
+                return ErrorNumber.NotSupported;
             }
+        }
 
-            // Deinterleave whole volume
-            Dictionary<ulong, byte[]> deinterleavedSectors = new();
+        // Deinterleave whole volume
+        Dictionary<ulong, byte[]> deinterleavedSectors = new();
 
-            if(_workingDefinition.sides                                                                       == 1 ||
-               string.Compare(_workingDefinition.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0)
+        if(_workingDefinition.sides                                                                       == 1 ||
+           string.Compare(_workingDefinition.order, "SIDES", StringComparison.InvariantCultureIgnoreCase) == 0)
+        {
+            AaruConsole.DebugWriteLine("CP/M Plugin", "Deinterleaving whole volume.");
+
+            for(int p = 0; p <= (int)(partition.End - partition.Start); p++)
             {
-                AaruConsole.DebugWriteLine("CP/M Plugin", "Deinterleaving whole volume.");
+                ErrorNumber errno =
+                    _device.
+                        ReadSector((ulong)((int)partition.Start + (p / _sectorMask.Length * _sectorMask.Length) + _sectorMask[p % _sectorMask.Length]),
+                                   out byte[] readSector);
 
-                for(int p = 0; p <= (int)(partition.End - partition.Start); p++)
-                {
-                    ErrorNumber errno =
-                        _device.
-                            ReadSector((ulong)((int)partition.Start + (p / _sectorMask.Length * _sectorMask.Length) + _sectorMask[p % _sectorMask.Length]),
-                                       out byte[] readSector);
+                if(errno != ErrorNumber.NoError)
+                    return errno;
 
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
+                if(_workingDefinition.complement)
+                    for(int b = 0; b < readSector.Length; b++)
+                        readSector[b] = (byte)(~readSector[b] & 0xFF);
 
-                    if(_workingDefinition.complement)
-                        for(int b = 0; b < readSector.Length; b++)
-                            readSector[b] = (byte)(~readSector[b] & 0xFF);
-
-                    deinterleavedSectors.Add((ulong)p, readSector);
-                }
+                deinterleavedSectors.Add((ulong)p, readSector);
             }
+        }
 
-            int                       blockSize        = 128 << _dpb.bsh;
-            var                       blockMs          = new MemoryStream();
-            ulong                     blockNo          = 0;
-            int                       sectorsPerBlock  = 0;
-            Dictionary<ulong, byte[]> allocationBlocks = new();
+        int                       blockSize        = 128 << _dpb.bsh;
+        var                       blockMs          = new MemoryStream();
+        ulong                     blockNo          = 0;
+        int                       sectorsPerBlock  = 0;
+        Dictionary<ulong, byte[]> allocationBlocks = new();
 
-            AaruConsole.DebugWriteLine("CP/M Plugin", "Creating allocation blocks.");
+        AaruConsole.DebugWriteLine("CP/M Plugin", "Creating allocation blocks.");
 
-            // For each volume sector
-            for(ulong a = 0; a < (ulong)deinterleavedSectors.Count; a++)
+        // For each volume sector
+        for(ulong a = 0; a < (ulong)deinterleavedSectors.Count; a++)
+        {
+            deinterleavedSectors.TryGetValue(a, out byte[] sector);
+
+            // May it happen? Just in case, CP/M blocks are smaller than physical sectors
+            if(sector.Length > blockSize)
+                for(int i = 0; i < sector.Length / blockSize; i++)
+                {
+                    byte[] tmp = new byte[blockSize];
+                    Array.Copy(sector, blockSize * i, tmp, 0, blockSize);
+                    allocationBlocks.Add(blockNo++, tmp);
+                }
+
+            // CP/M blocks are larger than physical sectors
+            else if(sector.Length < blockSize)
             {
-                deinterleavedSectors.TryGetValue(a, out byte[] sector);
+                blockMs.Write(sector, 0, sector.Length);
+                sectorsPerBlock++;
 
-                // May it happen? Just in case, CP/M blocks are smaller than physical sectors
-                if(sector.Length > blockSize)
-                    for(int i = 0; i < sector.Length / blockSize; i++)
-                    {
-                        byte[] tmp = new byte[blockSize];
-                        Array.Copy(sector, blockSize * i, tmp, 0, blockSize);
-                        allocationBlocks.Add(blockNo++, tmp);
-                    }
+                if(sectorsPerBlock != blockSize / sector.Length)
+                    continue;
 
-                // CP/M blocks are larger than physical sectors
-                else if(sector.Length < blockSize)
-                {
-                    blockMs.Write(sector, 0, sector.Length);
-                    sectorsPerBlock++;
-
-                    if(sectorsPerBlock != blockSize / sector.Length)
-                        continue;
-
-                    allocationBlocks.Add(blockNo++, blockMs.ToArray());
-                    sectorsPerBlock = 0;
-                    blockMs         = new MemoryStream();
-                }
-
-                // CP/M blocks are same size than physical sectors
-                else
-                    allocationBlocks.Add(blockNo++, sector);
+                allocationBlocks.Add(blockNo++, blockMs.ToArray());
+                sectorsPerBlock = 0;
+                blockMs         = new MemoryStream();
             }
 
-            AaruConsole.DebugWriteLine("CP/M Plugin", "Reading directory.");
-
-            int dirOff;
-            int dirSectors = (_dpb.drm + 1) * 32 / _workingDefinition.bytesPerSector;
-
-            if(_workingDefinition.sofs > 0)
-                dirOff = _workingDefinition.sofs;
+            // CP/M blocks are same size than physical sectors
             else
-                dirOff = _workingDefinition.ofs * _workingDefinition.sectorsPerTrack;
+                allocationBlocks.Add(blockNo++, sector);
+        }
 
-            // Read the whole directory blocks
-            var dirMs = new MemoryStream();
+        AaruConsole.DebugWriteLine("CP/M Plugin", "Reading directory.");
 
-            for(int d = 0; d < dirSectors; d++)
-            {
-                deinterleavedSectors.TryGetValue((ulong)(d + dirOff), out byte[] sector);
-                dirMs.Write(sector, 0, sector.Length);
-            }
+        int dirOff;
+        int dirSectors = (_dpb.drm + 1) * 32 / _workingDefinition.bytesPerSector;
 
-            byte[] directory = dirMs.ToArray();
+        if(_workingDefinition.sofs > 0)
+            dirOff = _workingDefinition.sofs;
+        else
+            dirOff = _workingDefinition.ofs * _workingDefinition.sectorsPerTrack;
 
-            if(directory == null)
-                return ErrorNumber.InvalidArgument;
+        // Read the whole directory blocks
+        var dirMs = new MemoryStream();
 
-            int    dirCnt = 0;
-            string file1  = null;
-            string file2  = null;
-            string file3  = null;
+        for(int d = 0; d < dirSectors; d++)
+        {
+            deinterleavedSectors.TryGetValue((ulong)(d + dirOff), out byte[] sector);
+            dirMs.Write(sector, 0, sector.Length);
+        }
 
-            Dictionary<string, Dictionary<int, List<ushort>>> fileExtents = new();
+        byte[] directory = dirMs.ToArray();
 
-            _statCache = new Dictionary<string, FileEntryInfo>();
-            _cpmStat   = new FileSystemInfo();
-            bool atime = false;
-            _dirList           = new List<string>();
-            _labelCreationDate = null;
-            _labelUpdateDate   = null;
-            _passwordCache     = new Dictionary<string, byte[]>();
+        if(directory == null)
+            return ErrorNumber.InvalidArgument;
 
-            AaruConsole.DebugWriteLine("CP/M Plugin", "Traversing directory.");
+        int    dirCnt = 0;
+        string file1  = null;
+        string file2  = null;
+        string file3  = null;
 
-            // For each directory entry
-            for(int dOff = 0; dOff < directory.Length; dOff += 32)
+        Dictionary<string, Dictionary<int, List<ushort>>> fileExtents = new();
 
-                // Describes a file (does not support PDOS entries with user >= 16, because they're identical to password entries
-                if((directory[dOff] & 0x7F) < 0x10)
-                    if(allocationBlocks.Count > 256)
-                    {
-                        DirectoryEntry16 entry =
-                            Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry16>(directory, dOff, 32);
+        _statCache = new Dictionary<string, FileEntryInfo>();
+        _cpmStat   = new FileSystemInfo();
+        bool atime = false;
+        _dirList           = new List<string>();
+        _labelCreationDate = null;
+        _labelUpdateDate   = null;
+        _passwordCache     = new Dictionary<string, byte[]>();
 
-                        bool hidden = (entry.statusUser & 0x80) == 0x80;
-                        bool rdOnly = (entry.filename[0] & 0x80) == 0x80 || (entry.extension[0] & 0x80) == 0x80;
-                        bool system = (entry.filename[1] & 0x80) == 0x80 || (entry.extension[2] & 0x80) == 0x80;
+        AaruConsole.DebugWriteLine("CP/M Plugin", "Traversing directory.");
 
-                        //bool backed = (entry.filename[3] & 0x80) == 0x80 || (entry.extension[3] & 0x80) == 0x80;
-                        int user = entry.statusUser & 0x0F;
+        // For each directory entry
+        for(int dOff = 0; dOff < directory.Length; dOff += 32)
 
-                        bool validEntry = true;
-
-                        for(int i = 0; i < 8; i++)
-                        {
-                            entry.filename[i] &= 0x7F;
-                            validEntry        &= entry.filename[i] >= 0x20;
-                        }
-
-                        for(int i = 0; i < 3; i++)
-                        {
-                            entry.extension[i] &= 0x7F;
-                            validEntry         &= entry.extension[i] >= 0x20;
-                        }
-
-                        if(!validEntry)
-                            continue;
-
-                        string filename  = Encoding.ASCII.GetString(entry.filename).Trim();
-                        string extension = Encoding.ASCII.GetString(entry.extension).Trim();
-
-                        // If user is != 0, append user to name to have identical filenames
-                        if(user > 0)
-                            filename = $"{user:X1}:{filename}";
-
-                        if(!string.IsNullOrEmpty(extension))
-                            filename = filename + "." + extension;
-
-                        filename = filename.Replace('/', '\u2215');
-
-                        int entryNo = ((32 * entry.extentCounter) + entry.extentCounterHigh) / (_dpb.exm + 1);
-
-                        // Do we have a stat for the file already?
-                        if(_statCache.TryGetValue(filename, out FileEntryInfo fInfo))
-                            _statCache.Remove(filename);
-                        else
-                            fInfo = new FileEntryInfo
-                            {
-                                Attributes = new FileAttributes()
-                            };
-
-                        // And any extent?
-                        if(fileExtents.TryGetValue(filename, out Dictionary<int, List<ushort>> extentBlocks))
-                            fileExtents.Remove(filename);
-                        else
-                            extentBlocks = new Dictionary<int, List<ushort>>();
-
-                        // Do we already have this extent? Should never happen
-                        if(extentBlocks.TryGetValue(entryNo, out List<ushort> blocks))
-                            extentBlocks.Remove(entryNo);
-                        else
-                            blocks = new List<ushort>();
-
-                        // Attributes
-                        if(hidden)
-                            fInfo.Attributes |= FileAttributes.Hidden;
-
-                        if(rdOnly)
-                            fInfo.Attributes |= FileAttributes.ReadOnly;
-
-                        if(system)
-                            fInfo.Attributes |= FileAttributes.System;
-
-                        // Supposedly there is a value in the directory entry telling how many blocks are designated in
-                        // this entry. However some implementations tend to do whatever they wish, but none will ever
-                        // allocate block 0 for a file because that's where the directory resides.
-                        // There is also a field telling how many bytes are used in the last block, but its meaning is
-                        // non-standard so we must ignore it.
-                        foreach(ushort blk in entry.allocations.Where(blk => !blocks.Contains(blk) && blk != 0))
-                            blocks.Add(blk);
-
-                        // Save the file
-                        fInfo.UID = (ulong)user;
-                        extentBlocks.Add(entryNo, blocks);
-                        fileExtents.Add(filename, extentBlocks);
-                        _statCache.Add(filename, fInfo);
-
-                        // Add the file to the directory listing
-                        if(!_dirList.Contains(filename))
-                            _dirList.Add(filename);
-
-                        // Count entries 3 by 3 for timestamps
-                        switch(dirCnt % 3)
-                        {
-                            case 0:
-                                file1 = filename;
-
-                                break;
-                            case 1:
-                                file2 = filename;
-
-                                break;
-                            case 2:
-                                file3 = filename;
-
-                                break;
-                        }
-
-                        dirCnt++;
-                    }
-                    else
-                    {
-                        DirectoryEntry entry =
-                            Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(directory, dOff, 32);
-
-                        bool hidden = (entry.statusUser & 0x80) == 0x80;
-                        bool rdOnly = (entry.filename[0] & 0x80) == 0x80 || (entry.extension[0] & 0x80) == 0x80;
-                        bool system = (entry.filename[1] & 0x80) == 0x80 || (entry.extension[2] & 0x80) == 0x80;
-
-                        //bool backed = (entry.filename[3] & 0x80) == 0x80 || (entry.extension[3] & 0x80) == 0x80;
-                        int user = entry.statusUser & 0x0F;
-
-                        bool validEntry = true;
-
-                        for(int i = 0; i < 8; i++)
-                        {
-                            entry.filename[i] &= 0x7F;
-                            validEntry        &= entry.filename[i] >= 0x20;
-                        }
-
-                        for(int i = 0; i < 3; i++)
-                        {
-                            entry.extension[i] &= 0x7F;
-                            validEntry         &= entry.extension[i] >= 0x20;
-                        }
-
-                        if(!validEntry)
-                            continue;
-
-                        string filename  = Encoding.ASCII.GetString(entry.filename).Trim();
-                        string extension = Encoding.ASCII.GetString(entry.extension).Trim();
-
-                        // If user is != 0, append user to name to have identical filenames
-                        if(user > 0)
-                            filename = $"{user:X1}:{filename}";
-
-                        if(!string.IsNullOrEmpty(extension))
-                            filename = filename + "." + extension;
-
-                        filename = filename.Replace('/', '\u2215');
-
-                        int entryNo = ((32 * entry.extentCounterHigh) + entry.extentCounter) / (_dpb.exm + 1);
-
-                        // Do we have a stat for the file already?
-                        if(_statCache.TryGetValue(filename, out FileEntryInfo fInfo))
-                            _statCache.Remove(filename);
-                        else
-                            fInfo = new FileEntryInfo
-                            {
-                                Attributes = new FileAttributes()
-                            };
-
-                        // And any extent?
-                        if(fileExtents.TryGetValue(filename, out Dictionary<int, List<ushort>> extentBlocks))
-                            fileExtents.Remove(filename);
-                        else
-                            extentBlocks = new Dictionary<int, List<ushort>>();
-
-                        // Do we already have this extent? Should never happen
-                        if(extentBlocks.TryGetValue(entryNo, out List<ushort> blocks))
-                            extentBlocks.Remove(entryNo);
-                        else
-                            blocks = new List<ushort>();
-
-                        // Attributes
-                        if(hidden)
-                            fInfo.Attributes |= FileAttributes.Hidden;
-
-                        if(rdOnly)
-                            fInfo.Attributes |= FileAttributes.ReadOnly;
-
-                        if(system)
-                            fInfo.Attributes |= FileAttributes.System;
-
-                        // Supposedly there is a value in the directory entry telling how many blocks are designated in
-                        // this entry. However some implementations tend to do whatever they wish, but none will ever
-                        // allocate block 0 for a file because that's where the directory resides.
-                        // There is also a field telling how many bytes are used in the last block, but its meaning is
-                        // non-standard so we must ignore it.
-                        foreach(ushort blk in entry.allocations.Where(blk => !blocks.Contains(blk) && blk != 0))
-                            blocks.Add(blk);
-
-                        // Save the file
-                        fInfo.UID = (ulong)user;
-                        extentBlocks.Add(entryNo, blocks);
-                        fileExtents.Add(filename, extentBlocks);
-                        _statCache.Add(filename, fInfo);
-
-                        // Add the file to the directory listing
-                        if(!_dirList.Contains(filename))
-                            _dirList.Add(filename);
-
-                        // Count entries 3 by 3 for timestamps
-                        switch(dirCnt % 3)
-                        {
-                            case 0:
-                                file1 = filename;
-
-                                break;
-                            case 1:
-                                file2 = filename;
-
-                                break;
-                            case 2:
-                                file3 = filename;
-
-                                break;
-                        }
-
-                        dirCnt++;
-                    }
-
-                // A password entry (or a file entry in PDOS, but this does not handle that case)
-                else if((directory[dOff] & 0x7F) >= 0x10 &&
-                        (directory[dOff] & 0x7F) < 0x20)
+            // Describes a file (does not support PDOS entries with user >= 16, because they're identical to password entries
+            if((directory[dOff] & 0x7F) < 0x10)
+                if(allocationBlocks.Count > 256)
                 {
-                    PasswordEntry entry = Marshal.ByteArrayToStructureLittleEndian<PasswordEntry>(directory, dOff, 32);
+                    DirectoryEntry16 entry =
+                        Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry16>(directory, dOff, 32);
 
-                    int user = entry.userNumber & 0x0F;
+                    bool hidden = (entry.statusUser & 0x80) == 0x80;
+                    bool rdOnly = (entry.filename[0] & 0x80) == 0x80 || (entry.extension[0] & 0x80) == 0x80;
+                    bool system = (entry.filename[1] & 0x80) == 0x80 || (entry.extension[2] & 0x80) == 0x80;
+
+                    //bool backed = (entry.filename[3] & 0x80) == 0x80 || (entry.extension[3] & 0x80) == 0x80;
+                    int user = entry.statusUser & 0x0F;
+
+                    bool validEntry = true;
 
                     for(int i = 0; i < 8; i++)
+                    {
                         entry.filename[i] &= 0x7F;
+                        validEntry        &= entry.filename[i] >= 0x20;
+                    }
 
                     for(int i = 0; i < 3; i++)
+                    {
                         entry.extension[i] &= 0x7F;
+                        validEntry         &= entry.extension[i] >= 0x20;
+                    }
+
+                    if(!validEntry)
+                        continue;
 
                     string filename  = Encoding.ASCII.GetString(entry.filename).Trim();
                     string extension = Encoding.ASCII.GetString(entry.extension).Trim();
@@ -501,14 +293,167 @@ namespace Aaru.Filesystems
 
                     filename = filename.Replace('/', '\u2215');
 
-                    // Do not repeat passwords
-                    if(_passwordCache.ContainsKey(filename))
-                        _passwordCache.Remove(filename);
+                    int entryNo = ((32 * entry.extentCounter) + entry.extentCounterHigh) / (_dpb.exm + 1);
 
-                    // Copy whole password entry
-                    byte[] tmp = new byte[32];
-                    Array.Copy(directory, dOff, tmp, 0, 32);
-                    _passwordCache.Add(filename, tmp);
+                    // Do we have a stat for the file already?
+                    if(_statCache.TryGetValue(filename, out FileEntryInfo fInfo))
+                        _statCache.Remove(filename);
+                    else
+                        fInfo = new FileEntryInfo
+                        {
+                            Attributes = new FileAttributes()
+                        };
+
+                    // And any extent?
+                    if(fileExtents.TryGetValue(filename, out Dictionary<int, List<ushort>> extentBlocks))
+                        fileExtents.Remove(filename);
+                    else
+                        extentBlocks = new Dictionary<int, List<ushort>>();
+
+                    // Do we already have this extent? Should never happen
+                    if(extentBlocks.TryGetValue(entryNo, out List<ushort> blocks))
+                        extentBlocks.Remove(entryNo);
+                    else
+                        blocks = new List<ushort>();
+
+                    // Attributes
+                    if(hidden)
+                        fInfo.Attributes |= FileAttributes.Hidden;
+
+                    if(rdOnly)
+                        fInfo.Attributes |= FileAttributes.ReadOnly;
+
+                    if(system)
+                        fInfo.Attributes |= FileAttributes.System;
+
+                    // Supposedly there is a value in the directory entry telling how many blocks are designated in
+                    // this entry. However some implementations tend to do whatever they wish, but none will ever
+                    // allocate block 0 for a file because that's where the directory resides.
+                    // There is also a field telling how many bytes are used in the last block, but its meaning is
+                    // non-standard so we must ignore it.
+                    foreach(ushort blk in entry.allocations.Where(blk => !blocks.Contains(blk) && blk != 0))
+                        blocks.Add(blk);
+
+                    // Save the file
+                    fInfo.UID = (ulong)user;
+                    extentBlocks.Add(entryNo, blocks);
+                    fileExtents.Add(filename, extentBlocks);
+                    _statCache.Add(filename, fInfo);
+
+                    // Add the file to the directory listing
+                    if(!_dirList.Contains(filename))
+                        _dirList.Add(filename);
+
+                    // Count entries 3 by 3 for timestamps
+                    switch(dirCnt % 3)
+                    {
+                        case 0:
+                            file1 = filename;
+
+                            break;
+                        case 1:
+                            file2 = filename;
+
+                            break;
+                        case 2:
+                            file3 = filename;
+
+                            break;
+                    }
+
+                    dirCnt++;
+                }
+                else
+                {
+                    DirectoryEntry entry =
+                        Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(directory, dOff, 32);
+
+                    bool hidden = (entry.statusUser & 0x80) == 0x80;
+                    bool rdOnly = (entry.filename[0] & 0x80) == 0x80 || (entry.extension[0] & 0x80) == 0x80;
+                    bool system = (entry.filename[1] & 0x80) == 0x80 || (entry.extension[2] & 0x80) == 0x80;
+
+                    //bool backed = (entry.filename[3] & 0x80) == 0x80 || (entry.extension[3] & 0x80) == 0x80;
+                    int user = entry.statusUser & 0x0F;
+
+                    bool validEntry = true;
+
+                    for(int i = 0; i < 8; i++)
+                    {
+                        entry.filename[i] &= 0x7F;
+                        validEntry        &= entry.filename[i] >= 0x20;
+                    }
+
+                    for(int i = 0; i < 3; i++)
+                    {
+                        entry.extension[i] &= 0x7F;
+                        validEntry         &= entry.extension[i] >= 0x20;
+                    }
+
+                    if(!validEntry)
+                        continue;
+
+                    string filename  = Encoding.ASCII.GetString(entry.filename).Trim();
+                    string extension = Encoding.ASCII.GetString(entry.extension).Trim();
+
+                    // If user is != 0, append user to name to have identical filenames
+                    if(user > 0)
+                        filename = $"{user:X1}:{filename}";
+
+                    if(!string.IsNullOrEmpty(extension))
+                        filename = filename + "." + extension;
+
+                    filename = filename.Replace('/', '\u2215');
+
+                    int entryNo = ((32 * entry.extentCounterHigh) + entry.extentCounter) / (_dpb.exm + 1);
+
+                    // Do we have a stat for the file already?
+                    if(_statCache.TryGetValue(filename, out FileEntryInfo fInfo))
+                        _statCache.Remove(filename);
+                    else
+                        fInfo = new FileEntryInfo
+                        {
+                            Attributes = new FileAttributes()
+                        };
+
+                    // And any extent?
+                    if(fileExtents.TryGetValue(filename, out Dictionary<int, List<ushort>> extentBlocks))
+                        fileExtents.Remove(filename);
+                    else
+                        extentBlocks = new Dictionary<int, List<ushort>>();
+
+                    // Do we already have this extent? Should never happen
+                    if(extentBlocks.TryGetValue(entryNo, out List<ushort> blocks))
+                        extentBlocks.Remove(entryNo);
+                    else
+                        blocks = new List<ushort>();
+
+                    // Attributes
+                    if(hidden)
+                        fInfo.Attributes |= FileAttributes.Hidden;
+
+                    if(rdOnly)
+                        fInfo.Attributes |= FileAttributes.ReadOnly;
+
+                    if(system)
+                        fInfo.Attributes |= FileAttributes.System;
+
+                    // Supposedly there is a value in the directory entry telling how many blocks are designated in
+                    // this entry. However some implementations tend to do whatever they wish, but none will ever
+                    // allocate block 0 for a file because that's where the directory resides.
+                    // There is also a field telling how many bytes are used in the last block, but its meaning is
+                    // non-standard so we must ignore it.
+                    foreach(ushort blk in entry.allocations.Where(blk => !blocks.Contains(blk) && blk != 0))
+                        blocks.Add(blk);
+
+                    // Save the file
+                    fInfo.UID = (ulong)user;
+                    extentBlocks.Add(entryNo, blocks);
+                    fileExtents.Add(filename, extentBlocks);
+                    _statCache.Add(filename, fInfo);
+
+                    // Add the file to the directory listing
+                    if(!_dirList.Contains(filename))
+                        _dirList.Add(filename);
 
                     // Count entries 3 by 3 for timestamps
                     switch(dirCnt % 3)
@@ -530,309 +475,363 @@ namespace Aaru.Filesystems
                     dirCnt++;
                 }
 
-                // Volume label and password entry. Volume password is ignored.
-                else
-                    switch(directory[dOff] & 0x7F)
-                    {
-                        case 0x20:
-                            LabelEntry labelEntry =
-                                Marshal.ByteArrayToStructureLittleEndian<LabelEntry>(directory, dOff, 32);
-
-                            // The volume label defines if one of the fields in CP/M 3 timestamp is a creation or an
-                            // access time
-                            atime |= (labelEntry.flags & 0x40) == 0x40;
-
-                            _label             = Encoding.ASCII.GetString(directory, dOff + 1, 11).Trim();
-                            _labelCreationDate = new byte[4];
-                            _labelUpdateDate   = new byte[4];
-                            Array.Copy(directory, dOff + 24, _labelCreationDate, 0, 4);
-                            Array.Copy(directory, dOff + 28, _labelUpdateDate, 0, 4);
-
-                            // Count entries 3 by 3 for timestamps
-                            switch(dirCnt % 3)
-                            {
-                                case 0:
-                                    file1 = null;
-
-                                    break;
-                                case 1:
-                                    file2 = null;
-
-                                    break;
-                                case 2:
-                                    file3 = null;
-
-                                    break;
-                            }
-
-                            dirCnt++;
-
-                            break;
-                        case 0x21:
-                            if(directory[dOff + 10] == 0x00 &&
-                               directory[dOff + 20] == 0x00 &&
-                               directory[dOff + 30] == 0x00 &&
-                               directory[dOff + 31] == 0x00)
-                            {
-                                DateEntry dateEntry =
-                                    Marshal.ByteArrayToStructureLittleEndian<DateEntry>(directory, dOff, 32);
-
-                                FileEntryInfo fInfo;
-
-                                // Entry contains timestamps for last 3 entries, whatever the kind they are.
-                                if(!string.IsNullOrEmpty(file1))
-                                {
-                                    if(_statCache.TryGetValue(file1, out fInfo))
-                                        _statCache.Remove(file1);
-                                    else
-                                        fInfo = new FileEntryInfo();
-
-                                    if(atime)
-                                        fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date1);
-                                    else
-                                        fInfo.CreationTime = DateHandlers.CpmToDateTime(dateEntry.date1);
-
-                                    fInfo.LastWriteTime = DateHandlers.CpmToDateTime(dateEntry.date2);
-
-                                    _statCache.Add(file1, fInfo);
-                                }
-
-                                if(!string.IsNullOrEmpty(file2))
-                                {
-                                    if(_statCache.TryGetValue(file2, out fInfo))
-                                        _statCache.Remove(file2);
-                                    else
-                                        fInfo = new FileEntryInfo();
-
-                                    if(atime)
-                                        fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date3);
-                                    else
-                                        fInfo.CreationTime = DateHandlers.CpmToDateTime(dateEntry.date3);
-
-                                    fInfo.LastWriteTime = DateHandlers.CpmToDateTime(dateEntry.date4);
-
-                                    _statCache.Add(file2, fInfo);
-                                }
-
-                                if(!string.IsNullOrEmpty(file3))
-                                {
-                                    if(_statCache.TryGetValue(file3, out fInfo))
-                                        _statCache.Remove(file3);
-                                    else
-                                        fInfo = new FileEntryInfo();
-
-                                    if(atime)
-                                        fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date5);
-                                    else
-                                        fInfo.CreationTime = DateHandlers.CpmToDateTime(dateEntry.date5);
-
-                                    fInfo.LastWriteTime = DateHandlers.CpmToDateTime(dateEntry.date6);
-
-                                    _statCache.Add(file3, fInfo);
-                                }
-
-                                file1  = null;
-                                file2  = null;
-                                file3  = null;
-                                dirCnt = 0;
-                            }
-
-                            // However, if this byte is 0, timestamp is in Z80DOS or DOS+ format
-                            else if(directory[dOff + 1] == 0x00)
-                            {
-                                TrdPartyDateEntry trdPartyDateEntry =
-                                    Marshal.ByteArrayToStructureLittleEndian<TrdPartyDateEntry>(directory, dOff, 32);
-
-                                FileEntryInfo fInfo;
-
-                                // Entry contains timestamps for last 3 entries, whatever the kind they are.
-                                if(!string.IsNullOrEmpty(file1))
-                                {
-                                    if(_statCache.TryGetValue(file1, out fInfo))
-                                        _statCache.Remove(file1);
-                                    else
-                                        fInfo = new FileEntryInfo();
-
-                                    byte[] ctime = new byte[4];
-                                    ctime[0] = trdPartyDateEntry.create1[0];
-                                    ctime[1] = trdPartyDateEntry.create1[1];
-
-                                    fInfo.AccessTime    = DateHandlers.CpmToDateTime(trdPartyDateEntry.access1);
-                                    fInfo.CreationTime  = DateHandlers.CpmToDateTime(ctime);
-                                    fInfo.LastWriteTime = DateHandlers.CpmToDateTime(trdPartyDateEntry.modify1);
-
-                                    _statCache.Add(file1, fInfo);
-                                }
-
-                                if(!string.IsNullOrEmpty(file2))
-                                {
-                                    if(_statCache.TryGetValue(file2, out fInfo))
-                                        _statCache.Remove(file2);
-                                    else
-                                        fInfo = new FileEntryInfo();
-
-                                    byte[] ctime = new byte[4];
-                                    ctime[0] = trdPartyDateEntry.create2[0];
-                                    ctime[1] = trdPartyDateEntry.create2[1];
-
-                                    fInfo.AccessTime    = DateHandlers.CpmToDateTime(trdPartyDateEntry.access2);
-                                    fInfo.CreationTime  = DateHandlers.CpmToDateTime(ctime);
-                                    fInfo.LastWriteTime = DateHandlers.CpmToDateTime(trdPartyDateEntry.modify2);
-
-                                    _statCache.Add(file2, fInfo);
-                                }
-
-                                if(!string.IsNullOrEmpty(file3))
-                                {
-                                    if(_statCache.TryGetValue(file1, out fInfo))
-                                        _statCache.Remove(file3);
-                                    else
-                                        fInfo = new FileEntryInfo();
-
-                                    byte[] ctime = new byte[4];
-                                    ctime[0] = trdPartyDateEntry.create3[0];
-                                    ctime[1] = trdPartyDateEntry.create3[1];
-
-                                    fInfo.AccessTime    = DateHandlers.CpmToDateTime(trdPartyDateEntry.access3);
-                                    fInfo.CreationTime  = DateHandlers.CpmToDateTime(ctime);
-                                    fInfo.LastWriteTime = DateHandlers.CpmToDateTime(trdPartyDateEntry.modify3);
-
-                                    _statCache.Add(file3, fInfo);
-                                }
-
-                                file1  = null;
-                                file2  = null;
-                                file3  = null;
-                                dirCnt = 0;
-                            }
-
-                            break;
-                    }
-
-            // Cache all files. As CP/M maximum volume size is 8 Mib
-            // this should not be a problem
-            AaruConsole.DebugWriteLine("CP/M Plugin", "Reading files.");
-            long usedBlocks = 0;
-            _fileCache = new Dictionary<string, byte[]>();
-
-            foreach(string filename in _dirList)
+            // A password entry (or a file entry in PDOS, but this does not handle that case)
+            else if((directory[dOff] & 0x7F) >= 0x10 &&
+                    (directory[dOff] & 0x7F) < 0x20)
             {
-                var fileMs = new MemoryStream();
+                PasswordEntry entry = Marshal.ByteArrayToStructureLittleEndian<PasswordEntry>(directory, dOff, 32);
 
-                if(_statCache.TryGetValue(filename, out FileEntryInfo fInfo))
-                    _statCache.Remove(filename);
+                int user = entry.userNumber & 0x0F;
 
-                fInfo.Blocks = 0;
+                for(int i = 0; i < 8; i++)
+                    entry.filename[i] &= 0x7F;
 
-                if(fileExtents.TryGetValue(filename, out Dictionary<int, List<ushort>> extents))
-                    for(int ex = 0; ex < extents.Count; ex++)
-                    {
-                        if(!extents.TryGetValue(ex, out List<ushort> alBlks))
-                            continue;
+                for(int i = 0; i < 3; i++)
+                    entry.extension[i] &= 0x7F;
 
-                        foreach(ushort alBlk in alBlks)
-                        {
-                            allocationBlocks.TryGetValue(alBlk, out byte[] blk);
-                            fileMs.Write(blk, 0, blk.Length);
-                            fInfo.Blocks++;
-                        }
-                    }
+                string filename  = Encoding.ASCII.GetString(entry.filename).Trim();
+                string extension = Encoding.ASCII.GetString(entry.extension).Trim();
 
-                // If you insist to call CP/M "extent based"
-                fInfo.Attributes |= FileAttributes.Extents;
-                fInfo.BlockSize  =  blockSize;
-                fInfo.Length     =  fileMs.Length;
-                _cpmStat.Files++;
-                usedBlocks += fInfo.Blocks;
+                // If user is != 0, append user to name to have identical filenames
+                if(user > 0)
+                    filename = $"{user:X1}:{filename}";
 
-                _statCache.Add(filename, fInfo);
-                _fileCache.Add(filename, fileMs.ToArray());
-            }
+                if(!string.IsNullOrEmpty(extension))
+                    filename = filename + "." + extension;
 
-            _decodedPasswordCache = new Dictionary<string, byte[]>();
+                filename = filename.Replace('/', '\u2215');
 
-            // For each stored password, store a decoded version of it
-            if(_passwordCache.Count > 0)
-                foreach(KeyValuePair<string, byte[]> kvp in _passwordCache)
+                // Do not repeat passwords
+                if(_passwordCache.ContainsKey(filename))
+                    _passwordCache.Remove(filename);
+
+                // Copy whole password entry
+                byte[] tmp = new byte[32];
+                Array.Copy(directory, dOff, tmp, 0, 32);
+                _passwordCache.Add(filename, tmp);
+
+                // Count entries 3 by 3 for timestamps
+                switch(dirCnt % 3)
                 {
-                    byte[] tmp = new byte[8];
-                    Array.Copy(kvp.Value, 16, tmp, 0, 8);
+                    case 0:
+                        file1 = filename;
 
-                    for(int t = 0; t < 8; t++)
-                        tmp[t] ^= kvp.Value[13];
+                        break;
+                    case 1:
+                        file2 = filename;
 
-                    _decodedPasswordCache.Add(kvp.Key, tmp);
+                        break;
+                    case 2:
+                        file3 = filename;
+
+                        break;
                 }
 
-            // Generate statfs.
-            _cpmStat.Blocks         = (ulong)(_dpb.dsm + 1);
-            _cpmStat.FilenameLength = 11;
-            _cpmStat.Files          = (ulong)_fileCache.Count;
-            _cpmStat.FreeBlocks     = _cpmStat.Blocks - (ulong)usedBlocks;
-            _cpmStat.PluginId       = Id;
-            _cpmStat.Type           = "CP/M filesystem";
-
-            // Generate XML info
-            XmlFsType = new FileSystemType
-            {
-                Clusters              = _cpmStat.Blocks,
-                ClusterSize           = (uint)blockSize,
-                Files                 = (ulong)_fileCache.Count,
-                FilesSpecified        = true,
-                FreeClusters          = _cpmStat.FreeBlocks,
-                FreeClustersSpecified = true,
-                Type                  = "CP/M filesystem"
-            };
-
-            if(_labelCreationDate != null)
-            {
-                XmlFsType.CreationDate          = DateHandlers.CpmToDateTime(_labelCreationDate);
-                XmlFsType.CreationDateSpecified = true;
+                dirCnt++;
             }
 
-            if(_labelUpdateDate != null)
+            // Volume label and password entry. Volume password is ignored.
+            else
+                switch(directory[dOff] & 0x7F)
+                {
+                    case 0x20:
+                        LabelEntry labelEntry =
+                            Marshal.ByteArrayToStructureLittleEndian<LabelEntry>(directory, dOff, 32);
+
+                        // The volume label defines if one of the fields in CP/M 3 timestamp is a creation or an
+                        // access time
+                        atime |= (labelEntry.flags & 0x40) == 0x40;
+
+                        _label             = Encoding.ASCII.GetString(directory, dOff + 1, 11).Trim();
+                        _labelCreationDate = new byte[4];
+                        _labelUpdateDate   = new byte[4];
+                        Array.Copy(directory, dOff + 24, _labelCreationDate, 0, 4);
+                        Array.Copy(directory, dOff + 28, _labelUpdateDate, 0, 4);
+
+                        // Count entries 3 by 3 for timestamps
+                        switch(dirCnt % 3)
+                        {
+                            case 0:
+                                file1 = null;
+
+                                break;
+                            case 1:
+                                file2 = null;
+
+                                break;
+                            case 2:
+                                file3 = null;
+
+                                break;
+                        }
+
+                        dirCnt++;
+
+                        break;
+                    case 0x21:
+                        if(directory[dOff + 10] == 0x00 &&
+                           directory[dOff + 20] == 0x00 &&
+                           directory[dOff + 30] == 0x00 &&
+                           directory[dOff + 31] == 0x00)
+                        {
+                            DateEntry dateEntry =
+                                Marshal.ByteArrayToStructureLittleEndian<DateEntry>(directory, dOff, 32);
+
+                            FileEntryInfo fInfo;
+
+                            // Entry contains timestamps for last 3 entries, whatever the kind they are.
+                            if(!string.IsNullOrEmpty(file1))
+                            {
+                                if(_statCache.TryGetValue(file1, out fInfo))
+                                    _statCache.Remove(file1);
+                                else
+                                    fInfo = new FileEntryInfo();
+
+                                if(atime)
+                                    fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date1);
+                                else
+                                    fInfo.CreationTime = DateHandlers.CpmToDateTime(dateEntry.date1);
+
+                                fInfo.LastWriteTime = DateHandlers.CpmToDateTime(dateEntry.date2);
+
+                                _statCache.Add(file1, fInfo);
+                            }
+
+                            if(!string.IsNullOrEmpty(file2))
+                            {
+                                if(_statCache.TryGetValue(file2, out fInfo))
+                                    _statCache.Remove(file2);
+                                else
+                                    fInfo = new FileEntryInfo();
+
+                                if(atime)
+                                    fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date3);
+                                else
+                                    fInfo.CreationTime = DateHandlers.CpmToDateTime(dateEntry.date3);
+
+                                fInfo.LastWriteTime = DateHandlers.CpmToDateTime(dateEntry.date4);
+
+                                _statCache.Add(file2, fInfo);
+                            }
+
+                            if(!string.IsNullOrEmpty(file3))
+                            {
+                                if(_statCache.TryGetValue(file3, out fInfo))
+                                    _statCache.Remove(file3);
+                                else
+                                    fInfo = new FileEntryInfo();
+
+                                if(atime)
+                                    fInfo.AccessTime = DateHandlers.CpmToDateTime(dateEntry.date5);
+                                else
+                                    fInfo.CreationTime = DateHandlers.CpmToDateTime(dateEntry.date5);
+
+                                fInfo.LastWriteTime = DateHandlers.CpmToDateTime(dateEntry.date6);
+
+                                _statCache.Add(file3, fInfo);
+                            }
+
+                            file1  = null;
+                            file2  = null;
+                            file3  = null;
+                            dirCnt = 0;
+                        }
+
+                        // However, if this byte is 0, timestamp is in Z80DOS or DOS+ format
+                        else if(directory[dOff + 1] == 0x00)
+                        {
+                            TrdPartyDateEntry trdPartyDateEntry =
+                                Marshal.ByteArrayToStructureLittleEndian<TrdPartyDateEntry>(directory, dOff, 32);
+
+                            FileEntryInfo fInfo;
+
+                            // Entry contains timestamps for last 3 entries, whatever the kind they are.
+                            if(!string.IsNullOrEmpty(file1))
+                            {
+                                if(_statCache.TryGetValue(file1, out fInfo))
+                                    _statCache.Remove(file1);
+                                else
+                                    fInfo = new FileEntryInfo();
+
+                                byte[] ctime = new byte[4];
+                                ctime[0] = trdPartyDateEntry.create1[0];
+                                ctime[1] = trdPartyDateEntry.create1[1];
+
+                                fInfo.AccessTime    = DateHandlers.CpmToDateTime(trdPartyDateEntry.access1);
+                                fInfo.CreationTime  = DateHandlers.CpmToDateTime(ctime);
+                                fInfo.LastWriteTime = DateHandlers.CpmToDateTime(trdPartyDateEntry.modify1);
+
+                                _statCache.Add(file1, fInfo);
+                            }
+
+                            if(!string.IsNullOrEmpty(file2))
+                            {
+                                if(_statCache.TryGetValue(file2, out fInfo))
+                                    _statCache.Remove(file2);
+                                else
+                                    fInfo = new FileEntryInfo();
+
+                                byte[] ctime = new byte[4];
+                                ctime[0] = trdPartyDateEntry.create2[0];
+                                ctime[1] = trdPartyDateEntry.create2[1];
+
+                                fInfo.AccessTime    = DateHandlers.CpmToDateTime(trdPartyDateEntry.access2);
+                                fInfo.CreationTime  = DateHandlers.CpmToDateTime(ctime);
+                                fInfo.LastWriteTime = DateHandlers.CpmToDateTime(trdPartyDateEntry.modify2);
+
+                                _statCache.Add(file2, fInfo);
+                            }
+
+                            if(!string.IsNullOrEmpty(file3))
+                            {
+                                if(_statCache.TryGetValue(file1, out fInfo))
+                                    _statCache.Remove(file3);
+                                else
+                                    fInfo = new FileEntryInfo();
+
+                                byte[] ctime = new byte[4];
+                                ctime[0] = trdPartyDateEntry.create3[0];
+                                ctime[1] = trdPartyDateEntry.create3[1];
+
+                                fInfo.AccessTime    = DateHandlers.CpmToDateTime(trdPartyDateEntry.access3);
+                                fInfo.CreationTime  = DateHandlers.CpmToDateTime(ctime);
+                                fInfo.LastWriteTime = DateHandlers.CpmToDateTime(trdPartyDateEntry.modify3);
+
+                                _statCache.Add(file3, fInfo);
+                            }
+
+                            file1  = null;
+                            file2  = null;
+                            file3  = null;
+                            dirCnt = 0;
+                        }
+
+                        break;
+                }
+
+        // Cache all files. As CP/M maximum volume size is 8 Mib
+        // this should not be a problem
+        AaruConsole.DebugWriteLine("CP/M Plugin", "Reading files.");
+        long usedBlocks = 0;
+        _fileCache = new Dictionary<string, byte[]>();
+
+        foreach(string filename in _dirList)
+        {
+            var fileMs = new MemoryStream();
+
+            if(_statCache.TryGetValue(filename, out FileEntryInfo fInfo))
+                _statCache.Remove(filename);
+
+            fInfo.Blocks = 0;
+
+            if(fileExtents.TryGetValue(filename, out Dictionary<int, List<ushort>> extents))
+                for(int ex = 0; ex < extents.Count; ex++)
+                {
+                    if(!extents.TryGetValue(ex, out List<ushort> alBlks))
+                        continue;
+
+                    foreach(ushort alBlk in alBlks)
+                    {
+                        allocationBlocks.TryGetValue(alBlk, out byte[] blk);
+                        fileMs.Write(blk, 0, blk.Length);
+                        fInfo.Blocks++;
+                    }
+                }
+
+            // If you insist to call CP/M "extent based"
+            fInfo.Attributes |= FileAttributes.Extents;
+            fInfo.BlockSize  =  blockSize;
+            fInfo.Length     =  fileMs.Length;
+            _cpmStat.Files++;
+            usedBlocks += fInfo.Blocks;
+
+            _statCache.Add(filename, fInfo);
+            _fileCache.Add(filename, fileMs.ToArray());
+        }
+
+        _decodedPasswordCache = new Dictionary<string, byte[]>();
+
+        // For each stored password, store a decoded version of it
+        if(_passwordCache.Count > 0)
+            foreach(KeyValuePair<string, byte[]> kvp in _passwordCache)
             {
-                XmlFsType.ModificationDate          = DateHandlers.CpmToDateTime(_labelUpdateDate);
-                XmlFsType.ModificationDateSpecified = true;
+                byte[] tmp = new byte[8];
+                Array.Copy(kvp.Value, 16, tmp, 0, 8);
+
+                for(int t = 0; t < 8; t++)
+                    tmp[t] ^= kvp.Value[13];
+
+                _decodedPasswordCache.Add(kvp.Key, tmp);
             }
 
-            if(!string.IsNullOrEmpty(_label))
-                XmlFsType.VolumeName = _label;
+        // Generate statfs.
+        _cpmStat.Blocks         = (ulong)(_dpb.dsm + 1);
+        _cpmStat.FilenameLength = 11;
+        _cpmStat.Files          = (ulong)_fileCache.Count;
+        _cpmStat.FreeBlocks     = _cpmStat.Blocks - (ulong)usedBlocks;
+        _cpmStat.PluginId       = Id;
+        _cpmStat.Type           = "CP/M filesystem";
 
-            _mounted = true;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber StatFs(out FileSystemInfo stat)
+        // Generate XML info
+        XmlFsType = new FileSystemType
         {
-            stat = null;
+            Clusters              = _cpmStat.Blocks,
+            ClusterSize           = (uint)blockSize,
+            Files                 = (ulong)_fileCache.Count,
+            FilesSpecified        = true,
+            FreeClusters          = _cpmStat.FreeBlocks,
+            FreeClustersSpecified = true,
+            Type                  = "CP/M filesystem"
+        };
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            stat = _cpmStat;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Unmount()
+        if(_labelCreationDate != null)
         {
-            _mounted              = false;
-            _definitions          = null;
-            _cpmFound             = false;
-            _workingDefinition    = null;
-            _dpb                  = null;
-            _sectorMask           = null;
-            _label                = null;
-            _thirdPartyTimestamps = false;
-            _standardTimestamps   = false;
-            _labelCreationDate    = null;
-            _labelUpdateDate      = null;
-
-            return ErrorNumber.NoError;
+            XmlFsType.CreationDate          = DateHandlers.CpmToDateTime(_labelCreationDate);
+            XmlFsType.CreationDateSpecified = true;
         }
+
+        if(_labelUpdateDate != null)
+        {
+            XmlFsType.ModificationDate          = DateHandlers.CpmToDateTime(_labelUpdateDate);
+            XmlFsType.ModificationDateSpecified = true;
+        }
+
+        if(!string.IsNullOrEmpty(_label))
+            XmlFsType.VolumeName = _label;
+
+        _mounted = true;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber StatFs(out FileSystemInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        stat = _cpmStat;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Unmount()
+    {
+        _mounted              = false;
+        _definitions          = null;
+        _cpmFound             = false;
+        _workingDefinition    = null;
+        _dpb                  = null;
+        _sectorMask           = null;
+        _label                = null;
+        _thirdPartyTimestamps = false;
+        _standardTimestamps   = false;
+        _labelCreationDate    = null;
+        _labelUpdateDate      = null;
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/CPM/Xattr.cs b/Aaru.Filesystems/CPM/Xattr.cs
index 778fce6fa..2ee64a82f 100644
--- a/Aaru.Filesystems/CPM/Xattr.cs
+++ b/Aaru.Filesystems/CPM/Xattr.cs
@@ -34,66 +34,65 @@ using System;
 using System.Collections.Generic;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class CPM
 {
-    public sealed partial class CPM
+    /// <inheritdoc />
+    public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
     {
-        /// <inheritdoc />
-        public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
+        if(!_fileCache.ContainsKey(pathElements[0].ToUpperInvariant()))
+            return ErrorNumber.NoSuchFile;
 
-            if(!_fileCache.ContainsKey(pathElements[0].ToUpperInvariant()))
-                return ErrorNumber.NoSuchFile;
+        if(string.Compare(xattr, "com.caldera.cpm.password", StringComparison.InvariantCulture) == 0)
+            if(!_passwordCache.TryGetValue(pathElements[0].ToUpperInvariant(), out buf))
+                return ErrorNumber.NoError;
 
-            if(string.Compare(xattr, "com.caldera.cpm.password", StringComparison.InvariantCulture) == 0)
-                if(!_passwordCache.TryGetValue(pathElements[0].ToUpperInvariant(), out buf))
-                    return ErrorNumber.NoError;
+        if(string.Compare(xattr, "com.caldera.cpm.password.text", StringComparison.InvariantCulture) != 0)
+            return ErrorNumber.NoSuchExtendedAttribute;
 
-            if(string.Compare(xattr, "com.caldera.cpm.password.text", StringComparison.InvariantCulture) != 0)
-                return ErrorNumber.NoSuchExtendedAttribute;
+        return !_passwordCache.TryGetValue(pathElements[0].ToUpperInvariant(), out buf) ? ErrorNumber.NoError
+                   : ErrorNumber.NoSuchExtendedAttribute;
+    }
 
-            return !_passwordCache.TryGetValue(pathElements[0].ToUpperInvariant(), out buf) ? ErrorNumber.NoError
-                       : ErrorNumber.NoSuchExtendedAttribute;
-        }
+    /// <inheritdoc />
+    public ErrorNumber ListXAttr(string path, out List<string> xattrs)
+    {
+        xattrs = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ListXAttr(string path, out List<string> xattrs)
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            xattrs = null;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        if(!_fileCache.ContainsKey(pathElements[0].ToUpperInvariant()))
+            return ErrorNumber.NoSuchFile;
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
+        xattrs = new List<string>();
 
-            if(!_fileCache.ContainsKey(pathElements[0].ToUpperInvariant()))
-                return ErrorNumber.NoSuchFile;
+        if(_passwordCache.ContainsKey(pathElements[0].ToUpperInvariant()))
+            xattrs.Add("com.caldera.cpm.password");
 
-            xattrs = new List<string>();
+        if(_decodedPasswordCache.ContainsKey(pathElements[0].ToUpperInvariant()))
+            xattrs.Add("com.caldera.cpm.password.text");
 
-            if(_passwordCache.ContainsKey(pathElements[0].ToUpperInvariant()))
-                xattrs.Add("com.caldera.cpm.password");
-
-            if(_decodedPasswordCache.ContainsKey(pathElements[0].ToUpperInvariant()))
-                xattrs.Add("com.caldera.cpm.password.text");
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Cram.cs b/Aaru.Filesystems/Cram.cs
index c714ddbab..14665e274 100644
--- a/Aaru.Filesystems/Cram.cs
+++ b/Aaru.Filesystems/Cram.cs
@@ -43,118 +43,117 @@ using Marshal = Aaru.Helpers.Marshal;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the CRAM filesystem</summary>
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed class Cram : IFilesystem
 {
+    /// <summary>Identifier for Cram</summary>
+    const uint CRAM_MAGIC = 0x28CD3D45;
+    const uint CRAM_CIGAM = 0x453DCD28;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the CRAM filesystem</summary>
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed class Cram : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Cram filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("F8F6E46F-7A2A-48E3-9C0A-46AF4DC29E09");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>Identifier for Cram</summary>
-        const uint CRAM_MAGIC = 0x28CD3D45;
-        const uint CRAM_CIGAM = 0x453DCD28;
+        if(partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Cram filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("F8F6E46F-7A2A-48E3-9C0A-46AF4DC29E09");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        uint magic = BitConverter.ToUInt32(sector, 0x00);
+
+        return magic == CRAM_MAGIC || magic == CRAM_CIGAM;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        uint magic = BitConverter.ToUInt32(sector, 0x00);
+
+        var  crSb         = new SuperBlock();
+        bool littleEndian = true;
+
+        switch(magic)
         {
-            if(partition.Start >= partition.End)
-                return false;
+            case CRAM_MAGIC:
+                crSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
 
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+                break;
+            case CRAM_CIGAM:
+                crSb         = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sector);
+                littleEndian = false;
 
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            uint magic = BitConverter.ToUInt32(sector, 0x00);
-
-            return magic == CRAM_MAGIC || magic == CRAM_CIGAM;
+                break;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        var sbInformation = new StringBuilder();
+
+        sbInformation.AppendLine("Cram file system");
+        sbInformation.AppendLine(littleEndian ? "Little-endian" : "Big-endian");
+        sbInformation.AppendFormat("Volume edition {0}", crSb.edition).AppendLine();
+        sbInformation.AppendFormat("Volume name: {0}", StringHandlers.CToString(crSb.name, Encoding)).AppendLine();
+        sbInformation.AppendFormat("Volume has {0} bytes", crSb.size).AppendLine();
+        sbInformation.AppendFormat("Volume has {0} blocks", crSb.blocks).AppendLine();
+        sbInformation.AppendFormat("Volume has {0} files", crSb.files).AppendLine();
+
+        information = sbInformation.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+            VolumeName            = StringHandlers.CToString(crSb.name, Encoding),
+            Type                  = "Cram file system",
+            Clusters              = crSb.blocks,
+            Files                 = crSb.files,
+            FilesSpecified        = true,
+            FreeClusters          = 0,
+            FreeClustersSpecified = true
+        };
+    }
 
-            if(errno != ErrorNumber.NoError)
-                return;
+    enum CramCompression : ushort
+    {
+        Zlib = 1, Lzma = 2, Lzo = 3,
+        Xz   = 4, Lz4  = 5
+    }
 
-            uint magic = BitConverter.ToUInt32(sector, 0x00);
-
-            var  crSb         = new SuperBlock();
-            bool littleEndian = true;
-
-            switch(magic)
-            {
-                case CRAM_MAGIC:
-                    crSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
-
-                    break;
-                case CRAM_CIGAM:
-                    crSb         = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sector);
-                    littleEndian = false;
-
-                    break;
-            }
-
-            var sbInformation = new StringBuilder();
-
-            sbInformation.AppendLine("Cram file system");
-            sbInformation.AppendLine(littleEndian ? "Little-endian" : "Big-endian");
-            sbInformation.AppendFormat("Volume edition {0}", crSb.edition).AppendLine();
-            sbInformation.AppendFormat("Volume name: {0}", StringHandlers.CToString(crSb.name, Encoding)).AppendLine();
-            sbInformation.AppendFormat("Volume has {0} bytes", crSb.size).AppendLine();
-            sbInformation.AppendFormat("Volume has {0} blocks", crSb.blocks).AppendLine();
-            sbInformation.AppendFormat("Volume has {0} files", crSb.files).AppendLine();
-
-            information = sbInformation.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                VolumeName            = StringHandlers.CToString(crSb.name, Encoding),
-                Type                  = "Cram file system",
-                Clusters              = crSb.blocks,
-                Files                 = crSb.files,
-                FilesSpecified        = true,
-                FreeClusters          = 0,
-                FreeClustersSpecified = true
-            };
-        }
-
-        enum CramCompression : ushort
-        {
-            Zlib = 1, Lzma = 2, Lzo = 3,
-            Xz   = 4, Lz4  = 5
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            public readonly uint magic;
-            public readonly uint size;
-            public readonly uint flags;
-            public readonly uint future;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] signature;
-            public readonly uint crc;
-            public readonly uint edition;
-            public readonly uint blocks;
-            public readonly uint files;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] name;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        public readonly uint magic;
+        public readonly uint size;
+        public readonly uint flags;
+        public readonly uint future;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] signature;
+        public readonly uint crc;
+        public readonly uint edition;
+        public readonly uint blocks;
+        public readonly uint files;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] name;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ECMA67.cs b/Aaru.Filesystems/ECMA67.cs
index 53cd902ba..ee1ce94b7 100644
--- a/Aaru.Filesystems/ECMA67.cs
+++ b/Aaru.Filesystems/ECMA67.cs
@@ -40,106 +40,105 @@ using Aaru.CommonTypes.Interfaces;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the filesystem described in ECMA-67</summary>
+public sealed class ECMA67 : IFilesystem
 {
-    /// <inheritdoc />
-    /// <summary>Implements detection of the filesystem described in ECMA-67</summary>
-    public sealed class ECMA67 : IFilesystem
+    readonly byte[] _magic =
     {
-        readonly byte[] _magic =
+        0x56, 0x4F, 0x4C
+    };
+
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "ECMA-67";
+    /// <inheritdoc />
+    public Guid Id => new("62A2D44A-CBC1-4377-B4B6-28C5C92034A1");
+    /// <inheritdoc />
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
+    {
+        if(partition.Start > 0)
+            return false;
+
+        if(partition.End < 8)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(6, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(sector.Length != 128)
+            return false;
+
+        VolumeLabel vol = Marshal.ByteArrayToStructureLittleEndian<VolumeLabel>(sector);
+
+        return _magic.SequenceEqual(vol.labelIdentifier) && vol.labelNumber == 1 && vol.recordLength == 0x31;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-1");
+        information = "";
+        ErrorNumber errno = imagePlugin.ReadSector(6, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        var sbInformation = new StringBuilder();
+
+        VolumeLabel vol = Marshal.ByteArrayToStructureLittleEndian<VolumeLabel>(sector);
+
+        sbInformation.AppendLine("ECMA-67");
+
+        sbInformation.AppendFormat("Volume name: {0}", Encoding.ASCII.GetString(vol.volumeIdentifier)).AppendLine();
+        sbInformation.AppendFormat("Volume owner: {0}", Encoding.ASCII.GetString(vol.owner)).AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            0x56, 0x4F, 0x4C
+            Type        = "ECMA-67",
+            ClusterSize = 256,
+            Clusters    = partition.End - partition.Start + 1,
+            VolumeName  = Encoding.ASCII.GetString(vol.volumeIdentifier)
         };
 
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "ECMA-67";
-        /// <inheritdoc />
-        public Guid Id => new("62A2D44A-CBC1-4377-B4B6-28C5C92034A1");
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        information = sbInformation.ToString();
+    }
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            if(partition.Start > 0)
-                return false;
-
-            if(partition.End < 8)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(6, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(sector.Length != 128)
-                return false;
-
-            VolumeLabel vol = Marshal.ByteArrayToStructureLittleEndian<VolumeLabel>(sector);
-
-            return _magic.SequenceEqual(vol.labelIdentifier) && vol.labelNumber == 1 && vol.recordLength == 0x31;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-1");
-            information = "";
-            ErrorNumber errno = imagePlugin.ReadSector(6, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            var sbInformation = new StringBuilder();
-
-            VolumeLabel vol = Marshal.ByteArrayToStructureLittleEndian<VolumeLabel>(sector);
-
-            sbInformation.AppendLine("ECMA-67");
-
-            sbInformation.AppendFormat("Volume name: {0}", Encoding.ASCII.GetString(vol.volumeIdentifier)).AppendLine();
-            sbInformation.AppendFormat("Volume owner: {0}", Encoding.ASCII.GetString(vol.owner)).AppendLine();
-
-            XmlFsType = new FileSystemType
-            {
-                Type        = "ECMA-67",
-                ClusterSize = 256,
-                Clusters    = partition.End - partition.Start + 1,
-                VolumeName  = Encoding.ASCII.GetString(vol.volumeIdentifier)
-            };
-
-            information = sbInformation.ToString();
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct VolumeLabel
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] labelIdentifier;
-            public readonly byte labelNumber;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] volumeIdentifier;
-            public readonly byte volumeAccessibility;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 26)]
-            public readonly byte[] reserved1;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public readonly byte[] owner;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] reserved2;
-            public readonly byte surface;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] reserved3;
-            public readonly byte recordLength;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] reserved4;
-            public readonly byte fileLabelAllocation;
-            public readonly byte labelStandardVersion;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 48)]
-            public readonly byte[] reserved5;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct VolumeLabel
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] labelIdentifier;
+        public readonly byte labelNumber;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] volumeIdentifier;
+        public readonly byte volumeAccessibility;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 26)]
+        public readonly byte[] reserved1;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
+        public readonly byte[] owner;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] reserved2;
+        public readonly byte surface;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] reserved3;
+        public readonly byte recordLength;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] reserved4;
+        public readonly byte fileLabelAllocation;
+        public readonly byte labelStandardVersion;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 48)]
+        public readonly byte[] reserved5;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/EFS.cs b/Aaru.Filesystems/EFS.cs
index dfa8f2a1c..781ab8d38 100644
--- a/Aaru.Filesystems/EFS.cs
+++ b/Aaru.Filesystems/EFS.cs
@@ -42,243 +42,242 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements identification for the SGI Extent FileSystem</summary>
+public sealed class EFS : IFilesystem
 {
+    const uint EFS_MAGIC     = 0x00072959;
+    const uint EFS_MAGIC_NEW = 0x0007295A;
+
     /// <inheritdoc />
-    /// <summary>Implements identification for the SGI Extent FileSystem</summary>
-    public sealed class EFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Extent File System Plugin";
+    /// <inheritdoc />
+    public Guid Id => new Guid("52A43F90-9AF3-4391-ADFE-65598DEEABAB");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint EFS_MAGIC     = 0x00072959;
-        const uint EFS_MAGIC_NEW = 0x0007295A;
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Extent File System Plugin";
-        /// <inheritdoc />
-        public Guid Id => new Guid("52A43F90-9AF3-4391-ADFE-65598DEEABAB");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        // Misaligned
+        if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
         {
-            if(imagePlugin.Info.SectorSize < 512)
+            uint sbSize = (uint)((Marshal.SizeOf<Superblock>() + 0x200) / imagePlugin.Info.SectorSize);
+
+            if((Marshal.SizeOf<Superblock>() + 0x200) % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            var errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+            if(errno != ErrorNumber.NoError) return false;
+
+            if(sector.Length < Marshal.SizeOf<Superblock>())
                 return false;
 
-            // Misaligned
-            if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
-            {
-                uint sbSize = (uint)((Marshal.SizeOf<Superblock>() + 0x200) / imagePlugin.Info.SectorSize);
+            byte[] sbpiece = new byte[Marshal.SizeOf<Superblock>()];
 
-                if((Marshal.SizeOf<Superblock>() + 0x200) % imagePlugin.Info.SectorSize != 0)
-                    sbSize++;
+            Array.Copy(sector, 0x200, sbpiece, 0, Marshal.SizeOf<Superblock>());
 
-                var errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
-                if(errno != ErrorNumber.NoError) return false;
+            Superblock sb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
 
-                if(sector.Length < Marshal.SizeOf<Superblock>())
-                    return false;
+            AaruConsole.DebugWriteLine("EFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})",
+                                       0x200, sb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
 
-                byte[] sbpiece = new byte[Marshal.SizeOf<Superblock>()];
+            if(sb.sb_magic == EFS_MAGIC ||
+               sb.sb_magic == EFS_MAGIC_NEW)
+                return true;
+        }
+        else
+        {
+            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
 
-                Array.Copy(sector, 0x200, sbpiece, 0, Marshal.SizeOf<Superblock>());
+            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
 
-                Superblock sb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
+            var errno = imagePlugin.ReadSectors(partition.Start + 1, sbSize, out byte[] sector);
+            if(errno != ErrorNumber.NoError) return false;
 
-                AaruConsole.DebugWriteLine("EFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})",
-                                           0x200, sb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
+            if(sector.Length < Marshal.SizeOf<Superblock>())
+                return false;
 
-                if(sb.sb_magic == EFS_MAGIC ||
-                   sb.sb_magic == EFS_MAGIC_NEW)
-                    return true;
-            }
-            else
-            {
-                uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+            Superblock sb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
 
-                if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                    sbSize++;
+            AaruConsole.DebugWriteLine("EFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})", 1,
+                                       sb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
 
-                var errno = imagePlugin.ReadSectors(partition.Start + 1, sbSize, out byte[] sector);
-                if(errno != ErrorNumber.NoError) return false;
-
-                if(sector.Length < Marshal.SizeOf<Superblock>())
-                    return false;
-
-                Superblock sb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
-
-                AaruConsole.DebugWriteLine("EFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})", 1,
-                                           sb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
-
-                if(sb.sb_magic == EFS_MAGIC ||
-                   sb.sb_magic == EFS_MAGIC_NEW)
-                    return true;
-            }
-
-            return false;
+            if(sb.sb_magic == EFS_MAGIC ||
+               sb.sb_magic == EFS_MAGIC_NEW)
+                return true;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
+        return false;
+    }
 
-            if(imagePlugin.Info.SectorSize < 512)
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        Superblock efsSb;
+
+        // Misaligned
+        if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+        {
+            uint sbSize = (uint)((Marshal.SizeOf<Superblock>() + 0x400) / imagePlugin.Info.SectorSize);
+
+            if((Marshal.SizeOf<Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            var errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+            if(errno != ErrorNumber.NoError) return;
+
+            if(sector.Length < Marshal.SizeOf<Superblock>())
                 return;
 
-            Superblock efsSb;
+            byte[] sbpiece = new byte[Marshal.SizeOf<Superblock>()];
 
-            // Misaligned
-            if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
-            {
-                uint sbSize = (uint)((Marshal.SizeOf<Superblock>() + 0x400) / imagePlugin.Info.SectorSize);
+            Array.Copy(sector, 0x200, sbpiece, 0, Marshal.SizeOf<Superblock>());
 
-                if((Marshal.SizeOf<Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0)
-                    sbSize++;
+            efsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
 
-                var errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
-                if(errno != ErrorNumber.NoError) return;
+            AaruConsole.DebugWriteLine("EFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})",
+                                       0x200, efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
+        }
+        else
+        {
+            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
 
-                if(sector.Length < Marshal.SizeOf<Superblock>())
-                    return;
+            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
 
-                byte[] sbpiece = new byte[Marshal.SizeOf<Superblock>()];
+            var errno = imagePlugin.ReadSectors(partition.Start + 1, sbSize, out byte[] sector);
+            if(errno != ErrorNumber.NoError) return;
 
-                Array.Copy(sector, 0x200, sbpiece, 0, Marshal.SizeOf<Superblock>());
-
-                efsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
-
-                AaruConsole.DebugWriteLine("EFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})",
-                                           0x200, efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
-            }
-            else
-            {
-                uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
-
-                if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                    sbSize++;
-
-                var errno = imagePlugin.ReadSectors(partition.Start + 1, sbSize, out byte[] sector);
-                if(errno != ErrorNumber.NoError) return;
-
-                if(sector.Length < Marshal.SizeOf<Superblock>())
-                    return;
-
-                efsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
-
-                AaruConsole.DebugWriteLine("EFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})", 1,
-                                           efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
-            }
-
-            if(efsSb.sb_magic != EFS_MAGIC &&
-               efsSb.sb_magic != EFS_MAGIC_NEW)
+            if(sector.Length < Marshal.SizeOf<Superblock>())
                 return;
 
-            var sb = new StringBuilder();
+            efsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
 
-            sb.AppendLine("SGI extent filesystem");
-
-            if(efsSb.sb_magic == EFS_MAGIC_NEW)
-                sb.AppendLine("New version");
-
-            sb.AppendFormat("Filesystem size: {0} basic blocks", efsSb.sb_size).AppendLine();
-            sb.AppendFormat("First cylinder group starts at block {0}", efsSb.sb_firstcg).AppendLine();
-            sb.AppendFormat("Cylinder group size: {0} basic blocks", efsSb.sb_cgfsize).AppendLine();
-            sb.AppendFormat("{0} inodes per cylinder group", efsSb.sb_cgisize).AppendLine();
-            sb.AppendFormat("{0} sectors per track", efsSb.sb_sectors).AppendLine();
-            sb.AppendFormat("{0} heads per cylinder", efsSb.sb_heads).AppendLine();
-            sb.AppendFormat("{0} cylinder groups", efsSb.sb_ncg).AppendLine();
-            sb.AppendFormat("Volume created on {0}", DateHandlers.UnixToDateTime(efsSb.sb_time)).AppendLine();
-            sb.AppendFormat("{0} bytes on bitmap", efsSb.sb_bmsize).AppendLine();
-            sb.AppendFormat("{0} free blocks", efsSb.sb_tfree).AppendLine();
-            sb.AppendFormat("{0} free inodes", efsSb.sb_tinode).AppendLine();
-
-            if(efsSb.sb_bmblock > 0)
-                sb.AppendFormat("Bitmap resides at block {0}", efsSb.sb_bmblock).AppendLine();
-
-            if(efsSb.sb_replsb > 0)
-                sb.AppendFormat("Replacement superblock resides at block {0}", efsSb.sb_replsb).AppendLine();
-
-            if(efsSb.sb_lastinode > 0)
-                sb.AppendFormat("Last inode allocated: {0}", efsSb.sb_lastinode).AppendLine();
-
-            if(efsSb.sb_dirty > 0)
-                sb.AppendLine("Volume is dirty");
-
-            sb.AppendFormat("Checksum: 0x{0:X8}", efsSb.sb_checksum).AppendLine();
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(efsSb.sb_fname, Encoding)).AppendLine();
-            sb.AppendFormat("Volume pack: {0}", StringHandlers.CToString(efsSb.sb_fpack, Encoding)).AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type                  = "Extent File System",
-                ClusterSize           = 512,
-                Clusters              = (ulong)efsSb.sb_size,
-                FreeClusters          = (ulong)efsSb.sb_tfree,
-                FreeClustersSpecified = true,
-                Dirty                 = efsSb.sb_dirty > 0,
-                VolumeName            = StringHandlers.CToString(efsSb.sb_fname, Encoding),
-                VolumeSerial          = $"{efsSb.sb_checksum:X8}",
-                CreationDate          = DateHandlers.UnixToDateTime(efsSb.sb_time),
-                CreationDateSpecified = true
-            };
+            AaruConsole.DebugWriteLine("EFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8} or 0x{3:X8})", 1,
+                                       efsSb.sb_magic, EFS_MAGIC, EFS_MAGIC_NEW);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
-        readonly struct Superblock
+        if(efsSb.sb_magic != EFS_MAGIC &&
+           efsSb.sb_magic != EFS_MAGIC_NEW)
+            return;
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("SGI extent filesystem");
+
+        if(efsSb.sb_magic == EFS_MAGIC_NEW)
+            sb.AppendLine("New version");
+
+        sb.AppendFormat("Filesystem size: {0} basic blocks", efsSb.sb_size).AppendLine();
+        sb.AppendFormat("First cylinder group starts at block {0}", efsSb.sb_firstcg).AppendLine();
+        sb.AppendFormat("Cylinder group size: {0} basic blocks", efsSb.sb_cgfsize).AppendLine();
+        sb.AppendFormat("{0} inodes per cylinder group", efsSb.sb_cgisize).AppendLine();
+        sb.AppendFormat("{0} sectors per track", efsSb.sb_sectors).AppendLine();
+        sb.AppendFormat("{0} heads per cylinder", efsSb.sb_heads).AppendLine();
+        sb.AppendFormat("{0} cylinder groups", efsSb.sb_ncg).AppendLine();
+        sb.AppendFormat("Volume created on {0}", DateHandlers.UnixToDateTime(efsSb.sb_time)).AppendLine();
+        sb.AppendFormat("{0} bytes on bitmap", efsSb.sb_bmsize).AppendLine();
+        sb.AppendFormat("{0} free blocks", efsSb.sb_tfree).AppendLine();
+        sb.AppendFormat("{0} free inodes", efsSb.sb_tinode).AppendLine();
+
+        if(efsSb.sb_bmblock > 0)
+            sb.AppendFormat("Bitmap resides at block {0}", efsSb.sb_bmblock).AppendLine();
+
+        if(efsSb.sb_replsb > 0)
+            sb.AppendFormat("Replacement superblock resides at block {0}", efsSb.sb_replsb).AppendLine();
+
+        if(efsSb.sb_lastinode > 0)
+            sb.AppendFormat("Last inode allocated: {0}", efsSb.sb_lastinode).AppendLine();
+
+        if(efsSb.sb_dirty > 0)
+            sb.AppendLine("Volume is dirty");
+
+        sb.AppendFormat("Checksum: 0x{0:X8}", efsSb.sb_checksum).AppendLine();
+        sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(efsSb.sb_fname, Encoding)).AppendLine();
+        sb.AppendFormat("Volume pack: {0}", StringHandlers.CToString(efsSb.sb_fpack, Encoding)).AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            /* 0:   fs size incl. bb 0 (in bb) */
-            public readonly int sb_size;
-            /* 4:   first cg offset (in bb) */
-            public readonly int sb_firstcg;
-            /* 8:   cg size (in bb) */
-            public readonly int sb_cgfsize;
-            /* 12:  inodes/cg (in bb) */
-            public readonly short sb_cgisize;
-            /* 14:  geom: sectors/track */
-            public readonly short sb_sectors;
-            /* 16:  geom: heads/cylinder (unused) */
-            public readonly short sb_heads;
-            /* 18:  num of cg's in the filesystem */
-            public readonly short sb_ncg;
-            /* 20:  non-0 indicates fsck required */
-            public readonly short sb_dirty;
-            /* 22:  */
-            public readonly short sb_pad0;
-            /* 24:  superblock ctime */
-            public readonly int sb_time;
-            /* 28:  magic [0] */
-            public readonly uint sb_magic;
-            /* 32:  name of filesystem */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] sb_fname;
-            /* 38:  name of filesystem pack */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] sb_fpack;
-            /* 44:  bitmap size (in bytes) */
-            public readonly int sb_bmsize;
-            /* 48:  total free data blocks */
-            public readonly int sb_tfree;
-            /* 52:  total free inodes */
-            public readonly int sb_tinode;
-            /* 56:  bitmap offset (grown fs) */
-            public readonly int sb_bmblock;
-            /* 62:  repl. superblock offset */
-            public readonly int sb_replsb;
-            /* 64:  last allocated inode */
-            public readonly int sb_lastinode;
-            /* 68:  unused */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] sb_spare;
-            /* 88:  checksum (all above) */
-            public readonly uint sb_checksum;
-        }
+            Type                  = "Extent File System",
+            ClusterSize           = 512,
+            Clusters              = (ulong)efsSb.sb_size,
+            FreeClusters          = (ulong)efsSb.sb_tfree,
+            FreeClustersSpecified = true,
+            Dirty                 = efsSb.sb_dirty > 0,
+            VolumeName            = StringHandlers.CToString(efsSb.sb_fname, Encoding),
+            VolumeSerial          = $"{efsSb.sb_checksum:X8}",
+            CreationDate          = DateHandlers.UnixToDateTime(efsSb.sb_time),
+            CreationDateSpecified = true
+        };
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
+    readonly struct Superblock
+    {
+        /* 0:   fs size incl. bb 0 (in bb) */
+        public readonly int sb_size;
+        /* 4:   first cg offset (in bb) */
+        public readonly int sb_firstcg;
+        /* 8:   cg size (in bb) */
+        public readonly int sb_cgfsize;
+        /* 12:  inodes/cg (in bb) */
+        public readonly short sb_cgisize;
+        /* 14:  geom: sectors/track */
+        public readonly short sb_sectors;
+        /* 16:  geom: heads/cylinder (unused) */
+        public readonly short sb_heads;
+        /* 18:  num of cg's in the filesystem */
+        public readonly short sb_ncg;
+        /* 20:  non-0 indicates fsck required */
+        public readonly short sb_dirty;
+        /* 22:  */
+        public readonly short sb_pad0;
+        /* 24:  superblock ctime */
+        public readonly int sb_time;
+        /* 28:  magic [0] */
+        public readonly uint sb_magic;
+        /* 32:  name of filesystem */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] sb_fname;
+        /* 38:  name of filesystem pack */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] sb_fpack;
+        /* 44:  bitmap size (in bytes) */
+        public readonly int sb_bmsize;
+        /* 48:  total free data blocks */
+        public readonly int sb_tfree;
+        /* 52:  total free inodes */
+        public readonly int sb_tinode;
+        /* 56:  bitmap offset (grown fs) */
+        public readonly int sb_bmblock;
+        /* 62:  repl. superblock offset */
+        public readonly int sb_replsb;
+        /* 64:  last allocated inode */
+        public readonly int sb_lastinode;
+        /* 68:  unused */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] sb_spare;
+        /* 88:  checksum (all above) */
+        public readonly uint sb_checksum;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/F2FS.cs b/Aaru.Filesystems/F2FS.cs
index 16b5d9bcc..037c00859 100644
--- a/Aaru.Filesystems/F2FS.cs
+++ b/Aaru.Filesystems/F2FS.cs
@@ -41,203 +41,202 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the Flash-Friendly File System (F2FS)</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class F2FS : IFilesystem
 {
+    // ReSharper disable InconsistentNaming
+    const uint F2FS_MAGIC        = 0xF2F52010;
+    const uint F2FS_SUPER_OFFSET = 1024;
+    const uint F2FS_MIN_SECTOR   = 512;
+    const uint F2FS_MAX_SECTOR   = 4096;
+    const uint F2FS_BLOCK_SIZE   = 4096;
+
+    // ReSharper restore InconsistentNaming
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the Flash-Friendly File System (F2FS)</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class F2FS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "F2FS Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("82B0920F-5F0D-4063-9F57-ADE0AE02ECE5");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        // ReSharper disable InconsistentNaming
-        const uint F2FS_MAGIC        = 0xF2F52010;
-        const uint F2FS_SUPER_OFFSET = 1024;
-        const uint F2FS_MIN_SECTOR   = 512;
-        const uint F2FS_MAX_SECTOR   = 4096;
-        const uint F2FS_BLOCK_SIZE   = 4096;
+        if(imagePlugin.Info.SectorSize < F2FS_MIN_SECTOR ||
+           imagePlugin.Info.SectorSize > F2FS_MAX_SECTOR)
+            return false;
 
-        // ReSharper restore InconsistentNaming
+        uint sbAddr = F2FS_SUPER_OFFSET / imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "F2FS Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("82B0920F-5F0D-4063-9F57-ADE0AE02ECE5");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(sbAddr == 0)
+            sbAddr = 1;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        if(partition.Start + sbAddr + sbSize >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(sector.Length < Marshal.SizeOf<Superblock>())
+            return false;
+
+        Superblock sb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        return sb.magic == F2FS_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = Encoding.Unicode;
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < F2FS_MIN_SECTOR ||
+           imagePlugin.Info.SectorSize > F2FS_MAX_SECTOR)
+            return;
+
+        uint sbAddr = F2FS_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+        if(sbAddr == 0)
+            sbAddr = 1;
+
+        uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        if(sector.Length < Marshal.SizeOf<Superblock>())
+            return;
+
+        // ReSharper disable once InconsistentNaming
+        Superblock f2fsSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        if(f2fsSb.magic != F2FS_MAGIC)
+            return;
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("F2FS filesystem");
+        sb.AppendFormat("Version {0}.{1}", f2fsSb.major_ver, f2fsSb.minor_ver).AppendLine();
+        sb.AppendFormat("{0} bytes per sector", 1 << (int)f2fsSb.log_sectorsize).AppendLine();
+
+        sb.AppendFormat("{0} sectors ({1} bytes) per block", 1 << (int)f2fsSb.log_sectors_per_block,
+                        1                                      << (int)f2fsSb.log_blocksize).AppendLine();
+
+        sb.AppendFormat("{0} blocks per segment", f2fsSb.log_blocks_per_seg).AppendLine();
+        sb.AppendFormat("{0} blocks in volume", f2fsSb.block_count).AppendLine();
+        sb.AppendFormat("{0} segments per section", f2fsSb.segs_per_sec).AppendLine();
+        sb.AppendFormat("{0} sections per zone", f2fsSb.secs_per_zone).AppendLine();
+        sb.AppendFormat("{0} sections", f2fsSb.section_count).AppendLine();
+        sb.AppendFormat("{0} segments", f2fsSb.segment_count).AppendLine();
+        sb.AppendFormat("Root directory resides on inode {0}", f2fsSb.root_ino).AppendLine();
+        sb.AppendFormat("Volume UUID: {0}", f2fsSb.uuid).AppendLine();
+
+        sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(f2fsSb.volume_name, Encoding.Unicode, true)).
+           AppendLine();
+
+        sb.AppendFormat("Volume last mounted on kernel version: {0}", StringHandlers.CToString(f2fsSb.version)).
+           AppendLine();
+
+        sb.AppendFormat("Volume created on kernel version: {0}", StringHandlers.CToString(f2fsSb.init_version)).
+           AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            if(imagePlugin.Info.SectorSize < F2FS_MIN_SECTOR ||
-               imagePlugin.Info.SectorSize > F2FS_MAX_SECTOR)
-                return false;
+            Type                   = "F2FS filesystem",
+            SystemIdentifier       = Encoding.ASCII.GetString(f2fsSb.version),
+            Clusters               = f2fsSb.block_count,
+            ClusterSize            = (uint)(1 << (int)f2fsSb.log_blocksize),
+            DataPreparerIdentifier = Encoding.ASCII.GetString(f2fsSb.init_version),
+            VolumeName             = StringHandlers.CToString(f2fsSb.volume_name, Encoding.Unicode, true),
+            VolumeSerial           = f2fsSb.uuid.ToString()
+        };
+    }
 
-            uint sbAddr = F2FS_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-
-            if(sbAddr == 0)
-                sbAddr = 1;
-
-            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            if(partition.Start + sbAddr + sbSize >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(sector.Length < Marshal.SizeOf<Superblock>())
-                return false;
-
-            Superblock sb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-            return sb.magic == F2FS_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = Encoding.Unicode;
-            information = "";
-
-            if(imagePlugin.Info.SectorSize < F2FS_MIN_SECTOR ||
-               imagePlugin.Info.SectorSize > F2FS_MAX_SECTOR)
-                return;
-
-            uint sbAddr = F2FS_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-
-            if(sbAddr == 0)
-                sbAddr = 1;
-
-            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            if(sector.Length < Marshal.SizeOf<Superblock>())
-                return;
-
-            // ReSharper disable once InconsistentNaming
-            Superblock f2fsSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-            if(f2fsSb.magic != F2FS_MAGIC)
-                return;
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine("F2FS filesystem");
-            sb.AppendFormat("Version {0}.{1}", f2fsSb.major_ver, f2fsSb.minor_ver).AppendLine();
-            sb.AppendFormat("{0} bytes per sector", 1 << (int)f2fsSb.log_sectorsize).AppendLine();
-
-            sb.AppendFormat("{0} sectors ({1} bytes) per block", 1 << (int)f2fsSb.log_sectors_per_block,
-                            1                                      << (int)f2fsSb.log_blocksize).AppendLine();
-
-            sb.AppendFormat("{0} blocks per segment", f2fsSb.log_blocks_per_seg).AppendLine();
-            sb.AppendFormat("{0} blocks in volume", f2fsSb.block_count).AppendLine();
-            sb.AppendFormat("{0} segments per section", f2fsSb.segs_per_sec).AppendLine();
-            sb.AppendFormat("{0} sections per zone", f2fsSb.secs_per_zone).AppendLine();
-            sb.AppendFormat("{0} sections", f2fsSb.section_count).AppendLine();
-            sb.AppendFormat("{0} segments", f2fsSb.segment_count).AppendLine();
-            sb.AppendFormat("Root directory resides on inode {0}", f2fsSb.root_ino).AppendLine();
-            sb.AppendFormat("Volume UUID: {0}", f2fsSb.uuid).AppendLine();
-
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(f2fsSb.volume_name, Encoding.Unicode, true)).
-               AppendLine();
-
-            sb.AppendFormat("Volume last mounted on kernel version: {0}", StringHandlers.CToString(f2fsSb.version)).
-               AppendLine();
-
-            sb.AppendFormat("Volume created on kernel version: {0}", StringHandlers.CToString(f2fsSb.init_version)).
-               AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type                   = "F2FS filesystem",
-                SystemIdentifier       = Encoding.ASCII.GetString(f2fsSb.version),
-                Clusters               = f2fsSb.block_count,
-                ClusterSize            = (uint)(1 << (int)f2fsSb.log_blocksize),
-                DataPreparerIdentifier = Encoding.ASCII.GetString(f2fsSb.init_version),
-                VolumeName             = StringHandlers.CToString(f2fsSb.volume_name, Encoding.Unicode, true),
-                VolumeSerial           = f2fsSb.uuid.ToString()
-            };
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
-        readonly struct Superblock
-        {
-            public readonly uint   magic;
-            public readonly ushort major_ver;
-            public readonly ushort minor_ver;
-            public readonly uint   log_sectorsize;
-            public readonly uint   log_sectors_per_block;
-            public readonly uint   log_blocksize;
-            public readonly uint   log_blocks_per_seg;
-            public readonly uint   segs_per_sec;
-            public readonly uint   secs_per_zone;
-            public readonly uint   checksum_offset;
-            public readonly ulong  block_count;
-            public readonly uint   section_count;
-            public readonly uint   segment_count;
-            public readonly uint   segment_count_ckpt;
-            public readonly uint   segment_count_sit;
-            public readonly uint   segment_count_nat;
-            public readonly uint   segment_count_ssa;
-            public readonly uint   segment_count_main;
-            public readonly uint   segment0_blkaddr;
-            public readonly uint   cp_blkaddr;
-            public readonly uint   sit_blkaddr;
-            public readonly uint   nat_blkaddr;
-            public readonly uint   ssa_blkaddr;
-            public readonly uint   main_blkaddr;
-            public readonly uint   root_ino;
-            public readonly uint   node_ino;
-            public readonly uint   meta_ino;
-            public readonly Guid   uuid;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1024)]
-            public readonly byte[] volume_name;
-            public readonly uint extension_count;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] extension_list1;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] extension_list2;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] extension_list3;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] extension_list4;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] extension_list5;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] extension_list6;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] extension_list7;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] extension_list8;
-            public readonly uint cp_payload;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
-            public readonly byte[] version;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
-            public readonly byte[] init_version;
-            public readonly uint feature;
-            public readonly byte encryption_level;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] encrypt_pw_salt;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 871)]
-            public readonly byte[] reserved;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
+    readonly struct Superblock
+    {
+        public readonly uint   magic;
+        public readonly ushort major_ver;
+        public readonly ushort minor_ver;
+        public readonly uint   log_sectorsize;
+        public readonly uint   log_sectors_per_block;
+        public readonly uint   log_blocksize;
+        public readonly uint   log_blocks_per_seg;
+        public readonly uint   segs_per_sec;
+        public readonly uint   secs_per_zone;
+        public readonly uint   checksum_offset;
+        public readonly ulong  block_count;
+        public readonly uint   section_count;
+        public readonly uint   segment_count;
+        public readonly uint   segment_count_ckpt;
+        public readonly uint   segment_count_sit;
+        public readonly uint   segment_count_nat;
+        public readonly uint   segment_count_ssa;
+        public readonly uint   segment_count_main;
+        public readonly uint   segment0_blkaddr;
+        public readonly uint   cp_blkaddr;
+        public readonly uint   sit_blkaddr;
+        public readonly uint   nat_blkaddr;
+        public readonly uint   ssa_blkaddr;
+        public readonly uint   main_blkaddr;
+        public readonly uint   root_ino;
+        public readonly uint   node_ino;
+        public readonly uint   meta_ino;
+        public readonly Guid   uuid;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1024)]
+        public readonly byte[] volume_name;
+        public readonly uint extension_count;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] extension_list1;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] extension_list2;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] extension_list3;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] extension_list4;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] extension_list5;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] extension_list6;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] extension_list7;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] extension_list8;
+        public readonly uint cp_payload;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
+        public readonly byte[] version;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
+        public readonly byte[] init_version;
+        public readonly uint feature;
+        public readonly byte encryption_level;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] encrypt_pw_salt;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 871)]
+        public readonly byte[] reserved;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FAT/BPB.cs b/Aaru.Filesystems/FAT/BPB.cs
index 12bb31c11..607e573a0 100644
--- a/Aaru.Filesystems/FAT/BPB.cs
+++ b/Aaru.Filesystems/FAT/BPB.cs
@@ -39,237 +39,223 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class FAT
 {
-    public sealed partial class FAT
+    static BpbKind DetectBpbKind(byte[] bpbSector, IMediaImage imagePlugin, Partition partition,
+                                 out BiosParameterBlockEbpb fakeBpb, out HumanParameterBlock humanBpb,
+                                 out AtariParameterBlock atariBpb, out byte minBootNearJump,
+                                 out bool andosOemCorrect, out bool bootable)
     {
-        static BpbKind DetectBpbKind(byte[] bpbSector, IMediaImage imagePlugin, Partition partition,
-                                     out BiosParameterBlockEbpb fakeBpb, out HumanParameterBlock humanBpb,
-                                     out AtariParameterBlock atariBpb, out byte minBootNearJump,
-                                     out bool andosOemCorrect, out bool bootable)
+        fakeBpb         = new BiosParameterBlockEbpb();
+        minBootNearJump = 0;
+        andosOemCorrect = false;
+        bootable        = false;
+        ErrorNumber errno;
+
+        humanBpb = Marshal.ByteArrayToStructureBigEndian<HumanParameterBlock>(bpbSector);
+        atariBpb = Marshal.ByteArrayToStructureLittleEndian<AtariParameterBlock>(bpbSector);
+
+        ulong expectedClusters = humanBpb.bpc > 0 ? partition.Size / humanBpb.bpc : 0;
+
+        // Check clusters for Human68k are correct
+        bool humanClustersCorrect = humanBpb.clusters       == 0 ? humanBpb.big_clusters == expectedClusters
+                                        : humanBpb.clusters == expectedClusters;
+
+        // Check OEM for Human68k is correct
+        bool humanOemCorrect = bpbSector[2]  >= 0x20 && bpbSector[3]  >= 0x20 && bpbSector[4]  >= 0x20 &&
+                               bpbSector[5]  >= 0x20 && bpbSector[6]  >= 0x20 && bpbSector[7]  >= 0x20 &&
+                               bpbSector[8]  >= 0x20 && bpbSector[9]  >= 0x20 && bpbSector[10] >= 0x20 &&
+                               bpbSector[11] >= 0x20 && bpbSector[12] >= 0x20 && bpbSector[13] >= 0x20 &&
+                               bpbSector[14] >= 0x20 && bpbSector[15] >= 0x20 && bpbSector[16] >= 0x20 &&
+                               bpbSector[17] >= 0x20;
+
+        // Check correct branch for Human68k
+        bool humanBranchCorrect = bpbSector[0] == 0x60 && bpbSector[1] >= 0x1C && bpbSector[1] < 0xFE;
+
+        AaruConsole.DebugWriteLine("FAT plugin", "humanClustersCorrect = {0}", humanClustersCorrect);
+        AaruConsole.DebugWriteLine("FAT plugin", "humanOemCorrect = {0}", humanOemCorrect);
+        AaruConsole.DebugWriteLine("FAT plugin", "humanBranchCorrect = {0}", humanBranchCorrect);
+
+        // If all Human68k checks are correct, it is a Human68k FAT16
+        bool useHumanBpb = humanClustersCorrect && humanOemCorrect && humanBranchCorrect && expectedClusters > 0;
+
+        if(useHumanBpb)
         {
-            fakeBpb         = new BiosParameterBlockEbpb();
-            minBootNearJump = 0;
-            andosOemCorrect = false;
-            bootable        = false;
-            ErrorNumber errno;
+            AaruConsole.DebugWriteLine("FAT plugin", "Using Human68k BPB");
 
-            humanBpb = Marshal.ByteArrayToStructureBigEndian<HumanParameterBlock>(bpbSector);
-            atariBpb = Marshal.ByteArrayToStructureLittleEndian<AtariParameterBlock>(bpbSector);
+            fakeBpb.jump        = humanBpb.jump;
+            fakeBpb.oem_name    = humanBpb.oem_name;
+            fakeBpb.bps         = (ushort)imagePlugin.Info.SectorSize;
+            fakeBpb.spc         = (byte)(humanBpb.bpc / fakeBpb.bps);
+            fakeBpb.fats_no     = 2;
+            fakeBpb.root_ent    = humanBpb.root_ent;
+            fakeBpb.media       = humanBpb.media;
+            fakeBpb.spfat       = (ushort)(humanBpb.cpfat * fakeBpb.spc);
+            fakeBpb.boot_code   = humanBpb.boot_code;
+            fakeBpb.sectors     = humanBpb.clusters;
+            fakeBpb.big_sectors = humanBpb.big_clusters;
+            fakeBpb.rsectors    = 1;
 
-            ulong expectedClusters = humanBpb.bpc > 0 ? partition.Size / humanBpb.bpc : 0;
+            return BpbKind.Human;
+        }
 
-            // Check clusters for Human68k are correct
-            bool humanClustersCorrect = humanBpb.clusters       == 0 ? humanBpb.big_clusters == expectedClusters
-                                            : humanBpb.clusters == expectedClusters;
+        var msxBpb     = new MsxParameterBlock();
+        var dos2Bpb    = new BiosParameterBlock2();
+        var dos30Bpb   = new BiosParameterBlock30();
+        var dos32Bpb   = new BiosParameterBlock32();
+        var dos33Bpb   = new BiosParameterBlock33();
+        var shortEbpb  = new BiosParameterBlockShortEbpb();
+        var ebpb       = new BiosParameterBlockEbpb();
+        var apricotBpb = new ApricotLabel();
 
-            // Check OEM for Human68k is correct
-            bool humanOemCorrect = bpbSector[2]  >= 0x20 && bpbSector[3]  >= 0x20 && bpbSector[4]  >= 0x20 &&
-                                   bpbSector[5]  >= 0x20 && bpbSector[6]  >= 0x20 && bpbSector[7]  >= 0x20 &&
-                                   bpbSector[8]  >= 0x20 && bpbSector[9]  >= 0x20 && bpbSector[10] >= 0x20 &&
-                                   bpbSector[11] >= 0x20 && bpbSector[12] >= 0x20 && bpbSector[13] >= 0x20 &&
-                                   bpbSector[14] >= 0x20 && bpbSector[15] >= 0x20 && bpbSector[16] >= 0x20 &&
-                                   bpbSector[17] >= 0x20;
+        bool useAtariBpb          = false;
+        bool useMsxBpb            = false;
+        bool useDos2Bpb           = false;
+        bool useDos3Bpb           = false;
+        bool useDos32Bpb          = false;
+        bool useDos33Bpb          = false;
+        bool userShortExtendedBpb = false;
+        bool useExtendedBpb       = false;
+        bool useShortFat32        = false;
+        bool useLongFat32         = false;
+        bool useApricotBpb        = false;
+        bool useDecRainbowBpb     = false;
 
-            // Check correct branch for Human68k
-            bool humanBranchCorrect = bpbSector[0] == 0x60 && bpbSector[1] >= 0x1C && bpbSector[1] < 0xFE;
+        if(imagePlugin.Info.SectorSize >= 256)
+        {
+            msxBpb    = Marshal.ByteArrayToStructureLittleEndian<MsxParameterBlock>(bpbSector);
+            dos2Bpb   = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock2>(bpbSector);
+            dos30Bpb  = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock30>(bpbSector);
+            dos32Bpb  = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock32>(bpbSector);
+            dos33Bpb  = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock33>(bpbSector);
+            shortEbpb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlockShortEbpb>(bpbSector);
+            ebpb      = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlockEbpb>(bpbSector);
 
-            AaruConsole.DebugWriteLine("FAT plugin", "humanClustersCorrect = {0}", humanClustersCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "humanOemCorrect = {0}", humanOemCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "humanBranchCorrect = {0}", humanBranchCorrect);
+            Fat32ParameterBlockShort shortFat32Bpb =
+                Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlockShort>(bpbSector);
 
-            // If all Human68k checks are correct, it is a Human68k FAT16
-            bool useHumanBpb = humanClustersCorrect && humanOemCorrect && humanBranchCorrect && expectedClusters > 0;
+            Fat32ParameterBlock fat32Bpb = Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlock>(bpbSector);
+            apricotBpb = Marshal.ByteArrayToStructureLittleEndian<ApricotLabel>(bpbSector);
 
-            if(useHumanBpb)
+            int bitsInBpsMsx        = CountBits.Count(msxBpb.bps);
+            int bitsInBpsDos33      = CountBits.Count(dos33Bpb.bps);
+            int bitsInBpsDos40      = CountBits.Count(ebpb.bps);
+            int bitsInBpsFat32Short = CountBits.Count(shortFat32Bpb.bps);
+            int bitsInBpsFat32      = CountBits.Count(fat32Bpb.bps);
+            int bitsInBpsApricot    = CountBits.Count(apricotBpb.mainBPB.bps);
+
+            bool correctSpcMsx = msxBpb.spc == 1  || msxBpb.spc == 2  || msxBpb.spc == 4 || msxBpb.spc == 8 ||
+                                 msxBpb.spc == 16 || msxBpb.spc == 32 || msxBpb.spc == 64;
+
+            bool correctSpcDos33 = dos33Bpb.spc == 1 || dos33Bpb.spc == 2  || dos33Bpb.spc == 4  ||
+                                   dos33Bpb.spc == 8 || dos33Bpb.spc == 16 || dos33Bpb.spc == 32 ||
+                                   dos33Bpb.spc == 64;
+
+            bool correctSpcDos40 = ebpb.spc == 1  || ebpb.spc == 2  || ebpb.spc == 4 || ebpb.spc == 8 ||
+                                   ebpb.spc == 16 || ebpb.spc == 32 || ebpb.spc == 64;
+
+            bool correctSpcFat32Short = shortFat32Bpb.spc == 1  || shortFat32Bpb.spc == 2  ||
+                                        shortFat32Bpb.spc == 4  || shortFat32Bpb.spc == 8  ||
+                                        shortFat32Bpb.spc == 16 || shortFat32Bpb.spc == 32 ||
+                                        shortFat32Bpb.spc == 64;
+
+            bool correctSpcFat32 = fat32Bpb.spc == 1 || fat32Bpb.spc == 2  || fat32Bpb.spc == 4  ||
+                                   fat32Bpb.spc == 8 || fat32Bpb.spc == 16 || fat32Bpb.spc == 32 ||
+                                   fat32Bpb.spc == 64;
+
+            bool correctSpcApricot = apricotBpb.mainBPB.spc == 1  || apricotBpb.mainBPB.spc == 2  ||
+                                     apricotBpb.mainBPB.spc == 4  || apricotBpb.mainBPB.spc == 8  ||
+                                     apricotBpb.mainBPB.spc == 16 || apricotBpb.mainBPB.spc == 32 ||
+                                     apricotBpb.mainBPB.spc == 64;
+
+            // This is to support FAT partitions on hybrid ISO/USB images
+            if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
             {
-                AaruConsole.DebugWriteLine("FAT plugin", "Using Human68k BPB");
-
-                fakeBpb.jump        = humanBpb.jump;
-                fakeBpb.oem_name    = humanBpb.oem_name;
-                fakeBpb.bps         = (ushort)imagePlugin.Info.SectorSize;
-                fakeBpb.spc         = (byte)(humanBpb.bpc / fakeBpb.bps);
-                fakeBpb.fats_no     = 2;
-                fakeBpb.root_ent    = humanBpb.root_ent;
-                fakeBpb.media       = humanBpb.media;
-                fakeBpb.spfat       = (ushort)(humanBpb.cpfat * fakeBpb.spc);
-                fakeBpb.boot_code   = humanBpb.boot_code;
-                fakeBpb.sectors     = humanBpb.clusters;
-                fakeBpb.big_sectors = humanBpb.big_clusters;
-                fakeBpb.rsectors    = 1;
-
-                return BpbKind.Human;
+                atariBpb.sectors           /= 4;
+                msxBpb.sectors             /= 4;
+                dos2Bpb.sectors            /= 4;
+                dos30Bpb.sectors           /= 4;
+                dos32Bpb.sectors           /= 4;
+                dos33Bpb.sectors           /= 4;
+                dos33Bpb.big_sectors       /= 4;
+                shortEbpb.sectors          /= 4;
+                shortEbpb.big_sectors      /= 4;
+                ebpb.sectors               /= 4;
+                ebpb.big_sectors           /= 4;
+                shortFat32Bpb.sectors      /= 4;
+                shortFat32Bpb.big_sectors  /= 4;
+                shortFat32Bpb.huge_sectors /= 4;
+                fat32Bpb.sectors           /= 4;
+                fat32Bpb.big_sectors       /= 4;
+                apricotBpb.mainBPB.sectors /= 4;
             }
 
-            var msxBpb     = new MsxParameterBlock();
-            var dos2Bpb    = new BiosParameterBlock2();
-            var dos30Bpb   = new BiosParameterBlock30();
-            var dos32Bpb   = new BiosParameterBlock32();
-            var dos33Bpb   = new BiosParameterBlock33();
-            var shortEbpb  = new BiosParameterBlockShortEbpb();
-            var ebpb       = new BiosParameterBlockEbpb();
-            var apricotBpb = new ApricotLabel();
+            andosOemCorrect = dos33Bpb.oem_name[0] < 0x20  && dos33Bpb.oem_name[1] >= 0x20 &&
+                              dos33Bpb.oem_name[2] >= 0x20 && dos33Bpb.oem_name[3] >= 0x20 &&
+                              dos33Bpb.oem_name[4] >= 0x20 && dos33Bpb.oem_name[5] >= 0x20 &&
+                              dos33Bpb.oem_name[6] >= 0x20 && dos33Bpb.oem_name[7] >= 0x20;
 
-            bool useAtariBpb          = false;
-            bool useMsxBpb            = false;
-            bool useDos2Bpb           = false;
-            bool useDos3Bpb           = false;
-            bool useDos32Bpb          = false;
-            bool useDos33Bpb          = false;
-            bool userShortExtendedBpb = false;
-            bool useExtendedBpb       = false;
-            bool useShortFat32        = false;
-            bool useLongFat32         = false;
-            bool useApricotBpb        = false;
-            bool useDecRainbowBpb     = false;
-
-            if(imagePlugin.Info.SectorSize >= 256)
+            if(bitsInBpsFat32 == 1                                &&
+               correctSpcFat32                                    &&
+               fat32Bpb.fats_no                           <= 2    &&
+               fat32Bpb.spfat                             == 0    &&
+               fat32Bpb.signature                         == 0x29 &&
+               Encoding.ASCII.GetString(fat32Bpb.fs_type) == "FAT32   ")
             {
-                msxBpb    = Marshal.ByteArrayToStructureLittleEndian<MsxParameterBlock>(bpbSector);
-                dos2Bpb   = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock2>(bpbSector);
-                dos30Bpb  = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock30>(bpbSector);
-                dos32Bpb  = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock32>(bpbSector);
-                dos33Bpb  = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock33>(bpbSector);
-                shortEbpb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlockShortEbpb>(bpbSector);
-                ebpb      = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlockEbpb>(bpbSector);
+                AaruConsole.DebugWriteLine("FAT plugin", "Using FAT32 BPB");
+                minBootNearJump = 0x58;
 
-                Fat32ParameterBlockShort shortFat32Bpb =
-                    Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlockShort>(bpbSector);
+                return BpbKind.LongFat32;
+            }
 
-                Fat32ParameterBlock fat32Bpb = Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlock>(bpbSector);
-                apricotBpb = Marshal.ByteArrayToStructureLittleEndian<ApricotLabel>(bpbSector);
+            if(bitsInBpsFat32Short == 1     &&
+               correctSpcFat32Short         &&
+               shortFat32Bpb.fats_no   <= 2 &&
+               shortFat32Bpb.sectors   == 0 &&
+               shortFat32Bpb.spfat     == 0 &&
+               shortFat32Bpb.signature == 0x28)
+            {
+                AaruConsole.DebugWriteLine("FAT plugin", "Using short FAT32 BPB");
 
-                int bitsInBpsMsx        = CountBits.Count(msxBpb.bps);
-                int bitsInBpsDos33      = CountBits.Count(dos33Bpb.bps);
-                int bitsInBpsDos40      = CountBits.Count(ebpb.bps);
-                int bitsInBpsFat32Short = CountBits.Count(shortFat32Bpb.bps);
-                int bitsInBpsFat32      = CountBits.Count(fat32Bpb.bps);
-                int bitsInBpsApricot    = CountBits.Count(apricotBpb.mainBPB.bps);
+                minBootNearJump = 0x57;
 
-                bool correctSpcMsx = msxBpb.spc == 1  || msxBpb.spc == 2  || msxBpb.spc == 4 || msxBpb.spc == 8 ||
-                                     msxBpb.spc == 16 || msxBpb.spc == 32 || msxBpb.spc == 64;
+                return BpbKind.ShortFat32;
+            }
 
-                bool correctSpcDos33 = dos33Bpb.spc == 1 || dos33Bpb.spc == 2  || dos33Bpb.spc == 4  ||
-                                       dos33Bpb.spc == 8 || dos33Bpb.spc == 16 || dos33Bpb.spc == 32 ||
-                                       dos33Bpb.spc == 64;
-
-                bool correctSpcDos40 = ebpb.spc == 1  || ebpb.spc == 2  || ebpb.spc == 4 || ebpb.spc == 8 ||
-                                       ebpb.spc == 16 || ebpb.spc == 32 || ebpb.spc == 64;
-
-                bool correctSpcFat32Short = shortFat32Bpb.spc == 1  || shortFat32Bpb.spc == 2  ||
-                                            shortFat32Bpb.spc == 4  || shortFat32Bpb.spc == 8  ||
-                                            shortFat32Bpb.spc == 16 || shortFat32Bpb.spc == 32 ||
-                                            shortFat32Bpb.spc == 64;
-
-                bool correctSpcFat32 = fat32Bpb.spc == 1 || fat32Bpb.spc == 2  || fat32Bpb.spc == 4  ||
-                                       fat32Bpb.spc == 8 || fat32Bpb.spc == 16 || fat32Bpb.spc == 32 ||
-                                       fat32Bpb.spc == 64;
-
-                bool correctSpcApricot = apricotBpb.mainBPB.spc == 1  || apricotBpb.mainBPB.spc == 2  ||
-                                         apricotBpb.mainBPB.spc == 4  || apricotBpb.mainBPB.spc == 8  ||
-                                         apricotBpb.mainBPB.spc == 16 || apricotBpb.mainBPB.spc == 32 ||
-                                         apricotBpb.mainBPB.spc == 64;
-
-                // This is to support FAT partitions on hybrid ISO/USB images
-                if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+            if(bitsInBpsMsx == 1                                                              &&
+               correctSpcMsx                                                                  &&
+               msxBpb.fats_no                          <= 2                                   &&
+               msxBpb.root_ent                         > 0                                    &&
+               msxBpb.sectors                          <= partition.End - partition.Start + 1 &&
+               msxBpb.spfat                            > 0                                    &&
+               Encoding.ASCII.GetString(msxBpb.vol_id) == "VOL_ID")
+            {
+                AaruConsole.DebugWriteLine("FAT plugin", "Using MSX BPB");
+                useMsxBpb = true;
+            }
+            else if(bitsInBpsApricot == 1                                              &&
+                    correctSpcApricot                                                  &&
+                    apricotBpb.mainBPB.fats_no  <= 2                                   &&
+                    apricotBpb.mainBPB.root_ent > 0                                    &&
+                    apricotBpb.mainBPB.sectors  <= partition.End - partition.Start + 1 &&
+                    apricotBpb.mainBPB.spfat    > 0                                    &&
+                    apricotBpb.partitionCount   == 0)
+            {
+                AaruConsole.DebugWriteLine("FAT plugin", "Using Apricot BPB");
+                useApricotBpb = true;
+            }
+            else if(bitsInBpsDos40 == 1 &&
+                    correctSpcDos40     &&
+                    ebpb.fats_no  <= 2  &&
+                    ebpb.root_ent > 0   &&
+                    ebpb.spfat    > 0   &&
+                    (ebpb.signature == 0x28 || ebpb.signature == 0x29 || andosOemCorrect))
+            {
+                if(ebpb.sectors == 0)
                 {
-                    atariBpb.sectors           /= 4;
-                    msxBpb.sectors             /= 4;
-                    dos2Bpb.sectors            /= 4;
-                    dos30Bpb.sectors           /= 4;
-                    dos32Bpb.sectors           /= 4;
-                    dos33Bpb.sectors           /= 4;
-                    dos33Bpb.big_sectors       /= 4;
-                    shortEbpb.sectors          /= 4;
-                    shortEbpb.big_sectors      /= 4;
-                    ebpb.sectors               /= 4;
-                    ebpb.big_sectors           /= 4;
-                    shortFat32Bpb.sectors      /= 4;
-                    shortFat32Bpb.big_sectors  /= 4;
-                    shortFat32Bpb.huge_sectors /= 4;
-                    fat32Bpb.sectors           /= 4;
-                    fat32Bpb.big_sectors       /= 4;
-                    apricotBpb.mainBPB.sectors /= 4;
-                }
-
-                andosOemCorrect = dos33Bpb.oem_name[0] < 0x20  && dos33Bpb.oem_name[1] >= 0x20 &&
-                                  dos33Bpb.oem_name[2] >= 0x20 && dos33Bpb.oem_name[3] >= 0x20 &&
-                                  dos33Bpb.oem_name[4] >= 0x20 && dos33Bpb.oem_name[5] >= 0x20 &&
-                                  dos33Bpb.oem_name[6] >= 0x20 && dos33Bpb.oem_name[7] >= 0x20;
-
-                if(bitsInBpsFat32 == 1                                &&
-                   correctSpcFat32                                    &&
-                   fat32Bpb.fats_no                           <= 2    &&
-                   fat32Bpb.spfat                             == 0    &&
-                   fat32Bpb.signature                         == 0x29 &&
-                   Encoding.ASCII.GetString(fat32Bpb.fs_type) == "FAT32   ")
-                {
-                    AaruConsole.DebugWriteLine("FAT plugin", "Using FAT32 BPB");
-                    minBootNearJump = 0x58;
-
-                    return BpbKind.LongFat32;
-                }
-
-                if(bitsInBpsFat32Short == 1     &&
-                   correctSpcFat32Short         &&
-                   shortFat32Bpb.fats_no   <= 2 &&
-                   shortFat32Bpb.sectors   == 0 &&
-                   shortFat32Bpb.spfat     == 0 &&
-                   shortFat32Bpb.signature == 0x28)
-                {
-                    AaruConsole.DebugWriteLine("FAT plugin", "Using short FAT32 BPB");
-
-                    minBootNearJump = 0x57;
-
-                    return BpbKind.ShortFat32;
-                }
-
-                if(bitsInBpsMsx == 1                                                              &&
-                   correctSpcMsx                                                                  &&
-                   msxBpb.fats_no                          <= 2                                   &&
-                   msxBpb.root_ent                         > 0                                    &&
-                   msxBpb.sectors                          <= partition.End - partition.Start + 1 &&
-                   msxBpb.spfat                            > 0                                    &&
-                   Encoding.ASCII.GetString(msxBpb.vol_id) == "VOL_ID")
-                {
-                    AaruConsole.DebugWriteLine("FAT plugin", "Using MSX BPB");
-                    useMsxBpb = true;
-                }
-                else if(bitsInBpsApricot == 1                                              &&
-                        correctSpcApricot                                                  &&
-                        apricotBpb.mainBPB.fats_no  <= 2                                   &&
-                        apricotBpb.mainBPB.root_ent > 0                                    &&
-                        apricotBpb.mainBPB.sectors  <= partition.End - partition.Start + 1 &&
-                        apricotBpb.mainBPB.spfat    > 0                                    &&
-                        apricotBpb.partitionCount   == 0)
-                {
-                    AaruConsole.DebugWriteLine("FAT plugin", "Using Apricot BPB");
-                    useApricotBpb = true;
-                }
-                else if(bitsInBpsDos40 == 1 &&
-                        correctSpcDos40     &&
-                        ebpb.fats_no  <= 2  &&
-                        ebpb.root_ent > 0   &&
-                        ebpb.spfat    > 0   &&
-                        (ebpb.signature == 0x28 || ebpb.signature == 0x29 || andosOemCorrect))
-                {
-                    if(ebpb.sectors == 0)
-                    {
-                        if(ebpb.big_sectors <= partition.End - partition.Start + 1)
-                            if(ebpb.signature == 0x29 || andosOemCorrect)
-                            {
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 4.0 BPB");
-                                useExtendedBpb  = true;
-                                minBootNearJump = 0x3C;
-                            }
-                            else
-                            {
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 3.4 BPB");
-                                userShortExtendedBpb = true;
-                                minBootNearJump      = 0x29;
-                            }
-                    }
-                    else if(ebpb.sectors <= partition.End - partition.Start + 1)
+                    if(ebpb.big_sectors <= partition.End - partition.Start + 1)
                         if(ebpb.signature == 0x29 || andosOemCorrect)
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 4.0 BPB");
@@ -283,338 +269,331 @@ namespace Aaru.Filesystems
                             minBootNearJump      = 0x29;
                         }
                 }
-                else if(bitsInBpsDos33 == 1                                 &&
-                        correctSpcDos33                                     &&
-                        dos33Bpb.rsectors < partition.End - partition.Start &&
-                        dos33Bpb.fats_no  <= 2                              &&
-                        dos33Bpb.root_ent > 0                               &&
-                        dos33Bpb.spfat    > 0)
-                    if(dos33Bpb.sectors     == 0               &&
-                       dos33Bpb.hsectors    <= partition.Start &&
-                       dos33Bpb.big_sectors > 0                &&
-                       dos33Bpb.big_sectors <= partition.End - partition.Start + 1)
+                else if(ebpb.sectors <= partition.End - partition.Start + 1)
+                    if(ebpb.signature == 0x29 || andosOemCorrect)
+                    {
+                        AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 4.0 BPB");
+                        useExtendedBpb  = true;
+                        minBootNearJump = 0x3C;
+                    }
+                    else
+                    {
+                        AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 3.4 BPB");
+                        userShortExtendedBpb = true;
+                        minBootNearJump      = 0x29;
+                    }
+            }
+            else if(bitsInBpsDos33 == 1                                 &&
+                    correctSpcDos33                                     &&
+                    dos33Bpb.rsectors < partition.End - partition.Start &&
+                    dos33Bpb.fats_no  <= 2                              &&
+                    dos33Bpb.root_ent > 0                               &&
+                    dos33Bpb.spfat    > 0)
+                if(dos33Bpb.sectors     == 0               &&
+                   dos33Bpb.hsectors    <= partition.Start &&
+                   dos33Bpb.big_sectors > 0                &&
+                   dos33Bpb.big_sectors <= partition.End - partition.Start + 1)
+                {
+                    AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 3.3 BPB");
+                    useDos33Bpb     = true;
+                    minBootNearJump = 0x22;
+                }
+                else if(dos33Bpb.big_sectors == 0               &&
+                        dos33Bpb.hsectors    <= partition.Start &&
+                        dos33Bpb.sectors     > 0                &&
+                        dos33Bpb.sectors     <= partition.End - partition.Start + 1)
+                    if(atariBpb.jump[0] == 0x60 ||
+                       (atariBpb.jump[0]                            == 0xE9 && atariBpb.jump[1] == 0x00 &&
+                        Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    ") ||
+                       partition.Type == "GEM"                                     ||
+                       partition.Type == "BGM")
+                    {
+                        AaruConsole.DebugWriteLine("FAT plugin", "Using Atari BPB");
+                        useAtariBpb = true;
+                    }
+                    else
                     {
                         AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 3.3 BPB");
                         useDos33Bpb     = true;
                         minBootNearJump = 0x22;
                     }
-                    else if(dos33Bpb.big_sectors == 0               &&
-                            dos33Bpb.hsectors    <= partition.Start &&
-                            dos33Bpb.sectors     > 0                &&
-                            dos33Bpb.sectors     <= partition.End - partition.Start + 1)
+                else
+                {
+                    if(dos32Bpb.hsectors                    <= partition.Start &&
+                       dos32Bpb.hsectors + dos32Bpb.sectors == dos32Bpb.total_sectors)
+                    {
+                        AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 3.2 BPB");
+                        useDos32Bpb     = true;
+                        minBootNearJump = 0x1E;
+                    }
+                    else if(dos30Bpb.sptrk > 0  &&
+                            dos30Bpb.sptrk < 64 &&
+                            dos30Bpb.heads > 0  &&
+                            dos30Bpb.heads < 256)
                         if(atariBpb.jump[0] == 0x60 ||
                            (atariBpb.jump[0]                            == 0xE9 && atariBpb.jump[1] == 0x00 &&
-                            Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    ") ||
-                           partition.Type == "GEM"                                     ||
-                           partition.Type == "BGM")
+                            Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    "))
                         {
                             AaruConsole.DebugWriteLine("FAT plugin", "Using Atari BPB");
                             useAtariBpb = true;
                         }
                         else
                         {
-                            AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 3.3 BPB");
-                            useDos33Bpb     = true;
-                            minBootNearJump = 0x22;
+                            AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 3.0 BPB");
+                            useDos3Bpb      = true;
+                            minBootNearJump = 0x1C;
                         }
                     else
                     {
-                        if(dos32Bpb.hsectors                    <= partition.Start &&
-                           dos32Bpb.hsectors + dos32Bpb.sectors == dos32Bpb.total_sectors)
+                        if(atariBpb.jump[0] == 0x60 ||
+                           (atariBpb.jump[0]                            == 0xE9 && atariBpb.jump[1] == 0x00 &&
+                            Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    "))
                         {
-                            AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 3.2 BPB");
-                            useDos32Bpb     = true;
-                            minBootNearJump = 0x1E;
+                            AaruConsole.DebugWriteLine("FAT plugin", "Using Atari BPB");
+                            useAtariBpb = true;
                         }
-                        else if(dos30Bpb.sptrk > 0  &&
-                                dos30Bpb.sptrk < 64 &&
-                                dos30Bpb.heads > 0  &&
-                                dos30Bpb.heads < 256)
-                            if(atariBpb.jump[0] == 0x60 ||
-                               (atariBpb.jump[0]                            == 0xE9 && atariBpb.jump[1] == 0x00 &&
-                                Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    "))
-                            {
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using Atari BPB");
-                                useAtariBpb = true;
-                            }
-                            else
-                            {
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 3.0 BPB");
-                                useDos3Bpb      = true;
-                                minBootNearJump = 0x1C;
-                            }
                         else
                         {
-                            if(atariBpb.jump[0] == 0x60 ||
-                               (atariBpb.jump[0]                            == 0xE9 && atariBpb.jump[1] == 0x00 &&
-                                Encoding.ASCII.GetString(dos33Bpb.oem_name) != "NEXT    "))
-                            {
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using Atari BPB");
-                                useAtariBpb = true;
-                            }
-                            else
-                            {
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 2.0 BPB");
-                                useDos2Bpb      = true;
-                                minBootNearJump = 0x16;
-                            }
+                            AaruConsole.DebugWriteLine("FAT plugin", "Using DOS 2.0 BPB");
+                            useDos2Bpb      = true;
+                            minBootNearJump = 0x16;
                         }
                     }
+                }
+        }
+
+        // DEC Rainbow, lacks a BPB but has a very concrete structure...
+        if(imagePlugin.Info.Sectors    == 800 &&
+           imagePlugin.Info.SectorSize == 512 &&
+           !useAtariBpb                       &&
+           !useMsxBpb                         &&
+           !useDos2Bpb                        &&
+           !useDos3Bpb                        &&
+           !useDos32Bpb                       &&
+           !useDos33Bpb                       &&
+           !userShortExtendedBpb              &&
+           !useExtendedBpb                    &&
+           !useShortFat32                     &&
+           !useLongFat32                      &&
+           !useApricotBpb)
+        {
+            // DEC Rainbow boots up with a Z80, first byte should be DI (disable interrupts)
+            byte z80Di = bpbSector[0];
+
+            // First FAT1 sector resides at LBA 0x14
+            imagePlugin.ReadSector(0x14, out byte[] fat1Sector0);
+
+            // First FAT2 sector resides at LBA 0x1A
+            imagePlugin.ReadSector(0x1A, out byte[] fat2Sector0);
+            bool equalFatIds = fat1Sector0[0] == fat2Sector0[0] && fat1Sector0[1] == fat2Sector0[1];
+
+            // Volume is software interleaved 2:1
+            var rootMs = new MemoryStream();
+
+            foreach(ulong rootSector in new[]
+                    {
+                        0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
+                    })
+            {
+                imagePlugin.ReadSector(rootSector, out byte[] tmp);
+                rootMs.Write(tmp, 0, tmp.Length);
             }
 
-            // DEC Rainbow, lacks a BPB but has a very concrete structure...
-            if(imagePlugin.Info.Sectors    == 800 &&
-               imagePlugin.Info.SectorSize == 512 &&
-               !useAtariBpb                       &&
-               !useMsxBpb                         &&
-               !useDos2Bpb                        &&
-               !useDos3Bpb                        &&
-               !useDos32Bpb                       &&
-               !useDos33Bpb                       &&
-               !userShortExtendedBpb              &&
-               !useExtendedBpb                    &&
-               !useShortFat32                     &&
-               !useLongFat32                      &&
-               !useApricotBpb)
+            byte[] rootDir      = rootMs.ToArray();
+            bool   validRootDir = true;
+
+            // Iterate all root directory
+            for(int e = 0; e < 96 * 32; e += 32)
             {
-                // DEC Rainbow boots up with a Z80, first byte should be DI (disable interrupts)
-                byte z80Di = bpbSector[0];
+                for(int c = 0; c < 11; c++)
+                    if((rootDir[c + e] < 0x20 && rootDir[c + e] != 0x00 && rootDir[c + e] != 0x05) ||
+                       rootDir[c + e] == 0xFF                                                      ||
+                       rootDir[c + e] == 0x2E)
+                    {
+                        validRootDir = false;
 
-                // First FAT1 sector resides at LBA 0x14
-                imagePlugin.ReadSector(0x14, out byte[] fat1Sector0);
+                        break;
+                    }
 
-                // First FAT2 sector resides at LBA 0x1A
-                imagePlugin.ReadSector(0x1A, out byte[] fat2Sector0);
-                bool equalFatIds = fat1Sector0[0] == fat2Sector0[0] && fat1Sector0[1] == fat2Sector0[1];
+                if(!validRootDir)
+                    break;
+            }
 
-                // Volume is software interleaved 2:1
-                var rootMs = new MemoryStream();
+            if(z80Di == 0xF3                   &&
+               equalFatIds                     &&
+               (fat1Sector0[0] & 0xF0) == 0xF0 &&
+               fat1Sector0[1]          == 0xFF &&
+               validRootDir)
+            {
+                AaruConsole.DebugWriteLine("FAT plugin", "Using DEC Rainbow hardcoded BPB.");
+                fakeBpb.bps       = 512;
+                fakeBpb.spc       = 1;
+                fakeBpb.rsectors  = 20;
+                fakeBpb.fats_no   = 2;
+                fakeBpb.root_ent  = 96;
+                fakeBpb.sectors   = 800;
+                fakeBpb.media     = 0xFA;
+                fakeBpb.sptrk     = 10;
+                fakeBpb.heads     = 1;
+                fakeBpb.hsectors  = 0;
+                fakeBpb.spfat     = 3;
+                bootable          = true;
+                fakeBpb.boot_code = bpbSector;
 
-                foreach(ulong rootSector in new[]
-                {
-                    0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
-                })
-                {
-                    imagePlugin.ReadSector(rootSector, out byte[] tmp);
-                    rootMs.Write(tmp, 0, tmp.Length);
-                }
+                return BpbKind.DecRainbow;
+            }
+        }
 
-                byte[] rootDir      = rootMs.ToArray();
-                bool   validRootDir = true;
+        if(!useAtariBpb          &&
+           !useMsxBpb            &&
+           !useDos2Bpb           &&
+           !useDos3Bpb           &&
+           !useDos32Bpb          &&
+           !useDos33Bpb          &&
+           !useHumanBpb          &&
+           !userShortExtendedBpb &&
+           !useExtendedBpb       &&
+           !useShortFat32        &&
+           !useLongFat32         &&
+           !useApricotBpb        &&
+           !useDecRainbowBpb)
+        {
+            imagePlugin.ReadSector(1 + partition.Start, out byte[] fatSector);
 
-                // Iterate all root directory
-                for(int e = 0; e < 96 * 32; e += 32)
-                {
-                    for(int c = 0; c < 11; c++)
-                        if((rootDir[c + e] < 0x20 && rootDir[c + e] != 0x00 && rootDir[c + e] != 0x05) ||
-                           rootDir[c + e] == 0xFF                                                      ||
-                           rootDir[c + e] == 0x2E)
-                        {
-                            validRootDir = false;
+            switch(fatSector[0])
+            {
+                case 0xE5:
+                    if(imagePlugin.Info.Sectors    == 2002 &&
+                       imagePlugin.Info.SectorSize == 128)
+                    {
+                        AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
+                        fakeBpb.bps      = 128;
+                        fakeBpb.spc      = 4;
+                        fakeBpb.rsectors = 1;
+                        fakeBpb.fats_no  = 2;
+                        fakeBpb.root_ent = 64;
+                        fakeBpb.sectors  = 2002;
+                        fakeBpb.media    = 0xE5;
+                        fakeBpb.sptrk    = 26;
+                        fakeBpb.heads    = 1;
+                        fakeBpb.hsectors = 0;
+                        fakeBpb.spfat    = 1;
+                    }
+
+                    break;
+                case 0xFD:
+                    if(imagePlugin.Info.Sectors    == 4004 &&
+                       imagePlugin.Info.SectorSize == 128)
+                    {
+                        AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
+                        fakeBpb.bps      = 128;
+                        fakeBpb.spc      = 4;
+                        fakeBpb.rsectors = 4;
+                        fakeBpb.fats_no  = 2;
+                        fakeBpb.root_ent = 68;
+                        fakeBpb.sectors  = 4004;
+                        fakeBpb.media    = 0xFD;
+                        fakeBpb.sptrk    = 26;
+                        fakeBpb.heads    = 2;
+                        fakeBpb.hsectors = 0;
+                        fakeBpb.spfat    = 6;
+                    }
+                    else if(imagePlugin.Info.Sectors    == 2002 &&
+                            imagePlugin.Info.SectorSize == 128)
+                    {
+                        AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
+                        fakeBpb.bps      = 128;
+                        fakeBpb.spc      = 4;
+                        fakeBpb.rsectors = 4;
+                        fakeBpb.fats_no  = 2;
+                        fakeBpb.root_ent = 68;
+                        fakeBpb.sectors  = 2002;
+                        fakeBpb.media    = 0xFD;
+                        fakeBpb.sptrk    = 26;
+                        fakeBpb.heads    = 1;
+                        fakeBpb.hsectors = 0;
+                        fakeBpb.spfat    = 6;
+                    }
+
+                    break;
+                case 0xFE:
+                    switch(imagePlugin.Info.Sectors)
+                    {
+                        case 320 when imagePlugin.Info.SectorSize == 512:
+                            AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB for 5.25\" SSDD.");
+                            fakeBpb.bps      = 512;
+                            fakeBpb.spc      = 1;
+                            fakeBpb.rsectors = 1;
+                            fakeBpb.fats_no  = 2;
+                            fakeBpb.root_ent = 64;
+                            fakeBpb.sectors  = 320;
+                            fakeBpb.media    = 0xFE;
+                            fakeBpb.sptrk    = 8;
+                            fakeBpb.heads    = 1;
+                            fakeBpb.hsectors = 0;
+                            fakeBpb.spfat    = 1;
 
                             break;
-                        }
-
-                    if(!validRootDir)
-                        break;
-                }
-
-                if(z80Di == 0xF3                   &&
-                   equalFatIds                     &&
-                   (fat1Sector0[0] & 0xF0) == 0xF0 &&
-                   fat1Sector0[1]          == 0xFF &&
-                   validRootDir)
-                {
-                    AaruConsole.DebugWriteLine("FAT plugin", "Using DEC Rainbow hardcoded BPB.");
-                    fakeBpb.bps       = 512;
-                    fakeBpb.spc       = 1;
-                    fakeBpb.rsectors  = 20;
-                    fakeBpb.fats_no   = 2;
-                    fakeBpb.root_ent  = 96;
-                    fakeBpb.sectors   = 800;
-                    fakeBpb.media     = 0xFA;
-                    fakeBpb.sptrk     = 10;
-                    fakeBpb.heads     = 1;
-                    fakeBpb.hsectors  = 0;
-                    fakeBpb.spfat     = 3;
-                    bootable          = true;
-                    fakeBpb.boot_code = bpbSector;
-
-                    return BpbKind.DecRainbow;
-                }
-            }
-
-            if(!useAtariBpb          &&
-               !useMsxBpb            &&
-               !useDos2Bpb           &&
-               !useDos3Bpb           &&
-               !useDos32Bpb          &&
-               !useDos33Bpb          &&
-               !useHumanBpb          &&
-               !userShortExtendedBpb &&
-               !useExtendedBpb       &&
-               !useShortFat32        &&
-               !useLongFat32         &&
-               !useApricotBpb        &&
-               !useDecRainbowBpb)
-            {
-                imagePlugin.ReadSector(1 + partition.Start, out byte[] fatSector);
-
-                switch(fatSector[0])
-                {
-                    case 0xE5:
-                        if(imagePlugin.Info.Sectors    == 2002 &&
-                           imagePlugin.Info.SectorSize == 128)
-                        {
+                        case 2002 when imagePlugin.Info.SectorSize == 128:
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
                             fakeBpb.bps      = 128;
                             fakeBpb.spc      = 4;
                             fakeBpb.rsectors = 1;
                             fakeBpb.fats_no  = 2;
-                            fakeBpb.root_ent = 64;
+                            fakeBpb.root_ent = 68;
                             fakeBpb.sectors  = 2002;
-                            fakeBpb.media    = 0xE5;
+                            fakeBpb.media    = 0xFE;
                             fakeBpb.sptrk    = 26;
                             fakeBpb.heads    = 1;
                             fakeBpb.hsectors = 0;
-                            fakeBpb.spfat    = 1;
-                        }
+                            fakeBpb.spfat    = 6;
 
-                        break;
-                    case 0xFD:
-                        if(imagePlugin.Info.Sectors    == 4004 &&
-                           imagePlugin.Info.SectorSize == 128)
-                        {
+                            break;
+                        case 1232 when imagePlugin.Info.SectorSize == 1024:
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
-                            fakeBpb.bps      = 128;
-                            fakeBpb.spc      = 4;
-                            fakeBpb.rsectors = 4;
+                            fakeBpb.bps      = 1024;
+                            fakeBpb.spc      = 1;
+                            fakeBpb.rsectors = 1;
                             fakeBpb.fats_no  = 2;
-                            fakeBpb.root_ent = 68;
-                            fakeBpb.sectors  = 4004;
-                            fakeBpb.media    = 0xFD;
-                            fakeBpb.sptrk    = 26;
+                            fakeBpb.root_ent = 192;
+                            fakeBpb.sectors  = 1232;
+                            fakeBpb.media    = 0xFE;
+                            fakeBpb.sptrk    = 8;
                             fakeBpb.heads    = 2;
                             fakeBpb.hsectors = 0;
-                            fakeBpb.spfat    = 6;
-                        }
-                        else if(imagePlugin.Info.Sectors    == 2002 &&
-                                imagePlugin.Info.SectorSize == 128)
-                        {
+                            fakeBpb.spfat    = 2;
+
+                            break;
+                        case 616 when imagePlugin.Info.SectorSize == 1024:
+                            AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
+                            fakeBpb.bps      = 1024;
+                            fakeBpb.spc      = 1;
+                            fakeBpb.rsectors = 1;
+                            fakeBpb.fats_no  = 2;
+                            fakeBpb.root_ent = 6192;
+                            fakeBpb.sectors  = 616;
+                            fakeBpb.media    = 0xFE;
+                            fakeBpb.sptrk    = 8;
+                            fakeBpb.heads    = 2;
+                            fakeBpb.hsectors = 0;
+
+                            break;
+                        case 720 when imagePlugin.Info.SectorSize == 128:
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
                             fakeBpb.bps      = 128;
-                            fakeBpb.spc      = 4;
-                            fakeBpb.rsectors = 4;
+                            fakeBpb.spc      = 2;
+                            fakeBpb.rsectors = 54;
                             fakeBpb.fats_no  = 2;
-                            fakeBpb.root_ent = 68;
-                            fakeBpb.sectors  = 2002;
-                            fakeBpb.media    = 0xFD;
-                            fakeBpb.sptrk    = 26;
+                            fakeBpb.root_ent = 64;
+                            fakeBpb.sectors  = 720;
+                            fakeBpb.media    = 0xFE;
+                            fakeBpb.sptrk    = 18;
                             fakeBpb.heads    = 1;
                             fakeBpb.hsectors = 0;
-                            fakeBpb.spfat    = 6;
-                        }
+                            fakeBpb.spfat    = 4;
 
-                        break;
-                    case 0xFE:
-                        switch(imagePlugin.Info.Sectors)
-                        {
-                            case 320 when imagePlugin.Info.SectorSize == 512:
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB for 5.25\" SSDD.");
-                                fakeBpb.bps      = 512;
-                                fakeBpb.spc      = 1;
-                                fakeBpb.rsectors = 1;
-                                fakeBpb.fats_no  = 2;
-                                fakeBpb.root_ent = 64;
-                                fakeBpb.sectors  = 320;
-                                fakeBpb.media    = 0xFE;
-                                fakeBpb.sptrk    = 8;
-                                fakeBpb.heads    = 1;
-                                fakeBpb.hsectors = 0;
-                                fakeBpb.spfat    = 1;
-
-                                break;
-                            case 2002 when imagePlugin.Info.SectorSize == 128:
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
-                                fakeBpb.bps      = 128;
-                                fakeBpb.spc      = 4;
-                                fakeBpb.rsectors = 1;
-                                fakeBpb.fats_no  = 2;
-                                fakeBpb.root_ent = 68;
-                                fakeBpb.sectors  = 2002;
-                                fakeBpb.media    = 0xFE;
-                                fakeBpb.sptrk    = 26;
-                                fakeBpb.heads    = 1;
-                                fakeBpb.hsectors = 0;
-                                fakeBpb.spfat    = 6;
-
-                                break;
-                            case 1232 when imagePlugin.Info.SectorSize == 1024:
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
-                                fakeBpb.bps      = 1024;
-                                fakeBpb.spc      = 1;
-                                fakeBpb.rsectors = 1;
-                                fakeBpb.fats_no  = 2;
-                                fakeBpb.root_ent = 192;
-                                fakeBpb.sectors  = 1232;
-                                fakeBpb.media    = 0xFE;
-                                fakeBpb.sptrk    = 8;
-                                fakeBpb.heads    = 2;
-                                fakeBpb.hsectors = 0;
-                                fakeBpb.spfat    = 2;
-
-                                break;
-                            case 616 when imagePlugin.Info.SectorSize == 1024:
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
-                                fakeBpb.bps      = 1024;
-                                fakeBpb.spc      = 1;
-                                fakeBpb.rsectors = 1;
-                                fakeBpb.fats_no  = 2;
-                                fakeBpb.root_ent = 6192;
-                                fakeBpb.sectors  = 616;
-                                fakeBpb.media    = 0xFE;
-                                fakeBpb.sptrk    = 8;
-                                fakeBpb.heads    = 2;
-                                fakeBpb.hsectors = 0;
-
-                                break;
-                            case 720 when imagePlugin.Info.SectorSize == 128:
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB.");
-                                fakeBpb.bps      = 128;
-                                fakeBpb.spc      = 2;
-                                fakeBpb.rsectors = 54;
-                                fakeBpb.fats_no  = 2;
-                                fakeBpb.root_ent = 64;
-                                fakeBpb.sectors  = 720;
-                                fakeBpb.media    = 0xFE;
-                                fakeBpb.sptrk    = 18;
-                                fakeBpb.heads    = 1;
-                                fakeBpb.hsectors = 0;
-                                fakeBpb.spfat    = 4;
-
-                                break;
-                            case 640 when imagePlugin.Info.SectorSize == 512:
-                                AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB for 5.25\" DSDD.");
-                                fakeBpb.bps      = 512;
-                                fakeBpb.spc      = 2;
-                                fakeBpb.rsectors = 1;
-                                fakeBpb.fats_no  = 2;
-                                fakeBpb.root_ent = 112;
-                                fakeBpb.sectors  = 640;
-                                fakeBpb.media    = 0xFF;
-                                fakeBpb.sptrk    = 8;
-                                fakeBpb.heads    = 2;
-                                fakeBpb.hsectors = 0;
-                                fakeBpb.spfat    = 1;
-
-                                break;
-                        }
-
-                        break;
-                    case 0xFF:
-                        if(imagePlugin.Info.Sectors    == 640 &&
-                           imagePlugin.Info.SectorSize == 512)
-                        {
+                            break;
+                        case 640 when imagePlugin.Info.SectorSize == 512:
                             AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB for 5.25\" DSDD.");
                             fakeBpb.bps      = 512;
                             fakeBpb.spc      = 2;
@@ -627,202 +606,222 @@ namespace Aaru.Filesystems
                             fakeBpb.heads    = 2;
                             fakeBpb.hsectors = 0;
                             fakeBpb.spfat    = 1;
-                        }
 
-                        break;
-                }
+                            break;
+                    }
 
-                // This assumes a bootable sector will jump somewhere or disable interrupts in x86 code
-                bootable |= bpbSector[0] == 0xFA || (bpbSector[0] == 0xEB && bpbSector[1] <= 0x7F) ||
-                            (bpbSector[0] == 0xE9 && BitConverter.ToUInt16(bpbSector, 1) <= 0x1FC);
+                    break;
+                case 0xFF:
+                    if(imagePlugin.Info.Sectors    == 640 &&
+                       imagePlugin.Info.SectorSize == 512)
+                    {
+                        AaruConsole.DebugWriteLine("FAT plugin", "Using hardcoded BPB for 5.25\" DSDD.");
+                        fakeBpb.bps      = 512;
+                        fakeBpb.spc      = 2;
+                        fakeBpb.rsectors = 1;
+                        fakeBpb.fats_no  = 2;
+                        fakeBpb.root_ent = 112;
+                        fakeBpb.sectors  = 640;
+                        fakeBpb.media    = 0xFF;
+                        fakeBpb.sptrk    = 8;
+                        fakeBpb.heads    = 2;
+                        fakeBpb.hsectors = 0;
+                        fakeBpb.spfat    = 1;
+                    }
 
-                fakeBpb.boot_code = bpbSector;
-
-                return BpbKind.Hardcoded;
+                    break;
             }
 
-            if(useExtendedBpb)
-            {
-                fakeBpb = ebpb;
+            // This assumes a bootable sector will jump somewhere or disable interrupts in x86 code
+            bootable |= bpbSector[0] == 0xFA || (bpbSector[0] == 0xEB && bpbSector[1]                        <= 0x7F) ||
+                        (bpbSector[0]                         == 0xE9 && BitConverter.ToUInt16(bpbSector, 1) <= 0x1FC);
 
-                return BpbKind.Extended;
-            }
+            fakeBpb.boot_code = bpbSector;
 
-            if(userShortExtendedBpb)
-            {
-                fakeBpb.jump           = shortEbpb.jump;
-                fakeBpb.oem_name       = shortEbpb.oem_name;
-                fakeBpb.bps            = shortEbpb.bps;
-                fakeBpb.spc            = shortEbpb.spc;
-                fakeBpb.rsectors       = shortEbpb.rsectors;
-                fakeBpb.fats_no        = shortEbpb.fats_no;
-                fakeBpb.root_ent       = shortEbpb.root_ent;
-                fakeBpb.sectors        = shortEbpb.sectors;
-                fakeBpb.media          = shortEbpb.media;
-                fakeBpb.spfat          = shortEbpb.spfat;
-                fakeBpb.sptrk          = shortEbpb.sptrk;
-                fakeBpb.heads          = shortEbpb.heads;
-                fakeBpb.hsectors       = shortEbpb.hsectors;
-                fakeBpb.big_sectors    = shortEbpb.big_sectors;
-                fakeBpb.drive_no       = shortEbpb.drive_no;
-                fakeBpb.flags          = shortEbpb.flags;
-                fakeBpb.signature      = shortEbpb.signature;
-                fakeBpb.serial_no      = shortEbpb.serial_no;
-                fakeBpb.boot_code      = shortEbpb.boot_code;
-                fakeBpb.boot_signature = shortEbpb.boot_signature;
-
-                return BpbKind.ShortExtended;
-            }
-
-            if(useDos33Bpb)
-            {
-                fakeBpb.jump           = dos33Bpb.jump;
-                fakeBpb.oem_name       = dos33Bpb.oem_name;
-                fakeBpb.bps            = dos33Bpb.bps;
-                fakeBpb.spc            = dos33Bpb.spc;
-                fakeBpb.rsectors       = dos33Bpb.rsectors;
-                fakeBpb.fats_no        = dos33Bpb.fats_no;
-                fakeBpb.root_ent       = dos33Bpb.root_ent;
-                fakeBpb.sectors        = dos33Bpb.sectors;
-                fakeBpb.media          = dos33Bpb.media;
-                fakeBpb.spfat          = dos33Bpb.spfat;
-                fakeBpb.sptrk          = dos33Bpb.sptrk;
-                fakeBpb.heads          = dos33Bpb.heads;
-                fakeBpb.hsectors       = dos33Bpb.hsectors;
-                fakeBpb.big_sectors    = dos33Bpb.big_sectors;
-                fakeBpb.boot_code      = dos33Bpb.boot_code;
-                fakeBpb.boot_signature = dos33Bpb.boot_signature;
-
-                return BpbKind.Dos33;
-            }
-
-            if(useDos32Bpb)
-            {
-                fakeBpb.jump           = dos32Bpb.jump;
-                fakeBpb.oem_name       = dos32Bpb.oem_name;
-                fakeBpb.bps            = dos32Bpb.bps;
-                fakeBpb.spc            = dos32Bpb.spc;
-                fakeBpb.rsectors       = dos32Bpb.rsectors;
-                fakeBpb.fats_no        = dos32Bpb.fats_no;
-                fakeBpb.root_ent       = dos32Bpb.root_ent;
-                fakeBpb.sectors        = dos32Bpb.sectors;
-                fakeBpb.media          = dos32Bpb.media;
-                fakeBpb.spfat          = dos32Bpb.spfat;
-                fakeBpb.sptrk          = dos32Bpb.sptrk;
-                fakeBpb.heads          = dos32Bpb.heads;
-                fakeBpb.hsectors       = dos32Bpb.hsectors;
-                fakeBpb.boot_code      = dos32Bpb.boot_code;
-                fakeBpb.boot_signature = dos32Bpb.boot_signature;
-
-                return BpbKind.Dos32;
-            }
-
-            if(useDos3Bpb)
-            {
-                fakeBpb.jump           = dos30Bpb.jump;
-                fakeBpb.oem_name       = dos30Bpb.oem_name;
-                fakeBpb.bps            = dos30Bpb.bps;
-                fakeBpb.spc            = dos30Bpb.spc;
-                fakeBpb.rsectors       = dos30Bpb.rsectors;
-                fakeBpb.fats_no        = dos30Bpb.fats_no;
-                fakeBpb.root_ent       = dos30Bpb.root_ent;
-                fakeBpb.sectors        = dos30Bpb.sectors;
-                fakeBpb.media          = dos30Bpb.media;
-                fakeBpb.spfat          = dos30Bpb.spfat;
-                fakeBpb.sptrk          = dos30Bpb.sptrk;
-                fakeBpb.heads          = dos30Bpb.heads;
-                fakeBpb.hsectors       = dos30Bpb.hsectors;
-                fakeBpb.boot_code      = dos30Bpb.boot_code;
-                fakeBpb.boot_signature = dos30Bpb.boot_signature;
-
-                return BpbKind.Dos3;
-            }
-
-            if(useDos2Bpb)
-            {
-                fakeBpb.jump           = dos2Bpb.jump;
-                fakeBpb.oem_name       = dos2Bpb.oem_name;
-                fakeBpb.bps            = dos2Bpb.bps;
-                fakeBpb.spc            = dos2Bpb.spc;
-                fakeBpb.rsectors       = dos2Bpb.rsectors;
-                fakeBpb.fats_no        = dos2Bpb.fats_no;
-                fakeBpb.root_ent       = dos2Bpb.root_ent;
-                fakeBpb.sectors        = dos2Bpb.sectors;
-                fakeBpb.media          = dos2Bpb.media;
-                fakeBpb.spfat          = dos2Bpb.spfat;
-                fakeBpb.boot_code      = dos2Bpb.boot_code;
-                fakeBpb.boot_signature = dos2Bpb.boot_signature;
-
-                return BpbKind.Dos2;
-            }
-
-            if(useMsxBpb)
-            {
-                fakeBpb.jump           = msxBpb.jump;
-                fakeBpb.oem_name       = msxBpb.oem_name;
-                fakeBpb.bps            = msxBpb.bps;
-                fakeBpb.spc            = msxBpb.spc;
-                fakeBpb.rsectors       = msxBpb.rsectors;
-                fakeBpb.fats_no        = msxBpb.fats_no;
-                fakeBpb.root_ent       = msxBpb.root_ent;
-                fakeBpb.sectors        = msxBpb.sectors;
-                fakeBpb.media          = msxBpb.media;
-                fakeBpb.spfat          = msxBpb.spfat;
-                fakeBpb.sptrk          = msxBpb.sptrk;
-                fakeBpb.heads          = msxBpb.heads;
-                fakeBpb.hsectors       = msxBpb.hsectors;
-                fakeBpb.boot_code      = msxBpb.boot_code;
-                fakeBpb.boot_signature = msxBpb.boot_signature;
-                fakeBpb.serial_no      = msxBpb.serial_no;
-
-                // TODO: Is there any way to check this?
-                bootable = true;
-
-                return BpbKind.Msx;
-            }
-
-            if(useAtariBpb)
-            {
-                fakeBpb.jump      = atariBpb.jump;
-                fakeBpb.oem_name  = atariBpb.oem_name;
-                fakeBpb.bps       = atariBpb.bps;
-                fakeBpb.spc       = atariBpb.spc;
-                fakeBpb.rsectors  = atariBpb.rsectors;
-                fakeBpb.fats_no   = atariBpb.fats_no;
-                fakeBpb.root_ent  = atariBpb.root_ent;
-                fakeBpb.sectors   = atariBpb.sectors;
-                fakeBpb.media     = atariBpb.media;
-                fakeBpb.spfat     = atariBpb.spfat;
-                fakeBpb.sptrk     = atariBpb.sptrk;
-                fakeBpb.heads     = atariBpb.heads;
-                fakeBpb.boot_code = atariBpb.boot_code;
-
-                return BpbKind.Atari;
-            }
-
-            if(useApricotBpb)
-            {
-                fakeBpb.bps      = apricotBpb.mainBPB.bps;
-                fakeBpb.spc      = apricotBpb.mainBPB.spc;
-                fakeBpb.rsectors = apricotBpb.mainBPB.rsectors;
-                fakeBpb.fats_no  = apricotBpb.mainBPB.fats_no;
-                fakeBpb.root_ent = apricotBpb.mainBPB.root_ent;
-                fakeBpb.sectors  = apricotBpb.mainBPB.sectors;
-                fakeBpb.media    = apricotBpb.mainBPB.media;
-                fakeBpb.spfat    = apricotBpb.mainBPB.spfat;
-                fakeBpb.sptrk    = apricotBpb.spt;
-                bootable         = apricotBpb.bootType > 0;
-
-                if(apricotBpb.bootLocation                       > 0 &&
-                   apricotBpb.bootLocation + apricotBpb.bootSize < imagePlugin.Info.Sectors)
-                    imagePlugin.ReadSectors(apricotBpb.bootLocation,
-                                                                (uint)(apricotBpb.sectorSize * apricotBpb.bootSize) /
-                                                                imagePlugin.Info.SectorSize, out fakeBpb.boot_code);
-
-                return BpbKind.Apricot;
-            }
-
-            return BpbKind.None;
+            return BpbKind.Hardcoded;
         }
+
+        if(useExtendedBpb)
+        {
+            fakeBpb = ebpb;
+
+            return BpbKind.Extended;
+        }
+
+        if(userShortExtendedBpb)
+        {
+            fakeBpb.jump           = shortEbpb.jump;
+            fakeBpb.oem_name       = shortEbpb.oem_name;
+            fakeBpb.bps            = shortEbpb.bps;
+            fakeBpb.spc            = shortEbpb.spc;
+            fakeBpb.rsectors       = shortEbpb.rsectors;
+            fakeBpb.fats_no        = shortEbpb.fats_no;
+            fakeBpb.root_ent       = shortEbpb.root_ent;
+            fakeBpb.sectors        = shortEbpb.sectors;
+            fakeBpb.media          = shortEbpb.media;
+            fakeBpb.spfat          = shortEbpb.spfat;
+            fakeBpb.sptrk          = shortEbpb.sptrk;
+            fakeBpb.heads          = shortEbpb.heads;
+            fakeBpb.hsectors       = shortEbpb.hsectors;
+            fakeBpb.big_sectors    = shortEbpb.big_sectors;
+            fakeBpb.drive_no       = shortEbpb.drive_no;
+            fakeBpb.flags          = shortEbpb.flags;
+            fakeBpb.signature      = shortEbpb.signature;
+            fakeBpb.serial_no      = shortEbpb.serial_no;
+            fakeBpb.boot_code      = shortEbpb.boot_code;
+            fakeBpb.boot_signature = shortEbpb.boot_signature;
+
+            return BpbKind.ShortExtended;
+        }
+
+        if(useDos33Bpb)
+        {
+            fakeBpb.jump           = dos33Bpb.jump;
+            fakeBpb.oem_name       = dos33Bpb.oem_name;
+            fakeBpb.bps            = dos33Bpb.bps;
+            fakeBpb.spc            = dos33Bpb.spc;
+            fakeBpb.rsectors       = dos33Bpb.rsectors;
+            fakeBpb.fats_no        = dos33Bpb.fats_no;
+            fakeBpb.root_ent       = dos33Bpb.root_ent;
+            fakeBpb.sectors        = dos33Bpb.sectors;
+            fakeBpb.media          = dos33Bpb.media;
+            fakeBpb.spfat          = dos33Bpb.spfat;
+            fakeBpb.sptrk          = dos33Bpb.sptrk;
+            fakeBpb.heads          = dos33Bpb.heads;
+            fakeBpb.hsectors       = dos33Bpb.hsectors;
+            fakeBpb.big_sectors    = dos33Bpb.big_sectors;
+            fakeBpb.boot_code      = dos33Bpb.boot_code;
+            fakeBpb.boot_signature = dos33Bpb.boot_signature;
+
+            return BpbKind.Dos33;
+        }
+
+        if(useDos32Bpb)
+        {
+            fakeBpb.jump           = dos32Bpb.jump;
+            fakeBpb.oem_name       = dos32Bpb.oem_name;
+            fakeBpb.bps            = dos32Bpb.bps;
+            fakeBpb.spc            = dos32Bpb.spc;
+            fakeBpb.rsectors       = dos32Bpb.rsectors;
+            fakeBpb.fats_no        = dos32Bpb.fats_no;
+            fakeBpb.root_ent       = dos32Bpb.root_ent;
+            fakeBpb.sectors        = dos32Bpb.sectors;
+            fakeBpb.media          = dos32Bpb.media;
+            fakeBpb.spfat          = dos32Bpb.spfat;
+            fakeBpb.sptrk          = dos32Bpb.sptrk;
+            fakeBpb.heads          = dos32Bpb.heads;
+            fakeBpb.hsectors       = dos32Bpb.hsectors;
+            fakeBpb.boot_code      = dos32Bpb.boot_code;
+            fakeBpb.boot_signature = dos32Bpb.boot_signature;
+
+            return BpbKind.Dos32;
+        }
+
+        if(useDos3Bpb)
+        {
+            fakeBpb.jump           = dos30Bpb.jump;
+            fakeBpb.oem_name       = dos30Bpb.oem_name;
+            fakeBpb.bps            = dos30Bpb.bps;
+            fakeBpb.spc            = dos30Bpb.spc;
+            fakeBpb.rsectors       = dos30Bpb.rsectors;
+            fakeBpb.fats_no        = dos30Bpb.fats_no;
+            fakeBpb.root_ent       = dos30Bpb.root_ent;
+            fakeBpb.sectors        = dos30Bpb.sectors;
+            fakeBpb.media          = dos30Bpb.media;
+            fakeBpb.spfat          = dos30Bpb.spfat;
+            fakeBpb.sptrk          = dos30Bpb.sptrk;
+            fakeBpb.heads          = dos30Bpb.heads;
+            fakeBpb.hsectors       = dos30Bpb.hsectors;
+            fakeBpb.boot_code      = dos30Bpb.boot_code;
+            fakeBpb.boot_signature = dos30Bpb.boot_signature;
+
+            return BpbKind.Dos3;
+        }
+
+        if(useDos2Bpb)
+        {
+            fakeBpb.jump           = dos2Bpb.jump;
+            fakeBpb.oem_name       = dos2Bpb.oem_name;
+            fakeBpb.bps            = dos2Bpb.bps;
+            fakeBpb.spc            = dos2Bpb.spc;
+            fakeBpb.rsectors       = dos2Bpb.rsectors;
+            fakeBpb.fats_no        = dos2Bpb.fats_no;
+            fakeBpb.root_ent       = dos2Bpb.root_ent;
+            fakeBpb.sectors        = dos2Bpb.sectors;
+            fakeBpb.media          = dos2Bpb.media;
+            fakeBpb.spfat          = dos2Bpb.spfat;
+            fakeBpb.boot_code      = dos2Bpb.boot_code;
+            fakeBpb.boot_signature = dos2Bpb.boot_signature;
+
+            return BpbKind.Dos2;
+        }
+
+        if(useMsxBpb)
+        {
+            fakeBpb.jump           = msxBpb.jump;
+            fakeBpb.oem_name       = msxBpb.oem_name;
+            fakeBpb.bps            = msxBpb.bps;
+            fakeBpb.spc            = msxBpb.spc;
+            fakeBpb.rsectors       = msxBpb.rsectors;
+            fakeBpb.fats_no        = msxBpb.fats_no;
+            fakeBpb.root_ent       = msxBpb.root_ent;
+            fakeBpb.sectors        = msxBpb.sectors;
+            fakeBpb.media          = msxBpb.media;
+            fakeBpb.spfat          = msxBpb.spfat;
+            fakeBpb.sptrk          = msxBpb.sptrk;
+            fakeBpb.heads          = msxBpb.heads;
+            fakeBpb.hsectors       = msxBpb.hsectors;
+            fakeBpb.boot_code      = msxBpb.boot_code;
+            fakeBpb.boot_signature = msxBpb.boot_signature;
+            fakeBpb.serial_no      = msxBpb.serial_no;
+
+            // TODO: Is there any way to check this?
+            bootable = true;
+
+            return BpbKind.Msx;
+        }
+
+        if(useAtariBpb)
+        {
+            fakeBpb.jump      = atariBpb.jump;
+            fakeBpb.oem_name  = atariBpb.oem_name;
+            fakeBpb.bps       = atariBpb.bps;
+            fakeBpb.spc       = atariBpb.spc;
+            fakeBpb.rsectors  = atariBpb.rsectors;
+            fakeBpb.fats_no   = atariBpb.fats_no;
+            fakeBpb.root_ent  = atariBpb.root_ent;
+            fakeBpb.sectors   = atariBpb.sectors;
+            fakeBpb.media     = atariBpb.media;
+            fakeBpb.spfat     = atariBpb.spfat;
+            fakeBpb.sptrk     = atariBpb.sptrk;
+            fakeBpb.heads     = atariBpb.heads;
+            fakeBpb.boot_code = atariBpb.boot_code;
+
+            return BpbKind.Atari;
+        }
+
+        if(useApricotBpb)
+        {
+            fakeBpb.bps      = apricotBpb.mainBPB.bps;
+            fakeBpb.spc      = apricotBpb.mainBPB.spc;
+            fakeBpb.rsectors = apricotBpb.mainBPB.rsectors;
+            fakeBpb.fats_no  = apricotBpb.mainBPB.fats_no;
+            fakeBpb.root_ent = apricotBpb.mainBPB.root_ent;
+            fakeBpb.sectors  = apricotBpb.mainBPB.sectors;
+            fakeBpb.media    = apricotBpb.mainBPB.media;
+            fakeBpb.spfat    = apricotBpb.mainBPB.spfat;
+            fakeBpb.sptrk    = apricotBpb.spt;
+            bootable         = apricotBpb.bootType > 0;
+
+            if(apricotBpb.bootLocation                       > 0 &&
+               apricotBpb.bootLocation + apricotBpb.bootSize < imagePlugin.Info.Sectors)
+                imagePlugin.ReadSectors(apricotBpb.bootLocation,
+                                        (uint)(apricotBpb.sectorSize * apricotBpb.bootSize) /
+                                        imagePlugin.Info.SectorSize, out fakeBpb.boot_code);
+
+            return BpbKind.Apricot;
+        }
+
+        return BpbKind.None;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FAT/Consts.cs b/Aaru.Filesystems/FAT/Consts.cs
index d974d5ade..30afff3fb 100644
--- a/Aaru.Filesystems/FAT/Consts.cs
+++ b/Aaru.Filesystems/FAT/Consts.cs
@@ -34,193 +34,192 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class FAT
 {
-    public sealed partial class FAT
+    const uint FSINFO_SIGNATURE1 = 0x41615252;
+    const uint FSINFO_SIGNATURE2 = 0x61417272;
+    const uint FSINFO_SIGNATURE3 = 0xAA550000;
+    /// <summary>Directory finishes</summary>
+    const byte DIRENT_FINISHED = 0x00;
+    /// <summary>Deleted directory entry</summary>
+    const byte DIRENT_DELETED = 0xE5;
+    /// <summary>Minimum allowed value in name/extension</summary>
+    const byte DIRENT_MIN = 0x20;
+    /// <summary>Value used instead of <see cref="DIRENT_FINISHED" /> for first name character</summary>
+    const byte DIRENT_E5 = 0x05;
+    /// <summary>Entry points to self or parent directory</summary>
+    const byte DIRENT_SUBDIR = 0x2E;
+    const uint   FAT32_MASK      = 0x0FFFFFFF;
+    const uint   FAT32_END_MASK  = 0xFFFFFF8;
+    const uint   FAT32_FORMATTED = 0xFFFFFF6;
+    const uint   FAT32_BAD       = 0xFFFFFF7;
+    const uint   FAT32_RESERVED  = 0xFFFFFF0;
+    const ushort FAT16_END_MASK  = 0xFFF8;
+    const ushort FAT16_FORMATTED = 0xFFF6;
+    const ushort FAT16_BAD       = 0xFFF7;
+    const ushort FAT16_RESERVED  = 0xFFF0;
+    const ushort FAT12_END_MASK  = 0xFF8;
+    const ushort FAT12_FORMATTED = 0xFF6;
+    const ushort FAT12_BAD       = 0xFF7;
+    const ushort FAT12_RESERVED  = 0xFF0;
+    const byte   LFN_ERASED      = 0x80;
+    const byte   LFN_LAST        = 0x40;
+    const byte   LFN_MASK        = 0x1F;
+    const ushort EADATA_MAGIC    = 0x4445;
+    const ushort EASCTR_MAGIC    = 0x4145;
+    const ushort EA_UNUSED       = 0xFFFF;
+    const ushort EAT_BINARY      = 0xFFFE;
+    const ushort EAT_ASCII       = 0xFFFD;
+    const ushort EAT_BITMAP      = 0xFFFB;
+    const ushort EAT_METAFILE    = 0xFFFA;
+    const ushort EAT_ICON        = 0xFFF9;
+    const ushort EAT_EA          = 0xFFEE;
+    const ushort EAT_MVMT        = 0xFFDF;
+    const ushort EAT_MVST        = 0xFFDE;
+    const ushort EAT_ASN1        = 0xFFDD;
+    const string FAT32_EA_TAIL   = " EA. SF";
+
+    readonly (string hash, string name)[] _knownBootHashes =
     {
-        const uint FSINFO_SIGNATURE1 = 0x41615252;
-        const uint FSINFO_SIGNATURE2 = 0x61417272;
-        const uint FSINFO_SIGNATURE3 = 0xAA550000;
-        /// <summary>Directory finishes</summary>
-        const byte DIRENT_FINISHED = 0x00;
-        /// <summary>Deleted directory entry</summary>
-        const byte DIRENT_DELETED = 0xE5;
-        /// <summary>Minimum allowed value in name/extension</summary>
-        const byte DIRENT_MIN = 0x20;
-        /// <summary>Value used instead of <see cref="DIRENT_FINISHED" /> for first name character</summary>
-        const byte DIRENT_E5 = 0x05;
-        /// <summary>Entry points to self or parent directory</summary>
-        const byte DIRENT_SUBDIR = 0x2E;
-        const uint   FAT32_MASK      = 0x0FFFFFFF;
-        const uint   FAT32_END_MASK  = 0xFFFFFF8;
-        const uint   FAT32_FORMATTED = 0xFFFFFF6;
-        const uint   FAT32_BAD       = 0xFFFFFF7;
-        const uint   FAT32_RESERVED  = 0xFFFFFF0;
-        const ushort FAT16_END_MASK  = 0xFFF8;
-        const ushort FAT16_FORMATTED = 0xFFF6;
-        const ushort FAT16_BAD       = 0xFFF7;
-        const ushort FAT16_RESERVED  = 0xFFF0;
-        const ushort FAT12_END_MASK  = 0xFF8;
-        const ushort FAT12_FORMATTED = 0xFF6;
-        const ushort FAT12_BAD       = 0xFF7;
-        const ushort FAT12_RESERVED  = 0xFF0;
-        const byte   LFN_ERASED      = 0x80;
-        const byte   LFN_LAST        = 0x40;
-        const byte   LFN_MASK        = 0x1F;
-        const ushort EADATA_MAGIC    = 0x4445;
-        const ushort EASCTR_MAGIC    = 0x4145;
-        const ushort EA_UNUSED       = 0xFFFF;
-        const ushort EAT_BINARY      = 0xFFFE;
-        const ushort EAT_ASCII       = 0xFFFD;
-        const ushort EAT_BITMAP      = 0xFFFB;
-        const ushort EAT_METAFILE    = 0xFFFA;
-        const ushort EAT_ICON        = 0xFFF9;
-        const ushort EAT_EA          = 0xFFEE;
-        const ushort EAT_MVMT        = 0xFFDF;
-        const ushort EAT_MVST        = 0xFFDE;
-        const ushort EAT_ASN1        = 0xFFDD;
-        const string FAT32_EA_TAIL   = " EA. SF";
+        ("b639b4d5b25f63560e3b34a3a0feb732aa65486f", "Amstrad MS-DOS 3.20 (8-sector floppy)"),
+        ("9311151f13f7611b1431593da05ddd3153370574", "Amstrad MS-DOS 3.20 (Spanish)"),
+        ("55eda6a9b955f5199020e6b56a6954fa6fcb7dc6", "AT&T MS-DOS 2.11"),
+        ("d5e10822977efa96e4fbaec2b268ca008d74fe6f", "Atari TOS"),
+        ("17f11a12b96899d2a4976d889cef160502167f2d", "BeOS"),
+        ("d0e31673028fcfcea38dff71a7be13669aa20b8d", "Compaq MS-DOS 3.30"),
+        ("3aa4ce2fa6f9a297b5b15aaef930401af369fcbc", "Compaq MS-DOS 3.30 (8-sector floppy)"),
+        ("8f1d33520343f35034aa3ce47e4180b10e960b43", "Compaq MS-DOS 3.30 (8-sector floppy)"),
+        ("2f4011ae0670ff3aff2bdd412a4651f255b600a9", "Compaq MS-DOS 3.31"),
+        ("afc3fb751089a52c9f0bd37098d3137d32ab4982", "Concurrent DOS 6.0"),
+        ("c25e2d93d3b8bf9870043bf9d12580ef07f5375e", "CrossDOS"),
+        ("43fb2afa1ab3102b3f8d0fe901b652a5b0a973e1", "DR-DOS >=7.02"),
+        ("92d83b7e9e3bd4b73c6b98f8c6434206eac7212f", "DR-DOS 3.40"),
+        ("6a7aba05f91c5a7108edc5d5ccc9dac0ebf5dd28", "DR-DOS 3.40"),
+        ("715e78bb1e38b56452dd1c15db8c096dc506eea3", "DR-DOS 3.41"),
+        ("01e46cb2bc6d65ddd89ba28d254baf563d8fc609", "DR-DOS 5.00"),
+        ("dd297f159eef8a61f5eec638ce7318a098fa26f4", "DR-DOS 5.00"),
+        ("f590e53ae7f9caec5dba93241e557710be61b6fe", "DR-DOS 6.00"),
+        ("630e4aaf230f15eb2d09985f294815b6bc50384c", "DR-DOS 6.00"),
+        ("8851459816d714f53b9c469472e51460ebd44b98", "DR-DOS 7.03"),
+        ("cf24388b61eb1b137f2bb8a4c319e7461d460b72", "DR-DOS 7.03"),
+        ("26bf8efe8368e598397b1f79d635faccf5ca4f87", "DR-DOS 8.00"),
+        ("36ddd6bf8686801f5a2a3cbd4656afa175cabdfc", "DR-DOS 8.00"),
+        ("9ac09781e4090d9ba5e1a31816b4ebfa6b54f39e", "DR-DOS 8.00"),
+        ("f5d68f26abec8392ac23716581c4ab1d6e8456a2", "eComStation"),
+        ("e2a852db8c3eb3d86ca86a706186a9dd54cdc815", "Epson MS-DOS 3.10"),
+        ("74675d158dd0f6b5983bd30dda7018a814bd34dd", "Epson MS-DOS 3.20"),
+        ("683a04f34714555df5e862f709f9abc7de51488e", "Epson MS-DOS 5.00 (PC-98)"),
+        ("1b062df94fc576af069e40603bf2558000a2ca10", "FreeBSD, NetBSD, Mac OS X"),
+        ("33c8e306b3a51e09668fd60f099450019a1238ea", "FreeBSD, NetBSD, Mac OS X"),
+        ("ca386b1cefaf964a49192c2cd08077aff09b82af", "FreeDOS"),
+        ("26033e0db1ee4f439f07077b790e189d1b77688c", "HP MS-DOS 3.20"),
+        ("66867cd665e0e87c32de0bcb721ecfe91a551bc5", "mkfs.vfat"),
+        ("48d4811dbea5d724803017d6d45a49d604982b7b", "mkfs.vfat"),
+        ("02d615c5fb68bc49766bf89777dd36accb1428b7", "MS-DOS >=4.01, PC-DOS >=5.00 (8-sector floppy)"),
+        ("cffb1dc01bf9f533ba63d949c359c9ae97944c9b", "MS-DOS >=5.00"),
+        ("bd099151f2f9f8b3815eef7d9fed90abead52d97", "MS-DOS 3.21"),
+        ("f338eeff68f4e03ce489eb165e18fd94f8a0c63e", "MS-DOS 3.30A"),
+        ("0eb0c789e141d59d91f075ef14d63fd4255aeac2", "MS-DOS 3.30A, 5.00, 6.xx (8-sector floppy)"),
+        ("7aa06595490f92e542965b43805eaa0d6da9c86c", "MS-DOS 3.31"),
+        ("00401ca66900d7defcbc3d794654d1ba2376e83d", "MS-DOS 3.31"),
+        ("00e39a27d9b36e88f2b0caaa1959a8e17223bf31", "MS-DOS 3.31 (8-sector floppy)"),
+        ("1e74fbad5948582247280b116e7175b5a16bcede", "MS-DOS 3.31 (8-sector floppy)"),
+        ("1cfb2cc3a34c8164b8f5051c118643b23a60f4d0", "MS-DOS 4.01"),
+        ("d370551c8aca9cfcd964e2a1235071329f93cc03", "Multiuser DOS 7.22r4"),
+        ("7106ea11dd0b9a39649cbb4f6314a0fa1241da38", "NEC >=MS-DOS 5.00 (PC-98)"),
+        ("30d4f5f54215af0fc69236594e52b94989b35c21", "NEC MS-DOS 3.30 (PC-98)"),
+        ("eae42777f562eb81ed624f0c0479347ba11158c9", "Novell DOS 7.00"),
+        ("c67a7d0bab94a960cca8720d476f5317c960b2fb", "Novell DOS 7.00"),
+        ("0ed508c71bcf1418a1701b9267ddf166e7993b6b", "Olivetti MS-DOS 3.10"),
+        ("3e1a3f22973d9f2d15f9a053204c2f7b72de00a9", "OS/2 1.00"),
+        ("4acb13943f21a266f9eb110969980481783c41c4", "OS/2 1.10"),
+        ("cc7b32236c76d34edefdac3ca6a7be8e26163cea", "OS/2 1.20, 1.30"),
+        ("05c6706189fa0532ea83a7484b88d1dcba63e167", "OS/2 2.00"),
+        ("eefb4383b3e2b05f7f7e0051d58f4617a4f39e42", "OS/2 2.1x, Warp 3"),
+        ("b1d9666ae8781958242da27d319e73aa2dda6805", "OS/2 Warp 4"),
+        ("661d92970ab0f81cec453dc7584e0debdd1b4928", "PC-DOS >=5.00"),
+        ("78522b303fe5752f3cb37eabb6cb54e6cb0cd276", "PC-DOS 2.xx"),
+        ("277edfefdc3f05a219f9378076227c4126b6c8ef", "PC-DOS 3.00"),
+        ("f72ef6ff4c90a170bc8cdd1b01e8d98235c16a3b", "PC-DOS 3.10"),
+        ("cb6b6c1bc024e025710288da652d0d93527a71db", "PC-DOS 3.30"),
+        ("3b844e2a411182958c2d9e6ee17c6d4fff18bd73", "PC-DOS 4.00"),
+        ("45e82fcff4c6f8a9c31418323bc063011f5730e5", "PCExchange 2.0"),
+        ("707849fd75b6a52fd219c3cebe060ecb23c40fc7", "SCO OpenServer"),
+        ("9f7f146b513b00ff9e8b5b927aee24025c3f3fb8", "Toshiba MS-DOS 3.30"),
+        ("30eafc45a4606a7b840dcd5899dfb977a837c835", "Toshiba MS-DOS 4.01"),
+        ("5695a9a69637bd4d4eaa531b976d6f3b71e8d4ad", "Toshiba MS-DOS 4.01"),
+        ("036a59138d620c16e8d0dba45af4dec4ae1376f7", "Windows 10"),
+        ("3dd2941b79f0f6644b3a973c7d81e64e434c0b70", "Windows 2000"),
+        ("cd1e2fced2e49825df23c08a3d1e280c1cf468a7", "Windows 2000"),
+        ("c20c6e706be97091768da8654fffc2f3c0431318", "Windows 95"),
+        ("cf750cc0d2d52251a1a0fb9f2568fed3ff81717a", "Windows 95 >=OSR2"),
+        ("48865a298d4bbe73f89c4de10153e16250c1a9ae", "Windows 95 >=OSR2"),
+        ("1d2df8f3b1b336fc4aa1c6e49b21956194884b41", "Windows 98 (Spanish)"),
+        ("6e6fb4a3ea034415d716b1f81217ffecf78813c3", "Windows 98 (Spanish)"),
+        ("9b5e6be09200145a6ed7c22d14b1e6b4de2f362b", "Windows 98 (Spanish)"),
+        ("3cea1921d29fcd3343d36c090cb3e3dba926781d", "Windows 98, Me"),
+        ("037f9c8caed602d93c88f7e9d8f13a732b3ada76", "Windows NT"),
+        ("a63806bfe11140c873082318dd4da834068be327", "Windows Vista"),
+        ("8f024b3d501c39ee6e3f8ca28173ad6a780d3eb0", "Windows Vista, 8, 10"),
+        ("d3e93f8b82ef250db216037d827a4896dc97d2be", "TracerST"), // OEM ID: "TracerST"
+        //("b741f85ef40288ccc8887de1f6e849009097e1c9", "Norton Utilities"), // OEM ID: "IBM PNCI", need to confirm
+        ("c49b275537ac7237cac64d83f34d2024ae0ca96a",
+         "Windows NT (Spanish)"), // Need to check Windows >= 2000 (Spanish)
+        //("a48b0e4b696317eed829e960d1aa576562a4f185", "TracerST"), // Unknown OEM ID, apparently Tracer, unconfirmed
+        ("fe477972602ba76658ff7143859045b3c4036ca5",
+         "iomega"), // OEM ID: "SHIPDISK", contains timedate on boot code may not be unique
+        ("ef79a1f33e5237827eb812dda548f0e4e916d815", "GEOS"), // OEM ID: "GEOWORKS"
+        ("8524587ee91494cc51cc2c9d07453e84be0cdc33", "Hero Soft v1.10"),
+        ("681a0d9d662ba368e6acb0d0bf602e1f56411144", "Human68k 2.00"),
+        ("91e2b47c3cb46611249e4daa283a68ba21ba596a", "Human68k 2.00")
+    };
 
-        readonly (string hash, string name)[] _knownBootHashes =
-        {
-            ("b639b4d5b25f63560e3b34a3a0feb732aa65486f", "Amstrad MS-DOS 3.20 (8-sector floppy)"),
-            ("9311151f13f7611b1431593da05ddd3153370574", "Amstrad MS-DOS 3.20 (Spanish)"),
-            ("55eda6a9b955f5199020e6b56a6954fa6fcb7dc6", "AT&T MS-DOS 2.11"),
-            ("d5e10822977efa96e4fbaec2b268ca008d74fe6f", "Atari TOS"),
-            ("17f11a12b96899d2a4976d889cef160502167f2d", "BeOS"),
-            ("d0e31673028fcfcea38dff71a7be13669aa20b8d", "Compaq MS-DOS 3.30"),
-            ("3aa4ce2fa6f9a297b5b15aaef930401af369fcbc", "Compaq MS-DOS 3.30 (8-sector floppy)"),
-            ("8f1d33520343f35034aa3ce47e4180b10e960b43", "Compaq MS-DOS 3.30 (8-sector floppy)"),
-            ("2f4011ae0670ff3aff2bdd412a4651f255b600a9", "Compaq MS-DOS 3.31"),
-            ("afc3fb751089a52c9f0bd37098d3137d32ab4982", "Concurrent DOS 6.0"),
-            ("c25e2d93d3b8bf9870043bf9d12580ef07f5375e", "CrossDOS"),
-            ("43fb2afa1ab3102b3f8d0fe901b652a5b0a973e1", "DR-DOS >=7.02"),
-            ("92d83b7e9e3bd4b73c6b98f8c6434206eac7212f", "DR-DOS 3.40"),
-            ("6a7aba05f91c5a7108edc5d5ccc9dac0ebf5dd28", "DR-DOS 3.40"),
-            ("715e78bb1e38b56452dd1c15db8c096dc506eea3", "DR-DOS 3.41"),
-            ("01e46cb2bc6d65ddd89ba28d254baf563d8fc609", "DR-DOS 5.00"),
-            ("dd297f159eef8a61f5eec638ce7318a098fa26f4", "DR-DOS 5.00"),
-            ("f590e53ae7f9caec5dba93241e557710be61b6fe", "DR-DOS 6.00"),
-            ("630e4aaf230f15eb2d09985f294815b6bc50384c", "DR-DOS 6.00"),
-            ("8851459816d714f53b9c469472e51460ebd44b98", "DR-DOS 7.03"),
-            ("cf24388b61eb1b137f2bb8a4c319e7461d460b72", "DR-DOS 7.03"),
-            ("26bf8efe8368e598397b1f79d635faccf5ca4f87", "DR-DOS 8.00"),
-            ("36ddd6bf8686801f5a2a3cbd4656afa175cabdfc", "DR-DOS 8.00"),
-            ("9ac09781e4090d9ba5e1a31816b4ebfa6b54f39e", "DR-DOS 8.00"),
-            ("f5d68f26abec8392ac23716581c4ab1d6e8456a2", "eComStation"),
-            ("e2a852db8c3eb3d86ca86a706186a9dd54cdc815", "Epson MS-DOS 3.10"),
-            ("74675d158dd0f6b5983bd30dda7018a814bd34dd", "Epson MS-DOS 3.20"),
-            ("683a04f34714555df5e862f709f9abc7de51488e", "Epson MS-DOS 5.00 (PC-98)"),
-            ("1b062df94fc576af069e40603bf2558000a2ca10", "FreeBSD, NetBSD, Mac OS X"),
-            ("33c8e306b3a51e09668fd60f099450019a1238ea", "FreeBSD, NetBSD, Mac OS X"),
-            ("ca386b1cefaf964a49192c2cd08077aff09b82af", "FreeDOS"),
-            ("26033e0db1ee4f439f07077b790e189d1b77688c", "HP MS-DOS 3.20"),
-            ("66867cd665e0e87c32de0bcb721ecfe91a551bc5", "mkfs.vfat"),
-            ("48d4811dbea5d724803017d6d45a49d604982b7b", "mkfs.vfat"),
-            ("02d615c5fb68bc49766bf89777dd36accb1428b7", "MS-DOS >=4.01, PC-DOS >=5.00 (8-sector floppy)"),
-            ("cffb1dc01bf9f533ba63d949c359c9ae97944c9b", "MS-DOS >=5.00"),
-            ("bd099151f2f9f8b3815eef7d9fed90abead52d97", "MS-DOS 3.21"),
-            ("f338eeff68f4e03ce489eb165e18fd94f8a0c63e", "MS-DOS 3.30A"),
-            ("0eb0c789e141d59d91f075ef14d63fd4255aeac2", "MS-DOS 3.30A, 5.00, 6.xx (8-sector floppy)"),
-            ("7aa06595490f92e542965b43805eaa0d6da9c86c", "MS-DOS 3.31"),
-            ("00401ca66900d7defcbc3d794654d1ba2376e83d", "MS-DOS 3.31"),
-            ("00e39a27d9b36e88f2b0caaa1959a8e17223bf31", "MS-DOS 3.31 (8-sector floppy)"),
-            ("1e74fbad5948582247280b116e7175b5a16bcede", "MS-DOS 3.31 (8-sector floppy)"),
-            ("1cfb2cc3a34c8164b8f5051c118643b23a60f4d0", "MS-DOS 4.01"),
-            ("d370551c8aca9cfcd964e2a1235071329f93cc03", "Multiuser DOS 7.22r4"),
-            ("7106ea11dd0b9a39649cbb4f6314a0fa1241da38", "NEC >=MS-DOS 5.00 (PC-98)"),
-            ("30d4f5f54215af0fc69236594e52b94989b35c21", "NEC MS-DOS 3.30 (PC-98)"),
-            ("eae42777f562eb81ed624f0c0479347ba11158c9", "Novell DOS 7.00"),
-            ("c67a7d0bab94a960cca8720d476f5317c960b2fb", "Novell DOS 7.00"),
-            ("0ed508c71bcf1418a1701b9267ddf166e7993b6b", "Olivetti MS-DOS 3.10"),
-            ("3e1a3f22973d9f2d15f9a053204c2f7b72de00a9", "OS/2 1.00"),
-            ("4acb13943f21a266f9eb110969980481783c41c4", "OS/2 1.10"),
-            ("cc7b32236c76d34edefdac3ca6a7be8e26163cea", "OS/2 1.20, 1.30"),
-            ("05c6706189fa0532ea83a7484b88d1dcba63e167", "OS/2 2.00"),
-            ("eefb4383b3e2b05f7f7e0051d58f4617a4f39e42", "OS/2 2.1x, Warp 3"),
-            ("b1d9666ae8781958242da27d319e73aa2dda6805", "OS/2 Warp 4"),
-            ("661d92970ab0f81cec453dc7584e0debdd1b4928", "PC-DOS >=5.00"),
-            ("78522b303fe5752f3cb37eabb6cb54e6cb0cd276", "PC-DOS 2.xx"),
-            ("277edfefdc3f05a219f9378076227c4126b6c8ef", "PC-DOS 3.00"),
-            ("f72ef6ff4c90a170bc8cdd1b01e8d98235c16a3b", "PC-DOS 3.10"),
-            ("cb6b6c1bc024e025710288da652d0d93527a71db", "PC-DOS 3.30"),
-            ("3b844e2a411182958c2d9e6ee17c6d4fff18bd73", "PC-DOS 4.00"),
-            ("45e82fcff4c6f8a9c31418323bc063011f5730e5", "PCExchange 2.0"),
-            ("707849fd75b6a52fd219c3cebe060ecb23c40fc7", "SCO OpenServer"),
-            ("9f7f146b513b00ff9e8b5b927aee24025c3f3fb8", "Toshiba MS-DOS 3.30"),
-            ("30eafc45a4606a7b840dcd5899dfb977a837c835", "Toshiba MS-DOS 4.01"),
-            ("5695a9a69637bd4d4eaa531b976d6f3b71e8d4ad", "Toshiba MS-DOS 4.01"),
-            ("036a59138d620c16e8d0dba45af4dec4ae1376f7", "Windows 10"),
-            ("3dd2941b79f0f6644b3a973c7d81e64e434c0b70", "Windows 2000"),
-            ("cd1e2fced2e49825df23c08a3d1e280c1cf468a7", "Windows 2000"),
-            ("c20c6e706be97091768da8654fffc2f3c0431318", "Windows 95"),
-            ("cf750cc0d2d52251a1a0fb9f2568fed3ff81717a", "Windows 95 >=OSR2"),
-            ("48865a298d4bbe73f89c4de10153e16250c1a9ae", "Windows 95 >=OSR2"),
-            ("1d2df8f3b1b336fc4aa1c6e49b21956194884b41", "Windows 98 (Spanish)"),
-            ("6e6fb4a3ea034415d716b1f81217ffecf78813c3", "Windows 98 (Spanish)"),
-            ("9b5e6be09200145a6ed7c22d14b1e6b4de2f362b", "Windows 98 (Spanish)"),
-            ("3cea1921d29fcd3343d36c090cb3e3dba926781d", "Windows 98, Me"),
-            ("037f9c8caed602d93c88f7e9d8f13a732b3ada76", "Windows NT"),
-            ("a63806bfe11140c873082318dd4da834068be327", "Windows Vista"),
-            ("8f024b3d501c39ee6e3f8ca28173ad6a780d3eb0", "Windows Vista, 8, 10"),
-            ("d3e93f8b82ef250db216037d827a4896dc97d2be", "TracerST"), // OEM ID: "TracerST"
-            //("b741f85ef40288ccc8887de1f6e849009097e1c9", "Norton Utilities"), // OEM ID: "IBM PNCI", need to confirm
-            ("c49b275537ac7237cac64d83f34d2024ae0ca96a",
-             "Windows NT (Spanish)"), // Need to check Windows >= 2000 (Spanish)
-            //("a48b0e4b696317eed829e960d1aa576562a4f185", "TracerST"), // Unknown OEM ID, apparently Tracer, unconfirmed
-            ("fe477972602ba76658ff7143859045b3c4036ca5",
-             "iomega"), // OEM ID: "SHIPDISK", contains timedate on boot code may not be unique
-            ("ef79a1f33e5237827eb812dda548f0e4e916d815", "GEOS"), // OEM ID: "GEOWORKS"
-            ("8524587ee91494cc51cc2c9d07453e84be0cdc33", "Hero Soft v1.10"),
-            ("681a0d9d662ba368e6acb0d0bf602e1f56411144", "Human68k 2.00"),
-            ("91e2b47c3cb46611249e4daa283a68ba21ba596a", "Human68k 2.00")
-        };
+    [Flags]
+    enum FatAttributes : byte
+    {
+        ReadOnly    = 0x01, Hidden       = 0x02, System  = 0x04,
+        VolumeLabel = 0x08, Subdirectory = 0x10, Archive = 0x20,
+        Device      = 0x40, Reserved     = 0x80, LFN     = 0x0F
+    }
 
-        [Flags]
-        enum FatAttributes : byte
-        {
-            ReadOnly    = 0x01, Hidden       = 0x02, System  = 0x04,
-            VolumeLabel = 0x08, Subdirectory = 0x10, Archive = 0x20,
-            Device      = 0x40, Reserved     = 0x80, LFN     = 0x0F
-        }
+    enum BpbKind
+    {
+        None, Hardcoded, Atari,
+        Msx, Dos2, Dos3,
+        Dos32, Dos33, ShortExtended,
+        Extended, ShortFat32, LongFat32,
+        Andos, Apricot, DecRainbow,
+        Human
+    }
 
-        enum BpbKind
-        {
-            None, Hardcoded, Atari,
-            Msx, Dos2, Dos3,
-            Dos32, Dos33, ShortExtended,
-            Extended, ShortFat32, LongFat32,
-            Andos, Apricot, DecRainbow,
-            Human
-        }
+    enum Namespace
+    {
+        Dos, Nt, Lfn,
+        Os2, Ecs, Human
+    }
 
-        enum Namespace
-        {
-            Dos, Nt, Lfn,
-            Os2, Ecs, Human
-        }
+    [Flags]
+    enum EaFlags : uint
+    {
+        Normal = 0, Critical = 1
+    }
 
-        [Flags]
-        enum EaFlags : uint
-        {
-            Normal = 0, Critical = 1
-        }
-
-        [Flags]
-        enum CaseInfo : byte
-        {
-            /// <summary>FASTFAT.SYS indicator that basename is lowercase</summary>
-            LowerCaseBasename = 0x08,
-            /// <summary>FASTFAT.SYS indicator that extension is lowercase</summary>
-            LowerCaseExtension = 0x10, AllLowerCase = 0x18,
-            /// <summary>FAT32.IFS &lt; 0.97 indicator for normal EAs present</summary>
-            NormalEaOld = 0xEA,
-            /// <summary>FAT32.IFS &lt; 0.97 indicator for critical EAs present</summary>
-            CriticalEaOld = 0xEC,
-            /// <summary>FAT32.IFS &gt;= 0.97 indicator for normal EAs present</summary>
-            NormalEa = 0x40,
-            /// <summary>FAT32.IFS &gt;= 0.97 indicator for critical EAs present</summary>
-            CriticalEa = 0x80
-        }
+    [Flags]
+    enum CaseInfo : byte
+    {
+        /// <summary>FASTFAT.SYS indicator that basename is lowercase</summary>
+        LowerCaseBasename = 0x08,
+        /// <summary>FASTFAT.SYS indicator that extension is lowercase</summary>
+        LowerCaseExtension = 0x10, AllLowerCase = 0x18,
+        /// <summary>FAT32.IFS &lt; 0.97 indicator for normal EAs present</summary>
+        NormalEaOld = 0xEA,
+        /// <summary>FAT32.IFS &lt; 0.97 indicator for critical EAs present</summary>
+        CriticalEaOld = 0xEC,
+        /// <summary>FAT32.IFS &gt;= 0.97 indicator for normal EAs present</summary>
+        NormalEa = 0x40,
+        /// <summary>FAT32.IFS &gt;= 0.97 indicator for critical EAs present</summary>
+        CriticalEa = 0x80
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FAT/Dir.cs b/Aaru.Filesystems/FAT/Dir.cs
index 0d29d59b0..7d6c2605f 100644
--- a/Aaru.Filesystems/FAT/Dir.cs
+++ b/Aaru.Filesystems/FAT/Dir.cs
@@ -39,58 +39,72 @@ using Aaru.CommonTypes.Enums;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
-{
-    public sealed partial class FAT
-    {
-        /// <inheritdoc />
-        /// <summary>Solves a symbolic link.</summary>
-        /// <param name="path">Link path.</param>
-        /// <param name="dest">Link destination.</param>
-        public ErrorNumber ReadLink(string path, out string dest)
-        {
-            dest = null;
+namespace Aaru.Filesystems;
 
-            return ErrorNumber.NotSupported;
+public sealed partial class FAT
+{
+    /// <inheritdoc />
+    /// <summary>Solves a symbolic link.</summary>
+    /// <param name="path">Link path.</param>
+    /// <param name="dest">Link destination.</param>
+    public ErrorNumber ReadLink(string path, out string dest)
+    {
+        dest = null;
+
+        return ErrorNumber.NotSupported;
+    }
+
+    /// <inheritdoc />
+    /// <summary>Lists contents from a directory.</summary>
+    /// <param name="path">Directory path.</param>
+    /// <param name="contents">Directory contents.</param>
+    public ErrorNumber ReadDir(string path, out List<string> contents)
+    {
+        contents = null;
+        ErrorNumber errno = ErrorNumber.NoError;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(string.IsNullOrWhiteSpace(path) ||
+           path == "/")
+        {
+            contents = _rootDirectoryCache.Keys.ToList();
+
+            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        /// <summary>Lists contents from a directory.</summary>
-        /// <param name="path">Directory path.</param>
-        /// <param name="contents">Directory contents.</param>
-        public ErrorNumber ReadDir(string path, out List<string> contents)
+        string cutPath = path.StartsWith("/", StringComparison.Ordinal) ? path.Substring(1).ToLower(_cultureInfo)
+                             : path.ToLower(_cultureInfo);
+
+        if(_directoryCache.TryGetValue(cutPath, out Dictionary<string, CompleteDirectoryEntry> currentDirectory))
         {
-            contents = null;
-            ErrorNumber errno = ErrorNumber.NoError;
+            contents = currentDirectory.Keys.ToList();
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            return ErrorNumber.NoError;
+        }
 
-            if(string.IsNullOrWhiteSpace(path) ||
-               path == "/")
-            {
-                contents = _rootDirectoryCache.Keys.ToList();
+        string[] pieces = cutPath.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-                return ErrorNumber.NoError;
-            }
+        KeyValuePair<string, CompleteDirectoryEntry> entry =
+            _rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[0]);
 
-            string cutPath = path.StartsWith("/", StringComparison.Ordinal) ? path.Substring(1).ToLower(_cultureInfo)
-                                 : path.ToLower(_cultureInfo);
+        if(string.IsNullOrEmpty(entry.Key))
+            return ErrorNumber.NoSuchFile;
 
-            if(_directoryCache.TryGetValue(cutPath, out Dictionary<string, CompleteDirectoryEntry> currentDirectory))
-            {
-                contents = currentDirectory.Keys.ToList();
+        if(!entry.Value.Dirent.attributes.HasFlag(FatAttributes.Subdirectory))
+            return ErrorNumber.NotDirectory;
 
-                return ErrorNumber.NoError;
-            }
+        string currentPath = pieces[0];
 
-            string[] pieces = cutPath.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        currentDirectory = _rootDirectoryCache;
 
-            KeyValuePair<string, CompleteDirectoryEntry> entry =
-                _rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[0]);
+        for(int p = 0; p < pieces.Length; p++)
+        {
+            entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[p]);
 
             if(string.IsNullOrEmpty(entry.Key))
                 return ErrorNumber.NoSuchFile;
@@ -98,302 +112,287 @@ namespace Aaru.Filesystems
             if(!entry.Value.Dirent.attributes.HasFlag(FatAttributes.Subdirectory))
                 return ErrorNumber.NotDirectory;
 
-            string currentPath = pieces[0];
+            currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
+            uint currentCluster = entry.Value.Dirent.start_cluster;
 
-            currentDirectory = _rootDirectoryCache;
+            if(_fat32)
+                currentCluster += (uint)(entry.Value.Dirent.ea_handle << 16);
 
-            for(int p = 0; p < pieces.Length; p++)
+            if(_directoryCache.TryGetValue(currentPath, out currentDirectory))
+                continue;
+
+            // Reserved unallocated directory, seen in Atari ST
+            if(currentCluster == 0)
             {
-                entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[p]);
+                _directoryCache[currentPath] = new Dictionary<string, CompleteDirectoryEntry>();
+                contents                     = new List<string>();
 
-                if(string.IsNullOrEmpty(entry.Key))
-                    return ErrorNumber.NoSuchFile;
-
-                if(!entry.Value.Dirent.attributes.HasFlag(FatAttributes.Subdirectory))
-                    return ErrorNumber.NotDirectory;
-
-                currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
-                uint currentCluster = entry.Value.Dirent.start_cluster;
-
-                if(_fat32)
-                    currentCluster += (uint)(entry.Value.Dirent.ea_handle << 16);
-
-                if(_directoryCache.TryGetValue(currentPath, out currentDirectory))
-                    continue;
-
-                // Reserved unallocated directory, seen in Atari ST
-                if(currentCluster == 0)
-                {
-                    _directoryCache[currentPath] = new Dictionary<string, CompleteDirectoryEntry>();
-                    contents                     = new List<string>();
-
-                    return ErrorNumber.NoError;
-                }
-
-                uint[] clusters = GetClusters(currentCluster);
-
-                if(clusters is null)
-                    return ErrorNumber.InvalidArgument;
-
-                byte[] directoryBuffer = new byte[_bytesPerCluster * clusters.Length];
-
-                for(int i = 0; i < clusters.Length; i++)
-                {
-                    errno = _image.ReadSectors(_firstClusterSector + (clusters[i] * _sectorsPerCluster),
-                                               _sectorsPerCluster, out byte[] buffer);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    Array.Copy(buffer, 0, directoryBuffer, i * _bytesPerCluster, _bytesPerCluster);
-                }
-
-                currentDirectory = new Dictionary<string, CompleteDirectoryEntry>();
-                byte[] lastLfnName     = null;
-                byte   lastLfnChecksum = 0;
-
-                for(int pos = 0; pos < directoryBuffer.Length; pos += Marshal.SizeOf<DirectoryEntry>())
-                {
-                    DirectoryEntry dirent =
-                        Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(directoryBuffer, pos,
-                            Marshal.SizeOf<DirectoryEntry>());
-
-                    if(dirent.filename[0] == DIRENT_FINISHED)
-                        break;
-
-                    if(dirent.attributes.HasFlag(FatAttributes.LFN))
-                    {
-                        if(_namespace != Namespace.Lfn &&
-                           _namespace != Namespace.Ecs)
-                            continue;
-
-                        LfnEntry lfnEntry =
-                            Marshal.ByteArrayToStructureLittleEndian<LfnEntry>(directoryBuffer, pos,
-                                                                               Marshal.SizeOf<LfnEntry>());
-
-                        int lfnSequence = lfnEntry.sequence & LFN_MASK;
-
-                        if((lfnEntry.sequence & LFN_ERASED) > 0)
-                            continue;
-
-                        if((lfnEntry.sequence & LFN_LAST) > 0)
-                        {
-                            lastLfnName     = new byte[lfnSequence * 26];
-                            lastLfnChecksum = lfnEntry.checksum;
-                        }
-
-                        if(lastLfnName is null)
-                            continue;
-
-                        if(lfnEntry.checksum != lastLfnChecksum)
-                            continue;
-
-                        lfnSequence--;
-
-                        Array.Copy(lfnEntry.name1, 0, lastLfnName, lfnSequence * 26, 10);
-                        Array.Copy(lfnEntry.name2, 0, lastLfnName, (lfnSequence * 26) + 10, 12);
-                        Array.Copy(lfnEntry.name3, 0, lastLfnName, (lfnSequence * 26) + 22, 4);
-
-                        continue;
-                    }
-
-                    // Not a correct entry
-                    if(dirent.filename[0] < DIRENT_MIN &&
-                       dirent.filename[0] != DIRENT_E5)
-                        continue;
-
-                    // Self
-                    if(Encoding.GetString(dirent.filename).TrimEnd() == ".")
-                        continue;
-
-                    // Parent
-                    if(Encoding.GetString(dirent.filename).TrimEnd() == "..")
-                        continue;
-
-                    // Deleted
-                    if(dirent.filename[0] == DIRENT_DELETED)
-                        continue;
-
-                    string filename;
-
-                    if(dirent.attributes.HasFlag(FatAttributes.VolumeLabel))
-                        continue;
-
-                    var completeEntry = new CompleteDirectoryEntry
-                    {
-                        Dirent = dirent
-                    };
-
-                    if((_namespace == Namespace.Lfn || _namespace == Namespace.Ecs) &&
-                       lastLfnName != null)
-                    {
-                        byte calculatedLfnChecksum = LfnChecksum(dirent.filename, dirent.extension);
-
-                        if(calculatedLfnChecksum == lastLfnChecksum)
-                        {
-                            filename = StringHandlers.CToString(lastLfnName, Encoding.Unicode, true);
-
-                            completeEntry.Lfn = filename;
-                            lastLfnName       = null;
-                            lastLfnChecksum   = 0;
-                        }
-                    }
-
-                    if(dirent.filename[0] == DIRENT_E5)
-                        dirent.filename[0] = DIRENT_DELETED;
-
-                    string name      = Encoding.GetString(dirent.filename).TrimEnd();
-                    string extension = Encoding.GetString(dirent.extension).TrimEnd();
-
-                    if(name      == "" &&
-                       extension == "")
-                    {
-                        AaruConsole.DebugWriteLine("FAT filesystem", "Found empty filename in {0}", path);
-
-                        if(!_debug ||
-                           (dirent.size > 0 && dirent.start_cluster == 0))
-                            continue; // Skip invalid name
-
-                        // If debug, add it
-                        name = ":{EMPTYNAME}:";
-
-                        // Try to create a unique filename with an extension from 000 to 999
-                        for(int uniq = 0; uniq < 1000; uniq++)
-                        {
-                            extension = $"{uniq:D03}";
-
-                            if(!currentDirectory.ContainsKey($"{name}.{extension}"))
-                                break;
-                        }
-
-                        // If we couldn't find it, just skip over
-                        if(currentDirectory.ContainsKey($"{name}.{extension}"))
-                            continue;
-                    }
-
-                    if(_namespace == Namespace.Nt)
-                    {
-                        if(dirent.caseinfo.HasFlag(CaseInfo.LowerCaseExtension))
-                            extension = extension.ToLower(CultureInfo.CurrentCulture);
-
-                        if(dirent.caseinfo.HasFlag(CaseInfo.LowerCaseBasename))
-                            name = name.ToLower(CultureInfo.CurrentCulture);
-                    }
-
-                    if(extension != "")
-                        filename = name + "." + extension;
-                    else
-                        filename = name;
-
-                    if(_namespace == Namespace.Human)
-                    {
-                        HumanDirectoryEntry humanEntry =
-                            Marshal.ByteArrayToStructureLittleEndian<HumanDirectoryEntry>(directoryBuffer, pos,
-                                Marshal.SizeOf<HumanDirectoryEntry>());
-
-                        completeEntry.HumanDirent = humanEntry;
-
-                        name      = StringHandlers.CToString(humanEntry.name1, Encoding).TrimEnd();
-                        extension = StringHandlers.CToString(humanEntry.extension, Encoding).TrimEnd();
-                        string name2 = StringHandlers.CToString(humanEntry.name2, Encoding).TrimEnd();
-
-                        if(extension != "")
-                            filename = name + name2 + "." + extension;
-                        else
-                            filename = name + name2;
-
-                        completeEntry.HumanName = filename;
-                    }
-
-                    // Atari ST allows slash AND colon so cannot simply substitute one for the other like in Mac filesystems
-                    filename = filename.Replace('/', '\u2215');
-
-                    // Using array accessor ensures that repeated entries just get substituted.
-                    // Repeated entries are not allowed but some bad implementations (e.g. FAT32.IFS)allow to create them
-                    // when using spaces
-                    completeEntry.Shortname                    = filename;
-                    currentDirectory[completeEntry.ToString()] = completeEntry;
-                }
-
-                // Check OS/2 .LONGNAME
-                if(_eaCache != null                                             &&
-                   (_namespace == Namespace.Os2 || _namespace == Namespace.Ecs) &&
-                   !_fat32)
-                {
-                    List<KeyValuePair<string, CompleteDirectoryEntry>> filesWithEas =
-                        currentDirectory.Where(t => t.Value.Dirent.ea_handle != 0).ToList();
-
-                    foreach(KeyValuePair<string, CompleteDirectoryEntry> fileWithEa in filesWithEas)
-                    {
-                        Dictionary<string, byte[]> eas = GetEas(fileWithEa.Value.Dirent.ea_handle);
-
-                        if(eas is null)
-                            continue;
-
-                        if(!eas.TryGetValue("com.microsoft.os2.longname", out byte[] longnameEa))
-                            continue;
-
-                        if(BitConverter.ToUInt16(longnameEa, 0) != EAT_ASCII)
-                            continue;
-
-                        ushort longnameSize = BitConverter.ToUInt16(longnameEa, 2);
-
-                        if(longnameSize + 4 > longnameEa.Length)
-                            continue;
-
-                        byte[] longnameBytes = new byte[longnameSize];
-
-                        Array.Copy(longnameEa, 4, longnameBytes, 0, longnameSize);
-
-                        string longname = StringHandlers.CToString(longnameBytes, Encoding);
-
-                        if(string.IsNullOrWhiteSpace(longname))
-                            continue;
-
-                        // Forward slash is allowed in .LONGNAME, so change it to visually similar division slash
-                        longname = longname.Replace('/', '\u2215');
-
-                        fileWithEa.Value.Longname = longname;
-                        currentDirectory.Remove(fileWithEa.Key);
-                        currentDirectory[fileWithEa.Value.ToString()] = fileWithEa.Value;
-                    }
-                }
-
-                // Check FAT32.IFS EAs
-                if(_fat32 || _debug)
-                {
-                    List<KeyValuePair<string, CompleteDirectoryEntry>> fat32EaSidecars = currentDirectory.
-                        Where(t => t.Key.EndsWith(FAT32_EA_TAIL, true, _cultureInfo)).ToList();
-
-                    foreach(KeyValuePair<string, CompleteDirectoryEntry> sidecar in fat32EaSidecars)
-                    {
-                        // No real file this sidecar accompanies
-                        if(!currentDirectory.
-                               TryGetValue(sidecar.Key.Substring(0, sidecar.Key.Length - FAT32_EA_TAIL.Length),
-                                           out CompleteDirectoryEntry fileWithEa))
-                            continue;
-
-                        // If not in debug mode we will consider the lack of EA bitflags to mean the EAs are corrupted or not real
-                        if(!_debug)
-                            if(!fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.NormalEaOld) &&
-                               !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.CriticalEa)  &&
-                               !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.NormalEa)    &&
-                               !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.CriticalEa))
-                                continue;
-
-                        fileWithEa.Fat32Ea = sidecar.Value.Dirent;
-
-                        if(!_debug)
-                            currentDirectory.Remove(sidecar.Key);
-                    }
-                }
-
-                _directoryCache.Add(currentPath, currentDirectory);
+                return ErrorNumber.NoError;
             }
 
-            contents = currentDirectory?.Keys.ToList();
+            uint[] clusters = GetClusters(currentCluster);
 
-            return ErrorNumber.NoError;
+            if(clusters is null)
+                return ErrorNumber.InvalidArgument;
+
+            byte[] directoryBuffer = new byte[_bytesPerCluster * clusters.Length];
+
+            for(int i = 0; i < clusters.Length; i++)
+            {
+                errno = _image.ReadSectors(_firstClusterSector + (clusters[i] * _sectorsPerCluster),
+                                           _sectorsPerCluster, out byte[] buffer);
+
+                if(errno != ErrorNumber.NoError)
+                    return errno;
+
+                Array.Copy(buffer, 0, directoryBuffer, i * _bytesPerCluster, _bytesPerCluster);
+            }
+
+            currentDirectory = new Dictionary<string, CompleteDirectoryEntry>();
+            byte[] lastLfnName     = null;
+            byte   lastLfnChecksum = 0;
+
+            for(int pos = 0; pos < directoryBuffer.Length; pos += Marshal.SizeOf<DirectoryEntry>())
+            {
+                DirectoryEntry dirent =
+                    Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(directoryBuffer, pos,
+                                                                             Marshal.SizeOf<DirectoryEntry>());
+
+                if(dirent.filename[0] == DIRENT_FINISHED)
+                    break;
+
+                if(dirent.attributes.HasFlag(FatAttributes.LFN))
+                {
+                    if(_namespace != Namespace.Lfn &&
+                       _namespace != Namespace.Ecs)
+                        continue;
+
+                    LfnEntry lfnEntry =
+                        Marshal.ByteArrayToStructureLittleEndian<LfnEntry>(directoryBuffer, pos,
+                                                                           Marshal.SizeOf<LfnEntry>());
+
+                    int lfnSequence = lfnEntry.sequence & LFN_MASK;
+
+                    if((lfnEntry.sequence & LFN_ERASED) > 0)
+                        continue;
+
+                    if((lfnEntry.sequence & LFN_LAST) > 0)
+                    {
+                        lastLfnName     = new byte[lfnSequence * 26];
+                        lastLfnChecksum = lfnEntry.checksum;
+                    }
+
+                    if(lastLfnName is null)
+                        continue;
+
+                    if(lfnEntry.checksum != lastLfnChecksum)
+                        continue;
+
+                    lfnSequence--;
+
+                    Array.Copy(lfnEntry.name1, 0, lastLfnName, lfnSequence * 26, 10);
+                    Array.Copy(lfnEntry.name2, 0, lastLfnName, (lfnSequence * 26) + 10, 12);
+                    Array.Copy(lfnEntry.name3, 0, lastLfnName, (lfnSequence * 26) + 22, 4);
+
+                    continue;
+                }
+
+                // Not a correct entry
+                if(dirent.filename[0] < DIRENT_MIN &&
+                   dirent.filename[0] != DIRENT_E5)
+                    continue;
+
+                // Self
+                if(Encoding.GetString(dirent.filename).TrimEnd() == ".")
+                    continue;
+
+                // Parent
+                if(Encoding.GetString(dirent.filename).TrimEnd() == "..")
+                    continue;
+
+                // Deleted
+                if(dirent.filename[0] == DIRENT_DELETED)
+                    continue;
+
+                string filename;
+
+                if(dirent.attributes.HasFlag(FatAttributes.VolumeLabel))
+                    continue;
+
+                var completeEntry = new CompleteDirectoryEntry
+                {
+                    Dirent = dirent
+                };
+
+                if((_namespace == Namespace.Lfn || _namespace == Namespace.Ecs) &&
+                   lastLfnName != null)
+                {
+                    byte calculatedLfnChecksum = LfnChecksum(dirent.filename, dirent.extension);
+
+                    if(calculatedLfnChecksum == lastLfnChecksum)
+                    {
+                        filename = StringHandlers.CToString(lastLfnName, Encoding.Unicode, true);
+
+                        completeEntry.Lfn = filename;
+                        lastLfnName       = null;
+                        lastLfnChecksum   = 0;
+                    }
+                }
+
+                if(dirent.filename[0] == DIRENT_E5)
+                    dirent.filename[0] = DIRENT_DELETED;
+
+                string name      = Encoding.GetString(dirent.filename).TrimEnd();
+                string extension = Encoding.GetString(dirent.extension).TrimEnd();
+
+                if(name      == "" &&
+                   extension == "")
+                {
+                    AaruConsole.DebugWriteLine("FAT filesystem", "Found empty filename in {0}", path);
+
+                    if(!_debug ||
+                       (dirent.size > 0 && dirent.start_cluster == 0))
+                        continue; // Skip invalid name
+
+                    // If debug, add it
+                    name = ":{EMPTYNAME}:";
+
+                    // Try to create a unique filename with an extension from 000 to 999
+                    for(int uniq = 0; uniq < 1000; uniq++)
+                    {
+                        extension = $"{uniq:D03}";
+
+                        if(!currentDirectory.ContainsKey($"{name}.{extension}"))
+                            break;
+                    }
+
+                    // If we couldn't find it, just skip over
+                    if(currentDirectory.ContainsKey($"{name}.{extension}"))
+                        continue;
+                }
+
+                if(_namespace == Namespace.Nt)
+                {
+                    if(dirent.caseinfo.HasFlag(CaseInfo.LowerCaseExtension))
+                        extension = extension.ToLower(CultureInfo.CurrentCulture);
+
+                    if(dirent.caseinfo.HasFlag(CaseInfo.LowerCaseBasename))
+                        name = name.ToLower(CultureInfo.CurrentCulture);
+                }
+
+                if(extension != "")
+                    filename = name + "." + extension;
+                else
+                    filename = name;
+
+                if(_namespace == Namespace.Human)
+                {
+                    HumanDirectoryEntry humanEntry =
+                        Marshal.ByteArrayToStructureLittleEndian<HumanDirectoryEntry>(directoryBuffer, pos,
+                            Marshal.SizeOf<HumanDirectoryEntry>());
+
+                    completeEntry.HumanDirent = humanEntry;
+
+                    name      = StringHandlers.CToString(humanEntry.name1, Encoding).TrimEnd();
+                    extension = StringHandlers.CToString(humanEntry.extension, Encoding).TrimEnd();
+                    string name2 = StringHandlers.CToString(humanEntry.name2, Encoding).TrimEnd();
+
+                    if(extension != "")
+                        filename = name + name2 + "." + extension;
+                    else
+                        filename = name + name2;
+
+                    completeEntry.HumanName = filename;
+                }
+
+                // Atari ST allows slash AND colon so cannot simply substitute one for the other like in Mac filesystems
+                filename = filename.Replace('/', '\u2215');
+
+                // Using array accessor ensures that repeated entries just get substituted.
+                // Repeated entries are not allowed but some bad implementations (e.g. FAT32.IFS)allow to create them
+                // when using spaces
+                completeEntry.Shortname                    = filename;
+                currentDirectory[completeEntry.ToString()] = completeEntry;
+            }
+
+            // Check OS/2 .LONGNAME
+            if(_eaCache != null                                             &&
+               (_namespace == Namespace.Os2 || _namespace == Namespace.Ecs) &&
+               !_fat32)
+            {
+                List<KeyValuePair<string, CompleteDirectoryEntry>> filesWithEas =
+                    currentDirectory.Where(t => t.Value.Dirent.ea_handle != 0).ToList();
+
+                foreach(KeyValuePair<string, CompleteDirectoryEntry> fileWithEa in filesWithEas)
+                {
+                    Dictionary<string, byte[]> eas = GetEas(fileWithEa.Value.Dirent.ea_handle);
+
+                    if(eas is null)
+                        continue;
+
+                    if(!eas.TryGetValue("com.microsoft.os2.longname", out byte[] longnameEa))
+                        continue;
+
+                    if(BitConverter.ToUInt16(longnameEa, 0) != EAT_ASCII)
+                        continue;
+
+                    ushort longnameSize = BitConverter.ToUInt16(longnameEa, 2);
+
+                    if(longnameSize + 4 > longnameEa.Length)
+                        continue;
+
+                    byte[] longnameBytes = new byte[longnameSize];
+
+                    Array.Copy(longnameEa, 4, longnameBytes, 0, longnameSize);
+
+                    string longname = StringHandlers.CToString(longnameBytes, Encoding);
+
+                    if(string.IsNullOrWhiteSpace(longname))
+                        continue;
+
+                    // Forward slash is allowed in .LONGNAME, so change it to visually similar division slash
+                    longname = longname.Replace('/', '\u2215');
+
+                    fileWithEa.Value.Longname = longname;
+                    currentDirectory.Remove(fileWithEa.Key);
+                    currentDirectory[fileWithEa.Value.ToString()] = fileWithEa.Value;
+                }
+            }
+
+            // Check FAT32.IFS EAs
+            if(_fat32 || _debug)
+            {
+                List<KeyValuePair<string, CompleteDirectoryEntry>> fat32EaSidecars = currentDirectory.
+                    Where(t => t.Key.EndsWith(FAT32_EA_TAIL, true, _cultureInfo)).ToList();
+
+                foreach(KeyValuePair<string, CompleteDirectoryEntry> sidecar in fat32EaSidecars)
+                {
+                    // No real file this sidecar accompanies
+                    if(!currentDirectory.
+                           TryGetValue(sidecar.Key.Substring(0, sidecar.Key.Length - FAT32_EA_TAIL.Length),
+                                       out CompleteDirectoryEntry fileWithEa))
+                        continue;
+
+                    // If not in debug mode we will consider the lack of EA bitflags to mean the EAs are corrupted or not real
+                    if(!_debug)
+                        if(!fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.NormalEaOld) &&
+                           !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.CriticalEa)  &&
+                           !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.NormalEa)    &&
+                           !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.CriticalEa))
+                            continue;
+
+                    fileWithEa.Fat32Ea = sidecar.Value.Dirent;
+
+                    if(!_debug)
+                        currentDirectory.Remove(sidecar.Key);
+                }
+            }
+
+            _directoryCache.Add(currentPath, currentDirectory);
         }
+
+        contents = currentDirectory?.Keys.ToList();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FAT/FAT.cs b/Aaru.Filesystems/FAT/FAT.cs
index 146d03408..935fe9bec 100644
--- a/Aaru.Filesystems/FAT/FAT.cs
+++ b/Aaru.Filesystems/FAT/FAT.cs
@@ -38,76 +38,75 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// TODO: Differentiate between Atari and X68k FAT, as this one uses a standard BPB.
+// X68K uses cdate/adate from direntry for extending filename
+/// <inheritdoc />
+/// <summary>Implements the File Allocation Table, aka FAT, filesystem (FAT12, FAT16 and FAT32 variants).</summary>
+public sealed partial class FAT : IReadOnlyFilesystem
 {
-    // TODO: Differentiate between Atari and X68k FAT, as this one uses a standard BPB.
-    // X68K uses cdate/adate from direntry for extending filename
+    uint                                                           _bytesPerCluster;
+    byte[]                                                         _cachedEaData;
+    CultureInfo                                                    _cultureInfo;
+    bool                                                           _debug;
+    Dictionary<string, Dictionary<string, CompleteDirectoryEntry>> _directoryCache;
+    DirectoryEntry                                                 _eaDirEntry;
+    bool                                                           _fat12;
+    bool                                                           _fat16;
+    bool                                                           _fat32;
+    ushort[]                                                       _fatEntries;
+    ulong                                                          _fatFirstSector;
+    ulong                                                          _firstClusterSector;
+    bool                                                           _mounted;
+    Namespace                                                      _namespace;
+    uint                                                           _reservedSectors;
+    Dictionary<string, CompleteDirectoryEntry>                     _rootDirectoryCache;
+    uint                                                           _sectorsPerCluster;
+    uint                                                           _sectorsPerFat;
+    FileSystemInfo                                                 _statfs;
+    bool                                                           _useFirstFat;
+
     /// <inheritdoc />
-    /// <summary>Implements the File Allocation Table, aka FAT, filesystem (FAT12, FAT16 and FAT32 variants).</summary>
-    public sealed partial class FAT : IReadOnlyFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Microsoft File Allocation Table";
+    /// <inheritdoc />
+    public Guid Id => new("33513B2C-0D26-0D2D-32C3-79D8611158E0");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
+        new (string name, Type type, string description)[]
+            {};
+
+    /// <inheritdoc />
+    public Dictionary<string, string> Namespaces => new()
     {
-        uint                                                           _bytesPerCluster;
-        byte[]                                                         _cachedEaData;
-        CultureInfo                                                    _cultureInfo;
-        bool                                                           _debug;
-        Dictionary<string, Dictionary<string, CompleteDirectoryEntry>> _directoryCache;
-        DirectoryEntry                                                 _eaDirEntry;
-        bool                                                           _fat12;
-        bool                                                           _fat16;
-        bool                                                           _fat32;
-        ushort[]                                                       _fatEntries;
-        ulong                                                          _fatFirstSector;
-        ulong                                                          _firstClusterSector;
-        bool                                                           _mounted;
-        Namespace                                                      _namespace;
-        uint                                                           _reservedSectors;
-        Dictionary<string, CompleteDirectoryEntry>                     _rootDirectoryCache;
-        uint                                                           _sectorsPerCluster;
-        uint                                                           _sectorsPerFat;
-        FileSystemInfo                                                 _statfs;
-        bool                                                           _useFirstFat;
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Microsoft File Allocation Table";
-        /// <inheritdoc />
-        public Guid Id => new("33513B2C-0D26-0D2D-32C3-79D8611158E0");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[]
-                {};
-
-        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => new()
         {
-            {
-                "dos", "DOS (8.3 all uppercase)"
-            },
-            {
-                "nt", "Windows NT (8.3 mixed case)"
-            },
-            {
-                "os2", "OS/2 .LONGNAME extended attribute"
-            },
-            {
-                "ecs", "Use LFN when available with fallback to .LONGNAME (default)"
-            },
-            {
-                "lfn", "Long file names"
-            }
-        };
-
-        static Dictionary<string, string> GetDefaultOptions() => new()
+            "dos", "DOS (8.3 all uppercase)"
+        },
         {
-            {
-                "debug", false.ToString()
-            }
-        };
-    }
+            "nt", "Windows NT (8.3 mixed case)"
+        },
+        {
+            "os2", "OS/2 .LONGNAME extended attribute"
+        },
+        {
+            "ecs", "Use LFN when available with fallback to .LONGNAME (default)"
+        },
+        {
+            "lfn", "Long file names"
+        }
+    };
+
+    static Dictionary<string, string> GetDefaultOptions() => new()
+    {
+        {
+            "debug", false.ToString()
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FAT/File.cs b/Aaru.Filesystems/FAT/File.cs
index 90136444b..289e35b56 100644
--- a/Aaru.Filesystems/FAT/File.cs
+++ b/Aaru.Filesystems/FAT/File.cs
@@ -39,317 +39,316 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class FAT
 {
-    public sealed partial class FAT
+    /// <inheritdoc />
+    public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
     {
-        /// <inheritdoc />
-        public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
+        deviceBlock = 0;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = Stat(path, out FileEntryInfo stat);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
+           !_debug)
+            return ErrorNumber.IsDirectory;
+
+        uint[] clusters = GetClusters((uint)stat.Inode);
+
+        if(fileBlock >= clusters.Length)
+            return ErrorNumber.InvalidArgument;
+
+        deviceBlock = (long)(_firstClusterSector + (clusters[fileBlock] * _sectorsPerCluster));
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+    {
+        attributes = new FileAttributes();
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = Stat(path, out FileEntryInfo stat);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        attributes = stat.Attributes;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+    {
+        ErrorNumber errno;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = Stat(path, out FileEntryInfo stat);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
+           !_debug)
+            return ErrorNumber.IsDirectory;
+
+        if(size == 0)
         {
-            deviceBlock = 0;
+            buf = Array.Empty<byte>();
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            return ErrorNumber.NoError;
+        }
 
-            ErrorNumber err = Stat(path, out FileEntryInfo stat);
+        if(offset >= stat.Length)
+            return ErrorNumber.InvalidArgument;
 
-            if(err != ErrorNumber.NoError)
-                return err;
+        if(size + offset >= stat.Length)
+            size = stat.Length - offset;
 
-            if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
-               !_debug)
-                return ErrorNumber.IsDirectory;
+        uint[] clusters = GetClusters((uint)stat.Inode);
 
-            uint[] clusters = GetClusters((uint)stat.Inode);
+        if(clusters is null)
+            return ErrorNumber.InvalidArgument;
 
-            if(fileBlock >= clusters.Length)
+        long firstCluster    = offset                   / _bytesPerCluster;
+        long offsetInCluster = offset                   % _bytesPerCluster;
+        long sizeInClusters  = (size + offsetInCluster) / _bytesPerCluster;
+
+        if((size + offsetInCluster) % _bytesPerCluster > 0)
+            sizeInClusters++;
+
+        var ms = new MemoryStream();
+
+        for(int i = 0; i < sizeInClusters; i++)
+        {
+            if(i + firstCluster >= clusters.Length)
                 return ErrorNumber.InvalidArgument;
 
-            deviceBlock = (long)(_firstClusterSector + (clusters[fileBlock] * _sectorsPerCluster));
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
-        {
-            attributes = new FileAttributes();
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = Stat(path, out FileEntryInfo stat);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            attributes = stat.Attributes;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
-        {
-            ErrorNumber errno;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = Stat(path, out FileEntryInfo stat);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
-               !_debug)
-                return ErrorNumber.IsDirectory;
-
-            if(size == 0)
-            {
-                buf = Array.Empty<byte>();
-
-                return ErrorNumber.NoError;
-            }
-
-            if(offset >= stat.Length)
-                return ErrorNumber.InvalidArgument;
-
-            if(size + offset >= stat.Length)
-                size = stat.Length - offset;
-
-            uint[] clusters = GetClusters((uint)stat.Inode);
-
-            if(clusters is null)
-                return ErrorNumber.InvalidArgument;
-
-            long firstCluster    = offset                   / _bytesPerCluster;
-            long offsetInCluster = offset                   % _bytesPerCluster;
-            long sizeInClusters  = (size + offsetInCluster) / _bytesPerCluster;
-
-            if((size + offsetInCluster) % _bytesPerCluster > 0)
-                sizeInClusters++;
-
-            var ms = new MemoryStream();
-
-            for(int i = 0; i < sizeInClusters; i++)
-            {
-                if(i + firstCluster >= clusters.Length)
-                    return ErrorNumber.InvalidArgument;
-
-                errno = _image.ReadSectors(_firstClusterSector + (clusters[i + firstCluster] * _sectorsPerCluster),
-                                           _sectorsPerCluster, out byte[] buffer);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(buffer, 0, buffer.Length);
-            }
-
-            ms.Position = offsetInCluster;
-            buf         = new byte[size];
-            ms.Read(buf, 0, (int)size);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Stat(string path, out FileEntryInfo stat)
-        {
-            stat = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = GetFileEntry(path, out CompleteDirectoryEntry completeEntry);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            DirectoryEntry entry = completeEntry.Dirent;
-
-            stat = new FileEntryInfo
-            {
-                Attributes = new FileAttributes(),
-                Blocks     = entry.size / _bytesPerCluster,
-                BlockSize  = _bytesPerCluster,
-                Length     = entry.size,
-                Inode      = (ulong)(_fat32 ? (entry.ea_handle << 16) + entry.start_cluster : entry.start_cluster),
-                Links      = 1
-            };
-
-            if(entry.cdate > 0 ||
-               entry.ctime > 0)
-                stat.CreationTime = DateHandlers.DosToDateTime(entry.cdate, entry.ctime);
-
-            if(_namespace != Namespace.Human)
-            {
-                if(entry.mdate > 0 ||
-                   entry.mtime > 0)
-                    stat.LastWriteTime = DateHandlers.DosToDateTime(entry.mdate, entry.mtime);
-
-                if(entry.ctime_ms > 0)
-                    stat.CreationTime = stat.CreationTime?.AddMilliseconds(entry.ctime_ms * 10);
-            }
-
-            if(entry.size % _bytesPerCluster > 0)
-                stat.Blocks++;
-
-            if(entry.attributes.HasFlag(FatAttributes.Subdirectory))
-            {
-                stat.Attributes |= FileAttributes.Directory;
-
-                if((_fat32 && entry.ea_handle << 16 > 0) ||
-                   entry.start_cluster > 0)
-                    stat.Blocks =
-                        _fat32 ? GetClusters((uint)((entry.ea_handle << 16) + entry.start_cluster))?.Length ?? 0
-                            : GetClusters(entry.start_cluster)?.Length                                      ?? 0;
-
-                stat.Length = stat.Blocks * stat.BlockSize;
-            }
-
-            if(entry.attributes.HasFlag(FatAttributes.ReadOnly))
-                stat.Attributes |= FileAttributes.ReadOnly;
-
-            if(entry.attributes.HasFlag(FatAttributes.Hidden))
-                stat.Attributes |= FileAttributes.Hidden;
-
-            if(entry.attributes.HasFlag(FatAttributes.System))
-                stat.Attributes |= FileAttributes.System;
-
-            if(entry.attributes.HasFlag(FatAttributes.Archive))
-                stat.Attributes |= FileAttributes.Archive;
-
-            if(entry.attributes.HasFlag(FatAttributes.Device))
-                stat.Attributes |= FileAttributes.Device;
-
-            return ErrorNumber.NoError;
-        }
-
-        uint[] GetClusters(uint startCluster)
-        {
-            if(startCluster == 0)
-                return Array.Empty<uint>();
-
-            if(startCluster >= XmlFsType.Clusters)
-                return null;
-
-            List<uint> clusters = new();
-
-            uint nextCluster = startCluster;
-
-            ulong nextSector = (nextCluster / _fatEntriesPerSector) + _fatFirstSector +
-                               (_useFirstFat ? 0 : _sectorsPerFat);
-
-            int nextEntry = (int)(nextCluster % _fatEntriesPerSector);
-
-            ulong       currentSector = nextSector;
-            ErrorNumber errno         = _image.ReadSector(currentSector, out byte[] fatData);
+            errno = _image.ReadSectors(_firstClusterSector + (clusters[i + firstCluster] * _sectorsPerCluster),
+                                       _sectorsPerCluster, out byte[] buffer);
 
             if(errno != ErrorNumber.NoError)
-                return null;
+                return errno;
 
-            if(_fat32)
-                while((nextCluster & FAT32_MASK) > 0 &&
-                      (nextCluster & FAT32_MASK) <= FAT32_RESERVED)
-                {
-                    clusters.Add(nextCluster);
-
-                    if(currentSector != nextSector)
-                    {
-                        errno = _image.ReadSector(nextSector, out fatData);
-
-                        if(errno != ErrorNumber.NoError)
-                            return null;
-
-                        currentSector = nextSector;
-                    }
-
-                    nextCluster = BitConverter.ToUInt32(fatData, nextEntry * 4);
-
-                    nextSector = (nextCluster / _fatEntriesPerSector) + _fatFirstSector +
-                                 (_useFirstFat ? 0 : _sectorsPerFat);
-
-                    nextEntry = (int)(nextCluster % _fatEntriesPerSector);
-                }
-            else if(_fat16)
-                while(nextCluster > 0 &&
-                      nextCluster <= FAT16_RESERVED)
-                {
-                    if(nextCluster > _fatEntries.Length)
-                        return null;
-
-                    clusters.Add(nextCluster);
-                    nextCluster = _fatEntries[nextCluster];
-                }
-            else
-                while(nextCluster > 0 &&
-                      nextCluster <= FAT12_RESERVED)
-                {
-                    if(nextCluster > _fatEntries.Length)
-                        return null;
-
-                    clusters.Add(nextCluster);
-                    nextCluster = _fatEntries[nextCluster];
-                }
-
-            return clusters.ToArray();
+            ms.Write(buffer, 0, buffer.Length);
         }
 
-        ErrorNumber GetFileEntry(string path, out CompleteDirectoryEntry entry)
+        ms.Position = offsetInCluster;
+        buf         = new byte[size];
+        ms.Read(buf, 0, (int)size);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Stat(string path, out FileEntryInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = GetFileEntry(path, out CompleteDirectoryEntry completeEntry);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        DirectoryEntry entry = completeEntry.Dirent;
+
+        stat = new FileEntryInfo
         {
-            entry = null;
+            Attributes = new FileAttributes(),
+            Blocks     = entry.size / _bytesPerCluster,
+            BlockSize  = _bytesPerCluster,
+            Length     = entry.size,
+            Inode      = (ulong)(_fat32 ? (entry.ea_handle << 16) + entry.start_cluster : entry.start_cluster),
+            Links      = 1
+        };
 
-            string cutPath = path.StartsWith('/') ? path.Substring(1).ToLower(_cultureInfo)
-                                 : path.ToLower(_cultureInfo);
+        if(entry.cdate > 0 ||
+           entry.ctime > 0)
+            stat.CreationTime = DateHandlers.DosToDateTime(entry.cdate, entry.ctime);
 
-            string[] pieces = cutPath.Split(new[]
+        if(_namespace != Namespace.Human)
+        {
+            if(entry.mdate > 0 ||
+               entry.mtime > 0)
+                stat.LastWriteTime = DateHandlers.DosToDateTime(entry.mdate, entry.mtime);
+
+            if(entry.ctime_ms > 0)
+                stat.CreationTime = stat.CreationTime?.AddMilliseconds(entry.ctime_ms * 10);
+        }
+
+        if(entry.size % _bytesPerCluster > 0)
+            stat.Blocks++;
+
+        if(entry.attributes.HasFlag(FatAttributes.Subdirectory))
+        {
+            stat.Attributes |= FileAttributes.Directory;
+
+            if((_fat32 && entry.ea_handle << 16 > 0) ||
+               entry.start_cluster > 0)
+                stat.Blocks =
+                    _fat32 ? GetClusters((uint)((entry.ea_handle << 16) + entry.start_cluster))?.Length ?? 0
+                        : GetClusters(entry.start_cluster)?.Length                                      ?? 0;
+
+            stat.Length = stat.Blocks * stat.BlockSize;
+        }
+
+        if(entry.attributes.HasFlag(FatAttributes.ReadOnly))
+            stat.Attributes |= FileAttributes.ReadOnly;
+
+        if(entry.attributes.HasFlag(FatAttributes.Hidden))
+            stat.Attributes |= FileAttributes.Hidden;
+
+        if(entry.attributes.HasFlag(FatAttributes.System))
+            stat.Attributes |= FileAttributes.System;
+
+        if(entry.attributes.HasFlag(FatAttributes.Archive))
+            stat.Attributes |= FileAttributes.Archive;
+
+        if(entry.attributes.HasFlag(FatAttributes.Device))
+            stat.Attributes |= FileAttributes.Device;
+
+        return ErrorNumber.NoError;
+    }
+
+    uint[] GetClusters(uint startCluster)
+    {
+        if(startCluster == 0)
+            return Array.Empty<uint>();
+
+        if(startCluster >= XmlFsType.Clusters)
+            return null;
+
+        List<uint> clusters = new();
+
+        uint nextCluster = startCluster;
+
+        ulong nextSector = (nextCluster / _fatEntriesPerSector) + _fatFirstSector +
+                           (_useFirstFat ? 0 : _sectorsPerFat);
+
+        int nextEntry = (int)(nextCluster % _fatEntriesPerSector);
+
+        ulong       currentSector = nextSector;
+        ErrorNumber errno         = _image.ReadSector(currentSector, out byte[] fatData);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        if(_fat32)
+            while((nextCluster & FAT32_MASK) > 0 &&
+                  (nextCluster & FAT32_MASK) <= FAT32_RESERVED)
             {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+                clusters.Add(nextCluster);
 
-            if(pieces.Length == 0)
-                return ErrorNumber.InvalidArgument;
+                if(currentSector != nextSector)
+                {
+                    errno = _image.ReadSector(nextSector, out fatData);
 
-            string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
+                    if(errno != ErrorNumber.NoError)
+                        return null;
 
-            if(!_directoryCache.TryGetValue(parentPath, out _))
+                    currentSector = nextSector;
+                }
+
+                nextCluster = BitConverter.ToUInt32(fatData, nextEntry * 4);
+
+                nextSector = (nextCluster / _fatEntriesPerSector) + _fatFirstSector +
+                             (_useFirstFat ? 0 : _sectorsPerFat);
+
+                nextEntry = (int)(nextCluster % _fatEntriesPerSector);
+            }
+        else if(_fat16)
+            while(nextCluster > 0 &&
+                  nextCluster <= FAT16_RESERVED)
             {
-                ErrorNumber err = ReadDir(parentPath, out _);
+                if(nextCluster > _fatEntries.Length)
+                    return null;
 
-                if(err != ErrorNumber.NoError)
-                    return err;
+                clusters.Add(nextCluster);
+                nextCluster = _fatEntries[nextCluster];
+            }
+        else
+            while(nextCluster > 0 &&
+                  nextCluster <= FAT12_RESERVED)
+            {
+                if(nextCluster > _fatEntries.Length)
+                    return null;
+
+                clusters.Add(nextCluster);
+                nextCluster = _fatEntries[nextCluster];
             }
 
-            Dictionary<string, CompleteDirectoryEntry> parent;
+        return clusters.ToArray();
+    }
 
-            if(pieces.Length == 1)
-                parent = _rootDirectoryCache;
-            else if(!_directoryCache.TryGetValue(parentPath, out parent))
-                return ErrorNumber.InvalidArgument;
+    ErrorNumber GetFileEntry(string path, out CompleteDirectoryEntry entry)
+    {
+        entry = null;
 
-            KeyValuePair<string, CompleteDirectoryEntry> dirent =
-                parent.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[^1]);
+        string cutPath = path.StartsWith('/') ? path.Substring(1).ToLower(_cultureInfo)
+                             : path.ToLower(_cultureInfo);
 
-            if(string.IsNullOrEmpty(dirent.Key))
-                return ErrorNumber.NoSuchFile;
-
-            entry = dirent.Value;
-
-            return ErrorNumber.NoError;
-        }
-
-        byte LfnChecksum(byte[] name, byte[] extension)
+        string[] pieces = cutPath.Split(new[]
         {
-            byte sum = 0;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            for(int i = 0; i < 8; i++)
-                sum = (byte)(((sum & 1) << 7) + (sum >> 1) + name[i]);
+        if(pieces.Length == 0)
+            return ErrorNumber.InvalidArgument;
 
-            for(int i = 0; i < 3; i++)
-                sum = (byte)(((sum & 1) << 7) + (sum >> 1) + extension[i]);
+        string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
 
-            return sum;
+        if(!_directoryCache.TryGetValue(parentPath, out _))
+        {
+            ErrorNumber err = ReadDir(parentPath, out _);
+
+            if(err != ErrorNumber.NoError)
+                return err;
         }
+
+        Dictionary<string, CompleteDirectoryEntry> parent;
+
+        if(pieces.Length == 1)
+            parent = _rootDirectoryCache;
+        else if(!_directoryCache.TryGetValue(parentPath, out parent))
+            return ErrorNumber.InvalidArgument;
+
+        KeyValuePair<string, CompleteDirectoryEntry> dirent =
+            parent.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[^1]);
+
+        if(string.IsNullOrEmpty(dirent.Key))
+            return ErrorNumber.NoSuchFile;
+
+        entry = dirent.Value;
+
+        return ErrorNumber.NoError;
+    }
+
+    byte LfnChecksum(byte[] name, byte[] extension)
+    {
+        byte sum = 0;
+
+        for(int i = 0; i < 8; i++)
+            sum = (byte)(((sum & 1) << 7) + (sum >> 1) + name[i]);
+
+        for(int i = 0; i < 3; i++)
+            sum = (byte)(((sum & 1) << 7) + (sum >> 1) + extension[i]);
+
+        return sum;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FAT/Info.cs b/Aaru.Filesystems/FAT/Info.cs
index dbd4ea3e5..62cadc19b 100644
--- a/Aaru.Filesystems/FAT/Info.cs
+++ b/Aaru.Filesystems/FAT/Info.cs
@@ -45,1102 +45,1101 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class FAT
 {
-    public sealed partial class FAT
+    /// <inheritdoc />
+    [SuppressMessage("ReSharper", "JoinDeclarationAndInitializer")]
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        [SuppressMessage("ReSharper", "JoinDeclarationAndInitializer")]
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(2 + partition.Start >= partition.End)
+            return false;
+
+        ushort bps;
+        byte   spc;
+        byte   numberOfFats;
+        ushort reservedSecs;
+        ushort rootEntries;
+        ushort sectors;
+        byte   mediaDescriptor;
+        ushort fatSectors;
+        uint   bigSectors;
+        byte   bpbSignature;
+        byte   fat32Signature;
+        ulong  hugeSectors;
+        byte[] fat32Id = new byte[8];
+        byte[] msxId   = new byte[6];
+        byte   fatId;
+        byte[] dosOem   = new byte[8];
+        byte[] atariOem = new byte[6];
+        ushort bootable = 0;
+
+        uint sectorsPerBpb = imagePlugin.Info.SectorSize < 512 ? 512 / imagePlugin.Info.SectorSize : 1;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(0 + partition.Start, sectorsPerBpb, out byte[] bpbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        errno = imagePlugin.ReadSector(sectorsPerBpb + partition.Start, out byte[] fatSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        HumanParameterBlock humanBpb = Marshal.ByteArrayToStructureBigEndian<HumanParameterBlock>(bpbSector);
+
+        ulong expectedClusters = humanBpb.bpc > 0 ? partition.Size / humanBpb.bpc : 0;
+
+        AaruConsole.DebugWriteLine("FAT plugin", "Human bpc = {0}", humanBpb.bpc);
+        AaruConsole.DebugWriteLine("FAT plugin", "Human clusters = {0}", humanBpb.clusters);
+        AaruConsole.DebugWriteLine("FAT plugin", "Human big_clusters = {0}", humanBpb.big_clusters);
+        AaruConsole.DebugWriteLine("FAT plugin", "Human expected clusters = {0}", expectedClusters);
+
+        // Check clusters for Human68k are correct
+        bool humanClustersCorrect = humanBpb.clusters       == 0 ? humanBpb.big_clusters == expectedClusters
+                                        : humanBpb.clusters == expectedClusters;
+
+        // Check OEM for Human68k is correct
+        bool humanOemCorrect = bpbSector[2]  >= 0x20 && bpbSector[3]  >= 0x20 && bpbSector[4]  >= 0x20 &&
+                               bpbSector[5]  >= 0x20 && bpbSector[6]  >= 0x20 && bpbSector[7]  >= 0x20 &&
+                               bpbSector[8]  >= 0x20 && bpbSector[9]  >= 0x20 && bpbSector[10] >= 0x20 &&
+                               bpbSector[11] >= 0x20 && bpbSector[12] >= 0x20 && bpbSector[13] >= 0x20 &&
+                               bpbSector[14] >= 0x20 && bpbSector[15] >= 0x20 && bpbSector[16] >= 0x20 &&
+                               bpbSector[17] >= 0x20;
+
+        // Check correct branch for Human68k
+        bool humanBranchCorrect = bpbSector[0] == 0x60 && bpbSector[1] >= 0x20 && bpbSector[1] < 0xFE;
+
+        AaruConsole.DebugWriteLine("FAT plugin", "humanClustersCorrect = {0}", humanClustersCorrect);
+        AaruConsole.DebugWriteLine("FAT plugin", "humanOemCorrect = {0}", humanOemCorrect);
+        AaruConsole.DebugWriteLine("FAT plugin", "humanBranchCorrect = {0}", humanBranchCorrect);
+
+        // If all Human68k checks are correct, it is a Human68k FAT16
+        if(humanClustersCorrect &&
+           humanOemCorrect      &&
+           humanBranchCorrect   &&
+           expectedClusters > 0)
+            return true;
+
+        Array.Copy(bpbSector, 0x02, atariOem, 0, 6);
+        Array.Copy(bpbSector, 0x03, dosOem, 0, 8);
+        bps             = BitConverter.ToUInt16(bpbSector, 0x00B);
+        spc             = bpbSector[0x00D];
+        reservedSecs    = BitConverter.ToUInt16(bpbSector, 0x00E);
+        numberOfFats    = bpbSector[0x010];
+        rootEntries     = BitConverter.ToUInt16(bpbSector, 0x011);
+        sectors         = BitConverter.ToUInt16(bpbSector, 0x013);
+        mediaDescriptor = bpbSector[0x015];
+        fatSectors      = BitConverter.ToUInt16(bpbSector, 0x016);
+        Array.Copy(bpbSector, 0x052, msxId, 0, 6);
+        bigSectors     = BitConverter.ToUInt32(bpbSector, 0x020);
+        bpbSignature   = bpbSector[0x026];
+        fat32Signature = bpbSector[0x042];
+        Array.Copy(bpbSector, 0x052, fat32Id, 0, 8);
+        hugeSectors = BitConverter.ToUInt64(bpbSector, 0x052);
+        fatId       = fatSector[0];
+        int bitsInBps = CountBits.Count(bps);
+
+        if(imagePlugin.Info.SectorSize >= 512)
+            bootable = BitConverter.ToUInt16(bpbSector, 0x1FE);
+
+        bool   correctSpc  = spc == 1 || spc == 2 || spc == 4 || spc == 8 || spc == 16 || spc == 32 || spc == 64;
+        string msxString   = Encoding.ASCII.GetString(msxId);
+        string fat32String = Encoding.ASCII.GetString(fat32Id);
+
+        bool atariOemCorrect = atariOem[0] >= 0x20 && atariOem[1] >= 0x20 && atariOem[2] >= 0x20 &&
+                               atariOem[3] >= 0x20 && atariOem[4] >= 0x20 && atariOem[5] >= 0x20;
+
+        bool dosOemCorrect = dosOem[0] >= 0x20 && dosOem[1] >= 0x20 && dosOem[2] >= 0x20 && dosOem[3] >= 0x20 &&
+                             dosOem[4] >= 0x20 && dosOem[5] >= 0x20 && dosOem[6] >= 0x20 && dosOem[7] >= 0x20;
+
+        string oemString = Encoding.ASCII.GetString(dosOem);
+
+        AaruConsole.DebugWriteLine("FAT plugin", "atari_oem_correct = {0}", atariOemCorrect);
+        AaruConsole.DebugWriteLine("FAT plugin", "dos_oem_correct = {0}", dosOemCorrect);
+        AaruConsole.DebugWriteLine("FAT plugin", "bps = {0}", bps);
+        AaruConsole.DebugWriteLine("FAT plugin", "bits in bps = {0}", bitsInBps);
+        AaruConsole.DebugWriteLine("FAT plugin", "spc = {0}", spc);
+        AaruConsole.DebugWriteLine("FAT plugin", "correct_spc = {0}", correctSpc);
+        AaruConsole.DebugWriteLine("FAT plugin", "reserved_secs = {0}", reservedSecs);
+        AaruConsole.DebugWriteLine("FAT plugin", "fats_no = {0}", numberOfFats);
+        AaruConsole.DebugWriteLine("FAT plugin", "root_entries = {0}", rootEntries);
+        AaruConsole.DebugWriteLine("FAT plugin", "sectors = {0}", sectors);
+        AaruConsole.DebugWriteLine("FAT plugin", "media_descriptor = 0x{0:X2}", mediaDescriptor);
+        AaruConsole.DebugWriteLine("FAT plugin", "fat_sectors = {0}", fatSectors);
+        AaruConsole.DebugWriteLine("FAT plugin", "msx_id = \"{0}\"", msxString);
+        AaruConsole.DebugWriteLine("FAT plugin", "big_sectors = {0}", bigSectors);
+        AaruConsole.DebugWriteLine("FAT plugin", "bpb_signature = 0x{0:X2}", bpbSignature);
+        AaruConsole.DebugWriteLine("FAT plugin", "fat32_signature = 0x{0:X2}", fat32Signature);
+        AaruConsole.DebugWriteLine("FAT plugin", "fat32_id = \"{0}\"", fat32String);
+        AaruConsole.DebugWriteLine("FAT plugin", "huge_sectors = {0}", hugeSectors);
+        AaruConsole.DebugWriteLine("FAT plugin", "fat_id = 0x{0:X2}", fatId);
+
+        ushort apricotBps             = BitConverter.ToUInt16(bpbSector, 0x50);
+        byte   apricotSpc             = bpbSector[0x52];
+        ushort apricotReservedSecs    = BitConverter.ToUInt16(bpbSector, 0x53);
+        byte   apricotFatsNo          = bpbSector[0x55];
+        ushort apricotRootEntries     = BitConverter.ToUInt16(bpbSector, 0x56);
+        ushort apricotSectors         = BitConverter.ToUInt16(bpbSector, 0x58);
+        byte   apricotMediaDescriptor = bpbSector[0x5A];
+        ushort apricotFatSectors      = BitConverter.ToUInt16(bpbSector, 0x5B);
+
+        bool apricotCorrectSpc = apricotSpc == 1  || apricotSpc == 2  || apricotSpc == 4 || apricotSpc == 8 ||
+                                 apricotSpc == 16 || apricotSpc == 32 || apricotSpc == 64;
+
+        int  bitsInApricotBps  = CountBits.Count(apricotBps);
+        byte apricotPartitions = bpbSector[0x0C];
+
+        AaruConsole.DebugWriteLine("FAT plugin", "apricot_bps = {0}", apricotBps);
+        AaruConsole.DebugWriteLine("FAT plugin", "apricot_spc = {0}", apricotSpc);
+        AaruConsole.DebugWriteLine("FAT plugin", "apricot_correct_spc = {0}", apricotCorrectSpc);
+        AaruConsole.DebugWriteLine("FAT plugin", "apricot_reserved_secs = {0}", apricotReservedSecs);
+        AaruConsole.DebugWriteLine("FAT plugin", "apricot_fats_no = {0}", apricotFatsNo);
+        AaruConsole.DebugWriteLine("FAT plugin", "apricot_root_entries = {0}", apricotRootEntries);
+        AaruConsole.DebugWriteLine("FAT plugin", "apricot_sectors = {0}", apricotSectors);
+        AaruConsole.DebugWriteLine("FAT plugin", "apricot_media_descriptor = 0x{0:X2}", apricotMediaDescriptor);
+        AaruConsole.DebugWriteLine("FAT plugin", "apricot_fat_sectors = {0}", apricotFatSectors);
+
+        // This is to support FAT partitions on hybrid ISO/USB images
+        if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
+            sectors     /= 4;
+            bigSectors  /= 4;
+            hugeSectors /= 4;
+        }
 
-            ushort bps;
-            byte   spc;
-            byte   numberOfFats;
-            ushort reservedSecs;
-            ushort rootEntries;
-            ushort sectors;
-            byte   mediaDescriptor;
-            ushort fatSectors;
-            uint   bigSectors;
-            byte   bpbSignature;
-            byte   fat32Signature;
-            ulong  hugeSectors;
-            byte[] fat32Id = new byte[8];
-            byte[] msxId   = new byte[6];
-            byte   fatId;
-            byte[] dosOem   = new byte[8];
-            byte[] atariOem = new byte[6];
-            ushort bootable = 0;
+        switch(oemString)
+        {
+            // exFAT
+            case "EXFAT   ": return false;
 
-            uint sectorsPerBpb = imagePlugin.Info.SectorSize < 512 ? 512 / imagePlugin.Info.SectorSize : 1;
+            // NTFS
+            case "NTFS    " when bootable == 0xAA55 && numberOfFats == 0 && fatSectors == 0: return false;
 
-            ErrorNumber errno = imagePlugin.ReadSectors(0 + partition.Start, sectorsPerBpb, out byte[] bpbSector);
+            // QNX4
+            case "FQNX4FS ": return false;
+        }
+
+        // HPFS
+        if(16 + partition.Start <= partition.End)
+        {
+            errno = imagePlugin.ReadSector(16 + partition.Start,
+                                           out byte[] hpfsSbSector); // Seek to superblock, on logical sector 16
 
             if(errno != ErrorNumber.NoError)
                 return false;
 
-            errno = imagePlugin.ReadSector(sectorsPerBpb + partition.Start, out byte[] fatSector);
+            uint hpfsMagic1 = BitConverter.ToUInt32(hpfsSbSector, 0x000);
+            uint hpfsMagic2 = BitConverter.ToUInt32(hpfsSbSector, 0x004);
+
+            if(hpfsMagic1 == 0xF995E849 &&
+               hpfsMagic2 == 0xFA53E9C5)
+                return false;
+        }
+
+        switch(bitsInBps)
+        {
+            // FAT32 for sure
+            case 1 when correctSpc && numberOfFats <= 2 && fatSectors == 0 && fat32Signature == 0x29 &&
+                        fat32String                == "FAT32   ": return true;
+
+            // short FAT32
+            case 1 when correctSpc && numberOfFats <= 2 && fatSectors == 0 && fat32Signature == 0x28:
+                return sectors == 0 ? bigSectors        == 0
+                                          ? hugeSectors <= partition.End - partition.Start + 1
+                                          : bigSectors  <= partition.End - partition.Start + 1
+                           : sectors <= partition.End - partition.Start + 1;
+
+            // MSX-DOS FAT12
+            case 1 when correctSpc && numberOfFats <= 2                                   && rootEntries > 0 &&
+                        sectors                    <= partition.End - partition.Start + 1 && fatSectors  > 0 &&
+                        msxString                  == "VOL_ID": return true;
+
+            // EBPB
+            case 1 when correctSpc && numberOfFats <= 2 && rootEntries > 0 && fatSectors > 0 &&
+                        (bpbSignature == 0x28 || bpbSignature == 0x29):
+                return sectors       == 0 ? bigSectors <= partition.End - partition.Start + 1
+                           : sectors <= partition.End                   - partition.Start + 1;
+
+            // BPB
+            case 1 when correctSpc && reservedSecs < partition.End - partition.Start && numberOfFats <= 2 &&
+                        rootEntries                > 0                               && fatSectors   > 0:
+                return sectors       == 0 ? bigSectors <= partition.End - partition.Start + 1
+                           : sectors <= partition.End                   - partition.Start + 1;
+        }
+
+        // Apricot BPB
+        if(bitsInApricotBps == 1                                      &&
+           apricotCorrectSpc                                          &&
+           apricotReservedSecs < partition.End - partition.Start      &&
+           apricotFatsNo       <= 2                                   &&
+           apricotRootEntries  > 0                                    &&
+           apricotFatSectors   > 0                                    &&
+           apricotSectors      <= partition.End - partition.Start + 1 &&
+           apricotPartitions   == 0)
+            return true;
+
+        // All FAT12 without BPB can only be used on floppies, without partitions.
+        if(partition.Start != 0)
+            return false;
+
+        // DEC Rainbow, lacks a BPB but has a very concrete structure...
+        if(imagePlugin.Info.Sectors    == 800 &&
+           imagePlugin.Info.SectorSize == 512)
+        {
+            // DEC Rainbow boots up with a Z80, first byte should be DI (disable interrupts)
+            byte z80Di = bpbSector[0];
+
+            // First FAT1 sector resides at LBA 0x14
+            errno = imagePlugin.ReadSector(0x14, out byte[] fat1Sector0);
 
             if(errno != ErrorNumber.NoError)
                 return false;
 
-            HumanParameterBlock humanBpb = Marshal.ByteArrayToStructureBigEndian<HumanParameterBlock>(bpbSector);
+            // First FAT2 sector resides at LBA 0x1A
+            errno = imagePlugin.ReadSector(0x1A, out byte[] fat2Sector0);
 
-            ulong expectedClusters = humanBpb.bpc > 0 ? partition.Size / humanBpb.bpc : 0;
+            if(errno != ErrorNumber.NoError)
+                return false;
 
-            AaruConsole.DebugWriteLine("FAT plugin", "Human bpc = {0}", humanBpb.bpc);
-            AaruConsole.DebugWriteLine("FAT plugin", "Human clusters = {0}", humanBpb.clusters);
-            AaruConsole.DebugWriteLine("FAT plugin", "Human big_clusters = {0}", humanBpb.big_clusters);
-            AaruConsole.DebugWriteLine("FAT plugin", "Human expected clusters = {0}", expectedClusters);
+            bool equalFatIds = fat1Sector0[0] == fat2Sector0[0] && fat1Sector0[1] == fat2Sector0[1];
 
-            // Check clusters for Human68k are correct
-            bool humanClustersCorrect = humanBpb.clusters       == 0 ? humanBpb.big_clusters == expectedClusters
-                                            : humanBpb.clusters == expectedClusters;
+            // Volume is software interleaved 2:1
+            var rootMs = new MemoryStream();
 
-            // Check OEM for Human68k is correct
-            bool humanOemCorrect = bpbSector[2]  >= 0x20 && bpbSector[3]  >= 0x20 && bpbSector[4]  >= 0x20 &&
-                                   bpbSector[5]  >= 0x20 && bpbSector[6]  >= 0x20 && bpbSector[7]  >= 0x20 &&
-                                   bpbSector[8]  >= 0x20 && bpbSector[9]  >= 0x20 && bpbSector[10] >= 0x20 &&
-                                   bpbSector[11] >= 0x20 && bpbSector[12] >= 0x20 && bpbSector[13] >= 0x20 &&
-                                   bpbSector[14] >= 0x20 && bpbSector[15] >= 0x20 && bpbSector[16] >= 0x20 &&
-                                   bpbSector[17] >= 0x20;
+            foreach(ulong rootSector in new ulong[]
+                    {
+                        0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
+                    })
+            {
+                errno = imagePlugin.ReadSector(rootSector, out byte[] tmp);
 
-            // Check correct branch for Human68k
-            bool humanBranchCorrect = bpbSector[0] == 0x60 && bpbSector[1] >= 0x20 && bpbSector[1] < 0xFE;
+                if(errno != ErrorNumber.NoError)
+                    return false;
 
-            AaruConsole.DebugWriteLine("FAT plugin", "humanClustersCorrect = {0}", humanClustersCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "humanOemCorrect = {0}", humanOemCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "humanBranchCorrect = {0}", humanBranchCorrect);
+                rootMs.Write(tmp, 0, tmp.Length);
+            }
 
-            // If all Human68k checks are correct, it is a Human68k FAT16
-            if(humanClustersCorrect &&
-               humanOemCorrect      &&
-               humanBranchCorrect   &&
-               expectedClusters > 0)
+            byte[] rootDir      = rootMs.ToArray();
+            bool   validRootDir = true;
+
+            // Iterate all root directory
+            for(int e = 0; e < 96 * 32; e += 32)
+            {
+                for(int c = 0; c < 11; c++)
+                    if((rootDir[c + e] < 0x20 && rootDir[c + e] != 0x00 && rootDir[c + e] != 0x05) ||
+                       rootDir[c + e] == 0xFF                                                      ||
+                       rootDir[c + e] == 0x2E)
+                    {
+                        validRootDir = false;
+
+                        break;
+                    }
+
+                if(!validRootDir)
+                    break;
+            }
+
+            if(z80Di == 0xF3                   &&
+               equalFatIds                     &&
+               (fat1Sector0[0] & 0xF0) == 0xF0 &&
+               fat1Sector0[1]          == 0xFF &&
+               validRootDir)
                 return true;
+        }
 
-            Array.Copy(bpbSector, 0x02, atariOem, 0, 6);
-            Array.Copy(bpbSector, 0x03, dosOem, 0, 8);
-            bps             = BitConverter.ToUInt16(bpbSector, 0x00B);
-            spc             = bpbSector[0x00D];
-            reservedSecs    = BitConverter.ToUInt16(bpbSector, 0x00E);
-            numberOfFats    = bpbSector[0x010];
-            rootEntries     = BitConverter.ToUInt16(bpbSector, 0x011);
-            sectors         = BitConverter.ToUInt16(bpbSector, 0x013);
-            mediaDescriptor = bpbSector[0x015];
-            fatSectors      = BitConverter.ToUInt16(bpbSector, 0x016);
-            Array.Copy(bpbSector, 0x052, msxId, 0, 6);
-            bigSectors     = BitConverter.ToUInt32(bpbSector, 0x020);
-            bpbSignature   = bpbSector[0x026];
-            fat32Signature = bpbSector[0x042];
-            Array.Copy(bpbSector, 0x052, fat32Id, 0, 8);
-            hugeSectors = BitConverter.ToUInt64(bpbSector, 0x052);
-            fatId       = fatSector[0];
-            int bitsInBps = CountBits.Count(bps);
+        byte   fat2        = fatSector[1];
+        byte   fat3        = fatSector[2];
+        ushort fatCluster2 = (ushort)(((fat2 << 8) + fat3) & 0xFFF);
 
-            if(imagePlugin.Info.SectorSize >= 512)
-                bootable = BitConverter.ToUInt16(bpbSector, 0x1FE);
+        AaruConsole.DebugWriteLine("FAT plugin", "1st fat cluster 1 = {0:X3}", fatCluster2);
 
-            bool   correctSpc  = spc == 1 || spc == 2 || spc == 4 || spc == 8 || spc == 16 || spc == 32 || spc == 64;
-            string msxString   = Encoding.ASCII.GetString(msxId);
-            string fat32String = Encoding.ASCII.GetString(fat32Id);
+        if(fatCluster2 < 0xFF0)
+            return false;
 
-            bool atariOemCorrect = atariOem[0] >= 0x20 && atariOem[1] >= 0x20 && atariOem[2] >= 0x20 &&
-                                   atariOem[3] >= 0x20 && atariOem[4] >= 0x20 && atariOem[5] >= 0x20;
+        ulong fat2SectorNo = 0;
 
-            bool dosOemCorrect = dosOem[0] >= 0x20 && dosOem[1] >= 0x20 && dosOem[2] >= 0x20 && dosOem[3] >= 0x20 &&
-                                 dosOem[4] >= 0x20 && dosOem[5] >= 0x20 && dosOem[6] >= 0x20 && dosOem[7] >= 0x20;
+        switch(fatId)
+        {
+            case 0xE5:
+                if(imagePlugin.Info.Sectors    == 2002 &&
+                   imagePlugin.Info.SectorSize == 128)
+                    fat2SectorNo = 2;
 
-            string oemString = Encoding.ASCII.GetString(dosOem);
+                break;
+            case 0xFD:
+                if(imagePlugin.Info.Sectors    == 4004 &&
+                   imagePlugin.Info.SectorSize == 128)
+                    fat2SectorNo = 7;
+                else if(imagePlugin.Info.Sectors    == 2002 &&
+                        imagePlugin.Info.SectorSize == 128)
+                    fat2SectorNo = 7;
 
-            AaruConsole.DebugWriteLine("FAT plugin", "atari_oem_correct = {0}", atariOemCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "dos_oem_correct = {0}", dosOemCorrect);
-            AaruConsole.DebugWriteLine("FAT plugin", "bps = {0}", bps);
-            AaruConsole.DebugWriteLine("FAT plugin", "bits in bps = {0}", bitsInBps);
-            AaruConsole.DebugWriteLine("FAT plugin", "spc = {0}", spc);
-            AaruConsole.DebugWriteLine("FAT plugin", "correct_spc = {0}", correctSpc);
-            AaruConsole.DebugWriteLine("FAT plugin", "reserved_secs = {0}", reservedSecs);
-            AaruConsole.DebugWriteLine("FAT plugin", "fats_no = {0}", numberOfFats);
-            AaruConsole.DebugWriteLine("FAT plugin", "root_entries = {0}", rootEntries);
-            AaruConsole.DebugWriteLine("FAT plugin", "sectors = {0}", sectors);
-            AaruConsole.DebugWriteLine("FAT plugin", "media_descriptor = 0x{0:X2}", mediaDescriptor);
-            AaruConsole.DebugWriteLine("FAT plugin", "fat_sectors = {0}", fatSectors);
-            AaruConsole.DebugWriteLine("FAT plugin", "msx_id = \"{0}\"", msxString);
-            AaruConsole.DebugWriteLine("FAT plugin", "big_sectors = {0}", bigSectors);
-            AaruConsole.DebugWriteLine("FAT plugin", "bpb_signature = 0x{0:X2}", bpbSignature);
-            AaruConsole.DebugWriteLine("FAT plugin", "fat32_signature = 0x{0:X2}", fat32Signature);
-            AaruConsole.DebugWriteLine("FAT plugin", "fat32_id = \"{0}\"", fat32String);
-            AaruConsole.DebugWriteLine("FAT plugin", "huge_sectors = {0}", hugeSectors);
-            AaruConsole.DebugWriteLine("FAT plugin", "fat_id = 0x{0:X2}", fatId);
+                break;
+            case 0xFE:
+                if(imagePlugin.Info.Sectors    == 320 &&
+                   imagePlugin.Info.SectorSize == 512)
+                    fat2SectorNo = 2;
+                else if(imagePlugin.Info.Sectors    == 2002 &&
+                        imagePlugin.Info.SectorSize == 128)
+                    fat2SectorNo = 7;
+                else if(imagePlugin.Info.Sectors    == 1232 &&
+                        imagePlugin.Info.SectorSize == 1024)
+                    fat2SectorNo = 3;
+                else if(imagePlugin.Info.Sectors    == 616 &&
+                        imagePlugin.Info.SectorSize == 1024)
+                    fat2SectorNo = 2;
+                else if(imagePlugin.Info.Sectors    == 720 &&
+                        imagePlugin.Info.SectorSize == 128)
+                    fat2SectorNo = 5;
+                else if(imagePlugin.Info.Sectors    == 640 &&
+                        imagePlugin.Info.SectorSize == 512)
+                    fat2SectorNo = 2;
 
-            ushort apricotBps             = BitConverter.ToUInt16(bpbSector, 0x50);
-            byte   apricotSpc             = bpbSector[0x52];
-            ushort apricotReservedSecs    = BitConverter.ToUInt16(bpbSector, 0x53);
-            byte   apricotFatsNo          = bpbSector[0x55];
-            ushort apricotRootEntries     = BitConverter.ToUInt16(bpbSector, 0x56);
-            ushort apricotSectors         = BitConverter.ToUInt16(bpbSector, 0x58);
-            byte   apricotMediaDescriptor = bpbSector[0x5A];
-            ushort apricotFatSectors      = BitConverter.ToUInt16(bpbSector, 0x5B);
+                break;
+            case 0xFF:
+                if(imagePlugin.Info.Sectors    == 640 &&
+                   imagePlugin.Info.SectorSize == 512)
+                    fat2SectorNo = 2;
 
-            bool apricotCorrectSpc = apricotSpc == 1  || apricotSpc == 2  || apricotSpc == 4 || apricotSpc == 8 ||
-                                     apricotSpc == 16 || apricotSpc == 32 || apricotSpc == 64;
+                break;
+            default:
+                if(fatId < 0xE8)
+                    return false;
 
-            int  bitsInApricotBps  = CountBits.Count(apricotBps);
-            byte apricotPartitions = bpbSector[0x0C];
+                fat2SectorNo = 2;
 
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_bps = {0}", apricotBps);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_spc = {0}", apricotSpc);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_correct_spc = {0}", apricotCorrectSpc);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_reserved_secs = {0}", apricotReservedSecs);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_fats_no = {0}", apricotFatsNo);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_root_entries = {0}", apricotRootEntries);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_sectors = {0}", apricotSectors);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_media_descriptor = 0x{0:X2}", apricotMediaDescriptor);
-            AaruConsole.DebugWriteLine("FAT plugin", "apricot_fat_sectors = {0}", apricotFatSectors);
+                break;
+        }
 
+        if(fat2SectorNo > partition.End ||
+           fat2SectorNo == 0)
+            return false;
+
+        AaruConsole.DebugWriteLine("FAT plugin", "2nd fat starts at = {0}", fat2SectorNo);
+
+        errno = imagePlugin.ReadSector(fat2SectorNo, out byte[] fat2Sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        fat2        = fat2Sector[1];
+        fat3        = fat2Sector[2];
+        fatCluster2 = (ushort)(((fat2 << 8) + fat3) & 0xFFF);
+
+        if(fatCluster2 < 0xFF0)
+            return false;
+
+        return fatId == fat2Sector[0];
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("IBM437");
+        information = "";
+        ErrorNumber errno;
+
+        var sb = new StringBuilder();
+        XmlFsType = new FileSystemType();
+
+        uint sectorsPerBpb = imagePlugin.Info.SectorSize < 512 ? 512 / imagePlugin.Info.SectorSize : 1;
+
+        errno = imagePlugin.ReadSectors(0 + partition.Start, sectorsPerBpb, out byte[] bpbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        BpbKind bpbKind = DetectBpbKind(bpbSector, imagePlugin, partition, out BiosParameterBlockEbpb fakeBpb,
+                                        out HumanParameterBlock humanBpb, out AtariParameterBlock atariBpb,
+                                        out byte minBootNearJump, out bool andosOemCorrect, out bool bootable);
+
+        bool   isFat12             = false;
+        bool   isFat16             = false;
+        bool   isFat32             = false;
+        ulong  rootDirectorySector = 0;
+        string extraInfo           = null;
+        string bootChk             = null;
+        XmlFsType.Bootable = bootable;
+
+        // This is needed because for FAT16, GEMDOS increases bytes per sector count instead of using big_sectors field.
+        uint sectorsPerRealSector;
+
+        // This is needed because some OSes don't put volume label as first entry in the root directory
+        uint sectorsForRootDirectory = 0;
+
+        switch(bpbKind)
+        {
+            case BpbKind.DecRainbow:
+            case BpbKind.Hardcoded:
+            case BpbKind.Msx:
+            case BpbKind.Apricot:
+                isFat12 = true;
+
+                break;
+            case BpbKind.ShortFat32:
+            case BpbKind.LongFat32:
+            {
+                isFat32 = true;
+
+                Fat32ParameterBlock fat32Bpb =
+                    Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlock>(bpbSector);
+
+                Fat32ParameterBlockShort shortFat32Bpb =
+                    Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlockShort>(bpbSector);
+
+                // This is to support FAT partitions on hybrid ISO/USB images
+                if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+                {
+                    fat32Bpb.bps       *= 4;
+                    fat32Bpb.spc       /= 4;
+                    fat32Bpb.big_spfat /= 4;
+                    fat32Bpb.hsectors  /= 4;
+                    fat32Bpb.sptrk     /= 4;
+                }
+
+                if(fat32Bpb.version != 0)
+                {
+                    sb.AppendLine("FAT+");
+                    XmlFsType.Type = "FAT+";
+                }
+                else
+                {
+                    sb.AppendLine("Microsoft FAT32");
+                    XmlFsType.Type = "FAT32";
+                }
+
+                if(fat32Bpb.oem_name != null)
+                    if(fat32Bpb.oem_name[5] == 0x49 &&
+                       fat32Bpb.oem_name[6] == 0x48 &&
+                       fat32Bpb.oem_name[7] == 0x43)
+                        sb.AppendLine("Volume has been modified by Windows 9x/Me Volume Tracker.");
+                    else
+                        XmlFsType.SystemIdentifier = StringHandlers.CToString(fat32Bpb.oem_name);
+
+                if(!string.IsNullOrEmpty(XmlFsType.SystemIdentifier))
+                    sb.AppendFormat("OEM Name: {0}", XmlFsType.SystemIdentifier.Trim()).AppendLine();
+
+                sb.AppendFormat("{0} bytes per sector.", fat32Bpb.bps).AppendLine();
+                sb.AppendFormat("{0} sectors per cluster.", fat32Bpb.spc).AppendLine();
+                XmlFsType.ClusterSize = (uint)(fat32Bpb.bps * fat32Bpb.spc);
+                sb.AppendFormat("{0} sectors reserved between BPB and FAT.", fat32Bpb.rsectors).AppendLine();
+
+                if(fat32Bpb.big_sectors == 0 &&
+                   fat32Bpb.signature   == 0x28)
+                {
+                    sb.AppendFormat("{0} sectors on volume ({1} bytes).", shortFat32Bpb.huge_sectors,
+                                    shortFat32Bpb.huge_sectors * shortFat32Bpb.bps).AppendLine();
+
+                    XmlFsType.Clusters = shortFat32Bpb.huge_sectors / shortFat32Bpb.spc;
+                }
+                else if(fat32Bpb.sectors == 0)
+                {
+                    sb.AppendFormat("{0} sectors on volume ({1} bytes).", fat32Bpb.big_sectors,
+                                    fat32Bpb.big_sectors * fat32Bpb.bps).AppendLine();
+
+                    XmlFsType.Clusters = fat32Bpb.big_sectors / fat32Bpb.spc;
+                }
+                else
+                {
+                    sb.AppendFormat("{0} sectors on volume ({1} bytes).", fat32Bpb.sectors,
+                                    fat32Bpb.sectors * fat32Bpb.bps).AppendLine();
+
+                    XmlFsType.Clusters = (ulong)(fat32Bpb.sectors / fat32Bpb.spc);
+                }
+
+                sb.AppendFormat("{0} clusters on volume.", XmlFsType.Clusters).AppendLine();
+                sb.AppendFormat("Media descriptor: 0x{0:X2}", fat32Bpb.media).AppendLine();
+                sb.AppendFormat("{0} sectors per FAT.", fat32Bpb.big_spfat).AppendLine();
+                sb.AppendFormat("{0} sectors per track.", fat32Bpb.sptrk).AppendLine();
+                sb.AppendFormat("{0} heads.", fat32Bpb.heads).AppendLine();
+                sb.AppendFormat("{0} hidden sectors before BPB.", fat32Bpb.hsectors).AppendLine();
+                sb.AppendFormat("Cluster of root directory: {0}", fat32Bpb.root_cluster).AppendLine();
+                sb.AppendFormat("Sector of FSINFO structure: {0}", fat32Bpb.fsinfo_sector).AppendLine();
+                sb.AppendFormat("Sector of backup FAT32 parameter block: {0}", fat32Bpb.backup_sector).AppendLine();
+                sb.AppendFormat("Drive number: 0x{0:X2}", fat32Bpb.drive_no).AppendLine();
+                sb.AppendFormat("Volume Serial Number: 0x{0:X8}", fat32Bpb.serial_no).AppendLine();
+                XmlFsType.VolumeSerial = $"{fat32Bpb.serial_no:X8}";
+
+                if((fat32Bpb.flags & 0xF8) == 0x00)
+                {
+                    if((fat32Bpb.flags & 0x01) == 0x01)
+                    {
+                        sb.AppendLine("Volume should be checked on next mount.");
+                        XmlFsType.Dirty = true;
+                    }
+
+                    if((fat32Bpb.flags & 0x02) == 0x02)
+                        sb.AppendLine("Disk surface should be on next mount.");
+                }
+
+                if((fat32Bpb.mirror_flags & 0x80) == 0x80)
+                    sb.AppendFormat("FATs are out of sync. FAT #{0} is in use.", fat32Bpb.mirror_flags & 0xF).
+                       AppendLine();
+                else
+                    sb.AppendLine("All copies of FAT are the same.");
+
+                if((fat32Bpb.mirror_flags & 0x6F20) == 0x6F20)
+                    sb.AppendLine("DR-DOS will boot this FAT32 using CHS.");
+                else if((fat32Bpb.mirror_flags & 0x4F20) == 0x4F20)
+                    sb.AppendLine("DR-DOS will boot this FAT32 using LBA.");
+
+                if(fat32Bpb.signature == 0x29)
+                {
+                    XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fat32Bpb.volume_label, Encoding);
+                    XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
+
+                    sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fat32Bpb.fs_type)).
+                       AppendLine();
+
+                    bootChk = Sha1Context.Data(fat32Bpb.boot_code, out _);
+                }
+                else
+                    bootChk = Sha1Context.Data(shortFat32Bpb.boot_code, out _);
+
+                // Check that jumps to a correct boot code position and has boot signature set.
+                // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
+                XmlFsType.Bootable =
+                    (fat32Bpb.jump[0] == 0xEB && fat32Bpb.jump[1] >= minBootNearJump && fat32Bpb.jump[1] < 0x80) ||
+                    (fat32Bpb.jump[0]                        == 0xE9            && fat32Bpb.jump.Length >= 3 &&
+                     BitConverter.ToUInt16(fat32Bpb.jump, 1) >= minBootNearJump &&
+                     BitConverter.ToUInt16(fat32Bpb.jump, 1) <= 0x1FC);
+
+                sectorsPerRealSector = fat32Bpb.bps / imagePlugin.Info.SectorSize;
+
+                // First root directory sector
+                rootDirectorySector =
+                    (ulong)(((fat32Bpb.root_cluster - 2) * fat32Bpb.spc) + (fat32Bpb.big_spfat * fat32Bpb.fats_no) +
+                            fat32Bpb.rsectors) * sectorsPerRealSector;
+
+                sectorsForRootDirectory = 1;
+
+                if(fat32Bpb.fsinfo_sector + partition.Start <= partition.End)
+                {
+                    errno = imagePlugin.ReadSector(fat32Bpb.fsinfo_sector + partition.Start,
+                                                   out byte[] fsinfoSector);
+
+                    if(errno != ErrorNumber.NoError)
+                        return;
+
+                    FsInfoSector fsInfo = Marshal.ByteArrayToStructureLittleEndian<FsInfoSector>(fsinfoSector);
+
+                    if(fsInfo.signature1 == FSINFO_SIGNATURE1 &&
+                       fsInfo.signature2 == FSINFO_SIGNATURE2 &&
+                       fsInfo.signature3 == FSINFO_SIGNATURE3)
+                    {
+                        if(fsInfo.free_clusters < 0xFFFFFFFF)
+                        {
+                            sb.AppendFormat("{0} free clusters", fsInfo.free_clusters).AppendLine();
+                            XmlFsType.FreeClusters          = fsInfo.free_clusters;
+                            XmlFsType.FreeClustersSpecified = true;
+                        }
+
+                        if(fsInfo.last_cluster > 2 &&
+                           fsInfo.last_cluster < 0xFFFFFFFF)
+                            sb.AppendFormat("Last allocated cluster {0}", fsInfo.last_cluster).AppendLine();
+                    }
+                }
+
+                break;
+            }
+
+            // Some fields could overflow fake BPB, those will be handled below
+            case BpbKind.Atari:
+            {
+                ushort sum = 0;
+
+                for(int i = 0; i < bpbSector.Length; i += 2)
+                    sum += BigEndianBitConverter.ToUInt16(bpbSector, i);
+
+                // TODO: Check this
+                if(sum == 0x1234)
+                {
+                    XmlFsType.Bootable = true;
+                    var atariSb = new StringBuilder();
+
+                    atariSb.AppendFormat("cmdload will be loaded with value {0:X4}h",
+                                         BigEndianBitConverter.ToUInt16(bpbSector, 0x01E)).AppendLine();
+
+                    atariSb.AppendFormat("Boot program will be loaded at address {0:X4}h", atariBpb.ldaaddr).
+                            AppendLine();
+
+                    atariSb.AppendFormat("FAT and directory will be cached at address {0:X4}h", atariBpb.fatbuf).
+                            AppendLine();
+
+                    if(atariBpb.ldmode == 0)
+                    {
+                        byte[] tmp = new byte[8];
+                        Array.Copy(atariBpb.fname, 0, tmp, 0, 8);
+                        string fname = Encoding.ASCII.GetString(tmp).Trim();
+                        tmp = new byte[3];
+                        Array.Copy(atariBpb.fname, 8, tmp, 0, 3);
+                        string extension = Encoding.ASCII.GetString(tmp).Trim();
+                        string filename;
+
+                        if(string.IsNullOrEmpty(extension))
+                            filename = fname;
+                        else
+                            filename = fname + "." + extension;
+
+                        atariSb.AppendFormat("Boot program resides in file \"{0}\"", filename).AppendLine();
+                    }
+                    else
+                        atariSb.
+                            AppendFormat("Boot program starts in sector {0} and is {1} sectors long ({2} bytes)",
+                                         atariBpb.ssect, atariBpb.sectcnt, atariBpb.sectcnt * atariBpb.bps).
+                            AppendLine();
+
+                    extraInfo = atariSb.ToString();
+                }
+
+                break;
+            }
+
+            case BpbKind.Human:
+                XmlFsType.Bootable = true;
+
+                break;
+        }
+
+        if(!isFat32)
+        {
             // This is to support FAT partitions on hybrid ISO/USB images
             if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
             {
-                sectors     /= 4;
-                bigSectors  /= 4;
-                hugeSectors /= 4;
+                fakeBpb.bps      *= 4;
+                fakeBpb.spc      /= 4;
+                fakeBpb.spfat    /= 4;
+                fakeBpb.hsectors /= 4;
+                fakeBpb.sptrk    /= 4;
+                fakeBpb.rsectors /= 4;
+
+                if(fakeBpb.spc == 0)
+                    fakeBpb.spc = 1;
             }
 
-            switch(oemString)
+            ulong clusters;
+
+            if(bpbKind != BpbKind.Human)
             {
-                // exFAT
-                case "EXFAT   ": return false;
+                int reservedSectors = fakeBpb.rsectors + (fakeBpb.fats_no * fakeBpb.spfat) +
+                                      (fakeBpb.root_ent * 32              / fakeBpb.bps);
 
-                // NTFS
-                case "NTFS    " when bootable == 0xAA55 && numberOfFats == 0 && fatSectors == 0: return false;
-
-                // QNX4
-                case "FQNX4FS ": return false;
+                if(fakeBpb.sectors == 0)
+                    clusters = (ulong)(fakeBpb.spc == 0 ? fakeBpb.big_sectors - reservedSectors
+                                           : (fakeBpb.big_sectors - reservedSectors) / fakeBpb.spc);
+                else
+                    clusters = (ulong)(fakeBpb.spc == 0 ? fakeBpb.sectors - reservedSectors
+                                           : (fakeBpb.sectors - reservedSectors) / fakeBpb.spc);
             }
+            else
+                clusters = humanBpb.clusters == 0 ? humanBpb.big_clusters : humanBpb.clusters;
 
-            // HPFS
-            if(16 + partition.Start <= partition.End)
+            // This will walk all the FAT entries and check if they're valid FAT12 or FAT16 entries.
+            // If the whole table is valid in both senses, it considers the type entry in the BPB.
+            // BeOS is known to set the type as FAT16 but treat it as FAT12.
+            if(!isFat12 &&
+               !isFat16)
             {
-                errno = imagePlugin.ReadSector(16 + partition.Start,
-                                               out byte[] hpfsSbSector); // Seek to superblock, on logical sector 16
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                uint hpfsMagic1 = BitConverter.ToUInt32(hpfsSbSector, 0x000);
-                uint hpfsMagic2 = BitConverter.ToUInt32(hpfsSbSector, 0x004);
-
-                if(hpfsMagic1 == 0xF995E849 &&
-                   hpfsMagic2 == 0xFA53E9C5)
-                    return false;
-            }
-
-            switch(bitsInBps)
-            {
-                // FAT32 for sure
-                case 1 when correctSpc && numberOfFats <= 2 && fatSectors == 0 && fat32Signature == 0x29 &&
-                            fat32String                == "FAT32   ": return true;
-
-                // short FAT32
-                case 1 when correctSpc && numberOfFats <= 2 && fatSectors == 0 && fat32Signature == 0x28:
-                    return sectors == 0 ? bigSectors        == 0
-                                              ? hugeSectors <= partition.End - partition.Start + 1
-                                              : bigSectors  <= partition.End - partition.Start + 1
-                               : sectors <= partition.End - partition.Start + 1;
-
-                // MSX-DOS FAT12
-                case 1 when correctSpc && numberOfFats <= 2                                   && rootEntries > 0 &&
-                            sectors                    <= partition.End - partition.Start + 1 && fatSectors  > 0 &&
-                            msxString                  == "VOL_ID": return true;
-
-                // EBPB
-                case 1 when correctSpc && numberOfFats <= 2 && rootEntries > 0 && fatSectors > 0 &&
-                            (bpbSignature == 0x28 || bpbSignature == 0x29):
-                    return sectors       == 0 ? bigSectors <= partition.End - partition.Start + 1
-                               : sectors <= partition.End                   - partition.Start + 1;
-
-                // BPB
-                case 1 when correctSpc && reservedSecs < partition.End - partition.Start && numberOfFats <= 2 &&
-                            rootEntries                > 0                               && fatSectors   > 0:
-                    return sectors       == 0 ? bigSectors <= partition.End - partition.Start + 1
-                               : sectors <= partition.End                   - partition.Start + 1;
-            }
-
-            // Apricot BPB
-            if(bitsInApricotBps == 1                                      &&
-               apricotCorrectSpc                                          &&
-               apricotReservedSecs < partition.End - partition.Start      &&
-               apricotFatsNo       <= 2                                   &&
-               apricotRootEntries  > 0                                    &&
-               apricotFatSectors   > 0                                    &&
-               apricotSectors      <= partition.End - partition.Start + 1 &&
-               apricotPartitions   == 0)
-                return true;
-
-            // All FAT12 without BPB can only be used on floppies, without partitions.
-            if(partition.Start != 0)
-                return false;
-
-            // DEC Rainbow, lacks a BPB but has a very concrete structure...
-            if(imagePlugin.Info.Sectors    == 800 &&
-               imagePlugin.Info.SectorSize == 512)
-            {
-                // DEC Rainbow boots up with a Z80, first byte should be DI (disable interrupts)
-                byte z80Di = bpbSector[0];
-
-                // First FAT1 sector resides at LBA 0x14
-                errno = imagePlugin.ReadSector(0x14, out byte[] fat1Sector0);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                // First FAT2 sector resides at LBA 0x1A
-                errno = imagePlugin.ReadSector(0x1A, out byte[] fat2Sector0);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                bool equalFatIds = fat1Sector0[0] == fat2Sector0[0] && fat1Sector0[1] == fat2Sector0[1];
-
-                // Volume is software interleaved 2:1
-                var rootMs = new MemoryStream();
-
-                foreach(ulong rootSector in new ulong[]
+                if(clusters < 4089)
                 {
-                    0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
-                })
-                {
-                    errno = imagePlugin.ReadSector(rootSector, out byte[] tmp);
+                    ushort[] fat12 = new ushort[clusters];
+
+                    _reservedSectors     = fakeBpb.rsectors;
+                    sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize;
+                    _fatFirstSector      = partition.Start + (_reservedSectors * sectorsPerRealSector);
+
+                    errno = imagePlugin.ReadSectors(_fatFirstSector, fakeBpb.spfat, out byte[] fatBytes);
 
                     if(errno != ErrorNumber.NoError)
-                        return false;
+                        return;
 
-                    rootMs.Write(tmp, 0, tmp.Length);
-                }
+                    int pos = 0;
 
-                byte[] rootDir      = rootMs.ToArray();
-                bool   validRootDir = true;
-
-                // Iterate all root directory
-                for(int e = 0; e < 96 * 32; e += 32)
-                {
-                    for(int c = 0; c < 11; c++)
-                        if((rootDir[c + e] < 0x20 && rootDir[c + e] != 0x00 && rootDir[c + e] != 0x05) ||
-                           rootDir[c + e] == 0xFF                                                      ||
-                           rootDir[c + e] == 0x2E)
-                        {
-                            validRootDir = false;
+                    for(int i = 0; i + 3 < fatBytes.Length && pos < fat12.Length; i += 3)
+                    {
+                        fat12[pos++] = (ushort)(((fatBytes[i + 1] & 0xF) << 8) + fatBytes[i + 0]);
 
+                        if(pos >= fat12.Length)
                             break;
-                        }
 
-                    if(!validRootDir)
+                        fat12[pos++] = (ushort)(((fatBytes[i + 1] & 0xF0) >> 4) + (fatBytes[i + 2] << 4));
+                    }
+
+                    bool fat12Valid = fat12[0] >= FAT12_RESERVED && fat12[1] >= FAT12_RESERVED;
+
+                    foreach(ushort entry in fat12)
+                    {
+                        if(entry >= FAT12_RESERVED ||
+                           entry <= clusters)
+                            continue;
+
+                        fat12Valid = false;
+
+                        break;
+                    }
+
+                    ushort[] fat16 = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
+
+                    bool fat16Valid = fat16[0] >= FAT16_RESERVED && fat16[1] >= 0x3FF0;
+
+                    foreach(ushort entry in fat16)
+                    {
+                        if(entry >= FAT16_RESERVED ||
+                           entry <= clusters)
+                            continue;
+
+                        fat16Valid = false;
+
+                        break;
+                    }
+
+                    isFat12 = fat12Valid;
+                    isFat16 = fat16Valid;
+
+                    // Check BPB type
+                    if(isFat12 == isFat16)
+                    {
+                        isFat12 = fakeBpb.fs_type                           != null &&
+                                  Encoding.ASCII.GetString(fakeBpb.fs_type) == "FAT12   ";
+
+                        isFat16 = fakeBpb.fs_type                           != null &&
+                                  Encoding.ASCII.GetString(fakeBpb.fs_type) == "FAT16   ";
+                    }
+
+                    if(!isFat12 &&
+                       !isFat16)
+                        isFat12 = true;
+                }
+                else
+                    isFat16 = true;
+            }
+
+            if(isFat12)
+            {
+                switch(bpbKind)
+                {
+                    case BpbKind.Atari:
+                        sb.AppendLine("Atari FAT12");
+
+                        break;
+                    case BpbKind.Apricot:
+                        sb.AppendLine("Apricot FAT12");
+
+                        break;
+                    case BpbKind.Human:
+                        sb.AppendLine("Human68k FAT12");
+
+                        break;
+                    default:
+                        sb.AppendLine("Microsoft FAT12");
+
                         break;
                 }
 
-                if(z80Di == 0xF3                   &&
-                   equalFatIds                     &&
-                   (fat1Sector0[0] & 0xF0) == 0xF0 &&
-                   fat1Sector0[1]          == 0xFF &&
-                   validRootDir)
-                    return true;
+                XmlFsType.Type = "FAT12";
             }
-
-            byte   fat2        = fatSector[1];
-            byte   fat3        = fatSector[2];
-            ushort fatCluster2 = (ushort)(((fat2 << 8) + fat3) & 0xFFF);
-
-            AaruConsole.DebugWriteLine("FAT plugin", "1st fat cluster 1 = {0:X3}", fatCluster2);
-
-            if(fatCluster2 < 0xFF0)
-                return false;
-
-            ulong fat2SectorNo = 0;
-
-            switch(fatId)
+            else if(isFat16)
             {
-                case 0xE5:
-                    if(imagePlugin.Info.Sectors    == 2002 &&
-                       imagePlugin.Info.SectorSize == 128)
-                        fat2SectorNo = 2;
+                sb.AppendLine(bpbKind == BpbKind.Atari
+                                  ? "Atari FAT16"
+                                  : bpbKind == BpbKind.Human
+                                      ? "Human68k FAT16"
+                                      : "Microsoft FAT16");
 
-                    break;
-                case 0xFD:
-                    if(imagePlugin.Info.Sectors    == 4004 &&
-                       imagePlugin.Info.SectorSize == 128)
-                        fat2SectorNo = 7;
-                    else if(imagePlugin.Info.Sectors    == 2002 &&
-                            imagePlugin.Info.SectorSize == 128)
-                        fat2SectorNo = 7;
-
-                    break;
-                case 0xFE:
-                    if(imagePlugin.Info.Sectors    == 320 &&
-                       imagePlugin.Info.SectorSize == 512)
-                        fat2SectorNo = 2;
-                    else if(imagePlugin.Info.Sectors    == 2002 &&
-                            imagePlugin.Info.SectorSize == 128)
-                        fat2SectorNo = 7;
-                    else if(imagePlugin.Info.Sectors    == 1232 &&
-                            imagePlugin.Info.SectorSize == 1024)
-                        fat2SectorNo = 3;
-                    else if(imagePlugin.Info.Sectors    == 616 &&
-                            imagePlugin.Info.SectorSize == 1024)
-                        fat2SectorNo = 2;
-                    else if(imagePlugin.Info.Sectors    == 720 &&
-                            imagePlugin.Info.SectorSize == 128)
-                        fat2SectorNo = 5;
-                    else if(imagePlugin.Info.Sectors    == 640 &&
-                            imagePlugin.Info.SectorSize == 512)
-                        fat2SectorNo = 2;
-
-                    break;
-                case 0xFF:
-                    if(imagePlugin.Info.Sectors    == 640 &&
-                       imagePlugin.Info.SectorSize == 512)
-                        fat2SectorNo = 2;
-
-                    break;
-                default:
-                    if(fatId < 0xE8)
-                        return false;
-
-                    fat2SectorNo = 2;
-
-                    break;
+                XmlFsType.Type = "FAT16";
             }
 
-            if(fat2SectorNo > partition.End ||
-               fat2SectorNo == 0)
-                return false;
+            if(bpbKind == BpbKind.Atari)
+            {
+                if(atariBpb.serial_no[0] == 0x49 &&
+                   atariBpb.serial_no[1] == 0x48 &&
+                   atariBpb.serial_no[2] == 0x43)
+                    sb.AppendLine("Volume has been modified by Windows 9x/Me Volume Tracker.");
+                else
+                    XmlFsType.VolumeSerial =
+                        $"{atariBpb.serial_no[0]:X2}{atariBpb.serial_no[1]:X2}{atariBpb.serial_no[2]:X2}";
 
-            AaruConsole.DebugWriteLine("FAT plugin", "2nd fat starts at = {0}", fat2SectorNo);
+                XmlFsType.SystemIdentifier = StringHandlers.CToString(atariBpb.oem_name);
 
-            errno = imagePlugin.ReadSector(fat2SectorNo, out byte[] fat2Sector);
+                if(string.IsNullOrEmpty(XmlFsType.SystemIdentifier))
+                    XmlFsType.SystemIdentifier = null;
+            }
+            else if(fakeBpb.oem_name != null)
+            {
+                if(fakeBpb.oem_name[5] == 0x49 &&
+                   fakeBpb.oem_name[6] == 0x48 &&
+                   fakeBpb.oem_name[7] == 0x43)
+                    sb.AppendLine("Volume has been modified by Windows 9x/Me Volume Tracker.");
+                else
+                {
+                    // Later versions of Windows create a DOS 3 BPB without OEM name on 8 sectors/track floppies
+                    // OEM ID should be ASCII, otherwise ignore it
+                    if(fakeBpb.oem_name[0] >= 0x20 &&
+                       fakeBpb.oem_name[0] <= 0x7F &&
+                       fakeBpb.oem_name[1] >= 0x20 &&
+                       fakeBpb.oem_name[1] <= 0x7F &&
+                       fakeBpb.oem_name[2] >= 0x20 &&
+                       fakeBpb.oem_name[2] <= 0x7F &&
+                       fakeBpb.oem_name[3] >= 0x20 &&
+                       fakeBpb.oem_name[3] <= 0x7F &&
+                       fakeBpb.oem_name[4] >= 0x20 &&
+                       fakeBpb.oem_name[4] <= 0x7F &&
+                       fakeBpb.oem_name[5] >= 0x20 &&
+                       fakeBpb.oem_name[5] <= 0x7F &&
+                       fakeBpb.oem_name[6] >= 0x20 &&
+                       fakeBpb.oem_name[6] <= 0x7F &&
+                       fakeBpb.oem_name[7] >= 0x20 &&
+                       fakeBpb.oem_name[7] <= 0x7F)
+                        XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name);
+                    else if(fakeBpb.oem_name[0] < 0x20  &&
+                            fakeBpb.oem_name[1] >= 0x20 &&
+                            fakeBpb.oem_name[1] <= 0x7F &&
+                            fakeBpb.oem_name[2] >= 0x20 &&
+                            fakeBpb.oem_name[2] <= 0x7F &&
+                            fakeBpb.oem_name[3] >= 0x20 &&
+                            fakeBpb.oem_name[3] <= 0x7F &&
+                            fakeBpb.oem_name[4] >= 0x20 &&
+                            fakeBpb.oem_name[4] <= 0x7F &&
+                            fakeBpb.oem_name[5] >= 0x20 &&
+                            fakeBpb.oem_name[5] <= 0x7F &&
+                            fakeBpb.oem_name[6] >= 0x20 &&
+                            fakeBpb.oem_name[6] <= 0x7F &&
+                            fakeBpb.oem_name[7] >= 0x20 &&
+                            fakeBpb.oem_name[7] <= 0x7F)
+                        XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name, Encoding, start: 1);
+                }
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+                if(fakeBpb.signature == 0x28 ||
+                   fakeBpb.signature == 0x29)
+                    XmlFsType.VolumeSerial = $"{fakeBpb.serial_no:X8}";
+            }
 
-            fat2        = fat2Sector[1];
-            fat3        = fat2Sector[2];
-            fatCluster2 = (ushort)(((fat2 << 8) + fat3) & 0xFFF);
+            if(XmlFsType.SystemIdentifier != null)
+                sb.AppendFormat("OEM Name: {0}", XmlFsType.SystemIdentifier.Trim()).AppendLine();
 
-            if(fatCluster2 < 0xFF0)
-                return false;
+            sb.AppendFormat("{0} bytes per sector.", fakeBpb.bps).AppendLine();
 
-            return fatId == fat2Sector[0];
+            if(bpbKind != BpbKind.Human)
+                if(fakeBpb.sectors == 0)
+                    sb.AppendFormat("{0} sectors on volume ({1} bytes).", fakeBpb.big_sectors,
+                                    fakeBpb.big_sectors * fakeBpb.bps).AppendLine();
+                else
+                    sb.AppendFormat("{0} sectors on volume ({1} bytes).", fakeBpb.sectors,
+                                    fakeBpb.sectors * fakeBpb.bps).AppendLine();
+            else
+                sb.AppendFormat("{0} sectors on volume ({1} bytes).",
+                                clusters * humanBpb.bpc / imagePlugin.Info.SectorSize, clusters * humanBpb.bpc).
+                   AppendLine();
+
+            XmlFsType.Clusters = clusters;
+            sb.AppendFormat("{0} sectors per cluster.", fakeBpb.spc).AppendLine();
+            sb.AppendFormat("{0} clusters on volume.", XmlFsType.Clusters).AppendLine();
+            XmlFsType.ClusterSize = (uint)(fakeBpb.bps * fakeBpb.spc);
+            sb.AppendFormat("{0} sectors reserved between BPB and FAT.", fakeBpb.rsectors).AppendLine();
+            sb.AppendFormat("{0} FATs.", fakeBpb.fats_no).AppendLine();
+            sb.AppendFormat("{0} entries on root directory.", fakeBpb.root_ent).AppendLine();
+
+            if(fakeBpb.media > 0)
+                sb.AppendFormat("Media descriptor: 0x{0:X2}", fakeBpb.media).AppendLine();
+
+            sb.AppendFormat("{0} sectors per FAT.", fakeBpb.spfat).AppendLine();
+
+            if(fakeBpb.sptrk > 0  &&
+               fakeBpb.sptrk < 64 &&
+               fakeBpb.heads > 0  &&
+               fakeBpb.heads < 256)
+            {
+                sb.AppendFormat("{0} sectors per track.", fakeBpb.sptrk).AppendLine();
+                sb.AppendFormat("{0} heads.", fakeBpb.heads).AppendLine();
+            }
+
+            if(fakeBpb.hsectors <= partition.Start)
+                sb.AppendFormat("{0} hidden sectors before BPB.", fakeBpb.hsectors).AppendLine();
+
+            if(fakeBpb.signature == 0x28 ||
+               fakeBpb.signature == 0x29 ||
+               andosOemCorrect)
+            {
+                sb.AppendFormat("Drive number: 0x{0:X2}", fakeBpb.drive_no).AppendLine();
+
+                if(XmlFsType.VolumeSerial != null)
+                    sb.AppendFormat("Volume Serial Number: {0}", XmlFsType.VolumeSerial).AppendLine();
+
+                if((fakeBpb.flags & 0xF8) == 0x00)
+                {
+                    if((fakeBpb.flags & 0x01) == 0x01)
+                    {
+                        sb.AppendLine("Volume should be checked on next mount.");
+                        XmlFsType.Dirty = true;
+                    }
+
+                    if((fakeBpb.flags & 0x02) == 0x02)
+                        sb.AppendLine("Disk surface should be on next mount.");
+                }
+
+                if(fakeBpb.signature == 0x29 || andosOemCorrect)
+                {
+                    XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fakeBpb.volume_label, Encoding);
+                    XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
+                    sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fakeBpb.fs_type)).AppendLine();
+                }
+            }
+            else if(bpbKind                == BpbKind.Atari &&
+                    XmlFsType.VolumeSerial != null)
+                sb.AppendFormat("Volume Serial Number: {0}", XmlFsType.VolumeSerial).AppendLine();
+
+            bootChk = Sha1Context.Data(fakeBpb.boot_code, out _);
+
+            // Workaround that PCExchange jumps into "FAT16   "...
+            if(XmlFsType.SystemIdentifier == "PCX 2.0 ")
+                fakeBpb.jump[1] += 8;
+
+            // Check that jumps to a correct boot code position and has boot signature set.
+            // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
+            if(XmlFsType.Bootable == false &&
+               fakeBpb.jump       != null)
+                XmlFsType.Bootable |=
+                    (fakeBpb.jump[0] == 0xEB && fakeBpb.jump[1] >= minBootNearJump && fakeBpb.jump[1] < 0x80) ||
+                    (fakeBpb.jump[0]                        == 0xE9            && fakeBpb.jump.Length >= 3 &&
+                     BitConverter.ToUInt16(fakeBpb.jump, 1) >= minBootNearJump &&
+                     BitConverter.ToUInt16(fakeBpb.jump, 1) <= 0x1FC);
+
+            sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize;
+
+            // First root directory sector
+            rootDirectorySector =
+                (ulong)((fakeBpb.spfat * fakeBpb.fats_no) + fakeBpb.rsectors) * sectorsPerRealSector;
+
+            sectorsForRootDirectory = (uint)(fakeBpb.root_ent * 32 / imagePlugin.Info.SectorSize);
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        if(extraInfo != null)
+            sb.Append(extraInfo);
+
+        if(rootDirectorySector + partition.Start < partition.End &&
+           imagePlugin.Info.XmlMediaType         != XmlMediaType.OpticalDisc)
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("IBM437");
-            information = "";
-            ErrorNumber errno;
-
-            var sb = new StringBuilder();
-            XmlFsType = new FileSystemType();
-
-            uint sectorsPerBpb = imagePlugin.Info.SectorSize < 512 ? 512 / imagePlugin.Info.SectorSize : 1;
-
-            errno = imagePlugin.ReadSectors(0 + partition.Start, sectorsPerBpb, out byte[] bpbSector);
+            errno = imagePlugin.ReadSectors(rootDirectorySector + partition.Start, sectorsForRootDirectory,
+                                            out byte[] rootDirectory);
 
             if(errno != ErrorNumber.NoError)
                 return;
 
-            BpbKind bpbKind = DetectBpbKind(bpbSector, imagePlugin, partition, out BiosParameterBlockEbpb fakeBpb,
-                                            out HumanParameterBlock humanBpb, out AtariParameterBlock atariBpb,
-                                            out byte minBootNearJump, out bool andosOemCorrect, out bool bootable);
-
-            bool   isFat12             = false;
-            bool   isFat16             = false;
-            bool   isFat32             = false;
-            ulong  rootDirectorySector = 0;
-            string extraInfo           = null;
-            string bootChk             = null;
-            XmlFsType.Bootable = bootable;
-
-            // This is needed because for FAT16, GEMDOS increases bytes per sector count instead of using big_sectors field.
-            uint sectorsPerRealSector;
-
-            // This is needed because some OSes don't put volume label as first entry in the root directory
-            uint sectorsForRootDirectory = 0;
-
-            switch(bpbKind)
+            if(bpbKind == BpbKind.DecRainbow)
             {
-                case BpbKind.DecRainbow:
-                case BpbKind.Hardcoded:
-                case BpbKind.Msx:
-                case BpbKind.Apricot:
-                    isFat12 = true;
+                var rootMs = new MemoryStream();
 
-                    break;
-                case BpbKind.ShortFat32:
-                case BpbKind.LongFat32:
+                foreach(ulong rootSector in new[]
+                        {
+                            0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
+                        })
                 {
-                    isFat32 = true;
+                    errno = imagePlugin.ReadSector(rootSector, out byte[] tmp);
 
-                    Fat32ParameterBlock fat32Bpb =
-                        Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlock>(bpbSector);
+                    if(errno != ErrorNumber.NoError)
+                        return;
 
-                    Fat32ParameterBlockShort shortFat32Bpb =
-                        Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlockShort>(bpbSector);
-
-                    // This is to support FAT partitions on hybrid ISO/USB images
-                    if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
-                    {
-                        fat32Bpb.bps       *= 4;
-                        fat32Bpb.spc       /= 4;
-                        fat32Bpb.big_spfat /= 4;
-                        fat32Bpb.hsectors  /= 4;
-                        fat32Bpb.sptrk     /= 4;
-                    }
-
-                    if(fat32Bpb.version != 0)
-                    {
-                        sb.AppendLine("FAT+");
-                        XmlFsType.Type = "FAT+";
-                    }
-                    else
-                    {
-                        sb.AppendLine("Microsoft FAT32");
-                        XmlFsType.Type = "FAT32";
-                    }
-
-                    if(fat32Bpb.oem_name != null)
-                        if(fat32Bpb.oem_name[5] == 0x49 &&
-                           fat32Bpb.oem_name[6] == 0x48 &&
-                           fat32Bpb.oem_name[7] == 0x43)
-                            sb.AppendLine("Volume has been modified by Windows 9x/Me Volume Tracker.");
-                        else
-                            XmlFsType.SystemIdentifier = StringHandlers.CToString(fat32Bpb.oem_name);
-
-                    if(!string.IsNullOrEmpty(XmlFsType.SystemIdentifier))
-                        sb.AppendFormat("OEM Name: {0}", XmlFsType.SystemIdentifier.Trim()).AppendLine();
-
-                    sb.AppendFormat("{0} bytes per sector.", fat32Bpb.bps).AppendLine();
-                    sb.AppendFormat("{0} sectors per cluster.", fat32Bpb.spc).AppendLine();
-                    XmlFsType.ClusterSize = (uint)(fat32Bpb.bps * fat32Bpb.spc);
-                    sb.AppendFormat("{0} sectors reserved between BPB and FAT.", fat32Bpb.rsectors).AppendLine();
-
-                    if(fat32Bpb.big_sectors == 0 &&
-                       fat32Bpb.signature   == 0x28)
-                    {
-                        sb.AppendFormat("{0} sectors on volume ({1} bytes).", shortFat32Bpb.huge_sectors,
-                                        shortFat32Bpb.huge_sectors * shortFat32Bpb.bps).AppendLine();
-
-                        XmlFsType.Clusters = shortFat32Bpb.huge_sectors / shortFat32Bpb.spc;
-                    }
-                    else if(fat32Bpb.sectors == 0)
-                    {
-                        sb.AppendFormat("{0} sectors on volume ({1} bytes).", fat32Bpb.big_sectors,
-                                        fat32Bpb.big_sectors * fat32Bpb.bps).AppendLine();
-
-                        XmlFsType.Clusters = fat32Bpb.big_sectors / fat32Bpb.spc;
-                    }
-                    else
-                    {
-                        sb.AppendFormat("{0} sectors on volume ({1} bytes).", fat32Bpb.sectors,
-                                        fat32Bpb.sectors * fat32Bpb.bps).AppendLine();
-
-                        XmlFsType.Clusters = (ulong)(fat32Bpb.sectors / fat32Bpb.spc);
-                    }
-
-                    sb.AppendFormat("{0} clusters on volume.", XmlFsType.Clusters).AppendLine();
-                    sb.AppendFormat("Media descriptor: 0x{0:X2}", fat32Bpb.media).AppendLine();
-                    sb.AppendFormat("{0} sectors per FAT.", fat32Bpb.big_spfat).AppendLine();
-                    sb.AppendFormat("{0} sectors per track.", fat32Bpb.sptrk).AppendLine();
-                    sb.AppendFormat("{0} heads.", fat32Bpb.heads).AppendLine();
-                    sb.AppendFormat("{0} hidden sectors before BPB.", fat32Bpb.hsectors).AppendLine();
-                    sb.AppendFormat("Cluster of root directory: {0}", fat32Bpb.root_cluster).AppendLine();
-                    sb.AppendFormat("Sector of FSINFO structure: {0}", fat32Bpb.fsinfo_sector).AppendLine();
-                    sb.AppendFormat("Sector of backup FAT32 parameter block: {0}", fat32Bpb.backup_sector).AppendLine();
-                    sb.AppendFormat("Drive number: 0x{0:X2}", fat32Bpb.drive_no).AppendLine();
-                    sb.AppendFormat("Volume Serial Number: 0x{0:X8}", fat32Bpb.serial_no).AppendLine();
-                    XmlFsType.VolumeSerial = $"{fat32Bpb.serial_no:X8}";
-
-                    if((fat32Bpb.flags & 0xF8) == 0x00)
-                    {
-                        if((fat32Bpb.flags & 0x01) == 0x01)
-                        {
-                            sb.AppendLine("Volume should be checked on next mount.");
-                            XmlFsType.Dirty = true;
-                        }
-
-                        if((fat32Bpb.flags & 0x02) == 0x02)
-                            sb.AppendLine("Disk surface should be on next mount.");
-                    }
-
-                    if((fat32Bpb.mirror_flags & 0x80) == 0x80)
-                        sb.AppendFormat("FATs are out of sync. FAT #{0} is in use.", fat32Bpb.mirror_flags & 0xF).
-                           AppendLine();
-                    else
-                        sb.AppendLine("All copies of FAT are the same.");
-
-                    if((fat32Bpb.mirror_flags & 0x6F20) == 0x6F20)
-                        sb.AppendLine("DR-DOS will boot this FAT32 using CHS.");
-                    else if((fat32Bpb.mirror_flags & 0x4F20) == 0x4F20)
-                        sb.AppendLine("DR-DOS will boot this FAT32 using LBA.");
-
-                    if(fat32Bpb.signature == 0x29)
-                    {
-                        XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fat32Bpb.volume_label, Encoding);
-                        XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
-
-                        sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fat32Bpb.fs_type)).
-                           AppendLine();
-
-                        bootChk = Sha1Context.Data(fat32Bpb.boot_code, out _);
-                    }
-                    else
-                        bootChk = Sha1Context.Data(shortFat32Bpb.boot_code, out _);
-
-                    // Check that jumps to a correct boot code position and has boot signature set.
-                    // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
-                    XmlFsType.Bootable =
-                        (fat32Bpb.jump[0] == 0xEB && fat32Bpb.jump[1] >= minBootNearJump && fat32Bpb.jump[1] < 0x80) ||
-                        (fat32Bpb.jump[0]                        == 0xE9            && fat32Bpb.jump.Length >= 3 &&
-                         BitConverter.ToUInt16(fat32Bpb.jump, 1) >= minBootNearJump &&
-                         BitConverter.ToUInt16(fat32Bpb.jump, 1) <= 0x1FC);
-
-                    sectorsPerRealSector = fat32Bpb.bps / imagePlugin.Info.SectorSize;
-
-                    // First root directory sector
-                    rootDirectorySector =
-                        (ulong)(((fat32Bpb.root_cluster - 2) * fat32Bpb.spc) + (fat32Bpb.big_spfat * fat32Bpb.fats_no) +
-                                fat32Bpb.rsectors) * sectorsPerRealSector;
-
-                    sectorsForRootDirectory = 1;
-
-                    if(fat32Bpb.fsinfo_sector + partition.Start <= partition.End)
-                    {
-                        errno = imagePlugin.ReadSector(fat32Bpb.fsinfo_sector + partition.Start,
-                                                       out byte[] fsinfoSector);
-
-                        if(errno != ErrorNumber.NoError)
-                            return;
-
-                        FsInfoSector fsInfo = Marshal.ByteArrayToStructureLittleEndian<FsInfoSector>(fsinfoSector);
-
-                        if(fsInfo.signature1 == FSINFO_SIGNATURE1 &&
-                           fsInfo.signature2 == FSINFO_SIGNATURE2 &&
-                           fsInfo.signature3 == FSINFO_SIGNATURE3)
-                        {
-                            if(fsInfo.free_clusters < 0xFFFFFFFF)
-                            {
-                                sb.AppendFormat("{0} free clusters", fsInfo.free_clusters).AppendLine();
-                                XmlFsType.FreeClusters          = fsInfo.free_clusters;
-                                XmlFsType.FreeClustersSpecified = true;
-                            }
-
-                            if(fsInfo.last_cluster > 2 &&
-                               fsInfo.last_cluster < 0xFFFFFFFF)
-                                sb.AppendFormat("Last allocated cluster {0}", fsInfo.last_cluster).AppendLine();
-                        }
-                    }
-
-                    break;
+                    rootMs.Write(tmp, 0, tmp.Length);
                 }
 
-                // Some fields could overflow fake BPB, those will be handled below
-                case BpbKind.Atari:
-                {
-                    ushort sum = 0;
-
-                    for(int i = 0; i < bpbSector.Length; i += 2)
-                        sum += BigEndianBitConverter.ToUInt16(bpbSector, i);
-
-                    // TODO: Check this
-                    if(sum == 0x1234)
-                    {
-                        XmlFsType.Bootable = true;
-                        var atariSb = new StringBuilder();
-
-                        atariSb.AppendFormat("cmdload will be loaded with value {0:X4}h",
-                                             BigEndianBitConverter.ToUInt16(bpbSector, 0x01E)).AppendLine();
-
-                        atariSb.AppendFormat("Boot program will be loaded at address {0:X4}h", atariBpb.ldaaddr).
-                                AppendLine();
-
-                        atariSb.AppendFormat("FAT and directory will be cached at address {0:X4}h", atariBpb.fatbuf).
-                                AppendLine();
-
-                        if(atariBpb.ldmode == 0)
-                        {
-                            byte[] tmp = new byte[8];
-                            Array.Copy(atariBpb.fname, 0, tmp, 0, 8);
-                            string fname = Encoding.ASCII.GetString(tmp).Trim();
-                            tmp = new byte[3];
-                            Array.Copy(atariBpb.fname, 8, tmp, 0, 3);
-                            string extension = Encoding.ASCII.GetString(tmp).Trim();
-                            string filename;
-
-                            if(string.IsNullOrEmpty(extension))
-                                filename = fname;
-                            else
-                                filename = fname + "." + extension;
-
-                            atariSb.AppendFormat("Boot program resides in file \"{0}\"", filename).AppendLine();
-                        }
-                        else
-                            atariSb.
-                                AppendFormat("Boot program starts in sector {0} and is {1} sectors long ({2} bytes)",
-                                             atariBpb.ssect, atariBpb.sectcnt, atariBpb.sectcnt * atariBpb.bps).
-                                AppendLine();
-
-                        extraInfo = atariSb.ToString();
-                    }
-
-                    break;
-                }
-
-                case BpbKind.Human:
-                    XmlFsType.Bootable = true;
-
-                    break;
+                rootDirectory = rootMs.ToArray();
             }
 
-            if(!isFat32)
+            for(int i = 0; i < rootDirectory.Length; i += 32)
             {
-                // This is to support FAT partitions on hybrid ISO/USB images
-                if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
-                {
-                    fakeBpb.bps      *= 4;
-                    fakeBpb.spc      /= 4;
-                    fakeBpb.spfat    /= 4;
-                    fakeBpb.hsectors /= 4;
-                    fakeBpb.sptrk    /= 4;
-                    fakeBpb.rsectors /= 4;
+                // Not a correct entry
+                if(rootDirectory[i] < DIRENT_MIN &&
+                   rootDirectory[i] != DIRENT_E5)
+                    continue;
 
-                    if(fakeBpb.spc == 0)
-                        fakeBpb.spc = 1;
+                // Deleted or subdirectory entry
+                if(rootDirectory[i] == DIRENT_SUBDIR ||
+                   rootDirectory[i] == DIRENT_DELETED)
+                    continue;
+
+                // Not a volume label
+                if(rootDirectory[i + 0x0B] != 0x08 &&
+                   rootDirectory[i + 0x0B] != 0x28)
+                    continue;
+
+                DirectoryEntry entry =
+                    Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(rootDirectory, i, 32);
+
+                byte[] fullname = new byte[11];
+                Array.Copy(entry.filename, 0, fullname, 0, 8);
+                Array.Copy(entry.extension, 0, fullname, 8, 3);
+                string volname = Encoding.GetString(fullname).Trim();
+
+                if(!string.IsNullOrEmpty(volname))
+                    XmlFsType.VolumeName =
+                        entry.caseinfo.HasFlag(CaseInfo.AllLowerCase) ? volname.ToLower() : volname;
+
+                if(entry.ctime > 0 &&
+                   entry.cdate > 0)
+                {
+                    XmlFsType.CreationDate = DateHandlers.DosToDateTime(entry.cdate, entry.ctime);
+
+                    if(entry.ctime_ms > 0)
+                        XmlFsType.CreationDate = XmlFsType.CreationDate.AddMilliseconds(entry.ctime_ms * 10);
+
+                    XmlFsType.CreationDateSpecified = true;
+                    sb.AppendFormat("Volume created on {0}", XmlFsType.CreationDate).AppendLine();
                 }
 
-                ulong clusters;
-
-                if(bpbKind != BpbKind.Human)
+                if(entry.mtime > 0 &&
+                   entry.mdate > 0)
                 {
-                    int reservedSectors = fakeBpb.rsectors + (fakeBpb.fats_no * fakeBpb.spfat) +
-                                          (fakeBpb.root_ent * 32              / fakeBpb.bps);
-
-                    if(fakeBpb.sectors == 0)
-                        clusters = (ulong)(fakeBpb.spc == 0 ? fakeBpb.big_sectors - reservedSectors
-                                               : (fakeBpb.big_sectors - reservedSectors) / fakeBpb.spc);
-                    else
-                        clusters = (ulong)(fakeBpb.spc == 0 ? fakeBpb.sectors - reservedSectors
-                                               : (fakeBpb.sectors - reservedSectors) / fakeBpb.spc);
-                }
-                else
-                    clusters = humanBpb.clusters == 0 ? humanBpb.big_clusters : humanBpb.clusters;
-
-                // This will walk all the FAT entries and check if they're valid FAT12 or FAT16 entries.
-                // If the whole table is valid in both senses, it considers the type entry in the BPB.
-                // BeOS is known to set the type as FAT16 but treat it as FAT12.
-                if(!isFat12 &&
-                   !isFat16)
-                {
-                    if(clusters < 4089)
-                    {
-                        ushort[] fat12 = new ushort[clusters];
-
-                        _reservedSectors     = fakeBpb.rsectors;
-                        sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize;
-                        _fatFirstSector      = partition.Start + (_reservedSectors * sectorsPerRealSector);
-
-                        errno = imagePlugin.ReadSectors(_fatFirstSector, fakeBpb.spfat, out byte[] fatBytes);
-
-                        if(errno != ErrorNumber.NoError)
-                            return;
-
-                        int pos = 0;
-
-                        for(int i = 0; i + 3 < fatBytes.Length && pos < fat12.Length; i += 3)
-                        {
-                            fat12[pos++] = (ushort)(((fatBytes[i + 1] & 0xF) << 8) + fatBytes[i + 0]);
-
-                            if(pos >= fat12.Length)
-                                break;
-
-                            fat12[pos++] = (ushort)(((fatBytes[i + 1] & 0xF0) >> 4) + (fatBytes[i + 2] << 4));
-                        }
-
-                        bool fat12Valid = fat12[0] >= FAT12_RESERVED && fat12[1] >= FAT12_RESERVED;
-
-                        foreach(ushort entry in fat12)
-                        {
-                            if(entry >= FAT12_RESERVED ||
-                               entry <= clusters)
-                                continue;
-
-                            fat12Valid = false;
-
-                            break;
-                        }
-
-                        ushort[] fat16 = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
-
-                        bool fat16Valid = fat16[0] >= FAT16_RESERVED && fat16[1] >= 0x3FF0;
-
-                        foreach(ushort entry in fat16)
-                        {
-                            if(entry >= FAT16_RESERVED ||
-                               entry <= clusters)
-                                continue;
-
-                            fat16Valid = false;
-
-                            break;
-                        }
-
-                        isFat12 = fat12Valid;
-                        isFat16 = fat16Valid;
-
-                        // Check BPB type
-                        if(isFat12 == isFat16)
-                        {
-                            isFat12 = fakeBpb.fs_type                           != null &&
-                                      Encoding.ASCII.GetString(fakeBpb.fs_type) == "FAT12   ";
-
-                            isFat16 = fakeBpb.fs_type                           != null &&
-                                      Encoding.ASCII.GetString(fakeBpb.fs_type) == "FAT16   ";
-                        }
-
-                        if(!isFat12 &&
-                           !isFat16)
-                            isFat12 = true;
-                    }
-                    else
-                        isFat16 = true;
+                    XmlFsType.ModificationDate          = DateHandlers.DosToDateTime(entry.mdate, entry.mtime);
+                    XmlFsType.ModificationDateSpecified = true;
+                    sb.AppendFormat("Volume last modified on {0}", XmlFsType.ModificationDate).AppendLine();
                 }
 
-                if(isFat12)
-                {
-                    switch(bpbKind)
-                    {
-                        case BpbKind.Atari:
-                            sb.AppendLine("Atari FAT12");
-
-                            break;
-                        case BpbKind.Apricot:
-                            sb.AppendLine("Apricot FAT12");
-
-                            break;
-                        case BpbKind.Human:
-                            sb.AppendLine("Human68k FAT12");
-
-                            break;
-                        default:
-                            sb.AppendLine("Microsoft FAT12");
-
-                            break;
-                    }
-
-                    XmlFsType.Type = "FAT12";
-                }
-                else if(isFat16)
-                {
-                    sb.AppendLine(bpbKind == BpbKind.Atari
-                                      ? "Atari FAT16"
-                                      : bpbKind == BpbKind.Human
-                                          ? "Human68k FAT16"
-                                          : "Microsoft FAT16");
-
-                    XmlFsType.Type = "FAT16";
-                }
-
-                if(bpbKind == BpbKind.Atari)
-                {
-                    if(atariBpb.serial_no[0] == 0x49 &&
-                       atariBpb.serial_no[1] == 0x48 &&
-                       atariBpb.serial_no[2] == 0x43)
-                        sb.AppendLine("Volume has been modified by Windows 9x/Me Volume Tracker.");
-                    else
-                        XmlFsType.VolumeSerial =
-                            $"{atariBpb.serial_no[0]:X2}{atariBpb.serial_no[1]:X2}{atariBpb.serial_no[2]:X2}";
-
-                    XmlFsType.SystemIdentifier = StringHandlers.CToString(atariBpb.oem_name);
-
-                    if(string.IsNullOrEmpty(XmlFsType.SystemIdentifier))
-                        XmlFsType.SystemIdentifier = null;
-                }
-                else if(fakeBpb.oem_name != null)
-                {
-                    if(fakeBpb.oem_name[5] == 0x49 &&
-                       fakeBpb.oem_name[6] == 0x48 &&
-                       fakeBpb.oem_name[7] == 0x43)
-                        sb.AppendLine("Volume has been modified by Windows 9x/Me Volume Tracker.");
-                    else
-                    {
-                        // Later versions of Windows create a DOS 3 BPB without OEM name on 8 sectors/track floppies
-                        // OEM ID should be ASCII, otherwise ignore it
-                        if(fakeBpb.oem_name[0] >= 0x20 &&
-                           fakeBpb.oem_name[0] <= 0x7F &&
-                           fakeBpb.oem_name[1] >= 0x20 &&
-                           fakeBpb.oem_name[1] <= 0x7F &&
-                           fakeBpb.oem_name[2] >= 0x20 &&
-                           fakeBpb.oem_name[2] <= 0x7F &&
-                           fakeBpb.oem_name[3] >= 0x20 &&
-                           fakeBpb.oem_name[3] <= 0x7F &&
-                           fakeBpb.oem_name[4] >= 0x20 &&
-                           fakeBpb.oem_name[4] <= 0x7F &&
-                           fakeBpb.oem_name[5] >= 0x20 &&
-                           fakeBpb.oem_name[5] <= 0x7F &&
-                           fakeBpb.oem_name[6] >= 0x20 &&
-                           fakeBpb.oem_name[6] <= 0x7F &&
-                           fakeBpb.oem_name[7] >= 0x20 &&
-                           fakeBpb.oem_name[7] <= 0x7F)
-                            XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name);
-                        else if(fakeBpb.oem_name[0] < 0x20  &&
-                                fakeBpb.oem_name[1] >= 0x20 &&
-                                fakeBpb.oem_name[1] <= 0x7F &&
-                                fakeBpb.oem_name[2] >= 0x20 &&
-                                fakeBpb.oem_name[2] <= 0x7F &&
-                                fakeBpb.oem_name[3] >= 0x20 &&
-                                fakeBpb.oem_name[3] <= 0x7F &&
-                                fakeBpb.oem_name[4] >= 0x20 &&
-                                fakeBpb.oem_name[4] <= 0x7F &&
-                                fakeBpb.oem_name[5] >= 0x20 &&
-                                fakeBpb.oem_name[5] <= 0x7F &&
-                                fakeBpb.oem_name[6] >= 0x20 &&
-                                fakeBpb.oem_name[6] <= 0x7F &&
-                                fakeBpb.oem_name[7] >= 0x20 &&
-                                fakeBpb.oem_name[7] <= 0x7F)
-                            XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name, Encoding, start: 1);
-                    }
-
-                    if(fakeBpb.signature == 0x28 ||
-                       fakeBpb.signature == 0x29)
-                        XmlFsType.VolumeSerial = $"{fakeBpb.serial_no:X8}";
-                }
-
-                if(XmlFsType.SystemIdentifier != null)
-                    sb.AppendFormat("OEM Name: {0}", XmlFsType.SystemIdentifier.Trim()).AppendLine();
-
-                sb.AppendFormat("{0} bytes per sector.", fakeBpb.bps).AppendLine();
-
-                if(bpbKind != BpbKind.Human)
-                    if(fakeBpb.sectors == 0)
-                        sb.AppendFormat("{0} sectors on volume ({1} bytes).", fakeBpb.big_sectors,
-                                        fakeBpb.big_sectors * fakeBpb.bps).AppendLine();
-                    else
-                        sb.AppendFormat("{0} sectors on volume ({1} bytes).", fakeBpb.sectors,
-                                        fakeBpb.sectors * fakeBpb.bps).AppendLine();
-                else
-                    sb.AppendFormat("{0} sectors on volume ({1} bytes).",
-                                    clusters * humanBpb.bpc / imagePlugin.Info.SectorSize, clusters * humanBpb.bpc).
+                if(entry.adate > 0)
+                    sb.AppendFormat("Volume last accessed on {0:d}", DateHandlers.DosToDateTime(entry.adate, 0)).
                        AppendLine();
 
-                XmlFsType.Clusters = clusters;
-                sb.AppendFormat("{0} sectors per cluster.", fakeBpb.spc).AppendLine();
-                sb.AppendFormat("{0} clusters on volume.", XmlFsType.Clusters).AppendLine();
-                XmlFsType.ClusterSize = (uint)(fakeBpb.bps * fakeBpb.spc);
-                sb.AppendFormat("{0} sectors reserved between BPB and FAT.", fakeBpb.rsectors).AppendLine();
-                sb.AppendFormat("{0} FATs.", fakeBpb.fats_no).AppendLine();
-                sb.AppendFormat("{0} entries on root directory.", fakeBpb.root_ent).AppendLine();
-
-                if(fakeBpb.media > 0)
-                    sb.AppendFormat("Media descriptor: 0x{0:X2}", fakeBpb.media).AppendLine();
-
-                sb.AppendFormat("{0} sectors per FAT.", fakeBpb.spfat).AppendLine();
-
-                if(fakeBpb.sptrk > 0  &&
-                   fakeBpb.sptrk < 64 &&
-                   fakeBpb.heads > 0  &&
-                   fakeBpb.heads < 256)
-                {
-                    sb.AppendFormat("{0} sectors per track.", fakeBpb.sptrk).AppendLine();
-                    sb.AppendFormat("{0} heads.", fakeBpb.heads).AppendLine();
-                }
-
-                if(fakeBpb.hsectors <= partition.Start)
-                    sb.AppendFormat("{0} hidden sectors before BPB.", fakeBpb.hsectors).AppendLine();
-
-                if(fakeBpb.signature == 0x28 ||
-                   fakeBpb.signature == 0x29 ||
-                   andosOemCorrect)
-                {
-                    sb.AppendFormat("Drive number: 0x{0:X2}", fakeBpb.drive_no).AppendLine();
-
-                    if(XmlFsType.VolumeSerial != null)
-                        sb.AppendFormat("Volume Serial Number: {0}", XmlFsType.VolumeSerial).AppendLine();
-
-                    if((fakeBpb.flags & 0xF8) == 0x00)
-                    {
-                        if((fakeBpb.flags & 0x01) == 0x01)
-                        {
-                            sb.AppendLine("Volume should be checked on next mount.");
-                            XmlFsType.Dirty = true;
-                        }
-
-                        if((fakeBpb.flags & 0x02) == 0x02)
-                            sb.AppendLine("Disk surface should be on next mount.");
-                    }
-
-                    if(fakeBpb.signature == 0x29 || andosOemCorrect)
-                    {
-                        XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fakeBpb.volume_label, Encoding);
-                        XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
-                        sb.AppendFormat("Filesystem type: {0}", Encoding.ASCII.GetString(fakeBpb.fs_type)).AppendLine();
-                    }
-                }
-                else if(bpbKind                == BpbKind.Atari &&
-                        XmlFsType.VolumeSerial != null)
-                    sb.AppendFormat("Volume Serial Number: {0}", XmlFsType.VolumeSerial).AppendLine();
-
-                bootChk = Sha1Context.Data(fakeBpb.boot_code, out _);
-
-                // Workaround that PCExchange jumps into "FAT16   "...
-                if(XmlFsType.SystemIdentifier == "PCX 2.0 ")
-                    fakeBpb.jump[1] += 8;
-
-                // Check that jumps to a correct boot code position and has boot signature set.
-                // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
-                if(XmlFsType.Bootable == false &&
-                   fakeBpb.jump       != null)
-                    XmlFsType.Bootable |=
-                        (fakeBpb.jump[0] == 0xEB && fakeBpb.jump[1] >= minBootNearJump && fakeBpb.jump[1] < 0x80) ||
-                        (fakeBpb.jump[0]                        == 0xE9            && fakeBpb.jump.Length >= 3 &&
-                         BitConverter.ToUInt16(fakeBpb.jump, 1) >= minBootNearJump &&
-                         BitConverter.ToUInt16(fakeBpb.jump, 1) <= 0x1FC);
-
-                sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize;
-
-                // First root directory sector
-                rootDirectorySector =
-                    (ulong)((fakeBpb.spfat * fakeBpb.fats_no) + fakeBpb.rsectors) * sectorsPerRealSector;
-
-                sectorsForRootDirectory = (uint)(fakeBpb.root_ent * 32 / imagePlugin.Info.SectorSize);
+                break;
             }
-
-            if(extraInfo != null)
-                sb.Append(extraInfo);
-
-            if(rootDirectorySector + partition.Start < partition.End &&
-               imagePlugin.Info.XmlMediaType         != XmlMediaType.OpticalDisc)
-            {
-                errno = imagePlugin.ReadSectors(rootDirectorySector + partition.Start, sectorsForRootDirectory,
-                                                out byte[] rootDirectory);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                if(bpbKind == BpbKind.DecRainbow)
-                {
-                    var rootMs = new MemoryStream();
-
-                    foreach(ulong rootSector in new[]
-                    {
-                        0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
-                    })
-                    {
-                        errno = imagePlugin.ReadSector(rootSector, out byte[] tmp);
-
-                        if(errno != ErrorNumber.NoError)
-                            return;
-
-                        rootMs.Write(tmp, 0, tmp.Length);
-                    }
-
-                    rootDirectory = rootMs.ToArray();
-                }
-
-                for(int i = 0; i < rootDirectory.Length; i += 32)
-                {
-                    // Not a correct entry
-                    if(rootDirectory[i] < DIRENT_MIN &&
-                       rootDirectory[i] != DIRENT_E5)
-                        continue;
-
-                    // Deleted or subdirectory entry
-                    if(rootDirectory[i] == DIRENT_SUBDIR ||
-                       rootDirectory[i] == DIRENT_DELETED)
-                        continue;
-
-                    // Not a volume label
-                    if(rootDirectory[i + 0x0B] != 0x08 &&
-                       rootDirectory[i + 0x0B] != 0x28)
-                        continue;
-
-                    DirectoryEntry entry =
-                        Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(rootDirectory, i, 32);
-
-                    byte[] fullname = new byte[11];
-                    Array.Copy(entry.filename, 0, fullname, 0, 8);
-                    Array.Copy(entry.extension, 0, fullname, 8, 3);
-                    string volname = Encoding.GetString(fullname).Trim();
-
-                    if(!string.IsNullOrEmpty(volname))
-                        XmlFsType.VolumeName =
-                            entry.caseinfo.HasFlag(CaseInfo.AllLowerCase) ? volname.ToLower() : volname;
-
-                    if(entry.ctime > 0 &&
-                       entry.cdate > 0)
-                    {
-                        XmlFsType.CreationDate = DateHandlers.DosToDateTime(entry.cdate, entry.ctime);
-
-                        if(entry.ctime_ms > 0)
-                            XmlFsType.CreationDate = XmlFsType.CreationDate.AddMilliseconds(entry.ctime_ms * 10);
-
-                        XmlFsType.CreationDateSpecified = true;
-                        sb.AppendFormat("Volume created on {0}", XmlFsType.CreationDate).AppendLine();
-                    }
-
-                    if(entry.mtime > 0 &&
-                       entry.mdate > 0)
-                    {
-                        XmlFsType.ModificationDate          = DateHandlers.DosToDateTime(entry.mdate, entry.mtime);
-                        XmlFsType.ModificationDateSpecified = true;
-                        sb.AppendFormat("Volume last modified on {0}", XmlFsType.ModificationDate).AppendLine();
-                    }
-
-                    if(entry.adate > 0)
-                        sb.AppendFormat("Volume last accessed on {0:d}", DateHandlers.DosToDateTime(entry.adate, 0)).
-                           AppendLine();
-
-                    break;
-                }
-            }
-
-            if(!string.IsNullOrEmpty(XmlFsType.VolumeName))
-                sb.AppendFormat("Volume label: {0}", XmlFsType.VolumeName).AppendLine();
-
-            if(XmlFsType.Bootable)
-            {
-                // Intel short jump
-                if(bpbSector[0] == 0xEB &&
-                   bpbSector[1] < 0x80)
-                {
-                    int    sigSize  = bpbSector[510] == 0x55 && bpbSector[511] == 0xAA ? 2 : 0;
-                    byte[] bootCode = new byte[512 - sigSize - bpbSector[1] - 2];
-                    Array.Copy(bpbSector, bpbSector[1] + 2, bootCode, 0, bootCode.Length);
-                    Sha1Context.Data(bootCode, out _);
-                }
-
-                // Intel big jump
-                else if(bpbSector[0]                        == 0xE9 &&
-                        BitConverter.ToUInt16(bpbSector, 1) < 0x1FC)
-                {
-                    int    sigSize  = bpbSector[510] == 0x55 && bpbSector[511] == 0xAA ? 2 : 0;
-                    byte[] bootCode = new byte[512 - sigSize - BitConverter.ToUInt16(bpbSector, 1) - 3];
-                    Array.Copy(bpbSector, BitConverter.ToUInt16(bpbSector, 1) + 3, bootCode, 0, bootCode.Length);
-                    Sha1Context.Data(bootCode, out _);
-                }
-
-                sb.AppendLine("Volume is bootable");
-                sb.AppendFormat("Boot code's SHA1: {0}", bootChk).AppendLine();
-                string bootName = _knownBootHashes.FirstOrDefault(t => t.hash == bootChk).name;
-
-                if(string.IsNullOrWhiteSpace(bootName))
-                    sb.AppendLine("Unknown boot code.");
-                else
-                    sb.AppendFormat("Boot code corresponds to {0}", bootName).AppendLine();
-            }
-
-            information = sb.ToString();
         }
+
+        if(!string.IsNullOrEmpty(XmlFsType.VolumeName))
+            sb.AppendFormat("Volume label: {0}", XmlFsType.VolumeName).AppendLine();
+
+        if(XmlFsType.Bootable)
+        {
+            // Intel short jump
+            if(bpbSector[0] == 0xEB &&
+               bpbSector[1] < 0x80)
+            {
+                int    sigSize  = bpbSector[510] == 0x55 && bpbSector[511] == 0xAA ? 2 : 0;
+                byte[] bootCode = new byte[512 - sigSize - bpbSector[1] - 2];
+                Array.Copy(bpbSector, bpbSector[1] + 2, bootCode, 0, bootCode.Length);
+                Sha1Context.Data(bootCode, out _);
+            }
+
+            // Intel big jump
+            else if(bpbSector[0]                        == 0xE9 &&
+                    BitConverter.ToUInt16(bpbSector, 1) < 0x1FC)
+            {
+                int    sigSize  = bpbSector[510] == 0x55 && bpbSector[511] == 0xAA ? 2 : 0;
+                byte[] bootCode = new byte[512 - sigSize - BitConverter.ToUInt16(bpbSector, 1) - 3];
+                Array.Copy(bpbSector, BitConverter.ToUInt16(bpbSector, 1) + 3, bootCode, 0, bootCode.Length);
+                Sha1Context.Data(bootCode, out _);
+            }
+
+            sb.AppendLine("Volume is bootable");
+            sb.AppendFormat("Boot code's SHA1: {0}", bootChk).AppendLine();
+            string bootName = _knownBootHashes.FirstOrDefault(t => t.hash == bootChk).name;
+
+            if(string.IsNullOrWhiteSpace(bootName))
+                sb.AppendLine("Unknown boot code.");
+            else
+                sb.AppendFormat("Boot code corresponds to {0}", bootName).AppendLine();
+        }
+
+        information = sb.ToString();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FAT/Structs.cs b/Aaru.Filesystems/FAT/Structs.cs
index 532c6ab26..729abdfd6 100644
--- a/Aaru.Filesystems/FAT/Structs.cs
+++ b/Aaru.Filesystems/FAT/Structs.cs
@@ -35,957 +35,956 @@ using System.Runtime.InteropServices;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class FAT
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class FAT
+    const int UMSDOS_MAXNAME = 220;
+
+    /// <summary>BIOS Parameter Block as used by Atari ST GEMDOS on FAT12 volumes.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct AtariParameterBlock
     {
-        const int UMSDOS_MAXNAME = 220;
+        /// <summary>68000 BRA.S jump or x86 loop</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] jump;
+        /// <summary>OEM Name, 6 bytes, space-padded, "Loader" for Atari ST boot loader</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] oem_name;
+        /// <summary>Volume serial number</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] serial_no;
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Reserved sectors between BPB and FAT (inclusive)</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor, unused by GEMDOS</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT</summary>
+        public readonly ushort spfat;
+        /// <summary>Sectors per track</summary>
+        public readonly ushort sptrk;
+        /// <summary>Heads</summary>
+        public readonly ushort heads;
+        /// <summary>Hidden sectors before BPB, unused by GEMDOS</summary>
+        public readonly ushort hsectors;
+        /// <summary>Word to be loaded in the cmdload system variable. Big-endian.</summary>
+        public readonly ushort execflag;
+        /// <summary>
+        ///     Word indicating load mode. If zero, file named <see cref="fname" /> is located and loaded. It not, sectors
+        ///     specified in <see cref="ssect" /> and <see cref="sectcnt" /> are loaded. Big endian.
+        /// </summary>
+        public readonly ushort ldmode;
+        /// <summary>Starting sector of boot code.</summary>
+        public readonly ushort ssect;
+        /// <summary>Count of sectors of boot code.</summary>
+        public readonly ushort sectcnt;
+        /// <summary>Address where boot code should be loaded.</summary>
+        public readonly ushort ldaaddr;
+        /// <summary>Padding.</summary>
+        public readonly ushort padding;
+        /// <summary>Address where FAT and root directory sectors must be loaded.</summary>
+        public readonly ushort fatbuf;
+        /// <summary>Unknown.</summary>
+        public readonly ushort unknown;
+        /// <summary>Filename to be loaded for booting.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] fname;
+        /// <summary>Reserved</summary>
+        public readonly ushort reserved;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 455)]
+        public readonly byte[] boot_code;
+        /// <summary>Big endian word to make big endian sum of all sector words be equal to 0x1234 if disk is bootable.</summary>
+        public readonly ushort checksum;
+    }
 
-        /// <summary>BIOS Parameter Block as used by Atari ST GEMDOS on FAT12 volumes.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct AtariParameterBlock
+    /// <summary>BIOS Parameter Block as used by MSX-DOS 2.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct MsxParameterBlock
+    {
+        /// <summary>x86 loop</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Reserved sectors between BPB and FAT (inclusive)</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT</summary>
+        public readonly ushort spfat;
+        /// <summary>Sectors per track</summary>
+        public readonly ushort sptrk;
+        /// <summary>Heads</summary>
+        public readonly ushort heads;
+        /// <summary>Hidden sectors before BPB</summary>
+        public readonly ushort hsectors;
+        /// <summary>Jump for MSX-DOS 1 boot code</summary>
+        public readonly ushort msxdos_jmp;
+        /// <summary>Set to "VOL_ID" by MSX-DOS 2</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] vol_id;
+        /// <summary>Bigger than 0 if there are deleted files (MSX-DOS 2)</summary>
+        public readonly byte undelete_flag;
+        /// <summary>Volume serial number (MSX-DOS 2)</summary>
+        public readonly uint serial_no;
+        /// <summary>Reserved (MSX-DOS 2)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] reserved;
+        /// <summary>Jump for MSX-DOS 2 boot code (MSX-DOS 2)</summary>
+        public readonly ushort msxdos2_jmp;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 460)]
+        public readonly byte[] boot_code;
+        /// <summary>Always 0x55 0xAA.</summary>
+        public readonly ushort boot_signature;
+    }
+
+    /// <summary>DOS 2.0 BIOS Parameter Block.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BiosParameterBlock2
+    {
+        /// <summary>x86 jump</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Reserved sectors between BPB and FAT</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT</summary>
+        public readonly ushort spfat;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 486)]
+        public readonly byte[] boot_code;
+        /// <summary>0x55 0xAA if bootable.</summary>
+        public readonly ushort boot_signature;
+    }
+
+    /// <summary>DOS 3.0 BIOS Parameter Block.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BiosParameterBlock30
+    {
+        /// <summary>x86 jump</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Reserved sectors between BPB and FAT</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT</summary>
+        public readonly ushort spfat;
+        /// <summary>Sectors per track</summary>
+        public readonly ushort sptrk;
+        /// <summary>Heads</summary>
+        public readonly ushort heads;
+        /// <summary>Hidden sectors before BPB</summary>
+        public readonly ushort hsectors;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 480)]
+        public readonly byte[] boot_code;
+        /// <summary>Always 0x55 0xAA.</summary>
+        public readonly ushort boot_signature;
+    }
+
+    /// <summary>DOS 3.2 BIOS Parameter Block.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BiosParameterBlock32
+    {
+        /// <summary>x86 jump</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Reserved sectors between BPB and FAT</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT</summary>
+        public readonly ushort spfat;
+        /// <summary>Sectors per track</summary>
+        public readonly ushort sptrk;
+        /// <summary>Heads</summary>
+        public readonly ushort heads;
+        /// <summary>Hidden sectors before BPB</summary>
+        public readonly ushort hsectors;
+        /// <summary>Total sectors including hidden ones</summary>
+        public readonly ushort total_sectors;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 478)]
+        public readonly byte[] boot_code;
+        /// <summary>Always 0x55 0xAA.</summary>
+        public readonly ushort boot_signature;
+    }
+
+    /// <summary>DOS 3.31 BIOS Parameter Block.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BiosParameterBlock33
+    {
+        /// <summary>x86 jump</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Reserved sectors between BPB and FAT</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT</summary>
+        public readonly ushort spfat;
+        /// <summary>Sectors per track</summary>
+        public readonly ushort sptrk;
+        /// <summary>Heads</summary>
+        public readonly ushort heads;
+        /// <summary>Hidden sectors before BPB</summary>
+        public readonly uint hsectors;
+        /// <summary>Sectors in volume if > 65535</summary>
+        public uint big_sectors;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 474)]
+        public readonly byte[] boot_code;
+        /// <summary>Always 0x55 0xAA.</summary>
+        public readonly ushort boot_signature;
+    }
+
+    /// <summary>DOS 3.4 BIOS Parameter Block.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BiosParameterBlockShortEbpb
+    {
+        /// <summary>x86 jump</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Reserved sectors between BPB and FAT</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT</summary>
+        public readonly ushort spfat;
+        /// <summary>Sectors per track</summary>
+        public readonly ushort sptrk;
+        /// <summary>Heads</summary>
+        public readonly ushort heads;
+        /// <summary>Hidden sectors before BPB</summary>
+        public readonly uint hsectors;
+        /// <summary>Sectors in volume if > 65535</summary>
+        public uint big_sectors;
+        /// <summary>Drive number</summary>
+        public readonly byte drive_no;
+        /// <summary>Volume flags</summary>
+        public readonly byte flags;
+        /// <summary>EPB signature, 0x28</summary>
+        public readonly byte signature;
+        /// <summary>Volume serial number</summary>
+        public readonly uint serial_no;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 467)]
+        public readonly byte[] boot_code;
+        /// <summary>Always 0x55 0xAA.</summary>
+        public readonly ushort boot_signature;
+    }
+
+    /// <summary>DOS 4.0 or higher BIOS Parameter Block.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BiosParameterBlockEbpb
+    {
+        /// <summary>x86 jump</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public byte[] jump;
+        /// <summary>OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public byte[] oem_name;
+        /// <summary>Bytes per sector</summary>
+        public ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public byte spc;
+        /// <summary>Reserved sectors between BPB and FAT</summary>
+        public ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public byte fats_no;
+        /// <summary>Number of entries on root directory</summary>
+        public ushort root_ent;
+        /// <summary>Sectors in volume</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public byte media;
+        /// <summary>Sectors per FAT</summary>
+        public ushort spfat;
+        /// <summary>Sectors per track</summary>
+        public ushort sptrk;
+        /// <summary>Heads</summary>
+        public ushort heads;
+        /// <summary>Hidden sectors before BPB</summary>
+        public uint hsectors;
+        /// <summary>Sectors in volume if > 65535</summary>
+        public uint big_sectors;
+        /// <summary>Drive number</summary>
+        public byte drive_no;
+        /// <summary>Volume flags</summary>
+        public byte flags;
+        /// <summary>EPB signature, 0x29</summary>
+        public byte signature;
+        /// <summary>Volume serial number</summary>
+        public uint serial_no;
+        /// <summary>Volume label, 11 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] volume_label;
+        /// <summary>Filesystem type, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] fs_type;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 448)]
+        public byte[] boot_code;
+        /// <summary>Always 0x55 0xAA.</summary>
+        public ushort boot_signature;
+    }
+
+    /// <summary>FAT32 Parameter Block</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Fat32ParameterBlockShort
+    {
+        /// <summary>x86 jump</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Reserved sectors between BPB and FAT</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory, set to 0</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume, set to 0</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT, set to 0</summary>
+        public readonly ushort spfat;
+        /// <summary>Sectors per track</summary>
+        public readonly ushort sptrk;
+        /// <summary>Heads</summary>
+        public readonly ushort heads;
+        /// <summary>Hidden sectors before BPB</summary>
+        public readonly uint hsectors;
+        /// <summary>Sectors in volume</summary>
+        public uint big_sectors;
+        /// <summary>Sectors per FAT</summary>
+        public readonly uint big_spfat;
+        /// <summary>FAT flags</summary>
+        public readonly ushort mirror_flags;
+        /// <summary>FAT32 version</summary>
+        public readonly ushort version;
+        /// <summary>Cluster of root directory</summary>
+        public readonly uint root_cluster;
+        /// <summary>Sector of FSINFO structure</summary>
+        public readonly ushort fsinfo_sector;
+        /// <summary>Sector of FAT32PB backup</summary>
+        public readonly ushort backup_sector;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] reserved;
+        /// <summary>Drive number</summary>
+        public readonly byte drive_no;
+        /// <summary>Volume flags</summary>
+        public readonly byte flags;
+        /// <summary>Signature, should be 0x28</summary>
+        public readonly byte signature;
+        /// <summary>Volume serial number</summary>
+        public readonly uint serial_no;
+        /// <summary>Volume label, 11 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] reserved2;
+        /// <summary>Sectors in volume if <see cref="big_sectors" /> equals 0</summary>
+        public ulong huge_sectors;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 420)]
+        public readonly byte[] boot_code;
+        /// <summary>Always 0x55 0xAA.</summary>
+        public readonly ushort boot_signature;
+    }
+
+    /// <summary>FAT32 Parameter Block</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Fat32ParameterBlock
+    {
+        /// <summary>x86 jump</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>Bytes per sector</summary>
+        public ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public byte spc;
+        /// <summary>Reserved sectors between BPB and FAT</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory, set to 0</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume, set to 0</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT, set to 0</summary>
+        public readonly ushort spfat;
+        /// <summary>Sectors per track</summary>
+        public ushort sptrk;
+        /// <summary>Heads</summary>
+        public readonly ushort heads;
+        /// <summary>Hidden sectors before BPB</summary>
+        public uint hsectors;
+        /// <summary>Sectors in volume</summary>
+        public uint big_sectors;
+        /// <summary>Sectors per FAT</summary>
+        public uint big_spfat;
+        /// <summary>FAT flags</summary>
+        public readonly ushort mirror_flags;
+        /// <summary>FAT32 version</summary>
+        public readonly ushort version;
+        /// <summary>Cluster of root directory</summary>
+        public readonly uint root_cluster;
+        /// <summary>Sector of FSINFO structure</summary>
+        public readonly ushort fsinfo_sector;
+        /// <summary>Sector of FAT32PB backup</summary>
+        public readonly ushort backup_sector;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] reserved;
+        /// <summary>Drive number</summary>
+        public readonly byte drive_no;
+        /// <summary>Volume flags</summary>
+        public readonly byte flags;
+        /// <summary>Signature, should be 0x29</summary>
+        public readonly byte signature;
+        /// <summary>Volume serial number</summary>
+        public readonly uint serial_no;
+        /// <summary>Volume label, 11 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] volume_label;
+        /// <summary>Filesystem type, 8 bytes, space-padded, must be "FAT32   "</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] fs_type;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 419)]
+        public readonly byte[] boot_code;
+        /// <summary>Always 0x55 0xAA.</summary>
+        public readonly ushort boot_signature;
+    }
+
+    /// <summary>Apricot Label.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ApricotLabel
+    {
+        /// <summary>Version of format which created disk</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] version;
+        /// <summary>Operating system.</summary>
+        public readonly byte operatingSystem;
+        /// <summary>Software write protection.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool writeProtected;
+        /// <summary>Copy protected.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool copyProtected;
+        /// <summary>Boot type.</summary>
+        public readonly byte bootType;
+        /// <summary>Partitions.</summary>
+        public readonly byte partitionCount;
+        /// <summary>Is hard disk?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool winchester;
+        /// <summary>Sector size.</summary>
+        public readonly ushort sectorSize;
+        /// <summary>Sectors per track.</summary>
+        public readonly ushort spt;
+        /// <summary>Tracks per side.</summary>
+        public readonly uint cylinders;
+        /// <summary>Sides.</summary>
+        public readonly byte heads;
+        /// <summary>Interleave factor.</summary>
+        public readonly byte interleave;
+        /// <summary>Skew factor.</summary>
+        public readonly ushort skew;
+        /// <summary>Sector where boot code starts.</summary>
+        public readonly uint bootLocation;
+        /// <summary>Size in sectors of boot code.</summary>
+        public readonly ushort bootSize;
+        /// <summary>Address at which to load boot code.</summary>
+        public readonly uint bootAddress;
+        /// <summary>Offset where to jump to boot.</summary>
+        public readonly ushort bootOffset;
+        /// <summary>Segment where to jump to boot.</summary>
+        public readonly ushort bootSegment;
+        /// <summary>First data sector.</summary>
+        public readonly uint firstDataBlock;
+        /// <summary>Generation.</summary>
+        public readonly ushort generation;
+        /// <summary>Copy count.</summary>
+        public readonly ushort copyCount;
+        /// <summary>Maximum number of copies.</summary>
+        public readonly ushort maxCopies;
+        /// <summary>Serial number.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] serialNumber;
+        /// <summary>Part number.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] partNumber;
+        /// <summary>Copyright.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
+        public readonly byte[] copyright;
+        /// <summary>BPB for whole disk.</summary>
+        public ApricotParameterBlock mainBPB;
+        /// <summary>Name of FONT file.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] fontName;
+        /// <summary>Name of KEYBOARD file.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] keyboardName;
+        /// <summary>Minor BIOS version.</summary>
+        public readonly byte biosMinorVersion;
+        /// <summary>Major BIOS version.</summary>
+        public readonly byte biosMajorVersion;
+        /// <summary>Diagnostics enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool diagnosticsFlag;
+        /// <summary>Printer device.</summary>
+        public readonly byte prnDevice;
+        /// <summary>Bell volume.</summary>
+        public readonly byte bellVolume;
+        /// <summary>Cache enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool enableCache;
+        /// <summary>Graphics enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool enableGraphics;
+        /// <summary>Length in sectors of DOS.</summary>
+        public readonly byte dosLength;
+        /// <summary>Length in sectors of FONT file.</summary>
+        public readonly byte fontLength;
+        /// <summary>Length in sectors of KEYBOARD file.</summary>
+        public readonly byte keyboardLength;
+        /// <summary>Starting sector of DOS.</summary>
+        public readonly ushort dosStart;
+        /// <summary>Starting sector of FONT file.</summary>
+        public readonly ushort fontStart;
+        /// <summary>Starting sector of KEYBOARD file.</summary>
+        public readonly ushort keyboardStart;
+        /// <summary>Keyboard click volume.</summary>
+        public readonly byte keyboardVolume;
+        /// <summary>Auto-repeat enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool autorepeat;
+        /// <summary>Auto-repeat lead-in.</summary>
+        public readonly byte autorepeatLeadIn;
+        /// <summary>Auto-repeat interval.</summary>
+        public readonly byte autorepeatInterval;
+        /// <summary>Microscreen mode.</summary>
+        public readonly byte microscreenMode;
+        /// <summary>Spare area for keyboard values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] spareKeyboard;
+        /// <summary>Screen line mode.</summary>
+        public readonly byte lineMode;
+        /// <summary>Screen line width.</summary>
+        public readonly byte lineWidth;
+        /// <summary>Screen disabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool imageOff;
+        /// <summary>Spare area for screen values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
+        public readonly byte[] spareScreen;
+        /// <summary>TX baud rate.</summary>
+        public readonly byte txBaudRate;
+        /// <summary>RX baud rate.</summary>
+        public readonly byte rxBaudRate;
+        /// <summary>TX bits.</summary>
+        public readonly byte txBits;
+        /// <summary>RX bits.</summary>
+        public readonly byte rxBits;
+        /// <summary>Stop bits.</summary>
+        public readonly byte stopBits;
+        /// <summary>Parity enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool parityCheck;
+        /// <summary>Parity type.</summary>
+        public readonly byte parityType;
+        /// <summary>Xon/Xoff enabled on TX.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool txXonXoff;
+        /// <summary>Xon/Xoff enabled on RX.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool rxXonXoff;
+        /// <summary>Xon character.</summary>
+        public readonly byte xonCharacter;
+        /// <summary>Xoff character.</summary>
+        public readonly byte xoffCharacter;
+        /// <summary>Xon/Xoff buffer on RX.</summary>
+        public readonly ushort rxXonXoffBuffer;
+        /// <summary>DTR/DSR enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool dtrDsr;
+        /// <summary>CTS/RTS enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool ctsRts;
+        /// <summary>NULLs after CR.</summary>
+        public readonly byte nullsAfterCr;
+        /// <summary>NULLs after 0xFF.</summary>
+        public readonly byte nullsAfterFF;
+        /// <summary>Send LF after CR in serial port.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool lfAfterCRSerial;
+        /// <summary>BIOS error report in serial port.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool biosErrorReportSerial;
+        /// <summary>Spare area for serial port values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
+        public readonly byte[] spareSerial;
+        /// <summary>Send LF after CR in parallel port.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool lfAfterCrParallel;
+        /// <summary>Select line supported?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool selectLine;
+        /// <summary>Paper empty supported?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool paperEmpty;
+        /// <summary>Fault line supported?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool faultLine;
+        /// <summary>BIOS error report in parallel port.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool biosErrorReportParallel;
+        /// <summary>Spare area for parallel port values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] spareParallel;
+        /// <summary>Spare area for Winchester values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
+        public readonly byte[] spareWinchester;
+        /// <summary>Parking enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool parkingEnabled;
+        /// <summary>Format protection?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool formatProtection;
+        /// <summary>Spare area for RAM disk values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] spareRamDisk;
+        /// <summary>List of bad blocks.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly ushort[] badBlocks;
+        /// <summary>Array of partition BPBs.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly ApricotParameterBlock[] partitions;
+        /// <summary>Spare area.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 63)]
+        public readonly byte[] spare;
+        /// <summary>CP/M double side indicator?.</summary>
+        public readonly bool cpmDoubleSided;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ApricotParameterBlock
+    {
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Reserved sectors between BPB and FAT</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT</summary>
+        public readonly ushort spfat;
+        /// <summary>Disk type</summary>
+        public readonly byte diskType;
+        /// <summary>Volume starting sector</summary>
+        public readonly ushort startSector;
+    }
+
+    /// <summary>FAT32 FS Information Sector</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct FsInfoSector
+    {
+        /// <summary>Signature must be <see cref="FAT.FSINFO_SIGNATURE1" /></summary>
+        public readonly uint signature1;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 480)]
+        public readonly byte[] reserved1;
+        /// <summary>Signature must be <see cref="FAT.FSINFO_SIGNATURE2" /></summary>
+        public readonly uint signature2;
+        /// <summary>Free clusters</summary>
+        public readonly uint free_clusters;
+        /// <summary>  cated cluster</summary>
+        public readonly uint last_cluster;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] reserved2;
+        /// <summary>Signature must be <see cref="FAT.FSINFO_SIGNATURE3" /></summary>
+        public readonly uint signature3;
+    }
+
+    /// <summary>Human68k Parameter Block, big endian, 512 bytes even on 256 bytes/sector.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HumanParameterBlock
+    {
+        /// <summary>68k bra.S</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] jump;
+        /// <summary>OEM Name, 16 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] oem_name;
+        /// <summary>Bytes per cluster</summary>
+        public readonly ushort bpc;
+        /// <summary>Unknown, seen 1, 2 and 16</summary>
+        public readonly byte unknown1;
+        /// <summary>Unknown, always 512?</summary>
+        public readonly ushort unknown2;
+        /// <summary>Unknown, always 1?</summary>
+        public readonly byte unknown3;
+        /// <summary>Number of entries on root directory</summary>
+        public readonly ushort root_ent;
+        /// <summary>Clusters, set to 0 if more than 65536</summary>
+        public readonly ushort clusters;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Clusters per FAT, set to 0</summary>
+        public readonly byte cpfat;
+        /// <summary>Clustersin volume</summary>
+        public readonly uint big_clusters;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 478)]
+        public readonly byte[] boot_code;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryEntry
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] filename;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] extension;
+        public readonly FatAttributes attributes;
+        public readonly CaseInfo      caseinfo;
+        public readonly byte          ctime_ms;
+        public readonly ushort        ctime;
+        public readonly ushort        cdate;
+        public readonly ushort        adate;
+        public readonly ushort        ea_handle;
+        public readonly ushort        mtime;
+        public readonly ushort        mdate;
+        public readonly ushort        start_cluster;
+        public readonly uint          size;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HumanDirectoryEntry
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] name1;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] extension;
+        public readonly FatAttributes attributes;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly byte[] name2;
+        public readonly ushort mtime;
+        public readonly ushort mdate;
+        public readonly ushort start_cluster;
+        public readonly uint   size;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct LfnEntry
+    {
+        public readonly byte sequence;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly byte[] name1;
+        public readonly FatAttributes attributes;
+        public readonly byte          type;
+        public readonly byte          checksum;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] name2;
+        public readonly ushort start_cluster;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] name3;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct EaHeader
+    {
+        public readonly ushort  magic;
+        public readonly ushort  cluster;
+        public readonly EaFlags flags;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] filename;
+        public readonly uint   unknown;
+        public readonly ushort zero;
+    }
+
+    /// <summary>This structure is 256 bytes large, depending on the name, only part of it is written to disk</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct UmsdosDirectoryEntry
+    {
+        /// <summary>if == 0, then this entry is not used</summary>
+        public readonly byte name_len;
+        /// <summary>UMSDOS_xxxx</summary>
+        public readonly UmsdosFlags flags;
+        /// <summary>How many hard links point to this entry</summary>
+        public readonly ushort nlink;
+        /// <summary>Owner user id</summary>
+        public readonly int uid;
+        /// <summary>Group id</summary>
+        public readonly int gid;
+        /// <summary>Access time</summary>
+        public readonly int atime;
+        /// <summary>Last modification time</summary>
+        public readonly int mtime;
+        /// <summary>Creation time</summary>
+        public readonly int ctime;
+        /// <summary>major and minor number of a device</summary>
+        public readonly uint rdev;
+        /*  */
+        /// <summary>Standard UNIX permissions bits + type of</summary>
+        public readonly ushort mode;
+        /// <summary>unused bytes for future extensions</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] spare;
+        /// <summary>
+        ///     Not '\0' terminated but '\0' padded, so it will allow for adding news fields in this record by reducing the
+        ///     size of name[]
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = UMSDOS_MAXNAME)]
+        public readonly byte[] name;
+    }
+
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum UmsdosFlags : byte
+    {
+        /// <summary>Never show this entry in directory search</summary>
+        UMSDOS_HIDDEN = 1,
+        /// <summary>It is a (pseudo) hard link</summary>
+        UMSDOS_HLINK = 2
+    }
+
+    class CompleteDirectoryEntry
+    {
+        public DirectoryEntry       Dirent;
+        public DirectoryEntry       Fat32Ea;
+        public HumanDirectoryEntry  HumanDirent;
+        public string               HumanName;
+        public string               Lfn;
+        public UmsdosDirectoryEntry LinuxDirent;
+        public string               LinuxName;
+        public string               Longname;
+        public string               Shortname;
+
+        public override string ToString()
         {
-            /// <summary>68000 BRA.S jump or x86 loop</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] jump;
-            /// <summary>OEM Name, 6 bytes, space-padded, "Loader" for Atari ST boot loader</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] oem_name;
-            /// <summary>Volume serial number</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] serial_no;
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Reserved sectors between BPB and FAT (inclusive)</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor, unused by GEMDOS</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT</summary>
-            public readonly ushort spfat;
-            /// <summary>Sectors per track</summary>
-            public readonly ushort sptrk;
-            /// <summary>Heads</summary>
-            public readonly ushort heads;
-            /// <summary>Hidden sectors before BPB, unused by GEMDOS</summary>
-            public readonly ushort hsectors;
-            /// <summary>Word to be loaded in the cmdload system variable. Big-endian.</summary>
-            public readonly ushort execflag;
-            /// <summary>
-            ///     Word indicating load mode. If zero, file named <see cref="fname" /> is located and loaded. It not, sectors
-            ///     specified in <see cref="ssect" /> and <see cref="sectcnt" /> are loaded. Big endian.
-            /// </summary>
-            public readonly ushort ldmode;
-            /// <summary>Starting sector of boot code.</summary>
-            public readonly ushort ssect;
-            /// <summary>Count of sectors of boot code.</summary>
-            public readonly ushort sectcnt;
-            /// <summary>Address where boot code should be loaded.</summary>
-            public readonly ushort ldaaddr;
-            /// <summary>Padding.</summary>
-            public readonly ushort padding;
-            /// <summary>Address where FAT and root directory sectors must be loaded.</summary>
-            public readonly ushort fatbuf;
-            /// <summary>Unknown.</summary>
-            public readonly ushort unknown;
-            /// <summary>Filename to be loaded for booting.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] fname;
-            /// <summary>Reserved</summary>
-            public readonly ushort reserved;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 455)]
-            public readonly byte[] boot_code;
-            /// <summary>Big endian word to make big endian sum of all sector words be equal to 0x1234 if disk is bootable.</summary>
-            public readonly ushort checksum;
-        }
+            // This ensures UMSDOS takes preference when present
+            if(!string.IsNullOrEmpty(LinuxName))
+                return LinuxName;
 
-        /// <summary>BIOS Parameter Block as used by MSX-DOS 2.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct MsxParameterBlock
-        {
-            /// <summary>x86 loop</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Reserved sectors between BPB and FAT (inclusive)</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT</summary>
-            public readonly ushort spfat;
-            /// <summary>Sectors per track</summary>
-            public readonly ushort sptrk;
-            /// <summary>Heads</summary>
-            public readonly ushort heads;
-            /// <summary>Hidden sectors before BPB</summary>
-            public readonly ushort hsectors;
-            /// <summary>Jump for MSX-DOS 1 boot code</summary>
-            public readonly ushort msxdos_jmp;
-            /// <summary>Set to "VOL_ID" by MSX-DOS 2</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] vol_id;
-            /// <summary>Bigger than 0 if there are deleted files (MSX-DOS 2)</summary>
-            public readonly byte undelete_flag;
-            /// <summary>Volume serial number (MSX-DOS 2)</summary>
-            public readonly uint serial_no;
-            /// <summary>Reserved (MSX-DOS 2)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] reserved;
-            /// <summary>Jump for MSX-DOS 2 boot code (MSX-DOS 2)</summary>
-            public readonly ushort msxdos2_jmp;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 460)]
-            public readonly byte[] boot_code;
-            /// <summary>Always 0x55 0xAA.</summary>
-            public readonly ushort boot_signature;
-        }
+            // This ensures LFN takes preference when eCS is in use
+            if(!string.IsNullOrEmpty(Lfn))
+                return Lfn;
 
-        /// <summary>DOS 2.0 BIOS Parameter Block.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BiosParameterBlock2
-        {
-            /// <summary>x86 jump</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Reserved sectors between BPB and FAT</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT</summary>
-            public readonly ushort spfat;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 486)]
-            public readonly byte[] boot_code;
-            /// <summary>0x55 0xAA if bootable.</summary>
-            public readonly ushort boot_signature;
-        }
+            // This ensures Humans takes preference when present
+            if(!string.IsNullOrEmpty(HumanName))
+                return HumanName;
 
-        /// <summary>DOS 3.0 BIOS Parameter Block.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BiosParameterBlock30
-        {
-            /// <summary>x86 jump</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Reserved sectors between BPB and FAT</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT</summary>
-            public readonly ushort spfat;
-            /// <summary>Sectors per track</summary>
-            public readonly ushort sptrk;
-            /// <summary>Heads</summary>
-            public readonly ushort heads;
-            /// <summary>Hidden sectors before BPB</summary>
-            public readonly ushort hsectors;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 480)]
-            public readonly byte[] boot_code;
-            /// <summary>Always 0x55 0xAA.</summary>
-            public readonly ushort boot_signature;
-        }
-
-        /// <summary>DOS 3.2 BIOS Parameter Block.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BiosParameterBlock32
-        {
-            /// <summary>x86 jump</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Reserved sectors between BPB and FAT</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT</summary>
-            public readonly ushort spfat;
-            /// <summary>Sectors per track</summary>
-            public readonly ushort sptrk;
-            /// <summary>Heads</summary>
-            public readonly ushort heads;
-            /// <summary>Hidden sectors before BPB</summary>
-            public readonly ushort hsectors;
-            /// <summary>Total sectors including hidden ones</summary>
-            public readonly ushort total_sectors;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 478)]
-            public readonly byte[] boot_code;
-            /// <summary>Always 0x55 0xAA.</summary>
-            public readonly ushort boot_signature;
-        }
-
-        /// <summary>DOS 3.31 BIOS Parameter Block.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BiosParameterBlock33
-        {
-            /// <summary>x86 jump</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Reserved sectors between BPB and FAT</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT</summary>
-            public readonly ushort spfat;
-            /// <summary>Sectors per track</summary>
-            public readonly ushort sptrk;
-            /// <summary>Heads</summary>
-            public readonly ushort heads;
-            /// <summary>Hidden sectors before BPB</summary>
-            public readonly uint hsectors;
-            /// <summary>Sectors in volume if > 65535</summary>
-            public uint big_sectors;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 474)]
-            public readonly byte[] boot_code;
-            /// <summary>Always 0x55 0xAA.</summary>
-            public readonly ushort boot_signature;
-        }
-
-        /// <summary>DOS 3.4 BIOS Parameter Block.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BiosParameterBlockShortEbpb
-        {
-            /// <summary>x86 jump</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Reserved sectors between BPB and FAT</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT</summary>
-            public readonly ushort spfat;
-            /// <summary>Sectors per track</summary>
-            public readonly ushort sptrk;
-            /// <summary>Heads</summary>
-            public readonly ushort heads;
-            /// <summary>Hidden sectors before BPB</summary>
-            public readonly uint hsectors;
-            /// <summary>Sectors in volume if > 65535</summary>
-            public uint big_sectors;
-            /// <summary>Drive number</summary>
-            public readonly byte drive_no;
-            /// <summary>Volume flags</summary>
-            public readonly byte flags;
-            /// <summary>EPB signature, 0x28</summary>
-            public readonly byte signature;
-            /// <summary>Volume serial number</summary>
-            public readonly uint serial_no;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 467)]
-            public readonly byte[] boot_code;
-            /// <summary>Always 0x55 0xAA.</summary>
-            public readonly ushort boot_signature;
-        }
-
-        /// <summary>DOS 4.0 or higher BIOS Parameter Block.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BiosParameterBlockEbpb
-        {
-            /// <summary>x86 jump</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] jump;
-            /// <summary>OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] oem_name;
-            /// <summary>Bytes per sector</summary>
-            public ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public byte spc;
-            /// <summary>Reserved sectors between BPB and FAT</summary>
-            public ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public byte fats_no;
-            /// <summary>Number of entries on root directory</summary>
-            public ushort root_ent;
-            /// <summary>Sectors in volume</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public byte media;
-            /// <summary>Sectors per FAT</summary>
-            public ushort spfat;
-            /// <summary>Sectors per track</summary>
-            public ushort sptrk;
-            /// <summary>Heads</summary>
-            public ushort heads;
-            /// <summary>Hidden sectors before BPB</summary>
-            public uint hsectors;
-            /// <summary>Sectors in volume if > 65535</summary>
-            public uint big_sectors;
-            /// <summary>Drive number</summary>
-            public byte drive_no;
-            /// <summary>Volume flags</summary>
-            public byte flags;
-            /// <summary>EPB signature, 0x29</summary>
-            public byte signature;
-            /// <summary>Volume serial number</summary>
-            public uint serial_no;
-            /// <summary>Volume label, 11 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] volume_label;
-            /// <summary>Filesystem type, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] fs_type;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 448)]
-            public byte[] boot_code;
-            /// <summary>Always 0x55 0xAA.</summary>
-            public ushort boot_signature;
-        }
-
-        /// <summary>FAT32 Parameter Block</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Fat32ParameterBlockShort
-        {
-            /// <summary>x86 jump</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Reserved sectors between BPB and FAT</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory, set to 0</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume, set to 0</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT, set to 0</summary>
-            public readonly ushort spfat;
-            /// <summary>Sectors per track</summary>
-            public readonly ushort sptrk;
-            /// <summary>Heads</summary>
-            public readonly ushort heads;
-            /// <summary>Hidden sectors before BPB</summary>
-            public readonly uint hsectors;
-            /// <summary>Sectors in volume</summary>
-            public uint big_sectors;
-            /// <summary>Sectors per FAT</summary>
-            public readonly uint big_spfat;
-            /// <summary>FAT flags</summary>
-            public readonly ushort mirror_flags;
-            /// <summary>FAT32 version</summary>
-            public readonly ushort version;
-            /// <summary>Cluster of root directory</summary>
-            public readonly uint root_cluster;
-            /// <summary>Sector of FSINFO structure</summary>
-            public readonly ushort fsinfo_sector;
-            /// <summary>Sector of FAT32PB backup</summary>
-            public readonly ushort backup_sector;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] reserved;
-            /// <summary>Drive number</summary>
-            public readonly byte drive_no;
-            /// <summary>Volume flags</summary>
-            public readonly byte flags;
-            /// <summary>Signature, should be 0x28</summary>
-            public readonly byte signature;
-            /// <summary>Volume serial number</summary>
-            public readonly uint serial_no;
-            /// <summary>Volume label, 11 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] reserved2;
-            /// <summary>Sectors in volume if <see cref="big_sectors" /> equals 0</summary>
-            public ulong huge_sectors;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 420)]
-            public readonly byte[] boot_code;
-            /// <summary>Always 0x55 0xAA.</summary>
-            public readonly ushort boot_signature;
-        }
-
-        /// <summary>FAT32 Parameter Block</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Fat32ParameterBlock
-        {
-            /// <summary>x86 jump</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>Bytes per sector</summary>
-            public ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public byte spc;
-            /// <summary>Reserved sectors between BPB and FAT</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory, set to 0</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume, set to 0</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT, set to 0</summary>
-            public readonly ushort spfat;
-            /// <summary>Sectors per track</summary>
-            public ushort sptrk;
-            /// <summary>Heads</summary>
-            public readonly ushort heads;
-            /// <summary>Hidden sectors before BPB</summary>
-            public uint hsectors;
-            /// <summary>Sectors in volume</summary>
-            public uint big_sectors;
-            /// <summary>Sectors per FAT</summary>
-            public uint big_spfat;
-            /// <summary>FAT flags</summary>
-            public readonly ushort mirror_flags;
-            /// <summary>FAT32 version</summary>
-            public readonly ushort version;
-            /// <summary>Cluster of root directory</summary>
-            public readonly uint root_cluster;
-            /// <summary>Sector of FSINFO structure</summary>
-            public readonly ushort fsinfo_sector;
-            /// <summary>Sector of FAT32PB backup</summary>
-            public readonly ushort backup_sector;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] reserved;
-            /// <summary>Drive number</summary>
-            public readonly byte drive_no;
-            /// <summary>Volume flags</summary>
-            public readonly byte flags;
-            /// <summary>Signature, should be 0x29</summary>
-            public readonly byte signature;
-            /// <summary>Volume serial number</summary>
-            public readonly uint serial_no;
-            /// <summary>Volume label, 11 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] volume_label;
-            /// <summary>Filesystem type, 8 bytes, space-padded, must be "FAT32   "</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] fs_type;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 419)]
-            public readonly byte[] boot_code;
-            /// <summary>Always 0x55 0xAA.</summary>
-            public readonly ushort boot_signature;
-        }
-
-        /// <summary>Apricot Label.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct ApricotLabel
-        {
-            /// <summary>Version of format which created disk</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] version;
-            /// <summary>Operating system.</summary>
-            public readonly byte operatingSystem;
-            /// <summary>Software write protection.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool writeProtected;
-            /// <summary>Copy protected.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool copyProtected;
-            /// <summary>Boot type.</summary>
-            public readonly byte bootType;
-            /// <summary>Partitions.</summary>
-            public readonly byte partitionCount;
-            /// <summary>Is hard disk?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool winchester;
-            /// <summary>Sector size.</summary>
-            public readonly ushort sectorSize;
-            /// <summary>Sectors per track.</summary>
-            public readonly ushort spt;
-            /// <summary>Tracks per side.</summary>
-            public readonly uint cylinders;
-            /// <summary>Sides.</summary>
-            public readonly byte heads;
-            /// <summary>Interleave factor.</summary>
-            public readonly byte interleave;
-            /// <summary>Skew factor.</summary>
-            public readonly ushort skew;
-            /// <summary>Sector where boot code starts.</summary>
-            public readonly uint bootLocation;
-            /// <summary>Size in sectors of boot code.</summary>
-            public readonly ushort bootSize;
-            /// <summary>Address at which to load boot code.</summary>
-            public readonly uint bootAddress;
-            /// <summary>Offset where to jump to boot.</summary>
-            public readonly ushort bootOffset;
-            /// <summary>Segment where to jump to boot.</summary>
-            public readonly ushort bootSegment;
-            /// <summary>First data sector.</summary>
-            public readonly uint firstDataBlock;
-            /// <summary>Generation.</summary>
-            public readonly ushort generation;
-            /// <summary>Copy count.</summary>
-            public readonly ushort copyCount;
-            /// <summary>Maximum number of copies.</summary>
-            public readonly ushort maxCopies;
-            /// <summary>Serial number.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] serialNumber;
-            /// <summary>Part number.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] partNumber;
-            /// <summary>Copyright.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public readonly byte[] copyright;
-            /// <summary>BPB for whole disk.</summary>
-            public ApricotParameterBlock mainBPB;
-            /// <summary>Name of FONT file.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] fontName;
-            /// <summary>Name of KEYBOARD file.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] keyboardName;
-            /// <summary>Minor BIOS version.</summary>
-            public readonly byte biosMinorVersion;
-            /// <summary>Major BIOS version.</summary>
-            public readonly byte biosMajorVersion;
-            /// <summary>Diagnostics enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool diagnosticsFlag;
-            /// <summary>Printer device.</summary>
-            public readonly byte prnDevice;
-            /// <summary>Bell volume.</summary>
-            public readonly byte bellVolume;
-            /// <summary>Cache enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool enableCache;
-            /// <summary>Graphics enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool enableGraphics;
-            /// <summary>Length in sectors of DOS.</summary>
-            public readonly byte dosLength;
-            /// <summary>Length in sectors of FONT file.</summary>
-            public readonly byte fontLength;
-            /// <summary>Length in sectors of KEYBOARD file.</summary>
-            public readonly byte keyboardLength;
-            /// <summary>Starting sector of DOS.</summary>
-            public readonly ushort dosStart;
-            /// <summary>Starting sector of FONT file.</summary>
-            public readonly ushort fontStart;
-            /// <summary>Starting sector of KEYBOARD file.</summary>
-            public readonly ushort keyboardStart;
-            /// <summary>Keyboard click volume.</summary>
-            public readonly byte keyboardVolume;
-            /// <summary>Auto-repeat enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool autorepeat;
-            /// <summary>Auto-repeat lead-in.</summary>
-            public readonly byte autorepeatLeadIn;
-            /// <summary>Auto-repeat interval.</summary>
-            public readonly byte autorepeatInterval;
-            /// <summary>Microscreen mode.</summary>
-            public readonly byte microscreenMode;
-            /// <summary>Spare area for keyboard values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] spareKeyboard;
-            /// <summary>Screen line mode.</summary>
-            public readonly byte lineMode;
-            /// <summary>Screen line width.</summary>
-            public readonly byte lineWidth;
-            /// <summary>Screen disabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool imageOff;
-            /// <summary>Spare area for screen values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public readonly byte[] spareScreen;
-            /// <summary>TX baud rate.</summary>
-            public readonly byte txBaudRate;
-            /// <summary>RX baud rate.</summary>
-            public readonly byte rxBaudRate;
-            /// <summary>TX bits.</summary>
-            public readonly byte txBits;
-            /// <summary>RX bits.</summary>
-            public readonly byte rxBits;
-            /// <summary>Stop bits.</summary>
-            public readonly byte stopBits;
-            /// <summary>Parity enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool parityCheck;
-            /// <summary>Parity type.</summary>
-            public readonly byte parityType;
-            /// <summary>Xon/Xoff enabled on TX.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool txXonXoff;
-            /// <summary>Xon/Xoff enabled on RX.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool rxXonXoff;
-            /// <summary>Xon character.</summary>
-            public readonly byte xonCharacter;
-            /// <summary>Xoff character.</summary>
-            public readonly byte xoffCharacter;
-            /// <summary>Xon/Xoff buffer on RX.</summary>
-            public readonly ushort rxXonXoffBuffer;
-            /// <summary>DTR/DSR enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool dtrDsr;
-            /// <summary>CTS/RTS enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool ctsRts;
-            /// <summary>NULLs after CR.</summary>
-            public readonly byte nullsAfterCr;
-            /// <summary>NULLs after 0xFF.</summary>
-            public readonly byte nullsAfterFF;
-            /// <summary>Send LF after CR in serial port.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool lfAfterCRSerial;
-            /// <summary>BIOS error report in serial port.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool biosErrorReportSerial;
-            /// <summary>Spare area for serial port values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public readonly byte[] spareSerial;
-            /// <summary>Send LF after CR in parallel port.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool lfAfterCrParallel;
-            /// <summary>Select line supported?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool selectLine;
-            /// <summary>Paper empty supported?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool paperEmpty;
-            /// <summary>Fault line supported?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool faultLine;
-            /// <summary>BIOS error report in parallel port.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool biosErrorReportParallel;
-            /// <summary>Spare area for parallel port values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] spareParallel;
-            /// <summary>Spare area for Winchester values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public readonly byte[] spareWinchester;
-            /// <summary>Parking enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool parkingEnabled;
-            /// <summary>Format protection?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool formatProtection;
-            /// <summary>Spare area for RAM disk values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] spareRamDisk;
-            /// <summary>List of bad blocks.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly ushort[] badBlocks;
-            /// <summary>Array of partition BPBs.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly ApricotParameterBlock[] partitions;
-            /// <summary>Spare area.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 63)]
-            public readonly byte[] spare;
-            /// <summary>CP/M double side indicator?.</summary>
-            public readonly bool cpmDoubleSided;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct ApricotParameterBlock
-        {
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Reserved sectors between BPB and FAT</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT</summary>
-            public readonly ushort spfat;
-            /// <summary>Disk type</summary>
-            public readonly byte diskType;
-            /// <summary>Volume starting sector</summary>
-            public readonly ushort startSector;
-        }
-
-        /// <summary>FAT32 FS Information Sector</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct FsInfoSector
-        {
-            /// <summary>Signature must be <see cref="FAT.FSINFO_SIGNATURE1" /></summary>
-            public readonly uint signature1;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 480)]
-            public readonly byte[] reserved1;
-            /// <summary>Signature must be <see cref="FAT.FSINFO_SIGNATURE2" /></summary>
-            public readonly uint signature2;
-            /// <summary>Free clusters</summary>
-            public readonly uint free_clusters;
-            /// <summary>  cated cluster</summary>
-            public readonly uint last_cluster;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] reserved2;
-            /// <summary>Signature must be <see cref="FAT.FSINFO_SIGNATURE3" /></summary>
-            public readonly uint signature3;
-        }
-
-        /// <summary>Human68k Parameter Block, big endian, 512 bytes even on 256 bytes/sector.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HumanParameterBlock
-        {
-            /// <summary>68k bra.S</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] jump;
-            /// <summary>OEM Name, 16 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] oem_name;
-            /// <summary>Bytes per cluster</summary>
-            public readonly ushort bpc;
-            /// <summary>Unknown, seen 1, 2 and 16</summary>
-            public readonly byte unknown1;
-            /// <summary>Unknown, always 512?</summary>
-            public readonly ushort unknown2;
-            /// <summary>Unknown, always 1?</summary>
-            public readonly byte unknown3;
-            /// <summary>Number of entries on root directory</summary>
-            public readonly ushort root_ent;
-            /// <summary>Clusters, set to 0 if more than 65536</summary>
-            public readonly ushort clusters;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Clusters per FAT, set to 0</summary>
-            public readonly byte cpfat;
-            /// <summary>Clustersin volume</summary>
-            public readonly uint big_clusters;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 478)]
-            public readonly byte[] boot_code;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryEntry
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] filename;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] extension;
-            public readonly FatAttributes attributes;
-            public readonly CaseInfo      caseinfo;
-            public readonly byte          ctime_ms;
-            public readonly ushort        ctime;
-            public readonly ushort        cdate;
-            public readonly ushort        adate;
-            public readonly ushort        ea_handle;
-            public readonly ushort        mtime;
-            public readonly ushort        mdate;
-            public readonly ushort        start_cluster;
-            public readonly uint          size;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HumanDirectoryEntry
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] name1;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] extension;
-            public readonly FatAttributes attributes;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly byte[] name2;
-            public readonly ushort mtime;
-            public readonly ushort mdate;
-            public readonly ushort start_cluster;
-            public readonly uint   size;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct LfnEntry
-        {
-            public readonly byte sequence;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly byte[] name1;
-            public readonly FatAttributes attributes;
-            public readonly byte          type;
-            public readonly byte          checksum;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] name2;
-            public readonly ushort start_cluster;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] name3;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct EaHeader
-        {
-            public readonly ushort  magic;
-            public readonly ushort  cluster;
-            public readonly EaFlags flags;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] filename;
-            public readonly uint   unknown;
-            public readonly ushort zero;
-        }
-
-        /// <summary>This structure is 256 bytes large, depending on the name, only part of it is written to disk</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct UmsdosDirectoryEntry
-        {
-            /// <summary>if == 0, then this entry is not used</summary>
-            public readonly byte name_len;
-            /// <summary>UMSDOS_xxxx</summary>
-            public readonly UmsdosFlags flags;
-            /// <summary>How many hard links point to this entry</summary>
-            public readonly ushort nlink;
-            /// <summary>Owner user id</summary>
-            public readonly int uid;
-            /// <summary>Group id</summary>
-            public readonly int gid;
-            /// <summary>Access time</summary>
-            public readonly int atime;
-            /// <summary>Last modification time</summary>
-            public readonly int mtime;
-            /// <summary>Creation time</summary>
-            public readonly int ctime;
-            /// <summary>major and minor number of a device</summary>
-            public readonly uint rdev;
-            /*  */
-            /// <summary>Standard UNIX permissions bits + type of</summary>
-            public readonly ushort mode;
-            /// <summary>unused bytes for future extensions</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] spare;
-            /// <summary>
-            ///     Not '\0' terminated but '\0' padded, so it will allow for adding news fields in this record by reducing the
-            ///     size of name[]
-            /// </summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = UMSDOS_MAXNAME)]
-            public readonly byte[] name;
-        }
-
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum UmsdosFlags : byte
-        {
-            /// <summary>Never show this entry in directory search</summary>
-            UMSDOS_HIDDEN = 1,
-            /// <summary>It is a (pseudo) hard link</summary>
-            UMSDOS_HLINK = 2
-        }
-
-        class CompleteDirectoryEntry
-        {
-            public DirectoryEntry       Dirent;
-            public DirectoryEntry       Fat32Ea;
-            public HumanDirectoryEntry  HumanDirent;
-            public string               HumanName;
-            public string               Lfn;
-            public UmsdosDirectoryEntry LinuxDirent;
-            public string               LinuxName;
-            public string               Longname;
-            public string               Shortname;
-
-            public override string ToString()
-            {
-                // This ensures UMSDOS takes preference when present
-                if(!string.IsNullOrEmpty(LinuxName))
-                    return LinuxName;
-
-                // This ensures LFN takes preference when eCS is in use
-                if(!string.IsNullOrEmpty(Lfn))
-                    return Lfn;
-
-                // This ensures Humans takes preference when present
-                if(!string.IsNullOrEmpty(HumanName))
-                    return HumanName;
-
-                return !string.IsNullOrEmpty(Longname) ? Longname : Shortname;
-            }
+            return !string.IsNullOrEmpty(Longname) ? Longname : Shortname;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FAT/Super.cs b/Aaru.Filesystems/FAT/Super.cs
index 1cdf784c8..61e7264d8 100644
--- a/Aaru.Filesystems/FAT/Super.cs
+++ b/Aaru.Filesystems/FAT/Super.cs
@@ -47,1071 +47,1070 @@ using Schemas;
 using FileSystemInfo = Aaru.CommonTypes.Structs.FileSystemInfo;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class FAT
 {
-    public sealed partial class FAT
+    uint        _fatEntriesPerSector;
+    IMediaImage _image;
+
+    /// <inheritdoc />
+    public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                             Dictionary<string, string> options, string @namespace)
     {
-        uint        _fatEntriesPerSector;
-        IMediaImage _image;
+        XmlFsType = new FileSystemType();
+        ErrorNumber errno;
 
-        /// <inheritdoc />
-        public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
-                                 Dictionary<string, string> options, string @namespace)
+        options ??= GetDefaultOptions();
+
+        if(options.TryGetValue("debug", out string debugString))
+            bool.TryParse(debugString, out _debug);
+
+        // Default namespace
+        @namespace ??= "ecs";
+
+        switch(@namespace.ToLowerInvariant())
         {
-            XmlFsType = new FileSystemType();
-            ErrorNumber errno;
+            case "dos":
+                _namespace = Namespace.Dos;
 
-            options ??= GetDefaultOptions();
+                break;
+            case "nt":
+                _namespace = Namespace.Nt;
 
-            if(options.TryGetValue("debug", out string debugString))
-                bool.TryParse(debugString, out _debug);
+                break;
+            case "os2":
+                _namespace = Namespace.Os2;
 
-            // Default namespace
-            @namespace ??= "ecs";
+                break;
+            case "ecs":
+                _namespace = Namespace.Ecs;
 
-            switch(@namespace.ToLowerInvariant())
+                break;
+            case "lfn":
+                _namespace = Namespace.Lfn;
+
+                break;
+            case "human":
+                _namespace = Namespace.Human;
+
+                break;
+            default: return ErrorNumber.InvalidArgument;
+        }
+
+        AaruConsole.DebugWriteLine("FAT plugin", "Reading BPB");
+
+        uint sectorsPerBpb = imagePlugin.Info.SectorSize < 512 ? 512 / imagePlugin.Info.SectorSize : 1;
+
+        errno = imagePlugin.ReadSectors(0 + partition.Start, sectorsPerBpb, out byte[] bpbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        BpbKind bpbKind = DetectBpbKind(bpbSector, imagePlugin, partition, out BiosParameterBlockEbpb fakeBpb,
+                                        out HumanParameterBlock humanBpb, out AtariParameterBlock atariBpb,
+                                        out byte minBootNearJump, out bool andosOemCorrect, out bool bootable);
+
+        _fat12             = false;
+        _fat16             = false;
+        _fat32             = false;
+        _useFirstFat       = true;
+        XmlFsType.Bootable = bootable;
+
+        _statfs = new FileSystemInfo
+        {
+            FilenameLength = 11,
+            Files          = 0, // Requires traversing all directories
+            FreeFiles      = 0,
+            PluginId       = Id,
+            FreeBlocks     = 0 // Requires traversing the FAT
+        };
+
+        // This is needed because for FAT16, GEMDOS increases bytes per sector count instead of using big_sectors field.
+        uint sectorsPerRealSector = 1;
+
+        // This is needed because some OSes don't put volume label as first entry in the root directory
+        uint sectorsForRootDirectory = 0;
+        uint rootDirectoryCluster    = 0;
+
+        Encoding = encoding ?? (bpbKind == BpbKind.Human ? Encoding.GetEncoding("shift_jis")
+                                    : Encoding.GetEncoding("IBM437"));
+
+        switch(bpbKind)
+        {
+            case BpbKind.DecRainbow:
+            case BpbKind.Hardcoded:
+            case BpbKind.Msx:
+            case BpbKind.Apricot:
+                _fat12 = true;
+
+                break;
+            case BpbKind.ShortFat32:
+            case BpbKind.LongFat32:
             {
-                case "dos":
-                    _namespace = Namespace.Dos;
+                _fat32 = true;
 
-                    break;
-                case "nt":
-                    _namespace = Namespace.Nt;
+                Fat32ParameterBlock fat32Bpb =
+                    Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlock>(bpbSector);
 
-                    break;
-                case "os2":
-                    _namespace = Namespace.Os2;
+                Fat32ParameterBlockShort shortFat32Bpb =
+                    Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlockShort>(bpbSector);
 
-                    break;
-                case "ecs":
-                    _namespace = Namespace.Ecs;
+                rootDirectoryCluster = fat32Bpb.root_cluster;
 
-                    break;
-                case "lfn":
-                    _namespace = Namespace.Lfn;
-
-                    break;
-                case "human":
-                    _namespace = Namespace.Human;
-
-                    break;
-                default: return ErrorNumber.InvalidArgument;
-            }
-
-            AaruConsole.DebugWriteLine("FAT plugin", "Reading BPB");
-
-            uint sectorsPerBpb = imagePlugin.Info.SectorSize < 512 ? 512 / imagePlugin.Info.SectorSize : 1;
-
-            errno = imagePlugin.ReadSectors(0 + partition.Start, sectorsPerBpb, out byte[] bpbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            BpbKind bpbKind = DetectBpbKind(bpbSector, imagePlugin, partition, out BiosParameterBlockEbpb fakeBpb,
-                                            out HumanParameterBlock humanBpb, out AtariParameterBlock atariBpb,
-                                            out byte minBootNearJump, out bool andosOemCorrect, out bool bootable);
-
-            _fat12             = false;
-            _fat16             = false;
-            _fat32             = false;
-            _useFirstFat       = true;
-            XmlFsType.Bootable = bootable;
-
-            _statfs = new FileSystemInfo
-            {
-                FilenameLength = 11,
-                Files          = 0, // Requires traversing all directories
-                FreeFiles      = 0,
-                PluginId       = Id,
-                FreeBlocks     = 0 // Requires traversing the FAT
-            };
-
-            // This is needed because for FAT16, GEMDOS increases bytes per sector count instead of using big_sectors field.
-            uint sectorsPerRealSector = 1;
-
-            // This is needed because some OSes don't put volume label as first entry in the root directory
-            uint sectorsForRootDirectory = 0;
-            uint rootDirectoryCluster    = 0;
-
-            Encoding = encoding ?? (bpbKind == BpbKind.Human ? Encoding.GetEncoding("shift_jis")
-                                        : Encoding.GetEncoding("IBM437"));
-
-            switch(bpbKind)
-            {
-                case BpbKind.DecRainbow:
-                case BpbKind.Hardcoded:
-                case BpbKind.Msx:
-                case BpbKind.Apricot:
-                    _fat12 = true;
-
-                    break;
-                case BpbKind.ShortFat32:
-                case BpbKind.LongFat32:
-                {
-                    _fat32 = true;
-
-                    Fat32ParameterBlock fat32Bpb =
-                        Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlock>(bpbSector);
-
-                    Fat32ParameterBlockShort shortFat32Bpb =
-                        Marshal.ByteArrayToStructureLittleEndian<Fat32ParameterBlockShort>(bpbSector);
-
-                    rootDirectoryCluster = fat32Bpb.root_cluster;
-
-                    // This is to support FAT partitions on hybrid ISO/USB images
-                    if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
-                    {
-                        fat32Bpb.bps       *= 4;
-                        fat32Bpb.spc       /= 4;
-                        fat32Bpb.big_spfat /= 4;
-                        fat32Bpb.hsectors  /= 4;
-                        fat32Bpb.sptrk     /= 4;
-                    }
-
-                    XmlFsType.Type = fat32Bpb.version != 0 ? "FAT+" : "FAT32";
-
-                    if(fat32Bpb.oem_name != null &&
-                       (fat32Bpb.oem_name[5] != 0x49 || fat32Bpb.oem_name[6] != 0x48 || fat32Bpb.oem_name[7] != 0x43))
-                        XmlFsType.SystemIdentifier = StringHandlers.CToString(fat32Bpb.oem_name);
-
-                    _sectorsPerCluster    = fat32Bpb.spc;
-                    XmlFsType.ClusterSize = (uint)(fat32Bpb.bps * fat32Bpb.spc);
-                    _reservedSectors      = fat32Bpb.rsectors;
-
-                    if(fat32Bpb.big_sectors == 0 &&
-                       fat32Bpb.signature   == 0x28)
-                        XmlFsType.Clusters = shortFat32Bpb.huge_sectors / shortFat32Bpb.spc;
-                    else if(fat32Bpb.sectors == 0)
-                        XmlFsType.Clusters = fat32Bpb.big_sectors / fat32Bpb.spc;
-                    else
-                        XmlFsType.Clusters = (ulong)(fat32Bpb.sectors / fat32Bpb.spc);
-
-                    _sectorsPerFat         = fat32Bpb.big_spfat;
-                    XmlFsType.VolumeSerial = $"{fat32Bpb.serial_no:X8}";
-
-                    _statfs.Id = new FileSystemId
-                    {
-                        IsInt    = true,
-                        Serial32 = fat32Bpb.serial_no
-                    };
-
-                    if((fat32Bpb.flags & 0xF8) == 0x00)
-                        if((fat32Bpb.flags & 0x01) == 0x01)
-                            XmlFsType.Dirty = true;
-
-                    if((fat32Bpb.mirror_flags & 0x80) == 0x80)
-                        _useFirstFat = (fat32Bpb.mirror_flags & 0xF) != 1;
-
-                    if(fat32Bpb.signature == 0x29)
-                    {
-                        XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fat32Bpb.volume_label, Encoding);
-                        XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
-                    }
-
-                    // Check that jumps to a correct boot code position and has boot signature set.
-                    // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
-                    XmlFsType.Bootable =
-                        (fat32Bpb.jump[0] == 0xEB && fat32Bpb.jump[1] >= minBootNearJump && fat32Bpb.jump[1] < 0x80) ||
-                        (fat32Bpb.jump[0]                        == 0xE9            && fat32Bpb.jump.Length >= 3 &&
-                         BitConverter.ToUInt16(fat32Bpb.jump, 1) >= minBootNearJump &&
-                         BitConverter.ToUInt16(fat32Bpb.jump, 1) <= 0x1FC);
-
-                    sectorsPerRealSector =  fat32Bpb.bps / imagePlugin.Info.SectorSize;
-                    _sectorsPerCluster   *= sectorsPerRealSector;
-
-                    // First root directory sector
-                    _firstClusterSector =
-                        ((ulong)((fat32Bpb.big_spfat * fat32Bpb.fats_no) + fat32Bpb.rsectors) * sectorsPerRealSector) -
-                        (2                                                                    * _sectorsPerCluster);
-
-                    if(fat32Bpb.fsinfo_sector + partition.Start <= partition.End)
-                    {
-                        errno = imagePlugin.ReadSector(fat32Bpb.fsinfo_sector + partition.Start,
-                                                       out byte[] fsinfoSector);
-
-                        if(errno != ErrorNumber.NoError)
-                            return errno;
-
-                        FsInfoSector fsInfo = Marshal.ByteArrayToStructureLittleEndian<FsInfoSector>(fsinfoSector);
-
-                        if(fsInfo.signature1 == FSINFO_SIGNATURE1 &&
-                           fsInfo.signature2 == FSINFO_SIGNATURE2 &&
-                           fsInfo.signature3 == FSINFO_SIGNATURE3)
-                            if(fsInfo.free_clusters < 0xFFFFFFFF)
-                            {
-                                XmlFsType.FreeClusters          = fsInfo.free_clusters;
-                                XmlFsType.FreeClustersSpecified = true;
-                            }
-                    }
-
-                    break;
-                }
-
-                // Some fields could overflow fake BPB, those will be handled below
-                case BpbKind.Atari:
-                {
-                    ushort sum = 0;
-
-                    for(int i = 0; i < bpbSector.Length; i += 2)
-                        sum += BigEndianBitConverter.ToUInt16(bpbSector, i);
-
-                    // TODO: Check this
-                    if(sum == 0x1234)
-                        XmlFsType.Bootable = true;
-
-                    // BGM changes the bytes per sector instead of changing the sectors per cluster. Why?! WHY!?
-                    uint ratio = fakeBpb.bps / imagePlugin.Info.SectorSize;
-                    fakeBpb.bps         = (ushort)imagePlugin.Info.SectorSize;
-                    fakeBpb.spc         = (byte)(fakeBpb.spc        * ratio);
-                    fakeBpb.rsectors    = (ushort)(fakeBpb.rsectors * ratio);
-                    fakeBpb.big_sectors = fakeBpb.sectors * ratio;
-                    fakeBpb.sectors     = 0;
-                    fakeBpb.spfat       = (ushort)(fakeBpb.spfat * ratio);
-                    fakeBpb.sptrk       = (ushort)(fakeBpb.sptrk * ratio);
-
-                    break;
-                }
-
-                case BpbKind.Human:
-                    // If not debug set Human68k namespace and ShiftJIS codepage as defaults
-                    if(!_debug)
-                        _namespace = Namespace.Human;
-
-                    XmlFsType.Bootable = true;
-
-                    break;
-            }
-
-            ulong firstRootSector = 0;
-
-            if(!_fat32)
-            {
                 // This is to support FAT partitions on hybrid ISO/USB images
                 if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
                 {
-                    fakeBpb.bps      *= 4;
-                    fakeBpb.spc      /= 4;
-                    fakeBpb.spfat    /= 4;
-                    fakeBpb.hsectors /= 4;
-                    fakeBpb.sptrk    /= 4;
-                    fakeBpb.rsectors /= 4;
-
-                    if(fakeBpb.spc == 0)
-                        fakeBpb.spc = 1;
+                    fat32Bpb.bps       *= 4;
+                    fat32Bpb.spc       /= 4;
+                    fat32Bpb.big_spfat /= 4;
+                    fat32Bpb.hsectors  /= 4;
+                    fat32Bpb.sptrk     /= 4;
                 }
 
-                ulong clusters;
+                XmlFsType.Type = fat32Bpb.version != 0 ? "FAT+" : "FAT32";
 
-                if(bpbKind != BpbKind.Human)
-                {
-                    int reservedSectors = fakeBpb.rsectors + (fakeBpb.fats_no * fakeBpb.spfat) +
-                                          (fakeBpb.root_ent * 32              / fakeBpb.bps);
+                if(fat32Bpb.oem_name != null &&
+                   (fat32Bpb.oem_name[5] != 0x49 || fat32Bpb.oem_name[6] != 0x48 || fat32Bpb.oem_name[7] != 0x43))
+                    XmlFsType.SystemIdentifier = StringHandlers.CToString(fat32Bpb.oem_name);
 
-                    if(fakeBpb.sectors == 0)
-                        clusters = (ulong)(fakeBpb.spc == 0 ? fakeBpb.big_sectors - reservedSectors
-                                               : (fakeBpb.big_sectors - reservedSectors) / fakeBpb.spc);
-                    else
-                        clusters = (ulong)(fakeBpb.spc == 0 ? fakeBpb.sectors - reservedSectors
-                                               : (fakeBpb.sectors - reservedSectors) / fakeBpb.spc);
-                }
+                _sectorsPerCluster    = fat32Bpb.spc;
+                XmlFsType.ClusterSize = (uint)(fat32Bpb.bps * fat32Bpb.spc);
+                _reservedSectors      = fat32Bpb.rsectors;
+
+                if(fat32Bpb.big_sectors == 0 &&
+                   fat32Bpb.signature   == 0x28)
+                    XmlFsType.Clusters = shortFat32Bpb.huge_sectors / shortFat32Bpb.spc;
+                else if(fat32Bpb.sectors == 0)
+                    XmlFsType.Clusters = fat32Bpb.big_sectors / fat32Bpb.spc;
                 else
-                    clusters = humanBpb.clusters == 0 ? humanBpb.big_clusters : humanBpb.clusters;
+                    XmlFsType.Clusters = (ulong)(fat32Bpb.sectors / fat32Bpb.spc);
 
-                // This will walk all the FAT entries and check if they're valid FAT12 or FAT16 entries.
-                // If the whole table is valid in both senses, it considers the type entry in the BPB.
-                // BeOS is known to set the type as FAT16 but treat it as FAT12.
-                if(!_fat12 &&
-                   !_fat16)
+                _sectorsPerFat         = fat32Bpb.big_spfat;
+                XmlFsType.VolumeSerial = $"{fat32Bpb.serial_no:X8}";
+
+                _statfs.Id = new FileSystemId
                 {
-                    if(clusters < 4089)
-                    {
-                        ushort[] fat12 = new ushort[clusters];
+                    IsInt    = true,
+                    Serial32 = fat32Bpb.serial_no
+                };
 
-                        _reservedSectors     = fakeBpb.rsectors;
-                        sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize;
-                        _fatFirstSector      = partition.Start + (_reservedSectors * sectorsPerRealSector);
+                if((fat32Bpb.flags & 0xF8) == 0x00)
+                    if((fat32Bpb.flags & 0x01) == 0x01)
+                        XmlFsType.Dirty = true;
 
-                        errno = imagePlugin.ReadSectors(_fatFirstSector, fakeBpb.spfat, out byte[] fatBytes);
+                if((fat32Bpb.mirror_flags & 0x80) == 0x80)
+                    _useFirstFat = (fat32Bpb.mirror_flags & 0xF) != 1;
 
-                        if(errno != ErrorNumber.NoError)
-                            return errno;
-
-                        int pos = 0;
-
-                        for(int i = 0; i + 3 < fatBytes.Length && pos < fat12.Length; i += 3)
-                        {
-                            fat12[pos++] = (ushort)(((fatBytes[i + 1] & 0xF) << 8) + fatBytes[i + 0]);
-
-                            if(pos >= fat12.Length)
-                                break;
-
-                            fat12[pos++] = (ushort)(((fatBytes[i + 1] & 0xF0) >> 4) + (fatBytes[i + 2] << 4));
-                        }
-
-                        bool fat12Valid = fat12[0] >= FAT12_RESERVED && fat12[1] >= FAT12_RESERVED;
-
-                        foreach(ushort entry in fat12)
-                        {
-                            if(entry >= FAT12_RESERVED ||
-                               entry <= clusters)
-                                continue;
-
-                            fat12Valid = false;
-
-                            break;
-                        }
-
-                        ushort[] fat16 = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
-
-                        bool fat16Valid = fat16[0] >= FAT16_RESERVED && fat16[1] >= 0x3FF0;
-
-                        foreach(ushort entry in fat16)
-                        {
-                            if(entry >= FAT16_RESERVED ||
-                               entry <= clusters)
-                                continue;
-
-                            fat16Valid = false;
-
-                            break;
-                        }
-
-                        _fat12 = fat12Valid;
-                        _fat16 = fat16Valid;
-
-                        // Check BPB type
-                        if(_fat12          == _fat16 &&
-                           fakeBpb.fs_type != null)
-                        {
-                            _fat12 = Encoding.ASCII.GetString(fakeBpb.fs_type) == "FAT12   ";
-                            _fat16 = Encoding.ASCII.GetString(fakeBpb.fs_type) == "FAT16   ";
-                        }
-
-                        // Still undecided (fs_type is null or is not FAT1[2|6])
-                        if(_fat12 == _fat16)
-                        {
-                            _fat12 = true;
-                            _fat16 = false;
-                        }
-                    }
-                    else
-                        _fat16 = true;
-                }
-
-                if(_fat12)
-                    XmlFsType.Type = "FAT12";
-                else if(_fat16)
-                    XmlFsType.Type = "FAT16";
-
-                if(bpbKind == BpbKind.Atari)
+                if(fat32Bpb.signature == 0x29)
                 {
-                    if(atariBpb.serial_no[0] != 0x49 ||
-                       atariBpb.serial_no[1] != 0x48 ||
-                       atariBpb.serial_no[2] != 0x43)
-                    {
-                        XmlFsType.VolumeSerial =
-                            $"{atariBpb.serial_no[0]:X2}{atariBpb.serial_no[1]:X2}{atariBpb.serial_no[2]:X2}";
-
-                        _statfs.Id = new FileSystemId
-                        {
-                            IsInt = true,
-                            Serial32 = (uint)((atariBpb.serial_no[0] << 16) + (atariBpb.serial_no[1] << 8) +
-                                              atariBpb.serial_no[2])
-                        };
-                    }
-
-                    XmlFsType.SystemIdentifier = StringHandlers.CToString(atariBpb.oem_name);
-
-                    if(string.IsNullOrEmpty(XmlFsType.SystemIdentifier))
-                        XmlFsType.SystemIdentifier = null;
+                    XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fat32Bpb.volume_label, Encoding);
+                    XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
                 }
-                else if(fakeBpb.oem_name != null)
-                {
-                    if(fakeBpb.oem_name[5] != 0x49 ||
-                       fakeBpb.oem_name[6] != 0x48 ||
-                       fakeBpb.oem_name[7] != 0x43)
-                    {
-                        // Later versions of Windows create a DOS 3 BPB without OEM name on 8 sectors/track floppies
-                        // OEM ID should be ASCII, otherwise ignore it
-                        if(fakeBpb.oem_name[0] >= 0x20 &&
-                           fakeBpb.oem_name[0] <= 0x7F &&
-                           fakeBpb.oem_name[1] >= 0x20 &&
-                           fakeBpb.oem_name[1] <= 0x7F &&
-                           fakeBpb.oem_name[2] >= 0x20 &&
-                           fakeBpb.oem_name[2] <= 0x7F &&
-                           fakeBpb.oem_name[3] >= 0x20 &&
-                           fakeBpb.oem_name[3] <= 0x7F &&
-                           fakeBpb.oem_name[4] >= 0x20 &&
-                           fakeBpb.oem_name[4] <= 0x7F &&
-                           fakeBpb.oem_name[5] >= 0x20 &&
-                           fakeBpb.oem_name[5] <= 0x7F &&
-                           fakeBpb.oem_name[6] >= 0x20 &&
-                           fakeBpb.oem_name[6] <= 0x7F &&
-                           fakeBpb.oem_name[7] >= 0x20 &&
-                           fakeBpb.oem_name[7] <= 0x7F)
-                            XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name);
-                        else if(fakeBpb.oem_name[0] < 0x20  &&
-                                fakeBpb.oem_name[1] >= 0x20 &&
-                                fakeBpb.oem_name[1] <= 0x7F &&
-                                fakeBpb.oem_name[2] >= 0x20 &&
-                                fakeBpb.oem_name[2] <= 0x7F &&
-                                fakeBpb.oem_name[3] >= 0x20 &&
-                                fakeBpb.oem_name[3] <= 0x7F &&
-                                fakeBpb.oem_name[4] >= 0x20 &&
-                                fakeBpb.oem_name[4] <= 0x7F &&
-                                fakeBpb.oem_name[5] >= 0x20 &&
-                                fakeBpb.oem_name[5] <= 0x7F &&
-                                fakeBpb.oem_name[6] >= 0x20 &&
-                                fakeBpb.oem_name[6] <= 0x7F &&
-                                fakeBpb.oem_name[7] >= 0x20 &&
-                                fakeBpb.oem_name[7] <= 0x7F)
-                            XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name, Encoding, start: 1);
-                    }
-
-                    if(fakeBpb.signature == 0x28 ||
-                       fakeBpb.signature == 0x29)
-                    {
-                        XmlFsType.VolumeSerial = $"{fakeBpb.serial_no:X8}";
-
-                        _statfs.Id = new FileSystemId
-                        {
-                            IsInt    = true,
-                            Serial32 = fakeBpb.serial_no
-                        };
-                    }
-                }
-
-                XmlFsType.Clusters    = clusters;
-                _sectorsPerCluster    = fakeBpb.spc;
-                XmlFsType.ClusterSize = (uint)(fakeBpb.bps * fakeBpb.spc);
-                _reservedSectors      = fakeBpb.rsectors;
-                _sectorsPerFat        = fakeBpb.spfat;
-
-                if(fakeBpb.signature == 0x28 ||
-                   fakeBpb.signature == 0x29 ||
-                   andosOemCorrect)
-                {
-                    if((fakeBpb.flags & 0xF8) == 0x00)
-                        if((fakeBpb.flags & 0x01) == 0x01)
-                            XmlFsType.Dirty = true;
-
-                    if(fakeBpb.signature == 0x29 || andosOemCorrect)
-                    {
-                        XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fakeBpb.volume_label, Encoding);
-                        XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
-                    }
-                }
-
-                // Workaround that PCExchange jumps into "FAT16   "...
-                if(XmlFsType.SystemIdentifier == "PCX 2.0 ")
-                    fakeBpb.jump[1] += 8;
 
                 // Check that jumps to a correct boot code position and has boot signature set.
                 // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
-                if(XmlFsType.Bootable == false &&
-                   fakeBpb.jump       != null)
-                    XmlFsType.Bootable |=
-                        (fakeBpb.jump[0] == 0xEB && fakeBpb.jump[1] >= minBootNearJump && fakeBpb.jump[1] < 0x80) ||
-                        (fakeBpb.jump[0]                        == 0xE9            && fakeBpb.jump.Length >= 3 &&
-                         BitConverter.ToUInt16(fakeBpb.jump, 1) >= minBootNearJump &&
-                         BitConverter.ToUInt16(fakeBpb.jump, 1) <= 0x1FC);
+                XmlFsType.Bootable =
+                    (fat32Bpb.jump[0] == 0xEB && fat32Bpb.jump[1] >= minBootNearJump && fat32Bpb.jump[1] < 0x80) ||
+                    (fat32Bpb.jump[0]                        == 0xE9            && fat32Bpb.jump.Length >= 3 &&
+                     BitConverter.ToUInt16(fat32Bpb.jump, 1) >= minBootNearJump &&
+                     BitConverter.ToUInt16(fat32Bpb.jump, 1) <= 0x1FC);
+
+                sectorsPerRealSector =  fat32Bpb.bps / imagePlugin.Info.SectorSize;
+                _sectorsPerCluster   *= sectorsPerRealSector;
 
                 // First root directory sector
-                firstRootSector =
-                    ((ulong)((fakeBpb.spfat * fakeBpb.fats_no) + fakeBpb.rsectors) * sectorsPerRealSector) +
-                    partition.Start;
+                _firstClusterSector =
+                    ((ulong)((fat32Bpb.big_spfat * fat32Bpb.fats_no) + fat32Bpb.rsectors) * sectorsPerRealSector) -
+                    (2                                                                    * _sectorsPerCluster);
 
-                sectorsForRootDirectory = (uint)(fakeBpb.root_ent * 32 / imagePlugin.Info.SectorSize);
-
-                sectorsPerRealSector =  fakeBpb.bps / imagePlugin.Info.SectorSize;
-                _sectorsPerCluster   *= sectorsPerRealSector;
-            }
-
-            _firstClusterSector += partition.Start;
-
-            _image = imagePlugin;
-
-            if(_fat32)
-                _fatEntriesPerSector = imagePlugin.Info.SectorSize / 4;
-            else if(_fat16)
-                _fatEntriesPerSector = imagePlugin.Info.SectorSize / 2;
-            else
-                _fatEntriesPerSector = imagePlugin.Info.SectorSize * 2 / 3;
-
-            _fatFirstSector = partition.Start + (_reservedSectors * sectorsPerRealSector);
-
-            _rootDirectoryCache = new Dictionary<string, CompleteDirectoryEntry>();
-            byte[] rootDirectory;
-
-            if(!_fat32)
-            {
-                _firstClusterSector = firstRootSector + sectorsForRootDirectory - (_sectorsPerCluster * 2);
-                errno = imagePlugin.ReadSectors(firstRootSector, sectorsForRootDirectory, out rootDirectory);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                if(bpbKind == BpbKind.DecRainbow)
+                if(fat32Bpb.fsinfo_sector + partition.Start <= partition.End)
                 {
-                    var rootMs = new MemoryStream();
-
-                    foreach(ulong rootSector in new[]
-                    {
-                        0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
-                    })
-                    {
-                        errno = imagePlugin.ReadSector(rootSector, out byte[] tmp);
-
-                        if(errno != ErrorNumber.NoError)
-                            return errno;
-
-                        rootMs.Write(tmp, 0, tmp.Length);
-                    }
-
-                    rootDirectory = rootMs.ToArray();
-                }
-            }
-            else
-            {
-                if(rootDirectoryCluster == 0)
-                    return ErrorNumber.InvalidArgument;
-
-                var    rootMs                = new MemoryStream();
-                uint[] rootDirectoryClusters = GetClusters(rootDirectoryCluster);
-
-                foreach(uint cluster in rootDirectoryClusters)
-                {
-                    errno = imagePlugin.ReadSectors(_firstClusterSector + (cluster * _sectorsPerCluster),
-                                                    _sectorsPerCluster, out byte[] buffer);
+                    errno = imagePlugin.ReadSector(fat32Bpb.fsinfo_sector + partition.Start,
+                                                   out byte[] fsinfoSector);
 
                     if(errno != ErrorNumber.NoError)
                         return errno;
 
-                    rootMs.Write(buffer, 0, buffer.Length);
+                    FsInfoSector fsInfo = Marshal.ByteArrayToStructureLittleEndian<FsInfoSector>(fsinfoSector);
+
+                    if(fsInfo.signature1 == FSINFO_SIGNATURE1 &&
+                       fsInfo.signature2 == FSINFO_SIGNATURE2 &&
+                       fsInfo.signature3 == FSINFO_SIGNATURE3)
+                        if(fsInfo.free_clusters < 0xFFFFFFFF)
+                        {
+                            XmlFsType.FreeClusters          = fsInfo.free_clusters;
+                            XmlFsType.FreeClustersSpecified = true;
+                        }
+                }
+
+                break;
+            }
+
+            // Some fields could overflow fake BPB, those will be handled below
+            case BpbKind.Atari:
+            {
+                ushort sum = 0;
+
+                for(int i = 0; i < bpbSector.Length; i += 2)
+                    sum += BigEndianBitConverter.ToUInt16(bpbSector, i);
+
+                // TODO: Check this
+                if(sum == 0x1234)
+                    XmlFsType.Bootable = true;
+
+                // BGM changes the bytes per sector instead of changing the sectors per cluster. Why?! WHY!?
+                uint ratio = fakeBpb.bps / imagePlugin.Info.SectorSize;
+                fakeBpb.bps         = (ushort)imagePlugin.Info.SectorSize;
+                fakeBpb.spc         = (byte)(fakeBpb.spc        * ratio);
+                fakeBpb.rsectors    = (ushort)(fakeBpb.rsectors * ratio);
+                fakeBpb.big_sectors = fakeBpb.sectors * ratio;
+                fakeBpb.sectors     = 0;
+                fakeBpb.spfat       = (ushort)(fakeBpb.spfat * ratio);
+                fakeBpb.sptrk       = (ushort)(fakeBpb.sptrk * ratio);
+
+                break;
+            }
+
+            case BpbKind.Human:
+                // If not debug set Human68k namespace and ShiftJIS codepage as defaults
+                if(!_debug)
+                    _namespace = Namespace.Human;
+
+                XmlFsType.Bootable = true;
+
+                break;
+        }
+
+        ulong firstRootSector = 0;
+
+        if(!_fat32)
+        {
+            // This is to support FAT partitions on hybrid ISO/USB images
+            if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+            {
+                fakeBpb.bps      *= 4;
+                fakeBpb.spc      /= 4;
+                fakeBpb.spfat    /= 4;
+                fakeBpb.hsectors /= 4;
+                fakeBpb.sptrk    /= 4;
+                fakeBpb.rsectors /= 4;
+
+                if(fakeBpb.spc == 0)
+                    fakeBpb.spc = 1;
+            }
+
+            ulong clusters;
+
+            if(bpbKind != BpbKind.Human)
+            {
+                int reservedSectors = fakeBpb.rsectors + (fakeBpb.fats_no * fakeBpb.spfat) +
+                                      (fakeBpb.root_ent * 32              / fakeBpb.bps);
+
+                if(fakeBpb.sectors == 0)
+                    clusters = (ulong)(fakeBpb.spc == 0 ? fakeBpb.big_sectors - reservedSectors
+                                           : (fakeBpb.big_sectors - reservedSectors) / fakeBpb.spc);
+                else
+                    clusters = (ulong)(fakeBpb.spc == 0 ? fakeBpb.sectors - reservedSectors
+                                           : (fakeBpb.sectors - reservedSectors) / fakeBpb.spc);
+            }
+            else
+                clusters = humanBpb.clusters == 0 ? humanBpb.big_clusters : humanBpb.clusters;
+
+            // This will walk all the FAT entries and check if they're valid FAT12 or FAT16 entries.
+            // If the whole table is valid in both senses, it considers the type entry in the BPB.
+            // BeOS is known to set the type as FAT16 but treat it as FAT12.
+            if(!_fat12 &&
+               !_fat16)
+            {
+                if(clusters < 4089)
+                {
+                    ushort[] fat12 = new ushort[clusters];
+
+                    _reservedSectors     = fakeBpb.rsectors;
+                    sectorsPerRealSector = fakeBpb.bps / imagePlugin.Info.SectorSize;
+                    _fatFirstSector      = partition.Start + (_reservedSectors * sectorsPerRealSector);
+
+                    errno = imagePlugin.ReadSectors(_fatFirstSector, fakeBpb.spfat, out byte[] fatBytes);
+
+                    if(errno != ErrorNumber.NoError)
+                        return errno;
+
+                    int pos = 0;
+
+                    for(int i = 0; i + 3 < fatBytes.Length && pos < fat12.Length; i += 3)
+                    {
+                        fat12[pos++] = (ushort)(((fatBytes[i + 1] & 0xF) << 8) + fatBytes[i + 0]);
+
+                        if(pos >= fat12.Length)
+                            break;
+
+                        fat12[pos++] = (ushort)(((fatBytes[i + 1] & 0xF0) >> 4) + (fatBytes[i + 2] << 4));
+                    }
+
+                    bool fat12Valid = fat12[0] >= FAT12_RESERVED && fat12[1] >= FAT12_RESERVED;
+
+                    foreach(ushort entry in fat12)
+                    {
+                        if(entry >= FAT12_RESERVED ||
+                           entry <= clusters)
+                            continue;
+
+                        fat12Valid = false;
+
+                        break;
+                    }
+
+                    ushort[] fat16 = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
+
+                    bool fat16Valid = fat16[0] >= FAT16_RESERVED && fat16[1] >= 0x3FF0;
+
+                    foreach(ushort entry in fat16)
+                    {
+                        if(entry >= FAT16_RESERVED ||
+                           entry <= clusters)
+                            continue;
+
+                        fat16Valid = false;
+
+                        break;
+                    }
+
+                    _fat12 = fat12Valid;
+                    _fat16 = fat16Valid;
+
+                    // Check BPB type
+                    if(_fat12          == _fat16 &&
+                       fakeBpb.fs_type != null)
+                    {
+                        _fat12 = Encoding.ASCII.GetString(fakeBpb.fs_type) == "FAT12   ";
+                        _fat16 = Encoding.ASCII.GetString(fakeBpb.fs_type) == "FAT16   ";
+                    }
+
+                    // Still undecided (fs_type is null or is not FAT1[2|6])
+                    if(_fat12 == _fat16)
+                    {
+                        _fat12 = true;
+                        _fat16 = false;
+                    }
+                }
+                else
+                    _fat16 = true;
+            }
+
+            if(_fat12)
+                XmlFsType.Type = "FAT12";
+            else if(_fat16)
+                XmlFsType.Type = "FAT16";
+
+            if(bpbKind == BpbKind.Atari)
+            {
+                if(atariBpb.serial_no[0] != 0x49 ||
+                   atariBpb.serial_no[1] != 0x48 ||
+                   atariBpb.serial_no[2] != 0x43)
+                {
+                    XmlFsType.VolumeSerial =
+                        $"{atariBpb.serial_no[0]:X2}{atariBpb.serial_no[1]:X2}{atariBpb.serial_no[2]:X2}";
+
+                    _statfs.Id = new FileSystemId
+                    {
+                        IsInt = true,
+                        Serial32 = (uint)((atariBpb.serial_no[0] << 16) + (atariBpb.serial_no[1] << 8) +
+                                          atariBpb.serial_no[2])
+                    };
+                }
+
+                XmlFsType.SystemIdentifier = StringHandlers.CToString(atariBpb.oem_name);
+
+                if(string.IsNullOrEmpty(XmlFsType.SystemIdentifier))
+                    XmlFsType.SystemIdentifier = null;
+            }
+            else if(fakeBpb.oem_name != null)
+            {
+                if(fakeBpb.oem_name[5] != 0x49 ||
+                   fakeBpb.oem_name[6] != 0x48 ||
+                   fakeBpb.oem_name[7] != 0x43)
+                {
+                    // Later versions of Windows create a DOS 3 BPB without OEM name on 8 sectors/track floppies
+                    // OEM ID should be ASCII, otherwise ignore it
+                    if(fakeBpb.oem_name[0] >= 0x20 &&
+                       fakeBpb.oem_name[0] <= 0x7F &&
+                       fakeBpb.oem_name[1] >= 0x20 &&
+                       fakeBpb.oem_name[1] <= 0x7F &&
+                       fakeBpb.oem_name[2] >= 0x20 &&
+                       fakeBpb.oem_name[2] <= 0x7F &&
+                       fakeBpb.oem_name[3] >= 0x20 &&
+                       fakeBpb.oem_name[3] <= 0x7F &&
+                       fakeBpb.oem_name[4] >= 0x20 &&
+                       fakeBpb.oem_name[4] <= 0x7F &&
+                       fakeBpb.oem_name[5] >= 0x20 &&
+                       fakeBpb.oem_name[5] <= 0x7F &&
+                       fakeBpb.oem_name[6] >= 0x20 &&
+                       fakeBpb.oem_name[6] <= 0x7F &&
+                       fakeBpb.oem_name[7] >= 0x20 &&
+                       fakeBpb.oem_name[7] <= 0x7F)
+                        XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name);
+                    else if(fakeBpb.oem_name[0] < 0x20  &&
+                            fakeBpb.oem_name[1] >= 0x20 &&
+                            fakeBpb.oem_name[1] <= 0x7F &&
+                            fakeBpb.oem_name[2] >= 0x20 &&
+                            fakeBpb.oem_name[2] <= 0x7F &&
+                            fakeBpb.oem_name[3] >= 0x20 &&
+                            fakeBpb.oem_name[3] <= 0x7F &&
+                            fakeBpb.oem_name[4] >= 0x20 &&
+                            fakeBpb.oem_name[4] <= 0x7F &&
+                            fakeBpb.oem_name[5] >= 0x20 &&
+                            fakeBpb.oem_name[5] <= 0x7F &&
+                            fakeBpb.oem_name[6] >= 0x20 &&
+                            fakeBpb.oem_name[6] <= 0x7F &&
+                            fakeBpb.oem_name[7] >= 0x20 &&
+                            fakeBpb.oem_name[7] <= 0x7F)
+                        XmlFsType.SystemIdentifier = StringHandlers.CToString(fakeBpb.oem_name, Encoding, start: 1);
+                }
+
+                if(fakeBpb.signature == 0x28 ||
+                   fakeBpb.signature == 0x29)
+                {
+                    XmlFsType.VolumeSerial = $"{fakeBpb.serial_no:X8}";
+
+                    _statfs.Id = new FileSystemId
+                    {
+                        IsInt    = true,
+                        Serial32 = fakeBpb.serial_no
+                    };
+                }
+            }
+
+            XmlFsType.Clusters    = clusters;
+            _sectorsPerCluster    = fakeBpb.spc;
+            XmlFsType.ClusterSize = (uint)(fakeBpb.bps * fakeBpb.spc);
+            _reservedSectors      = fakeBpb.rsectors;
+            _sectorsPerFat        = fakeBpb.spfat;
+
+            if(fakeBpb.signature == 0x28 ||
+               fakeBpb.signature == 0x29 ||
+               andosOemCorrect)
+            {
+                if((fakeBpb.flags & 0xF8) == 0x00)
+                    if((fakeBpb.flags & 0x01) == 0x01)
+                        XmlFsType.Dirty = true;
+
+                if(fakeBpb.signature == 0x29 || andosOemCorrect)
+                {
+                    XmlFsType.VolumeName = StringHandlers.SpacePaddedToString(fakeBpb.volume_label, Encoding);
+                    XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
+                }
+            }
+
+            // Workaround that PCExchange jumps into "FAT16   "...
+            if(XmlFsType.SystemIdentifier == "PCX 2.0 ")
+                fakeBpb.jump[1] += 8;
+
+            // Check that jumps to a correct boot code position and has boot signature set.
+            // This will mean that the volume will boot, even if just to say "this is not bootable change disk"......
+            if(XmlFsType.Bootable == false &&
+               fakeBpb.jump       != null)
+                XmlFsType.Bootable |=
+                    (fakeBpb.jump[0] == 0xEB && fakeBpb.jump[1] >= minBootNearJump && fakeBpb.jump[1] < 0x80) ||
+                    (fakeBpb.jump[0]                        == 0xE9            && fakeBpb.jump.Length >= 3 &&
+                     BitConverter.ToUInt16(fakeBpb.jump, 1) >= minBootNearJump &&
+                     BitConverter.ToUInt16(fakeBpb.jump, 1) <= 0x1FC);
+
+            // First root directory sector
+            firstRootSector =
+                ((ulong)((fakeBpb.spfat * fakeBpb.fats_no) + fakeBpb.rsectors) * sectorsPerRealSector) +
+                partition.Start;
+
+            sectorsForRootDirectory = (uint)(fakeBpb.root_ent * 32 / imagePlugin.Info.SectorSize);
+
+            sectorsPerRealSector =  fakeBpb.bps / imagePlugin.Info.SectorSize;
+            _sectorsPerCluster   *= sectorsPerRealSector;
+        }
+
+        _firstClusterSector += partition.Start;
+
+        _image = imagePlugin;
+
+        if(_fat32)
+            _fatEntriesPerSector = imagePlugin.Info.SectorSize / 4;
+        else if(_fat16)
+            _fatEntriesPerSector = imagePlugin.Info.SectorSize / 2;
+        else
+            _fatEntriesPerSector = imagePlugin.Info.SectorSize * 2 / 3;
+
+        _fatFirstSector = partition.Start + (_reservedSectors * sectorsPerRealSector);
+
+        _rootDirectoryCache = new Dictionary<string, CompleteDirectoryEntry>();
+        byte[] rootDirectory;
+
+        if(!_fat32)
+        {
+            _firstClusterSector = firstRootSector + sectorsForRootDirectory - (_sectorsPerCluster * 2);
+            errno               = imagePlugin.ReadSectors(firstRootSector, sectorsForRootDirectory, out rootDirectory);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            if(bpbKind == BpbKind.DecRainbow)
+            {
+                var rootMs = new MemoryStream();
+
+                foreach(ulong rootSector in new[]
+                        {
+                            0x17, 0x19, 0x1B, 0x1D, 0x1E, 0x20
+                        })
+                {
+                    errno = imagePlugin.ReadSector(rootSector, out byte[] tmp);
+
+                    if(errno != ErrorNumber.NoError)
+                        return errno;
+
+                    rootMs.Write(tmp, 0, tmp.Length);
                 }
 
                 rootDirectory = rootMs.ToArray();
-
-                // OS/2 FAT32.IFS uses LFN instead of .LONGNAME
-                if(_namespace == Namespace.Os2)
-                    _namespace = Namespace.Lfn;
             }
-
-            if(rootDirectory is null)
+        }
+        else
+        {
+            if(rootDirectoryCluster == 0)
                 return ErrorNumber.InvalidArgument;
 
-            byte[] lastLfnName     = null;
-            byte   lastLfnChecksum = 0;
+            var    rootMs                = new MemoryStream();
+            uint[] rootDirectoryClusters = GetClusters(rootDirectoryCluster);
 
-            for(int i = 0; i < rootDirectory.Length; i += Marshal.SizeOf<DirectoryEntry>())
+            foreach(uint cluster in rootDirectoryClusters)
             {
-                DirectoryEntry entry =
-                    Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(rootDirectory, i,
-                                                                             Marshal.SizeOf<DirectoryEntry>());
+                errno = imagePlugin.ReadSectors(_firstClusterSector + (cluster * _sectorsPerCluster),
+                                                _sectorsPerCluster, out byte[] buffer);
 
-                if(entry.filename[0] == DIRENT_FINISHED)
-                    break;
+                if(errno != ErrorNumber.NoError)
+                    return errno;
 
-                if(entry.attributes.HasFlag(FatAttributes.LFN))
-                {
-                    if(_namespace != Namespace.Lfn &&
-                       _namespace != Namespace.Ecs)
-                        continue;
+                rootMs.Write(buffer, 0, buffer.Length);
+            }
 
-                    LfnEntry lfnEntry =
-                        Marshal.ByteArrayToStructureLittleEndian<LfnEntry>(rootDirectory, i,
-                                                                           Marshal.SizeOf<LfnEntry>());
+            rootDirectory = rootMs.ToArray();
 
-                    int lfnSequence = lfnEntry.sequence & LFN_MASK;
+            // OS/2 FAT32.IFS uses LFN instead of .LONGNAME
+            if(_namespace == Namespace.Os2)
+                _namespace = Namespace.Lfn;
+        }
 
-                    if((lfnEntry.sequence & LFN_ERASED) > 0)
-                        continue;
+        if(rootDirectory is null)
+            return ErrorNumber.InvalidArgument;
 
-                    if((lfnEntry.sequence & LFN_LAST) > 0)
-                    {
-                        lastLfnName     = new byte[lfnSequence * 26];
-                        lastLfnChecksum = lfnEntry.checksum;
-                    }
+        byte[] lastLfnName     = null;
+        byte   lastLfnChecksum = 0;
 
-                    if(lastLfnName is null)
-                        continue;
+        for(int i = 0; i < rootDirectory.Length; i += Marshal.SizeOf<DirectoryEntry>())
+        {
+            DirectoryEntry entry =
+                Marshal.ByteArrayToStructureLittleEndian<DirectoryEntry>(rootDirectory, i,
+                                                                         Marshal.SizeOf<DirectoryEntry>());
 
-                    if(lfnEntry.checksum != lastLfnChecksum)
-                        continue;
-
-                    lfnSequence--;
-
-                    Array.Copy(lfnEntry.name1, 0, lastLfnName, lfnSequence * 26, 10);
-                    Array.Copy(lfnEntry.name2, 0, lastLfnName, (lfnSequence * 26) + 10, 12);
-                    Array.Copy(lfnEntry.name3, 0, lastLfnName, (lfnSequence * 26) + 22, 4);
+            if(entry.filename[0] == DIRENT_FINISHED)
+                break;
 
+            if(entry.attributes.HasFlag(FatAttributes.LFN))
+            {
+                if(_namespace != Namespace.Lfn &&
+                   _namespace != Namespace.Ecs)
                     continue;
+
+                LfnEntry lfnEntry =
+                    Marshal.ByteArrayToStructureLittleEndian<LfnEntry>(rootDirectory, i,
+                                                                       Marshal.SizeOf<LfnEntry>());
+
+                int lfnSequence = lfnEntry.sequence & LFN_MASK;
+
+                if((lfnEntry.sequence & LFN_ERASED) > 0)
+                    continue;
+
+                if((lfnEntry.sequence & LFN_LAST) > 0)
+                {
+                    lastLfnName     = new byte[lfnSequence * 26];
+                    lastLfnChecksum = lfnEntry.checksum;
                 }
 
-                // Not a correct entry
-                if(entry.filename[0] < DIRENT_MIN &&
-                   entry.filename[0] != DIRENT_E5)
+                if(lastLfnName is null)
                     continue;
 
-                // Self
-                if(Encoding.GetString(entry.filename).TrimEnd() == ".")
+                if(lfnEntry.checksum != lastLfnChecksum)
                     continue;
 
-                // Parent
-                if(Encoding.GetString(entry.filename).TrimEnd() == "..")
-                    continue;
+                lfnSequence--;
 
-                // Deleted
-                if(entry.filename[0] == DIRENT_DELETED)
-                    continue;
+                Array.Copy(lfnEntry.name1, 0, lastLfnName, lfnSequence * 26, 10);
+                Array.Copy(lfnEntry.name2, 0, lastLfnName, (lfnSequence * 26) + 10, 12);
+                Array.Copy(lfnEntry.name3, 0, lastLfnName, (lfnSequence * 26) + 22, 4);
 
-                string filename;
+                continue;
+            }
 
-                if(entry.attributes.HasFlag(FatAttributes.VolumeLabel))
+            // Not a correct entry
+            if(entry.filename[0] < DIRENT_MIN &&
+               entry.filename[0] != DIRENT_E5)
+                continue;
+
+            // Self
+            if(Encoding.GetString(entry.filename).TrimEnd() == ".")
+                continue;
+
+            // Parent
+            if(Encoding.GetString(entry.filename).TrimEnd() == "..")
+                continue;
+
+            // Deleted
+            if(entry.filename[0] == DIRENT_DELETED)
+                continue;
+
+            string filename;
+
+            if(entry.attributes.HasFlag(FatAttributes.VolumeLabel))
+            {
+                byte[] fullname = new byte[11];
+                Array.Copy(entry.filename, 0, fullname, 0, 8);
+                Array.Copy(entry.extension, 0, fullname, 8, 3);
+                string volname = Encoding.GetString(fullname).Trim();
+
+                if(!string.IsNullOrEmpty(volname))
+                    XmlFsType.VolumeName =
+                        entry.caseinfo.HasFlag(CaseInfo.AllLowerCase) && _namespace == Namespace.Nt
+                            ? volname.ToLower() : volname;
+
+                XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
+
+                if(entry.ctime > 0 &&
+                   entry.cdate > 0)
                 {
-                    byte[] fullname = new byte[11];
-                    Array.Copy(entry.filename, 0, fullname, 0, 8);
-                    Array.Copy(entry.extension, 0, fullname, 8, 3);
-                    string volname = Encoding.GetString(fullname).Trim();
+                    XmlFsType.CreationDate = DateHandlers.DosToDateTime(entry.cdate, entry.ctime);
 
-                    if(!string.IsNullOrEmpty(volname))
-                        XmlFsType.VolumeName =
-                            entry.caseinfo.HasFlag(CaseInfo.AllLowerCase) && _namespace == Namespace.Nt
-                                ? volname.ToLower() : volname;
+                    if(entry.ctime_ms > 0)
+                        XmlFsType.CreationDate = XmlFsType.CreationDate.AddMilliseconds(entry.ctime_ms * 10);
 
-                    XmlFsType.VolumeName = XmlFsType.VolumeName?.Replace("\0", "");
-
-                    if(entry.ctime > 0 &&
-                       entry.cdate > 0)
-                    {
-                        XmlFsType.CreationDate = DateHandlers.DosToDateTime(entry.cdate, entry.ctime);
-
-                        if(entry.ctime_ms > 0)
-                            XmlFsType.CreationDate = XmlFsType.CreationDate.AddMilliseconds(entry.ctime_ms * 10);
-
-                        XmlFsType.CreationDateSpecified = true;
-                    }
-
-                    if(entry.mtime > 0 &&
-                       entry.mdate > 0)
-                    {
-                        XmlFsType.ModificationDate          = DateHandlers.DosToDateTime(entry.mdate, entry.mtime);
-                        XmlFsType.ModificationDateSpecified = true;
-                    }
-
-                    continue;
+                    XmlFsType.CreationDateSpecified = true;
                 }
 
-                var completeEntry = new CompleteDirectoryEntry
+                if(entry.mtime > 0 &&
+                   entry.mdate > 0)
                 {
-                    Dirent = entry
-                };
-
-                if((_namespace == Namespace.Lfn || _namespace == Namespace.Ecs) &&
-                   lastLfnName != null)
-                {
-                    byte calculatedLfnChecksum = LfnChecksum(entry.filename, entry.extension);
-
-                    if(calculatedLfnChecksum == lastLfnChecksum)
-                    {
-                        filename = StringHandlers.CToString(lastLfnName, Encoding.Unicode, true);
-
-                        completeEntry.Lfn = filename;
-                        lastLfnName       = null;
-                        lastLfnChecksum   = 0;
-                    }
+                    XmlFsType.ModificationDate          = DateHandlers.DosToDateTime(entry.mdate, entry.mtime);
+                    XmlFsType.ModificationDateSpecified = true;
                 }
 
-                if(entry.filename[0] == DIRENT_E5)
-                    entry.filename[0] = DIRENT_DELETED;
+                continue;
+            }
 
-                string name      = Encoding.GetString(entry.filename).TrimEnd();
-                string extension = Encoding.GetString(entry.extension).TrimEnd();
+            var completeEntry = new CompleteDirectoryEntry
+            {
+                Dirent = entry
+            };
 
-                if(_namespace == Namespace.Nt)
+            if((_namespace == Namespace.Lfn || _namespace == Namespace.Ecs) &&
+               lastLfnName != null)
+            {
+                byte calculatedLfnChecksum = LfnChecksum(entry.filename, entry.extension);
+
+                if(calculatedLfnChecksum == lastLfnChecksum)
                 {
-                    if(entry.caseinfo.HasFlag(CaseInfo.LowerCaseExtension))
-                        extension = extension.ToLower(CultureInfo.CurrentCulture);
+                    filename = StringHandlers.CToString(lastLfnName, Encoding.Unicode, true);
 
-                    if(entry.caseinfo.HasFlag(CaseInfo.LowerCaseBasename))
-                        name = name.ToLower(CultureInfo.CurrentCulture);
+                    completeEntry.Lfn = filename;
+                    lastLfnName       = null;
+                    lastLfnChecksum   = 0;
                 }
+            }
+
+            if(entry.filename[0] == DIRENT_E5)
+                entry.filename[0] = DIRENT_DELETED;
+
+            string name      = Encoding.GetString(entry.filename).TrimEnd();
+            string extension = Encoding.GetString(entry.extension).TrimEnd();
+
+            if(_namespace == Namespace.Nt)
+            {
+                if(entry.caseinfo.HasFlag(CaseInfo.LowerCaseExtension))
+                    extension = extension.ToLower(CultureInfo.CurrentCulture);
+
+                if(entry.caseinfo.HasFlag(CaseInfo.LowerCaseBasename))
+                    name = name.ToLower(CultureInfo.CurrentCulture);
+            }
+
+            if(extension != "")
+                filename = name + "." + extension;
+            else
+                filename = name;
+
+            if(name      == "" &&
+               extension == "")
+            {
+                AaruConsole.DebugWriteLine("FAT filesystem", "Found empty filename in root directory");
+
+                if(!_debug ||
+                   (entry.size > 0 && entry.start_cluster == 0))
+                    continue; // Skip invalid name
+
+                // If debug, add it
+                name = ":{EMPTYNAME}:";
+
+                // Try to create a unique filename with an extension from 000 to 999
+                for(int uniq = 0; uniq < 1000; uniq++)
+                {
+                    extension = $"{uniq:D03}";
+
+                    if(!_rootDirectoryCache.ContainsKey($"{name}.{extension}"))
+                        break;
+                }
+
+                // If we couldn't find it, just skip over
+                if(_rootDirectoryCache.ContainsKey($"{name}.{extension}"))
+                    continue;
+            }
+
+            // Atari ST allows slash AND colon so cannot simply substitute one for the other like in Mac filesystems
+            filename = filename.Replace('/', '\u2215');
+
+            completeEntry.Shortname = filename;
+
+            if(_namespace == Namespace.Human)
+            {
+                HumanDirectoryEntry humanEntry =
+                    Marshal.ByteArrayToStructureLittleEndian<HumanDirectoryEntry>(rootDirectory, i,
+                        Marshal.SizeOf<HumanDirectoryEntry>());
+
+                completeEntry.HumanDirent = humanEntry;
+
+                name      = StringHandlers.CToString(humanEntry.name1, Encoding).TrimEnd();
+                extension = StringHandlers.CToString(humanEntry.extension, Encoding).TrimEnd();
+                string name2 = StringHandlers.CToString(humanEntry.name2, Encoding).TrimEnd();
 
                 if(extension != "")
-                    filename = name + "." + extension;
+                    filename = name + name2 + "." + extension;
                 else
-                    filename = name;
+                    filename = name + name2;
 
-                if(name      == "" &&
-                   extension == "")
-                {
-                    AaruConsole.DebugWriteLine("FAT filesystem", "Found empty filename in root directory");
+                completeEntry.HumanName = filename;
+            }
 
-                    if(!_debug ||
-                       (entry.size > 0 && entry.start_cluster == 0))
-                        continue; // Skip invalid name
+            if(!_fat32 &&
+               filename == "EA DATA. SF")
+            {
+                _eaDirEntry     = entry;
+                lastLfnName     = null;
+                lastLfnChecksum = 0;
 
-                    // If debug, add it
-                    name = ":{EMPTYNAME}:";
+                if(_debug)
+                    _rootDirectoryCache[completeEntry.ToString()] = completeEntry;
 
-                    // Try to create a unique filename with an extension from 000 to 999
-                    for(int uniq = 0; uniq < 1000; uniq++)
-                    {
-                        extension = $"{uniq:D03}";
+                continue;
+            }
 
-                        if(!_rootDirectoryCache.ContainsKey($"{name}.{extension}"))
-                            break;
-                    }
+            _rootDirectoryCache[completeEntry.ToString()] = completeEntry;
+            lastLfnName                                   = null;
+            lastLfnChecksum                               = 0;
+        }
 
-                    // If we couldn't find it, just skip over
-                    if(_rootDirectoryCache.ContainsKey($"{name}.{extension}"))
-                        continue;
-                }
+        XmlFsType.VolumeName = XmlFsType.VolumeName?.Trim();
+        _statfs.Blocks       = XmlFsType.Clusters;
 
-                // Atari ST allows slash AND colon so cannot simply substitute one for the other like in Mac filesystems
-                filename = filename.Replace('/', '\u2215');
+        switch(bpbKind)
+        {
+            case BpbKind.Hardcoded:
+                _statfs.Type = $"Microsoft FAT{(_fat16 ? "16" : "12")}";
 
-                completeEntry.Shortname = filename;
+                break;
+            case BpbKind.Atari:
+                _statfs.Type = $"Atari FAT{(_fat16 ? "16" : "12")}";
 
-                if(_namespace == Namespace.Human)
-                {
-                    HumanDirectoryEntry humanEntry =
-                        Marshal.ByteArrayToStructureLittleEndian<HumanDirectoryEntry>(rootDirectory, i,
-                            Marshal.SizeOf<HumanDirectoryEntry>());
+                break;
+            case BpbKind.Msx:
+                _statfs.Type = $"MSX FAT{(_fat16 ? "16" : "12")}";
 
-                    completeEntry.HumanDirent = humanEntry;
+                break;
+            case BpbKind.Dos2:
+            case BpbKind.Dos3:
+            case BpbKind.Dos32:
+            case BpbKind.Dos33:
+            case BpbKind.ShortExtended:
+            case BpbKind.Extended:
+                _statfs.Type = $"Microsoft FAT{(_fat16 ? "16" : "12")}";
 
-                    name      = StringHandlers.CToString(humanEntry.name1, Encoding).TrimEnd();
-                    extension = StringHandlers.CToString(humanEntry.extension, Encoding).TrimEnd();
-                    string name2 = StringHandlers.CToString(humanEntry.name2, Encoding).TrimEnd();
+                break;
+            case BpbKind.ShortFat32:
+            case BpbKind.LongFat32:
+                _statfs.Type = XmlFsType.Type == "FAT+" ? "FAT+" : "Microsoft FAT32";
 
-                    if(extension != "")
-                        filename = name + name2 + "." + extension;
-                    else
-                        filename = name + name2;
+                break;
+            case BpbKind.Andos:
+                _statfs.Type = $"ANDOS FAT{(_fat16 ? "16" : "12")}";
 
-                    completeEntry.HumanName = filename;
-                }
+                break;
+            case BpbKind.Apricot:
+                _statfs.Type = $"Apricot FAT{(_fat16 ? "16" : "12")}";
 
-                if(!_fat32 &&
-                   filename == "EA DATA. SF")
-                {
-                    _eaDirEntry     = entry;
-                    lastLfnName     = null;
-                    lastLfnChecksum = 0;
+                break;
+            case BpbKind.DecRainbow:
+                _statfs.Type = $"DEC FAT{(_fat16 ? "16" : "12")}";
 
-                    if(_debug)
-                        _rootDirectoryCache[completeEntry.ToString()] = completeEntry;
+                break;
+            case BpbKind.Human:
+                _statfs.Type = $"Human68k FAT{(_fat16 ? "16" : "12")}";
 
+                break;
+            default: throw new ArgumentOutOfRangeException();
+        }
+
+        _bytesPerCluster = _sectorsPerCluster * imagePlugin.Info.SectorSize;
+
+        ushort[] firstFatEntries  = new ushort[_statfs.Blocks];
+        ushort[] secondFatEntries = new ushort[_statfs.Blocks];
+        bool     firstFatValid    = true;
+        bool     secondFatValid   = true;
+
+        if(_fat12)
+        {
+            AaruConsole.DebugWriteLine("FAT plugin", "Reading FAT12");
+
+            errno = imagePlugin.ReadSectors(_fatFirstSector, _sectorsPerFat, out byte[] fatBytes);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            int pos = 0;
+
+            for(int i = 0; i + 3 < fatBytes.Length && pos < firstFatEntries.Length; i += 3)
+            {
+                firstFatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF) << 8) + fatBytes[i + 0]);
+
+                if(pos >= firstFatEntries.Length)
+                    break;
+
+                firstFatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF0) >> 4) + (fatBytes[i + 2] << 4));
+            }
+
+            errno = imagePlugin.ReadSectors(_fatFirstSector + _sectorsPerFat, _sectorsPerFat, out fatBytes);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            _fatEntries = new ushort[_statfs.Blocks];
+
+            pos = 0;
+
+            for(int i = 0; i + 3 < fatBytes.Length && pos < secondFatEntries.Length; i += 3)
+            {
+                secondFatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF) << 8) + fatBytes[i + 0]);
+
+                if(pos >= secondFatEntries.Length)
+                    break;
+
+                secondFatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF0) >> 4) + (fatBytes[i + 2] << 4));
+            }
+
+            foreach(ushort entry in firstFatEntries)
+            {
+                if(entry >= FAT12_RESERVED ||
+                   entry <= _statfs.Blocks)
                     continue;
-                }
 
-                _rootDirectoryCache[completeEntry.ToString()] = completeEntry;
-                lastLfnName                                   = null;
-                lastLfnChecksum                               = 0;
+                firstFatValid = false;
+
+                break;
             }
 
-            XmlFsType.VolumeName = XmlFsType.VolumeName?.Trim();
-            _statfs.Blocks       = XmlFsType.Clusters;
-
-            switch(bpbKind)
+            foreach(ushort entry in secondFatEntries)
             {
-                case BpbKind.Hardcoded:
-                    _statfs.Type = $"Microsoft FAT{(_fat16 ? "16" : "12")}";
+                if(entry >= FAT12_RESERVED ||
+                   entry <= _statfs.Blocks)
+                    continue;
 
-                    break;
-                case BpbKind.Atari:
-                    _statfs.Type = $"Atari FAT{(_fat16 ? "16" : "12")}";
+                secondFatValid = false;
 
-                    break;
-                case BpbKind.Msx:
-                    _statfs.Type = $"MSX FAT{(_fat16 ? "16" : "12")}";
-
-                    break;
-                case BpbKind.Dos2:
-                case BpbKind.Dos3:
-                case BpbKind.Dos32:
-                case BpbKind.Dos33:
-                case BpbKind.ShortExtended:
-                case BpbKind.Extended:
-                    _statfs.Type = $"Microsoft FAT{(_fat16 ? "16" : "12")}";
-
-                    break;
-                case BpbKind.ShortFat32:
-                case BpbKind.LongFat32:
-                    _statfs.Type = XmlFsType.Type == "FAT+" ? "FAT+" : "Microsoft FAT32";
-
-                    break;
-                case BpbKind.Andos:
-                    _statfs.Type = $"ANDOS FAT{(_fat16 ? "16" : "12")}";
-
-                    break;
-                case BpbKind.Apricot:
-                    _statfs.Type = $"Apricot FAT{(_fat16 ? "16" : "12")}";
-
-                    break;
-                case BpbKind.DecRainbow:
-                    _statfs.Type = $"DEC FAT{(_fat16 ? "16" : "12")}";
-
-                    break;
-                case BpbKind.Human:
-                    _statfs.Type = $"Human68k FAT{(_fat16 ? "16" : "12")}";
-
-                    break;
-                default: throw new ArgumentOutOfRangeException();
+                break;
             }
 
-            _bytesPerCluster = _sectorsPerCluster * imagePlugin.Info.SectorSize;
+            if(firstFatValid == secondFatValid)
+                _fatEntries = _useFirstFat ? firstFatEntries : secondFatEntries;
+            else if(firstFatValid)
+                _fatEntries = firstFatEntries;
+            else
+                _fatEntries = secondFatEntries;
+        }
+        else if(_fat16)
+        {
+            AaruConsole.DebugWriteLine("FAT plugin", "Reading FAT16");
 
-            ushort[] firstFatEntries  = new ushort[_statfs.Blocks];
-            ushort[] secondFatEntries = new ushort[_statfs.Blocks];
-            bool     firstFatValid    = true;
-            bool     secondFatValid   = true;
+            errno = imagePlugin.ReadSectors(_fatFirstSector, _sectorsPerFat, out byte[] fatBytes);
 
-            if(_fat12)
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            AaruConsole.DebugWriteLine("FAT plugin", "Casting FAT");
+            firstFatEntries = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
+
+            errno = imagePlugin.ReadSectors(_fatFirstSector + _sectorsPerFat, _sectorsPerFat, out fatBytes);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            AaruConsole.DebugWriteLine("FAT plugin", "Casting FAT");
+            secondFatEntries = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
+
+            foreach(ushort entry in firstFatEntries)
             {
-                AaruConsole.DebugWriteLine("FAT plugin", "Reading FAT12");
+                if(entry >= FAT16_RESERVED ||
+                   entry <= _statfs.Blocks)
+                    continue;
 
-                errno = imagePlugin.ReadSectors(_fatFirstSector, _sectorsPerFat, out byte[] fatBytes);
+                firstFatValid = false;
 
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                int pos = 0;
-
-                for(int i = 0; i + 3 < fatBytes.Length && pos < firstFatEntries.Length; i += 3)
-                {
-                    firstFatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF) << 8) + fatBytes[i + 0]);
-
-                    if(pos >= firstFatEntries.Length)
-                        break;
-
-                    firstFatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF0) >> 4) + (fatBytes[i + 2] << 4));
-                }
-
-                errno = imagePlugin.ReadSectors(_fatFirstSector + _sectorsPerFat, _sectorsPerFat, out fatBytes);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                _fatEntries = new ushort[_statfs.Blocks];
-
-                pos = 0;
-
-                for(int i = 0; i + 3 < fatBytes.Length && pos < secondFatEntries.Length; i += 3)
-                {
-                    secondFatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF) << 8) + fatBytes[i + 0]);
-
-                    if(pos >= secondFatEntries.Length)
-                        break;
-
-                    secondFatEntries[pos++] = (ushort)(((fatBytes[i + 1] & 0xF0) >> 4) + (fatBytes[i + 2] << 4));
-                }
-
-                foreach(ushort entry in firstFatEntries)
-                {
-                    if(entry >= FAT12_RESERVED ||
-                       entry <= _statfs.Blocks)
-                        continue;
-
-                    firstFatValid = false;
-
-                    break;
-                }
-
-                foreach(ushort entry in secondFatEntries)
-                {
-                    if(entry >= FAT12_RESERVED ||
-                       entry <= _statfs.Blocks)
-                        continue;
-
-                    secondFatValid = false;
-
-                    break;
-                }
-
-                if(firstFatValid == secondFatValid)
-                    _fatEntries = _useFirstFat ? firstFatEntries : secondFatEntries;
-                else if(firstFatValid)
-                    _fatEntries = firstFatEntries;
-                else
-                    _fatEntries = secondFatEntries;
+                break;
             }
-            else if(_fat16)
+
+            foreach(ushort entry in secondFatEntries)
             {
-                AaruConsole.DebugWriteLine("FAT plugin", "Reading FAT16");
+                if(entry >= FAT16_RESERVED ||
+                   entry <= _statfs.Blocks)
+                    continue;
 
-                errno = imagePlugin.ReadSectors(_fatFirstSector, _sectorsPerFat, out byte[] fatBytes);
+                secondFatValid = false;
 
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                AaruConsole.DebugWriteLine("FAT plugin", "Casting FAT");
-                firstFatEntries = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
-
-                errno = imagePlugin.ReadSectors(_fatFirstSector + _sectorsPerFat, _sectorsPerFat, out fatBytes);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                AaruConsole.DebugWriteLine("FAT plugin", "Casting FAT");
-                secondFatEntries = MemoryMarshal.Cast<byte, ushort>(fatBytes).ToArray();
-
-                foreach(ushort entry in firstFatEntries)
-                {
-                    if(entry >= FAT16_RESERVED ||
-                       entry <= _statfs.Blocks)
-                        continue;
-
-                    firstFatValid = false;
-
-                    break;
-                }
-
-                foreach(ushort entry in secondFatEntries)
-                {
-                    if(entry >= FAT16_RESERVED ||
-                       entry <= _statfs.Blocks)
-                        continue;
-
-                    secondFatValid = false;
-
-                    break;
-                }
-
-                if(firstFatValid == secondFatValid)
-                    _fatEntries = _useFirstFat ? firstFatEntries : secondFatEntries;
-                else if(firstFatValid)
-                    _fatEntries = firstFatEntries;
-                else
-                    _fatEntries = secondFatEntries;
+                break;
             }
 
-            // TODO: Check how this affects international filenames
-            _cultureInfo    = new CultureInfo("en-US", false);
-            _directoryCache = new Dictionary<string, Dictionary<string, CompleteDirectoryEntry>>();
+            if(firstFatValid == secondFatValid)
+                _fatEntries = _useFirstFat ? firstFatEntries : secondFatEntries;
+            else if(firstFatValid)
+                _fatEntries = firstFatEntries;
+            else
+                _fatEntries = secondFatEntries;
+        }
 
-            // Check it is really an OS/2 EA file
-            if(_eaDirEntry.start_cluster != 0)
+        // TODO: Check how this affects international filenames
+        _cultureInfo    = new CultureInfo("en-US", false);
+        _directoryCache = new Dictionary<string, Dictionary<string, CompleteDirectoryEntry>>();
+
+        // Check it is really an OS/2 EA file
+        if(_eaDirEntry.start_cluster != 0)
+        {
+            CacheEaData();
+            ushort eamagic = BitConverter.ToUInt16(_cachedEaData, 0);
+
+            if(eamagic != EADATA_MAGIC)
             {
-                CacheEaData();
-                ushort eamagic = BitConverter.ToUInt16(_cachedEaData, 0);
-
-                if(eamagic != EADATA_MAGIC)
-                {
-                    _eaDirEntry   = new DirectoryEntry();
-                    _cachedEaData = null;
-                }
-                else
-                    _eaCache = new Dictionary<string, Dictionary<string, byte[]>>();
+                _eaDirEntry   = new DirectoryEntry();
+                _cachedEaData = null;
             }
-            else if(_fat32)
+            else
                 _eaCache = new Dictionary<string, Dictionary<string, byte[]>>();
-
-            // Check OS/2 .LONGNAME
-            if(_eaCache != null                                             &&
-               (_namespace == Namespace.Os2 || _namespace == Namespace.Ecs) &&
-               !_fat32)
-            {
-                List<KeyValuePair<string, CompleteDirectoryEntry>> rootFilesWithEas =
-                    _rootDirectoryCache.Where(t => t.Value.Dirent.ea_handle != 0).ToList();
-
-                foreach(KeyValuePair<string, CompleteDirectoryEntry> fileWithEa in rootFilesWithEas)
-                {
-                    Dictionary<string, byte[]> eas = GetEas(fileWithEa.Value.Dirent.ea_handle);
-
-                    if(eas is null)
-                        continue;
-
-                    if(!eas.TryGetValue("com.microsoft.os2.longname", out byte[] longnameEa))
-                        continue;
-
-                    if(BitConverter.ToUInt16(longnameEa, 0) != EAT_ASCII)
-                        continue;
-
-                    ushort longnameSize = BitConverter.ToUInt16(longnameEa, 2);
-
-                    if(longnameSize + 4 > longnameEa.Length)
-                        continue;
-
-                    byte[] longnameBytes = new byte[longnameSize];
-
-                    Array.Copy(longnameEa, 4, longnameBytes, 0, longnameSize);
-
-                    string longname = StringHandlers.CToString(longnameBytes, Encoding);
-
-                    if(string.IsNullOrWhiteSpace(longname))
-                        continue;
-
-                    // Forward slash is allowed in .LONGNAME, so change it to visually similar division slash
-                    longname = longname.Replace('/', '\u2215');
-
-                    fileWithEa.Value.Longname = longname;
-                    _rootDirectoryCache.Remove(fileWithEa.Key);
-                    _rootDirectoryCache[fileWithEa.Value.ToString()] = fileWithEa.Value;
-                }
-            }
-
-            // Check FAT32.IFS EAs
-            if(_fat32 || _debug)
-            {
-                List<KeyValuePair<string, CompleteDirectoryEntry>> fat32EaSidecars = _rootDirectoryCache.
-                    Where(t => t.Key.EndsWith(FAT32_EA_TAIL, true, _cultureInfo)).ToList();
-
-                foreach(KeyValuePair<string, CompleteDirectoryEntry> sidecar in fat32EaSidecars)
-                {
-                    // No real file this sidecar accompanies
-                    if(!_rootDirectoryCache.
-                           TryGetValue(sidecar.Key.Substring(0, sidecar.Key.Length - FAT32_EA_TAIL.Length),
-                                       out CompleteDirectoryEntry fileWithEa))
-                        continue;
-
-                    // If not in debug mode we will consider the lack of EA bitflags to mean the EAs are corrupted or not real
-                    if(!_debug)
-                        if(!fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.NormalEaOld) &&
-                           !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.CriticalEa)  &&
-                           !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.NormalEa)    &&
-                           !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.CriticalEa))
-                            continue;
-
-                    fileWithEa.Fat32Ea = sidecar.Value.Dirent;
-
-                    if(!_debug)
-                        _rootDirectoryCache.Remove(sidecar.Key);
-                }
-            }
-
-            _mounted = true;
-
-            if(string.IsNullOrWhiteSpace(XmlFsType.VolumeName))
-                XmlFsType.VolumeName = null;
-
-            return ErrorNumber.NoError;
         }
+        else if(_fat32)
+            _eaCache = new Dictionary<string, Dictionary<string, byte[]>>();
 
-        /// <inheritdoc />
-        public ErrorNumber Unmount()
+        // Check OS/2 .LONGNAME
+        if(_eaCache != null                                             &&
+           (_namespace == Namespace.Os2 || _namespace == Namespace.Ecs) &&
+           !_fat32)
         {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            List<KeyValuePair<string, CompleteDirectoryEntry>> rootFilesWithEas =
+                _rootDirectoryCache.Where(t => t.Value.Dirent.ea_handle != 0).ToList();
 
-            _mounted    = false;
-            _fatEntries = null;
+            foreach(KeyValuePair<string, CompleteDirectoryEntry> fileWithEa in rootFilesWithEas)
+            {
+                Dictionary<string, byte[]> eas = GetEas(fileWithEa.Value.Dirent.ea_handle);
 
-            return ErrorNumber.NoError;
+                if(eas is null)
+                    continue;
+
+                if(!eas.TryGetValue("com.microsoft.os2.longname", out byte[] longnameEa))
+                    continue;
+
+                if(BitConverter.ToUInt16(longnameEa, 0) != EAT_ASCII)
+                    continue;
+
+                ushort longnameSize = BitConverter.ToUInt16(longnameEa, 2);
+
+                if(longnameSize + 4 > longnameEa.Length)
+                    continue;
+
+                byte[] longnameBytes = new byte[longnameSize];
+
+                Array.Copy(longnameEa, 4, longnameBytes, 0, longnameSize);
+
+                string longname = StringHandlers.CToString(longnameBytes, Encoding);
+
+                if(string.IsNullOrWhiteSpace(longname))
+                    continue;
+
+                // Forward slash is allowed in .LONGNAME, so change it to visually similar division slash
+                longname = longname.Replace('/', '\u2215');
+
+                fileWithEa.Value.Longname = longname;
+                _rootDirectoryCache.Remove(fileWithEa.Key);
+                _rootDirectoryCache[fileWithEa.Value.ToString()] = fileWithEa.Value;
+            }
         }
 
-        /// <inheritdoc />
-        public ErrorNumber StatFs(out FileSystemInfo stat)
+        // Check FAT32.IFS EAs
+        if(_fat32 || _debug)
         {
-            stat = null;
+            List<KeyValuePair<string, CompleteDirectoryEntry>> fat32EaSidecars = _rootDirectoryCache.
+                Where(t => t.Key.EndsWith(FAT32_EA_TAIL, true, _cultureInfo)).ToList();
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            foreach(KeyValuePair<string, CompleteDirectoryEntry> sidecar in fat32EaSidecars)
+            {
+                // No real file this sidecar accompanies
+                if(!_rootDirectoryCache.
+                       TryGetValue(sidecar.Key.Substring(0, sidecar.Key.Length - FAT32_EA_TAIL.Length),
+                                   out CompleteDirectoryEntry fileWithEa))
+                    continue;
 
-            stat = _statfs.ShallowCopy();
+                // If not in debug mode we will consider the lack of EA bitflags to mean the EAs are corrupted or not real
+                if(!_debug)
+                    if(!fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.NormalEaOld) &&
+                       !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.CriticalEa)  &&
+                       !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.NormalEa)    &&
+                       !fileWithEa.Dirent.caseinfo.HasFlag(CaseInfo.CriticalEa))
+                        continue;
 
-            return ErrorNumber.NoError;
+                fileWithEa.Fat32Ea = sidecar.Value.Dirent;
+
+                if(!_debug)
+                    _rootDirectoryCache.Remove(sidecar.Key);
+            }
         }
+
+        _mounted = true;
+
+        if(string.IsNullOrWhiteSpace(XmlFsType.VolumeName))
+            XmlFsType.VolumeName = null;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Unmount()
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        _mounted    = false;
+        _fatEntries = null;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber StatFs(out FileSystemInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        stat = _statfs.ShallowCopy();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FAT/Xattr.cs b/Aaru.Filesystems/FAT/Xattr.cs
index 73a0fcfa9..3f5ed385d 100644
--- a/Aaru.Filesystems/FAT/Xattr.cs
+++ b/Aaru.Filesystems/FAT/Xattr.cs
@@ -38,217 +38,216 @@ using System.Text;
 using Aaru.CommonTypes.Enums;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class FAT
 {
-    public sealed partial class FAT
+    Dictionary<string, Dictionary<string, byte[]>> _eaCache;
+
+    /// <inheritdoc />
+    public ErrorNumber ListXAttr(string path, out List<string> xattrs)
     {
-        Dictionary<string, Dictionary<string, byte[]>> _eaCache;
+        xattrs = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ListXAttr(string path, out List<string> xattrs)
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        // No other xattr recognized yet
+        if(_cachedEaData is null &&
+           !_fat32)
+            return ErrorNumber.NotSupported;
+
+        if(path[0] == '/')
+            path = path.Substring(1);
+
+        if(_eaCache.TryGetValue(path.ToLower(_cultureInfo), out Dictionary<string, byte[]> eas))
         {
-            xattrs = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            // No other xattr recognized yet
-            if(_cachedEaData is null &&
-               !_fat32)
-                return ErrorNumber.NotSupported;
-
-            if(path[0] == '/')
-                path = path.Substring(1);
-
-            if(_eaCache.TryGetValue(path.ToLower(_cultureInfo), out Dictionary<string, byte[]> eas))
-            {
-                xattrs = eas.Keys.ToList();
-
-                return ErrorNumber.NoError;
-            }
-
-            ErrorNumber err = GetFileEntry(path, out CompleteDirectoryEntry entry);
-
-            if(err != ErrorNumber.NoError ||
-               entry is null)
-                return err;
-
-            xattrs = new List<string>();
-
-            if(!_fat32)
-            {
-                if(entry.Dirent.ea_handle == 0)
-                    return ErrorNumber.NoError;
-
-                eas = GetEas(entry.Dirent.ea_handle);
-            }
-            else
-            {
-                if(entry.Fat32Ea.start_cluster == 0)
-                    return ErrorNumber.NoError;
-
-                eas = GetEas(entry.Fat32Ea);
-            }
-
-            if(eas is null)
-                return ErrorNumber.NoError;
-
-            _eaCache.Add(path.ToLower(_cultureInfo), eas);
             xattrs = eas.Keys.ToList();
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
+        ErrorNumber err = GetFileEntry(path, out CompleteDirectoryEntry entry);
+
+        if(err != ErrorNumber.NoError ||
+           entry is null)
+            return err;
+
+        xattrs = new List<string>();
+
+        if(!_fat32)
         {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            if(entry.Dirent.ea_handle == 0)
+                return ErrorNumber.NoError;
 
-            ErrorNumber err = ListXAttr(path, out List<string> xattrs);
+            eas = GetEas(entry.Dirent.ea_handle);
+        }
+        else
+        {
+            if(entry.Fat32Ea.start_cluster == 0)
+                return ErrorNumber.NoError;
 
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            if(path[0] == '/')
-                path = path.Substring(1);
-
-            if(!xattrs.Contains(xattr.ToLower(_cultureInfo)))
-                return ErrorNumber.NoSuchExtendedAttribute;
-
-            if(!_eaCache.TryGetValue(path.ToLower(_cultureInfo), out Dictionary<string, byte[]> eas))
-                return ErrorNumber.InvalidArgument;
-
-            if(!eas.TryGetValue(xattr.ToLower(_cultureInfo), out byte[] data))
-                return ErrorNumber.InvalidArgument;
-
-            buf = new byte[data.Length];
-            data.CopyTo(buf, 0);
+            eas = GetEas(entry.Fat32Ea);
+        }
 
+        if(eas is null)
             return ErrorNumber.NoError;
-        }
 
-        Dictionary<string, byte[]> GetEas(DirectoryEntry entryFat32Ea)
+        _eaCache.Add(path.ToLower(_cultureInfo), eas);
+        xattrs = eas.Keys.ToList();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = ListXAttr(path, out List<string> xattrs);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        if(path[0] == '/')
+            path = path.Substring(1);
+
+        if(!xattrs.Contains(xattr.ToLower(_cultureInfo)))
+            return ErrorNumber.NoSuchExtendedAttribute;
+
+        if(!_eaCache.TryGetValue(path.ToLower(_cultureInfo), out Dictionary<string, byte[]> eas))
+            return ErrorNumber.InvalidArgument;
+
+        if(!eas.TryGetValue(xattr.ToLower(_cultureInfo), out byte[] data))
+            return ErrorNumber.InvalidArgument;
+
+        buf = new byte[data.Length];
+        data.CopyTo(buf, 0);
+
+        return ErrorNumber.NoError;
+    }
+
+    Dictionary<string, byte[]> GetEas(DirectoryEntry entryFat32Ea)
+    {
+        var    eaMs                  = new MemoryStream();
+        uint[] rootDirectoryClusters = GetClusters(entryFat32Ea.start_cluster);
+
+        foreach(uint cluster in rootDirectoryClusters)
         {
-            var    eaMs                  = new MemoryStream();
-            uint[] rootDirectoryClusters = GetClusters(entryFat32Ea.start_cluster);
+            ErrorNumber errno = _image.ReadSectors(_firstClusterSector + (cluster * _sectorsPerCluster),
+                                                   _sectorsPerCluster, out byte[] buffer);
 
-            foreach(uint cluster in rootDirectoryClusters)
-            {
-                ErrorNumber errno = _image.ReadSectors(_firstClusterSector + (cluster * _sectorsPerCluster),
-                                                       _sectorsPerCluster, out byte[] buffer);
-
-                if(errno != ErrorNumber.NoError)
-                    return null;
-
-                eaMs.Write(buffer, 0, buffer.Length);
-            }
-
-            byte[] full = eaMs.ToArray();
-            ushort size = BitConverter.ToUInt16(full, 0);
-            byte[] eas  = new byte[size];
-            Array.Copy(full, 0, eas, 0, size);
-
-            eaMs.Close();
-
-            return GetEas(eas);
-        }
-
-        Dictionary<string, byte[]> GetEas(ushort eaHandle)
-        {
-            int aIndex = eaHandle >> 7;
-
-            // First 0x20 bytes are the magic number and unused words
-            ushort a = BitConverter.ToUInt16(_cachedEaData, (aIndex * 2) + 0x20);
-
-            ushort b = BitConverter.ToUInt16(_cachedEaData, (eaHandle * 2) + 0x200);
-
-            uint eaCluster = (uint)(a + b);
-
-            if(b == EA_UNUSED)
+            if(errno != ErrorNumber.NoError)
                 return null;
 
-            EaHeader header =
-                Marshal.ByteArrayToStructureLittleEndian<EaHeader>(_cachedEaData, (int)(eaCluster * _bytesPerCluster),
-                                                                   Marshal.SizeOf<EaHeader>());
-
-            if(header.magic != 0x4145)
-                return null;
-
-            uint eaLen = BitConverter.ToUInt32(_cachedEaData,
-                                               (int)(eaCluster * _bytesPerCluster) + Marshal.SizeOf<EaHeader>());
-
-            byte[] eaData = new byte[eaLen];
-
-            Array.Copy(_cachedEaData, (int)(eaCluster * _bytesPerCluster) + Marshal.SizeOf<EaHeader>(), eaData, 0,
-                       eaLen);
-
-            return GetEas(eaData);
+            eaMs.Write(buffer, 0, buffer.Length);
         }
 
-        Dictionary<string, byte[]> GetEas(byte[] eaData)
+        byte[] full = eaMs.ToArray();
+        ushort size = BitConverter.ToUInt16(full, 0);
+        byte[] eas  = new byte[size];
+        Array.Copy(full, 0, eas, 0, size);
+
+        eaMs.Close();
+
+        return GetEas(eas);
+    }
+
+    Dictionary<string, byte[]> GetEas(ushort eaHandle)
+    {
+        int aIndex = eaHandle >> 7;
+
+        // First 0x20 bytes are the magic number and unused words
+        ushort a = BitConverter.ToUInt16(_cachedEaData, (aIndex * 2) + 0x20);
+
+        ushort b = BitConverter.ToUInt16(_cachedEaData, (eaHandle * 2) + 0x200);
+
+        uint eaCluster = (uint)(a + b);
+
+        if(b == EA_UNUSED)
+            return null;
+
+        EaHeader header =
+            Marshal.ByteArrayToStructureLittleEndian<EaHeader>(_cachedEaData, (int)(eaCluster * _bytesPerCluster),
+                                                               Marshal.SizeOf<EaHeader>());
+
+        if(header.magic != 0x4145)
+            return null;
+
+        uint eaLen = BitConverter.ToUInt32(_cachedEaData,
+                                           (int)(eaCluster * _bytesPerCluster) + Marshal.SizeOf<EaHeader>());
+
+        byte[] eaData = new byte[eaLen];
+
+        Array.Copy(_cachedEaData, (int)(eaCluster * _bytesPerCluster) + Marshal.SizeOf<EaHeader>(), eaData, 0,
+                   eaLen);
+
+        return GetEas(eaData);
+    }
+
+    Dictionary<string, byte[]> GetEas(byte[] eaData)
+    {
+        if(eaData is null ||
+           eaData.Length < 4)
+            return null;
+
+        Dictionary<string, byte[]> eas = new();
+
+        if(_debug)
+            eas.Add("com.microsoft.os2.fea", eaData);
+
+        int pos = 4;
+
+        while(pos < eaData.Length)
         {
-            if(eaData is null ||
-               eaData.Length < 4)
-                return null;
+            pos++; // Skip fEA
+            byte   cbName  = eaData[pos++];
+            ushort cbValue = BitConverter.ToUInt16(eaData, pos);
+            pos += 2;
 
-            Dictionary<string, byte[]> eas = new();
+            string name = Encoding.ASCII.GetString(eaData, pos, cbName);
+            pos += cbName;
+            pos++;
+            byte[] data = new byte[cbValue];
 
-            if(_debug)
-                eas.Add("com.microsoft.os2.fea", eaData);
+            Array.Copy(eaData, pos, data, 0, cbValue);
+            pos += cbValue;
 
-            int pos = 4;
-
-            while(pos < eaData.Length)
+            // OS/2 System Attributes
+            if(name[0] == '.')
             {
-                pos++; // Skip fEA
-                byte   cbName  = eaData[pos++];
-                ushort cbValue = BitConverter.ToUInt16(eaData, pos);
-                pos += 2;
-
-                string name = Encoding.ASCII.GetString(eaData, pos, cbName);
-                pos += cbName;
-                pos++;
-                byte[] data = new byte[cbValue];
-
-                Array.Copy(eaData, pos, data, 0, cbValue);
-                pos += cbValue;
-
-                // OS/2 System Attributes
-                if(name[0] == '.')
-                {
-                    // This is WorkPlace System information so it's IBM
-                    if(name == ".CLASSINFO")
-                        name = "com.ibm.os2.classinfo";
-                    else
-                        name = "com.microsoft.os2" + name.ToLower();
-                }
-
-                eas.Add(name, data);
+                // This is WorkPlace System information so it's IBM
+                if(name == ".CLASSINFO")
+                    name = "com.ibm.os2.classinfo";
+                else
+                    name = "com.microsoft.os2" + name.ToLower();
             }
 
-            return eas;
+            eas.Add(name, data);
         }
 
-        void CacheEaData()
+        return eas;
+    }
+
+    void CacheEaData()
+    {
+        if(_eaDirEntry.start_cluster == 0)
+            return;
+
+        var eaDataMs = new MemoryStream();
+
+        foreach(uint cluster in GetClusters(_eaDirEntry.start_cluster))
         {
-            if(_eaDirEntry.start_cluster == 0)
-                return;
+            ErrorNumber errno = _image.ReadSectors(_firstClusterSector + (cluster * _sectorsPerCluster),
+                                                   _sectorsPerCluster, out byte[] buffer);
 
-            var eaDataMs = new MemoryStream();
+            if(errno != ErrorNumber.NoError)
+                break;
 
-            foreach(uint cluster in GetClusters(_eaDirEntry.start_cluster))
-            {
-                ErrorNumber errno = _image.ReadSectors(_firstClusterSector + (cluster * _sectorsPerCluster),
-                                                       _sectorsPerCluster, out byte[] buffer);
-
-                if(errno != ErrorNumber.NoError)
-                    break;
-
-                eaDataMs.Write(buffer, 0, buffer.Length);
-            }
-
-            _cachedEaData = eaDataMs.ToArray();
+            eaDataMs.Write(buffer, 0, buffer.Length);
         }
+
+        _cachedEaData = eaDataMs.ToArray();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FATX/Consts.cs b/Aaru.Filesystems/FATX/Consts.cs
index 5bd470e4a..b6cc8b27b 100644
--- a/Aaru.Filesystems/FATX/Consts.cs
+++ b/Aaru.Filesystems/FATX/Consts.cs
@@ -34,36 +34,35 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
-{
-    public sealed partial class XboxFatPlugin
-    {
-        const uint   FATX_MAGIC          = 0x58544146;
-        const uint   FATX_CIGAM          = 0x46415458;
-        const byte   UNUSED_DIRENTRY     = 0x00;
-        const byte   DELETED_DIRENTRY    = 0xE5;
-        const byte   FINISHED_DIRENTRY   = 0xFF;
-        const byte   MAX_FILENAME        = 42;
-        const int    MAX_XFAT16_CLUSTERS = 65525;
-        const int    FAT_START           = 4096;
-        const uint   FATX32_ID           = 0xFFFFFFF8;
-        const ushort FATX16_ID           = 0xFFF8;
-        const uint   FAT32_MASK          = 0x0FFFFFFF;
-        const uint   FAT32_END_MASK      = 0xFFFFFF8;
-        const uint   FAT32_FORMATTED     = 0xFFFFFF6;
-        const uint   FAT32_BAD           = 0xFFFFFF7;
-        const uint   FAT32_RESERVED      = 0xFFFFFF0;
-        const ushort FAT16_END_MASK      = 0xFFF8;
-        const ushort FAT16_FORMATTED     = 0xFFF6;
-        const ushort FAT16_BAD           = 0xFFF7;
-        const ushort FAT16_RESERVED      = 0xFFF0;
-        const ushort FAT_RESERVED        = 1;
+namespace Aaru.Filesystems;
 
-        [Flags]
-        enum Attributes : byte
-        {
-            ReadOnly  = 0x01, Hidden  = 0x02, System = 0x04,
-            Directory = 0x10, Archive = 0x20
-        }
+public sealed partial class XboxFatPlugin
+{
+    const uint   FATX_MAGIC          = 0x58544146;
+    const uint   FATX_CIGAM          = 0x46415458;
+    const byte   UNUSED_DIRENTRY     = 0x00;
+    const byte   DELETED_DIRENTRY    = 0xE5;
+    const byte   FINISHED_DIRENTRY   = 0xFF;
+    const byte   MAX_FILENAME        = 42;
+    const int    MAX_XFAT16_CLUSTERS = 65525;
+    const int    FAT_START           = 4096;
+    const uint   FATX32_ID           = 0xFFFFFFF8;
+    const ushort FATX16_ID           = 0xFFF8;
+    const uint   FAT32_MASK          = 0x0FFFFFFF;
+    const uint   FAT32_END_MASK      = 0xFFFFFF8;
+    const uint   FAT32_FORMATTED     = 0xFFFFFF6;
+    const uint   FAT32_BAD           = 0xFFFFFF7;
+    const uint   FAT32_RESERVED      = 0xFFFFFF0;
+    const ushort FAT16_END_MASK      = 0xFFF8;
+    const ushort FAT16_FORMATTED     = 0xFFF6;
+    const ushort FAT16_BAD           = 0xFFF7;
+    const ushort FAT16_RESERVED      = 0xFFF0;
+    const ushort FAT_RESERVED        = 1;
+
+    [Flags]
+    enum Attributes : byte
+    {
+        ReadOnly  = 0x01, Hidden  = 0x02, System = 0x04,
+        Directory = 0x10, Archive = 0x20
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FATX/Dir.cs b/Aaru.Filesystems/FATX/Dir.cs
index fb45e06f5..9c31746c0 100644
--- a/Aaru.Filesystems/FATX/Dir.cs
+++ b/Aaru.Filesystems/FATX/Dir.cs
@@ -36,43 +36,57 @@ using System.Linq;
 using Aaru.CommonTypes.Enums;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class XboxFatPlugin
 {
-    public sealed partial class XboxFatPlugin
+    /// <inheritdoc />
+    public ErrorNumber ReadDir(string path, out List<string> contents)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadDir(string path, out List<string> contents)
+        contents = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(string.IsNullOrWhiteSpace(path) ||
+           path == "/")
         {
-            contents = null;
+            contents = _rootDirectory.Keys.ToList();
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            return ErrorNumber.NoError;
+        }
 
-            if(string.IsNullOrWhiteSpace(path) ||
-               path == "/")
-            {
-                contents = _rootDirectory.Keys.ToList();
+        string cutPath = path.StartsWith('/') ? path.Substring(1).ToLower(_cultureInfo)
+                             : path.ToLower(_cultureInfo);
 
-                return ErrorNumber.NoError;
-            }
+        if(_directoryCache.TryGetValue(cutPath, out Dictionary<string, DirectoryEntry> currentDirectory))
+        {
+            contents = currentDirectory.Keys.ToList();
 
-            string cutPath = path.StartsWith('/') ? path.Substring(1).ToLower(_cultureInfo)
-                                 : path.ToLower(_cultureInfo);
+            return ErrorNumber.NoError;
+        }
 
-            if(_directoryCache.TryGetValue(cutPath, out Dictionary<string, DirectoryEntry> currentDirectory))
-            {
-                contents = currentDirectory.Keys.ToList();
+        string[] pieces = cutPath.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-                return ErrorNumber.NoError;
-            }
+        KeyValuePair<string, DirectoryEntry> entry =
+            _rootDirectory.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[0]);
 
-            string[] pieces = cutPath.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        if(string.IsNullOrEmpty(entry.Key))
+            return ErrorNumber.NoSuchFile;
 
-            KeyValuePair<string, DirectoryEntry> entry =
-                _rootDirectory.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[0]);
+        if(!entry.Value.attributes.HasFlag(Attributes.Directory))
+            return ErrorNumber.NotDirectory;
+
+        string currentPath = pieces[0];
+
+        currentDirectory = _rootDirectory;
+
+        for(int p = 0; p < pieces.Length; p++)
+        {
+            entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[p]);
 
             if(string.IsNullOrEmpty(entry.Key))
                 return ErrorNumber.NoSuchFile;
@@ -80,80 +94,65 @@ namespace Aaru.Filesystems
             if(!entry.Value.attributes.HasFlag(Attributes.Directory))
                 return ErrorNumber.NotDirectory;
 
-            string currentPath = pieces[0];
+            currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
+            uint currentCluster = entry.Value.firstCluster;
 
-            currentDirectory = _rootDirectory;
+            if(_directoryCache.TryGetValue(currentPath, out currentDirectory))
+                continue;
 
-            for(int p = 0; p < pieces.Length; p++)
+            uint[] clusters = GetClusters(currentCluster);
+
+            if(clusters is null)
+                return ErrorNumber.InvalidArgument;
+
+            byte[] directoryBuffer = new byte[_bytesPerCluster * clusters.Length];
+
+            for(int i = 0; i < clusters.Length; i++)
             {
-                entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[p]);
+                ErrorNumber errno =
+                    _imagePlugin.ReadSectors(_firstClusterSector + ((clusters[i] - 1) * _sectorsPerCluster),
+                                             _sectorsPerCluster, out byte[] buffer);
 
-                if(string.IsNullOrEmpty(entry.Key))
-                    return ErrorNumber.NoSuchFile;
+                if(errno != ErrorNumber.NoError)
+                    return errno;
 
-                if(!entry.Value.attributes.HasFlag(Attributes.Directory))
-                    return ErrorNumber.NotDirectory;
-
-                currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
-                uint currentCluster = entry.Value.firstCluster;
-
-                if(_directoryCache.TryGetValue(currentPath, out currentDirectory))
-                    continue;
-
-                uint[] clusters = GetClusters(currentCluster);
-
-                if(clusters is null)
-                    return ErrorNumber.InvalidArgument;
-
-                byte[] directoryBuffer = new byte[_bytesPerCluster * clusters.Length];
-
-                for(int i = 0; i < clusters.Length; i++)
-                {
-                    ErrorNumber errno =
-                        _imagePlugin.ReadSectors(_firstClusterSector + ((clusters[i] - 1) * _sectorsPerCluster),
-                                                 _sectorsPerCluster, out byte[] buffer);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    Array.Copy(buffer, 0, directoryBuffer, i * _bytesPerCluster, _bytesPerCluster);
-                }
-
-                currentDirectory = new Dictionary<string, DirectoryEntry>();
-
-                int pos = 0;
-
-                while(pos < directoryBuffer.Length)
-                {
-                    DirectoryEntry dirent = _littleEndian
-                                                ? Marshal.
-                                                    ByteArrayToStructureLittleEndian<
-                                                        DirectoryEntry>(directoryBuffer, pos,
-                                                                        Marshal.SizeOf<DirectoryEntry>())
-                                                : Marshal.ByteArrayToStructureBigEndian<DirectoryEntry>(directoryBuffer,
-                                                    pos, Marshal.SizeOf<DirectoryEntry>());
-
-                    pos += Marshal.SizeOf<DirectoryEntry>();
-
-                    if(dirent.filenameSize == UNUSED_DIRENTRY ||
-                       dirent.filenameSize == FINISHED_DIRENTRY)
-                        break;
-
-                    if(dirent.filenameSize == DELETED_DIRENTRY ||
-                       dirent.filenameSize > MAX_FILENAME)
-                        continue;
-
-                    string filename = Encoding.GetString(dirent.filename, 0, dirent.filenameSize);
-
-                    currentDirectory.Add(filename, dirent);
-                }
-
-                _directoryCache.Add(currentPath, currentDirectory);
+                Array.Copy(buffer, 0, directoryBuffer, i * _bytesPerCluster, _bytesPerCluster);
             }
 
-            contents = currentDirectory?.Keys.ToList();
+            currentDirectory = new Dictionary<string, DirectoryEntry>();
 
-            return ErrorNumber.NoError;
+            int pos = 0;
+
+            while(pos < directoryBuffer.Length)
+            {
+                DirectoryEntry dirent = _littleEndian
+                                            ? Marshal.
+                                                ByteArrayToStructureLittleEndian<
+                                                    DirectoryEntry>(directoryBuffer, pos,
+                                                                    Marshal.SizeOf<DirectoryEntry>())
+                                            : Marshal.ByteArrayToStructureBigEndian<DirectoryEntry>(directoryBuffer,
+                                                pos, Marshal.SizeOf<DirectoryEntry>());
+
+                pos += Marshal.SizeOf<DirectoryEntry>();
+
+                if(dirent.filenameSize == UNUSED_DIRENTRY ||
+                   dirent.filenameSize == FINISHED_DIRENTRY)
+                    break;
+
+                if(dirent.filenameSize == DELETED_DIRENTRY ||
+                   dirent.filenameSize > MAX_FILENAME)
+                    continue;
+
+                string filename = Encoding.GetString(dirent.filename, 0, dirent.filenameSize);
+
+                currentDirectory.Add(filename, dirent);
+            }
+
+            _directoryCache.Add(currentPath, currentDirectory);
         }
+
+        contents = currentDirectory?.Keys.ToList();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FATX/FATX.cs b/Aaru.Filesystems/FATX/FATX.cs
index 00a94cf0f..2409f58c4 100644
--- a/Aaru.Filesystems/FATX/FATX.cs
+++ b/Aaru.Filesystems/FATX/FATX.cs
@@ -39,71 +39,70 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements the Xbox File Allocation Table (FATX or XTAF) filesystem.</summary>
+public sealed partial class XboxFatPlugin : IReadOnlyFilesystem
 {
+    uint                                                   _bytesPerCluster;
+    CultureInfo                                            _cultureInfo;
+    bool                                                   _debug;
+    Dictionary<string, Dictionary<string, DirectoryEntry>> _directoryCache;
+    ushort[]                                               _fat16;
+    uint[]                                                 _fat32;
+    ulong                                                  _fatStartSector;
+    ulong                                                  _firstClusterSector;
+    IMediaImage                                            _imagePlugin;
+    bool                                                   _littleEndian;
+    bool                                                   _mounted;
+    Dictionary<string, DirectoryEntry>                     _rootDirectory;
+    uint                                                   _sectorsPerCluster;
+    FileSystemInfo                                         _statfs;
+    Superblock                                             _superblock;
+
     /// <inheritdoc />
-    /// <summary>Implements the Xbox File Allocation Table (FATX or XTAF) filesystem.</summary>
-    public sealed partial class XboxFatPlugin : IReadOnlyFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "FATX Filesystem Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("ED27A721-4A17-4649-89FD-33633B46E228");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public ErrorNumber ListXAttr(string path, out List<string> xattrs)
     {
-        uint                                                   _bytesPerCluster;
-        CultureInfo                                            _cultureInfo;
-        bool                                                   _debug;
-        Dictionary<string, Dictionary<string, DirectoryEntry>> _directoryCache;
-        ushort[]                                               _fat16;
-        uint[]                                                 _fat32;
-        ulong                                                  _fatStartSector;
-        ulong                                                  _firstClusterSector;
-        IMediaImage                                            _imagePlugin;
-        bool                                                   _littleEndian;
-        bool                                                   _mounted;
-        Dictionary<string, DirectoryEntry>                     _rootDirectory;
-        uint                                                   _sectorsPerCluster;
-        FileSystemInfo                                         _statfs;
-        Superblock                                             _superblock;
+        xattrs = null;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "FATX Filesystem Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("ED27A721-4A17-4649-89FD-33633B46E228");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public ErrorNumber ListXAttr(string path, out List<string> xattrs)
-        {
-            xattrs = null;
-
-            return ErrorNumber.NotSupported;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf) => ErrorNumber.NotSupported;
-
-        /// <inheritdoc />
-        public ErrorNumber ReadLink(string path, out string dest)
-        {
-            dest = null;
-
-            return ErrorNumber.NotSupported;
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[]
-                {};
-
-        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => null;
-
-        static Dictionary<string, string> GetDefaultOptions() => new()
-        {
-            {
-                "debug", false.ToString()
-            }
-        };
+        return ErrorNumber.NotSupported;
     }
+
+    /// <inheritdoc />
+    public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf) => ErrorNumber.NotSupported;
+
+    /// <inheritdoc />
+    public ErrorNumber ReadLink(string path, out string dest)
+    {
+        dest = null;
+
+        return ErrorNumber.NotSupported;
+    }
+
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
+        new (string name, Type type, string description)[]
+            {};
+
+    /// <inheritdoc />
+    public Dictionary<string, string> Namespaces => null;
+
+    static Dictionary<string, string> GetDefaultOptions() => new()
+    {
+        {
+            "debug", false.ToString()
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FATX/File.cs b/Aaru.Filesystems/FATX/File.cs
index 7644f1a42..5ef30a65b 100644
--- a/Aaru.Filesystems/FATX/File.cs
+++ b/Aaru.Filesystems/FATX/File.cs
@@ -39,256 +39,255 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class XboxFatPlugin
 {
-    public sealed partial class XboxFatPlugin
+    /// <inheritdoc />
+    public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
     {
-        /// <inheritdoc />
-        public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
+        deviceBlock = 0;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = Stat(path, out FileEntryInfo stat);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
+           !_debug)
+            return ErrorNumber.IsDirectory;
+
+        uint[] clusters = GetClusters((uint)stat.Inode);
+
+        if(fileBlock >= clusters.Length)
+            return ErrorNumber.InvalidArgument;
+
+        deviceBlock = (long)(_firstClusterSector + ((clusters[fileBlock] - 1) * _sectorsPerCluster));
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+    {
+        attributes = new FileAttributes();
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = Stat(path, out FileEntryInfo stat);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        attributes = stat.Attributes;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = Stat(path, out FileEntryInfo stat);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
+           !_debug)
+            return ErrorNumber.IsDirectory;
+
+        if(offset >= stat.Length)
+            return ErrorNumber.InvalidArgument;
+
+        if(size + offset >= stat.Length)
+            size = stat.Length - offset;
+
+        uint[] clusters = GetClusters((uint)stat.Inode);
+
+        long firstCluster    = offset                   / _bytesPerCluster;
+        long offsetInCluster = offset                   % _bytesPerCluster;
+        long sizeInClusters  = (size + offsetInCluster) / _bytesPerCluster;
+
+        if((size + offsetInCluster) % _bytesPerCluster > 0)
+            sizeInClusters++;
+
+        var ms = new MemoryStream();
+
+        for(int i = 0; i < sizeInClusters; i++)
         {
-            deviceBlock = 0;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = Stat(path, out FileEntryInfo stat);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
-               !_debug)
-                return ErrorNumber.IsDirectory;
-
-            uint[] clusters = GetClusters((uint)stat.Inode);
-
-            if(fileBlock >= clusters.Length)
+            if(i + firstCluster >= clusters.Length)
                 return ErrorNumber.InvalidArgument;
 
-            deviceBlock = (long)(_firstClusterSector + ((clusters[fileBlock] - 1) * _sectorsPerCluster));
+            ErrorNumber errno =
+                _imagePlugin.
+                    ReadSectors(_firstClusterSector + ((clusters[i + firstCluster] - 1) * _sectorsPerCluster),
+                                _sectorsPerCluster, out byte[] buffer);
 
-            return ErrorNumber.NoError;
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(buffer, 0, buffer.Length);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+        ms.Position = offsetInCluster;
+        buf         = new byte[size];
+        ms.Read(buf, 0, (int)size);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Stat(string path, out FileEntryInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(_debug && (string.IsNullOrEmpty(path) || path == "$" || path == "/"))
         {
-            attributes = new FileAttributes();
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = Stat(path, out FileEntryInfo stat);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            attributes = stat.Attributes;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
-        {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = Stat(path, out FileEntryInfo stat);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
-               !_debug)
-                return ErrorNumber.IsDirectory;
-
-            if(offset >= stat.Length)
-                return ErrorNumber.InvalidArgument;
-
-            if(size + offset >= stat.Length)
-                size = stat.Length - offset;
-
-            uint[] clusters = GetClusters((uint)stat.Inode);
-
-            long firstCluster    = offset                   / _bytesPerCluster;
-            long offsetInCluster = offset                   % _bytesPerCluster;
-            long sizeInClusters  = (size + offsetInCluster) / _bytesPerCluster;
-
-            if((size + offsetInCluster) % _bytesPerCluster > 0)
-                sizeInClusters++;
-
-            var ms = new MemoryStream();
-
-            for(int i = 0; i < sizeInClusters; i++)
-            {
-                if(i + firstCluster >= clusters.Length)
-                    return ErrorNumber.InvalidArgument;
-
-                ErrorNumber errno =
-                    _imagePlugin.
-                        ReadSectors(_firstClusterSector + ((clusters[i + firstCluster] - 1) * _sectorsPerCluster),
-                                    _sectorsPerCluster, out byte[] buffer);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(buffer, 0, buffer.Length);
-            }
-
-            ms.Position = offsetInCluster;
-            buf         = new byte[size];
-            ms.Read(buf, 0, (int)size);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Stat(string path, out FileEntryInfo stat)
-        {
-            stat = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            if(_debug && (string.IsNullOrEmpty(path) || path == "$" || path == "/"))
-            {
-                stat = new FileEntryInfo
-                {
-                    Attributes = FileAttributes.Directory | FileAttributes.System | FileAttributes.Hidden,
-                    Blocks     = GetClusters(_superblock.rootDirectoryCluster).Length,
-                    BlockSize  = _bytesPerCluster,
-                    Length     = GetClusters(_superblock.rootDirectoryCluster).Length * _bytesPerCluster,
-                    Inode      = _superblock.rootDirectoryCluster,
-                    Links      = 1
-                };
-
-                return ErrorNumber.NoError;
-            }
-
-            ErrorNumber err = GetFileEntry(path, out DirectoryEntry entry);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
             stat = new FileEntryInfo
             {
-                Attributes = new FileAttributes(),
-                Blocks     = entry.length / _bytesPerCluster,
+                Attributes = FileAttributes.Directory | FileAttributes.System | FileAttributes.Hidden,
+                Blocks     = GetClusters(_superblock.rootDirectoryCluster).Length,
                 BlockSize  = _bytesPerCluster,
-                Length     = entry.length,
-                Inode      = entry.firstCluster,
-                Links      = 1,
-                CreationTime = _littleEndian
-                                   ? DateHandlers.DosToDateTime(entry.creationDate, entry.creationTime).AddYears(20)
-                                   : DateHandlers.DosToDateTime(entry.creationTime, entry.creationDate),
-                AccessTime = _littleEndian
-                                 ? DateHandlers.DosToDateTime(entry.lastAccessDate, entry.lastAccessTime).AddYears(20)
-                                 : DateHandlers.DosToDateTime(entry.lastAccessTime, entry.lastAccessDate),
-                LastWriteTime = _littleEndian
-                                    ? DateHandlers.DosToDateTime(entry.lastWrittenDate, entry.lastWrittenTime).
-                                                   AddYears(20)
-                                    : DateHandlers.DosToDateTime(entry.lastWrittenTime, entry.lastWrittenDate)
+                Length     = GetClusters(_superblock.rootDirectoryCluster).Length * _bytesPerCluster,
+                Inode      = _superblock.rootDirectoryCluster,
+                Links      = 1
             };
 
-            if(entry.length % _bytesPerCluster > 0)
-                stat.Blocks++;
-
-            if(entry.attributes.HasFlag(Attributes.Directory))
-            {
-                stat.Attributes |= FileAttributes.Directory;
-                stat.Blocks     =  GetClusters(entry.firstCluster).Length;
-                stat.Length     =  stat.Blocks * stat.BlockSize;
-            }
-
-            if(entry.attributes.HasFlag(Attributes.ReadOnly))
-                stat.Attributes |= FileAttributes.ReadOnly;
-
-            if(entry.attributes.HasFlag(Attributes.Hidden))
-                stat.Attributes |= FileAttributes.Hidden;
-
-            if(entry.attributes.HasFlag(Attributes.System))
-                stat.Attributes |= FileAttributes.System;
-
-            if(entry.attributes.HasFlag(Attributes.Archive))
-                stat.Attributes |= FileAttributes.Archive;
-
             return ErrorNumber.NoError;
         }
 
-        uint[] GetClusters(uint startCluster)
-        {
-            if(startCluster == 0)
-                return null;
+        ErrorNumber err = GetFileEntry(path, out DirectoryEntry entry);
 
-            if(_fat16 is null)
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        stat = new FileEntryInfo
+        {
+            Attributes = new FileAttributes(),
+            Blocks     = entry.length / _bytesPerCluster,
+            BlockSize  = _bytesPerCluster,
+            Length     = entry.length,
+            Inode      = entry.firstCluster,
+            Links      = 1,
+            CreationTime = _littleEndian
+                               ? DateHandlers.DosToDateTime(entry.creationDate, entry.creationTime).AddYears(20)
+                               : DateHandlers.DosToDateTime(entry.creationTime, entry.creationDate),
+            AccessTime = _littleEndian
+                             ? DateHandlers.DosToDateTime(entry.lastAccessDate, entry.lastAccessTime).AddYears(20)
+                             : DateHandlers.DosToDateTime(entry.lastAccessTime, entry.lastAccessDate),
+            LastWriteTime = _littleEndian
+                                ? DateHandlers.DosToDateTime(entry.lastWrittenDate, entry.lastWrittenTime).
+                                               AddYears(20)
+                                : DateHandlers.DosToDateTime(entry.lastWrittenTime, entry.lastWrittenDate)
+        };
+
+        if(entry.length % _bytesPerCluster > 0)
+            stat.Blocks++;
+
+        if(entry.attributes.HasFlag(Attributes.Directory))
+        {
+            stat.Attributes |= FileAttributes.Directory;
+            stat.Blocks     =  GetClusters(entry.firstCluster).Length;
+            stat.Length     =  stat.Blocks * stat.BlockSize;
+        }
+
+        if(entry.attributes.HasFlag(Attributes.ReadOnly))
+            stat.Attributes |= FileAttributes.ReadOnly;
+
+        if(entry.attributes.HasFlag(Attributes.Hidden))
+            stat.Attributes |= FileAttributes.Hidden;
+
+        if(entry.attributes.HasFlag(Attributes.System))
+            stat.Attributes |= FileAttributes.System;
+
+        if(entry.attributes.HasFlag(Attributes.Archive))
+            stat.Attributes |= FileAttributes.Archive;
+
+        return ErrorNumber.NoError;
+    }
+
+    uint[] GetClusters(uint startCluster)
+    {
+        if(startCluster == 0)
+            return null;
+
+        if(_fat16 is null)
+        {
+            if(startCluster >= _fat32.Length)
+                return null;
+        }
+        else if(startCluster >= _fat16.Length)
+            return null;
+
+        List<uint> clusters = new();
+
+        uint nextCluster = startCluster;
+
+        if(_fat16 is null)
+            while((nextCluster & FAT32_MASK) > 0 &&
+                  (nextCluster & FAT32_MASK) <= FAT32_RESERVED)
             {
-                if(startCluster >= _fat32.Length)
-                    return null;
+                clusters.Add(nextCluster);
+                nextCluster = _fat32[nextCluster];
             }
-            else if(startCluster >= _fat16.Length)
-                return null;
-
-            List<uint> clusters = new();
-
-            uint nextCluster = startCluster;
-
-            if(_fat16 is null)
-                while((nextCluster & FAT32_MASK) > 0 &&
-                      (nextCluster & FAT32_MASK) <= FAT32_RESERVED)
-                {
-                    clusters.Add(nextCluster);
-                    nextCluster = _fat32[nextCluster];
-                }
-            else
-                while(nextCluster > 0 &&
-                      nextCluster <= FAT16_RESERVED)
-                {
-                    clusters.Add(nextCluster);
-                    nextCluster = _fat16[nextCluster];
-                }
-
-            return clusters.ToArray();
-        }
-
-        ErrorNumber GetFileEntry(string path, out DirectoryEntry entry)
-        {
-            entry = new DirectoryEntry();
-
-            string cutPath = path.StartsWith('/') ? path.Substring(1).ToLower(_cultureInfo)
-                                 : path.ToLower(_cultureInfo);
-
-            string[] pieces = cutPath.Split(new[]
+        else
+            while(nextCluster > 0 &&
+                  nextCluster <= FAT16_RESERVED)
             {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+                clusters.Add(nextCluster);
+                nextCluster = _fat16[nextCluster];
+            }
 
-            if(pieces.Length == 0)
-                return ErrorNumber.InvalidArgument;
+        return clusters.ToArray();
+    }
 
-            string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
+    ErrorNumber GetFileEntry(string path, out DirectoryEntry entry)
+    {
+        entry = new DirectoryEntry();
 
-            ErrorNumber err = ReadDir(parentPath, out _);
+        string cutPath = path.StartsWith('/') ? path.Substring(1).ToLower(_cultureInfo)
+                             : path.ToLower(_cultureInfo);
 
-            if(err != ErrorNumber.NoError)
-                return err;
+        string[] pieces = cutPath.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            Dictionary<string, DirectoryEntry> parent;
+        if(pieces.Length == 0)
+            return ErrorNumber.InvalidArgument;
 
-            if(pieces.Length == 1)
-                parent = _rootDirectory;
-            else if(!_directoryCache.TryGetValue(parentPath, out parent))
-                return ErrorNumber.InvalidArgument;
+        string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
 
-            KeyValuePair<string, DirectoryEntry> dirent =
-                parent.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[^1]);
+        ErrorNumber err = ReadDir(parentPath, out _);
 
-            if(string.IsNullOrEmpty(dirent.Key))
-                return ErrorNumber.NoSuchFile;
+        if(err != ErrorNumber.NoError)
+            return err;
 
-            entry = dirent.Value;
+        Dictionary<string, DirectoryEntry> parent;
 
-            return ErrorNumber.NoError;
-        }
+        if(pieces.Length == 1)
+            parent = _rootDirectory;
+        else if(!_directoryCache.TryGetValue(parentPath, out parent))
+            return ErrorNumber.InvalidArgument;
+
+        KeyValuePair<string, DirectoryEntry> dirent =
+            parent.FirstOrDefault(t => t.Key.ToLower(_cultureInfo) == pieces[^1]);
+
+        if(string.IsNullOrEmpty(dirent.Key))
+            return ErrorNumber.NoSuchFile;
+
+        entry = dirent.Value;
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FATX/Info.cs b/Aaru.Filesystems/FATX/Info.cs
index 5ff4bc0aa..fd7cbb99a 100644
--- a/Aaru.Filesystems/FATX/Info.cs
+++ b/Aaru.Filesystems/FATX/Info.cs
@@ -37,89 +37,88 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class XboxFatPlugin
 {
-    public sealed partial class XboxFatPlugin
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        Superblock sb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
+
+        return sb.magic == FATX_MAGIC || sb.magic == FATX_CIGAM;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = Encoding.UTF8;
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        bool bigEndian = true;
+
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        Superblock fatxSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
+
+        if(fatxSb.magic == FATX_CIGAM)
         {
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            Superblock sb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
-
-            return sb.magic == FATX_MAGIC || sb.magic == FATX_CIGAM;
+            fatxSb    = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+            bigEndian = false;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        if(fatxSb.magic != FATX_MAGIC)
+            return;
+
+        int logicalSectorsPerPhysicalSectors = partition.Offset == 0 && !bigEndian ? 8 : 1;
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("FATX filesystem");
+
+        sb.AppendFormat("{0} logical sectors ({1} bytes) per physical sector", logicalSectorsPerPhysicalSectors,
+                        logicalSectorsPerPhysicalSectors * imagePlugin.Info.SectorSize).AppendLine();
+
+        sb.AppendFormat("{0} sectors ({1} bytes) per cluster", fatxSb.sectorsPerCluster,
+                        fatxSb.sectorsPerCluster * logicalSectorsPerPhysicalSectors * imagePlugin.Info.SectorSize).
+           AppendLine();
+
+        sb.AppendFormat("Root directory starts on cluster {0}", fatxSb.rootDirectoryCluster).AppendLine();
+
+        string volumeLabel = StringHandlers.CToString(fatxSb.volumeLabel,
+                                                      bigEndian ? Encoding.BigEndianUnicode : Encoding.Unicode,
+                                                      true);
+
+        sb.AppendFormat("Volume label: {0}", volumeLabel).AppendLine();
+        sb.AppendFormat("Volume serial: {0:X8}", fatxSb.id).AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            Encoding    = Encoding.UTF8;
-            information = "";
+            Type = "FATX filesystem",
+            ClusterSize = (uint)(fatxSb.sectorsPerCluster * logicalSectorsPerPhysicalSectors *
+                                 imagePlugin.Info.SectorSize),
+            VolumeName   = volumeLabel,
+            VolumeSerial = $"{fatxSb.id:X8}"
+        };
 
-            if(imagePlugin.Info.SectorSize < 512)
-                return;
-
-            bool bigEndian = true;
-
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            Superblock fatxSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
-
-            if(fatxSb.magic == FATX_CIGAM)
-            {
-                fatxSb    = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-                bigEndian = false;
-            }
-
-            if(fatxSb.magic != FATX_MAGIC)
-                return;
-
-            int logicalSectorsPerPhysicalSectors = partition.Offset == 0 && !bigEndian ? 8 : 1;
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine("FATX filesystem");
-
-            sb.AppendFormat("{0} logical sectors ({1} bytes) per physical sector", logicalSectorsPerPhysicalSectors,
-                            logicalSectorsPerPhysicalSectors * imagePlugin.Info.SectorSize).AppendLine();
-
-            sb.AppendFormat("{0} sectors ({1} bytes) per cluster", fatxSb.sectorsPerCluster,
-                            fatxSb.sectorsPerCluster * logicalSectorsPerPhysicalSectors * imagePlugin.Info.SectorSize).
-               AppendLine();
-
-            sb.AppendFormat("Root directory starts on cluster {0}", fatxSb.rootDirectoryCluster).AppendLine();
-
-            string volumeLabel = StringHandlers.CToString(fatxSb.volumeLabel,
-                                                          bigEndian ? Encoding.BigEndianUnicode : Encoding.Unicode,
-                                                          true);
-
-            sb.AppendFormat("Volume label: {0}", volumeLabel).AppendLine();
-            sb.AppendFormat("Volume serial: {0:X8}", fatxSb.id).AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type = "FATX filesystem",
-                ClusterSize = (uint)(fatxSb.sectorsPerCluster * logicalSectorsPerPhysicalSectors *
-                                     imagePlugin.Info.SectorSize),
-                VolumeName   = volumeLabel,
-                VolumeSerial = $"{fatxSb.id:X8}"
-            };
-
-            XmlFsType.Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
-                                 XmlFsType.ClusterSize;
-        }
+        XmlFsType.Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
+                             XmlFsType.ClusterSize;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FATX/Structs.cs b/Aaru.Filesystems/FATX/Structs.cs
index baa524fc0..4a2c72ef6 100644
--- a/Aaru.Filesystems/FATX/Structs.cs
+++ b/Aaru.Filesystems/FATX/Structs.cs
@@ -32,38 +32,37 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class XboxFatPlugin
 {
-    public sealed partial class XboxFatPlugin
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Superblock
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Superblock
-        {
-            public readonly uint magic;
-            public readonly uint id;
-            public readonly uint sectorsPerCluster;
-            public readonly uint rootDirectoryCluster;
+        public readonly uint magic;
+        public readonly uint id;
+        public readonly uint sectorsPerCluster;
+        public readonly uint rootDirectoryCluster;
 
-            // TODO: Undetermined size
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] volumeLabel;
-        }
+        // TODO: Undetermined size
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] volumeLabel;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryEntry
-        {
-            public readonly byte       filenameSize;
-            public readonly Attributes attributes;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_FILENAME)]
-            public readonly byte[] filename;
-            public readonly uint   firstCluster;
-            public readonly uint   length;
-            public readonly ushort lastWrittenTime;
-            public readonly ushort lastWrittenDate;
-            public readonly ushort lastAccessTime;
-            public readonly ushort lastAccessDate;
-            public readonly ushort creationTime;
-            public readonly ushort creationDate;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryEntry
+    {
+        public readonly byte       filenameSize;
+        public readonly Attributes attributes;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_FILENAME)]
+        public readonly byte[] filename;
+        public readonly uint   firstCluster;
+        public readonly uint   length;
+        public readonly ushort lastWrittenTime;
+        public readonly ushort lastWrittenDate;
+        public readonly ushort lastAccessTime;
+        public readonly ushort lastAccessDate;
+        public readonly ushort creationTime;
+        public readonly ushort creationDate;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FATX/Super.cs b/Aaru.Filesystems/FATX/Super.cs
index 7df615489..bd15579ad 100644
--- a/Aaru.Filesystems/FATX/Super.cs
+++ b/Aaru.Filesystems/FATX/Super.cs
@@ -44,259 +44,258 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class XboxFatPlugin
 {
-    public sealed partial class XboxFatPlugin
+    /// <inheritdoc />
+    public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                             Dictionary<string, string> options, string @namespace)
     {
-        /// <inheritdoc />
-        public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
-                                 Dictionary<string, string> options, string @namespace)
+        Encoding      = Encoding.GetEncoding("iso-8859-15");
+        _littleEndian = true;
+
+        options ??= GetDefaultOptions();
+
+        if(options.TryGetValue("debug", out string debugString))
+            bool.TryParse(debugString, out _debug);
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return ErrorNumber.InvalidArgument;
+
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading superblock");
+
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        _superblock = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        if(_superblock.magic == FATX_CIGAM)
         {
-            Encoding      = Encoding.GetEncoding("iso-8859-15");
-            _littleEndian = true;
+            _superblock   = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
+            _littleEndian = false;
+        }
 
-            options ??= GetDefaultOptions();
+        if(_superblock.magic != FATX_MAGIC)
+            return ErrorNumber.InvalidArgument;
 
-            if(options.TryGetValue("debug", out string debugString))
-                bool.TryParse(debugString, out _debug);
+        AaruConsole.DebugWriteLine("Xbox FAT plugin",
+                                   _littleEndian ? "Filesystem is little endian" : "Filesystem is big endian");
 
-            if(imagePlugin.Info.SectorSize < 512)
-                return ErrorNumber.InvalidArgument;
+        int logicalSectorsPerPhysicalSectors = partition.Offset == 0 && _littleEndian ? 8 : 1;
 
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading superblock");
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "logicalSectorsPerPhysicalSectors = {0}",
+                                   logicalSectorsPerPhysicalSectors);
 
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+        string volumeLabel = StringHandlers.CToString(_superblock.volumeLabel,
+                                                      !_littleEndian ? Encoding.BigEndianUnicode : Encoding.Unicode,
+                                                      true);
+
+        XmlFsType = new FileSystemType
+        {
+            Type = "FATX filesystem",
+            ClusterSize = (uint)(_superblock.sectorsPerCluster * logicalSectorsPerPhysicalSectors *
+                                 imagePlugin.Info.SectorSize),
+            VolumeName   = volumeLabel,
+            VolumeSerial = $"{_superblock.id:X8}"
+        };
+
+        XmlFsType.Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
+                             XmlFsType.ClusterSize;
+
+        _statfs = new FileSystemInfo
+        {
+            Blocks         = XmlFsType.Clusters,
+            FilenameLength = MAX_FILENAME,
+            Files          = 0, // Requires traversing all directories
+            FreeFiles      = 0,
+            Id =
+            {
+                IsInt    = true,
+                Serial32 = _superblock.magic
+            },
+            PluginId   = Id,
+            Type       = _littleEndian ? "Xbox FAT" : "Xbox 360 FAT",
+            FreeBlocks = 0 // Requires traversing the FAT
+        };
+
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.ClusterSize: {0}", XmlFsType.ClusterSize);
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.VolumeName: {0}", XmlFsType.VolumeName);
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.VolumeSerial: {0}", XmlFsType.VolumeSerial);
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Blocks: {0}", _statfs.Blocks);
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.FilenameLength: {0}", _statfs.FilenameLength);
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Id: {0}", _statfs.Id.Serial32);
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Type: {0}", _statfs.Type);
+
+        byte[] buffer;
+        _fatStartSector = (FAT_START / imagePlugin.Info.SectorSize) + partition.Start;
+        uint fatSize;
+
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "fatStartSector: {0}", _fatStartSector);
+
+        if(_statfs.Blocks > MAX_XFAT16_CLUSTERS)
+        {
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading FAT32");
+
+            fatSize = (uint)((_statfs.Blocks + 1) * sizeof(uint) / imagePlugin.Info.SectorSize);
+
+            if((uint)((_statfs.Blocks + 1) * sizeof(uint) % imagePlugin.Info.SectorSize) > 0)
+                fatSize++;
+
+            long fatClusters = fatSize * imagePlugin.Info.SectorSize / 4096;
+
+            if(fatSize * imagePlugin.Info.SectorSize % 4096 > 0)
+                fatClusters++;
+
+            fatSize = (uint)(fatClusters * 4096 / imagePlugin.Info.SectorSize);
+
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "FAT is {0} sectors", fatSize);
+
+            errno = imagePlugin.ReadSectors(_fatStartSector, fatSize, out buffer);
 
             if(errno != ErrorNumber.NoError)
                 return errno;
 
-            _superblock = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "Casting FAT");
+            _fat32 = MemoryMarshal.Cast<byte, uint>(buffer).ToArray();
 
-            if(_superblock.magic == FATX_CIGAM)
-            {
-                _superblock   = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
-                _littleEndian = false;
-            }
+            if(!_littleEndian)
+                for(int i = 0; i < _fat32.Length; i++)
+                    _fat32[i] = Swapping.Swap(_fat32[i]);
 
-            if(_superblock.magic != FATX_MAGIC)
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "fat32[0] == FATX32_ID = {0}", _fat32[0] == FATX32_ID);
+
+            if(_fat32[0] != FATX32_ID)
                 return ErrorNumber.InvalidArgument;
+        }
+        else
+        {
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading FAT16");
 
-            AaruConsole.DebugWriteLine("Xbox FAT plugin",
-                                       _littleEndian ? "Filesystem is little endian" : "Filesystem is big endian");
+            fatSize = (uint)((_statfs.Blocks + 1) * sizeof(ushort) / imagePlugin.Info.SectorSize);
 
-            int logicalSectorsPerPhysicalSectors = partition.Offset == 0 && _littleEndian ? 8 : 1;
+            if((uint)((_statfs.Blocks + 1) * sizeof(ushort) % imagePlugin.Info.SectorSize) > 0)
+                fatSize++;
 
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "logicalSectorsPerPhysicalSectors = {0}",
-                                       logicalSectorsPerPhysicalSectors);
+            long fatClusters = fatSize * imagePlugin.Info.SectorSize / 4096;
 
-            string volumeLabel = StringHandlers.CToString(_superblock.volumeLabel,
-                                                          !_littleEndian ? Encoding.BigEndianUnicode : Encoding.Unicode,
-                                                          true);
+            if(fatSize * imagePlugin.Info.SectorSize % 4096 > 0)
+                fatClusters++;
 
-            XmlFsType = new FileSystemType
-            {
-                Type = "FATX filesystem",
-                ClusterSize = (uint)(_superblock.sectorsPerCluster * logicalSectorsPerPhysicalSectors *
-                                     imagePlugin.Info.SectorSize),
-                VolumeName   = volumeLabel,
-                VolumeSerial = $"{_superblock.id:X8}"
-            };
+            fatSize = (uint)(fatClusters * 4096 / imagePlugin.Info.SectorSize);
 
-            XmlFsType.Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
-                                 XmlFsType.ClusterSize;
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "FAT is {0} sectors", fatSize);
 
-            _statfs = new FileSystemInfo
-            {
-                Blocks         = XmlFsType.Clusters,
-                FilenameLength = MAX_FILENAME,
-                Files          = 0, // Requires traversing all directories
-                FreeFiles      = 0,
-                Id =
-                {
-                    IsInt    = true,
-                    Serial32 = _superblock.magic
-                },
-                PluginId   = Id,
-                Type       = _littleEndian ? "Xbox FAT" : "Xbox 360 FAT",
-                FreeBlocks = 0 // Requires traversing the FAT
-            };
+            errno = imagePlugin.ReadSectors(_fatStartSector, fatSize, out buffer);
 
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.ClusterSize: {0}", XmlFsType.ClusterSize);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.VolumeName: {0}", XmlFsType.VolumeName);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "XmlFsType.VolumeSerial: {0}", XmlFsType.VolumeSerial);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Blocks: {0}", _statfs.Blocks);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.FilenameLength: {0}", _statfs.FilenameLength);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Id: {0}", _statfs.Id.Serial32);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "stat.Type: {0}", _statfs.Type);
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            byte[] buffer;
-            _fatStartSector = (FAT_START / imagePlugin.Info.SectorSize) + partition.Start;
-            uint fatSize;
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "Casting FAT");
+            _fat16 = MemoryMarshal.Cast<byte, ushort>(buffer).ToArray();
 
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "fatStartSector: {0}", _fatStartSector);
+            if(!_littleEndian)
+                for(int i = 0; i < _fat16.Length; i++)
+                    _fat16[i] = Swapping.Swap(_fat16[i]);
 
-            if(_statfs.Blocks > MAX_XFAT16_CLUSTERS)
-            {
-                AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading FAT32");
+            AaruConsole.DebugWriteLine("Xbox FAT plugin", "fat16[0] == FATX16_ID = {0}", _fat16[0] == FATX16_ID);
 
-                fatSize = (uint)((_statfs.Blocks + 1) * sizeof(uint) / imagePlugin.Info.SectorSize);
-
-                if((uint)((_statfs.Blocks + 1) * sizeof(uint) % imagePlugin.Info.SectorSize) > 0)
-                    fatSize++;
-
-                long fatClusters = fatSize * imagePlugin.Info.SectorSize / 4096;
-
-                if(fatSize * imagePlugin.Info.SectorSize % 4096 > 0)
-                    fatClusters++;
-
-                fatSize = (uint)(fatClusters * 4096 / imagePlugin.Info.SectorSize);
-
-                AaruConsole.DebugWriteLine("Xbox FAT plugin", "FAT is {0} sectors", fatSize);
-
-                errno = imagePlugin.ReadSectors(_fatStartSector, fatSize, out buffer);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                AaruConsole.DebugWriteLine("Xbox FAT plugin", "Casting FAT");
-                _fat32 = MemoryMarshal.Cast<byte, uint>(buffer).ToArray();
-
-                if(!_littleEndian)
-                    for(int i = 0; i < _fat32.Length; i++)
-                        _fat32[i] = Swapping.Swap(_fat32[i]);
-
-                AaruConsole.DebugWriteLine("Xbox FAT plugin", "fat32[0] == FATX32_ID = {0}", _fat32[0] == FATX32_ID);
-
-                if(_fat32[0] != FATX32_ID)
-                    return ErrorNumber.InvalidArgument;
-            }
-            else
-            {
-                AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading FAT16");
-
-                fatSize = (uint)((_statfs.Blocks + 1) * sizeof(ushort) / imagePlugin.Info.SectorSize);
-
-                if((uint)((_statfs.Blocks + 1) * sizeof(ushort) % imagePlugin.Info.SectorSize) > 0)
-                    fatSize++;
-
-                long fatClusters = fatSize * imagePlugin.Info.SectorSize / 4096;
-
-                if(fatSize * imagePlugin.Info.SectorSize % 4096 > 0)
-                    fatClusters++;
-
-                fatSize = (uint)(fatClusters * 4096 / imagePlugin.Info.SectorSize);
-
-                AaruConsole.DebugWriteLine("Xbox FAT plugin", "FAT is {0} sectors", fatSize);
-
-                errno = imagePlugin.ReadSectors(_fatStartSector, fatSize, out buffer);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                AaruConsole.DebugWriteLine("Xbox FAT plugin", "Casting FAT");
-                _fat16 = MemoryMarshal.Cast<byte, ushort>(buffer).ToArray();
-
-                if(!_littleEndian)
-                    for(int i = 0; i < _fat16.Length; i++)
-                        _fat16[i] = Swapping.Swap(_fat16[i]);
-
-                AaruConsole.DebugWriteLine("Xbox FAT plugin", "fat16[0] == FATX16_ID = {0}", _fat16[0] == FATX16_ID);
-
-                if(_fat16[0] != FATX16_ID)
-                    return ErrorNumber.InvalidArgument;
-            }
-
-            _sectorsPerCluster  = (uint)(_superblock.sectorsPerCluster * logicalSectorsPerPhysicalSectors);
-            _imagePlugin        = imagePlugin;
-            _firstClusterSector = _fatStartSector + fatSize;
-            _bytesPerCluster    = _sectorsPerCluster * imagePlugin.Info.SectorSize;
-
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "sectorsPerCluster = {0}", _sectorsPerCluster);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "bytesPerCluster = {0}", _bytesPerCluster);
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "firstClusterSector = {0}", _firstClusterSector);
-
-            uint[] rootDirectoryClusters = GetClusters(_superblock.rootDirectoryCluster);
-
-            if(rootDirectoryClusters is null)
+            if(_fat16[0] != FATX16_ID)
                 return ErrorNumber.InvalidArgument;
-
-            byte[] rootDirectoryBuffer = new byte[_bytesPerCluster * rootDirectoryClusters.Length];
-
-            AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading root directory");
-
-            for(int i = 0; i < rootDirectoryClusters.Length; i++)
-            {
-                errno =
-                    imagePlugin.ReadSectors(_firstClusterSector + ((rootDirectoryClusters[i] - 1) * _sectorsPerCluster),
-                                            _sectorsPerCluster, out buffer);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                Array.Copy(buffer, 0, rootDirectoryBuffer, i * _bytesPerCluster, _bytesPerCluster);
-            }
-
-            _rootDirectory = new Dictionary<string, DirectoryEntry>();
-
-            int pos = 0;
-
-            while(pos < rootDirectoryBuffer.Length)
-            {
-                DirectoryEntry entry = _littleEndian
-                                           ? Marshal.
-                                               ByteArrayToStructureLittleEndian<
-                                                   DirectoryEntry>(rootDirectoryBuffer, pos,
-                                                                   Marshal.SizeOf<DirectoryEntry>())
-                                           : Marshal.ByteArrayToStructureBigEndian<DirectoryEntry>(rootDirectoryBuffer,
-                                               pos, Marshal.SizeOf<DirectoryEntry>());
-
-                pos += Marshal.SizeOf<DirectoryEntry>();
-
-                if(entry.filenameSize == UNUSED_DIRENTRY ||
-                   entry.filenameSize == FINISHED_DIRENTRY)
-                    break;
-
-                if(entry.filenameSize == DELETED_DIRENTRY ||
-                   entry.filenameSize > MAX_FILENAME)
-                    continue;
-
-                string filename = Encoding.GetString(entry.filename, 0, entry.filenameSize);
-
-                _rootDirectory.Add(filename, entry);
-            }
-
-            _cultureInfo    = new CultureInfo("en-US", false);
-            _directoryCache = new Dictionary<string, Dictionary<string, DirectoryEntry>>();
-            _mounted        = true;
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Unmount()
+        _sectorsPerCluster  = (uint)(_superblock.sectorsPerCluster * logicalSectorsPerPhysicalSectors);
+        _imagePlugin        = imagePlugin;
+        _firstClusterSector = _fatStartSector + fatSize;
+        _bytesPerCluster    = _sectorsPerCluster * imagePlugin.Info.SectorSize;
+
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "sectorsPerCluster = {0}", _sectorsPerCluster);
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "bytesPerCluster = {0}", _bytesPerCluster);
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "firstClusterSector = {0}", _firstClusterSector);
+
+        uint[] rootDirectoryClusters = GetClusters(_superblock.rootDirectoryCluster);
+
+        if(rootDirectoryClusters is null)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] rootDirectoryBuffer = new byte[_bytesPerCluster * rootDirectoryClusters.Length];
+
+        AaruConsole.DebugWriteLine("Xbox FAT plugin", "Reading root directory");
+
+        for(int i = 0; i < rootDirectoryClusters.Length; i++)
         {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            errno =
+                imagePlugin.ReadSectors(_firstClusterSector + ((rootDirectoryClusters[i] - 1) * _sectorsPerCluster),
+                                        _sectorsPerCluster, out buffer);
 
-            _fat16       = null;
-            _fat32       = null;
-            _imagePlugin = null;
-            _mounted     = false;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            return ErrorNumber.NoError;
+            Array.Copy(buffer, 0, rootDirectoryBuffer, i * _bytesPerCluster, _bytesPerCluster);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber StatFs(out FileSystemInfo stat)
+        _rootDirectory = new Dictionary<string, DirectoryEntry>();
+
+        int pos = 0;
+
+        while(pos < rootDirectoryBuffer.Length)
         {
-            stat = null;
+            DirectoryEntry entry = _littleEndian
+                                       ? Marshal.
+                                           ByteArrayToStructureLittleEndian<
+                                               DirectoryEntry>(rootDirectoryBuffer, pos,
+                                                               Marshal.SizeOf<DirectoryEntry>())
+                                       : Marshal.ByteArrayToStructureBigEndian<DirectoryEntry>(rootDirectoryBuffer,
+                                           pos, Marshal.SizeOf<DirectoryEntry>());
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            pos += Marshal.SizeOf<DirectoryEntry>();
 
-            stat = _statfs.ShallowCopy();
+            if(entry.filenameSize == UNUSED_DIRENTRY ||
+               entry.filenameSize == FINISHED_DIRENTRY)
+                break;
 
-            return ErrorNumber.NoError;
+            if(entry.filenameSize == DELETED_DIRENTRY ||
+               entry.filenameSize > MAX_FILENAME)
+                continue;
+
+            string filename = Encoding.GetString(entry.filename, 0, entry.filenameSize);
+
+            _rootDirectory.Add(filename, entry);
         }
+
+        _cultureInfo    = new CultureInfo("en-US", false);
+        _directoryCache = new Dictionary<string, Dictionary<string, DirectoryEntry>>();
+        _mounted        = true;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Unmount()
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        _fat16       = null;
+        _fat32       = null;
+        _imagePlugin = null;
+        _mounted     = false;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber StatFs(out FileSystemInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        stat = _statfs.ShallowCopy();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/FFS.cs b/Aaru.Filesystems/FFS.cs
index 3e8a61d7a..f41f8584e 100644
--- a/Aaru.Filesystems/FFS.cs
+++ b/Aaru.Filesystems/FFS.cs
@@ -45,827 +45,826 @@ using Marshal = Aaru.Helpers.Marshal;
 using time_t = System.Int32;
 using ufs_daddr_t = System.Int32;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Using information from Linux kernel headers
+/// <inheritdoc />
+/// <summary>Implements detection of BSD Fast File System (FFS, aka UNIX File System)</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed class FFSPlugin : IFilesystem
 {
-    // Using information from Linux kernel headers
+    const uint block_size = 8192;
+
+    // FreeBSD specifies starts at byte offsets 0, 8192, 65536 and 262144, but in other cases it's following sectors
+    // Without bootcode
+    const ulong sb_start_floppy = 0;
+
+    // With bootcode
+    const ulong sb_start_boot = 1;
+
+    // Dunno, longer boot code
+    const ulong sb_start_long_boot = 8;
+
+    // Found on AT&T for MD-2D floppieslzio
+    const ulong sb_start_att_dsdd = 14;
+
+    // Found on hard disks (Atari UNIX e.g.)
+    const ulong sb_start_piggy = 32;
+
+    // MAGICs
+    // UFS magic
+    const uint UFS_MAGIC = 0x00011954;
+
+    // Big-endian UFS magic
+    const uint UFS_CIGAM = 0x54190100;
+
+    // BorderWare UFS
+    const uint UFS_MAGIC_BW = 0x0F242697;
+
+    // Big-endian BorderWare UFS
+    const uint UFS_CIGAM_BW = 0x9726240F;
+
+    // UFS2 magic
+    const uint UFS2_MAGIC = 0x19540119;
+
+    // Big-endian UFS2 magic
+    const uint UFS2_CIGAM = 0x19015419;
+
+    // Incomplete newfs
+    const uint UFS_BAD_MAGIC = 0x19960408;
+
+    // Big-endian incomplete newfs
+    const uint UFS_BAD_CIGAM = 0x08049619;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of BSD Fast File System (FFS, aka UNIX File System)</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed class FFSPlugin : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "BSD Fast File System (aka UNIX File System, UFS)";
+    /// <inheritdoc />
+    public Guid Id => new("CC90D342-05DB-48A8-988C-C1FE000034A3");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint block_size = 8192;
+        if(2 + partition.Start >= partition.End)
+            return false;
 
-        // FreeBSD specifies starts at byte offsets 0, 8192, 65536 and 262144, but in other cases it's following sectors
-        // Without bootcode
-        const ulong sb_start_floppy = 0;
+        uint sbSizeInSectors;
 
-        // With bootcode
-        const ulong sb_start_boot = 1;
+        if(imagePlugin.Info.SectorSize == 2336 ||
+           imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448)
+            sbSizeInSectors = block_size / 2048;
+        else
+            sbSizeInSectors = block_size / imagePlugin.Info.SectorSize;
 
-        // Dunno, longer boot code
-        const ulong sb_start_long_boot = 8;
-
-        // Found on AT&T for MD-2D floppieslzio
-        const ulong sb_start_att_dsdd = 14;
-
-        // Found on hard disks (Atari UNIX e.g.)
-        const ulong sb_start_piggy = 32;
-
-        // MAGICs
-        // UFS magic
-        const uint UFS_MAGIC = 0x00011954;
-
-        // Big-endian UFS magic
-        const uint UFS_CIGAM = 0x54190100;
-
-        // BorderWare UFS
-        const uint UFS_MAGIC_BW = 0x0F242697;
-
-        // Big-endian BorderWare UFS
-        const uint UFS_CIGAM_BW = 0x9726240F;
-
-        // UFS2 magic
-        const uint UFS2_MAGIC = 0x19540119;
-
-        // Big-endian UFS2 magic
-        const uint UFS2_CIGAM = 0x19015419;
-
-        // Incomplete newfs
-        const uint UFS_BAD_MAGIC = 0x19960408;
-
-        // Big-endian incomplete newfs
-        const uint UFS_BAD_CIGAM = 0x08049619;
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "BSD Fast File System (aka UNIX File System, UFS)";
-        /// <inheritdoc />
-        public Guid Id => new("CC90D342-05DB-48A8-988C-C1FE000034A3");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ulong[] locations =
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
+            sb_start_floppy, sb_start_boot, sb_start_long_boot, sb_start_piggy, sb_start_att_dsdd,
+            8192   / imagePlugin.Info.SectorSize, 65536 / imagePlugin.Info.SectorSize,
+            262144 / imagePlugin.Info.SectorSize
+        };
 
-            uint sbSizeInSectors;
-
-            if(imagePlugin.Info.SectorSize == 2336 ||
-               imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448)
-                sbSizeInSectors = block_size / 2048;
-            else
-                sbSizeInSectors = block_size / imagePlugin.Info.SectorSize;
-
-            ulong[] locations =
+        try
+        {
+            foreach(ulong loc in locations)
             {
-                sb_start_floppy, sb_start_boot, sb_start_long_boot, sb_start_piggy, sb_start_att_dsdd,
-                8192   / imagePlugin.Info.SectorSize, 65536 / imagePlugin.Info.SectorSize,
-                262144 / imagePlugin.Info.SectorSize
-            };
-
-            try
-            {
-                foreach(ulong loc in locations)
+                if(partition.End > partition.Start + loc + sbSizeInSectors)
                 {
-                    if(partition.End > partition.Start + loc + sbSizeInSectors)
-                    {
-                        ErrorNumber errno =
-                            imagePlugin.ReadSectors(partition.Start + loc, sbSizeInSectors, out byte[] ufsSbSectors);
+                    ErrorNumber errno =
+                        imagePlugin.ReadSectors(partition.Start + loc, sbSizeInSectors, out byte[] ufsSbSectors);
 
-                        if(errno != ErrorNumber.NoError)
-                            continue;
+                    if(errno != ErrorNumber.NoError)
+                        continue;
 
-                        uint magic = BitConverter.ToUInt32(ufsSbSectors, 0x055C);
+                    uint magic = BitConverter.ToUInt32(ufsSbSectors, 0x055C);
 
-                        if(magic == UFS_MAGIC     ||
-                           magic == UFS_CIGAM     ||
-                           magic == UFS_MAGIC_BW  ||
-                           magic == UFS_CIGAM_BW  ||
-                           magic == UFS2_MAGIC    ||
-                           magic == UFS2_CIGAM    ||
-                           magic == UFS_BAD_MAGIC ||
-                           magic == UFS_BAD_CIGAM)
-                            return true;
-                    }
+                    if(magic == UFS_MAGIC     ||
+                       magic == UFS_CIGAM     ||
+                       magic == UFS_MAGIC_BW  ||
+                       magic == UFS_CIGAM_BW  ||
+                       magic == UFS2_MAGIC    ||
+                       magic == UFS2_CIGAM    ||
+                       magic == UFS_BAD_MAGIC ||
+                       magic == UFS_BAD_CIGAM)
+                        return true;
                 }
+            }
 
-                return false;
-            }
-            catch(Exception)
-            {
-                return false;
-            }
+            return false;
         }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        catch(Exception)
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-            var sbInformation = new StringBuilder();
-
-            uint   magic = 0;
-            uint   sb_size_in_sectors;
-            byte[] ufs_sb_sectors;
-            ulong  sb_offset     = partition.Start;
-            bool   fs_type_42bsd = false;
-            bool   fs_type_43bsd = false;
-            bool   fs_type_44bsd = false;
-            bool   fs_type_ufs   = false;
-            bool   fs_type_ufs2  = false;
-            bool   fs_type_sun   = false;
-            bool   fs_type_sun86 = false;
-
-            if(imagePlugin.Info.SectorSize == 2336 ||
-               imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448)
-                sb_size_in_sectors = block_size / 2048;
-            else
-                sb_size_in_sectors = block_size / imagePlugin.Info.SectorSize;
-
-            ulong[] locations =
-            {
-                sb_start_floppy, sb_start_boot, sb_start_long_boot, sb_start_piggy, sb_start_att_dsdd,
-                8192   / imagePlugin.Info.SectorSize, 65536 / imagePlugin.Info.SectorSize,
-                262144 / imagePlugin.Info.SectorSize
-            };
-
-            ErrorNumber errno;
-
-            foreach(ulong loc in locations.Where(loc => partition.End > partition.Start + loc + sb_size_in_sectors))
-            {
-                errno = imagePlugin.ReadSectors(partition.Start + loc, sb_size_in_sectors, out ufs_sb_sectors);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                magic = BitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
-
-                if(magic == UFS_MAGIC     ||
-                   magic == UFS_CIGAM     ||
-                   magic == UFS_MAGIC_BW  ||
-                   magic == UFS_CIGAM_BW  ||
-                   magic == UFS2_MAGIC    ||
-                   magic == UFS2_CIGAM    ||
-                   magic == UFS_BAD_MAGIC ||
-                   magic == UFS_BAD_CIGAM)
-                {
-                    sb_offset = partition.Start + loc;
-
-                    break;
-                }
-
-                magic = 0;
-            }
-
-            if(magic == 0)
-            {
-                information = "Not a UFS filesystem, I shouldn't have arrived here!";
-
-                return;
-            }
-
-            XmlFsType = new FileSystemType();
-
-            switch(magic)
-            {
-                case UFS_MAGIC:
-                    sbInformation.AppendLine("UFS filesystem");
-                    XmlFsType.Type = "UFS";
-
-                    break;
-                case UFS_CIGAM:
-                    sbInformation.AppendLine("Big-endian UFS filesystem");
-                    XmlFsType.Type = "UFS";
-
-                    break;
-                case UFS_MAGIC_BW:
-                    sbInformation.AppendLine("BorderWare UFS filesystem");
-                    XmlFsType.Type = "UFS";
-
-                    break;
-                case UFS_CIGAM_BW:
-                    sbInformation.AppendLine("Big-endian BorderWare UFS filesystem");
-                    XmlFsType.Type = "UFS";
-
-                    break;
-                case UFS2_MAGIC:
-                    sbInformation.AppendLine("UFS2 filesystem");
-                    XmlFsType.Type = "UFS2";
-
-                    break;
-                case UFS2_CIGAM:
-                    sbInformation.AppendLine("Big-endian UFS2 filesystem");
-                    XmlFsType.Type = "UFS2";
-
-                    break;
-                case UFS_BAD_MAGIC:
-                    sbInformation.AppendLine("Incompletely initialized UFS filesystem");
-                    sbInformation.AppendLine("BEWARE!!! Following information may be completely wrong!");
-                    XmlFsType.Type = "UFS";
-
-                    break;
-                case UFS_BAD_CIGAM:
-                    sbInformation.AppendLine("Incompletely initialized big-endian UFS filesystem");
-                    sbInformation.AppendLine("BEWARE!!! Following information may be completely wrong!");
-                    XmlFsType.Type = "UFS";
-
-                    break;
-            }
-
-            // Fun with seeking follows on superblock reading!
-            errno = imagePlugin.ReadSectors(sb_offset, sb_size_in_sectors, out ufs_sb_sectors);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            SuperBlock sb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(ufs_sb_sectors);
-
-            SuperBlock bs_sfu = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(ufs_sb_sectors);
-
-            if((bs_sfu.fs_magic == UFS_MAGIC     && sb.fs_magic == UFS_CIGAM)    ||
-               (bs_sfu.fs_magic == UFS_MAGIC_BW  && sb.fs_magic == UFS_CIGAM_BW) ||
-               (bs_sfu.fs_magic == UFS2_MAGIC    && sb.fs_magic == UFS2_CIGAM)   ||
-               (bs_sfu.fs_magic == UFS_BAD_MAGIC && sb.fs_magic == UFS_BAD_CIGAM))
-            {
-                sb                           = bs_sfu;
-                sb.fs_old_cstotal.cs_nbfree  = Swapping.Swap(sb.fs_old_cstotal.cs_nbfree);
-                sb.fs_old_cstotal.cs_ndir    = Swapping.Swap(sb.fs_old_cstotal.cs_ndir);
-                sb.fs_old_cstotal.cs_nffree  = Swapping.Swap(sb.fs_old_cstotal.cs_nffree);
-                sb.fs_old_cstotal.cs_nifree  = Swapping.Swap(sb.fs_old_cstotal.cs_nifree);
-                sb.fs_cstotal.cs_numclusters = Swapping.Swap(sb.fs_cstotal.cs_numclusters);
-                sb.fs_cstotal.cs_nbfree      = Swapping.Swap(sb.fs_cstotal.cs_nbfree);
-                sb.fs_cstotal.cs_ndir        = Swapping.Swap(sb.fs_cstotal.cs_ndir);
-                sb.fs_cstotal.cs_nffree      = Swapping.Swap(sb.fs_cstotal.cs_nffree);
-                sb.fs_cstotal.cs_nifree      = Swapping.Swap(sb.fs_cstotal.cs_nifree);
-                sb.fs_cstotal.cs_spare[0]    = Swapping.Swap(sb.fs_cstotal.cs_spare[0]);
-                sb.fs_cstotal.cs_spare[1]    = Swapping.Swap(sb.fs_cstotal.cs_spare[1]);
-                sb.fs_cstotal.cs_spare[2]    = Swapping.Swap(sb.fs_cstotal.cs_spare[2]);
-            }
-
-            AaruConsole.DebugWriteLine("FFS plugin", "sb offset: 0x{0:X8}", sb_offset);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_rlink: 0x{0:X8}", sb.fs_rlink);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_sblkno: 0x{0:X8}", sb.fs_sblkno);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_cblkno: 0x{0:X8}", sb.fs_cblkno);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_iblkno: 0x{0:X8}", sb.fs_iblkno);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_dblkno: 0x{0:X8}", sb.fs_dblkno);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_size: 0x{0:X8}", sb.fs_size);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_dsize: 0x{0:X8}", sb.fs_dsize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_ncg: 0x{0:X8}", sb.fs_ncg);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_bsize: 0x{0:X8}", sb.fs_bsize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fsize: 0x{0:X8}", sb.fs_fsize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_frag: 0x{0:X8}", sb.fs_frag);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_minfree: 0x{0:X8}", sb.fs_minfree);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_bmask: 0x{0:X8}", sb.fs_bmask);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fmask: 0x{0:X8}", sb.fs_fmask);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_bshift: 0x{0:X8}", sb.fs_bshift);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fshift: 0x{0:X8}", sb.fs_fshift);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_maxcontig: 0x{0:X8}", sb.fs_maxcontig);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_maxbpg: 0x{0:X8}", sb.fs_maxbpg);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fragshift: 0x{0:X8}", sb.fs_fragshift);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fsbtodb: 0x{0:X8}", sb.fs_fsbtodb);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_sbsize: 0x{0:X8}", sb.fs_sbsize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_csmask: 0x{0:X8}", sb.fs_csmask);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_csshift: 0x{0:X8}", sb.fs_csshift);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_nindir: 0x{0:X8}", sb.fs_nindir);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_inopb: 0x{0:X8}", sb.fs_inopb);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_optim: 0x{0:X8}", sb.fs_optim);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_id_1: 0x{0:X8}", sb.fs_id_1);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_id_2: 0x{0:X8}", sb.fs_id_2);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_csaddr: 0x{0:X8}", sb.fs_csaddr);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_cssize: 0x{0:X8}", sb.fs_cssize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_cgsize: 0x{0:X8}", sb.fs_cgsize);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_ipg: 0x{0:X8}", sb.fs_ipg);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fpg: 0x{0:X8}", sb.fs_fpg);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_fmod: 0x{0:X2}", sb.fs_fmod);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_clean: 0x{0:X2}", sb.fs_clean);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_ronly: 0x{0:X2}", sb.fs_ronly);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_flags: 0x{0:X2}", sb.fs_flags);
-            AaruConsole.DebugWriteLine("FFS plugin", "fs_magic: 0x{0:X8}", sb.fs_magic);
-
-            if(sb.fs_magic == UFS2_MAGIC)
-                fs_type_ufs2 = true;
-            else
-            {
-                const uint
-                    SunOSEpoch =
-                        0x1A54C580; // We are supposing there cannot be a Sun's fs created before 1/1/1982 00:00:00
-
-                fs_type_43bsd =
-                    true; // There is no way of knowing this is the version, but there is of knowing it is not.
-
-                if(sb.fs_link > 0)
-                {
-                    fs_type_42bsd = true; // It was used in 4.2BSD
-                    fs_type_43bsd = false;
-                }
-
-                if((sb.fs_maxfilesize & 0xFFFFFFFF)                                    > SunOSEpoch &&
-                   DateHandlers.UnixUnsignedToDateTime(sb.fs_maxfilesize & 0xFFFFFFFF) < DateTime.Now)
-                {
-                    fs_type_42bsd = false;
-                    fs_type_sun   = true;
-                    fs_type_43bsd = false;
-                }
-
-                // This is for sure, as it is shared with a sectors/track with non-x86 SunOS, Epoch is absurdly high for that
-                if(sb.fs_old_npsect                              > SunOSEpoch &&
-                   DateHandlers.UnixToDateTime(sb.fs_old_npsect) < DateTime.Now)
-                {
-                    fs_type_42bsd = false;
-                    fs_type_sun86 = true;
-                    fs_type_sun   = false;
-                    fs_type_43bsd = false;
-                }
-
-                if(sb.fs_cgrotor       > 0x00000000 &&
-                   (uint)sb.fs_cgrotor < 0xFFFFFFFF)
-                {
-                    fs_type_42bsd = false;
-                    fs_type_sun   = false;
-                    fs_type_sun86 = false;
-                    fs_type_ufs   = true;
-                    fs_type_43bsd = false;
-                }
-
-                // 4.3BSD code does not use these fields, they are always set up to 0
-                fs_type_43bsd &= sb.fs_id_2 == 0 && sb.fs_id_1 == 0;
-
-                // This is the only 4.4BSD inode format
-                fs_type_44bsd |= sb.fs_old_inodefmt == 2;
-            }
-
-            if(!fs_type_ufs2)
-            {
-                sbInformation.AppendLine("There are a lot of variants of UFS using overlapped values on same fields");
-
-                sbInformation.
-                    AppendLine("I will try to guess which one it is, but unless it's UFS2, I may be surely wrong");
-            }
-
-            if(fs_type_42bsd)
-                sbInformation.AppendLine("Guessed as 42BSD FFS");
-
-            if(fs_type_43bsd)
-                sbInformation.AppendLine("Guessed as 43BSD FFS");
-
-            if(fs_type_44bsd)
-                sbInformation.AppendLine("Guessed as 44BSD FFS");
-
-            if(fs_type_sun)
-                sbInformation.AppendLine("Guessed as SunOS FFS");
-
-            if(fs_type_sun86)
-                sbInformation.AppendLine("Guessed as SunOS/x86 FFS");
-
-            if(fs_type_ufs)
-                sbInformation.AppendLine("Guessed as UFS");
-
-            if(fs_type_42bsd)
-                sbInformation.AppendFormat("Linked list of filesystems: 0x{0:X8}", sb.fs_link).AppendLine();
-
-            sbInformation.AppendFormat("Superblock LBA: {0}", sb.fs_sblkno).AppendLine();
-            sbInformation.AppendFormat("Cylinder-block LBA: {0}", sb.fs_cblkno).AppendLine();
-            sbInformation.AppendFormat("inode-block LBA: {0}", sb.fs_iblkno).AppendLine();
-            sbInformation.AppendFormat("First data block LBA: {0}", sb.fs_dblkno).AppendLine();
-            sbInformation.AppendFormat("Cylinder group offset in cylinder: {0}", sb.fs_old_cgoffset).AppendLine();
-
-            sbInformation.AppendFormat("Volume last written on {0}", DateHandlers.UnixToDateTime(sb.fs_old_time)).
-                          AppendLine();
-
-            XmlFsType.ModificationDate          = DateHandlers.UnixToDateTime(sb.fs_old_time);
-            XmlFsType.ModificationDateSpecified = true;
-
-            sbInformation.AppendFormat("{0} blocks in volume ({1} bytes)", sb.fs_old_size,
-                                       (long)sb.fs_old_size * sb.fs_fsize).AppendLine();
-
-            XmlFsType.Clusters    = (ulong)sb.fs_old_size;
-            XmlFsType.ClusterSize = (uint)sb.fs_fsize;
-
-            sbInformation.AppendFormat("{0} data blocks in volume ({1} bytes)", sb.fs_old_dsize,
-                                       (long)sb.fs_old_dsize * sb.fs_fsize).AppendLine();
-
-            sbInformation.AppendFormat("{0} cylinder groups in volume", sb.fs_ncg).AppendLine();
-            sbInformation.AppendFormat("{0} bytes in a basic block", sb.fs_bsize).AppendLine();
-            sbInformation.AppendFormat("{0} bytes in a frag block", sb.fs_fsize).AppendLine();
-            sbInformation.AppendFormat("{0} frags in a block", sb.fs_frag).AppendLine();
-            sbInformation.AppendFormat("{0}% of blocks must be free", sb.fs_minfree).AppendLine();
-            sbInformation.AppendFormat("{0}ms for optimal next block", sb.fs_old_rotdelay).AppendLine();
-
-            sbInformation.AppendFormat("disk rotates {0} times per second ({1}rpm)", sb.fs_old_rps, sb.fs_old_rps * 60).
-                          AppendLine();
-
-            /*          sbInformation.AppendFormat("fs_bmask: 0x{0:X8}", sb.fs_bmask).AppendLine();
-                        sbInformation.AppendFormat("fs_fmask: 0x{0:X8}", sb.fs_fmask).AppendLine();
-                        sbInformation.AppendFormat("fs_bshift: 0x{0:X8}", sb.fs_bshift).AppendLine();
-                        sbInformation.AppendFormat("fs_fshift: 0x{0:X8}", sb.fs_fshift).AppendLine();*/
-            sbInformation.AppendFormat("{0} contiguous blocks at maximum", sb.fs_maxcontig).AppendLine();
-            sbInformation.AppendFormat("{0} blocks per cylinder group at maximum", sb.fs_maxbpg).AppendLine();
-            sbInformation.AppendFormat("Superblock is {0} bytes", sb.fs_sbsize).AppendLine();
-            sbInformation.AppendFormat("NINDIR: 0x{0:X8}", sb.fs_nindir).AppendLine();
-            sbInformation.AppendFormat("INOPB: 0x{0:X8}", sb.fs_inopb).AppendLine();
-            sbInformation.AppendFormat("NSPF: 0x{0:X8}", sb.fs_old_nspf).AppendLine();
-
-            switch(sb.fs_optim)
-            {
-                case 0:
-                    sbInformation.AppendLine("Filesystem will minimize allocation time");
-
-                    break;
-                case 1:
-                    sbInformation.AppendLine("Filesystem will minimize volume fragmentation");
-
-                    break;
-                default:
-                    sbInformation.AppendFormat("Unknown optimization value: 0x{0:X8}", sb.fs_optim).AppendLine();
-
-                    break;
-            }
-
-            if(fs_type_sun)
-                sbInformation.AppendFormat("{0} sectors/track", sb.fs_old_npsect).AppendLine();
-            else if(fs_type_sun86)
-                sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(sb.fs_old_npsect)).
-                              AppendLine();
-
-            sbInformation.AppendFormat("Hardware sector interleave: {0}", sb.fs_old_interleave).AppendLine();
-            sbInformation.AppendFormat("Sector 0 skew: {0}/track", sb.fs_old_trackskew).AppendLine();
-
-            if(!fs_type_43bsd &&
-               sb.fs_id_1 > 0 &&
-               sb.fs_id_2 > 0)
-                sbInformation.AppendFormat("Volume ID: 0x{0:X8}{1:X8}", sb.fs_id_1, sb.fs_id_2).AppendLine();
-            else if(fs_type_43bsd  &&
-                    sb.fs_id_1 > 0 &&
-                    sb.fs_id_2 > 0)
-            {
-                sbInformation.AppendFormat("{0} µsec for head switch", sb.fs_id_1).AppendLine();
-                sbInformation.AppendFormat("{0} µsec for track-to-track seek", sb.fs_id_2).AppendLine();
-            }
-
-            sbInformation.AppendFormat("Cylinder group summary LBA: {0}", sb.fs_old_csaddr).AppendLine();
-            sbInformation.AppendFormat("{0} bytes in cylinder group summary", sb.fs_cssize).AppendLine();
-            sbInformation.AppendFormat("{0} bytes in cylinder group", sb.fs_cgsize).AppendLine();
-            sbInformation.AppendFormat("{0} tracks/cylinder", sb.fs_old_ntrak).AppendLine();
-            sbInformation.AppendFormat("{0} sectors/track", sb.fs_old_nsect).AppendLine();
-            sbInformation.AppendFormat("{0} sectors/cylinder", sb.fs_old_spc).AppendLine();
-            sbInformation.AppendFormat("{0} cylinder in volume", sb.fs_old_ncyl).AppendLine();
-            sbInformation.AppendFormat("{0} cylinders/group", sb.fs_old_cpg).AppendLine();
-            sbInformation.AppendFormat("{0} inodes per cylinder group", sb.fs_ipg).AppendLine();
-            sbInformation.AppendFormat("{0} blocks per group", sb.fs_fpg / sb.fs_frag).AppendLine();
-            sbInformation.AppendFormat("{0} directories", sb.fs_old_cstotal.cs_ndir).AppendLine();
-
-            sbInformation.AppendFormat("{0} free blocks ({1} bytes)", sb.fs_old_cstotal.cs_nbfree,
-                                       (long)sb.fs_old_cstotal.cs_nbfree * sb.fs_fsize).AppendLine();
-
-            XmlFsType.FreeClusters          = (ulong)sb.fs_old_cstotal.cs_nbfree;
-            XmlFsType.FreeClustersSpecified = true;
-            sbInformation.AppendFormat("{0} free inodes", sb.fs_old_cstotal.cs_nifree).AppendLine();
-            sbInformation.AppendFormat("{0} free frags", sb.fs_old_cstotal.cs_nffree).AppendLine();
-
-            if(sb.fs_fmod == 1)
-            {
-                sbInformation.AppendLine("Superblock is under modification");
-                XmlFsType.Dirty = true;
-            }
-
-            if(sb.fs_clean == 1)
-                sbInformation.AppendLine("Volume is clean");
-
-            if(sb.fs_ronly == 1)
-                sbInformation.AppendLine("Volume is read-only");
-
-            sbInformation.AppendFormat("Volume flags: 0x{0:X2}", sb.fs_flags).AppendLine();
-
-            if(fs_type_ufs)
-                sbInformation.AppendFormat("Volume last mounted on \"{0}\"", StringHandlers.CToString(sb.fs_fsmnt)).
-                              AppendLine();
-            else if(fs_type_ufs2)
-            {
-                sbInformation.AppendFormat("Volume last mounted on \"{0}\"", StringHandlers.CToString(sb.fs_fsmnt)).
-                              AppendLine();
-
-                sbInformation.AppendFormat("Volume name: \"{0}\"", StringHandlers.CToString(sb.fs_volname)).
-                              AppendLine();
-
-                XmlFsType.VolumeName = StringHandlers.CToString(sb.fs_volname);
-                sbInformation.AppendFormat("Volume ID: 0x{0:X16}", sb.fs_swuid).AppendLine();
-
-                //xmlFSType.VolumeSerial = string.Format("{0:X16}", sb.fs_swuid);
-                sbInformation.AppendFormat("Last searched cylinder group: {0}", sb.fs_cgrotor).AppendLine();
-                sbInformation.AppendFormat("{0} contiguously allocated directories", sb.fs_contigdirs).AppendLine();
-                sbInformation.AppendFormat("Standard superblock LBA: {0}", sb.fs_sblkno).AppendLine();
-                sbInformation.AppendFormat("{0} directories", sb.fs_cstotal.cs_ndir).AppendLine();
-
-                sbInformation.AppendFormat("{0} free blocks ({1} bytes)", sb.fs_cstotal.cs_nbfree,
-                                           sb.fs_cstotal.cs_nbfree * sb.fs_fsize).AppendLine();
-
-                XmlFsType.FreeClusters          = (ulong)sb.fs_cstotal.cs_nbfree;
-                XmlFsType.FreeClustersSpecified = true;
-                sbInformation.AppendFormat("{0} free inodes", sb.fs_cstotal.cs_nifree).AppendLine();
-                sbInformation.AppendFormat("{0} free frags", sb.fs_cstotal.cs_nffree).AppendLine();
-                sbInformation.AppendFormat("{0} free clusters", sb.fs_cstotal.cs_numclusters).AppendLine();
-
-                sbInformation.AppendFormat("Volume last written on {0}", DateHandlers.UnixToDateTime(sb.fs_time)).
-                              AppendLine();
-
-                XmlFsType.ModificationDate          = DateHandlers.UnixToDateTime(sb.fs_time);
-                XmlFsType.ModificationDateSpecified = true;
-
-                sbInformation.AppendFormat("{0} blocks ({1} bytes)", sb.fs_size, sb.fs_size * sb.fs_fsize).AppendLine();
-
-                XmlFsType.Clusters = (ulong)sb.fs_size;
-
-                sbInformation.AppendFormat("{0} data blocks ({1} bytes)", sb.fs_dsize, sb.fs_dsize * sb.fs_fsize).
-                              AppendLine();
-
-                sbInformation.AppendFormat("Cylinder group summary area LBA: {0}", sb.fs_csaddr).AppendLine();
-                sbInformation.AppendFormat("{0} blocks pending of being freed", sb.fs_pendingblocks).AppendLine();
-                sbInformation.AppendFormat("{0} inodes pending of being freed", sb.fs_pendinginodes).AppendLine();
-            }
-
-            if(fs_type_sun)
-                sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(sb.fs_old_npsect)).
-                              AppendLine();
-            else if(fs_type_sun86)
-                sbInformation.AppendFormat("{0} sectors/track", sb.fs_state).AppendLine();
-            else if(fs_type_44bsd)
-            {
-                sbInformation.AppendFormat("{0} blocks on cluster summary array", sb.fs_contigsumsize).AppendLine();
-
-                sbInformation.AppendFormat("Maximum length of a symbolic link: {0}", sb.fs_maxsymlinklen).AppendLine();
-
-                sbInformation.AppendFormat("A file can be {0} bytes at max", sb.fs_maxfilesize).AppendLine();
-
-                sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(sb.fs_state)).
-                              AppendLine();
-            }
-
-            if(sb.fs_old_nrpos > 0)
-                sbInformation.AppendFormat("{0} rotational positions", sb.fs_old_nrpos).AppendLine();
-
-            if(sb.fs_old_rotbloff > 0)
-                sbInformation.AppendFormat("{0} blocks per rotation", sb.fs_old_rotbloff).AppendLine();
-
-            information = sbInformation.ToString();
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct csum
-        {
-            /// <summary>number of directories</summary>
-            public int cs_ndir;
-            /// <summary>number of free blocks</summary>
-            public int cs_nbfree;
-            /// <summary>number of free inodes</summary>
-            public int cs_nifree;
-            /// <summary>number of free frags</summary>
-            public int cs_nffree;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct csum_total
-        {
-            /// <summary>number of directories</summary>
-            public long cs_ndir;
-            /// <summary>number of free blocks</summary>
-            public long cs_nbfree;
-            /// <summary>number of free inodes</summary>
-            public long cs_nifree;
-            /// <summary>number of free frags</summary>
-            public long cs_nffree;
-            /// <summary>number of free clusters</summary>
-            public long cs_numclusters;
-            /// <summary>future expansion</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly long[] cs_spare;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct SuperBlock
-        {
-            /// <summary>linked list of file systems</summary>
-            public readonly uint fs_link;
-            /// <summary>used for incore super blocks on Sun: uint fs_rolled; // logging only: fs fully rolled</summary>
-            public readonly uint fs_rlink;
-            /// <summary>addr of super-block in filesys</summary>
-            public readonly int fs_sblkno;
-            /// <summary>offset of cyl-block in filesys</summary>
-            public readonly int fs_cblkno;
-            /// <summary>offset of inode-blocks in filesys</summary>
-            public readonly int fs_iblkno;
-            /// <summary>offset of first data after cg</summary>
-            public readonly int fs_dblkno;
-            /// <summary>cylinder group offset in cylinder</summary>
-            public readonly int fs_old_cgoffset;
-            /// <summary>used to calc mod fs_ntrak</summary>
-            public readonly int fs_old_cgmask;
-            /// <summary>last time written</summary>
-            public readonly int fs_old_time;
-            /// <summary>number of blocks in fs</summary>
-            public readonly int fs_old_size;
-            /// <summary>number of data blocks in fs</summary>
-            public readonly int fs_old_dsize;
-            /// <summary>number of cylinder groups</summary>
-            public readonly int fs_ncg;
-            /// <summary>size of basic blocks in fs</summary>
-            public readonly int fs_bsize;
-            /// <summary>size of frag blocks in fs</summary>
-            public readonly int fs_fsize;
-            /// <summary>number of frags in a block in fs</summary>
-            public readonly int fs_frag;
-            /* these are configuration parameters */
-            /// <summary>minimum percentage of free blocks</summary>
-            public readonly int fs_minfree;
-            /// <summary>num of ms for optimal next block</summary>
-            public readonly int fs_old_rotdelay;
-            /// <summary>disk revolutions per second</summary>
-            public readonly int fs_old_rps;
-            /* these fields can be computed from the others */
-            /// <summary>``blkoff'' calc of blk offsets</summary>
-            public readonly int fs_bmask;
-            /// <summary>``fragoff'' calc of frag offsets</summary>
-            public readonly int fs_fmask;
-            /// <summary>``lblkno'' calc of logical blkno</summary>
-            public readonly int fs_bshift;
-            /// <summary>``numfrags'' calc number of frags</summary>
-            public readonly int fs_fshift;
-            /* these are configuration parameters */
-            /// <summary>max number of contiguous blks</summary>
-            public readonly int fs_maxcontig;
-            /// <summary>max number of blks per cyl group</summary>
-            public readonly int fs_maxbpg;
-            /* these fields can be computed from the others */
-            /// <summary>block to frag shift</summary>
-            public readonly int fs_fragshift;
-            /// <summary>fsbtodb and dbtofsb shift constant</summary>
-            public readonly int fs_fsbtodb;
-            /// <summary>actual size of super block</summary>
-            public readonly int fs_sbsize;
-            /// <summary>csum block offset</summary>
-            public readonly int fs_csmask;
-            /// <summary>csum block number</summary>
-            public readonly int fs_csshift;
-            /// <summary>value of NINDIR</summary>
-            public readonly int fs_nindir;
-            /// <summary>value of INOPB</summary>
-            public readonly uint fs_inopb;
-            /// <summary>value of NSPF</summary>
-            public readonly int fs_old_nspf;
-            /* yet another configuration parameter */
-            /// <summary>optimization preference, see below On SVR: int fs_state; // file system state</summary>
-            public readonly int fs_optim;
-            /// <summary># sectors/track including spares</summary>
-            public readonly int fs_old_npsect;
-            /// <summary>hardware sector interleave</summary>
-            public readonly int fs_old_interleave;
-            /// <summary>sector 0 skew, per track On A/UX: int fs_state; // file system state</summary>
-            public readonly int fs_old_trackskew;
-            /// <summary>unique filesystem id On old: int fs_headswitch; // head switch time, usec</summary>
-            public readonly int fs_id_1;
-            /// <summary>unique filesystem id On old: int fs_trkseek; // track-to-track seek, usec</summary>
-            public readonly int fs_id_2;
-            /* sizes determined by number of cylinder groups and their sizes */
-            /// <summary>blk addr of cyl grp summary area</summary>
-            public readonly int fs_old_csaddr;
-            /// <summary>size of cyl grp summary area</summary>
-            public readonly int fs_cssize;
-            /// <summary>cylinder group size</summary>
-            public readonly int fs_cgsize;
-            /* these fields are derived from the hardware */
-            /// <summary>tracks per cylinder</summary>
-            public readonly int fs_old_ntrak;
-            /// <summary>sectors per track</summary>
-            public readonly int fs_old_nsect;
-            /// <summary>sectors per cylinder</summary>
-            public readonly int fs_old_spc;
-            /* this comes from the disk driver partitioning */
-            /// <summary>cylinders in filesystem</summary>
-            public readonly int fs_old_ncyl;
-            /* these fields can be computed from the others */
-            /// <summary>cylinders per group</summary>
-            public readonly int fs_old_cpg;
-            /// <summary>inodes per group</summary>
-            public readonly int fs_ipg;
-            /// <summary>blocks per group * fs_frag</summary>
-            public readonly int fs_fpg;
-            /* this data must be re-computed after crashes */
-            /// <summary>cylinder summary information</summary>
-            public csum fs_old_cstotal;
-            /* these fields are cleared at mount time */
-            /// <summary>super block modified flag</summary>
-            public readonly sbyte fs_fmod;
-            /// <summary>filesystem is clean flag</summary>
-            public readonly sbyte fs_clean;
-            /// <summary>mounted read-only flag</summary>
-            public readonly sbyte fs_ronly;
-            /// <summary>old FS_ flags</summary>
-            public readonly sbyte fs_old_flags;
-            /// <summary>name mounted on</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 468)]
-            public readonly byte[] fs_fsmnt;
-            /// <summary>volume name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] fs_volname;
-            /// <summary>system-wide uid</summary>
-            public readonly ulong fs_swuid;
-            /// <summary>due to alignment of fs_swuid</summary>
-            public readonly int fs_pad;
-            /* these fields retain the current block allocation info */
-            /// <summary>last cg searched</summary>
-            public readonly int fs_cgrotor;
-            /// <summary>padding; was list of fs_cs buffers</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 28)]
-            public readonly uint[] fs_ocsp;
-            /// <summary>(u) # of contig. allocated dirs</summary>
-            public readonly uint fs_contigdirs;
-            /// <summary>(u) cg summary info buffer</summary>
-            public readonly uint fs_csp;
-            /// <summary>(u) max cluster in each cyl group</summary>
-            public readonly uint fs_maxcluster;
-            /// <summary>(u) used by snapshots to track fs</summary>
-            public readonly uint fs_active;
-            /// <summary>cyl per cycle in postbl</summary>
-            public readonly int fs_old_cpc;
-            /// <summary>maximum blocking factor permitted</summary>
-            public readonly int fs_maxbsize;
-            /// <summary>number of unreferenced inodes</summary>
-            public readonly long fs_unrefs;
-            /// <summary>size of underlying GEOM provider</summary>
-            public readonly long fs_providersize;
-            /// <summary>size of area reserved for metadata</summary>
-            public readonly long fs_metaspace;
-            /// <summary>old rotation block list head</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public readonly long[] fs_sparecon64;
-            /// <summary>byte offset of standard superblock</summary>
-            public readonly long fs_sblockloc;
-            /// <summary>(u) cylinder summary information</summary>
-            public csum_total fs_cstotal;
-            /// <summary>last time written</summary>
-            public readonly long fs_time;
-            /// <summary>number of blocks in fs</summary>
-            public readonly long fs_size;
-            /// <summary>number of data blocks in fs</summary>
-            public readonly long fs_dsize;
-            /// <summary>blk addr of cyl grp summary area</summary>
-            public readonly long fs_csaddr;
-            /// <summary>(u) blocks being freed</summary>
-            public readonly long fs_pendingblocks;
-            /// <summary>(u) inodes being freed</summary>
-            public readonly uint fs_pendinginodes;
-            /// <summary>list of snapshot inode numbers</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly uint[] fs_snapinum;
-            /// <summary>expected average file size</summary>
-            public readonly uint fs_avgfilesize;
-            /// <summary>expected # of files per directory</summary>
-            public readonly uint fs_avgfpdir;
-            /// <summary>save real cg size to use fs_bsize</summary>
-            public readonly int fs_save_cgsize;
-            /// <summary>Last mount or fsck time.</summary>
-            public readonly long fs_mtime;
-            /// <summary>SUJ free list</summary>
-            public readonly int fs_sujfree;
-            /// <summary>reserved for future constants</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 23)]
-            public readonly int[] fs_sparecon32;
-            /// <summary>see FS_ flags below</summary>
-            public readonly int fs_flags;
-            /// <summary>size of cluster summary array</summary>
-            public readonly int fs_contigsumsize;
-            /// <summary>max length of an internal symlink</summary>
-            public readonly int fs_maxsymlinklen;
-            /// <summary>format of on-disk inodes</summary>
-            public readonly int fs_old_inodefmt;
-            /// <summary>maximum representable file size</summary>
-            public readonly ulong fs_maxfilesize;
-            /// <summary>~fs_bmask for use with 64-bit size</summary>
-            public readonly long fs_qbmask;
-            /// <summary>~fs_fmask for use with 64-bit size</summary>
-            public readonly long fs_qfmask;
-            /// <summary>validate fs_clean field</summary>
-            public readonly int fs_state;
-            /// <summary>format of positional layout tables</summary>
-            public readonly int fs_old_postblformat;
-            /// <summary>number of rotational positions</summary>
-            public readonly int fs_old_nrpos;
-            /// <summary>(short) rotation block list head</summary>
-            public readonly int fs_old_postbloff;
-            /// <summary>(uchar_t) blocks for each rotation</summary>
-            public readonly int fs_old_rotbloff;
-            /// <summary>magic number</summary>
-            public readonly uint fs_magic;
-            /// <summary>list of blocks for each rotation</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
-            public readonly byte[] fs_rotbl;
+            return false;
         }
     }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+        var sbInformation = new StringBuilder();
+
+        uint   magic = 0;
+        uint   sb_size_in_sectors;
+        byte[] ufs_sb_sectors;
+        ulong  sb_offset     = partition.Start;
+        bool   fs_type_42bsd = false;
+        bool   fs_type_43bsd = false;
+        bool   fs_type_44bsd = false;
+        bool   fs_type_ufs   = false;
+        bool   fs_type_ufs2  = false;
+        bool   fs_type_sun   = false;
+        bool   fs_type_sun86 = false;
+
+        if(imagePlugin.Info.SectorSize == 2336 ||
+           imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448)
+            sb_size_in_sectors = block_size / 2048;
+        else
+            sb_size_in_sectors = block_size / imagePlugin.Info.SectorSize;
+
+        ulong[] locations =
+        {
+            sb_start_floppy, sb_start_boot, sb_start_long_boot, sb_start_piggy, sb_start_att_dsdd,
+            8192   / imagePlugin.Info.SectorSize, 65536 / imagePlugin.Info.SectorSize,
+            262144 / imagePlugin.Info.SectorSize
+        };
+
+        ErrorNumber errno;
+
+        foreach(ulong loc in locations.Where(loc => partition.End > partition.Start + loc + sb_size_in_sectors))
+        {
+            errno = imagePlugin.ReadSectors(partition.Start + loc, sb_size_in_sectors, out ufs_sb_sectors);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            magic = BitConverter.ToUInt32(ufs_sb_sectors, 0x055C);
+
+            if(magic == UFS_MAGIC     ||
+               magic == UFS_CIGAM     ||
+               magic == UFS_MAGIC_BW  ||
+               magic == UFS_CIGAM_BW  ||
+               magic == UFS2_MAGIC    ||
+               magic == UFS2_CIGAM    ||
+               magic == UFS_BAD_MAGIC ||
+               magic == UFS_BAD_CIGAM)
+            {
+                sb_offset = partition.Start + loc;
+
+                break;
+            }
+
+            magic = 0;
+        }
+
+        if(magic == 0)
+        {
+            information = "Not a UFS filesystem, I shouldn't have arrived here!";
+
+            return;
+        }
+
+        XmlFsType = new FileSystemType();
+
+        switch(magic)
+        {
+            case UFS_MAGIC:
+                sbInformation.AppendLine("UFS filesystem");
+                XmlFsType.Type = "UFS";
+
+                break;
+            case UFS_CIGAM:
+                sbInformation.AppendLine("Big-endian UFS filesystem");
+                XmlFsType.Type = "UFS";
+
+                break;
+            case UFS_MAGIC_BW:
+                sbInformation.AppendLine("BorderWare UFS filesystem");
+                XmlFsType.Type = "UFS";
+
+                break;
+            case UFS_CIGAM_BW:
+                sbInformation.AppendLine("Big-endian BorderWare UFS filesystem");
+                XmlFsType.Type = "UFS";
+
+                break;
+            case UFS2_MAGIC:
+                sbInformation.AppendLine("UFS2 filesystem");
+                XmlFsType.Type = "UFS2";
+
+                break;
+            case UFS2_CIGAM:
+                sbInformation.AppendLine("Big-endian UFS2 filesystem");
+                XmlFsType.Type = "UFS2";
+
+                break;
+            case UFS_BAD_MAGIC:
+                sbInformation.AppendLine("Incompletely initialized UFS filesystem");
+                sbInformation.AppendLine("BEWARE!!! Following information may be completely wrong!");
+                XmlFsType.Type = "UFS";
+
+                break;
+            case UFS_BAD_CIGAM:
+                sbInformation.AppendLine("Incompletely initialized big-endian UFS filesystem");
+                sbInformation.AppendLine("BEWARE!!! Following information may be completely wrong!");
+                XmlFsType.Type = "UFS";
+
+                break;
+        }
+
+        // Fun with seeking follows on superblock reading!
+        errno = imagePlugin.ReadSectors(sb_offset, sb_size_in_sectors, out ufs_sb_sectors);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        SuperBlock sb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(ufs_sb_sectors);
+
+        SuperBlock bs_sfu = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(ufs_sb_sectors);
+
+        if((bs_sfu.fs_magic == UFS_MAGIC     && sb.fs_magic == UFS_CIGAM)    ||
+           (bs_sfu.fs_magic == UFS_MAGIC_BW  && sb.fs_magic == UFS_CIGAM_BW) ||
+           (bs_sfu.fs_magic == UFS2_MAGIC    && sb.fs_magic == UFS2_CIGAM)   ||
+           (bs_sfu.fs_magic == UFS_BAD_MAGIC && sb.fs_magic == UFS_BAD_CIGAM))
+        {
+            sb                           = bs_sfu;
+            sb.fs_old_cstotal.cs_nbfree  = Swapping.Swap(sb.fs_old_cstotal.cs_nbfree);
+            sb.fs_old_cstotal.cs_ndir    = Swapping.Swap(sb.fs_old_cstotal.cs_ndir);
+            sb.fs_old_cstotal.cs_nffree  = Swapping.Swap(sb.fs_old_cstotal.cs_nffree);
+            sb.fs_old_cstotal.cs_nifree  = Swapping.Swap(sb.fs_old_cstotal.cs_nifree);
+            sb.fs_cstotal.cs_numclusters = Swapping.Swap(sb.fs_cstotal.cs_numclusters);
+            sb.fs_cstotal.cs_nbfree      = Swapping.Swap(sb.fs_cstotal.cs_nbfree);
+            sb.fs_cstotal.cs_ndir        = Swapping.Swap(sb.fs_cstotal.cs_ndir);
+            sb.fs_cstotal.cs_nffree      = Swapping.Swap(sb.fs_cstotal.cs_nffree);
+            sb.fs_cstotal.cs_nifree      = Swapping.Swap(sb.fs_cstotal.cs_nifree);
+            sb.fs_cstotal.cs_spare[0]    = Swapping.Swap(sb.fs_cstotal.cs_spare[0]);
+            sb.fs_cstotal.cs_spare[1]    = Swapping.Swap(sb.fs_cstotal.cs_spare[1]);
+            sb.fs_cstotal.cs_spare[2]    = Swapping.Swap(sb.fs_cstotal.cs_spare[2]);
+        }
+
+        AaruConsole.DebugWriteLine("FFS plugin", "sb offset: 0x{0:X8}", sb_offset);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_rlink: 0x{0:X8}", sb.fs_rlink);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_sblkno: 0x{0:X8}", sb.fs_sblkno);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_cblkno: 0x{0:X8}", sb.fs_cblkno);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_iblkno: 0x{0:X8}", sb.fs_iblkno);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_dblkno: 0x{0:X8}", sb.fs_dblkno);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_size: 0x{0:X8}", sb.fs_size);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_dsize: 0x{0:X8}", sb.fs_dsize);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_ncg: 0x{0:X8}", sb.fs_ncg);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_bsize: 0x{0:X8}", sb.fs_bsize);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_fsize: 0x{0:X8}", sb.fs_fsize);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_frag: 0x{0:X8}", sb.fs_frag);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_minfree: 0x{0:X8}", sb.fs_minfree);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_bmask: 0x{0:X8}", sb.fs_bmask);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_fmask: 0x{0:X8}", sb.fs_fmask);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_bshift: 0x{0:X8}", sb.fs_bshift);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_fshift: 0x{0:X8}", sb.fs_fshift);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_maxcontig: 0x{0:X8}", sb.fs_maxcontig);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_maxbpg: 0x{0:X8}", sb.fs_maxbpg);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_fragshift: 0x{0:X8}", sb.fs_fragshift);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_fsbtodb: 0x{0:X8}", sb.fs_fsbtodb);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_sbsize: 0x{0:X8}", sb.fs_sbsize);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_csmask: 0x{0:X8}", sb.fs_csmask);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_csshift: 0x{0:X8}", sb.fs_csshift);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_nindir: 0x{0:X8}", sb.fs_nindir);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_inopb: 0x{0:X8}", sb.fs_inopb);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_optim: 0x{0:X8}", sb.fs_optim);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_id_1: 0x{0:X8}", sb.fs_id_1);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_id_2: 0x{0:X8}", sb.fs_id_2);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_csaddr: 0x{0:X8}", sb.fs_csaddr);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_cssize: 0x{0:X8}", sb.fs_cssize);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_cgsize: 0x{0:X8}", sb.fs_cgsize);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_ipg: 0x{0:X8}", sb.fs_ipg);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_fpg: 0x{0:X8}", sb.fs_fpg);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_fmod: 0x{0:X2}", sb.fs_fmod);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_clean: 0x{0:X2}", sb.fs_clean);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_ronly: 0x{0:X2}", sb.fs_ronly);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_flags: 0x{0:X2}", sb.fs_flags);
+        AaruConsole.DebugWriteLine("FFS plugin", "fs_magic: 0x{0:X8}", sb.fs_magic);
+
+        if(sb.fs_magic == UFS2_MAGIC)
+            fs_type_ufs2 = true;
+        else
+        {
+            const uint
+                SunOSEpoch =
+                    0x1A54C580; // We are supposing there cannot be a Sun's fs created before 1/1/1982 00:00:00
+
+            fs_type_43bsd =
+                true; // There is no way of knowing this is the version, but there is of knowing it is not.
+
+            if(sb.fs_link > 0)
+            {
+                fs_type_42bsd = true; // It was used in 4.2BSD
+                fs_type_43bsd = false;
+            }
+
+            if((sb.fs_maxfilesize & 0xFFFFFFFF)                                    > SunOSEpoch &&
+               DateHandlers.UnixUnsignedToDateTime(sb.fs_maxfilesize & 0xFFFFFFFF) < DateTime.Now)
+            {
+                fs_type_42bsd = false;
+                fs_type_sun   = true;
+                fs_type_43bsd = false;
+            }
+
+            // This is for sure, as it is shared with a sectors/track with non-x86 SunOS, Epoch is absurdly high for that
+            if(sb.fs_old_npsect                              > SunOSEpoch &&
+               DateHandlers.UnixToDateTime(sb.fs_old_npsect) < DateTime.Now)
+            {
+                fs_type_42bsd = false;
+                fs_type_sun86 = true;
+                fs_type_sun   = false;
+                fs_type_43bsd = false;
+            }
+
+            if(sb.fs_cgrotor       > 0x00000000 &&
+               (uint)sb.fs_cgrotor < 0xFFFFFFFF)
+            {
+                fs_type_42bsd = false;
+                fs_type_sun   = false;
+                fs_type_sun86 = false;
+                fs_type_ufs   = true;
+                fs_type_43bsd = false;
+            }
+
+            // 4.3BSD code does not use these fields, they are always set up to 0
+            fs_type_43bsd &= sb.fs_id_2 == 0 && sb.fs_id_1 == 0;
+
+            // This is the only 4.4BSD inode format
+            fs_type_44bsd |= sb.fs_old_inodefmt == 2;
+        }
+
+        if(!fs_type_ufs2)
+        {
+            sbInformation.AppendLine("There are a lot of variants of UFS using overlapped values on same fields");
+
+            sbInformation.
+                AppendLine("I will try to guess which one it is, but unless it's UFS2, I may be surely wrong");
+        }
+
+        if(fs_type_42bsd)
+            sbInformation.AppendLine("Guessed as 42BSD FFS");
+
+        if(fs_type_43bsd)
+            sbInformation.AppendLine("Guessed as 43BSD FFS");
+
+        if(fs_type_44bsd)
+            sbInformation.AppendLine("Guessed as 44BSD FFS");
+
+        if(fs_type_sun)
+            sbInformation.AppendLine("Guessed as SunOS FFS");
+
+        if(fs_type_sun86)
+            sbInformation.AppendLine("Guessed as SunOS/x86 FFS");
+
+        if(fs_type_ufs)
+            sbInformation.AppendLine("Guessed as UFS");
+
+        if(fs_type_42bsd)
+            sbInformation.AppendFormat("Linked list of filesystems: 0x{0:X8}", sb.fs_link).AppendLine();
+
+        sbInformation.AppendFormat("Superblock LBA: {0}", sb.fs_sblkno).AppendLine();
+        sbInformation.AppendFormat("Cylinder-block LBA: {0}", sb.fs_cblkno).AppendLine();
+        sbInformation.AppendFormat("inode-block LBA: {0}", sb.fs_iblkno).AppendLine();
+        sbInformation.AppendFormat("First data block LBA: {0}", sb.fs_dblkno).AppendLine();
+        sbInformation.AppendFormat("Cylinder group offset in cylinder: {0}", sb.fs_old_cgoffset).AppendLine();
+
+        sbInformation.AppendFormat("Volume last written on {0}", DateHandlers.UnixToDateTime(sb.fs_old_time)).
+                      AppendLine();
+
+        XmlFsType.ModificationDate          = DateHandlers.UnixToDateTime(sb.fs_old_time);
+        XmlFsType.ModificationDateSpecified = true;
+
+        sbInformation.AppendFormat("{0} blocks in volume ({1} bytes)", sb.fs_old_size,
+                                   (long)sb.fs_old_size * sb.fs_fsize).AppendLine();
+
+        XmlFsType.Clusters    = (ulong)sb.fs_old_size;
+        XmlFsType.ClusterSize = (uint)sb.fs_fsize;
+
+        sbInformation.AppendFormat("{0} data blocks in volume ({1} bytes)", sb.fs_old_dsize,
+                                   (long)sb.fs_old_dsize * sb.fs_fsize).AppendLine();
+
+        sbInformation.AppendFormat("{0} cylinder groups in volume", sb.fs_ncg).AppendLine();
+        sbInformation.AppendFormat("{0} bytes in a basic block", sb.fs_bsize).AppendLine();
+        sbInformation.AppendFormat("{0} bytes in a frag block", sb.fs_fsize).AppendLine();
+        sbInformation.AppendFormat("{0} frags in a block", sb.fs_frag).AppendLine();
+        sbInformation.AppendFormat("{0}% of blocks must be free", sb.fs_minfree).AppendLine();
+        sbInformation.AppendFormat("{0}ms for optimal next block", sb.fs_old_rotdelay).AppendLine();
+
+        sbInformation.AppendFormat("disk rotates {0} times per second ({1}rpm)", sb.fs_old_rps, sb.fs_old_rps * 60).
+                      AppendLine();
+
+        /*          sbInformation.AppendFormat("fs_bmask: 0x{0:X8}", sb.fs_bmask).AppendLine();
+                    sbInformation.AppendFormat("fs_fmask: 0x{0:X8}", sb.fs_fmask).AppendLine();
+                    sbInformation.AppendFormat("fs_bshift: 0x{0:X8}", sb.fs_bshift).AppendLine();
+                    sbInformation.AppendFormat("fs_fshift: 0x{0:X8}", sb.fs_fshift).AppendLine();*/
+        sbInformation.AppendFormat("{0} contiguous blocks at maximum", sb.fs_maxcontig).AppendLine();
+        sbInformation.AppendFormat("{0} blocks per cylinder group at maximum", sb.fs_maxbpg).AppendLine();
+        sbInformation.AppendFormat("Superblock is {0} bytes", sb.fs_sbsize).AppendLine();
+        sbInformation.AppendFormat("NINDIR: 0x{0:X8}", sb.fs_nindir).AppendLine();
+        sbInformation.AppendFormat("INOPB: 0x{0:X8}", sb.fs_inopb).AppendLine();
+        sbInformation.AppendFormat("NSPF: 0x{0:X8}", sb.fs_old_nspf).AppendLine();
+
+        switch(sb.fs_optim)
+        {
+            case 0:
+                sbInformation.AppendLine("Filesystem will minimize allocation time");
+
+                break;
+            case 1:
+                sbInformation.AppendLine("Filesystem will minimize volume fragmentation");
+
+                break;
+            default:
+                sbInformation.AppendFormat("Unknown optimization value: 0x{0:X8}", sb.fs_optim).AppendLine();
+
+                break;
+        }
+
+        if(fs_type_sun)
+            sbInformation.AppendFormat("{0} sectors/track", sb.fs_old_npsect).AppendLine();
+        else if(fs_type_sun86)
+            sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(sb.fs_old_npsect)).
+                          AppendLine();
+
+        sbInformation.AppendFormat("Hardware sector interleave: {0}", sb.fs_old_interleave).AppendLine();
+        sbInformation.AppendFormat("Sector 0 skew: {0}/track", sb.fs_old_trackskew).AppendLine();
+
+        if(!fs_type_43bsd &&
+           sb.fs_id_1 > 0 &&
+           sb.fs_id_2 > 0)
+            sbInformation.AppendFormat("Volume ID: 0x{0:X8}{1:X8}", sb.fs_id_1, sb.fs_id_2).AppendLine();
+        else if(fs_type_43bsd  &&
+                sb.fs_id_1 > 0 &&
+                sb.fs_id_2 > 0)
+        {
+            sbInformation.AppendFormat("{0} µsec for head switch", sb.fs_id_1).AppendLine();
+            sbInformation.AppendFormat("{0} µsec for track-to-track seek", sb.fs_id_2).AppendLine();
+        }
+
+        sbInformation.AppendFormat("Cylinder group summary LBA: {0}", sb.fs_old_csaddr).AppendLine();
+        sbInformation.AppendFormat("{0} bytes in cylinder group summary", sb.fs_cssize).AppendLine();
+        sbInformation.AppendFormat("{0} bytes in cylinder group", sb.fs_cgsize).AppendLine();
+        sbInformation.AppendFormat("{0} tracks/cylinder", sb.fs_old_ntrak).AppendLine();
+        sbInformation.AppendFormat("{0} sectors/track", sb.fs_old_nsect).AppendLine();
+        sbInformation.AppendFormat("{0} sectors/cylinder", sb.fs_old_spc).AppendLine();
+        sbInformation.AppendFormat("{0} cylinder in volume", sb.fs_old_ncyl).AppendLine();
+        sbInformation.AppendFormat("{0} cylinders/group", sb.fs_old_cpg).AppendLine();
+        sbInformation.AppendFormat("{0} inodes per cylinder group", sb.fs_ipg).AppendLine();
+        sbInformation.AppendFormat("{0} blocks per group", sb.fs_fpg / sb.fs_frag).AppendLine();
+        sbInformation.AppendFormat("{0} directories", sb.fs_old_cstotal.cs_ndir).AppendLine();
+
+        sbInformation.AppendFormat("{0} free blocks ({1} bytes)", sb.fs_old_cstotal.cs_nbfree,
+                                   (long)sb.fs_old_cstotal.cs_nbfree * sb.fs_fsize).AppendLine();
+
+        XmlFsType.FreeClusters          = (ulong)sb.fs_old_cstotal.cs_nbfree;
+        XmlFsType.FreeClustersSpecified = true;
+        sbInformation.AppendFormat("{0} free inodes", sb.fs_old_cstotal.cs_nifree).AppendLine();
+        sbInformation.AppendFormat("{0} free frags", sb.fs_old_cstotal.cs_nffree).AppendLine();
+
+        if(sb.fs_fmod == 1)
+        {
+            sbInformation.AppendLine("Superblock is under modification");
+            XmlFsType.Dirty = true;
+        }
+
+        if(sb.fs_clean == 1)
+            sbInformation.AppendLine("Volume is clean");
+
+        if(sb.fs_ronly == 1)
+            sbInformation.AppendLine("Volume is read-only");
+
+        sbInformation.AppendFormat("Volume flags: 0x{0:X2}", sb.fs_flags).AppendLine();
+
+        if(fs_type_ufs)
+            sbInformation.AppendFormat("Volume last mounted on \"{0}\"", StringHandlers.CToString(sb.fs_fsmnt)).
+                          AppendLine();
+        else if(fs_type_ufs2)
+        {
+            sbInformation.AppendFormat("Volume last mounted on \"{0}\"", StringHandlers.CToString(sb.fs_fsmnt)).
+                          AppendLine();
+
+            sbInformation.AppendFormat("Volume name: \"{0}\"", StringHandlers.CToString(sb.fs_volname)).
+                          AppendLine();
+
+            XmlFsType.VolumeName = StringHandlers.CToString(sb.fs_volname);
+            sbInformation.AppendFormat("Volume ID: 0x{0:X16}", sb.fs_swuid).AppendLine();
+
+            //xmlFSType.VolumeSerial = string.Format("{0:X16}", sb.fs_swuid);
+            sbInformation.AppendFormat("Last searched cylinder group: {0}", sb.fs_cgrotor).AppendLine();
+            sbInformation.AppendFormat("{0} contiguously allocated directories", sb.fs_contigdirs).AppendLine();
+            sbInformation.AppendFormat("Standard superblock LBA: {0}", sb.fs_sblkno).AppendLine();
+            sbInformation.AppendFormat("{0} directories", sb.fs_cstotal.cs_ndir).AppendLine();
+
+            sbInformation.AppendFormat("{0} free blocks ({1} bytes)", sb.fs_cstotal.cs_nbfree,
+                                       sb.fs_cstotal.cs_nbfree * sb.fs_fsize).AppendLine();
+
+            XmlFsType.FreeClusters          = (ulong)sb.fs_cstotal.cs_nbfree;
+            XmlFsType.FreeClustersSpecified = true;
+            sbInformation.AppendFormat("{0} free inodes", sb.fs_cstotal.cs_nifree).AppendLine();
+            sbInformation.AppendFormat("{0} free frags", sb.fs_cstotal.cs_nffree).AppendLine();
+            sbInformation.AppendFormat("{0} free clusters", sb.fs_cstotal.cs_numclusters).AppendLine();
+
+            sbInformation.AppendFormat("Volume last written on {0}", DateHandlers.UnixToDateTime(sb.fs_time)).
+                          AppendLine();
+
+            XmlFsType.ModificationDate          = DateHandlers.UnixToDateTime(sb.fs_time);
+            XmlFsType.ModificationDateSpecified = true;
+
+            sbInformation.AppendFormat("{0} blocks ({1} bytes)", sb.fs_size, sb.fs_size * sb.fs_fsize).AppendLine();
+
+            XmlFsType.Clusters = (ulong)sb.fs_size;
+
+            sbInformation.AppendFormat("{0} data blocks ({1} bytes)", sb.fs_dsize, sb.fs_dsize * sb.fs_fsize).
+                          AppendLine();
+
+            sbInformation.AppendFormat("Cylinder group summary area LBA: {0}", sb.fs_csaddr).AppendLine();
+            sbInformation.AppendFormat("{0} blocks pending of being freed", sb.fs_pendingblocks).AppendLine();
+            sbInformation.AppendFormat("{0} inodes pending of being freed", sb.fs_pendinginodes).AppendLine();
+        }
+
+        if(fs_type_sun)
+            sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(sb.fs_old_npsect)).
+                          AppendLine();
+        else if(fs_type_sun86)
+            sbInformation.AppendFormat("{0} sectors/track", sb.fs_state).AppendLine();
+        else if(fs_type_44bsd)
+        {
+            sbInformation.AppendFormat("{0} blocks on cluster summary array", sb.fs_contigsumsize).AppendLine();
+
+            sbInformation.AppendFormat("Maximum length of a symbolic link: {0}", sb.fs_maxsymlinklen).AppendLine();
+
+            sbInformation.AppendFormat("A file can be {0} bytes at max", sb.fs_maxfilesize).AppendLine();
+
+            sbInformation.AppendFormat("Volume state on {0}", DateHandlers.UnixToDateTime(sb.fs_state)).
+                          AppendLine();
+        }
+
+        if(sb.fs_old_nrpos > 0)
+            sbInformation.AppendFormat("{0} rotational positions", sb.fs_old_nrpos).AppendLine();
+
+        if(sb.fs_old_rotbloff > 0)
+            sbInformation.AppendFormat("{0} blocks per rotation", sb.fs_old_rotbloff).AppendLine();
+
+        information = sbInformation.ToString();
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct csum
+    {
+        /// <summary>number of directories</summary>
+        public int cs_ndir;
+        /// <summary>number of free blocks</summary>
+        public int cs_nbfree;
+        /// <summary>number of free inodes</summary>
+        public int cs_nifree;
+        /// <summary>number of free frags</summary>
+        public int cs_nffree;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct csum_total
+    {
+        /// <summary>number of directories</summary>
+        public long cs_ndir;
+        /// <summary>number of free blocks</summary>
+        public long cs_nbfree;
+        /// <summary>number of free inodes</summary>
+        public long cs_nifree;
+        /// <summary>number of free frags</summary>
+        public long cs_nffree;
+        /// <summary>number of free clusters</summary>
+        public long cs_numclusters;
+        /// <summary>future expansion</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly long[] cs_spare;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct SuperBlock
+    {
+        /// <summary>linked list of file systems</summary>
+        public readonly uint fs_link;
+        /// <summary>used for incore super blocks on Sun: uint fs_rolled; // logging only: fs fully rolled</summary>
+        public readonly uint fs_rlink;
+        /// <summary>addr of super-block in filesys</summary>
+        public readonly int fs_sblkno;
+        /// <summary>offset of cyl-block in filesys</summary>
+        public readonly int fs_cblkno;
+        /// <summary>offset of inode-blocks in filesys</summary>
+        public readonly int fs_iblkno;
+        /// <summary>offset of first data after cg</summary>
+        public readonly int fs_dblkno;
+        /// <summary>cylinder group offset in cylinder</summary>
+        public readonly int fs_old_cgoffset;
+        /// <summary>used to calc mod fs_ntrak</summary>
+        public readonly int fs_old_cgmask;
+        /// <summary>last time written</summary>
+        public readonly int fs_old_time;
+        /// <summary>number of blocks in fs</summary>
+        public readonly int fs_old_size;
+        /// <summary>number of data blocks in fs</summary>
+        public readonly int fs_old_dsize;
+        /// <summary>number of cylinder groups</summary>
+        public readonly int fs_ncg;
+        /// <summary>size of basic blocks in fs</summary>
+        public readonly int fs_bsize;
+        /// <summary>size of frag blocks in fs</summary>
+        public readonly int fs_fsize;
+        /// <summary>number of frags in a block in fs</summary>
+        public readonly int fs_frag;
+        /* these are configuration parameters */
+        /// <summary>minimum percentage of free blocks</summary>
+        public readonly int fs_minfree;
+        /// <summary>num of ms for optimal next block</summary>
+        public readonly int fs_old_rotdelay;
+        /// <summary>disk revolutions per second</summary>
+        public readonly int fs_old_rps;
+        /* these fields can be computed from the others */
+        /// <summary>``blkoff'' calc of blk offsets</summary>
+        public readonly int fs_bmask;
+        /// <summary>``fragoff'' calc of frag offsets</summary>
+        public readonly int fs_fmask;
+        /// <summary>``lblkno'' calc of logical blkno</summary>
+        public readonly int fs_bshift;
+        /// <summary>``numfrags'' calc number of frags</summary>
+        public readonly int fs_fshift;
+        /* these are configuration parameters */
+        /// <summary>max number of contiguous blks</summary>
+        public readonly int fs_maxcontig;
+        /// <summary>max number of blks per cyl group</summary>
+        public readonly int fs_maxbpg;
+        /* these fields can be computed from the others */
+        /// <summary>block to frag shift</summary>
+        public readonly int fs_fragshift;
+        /// <summary>fsbtodb and dbtofsb shift constant</summary>
+        public readonly int fs_fsbtodb;
+        /// <summary>actual size of super block</summary>
+        public readonly int fs_sbsize;
+        /// <summary>csum block offset</summary>
+        public readonly int fs_csmask;
+        /// <summary>csum block number</summary>
+        public readonly int fs_csshift;
+        /// <summary>value of NINDIR</summary>
+        public readonly int fs_nindir;
+        /// <summary>value of INOPB</summary>
+        public readonly uint fs_inopb;
+        /// <summary>value of NSPF</summary>
+        public readonly int fs_old_nspf;
+        /* yet another configuration parameter */
+        /// <summary>optimization preference, see below On SVR: int fs_state; // file system state</summary>
+        public readonly int fs_optim;
+        /// <summary># sectors/track including spares</summary>
+        public readonly int fs_old_npsect;
+        /// <summary>hardware sector interleave</summary>
+        public readonly int fs_old_interleave;
+        /// <summary>sector 0 skew, per track On A/UX: int fs_state; // file system state</summary>
+        public readonly int fs_old_trackskew;
+        /// <summary>unique filesystem id On old: int fs_headswitch; // head switch time, usec</summary>
+        public readonly int fs_id_1;
+        /// <summary>unique filesystem id On old: int fs_trkseek; // track-to-track seek, usec</summary>
+        public readonly int fs_id_2;
+        /* sizes determined by number of cylinder groups and their sizes */
+        /// <summary>blk addr of cyl grp summary area</summary>
+        public readonly int fs_old_csaddr;
+        /// <summary>size of cyl grp summary area</summary>
+        public readonly int fs_cssize;
+        /// <summary>cylinder group size</summary>
+        public readonly int fs_cgsize;
+        /* these fields are derived from the hardware */
+        /// <summary>tracks per cylinder</summary>
+        public readonly int fs_old_ntrak;
+        /// <summary>sectors per track</summary>
+        public readonly int fs_old_nsect;
+        /// <summary>sectors per cylinder</summary>
+        public readonly int fs_old_spc;
+        /* this comes from the disk driver partitioning */
+        /// <summary>cylinders in filesystem</summary>
+        public readonly int fs_old_ncyl;
+        /* these fields can be computed from the others */
+        /// <summary>cylinders per group</summary>
+        public readonly int fs_old_cpg;
+        /// <summary>inodes per group</summary>
+        public readonly int fs_ipg;
+        /// <summary>blocks per group * fs_frag</summary>
+        public readonly int fs_fpg;
+        /* this data must be re-computed after crashes */
+        /// <summary>cylinder summary information</summary>
+        public csum fs_old_cstotal;
+        /* these fields are cleared at mount time */
+        /// <summary>super block modified flag</summary>
+        public readonly sbyte fs_fmod;
+        /// <summary>filesystem is clean flag</summary>
+        public readonly sbyte fs_clean;
+        /// <summary>mounted read-only flag</summary>
+        public readonly sbyte fs_ronly;
+        /// <summary>old FS_ flags</summary>
+        public readonly sbyte fs_old_flags;
+        /// <summary>name mounted on</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 468)]
+        public readonly byte[] fs_fsmnt;
+        /// <summary>volume name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] fs_volname;
+        /// <summary>system-wide uid</summary>
+        public readonly ulong fs_swuid;
+        /// <summary>due to alignment of fs_swuid</summary>
+        public readonly int fs_pad;
+        /* these fields retain the current block allocation info */
+        /// <summary>last cg searched</summary>
+        public readonly int fs_cgrotor;
+        /// <summary>padding; was list of fs_cs buffers</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 28)]
+        public readonly uint[] fs_ocsp;
+        /// <summary>(u) # of contig. allocated dirs</summary>
+        public readonly uint fs_contigdirs;
+        /// <summary>(u) cg summary info buffer</summary>
+        public readonly uint fs_csp;
+        /// <summary>(u) max cluster in each cyl group</summary>
+        public readonly uint fs_maxcluster;
+        /// <summary>(u) used by snapshots to track fs</summary>
+        public readonly uint fs_active;
+        /// <summary>cyl per cycle in postbl</summary>
+        public readonly int fs_old_cpc;
+        /// <summary>maximum blocking factor permitted</summary>
+        public readonly int fs_maxbsize;
+        /// <summary>number of unreferenced inodes</summary>
+        public readonly long fs_unrefs;
+        /// <summary>size of underlying GEOM provider</summary>
+        public readonly long fs_providersize;
+        /// <summary>size of area reserved for metadata</summary>
+        public readonly long fs_metaspace;
+        /// <summary>old rotation block list head</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
+        public readonly long[] fs_sparecon64;
+        /// <summary>byte offset of standard superblock</summary>
+        public readonly long fs_sblockloc;
+        /// <summary>(u) cylinder summary information</summary>
+        public csum_total fs_cstotal;
+        /// <summary>last time written</summary>
+        public readonly long fs_time;
+        /// <summary>number of blocks in fs</summary>
+        public readonly long fs_size;
+        /// <summary>number of data blocks in fs</summary>
+        public readonly long fs_dsize;
+        /// <summary>blk addr of cyl grp summary area</summary>
+        public readonly long fs_csaddr;
+        /// <summary>(u) blocks being freed</summary>
+        public readonly long fs_pendingblocks;
+        /// <summary>(u) inodes being freed</summary>
+        public readonly uint fs_pendinginodes;
+        /// <summary>list of snapshot inode numbers</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly uint[] fs_snapinum;
+        /// <summary>expected average file size</summary>
+        public readonly uint fs_avgfilesize;
+        /// <summary>expected # of files per directory</summary>
+        public readonly uint fs_avgfpdir;
+        /// <summary>save real cg size to use fs_bsize</summary>
+        public readonly int fs_save_cgsize;
+        /// <summary>Last mount or fsck time.</summary>
+        public readonly long fs_mtime;
+        /// <summary>SUJ free list</summary>
+        public readonly int fs_sujfree;
+        /// <summary>reserved for future constants</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 23)]
+        public readonly int[] fs_sparecon32;
+        /// <summary>see FS_ flags below</summary>
+        public readonly int fs_flags;
+        /// <summary>size of cluster summary array</summary>
+        public readonly int fs_contigsumsize;
+        /// <summary>max length of an internal symlink</summary>
+        public readonly int fs_maxsymlinklen;
+        /// <summary>format of on-disk inodes</summary>
+        public readonly int fs_old_inodefmt;
+        /// <summary>maximum representable file size</summary>
+        public readonly ulong fs_maxfilesize;
+        /// <summary>~fs_bmask for use with 64-bit size</summary>
+        public readonly long fs_qbmask;
+        /// <summary>~fs_fmask for use with 64-bit size</summary>
+        public readonly long fs_qfmask;
+        /// <summary>validate fs_clean field</summary>
+        public readonly int fs_state;
+        /// <summary>format of positional layout tables</summary>
+        public readonly int fs_old_postblformat;
+        /// <summary>number of rotational positions</summary>
+        public readonly int fs_old_nrpos;
+        /// <summary>(short) rotation block list head</summary>
+        public readonly int fs_old_postbloff;
+        /// <summary>(uchar_t) blocks for each rotation</summary>
+        public readonly int fs_old_rotbloff;
+        /// <summary>magic number</summary>
+        public readonly uint fs_magic;
+        /// <summary>list of blocks for each rotation</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1)]
+        public readonly byte[] fs_rotbl;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Fossil.cs b/Aaru.Filesystems/Fossil.cs
index 1b81b5c5d..92df09a32 100644
--- a/Aaru.Filesystems/Fossil.cs
+++ b/Aaru.Filesystems/Fossil.cs
@@ -41,160 +41,159 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection for the Plan-9 Fossil on-disk filesystem</summary>
+public sealed class Fossil : IFilesystem
 {
+    const uint FOSSIL_HDR_MAGIC = 0x3776AE89;
+    const uint FOSSIL_SB_MAGIC  = 0x2340A3B1;
+
+    // Fossil header starts at 128KiB
+    const ulong HEADER_POS = 128 * 1024;
+
     /// <inheritdoc />
-    /// <summary>Implements detection for the Plan-9 Fossil on-disk filesystem</summary>
-    public sealed class Fossil : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Fossil Filesystem Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("932BF104-43F6-494F-973C-45EF58A51DA9");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint FOSSIL_HDR_MAGIC = 0x3776AE89;
-        const uint FOSSIL_SB_MAGIC  = 0x2340A3B1;
+        ulong hdrSector = HEADER_POS / imagePlugin.Info.SectorSize;
 
-        // Fossil header starts at 128KiB
-        const ulong HEADER_POS = 128 * 1024;
+        if(partition.Start + hdrSector > imagePlugin.Info.Sectors)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Fossil Filesystem Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("932BF104-43F6-494F-973C-45EF58A51DA9");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start + hdrSector, out byte[] sector);
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        Header hdr = Marshal.ByteArrayToStructureBigEndian<Header>(sector);
+
+        AaruConsole.DebugWriteLine("Fossil plugin", "magic at 0x{0:X8} (expected 0x{1:X8})", hdr.magic,
+                                   FOSSIL_HDR_MAGIC);
+
+        return hdr.magic == FOSSIL_HDR_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        // Technically everything on Plan 9 from Bell Labs is in UTF-8
+        Encoding    = Encoding.UTF8;
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        ulong hdrSector = HEADER_POS / imagePlugin.Info.SectorSize;
+
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start + hdrSector, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        Header hdr = Marshal.ByteArrayToStructureBigEndian<Header>(sector);
+
+        AaruConsole.DebugWriteLine("Fossil plugin", "magic at 0x{0:X8} (expected 0x{1:X8})", hdr.magic,
+                                   FOSSIL_HDR_MAGIC);
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("Fossil");
+        sb.AppendFormat("Filesystem version {0}", hdr.version).AppendLine();
+        sb.AppendFormat("{0} bytes per block", hdr.blockSize).AppendLine();
+        sb.AppendFormat("Superblock resides in block {0}", hdr.super).AppendLine();
+        sb.AppendFormat("Labels resides in block {0}", hdr.label).AppendLine();
+        sb.AppendFormat("Data starts at block {0}", hdr.data).AppendLine();
+        sb.AppendFormat("Volume has {0} blocks", hdr.end).AppendLine();
+
+        ulong sbLocation = (hdr.super * (hdr.blockSize / imagePlugin.Info.SectorSize)) + partition.Start;
+
+        XmlFsType = new FileSystemType
         {
-            ulong hdrSector = HEADER_POS / imagePlugin.Info.SectorSize;
+            Type        = "Fossil filesystem",
+            ClusterSize = hdr.blockSize,
+            Clusters    = hdr.end
+        };
 
-            if(partition.Start + hdrSector > imagePlugin.Info.Sectors)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start + hdrSector, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            Header hdr = Marshal.ByteArrayToStructureBigEndian<Header>(sector);
-
-            AaruConsole.DebugWriteLine("Fossil plugin", "magic at 0x{0:X8} (expected 0x{1:X8})", hdr.magic,
-                                       FOSSIL_HDR_MAGIC);
-
-            return hdr.magic == FOSSIL_HDR_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        if(sbLocation <= partition.End)
         {
-            // Technically everything on Plan 9 from Bell Labs is in UTF-8
-            Encoding    = Encoding.UTF8;
-            information = "";
+            errno = imagePlugin.ReadSector(sbLocation, out sector);
+            SuperBlock fsb = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sector);
 
-            if(imagePlugin.Info.SectorSize < 512)
-                return;
+            AaruConsole.DebugWriteLine("Fossil plugin", "magic 0x{0:X8} (expected 0x{1:X8})", fsb.magic,
+                                       FOSSIL_SB_MAGIC);
 
-            ulong hdrSector = HEADER_POS / imagePlugin.Info.SectorSize;
-
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start + hdrSector, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            Header hdr = Marshal.ByteArrayToStructureBigEndian<Header>(sector);
-
-            AaruConsole.DebugWriteLine("Fossil plugin", "magic at 0x{0:X8} (expected 0x{1:X8})", hdr.magic,
-                                       FOSSIL_HDR_MAGIC);
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine("Fossil");
-            sb.AppendFormat("Filesystem version {0}", hdr.version).AppendLine();
-            sb.AppendFormat("{0} bytes per block", hdr.blockSize).AppendLine();
-            sb.AppendFormat("Superblock resides in block {0}", hdr.super).AppendLine();
-            sb.AppendFormat("Labels resides in block {0}", hdr.label).AppendLine();
-            sb.AppendFormat("Data starts at block {0}", hdr.data).AppendLine();
-            sb.AppendFormat("Volume has {0} blocks", hdr.end).AppendLine();
-
-            ulong sbLocation = (hdr.super * (hdr.blockSize / imagePlugin.Info.SectorSize)) + partition.Start;
-
-            XmlFsType = new FileSystemType
+            if(fsb.magic == FOSSIL_SB_MAGIC)
             {
-                Type        = "Fossil filesystem",
-                ClusterSize = hdr.blockSize,
-                Clusters    = hdr.end
-            };
-
-            if(sbLocation <= partition.End)
-            {
-                errno = imagePlugin.ReadSector(sbLocation, out sector);
-                SuperBlock fsb = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sector);
-
-                AaruConsole.DebugWriteLine("Fossil plugin", "magic 0x{0:X8} (expected 0x{1:X8})", fsb.magic,
-                                           FOSSIL_SB_MAGIC);
-
-                if(fsb.magic == FOSSIL_SB_MAGIC)
-                {
-                    sb.AppendFormat("Epoch low {0}", fsb.epochLow).AppendLine();
-                    sb.AppendFormat("Epoch high {0}", fsb.epochHigh).AppendLine();
-                    sb.AppendFormat("Next QID {0}", fsb.qid).AppendLine();
-                    sb.AppendFormat("Active root block {0}", fsb.active).AppendLine();
-                    sb.AppendFormat("Next root block {0}", fsb.next).AppendLine();
-                    sb.AppendFormat("Current root block {0}", fsb.current).AppendLine();
-                    sb.AppendFormat("Volume label: \"{0}\"", StringHandlers.CToString(fsb.name, Encoding)).AppendLine();
-                    XmlFsType.VolumeName = StringHandlers.CToString(fsb.name, Encoding);
-                }
+                sb.AppendFormat("Epoch low {0}", fsb.epochLow).AppendLine();
+                sb.AppendFormat("Epoch high {0}", fsb.epochHigh).AppendLine();
+                sb.AppendFormat("Next QID {0}", fsb.qid).AppendLine();
+                sb.AppendFormat("Active root block {0}", fsb.active).AppendLine();
+                sb.AppendFormat("Next root block {0}", fsb.next).AppendLine();
+                sb.AppendFormat("Current root block {0}", fsb.current).AppendLine();
+                sb.AppendFormat("Volume label: \"{0}\"", StringHandlers.CToString(fsb.name, Encoding)).AppendLine();
+                XmlFsType.VolumeName = StringHandlers.CToString(fsb.name, Encoding);
             }
-
-            information = sb.ToString();
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Header
-        {
-            /// <summary>Magic number</summary>
-            public readonly uint magic;
-            /// <summary>Header version</summary>
-            public readonly ushort version;
-            /// <summary>Block size</summary>
-            public readonly ushort blockSize;
-            /// <summary>Block containing superblock</summary>
-            public readonly uint super;
-            /// <summary>Block containing labels</summary>
-            public readonly uint label;
-            /// <summary>Where do data blocks start</summary>
-            public readonly uint data;
-            /// <summary>How many data blocks does it have</summary>
-            public readonly uint end;
-        }
+        information = sb.ToString();
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            /// <summary>Magic number</summary>
-            public readonly uint magic;
-            /// <summary>Header version</summary>
-            public readonly ushort version;
-            /// <summary>file system low epoch</summary>
-            public readonly uint epochLow;
-            /// <summary>file system high(active) epoch</summary>
-            public readonly uint epochHigh;
-            /// <summary>next qid to allocate</summary>
-            public readonly ulong qid;
-            /// <summary>data block number: root of active file system</summary>
-            public readonly int active;
-            /// <summary>data block number: root of next file system to archive</summary>
-            public readonly int next;
-            /// <summary>data block number: root of file system currently being archived</summary>
-            public readonly int current;
-            /// <summary>Venti score of last successful archive</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] last;
-            /// <summary>name of file system(just a comment)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] name;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Header
+    {
+        /// <summary>Magic number</summary>
+        public readonly uint magic;
+        /// <summary>Header version</summary>
+        public readonly ushort version;
+        /// <summary>Block size</summary>
+        public readonly ushort blockSize;
+        /// <summary>Block containing superblock</summary>
+        public readonly uint super;
+        /// <summary>Block containing labels</summary>
+        public readonly uint label;
+        /// <summary>Where do data blocks start</summary>
+        public readonly uint data;
+        /// <summary>How many data blocks does it have</summary>
+        public readonly uint end;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        /// <summary>Magic number</summary>
+        public readonly uint magic;
+        /// <summary>Header version</summary>
+        public readonly ushort version;
+        /// <summary>file system low epoch</summary>
+        public readonly uint epochLow;
+        /// <summary>file system high(active) epoch</summary>
+        public readonly uint epochHigh;
+        /// <summary>next qid to allocate</summary>
+        public readonly ulong qid;
+        /// <summary>data block number: root of active file system</summary>
+        public readonly int active;
+        /// <summary>data block number: root of next file system to archive</summary>
+        public readonly int next;
+        /// <summary>data block number: root of file system currently being archived</summary>
+        public readonly int current;
+        /// <summary>Venti score of last successful archive</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] last;
+        /// <summary>name of file system(just a comment)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] name;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/HAMMER.cs b/Aaru.Filesystems/HAMMER.cs
index ff54a0255..9e36ec145 100644
--- a/Aaru.Filesystems/HAMMER.cs
+++ b/Aaru.Filesystems/HAMMER.cs
@@ -46,213 +46,212 @@ using Marshal = Aaru.Helpers.Marshal;
 
 #pragma warning disable 169
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection for the HAMMER filesystem</summary>
+public sealed class HAMMER : IFilesystem
 {
+    const ulong HAMMER_FSBUF_VOLUME     = 0xC8414D4DC5523031;
+    const ulong HAMMER_FSBUF_VOLUME_REV = 0x313052C54D4D41C8;
+    const uint  HAMMER_VOLHDR_SIZE      = 1928;
+    const int   HAMMER_BIGBLOCK_SIZE    = 8192 * 1024;
+
     /// <inheritdoc />
-    /// <summary>Implements detection for the HAMMER filesystem</summary>
-    public sealed class HAMMER : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "HAMMER Filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("91A188BF-5FD7-4677-BBD3-F59EBA9C864D");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const ulong HAMMER_FSBUF_VOLUME     = 0xC8414D4DC5523031;
-        const ulong HAMMER_FSBUF_VOLUME_REV = 0x313052C54D4D41C8;
-        const uint  HAMMER_VOLHDR_SIZE      = 1928;
-        const int   HAMMER_BIGBLOCK_SIZE    = 8192 * 1024;
+        uint run = HAMMER_VOLHDR_SIZE / imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "HAMMER Filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("91A188BF-5FD7-4677-BBD3-F59EBA9C864D");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(HAMMER_VOLHDR_SIZE % imagePlugin.Info.SectorSize > 0)
+            run++;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(run + partition.Start >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, run, out byte[] sbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        ulong magic = BitConverter.ToUInt64(sbSector, 0);
+
+        return magic == HAMMER_FSBUF_VOLUME || magic == HAMMER_FSBUF_VOLUME_REV;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        SuperBlock superBlock;
+
+        uint run = HAMMER_VOLHDR_SIZE / imagePlugin.Info.SectorSize;
+
+        if(HAMMER_VOLHDR_SIZE % imagePlugin.Info.SectorSize > 0)
+            run++;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, run, out byte[] sbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        ulong magic = BitConverter.ToUInt64(sbSector, 0);
+
+        superBlock = magic == HAMMER_FSBUF_VOLUME ? Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sbSector)
+                         : Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sbSector);
+
+        sb.AppendLine("HAMMER filesystem");
+
+        sb.AppendFormat("Volume version: {0}", superBlock.vol_version).AppendLine();
+
+        sb.AppendFormat("Volume {0} of {1} on this filesystem", superBlock.vol_no + 1, superBlock.vol_count).
+           AppendLine();
+
+        sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(superBlock.vol_label, Encoding)).AppendLine();
+        sb.AppendFormat("Volume serial: {0}", superBlock.vol_fsid).AppendLine();
+        sb.AppendFormat("Filesystem type: {0}", superBlock.vol_fstype).AppendLine();
+        sb.AppendFormat("Boot area starts at {0}", superBlock.vol_bot_beg).AppendLine();
+        sb.AppendFormat("Memory log starts at {0}", superBlock.vol_mem_beg).AppendLine();
+        sb.AppendFormat("First volume buffer starts at {0}", superBlock.vol_buf_beg).AppendLine();
+        sb.AppendFormat("Volume ends at {0}", superBlock.vol_buf_end).AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            uint run = HAMMER_VOLHDR_SIZE / imagePlugin.Info.SectorSize;
+            Clusters     = partition.Size / HAMMER_BIGBLOCK_SIZE,
+            ClusterSize  = HAMMER_BIGBLOCK_SIZE,
+            Dirty        = false,
+            Type         = "HAMMER",
+            VolumeName   = StringHandlers.CToString(superBlock.vol_label, Encoding),
+            VolumeSerial = superBlock.vol_fsid.ToString()
+        };
 
-            if(HAMMER_VOLHDR_SIZE % imagePlugin.Info.SectorSize > 0)
-                run++;
+        if(superBlock.vol_no == superBlock.vol_rootvol)
+        {
+            sb.AppendFormat("Filesystem contains {0} \"big-blocks\" ({1} bytes)", superBlock.vol0_stat_bigblocks,
+                            superBlock.vol0_stat_bigblocks * HAMMER_BIGBLOCK_SIZE).AppendLine();
 
-            if(run + partition.Start >= partition.End)
-                return false;
+            sb.AppendFormat("Filesystem has {0} \"big-blocks\" free ({1} bytes)",
+                            superBlock.vol0_stat_freebigblocks,
+                            superBlock.vol0_stat_freebigblocks * HAMMER_BIGBLOCK_SIZE).AppendLine();
 
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, run, out byte[] sbSector);
+            sb.AppendFormat("Filesystem has {0} inode used", superBlock.vol0_stat_inodes).AppendLine();
 
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            ulong magic = BitConverter.ToUInt64(sbSector, 0);
-
-            return magic == HAMMER_FSBUF_VOLUME || magic == HAMMER_FSBUF_VOLUME_REV;
+            XmlFsType.Clusters              = (ulong)superBlock.vol0_stat_bigblocks;
+            XmlFsType.FreeClusters          = (ulong)superBlock.vol0_stat_freebigblocks;
+            XmlFsType.FreeClustersSpecified = true;
+            XmlFsType.Files                 = (ulong)superBlock.vol0_stat_inodes;
+            XmlFsType.FilesSpecified        = true;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
+        // 0 ?
+        //sb.AppendFormat("Volume header CRC: 0x{0:X8}", afs_sb.vol_crc).AppendLine();
 
-            var sb = new StringBuilder();
+        information = sb.ToString();
+    }
 
-            SuperBlock superBlock;
+    /// <summary>Hammer superblock</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
+    readonly struct SuperBlock
+    {
+        /// <summary><see cref="HAMMER_FSBUF_VOLUME" /> for a valid header</summary>
+        public readonly ulong vol_signature;
 
-            uint run = HAMMER_VOLHDR_SIZE / imagePlugin.Info.SectorSize;
+        /* These are relative to block device offset, not zone offsets. */
+        /// <summary>offset of boot area</summary>
+        public readonly long vol_bot_beg;
+        /// <summary>offset of memory log</summary>
+        public readonly long vol_mem_beg;
+        /// <summary>offset of the first buffer in volume</summary>
+        public readonly long vol_buf_beg;
+        /// <summary>offset of volume EOF (on buffer boundary)</summary>
+        public readonly long vol_buf_end;
+        public readonly long vol_reserved01;
 
-            if(HAMMER_VOLHDR_SIZE % imagePlugin.Info.SectorSize > 0)
-                run++;
+        /// <summary>identify filesystem</summary>
+        public readonly Guid vol_fsid;
+        /// <summary>identify filesystem type</summary>
+        public readonly Guid vol_fstype;
+        /// <summary>filesystem label</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] vol_label;
 
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, run, out byte[] sbSector);
+        /// <summary>volume number within filesystem</summary>
+        public readonly int vol_no;
+        /// <summary>number of volumes making up filesystem</summary>
+        public readonly int vol_count;
 
-            if(errno != ErrorNumber.NoError)
-                return;
+        /// <summary>version control information</summary>
+        public readonly uint vol_version;
+        /// <summary>header crc</summary>
+        public readonly hammer_crc_t vol_crc;
+        /// <summary>volume flags</summary>
+        public readonly uint vol_flags;
+        /// <summary>the root volume number (must be 0)</summary>
+        public readonly uint vol_rootvol;
 
-            ulong magic = BitConverter.ToUInt64(sbSector, 0);
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly uint[] vol_reserved;
 
-            superBlock = magic == HAMMER_FSBUF_VOLUME ? Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sbSector)
-                             : Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sbSector);
+        /*
+         * These fields are initialized and space is reserved in every
+         * volume making up a HAMMER filesystem, but only the root volume
+         * contains valid data.  Note that vol0_stat_bigblocks does not
+         * include big-blocks for freemap and undomap initially allocated
+         * by newfs_hammer(8).
+         */
+        /// <summary>total big-blocks when fs is empty</summary>
+        public readonly long vol0_stat_bigblocks;
+        /// <summary>number of free big-blocks</summary>
+        public readonly long vol0_stat_freebigblocks;
+        public readonly long vol0_reserved01;
+        /// <summary>for statfs only</summary>
+        public readonly long vol0_stat_inodes;
+        public readonly long vol0_reserved02;
+        /// <summary>B-Tree root offset in zone-8</summary>
+        public readonly hammer_off_t vol0_btree_root;
+        /// <summary>highest partially synchronized TID</summary>
+        public readonly hammer_tid_t vol0_next_tid;
+        public readonly hammer_off_t vol0_reserved03;
 
-            sb.AppendLine("HAMMER filesystem");
+        /// <summary>
+        ///     Blockmaps for zones.  Not all zones use a blockmap.  Note that the entire root blockmap is cached in the
+        ///     hammer_mount structure.
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly HammerBlockMap[] vol0_blockmap;
 
-            sb.AppendFormat("Volume version: {0}", superBlock.vol_version).AppendLine();
+        /// <summary>Array of zone-2 addresses for undo FIFO.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly hammer_off_t[] vol0_undo_array;
+    }
 
-            sb.AppendFormat("Volume {0} of {1} on this filesystem", superBlock.vol_no + 1, superBlock.vol_count).
-               AppendLine();
-
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(superBlock.vol_label, Encoding)).AppendLine();
-            sb.AppendFormat("Volume serial: {0}", superBlock.vol_fsid).AppendLine();
-            sb.AppendFormat("Filesystem type: {0}", superBlock.vol_fstype).AppendLine();
-            sb.AppendFormat("Boot area starts at {0}", superBlock.vol_bot_beg).AppendLine();
-            sb.AppendFormat("Memory log starts at {0}", superBlock.vol_mem_beg).AppendLine();
-            sb.AppendFormat("First volume buffer starts at {0}", superBlock.vol_buf_beg).AppendLine();
-            sb.AppendFormat("Volume ends at {0}", superBlock.vol_buf_end).AppendLine();
-
-            XmlFsType = new FileSystemType
-            {
-                Clusters     = partition.Size / HAMMER_BIGBLOCK_SIZE,
-                ClusterSize  = HAMMER_BIGBLOCK_SIZE,
-                Dirty        = false,
-                Type         = "HAMMER",
-                VolumeName   = StringHandlers.CToString(superBlock.vol_label, Encoding),
-                VolumeSerial = superBlock.vol_fsid.ToString()
-            };
-
-            if(superBlock.vol_no == superBlock.vol_rootvol)
-            {
-                sb.AppendFormat("Filesystem contains {0} \"big-blocks\" ({1} bytes)", superBlock.vol0_stat_bigblocks,
-                                superBlock.vol0_stat_bigblocks * HAMMER_BIGBLOCK_SIZE).AppendLine();
-
-                sb.AppendFormat("Filesystem has {0} \"big-blocks\" free ({1} bytes)",
-                                superBlock.vol0_stat_freebigblocks,
-                                superBlock.vol0_stat_freebigblocks * HAMMER_BIGBLOCK_SIZE).AppendLine();
-
-                sb.AppendFormat("Filesystem has {0} inode used", superBlock.vol0_stat_inodes).AppendLine();
-
-                XmlFsType.Clusters              = (ulong)superBlock.vol0_stat_bigblocks;
-                XmlFsType.FreeClusters          = (ulong)superBlock.vol0_stat_freebigblocks;
-                XmlFsType.FreeClustersSpecified = true;
-                XmlFsType.Files                 = (ulong)superBlock.vol0_stat_inodes;
-                XmlFsType.FilesSpecified        = true;
-            }
-
-            // 0 ?
-            //sb.AppendFormat("Volume header CRC: 0x{0:X8}", afs_sb.vol_crc).AppendLine();
-
-            information = sb.ToString();
-        }
-
-        /// <summary>Hammer superblock</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
-        readonly struct SuperBlock
-        {
-            /// <summary><see cref="HAMMER_FSBUF_VOLUME" /> for a valid header</summary>
-            public readonly ulong vol_signature;
-
-            /* These are relative to block device offset, not zone offsets. */
-            /// <summary>offset of boot area</summary>
-            public readonly long vol_bot_beg;
-            /// <summary>offset of memory log</summary>
-            public readonly long vol_mem_beg;
-            /// <summary>offset of the first buffer in volume</summary>
-            public readonly long vol_buf_beg;
-            /// <summary>offset of volume EOF (on buffer boundary)</summary>
-            public readonly long vol_buf_end;
-            public readonly long vol_reserved01;
-
-            /// <summary>identify filesystem</summary>
-            public readonly Guid vol_fsid;
-            /// <summary>identify filesystem type</summary>
-            public readonly Guid vol_fstype;
-            /// <summary>filesystem label</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] vol_label;
-
-            /// <summary>volume number within filesystem</summary>
-            public readonly int vol_no;
-            /// <summary>number of volumes making up filesystem</summary>
-            public readonly int vol_count;
-
-            /// <summary>version control information</summary>
-            public readonly uint vol_version;
-            /// <summary>header crc</summary>
-            public readonly hammer_crc_t vol_crc;
-            /// <summary>volume flags</summary>
-            public readonly uint vol_flags;
-            /// <summary>the root volume number (must be 0)</summary>
-            public readonly uint vol_rootvol;
-
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly uint[] vol_reserved;
-
-            /*
-             * These fields are initialized and space is reserved in every
-             * volume making up a HAMMER filesystem, but only the root volume
-             * contains valid data.  Note that vol0_stat_bigblocks does not
-             * include big-blocks for freemap and undomap initially allocated
-             * by newfs_hammer(8).
-             */
-            /// <summary>total big-blocks when fs is empty</summary>
-            public readonly long vol0_stat_bigblocks;
-            /// <summary>number of free big-blocks</summary>
-            public readonly long vol0_stat_freebigblocks;
-            public readonly long vol0_reserved01;
-            /// <summary>for statfs only</summary>
-            public readonly long vol0_stat_inodes;
-            public readonly long vol0_reserved02;
-            /// <summary>B-Tree root offset in zone-8</summary>
-            public readonly hammer_off_t vol0_btree_root;
-            /// <summary>highest partially synchronized TID</summary>
-            public readonly hammer_tid_t vol0_next_tid;
-            public readonly hammer_off_t vol0_reserved03;
-
-            /// <summary>
-            ///     Blockmaps for zones.  Not all zones use a blockmap.  Note that the entire root blockmap is cached in the
-            ///     hammer_mount structure.
-            /// </summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly HammerBlockMap[] vol0_blockmap;
-
-            /// <summary>Array of zone-2 addresses for undo FIFO.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly hammer_off_t[] vol0_undo_array;
-        }
-
-        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
-        struct HammerBlockMap
-        {
-            /// <summary>zone-2 offset only used by zone-4</summary>
-            public hammer_off_t phys_offset;
-            /// <summary>zone-X offset only used by zone-3</summary>
-            public hammer_off_t first_offset;
-            /// <summary>zone-X offset for allocation</summary>
-            public hammer_off_t next_offset;
-            /// <summary>zone-X offset only used by zone-3</summary>
-            public hammer_off_t alloc_offset;
-            public uint         reserved01;
-            public hammer_crc_t entry_crc;
-        }
+    [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
+    struct HammerBlockMap
+    {
+        /// <summary>zone-2 offset only used by zone-4</summary>
+        public hammer_off_t phys_offset;
+        /// <summary>zone-X offset only used by zone-3</summary>
+        public hammer_off_t first_offset;
+        /// <summary>zone-X offset for allocation</summary>
+        public hammer_off_t next_offset;
+        /// <summary>zone-X offset only used by zone-3</summary>
+        public hammer_off_t alloc_offset;
+        public uint         reserved01;
+        public hammer_crc_t entry_crc;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/HPFS.cs b/Aaru.Filesystems/HPFS.cs
index df2732c5d..483b5ae3f 100644
--- a/Aaru.Filesystems/HPFS.cs
+++ b/Aaru.Filesystems/HPFS.cs
@@ -41,365 +41,364 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from an old unnamed document
+/// <inheritdoc />
+/// <summary>Implements detection of IBM's High Performance File System (HPFS)</summary>
+public sealed class HPFS : IFilesystem
 {
-    // Information from an old unnamed document
     /// <inheritdoc />
-    /// <summary>Implements detection of IBM's High Performance File System (HPFS)</summary>
-    public sealed class HPFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "OS/2 High Performance File System";
+    /// <inheritdoc />
+    public Guid Id => new("33513B2C-f590-4acb-8bf2-0b1d5e19dec5");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "OS/2 High Performance File System";
-        /// <inheritdoc />
-        public Guid Id => new("33513B2C-f590-4acb-8bf2-0b1d5e19dec5");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(16 + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            if(16 + partition.Start >= partition.End)
-                return false;
+        ErrorNumber errno =
+            imagePlugin.ReadSector(16 + partition.Start,
+                                   out byte[] hpfsSbSector); // Seek to superblock, on logical sector 16
 
-            ErrorNumber errno =
-                imagePlugin.ReadSector(16 + partition.Start,
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        uint magic1 = BitConverter.ToUInt32(hpfsSbSector, 0x000);
+        uint magic2 = BitConverter.ToUInt32(hpfsSbSector, 0x004);
+
+        return magic1 == 0xF995E849 && magic2 == 0xFA53E9C5;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("ibm850");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        ErrorNumber errno =
+            imagePlugin.ReadSector(0 + partition.Start,
+                                   out byte[] hpfsBpbSector); // Seek to BIOS parameter block, on logical sector 0
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        errno = imagePlugin.ReadSector(16 + partition.Start,
                                        out byte[] hpfsSbSector); // Seek to superblock, on logical sector 16
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+        if(errno != ErrorNumber.NoError)
+            return;
 
-            uint magic1 = BitConverter.ToUInt32(hpfsSbSector, 0x000);
-            uint magic2 = BitConverter.ToUInt32(hpfsSbSector, 0x004);
+        errno = imagePlugin.ReadSector(17 + partition.Start,
+                                       out byte[] hpfsSpSector); // Seek to spareblock, on logical sector 17
 
-            return magic1 == 0xF995E849 && magic2 == 0xFA53E9C5;
-        }
+        if(errno != ErrorNumber.NoError)
+            return;
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        BiosParameterBlock bpb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock>(hpfsBpbSector);
+
+        SuperBlock hpfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(hpfsSbSector);
+
+        SpareBlock sp = Marshal.ByteArrayToStructureLittleEndian<SpareBlock>(hpfsSpSector);
+
+        if(StringHandlers.CToString(bpb.fs_type) != "HPFS    " ||
+           hpfsSb.magic1                         != 0xF995E849 ||
+           hpfsSb.magic2                         != 0xFA53E9C5 ||
+           sp.magic1                             != 0xF9911849 ||
+           sp.magic2                             != 0xFA5229C5)
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("ibm850");
-            information = "";
-
-            var sb = new StringBuilder();
-
-            ErrorNumber errno =
-                imagePlugin.ReadSector(0 + partition.Start,
-                                       out byte[] hpfsBpbSector); // Seek to BIOS parameter block, on logical sector 0
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            errno = imagePlugin.ReadSector(16 + partition.Start,
-                                           out byte[] hpfsSbSector); // Seek to superblock, on logical sector 16
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            errno = imagePlugin.ReadSector(17 + partition.Start,
-                                           out byte[] hpfsSpSector); // Seek to spareblock, on logical sector 17
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            BiosParameterBlock bpb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock>(hpfsBpbSector);
-
-            SuperBlock hpfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(hpfsSbSector);
-
-            SpareBlock sp = Marshal.ByteArrayToStructureLittleEndian<SpareBlock>(hpfsSpSector);
-
-            if(StringHandlers.CToString(bpb.fs_type) != "HPFS    " ||
-               hpfsSb.magic1                         != 0xF995E849 ||
-               hpfsSb.magic2                         != 0xFA53E9C5 ||
-               sp.magic1                             != 0xF9911849 ||
-               sp.magic2                             != 0xFA5229C5)
-            {
-                sb.AppendLine("This may not be HPFS, following information may be not correct.");
-                sb.AppendFormat("File system type: \"{0}\" (Should be \"HPFS    \")", bpb.fs_type).AppendLine();
-                sb.AppendFormat("Superblock magic1: 0x{0:X8} (Should be 0xF995E849)", hpfsSb.magic1).AppendLine();
-                sb.AppendFormat("Superblock magic2: 0x{0:X8} (Should be 0xFA53E9C5)", hpfsSb.magic2).AppendLine();
-                sb.AppendFormat("Spareblock magic1: 0x{0:X8} (Should be 0xF9911849)", sp.magic1).AppendLine();
-                sb.AppendFormat("Spareblock magic2: 0x{0:X8} (Should be 0xFA5229C5)", sp.magic2).AppendLine();
-            }
-
-            sb.AppendFormat("OEM name: {0}", StringHandlers.CToString(bpb.oem_name)).AppendLine();
-            sb.AppendFormat("{0} bytes per sector", bpb.bps).AppendLine();
-
-            //          sb.AppendFormat("{0} sectors per cluster", hpfs_bpb.spc).AppendLine();
-            //          sb.AppendFormat("{0} reserved sectors", hpfs_bpb.rsectors).AppendLine();
-            //          sb.AppendFormat("{0} FATs", hpfs_bpb.fats_no).AppendLine();
-            //          sb.AppendFormat("{0} entries on root directory", hpfs_bpb.root_ent).AppendLine();
-            //          sb.AppendFormat("{0} mini sectors on volume", hpfs_bpb.sectors).AppendLine();
-            sb.AppendFormat("Media descriptor: 0x{0:X2}", bpb.media).AppendLine();
-
-            //          sb.AppendFormat("{0} sectors per FAT", hpfs_bpb.spfat).AppendLine();
-            //          sb.AppendFormat("{0} sectors per track", hpfs_bpb.sptrk).AppendLine();
-            //          sb.AppendFormat("{0} heads", hpfs_bpb.heads).AppendLine();
-            sb.AppendFormat("{0} sectors hidden before BPB", bpb.hsectors).AppendLine();
-
-            sb.AppendFormat("{0} sectors on volume ({1} bytes)", hpfsSb.sectors, hpfsSb.sectors * bpb.bps).AppendLine();
-
-            //          sb.AppendFormat("{0} sectors on volume ({1} bytes)", hpfs_bpb.big_sectors, hpfs_bpb.big_sectors * hpfs_bpb.bps).AppendLine();
-            sb.AppendFormat("BIOS Drive Number: 0x{0:X2}", bpb.drive_no).AppendLine();
-            sb.AppendFormat("NT Flags: 0x{0:X2}", bpb.nt_flags).AppendLine();
-            sb.AppendFormat("Signature: 0x{0:X2}", bpb.signature).AppendLine();
-            sb.AppendFormat("Serial number: 0x{0:X8}", bpb.serial_no).AppendLine();
-            sb.AppendFormat("Volume label: {0}", StringHandlers.CToString(bpb.volume_label, Encoding)).AppendLine();
-
-            //          sb.AppendFormat("Filesystem type: \"{0}\"", hpfs_bpb.fs_type).AppendLine();
-
-            DateTime lastChk   = DateHandlers.UnixToDateTime(hpfsSb.last_chkdsk);
-            DateTime lastOptim = DateHandlers.UnixToDateTime(hpfsSb.last_optim);
-
-            sb.AppendFormat("HPFS version: {0}", hpfsSb.version).AppendLine();
-            sb.AppendFormat("Functional version: {0}", hpfsSb.func_version).AppendLine();
-            sb.AppendFormat("Sector of root directory FNode: {0}", hpfsSb.root_fnode).AppendLine();
-            sb.AppendFormat("{0} sectors are marked bad", hpfsSb.badblocks).AppendLine();
-            sb.AppendFormat("Sector of free space bitmaps: {0}", hpfsSb.bitmap_lsn).AppendLine();
-            sb.AppendFormat("Sector of bad blocks list: {0}", hpfsSb.badblock_lsn).AppendLine();
-
-            if(hpfsSb.last_chkdsk > 0)
-                sb.AppendFormat("Date of last integrity check: {0}", lastChk).AppendLine();
-            else
-                sb.AppendLine("Filesystem integrity has never been checked");
-
-            if(hpfsSb.last_optim > 0)
-                sb.AppendFormat("Date of last optimization {0}", lastOptim).AppendLine();
-            else
-                sb.AppendLine("Filesystem has never been optimized");
-
-            sb.AppendFormat("Directory band has {0} sectors", hpfsSb.dband_sectors).AppendLine();
-            sb.AppendFormat("Directory band starts at sector {0}", hpfsSb.dband_start).AppendLine();
-            sb.AppendFormat("Directory band ends at sector {0}", hpfsSb.dband_last).AppendLine();
-            sb.AppendFormat("Sector of directory band bitmap: {0}", hpfsSb.dband_bitmap).AppendLine();
-            sb.AppendFormat("Sector of ACL directory: {0}", hpfsSb.acl_start).AppendLine();
-
-            sb.AppendFormat("Sector of Hotfix directory: {0}", sp.hotfix_start).AppendLine();
-            sb.AppendFormat("{0} used Hotfix entries", sp.hotfix_used).AppendLine();
-            sb.AppendFormat("{0} total Hotfix entries", sp.hotfix_entries).AppendLine();
-            sb.AppendFormat("{0} free spare DNodes", sp.spare_dnodes_free).AppendLine();
-            sb.AppendFormat("{0} total spare DNodes", sp.spare_dnodes).AppendLine();
-            sb.AppendFormat("Sector of codepage directory: {0}", sp.codepage_lsn).AppendLine();
-            sb.AppendFormat("{0} codepages used in the volume", sp.codepages).AppendLine();
-            sb.AppendFormat("SuperBlock CRC32: {0:X8}", sp.sb_crc32).AppendLine();
-            sb.AppendFormat("SpareBlock CRC32: {0:X8}", sp.sp_crc32).AppendLine();
-
-            sb.AppendLine("Flags:");
-            sb.AppendLine((sp.flags1 & 0x01) == 0x01 ? "Filesystem is dirty." : "Filesystem is clean.");
-
-            if((sp.flags1 & 0x02) == 0x02)
-                sb.AppendLine("Spare directory blocks are in use");
-
-            if((sp.flags1 & 0x04) == 0x04)
-                sb.AppendLine("Hotfixes are in use");
-
-            if((sp.flags1 & 0x08) == 0x08)
-                sb.AppendLine("Disk contains bad sectors");
-
-            if((sp.flags1 & 0x10) == 0x10)
-                sb.AppendLine("Disk has a bad bitmap");
-
-            if((sp.flags1 & 0x20) == 0x20)
-                sb.AppendLine("Filesystem was formatted fast");
-
-            if((sp.flags1 & 0x40) == 0x40)
-                sb.AppendLine("Unknown flag 0x40 on flags1 is active");
-
-            if((sp.flags1 & 0x80) == 0x80)
-                sb.AppendLine("Filesystem has been mounted by an old IFS");
-
-            if((sp.flags2 & 0x01) == 0x01)
-                sb.AppendLine("Install DASD limits");
-
-            if((sp.flags2 & 0x02) == 0x02)
-                sb.AppendLine("Resync DASD limits");
-
-            if((sp.flags2 & 0x04) == 0x04)
-                sb.AppendLine("DASD limits are operational");
-
-            if((sp.flags2 & 0x08) == 0x08)
-                sb.AppendLine("Multimedia is active");
-
-            if((sp.flags2 & 0x10) == 0x10)
-                sb.AppendLine("DCE ACLs are active");
-
-            if((sp.flags2 & 0x20) == 0x20)
-                sb.AppendLine("DASD limits are dirty");
-
-            if((sp.flags2 & 0x40) == 0x40)
-                sb.AppendLine("Unknown flag 0x40 on flags2 is active");
-
-            if((sp.flags2 & 0x80) == 0x80)
-                sb.AppendLine("Unknown flag 0x80 on flags2 is active");
-
-            XmlFsType = new FileSystemType();
-
-            // Theoretically everything from BPB to SB is boot code, should I hash everything or only the sector loaded by BIOS itself?
-            if(bpb.jump[0]    == 0xEB &&
-               bpb.jump[1]    > 0x3C  &&
-               bpb.jump[1]    < 0x80  &&
-               bpb.signature2 == 0xAA55)
-            {
-                XmlFsType.Bootable = true;
-                string bootChk = Sha1Context.Data(bpb.boot_code, out byte[] _);
-                sb.AppendLine("Volume is bootable");
-                sb.AppendFormat("Boot code's SHA1: {0}", bootChk).AppendLine();
-            }
-
-            XmlFsType.Dirty            |= (sp.flags1 & 0x01) == 0x01;
-            XmlFsType.Clusters         =  hpfsSb.sectors;
-            XmlFsType.ClusterSize      =  bpb.bps;
-            XmlFsType.Type             =  "HPFS";
-            XmlFsType.VolumeName       =  StringHandlers.CToString(bpb.volume_label, Encoding);
-            XmlFsType.VolumeSerial     =  $"{bpb.serial_no:X8}";
-            XmlFsType.SystemIdentifier =  StringHandlers.CToString(bpb.oem_name);
-
-            information = sb.ToString();
+            sb.AppendLine("This may not be HPFS, following information may be not correct.");
+            sb.AppendFormat("File system type: \"{0}\" (Should be \"HPFS    \")", bpb.fs_type).AppendLine();
+            sb.AppendFormat("Superblock magic1: 0x{0:X8} (Should be 0xF995E849)", hpfsSb.magic1).AppendLine();
+            sb.AppendFormat("Superblock magic2: 0x{0:X8} (Should be 0xFA53E9C5)", hpfsSb.magic2).AppendLine();
+            sb.AppendFormat("Spareblock magic1: 0x{0:X8} (Should be 0xF9911849)", sp.magic1).AppendLine();
+            sb.AppendFormat("Spareblock magic2: 0x{0:X8} (Should be 0xFA5229C5)", sp.magic2).AppendLine();
         }
 
-        /// <summary>BIOS Parameter Block, at sector 0</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BiosParameterBlock
+        sb.AppendFormat("OEM name: {0}", StringHandlers.CToString(bpb.oem_name)).AppendLine();
+        sb.AppendFormat("{0} bytes per sector", bpb.bps).AppendLine();
+
+        //          sb.AppendFormat("{0} sectors per cluster", hpfs_bpb.spc).AppendLine();
+        //          sb.AppendFormat("{0} reserved sectors", hpfs_bpb.rsectors).AppendLine();
+        //          sb.AppendFormat("{0} FATs", hpfs_bpb.fats_no).AppendLine();
+        //          sb.AppendFormat("{0} entries on root directory", hpfs_bpb.root_ent).AppendLine();
+        //          sb.AppendFormat("{0} mini sectors on volume", hpfs_bpb.sectors).AppendLine();
+        sb.AppendFormat("Media descriptor: 0x{0:X2}", bpb.media).AppendLine();
+
+        //          sb.AppendFormat("{0} sectors per FAT", hpfs_bpb.spfat).AppendLine();
+        //          sb.AppendFormat("{0} sectors per track", hpfs_bpb.sptrk).AppendLine();
+        //          sb.AppendFormat("{0} heads", hpfs_bpb.heads).AppendLine();
+        sb.AppendFormat("{0} sectors hidden before BPB", bpb.hsectors).AppendLine();
+
+        sb.AppendFormat("{0} sectors on volume ({1} bytes)", hpfsSb.sectors, hpfsSb.sectors * bpb.bps).AppendLine();
+
+        //          sb.AppendFormat("{0} sectors on volume ({1} bytes)", hpfs_bpb.big_sectors, hpfs_bpb.big_sectors * hpfs_bpb.bps).AppendLine();
+        sb.AppendFormat("BIOS Drive Number: 0x{0:X2}", bpb.drive_no).AppendLine();
+        sb.AppendFormat("NT Flags: 0x{0:X2}", bpb.nt_flags).AppendLine();
+        sb.AppendFormat("Signature: 0x{0:X2}", bpb.signature).AppendLine();
+        sb.AppendFormat("Serial number: 0x{0:X8}", bpb.serial_no).AppendLine();
+        sb.AppendFormat("Volume label: {0}", StringHandlers.CToString(bpb.volume_label, Encoding)).AppendLine();
+
+        //          sb.AppendFormat("Filesystem type: \"{0}\"", hpfs_bpb.fs_type).AppendLine();
+
+        DateTime lastChk   = DateHandlers.UnixToDateTime(hpfsSb.last_chkdsk);
+        DateTime lastOptim = DateHandlers.UnixToDateTime(hpfsSb.last_optim);
+
+        sb.AppendFormat("HPFS version: {0}", hpfsSb.version).AppendLine();
+        sb.AppendFormat("Functional version: {0}", hpfsSb.func_version).AppendLine();
+        sb.AppendFormat("Sector of root directory FNode: {0}", hpfsSb.root_fnode).AppendLine();
+        sb.AppendFormat("{0} sectors are marked bad", hpfsSb.badblocks).AppendLine();
+        sb.AppendFormat("Sector of free space bitmaps: {0}", hpfsSb.bitmap_lsn).AppendLine();
+        sb.AppendFormat("Sector of bad blocks list: {0}", hpfsSb.badblock_lsn).AppendLine();
+
+        if(hpfsSb.last_chkdsk > 0)
+            sb.AppendFormat("Date of last integrity check: {0}", lastChk).AppendLine();
+        else
+            sb.AppendLine("Filesystem integrity has never been checked");
+
+        if(hpfsSb.last_optim > 0)
+            sb.AppendFormat("Date of last optimization {0}", lastOptim).AppendLine();
+        else
+            sb.AppendLine("Filesystem has never been optimized");
+
+        sb.AppendFormat("Directory band has {0} sectors", hpfsSb.dband_sectors).AppendLine();
+        sb.AppendFormat("Directory band starts at sector {0}", hpfsSb.dband_start).AppendLine();
+        sb.AppendFormat("Directory band ends at sector {0}", hpfsSb.dband_last).AppendLine();
+        sb.AppendFormat("Sector of directory band bitmap: {0}", hpfsSb.dband_bitmap).AppendLine();
+        sb.AppendFormat("Sector of ACL directory: {0}", hpfsSb.acl_start).AppendLine();
+
+        sb.AppendFormat("Sector of Hotfix directory: {0}", sp.hotfix_start).AppendLine();
+        sb.AppendFormat("{0} used Hotfix entries", sp.hotfix_used).AppendLine();
+        sb.AppendFormat("{0} total Hotfix entries", sp.hotfix_entries).AppendLine();
+        sb.AppendFormat("{0} free spare DNodes", sp.spare_dnodes_free).AppendLine();
+        sb.AppendFormat("{0} total spare DNodes", sp.spare_dnodes).AppendLine();
+        sb.AppendFormat("Sector of codepage directory: {0}", sp.codepage_lsn).AppendLine();
+        sb.AppendFormat("{0} codepages used in the volume", sp.codepages).AppendLine();
+        sb.AppendFormat("SuperBlock CRC32: {0:X8}", sp.sb_crc32).AppendLine();
+        sb.AppendFormat("SpareBlock CRC32: {0:X8}", sp.sp_crc32).AppendLine();
+
+        sb.AppendLine("Flags:");
+        sb.AppendLine((sp.flags1 & 0x01) == 0x01 ? "Filesystem is dirty." : "Filesystem is clean.");
+
+        if((sp.flags1 & 0x02) == 0x02)
+            sb.AppendLine("Spare directory blocks are in use");
+
+        if((sp.flags1 & 0x04) == 0x04)
+            sb.AppendLine("Hotfixes are in use");
+
+        if((sp.flags1 & 0x08) == 0x08)
+            sb.AppendLine("Disk contains bad sectors");
+
+        if((sp.flags1 & 0x10) == 0x10)
+            sb.AppendLine("Disk has a bad bitmap");
+
+        if((sp.flags1 & 0x20) == 0x20)
+            sb.AppendLine("Filesystem was formatted fast");
+
+        if((sp.flags1 & 0x40) == 0x40)
+            sb.AppendLine("Unknown flag 0x40 on flags1 is active");
+
+        if((sp.flags1 & 0x80) == 0x80)
+            sb.AppendLine("Filesystem has been mounted by an old IFS");
+
+        if((sp.flags2 & 0x01) == 0x01)
+            sb.AppendLine("Install DASD limits");
+
+        if((sp.flags2 & 0x02) == 0x02)
+            sb.AppendLine("Resync DASD limits");
+
+        if((sp.flags2 & 0x04) == 0x04)
+            sb.AppendLine("DASD limits are operational");
+
+        if((sp.flags2 & 0x08) == 0x08)
+            sb.AppendLine("Multimedia is active");
+
+        if((sp.flags2 & 0x10) == 0x10)
+            sb.AppendLine("DCE ACLs are active");
+
+        if((sp.flags2 & 0x20) == 0x20)
+            sb.AppendLine("DASD limits are dirty");
+
+        if((sp.flags2 & 0x40) == 0x40)
+            sb.AppendLine("Unknown flag 0x40 on flags2 is active");
+
+        if((sp.flags2 & 0x80) == 0x80)
+            sb.AppendLine("Unknown flag 0x80 on flags2 is active");
+
+        XmlFsType = new FileSystemType();
+
+        // Theoretically everything from BPB to SB is boot code, should I hash everything or only the sector loaded by BIOS itself?
+        if(bpb.jump[0]    == 0xEB &&
+           bpb.jump[1]    > 0x3C  &&
+           bpb.jump[1]    < 0x80  &&
+           bpb.signature2 == 0xAA55)
         {
-            /// <summary>0x000, Jump to boot code</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>0x003, OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>0x00B, Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>0x00D, Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>0x00E, Reserved sectors between BPB and... does it have sense in HPFS?</summary>
-            public readonly ushort rsectors;
-            /// <summary>0x010, Number of FATs... seriously?</summary>
-            public readonly byte fats_no;
-            /// <summary>0x011, Number of entries on root directory... ok</summary>
-            public readonly ushort root_ent;
-            /// <summary>0x013, Sectors in volume... doubt it</summary>
-            public readonly ushort sectors;
-            /// <summary>0x015, Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>0x016, Sectors per FAT... again</summary>
-            public readonly ushort spfat;
-            /// <summary>0x018, Sectors per track... you're kidding</summary>
-            public readonly ushort sptrk;
-            /// <summary>0x01A, Heads... stop!</summary>
-            public readonly ushort heads;
-            /// <summary>0x01C, Hidden sectors before BPB</summary>
-            public readonly uint hsectors;
-            /// <summary>0x024, Sectors in volume if &gt; 65535...</summary>
-            public readonly uint big_sectors;
-            /// <summary>0x028, Drive number</summary>
-            public readonly byte drive_no;
-            /// <summary>0x029, Volume flags?</summary>
-            public readonly byte nt_flags;
-            /// <summary>0x02A, EPB signature, 0x29</summary>
-            public readonly byte signature;
-            /// <summary>0x02B, Volume serial number</summary>
-            public readonly uint serial_no;
-            /// <summary>0x02F, Volume label, 11 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] volume_label;
-            /// <summary>0x03A, Filesystem type, 8 bytes, space-padded ("HPFS    ")</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] fs_type;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 448)]
-            public readonly byte[] boot_code;
-            /// <summary>0x1FE, 0xAA55</summary>
-            public readonly ushort signature2;
+            XmlFsType.Bootable = true;
+            string bootChk = Sha1Context.Data(bpb.boot_code, out byte[] _);
+            sb.AppendLine("Volume is bootable");
+            sb.AppendFormat("Boot code's SHA1: {0}", bootChk).AppendLine();
         }
 
-        /// <summary>HPFS superblock at sector 16</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            /// <summary>0x000, 0xF995E849</summary>
-            public readonly uint magic1;
-            /// <summary>0x004, 0xFA53E9C5</summary>
-            public readonly uint magic2;
-            /// <summary>0x008, HPFS version</summary>
-            public readonly byte version;
-            /// <summary>0x009, 2 if &lt;= 4 GiB, 3 if &gt; 4 GiB</summary>
-            public readonly byte func_version;
-            /// <summary>0x00A, Alignment</summary>
-            public readonly ushort dummy;
-            /// <summary>0x00C, LSN pointer to root fnode</summary>
-            public readonly uint root_fnode;
-            /// <summary>0x010, Sectors on volume</summary>
-            public readonly uint sectors;
-            /// <summary>0x014, Bad blocks on volume</summary>
-            public readonly uint badblocks;
-            /// <summary>0x018, LSN pointer to volume bitmap</summary>
-            public readonly uint bitmap_lsn;
-            /// <summary>0x01C, 0</summary>
-            public readonly uint zero1;
-            /// <summary>0x020, LSN pointer to badblock directory</summary>
-            public readonly uint badblock_lsn;
-            /// <summary>0x024, 0</summary>
-            public readonly uint zero2;
-            /// <summary>0x028, Time of last CHKDSK</summary>
-            public readonly int last_chkdsk;
-            /// <summary>0x02C, Time of last optimization</summary>
-            public readonly int last_optim;
-            /// <summary>0x030, Sectors of dir band</summary>
-            public readonly uint dband_sectors;
-            /// <summary>0x034, Start sector of dir band</summary>
-            public readonly uint dband_start;
-            /// <summary>0x038, Last sector of dir band</summary>
-            public readonly uint dband_last;
-            /// <summary>0x03C, LSN of free space bitmap</summary>
-            public readonly uint dband_bitmap;
-            /// <summary>0x040, Can be used for volume name (32 bytes)</summary>
-            public readonly ulong zero3;
-            /// <summary>0x048, ...</summary>
-            public readonly ulong zero4;
-            /// <summary>0x04C, ...</summary>
-            public readonly ulong zero5;
-            /// <summary>0x050, ...;</summary>
-            public readonly ulong zero6;
-            /// <summary>0x058, LSN pointer to ACLs (only HPFS386)</summary>
-            public readonly uint acl_start;
-        }
+        XmlFsType.Dirty            |= (sp.flags1 & 0x01) == 0x01;
+        XmlFsType.Clusters         =  hpfsSb.sectors;
+        XmlFsType.ClusterSize      =  bpb.bps;
+        XmlFsType.Type             =  "HPFS";
+        XmlFsType.VolumeName       =  StringHandlers.CToString(bpb.volume_label, Encoding);
+        XmlFsType.VolumeSerial     =  $"{bpb.serial_no:X8}";
+        XmlFsType.SystemIdentifier =  StringHandlers.CToString(bpb.oem_name);
 
-        /// <summary>HPFS spareblock at sector 17</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SpareBlock
-        {
-            /// <summary>0x000, 0xF9911849</summary>
-            public readonly uint magic1;
-            /// <summary>0x004, 0xFA5229C5</summary>
-            public readonly uint magic2;
-            /// <summary>0x008, HPFS flags</summary>
-            public readonly byte flags1;
-            /// <summary>0x009, HPFS386 flags</summary>
-            public readonly byte flags2;
-            /// <summary>0x00A, Alignment</summary>
-            public readonly ushort dummy;
-            /// <summary>0x00C, LSN of hotfix directory</summary>
-            public readonly uint hotfix_start;
-            /// <summary>0x010, Used hotfixes</summary>
-            public readonly uint hotfix_used;
-            /// <summary>0x014, Total hotfixes available</summary>
-            public readonly uint hotfix_entries;
-            /// <summary>0x018, Unused spare dnodes</summary>
-            public readonly uint spare_dnodes_free;
-            /// <summary>0x01C, Length of spare dnodes list</summary>
-            public readonly uint spare_dnodes;
-            /// <summary>0x020, LSN of codepage directory</summary>
-            public readonly uint codepage_lsn;
-            /// <summary>0x024, Number of codepages used</summary>
-            public readonly uint codepages;
-            /// <summary>0x028, SuperBlock CRC32 (only HPFS386)</summary>
-            public readonly uint sb_crc32;
-            /// <summary>0x02C, SpareBlock CRC32 (only HPFS386)</summary>
-            public readonly uint sp_crc32;
-        }
+        information = sb.ToString();
+    }
+
+    /// <summary>BIOS Parameter Block, at sector 0</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BiosParameterBlock
+    {
+        /// <summary>0x000, Jump to boot code</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>0x003, OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>0x00B, Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>0x00D, Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>0x00E, Reserved sectors between BPB and... does it have sense in HPFS?</summary>
+        public readonly ushort rsectors;
+        /// <summary>0x010, Number of FATs... seriously?</summary>
+        public readonly byte fats_no;
+        /// <summary>0x011, Number of entries on root directory... ok</summary>
+        public readonly ushort root_ent;
+        /// <summary>0x013, Sectors in volume... doubt it</summary>
+        public readonly ushort sectors;
+        /// <summary>0x015, Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>0x016, Sectors per FAT... again</summary>
+        public readonly ushort spfat;
+        /// <summary>0x018, Sectors per track... you're kidding</summary>
+        public readonly ushort sptrk;
+        /// <summary>0x01A, Heads... stop!</summary>
+        public readonly ushort heads;
+        /// <summary>0x01C, Hidden sectors before BPB</summary>
+        public readonly uint hsectors;
+        /// <summary>0x024, Sectors in volume if &gt; 65535...</summary>
+        public readonly uint big_sectors;
+        /// <summary>0x028, Drive number</summary>
+        public readonly byte drive_no;
+        /// <summary>0x029, Volume flags?</summary>
+        public readonly byte nt_flags;
+        /// <summary>0x02A, EPB signature, 0x29</summary>
+        public readonly byte signature;
+        /// <summary>0x02B, Volume serial number</summary>
+        public readonly uint serial_no;
+        /// <summary>0x02F, Volume label, 11 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] volume_label;
+        /// <summary>0x03A, Filesystem type, 8 bytes, space-padded ("HPFS    ")</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] fs_type;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 448)]
+        public readonly byte[] boot_code;
+        /// <summary>0x1FE, 0xAA55</summary>
+        public readonly ushort signature2;
+    }
+
+    /// <summary>HPFS superblock at sector 16</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        /// <summary>0x000, 0xF995E849</summary>
+        public readonly uint magic1;
+        /// <summary>0x004, 0xFA53E9C5</summary>
+        public readonly uint magic2;
+        /// <summary>0x008, HPFS version</summary>
+        public readonly byte version;
+        /// <summary>0x009, 2 if &lt;= 4 GiB, 3 if &gt; 4 GiB</summary>
+        public readonly byte func_version;
+        /// <summary>0x00A, Alignment</summary>
+        public readonly ushort dummy;
+        /// <summary>0x00C, LSN pointer to root fnode</summary>
+        public readonly uint root_fnode;
+        /// <summary>0x010, Sectors on volume</summary>
+        public readonly uint sectors;
+        /// <summary>0x014, Bad blocks on volume</summary>
+        public readonly uint badblocks;
+        /// <summary>0x018, LSN pointer to volume bitmap</summary>
+        public readonly uint bitmap_lsn;
+        /// <summary>0x01C, 0</summary>
+        public readonly uint zero1;
+        /// <summary>0x020, LSN pointer to badblock directory</summary>
+        public readonly uint badblock_lsn;
+        /// <summary>0x024, 0</summary>
+        public readonly uint zero2;
+        /// <summary>0x028, Time of last CHKDSK</summary>
+        public readonly int last_chkdsk;
+        /// <summary>0x02C, Time of last optimization</summary>
+        public readonly int last_optim;
+        /// <summary>0x030, Sectors of dir band</summary>
+        public readonly uint dband_sectors;
+        /// <summary>0x034, Start sector of dir band</summary>
+        public readonly uint dband_start;
+        /// <summary>0x038, Last sector of dir band</summary>
+        public readonly uint dband_last;
+        /// <summary>0x03C, LSN of free space bitmap</summary>
+        public readonly uint dband_bitmap;
+        /// <summary>0x040, Can be used for volume name (32 bytes)</summary>
+        public readonly ulong zero3;
+        /// <summary>0x048, ...</summary>
+        public readonly ulong zero4;
+        /// <summary>0x04C, ...</summary>
+        public readonly ulong zero5;
+        /// <summary>0x050, ...;</summary>
+        public readonly ulong zero6;
+        /// <summary>0x058, LSN pointer to ACLs (only HPFS386)</summary>
+        public readonly uint acl_start;
+    }
+
+    /// <summary>HPFS spareblock at sector 17</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SpareBlock
+    {
+        /// <summary>0x000, 0xF9911849</summary>
+        public readonly uint magic1;
+        /// <summary>0x004, 0xFA5229C5</summary>
+        public readonly uint magic2;
+        /// <summary>0x008, HPFS flags</summary>
+        public readonly byte flags1;
+        /// <summary>0x009, HPFS386 flags</summary>
+        public readonly byte flags2;
+        /// <summary>0x00A, Alignment</summary>
+        public readonly ushort dummy;
+        /// <summary>0x00C, LSN of hotfix directory</summary>
+        public readonly uint hotfix_start;
+        /// <summary>0x010, Used hotfixes</summary>
+        public readonly uint hotfix_used;
+        /// <summary>0x014, Total hotfixes available</summary>
+        public readonly uint hotfix_entries;
+        /// <summary>0x018, Unused spare dnodes</summary>
+        public readonly uint spare_dnodes_free;
+        /// <summary>0x01C, Length of spare dnodes list</summary>
+        public readonly uint spare_dnodes;
+        /// <summary>0x020, LSN of codepage directory</summary>
+        public readonly uint codepage_lsn;
+        /// <summary>0x024, Number of codepages used</summary>
+        public readonly uint codepages;
+        /// <summary>0x028, SuperBlock CRC32 (only HPFS386)</summary>
+        public readonly uint sb_crc32;
+        /// <summary>0x02C, SpareBlock CRC32 (only HPFS386)</summary>
+        public readonly uint sp_crc32;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/HPOFS/Consts.cs b/Aaru.Filesystems/HPOFS/Consts.cs
index 2f07b0db2..1825c849c 100644
--- a/Aaru.Filesystems/HPOFS/Consts.cs
+++ b/Aaru.Filesystems/HPOFS/Consts.cs
@@ -30,21 +30,20 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class HPOFS
 {
-    public sealed partial class HPOFS
+    readonly byte[] _type =
     {
-        readonly byte[] _type =
-        {
-            0x48, 0x50, 0x4F, 0x46, 0x53, 0x00, 0x00, 0x00
-        };
-        readonly byte[] _medinfoSignature =
-        {
-            0x4D, 0x45, 0x44, 0x49, 0x4E, 0x46, 0x4F, 0x20
-        };
-        readonly byte[] _volinfoSignature =
-        {
-            0x56, 0x4F, 0x4C, 0x49, 0x4E, 0x46, 0x4F, 0x20
-        };
-    }
+        0x48, 0x50, 0x4F, 0x46, 0x53, 0x00, 0x00, 0x00
+    };
+    readonly byte[] _medinfoSignature =
+    {
+        0x4D, 0x45, 0x44, 0x49, 0x4E, 0x46, 0x4F, 0x20
+    };
+    readonly byte[] _volinfoSignature =
+    {
+        0x56, 0x4F, 0x4C, 0x49, 0x4E, 0x46, 0x4F, 0x20
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/HPOFS/HPOFS.cs b/Aaru.Filesystems/HPOFS/HPOFS.cs
index c5d792cbb..cc91ada30 100644
--- a/Aaru.Filesystems/HPOFS/HPOFS.cs
+++ b/Aaru.Filesystems/HPOFS/HPOFS.cs
@@ -35,23 +35,22 @@ using System.Text;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from test floppy images created with OS/2 HPOFS 2.0
+// Need to get IBM document GA32-0224 -> IBM 3995 Optical Library Dataserver Products: Optical Disk Format
+/// <inheritdoc />
+/// <summary>Implements identification of IBM's High Performance Optical File System</summary>
+public sealed partial class HPOFS : IFilesystem
 {
-    // Information from test floppy images created with OS/2 HPOFS 2.0
-    // Need to get IBM document GA32-0224 -> IBM 3995 Optical Library Dataserver Products: Optical Disk Format
     /// <inheritdoc />
-    /// <summary>Implements identification of IBM's High Performance Optical File System</summary>
-    public sealed partial class HPOFS : IFilesystem
-    {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "High Performance Optical File System";
-        /// <inheritdoc />
-        public Guid Id => new Guid("1b72dcd5-d031-4757-8a9f-8d2fb18c59e2");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-    }
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "High Performance Optical File System";
+    /// <inheritdoc />
+    public Guid Id => new Guid("1b72dcd5-d031-4757-8a9f-8d2fb18c59e2");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/HPOFS/Info.cs b/Aaru.Filesystems/HPOFS/Info.cs
index b73df7cf6..b2739737b 100644
--- a/Aaru.Filesystems/HPOFS/Info.cs
+++ b/Aaru.Filesystems/HPOFS/Info.cs
@@ -40,193 +40,192 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class HPOFS
 {
-    public sealed partial class HPOFS
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(16 + partition.Start >= partition.End)
+            return false;
+
+        ErrorNumber errno =
+            imagePlugin.ReadSector(0 + partition.Start,
+                                   out byte[] hpofsBpbSector); // Seek to BIOS parameter block, on logical sector 0
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(hpofsBpbSector.Length < 512)
+            return false;
+
+        BiosParameterBlock bpb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock>(hpofsBpbSector);
+
+        return bpb.fs_type.SequenceEqual(_type);
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("ibm850");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        ErrorNumber errno =
+            imagePlugin.ReadSector(0 + partition.Start,
+                                   out byte[] hpofsBpbSector); // Seek to BIOS parameter block, on logical sector 0
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        errno = imagePlugin.ReadSector(13 + partition.Start,
+                                       out byte[] medInfoSector); // Seek to media information block, on logical sector 13
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        errno = imagePlugin.ReadSector(14 + partition.Start,
+                                       out byte[] volInfoSector); // Seek to volume information block, on logical sector 14
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        BiosParameterBlock     bpb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock>(hpofsBpbSector);
+        MediaInformationBlock  mib = Marshal.ByteArrayToStructureBigEndian<MediaInformationBlock>(medInfoSector);
+        VolumeInformationBlock vib = Marshal.ByteArrayToStructureBigEndian<VolumeInformationBlock>(volInfoSector);
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.oem_name = \"{0}\"",
+                                   StringHandlers.CToString(bpb.oem_name));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.bps = {0}", bpb.bps);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.spc = {0}", bpb.spc);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.rsectors = {0}", bpb.rsectors);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.fats_no = {0}", bpb.fats_no);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.root_ent = {0}", bpb.root_ent);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.sectors = {0}", bpb.sectors);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.media = 0x{0:X2}", bpb.media);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.spfat = {0}", bpb.spfat);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.sptrk = {0}", bpb.sptrk);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.heads = {0}", bpb.heads);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.hsectors = {0}", bpb.hsectors);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.big_sectors = {0}", bpb.big_sectors);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.drive_no = 0x{0:X2}", bpb.drive_no);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.nt_flags = {0}", bpb.nt_flags);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.signature = 0x{0:X2}", bpb.signature);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.serial_no = 0x{0:X8}", bpb.serial_no);
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.volume_label = \"{0}\"",
+                                   StringHandlers.SpacePaddedToString(bpb.volume_label));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.fs_type = \"{0}\"", StringHandlers.CToString(bpb.fs_type));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.boot_code is empty? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(bpb.boot_code));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.unknown = {0}", bpb.unknown);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.unknown2 = {0}", bpb.unknown2);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.signature2 = {0}", bpb.signature2);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.blockId = \"{0}\"", StringHandlers.CToString(mib.blockId));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.volumeLabel = \"{0}\"",
+                                   StringHandlers.SpacePaddedToString(mib.volumeLabel));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.comment = \"{0}\"",
+                                   StringHandlers.SpacePaddedToString(mib.comment));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.serial = 0x{0:X8}", mib.serial);
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.creationTimestamp = {0}",
+                                   DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.codepageType = {0}", mib.codepageType);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.codepage = {0}", mib.codepage);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.rps = {0}", mib.rps);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.bps = {0}", mib.bps);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.bpc = {0}", mib.bpc);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown2 = {0}", mib.unknown2);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.sectors = {0}", mib.sectors);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown3 = {0}", mib.unknown3);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown4 = {0}", mib.unknown4);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.major = {0}", mib.major);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.minor = {0}", mib.minor);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown5 = {0}", mib.unknown5);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown6 = {0}", mib.unknown6);
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.filler is empty? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(mib.filler));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.blockId = \"{0}\"", StringHandlers.CToString(vib.blockId));
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown = {0}", vib.unknown);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown2 = {0}", vib.unknown2);
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown3 is empty? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(vib.unknown3));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown4 = \"{0}\"",
+                                   StringHandlers.SpacePaddedToString(vib.unknown4));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.owner = \"{0}\"",
+                                   StringHandlers.SpacePaddedToString(vib.owner));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown5 = \"{0}\"",
+                                   StringHandlers.SpacePaddedToString(vib.unknown5));
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown6 = {0}", vib.unknown6);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.percentFull = {0}", vib.percentFull);
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown7 = {0}", vib.unknown7);
+
+        AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.filler is empty? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(vib.filler));
+
+        sb.AppendLine("High Performance Optical File System");
+        sb.AppendFormat("OEM name: {0}", StringHandlers.SpacePaddedToString(bpb.oem_name)).AppendLine();
+        sb.AppendFormat("{0} bytes per sector", bpb.bps).AppendLine();
+        sb.AppendFormat("{0} sectors per cluster", bpb.spc).AppendLine();
+        sb.AppendFormat("Media descriptor: 0x{0:X2}", bpb.media).AppendLine();
+        sb.AppendFormat("{0} sectors per track", bpb.sptrk).AppendLine();
+        sb.AppendFormat("{0} heads", bpb.heads).AppendLine();
+        sb.AppendFormat("{0} sectors hidden before BPB", bpb.hsectors).AppendLine();
+        sb.AppendFormat("{0} sectors on volume ({1} bytes)", mib.sectors, mib.sectors * bpb.bps).AppendLine();
+        sb.AppendFormat("BIOS Drive Number: 0x{0:X2}", bpb.drive_no).AppendLine();
+        sb.AppendFormat("Serial number: 0x{0:X8}", mib.serial).AppendLine();
+
+        sb.AppendFormat("Volume label: {0}", StringHandlers.SpacePaddedToString(mib.volumeLabel, Encoding)).
+           AppendLine();
+
+        sb.AppendFormat("Volume comment: {0}", StringHandlers.SpacePaddedToString(mib.comment, Encoding)).
+           AppendLine();
+
+        sb.AppendFormat("Volume owner: {0}", StringHandlers.SpacePaddedToString(vib.owner, Encoding)).AppendLine();
+
+        sb.AppendFormat("Volume created on {0}", DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime)).
+           AppendLine();
+
+        sb.AppendFormat("Volume uses {0} codepage {1}", mib.codepageType > 0 && mib.codepageType < 3
+                                                            ? mib.codepageType == 2
+                                                                  ? "EBCDIC"
+                                                                  : "ASCII" : "Unknown", mib.codepage).AppendLine();
+
+        sb.AppendFormat("RPS level: {0}", mib.rps).AppendLine();
+        sb.AppendFormat("Filesystem version: {0}.{1}", mib.major, mib.minor).AppendLine();
+        sb.AppendFormat("Volume can be filled up to {0}%", vib.percentFull).AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            if(16 + partition.Start >= partition.End)
-                return false;
+            Clusters               = mib.sectors / bpb.spc,
+            ClusterSize            = (uint)(bpb.bps * bpb.spc),
+            CreationDate           = DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime),
+            CreationDateSpecified  = true,
+            DataPreparerIdentifier = StringHandlers.SpacePaddedToString(vib.owner, Encoding),
+            Type                   = "HPOFS",
+            VolumeName             = StringHandlers.SpacePaddedToString(mib.volumeLabel, Encoding),
+            VolumeSerial           = $"{mib.serial:X8}",
+            SystemIdentifier       = StringHandlers.SpacePaddedToString(bpb.oem_name)
+        };
 
-            ErrorNumber errno =
-                imagePlugin.ReadSector(0 + partition.Start,
-                                       out byte[] hpofsBpbSector); // Seek to BIOS parameter block, on logical sector 0
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(hpofsBpbSector.Length < 512)
-                return false;
-
-            BiosParameterBlock bpb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock>(hpofsBpbSector);
-
-            return bpb.fs_type.SequenceEqual(_type);
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("ibm850");
-            information = "";
-
-            var sb = new StringBuilder();
-
-            ErrorNumber errno =
-                imagePlugin.ReadSector(0 + partition.Start,
-                                       out byte[] hpofsBpbSector); // Seek to BIOS parameter block, on logical sector 0
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            errno = imagePlugin.ReadSector(13 + partition.Start,
-                                           out byte[] medInfoSector); // Seek to media information block, on logical sector 13
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            errno = imagePlugin.ReadSector(14 + partition.Start,
-                                           out byte[] volInfoSector); // Seek to volume information block, on logical sector 14
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            BiosParameterBlock     bpb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock>(hpofsBpbSector);
-            MediaInformationBlock  mib = Marshal.ByteArrayToStructureBigEndian<MediaInformationBlock>(medInfoSector);
-            VolumeInformationBlock vib = Marshal.ByteArrayToStructureBigEndian<VolumeInformationBlock>(volInfoSector);
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.oem_name = \"{0}\"",
-                                       StringHandlers.CToString(bpb.oem_name));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.bps = {0}", bpb.bps);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.spc = {0}", bpb.spc);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.rsectors = {0}", bpb.rsectors);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.fats_no = {0}", bpb.fats_no);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.root_ent = {0}", bpb.root_ent);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.sectors = {0}", bpb.sectors);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.media = 0x{0:X2}", bpb.media);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.spfat = {0}", bpb.spfat);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.sptrk = {0}", bpb.sptrk);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.heads = {0}", bpb.heads);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.hsectors = {0}", bpb.hsectors);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.big_sectors = {0}", bpb.big_sectors);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.drive_no = 0x{0:X2}", bpb.drive_no);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.nt_flags = {0}", bpb.nt_flags);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.signature = 0x{0:X2}", bpb.signature);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.serial_no = 0x{0:X8}", bpb.serial_no);
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.volume_label = \"{0}\"",
-                                       StringHandlers.SpacePaddedToString(bpb.volume_label));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.fs_type = \"{0}\"", StringHandlers.CToString(bpb.fs_type));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.boot_code is empty? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(bpb.boot_code));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.unknown = {0}", bpb.unknown);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.unknown2 = {0}", bpb.unknown2);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "bpb.signature2 = {0}", bpb.signature2);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.blockId = \"{0}\"", StringHandlers.CToString(mib.blockId));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.volumeLabel = \"{0}\"",
-                                       StringHandlers.SpacePaddedToString(mib.volumeLabel));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.comment = \"{0}\"",
-                                       StringHandlers.SpacePaddedToString(mib.comment));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.serial = 0x{0:X8}", mib.serial);
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.creationTimestamp = {0}",
-                                       DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.codepageType = {0}", mib.codepageType);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.codepage = {0}", mib.codepage);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.rps = {0}", mib.rps);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.bps = {0}", mib.bps);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.bpc = {0}", mib.bpc);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown2 = {0}", mib.unknown2);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.sectors = {0}", mib.sectors);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown3 = {0}", mib.unknown3);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown4 = {0}", mib.unknown4);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.major = {0}", mib.major);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.minor = {0}", mib.minor);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown5 = {0}", mib.unknown5);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.unknown6 = {0}", mib.unknown6);
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "mib.filler is empty? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(mib.filler));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.blockId = \"{0}\"", StringHandlers.CToString(vib.blockId));
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown = {0}", vib.unknown);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown2 = {0}", vib.unknown2);
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown3 is empty? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(vib.unknown3));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown4 = \"{0}\"",
-                                       StringHandlers.SpacePaddedToString(vib.unknown4));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.owner = \"{0}\"",
-                                       StringHandlers.SpacePaddedToString(vib.owner));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown5 = \"{0}\"",
-                                       StringHandlers.SpacePaddedToString(vib.unknown5));
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown6 = {0}", vib.unknown6);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.percentFull = {0}", vib.percentFull);
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.unknown7 = {0}", vib.unknown7);
-
-            AaruConsole.DebugWriteLine("HPOFS Plugin", "vib.filler is empty? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(vib.filler));
-
-            sb.AppendLine("High Performance Optical File System");
-            sb.AppendFormat("OEM name: {0}", StringHandlers.SpacePaddedToString(bpb.oem_name)).AppendLine();
-            sb.AppendFormat("{0} bytes per sector", bpb.bps).AppendLine();
-            sb.AppendFormat("{0} sectors per cluster", bpb.spc).AppendLine();
-            sb.AppendFormat("Media descriptor: 0x{0:X2}", bpb.media).AppendLine();
-            sb.AppendFormat("{0} sectors per track", bpb.sptrk).AppendLine();
-            sb.AppendFormat("{0} heads", bpb.heads).AppendLine();
-            sb.AppendFormat("{0} sectors hidden before BPB", bpb.hsectors).AppendLine();
-            sb.AppendFormat("{0} sectors on volume ({1} bytes)", mib.sectors, mib.sectors * bpb.bps).AppendLine();
-            sb.AppendFormat("BIOS Drive Number: 0x{0:X2}", bpb.drive_no).AppendLine();
-            sb.AppendFormat("Serial number: 0x{0:X8}", mib.serial).AppendLine();
-
-            sb.AppendFormat("Volume label: {0}", StringHandlers.SpacePaddedToString(mib.volumeLabel, Encoding)).
-               AppendLine();
-
-            sb.AppendFormat("Volume comment: {0}", StringHandlers.SpacePaddedToString(mib.comment, Encoding)).
-               AppendLine();
-
-            sb.AppendFormat("Volume owner: {0}", StringHandlers.SpacePaddedToString(vib.owner, Encoding)).AppendLine();
-
-            sb.AppendFormat("Volume created on {0}", DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime)).
-               AppendLine();
-
-            sb.AppendFormat("Volume uses {0} codepage {1}", mib.codepageType > 0 && mib.codepageType < 3
-                                                                ? mib.codepageType == 2
-                                                                      ? "EBCDIC"
-                                                                      : "ASCII" : "Unknown", mib.codepage).AppendLine();
-
-            sb.AppendFormat("RPS level: {0}", mib.rps).AppendLine();
-            sb.AppendFormat("Filesystem version: {0}.{1}", mib.major, mib.minor).AppendLine();
-            sb.AppendFormat("Volume can be filled up to {0}%", vib.percentFull).AppendLine();
-
-            XmlFsType = new FileSystemType
-            {
-                Clusters               = mib.sectors / bpb.spc,
-                ClusterSize            = (uint)(bpb.bps * bpb.spc),
-                CreationDate           = DateHandlers.DosToDateTime(mib.creationDate, mib.creationTime),
-                CreationDateSpecified  = true,
-                DataPreparerIdentifier = StringHandlers.SpacePaddedToString(vib.owner, Encoding),
-                Type                   = "HPOFS",
-                VolumeName             = StringHandlers.SpacePaddedToString(mib.volumeLabel, Encoding),
-                VolumeSerial           = $"{mib.serial:X8}",
-                SystemIdentifier       = StringHandlers.SpacePaddedToString(bpb.oem_name)
-            };
-
-            information = sb.ToString();
-        }
+        information = sb.ToString();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/HPOFS/Structs.cs b/Aaru.Filesystems/HPOFS/Structs.cs
index 8dbb388ca..57219eb21 100644
--- a/Aaru.Filesystems/HPOFS/Structs.cs
+++ b/Aaru.Filesystems/HPOFS/Structs.cs
@@ -33,327 +33,326 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class HPOFS
 {
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class HPOFS
+    /// <summary>BIOS Parameter Block, at sector 0, little-endian</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BiosParameterBlock
     {
-        /// <summary>BIOS Parameter Block, at sector 0, little-endian</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BiosParameterBlock
-        {
-            /// <summary>0x000, Jump to boot code</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>0x003, OEM Name, 8 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>0x00B, Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>0x00D, Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>0x00E, Reserved sectors between BPB and... does it have sense in HPFS?</summary>
-            public readonly ushort rsectors;
-            /// <summary>0x010, Number of FATs... seriously?</summary>
-            public readonly byte fats_no;
-            /// <summary>0x011, Number of entries on root directory... ok</summary>
-            public readonly ushort root_ent;
-            /// <summary>0x013, Sectors in volume... doubt it</summary>
-            public readonly ushort sectors;
-            /// <summary>0x015, Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>0x016, Sectors per FAT... again</summary>
-            public readonly ushort spfat;
-            /// <summary>0x018, Sectors per track... you're kidding</summary>
-            public readonly ushort sptrk;
-            /// <summary>0x01A, Heads... stop!</summary>
-            public readonly ushort heads;
-            /// <summary>0x01C, Hidden sectors before BPB</summary>
-            public readonly uint hsectors;
-            /// <summary>0x024, Sectors in volume if &gt; 65535...</summary>
-            public readonly uint big_sectors;
-            /// <summary>0x028, Drive number</summary>
-            public readonly byte drive_no;
-            /// <summary>0x029, Volume flags?</summary>
-            public readonly byte nt_flags;
-            /// <summary>0x02A, EPB signature, 0x29</summary>
-            public readonly byte signature;
-            /// <summary>0x02B, Volume serial number</summary>
-            public readonly uint serial_no;
-            /// <summary>0x02F, Volume label, 11 bytes, space-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] volume_label;
-            /// <summary>0x03A, Filesystem type, 8 bytes, space-padded ("HPOFS   ")</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] fs_type;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 442)]
-            public readonly byte[] boot_code;
-            /// <summary>0x1F8, Unknown</summary>
-            public readonly uint unknown;
-            /// <summary>0x1FC, Unknown</summary>
-            public readonly ushort unknown2;
-            /// <summary>0x1FE, 0xAA55</summary>
-            public readonly ushort signature2;
-        }
+        /// <summary>0x000, Jump to boot code</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>0x003, OEM Name, 8 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>0x00B, Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>0x00D, Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>0x00E, Reserved sectors between BPB and... does it have sense in HPFS?</summary>
+        public readonly ushort rsectors;
+        /// <summary>0x010, Number of FATs... seriously?</summary>
+        public readonly byte fats_no;
+        /// <summary>0x011, Number of entries on root directory... ok</summary>
+        public readonly ushort root_ent;
+        /// <summary>0x013, Sectors in volume... doubt it</summary>
+        public readonly ushort sectors;
+        /// <summary>0x015, Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>0x016, Sectors per FAT... again</summary>
+        public readonly ushort spfat;
+        /// <summary>0x018, Sectors per track... you're kidding</summary>
+        public readonly ushort sptrk;
+        /// <summary>0x01A, Heads... stop!</summary>
+        public readonly ushort heads;
+        /// <summary>0x01C, Hidden sectors before BPB</summary>
+        public readonly uint hsectors;
+        /// <summary>0x024, Sectors in volume if &gt; 65535...</summary>
+        public readonly uint big_sectors;
+        /// <summary>0x028, Drive number</summary>
+        public readonly byte drive_no;
+        /// <summary>0x029, Volume flags?</summary>
+        public readonly byte nt_flags;
+        /// <summary>0x02A, EPB signature, 0x29</summary>
+        public readonly byte signature;
+        /// <summary>0x02B, Volume serial number</summary>
+        public readonly uint serial_no;
+        /// <summary>0x02F, Volume label, 11 bytes, space-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] volume_label;
+        /// <summary>0x03A, Filesystem type, 8 bytes, space-padded ("HPOFS   ")</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] fs_type;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 442)]
+        public readonly byte[] boot_code;
+        /// <summary>0x1F8, Unknown</summary>
+        public readonly uint unknown;
+        /// <summary>0x1FC, Unknown</summary>
+        public readonly ushort unknown2;
+        /// <summary>0x1FE, 0xAA55</summary>
+        public readonly ushort signature2;
+    }
 
-        /// <summary>Media Information Block, at sector 13, big-endian</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MediaInformationBlock
-        {
-            /// <summary>Block identifier "MEDINFO "</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] blockId;
-            /// <summary>Volume label</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] volumeLabel;
-            /// <summary>Volume comment</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 160)]
-            public readonly byte[] comment;
-            /// <summary>Volume serial number</summary>
-            public readonly uint serial;
-            /// <summary>Volume creation date, DOS format</summary>
-            public readonly ushort creationDate;
-            /// <summary>Volume creation time, DOS format</summary>
-            public readonly ushort creationTime;
-            /// <summary>Codepage type: 1 ASCII, 2 EBCDIC</summary>
-            public readonly ushort codepageType;
-            /// <summary>Codepage</summary>
-            public readonly ushort codepage;
-            /// <summary>RPS level</summary>
-            public readonly uint rps;
-            /// <summary>Coincides with bytes per sector, and bytes per cluster, need more media</summary>
-            public readonly ushort bps;
-            /// <summary>Coincides with bytes per sector, and bytes per cluster, need more media</summary>
-            public readonly ushort bpc;
-            /// <summary>Unknown, empty</summary>
-            public readonly uint unknown2;
-            /// <summary>Sectors (or clusters)</summary>
-            public readonly uint sectors;
-            /// <summary>Unknown, coincides with bps but changing it makes nothing</summary>
-            public readonly uint unknown3;
-            /// <summary>Empty?</summary>
-            public readonly ulong unknown4;
-            /// <summary>Format major version</summary>
-            public readonly ushort major;
-            /// <summary>Format minor version</summary>
-            public readonly ushort minor;
-            /// <summary>Empty?</summary>
-            public readonly uint unknown5;
-            /// <summary>Unknown, non-empty</summary>
-            public readonly uint unknown6;
-            /// <summary>Empty</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 260)]
-            public readonly byte[] filler;
-        }
+    /// <summary>Media Information Block, at sector 13, big-endian</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MediaInformationBlock
+    {
+        /// <summary>Block identifier "MEDINFO "</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] blockId;
+        /// <summary>Volume label</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] volumeLabel;
+        /// <summary>Volume comment</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 160)]
+        public readonly byte[] comment;
+        /// <summary>Volume serial number</summary>
+        public readonly uint serial;
+        /// <summary>Volume creation date, DOS format</summary>
+        public readonly ushort creationDate;
+        /// <summary>Volume creation time, DOS format</summary>
+        public readonly ushort creationTime;
+        /// <summary>Codepage type: 1 ASCII, 2 EBCDIC</summary>
+        public readonly ushort codepageType;
+        /// <summary>Codepage</summary>
+        public readonly ushort codepage;
+        /// <summary>RPS level</summary>
+        public readonly uint rps;
+        /// <summary>Coincides with bytes per sector, and bytes per cluster, need more media</summary>
+        public readonly ushort bps;
+        /// <summary>Coincides with bytes per sector, and bytes per cluster, need more media</summary>
+        public readonly ushort bpc;
+        /// <summary>Unknown, empty</summary>
+        public readonly uint unknown2;
+        /// <summary>Sectors (or clusters)</summary>
+        public readonly uint sectors;
+        /// <summary>Unknown, coincides with bps but changing it makes nothing</summary>
+        public readonly uint unknown3;
+        /// <summary>Empty?</summary>
+        public readonly ulong unknown4;
+        /// <summary>Format major version</summary>
+        public readonly ushort major;
+        /// <summary>Format minor version</summary>
+        public readonly ushort minor;
+        /// <summary>Empty?</summary>
+        public readonly uint unknown5;
+        /// <summary>Unknown, non-empty</summary>
+        public readonly uint unknown6;
+        /// <summary>Empty</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 260)]
+        public readonly byte[] filler;
+    }
 
-        /// <summary>Volume Information Block, at sector 14, big-endian</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct VolumeInformationBlock
-        {
-            /// <summary>Block identifier "VOLINFO "</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] blockId;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown2;
-            /// <summary>Some kind of counter</summary>
-            public readonly uint dir_intent_cnt;
-            /// <summary>Some kind of counter, another</summary>
-            public readonly uint dir_update_cnt;
-            /// <summary>Unknown</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
-            public readonly byte[] unknown3;
-            /// <summary>Unknown, space-padded string</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] unknown4;
-            /// <summary>Owner, space-padded string</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] owner;
-            /// <summary>Unknown, space-padded string</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] unknown5;
-            /// <summary>Unknown, empty?</summary>
-            public readonly uint unknown6;
-            /// <summary>Maximum percent full</summary>
-            public readonly ushort percentFull;
-            /// <summary>Unknown, empty?</summary>
-            public readonly ushort unknown7;
-            /// <summary>Empty</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 384)]
-            public readonly byte[] filler;
-        }
+    /// <summary>Volume Information Block, at sector 14, big-endian</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct VolumeInformationBlock
+    {
+        /// <summary>Block identifier "VOLINFO "</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] blockId;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown2;
+        /// <summary>Some kind of counter</summary>
+        public readonly uint dir_intent_cnt;
+        /// <summary>Some kind of counter, another</summary>
+        public readonly uint dir_update_cnt;
+        /// <summary>Unknown</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
+        public readonly byte[] unknown3;
+        /// <summary>Unknown, space-padded string</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] unknown4;
+        /// <summary>Owner, space-padded string</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] owner;
+        /// <summary>Unknown, space-padded string</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] unknown5;
+        /// <summary>Unknown, empty?</summary>
+        public readonly uint unknown6;
+        /// <summary>Maximum percent full</summary>
+        public readonly ushort percentFull;
+        /// <summary>Unknown, empty?</summary>
+        public readonly ushort unknown7;
+        /// <summary>Empty</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 384)]
+        public readonly byte[] filler;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Extent
-        {
-            /// <summary>Extent length in sectors</summary>
-            public readonly ushort length;
-            /// <summary>Unknown</summary>
-            public readonly short unknown;
-            /// <summary>Extent starting sector</summary>
-            public readonly int start;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Extent
+    {
+        /// <summary>Extent length in sectors</summary>
+        public readonly ushort length;
+        /// <summary>Unknown</summary>
+        public readonly short unknown;
+        /// <summary>Extent starting sector</summary>
+        public readonly int start;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SubFile
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly Extent[] extents;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown2;
-            /// <summary>Logical size in bytes</summary>
-            public readonly uint logical_size;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown3;
-            /// <summary>Physical size in bytes</summary>
-            public readonly uint physical_size;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown4;
-            /// <summary>Physical size in bytes</summary>
-            public readonly uint physical_size2;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown5;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown6;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SubFile
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly Extent[] extents;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown2;
+        /// <summary>Logical size in bytes</summary>
+        public readonly uint logical_size;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown3;
+        /// <summary>Physical size in bytes</summary>
+        public readonly uint physical_size;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown4;
+        /// <summary>Physical size in bytes</summary>
+        public readonly uint physical_size2;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown5;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown6;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Direct
-        {
-            /// <summary>Unknown</summary>
-            public readonly uint unknown;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown2;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown3;
-            /// <summary>Mask 0x6000</summary>
-            public readonly ushort subfiles_no;
-            /// <summary>Unknown</summary>
-            public readonly ushort unknown4;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown5;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown6;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown7;
-            /// <summary>Some date</summary>
-            public readonly ushort date1;
-            /// <summary>Some time</summary>
-            public readonly ushort time1;
-            /// <summary>Some date</summary>
-            public readonly ushort date2;
-            /// <summary>Some time</summary>
-            public readonly ushort time2;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown8;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown9;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown10;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown11;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown12;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown13;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown14;
-            /// <summary>Subfiles, length unknown</summary>
-            public readonly SubFile[] subfiles;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Direct
+    {
+        /// <summary>Unknown</summary>
+        public readonly uint unknown;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown2;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown3;
+        /// <summary>Mask 0x6000</summary>
+        public readonly ushort subfiles_no;
+        /// <summary>Unknown</summary>
+        public readonly ushort unknown4;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown5;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown6;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown7;
+        /// <summary>Some date</summary>
+        public readonly ushort date1;
+        /// <summary>Some time</summary>
+        public readonly ushort time1;
+        /// <summary>Some date</summary>
+        public readonly ushort date2;
+        /// <summary>Some time</summary>
+        public readonly ushort time2;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown8;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown9;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown10;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown11;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown12;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown13;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown14;
+        /// <summary>Subfiles, length unknown</summary>
+        public readonly SubFile[] subfiles;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MasterRecord
-        {
-            /// <summary>"MAST"</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] blockId;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown;
-            /// <summary>Unknown</summary>
-            public readonly ushort unknown2;
-            /// <summary>Unknown</summary>
-            public readonly ushort unknown3;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown4;
-            /// <summary>Unknown</summary>
-            public readonly ushort unknown5;
-            /// <summary>Unknown</summary>
-            public readonly ushort unknown6;
-            /// <summary>Unknown</summary>
-            public readonly ushort unknown7;
-            /// <summary>Unknown</summary>
-            public readonly ushort unknown8;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown9;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MasterRecord
+    {
+        /// <summary>"MAST"</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] blockId;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown;
+        /// <summary>Unknown</summary>
+        public readonly ushort unknown2;
+        /// <summary>Unknown</summary>
+        public readonly ushort unknown3;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown4;
+        /// <summary>Unknown</summary>
+        public readonly ushort unknown5;
+        /// <summary>Unknown</summary>
+        public readonly ushort unknown6;
+        /// <summary>Unknown</summary>
+        public readonly ushort unknown7;
+        /// <summary>Unknown</summary>
+        public readonly ushort unknown8;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown9;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DciKey
-        {
-            /// <summary>Unknown</summary>
-            public readonly byte unknown;
-            /// <summary>Name size + 2</summary>
-            public readonly byte size;
-            /// <summary>Unknown</summary>
-            public readonly byte unknown2;
-            /// <summary>Unknown</summary>
-            public readonly byte unknown3;
-            /// <summary>Unknown</summary>
-            public readonly byte unknown4;
-            /// <summary>Unknown</summary>
-            public readonly byte unknown5;
-            /// <summary>Name, length = size - 2</summary>
-            public readonly byte[] name;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DciKey
+    {
+        /// <summary>Unknown</summary>
+        public readonly byte unknown;
+        /// <summary>Name size + 2</summary>
+        public readonly byte size;
+        /// <summary>Unknown</summary>
+        public readonly byte unknown2;
+        /// <summary>Unknown</summary>
+        public readonly byte unknown3;
+        /// <summary>Unknown</summary>
+        public readonly byte unknown4;
+        /// <summary>Unknown</summary>
+        public readonly byte unknown5;
+        /// <summary>Name, length = size - 2</summary>
+        public readonly byte[] name;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DciEntry
-        {
-            /// <summary>Key length</summary>
-            public readonly ushort key_len;
-            /// <summary>Record length</summary>
-            public readonly ushort record_len;
-            /// <summary>dci key</summary>
-            public readonly DciKey key;
-            /// <summary>Padding? Size is key_len - size of DciKey</summary>
-            public readonly byte[] padding;
-            /// <summary>Direct</summary>
-            public readonly Direct dir;
-            /// <summary>Padding? Size is record_len - size of Direct</summary>
-            public readonly byte[] unknown;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DciEntry
+    {
+        /// <summary>Key length</summary>
+        public readonly ushort key_len;
+        /// <summary>Record length</summary>
+        public readonly ushort record_len;
+        /// <summary>dci key</summary>
+        public readonly DciKey key;
+        /// <summary>Padding? Size is key_len - size of DciKey</summary>
+        public readonly byte[] padding;
+        /// <summary>Direct</summary>
+        public readonly Direct dir;
+        /// <summary>Padding? Size is record_len - size of Direct</summary>
+        public readonly byte[] unknown;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Dci
-        {
-            /// <summary>"DATA"</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] blockId;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown2;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown3;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown4;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown5;
-            /// <summary>Unknown</summary>
-            public readonly ushort unknown6;
-            /// <summary>Unknown</summary>
-            public readonly ushort unknown7;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown8;
-            /// <summary>Unknown</summary>
-            public readonly uint unknown9;
-            /// <summary>Entries, size unknown</summary>
-            public readonly DciEntry[] entries;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Dci
+    {
+        /// <summary>"DATA"</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] blockId;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown2;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown3;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown4;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown5;
+        /// <summary>Unknown</summary>
+        public readonly ushort unknown6;
+        /// <summary>Unknown</summary>
+        public readonly ushort unknown7;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown8;
+        /// <summary>Unknown</summary>
+        public readonly uint unknown9;
+        /// <summary>Entries, size unknown</summary>
+        public readonly DciEntry[] entries;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/AAIP.cs b/Aaru.Filesystems/ISO9660/Consts/AAIP.cs
index 8a91d8e44..58b3fdb01 100644
--- a/Aaru.Filesystems/ISO9660/Consts/AAIP.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/AAIP.cs
@@ -35,17 +35,16 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
-{
-    public sealed partial class ISO9660
-    {
-        const ushort AAIP_MAGIC     = 0x414C; // "AL"
-        const ushort AAIP_MAGIC_OLD = 0x4141; // "AA"
+namespace Aaru.Filesystems;
 
-        [Flags]
-        enum AAIPFlags : byte
-        {
-            Continue = 1
-        }
+public sealed partial class ISO9660
+{
+    const ushort AAIP_MAGIC     = 0x414C; // "AL"
+    const ushort AAIP_MAGIC_OLD = 0x4141; // "AA"
+
+    [Flags]
+    enum AAIPFlags : byte
+    {
+        Continue = 1
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/Amiga.cs b/Aaru.Filesystems/ISO9660/Consts/Amiga.cs
index 6418b8fdf..e5ec72b03 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Amiga.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Amiga.cs
@@ -35,32 +35,31 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    const ushort AMIGA_MAGIC = 0x4153; // "AS"
+
+    [Flags]
+    enum AmigaFlags : byte
     {
-        const ushort AMIGA_MAGIC = 0x4153; // "AS"
+        Protection = 1 << 0, Comment = 1 << 1, CommentContinues = 1 << 2
+    }
 
-        [Flags]
-        enum AmigaFlags : byte
-        {
-            Protection = 1 << 0, Comment = 1 << 1, CommentContinues = 1 << 2
-        }
+    [Flags]
+    enum AmigaMultiuser : byte
+    {
+        GroupDelete = 1 << 0, GroupExec   = 1 << 1, GroupWrite = 1 << 2,
+        GroupRead   = 1 << 3, OtherDelete = 1 << 4, OtherExec  = 1 << 5,
+        OtherWrite  = 1 << 6, OtherRead   = 1 << 7
+    }
 
-        [Flags]
-        enum AmigaMultiuser : byte
-        {
-            GroupDelete = 1 << 0, GroupExec   = 1 << 1, GroupWrite = 1 << 2,
-            GroupRead   = 1 << 3, OtherDelete = 1 << 4, OtherExec  = 1 << 5,
-            OtherWrite  = 1 << 6, OtherRead   = 1 << 7
-        }
-
-        [Flags]
-        enum AmigaAttributes : byte
-        {
-            OwnerDelete = 1 << 0, OwnerExec = 1 << 1, OwnerWrite = 1 << 2,
-            OwnerRead   = 1 << 3, Archive   = 1 << 4, Reentrant  = 1 << 5,
-            Script      = 1 << 6, Reserved  = 1 << 7
-        }
+    [Flags]
+    enum AmigaAttributes : byte
+    {
+        OwnerDelete = 1 << 0, OwnerExec = 1 << 1, OwnerWrite = 1 << 2,
+        OwnerRead   = 1 << 3, Archive   = 1 << 4, Reentrant  = 1 << 5,
+        Script      = 1 << 6, Reserved  = 1 << 7
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/Apple.cs b/Aaru.Filesystems/ISO9660/Consts/Apple.cs
index 94496d564..58f299bc2 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Apple.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Apple.cs
@@ -31,22 +31,21 @@
 // In the loving memory of Facunda "Tata" Suárez Domínguez, R.I.P. 2019/07/24
 // ****************************************************************************/
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    const ushort APPLE_MAGIC     = 0x4141; // "AA"
+    const ushort APPLE_MAGIC_OLD = 0x4241; // "BA"
+
+    enum AppleId : byte
     {
-        const ushort APPLE_MAGIC     = 0x4141; // "AA"
-        const ushort APPLE_MAGIC_OLD = 0x4241; // "BA"
+        ProDOS = 1, HFS = 2
+    }
 
-        enum AppleId : byte
-        {
-            ProDOS = 1, HFS = 2
-        }
-
-        enum AppleOldId : byte
-        {
-            ProDOS          = 1, TypeCreator           = 2, TypeCreatorBundle = 3,
-            TypeCreatorIcon = 4, TypeCreatorIconBundle = 5, HFS               = 6
-        }
+    enum AppleOldId : byte
+    {
+        ProDOS          = 1, TypeCreator           = 2, TypeCreatorBundle = 3,
+        TypeCreatorIcon = 4, TypeCreatorIconBundle = 5, HFS               = 6
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/CDi.cs b/Aaru.Filesystems/ISO9660/Consts/CDi.cs
index 168f24f27..3240d91c4 100644
--- a/Aaru.Filesystems/ISO9660/Consts/CDi.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/CDi.cs
@@ -36,33 +36,32 @@ using Aaru.Helpers;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    const           string CDI_MAGIC               = "CD-I ";
+    static readonly int    _cdiDirectoryRecordSize = Marshal.SizeOf<CdiDirectoryRecord>();
+    static readonly int    _cdiSystemAreaSize      = Marshal.SizeOf<CdiSystemArea>();
+
+    [Flags]
+    enum CdiVolumeFlags : byte
     {
-        const           string CDI_MAGIC               = "CD-I ";
-        static readonly int    _cdiDirectoryRecordSize = Marshal.SizeOf<CdiDirectoryRecord>();
-        static readonly int    _cdiSystemAreaSize      = Marshal.SizeOf<CdiSystemArea>();
+        // Escapes are not ISO 2375 but ISO 2022
+        NotISO2375 = 1
+    }
 
-        [Flags]
-        enum CdiVolumeFlags : byte
-        {
-            // Escapes are not ISO 2375 but ISO 2022
-            NotISO2375 = 1
-        }
+    [Flags]
+    enum CdiFileFlags : byte
+    {
+        Hidden = 0x01
+    }
 
-        [Flags]
-        enum CdiFileFlags : byte
-        {
-            Hidden = 0x01
-        }
-
-        [Flags]
-        enum CdiAttributes : ushort
-        {
-            OwnerRead    = 1 << 0, OwnerExecute = 1 << 2, GroupRead    = 1 << 4,
-            GroupExecute = 1 << 6, OtherRead    = 1 << 8, OtherExecute = 1 << 10,
-            DigitalAudio = 1 << 14, Directory   = 1 << 15
-        }
+    [Flags]
+    enum CdiAttributes : ushort
+    {
+        OwnerRead    = 1 << 0, OwnerExecute = 1 << 2, GroupRead    = 1 << 4,
+        GroupExecute = 1 << 6, OtherRead    = 1 << 8, OtherExecute = 1 << 10,
+        DigitalAudio = 1 << 14, Directory   = 1 << 15
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs b/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs
index 8805c747c..a799e7b76 100644
--- a/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/ElTorito.cs
@@ -35,36 +35,35 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    const ushort EL_TORITO_MAGIC      = 0xAA55;
+    const int    EL_TORITO_ENTRY_SIZE = 32;
+
+    enum ElToritoIndicator : byte
     {
-        const ushort EL_TORITO_MAGIC      = 0xAA55;
-        const int    EL_TORITO_ENTRY_SIZE = 32;
+        Header      = 1, Extension     = 0x44, Bootable = 0x88,
+        MoreHeaders = 0x90, LastHeader = 0x91
+    }
 
-        enum ElToritoIndicator : byte
-        {
-            Header      = 1, Extension     = 0x44, Bootable = 0x88,
-            MoreHeaders = 0x90, LastHeader = 0x91
-        }
+    enum ElToritoPlatform : byte
+    {
+        x86 = 0, PowerPC = 1, Macintosh = 2,
+        EFI = 0xef
+    }
 
-        enum ElToritoPlatform : byte
-        {
-            x86 = 0, PowerPC = 1, Macintosh = 2,
-            EFI = 0xef
-        }
+    enum ElToritoEmulation : byte
+    {
+        None  = 0, Md2Hd = 1, Mf2Hd = 2,
+        Mf2Ed = 3, Hdd   = 4
+    }
 
-        enum ElToritoEmulation : byte
-        {
-            None  = 0, Md2Hd = 1, Mf2Hd = 2,
-            Mf2Ed = 3, Hdd   = 4
-        }
-
-        [Flags]
-        enum ElToritoFlags : byte
-        {
-            Reserved = 0x10, Continued = 0x20, ATAPI = 0x40,
-            SCSI     = 0x08
-        }
+    [Flags]
+    enum ElToritoFlags : byte
+    {
+        Reserved = 0x10, Continued = 0x20, ATAPI = 0x40,
+        SCSI     = 0x08
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs b/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs
index d26e72eb3..22e52b2df 100644
--- a/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/HighSierra.cs
@@ -33,11 +33,10 @@
 
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
-    {
-        const           string HIGH_SIERRA_MAGIC              = "CDROM";
-        static readonly int    _highSierraDirectoryRecordSize = Marshal.SizeOf<HighSierraDirectoryRecord>();
-    }
+    const           string HIGH_SIERRA_MAGIC              = "CDROM";
+    static readonly int    _highSierraDirectoryRecordSize = Marshal.SizeOf<HighSierraDirectoryRecord>();
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/ISO.cs b/Aaru.Filesystems/ISO9660/Consts/ISO.cs
index eb3b89f11..6c28e055f 100644
--- a/Aaru.Filesystems/ISO9660/Consts/ISO.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/ISO.cs
@@ -35,36 +35,35 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    const string ISO_MAGIC = "CD001";
+
+    [Flags]
+    enum FileFlags : byte
     {
-        const string ISO_MAGIC = "CD001";
+        Hidden = 0x01, Directory = 0x02, Associated  = 0x04,
+        Record = 0x08, Protected = 0x10, MultiExtent = 0x80
+    }
 
-        [Flags]
-        enum FileFlags : byte
-        {
-            Hidden = 0x01, Directory = 0x02, Associated  = 0x04,
-            Record = 0x08, Protected = 0x10, MultiExtent = 0x80
-        }
+    [Flags]
+    enum Permissions : ushort
+    {
+        SystemRead   = 0x01, SystemExecute  = 0x04, OwnerRead     = 0x10,
+        OwnerExecute = 0x40, GroupRead      = 0x100, GroupExecute = 0x400,
+        OtherRead    = 0x1000, OtherExecute = 0x4000
+    }
 
-        [Flags]
-        enum Permissions : ushort
-        {
-            SystemRead   = 0x01, SystemExecute  = 0x04, OwnerRead     = 0x10,
-            OwnerExecute = 0x40, GroupRead      = 0x100, GroupExecute = 0x400,
-            OtherRead    = 0x1000, OtherExecute = 0x4000
-        }
+    enum RecordFormat : byte
+    {
+        Unspecified             = 0, FixedLength = 1, VariableLength = 2,
+        VariableLengthAlternate = 3
+    }
 
-        enum RecordFormat : byte
-        {
-            Unspecified             = 0, FixedLength = 1, VariableLength = 2,
-            VariableLengthAlternate = 3
-        }
-
-        enum RecordAttribute : byte
-        {
-            LFCR = 0, ISO1539 = 1, ControlContained = 2
-        }
+    enum RecordAttribute : byte
+    {
+        LFCR = 0, ISO1539 = 1, ControlContained = 2
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/Internal.cs b/Aaru.Filesystems/ISO9660/Consts/Internal.cs
index f1f017b74..1d5ba627b 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Internal.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Internal.cs
@@ -34,18 +34,17 @@
 using System.Diagnostics.CodeAnalysis;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
-{
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class ISO9660
-    {
-        const           byte MODE2_FORM2          = 0x20;
-        static readonly int  _directoryRecordSize = Marshal.SizeOf<DirectoryRecord>();
+namespace Aaru.Filesystems;
 
-        enum Namespace
-        {
-            Normal, Vms, Joliet,
-            Rrip, Romeo
-        }
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class ISO9660
+{
+    const           byte MODE2_FORM2          = 0x20;
+    static readonly int  _directoryRecordSize = Marshal.SizeOf<DirectoryRecord>();
+
+    enum Namespace
+    {
+        Normal, Vms, Joliet,
+        Rrip, Romeo
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/RRIP.cs b/Aaru.Filesystems/ISO9660/Consts/RRIP.cs
index 40175e142..39dd98d40 100644
--- a/Aaru.Filesystems/ISO9660/Consts/RRIP.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/RRIP.cs
@@ -35,59 +35,58 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    const ushort RRIP_MAGIC            = 0x5252; // "RR"
+    const ushort RRIP_POSIX_ATTRIBUTES = 0x5058; // "PX"
+    const ushort RRIP_POSIX_DEV_NO     = 0x504E; // "PN"
+    const ushort RRIP_SYMLINK          = 0x534C; // "SL"
+    const ushort RRIP_NAME             = 0x4E4D; // "NM"
+    const ushort RRIP_CHILDLINK        = 0x434C; // "CL"
+    const ushort RRIP_PARENTLINK       = 0x504C; // "PL"
+    const ushort RRIP_RELOCATED_DIR    = 0x5245; // "RE"
+    const ushort RRIP_TIMESTAMPS       = 0x5446; // "TF"
+    const ushort RRIP_SPARSE           = 0x5346; // "SF"
+
+    [Flags]
+    enum PosixMode : uint
     {
-        const ushort RRIP_MAGIC            = 0x5252; // "RR"
-        const ushort RRIP_POSIX_ATTRIBUTES = 0x5058; // "PX"
-        const ushort RRIP_POSIX_DEV_NO     = 0x504E; // "PN"
-        const ushort RRIP_SYMLINK          = 0x534C; // "SL"
-        const ushort RRIP_NAME             = 0x4E4D; // "NM"
-        const ushort RRIP_CHILDLINK        = 0x434C; // "CL"
-        const ushort RRIP_PARENTLINK       = 0x504C; // "PL"
-        const ushort RRIP_RELOCATED_DIR    = 0x5245; // "RE"
-        const ushort RRIP_TIMESTAMPS       = 0x5446; // "TF"
-        const ushort RRIP_SPARSE           = 0x5346; // "SF"
+        OwnerRead = 0x0100, OwnerWrite = 0x0080, OwnerExecute = 0x0040,
+        GroupRead = 0x0020, GroupWrite = 0x0010, GroupExecute = 0x0008,
+        OtherRead = 0x0004, OtherWrite = 0x0002, OtherExecute = 0x0001,
+        SetUID    = 0x0800, SetGid     = 0x0400, IsVTX        = 0x0200,
+        Socket    = 0xC000, Symlink    = 0xA000, Regular      = 0x8000,
+        Block     = 0x6000, Character  = 0x2000, Directory    = 0x4000,
+        Pipe      = 0x1000
+    }
 
-        [Flags]
-        enum PosixMode : uint
-        {
-            OwnerRead = 0x0100, OwnerWrite = 0x0080, OwnerExecute = 0x0040,
-            GroupRead = 0x0020, GroupWrite = 0x0010, GroupExecute = 0x0008,
-            OtherRead = 0x0004, OtherWrite = 0x0002, OtherExecute = 0x0001,
-            SetUID    = 0x0800, SetGid     = 0x0400, IsVTX        = 0x0200,
-            Socket    = 0xC000, Symlink    = 0xA000, Regular      = 0x8000,
-            Block     = 0x6000, Character  = 0x2000, Directory    = 0x4000,
-            Pipe      = 0x1000
-        }
+    [Flags]
+    enum SymlinkFlags : byte
+    {
+        Continue = 1
+    }
 
-        [Flags]
-        enum SymlinkFlags : byte
-        {
-            Continue = 1
-        }
+    [Flags]
+    enum SymlinkComponentFlags : byte
+    {
+        Continue = 1, Current    = 2, Parent       = 4,
+        Root     = 8, Mountpoint = 16, Networkname = 32
+    }
 
-        [Flags]
-        enum SymlinkComponentFlags : byte
-        {
-            Continue = 1, Current    = 2, Parent       = 4,
-            Root     = 8, Mountpoint = 16, Networkname = 32
-        }
+    [Flags]
+    enum AlternateNameFlags : byte
+    {
+        Continue    = 1, Current = 2, Parent = 4,
+        Networkname = 32
+    }
 
-        [Flags]
-        enum AlternateNameFlags : byte
-        {
-            Continue    = 1, Current = 2, Parent = 4,
-            Networkname = 32
-        }
-
-        [Flags]
-        enum TimestampFlags : byte
-        {
-            Creation        = 1 << 0, Modification = 1 << 1, Access     = 1 << 2,
-            AttributeChange = 1 << 3, Backup       = 1 << 4, Expiration = 1 << 5,
-            Effective       = 1 << 6, LongFormat   = 1 << 7
-        }
+    [Flags]
+    enum TimestampFlags : byte
+    {
+        Creation        = 1 << 0, Modification = 1 << 1, Access     = 1 << 2,
+        AttributeChange = 1 << 3, Backup       = 1 << 4, Expiration = 1 << 5,
+        Effective       = 1 << 6, LongFormat   = 1 << 7
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/SUSP.cs b/Aaru.Filesystems/ISO9660/Consts/SUSP.cs
index 6734dc386..8ae5aa866 100644
--- a/Aaru.Filesystems/ISO9660/Consts/SUSP.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/SUSP.cs
@@ -35,17 +35,16 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class ISO9660
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class ISO9660
-    {
-        const ushort SUSP_CONTINUATION = 0x4345; // "CE"
-        const ushort SUSP_PADDING      = 0x5044; // "PD"
-        const ushort SUSP_INDICATOR    = 0x5350; // "SP"
-        const ushort SUSP_TERMINATOR   = 0x5354; // "ST"
-        const ushort SUSP_REFERENCE    = 0x4552; // "ER"
-        const ushort SUSP_SELECTOR     = 0x4553; // "ES"
-        const ushort SUSP_MAGIC        = 0xBEEF;
-    }
+    const ushort SUSP_CONTINUATION = 0x4345; // "CE"
+    const ushort SUSP_PADDING      = 0x5044; // "PD"
+    const ushort SUSP_INDICATOR    = 0x5350; // "SP"
+    const ushort SUSP_TERMINATOR   = 0x5354; // "ST"
+    const ushort SUSP_REFERENCE    = 0x4552; // "ER"
+    const ushort SUSP_SELECTOR     = 0x4553; // "ES"
+    const ushort SUSP_MAGIC        = 0xBEEF;
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/XA.cs b/Aaru.Filesystems/ISO9660/Consts/XA.cs
index bec6ad5db..a289b3f37 100644
--- a/Aaru.Filesystems/ISO9660/Consts/XA.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/XA.cs
@@ -35,27 +35,26 @@ using System;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    const ushort XA_MAGIC = 0x5841; // "XA"
+
+    [Flags]
+    enum XaAttributes : ushort
     {
-        const ushort XA_MAGIC = 0x5841; // "XA"
+        SystemRead   = 0x01, SystemExecute = 0x04, OwnerRead     = 0x10,
+        OwnerExecute = 0x40, GroupRead     = 0x100, GroupExecute = 0x400,
+        Mode2Form1   = 0x800, Mode2Form2   = 0x1000, Interleaved = 0x2000,
+        Cdda         = 0x4000, Directory   = 0x8000
+    }
 
-        [Flags]
-        enum XaAttributes : ushort
-        {
-            SystemRead   = 0x01, SystemExecute = 0x04, OwnerRead     = 0x10,
-            OwnerExecute = 0x40, GroupRead     = 0x100, GroupExecute = 0x400,
-            Mode2Form1   = 0x800, Mode2Form2   = 0x1000, Interleaved = 0x2000,
-            Cdda         = 0x4000, Directory   = 0x8000
-        }
-
-        [Flags]
-        enum Mode2Submode : byte
-        {
-            EndOfFile = 0x80, RealTime    = 0x40, Form2 = 0x20,
-            Trigger   = 0x10, Data        = 0x08, Audio = 0x04,
-            Video     = 0x02, EndOfRecord = 0x01
-        }
+    [Flags]
+    enum Mode2Submode : byte
+    {
+        EndOfFile = 0x80, RealTime    = 0x40, Form2 = 0x20,
+        Trigger   = 0x10, Data        = 0x08, Audio = 0x04,
+        Video     = 0x02, EndOfRecord = 0x01
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Consts/Ziso.cs b/Aaru.Filesystems/ISO9660/Consts/Ziso.cs
index 88134e4ed..02699857a 100644
--- a/Aaru.Filesystems/ISO9660/Consts/Ziso.cs
+++ b/Aaru.Filesystems/ISO9660/Consts/Ziso.cs
@@ -33,14 +33,13 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class ISO9660
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class ISO9660
-    {
-        const ulong  ZISO_HEADER_MAGIC = 0x37E45396C9DBD607;
-        const ulong  ZISO_HEADER_CIGAM = 0x07D6DBC99653E437;
-        const ushort ZISO_MAGIC        = 0x5A46; // "ZF"
-        const ushort ZISO_PAGED_ZLIB   = 0x707A; // "pz"
-    }
+    const ulong  ZISO_HEADER_MAGIC = 0x37E45396C9DBD607;
+    const ulong  ZISO_HEADER_CIGAM = 0x07D6DBC99653E437;
+    const ushort ZISO_MAGIC        = 0x5A46; // "ZF"
+    const ushort ZISO_PAGED_ZLIB   = 0x707A; // "pz"
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Date.cs b/Aaru.Filesystems/ISO9660/Date.cs
index df4946c79..8ec326ca0 100644
--- a/Aaru.Filesystems/ISO9660/Date.cs
+++ b/Aaru.Filesystems/ISO9660/Date.cs
@@ -34,52 +34,51 @@
 using System;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    static DateTime? DecodeIsoDateTime(byte[] timestamp)
     {
-        static DateTime? DecodeIsoDateTime(byte[] timestamp)
+        switch(timestamp?.Length)
         {
-            switch(timestamp?.Length)
-            {
-                case 7:  return DecodeIsoDateTime(Marshal.ByteArrayToStructureLittleEndian<IsoTimestamp>(timestamp));
-                case 17: return DateHandlers.Iso9660ToDateTime(timestamp);
-                default: return null;
-            }
+            case 7:  return DecodeIsoDateTime(Marshal.ByteArrayToStructureLittleEndian<IsoTimestamp>(timestamp));
+            case 17: return DateHandlers.Iso9660ToDateTime(timestamp);
+            default: return null;
         }
+    }
 
-        static DateTime? DecodeIsoDateTime(IsoTimestamp timestamp)
+    static DateTime? DecodeIsoDateTime(IsoTimestamp timestamp)
+    {
+        try
         {
-            try
-            {
-                var date = new DateTime(timestamp.Years + 1900, timestamp.Month, timestamp.Day, timestamp.Hour,
-                                        timestamp.Minute, timestamp.Second, DateTimeKind.Unspecified);
+            var date = new DateTime(timestamp.Years + 1900, timestamp.Month, timestamp.Day, timestamp.Hour,
+                                    timestamp.Minute, timestamp.Second, DateTimeKind.Unspecified);
 
-                date = date.AddMinutes(timestamp.GmtOffset * 15);
+            date = date.AddMinutes(timestamp.GmtOffset * 15);
 
-                return TimeZoneInfo.ConvertTimeToUtc(date, TimeZoneInfo.FindSystemTimeZoneById("GMT"));
-            }
-            catch(Exception)
-            {
-                // ISO says timestamp can be unspecified
-                return null;
-            }
+            return TimeZoneInfo.ConvertTimeToUtc(date, TimeZoneInfo.FindSystemTimeZoneById("GMT"));
         }
-
-        static DateTime? DecodeHighSierraDateTime(HighSierraTimestamp timestamp)
+        catch(Exception)
         {
-            try
-            {
-                var date = new DateTime(timestamp.Years + 1900, timestamp.Month, timestamp.Day, timestamp.Hour,
-                                        timestamp.Minute, timestamp.Second, DateTimeKind.Unspecified);
+            // ISO says timestamp can be unspecified
+            return null;
+        }
+    }
 
-                return TimeZoneInfo.ConvertTimeToUtc(date, TimeZoneInfo.FindSystemTimeZoneById("GMT"));
-            }
-            catch(Exception)
-            {
-                // ISO says timestamp can be unspecified, suppose same for High Sierra
-                return null;
-            }
+    static DateTime? DecodeHighSierraDateTime(HighSierraTimestamp timestamp)
+    {
+        try
+        {
+            var date = new DateTime(timestamp.Years + 1900, timestamp.Month, timestamp.Day, timestamp.Hour,
+                                    timestamp.Minute, timestamp.Second, DateTimeKind.Unspecified);
+
+            return TimeZoneInfo.ConvertTimeToUtc(date, TimeZoneInfo.FindSystemTimeZoneById("GMT"));
+        }
+        catch(Exception)
+        {
+            // ISO says timestamp can be unspecified, suppose same for High Sierra
+            return null;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Dir.cs b/Aaru.Filesystems/ISO9660/Dir.cs
index 3666ad7d6..75c588dd4 100644
--- a/Aaru.Filesystems/ISO9660/Dir.cs
+++ b/Aaru.Filesystems/ISO9660/Dir.cs
@@ -40,46 +40,60 @@ using System.Text;
 using Aaru.CommonTypes.Enums;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    Dictionary<string, Dictionary<string, DecodedDirectoryEntry>> _directoryCache;
+
+    /// <inheritdoc />
+    public ErrorNumber ReadDir(string path, out List<string> contents)
     {
-        Dictionary<string, Dictionary<string, DecodedDirectoryEntry>> _directoryCache;
+        contents = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadDir(string path, out List<string> contents)
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(string.IsNullOrWhiteSpace(path) ||
+           path == "/")
         {
-            contents = null;
+            contents = GetFilenames(_rootDirectoryCache);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            return ErrorNumber.NoError;
+        }
 
-            if(string.IsNullOrWhiteSpace(path) ||
-               path == "/")
-            {
-                contents = GetFilenames(_rootDirectoryCache);
+        string cutPath = path.StartsWith("/", StringComparison.Ordinal)
+                             ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
+                             : path.ToLower(CultureInfo.CurrentUICulture);
 
-                return ErrorNumber.NoError;
-            }
+        if(_directoryCache.TryGetValue(cutPath, out Dictionary<string, DecodedDirectoryEntry> currentDirectory))
+        {
+            contents = currentDirectory.Keys.ToList();
 
-            string cutPath = path.StartsWith("/", StringComparison.Ordinal)
-                                 ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
-                                 : path.ToLower(CultureInfo.CurrentUICulture);
+            return ErrorNumber.NoError;
+        }
 
-            if(_directoryCache.TryGetValue(cutPath, out Dictionary<string, DecodedDirectoryEntry> currentDirectory))
-            {
-                contents = currentDirectory.Keys.ToList();
+        string[] pieces = cutPath.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-                return ErrorNumber.NoError;
-            }
+        KeyValuePair<string, DecodedDirectoryEntry> entry =
+            _rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[0]);
 
-            string[] pieces = cutPath.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        if(string.IsNullOrEmpty(entry.Key))
+            return ErrorNumber.NoSuchFile;
 
-            KeyValuePair<string, DecodedDirectoryEntry> entry =
-                _rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[0]);
+        if(!entry.Value.Flags.HasFlag(FileFlags.Directory))
+            return ErrorNumber.NotDirectory;
+
+        string currentPath = pieces[0];
+
+        currentDirectory = _rootDirectoryCache;
+
+        for(int p = 0; p < pieces.Length; p++)
+        {
+            entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[p]);
 
             if(string.IsNullOrEmpty(entry.Key))
                 return ErrorNumber.NoSuchFile;
@@ -87,1099 +101,1084 @@ namespace Aaru.Filesystems
             if(!entry.Value.Flags.HasFlag(FileFlags.Directory))
                 return ErrorNumber.NotDirectory;
 
-            string currentPath = pieces[0];
+            currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
 
-            currentDirectory = _rootDirectoryCache;
+            if(_directoryCache.TryGetValue(currentPath, out currentDirectory))
+                continue;
 
-            for(int p = 0; p < pieces.Length; p++)
-            {
-                entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[p]);
+            if(entry.Value.Extents.Count == 0)
+                return ErrorNumber.InvalidArgument;
 
-                if(string.IsNullOrEmpty(entry.Key))
-                    return ErrorNumber.NoSuchFile;
+            currentDirectory = _cdi
+                                   ? DecodeCdiDirectory(entry.Value.Extents[0].extent + entry.Value.XattrLength,
+                                                        entry.Value.Extents[0].size)
+                                   : _highSierra
+                                       ? DecodeHighSierraDirectory(entry.Value.Extents[0].extent + entry.Value.XattrLength,
+                                                                   entry.Value.Extents[0].size)
+                                       : DecodeIsoDirectory(entry.Value.Extents[0].extent + entry.Value.XattrLength,
+                                                            entry.Value.Extents[0].size);
 
-                if(!entry.Value.Flags.HasFlag(FileFlags.Directory))
-                    return ErrorNumber.NotDirectory;
+            if(_usePathTable)
+                foreach(DecodedDirectoryEntry subDirectory in _cdi
+                                                                  ? GetSubdirsFromCdiPathTable(currentPath)
+                                                                  : _highSierra
+                                                                      ? GetSubdirsFromHighSierraPathTable(currentPath)
+                                                                      : GetSubdirsFromIsoPathTable(currentPath))
+                    currentDirectory[subDirectory.Filename] = subDirectory;
 
-                currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
-
-                if(_directoryCache.TryGetValue(currentPath, out currentDirectory))
-                    continue;
-
-                if(entry.Value.Extents.Count == 0)
-                    return ErrorNumber.InvalidArgument;
-
-                currentDirectory = _cdi
-                                       ? DecodeCdiDirectory(entry.Value.Extents[0].extent + entry.Value.XattrLength,
-                                                            entry.Value.Extents[0].size)
-                                       : _highSierra
-                                           ? DecodeHighSierraDirectory(entry.Value.Extents[0].extent + entry.Value.XattrLength,
-                                                                       entry.Value.Extents[0].size)
-                                           : DecodeIsoDirectory(entry.Value.Extents[0].extent + entry.Value.XattrLength,
-                                                                entry.Value.Extents[0].size);
-
-                if(_usePathTable)
-                    foreach(DecodedDirectoryEntry subDirectory in _cdi
-                                                                      ? GetSubdirsFromCdiPathTable(currentPath)
-                                                                      : _highSierra
-                                                                          ? GetSubdirsFromHighSierraPathTable(currentPath)
-                                                                          : GetSubdirsFromIsoPathTable(currentPath))
-                        currentDirectory[subDirectory.Filename] = subDirectory;
-
-                _directoryCache.Add(currentPath, currentDirectory);
-            }
-
-            contents = GetFilenames(currentDirectory);
-
-            return ErrorNumber.NoError;
+            _directoryCache.Add(currentPath, currentDirectory);
         }
 
-        List<string> GetFilenames(Dictionary<string, DecodedDirectoryEntry> dirents)
-        {
-            List<string> contents = new();
+        contents = GetFilenames(currentDirectory);
 
-            foreach(DecodedDirectoryEntry entry in dirents.Values)
-                switch(_namespace)
-                {
-                    case Namespace.Normal:
-                        contents.Add(entry.Filename.EndsWith(";1", StringComparison.Ordinal)
-                                         ? entry.Filename.Substring(0, entry.Filename.Length - 2) : entry.Filename);
+        return ErrorNumber.NoError;
+    }
 
-                        break;
-                    case Namespace.Vms:
-                    case Namespace.Joliet:
-                    case Namespace.Rrip:
-                    case Namespace.Romeo:
-                        contents.Add(entry.Filename);
+    List<string> GetFilenames(Dictionary<string, DecodedDirectoryEntry> dirents)
+    {
+        List<string> contents = new();
 
-                        break;
-                    default: throw new ArgumentOutOfRangeException();
-                }
-
-            return contents;
-        }
-
-        Dictionary<string, DecodedDirectoryEntry> DecodeCdiDirectory(ulong start, uint size)
-        {
-            Dictionary<string, DecodedDirectoryEntry> entries  = new();
-            int                                       entryOff = 0;
-
-            byte[] data = ReadSingleExtent(size, (uint)start);
-
-            while(entryOff + _cdiDirectoryRecordSize < data.Length)
+        foreach(DecodedDirectoryEntry entry in dirents.Values)
+            switch(_namespace)
             {
-                CdiDirectoryRecord record =
-                    Marshal.ByteArrayToStructureBigEndian<CdiDirectoryRecord>(data, entryOff, _cdiDirectoryRecordSize);
-
-                if(record.length == 0)
-                {
-                    // Skip to next sector
-                    if(data.Length - (((entryOff / 2048) + 1) * 2048) > 0)
-                    {
-                        entryOff = ((entryOff / 2048) + 1) * 2048;
-
-                        continue;
-                    }
+                case Namespace.Normal:
+                    contents.Add(entry.Filename.EndsWith(";1", StringComparison.Ordinal)
+                                     ? entry.Filename.Substring(0, entry.Filename.Length - 2) : entry.Filename);
 
                     break;
-                }
+                case Namespace.Vms:
+                case Namespace.Joliet:
+                case Namespace.Rrip:
+                case Namespace.Romeo:
+                    contents.Add(entry.Filename);
 
-                // Special entries for current and parent directories, skip them
-                if(record.name_len == 1)
-                    if(data[entryOff + _directoryRecordSize] == 0 ||
-                       data[entryOff + _directoryRecordSize] == 1)
-                    {
-                        entryOff += record.length;
+                    break;
+                default: throw new ArgumentOutOfRangeException();
+            }
 
-                        continue;
-                    }
+        return contents;
+    }
 
-                var entry = new DecodedDirectoryEntry
+    Dictionary<string, DecodedDirectoryEntry> DecodeCdiDirectory(ulong start, uint size)
+    {
+        Dictionary<string, DecodedDirectoryEntry> entries  = new();
+        int                                       entryOff = 0;
+
+        byte[] data = ReadSingleExtent(size, (uint)start);
+
+        while(entryOff + _cdiDirectoryRecordSize < data.Length)
+        {
+            CdiDirectoryRecord record =
+                Marshal.ByteArrayToStructureBigEndian<CdiDirectoryRecord>(data, entryOff, _cdiDirectoryRecordSize);
+
+            if(record.length == 0)
+            {
+                // Skip to next sector
+                if(data.Length - (((entryOff / 2048) + 1) * 2048) > 0)
                 {
-                    Size                 = record.size,
-                    Filename             = Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len),
-                    VolumeSequenceNumber = record.volume_sequence_number,
-                    Timestamp            = DecodeHighSierraDateTime(record.date),
-                    XattrLength          = record.xattr_len
-                };
-
-                entry.Extents = new List<(uint extent, uint size)>();
-
-                if(record.size != 0)
-                    entry.Extents.Add((record.start_lbn, record.size));
-
-                if(record.flags.HasFlag(CdiFileFlags.Hidden))
-                {
-                    entry.Flags |= FileFlags.Hidden;
+                    entryOff = ((entryOff / 2048) + 1) * 2048;
 
                     continue;
                 }
 
-                int systemAreaStart = entryOff + record.name_len + _cdiDirectoryRecordSize;
+                break;
+            }
 
-                if(systemAreaStart % 2 != 0)
-                    systemAreaStart++;
+            // Special entries for current and parent directories, skip them
+            if(record.name_len == 1)
+                if(data[entryOff + _directoryRecordSize] == 0 ||
+                   data[entryOff + _directoryRecordSize] == 1)
+                {
+                    entryOff += record.length;
 
-                entry.CdiSystemArea =
-                    Marshal.ByteArrayToStructureBigEndian<CdiSystemArea>(data, systemAreaStart, _cdiSystemAreaSize);
+                    continue;
+                }
 
-                if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.Directory))
-                    entry.Flags |= FileFlags.Directory;
+            var entry = new DecodedDirectoryEntry
+            {
+                Size                 = record.size,
+                Filename             = Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len),
+                VolumeSequenceNumber = record.volume_sequence_number,
+                Timestamp            = DecodeHighSierraDateTime(record.date),
+                XattrLength          = record.xattr_len
+            };
 
-                if(!entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.Directory) ||
-                   !_usePathTable)
+            entry.Extents = new List<(uint extent, uint size)>();
+
+            if(record.size != 0)
+                entry.Extents.Add((record.start_lbn, record.size));
+
+            if(record.flags.HasFlag(CdiFileFlags.Hidden))
+            {
+                entry.Flags |= FileFlags.Hidden;
+
+                continue;
+            }
+
+            int systemAreaStart = entryOff + record.name_len + _cdiDirectoryRecordSize;
+
+            if(systemAreaStart % 2 != 0)
+                systemAreaStart++;
+
+            entry.CdiSystemArea =
+                Marshal.ByteArrayToStructureBigEndian<CdiSystemArea>(data, systemAreaStart, _cdiSystemAreaSize);
+
+            if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.Directory))
+                entry.Flags |= FileFlags.Directory;
+
+            if(!entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.Directory) ||
+               !_usePathTable)
+                entries[entry.Filename] = entry;
+
+            entryOff += record.length;
+        }
+
+        return entries;
+    }
+
+    Dictionary<string, DecodedDirectoryEntry> DecodeHighSierraDirectory(ulong start, uint size)
+    {
+        Dictionary<string, DecodedDirectoryEntry> entries  = new();
+        int                                       entryOff = 0;
+
+        byte[] data = ReadSingleExtent(size, (uint)start);
+
+        while(entryOff + _directoryRecordSize < data.Length)
+        {
+            HighSierraDirectoryRecord record =
+                Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(data, entryOff,
+                    _highSierraDirectoryRecordSize);
+
+            if(record.length == 0)
+            {
+                // Skip to next sector
+                if(data.Length - (((entryOff / 2048) + 1) * 2048) > 0)
+                {
+                    entryOff = ((entryOff / 2048) + 1) * 2048;
+
+                    continue;
+                }
+
+                break;
+            }
+
+            // Special entries for current and parent directories, skip them
+            if(record.name_len == 1)
+                if(data[entryOff + _directoryRecordSize] == 0 ||
+                   data[entryOff + _directoryRecordSize] == 1)
+                {
+                    entryOff += record.length;
+
+                    continue;
+                }
+
+            var entry = new DecodedDirectoryEntry
+            {
+                Size                 = record.size,
+                Flags                = record.flags,
+                Interleave           = record.interleave,
+                VolumeSequenceNumber = record.volume_sequence_number,
+                Filename             = Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len),
+                Timestamp            = DecodeHighSierraDateTime(record.date),
+                XattrLength          = record.xattr_len
+            };
+
+            entry.Extents = new List<(uint extent, uint size)>();
+
+            if(record.size != 0)
+                entry.Extents.Add((record.extent, record.size));
+
+            if(entry.Flags.HasFlag(FileFlags.Directory) && _usePathTable)
+            {
+                entryOff += record.length;
+
+                continue;
+            }
+
+            if(!entries.ContainsKey(entry.Filename))
+                entries.Add(entry.Filename, entry);
+
+            entryOff += record.length;
+        }
+
+        if(_useTransTbl)
+            DecodeTransTable(entries);
+
+        return entries;
+    }
+
+    Dictionary<string, DecodedDirectoryEntry> DecodeIsoDirectory(ulong start, uint size)
+    {
+        Dictionary<string, DecodedDirectoryEntry> entries  = new();
+        int                                       entryOff = 0;
+
+        byte[] data = ReadSingleExtent(size, (uint)start);
+
+        while(entryOff + _directoryRecordSize < data.Length)
+        {
+            DirectoryRecord record =
+                Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(data, entryOff, _directoryRecordSize);
+
+            if(record.length == 0)
+            {
+                // Skip to next sector
+                if(data.Length - (((entryOff / 2048) + 1) * 2048) > 0)
+                {
+                    entryOff = ((entryOff / 2048) + 1) * 2048;
+
+                    continue;
+                }
+
+                break;
+            }
+
+            // Special entries for current and parent directories, skip them
+            if(record.name_len == 1)
+                if(data[entryOff + _directoryRecordSize] == 0 ||
+                   data[entryOff + _directoryRecordSize] == 1)
+                {
+                    entryOff += record.length;
+
+                    continue;
+                }
+
+            var entry = new DecodedDirectoryEntry
+            {
+                Size  = record.size,
+                Flags = record.flags,
+                Filename =
+                    _joliet ? Encoding.BigEndianUnicode.GetString(data, entryOff + _directoryRecordSize,
+                                                                  record.name_len)
+                        : Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len),
+                FileUnitSize         = record.file_unit_size,
+                Interleave           = record.interleave,
+                VolumeSequenceNumber = record.volume_sequence_number,
+                Timestamp            = DecodeIsoDateTime(record.date),
+                XattrLength          = record.xattr_len
+            };
+
+            entry.Extents = new List<(uint extent, uint size)>();
+
+            if(record.size != 0)
+                entry.Extents.Add((record.extent, record.size));
+
+            if(entry.Flags.HasFlag(FileFlags.Directory) && _usePathTable)
+            {
+                entryOff += record.length;
+
+                continue;
+            }
+
+            // Mac OS can use slashes, we cannot
+            entry.Filename = entry.Filename.Replace('/', '\u2215');
+
+            // Tailing '.' is only allowed on RRIP. If present it will be recreated below with the alternate name
+            if(entry.Filename.EndsWith(".", StringComparison.Ordinal))
+                entry.Filename = entry.Filename.Substring(0, entry.Filename.Length - 1);
+
+            if(entry.Filename.EndsWith(".;1", StringComparison.Ordinal))
+                entry.Filename = entry.Filename.Substring(0, entry.Filename.Length - 3) + ";1";
+
+            // This is a legal Joliet name, different from VMS version fields, but Nero MAX incorrectly creates these filenames
+            if(_joliet && entry.Filename.EndsWith(";1", StringComparison.Ordinal))
+                entry.Filename = entry.Filename.Substring(0, entry.Filename.Length - 2);
+
+            int systemAreaStart  = entryOff      + record.name_len + _directoryRecordSize;
+            int systemAreaLength = record.length - record.name_len - _directoryRecordSize;
+
+            if(systemAreaStart % 2 != 0)
+            {
+                systemAreaStart++;
+                systemAreaLength--;
+            }
+
+            DecodeSystemArea(data, systemAreaStart, systemAreaStart + systemAreaLength, ref entry,
+                             out bool hasResourceFork);
+
+            if(entry.Flags.HasFlag(FileFlags.Associated))
+            {
+                if(entries.ContainsKey(entry.Filename))
+                {
+                    if(hasResourceFork)
+                    {
+                        entries[entry.Filename].ResourceFork.Size += entry.Size;
+                        entries[entry.Filename].ResourceFork.Extents.Add(entry.Extents[0]);
+                    }
+                    else
+                    {
+                        entries[entry.Filename].AssociatedFile.Size += entry.Size;
+                        entries[entry.Filename].AssociatedFile.Extents.Add(entry.Extents[0]);
+                    }
+                }
+                else
+                {
+                    entries[entry.Filename] = new DecodedDirectoryEntry
+                    {
+                        Size                 = 0,
+                        Flags                = record.flags ^ FileFlags.Associated,
+                        FileUnitSize         = 0,
+                        Interleave           = 0,
+                        VolumeSequenceNumber = record.volume_sequence_number,
+                        Filename             = entry.Filename,
+                        Timestamp            = DecodeIsoDateTime(record.date),
+                        XattrLength          = 0
+                    };
+
+                    if(hasResourceFork)
+                        entries[entry.Filename].ResourceFork = entry;
+                    else
+                        entries[entry.Filename].AssociatedFile = entry;
+                }
+            }
+            else
+            {
+                if(entries.ContainsKey(entry.Filename))
+                {
+                    entries[entry.Filename].Size += entry.Size;
+
+                    // Can appear after an associated file
+                    if(entries[entry.Filename].Extents is null)
+                    {
+                        entries[entry.Filename].Extents              = new List<(uint extent, uint size)>();
+                        entries[entry.Filename].Flags                = entry.Flags;
+                        entries[entry.Filename].FileUnitSize         = entry.FileUnitSize;
+                        entries[entry.Filename].Interleave           = entry.Interleave;
+                        entries[entry.Filename].VolumeSequenceNumber = entry.VolumeSequenceNumber;
+                        entries[entry.Filename].Filename             = entry.Filename;
+                        entries[entry.Filename].Timestamp            = entry.Timestamp;
+                        entries[entry.Filename].XattrLength          = entry.XattrLength;
+                    }
+
+                    if(entry.Extents?.Count > 0)
+                        entries[entry.Filename].Extents.Add(entry.Extents[0]);
+                }
+                else
                     entries[entry.Filename] = entry;
-
-                entryOff += record.length;
             }
 
-            return entries;
+            entryOff += record.length;
         }
 
-        Dictionary<string, DecodedDirectoryEntry> DecodeHighSierraDirectory(ulong start, uint size)
+        if(_useTransTbl)
+            DecodeTransTable(entries);
+
+        // Relocated directories should be shown in correct place when using Rock Ridge namespace
+        return _namespace == Namespace.Rrip
+                   ? entries.Where(e => !e.Value.RockRidgeRelocated).ToDictionary(x => x.Key, x => x.Value)
+                   : entries;
+    }
+
+    void DecodeTransTable(Dictionary<string, DecodedDirectoryEntry> entries)
+    {
+        KeyValuePair<string, DecodedDirectoryEntry> transTblEntry =
+            entries.FirstOrDefault(e => !e.Value.Flags.HasFlag(FileFlags.Directory) &&
+                                        (e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) == "trans.tbl" ||
+                                         e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) == "trans.tbl;1"));
+
+        if(transTblEntry.Value == null)
+            return;
+
+        byte[] transTbl = ReadWithExtents(0, (long)transTblEntry.Value.Size, transTblEntry.Value.Extents,
+                                          transTblEntry.Value.XA?.signature == XA_MAGIC &&
+                                          transTblEntry.Value.XA?.attributes.HasFlag(XaAttributes.Interleaved) ==
+                                          true, transTblEntry.Value.XA?.filenumber ?? 0);
+
+        var mr = new MemoryStream(transTbl, 0, (int)transTblEntry.Value.Size, false);
+        var sr = new StreamReader(mr, Encoding);
+
+        string line = sr.ReadLine();
+
+        while(line != null)
         {
-            Dictionary<string, DecodedDirectoryEntry> entries  = new();
-            int                                       entryOff = 0;
+            // Skip the type field and the first space
+            string cutLine      = line.Substring(2);
+            int    spaceIndex   = cutLine.IndexOf(' ');
+            string originalName = cutLine.Substring(0, spaceIndex);
+            string originalNameWithVersion;
+            string newName = cutLine.Substring(spaceIndex + 1).TrimStart();
 
-            byte[] data = ReadSingleExtent(size, (uint)start);
-
-            while(entryOff + _directoryRecordSize < data.Length)
+            if(originalName.EndsWith(";1", StringComparison.Ordinal))
             {
-                HighSierraDirectoryRecord record =
-                    Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(data, entryOff,
-                        _highSierraDirectoryRecordSize);
-
-                if(record.length == 0)
-                {
-                    // Skip to next sector
-                    if(data.Length - (((entryOff / 2048) + 1) * 2048) > 0)
-                    {
-                        entryOff = ((entryOff / 2048) + 1) * 2048;
-
-                        continue;
-                    }
-
-                    break;
-                }
-
-                // Special entries for current and parent directories, skip them
-                if(record.name_len == 1)
-                    if(data[entryOff + _directoryRecordSize] == 0 ||
-                       data[entryOff + _directoryRecordSize] == 1)
-                    {
-                        entryOff += record.length;
-
-                        continue;
-                    }
-
-                var entry = new DecodedDirectoryEntry
-                {
-                    Size                 = record.size,
-                    Flags                = record.flags,
-                    Interleave           = record.interleave,
-                    VolumeSequenceNumber = record.volume_sequence_number,
-                    Filename             = Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len),
-                    Timestamp            = DecodeHighSierraDateTime(record.date),
-                    XattrLength          = record.xattr_len
-                };
-
-                entry.Extents = new List<(uint extent, uint size)>();
-
-                if(record.size != 0)
-                    entry.Extents.Add((record.extent, record.size));
-
-                if(entry.Flags.HasFlag(FileFlags.Directory) && _usePathTable)
-                {
-                    entryOff += record.length;
-
-                    continue;
-                }
-
-                if(!entries.ContainsKey(entry.Filename))
-                    entries.Add(entry.Filename, entry);
-
-                entryOff += record.length;
+                originalNameWithVersion = originalName.ToLower(CultureInfo.CurrentUICulture);
+                originalName            = originalNameWithVersion.Substring(0, originalName.Length - 2);
             }
-
-            if(_useTransTbl)
-                DecodeTransTable(entries);
-
-            return entries;
-        }
-
-        Dictionary<string, DecodedDirectoryEntry> DecodeIsoDirectory(ulong start, uint size)
-        {
-            Dictionary<string, DecodedDirectoryEntry> entries  = new();
-            int                                       entryOff = 0;
-
-            byte[] data = ReadSingleExtent(size, (uint)start);
-
-            while(entryOff + _directoryRecordSize < data.Length)
+            else
             {
-                DirectoryRecord record =
-                    Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(data, entryOff, _directoryRecordSize);
-
-                if(record.length == 0)
-                {
-                    // Skip to next sector
-                    if(data.Length - (((entryOff / 2048) + 1) * 2048) > 0)
-                    {
-                        entryOff = ((entryOff / 2048) + 1) * 2048;
-
-                        continue;
-                    }
-
-                    break;
-                }
-
-                // Special entries for current and parent directories, skip them
-                if(record.name_len == 1)
-                    if(data[entryOff + _directoryRecordSize] == 0 ||
-                       data[entryOff + _directoryRecordSize] == 1)
-                    {
-                        entryOff += record.length;
-
-                        continue;
-                    }
-
-                var entry = new DecodedDirectoryEntry
-                {
-                    Size  = record.size,
-                    Flags = record.flags,
-                    Filename =
-                        _joliet ? Encoding.BigEndianUnicode.GetString(data, entryOff + _directoryRecordSize,
-                                                                      record.name_len)
-                            : Encoding.GetString(data, entryOff + _directoryRecordSize, record.name_len),
-                    FileUnitSize         = record.file_unit_size,
-                    Interleave           = record.interleave,
-                    VolumeSequenceNumber = record.volume_sequence_number,
-                    Timestamp            = DecodeIsoDateTime(record.date),
-                    XattrLength          = record.xattr_len
-                };
-
-                entry.Extents = new List<(uint extent, uint size)>();
-
-                if(record.size != 0)
-                    entry.Extents.Add((record.extent, record.size));
-
-                if(entry.Flags.HasFlag(FileFlags.Directory) && _usePathTable)
-                {
-                    entryOff += record.length;
-
-                    continue;
-                }
-
-                // Mac OS can use slashes, we cannot
-                entry.Filename = entry.Filename.Replace('/', '\u2215');
-
-                // Tailing '.' is only allowed on RRIP. If present it will be recreated below with the alternate name
-                if(entry.Filename.EndsWith(".", StringComparison.Ordinal))
-                    entry.Filename = entry.Filename.Substring(0, entry.Filename.Length - 1);
-
-                if(entry.Filename.EndsWith(".;1", StringComparison.Ordinal))
-                    entry.Filename = entry.Filename.Substring(0, entry.Filename.Length - 3) + ";1";
-
-                // This is a legal Joliet name, different from VMS version fields, but Nero MAX incorrectly creates these filenames
-                if(_joliet && entry.Filename.EndsWith(";1", StringComparison.Ordinal))
-                    entry.Filename = entry.Filename.Substring(0, entry.Filename.Length - 2);
-
-                int systemAreaStart  = entryOff      + record.name_len + _directoryRecordSize;
-                int systemAreaLength = record.length - record.name_len - _directoryRecordSize;
-
-                if(systemAreaStart % 2 != 0)
-                {
-                    systemAreaStart++;
-                    systemAreaLength--;
-                }
-
-                DecodeSystemArea(data, systemAreaStart, systemAreaStart + systemAreaLength, ref entry,
-                                 out bool hasResourceFork);
-
-                if(entry.Flags.HasFlag(FileFlags.Associated))
-                {
-                    if(entries.ContainsKey(entry.Filename))
-                    {
-                        if(hasResourceFork)
-                        {
-                            entries[entry.Filename].ResourceFork.Size += entry.Size;
-                            entries[entry.Filename].ResourceFork.Extents.Add(entry.Extents[0]);
-                        }
-                        else
-                        {
-                            entries[entry.Filename].AssociatedFile.Size += entry.Size;
-                            entries[entry.Filename].AssociatedFile.Extents.Add(entry.Extents[0]);
-                        }
-                    }
-                    else
-                    {
-                        entries[entry.Filename] = new DecodedDirectoryEntry
-                        {
-                            Size                 = 0,
-                            Flags                = record.flags ^ FileFlags.Associated,
-                            FileUnitSize         = 0,
-                            Interleave           = 0,
-                            VolumeSequenceNumber = record.volume_sequence_number,
-                            Filename             = entry.Filename,
-                            Timestamp            = DecodeIsoDateTime(record.date),
-                            XattrLength          = 0
-                        };
-
-                        if(hasResourceFork)
-                            entries[entry.Filename].ResourceFork = entry;
-                        else
-                            entries[entry.Filename].AssociatedFile = entry;
-                    }
-                }
-                else
-                {
-                    if(entries.ContainsKey(entry.Filename))
-                    {
-                        entries[entry.Filename].Size += entry.Size;
-
-                        // Can appear after an associated file
-                        if(entries[entry.Filename].Extents is null)
-                        {
-                            entries[entry.Filename].Extents              = new List<(uint extent, uint size)>();
-                            entries[entry.Filename].Flags                = entry.Flags;
-                            entries[entry.Filename].FileUnitSize         = entry.FileUnitSize;
-                            entries[entry.Filename].Interleave           = entry.Interleave;
-                            entries[entry.Filename].VolumeSequenceNumber = entry.VolumeSequenceNumber;
-                            entries[entry.Filename].Filename             = entry.Filename;
-                            entries[entry.Filename].Timestamp            = entry.Timestamp;
-                            entries[entry.Filename].XattrLength          = entry.XattrLength;
-                        }
-
-                        if(entry.Extents?.Count > 0)
-                            entries[entry.Filename].Extents.Add(entry.Extents[0]);
-                    }
-                    else
-                        entries[entry.Filename] = entry;
-                }
-
-                entryOff += record.length;
+                originalName            = originalName.ToLower(CultureInfo.CurrentUICulture);
+                originalNameWithVersion = originalName + ";1";
             }
 
-            if(_useTransTbl)
-                DecodeTransTable(entries);
+            // Pre-read next line
+            line = sr.ReadLine();
 
-            // Relocated directories should be shown in correct place when using Rock Ridge namespace
-            return _namespace == Namespace.Rrip
-                       ? entries.Where(e => !e.Value.RockRidgeRelocated).ToDictionary(x => x.Key, x => x.Value)
-                       : entries;
-        }
-
-        void DecodeTransTable(Dictionary<string, DecodedDirectoryEntry> entries)
-        {
-            KeyValuePair<string, DecodedDirectoryEntry> transTblEntry =
+            KeyValuePair<string, DecodedDirectoryEntry> originalEntry =
                 entries.FirstOrDefault(e => !e.Value.Flags.HasFlag(FileFlags.Directory) &&
-                                            (e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) == "trans.tbl" ||
-                                             e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) == "trans.tbl;1"));
+                                            (e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) ==
+                                             originalName ||
+                                             e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) ==
+                                             originalNameWithVersion));
 
-            if(transTblEntry.Value == null)
-                return;
-
-            byte[] transTbl = ReadWithExtents(0, (long)transTblEntry.Value.Size, transTblEntry.Value.Extents,
-                                              transTblEntry.Value.XA?.signature == XA_MAGIC &&
-                                              transTblEntry.Value.XA?.attributes.HasFlag(XaAttributes.Interleaved) ==
-                                              true, transTblEntry.Value.XA?.filenumber ?? 0);
-
-            var mr = new MemoryStream(transTbl, 0, (int)transTblEntry.Value.Size, false);
-            var sr = new StreamReader(mr, Encoding);
-
-            string line = sr.ReadLine();
-
-            while(line != null)
-            {
-                // Skip the type field and the first space
-                string cutLine      = line.Substring(2);
-                int    spaceIndex   = cutLine.IndexOf(' ');
-                string originalName = cutLine.Substring(0, spaceIndex);
-                string originalNameWithVersion;
-                string newName = cutLine.Substring(spaceIndex + 1).TrimStart();
-
-                if(originalName.EndsWith(";1", StringComparison.Ordinal))
-                {
-                    originalNameWithVersion = originalName.ToLower(CultureInfo.CurrentUICulture);
-                    originalName            = originalNameWithVersion.Substring(0, originalName.Length - 2);
-                }
-                else
-                {
-                    originalName            = originalName.ToLower(CultureInfo.CurrentUICulture);
-                    originalNameWithVersion = originalName + ";1";
-                }
-
-                // Pre-read next line
-                line = sr.ReadLine();
-
-                KeyValuePair<string, DecodedDirectoryEntry> originalEntry =
-                    entries.FirstOrDefault(e => !e.Value.Flags.HasFlag(FileFlags.Directory) &&
-                                                (e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) ==
-                                                 originalName ||
-                                                 e.Value.Filename.ToLower(CultureInfo.CurrentUICulture) ==
-                                                 originalNameWithVersion));
-
-                originalEntry.Value.Filename = newName;
-                entries.Remove(originalEntry.Key);
-                entries[newName] = originalEntry.Value;
-            }
-
-            entries.Remove(transTblEntry.Key);
+            originalEntry.Value.Filename = newName;
+            entries.Remove(originalEntry.Key);
+            entries[newName] = originalEntry.Value;
         }
 
-        void DecodeSystemArea(byte[] data, int start, int end, ref DecodedDirectoryEntry entry,
-                              out bool hasResourceFork)
+        entries.Remove(transTblEntry.Key);
+    }
+
+    void DecodeSystemArea(byte[] data, int start, int end, ref DecodedDirectoryEntry entry,
+                          out bool hasResourceFork)
+    {
+        int systemAreaOff = start;
+        hasResourceFork = false;
+        bool              continueSymlink          = false;
+        bool              continueSymlinkComponent = false;
+        AppleCommon.FInfo fInfo;
+
+        while(systemAreaOff + 2 <= end)
         {
-            int systemAreaOff = start;
-            hasResourceFork = false;
-            bool              continueSymlink          = false;
-            bool              continueSymlinkComponent = false;
-            AppleCommon.FInfo fInfo;
+            ushort systemAreaSignature = BigEndianBitConverter.ToUInt16(data, systemAreaOff);
 
-            while(systemAreaOff + 2 <= end)
+            if(BigEndianBitConverter.ToUInt16(data, systemAreaOff + 6) == XA_MAGIC)
+                systemAreaSignature = XA_MAGIC;
+
+            switch(systemAreaSignature)
             {
-                ushort systemAreaSignature = BigEndianBitConverter.ToUInt16(data, systemAreaOff);
+                case APPLE_MAGIC:
+                    byte appleLength = data[systemAreaOff + 2];
+                    var  appleId     = (AppleId)data[systemAreaOff + 3];
 
-                if(BigEndianBitConverter.ToUInt16(data, systemAreaOff + 6) == XA_MAGIC)
-                    systemAreaSignature = XA_MAGIC;
+                    // Old AAIP
+                    if(appleId     == AppleId.ProDOS &&
+                       appleLength != 7)
+                        goto case AAIP_MAGIC;
 
-                switch(systemAreaSignature)
-                {
-                    case APPLE_MAGIC:
-                        byte appleLength = data[systemAreaOff + 2];
-                        var  appleId     = (AppleId)data[systemAreaOff + 3];
+                    switch(appleId)
+                    {
+                        case AppleId.ProDOS:
+                            AppleProDOSSystemUse appleProDosSystemUse =
+                                Marshal.ByteArrayToStructureLittleEndian<AppleProDOSSystemUse>(data, systemAreaOff,
+                                    Marshal.SizeOf<AppleProDOSSystemUse>());
 
-                        // Old AAIP
-                        if(appleId     == AppleId.ProDOS &&
-                           appleLength != 7)
-                            goto case AAIP_MAGIC;
-
-                        switch(appleId)
-                        {
-                            case AppleId.ProDOS:
-                                AppleProDOSSystemUse appleProDosSystemUse =
-                                    Marshal.ByteArrayToStructureLittleEndian<AppleProDOSSystemUse>(data, systemAreaOff,
-                                        Marshal.SizeOf<AppleProDOSSystemUse>());
-
-                                entry.AppleProDosType = appleProDosSystemUse.aux_type;
-                                entry.AppleDosType    = appleProDosSystemUse.type;
-
-                                break;
-                            case AppleId.HFS:
-                                AppleHFSSystemUse appleHfsSystemUse =
-                                    Marshal.ByteArrayToStructureBigEndian<AppleHFSSystemUse>(data, systemAreaOff,
-                                        Marshal.SizeOf<AppleHFSSystemUse>());
-
-                                hasResourceFork = true;
-
-                                fInfo            = new AppleCommon.FInfo();
-                                fInfo.fdCreator  = appleHfsSystemUse.creator;
-                                fInfo.fdFlags    = appleHfsSystemUse.finder_flags;
-                                fInfo.fdType     = appleHfsSystemUse.type;
-                                entry.FinderInfo = fInfo;
-
-                                break;
-                        }
-
-                        systemAreaOff += appleLength;
-
-                        break;
-                    case APPLE_MAGIC_OLD:
-                        var appleOldId = (AppleOldId)data[systemAreaOff + 2];
-
-                        switch(appleOldId)
-                        {
-                            case AppleOldId.ProDOS:
-                                AppleProDOSOldSystemUse appleProDosOldSystemUse =
-                                    Marshal.ByteArrayToStructureLittleEndian<AppleProDOSOldSystemUse>(data,
-                                        systemAreaOff, Marshal.SizeOf<AppleProDOSOldSystemUse>());
-
-                                entry.AppleProDosType = appleProDosOldSystemUse.aux_type;
-                                entry.AppleDosType    = appleProDosOldSystemUse.type;
-
-                                systemAreaOff += Marshal.SizeOf<AppleProDOSOldSystemUse>();
-
-                                break;
-                            case AppleOldId.TypeCreator:
-                            case AppleOldId.TypeCreatorBundle:
-                                AppleHFSTypeCreatorSystemUse appleHfsTypeCreatorSystemUse =
-                                    Marshal.ByteArrayToStructureBigEndian<AppleHFSTypeCreatorSystemUse>(data,
-                                        systemAreaOff, Marshal.SizeOf<AppleHFSTypeCreatorSystemUse>());
-
-                                hasResourceFork = true;
-
-                                fInfo            = new AppleCommon.FInfo();
-                                fInfo.fdCreator  = appleHfsTypeCreatorSystemUse.creator;
-                                fInfo.fdType     = appleHfsTypeCreatorSystemUse.type;
-                                entry.FinderInfo = fInfo;
-
-                                systemAreaOff += Marshal.SizeOf<AppleHFSTypeCreatorSystemUse>();
-
-                                break;
-                            case AppleOldId.TypeCreatorIcon:
-                            case AppleOldId.TypeCreatorIconBundle:
-                                AppleHFSIconSystemUse appleHfsIconSystemUse =
-                                    Marshal.ByteArrayToStructureBigEndian<AppleHFSIconSystemUse>(data, systemAreaOff,
-                                        Marshal.SizeOf<AppleHFSIconSystemUse>());
-
-                                hasResourceFork = true;
-
-                                fInfo            = new AppleCommon.FInfo();
-                                fInfo.fdCreator  = appleHfsIconSystemUse.creator;
-                                fInfo.fdType     = appleHfsIconSystemUse.type;
-                                entry.FinderInfo = fInfo;
-                                entry.AppleIcon  = appleHfsIconSystemUse.icon;
-
-                                systemAreaOff += Marshal.SizeOf<AppleHFSIconSystemUse>();
-
-                                break;
-                            case AppleOldId.HFS:
-                                AppleHFSOldSystemUse appleHfsSystemUse =
-                                    Marshal.ByteArrayToStructureBigEndian<AppleHFSOldSystemUse>(data, systemAreaOff,
-                                        Marshal.SizeOf<AppleHFSOldSystemUse>());
-
-                                hasResourceFork = true;
-
-                                fInfo            = new AppleCommon.FInfo();
-                                fInfo.fdCreator  = appleHfsSystemUse.creator;
-                                fInfo.fdFlags    = (AppleCommon.FinderFlags)appleHfsSystemUse.finder_flags;
-                                fInfo.fdType     = appleHfsSystemUse.type;
-                                entry.FinderInfo = fInfo;
-
-                                systemAreaOff += Marshal.SizeOf<AppleHFSOldSystemUse>();
-
-                                break;
-                            default:
-                                // Cannot continue as we don't know this structure size
-                                systemAreaOff = end;
-
-                                break;
-                        }
-
-                        break;
-                    case XA_MAGIC:
-                        entry.XA = Marshal.ByteArrayToStructureBigEndian<CdromXa>(data, systemAreaOff,
-                            Marshal.SizeOf<CdromXa>());
-
-                        systemAreaOff += Marshal.SizeOf<CdromXa>();
-
-                        break;
-
-                    // All of these follow the SUSP indication of 2 bytes for signature 1 byte for length
-                    case AAIP_MAGIC:
-                    case AMIGA_MAGIC:
-                        AmigaEntry amiga =
-                            Marshal.ByteArrayToStructureBigEndian<AmigaEntry>(data, systemAreaOff,
-                                                                              Marshal.SizeOf<AmigaEntry>());
-
-                        int protectionLength = 0;
-
-                        if(amiga.flags.HasFlag(AmigaFlags.Protection))
-                        {
-                            entry.AmigaProtection =
-                                Marshal.ByteArrayToStructureBigEndian<AmigaProtection>(data,
-                                    systemAreaOff + Marshal.SizeOf<AmigaEntry>(),
-                                    Marshal.SizeOf<AmigaProtection>());
-
-                            protectionLength = Marshal.SizeOf<AmigaProtection>();
-                        }
-
-                        if(amiga.flags.HasFlag(AmigaFlags.Comment))
-                        {
-                            if(entry.AmigaComment is null)
-                                entry.AmigaComment = Array.Empty<byte>();
-
-                            byte[] newComment = new byte[entry.AmigaComment.Length +
-                                                         data
-                                                             [systemAreaOff + Marshal.SizeOf<AmigaEntry>() + protectionLength] -
-                                                         1];
-
-                            Array.Copy(entry.AmigaComment, 0, newComment, 0, entry.AmigaComment.Length);
-
-                            Array.Copy(data, systemAreaOff + Marshal.SizeOf<AmigaEntry>() + protectionLength,
-                                       newComment, entry.AmigaComment.Length,
-                                       data[systemAreaOff + Marshal.SizeOf<AmigaEntry>() + protectionLength] - 1);
-
-                            entry.AmigaComment = newComment;
-                        }
-
-                        systemAreaOff += amiga.length;
-
-                        break;
-
-                    // This merely indicates the existence of RRIP extensions, we don't need it
-                    case RRIP_MAGIC:
-                        byte rripLength = data[systemAreaOff + 2];
-                        systemAreaOff += rripLength;
-
-                        break;
-                    case RRIP_POSIX_ATTRIBUTES:
-                        byte pxLength = data[systemAreaOff + 2];
-
-                        if(pxLength == 36)
-                            entry.PosixAttributesOld =
-                                Marshal.ByteArrayToStructureLittleEndian<PosixAttributesOld>(data, systemAreaOff,
-                                    Marshal.SizeOf<PosixAttributesOld>());
-                        else if(pxLength >= 44)
-                            entry.PosixAttributes =
-                                Marshal.ByteArrayToStructureLittleEndian<PosixAttributes>(data, systemAreaOff,
-                                    Marshal.SizeOf<PosixAttributes>());
-
-                        systemAreaOff += pxLength;
-
-                        break;
-                    case RRIP_POSIX_DEV_NO:
-                        byte pnLength = data[systemAreaOff + 2];
-
-                        entry.PosixDeviceNumber =
-                            Marshal.ByteArrayToStructureLittleEndian<PosixDeviceNumber>(data, systemAreaOff,
-                                Marshal.SizeOf<PosixDeviceNumber>());
-
-                        systemAreaOff += pnLength;
-
-                        break;
-                    case RRIP_SYMLINK:
-                        byte slLength = data[systemAreaOff + 2];
-
-                        SymbolicLink sl =
-                            Marshal.ByteArrayToStructureLittleEndian<SymbolicLink>(data, systemAreaOff,
-                                Marshal.SizeOf<SymbolicLink>());
-
-                        SymbolicLinkComponent slc =
-                            Marshal.ByteArrayToStructureLittleEndian<SymbolicLinkComponent>(data,
-                                systemAreaOff + Marshal.SizeOf<SymbolicLink>(),
-                                Marshal.SizeOf<SymbolicLinkComponent>());
-
-                        if(!continueSymlink ||
-                           entry.SymbolicLink is null)
-                            entry.SymbolicLink = "";
-
-                        if(slc.flags.HasFlag(SymlinkComponentFlags.Root))
-                            entry.SymbolicLink = "/";
-
-                        if(slc.flags.HasFlag(SymlinkComponentFlags.Current))
-                            entry.SymbolicLink += ".";
-
-                        if(slc.flags.HasFlag(SymlinkComponentFlags.Parent))
-                            entry.SymbolicLink += "..";
-
-                        if(!continueSymlinkComponent &&
-                           !slc.flags.HasFlag(SymlinkComponentFlags.Root))
-                            entry.SymbolicLink += "/";
-
-                        entry.SymbolicLink += slc.flags.HasFlag(SymlinkComponentFlags.Networkname)
-                                                  ? Environment.MachineName
-                                                  : _joliet
-                                                      ? Encoding.BigEndianUnicode.GetString(data,
-                                                          systemAreaOff + Marshal.SizeOf<SymbolicLink>() +
-                                                          Marshal.SizeOf<SymbolicLinkComponent>(), slc.length)
-                                                      : Encoding.GetString(data,
-                                                                           systemAreaOff                  +
-                                                                           Marshal.SizeOf<SymbolicLink>() +
-                                                                           Marshal.SizeOf<SymbolicLinkComponent>(),
-                                                                           slc.length);
-
-                        continueSymlink          = sl.flags.HasFlag(SymlinkFlags.Continue);
-                        continueSymlinkComponent = slc.flags.HasFlag(SymlinkComponentFlags.Continue);
-
-                        systemAreaOff += slLength;
-
-                        break;
-                    case RRIP_NAME:
-                        byte nmLength = data[systemAreaOff + 2];
-
-                        if(_namespace != Namespace.Rrip)
-                        {
-                            systemAreaOff += nmLength;
+                            entry.AppleProDosType = appleProDosSystemUse.aux_type;
+                            entry.AppleDosType    = appleProDosSystemUse.type;
 
                             break;
-                        }
+                        case AppleId.HFS:
+                            AppleHFSSystemUse appleHfsSystemUse =
+                                Marshal.ByteArrayToStructureBigEndian<AppleHFSSystemUse>(data, systemAreaOff,
+                                    Marshal.SizeOf<AppleHFSSystemUse>());
 
-                        AlternateName alternateName =
-                            Marshal.ByteArrayToStructureLittleEndian<AlternateName>(data, systemAreaOff,
-                                Marshal.SizeOf<AlternateName>());
+                            hasResourceFork = true;
 
-                        byte[] nm;
+                            fInfo            = new AppleCommon.FInfo();
+                            fInfo.fdCreator  = appleHfsSystemUse.creator;
+                            fInfo.fdFlags    = appleHfsSystemUse.finder_flags;
+                            fInfo.fdType     = appleHfsSystemUse.type;
+                            entry.FinderInfo = fInfo;
 
-                        if(alternateName.flags.HasFlag(AlternateNameFlags.Networkname))
-                            nm = _joliet ? Encoding.BigEndianUnicode.GetBytes(Environment.MachineName)
-                                     : Encoding.GetBytes(Environment.MachineName);
-                        else
-                        {
-                            nm = new byte[nmLength - Marshal.SizeOf<AlternateName>()];
+                            break;
+                    }
 
-                            Array.Copy(data, systemAreaOff + Marshal.SizeOf<AlternateName>(), nm, 0, nm.Length);
-                        }
+                    systemAreaOff += appleLength;
 
-                        if(entry.RockRidgeAlternateName is null)
-                            entry.RockRidgeAlternateName = Array.Empty<byte>();
+                    break;
+                case APPLE_MAGIC_OLD:
+                    var appleOldId = (AppleOldId)data[systemAreaOff + 2];
 
-                        byte[] newNm = new byte[entry.RockRidgeAlternateName.Length + nm.Length];
-                        Array.Copy(entry.RockRidgeAlternateName, 0, newNm, 0, entry.RockRidgeAlternateName.Length);
-                        Array.Copy(nm, 0, newNm, entry.RockRidgeAlternateName.Length, nm.Length);
+                    switch(appleOldId)
+                    {
+                        case AppleOldId.ProDOS:
+                            AppleProDOSOldSystemUse appleProDosOldSystemUse =
+                                Marshal.ByteArrayToStructureLittleEndian<AppleProDOSOldSystemUse>(data,
+                                    systemAreaOff, Marshal.SizeOf<AppleProDOSOldSystemUse>());
 
-                        entry.RockRidgeAlternateName = newNm;
+                            entry.AppleProDosType = appleProDosOldSystemUse.aux_type;
+                            entry.AppleDosType    = appleProDosOldSystemUse.type;
 
-                        if(!alternateName.flags.HasFlag(AlternateNameFlags.Continue))
-                        {
-                            entry.Filename = _joliet ? Encoding.BigEndianUnicode.GetString(entry.RockRidgeAlternateName)
-                                                 : Encoding.GetString(entry.RockRidgeAlternateName);
+                            systemAreaOff += Marshal.SizeOf<AppleProDOSOldSystemUse>();
 
-                            entry.RockRidgeAlternateName = null;
-                        }
+                            break;
+                        case AppleOldId.TypeCreator:
+                        case AppleOldId.TypeCreatorBundle:
+                            AppleHFSTypeCreatorSystemUse appleHfsTypeCreatorSystemUse =
+                                Marshal.ByteArrayToStructureBigEndian<AppleHFSTypeCreatorSystemUse>(data,
+                                    systemAreaOff, Marshal.SizeOf<AppleHFSTypeCreatorSystemUse>());
 
+                            hasResourceFork = true;
+
+                            fInfo            = new AppleCommon.FInfo();
+                            fInfo.fdCreator  = appleHfsTypeCreatorSystemUse.creator;
+                            fInfo.fdType     = appleHfsTypeCreatorSystemUse.type;
+                            entry.FinderInfo = fInfo;
+
+                            systemAreaOff += Marshal.SizeOf<AppleHFSTypeCreatorSystemUse>();
+
+                            break;
+                        case AppleOldId.TypeCreatorIcon:
+                        case AppleOldId.TypeCreatorIconBundle:
+                            AppleHFSIconSystemUse appleHfsIconSystemUse =
+                                Marshal.ByteArrayToStructureBigEndian<AppleHFSIconSystemUse>(data, systemAreaOff,
+                                    Marshal.SizeOf<AppleHFSIconSystemUse>());
+
+                            hasResourceFork = true;
+
+                            fInfo            = new AppleCommon.FInfo();
+                            fInfo.fdCreator  = appleHfsIconSystemUse.creator;
+                            fInfo.fdType     = appleHfsIconSystemUse.type;
+                            entry.FinderInfo = fInfo;
+                            entry.AppleIcon  = appleHfsIconSystemUse.icon;
+
+                            systemAreaOff += Marshal.SizeOf<AppleHFSIconSystemUse>();
+
+                            break;
+                        case AppleOldId.HFS:
+                            AppleHFSOldSystemUse appleHfsSystemUse =
+                                Marshal.ByteArrayToStructureBigEndian<AppleHFSOldSystemUse>(data, systemAreaOff,
+                                    Marshal.SizeOf<AppleHFSOldSystemUse>());
+
+                            hasResourceFork = true;
+
+                            fInfo            = new AppleCommon.FInfo();
+                            fInfo.fdCreator  = appleHfsSystemUse.creator;
+                            fInfo.fdFlags    = (AppleCommon.FinderFlags)appleHfsSystemUse.finder_flags;
+                            fInfo.fdType     = appleHfsSystemUse.type;
+                            entry.FinderInfo = fInfo;
+
+                            systemAreaOff += Marshal.SizeOf<AppleHFSOldSystemUse>();
+
+                            break;
+                        default:
+                            // Cannot continue as we don't know this structure size
+                            systemAreaOff = end;
+
+                            break;
+                    }
+
+                    break;
+                case XA_MAGIC:
+                    entry.XA = Marshal.ByteArrayToStructureBigEndian<CdromXa>(data, systemAreaOff,
+                                                                              Marshal.SizeOf<CdromXa>());
+
+                    systemAreaOff += Marshal.SizeOf<CdromXa>();
+
+                    break;
+
+                // All of these follow the SUSP indication of 2 bytes for signature 1 byte for length
+                case AAIP_MAGIC:
+                case AMIGA_MAGIC:
+                    AmigaEntry amiga =
+                        Marshal.ByteArrayToStructureBigEndian<AmigaEntry>(data, systemAreaOff,
+                                                                          Marshal.SizeOf<AmigaEntry>());
+
+                    int protectionLength = 0;
+
+                    if(amiga.flags.HasFlag(AmigaFlags.Protection))
+                    {
+                        entry.AmigaProtection =
+                            Marshal.ByteArrayToStructureBigEndian<AmigaProtection>(data,
+                                systemAreaOff + Marshal.SizeOf<AmigaEntry>(),
+                                Marshal.SizeOf<AmigaProtection>());
+
+                        protectionLength = Marshal.SizeOf<AmigaProtection>();
+                    }
+
+                    if(amiga.flags.HasFlag(AmigaFlags.Comment))
+                    {
+                        if(entry.AmigaComment is null)
+                            entry.AmigaComment = Array.Empty<byte>();
+
+                        byte[] newComment = new byte[entry.AmigaComment.Length +
+                                                     data
+                                                         [systemAreaOff + Marshal.SizeOf<AmigaEntry>() + protectionLength] -
+                                                     1];
+
+                        Array.Copy(entry.AmigaComment, 0, newComment, 0, entry.AmigaComment.Length);
+
+                        Array.Copy(data, systemAreaOff + Marshal.SizeOf<AmigaEntry>() + protectionLength,
+                                   newComment, entry.AmigaComment.Length,
+                                   data[systemAreaOff + Marshal.SizeOf<AmigaEntry>() + protectionLength] - 1);
+
+                        entry.AmigaComment = newComment;
+                    }
+
+                    systemAreaOff += amiga.length;
+
+                    break;
+
+                // This merely indicates the existence of RRIP extensions, we don't need it
+                case RRIP_MAGIC:
+                    byte rripLength = data[systemAreaOff + 2];
+                    systemAreaOff += rripLength;
+
+                    break;
+                case RRIP_POSIX_ATTRIBUTES:
+                    byte pxLength = data[systemAreaOff + 2];
+
+                    if(pxLength == 36)
+                        entry.PosixAttributesOld =
+                            Marshal.ByteArrayToStructureLittleEndian<PosixAttributesOld>(data, systemAreaOff,
+                                Marshal.SizeOf<PosixAttributesOld>());
+                    else if(pxLength >= 44)
+                        entry.PosixAttributes =
+                            Marshal.ByteArrayToStructureLittleEndian<PosixAttributes>(data, systemAreaOff,
+                                Marshal.SizeOf<PosixAttributes>());
+
+                    systemAreaOff += pxLength;
+
+                    break;
+                case RRIP_POSIX_DEV_NO:
+                    byte pnLength = data[systemAreaOff + 2];
+
+                    entry.PosixDeviceNumber =
+                        Marshal.ByteArrayToStructureLittleEndian<PosixDeviceNumber>(data, systemAreaOff,
+                            Marshal.SizeOf<PosixDeviceNumber>());
+
+                    systemAreaOff += pnLength;
+
+                    break;
+                case RRIP_SYMLINK:
+                    byte slLength = data[systemAreaOff + 2];
+
+                    SymbolicLink sl =
+                        Marshal.ByteArrayToStructureLittleEndian<SymbolicLink>(data, systemAreaOff,
+                                                                               Marshal.SizeOf<SymbolicLink>());
+
+                    SymbolicLinkComponent slc =
+                        Marshal.ByteArrayToStructureLittleEndian<SymbolicLinkComponent>(data,
+                            systemAreaOff + Marshal.SizeOf<SymbolicLink>(),
+                            Marshal.SizeOf<SymbolicLinkComponent>());
+
+                    if(!continueSymlink ||
+                       entry.SymbolicLink is null)
+                        entry.SymbolicLink = "";
+
+                    if(slc.flags.HasFlag(SymlinkComponentFlags.Root))
+                        entry.SymbolicLink = "/";
+
+                    if(slc.flags.HasFlag(SymlinkComponentFlags.Current))
+                        entry.SymbolicLink += ".";
+
+                    if(slc.flags.HasFlag(SymlinkComponentFlags.Parent))
+                        entry.SymbolicLink += "..";
+
+                    if(!continueSymlinkComponent &&
+                       !slc.flags.HasFlag(SymlinkComponentFlags.Root))
+                        entry.SymbolicLink += "/";
+
+                    entry.SymbolicLink += slc.flags.HasFlag(SymlinkComponentFlags.Networkname)
+                                              ? Environment.MachineName
+                                              : _joliet
+                                                  ? Encoding.BigEndianUnicode.GetString(data,
+                                                      systemAreaOff + Marshal.SizeOf<SymbolicLink>() +
+                                                      Marshal.SizeOf<SymbolicLinkComponent>(), slc.length)
+                                                  : Encoding.GetString(data,
+                                                                       systemAreaOff                  +
+                                                                       Marshal.SizeOf<SymbolicLink>() +
+                                                                       Marshal.SizeOf<SymbolicLinkComponent>(),
+                                                                       slc.length);
+
+                    continueSymlink          = sl.flags.HasFlag(SymlinkFlags.Continue);
+                    continueSymlinkComponent = slc.flags.HasFlag(SymlinkComponentFlags.Continue);
+
+                    systemAreaOff += slLength;
+
+                    break;
+                case RRIP_NAME:
+                    byte nmLength = data[systemAreaOff + 2];
+
+                    if(_namespace != Namespace.Rrip)
+                    {
                         systemAreaOff += nmLength;
 
                         break;
-                    case RRIP_CHILDLINK:
-                        byte clLength = data[systemAreaOff + 2];
+                    }
 
-                        // If we are not in Rock Ridge namespace, or we are using the Path Table, skip it
-                        if(_namespace != Namespace.Rrip || _usePathTable)
-                        {
-                            systemAreaOff += clLength;
+                    AlternateName alternateName =
+                        Marshal.ByteArrayToStructureLittleEndian<AlternateName>(data, systemAreaOff,
+                                                                                    Marshal.SizeOf<AlternateName>());
 
-                            break;
-                        }
+                    byte[] nm;
 
-                        ChildLink cl =
-                            Marshal.ByteArrayToStructureLittleEndian<ChildLink>(data, systemAreaOff,
-                                                                                    Marshal.SizeOf<ChildLink>());
+                    if(alternateName.flags.HasFlag(AlternateNameFlags.Networkname))
+                        nm = _joliet ? Encoding.BigEndianUnicode.GetBytes(Environment.MachineName)
+                                 : Encoding.GetBytes(Environment.MachineName);
+                    else
+                    {
+                        nm = new byte[nmLength - Marshal.SizeOf<AlternateName>()];
 
-                        ErrorNumber errno = ReadSector(cl.child_dir_lba, out byte[] childSector);
+                        Array.Copy(data, systemAreaOff + Marshal.SizeOf<AlternateName>(), nm, 0, nm.Length);
+                    }
 
-                        DirectoryRecord childRecord =
-                            Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(childSector);
+                    if(entry.RockRidgeAlternateName is null)
+                        entry.RockRidgeAlternateName = Array.Empty<byte>();
 
-                        // As per RRIP 4.1.5.1, we leave name as in previous entry, substitute location with the one in
-                        // the CL, and replace all other fields with the ones found in the first entry of the child
-                        entry.Extents = new List<(uint extent, uint size)>
-                        {
-                            (cl.child_dir_lba, childRecord.size)
-                        };
+                    byte[] newNm = new byte[entry.RockRidgeAlternateName.Length + nm.Length];
+                    Array.Copy(entry.RockRidgeAlternateName, 0, newNm, 0, entry.RockRidgeAlternateName.Length);
+                    Array.Copy(nm, 0, newNm, entry.RockRidgeAlternateName.Length, nm.Length);
 
-                        entry.Size                 = childRecord.size;
-                        entry.Flags                = childRecord.flags;
-                        entry.FileUnitSize         = childRecord.file_unit_size;
-                        entry.Interleave           = childRecord.interleave;
-                        entry.VolumeSequenceNumber = childRecord.volume_sequence_number;
-                        entry.Timestamp            = DecodeIsoDateTime(childRecord.date);
-                        entry.XattrLength          = childRecord.xattr_len;
+                    entry.RockRidgeAlternateName = newNm;
 
+                    if(!alternateName.flags.HasFlag(AlternateNameFlags.Continue))
+                    {
+                        entry.Filename = _joliet ? Encoding.BigEndianUnicode.GetString(entry.RockRidgeAlternateName)
+                                             : Encoding.GetString(entry.RockRidgeAlternateName);
+
+                        entry.RockRidgeAlternateName = null;
+                    }
+
+                    systemAreaOff += nmLength;
+
+                    break;
+                case RRIP_CHILDLINK:
+                    byte clLength = data[systemAreaOff + 2];
+
+                    // If we are not in Rock Ridge namespace, or we are using the Path Table, skip it
+                    if(_namespace != Namespace.Rrip || _usePathTable)
+                    {
                         systemAreaOff += clLength;
 
                         break;
-                    case RRIP_PARENTLINK:
-                        // SKip, we don't need it
-                        byte plLength = data[systemAreaOff + 2];
-                        systemAreaOff += plLength;
+                    }
 
-                        break;
-                    case RRIP_RELOCATED_DIR:
-                        byte reLength = data[systemAreaOff + 2];
-                        systemAreaOff += reLength;
+                    ChildLink cl =
+                        Marshal.ByteArrayToStructureLittleEndian<ChildLink>(data, systemAreaOff,
+                                                                            Marshal.SizeOf<ChildLink>());
 
-                        entry.RockRidgeRelocated = true;
+                    ErrorNumber errno = ReadSector(cl.child_dir_lba, out byte[] childSector);
 
-                        break;
-                    case RRIP_TIMESTAMPS:
-                        byte tfLength = data[systemAreaOff + 2];
+                    DirectoryRecord childRecord =
+                        Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(childSector);
 
-                        Timestamps timestamps =
-                            Marshal.ByteArrayToStructureLittleEndian<Timestamps>(data, systemAreaOff,
-                                Marshal.SizeOf<Timestamps>());
+                    // As per RRIP 4.1.5.1, we leave name as in previous entry, substitute location with the one in
+                    // the CL, and replace all other fields with the ones found in the first entry of the child
+                    entry.Extents = new List<(uint extent, uint size)>
+                    {
+                        (cl.child_dir_lba, childRecord.size)
+                    };
 
-                        int tfOff = systemAreaOff + Marshal.SizeOf<Timestamps>();
-                        int tfLen = timestamps.flags.HasFlag(TimestampFlags.LongFormat) ? 17 : 7;
+                    entry.Size                 = childRecord.size;
+                    entry.Flags                = childRecord.flags;
+                    entry.FileUnitSize         = childRecord.file_unit_size;
+                    entry.Interleave           = childRecord.interleave;
+                    entry.VolumeSequenceNumber = childRecord.volume_sequence_number;
+                    entry.Timestamp            = DecodeIsoDateTime(childRecord.date);
+                    entry.XattrLength          = childRecord.xattr_len;
 
-                        if(timestamps.flags.HasFlag(TimestampFlags.Creation))
-                        {
-                            entry.RripCreation = new byte[tfLen];
-                            Array.Copy(data, tfOff, entry.RripCreation, 0, tfLen);
-                            tfOff += tfLen;
-                        }
+                    systemAreaOff += clLength;
 
-                        if(timestamps.flags.HasFlag(TimestampFlags.Modification))
-                        {
-                            entry.RripModify = new byte[tfLen];
-                            Array.Copy(data, tfOff, entry.RripModify, 0, tfLen);
-                            tfOff += tfLen;
-                        }
-
-                        if(timestamps.flags.HasFlag(TimestampFlags.Access))
-                        {
-                            entry.RripAccess = new byte[tfLen];
-                            Array.Copy(data, tfOff, entry.RripAccess, 0, tfLen);
-                            tfOff += tfLen;
-                        }
-
-                        if(timestamps.flags.HasFlag(TimestampFlags.AttributeChange))
-                        {
-                            entry.RripAttributeChange = new byte[tfLen];
-                            Array.Copy(data, tfOff, entry.RripAttributeChange, 0, tfLen);
-                            tfOff += tfLen;
-                        }
-
-                        if(timestamps.flags.HasFlag(TimestampFlags.Backup))
-                        {
-                            entry.RripBackup = new byte[tfLen];
-                            Array.Copy(data, tfOff, entry.RripBackup, 0, tfLen);
-                            tfOff += tfLen;
-                        }
-
-                        if(timestamps.flags.HasFlag(TimestampFlags.Expiration))
-                        {
-                            entry.RripExpiration = new byte[tfLen];
-                            Array.Copy(data, tfOff, entry.RripExpiration, 0, tfLen);
-                            tfOff += tfLen;
-                        }
-
-                        if(timestamps.flags.HasFlag(TimestampFlags.Effective))
-                        {
-                            entry.RripEffective = new byte[tfLen];
-                            Array.Copy(data, tfOff, entry.RripEffective, 0, tfLen);
-                        }
-
-                        systemAreaOff += tfLength;
-
-                        break;
-                    case RRIP_SPARSE:
-                        // TODO
-                        byte sfLength = data[systemAreaOff + 2];
-                        systemAreaOff += sfLength;
-
-                        break;
-                    case SUSP_CONTINUATION:
-                        byte ceLength = data[systemAreaOff + 2];
-
-                        ContinuationArea ca =
-                            Marshal.ByteArrayToStructureLittleEndian<ContinuationArea>(data, systemAreaOff,
-                                Marshal.SizeOf<ContinuationArea>());
-
-                        byte[] caData = ReadSingleExtent(ca.offset, ca.ca_length, ca.block);
-
-                        DecodeSystemArea(caData, 0, (int)ca.ca_length, ref entry, out hasResourceFork);
-
-                        systemAreaOff += ceLength;
-
-                        break;
-                    case SUSP_PADDING:
-                        // Just padding, skip
-                        byte pdLength = data[systemAreaOff + 2];
-                        systemAreaOff += pdLength;
-
-                        break;
-                    case SUSP_INDICATOR:
-                        // Only to be found on CURRENT entry of root directory
-                        byte spLength = data[systemAreaOff + 2];
-                        systemAreaOff += spLength;
-
-                        break;
-                    case SUSP_TERMINATOR:
-                        // Not seen on the wild
-                        byte stLength = data[systemAreaOff + 2];
-                        systemAreaOff += stLength;
-
-                        break;
-                    case SUSP_REFERENCE:
-                        // Only to be found on CURRENT entry of root directory
-                        byte erLength = data[systemAreaOff + 2];
-                        systemAreaOff += erLength;
-
-                        break;
-                    case SUSP_SELECTOR:
-                        // Only to be found on CURRENT entry of root directory
-                        byte esLength = data[systemAreaOff + 2];
-                        systemAreaOff += esLength;
-
-                        break;
-                    case ZISO_MAGIC:
-                        // TODO: Implement support for zisofs
-                        byte zfLength = data[systemAreaOff + 2];
-                        systemAreaOff += zfLength;
-
-                        break;
-                    default:
-                        // Cannot continue as we don't know this structure size
-                        systemAreaOff = end;
-
-                        break;
-                }
-            }
-        }
-
-        PathTableEntryInternal[] GetPathTableEntries(string path)
-        {
-            IEnumerable<PathTableEntryInternal> tableEntries;
-            List<PathTableEntryInternal>        pathTableList = new(_pathTable);
-
-            if(path == "" ||
-               path == "/")
-                tableEntries = _pathTable.Where(p => p.Parent == 1 && p != _pathTable[0]);
-            else
-            {
-                string cutPath = path.StartsWith("/", StringComparison.Ordinal)
-                                     ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
-                                     : path.ToLower(CultureInfo.CurrentUICulture);
-
-                string[] pieces = cutPath.Split(new[]
-                {
-                    '/'
-                }, StringSplitOptions.RemoveEmptyEntries);
-
-                int currentParent = 1;
-                int currentPiece  = 0;
-
-                while(currentPiece < pieces.Length)
-                {
-                    PathTableEntryInternal currentEntry = _pathTable.FirstOrDefault(p => p.Parent == currentParent &&
-                        p.Name.ToLower(CultureInfo.CurrentUICulture) == pieces[currentPiece]);
-
-                    if(currentEntry is null)
-                        break;
-
-                    currentPiece++;
-                    currentParent = pathTableList.IndexOf(currentEntry) + 1;
-                }
-
-                tableEntries = _pathTable.Where(p => p.Parent == currentParent);
-            }
-
-            return tableEntries.ToArray();
-        }
-
-        DecodedDirectoryEntry[] GetSubdirsFromCdiPathTable(string path)
-        {
-            PathTableEntryInternal[]    tableEntries = GetPathTableEntries(path);
-            List<DecodedDirectoryEntry> entries      = new();
-
-            foreach(PathTableEntryInternal tEntry in tableEntries)
-            {
-                ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector);
-
-                CdiDirectoryRecord record =
-                    Marshal.ByteArrayToStructureBigEndian<CdiDirectoryRecord>(sector, tEntry.XattrLength,
-                                                                              _cdiDirectoryRecordSize);
-
-                if(record.length == 0)
                     break;
+                case RRIP_PARENTLINK:
+                    // SKip, we don't need it
+                    byte plLength = data[systemAreaOff + 2];
+                    systemAreaOff += plLength;
 
-                var entry = new DecodedDirectoryEntry
-                {
-                    Size                 = record.size,
-                    Filename             = tEntry.Name,
-                    VolumeSequenceNumber = record.volume_sequence_number,
-                    Timestamp            = DecodeHighSierraDateTime(record.date),
-                    XattrLength          = tEntry.XattrLength
-                };
-
-                entry.Extents = new List<(uint extent, uint size)>();
-
-                if(record.size != 0)
-                    entry.Extents.Add((record.start_lbn, record.size));
-
-                if(record.flags.HasFlag(CdiFileFlags.Hidden))
-                    entry.Flags |= FileFlags.Hidden;
-
-                int systemAreaStart = record.name_len + _cdiDirectoryRecordSize;
-
-                if(systemAreaStart % 2 != 0)
-                    systemAreaStart++;
-
-                entry.CdiSystemArea =
-                    Marshal.ByteArrayToStructureBigEndian<CdiSystemArea>(sector, systemAreaStart, _cdiSystemAreaSize);
-
-                if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.Directory))
-                    entry.Flags |= FileFlags.Directory;
-
-                entries.Add(entry);
-            }
-
-            return entries.ToArray();
-        }
-
-        DecodedDirectoryEntry[] GetSubdirsFromIsoPathTable(string path)
-        {
-            PathTableEntryInternal[]    tableEntries = GetPathTableEntries(path);
-            List<DecodedDirectoryEntry> entries      = new();
-
-            foreach(PathTableEntryInternal tEntry in tableEntries)
-            {
-                ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector);
-
-                DirectoryRecord record =
-                    Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(sector, tEntry.XattrLength,
-                                                                              _directoryRecordSize);
-
-                if(record.length == 0)
                     break;
+                case RRIP_RELOCATED_DIR:
+                    byte reLength = data[systemAreaOff + 2];
+                    systemAreaOff += reLength;
 
-                var entry = new DecodedDirectoryEntry
-                {
-                    Size                 = record.size,
-                    Flags                = record.flags,
-                    Filename             = tEntry.Name,
-                    FileUnitSize         = record.file_unit_size,
-                    Interleave           = record.interleave,
-                    VolumeSequenceNumber = record.volume_sequence_number,
-                    Timestamp            = DecodeIsoDateTime(record.date),
-                    XattrLength          = tEntry.XattrLength
-                };
+                    entry.RockRidgeRelocated = true;
 
-                entry.Extents = new List<(uint extent, uint size)>();
+                    break;
+                case RRIP_TIMESTAMPS:
+                    byte tfLength = data[systemAreaOff + 2];
 
-                if(record.size != 0)
-                    entry.Extents.Add((record.extent, record.size));
+                    Timestamps timestamps =
+                        Marshal.ByteArrayToStructureLittleEndian<Timestamps>(data, systemAreaOff,
+                                                                             Marshal.SizeOf<Timestamps>());
 
-                int systemAreaStart  = record.name_len + _directoryRecordSize;
-                int systemAreaLength = record.length   - record.name_len - _directoryRecordSize;
+                    int tfOff = systemAreaOff + Marshal.SizeOf<Timestamps>();
+                    int tfLen = timestamps.flags.HasFlag(TimestampFlags.LongFormat) ? 17 : 7;
 
-                if(systemAreaStart % 2 != 0)
-                {
-                    systemAreaStart++;
-                    systemAreaLength--;
-                }
+                    if(timestamps.flags.HasFlag(TimestampFlags.Creation))
+                    {
+                        entry.RripCreation = new byte[tfLen];
+                        Array.Copy(data, tfOff, entry.RripCreation, 0, tfLen);
+                        tfOff += tfLen;
+                    }
 
-                DecodeSystemArea(sector, systemAreaStart, systemAreaStart + systemAreaLength, ref entry, out _);
+                    if(timestamps.flags.HasFlag(TimestampFlags.Modification))
+                    {
+                        entry.RripModify = new byte[tfLen];
+                        Array.Copy(data, tfOff, entry.RripModify, 0, tfLen);
+                        tfOff += tfLen;
+                    }
 
-                entries.Add(entry);
+                    if(timestamps.flags.HasFlag(TimestampFlags.Access))
+                    {
+                        entry.RripAccess = new byte[tfLen];
+                        Array.Copy(data, tfOff, entry.RripAccess, 0, tfLen);
+                        tfOff += tfLen;
+                    }
+
+                    if(timestamps.flags.HasFlag(TimestampFlags.AttributeChange))
+                    {
+                        entry.RripAttributeChange = new byte[tfLen];
+                        Array.Copy(data, tfOff, entry.RripAttributeChange, 0, tfLen);
+                        tfOff += tfLen;
+                    }
+
+                    if(timestamps.flags.HasFlag(TimestampFlags.Backup))
+                    {
+                        entry.RripBackup = new byte[tfLen];
+                        Array.Copy(data, tfOff, entry.RripBackup, 0, tfLen);
+                        tfOff += tfLen;
+                    }
+
+                    if(timestamps.flags.HasFlag(TimestampFlags.Expiration))
+                    {
+                        entry.RripExpiration = new byte[tfLen];
+                        Array.Copy(data, tfOff, entry.RripExpiration, 0, tfLen);
+                        tfOff += tfLen;
+                    }
+
+                    if(timestamps.flags.HasFlag(TimestampFlags.Effective))
+                    {
+                        entry.RripEffective = new byte[tfLen];
+                        Array.Copy(data, tfOff, entry.RripEffective, 0, tfLen);
+                    }
+
+                    systemAreaOff += tfLength;
+
+                    break;
+                case RRIP_SPARSE:
+                    // TODO
+                    byte sfLength = data[systemAreaOff + 2];
+                    systemAreaOff += sfLength;
+
+                    break;
+                case SUSP_CONTINUATION:
+                    byte ceLength = data[systemAreaOff + 2];
+
+                    ContinuationArea ca =
+                        Marshal.ByteArrayToStructureLittleEndian<ContinuationArea>(data, systemAreaOff,
+                            Marshal.SizeOf<ContinuationArea>());
+
+                    byte[] caData = ReadSingleExtent(ca.offset, ca.ca_length, ca.block);
+
+                    DecodeSystemArea(caData, 0, (int)ca.ca_length, ref entry, out hasResourceFork);
+
+                    systemAreaOff += ceLength;
+
+                    break;
+                case SUSP_PADDING:
+                    // Just padding, skip
+                    byte pdLength = data[systemAreaOff + 2];
+                    systemAreaOff += pdLength;
+
+                    break;
+                case SUSP_INDICATOR:
+                    // Only to be found on CURRENT entry of root directory
+                    byte spLength = data[systemAreaOff + 2];
+                    systemAreaOff += spLength;
+
+                    break;
+                case SUSP_TERMINATOR:
+                    // Not seen on the wild
+                    byte stLength = data[systemAreaOff + 2];
+                    systemAreaOff += stLength;
+
+                    break;
+                case SUSP_REFERENCE:
+                    // Only to be found on CURRENT entry of root directory
+                    byte erLength = data[systemAreaOff + 2];
+                    systemAreaOff += erLength;
+
+                    break;
+                case SUSP_SELECTOR:
+                    // Only to be found on CURRENT entry of root directory
+                    byte esLength = data[systemAreaOff + 2];
+                    systemAreaOff += esLength;
+
+                    break;
+                case ZISO_MAGIC:
+                    // TODO: Implement support for zisofs
+                    byte zfLength = data[systemAreaOff + 2];
+                    systemAreaOff += zfLength;
+
+                    break;
+                default:
+                    // Cannot continue as we don't know this structure size
+                    systemAreaOff = end;
+
+                    break;
             }
-
-            return entries.ToArray();
-        }
-
-        DecodedDirectoryEntry[] GetSubdirsFromHighSierraPathTable(string path)
-        {
-            PathTableEntryInternal[]    tableEntries = GetPathTableEntries(path);
-            List<DecodedDirectoryEntry> entries      = new();
-
-            foreach(PathTableEntryInternal tEntry in tableEntries)
-            {
-                ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector);
-
-                HighSierraDirectoryRecord record =
-                    Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(sector, tEntry.XattrLength,
-                        _highSierraDirectoryRecordSize);
-
-                var entry = new DecodedDirectoryEntry
-                {
-                    Size                 = record.size,
-                    Flags                = record.flags,
-                    Filename             = tEntry.Name,
-                    Interleave           = record.interleave,
-                    VolumeSequenceNumber = record.volume_sequence_number,
-                    Timestamp            = DecodeHighSierraDateTime(record.date),
-                    XattrLength          = tEntry.XattrLength
-                };
-
-                entry.Extents = new List<(uint extent, uint size)>();
-
-                if(record.size != 0)
-                    entry.Extents.Add((record.extent, record.size));
-
-                entries.Add(entry);
-            }
-
-            return entries.ToArray();
         }
     }
+
+    PathTableEntryInternal[] GetPathTableEntries(string path)
+    {
+        IEnumerable<PathTableEntryInternal> tableEntries;
+        List<PathTableEntryInternal>        pathTableList = new(_pathTable);
+
+        if(path == "" ||
+           path == "/")
+            tableEntries = _pathTable.Where(p => p.Parent == 1 && p != _pathTable[0]);
+        else
+        {
+            string cutPath = path.StartsWith("/", StringComparison.Ordinal)
+                                 ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
+                                 : path.ToLower(CultureInfo.CurrentUICulture);
+
+            string[] pieces = cutPath.Split(new[]
+            {
+                '/'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            int currentParent = 1;
+            int currentPiece  = 0;
+
+            while(currentPiece < pieces.Length)
+            {
+                PathTableEntryInternal currentEntry = _pathTable.FirstOrDefault(p => p.Parent == currentParent &&
+                                                                                    p.Name.ToLower(CultureInfo.CurrentUICulture) == pieces[currentPiece]);
+
+                if(currentEntry is null)
+                    break;
+
+                currentPiece++;
+                currentParent = pathTableList.IndexOf(currentEntry) + 1;
+            }
+
+            tableEntries = _pathTable.Where(p => p.Parent == currentParent);
+        }
+
+        return tableEntries.ToArray();
+    }
+
+    DecodedDirectoryEntry[] GetSubdirsFromCdiPathTable(string path)
+    {
+        PathTableEntryInternal[]    tableEntries = GetPathTableEntries(path);
+        List<DecodedDirectoryEntry> entries      = new();
+
+        foreach(PathTableEntryInternal tEntry in tableEntries)
+        {
+            ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector);
+
+            CdiDirectoryRecord record =
+                Marshal.ByteArrayToStructureBigEndian<CdiDirectoryRecord>(sector, tEntry.XattrLength,
+                                                                          _cdiDirectoryRecordSize);
+
+            if(record.length == 0)
+                break;
+
+            var entry = new DecodedDirectoryEntry
+            {
+                Size                 = record.size,
+                Filename             = tEntry.Name,
+                VolumeSequenceNumber = record.volume_sequence_number,
+                Timestamp            = DecodeHighSierraDateTime(record.date),
+                XattrLength          = tEntry.XattrLength
+            };
+
+            entry.Extents = new List<(uint extent, uint size)>();
+
+            if(record.size != 0)
+                entry.Extents.Add((record.start_lbn, record.size));
+
+            if(record.flags.HasFlag(CdiFileFlags.Hidden))
+                entry.Flags |= FileFlags.Hidden;
+
+            int systemAreaStart = record.name_len + _cdiDirectoryRecordSize;
+
+            if(systemAreaStart % 2 != 0)
+                systemAreaStart++;
+
+            entry.CdiSystemArea =
+                Marshal.ByteArrayToStructureBigEndian<CdiSystemArea>(sector, systemAreaStart, _cdiSystemAreaSize);
+
+            if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.Directory))
+                entry.Flags |= FileFlags.Directory;
+
+            entries.Add(entry);
+        }
+
+        return entries.ToArray();
+    }
+
+    DecodedDirectoryEntry[] GetSubdirsFromIsoPathTable(string path)
+    {
+        PathTableEntryInternal[]    tableEntries = GetPathTableEntries(path);
+        List<DecodedDirectoryEntry> entries      = new();
+
+        foreach(PathTableEntryInternal tEntry in tableEntries)
+        {
+            ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector);
+
+            DirectoryRecord record =
+                Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(sector, tEntry.XattrLength,
+                                                                          _directoryRecordSize);
+
+            if(record.length == 0)
+                break;
+
+            var entry = new DecodedDirectoryEntry
+            {
+                Size                 = record.size,
+                Flags                = record.flags,
+                Filename             = tEntry.Name,
+                FileUnitSize         = record.file_unit_size,
+                Interleave           = record.interleave,
+                VolumeSequenceNumber = record.volume_sequence_number,
+                Timestamp            = DecodeIsoDateTime(record.date),
+                XattrLength          = tEntry.XattrLength
+            };
+
+            entry.Extents = new List<(uint extent, uint size)>();
+
+            if(record.size != 0)
+                entry.Extents.Add((record.extent, record.size));
+
+            int systemAreaStart  = record.name_len + _directoryRecordSize;
+            int systemAreaLength = record.length   - record.name_len - _directoryRecordSize;
+
+            if(systemAreaStart % 2 != 0)
+            {
+                systemAreaStart++;
+                systemAreaLength--;
+            }
+
+            DecodeSystemArea(sector, systemAreaStart, systemAreaStart + systemAreaLength, ref entry, out _);
+
+            entries.Add(entry);
+        }
+
+        return entries.ToArray();
+    }
+
+    DecodedDirectoryEntry[] GetSubdirsFromHighSierraPathTable(string path)
+    {
+        PathTableEntryInternal[]    tableEntries = GetPathTableEntries(path);
+        List<DecodedDirectoryEntry> entries      = new();
+
+        foreach(PathTableEntryInternal tEntry in tableEntries)
+        {
+            ErrorNumber errno = ReadSector(tEntry.Extent, out byte[] sector);
+
+            HighSierraDirectoryRecord record =
+                Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(sector, tEntry.XattrLength,
+                    _highSierraDirectoryRecordSize);
+
+            var entry = new DecodedDirectoryEntry
+            {
+                Size                 = record.size,
+                Flags                = record.flags,
+                Filename             = tEntry.Name,
+                Interleave           = record.interleave,
+                VolumeSequenceNumber = record.volume_sequence_number,
+                Timestamp            = DecodeHighSierraDateTime(record.date),
+                XattrLength          = tEntry.XattrLength
+            };
+
+            entry.Extents = new List<(uint extent, uint size)>();
+
+            if(record.size != 0)
+                entry.Extents.Add((record.extent, record.size));
+
+            entries.Add(entry);
+        }
+
+        return entries.ToArray();
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/File.cs b/Aaru.Filesystems/ISO9660/File.cs
index 158afb994..d10caf081 100644
--- a/Aaru.Filesystems/ISO9660/File.cs
+++ b/Aaru.Filesystems/ISO9660/File.cs
@@ -43,561 +43,560 @@ using Aaru.Console;
 using Aaru.Helpers;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    /// <inheritdoc />
+    public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
     {
-        /// <inheritdoc />
-        public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
+        deviceBlock = 0;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        if(entry.Flags.HasFlag(FileFlags.Directory) &&
+           !_debug)
+            return ErrorNumber.IsDirectory;
+
+        // TODO: Multi-extents
+        if(entry.Extents.Count > 1)
+            return ErrorNumber.NotImplemented;
+
+        deviceBlock = entry.Extents[0].extent + fileBlock;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+    {
+        attributes = new FileAttributes();
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = Stat(path, out FileEntryInfo stat);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        attributes = stat.Attributes;
+
+        return ErrorNumber.NoError;
+    }
+
+    // TODO: Resolve symbolic link
+    /// <inheritdoc />
+    public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+    {
+        buf = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        if(entry.Flags.HasFlag(FileFlags.Directory) &&
+           !_debug)
+            return ErrorNumber.IsDirectory;
+
+        if(entry.Extents is null)
+            return ErrorNumber.InvalidArgument;
+
+        if(entry.Size == 0)
         {
-            deviceBlock = 0;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            if(entry.Flags.HasFlag(FileFlags.Directory) &&
-               !_debug)
-                return ErrorNumber.IsDirectory;
-
-            // TODO: Multi-extents
-            if(entry.Extents.Count > 1)
-                return ErrorNumber.NotImplemented;
-
-            deviceBlock = entry.Extents[0].extent + fileBlock;
+            buf = Array.Empty<byte>();
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+        if(offset >= (long)entry.Size)
+            return ErrorNumber.InvalidArgument;
+
+        if(size + offset >= (long)entry.Size)
+            size = (long)entry.Size - offset;
+
+        offset += entry.XattrLength * _blockSize;
+
+        if(entry.CdiSystemArea?.attributes.HasFlag(CdiAttributes.DigitalAudio) == true &&
+           entry.Extents.Count                                                 == 1)
         {
-            attributes = new FileAttributes();
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = Stat(path, out FileEntryInfo stat);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            attributes = stat.Attributes;
-
-            return ErrorNumber.NoError;
-        }
-
-        // TODO: Resolve symbolic link
-        /// <inheritdoc />
-        public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
-        {
-            buf = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            if(entry.Flags.HasFlag(FileFlags.Directory) &&
-               !_debug)
-                return ErrorNumber.IsDirectory;
-
-            if(entry.Extents is null)
-                return ErrorNumber.InvalidArgument;
-
-            if(entry.Size == 0)
+            try
             {
-                buf = Array.Empty<byte>();
+                long firstSector    = offset                  / 2352;
+                long offsetInSector = offset                  % 2352;
+                long sizeInSectors  = (size + offsetInSector) / 2352;
+
+                if((size + offsetInSector) % 2352 > 0)
+                    sizeInSectors++;
+
+                ErrorNumber errno = _image.ReadSectorsLong((ulong)(entry.Extents[0].extent + firstSector),
+                                                           (uint)sizeInSectors, out byte[] buffer);
+
+                if(errno != ErrorNumber.NoError)
+                    return errno;
+
+                buf = new byte[size];
+                Array.Copy(buffer, offsetInSector, buf, 0, size);
 
                 return ErrorNumber.NoError;
             }
-
-            if(offset >= (long)entry.Size)
-                return ErrorNumber.InvalidArgument;
-
-            if(size + offset >= (long)entry.Size)
-                size = (long)entry.Size - offset;
-
-            offset += entry.XattrLength * _blockSize;
-
-            if(entry.CdiSystemArea?.attributes.HasFlag(CdiAttributes.DigitalAudio) == true &&
-               entry.Extents.Count                                                 == 1)
+            catch(Exception e)
             {
-                try
-                {
-                    long firstSector    = offset                  / 2352;
-                    long offsetInSector = offset                  % 2352;
-                    long sizeInSectors  = (size + offsetInSector) / 2352;
+                AaruConsole.DebugWriteLine("ISO9660 plugin", "Exception reading CD-i audio file");
+                AaruConsole.DebugWriteLine("ISO9660 plugin", "{0}", e);
 
-                    if((size + offsetInSector) % 2352 > 0)
-                        sizeInSectors++;
-
-                    ErrorNumber errno = _image.ReadSectorsLong((ulong)(entry.Extents[0].extent + firstSector),
-                                                               (uint)sizeInSectors, out byte[] buffer);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    buf = new byte[size];
-                    Array.Copy(buffer, offsetInSector, buf, 0, size);
-
-                    return ErrorNumber.NoError;
-                }
-                catch(Exception e)
-                {
-                    AaruConsole.DebugWriteLine("ISO9660 plugin", "Exception reading CD-i audio file");
-                    AaruConsole.DebugWriteLine("ISO9660 plugin", "{0}", e);
-
-                    return ErrorNumber.UnexpectedException;
-                }
+                return ErrorNumber.UnexpectedException;
             }
-
-            buf = ReadWithExtents(offset, size, entry.Extents,
-                                  entry.XA?.signature                                    == XA_MAGIC &&
-                                  entry.XA?.attributes.HasFlag(XaAttributes.Interleaved) == true,
-                                  entry.XA?.filenumber ?? 0);
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Stat(string path, out FileEntryInfo stat)
+        buf = ReadWithExtents(offset, size, entry.Extents,
+                              entry.XA?.signature                                    == XA_MAGIC &&
+                              entry.XA?.attributes.HasFlag(XaAttributes.Interleaved) == true,
+                              entry.XA?.filenumber ?? 0);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Stat(string path, out FileEntryInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        stat = new FileEntryInfo
         {
-            stat = null;
+            Attributes       = new FileAttributes(),
+            Blocks           = (long)(entry.Size / 2048), // TODO: XA
+            BlockSize        = 2048,
+            Length           = (long)entry.Size,
+            Links            = 1,
+            LastWriteTimeUtc = entry.Timestamp
+        };
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(entry.Extents?.Count > 0)
+            stat.Inode = entry.Extents[0].extent;
 
-            ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
+        if(entry.Size % 2048 > 0)
+            stat.Blocks++;
 
-            if(err != ErrorNumber.NoError)
-                return err;
+        if(entry.Flags.HasFlag(FileFlags.Directory))
+            stat.Attributes |= FileAttributes.Directory;
 
-            stat = new FileEntryInfo
-            {
-                Attributes       = new FileAttributes(),
-                Blocks           = (long)(entry.Size / 2048), // TODO: XA
-                BlockSize        = 2048,
-                Length           = (long)entry.Size,
-                Links            = 1,
-                LastWriteTimeUtc = entry.Timestamp
-            };
+        if(entry.Flags.HasFlag(FileFlags.Hidden))
+            stat.Attributes |= FileAttributes.Hidden;
 
-            if(entry.Extents?.Count > 0)
-                stat.Inode = entry.Extents[0].extent;
+        if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsAlias) == true)
+            stat.Attributes |= FileAttributes.Alias;
 
-            if(entry.Size % 2048 > 0)
-                stat.Blocks++;
+        if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsInvisible) == true)
+            stat.Attributes |= FileAttributes.Hidden;
 
-            if(entry.Flags.HasFlag(FileFlags.Directory))
-                stat.Attributes |= FileAttributes.Directory;
+        if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasBeenInited) == true)
+            stat.Attributes |= FileAttributes.HasBeenInited;
 
-            if(entry.Flags.HasFlag(FileFlags.Hidden))
-                stat.Attributes |= FileAttributes.Hidden;
+        if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasCustomIcon) == true)
+            stat.Attributes |= FileAttributes.HasCustomIcon;
 
-            if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsAlias) == true)
-                stat.Attributes |= FileAttributes.Alias;
+        if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasNoINITs) == true)
+            stat.Attributes |= FileAttributes.HasNoINITs;
 
-            if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsInvisible) == true)
-                stat.Attributes |= FileAttributes.Hidden;
+        if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsOnDesk) == true)
+            stat.Attributes |= FileAttributes.IsOnDesk;
 
-            if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasBeenInited) == true)
-                stat.Attributes |= FileAttributes.HasBeenInited;
+        if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsShared) == true)
+            stat.Attributes |= FileAttributes.Shared;
 
-            if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasCustomIcon) == true)
-                stat.Attributes |= FileAttributes.HasCustomIcon;
+        if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsStationery) == true)
+            stat.Attributes |= FileAttributes.Stationery;
 
-            if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasNoINITs) == true)
-                stat.Attributes |= FileAttributes.HasNoINITs;
+        if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasBundle) == true)
+            stat.Attributes |= FileAttributes.Bundle;
 
-            if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsOnDesk) == true)
-                stat.Attributes |= FileAttributes.IsOnDesk;
+        if(entry.AppleIcon != null)
+            stat.Attributes |= FileAttributes.HasCustomIcon;
 
-            if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsShared) == true)
-                stat.Attributes |= FileAttributes.Shared;
-
-            if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kIsStationery) == true)
-                stat.Attributes |= FileAttributes.Stationery;
-
-            if(entry.FinderInfo?.fdFlags.HasFlag(AppleCommon.FinderFlags.kHasBundle) == true)
-                stat.Attributes |= FileAttributes.Bundle;
-
-            if(entry.AppleIcon != null)
-                stat.Attributes |= FileAttributes.HasCustomIcon;
-
-            if(entry.XA != null)
-            {
-                if(entry.XA.Value.attributes.HasFlag(XaAttributes.GroupExecute))
-                    stat.Mode |= 8;
-
-                if(entry.XA.Value.attributes.HasFlag(XaAttributes.GroupRead))
-                    stat.Mode |= 32;
-
-                if(entry.XA.Value.attributes.HasFlag(XaAttributes.OwnerExecute))
-                    stat.Mode |= 64;
-
-                if(entry.XA.Value.attributes.HasFlag(XaAttributes.OwnerRead))
-                    stat.Mode |= 256;
-
-                if(entry.XA.Value.attributes.HasFlag(XaAttributes.SystemExecute))
-                    stat.Mode |= 1;
-
-                if(entry.XA.Value.attributes.HasFlag(XaAttributes.SystemRead))
-                    stat.Mode |= 4;
-
-                stat.UID   = entry.XA.Value.user;
-                stat.GID   = entry.XA.Value.group;
-                stat.Inode = entry.XA.Value.filenumber;
-            }
-
-            if(entry.PosixAttributes != null)
-            {
-                stat.Mode = (uint?)entry.PosixAttributes.Value.st_mode & 0x0FFF;
-
-                if(entry.PosixAttributes.Value.st_mode.HasFlag(PosixMode.Block))
-                    stat.Attributes |= FileAttributes.BlockDevice;
-
-                if(entry.PosixAttributes.Value.st_mode.HasFlag(PosixMode.Character))
-                    stat.Attributes |= FileAttributes.CharDevice;
-
-                if(entry.PosixAttributes.Value.st_mode.HasFlag(PosixMode.Pipe))
-                    stat.Attributes |= FileAttributes.Pipe;
-
-                if(entry.PosixAttributes.Value.st_mode.HasFlag(PosixMode.Socket))
-                    stat.Attributes |= FileAttributes.Socket;
-
-                if(entry.PosixAttributes.Value.st_mode.HasFlag(PosixMode.Symlink))
-                    stat.Attributes |= FileAttributes.Symlink;
-
-                stat.Links = entry.PosixAttributes.Value.st_nlink;
-                stat.UID   = entry.PosixAttributes.Value.st_uid;
-                stat.GID   = entry.PosixAttributes.Value.st_gid;
-                stat.Inode = entry.PosixAttributes.Value.st_ino;
-            }
-            else if(entry.PosixAttributesOld != null)
-            {
-                stat.Mode = (uint?)entry.PosixAttributesOld.Value.st_mode & 0x0FFF;
-
-                if(entry.PosixAttributesOld.Value.st_mode.HasFlag(PosixMode.Block))
-                    stat.Attributes |= FileAttributes.BlockDevice;
-
-                if(entry.PosixAttributesOld.Value.st_mode.HasFlag(PosixMode.Character))
-                    stat.Attributes |= FileAttributes.CharDevice;
-
-                if(entry.PosixAttributesOld.Value.st_mode.HasFlag(PosixMode.Pipe))
-                    stat.Attributes |= FileAttributes.Pipe;
-
-                if(entry.PosixAttributesOld.Value.st_mode.HasFlag(PosixMode.Socket))
-                    stat.Attributes |= FileAttributes.Socket;
-
-                if(entry.PosixAttributesOld.Value.st_mode.HasFlag(PosixMode.Symlink))
-                    stat.Attributes |= FileAttributes.Symlink;
-
-                stat.Links = entry.PosixAttributesOld.Value.st_nlink;
-                stat.UID   = entry.PosixAttributesOld.Value.st_uid;
-                stat.GID   = entry.PosixAttributesOld.Value.st_gid;
-            }
-
-            if(entry.AmigaProtection != null)
-            {
-                if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.GroupExec))
-                    stat.Mode |= 8;
-
-                if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.GroupRead))
-                    stat.Mode |= 32;
-
-                if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.GroupWrite))
-                    stat.Mode |= 16;
-
-                if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.OtherExec))
-                    stat.Mode |= 1;
-
-                if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.OtherRead))
-                    stat.Mode |= 4;
-
-                if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.OtherWrite))
-                    stat.Mode |= 2;
-
-                if(entry.AmigaProtection.Value.Protection.HasFlag(AmigaAttributes.OwnerExec))
-                    stat.Mode |= 64;
-
-                if(entry.AmigaProtection.Value.Protection.HasFlag(AmigaAttributes.OwnerRead))
-                    stat.Mode |= 256;
-
-                if(entry.AmigaProtection.Value.Protection.HasFlag(AmigaAttributes.OwnerWrite))
-                    stat.Mode |= 128;
-
-                if(entry.AmigaProtection.Value.Protection.HasFlag(AmigaAttributes.Archive))
-                    stat.Attributes |= FileAttributes.Archive;
-            }
-
-            if(entry.PosixDeviceNumber != null)
-                stat.DeviceNo = ((ulong)entry.PosixDeviceNumber.Value.dev_t_high << 32) +
-                                entry.PosixDeviceNumber.Value.dev_t_low;
-
-            if(entry.RripModify != null)
-                stat.LastWriteTimeUtc = DecodeIsoDateTime(entry.RripModify);
-
-            if(entry.RripAccess != null)
-                stat.AccessTimeUtc = DecodeIsoDateTime(entry.RripAccess);
-
-            if(entry.RripAttributeChange != null)
-                stat.StatusChangeTimeUtc = DecodeIsoDateTime(entry.RripAttributeChange);
-
-            if(entry.RripBackup != null)
-                stat.BackupTimeUtc = DecodeIsoDateTime(entry.RripBackup);
-
-            if(entry.SymbolicLink != null)
-                stat.Attributes |= FileAttributes.Symlink;
-
-            if(entry.XattrLength == 0 ||
-               _cdi                   ||
-               _highSierra)
-                return ErrorNumber.NoError;
-
-            if(entry.CdiSystemArea != null)
-            {
-                stat.UID = entry.CdiSystemArea.Value.owner;
-                stat.GID = entry.CdiSystemArea.Value.group;
-
-                if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.GroupExecute))
-                    stat.Mode |= 8;
-
-                if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.GroupRead))
-                    stat.Mode |= 32;
-
-                if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.OtherExecute))
-                    stat.Mode |= 1;
-
-                if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.OtherRead))
-                    stat.Mode |= 4;
-
-                if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.OwnerExecute))
-                    stat.Mode |= 64;
-
-                if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.OwnerRead))
-                    stat.Mode |= 256;
-            }
-
-            byte[] ea = ReadSingleExtent(entry.XattrLength * _blockSize, entry.Extents[0].extent);
-
-            ExtendedAttributeRecord ear = Marshal.ByteArrayToStructureLittleEndian<ExtendedAttributeRecord>(ea);
-
-            stat.UID = ear.owner;
-            stat.GID = ear.group;
-
-            stat.Mode = 0;
-
-            if(ear.permissions.HasFlag(Permissions.GroupExecute))
+        if(entry.XA != null)
+        {
+            if(entry.XA.Value.attributes.HasFlag(XaAttributes.GroupExecute))
                 stat.Mode |= 8;
 
-            if(ear.permissions.HasFlag(Permissions.GroupRead))
+            if(entry.XA.Value.attributes.HasFlag(XaAttributes.GroupRead))
                 stat.Mode |= 32;
 
-            if(ear.permissions.HasFlag(Permissions.OwnerExecute))
+            if(entry.XA.Value.attributes.HasFlag(XaAttributes.OwnerExecute))
                 stat.Mode |= 64;
 
-            if(ear.permissions.HasFlag(Permissions.OwnerRead))
+            if(entry.XA.Value.attributes.HasFlag(XaAttributes.OwnerRead))
                 stat.Mode |= 256;
 
-            if(ear.permissions.HasFlag(Permissions.OtherExecute))
+            if(entry.XA.Value.attributes.HasFlag(XaAttributes.SystemExecute))
                 stat.Mode |= 1;
 
-            if(ear.permissions.HasFlag(Permissions.OtherRead))
+            if(entry.XA.Value.attributes.HasFlag(XaAttributes.SystemRead))
                 stat.Mode |= 4;
 
-            stat.CreationTimeUtc  = DateHandlers.Iso9660ToDateTime(ear.creation_date);
-            stat.LastWriteTimeUtc = DateHandlers.Iso9660ToDateTime(ear.modification_date);
-
-            return ErrorNumber.NoError;
+            stat.UID   = entry.XA.Value.user;
+            stat.GID   = entry.XA.Value.group;
+            stat.Inode = entry.XA.Value.filenumber;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadLink(string path, out string dest)
+        if(entry.PosixAttributes != null)
         {
-            dest = null;
+            stat.Mode = (uint?)entry.PosixAttributes.Value.st_mode & 0x0FFF;
 
-            ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
+            if(entry.PosixAttributes.Value.st_mode.HasFlag(PosixMode.Block))
+                stat.Attributes |= FileAttributes.BlockDevice;
+
+            if(entry.PosixAttributes.Value.st_mode.HasFlag(PosixMode.Character))
+                stat.Attributes |= FileAttributes.CharDevice;
+
+            if(entry.PosixAttributes.Value.st_mode.HasFlag(PosixMode.Pipe))
+                stat.Attributes |= FileAttributes.Pipe;
+
+            if(entry.PosixAttributes.Value.st_mode.HasFlag(PosixMode.Socket))
+                stat.Attributes |= FileAttributes.Socket;
+
+            if(entry.PosixAttributes.Value.st_mode.HasFlag(PosixMode.Symlink))
+                stat.Attributes |= FileAttributes.Symlink;
+
+            stat.Links = entry.PosixAttributes.Value.st_nlink;
+            stat.UID   = entry.PosixAttributes.Value.st_uid;
+            stat.GID   = entry.PosixAttributes.Value.st_gid;
+            stat.Inode = entry.PosixAttributes.Value.st_ino;
+        }
+        else if(entry.PosixAttributesOld != null)
+        {
+            stat.Mode = (uint?)entry.PosixAttributesOld.Value.st_mode & 0x0FFF;
+
+            if(entry.PosixAttributesOld.Value.st_mode.HasFlag(PosixMode.Block))
+                stat.Attributes |= FileAttributes.BlockDevice;
+
+            if(entry.PosixAttributesOld.Value.st_mode.HasFlag(PosixMode.Character))
+                stat.Attributes |= FileAttributes.CharDevice;
+
+            if(entry.PosixAttributesOld.Value.st_mode.HasFlag(PosixMode.Pipe))
+                stat.Attributes |= FileAttributes.Pipe;
+
+            if(entry.PosixAttributesOld.Value.st_mode.HasFlag(PosixMode.Socket))
+                stat.Attributes |= FileAttributes.Socket;
+
+            if(entry.PosixAttributesOld.Value.st_mode.HasFlag(PosixMode.Symlink))
+                stat.Attributes |= FileAttributes.Symlink;
+
+            stat.Links = entry.PosixAttributesOld.Value.st_nlink;
+            stat.UID   = entry.PosixAttributesOld.Value.st_uid;
+            stat.GID   = entry.PosixAttributesOld.Value.st_gid;
+        }
+
+        if(entry.AmigaProtection != null)
+        {
+            if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.GroupExec))
+                stat.Mode |= 8;
+
+            if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.GroupRead))
+                stat.Mode |= 32;
+
+            if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.GroupWrite))
+                stat.Mode |= 16;
+
+            if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.OtherExec))
+                stat.Mode |= 1;
+
+            if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.OtherRead))
+                stat.Mode |= 4;
+
+            if(entry.AmigaProtection.Value.Multiuser.HasFlag(AmigaMultiuser.OtherWrite))
+                stat.Mode |= 2;
+
+            if(entry.AmigaProtection.Value.Protection.HasFlag(AmigaAttributes.OwnerExec))
+                stat.Mode |= 64;
+
+            if(entry.AmigaProtection.Value.Protection.HasFlag(AmigaAttributes.OwnerRead))
+                stat.Mode |= 256;
+
+            if(entry.AmigaProtection.Value.Protection.HasFlag(AmigaAttributes.OwnerWrite))
+                stat.Mode |= 128;
+
+            if(entry.AmigaProtection.Value.Protection.HasFlag(AmigaAttributes.Archive))
+                stat.Attributes |= FileAttributes.Archive;
+        }
+
+        if(entry.PosixDeviceNumber != null)
+            stat.DeviceNo = ((ulong)entry.PosixDeviceNumber.Value.dev_t_high << 32) +
+                            entry.PosixDeviceNumber.Value.dev_t_low;
+
+        if(entry.RripModify != null)
+            stat.LastWriteTimeUtc = DecodeIsoDateTime(entry.RripModify);
+
+        if(entry.RripAccess != null)
+            stat.AccessTimeUtc = DecodeIsoDateTime(entry.RripAccess);
+
+        if(entry.RripAttributeChange != null)
+            stat.StatusChangeTimeUtc = DecodeIsoDateTime(entry.RripAttributeChange);
+
+        if(entry.RripBackup != null)
+            stat.BackupTimeUtc = DecodeIsoDateTime(entry.RripBackup);
+
+        if(entry.SymbolicLink != null)
+            stat.Attributes |= FileAttributes.Symlink;
+
+        if(entry.XattrLength == 0 ||
+           _cdi                   ||
+           _highSierra)
+            return ErrorNumber.NoError;
+
+        if(entry.CdiSystemArea != null)
+        {
+            stat.UID = entry.CdiSystemArea.Value.owner;
+            stat.GID = entry.CdiSystemArea.Value.group;
+
+            if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.GroupExecute))
+                stat.Mode |= 8;
+
+            if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.GroupRead))
+                stat.Mode |= 32;
+
+            if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.OtherExecute))
+                stat.Mode |= 1;
+
+            if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.OtherRead))
+                stat.Mode |= 4;
+
+            if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.OwnerExecute))
+                stat.Mode |= 64;
+
+            if(entry.CdiSystemArea.Value.attributes.HasFlag(CdiAttributes.OwnerRead))
+                stat.Mode |= 256;
+        }
+
+        byte[] ea = ReadSingleExtent(entry.XattrLength * _blockSize, entry.Extents[0].extent);
+
+        ExtendedAttributeRecord ear = Marshal.ByteArrayToStructureLittleEndian<ExtendedAttributeRecord>(ea);
+
+        stat.UID = ear.owner;
+        stat.GID = ear.group;
+
+        stat.Mode = 0;
+
+        if(ear.permissions.HasFlag(Permissions.GroupExecute))
+            stat.Mode |= 8;
+
+        if(ear.permissions.HasFlag(Permissions.GroupRead))
+            stat.Mode |= 32;
+
+        if(ear.permissions.HasFlag(Permissions.OwnerExecute))
+            stat.Mode |= 64;
+
+        if(ear.permissions.HasFlag(Permissions.OwnerRead))
+            stat.Mode |= 256;
+
+        if(ear.permissions.HasFlag(Permissions.OtherExecute))
+            stat.Mode |= 1;
+
+        if(ear.permissions.HasFlag(Permissions.OtherRead))
+            stat.Mode |= 4;
+
+        stat.CreationTimeUtc  = DateHandlers.Iso9660ToDateTime(ear.creation_date);
+        stat.LastWriteTimeUtc = DateHandlers.Iso9660ToDateTime(ear.modification_date);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadLink(string path, out string dest)
+    {
+        dest = null;
+
+        ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        if(entry.SymbolicLink is null)
+            return ErrorNumber.InvalidArgument;
+
+        dest = entry.SymbolicLink;
+
+        return ErrorNumber.NoError;
+    }
+
+    ErrorNumber GetFileEntry(string path, out DecodedDirectoryEntry entry)
+    {
+        entry = null;
+
+        string cutPath = path.StartsWith("/", StringComparison.Ordinal)
+                             ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
+                             : path.ToLower(CultureInfo.CurrentUICulture);
+
+        string[] pieces = cutPath.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
+
+        if(pieces.Length == 0)
+            return ErrorNumber.InvalidArgument;
+
+        string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
+
+        if(!_directoryCache.TryGetValue(parentPath, out _))
+        {
+            ErrorNumber err = ReadDir(parentPath, out _);
 
             if(err != ErrorNumber.NoError)
                 return err;
-
-            if(entry.SymbolicLink is null)
-                return ErrorNumber.InvalidArgument;
-
-            dest = entry.SymbolicLink;
-
-            return ErrorNumber.NoError;
         }
 
-        ErrorNumber GetFileEntry(string path, out DecodedDirectoryEntry entry)
+        Dictionary<string, DecodedDirectoryEntry> parent;
+
+        if(pieces.Length == 1)
+            parent = _rootDirectoryCache;
+        else if(!_directoryCache.TryGetValue(parentPath, out parent))
+            return ErrorNumber.InvalidArgument;
+
+        KeyValuePair<string, DecodedDirectoryEntry> dirent =
+            parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[^1]);
+
+        if(string.IsNullOrEmpty(dirent.Key))
         {
-            entry = null;
-
-            string cutPath = path.StartsWith("/", StringComparison.Ordinal)
-                                 ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
-                                 : path.ToLower(CultureInfo.CurrentUICulture);
-
-            string[] pieces = cutPath.Split(new[]
+            if(!_joliet &&
+               !pieces[^1].EndsWith(";1", StringComparison.Ordinal))
             {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+                dirent = parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) ==
+                                                    pieces[^1] + ";1");
 
-            if(pieces.Length == 0)
-                return ErrorNumber.InvalidArgument;
-
-            string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
-
-            if(!_directoryCache.TryGetValue(parentPath, out _))
-            {
-                ErrorNumber err = ReadDir(parentPath, out _);
-
-                if(err != ErrorNumber.NoError)
-                    return err;
-            }
-
-            Dictionary<string, DecodedDirectoryEntry> parent;
-
-            if(pieces.Length == 1)
-                parent = _rootDirectoryCache;
-            else if(!_directoryCache.TryGetValue(parentPath, out parent))
-                return ErrorNumber.InvalidArgument;
-
-            KeyValuePair<string, DecodedDirectoryEntry> dirent =
-                parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[^1]);
-
-            if(string.IsNullOrEmpty(dirent.Key))
-            {
-                if(!_joliet &&
-                   !pieces[^1].EndsWith(";1", StringComparison.Ordinal))
-                {
-                    dirent = parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) ==
-                                                        pieces[^1] + ";1");
-
-                    if(string.IsNullOrEmpty(dirent.Key))
-                        return ErrorNumber.NoSuchFile;
-                }
-                else
+                if(string.IsNullOrEmpty(dirent.Key))
                     return ErrorNumber.NoSuchFile;
             }
-
-            entry = dirent.Value;
-
-            return ErrorNumber.NoError;
+            else
+                return ErrorNumber.NoSuchFile;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        byte[] ReadSingleExtent(long size, uint startingSector, bool interleaved = false, byte fileNumber = 0) =>
-            ReadWithExtents(0, size, new List<(uint extent, uint size)>
-            {
-                (startingSector, (uint)size)
-            }, interleaved, fileNumber);
+        entry = dirent.Value;
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        byte[] ReadSingleExtent(long offset, long size, uint startingSector, bool interleaved = false,
-                                byte fileNumber = 0) => ReadWithExtents(offset, size, new List<(uint extent, uint size)>
+        return ErrorNumber.NoError;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    byte[] ReadSingleExtent(long size, uint startingSector, bool interleaved = false, byte fileNumber = 0) =>
+        ReadWithExtents(0, size, new List<(uint extent, uint size)>
         {
             (startingSector, (uint)size)
         }, interleaved, fileNumber);
 
-        // Cannot think how to make this faster, as we don't know the mode sector until it is read, but we have size in bytes
-        byte[] ReadWithExtents(long offset, long size, List<(uint extent, uint size)> extents, bool interleaved,
-                               byte fileNumber)
-        {
-            var  ms             = new MemoryStream();
-            long currentFilePos = 0;
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    byte[] ReadSingleExtent(long offset, long size, uint startingSector, bool interleaved = false,
+                            byte fileNumber = 0) => ReadWithExtents(offset, size, new List<(uint extent, uint size)>
+    {
+        (startingSector, (uint)size)
+    }, interleaved, fileNumber);
 
-            for(int i = 0; i < extents.Count; i++)
+    // Cannot think how to make this faster, as we don't know the mode sector until it is read, but we have size in bytes
+    byte[] ReadWithExtents(long offset, long size, List<(uint extent, uint size)> extents, bool interleaved,
+                           byte fileNumber)
+    {
+        var  ms             = new MemoryStream();
+        long currentFilePos = 0;
+
+        for(int i = 0; i < extents.Count; i++)
+        {
+            if(offset - currentFilePos >= extents[i].size)
             {
-                if(offset - currentFilePos >= extents[i].size)
+                currentFilePos += extents[i].size;
+
+                continue;
+            }
+
+            long leftExtentSize      = extents[i].size;
+            uint currentExtentSector = 0;
+
+            while(leftExtentSize > 0)
+            {
+                ErrorNumber errno = ReadSector(extents[i].extent + currentExtentSector, out byte[] sector,
+                                               interleaved, fileNumber);
+
+                if(errno != ErrorNumber.NoError ||
+                   sector is null)
                 {
-                    currentFilePos += extents[i].size;
+                    currentExtentSector++;
 
                     continue;
                 }
 
-                long leftExtentSize      = extents[i].size;
-                uint currentExtentSector = 0;
-
-                while(leftExtentSize > 0)
+                if(offset - currentFilePos > sector.Length)
                 {
-                    ErrorNumber errno = ReadSector(extents[i].extent + currentExtentSector, out byte[] sector,
-                                                   interleaved, fileNumber);
-
-                    if(errno != ErrorNumber.NoError ||
-                       sector is null)
-                    {
-                        currentExtentSector++;
-
-                        continue;
-                    }
-
-                    if(offset - currentFilePos > sector.Length)
-                    {
-                        currentExtentSector++;
-                        leftExtentSize -= sector.Length;
-                        currentFilePos += sector.Length;
-
-                        continue;
-                    }
-
-                    if(offset - currentFilePos > 0)
-                        ms.Write(sector, (int)(offset - currentFilePos),
-                                 (int)(sector.Length  - (offset - currentFilePos)));
-                    else
-                        ms.Write(sector, 0, sector.Length);
-
                     currentExtentSector++;
                     leftExtentSize -= sector.Length;
                     currentFilePos += sector.Length;
 
-                    if(ms.Length >= size)
-                        break;
+                    continue;
                 }
 
+                if(offset - currentFilePos > 0)
+                    ms.Write(sector, (int)(offset - currentFilePos),
+                             (int)(sector.Length  - (offset - currentFilePos)));
+                else
+                    ms.Write(sector, 0, sector.Length);
+
+                currentExtentSector++;
+                leftExtentSize -= sector.Length;
+                currentFilePos += sector.Length;
+
                 if(ms.Length >= size)
                     break;
             }
 
             if(ms.Length >= size)
-                ms.SetLength(size);
-
-            return ms.ToArray();
+                break;
         }
 
-        byte[] ReadSubheaderWithExtents(List<(uint extent, uint size)> extents, bool copy)
+        if(ms.Length >= size)
+            ms.SetLength(size);
+
+        return ms.ToArray();
+    }
+
+    byte[] ReadSubheaderWithExtents(List<(uint extent, uint size)> extents, bool copy)
+    {
+        var ms = new MemoryStream();
+
+        for(int i = 0; i < extents.Count; i++)
         {
-            var ms = new MemoryStream();
+            long leftExtentSize      = extents[i].size;
+            uint currentExtentSector = 0;
 
-            for(int i = 0; i < extents.Count; i++)
+            while(leftExtentSize > 0)
             {
-                long leftExtentSize      = extents[i].size;
-                uint currentExtentSector = 0;
+                ErrorNumber errno =
+                    _image.ReadSectorTag((extents[i].extent + currentExtentSector) * _blockSize / 2048,
+                                         SectorTagType.CdSectorSubHeader, out byte[] fullSector);
 
-                while(leftExtentSize > 0)
-                {
-                    ErrorNumber errno =
-                        _image.ReadSectorTag((extents[i].extent + currentExtentSector) * _blockSize / 2048,
-                                             SectorTagType.CdSectorSubHeader, out byte[] fullSector);
+                if(errno != ErrorNumber.NoError)
+                    return null;
 
-                    if(errno != ErrorNumber.NoError)
-                        return null;
+                ms.Write(fullSector, copy ? 0 : 4, 4);
 
-                    ms.Write(fullSector, copy ? 0 : 4, 4);
-
-                    currentExtentSector++;
-                    leftExtentSize -= 2048;
-                }
+                currentExtentSector++;
+                leftExtentSize -= 2048;
             }
-
-            return ms.ToArray();
         }
+
+        return ms.ToArray();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/ISO9660.cs b/Aaru.Filesystems/ISO9660/ISO9660.cs
index 7484ca5bb..c53680b94 100644
--- a/Aaru.Filesystems/ISO9660/ISO9660.cs
+++ b/Aaru.Filesystems/ISO9660/ISO9660.cs
@@ -39,75 +39,74 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// This is coded following ECMA-119.
+/// <inheritdoc />
+/// <summary>Implements the High Sierra, ISO9660 and CD-i filesystems</summary>
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class ISO9660 : IReadOnlyFilesystem
 {
-    // This is coded following ECMA-119.
+    bool                                      _cdi;
+    bool                                      _debug;
+    bool                                      _highSierra;
+    IMediaImage                               _image;
+    bool                                      _joliet;
+    bool                                      _mounted;
+    Namespace                                 _namespace;
+    PathTableEntryInternal[]                  _pathTable;
+    Dictionary<string, DecodedDirectoryEntry> _rootDirectoryCache;
+    FileSystemInfo                            _statfs;
+    bool                                      _useEvd;
+    bool                                      _usePathTable;
+    bool                                      _useTransTbl;
+    ushort                                    _blockSize;
+
     /// <inheritdoc />
-    /// <summary>Implements the High Sierra, ISO9660 and CD-i filesystems</summary>
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class ISO9660 : IReadOnlyFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "ISO9660 Filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("d812f4d3-c357-400d-90fd-3b22ef786aa8");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
+        new (string name, Type type, string description)[]
+        {
+            ("use_path_table", typeof(bool), "Use path table for directory traversal"),
+            ("use_trans_tbl", typeof(bool), "Use TRANS.TBL for filenames"),
+            ("use_evd", typeof(bool),
+             "If present, use Enhanced Volume Descriptor with specified encoding (overrides namespace)")
+        };
+
+    /// <inheritdoc />
+    public Dictionary<string, string> Namespaces => new()
     {
-        bool                                      _cdi;
-        bool                                      _debug;
-        bool                                      _highSierra;
-        IMediaImage                               _image;
-        bool                                      _joliet;
-        bool                                      _mounted;
-        Namespace                                 _namespace;
-        PathTableEntryInternal[]                  _pathTable;
-        Dictionary<string, DecodedDirectoryEntry> _rootDirectoryCache;
-        FileSystemInfo                            _statfs;
-        bool                                      _useEvd;
-        bool                                      _usePathTable;
-        bool                                      _useTransTbl;
-        ushort                                    _blockSize;
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "ISO9660 Filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("d812f4d3-c357-400d-90fd-3b22ef786aa8");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[]
-            {
-                ("use_path_table", typeof(bool), "Use path table for directory traversal"),
-                ("use_trans_tbl", typeof(bool), "Use TRANS.TBL for filenames"),
-                ("use_evd", typeof(bool),
-                 "If present, use Enhanced Volume Descriptor with specified encoding (overrides namespace)")
-            };
-
-        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => new()
         {
-            {
-                "normal", "Primary Volume Descriptor, ignoring ;1 suffixes"
-            },
-            {
-                "vms", "Primary Volume Descriptor, showing version suffixes"
-            },
-            {
-                "joliet", "Joliet Volume Descriptor (default)"
-            },
-            {
-                "rrip", "Rock Ridge"
-            },
-            {
-                "romeo", "Primary Volume Descriptor using the specified encoding codepage"
-            }
-        };
-
-        static Dictionary<string, string> GetDefaultOptions() => new()
+            "normal", "Primary Volume Descriptor, ignoring ;1 suffixes"
+        },
         {
-            {
-                "debug", false.ToString()
-            }
-        };
-    }
+            "vms", "Primary Volume Descriptor, showing version suffixes"
+        },
+        {
+            "joliet", "Joliet Volume Descriptor (default)"
+        },
+        {
+            "rrip", "Rock Ridge"
+        },
+        {
+            "romeo", "Primary Volume Descriptor using the specified encoding codepage"
+        }
+    };
+
+    static Dictionary<string, string> GetDefaultOptions() => new()
+    {
+        {
+            "debug", false.ToString()
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Info.cs b/Aaru.Filesystems/ISO9660/Info.cs
index fc55ed638..8001d4837 100644
--- a/Aaru.Filesystems/ISO9660/Info.cs
+++ b/Aaru.Filesystems/ISO9660/Info.cs
@@ -43,972 +43,971 @@ using Aaru.Decoders.Sega;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        // ISO9660 is designed for 2048 bytes/sector devices
+        if(imagePlugin.Info.SectorSize < 2048)
+            return false;
+
+        // ISO9660 Primary Volume Descriptor starts at sector 16, so that's minimal size.
+        if(partition.End <= 16 + partition.Start)
+            return false;
+
+        // Read to Volume Descriptor
+        ErrorNumber errno = imagePlugin.ReadSector(16 + partition.Start, out byte[] vdSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        int xaOff = 0;
+
+        if(vdSector.Length == 2336)
+            xaOff = 8;
+
+        byte   vdType  = vdSector[0 + xaOff];
+        byte[] vdMagic = new byte[5];
+        byte[] hsMagic = new byte[5];
+
+        // This indicates the end of a volume descriptor. HighSierra here would have 16 so no problem
+        if(vdType == 255)
+            return false;
+
+        Array.Copy(vdSector, 0x001 + xaOff, vdMagic, 0, 5);
+        Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5);
+
+        AaruConsole.DebugWriteLine("ISO9660 plugin", "VDMagic = {0}", Encoding.ASCII.GetString(vdMagic));
+        AaruConsole.DebugWriteLine("ISO9660 plugin", "HSMagic = {0}", Encoding.ASCII.GetString(hsMagic));
+
+        return Encoding.ASCII.GetString(vdMagic) == ISO_MAGIC         ||
+               Encoding.ASCII.GetString(hsMagic) == HIGH_SIERRA_MAGIC ||
+               Encoding.ASCII.GetString(vdMagic) == CDI_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.ASCII;
+        information = "";
+        var    isoMetadata = new StringBuilder();
+        byte[] vdMagic     = new byte[5]; // Volume Descriptor magic "CD001"
+        byte[] hsMagic     = new byte[5]; // Volume Descriptor magic "CDROM"
+
+        string bootSpec = "";
+
+        PrimaryVolumeDescriptor?           pvd      = null;
+        PrimaryVolumeDescriptor?           jolietvd = null;
+        BootRecord?                        bvd      = null;
+        HighSierraPrimaryVolumeDescriptor? hsvd     = null;
+        FileStructureVolumeDescriptor?     fsvd     = null;
+        ElToritoBootRecord?                torito   = null;
+
+        // ISO9660 is designed for 2048 bytes/sector devices
+        if(imagePlugin.Info.SectorSize < 2048)
+            return;
+
+        // ISO9660 Primary Volume Descriptor starts at sector 16, so that's minimal size.
+        if(partition.End < 16)
+            return;
+
+        ulong counter = 0;
+
+        ErrorNumber errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        int xaOff = vdSector.Length == 2336 ? 8 : 0;
+        Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5);
+        bool highSierraInfo = Encoding.GetString(hsMagic) == HIGH_SIERRA_MAGIC;
+        int  hsOff          = 0;
+
+        if(highSierraInfo)
+            hsOff = 8;
+
+        bool cdiInfo = false;
+        bool evd     = false;
+        bool vpd     = false;
+
+        while(true)
         {
-            // ISO9660 is designed for 2048 bytes/sector devices
-            if(imagePlugin.Info.SectorSize < 2048)
-                return false;
+            AaruConsole.DebugWriteLine("ISO9660 plugin", "Processing VD loop no. {0}", counter);
 
-            // ISO9660 Primary Volume Descriptor starts at sector 16, so that's minimal size.
-            if(partition.End <= 16 + partition.Start)
-                return false;
-
-            // Read to Volume Descriptor
-            ErrorNumber errno = imagePlugin.ReadSector(16 + partition.Start, out byte[] vdSector);
+            // Seek to Volume Descriptor
+            AaruConsole.DebugWriteLine("ISO9660 plugin", "Reading sector {0}", 16 + counter + partition.Start);
+            errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSectorTmp);
 
             if(errno != ErrorNumber.NoError)
-                return false;
+                return;
 
-            int xaOff = 0;
+            vdSector = new byte[vdSectorTmp.Length - xaOff];
+            Array.Copy(vdSectorTmp, xaOff, vdSector, 0, vdSector.Length);
 
-            if(vdSector.Length == 2336)
-                xaOff = 8;
+            byte vdType = vdSector[0 + hsOff]; // Volume Descriptor Type, should be 1 or 2.
+            AaruConsole.DebugWriteLine("ISO9660 plugin", "VDType = {0}", vdType);
 
-            byte   vdType  = vdSector[0 + xaOff];
-            byte[] vdMagic = new byte[5];
-            byte[] hsMagic = new byte[5];
+            if(vdType == 255) // Supposedly we are in the PVD.
+            {
+                if(counter == 0)
+                    return;
 
-            // This indicates the end of a volume descriptor. HighSierra here would have 16 so no problem
-            if(vdType == 255)
-                return false;
+                break;
+            }
 
-            Array.Copy(vdSector, 0x001 + xaOff, vdMagic, 0, 5);
-            Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5);
+            Array.Copy(vdSector, 0x001, vdMagic, 0, 5);
+            Array.Copy(vdSector, 0x009, hsMagic, 0, 5);
 
-            AaruConsole.DebugWriteLine("ISO9660 plugin", "VDMagic = {0}", Encoding.ASCII.GetString(vdMagic));
-            AaruConsole.DebugWriteLine("ISO9660 plugin", "HSMagic = {0}", Encoding.ASCII.GetString(hsMagic));
+            if(Encoding.GetString(vdMagic) != ISO_MAGIC         &&
+               Encoding.GetString(hsMagic) != HIGH_SIERRA_MAGIC &&
+               Encoding.GetString(vdMagic) !=
+               CDI_MAGIC) // Recognized, it is an ISO9660, now check for rest of data.
+            {
+                if(counter == 0)
+                    return;
 
-            return Encoding.ASCII.GetString(vdMagic) == ISO_MAGIC         ||
-                   Encoding.ASCII.GetString(hsMagic) == HIGH_SIERRA_MAGIC ||
-                   Encoding.ASCII.GetString(vdMagic) == CDI_MAGIC;
+                break;
+            }
+
+            cdiInfo |= Encoding.GetString(vdMagic) == CDI_MAGIC;
+
+            switch(vdType)
+            {
+                case 0:
+                {
+                    bvd = Marshal.ByteArrayToStructureLittleEndian<BootRecord>(vdSector, hsOff, 2048 - hsOff);
+
+                    bootSpec = "Unknown";
+
+                    if(Encoding.GetString(bvd.Value.system_id).Substring(0, 23) == "EL TORITO SPECIFICATION")
+                    {
+                        bootSpec = "El Torito";
+
+                        torito =
+                            Marshal.ByteArrayToStructureLittleEndian<ElToritoBootRecord>(vdSector, hsOff,
+                                2048 - hsOff);
+                    }
+
+                    break;
+                }
+
+                case 1:
+                {
+                    if(highSierraInfo)
+                        hsvd = Marshal.
+                            ByteArrayToStructureLittleEndian<HighSierraPrimaryVolumeDescriptor>(vdSector);
+                    else if(cdiInfo)
+                        fsvd = Marshal.ByteArrayToStructureBigEndian<FileStructureVolumeDescriptor>(vdSector);
+                    else
+                        pvd = Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(vdSector);
+
+                    break;
+                }
+
+                case 2:
+                {
+                    PrimaryVolumeDescriptor svd =
+                        Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(vdSector);
+
+                    // Check if this is Joliet
+                    if(svd.version == 1)
+                    {
+                        if(svd.escape_sequences[0] == '%' &&
+                           svd.escape_sequences[1] == '/')
+                            if(svd.escape_sequences[2] == '@' ||
+                               svd.escape_sequences[2] == 'C' ||
+                               svd.escape_sequences[2] == 'E')
+                                jolietvd = svd;
+                            else
+                                AaruConsole.WriteLine("ISO9660 plugin",
+                                                      "Found unknown supplementary volume descriptor");
+                    }
+                    else
+                        evd = true;
+
+                    break;
+                }
+
+                case 3:
+                {
+                    vpd = true;
+
+                    break;
+                }
+            }
+
+            counter++;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        DecodedVolumeDescriptor decodedVd;
+        var                     decodedJolietVd = new DecodedVolumeDescriptor();
+
+        XmlFsType = new FileSystemType();
+
+        if(pvd  == null &&
+           hsvd == null &&
+           fsvd == null)
         {
-            Encoding    = encoding ?? Encoding.ASCII;
-            information = "";
-            var    isoMetadata = new StringBuilder();
-            byte[] vdMagic     = new byte[5]; // Volume Descriptor magic "CD001"
-            byte[] hsMagic     = new byte[5]; // Volume Descriptor magic "CDROM"
+            information = "ERROR: Could not find primary volume descriptor";
 
-            string bootSpec = "";
+            return;
+        }
 
-            PrimaryVolumeDescriptor?           pvd      = null;
-            PrimaryVolumeDescriptor?           jolietvd = null;
-            BootRecord?                        bvd      = null;
-            HighSierraPrimaryVolumeDescriptor? hsvd     = null;
-            FileStructureVolumeDescriptor?     fsvd     = null;
-            ElToritoBootRecord?                torito   = null;
+        if(highSierraInfo)
+            decodedVd = DecodeVolumeDescriptor(hsvd.Value);
+        else if(cdiInfo)
+            decodedVd = DecodeVolumeDescriptor(fsvd.Value);
+        else
+            decodedVd = DecodeVolumeDescriptor(pvd.Value);
 
-            // ISO9660 is designed for 2048 bytes/sector devices
-            if(imagePlugin.Info.SectorSize < 2048)
-                return;
+        if(jolietvd != null)
+            decodedJolietVd = DecodeJolietDescriptor(jolietvd.Value);
 
-            // ISO9660 Primary Volume Descriptor starts at sector 16, so that's minimal size.
-            if(partition.End < 16)
-                return;
+        uint rootLocation = 0;
+        uint rootSize     = 0;
 
-            ulong counter = 0;
+        // No need to read root on CD-i, as extensions are not supported...
+        if(!cdiInfo)
+        {
+            rootLocation = highSierraInfo ? hsvd.Value.root_directory_record.extent
+                               : pvd.Value.root_directory_record.extent;
 
-            ErrorNumber errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSector);
+            if(highSierraInfo)
+            {
+                rootSize = hsvd.Value.root_directory_record.size / hsvd.Value.logical_block_size;
+
+                if(hsvd.Value.root_directory_record.size % hsvd.Value.logical_block_size > 0)
+                    rootSize++;
+            }
+            else
+            {
+                rootSize = pvd.Value.root_directory_record.size / pvd.Value.logical_block_size;
+
+                if(pvd.Value.root_directory_record.size % pvd.Value.logical_block_size > 0)
+                    rootSize++;
+            }
+        }
+
+        byte[]                 rootDir         = Array.Empty<byte>();
+        int                    rootOff         = 0;
+        bool                   xaExtensions    = false;
+        bool                   apple           = false;
+        bool                   susp            = false;
+        bool                   rrip            = false;
+        bool                   ziso            = false;
+        bool                   amiga           = false;
+        bool                   aaip            = false;
+        List<ContinuationArea> contareas       = new();
+        List<byte[]>           refareas        = new();
+        var                    suspInformation = new StringBuilder();
+
+        if(rootLocation + rootSize < imagePlugin.Info.Sectors)
+        {
+            errno = imagePlugin.ReadSectors(rootLocation, rootSize, out rootDir);
 
             if(errno != ErrorNumber.NoError)
                 return;
+        }
 
-            int xaOff = vdSector.Length == 2336 ? 8 : 0;
-            Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5);
-            bool highSierraInfo = Encoding.GetString(hsMagic) == HIGH_SIERRA_MAGIC;
-            int  hsOff          = 0;
+        // Walk thru root directory to see system area extensions in use
+        while(rootOff + Marshal.SizeOf<DirectoryRecord>() < rootDir.Length &&
+              !cdiInfo)
+        {
+            DirectoryRecord record =
+                Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(rootDir, rootOff,
+                                                                          Marshal.SizeOf<DirectoryRecord>());
 
-            if(highSierraInfo)
-                hsOff = 8;
+            int saOff = Marshal.SizeOf<DirectoryRecord>() + record.name_len;
+            saOff += saOff % 2;
+            int saLen = record.length - saOff;
 
-            bool cdiInfo = false;
-            bool evd     = false;
-            bool vpd     = false;
-
-            while(true)
+            if(saLen                   > 0 &&
+               rootOff + saOff + saLen <= rootDir.Length)
             {
-                AaruConsole.DebugWriteLine("ISO9660 plugin", "Processing VD loop no. {0}", counter);
+                byte[] sa = new byte[saLen];
+                Array.Copy(rootDir, rootOff + saOff, sa, 0, saLen);
+                saOff = 0;
 
-                // Seek to Volume Descriptor
-                AaruConsole.DebugWriteLine("ISO9660 plugin", "Reading sector {0}", 16 + counter + partition.Start);
-                errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSectorTmp);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                vdSector = new byte[vdSectorTmp.Length - xaOff];
-                Array.Copy(vdSectorTmp, xaOff, vdSector, 0, vdSector.Length);
-
-                byte vdType = vdSector[0 + hsOff]; // Volume Descriptor Type, should be 1 or 2.
-                AaruConsole.DebugWriteLine("ISO9660 plugin", "VDType = {0}", vdType);
-
-                if(vdType == 255) // Supposedly we are in the PVD.
+                while(saOff < saLen)
                 {
-                    if(counter == 0)
-                        return;
+                    bool noneFound = true;
 
-                    break;
-                }
-
-                Array.Copy(vdSector, 0x001, vdMagic, 0, 5);
-                Array.Copy(vdSector, 0x009, hsMagic, 0, 5);
-
-                if(Encoding.GetString(vdMagic) != ISO_MAGIC         &&
-                   Encoding.GetString(hsMagic) != HIGH_SIERRA_MAGIC &&
-                   Encoding.GetString(vdMagic) !=
-                   CDI_MAGIC) // Recognized, it is an ISO9660, now check for rest of data.
-                {
-                    if(counter == 0)
-                        return;
-
-                    break;
-                }
-
-                cdiInfo |= Encoding.GetString(vdMagic) == CDI_MAGIC;
-
-                switch(vdType)
-                {
-                    case 0:
+                    if(Marshal.SizeOf<CdromXa>() + saOff <= saLen)
                     {
-                        bvd = Marshal.ByteArrayToStructureLittleEndian<BootRecord>(vdSector, hsOff, 2048 - hsOff);
+                        CdromXa xa = Marshal.ByteArrayToStructureBigEndian<CdromXa>(sa);
 
-                        bootSpec = "Unknown";
-
-                        if(Encoding.GetString(bvd.Value.system_id).Substring(0, 23) == "EL TORITO SPECIFICATION")
+                        if(xa.signature == XA_MAGIC)
                         {
-                            bootSpec = "El Torito";
-
-                            torito =
-                                Marshal.ByteArrayToStructureLittleEndian<ElToritoBootRecord>(vdSector, hsOff,
-                                    2048 - hsOff);
+                            xaExtensions =  true;
+                            saOff        += Marshal.SizeOf<CdromXa>();
+                            noneFound    =  false;
                         }
+                    }
 
+                    if(saOff + 2 >= saLen)
                         break;
-                    }
 
-                    case 1:
-                    {
-                        if(highSierraInfo)
-                            hsvd = Marshal.
-                                ByteArrayToStructureLittleEndian<HighSierraPrimaryVolumeDescriptor>(vdSector);
-                        else if(cdiInfo)
-                            fsvd = Marshal.ByteArrayToStructureBigEndian<FileStructureVolumeDescriptor>(vdSector);
-                        else
-                            pvd = Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(vdSector);
-
-                        break;
-                    }
-
-                    case 2:
-                    {
-                        PrimaryVolumeDescriptor svd =
-                            Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(vdSector);
-
-                        // Check if this is Joliet
-                        if(svd.version == 1)
-                        {
-                            if(svd.escape_sequences[0] == '%' &&
-                               svd.escape_sequences[1] == '/')
-                                if(svd.escape_sequences[2] == '@' ||
-                                   svd.escape_sequences[2] == 'C' ||
-                                   svd.escape_sequences[2] == 'E')
-                                    jolietvd = svd;
-                                else
-                                    AaruConsole.WriteLine("ISO9660 plugin",
-                                                          "Found unknown supplementary volume descriptor");
-                        }
-                        else
-                            evd = true;
-
-                        break;
-                    }
-
-                    case 3:
-                    {
-                        vpd = true;
-
-                        break;
-                    }
-                }
-
-                counter++;
-            }
-
-            DecodedVolumeDescriptor decodedVd;
-            var                     decodedJolietVd = new DecodedVolumeDescriptor();
-
-            XmlFsType = new FileSystemType();
-
-            if(pvd  == null &&
-               hsvd == null &&
-               fsvd == null)
-            {
-                information = "ERROR: Could not find primary volume descriptor";
-
-                return;
-            }
-
-            if(highSierraInfo)
-                decodedVd = DecodeVolumeDescriptor(hsvd.Value);
-            else if(cdiInfo)
-                decodedVd = DecodeVolumeDescriptor(fsvd.Value);
-            else
-                decodedVd = DecodeVolumeDescriptor(pvd.Value);
-
-            if(jolietvd != null)
-                decodedJolietVd = DecodeJolietDescriptor(jolietvd.Value);
-
-            uint rootLocation = 0;
-            uint rootSize     = 0;
-
-            // No need to read root on CD-i, as extensions are not supported...
-            if(!cdiInfo)
-            {
-                rootLocation = highSierraInfo ? hsvd.Value.root_directory_record.extent
-                                   : pvd.Value.root_directory_record.extent;
-
-                if(highSierraInfo)
-                {
-                    rootSize = hsvd.Value.root_directory_record.size / hsvd.Value.logical_block_size;
-
-                    if(hsvd.Value.root_directory_record.size % hsvd.Value.logical_block_size > 0)
-                        rootSize++;
-                }
-                else
-                {
-                    rootSize = pvd.Value.root_directory_record.size / pvd.Value.logical_block_size;
-
-                    if(pvd.Value.root_directory_record.size % pvd.Value.logical_block_size > 0)
-                        rootSize++;
-                }
-            }
-
-            byte[]                 rootDir         = Array.Empty<byte>();
-            int                    rootOff         = 0;
-            bool                   xaExtensions    = false;
-            bool                   apple           = false;
-            bool                   susp            = false;
-            bool                   rrip            = false;
-            bool                   ziso            = false;
-            bool                   amiga           = false;
-            bool                   aaip            = false;
-            List<ContinuationArea> contareas       = new();
-            List<byte[]>           refareas        = new();
-            var                    suspInformation = new StringBuilder();
-
-            if(rootLocation + rootSize < imagePlugin.Info.Sectors)
-            {
-                errno = imagePlugin.ReadSectors(rootLocation, rootSize, out rootDir);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-            }
-
-            // Walk thru root directory to see system area extensions in use
-            while(rootOff + Marshal.SizeOf<DirectoryRecord>() < rootDir.Length &&
-                  !cdiInfo)
-            {
-                DirectoryRecord record =
-                    Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(rootDir, rootOff,
-                                                                              Marshal.SizeOf<DirectoryRecord>());
-
-                int saOff = Marshal.SizeOf<DirectoryRecord>() + record.name_len;
-                saOff += saOff % 2;
-                int saLen = record.length - saOff;
-
-                if(saLen                   > 0 &&
-                   rootOff + saOff + saLen <= rootDir.Length)
-                {
-                    byte[] sa = new byte[saLen];
-                    Array.Copy(rootDir, rootOff + saOff, sa, 0, saLen);
-                    saOff = 0;
-
-                    while(saOff < saLen)
-                    {
-                        bool noneFound = true;
-
-                        if(Marshal.SizeOf<CdromXa>() + saOff <= saLen)
-                        {
-                            CdromXa xa = Marshal.ByteArrayToStructureBigEndian<CdromXa>(sa);
-
-                            if(xa.signature == XA_MAGIC)
-                            {
-                                xaExtensions =  true;
-                                saOff        += Marshal.SizeOf<CdromXa>();
-                                noneFound    =  false;
-                            }
-                        }
-
-                        if(saOff + 2 >= saLen)
-                            break;
-
-                        ushort nextSignature = BigEndianBitConverter.ToUInt16(sa, saOff);
-
-                        switch(nextSignature)
-                        {
-                            // Easy, contains size field
-                            case APPLE_MAGIC:
-                                apple     =  true;
-                                saOff     += sa[saOff + 2];
-                                noneFound =  false;
-
-                                break;
-
-                            // Not easy, contains size field
-                            case APPLE_MAGIC_OLD:
-                                apple = true;
-                                var appleId = (AppleOldId)sa[saOff + 2];
-                                noneFound = false;
-
-                                switch(appleId)
-                                {
-                                    case AppleOldId.ProDOS:
-                                        saOff += Marshal.SizeOf<AppleProDOSOldSystemUse>();
-
-                                        break;
-                                    case AppleOldId.TypeCreator:
-                                    case AppleOldId.TypeCreatorBundle:
-                                        saOff += Marshal.SizeOf<AppleHFSTypeCreatorSystemUse>();
-
-                                        break;
-                                    case AppleOldId.TypeCreatorIcon:
-                                    case AppleOldId.TypeCreatorIconBundle:
-                                        saOff += Marshal.SizeOf<AppleHFSIconSystemUse>();
-
-                                        break;
-                                    case AppleOldId.HFS:
-                                        saOff += Marshal.SizeOf<AppleHFSOldSystemUse>();
-
-                                        break;
-                                }
-
-                                break;
-
-                            // IEEE-P1281 aka SUSP 1.12
-                            case SUSP_INDICATOR:
-                                susp      =  true;
-                                saOff     += sa[saOff + 2];
-                                noneFound =  false;
-
-                                while(saOff + 2 < saLen)
-                                {
-                                    nextSignature = BigEndianBitConverter.ToUInt16(sa, saOff);
-
-                                    switch(nextSignature)
-                                    {
-                                        case APPLE_MAGIC:
-                                            if(sa[saOff + 3] == 1 &&
-                                               sa[saOff + 2] == 7)
-                                                apple = true;
-                                            else
-                                                apple |= sa[saOff + 3] != 1;
-
-                                            break;
-                                        case SUSP_CONTINUATION when saOff + sa[saOff + 2] <= saLen:
-                                            byte[] ce = new byte[sa[saOff + 2]];
-                                            Array.Copy(sa, saOff, ce, 0, ce.Length);
-
-                                            ContinuationArea ca =
-                                                Marshal.ByteArrayToStructureBigEndian<ContinuationArea>(ce);
-
-                                            contareas.Add(ca);
-
-                                            break;
-                                        case SUSP_REFERENCE when saOff + sa[saOff + 2] <= saLen:
-                                            byte[] er = new byte[sa[saOff + 2]];
-                                            Array.Copy(sa, saOff, er, 0, er.Length);
-                                            refareas.Add(er);
-
-                                            break;
-                                    }
-
-                                    rrip |= nextSignature == RRIP_MAGIC || nextSignature == RRIP_POSIX_ATTRIBUTES ||
-                                            nextSignature == RRIP_POSIX_DEV_NO || nextSignature == RRIP_SYMLINK ||
-                                            nextSignature == RRIP_NAME || nextSignature == RRIP_CHILDLINK ||
-                                            nextSignature == RRIP_PARENTLINK || nextSignature == RRIP_RELOCATED_DIR ||
-                                            nextSignature == RRIP_TIMESTAMPS || nextSignature == RRIP_SPARSE;
-
-                                    ziso  |= nextSignature == ZISO_MAGIC;
-                                    amiga |= nextSignature == AMIGA_MAGIC;
-
-                                    aaip |= nextSignature == AAIP_MAGIC || (nextSignature == AAIP_MAGIC_OLD &&
-                                                                            sa[saOff + 3] == 1 && sa[saOff + 2] >= 9);
-
-                                    saOff += sa[saOff + 2];
-
-                                    if(nextSignature == SUSP_TERMINATOR)
-                                        break;
-                                }
-
-                                break;
-                        }
-
-                        if(noneFound)
-                            break;
-                    }
-                }
-
-                rootOff += record.length;
-
-                if(record.length == 0)
-                    break;
-            }
-
-            foreach(ContinuationArea ca in contareas)
-            {
-                uint caLen = (ca.ca_length_be + ca.offset_be) /
-                             (highSierraInfo ? hsvd.Value.logical_block_size : pvd.Value.logical_block_size);
-
-                if((ca.ca_length_be + ca.offset_be) %
-                   (highSierraInfo ? hsvd.Value.logical_block_size : pvd.Value.logical_block_size) > 0)
-                    caLen++;
-
-                errno = imagePlugin.ReadSectors(ca.block_be, caLen, out byte[] caSectors);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                byte[] caData = new byte[ca.ca_length_be];
-                Array.Copy(caSectors, ca.offset_be, caData, 0, ca.ca_length_be);
-                int caOff = 0;
-
-                while(caOff < ca.ca_length_be)
-                {
-                    ushort nextSignature = BigEndianBitConverter.ToUInt16(caData, caOff);
+                    ushort nextSignature = BigEndianBitConverter.ToUInt16(sa, saOff);
 
                     switch(nextSignature)
                     {
-                        // Apple never said to include its extensions inside a continuation area, but just in case
+                        // Easy, contains size field
                         case APPLE_MAGIC:
-                            if(caData[caOff + 3] == 1 &&
-                               caData[caOff + 2] == 7)
-                                apple = true;
-                            else
-                                apple |= caData[caOff + 3] != 1;
+                            apple     =  true;
+                            saOff     += sa[saOff + 2];
+                            noneFound =  false;
 
                             break;
-                        case SUSP_REFERENCE when caOff + caData[caOff + 2] <= ca.ca_length_be:
-                            byte[] er = new byte[caData[caOff + 2]];
-                            Array.Copy(caData, caOff, er, 0, er.Length);
-                            refareas.Add(er);
+
+                        // Not easy, contains size field
+                        case APPLE_MAGIC_OLD:
+                            apple = true;
+                            var appleId = (AppleOldId)sa[saOff + 2];
+                            noneFound = false;
+
+                            switch(appleId)
+                            {
+                                case AppleOldId.ProDOS:
+                                    saOff += Marshal.SizeOf<AppleProDOSOldSystemUse>();
+
+                                    break;
+                                case AppleOldId.TypeCreator:
+                                case AppleOldId.TypeCreatorBundle:
+                                    saOff += Marshal.SizeOf<AppleHFSTypeCreatorSystemUse>();
+
+                                    break;
+                                case AppleOldId.TypeCreatorIcon:
+                                case AppleOldId.TypeCreatorIconBundle:
+                                    saOff += Marshal.SizeOf<AppleHFSIconSystemUse>();
+
+                                    break;
+                                case AppleOldId.HFS:
+                                    saOff += Marshal.SizeOf<AppleHFSOldSystemUse>();
+
+                                    break;
+                            }
+
+                            break;
+
+                        // IEEE-P1281 aka SUSP 1.12
+                        case SUSP_INDICATOR:
+                            susp      =  true;
+                            saOff     += sa[saOff + 2];
+                            noneFound =  false;
+
+                            while(saOff + 2 < saLen)
+                            {
+                                nextSignature = BigEndianBitConverter.ToUInt16(sa, saOff);
+
+                                switch(nextSignature)
+                                {
+                                    case APPLE_MAGIC:
+                                        if(sa[saOff + 3] == 1 &&
+                                           sa[saOff + 2] == 7)
+                                            apple = true;
+                                        else
+                                            apple |= sa[saOff + 3] != 1;
+
+                                        break;
+                                    case SUSP_CONTINUATION when saOff + sa[saOff + 2] <= saLen:
+                                        byte[] ce = new byte[sa[saOff + 2]];
+                                        Array.Copy(sa, saOff, ce, 0, ce.Length);
+
+                                        ContinuationArea ca =
+                                            Marshal.ByteArrayToStructureBigEndian<ContinuationArea>(ce);
+
+                                        contareas.Add(ca);
+
+                                        break;
+                                    case SUSP_REFERENCE when saOff + sa[saOff + 2] <= saLen:
+                                        byte[] er = new byte[sa[saOff + 2]];
+                                        Array.Copy(sa, saOff, er, 0, er.Length);
+                                        refareas.Add(er);
+
+                                        break;
+                                }
+
+                                rrip |= nextSignature == RRIP_MAGIC        || nextSignature == RRIP_POSIX_ATTRIBUTES ||
+                                        nextSignature == RRIP_POSIX_DEV_NO || nextSignature == RRIP_SYMLINK          ||
+                                        nextSignature == RRIP_NAME         || nextSignature == RRIP_CHILDLINK        ||
+                                        nextSignature == RRIP_PARENTLINK   || nextSignature == RRIP_RELOCATED_DIR    ||
+                                        nextSignature == RRIP_TIMESTAMPS   || nextSignature == RRIP_SPARSE;
+
+                                ziso  |= nextSignature == ZISO_MAGIC;
+                                amiga |= nextSignature == AMIGA_MAGIC;
+
+                                aaip |= nextSignature == AAIP_MAGIC || (nextSignature == AAIP_MAGIC_OLD &&
+                                                                        sa[saOff + 3] == 1 && sa[saOff + 2] >= 9);
+
+                                saOff += sa[saOff + 2];
+
+                                if(nextSignature == SUSP_TERMINATOR)
+                                    break;
+                            }
 
                             break;
                     }
 
-                    rrip |= nextSignature == RRIP_MAGIC        || nextSignature == RRIP_POSIX_ATTRIBUTES ||
-                            nextSignature == RRIP_POSIX_DEV_NO || nextSignature == RRIP_SYMLINK          ||
-                            nextSignature == RRIP_NAME         || nextSignature == RRIP_CHILDLINK        ||
-                            nextSignature == RRIP_PARENTLINK   || nextSignature == RRIP_RELOCATED_DIR    ||
-                            nextSignature == RRIP_TIMESTAMPS   || nextSignature == RRIP_SPARSE;
-
-                    ziso  |= nextSignature == ZISO_MAGIC;
-                    amiga |= nextSignature == AMIGA_MAGIC;
-
-                    aaip |= nextSignature == AAIP_MAGIC || (nextSignature == AAIP_MAGIC_OLD && caData[caOff + 3] == 1 &&
-                                                            caData[caOff                                    + 2] >= 9);
-
-                    caOff += caData[caOff + 2];
+                    if(noneFound)
+                        break;
                 }
             }
 
-            if(refareas.Count > 0)
-            {
-                suspInformation.AppendLine("----------------------------------------");
-                suspInformation.AppendLine("SYSTEM USE SHARING PROTOCOL INFORMATION:");
-                suspInformation.AppendLine("----------------------------------------");
+            rootOff += record.length;
 
-                counter = 1;
+            if(record.length == 0)
+                break;
+        }
 
-                foreach(byte[] erb in refareas)
-                {
-                    ReferenceArea er    = Marshal.ByteArrayToStructureBigEndian<ReferenceArea>(erb);
-                    string        extId = Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>(), er.id_len);
+        foreach(ContinuationArea ca in contareas)
+        {
+            uint caLen = (ca.ca_length_be + ca.offset_be) /
+                         (highSierraInfo ? hsvd.Value.logical_block_size : pvd.Value.logical_block_size);
 
-                    string extDes = Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>() + er.id_len, er.des_len);
+            if((ca.ca_length_be + ca.offset_be) %
+               (highSierraInfo ? hsvd.Value.logical_block_size : pvd.Value.logical_block_size) > 0)
+                caLen++;
 
-                    string extSrc = Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>() + er.id_len + er.des_len,
-                                                       er.src_len);
-
-                    suspInformation.AppendFormat("Extension: {0}", counter).AppendLine();
-                    suspInformation.AppendFormat("\tID: {0}, version {1}", extId, er.ext_ver).AppendLine();
-                    suspInformation.AppendFormat("\tDescription: {0}", extDes).AppendLine();
-                    suspInformation.AppendFormat("\tSource: {0}", extSrc).AppendLine();
-                    counter++;
-                }
-            }
-
-            errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] ipbinSector);
+            errno = imagePlugin.ReadSectors(ca.block_be, caLen, out byte[] caSectors);
 
             if(errno != ErrorNumber.NoError)
                 return;
 
-            CD.IPBin?        segaCd    = CD.DecodeIPBin(ipbinSector);
-            Saturn.IPBin?    saturn    = Saturn.DecodeIPBin(ipbinSector);
-            Dreamcast.IPBin? dreamcast = Dreamcast.DecodeIPBin(ipbinSector);
+            byte[] caData = new byte[ca.ca_length_be];
+            Array.Copy(caSectors, ca.offset_be, caData, 0, ca.ca_length_be);
+            int caOff = 0;
 
-            string fsFormat;
-
-            if(highSierraInfo)
-                fsFormat = "High Sierra Format";
-            else if(cdiInfo)
-                fsFormat = "CD-i";
-            else
-                fsFormat = "ISO9660";
-
-            isoMetadata.AppendFormat("{0} file system", fsFormat).AppendLine();
-
-            if(xaExtensions)
-                isoMetadata.AppendLine("CD-ROM XA extensions present.");
-
-            if(amiga)
-                isoMetadata.AppendLine("Amiga extensions present.");
-
-            if(apple)
-                isoMetadata.AppendLine("Apple extensions present.");
-
-            if(jolietvd != null)
-                isoMetadata.AppendLine("Joliet extensions present.");
-
-            if(susp)
-                isoMetadata.AppendLine("System Use Sharing Protocol present.");
-
-            if(rrip)
-                isoMetadata.AppendLine("Rock Ridge Interchange Protocol present.");
-
-            if(aaip)
-                isoMetadata.AppendLine("Arbitrary Attribute Interchange Protocol present.");
-
-            if(ziso)
-                isoMetadata.AppendLine("zisofs compression present.");
-
-            if(evd)
-                isoMetadata.AppendLine("Contains Enhanved Volume Descriptor.");
-
-            if(vpd)
-                isoMetadata.AppendLine("Contains Volume Partition Descriptor.");
-
-            if(bvd != null)
-                isoMetadata.AppendFormat("Disc bootable following {0} specifications.", bootSpec).AppendLine();
-
-            if(segaCd != null)
+            while(caOff < ca.ca_length_be)
             {
-                isoMetadata.AppendLine("This is a SegaCD / MegaCD disc.");
-                isoMetadata.AppendLine(CD.Prettify(segaCd));
-            }
+                ushort nextSignature = BigEndianBitConverter.ToUInt16(caData, caOff);
 
-            if(saturn != null)
+                switch(nextSignature)
+                {
+                    // Apple never said to include its extensions inside a continuation area, but just in case
+                    case APPLE_MAGIC:
+                        if(caData[caOff + 3] == 1 &&
+                           caData[caOff + 2] == 7)
+                            apple = true;
+                        else
+                            apple |= caData[caOff + 3] != 1;
+
+                        break;
+                    case SUSP_REFERENCE when caOff + caData[caOff + 2] <= ca.ca_length_be:
+                        byte[] er = new byte[caData[caOff + 2]];
+                        Array.Copy(caData, caOff, er, 0, er.Length);
+                        refareas.Add(er);
+
+                        break;
+                }
+
+                rrip |= nextSignature == RRIP_MAGIC        || nextSignature == RRIP_POSIX_ATTRIBUTES ||
+                        nextSignature == RRIP_POSIX_DEV_NO || nextSignature == RRIP_SYMLINK          ||
+                        nextSignature == RRIP_NAME         || nextSignature == RRIP_CHILDLINK        ||
+                        nextSignature == RRIP_PARENTLINK   || nextSignature == RRIP_RELOCATED_DIR    ||
+                        nextSignature == RRIP_TIMESTAMPS   || nextSignature == RRIP_SPARSE;
+
+                ziso  |= nextSignature == ZISO_MAGIC;
+                amiga |= nextSignature == AMIGA_MAGIC;
+
+                aaip |= nextSignature == AAIP_MAGIC || (nextSignature == AAIP_MAGIC_OLD && caData[caOff + 3] == 1 &&
+                                                        caData[caOff                                    + 2] >= 9);
+
+                caOff += caData[caOff + 2];
+            }
+        }
+
+        if(refareas.Count > 0)
+        {
+            suspInformation.AppendLine("----------------------------------------");
+            suspInformation.AppendLine("SYSTEM USE SHARING PROTOCOL INFORMATION:");
+            suspInformation.AppendLine("----------------------------------------");
+
+            counter = 1;
+
+            foreach(byte[] erb in refareas)
             {
-                isoMetadata.AppendLine("This is a Sega Saturn disc.");
-                isoMetadata.AppendLine(Saturn.Prettify(saturn));
-            }
+                ReferenceArea er    = Marshal.ByteArrayToStructureBigEndian<ReferenceArea>(erb);
+                string        extId = Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>(), er.id_len);
 
-            if(dreamcast != null)
-            {
-                isoMetadata.AppendLine("This is a Sega Dreamcast disc.");
-                isoMetadata.AppendLine(Dreamcast.Prettify(dreamcast));
-            }
+                string extDes = Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>() + er.id_len, er.des_len);
 
-            isoMetadata.AppendFormat("{0}------------------------------", cdiInfo ? "---------------" : "").
+                string extSrc = Encoding.GetString(erb, Marshal.SizeOf<ReferenceArea>() + er.id_len + er.des_len,
+                                                   er.src_len);
+
+                suspInformation.AppendFormat("Extension: {0}", counter).AppendLine();
+                suspInformation.AppendFormat("\tID: {0}, version {1}", extId, er.ext_ver).AppendLine();
+                suspInformation.AppendFormat("\tDescription: {0}", extDes).AppendLine();
+                suspInformation.AppendFormat("\tSource: {0}", extSrc).AppendLine();
+                counter++;
+            }
+        }
+
+        errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] ipbinSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        CD.IPBin?        segaCd    = CD.DecodeIPBin(ipbinSector);
+        Saturn.IPBin?    saturn    = Saturn.DecodeIPBin(ipbinSector);
+        Dreamcast.IPBin? dreamcast = Dreamcast.DecodeIPBin(ipbinSector);
+
+        string fsFormat;
+
+        if(highSierraInfo)
+            fsFormat = "High Sierra Format";
+        else if(cdiInfo)
+            fsFormat = "CD-i";
+        else
+            fsFormat = "ISO9660";
+
+        isoMetadata.AppendFormat("{0} file system", fsFormat).AppendLine();
+
+        if(xaExtensions)
+            isoMetadata.AppendLine("CD-ROM XA extensions present.");
+
+        if(amiga)
+            isoMetadata.AppendLine("Amiga extensions present.");
+
+        if(apple)
+            isoMetadata.AppendLine("Apple extensions present.");
+
+        if(jolietvd != null)
+            isoMetadata.AppendLine("Joliet extensions present.");
+
+        if(susp)
+            isoMetadata.AppendLine("System Use Sharing Protocol present.");
+
+        if(rrip)
+            isoMetadata.AppendLine("Rock Ridge Interchange Protocol present.");
+
+        if(aaip)
+            isoMetadata.AppendLine("Arbitrary Attribute Interchange Protocol present.");
+
+        if(ziso)
+            isoMetadata.AppendLine("zisofs compression present.");
+
+        if(evd)
+            isoMetadata.AppendLine("Contains Enhanved Volume Descriptor.");
+
+        if(vpd)
+            isoMetadata.AppendLine("Contains Volume Partition Descriptor.");
+
+        if(bvd != null)
+            isoMetadata.AppendFormat("Disc bootable following {0} specifications.", bootSpec).AppendLine();
+
+        if(segaCd != null)
+        {
+            isoMetadata.AppendLine("This is a SegaCD / MegaCD disc.");
+            isoMetadata.AppendLine(CD.Prettify(segaCd));
+        }
+
+        if(saturn != null)
+        {
+            isoMetadata.AppendLine("This is a Sega Saturn disc.");
+            isoMetadata.AppendLine(Saturn.Prettify(saturn));
+        }
+
+        if(dreamcast != null)
+        {
+            isoMetadata.AppendLine("This is a Sega Dreamcast disc.");
+            isoMetadata.AppendLine(Dreamcast.Prettify(dreamcast));
+        }
+
+        isoMetadata.AppendFormat("{0}------------------------------", cdiInfo ? "---------------" : "").
+                    AppendLine();
+
+        isoMetadata.AppendFormat("{0}VOLUME DESCRIPTOR INFORMATION:", cdiInfo ? "FILE STRUCTURE " : "").
+                    AppendLine();
+
+        isoMetadata.AppendFormat("{0}------------------------------", cdiInfo ? "---------------" : "").
+                    AppendLine();
+
+        isoMetadata.AppendFormat("System identifier: {0}", decodedVd.SystemIdentifier).AppendLine();
+        isoMetadata.AppendFormat("Volume identifier: {0}", decodedVd.VolumeIdentifier).AppendLine();
+        isoMetadata.AppendFormat("Volume set identifier: {0}", decodedVd.VolumeSetIdentifier).AppendLine();
+        isoMetadata.AppendFormat("Publisher identifier: {0}", decodedVd.PublisherIdentifier).AppendLine();
+        isoMetadata.AppendFormat("Data preparer identifier: {0}", decodedVd.DataPreparerIdentifier).AppendLine();
+        isoMetadata.AppendFormat("Application identifier: {0}", decodedVd.ApplicationIdentifier).AppendLine();
+        isoMetadata.AppendFormat("Volume creation date: {0}", decodedVd.CreationTime).AppendLine();
+
+        if(decodedVd.HasModificationTime)
+            isoMetadata.AppendFormat("Volume modification date: {0}", decodedVd.ModificationTime).AppendLine();
+        else
+            isoMetadata.AppendFormat("Volume has not been modified.").AppendLine();
+
+        if(decodedVd.HasExpirationTime)
+            isoMetadata.AppendFormat("Volume expiration date: {0}", decodedVd.ExpirationTime).AppendLine();
+        else
+            isoMetadata.AppendFormat("Volume does not expire.").AppendLine();
+
+        if(decodedVd.HasEffectiveTime)
+            isoMetadata.AppendFormat("Volume effective date: {0}", decodedVd.EffectiveTime).AppendLine();
+        else
+            isoMetadata.AppendFormat("Volume has always been effective.").AppendLine();
+
+        isoMetadata.AppendFormat("Volume has {0} blocks of {1} bytes each", decodedVd.Blocks, decodedVd.BlockSize).
+                    AppendLine();
+
+        if(jolietvd != null)
+        {
+            isoMetadata.AppendLine("-------------------------------------");
+            isoMetadata.AppendLine("JOLIET VOLUME DESCRIPTOR INFORMATION:");
+            isoMetadata.AppendLine("-------------------------------------");
+            isoMetadata.AppendFormat("System identifier: {0}", decodedJolietVd.SystemIdentifier).AppendLine();
+            isoMetadata.AppendFormat("Volume identifier: {0}", decodedJolietVd.VolumeIdentifier).AppendLine();
+
+            isoMetadata.AppendFormat("Volume set identifier: {0}", decodedJolietVd.VolumeSetIdentifier).
                         AppendLine();
 
-            isoMetadata.AppendFormat("{0}VOLUME DESCRIPTOR INFORMATION:", cdiInfo ? "FILE STRUCTURE " : "").
+            isoMetadata.AppendFormat("Publisher identifier: {0}", decodedJolietVd.PublisherIdentifier).AppendLine();
+
+            isoMetadata.AppendFormat("Data preparer identifier: {0}", decodedJolietVd.DataPreparerIdentifier).
                         AppendLine();
 
-            isoMetadata.AppendFormat("{0}------------------------------", cdiInfo ? "---------------" : "").
+            isoMetadata.AppendFormat("Application identifier: {0}", decodedJolietVd.ApplicationIdentifier).
                         AppendLine();
 
-            isoMetadata.AppendFormat("System identifier: {0}", decodedVd.SystemIdentifier).AppendLine();
-            isoMetadata.AppendFormat("Volume identifier: {0}", decodedVd.VolumeIdentifier).AppendLine();
-            isoMetadata.AppendFormat("Volume set identifier: {0}", decodedVd.VolumeSetIdentifier).AppendLine();
-            isoMetadata.AppendFormat("Publisher identifier: {0}", decodedVd.PublisherIdentifier).AppendLine();
-            isoMetadata.AppendFormat("Data preparer identifier: {0}", decodedVd.DataPreparerIdentifier).AppendLine();
-            isoMetadata.AppendFormat("Application identifier: {0}", decodedVd.ApplicationIdentifier).AppendLine();
-            isoMetadata.AppendFormat("Volume creation date: {0}", decodedVd.CreationTime).AppendLine();
+            isoMetadata.AppendFormat("Volume creation date: {0}", decodedJolietVd.CreationTime).AppendLine();
 
-            if(decodedVd.HasModificationTime)
-                isoMetadata.AppendFormat("Volume modification date: {0}", decodedVd.ModificationTime).AppendLine();
+            if(decodedJolietVd.HasModificationTime)
+                isoMetadata.AppendFormat("Volume modification date: {0}", decodedJolietVd.ModificationTime).
+                            AppendLine();
             else
                 isoMetadata.AppendFormat("Volume has not been modified.").AppendLine();
 
-            if(decodedVd.HasExpirationTime)
-                isoMetadata.AppendFormat("Volume expiration date: {0}", decodedVd.ExpirationTime).AppendLine();
+            if(decodedJolietVd.HasExpirationTime)
+                isoMetadata.AppendFormat("Volume expiration date: {0}", decodedJolietVd.ExpirationTime).
+                            AppendLine();
             else
                 isoMetadata.AppendFormat("Volume does not expire.").AppendLine();
 
-            if(decodedVd.HasEffectiveTime)
-                isoMetadata.AppendFormat("Volume effective date: {0}", decodedVd.EffectiveTime).AppendLine();
+            if(decodedJolietVd.HasEffectiveTime)
+                isoMetadata.AppendFormat("Volume effective date: {0}", decodedJolietVd.EffectiveTime).AppendLine();
             else
                 isoMetadata.AppendFormat("Volume has always been effective.").AppendLine();
+        }
 
-            isoMetadata.AppendFormat("Volume has {0} blocks of {1} bytes each", decodedVd.Blocks, decodedVd.BlockSize).
-                        AppendLine();
+        if(torito != null)
+        {
+            errno = imagePlugin.ReadSector(torito.Value.catalog_sector + partition.Start, out vdSector);
 
-            if(jolietvd != null)
+            if(errno != ErrorNumber.NoError)
+                return;
+
+            int toritoOff = 0;
+
+            if(vdSector[toritoOff] != 1)
+                goto exit_torito;
+
+            ElToritoValidationEntry valentry =
+                Marshal.ByteArrayToStructureLittleEndian<ElToritoValidationEntry>(vdSector, toritoOff,
+                    EL_TORITO_ENTRY_SIZE);
+
+            if(valentry.signature != EL_TORITO_MAGIC)
+                goto exit_torito;
+
+            toritoOff = EL_TORITO_ENTRY_SIZE;
+
+            ElToritoInitialEntry initialEntry =
+                Marshal.ByteArrayToStructureLittleEndian<ElToritoInitialEntry>(vdSector, toritoOff,
+                                                                               EL_TORITO_ENTRY_SIZE);
+
+            initialEntry.boot_type = (ElToritoEmulation)((byte)initialEntry.boot_type & 0xF);
+
+            AaruConsole.DebugWriteLine("DEBUG (ISO9660 plugin)", "initialEntry.load_rba = {0}",
+                                       initialEntry.load_rba);
+
+            AaruConsole.DebugWriteLine("DEBUG (ISO9660 plugin)", "initialEntry.sector_count = {0}",
+                                       initialEntry.sector_count);
+
+            byte[] bootImage = null;
+
+            if(initialEntry.load_rba + partition.Start + initialEntry.sector_count - 1 <= partition.End)
+                imagePlugin.ReadSectors(initialEntry.load_rba + partition.Start, initialEntry.sector_count,
+                                        out bootImage);
+
+            isoMetadata.AppendLine("----------------------");
+            isoMetadata.AppendLine("EL TORITO INFORMATION:");
+            isoMetadata.AppendLine("----------------------");
+
+            isoMetadata.AppendLine("Initial entry:");
+            isoMetadata.AppendFormat("\tDeveloper ID: {0}", Encoding.GetString(valentry.developer_id)).AppendLine();
+
+            if(initialEntry.bootable == ElToritoIndicator.Bootable)
             {
-                isoMetadata.AppendLine("-------------------------------------");
-                isoMetadata.AppendLine("JOLIET VOLUME DESCRIPTOR INFORMATION:");
-                isoMetadata.AppendLine("-------------------------------------");
-                isoMetadata.AppendFormat("System identifier: {0}", decodedJolietVd.SystemIdentifier).AppendLine();
-                isoMetadata.AppendFormat("Volume identifier: {0}", decodedJolietVd.VolumeIdentifier).AppendLine();
+                isoMetadata.AppendFormat("\tBootable on {0}", valentry.platform_id).AppendLine();
 
-                isoMetadata.AppendFormat("Volume set identifier: {0}", decodedJolietVd.VolumeSetIdentifier).
-                            AppendLine();
+                isoMetadata.AppendFormat("\tBootable image starts at sector {0} and runs for {1} sectors",
+                                         initialEntry.load_rba, initialEntry.sector_count).AppendLine();
 
-                isoMetadata.AppendFormat("Publisher identifier: {0}", decodedJolietVd.PublisherIdentifier).AppendLine();
-
-                isoMetadata.AppendFormat("Data preparer identifier: {0}", decodedJolietVd.DataPreparerIdentifier).
-                            AppendLine();
-
-                isoMetadata.AppendFormat("Application identifier: {0}", decodedJolietVd.ApplicationIdentifier).
-                            AppendLine();
-
-                isoMetadata.AppendFormat("Volume creation date: {0}", decodedJolietVd.CreationTime).AppendLine();
-
-                if(decodedJolietVd.HasModificationTime)
-                    isoMetadata.AppendFormat("Volume modification date: {0}", decodedJolietVd.ModificationTime).
+                if(valentry.platform_id == ElToritoPlatform.x86)
+                    isoMetadata.AppendFormat("\tBootable image will be loaded at segment {0:X4}h",
+                                             initialEntry.load_seg == 0 ? 0x7C0 : initialEntry.load_seg).
                                 AppendLine();
                 else
-                    isoMetadata.AppendFormat("Volume has not been modified.").AppendLine();
+                    isoMetadata.AppendFormat("\tBootable image will be loaded at 0x{0:X8}",
+                                             (uint)initialEntry.load_seg * 10).AppendLine();
 
-                if(decodedJolietVd.HasExpirationTime)
-                    isoMetadata.AppendFormat("Volume expiration date: {0}", decodedJolietVd.ExpirationTime).
-                                AppendLine();
-                else
-                    isoMetadata.AppendFormat("Volume does not expire.").AppendLine();
-
-                if(decodedJolietVd.HasEffectiveTime)
-                    isoMetadata.AppendFormat("Volume effective date: {0}", decodedJolietVd.EffectiveTime).AppendLine();
-                else
-                    isoMetadata.AppendFormat("Volume has always been effective.").AppendLine();
-            }
-
-            if(torito != null)
-            {
-                errno = imagePlugin.ReadSector(torito.Value.catalog_sector + partition.Start, out vdSector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                int toritoOff = 0;
-
-                if(vdSector[toritoOff] != 1)
-                    goto exit_torito;
-
-                ElToritoValidationEntry valentry =
-                    Marshal.ByteArrayToStructureLittleEndian<ElToritoValidationEntry>(vdSector, toritoOff,
-                        EL_TORITO_ENTRY_SIZE);
-
-                if(valentry.signature != EL_TORITO_MAGIC)
-                    goto exit_torito;
-
-                toritoOff = EL_TORITO_ENTRY_SIZE;
-
-                ElToritoInitialEntry initialEntry =
-                    Marshal.ByteArrayToStructureLittleEndian<ElToritoInitialEntry>(vdSector, toritoOff,
-                        EL_TORITO_ENTRY_SIZE);
-
-                initialEntry.boot_type = (ElToritoEmulation)((byte)initialEntry.boot_type & 0xF);
-
-                AaruConsole.DebugWriteLine("DEBUG (ISO9660 plugin)", "initialEntry.load_rba = {0}",
-                                           initialEntry.load_rba);
-
-                AaruConsole.DebugWriteLine("DEBUG (ISO9660 plugin)", "initialEntry.sector_count = {0}",
-                                           initialEntry.sector_count);
-
-                byte[] bootImage = null;
-
-                if(initialEntry.load_rba + partition.Start + initialEntry.sector_count - 1 <= partition.End)
-                    imagePlugin.ReadSectors(initialEntry.load_rba + partition.Start, initialEntry.sector_count,
-                                            out bootImage);
-
-                isoMetadata.AppendLine("----------------------");
-                isoMetadata.AppendLine("EL TORITO INFORMATION:");
-                isoMetadata.AppendLine("----------------------");
-
-                isoMetadata.AppendLine("Initial entry:");
-                isoMetadata.AppendFormat("\tDeveloper ID: {0}", Encoding.GetString(valentry.developer_id)).AppendLine();
-
-                if(initialEntry.bootable == ElToritoIndicator.Bootable)
+                switch(initialEntry.boot_type)
                 {
-                    isoMetadata.AppendFormat("\tBootable on {0}", valentry.platform_id).AppendLine();
+                    case ElToritoEmulation.None:
+                        isoMetadata.AppendLine("\tImage uses no emulation");
 
-                    isoMetadata.AppendFormat("\tBootable image starts at sector {0} and runs for {1} sectors",
-                                             initialEntry.load_rba, initialEntry.sector_count).AppendLine();
+                        break;
+                    case ElToritoEmulation.Md2Hd:
+                        isoMetadata.AppendLine("\tImage emulates a 5.25\" high-density (MD2HD, 1.2Mb) floppy");
 
-                    if(valentry.platform_id == ElToritoPlatform.x86)
-                        isoMetadata.AppendFormat("\tBootable image will be loaded at segment {0:X4}h",
-                                                 initialEntry.load_seg == 0 ? 0x7C0 : initialEntry.load_seg).
-                                    AppendLine();
-                    else
-                        isoMetadata.AppendFormat("\tBootable image will be loaded at 0x{0:X8}",
-                                                 (uint)initialEntry.load_seg * 10).AppendLine();
+                        break;
+                    case ElToritoEmulation.Mf2Hd:
+                        isoMetadata.AppendLine("\tImage emulates a 3.5\" high-density (MF2HD, 1.44Mb) floppy");
 
-                    switch(initialEntry.boot_type)
-                    {
-                        case ElToritoEmulation.None:
-                            isoMetadata.AppendLine("\tImage uses no emulation");
+                        break;
+                    case ElToritoEmulation.Mf2Ed:
+                        isoMetadata.AppendLine("\tImage emulates a 3.5\" extra-density (MF2ED, 2.88Mb) floppy");
 
-                            break;
-                        case ElToritoEmulation.Md2Hd:
-                            isoMetadata.AppendLine("\tImage emulates a 5.25\" high-density (MD2HD, 1.2Mb) floppy");
+                        break;
+                    default:
+                        isoMetadata.AppendFormat("\tImage uses unknown emulation type {0}",
+                                                 (byte)initialEntry.boot_type).AppendLine();
 
-                            break;
-                        case ElToritoEmulation.Mf2Hd:
-                            isoMetadata.AppendLine("\tImage emulates a 3.5\" high-density (MF2HD, 1.44Mb) floppy");
-
-                            break;
-                        case ElToritoEmulation.Mf2Ed:
-                            isoMetadata.AppendLine("\tImage emulates a 3.5\" extra-density (MF2ED, 2.88Mb) floppy");
-
-                            break;
-                        default:
-                            isoMetadata.AppendFormat("\tImage uses unknown emulation type {0}",
-                                                     (byte)initialEntry.boot_type).AppendLine();
-
-                            break;
-                    }
-
-                    isoMetadata.AppendFormat("\tSystem type: 0x{0:X2}", initialEntry.system_type).AppendLine();
-
-                    if(bootImage != null)
-                        isoMetadata.AppendFormat("\tBootable image's SHA1: {0}", Sha1Context.Data(bootImage, out _)).
-                                    AppendLine();
+                        break;
                 }
-                else
-                    isoMetadata.AppendLine("\tNot bootable");
+
+                isoMetadata.AppendFormat("\tSystem type: 0x{0:X2}", initialEntry.system_type).AppendLine();
+
+                if(bootImage != null)
+                    isoMetadata.AppendFormat("\tBootable image's SHA1: {0}", Sha1Context.Data(bootImage, out _)).
+                                AppendLine();
+            }
+            else
+                isoMetadata.AppendLine("\tNot bootable");
+
+            toritoOff += EL_TORITO_ENTRY_SIZE;
+
+            const int sectionCounter = 2;
+
+            while(toritoOff < vdSector.Length &&
+                  (vdSector[toritoOff] == (byte)ElToritoIndicator.Header ||
+                   vdSector[toritoOff] == (byte)ElToritoIndicator.LastHeader))
+            {
+                ElToritoSectionHeaderEntry sectionHeader =
+                    Marshal.ByteArrayToStructureLittleEndian<ElToritoSectionHeaderEntry>(vdSector, toritoOff,
+                        EL_TORITO_ENTRY_SIZE);
 
                 toritoOff += EL_TORITO_ENTRY_SIZE;
 
-                const int sectionCounter = 2;
+                isoMetadata.AppendFormat("Boot section {0}:", sectionCounter);
 
-                while(toritoOff < vdSector.Length &&
-                      (vdSector[toritoOff] == (byte)ElToritoIndicator.Header ||
-                       vdSector[toritoOff] == (byte)ElToritoIndicator.LastHeader))
+                isoMetadata.AppendFormat("\tSection ID: {0}", Encoding.GetString(sectionHeader.identifier)).
+                            AppendLine();
+
+                for(int entryCounter = 1; entryCounter <= sectionHeader.entries && toritoOff < vdSector.Length;
+                    entryCounter++)
                 {
-                    ElToritoSectionHeaderEntry sectionHeader =
-                        Marshal.ByteArrayToStructureLittleEndian<ElToritoSectionHeaderEntry>(vdSector, toritoOff,
+                    ElToritoSectionEntry sectionEntry =
+                        Marshal.ByteArrayToStructureLittleEndian<ElToritoSectionEntry>(vdSector, toritoOff,
                             EL_TORITO_ENTRY_SIZE);
 
                     toritoOff += EL_TORITO_ENTRY_SIZE;
 
-                    isoMetadata.AppendFormat("Boot section {0}:", sectionCounter);
+                    isoMetadata.AppendFormat("\tEntry {0}:", entryCounter);
 
-                    isoMetadata.AppendFormat("\tSection ID: {0}", Encoding.GetString(sectionHeader.identifier)).
-                                AppendLine();
-
-                    for(int entryCounter = 1; entryCounter <= sectionHeader.entries && toritoOff < vdSector.Length;
-                        entryCounter++)
+                    if(sectionEntry.bootable == ElToritoIndicator.Bootable)
                     {
-                        ElToritoSectionEntry sectionEntry =
-                            Marshal.ByteArrayToStructureLittleEndian<ElToritoSectionEntry>(vdSector, toritoOff,
-                                EL_TORITO_ENTRY_SIZE);
+                        bootImage = null;
+
+                        if(sectionEntry.load_rba + partition.Start + sectionEntry.sector_count - 1 <= partition.End)
+                            imagePlugin.ReadSectors(sectionEntry.load_rba + partition.Start,
+                                                    sectionEntry.sector_count, out bootImage);
+
+                        isoMetadata.AppendFormat("\t\tBootable on {0}", sectionHeader.platform_id).AppendLine();
+
+                        isoMetadata.AppendFormat("\t\tBootable image starts at sector {0} and runs for {1} sectors",
+                                                 sectionEntry.load_rba, sectionEntry.sector_count).AppendLine();
+
+                        if(valentry.platform_id == ElToritoPlatform.x86)
+                            isoMetadata.AppendFormat("\t\tBootable image will be loaded at segment {0:X4}h",
+                                                     sectionEntry.load_seg == 0 ? 0x7C0 : sectionEntry.load_seg).
+                                        AppendLine();
+                        else
+                            isoMetadata.AppendFormat("\t\tBootable image will be loaded at 0x{0:X8}",
+                                                     (uint)sectionEntry.load_seg * 10).AppendLine();
+
+                        switch((ElToritoEmulation)((byte)sectionEntry.boot_type & 0xF))
+                        {
+                            case ElToritoEmulation.None:
+                                isoMetadata.AppendLine("\t\tImage uses no emulation");
+
+                                break;
+                            case ElToritoEmulation.Md2Hd:
+                                isoMetadata.
+                                    AppendLine("\t\tImage emulates a 5.25\" high-density (MD2HD, 1.2Mb) floppy");
+
+                                break;
+                            case ElToritoEmulation.Mf2Hd:
+                                isoMetadata.
+                                    AppendLine("\t\tImage emulates a 3.5\" high-density (MF2HD, 1.44Mb) floppy");
+
+                                break;
+                            case ElToritoEmulation.Mf2Ed:
+                                isoMetadata.
+                                    AppendLine("\t\tImage emulates a 3.5\" extra-density (MF2ED, 2.88Mb) floppy");
+
+                                break;
+                            default:
+                                isoMetadata.AppendFormat("\t\tImage uses unknown emulation type {0}",
+                                                         (byte)initialEntry.boot_type).AppendLine();
+
+                                break;
+                        }
+
+                        isoMetadata.AppendFormat("\t\tSelection criteria type: {0}",
+                                                 sectionEntry.selection_criteria_type).AppendLine();
+
+                        isoMetadata.AppendFormat("\t\tSystem type: 0x{0:X2}", sectionEntry.system_type).
+                                    AppendLine();
+
+                        if(bootImage != null)
+                            isoMetadata.AppendFormat("\t\tBootable image's SHA1: {0}",
+                                                     Sha1Context.Data(bootImage, out _)).AppendLine();
+                    }
+                    else
+                        isoMetadata.AppendLine("\t\tNot bootable");
+
+                    var flags = (ElToritoFlags)((byte)sectionEntry.boot_type & 0xF0);
+
+                    if(flags.HasFlag(ElToritoFlags.ATAPI))
+                        isoMetadata.AppendLine("\t\tImage contains ATAPI drivers");
+
+                    if(flags.HasFlag(ElToritoFlags.SCSI))
+                        isoMetadata.AppendLine("\t\tImage contains SCSI drivers");
+
+                    if(!flags.HasFlag(ElToritoFlags.Continued))
+                        continue;
+
+                    while(toritoOff < vdSector.Length)
+                    {
+                        ElToritoSectionEntryExtension sectionExtension =
+                            Marshal.ByteArrayToStructureLittleEndian<ElToritoSectionEntryExtension>(vdSector,
+                                toritoOff, EL_TORITO_ENTRY_SIZE);
 
                         toritoOff += EL_TORITO_ENTRY_SIZE;
 
-                        isoMetadata.AppendFormat("\tEntry {0}:", entryCounter);
-
-                        if(sectionEntry.bootable == ElToritoIndicator.Bootable)
-                        {
-                            bootImage = null;
-
-                            if(sectionEntry.load_rba + partition.Start + sectionEntry.sector_count - 1 <= partition.End)
-                                imagePlugin.ReadSectors(sectionEntry.load_rba + partition.Start,
-                                                        sectionEntry.sector_count, out bootImage);
-
-                            isoMetadata.AppendFormat("\t\tBootable on {0}", sectionHeader.platform_id).AppendLine();
-
-                            isoMetadata.AppendFormat("\t\tBootable image starts at sector {0} and runs for {1} sectors",
-                                                     sectionEntry.load_rba, sectionEntry.sector_count).AppendLine();
-
-                            if(valentry.platform_id == ElToritoPlatform.x86)
-                                isoMetadata.AppendFormat("\t\tBootable image will be loaded at segment {0:X4}h",
-                                                         sectionEntry.load_seg == 0 ? 0x7C0 : sectionEntry.load_seg).
-                                            AppendLine();
-                            else
-                                isoMetadata.AppendFormat("\t\tBootable image will be loaded at 0x{0:X8}",
-                                                         (uint)sectionEntry.load_seg * 10).AppendLine();
-
-                            switch((ElToritoEmulation)((byte)sectionEntry.boot_type & 0xF))
-                            {
-                                case ElToritoEmulation.None:
-                                    isoMetadata.AppendLine("\t\tImage uses no emulation");
-
-                                    break;
-                                case ElToritoEmulation.Md2Hd:
-                                    isoMetadata.
-                                        AppendLine("\t\tImage emulates a 5.25\" high-density (MD2HD, 1.2Mb) floppy");
-
-                                    break;
-                                case ElToritoEmulation.Mf2Hd:
-                                    isoMetadata.
-                                        AppendLine("\t\tImage emulates a 3.5\" high-density (MF2HD, 1.44Mb) floppy");
-
-                                    break;
-                                case ElToritoEmulation.Mf2Ed:
-                                    isoMetadata.
-                                        AppendLine("\t\tImage emulates a 3.5\" extra-density (MF2ED, 2.88Mb) floppy");
-
-                                    break;
-                                default:
-                                    isoMetadata.AppendFormat("\t\tImage uses unknown emulation type {0}",
-                                                             (byte)initialEntry.boot_type).AppendLine();
-
-                                    break;
-                            }
-
-                            isoMetadata.AppendFormat("\t\tSelection criteria type: {0}",
-                                                     sectionEntry.selection_criteria_type).AppendLine();
-
-                            isoMetadata.AppendFormat("\t\tSystem type: 0x{0:X2}", sectionEntry.system_type).
-                                        AppendLine();
-
-                            if(bootImage != null)
-                                isoMetadata.AppendFormat("\t\tBootable image's SHA1: {0}",
-                                                         Sha1Context.Data(bootImage, out _)).AppendLine();
-                        }
-                        else
-                            isoMetadata.AppendLine("\t\tNot bootable");
-
-                        var flags = (ElToritoFlags)((byte)sectionEntry.boot_type & 0xF0);
-
-                        if(flags.HasFlag(ElToritoFlags.ATAPI))
-                            isoMetadata.AppendLine("\t\tImage contains ATAPI drivers");
-
-                        if(flags.HasFlag(ElToritoFlags.SCSI))
-                            isoMetadata.AppendLine("\t\tImage contains SCSI drivers");
-
-                        if(!flags.HasFlag(ElToritoFlags.Continued))
-                            continue;
-
-                        while(toritoOff < vdSector.Length)
-                        {
-                            ElToritoSectionEntryExtension sectionExtension =
-                                Marshal.ByteArrayToStructureLittleEndian<ElToritoSectionEntryExtension>(vdSector,
-                                    toritoOff, EL_TORITO_ENTRY_SIZE);
-
-                            toritoOff += EL_TORITO_ENTRY_SIZE;
-
-                            if(!sectionExtension.extension_flags.HasFlag(ElToritoFlags.Continued))
-                                break;
-                        }
+                        if(!sectionExtension.extension_flags.HasFlag(ElToritoFlags.Continued))
+                            break;
                     }
-
-                    if(sectionHeader.header_id == ElToritoIndicator.LastHeader)
-                        break;
                 }
+
+                if(sectionHeader.header_id == ElToritoIndicator.LastHeader)
+                    break;
             }
-
-            exit_torito:
-
-            if(refareas.Count > 0)
-                isoMetadata.Append(suspInformation);
-
-            XmlFsType.Type = fsFormat;
-
-            if(jolietvd != null)
-            {
-                XmlFsType.VolumeName = decodedJolietVd.VolumeIdentifier;
-
-                if(string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ||
-                   decodedVd.SystemIdentifier.Length > decodedJolietVd.SystemIdentifier.Length)
-                    XmlFsType.SystemIdentifier = decodedVd.SystemIdentifier;
-                else
-                    XmlFsType.SystemIdentifier = string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ? null
-                                                     : decodedJolietVd.SystemIdentifier;
-
-                if(string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) ||
-                   decodedVd.VolumeSetIdentifier.Length > decodedJolietVd.VolumeSetIdentifier.Length)
-                    XmlFsType.VolumeSetIdentifier = decodedVd.VolumeSetIdentifier;
-                else
-                    XmlFsType.VolumeSetIdentifier = string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) ? null
-                                                        : decodedJolietVd.VolumeSetIdentifier;
-
-                if(string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) ||
-                   decodedVd.PublisherIdentifier.Length > decodedJolietVd.PublisherIdentifier.Length)
-                    XmlFsType.PublisherIdentifier = decodedVd.PublisherIdentifier;
-                else
-                    XmlFsType.PublisherIdentifier = string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) ? null
-                                                        : decodedJolietVd.PublisherIdentifier;
-
-                if(string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier) ||
-                   decodedVd.DataPreparerIdentifier.Length > decodedJolietVd.DataPreparerIdentifier.Length)
-                    XmlFsType.DataPreparerIdentifier = decodedVd.DataPreparerIdentifier;
-                else
-                    XmlFsType.DataPreparerIdentifier = string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier)
-                                                           ? null : decodedJolietVd.DataPreparerIdentifier;
-
-                if(string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ||
-                   decodedVd.ApplicationIdentifier.Length > decodedJolietVd.ApplicationIdentifier.Length)
-                    XmlFsType.ApplicationIdentifier = decodedVd.ApplicationIdentifier;
-                else
-                    XmlFsType.ApplicationIdentifier = string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ? null
-                                                          : decodedJolietVd.ApplicationIdentifier;
-
-                XmlFsType.CreationDate          = decodedJolietVd.CreationTime;
-                XmlFsType.CreationDateSpecified = true;
-
-                if(decodedJolietVd.HasModificationTime)
-                {
-                    XmlFsType.ModificationDate          = decodedJolietVd.ModificationTime;
-                    XmlFsType.ModificationDateSpecified = true;
-                }
-
-                if(decodedJolietVd.HasExpirationTime)
-                {
-                    XmlFsType.ExpirationDate          = decodedJolietVd.ExpirationTime;
-                    XmlFsType.ExpirationDateSpecified = true;
-                }
-
-                if(decodedJolietVd.HasEffectiveTime)
-                {
-                    XmlFsType.EffectiveDate          = decodedJolietVd.EffectiveTime;
-                    XmlFsType.EffectiveDateSpecified = true;
-                }
-            }
-            else
-            {
-                XmlFsType.SystemIdentifier       = decodedVd.SystemIdentifier;
-                XmlFsType.VolumeName             = decodedVd.VolumeIdentifier;
-                XmlFsType.VolumeSetIdentifier    = decodedVd.VolumeSetIdentifier;
-                XmlFsType.PublisherIdentifier    = decodedVd.PublisherIdentifier;
-                XmlFsType.DataPreparerIdentifier = decodedVd.DataPreparerIdentifier;
-                XmlFsType.ApplicationIdentifier  = decodedVd.ApplicationIdentifier;
-                XmlFsType.CreationDate           = decodedVd.CreationTime;
-                XmlFsType.CreationDateSpecified  = true;
-
-                if(decodedVd.HasModificationTime)
-                {
-                    XmlFsType.ModificationDate          = decodedVd.ModificationTime;
-                    XmlFsType.ModificationDateSpecified = true;
-                }
-
-                if(decodedVd.HasExpirationTime)
-                {
-                    XmlFsType.ExpirationDate          = decodedVd.ExpirationTime;
-                    XmlFsType.ExpirationDateSpecified = true;
-                }
-
-                if(decodedVd.HasEffectiveTime)
-                {
-                    XmlFsType.EffectiveDate          = decodedVd.EffectiveTime;
-                    XmlFsType.EffectiveDateSpecified = true;
-                }
-            }
-
-            XmlFsType.Bootable    |= bvd != null || segaCd != null || saturn != null || dreamcast != null;
-            XmlFsType.Clusters    =  decodedVd.Blocks;
-            XmlFsType.ClusterSize =  decodedVd.BlockSize;
-
-            information = isoMetadata.ToString();
         }
+
+        exit_torito:
+
+        if(refareas.Count > 0)
+            isoMetadata.Append(suspInformation);
+
+        XmlFsType.Type = fsFormat;
+
+        if(jolietvd != null)
+        {
+            XmlFsType.VolumeName = decodedJolietVd.VolumeIdentifier;
+
+            if(string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ||
+               decodedVd.SystemIdentifier.Length > decodedJolietVd.SystemIdentifier.Length)
+                XmlFsType.SystemIdentifier = decodedVd.SystemIdentifier;
+            else
+                XmlFsType.SystemIdentifier = string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ? null
+                                                 : decodedJolietVd.SystemIdentifier;
+
+            if(string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) ||
+               decodedVd.VolumeSetIdentifier.Length > decodedJolietVd.VolumeSetIdentifier.Length)
+                XmlFsType.VolumeSetIdentifier = decodedVd.VolumeSetIdentifier;
+            else
+                XmlFsType.VolumeSetIdentifier = string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) ? null
+                                                    : decodedJolietVd.VolumeSetIdentifier;
+
+            if(string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) ||
+               decodedVd.PublisherIdentifier.Length > decodedJolietVd.PublisherIdentifier.Length)
+                XmlFsType.PublisherIdentifier = decodedVd.PublisherIdentifier;
+            else
+                XmlFsType.PublisherIdentifier = string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) ? null
+                                                    : decodedJolietVd.PublisherIdentifier;
+
+            if(string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier) ||
+               decodedVd.DataPreparerIdentifier.Length > decodedJolietVd.DataPreparerIdentifier.Length)
+                XmlFsType.DataPreparerIdentifier = decodedVd.DataPreparerIdentifier;
+            else
+                XmlFsType.DataPreparerIdentifier = string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier)
+                                                       ? null : decodedJolietVd.DataPreparerIdentifier;
+
+            if(string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ||
+               decodedVd.ApplicationIdentifier.Length > decodedJolietVd.ApplicationIdentifier.Length)
+                XmlFsType.ApplicationIdentifier = decodedVd.ApplicationIdentifier;
+            else
+                XmlFsType.ApplicationIdentifier = string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ? null
+                                                      : decodedJolietVd.ApplicationIdentifier;
+
+            XmlFsType.CreationDate          = decodedJolietVd.CreationTime;
+            XmlFsType.CreationDateSpecified = true;
+
+            if(decodedJolietVd.HasModificationTime)
+            {
+                XmlFsType.ModificationDate          = decodedJolietVd.ModificationTime;
+                XmlFsType.ModificationDateSpecified = true;
+            }
+
+            if(decodedJolietVd.HasExpirationTime)
+            {
+                XmlFsType.ExpirationDate          = decodedJolietVd.ExpirationTime;
+                XmlFsType.ExpirationDateSpecified = true;
+            }
+
+            if(decodedJolietVd.HasEffectiveTime)
+            {
+                XmlFsType.EffectiveDate          = decodedJolietVd.EffectiveTime;
+                XmlFsType.EffectiveDateSpecified = true;
+            }
+        }
+        else
+        {
+            XmlFsType.SystemIdentifier       = decodedVd.SystemIdentifier;
+            XmlFsType.VolumeName             = decodedVd.VolumeIdentifier;
+            XmlFsType.VolumeSetIdentifier    = decodedVd.VolumeSetIdentifier;
+            XmlFsType.PublisherIdentifier    = decodedVd.PublisherIdentifier;
+            XmlFsType.DataPreparerIdentifier = decodedVd.DataPreparerIdentifier;
+            XmlFsType.ApplicationIdentifier  = decodedVd.ApplicationIdentifier;
+            XmlFsType.CreationDate           = decodedVd.CreationTime;
+            XmlFsType.CreationDateSpecified  = true;
+
+            if(decodedVd.HasModificationTime)
+            {
+                XmlFsType.ModificationDate          = decodedVd.ModificationTime;
+                XmlFsType.ModificationDateSpecified = true;
+            }
+
+            if(decodedVd.HasExpirationTime)
+            {
+                XmlFsType.ExpirationDate          = decodedVd.ExpirationTime;
+                XmlFsType.ExpirationDateSpecified = true;
+            }
+
+            if(decodedVd.HasEffectiveTime)
+            {
+                XmlFsType.EffectiveDate          = decodedVd.EffectiveTime;
+                XmlFsType.EffectiveDateSpecified = true;
+            }
+        }
+
+        XmlFsType.Bootable    |= bvd != null || segaCd != null || saturn != null || dreamcast != null;
+        XmlFsType.Clusters    =  decodedVd.Blocks;
+        XmlFsType.ClusterSize =  decodedVd.BlockSize;
+
+        information = isoMetadata.ToString();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Mode2.cs b/Aaru.Filesystems/ISO9660/Mode2.cs
index 5fd96a531..cae145911 100644
--- a/Aaru.Filesystems/ISO9660/Mode2.cs
+++ b/Aaru.Filesystems/ISO9660/Mode2.cs
@@ -37,34 +37,109 @@ using Aaru.CommonTypes.Enums;
 using Aaru.Console;
 using Aaru.Decoders.CD;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    ErrorNumber ReadSector(ulong sector, out byte[] buffer, bool interleaved = false, byte fileNumber = 0)
     {
-        ErrorNumber ReadSector(ulong sector, out byte[] buffer, bool interleaved = false, byte fileNumber = 0)
+        ulong       realSector;
+        uint        sectorCount;
+        ErrorNumber errno;
+        buffer = null;
+
+        sectorCount = (uint)_blockSize / 2048;
+
+        if(_blockSize % 2048 > 0)
+            sectorCount++;
+
+        realSector = sector * _blockSize / 2048;
+
+        ulong offset = sector * _blockSize % 2048;
+
+        byte[] data;
+
+        if(sectorCount == 1)
         {
-            ulong       realSector;
-            uint        sectorCount;
-            ErrorNumber errno;
-            buffer = null;
+            errno = _image.ReadSectorLong(realSector, out data);
 
-            sectorCount = (uint)_blockSize / 2048;
+            if(errno != ErrorNumber.NoError)
+                errno = _image.ReadSector(realSector, out data);
 
-            if(_blockSize % 2048 > 0)
-                sectorCount++;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            realSector = sector * _blockSize / 2048;
-
-            ulong offset = sector * _blockSize % 2048;
-
-            byte[] data;
-
-            if(sectorCount == 1)
+            if(_debug)
             {
-                errno = _image.ReadSectorLong(realSector, out data);
+                switch(data.Length)
+                {
+                    case 2048:
+                        AaruConsole.DebugWriteLine("ISO9660 Plugin", "Sector {0}, Cooked, Mode 0/1 / Mode 2 Form 1",
+                                                   realSector);
+
+                        break;
+                    case 2324:
+                        AaruConsole.DebugWriteLine("ISO9660 Plugin", "Sector {0}, Cooked, Mode 2 Form 2",
+                                                   realSector);
+
+                        break;
+                    case 2336:
+                        AaruConsole.DebugWriteLine("ISO9660 Plugin",
+                                                   "Sector {0}, Cooked, Mode 2 Form {1}, File Number {2}, Channel Number {3}, Submode {4}, Coding Information {5}",
+                                                   realSector,
+                                                   ((Mode2Submode)data[2]).HasFlag(Mode2Submode.Form2) ? 2 : 1,
+                                                   data[0], data[1], (Mode2Submode)data[2], data[3]);
+
+                        break;
+                    case 2352 when data[0] != 0x00 || data[1] != 0xFF || data[2]  != 0xFF || data[3]  != 0xFF ||
+                                   data[4] != 0xFF || data[5] != 0xFF || data[6]  != 0xFF || data[7]  != 0xFF ||
+                                   data[8] != 0xFF || data[9] != 0xFF || data[10] != 0xFF || data[11] != 0x00:
+                        AaruConsole.DebugWriteLine("ISO9660 Plugin", "Sector {0}, Raw, Audio", realSector);
+
+                        break;
+                    case 2352 when data[15] != 2:
+                        AaruConsole.DebugWriteLine("ISO9660 Plugin",
+                                                   "Sector {0} ({1:X2}:{2:X2}:{3:X2}), Raw, Mode {4}", realSector,
+                                                   data[12], data[13], data[14], data[15]);
+
+                        break;
+                    case 2352:
+                        AaruConsole.DebugWriteLine("ISO9660 Plugin",
+                                                   "Sector {0} ({1:X2}:{2:X2}:{3:X2}), Raw, Mode 2 Form {4}, File Number {5}, Channel Number {6}, Submode {7}, Coding Information {8}",
+                                                   realSector, data[12], data[13], data[14],
+                                                   ((Mode2Submode)data[18]).HasFlag(Mode2Submode.Form2) ? 2 : 1,
+                                                   data[16], data[17], (Mode2Submode)data[18], data[19]);
+
+                        break;
+                }
+            }
+
+            if(_blockSize == 2048)
+            {
+                buffer = Sector.GetUserData(data, interleaved, fileNumber);
+
+                return ErrorNumber.NoError;
+            }
+
+            byte[] tmp = new byte[_blockSize];
+            Array.Copy(Sector.GetUserData(data, interleaved, fileNumber), (int)offset, tmp, 0, _blockSize);
+
+            buffer = tmp;
+
+            return errno;
+        }
+        else
+        {
+            var ms = new MemoryStream();
+
+            for(uint i = 0; i < sectorCount; i++)
+            {
+                ulong dstSector = realSector + 1;
+
+                errno = _image.ReadSectorLong(dstSector, out data);
 
                 if(errno != ErrorNumber.NoError)
-                    errno = _image.ReadSector(realSector, out data);
+                    errno = _image.ReadSector(dstSector, out data);
 
                 if(errno != ErrorNumber.NoError)
                     return errno;
@@ -74,19 +149,19 @@ namespace Aaru.Filesystems
                     switch(data.Length)
                     {
                         case 2048:
-                            AaruConsole.DebugWriteLine("ISO9660 Plugin", "Sector {0}, Cooked, Mode 0/1 / Mode 2 Form 1",
-                                                       realSector);
+                            AaruConsole.DebugWriteLine("ISO9660 Plugin",
+                                                       "Sector {0}, Cooked, Mode 0/1 / Mode 2 Form 1", dstSector);
 
                             break;
                         case 2324:
                             AaruConsole.DebugWriteLine("ISO9660 Plugin", "Sector {0}, Cooked, Mode 2 Form 2",
-                                                       realSector);
+                                                       dstSector);
 
                             break;
                         case 2336:
                             AaruConsole.DebugWriteLine("ISO9660 Plugin",
                                                        "Sector {0}, Cooked, Mode 2 Form {1}, File Number {2}, Channel Number {3}, Submode {4}, Coding Information {5}",
-                                                       realSector,
+                                                       dstSector,
                                                        ((Mode2Submode)data[2]).HasFlag(Mode2Submode.Form2) ? 2 : 1,
                                                        data[0], data[1], (Mode2Submode)data[2], data[3]);
 
@@ -94,19 +169,19 @@ namespace Aaru.Filesystems
                         case 2352 when data[0] != 0x00 || data[1] != 0xFF || data[2]  != 0xFF || data[3]  != 0xFF ||
                                        data[4] != 0xFF || data[5] != 0xFF || data[6]  != 0xFF || data[7]  != 0xFF ||
                                        data[8] != 0xFF || data[9] != 0xFF || data[10] != 0xFF || data[11] != 0x00:
-                            AaruConsole.DebugWriteLine("ISO9660 Plugin", "Sector {0}, Raw, Audio", realSector);
+                            AaruConsole.DebugWriteLine("ISO9660 Plugin", "Sector {0}, Raw, Audio", dstSector);
 
                             break;
                         case 2352 when data[15] != 2:
                             AaruConsole.DebugWriteLine("ISO9660 Plugin",
-                                                       "Sector {0} ({1:X2}:{2:X2}:{3:X2}), Raw, Mode {4}", realSector,
-                                                       data[12], data[13], data[14], data[15]);
+                                                       "Sector {0} ({1:X2}:{2:X2}:{3:X2}), Raw, Mode {4}",
+                                                       dstSector, data[12], data[13], data[14], data[15]);
 
                             break;
                         case 2352:
                             AaruConsole.DebugWriteLine("ISO9660 Plugin",
                                                        "Sector {0} ({1:X2}:{2:X2}:{3:X2}), Raw, Mode 2 Form {4}, File Number {5}, Channel Number {6}, Submode {7}, Coding Information {8}",
-                                                       realSector, data[12], data[13], data[14],
+                                                       dstSector, data[12], data[13], data[14],
                                                        ((Mode2Submode)data[18]).HasFlag(Mode2Submode.Form2) ? 2 : 1,
                                                        data[16], data[17], (Mode2Submode)data[18], data[19]);
 
@@ -114,92 +189,16 @@ namespace Aaru.Filesystems
                     }
                 }
 
-                if(_blockSize == 2048)
-                {
-                    buffer = Sector.GetUserData(data, interleaved, fileNumber);
+                byte[] sectorData = Sector.GetUserData(data, interleaved, fileNumber);
 
-                    return ErrorNumber.NoError;
-                }
-
-                byte[] tmp = new byte[_blockSize];
-                Array.Copy(Sector.GetUserData(data, interleaved, fileNumber), (int)offset, tmp, 0, _blockSize);
-
-                buffer = tmp;
-
-                return errno;
+                ms.Write(sectorData, 0, sectorData.Length);
             }
-            else
-            {
-                var ms = new MemoryStream();
 
-                for(uint i = 0; i < sectorCount; i++)
-                {
-                    ulong dstSector = realSector + 1;
+            byte[] tmp = new byte[_blockSize];
+            Array.Copy(Sector.GetUserData(ms.ToArray(), interleaved, fileNumber), 0, tmp, 0, _blockSize);
+            buffer = tmp;
 
-                    errno = _image.ReadSectorLong(dstSector, out data);
-
-                    if(errno != ErrorNumber.NoError)
-                        errno = _image.ReadSector(dstSector, out data);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    if(_debug)
-                    {
-                        switch(data.Length)
-                        {
-                            case 2048:
-                                AaruConsole.DebugWriteLine("ISO9660 Plugin",
-                                                           "Sector {0}, Cooked, Mode 0/1 / Mode 2 Form 1", dstSector);
-
-                                break;
-                            case 2324:
-                                AaruConsole.DebugWriteLine("ISO9660 Plugin", "Sector {0}, Cooked, Mode 2 Form 2",
-                                                           dstSector);
-
-                                break;
-                            case 2336:
-                                AaruConsole.DebugWriteLine("ISO9660 Plugin",
-                                                           "Sector {0}, Cooked, Mode 2 Form {1}, File Number {2}, Channel Number {3}, Submode {4}, Coding Information {5}",
-                                                           dstSector,
-                                                           ((Mode2Submode)data[2]).HasFlag(Mode2Submode.Form2) ? 2 : 1,
-                                                           data[0], data[1], (Mode2Submode)data[2], data[3]);
-
-                                break;
-                            case 2352 when data[0] != 0x00 || data[1] != 0xFF || data[2]  != 0xFF || data[3]  != 0xFF ||
-                                           data[4] != 0xFF || data[5] != 0xFF || data[6]  != 0xFF || data[7]  != 0xFF ||
-                                           data[8] != 0xFF || data[9] != 0xFF || data[10] != 0xFF || data[11] != 0x00:
-                                AaruConsole.DebugWriteLine("ISO9660 Plugin", "Sector {0}, Raw, Audio", dstSector);
-
-                                break;
-                            case 2352 when data[15] != 2:
-                                AaruConsole.DebugWriteLine("ISO9660 Plugin",
-                                                           "Sector {0} ({1:X2}:{2:X2}:{3:X2}), Raw, Mode {4}",
-                                                           dstSector, data[12], data[13], data[14], data[15]);
-
-                                break;
-                            case 2352:
-                                AaruConsole.DebugWriteLine("ISO9660 Plugin",
-                                                           "Sector {0} ({1:X2}:{2:X2}:{3:X2}), Raw, Mode 2 Form {4}, File Number {5}, Channel Number {6}, Submode {7}, Coding Information {8}",
-                                                           dstSector, data[12], data[13], data[14],
-                                                           ((Mode2Submode)data[18]).HasFlag(Mode2Submode.Form2) ? 2 : 1,
-                                                           data[16], data[17], (Mode2Submode)data[18], data[19]);
-
-                                break;
-                        }
-                    }
-
-                    byte[] sectorData = Sector.GetUserData(data, interleaved, fileNumber);
-
-                    ms.Write(sectorData, 0, sectorData.Length);
-                }
-
-                byte[] tmp = new byte[_blockSize];
-                Array.Copy(Sector.GetUserData(ms.ToArray(), interleaved, fileNumber), 0, tmp, 0, _blockSize);
-                buffer = tmp;
-
-                return ErrorNumber.NoError;
-            }
+            return ErrorNumber.NoError;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/PathTable.cs b/Aaru.Filesystems/ISO9660/PathTable.cs
index 95c443fcf..1f864506d 100644
--- a/Aaru.Filesystems/ISO9660/PathTable.cs
+++ b/Aaru.Filesystems/ISO9660/PathTable.cs
@@ -34,94 +34,93 @@
 using System.Collections.Generic;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    PathTableEntryInternal[] DecodePathTable(byte[] data)
     {
-        PathTableEntryInternal[] DecodePathTable(byte[] data)
+        if(data is null || data.Length == 0)
+            return null;
+
+        List<PathTableEntryInternal> table = new List<PathTableEntryInternal>();
+
+        int off = 0;
+
+        PathTableEntry entry =
+            Marshal.ByteArrayToStructureBigEndian<PathTableEntry>(data, off, Marshal.SizeOf<PathTableEntry>());
+
+        if(entry.name_len                         != 1                                ||
+           entry.parent_dirno                     != 1                                ||
+           data.Length                            <= Marshal.SizeOf<PathTableEntry>() ||
+           data[Marshal.SizeOf<PathTableEntry>()] != 0x00)
+            return null;
+
+        while(off < data.Length)
         {
-            if(data is null || data.Length == 0)
-                return null;
-
-            List<PathTableEntryInternal> table = new List<PathTableEntryInternal>();
-
-            int off = 0;
-
-            PathTableEntry entry =
+            entry =
                 Marshal.ByteArrayToStructureBigEndian<PathTableEntry>(data, off, Marshal.SizeOf<PathTableEntry>());
 
-            if(entry.name_len                         != 1                                ||
-               entry.parent_dirno                     != 1                                ||
-               data.Length                            <= Marshal.SizeOf<PathTableEntry>() ||
-               data[Marshal.SizeOf<PathTableEntry>()] != 0x00)
-                return null;
+            if(entry.name_len == 0)
+                break;
 
-            while(off < data.Length)
+            off += Marshal.SizeOf<PathTableEntry>();
+
+            string name = Encoding.GetString(data, off, entry.name_len);
+
+            table.Add(new PathTableEntryInternal
             {
-                entry =
-                    Marshal.ByteArrayToStructureBigEndian<PathTableEntry>(data, off, Marshal.SizeOf<PathTableEntry>());
+                Extent      = entry.start_lbn,
+                Name        = name,
+                Parent      = entry.parent_dirno,
+                XattrLength = entry.xattr_len
+            });
 
-                if(entry.name_len == 0)
-                    break;
+            off += entry.name_len;
 
-                off += Marshal.SizeOf<PathTableEntry>();
-
-                string name = Encoding.GetString(data, off, entry.name_len);
-
-                table.Add(new PathTableEntryInternal
-                {
-                    Extent      = entry.start_lbn,
-                    Name        = name,
-                    Parent      = entry.parent_dirno,
-                    XattrLength = entry.xattr_len
-                });
-
-                off += entry.name_len;
-
-                if(entry.name_len % 2 != 0)
-                    off++;
-            }
-
-            return table.ToArray();
+            if(entry.name_len % 2 != 0)
+                off++;
         }
 
-        PathTableEntryInternal[] DecodeHighSierraPathTable(byte[] data)
+        return table.ToArray();
+    }
+
+    PathTableEntryInternal[] DecodeHighSierraPathTable(byte[] data)
+    {
+        if(data is null)
+            return null;
+
+        List<PathTableEntryInternal> table = new List<PathTableEntryInternal>();
+
+        int off = 0;
+
+        while(off < data.Length)
         {
-            if(data is null)
-                return null;
+            HighSierraPathTableEntry entry =
+                Marshal.ByteArrayToStructureBigEndian<HighSierraPathTableEntry>(data, off,
+                                                                                    Marshal.SizeOf<HighSierraPathTableEntry>());
 
-            List<PathTableEntryInternal> table = new List<PathTableEntryInternal>();
+            if(entry.name_len == 0)
+                break;
 
-            int off = 0;
+            off += Marshal.SizeOf<HighSierraPathTableEntry>();
 
-            while(off < data.Length)
+            string name = Encoding.GetString(data, off, entry.name_len);
+
+            table.Add(new PathTableEntryInternal
             {
-                HighSierraPathTableEntry entry =
-                    Marshal.ByteArrayToStructureBigEndian<HighSierraPathTableEntry>(data, off,
-                        Marshal.SizeOf<HighSierraPathTableEntry>());
+                Extent      = entry.start_lbn,
+                Name        = name,
+                Parent      = entry.parent_dirno,
+                XattrLength = entry.xattr_len
+            });
 
-                if(entry.name_len == 0)
-                    break;
+            off += entry.name_len;
 
-                off += Marshal.SizeOf<HighSierraPathTableEntry>();
-
-                string name = Encoding.GetString(data, off, entry.name_len);
-
-                table.Add(new PathTableEntryInternal
-                {
-                    Extent      = entry.start_lbn,
-                    Name        = name,
-                    Parent      = entry.parent_dirno,
-                    XattrLength = entry.xattr_len
-                });
-
-                off += entry.name_len;
-
-                if(entry.name_len % 2 != 0)
-                    off++;
-            }
-
-            return table.ToArray();
+            if(entry.name_len % 2 != 0)
+                off++;
         }
+
+        return table.ToArray();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/Amiga.cs b/Aaru.Filesystems/ISO9660/Structs/Amiga.cs
index 52070169c..dd79add7c 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Amiga.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Amiga.cs
@@ -33,29 +33,28 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AmigaEntry
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AmigaEntry
-        {
-            public readonly ushort     signature;
-            public readonly byte       length;
-            public readonly byte       version;
-            public readonly AmigaFlags flags;
+        public readonly ushort     signature;
+        public readonly byte       length;
+        public readonly byte       version;
+        public readonly AmigaFlags flags;
 
-            // Followed by AmigaProtection if present
-            // Followed by length-prefixed string for comment if present
-        }
+        // Followed by AmigaProtection if present
+        // Followed by length-prefixed string for comment if present
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AmigaProtection
-        {
-            public readonly byte            User;
-            public readonly byte            Reserved;
-            public readonly AmigaMultiuser  Multiuser;
-            public readonly AmigaAttributes Protection;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AmigaProtection
+    {
+        public readonly byte            User;
+        public readonly byte            Reserved;
+        public readonly AmigaMultiuser  Multiuser;
+        public readonly AmigaAttributes Protection;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/Apple.cs b/Aaru.Filesystems/ISO9660/Structs/Apple.cs
index d9b3d0657..b41b345e0 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Apple.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Apple.cs
@@ -33,74 +33,73 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    // Little-endian
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AppleProDOSSystemUse
     {
-        // Little-endian
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AppleProDOSSystemUse
-        {
-            public readonly ushort  signature;
-            public readonly byte    length;
-            public readonly AppleId id;
-            public readonly byte    type;
-            public readonly ushort  aux_type;
-        }
+        public readonly ushort  signature;
+        public readonly byte    length;
+        public readonly AppleId id;
+        public readonly byte    type;
+        public readonly ushort  aux_type;
+    }
 
-        // Big-endian
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AppleHFSSystemUse
-        {
-            public readonly ushort                  signature;
-            public readonly byte                    length;
-            public readonly AppleId                 id;
-            public readonly uint                    type;
-            public readonly uint                    creator;
-            public readonly AppleCommon.FinderFlags finder_flags;
-        }
+    // Big-endian
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AppleHFSSystemUse
+    {
+        public readonly ushort                  signature;
+        public readonly byte                    length;
+        public readonly AppleId                 id;
+        public readonly uint                    type;
+        public readonly uint                    creator;
+        public readonly AppleCommon.FinderFlags finder_flags;
+    }
 
-        // Little-endian
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AppleProDOSOldSystemUse
-        {
-            public readonly ushort     signature;
-            public readonly AppleOldId id;
-            public readonly byte       type;
-            public readonly ushort     aux_type;
-        }
+    // Little-endian
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AppleProDOSOldSystemUse
+    {
+        public readonly ushort     signature;
+        public readonly AppleOldId id;
+        public readonly byte       type;
+        public readonly ushort     aux_type;
+    }
 
-        // Big-endian
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AppleHFSTypeCreatorSystemUse
-        {
-            public readonly ushort     signature;
-            public readonly AppleOldId id;
-            public readonly uint       type;
-            public readonly uint       creator;
-        }
+    // Big-endian
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AppleHFSTypeCreatorSystemUse
+    {
+        public readonly ushort     signature;
+        public readonly AppleOldId id;
+        public readonly uint       type;
+        public readonly uint       creator;
+    }
 
-        // Big-endian
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AppleHFSIconSystemUse
-        {
-            public readonly ushort     signature;
-            public readonly AppleOldId id;
-            public readonly uint       type;
-            public readonly uint       creator;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] icon;
-        }
+    // Big-endian
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AppleHFSIconSystemUse
+    {
+        public readonly ushort     signature;
+        public readonly AppleOldId id;
+        public readonly uint       type;
+        public readonly uint       creator;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] icon;
+    }
 
-        // Big-endian
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AppleHFSOldSystemUse
-        {
-            public readonly ushort     signature;
-            public readonly AppleOldId id;
-            public readonly uint       type;
-            public readonly uint       creator;
-            public readonly ushort     finder_flags;
-        }
+    // Big-endian
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AppleHFSOldSystemUse
+    {
+        public readonly ushort     signature;
+        public readonly AppleOldId id;
+        public readonly uint       type;
+        public readonly uint       creator;
+        public readonly ushort     finder_flags;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/CDi.cs b/Aaru.Filesystems/ISO9660/Structs/CDi.cs
index 87c8da9ae..041286f1f 100644
--- a/Aaru.Filesystems/ISO9660/Structs/CDi.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/CDi.cs
@@ -35,162 +35,161 @@ using System;
 using System.Runtime.InteropServices;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    static DecodedVolumeDescriptor DecodeVolumeDescriptor(FileStructureVolumeDescriptor pvd)
     {
-        static DecodedVolumeDescriptor DecodeVolumeDescriptor(FileStructureVolumeDescriptor pvd)
+        var decodedVd = new DecodedVolumeDescriptor
         {
-            var decodedVd = new DecodedVolumeDescriptor
-            {
-                SystemIdentifier       = StringHandlers.CToString(pvd.system_id).TrimEnd(),
-                VolumeIdentifier       = StringHandlers.CToString(pvd.volume_id).TrimEnd(),
-                VolumeSetIdentifier    = StringHandlers.CToString(pvd.volume_set_id).TrimEnd(),
-                PublisherIdentifier    = StringHandlers.CToString(pvd.publisher_id).TrimEnd(),
-                DataPreparerIdentifier = StringHandlers.CToString(pvd.preparer_id).TrimEnd(),
-                ApplicationIdentifier  = StringHandlers.CToString(pvd.application_data).TrimEnd()
-            };
+            SystemIdentifier       = StringHandlers.CToString(pvd.system_id).TrimEnd(),
+            VolumeIdentifier       = StringHandlers.CToString(pvd.volume_id).TrimEnd(),
+            VolumeSetIdentifier    = StringHandlers.CToString(pvd.volume_set_id).TrimEnd(),
+            PublisherIdentifier    = StringHandlers.CToString(pvd.publisher_id).TrimEnd(),
+            DataPreparerIdentifier = StringHandlers.CToString(pvd.preparer_id).TrimEnd(),
+            ApplicationIdentifier  = StringHandlers.CToString(pvd.application_data).TrimEnd()
+        };
 
-            if(pvd.creation_date[0] == '0' ||
-               pvd.creation_date[0] == 0x00)
-                decodedVd.CreationTime = DateTime.MinValue;
-            else
-                decodedVd.CreationTime = DateHandlers.HighSierraToDateTime(pvd.creation_date);
+        if(pvd.creation_date[0] == '0' ||
+           pvd.creation_date[0] == 0x00)
+            decodedVd.CreationTime = DateTime.MinValue;
+        else
+            decodedVd.CreationTime = DateHandlers.HighSierraToDateTime(pvd.creation_date);
 
-            if(pvd.modification_date[0] == '0' ||
-               pvd.modification_date[0] == 0x00)
-                decodedVd.HasModificationTime = false;
-            else
-            {
-                decodedVd.HasModificationTime = true;
-                decodedVd.ModificationTime    = DateHandlers.HighSierraToDateTime(pvd.modification_date);
-            }
-
-            if(pvd.expiration_date[0] == '0' ||
-               pvd.expiration_date[0] == 0x00)
-                decodedVd.HasExpirationTime = false;
-            else
-            {
-                decodedVd.HasExpirationTime = true;
-                decodedVd.ExpirationTime    = DateHandlers.HighSierraToDateTime(pvd.expiration_date);
-            }
-
-            if(pvd.effective_date[0] == '0' ||
-               pvd.effective_date[0] == 0x00)
-                decodedVd.HasEffectiveTime = false;
-            else
-            {
-                decodedVd.HasEffectiveTime = true;
-                decodedVd.EffectiveTime    = DateHandlers.HighSierraToDateTime(pvd.effective_date);
-            }
-
-            decodedVd.Blocks    = pvd.volume_space_size;
-            decodedVd.BlockSize = pvd.logical_block_size;
-
-            return decodedVd;
+        if(pvd.modification_date[0] == '0' ||
+           pvd.modification_date[0] == 0x00)
+            decodedVd.HasModificationTime = false;
+        else
+        {
+            decodedVd.HasModificationTime = true;
+            decodedVd.ModificationTime    = DateHandlers.HighSierraToDateTime(pvd.modification_date);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct FileStructureVolumeDescriptor
+        if(pvd.expiration_date[0] == '0' ||
+           pvd.expiration_date[0] == 0x00)
+            decodedVd.HasExpirationTime = false;
+        else
         {
-            public readonly byte type;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] id;
-            public readonly byte           version;
-            public readonly CdiVolumeFlags flags;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] system_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] volume_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] reserved1;
-            public readonly uint volume_space_size;
-
-            // Only used in SVDs
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] escape_sequences;
-            public readonly ushort reserved2;
-            public readonly ushort volume_set_size;
-            public readonly ushort reserved3;
-            public readonly ushort volume_sequence_number;
-            public readonly ushort reserved4;
-            public readonly ushort logical_block_size;
-            public readonly uint   reserved5;
-            public readonly uint   path_table_size;
-            public readonly ulong  reserved6;
-            public readonly uint   path_table_addr;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 38)]
-            public readonly byte[] reserved7;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] volume_set_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] publisher_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] preparer_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] application_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] copyright_file_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] reserved8;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] abstract_file_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] reserved9;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] bibliographic_file_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] reserved10;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] creation_date;
-            public readonly byte reserved11;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] modification_date;
-            public readonly byte reserved12;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] expiration_date;
-            public readonly byte reserved13;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] effective_date;
-            public readonly byte reserved14;
-            public readonly byte file_structure_version;
-            public readonly byte reserved15;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public readonly byte[] application_data;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 653)]
-            public readonly byte[] reserved16;
+            decodedVd.HasExpirationTime = true;
+            decodedVd.ExpirationTime    = DateHandlers.HighSierraToDateTime(pvd.expiration_date);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CdiDirectoryRecord
+        if(pvd.effective_date[0] == '0' ||
+           pvd.effective_date[0] == 0x00)
+            decodedVd.HasEffectiveTime = false;
+        else
         {
-            public readonly byte                length;
-            public readonly byte                xattr_len;
-            public readonly uint                reserved1;
-            public readonly uint                start_lbn;
-            public readonly uint                reserved2;
-            public readonly uint                size;
-            public readonly HighSierraTimestamp date;
-            public readonly byte                reserved3;
-            public readonly CdiFileFlags        flags;
-            public readonly ushort              file_unit_size;
-            public readonly ushort              reserved4;
-            public readonly ushort              volume_sequence_number;
-            public readonly byte                name_len;
-
-            // Followed by name[name_len] and then CdiSystemArea until length arrives
+            decodedVd.HasEffectiveTime = true;
+            decodedVd.EffectiveTime    = DateHandlers.HighSierraToDateTime(pvd.effective_date);
         }
 
-        // Follows filename on directory record
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CdiSystemArea
-        {
-            public readonly ushort        group;
-            public readonly ushort        owner;
-            public readonly CdiAttributes attributes;
-            public readonly ushort        reserved1;
-            public readonly byte          file_no;
-            public readonly byte          reserved2;
-        }
+        decodedVd.Blocks    = pvd.volume_space_size;
+        decodedVd.BlockSize = pvd.logical_block_size;
+
+        return decodedVd;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct FileStructureVolumeDescriptor
+    {
+        public readonly byte type;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] id;
+        public readonly byte           version;
+        public readonly CdiVolumeFlags flags;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] system_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] volume_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] reserved1;
+        public readonly uint volume_space_size;
+
+        // Only used in SVDs
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] escape_sequences;
+        public readonly ushort reserved2;
+        public readonly ushort volume_set_size;
+        public readonly ushort reserved3;
+        public readonly ushort volume_sequence_number;
+        public readonly ushort reserved4;
+        public readonly ushort logical_block_size;
+        public readonly uint   reserved5;
+        public readonly uint   path_table_size;
+        public readonly ulong  reserved6;
+        public readonly uint   path_table_addr;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 38)]
+        public readonly byte[] reserved7;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] volume_set_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] publisher_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] preparer_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] application_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] copyright_file_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] reserved8;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] abstract_file_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] reserved9;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] bibliographic_file_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] reserved10;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] creation_date;
+        public readonly byte reserved11;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] modification_date;
+        public readonly byte reserved12;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] expiration_date;
+        public readonly byte reserved13;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] effective_date;
+        public readonly byte reserved14;
+        public readonly byte file_structure_version;
+        public readonly byte reserved15;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
+        public readonly byte[] application_data;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 653)]
+        public readonly byte[] reserved16;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CdiDirectoryRecord
+    {
+        public readonly byte                length;
+        public readonly byte                xattr_len;
+        public readonly uint                reserved1;
+        public readonly uint                start_lbn;
+        public readonly uint                reserved2;
+        public readonly uint                size;
+        public readonly HighSierraTimestamp date;
+        public readonly byte                reserved3;
+        public readonly CdiFileFlags        flags;
+        public readonly ushort              file_unit_size;
+        public readonly ushort              reserved4;
+        public readonly ushort              volume_sequence_number;
+        public readonly byte                name_len;
+
+        // Followed by name[name_len] and then CdiSystemArea until length arrives
+    }
+
+    // Follows filename on directory record
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CdiSystemArea
+    {
+        public readonly ushort        group;
+        public readonly ushort        owner;
+        public readonly CdiAttributes attributes;
+        public readonly ushort        reserved1;
+        public readonly byte          file_no;
+        public readonly byte          reserved2;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs b/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs
index 81e22784b..dcff144aa 100644
--- a/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/ElTorito.cs
@@ -33,84 +33,83 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ElToritoBootRecord
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ElToritoBootRecord
-        {
-            public readonly byte type;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] id;
-            public readonly byte version;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] system_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] boot_id;
-            public readonly uint catalog_sector;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1974)]
-            public readonly byte[] boot_use;
-        }
+        public readonly byte type;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] id;
+        public readonly byte version;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] system_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] boot_id;
+        public readonly uint catalog_sector;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1974)]
+        public readonly byte[] boot_use;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ElToritoValidationEntry
-        {
-            public readonly ElToritoIndicator header_id;
-            public readonly ElToritoPlatform  platform_id;
-            public readonly ushort            reserved;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
-            public readonly byte[] developer_id;
-            public readonly ushort checksum;
-            public readonly ushort signature;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ElToritoValidationEntry
+    {
+        public readonly ElToritoIndicator header_id;
+        public readonly ElToritoPlatform  platform_id;
+        public readonly ushort            reserved;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
+        public readonly byte[] developer_id;
+        public readonly ushort checksum;
+        public readonly ushort signature;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct ElToritoInitialEntry
-        {
-            public readonly ElToritoIndicator bootable;
-            public          ElToritoEmulation boot_type;
-            public readonly ushort            load_seg;
-            public readonly byte              system_type;
-            public readonly byte              reserved1;
-            public readonly ushort            sector_count;
-            public readonly uint              load_rba;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] reserved2;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ElToritoInitialEntry
+    {
+        public readonly ElToritoIndicator bootable;
+        public          ElToritoEmulation boot_type;
+        public readonly ushort            load_seg;
+        public readonly byte              system_type;
+        public readonly byte              reserved1;
+        public readonly ushort            sector_count;
+        public readonly uint              load_rba;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] reserved2;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ElToritoSectionHeaderEntry
-        {
-            public readonly ElToritoIndicator header_id;
-            public readonly ElToritoPlatform  platform_id;
-            public readonly ushort            entries;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 28)]
-            public readonly byte[] identifier;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ElToritoSectionHeaderEntry
+    {
+        public readonly ElToritoIndicator header_id;
+        public readonly ElToritoPlatform  platform_id;
+        public readonly ushort            entries;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 28)]
+        public readonly byte[] identifier;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ElToritoSectionEntry
-        {
-            public readonly ElToritoIndicator bootable;
-            public readonly ElToritoEmulation boot_type;
-            public readonly ushort            load_seg;
-            public readonly byte              system_type;
-            public readonly byte              reserved1;
-            public readonly ushort            sector_count;
-            public readonly uint              load_rba;
-            public readonly byte              selection_criteria_type;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 19)]
-            public readonly byte[] selection_criterias;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ElToritoSectionEntry
+    {
+        public readonly ElToritoIndicator bootable;
+        public readonly ElToritoEmulation boot_type;
+        public readonly ushort            load_seg;
+        public readonly byte              system_type;
+        public readonly byte              reserved1;
+        public readonly ushort            sector_count;
+        public readonly uint              load_rba;
+        public readonly byte              selection_criteria_type;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 19)]
+        public readonly byte[] selection_criterias;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ElToritoSectionEntryExtension
-        {
-            public readonly ElToritoIndicator extension_indicator;
-            public readonly ElToritoFlags     extension_flags;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 30)]
-            public readonly byte[] selection_criterias;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ElToritoSectionEntryExtension
+    {
+        public readonly ElToritoIndicator extension_indicator;
+        public readonly ElToritoFlags     extension_flags;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 30)]
+        public readonly byte[] selection_criterias;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs b/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs
index 3a5c32a50..453d89d8d 100644
--- a/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/HighSierra.cs
@@ -36,170 +36,169 @@ using System.Runtime.InteropServices;
 using System.Text;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    static DecodedVolumeDescriptor DecodeVolumeDescriptor(HighSierraPrimaryVolumeDescriptor pvd)
     {
-        static DecodedVolumeDescriptor DecodeVolumeDescriptor(HighSierraPrimaryVolumeDescriptor pvd)
+        var decodedVd = new DecodedVolumeDescriptor
         {
-            var decodedVd = new DecodedVolumeDescriptor
-            {
-                SystemIdentifier       = Encoding.ASCII.GetString(pvd.system_id).TrimEnd().Trim('\0'),
-                VolumeIdentifier       = Encoding.ASCII.GetString(pvd.volume_id).TrimEnd().Trim('\0'),
-                VolumeSetIdentifier    = Encoding.ASCII.GetString(pvd.volume_set_id).TrimEnd().Trim('\0'),
-                PublisherIdentifier    = Encoding.ASCII.GetString(pvd.publisher_id).TrimEnd().Trim('\0'),
-                DataPreparerIdentifier = Encoding.ASCII.GetString(pvd.preparer_id).TrimEnd().Trim('\0'),
-                ApplicationIdentifier  = Encoding.ASCII.GetString(pvd.application_data).TrimEnd().Trim('\0')
-            };
+            SystemIdentifier       = Encoding.ASCII.GetString(pvd.system_id).TrimEnd().Trim('\0'),
+            VolumeIdentifier       = Encoding.ASCII.GetString(pvd.volume_id).TrimEnd().Trim('\0'),
+            VolumeSetIdentifier    = Encoding.ASCII.GetString(pvd.volume_set_id).TrimEnd().Trim('\0'),
+            PublisherIdentifier    = Encoding.ASCII.GetString(pvd.publisher_id).TrimEnd().Trim('\0'),
+            DataPreparerIdentifier = Encoding.ASCII.GetString(pvd.preparer_id).TrimEnd().Trim('\0'),
+            ApplicationIdentifier  = Encoding.ASCII.GetString(pvd.application_data).TrimEnd().Trim('\0')
+        };
 
-            if(pvd.creation_date[0] == '0' ||
-               pvd.creation_date[0] == 0x00)
-                decodedVd.CreationTime = DateTime.MinValue;
-            else
-                decodedVd.CreationTime = DateHandlers.HighSierraToDateTime(pvd.creation_date);
+        if(pvd.creation_date[0] == '0' ||
+           pvd.creation_date[0] == 0x00)
+            decodedVd.CreationTime = DateTime.MinValue;
+        else
+            decodedVd.CreationTime = DateHandlers.HighSierraToDateTime(pvd.creation_date);
 
-            if(pvd.modification_date[0] == '0' ||
-               pvd.modification_date[0] == 0x00)
-                decodedVd.HasModificationTime = false;
-            else
-            {
-                decodedVd.HasModificationTime = true;
-                decodedVd.ModificationTime    = DateHandlers.HighSierraToDateTime(pvd.modification_date);
-            }
-
-            if(pvd.expiration_date[0] == '0' ||
-               pvd.expiration_date[0] == 0x00)
-                decodedVd.HasExpirationTime = false;
-            else
-            {
-                decodedVd.HasExpirationTime = true;
-                decodedVd.ExpirationTime    = DateHandlers.HighSierraToDateTime(pvd.expiration_date);
-            }
-
-            if(pvd.effective_date[0] == '0' ||
-               pvd.effective_date[0] == 0x00)
-                decodedVd.HasEffectiveTime = false;
-            else
-            {
-                decodedVd.HasEffectiveTime = true;
-                decodedVd.EffectiveTime    = DateHandlers.HighSierraToDateTime(pvd.effective_date);
-            }
-
-            decodedVd.Blocks    = pvd.volume_space_size;
-            decodedVd.BlockSize = pvd.logical_block_size;
-
-            return decodedVd;
+        if(pvd.modification_date[0] == '0' ||
+           pvd.modification_date[0] == 0x00)
+            decodedVd.HasModificationTime = false;
+        else
+        {
+            decodedVd.HasModificationTime = true;
+            decodedVd.ModificationTime    = DateHandlers.HighSierraToDateTime(pvd.modification_date);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HighSierraPrimaryVolumeDescriptor
+        if(pvd.expiration_date[0] == '0' ||
+           pvd.expiration_date[0] == 0x00)
+            decodedVd.HasExpirationTime = false;
+        else
         {
-            public readonly uint volume_lbn;
-            public readonly uint volume_lbn_be;
-            public readonly byte type;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] id;
-            public readonly byte version;
-
-            // Only used in SVDs
-            public readonly byte flags;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] system_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] volume_id;
-            public readonly ulong reserved1;
-            public readonly uint  volume_space_size;
-            public readonly uint  volume_space_size_be;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] escape_sequences;
-            public readonly ushort                    volume_set_size;
-            public readonly ushort                    volume_set_size_be;
-            public readonly ushort                    volume_sequence_number;
-            public readonly ushort                    volume_sequence_number_be;
-            public readonly ushort                    logical_block_size;
-            public readonly ushort                    logical_block_size_be;
-            public readonly uint                      path_table_size;
-            public readonly uint                      path_table_size_be;
-            public readonly uint                      mandatory_path_table_lsb;
-            public readonly uint                      opt_path_table_lsb_1;
-            public readonly uint                      opt_path_table_lsb_2;
-            public readonly uint                      opt_path_table_lsb_3;
-            public readonly uint                      mandatory_path_table_msb;
-            public readonly uint                      opt_path_table_msb_1;
-            public readonly uint                      opt_path_table_msb_2;
-            public readonly uint                      opt_path_table_msb_3;
-            public readonly HighSierraDirectoryRecord root_directory_record;
-            public readonly byte                      root_directory_name;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] volume_set_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] publisher_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] preparer_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] application_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] copyright_file_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] abstract_file_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] creation_date;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] modification_date;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] expiration_date;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] effective_date;
-            public readonly byte file_structure_version;
-            public readonly byte reserved2;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public readonly byte[] application_data;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 680)]
-            public readonly byte[] reserved3;
+            decodedVd.HasExpirationTime = true;
+            decodedVd.ExpirationTime    = DateHandlers.HighSierraToDateTime(pvd.expiration_date);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HighSierraDirectoryRecord
+        if(pvd.effective_date[0] == '0' ||
+           pvd.effective_date[0] == 0x00)
+            decodedVd.HasEffectiveTime = false;
+        else
         {
-            public readonly byte                length;
-            public readonly byte                xattr_len;
-            public readonly uint                extent;
-            public readonly uint                extent_be;
-            public readonly uint                size;
-            public readonly uint                size_be;
-            public readonly HighSierraTimestamp date;
-            public readonly FileFlags           flags;
-            public readonly byte                reserved;
-            public readonly byte                interleave_size;
-            public readonly byte                interleave;
-            public readonly ushort              volume_sequence_number;
-            public readonly ushort              volume_sequence_number_be;
-            public readonly byte                name_len;
-
-            // Followed by name[name_len] and then system area until length arrives
+            decodedVd.HasEffectiveTime = true;
+            decodedVd.EffectiveTime    = DateHandlers.HighSierraToDateTime(pvd.effective_date);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HighSierraTimestamp
-        {
-            public readonly byte Years;
-            public readonly byte Month;
-            public readonly byte Day;
-            public readonly byte Hour;
-            public readonly byte Minute;
-            public readonly byte Second;
-        }
+        decodedVd.Blocks    = pvd.volume_space_size;
+        decodedVd.BlockSize = pvd.logical_block_size;
 
-        // There are two tables one in little endian one in big endian
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HighSierraPathTableEntry
-        {
-            public readonly uint   start_lbn;
-            public readonly byte   xattr_len;
-            public readonly byte   name_len;
-            public readonly ushort parent_dirno;
+        return decodedVd;
+    }
 
-            // Followed by name[name_len]
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HighSierraPrimaryVolumeDescriptor
+    {
+        public readonly uint volume_lbn;
+        public readonly uint volume_lbn_be;
+        public readonly byte type;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] id;
+        public readonly byte version;
+
+        // Only used in SVDs
+        public readonly byte flags;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] system_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] volume_id;
+        public readonly ulong reserved1;
+        public readonly uint  volume_space_size;
+        public readonly uint  volume_space_size_be;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] escape_sequences;
+        public readonly ushort                    volume_set_size;
+        public readonly ushort                    volume_set_size_be;
+        public readonly ushort                    volume_sequence_number;
+        public readonly ushort                    volume_sequence_number_be;
+        public readonly ushort                    logical_block_size;
+        public readonly ushort                    logical_block_size_be;
+        public readonly uint                      path_table_size;
+        public readonly uint                      path_table_size_be;
+        public readonly uint                      mandatory_path_table_lsb;
+        public readonly uint                      opt_path_table_lsb_1;
+        public readonly uint                      opt_path_table_lsb_2;
+        public readonly uint                      opt_path_table_lsb_3;
+        public readonly uint                      mandatory_path_table_msb;
+        public readonly uint                      opt_path_table_msb_1;
+        public readonly uint                      opt_path_table_msb_2;
+        public readonly uint                      opt_path_table_msb_3;
+        public readonly HighSierraDirectoryRecord root_directory_record;
+        public readonly byte                      root_directory_name;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] volume_set_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] publisher_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] preparer_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] application_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] copyright_file_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] abstract_file_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] creation_date;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] modification_date;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] expiration_date;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] effective_date;
+        public readonly byte file_structure_version;
+        public readonly byte reserved2;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
+        public readonly byte[] application_data;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 680)]
+        public readonly byte[] reserved3;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HighSierraDirectoryRecord
+    {
+        public readonly byte                length;
+        public readonly byte                xattr_len;
+        public readonly uint                extent;
+        public readonly uint                extent_be;
+        public readonly uint                size;
+        public readonly uint                size_be;
+        public readonly HighSierraTimestamp date;
+        public readonly FileFlags           flags;
+        public readonly byte                reserved;
+        public readonly byte                interleave_size;
+        public readonly byte                interleave;
+        public readonly ushort              volume_sequence_number;
+        public readonly ushort              volume_sequence_number_be;
+        public readonly byte                name_len;
+
+        // Followed by name[name_len] and then system area until length arrives
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HighSierraTimestamp
+    {
+        public readonly byte Years;
+        public readonly byte Month;
+        public readonly byte Day;
+        public readonly byte Hour;
+        public readonly byte Minute;
+        public readonly byte Second;
+    }
+
+    // There are two tables one in little endian one in big endian
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HighSierraPathTableEntry
+    {
+        public readonly uint   start_lbn;
+        public readonly byte   xattr_len;
+        public readonly byte   name_len;
+        public readonly ushort parent_dirno;
+
+        // Followed by name[name_len]
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/ISO.cs b/Aaru.Filesystems/ISO9660/Structs/ISO.cs
index 40de8f554..391747672 100644
--- a/Aaru.Filesystems/ISO9660/Structs/ISO.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/ISO.cs
@@ -38,237 +38,236 @@ using Aaru.Helpers;
 
 // ReSharper disable UnusedType.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    static DecodedVolumeDescriptor DecodeVolumeDescriptor(PrimaryVolumeDescriptor pvd, Encoding encoding = null)
     {
-        static DecodedVolumeDescriptor DecodeVolumeDescriptor(PrimaryVolumeDescriptor pvd, Encoding encoding = null)
+        encoding ??= Encoding.ASCII;
+
+        var decodedVd = new DecodedVolumeDescriptor
         {
-            encoding ??= Encoding.ASCII;
+            SystemIdentifier       = StringHandlers.CToString(pvd.system_id, encoding).TrimEnd(),
+            VolumeIdentifier       = StringHandlers.CToString(pvd.volume_id, encoding).TrimEnd(),
+            VolumeSetIdentifier    = StringHandlers.CToString(pvd.volume_set_id, encoding).TrimEnd(),
+            PublisherIdentifier    = StringHandlers.CToString(pvd.publisher_id, encoding).TrimEnd(),
+            DataPreparerIdentifier = StringHandlers.CToString(pvd.preparer_id, encoding).TrimEnd(),
+            ApplicationIdentifier  = StringHandlers.CToString(pvd.application_id, encoding).TrimEnd()
+        };
 
-            var decodedVd = new DecodedVolumeDescriptor
-            {
-                SystemIdentifier       = StringHandlers.CToString(pvd.system_id, encoding).TrimEnd(),
-                VolumeIdentifier       = StringHandlers.CToString(pvd.volume_id, encoding).TrimEnd(),
-                VolumeSetIdentifier    = StringHandlers.CToString(pvd.volume_set_id, encoding).TrimEnd(),
-                PublisherIdentifier    = StringHandlers.CToString(pvd.publisher_id, encoding).TrimEnd(),
-                DataPreparerIdentifier = StringHandlers.CToString(pvd.preparer_id, encoding).TrimEnd(),
-                ApplicationIdentifier  = StringHandlers.CToString(pvd.application_id, encoding).TrimEnd()
-            };
+        if(pvd.creation_date[0] == '0' ||
+           pvd.creation_date[0] == 0x00)
+            decodedVd.CreationTime = DateTime.MinValue;
+        else
+            decodedVd.CreationTime = DateHandlers.Iso9660ToDateTime(pvd.creation_date);
 
-            if(pvd.creation_date[0] == '0' ||
-               pvd.creation_date[0] == 0x00)
-                decodedVd.CreationTime = DateTime.MinValue;
-            else
-                decodedVd.CreationTime = DateHandlers.Iso9660ToDateTime(pvd.creation_date);
-
-            if(pvd.modification_date[0] == '0' ||
-               pvd.modification_date[0] == 0x00)
-                decodedVd.HasModificationTime = false;
-            else
-            {
-                decodedVd.HasModificationTime = true;
-                decodedVd.ModificationTime    = DateHandlers.Iso9660ToDateTime(pvd.modification_date);
-            }
-
-            if(pvd.expiration_date[0] == '0' ||
-               pvd.expiration_date[0] == 0x00)
-                decodedVd.HasExpirationTime = false;
-            else
-            {
-                decodedVd.HasExpirationTime = true;
-                decodedVd.ExpirationTime    = DateHandlers.Iso9660ToDateTime(pvd.expiration_date);
-            }
-
-            if(pvd.effective_date[0] == '0' ||
-               pvd.effective_date[0] == 0x00)
-                decodedVd.HasEffectiveTime = false;
-            else
-            {
-                decodedVd.HasEffectiveTime = true;
-                decodedVd.EffectiveTime    = DateHandlers.Iso9660ToDateTime(pvd.effective_date);
-            }
-
-            decodedVd.Blocks    = pvd.volume_space_size;
-            decodedVd.BlockSize = pvd.logical_block_size;
-
-            return decodedVd;
+        if(pvd.modification_date[0] == '0' ||
+           pvd.modification_date[0] == 0x00)
+            decodedVd.HasModificationTime = false;
+        else
+        {
+            decodedVd.HasModificationTime = true;
+            decodedVd.ModificationTime    = DateHandlers.Iso9660ToDateTime(pvd.modification_date);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct PrimaryVolumeDescriptor
+        if(pvd.expiration_date[0] == '0' ||
+           pvd.expiration_date[0] == 0x00)
+            decodedVd.HasExpirationTime = false;
+        else
         {
-            public readonly byte type;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] id;
-            public readonly byte version;
-
-            // Only used in SVDs
-            public readonly byte flags;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] system_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] volume_id;
-            public readonly ulong reserved1;
-            public readonly uint  volume_space_size;
-            public readonly uint  volume_space_size_be;
-
-            // Only used in SVDs
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] escape_sequences;
-            public readonly ushort          volume_set_size;
-            public readonly ushort          volume_set_size_be;
-            public readonly ushort          volume_sequence_number;
-            public readonly ushort          volume_sequence_number_be;
-            public readonly ushort          logical_block_size;
-            public readonly ushort          logical_block_size_be;
-            public readonly uint            path_table_size;
-            public readonly uint            path_table_size_be;
-            public readonly uint            type_l_path_table;
-            public readonly uint            opt_type_l_path_table;
-            public readonly uint            type_m_path_table;
-            public readonly uint            opt_type_m_path_table;
-            public readonly DirectoryRecord root_directory_record;
-            public readonly byte            root_directory_name;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] volume_set_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] publisher_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] preparer_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] application_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 37)]
-            public readonly byte[] copyright_file_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 37)]
-            public readonly byte[] abstract_file_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 37)]
-            public readonly byte[] bibliographic_file_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public readonly byte[] creation_date;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public readonly byte[] modification_date;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public readonly byte[] expiration_date;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public readonly byte[] effective_date;
-            public readonly byte file_structure_version;
-            public readonly byte reserved2;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public readonly byte[] application_data;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 653)]
-            public readonly byte[] reserved3;
+            decodedVd.HasExpirationTime = true;
+            decodedVd.ExpirationTime    = DateHandlers.Iso9660ToDateTime(pvd.expiration_date);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BootRecord
+        if(pvd.effective_date[0] == '0' ||
+           pvd.effective_date[0] == 0x00)
+            decodedVd.HasEffectiveTime = false;
+        else
         {
-            public readonly byte type;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] id;
-            public readonly byte version;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] system_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] boot_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1977)]
-            public readonly byte[] boot_use;
+            decodedVd.HasEffectiveTime = true;
+            decodedVd.EffectiveTime    = DateHandlers.Iso9660ToDateTime(pvd.effective_date);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct PartitionDescriptor
-        {
-            public readonly byte type;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] id;
-            public readonly byte version;
-            public readonly byte reserved1;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] system_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] partition_id;
-            public readonly uint partition_location;
-            public readonly uint partition_location_be;
-            public readonly uint partition_size;
-            public readonly uint partition_size_be;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1960)]
-            public readonly byte[] system_use;
-        }
+        decodedVd.Blocks    = pvd.volume_space_size;
+        decodedVd.BlockSize = pvd.logical_block_size;
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryRecord
-        {
-            public readonly byte         length;
-            public readonly byte         xattr_len;
-            public readonly uint         extent;
-            public readonly uint         extent_be;
-            public readonly uint         size;
-            public readonly uint         size_be;
-            public readonly IsoTimestamp date;
-            public readonly FileFlags    flags;
-            public readonly byte         file_unit_size;
-            public readonly byte         interleave;
-            public readonly ushort       volume_sequence_number;
-            public readonly ushort       volume_sequence_number_be;
-            public readonly byte         name_len;
+        return decodedVd;
+    }
 
-            // Followed by name[name_len] and then system area until length arrives
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct PrimaryVolumeDescriptor
+    {
+        public readonly byte type;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] id;
+        public readonly byte version;
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ExtendedAttributeRecord
-        {
-            public readonly ushort      owner;
-            public readonly ushort      owner_be;
-            public readonly ushort      group;
-            public readonly ushort      group_be;
-            public readonly Permissions permissions;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public readonly byte[] creation_date;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public readonly byte[] modification_date;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public readonly byte[] expiration_date;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public readonly byte[] effective_date;
-            public readonly RecordFormat    record_format;
-            public readonly RecordAttribute record_attributes;
-            public readonly ushort          record_length;
-            public readonly ushort          record_length_be;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] system_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] system_use;
-            public readonly byte record_version;
-            public readonly byte escape_len;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] reserved1;
-            public readonly ushort app_use_len;
-            public readonly ushort app_use_len_be;
-        }
+        // Only used in SVDs
+        public readonly byte flags;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] system_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] volume_id;
+        public readonly ulong reserved1;
+        public readonly uint  volume_space_size;
+        public readonly uint  volume_space_size_be;
 
-        // There are two tables one in little endian one in big endian
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct PathTableEntry
-        {
-            public readonly byte   name_len;
-            public readonly byte   xattr_len;
-            public readonly uint   start_lbn;
-            public readonly ushort parent_dirno;
+        // Only used in SVDs
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] escape_sequences;
+        public readonly ushort          volume_set_size;
+        public readonly ushort          volume_set_size_be;
+        public readonly ushort          volume_sequence_number;
+        public readonly ushort          volume_sequence_number_be;
+        public readonly ushort          logical_block_size;
+        public readonly ushort          logical_block_size_be;
+        public readonly uint            path_table_size;
+        public readonly uint            path_table_size_be;
+        public readonly uint            type_l_path_table;
+        public readonly uint            opt_type_l_path_table;
+        public readonly uint            type_m_path_table;
+        public readonly uint            opt_type_m_path_table;
+        public readonly DirectoryRecord root_directory_record;
+        public readonly byte            root_directory_name;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] volume_set_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] publisher_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] preparer_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] application_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 37)]
+        public readonly byte[] copyright_file_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 37)]
+        public readonly byte[] abstract_file_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 37)]
+        public readonly byte[] bibliographic_file_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
+        public readonly byte[] creation_date;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
+        public readonly byte[] modification_date;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
+        public readonly byte[] expiration_date;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
+        public readonly byte[] effective_date;
+        public readonly byte file_structure_version;
+        public readonly byte reserved2;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
+        public readonly byte[] application_data;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 653)]
+        public readonly byte[] reserved3;
+    }
 
-            // Followed by name[name_len]
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BootRecord
+    {
+        public readonly byte type;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] id;
+        public readonly byte version;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] system_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] boot_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1977)]
+        public readonly byte[] boot_use;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct IsoTimestamp
-        {
-            public readonly byte  Years;
-            public readonly byte  Month;
-            public readonly byte  Day;
-            public readonly byte  Hour;
-            public readonly byte  Minute;
-            public readonly byte  Second;
-            public readonly sbyte GmtOffset;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct PartitionDescriptor
+    {
+        public readonly byte type;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] id;
+        public readonly byte version;
+        public readonly byte reserved1;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] system_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] partition_id;
+        public readonly uint partition_location;
+        public readonly uint partition_location_be;
+        public readonly uint partition_size;
+        public readonly uint partition_size_be;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1960)]
+        public readonly byte[] system_use;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryRecord
+    {
+        public readonly byte         length;
+        public readonly byte         xattr_len;
+        public readonly uint         extent;
+        public readonly uint         extent_be;
+        public readonly uint         size;
+        public readonly uint         size_be;
+        public readonly IsoTimestamp date;
+        public readonly FileFlags    flags;
+        public readonly byte         file_unit_size;
+        public readonly byte         interleave;
+        public readonly ushort       volume_sequence_number;
+        public readonly ushort       volume_sequence_number_be;
+        public readonly byte         name_len;
+
+        // Followed by name[name_len] and then system area until length arrives
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ExtendedAttributeRecord
+    {
+        public readonly ushort      owner;
+        public readonly ushort      owner_be;
+        public readonly ushort      group;
+        public readonly ushort      group_be;
+        public readonly Permissions permissions;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
+        public readonly byte[] creation_date;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
+        public readonly byte[] modification_date;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
+        public readonly byte[] expiration_date;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
+        public readonly byte[] effective_date;
+        public readonly RecordFormat    record_format;
+        public readonly RecordAttribute record_attributes;
+        public readonly ushort          record_length;
+        public readonly ushort          record_length_be;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] system_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] system_use;
+        public readonly byte record_version;
+        public readonly byte escape_len;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] reserved1;
+        public readonly ushort app_use_len;
+        public readonly ushort app_use_len_be;
+    }
+
+    // There are two tables one in little endian one in big endian
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct PathTableEntry
+    {
+        public readonly byte   name_len;
+        public readonly byte   xattr_len;
+        public readonly uint   start_lbn;
+        public readonly ushort parent_dirno;
+
+        // Followed by name[name_len]
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct IsoTimestamp
+    {
+        public readonly byte  Years;
+        public readonly byte  Month;
+        public readonly byte  Day;
+        public readonly byte  Hour;
+        public readonly byte  Minute;
+        public readonly byte  Second;
+        public readonly sbyte GmtOffset;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/Internal.cs b/Aaru.Filesystems/ISO9660/Structs/Internal.cs
index 1ad8f93c8..2406f087a 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Internal.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Internal.cs
@@ -34,75 +34,74 @@
 using System;
 using System.Collections.Generic;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    struct DecodedVolumeDescriptor
     {
-        struct DecodedVolumeDescriptor
-        {
-            public string   SystemIdentifier;
-            public string   VolumeIdentifier;
-            public string   VolumeSetIdentifier;
-            public string   PublisherIdentifier;
-            public string   DataPreparerIdentifier;
-            public string   ApplicationIdentifier;
-            public DateTime CreationTime;
-            public bool     HasModificationTime;
-            public DateTime ModificationTime;
-            public bool     HasExpirationTime;
-            public DateTime ExpirationTime;
-            public bool     HasEffectiveTime;
-            public DateTime EffectiveTime;
-            public ushort   BlockSize;
-            public uint     Blocks;
-        }
+        public string   SystemIdentifier;
+        public string   VolumeIdentifier;
+        public string   VolumeSetIdentifier;
+        public string   PublisherIdentifier;
+        public string   DataPreparerIdentifier;
+        public string   ApplicationIdentifier;
+        public DateTime CreationTime;
+        public bool     HasModificationTime;
+        public DateTime ModificationTime;
+        public bool     HasExpirationTime;
+        public DateTime ExpirationTime;
+        public bool     HasEffectiveTime;
+        public DateTime EffectiveTime;
+        public ushort   BlockSize;
+        public uint     Blocks;
+    }
 
-        class DecodedDirectoryEntry
-        {
-            public byte[]                         AmigaComment;
-            public AmigaProtection?               AmigaProtection;
-            public byte?                          AppleDosType;
-            public byte[]                         AppleIcon;
-            public ushort?                        AppleProDosType;
-            public DecodedDirectoryEntry          AssociatedFile;
-            public CdiSystemArea?                 CdiSystemArea;
-            public List<(uint extent, uint size)> Extents;
-            public string                         Filename;
-            public byte                           FileUnitSize;
-            public AppleCommon.FInfo?             FinderInfo;
-            public FileFlags                      Flags;
-            public byte                           Interleave;
-            public PosixAttributes?               PosixAttributes;
-            public PosixAttributesOld?            PosixAttributesOld;
-            public PosixDeviceNumber?             PosixDeviceNumber;
-            public DecodedDirectoryEntry          ResourceFork;
-            public byte[]                         RockRidgeAlternateName;
-            public bool                           RockRidgeRelocated;
-            public byte[]                         RripAccess;
-            public byte[]                         RripAttributeChange;
-            public byte[]                         RripBackup;
-            public byte[]                         RripCreation;
-            public byte[]                         RripEffective;
-            public byte[]                         RripExpiration;
-            public byte[]                         RripModify;
-            public ulong                          Size;
-            public string                         SymbolicLink;
-            public DateTime?                      Timestamp;
-            public ushort                         VolumeSequenceNumber;
-            public CdromXa?                       XA;
-            public byte                           XattrLength;
+    class DecodedDirectoryEntry
+    {
+        public byte[]                         AmigaComment;
+        public AmigaProtection?               AmigaProtection;
+        public byte?                          AppleDosType;
+        public byte[]                         AppleIcon;
+        public ushort?                        AppleProDosType;
+        public DecodedDirectoryEntry          AssociatedFile;
+        public CdiSystemArea?                 CdiSystemArea;
+        public List<(uint extent, uint size)> Extents;
+        public string                         Filename;
+        public byte                           FileUnitSize;
+        public AppleCommon.FInfo?             FinderInfo;
+        public FileFlags                      Flags;
+        public byte                           Interleave;
+        public PosixAttributes?               PosixAttributes;
+        public PosixAttributesOld?            PosixAttributesOld;
+        public PosixDeviceNumber?             PosixDeviceNumber;
+        public DecodedDirectoryEntry          ResourceFork;
+        public byte[]                         RockRidgeAlternateName;
+        public bool                           RockRidgeRelocated;
+        public byte[]                         RripAccess;
+        public byte[]                         RripAttributeChange;
+        public byte[]                         RripBackup;
+        public byte[]                         RripCreation;
+        public byte[]                         RripEffective;
+        public byte[]                         RripExpiration;
+        public byte[]                         RripModify;
+        public ulong                          Size;
+        public string                         SymbolicLink;
+        public DateTime?                      Timestamp;
+        public ushort                         VolumeSequenceNumber;
+        public CdromXa?                       XA;
+        public byte                           XattrLength;
 
-            public override string ToString() => Filename;
-        }
+        public override string ToString() => Filename;
+    }
 
-        class PathTableEntryInternal
-        {
-            public uint   Extent;
-            public string Name;
-            public ushort Parent;
-            public byte   XattrLength;
+    class PathTableEntryInternal
+    {
+        public uint   Extent;
+        public string Name;
+        public ushort Parent;
+        public byte   XattrLength;
 
-            public override string ToString() => Name;
-        }
+        public override string ToString() => Name;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/Joliet.cs b/Aaru.Filesystems/ISO9660/Structs/Joliet.cs
index 704207edc..d86186bb6 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Joliet.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Joliet.cs
@@ -35,65 +35,64 @@ using System;
 using System.Text;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    static DecodedVolumeDescriptor DecodeJolietDescriptor(PrimaryVolumeDescriptor jolietvd)
     {
-        static DecodedVolumeDescriptor DecodeJolietDescriptor(PrimaryVolumeDescriptor jolietvd)
+        var decodedVd = new DecodedVolumeDescriptor
         {
-            var decodedVd = new DecodedVolumeDescriptor
-            {
-                SystemIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.system_id).Replace('\u0000', ' ').
-                                            TrimEnd(),
-                VolumeIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.volume_id).Replace('\u0000', ' ').
-                                            TrimEnd(),
-                VolumeSetIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.volume_set_id).
-                                               Replace('\u0000', ' ').TrimEnd(),
-                PublisherIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.publisher_id).Replace('\u0000', ' ').
-                                               TrimEnd(),
-                DataPreparerIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.preparer_id).
-                                                  Replace('\u0000', ' ').TrimEnd(),
-                ApplicationIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.application_id).
-                                                 Replace('\u0000', ' ').TrimEnd()
-            };
+            SystemIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.system_id).Replace('\u0000', ' ').
+                                        TrimEnd(),
+            VolumeIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.volume_id).Replace('\u0000', ' ').
+                                        TrimEnd(),
+            VolumeSetIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.volume_set_id).
+                                           Replace('\u0000', ' ').TrimEnd(),
+            PublisherIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.publisher_id).Replace('\u0000', ' ').
+                                           TrimEnd(),
+            DataPreparerIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.preparer_id).
+                                              Replace('\u0000', ' ').TrimEnd(),
+            ApplicationIdentifier = Encoding.BigEndianUnicode.GetString(jolietvd.application_id).
+                                             Replace('\u0000', ' ').TrimEnd()
+        };
 
-            if(jolietvd.creation_date[0] < 0x31 ||
-               jolietvd.creation_date[0] > 0x39)
-                decodedVd.CreationTime = DateTime.MinValue;
-            else
-                decodedVd.CreationTime = DateHandlers.Iso9660ToDateTime(jolietvd.creation_date);
+        if(jolietvd.creation_date[0] < 0x31 ||
+           jolietvd.creation_date[0] > 0x39)
+            decodedVd.CreationTime = DateTime.MinValue;
+        else
+            decodedVd.CreationTime = DateHandlers.Iso9660ToDateTime(jolietvd.creation_date);
 
-            if(jolietvd.modification_date[0] < 0x31 ||
-               jolietvd.modification_date[0] > 0x39)
-                decodedVd.HasModificationTime = false;
-            else
-            {
-                decodedVd.HasModificationTime = true;
-                decodedVd.ModificationTime    = DateHandlers.Iso9660ToDateTime(jolietvd.modification_date);
-            }
-
-            if(jolietvd.expiration_date[0] < 0x31 ||
-               jolietvd.expiration_date[0] > 0x39)
-                decodedVd.HasExpirationTime = false;
-            else
-            {
-                decodedVd.HasExpirationTime = true;
-                decodedVd.ExpirationTime    = DateHandlers.Iso9660ToDateTime(jolietvd.expiration_date);
-            }
-
-            if(jolietvd.effective_date[0] < 0x31 ||
-               jolietvd.effective_date[0] > 0x39)
-                decodedVd.HasEffectiveTime = false;
-            else
-            {
-                decodedVd.HasEffectiveTime = true;
-                decodedVd.EffectiveTime    = DateHandlers.Iso9660ToDateTime(jolietvd.effective_date);
-            }
-
-            decodedVd.Blocks    = jolietvd.volume_space_size;
-            decodedVd.BlockSize = jolietvd.logical_block_size;
-
-            return decodedVd;
+        if(jolietvd.modification_date[0] < 0x31 ||
+           jolietvd.modification_date[0] > 0x39)
+            decodedVd.HasModificationTime = false;
+        else
+        {
+            decodedVd.HasModificationTime = true;
+            decodedVd.ModificationTime    = DateHandlers.Iso9660ToDateTime(jolietvd.modification_date);
         }
+
+        if(jolietvd.expiration_date[0] < 0x31 ||
+           jolietvd.expiration_date[0] > 0x39)
+            decodedVd.HasExpirationTime = false;
+        else
+        {
+            decodedVd.HasExpirationTime = true;
+            decodedVd.ExpirationTime    = DateHandlers.Iso9660ToDateTime(jolietvd.expiration_date);
+        }
+
+        if(jolietvd.effective_date[0] < 0x31 ||
+           jolietvd.effective_date[0] > 0x39)
+            decodedVd.HasEffectiveTime = false;
+        else
+        {
+            decodedVd.HasEffectiveTime = true;
+            decodedVd.EffectiveTime    = DateHandlers.Iso9660ToDateTime(jolietvd.effective_date);
+        }
+
+        decodedVd.Blocks    = jolietvd.volume_space_size;
+        decodedVd.BlockSize = jolietvd.logical_block_size;
+
+        return decodedVd;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/RRIP.cs b/Aaru.Filesystems/ISO9660/Structs/RRIP.cs
index 6e0ceaecd..3f8d82fa0 100644
--- a/Aaru.Filesystems/ISO9660/Structs/RRIP.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/RRIP.cs
@@ -34,147 +34,146 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class ISO9660
 {
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class ISO9660
+    // RRIP 1.10
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct PosixAttributesOld
     {
-        // RRIP 1.10
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct PosixAttributesOld
-        {
-            public readonly ushort    signature;
-            public readonly byte      length;
-            public readonly byte      version;
-            public readonly PosixMode st_mode;
-            public readonly PosixMode st_mode_be;
-            public readonly uint      st_nlink;
-            public readonly uint      st_nlink_be;
-            public readonly uint      st_uid;
-            public readonly uint      st_uid_be;
-            public readonly uint      st_gid;
-            public readonly uint      st_gid_be;
-        }
+        public readonly ushort    signature;
+        public readonly byte      length;
+        public readonly byte      version;
+        public readonly PosixMode st_mode;
+        public readonly PosixMode st_mode_be;
+        public readonly uint      st_nlink;
+        public readonly uint      st_nlink_be;
+        public readonly uint      st_uid;
+        public readonly uint      st_uid_be;
+        public readonly uint      st_gid;
+        public readonly uint      st_gid_be;
+    }
 
-        // RRIP 1.12
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct PosixAttributes
-        {
-            public readonly ushort    signature;
-            public readonly byte      length;
-            public readonly byte      version;
-            public readonly PosixMode st_mode;
-            public readonly PosixMode st_mode_be;
-            public readonly uint      st_nlink;
-            public readonly uint      st_nlink_be;
-            public readonly uint      st_uid;
-            public readonly uint      st_uid_be;
-            public readonly uint      st_gid;
-            public readonly uint      st_gid_be;
-            public readonly uint      st_ino;
-            public readonly uint      st_ino_be;
-        }
+    // RRIP 1.12
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct PosixAttributes
+    {
+        public readonly ushort    signature;
+        public readonly byte      length;
+        public readonly byte      version;
+        public readonly PosixMode st_mode;
+        public readonly PosixMode st_mode_be;
+        public readonly uint      st_nlink;
+        public readonly uint      st_nlink_be;
+        public readonly uint      st_uid;
+        public readonly uint      st_uid_be;
+        public readonly uint      st_gid;
+        public readonly uint      st_gid_be;
+        public readonly uint      st_ino;
+        public readonly uint      st_ino_be;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct PosixDeviceNumber
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-            public readonly uint   dev_t_high;
-            public readonly uint   dev_t_high_be;
-            public readonly uint   dev_t_low;
-            public readonly uint   dev_t_low_be;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct PosixDeviceNumber
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+        public readonly uint   dev_t_high;
+        public readonly uint   dev_t_high_be;
+        public readonly uint   dev_t_low;
+        public readonly uint   dev_t_low_be;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SymbolicLink
-        {
-            public readonly ushort       signature;
-            public readonly byte         length;
-            public readonly byte         version;
-            public readonly SymlinkFlags flags;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SymbolicLink
+    {
+        public readonly ushort       signature;
+        public readonly byte         length;
+        public readonly byte         version;
+        public readonly SymlinkFlags flags;
 
-            // Followed by SymbolicLinkComponent (link to /bar/foo uses at least two of these structs)
-        }
+        // Followed by SymbolicLinkComponent (link to /bar/foo uses at least two of these structs)
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SymbolicLinkComponent
-        {
-            public readonly SymlinkComponentFlags flags;
-            public readonly byte                  length;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SymbolicLinkComponent
+    {
+        public readonly SymlinkComponentFlags flags;
+        public readonly byte                  length;
 
-            // Followed by component content
-        }
+        // Followed by component content
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AlternateName
-        {
-            public readonly ushort             signature;
-            public readonly byte               length;
-            public readonly byte               version;
-            public readonly AlternateNameFlags flags;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AlternateName
+    {
+        public readonly ushort             signature;
+        public readonly byte               length;
+        public readonly byte               version;
+        public readonly AlternateNameFlags flags;
 
-            // Folowed by name, can be divided in pieces
-        }
+        // Folowed by name, can be divided in pieces
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ChildLink
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-            public readonly uint   child_dir_lba;
-            public readonly uint   child_dir_lba_be;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ChildLink
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+        public readonly uint   child_dir_lba;
+        public readonly uint   child_dir_lba_be;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ParentLink
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-            public readonly uint   parent_dir_lba;
-            public readonly uint   parent_dir_lba_be;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ParentLink
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+        public readonly uint   parent_dir_lba;
+        public readonly uint   parent_dir_lba_be;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct RelocatedDirectory
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct RelocatedDirectory
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Timestamps
-        {
-            public readonly ushort         signature;
-            public readonly byte           length;
-            public readonly byte           version;
-            public readonly TimestampFlags flags;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Timestamps
+    {
+        public readonly ushort         signature;
+        public readonly byte           length;
+        public readonly byte           version;
+        public readonly TimestampFlags flags;
 
-            // If flags indicate long format, timestamps are 17 bytes, if not, 7 bytes
-            // Followed by creation time if present
-            // Followed by modification time if present
-            // Followed by access time if present
-            // Followed by attribute change time if present
-            // Followed by backup time if present
-            // Followed by expiration time if present
-            // Followed by effective time if present
-        }
+        // If flags indicate long format, timestamps are 17 bytes, if not, 7 bytes
+        // Followed by creation time if present
+        // Followed by modification time if present
+        // Followed by access time if present
+        // Followed by attribute change time if present
+        // Followed by backup time if present
+        // Followed by expiration time if present
+        // Followed by effective time if present
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SparseFile
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-            public readonly uint   virtual_size_high;
-            public readonly uint   virtual_size_high_be;
-            public readonly uint   virtual_size_low;
-            public readonly uint   virtual_size_low_be;
-            public readonly byte   table_depth;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SparseFile
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+        public readonly uint   virtual_size_high;
+        public readonly uint   virtual_size_high_be;
+        public readonly uint   virtual_size_low;
+        public readonly uint   virtual_size_low_be;
+        public readonly byte   table_depth;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/SUSP.cs b/Aaru.Filesystems/ISO9660/Structs/SUSP.cs
index 26949a1f2..2474b810a 100644
--- a/Aaru.Filesystems/ISO9660/Structs/SUSP.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/SUSP.cs
@@ -35,73 +35,72 @@ using System.Runtime.InteropServices;
 
 // ReSharper disable UnusedType.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ContinuationArea
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ContinuationArea
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-            public readonly uint   block;
-            public readonly uint   block_be;
-            public readonly uint   offset;
-            public readonly uint   offset_be;
-            public readonly uint   ca_length;
-            public readonly uint   ca_length_be;
-        }
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+        public readonly uint   block;
+        public readonly uint   block_be;
+        public readonly uint   offset;
+        public readonly uint   offset_be;
+        public readonly uint   ca_length;
+        public readonly uint   ca_length_be;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct PaddingArea
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct PaddingArea
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct IndicatorArea
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-            public readonly ushort magic;
-            public readonly byte   skipped;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct IndicatorArea
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+        public readonly ushort magic;
+        public readonly byte   skipped;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct TerminatorArea
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct TerminatorArea
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ReferenceArea
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-            public readonly byte   id_len;
-            public readonly byte   des_len;
-            public readonly byte   src_len;
-            public readonly byte   ext_ver;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ReferenceArea
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+        public readonly byte   id_len;
+        public readonly byte   des_len;
+        public readonly byte   src_len;
+        public readonly byte   ext_ver;
 
-            // Follows extension identifier for id_len bytes
-            // Follows extension descriptor for des_len bytes
-            // Follows extension source for src_len bytes
-        }
+        // Follows extension identifier for id_len bytes
+        // Follows extension descriptor for des_len bytes
+        // Follows extension source for src_len bytes
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SelectorArea
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-            public readonly byte   sequence;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SelectorArea
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+        public readonly byte   sequence;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/XA.cs b/Aaru.Filesystems/ISO9660/Structs/XA.cs
index 92dc5168b..836484708 100644
--- a/Aaru.Filesystems/ISO9660/Structs/XA.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/XA.cs
@@ -33,21 +33,20 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    // Big-endian
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CdromXa
     {
-        // Big-endian
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CdromXa
-        {
-            public readonly ushort       group;
-            public readonly ushort       user;
-            public readonly XaAttributes attributes;
-            public readonly ushort       signature;
-            public readonly byte         filenumber;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] reserved;
-        }
+        public readonly ushort       group;
+        public readonly ushort       user;
+        public readonly XaAttributes attributes;
+        public readonly ushort       signature;
+        public readonly byte         filenumber;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] reserved;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Structs/Ziso.cs b/Aaru.Filesystems/ISO9660/Structs/Ziso.cs
index f77703307..116f38394 100644
--- a/Aaru.Filesystems/ISO9660/Structs/Ziso.cs
+++ b/Aaru.Filesystems/ISO9660/Structs/Ziso.cs
@@ -34,32 +34,31 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems
-{
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class ISO9660
-    {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ZisofsHeader
-        {
-            public readonly ulong magic;
-            public readonly uint  uncomp_len;
-            public readonly uint  uncomp_len_be;
-            public readonly byte  header_size;    // Shifted >> 2
-            public readonly byte  block_size_log; // log2(block_size)
-        }
+namespace Aaru.Filesystems;
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ZisofsEntry
-        {
-            public readonly ushort signature;
-            public readonly byte   length;
-            public readonly byte   version;
-            public readonly ushort alogirhtm;
-            public readonly byte   header_size;    // Shifted >> 2
-            public readonly byte   block_size_log; // log2(block_size)
-            public readonly uint   uncomp_len;
-            public readonly uint   uncomp_len_be;
-        }
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class ISO9660
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ZisofsHeader
+    {
+        public readonly ulong magic;
+        public readonly uint  uncomp_len;
+        public readonly uint  uncomp_len_be;
+        public readonly byte  header_size;    // Shifted >> 2
+        public readonly byte  block_size_log; // log2(block_size)
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ZisofsEntry
+    {
+        public readonly ushort signature;
+        public readonly byte   length;
+        public readonly byte   version;
+        public readonly ushort alogirhtm;
+        public readonly byte   header_size;    // Shifted >> 2
+        public readonly byte   block_size_log; // log2(block_size)
+        public readonly uint   uncomp_len;
+        public readonly uint   uncomp_len_be;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Super.cs b/Aaru.Filesystems/ISO9660/Super.cs
index 6be8e94c0..0f5474efd 100644
--- a/Aaru.Filesystems/ISO9660/Super.cs
+++ b/Aaru.Filesystems/ISO9660/Super.cs
@@ -43,331 +43,359 @@ using Aaru.Decoders.Sega;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    /// <inheritdoc />
+    public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                             Dictionary<string, string> options, string @namespace)
     {
-        /// <inheritdoc />
-        public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
-                                 Dictionary<string, string> options, string @namespace)
+        Encoding = encoding ?? Encoding.GetEncoding(1252);
+        byte[] vdMagic = new byte[5]; // Volume Descriptor magic "CD001"
+        byte[] hsMagic = new byte[5]; // Volume Descriptor magic "CDROM"
+
+        options ??= GetDefaultOptions();
+
+        if(options.TryGetValue("debug", out string debugString))
+            bool.TryParse(debugString, out _debug);
+
+        if(options.TryGetValue("use_path_table", out string usePathTableString))
+            bool.TryParse(usePathTableString, out _usePathTable);
+
+        if(options.TryGetValue("use_trans_tbl", out string useTransTblString))
+            bool.TryParse(useTransTblString, out _useTransTbl);
+
+        if(options.TryGetValue("use_evd", out string useEvdString))
+            bool.TryParse(useEvdString, out _useEvd);
+
+        // Default namespace
+        @namespace ??= "joliet";
+
+        switch(@namespace.ToLowerInvariant())
         {
-            Encoding = encoding ?? Encoding.GetEncoding(1252);
-            byte[] vdMagic = new byte[5]; // Volume Descriptor magic "CD001"
-            byte[] hsMagic = new byte[5]; // Volume Descriptor magic "CDROM"
+            case "normal":
+                _namespace = Namespace.Normal;
 
-            options ??= GetDefaultOptions();
+                break;
+            case "vms":
+                _namespace = Namespace.Vms;
 
-            if(options.TryGetValue("debug", out string debugString))
-                bool.TryParse(debugString, out _debug);
+                break;
+            case "joliet":
+                _namespace = Namespace.Joliet;
 
-            if(options.TryGetValue("use_path_table", out string usePathTableString))
-                bool.TryParse(usePathTableString, out _usePathTable);
+                break;
+            case "rrip":
+                _namespace = Namespace.Rrip;
 
-            if(options.TryGetValue("use_trans_tbl", out string useTransTblString))
-                bool.TryParse(useTransTblString, out _useTransTbl);
+                break;
+            case "romeo":
+                _namespace = Namespace.Romeo;
 
-            if(options.TryGetValue("use_evd", out string useEvdString))
-                bool.TryParse(useEvdString, out _useEvd);
+                break;
+            default: return ErrorNumber.InvalidArgument;
+        }
 
-            // Default namespace
-            @namespace ??= "joliet";
+        PrimaryVolumeDescriptor?           pvd      = null;
+        PrimaryVolumeDescriptor?           jolietvd = null;
+        BootRecord?                        bvd      = null;
+        HighSierraPrimaryVolumeDescriptor? hsvd     = null;
+        FileStructureVolumeDescriptor?     fsvd     = null;
 
-            switch(@namespace.ToLowerInvariant())
-            {
-                case "normal":
-                    _namespace = Namespace.Normal;
+        // ISO9660 is designed for 2048 bytes/sector devices
+        if(imagePlugin.Info.SectorSize < 2048)
+            return ErrorNumber.InvalidArgument;
 
-                    break;
-                case "vms":
-                    _namespace = Namespace.Vms;
+        // ISO9660 Primary Volume Descriptor starts at sector 16, so that's minimal size.
+        if(partition.End < 16)
+            return ErrorNumber.InvalidArgument;
 
-                    break;
-                case "joliet":
-                    _namespace = Namespace.Joliet;
+        ulong counter = 0;
 
-                    break;
-                case "rrip":
-                    _namespace = Namespace.Rrip;
+        ErrorNumber errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSector);
 
-                    break;
-                case "romeo":
-                    _namespace = Namespace.Romeo;
+        if(errno != ErrorNumber.NoError)
+            return errno;
 
-                    break;
-                default: return ErrorNumber.InvalidArgument;
-            }
+        int xaOff = vdSector.Length == 2336 ? 8 : 0;
+        Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5);
+        _highSierra = Encoding.GetString(hsMagic) == HIGH_SIERRA_MAGIC;
+        int hsOff = 0;
 
-            PrimaryVolumeDescriptor?           pvd      = null;
-            PrimaryVolumeDescriptor?           jolietvd = null;
-            BootRecord?                        bvd      = null;
-            HighSierraPrimaryVolumeDescriptor? hsvd     = null;
-            FileStructureVolumeDescriptor?     fsvd     = null;
+        if(_highSierra)
+            hsOff = 8;
 
-            // ISO9660 is designed for 2048 bytes/sector devices
-            if(imagePlugin.Info.SectorSize < 2048)
-                return ErrorNumber.InvalidArgument;
+        _cdi = false;
+        List<ulong> bvdSectors = new();
+        List<ulong> pvdSectors = new();
+        List<ulong> svdSectors = new();
+        List<ulong> evdSectors = new();
+        List<ulong> vpdSectors = new();
 
-            // ISO9660 Primary Volume Descriptor starts at sector 16, so that's minimal size.
-            if(partition.End < 16)
-                return ErrorNumber.InvalidArgument;
+        while(true)
+        {
+            AaruConsole.DebugWriteLine("ISO9660 plugin", "Processing VD loop no. {0}", counter);
 
-            ulong counter = 0;
-
-            ErrorNumber errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSector);
+            // Seek to Volume Descriptor
+            AaruConsole.DebugWriteLine("ISO9660 plugin", "Reading sector {0}", 16 + counter + partition.Start);
+            errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSectorTmp);
 
             if(errno != ErrorNumber.NoError)
                 return errno;
 
-            int xaOff = vdSector.Length == 2336 ? 8 : 0;
-            Array.Copy(vdSector, 0x009 + xaOff, hsMagic, 0, 5);
-            _highSierra = Encoding.GetString(hsMagic) == HIGH_SIERRA_MAGIC;
-            int hsOff = 0;
+            vdSector = new byte[vdSectorTmp.Length - xaOff];
+            Array.Copy(vdSectorTmp, xaOff, vdSector, 0, vdSector.Length);
 
-            if(_highSierra)
-                hsOff = 8;
+            byte vdType = vdSector[0 + hsOff]; // Volume Descriptor Type, should be 1 or 2.
+            AaruConsole.DebugWriteLine("ISO9660 plugin", "VDType = {0}", vdType);
 
-            _cdi = false;
-            List<ulong> bvdSectors = new();
-            List<ulong> pvdSectors = new();
-            List<ulong> svdSectors = new();
-            List<ulong> evdSectors = new();
-            List<ulong> vpdSectors = new();
-
-            while(true)
+            if(vdType == 255) // Supposedly we are in the PVD.
             {
-                AaruConsole.DebugWriteLine("ISO9660 plugin", "Processing VD loop no. {0}", counter);
+                if(counter == 0)
+                    return ErrorNumber.InvalidArgument;
 
-                // Seek to Volume Descriptor
-                AaruConsole.DebugWriteLine("ISO9660 plugin", "Reading sector {0}", 16 + counter + partition.Start);
-                errno = imagePlugin.ReadSector(16 + counter + partition.Start, out byte[] vdSectorTmp);
+                break;
+            }
+
+            Array.Copy(vdSector, 0x001, vdMagic, 0, 5);
+            Array.Copy(vdSector, 0x009, hsMagic, 0, 5);
+
+            if(Encoding.GetString(vdMagic) != ISO_MAGIC         &&
+               Encoding.GetString(hsMagic) != HIGH_SIERRA_MAGIC &&
+               Encoding.GetString(vdMagic) !=
+               CDI_MAGIC) // Recognized, it is an ISO9660, now check for rest of data.
+            {
+                if(counter == 0)
+                    return ErrorNumber.InvalidArgument;
+
+                break;
+            }
+
+            _cdi |= Encoding.GetString(vdMagic) == CDI_MAGIC;
+
+            switch(vdType)
+            {
+                case 0:
+                {
+                    if(_debug)
+                        bvdSectors.Add(16 + counter + partition.Start);
+
+                    break;
+                }
+
+                case 1:
+                {
+                    if(_highSierra)
+                        hsvd = Marshal.
+                            ByteArrayToStructureLittleEndian<HighSierraPrimaryVolumeDescriptor>(vdSector);
+                    else if(_cdi)
+                        fsvd = Marshal.ByteArrayToStructureBigEndian<FileStructureVolumeDescriptor>(vdSector);
+                    else
+                        pvd = Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(vdSector);
+
+                    if(_debug)
+                        pvdSectors.Add(16 + counter + partition.Start);
+
+                    break;
+                }
+
+                case 2:
+                {
+                    PrimaryVolumeDescriptor svd =
+                        Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(vdSector);
+
+                    // TODO: Other escape sequences
+                    // Check if this is Joliet
+                    if(svd.version == 1)
+                    {
+                        if(svd.escape_sequences[0] == '%' &&
+                           svd.escape_sequences[1] == '/')
+                            if(svd.escape_sequences[2] == '@' ||
+                               svd.escape_sequences[2] == 'C' ||
+                               svd.escape_sequences[2] == 'E')
+                                jolietvd = svd;
+                            else
+                                AaruConsole.DebugWriteLine("ISO9660 plugin",
+                                                           "Found unknown supplementary volume descriptor");
+
+                        if(_debug)
+                            svdSectors.Add(16 + counter + partition.Start);
+                    }
+                    else
+                    {
+                        if(_debug)
+                            evdSectors.Add(16 + counter + partition.Start);
+
+                        if(_useEvd)
+                        {
+                            // Basically until escape sequences are implemented, let the user chose the encoding.
+                            // This is the same as user choosing Romeo namespace, but using the EVD instead of the PVD
+                            _namespace = Namespace.Romeo;
+                            pvd        = svd;
+                        }
+                    }
+
+                    break;
+                }
+
+                case 3:
+                {
+                    if(_debug)
+                        vpdSectors.Add(16 + counter + partition.Start);
+
+                    break;
+                }
+            }
+
+            counter++;
+        }
+
+        DecodedVolumeDescriptor decodedVd;
+        var                     decodedJolietVd = new DecodedVolumeDescriptor();
+
+        XmlFsType = new FileSystemType();
+
+        if(pvd  == null &&
+           hsvd == null &&
+           fsvd == null)
+        {
+            AaruConsole.ErrorWriteLine("ERROR: Could not find primary volume descriptor");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        if(_highSierra)
+            decodedVd = DecodeVolumeDescriptor(hsvd.Value);
+        else if(_cdi)
+            decodedVd = DecodeVolumeDescriptor(fsvd.Value);
+        else
+            decodedVd = DecodeVolumeDescriptor(pvd.Value, _namespace == Namespace.Romeo ? Encoding : Encoding.ASCII);
+
+        if(jolietvd != null)
+            decodedJolietVd = DecodeJolietDescriptor(jolietvd.Value);
+
+        if(_namespace != Namespace.Romeo)
+            Encoding = Encoding.ASCII;
+
+        string fsFormat;
+        byte[] pathTableData;
+
+        uint pathTableMsbLocation;
+        uint pathTableLsbLocation = 0; // Initialize to 0 as ignored in CD-i
+
+        _image = imagePlugin;
+
+        if(_highSierra)
+        {
+            _blockSize = hsvd.Value.logical_block_size;
+
+            pathTableData = ReadSingleExtent(hsvd.Value.path_table_size,
+                                             Swapping.Swap(hsvd.Value.mandatory_path_table_msb));
+
+            fsFormat = "High Sierra Format";
+
+            pathTableMsbLocation = hsvd.Value.mandatory_path_table_msb;
+            pathTableLsbLocation = hsvd.Value.mandatory_path_table_lsb;
+        }
+        else if(_cdi)
+        {
+            _blockSize = fsvd.Value.logical_block_size;
+
+            pathTableData = ReadSingleExtent(fsvd.Value.path_table_size, fsvd.Value.path_table_addr);
+
+            fsFormat = "CD-i";
+
+            pathTableMsbLocation = fsvd.Value.path_table_addr;
+
+            // TODO: Until escape sequences are implemented this is the default CD-i encoding.
+            Encoding = Encoding.GetEncoding("iso8859-1");
+        }
+        else
+        {
+            _blockSize = pvd.Value.logical_block_size;
+
+            pathTableData = ReadSingleExtent(pvd.Value.path_table_size, Swapping.Swap(pvd.Value.type_m_path_table));
+
+            fsFormat = "ISO9660";
+
+            pathTableMsbLocation = pvd.Value.type_m_path_table;
+            pathTableLsbLocation = pvd.Value.type_l_path_table;
+        }
+
+        _pathTable = _highSierra ? DecodeHighSierraPathTable(pathTableData) : DecodePathTable(pathTableData);
+
+        if(_pathTable is null)
+        {
+            pathTableData = ReadSingleExtent(pathTableData.Length, pathTableLsbLocation);
+
+            _pathTable = _highSierra ? DecodeHighSierraPathTable(pathTableData) : DecodePathTable(pathTableData);
+        }
+
+        // High Sierra and CD-i do not support Joliet or RRIP
+        if((_highSierra || _cdi)          &&
+           _namespace != Namespace.Normal &&
+           _namespace != Namespace.Vms)
+            _namespace = Namespace.Normal;
+
+        if(jolietvd is null &&
+           _namespace == Namespace.Joliet)
+            _namespace = Namespace.Normal;
+
+        uint rootLocation;
+        uint rootSize;
+        byte rootXattrLength = 0;
+
+        if(!_cdi)
+        {
+            rootLocation = _highSierra ? hsvd.Value.root_directory_record.extent
+                               : pvd.Value.root_directory_record.extent;
+
+            rootXattrLength = _highSierra ? hsvd.Value.root_directory_record.xattr_len
+                                  : pvd.Value.root_directory_record.xattr_len;
+
+            rootSize = _highSierra ? hsvd.Value.root_directory_record.size : pvd.Value.root_directory_record.size;
+
+            if(_pathTable?.Length > 1 &&
+               rootLocation       != _pathTable[0].Extent)
+            {
+                AaruConsole.DebugWriteLine("ISO9660 plugin",
+                                           "Path table and PVD do not point to the same location for the root directory!");
+
+                errno = ReadSector(rootLocation, out byte[] firstRootSector);
 
                 if(errno != ErrorNumber.NoError)
                     return errno;
 
-                vdSector = new byte[vdSectorTmp.Length - xaOff];
-                Array.Copy(vdSectorTmp, xaOff, vdSector, 0, vdSector.Length);
+                bool pvdWrongRoot = false;
 
-                byte vdType = vdSector[0 + hsOff]; // Volume Descriptor Type, should be 1 or 2.
-                AaruConsole.DebugWriteLine("ISO9660 plugin", "VDType = {0}", vdType);
-
-                if(vdType == 255) // Supposedly we are in the PVD.
+                if(_highSierra)
                 {
-                    if(counter == 0)
-                        return ErrorNumber.InvalidArgument;
+                    HighSierraDirectoryRecord rootEntry =
+                        Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(firstRootSector);
 
-                    break;
+                    if(rootEntry.extent != rootLocation)
+                        pvdWrongRoot = true;
+                }
+                else
+                {
+                    DirectoryRecord rootEntry =
+                        Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(firstRootSector);
+
+                    if(rootEntry.extent != rootLocation)
+                        pvdWrongRoot = true;
                 }
 
-                Array.Copy(vdSector, 0x001, vdMagic, 0, 5);
-                Array.Copy(vdSector, 0x009, hsMagic, 0, 5);
-
-                if(Encoding.GetString(vdMagic) != ISO_MAGIC         &&
-                   Encoding.GetString(hsMagic) != HIGH_SIERRA_MAGIC &&
-                   Encoding.GetString(vdMagic) !=
-                   CDI_MAGIC) // Recognized, it is an ISO9660, now check for rest of data.
-                {
-                    if(counter == 0)
-                        return ErrorNumber.InvalidArgument;
-
-                    break;
-                }
-
-                _cdi |= Encoding.GetString(vdMagic) == CDI_MAGIC;
-
-                switch(vdType)
-                {
-                    case 0:
-                    {
-                        if(_debug)
-                            bvdSectors.Add(16 + counter + partition.Start);
-
-                        break;
-                    }
-
-                    case 1:
-                    {
-                        if(_highSierra)
-                            hsvd = Marshal.
-                                ByteArrayToStructureLittleEndian<HighSierraPrimaryVolumeDescriptor>(vdSector);
-                        else if(_cdi)
-                            fsvd = Marshal.ByteArrayToStructureBigEndian<FileStructureVolumeDescriptor>(vdSector);
-                        else
-                            pvd = Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(vdSector);
-
-                        if(_debug)
-                            pvdSectors.Add(16 + counter + partition.Start);
-
-                        break;
-                    }
-
-                    case 2:
-                    {
-                        PrimaryVolumeDescriptor svd =
-                            Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(vdSector);
-
-                        // TODO: Other escape sequences
-                        // Check if this is Joliet
-                        if(svd.version == 1)
-                        {
-                            if(svd.escape_sequences[0] == '%' &&
-                               svd.escape_sequences[1] == '/')
-                                if(svd.escape_sequences[2] == '@' ||
-                                   svd.escape_sequences[2] == 'C' ||
-                                   svd.escape_sequences[2] == 'E')
-                                    jolietvd = svd;
-                                else
-                                    AaruConsole.DebugWriteLine("ISO9660 plugin",
-                                                               "Found unknown supplementary volume descriptor");
-
-                            if(_debug)
-                                svdSectors.Add(16 + counter + partition.Start);
-                        }
-                        else
-                        {
-                            if(_debug)
-                                evdSectors.Add(16 + counter + partition.Start);
-
-                            if(_useEvd)
-                            {
-                                // Basically until escape sequences are implemented, let the user chose the encoding.
-                                // This is the same as user choosing Romeo namespace, but using the EVD instead of the PVD
-                                _namespace = Namespace.Romeo;
-                                pvd        = svd;
-                            }
-                        }
-
-                        break;
-                    }
-
-                    case 3:
-                    {
-                        if(_debug)
-                            vpdSectors.Add(16 + counter + partition.Start);
-
-                        break;
-                    }
-                }
-
-                counter++;
-            }
-
-            DecodedVolumeDescriptor decodedVd;
-            var                     decodedJolietVd = new DecodedVolumeDescriptor();
-
-            XmlFsType = new FileSystemType();
-
-            if(pvd  == null &&
-               hsvd == null &&
-               fsvd == null)
-            {
-                AaruConsole.ErrorWriteLine("ERROR: Could not find primary volume descriptor");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(_highSierra)
-                decodedVd = DecodeVolumeDescriptor(hsvd.Value);
-            else if(_cdi)
-                decodedVd = DecodeVolumeDescriptor(fsvd.Value);
-            else
-                decodedVd = DecodeVolumeDescriptor(pvd.Value, _namespace == Namespace.Romeo ? Encoding : Encoding.ASCII);
-
-            if(jolietvd != null)
-                decodedJolietVd = DecodeJolietDescriptor(jolietvd.Value);
-
-            if(_namespace != Namespace.Romeo)
-                Encoding = Encoding.ASCII;
-
-            string fsFormat;
-            byte[] pathTableData;
-
-            uint pathTableMsbLocation;
-            uint pathTableLsbLocation = 0; // Initialize to 0 as ignored in CD-i
-
-            _image = imagePlugin;
-
-            if(_highSierra)
-            {
-                _blockSize = hsvd.Value.logical_block_size;
-
-                pathTableData = ReadSingleExtent(hsvd.Value.path_table_size,
-                                                 Swapping.Swap(hsvd.Value.mandatory_path_table_msb));
-
-                fsFormat = "High Sierra Format";
-
-                pathTableMsbLocation = hsvd.Value.mandatory_path_table_msb;
-                pathTableLsbLocation = hsvd.Value.mandatory_path_table_lsb;
-            }
-            else if(_cdi)
-            {
-                _blockSize = fsvd.Value.logical_block_size;
-
-                pathTableData = ReadSingleExtent(fsvd.Value.path_table_size, fsvd.Value.path_table_addr);
-
-                fsFormat = "CD-i";
-
-                pathTableMsbLocation = fsvd.Value.path_table_addr;
-
-                // TODO: Until escape sequences are implemented this is the default CD-i encoding.
-                Encoding = Encoding.GetEncoding("iso8859-1");
-            }
-            else
-            {
-                _blockSize = pvd.Value.logical_block_size;
-
-                pathTableData = ReadSingleExtent(pvd.Value.path_table_size, Swapping.Swap(pvd.Value.type_m_path_table));
-
-                fsFormat = "ISO9660";
-
-                pathTableMsbLocation = pvd.Value.type_m_path_table;
-                pathTableLsbLocation = pvd.Value.type_l_path_table;
-            }
-
-            _pathTable = _highSierra ? DecodeHighSierraPathTable(pathTableData) : DecodePathTable(pathTableData);
-
-            if(_pathTable is null)
-            {
-                pathTableData = ReadSingleExtent(pathTableData.Length, pathTableLsbLocation);
-
-                _pathTable = _highSierra ? DecodeHighSierraPathTable(pathTableData) : DecodePathTable(pathTableData);
-            }
-
-            // High Sierra and CD-i do not support Joliet or RRIP
-            if((_highSierra || _cdi)          &&
-               _namespace != Namespace.Normal &&
-               _namespace != Namespace.Vms)
-                _namespace = Namespace.Normal;
-
-            if(jolietvd is null &&
-               _namespace == Namespace.Joliet)
-                _namespace = Namespace.Normal;
-
-            uint rootLocation;
-            uint rootSize;
-            byte rootXattrLength = 0;
-
-            if(!_cdi)
-            {
-                rootLocation = _highSierra ? hsvd.Value.root_directory_record.extent
-                                   : pvd.Value.root_directory_record.extent;
-
-                rootXattrLength = _highSierra ? hsvd.Value.root_directory_record.xattr_len
-                                      : pvd.Value.root_directory_record.xattr_len;
-
-                rootSize = _highSierra ? hsvd.Value.root_directory_record.size : pvd.Value.root_directory_record.size;
-
-                if(_pathTable?.Length > 1 &&
-                   rootLocation       != _pathTable[0].Extent)
+                if(pvdWrongRoot)
                 {
                     AaruConsole.DebugWriteLine("ISO9660 plugin",
-                                               "Path table and PVD do not point to the same location for the root directory!");
+                                               "PVD does not point to correct root directory, checking path table...");
 
-                    errno = ReadSector(rootLocation, out byte[] firstRootSector);
+                    bool pathTableWrongRoot = false;
 
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
+                    rootLocation = _pathTable[0].Extent;
 
-                    bool pvdWrongRoot = false;
+                    errno = ReadSector(_pathTable[0].Extent, out firstRootSector);
 
                     if(_highSierra)
                     {
@@ -375,7 +403,7 @@ namespace Aaru.Filesystems
                             Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(firstRootSector);
 
                         if(rootEntry.extent != rootLocation)
-                            pvdWrongRoot = true;
+                            pathTableWrongRoot = true;
                     }
                     else
                     {
@@ -383,423 +411,394 @@ namespace Aaru.Filesystems
                             Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(firstRootSector);
 
                         if(rootEntry.extent != rootLocation)
-                            pvdWrongRoot = true;
+                            pathTableWrongRoot = true;
                     }
 
-                    if(pvdWrongRoot)
+                    if(pathTableWrongRoot)
                     {
-                        AaruConsole.DebugWriteLine("ISO9660 plugin",
-                                                   "PVD does not point to correct root directory, checking path table...");
+                        AaruConsole.ErrorWriteLine("Cannot find root directory...");
 
-                        bool pathTableWrongRoot = false;
-
-                        rootLocation = _pathTable[0].Extent;
-
-                        errno = ReadSector(_pathTable[0].Extent, out firstRootSector);
-
-                        if(_highSierra)
-                        {
-                            HighSierraDirectoryRecord rootEntry =
-                                Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(firstRootSector);
-
-                            if(rootEntry.extent != rootLocation)
-                                pathTableWrongRoot = true;
-                        }
-                        else
-                        {
-                            DirectoryRecord rootEntry =
-                                Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(firstRootSector);
-
-                            if(rootEntry.extent != rootLocation)
-                                pathTableWrongRoot = true;
-                        }
-
-                        if(pathTableWrongRoot)
-                        {
-                            AaruConsole.ErrorWriteLine("Cannot find root directory...");
-
-                            return ErrorNumber.InvalidArgument;
-                        }
-
-                        _usePathTable = true;
+                        return ErrorNumber.InvalidArgument;
                     }
+
+                    _usePathTable = true;
                 }
             }
-            else
-            {
-                rootLocation = _pathTable[0].Extent;
+        }
+        else
+        {
+            rootLocation = _pathTable[0].Extent;
 
-                errno = ReadSector(rootLocation, out byte[] firstRootSector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                CdiDirectoryRecord rootEntry =
-                    Marshal.ByteArrayToStructureBigEndian<CdiDirectoryRecord>(firstRootSector);
-
-                rootSize = rootEntry.size;
-
-                _usePathTable = _usePathTable || _pathTable.Length == 1;
-                _useTransTbl  = false;
-            }
-
-            // In case the path table is incomplete
-            if(_usePathTable && (_pathTable is null || _pathTable?.Length <= 1))
-                _usePathTable = false;
-
-            if(_usePathTable && !_cdi)
-            {
-                rootLocation = _pathTable[0].Extent;
-
-                errno = ReadSector(rootLocation, out byte[] firstRootSector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                if(_highSierra)
-                {
-                    HighSierraDirectoryRecord rootEntry =
-                        Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(firstRootSector);
-
-                    rootSize = rootEntry.size;
-                }
-                else
-                {
-                    DirectoryRecord rootEntry =
-                        Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(firstRootSector);
-
-                    rootSize = rootEntry.size;
-                }
-
-                rootXattrLength = _pathTable[0].XattrLength;
-            }
-
-            try
-            {
-                _ = ReadSingleExtent(rootSize, rootLocation);
-            }
-            catch
-            {
-                return ErrorNumber.InvalidArgument;
-            }
-
-            errno = ReadSector(partition.Start, out byte[] ipbinSector);
+            errno = ReadSector(rootLocation, out byte[] firstRootSector);
 
             if(errno != ErrorNumber.NoError)
                 return errno;
 
-            CD.IPBin?        segaCd    = CD.DecodeIPBin(ipbinSector);
-            Saturn.IPBin?    saturn    = Saturn.DecodeIPBin(ipbinSector);
-            Dreamcast.IPBin? dreamcast = Dreamcast.DecodeIPBin(ipbinSector);
+            CdiDirectoryRecord rootEntry =
+                Marshal.ByteArrayToStructureBigEndian<CdiDirectoryRecord>(firstRootSector);
 
-            if(_namespace == Namespace.Joliet ||
-               _namespace == Namespace.Rrip)
+            rootSize = rootEntry.size;
+
+            _usePathTable = _usePathTable || _pathTable.Length == 1;
+            _useTransTbl  = false;
+        }
+
+        // In case the path table is incomplete
+        if(_usePathTable && (_pathTable is null || _pathTable?.Length <= 1))
+            _usePathTable = false;
+
+        if(_usePathTable && !_cdi)
+        {
+            rootLocation = _pathTable[0].Extent;
+
+            errno = ReadSector(rootLocation, out byte[] firstRootSector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            if(_highSierra)
             {
-                _usePathTable = false;
-                _useTransTbl  = false;
-            }
+                HighSierraDirectoryRecord rootEntry =
+                    Marshal.ByteArrayToStructureLittleEndian<HighSierraDirectoryRecord>(firstRootSector);
 
-            // Cannot traverse path table if we substitute the names for the ones in TRANS.TBL
-            if(_useTransTbl)
-                _usePathTable = false;
-
-            if(_namespace != Namespace.Joliet)
-                _rootDirectoryCache = _cdi
-                                          ? DecodeCdiDirectory(rootLocation + rootXattrLength, rootSize)
-                                          : _highSierra
-                                              ? DecodeHighSierraDirectory(rootLocation + rootXattrLength, rootSize)
-                                              : DecodeIsoDirectory(rootLocation        + rootXattrLength, rootSize);
-
-            XmlFsType.Type = fsFormat;
-
-            if(jolietvd != null &&
-               (_namespace == Namespace.Joliet || _namespace == Namespace.Rrip))
-            {
-                rootLocation    = jolietvd.Value.root_directory_record.extent;
-                rootXattrLength = jolietvd.Value.root_directory_record.xattr_len;
-
-                rootSize = jolietvd.Value.root_directory_record.size;
-
-                _joliet = true;
-
-                _rootDirectoryCache = DecodeIsoDirectory(rootLocation + rootXattrLength, rootSize);
-
-                XmlFsType.VolumeName = decodedJolietVd.VolumeIdentifier;
-
-                if(string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ||
-                   decodedVd.SystemIdentifier.Length > decodedJolietVd.SystemIdentifier.Length)
-                    XmlFsType.SystemIdentifier = decodedVd.SystemIdentifier;
-                else
-                    XmlFsType.SystemIdentifier = string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ? null
-                                                     : decodedJolietVd.SystemIdentifier;
-
-                if(string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) ||
-                   decodedVd.VolumeSetIdentifier.Length > decodedJolietVd.VolumeSetIdentifier.Length)
-                    XmlFsType.VolumeSetIdentifier = decodedVd.VolumeSetIdentifier;
-                else
-                    XmlFsType.VolumeSetIdentifier = string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) ? null
-                                                        : decodedJolietVd.VolumeSetIdentifier;
-
-                if(string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) ||
-                   decodedVd.PublisherIdentifier.Length > decodedJolietVd.PublisherIdentifier.Length)
-                    XmlFsType.PublisherIdentifier = decodedVd.PublisherIdentifier;
-                else
-                    XmlFsType.PublisherIdentifier = string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) ? null
-                                                        : decodedJolietVd.PublisherIdentifier;
-
-                if(string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier) ||
-                   decodedVd.DataPreparerIdentifier.Length > decodedJolietVd.DataPreparerIdentifier.Length)
-                    XmlFsType.DataPreparerIdentifier = decodedVd.DataPreparerIdentifier;
-                else
-                    XmlFsType.DataPreparerIdentifier = string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier)
-                                                           ? null : decodedJolietVd.DataPreparerIdentifier;
-
-                if(string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ||
-                   decodedVd.ApplicationIdentifier.Length > decodedJolietVd.ApplicationIdentifier.Length)
-                    XmlFsType.ApplicationIdentifier = decodedVd.ApplicationIdentifier;
-                else
-                    XmlFsType.ApplicationIdentifier = string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ? null
-                                                          : decodedJolietVd.ApplicationIdentifier;
-
-                XmlFsType.CreationDate          = decodedJolietVd.CreationTime;
-                XmlFsType.CreationDateSpecified = true;
-
-                if(decodedJolietVd.HasModificationTime)
-                {
-                    XmlFsType.ModificationDate          = decodedJolietVd.ModificationTime;
-                    XmlFsType.ModificationDateSpecified = true;
-                }
-
-                if(decodedJolietVd.HasExpirationTime)
-                {
-                    XmlFsType.ExpirationDate          = decodedJolietVd.ExpirationTime;
-                    XmlFsType.ExpirationDateSpecified = true;
-                }
-
-                if(decodedJolietVd.HasEffectiveTime)
-                {
-                    XmlFsType.EffectiveDate          = decodedJolietVd.EffectiveTime;
-                    XmlFsType.EffectiveDateSpecified = true;
-                }
-
-                decodedVd = decodedJolietVd;
+                rootSize = rootEntry.size;
             }
             else
             {
-                XmlFsType.SystemIdentifier       = decodedVd.SystemIdentifier;
-                XmlFsType.VolumeName             = decodedVd.VolumeIdentifier;
-                XmlFsType.VolumeSetIdentifier    = decodedVd.VolumeSetIdentifier;
-                XmlFsType.PublisherIdentifier    = decodedVd.PublisherIdentifier;
-                XmlFsType.DataPreparerIdentifier = decodedVd.DataPreparerIdentifier;
-                XmlFsType.ApplicationIdentifier  = decodedVd.ApplicationIdentifier;
-                XmlFsType.CreationDate           = decodedVd.CreationTime;
-                XmlFsType.CreationDateSpecified  = true;
+                DirectoryRecord rootEntry =
+                    Marshal.ByteArrayToStructureLittleEndian<DirectoryRecord>(firstRootSector);
 
-                if(decodedVd.HasModificationTime)
-                {
-                    XmlFsType.ModificationDate          = decodedVd.ModificationTime;
-                    XmlFsType.ModificationDateSpecified = true;
-                }
-
-                if(decodedVd.HasExpirationTime)
-                {
-                    XmlFsType.ExpirationDate          = decodedVd.ExpirationTime;
-                    XmlFsType.ExpirationDateSpecified = true;
-                }
-
-                if(decodedVd.HasEffectiveTime)
-                {
-                    XmlFsType.EffectiveDate          = decodedVd.EffectiveTime;
-                    XmlFsType.EffectiveDateSpecified = true;
-                }
+                rootSize = rootEntry.size;
             }
 
-            if(_debug)
+            rootXattrLength = _pathTable[0].XattrLength;
+        }
+
+        try
+        {
+            _ = ReadSingleExtent(rootSize, rootLocation);
+        }
+        catch
+        {
+            return ErrorNumber.InvalidArgument;
+        }
+
+        errno = ReadSector(partition.Start, out byte[] ipbinSector);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        CD.IPBin?        segaCd    = CD.DecodeIPBin(ipbinSector);
+        Saturn.IPBin?    saturn    = Saturn.DecodeIPBin(ipbinSector);
+        Dreamcast.IPBin? dreamcast = Dreamcast.DecodeIPBin(ipbinSector);
+
+        if(_namespace == Namespace.Joliet ||
+           _namespace == Namespace.Rrip)
+        {
+            _usePathTable = false;
+            _useTransTbl  = false;
+        }
+
+        // Cannot traverse path table if we substitute the names for the ones in TRANS.TBL
+        if(_useTransTbl)
+            _usePathTable = false;
+
+        if(_namespace != Namespace.Joliet)
+            _rootDirectoryCache = _cdi
+                                      ? DecodeCdiDirectory(rootLocation + rootXattrLength, rootSize)
+                                      : _highSierra
+                                          ? DecodeHighSierraDirectory(rootLocation + rootXattrLength, rootSize)
+                                          : DecodeIsoDirectory(rootLocation        + rootXattrLength, rootSize);
+
+        XmlFsType.Type = fsFormat;
+
+        if(jolietvd != null &&
+           (_namespace == Namespace.Joliet || _namespace == Namespace.Rrip))
+        {
+            rootLocation    = jolietvd.Value.root_directory_record.extent;
+            rootXattrLength = jolietvd.Value.root_directory_record.xattr_len;
+
+            rootSize = jolietvd.Value.root_directory_record.size;
+
+            _joliet = true;
+
+            _rootDirectoryCache = DecodeIsoDirectory(rootLocation + rootXattrLength, rootSize);
+
+            XmlFsType.VolumeName = decodedJolietVd.VolumeIdentifier;
+
+            if(string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ||
+               decodedVd.SystemIdentifier.Length > decodedJolietVd.SystemIdentifier.Length)
+                XmlFsType.SystemIdentifier = decodedVd.SystemIdentifier;
+            else
+                XmlFsType.SystemIdentifier = string.IsNullOrEmpty(decodedJolietVd.SystemIdentifier) ? null
+                                                 : decodedJolietVd.SystemIdentifier;
+
+            if(string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) ||
+               decodedVd.VolumeSetIdentifier.Length > decodedJolietVd.VolumeSetIdentifier.Length)
+                XmlFsType.VolumeSetIdentifier = decodedVd.VolumeSetIdentifier;
+            else
+                XmlFsType.VolumeSetIdentifier = string.IsNullOrEmpty(decodedJolietVd.VolumeSetIdentifier) ? null
+                                                    : decodedJolietVd.VolumeSetIdentifier;
+
+            if(string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) ||
+               decodedVd.PublisherIdentifier.Length > decodedJolietVd.PublisherIdentifier.Length)
+                XmlFsType.PublisherIdentifier = decodedVd.PublisherIdentifier;
+            else
+                XmlFsType.PublisherIdentifier = string.IsNullOrEmpty(decodedJolietVd.PublisherIdentifier) ? null
+                                                    : decodedJolietVd.PublisherIdentifier;
+
+            if(string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier) ||
+               decodedVd.DataPreparerIdentifier.Length > decodedJolietVd.DataPreparerIdentifier.Length)
+                XmlFsType.DataPreparerIdentifier = decodedVd.DataPreparerIdentifier;
+            else
+                XmlFsType.DataPreparerIdentifier = string.IsNullOrEmpty(decodedJolietVd.DataPreparerIdentifier)
+                                                       ? null : decodedJolietVd.DataPreparerIdentifier;
+
+            if(string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ||
+               decodedVd.ApplicationIdentifier.Length > decodedJolietVd.ApplicationIdentifier.Length)
+                XmlFsType.ApplicationIdentifier = decodedVd.ApplicationIdentifier;
+            else
+                XmlFsType.ApplicationIdentifier = string.IsNullOrEmpty(decodedJolietVd.ApplicationIdentifier) ? null
+                                                      : decodedJolietVd.ApplicationIdentifier;
+
+            XmlFsType.CreationDate          = decodedJolietVd.CreationTime;
+            XmlFsType.CreationDateSpecified = true;
+
+            if(decodedJolietVd.HasModificationTime)
             {
-                _rootDirectoryCache.Add("$", new DecodedDirectoryEntry
+                XmlFsType.ModificationDate          = decodedJolietVd.ModificationTime;
+                XmlFsType.ModificationDateSpecified = true;
+            }
+
+            if(decodedJolietVd.HasExpirationTime)
+            {
+                XmlFsType.ExpirationDate          = decodedJolietVd.ExpirationTime;
+                XmlFsType.ExpirationDateSpecified = true;
+            }
+
+            if(decodedJolietVd.HasEffectiveTime)
+            {
+                XmlFsType.EffectiveDate          = decodedJolietVd.EffectiveTime;
+                XmlFsType.EffectiveDateSpecified = true;
+            }
+
+            decodedVd = decodedJolietVd;
+        }
+        else
+        {
+            XmlFsType.SystemIdentifier       = decodedVd.SystemIdentifier;
+            XmlFsType.VolumeName             = decodedVd.VolumeIdentifier;
+            XmlFsType.VolumeSetIdentifier    = decodedVd.VolumeSetIdentifier;
+            XmlFsType.PublisherIdentifier    = decodedVd.PublisherIdentifier;
+            XmlFsType.DataPreparerIdentifier = decodedVd.DataPreparerIdentifier;
+            XmlFsType.ApplicationIdentifier  = decodedVd.ApplicationIdentifier;
+            XmlFsType.CreationDate           = decodedVd.CreationTime;
+            XmlFsType.CreationDateSpecified  = true;
+
+            if(decodedVd.HasModificationTime)
+            {
+                XmlFsType.ModificationDate          = decodedVd.ModificationTime;
+                XmlFsType.ModificationDateSpecified = true;
+            }
+
+            if(decodedVd.HasExpirationTime)
+            {
+                XmlFsType.ExpirationDate          = decodedVd.ExpirationTime;
+                XmlFsType.ExpirationDateSpecified = true;
+            }
+
+            if(decodedVd.HasEffectiveTime)
+            {
+                XmlFsType.EffectiveDate          = decodedVd.EffectiveTime;
+                XmlFsType.EffectiveDateSpecified = true;
+            }
+        }
+
+        if(_debug)
+        {
+            _rootDirectoryCache.Add("$", new DecodedDirectoryEntry
+            {
+                Extents = new List<(uint extent, uint size)>
+                {
+                    (rootLocation, rootSize)
+                },
+                Filename  = "$",
+                Size      = rootSize,
+                Timestamp = decodedVd.CreationTime
+            });
+
+            if(!_cdi)
+                _rootDirectoryCache.Add("$PATH_TABLE.LSB", new DecodedDirectoryEntry
                 {
                     Extents = new List<(uint extent, uint size)>
                     {
-                        (rootLocation, rootSize)
+                        (pathTableLsbLocation, (uint)pathTableData.Length)
                     },
-                    Filename  = "$",
-                    Size      = rootSize,
-                    Timestamp = decodedVd.CreationTime
-                });
-
-                if(!_cdi)
-                    _rootDirectoryCache.Add("$PATH_TABLE.LSB", new DecodedDirectoryEntry
-                    {
-                        Extents = new List<(uint extent, uint size)>
-                        {
-                            (pathTableLsbLocation, (uint)pathTableData.Length)
-                        },
-                        Filename  = "$PATH_TABLE.LSB",
-                        Size      = (uint)pathTableData.Length,
-                        Timestamp = decodedVd.CreationTime
-                    });
-
-                _rootDirectoryCache.Add("$PATH_TABLE.MSB", new DecodedDirectoryEntry
-                {
-                    Extents = new List<(uint extent, uint size)>
-                    {
-                        (Swapping.Swap(pathTableMsbLocation), (uint)pathTableData.Length)
-                    },
-                    Filename  = "$PATH_TABLE.MSB",
+                    Filename  = "$PATH_TABLE.LSB",
                     Size      = (uint)pathTableData.Length,
                     Timestamp = decodedVd.CreationTime
                 });
 
-                for(int i = 0; i < bvdSectors.Count; i++)
-                    _rootDirectoryCache.Add(i == 0 ? "$BOOT" : $"$BOOT_{i}", new DecodedDirectoryEntry
-                    {
-                        Extents = new List<(uint extent, uint size)>
-                        {
-                            ((uint)i, 2048)
-                        },
-                        Filename  = i == 0 ? "$BOOT" : $"$BOOT_{i}",
-                        Size      = 2048,
-                        Timestamp = decodedVd.CreationTime
-                    });
-
-                for(int i = 0; i < pvdSectors.Count; i++)
-                    _rootDirectoryCache.Add(i == 0 ? "$PVD" : $"$PVD{i}", new DecodedDirectoryEntry
-                    {
-                        Extents = new List<(uint extent, uint size)>
-                        {
-                            ((uint)i, 2048)
-                        },
-                        Filename  = i == 0 ? "$PVD" : $"PVD_{i}",
-                        Size      = 2048,
-                        Timestamp = decodedVd.CreationTime
-                    });
-
-                for(int i = 0; i < svdSectors.Count; i++)
-                    _rootDirectoryCache.Add(i == 0 ? "$SVD" : $"$SVD_{i}", new DecodedDirectoryEntry
-                    {
-                        Extents = new List<(uint extent, uint size)>
-                        {
-                            ((uint)i, 2048)
-                        },
-                        Filename  = i == 0 ? "$SVD" : $"$SVD_{i}",
-                        Size      = 2048,
-                        Timestamp = decodedVd.CreationTime
-                    });
-
-                for(int i = 0; i < evdSectors.Count; i++)
-                    _rootDirectoryCache.Add(i == 0 ? "$EVD" : $"$EVD_{i}", new DecodedDirectoryEntry
-                    {
-                        Extents = new List<(uint extent, uint size)>
-                        {
-                            ((uint)i, 2048)
-                        },
-                        Filename  = i == 0 ? "$EVD" : $"$EVD_{i}",
-                        Size      = 2048,
-                        Timestamp = decodedVd.CreationTime
-                    });
-
-                for(int i = 0; i < vpdSectors.Count; i++)
-                    _rootDirectoryCache.Add(i == 0 ? "$VPD" : $"$VPD_{i}", new DecodedDirectoryEntry
-                    {
-                        Extents = new List<(uint extent, uint size)>
-                        {
-                            ((uint)i, 2048)
-                        },
-                        Filename  = i == 0 ? "$VPD" : $"$VPD_{i}",
-                        Size      = 2048,
-                        Timestamp = decodedVd.CreationTime
-                    });
-
-                if(segaCd != null)
-                    _rootDirectoryCache.Add("$IP.BIN", new DecodedDirectoryEntry
-                    {
-                        Extents = new List<(uint extent, uint size)>
-                        {
-                            ((uint)partition.Start, (uint)Marshal.SizeOf<CD.IPBin>())
-                        },
-                        Filename  = "$IP.BIN",
-                        Size      = (uint)Marshal.SizeOf<CD.IPBin>(),
-                        Timestamp = decodedVd.CreationTime
-                    });
-
-                if(saturn != null)
-                    _rootDirectoryCache.Add("$IP.BIN", new DecodedDirectoryEntry
-                    {
-                        Extents = new List<(uint extent, uint size)>
-                        {
-                            ((uint)partition.Start, (uint)Marshal.SizeOf<Saturn.IPBin>())
-                        },
-                        Filename  = "$IP.BIN",
-                        Size      = (uint)Marshal.SizeOf<Saturn.IPBin>(),
-                        Timestamp = decodedVd.CreationTime
-                    });
-
-                if(dreamcast != null)
-                    _rootDirectoryCache.Add("$IP.BIN", new DecodedDirectoryEntry
-                    {
-                        Extents = new List<(uint extent, uint size)>
-                        {
-                            ((uint)partition.Start, (uint)Marshal.SizeOf<Dreamcast.IPBin>())
-                        },
-                        Filename  = "$IP.BIN",
-                        Size      = (uint)Marshal.SizeOf<Dreamcast.IPBin>(),
-                        Timestamp = decodedVd.CreationTime
-                    });
-            }
-
-            XmlFsType.Bootable    |= bvd != null || segaCd != null || saturn != null || dreamcast != null;
-            XmlFsType.Clusters    =  decodedVd.Blocks;
-            XmlFsType.ClusterSize =  decodedVd.BlockSize;
-
-            _statfs = new FileSystemInfo
+            _rootDirectoryCache.Add("$PATH_TABLE.MSB", new DecodedDirectoryEntry
             {
-                Blocks = decodedVd.Blocks,
-                FilenameLength = (ushort)(jolietvd != null ? _namespace == Namespace.Joliet
-                                                                 ? 110
-                                                                 : 255 : 255),
-                PluginId = Id,
-                Type     = fsFormat
-            };
+                Extents = new List<(uint extent, uint size)>
+                {
+                    (Swapping.Swap(pathTableMsbLocation), (uint)pathTableData.Length)
+                },
+                Filename  = "$PATH_TABLE.MSB",
+                Size      = (uint)pathTableData.Length,
+                Timestamp = decodedVd.CreationTime
+            });
 
-            _directoryCache = new Dictionary<string, Dictionary<string, DecodedDirectoryEntry>>();
+            for(int i = 0; i < bvdSectors.Count; i++)
+                _rootDirectoryCache.Add(i == 0 ? "$BOOT" : $"$BOOT_{i}", new DecodedDirectoryEntry
+                {
+                    Extents = new List<(uint extent, uint size)>
+                    {
+                        ((uint)i, 2048)
+                    },
+                    Filename  = i == 0 ? "$BOOT" : $"$BOOT_{i}",
+                    Size      = 2048,
+                    Timestamp = decodedVd.CreationTime
+                });
 
-            if(_usePathTable)
-                foreach(DecodedDirectoryEntry subDirectory in _cdi
-                                                                  ? GetSubdirsFromCdiPathTable("")
-                                                                  : _highSierra
-                                                                      ? GetSubdirsFromHighSierraPathTable("")
-                                                                      : GetSubdirsFromIsoPathTable(""))
-                    _rootDirectoryCache[subDirectory.Filename] = subDirectory;
+            for(int i = 0; i < pvdSectors.Count; i++)
+                _rootDirectoryCache.Add(i == 0 ? "$PVD" : $"$PVD{i}", new DecodedDirectoryEntry
+                {
+                    Extents = new List<(uint extent, uint size)>
+                    {
+                        ((uint)i, 2048)
+                    },
+                    Filename  = i == 0 ? "$PVD" : $"PVD_{i}",
+                    Size      = 2048,
+                    Timestamp = decodedVd.CreationTime
+                });
 
-            _mounted = true;
+            for(int i = 0; i < svdSectors.Count; i++)
+                _rootDirectoryCache.Add(i == 0 ? "$SVD" : $"$SVD_{i}", new DecodedDirectoryEntry
+                {
+                    Extents = new List<(uint extent, uint size)>
+                    {
+                        ((uint)i, 2048)
+                    },
+                    Filename  = i == 0 ? "$SVD" : $"$SVD_{i}",
+                    Size      = 2048,
+                    Timestamp = decodedVd.CreationTime
+                });
 
-            return ErrorNumber.NoError;
+            for(int i = 0; i < evdSectors.Count; i++)
+                _rootDirectoryCache.Add(i == 0 ? "$EVD" : $"$EVD_{i}", new DecodedDirectoryEntry
+                {
+                    Extents = new List<(uint extent, uint size)>
+                    {
+                        ((uint)i, 2048)
+                    },
+                    Filename  = i == 0 ? "$EVD" : $"$EVD_{i}",
+                    Size      = 2048,
+                    Timestamp = decodedVd.CreationTime
+                });
+
+            for(int i = 0; i < vpdSectors.Count; i++)
+                _rootDirectoryCache.Add(i == 0 ? "$VPD" : $"$VPD_{i}", new DecodedDirectoryEntry
+                {
+                    Extents = new List<(uint extent, uint size)>
+                    {
+                        ((uint)i, 2048)
+                    },
+                    Filename  = i == 0 ? "$VPD" : $"$VPD_{i}",
+                    Size      = 2048,
+                    Timestamp = decodedVd.CreationTime
+                });
+
+            if(segaCd != null)
+                _rootDirectoryCache.Add("$IP.BIN", new DecodedDirectoryEntry
+                {
+                    Extents = new List<(uint extent, uint size)>
+                    {
+                        ((uint)partition.Start, (uint)Marshal.SizeOf<CD.IPBin>())
+                    },
+                    Filename  = "$IP.BIN",
+                    Size      = (uint)Marshal.SizeOf<CD.IPBin>(),
+                    Timestamp = decodedVd.CreationTime
+                });
+
+            if(saturn != null)
+                _rootDirectoryCache.Add("$IP.BIN", new DecodedDirectoryEntry
+                {
+                    Extents = new List<(uint extent, uint size)>
+                    {
+                        ((uint)partition.Start, (uint)Marshal.SizeOf<Saturn.IPBin>())
+                    },
+                    Filename  = "$IP.BIN",
+                    Size      = (uint)Marshal.SizeOf<Saturn.IPBin>(),
+                    Timestamp = decodedVd.CreationTime
+                });
+
+            if(dreamcast != null)
+                _rootDirectoryCache.Add("$IP.BIN", new DecodedDirectoryEntry
+                {
+                    Extents = new List<(uint extent, uint size)>
+                    {
+                        ((uint)partition.Start, (uint)Marshal.SizeOf<Dreamcast.IPBin>())
+                    },
+                    Filename  = "$IP.BIN",
+                    Size      = (uint)Marshal.SizeOf<Dreamcast.IPBin>(),
+                    Timestamp = decodedVd.CreationTime
+                });
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Unmount()
+        XmlFsType.Bootable    |= bvd != null || segaCd != null || saturn != null || dreamcast != null;
+        XmlFsType.Clusters    =  decodedVd.Blocks;
+        XmlFsType.ClusterSize =  decodedVd.BlockSize;
+
+        _statfs = new FileSystemInfo
         {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            Blocks = decodedVd.Blocks,
+            FilenameLength = (ushort)(jolietvd != null ? _namespace == Namespace.Joliet
+                                                             ? 110
+                                                             : 255 : 255),
+            PluginId = Id,
+            Type     = fsFormat
+        };
 
-            _rootDirectoryCache = null;
-            _directoryCache     = null;
-            _mounted            = false;
+        _directoryCache = new Dictionary<string, Dictionary<string, DecodedDirectoryEntry>>();
 
-            return ErrorNumber.NoError;
-        }
+        if(_usePathTable)
+            foreach(DecodedDirectoryEntry subDirectory in _cdi
+                                                              ? GetSubdirsFromCdiPathTable("")
+                                                              : _highSierra
+                                                                  ? GetSubdirsFromHighSierraPathTable("")
+                                                                  : GetSubdirsFromIsoPathTable(""))
+                _rootDirectoryCache[subDirectory.Filename] = subDirectory;
 
-        /// <inheritdoc />
-        public ErrorNumber StatFs(out FileSystemInfo stat)
-        {
-            stat = null;
+        _mounted = true;
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        return ErrorNumber.NoError;
+    }
 
-            stat = _statfs.ShallowCopy();
+    /// <inheritdoc />
+    public ErrorNumber Unmount()
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
 
-            return ErrorNumber.NoError;
-        }
+        _rootDirectoryCache = null;
+        _directoryCache     = null;
+        _mounted            = false;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber StatFs(out FileSystemInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        stat = _statfs.ShallowCopy();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ISO9660/Xattr.cs b/Aaru.Filesystems/ISO9660/Xattr.cs
index 387e47d08..046e4a96b 100644
--- a/Aaru.Filesystems/ISO9660/Xattr.cs
+++ b/Aaru.Filesystems/ISO9660/Xattr.cs
@@ -36,181 +36,180 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Enums;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class ISO9660
 {
-    public sealed partial class ISO9660
+    /// <inheritdoc />
+    public ErrorNumber ListXAttr(string path, out List<string> xattrs)
     {
-        /// <inheritdoc />
-        public ErrorNumber ListXAttr(string path, out List<string> xattrs)
-        {
-            xattrs = null;
+        xattrs = null;
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
 
-            ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
+        ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
 
-            if(err != ErrorNumber.NoError)
-                return err;
+        if(err != ErrorNumber.NoError)
+            return err;
 
-            xattrs = new List<string>();
+        xattrs = new List<string>();
 
-            if(entry.XattrLength > 0)
-                xattrs.Add("org.iso.9660.ea");
+        if(entry.XattrLength > 0)
+            xattrs.Add("org.iso.9660.ea");
 
-            if(entry.AssociatedFile != null)
-                xattrs.Add("org.iso.9660.AssociatedFile");
+        if(entry.AssociatedFile != null)
+            xattrs.Add("org.iso.9660.AssociatedFile");
 
-            if(entry.AppleDosType != null)
-                xattrs.Add("com.apple.dos.type");
+        if(entry.AppleDosType != null)
+            xattrs.Add("com.apple.dos.type");
 
-            if(entry.AppleProDosType != null)
-                xattrs.Add("com.apple.prodos.type");
+        if(entry.AppleProDosType != null)
+            xattrs.Add("com.apple.prodos.type");
 
-            if(entry.ResourceFork != null)
-                xattrs.Add("com.apple.ResourceFork");
+        if(entry.ResourceFork != null)
+            xattrs.Add("com.apple.ResourceFork");
 
-            if(entry.FinderInfo != null)
-                xattrs.Add("com.apple.FinderInfo");
+        if(entry.FinderInfo != null)
+            xattrs.Add("com.apple.FinderInfo");
 
-            if(entry.AppleIcon != null)
-                xattrs.Add("com.apple.Macintosh.Icon");
+        if(entry.AppleIcon != null)
+            xattrs.Add("com.apple.Macintosh.Icon");
 
-            if(entry.AmigaComment != null)
-                xattrs.Add("com.amiga.comments");
-
-            if(entry.Flags.HasFlag(FileFlags.Directory) ||
-               entry.Extents       == null              ||
-               entry.Extents.Count == 0)
-                return ErrorNumber.NoError;
-
-            ErrorNumber errno = _image.ReadSectorLong(entry.Extents[0].extent * _blockSize / 2048, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            if(sector[15] != 2)
-                return ErrorNumber.NoError;
-
-            xattrs.Add("org.iso.mode2.subheader");
-            xattrs.Add("org.iso.mode2.subheader.copy");
+        if(entry.AmigaComment != null)
+            xattrs.Add("com.amiga.comments");
 
+        if(entry.Flags.HasFlag(FileFlags.Directory) ||
+           entry.Extents       == null              ||
+           entry.Extents.Count == 0)
             return ErrorNumber.NoError;
-        }
 
-        /// <inheritdoc />
-        public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
+        ErrorNumber errno = _image.ReadSectorLong(entry.Extents[0].extent * _blockSize / 2048, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        if(sector[15] != 2)
+            return ErrorNumber.NoError;
+
+        xattrs.Add("org.iso.mode2.subheader");
+        xattrs.Add("org.iso.mode2.subheader.copy");
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
+    {
+        buf = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        switch(xattr)
         {
-            buf = null;
+            case "org.iso.9660.ea":
+                if(entry.XattrLength == 0)
+                    return ErrorNumber.NoSuchExtendedAttribute;
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+                if(entry.Extents is null)
+                    return ErrorNumber.InvalidArgument;
 
-            ErrorNumber err = GetFileEntry(path, out DecodedDirectoryEntry entry);
+                buf = ReadSingleExtent(entry.XattrLength * _blockSize, entry.Extents[0].extent);
 
-            if(err != ErrorNumber.NoError)
-                return err;
+                return ErrorNumber.NoError;
+            case "org.iso.9660.AssociatedFile":
+                if(entry.AssociatedFile is null)
+                    return ErrorNumber.NoSuchExtendedAttribute;
 
-            switch(xattr)
-            {
-                case "org.iso.9660.ea":
-                    if(entry.XattrLength == 0)
-                        return ErrorNumber.NoSuchExtendedAttribute;
+                if(entry.AssociatedFile.Extents is null)
+                    return ErrorNumber.InvalidArgument;
 
-                    if(entry.Extents is null)
-                        return ErrorNumber.InvalidArgument;
-
-                    buf = ReadSingleExtent(entry.XattrLength * _blockSize, entry.Extents[0].extent);
+                if(entry.AssociatedFile.Size == 0)
+                {
+                    buf = Array.Empty<byte>();
 
                     return ErrorNumber.NoError;
-                case "org.iso.9660.AssociatedFile":
-                    if(entry.AssociatedFile is null)
-                        return ErrorNumber.NoSuchExtendedAttribute;
+                }
 
-                    if(entry.AssociatedFile.Extents is null)
-                        return ErrorNumber.InvalidArgument;
+                buf = ReadWithExtents(0, (long)entry.AssociatedFile.Size, entry.AssociatedFile.Extents,
+                                      entry.AssociatedFile.XA?.signature == XA_MAGIC &&
+                                      entry.AssociatedFile.XA?.attributes.HasFlag(XaAttributes.Interleaved) == true,
+                                      entry.AssociatedFile.XA?.filenumber ?? 0);
 
-                    if(entry.AssociatedFile.Size == 0)
-                    {
-                        buf = Array.Empty<byte>();
+                return ErrorNumber.NoError;
+            case "com.apple.dos.type":
+                if(entry.AppleDosType is null)
+                    return ErrorNumber.NoSuchExtendedAttribute;
 
-                        return ErrorNumber.NoError;
-                    }
+                buf    = new byte[1];
+                buf[0] = entry.AppleDosType.Value;
 
-                    buf = ReadWithExtents(0, (long)entry.AssociatedFile.Size, entry.AssociatedFile.Extents,
-                                          entry.AssociatedFile.XA?.signature == XA_MAGIC &&
-                                          entry.AssociatedFile.XA?.attributes.HasFlag(XaAttributes.Interleaved) == true,
-                                          entry.AssociatedFile.XA?.filenumber ?? 0);
+                return ErrorNumber.NoError;
+            case "com.apple.prodos.type":
+                if(entry.AppleProDosType is null)
+                    return ErrorNumber.NoSuchExtendedAttribute;
+
+                buf = BitConverter.GetBytes(entry.AppleProDosType.Value);
+
+                return ErrorNumber.NoError;
+            case "com.apple.ResourceFork":
+                if(entry.ResourceFork is null)
+                    return ErrorNumber.NoSuchExtendedAttribute;
+
+                if(entry.ResourceFork.Extents is null)
+                    return ErrorNumber.InvalidArgument;
+
+                if(entry.ResourceFork.Size == 0)
+                {
+                    buf = Array.Empty<byte>();
 
                     return ErrorNumber.NoError;
-                case "com.apple.dos.type":
-                    if(entry.AppleDosType is null)
-                        return ErrorNumber.NoSuchExtendedAttribute;
+                }
 
-                    buf    = new byte[1];
-                    buf[0] = entry.AppleDosType.Value;
+                buf = ReadWithExtents(0, (long)entry.ResourceFork.Size, entry.ResourceFork.Extents,
+                                      entry.ResourceFork.XA?.signature                                    == XA_MAGIC &&
+                                      entry.ResourceFork.XA?.attributes.HasFlag(XaAttributes.Interleaved) == true,
+                                      entry.ResourceFork.XA?.filenumber ?? 0);
 
-                    return ErrorNumber.NoError;
-                case "com.apple.prodos.type":
-                    if(entry.AppleProDosType is null)
-                        return ErrorNumber.NoSuchExtendedAttribute;
+                return ErrorNumber.NoError;
+            case "com.apple.FinderInfo":
+                if(entry.FinderInfo is null)
+                    return ErrorNumber.NoSuchExtendedAttribute;
 
-                    buf = BitConverter.GetBytes(entry.AppleProDosType.Value);
+                buf = Marshal.StructureToByteArrayBigEndian(entry.FinderInfo.Value);
 
-                    return ErrorNumber.NoError;
-                case "com.apple.ResourceFork":
-                    if(entry.ResourceFork is null)
-                        return ErrorNumber.NoSuchExtendedAttribute;
+                return ErrorNumber.NoError;
+            case "com.apple.Macintosh.Icon":
+                if(entry.AppleIcon is null)
+                    return ErrorNumber.NoSuchExtendedAttribute;
 
-                    if(entry.ResourceFork.Extents is null)
-                        return ErrorNumber.InvalidArgument;
+                buf = new byte[entry.AppleIcon.Length];
+                Array.Copy(entry.AppleIcon, 0, buf, 0, entry.AppleIcon.Length);
 
-                    if(entry.ResourceFork.Size == 0)
-                    {
-                        buf = Array.Empty<byte>();
+                return ErrorNumber.NoError;
+            case "com.amiga.comments":
+                if(entry.AmigaComment is null)
+                    return ErrorNumber.NoSuchExtendedAttribute;
 
-                        return ErrorNumber.NoError;
-                    }
+                buf = new byte[entry.AmigaComment.Length];
+                Array.Copy(entry.AmigaComment, 0, buf, 0, entry.AmigaComment.Length);
 
-                    buf = ReadWithExtents(0, (long)entry.ResourceFork.Size, entry.ResourceFork.Extents,
-                                          entry.ResourceFork.XA?.signature == XA_MAGIC &&
-                                          entry.ResourceFork.XA?.attributes.HasFlag(XaAttributes.Interleaved) == true,
-                                          entry.ResourceFork.XA?.filenumber ?? 0);
+                return ErrorNumber.NoError;
+            case "org.iso.mode2.subheader":
+                buf = ReadSubheaderWithExtents(entry.Extents, false);
 
-                    return ErrorNumber.NoError;
-                case "com.apple.FinderInfo":
-                    if(entry.FinderInfo is null)
-                        return ErrorNumber.NoSuchExtendedAttribute;
+                return ErrorNumber.NoError;
+            case "org.iso.mode2.subheader.copy":
+                buf = ReadSubheaderWithExtents(entry.Extents, true);
 
-                    buf = Marshal.StructureToByteArrayBigEndian(entry.FinderInfo.Value);
-
-                    return ErrorNumber.NoError;
-                case "com.apple.Macintosh.Icon":
-                    if(entry.AppleIcon is null)
-                        return ErrorNumber.NoSuchExtendedAttribute;
-
-                    buf = new byte[entry.AppleIcon.Length];
-                    Array.Copy(entry.AppleIcon, 0, buf, 0, entry.AppleIcon.Length);
-
-                    return ErrorNumber.NoError;
-                case "com.amiga.comments":
-                    if(entry.AmigaComment is null)
-                        return ErrorNumber.NoSuchExtendedAttribute;
-
-                    buf = new byte[entry.AmigaComment.Length];
-                    Array.Copy(entry.AmigaComment, 0, buf, 0, entry.AmigaComment.Length);
-
-                    return ErrorNumber.NoError;
-                case "org.iso.mode2.subheader":
-                    buf = ReadSubheaderWithExtents(entry.Extents, false);
-
-                    return ErrorNumber.NoError;
-                case "org.iso.mode2.subheader.copy":
-                    buf = ReadSubheaderWithExtents(entry.Extents, true);
-
-                    return ErrorNumber.NoError;
-                default: return ErrorNumber.NoSuchExtendedAttribute;
-            }
+                return ErrorNumber.NoError;
+            default: return ErrorNumber.NoSuchExtendedAttribute;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/JFS.cs b/Aaru.Filesystems/JFS.cs
index 79de52c64..bb5162000 100644
--- a/Aaru.Filesystems/JFS.cs
+++ b/Aaru.Filesystems/JFS.cs
@@ -43,240 +43,239 @@ using Marshal = Aaru.Helpers.Marshal;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of IBM's Journaled File System</summary>
+public sealed class JFS : IFilesystem
 {
+    const uint JFS_BOOT_BLOCKS_SIZE = 0x8000;
+    const uint JFS_MAGIC            = 0x3153464A;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of IBM's Journaled File System</summary>
-    public sealed class JFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "JFS Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("D3BE2A41-8F28-4055-94DC-BB6C72A0E9C4");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint JFS_BOOT_BLOCKS_SIZE = 0x8000;
-        const uint JFS_MAGIC            = 0x3153464A;
+        uint bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "JFS Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("D3BE2A41-8F28-4055-94DC-BB6C72A0E9C4");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(partition.Start + bootSectors >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start + bootSectors, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(sector.Length < 512)
+            return false;
+
+        SuperBlock jfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
+
+        return jfsSb.s_magic == JFS_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+        var         sb          = new StringBuilder();
+        uint        bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
+        ErrorNumber errno       = imagePlugin.ReadSector(partition.Start + bootSectors, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        if(sector.Length < 512)
+            return;
+
+        SuperBlock jfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
+
+        sb.AppendLine("JFS filesystem");
+        sb.AppendFormat("Version {0}", jfsSb.s_version).AppendLine();
+        sb.AppendFormat("{0} blocks of {1} bytes", jfsSb.s_size, jfsSb.s_bsize).AppendLine();
+        sb.AppendFormat("{0} blocks per allocation group", jfsSb.s_agsize).AppendLine();
+
+        if(jfsSb.s_flags.HasFlag(Flags.Unicode))
+            sb.AppendLine("Volume uses Unicode for directory entries");
+
+        if(jfsSb.s_flags.HasFlag(Flags.RemountRO))
+            sb.AppendLine("Volume remounts read-only on error");
+
+        if(jfsSb.s_flags.HasFlag(Flags.Continue))
+            sb.AppendLine("Volume continues on error");
+
+        if(jfsSb.s_flags.HasFlag(Flags.Panic))
+            sb.AppendLine("Volume panics on error");
+
+        if(jfsSb.s_flags.HasFlag(Flags.UserQuota))
+            sb.AppendLine("Volume has user quotas enabled");
+
+        if(jfsSb.s_flags.HasFlag(Flags.GroupQuota))
+            sb.AppendLine("Volume has group quotas enabled");
+
+        if(jfsSb.s_flags.HasFlag(Flags.NoJournal))
+            sb.AppendLine("Volume is not using any journal");
+
+        if(jfsSb.s_flags.HasFlag(Flags.Discard))
+            sb.AppendLine("Volume sends TRIM/UNMAP commands to underlying device");
+
+        if(jfsSb.s_flags.HasFlag(Flags.GroupCommit))
+            sb.AppendLine("Volume commits in groups of 1");
+
+        if(jfsSb.s_flags.HasFlag(Flags.LazyCommit))
+            sb.AppendLine("Volume commits lazy");
+
+        if(jfsSb.s_flags.HasFlag(Flags.Temporary))
+            sb.AppendLine("Volume does not commit to log");
+
+        if(jfsSb.s_flags.HasFlag(Flags.InlineLog))
+            sb.AppendLine("Volume has log withing itself");
+
+        if(jfsSb.s_flags.HasFlag(Flags.InlineMoving))
+            sb.AppendLine("Volume has log withing itself and is moving it out");
+
+        if(jfsSb.s_flags.HasFlag(Flags.BadSAIT))
+            sb.AppendLine("Volume has bad current secondary ait");
+
+        if(jfsSb.s_flags.HasFlag(Flags.Sparse))
+            sb.AppendLine("Volume supports sparse files");
+
+        if(jfsSb.s_flags.HasFlag(Flags.DASDEnabled))
+            sb.AppendLine("Volume has DASD limits enabled");
+
+        if(jfsSb.s_flags.HasFlag(Flags.DASDPrime))
+            sb.AppendLine("Volume primes DASD on boot");
+
+        if(jfsSb.s_flags.HasFlag(Flags.SwapBytes))
+            sb.AppendLine("Volume is in a big-endian system");
+
+        if(jfsSb.s_flags.HasFlag(Flags.DirIndex))
+            sb.AppendLine("Volume has presistent indexes");
+
+        if(jfsSb.s_flags.HasFlag(Flags.Linux))
+            sb.AppendLine("Volume supports Linux");
+
+        if(jfsSb.s_flags.HasFlag(Flags.DFS))
+            sb.AppendLine("Volume supports DCE DFS LFS");
+
+        if(jfsSb.s_flags.HasFlag(Flags.OS2))
+            sb.AppendLine("Volume supports OS/2, and is case insensitive");
+
+        if(jfsSb.s_flags.HasFlag(Flags.AIX))
+            sb.AppendLine("Volume supports AIX");
+
+        if(jfsSb.s_state != 0)
+            sb.AppendLine("Volume is dirty");
+
+        sb.AppendFormat("Volume was last updated on {0}",
+                        DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec)).
+           AppendLine();
+
+        if(jfsSb.s_version == 1)
+            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(jfsSb.s_fpack, Encoding)).AppendLine();
+        else
+            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(jfsSb.s_label, Encoding)).AppendLine();
+
+        sb.AppendFormat("Volume UUID: {0}", jfsSb.s_uuid).AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            uint bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
+            Type = "JFS filesystem",
+            Clusters = jfsSb.s_size,
+            ClusterSize = jfsSb.s_bsize,
+            Bootable = true,
+            VolumeName = StringHandlers.CToString(jfsSb.s_version == 1 ? jfsSb.s_fpack : jfsSb.s_label, Encoding),
+            VolumeSerial = $"{jfsSb.s_uuid}",
+            ModificationDate = DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec),
+            ModificationDateSpecified = true
+        };
 
-            if(partition.Start + bootSectors >= partition.End)
-                return false;
+        if(jfsSb.s_state != 0)
+            XmlFsType.Dirty = true;
 
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start + bootSectors, out byte[] sector);
+        information = sb.ToString();
+    }
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+    [Flags, SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum Flags : uint
+    {
+        Unicode      = 0x00000001, RemountRO = 0x00000002, Continue    = 0x00000004,
+        Panic        = 0x00000008, UserQuota = 0x00000010, GroupQuota  = 0x00000020,
+        NoJournal    = 0x00000040, Discard   = 0x00000080, GroupCommit = 0x00000100,
+        LazyCommit   = 0x00000200, Temporary = 0x00000400, InlineLog   = 0x00000800,
+        InlineMoving = 0x00001000, BadSAIT   = 0x00010000, Sparse      = 0x00020000,
+        DASDEnabled  = 0x00040000, DASDPrime = 0x00080000, SwapBytes   = 0x00100000,
+        DirIndex     = 0x00200000, Linux     = 0x10000000, DFS         = 0x20000000,
+        OS2          = 0x40000000, AIX       = 0x80000000
+    }
 
-            if(sector.Length < 512)
-                return false;
+    [Flags]
+    enum State : uint
+    {
+        Clean   = 0, Mounted  = 1, Dirty = 2,
+        Logredo = 4, Extendfs = 8
+    }
 
-            SuperBlock jfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Extent
+    {
+        /// <summary>Leftmost 24 bits are extent length, rest 8 bits are most significant for <see cref="addr2" /></summary>
+        public readonly uint len_addr;
+        public readonly uint addr2;
+    }
 
-            return jfsSb.s_magic == JFS_MAGIC;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct TimeStruct
+    {
+        public readonly uint tv_sec;
+        public readonly uint tv_nsec;
+    }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-            var         sb          = new StringBuilder();
-            uint        bootSectors = JFS_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
-            ErrorNumber errno       = imagePlugin.ReadSector(partition.Start + bootSectors, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            if(sector.Length < 512)
-                return;
-
-            SuperBlock jfsSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
-
-            sb.AppendLine("JFS filesystem");
-            sb.AppendFormat("Version {0}", jfsSb.s_version).AppendLine();
-            sb.AppendFormat("{0} blocks of {1} bytes", jfsSb.s_size, jfsSb.s_bsize).AppendLine();
-            sb.AppendFormat("{0} blocks per allocation group", jfsSb.s_agsize).AppendLine();
-
-            if(jfsSb.s_flags.HasFlag(Flags.Unicode))
-                sb.AppendLine("Volume uses Unicode for directory entries");
-
-            if(jfsSb.s_flags.HasFlag(Flags.RemountRO))
-                sb.AppendLine("Volume remounts read-only on error");
-
-            if(jfsSb.s_flags.HasFlag(Flags.Continue))
-                sb.AppendLine("Volume continues on error");
-
-            if(jfsSb.s_flags.HasFlag(Flags.Panic))
-                sb.AppendLine("Volume panics on error");
-
-            if(jfsSb.s_flags.HasFlag(Flags.UserQuota))
-                sb.AppendLine("Volume has user quotas enabled");
-
-            if(jfsSb.s_flags.HasFlag(Flags.GroupQuota))
-                sb.AppendLine("Volume has group quotas enabled");
-
-            if(jfsSb.s_flags.HasFlag(Flags.NoJournal))
-                sb.AppendLine("Volume is not using any journal");
-
-            if(jfsSb.s_flags.HasFlag(Flags.Discard))
-                sb.AppendLine("Volume sends TRIM/UNMAP commands to underlying device");
-
-            if(jfsSb.s_flags.HasFlag(Flags.GroupCommit))
-                sb.AppendLine("Volume commits in groups of 1");
-
-            if(jfsSb.s_flags.HasFlag(Flags.LazyCommit))
-                sb.AppendLine("Volume commits lazy");
-
-            if(jfsSb.s_flags.HasFlag(Flags.Temporary))
-                sb.AppendLine("Volume does not commit to log");
-
-            if(jfsSb.s_flags.HasFlag(Flags.InlineLog))
-                sb.AppendLine("Volume has log withing itself");
-
-            if(jfsSb.s_flags.HasFlag(Flags.InlineMoving))
-                sb.AppendLine("Volume has log withing itself and is moving it out");
-
-            if(jfsSb.s_flags.HasFlag(Flags.BadSAIT))
-                sb.AppendLine("Volume has bad current secondary ait");
-
-            if(jfsSb.s_flags.HasFlag(Flags.Sparse))
-                sb.AppendLine("Volume supports sparse files");
-
-            if(jfsSb.s_flags.HasFlag(Flags.DASDEnabled))
-                sb.AppendLine("Volume has DASD limits enabled");
-
-            if(jfsSb.s_flags.HasFlag(Flags.DASDPrime))
-                sb.AppendLine("Volume primes DASD on boot");
-
-            if(jfsSb.s_flags.HasFlag(Flags.SwapBytes))
-                sb.AppendLine("Volume is in a big-endian system");
-
-            if(jfsSb.s_flags.HasFlag(Flags.DirIndex))
-                sb.AppendLine("Volume has presistent indexes");
-
-            if(jfsSb.s_flags.HasFlag(Flags.Linux))
-                sb.AppendLine("Volume supports Linux");
-
-            if(jfsSb.s_flags.HasFlag(Flags.DFS))
-                sb.AppendLine("Volume supports DCE DFS LFS");
-
-            if(jfsSb.s_flags.HasFlag(Flags.OS2))
-                sb.AppendLine("Volume supports OS/2, and is case insensitive");
-
-            if(jfsSb.s_flags.HasFlag(Flags.AIX))
-                sb.AppendLine("Volume supports AIX");
-
-            if(jfsSb.s_state != 0)
-                sb.AppendLine("Volume is dirty");
-
-            sb.AppendFormat("Volume was last updated on {0}",
-                            DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec)).
-               AppendLine();
-
-            if(jfsSb.s_version == 1)
-                sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(jfsSb.s_fpack, Encoding)).AppendLine();
-            else
-                sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(jfsSb.s_label, Encoding)).AppendLine();
-
-            sb.AppendFormat("Volume UUID: {0}", jfsSb.s_uuid).AppendLine();
-
-            XmlFsType = new FileSystemType
-            {
-                Type = "JFS filesystem",
-                Clusters = jfsSb.s_size,
-                ClusterSize = jfsSb.s_bsize,
-                Bootable = true,
-                VolumeName = StringHandlers.CToString(jfsSb.s_version == 1 ? jfsSb.s_fpack : jfsSb.s_label, Encoding),
-                VolumeSerial = $"{jfsSb.s_uuid}",
-                ModificationDate = DateHandlers.UnixUnsignedToDateTime(jfsSb.s_time.tv_sec, jfsSb.s_time.tv_nsec),
-                ModificationDateSpecified = true
-            };
-
-            if(jfsSb.s_state != 0)
-                XmlFsType.Dirty = true;
-
-            information = sb.ToString();
-        }
-
-        [Flags, SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum Flags : uint
-        {
-            Unicode      = 0x00000001, RemountRO = 0x00000002, Continue    = 0x00000004,
-            Panic        = 0x00000008, UserQuota = 0x00000010, GroupQuota  = 0x00000020,
-            NoJournal    = 0x00000040, Discard   = 0x00000080, GroupCommit = 0x00000100,
-            LazyCommit   = 0x00000200, Temporary = 0x00000400, InlineLog   = 0x00000800,
-            InlineMoving = 0x00001000, BadSAIT   = 0x00010000, Sparse      = 0x00020000,
-            DASDEnabled  = 0x00040000, DASDPrime = 0x00080000, SwapBytes   = 0x00100000,
-            DirIndex     = 0x00200000, Linux     = 0x10000000, DFS         = 0x20000000,
-            OS2          = 0x40000000, AIX       = 0x80000000
-        }
-
-        [Flags]
-        enum State : uint
-        {
-            Clean   = 0, Mounted  = 1, Dirty = 2,
-            Logredo = 4, Extendfs = 8
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Extent
-        {
-            /// <summary>Leftmost 24 bits are extent length, rest 8 bits are most significant for <see cref="addr2" /></summary>
-            public readonly uint len_addr;
-            public readonly uint addr2;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct TimeStruct
-        {
-            public readonly uint tv_sec;
-            public readonly uint tv_nsec;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            public readonly uint       s_magic;
-            public readonly uint       s_version;
-            public readonly ulong      s_size;
-            public readonly uint       s_bsize;
-            public readonly ushort     s_l2bsize;
-            public readonly ushort     s_l2bfactor;
-            public readonly uint       s_pbsize;
-            public readonly ushort     s_l1pbsize;
-            public readonly ushort     pad;
-            public readonly uint       s_agsize;
-            public readonly Flags      s_flags;
-            public readonly State      s_state;
-            public readonly uint       s_compress;
-            public readonly Extent     s_ait2;
-            public readonly Extent     s_aim2;
-            public readonly uint       s_logdev;
-            public readonly uint       s_logserial;
-            public readonly Extent     s_logpxd;
-            public readonly Extent     s_fsckpxd;
-            public readonly TimeStruct s_time;
-            public readonly uint       s_fsckloglen;
-            public readonly sbyte      s_fscklog;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] s_fpack;
-            public readonly ulong  s_xsize;
-            public readonly Extent s_xfsckpxd;
-            public readonly Extent s_xlogpxd;
-            public readonly Guid   s_uuid;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] s_label;
-            public readonly Guid s_loguuid;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        public readonly uint       s_magic;
+        public readonly uint       s_version;
+        public readonly ulong      s_size;
+        public readonly uint       s_bsize;
+        public readonly ushort     s_l2bsize;
+        public readonly ushort     s_l2bfactor;
+        public readonly uint       s_pbsize;
+        public readonly ushort     s_l1pbsize;
+        public readonly ushort     pad;
+        public readonly uint       s_agsize;
+        public readonly Flags      s_flags;
+        public readonly State      s_state;
+        public readonly uint       s_compress;
+        public readonly Extent     s_ait2;
+        public readonly Extent     s_aim2;
+        public readonly uint       s_logdev;
+        public readonly uint       s_logserial;
+        public readonly Extent     s_logpxd;
+        public readonly Extent     s_fsckpxd;
+        public readonly TimeStruct s_time;
+        public readonly uint       s_fsckloglen;
+        public readonly sbyte      s_fscklog;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] s_fpack;
+        public readonly ulong  s_xsize;
+        public readonly Extent s_xfsckpxd;
+        public readonly Extent s_xlogpxd;
+        public readonly Guid   s_uuid;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] s_label;
+        public readonly Guid s_loguuid;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/LIF.cs b/Aaru.Filesystems/LIF.cs
index abefb2db4..721cb4861 100644
--- a/Aaru.Filesystems/LIF.cs
+++ b/Aaru.Filesystems/LIF.cs
@@ -41,108 +41,107 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from http://www.hp9845.net/9845/projects/hpdir/#lif_filesystem
+/// <inheritdoc />
+/// <summary>Implements detection of the LIF filesystem</summary>
+public sealed class LIF : IFilesystem
 {
-    // Information from http://www.hp9845.net/9845/projects/hpdir/#lif_filesystem
+    const uint LIF_MAGIC = 0x8000;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the LIF filesystem</summary>
-    public sealed class LIF : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "HP Logical Interchange Format Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("41535647-77A5-477B-9206-DA727ACDC704");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint LIF_MAGIC = 0x8000;
+        if(imagePlugin.Info.SectorSize < 256)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "HP Logical Interchange Format Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("41535647-77A5-477B-9206-DA727ACDC704");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        SystemBlock lifSb = Marshal.ByteArrayToStructureBigEndian<SystemBlock>(sector);
+        AaruConsole.DebugWriteLine("LIF plugin", "magic 0x{0:X8} (expected 0x{1:X8})", lifSb.magic, LIF_MAGIC);
+
+        return lifSb.magic == LIF_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < 256)
+            return;
+
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        SystemBlock lifSb = Marshal.ByteArrayToStructureBigEndian<SystemBlock>(sector);
+
+        if(lifSb.magic != LIF_MAGIC)
+            return;
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("HP Logical Interchange Format");
+        sb.AppendFormat("Directory starts at cluster {0}", lifSb.directoryStart).AppendLine();
+        sb.AppendFormat("LIF identifier: {0}", lifSb.lifId).AppendLine();
+        sb.AppendFormat("Directory size: {0} clusters", lifSb.directorySize).AppendLine();
+        sb.AppendFormat("LIF version: {0}", lifSb.lifVersion).AppendLine();
+
+        // How is this related to volume size? I have only CDs to test and makes no sense there
+        sb.AppendFormat("{0} tracks", lifSb.tracks).AppendLine();
+        sb.AppendFormat("{0} heads", lifSb.heads).AppendLine();
+        sb.AppendFormat("{0} sectors", lifSb.sectors).AppendLine();
+        sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(lifSb.volumeLabel, Encoding)).AppendLine();
+        sb.AppendFormat("Volume created on {0}", DateHandlers.LifToDateTime(lifSb.creationDate)).AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            if(imagePlugin.Info.SectorSize < 256)
-                return false;
+            Type                  = "HP Logical Interchange Format",
+            ClusterSize           = 256,
+            Clusters              = partition.Size / 256,
+            CreationDate          = DateHandlers.LifToDateTime(lifSb.creationDate),
+            CreationDateSpecified = true,
+            VolumeName            = StringHandlers.CToString(lifSb.volumeLabel, Encoding)
+        };
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            SystemBlock lifSb = Marshal.ByteArrayToStructureBigEndian<SystemBlock>(sector);
-            AaruConsole.DebugWriteLine("LIF plugin", "magic 0x{0:X8} (expected 0x{1:X8})", lifSb.magic, LIF_MAGIC);
-
-            return lifSb.magic == LIF_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-
-            if(imagePlugin.Info.SectorSize < 256)
-                return;
-
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            SystemBlock lifSb = Marshal.ByteArrayToStructureBigEndian<SystemBlock>(sector);
-
-            if(lifSb.magic != LIF_MAGIC)
-                return;
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine("HP Logical Interchange Format");
-            sb.AppendFormat("Directory starts at cluster {0}", lifSb.directoryStart).AppendLine();
-            sb.AppendFormat("LIF identifier: {0}", lifSb.lifId).AppendLine();
-            sb.AppendFormat("Directory size: {0} clusters", lifSb.directorySize).AppendLine();
-            sb.AppendFormat("LIF version: {0}", lifSb.lifVersion).AppendLine();
-
-            // How is this related to volume size? I have only CDs to test and makes no sense there
-            sb.AppendFormat("{0} tracks", lifSb.tracks).AppendLine();
-            sb.AppendFormat("{0} heads", lifSb.heads).AppendLine();
-            sb.AppendFormat("{0} sectors", lifSb.sectors).AppendLine();
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(lifSb.volumeLabel, Encoding)).AppendLine();
-            sb.AppendFormat("Volume created on {0}", DateHandlers.LifToDateTime(lifSb.creationDate)).AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type                  = "HP Logical Interchange Format",
-                ClusterSize           = 256,
-                Clusters              = partition.Size / 256,
-                CreationDate          = DateHandlers.LifToDateTime(lifSb.creationDate),
-                CreationDateSpecified = true,
-                VolumeName            = StringHandlers.CToString(lifSb.volumeLabel, Encoding)
-            };
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SystemBlock
-        {
-            public readonly ushort magic;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] volumeLabel;
-            public readonly uint   directoryStart;
-            public readonly ushort lifId;
-            public readonly ushort unused;
-            public readonly uint   directorySize;
-            public readonly ushort lifVersion;
-            public readonly ushort unused2;
-            public readonly uint   tracks;
-            public readonly uint   heads;
-            public readonly uint   sectors;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] creationDate;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SystemBlock
+    {
+        public readonly ushort magic;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] volumeLabel;
+        public readonly uint   directoryStart;
+        public readonly ushort lifId;
+        public readonly ushort unused;
+        public readonly uint   directorySize;
+        public readonly ushort lifVersion;
+        public readonly ushort unused2;
+        public readonly uint   tracks;
+        public readonly uint   heads;
+        public readonly uint   sectors;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] creationDate;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/LisaFS/Consts.cs b/Aaru.Filesystems/LisaFS/Consts.cs
index 9378d1f30..2406994f5 100644
--- a/Aaru.Filesystems/LisaFS/Consts.cs
+++ b/Aaru.Filesystems/LisaFS/Consts.cs
@@ -32,83 +32,82 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.Filesystems.LisaFS
+namespace Aaru.Filesystems.LisaFS;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class LisaFS
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class LisaFS
+    /// <summary>Lisa FS v1, from Lisa OS 1.0 (Workshop or Office) Never seen on Sony floppies.</summary>
+    const byte LISA_V1 = 0x0E;
+    /// <summary>
+    ///     Lisa FS v2, from Lisa OS 2.0 (Workshop or Office) Contrary to what most information online says the only
+    ///     difference with V1 is the Extents File size. Catalog format is the same
+    /// </summary>
+    const byte LISA_V2 = 0x0F;
+    /// <summary>
+    ///     Lisa FS v3, from Lisa OS 3.0 (Workshop or Office) Adds support for user catalogs (aka subdirectories), and
+    ///     changes the catalog format from extents to double-linked list. Uses '-' as path separator (so people that created
+    ///     Lisa/FILE.TEXT just created a file named like that :p)
+    /// </summary>
+    const byte LISA_V3 = 0x11;
+    /// <summary>Maximum string size in LisaFS</summary>
+    const uint E_NAME = 32;
+    /// <summary>Unused file ID</summary>
+    const ushort FILEID_FREE = 0x0000;
+    /// <summary>Used by the boot blocks</summary>
+    const ushort FILEID_BOOT = 0xAAAA;
+    /// <summary>Used by the operating system loader blocks</summary>
+    const ushort FILEID_LOADER = 0xBBBB;
+    /// <summary>Used by the MDDF</summary>
+    const ushort FILEID_MDDF = 0x0001;
+    /// <summary>Used by the volume bitmap, sits between MDDF and S-Records file.</summary>
+    const ushort FILEID_BITMAP = 0x0002;
+    /// <summary>S-Records file</summary>
+    const ushort FILEID_SRECORD = 0x0003;
+    /// <summary>The root catalog</summary>
+    const ushort FILEID_CATALOG = 0x0004;
+    const short FILEID_BOOT_SIGNED   = -21846;
+    const short FILEID_LOADER_SIGNED = -17477;
+    /// <summary>A file that has been erased</summary>
+    const ushort FILEID_ERASED = 0x7FFF;
+    const ushort FILEID_MAX = FILEID_ERASED;
+
+    /// <summary>Root directory ID</summary>
+    const short DIRID_ROOT = 0;
+
+    enum FileType : byte
     {
-        /// <summary>Lisa FS v1, from Lisa OS 1.0 (Workshop or Office) Never seen on Sony floppies.</summary>
-        const byte LISA_V1 = 0x0E;
-        /// <summary>
-        ///     Lisa FS v2, from Lisa OS 2.0 (Workshop or Office) Contrary to what most information online says the only
-        ///     difference with V1 is the Extents File size. Catalog format is the same
-        /// </summary>
-        const byte LISA_V2 = 0x0F;
-        /// <summary>
-        ///     Lisa FS v3, from Lisa OS 3.0 (Workshop or Office) Adds support for user catalogs (aka subdirectories), and
-        ///     changes the catalog format from extents to double-linked list. Uses '-' as path separator (so people that created
-        ///     Lisa/FILE.TEXT just created a file named like that :p)
-        /// </summary>
-        const byte LISA_V3 = 0x11;
-        /// <summary>Maximum string size in LisaFS</summary>
-        const uint E_NAME = 32;
-        /// <summary>Unused file ID</summary>
-        const ushort FILEID_FREE = 0x0000;
-        /// <summary>Used by the boot blocks</summary>
-        const ushort FILEID_BOOT = 0xAAAA;
-        /// <summary>Used by the operating system loader blocks</summary>
-        const ushort FILEID_LOADER = 0xBBBB;
-        /// <summary>Used by the MDDF</summary>
-        const ushort FILEID_MDDF = 0x0001;
-        /// <summary>Used by the volume bitmap, sits between MDDF and S-Records file.</summary>
-        const ushort FILEID_BITMAP = 0x0002;
-        /// <summary>S-Records file</summary>
-        const ushort FILEID_SRECORD = 0x0003;
-        /// <summary>The root catalog</summary>
-        const ushort FILEID_CATALOG = 0x0004;
-        const short FILEID_BOOT_SIGNED   = -21846;
-        const short FILEID_LOADER_SIGNED = -17477;
-        /// <summary>A file that has been erased</summary>
-        const ushort FILEID_ERASED = 0x7FFF;
-        const ushort FILEID_MAX = FILEID_ERASED;
-
-        /// <summary>Root directory ID</summary>
-        const short DIRID_ROOT = 0;
-
-        enum FileType : byte
-        {
-            /// <summary>Undefined file type</summary>
-            Undefined = 0,
-            /// <summary>MDDF</summary>
-            MDDFile = 1,
-            /// <summary>Root catalog</summary>
-            RootCat = 2,
-            /// <summary>Bitmap</summary>
-            FreeList = 3,
-            /// <summary>Unknown, maybe refers to the S-Records File?</summary>
-            BadBlocks = 4,
-            /// <summary>System data</summary>
-            SysData = 5,
-            /// <summary>Printer spool</summary>
-            Spool = 6,
-            /// <summary>Executable. Yet application files don't use it</summary>
-            Exec = 7,
-            /// <summary>User catalog</summary>
-            UserCat = 8,
-            /// <summary>Pipe. Not seen on disk.</summary>
-            Pipe = 9,
-            /// <summary>Boot file?</summary>
-            BootFile = 10,
-            /// <summary>Swap for data</summary>
-            SwapData = 11,
-            /// <summary>Swap for code</summary>
-            SwapCode = 12,
-            /// <summary>Unknown</summary>
-            RamAP = 13,
-            /// <summary>Any file</summary>
-            UserFile = 14,
-            /// <summary>Erased?</summary>
-            KilledObject = 15
-        }
+        /// <summary>Undefined file type</summary>
+        Undefined = 0,
+        /// <summary>MDDF</summary>
+        MDDFile = 1,
+        /// <summary>Root catalog</summary>
+        RootCat = 2,
+        /// <summary>Bitmap</summary>
+        FreeList = 3,
+        /// <summary>Unknown, maybe refers to the S-Records File?</summary>
+        BadBlocks = 4,
+        /// <summary>System data</summary>
+        SysData = 5,
+        /// <summary>Printer spool</summary>
+        Spool = 6,
+        /// <summary>Executable. Yet application files don't use it</summary>
+        Exec = 7,
+        /// <summary>User catalog</summary>
+        UserCat = 8,
+        /// <summary>Pipe. Not seen on disk.</summary>
+        Pipe = 9,
+        /// <summary>Boot file?</summary>
+        BootFile = 10,
+        /// <summary>Swap for data</summary>
+        SwapData = 11,
+        /// <summary>Swap for code</summary>
+        SwapCode = 12,
+        /// <summary>Unknown</summary>
+        RamAP = 13,
+        /// <summary>Any file</summary>
+        UserFile = 14,
+        /// <summary>Erased?</summary>
+        KilledObject = 15
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/LisaFS/Dir.cs b/Aaru.Filesystems/LisaFS/Dir.cs
index 87774d659..ce01e9f80 100644
--- a/Aaru.Filesystems/LisaFS/Dir.cs
+++ b/Aaru.Filesystems/LisaFS/Dir.cs
@@ -38,337 +38,336 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Decoders;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.LisaFS
-{
-    public sealed partial class LisaFS
-    {
-        /// <inheritdoc />
-        public ErrorNumber ReadLink(string path, out string dest)
-        {
-            dest = null;
+namespace Aaru.Filesystems.LisaFS;
 
-            // LisaFS does not support symbolic links (afaik)
-            return ErrorNumber.NotSupported;
+public sealed partial class LisaFS
+{
+    /// <inheritdoc />
+    public ErrorNumber ReadLink(string path, out string dest)
+    {
+        dest = null;
+
+        // LisaFS does not support symbolic links (afaik)
+        return ErrorNumber.NotSupported;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadDir(string path, out List<string> contents)
+    {
+        contents = null;
+        ErrorNumber error = LookupFileId(path, out short fileId, out bool isDir);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        if(!isDir)
+            return ErrorNumber.NotDirectory;
+
+        /*List<CatalogEntry> catalog;
+        error = ReadCatalog(fileId, out catalog);
+        if(error != ErrorNumber.NoError)
+            return error;*/
+
+        ReadDir(fileId, out contents);
+
+        // On debug add system files as readable files
+        // Syntax similar to NTFS
+        if(_debug && fileId == DIRID_ROOT)
+        {
+            contents.Add("$MDDF");
+            contents.Add("$Boot");
+            contents.Add("$Loader");
+            contents.Add("$Bitmap");
+            contents.Add("$S-Record");
+            contents.Add("$");
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadDir(string path, out List<string> contents)
+        contents.Sort();
+
+        return ErrorNumber.NoError;
+    }
+
+    void ReadDir(short dirId, out List<string> contents) =>
+
+        // Do same trick as Mac OS X, replace filesystem '/' with '-',
+        // as '-' is the path separator in Lisa OS
+        contents = (from entry in _catalogCache where entry.parentID == dirId
+                    select StringHandlers.CToString(entry.filename, Encoding).Replace('/', '-')).ToList();
+
+    /// <summary>Reads, interprets and caches the Catalog File</summary>
+    ErrorNumber ReadCatalog()
+    {
+        ErrorNumber errno;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        _catalogCache = new List<CatalogEntry>();
+
+        // Do differently for V1 and V2
+        if(_mddf.fsversion == LISA_V2 ||
+           _mddf.fsversion == LISA_V1)
         {
-            contents = null;
-            ErrorNumber error = LookupFileId(path, out short fileId, out bool isDir);
+            ErrorNumber error = ReadFile((short)FILEID_CATALOG, out byte[] buf);
 
             if(error != ErrorNumber.NoError)
                 return error;
 
-            if(!isDir)
-                return ErrorNumber.NotDirectory;
+            int                  offset    = 0;
+            List<CatalogEntryV2> catalogV2 = new();
 
-            /*List<CatalogEntry> catalog;
-            error = ReadCatalog(fileId, out catalog);
-            if(error != ErrorNumber.NoError)
-                return error;*/
-
-            ReadDir(fileId, out contents);
-
-            // On debug add system files as readable files
-            // Syntax similar to NTFS
-            if(_debug && fileId == DIRID_ROOT)
+            // For each entry on the catalog
+            while(offset + 54 < buf.Length)
             {
-                contents.Add("$MDDF");
-                contents.Add("$Boot");
-                contents.Add("$Loader");
-                contents.Add("$Bitmap");
-                contents.Add("$S-Record");
-                contents.Add("$");
+                var entV2 = new CatalogEntryV2
+                {
+                    filenameLen = buf[offset],
+                    filename    = new byte[E_NAME],
+                    unknown1    = buf[offset                                + 0x21],
+                    fileType    = buf[offset                                + 0x22],
+                    unknown2    = buf[offset                                + 0x23],
+                    fileID      = BigEndianBitConverter.ToInt16(buf, offset + 0x24),
+                    unknown3    = new byte[16]
+                };
+
+                Array.Copy(buf, offset + 0x01, entV2.filename, 0, E_NAME);
+                Array.Copy(buf, offset + 0x26, entV2.unknown3, 0, 16);
+
+                offset += 54;
+
+                // Check that the entry is correct, not empty or garbage
+                if(entV2.filenameLen != 0      &&
+                   entV2.filenameLen <= E_NAME &&
+                   entV2.fileType    != 0      &&
+                   entV2.fileID      > 0)
+                    catalogV2.Add(entV2);
             }
 
-            contents.Sort();
-
-            return ErrorNumber.NoError;
-        }
-
-        void ReadDir(short dirId, out List<string> contents) =>
-
-            // Do same trick as Mac OS X, replace filesystem '/' with '-',
-            // as '-' is the path separator in Lisa OS
-            contents = (from entry in _catalogCache where entry.parentID == dirId
-                        select StringHandlers.CToString(entry.filename, Encoding).Replace('/', '-')).ToList();
-
-        /// <summary>Reads, interprets and caches the Catalog File</summary>
-        ErrorNumber ReadCatalog()
-        {
-            ErrorNumber errno;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            _catalogCache = new List<CatalogEntry>();
-
-            // Do differently for V1 and V2
-            if(_mddf.fsversion == LISA_V2 ||
-               _mddf.fsversion == LISA_V1)
+            // Convert entries to V3 format
+            foreach(CatalogEntryV2 entV2 in catalogV2)
             {
-                ErrorNumber error = ReadFile((short)FILEID_CATALOG, out byte[] buf);
+                error = ReadExtentsFile(entV2.fileID, out ExtentFile ext);
 
                 if(error != ErrorNumber.NoError)
-                    return error;
-
-                int                  offset    = 0;
-                List<CatalogEntryV2> catalogV2 = new();
-
-                // For each entry on the catalog
-                while(offset + 54 < buf.Length)
-                {
-                    var entV2 = new CatalogEntryV2
-                    {
-                        filenameLen = buf[offset],
-                        filename    = new byte[E_NAME],
-                        unknown1    = buf[offset                                + 0x21],
-                        fileType    = buf[offset                                + 0x22],
-                        unknown2    = buf[offset                                + 0x23],
-                        fileID      = BigEndianBitConverter.ToInt16(buf, offset + 0x24),
-                        unknown3    = new byte[16]
-                    };
-
-                    Array.Copy(buf, offset + 0x01, entV2.filename, 0, E_NAME);
-                    Array.Copy(buf, offset + 0x26, entV2.unknown3, 0, 16);
-
-                    offset += 54;
-
-                    // Check that the entry is correct, not empty or garbage
-                    if(entV2.filenameLen != 0      &&
-                       entV2.filenameLen <= E_NAME &&
-                       entV2.fileType    != 0      &&
-                       entV2.fileID      > 0)
-                        catalogV2.Add(entV2);
-                }
-
-                // Convert entries to V3 format
-                foreach(CatalogEntryV2 entV2 in catalogV2)
-                {
-                    error = ReadExtentsFile(entV2.fileID, out ExtentFile ext);
-
-                    if(error != ErrorNumber.NoError)
-                        continue;
-
-                    var entV3 = new CatalogEntry
-                    {
-                        fileID   = entV2.fileID,
-                        filename = new byte[32],
-                        fileType = entV2.fileType,
-                        length   = (int)_srecords[entV2.fileID].filesize,
-                        dtc      = ext.dtc,
-                        dtm      = ext.dtm
-                    };
-
-                    Array.Copy(entV2.filename, 0, entV3.filename, 0, entV2.filenameLen);
-
-                    _catalogCache.Add(entV3);
-                }
-
-                return ErrorNumber.NoError;
-            }
-
-            byte[] firstCatalogBlock = null;
-
-            // Search for the first sector describing the catalog
-            // While root catalog is not stored in S-Records, probably rest are? (unchecked)
-            // If root catalog is not pointed in MDDF (unchecked) maybe it's always following S-Records File?
-            for(ulong i = 0; i < _device.Info.Sectors; i++)
-            {
-                errno = _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out byte[] tag);
-
-                if(errno != ErrorNumber.NoError)
                     continue;
 
-                DecodeTag(tag, out LisaTag.PriamTag catTag);
+                var entV3 = new CatalogEntry
+                {
+                    fileID   = entV2.fileID,
+                    filename = new byte[32],
+                    fileType = entV2.fileType,
+                    length   = (int)_srecords[entV2.fileID].filesize,
+                    dtc      = ext.dtc,
+                    dtm      = ext.dtm
+                };
 
-                if(catTag.FileId  != FILEID_CATALOG ||
-                   catTag.RelPage != 0)
-                    continue;
+                Array.Copy(entV2.filename, 0, entV3.filename, 0, entV2.filenameLen);
 
-                errno = _device.ReadSectors(i, 4, out firstCatalogBlock);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                break;
-            }
-
-            // Catalog not found
-            if(firstCatalogBlock == null)
-                return ErrorNumber.NoSuchFile;
-
-            ulong prevCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7F6);
-
-            // Traverse double-linked list until first catalog block
-            while(prevCatalogPointer != 0xFFFFFFFF)
-            {
-                errno = _device.ReadSectorTag(prevCatalogPointer + _mddf.mddf_block + _volumePrefix,
-                                              SectorTagType.AppleSectorTag, out byte[] tag);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                DecodeTag(tag, out LisaTag.PriamTag prevTag);
-
-                if(prevTag.FileId != FILEID_CATALOG)
-                    return ErrorNumber.InvalidArgument;
-
-                errno = _device.ReadSectors(prevCatalogPointer + _mddf.mddf_block + _volumePrefix, 4,
-                                            out firstCatalogBlock);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                prevCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7F6);
-            }
-
-            ulong nextCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7FA);
-
-            List<byte[]> catalogBlocks = new()
-            {
-                firstCatalogBlock
-            };
-
-            // Traverse double-linked list to read full catalog
-            while(nextCatalogPointer != 0xFFFFFFFF)
-            {
-                errno = _device.ReadSectorTag(nextCatalogPointer + _mddf.mddf_block + _volumePrefix,
-                                              SectorTagType.AppleSectorTag, out byte[] tag);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                DecodeTag(tag, out LisaTag.PriamTag nextTag);
-
-                if(nextTag.FileId != FILEID_CATALOG)
-                    return ErrorNumber.InvalidArgument;
-
-                errno = _device.ReadSectors(nextCatalogPointer + _mddf.mddf_block + _volumePrefix, 4,
-                                            out byte[] nextCatalogBlock);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                nextCatalogPointer = BigEndianBitConverter.ToUInt32(nextCatalogBlock, 0x7FA);
-                catalogBlocks.Add(nextCatalogBlock);
-            }
-
-            // Foreach catalog block
-            foreach(byte[] buf in catalogBlocks)
-            {
-                int offset = 0;
-
-                // Traverse all entries
-                while(offset + 64 <= buf.Length)
-
-                    // Catalog block header
-                    if(buf[offset + 0x24] == 0x08)
-                        offset += 78;
-
-                    // Maybe just garbage? Found in more than 1 disk
-                    else if(buf[offset + 0x24] == 0x7C)
-                        offset += 50;
-
-                    // Apparently reserved to indicate end of catalog?
-                    else if(buf[offset + 0x24] == 0xFF)
-                        break;
-
-                    // Normal entry
-                    else if(buf[offset + 0x24] == 0x03 &&
-                            buf[offset]        == 0x24)
-                    {
-                        var entry = new CatalogEntry
-                        {
-                            marker     = buf[offset],
-                            parentID   = BigEndianBitConverter.ToUInt16(buf, offset + 0x01),
-                            filename   = new byte[E_NAME],
-                            terminator = buf[offset                                 + 0x23],
-                            fileType   = buf[offset                                 + 0x24],
-                            unknown    = buf[offset                                 + 0x25],
-                            fileID     = BigEndianBitConverter.ToInt16(buf, offset  + 0x26),
-                            dtc        = BigEndianBitConverter.ToUInt32(buf, offset + 0x28),
-                            dtm        = BigEndianBitConverter.ToUInt32(buf, offset + 0x2C),
-                            length     = BigEndianBitConverter.ToInt32(buf, offset  + 0x30),
-                            wasted     = BigEndianBitConverter.ToInt32(buf, offset  + 0x34),
-                            tail       = new byte[8]
-                        };
-
-                        Array.Copy(buf, offset + 0x03, entry.filename, 0, E_NAME);
-                        Array.Copy(buf, offset + 0x38, entry.tail, 0, 8);
-
-                        if(ReadExtentsFile(entry.fileID, out _) == ErrorNumber.NoError)
-                            if(!_fileSizeCache.ContainsKey(entry.fileID))
-                            {
-                                _catalogCache.Add(entry);
-                                _fileSizeCache.Add(entry.fileID, entry.length);
-                            }
-
-                        offset += 64;
-                    }
-
-                    // Subdirectory entry
-                    else if(buf[offset + 0x24] == 0x01 &&
-                            buf[offset]        == 0x24)
-                    {
-                        var entry = new CatalogEntry
-                        {
-                            marker     = buf[offset],
-                            parentID   = BigEndianBitConverter.ToUInt16(buf, offset + 0x01),
-                            filename   = new byte[E_NAME],
-                            terminator = buf[offset                                 + 0x23],
-                            fileType   = buf[offset                                 + 0x24],
-                            unknown    = buf[offset                                 + 0x25],
-                            fileID     = BigEndianBitConverter.ToInt16(buf, offset  + 0x26),
-                            dtc        = BigEndianBitConverter.ToUInt32(buf, offset + 0x28),
-                            dtm        = BigEndianBitConverter.ToUInt32(buf, offset + 0x2C),
-                            length     = 0,
-                            wasted     = 0,
-                            tail       = null
-                        };
-
-                        Array.Copy(buf, offset + 0x03, entry.filename, 0, E_NAME);
-
-                        if(!_directoryDtcCache.ContainsKey(entry.fileID))
-                            _directoryDtcCache.Add(entry.fileID, DateHandlers.LisaToDateTime(entry.dtc));
-
-                        _catalogCache.Add(entry);
-
-                        offset += 48;
-                    }
-                    else
-                        break;
+                _catalogCache.Add(entV3);
             }
 
             return ErrorNumber.NoError;
         }
 
-        ErrorNumber StatDir(short dirId, out FileEntryInfo stat)
+        byte[] firstCatalogBlock = null;
+
+        // Search for the first sector describing the catalog
+        // While root catalog is not stored in S-Records, probably rest are? (unchecked)
+        // If root catalog is not pointed in MDDF (unchecked) maybe it's always following S-Records File?
+        for(ulong i = 0; i < _device.Info.Sectors; i++)
         {
-            stat = null;
+            errno = _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out byte[] tag);
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            if(errno != ErrorNumber.NoError)
+                continue;
 
-            stat = new FileEntryInfo
-            {
-                Attributes = new FileAttributes(),
-                Inode      = FILEID_CATALOG,
-                Mode       = 0x16D,
-                Links      = 0,
-                UID        = 0,
-                GID        = 0,
-                DeviceNo   = 0,
-                Length     = 0,
-                BlockSize  = _mddf.datasize,
-                Blocks     = 0
-            };
+            DecodeTag(tag, out LisaTag.PriamTag catTag);
 
-            _directoryDtcCache.TryGetValue(dirId, out DateTime tmp);
-            stat.CreationTime = tmp;
+            if(catTag.FileId  != FILEID_CATALOG ||
+               catTag.RelPage != 0)
+                continue;
 
-            return ErrorNumber.NoError;
+            errno = _device.ReadSectors(i, 4, out firstCatalogBlock);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            break;
         }
+
+        // Catalog not found
+        if(firstCatalogBlock == null)
+            return ErrorNumber.NoSuchFile;
+
+        ulong prevCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7F6);
+
+        // Traverse double-linked list until first catalog block
+        while(prevCatalogPointer != 0xFFFFFFFF)
+        {
+            errno = _device.ReadSectorTag(prevCatalogPointer + _mddf.mddf_block + _volumePrefix,
+                                          SectorTagType.AppleSectorTag, out byte[] tag);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            DecodeTag(tag, out LisaTag.PriamTag prevTag);
+
+            if(prevTag.FileId != FILEID_CATALOG)
+                return ErrorNumber.InvalidArgument;
+
+            errno = _device.ReadSectors(prevCatalogPointer + _mddf.mddf_block + _volumePrefix, 4,
+                                        out firstCatalogBlock);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            prevCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7F6);
+        }
+
+        ulong nextCatalogPointer = BigEndianBitConverter.ToUInt32(firstCatalogBlock, 0x7FA);
+
+        List<byte[]> catalogBlocks = new()
+        {
+            firstCatalogBlock
+        };
+
+        // Traverse double-linked list to read full catalog
+        while(nextCatalogPointer != 0xFFFFFFFF)
+        {
+            errno = _device.ReadSectorTag(nextCatalogPointer + _mddf.mddf_block + _volumePrefix,
+                                          SectorTagType.AppleSectorTag, out byte[] tag);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            DecodeTag(tag, out LisaTag.PriamTag nextTag);
+
+            if(nextTag.FileId != FILEID_CATALOG)
+                return ErrorNumber.InvalidArgument;
+
+            errno = _device.ReadSectors(nextCatalogPointer + _mddf.mddf_block + _volumePrefix, 4,
+                                        out byte[] nextCatalogBlock);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            nextCatalogPointer = BigEndianBitConverter.ToUInt32(nextCatalogBlock, 0x7FA);
+            catalogBlocks.Add(nextCatalogBlock);
+        }
+
+        // Foreach catalog block
+        foreach(byte[] buf in catalogBlocks)
+        {
+            int offset = 0;
+
+            // Traverse all entries
+            while(offset + 64 <= buf.Length)
+
+                // Catalog block header
+                if(buf[offset + 0x24] == 0x08)
+                    offset += 78;
+
+                // Maybe just garbage? Found in more than 1 disk
+                else if(buf[offset + 0x24] == 0x7C)
+                    offset += 50;
+
+                // Apparently reserved to indicate end of catalog?
+                else if(buf[offset + 0x24] == 0xFF)
+                    break;
+
+                // Normal entry
+                else if(buf[offset + 0x24] == 0x03 &&
+                        buf[offset]        == 0x24)
+                {
+                    var entry = new CatalogEntry
+                    {
+                        marker     = buf[offset],
+                        parentID   = BigEndianBitConverter.ToUInt16(buf, offset + 0x01),
+                        filename   = new byte[E_NAME],
+                        terminator = buf[offset                                 + 0x23],
+                        fileType   = buf[offset                                 + 0x24],
+                        unknown    = buf[offset                                 + 0x25],
+                        fileID     = BigEndianBitConverter.ToInt16(buf, offset  + 0x26),
+                        dtc        = BigEndianBitConverter.ToUInt32(buf, offset + 0x28),
+                        dtm        = BigEndianBitConverter.ToUInt32(buf, offset + 0x2C),
+                        length     = BigEndianBitConverter.ToInt32(buf, offset  + 0x30),
+                        wasted     = BigEndianBitConverter.ToInt32(buf, offset  + 0x34),
+                        tail       = new byte[8]
+                    };
+
+                    Array.Copy(buf, offset + 0x03, entry.filename, 0, E_NAME);
+                    Array.Copy(buf, offset + 0x38, entry.tail, 0, 8);
+
+                    if(ReadExtentsFile(entry.fileID, out _) == ErrorNumber.NoError)
+                        if(!_fileSizeCache.ContainsKey(entry.fileID))
+                        {
+                            _catalogCache.Add(entry);
+                            _fileSizeCache.Add(entry.fileID, entry.length);
+                        }
+
+                    offset += 64;
+                }
+
+                // Subdirectory entry
+                else if(buf[offset + 0x24] == 0x01 &&
+                        buf[offset]        == 0x24)
+                {
+                    var entry = new CatalogEntry
+                    {
+                        marker     = buf[offset],
+                        parentID   = BigEndianBitConverter.ToUInt16(buf, offset + 0x01),
+                        filename   = new byte[E_NAME],
+                        terminator = buf[offset                                 + 0x23],
+                        fileType   = buf[offset                                 + 0x24],
+                        unknown    = buf[offset                                 + 0x25],
+                        fileID     = BigEndianBitConverter.ToInt16(buf, offset  + 0x26),
+                        dtc        = BigEndianBitConverter.ToUInt32(buf, offset + 0x28),
+                        dtm        = BigEndianBitConverter.ToUInt32(buf, offset + 0x2C),
+                        length     = 0,
+                        wasted     = 0,
+                        tail       = null
+                    };
+
+                    Array.Copy(buf, offset + 0x03, entry.filename, 0, E_NAME);
+
+                    if(!_directoryDtcCache.ContainsKey(entry.fileID))
+                        _directoryDtcCache.Add(entry.fileID, DateHandlers.LisaToDateTime(entry.dtc));
+
+                    _catalogCache.Add(entry);
+
+                    offset += 48;
+                }
+                else
+                    break;
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    ErrorNumber StatDir(short dirId, out FileEntryInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        stat = new FileEntryInfo
+        {
+            Attributes = new FileAttributes(),
+            Inode      = FILEID_CATALOG,
+            Mode       = 0x16D,
+            Links      = 0,
+            UID        = 0,
+            GID        = 0,
+            DeviceNo   = 0,
+            Length     = 0,
+            BlockSize  = _mddf.datasize,
+            Blocks     = 0
+        };
+
+        _directoryDtcCache.TryGetValue(dirId, out DateTime tmp);
+        stat.CreationTime = tmp;
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/LisaFS/Extent.cs b/Aaru.Filesystems/LisaFS/Extent.cs
index 3fb788ddb..11f7a81e3 100644
--- a/Aaru.Filesystems/LisaFS/Extent.cs
+++ b/Aaru.Filesystems/LisaFS/Extent.cs
@@ -36,293 +36,292 @@ using Aaru.Console;
 using Aaru.Decoders;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.LisaFS
+namespace Aaru.Filesystems.LisaFS;
+
+public sealed partial class LisaFS
 {
-    public sealed partial class LisaFS
+    /// <inheritdoc />
+    public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
     {
-        /// <inheritdoc />
-        public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
-        {
-            deviceBlock = 0;
+        deviceBlock = 0;
 
-            // TODO: Not really important.
-            return ErrorNumber.NotImplemented;
-        }
+        // TODO: Not really important.
+        return ErrorNumber.NotImplemented;
+    }
 
-        /// <summary>Searches the disk for an extents file (or gets it from cache)</summary>
-        /// <returns>Error.</returns>
-        /// <param name="fileId">File identifier.</param>
-        /// <param name="file">Extents file.</param>
-        ErrorNumber ReadExtentsFile(short fileId, out ExtentFile file)
-        {
-            file = new ExtentFile();
-            ErrorNumber errno;
+    /// <summary>Searches the disk for an extents file (or gets it from cache)</summary>
+    /// <returns>Error.</returns>
+    /// <param name="fileId">File identifier.</param>
+    /// <param name="file">Extents file.</param>
+    ErrorNumber ReadExtentsFile(short fileId, out ExtentFile file)
+    {
+        file = new ExtentFile();
+        ErrorNumber errno;
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
 
-            if(fileId < 4 ||
-               (fileId == 4 && _mddf.fsversion != LISA_V2 && _mddf.fsversion != LISA_V1))
-                return ErrorNumber.InvalidArgument;
-
-            if(_extentCache.TryGetValue(fileId, out file))
-                return ErrorNumber.NoError;
-
-            // A file ID that cannot be stored in the S-Records File
-            if(fileId >= _srecords.Length)
-                return ErrorNumber.InvalidArgument;
-
-            ulong ptr = _srecords[fileId].extent_ptr;
-
-            // An invalid pointer denotes file does not exist
-            if(ptr == 0xFFFFFFFF ||
-               ptr == 0x00000000)
-                return ErrorNumber.NoSuchFile;
-
-            // Pointers are relative to MDDF
-            ptr += _mddf.mddf_block + _volumePrefix;
-
-            LisaTag.PriamTag extTag;
-            byte[]           tag;
-
-            // This happens on some disks.
-            // This is a filesystem corruption that makes LisaOS crash on scavenge.
-            // This code just allow to ignore that corruption by searching the Extents File using sector tags
-            if(ptr >= _device.Info.Sectors)
-            {
-                bool found = false;
-
-                for(ulong i = 0; i < _device.Info.Sectors; i++)
-                {
-                    errno = _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out tag);
-
-                    if(errno != ErrorNumber.NoError)
-                        continue;
-
-                    DecodeTag(tag, out extTag);
-
-                    if(extTag.FileId != fileId * -1)
-                        continue;
-
-                    ptr   = i;
-                    found = true;
-
-                    break;
-                }
-
-                if(!found)
-                    return ErrorNumber.InvalidArgument;
-            }
-
-            // Checks that the sector tag indicates its the Extents File we are searching for
-            errno = _device.ReadSectorTag(ptr, SectorTagType.AppleSectorTag, out tag);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            DecodeTag(tag, out extTag);
-
-            if(extTag.FileId != (short)(-1 * fileId))
-                return ErrorNumber.NoSuchFile;
-
-            byte[] sector;
-
-            errno = _mddf.fsversion == LISA_V1 ? _device.ReadSectors(ptr, 2, out sector)
-                        : _device.ReadSector(ptr, out sector);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            if(sector[0] >= 32 ||
-               sector[0] == 0)
-                return ErrorNumber.InvalidArgument;
-
-            file.filenameLen = sector[0];
-            file.filename    = new byte[file.filenameLen];
-            Array.Copy(sector, 0x01, file.filename, 0, file.filenameLen);
-            file.unknown1  = BigEndianBitConverter.ToUInt16(sector, 0x20);
-            file.file_uid  = BigEndianBitConverter.ToUInt64(sector, 0x22);
-            file.unknown2  = sector[0x2A];
-            file.etype     = sector[0x2B];
-            file.ftype     = (FileType)sector[0x2C];
-            file.unknown3  = sector[0x2D];
-            file.dtc       = BigEndianBitConverter.ToUInt32(sector, 0x2E);
-            file.dta       = BigEndianBitConverter.ToUInt32(sector, 0x32);
-            file.dtm       = BigEndianBitConverter.ToUInt32(sector, 0x36);
-            file.dtb       = BigEndianBitConverter.ToUInt32(sector, 0x3A);
-            file.dts       = BigEndianBitConverter.ToUInt32(sector, 0x3E);
-            file.serial    = BigEndianBitConverter.ToUInt32(sector, 0x42);
-            file.unknown4  = sector[0x46];
-            file.locked    = sector[0x47];
-            file.protect   = sector[0x48];
-            file.master    = sector[0x49];
-            file.scavenged = sector[0x4A];
-            file.closed    = sector[0x4B];
-            file.open      = sector[0x4C];
-            file.unknown5  = new byte[11];
-            Array.Copy(sector, 0x4D, file.unknown5, 0, 11);
-            file.release        = BigEndianBitConverter.ToUInt16(sector, 0x58);
-            file.build          = BigEndianBitConverter.ToUInt16(sector, 0x5A);
-            file.compatibility  = BigEndianBitConverter.ToUInt16(sector, 0x5C);
-            file.revision       = BigEndianBitConverter.ToUInt16(sector, 0x5E);
-            file.unknown6       = BigEndianBitConverter.ToUInt16(sector, 0x60);
-            file.password_valid = sector[0x62];
-            file.password       = new byte[8];
-            Array.Copy(sector, 0x63, file.password, 0, 8);
-            file.unknown7 = new byte[3];
-            Array.Copy(sector, 0x6B, file.unknown7, 0, 3);
-            file.overhead = BigEndianBitConverter.ToUInt16(sector, 0x6E);
-            file.unknown8 = new byte[16];
-            Array.Copy(sector, 0x70, file.unknown8, 0, 16);
-            file.unknown10 = BigEndianBitConverter.ToInt16(sector, 0x17E);
-            file.LisaInfo  = new byte[128];
-            Array.Copy(sector, 0x180, file.LisaInfo, 0, 128);
-
-            int extentsCount = 0;
-            int extentsOffset;
-
-            if(_mddf.fsversion == LISA_V1)
-            {
-                file.length   = BigEndianBitConverter.ToInt32(sector, 0x200);
-                file.unknown9 = BigEndianBitConverter.ToInt32(sector, 0x204);
-                extentsOffset = 0x208;
-            }
-            else
-            {
-                file.length   = BigEndianBitConverter.ToInt32(sector, 0x80);
-                file.unknown9 = BigEndianBitConverter.ToInt32(sector, 0x84);
-                extentsOffset = 0x88;
-            }
-
-            for(int j = 0; j < 41; j++)
-            {
-                if(BigEndianBitConverter.ToInt16(sector, extentsOffset + (j * 6) + 4) == 0)
-                    break;
-
-                extentsCount++;
-            }
-
-            file.extents = new Extent[extentsCount];
-
-            for(int j = 0; j < extentsCount; j++)
-                file.extents[j] = new Extent
-                {
-                    start  = BigEndianBitConverter.ToInt32(sector, extentsOffset + (j * 6)),
-                    length = BigEndianBitConverter.ToInt16(sector, extentsOffset + (j * 6) + 4)
-                };
-
-            _extentCache.Add(fileId, file);
-
-            if(!_debug)
-                return ErrorNumber.NoError;
-
-            if(_printedExtents.Contains(fileId))
-                return ErrorNumber.NoError;
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filenameLen = {1}", fileId, file.filenameLen);
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filename = {1}", fileId,
-                                       StringHandlers.CToString(file.filename, Encoding));
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown1 = 0x{1:X4}", fileId, file.unknown1);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].file_uid = 0x{1:X16}", fileId, file.file_uid);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown2 = 0x{1:X2}", fileId, file.unknown2);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].etype = 0x{1:X2}", fileId, file.etype);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].ftype = {1}", fileId, file.ftype);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown3 = 0x{1:X2}", fileId, file.unknown3);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtc = {1}", fileId, file.dtc);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dta = {1}", fileId, file.dta);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtm = {1}", fileId, file.dtm);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtb = {1}", fileId, file.dtb);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dts = {1}", fileId, file.dts);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].serial = {1}", fileId, file.serial);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown4 = 0x{1:X2}", fileId, file.unknown4);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].locked = {1}", fileId, file.locked       > 0);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].protect = {1}", fileId, file.protect     > 0);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].master = {1}", fileId, file.master       > 0);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].scavenged = {1}", fileId, file.scavenged > 0);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].closed = {1}", fileId, file.closed       > 0);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].open = {1}", fileId, file.open           > 0);
-
-            AaruConsole.DebugWriteLine("LisaFS plugin",
-                                       "ExtentFile[{0}].unknown5 = 0x{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}" +
-                                       "{10:X2}{11:X2}", fileId, file.unknown5[0], file.unknown5[1], file.unknown5[2],
-                                       file.unknown5[3], file.unknown5[4], file.unknown5[5], file.unknown5[6],
-                                       file.unknown5[7], file.unknown5[8], file.unknown5[9], file.unknown5[10]);
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].release = {1}", fileId, file.release);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].build = {1}", fileId, file.build);
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].compatibility = {1}", fileId,
-                                       file.compatibility);
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].revision = {1}", fileId, file.revision);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown6 = 0x{1:X4}", fileId, file.unknown6);
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].password_valid = {1}", fileId,
-                                       file.password_valid > 0);
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].password = {1}", fileId,
-                                       Encoding.GetString(file.password));
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown7 = 0x{1:X2}{2:X2}{3:X2}", fileId,
-                                       file.unknown7[0], file.unknown7[1], file.unknown7[2]);
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].overhead = {1}", fileId, file.overhead);
-
-            AaruConsole.DebugWriteLine("LisaFS plugin",
-                                       "ExtentFile[{0}].unknown8 = 0x{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}" +
-                                       "{10:X2}{11:X2}{12:X2}{13:X2}{14:X2}{15:X2}{16:X2}", fileId, file.unknown8[0],
-                                       file.unknown8[1], file.unknown8[2], file.unknown8[3], file.unknown8[4],
-                                       file.unknown8[5], file.unknown8[6], file.unknown8[7], file.unknown8[8],
-                                       file.unknown8[9], file.unknown8[10], file.unknown8[11], file.unknown8[12],
-                                       file.unknown8[13], file.unknown8[14], file.unknown8[15]);
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].length = {1}", fileId, file.length);
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown9 = 0x{1:X8}", fileId, file.unknown9);
-
-            for(int ext = 0; ext < file.extents.Length; ext++)
-            {
-                AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].extents[{1}].start = {2}", fileId, ext,
-                                           file.extents[ext].start);
-
-                AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].extents[{1}].length = {2}", fileId, ext,
-                                           file.extents[ext].length);
-            }
-
-            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown10 = 0x{1:X4}", fileId, file.unknown10);
-
-            _printedExtents.Add(fileId);
+        if(fileId < 4 ||
+           (fileId == 4 && _mddf.fsversion != LISA_V2 && _mddf.fsversion != LISA_V1))
+            return ErrorNumber.InvalidArgument;
 
+        if(_extentCache.TryGetValue(fileId, out file))
             return ErrorNumber.NoError;
-        }
 
-        /// <summary>Reads all the S-Records and caches it</summary>
-        ErrorNumber ReadSRecords()
+        // A file ID that cannot be stored in the S-Records File
+        if(fileId >= _srecords.Length)
+            return ErrorNumber.InvalidArgument;
+
+        ulong ptr = _srecords[fileId].extent_ptr;
+
+        // An invalid pointer denotes file does not exist
+        if(ptr == 0xFFFFFFFF ||
+           ptr == 0x00000000)
+            return ErrorNumber.NoSuchFile;
+
+        // Pointers are relative to MDDF
+        ptr += _mddf.mddf_block + _volumePrefix;
+
+        LisaTag.PriamTag extTag;
+        byte[]           tag;
+
+        // This happens on some disks.
+        // This is a filesystem corruption that makes LisaOS crash on scavenge.
+        // This code just allow to ignore that corruption by searching the Extents File using sector tags
+        if(ptr >= _device.Info.Sectors)
         {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            bool found = false;
 
-            // Searches the S-Records place using MDDF pointers
-            ErrorNumber errno = _device.ReadSectors(_mddf.srec_ptr + _mddf.mddf_block + _volumePrefix, _mddf.srec_len,
-                                                    out byte[] sectors);
+            for(ulong i = 0; i < _device.Info.Sectors; i++)
+            {
+                errno = _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out tag);
 
-            if(errno != ErrorNumber.NoError)
-                return errno;
+                if(errno != ErrorNumber.NoError)
+                    continue;
 
-            // Each entry takes 14 bytes
-            _srecords = new SRecord[sectors.Length / 14];
+                DecodeTag(tag, out extTag);
 
-            for(int s = 0; s < _srecords.Length; s++)
-                _srecords[s] = new SRecord
-                {
-                    extent_ptr = BigEndianBitConverter.ToUInt32(sectors, 0x00 + (14 * s)),
-                    unknown    = BigEndianBitConverter.ToUInt32(sectors, 0x04 + (14 * s)),
-                    filesize   = BigEndianBitConverter.ToUInt32(sectors, 0x08 + (14 * s)),
-                    flags      = BigEndianBitConverter.ToUInt16(sectors, 0x0C + (14 * s))
-                };
+                if(extTag.FileId != fileId * -1)
+                    continue;
 
-            return ErrorNumber.NoError;
+                ptr   = i;
+                found = true;
+
+                break;
+            }
+
+            if(!found)
+                return ErrorNumber.InvalidArgument;
         }
+
+        // Checks that the sector tag indicates its the Extents File we are searching for
+        errno = _device.ReadSectorTag(ptr, SectorTagType.AppleSectorTag, out tag);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        DecodeTag(tag, out extTag);
+
+        if(extTag.FileId != (short)(-1 * fileId))
+            return ErrorNumber.NoSuchFile;
+
+        byte[] sector;
+
+        errno = _mddf.fsversion == LISA_V1 ? _device.ReadSectors(ptr, 2, out sector)
+                    : _device.ReadSector(ptr, out sector);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        if(sector[0] >= 32 ||
+           sector[0] == 0)
+            return ErrorNumber.InvalidArgument;
+
+        file.filenameLen = sector[0];
+        file.filename    = new byte[file.filenameLen];
+        Array.Copy(sector, 0x01, file.filename, 0, file.filenameLen);
+        file.unknown1  = BigEndianBitConverter.ToUInt16(sector, 0x20);
+        file.file_uid  = BigEndianBitConverter.ToUInt64(sector, 0x22);
+        file.unknown2  = sector[0x2A];
+        file.etype     = sector[0x2B];
+        file.ftype     = (FileType)sector[0x2C];
+        file.unknown3  = sector[0x2D];
+        file.dtc       = BigEndianBitConverter.ToUInt32(sector, 0x2E);
+        file.dta       = BigEndianBitConverter.ToUInt32(sector, 0x32);
+        file.dtm       = BigEndianBitConverter.ToUInt32(sector, 0x36);
+        file.dtb       = BigEndianBitConverter.ToUInt32(sector, 0x3A);
+        file.dts       = BigEndianBitConverter.ToUInt32(sector, 0x3E);
+        file.serial    = BigEndianBitConverter.ToUInt32(sector, 0x42);
+        file.unknown4  = sector[0x46];
+        file.locked    = sector[0x47];
+        file.protect   = sector[0x48];
+        file.master    = sector[0x49];
+        file.scavenged = sector[0x4A];
+        file.closed    = sector[0x4B];
+        file.open      = sector[0x4C];
+        file.unknown5  = new byte[11];
+        Array.Copy(sector, 0x4D, file.unknown5, 0, 11);
+        file.release        = BigEndianBitConverter.ToUInt16(sector, 0x58);
+        file.build          = BigEndianBitConverter.ToUInt16(sector, 0x5A);
+        file.compatibility  = BigEndianBitConverter.ToUInt16(sector, 0x5C);
+        file.revision       = BigEndianBitConverter.ToUInt16(sector, 0x5E);
+        file.unknown6       = BigEndianBitConverter.ToUInt16(sector, 0x60);
+        file.password_valid = sector[0x62];
+        file.password       = new byte[8];
+        Array.Copy(sector, 0x63, file.password, 0, 8);
+        file.unknown7 = new byte[3];
+        Array.Copy(sector, 0x6B, file.unknown7, 0, 3);
+        file.overhead = BigEndianBitConverter.ToUInt16(sector, 0x6E);
+        file.unknown8 = new byte[16];
+        Array.Copy(sector, 0x70, file.unknown8, 0, 16);
+        file.unknown10 = BigEndianBitConverter.ToInt16(sector, 0x17E);
+        file.LisaInfo  = new byte[128];
+        Array.Copy(sector, 0x180, file.LisaInfo, 0, 128);
+
+        int extentsCount = 0;
+        int extentsOffset;
+
+        if(_mddf.fsversion == LISA_V1)
+        {
+            file.length   = BigEndianBitConverter.ToInt32(sector, 0x200);
+            file.unknown9 = BigEndianBitConverter.ToInt32(sector, 0x204);
+            extentsOffset = 0x208;
+        }
+        else
+        {
+            file.length   = BigEndianBitConverter.ToInt32(sector, 0x80);
+            file.unknown9 = BigEndianBitConverter.ToInt32(sector, 0x84);
+            extentsOffset = 0x88;
+        }
+
+        for(int j = 0; j < 41; j++)
+        {
+            if(BigEndianBitConverter.ToInt16(sector, extentsOffset + (j * 6) + 4) == 0)
+                break;
+
+            extentsCount++;
+        }
+
+        file.extents = new Extent[extentsCount];
+
+        for(int j = 0; j < extentsCount; j++)
+            file.extents[j] = new Extent
+            {
+                start  = BigEndianBitConverter.ToInt32(sector, extentsOffset + (j * 6)),
+                length = BigEndianBitConverter.ToInt16(sector, extentsOffset + (j * 6) + 4)
+            };
+
+        _extentCache.Add(fileId, file);
+
+        if(!_debug)
+            return ErrorNumber.NoError;
+
+        if(_printedExtents.Contains(fileId))
+            return ErrorNumber.NoError;
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filenameLen = {1}", fileId, file.filenameLen);
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].filename = {1}", fileId,
+                                   StringHandlers.CToString(file.filename, Encoding));
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown1 = 0x{1:X4}", fileId, file.unknown1);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].file_uid = 0x{1:X16}", fileId, file.file_uid);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown2 = 0x{1:X2}", fileId, file.unknown2);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].etype = 0x{1:X2}", fileId, file.etype);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].ftype = {1}", fileId, file.ftype);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown3 = 0x{1:X2}", fileId, file.unknown3);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtc = {1}", fileId, file.dtc);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dta = {1}", fileId, file.dta);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtm = {1}", fileId, file.dtm);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dtb = {1}", fileId, file.dtb);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].dts = {1}", fileId, file.dts);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].serial = {1}", fileId, file.serial);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown4 = 0x{1:X2}", fileId, file.unknown4);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].locked = {1}", fileId, file.locked       > 0);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].protect = {1}", fileId, file.protect     > 0);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].master = {1}", fileId, file.master       > 0);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].scavenged = {1}", fileId, file.scavenged > 0);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].closed = {1}", fileId, file.closed       > 0);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].open = {1}", fileId, file.open           > 0);
+
+        AaruConsole.DebugWriteLine("LisaFS plugin",
+                                   "ExtentFile[{0}].unknown5 = 0x{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}" +
+                                   "{10:X2}{11:X2}", fileId, file.unknown5[0], file.unknown5[1], file.unknown5[2],
+                                   file.unknown5[3], file.unknown5[4], file.unknown5[5], file.unknown5[6],
+                                   file.unknown5[7], file.unknown5[8], file.unknown5[9], file.unknown5[10]);
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].release = {1}", fileId, file.release);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].build = {1}", fileId, file.build);
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].compatibility = {1}", fileId,
+                                   file.compatibility);
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].revision = {1}", fileId, file.revision);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown6 = 0x{1:X4}", fileId, file.unknown6);
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].password_valid = {1}", fileId,
+                                   file.password_valid > 0);
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].password = {1}", fileId,
+                                   Encoding.GetString(file.password));
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown7 = 0x{1:X2}{2:X2}{3:X2}", fileId,
+                                   file.unknown7[0], file.unknown7[1], file.unknown7[2]);
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].overhead = {1}", fileId, file.overhead);
+
+        AaruConsole.DebugWriteLine("LisaFS plugin",
+                                   "ExtentFile[{0}].unknown8 = 0x{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}" +
+                                   "{10:X2}{11:X2}{12:X2}{13:X2}{14:X2}{15:X2}{16:X2}", fileId, file.unknown8[0],
+                                   file.unknown8[1], file.unknown8[2], file.unknown8[3], file.unknown8[4],
+                                   file.unknown8[5], file.unknown8[6], file.unknown8[7], file.unknown8[8],
+                                   file.unknown8[9], file.unknown8[10], file.unknown8[11], file.unknown8[12],
+                                   file.unknown8[13], file.unknown8[14], file.unknown8[15]);
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].length = {1}", fileId, file.length);
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown9 = 0x{1:X8}", fileId, file.unknown9);
+
+        for(int ext = 0; ext < file.extents.Length; ext++)
+        {
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].extents[{1}].start = {2}", fileId, ext,
+                                       file.extents[ext].start);
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].extents[{1}].length = {2}", fileId, ext,
+                                       file.extents[ext].length);
+        }
+
+        AaruConsole.DebugWriteLine("LisaFS plugin", "ExtentFile[{0}].unknown10 = 0x{1:X4}", fileId, file.unknown10);
+
+        _printedExtents.Add(fileId);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <summary>Reads all the S-Records and caches it</summary>
+    ErrorNumber ReadSRecords()
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        // Searches the S-Records place using MDDF pointers
+        ErrorNumber errno = _device.ReadSectors(_mddf.srec_ptr + _mddf.mddf_block + _volumePrefix, _mddf.srec_len,
+                                                out byte[] sectors);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        // Each entry takes 14 bytes
+        _srecords = new SRecord[sectors.Length / 14];
+
+        for(int s = 0; s < _srecords.Length; s++)
+            _srecords[s] = new SRecord
+            {
+                extent_ptr = BigEndianBitConverter.ToUInt32(sectors, 0x00 + (14 * s)),
+                unknown    = BigEndianBitConverter.ToUInt32(sectors, 0x04 + (14 * s)),
+                filesize   = BigEndianBitConverter.ToUInt32(sectors, 0x08 + (14 * s)),
+                flags      = BigEndianBitConverter.ToUInt16(sectors, 0x0C + (14 * s))
+            };
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/LisaFS/File.cs b/Aaru.Filesystems/LisaFS/File.cs
index 0b2d50e82..9657e1403 100644
--- a/Aaru.Filesystems/LisaFS/File.cs
+++ b/Aaru.Filesystems/LisaFS/File.cs
@@ -37,522 +37,521 @@ using Aaru.Console;
 using Aaru.Decoders;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.LisaFS
+namespace Aaru.Filesystems.LisaFS;
+
+public sealed partial class LisaFS
 {
-    public sealed partial class LisaFS
+    /// <inheritdoc />
+    public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
     {
-        /// <inheritdoc />
-        public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+        attributes = new FileAttributes();
+
+        ErrorNumber error = LookupFileId(path, out short fileId, out bool isDir);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        if(!isDir)
+            return GetAttributes(fileId, out attributes);
+
+        attributes = FileAttributes.Directory;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+    {
+        if(size == 0)
         {
-            attributes = new FileAttributes();
-
-            ErrorNumber error = LookupFileId(path, out short fileId, out bool isDir);
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            if(!isDir)
-                return GetAttributes(fileId, out attributes);
-
-            attributes = FileAttributes.Directory;
+            buf = Array.Empty<byte>();
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
-        {
-            if(size == 0)
+        if(offset < 0)
+            return ErrorNumber.InvalidArgument;
+
+        ErrorNumber error = LookupFileId(path, out short fileId, out _);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        byte[] tmp;
+
+        if(_debug)
+            switch(fileId)
             {
-                buf = Array.Empty<byte>();
-
-                return ErrorNumber.NoError;
-            }
-
-            if(offset < 0)
-                return ErrorNumber.InvalidArgument;
-
-            ErrorNumber error = LookupFileId(path, out short fileId, out _);
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            byte[] tmp;
-
-            if(_debug)
-                switch(fileId)
-                {
-                    case FILEID_BOOT_SIGNED:
-                    case FILEID_LOADER_SIGNED:
-                    case (short)FILEID_MDDF:
-                    case (short)FILEID_BITMAP:
-                    case (short)FILEID_SRECORD:
-                    case (short)FILEID_CATALOG:
-                        error = ReadSystemFile(fileId, out tmp);
-
-                        break;
-                    default:
-                        error = ReadFile(fileId, out tmp);
-
-                        break;
-                }
-            else
-                error = ReadFile(fileId, out tmp);
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            if(offset >= tmp.Length)
-                return ErrorNumber.EINVAL;
-
-            if(size + offset >= tmp.Length)
-                size = tmp.Length - offset;
-
-            buf = new byte[size];
-            Array.Copy(tmp, offset, buf, 0, size);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Stat(string path, out FileEntryInfo stat)
-        {
-            stat = null;
-            ErrorNumber error = LookupFileId(path, out short fileId, out bool isDir);
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            return isDir ? StatDir(fileId, out stat) : Stat(fileId, out stat);
-        }
-
-        ErrorNumber GetAttributes(short fileId, out FileAttributes attributes)
-        {
-            attributes = new FileAttributes();
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            if(fileId < 4)
-            {
-                if(!_debug)
-                    return ErrorNumber.NoSuchFile;
-
-                attributes =  new FileAttributes();
-                attributes =  FileAttributes.System;
-                attributes |= FileAttributes.Hidden;
-
-                attributes |= FileAttributes.File;
-
-                return ErrorNumber.NoError;
-            }
-
-            ErrorNumber error = ReadExtentsFile(fileId, out ExtentFile extFile);
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            switch(extFile.ftype)
-            {
-                case FileType.Spool:
-                    attributes |= FileAttributes.CharDevice;
+                case FILEID_BOOT_SIGNED:
+                case FILEID_LOADER_SIGNED:
+                case (short)FILEID_MDDF:
+                case (short)FILEID_BITMAP:
+                case (short)FILEID_SRECORD:
+                case (short)FILEID_CATALOG:
+                    error = ReadSystemFile(fileId, out tmp);
 
                     break;
-                case FileType.UserCat:
-                case FileType.RootCat:
-                    attributes |= FileAttributes.Directory;
-
-                    break;
-                case FileType.Pipe:
-                    attributes |= FileAttributes.Pipe;
-
-                    break;
-                case FileType.Undefined: break;
                 default:
-                    attributes |= FileAttributes.File;
-                    attributes |= FileAttributes.Extents;
+                    error = ReadFile(fileId, out tmp);
 
                     break;
             }
+        else
+            error = ReadFile(fileId, out tmp);
 
-            if(extFile.protect > 0)
-                attributes |= FileAttributes.Immutable;
+        if(error != ErrorNumber.NoError)
+            return error;
 
-            if(extFile.locked > 0)
-                attributes |= FileAttributes.ReadOnly;
+        if(offset >= tmp.Length)
+            return ErrorNumber.EINVAL;
 
-            if(extFile.password_valid > 0)
-                attributes |= FileAttributes.Password;
+        if(size + offset >= tmp.Length)
+            size = tmp.Length - offset;
 
-            return ErrorNumber.NoError;
-        }
+        buf = new byte[size];
+        Array.Copy(tmp, offset, buf, 0, size);
 
-        ErrorNumber ReadSystemFile(short fileId, out byte[] buf) => ReadSystemFile(fileId, out buf, false);
+        return ErrorNumber.NoError;
+    }
 
-        ErrorNumber ReadSystemFile(short fileId, out byte[] buf, bool tags)
+    /// <inheritdoc />
+    public ErrorNumber Stat(string path, out FileEntryInfo stat)
+    {
+        stat = null;
+        ErrorNumber error = LookupFileId(path, out short fileId, out bool isDir);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        return isDir ? StatDir(fileId, out stat) : Stat(fileId, out stat);
+    }
+
+    ErrorNumber GetAttributes(short fileId, out FileAttributes attributes)
+    {
+        attributes = new FileAttributes();
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(fileId < 4)
         {
-            buf = null;
-            ErrorNumber errno;
-
-            if(!_mounted ||
-               !_debug)
-                return ErrorNumber.AccessDenied;
-
-            if(fileId > 4 ||
-               fileId <= 0)
-                if(fileId != FILEID_BOOT_SIGNED &&
-                   fileId != FILEID_LOADER_SIGNED)
-                    return ErrorNumber.InvalidArgument;
-
-            if(_systemFileCache.TryGetValue(fileId, out buf) &&
-               !tags)
-                return ErrorNumber.NoError;
-
-            int count = 0;
-
-            if(fileId == FILEID_SRECORD)
-                if(!tags)
-                {
-                    errno = _device.ReadSectors(_mddf.mddf_block + _volumePrefix + _mddf.srec_ptr, _mddf.srec_len,
-                                                out buf);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    _systemFileCache.Add(fileId, buf);
-
-                    return ErrorNumber.NoError;
-                }
-                else
-                {
-                    errno = _device.ReadSectorsTag(_mddf.mddf_block + _volumePrefix + _mddf.srec_ptr, _mddf.srec_len,
-                                                   SectorTagType.AppleSectorTag, out buf);
-
-                    return errno != ErrorNumber.NoError ? errno : ErrorNumber.NoError;
-                }
-
-            LisaTag.PriamTag sysTag;
-
-            // Should be enough to check 100 sectors?
-            for(ulong i = 0; i < 100; i++)
-            {
-                errno = _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out byte[] tag);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                DecodeTag(tag, out sysTag);
-
-                if(sysTag.FileId == fileId)
-                    count++;
-            }
-
-            if(count == 0)
+            if(!_debug)
                 return ErrorNumber.NoSuchFile;
 
-            buf = !tags ? new byte[count * _device.Info.SectorSize] : new byte[count * _devTagSize];
+            attributes =  new FileAttributes();
+            attributes =  FileAttributes.System;
+            attributes |= FileAttributes.Hidden;
 
-            // Should be enough to check 100 sectors?
-            for(ulong i = 0; i < 100; i++)
-            {
-                errno = _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out byte[] tag);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                DecodeTag(tag, out sysTag);
-
-                if(sysTag.FileId != fileId)
-                    continue;
-
-                byte[] sector;
-
-                errno = !tags ? _device.ReadSector(i, out sector)
-                            : _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                // Relative block for $Loader starts at $Boot block
-                if(sysTag.FileId == FILEID_LOADER_SIGNED)
-                    sysTag.RelPage--;
-
-                Array.Copy(sector, 0, buf, sector.Length * sysTag.RelPage, sector.Length);
-            }
-
-            if(!tags)
-                _systemFileCache.Add(fileId, buf);
+            attributes |= FileAttributes.File;
 
             return ErrorNumber.NoError;
         }
 
-        ErrorNumber Stat(short fileId, out FileEntryInfo stat)
+        ErrorNumber error = ReadExtentsFile(fileId, out ExtentFile extFile);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        switch(extFile.ftype)
         {
-            stat = null;
+            case FileType.Spool:
+                attributes |= FileAttributes.CharDevice;
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+                break;
+            case FileType.UserCat:
+            case FileType.RootCat:
+                attributes |= FileAttributes.Directory;
 
-            ErrorNumber error;
-            ExtentFile  file;
+                break;
+            case FileType.Pipe:
+                attributes |= FileAttributes.Pipe;
 
-            if(fileId <= 4)
-                if(!_debug ||
-                   fileId == 0)
-                    return ErrorNumber.NoSuchFile;
-                else
-                {
-                    stat = new FileEntryInfo();
+                break;
+            case FileType.Undefined: break;
+            default:
+                attributes |= FileAttributes.File;
+                attributes |= FileAttributes.Extents;
 
-                    error = GetAttributes(fileId, out FileAttributes attrs);
-
-                    stat.Attributes = attrs;
-
-                    if(error != ErrorNumber.NoError)
-                        return error;
-
-                    if(fileId < 0                   &&
-                       fileId != FILEID_BOOT_SIGNED &&
-                       fileId != FILEID_LOADER_SIGNED)
-                    {
-                        error = ReadExtentsFile((short)(fileId * -1), out file);
-
-                        if(error != ErrorNumber.NoError)
-                            return error;
-
-                        stat.CreationTime  = DateHandlers.LisaToDateTime(file.dtc);
-                        stat.AccessTime    = DateHandlers.LisaToDateTime(file.dta);
-                        stat.BackupTime    = DateHandlers.LisaToDateTime(file.dtb);
-                        stat.LastWriteTime = DateHandlers.LisaToDateTime(file.dtm);
-
-                        stat.Inode     = (ulong)fileId;
-                        stat.Links     = 0;
-                        stat.Length    = _mddf.datasize;
-                        stat.BlockSize = _mddf.datasize;
-                        stat.Blocks    = 1;
-                    }
-                    else
-                    {
-                        error = ReadSystemFile(fileId, out byte[] buf);
-
-                        if(error != ErrorNumber.NoError)
-                            return error;
-
-                        stat.CreationTime = fileId != 4 ? _mddf.dtvc : _mddf.dtcc;
-
-                        stat.BackupTime = _mddf.dtvb;
-
-                        stat.Inode     = (ulong)fileId;
-                        stat.Links     = 0;
-                        stat.Length    = buf.Length;
-                        stat.BlockSize = _mddf.datasize;
-                        stat.Blocks    = buf.Length / _mddf.datasize;
-                    }
-
-                    return ErrorNumber.NoError;
-                }
-
-            stat = new FileEntryInfo();
-
-            error           = GetAttributes(fileId, out FileAttributes fileAttributes);
-            stat.Attributes = fileAttributes;
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            error = ReadExtentsFile(fileId, out file);
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            stat.CreationTime  = DateHandlers.LisaToDateTime(file.dtc);
-            stat.AccessTime    = DateHandlers.LisaToDateTime(file.dta);
-            stat.BackupTime    = DateHandlers.LisaToDateTime(file.dtb);
-            stat.LastWriteTime = DateHandlers.LisaToDateTime(file.dtm);
-
-            stat.Inode = (ulong)fileId;
-            stat.Links = 1;
-
-            if(!_fileSizeCache.TryGetValue(fileId, out int len))
-                stat.Length = _srecords[fileId].filesize;
-            else
-                stat.Length = len;
-
-            stat.BlockSize = _mddf.datasize;
-            stat.Blocks    = file.length;
-
-            return ErrorNumber.NoError;
+                break;
         }
 
-        ErrorNumber ReadFile(short fileId, out byte[] buf) => ReadFile(fileId, out buf, false);
+        if(extFile.protect > 0)
+            attributes |= FileAttributes.Immutable;
 
-        ErrorNumber ReadFile(short fileId, out byte[] buf, bool tags)
-        {
-            buf = null;
-            ErrorNumber errno;
+        if(extFile.locked > 0)
+            attributes |= FileAttributes.ReadOnly;
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(extFile.password_valid > 0)
+            attributes |= FileAttributes.Password;
 
-            tags &= _debug;
+        return ErrorNumber.NoError;
+    }
 
-            if(fileId < 4 ||
-               (fileId == 4 && _mddf.fsversion != LISA_V2 && _mddf.fsversion != LISA_V1))
+    ErrorNumber ReadSystemFile(short fileId, out byte[] buf) => ReadSystemFile(fileId, out buf, false);
+
+    ErrorNumber ReadSystemFile(short fileId, out byte[] buf, bool tags)
+    {
+        buf = null;
+        ErrorNumber errno;
+
+        if(!_mounted ||
+           !_debug)
+            return ErrorNumber.AccessDenied;
+
+        if(fileId > 4 ||
+           fileId <= 0)
+            if(fileId != FILEID_BOOT_SIGNED &&
+               fileId != FILEID_LOADER_SIGNED)
                 return ErrorNumber.InvalidArgument;
 
-            if(!tags &&
-               _fileCache.TryGetValue(fileId, out buf))
-                return ErrorNumber.NoError;
+        if(_systemFileCache.TryGetValue(fileId, out buf) &&
+           !tags)
+            return ErrorNumber.NoError;
 
-            ErrorNumber error = ReadExtentsFile(fileId, out ExtentFile file);
+        int count = 0;
 
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            int sectorSize;
-
-            if(tags)
-                sectorSize = _devTagSize;
-            else
-                sectorSize = (int)_device.Info.SectorSize;
-
-            byte[] temp = new byte[file.length * sectorSize];
-
-            int offset = 0;
-
-            for(int i = 0; i < file.extents.Length; i++)
+        if(fileId == FILEID_SRECORD)
+            if(!tags)
             {
-                byte[] sector;
-
-                errno = !tags ? _device.ReadSectors((ulong)file.extents[i].start + _mddf.mddf_block + _volumePrefix,
-                                                    (uint)file.extents[i].length, out sector)
-                            : _device.ReadSectorsTag((ulong)file.extents[i].start + _mddf.mddf_block + _volumePrefix,
-                                                     (uint)file.extents[i].length, SectorTagType.AppleSectorTag,
-                                                     out sector);
+                errno = _device.ReadSectors(_mddf.mddf_block + _volumePrefix + _mddf.srec_ptr, _mddf.srec_len,
+                                            out buf);
 
                 if(errno != ErrorNumber.NoError)
                     return errno;
 
-                Array.Copy(sector, 0, temp, offset, sector.Length);
-                offset += sector.Length;
-            }
+                _systemFileCache.Add(fileId, buf);
 
-            if(!tags)
-            {
-                if(_fileSizeCache.TryGetValue(fileId, out int realSize))
-                    if(realSize > temp.Length)
-                        AaruConsole.ErrorWriteLine("File {0} gets truncated.", fileId);
-
-                buf = temp;
-
-                _fileCache.Add(fileId, buf);
+                return ErrorNumber.NoError;
             }
             else
-                buf = temp;
+            {
+                errno = _device.ReadSectorsTag(_mddf.mddf_block + _volumePrefix + _mddf.srec_ptr, _mddf.srec_len,
+                                               SectorTagType.AppleSectorTag, out buf);
+
+                return errno != ErrorNumber.NoError ? errno : ErrorNumber.NoError;
+            }
+
+        LisaTag.PriamTag sysTag;
+
+        // Should be enough to check 100 sectors?
+        for(ulong i = 0; i < 100; i++)
+        {
+            errno = _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out byte[] tag);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            DecodeTag(tag, out sysTag);
+
+            if(sysTag.FileId == fileId)
+                count++;
+        }
+
+        if(count == 0)
+            return ErrorNumber.NoSuchFile;
+
+        buf = !tags ? new byte[count * _device.Info.SectorSize] : new byte[count * _devTagSize];
+
+        // Should be enough to check 100 sectors?
+        for(ulong i = 0; i < 100; i++)
+        {
+            errno = _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out byte[] tag);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            DecodeTag(tag, out sysTag);
+
+            if(sysTag.FileId != fileId)
+                continue;
+
+            byte[] sector;
+
+            errno = !tags ? _device.ReadSector(i, out sector)
+                        : _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            // Relative block for $Loader starts at $Boot block
+            if(sysTag.FileId == FILEID_LOADER_SIGNED)
+                sysTag.RelPage--;
+
+            Array.Copy(sector, 0, buf, sector.Length * sysTag.RelPage, sector.Length);
+        }
+
+        if(!tags)
+            _systemFileCache.Add(fileId, buf);
+
+        return ErrorNumber.NoError;
+    }
+
+    ErrorNumber Stat(short fileId, out FileEntryInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber error;
+        ExtentFile  file;
+
+        if(fileId <= 4)
+            if(!_debug ||
+               fileId == 0)
+                return ErrorNumber.NoSuchFile;
+            else
+            {
+                stat = new FileEntryInfo();
+
+                error = GetAttributes(fileId, out FileAttributes attrs);
+
+                stat.Attributes = attrs;
+
+                if(error != ErrorNumber.NoError)
+                    return error;
+
+                if(fileId < 0                   &&
+                   fileId != FILEID_BOOT_SIGNED &&
+                   fileId != FILEID_LOADER_SIGNED)
+                {
+                    error = ReadExtentsFile((short)(fileId * -1), out file);
+
+                    if(error != ErrorNumber.NoError)
+                        return error;
+
+                    stat.CreationTime  = DateHandlers.LisaToDateTime(file.dtc);
+                    stat.AccessTime    = DateHandlers.LisaToDateTime(file.dta);
+                    stat.BackupTime    = DateHandlers.LisaToDateTime(file.dtb);
+                    stat.LastWriteTime = DateHandlers.LisaToDateTime(file.dtm);
+
+                    stat.Inode     = (ulong)fileId;
+                    stat.Links     = 0;
+                    stat.Length    = _mddf.datasize;
+                    stat.BlockSize = _mddf.datasize;
+                    stat.Blocks    = 1;
+                }
+                else
+                {
+                    error = ReadSystemFile(fileId, out byte[] buf);
+
+                    if(error != ErrorNumber.NoError)
+                        return error;
+
+                    stat.CreationTime = fileId != 4 ? _mddf.dtvc : _mddf.dtcc;
+
+                    stat.BackupTime = _mddf.dtvb;
+
+                    stat.Inode     = (ulong)fileId;
+                    stat.Links     = 0;
+                    stat.Length    = buf.Length;
+                    stat.BlockSize = _mddf.datasize;
+                    stat.Blocks    = buf.Length / _mddf.datasize;
+                }
+
+                return ErrorNumber.NoError;
+            }
+
+        stat = new FileEntryInfo();
+
+        error           = GetAttributes(fileId, out FileAttributes fileAttributes);
+        stat.Attributes = fileAttributes;
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        error = ReadExtentsFile(fileId, out file);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        stat.CreationTime  = DateHandlers.LisaToDateTime(file.dtc);
+        stat.AccessTime    = DateHandlers.LisaToDateTime(file.dta);
+        stat.BackupTime    = DateHandlers.LisaToDateTime(file.dtb);
+        stat.LastWriteTime = DateHandlers.LisaToDateTime(file.dtm);
+
+        stat.Inode = (ulong)fileId;
+        stat.Links = 1;
+
+        if(!_fileSizeCache.TryGetValue(fileId, out int len))
+            stat.Length = _srecords[fileId].filesize;
+        else
+            stat.Length = len;
+
+        stat.BlockSize = _mddf.datasize;
+        stat.Blocks    = file.length;
+
+        return ErrorNumber.NoError;
+    }
+
+    ErrorNumber ReadFile(short fileId, out byte[] buf) => ReadFile(fileId, out buf, false);
+
+    ErrorNumber ReadFile(short fileId, out byte[] buf, bool tags)
+    {
+        buf = null;
+        ErrorNumber errno;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        tags &= _debug;
+
+        if(fileId < 4 ||
+           (fileId == 4 && _mddf.fsversion != LISA_V2 && _mddf.fsversion != LISA_V1))
+            return ErrorNumber.InvalidArgument;
+
+        if(!tags &&
+           _fileCache.TryGetValue(fileId, out buf))
+            return ErrorNumber.NoError;
+
+        ErrorNumber error = ReadExtentsFile(fileId, out ExtentFile file);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        int sectorSize;
+
+        if(tags)
+            sectorSize = _devTagSize;
+        else
+            sectorSize = (int)_device.Info.SectorSize;
+
+        byte[] temp = new byte[file.length * sectorSize];
+
+        int offset = 0;
+
+        for(int i = 0; i < file.extents.Length; i++)
+        {
+            byte[] sector;
+
+            errno = !tags ? _device.ReadSectors((ulong)file.extents[i].start + _mddf.mddf_block + _volumePrefix,
+                                                (uint)file.extents[i].length, out sector)
+                        : _device.ReadSectorsTag((ulong)file.extents[i].start + _mddf.mddf_block + _volumePrefix,
+                                                 (uint)file.extents[i].length, SectorTagType.AppleSectorTag,
+                                                 out sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            Array.Copy(sector, 0, temp, offset, sector.Length);
+            offset += sector.Length;
+        }
+
+        if(!tags)
+        {
+            if(_fileSizeCache.TryGetValue(fileId, out int realSize))
+                if(realSize > temp.Length)
+                    AaruConsole.ErrorWriteLine("File {0} gets truncated.", fileId);
+
+            buf = temp;
+
+            _fileCache.Add(fileId, buf);
+        }
+        else
+            buf = temp;
+
+        return ErrorNumber.NoError;
+    }
+
+    ErrorNumber LookupFileId(string path, out short fileId, out bool isDir)
+    {
+        fileId = 0;
+        isDir  = false;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
+
+        if(pathElements.Length == 0)
+        {
+            fileId = DIRID_ROOT;
+            isDir  = true;
 
             return ErrorNumber.NoError;
         }
 
-        ErrorNumber LookupFileId(string path, out short fileId, out bool isDir)
+        // Only V3 supports subdirectories
+        if(pathElements.Length > 1 &&
+           _mddf.fsversion     != LISA_V3)
+            return ErrorNumber.NotSupported;
+
+        if(_debug && pathElements.Length == 1)
         {
-            fileId = 0;
-            isDir  = false;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            string[] pathElements = path.Split(new[]
+            if(string.Compare(pathElements[0], "$MDDF", StringComparison.InvariantCulture) == 0)
             {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+                fileId = (short)FILEID_MDDF;
 
-            if(pathElements.Length == 0)
+                return ErrorNumber.NoError;
+            }
+
+            if(string.Compare(pathElements[0], "$Boot", StringComparison.InvariantCulture) == 0)
+            {
+                fileId = FILEID_BOOT_SIGNED;
+
+                return ErrorNumber.NoError;
+            }
+
+            if(string.Compare(pathElements[0], "$Loader", StringComparison.InvariantCulture) == 0)
+            {
+                fileId = FILEID_LOADER_SIGNED;
+
+                return ErrorNumber.NoError;
+            }
+
+            if(string.Compare(pathElements[0], "$Bitmap", StringComparison.InvariantCulture) == 0)
+            {
+                fileId = (short)FILEID_BITMAP;
+
+                return ErrorNumber.NoError;
+            }
+
+            if(string.Compare(pathElements[0], "$S-Record", StringComparison.InvariantCulture) == 0)
+            {
+                fileId = (short)FILEID_SRECORD;
+
+                return ErrorNumber.NoError;
+            }
+
+            if(string.Compare(pathElements[0], "$", StringComparison.InvariantCulture) == 0)
             {
                 fileId = DIRID_ROOT;
                 isDir  = true;
 
                 return ErrorNumber.NoError;
             }
-
-            // Only V3 supports subdirectories
-            if(pathElements.Length > 1 &&
-               _mddf.fsversion     != LISA_V3)
-                return ErrorNumber.NotSupported;
-
-            if(_debug && pathElements.Length == 1)
-            {
-                if(string.Compare(pathElements[0], "$MDDF", StringComparison.InvariantCulture) == 0)
-                {
-                    fileId = (short)FILEID_MDDF;
-
-                    return ErrorNumber.NoError;
-                }
-
-                if(string.Compare(pathElements[0], "$Boot", StringComparison.InvariantCulture) == 0)
-                {
-                    fileId = FILEID_BOOT_SIGNED;
-
-                    return ErrorNumber.NoError;
-                }
-
-                if(string.Compare(pathElements[0], "$Loader", StringComparison.InvariantCulture) == 0)
-                {
-                    fileId = FILEID_LOADER_SIGNED;
-
-                    return ErrorNumber.NoError;
-                }
-
-                if(string.Compare(pathElements[0], "$Bitmap", StringComparison.InvariantCulture) == 0)
-                {
-                    fileId = (short)FILEID_BITMAP;
-
-                    return ErrorNumber.NoError;
-                }
-
-                if(string.Compare(pathElements[0], "$S-Record", StringComparison.InvariantCulture) == 0)
-                {
-                    fileId = (short)FILEID_SRECORD;
-
-                    return ErrorNumber.NoError;
-                }
-
-                if(string.Compare(pathElements[0], "$", StringComparison.InvariantCulture) == 0)
-                {
-                    fileId = DIRID_ROOT;
-                    isDir  = true;
-
-                    return ErrorNumber.NoError;
-                }
-            }
-
-            for(int lvl = 0; lvl < pathElements.Length; lvl++)
-            {
-                string wantedFilename = pathElements[0].Replace('-', '/');
-
-                foreach(CatalogEntry entry in _catalogCache)
-                {
-                    string filename = StringHandlers.CToString(entry.filename, Encoding);
-
-                    // LisaOS is case insensitive
-                    if(string.Compare(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) != 0 ||
-                       entry.parentID                                                                        != fileId)
-                        continue;
-
-                    fileId = entry.fileID;
-                    isDir  = entry.fileType == 0x01;
-
-                    // Not last path element, and it's not a directory
-                    if(lvl != pathElements.Length - 1 &&
-                       !isDir)
-                        return ErrorNumber.NotDirectory;
-
-                    // Arrived last path element
-                    if(lvl == pathElements.Length - 1)
-                        return ErrorNumber.NoError;
-                }
-            }
-
-            return ErrorNumber.NoSuchFile;
         }
+
+        for(int lvl = 0; lvl < pathElements.Length; lvl++)
+        {
+            string wantedFilename = pathElements[0].Replace('-', '/');
+
+            foreach(CatalogEntry entry in _catalogCache)
+            {
+                string filename = StringHandlers.CToString(entry.filename, Encoding);
+
+                // LisaOS is case insensitive
+                if(string.Compare(wantedFilename, filename, StringComparison.InvariantCultureIgnoreCase) != 0 ||
+                   entry.parentID                                                                        != fileId)
+                    continue;
+
+                fileId = entry.fileID;
+                isDir  = entry.fileType == 0x01;
+
+                // Not last path element, and it's not a directory
+                if(lvl != pathElements.Length - 1 &&
+                   !isDir)
+                    return ErrorNumber.NotDirectory;
+
+                // Arrived last path element
+                if(lvl == pathElements.Length - 1)
+                    return ErrorNumber.NoError;
+            }
+        }
+
+        return ErrorNumber.NoSuchFile;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/LisaFS/Info.cs b/Aaru.Filesystems/LisaFS/Info.cs
index f4215b8a0..b91def688 100644
--- a/Aaru.Filesystems/LisaFS/Info.cs
+++ b/Aaru.Filesystems/LisaFS/Info.cs
@@ -42,378 +42,377 @@ using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
-namespace Aaru.Filesystems.LisaFS
+namespace Aaru.Filesystems.LisaFS;
+
+public sealed partial class LisaFS
 {
-    public sealed partial class LisaFS
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            ErrorNumber errno;
-
-            if(imagePlugin.Info.ReadableSectorTags?.Contains(SectorTagType.AppleSectorTag) != true)
-                return false;
-
-            // Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
-            if(imagePlugin.Info.Sectors < 800)
-                return false;
-
-            int beforeMddf = -1;
-
-            // LisaOS searches sectors until tag tells MDDF resides there, so we'll search 100 sectors
-            for(int i = 0; i < 100; i++)
-            {
-                errno = imagePlugin.ReadSectorTag((ulong)i, SectorTagType.AppleSectorTag, out byte[] tag);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                DecodeTag(tag, out LisaTag.PriamTag searchTag);
-
-                AaruConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
-
-                if(beforeMddf       == -1 &&
-                   searchTag.FileId == FILEID_LOADER_SIGNED)
-                    beforeMddf = i - 1;
-
-                if(searchTag.FileId != FILEID_MDDF)
-                    continue;
-
-                errno = imagePlugin.ReadSector((ulong)i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                var infoMddf = new MDDF
-                {
-                    mddf_block                   = BigEndianBitConverter.ToUInt32(sector, 0x6C),
-                    volsize_minus_one            = BigEndianBitConverter.ToUInt32(sector, 0x70),
-                    volsize_minus_mddf_minus_one = BigEndianBitConverter.ToUInt32(sector, 0x74),
-                    vol_size                     = BigEndianBitConverter.ToUInt32(sector, 0x78),
-                    blocksize                    = BigEndianBitConverter.ToUInt16(sector, 0x7C),
-                    datasize                     = BigEndianBitConverter.ToUInt16(sector, 0x7E)
-                };
-
-                AaruConsole.DebugWriteLine("LisaFS plugin", "Current sector = {0}", i);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.mddf_block = {0}", infoMddf.mddf_block);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "Disk size = {0} sectors", imagePlugin.Info.Sectors);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size = {0} sectors", infoMddf.vol_size);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size - 1 = {0}", infoMddf.volsize_minus_one);
-
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size - mddf.mddf_block -1 = {0}",
-                                           infoMddf.volsize_minus_mddf_minus_one);
-
-                AaruConsole.DebugWriteLine("LisaFS plugin", "Disk sector = {0} bytes", imagePlugin.Info.SectorSize);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.blocksize = {0} bytes", infoMddf.blocksize);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.datasize = {0} bytes", infoMddf.datasize);
-
-                if(infoMddf.mddf_block != i - beforeMddf)
-                    return false;
-
-                if(infoMddf.vol_size > imagePlugin.Info.Sectors)
-                    return false;
-
-                if(infoMddf.vol_size - 1 != infoMddf.volsize_minus_one)
-                    return false;
-
-                if(infoMddf.vol_size - i - 1 != infoMddf.volsize_minus_mddf_minus_one - beforeMddf)
-                    return false;
-
-                if(infoMddf.datasize > infoMddf.blocksize)
-                    return false;
-
-                if(infoMddf.blocksize < imagePlugin.Info.SectorSize)
-                    return false;
-
-                return infoMddf.datasize == imagePlugin.Info.SectorSize;
-            }
+        ErrorNumber errno;
 
+        if(imagePlugin.Info.ReadableSectorTags?.Contains(SectorTagType.AppleSectorTag) != true)
             return false;
+
+        // Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
+        if(imagePlugin.Info.Sectors < 800)
+            return false;
+
+        int beforeMddf = -1;
+
+        // LisaOS searches sectors until tag tells MDDF resides there, so we'll search 100 sectors
+        for(int i = 0; i < 100; i++)
+        {
+            errno = imagePlugin.ReadSectorTag((ulong)i, SectorTagType.AppleSectorTag, out byte[] tag);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            DecodeTag(tag, out LisaTag.PriamTag searchTag);
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
+
+            if(beforeMddf       == -1 &&
+               searchTag.FileId == FILEID_LOADER_SIGNED)
+                beforeMddf = i - 1;
+
+            if(searchTag.FileId != FILEID_MDDF)
+                continue;
+
+            errno = imagePlugin.ReadSector((ulong)i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            var infoMddf = new MDDF
+            {
+                mddf_block                   = BigEndianBitConverter.ToUInt32(sector, 0x6C),
+                volsize_minus_one            = BigEndianBitConverter.ToUInt32(sector, 0x70),
+                volsize_minus_mddf_minus_one = BigEndianBitConverter.ToUInt32(sector, 0x74),
+                vol_size                     = BigEndianBitConverter.ToUInt32(sector, 0x78),
+                blocksize                    = BigEndianBitConverter.ToUInt16(sector, 0x7C),
+                datasize                     = BigEndianBitConverter.ToUInt16(sector, 0x7E)
+            };
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "Current sector = {0}", i);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.mddf_block = {0}", infoMddf.mddf_block);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "Disk size = {0} sectors", imagePlugin.Info.Sectors);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size = {0} sectors", infoMddf.vol_size);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size - 1 = {0}", infoMddf.volsize_minus_one);
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.vol_size - mddf.mddf_block -1 = {0}",
+                                       infoMddf.volsize_minus_mddf_minus_one);
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "Disk sector = {0} bytes", imagePlugin.Info.SectorSize);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.blocksize = {0} bytes", infoMddf.blocksize);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.datasize = {0} bytes", infoMddf.datasize);
+
+            if(infoMddf.mddf_block != i - beforeMddf)
+                return false;
+
+            if(infoMddf.vol_size > imagePlugin.Info.Sectors)
+                return false;
+
+            if(infoMddf.vol_size - 1 != infoMddf.volsize_minus_one)
+                return false;
+
+            if(infoMddf.vol_size - i - 1 != infoMddf.volsize_minus_mddf_minus_one - beforeMddf)
+                return false;
+
+            if(infoMddf.datasize > infoMddf.blocksize)
+                return false;
+
+            if(infoMddf.blocksize < imagePlugin.Info.SectorSize)
+                return false;
+
+            return infoMddf.datasize == imagePlugin.Info.SectorSize;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        return false;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = new LisaRoman();
+        information = "";
+        var         sb = new StringBuilder();
+        ErrorNumber errno;
+
+        if(imagePlugin.Info.ReadableSectorTags?.Contains(SectorTagType.AppleSectorTag) != true)
+            return;
+
+        // Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
+        if(imagePlugin.Info.Sectors < 800)
+            return;
+
+        int beforeMddf = -1;
+
+        // LisaOS searches sectors until tag tells MDDF resides there, so we'll search 100 sectors
+        for(int i = 0; i < 100; i++)
         {
-            Encoding    = new LisaRoman();
-            information = "";
-            var         sb = new StringBuilder();
-            ErrorNumber errno;
+            errno = imagePlugin.ReadSectorTag((ulong)i, SectorTagType.AppleSectorTag, out byte[] tag);
 
-            if(imagePlugin.Info.ReadableSectorTags?.Contains(SectorTagType.AppleSectorTag) != true)
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            DecodeTag(tag, out LisaTag.PriamTag searchTag);
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
+
+            if(beforeMddf       == -1 &&
+               searchTag.FileId == FILEID_LOADER_SIGNED)
+                beforeMddf = i - 1;
+
+            if(searchTag.FileId != FILEID_MDDF)
+                continue;
+
+            errno = imagePlugin.ReadSector((ulong)i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            var    infoMddf = new MDDF();
+            byte[] pString  = new byte[33];
+
+            infoMddf.fsversion = BigEndianBitConverter.ToUInt16(sector, 0x00);
+            infoMddf.volid     = BigEndianBitConverter.ToUInt64(sector, 0x02);
+            infoMddf.volnum    = BigEndianBitConverter.ToUInt16(sector, 0x0A);
+            Array.Copy(sector, 0x0C, pString, 0, 33);
+            infoMddf.volname  = StringHandlers.PascalToString(pString, Encoding);
+            infoMddf.unknown1 = sector[0x2D];
+            Array.Copy(sector, 0x2E, pString, 0, 33);
+
+            // Prevent garbage
+            infoMddf.password       = pString[0] <= 32 ? StringHandlers.PascalToString(pString, Encoding) : "";
+            infoMddf.unknown2       = sector[0x4F];
+            infoMddf.machine_id     = BigEndianBitConverter.ToUInt32(sector, 0x50);
+            infoMddf.master_copy_id = BigEndianBitConverter.ToUInt32(sector, 0x54);
+            uint lisaTime = BigEndianBitConverter.ToUInt32(sector, 0x58);
+            infoMddf.dtvc                         = DateHandlers.LisaToDateTime(lisaTime);
+            lisaTime                              = BigEndianBitConverter.ToUInt32(sector, 0x5C);
+            infoMddf.dtcc                         = DateHandlers.LisaToDateTime(lisaTime);
+            lisaTime                              = BigEndianBitConverter.ToUInt32(sector, 0x60);
+            infoMddf.dtvb                         = DateHandlers.LisaToDateTime(lisaTime);
+            lisaTime                              = BigEndianBitConverter.ToUInt32(sector, 0x64);
+            infoMddf.dtvs                         = DateHandlers.LisaToDateTime(lisaTime);
+            infoMddf.unknown3                     = BigEndianBitConverter.ToUInt32(sector, 0x68);
+            infoMddf.mddf_block                   = BigEndianBitConverter.ToUInt32(sector, 0x6C);
+            infoMddf.volsize_minus_one            = BigEndianBitConverter.ToUInt32(sector, 0x70);
+            infoMddf.volsize_minus_mddf_minus_one = BigEndianBitConverter.ToUInt32(sector, 0x74);
+            infoMddf.vol_size                     = BigEndianBitConverter.ToUInt32(sector, 0x78);
+            infoMddf.blocksize                    = BigEndianBitConverter.ToUInt16(sector, 0x7C);
+            infoMddf.datasize                     = BigEndianBitConverter.ToUInt16(sector, 0x7E);
+            infoMddf.unknown4                     = BigEndianBitConverter.ToUInt16(sector, 0x80);
+            infoMddf.unknown5                     = BigEndianBitConverter.ToUInt32(sector, 0x82);
+            infoMddf.unknown6                     = BigEndianBitConverter.ToUInt32(sector, 0x86);
+            infoMddf.clustersize                  = BigEndianBitConverter.ToUInt16(sector, 0x8A);
+            infoMddf.fs_size                      = BigEndianBitConverter.ToUInt32(sector, 0x8C);
+            infoMddf.unknown7                     = BigEndianBitConverter.ToUInt32(sector, 0x90);
+            infoMddf.srec_ptr                     = BigEndianBitConverter.ToUInt32(sector, 0x94);
+            infoMddf.unknown9                     = BigEndianBitConverter.ToUInt16(sector, 0x98);
+            infoMddf.srec_len                     = BigEndianBitConverter.ToUInt16(sector, 0x9A);
+            infoMddf.unknown10                    = BigEndianBitConverter.ToUInt32(sector, 0x9C);
+            infoMddf.unknown11                    = BigEndianBitConverter.ToUInt32(sector, 0xA0);
+            infoMddf.unknown12                    = BigEndianBitConverter.ToUInt32(sector, 0xA4);
+            infoMddf.unknown13                    = BigEndianBitConverter.ToUInt32(sector, 0xA8);
+            infoMddf.unknown14                    = BigEndianBitConverter.ToUInt32(sector, 0xAC);
+            infoMddf.filecount                    = BigEndianBitConverter.ToUInt16(sector, 0xB0);
+            infoMddf.unknown15                    = BigEndianBitConverter.ToUInt32(sector, 0xB2);
+            infoMddf.unknown16                    = BigEndianBitConverter.ToUInt32(sector, 0xB6);
+            infoMddf.freecount                    = BigEndianBitConverter.ToUInt32(sector, 0xBA);
+            infoMddf.unknown17                    = BigEndianBitConverter.ToUInt16(sector, 0xBE);
+            infoMddf.unknown18                    = BigEndianBitConverter.ToUInt32(sector, 0xC0);
+            infoMddf.overmount_stamp              = BigEndianBitConverter.ToUInt64(sector, 0xC4);
+            infoMddf.serialization                = BigEndianBitConverter.ToUInt32(sector, 0xCC);
+            infoMddf.unknown19                    = BigEndianBitConverter.ToUInt32(sector, 0xD0);
+            infoMddf.unknown_timestamp            = BigEndianBitConverter.ToUInt32(sector, 0xD4);
+            infoMddf.unknown20                    = BigEndianBitConverter.ToUInt32(sector, 0xD8);
+            infoMddf.unknown21                    = BigEndianBitConverter.ToUInt32(sector, 0xDC);
+            infoMddf.unknown22                    = BigEndianBitConverter.ToUInt32(sector, 0xE0);
+            infoMddf.unknown23                    = BigEndianBitConverter.ToUInt32(sector, 0xE4);
+            infoMddf.unknown24                    = BigEndianBitConverter.ToUInt32(sector, 0xE8);
+            infoMddf.unknown25                    = BigEndianBitConverter.ToUInt32(sector, 0xEC);
+            infoMddf.unknown26                    = BigEndianBitConverter.ToUInt32(sector, 0xF0);
+            infoMddf.unknown27                    = BigEndianBitConverter.ToUInt32(sector, 0xF4);
+            infoMddf.unknown28                    = BigEndianBitConverter.ToUInt32(sector, 0xF8);
+            infoMddf.unknown29                    = BigEndianBitConverter.ToUInt32(sector, 0xFC);
+            infoMddf.unknown30                    = BigEndianBitConverter.ToUInt32(sector, 0x100);
+            infoMddf.unknown31                    = BigEndianBitConverter.ToUInt32(sector, 0x104);
+            infoMddf.unknown32                    = BigEndianBitConverter.ToUInt32(sector, 0x108);
+            infoMddf.unknown33                    = BigEndianBitConverter.ToUInt32(sector, 0x10C);
+            infoMddf.unknown34                    = BigEndianBitConverter.ToUInt32(sector, 0x110);
+            infoMddf.unknown35                    = BigEndianBitConverter.ToUInt32(sector, 0x114);
+            infoMddf.backup_volid                 = BigEndianBitConverter.ToUInt64(sector, 0x118);
+            infoMddf.label_size                   = BigEndianBitConverter.ToUInt16(sector, 0x120);
+            infoMddf.fs_overhead                  = BigEndianBitConverter.ToUInt16(sector, 0x122);
+            infoMddf.result_scavenge              = BigEndianBitConverter.ToUInt16(sector, 0x124);
+            infoMddf.boot_code                    = BigEndianBitConverter.ToUInt16(sector, 0x126);
+            infoMddf.boot_environ                 = BigEndianBitConverter.ToUInt16(sector, 0x6C);
+            infoMddf.unknown36                    = BigEndianBitConverter.ToUInt32(sector, 0x12A);
+            infoMddf.unknown37                    = BigEndianBitConverter.ToUInt32(sector, 0x12E);
+            infoMddf.unknown38                    = BigEndianBitConverter.ToUInt32(sector, 0x132);
+            infoMddf.vol_sequence                 = BigEndianBitConverter.ToUInt16(sector, 0x136);
+            infoMddf.vol_left_mounted             = sector[0x138];
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown1 = 0x{0:X2} ({0})", infoMddf.unknown1);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown2 = 0x{0:X2} ({0})", infoMddf.unknown2);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown3 = 0x{0:X8} ({0})", infoMddf.unknown3);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown4 = 0x{0:X4} ({0})", infoMddf.unknown4);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown5 = 0x{0:X8} ({0})", infoMddf.unknown5);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown6 = 0x{0:X8} ({0})", infoMddf.unknown6);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown7 = 0x{0:X8} ({0})", infoMddf.unknown7);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown9 = 0x{0:X4} ({0})", infoMddf.unknown9);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown10 = 0x{0:X8} ({0})", infoMddf.unknown10);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown11 = 0x{0:X8} ({0})", infoMddf.unknown11);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown12 = 0x{0:X8} ({0})", infoMddf.unknown12);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown13 = 0x{0:X8} ({0})", infoMddf.unknown13);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown14 = 0x{0:X8} ({0})", infoMddf.unknown14);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown15 = 0x{0:X8} ({0})", infoMddf.unknown15);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown16 = 0x{0:X8} ({0})", infoMddf.unknown16);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown17 = 0x{0:X4} ({0})", infoMddf.unknown17);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown18 = 0x{0:X8} ({0})", infoMddf.unknown18);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown19 = 0x{0:X8} ({0})", infoMddf.unknown19);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown20 = 0x{0:X8} ({0})", infoMddf.unknown20);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown21 = 0x{0:X8} ({0})", infoMddf.unknown21);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown22 = 0x{0:X8} ({0})", infoMddf.unknown22);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown23 = 0x{0:X8} ({0})", infoMddf.unknown23);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown24 = 0x{0:X8} ({0})", infoMddf.unknown24);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown25 = 0x{0:X8} ({0})", infoMddf.unknown25);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown26 = 0x{0:X8} ({0})", infoMddf.unknown26);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown27 = 0x{0:X8} ({0})", infoMddf.unknown27);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown28 = 0x{0:X8} ({0})", infoMddf.unknown28);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown29 = 0x{0:X8} ({0})", infoMddf.unknown29);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown30 = 0x{0:X8} ({0})", infoMddf.unknown30);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown31 = 0x{0:X8} ({0})", infoMddf.unknown31);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown32 = 0x{0:X8} ({0})", infoMddf.unknown32);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown33 = 0x{0:X8} ({0})", infoMddf.unknown33);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown34 = 0x{0:X8} ({0})", infoMddf.unknown34);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown35 = 0x{0:X8} ({0})", infoMddf.unknown35);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown36 = 0x{0:X8} ({0})", infoMddf.unknown36);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown37 = 0x{0:X8} ({0})", infoMddf.unknown37);
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown38 = 0x{0:X8} ({0})", infoMddf.unknown38);
+
+            AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown_timestamp = 0x{0:X8} ({0}, {1})",
+                                       infoMddf.unknown_timestamp,
+                                       DateHandlers.LisaToDateTime(infoMddf.unknown_timestamp));
+
+            if(infoMddf.mddf_block != i - beforeMddf)
                 return;
 
-            // Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
-            if(imagePlugin.Info.Sectors < 800)
+            if(infoMddf.vol_size > imagePlugin.Info.Sectors)
                 return;
 
-            int beforeMddf = -1;
+            if(infoMddf.vol_size - 1 != infoMddf.volsize_minus_one)
+                return;
 
-            // LisaOS searches sectors until tag tells MDDF resides there, so we'll search 100 sectors
-            for(int i = 0; i < 100; i++)
+            if(infoMddf.vol_size - i - 1 != infoMddf.volsize_minus_mddf_minus_one - beforeMddf)
+                return;
+
+            if(infoMddf.datasize > infoMddf.blocksize)
+                return;
+
+            if(infoMddf.blocksize < imagePlugin.Info.SectorSize)
+                return;
+
+            if(infoMddf.datasize != imagePlugin.Info.SectorSize)
+                return;
+
+            switch(infoMddf.fsversion)
             {
-                errno = imagePlugin.ReadSectorTag((ulong)i, SectorTagType.AppleSectorTag, out byte[] tag);
+                case LISA_V1:
+                    sb.AppendLine("LisaFS v1");
 
-                if(errno != ErrorNumber.NoError)
-                    continue;
+                    break;
+                case LISA_V2:
+                    sb.AppendLine("LisaFS v2");
 
-                DecodeTag(tag, out LisaTag.PriamTag searchTag);
+                    break;
+                case LISA_V3:
+                    sb.AppendLine("LisaFS v3");
 
-                AaruConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
+                    break;
+                default:
+                    sb.AppendFormat("Unknown LisaFS version {0}", infoMddf.fsversion).AppendLine();
 
-                if(beforeMddf       == -1 &&
-                   searchTag.FileId == FILEID_LOADER_SIGNED)
-                    beforeMddf = i - 1;
-
-                if(searchTag.FileId != FILEID_MDDF)
-                    continue;
-
-                errno = imagePlugin.ReadSector((ulong)i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                var    infoMddf = new MDDF();
-                byte[] pString  = new byte[33];
-
-                infoMddf.fsversion = BigEndianBitConverter.ToUInt16(sector, 0x00);
-                infoMddf.volid     = BigEndianBitConverter.ToUInt64(sector, 0x02);
-                infoMddf.volnum    = BigEndianBitConverter.ToUInt16(sector, 0x0A);
-                Array.Copy(sector, 0x0C, pString, 0, 33);
-                infoMddf.volname  = StringHandlers.PascalToString(pString, Encoding);
-                infoMddf.unknown1 = sector[0x2D];
-                Array.Copy(sector, 0x2E, pString, 0, 33);
-
-                // Prevent garbage
-                infoMddf.password       = pString[0] <= 32 ? StringHandlers.PascalToString(pString, Encoding) : "";
-                infoMddf.unknown2       = sector[0x4F];
-                infoMddf.machine_id     = BigEndianBitConverter.ToUInt32(sector, 0x50);
-                infoMddf.master_copy_id = BigEndianBitConverter.ToUInt32(sector, 0x54);
-                uint lisaTime = BigEndianBitConverter.ToUInt32(sector, 0x58);
-                infoMddf.dtvc                         = DateHandlers.LisaToDateTime(lisaTime);
-                lisaTime                              = BigEndianBitConverter.ToUInt32(sector, 0x5C);
-                infoMddf.dtcc                         = DateHandlers.LisaToDateTime(lisaTime);
-                lisaTime                              = BigEndianBitConverter.ToUInt32(sector, 0x60);
-                infoMddf.dtvb                         = DateHandlers.LisaToDateTime(lisaTime);
-                lisaTime                              = BigEndianBitConverter.ToUInt32(sector, 0x64);
-                infoMddf.dtvs                         = DateHandlers.LisaToDateTime(lisaTime);
-                infoMddf.unknown3                     = BigEndianBitConverter.ToUInt32(sector, 0x68);
-                infoMddf.mddf_block                   = BigEndianBitConverter.ToUInt32(sector, 0x6C);
-                infoMddf.volsize_minus_one            = BigEndianBitConverter.ToUInt32(sector, 0x70);
-                infoMddf.volsize_minus_mddf_minus_one = BigEndianBitConverter.ToUInt32(sector, 0x74);
-                infoMddf.vol_size                     = BigEndianBitConverter.ToUInt32(sector, 0x78);
-                infoMddf.blocksize                    = BigEndianBitConverter.ToUInt16(sector, 0x7C);
-                infoMddf.datasize                     = BigEndianBitConverter.ToUInt16(sector, 0x7E);
-                infoMddf.unknown4                     = BigEndianBitConverter.ToUInt16(sector, 0x80);
-                infoMddf.unknown5                     = BigEndianBitConverter.ToUInt32(sector, 0x82);
-                infoMddf.unknown6                     = BigEndianBitConverter.ToUInt32(sector, 0x86);
-                infoMddf.clustersize                  = BigEndianBitConverter.ToUInt16(sector, 0x8A);
-                infoMddf.fs_size                      = BigEndianBitConverter.ToUInt32(sector, 0x8C);
-                infoMddf.unknown7                     = BigEndianBitConverter.ToUInt32(sector, 0x90);
-                infoMddf.srec_ptr                     = BigEndianBitConverter.ToUInt32(sector, 0x94);
-                infoMddf.unknown9                     = BigEndianBitConverter.ToUInt16(sector, 0x98);
-                infoMddf.srec_len                     = BigEndianBitConverter.ToUInt16(sector, 0x9A);
-                infoMddf.unknown10                    = BigEndianBitConverter.ToUInt32(sector, 0x9C);
-                infoMddf.unknown11                    = BigEndianBitConverter.ToUInt32(sector, 0xA0);
-                infoMddf.unknown12                    = BigEndianBitConverter.ToUInt32(sector, 0xA4);
-                infoMddf.unknown13                    = BigEndianBitConverter.ToUInt32(sector, 0xA8);
-                infoMddf.unknown14                    = BigEndianBitConverter.ToUInt32(sector, 0xAC);
-                infoMddf.filecount                    = BigEndianBitConverter.ToUInt16(sector, 0xB0);
-                infoMddf.unknown15                    = BigEndianBitConverter.ToUInt32(sector, 0xB2);
-                infoMddf.unknown16                    = BigEndianBitConverter.ToUInt32(sector, 0xB6);
-                infoMddf.freecount                    = BigEndianBitConverter.ToUInt32(sector, 0xBA);
-                infoMddf.unknown17                    = BigEndianBitConverter.ToUInt16(sector, 0xBE);
-                infoMddf.unknown18                    = BigEndianBitConverter.ToUInt32(sector, 0xC0);
-                infoMddf.overmount_stamp              = BigEndianBitConverter.ToUInt64(sector, 0xC4);
-                infoMddf.serialization                = BigEndianBitConverter.ToUInt32(sector, 0xCC);
-                infoMddf.unknown19                    = BigEndianBitConverter.ToUInt32(sector, 0xD0);
-                infoMddf.unknown_timestamp            = BigEndianBitConverter.ToUInt32(sector, 0xD4);
-                infoMddf.unknown20                    = BigEndianBitConverter.ToUInt32(sector, 0xD8);
-                infoMddf.unknown21                    = BigEndianBitConverter.ToUInt32(sector, 0xDC);
-                infoMddf.unknown22                    = BigEndianBitConverter.ToUInt32(sector, 0xE0);
-                infoMddf.unknown23                    = BigEndianBitConverter.ToUInt32(sector, 0xE4);
-                infoMddf.unknown24                    = BigEndianBitConverter.ToUInt32(sector, 0xE8);
-                infoMddf.unknown25                    = BigEndianBitConverter.ToUInt32(sector, 0xEC);
-                infoMddf.unknown26                    = BigEndianBitConverter.ToUInt32(sector, 0xF0);
-                infoMddf.unknown27                    = BigEndianBitConverter.ToUInt32(sector, 0xF4);
-                infoMddf.unknown28                    = BigEndianBitConverter.ToUInt32(sector, 0xF8);
-                infoMddf.unknown29                    = BigEndianBitConverter.ToUInt32(sector, 0xFC);
-                infoMddf.unknown30                    = BigEndianBitConverter.ToUInt32(sector, 0x100);
-                infoMddf.unknown31                    = BigEndianBitConverter.ToUInt32(sector, 0x104);
-                infoMddf.unknown32                    = BigEndianBitConverter.ToUInt32(sector, 0x108);
-                infoMddf.unknown33                    = BigEndianBitConverter.ToUInt32(sector, 0x10C);
-                infoMddf.unknown34                    = BigEndianBitConverter.ToUInt32(sector, 0x110);
-                infoMddf.unknown35                    = BigEndianBitConverter.ToUInt32(sector, 0x114);
-                infoMddf.backup_volid                 = BigEndianBitConverter.ToUInt64(sector, 0x118);
-                infoMddf.label_size                   = BigEndianBitConverter.ToUInt16(sector, 0x120);
-                infoMddf.fs_overhead                  = BigEndianBitConverter.ToUInt16(sector, 0x122);
-                infoMddf.result_scavenge              = BigEndianBitConverter.ToUInt16(sector, 0x124);
-                infoMddf.boot_code                    = BigEndianBitConverter.ToUInt16(sector, 0x126);
-                infoMddf.boot_environ                 = BigEndianBitConverter.ToUInt16(sector, 0x6C);
-                infoMddf.unknown36                    = BigEndianBitConverter.ToUInt32(sector, 0x12A);
-                infoMddf.unknown37                    = BigEndianBitConverter.ToUInt32(sector, 0x12E);
-                infoMddf.unknown38                    = BigEndianBitConverter.ToUInt32(sector, 0x132);
-                infoMddf.vol_sequence                 = BigEndianBitConverter.ToUInt16(sector, 0x136);
-                infoMddf.vol_left_mounted             = sector[0x138];
-
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown1 = 0x{0:X2} ({0})", infoMddf.unknown1);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown2 = 0x{0:X2} ({0})", infoMddf.unknown2);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown3 = 0x{0:X8} ({0})", infoMddf.unknown3);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown4 = 0x{0:X4} ({0})", infoMddf.unknown4);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown5 = 0x{0:X8} ({0})", infoMddf.unknown5);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown6 = 0x{0:X8} ({0})", infoMddf.unknown6);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown7 = 0x{0:X8} ({0})", infoMddf.unknown7);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown9 = 0x{0:X4} ({0})", infoMddf.unknown9);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown10 = 0x{0:X8} ({0})", infoMddf.unknown10);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown11 = 0x{0:X8} ({0})", infoMddf.unknown11);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown12 = 0x{0:X8} ({0})", infoMddf.unknown12);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown13 = 0x{0:X8} ({0})", infoMddf.unknown13);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown14 = 0x{0:X8} ({0})", infoMddf.unknown14);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown15 = 0x{0:X8} ({0})", infoMddf.unknown15);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown16 = 0x{0:X8} ({0})", infoMddf.unknown16);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown17 = 0x{0:X4} ({0})", infoMddf.unknown17);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown18 = 0x{0:X8} ({0})", infoMddf.unknown18);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown19 = 0x{0:X8} ({0})", infoMddf.unknown19);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown20 = 0x{0:X8} ({0})", infoMddf.unknown20);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown21 = 0x{0:X8} ({0})", infoMddf.unknown21);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown22 = 0x{0:X8} ({0})", infoMddf.unknown22);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown23 = 0x{0:X8} ({0})", infoMddf.unknown23);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown24 = 0x{0:X8} ({0})", infoMddf.unknown24);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown25 = 0x{0:X8} ({0})", infoMddf.unknown25);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown26 = 0x{0:X8} ({0})", infoMddf.unknown26);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown27 = 0x{0:X8} ({0})", infoMddf.unknown27);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown28 = 0x{0:X8} ({0})", infoMddf.unknown28);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown29 = 0x{0:X8} ({0})", infoMddf.unknown29);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown30 = 0x{0:X8} ({0})", infoMddf.unknown30);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown31 = 0x{0:X8} ({0})", infoMddf.unknown31);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown32 = 0x{0:X8} ({0})", infoMddf.unknown32);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown33 = 0x{0:X8} ({0})", infoMddf.unknown33);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown34 = 0x{0:X8} ({0})", infoMddf.unknown34);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown35 = 0x{0:X8} ({0})", infoMddf.unknown35);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown36 = 0x{0:X8} ({0})", infoMddf.unknown36);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown37 = 0x{0:X8} ({0})", infoMddf.unknown37);
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown38 = 0x{0:X8} ({0})", infoMddf.unknown38);
-
-                AaruConsole.DebugWriteLine("LisaFS plugin", "mddf.unknown_timestamp = 0x{0:X8} ({0}, {1})",
-                                           infoMddf.unknown_timestamp,
-                                           DateHandlers.LisaToDateTime(infoMddf.unknown_timestamp));
-
-                if(infoMddf.mddf_block != i - beforeMddf)
-                    return;
-
-                if(infoMddf.vol_size > imagePlugin.Info.Sectors)
-                    return;
-
-                if(infoMddf.vol_size - 1 != infoMddf.volsize_minus_one)
-                    return;
-
-                if(infoMddf.vol_size - i - 1 != infoMddf.volsize_minus_mddf_minus_one - beforeMddf)
-                    return;
-
-                if(infoMddf.datasize > infoMddf.blocksize)
-                    return;
-
-                if(infoMddf.blocksize < imagePlugin.Info.SectorSize)
-                    return;
-
-                if(infoMddf.datasize != imagePlugin.Info.SectorSize)
-                    return;
-
-                switch(infoMddf.fsversion)
-                {
-                    case LISA_V1:
-                        sb.AppendLine("LisaFS v1");
-
-                        break;
-                    case LISA_V2:
-                        sb.AppendLine("LisaFS v2");
-
-                        break;
-                    case LISA_V3:
-                        sb.AppendLine("LisaFS v3");
-
-                        break;
-                    default:
-                        sb.AppendFormat("Unknown LisaFS version {0}", infoMddf.fsversion).AppendLine();
-
-                        break;
-                }
-
-                sb.AppendFormat("Volume name: \"{0}\"", infoMddf.volname).AppendLine();
-                sb.AppendFormat("Volume password: \"{0}\"", infoMddf.password).AppendLine();
-                sb.AppendFormat("Volume ID: 0x{0:X16}", infoMddf.volid).AppendLine();
-                sb.AppendFormat("Backup volume ID: 0x{0:X16}", infoMddf.backup_volid).AppendLine();
-
-                sb.AppendFormat("Master copy ID: 0x{0:X8}", infoMddf.master_copy_id).AppendLine();
-
-                sb.AppendFormat("Volume is number {0} of {1}", infoMddf.volnum, infoMddf.vol_sequence).AppendLine();
-
-                sb.AppendFormat("Serial number of Lisa computer that created this volume: {0}", infoMddf.machine_id).
-                   AppendLine();
-
-                sb.AppendFormat("Serial number of Lisa computer that can use this volume's software {0}",
-                                infoMddf.serialization).AppendLine();
-
-                sb.AppendFormat("Volume created on {0}", infoMddf.dtvc).AppendLine();
-                sb.AppendFormat("Some timestamp, says {0}", infoMddf.dtcc).AppendLine();
-                sb.AppendFormat("Volume backed up on {0}", infoMddf.dtvb).AppendLine();
-                sb.AppendFormat("Volume scavenged on {0}", infoMddf.dtvs).AppendLine();
-                sb.AppendFormat("MDDF is in block {0}", infoMddf.mddf_block + beforeMddf).AppendLine();
-                sb.AppendFormat("There are {0} reserved blocks before volume", beforeMddf).AppendLine();
-                sb.AppendFormat("{0} blocks minus one", infoMddf.volsize_minus_one).AppendLine();
-
-                sb.AppendFormat("{0} blocks minus one minus MDDF offset", infoMddf.volsize_minus_mddf_minus_one).
-                   AppendLine();
-
-                sb.AppendFormat("{0} blocks in volume", infoMddf.vol_size).AppendLine();
-                sb.AppendFormat("{0} bytes per sector (uncooked)", infoMddf.blocksize).AppendLine();
-                sb.AppendFormat("{0} bytes per sector", infoMddf.datasize).AppendLine();
-                sb.AppendFormat("{0} blocks per cluster", infoMddf.clustersize).AppendLine();
-                sb.AppendFormat("{0} blocks in filesystem", infoMddf.fs_size).AppendLine();
-                sb.AppendFormat("{0} files in volume", infoMddf.filecount).AppendLine();
-                sb.AppendFormat("{0} blocks free", infoMddf.freecount).AppendLine();
-                sb.AppendFormat("{0} bytes in LisaInfo", infoMddf.label_size).AppendLine();
-                sb.AppendFormat("Filesystem overhead: {0}", infoMddf.fs_overhead).AppendLine();
-                sb.AppendFormat("Scavenger result code: 0x{0:X8}", infoMddf.result_scavenge).AppendLine();
-                sb.AppendFormat("Boot code: 0x{0:X8}", infoMddf.boot_code).AppendLine();
-                sb.AppendFormat("Boot environment:  0x{0:X8}", infoMddf.boot_environ).AppendLine();
-                sb.AppendFormat("Overmount stamp: 0x{0:X16}", infoMddf.overmount_stamp).AppendLine();
-
-                sb.AppendFormat("S-Records start at {0} and spans for {1} blocks",
-                                infoMddf.srec_ptr + infoMddf.mddf_block + beforeMddf, infoMddf.srec_len).AppendLine();
-
-                sb.AppendLine(infoMddf.vol_left_mounted == 0 ? "Volume is clean" : "Volume is dirty");
-
-                information = sb.ToString();
-
-                XmlFsType = new FileSystemType();
-
-                if(DateTime.Compare(infoMddf.dtvb, DateHandlers.LisaToDateTime(0)) > 0)
-                {
-                    XmlFsType.BackupDate          = infoMddf.dtvb;
-                    XmlFsType.BackupDateSpecified = true;
-                }
-
-                XmlFsType.Clusters    = infoMddf.vol_size;
-                XmlFsType.ClusterSize = (uint)(infoMddf.clustersize * infoMddf.datasize);
-
-                if(DateTime.Compare(infoMddf.dtvc, DateHandlers.LisaToDateTime(0)) > 0)
-                {
-                    XmlFsType.CreationDate          = infoMddf.dtvc;
-                    XmlFsType.CreationDateSpecified = true;
-                }
-
-                XmlFsType.Dirty                 = infoMddf.vol_left_mounted != 0;
-                XmlFsType.Files                 = infoMddf.filecount;
-                XmlFsType.FilesSpecified        = true;
-                XmlFsType.FreeClusters          = infoMddf.freecount;
-                XmlFsType.FreeClustersSpecified = true;
-                XmlFsType.Type                  = "LisaFS";
-                XmlFsType.VolumeName            = infoMddf.volname;
-                XmlFsType.VolumeSerial          = $"{infoMddf.volid:X16}";
-
-                return;
+                    break;
             }
+
+            sb.AppendFormat("Volume name: \"{0}\"", infoMddf.volname).AppendLine();
+            sb.AppendFormat("Volume password: \"{0}\"", infoMddf.password).AppendLine();
+            sb.AppendFormat("Volume ID: 0x{0:X16}", infoMddf.volid).AppendLine();
+            sb.AppendFormat("Backup volume ID: 0x{0:X16}", infoMddf.backup_volid).AppendLine();
+
+            sb.AppendFormat("Master copy ID: 0x{0:X8}", infoMddf.master_copy_id).AppendLine();
+
+            sb.AppendFormat("Volume is number {0} of {1}", infoMddf.volnum, infoMddf.vol_sequence).AppendLine();
+
+            sb.AppendFormat("Serial number of Lisa computer that created this volume: {0}", infoMddf.machine_id).
+               AppendLine();
+
+            sb.AppendFormat("Serial number of Lisa computer that can use this volume's software {0}",
+                            infoMddf.serialization).AppendLine();
+
+            sb.AppendFormat("Volume created on {0}", infoMddf.dtvc).AppendLine();
+            sb.AppendFormat("Some timestamp, says {0}", infoMddf.dtcc).AppendLine();
+            sb.AppendFormat("Volume backed up on {0}", infoMddf.dtvb).AppendLine();
+            sb.AppendFormat("Volume scavenged on {0}", infoMddf.dtvs).AppendLine();
+            sb.AppendFormat("MDDF is in block {0}", infoMddf.mddf_block + beforeMddf).AppendLine();
+            sb.AppendFormat("There are {0} reserved blocks before volume", beforeMddf).AppendLine();
+            sb.AppendFormat("{0} blocks minus one", infoMddf.volsize_minus_one).AppendLine();
+
+            sb.AppendFormat("{0} blocks minus one minus MDDF offset", infoMddf.volsize_minus_mddf_minus_one).
+               AppendLine();
+
+            sb.AppendFormat("{0} blocks in volume", infoMddf.vol_size).AppendLine();
+            sb.AppendFormat("{0} bytes per sector (uncooked)", infoMddf.blocksize).AppendLine();
+            sb.AppendFormat("{0} bytes per sector", infoMddf.datasize).AppendLine();
+            sb.AppendFormat("{0} blocks per cluster", infoMddf.clustersize).AppendLine();
+            sb.AppendFormat("{0} blocks in filesystem", infoMddf.fs_size).AppendLine();
+            sb.AppendFormat("{0} files in volume", infoMddf.filecount).AppendLine();
+            sb.AppendFormat("{0} blocks free", infoMddf.freecount).AppendLine();
+            sb.AppendFormat("{0} bytes in LisaInfo", infoMddf.label_size).AppendLine();
+            sb.AppendFormat("Filesystem overhead: {0}", infoMddf.fs_overhead).AppendLine();
+            sb.AppendFormat("Scavenger result code: 0x{0:X8}", infoMddf.result_scavenge).AppendLine();
+            sb.AppendFormat("Boot code: 0x{0:X8}", infoMddf.boot_code).AppendLine();
+            sb.AppendFormat("Boot environment:  0x{0:X8}", infoMddf.boot_environ).AppendLine();
+            sb.AppendFormat("Overmount stamp: 0x{0:X16}", infoMddf.overmount_stamp).AppendLine();
+
+            sb.AppendFormat("S-Records start at {0} and spans for {1} blocks",
+                            infoMddf.srec_ptr + infoMddf.mddf_block + beforeMddf, infoMddf.srec_len).AppendLine();
+
+            sb.AppendLine(infoMddf.vol_left_mounted == 0 ? "Volume is clean" : "Volume is dirty");
+
+            information = sb.ToString();
+
+            XmlFsType = new FileSystemType();
+
+            if(DateTime.Compare(infoMddf.dtvb, DateHandlers.LisaToDateTime(0)) > 0)
+            {
+                XmlFsType.BackupDate          = infoMddf.dtvb;
+                XmlFsType.BackupDateSpecified = true;
+            }
+
+            XmlFsType.Clusters    = infoMddf.vol_size;
+            XmlFsType.ClusterSize = (uint)(infoMddf.clustersize * infoMddf.datasize);
+
+            if(DateTime.Compare(infoMddf.dtvc, DateHandlers.LisaToDateTime(0)) > 0)
+            {
+                XmlFsType.CreationDate          = infoMddf.dtvc;
+                XmlFsType.CreationDateSpecified = true;
+            }
+
+            XmlFsType.Dirty                 = infoMddf.vol_left_mounted != 0;
+            XmlFsType.Files                 = infoMddf.filecount;
+            XmlFsType.FilesSpecified        = true;
+            XmlFsType.FreeClusters          = infoMddf.freecount;
+            XmlFsType.FreeClustersSpecified = true;
+            XmlFsType.Type                  = "LisaFS";
+            XmlFsType.VolumeName            = infoMddf.volname;
+            XmlFsType.VolumeSerial          = $"{infoMddf.volid:X16}";
+
+            return;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/LisaFS/LisaFS.cs b/Aaru.Filesystems/LisaFS/LisaFS.cs
index 5d293343b..b72d22b83 100644
--- a/Aaru.Filesystems/LisaFS/LisaFS.cs
+++ b/Aaru.Filesystems/LisaFS/LisaFS.cs
@@ -36,72 +36,71 @@ using System.Text;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Filesystems.LisaFS
+namespace Aaru.Filesystems.LisaFS;
+
+// All information by Natalia Portillo
+// Variable names from Lisa API
+/// <inheritdoc />
+/// <summary>Implements the Apple Lisa File System</summary>
+public sealed partial class LisaFS : IReadOnlyFilesystem
 {
-    // All information by Natalia Portillo
-    // Variable names from Lisa API
+    bool        _debug;
+    IMediaImage _device;
+    int         _devTagSize;
+    MDDF        _mddf;
+    bool        _mounted;
+    SRecord[]   _srecords;
+    ulong       _volumePrefix;
+
     /// <inheritdoc />
-    /// <summary>Implements the Apple Lisa File System</summary>
-    public sealed partial class LisaFS : IReadOnlyFilesystem
+    public string Name => "Apple Lisa File System";
+    /// <inheritdoc />
+    public Guid Id => new("7E6034D1-D823-4248-A54D-239742B28391");
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    // TODO: Implement Lisa 7/7 namespace (needs decoding {!CATALOG} file)
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
+        new (string name, Type type, string description)[]
+            {};
+
+    /// <inheritdoc />
+    public Dictionary<string, string> Namespaces => new()
     {
-        bool        _debug;
-        IMediaImage _device;
-        int         _devTagSize;
-        MDDF        _mddf;
-        bool        _mounted;
-        SRecord[]   _srecords;
-        ulong       _volumePrefix;
-
-        /// <inheritdoc />
-        public string Name => "Apple Lisa File System";
-        /// <inheritdoc />
-        public Guid Id => new("7E6034D1-D823-4248-A54D-239742B28391");
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        // TODO: Implement Lisa 7/7 namespace (needs decoding {!CATALOG} file)
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[]
-                {};
-
-        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => new()
         {
-            {
-                "workshop", "Filenames as shown by the Lisa Pascal Workshop (default)"
-            },
-            {
-                "office", "Filenames as shown by the Lisa Office System (not yet implemented)"
-            }
-        };
-
-        static Dictionary<string, string> GetDefaultOptions() => new()
+            "workshop", "Filenames as shown by the Lisa Pascal Workshop (default)"
+        },
         {
-            {
-                "debug", false.ToString()
-            }
-        };
+            "office", "Filenames as shown by the Lisa Office System (not yet implemented)"
+        }
+    };
 
-        #region Caches
-        /// <summary>Caches Extents Files</summary>
-        Dictionary<short, ExtentFile> _extentCache;
-        /// <summary>Caches system files</summary>
-        Dictionary<short, byte[]> _systemFileCache;
-        /// <summary>Caches user files files</summary>
-        Dictionary<short, byte[]> _fileCache;
-        /// <summary>Caches catalogs</summary>
-        List<CatalogEntry> _catalogCache;
-        /// <summary>Caches file size</summary>
-        Dictionary<short, int> _fileSizeCache;
-        /// <summary>Lists Extents Files already printed in debug mode to not repeat them</summary>
-        List<short> _printedExtents;
-        /// <summary>Caches the creation times for subdirectories as to not have to traverse the Catalog File on each stat</summary>
-        Dictionary<short, DateTime> _directoryDtcCache;
-        #endregion Caches
-    }
+    static Dictionary<string, string> GetDefaultOptions() => new()
+    {
+        {
+            "debug", false.ToString()
+        }
+    };
+
+    #region Caches
+    /// <summary>Caches Extents Files</summary>
+    Dictionary<short, ExtentFile> _extentCache;
+    /// <summary>Caches system files</summary>
+    Dictionary<short, byte[]> _systemFileCache;
+    /// <summary>Caches user files files</summary>
+    Dictionary<short, byte[]> _fileCache;
+    /// <summary>Caches catalogs</summary>
+    List<CatalogEntry> _catalogCache;
+    /// <summary>Caches file size</summary>
+    Dictionary<short, int> _fileSizeCache;
+    /// <summary>Lists Extents Files already printed in debug mode to not repeat them</summary>
+    List<short> _printedExtents;
+    /// <summary>Caches the creation times for subdirectories as to not have to traverse the Catalog File on each stat</summary>
+    Dictionary<short, DateTime> _directoryDtcCache;
+    #endregion Caches
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/LisaFS/Structs.cs b/Aaru.Filesystems/LisaFS/Structs.cs
index da1ee428b..a167d4ddc 100644
--- a/Aaru.Filesystems/LisaFS/Structs.cs
+++ b/Aaru.Filesystems/LisaFS/Structs.cs
@@ -35,369 +35,368 @@ using System.Diagnostics.CodeAnalysis;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.Filesystems.LisaFS
+namespace Aaru.Filesystems.LisaFS;
+
+public sealed partial class LisaFS
 {
-    public sealed partial class LisaFS
+    /// <summary>
+    ///     The MDDF is the most import block on a Lisa FS volume. It describes the volume and its contents. On
+    ///     initialization the memory where it resides is not emptied so it tends to contain a lot of garbage. This has
+    ///     difficulted its reverse engineering.
+    /// </summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct MDDF
     {
+        /// <summary>0x00, Filesystem version</summary>
+        public ushort fsversion;
+        /// <summary>0x02, Volume ID</summary>
+        public ulong volid;
+        /// <summary>0x0A, Volume sequence number</summary>
+        public ushort volnum;
+        /// <summary>0x0C, Pascal string, 32+1 bytes, volume name</summary>
+        public string volname;
+        /// <summary>0x2D, unknown, possible padding</summary>
+        public byte unknown1;
+        /// <summary>0x2E, Pascal string, 32+1 bytes, password</summary>
+        public string password;
+        /// <summary>0x4F, unknown, possible padding</summary>
+        public byte unknown2;
+        /// <summary>0x50, Lisa serial number that init'ed this disk</summary>
+        public uint machine_id;
+        /// <summary>0x54, ID of the master copy ? no idea really</summary>
+        public uint master_copy_id;
+        /// <summary>0x58, Date of volume creation</summary>
+        public DateTime dtvc;
+        /// <summary>0x5C, Date...</summary>
+        public DateTime dtcc;
+        /// <summary>0x60, Date of volume backup</summary>
+        public DateTime dtvb;
+        /// <summary>0x64, Date of volume scavenging</summary>
+        public DateTime dtvs;
+        /// <summary>0x68, unknown</summary>
+        public uint unknown3;
+        /// <summary>0x6C, block the MDDF is residing on</summary>
+        public uint mddf_block;
+        /// <summary>0x70, volsize-1</summary>
+        public uint volsize_minus_one;
+        /// <summary>0x74, volsize-1-mddf_block</summary>
+        public uint volsize_minus_mddf_minus_one;
+        /// <summary>0x78, Volume size in blocks</summary>
+        public uint vol_size;
+        /// <summary>0x7C, Blocks size of underlying drive (data+tags)</summary>
+        public ushort blocksize;
+        /// <summary>0x7E, Data only block size</summary>
+        public ushort datasize;
+        /// <summary>0x80, unknown</summary>
+        public ushort unknown4;
+        /// <summary>0x82, unknown</summary>
+        public uint unknown5;
+        /// <summary>0x86, unknown</summary>
+        public uint unknown6;
+        /// <summary>0x8A, Size in sectors of filesystem clusters</summary>
+        public ushort clustersize;
+        /// <summary>0x8C, Filesystem size in blocks</summary>
+        public uint fs_size;
+        /// <summary>0x90, unknown</summary>
+        public uint unknown7;
+        /// <summary>0x94, Pointer to S-Records</summary>
+        public uint srec_ptr;
+        /// <summary>0x98, unknown</summary>
+        public ushort unknown9;
+        /// <summary>0x9A, S-Records length</summary>
+        public ushort srec_len;
+        /// <summary>0x9C, unknown</summary>
+        public uint unknown10;
+        /// <summary>0xA0, unknown</summary>
+        public uint unknown11;
+        /// <summary>0xA4, unknown</summary>
+        public uint unknown12;
+        /// <summary>0xA8, unknown</summary>
+        public uint unknown13;
+        /// <summary>0xAC, unknown</summary>
+        public uint unknown14;
+        /// <summary>0xB0, Files in volume</summary>
+        public ushort filecount;
+        /// <summary>0xB2, unknown</summary>
+        public uint unknown15;
+        /// <summary>0xB6, unknown</summary>
+        public uint unknown16;
+        /// <summary>0xBA, Free blocks</summary>
+        public uint freecount;
+        /// <summary>0xBE, unknown</summary>
+        public ushort unknown17;
+        /// <summary>0xC0, unknown</summary>
+        public uint unknown18;
+        /// <summary>0xC4, no idea</summary>
+        public ulong overmount_stamp;
+        /// <summary>0xCC, serialization, lisa serial number authorized to use blocked software on this volume</summary>
+        public uint serialization;
+        /// <summary>0xD0, unknown</summary>
+        public uint unknown19;
+        /// <summary>0xD4, unknown, possible timestamp</summary>
+        public uint unknown_timestamp;
+        /// <summary>0xD8, unknown</summary>
+        public uint unknown20;
+        /// <summary>0xDC, unknown</summary>
+        public uint unknown21;
+        /// <summary>0xE0, unknown</summary>
+        public uint unknown22;
+        /// <summary>0xE4, unknown</summary>
+        public uint unknown23;
+        /// <summary>0xE8, unknown</summary>
+        public uint unknown24;
+        /// <summary>0xEC, unknown</summary>
+        public uint unknown25;
+        /// <summary>0xF0, unknown</summary>
+        public uint unknown26;
+        /// <summary>0xF4, unknown</summary>
+        public uint unknown27;
+        /// <summary>0xF8, unknown</summary>
+        public uint unknown28;
+        /// <summary>0xFC, unknown</summary>
+        public uint unknown29;
+        /// <summary>0x100, unknown</summary>
+        public uint unknown30;
+        /// <summary>0x104, unknown</summary>
+        public uint unknown31;
+        /// <summary>0x108, unknown</summary>
+        public uint unknown32;
+        /// <summary>0x10C, unknown</summary>
+        public uint unknown33;
+        /// <summary>0x110, unknown</summary>
+        public uint unknown34;
+        /// <summary>0x114, unknown</summary>
+        public uint unknown35;
+        /// <summary>0x118, ID of volume where this volume was backed up</summary>
+        public ulong backup_volid;
+        /// <summary>0x120, Size of LisaInfo label</summary>
+        public ushort label_size;
+        /// <summary>0x122, not clear</summary>
+        public ushort fs_overhead;
+        /// <summary>0x124, Return code of Scavenger</summary>
+        public ushort result_scavenge;
+        /// <summary>0x126, No idea</summary>
+        public ushort boot_code;
+        /// <summary>0x128, No idea</summary>
+        public ushort boot_environ;
+        /// <summary>0x12A, unknown</summary>
+        public uint unknown36;
+        /// <summary>0x12E, unknown</summary>
+        public uint unknown37;
+        /// <summary>0x132, unknown</summary>
+        public uint unknown38;
+        /// <summary>0x136, Total volumes in sequence</summary>
+        public ushort vol_sequence;
+        /// <summary>0x138, Volume is dirty?</summary>
+        public byte vol_left_mounted;
+        /// <summary>Is password present? (On-disk position unknown)</summary>
+        public byte passwd_present;
+        /// <summary>Opened files (memory-only?) (On-disk position unknown)</summary>
+        public uint opencount;
+        /// <summary>No idea (On-disk position unknown)</summary>
+        public uint copy_thread;
+
+        // Flags are boolean, but Pascal seems to use them as full unsigned 8 bit values
+        /// <summary>No idea (On-disk position unknown)</summary>
+        public byte privileged;
+        /// <summary>Read-only volume (On-disk position unknown)</summary>
+        public byte write_protected;
+        /// <summary>Master disk (On-disk position unknown)</summary>
+        public byte master;
+        /// <summary>Copy disk (On-disk position unknown)</summary>
+        public byte copy;
+        /// <summary>No idea (On-disk position unknown)</summary>
+        public byte copy_flag;
+        /// <summary>No idea (On-disk position unknown)</summary>
+        public byte scavenge_flag;
+    }
+
+    /// <summary>
+    ///     An entry in the catalog from V3. The first entry is bigger than the rest, may be a header, I have not needed
+    ///     any of its values so I just ignored it. Each catalog is divided in 4-sector blocks, and if it needs more than a
+    ///     block there are previous and next block pointers, effectively making the V3 catalog a double-linked list. Garbage
+    ///     is not zeroed.
+    /// </summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct CatalogEntry
+    {
+        /// <summary>0x00, seems to be 0x24 when the entry is valid</summary>
+        public byte marker;
+        /// <summary>0x01, parent directory ID for this file, 0 for root directory</summary>
+        public ushort parentID;
+        /// <summary>0x03, filename, 32-bytes, null-padded</summary>
+        public byte[] filename;
+        /// <summary>0x23, null-termination</summary>
+        public byte terminator;
         /// <summary>
-        ///     The MDDF is the most import block on a Lisa FS volume. It describes the volume and its contents. On
-        ///     initialization the memory where it resides is not emptied so it tends to contain a lot of garbage. This has
-        ///     difficulted its reverse engineering.
+        ///     At 0x24 0x01 here for subdirectories, entries 48 bytes long 0x03 here for entries 64 bytes long 0x08 here for
+        ///     entries 78 bytes long This is incomplete, may fail, mostly works...
         /// </summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct MDDF
-        {
-            /// <summary>0x00, Filesystem version</summary>
-            public ushort fsversion;
-            /// <summary>0x02, Volume ID</summary>
-            public ulong volid;
-            /// <summary>0x0A, Volume sequence number</summary>
-            public ushort volnum;
-            /// <summary>0x0C, Pascal string, 32+1 bytes, volume name</summary>
-            public string volname;
-            /// <summary>0x2D, unknown, possible padding</summary>
-            public byte unknown1;
-            /// <summary>0x2E, Pascal string, 32+1 bytes, password</summary>
-            public string password;
-            /// <summary>0x4F, unknown, possible padding</summary>
-            public byte unknown2;
-            /// <summary>0x50, Lisa serial number that init'ed this disk</summary>
-            public uint machine_id;
-            /// <summary>0x54, ID of the master copy ? no idea really</summary>
-            public uint master_copy_id;
-            /// <summary>0x58, Date of volume creation</summary>
-            public DateTime dtvc;
-            /// <summary>0x5C, Date...</summary>
-            public DateTime dtcc;
-            /// <summary>0x60, Date of volume backup</summary>
-            public DateTime dtvb;
-            /// <summary>0x64, Date of volume scavenging</summary>
-            public DateTime dtvs;
-            /// <summary>0x68, unknown</summary>
-            public uint unknown3;
-            /// <summary>0x6C, block the MDDF is residing on</summary>
-            public uint mddf_block;
-            /// <summary>0x70, volsize-1</summary>
-            public uint volsize_minus_one;
-            /// <summary>0x74, volsize-1-mddf_block</summary>
-            public uint volsize_minus_mddf_minus_one;
-            /// <summary>0x78, Volume size in blocks</summary>
-            public uint vol_size;
-            /// <summary>0x7C, Blocks size of underlying drive (data+tags)</summary>
-            public ushort blocksize;
-            /// <summary>0x7E, Data only block size</summary>
-            public ushort datasize;
-            /// <summary>0x80, unknown</summary>
-            public ushort unknown4;
-            /// <summary>0x82, unknown</summary>
-            public uint unknown5;
-            /// <summary>0x86, unknown</summary>
-            public uint unknown6;
-            /// <summary>0x8A, Size in sectors of filesystem clusters</summary>
-            public ushort clustersize;
-            /// <summary>0x8C, Filesystem size in blocks</summary>
-            public uint fs_size;
-            /// <summary>0x90, unknown</summary>
-            public uint unknown7;
-            /// <summary>0x94, Pointer to S-Records</summary>
-            public uint srec_ptr;
-            /// <summary>0x98, unknown</summary>
-            public ushort unknown9;
-            /// <summary>0x9A, S-Records length</summary>
-            public ushort srec_len;
-            /// <summary>0x9C, unknown</summary>
-            public uint unknown10;
-            /// <summary>0xA0, unknown</summary>
-            public uint unknown11;
-            /// <summary>0xA4, unknown</summary>
-            public uint unknown12;
-            /// <summary>0xA8, unknown</summary>
-            public uint unknown13;
-            /// <summary>0xAC, unknown</summary>
-            public uint unknown14;
-            /// <summary>0xB0, Files in volume</summary>
-            public ushort filecount;
-            /// <summary>0xB2, unknown</summary>
-            public uint unknown15;
-            /// <summary>0xB6, unknown</summary>
-            public uint unknown16;
-            /// <summary>0xBA, Free blocks</summary>
-            public uint freecount;
-            /// <summary>0xBE, unknown</summary>
-            public ushort unknown17;
-            /// <summary>0xC0, unknown</summary>
-            public uint unknown18;
-            /// <summary>0xC4, no idea</summary>
-            public ulong overmount_stamp;
-            /// <summary>0xCC, serialization, lisa serial number authorized to use blocked software on this volume</summary>
-            public uint serialization;
-            /// <summary>0xD0, unknown</summary>
-            public uint unknown19;
-            /// <summary>0xD4, unknown, possible timestamp</summary>
-            public uint unknown_timestamp;
-            /// <summary>0xD8, unknown</summary>
-            public uint unknown20;
-            /// <summary>0xDC, unknown</summary>
-            public uint unknown21;
-            /// <summary>0xE0, unknown</summary>
-            public uint unknown22;
-            /// <summary>0xE4, unknown</summary>
-            public uint unknown23;
-            /// <summary>0xE8, unknown</summary>
-            public uint unknown24;
-            /// <summary>0xEC, unknown</summary>
-            public uint unknown25;
-            /// <summary>0xF0, unknown</summary>
-            public uint unknown26;
-            /// <summary>0xF4, unknown</summary>
-            public uint unknown27;
-            /// <summary>0xF8, unknown</summary>
-            public uint unknown28;
-            /// <summary>0xFC, unknown</summary>
-            public uint unknown29;
-            /// <summary>0x100, unknown</summary>
-            public uint unknown30;
-            /// <summary>0x104, unknown</summary>
-            public uint unknown31;
-            /// <summary>0x108, unknown</summary>
-            public uint unknown32;
-            /// <summary>0x10C, unknown</summary>
-            public uint unknown33;
-            /// <summary>0x110, unknown</summary>
-            public uint unknown34;
-            /// <summary>0x114, unknown</summary>
-            public uint unknown35;
-            /// <summary>0x118, ID of volume where this volume was backed up</summary>
-            public ulong backup_volid;
-            /// <summary>0x120, Size of LisaInfo label</summary>
-            public ushort label_size;
-            /// <summary>0x122, not clear</summary>
-            public ushort fs_overhead;
-            /// <summary>0x124, Return code of Scavenger</summary>
-            public ushort result_scavenge;
-            /// <summary>0x126, No idea</summary>
-            public ushort boot_code;
-            /// <summary>0x128, No idea</summary>
-            public ushort boot_environ;
-            /// <summary>0x12A, unknown</summary>
-            public uint unknown36;
-            /// <summary>0x12E, unknown</summary>
-            public uint unknown37;
-            /// <summary>0x132, unknown</summary>
-            public uint unknown38;
-            /// <summary>0x136, Total volumes in sequence</summary>
-            public ushort vol_sequence;
-            /// <summary>0x138, Volume is dirty?</summary>
-            public byte vol_left_mounted;
-            /// <summary>Is password present? (On-disk position unknown)</summary>
-            public byte passwd_present;
-            /// <summary>Opened files (memory-only?) (On-disk position unknown)</summary>
-            public uint opencount;
-            /// <summary>No idea (On-disk position unknown)</summary>
-            public uint copy_thread;
+        public byte fileType;
+        /// <summary>0x25, lot of values found here, unknown</summary>
+        public byte unknown;
+        /// <summary>0x26, file ID, must be positive and bigger than 4</summary>
+        public short fileID;
+        /// <summary>0x28, creation date</summary>
+        public uint dtc;
+        /// <summary>0x2C, last modification date</summary>
+        public uint dtm;
+        /// <summary>0x30, file length in bytes</summary>
+        public int length;
+        /// <summary>0x34, file length in bytes, including wasted block space</summary>
+        public int wasted;
+        /// <summary>0x38, unknown</summary>
+        public byte[] tail;
+    }
 
-            // Flags are boolean, but Pascal seems to use them as full unsigned 8 bit values
-            /// <summary>No idea (On-disk position unknown)</summary>
-            public byte privileged;
-            /// <summary>Read-only volume (On-disk position unknown)</summary>
-            public byte write_protected;
-            /// <summary>Master disk (On-disk position unknown)</summary>
-            public byte master;
-            /// <summary>Copy disk (On-disk position unknown)</summary>
-            public byte copy;
-            /// <summary>No idea (On-disk position unknown)</summary>
-            public byte copy_flag;
-            /// <summary>No idea (On-disk position unknown)</summary>
-            public byte scavenge_flag;
-        }
+    /// <summary>An extent indicating a start and a run of sectors.</summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct Extent
+    {
+        public int   start;
+        public short length;
+    }
 
+    /// <summary>
+    ///     The Extents File. There is one Extents File per each file stored on disk. The file ID present on the sectors
+    ///     tags for the Extents File is the negated value of the file ID it represents. e.g. file = 5 (0x0005) extents = -5
+    ///     (0xFFFB) It spans a single sector on V2 and V3 but 2 sectors on V1. It contains all information about a file, and
+    ///     is indexed in the S-Records file. It also contains the label. Garbage is zeroed.
+    /// </summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct ExtentFile
+    {
+        /// <summary>0x00, filename length</summary>
+        public byte filenameLen;
+        /// <summary>0x01, filename</summary>
+        public byte[] filename;
+        /// <summary>0x20, unknown</summary>
+        public ushort unknown1;
+        /// <summary>0x22, 8 bytes</summary>
+        public ulong file_uid;
+        /// <summary>0x2A, unknown</summary>
+        public byte unknown2;
+        /// <summary>0x2B, entry type? gets modified</summary>
+        public byte etype;
+        /// <summary>0x2C, file type</summary>
+        public FileType ftype;
+        /// <summary>0x2D, unknown</summary>
+        public byte unknown3;
+        /// <summary>0x2E, creation time</summary>
+        public uint dtc;
+        /// <summary>0x32, last access time</summary>
+        public uint dta;
+        /// <summary>0x36, modification time</summary>
+        public uint dtm;
+        /// <summary>0x3A, backup time</summary>
+        public uint dtb;
+        /// <summary>0x3E, scavenge time</summary>
+        public uint dts;
+        /// <summary>0x42, machine serial number</summary>
+        public uint serial;
+        /// <summary>0x46, unknown</summary>
+        public byte unknown4;
+        /// <summary>0x47, locked file</summary>
+        public byte locked;
+        /// <summary>0x48, protected file</summary>
+        public byte protect;
+        /// <summary>0x49, master file</summary>
+        public byte master;
+        /// <summary>0x4A, scavenged file</summary>
+        public byte scavenged;
+        /// <summary>0x4B, file closed by os</summary>
+        public byte closed;
+        /// <summary>0x4C, file left open</summary>
+        public byte open;
+        /// <summary>0x4D, 11 bytes, unknown</summary>
+        public byte[] unknown5;
+        /// <summary>0x58, Release number</summary>
+        public ushort release;
+        /// <summary>0x5A, Build number</summary>
+        public ushort build;
+        /// <summary>0x5C, Compatibility level</summary>
+        public ushort compatibility;
+        /// <summary>0x5E, Revision level</summary>
+        public ushort revision;
+        /// <summary>0x60, unknown</summary>
+        public ushort unknown6;
+        /// <summary>0x62, 0x08 set if password is valid</summary>
+        public byte password_valid;
+        /// <summary>0x63, 8 bytes, scrambled password</summary>
+        public byte[] password;
+        /// <summary>0x6B, 3 bytes, unknown</summary>
+        public byte[] unknown7;
+        /// <summary>0x6E, filesystem overhead</summary>
+        public ushort overhead;
+        /// <summary>0x70, 16 bytes, unknown</summary>
+        public byte[] unknown8;
+        /// <summary>0x80, 0x200 in v1, file length in blocks</summary>
+        public int length;
+        /// <summary>0x84, 0x204 in v1, unknown</summary>
+        public int unknown9;
         /// <summary>
-        ///     An entry in the catalog from V3. The first entry is bigger than the rest, may be a header, I have not needed
-        ///     any of its values so I just ignored it. Each catalog is divided in 4-sector blocks, and if it needs more than a
-        ///     block there are previous and next block pointers, effectively making the V3 catalog a double-linked list. Garbage
-        ///     is not zeroed.
+        ///     0x88, 0x208 in v1, extents, can contain up to 41 extents (85 in v1), dunno LisaOS maximum (never seen more
+        ///     than 3)
         /// </summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct CatalogEntry
-        {
-            /// <summary>0x00, seems to be 0x24 when the entry is valid</summary>
-            public byte marker;
-            /// <summary>0x01, parent directory ID for this file, 0 for root directory</summary>
-            public ushort parentID;
-            /// <summary>0x03, filename, 32-bytes, null-padded</summary>
-            public byte[] filename;
-            /// <summary>0x23, null-termination</summary>
-            public byte terminator;
-            /// <summary>
-            ///     At 0x24 0x01 here for subdirectories, entries 48 bytes long 0x03 here for entries 64 bytes long 0x08 here for
-            ///     entries 78 bytes long This is incomplete, may fail, mostly works...
-            /// </summary>
-            public byte fileType;
-            /// <summary>0x25, lot of values found here, unknown</summary>
-            public byte unknown;
-            /// <summary>0x26, file ID, must be positive and bigger than 4</summary>
-            public short fileID;
-            /// <summary>0x28, creation date</summary>
-            public uint dtc;
-            /// <summary>0x2C, last modification date</summary>
-            public uint dtm;
-            /// <summary>0x30, file length in bytes</summary>
-            public int length;
-            /// <summary>0x34, file length in bytes, including wasted block space</summary>
-            public int wasted;
-            /// <summary>0x38, unknown</summary>
-            public byte[] tail;
-        }
-
-        /// <summary>An extent indicating a start and a run of sectors.</summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct Extent
-        {
-            public int   start;
-            public short length;
-        }
-
+        public Extent[] extents;
+        /// <summary>0x17E, unknown, empty, padding?</summary>
+        public short unknown10;
         /// <summary>
-        ///     The Extents File. There is one Extents File per each file stored on disk. The file ID present on the sectors
-        ///     tags for the Extents File is the negated value of the file ID it represents. e.g. file = 5 (0x0005) extents = -5
-        ///     (0xFFFB) It spans a single sector on V2 and V3 but 2 sectors on V1. It contains all information about a file, and
-        ///     is indexed in the S-Records file. It also contains the label. Garbage is zeroed.
+        ///     At 0x180, this is the label. While 1982 pre-release documentation says the label can be up to 448 bytes, v1
+        ///     onward only have space for a 128 bytes one. Any application can write whatever they want in the label, however,
+        ///     Lisa Office uses it to store its own information, something that will effectively overwrite any information a user
+        ///     application wrote there. The information written here by Lisa Office is like the information Finder writes in the
+        ///     FinderInfo structures, plus the non-unique name that is shown on the GUI. For this reason I called it LisaInfo. I
+        ///     have not tried to reverse engineer it.
         /// </summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct ExtentFile
-        {
-            /// <summary>0x00, filename length</summary>
-            public byte filenameLen;
-            /// <summary>0x01, filename</summary>
-            public byte[] filename;
-            /// <summary>0x20, unknown</summary>
-            public ushort unknown1;
-            /// <summary>0x22, 8 bytes</summary>
-            public ulong file_uid;
-            /// <summary>0x2A, unknown</summary>
-            public byte unknown2;
-            /// <summary>0x2B, entry type? gets modified</summary>
-            public byte etype;
-            /// <summary>0x2C, file type</summary>
-            public FileType ftype;
-            /// <summary>0x2D, unknown</summary>
-            public byte unknown3;
-            /// <summary>0x2E, creation time</summary>
-            public uint dtc;
-            /// <summary>0x32, last access time</summary>
-            public uint dta;
-            /// <summary>0x36, modification time</summary>
-            public uint dtm;
-            /// <summary>0x3A, backup time</summary>
-            public uint dtb;
-            /// <summary>0x3E, scavenge time</summary>
-            public uint dts;
-            /// <summary>0x42, machine serial number</summary>
-            public uint serial;
-            /// <summary>0x46, unknown</summary>
-            public byte unknown4;
-            /// <summary>0x47, locked file</summary>
-            public byte locked;
-            /// <summary>0x48, protected file</summary>
-            public byte protect;
-            /// <summary>0x49, master file</summary>
-            public byte master;
-            /// <summary>0x4A, scavenged file</summary>
-            public byte scavenged;
-            /// <summary>0x4B, file closed by os</summary>
-            public byte closed;
-            /// <summary>0x4C, file left open</summary>
-            public byte open;
-            /// <summary>0x4D, 11 bytes, unknown</summary>
-            public byte[] unknown5;
-            /// <summary>0x58, Release number</summary>
-            public ushort release;
-            /// <summary>0x5A, Build number</summary>
-            public ushort build;
-            /// <summary>0x5C, Compatibility level</summary>
-            public ushort compatibility;
-            /// <summary>0x5E, Revision level</summary>
-            public ushort revision;
-            /// <summary>0x60, unknown</summary>
-            public ushort unknown6;
-            /// <summary>0x62, 0x08 set if password is valid</summary>
-            public byte password_valid;
-            /// <summary>0x63, 8 bytes, scrambled password</summary>
-            public byte[] password;
-            /// <summary>0x6B, 3 bytes, unknown</summary>
-            public byte[] unknown7;
-            /// <summary>0x6E, filesystem overhead</summary>
-            public ushort overhead;
-            /// <summary>0x70, 16 bytes, unknown</summary>
-            public byte[] unknown8;
-            /// <summary>0x80, 0x200 in v1, file length in blocks</summary>
-            public int length;
-            /// <summary>0x84, 0x204 in v1, unknown</summary>
-            public int unknown9;
-            /// <summary>
-            ///     0x88, 0x208 in v1, extents, can contain up to 41 extents (85 in v1), dunno LisaOS maximum (never seen more
-            ///     than 3)
-            /// </summary>
-            public Extent[] extents;
-            /// <summary>0x17E, unknown, empty, padding?</summary>
-            public short unknown10;
-            /// <summary>
-            ///     At 0x180, this is the label. While 1982 pre-release documentation says the label can be up to 448 bytes, v1
-            ///     onward only have space for a 128 bytes one. Any application can write whatever they want in the label, however,
-            ///     Lisa Office uses it to store its own information, something that will effectively overwrite any information a user
-            ///     application wrote there. The information written here by Lisa Office is like the information Finder writes in the
-            ///     FinderInfo structures, plus the non-unique name that is shown on the GUI. For this reason I called it LisaInfo. I
-            ///     have not tried to reverse engineer it.
-            /// </summary>
-            public byte[] LisaInfo;
-        }
+        public byte[] LisaInfo;
+    }
 
-        /// <summary>
-        ///     The S-Records File is a hashtable of S-Records, where the hash is the file ID they belong to. The S-Records
-        ///     File cannot be fragmented or grown, and it can easily become full before the 32766 file IDs are exhausted. Each
-        ///     S-Record entry contains a block pointer to the Extents File that correspond to that file ID as well as the real
-        ///     file size, the only important information about a file that's not inside the Extents File. It also contains a low
-        ///     value (less than 0x200) variable field of unknown meaning and another one that seems to be flags, with values like
-        ///     0, 1, 3 and 5.
-        /// </summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct SRecord
-        {
-            /// <summary>0x00, block where ExtentsFile for this entry resides</summary>
-            public uint extent_ptr;
-            /// <summary>0x04, unknown</summary>
-            public uint unknown;
-            /// <summary>0x08, filesize in bytes</summary>
-            public uint filesize;
-            /// <summary>0x0C, some kind of flags, meaning unknown</summary>
-            public ushort flags;
-        }
+    /// <summary>
+    ///     The S-Records File is a hashtable of S-Records, where the hash is the file ID they belong to. The S-Records
+    ///     File cannot be fragmented or grown, and it can easily become full before the 32766 file IDs are exhausted. Each
+    ///     S-Record entry contains a block pointer to the Extents File that correspond to that file ID as well as the real
+    ///     file size, the only important information about a file that's not inside the Extents File. It also contains a low
+    ///     value (less than 0x200) variable field of unknown meaning and another one that seems to be flags, with values like
+    ///     0, 1, 3 and 5.
+    /// </summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct SRecord
+    {
+        /// <summary>0x00, block where ExtentsFile for this entry resides</summary>
+        public uint extent_ptr;
+        /// <summary>0x04, unknown</summary>
+        public uint unknown;
+        /// <summary>0x08, filesize in bytes</summary>
+        public uint filesize;
+        /// <summary>0x0C, some kind of flags, meaning unknown</summary>
+        public ushort flags;
+    }
 
-        /// <summary>
-        ///     The catalog entry for the V1 and V2 volume formats. It merely contains the file name, type and ID, plus a few
-        ///     (mostly empty) unknown fields. Contrary to V3, it has no header and instead of being a double-linked list it is
-        ///     fragmented using an Extents File. The Extents File position for the root catalog is then stored in the S-Records
-        ///     File. Its entries are not filed sequentially denoting some kind of in-memory structure while at the same time
-        ///     forcing LisaOS to read the whole catalog. That or I missed the pointers. Empty entries just contain a 0-len
-        ///     filename. Garbage is not zeroed.
-        /// </summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct CatalogEntryV2
-        {
-            /// <summary>0x00, filename, 32-bytes, null-padded</summary>
-            public byte filenameLen;
-            /// <summary>0x01, filename, 31-bytes</summary>
-            public byte[] filename;
-            /// <summary>0x21, unknown</summary>
-            public byte unknown1;
-            /// <summary>0x22, unknown</summary>
-            public byte fileType;
-            /// <summary>0x23, unknown</summary>
-            public byte unknown2;
-            /// <summary>0x24, unknown</summary>
-            public short fileID;
-            /// <summary>0x26, 16 bytes, unknown</summary>
-            public byte[] unknown3;
-        }
+    /// <summary>
+    ///     The catalog entry for the V1 and V2 volume formats. It merely contains the file name, type and ID, plus a few
+    ///     (mostly empty) unknown fields. Contrary to V3, it has no header and instead of being a double-linked list it is
+    ///     fragmented using an Extents File. The Extents File position for the root catalog is then stored in the S-Records
+    ///     File. Its entries are not filed sequentially denoting some kind of in-memory structure while at the same time
+    ///     forcing LisaOS to read the whole catalog. That or I missed the pointers. Empty entries just contain a 0-len
+    ///     filename. Garbage is not zeroed.
+    /// </summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct CatalogEntryV2
+    {
+        /// <summary>0x00, filename, 32-bytes, null-padded</summary>
+        public byte filenameLen;
+        /// <summary>0x01, filename, 31-bytes</summary>
+        public byte[] filename;
+        /// <summary>0x21, unknown</summary>
+        public byte unknown1;
+        /// <summary>0x22, unknown</summary>
+        public byte fileType;
+        /// <summary>0x23, unknown</summary>
+        public byte unknown2;
+        /// <summary>0x24, unknown</summary>
+        public short fileID;
+        /// <summary>0x26, 16 bytes, unknown</summary>
+        public byte[] unknown3;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/LisaFS/Super.cs b/Aaru.Filesystems/LisaFS/Super.cs
index 6aa132dec..6c36f2a6c 100644
--- a/Aaru.Filesystems/LisaFS/Super.cs
+++ b/Aaru.Filesystems/LisaFS/Super.cs
@@ -43,386 +43,385 @@ using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
-namespace Aaru.Filesystems.LisaFS
+namespace Aaru.Filesystems.LisaFS;
+
+public sealed partial class LisaFS
 {
-    public sealed partial class LisaFS
+    /// <inheritdoc />
+    public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                             Dictionary<string, string> options, string @namespace)
     {
-        /// <inheritdoc />
-        public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
-                                 Dictionary<string, string> options, string @namespace)
+        try
         {
-            try
+            _device  = imagePlugin;
+            Encoding = new LisaRoman();
+
+            // Lisa OS is unable to work on disks without tags.
+            // This code is designed like that.
+            // However with some effort the code may be modified to ignore them.
+            if(_device.Info.ReadableSectorTags?.Contains(SectorTagType.AppleSectorTag) != true)
             {
-                _device  = imagePlugin;
-                Encoding = new LisaRoman();
+                AaruConsole.DebugWriteLine("LisaFS plugin", "Underlying device does not support Lisa tags");
 
-                // Lisa OS is unable to work on disks without tags.
-                // This code is designed like that.
-                // However with some effort the code may be modified to ignore them.
-                if(_device.Info.ReadableSectorTags?.Contains(SectorTagType.AppleSectorTag) != true)
+                return ErrorNumber.InOutError;
+            }
+
+            // Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
+            if(_device.Info.Sectors < 800)
+            {
+                AaruConsole.DebugWriteLine("LisaFS plugin", "Device is too small");
+
+                return ErrorNumber.InOutError;
+            }
+
+            // MDDF cannot be at end of device, of course
+            _volumePrefix = _device.Info.Sectors;
+
+            // LisaOS searches sectors until tag tells MDDF resides there, so we'll search 100 sectors
+            for(ulong i = 0; i < 100; i++)
+            {
+                ErrorNumber errno = _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out byte[] tag);
+
+                if(errno != ErrorNumber.NoError)
+                    continue;
+
+                DecodeTag(tag, out LisaTag.PriamTag searchTag);
+
+                AaruConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
+
+                if(_volumePrefix    == _device.Info.Sectors &&
+                   searchTag.FileId == FILEID_LOADER_SIGNED)
+                    _volumePrefix = i - 1;
+
+                if(searchTag.FileId != FILEID_MDDF)
+                    continue;
+
+                _devTagSize = tag.Length;
+                errno       = _device.ReadSector(i, out byte[] sector);
+
+                if(errno != ErrorNumber.NoError)
+                    return errno;
+
+                _mddf = new MDDF();
+                byte[] pString = new byte[33];
+
+                _mddf.fsversion = BigEndianBitConverter.ToUInt16(sector, 0x00);
+                _mddf.volid     = BigEndianBitConverter.ToUInt64(sector, 0x02);
+                _mddf.volnum    = BigEndianBitConverter.ToUInt16(sector, 0x0A);
+                Array.Copy(sector, 0x0C, pString, 0, 33);
+                _mddf.volname  = StringHandlers.PascalToString(pString, Encoding);
+                _mddf.unknown1 = sector[0x2D];
+                Array.Copy(sector, 0x2E, pString, 0, 33);
+
+                // Prevent garbage
+                _mddf.password       = pString[0] <= 32 ? StringHandlers.PascalToString(pString, Encoding) : "";
+                _mddf.unknown2       = sector[0x4F];
+                _mddf.machine_id     = BigEndianBitConverter.ToUInt32(sector, 0x50);
+                _mddf.master_copy_id = BigEndianBitConverter.ToUInt32(sector, 0x54);
+                uint lisaTime = BigEndianBitConverter.ToUInt32(sector, 0x58);
+                _mddf.dtvc                         = DateHandlers.LisaToDateTime(lisaTime);
+                lisaTime                           = BigEndianBitConverter.ToUInt32(sector, 0x5C);
+                _mddf.dtcc                         = DateHandlers.LisaToDateTime(lisaTime);
+                lisaTime                           = BigEndianBitConverter.ToUInt32(sector, 0x60);
+                _mddf.dtvb                         = DateHandlers.LisaToDateTime(lisaTime);
+                lisaTime                           = BigEndianBitConverter.ToUInt32(sector, 0x64);
+                _mddf.dtvs                         = DateHandlers.LisaToDateTime(lisaTime);
+                _mddf.unknown3                     = BigEndianBitConverter.ToUInt32(sector, 0x68);
+                _mddf.mddf_block                   = BigEndianBitConverter.ToUInt32(sector, 0x6C);
+                _mddf.volsize_minus_one            = BigEndianBitConverter.ToUInt32(sector, 0x70);
+                _mddf.volsize_minus_mddf_minus_one = BigEndianBitConverter.ToUInt32(sector, 0x74);
+                _mddf.vol_size                     = BigEndianBitConverter.ToUInt32(sector, 0x78);
+                _mddf.blocksize                    = BigEndianBitConverter.ToUInt16(sector, 0x7C);
+                _mddf.datasize                     = BigEndianBitConverter.ToUInt16(sector, 0x7E);
+                _mddf.unknown4                     = BigEndianBitConverter.ToUInt16(sector, 0x80);
+                _mddf.unknown5                     = BigEndianBitConverter.ToUInt32(sector, 0x82);
+                _mddf.unknown6                     = BigEndianBitConverter.ToUInt32(sector, 0x86);
+                _mddf.clustersize                  = BigEndianBitConverter.ToUInt16(sector, 0x8A);
+                _mddf.fs_size                      = BigEndianBitConverter.ToUInt32(sector, 0x8C);
+                _mddf.unknown7                     = BigEndianBitConverter.ToUInt32(sector, 0x90);
+                _mddf.srec_ptr                     = BigEndianBitConverter.ToUInt32(sector, 0x94);
+                _mddf.unknown9                     = BigEndianBitConverter.ToUInt16(sector, 0x98);
+                _mddf.srec_len                     = BigEndianBitConverter.ToUInt16(sector, 0x9A);
+                _mddf.unknown10                    = BigEndianBitConverter.ToUInt32(sector, 0x9C);
+                _mddf.unknown11                    = BigEndianBitConverter.ToUInt32(sector, 0xA0);
+                _mddf.unknown12                    = BigEndianBitConverter.ToUInt32(sector, 0xA4);
+                _mddf.unknown13                    = BigEndianBitConverter.ToUInt32(sector, 0xA8);
+                _mddf.unknown14                    = BigEndianBitConverter.ToUInt32(sector, 0xAC);
+                _mddf.filecount                    = BigEndianBitConverter.ToUInt16(sector, 0xB0);
+                _mddf.unknown15                    = BigEndianBitConverter.ToUInt32(sector, 0xB2);
+                _mddf.unknown16                    = BigEndianBitConverter.ToUInt32(sector, 0xB6);
+                _mddf.freecount                    = BigEndianBitConverter.ToUInt32(sector, 0xBA);
+                _mddf.unknown17                    = BigEndianBitConverter.ToUInt16(sector, 0xBE);
+                _mddf.unknown18                    = BigEndianBitConverter.ToUInt32(sector, 0xC0);
+                _mddf.overmount_stamp              = BigEndianBitConverter.ToUInt64(sector, 0xC4);
+                _mddf.serialization                = BigEndianBitConverter.ToUInt32(sector, 0xCC);
+                _mddf.unknown19                    = BigEndianBitConverter.ToUInt32(sector, 0xD0);
+                _mddf.unknown_timestamp            = BigEndianBitConverter.ToUInt32(sector, 0xD4);
+                _mddf.unknown20                    = BigEndianBitConverter.ToUInt32(sector, 0xD8);
+                _mddf.unknown21                    = BigEndianBitConverter.ToUInt32(sector, 0xDC);
+                _mddf.unknown22                    = BigEndianBitConverter.ToUInt32(sector, 0xE0);
+                _mddf.unknown23                    = BigEndianBitConverter.ToUInt32(sector, 0xE4);
+                _mddf.unknown24                    = BigEndianBitConverter.ToUInt32(sector, 0xE8);
+                _mddf.unknown25                    = BigEndianBitConverter.ToUInt32(sector, 0xEC);
+                _mddf.unknown26                    = BigEndianBitConverter.ToUInt32(sector, 0xF0);
+                _mddf.unknown27                    = BigEndianBitConverter.ToUInt32(sector, 0xF4);
+                _mddf.unknown28                    = BigEndianBitConverter.ToUInt32(sector, 0xF8);
+                _mddf.unknown29                    = BigEndianBitConverter.ToUInt32(sector, 0xFC);
+                _mddf.unknown30                    = BigEndianBitConverter.ToUInt32(sector, 0x100);
+                _mddf.unknown31                    = BigEndianBitConverter.ToUInt32(sector, 0x104);
+                _mddf.unknown32                    = BigEndianBitConverter.ToUInt32(sector, 0x108);
+                _mddf.unknown33                    = BigEndianBitConverter.ToUInt32(sector, 0x10C);
+                _mddf.unknown34                    = BigEndianBitConverter.ToUInt32(sector, 0x110);
+                _mddf.unknown35                    = BigEndianBitConverter.ToUInt32(sector, 0x114);
+                _mddf.backup_volid                 = BigEndianBitConverter.ToUInt64(sector, 0x118);
+                _mddf.label_size                   = BigEndianBitConverter.ToUInt16(sector, 0x120);
+                _mddf.fs_overhead                  = BigEndianBitConverter.ToUInt16(sector, 0x122);
+                _mddf.result_scavenge              = BigEndianBitConverter.ToUInt16(sector, 0x124);
+                _mddf.boot_code                    = BigEndianBitConverter.ToUInt16(sector, 0x126);
+                _mddf.boot_environ                 = BigEndianBitConverter.ToUInt16(sector, 0x6C);
+                _mddf.unknown36                    = BigEndianBitConverter.ToUInt32(sector, 0x12A);
+                _mddf.unknown37                    = BigEndianBitConverter.ToUInt32(sector, 0x12E);
+                _mddf.unknown38                    = BigEndianBitConverter.ToUInt32(sector, 0x132);
+                _mddf.vol_sequence                 = BigEndianBitConverter.ToUInt16(sector, 0x136);
+                _mddf.vol_left_mounted             = sector[0x138];
+
+                // Check that the MDDF is correct
+                if(_mddf.mddf_block       != i - _volumePrefix                                  ||
+                   _mddf.vol_size         > _device.Info.Sectors                                ||
+                   _mddf.vol_size - 1     != _mddf.volsize_minus_one                            ||
+                   _mddf.vol_size - i - 1 != _mddf.volsize_minus_mddf_minus_one - _volumePrefix ||
+                   _mddf.datasize         > _mddf.blocksize                                     ||
+                   _mddf.blocksize        < _device.Info.SectorSize                             ||
+                   _mddf.datasize         != _device.Info.SectorSize)
                 {
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "Underlying device does not support Lisa tags");
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "Incorrect MDDF found");
 
-                    return ErrorNumber.InOutError;
+                    return ErrorNumber.InvalidArgument;
                 }
 
-                // Minimal LisaOS disk is 3.5" single sided double density, 800 sectors
-                if(_device.Info.Sectors < 800)
+                // Check MDDF version
+                switch(_mddf.fsversion)
                 {
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "Device is too small");
+                    case LISA_V1:
+                        AaruConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v1");
 
-                    return ErrorNumber.InOutError;
+                        break;
+                    case LISA_V2:
+                        AaruConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v2");
+
+                        break;
+                    case LISA_V3:
+                        AaruConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v3");
+
+                        break;
+                    default:
+                        AaruConsole.ErrorWriteLine("Cannot mount LisaFS version {0}", _mddf.fsversion.ToString());
+
+                        return ErrorNumber.NotSupported;
                 }
 
-                // MDDF cannot be at end of device, of course
-                _volumePrefix = _device.Info.Sectors;
+                // Initialize caches
+                _extentCache     = new Dictionary<short, ExtentFile>();
+                _systemFileCache = new Dictionary<short, byte[]>();
+                _fileCache       = new Dictionary<short, byte[]>();
 
-                // LisaOS searches sectors until tag tells MDDF resides there, so we'll search 100 sectors
-                for(ulong i = 0; i < 100; i++)
+                //catalogCache = new Dictionary<short, List<CatalogEntry>>();
+                _fileSizeCache = new Dictionary<short, int>();
+
+                _mounted = true;
+
+                options ??= GetDefaultOptions();
+
+                if(options.TryGetValue("debug", out string debugString))
+                    bool.TryParse(debugString, out _debug);
+
+                if(_debug)
+                    _printedExtents = new List<short>();
+
+                // Read the S-Records file
+                ErrorNumber error = ReadSRecords();
+
+                if(error != ErrorNumber.NoError)
                 {
-                    ErrorNumber errno = _device.ReadSectorTag(i, SectorTagType.AppleSectorTag, out byte[] tag);
+                    AaruConsole.ErrorWriteLine("Error {0} reading S-Records file.", error);
 
-                    if(errno != ErrorNumber.NoError)
-                        continue;
+                    return error;
+                }
 
-                    DecodeTag(tag, out LisaTag.PriamTag searchTag);
-
-                    AaruConsole.DebugWriteLine("LisaFS plugin", "Sector {0}, file ID 0x{1:X4}", i, searchTag.FileId);
-
-                    if(_volumePrefix    == _device.Info.Sectors &&
-                       searchTag.FileId == FILEID_LOADER_SIGNED)
-                        _volumePrefix = i - 1;
-
-                    if(searchTag.FileId != FILEID_MDDF)
-                        continue;
-
-                    _devTagSize = tag.Length;
-                    errno       = _device.ReadSector(i, out byte[] sector);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    _mddf = new MDDF();
-                    byte[] pString = new byte[33];
-
-                    _mddf.fsversion = BigEndianBitConverter.ToUInt16(sector, 0x00);
-                    _mddf.volid     = BigEndianBitConverter.ToUInt64(sector, 0x02);
-                    _mddf.volnum    = BigEndianBitConverter.ToUInt16(sector, 0x0A);
-                    Array.Copy(sector, 0x0C, pString, 0, 33);
-                    _mddf.volname  = StringHandlers.PascalToString(pString, Encoding);
-                    _mddf.unknown1 = sector[0x2D];
-                    Array.Copy(sector, 0x2E, pString, 0, 33);
-
-                    // Prevent garbage
-                    _mddf.password       = pString[0] <= 32 ? StringHandlers.PascalToString(pString, Encoding) : "";
-                    _mddf.unknown2       = sector[0x4F];
-                    _mddf.machine_id     = BigEndianBitConverter.ToUInt32(sector, 0x50);
-                    _mddf.master_copy_id = BigEndianBitConverter.ToUInt32(sector, 0x54);
-                    uint lisaTime = BigEndianBitConverter.ToUInt32(sector, 0x58);
-                    _mddf.dtvc                         = DateHandlers.LisaToDateTime(lisaTime);
-                    lisaTime                           = BigEndianBitConverter.ToUInt32(sector, 0x5C);
-                    _mddf.dtcc                         = DateHandlers.LisaToDateTime(lisaTime);
-                    lisaTime                           = BigEndianBitConverter.ToUInt32(sector, 0x60);
-                    _mddf.dtvb                         = DateHandlers.LisaToDateTime(lisaTime);
-                    lisaTime                           = BigEndianBitConverter.ToUInt32(sector, 0x64);
-                    _mddf.dtvs                         = DateHandlers.LisaToDateTime(lisaTime);
-                    _mddf.unknown3                     = BigEndianBitConverter.ToUInt32(sector, 0x68);
-                    _mddf.mddf_block                   = BigEndianBitConverter.ToUInt32(sector, 0x6C);
-                    _mddf.volsize_minus_one            = BigEndianBitConverter.ToUInt32(sector, 0x70);
-                    _mddf.volsize_minus_mddf_minus_one = BigEndianBitConverter.ToUInt32(sector, 0x74);
-                    _mddf.vol_size                     = BigEndianBitConverter.ToUInt32(sector, 0x78);
-                    _mddf.blocksize                    = BigEndianBitConverter.ToUInt16(sector, 0x7C);
-                    _mddf.datasize                     = BigEndianBitConverter.ToUInt16(sector, 0x7E);
-                    _mddf.unknown4                     = BigEndianBitConverter.ToUInt16(sector, 0x80);
-                    _mddf.unknown5                     = BigEndianBitConverter.ToUInt32(sector, 0x82);
-                    _mddf.unknown6                     = BigEndianBitConverter.ToUInt32(sector, 0x86);
-                    _mddf.clustersize                  = BigEndianBitConverter.ToUInt16(sector, 0x8A);
-                    _mddf.fs_size                      = BigEndianBitConverter.ToUInt32(sector, 0x8C);
-                    _mddf.unknown7                     = BigEndianBitConverter.ToUInt32(sector, 0x90);
-                    _mddf.srec_ptr                     = BigEndianBitConverter.ToUInt32(sector, 0x94);
-                    _mddf.unknown9                     = BigEndianBitConverter.ToUInt16(sector, 0x98);
-                    _mddf.srec_len                     = BigEndianBitConverter.ToUInt16(sector, 0x9A);
-                    _mddf.unknown10                    = BigEndianBitConverter.ToUInt32(sector, 0x9C);
-                    _mddf.unknown11                    = BigEndianBitConverter.ToUInt32(sector, 0xA0);
-                    _mddf.unknown12                    = BigEndianBitConverter.ToUInt32(sector, 0xA4);
-                    _mddf.unknown13                    = BigEndianBitConverter.ToUInt32(sector, 0xA8);
-                    _mddf.unknown14                    = BigEndianBitConverter.ToUInt32(sector, 0xAC);
-                    _mddf.filecount                    = BigEndianBitConverter.ToUInt16(sector, 0xB0);
-                    _mddf.unknown15                    = BigEndianBitConverter.ToUInt32(sector, 0xB2);
-                    _mddf.unknown16                    = BigEndianBitConverter.ToUInt32(sector, 0xB6);
-                    _mddf.freecount                    = BigEndianBitConverter.ToUInt32(sector, 0xBA);
-                    _mddf.unknown17                    = BigEndianBitConverter.ToUInt16(sector, 0xBE);
-                    _mddf.unknown18                    = BigEndianBitConverter.ToUInt32(sector, 0xC0);
-                    _mddf.overmount_stamp              = BigEndianBitConverter.ToUInt64(sector, 0xC4);
-                    _mddf.serialization                = BigEndianBitConverter.ToUInt32(sector, 0xCC);
-                    _mddf.unknown19                    = BigEndianBitConverter.ToUInt32(sector, 0xD0);
-                    _mddf.unknown_timestamp            = BigEndianBitConverter.ToUInt32(sector, 0xD4);
-                    _mddf.unknown20                    = BigEndianBitConverter.ToUInt32(sector, 0xD8);
-                    _mddf.unknown21                    = BigEndianBitConverter.ToUInt32(sector, 0xDC);
-                    _mddf.unknown22                    = BigEndianBitConverter.ToUInt32(sector, 0xE0);
-                    _mddf.unknown23                    = BigEndianBitConverter.ToUInt32(sector, 0xE4);
-                    _mddf.unknown24                    = BigEndianBitConverter.ToUInt32(sector, 0xE8);
-                    _mddf.unknown25                    = BigEndianBitConverter.ToUInt32(sector, 0xEC);
-                    _mddf.unknown26                    = BigEndianBitConverter.ToUInt32(sector, 0xF0);
-                    _mddf.unknown27                    = BigEndianBitConverter.ToUInt32(sector, 0xF4);
-                    _mddf.unknown28                    = BigEndianBitConverter.ToUInt32(sector, 0xF8);
-                    _mddf.unknown29                    = BigEndianBitConverter.ToUInt32(sector, 0xFC);
-                    _mddf.unknown30                    = BigEndianBitConverter.ToUInt32(sector, 0x100);
-                    _mddf.unknown31                    = BigEndianBitConverter.ToUInt32(sector, 0x104);
-                    _mddf.unknown32                    = BigEndianBitConverter.ToUInt32(sector, 0x108);
-                    _mddf.unknown33                    = BigEndianBitConverter.ToUInt32(sector, 0x10C);
-                    _mddf.unknown34                    = BigEndianBitConverter.ToUInt32(sector, 0x110);
-                    _mddf.unknown35                    = BigEndianBitConverter.ToUInt32(sector, 0x114);
-                    _mddf.backup_volid                 = BigEndianBitConverter.ToUInt64(sector, 0x118);
-                    _mddf.label_size                   = BigEndianBitConverter.ToUInt16(sector, 0x120);
-                    _mddf.fs_overhead                  = BigEndianBitConverter.ToUInt16(sector, 0x122);
-                    _mddf.result_scavenge              = BigEndianBitConverter.ToUInt16(sector, 0x124);
-                    _mddf.boot_code                    = BigEndianBitConverter.ToUInt16(sector, 0x126);
-                    _mddf.boot_environ                 = BigEndianBitConverter.ToUInt16(sector, 0x6C);
-                    _mddf.unknown36                    = BigEndianBitConverter.ToUInt32(sector, 0x12A);
-                    _mddf.unknown37                    = BigEndianBitConverter.ToUInt32(sector, 0x12E);
-                    _mddf.unknown38                    = BigEndianBitConverter.ToUInt32(sector, 0x132);
-                    _mddf.vol_sequence                 = BigEndianBitConverter.ToUInt16(sector, 0x136);
-                    _mddf.vol_left_mounted             = sector[0x138];
-
-                    // Check that the MDDF is correct
-                    if(_mddf.mddf_block       != i - _volumePrefix                                  ||
-                       _mddf.vol_size         > _device.Info.Sectors                                ||
-                       _mddf.vol_size - 1     != _mddf.volsize_minus_one                            ||
-                       _mddf.vol_size - i - 1 != _mddf.volsize_minus_mddf_minus_one - _volumePrefix ||
-                       _mddf.datasize         > _mddf.blocksize                                     ||
-                       _mddf.blocksize        < _device.Info.SectorSize                             ||
-                       _mddf.datasize         != _device.Info.SectorSize)
+                _directoryDtcCache = new Dictionary<short, DateTime>
+                {
                     {
-                        AaruConsole.DebugWriteLine("LisaFS plugin", "Incorrect MDDF found");
-
-                        return ErrorNumber.InvalidArgument;
+                        DIRID_ROOT, _mddf.dtcc
                     }
+                };
 
-                    // Check MDDF version
-                    switch(_mddf.fsversion)
-                    {
-                        case LISA_V1:
-                            AaruConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v1");
+                // Read the Catalog File
+                error = ReadCatalog();
 
-                            break;
-                        case LISA_V2:
-                            AaruConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v2");
+                if(error != ErrorNumber.NoError)
+                {
+                    AaruConsole.DebugWriteLine("LisaFS plugin", "Cannot read Catalog File, error {0}",
+                                               error.ToString());
 
-                            break;
-                        case LISA_V3:
-                            AaruConsole.DebugWriteLine("LisaFS plugin", "Mounting LisaFS v3");
+                    _mounted = false;
 
-                            break;
-                        default:
-                            AaruConsole.ErrorWriteLine("Cannot mount LisaFS version {0}", _mddf.fsversion.ToString());
+                    return error;
+                }
 
-                            return ErrorNumber.NotSupported;
-                    }
-
-                    // Initialize caches
-                    _extentCache     = new Dictionary<short, ExtentFile>();
-                    _systemFileCache = new Dictionary<short, byte[]>();
-                    _fileCache       = new Dictionary<short, byte[]>();
-
-                    //catalogCache = new Dictionary<short, List<CatalogEntry>>();
-                    _fileSizeCache = new Dictionary<short, int>();
-
-                    _mounted = true;
-
-                    options ??= GetDefaultOptions();
-
-                    if(options.TryGetValue("debug", out string debugString))
-                        bool.TryParse(debugString, out _debug);
-
-                    if(_debug)
-                        _printedExtents = new List<short>();
-
-                    // Read the S-Records file
-                    ErrorNumber error = ReadSRecords();
+                // If debug, cache system files
+                if(_debug)
+                {
+                    error = ReadSystemFile(FILEID_BOOT_SIGNED, out _);
 
                     if(error != ErrorNumber.NoError)
                     {
-                        AaruConsole.ErrorWriteLine("Error {0} reading S-Records file.", error);
-
-                        return error;
-                    }
-
-                    _directoryDtcCache = new Dictionary<short, DateTime>
-                    {
-                        {
-                            DIRID_ROOT, _mddf.dtcc
-                        }
-                    };
-
-                    // Read the Catalog File
-                    error = ReadCatalog();
-
-                    if(error != ErrorNumber.NoError)
-                    {
-                        AaruConsole.DebugWriteLine("LisaFS plugin", "Cannot read Catalog File, error {0}",
-                                                   error.ToString());
-
+                        AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read boot blocks");
                         _mounted = false;
 
                         return error;
                     }
 
-                    // If debug, cache system files
-                    if(_debug)
+                    error = ReadSystemFile(FILEID_LOADER_SIGNED, out _);
+
+                    if(error != ErrorNumber.NoError)
                     {
-                        error = ReadSystemFile(FILEID_BOOT_SIGNED, out _);
+                        AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read boot loader");
+                        _mounted = false;
 
-                        if(error != ErrorNumber.NoError)
-                        {
-                            AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read boot blocks");
-                            _mounted = false;
-
-                            return error;
-                        }
-
-                        error = ReadSystemFile(FILEID_LOADER_SIGNED, out _);
-
-                        if(error != ErrorNumber.NoError)
-                        {
-                            AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read boot loader");
-                            _mounted = false;
-
-                            return error;
-                        }
-
-                        error = ReadSystemFile((short)FILEID_MDDF, out _);
-
-                        if(error != ErrorNumber.NoError)
-                        {
-                            AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read MDDF");
-                            _mounted = false;
-
-                            return error;
-                        }
-
-                        error = ReadSystemFile((short)FILEID_BITMAP, out _);
-
-                        if(error != ErrorNumber.NoError)
-                        {
-                            AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read volume bitmap");
-                            _mounted = false;
-
-                            return error;
-                        }
-
-                        error = ReadSystemFile((short)FILEID_SRECORD, out _);
-
-                        if(error != ErrorNumber.NoError)
-                        {
-                            AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read S-Records file");
-                            _mounted = false;
-
-                            return error;
-                        }
+                        return error;
                     }
 
-                    // Create XML metadata for mounted filesystem
-                    XmlFsType = new FileSystemType();
+                    error = ReadSystemFile((short)FILEID_MDDF, out _);
 
-                    if(DateTime.Compare(_mddf.dtvb, DateHandlers.LisaToDateTime(0)) > 0)
+                    if(error != ErrorNumber.NoError)
                     {
-                        XmlFsType.BackupDate          = _mddf.dtvb;
-                        XmlFsType.BackupDateSpecified = true;
+                        AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read MDDF");
+                        _mounted = false;
+
+                        return error;
                     }
 
-                    XmlFsType.Clusters    = _mddf.vol_size;
-                    XmlFsType.ClusterSize = (uint)(_mddf.clustersize * _mddf.datasize);
+                    error = ReadSystemFile((short)FILEID_BITMAP, out _);
 
-                    if(DateTime.Compare(_mddf.dtvc, DateHandlers.LisaToDateTime(0)) > 0)
+                    if(error != ErrorNumber.NoError)
                     {
-                        XmlFsType.CreationDate          = _mddf.dtvc;
-                        XmlFsType.CreationDateSpecified = true;
+                        AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read volume bitmap");
+                        _mounted = false;
+
+                        return error;
                     }
 
-                    XmlFsType.Dirty                 = _mddf.vol_left_mounted != 0;
-                    XmlFsType.Files                 = _mddf.filecount;
-                    XmlFsType.FilesSpecified        = true;
-                    XmlFsType.FreeClusters          = _mddf.freecount;
-                    XmlFsType.FreeClustersSpecified = true;
-                    XmlFsType.Type                  = "LisaFS";
-                    XmlFsType.VolumeName            = _mddf.volname;
-                    XmlFsType.VolumeSerial          = $"{_mddf.volid:X16}";
+                    error = ReadSystemFile((short)FILEID_SRECORD, out _);
 
-                    return ErrorNumber.NoError;
+                    if(error != ErrorNumber.NoError)
+                    {
+                        AaruConsole.DebugWriteLine("LisaFS plugin", "Unable to read S-Records file");
+                        _mounted = false;
+
+                        return error;
+                    }
                 }
 
-                AaruConsole.DebugWriteLine("LisaFS plugin", "Not a Lisa filesystem");
+                // Create XML metadata for mounted filesystem
+                XmlFsType = new FileSystemType();
 
-                return ErrorNumber.NotSupported;
-            }
-            catch(Exception ex)
-            {
-                AaruConsole.ErrorWriteLine("Exception {0}, {1}, {2}", ex.Message, ex.InnerException, ex.StackTrace);
-
-                return ErrorNumber.InOutError;
-            }
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Unmount()
-        {
-            _mounted         = false;
-            _extentCache     = null;
-            _systemFileCache = null;
-            _fileCache       = null;
-            _catalogCache    = null;
-            _fileSizeCache   = null;
-            _printedExtents  = null;
-            _mddf            = new MDDF();
-            _volumePrefix    = 0;
-            _devTagSize      = 0;
-            _srecords        = null;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber StatFs(out FileSystemInfo stat)
-        {
-            stat = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            stat = new FileSystemInfo
-            {
-                Blocks         = _mddf.vol_size,
-                FilenameLength = (ushort)E_NAME,
-                Files          = _mddf.filecount,
-                FreeBlocks     = _mddf.freecount,
-                Id =
+                if(DateTime.Compare(_mddf.dtvb, DateHandlers.LisaToDateTime(0)) > 0)
                 {
-                    Serial64 = _mddf.volid,
-                    IsLong   = true
-                },
-                PluginId = Id
-            };
+                    XmlFsType.BackupDate          = _mddf.dtvb;
+                    XmlFsType.BackupDateSpecified = true;
+                }
 
-            stat.FreeFiles = FILEID_MAX - stat.Files;
+                XmlFsType.Clusters    = _mddf.vol_size;
+                XmlFsType.ClusterSize = (uint)(_mddf.clustersize * _mddf.datasize);
 
-            switch(_mddf.fsversion)
-            {
-                case LISA_V1:
-                    stat.Type = "LisaFS v1";
+                if(DateTime.Compare(_mddf.dtvc, DateHandlers.LisaToDateTime(0)) > 0)
+                {
+                    XmlFsType.CreationDate          = _mddf.dtvc;
+                    XmlFsType.CreationDateSpecified = true;
+                }
 
-                    break;
-                case LISA_V2:
-                    stat.Type = "LisaFS v2";
+                XmlFsType.Dirty                 = _mddf.vol_left_mounted != 0;
+                XmlFsType.Files                 = _mddf.filecount;
+                XmlFsType.FilesSpecified        = true;
+                XmlFsType.FreeClusters          = _mddf.freecount;
+                XmlFsType.FreeClustersSpecified = true;
+                XmlFsType.Type                  = "LisaFS";
+                XmlFsType.VolumeName            = _mddf.volname;
+                XmlFsType.VolumeSerial          = $"{_mddf.volid:X16}";
 
-                    break;
-                case LISA_V3:
-                    stat.Type = "LisaFS v3";
-
-                    break;
+                return ErrorNumber.NoError;
             }
 
-            return ErrorNumber.NoError;
+            AaruConsole.DebugWriteLine("LisaFS plugin", "Not a Lisa filesystem");
+
+            return ErrorNumber.NotSupported;
+        }
+        catch(Exception ex)
+        {
+            AaruConsole.ErrorWriteLine("Exception {0}, {1}, {2}", ex.Message, ex.InnerException, ex.StackTrace);
+
+            return ErrorNumber.InOutError;
         }
     }
+
+    /// <inheritdoc />
+    public ErrorNumber Unmount()
+    {
+        _mounted         = false;
+        _extentCache     = null;
+        _systemFileCache = null;
+        _fileCache       = null;
+        _catalogCache    = null;
+        _fileSizeCache   = null;
+        _printedExtents  = null;
+        _mddf            = new MDDF();
+        _volumePrefix    = 0;
+        _devTagSize      = 0;
+        _srecords        = null;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber StatFs(out FileSystemInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        stat = new FileSystemInfo
+        {
+            Blocks         = _mddf.vol_size,
+            FilenameLength = (ushort)E_NAME,
+            Files          = _mddf.filecount,
+            FreeBlocks     = _mddf.freecount,
+            Id =
+            {
+                Serial64 = _mddf.volid,
+                IsLong   = true
+            },
+            PluginId = Id
+        };
+
+        stat.FreeFiles = FILEID_MAX - stat.Files;
+
+        switch(_mddf.fsversion)
+        {
+            case LISA_V1:
+                stat.Type = "LisaFS v1";
+
+                break;
+            case LISA_V2:
+                stat.Type = "LisaFS v2";
+
+                break;
+            case LISA_V3:
+                stat.Type = "LisaFS v3";
+
+                break;
+        }
+
+        return ErrorNumber.NoError;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/LisaFS/Xattr.cs b/Aaru.Filesystems/LisaFS/Xattr.cs
index c173b9b88..fd46350e6 100644
--- a/Aaru.Filesystems/LisaFS/Xattr.cs
+++ b/Aaru.Filesystems/LisaFS/Xattr.cs
@@ -38,179 +38,178 @@ using Aaru.CommonTypes.Enums;
 using Aaru.Decoders;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.LisaFS
+namespace Aaru.Filesystems.LisaFS;
+
+public sealed partial class LisaFS
 {
-    public sealed partial class LisaFS
+    /// <inheritdoc />
+    public ErrorNumber ListXAttr(string path, out List<string> xattrs)
     {
-        /// <inheritdoc />
-        public ErrorNumber ListXAttr(string path, out List<string> xattrs)
+        xattrs = null;
+        ErrorNumber error = LookupFileId(path, out short fileId, out bool isDir);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        return isDir ? ErrorNumber.InvalidArgument : ListXAttr(fileId, out xattrs);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
+    {
+        ErrorNumber error = LookupFileId(path, out short fileId, out bool isDir);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        return isDir ? ErrorNumber.InvalidArgument : GetXattr(fileId, xattr, out buf);
+    }
+
+    /// <summary>Lists special Apple Lisa filesystem features as extended attributes</summary>
+    /// <returns>Error number.</returns>
+    /// <param name="fileId">File identifier.</param>
+    /// <param name="xattrs">Extended attributes.</param>
+    ErrorNumber ListXAttr(short fileId, out List<string> xattrs)
+    {
+        xattrs = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        // System files
+        if(fileId < 4)
         {
-            xattrs = null;
-            ErrorNumber error = LookupFileId(path, out short fileId, out bool isDir);
+            if(!_debug ||
+               fileId == 0)
+                return ErrorNumber.InvalidArgument;
 
-            if(error != ErrorNumber.NoError)
-                return error;
+            xattrs = new List<string>();
 
-            return isDir ? ErrorNumber.InvalidArgument : ListXAttr(fileId, out xattrs);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf)
-        {
-            ErrorNumber error = LookupFileId(path, out short fileId, out bool isDir);
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            return isDir ? ErrorNumber.InvalidArgument : GetXattr(fileId, xattr, out buf);
-        }
-
-        /// <summary>Lists special Apple Lisa filesystem features as extended attributes</summary>
-        /// <returns>Error number.</returns>
-        /// <param name="fileId">File identifier.</param>
-        /// <param name="xattrs">Extended attributes.</param>
-        ErrorNumber ListXAttr(short fileId, out List<string> xattrs)
-        {
-            xattrs = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            // System files
-            if(fileId < 4)
+            // Only MDDF contains an extended attributes
+            if(fileId == FILEID_MDDF)
             {
-                if(!_debug ||
-                   fileId == 0)
-                    return ErrorNumber.InvalidArgument;
+                byte[] buf = Encoding.ASCII.GetBytes(_mddf.password);
 
-                xattrs = new List<string>();
-
-                // Only MDDF contains an extended attributes
-                if(fileId == FILEID_MDDF)
-                {
-                    byte[] buf = Encoding.ASCII.GetBytes(_mddf.password);
-
-                    // If the MDDF contains a password, show it
-                    if(buf.Length > 0)
-                        xattrs.Add("com.apple.lisa.password");
-                }
-            }
-            else
-            {
-                // Search for the file
-                ErrorNumber error = ReadExtentsFile(fileId, out ExtentFile file);
-
-                if(error != ErrorNumber.NoError)
-                    return error;
-
-                xattrs = new List<string>();
-
-                // Password field is never emptied, check if valid
-                if(file.password_valid > 0)
+                // If the MDDF contains a password, show it
+                if(buf.Length > 0)
                     xattrs.Add("com.apple.lisa.password");
-
-                // Check for a valid copy-protection serial number
-                if(file.serial > 0)
-                    xattrs.Add("com.apple.lisa.serial");
-
-                // Check if the label contains something or is empty
-                if(!ArrayHelpers.ArrayIsNullOrEmpty(file.LisaInfo))
-                    xattrs.Add("com.apple.lisa.label");
             }
-
-            // On debug mode allow sector tags to be accessed as an xattr
-            if(_debug)
-                xattrs.Add("com.apple.lisa.tags");
-
-            xattrs.Sort();
-
-            return ErrorNumber.NoError;
         }
-
-        /// <summary>Lists special Apple Lisa filesystem features as extended attributes</summary>
-        /// <returns>Error number.</returns>
-        /// <param name="fileId">File identifier.</param>
-        /// <param name="xattr">Extended attribute name.</param>
-        /// <param name="buf">Buffer where the extended attribute will be stored.</param>
-        ErrorNumber GetXattr(short fileId, string xattr, out byte[] buf)
+        else
         {
-            buf = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            // System files
-            if(fileId < 4)
-            {
-                if(!_debug ||
-                   fileId == 0)
-                    return ErrorNumber.InvalidArgument;
-
-                // Only MDDF contains an extended attributes
-                if(fileId == FILEID_MDDF)
-                    if(xattr == "com.apple.lisa.password")
-                    {
-                        buf = Encoding.ASCII.GetBytes(_mddf.password);
-
-                        return ErrorNumber.NoError;
-                    }
-
-                // But on debug mode even system files contain tags
-                if(_debug && xattr == "com.apple.lisa.tags")
-                    return ReadSystemFile(fileId, out buf, true);
-
-                return ErrorNumber.NoSuchExtendedAttribute;
-            }
-
             // Search for the file
             ErrorNumber error = ReadExtentsFile(fileId, out ExtentFile file);
 
             if(error != ErrorNumber.NoError)
                 return error;
 
-            switch(xattr)
-            {
-                case "com.apple.lisa.password" when file.password_valid > 0:
-                    buf = new byte[8];
-                    Array.Copy(file.password, 0, buf, 0, 8);
+            xattrs = new List<string>();
+
+            // Password field is never emptied, check if valid
+            if(file.password_valid > 0)
+                xattrs.Add("com.apple.lisa.password");
+
+            // Check for a valid copy-protection serial number
+            if(file.serial > 0)
+                xattrs.Add("com.apple.lisa.serial");
+
+            // Check if the label contains something or is empty
+            if(!ArrayHelpers.ArrayIsNullOrEmpty(file.LisaInfo))
+                xattrs.Add("com.apple.lisa.label");
+        }
+
+        // On debug mode allow sector tags to be accessed as an xattr
+        if(_debug)
+            xattrs.Add("com.apple.lisa.tags");
+
+        xattrs.Sort();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <summary>Lists special Apple Lisa filesystem features as extended attributes</summary>
+    /// <returns>Error number.</returns>
+    /// <param name="fileId">File identifier.</param>
+    /// <param name="xattr">Extended attribute name.</param>
+    /// <param name="buf">Buffer where the extended attribute will be stored.</param>
+    ErrorNumber GetXattr(short fileId, string xattr, out byte[] buf)
+    {
+        buf = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        // System files
+        if(fileId < 4)
+        {
+            if(!_debug ||
+               fileId == 0)
+                return ErrorNumber.InvalidArgument;
+
+            // Only MDDF contains an extended attributes
+            if(fileId == FILEID_MDDF)
+                if(xattr == "com.apple.lisa.password")
+                {
+                    buf = Encoding.ASCII.GetBytes(_mddf.password);
 
                     return ErrorNumber.NoError;
-                case "com.apple.lisa.serial" when file.serial > 0:
-                    buf = Encoding.ASCII.GetBytes(file.serial.ToString());
-
-                    return ErrorNumber.NoError;
-            }
-
-            if(!ArrayHelpers.ArrayIsNullOrEmpty(file.LisaInfo) &&
-               xattr == "com.apple.lisa.label")
-            {
-                buf = new byte[128];
-                Array.Copy(file.LisaInfo, 0, buf, 0, 128);
-
-                return ErrorNumber.NoError;
-            }
+                }
 
+            // But on debug mode even system files contain tags
             if(_debug && xattr == "com.apple.lisa.tags")
-                return ReadFile(fileId, out buf, true);
+                return ReadSystemFile(fileId, out buf, true);
 
             return ErrorNumber.NoSuchExtendedAttribute;
         }
 
-        /// <summary>Decodes a sector tag. Not tested with 24-byte tags.</summary>
-        /// <returns>Error number.</returns>
-        /// <param name="tag">Sector tag.</param>
-        /// <param name="decoded">Decoded sector tag.</param>
-        static ErrorNumber DecodeTag(byte[] tag, out LisaTag.PriamTag decoded)
+        // Search for the file
+        ErrorNumber error = ReadExtentsFile(fileId, out ExtentFile file);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        switch(xattr)
         {
-            decoded = new LisaTag.PriamTag();
-            LisaTag.PriamTag? pmTag = LisaTag.DecodeTag(tag);
+            case "com.apple.lisa.password" when file.password_valid > 0:
+                buf = new byte[8];
+                Array.Copy(file.password, 0, buf, 0, 8);
 
-            if(!pmTag.HasValue)
-                return ErrorNumber.InvalidArgument;
+                return ErrorNumber.NoError;
+            case "com.apple.lisa.serial" when file.serial > 0:
+                buf = Encoding.ASCII.GetBytes(file.serial.ToString());
 
-            decoded = pmTag.Value;
+                return ErrorNumber.NoError;
+        }
+
+        if(!ArrayHelpers.ArrayIsNullOrEmpty(file.LisaInfo) &&
+           xattr == "com.apple.lisa.label")
+        {
+            buf = new byte[128];
+            Array.Copy(file.LisaInfo, 0, buf, 0, 128);
 
             return ErrorNumber.NoError;
         }
+
+        if(_debug && xattr == "com.apple.lisa.tags")
+            return ReadFile(fileId, out buf, true);
+
+        return ErrorNumber.NoSuchExtendedAttribute;
+    }
+
+    /// <summary>Decodes a sector tag. Not tested with 24-byte tags.</summary>
+    /// <returns>Error number.</returns>
+    /// <param name="tag">Sector tag.</param>
+    /// <param name="decoded">Decoded sector tag.</param>
+    static ErrorNumber DecodeTag(byte[] tag, out LisaTag.PriamTag decoded)
+    {
+        decoded = new LisaTag.PriamTag();
+        LisaTag.PriamTag? pmTag = LisaTag.DecodeTag(tag);
+
+        if(!pmTag.HasValue)
+            return ErrorNumber.InvalidArgument;
+
+        decoded = pmTag.Value;
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Locus.cs b/Aaru.Filesystems/Locus.cs
index 659b07ce8..4dacdef44 100644
--- a/Aaru.Filesystems/Locus.cs
+++ b/Aaru.Filesystems/Locus.cs
@@ -66,361 +66,360 @@ using time_t = System.Int32;
 // ReSharper disable UnusedMember.Local
 // ReSharper disable UnusedType.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the Locus filesystem</summary>
+public sealed class Locus : IFilesystem
 {
+    const int NICINOD    = 325;
+    const int NICFREE    = 600;
+    const int OLDNICINOD = 700;
+    const int OLDNICFREE = 500;
+
+    const uint LOCUS_MAGIC     = 0xFFEEDDCD;
+    const uint LOCUS_CIGAM     = 0xCDDDEEFF;
+    const uint LOCUS_MAGIC_OLD = 0xFFEEDDCC;
+    const uint LOCUS_CIGAM_OLD = 0xCCDDEEFF;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the Locus filesystem</summary>
-    public sealed class Locus : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Locus Filesystem Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("1A70B30A-437D-479A-88E1-D0C9C1797FF4");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const int NICINOD    = 325;
-        const int NICFREE    = 600;
-        const int OLDNICINOD = 700;
-        const int OLDNICFREE = 500;
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
 
-        const uint LOCUS_MAGIC     = 0xFFEEDDCD;
-        const uint LOCUS_CIGAM     = 0xCDDDEEFF;
-        const uint LOCUS_MAGIC_OLD = 0xFFEEDDCC;
-        const uint LOCUS_CIGAM_OLD = 0xCCDDEEFF;
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Locus Filesystem Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("1A70B30A-437D-479A-88E1-D0C9C1797FF4");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        for(ulong location = 0; location <= 8; location++)
         {
-            if(imagePlugin.Info.SectorSize < 512)
+            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            if(partition.Start + location + sbSize >= imagePlugin.Info.Sectors)
+                break;
+
+            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
                 return false;
 
-            for(ulong location = 0; location <= 8; location++)
-            {
-                uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+            if(sector.Length < Marshal.SizeOf<Superblock>())
+                return false;
 
-                if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                    sbSize++;
+            Superblock locusSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
 
-                if(partition.Start + location + sbSize >= imagePlugin.Info.Sectors)
-                    break;
+            AaruConsole.DebugWriteLine("Locus plugin", "magic at {1} = 0x{0:X8}", locusSb.s_magic, location);
 
-                ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                if(sector.Length < Marshal.SizeOf<Superblock>())
-                    return false;
-
-                Superblock locusSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-                AaruConsole.DebugWriteLine("Locus plugin", "magic at {1} = 0x{0:X8}", locusSb.s_magic, location);
-
-                if(locusSb.s_magic == LOCUS_MAGIC     ||
-                   locusSb.s_magic == LOCUS_CIGAM     ||
-                   locusSb.s_magic == LOCUS_MAGIC_OLD ||
-                   locusSb.s_magic == LOCUS_CIGAM_OLD)
-                    return true;
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-
-            if(imagePlugin.Info.SectorSize < 512)
-                return;
-
-            var    locusSb = new Superblock();
-            byte[] sector  = null;
-
-            for(ulong location = 0; location <= 8; location++)
-            {
-                uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
-
-                if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                    sbSize++;
-
-                ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                if(sector.Length < Marshal.SizeOf<Superblock>())
-                    return;
-
-                locusSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-                if(locusSb.s_magic == LOCUS_MAGIC     ||
-                   locusSb.s_magic == LOCUS_CIGAM     ||
-                   locusSb.s_magic == LOCUS_MAGIC_OLD ||
-                   locusSb.s_magic == LOCUS_CIGAM_OLD)
-                    break;
-            }
-
-            // We don't care about old version for information
-            if(locusSb.s_magic != LOCUS_MAGIC     &&
-               locusSb.s_magic != LOCUS_CIGAM     &&
-               locusSb.s_magic != LOCUS_MAGIC_OLD &&
-               locusSb.s_magic != LOCUS_CIGAM_OLD)
-                return;
-
-            // Numerical arrays are not important for information so no need to swap them
-            if(locusSb.s_magic == LOCUS_CIGAM ||
+            if(locusSb.s_magic == LOCUS_MAGIC     ||
+               locusSb.s_magic == LOCUS_CIGAM     ||
+               locusSb.s_magic == LOCUS_MAGIC_OLD ||
                locusSb.s_magic == LOCUS_CIGAM_OLD)
-            {
-                locusSb         = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
-                locusSb.s_flags = (Flags)Swapping.Swap((ushort)locusSb.s_flags);
-            }
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine(locusSb.s_magic == LOCUS_MAGIC_OLD ? "Locus filesystem (old)" : "Locus filesystem");
-
-            int blockSize = locusSb.s_version == Version.SB_SB4096 ? 4096 : 1024;
-
-            // ReSharper disable once InconsistentNaming
-            string s_fsmnt = StringHandlers.CToString(locusSb.s_fsmnt, Encoding);
-
-            // ReSharper disable once InconsistentNaming
-            string s_fpack = StringHandlers.CToString(locusSb.s_fpack, Encoding);
-
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_magic = 0x{0:X8}", locusSb.s_magic);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_gfs = {0}", locusSb.s_gfs);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fsize = {0}", locusSb.s_fsize);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_lwm = {0}", locusSb.s_lwm);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_hwm = {0}", locusSb.s_hwm);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_llst = {0}", locusSb.s_llst);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fstore = {0}", locusSb.s_fstore);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_time = {0}", locusSb.s_time);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_tfree = {0}", locusSb.s_tfree);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_isize = {0}", locusSb.s_isize);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_nfree = {0}", locusSb.s_nfree);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_flags = {0}", locusSb.s_flags);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_tinode = {0}", locusSb.s_tinode);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_lasti = {0}", locusSb.s_lasti);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_nbehind = {0}", locusSb.s_nbehind);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_gfspack = {0}", locusSb.s_gfspack);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_ninode = {0}", locusSb.s_ninode);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_flock = {0}", locusSb.s_flock);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_ilock = {0}", locusSb.s_ilock);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fmod = {0}", locusSb.s_fmod);
-            AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_version = {0}", locusSb.s_version);
-
-            sb.AppendFormat("Superblock last modified on {0}", DateHandlers.UnixToDateTime(locusSb.s_time)).
-               AppendLine();
-
-            sb.AppendFormat("Volume has {0} blocks of {1} bytes each (total {2} bytes)", locusSb.s_fsize, blockSize,
-                            locusSb.s_fsize * blockSize).AppendLine();
-
-            sb.AppendFormat("{0} blocks free ({1} bytes)", locusSb.s_tfree, locusSb.s_tfree * blockSize).AppendLine();
-            sb.AppendFormat("I-node list uses {0} blocks", locusSb.s_isize).AppendLine();
-            sb.AppendFormat("{0} free inodes", locusSb.s_tinode).AppendLine();
-            sb.AppendFormat("Next free inode search will start at inode {0}", locusSb.s_lasti).AppendLine();
-
-            sb.AppendFormat("There are an estimate of {0} free inodes before next search start", locusSb.s_nbehind).
-               AppendLine();
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_RDONLY))
-                sb.AppendLine("Read-only volume");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_CLEAN))
-                sb.AppendLine("Clean volume");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_DIRTY))
-                sb.AppendLine("Dirty volume");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_RMV))
-                sb.AppendLine("Removable volume");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_PRIMPACK))
-                sb.AppendLine("This is the primary pack");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_REPLTYPE))
-                sb.AppendLine("Replicated volume");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_USER))
-                sb.AppendLine("User replicated volume");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_BACKBONE))
-                sb.AppendLine("Backbone volume");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_NFS))
-                sb.AppendLine("NFS volume");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_BYHAND))
-                sb.AppendLine("Volume inhibits automatic fsck");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_NOSUID))
-                sb.AppendLine("Set-uid/set-gid is disabled");
-
-            if(locusSb.s_flags.HasFlag(Flags.SB_SYNCW))
-                sb.AppendLine("Volume uses synchronous writes");
-
-            sb.AppendFormat("Volume label: {0}", s_fsmnt).AppendLine();
-            sb.AppendFormat("Physical volume name: {0}", s_fpack).AppendLine();
-            sb.AppendFormat("Global File System number: {0}", locusSb.s_gfs).AppendLine();
-            sb.AppendFormat("Global File System pack number {0}", locusSb.s_gfspack).AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type        = "Locus filesystem",
-                ClusterSize = (uint)blockSize,
-                Clusters    = (ulong)locusSb.s_fsize,
-
-                // Sometimes it uses one, or the other. Use the bigger
-                VolumeName = string.IsNullOrEmpty(s_fsmnt) ? s_fpack : s_fsmnt,
-                ModificationDate = DateHandlers.UnixToDateTime(locusSb.s_time),
-                ModificationDateSpecified = true,
-                Dirty = !locusSb.s_flags.HasFlag(Flags.SB_CLEAN) || locusSb.s_flags.HasFlag(Flags.SB_DIRTY),
-                FreeClusters = (ulong)locusSb.s_tfree,
-                FreeClustersSpecified = true
-            };
+                return true;
         }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
-         StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Superblock
+        return false;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        var    locusSb = new Superblock();
+        byte[] sector  = null;
+
+        for(ulong location = 0; location <= 8; location++)
         {
-            public readonly uint s_magic; /* identifies this as a locus filesystem */
-            /* defined as a constant below */
-            public readonly gfs_t   s_gfs;   /* global filesystem number */
-            public readonly daddr_t s_fsize; /* size in blocks of entire volume */
-            /* several ints for replicated filesystems */
-            public readonly commitcnt_t s_lwm; /* all prior commits propagated */
-            public readonly commitcnt_t s_hwm; /* highest commit propagated */
-            /* oldest committed version in the list.
-             * llst mod NCMTLST is the offset of commit #llst in the list,
-             * which wraps around from there.
-             */
-            public readonly commitcnt_t s_llst;
-            public readonly fstore_t s_fstore; /* filesystem storage bit mask; if the
+            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            if(sector.Length < Marshal.SizeOf<Superblock>())
+                return;
+
+            locusSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+            if(locusSb.s_magic == LOCUS_MAGIC     ||
+               locusSb.s_magic == LOCUS_CIGAM     ||
+               locusSb.s_magic == LOCUS_MAGIC_OLD ||
+               locusSb.s_magic == LOCUS_CIGAM_OLD)
+                break;
+        }
+
+        // We don't care about old version for information
+        if(locusSb.s_magic != LOCUS_MAGIC     &&
+           locusSb.s_magic != LOCUS_CIGAM     &&
+           locusSb.s_magic != LOCUS_MAGIC_OLD &&
+           locusSb.s_magic != LOCUS_CIGAM_OLD)
+            return;
+
+        // Numerical arrays are not important for information so no need to swap them
+        if(locusSb.s_magic == LOCUS_CIGAM ||
+           locusSb.s_magic == LOCUS_CIGAM_OLD)
+        {
+            locusSb         = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
+            locusSb.s_flags = (Flags)Swapping.Swap((ushort)locusSb.s_flags);
+        }
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine(locusSb.s_magic == LOCUS_MAGIC_OLD ? "Locus filesystem (old)" : "Locus filesystem");
+
+        int blockSize = locusSb.s_version == Version.SB_SB4096 ? 4096 : 1024;
+
+        // ReSharper disable once InconsistentNaming
+        string s_fsmnt = StringHandlers.CToString(locusSb.s_fsmnt, Encoding);
+
+        // ReSharper disable once InconsistentNaming
+        string s_fpack = StringHandlers.CToString(locusSb.s_fpack, Encoding);
+
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_magic = 0x{0:X8}", locusSb.s_magic);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_gfs = {0}", locusSb.s_gfs);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fsize = {0}", locusSb.s_fsize);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_lwm = {0}", locusSb.s_lwm);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_hwm = {0}", locusSb.s_hwm);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_llst = {0}", locusSb.s_llst);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fstore = {0}", locusSb.s_fstore);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_time = {0}", locusSb.s_time);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_tfree = {0}", locusSb.s_tfree);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_isize = {0}", locusSb.s_isize);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_nfree = {0}", locusSb.s_nfree);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_flags = {0}", locusSb.s_flags);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_tinode = {0}", locusSb.s_tinode);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_lasti = {0}", locusSb.s_lasti);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_nbehind = {0}", locusSb.s_nbehind);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_gfspack = {0}", locusSb.s_gfspack);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_ninode = {0}", locusSb.s_ninode);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_flock = {0}", locusSb.s_flock);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_ilock = {0}", locusSb.s_ilock);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_fmod = {0}", locusSb.s_fmod);
+        AaruConsole.DebugWriteLine("Locus plugin", "LocusSb.s_version = {0}", locusSb.s_version);
+
+        sb.AppendFormat("Superblock last modified on {0}", DateHandlers.UnixToDateTime(locusSb.s_time)).
+           AppendLine();
+
+        sb.AppendFormat("Volume has {0} blocks of {1} bytes each (total {2} bytes)", locusSb.s_fsize, blockSize,
+                        locusSb.s_fsize * blockSize).AppendLine();
+
+        sb.AppendFormat("{0} blocks free ({1} bytes)", locusSb.s_tfree, locusSb.s_tfree * blockSize).AppendLine();
+        sb.AppendFormat("I-node list uses {0} blocks", locusSb.s_isize).AppendLine();
+        sb.AppendFormat("{0} free inodes", locusSb.s_tinode).AppendLine();
+        sb.AppendFormat("Next free inode search will start at inode {0}", locusSb.s_lasti).AppendLine();
+
+        sb.AppendFormat("There are an estimate of {0} free inodes before next search start", locusSb.s_nbehind).
+           AppendLine();
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_RDONLY))
+            sb.AppendLine("Read-only volume");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_CLEAN))
+            sb.AppendLine("Clean volume");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_DIRTY))
+            sb.AppendLine("Dirty volume");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_RMV))
+            sb.AppendLine("Removable volume");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_PRIMPACK))
+            sb.AppendLine("This is the primary pack");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_REPLTYPE))
+            sb.AppendLine("Replicated volume");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_USER))
+            sb.AppendLine("User replicated volume");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_BACKBONE))
+            sb.AppendLine("Backbone volume");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_NFS))
+            sb.AppendLine("NFS volume");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_BYHAND))
+            sb.AppendLine("Volume inhibits automatic fsck");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_NOSUID))
+            sb.AppendLine("Set-uid/set-gid is disabled");
+
+        if(locusSb.s_flags.HasFlag(Flags.SB_SYNCW))
+            sb.AppendLine("Volume uses synchronous writes");
+
+        sb.AppendFormat("Volume label: {0}", s_fsmnt).AppendLine();
+        sb.AppendFormat("Physical volume name: {0}", s_fpack).AppendLine();
+        sb.AppendFormat("Global File System number: {0}", locusSb.s_gfs).AppendLine();
+        sb.AppendFormat("Global File System pack number {0}", locusSb.s_gfspack).AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
+        {
+            Type        = "Locus filesystem",
+            ClusterSize = (uint)blockSize,
+            Clusters    = (ulong)locusSb.s_fsize,
+
+            // Sometimes it uses one, or the other. Use the bigger
+            VolumeName = string.IsNullOrEmpty(s_fsmnt) ? s_fpack : s_fsmnt,
+            ModificationDate = DateHandlers.UnixToDateTime(locusSb.s_time),
+            ModificationDateSpecified = true,
+            Dirty = !locusSb.s_flags.HasFlag(Flags.SB_CLEAN) || locusSb.s_flags.HasFlag(Flags.SB_DIRTY),
+            FreeClusters = (ulong)locusSb.s_tfree,
+            FreeClustersSpecified = true
+        };
+    }
+
+    [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
+     StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Superblock
+    {
+        public readonly uint s_magic; /* identifies this as a locus filesystem */
+        /* defined as a constant below */
+        public readonly gfs_t   s_gfs;   /* global filesystem number */
+        public readonly daddr_t s_fsize; /* size in blocks of entire volume */
+        /* several ints for replicated filesystems */
+        public readonly commitcnt_t s_lwm; /* all prior commits propagated */
+        public readonly commitcnt_t s_hwm; /* highest commit propagated */
+        /* oldest committed version in the list.
+         * llst mod NCMTLST is the offset of commit #llst in the list,
+         * which wraps around from there.
+         */
+        public readonly commitcnt_t s_llst;
+        public readonly fstore_t s_fstore; /* filesystem storage bit mask; if the
                    filsys is replicated and this is not a
                    primary or backbone copy, this bit mask
                    determines which files are stored */
 
-            public readonly time_t  s_time;  /* last super block update */
-            public readonly daddr_t s_tfree; /* total free blocks*/
+        public readonly time_t  s_time;  /* last super block update */
+        public readonly daddr_t s_tfree; /* total free blocks*/
 
-            public readonly ino_t   s_isize;   /* size in blocks of i-list */
-            public readonly short   s_nfree;   /* number of addresses in s_free */
-            public          Flags   s_flags;   /* filsys flags, defined below */
-            public readonly ino_t   s_tinode;  /* total free inodes */
-            public readonly ino_t   s_lasti;   /* start place for circular search */
-            public readonly ino_t   s_nbehind; /* est # free inodes before s_lasti */
-            public readonly pckno_t s_gfspack; /* global filesystem pack number */
-            public readonly short   s_ninode;  /* number of i-nodes in s_inode */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly short[] s_dinfo; /* interleave stuff */
+        public readonly ino_t   s_isize;   /* size in blocks of i-list */
+        public readonly short   s_nfree;   /* number of addresses in s_free */
+        public          Flags   s_flags;   /* filsys flags, defined below */
+        public readonly ino_t   s_tinode;  /* total free inodes */
+        public readonly ino_t   s_lasti;   /* start place for circular search */
+        public readonly ino_t   s_nbehind; /* est # free inodes before s_lasti */
+        public readonly pckno_t s_gfspack; /* global filesystem pack number */
+        public readonly short   s_ninode;  /* number of i-nodes in s_inode */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly short[] s_dinfo; /* interleave stuff */
 
-            //#define s_m s_dinfo[0]
-            //#define s_skip  s_dinfo[0]      /* AIX defines  */
-            //#define s_n s_dinfo[1]
-            //#define s_cyl   s_dinfo[1]      /* AIX defines  */
-            public readonly byte    s_flock;   /* lock during free list manipulation */
-            public readonly byte    s_ilock;   /* lock during i-list manipulation */
-            public readonly byte    s_fmod;    /* super block modified flag */
-            public readonly Version s_version; /* version of the data format in fs. */
-            /*  defined below. */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] s_fsmnt; /* name of this file system */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] s_fpack; /* name of this physical volume */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NICINOD)]
-            public readonly ino_t[] s_inode; /* free i-node list */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NICFREE)]
-            public readonly daddr_t[] su_free; /* free block list for non-replicated filsys */
-            public readonly byte s_byteorder;  /* byte order of integers */
-        }
+        //#define s_m s_dinfo[0]
+        //#define s_skip  s_dinfo[0]      /* AIX defines  */
+        //#define s_n s_dinfo[1]
+        //#define s_cyl   s_dinfo[1]      /* AIX defines  */
+        public readonly byte    s_flock;   /* lock during free list manipulation */
+        public readonly byte    s_ilock;   /* lock during i-list manipulation */
+        public readonly byte    s_fmod;    /* super block modified flag */
+        public readonly Version s_version; /* version of the data format in fs. */
+        /*  defined below. */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] s_fsmnt; /* name of this file system */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] s_fpack; /* name of this physical volume */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NICINOD)]
+        public readonly ino_t[] s_inode; /* free i-node list */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NICFREE)]
+        public readonly daddr_t[] su_free; /* free block list for non-replicated filsys */
+        public readonly byte s_byteorder;  /* byte order of integers */
+    }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
-         StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct OldSuperblock
-        {
-            public readonly uint s_magic; /* identifies this as a locus filesystem */
-            /* defined as a constant below */
-            public readonly gfs_t   s_gfs;   /* global filesystem number */
-            public readonly daddr_t s_fsize; /* size in blocks of entire volume */
-            /* several ints for replicated filsystems */
-            public readonly commitcnt_t s_lwm; /* all prior commits propagated */
-            public readonly commitcnt_t s_hwm; /* highest commit propagated */
-            /* oldest committed version in the list.
-             * llst mod NCMTLST is the offset of commit #llst in the list,
-             * which wraps around from there.
-             */
-            public readonly commitcnt_t s_llst;
-            public readonly fstore_t s_fstore; /* filesystem storage bit mask; if the
+    [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
+     StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct OldSuperblock
+    {
+        public readonly uint s_magic; /* identifies this as a locus filesystem */
+        /* defined as a constant below */
+        public readonly gfs_t   s_gfs;   /* global filesystem number */
+        public readonly daddr_t s_fsize; /* size in blocks of entire volume */
+        /* several ints for replicated filsystems */
+        public readonly commitcnt_t s_lwm; /* all prior commits propagated */
+        public readonly commitcnt_t s_hwm; /* highest commit propagated */
+        /* oldest committed version in the list.
+         * llst mod NCMTLST is the offset of commit #llst in the list,
+         * which wraps around from there.
+         */
+        public readonly commitcnt_t s_llst;
+        public readonly fstore_t s_fstore; /* filesystem storage bit mask; if the
                    filsys is replicated and this is not a
                    primary or backbone copy, this bit mask
                    determines which files are stored */
 
-            public readonly time_t  s_time;  /* last super block update */
-            public readonly daddr_t s_tfree; /* total free blocks*/
+        public readonly time_t  s_time;  /* last super block update */
+        public readonly daddr_t s_tfree; /* total free blocks*/
 
-            public readonly ino_t   s_isize;   /* size in blocks of i-list */
-            public readonly short   s_nfree;   /* number of addresses in s_free */
-            public readonly Flags   s_flags;   /* filsys flags, defined below */
-            public readonly ino_t   s_tinode;  /* total free inodes */
-            public readonly ino_t   s_lasti;   /* start place for circular search */
-            public readonly ino_t   s_nbehind; /* est # free inodes before s_lasti */
-            public readonly pckno_t s_gfspack; /* global filesystem pack number */
-            public readonly short   s_ninode;  /* number of i-nodes in s_inode */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly short[] s_dinfo; /* interleave stuff */
+        public readonly ino_t   s_isize;   /* size in blocks of i-list */
+        public readonly short   s_nfree;   /* number of addresses in s_free */
+        public readonly Flags   s_flags;   /* filsys flags, defined below */
+        public readonly ino_t   s_tinode;  /* total free inodes */
+        public readonly ino_t   s_lasti;   /* start place for circular search */
+        public readonly ino_t   s_nbehind; /* est # free inodes before s_lasti */
+        public readonly pckno_t s_gfspack; /* global filesystem pack number */
+        public readonly short   s_ninode;  /* number of i-nodes in s_inode */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly short[] s_dinfo; /* interleave stuff */
 
-            //#define s_m s_dinfo[0]
-            //#define s_skip  s_dinfo[0]      /* AIX defines  */
-            //#define s_n s_dinfo[1]
-            //#define s_cyl   s_dinfo[1]      /* AIX defines  */
-            public readonly byte    s_flock;   /* lock during free list manipulation */
-            public readonly byte    s_ilock;   /* lock during i-list manipulation */
-            public readonly byte    s_fmod;    /* super block modified flag */
-            public readonly Version s_version; /* version of the data format in fs. */
-            /*  defined below. */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] s_fsmnt; /* name of this file system */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] s_fpack; /* name of this physical volume */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = OLDNICINOD)]
-            public readonly ino_t[] s_inode; /* free i-node list */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = OLDNICFREE)]
-            public readonly daddr_t[] su_free; /* free block list for non-replicated filsys */
-            public readonly byte s_byteorder;  /* byte order of integers */
-        }
+        //#define s_m s_dinfo[0]
+        //#define s_skip  s_dinfo[0]      /* AIX defines  */
+        //#define s_n s_dinfo[1]
+        //#define s_cyl   s_dinfo[1]      /* AIX defines  */
+        public readonly byte    s_flock;   /* lock during free list manipulation */
+        public readonly byte    s_ilock;   /* lock during i-list manipulation */
+        public readonly byte    s_fmod;    /* super block modified flag */
+        public readonly Version s_version; /* version of the data format in fs. */
+        /*  defined below. */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] s_fsmnt; /* name of this file system */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] s_fpack; /* name of this physical volume */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = OLDNICINOD)]
+        public readonly ino_t[] s_inode; /* free i-node list */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = OLDNICFREE)]
+        public readonly daddr_t[] su_free; /* free block list for non-replicated filsys */
+        public readonly byte s_byteorder;  /* byte order of integers */
+    }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
-         Flags]
-        enum Flags : ushort
-        {
-            SB_RDONLY   = 0x1, /* no writes on filesystem */ SB_CLEAN = 0x2, /* fs unmounted cleanly (or checks run) */
-            SB_DIRTY    = 0x4, /* fs mounted without CLEAN bit set */ SB_RMV = 0x8, /* fs is a removable file system */
-            SB_PRIMPACK = 0x10, /* This is the primary pack of the filesystem */
-            SB_REPLTYPE = 0x20, /* This is a replicated type filesystem. */
-            SB_USER     = 0x40, /* This is a "user" replicated filesystem. */
-            SB_BACKBONE = 0x80, /* backbone pack ; complete copy of primary pack but not modifiable */
-            SB_NFS      = 0x100, /* This is a NFS type filesystem */
-            SB_BYHAND   = 0x200, /* Inhibits automatic fscks on a mangled file system */
-            SB_NOSUID   = 0x400, /* Set-uid/Set-gid is disabled */ SB_SYNCW = 0x800 /* Synchronous Write */
-        }
+    [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
+     Flags]
+    enum Flags : ushort
+    {
+        SB_RDONLY   = 0x1, /* no writes on filesystem */ SB_CLEAN = 0x2, /* fs unmounted cleanly (or checks run) */
+        SB_DIRTY    = 0x4, /* fs mounted without CLEAN bit set */ SB_RMV = 0x8, /* fs is a removable file system */
+        SB_PRIMPACK = 0x10, /* This is the primary pack of the filesystem */
+        SB_REPLTYPE = 0x20, /* This is a replicated type filesystem. */
+        SB_USER     = 0x40, /* This is a "user" replicated filesystem. */
+        SB_BACKBONE = 0x80, /* backbone pack ; complete copy of primary pack but not modifiable */
+        SB_NFS      = 0x100, /* This is a NFS type filesystem */
+        SB_BYHAND   = 0x200, /* Inhibits automatic fscks on a mangled file system */
+        SB_NOSUID   = 0x400, /* Set-uid/Set-gid is disabled */ SB_SYNCW = 0x800 /* Synchronous Write */
+    }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
-         Flags]
-        enum Version : byte
-        {
-            SB_SB4096 = 1, /* smallblock filesys with 4096 byte blocks */ SB_B1024 = 2, /* 1024 byte block filesystem */
-            NUMSCANDEV = 5 /* Used by scangfs(), refed in space.h */
-        }
+    [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle"),
+     Flags]
+    enum Version : byte
+    {
+        SB_SB4096  = 1, /* smallblock filesys with 4096 byte blocks */ SB_B1024 = 2, /* 1024 byte block filesystem */
+        NUMSCANDEV = 5 /* Used by scangfs(), refed in space.h */
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/MicroDOS.cs b/Aaru.Filesystems/MicroDOS.cs
index 8e99212da..5f8788c7f 100644
--- a/Aaru.Filesystems/MicroDOS.cs
+++ b/Aaru.Filesystems/MicroDOS.cs
@@ -42,144 +42,143 @@ using Marshal = Aaru.Helpers.Marshal;
 // ReSharper disable UnusedType.Local
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>
+///     Implements detection for the MicroDOS filesystem. Information from http://www.owg.ru/mkt/BK/MKDOS.TXT Thanks
+///     to tarlabnor for translating it
+/// </summary>
+public sealed class MicroDOS : IFilesystem
 {
+    const ushort MAGIC  = 0xA72E;
+    const ushort MAGIC2 = 0x530C;
+
     /// <inheritdoc />
-    /// <summary>
-    ///     Implements detection for the MicroDOS filesystem. Information from http://www.owg.ru/mkt/BK/MKDOS.TXT Thanks
-    ///     to tarlabnor for translating it
-    /// </summary>
-    public sealed class MicroDOS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "MicroDOS file system";
+    /// <inheritdoc />
+    public Guid Id => new("9F9A364A-1A27-48A3-B730-7A7122000324");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const ushort MAGIC  = 0xA72E;
-        const ushort MAGIC2 = 0x530C;
+        if(1 + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "MicroDOS file system";
-        /// <inheritdoc />
-        public Guid Id => new("9F9A364A-1A27-48A3-B730-7A7122000324");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bk0);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        Block0 block0 = Marshal.ByteArrayToStructureLittleEndian<Block0>(bk0);
+
+        return block0.label == MAGIC && block0.mklabel == MAGIC2;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("koi8-r");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bk0);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        Block0 block0 = Marshal.ByteArrayToStructureLittleEndian<Block0>(bk0);
+
+        sb.AppendLine("MicroDOS filesystem");
+        sb.AppendFormat("Volume has {0} blocks ({1} bytes)", block0.blocks, block0.blocks * 512).AppendLine();
+
+        sb.AppendFormat("Volume has {0} blocks used ({1} bytes)", block0.usedBlocks, block0.usedBlocks * 512).
+           AppendLine();
+
+        sb.AppendFormat("Volume contains {0} files", block0.files).AppendLine();
+        sb.AppendFormat("First used block is {0}", block0.firstUsedBlock).AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            if(1 + partition.Start >= partition.End)
-                return false;
+            Type                  = "MicroDOS",
+            ClusterSize           = 512,
+            Clusters              = block0.blocks,
+            Files                 = block0.files,
+            FilesSpecified        = true,
+            FreeClusters          = (ulong)(block0.blocks - block0.usedBlocks),
+            FreeClustersSpecified = true
+        };
 
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
+        information = sb.ToString();
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bk0);
+    // Followed by directory entries
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Block0
+    {
+        /// <summary>BK starts booting here</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
+        public readonly byte[] bootCode;
+        /// <summary>Number of files in directory</summary>
+        public readonly ushort files;
+        /// <summary>Total number of blocks in files of the directory</summary>
+        public readonly ushort usedBlocks;
+        /// <summary>Unknown</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 228)]
+        public readonly byte[] unknown;
+        /// <summary>Ownership label (label that shows it belongs to Micro DOS format)</summary>
+        public readonly ushort label;
+        /// <summary>MK-DOS directory format label</summary>
+        public readonly ushort mklabel;
+        /// <summary>Unknown</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 50)]
+        public readonly byte[] unknown2;
+        /// <summary>
+        ///     Disk size in blocks (absolute value for the system unlike NORD, NORTON etc.) that doesn't use two fixed values
+        ///     40 or 80 tracks, but i.e. if you drive works with 76 tracks this field will contain an appropriate number of blocks
+        /// </summary>
+        public readonly ushort blocks;
+        /// <summary> Number of the first file's block. Value is changable</summary>
+        public readonly ushort firstUsedBlock;
+        /// <summary>Unknown</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] unknown3;
+    }
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryEntry
+    {
+        /// <summary>File status</summary>
+        public readonly byte status;
+        /// <summary>Directory number (0 - root)</summary>
+        public readonly byte directory;
+        /// <summary>File name 14. symbols in ASCII KOI8</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] filename;
+        /// <summary>Block number</summary>
+        public readonly ushort blockNo;
+        /// <summary>Length in blocks</summary>
+        public readonly ushort blocks;
+        /// <summary>Address</summary>
+        public readonly ushort address;
+        /// <summary>Length</summary>
+        public readonly ushort length;
+    }
 
-            Block0 block0 = Marshal.ByteArrayToStructureLittleEndian<Block0>(bk0);
-
-            return block0.label == MAGIC && block0.mklabel == MAGIC2;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("koi8-r");
-            information = "";
-
-            var sb = new StringBuilder();
-
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bk0);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            Block0 block0 = Marshal.ByteArrayToStructureLittleEndian<Block0>(bk0);
-
-            sb.AppendLine("MicroDOS filesystem");
-            sb.AppendFormat("Volume has {0} blocks ({1} bytes)", block0.blocks, block0.blocks * 512).AppendLine();
-
-            sb.AppendFormat("Volume has {0} blocks used ({1} bytes)", block0.usedBlocks, block0.usedBlocks * 512).
-               AppendLine();
-
-            sb.AppendFormat("Volume contains {0} files", block0.files).AppendLine();
-            sb.AppendFormat("First used block is {0}", block0.firstUsedBlock).AppendLine();
-
-            XmlFsType = new FileSystemType
-            {
-                Type                  = "MicroDOS",
-                ClusterSize           = 512,
-                Clusters              = block0.blocks,
-                Files                 = block0.files,
-                FilesSpecified        = true,
-                FreeClusters          = (ulong)(block0.blocks - block0.usedBlocks),
-                FreeClustersSpecified = true
-            };
-
-            information = sb.ToString();
-        }
-
-        // Followed by directory entries
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Block0
-        {
-            /// <summary>BK starts booting here</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
-            public readonly byte[] bootCode;
-            /// <summary>Number of files in directory</summary>
-            public readonly ushort files;
-            /// <summary>Total number of blocks in files of the directory</summary>
-            public readonly ushort usedBlocks;
-            /// <summary>Unknown</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 228)]
-            public readonly byte[] unknown;
-            /// <summary>Ownership label (label that shows it belongs to Micro DOS format)</summary>
-            public readonly ushort label;
-            /// <summary>MK-DOS directory format label</summary>
-            public readonly ushort mklabel;
-            /// <summary>Unknown</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 50)]
-            public readonly byte[] unknown2;
-            /// <summary>
-            ///     Disk size in blocks (absolute value for the system unlike NORD, NORTON etc.) that doesn't use two fixed values
-            ///     40 or 80 tracks, but i.e. if you drive works with 76 tracks this field will contain an appropriate number of blocks
-            /// </summary>
-            public readonly ushort blocks;
-            /// <summary> Number of the first file's block. Value is changable</summary>
-            public readonly ushort firstUsedBlock;
-            /// <summary>Unknown</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] unknown3;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryEntry
-        {
-            /// <summary>File status</summary>
-            public readonly byte status;
-            /// <summary>Directory number (0 - root)</summary>
-            public readonly byte directory;
-            /// <summary>File name 14. symbols in ASCII KOI8</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] filename;
-            /// <summary>Block number</summary>
-            public readonly ushort blockNo;
-            /// <summary>Length in blocks</summary>
-            public readonly ushort blocks;
-            /// <summary>Address</summary>
-            public readonly ushort address;
-            /// <summary>Length</summary>
-            public readonly ushort length;
-        }
-
-        enum FileStatus : byte
-        {
-            CommonFile = 0, Protected  = 1, LogicalDisk = 2,
-            BadFile    = 0x80, Deleted = 0xFF
-        }
+    enum FileStatus : byte
+    {
+        CommonFile = 0, Protected  = 1, LogicalDisk = 2,
+        BadFile    = 0x80, Deleted = 0xFF
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/MinixFS.cs b/Aaru.Filesystems/MinixFS.cs
index dd14c2db2..e2aed578f 100644
--- a/Aaru.Filesystems/MinixFS.cs
+++ b/Aaru.Filesystems/MinixFS.cs
@@ -39,360 +39,359 @@ using Aaru.CommonTypes.Interfaces;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from the Linux kernel
+/// <inheritdoc />
+/// <summary>Implements detection of the MINIX filesystem</summary>
+public sealed class MinixFS : IFilesystem
 {
-    // Information from the Linux kernel
+    /// <summary>Minix v1, 14 char filenames</summary>
+    const ushort MINIX_MAGIC = 0x137F;
+    /// <summary>Minix v1, 30 char filenames</summary>
+    const ushort MINIX_MAGIC2 = 0x138F;
+    /// <summary>Minix v2, 14 char filenames</summary>
+    const ushort MINIX2_MAGIC = 0x2468;
+    /// <summary>Minix v2, 30 char filenames</summary>
+    const ushort MINIX2_MAGIC2 = 0x2478;
+    /// <summary>Minix v3, 60 char filenames</summary>
+    const ushort MINIX3_MAGIC = 0x4D5A;
+
+    // Byteswapped
+    /// <summary>Minix v1, 14 char filenames</summary>
+    const ushort MINIX_CIGAM = 0x7F13;
+    /// <summary>Minix v1, 30 char filenames</summary>
+    const ushort MINIX_CIGAM2 = 0x8F13;
+    /// <summary>Minix v2, 14 char filenames</summary>
+    const ushort MINIX2_CIGAM = 0x6824;
+    /// <summary>Minix v2, 30 char filenames</summary>
+    const ushort MINIX2_CIGAM2 = 0x7824;
+    /// <summary>Minix v3, 60 char filenames</summary>
+    const ushort MINIX3_CIGAM = 0x5A4D;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the MINIX filesystem</summary>
-    public sealed class MinixFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Minix Filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("FE248C3B-B727-4AE5-A39F-79EA9A07D4B3");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>Minix v1, 14 char filenames</summary>
-        const ushort MINIX_MAGIC = 0x137F;
-        /// <summary>Minix v1, 30 char filenames</summary>
-        const ushort MINIX_MAGIC2 = 0x138F;
-        /// <summary>Minix v2, 14 char filenames</summary>
-        const ushort MINIX2_MAGIC = 0x2468;
-        /// <summary>Minix v2, 30 char filenames</summary>
-        const ushort MINIX2_MAGIC2 = 0x2478;
-        /// <summary>Minix v3, 60 char filenames</summary>
-        const ushort MINIX3_MAGIC = 0x4D5A;
+        uint sector = 2;
+        uint offset = 0;
 
-        // Byteswapped
-        /// <summary>Minix v1, 14 char filenames</summary>
-        const ushort MINIX_CIGAM = 0x7F13;
-        /// <summary>Minix v1, 30 char filenames</summary>
-        const ushort MINIX_CIGAM2 = 0x8F13;
-        /// <summary>Minix v2, 14 char filenames</summary>
-        const ushort MINIX2_CIGAM = 0x6824;
-        /// <summary>Minix v2, 30 char filenames</summary>
-        const ushort MINIX2_CIGAM2 = 0x7824;
-        /// <summary>Minix v3, 60 char filenames</summary>
-        const ushort MINIX3_CIGAM = 0x5A4D;
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Minix Filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("FE248C3B-B727-4AE5-A39F-79EA9A07D4B3");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
         {
-            uint sector = 2;
-            uint offset = 0;
-
-            if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
-            {
-                sector = 0;
-                offset = 0x400;
-            }
-
-            if(sector + partition.Start >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(sector + partition.Start, out byte[] minixSbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            // Optical media
-            if(offset > 0)
-            {
-                byte[] tmp = new byte[0x200];
-                Array.Copy(minixSbSector, offset, tmp, 0, 0x200);
-                minixSbSector = tmp;
-            }
-
-            ushort magic = BitConverter.ToUInt16(minixSbSector, 0x010);
-
-            if(magic == MINIX_MAGIC   ||
-               magic == MINIX_MAGIC2  ||
-               magic == MINIX2_MAGIC  ||
-               magic == MINIX2_MAGIC2 ||
-               magic == MINIX_CIGAM   ||
-               magic == MINIX_CIGAM2  ||
-               magic == MINIX2_CIGAM  ||
-               magic == MINIX2_CIGAM2)
-                return true;
-
-            magic = BitConverter.ToUInt16(minixSbSector, 0x018); // Here should reside magic number on Minix v3
-
-            return magic == MINIX_MAGIC  || magic == MINIX2_MAGIC || magic == MINIX3_MAGIC || magic == MINIX_CIGAM ||
-                   magic == MINIX2_CIGAM || magic == MINIX3_CIGAM;
+            sector = 0;
+            offset = 0x400;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        if(sector + partition.Start >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(sector + partition.Start, out byte[] minixSbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        // Optical media
+        if(offset > 0)
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
+            byte[] tmp = new byte[0x200];
+            Array.Copy(minixSbSector, offset, tmp, 0, 0x200);
+            minixSbSector = tmp;
+        }
 
-            var sb = new StringBuilder();
+        ushort magic = BitConverter.ToUInt16(minixSbSector, 0x010);
 
-            uint sector = 2;
-            uint offset = 0;
+        if(magic == MINIX_MAGIC   ||
+           magic == MINIX_MAGIC2  ||
+           magic == MINIX2_MAGIC  ||
+           magic == MINIX2_MAGIC2 ||
+           magic == MINIX_CIGAM   ||
+           magic == MINIX_CIGAM2  ||
+           magic == MINIX2_CIGAM  ||
+           magic == MINIX2_CIGAM2)
+            return true;
 
-            if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+        magic = BitConverter.ToUInt16(minixSbSector, 0x018); // Here should reside magic number on Minix v3
+
+        return magic == MINIX_MAGIC  || magic == MINIX2_MAGIC || magic == MINIX3_MAGIC || magic == MINIX_CIGAM ||
+               magic == MINIX2_CIGAM || magic == MINIX3_CIGAM;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        uint sector = 2;
+        uint offset = 0;
+
+        if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+        {
+            sector = 0;
+            offset = 0x400;
+        }
+
+        bool        minix3 = false;
+        int         filenamesize;
+        string      minixVersion;
+        ErrorNumber errno = imagePlugin.ReadSector(sector + partition.Start, out byte[] minixSbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        // Optical media
+        if(offset > 0)
+        {
+            byte[] tmp = new byte[0x200];
+            Array.Copy(minixSbSector, offset, tmp, 0, 0x200);
+            minixSbSector = tmp;
+        }
+
+        ushort magic = BitConverter.ToUInt16(minixSbSector, 0x018);
+
+        XmlFsType = new FileSystemType();
+
+        bool littleEndian;
+
+        if(magic == MINIX3_MAGIC ||
+           magic == MINIX3_CIGAM ||
+           magic == MINIX2_MAGIC ||
+           magic == MINIX2_CIGAM ||
+           magic == MINIX_MAGIC  ||
+           magic == MINIX_CIGAM)
+        {
+            filenamesize = 60;
+            littleEndian = magic != MINIX3_CIGAM || magic == MINIX2_CIGAM || magic == MINIX_CIGAM;
+
+            switch(magic)
             {
-                sector = 0;
-                offset = 0x400;
+                case MINIX3_MAGIC:
+                case MINIX3_CIGAM:
+                    minixVersion   = "Minix v3 filesystem";
+                    XmlFsType.Type = "Minix v3";
+
+                    break;
+                case MINIX2_MAGIC:
+                case MINIX2_CIGAM:
+                    minixVersion   = "Minix 3 v2 filesystem";
+                    XmlFsType.Type = "Minix 3 v2";
+
+                    break;
+                default:
+                    minixVersion   = "Minix 3 v1 filesystem";
+                    XmlFsType.Type = "Minix 3 v1";
+
+                    break;
             }
 
-            bool        minix3 = false;
-            int         filenamesize;
-            string      minixVersion;
-            ErrorNumber errno = imagePlugin.ReadSector(sector + partition.Start, out byte[] minixSbSector);
+            minix3 = true;
+        }
+        else
+        {
+            magic = BitConverter.ToUInt16(minixSbSector, 0x010);
 
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            // Optical media
-            if(offset > 0)
+            switch(magic)
             {
-                byte[] tmp = new byte[0x200];
-                Array.Copy(minixSbSector, offset, tmp, 0, 0x200);
-                minixSbSector = tmp;
+                case MINIX_MAGIC:
+                    filenamesize   = 14;
+                    minixVersion   = "Minix v1 filesystem";
+                    littleEndian   = true;
+                    XmlFsType.Type = "Minix v1";
+
+                    break;
+                case MINIX_MAGIC2:
+                    filenamesize   = 30;
+                    minixVersion   = "Minix v1 filesystem";
+                    littleEndian   = true;
+                    XmlFsType.Type = "Minix v1";
+
+                    break;
+                case MINIX2_MAGIC:
+                    filenamesize   = 14;
+                    minixVersion   = "Minix v2 filesystem";
+                    littleEndian   = true;
+                    XmlFsType.Type = "Minix v2";
+
+                    break;
+                case MINIX2_MAGIC2:
+                    filenamesize   = 30;
+                    minixVersion   = "Minix v2 filesystem";
+                    littleEndian   = true;
+                    XmlFsType.Type = "Minix v2";
+
+                    break;
+                case MINIX_CIGAM:
+                    filenamesize   = 14;
+                    minixVersion   = "Minix v1 filesystem";
+                    littleEndian   = false;
+                    XmlFsType.Type = "Minix v1";
+
+                    break;
+                case MINIX_CIGAM2:
+                    filenamesize   = 30;
+                    minixVersion   = "Minix v1 filesystem";
+                    littleEndian   = false;
+                    XmlFsType.Type = "Minix v1";
+
+                    break;
+                case MINIX2_CIGAM:
+                    filenamesize   = 14;
+                    minixVersion   = "Minix v2 filesystem";
+                    littleEndian   = false;
+                    XmlFsType.Type = "Minix v2";
+
+                    break;
+                case MINIX2_CIGAM2:
+                    filenamesize   = 30;
+                    minixVersion   = "Minix v2 filesystem";
+                    littleEndian   = false;
+                    XmlFsType.Type = "Minix v2";
+
+                    break;
+                default: return;
             }
+        }
 
-            ushort magic = BitConverter.ToUInt16(minixSbSector, 0x018);
+        if(minix3)
+        {
+            SuperBlock3 mnxSb = littleEndian ? Marshal.ByteArrayToStructureLittleEndian<SuperBlock3>(minixSbSector)
+                                    : Marshal.ByteArrayToStructureBigEndian<SuperBlock3>(minixSbSector);
 
-            XmlFsType = new FileSystemType();
+            if(magic != MINIX3_MAGIC &&
+               magic != MINIX3_CIGAM)
+                mnxSb.s_blocksize = 1024;
 
-            bool littleEndian;
+            sb.AppendLine(minixVersion);
+            sb.AppendFormat("{0} chars in filename", filenamesize).AppendLine();
 
-            if(magic == MINIX3_MAGIC ||
-               magic == MINIX3_CIGAM ||
-               magic == MINIX2_MAGIC ||
-               magic == MINIX2_CIGAM ||
-               magic == MINIX_MAGIC  ||
-               magic == MINIX_CIGAM)
-            {
-                filenamesize = 60;
-                littleEndian = magic != MINIX3_CIGAM || magic == MINIX2_CIGAM || magic == MINIX_CIGAM;
-
-                switch(magic)
-                {
-                    case MINIX3_MAGIC:
-                    case MINIX3_CIGAM:
-                        minixVersion   = "Minix v3 filesystem";
-                        XmlFsType.Type = "Minix v3";
-
-                        break;
-                    case MINIX2_MAGIC:
-                    case MINIX2_CIGAM:
-                        minixVersion   = "Minix 3 v2 filesystem";
-                        XmlFsType.Type = "Minix 3 v2";
-
-                        break;
-                    default:
-                        minixVersion   = "Minix 3 v1 filesystem";
-                        XmlFsType.Type = "Minix 3 v1";
-
-                        break;
-                }
-
-                minix3 = true;
-            }
+            if(mnxSb.s_zones > 0) // On V2
+                sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_zones, mnxSb.s_zones * 1024).
+                   AppendLine();
             else
-            {
-                magic = BitConverter.ToUInt16(minixSbSector, 0x010);
-
-                switch(magic)
-                {
-                    case MINIX_MAGIC:
-                        filenamesize   = 14;
-                        minixVersion   = "Minix v1 filesystem";
-                        littleEndian   = true;
-                        XmlFsType.Type = "Minix v1";
-
-                        break;
-                    case MINIX_MAGIC2:
-                        filenamesize   = 30;
-                        minixVersion   = "Minix v1 filesystem";
-                        littleEndian   = true;
-                        XmlFsType.Type = "Minix v1";
-
-                        break;
-                    case MINIX2_MAGIC:
-                        filenamesize   = 14;
-                        minixVersion   = "Minix v2 filesystem";
-                        littleEndian   = true;
-                        XmlFsType.Type = "Minix v2";
-
-                        break;
-                    case MINIX2_MAGIC2:
-                        filenamesize   = 30;
-                        minixVersion   = "Minix v2 filesystem";
-                        littleEndian   = true;
-                        XmlFsType.Type = "Minix v2";
-
-                        break;
-                    case MINIX_CIGAM:
-                        filenamesize   = 14;
-                        minixVersion   = "Minix v1 filesystem";
-                        littleEndian   = false;
-                        XmlFsType.Type = "Minix v1";
-
-                        break;
-                    case MINIX_CIGAM2:
-                        filenamesize   = 30;
-                        minixVersion   = "Minix v1 filesystem";
-                        littleEndian   = false;
-                        XmlFsType.Type = "Minix v1";
-
-                        break;
-                    case MINIX2_CIGAM:
-                        filenamesize   = 14;
-                        minixVersion   = "Minix v2 filesystem";
-                        littleEndian   = false;
-                        XmlFsType.Type = "Minix v2";
-
-                        break;
-                    case MINIX2_CIGAM2:
-                        filenamesize   = 30;
-                        minixVersion   = "Minix v2 filesystem";
-                        littleEndian   = false;
-                        XmlFsType.Type = "Minix v2";
-
-                        break;
-                    default: return;
-                }
-            }
-
-            if(minix3)
-            {
-                SuperBlock3 mnxSb = littleEndian ? Marshal.ByteArrayToStructureLittleEndian<SuperBlock3>(minixSbSector)
-                                        : Marshal.ByteArrayToStructureBigEndian<SuperBlock3>(minixSbSector);
-
-                if(magic != MINIX3_MAGIC &&
-                   magic != MINIX3_CIGAM)
-                    mnxSb.s_blocksize = 1024;
-
-                sb.AppendLine(minixVersion);
-                sb.AppendFormat("{0} chars in filename", filenamesize).AppendLine();
-
-                if(mnxSb.s_zones > 0) // On V2
-                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_zones, mnxSb.s_zones * 1024).
-                       AppendLine();
-                else
-                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_nzones, mnxSb.s_nzones * 1024).
-                       AppendLine();
-
-                sb.AppendFormat("{0} bytes/block", mnxSb.s_blocksize).AppendLine();
-                sb.AppendFormat("{0} inodes on volume", mnxSb.s_ninodes).AppendLine();
-
-                sb.AppendFormat("{0} blocks on inode map ({1} bytes)", mnxSb.s_imap_blocks,
-                                mnxSb.s_imap_blocks * mnxSb.s_blocksize).AppendLine();
-
-                sb.AppendFormat("{0} blocks on zone map ({1} bytes)", mnxSb.s_zmap_blocks,
-                                mnxSb.s_zmap_blocks * mnxSb.s_blocksize).AppendLine();
-
-                sb.AppendFormat("First data zone: {0}", mnxSb.s_firstdatazone).AppendLine();
-
-                //sb.AppendFormat("log2 of blocks/zone: {0}", mnx_sb.s_log_zone_size).AppendLine(); // Apparently 0
-                sb.AppendFormat("{0} bytes maximum per file", mnxSb.s_max_size).AppendLine();
-                sb.AppendFormat("On-disk filesystem version: {0}", mnxSb.s_disk_version).AppendLine();
-
-                XmlFsType.ClusterSize = mnxSb.s_blocksize;
-                XmlFsType.Clusters    = mnxSb.s_zones > 0 ? mnxSb.s_zones : mnxSb.s_nzones;
-            }
-            else
-            {
-                SuperBlock mnxSb = littleEndian ? Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(minixSbSector)
-                                       : Marshal.ByteArrayToStructureBigEndian<SuperBlock>(minixSbSector);
-
-                sb.AppendLine(minixVersion);
-                sb.AppendFormat("{0} chars in filename", filenamesize).AppendLine();
-
-                if(mnxSb.s_zones > 0) // On V2
-                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_zones, mnxSb.s_zones * 1024).
-                       AppendLine();
-                else
-                    sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_nzones, mnxSb.s_nzones * 1024).
-                       AppendLine();
-
-                sb.AppendFormat("{0} inodes on volume", mnxSb.s_ninodes).AppendLine();
-
-                sb.AppendFormat("{0} blocks on inode map ({1} bytes)", mnxSb.s_imap_blocks, mnxSb.s_imap_blocks * 1024).
+                sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_nzones, mnxSb.s_nzones * 1024).
                    AppendLine();
 
-                sb.AppendFormat("{0} blocks on zone map ({1} bytes)", mnxSb.s_zmap_blocks, mnxSb.s_zmap_blocks * 1024).
+            sb.AppendFormat("{0} bytes/block", mnxSb.s_blocksize).AppendLine();
+            sb.AppendFormat("{0} inodes on volume", mnxSb.s_ninodes).AppendLine();
+
+            sb.AppendFormat("{0} blocks on inode map ({1} bytes)", mnxSb.s_imap_blocks,
+                            mnxSb.s_imap_blocks * mnxSb.s_blocksize).AppendLine();
+
+            sb.AppendFormat("{0} blocks on zone map ({1} bytes)", mnxSb.s_zmap_blocks,
+                            mnxSb.s_zmap_blocks * mnxSb.s_blocksize).AppendLine();
+
+            sb.AppendFormat("First data zone: {0}", mnxSb.s_firstdatazone).AppendLine();
+
+            //sb.AppendFormat("log2 of blocks/zone: {0}", mnx_sb.s_log_zone_size).AppendLine(); // Apparently 0
+            sb.AppendFormat("{0} bytes maximum per file", mnxSb.s_max_size).AppendLine();
+            sb.AppendFormat("On-disk filesystem version: {0}", mnxSb.s_disk_version).AppendLine();
+
+            XmlFsType.ClusterSize = mnxSb.s_blocksize;
+            XmlFsType.Clusters    = mnxSb.s_zones > 0 ? mnxSb.s_zones : mnxSb.s_nzones;
+        }
+        else
+        {
+            SuperBlock mnxSb = littleEndian ? Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(minixSbSector)
+                                   : Marshal.ByteArrayToStructureBigEndian<SuperBlock>(minixSbSector);
+
+            sb.AppendLine(minixVersion);
+            sb.AppendFormat("{0} chars in filename", filenamesize).AppendLine();
+
+            if(mnxSb.s_zones > 0) // On V2
+                sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_zones, mnxSb.s_zones * 1024).
+                   AppendLine();
+            else
+                sb.AppendFormat("{0} zones on volume ({1} bytes)", mnxSb.s_nzones, mnxSb.s_nzones * 1024).
                    AppendLine();
 
-                sb.AppendFormat("First data zone: {0}", mnxSb.s_firstdatazone).AppendLine();
+            sb.AppendFormat("{0} inodes on volume", mnxSb.s_ninodes).AppendLine();
 
-                //sb.AppendFormat("log2 of blocks/zone: {0}", mnx_sb.s_log_zone_size).AppendLine(); // Apparently 0
-                sb.AppendFormat("{0} bytes maximum per file", mnxSb.s_max_size).AppendLine();
-                sb.AppendFormat("Filesystem state: {0:X4}", mnxSb.s_state).AppendLine();
-                XmlFsType.ClusterSize = 1024;
-                XmlFsType.Clusters    = mnxSb.s_zones > 0 ? mnxSb.s_zones : mnxSb.s_nzones;
-            }
+            sb.AppendFormat("{0} blocks on inode map ({1} bytes)", mnxSb.s_imap_blocks, mnxSb.s_imap_blocks * 1024).
+               AppendLine();
 
-            information = sb.ToString();
+            sb.AppendFormat("{0} blocks on zone map ({1} bytes)", mnxSb.s_zmap_blocks, mnxSb.s_zmap_blocks * 1024).
+               AppendLine();
+
+            sb.AppendFormat("First data zone: {0}", mnxSb.s_firstdatazone).AppendLine();
+
+            //sb.AppendFormat("log2 of blocks/zone: {0}", mnx_sb.s_log_zone_size).AppendLine(); // Apparently 0
+            sb.AppendFormat("{0} bytes maximum per file", mnxSb.s_max_size).AppendLine();
+            sb.AppendFormat("Filesystem state: {0:X4}", mnxSb.s_state).AppendLine();
+            XmlFsType.ClusterSize = 1024;
+            XmlFsType.Clusters    = mnxSb.s_zones > 0 ? mnxSb.s_zones : mnxSb.s_nzones;
         }
 
-        /// <summary>Superblock for Minix v1 and V2 filesystems</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            /// <summary>0x00, inodes on volume</summary>
-            public readonly ushort s_ninodes;
-            /// <summary>0x02, zones on volume</summary>
-            public readonly ushort s_nzones;
-            /// <summary>0x04, blocks on inode map</summary>
-            public readonly short s_imap_blocks;
-            /// <summary>0x06, blocks on zone map</summary>
-            public readonly short s_zmap_blocks;
-            /// <summary>0x08, first data zone</summary>
-            public readonly ushort s_firstdatazone;
-            /// <summary>0x0A, log2 of blocks/zone</summary>
-            public readonly short s_log_zone_size;
-            /// <summary>0x0C, max file size</summary>
-            public readonly uint s_max_size;
-            /// <summary>0x10, magic</summary>
-            public readonly ushort s_magic;
-            /// <summary>0x12, filesystem state</summary>
-            public readonly ushort s_state;
-            /// <summary>0x14, number of zones</summary>
-            public readonly uint s_zones;
-        }
+        information = sb.ToString();
+    }
 
-        /// <summary>Superblock for Minix v3 filesystems</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct SuperBlock3
-        {
-            /// <summary>0x00, inodes on volume</summary>
-            public readonly uint s_ninodes;
-            /// <summary>0x02, old zones on volume</summary>
-            public readonly ushort s_nzones;
-            /// <summary>0x06, blocks on inode map</summary>
-            public readonly ushort s_imap_blocks;
-            /// <summary>0x08, blocks on zone map</summary>
-            public readonly ushort s_zmap_blocks;
-            /// <summary>0x0A, first data zone</summary>
-            public readonly ushort s_firstdatazone;
-            /// <summary>0x0C, log2 of blocks/zone</summary>
-            public readonly ushort s_log_zone_size;
-            /// <summary>0x0E, padding</summary>
-            public readonly ushort s_pad1;
-            /// <summary>0x10, max file size</summary>
-            public readonly uint s_max_size;
-            /// <summary>0x14, number of zones</summary>
-            public readonly uint s_zones;
-            /// <summary>0x18, magic</summary>
-            public readonly ushort s_magic;
-            /// <summary>0x1A, padding</summary>
-            public readonly ushort s_pad2;
-            /// <summary>0x1C, bytes in a block</summary>
-            public ushort s_blocksize;
-            /// <summary>0x1E, on-disk structures version</summary>
-            public readonly byte s_disk_version;
-        }
+    /// <summary>Superblock for Minix v1 and V2 filesystems</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        /// <summary>0x00, inodes on volume</summary>
+        public readonly ushort s_ninodes;
+        /// <summary>0x02, zones on volume</summary>
+        public readonly ushort s_nzones;
+        /// <summary>0x04, blocks on inode map</summary>
+        public readonly short s_imap_blocks;
+        /// <summary>0x06, blocks on zone map</summary>
+        public readonly short s_zmap_blocks;
+        /// <summary>0x08, first data zone</summary>
+        public readonly ushort s_firstdatazone;
+        /// <summary>0x0A, log2 of blocks/zone</summary>
+        public readonly short s_log_zone_size;
+        /// <summary>0x0C, max file size</summary>
+        public readonly uint s_max_size;
+        /// <summary>0x10, magic</summary>
+        public readonly ushort s_magic;
+        /// <summary>0x12, filesystem state</summary>
+        public readonly ushort s_state;
+        /// <summary>0x14, number of zones</summary>
+        public readonly uint s_zones;
+    }
+
+    /// <summary>Superblock for Minix v3 filesystems</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct SuperBlock3
+    {
+        /// <summary>0x00, inodes on volume</summary>
+        public readonly uint s_ninodes;
+        /// <summary>0x02, old zones on volume</summary>
+        public readonly ushort s_nzones;
+        /// <summary>0x06, blocks on inode map</summary>
+        public readonly ushort s_imap_blocks;
+        /// <summary>0x08, blocks on zone map</summary>
+        public readonly ushort s_zmap_blocks;
+        /// <summary>0x0A, first data zone</summary>
+        public readonly ushort s_firstdatazone;
+        /// <summary>0x0C, log2 of blocks/zone</summary>
+        public readonly ushort s_log_zone_size;
+        /// <summary>0x0E, padding</summary>
+        public readonly ushort s_pad1;
+        /// <summary>0x10, max file size</summary>
+        public readonly uint s_max_size;
+        /// <summary>0x14, number of zones</summary>
+        public readonly uint s_zones;
+        /// <summary>0x18, magic</summary>
+        public readonly ushort s_magic;
+        /// <summary>0x1A, padding</summary>
+        public readonly ushort s_pad2;
+        /// <summary>0x1C, bytes in a block</summary>
+        public ushort s_blocksize;
+        /// <summary>0x1E, on-disk structures version</summary>
+        public readonly byte s_disk_version;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/NILFS2.cs b/Aaru.Filesystems/NILFS2.cs
index 8cd5049aa..7bfeeacce 100644
--- a/Aaru.Filesystems/NILFS2.cs
+++ b/Aaru.Filesystems/NILFS2.cs
@@ -42,186 +42,185 @@ using Marshal = Aaru.Helpers.Marshal;
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the New Implementation of a Log-structured File System v2</summary>
+public sealed class NILFS2 : IFilesystem
 {
+    const ushort NILFS2_MAGIC        = 0x3434;
+    const uint   NILFS2_SUPER_OFFSET = 1024;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the New Implementation of a Log-structured File System v2</summary>
-    public sealed class NILFS2 : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "NILFS2 Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("35224226-C5CC-48B5-8FFD-3781E91E86B6");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const ushort NILFS2_MAGIC        = 0x3434;
-        const uint   NILFS2_SUPER_OFFSET = 1024;
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "NILFS2 Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("35224226-C5CC-48B5-8FFD-3781E91E86B6");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        uint sbAddr = NILFS2_SUPER_OFFSET / imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(sbAddr == 0)
+            sbAddr = 1;
+
+        uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        if(partition.Start + sbAddr + sbSize >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(sector.Length < Marshal.SizeOf<Superblock>())
+            return false;
+
+        Superblock nilfsSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        return nilfsSb.magic == NILFS2_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.UTF8;
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        uint sbAddr = NILFS2_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+        if(sbAddr == 0)
+            sbAddr = 1;
+
+        uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        if(sector.Length < Marshal.SizeOf<Superblock>())
+            return;
+
+        Superblock nilfsSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        if(nilfsSb.magic != NILFS2_MAGIC)
+            return;
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("NILFS2 filesystem");
+        sb.AppendFormat("Version {0}.{1}", nilfsSb.rev_level, nilfsSb.minor_rev_level).AppendLine();
+        sb.AppendFormat("{0} bytes per block", 1 << (int)(nilfsSb.log_block_size + 10)).AppendLine();
+        sb.AppendFormat("{0} bytes in volume", nilfsSb.dev_size).AppendLine();
+        sb.AppendFormat("{0} blocks per segment", nilfsSb.blocks_per_segment).AppendLine();
+        sb.AppendFormat("{0} segments", nilfsSb.nsegments).AppendLine();
+
+        if(nilfsSb.creator_os == 0)
+            sb.AppendLine("Filesystem created on Linux");
+        else
+            sb.AppendFormat("Creator OS code: {0}", nilfsSb.creator_os).AppendLine();
+
+        sb.AppendFormat("{0} bytes per inode", nilfsSb.inode_size).AppendLine();
+        sb.AppendFormat("Volume UUID: {0}", nilfsSb.uuid).AppendLine();
+        sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(nilfsSb.volume_name, Encoding)).AppendLine();
+        sb.AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.ctime)).AppendLine();
+
+        sb.AppendFormat("Volume last mounted on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.mtime)).
+           AppendLine();
+
+        sb.AppendFormat("Volume last written on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.wtime)).
+           AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
+            Type                      = "NILFS2 filesystem",
+            ClusterSize               = (uint)(1 << (int)(nilfsSb.log_block_size + 10)),
+            VolumeName                = StringHandlers.CToString(nilfsSb.volume_name, Encoding),
+            VolumeSerial              = nilfsSb.uuid.ToString(),
+            CreationDate              = DateHandlers.UnixUnsignedToDateTime(nilfsSb.ctime),
+            CreationDateSpecified     = true,
+            ModificationDate          = DateHandlers.UnixUnsignedToDateTime(nilfsSb.wtime),
+            ModificationDateSpecified = true
+        };
 
-            uint sbAddr = NILFS2_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+        if(nilfsSb.creator_os == 0)
+            XmlFsType.SystemIdentifier = "Linux";
 
-            if(sbAddr == 0)
-                sbAddr = 1;
+        XmlFsType.Clusters = nilfsSb.dev_size / XmlFsType.ClusterSize;
+    }
 
-            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+    enum State : ushort
+    {
+        Valid = 0x0001, Error = 0x0002, Resize = 0x0004
+    }
 
-            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            if(partition.Start + sbAddr + sbSize >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(sector.Length < Marshal.SizeOf<Superblock>())
-                return false;
-
-            Superblock nilfsSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-            return nilfsSb.magic == NILFS2_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.UTF8;
-            information = "";
-
-            if(imagePlugin.Info.SectorSize < 512)
-                return;
-
-            uint sbAddr = NILFS2_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-
-            if(sbAddr == 0)
-                sbAddr = 1;
-
-            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            if(sector.Length < Marshal.SizeOf<Superblock>())
-                return;
-
-            Superblock nilfsSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-            if(nilfsSb.magic != NILFS2_MAGIC)
-                return;
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine("NILFS2 filesystem");
-            sb.AppendFormat("Version {0}.{1}", nilfsSb.rev_level, nilfsSb.minor_rev_level).AppendLine();
-            sb.AppendFormat("{0} bytes per block", 1 << (int)(nilfsSb.log_block_size + 10)).AppendLine();
-            sb.AppendFormat("{0} bytes in volume", nilfsSb.dev_size).AppendLine();
-            sb.AppendFormat("{0} blocks per segment", nilfsSb.blocks_per_segment).AppendLine();
-            sb.AppendFormat("{0} segments", nilfsSb.nsegments).AppendLine();
-
-            if(nilfsSb.creator_os == 0)
-                sb.AppendLine("Filesystem created on Linux");
-            else
-                sb.AppendFormat("Creator OS code: {0}", nilfsSb.creator_os).AppendLine();
-
-            sb.AppendFormat("{0} bytes per inode", nilfsSb.inode_size).AppendLine();
-            sb.AppendFormat("Volume UUID: {0}", nilfsSb.uuid).AppendLine();
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(nilfsSb.volume_name, Encoding)).AppendLine();
-            sb.AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.ctime)).AppendLine();
-
-            sb.AppendFormat("Volume last mounted on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.mtime)).
-               AppendLine();
-
-            sb.AppendFormat("Volume last written on {0}", DateHandlers.UnixUnsignedToDateTime(nilfsSb.wtime)).
-               AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type                      = "NILFS2 filesystem",
-                ClusterSize               = (uint)(1 << (int)(nilfsSb.log_block_size + 10)),
-                VolumeName                = StringHandlers.CToString(nilfsSb.volume_name, Encoding),
-                VolumeSerial              = nilfsSb.uuid.ToString(),
-                CreationDate              = DateHandlers.UnixUnsignedToDateTime(nilfsSb.ctime),
-                CreationDateSpecified     = true,
-                ModificationDate          = DateHandlers.UnixUnsignedToDateTime(nilfsSb.wtime),
-                ModificationDateSpecified = true
-            };
-
-            if(nilfsSb.creator_os == 0)
-                XmlFsType.SystemIdentifier = "Linux";
-
-            XmlFsType.Clusters = nilfsSb.dev_size / XmlFsType.ClusterSize;
-        }
-
-        enum State : ushort
-        {
-            Valid = 0x0001, Error = 0x0002, Resize = 0x0004
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Superblock
-        {
-            public readonly uint   rev_level;
-            public readonly ushort minor_rev_level;
-            public readonly ushort magic;
-            public readonly ushort bytes;
-            public readonly ushort flags;
-            public readonly uint   crc_seed;
-            public readonly uint   sum;
-            public readonly uint   log_block_size;
-            public readonly ulong  nsegments;
-            public readonly ulong  dev_size;
-            public readonly ulong  first_data_block;
-            public readonly uint   blocks_per_segment;
-            public readonly uint   r_segments_percentage;
-            public readonly ulong  last_cno;
-            public readonly ulong  last_pseg;
-            public readonly ulong  last_seq;
-            public readonly ulong  free_blocks_count;
-            public readonly ulong  ctime;
-            public readonly ulong  mtime;
-            public readonly ulong  wtime;
-            public readonly ushort mnt_count;
-            public readonly ushort max_mnt_count;
-            public readonly State  state;
-            public readonly ushort errors;
-            public readonly ulong  lastcheck;
-            public readonly uint   checkinterval;
-            public readonly uint   creator_os;
-            public readonly ushort def_resuid;
-            public readonly ushort def_resgid;
-            public readonly uint   first_ino;
-            public readonly ushort inode_size;
-            public readonly ushort dat_entry_size;
-            public readonly ushort checkpoint_size;
-            public readonly ushort segment_usage_size;
-            public readonly Guid   uuid;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 80)]
-            public readonly byte[] volume_name;
-            public readonly uint  c_interval;
-            public readonly uint  c_block_max;
-            public readonly ulong feature_compat;
-            public readonly ulong feature_compat_ro;
-            public readonly ulong feature_incompat;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Superblock
+    {
+        public readonly uint   rev_level;
+        public readonly ushort minor_rev_level;
+        public readonly ushort magic;
+        public readonly ushort bytes;
+        public readonly ushort flags;
+        public readonly uint   crc_seed;
+        public readonly uint   sum;
+        public readonly uint   log_block_size;
+        public readonly ulong  nsegments;
+        public readonly ulong  dev_size;
+        public readonly ulong  first_data_block;
+        public readonly uint   blocks_per_segment;
+        public readonly uint   r_segments_percentage;
+        public readonly ulong  last_cno;
+        public readonly ulong  last_pseg;
+        public readonly ulong  last_seq;
+        public readonly ulong  free_blocks_count;
+        public readonly ulong  ctime;
+        public readonly ulong  mtime;
+        public readonly ulong  wtime;
+        public readonly ushort mnt_count;
+        public readonly ushort max_mnt_count;
+        public readonly State  state;
+        public readonly ushort errors;
+        public readonly ulong  lastcheck;
+        public readonly uint   checkinterval;
+        public readonly uint   creator_os;
+        public readonly ushort def_resuid;
+        public readonly ushort def_resgid;
+        public readonly uint   first_ino;
+        public readonly ushort inode_size;
+        public readonly ushort dat_entry_size;
+        public readonly ushort checkpoint_size;
+        public readonly ushort segment_usage_size;
+        public readonly Guid   uuid;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 80)]
+        public readonly byte[] volume_name;
+        public readonly uint  c_interval;
+        public readonly uint  c_block_max;
+        public readonly ulong feature_compat;
+        public readonly ulong feature_compat_ro;
+        public readonly ulong feature_incompat;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/NTFS.cs b/Aaru.Filesystems/NTFS.cs
index 20468c0b2..06e5947c6 100644
--- a/Aaru.Filesystems/NTFS.cs
+++ b/Aaru.Filesystems/NTFS.cs
@@ -41,206 +41,205 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Inside Windows NT
+/// <inheritdoc />
+/// <summary>Implements detection of the New Technology File System (NTFS)</summary>
+public sealed class NTFS : IFilesystem
 {
-    // Information from Inside Windows NT
     /// <inheritdoc />
-    /// <summary>Implements detection of the New Technology File System (NTFS)</summary>
-    public sealed class NTFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "New Technology File System (NTFS)";
+    /// <inheritdoc />
+    public Guid Id => new("33513B2C-1e6d-4d21-a660-0bbc789c3871");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "New Technology File System (NTFS)";
-        /// <inheritdoc />
-        public Guid Id => new("33513B2C-1e6d-4d21-a660-0bbc789c3871");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(2 + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        byte[] eigthBytes = new byte[8];
+
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] ntfsBpb);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        Array.Copy(ntfsBpb, 0x003, eigthBytes, 0, 8);
+        string oemName = StringHandlers.CToString(eigthBytes);
+
+        if(oemName != "NTFS    ")
+            return false;
+
+        byte   fatsNo    = ntfsBpb[0x010];
+        ushort spFat     = BitConverter.ToUInt16(ntfsBpb, 0x016);
+        ushort signature = BitConverter.ToUInt16(ntfsBpb, 0x1FE);
+
+        if(fatsNo != 0)
+            return false;
+
+        if(spFat != 0)
+            return false;
+
+        return signature == 0xAA55;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = Encoding.Unicode;
+        information = "";
+
+        var sb = new StringBuilder();
+
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] ntfsBpb);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        BiosParameterBlock ntfsBb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock>(ntfsBpb);
+
+        sb.AppendFormat("{0} bytes per sector", ntfsBb.bps).AppendLine();
+        sb.AppendFormat("{0} sectors per cluster ({1} bytes)", ntfsBb.spc, ntfsBb.spc * ntfsBb.bps).AppendLine();
+
+        //          sb.AppendFormat("{0} reserved sectors", ntfs_bb.rsectors).AppendLine();
+        //          sb.AppendFormat("{0} FATs", ntfs_bb.fats_no).AppendLine();
+        //          sb.AppendFormat("{0} entries in the root folder", ntfs_bb.root_ent).AppendLine();
+        //          sb.AppendFormat("{0} sectors on volume (small)", ntfs_bb.sml_sectors).AppendLine();
+        sb.AppendFormat("Media descriptor: 0x{0:X2}", ntfsBb.media).AppendLine();
+
+        //          sb.AppendFormat("{0} sectors per FAT", ntfs_bb.spfat).AppendLine();
+        sb.AppendFormat("{0} sectors per track", ntfsBb.sptrk).AppendLine();
+        sb.AppendFormat("{0} heads", ntfsBb.heads).AppendLine();
+        sb.AppendFormat("{0} hidden sectors before filesystem", ntfsBb.hsectors).AppendLine();
+
+        //          sb.AppendFormat("{0} sectors on volume (big)", ntfs_bb.big_sectors).AppendLine();
+        sb.AppendFormat("BIOS drive number: 0x{0:X2}", ntfsBb.drive_no).AppendLine();
+
+        //          sb.AppendFormat("NT flags: 0x{0:X2}", ntfs_bb.nt_flags).AppendLine();
+        //          sb.AppendFormat("Signature 1: 0x{0:X2}", ntfs_bb.signature1).AppendLine();
+        sb.AppendFormat("{0} sectors on volume ({1} bytes)", ntfsBb.sectors, ntfsBb.sectors * ntfsBb.bps).
+           AppendLine();
+
+        sb.AppendFormat("Cluster where $MFT starts: {0}", ntfsBb.mft_lsn).AppendLine();
+        sb.AppendFormat("Cluster where $MFTMirr starts: {0}", ntfsBb.mftmirror_lsn).AppendLine();
+
+        if(ntfsBb.mft_rc_clusters > 0)
+            sb.AppendFormat("{0} clusters per MFT record ({1} bytes)", ntfsBb.mft_rc_clusters,
+                            ntfsBb.mft_rc_clusters * ntfsBb.bps * ntfsBb.spc).AppendLine();
+        else
+            sb.AppendFormat("{0} bytes per MFT record", 1 << -ntfsBb.mft_rc_clusters).AppendLine();
+
+        if(ntfsBb.index_blk_cts > 0)
+            sb.AppendFormat("{0} clusters per Index block ({1} bytes)", ntfsBb.index_blk_cts,
+                            ntfsBb.index_blk_cts * ntfsBb.bps * ntfsBb.spc).AppendLine();
+        else
+            sb.AppendFormat("{0} bytes per Index block", 1 << -ntfsBb.index_blk_cts).AppendLine();
+
+        sb.AppendFormat("Volume serial number: {0:X16}", ntfsBb.serial_no).AppendLine();
+
+        //          sb.AppendFormat("Signature 2: 0x{0:X4}", ntfs_bb.signature2).AppendLine();
+
+        XmlFsType = new FileSystemType();
+
+        if(ntfsBb.jump[0]    == 0xEB &&
+           ntfsBb.jump[1]    > 0x4E  &&
+           ntfsBb.jump[1]    < 0x80  &&
+           ntfsBb.signature2 == 0xAA55)
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
-
-            byte[] eigthBytes = new byte[8];
-
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] ntfsBpb);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            Array.Copy(ntfsBpb, 0x003, eigthBytes, 0, 8);
-            string oemName = StringHandlers.CToString(eigthBytes);
-
-            if(oemName != "NTFS    ")
-                return false;
-
-            byte   fatsNo    = ntfsBpb[0x010];
-            ushort spFat     = BitConverter.ToUInt16(ntfsBpb, 0x016);
-            ushort signature = BitConverter.ToUInt16(ntfsBpb, 0x1FE);
-
-            if(fatsNo != 0)
-                return false;
-
-            if(spFat != 0)
-                return false;
-
-            return signature == 0xAA55;
+            XmlFsType.Bootable = true;
+            string bootChk = Sha1Context.Data(ntfsBb.boot_code, out _);
+            sb.AppendLine("Volume is bootable");
+            sb.AppendFormat("Boot code's SHA1: {0}", bootChk).AppendLine();
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = Encoding.Unicode;
-            information = "";
+        XmlFsType.ClusterSize  = (uint)(ntfsBb.spc      * ntfsBb.bps);
+        XmlFsType.Clusters     = (ulong)(ntfsBb.sectors / ntfsBb.spc);
+        XmlFsType.VolumeSerial = $"{ntfsBb.serial_no:X16}";
+        XmlFsType.Type         = "NTFS";
 
-            var sb = new StringBuilder();
+        information = sb.ToString();
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] ntfsBpb);
+    /// <summary>NTFS $BOOT</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BiosParameterBlock
+    {
+        // Start of BIOS Parameter Block
+        /// <summary>0x000, Jump to boot code</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        /// <summary>0x003, OEM Name, 8 bytes, space-padded, must be "NTFS    "</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] oem_name;
+        /// <summary>0x00B, Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>0x00D, Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>0x00E, Reserved sectors, seems 0</summary>
+        public readonly ushort rsectors;
+        /// <summary>0x010, Number of FATs... obviously, 0</summary>
+        public readonly byte fats_no;
+        /// <summary>0x011, Number of entries on root directory... 0</summary>
+        public readonly ushort root_ent;
+        /// <summary>0x013, Sectors in volume... 0</summary>
+        public readonly ushort sml_sectors;
+        /// <summary>0x015, Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>0x016, Sectors per FAT... 0</summary>
+        public readonly ushort spfat;
+        /// <summary>0x018, Sectors per track, required to boot</summary>
+        public readonly ushort sptrk;
+        /// <summary>0x01A, Heads... required to boot</summary>
+        public readonly ushort heads;
+        /// <summary>0x01C, Hidden sectors before BPB</summary>
+        public readonly uint hsectors;
+        /// <summary>0x020, Sectors in volume if &gt; 65535... 0</summary>
+        public readonly uint big_sectors;
+        /// <summary>0x024, Drive number</summary>
+        public readonly byte drive_no;
+        /// <summary>0x025, 0</summary>
+        public readonly byte nt_flags;
+        /// <summary>0x026, EPB signature, 0x80</summary>
+        public readonly byte signature1;
+        /// <summary>0x027, Alignment</summary>
+        public readonly byte dummy;
 
-            if(errno != ErrorNumber.NoError)
-                return;
+        // End of BIOS Parameter Block
 
-            BiosParameterBlock ntfsBb = Marshal.ByteArrayToStructureLittleEndian<BiosParameterBlock>(ntfsBpb);
-
-            sb.AppendFormat("{0} bytes per sector", ntfsBb.bps).AppendLine();
-            sb.AppendFormat("{0} sectors per cluster ({1} bytes)", ntfsBb.spc, ntfsBb.spc * ntfsBb.bps).AppendLine();
-
-            //          sb.AppendFormat("{0} reserved sectors", ntfs_bb.rsectors).AppendLine();
-            //          sb.AppendFormat("{0} FATs", ntfs_bb.fats_no).AppendLine();
-            //          sb.AppendFormat("{0} entries in the root folder", ntfs_bb.root_ent).AppendLine();
-            //          sb.AppendFormat("{0} sectors on volume (small)", ntfs_bb.sml_sectors).AppendLine();
-            sb.AppendFormat("Media descriptor: 0x{0:X2}", ntfsBb.media).AppendLine();
-
-            //          sb.AppendFormat("{0} sectors per FAT", ntfs_bb.spfat).AppendLine();
-            sb.AppendFormat("{0} sectors per track", ntfsBb.sptrk).AppendLine();
-            sb.AppendFormat("{0} heads", ntfsBb.heads).AppendLine();
-            sb.AppendFormat("{0} hidden sectors before filesystem", ntfsBb.hsectors).AppendLine();
-
-            //          sb.AppendFormat("{0} sectors on volume (big)", ntfs_bb.big_sectors).AppendLine();
-            sb.AppendFormat("BIOS drive number: 0x{0:X2}", ntfsBb.drive_no).AppendLine();
-
-            //          sb.AppendFormat("NT flags: 0x{0:X2}", ntfs_bb.nt_flags).AppendLine();
-            //          sb.AppendFormat("Signature 1: 0x{0:X2}", ntfs_bb.signature1).AppendLine();
-            sb.AppendFormat("{0} sectors on volume ({1} bytes)", ntfsBb.sectors, ntfsBb.sectors * ntfsBb.bps).
-               AppendLine();
-
-            sb.AppendFormat("Cluster where $MFT starts: {0}", ntfsBb.mft_lsn).AppendLine();
-            sb.AppendFormat("Cluster where $MFTMirr starts: {0}", ntfsBb.mftmirror_lsn).AppendLine();
-
-            if(ntfsBb.mft_rc_clusters > 0)
-                sb.AppendFormat("{0} clusters per MFT record ({1} bytes)", ntfsBb.mft_rc_clusters,
-                                ntfsBb.mft_rc_clusters * ntfsBb.bps * ntfsBb.spc).AppendLine();
-            else
-                sb.AppendFormat("{0} bytes per MFT record", 1 << -ntfsBb.mft_rc_clusters).AppendLine();
-
-            if(ntfsBb.index_blk_cts > 0)
-                sb.AppendFormat("{0} clusters per Index block ({1} bytes)", ntfsBb.index_blk_cts,
-                                ntfsBb.index_blk_cts * ntfsBb.bps * ntfsBb.spc).AppendLine();
-            else
-                sb.AppendFormat("{0} bytes per Index block", 1 << -ntfsBb.index_blk_cts).AppendLine();
-
-            sb.AppendFormat("Volume serial number: {0:X16}", ntfsBb.serial_no).AppendLine();
-
-            //          sb.AppendFormat("Signature 2: 0x{0:X4}", ntfs_bb.signature2).AppendLine();
-
-            XmlFsType = new FileSystemType();
-
-            if(ntfsBb.jump[0]    == 0xEB &&
-               ntfsBb.jump[1]    > 0x4E  &&
-               ntfsBb.jump[1]    < 0x80  &&
-               ntfsBb.signature2 == 0xAA55)
-            {
-                XmlFsType.Bootable = true;
-                string bootChk = Sha1Context.Data(ntfsBb.boot_code, out _);
-                sb.AppendLine("Volume is bootable");
-                sb.AppendFormat("Boot code's SHA1: {0}", bootChk).AppendLine();
-            }
-
-            XmlFsType.ClusterSize  = (uint)(ntfsBb.spc      * ntfsBb.bps);
-            XmlFsType.Clusters     = (ulong)(ntfsBb.sectors / ntfsBb.spc);
-            XmlFsType.VolumeSerial = $"{ntfsBb.serial_no:X16}";
-            XmlFsType.Type         = "NTFS";
-
-            information = sb.ToString();
-        }
-
-        /// <summary>NTFS $BOOT</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BiosParameterBlock
-        {
-            // Start of BIOS Parameter Block
-            /// <summary>0x000, Jump to boot code</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            /// <summary>0x003, OEM Name, 8 bytes, space-padded, must be "NTFS    "</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] oem_name;
-            /// <summary>0x00B, Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>0x00D, Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>0x00E, Reserved sectors, seems 0</summary>
-            public readonly ushort rsectors;
-            /// <summary>0x010, Number of FATs... obviously, 0</summary>
-            public readonly byte fats_no;
-            /// <summary>0x011, Number of entries on root directory... 0</summary>
-            public readonly ushort root_ent;
-            /// <summary>0x013, Sectors in volume... 0</summary>
-            public readonly ushort sml_sectors;
-            /// <summary>0x015, Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>0x016, Sectors per FAT... 0</summary>
-            public readonly ushort spfat;
-            /// <summary>0x018, Sectors per track, required to boot</summary>
-            public readonly ushort sptrk;
-            /// <summary>0x01A, Heads... required to boot</summary>
-            public readonly ushort heads;
-            /// <summary>0x01C, Hidden sectors before BPB</summary>
-            public readonly uint hsectors;
-            /// <summary>0x020, Sectors in volume if &gt; 65535... 0</summary>
-            public readonly uint big_sectors;
-            /// <summary>0x024, Drive number</summary>
-            public readonly byte drive_no;
-            /// <summary>0x025, 0</summary>
-            public readonly byte nt_flags;
-            /// <summary>0x026, EPB signature, 0x80</summary>
-            public readonly byte signature1;
-            /// <summary>0x027, Alignment</summary>
-            public readonly byte dummy;
-
-            // End of BIOS Parameter Block
-
-            // Start of NTFS real superblock
-            /// <summary>0x028, Sectors on volume</summary>
-            public readonly long sectors;
-            /// <summary>0x030, LSN of $MFT</summary>
-            public readonly long mft_lsn;
-            /// <summary>0x038, LSN of $MFTMirror</summary>
-            public readonly long mftmirror_lsn;
-            /// <summary>0x040, Clusters per MFT record</summary>
-            public readonly sbyte mft_rc_clusters;
-            /// <summary>0x041, Alignment</summary>
-            public readonly byte dummy2;
-            /// <summary>0x042, Alignment</summary>
-            public readonly ushort dummy3;
-            /// <summary>0x044, Clusters per index block</summary>
-            public readonly sbyte index_blk_cts;
-            /// <summary>0x045, Alignment</summary>
-            public readonly byte dummy4;
-            /// <summary>0x046, Alignment</summary>
-            public readonly ushort dummy5;
-            /// <summary>0x048, Volume serial number</summary>
-            public readonly ulong serial_no;
-            /// <summary>Boot code.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 430)]
-            public readonly byte[] boot_code;
-            /// <summary>0x1FE, 0xAA55</summary>
-            public readonly ushort signature2;
-        }
+        // Start of NTFS real superblock
+        /// <summary>0x028, Sectors on volume</summary>
+        public readonly long sectors;
+        /// <summary>0x030, LSN of $MFT</summary>
+        public readonly long mft_lsn;
+        /// <summary>0x038, LSN of $MFTMirror</summary>
+        public readonly long mftmirror_lsn;
+        /// <summary>0x040, Clusters per MFT record</summary>
+        public readonly sbyte mft_rc_clusters;
+        /// <summary>0x041, Alignment</summary>
+        public readonly byte dummy2;
+        /// <summary>0x042, Alignment</summary>
+        public readonly ushort dummy3;
+        /// <summary>0x044, Clusters per index block</summary>
+        public readonly sbyte index_blk_cts;
+        /// <summary>0x045, Alignment</summary>
+        public readonly byte dummy4;
+        /// <summary>0x046, Alignment</summary>
+        public readonly ushort dummy5;
+        /// <summary>0x048, Volume serial number</summary>
+        public readonly ulong serial_no;
+        /// <summary>Boot code.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 430)]
+        public readonly byte[] boot_code;
+        /// <summary>0x1FE, 0xAA55</summary>
+        public readonly ushort signature2;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Nintendo.cs b/Aaru.Filesystems/Nintendo.cs
index e49ebfde1..a4bce5f0f 100644
--- a/Aaru.Filesystems/Nintendo.cs
+++ b/Aaru.Filesystems/Nintendo.cs
@@ -39,444 +39,443 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the filesystem used by Nintendo Gamecube and Wii discs</summary>
+public sealed class NintendoPlugin : IFilesystem
 {
     /// <inheritdoc />
-    /// <summary>Implements detection of the filesystem used by Nintendo Gamecube and Wii discs</summary>
-    public sealed class NintendoPlugin : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Nintendo optical filesystems";
+    /// <inheritdoc />
+    public Guid Id => new("4675fcb4-4418-4288-9e4a-33d6a4ac1126");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Nintendo optical filesystems";
-        /// <inheritdoc />
-        public Guid Id => new("4675fcb4-4418-4288-9e4a-33d6a4ac1126");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(partition.Start != 0)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize < 0x50000)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(0, 0x50000 / imagePlugin.Info.SectorSize, out byte[] header);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        uint magicGc  = BigEndianBitConverter.ToUInt32(header, 0x1C);
+        uint magicWii = BigEndianBitConverter.ToUInt32(header, 0x18);
+
+        return magicGc == 0xC2339F3D || magicWii == 0x5D1C9EA3;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding = encoding ?? Encoding.GetEncoding("shift_jis");
+        var sbInformation = new StringBuilder();
+        information = "";
+        XmlFsType   = new FileSystemType();
+
+        var fields = new NintendoFields();
+
+        ErrorNumber errno = imagePlugin.ReadSectors(0, 0x50000 / imagePlugin.Info.SectorSize, out byte[] header);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        bool wii = false;
+
+        uint magicGc  = BigEndianBitConverter.ToUInt32(header, 0x1C);
+        uint magicWii = BigEndianBitConverter.ToUInt32(header, 0x18);
+
+        if(magicWii == 0x5D1C9EA3)
+            wii = true;
+        else if(magicGc != 0xC2339F3D)
+            return;
+
+        fields.DiscType         =  Encoding.ASCII.GetString(header, 0, 1);
+        fields.GameCode         =  Encoding.ASCII.GetString(header, 1, 2);
+        fields.RegionCode       =  Encoding.ASCII.GetString(header, 3, 1);
+        fields.PublisherCode    =  Encoding.ASCII.GetString(header, 4, 2);
+        fields.DiscId           =  Encoding.ASCII.GetString(header, 0, 6);
+        fields.DiscNumber       =  header[6];
+        fields.DiscVersion      =  header[7];
+        fields.Streaming        |= header[8] > 0;
+        fields.StreamBufferSize =  header[9];
+        byte[] temp = new byte[64];
+        Array.Copy(header, 0x20, temp, 0, 64);
+        fields.Title = StringHandlers.CToString(temp, Encoding);
+
+        if(!wii)
         {
-            if(partition.Start != 0)
-                return false;
-
-            if(imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize < 0x50000)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(0, 0x50000 / imagePlugin.Info.SectorSize, out byte[] header);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            uint magicGc  = BigEndianBitConverter.ToUInt32(header, 0x1C);
-            uint magicWii = BigEndianBitConverter.ToUInt32(header, 0x18);
-
-            return magicGc == 0xC2339F3D || magicWii == 0x5D1C9EA3;
+            fields.DebugOff  = BigEndianBitConverter.ToUInt32(header, 0x0400);
+            fields.DebugAddr = BigEndianBitConverter.ToUInt32(header, 0x0404);
+            fields.DolOff    = BigEndianBitConverter.ToUInt32(header, 0x0420);
+            fields.FstOff    = BigEndianBitConverter.ToUInt32(header, 0x0424);
+            fields.FstSize   = BigEndianBitConverter.ToUInt32(header, 0x0428);
+            fields.FstMax    = BigEndianBitConverter.ToUInt32(header, 0x042C);
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        if(wii)
         {
-            Encoding = encoding ?? Encoding.GetEncoding("shift_jis");
-            var sbInformation = new StringBuilder();
-            information = "";
-            XmlFsType   = new FileSystemType();
+            uint offset1 = BigEndianBitConverter.ToUInt32(header, 0x40004) << 2;
+            uint offset2 = BigEndianBitConverter.ToUInt32(header, 0x4000C) << 2;
+            uint offset3 = BigEndianBitConverter.ToUInt32(header, 0x40014) << 2;
+            uint offset4 = BigEndianBitConverter.ToUInt32(header, 0x4001C) << 2;
 
-            var fields = new NintendoFields();
-
-            ErrorNumber errno = imagePlugin.ReadSectors(0, 0x50000 / imagePlugin.Info.SectorSize, out byte[] header);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            bool wii = false;
-
-            uint magicGc  = BigEndianBitConverter.ToUInt32(header, 0x1C);
-            uint magicWii = BigEndianBitConverter.ToUInt32(header, 0x18);
-
-            if(magicWii == 0x5D1C9EA3)
-                wii = true;
-            else if(magicGc != 0xC2339F3D)
-                return;
-
-            fields.DiscType         =  Encoding.ASCII.GetString(header, 0, 1);
-            fields.GameCode         =  Encoding.ASCII.GetString(header, 1, 2);
-            fields.RegionCode       =  Encoding.ASCII.GetString(header, 3, 1);
-            fields.PublisherCode    =  Encoding.ASCII.GetString(header, 4, 2);
-            fields.DiscId           =  Encoding.ASCII.GetString(header, 0, 6);
-            fields.DiscNumber       =  header[6];
-            fields.DiscVersion      =  header[7];
-            fields.Streaming        |= header[8] > 0;
-            fields.StreamBufferSize =  header[9];
-            byte[] temp = new byte[64];
-            Array.Copy(header, 0x20, temp, 0, 64);
-            fields.Title = StringHandlers.CToString(temp, Encoding);
-
-            if(!wii)
-            {
-                fields.DebugOff  = BigEndianBitConverter.ToUInt32(header, 0x0400);
-                fields.DebugAddr = BigEndianBitConverter.ToUInt32(header, 0x0404);
-                fields.DolOff    = BigEndianBitConverter.ToUInt32(header, 0x0420);
-                fields.FstOff    = BigEndianBitConverter.ToUInt32(header, 0x0424);
-                fields.FstSize   = BigEndianBitConverter.ToUInt32(header, 0x0428);
-                fields.FstMax    = BigEndianBitConverter.ToUInt32(header, 0x042C);
-            }
-
-            if(wii)
-            {
-                uint offset1 = BigEndianBitConverter.ToUInt32(header, 0x40004) << 2;
-                uint offset2 = BigEndianBitConverter.ToUInt32(header, 0x4000C) << 2;
-                uint offset3 = BigEndianBitConverter.ToUInt32(header, 0x40014) << 2;
-                uint offset4 = BigEndianBitConverter.ToUInt32(header, 0x4001C) << 2;
-
-                fields.FirstPartitions  = new NintendoPartition[BigEndianBitConverter.ToUInt32(header, 0x40000)];
-                fields.SecondPartitions = new NintendoPartition[BigEndianBitConverter.ToUInt32(header, 0x40008)];
-                fields.ThirdPartitions  = new NintendoPartition[BigEndianBitConverter.ToUInt32(header, 0x40010)];
-                fields.FourthPartitions = new NintendoPartition[BigEndianBitConverter.ToUInt32(header, 0x40018)];
-
-                for(int i = 0; i < fields.FirstPartitions.Length; i++)
-                    if(offset1 + (i * 8) + 8 < 0x50000)
-                    {
-                        fields.FirstPartitions[i].Offset =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset1 + (i * 8) + 0)) << 2;
-
-                        fields.FirstPartitions[i].Type =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset1 + (i * 8) + 4));
-                    }
-
-                for(int i = 0; i < fields.SecondPartitions.Length; i++)
-                    if(offset1 + (i * 8) + 8 < 0x50000)
-                    {
-                        fields.FirstPartitions[i].Offset =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset2 + (i * 8) + 0)) << 2;
-
-                        fields.FirstPartitions[i].Type =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset2 + (i * 8) + 4));
-                    }
-
-                for(int i = 0; i < fields.ThirdPartitions.Length; i++)
-                    if(offset1 + (i * 8) + 8 < 0x50000)
-                    {
-                        fields.FirstPartitions[i].Offset =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset3 + (i * 8) + 0)) << 2;
-
-                        fields.FirstPartitions[i].Type =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset3 + (i * 8) + 4));
-                    }
-
-                for(int i = 0; i < fields.FourthPartitions.Length; i++)
-                    if(offset1 + (i * 8) + 8 < 0x50000)
-                    {
-                        fields.FirstPartitions[i].Offset =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset4 + (i * 8) + 0)) << 2;
-
-                        fields.FirstPartitions[i].Type =
-                            BigEndianBitConverter.ToUInt32(header, (int)(offset4 + (i * 8) + 4));
-                    }
-
-                fields.Region       = header[0x4E000];
-                fields.JapanAge     = header[0x4E010];
-                fields.UsaAge       = header[0x4E011];
-                fields.GermanAge    = header[0x4E013];
-                fields.PegiAge      = header[0x4E014];
-                fields.FinlandAge   = header[0x4E015];
-                fields.PortugalAge  = header[0x4E016];
-                fields.UkAge        = header[0x4E017];
-                fields.AustraliaAge = header[0x4E018];
-                fields.KoreaAge     = header[0x4E019];
-            }
-            else
-            {
-                fields.FirstPartitions  = Array.Empty<NintendoPartition>();
-                fields.SecondPartitions = Array.Empty<NintendoPartition>();
-                fields.ThirdPartitions  = Array.Empty<NintendoPartition>();
-                fields.FourthPartitions = Array.Empty<NintendoPartition>();
-            }
-
-            AaruConsole.DebugWriteLine("Nintendo plugin", "discType = {0}", fields.DiscType);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "gameCode = {0}", fields.GameCode);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "regionCode = {0}", fields.RegionCode);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "publisherCode = {0}", fields.PublisherCode);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "discID = {0}", fields.DiscId);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "discNumber = {0}", fields.DiscNumber);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "discVersion = {0}", fields.DiscVersion);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "streaming = {0}", fields.Streaming);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "streamBufferSize = {0}", fields.StreamBufferSize);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "title = \"{0}\"", fields.Title);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "debugOff = 0x{0:X8}", fields.DebugOff);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "debugAddr = 0x{0:X8}", fields.DebugAddr);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "dolOff = 0x{0:X8}", fields.DolOff);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "fstOff = 0x{0:X8}", fields.FstOff);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "fstSize = {0}", fields.FstSize);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "fstMax = {0}", fields.FstMax);
+            fields.FirstPartitions  = new NintendoPartition[BigEndianBitConverter.ToUInt32(header, 0x40000)];
+            fields.SecondPartitions = new NintendoPartition[BigEndianBitConverter.ToUInt32(header, 0x40008)];
+            fields.ThirdPartitions  = new NintendoPartition[BigEndianBitConverter.ToUInt32(header, 0x40010)];
+            fields.FourthPartitions = new NintendoPartition[BigEndianBitConverter.ToUInt32(header, 0x40018)];
 
             for(int i = 0; i < fields.FirstPartitions.Length; i++)
-            {
-                AaruConsole.DebugWriteLine("Nintendo plugin", "firstPartitions[{1}].offset = {0}",
-                                           fields.FirstPartitions[i].Offset, i);
+                if(offset1 + (i * 8) + 8 < 0x50000)
+                {
+                    fields.FirstPartitions[i].Offset =
+                        BigEndianBitConverter.ToUInt32(header, (int)(offset1 + (i * 8) + 0)) << 2;
 
-                AaruConsole.DebugWriteLine("Nintendo plugin", "firstPartitions[{1}].type = {0}",
-                                           fields.FirstPartitions[i].Type, i);
-            }
+                    fields.FirstPartitions[i].Type =
+                        BigEndianBitConverter.ToUInt32(header, (int)(offset1 + (i * 8) + 4));
+                }
 
             for(int i = 0; i < fields.SecondPartitions.Length; i++)
-            {
-                AaruConsole.DebugWriteLine("Nintendo plugin", "secondPartitions[{1}].offset = {0}",
-                                           fields.SecondPartitions[i].Offset, i);
+                if(offset1 + (i * 8) + 8 < 0x50000)
+                {
+                    fields.FirstPartitions[i].Offset =
+                        BigEndianBitConverter.ToUInt32(header, (int)(offset2 + (i * 8) + 0)) << 2;
 
-                AaruConsole.DebugWriteLine("Nintendo plugin", "secondPartitions[{1}].type = {0}",
-                                           fields.SecondPartitions[i].Type, i);
-            }
+                    fields.FirstPartitions[i].Type =
+                        BigEndianBitConverter.ToUInt32(header, (int)(offset2 + (i * 8) + 4));
+                }
 
             for(int i = 0; i < fields.ThirdPartitions.Length; i++)
-            {
-                AaruConsole.DebugWriteLine("Nintendo plugin", "thirdPartitions[{1}].offset = {0}",
-                                           fields.ThirdPartitions[i].Offset, i);
+                if(offset1 + (i * 8) + 8 < 0x50000)
+                {
+                    fields.FirstPartitions[i].Offset =
+                        BigEndianBitConverter.ToUInt32(header, (int)(offset3 + (i * 8) + 0)) << 2;
 
-                AaruConsole.DebugWriteLine("Nintendo plugin", "thirdPartitions[{1}].type = {0}",
-                                           fields.ThirdPartitions[i].Type, i);
-            }
+                    fields.FirstPartitions[i].Type =
+                        BigEndianBitConverter.ToUInt32(header, (int)(offset3 + (i * 8) + 4));
+                }
 
             for(int i = 0; i < fields.FourthPartitions.Length; i++)
-            {
-                AaruConsole.DebugWriteLine("Nintendo plugin", "fourthPartitions[{1}].offset = {0}",
-                                           fields.FourthPartitions[i].Offset, i);
+                if(offset1 + (i * 8) + 8 < 0x50000)
+                {
+                    fields.FirstPartitions[i].Offset =
+                        BigEndianBitConverter.ToUInt32(header, (int)(offset4 + (i * 8) + 0)) << 2;
 
-                AaruConsole.DebugWriteLine("Nintendo plugin", "fourthPartitions[{1}].type = {0}",
-                                           fields.FourthPartitions[i].Type, i);
-            }
+                    fields.FirstPartitions[i].Type =
+                        BigEndianBitConverter.ToUInt32(header, (int)(offset4 + (i * 8) + 4));
+                }
 
-            AaruConsole.DebugWriteLine("Nintendo plugin", "region = {0}", fields.Region);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "japanAge = {0}", fields.JapanAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "usaAge = {0}", fields.UsaAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "germanAge = {0}", fields.GermanAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "pegiAge = {0}", fields.PegiAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "finlandAge = {0}", fields.FinlandAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "portugalAge = {0}", fields.PortugalAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "ukAge = {0}", fields.UkAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "australiaAge = {0}", fields.AustraliaAge);
-            AaruConsole.DebugWriteLine("Nintendo plugin", "koreaAge = {0}", fields.KoreaAge);
-
-            sbInformation.AppendLine("Nintendo optical filesystem");
-            sbInformation.AppendLine(wii ? "Nintendo Wii Optical Disc" : "Nintendo GameCube Optical Disc");
-            sbInformation.AppendFormat("Disc ID is {0}", fields.DiscId).AppendLine();
-            sbInformation.AppendFormat("Disc is a {0} disc", DiscTypeToString(fields.DiscType)).AppendLine();
-            sbInformation.AppendFormat("Disc region is {0}", RegionCodeToString(fields.RegionCode)).AppendLine();
-            sbInformation.AppendFormat("Published by {0}", PublisherCodeToString(fields.PublisherCode)).AppendLine();
-
-            if(fields.DiscNumber > 0)
-                sbInformation.AppendFormat("Disc number {0} of a multi-disc set", fields.DiscNumber + 1).AppendLine();
-
-            if(fields.Streaming)
-                sbInformation.AppendLine("Disc is prepared for audio streaming");
-
-            if(fields.StreamBufferSize > 0)
-                sbInformation.AppendFormat("Audio streaming buffer size is {0} bytes", fields.StreamBufferSize).
-                              AppendLine();
-
-            sbInformation.AppendFormat("Title: {0}", fields.Title).AppendLine();
-
-            if(wii)
-            {
-                for(int i = 0; i < fields.FirstPartitions.Length; i++)
-                    sbInformation.AppendFormat("First {0} partition starts at sector {1}",
-                                               PartitionTypeToString(fields.FirstPartitions[i].Type),
-                                               fields.FirstPartitions[i].Offset / 2048).AppendLine();
-
-                for(int i = 0; i < fields.SecondPartitions.Length; i++)
-                    sbInformation.AppendFormat("Second {0} partition starts at sector {1}",
-                                               PartitionTypeToString(fields.SecondPartitions[i].Type),
-                                               fields.SecondPartitions[i].Offset / 2048).AppendLine();
-
-                for(int i = 0; i < fields.ThirdPartitions.Length; i++)
-                    sbInformation.AppendFormat("Third {0} partition starts at sector {1}",
-                                               PartitionTypeToString(fields.ThirdPartitions[i].Type),
-                                               fields.ThirdPartitions[i].Offset / 2048).AppendLine();
-
-                for(int i = 0; i < fields.FourthPartitions.Length; i++)
-                    sbInformation.AppendFormat("Fourth {0} partition starts at sector {1}",
-                                               PartitionTypeToString(fields.FourthPartitions[i].Type),
-                                               fields.FourthPartitions[i].Offset / 2048).AppendLine();
-
-                //                sbInformation.AppendFormat("Region byte is {0}", fields.region).AppendLine();
-                if((fields.JapanAge & 0x80) != 0x80)
-                    sbInformation.AppendFormat("Japan age rating is {0}", fields.JapanAge).AppendLine();
-
-                if((fields.UsaAge & 0x80) != 0x80)
-                    sbInformation.AppendFormat("ESRB age rating is {0}", fields.UsaAge).AppendLine();
-
-                if((fields.GermanAge & 0x80) != 0x80)
-                    sbInformation.AppendFormat("German age rating is {0}", fields.GermanAge).AppendLine();
-
-                if((fields.PegiAge & 0x80) != 0x80)
-                    sbInformation.AppendFormat("PEGI age rating is {0}", fields.PegiAge).AppendLine();
-
-                if((fields.FinlandAge & 0x80) != 0x80)
-                    sbInformation.AppendFormat("Finland age rating is {0}", fields.FinlandAge).AppendLine();
-
-                if((fields.PortugalAge & 0x80) != 0x80)
-                    sbInformation.AppendFormat("Portugal age rating is {0}", fields.PortugalAge).AppendLine();
-
-                if((fields.UkAge & 0x80) != 0x80)
-                    sbInformation.AppendFormat("UK age rating is {0}", fields.UkAge).AppendLine();
-
-                if((fields.AustraliaAge & 0x80) != 0x80)
-                    sbInformation.AppendFormat("Australia age rating is {0}", fields.AustraliaAge).AppendLine();
-
-                if((fields.KoreaAge & 0x80) != 0x80)
-                    sbInformation.AppendFormat("Korea age rating is {0}", fields.KoreaAge).AppendLine();
-            }
-            else
-                sbInformation.AppendFormat("FST starts at {0} and has {1} bytes", fields.FstOff, fields.FstSize).
-                              AppendLine();
-
-            information            = sbInformation.ToString();
-            XmlFsType.Bootable     = true;
-            XmlFsType.Clusters     = imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize / 2048;
-            XmlFsType.ClusterSize  = 2048;
-            XmlFsType.Type         = wii ? "Nintendo Wii filesystem" : "Nintendo Gamecube filesystem";
-            XmlFsType.VolumeName   = fields.Title;
-            XmlFsType.VolumeSerial = fields.DiscId;
+            fields.Region       = header[0x4E000];
+            fields.JapanAge     = header[0x4E010];
+            fields.UsaAge       = header[0x4E011];
+            fields.GermanAge    = header[0x4E013];
+            fields.PegiAge      = header[0x4E014];
+            fields.FinlandAge   = header[0x4E015];
+            fields.PortugalAge  = header[0x4E016];
+            fields.UkAge        = header[0x4E017];
+            fields.AustraliaAge = header[0x4E018];
+            fields.KoreaAge     = header[0x4E019];
         }
-
-        static string DiscTypeToString(string discType)
+        else
         {
-            switch(discType)
-            {
-                case "C": return "Commodore 64 Virtual Console";
-                case "D": return "Demo";
-                case "E": return "Neo-Geo Virtual Console";
-                case "F": return "NES Virtual Console";
-                case "G": return "Gamecube";
-                case "H": return "Wii channel";
-                case "J": return "Super Nintendo Virtual Console";
-                case "L": return "Master System Virtual Console";
-                case "M": return "Megadrive Virtual Console";
-                case "N": return "Nintendo 64 Virtual Console";
-                case "P": return "Promotional or TurboGrafx Virtual Console";
-                case "Q": return "TurboGrafx CD Virtual Console";
-                case "R":
-                case "S": return "Wii";
-                case "U": return "Utility";
-                case "W": return "WiiWare";
-                case "X": return "MSX Virtual Console or WiiWare demo";
-                case "0":
-                case "1": return "Diagnostic";
-                case "4": return "Wii Backup";
-                case "_": return "WiiFit";
-            }
-
-            return $"unknown type '{discType}'";
+            fields.FirstPartitions  = Array.Empty<NintendoPartition>();
+            fields.SecondPartitions = Array.Empty<NintendoPartition>();
+            fields.ThirdPartitions  = Array.Empty<NintendoPartition>();
+            fields.FourthPartitions = Array.Empty<NintendoPartition>();
         }
 
-        static string RegionCodeToString(string regionCode)
+        AaruConsole.DebugWriteLine("Nintendo plugin", "discType = {0}", fields.DiscType);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "gameCode = {0}", fields.GameCode);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "regionCode = {0}", fields.RegionCode);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "publisherCode = {0}", fields.PublisherCode);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "discID = {0}", fields.DiscId);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "discNumber = {0}", fields.DiscNumber);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "discVersion = {0}", fields.DiscVersion);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "streaming = {0}", fields.Streaming);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "streamBufferSize = {0}", fields.StreamBufferSize);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "title = \"{0}\"", fields.Title);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "debugOff = 0x{0:X8}", fields.DebugOff);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "debugAddr = 0x{0:X8}", fields.DebugAddr);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "dolOff = 0x{0:X8}", fields.DolOff);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "fstOff = 0x{0:X8}", fields.FstOff);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "fstSize = {0}", fields.FstSize);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "fstMax = {0}", fields.FstMax);
+
+        for(int i = 0; i < fields.FirstPartitions.Length; i++)
         {
-            switch(regionCode)
-            {
-                case "A": return "any region";
-                case "D": return "Germany";
-                case "N":
-                case "E": return "USA";
-                case "F": return "France";
-                case "I": return "Italy";
-                case "J": return "Japan";
-                case "K":
-                case "Q": return "Korea";
-                case "L":
-                case "M":
-                case "P": return "PAL";
-                case "R": return "Russia";
-                case "S": return "Spain";
-                case "T": return "Taiwan";
-                case "U": return "Australia";
-            }
+            AaruConsole.DebugWriteLine("Nintendo plugin", "firstPartitions[{1}].offset = {0}",
+                                       fields.FirstPartitions[i].Offset, i);
 
-            return $"unknown code '{regionCode}'";
+            AaruConsole.DebugWriteLine("Nintendo plugin", "firstPartitions[{1}].type = {0}",
+                                       fields.FirstPartitions[i].Type, i);
         }
 
-        static string PublisherCodeToString(string publisherCode)
+        for(int i = 0; i < fields.SecondPartitions.Length; i++)
         {
-            switch(publisherCode)
-            {
-                case "01": return "Nintendo";
-                case "08": return "CAPCOM";
-                case "41": return "Ubisoft";
-                case "4F": return "Eidos";
-                case "51": return "Acclaim";
-                case "52": return "Activision";
-                case "5D": return "Midway";
-                case "5G": return "Hudson";
-                case "64": return "LucasArts";
-                case "69": return "Electronic Arts";
-                case "6S": return "TDK Mediactive";
-                case "8P": return "SEGA";
-                case "A4": return "Mirage Studios";
-                case "AF": return "Namco";
-                case "B2": return "Bandai";
-                case "DA": return "Tomy";
-                case "EM": return "Konami";
-                case "70": return "Atari";
-                case "4Q": return "Disney Interactive";
-                case "GD": return "Square Enix";
-                case "7D": return "Sierra";
-            }
+            AaruConsole.DebugWriteLine("Nintendo plugin", "secondPartitions[{1}].offset = {0}",
+                                       fields.SecondPartitions[i].Offset, i);
 
-            return $"Unknown publisher '{publisherCode}'";
+            AaruConsole.DebugWriteLine("Nintendo plugin", "secondPartitions[{1}].type = {0}",
+                                       fields.SecondPartitions[i].Type, i);
         }
 
-        static string PartitionTypeToString(uint type)
+        for(int i = 0; i < fields.ThirdPartitions.Length; i++)
         {
-            switch(type)
-            {
-                case 0: return "data";
-                case 1: return "update";
-                case 2: return "channel";
-            }
+            AaruConsole.DebugWriteLine("Nintendo plugin", "thirdPartitions[{1}].offset = {0}",
+                                       fields.ThirdPartitions[i].Offset, i);
 
-            return $"unknown type {type}";
+            AaruConsole.DebugWriteLine("Nintendo plugin", "thirdPartitions[{1}].type = {0}",
+                                       fields.ThirdPartitions[i].Type, i);
         }
 
-        struct NintendoFields
+        for(int i = 0; i < fields.FourthPartitions.Length; i++)
         {
-            public string              DiscType;
-            public string              GameCode;
-            public string              RegionCode;
-            public string              PublisherCode;
-            public string              DiscId;
-            public byte                DiscNumber;
-            public byte                DiscVersion;
-            public bool                Streaming;
-            public byte                StreamBufferSize;
-            public string              Title;
-            public uint                DebugOff;
-            public uint                DebugAddr;
-            public uint                DolOff;
-            public uint                FstOff;
-            public uint                FstSize;
-            public uint                FstMax;
-            public NintendoPartition[] FirstPartitions;
-            public NintendoPartition[] SecondPartitions;
-            public NintendoPartition[] ThirdPartitions;
-            public NintendoPartition[] FourthPartitions;
-            public byte                Region;
-            public byte                JapanAge;
-            public byte                UsaAge;
-            public byte                GermanAge;
-            public byte                PegiAge;
-            public byte                FinlandAge;
-            public byte                PortugalAge;
-            public byte                UkAge;
-            public byte                AustraliaAge;
-            public byte                KoreaAge;
+            AaruConsole.DebugWriteLine("Nintendo plugin", "fourthPartitions[{1}].offset = {0}",
+                                       fields.FourthPartitions[i].Offset, i);
+
+            AaruConsole.DebugWriteLine("Nintendo plugin", "fourthPartitions[{1}].type = {0}",
+                                       fields.FourthPartitions[i].Type, i);
         }
 
-        struct NintendoPartition
+        AaruConsole.DebugWriteLine("Nintendo plugin", "region = {0}", fields.Region);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "japanAge = {0}", fields.JapanAge);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "usaAge = {0}", fields.UsaAge);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "germanAge = {0}", fields.GermanAge);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "pegiAge = {0}", fields.PegiAge);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "finlandAge = {0}", fields.FinlandAge);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "portugalAge = {0}", fields.PortugalAge);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "ukAge = {0}", fields.UkAge);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "australiaAge = {0}", fields.AustraliaAge);
+        AaruConsole.DebugWriteLine("Nintendo plugin", "koreaAge = {0}", fields.KoreaAge);
+
+        sbInformation.AppendLine("Nintendo optical filesystem");
+        sbInformation.AppendLine(wii ? "Nintendo Wii Optical Disc" : "Nintendo GameCube Optical Disc");
+        sbInformation.AppendFormat("Disc ID is {0}", fields.DiscId).AppendLine();
+        sbInformation.AppendFormat("Disc is a {0} disc", DiscTypeToString(fields.DiscType)).AppendLine();
+        sbInformation.AppendFormat("Disc region is {0}", RegionCodeToString(fields.RegionCode)).AppendLine();
+        sbInformation.AppendFormat("Published by {0}", PublisherCodeToString(fields.PublisherCode)).AppendLine();
+
+        if(fields.DiscNumber > 0)
+            sbInformation.AppendFormat("Disc number {0} of a multi-disc set", fields.DiscNumber + 1).AppendLine();
+
+        if(fields.Streaming)
+            sbInformation.AppendLine("Disc is prepared for audio streaming");
+
+        if(fields.StreamBufferSize > 0)
+            sbInformation.AppendFormat("Audio streaming buffer size is {0} bytes", fields.StreamBufferSize).
+                          AppendLine();
+
+        sbInformation.AppendFormat("Title: {0}", fields.Title).AppendLine();
+
+        if(wii)
         {
-            public uint Offset;
-            public uint Type;
+            for(int i = 0; i < fields.FirstPartitions.Length; i++)
+                sbInformation.AppendFormat("First {0} partition starts at sector {1}",
+                                           PartitionTypeToString(fields.FirstPartitions[i].Type),
+                                           fields.FirstPartitions[i].Offset / 2048).AppendLine();
+
+            for(int i = 0; i < fields.SecondPartitions.Length; i++)
+                sbInformation.AppendFormat("Second {0} partition starts at sector {1}",
+                                           PartitionTypeToString(fields.SecondPartitions[i].Type),
+                                           fields.SecondPartitions[i].Offset / 2048).AppendLine();
+
+            for(int i = 0; i < fields.ThirdPartitions.Length; i++)
+                sbInformation.AppendFormat("Third {0} partition starts at sector {1}",
+                                           PartitionTypeToString(fields.ThirdPartitions[i].Type),
+                                           fields.ThirdPartitions[i].Offset / 2048).AppendLine();
+
+            for(int i = 0; i < fields.FourthPartitions.Length; i++)
+                sbInformation.AppendFormat("Fourth {0} partition starts at sector {1}",
+                                           PartitionTypeToString(fields.FourthPartitions[i].Type),
+                                           fields.FourthPartitions[i].Offset / 2048).AppendLine();
+
+            //                sbInformation.AppendFormat("Region byte is {0}", fields.region).AppendLine();
+            if((fields.JapanAge & 0x80) != 0x80)
+                sbInformation.AppendFormat("Japan age rating is {0}", fields.JapanAge).AppendLine();
+
+            if((fields.UsaAge & 0x80) != 0x80)
+                sbInformation.AppendFormat("ESRB age rating is {0}", fields.UsaAge).AppendLine();
+
+            if((fields.GermanAge & 0x80) != 0x80)
+                sbInformation.AppendFormat("German age rating is {0}", fields.GermanAge).AppendLine();
+
+            if((fields.PegiAge & 0x80) != 0x80)
+                sbInformation.AppendFormat("PEGI age rating is {0}", fields.PegiAge).AppendLine();
+
+            if((fields.FinlandAge & 0x80) != 0x80)
+                sbInformation.AppendFormat("Finland age rating is {0}", fields.FinlandAge).AppendLine();
+
+            if((fields.PortugalAge & 0x80) != 0x80)
+                sbInformation.AppendFormat("Portugal age rating is {0}", fields.PortugalAge).AppendLine();
+
+            if((fields.UkAge & 0x80) != 0x80)
+                sbInformation.AppendFormat("UK age rating is {0}", fields.UkAge).AppendLine();
+
+            if((fields.AustraliaAge & 0x80) != 0x80)
+                sbInformation.AppendFormat("Australia age rating is {0}", fields.AustraliaAge).AppendLine();
+
+            if((fields.KoreaAge & 0x80) != 0x80)
+                sbInformation.AppendFormat("Korea age rating is {0}", fields.KoreaAge).AppendLine();
         }
+        else
+            sbInformation.AppendFormat("FST starts at {0} and has {1} bytes", fields.FstOff, fields.FstSize).
+                          AppendLine();
+
+        information            = sbInformation.ToString();
+        XmlFsType.Bootable     = true;
+        XmlFsType.Clusters     = imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize / 2048;
+        XmlFsType.ClusterSize  = 2048;
+        XmlFsType.Type         = wii ? "Nintendo Wii filesystem" : "Nintendo Gamecube filesystem";
+        XmlFsType.VolumeName   = fields.Title;
+        XmlFsType.VolumeSerial = fields.DiscId;
+    }
+
+    static string DiscTypeToString(string discType)
+    {
+        switch(discType)
+        {
+            case "C": return "Commodore 64 Virtual Console";
+            case "D": return "Demo";
+            case "E": return "Neo-Geo Virtual Console";
+            case "F": return "NES Virtual Console";
+            case "G": return "Gamecube";
+            case "H": return "Wii channel";
+            case "J": return "Super Nintendo Virtual Console";
+            case "L": return "Master System Virtual Console";
+            case "M": return "Megadrive Virtual Console";
+            case "N": return "Nintendo 64 Virtual Console";
+            case "P": return "Promotional or TurboGrafx Virtual Console";
+            case "Q": return "TurboGrafx CD Virtual Console";
+            case "R":
+            case "S": return "Wii";
+            case "U": return "Utility";
+            case "W": return "WiiWare";
+            case "X": return "MSX Virtual Console or WiiWare demo";
+            case "0":
+            case "1": return "Diagnostic";
+            case "4": return "Wii Backup";
+            case "_": return "WiiFit";
+        }
+
+        return $"unknown type '{discType}'";
+    }
+
+    static string RegionCodeToString(string regionCode)
+    {
+        switch(regionCode)
+        {
+            case "A": return "any region";
+            case "D": return "Germany";
+            case "N":
+            case "E": return "USA";
+            case "F": return "France";
+            case "I": return "Italy";
+            case "J": return "Japan";
+            case "K":
+            case "Q": return "Korea";
+            case "L":
+            case "M":
+            case "P": return "PAL";
+            case "R": return "Russia";
+            case "S": return "Spain";
+            case "T": return "Taiwan";
+            case "U": return "Australia";
+        }
+
+        return $"unknown code '{regionCode}'";
+    }
+
+    static string PublisherCodeToString(string publisherCode)
+    {
+        switch(publisherCode)
+        {
+            case "01": return "Nintendo";
+            case "08": return "CAPCOM";
+            case "41": return "Ubisoft";
+            case "4F": return "Eidos";
+            case "51": return "Acclaim";
+            case "52": return "Activision";
+            case "5D": return "Midway";
+            case "5G": return "Hudson";
+            case "64": return "LucasArts";
+            case "69": return "Electronic Arts";
+            case "6S": return "TDK Mediactive";
+            case "8P": return "SEGA";
+            case "A4": return "Mirage Studios";
+            case "AF": return "Namco";
+            case "B2": return "Bandai";
+            case "DA": return "Tomy";
+            case "EM": return "Konami";
+            case "70": return "Atari";
+            case "4Q": return "Disney Interactive";
+            case "GD": return "Square Enix";
+            case "7D": return "Sierra";
+        }
+
+        return $"Unknown publisher '{publisherCode}'";
+    }
+
+    static string PartitionTypeToString(uint type)
+    {
+        switch(type)
+        {
+            case 0: return "data";
+            case 1: return "update";
+            case 2: return "channel";
+        }
+
+        return $"unknown type {type}";
+    }
+
+    struct NintendoFields
+    {
+        public string              DiscType;
+        public string              GameCode;
+        public string              RegionCode;
+        public string              PublisherCode;
+        public string              DiscId;
+        public byte                DiscNumber;
+        public byte                DiscVersion;
+        public bool                Streaming;
+        public byte                StreamBufferSize;
+        public string              Title;
+        public uint                DebugOff;
+        public uint                DebugAddr;
+        public uint                DolOff;
+        public uint                FstOff;
+        public uint                FstSize;
+        public uint                FstMax;
+        public NintendoPartition[] FirstPartitions;
+        public NintendoPartition[] SecondPartitions;
+        public NintendoPartition[] ThirdPartitions;
+        public NintendoPartition[] FourthPartitions;
+        public byte                Region;
+        public byte                JapanAge;
+        public byte                UsaAge;
+        public byte                GermanAge;
+        public byte                PegiAge;
+        public byte                FinlandAge;
+        public byte                PortugalAge;
+        public byte                UkAge;
+        public byte                AustraliaAge;
+        public byte                KoreaAge;
+    }
+
+    struct NintendoPartition
+    {
+        public uint Offset;
+        public uint Type;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ODS.cs b/Aaru.Filesystems/ODS.cs
index fafac18c3..b6fa58310 100644
--- a/Aaru.Filesystems/ODS.cs
+++ b/Aaru.Filesystems/ODS.cs
@@ -41,361 +41,360 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from VMS File System Internals by Kirby McCoy
+// ISBN: 1-55558-056-4
+// With some hints from http://www.decuslib.com/DECUS/vmslt97b/gnusoftware/gccaxp/7_1/vms/hm2def.h
+// Expects the home block to be always in sector #1 (does not check deltas)
+// Assumes a sector size of 512 bytes (VMS does on HDDs and optical drives, dunno about M.O.)
+// Book only describes ODS-2. Need to test ODS-1 and ODS-5
+// There is an ODS with signature "DECFILES11A", yet to be seen
+// Time is a 64 bit unsigned integer, tenths of microseconds since 1858/11/17 00:00:00.
+// TODO: Implement checksum
+/// <inheritdoc />
+/// <summary>Implements detection of DEC's On-Disk Structure, aka the ODS filesystem</summary>
+public sealed class ODS : IFilesystem
 {
-    // Information from VMS File System Internals by Kirby McCoy
-    // ISBN: 1-55558-056-4
-    // With some hints from http://www.decuslib.com/DECUS/vmslt97b/gnusoftware/gccaxp/7_1/vms/hm2def.h
-    // Expects the home block to be always in sector #1 (does not check deltas)
-    // Assumes a sector size of 512 bytes (VMS does on HDDs and optical drives, dunno about M.O.)
-    // Book only describes ODS-2. Need to test ODS-1 and ODS-5
-    // There is an ODS with signature "DECFILES11A", yet to be seen
-    // Time is a 64 bit unsigned integer, tenths of microseconds since 1858/11/17 00:00:00.
-    // TODO: Implement checksum
     /// <inheritdoc />
-    /// <summary>Implements detection of DEC's On-Disk Structure, aka the ODS filesystem</summary>
-    public sealed class ODS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Files-11 On-Disk Structure";
+    /// <inheritdoc />
+    public Guid Id => new("de20633c-8021-4384-aeb0-83b0df14491f");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Files-11 On-Disk Structure";
-        /// <inheritdoc />
-        public Guid Id => new("de20633c-8021-4384-aeb0-83b0df14491f");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(2 + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
+
+        byte[]      magicB = new byte[12];
+        ErrorNumber errno  = imagePlugin.ReadSector(1 + partition.Start, out byte[] hbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        Array.Copy(hbSector, 0x1F0, magicB, 0, 12);
+        string magic = Encoding.ASCII.GetString(magicB);
+
+        AaruConsole.DebugWriteLine("Files-11 plugin", "magic: \"{0}\"", magic);
+
+        if(magic == "DECFILE11A  " ||
+           magic == "DECFILE11B  ")
+            return true;
+
+        // Optical disc
+        if(imagePlugin.Info.XmlMediaType != XmlMediaType.OpticalDisc)
+            return false;
+
+        if(hbSector.Length < 0x400)
+            return false;
+
+        errno = imagePlugin.ReadSector(partition.Start, out hbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        Array.Copy(hbSector, 0x3F0, magicB, 0, 12);
+        magic = Encoding.ASCII.GetString(magicB);
+
+        AaruConsole.DebugWriteLine("Files-11 plugin", "unaligned magic: \"{0}\"", magic);
+
+        return magic == "DECFILE11A  " || magic == "DECFILE11B  ";
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-1");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        ErrorNumber errno = imagePlugin.ReadSector(1 + partition.Start, out byte[] hbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        HomeBlock homeblock = Marshal.ByteArrayToStructureLittleEndian<HomeBlock>(hbSector);
+
+        // Optical disc
+        if(imagePlugin.Info.XmlMediaType              == XmlMediaType.OpticalDisc &&
+           StringHandlers.CToString(homeblock.format) != "DECFILE11A  "           &&
+           StringHandlers.CToString(homeblock.format) != "DECFILE11B  ")
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
-
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
-
-            byte[]      magicB = new byte[12];
-            ErrorNumber errno  = imagePlugin.ReadSector(1 + partition.Start, out byte[] hbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            Array.Copy(hbSector, 0x1F0, magicB, 0, 12);
-            string magic = Encoding.ASCII.GetString(magicB);
-
-            AaruConsole.DebugWriteLine("Files-11 plugin", "magic: \"{0}\"", magic);
-
-            if(magic == "DECFILE11A  " ||
-               magic == "DECFILE11B  ")
-                return true;
-
-            // Optical disc
-            if(imagePlugin.Info.XmlMediaType != XmlMediaType.OpticalDisc)
-                return false;
-
             if(hbSector.Length < 0x400)
-                return false;
+                return;
 
-            errno = imagePlugin.ReadSector(partition.Start, out hbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            Array.Copy(hbSector, 0x3F0, magicB, 0, 12);
-            magic = Encoding.ASCII.GetString(magicB);
-
-            AaruConsole.DebugWriteLine("Files-11 plugin", "unaligned magic: \"{0}\"", magic);
-
-            return magic == "DECFILE11A  " || magic == "DECFILE11B  ";
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-1");
-            information = "";
-
-            var sb = new StringBuilder();
-
-            ErrorNumber errno = imagePlugin.ReadSector(1 + partition.Start, out byte[] hbSector);
+            errno = imagePlugin.ReadSector(partition.Start, out byte[] tmp);
 
             if(errno != ErrorNumber.NoError)
                 return;
 
-            HomeBlock homeblock = Marshal.ByteArrayToStructureLittleEndian<HomeBlock>(hbSector);
+            hbSector = new byte[0x200];
+            Array.Copy(tmp, 0x200, hbSector, 0, 0x200);
 
-            // Optical disc
-            if(imagePlugin.Info.XmlMediaType              == XmlMediaType.OpticalDisc &&
-               StringHandlers.CToString(homeblock.format) != "DECFILE11A  "           &&
+            homeblock = Marshal.ByteArrayToStructureLittleEndian<HomeBlock>(hbSector);
+
+            if(StringHandlers.CToString(homeblock.format) != "DECFILE11A  " &&
                StringHandlers.CToString(homeblock.format) != "DECFILE11B  ")
-            {
-                if(hbSector.Length < 0x400)
-                    return;
-
-                errno = imagePlugin.ReadSector(partition.Start, out byte[] tmp);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                hbSector = new byte[0x200];
-                Array.Copy(tmp, 0x200, hbSector, 0, 0x200);
-
-                homeblock = Marshal.ByteArrayToStructureLittleEndian<HomeBlock>(hbSector);
-
-                if(StringHandlers.CToString(homeblock.format) != "DECFILE11A  " &&
-                   StringHandlers.CToString(homeblock.format) != "DECFILE11B  ")
-                    return;
-            }
-
-            if((homeblock.struclev & 0xFF00)              != 0x0200 ||
-               (homeblock.struclev & 0xFF)                != 1      ||
-               StringHandlers.CToString(homeblock.format) != "DECFILE11B  ")
-                sb.AppendLine("The following information may be incorrect for this volume.");
-
-            if(homeblock.resfiles < 5 ||
-               homeblock.devtype  != 0)
-                sb.AppendLine("This volume may be corrupted.");
-
-            sb.AppendFormat("Volume format is {0}", StringHandlers.SpacePaddedToString(homeblock.format, Encoding)).
-               AppendLine();
-
-            sb.AppendFormat("Volume is Level {0} revision {1}", (homeblock.struclev & 0xFF00) >> 8,
-                            homeblock.struclev & 0xFF).AppendLine();
-
-            sb.AppendFormat("Lowest structure in the volume is Level {0}, revision {1}",
-                            (homeblock.lowstruclev & 0xFF00) >> 8, homeblock.lowstruclev & 0xFF).AppendLine();
-
-            sb.AppendFormat("Highest structure in the volume is Level {0}, revision {1}",
-                            (homeblock.highstruclev & 0xFF00) >> 8, homeblock.highstruclev & 0xFF).AppendLine();
-
-            sb.AppendFormat("{0} sectors per cluster ({1} bytes)", homeblock.cluster, homeblock.cluster * 512).
-               AppendLine();
-
-            sb.AppendFormat("This home block is on sector {0} (VBN {1})", homeblock.homelbn, homeblock.homevbn).
-               AppendLine();
-
-            sb.AppendFormat("Secondary home block is on sector {0} (VBN {1})", homeblock.alhomelbn,
-                            homeblock.alhomevbn).AppendLine();
-
-            sb.AppendFormat("Volume bitmap starts in sector {0} (VBN {1})", homeblock.ibmaplbn, homeblock.ibmapvbn).
-               AppendLine();
-
-            sb.AppendFormat("Volume bitmap runs for {0} sectors ({1} bytes)", homeblock.ibmapsize,
-                            homeblock.ibmapsize * 512).AppendLine();
-
-            sb.AppendFormat("Backup INDEXF.SYS;1 is in sector {0} (VBN {1})", homeblock.altidxlbn, homeblock.altidxvbn).
-               AppendLine();
-
-            sb.AppendFormat("{0} maximum files on the volume", homeblock.maxfiles).AppendLine();
-            sb.AppendFormat("{0} reserved files", homeblock.resfiles).AppendLine();
-
-            if(homeblock.rvn                                 > 0 &&
-               homeblock.setcount                            > 0 &&
-               StringHandlers.CToString(homeblock.strucname) != "            ")
-                sb.AppendFormat("Volume is {0} of {1} in set \"{2}\".", homeblock.rvn, homeblock.setcount,
-                                StringHandlers.SpacePaddedToString(homeblock.strucname, Encoding)).AppendLine();
-
-            sb.AppendFormat("Volume owner is \"{0}\" (ID 0x{1:X8})",
-                            StringHandlers.SpacePaddedToString(homeblock.ownername, Encoding), homeblock.volowner).
-               AppendLine();
-
-            sb.AppendFormat("Volume label: \"{0}\"", StringHandlers.SpacePaddedToString(homeblock.volname, Encoding)).
-               AppendLine();
-
-            sb.AppendFormat("Drive serial number: 0x{0:X8}", homeblock.serialnum).AppendLine();
-            sb.AppendFormat("Volume was created on {0}", DateHandlers.VmsToDateTime(homeblock.credate)).AppendLine();
-
-            if(homeblock.revdate > 0)
-                sb.AppendFormat("Volume was last modified on {0}", DateHandlers.VmsToDateTime(homeblock.revdate)).
-                   AppendLine();
-
-            if(homeblock.copydate > 0)
-                sb.AppendFormat("Volume copied on {0}", DateHandlers.VmsToDateTime(homeblock.copydate)).AppendLine();
-
-            sb.AppendFormat("Checksums: 0x{0:X4} and 0x{1:X4}", homeblock.checksum1, homeblock.checksum2).AppendLine();
-            sb.AppendLine("Flags:");
-            sb.AppendFormat("Window: {0}", homeblock.window).AppendLine();
-            sb.AppendFormat("Cached directores: {0}", homeblock.lru_lim).AppendLine();
-            sb.AppendFormat("Default allocation: {0} blocks", homeblock.extend).AppendLine();
-
-            if((homeblock.volchar & 0x01) == 0x01)
-                sb.AppendLine("Readings should be verified");
-
-            if((homeblock.volchar & 0x02) == 0x02)
-                sb.AppendLine("Writings should be verified");
-
-            if((homeblock.volchar & 0x04) == 0x04)
-                sb.AppendLine("Files should be erased or overwritten when deleted");
-
-            if((homeblock.volchar & 0x08) == 0x08)
-                sb.AppendLine("Highwater mark is to be disabled");
-
-            if((homeblock.volchar & 0x10) == 0x10)
-                sb.AppendLine("Classification checks are enabled");
-
-            sb.AppendLine("Volume permissions (r = read, w = write, c = create, d = delete)");
-            sb.AppendLine("System, owner, group, world");
-
-            // System
-            sb.Append((homeblock.protect & 0x1000) == 0x1000 ? "-" : "r");
-            sb.Append((homeblock.protect & 0x2000) == 0x2000 ? "-" : "w");
-            sb.Append((homeblock.protect & 0x4000) == 0x4000 ? "-" : "c");
-            sb.Append((homeblock.protect & 0x8000) == 0x8000 ? "-" : "d");
-
-            // Owner
-            sb.Append((homeblock.protect & 0x100) == 0x100 ? "-" : "r");
-            sb.Append((homeblock.protect & 0x200) == 0x200 ? "-" : "w");
-            sb.Append((homeblock.protect & 0x400) == 0x400 ? "-" : "c");
-            sb.Append((homeblock.protect & 0x800) == 0x800 ? "-" : "d");
-
-            // Group
-            sb.Append((homeblock.protect & 0x10) == 0x10 ? "-" : "r");
-            sb.Append((homeblock.protect & 0x20) == 0x20 ? "-" : "w");
-            sb.Append((homeblock.protect & 0x40) == 0x40 ? "-" : "c");
-            sb.Append((homeblock.protect & 0x80) == 0x80 ? "-" : "d");
-
-            // World (other)
-            sb.Append((homeblock.protect & 0x1) == 0x1 ? "-" : "r");
-            sb.Append((homeblock.protect & 0x2) == 0x2 ? "-" : "w");
-            sb.Append((homeblock.protect & 0x4) == 0x4 ? "-" : "c");
-            sb.Append((homeblock.protect & 0x8) == 0x8 ? "-" : "d");
-
-            sb.AppendLine();
-
-            sb.AppendLine("Unknown structures:");
-            sb.AppendFormat("Security mask: 0x{0:X8}", homeblock.sec_mask).AppendLine();
-            sb.AppendFormat("File protection: 0x{0:X4}", homeblock.fileprot).AppendLine();
-            sb.AppendFormat("Record protection: 0x{0:X4}", homeblock.recprot).AppendLine();
-
-            XmlFsType = new FileSystemType
-            {
-                Type         = "FILES-11",
-                ClusterSize  = (uint)(homeblock.cluster * 512),
-                Clusters     = partition.Size / (ulong)(homeblock.cluster * 512),
-                VolumeName   = StringHandlers.SpacePaddedToString(homeblock.volname, Encoding),
-                VolumeSerial = $"{homeblock.serialnum:X8}"
-            };
-
-            if(homeblock.credate > 0)
-            {
-                XmlFsType.CreationDate          = DateHandlers.VmsToDateTime(homeblock.credate);
-                XmlFsType.CreationDateSpecified = true;
-            }
-
-            if(homeblock.revdate > 0)
-            {
-                XmlFsType.ModificationDate          = DateHandlers.VmsToDateTime(homeblock.revdate);
-                XmlFsType.ModificationDateSpecified = true;
-            }
-
-            information = sb.ToString();
+                return;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HomeBlock
+        if((homeblock.struclev & 0xFF00)              != 0x0200 ||
+           (homeblock.struclev & 0xFF)                != 1      ||
+           StringHandlers.CToString(homeblock.format) != "DECFILE11B  ")
+            sb.AppendLine("The following information may be incorrect for this volume.");
+
+        if(homeblock.resfiles < 5 ||
+           homeblock.devtype  != 0)
+            sb.AppendLine("This volume may be corrupted.");
+
+        sb.AppendFormat("Volume format is {0}", StringHandlers.SpacePaddedToString(homeblock.format, Encoding)).
+           AppendLine();
+
+        sb.AppendFormat("Volume is Level {0} revision {1}", (homeblock.struclev & 0xFF00) >> 8,
+                        homeblock.struclev & 0xFF).AppendLine();
+
+        sb.AppendFormat("Lowest structure in the volume is Level {0}, revision {1}",
+                        (homeblock.lowstruclev & 0xFF00) >> 8, homeblock.lowstruclev & 0xFF).AppendLine();
+
+        sb.AppendFormat("Highest structure in the volume is Level {0}, revision {1}",
+                        (homeblock.highstruclev & 0xFF00) >> 8, homeblock.highstruclev & 0xFF).AppendLine();
+
+        sb.AppendFormat("{0} sectors per cluster ({1} bytes)", homeblock.cluster, homeblock.cluster * 512).
+           AppendLine();
+
+        sb.AppendFormat("This home block is on sector {0} (VBN {1})", homeblock.homelbn, homeblock.homevbn).
+           AppendLine();
+
+        sb.AppendFormat("Secondary home block is on sector {0} (VBN {1})", homeblock.alhomelbn,
+                        homeblock.alhomevbn).AppendLine();
+
+        sb.AppendFormat("Volume bitmap starts in sector {0} (VBN {1})", homeblock.ibmaplbn, homeblock.ibmapvbn).
+           AppendLine();
+
+        sb.AppendFormat("Volume bitmap runs for {0} sectors ({1} bytes)", homeblock.ibmapsize,
+                        homeblock.ibmapsize * 512).AppendLine();
+
+        sb.AppendFormat("Backup INDEXF.SYS;1 is in sector {0} (VBN {1})", homeblock.altidxlbn, homeblock.altidxvbn).
+           AppendLine();
+
+        sb.AppendFormat("{0} maximum files on the volume", homeblock.maxfiles).AppendLine();
+        sb.AppendFormat("{0} reserved files", homeblock.resfiles).AppendLine();
+
+        if(homeblock.rvn                                 > 0 &&
+           homeblock.setcount                            > 0 &&
+           StringHandlers.CToString(homeblock.strucname) != "            ")
+            sb.AppendFormat("Volume is {0} of {1} in set \"{2}\".", homeblock.rvn, homeblock.setcount,
+                            StringHandlers.SpacePaddedToString(homeblock.strucname, Encoding)).AppendLine();
+
+        sb.AppendFormat("Volume owner is \"{0}\" (ID 0x{1:X8})",
+                        StringHandlers.SpacePaddedToString(homeblock.ownername, Encoding), homeblock.volowner).
+           AppendLine();
+
+        sb.AppendFormat("Volume label: \"{0}\"", StringHandlers.SpacePaddedToString(homeblock.volname, Encoding)).
+           AppendLine();
+
+        sb.AppendFormat("Drive serial number: 0x{0:X8}", homeblock.serialnum).AppendLine();
+        sb.AppendFormat("Volume was created on {0}", DateHandlers.VmsToDateTime(homeblock.credate)).AppendLine();
+
+        if(homeblock.revdate > 0)
+            sb.AppendFormat("Volume was last modified on {0}", DateHandlers.VmsToDateTime(homeblock.revdate)).
+               AppendLine();
+
+        if(homeblock.copydate > 0)
+            sb.AppendFormat("Volume copied on {0}", DateHandlers.VmsToDateTime(homeblock.copydate)).AppendLine();
+
+        sb.AppendFormat("Checksums: 0x{0:X4} and 0x{1:X4}", homeblock.checksum1, homeblock.checksum2).AppendLine();
+        sb.AppendLine("Flags:");
+        sb.AppendFormat("Window: {0}", homeblock.window).AppendLine();
+        sb.AppendFormat("Cached directores: {0}", homeblock.lru_lim).AppendLine();
+        sb.AppendFormat("Default allocation: {0} blocks", homeblock.extend).AppendLine();
+
+        if((homeblock.volchar & 0x01) == 0x01)
+            sb.AppendLine("Readings should be verified");
+
+        if((homeblock.volchar & 0x02) == 0x02)
+            sb.AppendLine("Writings should be verified");
+
+        if((homeblock.volchar & 0x04) == 0x04)
+            sb.AppendLine("Files should be erased or overwritten when deleted");
+
+        if((homeblock.volchar & 0x08) == 0x08)
+            sb.AppendLine("Highwater mark is to be disabled");
+
+        if((homeblock.volchar & 0x10) == 0x10)
+            sb.AppendLine("Classification checks are enabled");
+
+        sb.AppendLine("Volume permissions (r = read, w = write, c = create, d = delete)");
+        sb.AppendLine("System, owner, group, world");
+
+        // System
+        sb.Append((homeblock.protect & 0x1000) == 0x1000 ? "-" : "r");
+        sb.Append((homeblock.protect & 0x2000) == 0x2000 ? "-" : "w");
+        sb.Append((homeblock.protect & 0x4000) == 0x4000 ? "-" : "c");
+        sb.Append((homeblock.protect & 0x8000) == 0x8000 ? "-" : "d");
+
+        // Owner
+        sb.Append((homeblock.protect & 0x100) == 0x100 ? "-" : "r");
+        sb.Append((homeblock.protect & 0x200) == 0x200 ? "-" : "w");
+        sb.Append((homeblock.protect & 0x400) == 0x400 ? "-" : "c");
+        sb.Append((homeblock.protect & 0x800) == 0x800 ? "-" : "d");
+
+        // Group
+        sb.Append((homeblock.protect & 0x10) == 0x10 ? "-" : "r");
+        sb.Append((homeblock.protect & 0x20) == 0x20 ? "-" : "w");
+        sb.Append((homeblock.protect & 0x40) == 0x40 ? "-" : "c");
+        sb.Append((homeblock.protect & 0x80) == 0x80 ? "-" : "d");
+
+        // World (other)
+        sb.Append((homeblock.protect & 0x1) == 0x1 ? "-" : "r");
+        sb.Append((homeblock.protect & 0x2) == 0x2 ? "-" : "w");
+        sb.Append((homeblock.protect & 0x4) == 0x4 ? "-" : "c");
+        sb.Append((homeblock.protect & 0x8) == 0x8 ? "-" : "d");
+
+        sb.AppendLine();
+
+        sb.AppendLine("Unknown structures:");
+        sb.AppendFormat("Security mask: 0x{0:X8}", homeblock.sec_mask).AppendLine();
+        sb.AppendFormat("File protection: 0x{0:X4}", homeblock.fileprot).AppendLine();
+        sb.AppendFormat("Record protection: 0x{0:X4}", homeblock.recprot).AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            /// <summary>0x000, LBN of THIS home block</summary>
-            public readonly uint homelbn;
-            /// <summary>0x004, LBN of the secondary home block</summary>
-            public readonly uint alhomelbn;
-            /// <summary>0x008, LBN of backup INDEXF.SYS;1</summary>
-            public readonly uint altidxlbn;
-            /// <summary>0x00C, High byte contains filesystem version (1, 2 or 5), low byte contains revision (1)</summary>
-            public readonly ushort struclev;
-            /// <summary>0x00E, Number of blocks each bit of the volume bitmap represents</summary>
-            public readonly ushort cluster;
-            /// <summary>0x010, VBN of THIS home block</summary>
-            public readonly ushort homevbn;
-            /// <summary>0x012, VBN of the secondary home block</summary>
-            public readonly ushort alhomevbn;
-            /// <summary>0x014, VBN of backup INDEXF.SYS;1</summary>
-            public readonly ushort altidxvbn;
-            /// <summary>0x016, VBN of the bitmap</summary>
-            public readonly ushort ibmapvbn;
-            /// <summary>0x018, LBN of the bitmap</summary>
-            public readonly uint ibmaplbn;
-            /// <summary>0x01C, Max files on volume</summary>
-            public readonly uint maxfiles;
-            /// <summary>0x020, Bitmap size in sectors</summary>
-            public readonly ushort ibmapsize;
-            /// <summary>0x022, Reserved files, 5 at minimum</summary>
-            public readonly ushort resfiles;
-            /// <summary>0x024, Device type, ODS-2 defines it as always 0</summary>
-            public readonly ushort devtype;
-            /// <summary>0x026, Relative volume number (number of the volume in a set)</summary>
-            public readonly ushort rvn;
-            /// <summary>0x028, Total number of volumes in the set this volume is</summary>
-            public readonly ushort setcount;
-            /// <summary>0x02A, Flags</summary>
-            public readonly ushort volchar;
-            /// <summary>0x02C, User ID of the volume owner</summary>
-            public readonly uint volowner;
-            /// <summary>0x030, Security mask (??)</summary>
-            public readonly uint sec_mask;
-            /// <summary>0x034, Volume permissions (system, owner, group and other)</summary>
-            public readonly ushort protect;
-            /// <summary>0x036, Default file protection, unsupported in ODS-2</summary>
-            public readonly ushort fileprot;
-            /// <summary>0x038, Default file record protection</summary>
-            public readonly ushort recprot;
-            /// <summary>0x03A, Checksum of all preceding entries</summary>
-            public readonly ushort checksum1;
-            /// <summary>0x03C, Creation date</summary>
-            public readonly ulong credate;
-            /// <summary>0x044, Window size (pointers for the window)</summary>
-            public readonly byte window;
-            /// <summary>0x045, Directories to be stored in cache</summary>
-            public readonly byte lru_lim;
-            /// <summary>0x046, Default allocation size in blocks</summary>
-            public readonly ushort extend;
-            /// <summary>0x048, Minimum file retention period</summary>
-            public readonly ulong retainmin;
-            /// <summary>0x050, Maximum file retention period</summary>
-            public readonly ulong retainmax;
-            /// <summary>0x058, Last modification date</summary>
-            public readonly ulong revdate;
-            /// <summary>0x060, Minimum security class, 20 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] min_class;
-            /// <summary>0x074, Maximum security class, 20 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] max_class;
-            /// <summary>0x088, File lookup table FID</summary>
-            public readonly ushort filetab_fid1;
-            /// <summary>0x08A, File lookup table FID</summary>
-            public readonly ushort filetab_fid2;
-            /// <summary>0x08C, File lookup table FID</summary>
-            public readonly ushort filetab_fid3;
-            /// <summary>0x08E, Lowest structure level on the volume</summary>
-            public readonly ushort lowstruclev;
-            /// <summary>0x090, Highest structure level on the volume</summary>
-            public readonly ushort highstruclev;
-            /// <summary>0x092, Volume copy date (??)</summary>
-            public readonly ulong copydate;
-            /// <summary>0x09A, 302 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 302)]
-            public readonly byte[] reserved1;
-            /// <summary>0x1C8, Physical drive serial number</summary>
-            public readonly uint serialnum;
-            /// <summary>0x1CC, Name of the volume set, 12 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] strucname;
-            /// <summary>0x1D8, Volume label, 12 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] volname;
-            /// <summary>0x1E4, Name of the volume owner, 12 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] ownername;
-            /// <summary>0x1F0, ODS-2 defines it as "DECFILE11B", 12 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] format;
-            /// <summary>0x1FC, Reserved</summary>
-            public readonly ushort reserved2;
-            /// <summary>0x1FE, Checksum of preceding 255 words (16 bit units)</summary>
-            public readonly ushort checksum2;
+            Type         = "FILES-11",
+            ClusterSize  = (uint)(homeblock.cluster * 512),
+            Clusters     = partition.Size / (ulong)(homeblock.cluster * 512),
+            VolumeName   = StringHandlers.SpacePaddedToString(homeblock.volname, Encoding),
+            VolumeSerial = $"{homeblock.serialnum:X8}"
+        };
+
+        if(homeblock.credate > 0)
+        {
+            XmlFsType.CreationDate          = DateHandlers.VmsToDateTime(homeblock.credate);
+            XmlFsType.CreationDateSpecified = true;
         }
+
+        if(homeblock.revdate > 0)
+        {
+            XmlFsType.ModificationDate          = DateHandlers.VmsToDateTime(homeblock.revdate);
+            XmlFsType.ModificationDateSpecified = true;
+        }
+
+        information = sb.ToString();
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HomeBlock
+    {
+        /// <summary>0x000, LBN of THIS home block</summary>
+        public readonly uint homelbn;
+        /// <summary>0x004, LBN of the secondary home block</summary>
+        public readonly uint alhomelbn;
+        /// <summary>0x008, LBN of backup INDEXF.SYS;1</summary>
+        public readonly uint altidxlbn;
+        /// <summary>0x00C, High byte contains filesystem version (1, 2 or 5), low byte contains revision (1)</summary>
+        public readonly ushort struclev;
+        /// <summary>0x00E, Number of blocks each bit of the volume bitmap represents</summary>
+        public readonly ushort cluster;
+        /// <summary>0x010, VBN of THIS home block</summary>
+        public readonly ushort homevbn;
+        /// <summary>0x012, VBN of the secondary home block</summary>
+        public readonly ushort alhomevbn;
+        /// <summary>0x014, VBN of backup INDEXF.SYS;1</summary>
+        public readonly ushort altidxvbn;
+        /// <summary>0x016, VBN of the bitmap</summary>
+        public readonly ushort ibmapvbn;
+        /// <summary>0x018, LBN of the bitmap</summary>
+        public readonly uint ibmaplbn;
+        /// <summary>0x01C, Max files on volume</summary>
+        public readonly uint maxfiles;
+        /// <summary>0x020, Bitmap size in sectors</summary>
+        public readonly ushort ibmapsize;
+        /// <summary>0x022, Reserved files, 5 at minimum</summary>
+        public readonly ushort resfiles;
+        /// <summary>0x024, Device type, ODS-2 defines it as always 0</summary>
+        public readonly ushort devtype;
+        /// <summary>0x026, Relative volume number (number of the volume in a set)</summary>
+        public readonly ushort rvn;
+        /// <summary>0x028, Total number of volumes in the set this volume is</summary>
+        public readonly ushort setcount;
+        /// <summary>0x02A, Flags</summary>
+        public readonly ushort volchar;
+        /// <summary>0x02C, User ID of the volume owner</summary>
+        public readonly uint volowner;
+        /// <summary>0x030, Security mask (??)</summary>
+        public readonly uint sec_mask;
+        /// <summary>0x034, Volume permissions (system, owner, group and other)</summary>
+        public readonly ushort protect;
+        /// <summary>0x036, Default file protection, unsupported in ODS-2</summary>
+        public readonly ushort fileprot;
+        /// <summary>0x038, Default file record protection</summary>
+        public readonly ushort recprot;
+        /// <summary>0x03A, Checksum of all preceding entries</summary>
+        public readonly ushort checksum1;
+        /// <summary>0x03C, Creation date</summary>
+        public readonly ulong credate;
+        /// <summary>0x044, Window size (pointers for the window)</summary>
+        public readonly byte window;
+        /// <summary>0x045, Directories to be stored in cache</summary>
+        public readonly byte lru_lim;
+        /// <summary>0x046, Default allocation size in blocks</summary>
+        public readonly ushort extend;
+        /// <summary>0x048, Minimum file retention period</summary>
+        public readonly ulong retainmin;
+        /// <summary>0x050, Maximum file retention period</summary>
+        public readonly ulong retainmax;
+        /// <summary>0x058, Last modification date</summary>
+        public readonly ulong revdate;
+        /// <summary>0x060, Minimum security class, 20 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] min_class;
+        /// <summary>0x074, Maximum security class, 20 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] max_class;
+        /// <summary>0x088, File lookup table FID</summary>
+        public readonly ushort filetab_fid1;
+        /// <summary>0x08A, File lookup table FID</summary>
+        public readonly ushort filetab_fid2;
+        /// <summary>0x08C, File lookup table FID</summary>
+        public readonly ushort filetab_fid3;
+        /// <summary>0x08E, Lowest structure level on the volume</summary>
+        public readonly ushort lowstruclev;
+        /// <summary>0x090, Highest structure level on the volume</summary>
+        public readonly ushort highstruclev;
+        /// <summary>0x092, Volume copy date (??)</summary>
+        public readonly ulong copydate;
+        /// <summary>0x09A, 302 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 302)]
+        public readonly byte[] reserved1;
+        /// <summary>0x1C8, Physical drive serial number</summary>
+        public readonly uint serialnum;
+        /// <summary>0x1CC, Name of the volume set, 12 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] strucname;
+        /// <summary>0x1D8, Volume label, 12 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] volname;
+        /// <summary>0x1E4, Name of the volume owner, 12 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] ownername;
+        /// <summary>0x1F0, ODS-2 defines it as "DECFILE11B", 12 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] format;
+        /// <summary>0x1FC, Reserved</summary>
+        public readonly ushort reserved2;
+        /// <summary>0x1FE, Checksum of preceding 255 words (16 bit units)</summary>
+        public readonly ushort checksum2;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Opera/Consts.cs b/Aaru.Filesystems/Opera/Consts.cs
index 40d53fc44..5f56476cb 100644
--- a/Aaru.Filesystems/Opera/Consts.cs
+++ b/Aaru.Filesystems/Opera/Consts.cs
@@ -33,27 +33,26 @@
 using System.Diagnostics.CodeAnalysis;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class OperaFS
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class OperaFS
+    const string SYNC       = "ZZZZZ";
+    const uint   FLAGS_MASK = 0xFF;
+    const int    MAX_NAME   = 32;
+
+    /// <summary>Directory</summary>
+    const uint TYPE_DIR = 0x2A646972;
+    /// <summary>Disc label</summary>
+    const uint TYPE_LBL = 0x2A6C626C;
+    /// <summary>Catapult</summary>
+    const uint TYPE_ZAP = 0x2A7A6170;
+    static readonly int _directoryEntrySize = Marshal.SizeOf<DirectoryEntry>();
+
+    enum FileFlags : uint
     {
-        const string SYNC       = "ZZZZZ";
-        const uint   FLAGS_MASK = 0xFF;
-        const int    MAX_NAME   = 32;
-
-        /// <summary>Directory</summary>
-        const uint TYPE_DIR = 0x2A646972;
-        /// <summary>Disc label</summary>
-        const uint TYPE_LBL = 0x2A6C626C;
-        /// <summary>Catapult</summary>
-        const uint TYPE_ZAP = 0x2A7A6170;
-        static readonly int _directoryEntrySize = Marshal.SizeOf<DirectoryEntry>();
-
-        enum FileFlags : uint
-        {
-            File             = 2, Special            = 6, Directory = 7,
-            LastEntryInBlock = 0x40000000, LastEntry = 0x80000000
-        }
+        File             = 2, Special            = 6, Directory = 7,
+        LastEntryInBlock = 0x40000000, LastEntry = 0x80000000
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Opera/Dir.cs b/Aaru.Filesystems/Opera/Dir.cs
index e998de780..779effb9a 100644
--- a/Aaru.Filesystems/Opera/Dir.cs
+++ b/Aaru.Filesystems/Opera/Dir.cs
@@ -37,45 +37,59 @@ using System.Linq;
 using Aaru.CommonTypes.Enums;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class OperaFS
 {
-    public sealed partial class OperaFS
+    /// <inheritdoc />
+    public ErrorNumber ReadDir(string path, out List<string> contents)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadDir(string path, out List<string> contents)
+        contents = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(string.IsNullOrWhiteSpace(path) ||
+           path == "/")
         {
-            contents = null;
+            contents = _rootDirectoryCache.Keys.ToList();
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            return ErrorNumber.NoError;
+        }
 
-            if(string.IsNullOrWhiteSpace(path) ||
-               path == "/")
-            {
-                contents = _rootDirectoryCache.Keys.ToList();
+        string cutPath = path.StartsWith("/", StringComparison.Ordinal)
+                             ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
+                             : path.ToLower(CultureInfo.CurrentUICulture);
 
-                return ErrorNumber.NoError;
-            }
+        if(_directoryCache.TryGetValue(cutPath,
+                                       out Dictionary<string, DirectoryEntryWithPointers> currentDirectory))
+        {
+            contents = currentDirectory.Keys.ToList();
 
-            string cutPath = path.StartsWith("/", StringComparison.Ordinal)
-                                 ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
-                                 : path.ToLower(CultureInfo.CurrentUICulture);
+            return ErrorNumber.NoError;
+        }
 
-            if(_directoryCache.TryGetValue(cutPath,
-                                           out Dictionary<string, DirectoryEntryWithPointers> currentDirectory))
-            {
-                contents = currentDirectory.Keys.ToList();
+        string[] pieces = cutPath.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-                return ErrorNumber.NoError;
-            }
+        KeyValuePair<string, DirectoryEntryWithPointers> entry =
+            _rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[0]);
 
-            string[] pieces = cutPath.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        if(string.IsNullOrEmpty(entry.Key))
+            return ErrorNumber.NoSuchFile;
 
-            KeyValuePair<string, DirectoryEntryWithPointers> entry =
-                _rootDirectoryCache.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[0]);
+        if((entry.Value.Entry.flags & FLAGS_MASK) != (int)FileFlags.Directory)
+            return ErrorNumber.NotDirectory;
+
+        string currentPath = pieces[0];
+
+        currentDirectory = _rootDirectoryCache;
+
+        for(int p = 0; p < pieces.Length; p++)
+        {
+            entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[p]);
 
             if(string.IsNullOrEmpty(entry.Key))
                 return ErrorNumber.NoSuchFile;
@@ -83,90 +97,75 @@ namespace Aaru.Filesystems
             if((entry.Value.Entry.flags & FLAGS_MASK) != (int)FileFlags.Directory)
                 return ErrorNumber.NotDirectory;
 
-            string currentPath = pieces[0];
+            currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
 
-            currentDirectory = _rootDirectoryCache;
+            if(_directoryCache.TryGetValue(currentPath, out currentDirectory))
+                continue;
 
-            for(int p = 0; p < pieces.Length; p++)
+            if(entry.Value.Pointers.Length < 1)
+                return ErrorNumber.InvalidArgument;
+
+            currentDirectory = DecodeDirectory((int)entry.Value.Pointers[0]);
+
+            _directoryCache.Add(currentPath, currentDirectory);
+        }
+
+        contents = currentDirectory?.Keys.ToList();
+
+        return ErrorNumber.NoError;
+    }
+
+    Dictionary<string, DirectoryEntryWithPointers> DecodeDirectory(int firstBlock)
+    {
+        Dictionary<string, DirectoryEntryWithPointers> entries = new();
+
+        int nextBlock = firstBlock;
+
+        DirectoryHeader header;
+
+        do
+        {
+            ErrorNumber errno = _image.ReadSectors((ulong)(nextBlock * _volumeBlockSizeRatio),
+                                                   _volumeBlockSizeRatio, out byte[] data);
+
+            if(errno != ErrorNumber.NoError)
+                break;
+
+            header    = Marshal.ByteArrayToStructureBigEndian<DirectoryHeader>(data);
+            nextBlock = header.next_block + firstBlock;
+
+            int off = (int)header.first_used;
+
+            var entry = new DirectoryEntry();
+
+            while(off + _directoryEntrySize < data.Length)
             {
-                entry = currentDirectory.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[p]);
+                entry = Marshal.ByteArrayToStructureBigEndian<DirectoryEntry>(data, off, _directoryEntrySize);
+                string name = StringHandlers.CToString(entry.name, Encoding);
 
-                if(string.IsNullOrEmpty(entry.Key))
-                    return ErrorNumber.NoSuchFile;
+                var entryWithPointers = new DirectoryEntryWithPointers
+                {
+                    Entry    = entry,
+                    Pointers = new uint[entry.last_copy + 1]
+                };
 
-                if((entry.Value.Entry.flags & FLAGS_MASK) != (int)FileFlags.Directory)
-                    return ErrorNumber.NotDirectory;
+                for(int i = 0; i <= entry.last_copy; i++)
+                    entryWithPointers.Pointers[i] =
+                        BigEndianBitConverter.ToUInt32(data, off + _directoryEntrySize + (i * 4));
 
-                currentPath = p == 0 ? pieces[0] : $"{currentPath}/{pieces[p]}";
+                entries.Add(name, entryWithPointers);
 
-                if(_directoryCache.TryGetValue(currentPath, out currentDirectory))
-                    continue;
+                if((entry.flags & (uint)FileFlags.LastEntry)        != 0 ||
+                   (entry.flags & (uint)FileFlags.LastEntryInBlock) != 0)
+                    break;
 
-                if(entry.Value.Pointers.Length < 1)
-                    return ErrorNumber.InvalidArgument;
-
-                currentDirectory = DecodeDirectory((int)entry.Value.Pointers[0]);
-
-                _directoryCache.Add(currentPath, currentDirectory);
+                off += (int)(_directoryEntrySize + ((entry.last_copy + 1) * 4));
             }
 
-            contents = currentDirectory?.Keys.ToList();
+            if((entry.flags & (uint)FileFlags.LastEntry) != 0)
+                break;
+        } while(header.next_block != -1);
 
-            return ErrorNumber.NoError;
-        }
-
-        Dictionary<string, DirectoryEntryWithPointers> DecodeDirectory(int firstBlock)
-        {
-            Dictionary<string, DirectoryEntryWithPointers> entries = new();
-
-            int nextBlock = firstBlock;
-
-            DirectoryHeader header;
-
-            do
-            {
-                ErrorNumber errno = _image.ReadSectors((ulong)(nextBlock * _volumeBlockSizeRatio),
-                                                       _volumeBlockSizeRatio, out byte[] data);
-
-                if(errno != ErrorNumber.NoError)
-                    break;
-
-                header    = Marshal.ByteArrayToStructureBigEndian<DirectoryHeader>(data);
-                nextBlock = header.next_block + firstBlock;
-
-                int off = (int)header.first_used;
-
-                var entry = new DirectoryEntry();
-
-                while(off + _directoryEntrySize < data.Length)
-                {
-                    entry = Marshal.ByteArrayToStructureBigEndian<DirectoryEntry>(data, off, _directoryEntrySize);
-                    string name = StringHandlers.CToString(entry.name, Encoding);
-
-                    var entryWithPointers = new DirectoryEntryWithPointers
-                    {
-                        Entry    = entry,
-                        Pointers = new uint[entry.last_copy + 1]
-                    };
-
-                    for(int i = 0; i <= entry.last_copy; i++)
-                        entryWithPointers.Pointers[i] =
-                            BigEndianBitConverter.ToUInt32(data, off + _directoryEntrySize + (i * 4));
-
-                    entries.Add(name, entryWithPointers);
-
-                    if((entry.flags & (uint)FileFlags.LastEntry)        != 0 ||
-                       (entry.flags & (uint)FileFlags.LastEntryInBlock) != 0)
-                        break;
-
-                    off += (int)(_directoryEntrySize + ((entry.last_copy + 1) * 4));
-                }
-
-                if((entry.flags & (uint)FileFlags.LastEntry) != 0)
-                    break;
-            } while(header.next_block != -1);
-
-            return entries;
-        }
+        return entries;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Opera/File.cs b/Aaru.Filesystems/Opera/File.cs
index a5b1a4f99..2a5d25561 100644
--- a/Aaru.Filesystems/Opera/File.cs
+++ b/Aaru.Filesystems/Opera/File.cs
@@ -37,189 +37,188 @@ using System.Linq;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class OperaFS
 {
-    public sealed partial class OperaFS
+    /// <inheritdoc />
+    public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
     {
-        /// <inheritdoc />
-        public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
+        deviceBlock = 0;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = GetFileEntry(path, out DirectoryEntryWithPointers entry);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        if((entry.Entry.flags & FLAGS_MASK) == (uint)FileFlags.Directory &&
+           !_debug)
+            return ErrorNumber.IsDirectory;
+
+        deviceBlock = entry.Pointers[0] + fileBlock;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+    {
+        attributes = new FileAttributes();
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = Stat(path, out FileEntryInfo stat);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        attributes = stat.Attributes;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+    {
+        buf = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = GetFileEntry(path, out DirectoryEntryWithPointers entry);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        if((entry.Entry.flags & FLAGS_MASK) == (uint)FileFlags.Directory &&
+           !_debug)
+            return ErrorNumber.IsDirectory;
+
+        if(entry.Pointers.Length < 1)
+            return ErrorNumber.InvalidArgument;
+
+        if(entry.Entry.byte_count == 0)
         {
-            deviceBlock = 0;
+            buf = Array.Empty<byte>();
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            return ErrorNumber.NoError;
+        }
 
-            ErrorNumber err = GetFileEntry(path, out DirectoryEntryWithPointers entry);
+        if(offset >= entry.Entry.byte_count)
+            return ErrorNumber.InvalidArgument;
+
+        if(size + offset >= entry.Entry.byte_count)
+            size = entry.Entry.byte_count - offset;
+
+        long firstBlock    = offset                 / entry.Entry.block_size;
+        long offsetInBlock = offset                 % entry.Entry.block_size;
+        long sizeInBlocks  = (size + offsetInBlock) / entry.Entry.block_size;
+
+        if((size + offsetInBlock) % entry.Entry.block_size > 0)
+            sizeInBlocks++;
+
+        uint fileBlockSizeRatio;
+
+        if(_image.Info.SectorSize == 2336 ||
+           _image.Info.SectorSize == 2352 ||
+           _image.Info.SectorSize == 2448)
+            fileBlockSizeRatio = entry.Entry.block_size / 2048;
+        else
+            fileBlockSizeRatio = entry.Entry.block_size / _image.Info.SectorSize;
+
+        ErrorNumber errno = _image.ReadSectors((ulong)(entry.Pointers[0] + (firstBlock * fileBlockSizeRatio)),
+                                               (uint)(sizeInBlocks * fileBlockSizeRatio), out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        buf = new byte[size];
+        Array.Copy(buffer, offsetInBlock, buf, 0, size);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Stat(string path, out FileEntryInfo stat)
+    {
+        stat = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        ErrorNumber err = GetFileEntry(path, out DirectoryEntryWithPointers entryWithPointers);
+
+        if(err != ErrorNumber.NoError)
+            return err;
+
+        DirectoryEntry entry = entryWithPointers.Entry;
+
+        stat = new FileEntryInfo
+        {
+            Attributes = new FileAttributes(),
+            Blocks     = entry.block_count,
+            BlockSize  = entry.block_size,
+            Length     = entry.byte_count,
+            Inode      = entry.id,
+            Links      = (ulong)entryWithPointers.Pointers.Length
+        };
+
+        var flags = (FileFlags)(entry.flags & FLAGS_MASK);
+
+        if(flags == FileFlags.Directory)
+            stat.Attributes |= FileAttributes.Directory;
+
+        if(flags == FileFlags.Special)
+            stat.Attributes |= FileAttributes.Device;
+
+        return ErrorNumber.NoError;
+    }
+
+    ErrorNumber GetFileEntry(string path, out DirectoryEntryWithPointers entry)
+    {
+        entry = null;
+
+        string cutPath = path.StartsWith("/", StringComparison.Ordinal)
+                             ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
+                             : path.ToLower(CultureInfo.CurrentUICulture);
+
+        string[] pieces = cutPath.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
+
+        if(pieces.Length == 0)
+            return ErrorNumber.InvalidArgument;
+
+        string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
+
+        if(!_directoryCache.TryGetValue(parentPath, out _))
+        {
+            ErrorNumber err = ReadDir(parentPath, out _);
 
             if(err != ErrorNumber.NoError)
                 return err;
-
-            if((entry.Entry.flags & FLAGS_MASK) == (uint)FileFlags.Directory &&
-               !_debug)
-                return ErrorNumber.IsDirectory;
-
-            deviceBlock = entry.Pointers[0] + fileBlock;
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
-        {
-            attributes = new FileAttributes();
+        Dictionary<string, DirectoryEntryWithPointers> parent;
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        if(pieces.Length == 1)
+            parent = _rootDirectoryCache;
+        else if(!_directoryCache.TryGetValue(parentPath, out parent))
+            return ErrorNumber.InvalidArgument;
 
-            ErrorNumber err = Stat(path, out FileEntryInfo stat);
+        KeyValuePair<string, DirectoryEntryWithPointers> dirent =
+            parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[^1]);
 
-            if(err != ErrorNumber.NoError)
-                return err;
+        if(string.IsNullOrEmpty(dirent.Key))
+            return ErrorNumber.NoSuchFile;
 
-            attributes = stat.Attributes;
+        entry = dirent.Value;
 
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
-        {
-            buf = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = GetFileEntry(path, out DirectoryEntryWithPointers entry);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            if((entry.Entry.flags & FLAGS_MASK) == (uint)FileFlags.Directory &&
-               !_debug)
-                return ErrorNumber.IsDirectory;
-
-            if(entry.Pointers.Length < 1)
-                return ErrorNumber.InvalidArgument;
-
-            if(entry.Entry.byte_count == 0)
-            {
-                buf = Array.Empty<byte>();
-
-                return ErrorNumber.NoError;
-            }
-
-            if(offset >= entry.Entry.byte_count)
-                return ErrorNumber.InvalidArgument;
-
-            if(size + offset >= entry.Entry.byte_count)
-                size = entry.Entry.byte_count - offset;
-
-            long firstBlock    = offset                 / entry.Entry.block_size;
-            long offsetInBlock = offset                 % entry.Entry.block_size;
-            long sizeInBlocks  = (size + offsetInBlock) / entry.Entry.block_size;
-
-            if((size + offsetInBlock) % entry.Entry.block_size > 0)
-                sizeInBlocks++;
-
-            uint fileBlockSizeRatio;
-
-            if(_image.Info.SectorSize == 2336 ||
-               _image.Info.SectorSize == 2352 ||
-               _image.Info.SectorSize == 2448)
-                fileBlockSizeRatio = entry.Entry.block_size / 2048;
-            else
-                fileBlockSizeRatio = entry.Entry.block_size / _image.Info.SectorSize;
-
-            ErrorNumber errno = _image.ReadSectors((ulong)(entry.Pointers[0] + (firstBlock * fileBlockSizeRatio)),
-                                                   (uint)(sizeInBlocks * fileBlockSizeRatio), out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            buf = new byte[size];
-            Array.Copy(buffer, offsetInBlock, buf, 0, size);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Stat(string path, out FileEntryInfo stat)
-        {
-            stat = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            ErrorNumber err = GetFileEntry(path, out DirectoryEntryWithPointers entryWithPointers);
-
-            if(err != ErrorNumber.NoError)
-                return err;
-
-            DirectoryEntry entry = entryWithPointers.Entry;
-
-            stat = new FileEntryInfo
-            {
-                Attributes = new FileAttributes(),
-                Blocks     = entry.block_count,
-                BlockSize  = entry.block_size,
-                Length     = entry.byte_count,
-                Inode      = entry.id,
-                Links      = (ulong)entryWithPointers.Pointers.Length
-            };
-
-            var flags = (FileFlags)(entry.flags & FLAGS_MASK);
-
-            if(flags == FileFlags.Directory)
-                stat.Attributes |= FileAttributes.Directory;
-
-            if(flags == FileFlags.Special)
-                stat.Attributes |= FileAttributes.Device;
-
-            return ErrorNumber.NoError;
-        }
-
-        ErrorNumber GetFileEntry(string path, out DirectoryEntryWithPointers entry)
-        {
-            entry = null;
-
-            string cutPath = path.StartsWith("/", StringComparison.Ordinal)
-                                 ? path.Substring(1).ToLower(CultureInfo.CurrentUICulture)
-                                 : path.ToLower(CultureInfo.CurrentUICulture);
-
-            string[] pieces = cutPath.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
-
-            if(pieces.Length == 0)
-                return ErrorNumber.InvalidArgument;
-
-            string parentPath = string.Join("/", pieces, 0, pieces.Length - 1);
-
-            if(!_directoryCache.TryGetValue(parentPath, out _))
-            {
-                ErrorNumber err = ReadDir(parentPath, out _);
-
-                if(err != ErrorNumber.NoError)
-                    return err;
-            }
-
-            Dictionary<string, DirectoryEntryWithPointers> parent;
-
-            if(pieces.Length == 1)
-                parent = _rootDirectoryCache;
-            else if(!_directoryCache.TryGetValue(parentPath, out parent))
-                return ErrorNumber.InvalidArgument;
-
-            KeyValuePair<string, DirectoryEntryWithPointers> dirent =
-                parent.FirstOrDefault(t => t.Key.ToLower(CultureInfo.CurrentUICulture) == pieces[^1]);
-
-            if(string.IsNullOrEmpty(dirent.Key))
-                return ErrorNumber.NoSuchFile;
-
-            entry = dirent.Value;
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Opera/Info.cs b/Aaru.Filesystems/Opera/Info.cs
index b099e2c85..ac62715a0 100644
--- a/Aaru.Filesystems/Opera/Info.cs
+++ b/Aaru.Filesystems/Opera/Info.cs
@@ -38,111 +38,110 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class OperaFS
 {
-    public sealed partial class OperaFS
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            if(2 + partition.Start >= partition.End)
-                return false;
+        if(2 + partition.Start >= partition.End)
+            return false;
 
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] sbSector);
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] sbSector);
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+        if(errno != ErrorNumber.NoError)
+            return false;
 
-            byte[] syncBytes = new byte[5];
+        byte[] syncBytes = new byte[5];
 
-            byte recordType = sbSector[0x000];
-            Array.Copy(sbSector, 0x001, syncBytes, 0, 5);
-            byte recordVersion = sbSector[0x006];
+        byte recordType = sbSector[0x000];
+        Array.Copy(sbSector, 0x001, syncBytes, 0, 5);
+        byte recordVersion = sbSector[0x006];
 
-            if(recordType    != 1 ||
-               recordVersion != 1)
-                return false;
+        if(recordType    != 1 ||
+           recordVersion != 1)
+            return false;
 
-            return Encoding.ASCII.GetString(syncBytes) == SYNC;
-        }
+        return Encoding.ASCII.GetString(syncBytes) == SYNC;
+    }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            // TODO: Find correct default encoding
-            Encoding    = Encoding.ASCII;
-            information = "";
-            var superBlockMetadata = new StringBuilder();
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        // TODO: Find correct default encoding
+        Encoding    = Encoding.ASCII;
+        information = "";
+        var superBlockMetadata = new StringBuilder();
 
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] sbSector);
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] sbSector);
 
-            if(errno != ErrorNumber.NoError)
-                return;
+        if(errno != ErrorNumber.NoError)
+            return;
 
-            SuperBlock sb = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sbSector);
+        SuperBlock sb = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sbSector);
 
-            if(sb.record_type    != 1 ||
-               sb.record_version != 1)
-                return;
+        if(sb.record_type    != 1 ||
+           sb.record_version != 1)
+            return;
 
-            if(Encoding.ASCII.GetString(sb.sync_bytes) != SYNC)
-                return;
+        if(Encoding.ASCII.GetString(sb.sync_bytes) != SYNC)
+            return;
 
-            superBlockMetadata.AppendFormat("Opera filesystem disc.").AppendLine();
-
-            if(!string.IsNullOrEmpty(StringHandlers.CToString(sb.volume_label, Encoding)))
-                superBlockMetadata.
-                    AppendFormat("Volume label: {0}", StringHandlers.CToString(sb.volume_label, Encoding)).AppendLine();
-
-            if(!string.IsNullOrEmpty(StringHandlers.CToString(sb.volume_comment, Encoding)))
-                superBlockMetadata.
-                    AppendFormat("Volume comment: {0}", StringHandlers.CToString(sb.volume_comment, Encoding)).
-                    AppendLine();
-
-            superBlockMetadata.AppendFormat("Volume identifier: 0x{0:X8}", sb.volume_id).AppendLine();
-            superBlockMetadata.AppendFormat("Block size: {0} bytes", sb.block_size).AppendLine();
-
-            if(imagePlugin.Info.SectorSize == 2336 ||
-               imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448)
-            {
-                if(sb.block_size != 2048)
-                    superBlockMetadata.
-                        AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/block",
-                                     sb.block_size, 2048);
-            }
-            else if(imagePlugin.Info.SectorSize != sb.block_size)
-                superBlockMetadata.
-                    AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/block",
-                                 sb.block_size, imagePlugin.Info.SectorSize);
+        superBlockMetadata.AppendFormat("Opera filesystem disc.").AppendLine();
 
+        if(!string.IsNullOrEmpty(StringHandlers.CToString(sb.volume_label, Encoding)))
             superBlockMetadata.
-                AppendFormat("Volume size: {0} blocks, {1} bytes", sb.block_count, sb.block_size * sb.block_count).
+                AppendFormat("Volume label: {0}", StringHandlers.CToString(sb.volume_label, Encoding)).AppendLine();
+
+        if(!string.IsNullOrEmpty(StringHandlers.CToString(sb.volume_comment, Encoding)))
+            superBlockMetadata.
+                AppendFormat("Volume comment: {0}", StringHandlers.CToString(sb.volume_comment, Encoding)).
                 AppendLine();
 
-            if(sb.block_count > imagePlugin.Info.Sectors)
+        superBlockMetadata.AppendFormat("Volume identifier: 0x{0:X8}", sb.volume_id).AppendLine();
+        superBlockMetadata.AppendFormat("Block size: {0} bytes", sb.block_size).AppendLine();
+
+        if(imagePlugin.Info.SectorSize == 2336 ||
+           imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448)
+        {
+            if(sb.block_size != 2048)
                 superBlockMetadata.
-                    AppendFormat("WARNING: Filesystem indicates {0} blocks while device indicates {1} blocks",
-                                 sb.block_count, imagePlugin.Info.Sectors);
-
-            superBlockMetadata.AppendFormat("Root directory identifier: 0x{0:X8}", sb.root_dirid).AppendLine();
-            superBlockMetadata.AppendFormat("Root directory block size: {0} bytes", sb.rootdir_bsize).AppendLine();
-
-            superBlockMetadata.AppendFormat("Root directory size: {0} blocks, {1} bytes", sb.rootdir_blocks,
-                                            sb.rootdir_bsize * sb.rootdir_blocks).AppendLine();
-
-            superBlockMetadata.AppendFormat("Last root directory copy: {0}", sb.last_root_copy).AppendLine();
-
-            information = superBlockMetadata.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type        = "Opera",
-                VolumeName  = StringHandlers.CToString(sb.volume_label, Encoding),
-                ClusterSize = sb.block_size,
-                Clusters    = sb.block_count
-            };
+                    AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/block",
+                                 sb.block_size, 2048);
         }
+        else if(imagePlugin.Info.SectorSize != sb.block_size)
+            superBlockMetadata.
+                AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/block",
+                             sb.block_size, imagePlugin.Info.SectorSize);
+
+        superBlockMetadata.
+            AppendFormat("Volume size: {0} blocks, {1} bytes", sb.block_count, sb.block_size * sb.block_count).
+            AppendLine();
+
+        if(sb.block_count > imagePlugin.Info.Sectors)
+            superBlockMetadata.
+                AppendFormat("WARNING: Filesystem indicates {0} blocks while device indicates {1} blocks",
+                             sb.block_count, imagePlugin.Info.Sectors);
+
+        superBlockMetadata.AppendFormat("Root directory identifier: 0x{0:X8}", sb.root_dirid).AppendLine();
+        superBlockMetadata.AppendFormat("Root directory block size: {0} bytes", sb.rootdir_bsize).AppendLine();
+
+        superBlockMetadata.AppendFormat("Root directory size: {0} blocks, {1} bytes", sb.rootdir_blocks,
+                                        sb.rootdir_bsize * sb.rootdir_blocks).AppendLine();
+
+        superBlockMetadata.AppendFormat("Last root directory copy: {0}", sb.last_root_copy).AppendLine();
+
+        information = superBlockMetadata.ToString();
+
+        XmlFsType = new FileSystemType
+        {
+            Type        = "Opera",
+            VolumeName  = StringHandlers.CToString(sb.volume_label, Encoding),
+            ClusterSize = sb.block_size,
+            Clusters    = sb.block_count
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Opera/Opera.cs b/Aaru.Filesystems/Opera/Opera.cs
index 7cc8688c8..ae5b4b8af 100644
--- a/Aaru.Filesystems/Opera/Opera.cs
+++ b/Aaru.Filesystems/Opera/Opera.cs
@@ -38,63 +38,62 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements the 3DO Opera filesystem</summary>
+public sealed partial class OperaFS : IReadOnlyFilesystem
 {
+    bool                                                               _debug;
+    Dictionary<string, Dictionary<string, DirectoryEntryWithPointers>> _directoryCache;
+    IMediaImage                                                        _image;
+    bool                                                               _mounted;
+    Dictionary<string, DirectoryEntryWithPointers>                     _rootDirectoryCache;
+    FileSystemInfo                                                     _statfs;
+    uint                                                               _volumeBlockSizeRatio;
+
     /// <inheritdoc />
-    /// <summary>Implements the 3DO Opera filesystem</summary>
-    public sealed partial class OperaFS : IReadOnlyFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Opera Filesystem Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("0ec84ec7-eae6-4196-83fe-943b3fe46dbd");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public ErrorNumber ListXAttr(string path, out List<string> xattrs)
     {
-        bool                                                               _debug;
-        Dictionary<string, Dictionary<string, DirectoryEntryWithPointers>> _directoryCache;
-        IMediaImage                                                        _image;
-        bool                                                               _mounted;
-        Dictionary<string, DirectoryEntryWithPointers>                     _rootDirectoryCache;
-        FileSystemInfo                                                     _statfs;
-        uint                                                               _volumeBlockSizeRatio;
+        xattrs = null;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Opera Filesystem Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("0ec84ec7-eae6-4196-83fe-943b3fe46dbd");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public ErrorNumber ListXAttr(string path, out List<string> xattrs)
-        {
-            xattrs = null;
-
-            return ErrorNumber.NotSupported;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf) => ErrorNumber.NotSupported;
-
-        /// <inheritdoc />
-        public ErrorNumber ReadLink(string path, out string dest)
-        {
-            dest = null;
-
-            return ErrorNumber.NotSupported;
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[]
-                {};
-
-        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => null;
-
-        static Dictionary<string, string> GetDefaultOptions() => new()
-        {
-            {
-                "debug", false.ToString()
-            }
-        };
+        return ErrorNumber.NotSupported;
     }
+
+    /// <inheritdoc />
+    public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf) => ErrorNumber.NotSupported;
+
+    /// <inheritdoc />
+    public ErrorNumber ReadLink(string path, out string dest)
+    {
+        dest = null;
+
+        return ErrorNumber.NotSupported;
+    }
+
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
+        new (string name, Type type, string description)[]
+            {};
+
+    /// <inheritdoc />
+    public Dictionary<string, string> Namespaces => null;
+
+    static Dictionary<string, string> GetDefaultOptions() => new()
+    {
+        {
+            "debug", false.ToString()
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Opera/Structs.cs b/Aaru.Filesystems/Opera/Structs.cs
index 3a04400da..122277aed 100644
--- a/Aaru.Filesystems/Opera/Structs.cs
+++ b/Aaru.Filesystems/Opera/Structs.cs
@@ -32,89 +32,88 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class OperaFS
 {
-    public sealed partial class OperaFS
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            /// <summary>0x000, Record type, must be 1</summary>
-            public readonly byte record_type;
-            /// <summary>0x001, 5 bytes, "ZZZZZ"</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] sync_bytes;
-            /// <summary>0x006, Record version, must be 1</summary>
-            public readonly byte record_version;
-            /// <summary>0x007, Volume flags</summary>
-            public readonly byte volume_flags;
-            /// <summary>0x008, 32 bytes, volume comment</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_NAME)]
-            public readonly byte[] volume_comment;
-            /// <summary>0x028, 32 bytes, volume label</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_NAME)]
-            public readonly byte[] volume_label;
-            /// <summary>0x048, Volume ID</summary>
-            public readonly uint volume_id;
-            /// <summary>0x04C, Block size in bytes</summary>
-            public readonly uint block_size;
-            /// <summary>0x050, Blocks in volume</summary>
-            public readonly uint block_count;
-            /// <summary>0x054, Root directory ID</summary>
-            public readonly uint root_dirid;
-            /// <summary>0x058, Root directory blocks</summary>
-            public readonly uint rootdir_blocks;
-            /// <summary>0x05C, Root directory block size</summary>
-            public readonly uint rootdir_bsize;
-            /// <summary>0x060, Last root directory copy</summary>
-            public readonly uint last_root_copy;
-        }
+        /// <summary>0x000, Record type, must be 1</summary>
+        public readonly byte record_type;
+        /// <summary>0x001, 5 bytes, "ZZZZZ"</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] sync_bytes;
+        /// <summary>0x006, Record version, must be 1</summary>
+        public readonly byte record_version;
+        /// <summary>0x007, Volume flags</summary>
+        public readonly byte volume_flags;
+        /// <summary>0x008, 32 bytes, volume comment</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_NAME)]
+        public readonly byte[] volume_comment;
+        /// <summary>0x028, 32 bytes, volume label</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_NAME)]
+        public readonly byte[] volume_label;
+        /// <summary>0x048, Volume ID</summary>
+        public readonly uint volume_id;
+        /// <summary>0x04C, Block size in bytes</summary>
+        public readonly uint block_size;
+        /// <summary>0x050, Blocks in volume</summary>
+        public readonly uint block_count;
+        /// <summary>0x054, Root directory ID</summary>
+        public readonly uint root_dirid;
+        /// <summary>0x058, Root directory blocks</summary>
+        public readonly uint rootdir_blocks;
+        /// <summary>0x05C, Root directory block size</summary>
+        public readonly uint rootdir_bsize;
+        /// <summary>0x060, Last root directory copy</summary>
+        public readonly uint last_root_copy;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryHeader
-        {
-            /// <summary>Next block from this directory, -1 if last</summary>
-            public readonly int next_block;
-            /// <summary>Previous block from this directory, -1 if first</summary>
-            public readonly int prev_block;
-            /// <summary>Directory flags</summary>
-            public readonly uint flags;
-            /// <summary>Offset to first free unused byte in the directory</summary>
-            public readonly uint first_free;
-            /// <summary>Offset to first directory entry</summary>
-            public readonly uint first_used;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryHeader
+    {
+        /// <summary>Next block from this directory, -1 if last</summary>
+        public readonly int next_block;
+        /// <summary>Previous block from this directory, -1 if first</summary>
+        public readonly int prev_block;
+        /// <summary>Directory flags</summary>
+        public readonly uint flags;
+        /// <summary>Offset to first free unused byte in the directory</summary>
+        public readonly uint first_free;
+        /// <summary>Offset to first directory entry</summary>
+        public readonly uint first_used;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryEntry
-        {
-            /// <summary>File flags, see <see cref="FileFlags" /></summary>
-            public readonly uint flags;
-            /// <summary>Unique file identifier</summary>
-            public readonly uint id;
-            /// <summary>Entry type</summary>
-            public readonly uint type;
-            /// <summary>Block size</summary>
-            public readonly uint block_size;
-            /// <summary>Size in bytes</summary>
-            public readonly uint byte_count;
-            /// <summary>Block count</summary>
-            public readonly uint block_count;
-            /// <summary>Unknown</summary>
-            public readonly uint burst;
-            /// <summary>Unknown</summary>
-            public readonly uint gap;
-            /// <summary>Filename</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_NAME)]
-            public readonly byte[] name;
-            /// <summary>Last copy</summary>
-            public readonly uint last_copy;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryEntry
+    {
+        /// <summary>File flags, see <see cref="FileFlags" /></summary>
+        public readonly uint flags;
+        /// <summary>Unique file identifier</summary>
+        public readonly uint id;
+        /// <summary>Entry type</summary>
+        public readonly uint type;
+        /// <summary>Block size</summary>
+        public readonly uint block_size;
+        /// <summary>Size in bytes</summary>
+        public readonly uint byte_count;
+        /// <summary>Block count</summary>
+        public readonly uint block_count;
+        /// <summary>Unknown</summary>
+        public readonly uint burst;
+        /// <summary>Unknown</summary>
+        public readonly uint gap;
+        /// <summary>Filename</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_NAME)]
+        public readonly byte[] name;
+        /// <summary>Last copy</summary>
+        public readonly uint last_copy;
+    }
 
-        class DirectoryEntryWithPointers
-        {
-            public DirectoryEntry Entry;
-            public uint[]         Pointers;
-        }
+    class DirectoryEntryWithPointers
+    {
+        public DirectoryEntry Entry;
+        public uint[]         Pointers;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Opera/Super.cs b/Aaru.Filesystems/Opera/Super.cs
index dd6af6b50..76e60b125 100644
--- a/Aaru.Filesystems/Opera/Super.cs
+++ b/Aaru.Filesystems/Opera/Super.cs
@@ -39,98 +39,97 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+public sealed partial class OperaFS
 {
-    public sealed partial class OperaFS
+    /// <inheritdoc />
+    public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                             Dictionary<string, string> options, string @namespace)
     {
-        /// <inheritdoc />
-        public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
-                                 Dictionary<string, string> options, string @namespace)
+        // TODO: Find correct default encoding
+        Encoding = Encoding.ASCII;
+
+        options ??= GetDefaultOptions();
+
+        if(options.TryGetValue("debug", out string debugString))
+            bool.TryParse(debugString, out _debug);
+
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] sbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        SuperBlock sb = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sbSector);
+
+        if(sb.record_type    != 1 ||
+           sb.record_version != 1)
+            return ErrorNumber.InvalidArgument;
+
+        if(Encoding.ASCII.GetString(sb.sync_bytes) != SYNC)
+            return ErrorNumber.InvalidArgument;
+
+        if(imagePlugin.Info.SectorSize == 2336 ||
+           imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448)
+            _volumeBlockSizeRatio = sb.block_size / 2048;
+        else
+            _volumeBlockSizeRatio = sb.block_size / imagePlugin.Info.SectorSize;
+
+        XmlFsType = new FileSystemType
         {
-            // TODO: Find correct default encoding
-            Encoding = Encoding.ASCII;
+            Type         = "Opera",
+            VolumeName   = StringHandlers.CToString(sb.volume_label, Encoding),
+            ClusterSize  = sb.block_size,
+            Clusters     = sb.block_count,
+            Bootable     = true,
+            VolumeSerial = $"{sb.volume_id:X8}"
+        };
 
-            options ??= GetDefaultOptions();
-
-            if(options.TryGetValue("debug", out string debugString))
-                bool.TryParse(debugString, out _debug);
-
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] sbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            SuperBlock sb = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sbSector);
-
-            if(sb.record_type    != 1 ||
-               sb.record_version != 1)
-                return ErrorNumber.InvalidArgument;
-
-            if(Encoding.ASCII.GetString(sb.sync_bytes) != SYNC)
-                return ErrorNumber.InvalidArgument;
-
-            if(imagePlugin.Info.SectorSize == 2336 ||
-               imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448)
-                _volumeBlockSizeRatio = sb.block_size / 2048;
-            else
-                _volumeBlockSizeRatio = sb.block_size / imagePlugin.Info.SectorSize;
-
-            XmlFsType = new FileSystemType
+        _statfs = new FileSystemInfo
+        {
+            Blocks         = sb.block_count,
+            FilenameLength = MAX_NAME,
+            FreeBlocks     = 0,
+            Id = new FileSystemId
             {
-                Type         = "Opera",
-                VolumeName   = StringHandlers.CToString(sb.volume_label, Encoding),
-                ClusterSize  = sb.block_size,
-                Clusters     = sb.block_count,
-                Bootable     = true,
-                VolumeSerial = $"{sb.volume_id:X8}"
-            };
+                IsInt    = true,
+                Serial32 = sb.volume_id
+            },
+            PluginId = Id,
+            Type     = "Opera"
+        };
 
-            _statfs = new FileSystemInfo
-            {
-                Blocks         = sb.block_count,
-                FilenameLength = MAX_NAME,
-                FreeBlocks     = 0,
-                Id = new FileSystemId
-                {
-                    IsInt    = true,
-                    Serial32 = sb.volume_id
-                },
-                PluginId = Id,
-                Type     = "Opera"
-            };
+        _image = imagePlugin;
+        int firstRootBlock = BigEndianBitConverter.ToInt32(sbSector, Marshal.SizeOf<SuperBlock>());
+        _rootDirectoryCache = DecodeDirectory(firstRootBlock);
+        _directoryCache     = new Dictionary<string, Dictionary<string, DirectoryEntryWithPointers>>();
+        _mounted            = true;
 
-            _image = imagePlugin;
-            int firstRootBlock = BigEndianBitConverter.ToInt32(sbSector, Marshal.SizeOf<SuperBlock>());
-            _rootDirectoryCache = DecodeDirectory(firstRootBlock);
-            _directoryCache     = new Dictionary<string, Dictionary<string, DirectoryEntryWithPointers>>();
-            _mounted            = true;
+        return ErrorNumber.NoError;
+    }
 
-            return ErrorNumber.NoError;
-        }
+    /// <inheritdoc />
+    public ErrorNumber Unmount()
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
 
-        /// <inheritdoc />
-        public ErrorNumber Unmount()
-        {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        _mounted = false;
 
-            _mounted = false;
+        return ErrorNumber.NoError;
+    }
 
-            return ErrorNumber.NoError;
-        }
+    /// <inheritdoc />
+    public ErrorNumber StatFs(out FileSystemInfo stat)
+    {
+        stat = null;
 
-        /// <inheritdoc />
-        public ErrorNumber StatFs(out FileSystemInfo stat)
-        {
-            stat = null;
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
 
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+        stat = _statfs.ShallowCopy();
 
-            stat = _statfs.ShallowCopy();
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/PCEngine.cs b/Aaru.Filesystems/PCEngine.cs
index 261d9ca00..3c83f7c30 100644
--- a/Aaru.Filesystems/PCEngine.cs
+++ b/Aaru.Filesystems/PCEngine.cs
@@ -37,53 +37,52 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the PC-Engine CD file headers</summary>
+public sealed class PCEnginePlugin : IFilesystem
 {
     /// <inheritdoc />
-    /// <summary>Implements detection of the PC-Engine CD file headers</summary>
-    public sealed class PCEnginePlugin : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "PC Engine CD Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("e5ee6d7c-90fa-49bd-ac89-14ef750b8af3");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "PC Engine CD Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("e5ee6d7c-90fa-49bd-ac89-14ef750b8af3");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(2 + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        byte[]      systemDescriptor = new byte[23];
+        ErrorNumber errno            = imagePlugin.ReadSector(1 + partition.Start, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        Array.Copy(sector, 0x20, systemDescriptor, 0, 23);
+
+        return Encoding.ASCII.GetString(systemDescriptor) == "PC Engine CD-ROM SYSTEM";
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("shift_jis");
+        information = "";
+
+        XmlFsType = new FileSystemType
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
-
-            byte[]      systemDescriptor = new byte[23];
-            ErrorNumber errno            = imagePlugin.ReadSector(1 + partition.Start, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            Array.Copy(sector, 0x20, systemDescriptor, 0, 23);
-
-            return Encoding.ASCII.GetString(systemDescriptor) == "PC Engine CD-ROM SYSTEM";
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("shift_jis");
-            information = "";
-
-            XmlFsType = new FileSystemType
-            {
-                Type        = "PC Engine filesystem",
-                Clusters    = (partition.End - partition.Start + 1) / imagePlugin.Info.SectorSize * 2048,
-                ClusterSize = 2048
-            };
-        }
+            Type        = "PC Engine filesystem",
+            Clusters    = (partition.End - partition.Start + 1) / imagePlugin.Info.SectorSize * 2048,
+            ClusterSize = 2048
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/PCFX.cs b/Aaru.Filesystems/PCFX.cs
index ee237671a..963cf8f38 100644
--- a/Aaru.Filesystems/PCFX.cs
+++ b/Aaru.Filesystems/PCFX.cs
@@ -40,133 +40,132 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Not a filesystem, more like an executable header
+/// <inheritdoc />
+/// <summary>Implements detection of NEC PC-FX headers</summary>
+public sealed class PCFX : IFilesystem
 {
-    // Not a filesystem, more like an executable header
+    const string IDENTIFIER = "PC-FX:Hu_CD-ROM ";
     /// <inheritdoc />
-    /// <summary>Implements detection of NEC PC-FX headers</summary>
-    public sealed class PCFX : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "PC-FX Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("8BC27CCE-D9E9-48F8-BA93-C66A86EB565A");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const string IDENTIFIER = "PC-FX:Hu_CD-ROM ";
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "PC-FX Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("8BC27CCE-D9E9-48F8-BA93-C66A86EB565A");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(2 + partition.Start           >= partition.End ||
+           imagePlugin.Info.XmlMediaType != XmlMediaType.OpticalDisc)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, 2, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        var encoding = Encoding.GetEncoding("shift_jis");
+
+        return encoding.GetString(sector, 0, 16) == IDENTIFIER;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        // Always Shift-JIS
+        Encoding    = Encoding.GetEncoding("shift_jis");
+        information = "";
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, 2, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        Header header = Marshal.ByteArrayToStructureLittleEndian<Header>(sector);
+
+        string   date;
+        DateTime dateTime = DateTime.MinValue;
+
+        try
         {
-            if(2 + partition.Start           >= partition.End ||
-               imagePlugin.Info.XmlMediaType != XmlMediaType.OpticalDisc)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, 2, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            var encoding = Encoding.GetEncoding("shift_jis");
-
-            return encoding.GetString(sector, 0, 16) == IDENTIFIER;
+            date = Encoding.GetString(header.date);
+            int year  = int.Parse(date.Substring(0, 4));
+            int month = int.Parse(date.Substring(4, 2));
+            int day   = int.Parse(date.Substring(6, 2));
+            dateTime = new DateTime(year, month, day);
+        }
+        catch
+        {
+            date = null;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        var sb = new StringBuilder();
+        sb.AppendLine("PC-FX executable:");
+        sb.AppendFormat("Identifier: {0}", StringHandlers.CToString(header.signature, Encoding)).AppendLine();
+        sb.AppendFormat("Copyright: {0}", StringHandlers.CToString(header.copyright, Encoding)).AppendLine();
+        sb.AppendFormat("Title: {0}", StringHandlers.CToString(header.title, Encoding)).AppendLine();
+        sb.AppendFormat("Maker ID: {0}", StringHandlers.CToString(header.makerId, Encoding)).AppendLine();
+        sb.AppendFormat("Maker name: {0}", StringHandlers.CToString(header.makerName, Encoding)).AppendLine();
+        sb.AppendFormat("Volume number: {0}", header.volumeNumber).AppendLine();
+        sb.AppendFormat("Country code: {0}", header.country).AppendLine();
+        sb.AppendFormat("Version: {0}.{1}", header.minorVersion, header.majorVersion).AppendLine();
+
+        if(date != null)
+            sb.AppendFormat("Dated {0}", dateTime).AppendLine();
+
+        sb.AppendFormat("Load {0} sectors from sector {1}", header.loadCount, header.loadOffset).AppendLine();
+
+        sb.AppendFormat("Load at 0x{0:X8} and jump to 0x{1:X8}", header.loadAddress, header.entryPoint).
+           AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            // Always Shift-JIS
-            Encoding    = Encoding.GetEncoding("shift_jis");
-            information = "";
+            Type                  = "PC-FX",
+            Clusters              = partition.Length,
+            ClusterSize           = 2048,
+            Bootable              = true,
+            CreationDate          = dateTime,
+            CreationDateSpecified = date != null,
+            PublisherIdentifier   = StringHandlers.CToString(header.makerName, Encoding),
+            VolumeName            = StringHandlers.CToString(header.title, Encoding),
+            SystemIdentifier      = "PC-FX"
+        };
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, 2, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            Header header = Marshal.ByteArrayToStructureLittleEndian<Header>(sector);
-
-            string   date;
-            DateTime dateTime = DateTime.MinValue;
-
-            try
-            {
-                date = Encoding.GetString(header.date);
-                int year  = int.Parse(date.Substring(0, 4));
-                int month = int.Parse(date.Substring(4, 2));
-                int day   = int.Parse(date.Substring(6, 2));
-                dateTime = new DateTime(year, month, day);
-            }
-            catch
-            {
-                date = null;
-            }
-
-            var sb = new StringBuilder();
-            sb.AppendLine("PC-FX executable:");
-            sb.AppendFormat("Identifier: {0}", StringHandlers.CToString(header.signature, Encoding)).AppendLine();
-            sb.AppendFormat("Copyright: {0}", StringHandlers.CToString(header.copyright, Encoding)).AppendLine();
-            sb.AppendFormat("Title: {0}", StringHandlers.CToString(header.title, Encoding)).AppendLine();
-            sb.AppendFormat("Maker ID: {0}", StringHandlers.CToString(header.makerId, Encoding)).AppendLine();
-            sb.AppendFormat("Maker name: {0}", StringHandlers.CToString(header.makerName, Encoding)).AppendLine();
-            sb.AppendFormat("Volume number: {0}", header.volumeNumber).AppendLine();
-            sb.AppendFormat("Country code: {0}", header.country).AppendLine();
-            sb.AppendFormat("Version: {0}.{1}", header.minorVersion, header.majorVersion).AppendLine();
-
-            if(date != null)
-                sb.AppendFormat("Dated {0}", dateTime).AppendLine();
-
-            sb.AppendFormat("Load {0} sectors from sector {1}", header.loadCount, header.loadOffset).AppendLine();
-
-            sb.AppendFormat("Load at 0x{0:X8} and jump to 0x{1:X8}", header.loadAddress, header.entryPoint).
-               AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type                  = "PC-FX",
-                Clusters              = partition.Length,
-                ClusterSize           = 2048,
-                Bootable              = true,
-                CreationDate          = dateTime,
-                CreationDateSpecified = date != null,
-                PublisherIdentifier   = StringHandlers.CToString(header.makerName, Encoding),
-                VolumeName            = StringHandlers.CToString(header.title, Encoding),
-                SystemIdentifier      = "PC-FX"
-            };
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Header
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] signature;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0xE0)]
-            public readonly byte[] copyright;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x710)]
-            public readonly byte[] unknown;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] title;
-            public readonly uint loadOffset;
-            public readonly uint loadCount;
-            public readonly uint loadAddress;
-            public readonly uint entryPoint;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] makerId;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 60)]
-            public readonly byte[] makerName;
-            public readonly uint   volumeNumber;
-            public readonly byte   majorVersion;
-            public readonly byte   minorVersion;
-            public readonly ushort country;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] date;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Header
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] signature;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0xE0)]
+        public readonly byte[] copyright;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x710)]
+        public readonly byte[] unknown;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] title;
+        public readonly uint loadOffset;
+        public readonly uint loadCount;
+        public readonly uint loadAddress;
+        public readonly uint entryPoint;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] makerId;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 60)]
+        public readonly byte[] makerName;
+        public readonly uint   volumeNumber;
+        public readonly byte   majorVersion;
+        public readonly byte   minorVersion;
+        public readonly ushort country;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] date;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/PFS.cs b/Aaru.Filesystems/PFS.cs
index e5da8b54d..b47b2ae43 100644
--- a/Aaru.Filesystems/PFS.cs
+++ b/Aaru.Filesystems/PFS.cs
@@ -42,175 +42,174 @@ using Marshal = Aaru.Helpers.Marshal;
 
 // ReSharper disable UnusedType.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the Professional File System</summary>
+public sealed class PFS : IFilesystem
 {
+    /// <summary>Identifier for AFS (PFS v1)</summary>
+    const uint AFS_DISK = 0x41465301;
+    /// <summary>Identifier for PFS v2</summary>
+    const uint PFS2_DISK = 0x50465302;
+    /// <summary>Identifier for PFS v3</summary>
+    const uint PFS_DISK = 0x50465301;
+    /// <summary>Identifier for multi-user AFS</summary>
+    const uint MUAF_DISK = 0x6D754146;
+    /// <summary>Identifier for multi-user PFS</summary>
+    const uint MUPFS_DISK = 0x6D755046;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the Professional File System</summary>
-    public sealed class PFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Professional File System";
+    /// <inheritdoc />
+    public Guid Id => new("68DE769E-D957-406A-8AE4-3781CA8CDA77");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>Identifier for AFS (PFS v1)</summary>
-        const uint AFS_DISK = 0x41465301;
-        /// <summary>Identifier for PFS v2</summary>
-        const uint PFS2_DISK = 0x50465302;
-        /// <summary>Identifier for PFS v3</summary>
-        const uint PFS_DISK = 0x50465301;
-        /// <summary>Identifier for multi-user AFS</summary>
-        const uint MUAF_DISK = 0x6D754146;
-        /// <summary>Identifier for multi-user PFS</summary>
-        const uint MUPFS_DISK = 0x6D755046;
+        if(partition.Length < 3)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Professional File System";
-        /// <inheritdoc />
-        public Guid Id => new("68DE769E-D957-406A-8AE4-3781CA8CDA77");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] sector);
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        uint magic = BigEndianBitConverter.ToUInt32(sector, 0x00);
+
+        return magic == AFS_DISK || magic == PFS2_DISK || magic == PFS_DISK || magic == MUAF_DISK ||
+               magic == MUPFS_DISK;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        information = "";
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-1");
+        ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] rootBlockSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        RootBlock rootBlock = Marshal.ByteArrayToStructureBigEndian<RootBlock>(rootBlockSector);
+
+        var sbInformation = new StringBuilder();
+        XmlFsType = new FileSystemType();
+
+        switch(rootBlock.diskType)
         {
-            if(partition.Length < 3)
-                return false;
+            case AFS_DISK:
+            case MUAF_DISK:
+                sbInformation.Append("Professional File System v1");
+                XmlFsType.Type = "PFS v1";
 
-            ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] sector);
+                break;
+            case PFS2_DISK:
+                sbInformation.Append("Professional File System v2");
+                XmlFsType.Type = "PFS v2";
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+                break;
+            case PFS_DISK:
+            case MUPFS_DISK:
+                sbInformation.Append("Professional File System v3");
+                XmlFsType.Type = "PFS v3";
 
-            uint magic = BigEndianBitConverter.ToUInt32(sector, 0x00);
-
-            return magic == AFS_DISK || magic == PFS2_DISK || magic == PFS_DISK || magic == MUAF_DISK ||
-                   magic == MUPFS_DISK;
+                break;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            information = "";
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-1");
-            ErrorNumber errno = imagePlugin.ReadSector(2 + partition.Start, out byte[] rootBlockSector);
+        if(rootBlock.diskType == MUAF_DISK ||
+           rootBlock.diskType == MUPFS_DISK)
+            sbInformation.Append(", with multi-user support");
 
-            if(errno != ErrorNumber.NoError)
-                return;
+        sbInformation.AppendLine();
 
-            RootBlock rootBlock = Marshal.ByteArrayToStructureBigEndian<RootBlock>(rootBlockSector);
+        sbInformation.AppendFormat("Volume name: {0}", StringHandlers.PascalToString(rootBlock.diskname, Encoding)).
+                      AppendLine();
 
-            var sbInformation = new StringBuilder();
-            XmlFsType = new FileSystemType();
+        sbInformation.AppendFormat("Volume has {0} free sectors of {1}", rootBlock.blocksfree, rootBlock.diskSize).
+                      AppendLine();
 
-            switch(rootBlock.diskType)
-            {
-                case AFS_DISK:
-                case MUAF_DISK:
-                    sbInformation.Append("Professional File System v1");
-                    XmlFsType.Type = "PFS v1";
+        sbInformation.AppendFormat("Volume created on {0}",
+                                   DateHandlers.AmigaToDateTime(rootBlock.creationday, rootBlock.creationminute,
+                                                                rootBlock.creationtick)).AppendLine();
 
-                    break;
-                case PFS2_DISK:
-                    sbInformation.Append("Professional File System v2");
-                    XmlFsType.Type = "PFS v2";
-
-                    break;
-                case PFS_DISK:
-                case MUPFS_DISK:
-                    sbInformation.Append("Professional File System v3");
-                    XmlFsType.Type = "PFS v3";
-
-                    break;
-            }
-
-            if(rootBlock.diskType == MUAF_DISK ||
-               rootBlock.diskType == MUPFS_DISK)
-                sbInformation.Append(", with multi-user support");
-
-            sbInformation.AppendLine();
-
-            sbInformation.AppendFormat("Volume name: {0}", StringHandlers.PascalToString(rootBlock.diskname, Encoding)).
+        if(rootBlock.extension > 0)
+            sbInformation.AppendFormat("Root block extension resides at block {0}", rootBlock.extension).
                           AppendLine();
 
-            sbInformation.AppendFormat("Volume has {0} free sectors of {1}", rootBlock.blocksfree, rootBlock.diskSize).
-                          AppendLine();
+        information = sbInformation.ToString();
 
-            sbInformation.AppendFormat("Volume created on {0}",
-                                       DateHandlers.AmigaToDateTime(rootBlock.creationday, rootBlock.creationminute,
-                                                                    rootBlock.creationtick)).AppendLine();
+        XmlFsType.CreationDate =
+            DateHandlers.AmigaToDateTime(rootBlock.creationday, rootBlock.creationminute, rootBlock.creationtick);
 
-            if(rootBlock.extension > 0)
-                sbInformation.AppendFormat("Root block extension resides at block {0}", rootBlock.extension).
-                              AppendLine();
+        XmlFsType.CreationDateSpecified = true;
+        XmlFsType.FreeClusters          = rootBlock.blocksfree;
+        XmlFsType.FreeClustersSpecified = true;
+        XmlFsType.Clusters              = rootBlock.diskSize;
+        XmlFsType.ClusterSize           = imagePlugin.Info.SectorSize;
+        XmlFsType.VolumeName            = StringHandlers.PascalToString(rootBlock.diskname, Encoding);
+    }
 
-            information = sbInformation.ToString();
+    /// <summary>Boot block, first 2 sectors</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BootBlock
+    {
+        /// <summary>"PFS\1" disk type</summary>
+        public readonly uint diskType;
+        /// <summary>Boot code, til completion</summary>
+        public readonly byte[] bootCode;
+    }
 
-            XmlFsType.CreationDate =
-                DateHandlers.AmigaToDateTime(rootBlock.creationday, rootBlock.creationminute, rootBlock.creationtick);
-
-            XmlFsType.CreationDateSpecified = true;
-            XmlFsType.FreeClusters          = rootBlock.blocksfree;
-            XmlFsType.FreeClustersSpecified = true;
-            XmlFsType.Clusters              = rootBlock.diskSize;
-            XmlFsType.ClusterSize           = imagePlugin.Info.SectorSize;
-            XmlFsType.VolumeName            = StringHandlers.PascalToString(rootBlock.diskname, Encoding);
-        }
-
-        /// <summary>Boot block, first 2 sectors</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BootBlock
-        {
-            /// <summary>"PFS\1" disk type</summary>
-            public readonly uint diskType;
-            /// <summary>Boot code, til completion</summary>
-            public readonly byte[] bootCode;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct RootBlock
-        {
-            /// <summary>Disk type</summary>
-            public readonly uint diskType;
-            /// <summary>Options</summary>
-            public readonly uint options;
-            /// <summary>Current datestamp</summary>
-            public readonly uint datestamp;
-            /// <summary>Volume creation day</summary>
-            public readonly ushort creationday;
-            /// <summary>Volume creation minute</summary>
-            public readonly ushort creationminute;
-            /// <summary>Volume creation tick</summary>
-            public readonly ushort creationtick;
-            /// <summary>AmigaDOS protection bits</summary>
-            public readonly ushort protection;
-            /// <summary>Volume label (Pascal string)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] diskname;
-            /// <summary>Last reserved block</summary>
-            public readonly uint lastreserved;
-            /// <summary>First reserved block</summary>
-            public readonly uint firstreserved;
-            /// <summary>Free reserved blocks</summary>
-            public readonly uint reservedfree;
-            /// <summary>Size of reserved blocks in bytes</summary>
-            public readonly ushort reservedblocksize;
-            /// <summary>Blocks in rootblock, including bitmap</summary>
-            public readonly ushort rootblockclusters;
-            /// <summary>Free blocks</summary>
-            public readonly uint blocksfree;
-            /// <summary>Blocks that must be always free</summary>
-            public readonly uint alwaysfree;
-            /// <summary>Current bitmapfield number for allocation</summary>
-            public readonly uint rovingPointer;
-            /// <summary>Pointer to deldir</summary>
-            public readonly uint delDirPtr;
-            /// <summary>Disk size in sectors</summary>
-            public readonly uint diskSize;
-            /// <summary>Rootblock extension</summary>
-            public readonly uint extension;
-            /// <summary>Unused</summary>
-            public readonly uint unused;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct RootBlock
+    {
+        /// <summary>Disk type</summary>
+        public readonly uint diskType;
+        /// <summary>Options</summary>
+        public readonly uint options;
+        /// <summary>Current datestamp</summary>
+        public readonly uint datestamp;
+        /// <summary>Volume creation day</summary>
+        public readonly ushort creationday;
+        /// <summary>Volume creation minute</summary>
+        public readonly ushort creationminute;
+        /// <summary>Volume creation tick</summary>
+        public readonly ushort creationtick;
+        /// <summary>AmigaDOS protection bits</summary>
+        public readonly ushort protection;
+        /// <summary>Volume label (Pascal string)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] diskname;
+        /// <summary>Last reserved block</summary>
+        public readonly uint lastreserved;
+        /// <summary>First reserved block</summary>
+        public readonly uint firstreserved;
+        /// <summary>Free reserved blocks</summary>
+        public readonly uint reservedfree;
+        /// <summary>Size of reserved blocks in bytes</summary>
+        public readonly ushort reservedblocksize;
+        /// <summary>Blocks in rootblock, including bitmap</summary>
+        public readonly ushort rootblockclusters;
+        /// <summary>Free blocks</summary>
+        public readonly uint blocksfree;
+        /// <summary>Blocks that must be always free</summary>
+        public readonly uint alwaysfree;
+        /// <summary>Current bitmapfield number for allocation</summary>
+        public readonly uint rovingPointer;
+        /// <summary>Pointer to deldir</summary>
+        public readonly uint delDirPtr;
+        /// <summary>Disk size in sectors</summary>
+        public readonly uint diskSize;
+        /// <summary>Rootblock extension</summary>
+        public readonly uint extension;
+        /// <summary>Unused</summary>
+        public readonly uint unused;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ProDOS.cs b/Aaru.Filesystems/ProDOS.cs
index be5afd2c7..3ab9d4e49 100644
--- a/Aaru.Filesystems/ProDOS.cs
+++ b/Aaru.Filesystems/ProDOS.cs
@@ -44,474 +44,473 @@ using Encoding = System.Text.Encoding;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from Apple ProDOS 8 Technical Reference
+/// <inheritdoc />
+/// <summary>Implements detection of Apple ProDOS filesystem</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed class ProDOSPlugin : IFilesystem
 {
-    // Information from Apple ProDOS 8 Technical Reference
+    const byte EMPTY_STORAGE_TYPE = 0x00;
+    /// <summary>A file that occupies one block or less</summary>
+    const byte SEEDLING_FILE_TYPE = 0x01;
+    /// <summary>A file that occupies between 2 and 256 blocks</summary>
+    const byte SAPLING_FILE_TYPE = 0x02;
+    /// <summary>A file that occupies between 257 and 32768 blocks</summary>
+    const byte TREE_FILE_TYPE = 0x03;
+    const byte PASCAL_AREA_TYPE         = 0x04;
+    const byte SUBDIRECTORY_TYPE        = 0x0D;
+    const byte SUBDIRECTORY_HEADER_TYPE = 0x0E;
+    const byte ROOT_DIRECTORY_TYPE      = 0x0F;
+
+    const byte VERSION1 = 0x00;
+
+    const uint YEAR_MASK   = 0xFE000000;
+    const uint MONTH_MASK  = 0x1E00000;
+    const uint DAY_MASK    = 0x1F0000;
+    const uint HOUR_MASK   = 0x1F00;
+    const uint MINUTE_MASK = 0x3F;
+
+    const byte DESTROY_ATTRIBUTE       = 0x80;
+    const byte RENAME_ATTRIBUTE        = 0x40;
+    const byte BACKUP_ATTRIBUTE        = 0x20;
+    const byte WRITE_ATTRIBUTE         = 0x02;
+    const byte READ_ATTRIBUTE          = 0x01;
+    const byte RESERVED_ATTRIBUTE_MASK = 0x1C;
+
+    const byte STORAGE_TYPE_MASK = 0xF0;
+    const byte NAME_LENGTH_MASK  = 0x0F;
+    const byte ENTRY_LENGTH      = 0x27;
+    const byte ENTRIES_PER_BLOCK = 0x0D;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of Apple ProDOS filesystem</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed class ProDOSPlugin : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Apple ProDOS filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("43874265-7B8A-4739-BCF7-07F80D5932BF");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const byte EMPTY_STORAGE_TYPE = 0x00;
-        /// <summary>A file that occupies one block or less</summary>
-        const byte SEEDLING_FILE_TYPE = 0x01;
-        /// <summary>A file that occupies between 2 and 256 blocks</summary>
-        const byte SAPLING_FILE_TYPE = 0x02;
-        /// <summary>A file that occupies between 257 and 32768 blocks</summary>
-        const byte TREE_FILE_TYPE = 0x03;
-        const byte PASCAL_AREA_TYPE         = 0x04;
-        const byte SUBDIRECTORY_TYPE        = 0x0D;
-        const byte SUBDIRECTORY_HEADER_TYPE = 0x0E;
-        const byte ROOT_DIRECTORY_TYPE      = 0x0F;
+        if(partition.Length < 3)
+            return false;
 
-        const byte VERSION1 = 0x00;
+        uint multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
 
-        const uint YEAR_MASK   = 0xFE000000;
-        const uint MONTH_MASK  = 0x1E00000;
-        const uint DAY_MASK    = 0x1F0000;
-        const uint HOUR_MASK   = 0x1F00;
-        const uint MINUTE_MASK = 0x3F;
+        // Blocks 0 and 1 are boot code
+        ErrorNumber errno = imagePlugin.ReadSectors((2 * multiplier) + partition.Start, multiplier,
+                                                    out byte[] rootDirectoryKeyBlock);
 
-        const byte DESTROY_ATTRIBUTE       = 0x80;
-        const byte RENAME_ATTRIBUTE        = 0x40;
-        const byte BACKUP_ATTRIBUTE        = 0x20;
-        const byte WRITE_ATTRIBUTE         = 0x02;
-        const byte READ_ATTRIBUTE          = 0x01;
-        const byte RESERVED_ATTRIBUTE_MASK = 0x1C;
+        bool apmFromHddOnCd = false;
 
-        const byte STORAGE_TYPE_MASK = 0xF0;
-        const byte NAME_LENGTH_MASK  = 0x0F;
-        const byte ENTRY_LENGTH      = 0x27;
-        const byte ENTRIES_PER_BLOCK = 0x0D;
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Apple ProDOS filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("43874265-7B8A-4739-BCF7-07F80D5932BF");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448 ||
+           imagePlugin.Info.SectorSize == 2048)
         {
-            if(partition.Length < 3)
+            errno = imagePlugin.ReadSectors(partition.Start, 2, out byte[] tmp);
+
+            if(errno != ErrorNumber.NoError)
                 return false;
 
-            uint multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
-
-            // Blocks 0 and 1 are boot code
-            ErrorNumber errno = imagePlugin.ReadSectors((2 * multiplier) + partition.Start, multiplier,
-                                                        out byte[] rootDirectoryKeyBlock);
-
-            bool apmFromHddOnCd = false;
-
-            if(imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448 ||
-               imagePlugin.Info.SectorSize == 2048)
+            foreach(int offset in new[]
+                    {
+                        0, 0x200, 0x400, 0x600, 0x800, 0xA00
+                    }.Where(offset => tmp.Length > offset + 0x200 && BitConverter.ToUInt16(tmp, offset) == 0 &&
+                                      (byte)((tmp[offset + 0x04] & STORAGE_TYPE_MASK) >> 4) == ROOT_DIRECTORY_TYPE &&
+                                      tmp[offset + 0x23] == ENTRY_LENGTH && tmp[offset + 0x24] == ENTRIES_PER_BLOCK))
             {
-                errno = imagePlugin.ReadSectors(partition.Start, 2, out byte[] tmp);
+                Array.Copy(tmp, offset, rootDirectoryKeyBlock, 0, 0x200);
+                apmFromHddOnCd = true;
 
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                foreach(int offset in new[]
-                {
-                    0, 0x200, 0x400, 0x600, 0x800, 0xA00
-                }.Where(offset => tmp.Length > offset + 0x200 && BitConverter.ToUInt16(tmp, offset) == 0 &&
-                                  (byte)((tmp[offset + 0x04] & STORAGE_TYPE_MASK) >> 4) == ROOT_DIRECTORY_TYPE &&
-                                  tmp[offset + 0x23] == ENTRY_LENGTH && tmp[offset + 0x24] == ENTRIES_PER_BLOCK))
-                {
-                    Array.Copy(tmp, offset, rootDirectoryKeyBlock, 0, 0x200);
-                    apmFromHddOnCd = true;
-
-                    break;
-                }
+                break;
             }
-
-            ushort prePointer = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0);
-            AaruConsole.DebugWriteLine("ProDOS plugin", "prePointer = {0}", prePointer);
-
-            if(prePointer != 0)
-                return false;
-
-            byte storageType = (byte)((rootDirectoryKeyBlock[0x04] & STORAGE_TYPE_MASK) >> 4);
-            AaruConsole.DebugWriteLine("ProDOS plugin", "storage_type = {0}", storageType);
-
-            if(storageType != ROOT_DIRECTORY_TYPE)
-                return false;
-
-            byte entryLength = rootDirectoryKeyBlock[0x23];
-            AaruConsole.DebugWriteLine("ProDOS plugin", "entry_length = {0}", entryLength);
-
-            if(entryLength != ENTRY_LENGTH)
-                return false;
-
-            byte entriesPerBlock = rootDirectoryKeyBlock[0x24];
-            AaruConsole.DebugWriteLine("ProDOS plugin", "entries_per_block = {0}", entriesPerBlock);
-
-            if(entriesPerBlock != ENTRIES_PER_BLOCK)
-                return false;
-
-            ushort bitMapPointer = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0x27);
-            AaruConsole.DebugWriteLine("ProDOS plugin", "bit_map_pointer = {0}", bitMapPointer);
-
-            if(bitMapPointer > partition.End)
-                return false;
-
-            ushort totalBlocks = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0x29);
-
-            if(apmFromHddOnCd)
-                totalBlocks /= 4;
-
-            AaruConsole.DebugWriteLine("ProDOS plugin", "{0} <= ({1} - {2} + 1)? {3}", totalBlocks, partition.End,
-                                       partition.Start, totalBlocks <= partition.End - partition.Start + 1);
-
-            return totalBlocks <= partition.End - partition.Start + 1;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? new Apple2c();
-            information = "";
-            var  sbInformation = new StringBuilder();
-            uint multiplier    = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
+        ushort prePointer = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0);
+        AaruConsole.DebugWriteLine("ProDOS plugin", "prePointer = {0}", prePointer);
 
-            // Blocks 0 and 1 are boot code
-            ErrorNumber errno = imagePlugin.ReadSectors((2 * multiplier) + partition.Start, multiplier,
-                                                        out byte[] rootDirectoryKeyBlockBytes);
+        if(prePointer != 0)
+            return false;
+
+        byte storageType = (byte)((rootDirectoryKeyBlock[0x04] & STORAGE_TYPE_MASK) >> 4);
+        AaruConsole.DebugWriteLine("ProDOS plugin", "storage_type = {0}", storageType);
+
+        if(storageType != ROOT_DIRECTORY_TYPE)
+            return false;
+
+        byte entryLength = rootDirectoryKeyBlock[0x23];
+        AaruConsole.DebugWriteLine("ProDOS plugin", "entry_length = {0}", entryLength);
+
+        if(entryLength != ENTRY_LENGTH)
+            return false;
+
+        byte entriesPerBlock = rootDirectoryKeyBlock[0x24];
+        AaruConsole.DebugWriteLine("ProDOS plugin", "entries_per_block = {0}", entriesPerBlock);
+
+        if(entriesPerBlock != ENTRIES_PER_BLOCK)
+            return false;
+
+        ushort bitMapPointer = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0x27);
+        AaruConsole.DebugWriteLine("ProDOS plugin", "bit_map_pointer = {0}", bitMapPointer);
+
+        if(bitMapPointer > partition.End)
+            return false;
+
+        ushort totalBlocks = BitConverter.ToUInt16(rootDirectoryKeyBlock, 0x29);
+
+        if(apmFromHddOnCd)
+            totalBlocks /= 4;
+
+        AaruConsole.DebugWriteLine("ProDOS plugin", "{0} <= ({1} - {2} + 1)? {3}", totalBlocks, partition.End,
+                                   partition.Start, totalBlocks <= partition.End - partition.Start + 1);
+
+        return totalBlocks <= partition.End - partition.Start + 1;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? new Apple2c();
+        information = "";
+        var  sbInformation = new StringBuilder();
+        uint multiplier    = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
+
+        // Blocks 0 and 1 are boot code
+        ErrorNumber errno = imagePlugin.ReadSectors((2 * multiplier) + partition.Start, multiplier,
+                                                    out byte[] rootDirectoryKeyBlockBytes);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        bool apmFromHddOnCd = false;
+
+        if(imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448 ||
+           imagePlugin.Info.SectorSize == 2048)
+        {
+            errno = imagePlugin.ReadSectors(partition.Start, 2, out byte[] tmp);
 
             if(errno != ErrorNumber.NoError)
                 return;
 
-            bool apmFromHddOnCd = false;
-
-            if(imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448 ||
-               imagePlugin.Info.SectorSize == 2048)
+            foreach(int offset in new[]
+                    {
+                        0, 0x200, 0x400, 0x600, 0x800, 0xA00
+                    }.Where(offset => BitConverter.ToUInt16(tmp, offset) == 0 &&
+                                      (byte)((tmp[offset + 0x04] & STORAGE_TYPE_MASK) >> 4) == ROOT_DIRECTORY_TYPE &&
+                                      tmp[offset + 0x23] == ENTRY_LENGTH && tmp[offset + 0x24] == ENTRIES_PER_BLOCK))
             {
-                errno = imagePlugin.ReadSectors(partition.Start, 2, out byte[] tmp);
+                Array.Copy(tmp, offset, rootDirectoryKeyBlockBytes, 0, 0x200);
+                apmFromHddOnCd = true;
 
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                foreach(int offset in new[]
-                {
-                    0, 0x200, 0x400, 0x600, 0x800, 0xA00
-                }.Where(offset => BitConverter.ToUInt16(tmp, offset) == 0 &&
-                                  (byte)((tmp[offset + 0x04] & STORAGE_TYPE_MASK) >> 4) == ROOT_DIRECTORY_TYPE &&
-                                  tmp[offset + 0x23] == ENTRY_LENGTH && tmp[offset + 0x24] == ENTRIES_PER_BLOCK))
-                {
-                    Array.Copy(tmp, offset, rootDirectoryKeyBlockBytes, 0, 0x200);
-                    apmFromHddOnCd = true;
-
-                    break;
-                }
+                break;
             }
+        }
 
-            var rootDirectoryKeyBlock = new RootDirectoryKeyBlock
-            {
-                header       = new RootDirectoryHeader(),
-                zero         = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x00),
-                next_pointer = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x02)
-            };
+        var rootDirectoryKeyBlock = new RootDirectoryKeyBlock
+        {
+            header       = new RootDirectoryHeader(),
+            zero         = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x00),
+            next_pointer = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x02)
+        };
 
-            rootDirectoryKeyBlock.header.storage_type =
-                (byte)((rootDirectoryKeyBlockBytes[0x04] & STORAGE_TYPE_MASK) >> 4);
+        rootDirectoryKeyBlock.header.storage_type =
+            (byte)((rootDirectoryKeyBlockBytes[0x04] & STORAGE_TYPE_MASK) >> 4);
 
-            rootDirectoryKeyBlock.header.name_length = (byte)(rootDirectoryKeyBlockBytes[0x04] & NAME_LENGTH_MASK);
-            byte[] temporal = new byte[rootDirectoryKeyBlock.header.name_length];
-            Array.Copy(rootDirectoryKeyBlockBytes, 0x05, temporal, 0, rootDirectoryKeyBlock.header.name_length);
-            rootDirectoryKeyBlock.header.volume_name = Encoding.GetString(temporal);
-            rootDirectoryKeyBlock.header.reserved    = BitConverter.ToUInt64(rootDirectoryKeyBlockBytes, 0x14);
+        rootDirectoryKeyBlock.header.name_length = (byte)(rootDirectoryKeyBlockBytes[0x04] & NAME_LENGTH_MASK);
+        byte[] temporal = new byte[rootDirectoryKeyBlock.header.name_length];
+        Array.Copy(rootDirectoryKeyBlockBytes, 0x05, temporal, 0, rootDirectoryKeyBlock.header.name_length);
+        rootDirectoryKeyBlock.header.volume_name = Encoding.GetString(temporal);
+        rootDirectoryKeyBlock.header.reserved    = BitConverter.ToUInt64(rootDirectoryKeyBlockBytes, 0x14);
 
-            ushort tempTimestampLeft  = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x1C);
-            ushort tempTimestampRight = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x1E);
+        ushort tempTimestampLeft  = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x1C);
+        ushort tempTimestampRight = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x1E);
 
-            bool dateCorrect;
+        bool dateCorrect;
 
-            try
-            {
-                uint tempTimestamp = (uint)((tempTimestampLeft << 16) + tempTimestampRight);
-                int  year          = (int)((tempTimestamp & YEAR_MASK)  >> 25);
-                int  month         = (int)((tempTimestamp & MONTH_MASK) >> 21);
-                int  day           = (int)((tempTimestamp & DAY_MASK)   >> 16);
-                int  hour          = (int)((tempTimestamp & HOUR_MASK)  >> 8);
-                int  minute        = (int)(tempTimestamp & MINUTE_MASK);
-                year += 1900;
+        try
+        {
+            uint tempTimestamp = (uint)((tempTimestampLeft << 16) + tempTimestampRight);
+            int  year          = (int)((tempTimestamp & YEAR_MASK)  >> 25);
+            int  month         = (int)((tempTimestamp & MONTH_MASK) >> 21);
+            int  day           = (int)((tempTimestamp & DAY_MASK)   >> 16);
+            int  hour          = (int)((tempTimestamp & HOUR_MASK)  >> 8);
+            int  minute        = (int)(tempTimestamp & MINUTE_MASK);
+            year += 1900;
 
-                if(year < 1940)
-                    year += 100;
+            if(year < 1940)
+                year += 100;
 
-                AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp_left = 0x{0:X4}", tempTimestampLeft);
-                AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp_right = 0x{0:X4}", tempTimestampRight);
-                AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp = 0x{0:X8}", tempTimestamp);
+            AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp_left = 0x{0:X4}", tempTimestampLeft);
+            AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp_right = 0x{0:X4}", tempTimestampRight);
+            AaruConsole.DebugWriteLine("ProDOS plugin", "temp_timestamp = 0x{0:X8}", tempTimestamp);
 
-                AaruConsole.DebugWriteLine("ProDOS plugin",
-                                           "Datetime field year {0}, month {1}, day {2}, hour {3}, minute {4}.", year,
-                                           month, day, hour, minute);
+            AaruConsole.DebugWriteLine("ProDOS plugin",
+                                       "Datetime field year {0}, month {1}, day {2}, hour {3}, minute {4}.", year,
+                                       month, day, hour, minute);
 
-                rootDirectoryKeyBlock.header.creation_time = new DateTime(year, month, day, hour, minute, 0);
-                dateCorrect                                = true;
-            }
-            catch(ArgumentOutOfRangeException)
-            {
-                dateCorrect = false;
-            }
+            rootDirectoryKeyBlock.header.creation_time = new DateTime(year, month, day, hour, minute, 0);
+            dateCorrect                                = true;
+        }
+        catch(ArgumentOutOfRangeException)
+        {
+            dateCorrect = false;
+        }
 
-            rootDirectoryKeyBlock.header.version           = rootDirectoryKeyBlockBytes[0x20];
-            rootDirectoryKeyBlock.header.min_version       = rootDirectoryKeyBlockBytes[0x21];
-            rootDirectoryKeyBlock.header.access            = rootDirectoryKeyBlockBytes[0x22];
-            rootDirectoryKeyBlock.header.entry_length      = rootDirectoryKeyBlockBytes[0x23];
-            rootDirectoryKeyBlock.header.entries_per_block = rootDirectoryKeyBlockBytes[0x24];
+        rootDirectoryKeyBlock.header.version           = rootDirectoryKeyBlockBytes[0x20];
+        rootDirectoryKeyBlock.header.min_version       = rootDirectoryKeyBlockBytes[0x21];
+        rootDirectoryKeyBlock.header.access            = rootDirectoryKeyBlockBytes[0x22];
+        rootDirectoryKeyBlock.header.entry_length      = rootDirectoryKeyBlockBytes[0x23];
+        rootDirectoryKeyBlock.header.entries_per_block = rootDirectoryKeyBlockBytes[0x24];
 
-            rootDirectoryKeyBlock.header.file_count      = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x25);
-            rootDirectoryKeyBlock.header.bit_map_pointer = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x27);
-            rootDirectoryKeyBlock.header.total_blocks    = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x29);
+        rootDirectoryKeyBlock.header.file_count      = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x25);
+        rootDirectoryKeyBlock.header.bit_map_pointer = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x27);
+        rootDirectoryKeyBlock.header.total_blocks    = BitConverter.ToUInt16(rootDirectoryKeyBlockBytes, 0x29);
 
-            if(apmFromHddOnCd)
-                sbInformation.AppendLine("ProDOS uses 512 bytes/sector while devices uses 2048 bytes/sector.").
-                              AppendLine();
-
-            if(rootDirectoryKeyBlock.header.version     != VERSION1 ||
-               rootDirectoryKeyBlock.header.min_version != VERSION1)
-            {
-                sbInformation.AppendLine("Warning! Detected unknown ProDOS version ProDOS filesystem.");
-                sbInformation.AppendLine("All of the following information may be incorrect");
-            }
-
-            if(rootDirectoryKeyBlock.header.version == VERSION1)
-                sbInformation.AppendLine("ProDOS version 1 used to create this volume.");
-            else
-                sbInformation.AppendFormat("Unknown ProDOS version with field {0} used to create this volume.",
-                                           rootDirectoryKeyBlock.header.version).AppendLine();
-
-            if(rootDirectoryKeyBlock.header.min_version == VERSION1)
-                sbInformation.AppendLine("ProDOS version 1 at least required for reading this volume.");
-            else
-                sbInformation.
-                    AppendFormat("Unknown ProDOS version with field {0} is at least required for reading this volume.",
-                                 rootDirectoryKeyBlock.header.min_version).AppendLine();
-
-            sbInformation.AppendFormat("Volume name is {0}", rootDirectoryKeyBlock.header.volume_name).AppendLine();
-
-            if(dateCorrect)
-                sbInformation.AppendFormat("Volume created on {0}", rootDirectoryKeyBlock.header.creation_time).
-                              AppendLine();
-
-            sbInformation.AppendFormat("{0} bytes per directory entry", rootDirectoryKeyBlock.header.entry_length).
+        if(apmFromHddOnCd)
+            sbInformation.AppendLine("ProDOS uses 512 bytes/sector while devices uses 2048 bytes/sector.").
                           AppendLine();
 
+        if(rootDirectoryKeyBlock.header.version     != VERSION1 ||
+           rootDirectoryKeyBlock.header.min_version != VERSION1)
+        {
+            sbInformation.AppendLine("Warning! Detected unknown ProDOS version ProDOS filesystem.");
+            sbInformation.AppendLine("All of the following information may be incorrect");
+        }
+
+        if(rootDirectoryKeyBlock.header.version == VERSION1)
+            sbInformation.AppendLine("ProDOS version 1 used to create this volume.");
+        else
+            sbInformation.AppendFormat("Unknown ProDOS version with field {0} used to create this volume.",
+                                       rootDirectoryKeyBlock.header.version).AppendLine();
+
+        if(rootDirectoryKeyBlock.header.min_version == VERSION1)
+            sbInformation.AppendLine("ProDOS version 1 at least required for reading this volume.");
+        else
             sbInformation.
-                AppendFormat("{0} entries per directory block", rootDirectoryKeyBlock.header.entries_per_block).
-                AppendLine();
+                AppendFormat("Unknown ProDOS version with field {0} is at least required for reading this volume.",
+                             rootDirectoryKeyBlock.header.min_version).AppendLine();
 
-            sbInformation.AppendFormat("{0} files in root directory", rootDirectoryKeyBlock.header.file_count).
+        sbInformation.AppendFormat("Volume name is {0}", rootDirectoryKeyBlock.header.volume_name).AppendLine();
+
+        if(dateCorrect)
+            sbInformation.AppendFormat("Volume created on {0}", rootDirectoryKeyBlock.header.creation_time).
                           AppendLine();
 
-            sbInformation.AppendFormat("{0} blocks in volume", rootDirectoryKeyBlock.header.total_blocks).AppendLine();
+        sbInformation.AppendFormat("{0} bytes per directory entry", rootDirectoryKeyBlock.header.entry_length).
+                      AppendLine();
 
-            sbInformation.AppendFormat("Bitmap starts at block {0}", rootDirectoryKeyBlock.header.bit_map_pointer).
-                          AppendLine();
+        sbInformation.
+            AppendFormat("{0} entries per directory block", rootDirectoryKeyBlock.header.entries_per_block).
+            AppendLine();
 
-            if((rootDirectoryKeyBlock.header.access & READ_ATTRIBUTE) == READ_ATTRIBUTE)
-                sbInformation.AppendLine("Volume can be read");
+        sbInformation.AppendFormat("{0} files in root directory", rootDirectoryKeyBlock.header.file_count).
+                      AppendLine();
 
-            if((rootDirectoryKeyBlock.header.access & WRITE_ATTRIBUTE) == WRITE_ATTRIBUTE)
-                sbInformation.AppendLine("Volume can be written");
+        sbInformation.AppendFormat("{0} blocks in volume", rootDirectoryKeyBlock.header.total_blocks).AppendLine();
 
-            if((rootDirectoryKeyBlock.header.access & RENAME_ATTRIBUTE) == RENAME_ATTRIBUTE)
-                sbInformation.AppendLine("Volume can be renamed");
+        sbInformation.AppendFormat("Bitmap starts at block {0}", rootDirectoryKeyBlock.header.bit_map_pointer).
+                      AppendLine();
 
-            if((rootDirectoryKeyBlock.header.access & DESTROY_ATTRIBUTE) == DESTROY_ATTRIBUTE)
-                sbInformation.AppendLine("Volume can be destroyed");
+        if((rootDirectoryKeyBlock.header.access & READ_ATTRIBUTE) == READ_ATTRIBUTE)
+            sbInformation.AppendLine("Volume can be read");
 
-            if((rootDirectoryKeyBlock.header.access & BACKUP_ATTRIBUTE) == BACKUP_ATTRIBUTE)
-                sbInformation.AppendLine("Volume must be backed up");
+        if((rootDirectoryKeyBlock.header.access & WRITE_ATTRIBUTE) == WRITE_ATTRIBUTE)
+            sbInformation.AppendLine("Volume can be written");
 
-            if((rootDirectoryKeyBlock.header.access & RESERVED_ATTRIBUTE_MASK) != 0)
-                AaruConsole.DebugWriteLine("ProDOS plugin", "Reserved attributes are set: {0:X2}",
-                                           rootDirectoryKeyBlock.header.access);
+        if((rootDirectoryKeyBlock.header.access & RENAME_ATTRIBUTE) == RENAME_ATTRIBUTE)
+            sbInformation.AppendLine("Volume can be renamed");
 
-            information = sbInformation.ToString();
+        if((rootDirectoryKeyBlock.header.access & DESTROY_ATTRIBUTE) == DESTROY_ATTRIBUTE)
+            sbInformation.AppendLine("Volume can be destroyed");
 
-            XmlFsType = new FileSystemType
-            {
-                VolumeName     = rootDirectoryKeyBlock.header.volume_name,
-                Files          = rootDirectoryKeyBlock.header.file_count,
-                FilesSpecified = true,
-                Clusters       = rootDirectoryKeyBlock.header.total_blocks,
-                Type           = "ProDOS"
-            };
+        if((rootDirectoryKeyBlock.header.access & BACKUP_ATTRIBUTE) == BACKUP_ATTRIBUTE)
+            sbInformation.AppendLine("Volume must be backed up");
 
-            XmlFsType.ClusterSize = (uint)((partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
-                                           XmlFsType.Clusters);
+        if((rootDirectoryKeyBlock.header.access & RESERVED_ATTRIBUTE_MASK) != 0)
+            AaruConsole.DebugWriteLine("ProDOS plugin", "Reserved attributes are set: {0:X2}",
+                                       rootDirectoryKeyBlock.header.access);
 
-            if(!dateCorrect)
-                return;
+        information = sbInformation.ToString();
 
-            XmlFsType.CreationDate          = rootDirectoryKeyBlock.header.creation_time;
-            XmlFsType.CreationDateSpecified = true;
-        }
-
-        /// <summary>ProDOS directory entry, decoded structure</summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct Entry
+        XmlFsType = new FileSystemType
         {
-            /// <summary>Type of file pointed by this entry Offset 0x00, mask 0xF0</summary>
-            public byte storage_type;
-            /// <summary>Length of name_length pascal string Offset 0x00, mask 0x0F</summary>
-            public byte name_length;
-            /// <summary>Pascal string of file name Offset 0x01, 15 bytes</summary>
-            public string file_name;
-            /// <summary>Descriptor of internal structure of the file Offset 0x10, 1 byte</summary>
-            public byte file_type;
-            /// <summary>
-            ///     Block address of master index block for tree files. Block address of index block for sapling files. Block
-            ///     address of block for seedling files. Offset 0x11, 2 bytes
-            /// </summary>
-            public ushort key_pointer;
-            /// <summary>Blocks used by file or directory, including index blocks. Offset 0x13, 2 bytes</summary>
-            public ushort blocks_used;
-            /// <summary>Size of file in bytes Offset 0x15, 3 bytes</summary>
-            public uint EOF;
-            /// <summary>File creation datetime Offset 0x18, 4 bytes</summary>
-            public DateTime creation_time;
-            /// <summary>Version of ProDOS that created this file Offset 0x1C, 1 byte</summary>
-            public byte version;
-            /// <summary>Minimum version of ProDOS needed to access this file Offset 0x1D, 1 byte</summary>
-            public byte min_version;
-            /// <summary>File permissions Offset 0x1E, 1 byte</summary>
-            public byte access;
-            /// <summary>General purpose field to store additional information about file format Offset 0x1F, 2 bytes</summary>
-            public ushort aux_type;
-            /// <summary>File last modification date time Offset 0x21, 4 bytes</summary>
-            public DateTime last_mod;
-            /// <summary>Block address pointer to key block of the directory containing this entry Offset 0x25, 2 bytes</summary>
-            public ushort header_pointer;
-        }
+            VolumeName     = rootDirectoryKeyBlock.header.volume_name,
+            Files          = rootDirectoryKeyBlock.header.file_count,
+            FilesSpecified = true,
+            Clusters       = rootDirectoryKeyBlock.header.total_blocks,
+            Type           = "ProDOS"
+        };
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct RootDirectoryHeader
-        {
-            /// <summary>Constant 0x0F Offset 0x04, mask 0xF0</summary>
-            public byte storage_type;
-            /// <summary>Length of volume_name pascal string Offset 0x04, mask 0x0F</summary>
-            public byte name_length;
-            /// <summary>The name of the volume. Offset 0x05, 15 bytes</summary>
-            public string volume_name;
-            /// <summary>Reserved for future expansion Offset 0x14, 8 bytes</summary>
-            public ulong reserved;
-            /// <summary>Creation time of the volume Offset 0x1C, 4 bytes</summary>
-            public DateTime creation_time;
-            /// <summary>Version number of the volume format Offset 0x20, 1 byte</summary>
-            public byte version;
-            /// <summary>Reserved for future use Offset 0x21, 1 byte</summary>
-            public byte min_version;
-            /// <summary>Permissions for the volume Offset 0x22, 1 byte</summary>
-            public byte access;
-            /// <summary>Length of an entry in this directory Const 0x27 Offset 0x23, 1 byte</summary>
-            public byte entry_length;
-            /// <summary>Number of entries per block Const 0x0D Offset 0x24, 1 byte</summary>
-            public byte entries_per_block;
-            /// <summary>Number of active files in this directory Offset 0x25, 2 bytes</summary>
-            public ushort file_count;
-            /// <summary>
-            ///     Block address of the first block of the volume's bitmap, one for every 4096 blocks or fraction Offset 0x27, 2
-            ///     bytes
-            /// </summary>
-            public ushort bit_map_pointer;
-            /// <summary>Total number of blocks in the volume Offset 0x29, 2 bytes</summary>
-            public ushort total_blocks;
-        }
+        XmlFsType.ClusterSize = (uint)((partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
+                                       XmlFsType.Clusters);
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct DirectoryHeader
-        {
-            /// <summary>Constant 0x0E Offset 0x04, mask 0xF0</summary>
-            public byte storage_type;
-            /// <summary>Length of volume_name pascal string Offset 0x04, mask 0x0F</summary>
-            public byte name_length;
-            /// <summary>The name of the directory. Offset 0x05, 15 bytes</summary>
-            public string directory_name;
-            /// <summary>Reserved for future expansion Offset 0x14, 8 bytes</summary>
-            public ulong reserved;
-            /// <summary>Creation time of the volume Offset 0x1C, 4 bytes</summary>
-            public DateTime creation_time;
-            /// <summary>Version number of the volume format Offset 0x20, 1 byte</summary>
-            public byte version;
-            /// <summary>Reserved for future use Offset 0x21, 1 byte</summary>
-            public byte min_version;
-            /// <summary>Permissions for the volume Offset 0x22, 1 byte</summary>
-            public byte access;
-            /// <summary>Length of an entry in this directory Const 0x27 Offset 0x23, 1 byte</summary>
-            public byte entry_length;
-            /// <summary>Number of entries per block Const 0x0D Offset 0x24, 1 byte</summary>
-            public byte entries_per_block;
-            /// <summary>Number of active files in this directory Offset 0x25, 2 bytes</summary>
-            public ushort file_count;
-            /// <summary>Block address of parent directory block that contains this entry Offset 0x27, 2 bytes</summary>
-            public ushort parent_pointer;
-            /// <summary>Entry number within the block indicated in parent_pointer Offset 0x29, 1 byte</summary>
-            public byte parent_entry_number;
-            /// <summary>Length of the entry that holds this directory, in the parent entry Const 0x27 Offset 0x2A, 1 byte</summary>
-            public byte parent_entry_length;
-        }
+        if(!dateCorrect)
+            return;
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct DirectoryKeyBlock
-        {
-            /// <summary>Always 0 Offset 0x00, 2 bytes</summary>
-            public ushort zero;
-            /// <summary>Pointer to next directory block, 0 if last Offset 0x02, 2 bytes</summary>
-            public ushort next_pointer;
-            /// <summary>Directory header Offset 0x04, 39 bytes</summary>
-            public DirectoryHeader header;
-            /// <summary>Directory entries Offset 0x2F, 39 bytes each, 12 entries</summary>
-            public Entry[] entries;
-        }
+        XmlFsType.CreationDate          = rootDirectoryKeyBlock.header.creation_time;
+        XmlFsType.CreationDateSpecified = true;
+    }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct RootDirectoryKeyBlock
-        {
-            /// <summary>Always 0 Offset 0x00, 2 bytes</summary>
-            public ushort zero;
-            /// <summary>Pointer to next directory block, 0 if last Offset 0x02, 2 bytes</summary>
-            public ushort next_pointer;
-            /// <summary>Directory header Offset 0x04, 39 bytes</summary>
-            public RootDirectoryHeader header;
-            /// <summary>Directory entries Offset 0x2F, 39 bytes each, 12 entries</summary>
-            public Entry[] entries;
-        }
+    /// <summary>ProDOS directory entry, decoded structure</summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct Entry
+    {
+        /// <summary>Type of file pointed by this entry Offset 0x00, mask 0xF0</summary>
+        public byte storage_type;
+        /// <summary>Length of name_length pascal string Offset 0x00, mask 0x0F</summary>
+        public byte name_length;
+        /// <summary>Pascal string of file name Offset 0x01, 15 bytes</summary>
+        public string file_name;
+        /// <summary>Descriptor of internal structure of the file Offset 0x10, 1 byte</summary>
+        public byte file_type;
+        /// <summary>
+        ///     Block address of master index block for tree files. Block address of index block for sapling files. Block
+        ///     address of block for seedling files. Offset 0x11, 2 bytes
+        /// </summary>
+        public ushort key_pointer;
+        /// <summary>Blocks used by file or directory, including index blocks. Offset 0x13, 2 bytes</summary>
+        public ushort blocks_used;
+        /// <summary>Size of file in bytes Offset 0x15, 3 bytes</summary>
+        public uint EOF;
+        /// <summary>File creation datetime Offset 0x18, 4 bytes</summary>
+        public DateTime creation_time;
+        /// <summary>Version of ProDOS that created this file Offset 0x1C, 1 byte</summary>
+        public byte version;
+        /// <summary>Minimum version of ProDOS needed to access this file Offset 0x1D, 1 byte</summary>
+        public byte min_version;
+        /// <summary>File permissions Offset 0x1E, 1 byte</summary>
+        public byte access;
+        /// <summary>General purpose field to store additional information about file format Offset 0x1F, 2 bytes</summary>
+        public ushort aux_type;
+        /// <summary>File last modification date time Offset 0x21, 4 bytes</summary>
+        public DateTime last_mod;
+        /// <summary>Block address pointer to key block of the directory containing this entry Offset 0x25, 2 bytes</summary>
+        public ushort header_pointer;
+    }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct DirectoryBlock
-        {
-            /// <summary>Pointer to previous directory block Offset 0x00, 2 bytes</summary>
-            public ushort zero;
-            /// <summary>Pointer to next directory block, 0 if last Offset 0x02, 2 bytes</summary>
-            public ushort next_pointer;
-            /// <summary>Directory entries Offset 0x2F, 39 bytes each, 13 entries</summary>
-            public Entry[] entries;
-        }
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct RootDirectoryHeader
+    {
+        /// <summary>Constant 0x0F Offset 0x04, mask 0xF0</summary>
+        public byte storage_type;
+        /// <summary>Length of volume_name pascal string Offset 0x04, mask 0x0F</summary>
+        public byte name_length;
+        /// <summary>The name of the volume. Offset 0x05, 15 bytes</summary>
+        public string volume_name;
+        /// <summary>Reserved for future expansion Offset 0x14, 8 bytes</summary>
+        public ulong reserved;
+        /// <summary>Creation time of the volume Offset 0x1C, 4 bytes</summary>
+        public DateTime creation_time;
+        /// <summary>Version number of the volume format Offset 0x20, 1 byte</summary>
+        public byte version;
+        /// <summary>Reserved for future use Offset 0x21, 1 byte</summary>
+        public byte min_version;
+        /// <summary>Permissions for the volume Offset 0x22, 1 byte</summary>
+        public byte access;
+        /// <summary>Length of an entry in this directory Const 0x27 Offset 0x23, 1 byte</summary>
+        public byte entry_length;
+        /// <summary>Number of entries per block Const 0x0D Offset 0x24, 1 byte</summary>
+        public byte entries_per_block;
+        /// <summary>Number of active files in this directory Offset 0x25, 2 bytes</summary>
+        public ushort file_count;
+        /// <summary>
+        ///     Block address of the first block of the volume's bitmap, one for every 4096 blocks or fraction Offset 0x27, 2
+        ///     bytes
+        /// </summary>
+        public ushort bit_map_pointer;
+        /// <summary>Total number of blocks in the volume Offset 0x29, 2 bytes</summary>
+        public ushort total_blocks;
+    }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct IndexBlock
-        {
-            /// <summary>Up to 256 pointers to blocks, 0 to indicate the block is sparsed (non-allocated)</summary>
-            public ushort[] block_pointer;
-        }
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct DirectoryHeader
+    {
+        /// <summary>Constant 0x0E Offset 0x04, mask 0xF0</summary>
+        public byte storage_type;
+        /// <summary>Length of volume_name pascal string Offset 0x04, mask 0x0F</summary>
+        public byte name_length;
+        /// <summary>The name of the directory. Offset 0x05, 15 bytes</summary>
+        public string directory_name;
+        /// <summary>Reserved for future expansion Offset 0x14, 8 bytes</summary>
+        public ulong reserved;
+        /// <summary>Creation time of the volume Offset 0x1C, 4 bytes</summary>
+        public DateTime creation_time;
+        /// <summary>Version number of the volume format Offset 0x20, 1 byte</summary>
+        public byte version;
+        /// <summary>Reserved for future use Offset 0x21, 1 byte</summary>
+        public byte min_version;
+        /// <summary>Permissions for the volume Offset 0x22, 1 byte</summary>
+        public byte access;
+        /// <summary>Length of an entry in this directory Const 0x27 Offset 0x23, 1 byte</summary>
+        public byte entry_length;
+        /// <summary>Number of entries per block Const 0x0D Offset 0x24, 1 byte</summary>
+        public byte entries_per_block;
+        /// <summary>Number of active files in this directory Offset 0x25, 2 bytes</summary>
+        public ushort file_count;
+        /// <summary>Block address of parent directory block that contains this entry Offset 0x27, 2 bytes</summary>
+        public ushort parent_pointer;
+        /// <summary>Entry number within the block indicated in parent_pointer Offset 0x29, 1 byte</summary>
+        public byte parent_entry_number;
+        /// <summary>Length of the entry that holds this directory, in the parent entry Const 0x27 Offset 0x2A, 1 byte</summary>
+        public byte parent_entry_length;
+    }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct MasterIndexBlock
-        {
-            /// <summary>Up to 128 pointers to index blocks</summary>
-            public ushort[] index_block_pointer;
-        }
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct DirectoryKeyBlock
+    {
+        /// <summary>Always 0 Offset 0x00, 2 bytes</summary>
+        public ushort zero;
+        /// <summary>Pointer to next directory block, 0 if last Offset 0x02, 2 bytes</summary>
+        public ushort next_pointer;
+        /// <summary>Directory header Offset 0x04, 39 bytes</summary>
+        public DirectoryHeader header;
+        /// <summary>Directory entries Offset 0x2F, 39 bytes each, 12 entries</summary>
+        public Entry[] entries;
+    }
+
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct RootDirectoryKeyBlock
+    {
+        /// <summary>Always 0 Offset 0x00, 2 bytes</summary>
+        public ushort zero;
+        /// <summary>Pointer to next directory block, 0 if last Offset 0x02, 2 bytes</summary>
+        public ushort next_pointer;
+        /// <summary>Directory header Offset 0x04, 39 bytes</summary>
+        public RootDirectoryHeader header;
+        /// <summary>Directory entries Offset 0x2F, 39 bytes each, 12 entries</summary>
+        public Entry[] entries;
+    }
+
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct DirectoryBlock
+    {
+        /// <summary>Pointer to previous directory block Offset 0x00, 2 bytes</summary>
+        public ushort zero;
+        /// <summary>Pointer to next directory block, 0 if last Offset 0x02, 2 bytes</summary>
+        public ushort next_pointer;
+        /// <summary>Directory entries Offset 0x2F, 39 bytes each, 13 entries</summary>
+        public Entry[] entries;
+    }
+
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct IndexBlock
+    {
+        /// <summary>Up to 256 pointers to blocks, 0 to indicate the block is sparsed (non-allocated)</summary>
+        public ushort[] block_pointer;
+    }
+
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct MasterIndexBlock
+    {
+        /// <summary>Up to 128 pointers to index blocks</summary>
+        public ushort[] index_block_pointer;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/QNX4.cs b/Aaru.Filesystems/QNX4.cs
index aa93bb37f..1d66dbfcc 100644
--- a/Aaru.Filesystems/QNX4.cs
+++ b/Aaru.Filesystems/QNX4.cs
@@ -42,244 +42,243 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of QNX 4 filesystem</summary>
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed class QNX4 : IFilesystem
 {
-    /// <inheritdoc />
-    /// <summary>Implements detection of QNX 4 filesystem</summary>
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed class QNX4 : IFilesystem
+    readonly byte[] _rootDirFname =
     {
-        readonly byte[] _rootDirFname =
+        0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
+
+    /// <inheritdoc />
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "QNX4 Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("E73A63FA-B5B0-48BF-BF82-DA5F0A8170D2");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
+    {
+        if(partition.Start + 1 >= imagePlugin.Info.Sectors)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start + 1, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(sector.Length < 512)
+            return false;
+
+        Superblock qnxSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        // Check root directory name
+        if(!_rootDirFname.SequenceEqual(qnxSb.rootDir.di_fname))
+            return false;
+
+        // Check sizes are multiple of blocks
+        if(qnxSb.rootDir.di_size % 512 != 0 ||
+           qnxSb.inode.di_size   % 512 != 0 ||
+           qnxSb.boot.di_size    % 512 != 0 ||
+           qnxSb.altBoot.di_size % 512 != 0)
+            return false;
+
+        // Check extents are not past device
+        if(qnxSb.rootDir.di_first_xtnt.Block + partition.Start >= partition.End ||
+           qnxSb.inode.di_first_xtnt.Block   + partition.Start >= partition.End ||
+           qnxSb.boot.di_first_xtnt.Block    + partition.Start >= partition.End ||
+           qnxSb.altBoot.di_first_xtnt.Block + partition.Start >= partition.End)
+            return false;
+
+        // Check inodes are in use
+        if((qnxSb.rootDir.di_status & 0x01) != 0x01 ||
+           (qnxSb.inode.di_status   & 0x01) != 0x01 ||
+           (qnxSb.boot.di_status    & 0x01) != 0x01)
+            return false;
+
+        // All hail filesystems without identification marks
+        return true;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start + 1, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        if(sector.Length < 512)
+            return;
+
+        Superblock qnxSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        // Too much useless information
+        /*
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_fname = {0}", CurrentEncoding.GetString(qnxSb.rootDir.di_fname));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_size = {0}", qnxSb.rootDir.di_size);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_first_xtnt.block = {0}", qnxSb.rootDir.di_first_xtnt.block);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_first_xtnt.length = {0}", qnxSb.rootDir.di_first_xtnt.length);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_xblk = {0}", qnxSb.rootDir.di_xblk);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_ftime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.rootDir.di_ftime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_mtime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.rootDir.di_mtime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_atime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.rootDir.di_atime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_ctime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.rootDir.di_ctime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_num_xtnts = {0}", qnxSb.rootDir.di_num_xtnts);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_mode = {0}", Convert.ToString(qnxSb.rootDir.di_mode, 8));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_uid = {0}", qnxSb.rootDir.di_uid);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_gid = {0}", qnxSb.rootDir.di_gid);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_nlink = {0}", qnxSb.rootDir.di_nlink);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_zero = {0}", qnxSb.rootDir.di_zero);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_type = {0}", qnxSb.rootDir.di_type);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_status = {0}", qnxSb.rootDir.di_status);
+
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_fname = {0}", CurrentEncoding.GetString(qnxSb.inode.di_fname));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_size = {0}", qnxSb.inode.di_size);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_first_xtnt.block = {0}", qnxSb.inode.di_first_xtnt.block);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_first_xtnt.length = {0}", qnxSb.inode.di_first_xtnt.length);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_xblk = {0}", qnxSb.inode.di_xblk);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_ftime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.inode.di_ftime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_mtime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.inode.di_mtime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_atime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.inode.di_atime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_ctime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.inode.di_ctime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_num_xtnts = {0}", qnxSb.inode.di_num_xtnts);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_mode = {0}", Convert.ToString(qnxSb.inode.di_mode, 8));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_uid = {0}", qnxSb.inode.di_uid);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_gid = {0}", qnxSb.inode.di_gid);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_nlink = {0}", qnxSb.inode.di_nlink);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_zero = {0}", qnxSb.inode.di_zero);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_type = {0}", qnxSb.inode.di_type);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_status = {0}", qnxSb.inode.di_status);
+
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_fname = {0}", CurrentEncoding.GetString(qnxSb.boot.di_fname));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_size = {0}", qnxSb.boot.di_size);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_first_xtnt.block = {0}", qnxSb.boot.di_first_xtnt.block);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_first_xtnt.length = {0}", qnxSb.boot.di_first_xtnt.length);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_xblk = {0}", qnxSb.boot.di_xblk);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_ftime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.boot.di_ftime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_mtime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.boot.di_mtime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_atime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.boot.di_atime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_ctime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.boot.di_ctime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_num_xtnts = {0}", qnxSb.boot.di_num_xtnts);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_mode = {0}", Convert.ToString(qnxSb.boot.di_mode, 8));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_uid = {0}", qnxSb.boot.di_uid);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_gid = {0}", qnxSb.boot.di_gid);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_nlink = {0}", qnxSb.boot.di_nlink);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_zero = {0}", qnxSb.boot.di_zero);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_type = {0}", qnxSb.boot.di_type);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_status = {0}", qnxSb.boot.di_status);
+
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_fname = {0}", CurrentEncoding.GetString(qnxSb.altBoot.di_fname));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_size = {0}", qnxSb.altBoot.di_size);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_first_xtnt.block = {0}", qnxSb.altBoot.di_first_xtnt.block);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_first_xtnt.length = {0}", qnxSb.altBoot.di_first_xtnt.length);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_xblk = {0}", qnxSb.altBoot.di_xblk);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_ftime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.altBoot.di_ftime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_mtime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.altBoot.di_mtime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_atime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.altBoot.di_atime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_ctime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.altBoot.di_ctime));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_num_xtnts = {0}", qnxSb.altBoot.di_num_xtnts);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_mode = {0}", Convert.ToString(qnxSb.altBoot.di_mode, 8));
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_uid = {0}", qnxSb.altBoot.di_uid);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_gid = {0}", qnxSb.altBoot.di_gid);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_nlink = {0}", qnxSb.altBoot.di_nlink);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_zero = {0}", qnxSb.altBoot.di_zero);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_type = {0}", qnxSb.altBoot.di_type);
+        AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_status = {0}", qnxSb.altBoot.di_status);
+        */
+
+        information =
+            $"QNX4 filesystem\nCreated on {DateHandlers.UnixUnsignedToDateTime(qnxSb.rootDir.di_ftime)}\n";
+
+        XmlFsType = new FileSystemType
         {
-            0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            Type                      = "QNX4 filesystem",
+            Clusters                  = partition.Length,
+            ClusterSize               = 512,
+            CreationDate              = DateHandlers.UnixUnsignedToDateTime(qnxSb.rootDir.di_ftime),
+            CreationDateSpecified     = true,
+            ModificationDate          = DateHandlers.UnixUnsignedToDateTime(qnxSb.rootDir.di_mtime),
+            ModificationDateSpecified = true
         };
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "QNX4 Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("E73A63FA-B5B0-48BF-BF82-DA5F0A8170D2");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        XmlFsType.Bootable |= qnxSb.boot.di_size != 0 || qnxSb.altBoot.di_size != 0;
+    }
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            if(partition.Start + 1 >= imagePlugin.Info.Sectors)
-                return false;
+    struct Extent
+    {
+        public uint Block;
+        public uint Length;
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start + 1, out byte[] sector);
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Inode
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] di_fname;
+        public readonly uint   di_size;
+        public readonly Extent di_first_xtnt;
+        public readonly uint   di_xblk;
+        public readonly uint   di_ftime;
+        public readonly uint   di_mtime;
+        public readonly uint   di_atime;
+        public readonly uint   di_ctime;
+        public readonly ushort di_num_xtnts;
+        public readonly ushort di_mode;
+        public readonly ushort di_uid;
+        public readonly ushort di_gid;
+        public readonly ushort di_nlink;
+        public readonly uint   di_zero;
+        public readonly byte   di_type;
+        public readonly byte   di_status;
+    }
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct LinkInfo
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 48)]
+        public readonly byte[] dl_fname;
+        public readonly uint dl_inode_blk;
+        public readonly byte dl_inode_ndx;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly byte[] dl_spare;
+        public readonly byte dl_status;
+    }
 
-            if(sector.Length < 512)
-                return false;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ExtentBlock
+    {
+        public readonly uint next_xblk;
+        public readonly uint prev_xblk;
+        public readonly byte num_xtnts;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] spare;
+        public readonly uint num_blocks;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 60)]
+        public readonly Extent[] xtnts;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] signature;
+        public readonly Extent first_xtnt;
+    }
 
-            Superblock qnxSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-            // Check root directory name
-            if(!_rootDirFname.SequenceEqual(qnxSb.rootDir.di_fname))
-                return false;
-
-            // Check sizes are multiple of blocks
-            if(qnxSb.rootDir.di_size % 512 != 0 ||
-               qnxSb.inode.di_size   % 512 != 0 ||
-               qnxSb.boot.di_size    % 512 != 0 ||
-               qnxSb.altBoot.di_size % 512 != 0)
-                return false;
-
-            // Check extents are not past device
-            if(qnxSb.rootDir.di_first_xtnt.Block + partition.Start >= partition.End ||
-               qnxSb.inode.di_first_xtnt.Block   + partition.Start >= partition.End ||
-               qnxSb.boot.di_first_xtnt.Block    + partition.Start >= partition.End ||
-               qnxSb.altBoot.di_first_xtnt.Block + partition.Start >= partition.End)
-                return false;
-
-            // Check inodes are in use
-            if((qnxSb.rootDir.di_status & 0x01) != 0x01 ||
-               (qnxSb.inode.di_status   & 0x01) != 0x01 ||
-               (qnxSb.boot.di_status    & 0x01) != 0x01)
-                return false;
-
-            // All hail filesystems without identification marks
-            return true;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start + 1, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            if(sector.Length < 512)
-                return;
-
-            Superblock qnxSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-            // Too much useless information
-            /*
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_fname = {0}", CurrentEncoding.GetString(qnxSb.rootDir.di_fname));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_size = {0}", qnxSb.rootDir.di_size);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_first_xtnt.block = {0}", qnxSb.rootDir.di_first_xtnt.block);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_first_xtnt.length = {0}", qnxSb.rootDir.di_first_xtnt.length);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_xblk = {0}", qnxSb.rootDir.di_xblk);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_ftime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.rootDir.di_ftime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_mtime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.rootDir.di_mtime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_atime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.rootDir.di_atime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_ctime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.rootDir.di_ctime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_num_xtnts = {0}", qnxSb.rootDir.di_num_xtnts);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_mode = {0}", Convert.ToString(qnxSb.rootDir.di_mode, 8));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_uid = {0}", qnxSb.rootDir.di_uid);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_gid = {0}", qnxSb.rootDir.di_gid);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_nlink = {0}", qnxSb.rootDir.di_nlink);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_zero = {0}", qnxSb.rootDir.di_zero);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_type = {0}", qnxSb.rootDir.di_type);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.rootDir.di_status = {0}", qnxSb.rootDir.di_status);
-
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_fname = {0}", CurrentEncoding.GetString(qnxSb.inode.di_fname));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_size = {0}", qnxSb.inode.di_size);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_first_xtnt.block = {0}", qnxSb.inode.di_first_xtnt.block);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_first_xtnt.length = {0}", qnxSb.inode.di_first_xtnt.length);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_xblk = {0}", qnxSb.inode.di_xblk);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_ftime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.inode.di_ftime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_mtime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.inode.di_mtime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_atime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.inode.di_atime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_ctime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.inode.di_ctime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_num_xtnts = {0}", qnxSb.inode.di_num_xtnts);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_mode = {0}", Convert.ToString(qnxSb.inode.di_mode, 8));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_uid = {0}", qnxSb.inode.di_uid);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_gid = {0}", qnxSb.inode.di_gid);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_nlink = {0}", qnxSb.inode.di_nlink);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_zero = {0}", qnxSb.inode.di_zero);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_type = {0}", qnxSb.inode.di_type);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.inode.di_status = {0}", qnxSb.inode.di_status);
-
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_fname = {0}", CurrentEncoding.GetString(qnxSb.boot.di_fname));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_size = {0}", qnxSb.boot.di_size);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_first_xtnt.block = {0}", qnxSb.boot.di_first_xtnt.block);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_first_xtnt.length = {0}", qnxSb.boot.di_first_xtnt.length);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_xblk = {0}", qnxSb.boot.di_xblk);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_ftime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.boot.di_ftime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_mtime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.boot.di_mtime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_atime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.boot.di_atime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_ctime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.boot.di_ctime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_num_xtnts = {0}", qnxSb.boot.di_num_xtnts);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_mode = {0}", Convert.ToString(qnxSb.boot.di_mode, 8));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_uid = {0}", qnxSb.boot.di_uid);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_gid = {0}", qnxSb.boot.di_gid);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_nlink = {0}", qnxSb.boot.di_nlink);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_zero = {0}", qnxSb.boot.di_zero);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_type = {0}", qnxSb.boot.di_type);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.boot.di_status = {0}", qnxSb.boot.di_status);
-
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_fname = {0}", CurrentEncoding.GetString(qnxSb.altBoot.di_fname));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_size = {0}", qnxSb.altBoot.di_size);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_first_xtnt.block = {0}", qnxSb.altBoot.di_first_xtnt.block);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_first_xtnt.length = {0}", qnxSb.altBoot.di_first_xtnt.length);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_xblk = {0}", qnxSb.altBoot.di_xblk);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_ftime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.altBoot.di_ftime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_mtime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.altBoot.di_mtime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_atime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.altBoot.di_atime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_ctime = {0}", DateHandlers.UNIXUnsignedToDateTime(qnxSb.altBoot.di_ctime));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_num_xtnts = {0}", qnxSb.altBoot.di_num_xtnts);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_mode = {0}", Convert.ToString(qnxSb.altBoot.di_mode, 8));
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_uid = {0}", qnxSb.altBoot.di_uid);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_gid = {0}", qnxSb.altBoot.di_gid);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_nlink = {0}", qnxSb.altBoot.di_nlink);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_zero = {0}", qnxSb.altBoot.di_zero);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_type = {0}", qnxSb.altBoot.di_type);
-            AaruConsole.DebugWriteLine("QNX4 plugin", "qnxSb.altBoot.di_status = {0}", qnxSb.altBoot.di_status);
-            */
-
-            information =
-                $"QNX4 filesystem\nCreated on {DateHandlers.UnixUnsignedToDateTime(qnxSb.rootDir.di_ftime)}\n";
-
-            XmlFsType = new FileSystemType
-            {
-                Type                      = "QNX4 filesystem",
-                Clusters                  = partition.Length,
-                ClusterSize               = 512,
-                CreationDate              = DateHandlers.UnixUnsignedToDateTime(qnxSb.rootDir.di_ftime),
-                CreationDateSpecified     = true,
-                ModificationDate          = DateHandlers.UnixUnsignedToDateTime(qnxSb.rootDir.di_mtime),
-                ModificationDateSpecified = true
-            };
-
-            XmlFsType.Bootable |= qnxSb.boot.di_size != 0 || qnxSb.altBoot.di_size != 0;
-        }
-
-        struct Extent
-        {
-            public uint Block;
-            public uint Length;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Inode
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] di_fname;
-            public readonly uint   di_size;
-            public readonly Extent di_first_xtnt;
-            public readonly uint   di_xblk;
-            public readonly uint   di_ftime;
-            public readonly uint   di_mtime;
-            public readonly uint   di_atime;
-            public readonly uint   di_ctime;
-            public readonly ushort di_num_xtnts;
-            public readonly ushort di_mode;
-            public readonly ushort di_uid;
-            public readonly ushort di_gid;
-            public readonly ushort di_nlink;
-            public readonly uint   di_zero;
-            public readonly byte   di_type;
-            public readonly byte   di_status;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct LinkInfo
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 48)]
-            public readonly byte[] dl_fname;
-            public readonly uint dl_inode_blk;
-            public readonly byte dl_inode_ndx;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly byte[] dl_spare;
-            public readonly byte dl_status;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ExtentBlock
-        {
-            public readonly uint next_xblk;
-            public readonly uint prev_xblk;
-            public readonly byte num_xtnts;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] spare;
-            public readonly uint num_blocks;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 60)]
-            public readonly Extent[] xtnts;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] signature;
-            public readonly Extent first_xtnt;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Superblock
-        {
-            public readonly Inode rootDir;
-            public readonly Inode inode;
-            public readonly Inode boot;
-            public readonly Inode altBoot;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Superblock
+    {
+        public readonly Inode rootDir;
+        public readonly Inode inode;
+        public readonly Inode boot;
+        public readonly Inode altBoot;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/QNX6.cs b/Aaru.Filesystems/QNX6.cs
index 621958a49..f3bd6ea6b 100644
--- a/Aaru.Filesystems/QNX6.cs
+++ b/Aaru.Filesystems/QNX6.cs
@@ -40,213 +40,212 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of QNX 6 filesystem</summary>
+public sealed class QNX6 : IFilesystem
 {
+    const uint QNX6_SUPER_BLOCK_SIZE = 0x1000;
+    const uint QNX6_BOOT_BLOCKS_SIZE = 0x2000;
+    const uint QNX6_MAGIC            = 0x68191122;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of QNX 6 filesystem</summary>
-    public sealed class QNX6 : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "QNX6 Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("3E610EA2-4D08-4D70-8947-830CD4C74FC0");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint QNX6_SUPER_BLOCK_SIZE = 0x1000;
-        const uint QNX6_BOOT_BLOCKS_SIZE = 0x2000;
-        const uint QNX6_MAGIC            = 0x68191122;
+        uint sectors     = QNX6_SUPER_BLOCK_SIZE / imagePlugin.Info.SectorSize;
+        uint bootSectors = QNX6_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "QNX6 Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("3E610EA2-4D08-4D70-8947-830CD4C74FC0");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(partition.Start + bootSectors + sectors >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sectors, out byte[] audiSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        errno = imagePlugin.ReadSectors(partition.Start + bootSectors, sectors, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(sector.Length < QNX6_SUPER_BLOCK_SIZE)
+            return false;
+
+        AudiSuperBlock audiSb = Marshal.ByteArrayToStructureLittleEndian<AudiSuperBlock>(audiSector);
+
+        SuperBlock qnxSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
+
+        return qnxSb.magic == QNX6_MAGIC || audiSb.magic == QNX6_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+        var  sb          = new StringBuilder();
+        uint sectors     = QNX6_SUPER_BLOCK_SIZE / imagePlugin.Info.SectorSize;
+        uint bootSectors = QNX6_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sectors, out byte[] audiSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        errno = imagePlugin.ReadSectors(partition.Start + bootSectors, sectors, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        if(sector.Length < QNX6_SUPER_BLOCK_SIZE)
+            return;
+
+        AudiSuperBlock audiSb = Marshal.ByteArrayToStructureLittleEndian<AudiSuperBlock>(audiSector);
+
+        SuperBlock qnxSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
+
+        bool audi = audiSb.magic == QNX6_MAGIC;
+
+        if(audi)
         {
-            uint sectors     = QNX6_SUPER_BLOCK_SIZE / imagePlugin.Info.SectorSize;
-            uint bootSectors = QNX6_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
+            sb.AppendLine("QNX6 (Audi) filesystem");
+            sb.AppendFormat("Checksum: 0x{0:X8}", audiSb.checksum).AppendLine();
+            sb.AppendFormat("Serial: 0x{0:X16}", audiSb.checksum).AppendLine();
+            sb.AppendFormat("{0} bytes per block", audiSb.blockSize).AppendLine();
+            sb.AppendFormat("{0} inodes free of {1}", audiSb.freeInodes, audiSb.numInodes).AppendLine();
 
-            if(partition.Start + bootSectors + sectors >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sectors, out byte[] audiSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            errno = imagePlugin.ReadSectors(partition.Start + bootSectors, sectors, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(sector.Length < QNX6_SUPER_BLOCK_SIZE)
-                return false;
-
-            AudiSuperBlock audiSb = Marshal.ByteArrayToStructureLittleEndian<AudiSuperBlock>(audiSector);
-
-            SuperBlock qnxSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
-
-            return qnxSb.magic == QNX6_MAGIC || audiSb.magic == QNX6_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-            var  sb          = new StringBuilder();
-            uint sectors     = QNX6_SUPER_BLOCK_SIZE / imagePlugin.Info.SectorSize;
-            uint bootSectors = QNX6_BOOT_BLOCKS_SIZE / imagePlugin.Info.SectorSize;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sectors, out byte[] audiSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            errno = imagePlugin.ReadSectors(partition.Start + bootSectors, sectors, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            if(sector.Length < QNX6_SUPER_BLOCK_SIZE)
-                return;
-
-            AudiSuperBlock audiSb = Marshal.ByteArrayToStructureLittleEndian<AudiSuperBlock>(audiSector);
-
-            SuperBlock qnxSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
-
-            bool audi = audiSb.magic == QNX6_MAGIC;
-
-            if(audi)
-            {
-                sb.AppendLine("QNX6 (Audi) filesystem");
-                sb.AppendFormat("Checksum: 0x{0:X8}", audiSb.checksum).AppendLine();
-                sb.AppendFormat("Serial: 0x{0:X16}", audiSb.checksum).AppendLine();
-                sb.AppendFormat("{0} bytes per block", audiSb.blockSize).AppendLine();
-                sb.AppendFormat("{0} inodes free of {1}", audiSb.freeInodes, audiSb.numInodes).AppendLine();
-
-                sb.AppendFormat("{0} blocks ({1} bytes) free of {2} ({3} bytes)", audiSb.freeBlocks,
-                                audiSb.freeBlocks * audiSb.blockSize, audiSb.numBlocks,
-                                audiSb.numBlocks  * audiSb.blockSize).AppendLine();
-
-                XmlFsType = new FileSystemType
-                {
-                    Type                  = "QNX6 (Audi) filesystem",
-                    Clusters              = audiSb.numBlocks,
-                    ClusterSize           = audiSb.blockSize,
-                    Bootable              = true,
-                    Files                 = audiSb.numInodes - audiSb.freeInodes,
-                    FilesSpecified        = true,
-                    FreeClusters          = audiSb.freeBlocks,
-                    FreeClustersSpecified = true,
-                    VolumeSerial          = $"{audiSb.serial:X16}"
-                };
-
-                //xmlFSType.VolumeName = CurrentEncoding.GetString(audiSb.id);
-
-                information = sb.ToString();
-
-                return;
-            }
-
-            sb.AppendLine("QNX6 filesystem");
-            sb.AppendFormat("Checksum: 0x{0:X8}", qnxSb.checksum).AppendLine();
-            sb.AppendFormat("Serial: 0x{0:X16}", qnxSb.checksum).AppendLine();
-            sb.AppendFormat("Created on {0}", DateHandlers.UnixUnsignedToDateTime(qnxSb.ctime)).AppendLine();
-            sb.AppendFormat("Last mounted on {0}", DateHandlers.UnixUnsignedToDateTime(qnxSb.atime)).AppendLine();
-            sb.AppendFormat("Flags: 0x{0:X8}", qnxSb.flags).AppendLine();
-            sb.AppendFormat("Version1: 0x{0:X4}", qnxSb.version1).AppendLine();
-            sb.AppendFormat("Version2: 0x{0:X4}", qnxSb.version2).AppendLine();
-
-            //sb.AppendFormat("Volume ID: \"{0}\"", CurrentEncoding.GetString(qnxSb.volumeid)).AppendLine();
-            sb.AppendFormat("{0} bytes per block", qnxSb.blockSize).AppendLine();
-            sb.AppendFormat("{0} inodes free of {1}", qnxSb.freeInodes, qnxSb.numInodes).AppendLine();
-
-            sb.AppendFormat("{0} blocks ({1} bytes) free of {2} ({3} bytes)", qnxSb.freeBlocks,
-                            qnxSb.freeBlocks * qnxSb.blockSize, qnxSb.numBlocks, qnxSb.numBlocks * qnxSb.blockSize).
-               AppendLine();
+            sb.AppendFormat("{0} blocks ({1} bytes) free of {2} ({3} bytes)", audiSb.freeBlocks,
+                            audiSb.freeBlocks * audiSb.blockSize, audiSb.numBlocks,
+                            audiSb.numBlocks  * audiSb.blockSize).AppendLine();
 
             XmlFsType = new FileSystemType
             {
-                Type                      = "QNX6 filesystem",
-                Clusters                  = qnxSb.numBlocks,
-                ClusterSize               = qnxSb.blockSize,
-                Bootable                  = true,
-                Files                     = qnxSb.numInodes - qnxSb.freeInodes,
-                FilesSpecified            = true,
-                FreeClusters              = qnxSb.freeBlocks,
-                FreeClustersSpecified     = true,
-                VolumeSerial              = $"{qnxSb.serial:X16}",
-                CreationDate              = DateHandlers.UnixUnsignedToDateTime(qnxSb.ctime),
-                CreationDateSpecified     = true,
-                ModificationDate          = DateHandlers.UnixUnsignedToDateTime(qnxSb.atime),
-                ModificationDateSpecified = true
+                Type                  = "QNX6 (Audi) filesystem",
+                Clusters              = audiSb.numBlocks,
+                ClusterSize           = audiSb.blockSize,
+                Bootable              = true,
+                Files                 = audiSb.numInodes - audiSb.freeInodes,
+                FilesSpecified        = true,
+                FreeClusters          = audiSb.freeBlocks,
+                FreeClustersSpecified = true,
+                VolumeSerial          = $"{audiSb.serial:X16}"
             };
 
-            //xmlFSType.VolumeName = CurrentEncoding.GetString(qnxSb.volumeid);
+            //xmlFSType.VolumeName = CurrentEncoding.GetString(audiSb.id);
 
             information = sb.ToString();
+
+            return;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct RootNode
-        {
-            public readonly ulong size;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly uint[] pointers;
-            public readonly byte levels;
-            public readonly byte mode;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] spare;
-        }
+        sb.AppendLine("QNX6 filesystem");
+        sb.AppendFormat("Checksum: 0x{0:X8}", qnxSb.checksum).AppendLine();
+        sb.AppendFormat("Serial: 0x{0:X16}", qnxSb.checksum).AppendLine();
+        sb.AppendFormat("Created on {0}", DateHandlers.UnixUnsignedToDateTime(qnxSb.ctime)).AppendLine();
+        sb.AppendFormat("Last mounted on {0}", DateHandlers.UnixUnsignedToDateTime(qnxSb.atime)).AppendLine();
+        sb.AppendFormat("Flags: 0x{0:X8}", qnxSb.flags).AppendLine();
+        sb.AppendFormat("Version1: 0x{0:X4}", qnxSb.version1).AppendLine();
+        sb.AppendFormat("Version2: 0x{0:X4}", qnxSb.version2).AppendLine();
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            public readonly uint   magic;
-            public readonly uint   checksum;
-            public readonly ulong  serial;
-            public readonly uint   ctime;
-            public readonly uint   atime;
-            public readonly uint   flags;
-            public readonly ushort version1;
-            public readonly ushort version2;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] volumeid;
-            public readonly uint     blockSize;
-            public readonly uint     numInodes;
-            public readonly uint     freeInodes;
-            public readonly uint     numBlocks;
-            public readonly uint     freeBlocks;
-            public readonly uint     allocationGroup;
-            public readonly RootNode inode;
-            public readonly RootNode bitmap;
-            public readonly RootNode longfile;
-            public readonly RootNode unknown;
-        }
+        //sb.AppendFormat("Volume ID: \"{0}\"", CurrentEncoding.GetString(qnxSb.volumeid)).AppendLine();
+        sb.AppendFormat("{0} bytes per block", qnxSb.blockSize).AppendLine();
+        sb.AppendFormat("{0} inodes free of {1}", qnxSb.freeInodes, qnxSb.numInodes).AppendLine();
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AudiSuperBlock
+        sb.AppendFormat("{0} blocks ({1} bytes) free of {2} ({3} bytes)", qnxSb.freeBlocks,
+                        qnxSb.freeBlocks * qnxSb.blockSize, qnxSb.numBlocks, qnxSb.numBlocks * qnxSb.blockSize).
+           AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            public readonly uint  magic;
-            public readonly uint  checksum;
-            public readonly ulong serial;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] spare1;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] id;
-            public readonly uint     blockSize;
-            public readonly uint     numInodes;
-            public readonly uint     freeInodes;
-            public readonly uint     numBlocks;
-            public readonly uint     freeBlocks;
-            public readonly uint     spare2;
-            public readonly RootNode inode;
-            public readonly RootNode bitmap;
-            public readonly RootNode longfile;
-            public readonly RootNode unknown;
-        }
+            Type                      = "QNX6 filesystem",
+            Clusters                  = qnxSb.numBlocks,
+            ClusterSize               = qnxSb.blockSize,
+            Bootable                  = true,
+            Files                     = qnxSb.numInodes - qnxSb.freeInodes,
+            FilesSpecified            = true,
+            FreeClusters              = qnxSb.freeBlocks,
+            FreeClustersSpecified     = true,
+            VolumeSerial              = $"{qnxSb.serial:X16}",
+            CreationDate              = DateHandlers.UnixUnsignedToDateTime(qnxSb.ctime),
+            CreationDateSpecified     = true,
+            ModificationDate          = DateHandlers.UnixUnsignedToDateTime(qnxSb.atime),
+            ModificationDateSpecified = true
+        };
+
+        //xmlFSType.VolumeName = CurrentEncoding.GetString(qnxSb.volumeid);
+
+        information = sb.ToString();
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct RootNode
+    {
+        public readonly ulong size;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly uint[] pointers;
+        public readonly byte levels;
+        public readonly byte mode;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] spare;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        public readonly uint   magic;
+        public readonly uint   checksum;
+        public readonly ulong  serial;
+        public readonly uint   ctime;
+        public readonly uint   atime;
+        public readonly uint   flags;
+        public readonly ushort version1;
+        public readonly ushort version2;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] volumeid;
+        public readonly uint     blockSize;
+        public readonly uint     numInodes;
+        public readonly uint     freeInodes;
+        public readonly uint     numBlocks;
+        public readonly uint     freeBlocks;
+        public readonly uint     allocationGroup;
+        public readonly RootNode inode;
+        public readonly RootNode bitmap;
+        public readonly RootNode longfile;
+        public readonly RootNode unknown;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AudiSuperBlock
+    {
+        public readonly uint  magic;
+        public readonly uint  checksum;
+        public readonly ulong serial;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] spare1;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] id;
+        public readonly uint     blockSize;
+        public readonly uint     numInodes;
+        public readonly uint     freeInodes;
+        public readonly uint     numBlocks;
+        public readonly uint     freeBlocks;
+        public readonly uint     spare2;
+        public readonly RootNode inode;
+        public readonly RootNode bitmap;
+        public readonly RootNode longfile;
+        public readonly RootNode unknown;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/RBF.cs b/Aaru.Filesystems/RBF.cs
index 5fe61d9d5..3c5415bde 100644
--- a/Aaru.Filesystems/RBF.cs
+++ b/Aaru.Filesystems/RBF.cs
@@ -41,373 +41,372 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the Locus filesystem</summary>
+public sealed class RBF : IFilesystem
 {
+    /// <summary>Magic number for OS-9. Same for OS-9000?</summary>
+    const uint RBF_SYNC = 0x4372757A;
+    const uint RBF_CNYS = 0x7A757243;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the Locus filesystem</summary>
-    public sealed class RBF : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "OS-9 Random Block File Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("E864E45B-0B52-4D29-A858-7BDFA9199FB2");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>Magic number for OS-9. Same for OS-9000?</summary>
-        const uint RBF_SYNC = 0x4372757A;
-        const uint RBF_CNYS = 0x7A757243;
+        if(imagePlugin.Info.SectorSize < 256)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "OS-9 Random Block File Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("E864E45B-0B52-4D29-A858-7BDFA9199FB2");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        // Documentation says ID should be sector 0
+        // I've found that OS-9/X68000 has it on sector 4
+        // I've read OS-9/Apple2 has it on sector 15
+        foreach(int i in new[]
+                {
+                    0, 4, 15
+                })
         {
-            if(imagePlugin.Info.SectorSize < 256)
+            ulong location = (ulong)i;
+
+            uint sbSize = (uint)(Marshal.SizeOf<IdSector>() / imagePlugin.Info.SectorSize);
+
+            if(Marshal.SizeOf<IdSector>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            if(partition.Start + location + sbSize >= imagePlugin.Info.Sectors)
+                break;
+
+            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
                 return false;
 
-            // Documentation says ID should be sector 0
-            // I've found that OS-9/X68000 has it on sector 4
-            // I've read OS-9/Apple2 has it on sector 15
-            foreach(int i in new[]
-            {
-                0, 4, 15
-            })
-            {
-                ulong location = (ulong)i;
+            if(sector.Length < Marshal.SizeOf<IdSector>())
+                return false;
 
-                uint sbSize = (uint)(Marshal.SizeOf<IdSector>() / imagePlugin.Info.SectorSize);
+            IdSector    rbfSb     = Marshal.ByteArrayToStructureBigEndian<IdSector>(sector);
+            NewIdSector rbf9000Sb = Marshal.ByteArrayToStructureBigEndian<NewIdSector>(sector);
 
-                if(Marshal.SizeOf<IdSector>() % imagePlugin.Info.SectorSize != 0)
-                    sbSize++;
+            AaruConsole.DebugWriteLine("RBF plugin",
+                                       "magic at {0} = 0x{1:X8} or 0x{2:X8} (expected 0x{3:X8} or 0x{4:X8})",
+                                       location, rbfSb.dd_sync, rbf9000Sb.rid_sync, RBF_SYNC, RBF_CNYS);
 
-                if(partition.Start + location + sbSize >= imagePlugin.Info.Sectors)
-                    break;
-
-                ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                if(sector.Length < Marshal.SizeOf<IdSector>())
-                    return false;
-
-                IdSector    rbfSb     = Marshal.ByteArrayToStructureBigEndian<IdSector>(sector);
-                NewIdSector rbf9000Sb = Marshal.ByteArrayToStructureBigEndian<NewIdSector>(sector);
-
-                AaruConsole.DebugWriteLine("RBF plugin",
-                                           "magic at {0} = 0x{1:X8} or 0x{2:X8} (expected 0x{3:X8} or 0x{4:X8})",
-                                           location, rbfSb.dd_sync, rbf9000Sb.rid_sync, RBF_SYNC, RBF_CNYS);
-
-                if(rbfSb.dd_sync      == RBF_SYNC ||
-                   rbf9000Sb.rid_sync == RBF_SYNC ||
-                   rbf9000Sb.rid_sync == RBF_CNYS)
-                    return true;
-            }
-
-            return false;
+            if(rbfSb.dd_sync      == RBF_SYNC ||
+               rbf9000Sb.rid_sync == RBF_SYNC ||
+               rbf9000Sb.rid_sync == RBF_CNYS)
+                return true;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
+        return false;
+    }
 
-            if(imagePlugin.Info.SectorSize < 256)
-                return;
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
 
-            var rbfSb     = new IdSector();
-            var rbf9000Sb = new NewIdSector();
+        if(imagePlugin.Info.SectorSize < 256)
+            return;
 
-            foreach(int i in new[]
-            {
-                0, 4, 15
-            })
-            {
-                ulong location = (ulong)i;
-                uint  sbSize   = (uint)(Marshal.SizeOf<IdSector>() / imagePlugin.Info.SectorSize);
+        var rbfSb     = new IdSector();
+        var rbf9000Sb = new NewIdSector();
 
-                if(Marshal.SizeOf<IdSector>() % imagePlugin.Info.SectorSize != 0)
-                    sbSize++;
-
-                ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                if(sector.Length < Marshal.SizeOf<IdSector>())
-                    return;
-
-                rbfSb     = Marshal.ByteArrayToStructureBigEndian<IdSector>(sector);
-                rbf9000Sb = Marshal.ByteArrayToStructureBigEndian<NewIdSector>(sector);
-
-                AaruConsole.DebugWriteLine("RBF plugin",
-                                           "magic at {0} = 0x{1:X8} or 0x{2:X8} (expected 0x{3:X8} or 0x{4:X8})",
-                                           location, rbfSb.dd_sync, rbf9000Sb.rid_sync, RBF_SYNC, RBF_CNYS);
-
-                if(rbfSb.dd_sync      == RBF_SYNC ||
-                   rbf9000Sb.rid_sync == RBF_SYNC ||
-                   rbf9000Sb.rid_sync == RBF_CNYS)
-                    break;
-            }
-
-            if(rbfSb.dd_sync      != RBF_SYNC &&
-               rbf9000Sb.rid_sync != RBF_SYNC &&
-               rbf9000Sb.rid_sync != RBF_CNYS)
-                return;
-
-            if(rbf9000Sb.rid_sync == RBF_CNYS)
-                rbf9000Sb = (NewIdSector)Marshal.SwapStructureMembersEndian(rbf9000Sb);
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine("OS-9 Random Block File");
-
-            if(rbf9000Sb.rid_sync == RBF_SYNC)
-            {
-                sb.AppendFormat("Volume ID: {0:X8}", rbf9000Sb.rid_diskid).AppendLine();
-                sb.AppendFormat("{0} blocks in volume", rbf9000Sb.rid_totblocks).AppendLine();
-                sb.AppendFormat("{0} cylinders", rbf9000Sb.rid_cylinders).AppendLine();
-                sb.AppendFormat("{0} blocks in cylinder 0", rbf9000Sb.rid_cyl0size).AppendLine();
-                sb.AppendFormat("{0} blocks per cylinder", rbf9000Sb.rid_cylsize).AppendLine();
-                sb.AppendFormat("{0} heads", rbf9000Sb.rid_heads).AppendLine();
-                sb.AppendFormat("{0} bytes per block", rbf9000Sb.rid_blocksize).AppendLine();
-
-                // TODO: Convert to flags?
-                sb.AppendLine((rbf9000Sb.rid_format & 0x01) == 0x01 ? "Disk is double sided" : "Disk is single sided");
-
-                sb.AppendLine((rbf9000Sb.rid_format & 0x02) == 0x02 ? "Disk is double density"
-                                  : "Disk is single density");
-
-                if((rbf9000Sb.rid_format & 0x10) == 0x10)
-                    sb.AppendLine("Disk is 384 TPI");
-                else if((rbf9000Sb.rid_format & 0x08) == 0x08)
-                    sb.AppendLine("Disk is 192 TPI");
-                else if((rbf9000Sb.rid_format & 0x04) == 0x04)
-                    sb.AppendLine("Disk is 96 TPI or 135 TPI");
-                else
-                    sb.AppendLine("Disk is 48 TPI");
-
-                sb.AppendFormat("Allocation bitmap descriptor starts at block {0}",
-                                rbf9000Sb.rid_bitmap == 0 ? 1 : rbf9000Sb.rid_bitmap).AppendLine();
-
-                if(rbf9000Sb.rid_firstboot > 0)
-                    sb.AppendFormat("Debugger descriptor starts at block {0}", rbf9000Sb.rid_firstboot).AppendLine();
-
-                if(rbf9000Sb.rid_bootfile > 0)
-                    sb.AppendFormat("Boot file descriptor starts at block {0}", rbf9000Sb.rid_bootfile).AppendLine();
-
-                sb.AppendFormat("Root directory descriptor starts at block {0}", rbf9000Sb.rid_rootdir).AppendLine();
-
-                sb.AppendFormat("Disk is owned by group {0} user {1}", rbf9000Sb.rid_group, rbf9000Sb.rid_owner).
-                   AppendLine();
-
-                sb.AppendFormat("Volume was created on {0}", DateHandlers.UnixToDateTime(rbf9000Sb.rid_ctime)).
-                   AppendLine();
-
-                sb.AppendFormat("Volume's identification block was last written on {0}",
-                                DateHandlers.UnixToDateTime(rbf9000Sb.rid_mtime)).AppendLine();
-
-                sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(rbf9000Sb.rid_name, Encoding)).
-                   AppendLine();
-
-                XmlFsType = new FileSystemType
+        foreach(int i in new[]
                 {
-                    Type                      = "OS-9 Random Block File",
-                    Bootable                  = rbf9000Sb.rid_bootfile > 0,
-                    ClusterSize               = rbf9000Sb.rid_blocksize,
-                    Clusters                  = rbf9000Sb.rid_totblocks,
-                    CreationDate              = DateHandlers.UnixToDateTime(rbf9000Sb.rid_ctime),
-                    CreationDateSpecified     = true,
-                    ModificationDate          = DateHandlers.UnixToDateTime(rbf9000Sb.rid_mtime),
-                    ModificationDateSpecified = true,
-                    VolumeName                = StringHandlers.CToString(rbf9000Sb.rid_name, Encoding),
-                    VolumeSerial              = $"{rbf9000Sb.rid_diskid:X8}"
-                };
-            }
+                    0, 4, 15
+                })
+        {
+            ulong location = (ulong)i;
+            uint  sbSize   = (uint)(Marshal.SizeOf<IdSector>() / imagePlugin.Info.SectorSize);
+
+            if(Marshal.SizeOf<IdSector>() % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return;
+
+            if(sector.Length < Marshal.SizeOf<IdSector>())
+                return;
+
+            rbfSb     = Marshal.ByteArrayToStructureBigEndian<IdSector>(sector);
+            rbf9000Sb = Marshal.ByteArrayToStructureBigEndian<NewIdSector>(sector);
+
+            AaruConsole.DebugWriteLine("RBF plugin",
+                                       "magic at {0} = 0x{1:X8} or 0x{2:X8} (expected 0x{3:X8} or 0x{4:X8})",
+                                       location, rbfSb.dd_sync, rbf9000Sb.rid_sync, RBF_SYNC, RBF_CNYS);
+
+            if(rbfSb.dd_sync      == RBF_SYNC ||
+               rbf9000Sb.rid_sync == RBF_SYNC ||
+               rbf9000Sb.rid_sync == RBF_CNYS)
+                break;
+        }
+
+        if(rbfSb.dd_sync      != RBF_SYNC &&
+           rbf9000Sb.rid_sync != RBF_SYNC &&
+           rbf9000Sb.rid_sync != RBF_CNYS)
+            return;
+
+        if(rbf9000Sb.rid_sync == RBF_CNYS)
+            rbf9000Sb = (NewIdSector)Marshal.SwapStructureMembersEndian(rbf9000Sb);
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("OS-9 Random Block File");
+
+        if(rbf9000Sb.rid_sync == RBF_SYNC)
+        {
+            sb.AppendFormat("Volume ID: {0:X8}", rbf9000Sb.rid_diskid).AppendLine();
+            sb.AppendFormat("{0} blocks in volume", rbf9000Sb.rid_totblocks).AppendLine();
+            sb.AppendFormat("{0} cylinders", rbf9000Sb.rid_cylinders).AppendLine();
+            sb.AppendFormat("{0} blocks in cylinder 0", rbf9000Sb.rid_cyl0size).AppendLine();
+            sb.AppendFormat("{0} blocks per cylinder", rbf9000Sb.rid_cylsize).AppendLine();
+            sb.AppendFormat("{0} heads", rbf9000Sb.rid_heads).AppendLine();
+            sb.AppendFormat("{0} bytes per block", rbf9000Sb.rid_blocksize).AppendLine();
+
+            // TODO: Convert to flags?
+            sb.AppendLine((rbf9000Sb.rid_format & 0x01) == 0x01 ? "Disk is double sided" : "Disk is single sided");
+
+            sb.AppendLine((rbf9000Sb.rid_format & 0x02) == 0x02 ? "Disk is double density"
+                              : "Disk is single density");
+
+            if((rbf9000Sb.rid_format & 0x10) == 0x10)
+                sb.AppendLine("Disk is 384 TPI");
+            else if((rbf9000Sb.rid_format & 0x08) == 0x08)
+                sb.AppendLine("Disk is 192 TPI");
+            else if((rbf9000Sb.rid_format & 0x04) == 0x04)
+                sb.AppendLine("Disk is 96 TPI or 135 TPI");
             else
+                sb.AppendLine("Disk is 48 TPI");
+
+            sb.AppendFormat("Allocation bitmap descriptor starts at block {0}",
+                            rbf9000Sb.rid_bitmap == 0 ? 1 : rbf9000Sb.rid_bitmap).AppendLine();
+
+            if(rbf9000Sb.rid_firstboot > 0)
+                sb.AppendFormat("Debugger descriptor starts at block {0}", rbf9000Sb.rid_firstboot).AppendLine();
+
+            if(rbf9000Sb.rid_bootfile > 0)
+                sb.AppendFormat("Boot file descriptor starts at block {0}", rbf9000Sb.rid_bootfile).AppendLine();
+
+            sb.AppendFormat("Root directory descriptor starts at block {0}", rbf9000Sb.rid_rootdir).AppendLine();
+
+            sb.AppendFormat("Disk is owned by group {0} user {1}", rbf9000Sb.rid_group, rbf9000Sb.rid_owner).
+               AppendLine();
+
+            sb.AppendFormat("Volume was created on {0}", DateHandlers.UnixToDateTime(rbf9000Sb.rid_ctime)).
+               AppendLine();
+
+            sb.AppendFormat("Volume's identification block was last written on {0}",
+                            DateHandlers.UnixToDateTime(rbf9000Sb.rid_mtime)).AppendLine();
+
+            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(rbf9000Sb.rid_name, Encoding)).
+               AppendLine();
+
+            XmlFsType = new FileSystemType
             {
-                sb.AppendFormat("Volume ID: {0:X4}", rbfSb.dd_dsk).AppendLine();
-                sb.AppendFormat("{0} blocks in volume", LSNToUInt32(rbfSb.dd_tot)).AppendLine();
-                sb.AppendFormat("{0} tracks", rbfSb.dd_tks).AppendLine();
-                sb.AppendFormat("{0} sectors per track", rbfSb.dd_spt).AppendLine();
-                sb.AppendFormat("{0} bytes per sector", 256 << rbfSb.dd_lsnsize).AppendLine();
-
-                sb.AppendFormat("{0} sectors per cluster ({1} bytes)", rbfSb.dd_bit,
-                                rbfSb.dd_bit * (256 << rbfSb.dd_lsnsize)).AppendLine();
-
-                // TODO: Convert to flags?
-                sb.AppendLine((rbfSb.dd_fmt & 0x01) == 0x01 ? "Disk is double sided" : "Disk is single sided");
-                sb.AppendLine((rbfSb.dd_fmt & 0x02) == 0x02 ? "Disk is double density" : "Disk is single density");
-
-                if((rbfSb.dd_fmt & 0x10) == 0x10)
-                    sb.AppendLine("Disk is 384 TPI");
-                else if((rbfSb.dd_fmt & 0x08) == 0x08)
-                    sb.AppendLine("Disk is 192 TPI");
-                else if((rbfSb.dd_fmt & 0x04) == 0x04)
-                    sb.AppendLine("Disk is 96 TPI or 135 TPI");
-                else
-                    sb.AppendLine("Disk is 48 TPI");
-
-                sb.AppendFormat("Allocation bitmap descriptor starts at block {0}",
-                                rbfSb.dd_maplsn == 0 ? 1 : rbfSb.dd_maplsn).AppendLine();
-
-                sb.AppendFormat("{0} bytes in allocation bitmap", rbfSb.dd_map).AppendLine();
-
-                if(LSNToUInt32(rbfSb.dd_bt) > 0 &&
-                   rbfSb.dd_bsz             > 0)
-                    sb.AppendFormat("Boot file starts at block {0} and has {1} bytes", LSNToUInt32(rbfSb.dd_bt),
-                                    rbfSb.dd_bsz).AppendLine();
-
-                sb.AppendFormat("Root directory descriptor starts at block {0}", LSNToUInt32(rbfSb.dd_dir)).
-                   AppendLine();
-
-                sb.AppendFormat("Disk is owned by user {0}", rbfSb.dd_own).AppendLine();
-                sb.AppendFormat("Volume was created on {0}", DateHandlers.Os9ToDateTime(rbfSb.dd_dat)).AppendLine();
-                sb.AppendFormat("Volume attributes: {0:X2}", rbfSb.dd_att).AppendLine();
-                sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(rbfSb.dd_nam, Encoding)).AppendLine();
-
-                sb.AppendFormat("Path descriptor options: {0}", StringHandlers.CToString(rbfSb.dd_opt, Encoding)).
-                   AppendLine();
-
-                XmlFsType = new FileSystemType
-                {
-                    Type                  = "OS-9 Random Block File",
-                    Bootable              = LSNToUInt32(rbfSb.dd_bt) > 0 && rbfSb.dd_bsz > 0,
-                    ClusterSize           = (uint)(rbfSb.dd_bit * (256 << rbfSb.dd_lsnsize)),
-                    Clusters              = LSNToUInt32(rbfSb.dd_tot),
-                    CreationDate          = DateHandlers.Os9ToDateTime(rbfSb.dd_dat),
-                    CreationDateSpecified = true,
-                    VolumeName            = StringHandlers.CToString(rbfSb.dd_nam, Encoding),
-                    VolumeSerial          = $"{rbfSb.dd_dsk:X4}"
-                };
-            }
-
-            information = sb.ToString();
+                Type                      = "OS-9 Random Block File",
+                Bootable                  = rbf9000Sb.rid_bootfile > 0,
+                ClusterSize               = rbf9000Sb.rid_blocksize,
+                Clusters                  = rbf9000Sb.rid_totblocks,
+                CreationDate              = DateHandlers.UnixToDateTime(rbf9000Sb.rid_ctime),
+                CreationDateSpecified     = true,
+                ModificationDate          = DateHandlers.UnixToDateTime(rbf9000Sb.rid_mtime),
+                ModificationDateSpecified = true,
+                VolumeName                = StringHandlers.CToString(rbf9000Sb.rid_name, Encoding),
+                VolumeSerial              = $"{rbf9000Sb.rid_diskid:X8}"
+            };
         }
-
-        static uint LSNToUInt32(byte[] lsn)
+        else
         {
-            if(lsn        == null ||
-               lsn.Length != 3)
-                return 0;
+            sb.AppendFormat("Volume ID: {0:X4}", rbfSb.dd_dsk).AppendLine();
+            sb.AppendFormat("{0} blocks in volume", LSNToUInt32(rbfSb.dd_tot)).AppendLine();
+            sb.AppendFormat("{0} tracks", rbfSb.dd_tks).AppendLine();
+            sb.AppendFormat("{0} sectors per track", rbfSb.dd_spt).AppendLine();
+            sb.AppendFormat("{0} bytes per sector", 256 << rbfSb.dd_lsnsize).AppendLine();
 
-            return (uint)((lsn[0] << 16) + (lsn[1] << 8) + lsn[2]);
+            sb.AppendFormat("{0} sectors per cluster ({1} bytes)", rbfSb.dd_bit,
+                            rbfSb.dd_bit * (256 << rbfSb.dd_lsnsize)).AppendLine();
+
+            // TODO: Convert to flags?
+            sb.AppendLine((rbfSb.dd_fmt & 0x01) == 0x01 ? "Disk is double sided" : "Disk is single sided");
+            sb.AppendLine((rbfSb.dd_fmt & 0x02) == 0x02 ? "Disk is double density" : "Disk is single density");
+
+            if((rbfSb.dd_fmt & 0x10) == 0x10)
+                sb.AppendLine("Disk is 384 TPI");
+            else if((rbfSb.dd_fmt & 0x08) == 0x08)
+                sb.AppendLine("Disk is 192 TPI");
+            else if((rbfSb.dd_fmt & 0x04) == 0x04)
+                sb.AppendLine("Disk is 96 TPI or 135 TPI");
+            else
+                sb.AppendLine("Disk is 48 TPI");
+
+            sb.AppendFormat("Allocation bitmap descriptor starts at block {0}",
+                            rbfSb.dd_maplsn == 0 ? 1 : rbfSb.dd_maplsn).AppendLine();
+
+            sb.AppendFormat("{0} bytes in allocation bitmap", rbfSb.dd_map).AppendLine();
+
+            if(LSNToUInt32(rbfSb.dd_bt) > 0 &&
+               rbfSb.dd_bsz             > 0)
+                sb.AppendFormat("Boot file starts at block {0} and has {1} bytes", LSNToUInt32(rbfSb.dd_bt),
+                                rbfSb.dd_bsz).AppendLine();
+
+            sb.AppendFormat("Root directory descriptor starts at block {0}", LSNToUInt32(rbfSb.dd_dir)).
+               AppendLine();
+
+            sb.AppendFormat("Disk is owned by user {0}", rbfSb.dd_own).AppendLine();
+            sb.AppendFormat("Volume was created on {0}", DateHandlers.Os9ToDateTime(rbfSb.dd_dat)).AppendLine();
+            sb.AppendFormat("Volume attributes: {0:X2}", rbfSb.dd_att).AppendLine();
+            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(rbfSb.dd_nam, Encoding)).AppendLine();
+
+            sb.AppendFormat("Path descriptor options: {0}", StringHandlers.CToString(rbfSb.dd_opt, Encoding)).
+               AppendLine();
+
+            XmlFsType = new FileSystemType
+            {
+                Type                  = "OS-9 Random Block File",
+                Bootable              = LSNToUInt32(rbfSb.dd_bt) > 0 && rbfSb.dd_bsz > 0,
+                ClusterSize           = (uint)(rbfSb.dd_bit * (256 << rbfSb.dd_lsnsize)),
+                Clusters              = LSNToUInt32(rbfSb.dd_tot),
+                CreationDate          = DateHandlers.Os9ToDateTime(rbfSb.dd_dat),
+                CreationDateSpecified = true,
+                VolumeName            = StringHandlers.CToString(rbfSb.dd_nam, Encoding),
+                VolumeSerial          = $"{rbfSb.dd_dsk:X4}"
+            };
         }
 
-        /// <summary>Identification sector. Wherever the sector this resides on, becomes LSN 0.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct IdSector
-        {
-            /// <summary>Sectors on disk</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] dd_tot;
-            /// <summary>Tracks</summary>
-            public readonly byte dd_tks;
-            /// <summary>Bytes in allocation map</summary>
-            public readonly ushort dd_map;
-            /// <summary>Sectors per cluster</summary>
-            public readonly ushort dd_bit;
-            /// <summary>LSN of root directory</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] dd_dir;
-            /// <summary>Owner ID</summary>
-            public readonly ushort dd_own;
-            /// <summary>Attributes</summary>
-            public readonly byte dd_att;
-            /// <summary>Disk ID</summary>
-            public readonly ushort dd_dsk;
-            /// <summary>Format byte</summary>
-            public readonly byte dd_fmt;
-            /// <summary>Sectors per track</summary>
-            public readonly ushort dd_spt;
-            /// <summary>Reserved</summary>
-            public readonly ushort dd_res;
-            /// <summary>LSN of boot file</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] dd_bt;
-            /// <summary>Size of boot file</summary>
-            public readonly ushort dd_bsz;
-            /// <summary>Creation date</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] dd_dat;
-            /// <summary>Volume name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] dd_nam;
-            /// <summary>Path options</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] dd_opt;
-            /// <summary>Reserved</summary>
-            public readonly byte reserved;
-            /// <summary>Magic number</summary>
-            public readonly uint dd_sync;
-            /// <summary>LSN of allocation map</summary>
-            public readonly uint dd_maplsn;
-            /// <summary>Size of an LSN</summary>
-            public readonly ushort dd_lsnsize;
-            /// <summary>Version ID</summary>
-            public readonly ushort dd_versid;
-        }
+        information = sb.ToString();
+    }
 
-        /// <summary>
-        ///     Identification sector. Wherever the sector this resides on, becomes LSN 0. Introduced on OS-9000, this can be
-        ///     big or little endian.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct NewIdSector
-        {
-            /// <summary>Magic number</summary>
-            public readonly uint rid_sync;
-            /// <summary>Disk ID</summary>
-            public readonly uint rid_diskid;
-            /// <summary>Sectors on disk</summary>
-            public readonly uint rid_totblocks;
-            /// <summary>Cylinders</summary>
-            public readonly ushort rid_cylinders;
-            /// <summary>Sectors in cylinder 0</summary>
-            public readonly ushort rid_cyl0size;
-            /// <summary>Sectors per cylinder</summary>
-            public readonly ushort rid_cylsize;
-            /// <summary>Heads</summary>
-            public readonly ushort rid_heads;
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort rid_blocksize;
-            /// <summary>Disk format</summary>
-            public readonly ushort rid_format;
-            /// <summary>Flags</summary>
-            public readonly ushort rid_flags;
-            /// <summary>Padding</summary>
-            public readonly ushort rid_unused1;
-            /// <summary>Sector of allocation bitmap</summary>
-            public readonly uint rid_bitmap;
-            /// <summary>Sector of debugger FD</summary>
-            public readonly uint rid_firstboot;
-            /// <summary>Sector of bootfile FD</summary>
-            public readonly uint rid_bootfile;
-            /// <summary>Sector of root directory FD</summary>
-            public readonly uint rid_rootdir;
-            /// <summary>Group owner of media</summary>
-            public readonly ushort rid_group;
-            /// <summary>Owner of media</summary>
-            public readonly ushort rid_owner;
-            /// <summary>Creation time</summary>
-            public readonly uint rid_ctime;
-            /// <summary>Last write time for this structure</summary>
-            public readonly uint rid_mtime;
-            /// <summary>Volume name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] rid_name;
-            /// <summary>Endian flag</summary>
-            public readonly byte rid_endflag;
-            /// <summary>Padding</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] rid_unused2;
-            /// <summary>Parity</summary>
-            public readonly uint rid_parity;
-        }
+    static uint LSNToUInt32(byte[] lsn)
+    {
+        if(lsn        == null ||
+           lsn.Length != 3)
+            return 0;
+
+        return (uint)((lsn[0] << 16) + (lsn[1] << 8) + lsn[2]);
+    }
+
+    /// <summary>Identification sector. Wherever the sector this resides on, becomes LSN 0.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct IdSector
+    {
+        /// <summary>Sectors on disk</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] dd_tot;
+        /// <summary>Tracks</summary>
+        public readonly byte dd_tks;
+        /// <summary>Bytes in allocation map</summary>
+        public readonly ushort dd_map;
+        /// <summary>Sectors per cluster</summary>
+        public readonly ushort dd_bit;
+        /// <summary>LSN of root directory</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] dd_dir;
+        /// <summary>Owner ID</summary>
+        public readonly ushort dd_own;
+        /// <summary>Attributes</summary>
+        public readonly byte dd_att;
+        /// <summary>Disk ID</summary>
+        public readonly ushort dd_dsk;
+        /// <summary>Format byte</summary>
+        public readonly byte dd_fmt;
+        /// <summary>Sectors per track</summary>
+        public readonly ushort dd_spt;
+        /// <summary>Reserved</summary>
+        public readonly ushort dd_res;
+        /// <summary>LSN of boot file</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] dd_bt;
+        /// <summary>Size of boot file</summary>
+        public readonly ushort dd_bsz;
+        /// <summary>Creation date</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] dd_dat;
+        /// <summary>Volume name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] dd_nam;
+        /// <summary>Path options</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] dd_opt;
+        /// <summary>Reserved</summary>
+        public readonly byte reserved;
+        /// <summary>Magic number</summary>
+        public readonly uint dd_sync;
+        /// <summary>LSN of allocation map</summary>
+        public readonly uint dd_maplsn;
+        /// <summary>Size of an LSN</summary>
+        public readonly ushort dd_lsnsize;
+        /// <summary>Version ID</summary>
+        public readonly ushort dd_versid;
+    }
+
+    /// <summary>
+    ///     Identification sector. Wherever the sector this resides on, becomes LSN 0. Introduced on OS-9000, this can be
+    ///     big or little endian.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct NewIdSector
+    {
+        /// <summary>Magic number</summary>
+        public readonly uint rid_sync;
+        /// <summary>Disk ID</summary>
+        public readonly uint rid_diskid;
+        /// <summary>Sectors on disk</summary>
+        public readonly uint rid_totblocks;
+        /// <summary>Cylinders</summary>
+        public readonly ushort rid_cylinders;
+        /// <summary>Sectors in cylinder 0</summary>
+        public readonly ushort rid_cyl0size;
+        /// <summary>Sectors per cylinder</summary>
+        public readonly ushort rid_cylsize;
+        /// <summary>Heads</summary>
+        public readonly ushort rid_heads;
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort rid_blocksize;
+        /// <summary>Disk format</summary>
+        public readonly ushort rid_format;
+        /// <summary>Flags</summary>
+        public readonly ushort rid_flags;
+        /// <summary>Padding</summary>
+        public readonly ushort rid_unused1;
+        /// <summary>Sector of allocation bitmap</summary>
+        public readonly uint rid_bitmap;
+        /// <summary>Sector of debugger FD</summary>
+        public readonly uint rid_firstboot;
+        /// <summary>Sector of bootfile FD</summary>
+        public readonly uint rid_bootfile;
+        /// <summary>Sector of root directory FD</summary>
+        public readonly uint rid_rootdir;
+        /// <summary>Group owner of media</summary>
+        public readonly ushort rid_group;
+        /// <summary>Owner of media</summary>
+        public readonly ushort rid_owner;
+        /// <summary>Creation time</summary>
+        public readonly uint rid_ctime;
+        /// <summary>Last write time for this structure</summary>
+        public readonly uint rid_mtime;
+        /// <summary>Volume name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] rid_name;
+        /// <summary>Endian flag</summary>
+        public readonly byte rid_endflag;
+        /// <summary>Padding</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] rid_unused2;
+        /// <summary>Parity</summary>
+        public readonly uint rid_parity;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/RT11.cs b/Aaru.Filesystems/RT11.cs
index 4bacc5475..f559c0811 100644
--- a/Aaru.Filesystems/RT11.cs
+++ b/Aaru.Filesystems/RT11.cs
@@ -42,146 +42,145 @@ using Schemas;
 using Encoding = System.Text.Encoding;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from http://www.trailing-edge.com/~shoppa/rt11fs/
+/// <inheritdoc />
+/// <summary>Implements detection of the DEC RT-11 filesystem</summary>
+public sealed class RT11 : IFilesystem
 {
-    // Information from http://www.trailing-edge.com/~shoppa/rt11fs/
     /// <inheritdoc />
-    /// <summary>Implements detection of the DEC RT-11 filesystem</summary>
-    public sealed class RT11 : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "RT-11 file system";
+    /// <inheritdoc />
+    public Guid Id => new("DB3E2F98-8F98-463C-8126-E937843DA024");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "RT-11 file system";
-        /// <inheritdoc />
-        public Guid Id => new("DB3E2F98-8F98-463C-8126-E937843DA024");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(1 + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        byte[]      magicB = new byte[12];
+        ErrorNumber errno  = imagePlugin.ReadSector(1 + partition.Start, out byte[] hbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(hbSector.Length < 512)
+            return false;
+
+        Array.Copy(hbSector, 0x1F0, magicB, 0, 12);
+        string magic = Encoding.ASCII.GetString(magicB);
+
+        return magic == "DECRT11A    ";
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = new Radix50();
+        information = "";
+
+        var sb = new StringBuilder();
+
+        ErrorNumber errno = imagePlugin.ReadSector(1 + partition.Start, out byte[] hbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        HomeBlock homeblock = Marshal.ByteArrayToStructureLittleEndian<HomeBlock>(hbSector);
+
+        /* TODO: Is this correct?
+         * Assembler:
+         *      MOV address, R0
+         *      CLR R1
+         *      MOV #255., R2
+         * 10$: ADD (R0)+, R1
+         *      SOB R2, 10$
+         *      MOV 1,@R0
+         */
+        ushort check = 0;
+
+        for(int i = 0; i < 512; i += 2)
+            check += BitConverter.ToUInt16(hbSector, i);
+
+        sb.AppendFormat("Volume format is {0}",
+                        StringHandlers.SpacePaddedToString(homeblock.format, Encoding.ASCII)).AppendLine();
+
+        sb.AppendFormat("{0} sectors per cluster ({1} bytes)", homeblock.cluster, homeblock.cluster * 512).
+           AppendLine();
+
+        sb.AppendFormat("First directory segment starts at block {0}", homeblock.rootBlock).AppendLine();
+        sb.AppendFormat("Volume owner is \"{0}\"", Encoding.GetString(homeblock.ownername).TrimEnd()).AppendLine();
+        sb.AppendFormat("Volume label: \"{0}\"", Encoding.GetString(homeblock.volname).TrimEnd()).AppendLine();
+        sb.AppendFormat("Checksum: 0x{0:X4} (calculated 0x{1:X4})", homeblock.checksum, check).AppendLine();
+
+        imagePlugin.ReadSector(0, out byte[] bootBlock);
+
+        XmlFsType = new FileSystemType
         {
-            if(1 + partition.Start >= partition.End)
-                return false;
+            Type        = "RT-11",
+            ClusterSize = (uint)(homeblock.cluster * 512),
+            Clusters    = homeblock.cluster,
+            VolumeName  = StringHandlers.SpacePaddedToString(homeblock.volname, Encoding),
+            Bootable    = !ArrayHelpers.ArrayIsNullOrEmpty(bootBlock)
+        };
 
-            byte[]      magicB = new byte[12];
-            ErrorNumber errno  = imagePlugin.ReadSector(1 + partition.Start, out byte[] hbSector);
+        information = sb.ToString();
+    }
 
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(hbSector.Length < 512)
-                return false;
-
-            Array.Copy(hbSector, 0x1F0, magicB, 0, 12);
-            string magic = Encoding.ASCII.GetString(magicB);
-
-            return magic == "DECRT11A    ";
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = new Radix50();
-            information = "";
-
-            var sb = new StringBuilder();
-
-            ErrorNumber errno = imagePlugin.ReadSector(1 + partition.Start, out byte[] hbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            HomeBlock homeblock = Marshal.ByteArrayToStructureLittleEndian<HomeBlock>(hbSector);
-
-            /* TODO: Is this correct?
-             * Assembler:
-             *      MOV address, R0
-             *      CLR R1
-             *      MOV #255., R2
-             * 10$: ADD (R0)+, R1
-             *      SOB R2, 10$
-             *      MOV 1,@R0
-             */
-            ushort check = 0;
-
-            for(int i = 0; i < 512; i += 2)
-                check += BitConverter.ToUInt16(hbSector, i);
-
-            sb.AppendFormat("Volume format is {0}",
-                            StringHandlers.SpacePaddedToString(homeblock.format, Encoding.ASCII)).AppendLine();
-
-            sb.AppendFormat("{0} sectors per cluster ({1} bytes)", homeblock.cluster, homeblock.cluster * 512).
-               AppendLine();
-
-            sb.AppendFormat("First directory segment starts at block {0}", homeblock.rootBlock).AppendLine();
-            sb.AppendFormat("Volume owner is \"{0}\"", Encoding.GetString(homeblock.ownername).TrimEnd()).AppendLine();
-            sb.AppendFormat("Volume label: \"{0}\"", Encoding.GetString(homeblock.volname).TrimEnd()).AppendLine();
-            sb.AppendFormat("Checksum: 0x{0:X4} (calculated 0x{1:X4})", homeblock.checksum, check).AppendLine();
-
-            imagePlugin.ReadSector(0, out byte[] bootBlock);
-
-            XmlFsType = new FileSystemType
-            {
-                Type        = "RT-11",
-                ClusterSize = (uint)(homeblock.cluster * 512),
-                Clusters    = homeblock.cluster,
-                VolumeName  = StringHandlers.SpacePaddedToString(homeblock.volname, Encoding),
-                Bootable    = !ArrayHelpers.ArrayIsNullOrEmpty(bootBlock)
-            };
-
-            information = sb.ToString();
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HomeBlock
-        {
-            /// <summary>Bad block replacement table</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 130)]
-            public readonly byte[] badBlockTable;
-            /// <summary>Unused</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] unused;
-            /// <summary>INITIALIZE/RESTORE data area</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 38)]
-            public readonly byte[] initArea;
-            /// <summary>BUP information area</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 18)]
-            public readonly byte[] bupInformation;
-            /// <summary>Empty</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 260)]
-            public readonly byte[] empty;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] reserved1;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] reserved2;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public readonly byte[] empty2;
-            /// <summary>Cluster size</summary>
-            public readonly ushort cluster;
-            /// <summary>Block of the first directory segment</summary>
-            public readonly ushort rootBlock;
-            /// <summary>"V3A" in Radix-50</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] systemVersion;
-            /// <summary>Name of the volume, 12 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] volname;
-            /// <summary>Name of the volume owner, 12 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] ownername;
-            /// <summary>RT11 defines it as "DECRT11A    ", 12 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] format;
-            /// <summary>Unused</summary>
-            public readonly ushort unused2;
-            /// <summary>Checksum of preceding 255 words (16 bit units)</summary>
-            public readonly ushort checksum;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HomeBlock
+    {
+        /// <summary>Bad block replacement table</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 130)]
+        public readonly byte[] badBlockTable;
+        /// <summary>Unused</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] unused;
+        /// <summary>INITIALIZE/RESTORE data area</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 38)]
+        public readonly byte[] initArea;
+        /// <summary>BUP information area</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 18)]
+        public readonly byte[] bupInformation;
+        /// <summary>Empty</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 260)]
+        public readonly byte[] empty;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] reserved1;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] reserved2;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
+        public readonly byte[] empty2;
+        /// <summary>Cluster size</summary>
+        public readonly ushort cluster;
+        /// <summary>Block of the first directory segment</summary>
+        public readonly ushort rootBlock;
+        /// <summary>"V3A" in Radix-50</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] systemVersion;
+        /// <summary>Name of the volume, 12 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] volname;
+        /// <summary>Name of the volume owner, 12 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] ownername;
+        /// <summary>RT11 defines it as "DECRT11A    ", 12 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] format;
+        /// <summary>Unused</summary>
+        public readonly ushort unused2;
+        /// <summary>Checksum of preceding 255 words (16 bit units)</summary>
+        public readonly ushort checksum;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ReFS.cs b/Aaru.Filesystems/ReFS.cs
index 30063e6ab..db86be220 100644
--- a/Aaru.Filesystems/ReFS.cs
+++ b/Aaru.Filesystems/ReFS.cs
@@ -42,152 +42,151 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of Microsoft's Resilient filesystem (ReFS)</summary>
+public sealed class ReFS : IFilesystem
 {
-    /// <inheritdoc />
-    /// <summary>Implements detection of Microsoft's Resilient filesystem (ReFS)</summary>
-    public sealed class ReFS : IFilesystem
+    const uint FSRS = 0x53525346;
+    readonly byte[] _signature =
     {
-        const uint FSRS = 0x53525346;
-        readonly byte[] _signature =
+        0x52, 0x65, 0x46, 0x53, 0x00, 0x00, 0x00, 0x00
+    };
+    /// <inheritdoc />
+    public string Name => "Resilient File System plugin";
+    /// <inheritdoc />
+    public Guid Id => new("37766C4E-EBF5-4113-A712-B758B756ABD6");
+    /// <inheritdoc />
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
+    {
+        uint sbSize = (uint)(Marshal.SizeOf<VolumeHeader>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<VolumeHeader>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        if(partition.Start + sbSize >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(sector.Length < Marshal.SizeOf<VolumeHeader>())
+            return false;
+
+        VolumeHeader vhdr = Marshal.ByteArrayToStructureLittleEndian<VolumeHeader>(sector);
+
+        return vhdr.identifier == FSRS && ArrayHelpers.ArrayIsNullOrEmpty(vhdr.mustBeZero) &&
+               vhdr.signature.SequenceEqual(_signature);
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = Encoding.UTF8;
+        information = "";
+
+        uint sbSize = (uint)(Marshal.SizeOf<VolumeHeader>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<VolumeHeader>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        if(partition.Start + sbSize >= partition.End)
+            return;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        if(sector.Length < Marshal.SizeOf<VolumeHeader>())
+            return;
+
+        VolumeHeader vhdr = Marshal.ByteArrayToStructureLittleEndian<VolumeHeader>(sector);
+
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.jump empty? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(vhdr.jump));
+
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.signature = {0}",
+                                   StringHandlers.CToString(vhdr.signature));
+
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.mustBeZero empty? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(vhdr.mustBeZero));
+
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.identifier = {0}",
+                                   StringHandlers.CToString(BitConverter.GetBytes(vhdr.identifier)));
+
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.length = {0}", vhdr.length);
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.checksum = 0x{0:X4}", vhdr.checksum);
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.sectors = {0}", vhdr.sectors);
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.bytesPerSector = {0}", vhdr.bytesPerSector);
+
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.sectorsPerCluster = {0}", vhdr.sectorsPerCluster);
+
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown1 zero? = {0}", vhdr.unknown1 == 0);
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown2 zero? = {0}", vhdr.unknown2 == 0);
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown3 zero? = {0}", vhdr.unknown3 == 0);
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown4 zero? = {0}", vhdr.unknown4 == 0);
+
+        AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown5 empty? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(vhdr.unknown5));
+
+        if(vhdr.identifier != FSRS                           ||
+           !ArrayHelpers.ArrayIsNullOrEmpty(vhdr.mustBeZero) ||
+           !vhdr.signature.SequenceEqual(_signature))
+            return;
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("Microsoft Resilient File System");
+        sb.AppendFormat("Volume uses {0} bytes per sector", vhdr.bytesPerSector).AppendLine();
+
+        sb.AppendFormat("Volume uses {0} sectors per cluster ({1} bytes)", vhdr.sectorsPerCluster,
+                        vhdr.sectorsPerCluster * vhdr.bytesPerSector).AppendLine();
+
+        sb.AppendFormat("Volume has {0} sectors ({1} bytes)", vhdr.sectors, vhdr.sectors * vhdr.bytesPerSector).
+           AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            0x52, 0x65, 0x46, 0x53, 0x00, 0x00, 0x00, 0x00
+            Type        = "Resilient File System",
+            ClusterSize = vhdr.bytesPerSector * vhdr.sectorsPerCluster,
+            Clusters    = vhdr.sectors        / vhdr.sectorsPerCluster
         };
-        /// <inheritdoc />
-        public string Name => "Resilient File System plugin";
-        /// <inheritdoc />
-        public Guid Id => new("37766C4E-EBF5-4113-A712-B758B756ABD6");
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+    }
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            uint sbSize = (uint)(Marshal.SizeOf<VolumeHeader>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<VolumeHeader>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            if(partition.Start + sbSize >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(sector.Length < Marshal.SizeOf<VolumeHeader>())
-                return false;
-
-            VolumeHeader vhdr = Marshal.ByteArrayToStructureLittleEndian<VolumeHeader>(sector);
-
-            return vhdr.identifier == FSRS && ArrayHelpers.ArrayIsNullOrEmpty(vhdr.mustBeZero) &&
-                   vhdr.signature.SequenceEqual(_signature);
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = Encoding.UTF8;
-            information = "";
-
-            uint sbSize = (uint)(Marshal.SizeOf<VolumeHeader>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<VolumeHeader>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            if(partition.Start + sbSize >= partition.End)
-                return;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            if(sector.Length < Marshal.SizeOf<VolumeHeader>())
-                return;
-
-            VolumeHeader vhdr = Marshal.ByteArrayToStructureLittleEndian<VolumeHeader>(sector);
-
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.jump empty? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(vhdr.jump));
-
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.signature = {0}",
-                                       StringHandlers.CToString(vhdr.signature));
-
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.mustBeZero empty? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(vhdr.mustBeZero));
-
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.identifier = {0}",
-                                       StringHandlers.CToString(BitConverter.GetBytes(vhdr.identifier)));
-
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.length = {0}", vhdr.length);
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.checksum = 0x{0:X4}", vhdr.checksum);
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.sectors = {0}", vhdr.sectors);
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.bytesPerSector = {0}", vhdr.bytesPerSector);
-
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.sectorsPerCluster = {0}", vhdr.sectorsPerCluster);
-
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown1 zero? = {0}", vhdr.unknown1 == 0);
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown2 zero? = {0}", vhdr.unknown2 == 0);
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown3 zero? = {0}", vhdr.unknown3 == 0);
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown4 zero? = {0}", vhdr.unknown4 == 0);
-
-            AaruConsole.DebugWriteLine("ReFS plugin", "VolumeHeader.unknown5 empty? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(vhdr.unknown5));
-
-            if(vhdr.identifier != FSRS                           ||
-               !ArrayHelpers.ArrayIsNullOrEmpty(vhdr.mustBeZero) ||
-               !vhdr.signature.SequenceEqual(_signature))
-                return;
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine("Microsoft Resilient File System");
-            sb.AppendFormat("Volume uses {0} bytes per sector", vhdr.bytesPerSector).AppendLine();
-
-            sb.AppendFormat("Volume uses {0} sectors per cluster ({1} bytes)", vhdr.sectorsPerCluster,
-                            vhdr.sectorsPerCluster * vhdr.bytesPerSector).AppendLine();
-
-            sb.AppendFormat("Volume has {0} sectors ({1} bytes)", vhdr.sectors, vhdr.sectors * vhdr.bytesPerSector).
-               AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type        = "Resilient File System",
-                ClusterSize = vhdr.bytesPerSector * vhdr.sectorsPerCluster,
-                Clusters    = vhdr.sectors        / vhdr.sectorsPerCluster
-            };
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct VolumeHeader
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] signature;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] mustBeZero;
-            public readonly uint   identifier;
-            public readonly ushort length;
-            public readonly ushort checksum;
-            public readonly ulong  sectors;
-            public readonly uint   bytesPerSector;
-            public readonly uint   sectorsPerCluster;
-            public readonly uint   unknown1;
-            public readonly uint   unknown2;
-            public readonly ulong  unknown3;
-            public readonly ulong  unknown4;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15872)]
-            public readonly byte[] unknown5;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct VolumeHeader
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] signature;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] mustBeZero;
+        public readonly uint   identifier;
+        public readonly ushort length;
+        public readonly ushort checksum;
+        public readonly ulong  sectors;
+        public readonly uint   bytesPerSector;
+        public readonly uint   sectorsPerCluster;
+        public readonly uint   unknown1;
+        public readonly uint   unknown2;
+        public readonly ulong  unknown3;
+        public readonly ulong  unknown4;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15872)]
+        public readonly byte[] unknown5;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Reiser.cs b/Aaru.Filesystems/Reiser.cs
index 72c0bcd35..18919fcc2 100644
--- a/Aaru.Filesystems/Reiser.cs
+++ b/Aaru.Filesystems/Reiser.cs
@@ -41,200 +41,199 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the Reiser v3 filesystem</summary>
+public sealed class Reiser : IFilesystem
 {
-    /// <inheritdoc />
-    /// <summary>Implements detection of the Reiser v3 filesystem</summary>
-    public sealed class Reiser : IFilesystem
+    const uint REISER_SUPER_OFFSET = 0x10000;
+
+    readonly byte[] _magic35 =
     {
-        const uint REISER_SUPER_OFFSET = 0x10000;
+        0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x46, 0x73, 0x00, 0x00
+    };
+    readonly byte[] _magic36 =
+    {
+        0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x32, 0x46, 0x73, 0x00
+    };
+    readonly byte[] _magicJr =
+    {
+        0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x33, 0x46, 0x73, 0x00
+    };
 
-        readonly byte[] _magic35 =
+    /// <inheritdoc />
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Reiser Filesystem Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("1D8CD8B8-27E6-410F-9973-D16409225FBA");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
+    {
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
+
+        uint sbAddr = REISER_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+        if(sbAddr == 0)
+            sbAddr = 1;
+
+        uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        if(partition.Start + sbAddr + sbSize >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(sector.Length < Marshal.SizeOf<Superblock>())
+            return false;
+
+        Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        return _magic35.SequenceEqual(reiserSb.magic) || _magic36.SequenceEqual(reiserSb.magic) ||
+               _magicJr.SequenceEqual(reiserSb.magic);
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        uint sbAddr = REISER_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+        if(sbAddr == 0)
+            sbAddr = 1;
+
+        uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        if(sector.Length < Marshal.SizeOf<Superblock>())
+            return;
+
+        Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        if(!_magic35.SequenceEqual(reiserSb.magic) &&
+           !_magic36.SequenceEqual(reiserSb.magic) &&
+           !_magicJr.SequenceEqual(reiserSb.magic))
+            return;
+
+        var sb = new StringBuilder();
+
+        if(_magic35.SequenceEqual(reiserSb.magic))
+            sb.AppendLine("Reiser 3.5 filesystem");
+        else if(_magic36.SequenceEqual(reiserSb.magic))
+            sb.AppendLine("Reiser 3.6 filesystem");
+        else if(_magicJr.SequenceEqual(reiserSb.magic))
+            sb.AppendLine("Reiser Jr. filesystem");
+
+        sb.AppendFormat("Volume has {0} blocks with {1} blocks free", reiserSb.block_count, reiserSb.free_blocks).
+           AppendLine();
+
+        sb.AppendFormat("{0} bytes per block", reiserSb.blocksize).AppendLine();
+        sb.AppendFormat("Root directory resides on block {0}", reiserSb.root_block).AppendLine();
+
+        if(reiserSb.umount_state == 2)
+            sb.AppendLine("Volume has not been cleanly umounted");
+
+        sb.AppendFormat("Volume last checked on {0}", DateHandlers.UnixUnsignedToDateTime(reiserSb.last_check)).
+           AppendLine();
+
+        if(reiserSb.version >= 2)
         {
-            0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x46, 0x73, 0x00, 0x00
-        };
-        readonly byte[] _magic36 =
-        {
-            0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x32, 0x46, 0x73, 0x00
-        };
-        readonly byte[] _magicJr =
-        {
-            0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x33, 0x46, 0x73, 0x00
-        };
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Reiser Filesystem Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("1D8CD8B8-27E6-410F-9973-D16409225FBA");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
-
-            uint sbAddr = REISER_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-
-            if(sbAddr == 0)
-                sbAddr = 1;
-
-            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            if(partition.Start + sbAddr + sbSize >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(sector.Length < Marshal.SizeOf<Superblock>())
-                return false;
-
-            Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-            return _magic35.SequenceEqual(reiserSb.magic) || _magic36.SequenceEqual(reiserSb.magic) ||
-                   _magicJr.SequenceEqual(reiserSb.magic);
+            sb.AppendFormat("Volume UUID: {0}", reiserSb.uuid).AppendLine();
+            sb.AppendFormat("Volume name: {0}", Encoding.GetString(reiserSb.label)).AppendLine();
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
+        information = sb.ToString();
 
-            if(imagePlugin.Info.SectorSize < 512)
-                return;
+        XmlFsType = new FileSystemType();
 
-            uint sbAddr = REISER_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+        if(_magic35.SequenceEqual(reiserSb.magic))
+            XmlFsType.Type = "Reiser 3.5 filesystem";
+        else if(_magic36.SequenceEqual(reiserSb.magic))
+            XmlFsType.Type = "Reiser 3.6 filesystem";
+        else if(_magicJr.SequenceEqual(reiserSb.magic))
+            XmlFsType.Type = "Reiser Jr. filesystem";
 
-            if(sbAddr == 0)
-                sbAddr = 1;
+        XmlFsType.ClusterSize           = reiserSb.blocksize;
+        XmlFsType.Clusters              = reiserSb.block_count;
+        XmlFsType.FreeClusters          = reiserSb.free_blocks;
+        XmlFsType.FreeClustersSpecified = true;
+        XmlFsType.Dirty                 = reiserSb.umount_state == 2;
 
-            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+        if(reiserSb.version < 2)
+            return;
 
-            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
+        XmlFsType.VolumeName   = StringHandlers.CToString(reiserSb.label, Encoding);
+        XmlFsType.VolumeSerial = reiserSb.uuid.ToString();
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct JournalParameters
+    {
+        public readonly uint journal_1stblock;
+        public readonly uint journal_dev;
+        public readonly uint journal_size;
+        public readonly uint journal_trans_max;
+        public readonly uint journal_magic;
+        public readonly uint journal_max_batch;
+        public readonly uint journal_max_commit_age;
+        public readonly uint journal_max_trans_age;
+    }
 
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            if(sector.Length < Marshal.SizeOf<Superblock>())
-                return;
-
-            Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-            if(!_magic35.SequenceEqual(reiserSb.magic) &&
-               !_magic36.SequenceEqual(reiserSb.magic) &&
-               !_magicJr.SequenceEqual(reiserSb.magic))
-                return;
-
-            var sb = new StringBuilder();
-
-            if(_magic35.SequenceEqual(reiserSb.magic))
-                sb.AppendLine("Reiser 3.5 filesystem");
-            else if(_magic36.SequenceEqual(reiserSb.magic))
-                sb.AppendLine("Reiser 3.6 filesystem");
-            else if(_magicJr.SequenceEqual(reiserSb.magic))
-                sb.AppendLine("Reiser Jr. filesystem");
-
-            sb.AppendFormat("Volume has {0} blocks with {1} blocks free", reiserSb.block_count, reiserSb.free_blocks).
-               AppendLine();
-
-            sb.AppendFormat("{0} bytes per block", reiserSb.blocksize).AppendLine();
-            sb.AppendFormat("Root directory resides on block {0}", reiserSb.root_block).AppendLine();
-
-            if(reiserSb.umount_state == 2)
-                sb.AppendLine("Volume has not been cleanly umounted");
-
-            sb.AppendFormat("Volume last checked on {0}", DateHandlers.UnixUnsignedToDateTime(reiserSb.last_check)).
-               AppendLine();
-
-            if(reiserSb.version >= 2)
-            {
-                sb.AppendFormat("Volume UUID: {0}", reiserSb.uuid).AppendLine();
-                sb.AppendFormat("Volume name: {0}", Encoding.GetString(reiserSb.label)).AppendLine();
-            }
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType();
-
-            if(_magic35.SequenceEqual(reiserSb.magic))
-                XmlFsType.Type = "Reiser 3.5 filesystem";
-            else if(_magic36.SequenceEqual(reiserSb.magic))
-                XmlFsType.Type = "Reiser 3.6 filesystem";
-            else if(_magicJr.SequenceEqual(reiserSb.magic))
-                XmlFsType.Type = "Reiser Jr. filesystem";
-
-            XmlFsType.ClusterSize           = reiserSb.blocksize;
-            XmlFsType.Clusters              = reiserSb.block_count;
-            XmlFsType.FreeClusters          = reiserSb.free_blocks;
-            XmlFsType.FreeClustersSpecified = true;
-            XmlFsType.Dirty                 = reiserSb.umount_state == 2;
-
-            if(reiserSb.version < 2)
-                return;
-
-            XmlFsType.VolumeName   = StringHandlers.CToString(reiserSb.label, Encoding);
-            XmlFsType.VolumeSerial = reiserSb.uuid.ToString();
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct JournalParameters
-        {
-            public readonly uint journal_1stblock;
-            public readonly uint journal_dev;
-            public readonly uint journal_size;
-            public readonly uint journal_trans_max;
-            public readonly uint journal_magic;
-            public readonly uint journal_max_batch;
-            public readonly uint journal_max_commit_age;
-            public readonly uint journal_max_trans_age;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Superblock
-        {
-            public readonly uint              block_count;
-            public readonly uint              free_blocks;
-            public readonly uint              root_block;
-            public readonly JournalParameters journal;
-            public readonly ushort            blocksize;
-            public readonly ushort            oid_maxsize;
-            public readonly ushort            oid_cursize;
-            public readonly ushort            umount_state;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly byte[] magic;
-            public readonly ushort fs_state;
-            public readonly uint   hash_function_code;
-            public readonly ushort tree_height;
-            public readonly ushort bmap_nr;
-            public readonly ushort version;
-            public readonly ushort reserved_for_journal;
-            public readonly uint   inode_generation;
-            public readonly uint   flags;
-            public readonly Guid   uuid;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] label;
-            public readonly ushort mnt_count;
-            public readonly ushort max_mnt_count;
-            public readonly uint   last_check;
-            public readonly uint   check_interval;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 76)]
-            public readonly byte[] unused;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Superblock
+    {
+        public readonly uint              block_count;
+        public readonly uint              free_blocks;
+        public readonly uint              root_block;
+        public readonly JournalParameters journal;
+        public readonly ushort            blocksize;
+        public readonly ushort            oid_maxsize;
+        public readonly ushort            oid_cursize;
+        public readonly ushort            umount_state;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly byte[] magic;
+        public readonly ushort fs_state;
+        public readonly uint   hash_function_code;
+        public readonly ushort tree_height;
+        public readonly ushort bmap_nr;
+        public readonly ushort version;
+        public readonly ushort reserved_for_journal;
+        public readonly uint   inode_generation;
+        public readonly uint   flags;
+        public readonly Guid   uuid;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] label;
+        public readonly ushort mnt_count;
+        public readonly ushort max_mnt_count;
+        public readonly uint   last_check;
+        public readonly uint   check_interval;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 76)]
+        public readonly byte[] unused;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Reiser4.cs b/Aaru.Filesystems/Reiser4.cs
index 116a5af58..66d3e50de 100644
--- a/Aaru.Filesystems/Reiser4.cs
+++ b/Aaru.Filesystems/Reiser4.cs
@@ -41,125 +41,124 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the Reiser v4 filesystem</summary>
+public sealed class Reiser4 : IFilesystem
 {
-    /// <inheritdoc />
-    /// <summary>Implements detection of the Reiser v4 filesystem</summary>
-    public sealed class Reiser4 : IFilesystem
+    const uint REISER4_SUPER_OFFSET = 0x10000;
+
+    readonly byte[] _magic =
     {
-        const uint REISER4_SUPER_OFFSET = 0x10000;
+        0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
 
-        readonly byte[] _magic =
+    /// <inheritdoc />
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Reiser4 Filesystem Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("301F2D00-E8D5-4F04-934E-81DFB21D15BA");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
+    {
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
+
+        uint sbAddr = REISER4_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+        if(sbAddr == 0)
+            sbAddr = 1;
+
+        uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        if(partition.Start + sbAddr + sbSize >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(sector.Length < Marshal.SizeOf<Superblock>())
+            return false;
+
+        Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        return _magic.SequenceEqual(reiserSb.magic);
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        uint sbAddr = REISER4_SUPER_OFFSET / imagePlugin.Info.SectorSize;
+
+        if(sbAddr == 0)
+            sbAddr = 1;
+
+        uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        if(sector.Length < Marshal.SizeOf<Superblock>())
+            return;
+
+        Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
+
+        if(!_magic.SequenceEqual(reiserSb.magic))
+            return;
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("Reiser 4 filesystem");
+        sb.AppendFormat("{0} bytes per block", reiserSb.blocksize).AppendLine();
+        sb.AppendFormat("Volume disk format: {0}", reiserSb.diskformat).AppendLine();
+        sb.AppendFormat("Volume UUID: {0}", reiserSb.uuid).AppendLine();
+        sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(reiserSb.label, Encoding)).AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            0x52, 0x65, 0x49, 0x73, 0x45, 0x72, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+            Type         = "Reiser 4 filesystem",
+            ClusterSize  = reiserSb.blocksize,
+            Clusters     = (partition.End - partition.Start) * imagePlugin.Info.SectorSize / reiserSb.blocksize,
+            VolumeName   = StringHandlers.CToString(reiserSb.label, Encoding),
+            VolumeSerial = reiserSb.uuid.ToString()
         };
+    }
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Reiser4 Filesystem Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("301F2D00-E8D5-4F04-934E-81DFB21D15BA");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
-
-            uint sbAddr = REISER4_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-
-            if(sbAddr == 0)
-                sbAddr = 1;
-
-            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            if(partition.Start + sbAddr + sbSize >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(sector.Length < Marshal.SizeOf<Superblock>())
-                return false;
-
-            Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-            return _magic.SequenceEqual(reiserSb.magic);
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-
-            if(imagePlugin.Info.SectorSize < 512)
-                return;
-
-            uint sbAddr = REISER4_SUPER_OFFSET / imagePlugin.Info.SectorSize;
-
-            if(sbAddr == 0)
-                sbAddr = 1;
-
-            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + sbAddr, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            if(sector.Length < Marshal.SizeOf<Superblock>())
-                return;
-
-            Superblock reiserSb = Marshal.ByteArrayToStructureLittleEndian<Superblock>(sector);
-
-            if(!_magic.SequenceEqual(reiserSb.magic))
-                return;
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine("Reiser 4 filesystem");
-            sb.AppendFormat("{0} bytes per block", reiserSb.blocksize).AppendLine();
-            sb.AppendFormat("Volume disk format: {0}", reiserSb.diskformat).AppendLine();
-            sb.AppendFormat("Volume UUID: {0}", reiserSb.uuid).AppendLine();
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(reiserSb.label, Encoding)).AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type         = "Reiser 4 filesystem",
-                ClusterSize  = reiserSb.blocksize,
-                Clusters     = (partition.End - partition.Start) * imagePlugin.Info.SectorSize / reiserSb.blocksize,
-                VolumeName   = StringHandlers.CToString(reiserSb.label, Encoding),
-                VolumeSerial = reiserSb.uuid.ToString()
-            };
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Superblock
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] magic;
-            public readonly ushort diskformat;
-            public readonly ushort blocksize;
-            public readonly Guid   uuid;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] label;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Superblock
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] magic;
+        public readonly ushort diskformat;
+        public readonly ushort blocksize;
+        public readonly Guid   uuid;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] label;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/SFS.cs b/Aaru.Filesystems/SFS.cs
index 214880f07..f7fc19923 100644
--- a/Aaru.Filesystems/SFS.cs
+++ b/Aaru.Filesystems/SFS.cs
@@ -40,142 +40,141 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the Smart File System</summary>
+public sealed class SFS : IFilesystem
 {
+    /// <summary>Identifier for SFS v1</summary>
+    const uint SFS_MAGIC = 0x53465300;
+    /// <summary>Identifier for SFS v2</summary>
+    const uint SFS2_MAGIC = 0x53465302;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the Smart File System</summary>
-    public sealed class SFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "SmartFileSystem";
+    /// <inheritdoc />
+    public Guid Id => new("26550C19-3671-4A2D-BC2F-F20CEB7F48DC");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>Identifier for SFS v1</summary>
-        const uint SFS_MAGIC = 0x53465300;
-        /// <summary>Identifier for SFS v2</summary>
-        const uint SFS2_MAGIC = 0x53465302;
+        if(partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "SmartFileSystem";
-        /// <inheritdoc />
-        public Guid Id => new("26550C19-3671-4A2D-BC2F-F20CEB7F48DC");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        uint magic = BigEndianBitConverter.ToUInt32(sector, 0x00);
+
+        return magic == SFS_MAGIC || magic == SFS2_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        information = "";
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-1");
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] rootBlockSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        RootBlock rootBlock = Marshal.ByteArrayToStructureBigEndian<RootBlock>(rootBlockSector);
+
+        var sbInformation = new StringBuilder();
+
+        sbInformation.AppendLine("SmartFileSystem");
+
+        sbInformation.AppendFormat("Volume version {0}", rootBlock.version).AppendLine();
+
+        sbInformation.AppendFormat("Volume starts on device byte {0} and ends on byte {1}", rootBlock.firstbyte,
+                                   rootBlock.lastbyte).AppendLine();
+
+        sbInformation.
+            AppendFormat("Volume has {0} blocks of {1} bytes each", rootBlock.totalblocks, rootBlock.blocksize).
+            AppendLine();
+
+        sbInformation.AppendFormat("Volume created on {0}",
+                                   DateHandlers.UnixUnsignedToDateTime(rootBlock.datecreated).AddYears(8)).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Bitmap starts in block {0}", rootBlock.bitmapbase).AppendLine();
+
+        sbInformation.AppendFormat("Admin space container starts in block {0}", rootBlock.adminspacecontainer).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Root object container starts in block {0}", rootBlock.rootobjectcontainer).
+                      AppendLine();
+
+        sbInformation.
+            AppendFormat("Root node of the extent B-tree resides in block {0}", rootBlock.extentbnoderoot).
+            AppendLine();
+
+        sbInformation.AppendFormat("Root node of the object B-tree resides in block {0}", rootBlock.objectnoderoot).
+                      AppendLine();
+
+        if(rootBlock.bits.HasFlag(Flags.CaseSensitive))
+            sbInformation.AppendLine("Volume is case sensitive");
+
+        if(rootBlock.bits.HasFlag(Flags.RecycledFolder))
+            sbInformation.AppendLine("Volume moves deleted files to a recycled folder");
+
+        information = sbInformation.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            if(partition.Start >= partition.End)
-                return false;
+            CreationDate          = DateHandlers.UnixUnsignedToDateTime(rootBlock.datecreated).AddYears(8),
+            CreationDateSpecified = true,
+            Clusters              = rootBlock.totalblocks,
+            ClusterSize           = rootBlock.blocksize,
+            Type                  = "SmartFileSystem"
+        };
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+    [Flags]
+    enum Flags : byte
+    {
+        RecycledFolder = 64, CaseSensitive = 128
+    }
 
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            uint magic = BigEndianBitConverter.ToUInt32(sector, 0x00);
-
-            return magic == SFS_MAGIC || magic == SFS2_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            information = "";
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-1");
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] rootBlockSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            RootBlock rootBlock = Marshal.ByteArrayToStructureBigEndian<RootBlock>(rootBlockSector);
-
-            var sbInformation = new StringBuilder();
-
-            sbInformation.AppendLine("SmartFileSystem");
-
-            sbInformation.AppendFormat("Volume version {0}", rootBlock.version).AppendLine();
-
-            sbInformation.AppendFormat("Volume starts on device byte {0} and ends on byte {1}", rootBlock.firstbyte,
-                                       rootBlock.lastbyte).AppendLine();
-
-            sbInformation.
-                AppendFormat("Volume has {0} blocks of {1} bytes each", rootBlock.totalblocks, rootBlock.blocksize).
-                AppendLine();
-
-            sbInformation.AppendFormat("Volume created on {0}",
-                                       DateHandlers.UnixUnsignedToDateTime(rootBlock.datecreated).AddYears(8)).
-                          AppendLine();
-
-            sbInformation.AppendFormat("Bitmap starts in block {0}", rootBlock.bitmapbase).AppendLine();
-
-            sbInformation.AppendFormat("Admin space container starts in block {0}", rootBlock.adminspacecontainer).
-                          AppendLine();
-
-            sbInformation.AppendFormat("Root object container starts in block {0}", rootBlock.rootobjectcontainer).
-                          AppendLine();
-
-            sbInformation.
-                AppendFormat("Root node of the extent B-tree resides in block {0}", rootBlock.extentbnoderoot).
-                AppendLine();
-
-            sbInformation.AppendFormat("Root node of the object B-tree resides in block {0}", rootBlock.objectnoderoot).
-                          AppendLine();
-
-            if(rootBlock.bits.HasFlag(Flags.CaseSensitive))
-                sbInformation.AppendLine("Volume is case sensitive");
-
-            if(rootBlock.bits.HasFlag(Flags.RecycledFolder))
-                sbInformation.AppendLine("Volume moves deleted files to a recycled folder");
-
-            information = sbInformation.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                CreationDate          = DateHandlers.UnixUnsignedToDateTime(rootBlock.datecreated).AddYears(8),
-                CreationDateSpecified = true,
-                Clusters              = rootBlock.totalblocks,
-                ClusterSize           = rootBlock.blocksize,
-                Type                  = "SmartFileSystem"
-            };
-        }
-
-        [Flags]
-        enum Flags : byte
-        {
-            RecycledFolder = 64, CaseSensitive = 128
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct RootBlock
-        {
-            public readonly uint   blockId;
-            public readonly uint   blockChecksum;
-            public readonly uint   blockSelfPointer;
-            public readonly ushort version;
-            public readonly ushort sequence;
-            public readonly uint   datecreated;
-            public readonly Flags  bits;
-            public readonly byte   padding1;
-            public readonly ushort padding2;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly uint[] reserved1;
-            public readonly ulong firstbyte;
-            public readonly ulong lastbyte;
-            public readonly uint  totalblocks;
-            public readonly uint  blocksize;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly uint[] reserved2;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly uint[] reserved3;
-            public readonly uint bitmapbase;
-            public readonly uint adminspacecontainer;
-            public readonly uint rootobjectcontainer;
-            public readonly uint extentbnoderoot;
-            public readonly uint objectnoderoot;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly uint[] reserved4;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct RootBlock
+    {
+        public readonly uint   blockId;
+        public readonly uint   blockChecksum;
+        public readonly uint   blockSelfPointer;
+        public readonly ushort version;
+        public readonly ushort sequence;
+        public readonly uint   datecreated;
+        public readonly Flags  bits;
+        public readonly byte   padding1;
+        public readonly ushort padding2;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly uint[] reserved1;
+        public readonly ulong firstbyte;
+        public readonly ulong lastbyte;
+        public readonly uint  totalblocks;
+        public readonly uint  blocksize;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly uint[] reserved2;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly uint[] reserved3;
+        public readonly uint bitmapbase;
+        public readonly uint adminspacecontainer;
+        public readonly uint rootobjectcontainer;
+        public readonly uint extentbnoderoot;
+        public readonly uint objectnoderoot;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly uint[] reserved4;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/SolarFS.cs b/Aaru.Filesystems/SolarFS.cs
index ad408abc6..3f218f4ee 100644
--- a/Aaru.Filesystems/SolarFS.cs
+++ b/Aaru.Filesystems/SolarFS.cs
@@ -40,185 +40,184 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Based on FAT's BPB, cannot find a FAT or directory
+/// <inheritdoc />
+/// <summary>Implements detection of the Solar OS filesystem</summary>
+public sealed class SolarFS : IFilesystem
 {
-    // Based on FAT's BPB, cannot find a FAT or directory
     /// <inheritdoc />
-    /// <summary>Implements detection of the Solar OS filesystem</summary>
-    public sealed class SolarFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Solar_OS filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("EA3101C1-E777-4B4F-B5A3-8C57F50F6E65");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Solar_OS filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("EA3101C1-E777-4B4F-B5A3-8C57F50F6E65");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(2 + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bpb);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        byte[] fsTypeB = new byte[8];
+
+        byte signature = bpb[0x25];
+        Array.Copy(bpb, 0x35, fsTypeB, 0, 8);
+        string fsType = StringHandlers.CToString(fsTypeB);
+
+        return signature == 0x29 && fsType == "SOL_FS  ";
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        var         sb    = new StringBuilder();
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bpbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        var bpb = new BiosParameterBlock
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
+            bps       = BitConverter.ToUInt16(bpbSector, 0x0B),
+            root_ent  = BitConverter.ToUInt16(bpbSector, 0x10),
+            sectors   = BitConverter.ToUInt16(bpbSector, 0x12),
+            media     = bpbSector[0x14],
+            spfat     = BitConverter.ToUInt16(bpbSector, 0x15),
+            sptrk     = BitConverter.ToUInt16(bpbSector, 0x17),
+            heads     = BitConverter.ToUInt16(bpbSector, 0x19),
+            signature = bpbSector[0x25]
+        };
 
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bpb);
+        byte[] bpbStrings = new byte[8];
+        Array.Copy(bpbSector, 0x03, bpbStrings, 0, 8);
+        bpb.OEMName = StringHandlers.CToString(bpbStrings);
+        bpbStrings  = new byte[8];
+        Array.Copy(bpbSector, 0x2A, bpbStrings, 0, 11);
+        bpb.vol_name = StringHandlers.CToString(bpbStrings, Encoding);
+        bpbStrings   = new byte[8];
+        Array.Copy(bpbSector, 0x35, bpbStrings, 0, 8);
+        bpb.fs_type = StringHandlers.CToString(bpbStrings, Encoding);
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+        bpb.x86_jump = new byte[3];
+        Array.Copy(bpbSector, 0x00, bpb.x86_jump, 0, 3);
+        bpb.unk1 = bpbSector[0x0D];
+        bpb.unk2 = BitConverter.ToUInt16(bpbSector, 0x0E);
+        bpb.unk3 = new byte[10];
+        Array.Copy(bpbSector, 0x1B, bpb.unk3, 0, 10);
+        bpb.unk4 = BitConverter.ToUInt32(bpbSector, 0x26);
 
-            byte[] fsTypeB = new byte[8];
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.x86_jump: 0x{0:X2}{1:X2}{2:X2}", bpb.x86_jump[0],
+                                   bpb.x86_jump[1], bpb.x86_jump[2]);
 
-            byte signature = bpb[0x25];
-            Array.Copy(bpb, 0x35, fsTypeB, 0, 8);
-            string fsType = StringHandlers.CToString(fsTypeB);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.OEMName: \"{0}\"", bpb.OEMName);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.bps: {0}", bpb.bps);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk1: 0x{0:X2}", bpb.unk1);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk2: 0x{0:X4}", bpb.unk2);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.root_ent: {0}", bpb.root_ent);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.sectors: {0}", bpb.sectors);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.media: 0x{0:X2}", bpb.media);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.spfat: {0}", bpb.spfat);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.sptrk: {0}", bpb.sptrk);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.heads: {0}", bpb.heads);
 
-            return signature == 0x29 && fsType == "SOL_FS  ";
-        }
+        AaruConsole.DebugWriteLine("SolarFS plugin",
+                                   "BPB.unk3: 0x{0:X2}{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}",
+                                   bpb.unk3[0], bpb.unk3[1], bpb.unk3[2], bpb.unk3[3], bpb.unk3[4], bpb.unk3[5],
+                                   bpb.unk3[6], bpb.unk3[7], bpb.unk3[8], bpb.unk3[9]);
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.signature: 0x{0:X2}", bpb.signature);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk4: 0x{0:X8}", bpb.unk4);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.vol_name: \"{0}\"", bpb.vol_name);
+        AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.fs_type: \"{0}\"", bpb.fs_type);
+
+        sb.AppendLine("Solar_OS filesystem");
+        sb.AppendFormat("Media descriptor: 0x{0:X2}", bpb.media).AppendLine();
+        sb.AppendFormat("{0} bytes per sector", bpb.bps).AppendLine();
+
+        if(imagePlugin.Info.SectorSize == 2336 ||
+           imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448)
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-
-            var         sb    = new StringBuilder();
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bpbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            var bpb = new BiosParameterBlock
-            {
-                bps       = BitConverter.ToUInt16(bpbSector, 0x0B),
-                root_ent  = BitConverter.ToUInt16(bpbSector, 0x10),
-                sectors   = BitConverter.ToUInt16(bpbSector, 0x12),
-                media     = bpbSector[0x14],
-                spfat     = BitConverter.ToUInt16(bpbSector, 0x15),
-                sptrk     = BitConverter.ToUInt16(bpbSector, 0x17),
-                heads     = BitConverter.ToUInt16(bpbSector, 0x19),
-                signature = bpbSector[0x25]
-            };
-
-            byte[] bpbStrings = new byte[8];
-            Array.Copy(bpbSector, 0x03, bpbStrings, 0, 8);
-            bpb.OEMName = StringHandlers.CToString(bpbStrings);
-            bpbStrings  = new byte[8];
-            Array.Copy(bpbSector, 0x2A, bpbStrings, 0, 11);
-            bpb.vol_name = StringHandlers.CToString(bpbStrings, Encoding);
-            bpbStrings   = new byte[8];
-            Array.Copy(bpbSector, 0x35, bpbStrings, 0, 8);
-            bpb.fs_type = StringHandlers.CToString(bpbStrings, Encoding);
-
-            bpb.x86_jump = new byte[3];
-            Array.Copy(bpbSector, 0x00, bpb.x86_jump, 0, 3);
-            bpb.unk1 = bpbSector[0x0D];
-            bpb.unk2 = BitConverter.ToUInt16(bpbSector, 0x0E);
-            bpb.unk3 = new byte[10];
-            Array.Copy(bpbSector, 0x1B, bpb.unk3, 0, 10);
-            bpb.unk4 = BitConverter.ToUInt32(bpbSector, 0x26);
-
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.x86_jump: 0x{0:X2}{1:X2}{2:X2}", bpb.x86_jump[0],
-                                       bpb.x86_jump[1], bpb.x86_jump[2]);
-
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.OEMName: \"{0}\"", bpb.OEMName);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.bps: {0}", bpb.bps);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk1: 0x{0:X2}", bpb.unk1);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk2: 0x{0:X4}", bpb.unk2);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.root_ent: {0}", bpb.root_ent);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.sectors: {0}", bpb.sectors);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.media: 0x{0:X2}", bpb.media);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.spfat: {0}", bpb.spfat);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.sptrk: {0}", bpb.sptrk);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.heads: {0}", bpb.heads);
-
-            AaruConsole.DebugWriteLine("SolarFS plugin",
-                                       "BPB.unk3: 0x{0:X2}{1:X2}{2:X2}{3:X2}{4:X2}{5:X2}{6:X2}{7:X2}{8:X2}{9:X2}",
-                                       bpb.unk3[0], bpb.unk3[1], bpb.unk3[2], bpb.unk3[3], bpb.unk3[4], bpb.unk3[5],
-                                       bpb.unk3[6], bpb.unk3[7], bpb.unk3[8], bpb.unk3[9]);
-
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.signature: 0x{0:X2}", bpb.signature);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.unk4: 0x{0:X8}", bpb.unk4);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.vol_name: \"{0}\"", bpb.vol_name);
-            AaruConsole.DebugWriteLine("SolarFS plugin", "BPB.fs_type: \"{0}\"", bpb.fs_type);
-
-            sb.AppendLine("Solar_OS filesystem");
-            sb.AppendFormat("Media descriptor: 0x{0:X2}", bpb.media).AppendLine();
-            sb.AppendFormat("{0} bytes per sector", bpb.bps).AppendLine();
-
-            if(imagePlugin.Info.SectorSize == 2336 ||
-               imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448)
-            {
-                if(bpb.bps != imagePlugin.Info.SectorSize)
-                    sb.
-                        AppendFormat("WARNING: Filesystem describes a {0} bytes/sector, while device describes a {1} bytes/sector",
-                                     bpb.bps, 2048).AppendLine();
-            }
-            else if(bpb.bps != imagePlugin.Info.SectorSize)
+            if(bpb.bps != imagePlugin.Info.SectorSize)
                 sb.
                     AppendFormat("WARNING: Filesystem describes a {0} bytes/sector, while device describes a {1} bytes/sector",
-                                 bpb.bps, imagePlugin.Info.SectorSize).AppendLine();
-
-            sb.AppendFormat("{0} sectors on volume ({1} bytes)", bpb.sectors, bpb.sectors * bpb.bps).AppendLine();
-
-            if(bpb.sectors > imagePlugin.Info.Sectors)
-                sb.AppendFormat("WARNING: Filesystem describes a {0} sectors volume, bigger than device ({1} sectors)",
-                                bpb.sectors, imagePlugin.Info.Sectors);
-
-            sb.AppendFormat("{0} heads", bpb.heads).AppendLine();
-            sb.AppendFormat("{0} sectors per track", bpb.sptrk).AppendLine();
-            sb.AppendFormat("Volume name: {0}", bpb.vol_name).AppendLine();
-
-            XmlFsType = new FileSystemType
-            {
-                Type        = "SolarFS",
-                Clusters    = bpb.sectors,
-                ClusterSize = bpb.bps,
-                VolumeName  = bpb.vol_name
-            };
-
-            information = sb.ToString();
+                                 bpb.bps, 2048).AppendLine();
         }
+        else if(bpb.bps != imagePlugin.Info.SectorSize)
+            sb.
+                AppendFormat("WARNING: Filesystem describes a {0} bytes/sector, while device describes a {1} bytes/sector",
+                             bpb.bps, imagePlugin.Info.SectorSize).AppendLine();
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct BiosParameterBlock
+        sb.AppendFormat("{0} sectors on volume ({1} bytes)", bpb.sectors, bpb.sectors * bpb.bps).AppendLine();
+
+        if(bpb.sectors > imagePlugin.Info.Sectors)
+            sb.AppendFormat("WARNING: Filesystem describes a {0} sectors volume, bigger than device ({1} sectors)",
+                            bpb.sectors, imagePlugin.Info.Sectors);
+
+        sb.AppendFormat("{0} heads", bpb.heads).AppendLine();
+        sb.AppendFormat("{0} sectors per track", bpb.sptrk).AppendLine();
+        sb.AppendFormat("Volume name: {0}", bpb.vol_name).AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            /// <summary>0x00, x86 jump (3 bytes), jumps to 0x60</summary>
-            public byte[] x86_jump;
-            /// <summary>0x03, 8 bytes, "SOLAR_OS"</summary>
-            public string OEMName;
-            /// <summary>0x0B, Bytes per sector</summary>
-            public ushort bps;
-            /// <summary>0x0D, unknown, 0x01</summary>
-            public byte unk1;
-            /// <summary>0x0E, unknown, 0x0201</summary>
-            public ushort unk2;
-            /// <summary>0x10, Number of entries on root directory ? (no root directory found)</summary>
-            public ushort root_ent;
-            /// <summary>0x12, Sectors in volume</summary>
-            public ushort sectors;
-            /// <summary>0x14, Media descriptor</summary>
-            public byte media;
-            /// <summary>0x15, Sectors per FAT ? (no FAT found)</summary>
-            public ushort spfat;
-            /// <summary>0x17, Sectors per track</summary>
-            public ushort sptrk;
-            /// <summary>0x19, Heads</summary>
-            public ushort heads;
-            /// <summary>0x1B, unknown, 10 bytes, zero-filled</summary>
-            public byte[] unk3;
-            /// <summary>0x25, 0x29</summary>
-            public byte signature;
-            /// <summary>0x26, unknown, zero-filled</summary>
-            public uint unk4;
-            /// <summary>0x2A, 11 bytes, volume name, space-padded</summary>
-            public string vol_name;
-            /// <summary>0x35, 8 bytes, "SOL_FS  "</summary>
-            public string fs_type;
-        }
+            Type        = "SolarFS",
+            Clusters    = bpb.sectors,
+            ClusterSize = bpb.bps,
+            VolumeName  = bpb.vol_name
+        };
+
+        information = sb.ToString();
+    }
+
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct BiosParameterBlock
+    {
+        /// <summary>0x00, x86 jump (3 bytes), jumps to 0x60</summary>
+        public byte[] x86_jump;
+        /// <summary>0x03, 8 bytes, "SOLAR_OS"</summary>
+        public string OEMName;
+        /// <summary>0x0B, Bytes per sector</summary>
+        public ushort bps;
+        /// <summary>0x0D, unknown, 0x01</summary>
+        public byte unk1;
+        /// <summary>0x0E, unknown, 0x0201</summary>
+        public ushort unk2;
+        /// <summary>0x10, Number of entries on root directory ? (no root directory found)</summary>
+        public ushort root_ent;
+        /// <summary>0x12, Sectors in volume</summary>
+        public ushort sectors;
+        /// <summary>0x14, Media descriptor</summary>
+        public byte media;
+        /// <summary>0x15, Sectors per FAT ? (no FAT found)</summary>
+        public ushort spfat;
+        /// <summary>0x17, Sectors per track</summary>
+        public ushort sptrk;
+        /// <summary>0x19, Heads</summary>
+        public ushort heads;
+        /// <summary>0x1B, unknown, 10 bytes, zero-filled</summary>
+        public byte[] unk3;
+        /// <summary>0x25, 0x29</summary>
+        public byte signature;
+        /// <summary>0x26, unknown, zero-filled</summary>
+        public uint unk4;
+        /// <summary>0x2A, 11 bytes, volume name, space-padded</summary>
+        public string vol_name;
+        /// <summary>0x35, 8 bytes, "SOL_FS  "</summary>
+        public string fs_type;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Squash.cs b/Aaru.Filesystems/Squash.cs
index 8703215b5..500819a10 100644
--- a/Aaru.Filesystems/Squash.cs
+++ b/Aaru.Filesystems/Squash.cs
@@ -40,162 +40,161 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the squash filesystem</summary>
+public sealed class Squash : IFilesystem
 {
+    /// <summary>Identifier for Squash</summary>
+    const uint SQUASH_MAGIC = 0x73717368;
+    const uint SQUASH_CIGAM = 0x68737173;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the squash filesystem</summary>
-    public sealed class Squash : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Squash filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("F8F6E46F-7A2A-48E3-9C0A-46AF4DC29E09");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>Identifier for Squash</summary>
-        const uint SQUASH_MAGIC = 0x73717368;
-        const uint SQUASH_CIGAM = 0x68737173;
+        if(partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Squash filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("F8F6E46F-7A2A-48E3-9C0A-46AF4DC29E09");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        uint magic = BitConverter.ToUInt32(sector, 0x00);
+
+        return magic == SQUASH_MAGIC || magic == SQUASH_CIGAM;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.UTF8;
+        information = "";
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        uint magic = BitConverter.ToUInt32(sector, 0x00);
+
+        var  sqSb         = new SuperBlock();
+        bool littleEndian = true;
+
+        switch(magic)
         {
-            if(partition.Start >= partition.End)
-                return false;
+            case SQUASH_MAGIC:
+                sqSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
 
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+                break;
+            case SQUASH_CIGAM:
+                sqSb         = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sector);
+                littleEndian = false;
 
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            uint magic = BitConverter.ToUInt32(sector, 0x00);
-
-            return magic == SQUASH_MAGIC || magic == SQUASH_CIGAM;
+                break;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        var sbInformation = new StringBuilder();
+
+        sbInformation.AppendLine("Squash file system");
+        sbInformation.AppendLine(littleEndian ? "Little-endian" : "Big-endian");
+        sbInformation.AppendFormat("Volume version {0}.{1}", sqSb.s_major, sqSb.s_minor).AppendLine();
+        sbInformation.AppendFormat("Volume has {0} bytes", sqSb.bytes_used).AppendLine();
+        sbInformation.AppendFormat("Volume has {0} bytes per block", sqSb.block_size).AppendLine();
+
+        sbInformation.AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(sqSb.mkfs_time)).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Volume has {0} inodes", sqSb.inodes).AppendLine();
+
+        switch(sqSb.compression)
         {
-            Encoding    = encoding ?? Encoding.UTF8;
-            information = "";
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start, out byte[] sector);
+            case (ushort)SquashCompression.Lz4:
+                sbInformation.AppendLine("Volume is compressed using LZ4");
 
-            if(errno != ErrorNumber.NoError)
-                return;
+                break;
+            case (ushort)SquashCompression.Lzo:
+                sbInformation.AppendLine("Volume is compressed using LZO");
 
-            uint magic = BitConverter.ToUInt32(sector, 0x00);
+                break;
+            case (ushort)SquashCompression.Lzma:
+                sbInformation.AppendLine("Volume is compressed using LZMA");
 
-            var  sqSb         = new SuperBlock();
-            bool littleEndian = true;
+                break;
+            case (ushort)SquashCompression.Xz:
+                sbInformation.AppendLine("Volume is compressed using XZ");
 
-            switch(magic)
-            {
-                case SQUASH_MAGIC:
-                    sqSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
+                break;
+            case (ushort)SquashCompression.Zlib:
+                sbInformation.AppendLine("Volume is compressed using GZIP");
 
-                    break;
-                case SQUASH_CIGAM:
-                    sqSb         = Marshal.ByteArrayToStructureBigEndian<SuperBlock>(sector);
-                    littleEndian = false;
+                break;
+            case (ushort)SquashCompression.Zstd:
+                sbInformation.AppendLine("Volume is compressed using Zstandard");
 
-                    break;
-            }
+                break;
+            default:
+                sbInformation.AppendFormat("Volume is compressed using unknown algorithm {0}", sqSb.compression).
+                              AppendLine();
 
-            var sbInformation = new StringBuilder();
-
-            sbInformation.AppendLine("Squash file system");
-            sbInformation.AppendLine(littleEndian ? "Little-endian" : "Big-endian");
-            sbInformation.AppendFormat("Volume version {0}.{1}", sqSb.s_major, sqSb.s_minor).AppendLine();
-            sbInformation.AppendFormat("Volume has {0} bytes", sqSb.bytes_used).AppendLine();
-            sbInformation.AppendFormat("Volume has {0} bytes per block", sqSb.block_size).AppendLine();
-
-            sbInformation.AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(sqSb.mkfs_time)).
-                          AppendLine();
-
-            sbInformation.AppendFormat("Volume has {0} inodes", sqSb.inodes).AppendLine();
-
-            switch(sqSb.compression)
-            {
-                case (ushort)SquashCompression.Lz4:
-                    sbInformation.AppendLine("Volume is compressed using LZ4");
-
-                    break;
-                case (ushort)SquashCompression.Lzo:
-                    sbInformation.AppendLine("Volume is compressed using LZO");
-
-                    break;
-                case (ushort)SquashCompression.Lzma:
-                    sbInformation.AppendLine("Volume is compressed using LZMA");
-
-                    break;
-                case (ushort)SquashCompression.Xz:
-                    sbInformation.AppendLine("Volume is compressed using XZ");
-
-                    break;
-                case (ushort)SquashCompression.Zlib:
-                    sbInformation.AppendLine("Volume is compressed using GZIP");
-
-                    break;
-                case (ushort)SquashCompression.Zstd:
-                    sbInformation.AppendLine("Volume is compressed using Zstandard");
-
-                    break;
-                default:
-                    sbInformation.AppendFormat("Volume is compressed using unknown algorithm {0}", sqSb.compression).
-                                  AppendLine();
-
-                    break;
-            }
-
-            information = sbInformation.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type = "Squash file system",
-                CreationDate = DateHandlers.UnixUnsignedToDateTime(sqSb.mkfs_time),
-                CreationDateSpecified = true,
-                Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize / sqSb.block_size,
-                ClusterSize = sqSb.block_size,
-                Files = sqSb.inodes,
-                FilesSpecified = true,
-                FreeClusters = 0,
-                FreeClustersSpecified = true
-            };
+                break;
         }
 
-        enum SquashCompression : ushort
-        {
-            Zlib = 1, Lzma = 2, Lzo  = 3,
-            Xz   = 4, Lz4  = 5, Zstd = 6
-        }
+        information = sbInformation.ToString();
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
+        XmlFsType = new FileSystemType
         {
-            public readonly uint   magic;
-            public readonly uint   inodes;
-            public readonly uint   mkfs_time;
-            public readonly uint   block_size;
-            public readonly uint   fragments;
-            public readonly ushort compression;
-            public readonly ushort block_log;
-            public readonly ushort flags;
-            public readonly ushort no_ids;
-            public readonly ushort s_major;
-            public readonly ushort s_minor;
-            public readonly ulong  root_inode;
-            public readonly ulong  bytes_used;
-            public readonly ulong  id_table_start;
-            public readonly ulong  xattr_id_table_start;
-            public readonly ulong  inode_table_start;
-            public readonly ulong  directory_table_start;
-            public readonly ulong  fragment_table_start;
-            public readonly ulong  lookup_table_start;
-        }
+            Type = "Squash file system",
+            CreationDate = DateHandlers.UnixUnsignedToDateTime(sqSb.mkfs_time),
+            CreationDateSpecified = true,
+            Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize / sqSb.block_size,
+            ClusterSize = sqSb.block_size,
+            Files = sqSb.inodes,
+            FilesSpecified = true,
+            FreeClusters = 0,
+            FreeClustersSpecified = true
+        };
+    }
+
+    enum SquashCompression : ushort
+    {
+        Zlib = 1, Lzma = 2, Lzo  = 3,
+        Xz   = 4, Lz4  = 5, Zstd = 6
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        public readonly uint   magic;
+        public readonly uint   inodes;
+        public readonly uint   mkfs_time;
+        public readonly uint   block_size;
+        public readonly uint   fragments;
+        public readonly ushort compression;
+        public readonly ushort block_log;
+        public readonly ushort flags;
+        public readonly ushort no_ids;
+        public readonly ushort s_major;
+        public readonly ushort s_minor;
+        public readonly ulong  root_inode;
+        public readonly ulong  bytes_used;
+        public readonly ulong  id_table_start;
+        public readonly ulong  xattr_id_table_start;
+        public readonly ulong  inode_table_start;
+        public readonly ulong  directory_table_start;
+        public readonly ulong  fragment_table_start;
+        public readonly ulong  lookup_table_start;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/SysV.cs b/Aaru.Filesystems/SysV.cs
index 2b40fd963..47ee58965 100644
--- a/Aaru.Filesystems/SysV.cs
+++ b/Aaru.Filesystems/SysV.cs
@@ -42,1107 +42,1106 @@ using Schemas;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from the Linux kernel
+/// <inheritdoc />
+/// <summary>Implements detection of the UNIX System V filesystem</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "UnusedMember.Local"),
+ SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed class SysVfs : IFilesystem
 {
-    // Information from the Linux kernel
+    const uint XENIX_MAGIC = 0x002B5544;
+    const uint XENIX_CIGAM = 0x44552B00;
+    const uint SYSV_MAGIC  = 0xFD187E20;
+    const uint SYSV_CIGAM  = 0x207E18FD;
+
+    // Rest have no magic.
+    // Per a Linux kernel, Coherent fs has following:
+    const string COH_FNAME = "noname";
+    const string COH_FPACK = "nopack";
+    const string COH_XXXXX = "xxxxx";
+    const string COH_XXXXS = "xxxxx ";
+    const string COH_XXXXN = "xxxxx\n";
+
+    // SCO AFS
+    const ushort SCO_NFREE = 0xFFFF;
+
+    // UNIX 7th Edition has nothing to detect it, so check for a valid filesystem is a must :(
+    const ushort V7_NICINOD = 100;
+    const ushort V7_NICFREE = 100;
+    const uint   V7_MAXSIZE = 0x00FFFFFF;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the UNIX System V filesystem</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "UnusedMember.Local"),
-     SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed class SysVfs : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "UNIX System V filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("9B8D016A-8561-400E-A12A-A198283C211D");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint XENIX_MAGIC = 0x002B5544;
-        const uint XENIX_CIGAM = 0x44552B00;
-        const uint SYSV_MAGIC  = 0xFD187E20;
-        const uint SYSV_CIGAM  = 0x207E18FD;
+        if(2 + partition.Start >= partition.End)
+            return false;
 
-        // Rest have no magic.
-        // Per a Linux kernel, Coherent fs has following:
-        const string COH_FNAME = "noname";
-        const string COH_FPACK = "nopack";
-        const string COH_XXXXX = "xxxxx";
-        const string COH_XXXXS = "xxxxx ";
-        const string COH_XXXXN = "xxxxx\n";
+        byte sb_size_in_sectors;
 
-        // SCO AFS
-        const ushort SCO_NFREE = 0xFFFF;
+        if(imagePlugin.Info.SectorSize <=
+           0x400) // Check if underlying device sector size is smaller than SuperBlock size
+            sb_size_in_sectors = (byte)(0x400 / imagePlugin.Info.SectorSize);
+        else
+            sb_size_in_sectors = 1; // If not a single sector can store it
 
-        // UNIX 7th Edition has nothing to detect it, so check for a valid filesystem is a must :(
-        const ushort V7_NICINOD = 100;
-        const ushort V7_NICFREE = 100;
-        const uint   V7_MAXSIZE = 0x00FFFFFF;
+        if(partition.End <=
+           partition.Start + (4 * (ulong)sb_size_in_sectors) +
+           sb_size_in_sectors) // Device must be bigger than SB location + SB size + offset
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "UNIX System V filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("9B8D016A-8561-400E-A12A-A198283C211D");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        // Sectors in a cylinder
+        int spc = (int)(imagePlugin.Info.Heads * imagePlugin.Info.SectorsPerTrack);
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        // Superblock can start on 0x000, 0x200, 0x600 and 0x800, not aligned, so we assume 16 (128 bytes/sector) sectors as a safe value
+        int[] locations =
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
 
-            byte sb_size_in_sectors;
+            // Superblock can also skip one cylinder (for boot)
+            spc
+        };
 
-            if(imagePlugin.Info.SectorSize <=
-               0x400) // Check if underlying device sector size is smaller than SuperBlock size
-                sb_size_in_sectors = (byte)(0x400 / imagePlugin.Info.SectorSize);
-            else
-                sb_size_in_sectors = 1; // If not a single sector can store it
+        foreach(int i in locations.TakeWhile(i => (ulong)i + partition.Start + sb_size_in_sectors <
+                                                  imagePlugin.Info.Sectors))
+        {
+            ErrorNumber errno =
+                imagePlugin.ReadSectors((ulong)i + partition.Start, sb_size_in_sectors, out byte[] sb_sector);
 
-            if(partition.End <=
-               partition.Start + (4 * (ulong)sb_size_in_sectors) +
-               sb_size_in_sectors) // Device must be bigger than SB location + SB size + offset
-                return false;
+            if(errno            != ErrorNumber.NoError ||
+               sb_sector.Length < 0x400)
+                continue;
 
-            // Sectors in a cylinder
-            int spc = (int)(imagePlugin.Info.Heads * imagePlugin.Info.SectorsPerTrack);
+            uint magic = BitConverter.ToUInt32(sb_sector, 0x3F8);
 
-            // Superblock can start on 0x000, 0x200, 0x600 and 0x800, not aligned, so we assume 16 (128 bytes/sector) sectors as a safe value
-            int[] locations =
+            if(magic == XENIX_MAGIC ||
+               magic == XENIX_CIGAM ||
+               magic == SYSV_MAGIC  ||
+               magic == SYSV_CIGAM)
+                return true;
+
+            magic = BitConverter.ToUInt32(sb_sector, 0x1F8); // System V magic location
+
+            if(magic == SYSV_MAGIC ||
+               magic == SYSV_CIGAM)
+                return true;
+
+            magic = BitConverter.ToUInt32(sb_sector, 0x1F0); // XENIX 3 magic location
+
+            if(magic == XENIX_MAGIC ||
+               magic == XENIX_CIGAM)
+                return true;
+
+            byte[] coherent_string = new byte[6];
+            Array.Copy(sb_sector, 0x1E4, coherent_string, 0, 6); // Coherent UNIX s_fname location
+            string s_fname = StringHandlers.CToString(coherent_string);
+            Array.Copy(sb_sector, 0x1EA, coherent_string, 0, 6); // Coherent UNIX s_fpack location
+            string s_fpack = StringHandlers.CToString(coherent_string);
+
+            if((s_fname == COH_FNAME && s_fpack == COH_FPACK) ||
+               (s_fname == COH_XXXXX && s_fpack == COH_XXXXX) ||
+               (s_fname == COH_XXXXS && s_fpack == COH_XXXXN))
+                return true;
+
+            // Now try to identify 7th edition
+            uint   s_fsize  = BitConverter.ToUInt32(sb_sector, 0x002);
+            ushort s_nfree  = BitConverter.ToUInt16(sb_sector, 0x006);
+            ushort s_ninode = BitConverter.ToUInt16(sb_sector, 0x0D0);
+
+            if(s_fsize  <= 0          ||
+               s_fsize  >= 0xFFFFFFFF ||
+               s_nfree  <= 0          ||
+               s_nfree  >= 0xFFFF     ||
+               s_ninode <= 0          ||
+               s_ninode >= 0xFFFF)
+                continue;
+
+            if((s_fsize  & 0xFF) == 0x00 &&
+               (s_nfree  & 0xFF) == 0x00 &&
+               (s_ninode & 0xFF) == 0x00)
             {
-                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
+                // Byteswap
+                s_fsize = ((s_fsize & 0xFF)       << 24) + ((s_fsize & 0xFF00) << 8) + ((s_fsize & 0xFF0000) >> 8) +
+                          ((s_fsize & 0xFF000000) >> 24);
 
-                // Superblock can also skip one cylinder (for boot)
-                spc
-            };
-
-            foreach(int i in locations.TakeWhile(i => (ulong)i + partition.Start + sb_size_in_sectors <
-                                                      imagePlugin.Info.Sectors))
-            {
-                ErrorNumber errno =
-                    imagePlugin.ReadSectors((ulong)i + partition.Start, sb_size_in_sectors, out byte[] sb_sector);
-
-                if(errno            != ErrorNumber.NoError ||
-                   sb_sector.Length < 0x400)
-                    continue;
-
-                uint magic = BitConverter.ToUInt32(sb_sector, 0x3F8);
-
-                if(magic == XENIX_MAGIC ||
-                   magic == XENIX_CIGAM ||
-                   magic == SYSV_MAGIC  ||
-                   magic == SYSV_CIGAM)
-                    return true;
-
-                magic = BitConverter.ToUInt32(sb_sector, 0x1F8); // System V magic location
-
-                if(magic == SYSV_MAGIC ||
-                   magic == SYSV_CIGAM)
-                    return true;
-
-                magic = BitConverter.ToUInt32(sb_sector, 0x1F0); // XENIX 3 magic location
-
-                if(magic == XENIX_MAGIC ||
-                   magic == XENIX_CIGAM)
-                    return true;
-
-                byte[] coherent_string = new byte[6];
-                Array.Copy(sb_sector, 0x1E4, coherent_string, 0, 6); // Coherent UNIX s_fname location
-                string s_fname = StringHandlers.CToString(coherent_string);
-                Array.Copy(sb_sector, 0x1EA, coherent_string, 0, 6); // Coherent UNIX s_fpack location
-                string s_fpack = StringHandlers.CToString(coherent_string);
-
-                if((s_fname == COH_FNAME && s_fpack == COH_FPACK) ||
-                   (s_fname == COH_XXXXX && s_fpack == COH_XXXXX) ||
-                   (s_fname == COH_XXXXS && s_fpack == COH_XXXXN))
-                    return true;
-
-                // Now try to identify 7th edition
-                uint   s_fsize  = BitConverter.ToUInt32(sb_sector, 0x002);
-                ushort s_nfree  = BitConverter.ToUInt16(sb_sector, 0x006);
-                ushort s_ninode = BitConverter.ToUInt16(sb_sector, 0x0D0);
-
-                if(s_fsize  <= 0          ||
-                   s_fsize  >= 0xFFFFFFFF ||
-                   s_nfree  <= 0          ||
-                   s_nfree  >= 0xFFFF     ||
-                   s_ninode <= 0          ||
-                   s_ninode >= 0xFFFF)
-                    continue;
-
-                if((s_fsize  & 0xFF) == 0x00 &&
-                   (s_nfree  & 0xFF) == 0x00 &&
-                   (s_ninode & 0xFF) == 0x00)
-                {
-                    // Byteswap
-                    s_fsize = ((s_fsize & 0xFF)       << 24) + ((s_fsize & 0xFF00) << 8) + ((s_fsize & 0xFF0000) >> 8) +
-                              ((s_fsize & 0xFF000000) >> 24);
-
-                    s_nfree  = (ushort)(s_nfree  >> 8);
-                    s_ninode = (ushort)(s_ninode >> 8);
-                }
-
-                if((s_fsize  & 0xFF000000) != 0x00 ||
-                   (s_nfree  & 0xFF00)     != 0x00 ||
-                   (s_ninode & 0xFF00)     != 0x00)
-                    continue;
-
-                if(s_fsize  >= V7_MAXSIZE ||
-                   s_nfree  >= V7_NICFREE ||
-                   s_ninode >= V7_NICINOD)
-                    continue;
-
-                if(s_fsize * 1024 == (partition.End - partition.Start) * imagePlugin.Info.SectorSize ||
-                   s_fsize * 512  == (partition.End - partition.Start) * imagePlugin.Info.SectorSize)
-                    return true;
+                s_nfree  = (ushort)(s_nfree  >> 8);
+                s_ninode = (ushort)(s_ninode >> 8);
             }
 
-            return false;
+            if((s_fsize  & 0xFF000000) != 0x00 ||
+               (s_nfree  & 0xFF00)     != 0x00 ||
+               (s_ninode & 0xFF00)     != 0x00)
+                continue;
+
+            if(s_fsize  >= V7_MAXSIZE ||
+               s_nfree  >= V7_NICFREE ||
+               s_ninode >= V7_NICINOD)
+                continue;
+
+            if(s_fsize * 1024 == (partition.End - partition.Start) * imagePlugin.Info.SectorSize ||
+               s_fsize * 512  == (partition.End - partition.Start) * imagePlugin.Info.SectorSize)
+                return true;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        return false;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        var    sb        = new StringBuilder();
+        bool   bigEndian = false; // Start in little endian until we know what are we handling here
+        int    start     = 0;
+        bool   xenix     = false;
+        bool   sysv      = false;
+        bool   sys7th    = false;
+        bool   coherent  = false;
+        bool   xenix3    = false;
+        byte[] sb_sector;
+        byte   sb_size_in_sectors;
+        int    offset = 0;
+
+        if(imagePlugin.Info.SectorSize <=
+           0x400) // Check if underlying device sector size is smaller than SuperBlock size
+            sb_size_in_sectors = (byte)(0x400 / imagePlugin.Info.SectorSize);
+        else
+            sb_size_in_sectors = 1; // If not a single sector can store it
+
+        // Sectors in a cylinder
+        int spc = (int)(imagePlugin.Info.Heads * imagePlugin.Info.SectorsPerTrack);
+
+        // Superblock can start on 0x000, 0x200, 0x600 and 0x800, not aligned, so we assume 16 (128 bytes/sector) sectors as a safe value
+        int[] locations =
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
 
-            var    sb        = new StringBuilder();
-            bool   bigEndian = false; // Start in little endian until we know what are we handling here
-            int    start     = 0;
-            bool   xenix     = false;
-            bool   sysv      = false;
-            bool   sys7th    = false;
-            bool   coherent  = false;
-            bool   xenix3    = false;
-            byte[] sb_sector;
-            byte   sb_size_in_sectors;
-            int    offset = 0;
+            // Superblock can also skip one cylinder (for boot)
+            spc
+        };
 
-            if(imagePlugin.Info.SectorSize <=
-               0x400) // Check if underlying device sector size is smaller than SuperBlock size
-                sb_size_in_sectors = (byte)(0x400 / imagePlugin.Info.SectorSize);
-            else
-                sb_size_in_sectors = 1; // If not a single sector can store it
+        ErrorNumber errno;
 
-            // Sectors in a cylinder
-            int spc = (int)(imagePlugin.Info.Heads * imagePlugin.Info.SectorsPerTrack);
+        foreach(int i in locations)
+        {
+            errno = imagePlugin.ReadSectors((ulong)i + partition.Start, sb_size_in_sectors, out sb_sector);
 
-            // Superblock can start on 0x000, 0x200, 0x600 and 0x800, not aligned, so we assume 16 (128 bytes/sector) sectors as a safe value
-            int[] locations =
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            uint magic = BitConverter.ToUInt32(sb_sector, 0x3F8);
+
+            if(magic == XENIX_MAGIC ||
+               magic == SYSV_MAGIC)
             {
-                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-
-                // Superblock can also skip one cylinder (for boot)
-                spc
-            };
-
-            ErrorNumber errno;
-
-            foreach(int i in locations)
-            {
-                errno = imagePlugin.ReadSectors((ulong)i + partition.Start, sb_size_in_sectors, out sb_sector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                uint magic = BitConverter.ToUInt32(sb_sector, 0x3F8);
-
-                if(magic == XENIX_MAGIC ||
-                   magic == SYSV_MAGIC)
-                {
-                    if(magic == SYSV_MAGIC)
-                    {
-                        sysv   = true;
-                        offset = 0x200;
-                    }
-                    else
-                        xenix = true;
-
-                    start = i;
-
-                    break;
-                }
-
-                if(magic == XENIX_CIGAM ||
-                   magic == SYSV_CIGAM)
-                {
-                    bigEndian = true; // Big endian
-
-                    if(magic == SYSV_CIGAM)
-                    {
-                        sysv   = true;
-                        offset = 0x200;
-                    }
-                    else
-                        xenix = true;
-
-                    start = i;
-
-                    break;
-                }
-
-                magic = BitConverter.ToUInt32(sb_sector, 0x1F0); // XENIX 3 magic location
-
-                if(magic == XENIX_MAGIC)
-                {
-                    xenix3 = true;
-                    start  = i;
-
-                    break;
-                }
-
-                if(magic == XENIX_CIGAM)
-                {
-                    bigEndian = true; // Big endian
-                    xenix3    = true;
-                    start     = i;
-
-                    break;
-                }
-
-                magic = BitConverter.ToUInt32(sb_sector, 0x1F8); // XENIX magic location
-
                 if(magic == SYSV_MAGIC)
                 {
-                    sysv  = true;
-                    start = i;
-
-                    break;
+                    sysv   = true;
+                    offset = 0x200;
                 }
+                else
+                    xenix = true;
+
+                start = i;
+
+                break;
+            }
+
+            if(magic == XENIX_CIGAM ||
+               magic == SYSV_CIGAM)
+            {
+                bigEndian = true; // Big endian
 
                 if(magic == SYSV_CIGAM)
                 {
-                    bigEndian = true; // Big endian
-                    sysv      = true;
-                    start     = i;
-
-                    break;
+                    sysv   = true;
+                    offset = 0x200;
                 }
+                else
+                    xenix = true;
 
-                byte[] coherent_string = new byte[6];
-                Array.Copy(sb_sector, 0x1E4, coherent_string, 0, 6); // Coherent UNIX s_fname location
-                string s_fname = StringHandlers.CToString(coherent_string, Encoding);
-                Array.Copy(sb_sector, 0x1EA, coherent_string, 0, 6); // Coherent UNIX s_fpack location
-                string s_fpack = StringHandlers.CToString(coherent_string, Encoding);
+                start = i;
 
-                if((s_fname == COH_FNAME && s_fpack == COH_FPACK) ||
-                   (s_fname == COH_XXXXX && s_fpack == COH_XXXXX) ||
-                   (s_fname == COH_XXXXS && s_fpack == COH_XXXXN))
-                {
-                    coherent = true;
-                    start    = i;
+                break;
+            }
 
-                    break;
-                }
+            magic = BitConverter.ToUInt32(sb_sector, 0x1F0); // XENIX 3 magic location
 
-                // Now try to identify 7th edition
-                uint   s_fsize  = BitConverter.ToUInt32(sb_sector, 0x002);
-                ushort s_nfree  = BitConverter.ToUInt16(sb_sector, 0x006);
-                ushort s_ninode = BitConverter.ToUInt16(sb_sector, 0x0D0);
-
-                if(s_fsize  <= 0          ||
-                   s_fsize  >= 0xFFFFFFFF ||
-                   s_nfree  <= 0          ||
-                   s_nfree  >= 0xFFFF     ||
-                   s_ninode <= 0          ||
-                   s_ninode >= 0xFFFF)
-                    continue;
-
-                if((s_fsize  & 0xFF) == 0x00 &&
-                   (s_nfree  & 0xFF) == 0x00 &&
-                   (s_ninode & 0xFF) == 0x00)
-                {
-                    // Byteswap
-                    s_fsize = ((s_fsize & 0xFF)       << 24) + ((s_fsize & 0xFF00) << 8) + ((s_fsize & 0xFF0000) >> 8) +
-                              ((s_fsize & 0xFF000000) >> 24);
-
-                    s_nfree  = (ushort)(s_nfree  >> 8);
-                    s_ninode = (ushort)(s_ninode >> 8);
-                }
-
-                if((s_fsize  & 0xFF000000) != 0x00 ||
-                   (s_nfree  & 0xFF00)     != 0x00 ||
-                   (s_ninode & 0xFF00)     != 0x00)
-                    continue;
-
-                if(s_fsize  >= V7_MAXSIZE ||
-                   s_nfree  >= V7_NICFREE ||
-                   s_ninode >= V7_NICINOD)
-                    continue;
-
-                if(s_fsize * 1024 != (partition.End - partition.Start) * imagePlugin.Info.SectorSize &&
-                   s_fsize * 512  != (partition.End - partition.Start) * imagePlugin.Info.SectorSize)
-                    continue;
-
-                sys7th = true;
+            if(magic == XENIX_MAGIC)
+            {
+                xenix3 = true;
                 start  = i;
 
                 break;
             }
 
-            if(!sys7th   &&
-               !sysv     &&
-               !coherent &&
-               !xenix    &&
-               !xenix3)
+            if(magic == XENIX_CIGAM)
+            {
+                bigEndian = true; // Big endian
+                xenix3    = true;
+                start     = i;
+
+                break;
+            }
+
+            magic = BitConverter.ToUInt32(sb_sector, 0x1F8); // XENIX magic location
+
+            if(magic == SYSV_MAGIC)
+            {
+                sysv  = true;
+                start = i;
+
+                break;
+            }
+
+            if(magic == SYSV_CIGAM)
+            {
+                bigEndian = true; // Big endian
+                sysv      = true;
+                start     = i;
+
+                break;
+            }
+
+            byte[] coherent_string = new byte[6];
+            Array.Copy(sb_sector, 0x1E4, coherent_string, 0, 6); // Coherent UNIX s_fname location
+            string s_fname = StringHandlers.CToString(coherent_string, Encoding);
+            Array.Copy(sb_sector, 0x1EA, coherent_string, 0, 6); // Coherent UNIX s_fpack location
+            string s_fpack = StringHandlers.CToString(coherent_string, Encoding);
+
+            if((s_fname == COH_FNAME && s_fpack == COH_FPACK) ||
+               (s_fname == COH_XXXXX && s_fpack == COH_XXXXX) ||
+               (s_fname == COH_XXXXS && s_fpack == COH_XXXXN))
+            {
+                coherent = true;
+                start    = i;
+
+                break;
+            }
+
+            // Now try to identify 7th edition
+            uint   s_fsize  = BitConverter.ToUInt32(sb_sector, 0x002);
+            ushort s_nfree  = BitConverter.ToUInt16(sb_sector, 0x006);
+            ushort s_ninode = BitConverter.ToUInt16(sb_sector, 0x0D0);
+
+            if(s_fsize  <= 0          ||
+               s_fsize  >= 0xFFFFFFFF ||
+               s_nfree  <= 0          ||
+               s_nfree  >= 0xFFFF     ||
+               s_ninode <= 0          ||
+               s_ninode >= 0xFFFF)
+                continue;
+
+            if((s_fsize  & 0xFF) == 0x00 &&
+               (s_nfree  & 0xFF) == 0x00 &&
+               (s_ninode & 0xFF) == 0x00)
+            {
+                // Byteswap
+                s_fsize = ((s_fsize & 0xFF)       << 24) + ((s_fsize & 0xFF00) << 8) + ((s_fsize & 0xFF0000) >> 8) +
+                          ((s_fsize & 0xFF000000) >> 24);
+
+                s_nfree  = (ushort)(s_nfree  >> 8);
+                s_ninode = (ushort)(s_ninode >> 8);
+            }
+
+            if((s_fsize  & 0xFF000000) != 0x00 ||
+               (s_nfree  & 0xFF00)     != 0x00 ||
+               (s_ninode & 0xFF00)     != 0x00)
+                continue;
+
+            if(s_fsize  >= V7_MAXSIZE ||
+               s_nfree  >= V7_NICFREE ||
+               s_ninode >= V7_NICINOD)
+                continue;
+
+            if(s_fsize * 1024 != (partition.End - partition.Start) * imagePlugin.Info.SectorSize &&
+               s_fsize * 512  != (partition.End - partition.Start) * imagePlugin.Info.SectorSize)
+                continue;
+
+            sys7th = true;
+            start  = i;
+
+            break;
+        }
+
+        if(!sys7th   &&
+           !sysv     &&
+           !coherent &&
+           !xenix    &&
+           !xenix3)
+            return;
+
+        XmlFsType = new FileSystemType();
+
+        if(xenix || xenix3)
+        {
+            byte[] xenix_strings = new byte[6];
+            var    xnx_sb        = new XenixSuperBlock();
+            errno = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors, out sb_sector);
+
+            if(errno != ErrorNumber.NoError)
                 return;
 
-            XmlFsType = new FileSystemType();
-
-            if(xenix || xenix3)
+            if(xenix3)
             {
-                byte[] xenix_strings = new byte[6];
-                var    xnx_sb        = new XenixSuperBlock();
-                errno = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors, out sb_sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                if(xenix3)
-                {
-                    xnx_sb.s_isize   = BitConverter.ToUInt16(sb_sector, 0x000);
-                    xnx_sb.s_fsize   = BitConverter.ToUInt32(sb_sector, 0x002);
-                    xnx_sb.s_nfree   = BitConverter.ToUInt16(sb_sector, 0x006);
-                    xnx_sb.s_ninode  = BitConverter.ToUInt16(sb_sector, 0x0D0);
-                    xnx_sb.s_flock   = sb_sector[0x19A];
-                    xnx_sb.s_ilock   = sb_sector[0x19B];
-                    xnx_sb.s_fmod    = sb_sector[0x19C];
-                    xnx_sb.s_ronly   = sb_sector[0x19D];
-                    xnx_sb.s_time    = BitConverter.ToInt32(sb_sector, 0x19E);
-                    xnx_sb.s_tfree   = BitConverter.ToUInt32(sb_sector, 0x1A2);
-                    xnx_sb.s_tinode  = BitConverter.ToUInt16(sb_sector, 0x1A6);
-                    xnx_sb.s_cylblks = BitConverter.ToUInt16(sb_sector, 0x1A8);
-                    xnx_sb.s_gapblks = BitConverter.ToUInt16(sb_sector, 0x1AA);
-                    xnx_sb.s_dinfo0  = BitConverter.ToUInt16(sb_sector, 0x1AC);
-                    xnx_sb.s_dinfo1  = BitConverter.ToUInt16(sb_sector, 0x1AE);
-                    Array.Copy(sb_sector, 0x1B0, xenix_strings, 0, 6);
-                    xnx_sb.s_fname = StringHandlers.CToString(xenix_strings, Encoding);
-                    Array.Copy(sb_sector, 0x1B6, xenix_strings, 0, 6);
-                    xnx_sb.s_fpack = StringHandlers.CToString(xenix_strings, Encoding);
-                    xnx_sb.s_clean = sb_sector[0x1BC];
-                    xnx_sb.s_magic = BitConverter.ToUInt32(sb_sector, 0x1F0);
-                    xnx_sb.s_type  = BitConverter.ToUInt32(sb_sector, 0x1F4);
-                }
-                else
-                {
-                    xnx_sb.s_isize   = BitConverter.ToUInt16(sb_sector, 0x000);
-                    xnx_sb.s_fsize   = BitConverter.ToUInt32(sb_sector, 0x002);
-                    xnx_sb.s_nfree   = BitConverter.ToUInt16(sb_sector, 0x006);
-                    xnx_sb.s_ninode  = BitConverter.ToUInt16(sb_sector, 0x198);
-                    xnx_sb.s_flock   = sb_sector[0x262];
-                    xnx_sb.s_ilock   = sb_sector[0x263];
-                    xnx_sb.s_fmod    = sb_sector[0x264];
-                    xnx_sb.s_ronly   = sb_sector[0x265];
-                    xnx_sb.s_time    = BitConverter.ToInt32(sb_sector, 0x266);
-                    xnx_sb.s_tfree   = BitConverter.ToUInt32(sb_sector, 0x26A);
-                    xnx_sb.s_tinode  = BitConverter.ToUInt16(sb_sector, 0x26E);
-                    xnx_sb.s_cylblks = BitConverter.ToUInt16(sb_sector, 0x270);
-                    xnx_sb.s_gapblks = BitConverter.ToUInt16(sb_sector, 0x272);
-                    xnx_sb.s_dinfo0  = BitConverter.ToUInt16(sb_sector, 0x274);
-                    xnx_sb.s_dinfo1  = BitConverter.ToUInt16(sb_sector, 0x276);
-                    Array.Copy(sb_sector, 0x278, xenix_strings, 0, 6);
-                    xnx_sb.s_fname = StringHandlers.CToString(xenix_strings, Encoding);
-                    Array.Copy(sb_sector, 0x27E, xenix_strings, 0, 6);
-                    xnx_sb.s_fpack = StringHandlers.CToString(xenix_strings, Encoding);
-                    xnx_sb.s_clean = sb_sector[0x284];
-                    xnx_sb.s_magic = BitConverter.ToUInt32(sb_sector, 0x3F8);
-                    xnx_sb.s_type  = BitConverter.ToUInt32(sb_sector, 0x3FC);
-                }
-
-                if(bigEndian)
-                {
-                    xnx_sb.s_isize   = Swapping.Swap(xnx_sb.s_isize);
-                    xnx_sb.s_fsize   = Swapping.Swap(xnx_sb.s_fsize);
-                    xnx_sb.s_nfree   = Swapping.Swap(xnx_sb.s_nfree);
-                    xnx_sb.s_ninode  = Swapping.Swap(xnx_sb.s_ninode);
-                    xnx_sb.s_time    = Swapping.Swap(xnx_sb.s_time);
-                    xnx_sb.s_tfree   = Swapping.Swap(xnx_sb.s_tfree);
-                    xnx_sb.s_tinode  = Swapping.Swap(xnx_sb.s_tinode);
-                    xnx_sb.s_cylblks = Swapping.Swap(xnx_sb.s_cylblks);
-                    xnx_sb.s_gapblks = Swapping.Swap(xnx_sb.s_gapblks);
-                    xnx_sb.s_dinfo0  = Swapping.Swap(xnx_sb.s_dinfo0);
-                    xnx_sb.s_dinfo1  = Swapping.Swap(xnx_sb.s_dinfo1);
-                    xnx_sb.s_magic   = Swapping.Swap(xnx_sb.s_magic);
-                    xnx_sb.s_type    = Swapping.Swap(xnx_sb.s_type);
-                }
-
-                uint bs = 512;
-                sb.AppendLine("XENIX filesystem");
-                XmlFsType.Type = "XENIX fs";
-
-                switch(xnx_sb.s_type)
-                {
-                    case 1:
-                        sb.AppendLine("512 bytes per block");
-                        XmlFsType.ClusterSize = 512;
-
-                        break;
-                    case 2:
-                        sb.AppendLine("1024 bytes per block");
-                        bs                    = 1024;
-                        XmlFsType.ClusterSize = 1024;
-
-                        break;
-                    case 3:
-                        sb.AppendLine("2048 bytes per block");
-                        bs                    = 2048;
-                        XmlFsType.ClusterSize = 2048;
-
-                        break;
-                    default:
-                        sb.AppendFormat("Unknown s_type value: 0x{0:X8}", xnx_sb.s_type).AppendLine();
-
-                        break;
-                }
-
-                if(imagePlugin.Info.SectorSize == 2336 ||
-                   imagePlugin.Info.SectorSize == 2352 ||
-                   imagePlugin.Info.SectorSize == 2448)
-                {
-                    if(bs != 2048)
-                        sb.
-                            AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
-                                         bs, 2048).AppendLine();
-                }
-                else
-                {
-                    if(bs != imagePlugin.Info.SectorSize)
-                        sb.
-                            AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
-                                         bs, imagePlugin.Info.SectorSize).AppendLine();
-                }
-
-                sb.AppendFormat("{0} zones on volume ({1} bytes)", xnx_sb.s_fsize, xnx_sb.s_fsize * bs).AppendLine();
-
-                sb.AppendFormat("{0} free zones on volume ({1} bytes)", xnx_sb.s_tfree, xnx_sb.s_tfree * bs).
-                   AppendLine();
-
-                sb.AppendFormat("{0} free blocks on list ({1} bytes)", xnx_sb.s_nfree, xnx_sb.s_nfree * bs).
-                   AppendLine();
-
-                sb.AppendFormat("{0} blocks per cylinder ({1} bytes)", xnx_sb.s_cylblks, xnx_sb.s_cylblks * bs).
-                   AppendLine();
-
-                sb.AppendFormat("{0} blocks per gap ({1} bytes)", xnx_sb.s_gapblks, xnx_sb.s_gapblks * bs).AppendLine();
-                sb.AppendFormat("First data zone: {0}", xnx_sb.s_isize).AppendLine();
-                sb.AppendFormat("{0} free inodes on volume", xnx_sb.s_tinode).AppendLine();
-                sb.AppendFormat("{0} free inodes on list", xnx_sb.s_ninode).AppendLine();
-
-                if(xnx_sb.s_flock > 0)
-                    sb.AppendLine("Free block list is locked");
-
-                if(xnx_sb.s_ilock > 0)
-                    sb.AppendLine("inode cache is locked");
-
-                if(xnx_sb.s_fmod > 0)
-                    sb.AppendLine("Superblock is being modified");
-
-                if(xnx_sb.s_ronly > 0)
-                    sb.AppendLine("Volume is mounted read-only");
-
-                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixToDateTime(xnx_sb.s_time)).
-                   AppendLine();
-
-                if(xnx_sb.s_time != 0)
-                {
-                    XmlFsType.ModificationDate          = DateHandlers.UnixToDateTime(xnx_sb.s_time);
-                    XmlFsType.ModificationDateSpecified = true;
-                }
-
-                sb.AppendFormat("Volume name: {0}", xnx_sb.s_fname).AppendLine();
-                XmlFsType.VolumeName = xnx_sb.s_fname;
-                sb.AppendFormat("Pack name: {0}", xnx_sb.s_fpack).AppendLine();
-
-                if(xnx_sb.s_clean == 0x46)
-                    sb.AppendLine("Volume is clean");
-                else
-                {
-                    sb.AppendLine("Volume is dirty");
-                    XmlFsType.Dirty = true;
-                }
+                xnx_sb.s_isize   = BitConverter.ToUInt16(sb_sector, 0x000);
+                xnx_sb.s_fsize   = BitConverter.ToUInt32(sb_sector, 0x002);
+                xnx_sb.s_nfree   = BitConverter.ToUInt16(sb_sector, 0x006);
+                xnx_sb.s_ninode  = BitConverter.ToUInt16(sb_sector, 0x0D0);
+                xnx_sb.s_flock   = sb_sector[0x19A];
+                xnx_sb.s_ilock   = sb_sector[0x19B];
+                xnx_sb.s_fmod    = sb_sector[0x19C];
+                xnx_sb.s_ronly   = sb_sector[0x19D];
+                xnx_sb.s_time    = BitConverter.ToInt32(sb_sector, 0x19E);
+                xnx_sb.s_tfree   = BitConverter.ToUInt32(sb_sector, 0x1A2);
+                xnx_sb.s_tinode  = BitConverter.ToUInt16(sb_sector, 0x1A6);
+                xnx_sb.s_cylblks = BitConverter.ToUInt16(sb_sector, 0x1A8);
+                xnx_sb.s_gapblks = BitConverter.ToUInt16(sb_sector, 0x1AA);
+                xnx_sb.s_dinfo0  = BitConverter.ToUInt16(sb_sector, 0x1AC);
+                xnx_sb.s_dinfo1  = BitConverter.ToUInt16(sb_sector, 0x1AE);
+                Array.Copy(sb_sector, 0x1B0, xenix_strings, 0, 6);
+                xnx_sb.s_fname = StringHandlers.CToString(xenix_strings, Encoding);
+                Array.Copy(sb_sector, 0x1B6, xenix_strings, 0, 6);
+                xnx_sb.s_fpack = StringHandlers.CToString(xenix_strings, Encoding);
+                xnx_sb.s_clean = sb_sector[0x1BC];
+                xnx_sb.s_magic = BitConverter.ToUInt32(sb_sector, 0x1F0);
+                xnx_sb.s_type  = BitConverter.ToUInt32(sb_sector, 0x1F4);
+            }
+            else
+            {
+                xnx_sb.s_isize   = BitConverter.ToUInt16(sb_sector, 0x000);
+                xnx_sb.s_fsize   = BitConverter.ToUInt32(sb_sector, 0x002);
+                xnx_sb.s_nfree   = BitConverter.ToUInt16(sb_sector, 0x006);
+                xnx_sb.s_ninode  = BitConverter.ToUInt16(sb_sector, 0x198);
+                xnx_sb.s_flock   = sb_sector[0x262];
+                xnx_sb.s_ilock   = sb_sector[0x263];
+                xnx_sb.s_fmod    = sb_sector[0x264];
+                xnx_sb.s_ronly   = sb_sector[0x265];
+                xnx_sb.s_time    = BitConverter.ToInt32(sb_sector, 0x266);
+                xnx_sb.s_tfree   = BitConverter.ToUInt32(sb_sector, 0x26A);
+                xnx_sb.s_tinode  = BitConverter.ToUInt16(sb_sector, 0x26E);
+                xnx_sb.s_cylblks = BitConverter.ToUInt16(sb_sector, 0x270);
+                xnx_sb.s_gapblks = BitConverter.ToUInt16(sb_sector, 0x272);
+                xnx_sb.s_dinfo0  = BitConverter.ToUInt16(sb_sector, 0x274);
+                xnx_sb.s_dinfo1  = BitConverter.ToUInt16(sb_sector, 0x276);
+                Array.Copy(sb_sector, 0x278, xenix_strings, 0, 6);
+                xnx_sb.s_fname = StringHandlers.CToString(xenix_strings, Encoding);
+                Array.Copy(sb_sector, 0x27E, xenix_strings, 0, 6);
+                xnx_sb.s_fpack = StringHandlers.CToString(xenix_strings, Encoding);
+                xnx_sb.s_clean = sb_sector[0x284];
+                xnx_sb.s_magic = BitConverter.ToUInt32(sb_sector, 0x3F8);
+                xnx_sb.s_type  = BitConverter.ToUInt32(sb_sector, 0x3FC);
             }
 
-            if(sysv)
+            if(bigEndian)
             {
-                errno = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors, out sb_sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                byte[] sysv_strings = new byte[6];
-
-                var sysv_sb = new SystemVRelease4SuperBlock
-                {
-                    s_type = BitConverter.ToUInt32(sb_sector, 0x1FC + offset)
-                };
-
-                if(bigEndian)
-                    sysv_sb.s_type = Swapping.Swap(sysv_sb.s_type);
-
-                uint bs = 512;
-
-                switch(sysv_sb.s_type)
-                {
-                    case 1:
-                        XmlFsType.ClusterSize = 512;
-
-                        break;
-                    case 2:
-                        bs                    = 1024;
-                        XmlFsType.ClusterSize = 1024;
-
-                        break;
-                    case 3:
-                        bs                    = 2048;
-                        XmlFsType.ClusterSize = 2048;
-
-                        break;
-                    default:
-                        sb.AppendFormat("Unknown s_type value: 0x{0:X8}", sysv_sb.s_type).AppendLine();
-
-                        break;
-                }
-
-                sysv_sb.s_fsize = BitConverter.ToUInt32(sb_sector, 0x002 + offset);
-
-                if(bigEndian)
-                    sysv_sb.s_fsize = Swapping.Swap(sysv_sb.s_fsize);
-
-                bool sysvr4 = sysv_sb.s_fsize * bs <= 0 || sysv_sb.s_fsize * bs != partition.Size;
-
-                if(sysvr4)
-                {
-                    sysv_sb.s_isize   = BitConverter.ToUInt16(sb_sector, 0x000 + offset);
-                    sysv_sb.s_state   = BitConverter.ToUInt32(sb_sector, 0x1F4 + offset);
-                    sysv_sb.s_magic   = BitConverter.ToUInt32(sb_sector, 0x1F8 + offset);
-                    sysv_sb.s_fsize   = BitConverter.ToUInt32(sb_sector, 0x004 + offset);
-                    sysv_sb.s_nfree   = BitConverter.ToUInt16(sb_sector, 0x008 + offset);
-                    sysv_sb.s_ninode  = BitConverter.ToUInt16(sb_sector, 0x0D4 + offset);
-                    sysv_sb.s_flock   = sb_sector[0x1A0                        + offset];
-                    sysv_sb.s_ilock   = sb_sector[0x1A1                        + offset];
-                    sysv_sb.s_fmod    = sb_sector[0x1A2                        + offset];
-                    sysv_sb.s_ronly   = sb_sector[0x1A3                        + offset];
-                    sysv_sb.s_time    = BitConverter.ToUInt32(sb_sector, 0x1A4 + offset);
-                    sysv_sb.s_cylblks = BitConverter.ToUInt16(sb_sector, 0x1A8 + offset);
-                    sysv_sb.s_gapblks = BitConverter.ToUInt16(sb_sector, 0x1AA + offset);
-                    sysv_sb.s_dinfo0  = BitConverter.ToUInt16(sb_sector, 0x1AC + offset);
-                    sysv_sb.s_dinfo1  = BitConverter.ToUInt16(sb_sector, 0x1AE + offset);
-                    sysv_sb.s_tfree   = BitConverter.ToUInt32(sb_sector, 0x1B0 + offset);
-                    sysv_sb.s_tinode  = BitConverter.ToUInt16(sb_sector, 0x1B4 + offset);
-                    Array.Copy(sb_sector, 0x1B6 + offset, sysv_strings, 0, 6);
-                    sysv_sb.s_fname = StringHandlers.CToString(sysv_strings, Encoding);
-                    Array.Copy(sb_sector, 0x1BC + offset, sysv_strings, 0, 6);
-                    sysv_sb.s_fpack = StringHandlers.CToString(sysv_strings, Encoding);
-                    sb.AppendLine("System V Release 4 filesystem");
-                    XmlFsType.Type = "SVR4 fs";
-                }
-                else
-                {
-                    sysv_sb.s_isize   = BitConverter.ToUInt16(sb_sector, 0x000 + offset);
-                    sysv_sb.s_state   = BitConverter.ToUInt32(sb_sector, 0x1F4 + offset);
-                    sysv_sb.s_magic   = BitConverter.ToUInt32(sb_sector, 0x1F8 + offset);
-                    sysv_sb.s_fsize   = BitConverter.ToUInt32(sb_sector, 0x002 + offset);
-                    sysv_sb.s_nfree   = BitConverter.ToUInt16(sb_sector, 0x006 + offset);
-                    sysv_sb.s_ninode  = BitConverter.ToUInt16(sb_sector, 0x0D0 + offset);
-                    sysv_sb.s_flock   = sb_sector[0x19A                        + offset];
-                    sysv_sb.s_ilock   = sb_sector[0x19B                        + offset];
-                    sysv_sb.s_fmod    = sb_sector[0x19C                        + offset];
-                    sysv_sb.s_ronly   = sb_sector[0x19D                        + offset];
-                    sysv_sb.s_time    = BitConverter.ToUInt32(sb_sector, 0x19E + offset);
-                    sysv_sb.s_cylblks = BitConverter.ToUInt16(sb_sector, 0x1A2 + offset);
-                    sysv_sb.s_gapblks = BitConverter.ToUInt16(sb_sector, 0x1A4 + offset);
-                    sysv_sb.s_dinfo0  = BitConverter.ToUInt16(sb_sector, 0x1A6 + offset);
-                    sysv_sb.s_dinfo1  = BitConverter.ToUInt16(sb_sector, 0x1A8 + offset);
-                    sysv_sb.s_tfree   = BitConverter.ToUInt32(sb_sector, 0x1AA + offset);
-                    sysv_sb.s_tinode  = BitConverter.ToUInt16(sb_sector, 0x1AE + offset);
-                    Array.Copy(sb_sector, 0x1B0 + offset, sysv_strings, 0, 6);
-                    sysv_sb.s_fname = StringHandlers.CToString(sysv_strings, Encoding);
-                    Array.Copy(sb_sector, 0x1B6 + offset, sysv_strings, 0, 6);
-                    sysv_sb.s_fpack = StringHandlers.CToString(sysv_strings, Encoding);
-                    sb.AppendLine("System V Release 2 filesystem");
-                    XmlFsType.Type = "SVR2 fs";
-                }
-
-                if(bigEndian)
-                {
-                    sysv_sb.s_isize   = Swapping.Swap(sysv_sb.s_isize);
-                    sysv_sb.s_state   = Swapping.Swap(sysv_sb.s_state);
-                    sysv_sb.s_magic   = Swapping.Swap(sysv_sb.s_magic);
-                    sysv_sb.s_fsize   = Swapping.Swap(sysv_sb.s_fsize);
-                    sysv_sb.s_nfree   = Swapping.Swap(sysv_sb.s_nfree);
-                    sysv_sb.s_ninode  = Swapping.Swap(sysv_sb.s_ninode);
-                    sysv_sb.s_time    = Swapping.Swap(sysv_sb.s_time);
-                    sysv_sb.s_cylblks = Swapping.Swap(sysv_sb.s_cylblks);
-                    sysv_sb.s_gapblks = Swapping.Swap(sysv_sb.s_gapblks);
-                    sysv_sb.s_dinfo0  = Swapping.Swap(sysv_sb.s_dinfo0);
-                    sysv_sb.s_dinfo1  = Swapping.Swap(sysv_sb.s_dinfo1);
-                    sysv_sb.s_tfree   = Swapping.Swap(sysv_sb.s_tfree);
-                    sysv_sb.s_tinode  = Swapping.Swap(sysv_sb.s_tinode);
-                }
-
-                sb.AppendFormat("{0} bytes per block", bs).AppendLine();
-
-                XmlFsType.Clusters = sysv_sb.s_fsize;
-                sb.AppendFormat("{0} zones on volume ({1} bytes)", sysv_sb.s_fsize, sysv_sb.s_fsize * bs).AppendLine();
-
-                sb.AppendFormat("{0} free zones on volume ({1} bytes)", sysv_sb.s_tfree, sysv_sb.s_tfree * bs).
-                   AppendLine();
-
-                sb.AppendFormat("{0} free blocks on list ({1} bytes)", sysv_sb.s_nfree, sysv_sb.s_nfree * bs).
-                   AppendLine();
-
-                sb.AppendFormat("{0} blocks per cylinder ({1} bytes)", sysv_sb.s_cylblks, sysv_sb.s_cylblks * bs).
-                   AppendLine();
-
-                sb.AppendFormat("{0} blocks per gap ({1} bytes)", sysv_sb.s_gapblks, sysv_sb.s_gapblks * bs).
-                   AppendLine();
-
-                sb.AppendFormat("First data zone: {0}", sysv_sb.s_isize).AppendLine();
-                sb.AppendFormat("{0} free inodes on volume", sysv_sb.s_tinode).AppendLine();
-                sb.AppendFormat("{0} free inodes on list", sysv_sb.s_ninode).AppendLine();
-
-                if(sysv_sb.s_flock > 0)
-                    sb.AppendLine("Free block list is locked");
-
-                if(sysv_sb.s_ilock > 0)
-                    sb.AppendLine("inode cache is locked");
-
-                if(sysv_sb.s_fmod > 0)
-                    sb.AppendLine("Superblock is being modified");
-
-                if(sysv_sb.s_ronly > 0)
-                    sb.AppendLine("Volume is mounted read-only");
-
-                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(sysv_sb.s_time)).
-                   AppendLine();
-
-                if(sysv_sb.s_time != 0)
-                {
-                    XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(sysv_sb.s_time);
-                    XmlFsType.ModificationDateSpecified = true;
-                }
-
-                sb.AppendFormat("Volume name: {0}", sysv_sb.s_fname).AppendLine();
-                XmlFsType.VolumeName = sysv_sb.s_fname;
-                sb.AppendFormat("Pack name: {0}", sysv_sb.s_fpack).AppendLine();
-
-                if(sysv_sb.s_state == 0x7C269D38 - sysv_sb.s_time)
-                    sb.AppendLine("Volume is clean");
-                else
-                {
-                    sb.AppendLine("Volume is dirty");
-                    XmlFsType.Dirty = true;
-                }
+                xnx_sb.s_isize   = Swapping.Swap(xnx_sb.s_isize);
+                xnx_sb.s_fsize   = Swapping.Swap(xnx_sb.s_fsize);
+                xnx_sb.s_nfree   = Swapping.Swap(xnx_sb.s_nfree);
+                xnx_sb.s_ninode  = Swapping.Swap(xnx_sb.s_ninode);
+                xnx_sb.s_time    = Swapping.Swap(xnx_sb.s_time);
+                xnx_sb.s_tfree   = Swapping.Swap(xnx_sb.s_tfree);
+                xnx_sb.s_tinode  = Swapping.Swap(xnx_sb.s_tinode);
+                xnx_sb.s_cylblks = Swapping.Swap(xnx_sb.s_cylblks);
+                xnx_sb.s_gapblks = Swapping.Swap(xnx_sb.s_gapblks);
+                xnx_sb.s_dinfo0  = Swapping.Swap(xnx_sb.s_dinfo0);
+                xnx_sb.s_dinfo1  = Swapping.Swap(xnx_sb.s_dinfo1);
+                xnx_sb.s_magic   = Swapping.Swap(xnx_sb.s_magic);
+                xnx_sb.s_type    = Swapping.Swap(xnx_sb.s_type);
             }
 
-            if(coherent)
+            uint bs = 512;
+            sb.AppendLine("XENIX filesystem");
+            XmlFsType.Type = "XENIX fs";
+
+            switch(xnx_sb.s_type)
             {
-                errno = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors, out sb_sector);
+                case 1:
+                    sb.AppendLine("512 bytes per block");
+                    XmlFsType.ClusterSize = 512;
 
-                if(errno != ErrorNumber.NoError)
-                    return;
+                    break;
+                case 2:
+                    sb.AppendLine("1024 bytes per block");
+                    bs                    = 1024;
+                    XmlFsType.ClusterSize = 1024;
 
-                var    coh_sb      = new CoherentSuperBlock();
-                byte[] coh_strings = new byte[6];
+                    break;
+                case 3:
+                    sb.AppendLine("2048 bytes per block");
+                    bs                    = 2048;
+                    XmlFsType.ClusterSize = 2048;
 
-                coh_sb.s_isize  = BitConverter.ToUInt16(sb_sector, 0x000);
-                coh_sb.s_fsize  = Swapping.PDPFromLittleEndian(BitConverter.ToUInt32(sb_sector, 0x002));
-                coh_sb.s_nfree  = BitConverter.ToUInt16(sb_sector, 0x006);
-                coh_sb.s_ninode = BitConverter.ToUInt16(sb_sector, 0x108);
-                coh_sb.s_flock  = sb_sector[0x1D2];
-                coh_sb.s_ilock  = sb_sector[0x1D3];
-                coh_sb.s_fmod   = sb_sector[0x1D4];
-                coh_sb.s_ronly  = sb_sector[0x1D5];
-                coh_sb.s_time   = Swapping.PDPFromLittleEndian(BitConverter.ToUInt32(sb_sector, 0x1D6));
-                coh_sb.s_tfree  = Swapping.PDPFromLittleEndian(BitConverter.ToUInt32(sb_sector, 0x1DA));
-                coh_sb.s_tinode = BitConverter.ToUInt16(sb_sector, 0x1DE);
-                coh_sb.s_int_m  = BitConverter.ToUInt16(sb_sector, 0x1E0);
-                coh_sb.s_int_n  = BitConverter.ToUInt16(sb_sector, 0x1E2);
-                Array.Copy(sb_sector, 0x1E4, coh_strings, 0, 6);
-                coh_sb.s_fname = StringHandlers.CToString(coh_strings, Encoding);
-                Array.Copy(sb_sector, 0x1EA, coh_strings, 0, 6);
-                coh_sb.s_fpack = StringHandlers.CToString(coh_strings, Encoding);
+                    break;
+                default:
+                    sb.AppendFormat("Unknown s_type value: 0x{0:X8}", xnx_sb.s_type).AppendLine();
 
-                XmlFsType.Type        = "Coherent fs";
-                XmlFsType.ClusterSize = 512;
-                XmlFsType.Clusters    = coh_sb.s_fsize;
+                    break;
+            }
 
-                sb.AppendLine("Coherent UNIX filesystem");
-
-                if(imagePlugin.Info.SectorSize != 512)
+            if(imagePlugin.Info.SectorSize == 2336 ||
+               imagePlugin.Info.SectorSize == 2352 ||
+               imagePlugin.Info.SectorSize == 2448)
+            {
+                if(bs != 2048)
                     sb.
                         AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
-                                     512, 2048).AppendLine();
-
-                sb.AppendFormat("{0} zones on volume ({1} bytes)", coh_sb.s_fsize, coh_sb.s_fsize * 512).AppendLine();
-
-                sb.AppendFormat("{0} free zones on volume ({1} bytes)", coh_sb.s_tfree, coh_sb.s_tfree * 512).
-                   AppendLine();
-
-                sb.AppendFormat("{0} free blocks on list ({1} bytes)", coh_sb.s_nfree, coh_sb.s_nfree * 512).
-                   AppendLine();
-
-                sb.AppendFormat("First data zone: {0}", coh_sb.s_isize).AppendLine();
-                sb.AppendFormat("{0} free inodes on volume", coh_sb.s_tinode).AppendLine();
-                sb.AppendFormat("{0} free inodes on list", coh_sb.s_ninode).AppendLine();
-
-                if(coh_sb.s_flock > 0)
-                    sb.AppendLine("Free block list is locked");
-
-                if(coh_sb.s_ilock > 0)
-                    sb.AppendLine("inode cache is locked");
-
-                if(coh_sb.s_fmod > 0)
-                    sb.AppendLine("Superblock is being modified");
-
-                if(coh_sb.s_ronly > 0)
-                    sb.AppendLine("Volume is mounted read-only");
-
-                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(coh_sb.s_time)).
-                   AppendLine();
-
-                if(coh_sb.s_time != 0)
-                {
-                    XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(coh_sb.s_time);
-                    XmlFsType.ModificationDateSpecified = true;
-                }
-
-                sb.AppendFormat("Volume name: {0}", coh_sb.s_fname).AppendLine();
-                XmlFsType.VolumeName = coh_sb.s_fname;
-                sb.AppendFormat("Pack name: {0}", coh_sb.s_fpack).AppendLine();
+                                     bs, 2048).AppendLine();
             }
-
-            if(sys7th)
+            else
             {
-                errno = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors, out sb_sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                var    v7_sb        = new UNIX7thEditionSuperBlock();
-                byte[] sys7_strings = new byte[6];
-
-                v7_sb.s_isize  = BitConverter.ToUInt16(sb_sector, 0x000);
-                v7_sb.s_fsize  = BitConverter.ToUInt32(sb_sector, 0x002);
-                v7_sb.s_nfree  = BitConverter.ToUInt16(sb_sector, 0x006);
-                v7_sb.s_ninode = BitConverter.ToUInt16(sb_sector, 0x0D0);
-                v7_sb.s_flock  = sb_sector[0x19A];
-                v7_sb.s_ilock  = sb_sector[0x19B];
-                v7_sb.s_fmod   = sb_sector[0x19C];
-                v7_sb.s_ronly  = sb_sector[0x19D];
-                v7_sb.s_time   = BitConverter.ToUInt32(sb_sector, 0x19E);
-                v7_sb.s_tfree  = BitConverter.ToUInt32(sb_sector, 0x1A2);
-                v7_sb.s_tinode = BitConverter.ToUInt16(sb_sector, 0x1A6);
-                v7_sb.s_int_m  = BitConverter.ToUInt16(sb_sector, 0x1A8);
-                v7_sb.s_int_n  = BitConverter.ToUInt16(sb_sector, 0x1AA);
-                Array.Copy(sb_sector, 0x1AC, sys7_strings, 0, 6);
-                v7_sb.s_fname = StringHandlers.CToString(sys7_strings, Encoding);
-                Array.Copy(sb_sector, 0x1B2, sys7_strings, 0, 6);
-                v7_sb.s_fpack = StringHandlers.CToString(sys7_strings, Encoding);
-
-                XmlFsType.Type        = "UNIX 7th Edition fs";
-                XmlFsType.ClusterSize = 512;
-                XmlFsType.Clusters    = v7_sb.s_fsize;
-                sb.AppendLine("UNIX 7th Edition filesystem");
-
-                if(imagePlugin.Info.SectorSize != 512)
+                if(bs != imagePlugin.Info.SectorSize)
                     sb.
                         AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
-                                     512, 2048).AppendLine();
-
-                sb.AppendFormat("{0} zones on volume ({1} bytes)", v7_sb.s_fsize, v7_sb.s_fsize * 512).AppendLine();
-
-                sb.AppendFormat("{0} free zones on volume ({1} bytes)", v7_sb.s_tfree, v7_sb.s_tfree * 512).
-                   AppendLine();
-
-                sb.AppendFormat("{0} free blocks on list ({1} bytes)", v7_sb.s_nfree, v7_sb.s_nfree * 512).AppendLine();
-                sb.AppendFormat("First data zone: {0}", v7_sb.s_isize).AppendLine();
-                sb.AppendFormat("{0} free inodes on volume", v7_sb.s_tinode).AppendLine();
-                sb.AppendFormat("{0} free inodes on list", v7_sb.s_ninode).AppendLine();
-
-                if(v7_sb.s_flock > 0)
-                    sb.AppendLine("Free block list is locked");
-
-                if(v7_sb.s_ilock > 0)
-                    sb.AppendLine("inode cache is locked");
-
-                if(v7_sb.s_fmod > 0)
-                    sb.AppendLine("Superblock is being modified");
-
-                if(v7_sb.s_ronly > 0)
-                    sb.AppendLine("Volume is mounted read-only");
-
-                sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(v7_sb.s_time)).
-                   AppendLine();
-
-                if(v7_sb.s_time != 0)
-                {
-                    XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(v7_sb.s_time);
-                    XmlFsType.ModificationDateSpecified = true;
-                }
-
-                sb.AppendFormat("Volume name: {0}", v7_sb.s_fname).AppendLine();
-                XmlFsType.VolumeName = v7_sb.s_fname;
-                sb.AppendFormat("Pack name: {0}", v7_sb.s_fpack).AppendLine();
+                                     bs, imagePlugin.Info.SectorSize).AppendLine();
             }
 
-            information = sb.ToString();
+            sb.AppendFormat("{0} zones on volume ({1} bytes)", xnx_sb.s_fsize, xnx_sb.s_fsize * bs).AppendLine();
+
+            sb.AppendFormat("{0} free zones on volume ({1} bytes)", xnx_sb.s_tfree, xnx_sb.s_tfree * bs).
+               AppendLine();
+
+            sb.AppendFormat("{0} free blocks on list ({1} bytes)", xnx_sb.s_nfree, xnx_sb.s_nfree * bs).
+               AppendLine();
+
+            sb.AppendFormat("{0} blocks per cylinder ({1} bytes)", xnx_sb.s_cylblks, xnx_sb.s_cylblks * bs).
+               AppendLine();
+
+            sb.AppendFormat("{0} blocks per gap ({1} bytes)", xnx_sb.s_gapblks, xnx_sb.s_gapblks * bs).AppendLine();
+            sb.AppendFormat("First data zone: {0}", xnx_sb.s_isize).AppendLine();
+            sb.AppendFormat("{0} free inodes on volume", xnx_sb.s_tinode).AppendLine();
+            sb.AppendFormat("{0} free inodes on list", xnx_sb.s_ninode).AppendLine();
+
+            if(xnx_sb.s_flock > 0)
+                sb.AppendLine("Free block list is locked");
+
+            if(xnx_sb.s_ilock > 0)
+                sb.AppendLine("inode cache is locked");
+
+            if(xnx_sb.s_fmod > 0)
+                sb.AppendLine("Superblock is being modified");
+
+            if(xnx_sb.s_ronly > 0)
+                sb.AppendLine("Volume is mounted read-only");
+
+            sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixToDateTime(xnx_sb.s_time)).
+               AppendLine();
+
+            if(xnx_sb.s_time != 0)
+            {
+                XmlFsType.ModificationDate          = DateHandlers.UnixToDateTime(xnx_sb.s_time);
+                XmlFsType.ModificationDateSpecified = true;
+            }
+
+            sb.AppendFormat("Volume name: {0}", xnx_sb.s_fname).AppendLine();
+            XmlFsType.VolumeName = xnx_sb.s_fname;
+            sb.AppendFormat("Pack name: {0}", xnx_sb.s_fpack).AppendLine();
+
+            if(xnx_sb.s_clean == 0x46)
+                sb.AppendLine("Volume is clean");
+            else
+            {
+                sb.AppendLine("Volume is dirty");
+                XmlFsType.Dirty = true;
+            }
         }
 
-        // Old XENIX use different offsets
-        struct XenixSuperBlock
+        if(sysv)
         {
-            /// <summary>0x000, index of first data zone</summary>
-            public ushort s_isize;
-            /// <summary>0x002, total number of zones of this volume</summary>
-            public uint s_fsize;
+            errno = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors, out sb_sector);
 
-            // the start of the free block list:
-            /// <summary>0x006, blocks in s_free, &lt;=100</summary>
-            public ushort s_nfree;
-            /// <summary>0x008, 100 entries, 50 entries for Xenix 3, first free block list chunk</summary>
-            public uint[] s_free;
+            if(errno != ErrorNumber.NoError)
+                return;
 
-            // the cache of free inodes:
-            /// <summary>0x198 (0xD0), number of inodes in s_inode, &lt;= 100</summary>
-            public ushort s_ninode;
-            /// <summary>0x19A (0xD2), 100 entries, some free inodes</summary>
-            public ushort[] s_inode;
-            /// <summary>0x262 (0x19A), free block list manipulation lock</summary>
-            public byte s_flock;
-            /// <summary>0x263 (0x19B), inode cache manipulation lock</summary>
-            public byte s_ilock;
-            /// <summary>0x264 (0x19C), superblock modification flag</summary>
-            public byte s_fmod;
-            /// <summary>0x265 (0x19D), read-only mounted flag</summary>
-            public byte s_ronly;
-            /// <summary>0x266 (0x19E), time of last superblock update</summary>
-            public int s_time;
-            /// <summary>0x26A (0x1A2), total number of free zones</summary>
-            public uint s_tfree;
-            /// <summary>0x26E (0x1A6), total number of free inodes</summary>
-            public ushort s_tinode;
-            /// <summary>0x270 (0x1A8), blocks per cylinder</summary>
-            public ushort s_cylblks;
-            /// <summary>0x272 (0x1AA), blocks per gap</summary>
-            public ushort s_gapblks;
-            /// <summary>0x274 (0x1AC), device information ??</summary>
-            public ushort s_dinfo0;
-            /// <summary>0x276 (0x1AE), device information ??</summary>
-            public ushort s_dinfo1;
-            /// <summary>0x278 (0x1B0), 6 bytes, volume name</summary>
-            public string s_fname;
-            /// <summary>0x27E (0x1B6), 6 bytes, pack name</summary>
-            public string s_fpack;
-            /// <summary>0x284 (0x1BC), 0x46 if volume is clean</summary>
-            public byte s_clean;
-            /// <summary>0x285 (0x1BD), 371 bytes, 51 bytes for Xenix 3</summary>
-            public byte[] s_fill;
-            /// <summary>0x3F8 (0x1F0), magic</summary>
-            public uint s_magic;
-            /// <summary>0x3FC (0x1F4), filesystem type (1 = 512 bytes/blk, 2 = 1024 bytes/blk, 3 = 2048 bytes/blk)</summary>
-            public uint s_type;
+            byte[] sysv_strings = new byte[6];
+
+            var sysv_sb = new SystemVRelease4SuperBlock
+            {
+                s_type = BitConverter.ToUInt32(sb_sector, 0x1FC + offset)
+            };
+
+            if(bigEndian)
+                sysv_sb.s_type = Swapping.Swap(sysv_sb.s_type);
+
+            uint bs = 512;
+
+            switch(sysv_sb.s_type)
+            {
+                case 1:
+                    XmlFsType.ClusterSize = 512;
+
+                    break;
+                case 2:
+                    bs                    = 1024;
+                    XmlFsType.ClusterSize = 1024;
+
+                    break;
+                case 3:
+                    bs                    = 2048;
+                    XmlFsType.ClusterSize = 2048;
+
+                    break;
+                default:
+                    sb.AppendFormat("Unknown s_type value: 0x{0:X8}", sysv_sb.s_type).AppendLine();
+
+                    break;
+            }
+
+            sysv_sb.s_fsize = BitConverter.ToUInt32(sb_sector, 0x002 + offset);
+
+            if(bigEndian)
+                sysv_sb.s_fsize = Swapping.Swap(sysv_sb.s_fsize);
+
+            bool sysvr4 = sysv_sb.s_fsize * bs <= 0 || sysv_sb.s_fsize * bs != partition.Size;
+
+            if(sysvr4)
+            {
+                sysv_sb.s_isize   = BitConverter.ToUInt16(sb_sector, 0x000 + offset);
+                sysv_sb.s_state   = BitConverter.ToUInt32(sb_sector, 0x1F4 + offset);
+                sysv_sb.s_magic   = BitConverter.ToUInt32(sb_sector, 0x1F8 + offset);
+                sysv_sb.s_fsize   = BitConverter.ToUInt32(sb_sector, 0x004 + offset);
+                sysv_sb.s_nfree   = BitConverter.ToUInt16(sb_sector, 0x008 + offset);
+                sysv_sb.s_ninode  = BitConverter.ToUInt16(sb_sector, 0x0D4 + offset);
+                sysv_sb.s_flock   = sb_sector[0x1A0                        + offset];
+                sysv_sb.s_ilock   = sb_sector[0x1A1                        + offset];
+                sysv_sb.s_fmod    = sb_sector[0x1A2                        + offset];
+                sysv_sb.s_ronly   = sb_sector[0x1A3                        + offset];
+                sysv_sb.s_time    = BitConverter.ToUInt32(sb_sector, 0x1A4 + offset);
+                sysv_sb.s_cylblks = BitConverter.ToUInt16(sb_sector, 0x1A8 + offset);
+                sysv_sb.s_gapblks = BitConverter.ToUInt16(sb_sector, 0x1AA + offset);
+                sysv_sb.s_dinfo0  = BitConverter.ToUInt16(sb_sector, 0x1AC + offset);
+                sysv_sb.s_dinfo1  = BitConverter.ToUInt16(sb_sector, 0x1AE + offset);
+                sysv_sb.s_tfree   = BitConverter.ToUInt32(sb_sector, 0x1B0 + offset);
+                sysv_sb.s_tinode  = BitConverter.ToUInt16(sb_sector, 0x1B4 + offset);
+                Array.Copy(sb_sector, 0x1B6 + offset, sysv_strings, 0, 6);
+                sysv_sb.s_fname = StringHandlers.CToString(sysv_strings, Encoding);
+                Array.Copy(sb_sector, 0x1BC + offset, sysv_strings, 0, 6);
+                sysv_sb.s_fpack = StringHandlers.CToString(sysv_strings, Encoding);
+                sb.AppendLine("System V Release 4 filesystem");
+                XmlFsType.Type = "SVR4 fs";
+            }
+            else
+            {
+                sysv_sb.s_isize   = BitConverter.ToUInt16(sb_sector, 0x000 + offset);
+                sysv_sb.s_state   = BitConverter.ToUInt32(sb_sector, 0x1F4 + offset);
+                sysv_sb.s_magic   = BitConverter.ToUInt32(sb_sector, 0x1F8 + offset);
+                sysv_sb.s_fsize   = BitConverter.ToUInt32(sb_sector, 0x002 + offset);
+                sysv_sb.s_nfree   = BitConverter.ToUInt16(sb_sector, 0x006 + offset);
+                sysv_sb.s_ninode  = BitConverter.ToUInt16(sb_sector, 0x0D0 + offset);
+                sysv_sb.s_flock   = sb_sector[0x19A                        + offset];
+                sysv_sb.s_ilock   = sb_sector[0x19B                        + offset];
+                sysv_sb.s_fmod    = sb_sector[0x19C                        + offset];
+                sysv_sb.s_ronly   = sb_sector[0x19D                        + offset];
+                sysv_sb.s_time    = BitConverter.ToUInt32(sb_sector, 0x19E + offset);
+                sysv_sb.s_cylblks = BitConverter.ToUInt16(sb_sector, 0x1A2 + offset);
+                sysv_sb.s_gapblks = BitConverter.ToUInt16(sb_sector, 0x1A4 + offset);
+                sysv_sb.s_dinfo0  = BitConverter.ToUInt16(sb_sector, 0x1A6 + offset);
+                sysv_sb.s_dinfo1  = BitConverter.ToUInt16(sb_sector, 0x1A8 + offset);
+                sysv_sb.s_tfree   = BitConverter.ToUInt32(sb_sector, 0x1AA + offset);
+                sysv_sb.s_tinode  = BitConverter.ToUInt16(sb_sector, 0x1AE + offset);
+                Array.Copy(sb_sector, 0x1B0 + offset, sysv_strings, 0, 6);
+                sysv_sb.s_fname = StringHandlers.CToString(sysv_strings, Encoding);
+                Array.Copy(sb_sector, 0x1B6 + offset, sysv_strings, 0, 6);
+                sysv_sb.s_fpack = StringHandlers.CToString(sysv_strings, Encoding);
+                sb.AppendLine("System V Release 2 filesystem");
+                XmlFsType.Type = "SVR2 fs";
+            }
+
+            if(bigEndian)
+            {
+                sysv_sb.s_isize   = Swapping.Swap(sysv_sb.s_isize);
+                sysv_sb.s_state   = Swapping.Swap(sysv_sb.s_state);
+                sysv_sb.s_magic   = Swapping.Swap(sysv_sb.s_magic);
+                sysv_sb.s_fsize   = Swapping.Swap(sysv_sb.s_fsize);
+                sysv_sb.s_nfree   = Swapping.Swap(sysv_sb.s_nfree);
+                sysv_sb.s_ninode  = Swapping.Swap(sysv_sb.s_ninode);
+                sysv_sb.s_time    = Swapping.Swap(sysv_sb.s_time);
+                sysv_sb.s_cylblks = Swapping.Swap(sysv_sb.s_cylblks);
+                sysv_sb.s_gapblks = Swapping.Swap(sysv_sb.s_gapblks);
+                sysv_sb.s_dinfo0  = Swapping.Swap(sysv_sb.s_dinfo0);
+                sysv_sb.s_dinfo1  = Swapping.Swap(sysv_sb.s_dinfo1);
+                sysv_sb.s_tfree   = Swapping.Swap(sysv_sb.s_tfree);
+                sysv_sb.s_tinode  = Swapping.Swap(sysv_sb.s_tinode);
+            }
+
+            sb.AppendFormat("{0} bytes per block", bs).AppendLine();
+
+            XmlFsType.Clusters = sysv_sb.s_fsize;
+            sb.AppendFormat("{0} zones on volume ({1} bytes)", sysv_sb.s_fsize, sysv_sb.s_fsize * bs).AppendLine();
+
+            sb.AppendFormat("{0} free zones on volume ({1} bytes)", sysv_sb.s_tfree, sysv_sb.s_tfree * bs).
+               AppendLine();
+
+            sb.AppendFormat("{0} free blocks on list ({1} bytes)", sysv_sb.s_nfree, sysv_sb.s_nfree * bs).
+               AppendLine();
+
+            sb.AppendFormat("{0} blocks per cylinder ({1} bytes)", sysv_sb.s_cylblks, sysv_sb.s_cylblks * bs).
+               AppendLine();
+
+            sb.AppendFormat("{0} blocks per gap ({1} bytes)", sysv_sb.s_gapblks, sysv_sb.s_gapblks * bs).
+               AppendLine();
+
+            sb.AppendFormat("First data zone: {0}", sysv_sb.s_isize).AppendLine();
+            sb.AppendFormat("{0} free inodes on volume", sysv_sb.s_tinode).AppendLine();
+            sb.AppendFormat("{0} free inodes on list", sysv_sb.s_ninode).AppendLine();
+
+            if(sysv_sb.s_flock > 0)
+                sb.AppendLine("Free block list is locked");
+
+            if(sysv_sb.s_ilock > 0)
+                sb.AppendLine("inode cache is locked");
+
+            if(sysv_sb.s_fmod > 0)
+                sb.AppendLine("Superblock is being modified");
+
+            if(sysv_sb.s_ronly > 0)
+                sb.AppendLine("Volume is mounted read-only");
+
+            sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(sysv_sb.s_time)).
+               AppendLine();
+
+            if(sysv_sb.s_time != 0)
+            {
+                XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(sysv_sb.s_time);
+                XmlFsType.ModificationDateSpecified = true;
+            }
+
+            sb.AppendFormat("Volume name: {0}", sysv_sb.s_fname).AppendLine();
+            XmlFsType.VolumeName = sysv_sb.s_fname;
+            sb.AppendFormat("Pack name: {0}", sysv_sb.s_fpack).AppendLine();
+
+            if(sysv_sb.s_state == 0x7C269D38 - sysv_sb.s_time)
+                sb.AppendLine("Volume is clean");
+            else
+            {
+                sb.AppendLine("Volume is dirty");
+                XmlFsType.Dirty = true;
+            }
         }
 
-        struct SystemVRelease4SuperBlock
+        if(coherent)
         {
-            /// <summary>0x000, index of first data zone</summary>
-            public ushort s_isize;
-            /// <summary>0x002, padding</summary>
-            public ushort s_pad0;
-            /// <summary>0x004, total number of zones of this volume</summary>
-            public uint s_fsize;
+            errno = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors, out sb_sector);
 
-            // the start of the free block list:
-            /// <summary>0x008, blocks in s_free, &lt;=100</summary>
-            public ushort s_nfree;
-            /// <summary>0x00A, padding</summary>
-            public ushort s_pad1;
-            /// <summary>0x00C, 50 entries, first free block list chunk</summary>
-            public uint[] s_free;
+            if(errno != ErrorNumber.NoError)
+                return;
 
-            // the cache of free inodes:
-            /// <summary>0x0D4, number of inodes in s_inode, &lt;= 100</summary>
-            public ushort s_ninode;
-            /// <summary>0x0D6, padding</summary>
-            public ushort s_pad2;
-            /// <summary>0x0D8, 100 entries, some free inodes</summary>
-            public ushort[] s_inode;
-            /// <summary>0x1A0, free block list manipulation lock</summary>
-            public byte s_flock;
-            /// <summary>0x1A1, inode cache manipulation lock</summary>
-            public byte s_ilock;
-            /// <summary>0x1A2, superblock modification flag</summary>
-            public byte s_fmod;
-            /// <summary>0x1A3, read-only mounted flag</summary>
-            public byte s_ronly;
-            /// <summary>0x1A4, time of last superblock update</summary>
-            public uint s_time;
-            /// <summary>0x1A8, blocks per cylinder</summary>
-            public ushort s_cylblks;
-            /// <summary>0x1AA, blocks per gap</summary>
-            public ushort s_gapblks;
-            /// <summary>0x1AC, device information ??</summary>
-            public ushort s_dinfo0;
-            /// <summary>0x1AE, device information ??</summary>
-            public ushort s_dinfo1;
-            /// <summary>0x1B0, total number of free zones</summary>
-            public uint s_tfree;
-            /// <summary>0x1B4, total number of free inodes</summary>
-            public ushort s_tinode;
-            /// <summary>0x1B6, padding</summary>
-            public ushort s_pad3;
-            /// <summary>0x1B8, 6 bytes, volume name</summary>
-            public string s_fname;
-            /// <summary>0x1BE, 6 bytes, pack name</summary>
-            public string s_fpack;
-            /// <summary>0x1C4, 48 bytes</summary>
-            public byte[] s_fill;
-            /// <summary>0x1F4, if s_state == (0x7C269D38 - s_time) then filesystem is clean</summary>
-            public uint s_state;
-            /// <summary>0x1F8, magic</summary>
-            public uint s_magic;
-            /// <summary>0x1FC, filesystem type (1 = 512 bytes/blk, 2 = 1024 bytes/blk)</summary>
-            public uint s_type;
+            var    coh_sb      = new CoherentSuperBlock();
+            byte[] coh_strings = new byte[6];
+
+            coh_sb.s_isize  = BitConverter.ToUInt16(sb_sector, 0x000);
+            coh_sb.s_fsize  = Swapping.PDPFromLittleEndian(BitConverter.ToUInt32(sb_sector, 0x002));
+            coh_sb.s_nfree  = BitConverter.ToUInt16(sb_sector, 0x006);
+            coh_sb.s_ninode = BitConverter.ToUInt16(sb_sector, 0x108);
+            coh_sb.s_flock  = sb_sector[0x1D2];
+            coh_sb.s_ilock  = sb_sector[0x1D3];
+            coh_sb.s_fmod   = sb_sector[0x1D4];
+            coh_sb.s_ronly  = sb_sector[0x1D5];
+            coh_sb.s_time   = Swapping.PDPFromLittleEndian(BitConverter.ToUInt32(sb_sector, 0x1D6));
+            coh_sb.s_tfree  = Swapping.PDPFromLittleEndian(BitConverter.ToUInt32(sb_sector, 0x1DA));
+            coh_sb.s_tinode = BitConverter.ToUInt16(sb_sector, 0x1DE);
+            coh_sb.s_int_m  = BitConverter.ToUInt16(sb_sector, 0x1E0);
+            coh_sb.s_int_n  = BitConverter.ToUInt16(sb_sector, 0x1E2);
+            Array.Copy(sb_sector, 0x1E4, coh_strings, 0, 6);
+            coh_sb.s_fname = StringHandlers.CToString(coh_strings, Encoding);
+            Array.Copy(sb_sector, 0x1EA, coh_strings, 0, 6);
+            coh_sb.s_fpack = StringHandlers.CToString(coh_strings, Encoding);
+
+            XmlFsType.Type        = "Coherent fs";
+            XmlFsType.ClusterSize = 512;
+            XmlFsType.Clusters    = coh_sb.s_fsize;
+
+            sb.AppendLine("Coherent UNIX filesystem");
+
+            if(imagePlugin.Info.SectorSize != 512)
+                sb.
+                    AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
+                                 512, 2048).AppendLine();
+
+            sb.AppendFormat("{0} zones on volume ({1} bytes)", coh_sb.s_fsize, coh_sb.s_fsize * 512).AppendLine();
+
+            sb.AppendFormat("{0} free zones on volume ({1} bytes)", coh_sb.s_tfree, coh_sb.s_tfree * 512).
+               AppendLine();
+
+            sb.AppendFormat("{0} free blocks on list ({1} bytes)", coh_sb.s_nfree, coh_sb.s_nfree * 512).
+               AppendLine();
+
+            sb.AppendFormat("First data zone: {0}", coh_sb.s_isize).AppendLine();
+            sb.AppendFormat("{0} free inodes on volume", coh_sb.s_tinode).AppendLine();
+            sb.AppendFormat("{0} free inodes on list", coh_sb.s_ninode).AppendLine();
+
+            if(coh_sb.s_flock > 0)
+                sb.AppendLine("Free block list is locked");
+
+            if(coh_sb.s_ilock > 0)
+                sb.AppendLine("inode cache is locked");
+
+            if(coh_sb.s_fmod > 0)
+                sb.AppendLine("Superblock is being modified");
+
+            if(coh_sb.s_ronly > 0)
+                sb.AppendLine("Volume is mounted read-only");
+
+            sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(coh_sb.s_time)).
+               AppendLine();
+
+            if(coh_sb.s_time != 0)
+            {
+                XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(coh_sb.s_time);
+                XmlFsType.ModificationDateSpecified = true;
+            }
+
+            sb.AppendFormat("Volume name: {0}", coh_sb.s_fname).AppendLine();
+            XmlFsType.VolumeName = coh_sb.s_fname;
+            sb.AppendFormat("Pack name: {0}", coh_sb.s_fpack).AppendLine();
         }
 
-        struct SystemVRelease2SuperBlock
+        if(sys7th)
         {
-            /// <summary>0x000, index of first data zone</summary>
-            public ushort s_isize;
-            /// <summary>0x002, total number of zones of this volume</summary>
-            public uint s_fsize;
+            errno = imagePlugin.ReadSectors((ulong)start + partition.Start, sb_size_in_sectors, out sb_sector);
 
-            // the start of the free block list:
-            /// <summary>0x006, blocks in s_free, &lt;=100</summary>
-            public ushort s_nfree;
-            /// <summary>0x008, 50 entries, first free block list chunk</summary>
-            public uint[] s_free;
+            if(errno != ErrorNumber.NoError)
+                return;
 
-            // the cache of free inodes:
-            /// <summary>0x0D0, number of inodes in s_inode, &lt;= 100</summary>
-            public ushort s_ninode;
-            /// <summary>0x0D2, 100 entries, some free inodes</summary>
-            public ushort[] s_inode;
-            /// <summary>0x19A, free block list manipulation lock</summary>
-            public byte s_flock;
-            /// <summary>0x19B, inode cache manipulation lock</summary>
-            public byte s_ilock;
-            /// <summary>0x19C, superblock modification flag</summary>
-            public byte s_fmod;
-            /// <summary>0x19D, read-only mounted flag</summary>
-            public byte s_ronly;
-            /// <summary>0x19E, time of last superblock update</summary>
-            public uint s_time;
-            /// <summary>0x1A2, blocks per cylinder</summary>
-            public ushort s_cylblks;
-            /// <summary>0x1A4, blocks per gap</summary>
-            public ushort s_gapblks;
-            /// <summary>0x1A6, device information ??</summary>
-            public ushort s_dinfo0;
-            /// <summary>0x1A8, device information ??</summary>
-            public ushort s_dinfo1;
-            /// <summary>0x1AA, total number of free zones</summary>
-            public uint s_tfree;
-            /// <summary>0x1AE, total number of free inodes</summary>
-            public ushort s_tinode;
-            /// <summary>0x1B0, 6 bytes, volume name</summary>
-            public string s_fname;
-            /// <summary>0x1B6, 6 bytes, pack name</summary>
-            public string s_fpack;
-            /// <summary>0x1BC, 56 bytes</summary>
-            public byte[] s_fill;
-            /// <summary>0x1F4, if s_state == (0x7C269D38 - s_time) then filesystem is clean</summary>
-            public uint s_state;
-            /// <summary>0x1F8, magic</summary>
-            public uint s_magic;
-            /// <summary>0x1FC, filesystem type (1 = 512 bytes/blk, 2 = 1024 bytes/blk)</summary>
-            public uint s_type;
+            var    v7_sb        = new UNIX7thEditionSuperBlock();
+            byte[] sys7_strings = new byte[6];
+
+            v7_sb.s_isize  = BitConverter.ToUInt16(sb_sector, 0x000);
+            v7_sb.s_fsize  = BitConverter.ToUInt32(sb_sector, 0x002);
+            v7_sb.s_nfree  = BitConverter.ToUInt16(sb_sector, 0x006);
+            v7_sb.s_ninode = BitConverter.ToUInt16(sb_sector, 0x0D0);
+            v7_sb.s_flock  = sb_sector[0x19A];
+            v7_sb.s_ilock  = sb_sector[0x19B];
+            v7_sb.s_fmod   = sb_sector[0x19C];
+            v7_sb.s_ronly  = sb_sector[0x19D];
+            v7_sb.s_time   = BitConverter.ToUInt32(sb_sector, 0x19E);
+            v7_sb.s_tfree  = BitConverter.ToUInt32(sb_sector, 0x1A2);
+            v7_sb.s_tinode = BitConverter.ToUInt16(sb_sector, 0x1A6);
+            v7_sb.s_int_m  = BitConverter.ToUInt16(sb_sector, 0x1A8);
+            v7_sb.s_int_n  = BitConverter.ToUInt16(sb_sector, 0x1AA);
+            Array.Copy(sb_sector, 0x1AC, sys7_strings, 0, 6);
+            v7_sb.s_fname = StringHandlers.CToString(sys7_strings, Encoding);
+            Array.Copy(sb_sector, 0x1B2, sys7_strings, 0, 6);
+            v7_sb.s_fpack = StringHandlers.CToString(sys7_strings, Encoding);
+
+            XmlFsType.Type        = "UNIX 7th Edition fs";
+            XmlFsType.ClusterSize = 512;
+            XmlFsType.Clusters    = v7_sb.s_fsize;
+            sb.AppendLine("UNIX 7th Edition filesystem");
+
+            if(imagePlugin.Info.SectorSize != 512)
+                sb.
+                    AppendFormat("WARNING: Filesystem indicates {0} bytes/block while device indicates {1} bytes/sector",
+                                 512, 2048).AppendLine();
+
+            sb.AppendFormat("{0} zones on volume ({1} bytes)", v7_sb.s_fsize, v7_sb.s_fsize * 512).AppendLine();
+
+            sb.AppendFormat("{0} free zones on volume ({1} bytes)", v7_sb.s_tfree, v7_sb.s_tfree * 512).
+               AppendLine();
+
+            sb.AppendFormat("{0} free blocks on list ({1} bytes)", v7_sb.s_nfree, v7_sb.s_nfree * 512).AppendLine();
+            sb.AppendFormat("First data zone: {0}", v7_sb.s_isize).AppendLine();
+            sb.AppendFormat("{0} free inodes on volume", v7_sb.s_tinode).AppendLine();
+            sb.AppendFormat("{0} free inodes on list", v7_sb.s_ninode).AppendLine();
+
+            if(v7_sb.s_flock > 0)
+                sb.AppendLine("Free block list is locked");
+
+            if(v7_sb.s_ilock > 0)
+                sb.AppendLine("inode cache is locked");
+
+            if(v7_sb.s_fmod > 0)
+                sb.AppendLine("Superblock is being modified");
+
+            if(v7_sb.s_ronly > 0)
+                sb.AppendLine("Volume is mounted read-only");
+
+            sb.AppendFormat("Superblock last updated on {0}", DateHandlers.UnixUnsignedToDateTime(v7_sb.s_time)).
+               AppendLine();
+
+            if(v7_sb.s_time != 0)
+            {
+                XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(v7_sb.s_time);
+                XmlFsType.ModificationDateSpecified = true;
+            }
+
+            sb.AppendFormat("Volume name: {0}", v7_sb.s_fname).AppendLine();
+            XmlFsType.VolumeName = v7_sb.s_fname;
+            sb.AppendFormat("Pack name: {0}", v7_sb.s_fpack).AppendLine();
         }
 
-        struct UNIX7thEditionSuperBlock
-        {
-            /// <summary>0x000, index of first data zone</summary>
-            public ushort s_isize;
-            /// <summary>0x002, total number of zones of this volume</summary>
-            public uint s_fsize;
+        information = sb.ToString();
+    }
 
-            // the start of the free block list:
-            /// <summary>0x006, blocks in s_free, &lt;=100</summary>
-            public ushort s_nfree;
-            /// <summary>0x008, 50 entries, first free block list chunk</summary>
-            public uint[] s_free;
+    // Old XENIX use different offsets
+    struct XenixSuperBlock
+    {
+        /// <summary>0x000, index of first data zone</summary>
+        public ushort s_isize;
+        /// <summary>0x002, total number of zones of this volume</summary>
+        public uint s_fsize;
 
-            // the cache of free inodes:
-            /// <summary>0x0D0, number of inodes in s_inode, &lt;= 100</summary>
-            public ushort s_ninode;
-            /// <summary>0x0D2, 100 entries, some free inodes</summary>
-            public ushort[] s_inode;
-            /// <summary>0x19A, free block list manipulation lock</summary>
-            public byte s_flock;
-            /// <summary>0x19B, inode cache manipulation lock</summary>
-            public byte s_ilock;
-            /// <summary>0x19C, superblock modification flag</summary>
-            public byte s_fmod;
-            /// <summary>0x19D, read-only mounted flag</summary>
-            public byte s_ronly;
-            /// <summary>0x19E, time of last superblock update</summary>
-            public uint s_time;
-            /// <summary>0x1A2, total number of free zones</summary>
-            public uint s_tfree;
-            /// <summary>0x1A6, total number of free inodes</summary>
-            public ushort s_tinode;
-            /// <summary>0x1A8, interleave factor</summary>
-            public ushort s_int_m;
-            /// <summary>0x1AA, interleave factor</summary>
-            public ushort s_int_n;
-            /// <summary>0x1AC, 6 bytes, volume name</summary>
-            public string s_fname;
-            /// <summary>0x1B2, 6 bytes, pack name</summary>
-            public string s_fpack;
-        }
+        // the start of the free block list:
+        /// <summary>0x006, blocks in s_free, &lt;=100</summary>
+        public ushort s_nfree;
+        /// <summary>0x008, 100 entries, 50 entries for Xenix 3, first free block list chunk</summary>
+        public uint[] s_free;
 
-        struct CoherentSuperBlock
-        {
-            /// <summary>0x000, index of first data zone</summary>
-            public ushort s_isize;
-            /// <summary>0x002, total number of zones of this volume</summary>
-            public uint s_fsize;
+        // the cache of free inodes:
+        /// <summary>0x198 (0xD0), number of inodes in s_inode, &lt;= 100</summary>
+        public ushort s_ninode;
+        /// <summary>0x19A (0xD2), 100 entries, some free inodes</summary>
+        public ushort[] s_inode;
+        /// <summary>0x262 (0x19A), free block list manipulation lock</summary>
+        public byte s_flock;
+        /// <summary>0x263 (0x19B), inode cache manipulation lock</summary>
+        public byte s_ilock;
+        /// <summary>0x264 (0x19C), superblock modification flag</summary>
+        public byte s_fmod;
+        /// <summary>0x265 (0x19D), read-only mounted flag</summary>
+        public byte s_ronly;
+        /// <summary>0x266 (0x19E), time of last superblock update</summary>
+        public int s_time;
+        /// <summary>0x26A (0x1A2), total number of free zones</summary>
+        public uint s_tfree;
+        /// <summary>0x26E (0x1A6), total number of free inodes</summary>
+        public ushort s_tinode;
+        /// <summary>0x270 (0x1A8), blocks per cylinder</summary>
+        public ushort s_cylblks;
+        /// <summary>0x272 (0x1AA), blocks per gap</summary>
+        public ushort s_gapblks;
+        /// <summary>0x274 (0x1AC), device information ??</summary>
+        public ushort s_dinfo0;
+        /// <summary>0x276 (0x1AE), device information ??</summary>
+        public ushort s_dinfo1;
+        /// <summary>0x278 (0x1B0), 6 bytes, volume name</summary>
+        public string s_fname;
+        /// <summary>0x27E (0x1B6), 6 bytes, pack name</summary>
+        public string s_fpack;
+        /// <summary>0x284 (0x1BC), 0x46 if volume is clean</summary>
+        public byte s_clean;
+        /// <summary>0x285 (0x1BD), 371 bytes, 51 bytes for Xenix 3</summary>
+        public byte[] s_fill;
+        /// <summary>0x3F8 (0x1F0), magic</summary>
+        public uint s_magic;
+        /// <summary>0x3FC (0x1F4), filesystem type (1 = 512 bytes/blk, 2 = 1024 bytes/blk, 3 = 2048 bytes/blk)</summary>
+        public uint s_type;
+    }
 
-            // the start of the free block list:
-            /// <summary>0x006, blocks in s_free, &lt;=100</summary>
-            public ushort s_nfree;
-            /// <summary>0x008, 64 entries, first free block list chunk</summary>
-            public uint[] s_free;
+    struct SystemVRelease4SuperBlock
+    {
+        /// <summary>0x000, index of first data zone</summary>
+        public ushort s_isize;
+        /// <summary>0x002, padding</summary>
+        public ushort s_pad0;
+        /// <summary>0x004, total number of zones of this volume</summary>
+        public uint s_fsize;
 
-            // the cache of free inodes:
-            /// <summary>0x108, number of inodes in s_inode, &lt;= 100</summary>
-            public ushort s_ninode;
-            /// <summary>0x10A, 100 entries, some free inodes</summary>
-            public ushort[] s_inode;
-            /// <summary>0x1D2, free block list manipulation lock</summary>
-            public byte s_flock;
-            /// <summary>0x1D3, inode cache manipulation lock</summary>
-            public byte s_ilock;
-            /// <summary>0x1D4, superblock modification flag</summary>
-            public byte s_fmod;
-            /// <summary>0x1D5, read-only mounted flag</summary>
-            public byte s_ronly;
-            /// <summary>0x1D6, time of last superblock update</summary>
-            public uint s_time;
-            /// <summary>0x1DE, total number of free zones</summary>
-            public uint s_tfree;
-            /// <summary>0x1E2, total number of free inodes</summary>
-            public ushort s_tinode;
-            /// <summary>0x1E4, interleave factor</summary>
-            public ushort s_int_m;
-            /// <summary>0x1E6, interleave factor</summary>
-            public ushort s_int_n;
-            /// <summary>0x1E8, 6 bytes, volume name</summary>
-            public string s_fname;
-            /// <summary>0x1EE, 6 bytes, pack name</summary>
-            public string s_fpack;
-            /// <summary>0x1F4, zero-filled</summary>
-            public uint s_unique;
-        }
+        // the start of the free block list:
+        /// <summary>0x008, blocks in s_free, &lt;=100</summary>
+        public ushort s_nfree;
+        /// <summary>0x00A, padding</summary>
+        public ushort s_pad1;
+        /// <summary>0x00C, 50 entries, first free block list chunk</summary>
+        public uint[] s_free;
+
+        // the cache of free inodes:
+        /// <summary>0x0D4, number of inodes in s_inode, &lt;= 100</summary>
+        public ushort s_ninode;
+        /// <summary>0x0D6, padding</summary>
+        public ushort s_pad2;
+        /// <summary>0x0D8, 100 entries, some free inodes</summary>
+        public ushort[] s_inode;
+        /// <summary>0x1A0, free block list manipulation lock</summary>
+        public byte s_flock;
+        /// <summary>0x1A1, inode cache manipulation lock</summary>
+        public byte s_ilock;
+        /// <summary>0x1A2, superblock modification flag</summary>
+        public byte s_fmod;
+        /// <summary>0x1A3, read-only mounted flag</summary>
+        public byte s_ronly;
+        /// <summary>0x1A4, time of last superblock update</summary>
+        public uint s_time;
+        /// <summary>0x1A8, blocks per cylinder</summary>
+        public ushort s_cylblks;
+        /// <summary>0x1AA, blocks per gap</summary>
+        public ushort s_gapblks;
+        /// <summary>0x1AC, device information ??</summary>
+        public ushort s_dinfo0;
+        /// <summary>0x1AE, device information ??</summary>
+        public ushort s_dinfo1;
+        /// <summary>0x1B0, total number of free zones</summary>
+        public uint s_tfree;
+        /// <summary>0x1B4, total number of free inodes</summary>
+        public ushort s_tinode;
+        /// <summary>0x1B6, padding</summary>
+        public ushort s_pad3;
+        /// <summary>0x1B8, 6 bytes, volume name</summary>
+        public string s_fname;
+        /// <summary>0x1BE, 6 bytes, pack name</summary>
+        public string s_fpack;
+        /// <summary>0x1C4, 48 bytes</summary>
+        public byte[] s_fill;
+        /// <summary>0x1F4, if s_state == (0x7C269D38 - s_time) then filesystem is clean</summary>
+        public uint s_state;
+        /// <summary>0x1F8, magic</summary>
+        public uint s_magic;
+        /// <summary>0x1FC, filesystem type (1 = 512 bytes/blk, 2 = 1024 bytes/blk)</summary>
+        public uint s_type;
+    }
+
+    struct SystemVRelease2SuperBlock
+    {
+        /// <summary>0x000, index of first data zone</summary>
+        public ushort s_isize;
+        /// <summary>0x002, total number of zones of this volume</summary>
+        public uint s_fsize;
+
+        // the start of the free block list:
+        /// <summary>0x006, blocks in s_free, &lt;=100</summary>
+        public ushort s_nfree;
+        /// <summary>0x008, 50 entries, first free block list chunk</summary>
+        public uint[] s_free;
+
+        // the cache of free inodes:
+        /// <summary>0x0D0, number of inodes in s_inode, &lt;= 100</summary>
+        public ushort s_ninode;
+        /// <summary>0x0D2, 100 entries, some free inodes</summary>
+        public ushort[] s_inode;
+        /// <summary>0x19A, free block list manipulation lock</summary>
+        public byte s_flock;
+        /// <summary>0x19B, inode cache manipulation lock</summary>
+        public byte s_ilock;
+        /// <summary>0x19C, superblock modification flag</summary>
+        public byte s_fmod;
+        /// <summary>0x19D, read-only mounted flag</summary>
+        public byte s_ronly;
+        /// <summary>0x19E, time of last superblock update</summary>
+        public uint s_time;
+        /// <summary>0x1A2, blocks per cylinder</summary>
+        public ushort s_cylblks;
+        /// <summary>0x1A4, blocks per gap</summary>
+        public ushort s_gapblks;
+        /// <summary>0x1A6, device information ??</summary>
+        public ushort s_dinfo0;
+        /// <summary>0x1A8, device information ??</summary>
+        public ushort s_dinfo1;
+        /// <summary>0x1AA, total number of free zones</summary>
+        public uint s_tfree;
+        /// <summary>0x1AE, total number of free inodes</summary>
+        public ushort s_tinode;
+        /// <summary>0x1B0, 6 bytes, volume name</summary>
+        public string s_fname;
+        /// <summary>0x1B6, 6 bytes, pack name</summary>
+        public string s_fpack;
+        /// <summary>0x1BC, 56 bytes</summary>
+        public byte[] s_fill;
+        /// <summary>0x1F4, if s_state == (0x7C269D38 - s_time) then filesystem is clean</summary>
+        public uint s_state;
+        /// <summary>0x1F8, magic</summary>
+        public uint s_magic;
+        /// <summary>0x1FC, filesystem type (1 = 512 bytes/blk, 2 = 1024 bytes/blk)</summary>
+        public uint s_type;
+    }
+
+    struct UNIX7thEditionSuperBlock
+    {
+        /// <summary>0x000, index of first data zone</summary>
+        public ushort s_isize;
+        /// <summary>0x002, total number of zones of this volume</summary>
+        public uint s_fsize;
+
+        // the start of the free block list:
+        /// <summary>0x006, blocks in s_free, &lt;=100</summary>
+        public ushort s_nfree;
+        /// <summary>0x008, 50 entries, first free block list chunk</summary>
+        public uint[] s_free;
+
+        // the cache of free inodes:
+        /// <summary>0x0D0, number of inodes in s_inode, &lt;= 100</summary>
+        public ushort s_ninode;
+        /// <summary>0x0D2, 100 entries, some free inodes</summary>
+        public ushort[] s_inode;
+        /// <summary>0x19A, free block list manipulation lock</summary>
+        public byte s_flock;
+        /// <summary>0x19B, inode cache manipulation lock</summary>
+        public byte s_ilock;
+        /// <summary>0x19C, superblock modification flag</summary>
+        public byte s_fmod;
+        /// <summary>0x19D, read-only mounted flag</summary>
+        public byte s_ronly;
+        /// <summary>0x19E, time of last superblock update</summary>
+        public uint s_time;
+        /// <summary>0x1A2, total number of free zones</summary>
+        public uint s_tfree;
+        /// <summary>0x1A6, total number of free inodes</summary>
+        public ushort s_tinode;
+        /// <summary>0x1A8, interleave factor</summary>
+        public ushort s_int_m;
+        /// <summary>0x1AA, interleave factor</summary>
+        public ushort s_int_n;
+        /// <summary>0x1AC, 6 bytes, volume name</summary>
+        public string s_fname;
+        /// <summary>0x1B2, 6 bytes, pack name</summary>
+        public string s_fpack;
+    }
+
+    struct CoherentSuperBlock
+    {
+        /// <summary>0x000, index of first data zone</summary>
+        public ushort s_isize;
+        /// <summary>0x002, total number of zones of this volume</summary>
+        public uint s_fsize;
+
+        // the start of the free block list:
+        /// <summary>0x006, blocks in s_free, &lt;=100</summary>
+        public ushort s_nfree;
+        /// <summary>0x008, 64 entries, first free block list chunk</summary>
+        public uint[] s_free;
+
+        // the cache of free inodes:
+        /// <summary>0x108, number of inodes in s_inode, &lt;= 100</summary>
+        public ushort s_ninode;
+        /// <summary>0x10A, 100 entries, some free inodes</summary>
+        public ushort[] s_inode;
+        /// <summary>0x1D2, free block list manipulation lock</summary>
+        public byte s_flock;
+        /// <summary>0x1D3, inode cache manipulation lock</summary>
+        public byte s_ilock;
+        /// <summary>0x1D4, superblock modification flag</summary>
+        public byte s_fmod;
+        /// <summary>0x1D5, read-only mounted flag</summary>
+        public byte s_ronly;
+        /// <summary>0x1D6, time of last superblock update</summary>
+        public uint s_time;
+        /// <summary>0x1DE, total number of free zones</summary>
+        public uint s_tfree;
+        /// <summary>0x1E2, total number of free inodes</summary>
+        public ushort s_tinode;
+        /// <summary>0x1E4, interleave factor</summary>
+        public ushort s_int_m;
+        /// <summary>0x1E6, interleave factor</summary>
+        public ushort s_int_n;
+        /// <summary>0x1E8, 6 bytes, volume name</summary>
+        public string s_fname;
+        /// <summary>0x1EE, 6 bytes, pack name</summary>
+        public string s_fpack;
+        /// <summary>0x1F4, zero-filled</summary>
+        public uint s_unique;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UCSDPascal/Consts.cs b/Aaru.Filesystems/UCSDPascal/Consts.cs
index 5db49ca17..c497573e2 100644
--- a/Aaru.Filesystems/UCSDPascal/Consts.cs
+++ b/Aaru.Filesystems/UCSDPascal/Consts.cs
@@ -32,32 +32,31 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.Filesystems.UCSDPascal
+namespace Aaru.Filesystems.UCSDPascal;
+
+// Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class PascalPlugin
 {
-    // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class PascalPlugin
+    enum PascalFileKind : short
     {
-        enum PascalFileKind : short
-        {
-            /// <summary>Disk volume entry</summary>
-            Volume = 0,
-            /// <summary>File containing bad blocks</summary>
-            Bad,
-            /// <summary>Code file, machine executable</summary>
-            Code,
-            /// <summary>Text file, human readable</summary>
-            Text,
-            /// <summary>Information file for debugger</summary>
-            Info,
-            /// <summary>Data file</summary>
-            Data,
-            /// <summary>Graphics vectors</summary>
-            Graf,
-            /// <summary>Graphics screen image</summary>
-            Foto,
-            /// <summary>Security, not used</summary>
-            Secure
-        }
+        /// <summary>Disk volume entry</summary>
+        Volume = 0,
+        /// <summary>File containing bad blocks</summary>
+        Bad,
+        /// <summary>Code file, machine executable</summary>
+        Code,
+        /// <summary>Text file, human readable</summary>
+        Text,
+        /// <summary>Information file for debugger</summary>
+        Info,
+        /// <summary>Data file</summary>
+        Data,
+        /// <summary>Graphics vectors</summary>
+        Graf,
+        /// <summary>Graphics screen image</summary>
+        Foto,
+        /// <summary>Security, not used</summary>
+        Secure
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UCSDPascal/Dir.cs b/Aaru.Filesystems/UCSDPascal/Dir.cs
index c3a43fb09..7ab468411 100644
--- a/Aaru.Filesystems/UCSDPascal/Dir.cs
+++ b/Aaru.Filesystems/UCSDPascal/Dir.cs
@@ -36,34 +36,33 @@ using System.Linq;
 using Aaru.CommonTypes.Enums;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.UCSDPascal
+namespace Aaru.Filesystems.UCSDPascal;
+
+// Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
+public sealed partial class PascalPlugin
 {
-    // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
-    public sealed partial class PascalPlugin
+    /// <inheritdoc />
+    public ErrorNumber ReadDir(string path, out List<string> contents)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadDir(string path, out List<string> contents)
+        contents = null;
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        if(!string.IsNullOrEmpty(path) &&
+           string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
+            return ErrorNumber.NotSupported;
+
+        contents = _fileEntries.Select(ent => StringHandlers.PascalToString(ent.Filename, Encoding)).ToList();
+
+        if(_debug)
         {
-            contents = null;
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            if(!string.IsNullOrEmpty(path) &&
-               string.Compare(path, "/", StringComparison.OrdinalIgnoreCase) != 0)
-                return ErrorNumber.NotSupported;
-
-            contents = _fileEntries.Select(ent => StringHandlers.PascalToString(ent.Filename, Encoding)).ToList();
-
-            if(_debug)
-            {
-                contents.Add("$");
-                contents.Add("$Boot");
-            }
-
-            contents.Sort();
-
-            return ErrorNumber.NoError;
+            contents.Add("$");
+            contents.Add("$Boot");
         }
+
+        contents.Sort();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UCSDPascal/File.cs b/Aaru.Filesystems/UCSDPascal/File.cs
index 4fe01b3d9..fc85ea599 100644
--- a/Aaru.Filesystems/UCSDPascal/File.cs
+++ b/Aaru.Filesystems/UCSDPascal/File.cs
@@ -36,172 +36,171 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 
-namespace Aaru.Filesystems.UCSDPascal
+namespace Aaru.Filesystems.UCSDPascal;
+
+// Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
+public sealed partial class PascalPlugin
 {
-    // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
-    public sealed partial class PascalPlugin
+    /// <inheritdoc />
+    public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
     {
-        /// <inheritdoc />
-        public ErrorNumber MapBlock(string path, long fileBlock, out long deviceBlock)
+        deviceBlock = 0;
+
+        return !_mounted ? ErrorNumber.AccessDenied : ErrorNumber.NotImplemented;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
+    {
+        attributes = new FileAttributes();
+
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            deviceBlock = 0;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            return !_mounted ? ErrorNumber.AccessDenied : ErrorNumber.NotImplemented;
-        }
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-        /// <inheritdoc />
-        public ErrorNumber GetAttributes(string path, out FileAttributes attributes)
-        {
-            attributes = new FileAttributes();
-
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
-
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
-
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
-
-            ErrorNumber error = GetFileEntry(path, out _);
-
-            if(error != ErrorNumber.NoError)
-                return error;
-
-            attributes = FileAttributes.File;
+        ErrorNumber error = GetFileEntry(path, out _);
 
+        if(error != ErrorNumber.NoError)
             return error;
-        }
 
-        /// <inheritdoc />
-        public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+        attributes = FileAttributes.File;
+
+        return error;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Read(string path, long offset, long size, ref byte[] buf)
+    {
+        if(!_mounted)
+            return ErrorNumber.AccessDenied;
+
+        string[] pathElements = path.Split(new[]
         {
-            if(!_mounted)
-                return ErrorNumber.AccessDenied;
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
 
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
 
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
+        byte[] file;
 
-            byte[] file;
-
-            if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
-                          string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0))
-                file = string.Compare(path, "$", StringComparison.InvariantCulture) == 0 ? _catalogBlocks : _bootBlocks;
-            else
-            {
-                ErrorNumber error = GetFileEntry(path, out PascalFileEntry entry);
-
-                if(error != ErrorNumber.NoError)
-                    return error;
-
-                error = _device.ReadSectors((ulong)entry.FirstBlock                    * _multiplier,
-                                            (uint)(entry.LastBlock - entry.FirstBlock) * _multiplier, out byte[] tmp);
-
-                if(error != ErrorNumber.NoError)
-                    return error;
-
-                file = new byte[((entry.LastBlock - entry.FirstBlock - 1) * _device.Info.SectorSize * _multiplier) +
-                                entry.LastBytes];
-
-                Array.Copy(tmp, 0, file, 0, file.Length);
-            }
-
-            if(offset >= file.Length)
-                return ErrorNumber.EINVAL;
-
-            if(size + offset >= file.Length)
-                size = file.Length - offset;
-
-            buf = new byte[size];
-
-            Array.Copy(file, offset, buf, 0, size);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Stat(string path, out FileEntryInfo stat)
+        if(_debug && (string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
+                      string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0))
+            file = string.Compare(path, "$", StringComparison.InvariantCulture) == 0 ? _catalogBlocks : _bootBlocks;
+        else
         {
-            stat = null;
-
-            string[] pathElements = path.Split(new[]
-            {
-                '/'
-            }, StringSplitOptions.RemoveEmptyEntries);
-
-            if(pathElements.Length != 1)
-                return ErrorNumber.NotSupported;
-
-            if(_debug)
-                if(string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
-                   string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0)
-                {
-                    stat = new FileEntryInfo
-                    {
-                        Attributes = FileAttributes.System,
-                        BlockSize  = _device.Info.SectorSize * _multiplier,
-                        Links      = 1
-                    };
-
-                    if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
-                    {
-                        stat.Blocks = (_catalogBlocks.Length / stat.BlockSize) +
-                                      (_catalogBlocks.Length % stat.BlockSize);
-
-                        stat.Length = _catalogBlocks.Length;
-                    }
-                    else
-                    {
-                        stat.Blocks = (_bootBlocks.Length / stat.BlockSize) + (_catalogBlocks.Length % stat.BlockSize);
-                        stat.Length = _bootBlocks.Length;
-                    }
-
-                    return ErrorNumber.NoError;
-                }
-
             ErrorNumber error = GetFileEntry(path, out PascalFileEntry entry);
 
             if(error != ErrorNumber.NoError)
                 return error;
 
-            stat = new FileEntryInfo
-            {
-                Attributes       = FileAttributes.File,
-                Blocks           = entry.LastBlock - entry.FirstBlock,
-                BlockSize        = _device.Info.SectorSize * _multiplier,
-                LastWriteTimeUtc = DateHandlers.UcsdPascalToDateTime(entry.ModificationTime),
-                Length = ((entry.LastBlock - entry.FirstBlock) * _device.Info.SectorSize * _multiplier) +
-                         entry.LastBytes,
-                Links = 1
-            };
+            error = _device.ReadSectors((ulong)entry.FirstBlock                    * _multiplier,
+                                        (uint)(entry.LastBlock - entry.FirstBlock) * _multiplier, out byte[] tmp);
 
-            return ErrorNumber.NoError;
+            if(error != ErrorNumber.NoError)
+                return error;
+
+            file = new byte[((entry.LastBlock - entry.FirstBlock - 1) * _device.Info.SectorSize * _multiplier) +
+                            entry.LastBytes];
+
+            Array.Copy(tmp, 0, file, 0, file.Length);
         }
 
-        ErrorNumber GetFileEntry(string path, out PascalFileEntry entry)
-        {
-            entry = new PascalFileEntry();
+        if(offset >= file.Length)
+            return ErrorNumber.EINVAL;
 
-            foreach(PascalFileEntry ent in _fileEntries.Where(ent =>
-                                                                  string.Compare(path,
-                                                                      StringHandlers.PascalToString(ent.Filename,
-                                                                          Encoding),
-                                                                      StringComparison.
-                                                                          InvariantCultureIgnoreCase) == 0))
+        if(size + offset >= file.Length)
+            size = file.Length - offset;
+
+        buf = new byte[size];
+
+        Array.Copy(file, offset, buf, 0, size);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Stat(string path, out FileEntryInfo stat)
+    {
+        stat = null;
+
+        string[] pathElements = path.Split(new[]
+        {
+            '/'
+        }, StringSplitOptions.RemoveEmptyEntries);
+
+        if(pathElements.Length != 1)
+            return ErrorNumber.NotSupported;
+
+        if(_debug)
+            if(string.Compare(path, "$", StringComparison.InvariantCulture)     == 0 ||
+               string.Compare(path, "$Boot", StringComparison.InvariantCulture) == 0)
             {
-                entry = ent;
+                stat = new FileEntryInfo
+                {
+                    Attributes = FileAttributes.System,
+                    BlockSize  = _device.Info.SectorSize * _multiplier,
+                    Links      = 1
+                };
+
+                if(string.Compare(path, "$", StringComparison.InvariantCulture) == 0)
+                {
+                    stat.Blocks = (_catalogBlocks.Length / stat.BlockSize) +
+                                  (_catalogBlocks.Length % stat.BlockSize);
+
+                    stat.Length = _catalogBlocks.Length;
+                }
+                else
+                {
+                    stat.Blocks = (_bootBlocks.Length / stat.BlockSize) + (_catalogBlocks.Length % stat.BlockSize);
+                    stat.Length = _bootBlocks.Length;
+                }
 
                 return ErrorNumber.NoError;
             }
 
-            return ErrorNumber.NoSuchFile;
+        ErrorNumber error = GetFileEntry(path, out PascalFileEntry entry);
+
+        if(error != ErrorNumber.NoError)
+            return error;
+
+        stat = new FileEntryInfo
+        {
+            Attributes       = FileAttributes.File,
+            Blocks           = entry.LastBlock - entry.FirstBlock,
+            BlockSize        = _device.Info.SectorSize * _multiplier,
+            LastWriteTimeUtc = DateHandlers.UcsdPascalToDateTime(entry.ModificationTime),
+            Length = ((entry.LastBlock - entry.FirstBlock) * _device.Info.SectorSize * _multiplier) +
+                     entry.LastBytes,
+            Links = 1
+        };
+
+        return ErrorNumber.NoError;
+    }
+
+    ErrorNumber GetFileEntry(string path, out PascalFileEntry entry)
+    {
+        entry = new PascalFileEntry();
+
+        foreach(PascalFileEntry ent in _fileEntries.Where(ent =>
+                                                              string.Compare(path,
+                                                                             StringHandlers.PascalToString(ent.Filename,
+                                                                                 Encoding),
+                                                                             StringComparison.
+                                                                                 InvariantCultureIgnoreCase) == 0))
+        {
+            entry = ent;
+
+            return ErrorNumber.NoError;
         }
+
+        return ErrorNumber.NoSuchFile;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UCSDPascal/Info.cs b/Aaru.Filesystems/UCSDPascal/Info.cs
index 5225fba33..6a871acd6 100644
--- a/Aaru.Filesystems/UCSDPascal/Info.cs
+++ b/Aaru.Filesystems/UCSDPascal/Info.cs
@@ -41,177 +41,176 @@ using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
-namespace Aaru.Filesystems.UCSDPascal
+namespace Aaru.Filesystems.UCSDPascal;
+
+// Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
+public sealed partial class PascalPlugin
 {
-    // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
-    public sealed partial class PascalPlugin
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(partition.Length < 3)
+            return false;
+
+        _multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
+
+        // Blocks 0 and 1 are boot code
+        ErrorNumber errno =
+            imagePlugin.ReadSectors((_multiplier * 2) + partition.Start, _multiplier, out byte[] volBlock);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        // On Apple II, it's little endian
+        // TODO: Fix
+        /*BigEndianBitConverter.IsLittleEndian =
+            multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian;*/
+
+        var volEntry = new PascalVolumeEntry
         {
-            if(partition.Length < 3)
-                return false;
+            FirstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00),
+            LastBlock  = BigEndianBitConverter.ToInt16(volBlock, 0x02),
+            EntryType  = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04),
+            VolumeName = new byte[8],
+            Blocks     = BigEndianBitConverter.ToInt16(volBlock, 0x0E),
+            Files      = BigEndianBitConverter.ToInt16(volBlock, 0x10),
+            Dummy      = BigEndianBitConverter.ToInt16(volBlock, 0x12),
+            LastBoot   = BigEndianBitConverter.ToInt16(volBlock, 0x14),
+            Tail       = BigEndianBitConverter.ToInt32(volBlock, 0x16)
+        };
 
-            _multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
+        Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8);
 
-            // Blocks 0 and 1 are boot code
-            ErrorNumber errno =
-                imagePlugin.ReadSectors((_multiplier * 2) + partition.Start, _multiplier, out byte[] volBlock);
+        AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.firstBlock = {0}", volEntry.FirstBlock);
+        AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.lastBlock = {0}", volEntry.LastBlock);
+        AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.entryType = {0}", volEntry.EntryType);
+        //            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.volumeName = {0}", volEntry.VolumeName);
+        AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.blocks = {0}", volEntry.Blocks);
+        AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.files = {0}", volEntry.Files);
+        AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.dummy = {0}", volEntry.Dummy);
+        AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.lastBoot = {0}", volEntry.LastBoot);
+        AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.tail = {0}", volEntry.Tail);
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+        // First block is always 0 (even is it's sector 2)
+        if(volEntry.FirstBlock != 0)
+            return false;
 
-            // On Apple II, it's little endian
-            // TODO: Fix
-            /*BigEndianBitConverter.IsLittleEndian =
-                multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian;*/
+        // Last volume record block must be after first block, and before end of device
+        if(volEntry.LastBlock        <= volEntry.FirstBlock ||
+           (ulong)volEntry.LastBlock > (imagePlugin.Info.Sectors / _multiplier) - 2)
+            return false;
 
-            var volEntry = new PascalVolumeEntry
-            {
-                FirstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00),
-                LastBlock  = BigEndianBitConverter.ToInt16(volBlock, 0x02),
-                EntryType  = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04),
-                VolumeName = new byte[8],
-                Blocks     = BigEndianBitConverter.ToInt16(volBlock, 0x0E),
-                Files      = BigEndianBitConverter.ToInt16(volBlock, 0x10),
-                Dummy      = BigEndianBitConverter.ToInt16(volBlock, 0x12),
-                LastBoot   = BigEndianBitConverter.ToInt16(volBlock, 0x14),
-                Tail       = BigEndianBitConverter.ToInt32(volBlock, 0x16)
-            };
+        // Volume record entry type must be volume or secure
+        if(volEntry.EntryType != PascalFileKind.Volume &&
+           volEntry.EntryType != PascalFileKind.Secure)
+            return false;
 
-            Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8);
+        // Volume name is max 7 characters
+        if(volEntry.VolumeName[0] > 7)
+            return false;
 
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.firstBlock = {0}", volEntry.FirstBlock);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.lastBlock = {0}", volEntry.LastBlock);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.entryType = {0}", volEntry.EntryType);
-//            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.volumeName = {0}", volEntry.VolumeName);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.blocks = {0}", volEntry.Blocks);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.files = {0}", volEntry.Files);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.dummy = {0}", volEntry.Dummy);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.lastBoot = {0}", volEntry.LastBoot);
-            AaruConsole.DebugWriteLine("UCSD Pascal Plugin", "volEntry.tail = {0}", volEntry.Tail);
+        // Volume blocks is equal to volume sectors
+        if(volEntry.Blocks        < 0 ||
+           (ulong)volEntry.Blocks != imagePlugin.Info.Sectors / _multiplier)
+            return false;
 
-            // First block is always 0 (even is it's sector 2)
-            if(volEntry.FirstBlock != 0)
-                return false;
+        // There can be not less than zero files
+        return volEntry.Files >= 0;
+    }
 
-            // Last volume record block must be after first block, and before end of device
-            if(volEntry.LastBlock        <= volEntry.FirstBlock ||
-               (ulong)volEntry.LastBlock > (imagePlugin.Info.Sectors / _multiplier) - 2)
-                return false;
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding = encoding ?? new Apple2();
+        var sbInformation = new StringBuilder();
+        information = "";
+        _multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
 
-            // Volume record entry type must be volume or secure
-            if(volEntry.EntryType != PascalFileKind.Volume &&
-               volEntry.EntryType != PascalFileKind.Secure)
-                return false;
+        if(imagePlugin.Info.Sectors < 3)
+            return;
 
-            // Volume name is max 7 characters
-            if(volEntry.VolumeName[0] > 7)
-                return false;
+        // Blocks 0 and 1 are boot code
+        ErrorNumber errno =
+            imagePlugin.ReadSectors((_multiplier * 2) + partition.Start, _multiplier, out byte[] volBlock);
 
-            // Volume blocks is equal to volume sectors
-            if(volEntry.Blocks        < 0 ||
-               (ulong)volEntry.Blocks != imagePlugin.Info.Sectors / _multiplier)
-                return false;
+        if(errno != ErrorNumber.NoError)
+            return;
 
-            // There can be not less than zero files
-            return volEntry.Files >= 0;
-        }
+        // On Apple //, it's little endian
+        // TODO: Fix
+        //BigEndianBitConverter.IsLittleEndian =
+        //    multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian;
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        var volEntry = new PascalVolumeEntry
         {
-            Encoding = encoding ?? new Apple2();
-            var sbInformation = new StringBuilder();
-            information = "";
-            _multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
+            FirstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00),
+            LastBlock  = BigEndianBitConverter.ToInt16(volBlock, 0x02),
+            EntryType  = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04),
+            VolumeName = new byte[8],
+            Blocks     = BigEndianBitConverter.ToInt16(volBlock, 0x0E),
+            Files      = BigEndianBitConverter.ToInt16(volBlock, 0x10),
+            Dummy      = BigEndianBitConverter.ToInt16(volBlock, 0x12),
+            LastBoot   = BigEndianBitConverter.ToInt16(volBlock, 0x14),
+            Tail       = BigEndianBitConverter.ToInt32(volBlock, 0x16)
+        };
 
-            if(imagePlugin.Info.Sectors < 3)
-                return;
+        Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8);
 
-            // Blocks 0 and 1 are boot code
-            ErrorNumber errno =
-                imagePlugin.ReadSectors((_multiplier * 2) + partition.Start, _multiplier, out byte[] volBlock);
+        // First block is always 0 (even is it's sector 2)
+        if(volEntry.FirstBlock != 0)
+            return;
 
-            if(errno != ErrorNumber.NoError)
-                return;
+        // Last volume record block must be after first block, and before end of device
+        if(volEntry.LastBlock        <= volEntry.FirstBlock ||
+           (ulong)volEntry.LastBlock > (imagePlugin.Info.Sectors / _multiplier) - 2)
+            return;
 
-            // On Apple //, it's little endian
-            // TODO: Fix
-            //BigEndianBitConverter.IsLittleEndian =
-            //    multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian;
+        // Volume record entry type must be volume or secure
+        if(volEntry.EntryType != PascalFileKind.Volume &&
+           volEntry.EntryType != PascalFileKind.Secure)
+            return;
 
-            var volEntry = new PascalVolumeEntry
-            {
-                FirstBlock = BigEndianBitConverter.ToInt16(volBlock, 0x00),
-                LastBlock  = BigEndianBitConverter.ToInt16(volBlock, 0x02),
-                EntryType  = (PascalFileKind)BigEndianBitConverter.ToInt16(volBlock, 0x04),
-                VolumeName = new byte[8],
-                Blocks     = BigEndianBitConverter.ToInt16(volBlock, 0x0E),
-                Files      = BigEndianBitConverter.ToInt16(volBlock, 0x10),
-                Dummy      = BigEndianBitConverter.ToInt16(volBlock, 0x12),
-                LastBoot   = BigEndianBitConverter.ToInt16(volBlock, 0x14),
-                Tail       = BigEndianBitConverter.ToInt32(volBlock, 0x16)
-            };
+        // Volume name is max 7 characters
+        if(volEntry.VolumeName[0] > 7)
+            return;
 
-            Array.Copy(volBlock, 0x06, volEntry.VolumeName, 0, 8);
+        // Volume blocks is equal to volume sectors
+        if(volEntry.Blocks        < 0 ||
+           (ulong)volEntry.Blocks != imagePlugin.Info.Sectors / _multiplier)
+            return;
 
-            // First block is always 0 (even is it's sector 2)
-            if(volEntry.FirstBlock != 0)
-                return;
+        // There can be not less than zero files
+        if(volEntry.Files < 0)
+            return;
 
-            // Last volume record block must be after first block, and before end of device
-            if(volEntry.LastBlock        <= volEntry.FirstBlock ||
-               (ulong)volEntry.LastBlock > (imagePlugin.Info.Sectors / _multiplier) - 2)
-                return;
+        sbInformation.AppendFormat("Volume record spans from block {0} to block {1}", volEntry.FirstBlock,
+                                   volEntry.LastBlock).AppendLine();
 
-            // Volume record entry type must be volume or secure
-            if(volEntry.EntryType != PascalFileKind.Volume &&
-               volEntry.EntryType != PascalFileKind.Secure)
-                return;
+        sbInformation.
+            AppendFormat("Volume name: {0}", StringHandlers.PascalToString(volEntry.VolumeName, Encoding)).
+            AppendLine();
 
-            // Volume name is max 7 characters
-            if(volEntry.VolumeName[0] > 7)
-                return;
+        sbInformation.AppendFormat("Volume has {0} blocks", volEntry.Blocks).AppendLine();
+        sbInformation.AppendFormat("Volume has {0} files", volEntry.Files).AppendLine();
 
-            // Volume blocks is equal to volume sectors
-            if(volEntry.Blocks        < 0 ||
-               (ulong)volEntry.Blocks != imagePlugin.Info.Sectors / _multiplier)
-                return;
+        sbInformation.
+            AppendFormat("Volume last booted at {0}", DateHandlers.UcsdPascalToDateTime(volEntry.LastBoot)).
+            AppendLine();
 
-            // There can be not less than zero files
-            if(volEntry.Files < 0)
-                return;
+        information = sbInformation.ToString();
 
-            sbInformation.AppendFormat("Volume record spans from block {0} to block {1}", volEntry.FirstBlock,
-                                       volEntry.LastBlock).AppendLine();
+        imagePlugin.ReadSectors(partition.Start, _multiplier * 2, out byte[] boot);
 
-            sbInformation.
-                AppendFormat("Volume name: {0}", StringHandlers.PascalToString(volEntry.VolumeName, Encoding)).
-                AppendLine();
-
-            sbInformation.AppendFormat("Volume has {0} blocks", volEntry.Blocks).AppendLine();
-            sbInformation.AppendFormat("Volume has {0} files", volEntry.Files).AppendLine();
-
-            sbInformation.
-                AppendFormat("Volume last booted at {0}", DateHandlers.UcsdPascalToDateTime(volEntry.LastBoot)).
-                AppendLine();
-
-            information = sbInformation.ToString();
-
-            imagePlugin.ReadSectors(partition.Start, _multiplier * 2, out byte[] boot);
-
-            XmlFsType = new FileSystemType
-            {
-                Bootable       = !ArrayHelpers.ArrayIsNullOrEmpty(boot),
-                Clusters       = (ulong)volEntry.Blocks,
-                ClusterSize    = imagePlugin.Info.SectorSize,
-                Files          = (ulong)volEntry.Files,
-                FilesSpecified = true,
-                Type           = "UCSD Pascal",
-                VolumeName     = StringHandlers.PascalToString(volEntry.VolumeName, Encoding)
-            };
-        }
+        XmlFsType = new FileSystemType
+        {
+            Bootable       = !ArrayHelpers.ArrayIsNullOrEmpty(boot),
+            Clusters       = (ulong)volEntry.Blocks,
+            ClusterSize    = imagePlugin.Info.SectorSize,
+            Files          = (ulong)volEntry.Files,
+            FilesSpecified = true,
+            Type           = "UCSD Pascal",
+            VolumeName     = StringHandlers.PascalToString(volEntry.VolumeName, Encoding)
+        };
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UCSDPascal/Structs.cs b/Aaru.Filesystems/UCSDPascal/Structs.cs
index 45747aff1..2aec998ee 100644
--- a/Aaru.Filesystems/UCSDPascal/Structs.cs
+++ b/Aaru.Filesystems/UCSDPascal/Structs.cs
@@ -32,48 +32,47 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.Filesystems.UCSDPascal
-{
-    // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
-    [SuppressMessage("ReSharper", "NotAccessedField.Local")]
-    public sealed partial class PascalPlugin
-    {
-        struct PascalVolumeEntry
-        {
-            /// <summary>0x00, first block of volume entry</summary>
-            public short FirstBlock;
-            /// <summary>0x02, last block of volume entry</summary>
-            public short LastBlock;
-            /// <summary>0x04, entry type</summary>
-            public PascalFileKind EntryType;
-            /// <summary>0x06, volume name</summary>
-            public byte[] VolumeName;
-            /// <summary>0x0E, block in volume</summary>
-            public short Blocks;
-            /// <summary>0x10, files in volume</summary>
-            public short Files;
-            /// <summary>0x12, dummy</summary>
-            public short Dummy;
-            /// <summary>0x14, last booted</summary>
-            public short LastBoot;
-            /// <summary>0x16, tail to make record same size as <see cref="PascalFileEntry" /></summary>
-            public int Tail;
-        }
+namespace Aaru.Filesystems.UCSDPascal;
 
-        struct PascalFileEntry
-        {
-            /// <summary>0x00, first block of file</summary>
-            public short FirstBlock;
-            /// <summary>0x02, last block of file</summary>
-            public short LastBlock;
-            /// <summary>0x04, entry type</summary>
-            public PascalFileKind EntryType;
-            /// <summary>0x06, file name</summary>
-            public byte[] Filename;
-            /// <summary>0x16, bytes used in last block</summary>
-            public short LastBytes;
-            /// <summary>0x18, modification time</summary>
-            public short ModificationTime;
-        }
+// Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
+[SuppressMessage("ReSharper", "NotAccessedField.Local")]
+public sealed partial class PascalPlugin
+{
+    struct PascalVolumeEntry
+    {
+        /// <summary>0x00, first block of volume entry</summary>
+        public short FirstBlock;
+        /// <summary>0x02, last block of volume entry</summary>
+        public short LastBlock;
+        /// <summary>0x04, entry type</summary>
+        public PascalFileKind EntryType;
+        /// <summary>0x06, volume name</summary>
+        public byte[] VolumeName;
+        /// <summary>0x0E, block in volume</summary>
+        public short Blocks;
+        /// <summary>0x10, files in volume</summary>
+        public short Files;
+        /// <summary>0x12, dummy</summary>
+        public short Dummy;
+        /// <summary>0x14, last booted</summary>
+        public short LastBoot;
+        /// <summary>0x16, tail to make record same size as <see cref="PascalFileEntry" /></summary>
+        public int Tail;
+    }
+
+    struct PascalFileEntry
+    {
+        /// <summary>0x00, first block of file</summary>
+        public short FirstBlock;
+        /// <summary>0x02, last block of file</summary>
+        public short LastBlock;
+        /// <summary>0x04, entry type</summary>
+        public PascalFileKind EntryType;
+        /// <summary>0x06, file name</summary>
+        public byte[] Filename;
+        /// <summary>0x16, bytes used in last block</summary>
+        public short LastBytes;
+        /// <summary>0x18, modification time</summary>
+        public short ModificationTime;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UCSDPascal/Super.cs b/Aaru.Filesystems/UCSDPascal/Super.cs
index fcd85b4b5..ea23397d4 100644
--- a/Aaru.Filesystems/UCSDPascal/Super.cs
+++ b/Aaru.Filesystems/UCSDPascal/Super.cs
@@ -41,143 +41,142 @@ using Claunia.Encoding;
 using Schemas;
 using Encoding = System.Text.Encoding;
 
-namespace Aaru.Filesystems.UCSDPascal
+namespace Aaru.Filesystems.UCSDPascal;
+
+// Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
+public sealed partial class PascalPlugin
 {
-    // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
-    public sealed partial class PascalPlugin
+    /// <inheritdoc />
+    public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
+                             Dictionary<string, string> options, string @namespace)
     {
-        /// <inheritdoc />
-        public ErrorNumber Mount(IMediaImage imagePlugin, Partition partition, Encoding encoding,
-                                 Dictionary<string, string> options, string @namespace)
+        _device  = imagePlugin;
+        Encoding = encoding ?? new Apple2();
+
+        options ??= GetDefaultOptions();
+
+        if(options.TryGetValue("debug", out string debugString))
+            bool.TryParse(debugString, out _debug);
+
+        if(_device.Info.Sectors < 3)
+            return ErrorNumber.InvalidArgument;
+
+        _multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
+
+        // Blocks 0 and 1 are boot code
+        ErrorNumber errno = _device.ReadSectors(_multiplier * 2, _multiplier, out _catalogBlocks);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        // On Apple //, it's little endian
+        // TODO: Fix
+        //BigEndianBitConverter.IsLittleEndian =
+        //    multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian;
+
+        _mountedVolEntry.FirstBlock = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x00);
+        _mountedVolEntry.LastBlock  = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x02);
+        _mountedVolEntry.EntryType  = (PascalFileKind)BigEndianBitConverter.ToInt16(_catalogBlocks, 0x04);
+        _mountedVolEntry.VolumeName = new byte[8];
+        Array.Copy(_catalogBlocks, 0x06, _mountedVolEntry.VolumeName, 0, 8);
+        _mountedVolEntry.Blocks   = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x0E);
+        _mountedVolEntry.Files    = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x10);
+        _mountedVolEntry.Dummy    = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x12);
+        _mountedVolEntry.LastBoot = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x14);
+        _mountedVolEntry.Tail     = BigEndianBitConverter.ToInt32(_catalogBlocks, 0x16);
+
+        if(_mountedVolEntry.FirstBlock       != 0                                       ||
+           _mountedVolEntry.LastBlock        <= _mountedVolEntry.FirstBlock             ||
+           (ulong)_mountedVolEntry.LastBlock > (_device.Info.Sectors / _multiplier) - 2 ||
+           (_mountedVolEntry.EntryType != PascalFileKind.Volume &&
+            _mountedVolEntry.EntryType != PascalFileKind.Secure)                ||
+           _mountedVolEntry.VolumeName[0] > 7                                   ||
+           _mountedVolEntry.Blocks        < 0                                   ||
+           (ulong)_mountedVolEntry.Blocks != _device.Info.Sectors / _multiplier ||
+           _mountedVolEntry.Files         < 0)
+            return ErrorNumber.InvalidArgument;
+
+        errno = _device.ReadSectors(_multiplier * 2,
+                                    (uint)(_mountedVolEntry.LastBlock - _mountedVolEntry.FirstBlock - 2) *
+                                    _multiplier, out _catalogBlocks);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        int offset = 26;
+
+        _fileEntries = new List<PascalFileEntry>();
+
+        while(offset + 26 < _catalogBlocks.Length)
         {
-            _device  = imagePlugin;
-            Encoding = encoding ?? new Apple2();
-
-            options ??= GetDefaultOptions();
-
-            if(options.TryGetValue("debug", out string debugString))
-                bool.TryParse(debugString, out _debug);
-
-            if(_device.Info.Sectors < 3)
-                return ErrorNumber.InvalidArgument;
-
-            _multiplier = (uint)(imagePlugin.Info.SectorSize == 256 ? 2 : 1);
-
-            // Blocks 0 and 1 are boot code
-            ErrorNumber errno = _device.ReadSectors(_multiplier * 2, _multiplier, out _catalogBlocks);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            // On Apple //, it's little endian
-            // TODO: Fix
-            //BigEndianBitConverter.IsLittleEndian =
-            //    multiplier == 2 ? !BitConverter.IsLittleEndian : BitConverter.IsLittleEndian;
-
-            _mountedVolEntry.FirstBlock = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x00);
-            _mountedVolEntry.LastBlock  = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x02);
-            _mountedVolEntry.EntryType  = (PascalFileKind)BigEndianBitConverter.ToInt16(_catalogBlocks, 0x04);
-            _mountedVolEntry.VolumeName = new byte[8];
-            Array.Copy(_catalogBlocks, 0x06, _mountedVolEntry.VolumeName, 0, 8);
-            _mountedVolEntry.Blocks   = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x0E);
-            _mountedVolEntry.Files    = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x10);
-            _mountedVolEntry.Dummy    = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x12);
-            _mountedVolEntry.LastBoot = BigEndianBitConverter.ToInt16(_catalogBlocks, 0x14);
-            _mountedVolEntry.Tail     = BigEndianBitConverter.ToInt32(_catalogBlocks, 0x16);
-
-            if(_mountedVolEntry.FirstBlock       != 0                                       ||
-               _mountedVolEntry.LastBlock        <= _mountedVolEntry.FirstBlock             ||
-               (ulong)_mountedVolEntry.LastBlock > (_device.Info.Sectors / _multiplier) - 2 ||
-               (_mountedVolEntry.EntryType != PascalFileKind.Volume &&
-                _mountedVolEntry.EntryType != PascalFileKind.Secure)                ||
-               _mountedVolEntry.VolumeName[0] > 7                                   ||
-               _mountedVolEntry.Blocks        < 0                                   ||
-               (ulong)_mountedVolEntry.Blocks != _device.Info.Sectors / _multiplier ||
-               _mountedVolEntry.Files         < 0)
-                return ErrorNumber.InvalidArgument;
-
-            errno = _device.ReadSectors(_multiplier * 2,
-                                        (uint)(_mountedVolEntry.LastBlock - _mountedVolEntry.FirstBlock - 2) *
-                                        _multiplier, out _catalogBlocks);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            int offset = 26;
-
-            _fileEntries = new List<PascalFileEntry>();
-
-            while(offset + 26 < _catalogBlocks.Length)
+            var entry = new PascalFileEntry
             {
-                var entry = new PascalFileEntry
-                {
-                    Filename         = new byte[16],
-                    FirstBlock       = BigEndianBitConverter.ToInt16(_catalogBlocks, offset + 0x00),
-                    LastBlock        = BigEndianBitConverter.ToInt16(_catalogBlocks, offset + 0x02),
-                    EntryType        = (PascalFileKind)BigEndianBitConverter.ToInt16(_catalogBlocks, offset + 0x04),
-                    LastBytes        = BigEndianBitConverter.ToInt16(_catalogBlocks, offset + 0x16),
-                    ModificationTime = BigEndianBitConverter.ToInt16(_catalogBlocks, offset + 0x18)
-                };
-
-                Array.Copy(_catalogBlocks, offset + 0x06, entry.Filename, 0, 16);
-
-                if(entry.Filename[0] <= 15 &&
-                   entry.Filename[0] > 0)
-                    _fileEntries.Add(entry);
-
-                offset += 26;
-            }
-
-            errno = _device.ReadSectors(0, 2 * _multiplier, out _bootBlocks);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            XmlFsType = new FileSystemType
-            {
-                Bootable       = !ArrayHelpers.ArrayIsNullOrEmpty(_bootBlocks),
-                Clusters       = (ulong)_mountedVolEntry.Blocks,
-                ClusterSize    = _device.Info.SectorSize,
-                Files          = (ulong)_mountedVolEntry.Files,
-                FilesSpecified = true,
-                Type           = "UCSD Pascal",
-                VolumeName     = StringHandlers.PascalToString(_mountedVolEntry.VolumeName, Encoding)
+                Filename         = new byte[16],
+                FirstBlock       = BigEndianBitConverter.ToInt16(_catalogBlocks, offset + 0x00),
+                LastBlock        = BigEndianBitConverter.ToInt16(_catalogBlocks, offset + 0x02),
+                EntryType        = (PascalFileKind)BigEndianBitConverter.ToInt16(_catalogBlocks, offset + 0x04),
+                LastBytes        = BigEndianBitConverter.ToInt16(_catalogBlocks, offset + 0x16),
+                ModificationTime = BigEndianBitConverter.ToInt16(_catalogBlocks, offset + 0x18)
             };
 
-            _mounted = true;
+            Array.Copy(_catalogBlocks, offset + 0x06, entry.Filename, 0, 16);
 
-            return ErrorNumber.NoError;
+            if(entry.Filename[0] <= 15 &&
+               entry.Filename[0] > 0)
+                _fileEntries.Add(entry);
+
+            offset += 26;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Unmount()
+        errno = _device.ReadSectors(0, 2 * _multiplier, out _bootBlocks);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        XmlFsType = new FileSystemType
         {
-            _mounted     = false;
-            _fileEntries = null;
+            Bootable       = !ArrayHelpers.ArrayIsNullOrEmpty(_bootBlocks),
+            Clusters       = (ulong)_mountedVolEntry.Blocks,
+            ClusterSize    = _device.Info.SectorSize,
+            Files          = (ulong)_mountedVolEntry.Files,
+            FilesSpecified = true,
+            Type           = "UCSD Pascal",
+            VolumeName     = StringHandlers.PascalToString(_mountedVolEntry.VolumeName, Encoding)
+        };
 
-            return ErrorNumber.NoError;
-        }
+        _mounted = true;
 
-        /// <inheritdoc />
-        public ErrorNumber StatFs(out FileSystemInfo stat)
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Unmount()
+    {
+        _mounted     = false;
+        _fileEntries = null;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber StatFs(out FileSystemInfo stat)
+    {
+        stat = new FileSystemInfo
         {
-            stat = new FileSystemInfo
-            {
-                Blocks         = (ulong)_mountedVolEntry.Blocks,
-                FilenameLength = 16,
-                Files          = (ulong)_mountedVolEntry.Files,
-                FreeBlocks     = 0,
-                PluginId       = Id,
-                Type           = "UCSD Pascal"
-            };
+            Blocks         = (ulong)_mountedVolEntry.Blocks,
+            FilenameLength = 16,
+            Files          = (ulong)_mountedVolEntry.Files,
+            FreeBlocks     = 0,
+            PluginId       = Id,
+            Type           = "UCSD Pascal"
+        };
 
-            stat.FreeBlocks =
-                (ulong)(_mountedVolEntry.Blocks - (_mountedVolEntry.LastBlock - _mountedVolEntry.FirstBlock));
+        stat.FreeBlocks =
+            (ulong)(_mountedVolEntry.Blocks - (_mountedVolEntry.LastBlock - _mountedVolEntry.FirstBlock));
 
-            foreach(PascalFileEntry entry in _fileEntries)
-                stat.FreeBlocks -= (ulong)(entry.LastBlock - entry.FirstBlock);
+        foreach(PascalFileEntry entry in _fileEntries)
+            stat.FreeBlocks -= (ulong)(entry.LastBlock - entry.FirstBlock);
 
-            return ErrorNumber.NotImplemented;
-        }
+        return ErrorNumber.NotImplemented;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs b/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs
index 9af259db2..2527e2b35 100644
--- a/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs
+++ b/Aaru.Filesystems/UCSDPascal/UCSDPascal.cs
@@ -37,66 +37,65 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Filesystems.UCSDPascal
+namespace Aaru.Filesystems.UCSDPascal;
+
+// Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
+/// <inheritdoc />
+/// <summary>Implements the U.C.S.D. Pascal filesystem</summary>
+public sealed partial class PascalPlugin : IReadOnlyFilesystem
 {
-    // Information from Call-A.P.P.L.E. Pascal Disk Directory Structure
+    byte[]                _bootBlocks;
+    byte[]                _catalogBlocks;
+    bool                  _debug;
+    IMediaImage           _device;
+    List<PascalFileEntry> _fileEntries;
+    bool                  _mounted;
+    PascalVolumeEntry     _mountedVolEntry;
+    /// <summary>Apple II disks use 256 bytes / sector, but filesystem assumes it's 512 bytes / sector</summary>
+    uint _multiplier;
+
     /// <inheritdoc />
-    /// <summary>Implements the U.C.S.D. Pascal filesystem</summary>
-    public sealed partial class PascalPlugin : IReadOnlyFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public string Name => "U.C.S.D. Pascal filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("B0AC2CB5-72AA-473A-9200-270B5A2C2D53");
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public ErrorNumber ListXAttr(string path, out List<string> xattrs)
     {
-        byte[]                _bootBlocks;
-        byte[]                _catalogBlocks;
-        bool                  _debug;
-        IMediaImage           _device;
-        List<PascalFileEntry> _fileEntries;
-        bool                  _mounted;
-        PascalVolumeEntry     _mountedVolEntry;
-        /// <summary>Apple II disks use 256 bytes / sector, but filesystem assumes it's 512 bytes / sector</summary>
-        uint _multiplier;
+        xattrs = null;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public string Name => "U.C.S.D. Pascal filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("B0AC2CB5-72AA-473A-9200-270B5A2C2D53");
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public ErrorNumber ListXAttr(string path, out List<string> xattrs)
-        {
-            xattrs = null;
-
-            return ErrorNumber.NotSupported;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf) => ErrorNumber.NotSupported;
-
-        /// <inheritdoc />
-        public ErrorNumber ReadLink(string path, out string dest)
-        {
-            dest = null;
-
-            return ErrorNumber.NotSupported;
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
-            new (string name, Type type, string description)[]
-                {};
-
-        /// <inheritdoc />
-        public Dictionary<string, string> Namespaces => null;
-
-        static Dictionary<string, string> GetDefaultOptions() => new()
-        {
-            {
-                "debug", false.ToString()
-            }
-        };
+        return ErrorNumber.NotSupported;
     }
+
+    /// <inheritdoc />
+    public ErrorNumber GetXattr(string path, string xattr, ref byte[] buf) => ErrorNumber.NotSupported;
+
+    /// <inheritdoc />
+    public ErrorNumber ReadLink(string path, out string dest)
+    {
+        dest = null;
+
+        return ErrorNumber.NotSupported;
+    }
+
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description)> SupportedOptions =>
+        new (string name, Type type, string description)[]
+            {};
+
+    /// <inheritdoc />
+    public Dictionary<string, string> Namespaces => null;
+
+    static Dictionary<string, string> GetDefaultOptions() => new()
+    {
+        {
+            "debug", false.ToString()
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UDF.cs b/Aaru.Filesystems/UDF.cs
index 1cee8f5e2..39f8e47bc 100644
--- a/Aaru.Filesystems/UDF.cs
+++ b/Aaru.Filesystems/UDF.cs
@@ -43,539 +43,538 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// TODO: Detect bootable
+/// <inheritdoc />
+/// <summary>Implements detection of the Universal Disk Format filesystem</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class UDF : IFilesystem
 {
-    // TODO: Detect bootable
-    /// <inheritdoc />
-    /// <summary>Implements detection of the Universal Disk Format filesystem</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class UDF : IFilesystem
+    readonly byte[] _magic =
     {
-        readonly byte[] _magic =
+        0x2A, 0x4F, 0x53, 0x54, 0x41, 0x20, 0x55, 0x44, 0x46, 0x20, 0x43, 0x6F, 0x6D, 0x70, 0x6C, 0x69, 0x61, 0x6E,
+        0x74, 0x00, 0x00, 0x00, 0x00
+    };
+
+    /// <inheritdoc />
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Universal Disk Format";
+    /// <inheritdoc />
+    public Guid Id => new("83976FEC-A91B-464B-9293-56C719461BAB");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
+    {
+        // UDF needs at least that
+        if(partition.End - partition.Start < 256)
+            return false;
+
+        // UDF needs at least that
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
+
+        byte[] sector;
+        var    anchor = new AnchorVolumeDescriptorPointer();
+
+        // All positions where anchor may reside, with the ratio between 512 and 2048bps
+        ulong[][] positions =
         {
-            0x2A, 0x4F, 0x53, 0x54, 0x41, 0x20, 0x55, 0x44, 0x46, 0x20, 0x43, 0x6F, 0x6D, 0x70, 0x6C, 0x69, 0x61, 0x6E,
-            0x74, 0x00, 0x00, 0x00, 0x00
+            new ulong[]
+            {
+                256, 1
+            },
+            new ulong[]
+            {
+                512, 1
+            },
+            new ulong[]
+            {
+                partition.End - 256, 1
+            },
+            new ulong[]
+            {
+                partition.End, 1
+            },
+            new ulong[]
+            {
+                1024, 4
+            },
+            new ulong[]
+            {
+                2048, 4
+            },
+            new ulong[]
+            {
+                partition.End - 1024, 4
+            },
+            new ulong[]
+            {
+                partition.End - 4, 4
+            }
         };
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Universal Disk Format";
-        /// <inheritdoc />
-        public Guid Id => new("83976FEC-A91B-464B-9293-56C719461BAB");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        bool anchorFound = false;
+        uint ratio       = 1;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        foreach(ulong[] position in positions.Where(position => position[0] + partition.Start + position[1] <=
+                                                                partition.End && position[0] < partition.End))
         {
-            // UDF needs at least that
-            if(partition.End - partition.Start < 256)
-                return false;
-
-            // UDF needs at least that
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
-
-            byte[] sector;
-            var    anchor = new AnchorVolumeDescriptorPointer();
-
-            // All positions where anchor may reside, with the ratio between 512 and 2048bps
-            ulong[][] positions =
-            {
-                new ulong[]
-                {
-                    256, 1
-                },
-                new ulong[]
-                {
-                    512, 1
-                },
-                new ulong[]
-                {
-                    partition.End - 256, 1
-                },
-                new ulong[]
-                {
-                    partition.End, 1
-                },
-                new ulong[]
-                {
-                    1024, 4
-                },
-                new ulong[]
-                {
-                    2048, 4
-                },
-                new ulong[]
-                {
-                    partition.End - 1024, 4
-                },
-                new ulong[]
-                {
-                    partition.End - 4, 4
-                }
-            };
-
-            bool anchorFound = false;
-            uint ratio       = 1;
-
-            foreach(ulong[] position in positions.Where(position => position[0] + partition.Start + position[1] <=
-                                                                    partition.End && position[0] < partition.End))
-            {
-                ErrorNumber errno = imagePlugin.ReadSectors(position[0], (uint)position[1], out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                anchor = Marshal.ByteArrayToStructureLittleEndian<AnchorVolumeDescriptorPointer>(sector);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagIdentifier = {0}", anchor.tag.tagIdentifier);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.descriptorVersion = {0}",
-                                           anchor.tag.descriptorVersion);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagChecksum = 0x{0:X2}", anchor.tag.tagChecksum);
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.reserved = {0}", anchor.tag.reserved);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagSerialNumber = {0}",
-                                           anchor.tag.tagSerialNumber);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.descriptorCrc = 0x{0:X4}",
-                                           anchor.tag.descriptorCrc);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.descriptorCrcLength = {0}",
-                                           anchor.tag.descriptorCrcLength);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagLocation = {0}", anchor.tag.tagLocation);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.mainVolumeDescriptorSequenceExtent.length = {0}",
-                                           anchor.mainVolumeDescriptorSequenceExtent.length);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.mainVolumeDescriptorSequenceExtent.location = {0}",
-                                           anchor.mainVolumeDescriptorSequenceExtent.location);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.reserveVolumeDescriptorSequenceExtent.length = {0}",
-                                           anchor.reserveVolumeDescriptorSequenceExtent.length);
-
-                AaruConsole.DebugWriteLine("UDF Plugin", "anchor.reserveVolumeDescriptorSequenceExtent.location = {0}",
-                                           anchor.reserveVolumeDescriptorSequenceExtent.location);
-
-                if(anchor.tag.tagIdentifier != TagIdentifier.AnchorVolumeDescriptorPointer ||
-                   anchor.tag.tagLocation   != position[0] / position[1]                   ||
-                   (anchor.mainVolumeDescriptorSequenceExtent.location * position[1]) + partition.Start >=
-                   partition.End)
-                    continue;
-
-                anchorFound = true;
-                ratio       = (uint)position[1];
-
-                break;
-            }
-
-            if(!anchorFound)
-                return false;
-
-            ulong count = 0;
-
-            while(count < 256)
-            {
-                ErrorNumber errno =
-                    imagePlugin.
-                        ReadSectors(partition.Start + (anchor.mainVolumeDescriptorSequenceExtent.location * ratio) + (count * ratio),
-                                    ratio, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                {
-                    count++;
-
-                    continue;
-                }
-
-                var  tagId    = (TagIdentifier)BitConverter.ToUInt16(sector, 0);
-                uint location = BitConverter.ToUInt32(sector, 0x0C);
-
-                if(location == (partition.Start / ratio) + anchor.mainVolumeDescriptorSequenceExtent.location + count)
-                {
-                    if(tagId == TagIdentifier.TerminatingDescriptor)
-                        break;
-
-                    if(tagId == TagIdentifier.LogicalVolumeDescriptor)
-                    {
-                        LogicalVolumeDescriptor lvd =
-                            Marshal.ByteArrayToStructureLittleEndian<LogicalVolumeDescriptor>(sector);
-
-                        return _magic.SequenceEqual(lvd.domainIdentifier.identifier);
-                    }
-                }
-                else
-                    break;
-
-                count++;
-            }
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            information = "";
-            ErrorNumber errno;
-
-            // UDF is always UTF-8
-            Encoding = Encoding.UTF8;
-            byte[] sector;
-
-            var sbInformation = new StringBuilder();
-
-            sbInformation.AppendLine("Universal Disk Format");
-
-            var anchor = new AnchorVolumeDescriptorPointer();
-
-            // All positions where anchor may reside, with the ratio between 512 and 2048bps
-            ulong[][] positions =
-            {
-                new ulong[]
-                {
-                    256, 1
-                },
-                new ulong[]
-                {
-                    512, 1
-                },
-                new ulong[]
-                {
-                    partition.End - 256, 1
-                },
-                new ulong[]
-                {
-                    partition.End, 1
-                },
-                new ulong[]
-                {
-                    1024, 4
-                },
-                new ulong[]
-                {
-                    2048, 4
-                },
-                new ulong[]
-                {
-                    partition.End - 1024, 4
-                },
-                new ulong[]
-                {
-                    partition.End - 4, 4
-                }
-            };
-
-            uint ratio = 1;
-
-            foreach(ulong[] position in positions)
-            {
-                errno = imagePlugin.ReadSectors(position[0], (uint)position[1], out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                anchor = Marshal.ByteArrayToStructureLittleEndian<AnchorVolumeDescriptorPointer>(sector);
-
-                if(anchor.tag.tagIdentifier != TagIdentifier.AnchorVolumeDescriptorPointer ||
-                   anchor.tag.tagLocation != position[0] / position[1] ||
-                   anchor.mainVolumeDescriptorSequenceExtent.location + partition.Start >= partition.End)
-                    continue;
-
-                ratio = (uint)position[1];
-
-                break;
-            }
-
-            ulong count = 0;
-
-            var                              pvd = new PrimaryVolumeDescriptor();
-            var                              lvd = new LogicalVolumeDescriptor();
-            LogicalVolumeIntegrityDescriptor lvid;
-            var                              lvidiu = new LogicalVolumeIntegrityDescriptorImplementationUse();
-
-            while(count < 256)
-            {
-                errno =
-                    imagePlugin.
-                        ReadSectors(partition.Start + (anchor.mainVolumeDescriptorSequenceExtent.location * ratio) + (count * ratio),
-                                    ratio, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                var  tagId    = (TagIdentifier)BitConverter.ToUInt16(sector, 0);
-                uint location = BitConverter.ToUInt32(sector, 0x0C);
-
-                if(location == (partition.Start / ratio) + anchor.mainVolumeDescriptorSequenceExtent.location + count)
-                {
-                    if(tagId == TagIdentifier.TerminatingDescriptor)
-                        break;
-
-                    switch(tagId)
-                    {
-                        case TagIdentifier.LogicalVolumeDescriptor:
-                            lvd = Marshal.ByteArrayToStructureLittleEndian<LogicalVolumeDescriptor>(sector);
-
-                            break;
-                        case TagIdentifier.PrimaryVolumeDescriptor:
-                            pvd = Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(sector);
-
-                            break;
-                    }
-                }
-                else
-                    break;
-
-                count++;
-            }
-
-            errno = imagePlugin.ReadSectors(lvd.integritySequenceExtent.location * ratio, ratio, out sector);
+            ErrorNumber errno = imagePlugin.ReadSectors(position[0], (uint)position[1], out sector);
 
             if(errno != ErrorNumber.NoError)
-                return;
+                continue;
 
-            lvid = Marshal.ByteArrayToStructureLittleEndian<LogicalVolumeIntegrityDescriptor>(sector);
+            anchor = Marshal.ByteArrayToStructureLittleEndian<AnchorVolumeDescriptorPointer>(sector);
 
-            if(lvid.tag.tagIdentifier == TagIdentifier.LogicalVolumeIntegrityDescriptor &&
-               lvid.tag.tagLocation   == lvd.integritySequenceExtent.location)
-                lvidiu =
-                    Marshal.ByteArrayToStructureLittleEndian<LogicalVolumeIntegrityDescriptorImplementationUse>(sector,
-                        (int)((lvid.numberOfPartitions * 8) + 80),
-                        System.Runtime.InteropServices.Marshal.SizeOf(lvidiu));
-            else
-                lvid = new LogicalVolumeIntegrityDescriptor();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagIdentifier = {0}", anchor.tag.tagIdentifier);
 
-            sbInformation.AppendFormat("Volume is number {0} of {1}", pvd.volumeSequenceNumber,
-                                       pvd.maximumVolumeSequenceNumber).AppendLine();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.descriptorVersion = {0}",
+                                       anchor.tag.descriptorVersion);
 
-            sbInformation.AppendFormat("Volume set identifier: {0}",
-                                       StringHandlers.DecompressUnicode(pvd.volumeSetIdentifier)).AppendLine();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagChecksum = 0x{0:X2}", anchor.tag.tagChecksum);
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.reserved = {0}", anchor.tag.reserved);
 
-            sbInformation.
-                AppendFormat("Volume name: {0}", StringHandlers.DecompressUnicode(lvd.logicalVolumeIdentifier)).
-                AppendLine();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagSerialNumber = {0}",
+                                       anchor.tag.tagSerialNumber);
 
-            sbInformation.AppendFormat("Volume uses {0} bytes per block", lvd.logicalBlockSize).AppendLine();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.descriptorCrc = 0x{0:X4}",
+                                       anchor.tag.descriptorCrc);
 
-            sbInformation.AppendFormat("Volume was last written in {0}", EcmaToDateTime(lvid.recordingDateTime)).
-                          AppendLine();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.descriptorCrcLength = {0}",
+                                       anchor.tag.descriptorCrcLength);
 
-            sbInformation.AppendFormat("Volume contains {0} partitions", lvid.numberOfPartitions).AppendLine();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.tag.tagLocation = {0}", anchor.tag.tagLocation);
 
-            sbInformation.
-                AppendFormat("Volume contains {0} files and {1} directories", lvidiu.files, lvidiu.directories).
-                AppendLine();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.mainVolumeDescriptorSequenceExtent.length = {0}",
+                                       anchor.mainVolumeDescriptorSequenceExtent.length);
 
-            sbInformation.AppendFormat("Volume conforms to {0}",
-                                       Encoding.GetString(lvd.domainIdentifier.identifier).TrimEnd('\u0000')).
-                          AppendLine();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.mainVolumeDescriptorSequenceExtent.location = {0}",
+                                       anchor.mainVolumeDescriptorSequenceExtent.location);
 
-            sbInformation.AppendFormat("Volume was last written by: {0}",
-                                       Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000')).
-                          AppendLine();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.reserveVolumeDescriptorSequenceExtent.length = {0}",
+                                       anchor.reserveVolumeDescriptorSequenceExtent.length);
 
-            sbInformation.AppendFormat("Volume requires UDF version {0}.{1:X2} to be read",
-                                       Convert.ToInt32($"{(lvidiu.minimumReadUDF & 0xFF00) >> 8}", 10),
-                                       Convert.ToInt32($"{lvidiu.minimumReadUDF & 0xFF}", 10)).AppendLine();
+            AaruConsole.DebugWriteLine("UDF Plugin", "anchor.reserveVolumeDescriptorSequenceExtent.location = {0}",
+                                       anchor.reserveVolumeDescriptorSequenceExtent.location);
 
-            sbInformation.AppendFormat("Volume requires UDF version {0}.{1:X2} to be written to",
-                                       Convert.ToInt32($"{(lvidiu.minimumWriteUDF & 0xFF00) >> 8}", 10),
-                                       Convert.ToInt32($"{lvidiu.minimumWriteUDF & 0xFF}", 10)).AppendLine();
+            if(anchor.tag.tagIdentifier != TagIdentifier.AnchorVolumeDescriptorPointer ||
+               anchor.tag.tagLocation   != position[0] / position[1]                   ||
+               (anchor.mainVolumeDescriptorSequenceExtent.location * position[1]) + partition.Start >=
+               partition.End)
+                continue;
 
-            sbInformation.AppendFormat("Volume cannot be written by any UDF version higher than {0}.{1:X2}",
-                                       Convert.ToInt32($"{(lvidiu.maximumWriteUDF & 0xFF00) >> 8}", 10),
-                                       Convert.ToInt32($"{lvidiu.maximumWriteUDF & 0xFF}", 10)).AppendLine();
+            anchorFound = true;
+            ratio       = (uint)position[1];
 
-            XmlFsType = new FileSystemType
+            break;
+        }
+
+        if(!anchorFound)
+            return false;
+
+        ulong count = 0;
+
+        while(count < 256)
+        {
+            ErrorNumber errno =
+                imagePlugin.
+                    ReadSectors(partition.Start + (anchor.mainVolumeDescriptorSequenceExtent.location * ratio) + (count * ratio),
+                                ratio, out sector);
+
+            if(errno != ErrorNumber.NoError)
             {
-                Type =
-                    $"UDF v{Convert.ToInt32($"{(lvidiu.maximumWriteUDF & 0xFF00) >> 8}", 10)}.{Convert.ToInt32($"{lvidiu.maximumWriteUDF & 0xFF}", 10):X2}",
-                ApplicationIdentifier = Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000'),
-                ClusterSize = lvd.logicalBlockSize,
-                ModificationDate = EcmaToDateTime(lvid.recordingDateTime),
-                ModificationDateSpecified = true,
-                Files = lvidiu.files,
-                FilesSpecified = true,
-                VolumeName = StringHandlers.DecompressUnicode(lvd.logicalVolumeIdentifier),
-                VolumeSetIdentifier = StringHandlers.DecompressUnicode(pvd.volumeSetIdentifier),
-                VolumeSerial = StringHandlers.DecompressUnicode(pvd.volumeSetIdentifier),
-                SystemIdentifier = Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000')
-            };
+                count++;
 
-            XmlFsType.Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
-                                 XmlFsType.ClusterSize;
+                continue;
+            }
 
-            information = sbInformation.ToString();
+            var  tagId    = (TagIdentifier)BitConverter.ToUInt16(sector, 0);
+            uint location = BitConverter.ToUInt32(sector, 0x0C);
+
+            if(location == (partition.Start / ratio) + anchor.mainVolumeDescriptorSequenceExtent.location + count)
+            {
+                if(tagId == TagIdentifier.TerminatingDescriptor)
+                    break;
+
+                if(tagId == TagIdentifier.LogicalVolumeDescriptor)
+                {
+                    LogicalVolumeDescriptor lvd =
+                        Marshal.ByteArrayToStructureLittleEndian<LogicalVolumeDescriptor>(sector);
+
+                    return _magic.SequenceEqual(lvd.domainIdentifier.identifier);
+                }
+            }
+            else
+                break;
+
+            count++;
         }
 
-        static DateTime EcmaToDateTime(Timestamp timestamp) => DateHandlers.EcmaToDateTime(timestamp.typeAndZone,
-            timestamp.year, timestamp.month, timestamp.day, timestamp.hour, timestamp.minute, timestamp.second,
-            timestamp.centiseconds, timestamp.hundredsMicroseconds, timestamp.microseconds);
+        return false;
+    }
 
-        [Flags]
-        enum EntityFlags : byte
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        information = "";
+        ErrorNumber errno;
+
+        // UDF is always UTF-8
+        Encoding = Encoding.UTF8;
+        byte[] sector;
+
+        var sbInformation = new StringBuilder();
+
+        sbInformation.AppendLine("Universal Disk Format");
+
+        var anchor = new AnchorVolumeDescriptorPointer();
+
+        // All positions where anchor may reside, with the ratio between 512 and 2048bps
+        ulong[][] positions =
         {
-            Dirty = 0x01, Protected = 0x02
-        }
+            new ulong[]
+            {
+                256, 1
+            },
+            new ulong[]
+            {
+                512, 1
+            },
+            new ulong[]
+            {
+                partition.End - 256, 1
+            },
+            new ulong[]
+            {
+                partition.End, 1
+            },
+            new ulong[]
+            {
+                1024, 4
+            },
+            new ulong[]
+            {
+                2048, 4
+            },
+            new ulong[]
+            {
+                partition.End - 1024, 4
+            },
+            new ulong[]
+            {
+                partition.End - 4, 4
+            }
+        };
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct EntityIdentifier
+        uint ratio = 1;
+
+        foreach(ulong[] position in positions)
         {
-            /// <summary>Entity flags</summary>
-            public readonly EntityFlags flags;
-            /// <summary>Structure identifier</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 23)]
-            public readonly byte[] identifier;
-            /// <summary>Structure data</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] identifierSuffix;
+            errno = imagePlugin.ReadSectors(position[0], (uint)position[1], out sector);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            anchor = Marshal.ByteArrayToStructureLittleEndian<AnchorVolumeDescriptorPointer>(sector);
+
+            if(anchor.tag.tagIdentifier != TagIdentifier.AnchorVolumeDescriptorPointer ||
+               anchor.tag.tagLocation != position[0] / position[1] ||
+               anchor.mainVolumeDescriptorSequenceExtent.location + partition.Start >= partition.End)
+                continue;
+
+            ratio = (uint)position[1];
+
+            break;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Timestamp
+        ulong count = 0;
+
+        var                              pvd = new PrimaryVolumeDescriptor();
+        var                              lvd = new LogicalVolumeDescriptor();
+        LogicalVolumeIntegrityDescriptor lvid;
+        var                              lvidiu = new LogicalVolumeIntegrityDescriptorImplementationUse();
+
+        while(count < 256)
         {
-            public readonly ushort typeAndZone;
-            public readonly short  year;
-            public readonly byte   month;
-            public readonly byte   day;
-            public readonly byte   hour;
-            public readonly byte   minute;
-            public readonly byte   second;
-            public readonly byte   centiseconds;
-            public readonly byte   hundredsMicroseconds;
-            public readonly byte   microseconds;
+            errno =
+                imagePlugin.
+                    ReadSectors(partition.Start + (anchor.mainVolumeDescriptorSequenceExtent.location * ratio) + (count * ratio),
+                                ratio, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                continue;
+
+            var  tagId    = (TagIdentifier)BitConverter.ToUInt16(sector, 0);
+            uint location = BitConverter.ToUInt32(sector, 0x0C);
+
+            if(location == (partition.Start / ratio) + anchor.mainVolumeDescriptorSequenceExtent.location + count)
+            {
+                if(tagId == TagIdentifier.TerminatingDescriptor)
+                    break;
+
+                switch(tagId)
+                {
+                    case TagIdentifier.LogicalVolumeDescriptor:
+                        lvd = Marshal.ByteArrayToStructureLittleEndian<LogicalVolumeDescriptor>(sector);
+
+                        break;
+                    case TagIdentifier.PrimaryVolumeDescriptor:
+                        pvd = Marshal.ByteArrayToStructureLittleEndian<PrimaryVolumeDescriptor>(sector);
+
+                        break;
+                }
+            }
+            else
+                break;
+
+            count++;
         }
 
-        enum TagIdentifier : ushort
+        errno = imagePlugin.ReadSectors(lvd.integritySequenceExtent.location * ratio, ratio, out sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        lvid = Marshal.ByteArrayToStructureLittleEndian<LogicalVolumeIntegrityDescriptor>(sector);
+
+        if(lvid.tag.tagIdentifier == TagIdentifier.LogicalVolumeIntegrityDescriptor &&
+           lvid.tag.tagLocation   == lvd.integritySequenceExtent.location)
+            lvidiu =
+                Marshal.ByteArrayToStructureLittleEndian<LogicalVolumeIntegrityDescriptorImplementationUse>(sector,
+                    (int)((lvid.numberOfPartitions * 8) + 80),
+                    System.Runtime.InteropServices.Marshal.SizeOf(lvidiu));
+        else
+            lvid = new LogicalVolumeIntegrityDescriptor();
+
+        sbInformation.AppendFormat("Volume is number {0} of {1}", pvd.volumeSequenceNumber,
+                                   pvd.maximumVolumeSequenceNumber).AppendLine();
+
+        sbInformation.AppendFormat("Volume set identifier: {0}",
+                                   StringHandlers.DecompressUnicode(pvd.volumeSetIdentifier)).AppendLine();
+
+        sbInformation.
+            AppendFormat("Volume name: {0}", StringHandlers.DecompressUnicode(lvd.logicalVolumeIdentifier)).
+            AppendLine();
+
+        sbInformation.AppendFormat("Volume uses {0} bytes per block", lvd.logicalBlockSize).AppendLine();
+
+        sbInformation.AppendFormat("Volume was last written in {0}", EcmaToDateTime(lvid.recordingDateTime)).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Volume contains {0} partitions", lvid.numberOfPartitions).AppendLine();
+
+        sbInformation.
+            AppendFormat("Volume contains {0} files and {1} directories", lvidiu.files, lvidiu.directories).
+            AppendLine();
+
+        sbInformation.AppendFormat("Volume conforms to {0}",
+                                   Encoding.GetString(lvd.domainIdentifier.identifier).TrimEnd('\u0000')).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Volume was last written by: {0}",
+                                   Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000')).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Volume requires UDF version {0}.{1:X2} to be read",
+                                   Convert.ToInt32($"{(lvidiu.minimumReadUDF & 0xFF00) >> 8}", 10),
+                                   Convert.ToInt32($"{lvidiu.minimumReadUDF & 0xFF}", 10)).AppendLine();
+
+        sbInformation.AppendFormat("Volume requires UDF version {0}.{1:X2} to be written to",
+                                   Convert.ToInt32($"{(lvidiu.minimumWriteUDF & 0xFF00) >> 8}", 10),
+                                   Convert.ToInt32($"{lvidiu.minimumWriteUDF & 0xFF}", 10)).AppendLine();
+
+        sbInformation.AppendFormat("Volume cannot be written by any UDF version higher than {0}.{1:X2}",
+                                   Convert.ToInt32($"{(lvidiu.maximumWriteUDF & 0xFF00) >> 8}", 10),
+                                   Convert.ToInt32($"{lvidiu.maximumWriteUDF & 0xFF}", 10)).AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            PrimaryVolumeDescriptor           = 1, AnchorVolumeDescriptorPointer = 2, VolumeDescriptorPointer = 3,
-            ImplementationUseVolumeDescriptor = 4, PartitionDescriptor = 5, LogicalVolumeDescriptor = 6,
-            UnallocatedSpaceDescriptor        = 7, TerminatingDescriptor = 8, LogicalVolumeIntegrityDescriptor = 9
-        }
+            Type =
+                $"UDF v{Convert.ToInt32($"{(lvidiu.maximumWriteUDF & 0xFF00) >> 8}", 10)}.{Convert.ToInt32($"{lvidiu.maximumWriteUDF & 0xFF}", 10):X2}",
+            ApplicationIdentifier     = Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000'),
+            ClusterSize               = lvd.logicalBlockSize,
+            ModificationDate          = EcmaToDateTime(lvid.recordingDateTime),
+            ModificationDateSpecified = true,
+            Files                     = lvidiu.files,
+            FilesSpecified            = true,
+            VolumeName                = StringHandlers.DecompressUnicode(lvd.logicalVolumeIdentifier),
+            VolumeSetIdentifier       = StringHandlers.DecompressUnicode(pvd.volumeSetIdentifier),
+            VolumeSerial              = StringHandlers.DecompressUnicode(pvd.volumeSetIdentifier),
+            SystemIdentifier          = Encoding.GetString(pvd.implementationIdentifier.identifier).TrimEnd('\u0000')
+        };
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DescriptorTag
-        {
-            public readonly TagIdentifier tagIdentifier;
-            public readonly ushort        descriptorVersion;
-            public readonly byte          tagChecksum;
-            public readonly byte          reserved;
-            public readonly ushort        tagSerialNumber;
-            public readonly ushort        descriptorCrc;
-            public readonly ushort        descriptorCrcLength;
-            public readonly uint          tagLocation;
-        }
+        XmlFsType.Clusters = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize /
+                             XmlFsType.ClusterSize;
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ExtentDescriptor
-        {
-            public readonly uint length;
-            public readonly uint location;
-        }
+        information = sbInformation.ToString();
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CharacterSpecification
-        {
-            public readonly byte type;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 63)]
-            public readonly byte[] information;
-        }
+    static DateTime EcmaToDateTime(Timestamp timestamp) => DateHandlers.EcmaToDateTime(timestamp.typeAndZone,
+        timestamp.year, timestamp.month, timestamp.day, timestamp.hour, timestamp.minute, timestamp.second,
+        timestamp.centiseconds, timestamp.hundredsMicroseconds, timestamp.microseconds);
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct AnchorVolumeDescriptorPointer
-        {
-            public readonly DescriptorTag    tag;
-            public readonly ExtentDescriptor mainVolumeDescriptorSequenceExtent;
-            public readonly ExtentDescriptor reserveVolumeDescriptorSequenceExtent;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 480)]
-            public readonly byte[] reserved;
-        }
+    [Flags]
+    enum EntityFlags : byte
+    {
+        Dirty = 0x01, Protected = 0x02
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct PrimaryVolumeDescriptor
-        {
-            public readonly DescriptorTag tag;
-            public readonly uint          volumeDescriptorSequenceNumber;
-            public readonly uint          primaryVolumeDescriptorNumber;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] volumeIdentifier;
-            public readonly ushort volumeSequenceNumber;
-            public readonly ushort maximumVolumeSequenceNumber;
-            public readonly ushort interchangeLevel;
-            public readonly ushort maximumInterchangeLevel;
-            public readonly uint   characterSetList;
-            public readonly uint   maximumCharacterSetList;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] volumeSetIdentifier;
-            public readonly CharacterSpecification descriptorCharacterSet;
-            public readonly CharacterSpecification explanatoryCharacterSet;
-            public readonly ExtentDescriptor       volumeAbstract;
-            public readonly ExtentDescriptor       volumeCopyright;
-            public readonly EntityIdentifier       applicationIdentifier;
-            public readonly Timestamp              recordingDateTime;
-            public readonly EntityIdentifier       implementationIdentifier;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] implementationUse;
-            public readonly uint   predecessorVolumeDescriptorSequenceLocation;
-            public readonly ushort flags;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
-            public readonly byte[] reserved;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct EntityIdentifier
+    {
+        /// <summary>Entity flags</summary>
+        public readonly EntityFlags flags;
+        /// <summary>Structure identifier</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 23)]
+        public readonly byte[] identifier;
+        /// <summary>Structure data</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] identifierSuffix;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct LogicalVolumeDescriptor
-        {
-            public readonly DescriptorTag          tag;
-            public readonly uint                   volumeDescriptorSequenceNumber;
-            public readonly CharacterSpecification descriptorCharacterSet;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] logicalVolumeIdentifier;
-            public readonly uint             logicalBlockSize;
-            public readonly EntityIdentifier domainIdentifier;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] logicalVolumeContentsUse;
-            public readonly uint             mapTableLength;
-            public readonly uint             numberOfPartitionMaps;
-            public readonly EntityIdentifier implementationIdentifier;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly byte[] implementationUse;
-            public readonly ExtentDescriptor integritySequenceExtent;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Timestamp
+    {
+        public readonly ushort typeAndZone;
+        public readonly short  year;
+        public readonly byte   month;
+        public readonly byte   day;
+        public readonly byte   hour;
+        public readonly byte   minute;
+        public readonly byte   second;
+        public readonly byte   centiseconds;
+        public readonly byte   hundredsMicroseconds;
+        public readonly byte   microseconds;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct LogicalVolumeIntegrityDescriptor
-        {
-            public readonly DescriptorTag    tag;
-            public readonly Timestamp        recordingDateTime;
-            public readonly uint             integrityType;
-            public readonly ExtentDescriptor nextIntegrityExtent;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] logicalVolumeContentsUse;
-            public readonly uint numberOfPartitions;
-            public readonly uint lengthOfImplementationUse;
+    enum TagIdentifier : ushort
+    {
+        PrimaryVolumeDescriptor           = 1, AnchorVolumeDescriptorPointer = 2, VolumeDescriptorPointer          = 3,
+        ImplementationUseVolumeDescriptor = 4, PartitionDescriptor           = 5, LogicalVolumeDescriptor          = 6,
+        UnallocatedSpaceDescriptor        = 7, TerminatingDescriptor         = 8, LogicalVolumeIntegrityDescriptor = 9
+    }
 
-            // Follows uint[numberOfPartitions] freeSpaceTable;
-            // Follows uint[numberOfPartitions] sizeTable;
-            // Follows byte[lengthOfImplementationUse] implementationUse;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DescriptorTag
+    {
+        public readonly TagIdentifier tagIdentifier;
+        public readonly ushort        descriptorVersion;
+        public readonly byte          tagChecksum;
+        public readonly byte          reserved;
+        public readonly ushort        tagSerialNumber;
+        public readonly ushort        descriptorCrc;
+        public readonly ushort        descriptorCrcLength;
+        public readonly uint          tagLocation;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct LogicalVolumeIntegrityDescriptorImplementationUse
-        {
-            public readonly EntityIdentifier implementationId;
-            public readonly uint             files;
-            public readonly uint             directories;
-            public readonly ushort           minimumReadUDF;
-            public readonly ushort           minimumWriteUDF;
-            public readonly ushort           maximumWriteUDF;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ExtentDescriptor
+    {
+        public readonly uint length;
+        public readonly uint location;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CharacterSpecification
+    {
+        public readonly byte type;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 63)]
+        public readonly byte[] information;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct AnchorVolumeDescriptorPointer
+    {
+        public readonly DescriptorTag    tag;
+        public readonly ExtentDescriptor mainVolumeDescriptorSequenceExtent;
+        public readonly ExtentDescriptor reserveVolumeDescriptorSequenceExtent;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 480)]
+        public readonly byte[] reserved;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct PrimaryVolumeDescriptor
+    {
+        public readonly DescriptorTag tag;
+        public readonly uint          volumeDescriptorSequenceNumber;
+        public readonly uint          primaryVolumeDescriptorNumber;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] volumeIdentifier;
+        public readonly ushort volumeSequenceNumber;
+        public readonly ushort maximumVolumeSequenceNumber;
+        public readonly ushort interchangeLevel;
+        public readonly ushort maximumInterchangeLevel;
+        public readonly uint   characterSetList;
+        public readonly uint   maximumCharacterSetList;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] volumeSetIdentifier;
+        public readonly CharacterSpecification descriptorCharacterSet;
+        public readonly CharacterSpecification explanatoryCharacterSet;
+        public readonly ExtentDescriptor       volumeAbstract;
+        public readonly ExtentDescriptor       volumeCopyright;
+        public readonly EntityIdentifier       applicationIdentifier;
+        public readonly Timestamp              recordingDateTime;
+        public readonly EntityIdentifier       implementationIdentifier;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] implementationUse;
+        public readonly uint   predecessorVolumeDescriptorSequenceLocation;
+        public readonly ushort flags;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
+        public readonly byte[] reserved;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct LogicalVolumeDescriptor
+    {
+        public readonly DescriptorTag          tag;
+        public readonly uint                   volumeDescriptorSequenceNumber;
+        public readonly CharacterSpecification descriptorCharacterSet;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] logicalVolumeIdentifier;
+        public readonly uint             logicalBlockSize;
+        public readonly EntityIdentifier domainIdentifier;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] logicalVolumeContentsUse;
+        public readonly uint             mapTableLength;
+        public readonly uint             numberOfPartitionMaps;
+        public readonly EntityIdentifier implementationIdentifier;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly byte[] implementationUse;
+        public readonly ExtentDescriptor integritySequenceExtent;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct LogicalVolumeIntegrityDescriptor
+    {
+        public readonly DescriptorTag    tag;
+        public readonly Timestamp        recordingDateTime;
+        public readonly uint             integrityType;
+        public readonly ExtentDescriptor nextIntegrityExtent;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] logicalVolumeContentsUse;
+        public readonly uint numberOfPartitions;
+        public readonly uint lengthOfImplementationUse;
+
+        // Follows uint[numberOfPartitions] freeSpaceTable;
+        // Follows uint[numberOfPartitions] sizeTable;
+        // Follows byte[lengthOfImplementationUse] implementationUse;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct LogicalVolumeIntegrityDescriptorImplementationUse
+    {
+        public readonly EntityIdentifier implementationId;
+        public readonly uint             files;
+        public readonly uint             directories;
+        public readonly ushort           minimumReadUDF;
+        public readonly ushort           minimumWriteUDF;
+        public readonly ushort           maximumWriteUDF;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UNICOS.cs b/Aaru.Filesystems/UNICOS.cs
index 4b65157ce..f47053b48 100644
--- a/Aaru.Filesystems/UNICOS.cs
+++ b/Aaru.Filesystems/UNICOS.cs
@@ -50,202 +50,201 @@ using ino_t = System.Int64;
 using Marshal = Aaru.Helpers.Marshal;
 using time_t = System.Int64;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection for the Cray UNICOS filesystem</summary>
+public sealed class UNICOS : IFilesystem
 {
+    const int NC1_MAXPART = 64;
+    const int NC1_MAXIREG = 4;
+
+    const ulong UNICOS_MAGIC  = 0x6e6331667331636e;
+    const ulong UNICOS_SECURE = 0xcd076d1771d670cd;
+
     /// <inheritdoc />
-    /// <summary>Implements detection for the Cray UNICOS filesystem</summary>
-    public sealed class UNICOS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "UNICOS Filesystem Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("61712F04-066C-44D5-A2A0-1E44C66B33F0");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const int NC1_MAXPART = 64;
-        const int NC1_MAXIREG = 4;
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
 
-        const ulong UNICOS_MAGIC  = 0x6e6331667331636e;
-        const ulong UNICOS_SECURE = 0xcd076d1771d670cd;
+        uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "UNICOS Filesystem Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("61712F04-066C-44D5-A2A0-1E44C66B33F0");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(partition.Start + sbSize >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(sector.Length < Marshal.SizeOf<Superblock>())
+            return false;
+
+        Superblock unicosSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
+
+        AaruConsole.DebugWriteLine("UNICOS plugin", "magic = 0x{0:X16} (expected 0x{1:X16})", unicosSb.s_magic,
+                                   UNICOS_MAGIC);
+
+        return unicosSb.s_magic == UNICOS_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        if(sector.Length < Marshal.SizeOf<Superblock>())
+            return;
+
+        Superblock unicosSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
+
+        if(unicosSb.s_magic != UNICOS_MAGIC)
+            return;
+
+        var sb = new StringBuilder();
+
+        sb.AppendLine("UNICOS filesystem");
+
+        if(unicosSb.s_secure == UNICOS_SECURE)
+            sb.AppendLine("Volume is secure");
+
+        sb.AppendFormat("Volume contains {0} partitions", unicosSb.s_npart).AppendLine();
+        sb.AppendFormat("{0} bytes per sector", unicosSb.s_iounit).AppendLine();
+        sb.AppendLine("4096 bytes per block");
+        sb.AppendFormat("{0} data blocks in volume", unicosSb.s_fsize).AppendLine();
+        sb.AppendFormat("Root resides on inode {0}", unicosSb.s_root).AppendLine();
+        sb.AppendFormat("{0} inodes in volume", unicosSb.s_isize).AppendLine();
+        sb.AppendFormat("Volume last updated on {0}", DateHandlers.UnixToDateTime(unicosSb.s_time)).AppendLine();
+
+        if(unicosSb.s_error > 0)
+            sb.AppendFormat("Volume is dirty, error code = 0x{0:X16}", unicosSb.s_error).AppendLine();
+
+        sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(unicosSb.s_fname, Encoding)).AppendLine();
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
+            Type                      = "UNICOS filesystem",
+            ClusterSize               = 4096,
+            Clusters                  = (ulong)unicosSb.s_fsize,
+            VolumeName                = StringHandlers.CToString(unicosSb.s_fname, Encoding),
+            ModificationDate          = DateHandlers.UnixToDateTime(unicosSb.s_time),
+            ModificationDateSpecified = true
+        };
 
-            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+        XmlFsType.Dirty |= unicosSb.s_error > 0;
+    }
 
-            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
+    [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
+    readonly struct nc1ireg_sb
+    {
+        public readonly ushort i_unused; /* reserved */
+        public readonly ushort i_nblk;   /* number of blocks */
+        public readonly uint   i_sblk;   /* start block number */
+    }
 
-            if(partition.Start + sbSize >= partition.End)
-                return false;
+    [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
+    readonly struct nc1fdev_sb
+    {
+        public readonly long fd_name; /* Physical device name */
+        public readonly uint fd_sblk; /* Start block number */
+        public readonly uint fd_nblk; /* Number of blocks */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NC1_MAXIREG)]
+        public readonly nc1ireg_sb[] fd_ireg; /* Inode regions */
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+    [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming"),
+     SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
+    readonly struct Superblock
+    {
+        public readonly ulong s_magic; /* magic number to indicate file system type */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] s_fname; /* file system name */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] s_fpack; /* file system pack name */
+        public readonly dev_t s_dev;    /* major/minor device, for verification */
 
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(sector.Length < Marshal.SizeOf<Superblock>())
-                return false;
-
-            Superblock unicosSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
-
-            AaruConsole.DebugWriteLine("UNICOS plugin", "magic = 0x{0:X16} (expected 0x{1:X16})", unicosSb.s_magic,
-                                       UNICOS_MAGIC);
-
-            return unicosSb.s_magic == UNICOS_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-
-            if(imagePlugin.Info.SectorSize < 512)
-                return;
-
-            uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            if(sector.Length < Marshal.SizeOf<Superblock>())
-                return;
-
-            Superblock unicosSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
-
-            if(unicosSb.s_magic != UNICOS_MAGIC)
-                return;
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine("UNICOS filesystem");
-
-            if(unicosSb.s_secure == UNICOS_SECURE)
-                sb.AppendLine("Volume is secure");
-
-            sb.AppendFormat("Volume contains {0} partitions", unicosSb.s_npart).AppendLine();
-            sb.AppendFormat("{0} bytes per sector", unicosSb.s_iounit).AppendLine();
-            sb.AppendLine("4096 bytes per block");
-            sb.AppendFormat("{0} data blocks in volume", unicosSb.s_fsize).AppendLine();
-            sb.AppendFormat("Root resides on inode {0}", unicosSb.s_root).AppendLine();
-            sb.AppendFormat("{0} inodes in volume", unicosSb.s_isize).AppendLine();
-            sb.AppendFormat("Volume last updated on {0}", DateHandlers.UnixToDateTime(unicosSb.s_time)).AppendLine();
-
-            if(unicosSb.s_error > 0)
-                sb.AppendFormat("Volume is dirty, error code = 0x{0:X16}", unicosSb.s_error).AppendLine();
-
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(unicosSb.s_fname, Encoding)).AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type                      = "UNICOS filesystem",
-                ClusterSize               = 4096,
-                Clusters                  = (ulong)unicosSb.s_fsize,
-                VolumeName                = StringHandlers.CToString(unicosSb.s_fname, Encoding),
-                ModificationDate          = DateHandlers.UnixToDateTime(unicosSb.s_time),
-                ModificationDateSpecified = true
-            };
-
-            XmlFsType.Dirty |= unicosSb.s_error > 0;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
-        readonly struct nc1ireg_sb
-        {
-            public readonly ushort i_unused; /* reserved */
-            public readonly ushort i_nblk;   /* number of blocks */
-            public readonly uint   i_sblk;   /* start block number */
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
-        readonly struct nc1fdev_sb
-        {
-            public readonly long fd_name; /* Physical device name */
-            public readonly uint fd_sblk; /* Start block number */
-            public readonly uint fd_nblk; /* Number of blocks */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NC1_MAXIREG)]
-            public readonly nc1ireg_sb[] fd_ireg; /* Inode regions */
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming"),
-         SuppressMessage("ReSharper", "BuiltInTypeReferenceStyle")]
-        readonly struct Superblock
-        {
-            public readonly ulong s_magic; /* magic number to indicate file system type */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] s_fname; /* file system name */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] s_fpack; /* file system pack name */
-            public readonly dev_t s_dev;    /* major/minor device, for verification */
-
-            public readonly daddr_t  s_fsize;   /* size in blocks of entire volume */
-            public readonly long     s_isize;   /* Number of total inodes */
-            public readonly long     s_bigfile; /* number of bytes at which a file is big */
-            public readonly long     s_bigunit; /* minimum number of blocks allocated for big files */
-            public readonly ulong    s_secure;  /* security: secure FS label */
-            public readonly long     s_maxlvl;  /* security: maximum security level */
-            public readonly long     s_minlvl;  /* security: minimum security level */
-            public readonly long     s_valcmp;  /* security: valid security compartments */
-            public readonly time_t   s_time;    /* last super block update */
-            public readonly blkno_t  s_dboff;   /* Dynamic block number */
-            public readonly ino_t    s_root;    /* root inode */
-            public readonly long     s_error;   /* Type of file system error detected */
-            public readonly blkno_t  s_mapoff;  /* Start map block number */
-            public readonly long     s_mapblks; /* Last map block number */
-            public readonly long     s_nscpys;  /* Number of copies of s.b per partition */
-            public readonly long     s_npart;   /* Number of partitions */
-            public readonly long     s_ifract;  /* Ratio of inodes to blocks */
-            public readonly extent_t s_sfs;     /* SFS only blocks */
-            public readonly long     s_flag;    /* Flag word */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NC1_MAXPART)]
-            public readonly nc1fdev_sb[] s_part; /* Partition descriptors */
-            public readonly long s_iounit;       /* Physical block size */
-            public readonly long s_numiresblks;  /* number of inode reservation blocks */
-            /* per region (currently 1) */
-            /* 0 = 1*(AU) words, n = (n+1)*(AU) words */
-            public readonly long s_priparts; /* bitmap of primary partitions */
-            public readonly long s_priblock; /* block size of primary partition(s) */
-            /* 0 = 1*512 words, n = (n+1)*512 words */
-            public readonly long s_prinblks; /* number of 512 wds blocks in primary */
-            public readonly long s_secparts; /* bitmap of secondary partitions */
-            public readonly long s_secblock; /* block size of secondary partition(s) */
-            /* 0 = 1*512 words, n = (n+1)*512 words */
-            public readonly long s_secnblks;  /* number of 512 wds blocks in secondary */
-            public readonly long s_sbdbparts; /* bitmap of partitions with file system data */
-            /* including super blocks, dynamic block */
-            /* and free block bitmaps (only primary */
-            /* partitions may contain these) */
-            public readonly long s_rootdparts; /* bitmap of partitions with root directory */
-            /* (only primary partitions) */
-            public readonly long s_nudparts; /* bitmap of no-user-data partitions */
-            /* (only primary partitions) */
-            public readonly long s_nsema;     /* SFS: # fs semaphores to allocate */
-            public readonly long s_priactive; /* bitmap of primary partitions which contain */
-            /* active (up to date) dynamic blocks and */
-            /* free block bitmaps. All bits set indicate */
-            /* that all primary partitions are active, */
-            /* and no kernel manipulation of active flag */
-            /* is allowed. */
-            public readonly long s_sfs_arbiterid; /* SFS Arbiter ID */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 91)]
-            public readonly long[] s_fill; /* reserved */
-        }
+        public readonly daddr_t  s_fsize;   /* size in blocks of entire volume */
+        public readonly long     s_isize;   /* Number of total inodes */
+        public readonly long     s_bigfile; /* number of bytes at which a file is big */
+        public readonly long     s_bigunit; /* minimum number of blocks allocated for big files */
+        public readonly ulong    s_secure;  /* security: secure FS label */
+        public readonly long     s_maxlvl;  /* security: maximum security level */
+        public readonly long     s_minlvl;  /* security: minimum security level */
+        public readonly long     s_valcmp;  /* security: valid security compartments */
+        public readonly time_t   s_time;    /* last super block update */
+        public readonly blkno_t  s_dboff;   /* Dynamic block number */
+        public readonly ino_t    s_root;    /* root inode */
+        public readonly long     s_error;   /* Type of file system error detected */
+        public readonly blkno_t  s_mapoff;  /* Start map block number */
+        public readonly long     s_mapblks; /* Last map block number */
+        public readonly long     s_nscpys;  /* Number of copies of s.b per partition */
+        public readonly long     s_npart;   /* Number of partitions */
+        public readonly long     s_ifract;  /* Ratio of inodes to blocks */
+        public readonly extent_t s_sfs;     /* SFS only blocks */
+        public readonly long     s_flag;    /* Flag word */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NC1_MAXPART)]
+        public readonly nc1fdev_sb[] s_part; /* Partition descriptors */
+        public readonly long s_iounit;       /* Physical block size */
+        public readonly long s_numiresblks;  /* number of inode reservation blocks */
+        /* per region (currently 1) */
+        /* 0 = 1*(AU) words, n = (n+1)*(AU) words */
+        public readonly long s_priparts; /* bitmap of primary partitions */
+        public readonly long s_priblock; /* block size of primary partition(s) */
+        /* 0 = 1*512 words, n = (n+1)*512 words */
+        public readonly long s_prinblks; /* number of 512 wds blocks in primary */
+        public readonly long s_secparts; /* bitmap of secondary partitions */
+        public readonly long s_secblock; /* block size of secondary partition(s) */
+        /* 0 = 1*512 words, n = (n+1)*512 words */
+        public readonly long s_secnblks;  /* number of 512 wds blocks in secondary */
+        public readonly long s_sbdbparts; /* bitmap of partitions with file system data */
+        /* including super blocks, dynamic block */
+        /* and free block bitmaps (only primary */
+        /* partitions may contain these) */
+        public readonly long s_rootdparts; /* bitmap of partitions with root directory */
+        /* (only primary partitions) */
+        public readonly long s_nudparts; /* bitmap of no-user-data partitions */
+        /* (only primary partitions) */
+        public readonly long s_nsema;     /* SFS: # fs semaphores to allocate */
+        public readonly long s_priactive; /* bitmap of primary partitions which contain */
+        /* active (up to date) dynamic blocks and */
+        /* free block bitmaps. All bits set indicate */
+        /* that all primary partitions are active, */
+        /* and no kernel manipulation of active flag */
+        /* is allowed. */
+        public readonly long s_sfs_arbiterid; /* SFS Arbiter ID */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 91)]
+        public readonly long[] s_fill; /* reserved */
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/UNIXBFS.cs b/Aaru.Filesystems/UNIXBFS.cs
index b9b981953..fe00d33f8 100644
--- a/Aaru.Filesystems/UNIXBFS.cs
+++ b/Aaru.Filesystems/UNIXBFS.cs
@@ -40,123 +40,122 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from the Linux kernel
+/// <inheritdoc />
+/// <summary>Implements detection of the UNIX boot filesystem</summary>
+public sealed class BFS : IFilesystem
 {
-    // Information from the Linux kernel
+    const uint BFS_MAGIC = 0x1BADFACE;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the UNIX boot filesystem</summary>
-    public sealed class BFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "UNIX Boot filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("1E6E0DA6-F7E4-494C-80C6-CB5929E96155");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint BFS_MAGIC = 0x1BADFACE;
+        if(2 + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "UNIX Boot filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("1E6E0DA6-F7E4-494C-80C6-CB5929E96155");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] tmp);
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        uint magic = BitConverter.ToUInt32(tmp, 0);
+
+        return magic == BFS_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        var         sb    = new StringBuilder();
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bfsSbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        byte[] sbStrings = new byte[6];
+
+        var bfsSb = new SuperBlock
         {
-            if(2 + partition.Start >= partition.End)
-                return false;
+            s_magic = BitConverter.ToUInt32(bfsSbSector, 0x00),
+            s_start = BitConverter.ToUInt32(bfsSbSector, 0x04),
+            s_end   = BitConverter.ToUInt32(bfsSbSector, 0x08),
+            s_from  = BitConverter.ToUInt32(bfsSbSector, 0x0C),
+            s_to    = BitConverter.ToUInt32(bfsSbSector, 0x10),
+            s_bfrom = BitConverter.ToInt32(bfsSbSector, 0x14),
+            s_bto   = BitConverter.ToInt32(bfsSbSector, 0x18)
+        };
 
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] tmp);
+        Array.Copy(bfsSbSector, 0x1C, sbStrings, 0, 6);
+        bfsSb.s_fsname = StringHandlers.CToString(sbStrings, Encoding);
+        Array.Copy(bfsSbSector, 0x22, sbStrings, 0, 6);
+        bfsSb.s_volume = StringHandlers.CToString(sbStrings, Encoding);
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+        AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_magic: 0x{0:X8}", bfsSb.s_magic);
+        AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_start: 0x{0:X8}", bfsSb.s_start);
+        AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_end: 0x{0:X8}", bfsSb.s_end);
+        AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_from: 0x{0:X8}", bfsSb.s_from);
+        AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_to: 0x{0:X8}", bfsSb.s_to);
+        AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_bfrom: 0x{0:X8}", bfsSb.s_bfrom);
+        AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_bto: 0x{0:X8}", bfsSb.s_bto);
+        AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_fsname: 0x{0}", bfsSb.s_fsname);
+        AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_volume: 0x{0}", bfsSb.s_volume);
 
-            uint magic = BitConverter.ToUInt32(tmp, 0);
+        sb.AppendLine("UNIX Boot filesystem");
 
-            return magic == BFS_MAGIC;
-        }
+        sb.AppendFormat("Volume goes from byte {0} to byte {1}, for {2} bytes", bfsSb.s_start, bfsSb.s_end,
+                        bfsSb.s_end - bfsSb.s_start).AppendLine();
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        sb.AppendFormat("Filesystem name: {0}", bfsSb.s_fsname).AppendLine();
+        sb.AppendFormat("Volume name: {0}", bfsSb.s_volume).AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
+            Type        = "BFS",
+            VolumeName  = bfsSb.s_volume,
+            ClusterSize = imagePlugin.Info.SectorSize,
+            Clusters    = partition.End - partition.Start + 1
+        };
 
-            var         sb    = new StringBuilder();
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] bfsSbSector);
+        information = sb.ToString();
+    }
 
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            byte[] sbStrings = new byte[6];
-
-            var bfsSb = new SuperBlock
-            {
-                s_magic = BitConverter.ToUInt32(bfsSbSector, 0x00),
-                s_start = BitConverter.ToUInt32(bfsSbSector, 0x04),
-                s_end   = BitConverter.ToUInt32(bfsSbSector, 0x08),
-                s_from  = BitConverter.ToUInt32(bfsSbSector, 0x0C),
-                s_to    = BitConverter.ToUInt32(bfsSbSector, 0x10),
-                s_bfrom = BitConverter.ToInt32(bfsSbSector, 0x14),
-                s_bto   = BitConverter.ToInt32(bfsSbSector, 0x18)
-            };
-
-            Array.Copy(bfsSbSector, 0x1C, sbStrings, 0, 6);
-            bfsSb.s_fsname = StringHandlers.CToString(sbStrings, Encoding);
-            Array.Copy(bfsSbSector, 0x22, sbStrings, 0, 6);
-            bfsSb.s_volume = StringHandlers.CToString(sbStrings, Encoding);
-
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_magic: 0x{0:X8}", bfsSb.s_magic);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_start: 0x{0:X8}", bfsSb.s_start);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_end: 0x{0:X8}", bfsSb.s_end);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_from: 0x{0:X8}", bfsSb.s_from);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_to: 0x{0:X8}", bfsSb.s_to);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_bfrom: 0x{0:X8}", bfsSb.s_bfrom);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_bto: 0x{0:X8}", bfsSb.s_bto);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_fsname: 0x{0}", bfsSb.s_fsname);
-            AaruConsole.DebugWriteLine("BFS plugin", "bfs_sb.s_volume: 0x{0}", bfsSb.s_volume);
-
-            sb.AppendLine("UNIX Boot filesystem");
-
-            sb.AppendFormat("Volume goes from byte {0} to byte {1}, for {2} bytes", bfsSb.s_start, bfsSb.s_end,
-                            bfsSb.s_end - bfsSb.s_start).AppendLine();
-
-            sb.AppendFormat("Filesystem name: {0}", bfsSb.s_fsname).AppendLine();
-            sb.AppendFormat("Volume name: {0}", bfsSb.s_volume).AppendLine();
-
-            XmlFsType = new FileSystemType
-            {
-                Type        = "BFS",
-                VolumeName  = bfsSb.s_volume,
-                ClusterSize = imagePlugin.Info.SectorSize,
-                Clusters    = partition.End - partition.Start + 1
-            };
-
-            information = sb.ToString();
-        }
-
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct SuperBlock
-        {
-            /// <summary>0x00, 0x1BADFACE</summary>
-            public uint s_magic;
-            /// <summary>0x04, start in bytes of volume</summary>
-            public uint s_start;
-            /// <summary>0x08, end in bytes of volume</summary>
-            public uint s_end;
-            /// <summary>0x0C, unknown :p</summary>
-            public uint s_from;
-            /// <summary>0x10, unknown :p</summary>
-            public uint s_to;
-            /// <summary>0x14, unknown :p</summary>
-            public int s_bfrom;
-            /// <summary>0x18, unknown :p</summary>
-            public int s_bto;
-            /// <summary>0x1C, 6 bytes, filesystem name</summary>
-            public string s_fsname;
-            /// <summary>0x22, 6 bytes, volume name</summary>
-            public string s_volume;
-        }
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct SuperBlock
+    {
+        /// <summary>0x00, 0x1BADFACE</summary>
+        public uint s_magic;
+        /// <summary>0x04, start in bytes of volume</summary>
+        public uint s_start;
+        /// <summary>0x08, end in bytes of volume</summary>
+        public uint s_end;
+        /// <summary>0x0C, unknown :p</summary>
+        public uint s_from;
+        /// <summary>0x10, unknown :p</summary>
+        public uint s_to;
+        /// <summary>0x14, unknown :p</summary>
+        public int s_bfrom;
+        /// <summary>0x18, unknown :p</summary>
+        public int s_bto;
+        /// <summary>0x1C, 6 bytes, filesystem name</summary>
+        public string s_fsname;
+        /// <summary>0x22, 6 bytes, volume name</summary>
+        public string s_volume;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/VMfs.cs b/Aaru.Filesystems/VMfs.cs
index dcaac2ea1..e2425f1c3 100644
--- a/Aaru.Filesystems/VMfs.cs
+++ b/Aaru.Filesystems/VMfs.cs
@@ -41,129 +41,128 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the VMware filesystem</summary>
+[SuppressMessage("ReSharper", "UnusedType.Local"), SuppressMessage("ReSharper", "IdentifierTypo"),
+ SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class VMfs : IFilesystem
 {
+    /// <summary>Identifier for VMfs</summary>
+    const uint VMFS_MAGIC = 0xC001D00D;
+    const uint VMFS_BASE = 0x00100000;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the VMware filesystem</summary>
-    [SuppressMessage("ReSharper", "UnusedType.Local"), SuppressMessage("ReSharper", "IdentifierTypo"),
-     SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class VMfs : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "VMware filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("EE52BDB8-B49C-4122-A3DA-AD21CBE79843");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>Identifier for VMfs</summary>
-        const uint VMFS_MAGIC = 0xC001D00D;
-        const uint VMFS_BASE = 0x00100000;
+        if(partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "VMware filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("EE52BDB8-B49C-4122-A3DA-AD21CBE79843");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ulong vmfsSuperOff = VMFS_BASE / imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(partition.Start + vmfsSuperOff > partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start + vmfsSuperOff, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        uint magic = BitConverter.ToUInt32(sector, 0x00);
+
+        return magic == VMFS_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.UTF8;
+        information = "";
+        ulong       vmfsSuperOff = VMFS_BASE / imagePlugin.Info.SectorSize;
+        ErrorNumber errno        = imagePlugin.ReadSector(partition.Start + vmfsSuperOff, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        VolumeInfo volInfo = Marshal.ByteArrayToStructureLittleEndian<VolumeInfo>(sector);
+
+        var sbInformation = new StringBuilder();
+
+        sbInformation.AppendLine("VMware file system");
+
+        uint ctimeSecs     = (uint)(volInfo.ctime / 1000000);
+        uint ctimeNanoSecs = (uint)(volInfo.ctime % 1000000);
+        uint mtimeSecs     = (uint)(volInfo.mtime / 1000000);
+        uint mtimeNanoSecs = (uint)(volInfo.mtime % 1000000);
+
+        sbInformation.AppendFormat("Volume version {0}", volInfo.version).AppendLine();
+
+        sbInformation.AppendFormat("Volume name {0}", StringHandlers.CToString(volInfo.name, Encoding)).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Volume size {0} bytes", volInfo.size * 256).AppendLine();
+        sbInformation.AppendFormat("Volume UUID {0}", volInfo.uuid).AppendLine();
+
+        sbInformation.
+            AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(ctimeSecs, ctimeNanoSecs)).
+            AppendLine();
+
+        sbInformation.AppendFormat("Volume last modified on {0}",
+                                   DateHandlers.UnixUnsignedToDateTime(mtimeSecs, mtimeNanoSecs)).AppendLine();
+
+        information = sbInformation.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            if(partition.Start >= partition.End)
-                return false;
+            Type                      = "VMware file system",
+            CreationDate              = DateHandlers.UnixUnsignedToDateTime(ctimeSecs, ctimeNanoSecs),
+            CreationDateSpecified     = true,
+            ModificationDate          = DateHandlers.UnixUnsignedToDateTime(mtimeSecs, mtimeNanoSecs),
+            ModificationDateSpecified = true,
+            Clusters                  = volInfo.size * 256 / imagePlugin.Info.SectorSize,
+            ClusterSize               = imagePlugin.Info.SectorSize,
+            VolumeSerial              = volInfo.uuid.ToString()
+        };
+    }
 
-            ulong vmfsSuperOff = VMFS_BASE / imagePlugin.Info.SectorSize;
+    [Flags]
+    enum Flags : byte
+    {
+        RecyledFolder = 64, CaseSensitive = 128
+    }
 
-            if(partition.Start + vmfsSuperOff > partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start + vmfsSuperOff, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            uint magic = BitConverter.ToUInt32(sector, 0x00);
-
-            return magic == VMFS_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.UTF8;
-            information = "";
-            ulong       vmfsSuperOff = VMFS_BASE / imagePlugin.Info.SectorSize;
-            ErrorNumber errno        = imagePlugin.ReadSector(partition.Start + vmfsSuperOff, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            VolumeInfo volInfo = Marshal.ByteArrayToStructureLittleEndian<VolumeInfo>(sector);
-
-            var sbInformation = new StringBuilder();
-
-            sbInformation.AppendLine("VMware file system");
-
-            uint ctimeSecs     = (uint)(volInfo.ctime / 1000000);
-            uint ctimeNanoSecs = (uint)(volInfo.ctime % 1000000);
-            uint mtimeSecs     = (uint)(volInfo.mtime / 1000000);
-            uint mtimeNanoSecs = (uint)(volInfo.mtime % 1000000);
-
-            sbInformation.AppendFormat("Volume version {0}", volInfo.version).AppendLine();
-
-            sbInformation.AppendFormat("Volume name {0}", StringHandlers.CToString(volInfo.name, Encoding)).
-                          AppendLine();
-
-            sbInformation.AppendFormat("Volume size {0} bytes", volInfo.size * 256).AppendLine();
-            sbInformation.AppendFormat("Volume UUID {0}", volInfo.uuid).AppendLine();
-
-            sbInformation.
-                AppendFormat("Volume created on {0}", DateHandlers.UnixUnsignedToDateTime(ctimeSecs, ctimeNanoSecs)).
-                AppendLine();
-
-            sbInformation.AppendFormat("Volume last modified on {0}",
-                                       DateHandlers.UnixUnsignedToDateTime(mtimeSecs, mtimeNanoSecs)).AppendLine();
-
-            information = sbInformation.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type                      = "VMware file system",
-                CreationDate              = DateHandlers.UnixUnsignedToDateTime(ctimeSecs, ctimeNanoSecs),
-                CreationDateSpecified     = true,
-                ModificationDate          = DateHandlers.UnixUnsignedToDateTime(mtimeSecs, mtimeNanoSecs),
-                ModificationDateSpecified = true,
-                Clusters                  = volInfo.size * 256 / imagePlugin.Info.SectorSize,
-                ClusterSize               = imagePlugin.Info.SectorSize,
-                VolumeSerial              = volInfo.uuid.ToString()
-            };
-        }
-
-        [Flags]
-        enum Flags : byte
-        {
-            RecyledFolder = 64, CaseSensitive = 128
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct VolumeInfo
-        {
-            public readonly uint magic;
-            public readonly uint version;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] unknown1;
-            public readonly byte lun;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] unknown2;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 28)]
-            public readonly byte[] name;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 49)]
-            public readonly byte[] unknown3;
-            public readonly uint size;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 31)]
-            public readonly byte[] unknown4;
-            public readonly Guid  uuid;
-            public readonly ulong ctime;
-            public readonly ulong mtime;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct VolumeInfo
+    {
+        public readonly uint magic;
+        public readonly uint version;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] unknown1;
+        public readonly byte lun;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] unknown2;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 28)]
+        public readonly byte[] name;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 49)]
+        public readonly byte[] unknown3;
+        public readonly uint size;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 31)]
+        public readonly byte[] unknown4;
+        public readonly Guid  uuid;
+        public readonly ulong ctime;
+        public readonly ulong mtime;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/VxFS.cs b/Aaru.Filesystems/VxFS.cs
index 2847cf24e..dd2c88a78 100644
--- a/Aaru.Filesystems/VxFS.cs
+++ b/Aaru.Filesystems/VxFS.cs
@@ -40,246 +40,245 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of the Veritas filesystem</summary>
+public sealed class VxFS : IFilesystem
 {
+    /// <summary>Identifier for VxFS</summary>
+    const uint VXFS_MAGIC = 0xA501FCF5;
+    const uint VXFS_BASE = 0x400;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the Veritas filesystem</summary>
-    public sealed class VxFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Veritas filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("EC372605-7687-453C-8BEA-7E0DFF79CB03");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>Identifier for VxFS</summary>
-        const uint VXFS_MAGIC = 0xA501FCF5;
-        const uint VXFS_BASE = 0x400;
+        ulong vmfsSuperOff = VXFS_BASE / imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Veritas filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("EC372605-7687-453C-8BEA-7E0DFF79CB03");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(partition.Start + vmfsSuperOff >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ErrorNumber errno = imagePlugin.ReadSector(partition.Start + vmfsSuperOff, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        uint magic = BitConverter.ToUInt32(sector, 0x00);
+
+        return magic == VXFS_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.UTF8;
+        information = "";
+        ulong       vmfsSuperOff = VXFS_BASE / imagePlugin.Info.SectorSize;
+        ErrorNumber errno        = imagePlugin.ReadSector(partition.Start + vmfsSuperOff, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        SuperBlock vxSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
+
+        var sbInformation = new StringBuilder();
+
+        sbInformation.AppendLine("Veritas file system");
+
+        sbInformation.AppendFormat("Volume version {0}", vxSb.vs_version).AppendLine();
+
+        sbInformation.AppendFormat("Volume name {0}", StringHandlers.CToString(vxSb.vs_fname, Encoding)).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Volume has {0} blocks of {1} bytes each", vxSb.vs_bsize, vxSb.vs_size).
+                      AppendLine();
+
+        sbInformation.AppendFormat("Volume has {0} inodes per block", vxSb.vs_inopb).AppendLine();
+        sbInformation.AppendFormat("Volume has {0} free inodes", vxSb.vs_ifree).AppendLine();
+        sbInformation.AppendFormat("Volume has {0} free blocks", vxSb.vs_free).AppendLine();
+
+        sbInformation.AppendFormat("Volume created on {0}",
+                                   DateHandlers.UnixUnsignedToDateTime(vxSb.vs_ctime, vxSb.vs_cutime)).AppendLine();
+
+        sbInformation.AppendFormat("Volume last modified on {0}",
+                                   DateHandlers.UnixUnsignedToDateTime(vxSb.vs_wtime, vxSb.vs_wutime)).AppendLine();
+
+        if(vxSb.vs_clean != 0)
+            sbInformation.AppendLine("Volume is dirty");
+
+        information = sbInformation.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            ulong vmfsSuperOff = VXFS_BASE / imagePlugin.Info.SectorSize;
+            Type                      = "Veritas file system",
+            CreationDate              = DateHandlers.UnixUnsignedToDateTime(vxSb.vs_ctime, vxSb.vs_cutime),
+            CreationDateSpecified     = true,
+            ModificationDate          = DateHandlers.UnixUnsignedToDateTime(vxSb.vs_wtime, vxSb.vs_wutime),
+            ModificationDateSpecified = true,
+            Clusters                  = (ulong)vxSb.vs_size,
+            ClusterSize               = (uint)vxSb.vs_bsize,
+            Dirty                     = vxSb.vs_clean != 0,
+            FreeClusters              = (ulong)vxSb.vs_free,
+            FreeClustersSpecified     = true
+        };
+    }
 
-            if(partition.Start + vmfsSuperOff >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(partition.Start + vmfsSuperOff, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            uint magic = BitConverter.ToUInt32(sector, 0x00);
-
-            return magic == VXFS_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.UTF8;
-            information = "";
-            ulong       vmfsSuperOff = VXFS_BASE / imagePlugin.Info.SectorSize;
-            ErrorNumber errno        = imagePlugin.ReadSector(partition.Start + vmfsSuperOff, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            SuperBlock vxSb = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sector);
-
-            var sbInformation = new StringBuilder();
-
-            sbInformation.AppendLine("Veritas file system");
-
-            sbInformation.AppendFormat("Volume version {0}", vxSb.vs_version).AppendLine();
-
-            sbInformation.AppendFormat("Volume name {0}", StringHandlers.CToString(vxSb.vs_fname, Encoding)).
-                          AppendLine();
-
-            sbInformation.AppendFormat("Volume has {0} blocks of {1} bytes each", vxSb.vs_bsize, vxSb.vs_size).
-                          AppendLine();
-
-            sbInformation.AppendFormat("Volume has {0} inodes per block", vxSb.vs_inopb).AppendLine();
-            sbInformation.AppendFormat("Volume has {0} free inodes", vxSb.vs_ifree).AppendLine();
-            sbInformation.AppendFormat("Volume has {0} free blocks", vxSb.vs_free).AppendLine();
-
-            sbInformation.AppendFormat("Volume created on {0}",
-                                       DateHandlers.UnixUnsignedToDateTime(vxSb.vs_ctime, vxSb.vs_cutime)).AppendLine();
-
-            sbInformation.AppendFormat("Volume last modified on {0}",
-                                       DateHandlers.UnixUnsignedToDateTime(vxSb.vs_wtime, vxSb.vs_wutime)).AppendLine();
-
-            if(vxSb.vs_clean != 0)
-                sbInformation.AppendLine("Volume is dirty");
-
-            information = sbInformation.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type                      = "Veritas file system",
-                CreationDate              = DateHandlers.UnixUnsignedToDateTime(vxSb.vs_ctime, vxSb.vs_cutime),
-                CreationDateSpecified     = true,
-                ModificationDate          = DateHandlers.UnixUnsignedToDateTime(vxSb.vs_wtime, vxSb.vs_wutime),
-                ModificationDateSpecified = true,
-                Clusters                  = (ulong)vxSb.vs_size,
-                ClusterSize               = (uint)vxSb.vs_bsize,
-                Dirty                     = vxSb.vs_clean != 0,
-                FreeClusters              = (ulong)vxSb.vs_free,
-                FreeClustersSpecified     = true
-            };
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            /// <summary>Magic number</summary>
-            public readonly uint vs_magic;
-            /// <summary>VxFS version</summary>
-            public readonly int vs_version;
-            /// <summary>create time - secs</summary>
-            public readonly uint vs_ctime;
-            /// <summary>create time - usecs</summary>
-            public readonly uint vs_cutime;
-            /// <summary>unused</summary>
-            public readonly int __unused1;
-            /// <summary>unused</summary>
-            public readonly int __unused2;
-            /// <summary>obsolete</summary>
-            public readonly int vs_old_logstart;
-            /// <summary>obsolete</summary>
-            public readonly int vs_old_logend;
-            /// <summary>block size</summary>
-            public readonly int vs_bsize;
-            /// <summary>number of blocks</summary>
-            public readonly int vs_size;
-            /// <summary>number of data blocks</summary>
-            public readonly int vs_dsize;
-            /// <summary>obsolete</summary>
-            public readonly uint vs_old_ninode;
-            /// <summary>obsolete</summary>
-            public readonly int vs_old_nau;
-            /// <summary>unused</summary>
-            public readonly int __unused3;
-            /// <summary>obsolete</summary>
-            public readonly int vs_old_defiextsize;
-            /// <summary>obsolete</summary>
-            public readonly int vs_old_ilbsize;
-            /// <summary>size of immediate data area</summary>
-            public readonly int vs_immedlen;
-            /// <summary>number of direct extentes</summary>
-            public readonly int vs_ndaddr;
-            /// <summary>address of first AU</summary>
-            public readonly int vs_firstau;
-            /// <summary>offset of extent map in AU</summary>
-            public readonly int vs_emap;
-            /// <summary>offset of inode map in AU</summary>
-            public readonly int vs_imap;
-            /// <summary>offset of ExtOp. map in AU</summary>
-            public readonly int vs_iextop;
-            /// <summary>offset of inode list in AU</summary>
-            public readonly int vs_istart;
-            /// <summary>offset of fdblock in AU</summary>
-            public readonly int vs_bstart;
-            /// <summary>aufirst + emap</summary>
-            public readonly int vs_femap;
-            /// <summary>aufirst + imap</summary>
-            public readonly int vs_fimap;
-            /// <summary>aufirst + iextop</summary>
-            public readonly int vs_fiextop;
-            /// <summary>aufirst + istart</summary>
-            public readonly int vs_fistart;
-            /// <summary>aufirst + bstart</summary>
-            public readonly int vs_fbstart;
-            /// <summary>number of entries in indir</summary>
-            public readonly int vs_nindir;
-            /// <summary>length of AU in blocks</summary>
-            public readonly int vs_aulen;
-            /// <summary>length of imap in blocks</summary>
-            public readonly int vs_auimlen;
-            /// <summary>length of emap in blocks</summary>
-            public readonly int vs_auemlen;
-            /// <summary>length of ilist in blocks</summary>
-            public readonly int vs_auilen;
-            /// <summary>length of pad in blocks</summary>
-            public readonly int vs_aupad;
-            /// <summary>data blocks in AU</summary>
-            public readonly int vs_aublocks;
-            /// <summary>log base 2 of aublocks</summary>
-            public readonly int vs_maxtier;
-            /// <summary>number of inodes per blk</summary>
-            public readonly int vs_inopb;
-            /// <summary>obsolete</summary>
-            public readonly int vs_old_inopau;
-            /// <summary>obsolete</summary>
-            public readonly int vs_old_inopilb;
-            /// <summary>obsolete</summary>
-            public readonly int vs_old_ndiripau;
-            /// <summary>size of indirect addr ext.</summary>
-            public readonly int vs_iaddrlen;
-            /// <summary>log base 2 of bsize</summary>
-            public readonly int vs_bshift;
-            /// <summary>log base 2 of inobp</summary>
-            public readonly int vs_inoshift;
-            /// <summary>~( bsize - 1 )</summary>
-            public readonly int vs_bmask;
-            /// <summary>bsize - 1</summary>
-            public readonly int vs_boffmask;
-            /// <summary>old_inopilb - 1</summary>
-            public readonly int vs_old_inomask;
-            /// <summary>checksum of V1 data</summary>
-            public readonly int vs_checksum;
-            /// <summary>number of free blocks</summary>
-            public readonly int vs_free;
-            /// <summary>number of free inodes</summary>
-            public readonly int vs_ifree;
-            /// <summary>number of free extents by size</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly int[] vs_efree;
-            /// <summary>flags ?!?</summary>
-            public readonly int vs_flags;
-            /// <summary>filesystem has been changed</summary>
-            public readonly byte vs_mod;
-            /// <summary>clean FS</summary>
-            public readonly byte vs_clean;
-            /// <summary>unused</summary>
-            public readonly ushort __unused4;
-            /// <summary>mount time log ID</summary>
-            public readonly uint vs_firstlogid;
-            /// <summary>last time written - sec</summary>
-            public readonly uint vs_wtime;
-            /// <summary>last time written - usec</summary>
-            public readonly uint vs_wutime;
-            /// <summary>FS name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] vs_fname;
-            /// <summary>FS pack name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public readonly byte[] vs_fpack;
-            /// <summary>log format version</summary>
-            public readonly int vs_logversion;
-            /// <summary>unused</summary>
-            public readonly int __unused5;
-            /// <summary>OLT extent and replica</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly int[] vs_oltext;
-            /// <summary>OLT extent size</summary>
-            public readonly int vs_oltsize;
-            /// <summary>size of inode map</summary>
-            public readonly int vs_iauimlen;
-            /// <summary>size of IAU in blocks</summary>
-            public readonly int vs_iausize;
-            /// <summary>size of inode in bytes</summary>
-            public readonly int vs_dinosize;
-            /// <summary>indir levels per inode</summary>
-            public readonly int vs_old_dniaddr;
-            /// <summary>checksum of V2 RO</summary>
-            public readonly int vs_checksum2;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        /// <summary>Magic number</summary>
+        public readonly uint vs_magic;
+        /// <summary>VxFS version</summary>
+        public readonly int vs_version;
+        /// <summary>create time - secs</summary>
+        public readonly uint vs_ctime;
+        /// <summary>create time - usecs</summary>
+        public readonly uint vs_cutime;
+        /// <summary>unused</summary>
+        public readonly int __unused1;
+        /// <summary>unused</summary>
+        public readonly int __unused2;
+        /// <summary>obsolete</summary>
+        public readonly int vs_old_logstart;
+        /// <summary>obsolete</summary>
+        public readonly int vs_old_logend;
+        /// <summary>block size</summary>
+        public readonly int vs_bsize;
+        /// <summary>number of blocks</summary>
+        public readonly int vs_size;
+        /// <summary>number of data blocks</summary>
+        public readonly int vs_dsize;
+        /// <summary>obsolete</summary>
+        public readonly uint vs_old_ninode;
+        /// <summary>obsolete</summary>
+        public readonly int vs_old_nau;
+        /// <summary>unused</summary>
+        public readonly int __unused3;
+        /// <summary>obsolete</summary>
+        public readonly int vs_old_defiextsize;
+        /// <summary>obsolete</summary>
+        public readonly int vs_old_ilbsize;
+        /// <summary>size of immediate data area</summary>
+        public readonly int vs_immedlen;
+        /// <summary>number of direct extentes</summary>
+        public readonly int vs_ndaddr;
+        /// <summary>address of first AU</summary>
+        public readonly int vs_firstau;
+        /// <summary>offset of extent map in AU</summary>
+        public readonly int vs_emap;
+        /// <summary>offset of inode map in AU</summary>
+        public readonly int vs_imap;
+        /// <summary>offset of ExtOp. map in AU</summary>
+        public readonly int vs_iextop;
+        /// <summary>offset of inode list in AU</summary>
+        public readonly int vs_istart;
+        /// <summary>offset of fdblock in AU</summary>
+        public readonly int vs_bstart;
+        /// <summary>aufirst + emap</summary>
+        public readonly int vs_femap;
+        /// <summary>aufirst + imap</summary>
+        public readonly int vs_fimap;
+        /// <summary>aufirst + iextop</summary>
+        public readonly int vs_fiextop;
+        /// <summary>aufirst + istart</summary>
+        public readonly int vs_fistart;
+        /// <summary>aufirst + bstart</summary>
+        public readonly int vs_fbstart;
+        /// <summary>number of entries in indir</summary>
+        public readonly int vs_nindir;
+        /// <summary>length of AU in blocks</summary>
+        public readonly int vs_aulen;
+        /// <summary>length of imap in blocks</summary>
+        public readonly int vs_auimlen;
+        /// <summary>length of emap in blocks</summary>
+        public readonly int vs_auemlen;
+        /// <summary>length of ilist in blocks</summary>
+        public readonly int vs_auilen;
+        /// <summary>length of pad in blocks</summary>
+        public readonly int vs_aupad;
+        /// <summary>data blocks in AU</summary>
+        public readonly int vs_aublocks;
+        /// <summary>log base 2 of aublocks</summary>
+        public readonly int vs_maxtier;
+        /// <summary>number of inodes per blk</summary>
+        public readonly int vs_inopb;
+        /// <summary>obsolete</summary>
+        public readonly int vs_old_inopau;
+        /// <summary>obsolete</summary>
+        public readonly int vs_old_inopilb;
+        /// <summary>obsolete</summary>
+        public readonly int vs_old_ndiripau;
+        /// <summary>size of indirect addr ext.</summary>
+        public readonly int vs_iaddrlen;
+        /// <summary>log base 2 of bsize</summary>
+        public readonly int vs_bshift;
+        /// <summary>log base 2 of inobp</summary>
+        public readonly int vs_inoshift;
+        /// <summary>~( bsize - 1 )</summary>
+        public readonly int vs_bmask;
+        /// <summary>bsize - 1</summary>
+        public readonly int vs_boffmask;
+        /// <summary>old_inopilb - 1</summary>
+        public readonly int vs_old_inomask;
+        /// <summary>checksum of V1 data</summary>
+        public readonly int vs_checksum;
+        /// <summary>number of free blocks</summary>
+        public readonly int vs_free;
+        /// <summary>number of free inodes</summary>
+        public readonly int vs_ifree;
+        /// <summary>number of free extents by size</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly int[] vs_efree;
+        /// <summary>flags ?!?</summary>
+        public readonly int vs_flags;
+        /// <summary>filesystem has been changed</summary>
+        public readonly byte vs_mod;
+        /// <summary>clean FS</summary>
+        public readonly byte vs_clean;
+        /// <summary>unused</summary>
+        public readonly ushort __unused4;
+        /// <summary>mount time log ID</summary>
+        public readonly uint vs_firstlogid;
+        /// <summary>last time written - sec</summary>
+        public readonly uint vs_wtime;
+        /// <summary>last time written - usec</summary>
+        public readonly uint vs_wutime;
+        /// <summary>FS name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] vs_fname;
+        /// <summary>FS pack name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public readonly byte[] vs_fpack;
+        /// <summary>log format version</summary>
+        public readonly int vs_logversion;
+        /// <summary>unused</summary>
+        public readonly int __unused5;
+        /// <summary>OLT extent and replica</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly int[] vs_oltext;
+        /// <summary>OLT extent size</summary>
+        public readonly int vs_oltsize;
+        /// <summary>size of inode map</summary>
+        public readonly int vs_iauimlen;
+        /// <summary>size of IAU in blocks</summary>
+        public readonly int vs_iausize;
+        /// <summary>size of inode in bytes</summary>
+        public readonly int vs_dinosize;
+        /// <summary>indir levels per inode</summary>
+        public readonly int vs_old_dniaddr;
+        /// <summary>checksum of V2 RO</summary>
+        public readonly int vs_checksum2;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/XFS.cs b/Aaru.Filesystems/XFS.cs
index fb1f9f440..d49ed8f84 100644
--- a/Aaru.Filesystems/XFS.cs
+++ b/Aaru.Filesystems/XFS.cs
@@ -41,268 +41,267 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements detection of SGI's XFS</summary>
+public sealed class XFS : IFilesystem
 {
+    const uint XFS_MAGIC = 0x58465342;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of SGI's XFS</summary>
-    public sealed class XFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "XFS Filesystem Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("1D8CD8B8-27E6-410F-9973-D16409225FBA");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint XFS_MAGIC = 0x58465342;
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "XFS Filesystem Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("1D8CD8B8-27E6-410F-9973-D16409225FBA");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        // Misaligned
+        if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
         {
-            if(imagePlugin.Info.SectorSize < 512)
+            uint sbSize = (uint)((Marshal.SizeOf<Superblock>() + 0x400) / imagePlugin.Info.SectorSize);
+
+            if((Marshal.SizeOf<Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
                 return false;
 
-            // Misaligned
-            if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
-            {
-                uint sbSize = (uint)((Marshal.SizeOf<Superblock>() + 0x400) / imagePlugin.Info.SectorSize);
+            if(sector.Length < Marshal.SizeOf<Superblock>())
+                return false;
 
-                if((Marshal.SizeOf<Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0)
+            byte[] sbpiece = new byte[Marshal.SizeOf<Superblock>()];
+
+            foreach(int location in new[]
+                    {
+                        0, 0x200, 0x400
+                    })
+            {
+                Array.Copy(sector, location, sbpiece, 0, Marshal.SizeOf<Superblock>());
+
+                Superblock xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
+
+                AaruConsole.DebugWriteLine("XFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8})",
+                                           location, xfsSb.magicnum, XFS_MAGIC);
+
+                if(xfsSb.magicnum == XFS_MAGIC)
+                    return true;
+            }
+        }
+        else
+            foreach(int i in new[]
+                    {
+                        0, 1, 2
+                    })
+            {
+                ulong location = (ulong)i;
+
+                uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+                if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
                     sbSize++;
 
-                ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+                ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out byte[] sector);
 
                 if(errno != ErrorNumber.NoError)
-                    return false;
+                    continue;
 
                 if(sector.Length < Marshal.SizeOf<Superblock>())
                     return false;
 
-                byte[] sbpiece = new byte[Marshal.SizeOf<Superblock>()];
+                Superblock xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
 
-                foreach(int location in new[]
-                {
-                    0, 0x200, 0x400
-                })
-                {
-                    Array.Copy(sector, location, sbpiece, 0, Marshal.SizeOf<Superblock>());
+                AaruConsole.DebugWriteLine("XFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8})", location,
+                                           xfsSb.magicnum, XFS_MAGIC);
 
-                    Superblock xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
-
-                    AaruConsole.DebugWriteLine("XFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8})",
-                                               location, xfsSb.magicnum, XFS_MAGIC);
-
-                    if(xfsSb.magicnum == XFS_MAGIC)
-                        return true;
-                }
+                if(xfsSb.magicnum == XFS_MAGIC)
+                    return true;
             }
-            else
-                foreach(int i in new[]
-                {
-                    0, 1, 2
-                })
-                {
-                    ulong location = (ulong)i;
 
-                    uint sbSize = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+        return false;
+    }
 
-                    if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                        sbSize++;
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
 
-                    ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out byte[] sector);
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
 
-                    if(errno != ErrorNumber.NoError)
-                        continue;
+        var xfsSb = new Superblock();
 
-                    if(sector.Length < Marshal.SizeOf<Superblock>())
-                        return false;
-
-                    Superblock xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
-
-                    AaruConsole.DebugWriteLine("XFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8})", location,
-                                               xfsSb.magicnum, XFS_MAGIC);
-
-                    if(xfsSb.magicnum == XFS_MAGIC)
-                        return true;
-                }
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        // Misaligned
+        if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
+            uint sbSize = (uint)((Marshal.SizeOf<Superblock>() + 0x400) / imagePlugin.Info.SectorSize);
 
-            if(imagePlugin.Info.SectorSize < 512)
+            if((Marshal.SizeOf<Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0)
+                sbSize++;
+
+            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+
+            if(errno         != ErrorNumber.NoError ||
+               sector.Length < Marshal.SizeOf<Superblock>())
                 return;
 
-            var xfsSb = new Superblock();
+            byte[] sbpiece = new byte[Marshal.SizeOf<Superblock>()];
 
-            // Misaligned
-            if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+            foreach(int location in new[]
+                    {
+                        0, 0x200, 0x400
+                    })
             {
-                uint sbSize = (uint)((Marshal.SizeOf<Superblock>() + 0x400) / imagePlugin.Info.SectorSize);
+                Array.Copy(sector, location, sbpiece, 0, Marshal.SizeOf<Superblock>());
 
-                if((Marshal.SizeOf<Superblock>() + 0x400) % imagePlugin.Info.SectorSize != 0)
+                xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
+
+                AaruConsole.DebugWriteLine("XFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8})",
+                                           location, xfsSb.magicnum, XFS_MAGIC);
+
+                if(xfsSb.magicnum == XFS_MAGIC)
+                    break;
+            }
+        }
+        else
+            foreach(int i in new[]
+                    {
+                        0, 1, 2
+                    })
+            {
+                ulong location = (ulong)i;
+                uint  sbSize   = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
+
+                if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
                     sbSize++;
 
-                ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+                ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out byte[] sector);
 
                 if(errno         != ErrorNumber.NoError ||
                    sector.Length < Marshal.SizeOf<Superblock>())
                     return;
 
-                byte[] sbpiece = new byte[Marshal.SizeOf<Superblock>()];
+                xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
 
-                foreach(int location in new[]
-                {
-                    0, 0x200, 0x400
-                })
-                {
-                    Array.Copy(sector, location, sbpiece, 0, Marshal.SizeOf<Superblock>());
+                AaruConsole.DebugWriteLine("XFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8})", location,
+                                           xfsSb.magicnum, XFS_MAGIC);
 
-                    xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sbpiece);
-
-                    AaruConsole.DebugWriteLine("XFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8})",
-                                               location, xfsSb.magicnum, XFS_MAGIC);
-
-                    if(xfsSb.magicnum == XFS_MAGIC)
-                        break;
-                }
+                if(xfsSb.magicnum == XFS_MAGIC)
+                    break;
             }
-            else
-                foreach(int i in new[]
-                {
-                    0, 1, 2
-                })
-                {
-                    ulong location = (ulong)i;
-                    uint  sbSize   = (uint)(Marshal.SizeOf<Superblock>() / imagePlugin.Info.SectorSize);
 
-                    if(Marshal.SizeOf<Superblock>() % imagePlugin.Info.SectorSize != 0)
-                        sbSize++;
+        if(xfsSb.magicnum != XFS_MAGIC)
+            return;
 
-                    ErrorNumber errno = imagePlugin.ReadSectors(partition.Start + location, sbSize, out byte[] sector);
+        var sb = new StringBuilder();
 
-                    if(errno         != ErrorNumber.NoError ||
-                       sector.Length < Marshal.SizeOf<Superblock>())
-                        return;
+        sb.AppendLine("XFS filesystem");
+        sb.AppendFormat("Filesystem version {0}", xfsSb.version & 0xF).AppendLine();
+        sb.AppendFormat("{0} bytes per sector", xfsSb.sectsize).AppendLine();
+        sb.AppendFormat("{0} bytes per block", xfsSb.blocksize).AppendLine();
+        sb.AppendFormat("{0} bytes per inode", xfsSb.inodesize).AppendLine();
+        sb.AppendFormat("{0} data blocks in volume, {1} free", xfsSb.dblocks, xfsSb.fdblocks).AppendLine();
+        sb.AppendFormat("{0} blocks per allocation group", xfsSb.agblocks).AppendLine();
+        sb.AppendFormat("{0} allocation groups in volume", xfsSb.agcount).AppendLine();
+        sb.AppendFormat("{0} inodes in volume, {1} free", xfsSb.icount, xfsSb.ifree).AppendLine();
 
-                    xfsSb = Marshal.ByteArrayToStructureBigEndian<Superblock>(sector);
+        if(xfsSb.inprogress > 0)
+            sb.AppendLine("fsck in progress");
 
-                    AaruConsole.DebugWriteLine("XFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8})", location,
-                                               xfsSb.magicnum, XFS_MAGIC);
+        sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(xfsSb.fname, Encoding)).AppendLine();
+        sb.AppendFormat("Volume UUID: {0}", xfsSb.uuid).AppendLine();
 
-                    if(xfsSb.magicnum == XFS_MAGIC)
-                        break;
-                }
+        information = sb.ToString();
 
-            if(xfsSb.magicnum != XFS_MAGIC)
-                return;
-
-            var sb = new StringBuilder();
-
-            sb.AppendLine("XFS filesystem");
-            sb.AppendFormat("Filesystem version {0}", xfsSb.version & 0xF).AppendLine();
-            sb.AppendFormat("{0} bytes per sector", xfsSb.sectsize).AppendLine();
-            sb.AppendFormat("{0} bytes per block", xfsSb.blocksize).AppendLine();
-            sb.AppendFormat("{0} bytes per inode", xfsSb.inodesize).AppendLine();
-            sb.AppendFormat("{0} data blocks in volume, {1} free", xfsSb.dblocks, xfsSb.fdblocks).AppendLine();
-            sb.AppendFormat("{0} blocks per allocation group", xfsSb.agblocks).AppendLine();
-            sb.AppendFormat("{0} allocation groups in volume", xfsSb.agcount).AppendLine();
-            sb.AppendFormat("{0} inodes in volume, {1} free", xfsSb.icount, xfsSb.ifree).AppendLine();
-
-            if(xfsSb.inprogress > 0)
-                sb.AppendLine("fsck in progress");
-
-            sb.AppendFormat("Volume name: {0}", StringHandlers.CToString(xfsSb.fname, Encoding)).AppendLine();
-            sb.AppendFormat("Volume UUID: {0}", xfsSb.uuid).AppendLine();
-
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type                  = "XFS filesystem",
-                ClusterSize           = xfsSb.blocksize,
-                Clusters              = xfsSb.dblocks,
-                FreeClusters          = xfsSb.fdblocks,
-                FreeClustersSpecified = true,
-                Files                 = xfsSb.icount - xfsSb.ifree,
-                FilesSpecified        = true,
-                Dirty                 = xfsSb.inprogress > 0,
-                VolumeName            = StringHandlers.CToString(xfsSb.fname, Encoding),
-                VolumeSerial          = xfsSb.uuid.ToString()
-            };
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Superblock
+        XmlFsType = new FileSystemType
         {
-            public readonly uint   magicnum;
-            public readonly uint   blocksize;
-            public readonly ulong  dblocks;
-            public readonly ulong  rblocks;
-            public readonly ulong  rextents;
-            public readonly Guid   uuid;
-            public readonly ulong  logstat;
-            public readonly ulong  rootino;
-            public readonly ulong  rbmino;
-            public readonly ulong  rsumino;
-            public readonly uint   rextsize;
-            public readonly uint   agblocks;
-            public readonly uint   agcount;
-            public readonly uint   rbmblocks;
-            public readonly uint   logblocks;
-            public readonly ushort version;
-            public readonly ushort sectsize;
-            public readonly ushort inodesize;
-            public readonly ushort inopblock;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] fname;
-            public readonly byte   blocklog;
-            public readonly byte   sectlog;
-            public readonly byte   inodelog;
-            public readonly byte   inopblog;
-            public readonly byte   agblklog;
-            public readonly byte   rextslog;
-            public readonly byte   inprogress;
-            public readonly byte   imax_pct;
-            public readonly ulong  icount;
-            public readonly ulong  ifree;
-            public readonly ulong  fdblocks;
-            public readonly ulong  frextents;
-            public readonly ulong  uquotino;
-            public readonly ulong  gquotino;
-            public readonly ushort qflags;
-            public readonly byte   flags;
-            public readonly byte   shared_vn;
-            public readonly ulong  inoalignmt;
-            public readonly ulong  unit;
-            public readonly ulong  width;
-            public readonly byte   dirblklog;
-            public readonly byte   logsectlog;
-            public readonly ushort logsectsize;
-            public readonly uint   logsunit;
-            public readonly uint   features2;
-            public readonly uint   bad_features2;
-            public readonly uint   features_compat;
-            public readonly uint   features_ro_compat;
-            public readonly uint   features_incompat;
-            public readonly uint   features_log_incompat;
+            Type                  = "XFS filesystem",
+            ClusterSize           = xfsSb.blocksize,
+            Clusters              = xfsSb.dblocks,
+            FreeClusters          = xfsSb.fdblocks,
+            FreeClustersSpecified = true,
+            Files                 = xfsSb.icount - xfsSb.ifree,
+            FilesSpecified        = true,
+            Dirty                 = xfsSb.inprogress > 0,
+            VolumeName            = StringHandlers.CToString(xfsSb.fname, Encoding),
+            VolumeSerial          = xfsSb.uuid.ToString()
+        };
+    }
 
-            // This field is little-endian while rest of superblock is big-endian
-            public readonly uint  crc;
-            public readonly uint  spino_align;
-            public readonly ulong pquotino;
-            public readonly ulong lsn;
-            public readonly Guid  meta_uuid;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Superblock
+    {
+        public readonly uint   magicnum;
+        public readonly uint   blocksize;
+        public readonly ulong  dblocks;
+        public readonly ulong  rblocks;
+        public readonly ulong  rextents;
+        public readonly Guid   uuid;
+        public readonly ulong  logstat;
+        public readonly ulong  rootino;
+        public readonly ulong  rbmino;
+        public readonly ulong  rsumino;
+        public readonly uint   rextsize;
+        public readonly uint   agblocks;
+        public readonly uint   agcount;
+        public readonly uint   rbmblocks;
+        public readonly uint   logblocks;
+        public readonly ushort version;
+        public readonly ushort sectsize;
+        public readonly ushort inodesize;
+        public readonly ushort inopblock;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] fname;
+        public readonly byte   blocklog;
+        public readonly byte   sectlog;
+        public readonly byte   inodelog;
+        public readonly byte   inopblog;
+        public readonly byte   agblklog;
+        public readonly byte   rextslog;
+        public readonly byte   inprogress;
+        public readonly byte   imax_pct;
+        public readonly ulong  icount;
+        public readonly ulong  ifree;
+        public readonly ulong  fdblocks;
+        public readonly ulong  frextents;
+        public readonly ulong  uquotino;
+        public readonly ulong  gquotino;
+        public readonly ushort qflags;
+        public readonly byte   flags;
+        public readonly byte   shared_vn;
+        public readonly ulong  inoalignmt;
+        public readonly ulong  unit;
+        public readonly ulong  width;
+        public readonly byte   dirblklog;
+        public readonly byte   logsectlog;
+        public readonly ushort logsectsize;
+        public readonly uint   logsunit;
+        public readonly uint   features2;
+        public readonly uint   bad_features2;
+        public readonly uint   features_compat;
+        public readonly uint   features_ro_compat;
+        public readonly uint   features_incompat;
+        public readonly uint   features_log_incompat;
+
+        // This field is little-endian while rest of superblock is big-endian
+        public readonly uint  crc;
+        public readonly uint  spino_align;
+        public readonly ulong pquotino;
+        public readonly ulong lsn;
+        public readonly Guid  meta_uuid;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/Xia.cs b/Aaru.Filesystems/Xia.cs
index a02201c98..0ce95dfd4 100644
--- a/Aaru.Filesystems/Xia.cs
+++ b/Aaru.Filesystems/Xia.cs
@@ -41,180 +41,179 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from the Linux kernel
+/// <inheritdoc />
+/// <summary>Implements detection for the Xia filesystem</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed class Xia : IFilesystem
 {
-    // Information from the Linux kernel
+    const uint XIAFS_SUPER_MAGIC        = 0x012FD16D;
+    const uint XIAFS_ROOT_INO           = 1;
+    const uint XIAFS_BAD_INO            = 2;
+    const int  XIAFS_MAX_LINK           = 64000;
+    const int  XIAFS_DIR_SIZE           = 12;
+    const int  XIAFS_NUM_BLOCK_POINTERS = 10;
+    const int  XIAFS_NAME_LEN           = 248;
+
     /// <inheritdoc />
-    /// <summary>Implements detection for the Xia filesystem</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed class Xia : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Xia filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("169E1DE5-24F2-4EF6-A04D-A4B2CA66DE9D");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const uint XIAFS_SUPER_MAGIC        = 0x012FD16D;
-        const uint XIAFS_ROOT_INO           = 1;
-        const uint XIAFS_BAD_INO            = 2;
-        const int  XIAFS_MAX_LINK           = 64000;
-        const int  XIAFS_DIR_SIZE           = 12;
-        const int  XIAFS_NUM_BLOCK_POINTERS = 10;
-        const int  XIAFS_NAME_LEN           = 248;
+        int  sbSizeInBytes   = Marshal.SizeOf<SuperBlock>();
+        uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Xia filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("169E1DE5-24F2-4EF6-A04D-A4B2CA66DE9D");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
+            sbSizeInSectors++;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(sbSizeInSectors + partition.Start >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSizeInSectors, out byte[] sbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        SuperBlock supblk = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sbSector);
+
+        return supblk.s_magic == XIAFS_SUPER_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        int  sbSizeInBytes   = Marshal.SizeOf<SuperBlock>();
+        uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
+
+        if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
+            sbSizeInSectors++;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSizeInSectors, out byte[] sbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        SuperBlock supblk = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sbSector);
+
+        sb.AppendFormat("{0} bytes per zone", supblk.s_zone_size).AppendLine();
+
+        sb.AppendFormat("{0} zones in volume ({1} bytes)", supblk.s_nzones, supblk.s_nzones * supblk.s_zone_size).
+           AppendLine();
+
+        sb.AppendFormat("{0} inodes", supblk.s_ninodes).AppendLine();
+
+        sb.AppendFormat("{0} data zones ({1} bytes)", supblk.s_ndatazones,
+                        supblk.s_ndatazones * supblk.s_zone_size).AppendLine();
+
+        sb.AppendFormat("{0} imap zones ({1} bytes)", supblk.s_imap_zones,
+                        supblk.s_imap_zones * supblk.s_zone_size).AppendLine();
+
+        sb.AppendFormat("{0} zmap zones ({1} bytes)", supblk.s_zmap_zones,
+                        supblk.s_zmap_zones * supblk.s_zone_size).AppendLine();
+
+        sb.AppendFormat("First data zone: {0}", supblk.s_firstdatazone).AppendLine();
+
+        sb.AppendFormat("Maximum filesize is {0} bytes ({1} MiB)", supblk.s_max_size, supblk.s_max_size / 1048576).
+           AppendLine();
+
+        sb.AppendFormat("{0} zones reserved for kernel images ({1} bytes)", supblk.s_kernzones,
+                        supblk.s_kernzones * supblk.s_zone_size).AppendLine();
+
+        sb.AppendFormat("First kernel zone: {0}", supblk.s_firstkernzone).AppendLine();
+
+        XmlFsType = new FileSystemType
         {
-            int  sbSizeInBytes   = Marshal.SizeOf<SuperBlock>();
-            uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
+            Bootable    = !ArrayHelpers.ArrayIsNullOrEmpty(supblk.s_boot_segment),
+            Clusters    = supblk.s_nzones,
+            ClusterSize = supblk.s_zone_size,
+            Type        = "Xia filesystem"
+        };
 
-            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
-                sbSizeInSectors++;
+        information = sb.ToString();
+    }
 
-            if(sbSizeInSectors + partition.Start >= partition.End)
-                return false;
+    /// <summary>Xia superblock</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SuperBlock
+    {
+        /// <summary>1st sector reserved for boot</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
+        public readonly byte[] s_boot_segment;
+        /// <summary>the name says it</summary>
+        public readonly uint s_zone_size;
+        /// <summary>volume size, zone aligned</summary>
+        public readonly uint s_nzones;
+        /// <summary># of inodes</summary>
+        public readonly uint s_ninodes;
+        /// <summary># of data zones</summary>
+        public readonly uint s_ndatazones;
+        /// <summary># of imap zones</summary>
+        public readonly uint s_imap_zones;
+        /// <summary># of zmap zones</summary>
+        public readonly uint s_zmap_zones;
+        /// <summary>first data zone</summary>
+        public readonly uint s_firstdatazone;
+        /// <summary>z size = 1KB &lt;&lt; z shift</summary>
+        public readonly uint s_zone_shift;
+        /// <summary>max size of a single file</summary>
+        public readonly uint s_max_size;
+        /// <summary>reserved</summary>
+        public readonly uint s_reserved0;
+        /// <summary>reserved</summary>
+        public readonly uint s_reserved1;
+        /// <summary>reserved</summary>
+        public readonly uint s_reserved2;
+        /// <summary>reserved</summary>
+        public readonly uint s_reserved3;
+        /// <summary>first kernel zone</summary>
+        public readonly uint s_firstkernzone;
+        /// <summary>kernel size in zones</summary>
+        public readonly uint s_kernzones;
+        /// <summary>magic number for xiafs</summary>
+        public readonly uint s_magic;
+    }
 
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSizeInSectors, out byte[] sbSector);
+    /// <summary>Xia directory entry</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DirectoryEntry
+    {
+        public readonly uint   d_ino;
+        public readonly ushort d_rec_len;
+        public readonly byte   d_name_len;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = XIAFS_NAME_LEN + 1)]
+        public readonly byte[] d_name;
+    }
 
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            SuperBlock supblk = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sbSector);
-
-            return supblk.s_magic == XIAFS_SUPER_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-
-            var sb = new StringBuilder();
-
-            int  sbSizeInBytes   = Marshal.SizeOf<SuperBlock>();
-            uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
-
-            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
-                sbSizeInSectors++;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSizeInSectors, out byte[] sbSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            SuperBlock supblk = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sbSector);
-
-            sb.AppendFormat("{0} bytes per zone", supblk.s_zone_size).AppendLine();
-
-            sb.AppendFormat("{0} zones in volume ({1} bytes)", supblk.s_nzones, supblk.s_nzones * supblk.s_zone_size).
-               AppendLine();
-
-            sb.AppendFormat("{0} inodes", supblk.s_ninodes).AppendLine();
-
-            sb.AppendFormat("{0} data zones ({1} bytes)", supblk.s_ndatazones,
-                            supblk.s_ndatazones * supblk.s_zone_size).AppendLine();
-
-            sb.AppendFormat("{0} imap zones ({1} bytes)", supblk.s_imap_zones,
-                            supblk.s_imap_zones * supblk.s_zone_size).AppendLine();
-
-            sb.AppendFormat("{0} zmap zones ({1} bytes)", supblk.s_zmap_zones,
-                            supblk.s_zmap_zones * supblk.s_zone_size).AppendLine();
-
-            sb.AppendFormat("First data zone: {0}", supblk.s_firstdatazone).AppendLine();
-
-            sb.AppendFormat("Maximum filesize is {0} bytes ({1} MiB)", supblk.s_max_size, supblk.s_max_size / 1048576).
-               AppendLine();
-
-            sb.AppendFormat("{0} zones reserved for kernel images ({1} bytes)", supblk.s_kernzones,
-                            supblk.s_kernzones * supblk.s_zone_size).AppendLine();
-
-            sb.AppendFormat("First kernel zone: {0}", supblk.s_firstkernzone).AppendLine();
-
-            XmlFsType = new FileSystemType
-            {
-                Bootable    = !ArrayHelpers.ArrayIsNullOrEmpty(supblk.s_boot_segment),
-                Clusters    = supblk.s_nzones,
-                ClusterSize = supblk.s_zone_size,
-                Type        = "Xia filesystem"
-            };
-
-            information = sb.ToString();
-        }
-
-        /// <summary>Xia superblock</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SuperBlock
-        {
-            /// <summary>1st sector reserved for boot</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public readonly byte[] s_boot_segment;
-            /// <summary>the name says it</summary>
-            public readonly uint s_zone_size;
-            /// <summary>volume size, zone aligned</summary>
-            public readonly uint s_nzones;
-            /// <summary># of inodes</summary>
-            public readonly uint s_ninodes;
-            /// <summary># of data zones</summary>
-            public readonly uint s_ndatazones;
-            /// <summary># of imap zones</summary>
-            public readonly uint s_imap_zones;
-            /// <summary># of zmap zones</summary>
-            public readonly uint s_zmap_zones;
-            /// <summary>first data zone</summary>
-            public readonly uint s_firstdatazone;
-            /// <summary>z size = 1KB &lt;&lt; z shift</summary>
-            public readonly uint s_zone_shift;
-            /// <summary>max size of a single file</summary>
-            public readonly uint s_max_size;
-            /// <summary>reserved</summary>
-            public readonly uint s_reserved0;
-            /// <summary>reserved</summary>
-            public readonly uint s_reserved1;
-            /// <summary>reserved</summary>
-            public readonly uint s_reserved2;
-            /// <summary>reserved</summary>
-            public readonly uint s_reserved3;
-            /// <summary>first kernel zone</summary>
-            public readonly uint s_firstkernzone;
-            /// <summary>kernel size in zones</summary>
-            public readonly uint s_kernzones;
-            /// <summary>magic number for xiafs</summary>
-            public readonly uint s_magic;
-        }
-
-        /// <summary>Xia directory entry</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DirectoryEntry
-        {
-            public readonly uint   d_ino;
-            public readonly ushort d_rec_len;
-            public readonly byte   d_name_len;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = XIAFS_NAME_LEN + 1)]
-            public readonly byte[] d_name;
-        }
-
-        /// <summary>Xia inode</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Inode
-        {
-            public readonly ushort i_mode;
-            public readonly ushort i_nlinks;
-            public readonly ushort i_uid;
-            public readonly ushort i_gid;
-            public readonly uint   i_size;
-            public readonly uint   i_ctime;
-            public readonly uint   i_atime;
-            public readonly uint   i_mtime;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = XIAFS_NUM_BLOCK_POINTERS)]
-            public readonly uint[] i_zone;
-        }
+    /// <summary>Xia inode</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Inode
+    {
+        public readonly ushort i_mode;
+        public readonly ushort i_nlinks;
+        public readonly ushort i_uid;
+        public readonly ushort i_gid;
+        public readonly uint   i_size;
+        public readonly uint   i_ctime;
+        public readonly uint   i_atime;
+        public readonly uint   i_mtime;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = XIAFS_NUM_BLOCK_POINTERS)]
+        public readonly uint[] i_zone;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ZFS.cs b/Aaru.Filesystems/ZFS.cs
index 57f399f47..adb76db0e 100644
--- a/Aaru.Filesystems/ZFS.cs
+++ b/Aaru.Filesystems/ZFS.cs
@@ -41,799 +41,798 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/*
+ * The ZFS on-disk structure is quite undocumented, so this has been checked using several test images and reading the comments and headers (but not the code)
+ * of ZFS-On-Linux.
+ *
+ * The most basic structure, the vdev label, is as follows:
+ * 8KiB of blank space
+ * 8KiB reserved for boot code, stored as a ZIO block with magic and checksum
+ * 112KiB of nvlist, usually encoded using XDR
+ * 128KiB of copies of the 1KiB uberblock
+ *
+ * Two vdev labels, L0 and L1 are stored at the start of the vdev.
+ * Another two, L2 and L3 are stored at the end.
+ *
+ * The nvlist is nothing more than a double linked list of name/value pairs where name is a string and value is an arbitrary type (and can be an array of it).
+ * On-disk they are stored sequentially (no pointers) and can be encoded in XDR (an old Sun serialization method that stores everything as 4 bytes chunks) or
+ * natively (that is as the host natively stores that values, for example on Intel an extended float would be 10 bytes (80 bit).
+ * It can also be encoded little or big endian.
+ * Because of this variations, ZFS stored a header indicating the used encoding and endianess before the encoded nvlist.
+ */
+/// <inheritdoc />
+/// <summary>Implements detection for the Zettabyte File System (ZFS)</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "UnusedType.Local"),
+ SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "NotAccessedField.Local")]
+public sealed class ZFS : IFilesystem
 {
-    /*
-     * The ZFS on-disk structure is quite undocumented, so this has been checked using several test images and reading the comments and headers (but not the code)
-     * of ZFS-On-Linux.
-     *
-     * The most basic structure, the vdev label, is as follows:
-     * 8KiB of blank space
-     * 8KiB reserved for boot code, stored as a ZIO block with magic and checksum
-     * 112KiB of nvlist, usually encoded using XDR
-     * 128KiB of copies of the 1KiB uberblock
-     *
-     * Two vdev labels, L0 and L1 are stored at the start of the vdev.
-     * Another two, L2 and L3 are stored at the end.
-     *
-     * The nvlist is nothing more than a double linked list of name/value pairs where name is a string and value is an arbitrary type (and can be an array of it).
-     * On-disk they are stored sequentially (no pointers) and can be encoded in XDR (an old Sun serialization method that stores everything as 4 bytes chunks) or
-     * natively (that is as the host natively stores that values, for example on Intel an extended float would be 10 bytes (80 bit).
-     * It can also be encoded little or big endian.
-     * Because of this variations, ZFS stored a header indicating the used encoding and endianess before the encoded nvlist.
-     */
+    const ulong ZEC_MAGIC = 0x0210DA7AB10C7A11;
+    const ulong ZEC_CIGAM = 0x117A0CB17ADA1002;
+
+    // These parameters define how the nvlist is stored
+    const byte NVS_LITTLE_ENDIAN = 1;
+    const byte NVS_BIG_ENDIAN    = 0;
+    const byte NVS_NATIVE        = 0;
+    const byte NVS_XDR           = 1;
+
+    const ulong UBERBLOCK_MAGIC = 0x00BAB10C;
+
+    const uint ZFS_MAGIC = 0x58465342;
+
     /// <inheritdoc />
-    /// <summary>Implements detection for the Zettabyte File System (ZFS)</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "UnusedType.Local"),
-     SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "NotAccessedField.Local")]
-    public sealed class ZFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "ZFS Filesystem Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("0750014F-A714-4692-A369-E23F6EC3659C");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const ulong ZEC_MAGIC = 0x0210DA7AB10C7A11;
-        const ulong ZEC_CIGAM = 0x117A0CB17ADA1002;
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
 
-        // These parameters define how the nvlist is stored
-        const byte NVS_LITTLE_ENDIAN = 1;
-        const byte NVS_BIG_ENDIAN    = 0;
-        const byte NVS_NATIVE        = 0;
-        const byte NVS_XDR           = 1;
+        byte[]      sector;
+        ulong       magic;
+        ErrorNumber errno;
 
-        const ulong UBERBLOCK_MAGIC = 0x00BAB10C;
-
-        const uint ZFS_MAGIC = 0x58465342;
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "ZFS Filesystem Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("0750014F-A714-4692-A369-E23F6EC3659C");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(partition.Start + 31 < partition.End)
         {
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
-
-            byte[]      sector;
-            ulong       magic;
-            ErrorNumber errno;
-
-            if(partition.Start + 31 < partition.End)
-            {
-                errno = imagePlugin.ReadSector(partition.Start + 31, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                magic = BitConverter.ToUInt64(sector, 0x1D8);
-
-                if(magic == ZEC_MAGIC ||
-                   magic == ZEC_CIGAM)
-                    return true;
-            }
-
-            if(partition.Start + 16 >= partition.End)
-                return false;
-
-            errno = imagePlugin.ReadSector(partition.Start + 16, out sector);
+            errno = imagePlugin.ReadSector(partition.Start + 31, out sector);
 
             if(errno != ErrorNumber.NoError)
                 return false;
 
             magic = BitConverter.ToUInt64(sector, 0x1D8);
 
-            return magic == ZEC_MAGIC || magic == ZEC_CIGAM;
+            if(magic == ZEC_MAGIC ||
+               magic == ZEC_CIGAM)
+                return true;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        if(partition.Start + 16 >= partition.End)
+            return false;
+
+        errno = imagePlugin.ReadSector(partition.Start + 16, out sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        magic = BitConverter.ToUInt64(sector, 0x1D8);
+
+        return magic == ZEC_MAGIC || magic == ZEC_CIGAM;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        // ZFS is always UTF-8
+        Encoding    = Encoding.UTF8;
+        information = "";
+        ErrorNumber errno;
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        byte[] sector;
+        ulong  magic;
+
+        ulong nvlistOff = 32;
+        uint  nvlistLen = 114688 / imagePlugin.Info.SectorSize;
+
+        if(partition.Start + 31 < partition.End)
         {
-            // ZFS is always UTF-8
-            Encoding    = Encoding.UTF8;
-            information = "";
-            ErrorNumber errno;
-
-            if(imagePlugin.Info.SectorSize < 512)
-                return;
-
-            byte[] sector;
-            ulong  magic;
-
-            ulong nvlistOff = 32;
-            uint  nvlistLen = 114688 / imagePlugin.Info.SectorSize;
-
-            if(partition.Start + 31 < partition.End)
-            {
-                errno = imagePlugin.ReadSector(partition.Start + 31, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                magic = BitConverter.ToUInt64(sector, 0x1D8);
-
-                if(magic == ZEC_MAGIC ||
-                   magic == ZEC_CIGAM)
-                    nvlistOff = 32;
-            }
-
-            if(partition.Start + 16 < partition.End)
-            {
-                errno = imagePlugin.ReadSector(partition.Start + 16, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return;
-
-                magic = BitConverter.ToUInt64(sector, 0x1D8);
-
-                if(magic == ZEC_MAGIC ||
-                   magic == ZEC_CIGAM)
-                    nvlistOff = 17;
-            }
-
-            var sb = new StringBuilder();
-            sb.AppendLine("ZFS filesystem");
-
-            errno = imagePlugin.ReadSectors(partition.Start + nvlistOff, nvlistLen, out byte[] nvlist);
+            errno = imagePlugin.ReadSector(partition.Start + 31, out sector);
 
             if(errno != ErrorNumber.NoError)
                 return;
 
-            sb.AppendLine(!DecodeNvList(nvlist, out Dictionary<string, NVS_Item> decodedNvList)
-                              ? "Could not decode nvlist" : PrintNvList(decodedNvList));
+            magic = BitConverter.ToUInt64(sector, 0x1D8);
 
-            information = sb.ToString();
-
-            XmlFsType = new FileSystemType
-            {
-                Type = "ZFS filesystem"
-            };
-
-            if(decodedNvList.TryGetValue("name", out NVS_Item tmpObj))
-                XmlFsType.VolumeName = (string)tmpObj.value;
-
-            if(decodedNvList.TryGetValue("guid", out tmpObj))
-                XmlFsType.VolumeSerial = $"{(ulong)tmpObj.value}";
-
-            if(decodedNvList.TryGetValue("pool_guid", out tmpObj))
-                XmlFsType.VolumeSetIdentifier = $"{(ulong)tmpObj.value}";
+            if(magic == ZEC_MAGIC ||
+               magic == ZEC_CIGAM)
+                nvlistOff = 32;
         }
 
-        static bool DecodeNvList(byte[] nvlist, out Dictionary<string, NVS_Item> decodedNvList)
+        if(partition.Start + 16 < partition.End)
         {
-            byte[] tmp = new byte[nvlist.Length - 4];
-            Array.Copy(nvlist, 4, tmp, 0, nvlist.Length - 4);
-            bool xdr          = nvlist[0] == 1;
-            bool littleEndian = nvlist[1] == 1;
+            errno = imagePlugin.ReadSector(partition.Start + 16, out sector);
 
-            return DecodeNvList(tmp, out decodedNvList, xdr, littleEndian);
+            if(errno != ErrorNumber.NoError)
+                return;
+
+            magic = BitConverter.ToUInt64(sector, 0x1D8);
+
+            if(magic == ZEC_MAGIC ||
+               magic == ZEC_CIGAM)
+                nvlistOff = 17;
         }
 
-        // TODO: Decode native nvlist
-        static bool DecodeNvList(byte[] nvlist, out Dictionary<string, NVS_Item> decodedNvList, bool xdr,
-                                 bool littleEndian)
+        var sb = new StringBuilder();
+        sb.AppendLine("ZFS filesystem");
+
+        errno = imagePlugin.ReadSectors(partition.Start + nvlistOff, nvlistLen, out byte[] nvlist);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        sb.AppendLine(!DecodeNvList(nvlist, out Dictionary<string, NVS_Item> decodedNvList)
+                          ? "Could not decode nvlist" : PrintNvList(decodedNvList));
+
+        information = sb.ToString();
+
+        XmlFsType = new FileSystemType
         {
-            decodedNvList = new Dictionary<string, NVS_Item>();
+            Type = "ZFS filesystem"
+        };
 
-            if(nvlist        == null ||
-               nvlist.Length < 16)
-                return false;
+        if(decodedNvList.TryGetValue("name", out NVS_Item tmpObj))
+            XmlFsType.VolumeName = (string)tmpObj.value;
 
-            if(!xdr)
-                return false;
+        if(decodedNvList.TryGetValue("guid", out tmpObj))
+            XmlFsType.VolumeSerial = $"{(ulong)tmpObj.value}";
 
-            int offset = 8;
+        if(decodedNvList.TryGetValue("pool_guid", out tmpObj))
+            XmlFsType.VolumeSetIdentifier = $"{(ulong)tmpObj.value}";
+    }
 
-            while(offset < nvlist.Length)
+    static bool DecodeNvList(byte[] nvlist, out Dictionary<string, NVS_Item> decodedNvList)
+    {
+        byte[] tmp = new byte[nvlist.Length - 4];
+        Array.Copy(nvlist, 4, tmp, 0, nvlist.Length - 4);
+        bool xdr          = nvlist[0] == 1;
+        bool littleEndian = nvlist[1] == 1;
+
+        return DecodeNvList(tmp, out decodedNvList, xdr, littleEndian);
+    }
+
+    // TODO: Decode native nvlist
+    static bool DecodeNvList(byte[] nvlist, out Dictionary<string, NVS_Item> decodedNvList, bool xdr,
+                             bool littleEndian)
+    {
+        decodedNvList = new Dictionary<string, NVS_Item>();
+
+        if(nvlist        == null ||
+           nvlist.Length < 16)
+            return false;
+
+        if(!xdr)
+            return false;
+
+        int offset = 8;
+
+        while(offset < nvlist.Length)
+        {
+            var item    = new NVS_Item();
+            int currOff = offset;
+
+            item.encodedSize = BigEndianBitConverter.ToUInt32(nvlist, offset);
+
+            // Finished
+            if(item.encodedSize == 0)
+                break;
+
+            offset           += 4;
+            item.decodedSize =  BigEndianBitConverter.ToUInt32(nvlist, offset);
+            offset           += 4;
+            uint nameLength = BigEndianBitConverter.ToUInt32(nvlist, offset);
+            offset += 4;
+
+            if(nameLength % 4 > 0)
+                nameLength += 4 - (nameLength % 4);
+
+            byte[] nameBytes = new byte[nameLength];
+            Array.Copy(nvlist, offset, nameBytes, 0, nameLength);
+            item.name     =  StringHandlers.CToString(nameBytes);
+            offset        += (int)nameLength;
+            item.dataType =  (NVS_DataTypes)BigEndianBitConverter.ToUInt32(nvlist, offset);
+            offset        += 4;
+            item.elements =  BigEndianBitConverter.ToUInt32(nvlist, offset);
+            offset        += 4;
+
+            if(item.elements == 0)
             {
-                var item    = new NVS_Item();
-                int currOff = offset;
+                decodedNvList.Add(item.name, item);
 
-                item.encodedSize = BigEndianBitConverter.ToUInt32(nvlist, offset);
+                continue;
+            }
 
-                // Finished
-                if(item.encodedSize == 0)
-                    break;
+            switch(item.dataType)
+            {
+                case NVS_DataTypes.DATA_TYPE_BOOLEAN:
+                case NVS_DataTypes.DATA_TYPE_BOOLEAN_ARRAY:
+                case NVS_DataTypes.DATA_TYPE_BOOLEAN_VALUE:
+                    if(item.elements > 1)
+                    {
+                        bool[] boolArray = new bool[item.elements];
 
-                offset           += 4;
-                item.decodedSize =  BigEndianBitConverter.ToUInt32(nvlist, offset);
-                offset           += 4;
-                uint nameLength = BigEndianBitConverter.ToUInt32(nvlist, offset);
-                offset += 4;
-
-                if(nameLength % 4 > 0)
-                    nameLength += 4 - (nameLength % 4);
-
-                byte[] nameBytes = new byte[nameLength];
-                Array.Copy(nvlist, offset, nameBytes, 0, nameLength);
-                item.name     =  StringHandlers.CToString(nameBytes);
-                offset        += (int)nameLength;
-                item.dataType =  (NVS_DataTypes)BigEndianBitConverter.ToUInt32(nvlist, offset);
-                offset        += 4;
-                item.elements =  BigEndianBitConverter.ToUInt32(nvlist, offset);
-                offset        += 4;
-
-                if(item.elements == 0)
-                {
-                    decodedNvList.Add(item.name, item);
-
-                    continue;
-                }
-
-                switch(item.dataType)
-                {
-                    case NVS_DataTypes.DATA_TYPE_BOOLEAN:
-                    case NVS_DataTypes.DATA_TYPE_BOOLEAN_ARRAY:
-                    case NVS_DataTypes.DATA_TYPE_BOOLEAN_VALUE:
-                        if(item.elements > 1)
-                        {
-                            bool[] boolArray = new bool[item.elements];
-
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                uint temp = BigEndianBitConverter.ToUInt32(nvlist, offset);
-                                boolArray[i] =  temp > 0;
-                                offset       += 4;
-                            }
-
-                            item.value = boolArray;
-                        }
-                        else
+                        for(int i = 0; i < item.elements; i++)
                         {
                             uint temp = BigEndianBitConverter.ToUInt32(nvlist, offset);
-                            item.value =  temp > 0;
-                            offset     += 4;
+                            boolArray[i] =  temp > 0;
+                            offset       += 4;
                         }
 
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_BYTE:
-                    case NVS_DataTypes.DATA_TYPE_BYTE_ARRAY:
-                    case NVS_DataTypes.DATA_TYPE_UINT8:
-                    case NVS_DataTypes.DATA_TYPE_UINT8_ARRAY:
-                        if(item.elements > 1)
-                        {
-                            byte[] byteArray = new byte[item.elements];
-                            Array.Copy(nvlist, offset, byteArray, 0, item.elements);
-                            offset += (int)item.elements;
+                        item.value = boolArray;
+                    }
+                    else
+                    {
+                        uint temp = BigEndianBitConverter.ToUInt32(nvlist, offset);
+                        item.value =  temp > 0;
+                        offset     += 4;
+                    }
 
-                            if(item.elements % 4 > 0)
-                                offset += 4 - (int)(item.elements % 4);
+                    break;
+                case NVS_DataTypes.DATA_TYPE_BYTE:
+                case NVS_DataTypes.DATA_TYPE_BYTE_ARRAY:
+                case NVS_DataTypes.DATA_TYPE_UINT8:
+                case NVS_DataTypes.DATA_TYPE_UINT8_ARRAY:
+                    if(item.elements > 1)
+                    {
+                        byte[] byteArray = new byte[item.elements];
+                        Array.Copy(nvlist, offset, byteArray, 0, item.elements);
+                        offset += (int)item.elements;
 
-                            item.value = byteArray;
-                        }
-                        else
+                        if(item.elements % 4 > 0)
+                            offset += 4 - (int)(item.elements % 4);
+
+                        item.value = byteArray;
+                    }
+                    else
+                    {
+                        item.value =  nvlist[offset];
+                        offset     += 4;
+                    }
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_DOUBLE:
+                    if(item.elements > 1)
+                    {
+                        double[] doubleArray = new double[item.elements];
+
+                        for(int i = 0; i < item.elements; i++)
                         {
-                            item.value =  nvlist[offset];
-                            offset     += 4;
+                            double temp = BigEndianBitConverter.ToDouble(nvlist, offset);
+                            doubleArray[i] =  temp;
+                            offset         += 8;
                         }
 
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_DOUBLE:
-                        if(item.elements > 1)
+                        item.value = doubleArray;
+                    }
+                    else
+                    {
+                        item.value =  BigEndianBitConverter.ToDouble(nvlist, offset);
+                        offset     += 8;
+                    }
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_HRTIME:
+                    if(item.elements > 1)
+                    {
+                        DateTime[] hrtimeArray = new DateTime[item.elements];
+
+                        for(int i = 0; i < item.elements; i++)
                         {
-                            double[] doubleArray = new double[item.elements];
-
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                double temp = BigEndianBitConverter.ToDouble(nvlist, offset);
-                                doubleArray[i] =  temp;
-                                offset         += 8;
-                            }
-
-                            item.value = doubleArray;
-                        }
-                        else
-                        {
-                            item.value =  BigEndianBitConverter.ToDouble(nvlist, offset);
-                            offset     += 8;
-                        }
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_HRTIME:
-                        if(item.elements > 1)
-                        {
-                            DateTime[] hrtimeArray = new DateTime[item.elements];
-
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                DateTime temp =
-                                    DateHandlers.UnixHrTimeToDateTime(BigEndianBitConverter.ToUInt64(nvlist, offset));
-
-                                hrtimeArray[i] =  temp;
-                                offset         += 8;
-                            }
-
-                            item.value = hrtimeArray;
-                        }
-                        else
-                        {
-                            item.value =
+                            DateTime temp =
                                 DateHandlers.UnixHrTimeToDateTime(BigEndianBitConverter.ToUInt64(nvlist, offset));
 
-                            offset += 8;
+                            hrtimeArray[i] =  temp;
+                            offset         += 8;
                         }
 
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_INT16:
-                    case NVS_DataTypes.DATA_TYPE_INT16_ARRAY:
-                        if(item.elements > 1)
+                        item.value = hrtimeArray;
+                    }
+                    else
+                    {
+                        item.value =
+                            DateHandlers.UnixHrTimeToDateTime(BigEndianBitConverter.ToUInt64(nvlist, offset));
+
+                        offset += 8;
+                    }
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_INT16:
+                case NVS_DataTypes.DATA_TYPE_INT16_ARRAY:
+                    if(item.elements > 1)
+                    {
+                        short[] shortArray = new short[item.elements];
+
+                        for(int i = 0; i < item.elements; i++)
                         {
-                            short[] shortArray = new short[item.elements];
-
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                short temp = BigEndianBitConverter.ToInt16(nvlist, offset);
-                                shortArray[i] =  temp;
-                                offset        += 4;
-                            }
-
-                            item.value = shortArray;
+                            short temp = BigEndianBitConverter.ToInt16(nvlist, offset);
+                            shortArray[i] =  temp;
+                            offset        += 4;
                         }
-                        else
+
+                        item.value = shortArray;
+                    }
+                    else
+                    {
+                        item.value =  BigEndianBitConverter.ToInt16(nvlist, offset);
+                        offset     += 4;
+                    }
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_INT32:
+                case NVS_DataTypes.DATA_TYPE_INT32_ARRAY:
+                    if(item.elements > 1)
+                    {
+                        int[] intArray = new int[item.elements];
+
+                        for(int i = 0; i < item.elements; i++)
                         {
-                            item.value =  BigEndianBitConverter.ToInt16(nvlist, offset);
-                            offset     += 4;
+                            int temp = BigEndianBitConverter.ToInt32(nvlist, offset);
+                            intArray[i] =  temp;
+                            offset      += 4;
                         }
 
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_INT32:
-                    case NVS_DataTypes.DATA_TYPE_INT32_ARRAY:
-                        if(item.elements > 1)
+                        item.value = intArray;
+                    }
+                    else
+                    {
+                        item.value =  BigEndianBitConverter.ToInt32(nvlist, offset);
+                        offset     += 4;
+                    }
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_INT64:
+                case NVS_DataTypes.DATA_TYPE_INT64_ARRAY:
+                    if(item.elements > 1)
+                    {
+                        long[] longArray = new long[item.elements];
+
+                        for(int i = 0; i < item.elements; i++)
                         {
-                            int[] intArray = new int[item.elements];
-
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                int temp = BigEndianBitConverter.ToInt32(nvlist, offset);
-                                intArray[i] =  temp;
-                                offset      += 4;
-                            }
-
-                            item.value = intArray;
+                            long temp = BigEndianBitConverter.ToInt64(nvlist, offset);
+                            longArray[i] =  temp;
+                            offset       += 8;
                         }
-                        else
+
+                        item.value = longArray;
+                    }
+                    else
+                    {
+                        item.value =  BigEndianBitConverter.ToInt64(nvlist, offset);
+                        offset     += 8;
+                    }
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_INT8:
+                case NVS_DataTypes.DATA_TYPE_INT8_ARRAY:
+                    if(item.elements > 1)
+                    {
+                        sbyte[] sbyteArray = new sbyte[item.elements];
+
+                        for(int i = 0; i < item.elements; i++)
                         {
-                            item.value =  BigEndianBitConverter.ToInt32(nvlist, offset);
-                            offset     += 4;
+                            sbyte temp = (sbyte)nvlist[offset];
+                            sbyteArray[i] = temp;
+                            offset++;
                         }
 
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_INT64:
-                    case NVS_DataTypes.DATA_TYPE_INT64_ARRAY:
-                        if(item.elements > 1)
-                        {
-                            long[] longArray = new long[item.elements];
+                        item.value = sbyteArray;
 
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                long temp = BigEndianBitConverter.ToInt64(nvlist, offset);
-                                longArray[i] =  temp;
-                                offset       += 8;
-                            }
+                        if(sbyteArray.Length % 4 > 0)
+                            offset += 4 - (sbyteArray.Length % 4);
+                    }
+                    else
+                    {
+                        item.value =  BigEndianBitConverter.ToInt64(nvlist, offset);
+                        offset     += 4;
+                    }
 
-                            item.value = longArray;
-                        }
-                        else
-                        {
-                            item.value =  BigEndianBitConverter.ToInt64(nvlist, offset);
-                            offset     += 8;
-                        }
+                    break;
+                case NVS_DataTypes.DATA_TYPE_STRING:
+                case NVS_DataTypes.DATA_TYPE_STRING_ARRAY:
+                    if(item.elements > 1)
+                    {
+                        string[] stringArray = new string[item.elements];
 
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_INT8:
-                    case NVS_DataTypes.DATA_TYPE_INT8_ARRAY:
-                        if(item.elements > 1)
-                        {
-                            sbyte[] sbyteArray = new sbyte[item.elements];
-
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                sbyte temp = (sbyte)nvlist[offset];
-                                sbyteArray[i] = temp;
-                                offset++;
-                            }
-
-                            item.value = sbyteArray;
-
-                            if(sbyteArray.Length % 4 > 0)
-                                offset += 4 - (sbyteArray.Length % 4);
-                        }
-                        else
-                        {
-                            item.value =  BigEndianBitConverter.ToInt64(nvlist, offset);
-                            offset     += 4;
-                        }
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_STRING:
-                    case NVS_DataTypes.DATA_TYPE_STRING_ARRAY:
-                        if(item.elements > 1)
-                        {
-                            string[] stringArray = new string[item.elements];
-
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                uint strLength = BigEndianBitConverter.ToUInt32(nvlist, offset);
-                                offset += 4;
-                                byte[] strBytes = new byte[strLength];
-                                Array.Copy(nvlist, offset, strBytes, 0, strLength);
-                                stringArray[i] =  StringHandlers.CToString(strBytes);
-                                offset         += (int)strLength;
-
-                                if(strLength % 4 > 0)
-                                    offset += 4 - (int)(strLength % 4);
-                            }
-
-                            item.value = stringArray;
-                        }
-                        else
+                        for(int i = 0; i < item.elements; i++)
                         {
                             uint strLength = BigEndianBitConverter.ToUInt32(nvlist, offset);
                             offset += 4;
                             byte[] strBytes = new byte[strLength];
                             Array.Copy(nvlist, offset, strBytes, 0, strLength);
-                            item.value =  StringHandlers.CToString(strBytes);
-                            offset     += (int)strLength;
+                            stringArray[i] =  StringHandlers.CToString(strBytes);
+                            offset         += (int)strLength;
 
                             if(strLength % 4 > 0)
                                 offset += 4 - (int)(strLength % 4);
                         }
 
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_UINT16:
-                    case NVS_DataTypes.DATA_TYPE_UINT16_ARRAY:
-                        if(item.elements > 1)
-                        {
-                            ushort[] ushortArray = new ushort[item.elements];
+                        item.value = stringArray;
+                    }
+                    else
+                    {
+                        uint strLength = BigEndianBitConverter.ToUInt32(nvlist, offset);
+                        offset += 4;
+                        byte[] strBytes = new byte[strLength];
+                        Array.Copy(nvlist, offset, strBytes, 0, strLength);
+                        item.value =  StringHandlers.CToString(strBytes);
+                        offset     += (int)strLength;
 
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                ushort temp = BigEndianBitConverter.ToUInt16(nvlist, offset);
-                                ushortArray[i] =  temp;
-                                offset         += 4;
-                            }
+                        if(strLength % 4 > 0)
+                            offset += 4 - (int)(strLength % 4);
+                    }
 
-                            item.value = ushortArray;
-                        }
-                        else
+                    break;
+                case NVS_DataTypes.DATA_TYPE_UINT16:
+                case NVS_DataTypes.DATA_TYPE_UINT16_ARRAY:
+                    if(item.elements > 1)
+                    {
+                        ushort[] ushortArray = new ushort[item.elements];
+
+                        for(int i = 0; i < item.elements; i++)
                         {
-                            item.value =  BigEndianBitConverter.ToUInt16(nvlist, offset);
-                            offset     += 4;
+                            ushort temp = BigEndianBitConverter.ToUInt16(nvlist, offset);
+                            ushortArray[i] =  temp;
+                            offset         += 4;
                         }
 
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_UINT32:
-                    case NVS_DataTypes.DATA_TYPE_UINT32_ARRAY:
-                        if(item.elements > 1)
-                        {
-                            uint[] uintArray = new uint[item.elements];
+                        item.value = ushortArray;
+                    }
+                    else
+                    {
+                        item.value =  BigEndianBitConverter.ToUInt16(nvlist, offset);
+                        offset     += 4;
+                    }
 
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                uint temp = BigEndianBitConverter.ToUInt32(nvlist, offset);
-                                uintArray[i] =  temp;
-                                offset       += 4;
-                            }
+                    break;
+                case NVS_DataTypes.DATA_TYPE_UINT32:
+                case NVS_DataTypes.DATA_TYPE_UINT32_ARRAY:
+                    if(item.elements > 1)
+                    {
+                        uint[] uintArray = new uint[item.elements];
 
-                            item.value = uintArray;
-                        }
-                        else
+                        for(int i = 0; i < item.elements; i++)
                         {
-                            item.value =  BigEndianBitConverter.ToUInt32(nvlist, offset);
-                            offset     += 4;
+                            uint temp = BigEndianBitConverter.ToUInt32(nvlist, offset);
+                            uintArray[i] =  temp;
+                            offset       += 4;
                         }
 
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_UINT64:
-                    case NVS_DataTypes.DATA_TYPE_UINT64_ARRAY:
-                        if(item.elements > 1)
-                        {
-                            ulong[] ulongArray = new ulong[item.elements];
+                        item.value = uintArray;
+                    }
+                    else
+                    {
+                        item.value =  BigEndianBitConverter.ToUInt32(nvlist, offset);
+                        offset     += 4;
+                    }
 
-                            for(int i = 0; i < item.elements; i++)
-                            {
-                                ulong temp = BigEndianBitConverter.ToUInt64(nvlist, offset);
-                                ulongArray[i] =  temp;
-                                offset        += 8;
-                            }
+                    break;
+                case NVS_DataTypes.DATA_TYPE_UINT64:
+                case NVS_DataTypes.DATA_TYPE_UINT64_ARRAY:
+                    if(item.elements > 1)
+                    {
+                        ulong[] ulongArray = new ulong[item.elements];
 
-                            item.value = ulongArray;
-                        }
-                        else
+                        for(int i = 0; i < item.elements; i++)
                         {
-                            item.value =  BigEndianBitConverter.ToUInt64(nvlist, offset);
-                            offset     += 8;
+                            ulong temp = BigEndianBitConverter.ToUInt64(nvlist, offset);
+                            ulongArray[i] =  temp;
+                            offset        += 8;
                         }
 
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_NVLIST:
-                        if(item.elements > 1)
-                            goto default;
+                        item.value = ulongArray;
+                    }
+                    else
+                    {
+                        item.value =  BigEndianBitConverter.ToUInt64(nvlist, offset);
+                        offset     += 8;
+                    }
 
-                        byte[] subListBytes = new byte[item.encodedSize - (offset - currOff)];
-                        Array.Copy(nvlist, offset, subListBytes, 0, subListBytes.Length);
+                    break;
+                case NVS_DataTypes.DATA_TYPE_NVLIST:
+                    if(item.elements > 1)
+                        goto default;
 
-                        if(DecodeNvList(subListBytes, out Dictionary<string, NVS_Item> subList, true, littleEndian))
-                            item.value = subList;
-                        else
-                            goto default;
+                    byte[] subListBytes = new byte[item.encodedSize - (offset - currOff)];
+                    Array.Copy(nvlist, offset, subListBytes, 0, subListBytes.Length);
 
-                        offset = (int)(currOff + item.encodedSize);
+                    if(DecodeNvList(subListBytes, out Dictionary<string, NVS_Item> subList, true, littleEndian))
+                        item.value = subList;
+                    else
+                        goto default;
 
-                        break;
-                    default:
-                        byte[] unknown = new byte[item.encodedSize - (offset - currOff)];
-                        Array.Copy(nvlist, offset, unknown, 0, unknown.Length);
-                        item.value = unknown;
-                        offset     = (int)(currOff + item.encodedSize);
+                    offset = (int)(currOff + item.encodedSize);
 
-                        break;
-                }
+                    break;
+                default:
+                    byte[] unknown = new byte[item.encodedSize - (offset - currOff)];
+                    Array.Copy(nvlist, offset, unknown, 0, unknown.Length);
+                    item.value = unknown;
+                    offset     = (int)(currOff + item.encodedSize);
 
-                decodedNvList.Add(item.name, item);
+                    break;
             }
 
-            return decodedNvList.Count > 0;
+            decodedNvList.Add(item.name, item);
         }
 
-        static string PrintNvList(Dictionary<string, NVS_Item> decodedNvList)
-        {
-            var sb = new StringBuilder();
+        return decodedNvList.Count > 0;
+    }
 
-            foreach(NVS_Item item in decodedNvList.Values)
+    static string PrintNvList(Dictionary<string, NVS_Item> decodedNvList)
+    {
+        var sb = new StringBuilder();
+
+        foreach(NVS_Item item in decodedNvList.Values)
+        {
+            if(item.elements == 0)
             {
-                if(item.elements == 0)
-                {
-                    sb.AppendFormat("{0} is not set", item.name).AppendLine();
+                sb.AppendFormat("{0} is not set", item.name).AppendLine();
 
-                    continue;
-                }
-
-                switch(item.dataType)
-                {
-                    case NVS_DataTypes.DATA_TYPE_BOOLEAN:
-                    case NVS_DataTypes.DATA_TYPE_BOOLEAN_ARRAY:
-                    case NVS_DataTypes.DATA_TYPE_BOOLEAN_VALUE:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((bool[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (bool)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_BYTE:
-                    case NVS_DataTypes.DATA_TYPE_BYTE_ARRAY:
-                    case NVS_DataTypes.DATA_TYPE_UINT8:
-                    case NVS_DataTypes.DATA_TYPE_UINT8_ARRAY:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((byte[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (byte)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_DOUBLE:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((double[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (double)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_HRTIME:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((DateTime[])item.value)[i]).
-                                   AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (DateTime)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_INT16:
-                    case NVS_DataTypes.DATA_TYPE_INT16_ARRAY:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((short[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (short)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_INT32:
-                    case NVS_DataTypes.DATA_TYPE_INT32_ARRAY:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((int[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (int)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_INT64:
-                    case NVS_DataTypes.DATA_TYPE_INT64_ARRAY:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((long[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (long)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_INT8:
-                    case NVS_DataTypes.DATA_TYPE_INT8_ARRAY:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((sbyte[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (sbyte)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_STRING:
-                    case NVS_DataTypes.DATA_TYPE_STRING_ARRAY:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((string[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (string)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_UINT16:
-                    case NVS_DataTypes.DATA_TYPE_UINT16_ARRAY:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((ushort[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (ushort)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_UINT32:
-                    case NVS_DataTypes.DATA_TYPE_UINT32_ARRAY:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((uint[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (uint)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_UINT64:
-                    case NVS_DataTypes.DATA_TYPE_UINT64_ARRAY:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((ulong[])item.value)[i]).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1}", item.name, (ulong)item.value).AppendLine();
-
-                        break;
-                    case NVS_DataTypes.DATA_TYPE_NVLIST:
-                        if(item.elements == 1)
-                            sb.AppendFormat("{0} =\n{1}", item.name,
-                                            PrintNvList((Dictionary<string, NVS_Item>)item.value)).AppendLine();
-                        else
-                            sb.AppendFormat("{0} = {1} elements nvlist[], unable to print", item.name, item.elements).
-                               AppendLine();
-
-                        break;
-                    default:
-                        if(item.elements > 1)
-                            for(int i = 0; i < item.elements; i++)
-                                sb.AppendFormat("{0}[{1}] = Unknown data type {2}", item.name, i, item.dataType).
-                                   AppendLine();
-                        else
-                            sb.AppendFormat("{0} = Unknown data type {1}", item.name, item.dataType).AppendLine();
-
-                        break;
-                }
+                continue;
             }
 
-            return sb.ToString();
+            switch(item.dataType)
+            {
+                case NVS_DataTypes.DATA_TYPE_BOOLEAN:
+                case NVS_DataTypes.DATA_TYPE_BOOLEAN_ARRAY:
+                case NVS_DataTypes.DATA_TYPE_BOOLEAN_VALUE:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((bool[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (bool)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_BYTE:
+                case NVS_DataTypes.DATA_TYPE_BYTE_ARRAY:
+                case NVS_DataTypes.DATA_TYPE_UINT8:
+                case NVS_DataTypes.DATA_TYPE_UINT8_ARRAY:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((byte[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (byte)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_DOUBLE:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((double[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (double)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_HRTIME:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((DateTime[])item.value)[i]).
+                               AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (DateTime)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_INT16:
+                case NVS_DataTypes.DATA_TYPE_INT16_ARRAY:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((short[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (short)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_INT32:
+                case NVS_DataTypes.DATA_TYPE_INT32_ARRAY:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((int[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (int)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_INT64:
+                case NVS_DataTypes.DATA_TYPE_INT64_ARRAY:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((long[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (long)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_INT8:
+                case NVS_DataTypes.DATA_TYPE_INT8_ARRAY:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((sbyte[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (sbyte)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_STRING:
+                case NVS_DataTypes.DATA_TYPE_STRING_ARRAY:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((string[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (string)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_UINT16:
+                case NVS_DataTypes.DATA_TYPE_UINT16_ARRAY:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((ushort[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (ushort)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_UINT32:
+                case NVS_DataTypes.DATA_TYPE_UINT32_ARRAY:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((uint[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (uint)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_UINT64:
+                case NVS_DataTypes.DATA_TYPE_UINT64_ARRAY:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = {2}", item.name, i, ((ulong[])item.value)[i]).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1}", item.name, (ulong)item.value).AppendLine();
+
+                    break;
+                case NVS_DataTypes.DATA_TYPE_NVLIST:
+                    if(item.elements == 1)
+                        sb.AppendFormat("{0} =\n{1}", item.name,
+                                        PrintNvList((Dictionary<string, NVS_Item>)item.value)).AppendLine();
+                    else
+                        sb.AppendFormat("{0} = {1} elements nvlist[], unable to print", item.name, item.elements).
+                           AppendLine();
+
+                    break;
+                default:
+                    if(item.elements > 1)
+                        for(int i = 0; i < item.elements; i++)
+                            sb.AppendFormat("{0}[{1}] = Unknown data type {2}", item.name, i, item.dataType).
+                               AppendLine();
+                    else
+                        sb.AppendFormat("{0} = Unknown data type {1}", item.name, item.dataType).AppendLine();
+
+                    break;
+            }
         }
 
-        struct ZIO_Checksum
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public ulong[] word;
-        }
+        return sb.ToString();
+    }
 
-        /// <summary>
-        ///     There is an empty ZIO at sector 16 or sector 31, with magic and checksum, to detect it is really ZFS I
-        ///     suppose.
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct ZIO_Empty
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 472)]
-            public readonly byte[] empty;
-            public readonly ulong        magic;
-            public readonly ZIO_Checksum checksum;
-        }
+    struct ZIO_Checksum
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public ulong[] word;
+    }
 
-        /// <summary>This structure indicates which encoding method and endianness is used to encode the nvlist</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct NVS_Method
-        {
-            public readonly byte encoding;
-            public readonly byte endian;
-            public readonly byte reserved1;
-            public readonly byte reserved2;
-        }
+    /// <summary>
+    ///     There is an empty ZIO at sector 16 or sector 31, with magic and checksum, to detect it is really ZFS I
+    ///     suppose.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ZIO_Empty
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 472)]
+        public readonly byte[] empty;
+        public readonly ulong        magic;
+        public readonly ZIO_Checksum checksum;
+    }
 
-        /// <summary>This structure gives information about the encoded nvlist</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct NVS_XDR_Header
-        {
-            public readonly NVS_Method encodingAndEndian;
-            public readonly uint       version;
-            public readonly uint       flags;
-        }
+    /// <summary>This structure indicates which encoding method and endianness is used to encode the nvlist</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct NVS_Method
+    {
+        public readonly byte encoding;
+        public readonly byte endian;
+        public readonly byte reserved1;
+        public readonly byte reserved2;
+    }
 
-        enum NVS_DataTypes : uint
-        {
-            DATA_TYPE_UNKNOWN = 0, DATA_TYPE_BOOLEAN, DATA_TYPE_BYTE,
-            DATA_TYPE_INT16, DATA_TYPE_UINT16, DATA_TYPE_INT32,
-            DATA_TYPE_UINT32, DATA_TYPE_INT64, DATA_TYPE_UINT64,
-            DATA_TYPE_STRING, DATA_TYPE_BYTE_ARRAY, DATA_TYPE_INT16_ARRAY,
-            DATA_TYPE_UINT16_ARRAY, DATA_TYPE_INT32_ARRAY, DATA_TYPE_UINT32_ARRAY,
-            DATA_TYPE_INT64_ARRAY, DATA_TYPE_UINT64_ARRAY, DATA_TYPE_STRING_ARRAY,
-            DATA_TYPE_HRTIME, DATA_TYPE_NVLIST, DATA_TYPE_NVLIST_ARRAY,
-            DATA_TYPE_BOOLEAN_VALUE, DATA_TYPE_INT8, DATA_TYPE_UINT8,
-            DATA_TYPE_BOOLEAN_ARRAY, DATA_TYPE_INT8_ARRAY, DATA_TYPE_UINT8_ARRAY,
-            DATA_TYPE_DOUBLE
-        }
+    /// <summary>This structure gives information about the encoded nvlist</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct NVS_XDR_Header
+    {
+        public readonly NVS_Method encodingAndEndian;
+        public readonly uint       version;
+        public readonly uint       flags;
+    }
 
-        /// <summary>This represent an encoded nvpair (an item of an nvlist)</summary>
-        struct NVS_Item
-        {
-            /// <summary>Size in bytes when encoded in XDR</summary>
-            public uint encodedSize;
-            /// <summary>Size in bytes when decoded</summary>
-            public uint decodedSize;
-            /// <summary>On disk, it is null-padded for alignment to 4 bytes and prepended by a 4 byte length indicator</summary>
-            public string name;
-            /// <summary>Data type</summary>
-            public NVS_DataTypes dataType;
-            /// <summary>How many elements are here</summary>
-            public uint elements;
-            /// <summary>On disk size is relative to <see cref="dataType" /> and <see cref="elements" /> always aligned to 4 bytes</summary>
-            public object value;
-        }
+    enum NVS_DataTypes : uint
+    {
+        DATA_TYPE_UNKNOWN = 0, DATA_TYPE_BOOLEAN, DATA_TYPE_BYTE,
+        DATA_TYPE_INT16, DATA_TYPE_UINT16, DATA_TYPE_INT32,
+        DATA_TYPE_UINT32, DATA_TYPE_INT64, DATA_TYPE_UINT64,
+        DATA_TYPE_STRING, DATA_TYPE_BYTE_ARRAY, DATA_TYPE_INT16_ARRAY,
+        DATA_TYPE_UINT16_ARRAY, DATA_TYPE_INT32_ARRAY, DATA_TYPE_UINT32_ARRAY,
+        DATA_TYPE_INT64_ARRAY, DATA_TYPE_UINT64_ARRAY, DATA_TYPE_STRING_ARRAY,
+        DATA_TYPE_HRTIME, DATA_TYPE_NVLIST, DATA_TYPE_NVLIST_ARRAY,
+        DATA_TYPE_BOOLEAN_VALUE, DATA_TYPE_INT8, DATA_TYPE_UINT8,
+        DATA_TYPE_BOOLEAN_ARRAY, DATA_TYPE_INT8_ARRAY, DATA_TYPE_UINT8_ARRAY,
+        DATA_TYPE_DOUBLE
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct DVA
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly ulong[] word;
-        }
+    /// <summary>This represent an encoded nvpair (an item of an nvlist)</summary>
+    struct NVS_Item
+    {
+        /// <summary>Size in bytes when encoded in XDR</summary>
+        public uint encodedSize;
+        /// <summary>Size in bytes when decoded</summary>
+        public uint decodedSize;
+        /// <summary>On disk, it is null-padded for alignment to 4 bytes and prepended by a 4 byte length indicator</summary>
+        public string name;
+        /// <summary>Data type</summary>
+        public NVS_DataTypes dataType;
+        /// <summary>How many elements are here</summary>
+        public uint elements;
+        /// <summary>On disk size is relative to <see cref="dataType" /> and <see cref="elements" /> always aligned to 4 bytes</summary>
+        public object value;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct SPA_BlockPointer
-        {
-            /// <summary>Data virtual address</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly DVA[] dataVirtualAddress;
-            /// <summary>Block properties</summary>
-            public readonly ulong properties;
-            /// <summary>Reserved for future expansion</summary>
-            public readonly ulong[] padding;
-            /// <summary>TXG when block was allocated</summary>
-            public readonly ulong birthTxg;
-            /// <summary>Transaction group at birth</summary>
-            public readonly ulong birth;
-            /// <summary>Fill count</summary>
-            public readonly ulong fill;
-            public readonly ZIO_Checksum checksum;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct DVA
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly ulong[] word;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct ZFS_Uberblock
-        {
-            public readonly ulong            magic;
-            public readonly ulong            spaVersion;
-            public readonly ulong            lastTxg;
-            public readonly ulong            guidSum;
-            public readonly ulong            timestamp;
-            public readonly SPA_BlockPointer mosPtr;
-            public readonly ulong            softwareVersion;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct SPA_BlockPointer
+    {
+        /// <summary>Data virtual address</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly DVA[] dataVirtualAddress;
+        /// <summary>Block properties</summary>
+        public readonly ulong properties;
+        /// <summary>Reserved for future expansion</summary>
+        public readonly ulong[] padding;
+        /// <summary>TXG when block was allocated</summary>
+        public readonly ulong birthTxg;
+        /// <summary>Transaction group at birth</summary>
+        public readonly ulong birth;
+        /// <summary>Fill count</summary>
+        public readonly ulong fill;
+        public readonly ZIO_Checksum checksum;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ZFS_Uberblock
+    {
+        public readonly ulong            magic;
+        public readonly ulong            spaVersion;
+        public readonly ulong            lastTxg;
+        public readonly ulong            guidSum;
+        public readonly ulong            timestamp;
+        public readonly SPA_BlockPointer mosPtr;
+        public readonly ulong            softwareVersion;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/dump.cs b/Aaru.Filesystems/dump.cs
index c5e832c5e..cfd4543de 100644
--- a/Aaru.Filesystems/dump.cs
+++ b/Aaru.Filesystems/dump.cs
@@ -43,394 +43,393 @@ using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 using ufs_daddr_t = System.Int32;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+/// <inheritdoc />
+/// <summary>Implements identification of a dump(8) image (virtual filesystem on a file)</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class dump : IFilesystem
 {
+    /// <summary>Magic number for old dump</summary>
+    const ushort OFS_MAGIC = 60011;
+    /// <summary>Magic number for new dump</summary>
+    const uint NFS_MAGIC = 60012;
+    /// <summary>Magic number for AIX dump</summary>
+    const uint XIX_MAGIC = 60013;
+    /// <summary>Magic number for UFS2 dump</summary>
+    const uint UFS2_MAGIC = 0x19540119;
+    /// <summary>Magic number for old dump</summary>
+    const uint OFS_CIGAM = 0x6BEA0000;
+    /// <summary>Magic number for new dump</summary>
+    const uint NFS_CIGAM = 0x6CEA0000;
+    /// <summary>Magic number for AIX dump</summary>
+    const uint XIX_CIGAM = 0x6DEA0000;
+    /// <summary>Magic number for UFS2 dump</summary>
+    const uint UFS2_CIGAM = 0x19015419;
+
+    const int TP_BSIZE = 1024;
+
+    /// <summary>Dump tape header</summary>
+    const short TS_TAPE = 1;
+    /// <summary>Beginning of file record</summary>
+    const short TS_INODE = 2;
+    /// <summary>Map of inodes on tape</summary>
+    const short TS_BITS = 3;
+    /// <summary>Continuation of file record</summary>
+    const short TS_ADDR = 4;
+    /// <summary>Map of inodes deleted since last dump</summary>
+    const short TS_END = 5;
+    /// <summary>Inode bitmap</summary>
+    const short TS_CLRI = 6;
+    const short TS_ACL = 7;
+    const short TS_PCL = 8;
+
+    const int TP_NINDIR = TP_BSIZE / 2;
+    const int LBLSIZE   = 16;
+    const int NAMELEN   = 64;
+
+    const int NDADDR = 12;
+    const int NIADDR = 3;
+
     /// <inheritdoc />
-    /// <summary>Implements identification of a dump(8) image (virtual filesystem on a file)</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming"), SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class dump : IFilesystem
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "dump(8) Plugin";
+    /// <inheritdoc />
+    public Guid Id => new("E53B4D28-C858-4800-B092-DDAE80D361B9");
+    /// <inheritdoc />
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        /// <summary>Magic number for old dump</summary>
-        const ushort OFS_MAGIC = 60011;
-        /// <summary>Magic number for new dump</summary>
-        const uint NFS_MAGIC = 60012;
-        /// <summary>Magic number for AIX dump</summary>
-        const uint XIX_MAGIC = 60013;
-        /// <summary>Magic number for UFS2 dump</summary>
-        const uint UFS2_MAGIC = 0x19540119;
-        /// <summary>Magic number for old dump</summary>
-        const uint OFS_CIGAM = 0x6BEA0000;
-        /// <summary>Magic number for new dump</summary>
-        const uint NFS_CIGAM = 0x6CEA0000;
-        /// <summary>Magic number for AIX dump</summary>
-        const uint XIX_CIGAM = 0x6DEA0000;
-        /// <summary>Magic number for UFS2 dump</summary>
-        const uint UFS2_CIGAM = 0x19015419;
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
 
-        const int TP_BSIZE = 1024;
+        // It should be start of a tape or floppy or file
+        if(partition.Start != 0)
+            return false;
 
-        /// <summary>Dump tape header</summary>
-        const short TS_TAPE = 1;
-        /// <summary>Beginning of file record</summary>
-        const short TS_INODE = 2;
-        /// <summary>Map of inodes on tape</summary>
-        const short TS_BITS = 3;
-        /// <summary>Continuation of file record</summary>
-        const short TS_ADDR = 4;
-        /// <summary>Map of inodes deleted since last dump</summary>
-        const short TS_END = 5;
-        /// <summary>Inode bitmap</summary>
-        const short TS_CLRI = 6;
-        const short TS_ACL = 7;
-        const short TS_PCL = 8;
+        uint sbSize = (uint)(Marshal.SizeOf<s_spcl>() / imagePlugin.Info.SectorSize);
 
-        const int TP_NINDIR = TP_BSIZE / 2;
-        const int LBLSIZE   = 16;
-        const int NAMELEN   = 64;
+        if(Marshal.SizeOf<s_spcl>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
 
-        const int NDADDR = 12;
-        const int NIADDR = 3;
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
 
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "dump(8) Plugin";
-        /// <inheritdoc />
-        public Guid Id => new("E53B4D28-C858-4800-B092-DDAE80D361B9");
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(errno != ErrorNumber.NoError)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        if(sector.Length < Marshal.SizeOf<s_spcl>())
+            return false;
+
+        spcl16   oldHdr = Marshal.ByteArrayToStructureLittleEndian<spcl16>(sector);
+        spcl_aix aixHdr = Marshal.ByteArrayToStructureLittleEndian<spcl_aix>(sector);
+        s_spcl   newHdr = Marshal.ByteArrayToStructureLittleEndian<s_spcl>(sector);
+
+        AaruConsole.DebugWriteLine("dump(8) plugin", "old magic = 0x{0:X8}", oldHdr.c_magic);
+        AaruConsole.DebugWriteLine("dump(8) plugin", "aix magic = 0x{0:X8}", aixHdr.c_magic);
+        AaruConsole.DebugWriteLine("dump(8) plugin", "new magic = 0x{0:X8}", newHdr.c_magic);
+
+        return oldHdr.c_magic == OFS_MAGIC || aixHdr.c_magic == XIX_MAGIC  || aixHdr.c_magic == XIX_CIGAM ||
+               newHdr.c_magic == OFS_MAGIC || newHdr.c_magic == NFS_MAGIC  || newHdr.c_magic == OFS_CIGAM ||
+               newHdr.c_magic == NFS_CIGAM || newHdr.c_magic == UFS2_MAGIC || newHdr.c_magic == UFS2_CIGAM;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        if(partition.Start != 0)
+            return;
+
+        uint sbSize = (uint)(Marshal.SizeOf<s_spcl>() / imagePlugin.Info.SectorSize);
+
+        if(Marshal.SizeOf<s_spcl>() % imagePlugin.Info.SectorSize != 0)
+            sbSize++;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        if(sector.Length < Marshal.SizeOf<s_spcl>())
+            return;
+
+        spcl16   oldHdr = Marshal.ByteArrayToStructureLittleEndian<spcl16>(sector);
+        spcl_aix aixHdr = Marshal.ByteArrayToStructureLittleEndian<spcl_aix>(sector);
+        s_spcl   newHdr = Marshal.ByteArrayToStructureLittleEndian<s_spcl>(sector);
+
+        bool useOld = false;
+        bool useAix = false;
+
+        if(newHdr.c_magic == OFS_MAGIC  ||
+           newHdr.c_magic == NFS_MAGIC  ||
+           newHdr.c_magic == OFS_CIGAM  ||
+           newHdr.c_magic == NFS_CIGAM  ||
+           newHdr.c_magic == UFS2_MAGIC ||
+           newHdr.c_magic == UFS2_CIGAM)
         {
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
-
-            // It should be start of a tape or floppy or file
-            if(partition.Start != 0)
-                return false;
-
-            uint sbSize = (uint)(Marshal.SizeOf<s_spcl>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<s_spcl>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(sector.Length < Marshal.SizeOf<s_spcl>())
-                return false;
-
-            spcl16   oldHdr = Marshal.ByteArrayToStructureLittleEndian<spcl16>(sector);
-            spcl_aix aixHdr = Marshal.ByteArrayToStructureLittleEndian<spcl_aix>(sector);
-            s_spcl   newHdr = Marshal.ByteArrayToStructureLittleEndian<s_spcl>(sector);
-
-            AaruConsole.DebugWriteLine("dump(8) plugin", "old magic = 0x{0:X8}", oldHdr.c_magic);
-            AaruConsole.DebugWriteLine("dump(8) plugin", "aix magic = 0x{0:X8}", aixHdr.c_magic);
-            AaruConsole.DebugWriteLine("dump(8) plugin", "new magic = 0x{0:X8}", newHdr.c_magic);
-
-            return oldHdr.c_magic == OFS_MAGIC || aixHdr.c_magic == XIX_MAGIC  || aixHdr.c_magic == XIX_CIGAM ||
-                   newHdr.c_magic == OFS_MAGIC || newHdr.c_magic == NFS_MAGIC  || newHdr.c_magic == OFS_CIGAM ||
-                   newHdr.c_magic == NFS_CIGAM || newHdr.c_magic == UFS2_MAGIC || newHdr.c_magic == UFS2_CIGAM;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-
-            if(imagePlugin.Info.SectorSize < 512)
-                return;
-
-            if(partition.Start != 0)
-                return;
-
-            uint sbSize = (uint)(Marshal.SizeOf<s_spcl>() / imagePlugin.Info.SectorSize);
-
-            if(Marshal.SizeOf<s_spcl>() % imagePlugin.Info.SectorSize != 0)
-                sbSize++;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(partition.Start, sbSize, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            if(sector.Length < Marshal.SizeOf<s_spcl>())
-                return;
-
-            spcl16   oldHdr = Marshal.ByteArrayToStructureLittleEndian<spcl16>(sector);
-            spcl_aix aixHdr = Marshal.ByteArrayToStructureLittleEndian<spcl_aix>(sector);
-            s_spcl   newHdr = Marshal.ByteArrayToStructureLittleEndian<s_spcl>(sector);
-
-            bool useOld = false;
-            bool useAix = false;
-
-            if(newHdr.c_magic == OFS_MAGIC  ||
-               newHdr.c_magic == NFS_MAGIC  ||
-               newHdr.c_magic == OFS_CIGAM  ||
-               newHdr.c_magic == NFS_CIGAM  ||
-               newHdr.c_magic == UFS2_MAGIC ||
+            if(newHdr.c_magic == OFS_CIGAM ||
+               newHdr.c_magic == NFS_CIGAM ||
                newHdr.c_magic == UFS2_CIGAM)
-            {
-                if(newHdr.c_magic == OFS_CIGAM ||
-                   newHdr.c_magic == NFS_CIGAM ||
-                   newHdr.c_magic == UFS2_CIGAM)
-                    newHdr = Marshal.ByteArrayToStructureBigEndian<s_spcl>(sector);
-            }
-            else if(aixHdr.c_magic == XIX_MAGIC ||
-                    aixHdr.c_magic == XIX_CIGAM)
-            {
-                useAix = true;
-
-                if(aixHdr.c_magic == XIX_CIGAM)
-                    aixHdr = Marshal.ByteArrayToStructureBigEndian<spcl_aix>(sector);
-            }
-            else if(oldHdr.c_magic == OFS_MAGIC)
-            {
-                useOld = true;
-
-                // Swap PDP-11 endian
-                oldHdr.c_date  = (int)Swapping.PDPFromLittleEndian((uint)oldHdr.c_date);
-                oldHdr.c_ddate = (int)Swapping.PDPFromLittleEndian((uint)oldHdr.c_ddate);
-            }
-            else
-            {
-                information = "Could not read dump(8) header block";
-
-                return;
-            }
-
-            var sb = new StringBuilder();
-
-            XmlFsType = new FileSystemType
-            {
-                ClusterSize = 1024,
-                Clusters    = partition.Size / 1024
-            };
-
-            if(useOld)
-            {
-                XmlFsType.Type = "Old 16-bit dump(8)";
-                sb.AppendLine(XmlFsType.Type);
-
-                if(oldHdr.c_date > 0)
-                {
-                    XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(oldHdr.c_date);
-                    XmlFsType.CreationDateSpecified = true;
-                    sb.AppendFormat("Dump created on {0}", XmlFsType.CreationDate).AppendLine();
-                }
-
-                if(oldHdr.c_ddate > 0)
-                {
-                    XmlFsType.BackupDate          = DateHandlers.UnixToDateTime(oldHdr.c_ddate);
-                    XmlFsType.BackupDateSpecified = true;
-                    sb.AppendFormat("Previous dump created on {0}", XmlFsType.BackupDate).AppendLine();
-                }
-
-                sb.AppendFormat("Dump volume number: {0}", oldHdr.c_volume).AppendLine();
-            }
-            else if(useAix)
-            {
-                XmlFsType.Type = "AIX dump(8)";
-                sb.AppendLine(XmlFsType.Type);
-
-                if(aixHdr.c_date > 0)
-                {
-                    XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(aixHdr.c_date);
-                    XmlFsType.CreationDateSpecified = true;
-                    sb.AppendFormat("Dump created on {0}", XmlFsType.CreationDate).AppendLine();
-                }
-
-                if(aixHdr.c_ddate > 0)
-                {
-                    XmlFsType.BackupDate          = DateHandlers.UnixToDateTime(aixHdr.c_ddate);
-                    XmlFsType.BackupDateSpecified = true;
-                    sb.AppendFormat("Previous dump created on {0}", XmlFsType.BackupDate).AppendLine();
-                }
-
-                sb.AppendFormat("Dump volume number: {0}", aixHdr.c_volume).AppendLine();
-            }
-            else
-            {
-                XmlFsType.Type = "dump(8)";
-                sb.AppendLine(XmlFsType.Type);
-
-                if(newHdr.c_ndate > 0)
-                {
-                    XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(newHdr.c_ndate);
-                    XmlFsType.CreationDateSpecified = true;
-                    sb.AppendFormat("Dump created on {0}", XmlFsType.CreationDate).AppendLine();
-                }
-                else if(newHdr.c_date > 0)
-                {
-                    XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(newHdr.c_date);
-                    XmlFsType.CreationDateSpecified = true;
-                    sb.AppendFormat("Dump created on {0}", XmlFsType.CreationDate).AppendLine();
-                }
-
-                if(newHdr.c_nddate > 0)
-                {
-                    XmlFsType.BackupDate          = DateHandlers.UnixToDateTime(newHdr.c_nddate);
-                    XmlFsType.BackupDateSpecified = true;
-                    sb.AppendFormat("Previous dump created on {0}", XmlFsType.BackupDate).AppendLine();
-                }
-                else if(newHdr.c_ddate > 0)
-                {
-                    XmlFsType.BackupDate          = DateHandlers.UnixToDateTime(newHdr.c_ddate);
-                    XmlFsType.BackupDateSpecified = true;
-                    sb.AppendFormat("Previous dump created on {0}", XmlFsType.BackupDate).AppendLine();
-                }
-
-                sb.AppendFormat("Dump volume number: {0}", newHdr.c_volume).AppendLine();
-                sb.AppendFormat("Dump level: {0}", newHdr.c_level).AppendLine();
-                string dumpname = StringHandlers.CToString(newHdr.c_label);
-
-                if(!string.IsNullOrEmpty(dumpname))
-                {
-                    XmlFsType.VolumeName = dumpname;
-                    sb.AppendFormat("Dump label: {0}", dumpname).AppendLine();
-                }
-
-                string str = StringHandlers.CToString(newHdr.c_filesys);
-
-                if(!string.IsNullOrEmpty(str))
-                    sb.AppendFormat("Dumped filesystem name: {0}", str).AppendLine();
-
-                str = StringHandlers.CToString(newHdr.c_dev);
-
-                if(!string.IsNullOrEmpty(str))
-                    sb.AppendFormat("Dumped device: {0}", str).AppendLine();
-
-                str = StringHandlers.CToString(newHdr.c_host);
-
-                if(!string.IsNullOrEmpty(str))
-                    sb.AppendFormat("Dump hostname: {0}", str).AppendLine();
-            }
-
-            information = sb.ToString();
+                newHdr = Marshal.ByteArrayToStructureBigEndian<s_spcl>(sector);
         }
-
-        // Old 16-bit format record
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct spcl16
+        else if(aixHdr.c_magic == XIX_MAGIC ||
+                aixHdr.c_magic == XIX_CIGAM)
         {
-            /// <summary>Record type</summary>
-            public readonly short c_type;
-            /// <summary>Dump date</summary>
-            public int c_date;
-            /// <summary>Previous dump date</summary>
-            public int c_ddate;
-            /// <summary>Dump volume number</summary>
-            public readonly short c_volume;
-            /// <summary>Logical block of this record</summary>
-            public readonly int c_tapea;
-            /// <summary>Inode number</summary>
-            public readonly ushort c_inumber;
-            /// <summary>Magic number</summary>
-            public readonly ushort c_magic;
-            /// <summary>Record checksum</summary>
-            public readonly int c_checksum;
+            useAix = true;
 
-            // Unneeded for now
-            /*
-            struct dinode  c_dinode;
-            int c_count;
-            char c_addr[BSIZE];
-            */
+            if(aixHdr.c_magic == XIX_CIGAM)
+                aixHdr = Marshal.ByteArrayToStructureBigEndian<spcl_aix>(sector);
         }
-
-        // 32-bit AIX format record
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct spcl_aix
+        else if(oldHdr.c_magic == OFS_MAGIC)
         {
-            /// <summary>Record type</summary>
-            public readonly int c_type;
-            /// <summary>Dump date</summary>
-            public readonly int c_date;
-            /// <summary>Previous dump date</summary>
-            public readonly int c_ddate;
-            /// <summary>Dump volume number</summary>
-            public readonly int c_volume;
-            /// <summary>Logical block of this record</summary>
-            public readonly int c_tapea;
-            public readonly uint c_inumber;
-            public readonly uint c_magic;
-            public readonly int  c_checksum;
+            useOld = true;
 
-            // Unneeded for now
-            /*
-            public bsd_dinode  bsd_c_dinode;
-            public int c_count;
-            public char c_addr[TP_NINDIR];
-            public int xix_flag;
-            public dinode xix_dinode;
-            */
+            // Swap PDP-11 endian
+            oldHdr.c_date  = (int)Swapping.PDPFromLittleEndian((uint)oldHdr.c_date);
+            oldHdr.c_ddate = (int)Swapping.PDPFromLittleEndian((uint)oldHdr.c_ddate);
         }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct s_spcl
+        else
         {
-            public readonly int    c_type;     /* record type (see below) */
-            public readonly int    c_date;     /* date of this dump */
-            public readonly int    c_ddate;    /* date of previous dump */
-            public readonly int    c_volume;   /* dump volume number */
-            public readonly int    c_tapea;    /* logical block of this record */
-            public readonly uint   c_inumber;  /* number of inode */
-            public readonly int    c_magic;    /* magic number (see above) */
-            public readonly int    c_checksum; /* record checksum */
-            public readonly dinode c_dinode;   /* ownership and mode of inode */
-            public readonly int    c_count;    /* number of valid c_addr entries */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = TP_NINDIR)]
-            public readonly byte[] c_addr; /* 1 => data; 0 => hole in inode */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = LBLSIZE)]
-            public readonly byte[] c_label; /* dump label */
-            public readonly int c_level;    /* level of this dump */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NAMELEN)]
-            public readonly byte[] c_filesys; /* name of dumpped file system */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NAMELEN)]
-            public readonly byte[] c_dev; /* name of dumpped device */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NAMELEN)]
-            public readonly byte[] c_host;    /* name of dumpped host */
-            public readonly int  c_flags;     /* additional information */
-            public readonly int  c_firstrec;  /* first record on volume */
-            public readonly long c_ndate;     /* date of this dump */
-            public readonly long c_nddate;    /* date of previous dump */
-            public readonly long c_ntapea;    /* logical block of this record */
-            public readonly long c_nfirstrec; /* first record on volume */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly int[] c_spare; /* reserved for future uses */
+            information = "Could not read dump(8) header block";
+
+            return;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct dinode
+        var sb = new StringBuilder();
+
+        XmlFsType = new FileSystemType
         {
-            public readonly ushort di_mode;      /*   0: IFMT, permissions; see below. */
-            public readonly short  di_nlink;     /*   2: File link count. */
-            public readonly int    inumber;      /*   4: Lfs: inode number. */
-            public readonly ulong  di_size;      /*   8: File byte count. */
-            public readonly int    di_atime;     /*  16: Last access time. */
-            public readonly int    di_atimensec; /*  20: Last access time. */
-            public readonly int    di_mtime;     /*  24: Last modified time. */
-            public readonly int    di_mtimensec; /*  28: Last modified time. */
-            public readonly int    di_ctime;     /*  32: Last inode change time. */
-            public readonly int    di_ctimensec; /*  36: Last inode change time. */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDADDR)]
-            public readonly int[] di_db; /*  40: Direct disk blocks. */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NIADDR)]
-            public readonly int[] di_ib;    /*  88: Indirect disk blocks. */
-            public readonly uint di_flags;  /* 100: Status flags (chflags). */
-            public readonly uint di_blocks; /* 104: Blocks actually held. */
-            public readonly int  di_gen;    /* 108: Generation number. */
-            public readonly uint di_uid;    /* 112: File owner. */
-            public readonly uint di_gid;    /* 116: File group. */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly int[] di_spare; /* 120: Reserved; currently unused */
+            ClusterSize = 1024,
+            Clusters    = partition.Size / 1024
+        };
+
+        if(useOld)
+        {
+            XmlFsType.Type = "Old 16-bit dump(8)";
+            sb.AppendLine(XmlFsType.Type);
+
+            if(oldHdr.c_date > 0)
+            {
+                XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(oldHdr.c_date);
+                XmlFsType.CreationDateSpecified = true;
+                sb.AppendFormat("Dump created on {0}", XmlFsType.CreationDate).AppendLine();
+            }
+
+            if(oldHdr.c_ddate > 0)
+            {
+                XmlFsType.BackupDate          = DateHandlers.UnixToDateTime(oldHdr.c_ddate);
+                XmlFsType.BackupDateSpecified = true;
+                sb.AppendFormat("Previous dump created on {0}", XmlFsType.BackupDate).AppendLine();
+            }
+
+            sb.AppendFormat("Dump volume number: {0}", oldHdr.c_volume).AppendLine();
         }
+        else if(useAix)
+        {
+            XmlFsType.Type = "AIX dump(8)";
+            sb.AppendLine(XmlFsType.Type);
+
+            if(aixHdr.c_date > 0)
+            {
+                XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(aixHdr.c_date);
+                XmlFsType.CreationDateSpecified = true;
+                sb.AppendFormat("Dump created on {0}", XmlFsType.CreationDate).AppendLine();
+            }
+
+            if(aixHdr.c_ddate > 0)
+            {
+                XmlFsType.BackupDate          = DateHandlers.UnixToDateTime(aixHdr.c_ddate);
+                XmlFsType.BackupDateSpecified = true;
+                sb.AppendFormat("Previous dump created on {0}", XmlFsType.BackupDate).AppendLine();
+            }
+
+            sb.AppendFormat("Dump volume number: {0}", aixHdr.c_volume).AppendLine();
+        }
+        else
+        {
+            XmlFsType.Type = "dump(8)";
+            sb.AppendLine(XmlFsType.Type);
+
+            if(newHdr.c_ndate > 0)
+            {
+                XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(newHdr.c_ndate);
+                XmlFsType.CreationDateSpecified = true;
+                sb.AppendFormat("Dump created on {0}", XmlFsType.CreationDate).AppendLine();
+            }
+            else if(newHdr.c_date > 0)
+            {
+                XmlFsType.CreationDate          = DateHandlers.UnixToDateTime(newHdr.c_date);
+                XmlFsType.CreationDateSpecified = true;
+                sb.AppendFormat("Dump created on {0}", XmlFsType.CreationDate).AppendLine();
+            }
+
+            if(newHdr.c_nddate > 0)
+            {
+                XmlFsType.BackupDate          = DateHandlers.UnixToDateTime(newHdr.c_nddate);
+                XmlFsType.BackupDateSpecified = true;
+                sb.AppendFormat("Previous dump created on {0}", XmlFsType.BackupDate).AppendLine();
+            }
+            else if(newHdr.c_ddate > 0)
+            {
+                XmlFsType.BackupDate          = DateHandlers.UnixToDateTime(newHdr.c_ddate);
+                XmlFsType.BackupDateSpecified = true;
+                sb.AppendFormat("Previous dump created on {0}", XmlFsType.BackupDate).AppendLine();
+            }
+
+            sb.AppendFormat("Dump volume number: {0}", newHdr.c_volume).AppendLine();
+            sb.AppendFormat("Dump level: {0}", newHdr.c_level).AppendLine();
+            string dumpname = StringHandlers.CToString(newHdr.c_label);
+
+            if(!string.IsNullOrEmpty(dumpname))
+            {
+                XmlFsType.VolumeName = dumpname;
+                sb.AppendFormat("Dump label: {0}", dumpname).AppendLine();
+            }
+
+            string str = StringHandlers.CToString(newHdr.c_filesys);
+
+            if(!string.IsNullOrEmpty(str))
+                sb.AppendFormat("Dumped filesystem name: {0}", str).AppendLine();
+
+            str = StringHandlers.CToString(newHdr.c_dev);
+
+            if(!string.IsNullOrEmpty(str))
+                sb.AppendFormat("Dumped device: {0}", str).AppendLine();
+
+            str = StringHandlers.CToString(newHdr.c_host);
+
+            if(!string.IsNullOrEmpty(str))
+                sb.AppendFormat("Dump hostname: {0}", str).AppendLine();
+        }
+
+        information = sb.ToString();
+    }
+
+    // Old 16-bit format record
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct spcl16
+    {
+        /// <summary>Record type</summary>
+        public readonly short c_type;
+        /// <summary>Dump date</summary>
+        public int c_date;
+        /// <summary>Previous dump date</summary>
+        public int c_ddate;
+        /// <summary>Dump volume number</summary>
+        public readonly short c_volume;
+        /// <summary>Logical block of this record</summary>
+        public readonly int c_tapea;
+        /// <summary>Inode number</summary>
+        public readonly ushort c_inumber;
+        /// <summary>Magic number</summary>
+        public readonly ushort c_magic;
+        /// <summary>Record checksum</summary>
+        public readonly int c_checksum;
+
+        // Unneeded for now
+        /*
+        struct dinode  c_dinode;
+        int c_count;
+        char c_addr[BSIZE];
+        */
+    }
+
+    // 32-bit AIX format record
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct spcl_aix
+    {
+        /// <summary>Record type</summary>
+        public readonly int c_type;
+        /// <summary>Dump date</summary>
+        public readonly int c_date;
+        /// <summary>Previous dump date</summary>
+        public readonly int c_ddate;
+        /// <summary>Dump volume number</summary>
+        public readonly int c_volume;
+        /// <summary>Logical block of this record</summary>
+        public readonly int c_tapea;
+        public readonly uint c_inumber;
+        public readonly uint c_magic;
+        public readonly int  c_checksum;
+
+        // Unneeded for now
+        /*
+        public bsd_dinode  bsd_c_dinode;
+        public int c_count;
+        public char c_addr[TP_NINDIR];
+        public int xix_flag;
+        public dinode xix_dinode;
+        */
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct s_spcl
+    {
+        public readonly int    c_type;     /* record type (see below) */
+        public readonly int    c_date;     /* date of this dump */
+        public readonly int    c_ddate;    /* date of previous dump */
+        public readonly int    c_volume;   /* dump volume number */
+        public readonly int    c_tapea;    /* logical block of this record */
+        public readonly uint   c_inumber;  /* number of inode */
+        public readonly int    c_magic;    /* magic number (see above) */
+        public readonly int    c_checksum; /* record checksum */
+        public readonly dinode c_dinode;   /* ownership and mode of inode */
+        public readonly int    c_count;    /* number of valid c_addr entries */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = TP_NINDIR)]
+        public readonly byte[] c_addr; /* 1 => data; 0 => hole in inode */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = LBLSIZE)]
+        public readonly byte[] c_label; /* dump label */
+        public readonly int c_level;    /* level of this dump */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NAMELEN)]
+        public readonly byte[] c_filesys; /* name of dumpped file system */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NAMELEN)]
+        public readonly byte[] c_dev; /* name of dumpped device */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NAMELEN)]
+        public readonly byte[] c_host;    /* name of dumpped host */
+        public readonly int  c_flags;     /* additional information */
+        public readonly int  c_firstrec;  /* first record on volume */
+        public readonly long c_ndate;     /* date of this dump */
+        public readonly long c_nddate;    /* date of previous dump */
+        public readonly long c_ntapea;    /* logical block of this record */
+        public readonly long c_nfirstrec; /* first record on volume */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly int[] c_spare; /* reserved for future uses */
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct dinode
+    {
+        public readonly ushort di_mode;      /*   0: IFMT, permissions; see below. */
+        public readonly short  di_nlink;     /*   2: File link count. */
+        public readonly int    inumber;      /*   4: Lfs: inode number. */
+        public readonly ulong  di_size;      /*   8: File byte count. */
+        public readonly int    di_atime;     /*  16: Last access time. */
+        public readonly int    di_atimensec; /*  20: Last access time. */
+        public readonly int    di_mtime;     /*  24: Last modified time. */
+        public readonly int    di_mtimensec; /*  28: Last modified time. */
+        public readonly int    di_ctime;     /*  32: Last inode change time. */
+        public readonly int    di_ctimensec; /*  36: Last inode change time. */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDADDR)]
+        public readonly int[] di_db; /*  40: Direct disk blocks. */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NIADDR)]
+        public readonly int[] di_ib;    /*  88: Indirect disk blocks. */
+        public readonly uint di_flags;  /* 100: Status flags (chflags). */
+        public readonly uint di_blocks; /* 104: Blocks actually held. */
+        public readonly int  di_gen;    /* 108: Generation number. */
+        public readonly uint di_uid;    /* 112: File owner. */
+        public readonly uint di_gid;    /* 116: File group. */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly int[] di_spare; /* 120: Reserved; currently unused */
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/exFAT.cs b/Aaru.Filesystems/exFAT.cs
index 9f12fefd0..b45347b7e 100644
--- a/Aaru.Filesystems/exFAT.cs
+++ b/Aaru.Filesystems/exFAT.cs
@@ -41,216 +41,215 @@ using Aaru.CommonTypes.Interfaces;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from https://www.sans.org/reading-room/whitepapers/forensics/reverse-engineering-microsoft-exfat-file-system-33274
+/// <inheritdoc />
+/// <summary>Implements detection of the exFAT filesystem</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class exFAT : IFilesystem
 {
-    // Information from https://www.sans.org/reading-room/whitepapers/forensics/reverse-engineering-microsoft-exfat-file-system-33274
-    /// <inheritdoc />
-    /// <summary>Implements detection of the exFAT filesystem</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class exFAT : IFilesystem
+    readonly Guid _oemFlashParameterGuid = new("0A0C7E46-3399-4021-90C8-FA6D389C4BA2");
+
+    readonly byte[] _signature =
     {
-        readonly Guid _oemFlashParameterGuid = new("0A0C7E46-3399-4021-90C8-FA6D389C4BA2");
+        0x45, 0x58, 0x46, 0x41, 0x54, 0x20, 0x20, 0x20
+    };
 
-        readonly byte[] _signature =
+    /// <inheritdoc />
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Microsoft Extended File Allocation Table";
+    /// <inheritdoc />
+    public Guid Id => new("8271D088-1533-4CB3-AC28-D802B68BB95C");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
+    {
+        if(12 + partition.Start >= partition.End)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] vbrSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        if(vbrSector.Length < 512)
+            return false;
+
+        VolumeBootRecord vbr = Marshal.ByteArrayToStructureLittleEndian<VolumeBootRecord>(vbrSector);
+
+        return _signature.SequenceEqual(vbr.signature);
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        var sb = new StringBuilder();
+        XmlFsType = new FileSystemType();
+
+        ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] vbrSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        VolumeBootRecord vbr = Marshal.ByteArrayToStructureLittleEndian<VolumeBootRecord>(vbrSector);
+
+        errno = imagePlugin.ReadSector(9 + partition.Start, out byte[] parametersSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        OemParameterTable parametersTable =
+            Marshal.ByteArrayToStructureLittleEndian<OemParameterTable>(parametersSector);
+
+        errno = imagePlugin.ReadSector(11 + partition.Start, out byte[] chkSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        ChecksumSector chksector = Marshal.ByteArrayToStructureLittleEndian<ChecksumSector>(chkSector);
+
+        sb.AppendLine("Microsoft exFAT");
+        sb.AppendFormat("Partition offset: {0}", vbr.offset).AppendLine();
+
+        sb.AppendFormat("Volume has {0} sectors of {1} bytes each for a total of {2} bytes", vbr.sectors,
+                        1 << vbr.sectorShift, vbr.sectors * (ulong)(1 << vbr.sectorShift)).AppendLine();
+
+        sb.AppendFormat("Volume uses clusters of {0} sectors ({1} bytes) each", 1 << vbr.clusterShift,
+                        (1 << vbr.sectorShift) * (1 << vbr.clusterShift)).AppendLine();
+
+        sb.AppendFormat("First FAT starts at sector {0} and runs for {1} sectors", vbr.fatOffset, vbr.fatLength).
+           AppendLine();
+
+        sb.AppendFormat("Volume uses {0} FATs", vbr.fats).AppendLine();
+
+        sb.AppendFormat("Cluster heap starts at sector {0}, contains {1} clusters and is {2}% used",
+                        vbr.clusterHeapOffset, vbr.clusterHeapLength, vbr.heapUsage).AppendLine();
+
+        sb.AppendFormat("Root directory starts at cluster {0}", vbr.rootDirectoryCluster).AppendLine();
+
+        sb.AppendFormat("Filesystem revision is {0}.{1:D2}", (vbr.revision & 0xFF00) >> 8, vbr.revision & 0xFF).
+           AppendLine();
+
+        sb.AppendFormat("Volume serial number: {0:X8}", vbr.volumeSerial).AppendLine();
+        sb.AppendFormat("BIOS drive is {0:X2}h", vbr.drive).AppendLine();
+
+        if(vbr.flags.HasFlag(VolumeFlags.SecondFatActive))
+            sb.AppendLine("2nd FAT is in use");
+
+        if(vbr.flags.HasFlag(VolumeFlags.VolumeDirty))
+            sb.AppendLine("Volume is dirty");
+
+        if(vbr.flags.HasFlag(VolumeFlags.MediaFailure))
+            sb.AppendLine("Underlying media presented errors");
+
+        int count = 1;
+
+        foreach(OemParameter parameter in parametersTable.parameters)
         {
-            0x45, 0x58, 0x46, 0x41, 0x54, 0x20, 0x20, 0x20
-        };
-
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Microsoft Extended File Allocation Table";
-        /// <inheritdoc />
-        public Guid Id => new("8271D088-1533-4CB3-AC28-D802B68BB95C");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
-        {
-            if(12 + partition.Start >= partition.End)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] vbrSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            if(vbrSector.Length < 512)
-                return false;
-
-            VolumeBootRecord vbr = Marshal.ByteArrayToStructureLittleEndian<VolumeBootRecord>(vbrSector);
-
-            return _signature.SequenceEqual(vbr.signature);
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
-        {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
-
-            var sb = new StringBuilder();
-            XmlFsType = new FileSystemType();
-
-            ErrorNumber errno = imagePlugin.ReadSector(0 + partition.Start, out byte[] vbrSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            VolumeBootRecord vbr = Marshal.ByteArrayToStructureLittleEndian<VolumeBootRecord>(vbrSector);
-
-            errno = imagePlugin.ReadSector(9 + partition.Start, out byte[] parametersSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            OemParameterTable parametersTable =
-                Marshal.ByteArrayToStructureLittleEndian<OemParameterTable>(parametersSector);
-
-            errno = imagePlugin.ReadSector(11 + partition.Start, out byte[] chkSector);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            ChecksumSector chksector = Marshal.ByteArrayToStructureLittleEndian<ChecksumSector>(chkSector);
-
-            sb.AppendLine("Microsoft exFAT");
-            sb.AppendFormat("Partition offset: {0}", vbr.offset).AppendLine();
-
-            sb.AppendFormat("Volume has {0} sectors of {1} bytes each for a total of {2} bytes", vbr.sectors,
-                            1 << vbr.sectorShift, vbr.sectors * (ulong)(1 << vbr.sectorShift)).AppendLine();
-
-            sb.AppendFormat("Volume uses clusters of {0} sectors ({1} bytes) each", 1 << vbr.clusterShift,
-                            (1 << vbr.sectorShift) * (1 << vbr.clusterShift)).AppendLine();
-
-            sb.AppendFormat("First FAT starts at sector {0} and runs for {1} sectors", vbr.fatOffset, vbr.fatLength).
-               AppendLine();
-
-            sb.AppendFormat("Volume uses {0} FATs", vbr.fats).AppendLine();
-
-            sb.AppendFormat("Cluster heap starts at sector {0}, contains {1} clusters and is {2}% used",
-                            vbr.clusterHeapOffset, vbr.clusterHeapLength, vbr.heapUsage).AppendLine();
-
-            sb.AppendFormat("Root directory starts at cluster {0}", vbr.rootDirectoryCluster).AppendLine();
-
-            sb.AppendFormat("Filesystem revision is {0}.{1:D2}", (vbr.revision & 0xFF00) >> 8, vbr.revision & 0xFF).
-               AppendLine();
-
-            sb.AppendFormat("Volume serial number: {0:X8}", vbr.volumeSerial).AppendLine();
-            sb.AppendFormat("BIOS drive is {0:X2}h", vbr.drive).AppendLine();
-
-            if(vbr.flags.HasFlag(VolumeFlags.SecondFatActive))
-                sb.AppendLine("2nd FAT is in use");
-
-            if(vbr.flags.HasFlag(VolumeFlags.VolumeDirty))
-                sb.AppendLine("Volume is dirty");
-
-            if(vbr.flags.HasFlag(VolumeFlags.MediaFailure))
-                sb.AppendLine("Underlying media presented errors");
-
-            int count = 1;
-
-            foreach(OemParameter parameter in parametersTable.parameters)
+            if(parameter.OemParameterType == _oemFlashParameterGuid)
             {
-                if(parameter.OemParameterType == _oemFlashParameterGuid)
-                {
-                    sb.AppendFormat("OEM Parameters {0}:", count).AppendLine();
-                    sb.AppendFormat("\t{0} bytes in erase block", parameter.eraseBlockSize).AppendLine();
-                    sb.AppendFormat("\t{0} bytes per page", parameter.pageSize).AppendLine();
-                    sb.AppendFormat("\t{0} spare blocks", parameter.spareBlocks).AppendLine();
-                    sb.AppendFormat("\t{0} nanoseconds random access time", parameter.randomAccessTime).AppendLine();
-                    sb.AppendFormat("\t{0} nanoseconds program time", parameter.programTime).AppendLine();
-                    sb.AppendFormat("\t{0} nanoseconds read cycle time", parameter.readCycleTime).AppendLine();
-                    sb.AppendFormat("\t{0} nanoseconds write cycle time", parameter.writeCycleTime).AppendLine();
-                }
-                else if(parameter.OemParameterType != Guid.Empty)
-                    sb.AppendFormat("Found unknown parameter type {0}", parameter.OemParameterType).AppendLine();
-
-                count++;
+                sb.AppendFormat("OEM Parameters {0}:", count).AppendLine();
+                sb.AppendFormat("\t{0} bytes in erase block", parameter.eraseBlockSize).AppendLine();
+                sb.AppendFormat("\t{0} bytes per page", parameter.pageSize).AppendLine();
+                sb.AppendFormat("\t{0} spare blocks", parameter.spareBlocks).AppendLine();
+                sb.AppendFormat("\t{0} nanoseconds random access time", parameter.randomAccessTime).AppendLine();
+                sb.AppendFormat("\t{0} nanoseconds program time", parameter.programTime).AppendLine();
+                sb.AppendFormat("\t{0} nanoseconds read cycle time", parameter.readCycleTime).AppendLine();
+                sb.AppendFormat("\t{0} nanoseconds write cycle time", parameter.writeCycleTime).AppendLine();
             }
+            else if(parameter.OemParameterType != Guid.Empty)
+                sb.AppendFormat("Found unknown parameter type {0}", parameter.OemParameterType).AppendLine();
 
-            sb.AppendFormat("Checksum 0x{0:X8}", chksector.checksum[0]).AppendLine();
-
-            XmlFsType.ClusterSize  = (uint)((1 << vbr.sectorShift) * (1 << vbr.clusterShift));
-            XmlFsType.Clusters     = vbr.clusterHeapLength;
-            XmlFsType.Dirty        = vbr.flags.HasFlag(VolumeFlags.VolumeDirty);
-            XmlFsType.Type         = "exFAT";
-            XmlFsType.VolumeSerial = $"{vbr.volumeSerial:X8}";
-
-            information = sb.ToString();
+            count++;
         }
 
-        [Flags]
-        enum VolumeFlags : ushort
-        {
-            SecondFatActive = 1, VolumeDirty = 2, MediaFailure = 4,
-            ClearToZero     = 8
-        }
+        sb.AppendFormat("Checksum 0x{0:X8}", chksector.checksum[0]).AppendLine();
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct VolumeBootRecord
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] jump;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] signature;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 53)]
-            public readonly byte[] zero;
-            public readonly ulong       offset;
-            public readonly ulong       sectors;
-            public readonly uint        fatOffset;
-            public readonly uint        fatLength;
-            public readonly uint        clusterHeapOffset;
-            public readonly uint        clusterHeapLength;
-            public readonly uint        rootDirectoryCluster;
-            public readonly uint        volumeSerial;
-            public readonly ushort      revision;
-            public readonly VolumeFlags flags;
-            public readonly byte        sectorShift;
-            public readonly byte        clusterShift;
-            public readonly byte        fats;
-            public readonly byte        drive;
-            public readonly byte        heapUsage;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 53)]
-            public readonly byte[] reserved;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 53)]
-            public readonly byte[] bootCode;
-            public readonly ushort bootSignature;
-        }
+        XmlFsType.ClusterSize  = (uint)((1 << vbr.sectorShift) * (1 << vbr.clusterShift));
+        XmlFsType.Clusters     = vbr.clusterHeapLength;
+        XmlFsType.Dirty        = vbr.flags.HasFlag(VolumeFlags.VolumeDirty);
+        XmlFsType.Type         = "exFAT";
+        XmlFsType.VolumeSerial = $"{vbr.volumeSerial:X8}";
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct OemParameter
-        {
-            public readonly Guid OemParameterType;
-            public readonly uint eraseBlockSize;
-            public readonly uint pageSize;
-            public readonly uint spareBlocks;
-            public readonly uint randomAccessTime;
-            public readonly uint programTime;
-            public readonly uint readCycleTime;
-            public readonly uint writeCycleTime;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] reserved;
-        }
+        information = sb.ToString();
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct OemParameterTable
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly OemParameter[] parameters;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] padding;
-        }
+    [Flags]
+    enum VolumeFlags : ushort
+    {
+        SecondFatActive = 1, VolumeDirty = 2, MediaFailure = 4,
+        ClearToZero     = 8
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ChecksumSector
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly uint[] checksum;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct VolumeBootRecord
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] jump;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] signature;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 53)]
+        public readonly byte[] zero;
+        public readonly ulong       offset;
+        public readonly ulong       sectors;
+        public readonly uint        fatOffset;
+        public readonly uint        fatLength;
+        public readonly uint        clusterHeapOffset;
+        public readonly uint        clusterHeapLength;
+        public readonly uint        rootDirectoryCluster;
+        public readonly uint        volumeSerial;
+        public readonly ushort      revision;
+        public readonly VolumeFlags flags;
+        public readonly byte        sectorShift;
+        public readonly byte        clusterShift;
+        public readonly byte        fats;
+        public readonly byte        drive;
+        public readonly byte        heapUsage;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 53)]
+        public readonly byte[] reserved;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 53)]
+        public readonly byte[] bootCode;
+        public readonly ushort bootSignature;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct OemParameter
+    {
+        public readonly Guid OemParameterType;
+        public readonly uint eraseBlockSize;
+        public readonly uint pageSize;
+        public readonly uint spareBlocks;
+        public readonly uint randomAccessTime;
+        public readonly uint programTime;
+        public readonly uint readCycleTime;
+        public readonly uint writeCycleTime;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] reserved;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct OemParameterTable
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly OemParameter[] parameters;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] padding;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ChecksumSector
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly uint[] checksum;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/ext2FS.cs b/Aaru.Filesystems/ext2FS.cs
index 6e4696af0..56f9a093e 100644
--- a/Aaru.Filesystems/ext2FS.cs
+++ b/Aaru.Filesystems/ext2FS.cs
@@ -41,961 +41,960 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from the Linux kernel
+/// <inheritdoc />
+/// <summary>Implements detection of the Linux extended filesystem v2, v3 and v4</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class ext2FS : IFilesystem
 {
-    // Information from the Linux kernel
+    const int SB_POS = 0x400;
+
+    /// <summary>Same magic for ext2, ext3 and ext4</summary>
+    const ushort EXT2_MAGIC = 0xEF53;
+
+    const ushort EXT2_MAGIC_OLD = 0xEF51;
+
+    // ext? filesystem states
+    /// <summary>Cleanly-unmounted volume</summary>
+    const ushort EXT2_VALID_FS = 0x0001;
+    /// <summary>Dirty volume</summary>
+    const ushort EXT2_ERROR_FS = 0x0002;
+    /// <summary>Recovering orphan files</summary>
+    const ushort EXT3_ORPHAN_FS = 0x0004;
+
+    // ext? default mount flags
+    /// <summary>Enable debugging messages</summary>
+    const uint EXT2_DEFM_DEBUG = 0x000001;
+    /// <summary>Emulates BSD behaviour on new file creation</summary>
+    const uint EXT2_DEFM_BSDGROUPS = 0x000002;
+    /// <summary>Enable user xattrs</summary>
+    const uint EXT2_DEFM_XATTR_USER = 0x000004;
+    /// <summary>Enable POSIX ACLs</summary>
+    const uint EXT2_DEFM_ACL = 0x000008;
+    /// <summary>Use 16bit UIDs</summary>
+    const uint EXT2_DEFM_UID16 = 0x000010;
+    /// <summary>Journal data mode</summary>
+    const uint EXT3_DEFM_JMODE_DATA = 0x000040;
+    /// <summary>Journal ordered mode</summary>
+    const uint EXT3_DEFM_JMODE_ORDERED = 0x000080;
+    /// <summary>Journal writeback mode</summary>
+    const uint EXT3_DEFM_JMODE_WBACK = 0x000100;
+
+    // Behaviour on errors
+    /// <summary>Continue execution</summary>
+    const ushort EXT2_ERRORS_CONTINUE = 1;
+    /// <summary>Remount fs read-only</summary>
+    const ushort EXT2_ERRORS_RO = 2;
+    /// <summary>Panic</summary>
+    const ushort EXT2_ERRORS_PANIC = 3;
+
+    // OS codes
+    const uint EXT2_OS_LINUX   = 0;
+    const uint EXT2_OS_HURD    = 1;
+    const uint EXT2_OS_MASIX   = 2;
+    const uint EXT2_OS_FREEBSD = 3;
+    const uint EXT2_OS_LITES   = 4;
+
+    // Revision levels
+    /// <summary>The good old (original) format</summary>
+    const uint EXT2_GOOD_OLD_REV = 0;
+    /// <summary>V2 format w/ dynamic inode sizes</summary>
+    const uint EXT2_DYNAMIC_REV = 1;
+
+    // Compatible features
+    /// <summary>Pre-allocate directories</summary>
+    const uint EXT2_FEATURE_COMPAT_DIR_PREALLOC = 0x00000001;
+    /// <summary>imagic inodes ?</summary>
+    const uint EXT2_FEATURE_COMPAT_IMAGIC_INODES = 0x00000002;
+    /// <summary>Has journal (it's ext3)</summary>
+    const uint EXT3_FEATURE_COMPAT_HAS_JOURNAL = 0x00000004;
+    /// <summary>EA blocks</summary>
+    const uint EXT2_FEATURE_COMPAT_EXT_ATTR = 0x00000008;
+    /// <summary>Online filesystem resize reservations</summary>
+    const uint EXT2_FEATURE_COMPAT_RESIZE_INO = 0x00000010;
+    /// <summary>Can use hashed indexes on directories</summary>
+    const uint EXT2_FEATURE_COMPAT_DIR_INDEX = 0x00000020;
+
+    // Read-only compatible features
+    /// <summary>Reduced number of superblocks</summary>
+    const uint EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER = 0x00000001;
+    /// <summary>Can have files bigger than 2GiB</summary>
+    const uint EXT2_FEATURE_RO_COMPAT_LARGE_FILE = 0x00000002;
+    /// <summary>Use B-Tree for directories</summary>
+    const uint EXT2_FEATURE_RO_COMPAT_BTREE_DIR = 0x00000004;
+    /// <summary>Can have files bigger than 2TiB *ext4*</summary>
+    const uint EXT4_FEATURE_RO_COMPAT_HUGE_FILE = 0x00000008;
+    /// <summary>Group descriptor checksums and sparse inode table *ext4*</summary>
+    const uint EXT4_FEATURE_RO_COMPAT_GDT_CSUM = 0x00000010;
+    /// <summary>More than 32000 directory entries *ext4*</summary>
+    const uint EXT4_FEATURE_RO_COMPAT_DIR_NLINK = 0x00000020;
+    /// <summary>Nanosecond timestamps and creation time *ext4*</summary>
+    const uint EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE = 0x00000040;
+
+    // Incompatible features
+    /// <summary>Uses compression</summary>
+    const uint EXT2_FEATURE_INCOMPAT_COMPRESSION = 0x00000001;
+    /// <summary>Filetype in directory entries</summary>
+    const uint EXT2_FEATURE_INCOMPAT_FILETYPE = 0x00000002;
+    /// <summary>Journal needs recovery *ext3*</summary>
+    const uint EXT3_FEATURE_INCOMPAT_RECOVER = 0x00000004;
+    /// <summary>Has journal on another device *ext3*</summary>
+    const uint EXT3_FEATURE_INCOMPAT_JOURNAL_DEV = 0x00000008;
+    /// <summary>Reduced block group backups</summary>
+    const uint EXT2_FEATURE_INCOMPAT_META_BG = 0x00000010;
+    /// <summary>Volume use extents *ext4*</summary>
+    const uint EXT4_FEATURE_INCOMPAT_EXTENTS = 0x00000040;
+    /// <summary>Supports volumes bigger than 2^32 blocks *ext4*</summary>
+    const uint EXT4_FEATURE_INCOMPAT_64BIT = 0x00000080;
+    /// <summary>Multi-mount protection *ext4*</summary>
+    const uint EXT4_FEATURE_INCOMPAT_MMP = 0x00000100;
+    /// <summary>Flexible block group metadata location *ext4*</summary>
+    const uint EXT4_FEATURE_INCOMPAT_FLEX_BG = 0x00000200;
+    /// <summary>EA in inode *ext4*</summary>
+    const uint EXT4_FEATURE_INCOMPAT_EA_INODE = 0x00000400;
+    /// <summary>Data can reside in directory entry *ext4*</summary>
+    const uint EXT4_FEATURE_INCOMPAT_DIRDATA = 0x00001000;
+
+    // Miscellaneous filesystem flags
+    /// <summary>Signed dirhash in use</summary>
+    const uint EXT2_FLAGS_SIGNED_HASH = 0x00000001;
+    /// <summary>Unsigned dirhash in use</summary>
+    const uint EXT2_FLAGS_UNSIGNED_HASH = 0x00000002;
+    /// <summary>Testing development code</summary>
+    const uint EXT2_FLAGS_TEST_FILESYS = 0x00000004;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the Linux extended filesystem v2, v3 and v4</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class ext2FS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Linux extended Filesystem 2, 3 and 4";
+    /// <inheritdoc />
+    public Guid Id => new("6AA91B88-150B-4A7B-AD56-F84FB2DF4184");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const int SB_POS = 0x400;
+        ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
+        uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
 
-        /// <summary>Same magic for ext2, ext3 and ext4</summary>
-        const ushort EXT2_MAGIC = 0xEF53;
+        if(sbSectorOff + partition.Start >= partition.End)
+            return false;
 
-        const ushort EXT2_MAGIC_OLD = 0xEF51;
+        int  sbSizeInBytes   = Marshal.SizeOf<SuperBlock>();
+        uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
 
-        // ext? filesystem states
-        /// <summary>Cleanly-unmounted volume</summary>
-        const ushort EXT2_VALID_FS = 0x0001;
-        /// <summary>Dirty volume</summary>
-        const ushort EXT2_ERROR_FS = 0x0002;
-        /// <summary>Recovering orphan files</summary>
-        const ushort EXT3_ORPHAN_FS = 0x0004;
+        if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
+            sbSizeInSectors++;
 
-        // ext? default mount flags
-        /// <summary>Enable debugging messages</summary>
-        const uint EXT2_DEFM_DEBUG = 0x000001;
-        /// <summary>Emulates BSD behaviour on new file creation</summary>
-        const uint EXT2_DEFM_BSDGROUPS = 0x000002;
-        /// <summary>Enable user xattrs</summary>
-        const uint EXT2_DEFM_XATTR_USER = 0x000004;
-        /// <summary>Enable POSIX ACLs</summary>
-        const uint EXT2_DEFM_ACL = 0x000008;
-        /// <summary>Use 16bit UIDs</summary>
-        const uint EXT2_DEFM_UID16 = 0x000010;
-        /// <summary>Journal data mode</summary>
-        const uint EXT3_DEFM_JMODE_DATA = 0x000040;
-        /// <summary>Journal ordered mode</summary>
-        const uint EXT3_DEFM_JMODE_ORDERED = 0x000080;
-        /// <summary>Journal writeback mode</summary>
-        const uint EXT3_DEFM_JMODE_WBACK = 0x000100;
+        ErrorNumber errno =
+            imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSizeInSectors, out byte[] sbSector);
 
-        // Behaviour on errors
-        /// <summary>Continue execution</summary>
-        const ushort EXT2_ERRORS_CONTINUE = 1;
-        /// <summary>Remount fs read-only</summary>
-        const ushort EXT2_ERRORS_RO = 2;
-        /// <summary>Panic</summary>
-        const ushort EXT2_ERRORS_PANIC = 3;
+        if(errno != ErrorNumber.NoError)
+            return false;
 
-        // OS codes
-        const uint EXT2_OS_LINUX   = 0;
-        const uint EXT2_OS_HURD    = 1;
-        const uint EXT2_OS_MASIX   = 2;
-        const uint EXT2_OS_FREEBSD = 3;
-        const uint EXT2_OS_LITES   = 4;
+        byte[] sb = new byte[sbSizeInBytes];
 
-        // Revision levels
-        /// <summary>The good old (original) format</summary>
-        const uint EXT2_GOOD_OLD_REV = 0;
-        /// <summary>V2 format w/ dynamic inode sizes</summary>
-        const uint EXT2_DYNAMIC_REV = 1;
+        if(sbOff + sbSizeInBytes > sbSector.Length)
+            return false;
 
-        // Compatible features
-        /// <summary>Pre-allocate directories</summary>
-        const uint EXT2_FEATURE_COMPAT_DIR_PREALLOC = 0x00000001;
-        /// <summary>imagic inodes ?</summary>
-        const uint EXT2_FEATURE_COMPAT_IMAGIC_INODES = 0x00000002;
-        /// <summary>Has journal (it's ext3)</summary>
-        const uint EXT3_FEATURE_COMPAT_HAS_JOURNAL = 0x00000004;
-        /// <summary>EA blocks</summary>
-        const uint EXT2_FEATURE_COMPAT_EXT_ATTR = 0x00000008;
-        /// <summary>Online filesystem resize reservations</summary>
-        const uint EXT2_FEATURE_COMPAT_RESIZE_INO = 0x00000010;
-        /// <summary>Can use hashed indexes on directories</summary>
-        const uint EXT2_FEATURE_COMPAT_DIR_INDEX = 0x00000020;
+        Array.Copy(sbSector, sbOff, sb, 0, sbSizeInBytes);
 
-        // Read-only compatible features
-        /// <summary>Reduced number of superblocks</summary>
-        const uint EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER = 0x00000001;
-        /// <summary>Can have files bigger than 2GiB</summary>
-        const uint EXT2_FEATURE_RO_COMPAT_LARGE_FILE = 0x00000002;
-        /// <summary>Use B-Tree for directories</summary>
-        const uint EXT2_FEATURE_RO_COMPAT_BTREE_DIR = 0x00000004;
-        /// <summary>Can have files bigger than 2TiB *ext4*</summary>
-        const uint EXT4_FEATURE_RO_COMPAT_HUGE_FILE = 0x00000008;
-        /// <summary>Group descriptor checksums and sparse inode table *ext4*</summary>
-        const uint EXT4_FEATURE_RO_COMPAT_GDT_CSUM = 0x00000010;
-        /// <summary>More than 32000 directory entries *ext4*</summary>
-        const uint EXT4_FEATURE_RO_COMPAT_DIR_NLINK = 0x00000020;
-        /// <summary>Nanosecond timestamps and creation time *ext4*</summary>
-        const uint EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE = 0x00000040;
+        ushort magic = BitConverter.ToUInt16(sb, 0x038);
 
-        // Incompatible features
-        /// <summary>Uses compression</summary>
-        const uint EXT2_FEATURE_INCOMPAT_COMPRESSION = 0x00000001;
-        /// <summary>Filetype in directory entries</summary>
-        const uint EXT2_FEATURE_INCOMPAT_FILETYPE = 0x00000002;
-        /// <summary>Journal needs recovery *ext3*</summary>
-        const uint EXT3_FEATURE_INCOMPAT_RECOVER = 0x00000004;
-        /// <summary>Has journal on another device *ext3*</summary>
-        const uint EXT3_FEATURE_INCOMPAT_JOURNAL_DEV = 0x00000008;
-        /// <summary>Reduced block group backups</summary>
-        const uint EXT2_FEATURE_INCOMPAT_META_BG = 0x00000010;
-        /// <summary>Volume use extents *ext4*</summary>
-        const uint EXT4_FEATURE_INCOMPAT_EXTENTS = 0x00000040;
-        /// <summary>Supports volumes bigger than 2^32 blocks *ext4*</summary>
-        const uint EXT4_FEATURE_INCOMPAT_64BIT = 0x00000080;
-        /// <summary>Multi-mount protection *ext4*</summary>
-        const uint EXT4_FEATURE_INCOMPAT_MMP = 0x00000100;
-        /// <summary>Flexible block group metadata location *ext4*</summary>
-        const uint EXT4_FEATURE_INCOMPAT_FLEX_BG = 0x00000200;
-        /// <summary>EA in inode *ext4*</summary>
-        const uint EXT4_FEATURE_INCOMPAT_EA_INODE = 0x00000400;
-        /// <summary>Data can reside in directory entry *ext4*</summary>
-        const uint EXT4_FEATURE_INCOMPAT_DIRDATA = 0x00001000;
+        return magic == EXT2_MAGIC || magic == EXT2_MAGIC_OLD;
+    }
 
-        // Miscellaneous filesystem flags
-        /// <summary>Signed dirhash in use</summary>
-        const uint EXT2_FLAGS_SIGNED_HASH = 0x00000001;
-        /// <summary>Unsigned dirhash in use</summary>
-        const uint EXT2_FLAGS_UNSIGNED_HASH = 0x00000002;
-        /// <summary>Testing development code</summary>
-        const uint EXT2_FLAGS_TEST_FILESYS = 0x00000004;
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Linux extended Filesystem 2, 3 and 4";
-        /// <inheritdoc />
-        public Guid Id => new("6AA91B88-150B-4A7B-AD56-F84FB2DF4184");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        var sb = new StringBuilder();
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        bool newExt2 = false;
+        bool ext3    = false;
+        bool ext4    = false;
+
+        int  sbSizeInBytes   = Marshal.SizeOf<SuperBlock>();
+        uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
+
+        if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
+            sbSizeInSectors++;
+
+        ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
+        uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
+
+        ErrorNumber errno =
+            imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSizeInSectors, out byte[] sbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        byte[] sblock = new byte[sbSizeInBytes];
+        Array.Copy(sbSector, sbOff, sblock, 0, sbSizeInBytes);
+        SuperBlock supblk = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sblock);
+
+        XmlFsType = new FileSystemType();
+
+        switch(supblk.magic)
         {
-            ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
-            uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
+            case EXT2_MAGIC_OLD:
+                sb.AppendLine("ext2 (old) filesystem");
+                XmlFsType.Type = "ext2";
 
-            if(sbSectorOff + partition.Start >= partition.End)
-                return false;
+                break;
+            case EXT2_MAGIC:
+                ext3 |= (supblk.ftr_compat   & EXT3_FEATURE_COMPAT_HAS_JOURNAL) == EXT3_FEATURE_COMPAT_HAS_JOURNAL ||
+                        (supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_RECOVER)   == EXT3_FEATURE_INCOMPAT_RECOVER   ||
+                        (supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) ==
+                        EXT3_FEATURE_INCOMPAT_JOURNAL_DEV;
 
-            int  sbSizeInBytes   = Marshal.SizeOf<SuperBlock>();
-            uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
+                if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE) == EXT4_FEATURE_RO_COMPAT_HUGE_FILE ||
+                   (supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM)  == EXT4_FEATURE_RO_COMPAT_GDT_CSUM  ||
+                   (supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_DIR_NLINK) == EXT4_FEATURE_RO_COMPAT_DIR_NLINK ||
+                   (supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE) ==
+                   EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE                                                       ||
+                   (supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_64BIT)    == EXT4_FEATURE_INCOMPAT_64BIT    ||
+                   (supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_MMP)      == EXT4_FEATURE_INCOMPAT_MMP      ||
+                   (supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG)  == EXT4_FEATURE_INCOMPAT_FLEX_BG  ||
+                   (supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_EA_INODE) == EXT4_FEATURE_INCOMPAT_EA_INODE ||
+                   (supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_DIRDATA)  == EXT4_FEATURE_INCOMPAT_DIRDATA)
+                {
+                    ext3 = false;
+                    ext4 = true;
+                }
 
-            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
-                sbSizeInSectors++;
+                newExt2 |= !ext3 && !ext4;
 
-            ErrorNumber errno =
-                imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSizeInSectors, out byte[] sbSector);
+                if(newExt2)
+                {
+                    sb.AppendLine("ext2 filesystem");
+                    XmlFsType.Type = "ext2";
+                }
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+                if(ext3)
+                {
+                    sb.AppendLine("ext3 filesystem");
+                    XmlFsType.Type = "ext3";
+                }
 
-            byte[] sb = new byte[sbSizeInBytes];
+                if(ext4)
+                {
+                    sb.AppendLine("ext4 filesystem");
+                    XmlFsType.Type = "ext4";
+                }
 
-            if(sbOff + sbSizeInBytes > sbSector.Length)
-                return false;
+                break;
+            default:
+                information = "Not a ext2/3/4 filesystem" + Environment.NewLine;
 
-            Array.Copy(sbSector, sbOff, sb, 0, sbSizeInBytes);
-
-            ushort magic = BitConverter.ToUInt16(sb, 0x038);
-
-            return magic == EXT2_MAGIC || magic == EXT2_MAGIC_OLD;
+                return;
         }
 
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        string extOs;
+
+        switch(supblk.creator_os)
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
+            case EXT2_OS_FREEBSD:
+                extOs = "FreeBSD";
 
-            var sb = new StringBuilder();
+                break;
+            case EXT2_OS_HURD:
+                extOs = "Hurd";
 
-            bool newExt2 = false;
-            bool ext3    = false;
-            bool ext4    = false;
+                break;
+            case EXT2_OS_LINUX:
+                extOs = "Linux";
 
-            int  sbSizeInBytes   = Marshal.SizeOf<SuperBlock>();
-            uint sbSizeInSectors = (uint)(sbSizeInBytes / imagePlugin.Info.SectorSize);
+                break;
+            case EXT2_OS_LITES:
+                extOs = "Lites";
 
-            if(sbSizeInBytes % imagePlugin.Info.SectorSize > 0)
-                sbSizeInSectors++;
+                break;
+            case EXT2_OS_MASIX:
+                extOs = "MasIX";
 
-            ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
-            uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
+                break;
+            default:
+                extOs = $"Unknown OS ({supblk.creator_os})";
 
-            ErrorNumber errno =
-                imagePlugin.ReadSectors(sbSectorOff + partition.Start, sbSizeInSectors, out byte[] sbSector);
+                break;
+        }
 
-            if(errno != ErrorNumber.NoError)
-                return;
+        XmlFsType.SystemIdentifier = extOs;
 
-            byte[] sblock = new byte[sbSizeInBytes];
-            Array.Copy(sbSector, sbOff, sblock, 0, sbSizeInBytes);
-            SuperBlock supblk = Marshal.ByteArrayToStructureLittleEndian<SuperBlock>(sblock);
+        if(supblk.mkfs_t > 0)
+        {
+            sb.AppendFormat("Volume was created on {0} for {1}", DateHandlers.UnixUnsignedToDateTime(supblk.mkfs_t),
+                            extOs).AppendLine();
 
-            XmlFsType = new FileSystemType();
+            XmlFsType.CreationDate          = DateHandlers.UnixUnsignedToDateTime(supblk.mkfs_t);
+            XmlFsType.CreationDateSpecified = true;
+        }
+        else
+            sb.AppendFormat("Volume was created for {0}", extOs).AppendLine();
 
-            switch(supblk.magic)
-            {
-                case EXT2_MAGIC_OLD:
-                    sb.AppendLine("ext2 (old) filesystem");
-                    XmlFsType.Type = "ext2";
+        byte[] tempBytes = new byte[8];
+        ulong  blocks, reserved, free;
 
-                    break;
-                case EXT2_MAGIC:
-                    ext3 |= (supblk.ftr_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) == EXT3_FEATURE_COMPAT_HAS_JOURNAL ||
-                            (supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_RECOVER) == EXT3_FEATURE_INCOMPAT_RECOVER ||
-                            (supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) ==
-                            EXT3_FEATURE_INCOMPAT_JOURNAL_DEV;
+        if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_64BIT) == EXT4_FEATURE_INCOMPAT_64BIT)
+        {
+            byte[] tempLo = BitConverter.GetBytes(supblk.blocks);
+            byte[] tempHi = BitConverter.GetBytes(supblk.blocks_hi);
+            tempBytes[0] = tempLo[0];
+            tempBytes[1] = tempLo[1];
+            tempBytes[2] = tempLo[2];
+            tempBytes[3] = tempLo[3];
+            tempBytes[4] = tempHi[0];
+            tempBytes[5] = tempHi[1];
+            tempBytes[6] = tempHi[2];
+            tempBytes[7] = tempHi[3];
+            blocks       = BitConverter.ToUInt64(tempBytes, 0);
 
-                    if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE) == EXT4_FEATURE_RO_COMPAT_HUGE_FILE ||
-                       (supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM)  == EXT4_FEATURE_RO_COMPAT_GDT_CSUM  ||
-                       (supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_DIR_NLINK) == EXT4_FEATURE_RO_COMPAT_DIR_NLINK ||
-                       (supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE) ==
-                       EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE                                                       ||
-                       (supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_64BIT)    == EXT4_FEATURE_INCOMPAT_64BIT    ||
-                       (supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_MMP)      == EXT4_FEATURE_INCOMPAT_MMP      ||
-                       (supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG)  == EXT4_FEATURE_INCOMPAT_FLEX_BG  ||
-                       (supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_EA_INODE) == EXT4_FEATURE_INCOMPAT_EA_INODE ||
-                       (supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_DIRDATA)  == EXT4_FEATURE_INCOMPAT_DIRDATA)
-                    {
-                        ext3 = false;
-                        ext4 = true;
-                    }
+            tempLo       = BitConverter.GetBytes(supblk.reserved_blocks);
+            tempHi       = BitConverter.GetBytes(supblk.reserved_blocks_hi);
+            tempBytes[0] = tempLo[0];
+            tempBytes[1] = tempLo[1];
+            tempBytes[2] = tempLo[2];
+            tempBytes[3] = tempLo[3];
+            tempBytes[4] = tempHi[0];
+            tempBytes[5] = tempHi[1];
+            tempBytes[6] = tempHi[2];
+            tempBytes[7] = tempHi[3];
+            reserved     = BitConverter.ToUInt64(tempBytes, 0);
 
-                    newExt2 |= !ext3 && !ext4;
+            tempLo       = BitConverter.GetBytes(supblk.free_blocks);
+            tempHi       = BitConverter.GetBytes(supblk.free_blocks_hi);
+            tempBytes[0] = tempLo[0];
+            tempBytes[1] = tempLo[1];
+            tempBytes[2] = tempLo[2];
+            tempBytes[3] = tempLo[3];
+            tempBytes[4] = tempHi[0];
+            tempBytes[5] = tempHi[1];
+            tempBytes[6] = tempHi[2];
+            tempBytes[7] = tempHi[3];
+            free         = BitConverter.ToUInt64(tempBytes, 0);
+        }
+        else
+        {
+            blocks   = supblk.blocks;
+            reserved = supblk.reserved_blocks;
+            free     = supblk.free_blocks;
+        }
 
-                    if(newExt2)
-                    {
-                        sb.AppendLine("ext2 filesystem");
-                        XmlFsType.Type = "ext2";
-                    }
+        if(supblk.block_size == 0) // Then it is 1024 bytes
+            supblk.block_size = 1024;
 
-                    if(ext3)
-                    {
-                        sb.AppendLine("ext3 filesystem");
-                        XmlFsType.Type = "ext3";
-                    }
+        sb.AppendFormat("Volume has {0} blocks of {1} bytes, for a total of {2} bytes", blocks,
+                        1024 << (int)supblk.block_size, blocks * (ulong)(1024 << (int)supblk.block_size)).
+           AppendLine();
 
-                    if(ext4)
-                    {
-                        sb.AppendLine("ext4 filesystem");
-                        XmlFsType.Type = "ext4";
-                    }
+        XmlFsType.Clusters    = blocks;
+        XmlFsType.ClusterSize = (uint)(1024 << (int)supblk.block_size);
 
-                    break;
-                default:
-                    information = "Not a ext2/3/4 filesystem" + Environment.NewLine;
+        if(supblk.mount_t > 0 ||
+           supblk.mount_c > 0)
+        {
+            if(supblk.mount_t > 0)
+                sb.AppendFormat("Last mounted on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.mount_t)).
+                   AppendLine();
 
-                    return;
-            }
-
-            string extOs;
-
-            switch(supblk.creator_os)
-            {
-                case EXT2_OS_FREEBSD:
-                    extOs = "FreeBSD";
-
-                    break;
-                case EXT2_OS_HURD:
-                    extOs = "Hurd";
-
-                    break;
-                case EXT2_OS_LINUX:
-                    extOs = "Linux";
-
-                    break;
-                case EXT2_OS_LITES:
-                    extOs = "Lites";
-
-                    break;
-                case EXT2_OS_MASIX:
-                    extOs = "MasIX";
-
-                    break;
-                default:
-                    extOs = $"Unknown OS ({supblk.creator_os})";
-
-                    break;
-            }
-
-            XmlFsType.SystemIdentifier = extOs;
-
-            if(supblk.mkfs_t > 0)
-            {
-                sb.AppendFormat("Volume was created on {0} for {1}", DateHandlers.UnixUnsignedToDateTime(supblk.mkfs_t),
-                                extOs).AppendLine();
-
-                XmlFsType.CreationDate          = DateHandlers.UnixUnsignedToDateTime(supblk.mkfs_t);
-                XmlFsType.CreationDateSpecified = true;
-            }
+            if(supblk.max_mount_c != -1)
+                sb.AppendFormat("Volume has been mounted {0} times of a maximum of {1} mounts before checking",
+                                supblk.mount_c, supblk.max_mount_c).AppendLine();
             else
-                sb.AppendFormat("Volume was created for {0}", extOs).AppendLine();
+                sb.AppendFormat("Volume has been mounted {0} times with no maximum no. of mounts before checking",
+                                supblk.mount_c).AppendLine();
 
-            byte[] tempBytes = new byte[8];
-            ulong  blocks, reserved, free;
+            if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.last_mount_dir, Encoding)))
+                sb.AppendFormat("Last mounted on: \"{0}\"",
+                                StringHandlers.CToString(supblk.last_mount_dir, Encoding)).AppendLine();
 
-            if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_64BIT) == EXT4_FEATURE_INCOMPAT_64BIT)
-            {
-                byte[] tempLo = BitConverter.GetBytes(supblk.blocks);
-                byte[] tempHi = BitConverter.GetBytes(supblk.blocks_hi);
-                tempBytes[0] = tempLo[0];
-                tempBytes[1] = tempLo[1];
-                tempBytes[2] = tempLo[2];
-                tempBytes[3] = tempLo[3];
-                tempBytes[4] = tempHi[0];
-                tempBytes[5] = tempHi[1];
-                tempBytes[6] = tempHi[2];
-                tempBytes[7] = tempHi[3];
-                blocks       = BitConverter.ToUInt64(tempBytes, 0);
+            if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.mount_options, Encoding)))
+                sb.AppendFormat("Last used mount options were: {0}",
+                                StringHandlers.CToString(supblk.mount_options, Encoding)).AppendLine();
+        }
+        else
+        {
+            sb.AppendLine("Volume has never been mounted");
 
-                tempLo       = BitConverter.GetBytes(supblk.reserved_blocks);
-                tempHi       = BitConverter.GetBytes(supblk.reserved_blocks_hi);
-                tempBytes[0] = tempLo[0];
-                tempBytes[1] = tempLo[1];
-                tempBytes[2] = tempLo[2];
-                tempBytes[3] = tempLo[3];
-                tempBytes[4] = tempHi[0];
-                tempBytes[5] = tempHi[1];
-                tempBytes[6] = tempHi[2];
-                tempBytes[7] = tempHi[3];
-                reserved     = BitConverter.ToUInt64(tempBytes, 0);
-
-                tempLo       = BitConverter.GetBytes(supblk.free_blocks);
-                tempHi       = BitConverter.GetBytes(supblk.free_blocks_hi);
-                tempBytes[0] = tempLo[0];
-                tempBytes[1] = tempLo[1];
-                tempBytes[2] = tempLo[2];
-                tempBytes[3] = tempLo[3];
-                tempBytes[4] = tempHi[0];
-                tempBytes[5] = tempHi[1];
-                tempBytes[6] = tempHi[2];
-                tempBytes[7] = tempHi[3];
-                free         = BitConverter.ToUInt64(tempBytes, 0);
-            }
+            if(supblk.max_mount_c != -1)
+                sb.AppendFormat("Volume can be mounted {0} times before checking", supblk.max_mount_c).AppendLine();
             else
-            {
-                blocks   = supblk.blocks;
-                reserved = supblk.reserved_blocks;
-                free     = supblk.free_blocks;
-            }
+                sb.AppendLine("Volume has no maximum no. of mounts before checking");
+        }
 
-            if(supblk.block_size == 0) // Then it is 1024 bytes
-                supblk.block_size = 1024;
+        if(supblk.check_t > 0)
+            if(supblk.check_inv > 0)
+                sb.AppendFormat("Last checked on {0} (should check every {1} seconds)",
+                                DateHandlers.UnixUnsignedToDateTime(supblk.check_t), supblk.check_inv).AppendLine();
+            else
+                sb.AppendFormat("Last checked on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.check_t)).
+                   AppendLine();
+        else
+        {
+            if(supblk.check_inv > 0)
+                sb.AppendFormat("Volume has never been checked (should check every {0})", supblk.check_inv).
+                   AppendLine();
+            else
+                sb.AppendLine("Volume has never been checked");
+        }
 
-            sb.AppendFormat("Volume has {0} blocks of {1} bytes, for a total of {2} bytes", blocks,
-                            1024 << (int)supblk.block_size, blocks * (ulong)(1024 << (int)supblk.block_size)).
+        if(supblk.write_t > 0)
+        {
+            sb.AppendFormat("Last written on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.write_t)).
                AppendLine();
 
-            XmlFsType.Clusters    = blocks;
-            XmlFsType.ClusterSize = (uint)(1024 << (int)supblk.block_size);
-
-            if(supblk.mount_t > 0 ||
-               supblk.mount_c > 0)
-            {
-                if(supblk.mount_t > 0)
-                    sb.AppendFormat("Last mounted on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.mount_t)).
-                       AppendLine();
-
-                if(supblk.max_mount_c != -1)
-                    sb.AppendFormat("Volume has been mounted {0} times of a maximum of {1} mounts before checking",
-                                    supblk.mount_c, supblk.max_mount_c).AppendLine();
-                else
-                    sb.AppendFormat("Volume has been mounted {0} times with no maximum no. of mounts before checking",
-                                    supblk.mount_c).AppendLine();
-
-                if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.last_mount_dir, Encoding)))
-                    sb.AppendFormat("Last mounted on: \"{0}\"",
-                                    StringHandlers.CToString(supblk.last_mount_dir, Encoding)).AppendLine();
-
-                if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.mount_options, Encoding)))
-                    sb.AppendFormat("Last used mount options were: {0}",
-                                    StringHandlers.CToString(supblk.mount_options, Encoding)).AppendLine();
-            }
-            else
-            {
-                sb.AppendLine("Volume has never been mounted");
-
-                if(supblk.max_mount_c != -1)
-                    sb.AppendFormat("Volume can be mounted {0} times before checking", supblk.max_mount_c).AppendLine();
-                else
-                    sb.AppendLine("Volume has no maximum no. of mounts before checking");
-            }
-
-            if(supblk.check_t > 0)
-                if(supblk.check_inv > 0)
-                    sb.AppendFormat("Last checked on {0} (should check every {1} seconds)",
-                                    DateHandlers.UnixUnsignedToDateTime(supblk.check_t), supblk.check_inv).AppendLine();
-                else
-                    sb.AppendFormat("Last checked on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.check_t)).
-                       AppendLine();
-            else
-            {
-                if(supblk.check_inv > 0)
-                    sb.AppendFormat("Volume has never been checked (should check every {0})", supblk.check_inv).
-                       AppendLine();
-                else
-                    sb.AppendLine("Volume has never been checked");
-            }
-
-            if(supblk.write_t > 0)
-            {
-                sb.AppendFormat("Last written on {0}", DateHandlers.UnixUnsignedToDateTime(supblk.write_t)).
-                   AppendLine();
-
-                XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(supblk.write_t);
-                XmlFsType.ModificationDateSpecified = true;
-            }
-            else
-                sb.AppendLine("Volume has never been written");
-
-            XmlFsType.Dirty = true;
-
-            switch(supblk.state)
-            {
-                case EXT2_VALID_FS:
-                    sb.AppendLine("Volume is clean");
-                    XmlFsType.Dirty = false;
-
-                    break;
-                case EXT2_ERROR_FS:
-                    sb.AppendLine("Volume is dirty");
-
-                    break;
-                case EXT3_ORPHAN_FS:
-                    sb.AppendLine("Volume is recovering orphan files");
-
-                    break;
-                default:
-                    sb.AppendFormat("Volume is in an unknown state ({0})", supblk.state).AppendLine();
-
-                    break;
-            }
-
-            if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.volume_name, Encoding)))
-            {
-                sb.AppendFormat("Volume name: \"{0}\"", StringHandlers.CToString(supblk.volume_name, Encoding)).
-                   AppendLine();
-
-                XmlFsType.VolumeName = StringHandlers.CToString(supblk.volume_name, Encoding);
-            }
-
-            switch(supblk.err_behaviour)
-            {
-                case EXT2_ERRORS_CONTINUE:
-                    sb.AppendLine("On errors, filesystem should continue");
-
-                    break;
-                case EXT2_ERRORS_RO:
-                    sb.AppendLine("On errors, filesystem should remount read-only");
-
-                    break;
-                case EXT2_ERRORS_PANIC:
-                    sb.AppendLine("On errors, filesystem should panic");
-
-                    break;
-                default:
-                    sb.AppendFormat("On errors filesystem will do an unknown thing ({0})", supblk.err_behaviour).
-                       AppendLine();
-
-                    break;
-            }
-
-            if(supblk.revision > 0)
-                sb.AppendFormat("Filesystem revision: {0}.{1}", supblk.revision, supblk.minor_revision).AppendLine();
-
-            if(supblk.uuid != Guid.Empty)
-            {
-                sb.AppendFormat("Volume UUID: {0}", supblk.uuid).AppendLine();
-                XmlFsType.VolumeSerial = supblk.uuid.ToString();
-            }
-
-            if(supblk.kbytes_written > 0)
-                sb.AppendFormat("{0} KiB has been written on volume", supblk.kbytes_written).AppendLine();
-
-            sb.AppendFormat("{0} reserved and {1} free blocks", reserved, free).AppendLine();
-            XmlFsType.FreeClusters          = free;
-            XmlFsType.FreeClustersSpecified = true;
-
-            sb.AppendFormat("{0} inodes with {1} free inodes ({2}%)", supblk.inodes, supblk.free_inodes,
-                            supblk.free_inodes * 100 / supblk.inodes).AppendLine();
-
-            if(supblk.first_inode > 0)
-                sb.AppendFormat("First inode is {0}", supblk.first_inode).AppendLine();
-
-            if(supblk.frag_size > 0)
-                sb.AppendFormat("{0} bytes per fragment", supblk.frag_size).AppendLine();
-
-            if(supblk.blocks_per_grp > 0 &&
-               supblk.flags_per_grp  > 0 &&
-               supblk.inodes_per_grp > 0)
-                sb.AppendFormat("{0} blocks, {1} flags and {2} inodes per group", supblk.blocks_per_grp,
-                                supblk.flags_per_grp, supblk.inodes_per_grp).AppendLine();
-
-            if(supblk.first_block > 0)
-                sb.AppendFormat("{0} is first data block", supblk.first_block).AppendLine();
-
-            sb.AppendFormat("Default UID: {0}, GID: {1}", supblk.default_uid, supblk.default_gid).AppendLine();
-
-            if(supblk.block_group_no > 0)
-                sb.AppendFormat("Block group number is {0}", supblk.block_group_no).AppendLine();
-
-            if(supblk.desc_grp_size > 0)
-                sb.AppendFormat("Group descriptor size is {0} bytes", supblk.desc_grp_size).AppendLine();
-
-            if(supblk.first_meta_bg > 0)
-                sb.AppendFormat("First metablock group is {0}", supblk.first_meta_bg).AppendLine();
-
-            if(supblk.raid_stride > 0)
-                sb.AppendFormat("RAID stride: {0}", supblk.raid_stride).AppendLine();
-
-            if(supblk.raid_stripe_width > 0)
-                sb.AppendFormat("{0} blocks on all data disks", supblk.raid_stripe_width).AppendLine();
-
-            if(supblk.mmp_interval > 0 &&
-               supblk.mmp_block    > 0)
-                sb.AppendFormat("{0} seconds for multi-mount protection wait, on block {1}", supblk.mmp_interval,
-                                supblk.mmp_block).AppendLine();
-
-            if(supblk.flex_bg_grp_size > 0)
-                sb.AppendFormat("{0} Flexible block group size", supblk.flex_bg_grp_size).AppendLine();
-
-            if(supblk.hash_seed_1 > 0 &&
-               supblk.hash_seed_2 > 0 &&
-               supblk.hash_seed_3 > 0 &&
-               supblk.hash_seed_4 > 0)
-                sb.AppendFormat("Hash seed: {0:X8}{1:X8}{2:X8}{3:X8}, version {4}", supblk.hash_seed_1,
-                                supblk.hash_seed_2, supblk.hash_seed_3, supblk.hash_seed_4, supblk.hash_version).
-                   AppendLine();
-
-            if((supblk.ftr_compat   & EXT3_FEATURE_COMPAT_HAS_JOURNAL)   == EXT3_FEATURE_COMPAT_HAS_JOURNAL ||
-               (supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) == EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
-            {
-                sb.AppendLine("Volume is journaled");
-
-                if(supblk.journal_uuid != Guid.Empty)
-                    sb.AppendFormat("Journal UUID: {0}", supblk.journal_uuid).AppendLine();
-
-                sb.AppendFormat("Journal has inode {0}", supblk.journal_inode).AppendLine();
-
-                if((supblk.ftr_compat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) == EXT3_FEATURE_INCOMPAT_JOURNAL_DEV &&
-                   supblk.journal_dev                                      > 0)
-                    sb.AppendFormat("Journal is on device {0}", supblk.journal_dev).AppendLine();
-
-                if(supblk.jnl_backup_type > 0)
-                    sb.AppendFormat("Journal backup type: {0}", supblk.jnl_backup_type).AppendLine();
-
-                if(supblk.last_orphan > 0)
-                    sb.AppendFormat("Last orphaned inode is {0}", supblk.last_orphan).AppendLine();
-                else
-                    sb.AppendLine("There are no orphaned inodes");
-            }
-
-            if(ext4)
-            {
-                if(supblk.snapshot_id > 0)
-                    sb.
-                        AppendFormat("Active snapshot has ID {0}, on inode {1}, with {2} blocks reserved, list starting on block {3}",
-                                     supblk.snapshot_id, supblk.snapshot_inum, supblk.snapshot_blocks,
-                                     supblk.snapshot_list).AppendLine();
-
-                if(supblk.error_count > 0)
-                {
-                    sb.AppendFormat("{0} errors registered", supblk.error_count).AppendLine();
-
-                    sb.AppendFormat("First error occurred on {0}, last on {1}",
-                                    DateHandlers.UnixUnsignedToDateTime(supblk.first_error_t),
-                                    DateHandlers.UnixUnsignedToDateTime(supblk.last_error_t)).AppendLine();
-
-                    sb.AppendFormat("First error inode is {0}, last is {1}", supblk.first_error_inode,
-                                    supblk.last_error_inode).AppendLine();
-
-                    sb.AppendFormat("First error block is {0}, last is {1}", supblk.first_error_block,
-                                    supblk.last_error_block).AppendLine();
-
-                    sb.AppendFormat("First error function is \"{0}\", last is \"{1}\"", supblk.first_error_func,
-                                    supblk.last_error_func).AppendLine();
-                }
-            }
-
-            sb.AppendFormat("Flags…:").AppendLine();
-
-            if((supblk.flags & EXT2_FLAGS_SIGNED_HASH) == EXT2_FLAGS_SIGNED_HASH)
-                sb.AppendLine("Signed directory hash is in use");
-
-            if((supblk.flags & EXT2_FLAGS_UNSIGNED_HASH) == EXT2_FLAGS_UNSIGNED_HASH)
-                sb.AppendLine("Unsigned directory hash is in use");
-
-            if((supblk.flags & EXT2_FLAGS_TEST_FILESYS) == EXT2_FLAGS_TEST_FILESYS)
-                sb.AppendLine("Volume is testing development code");
-
-            if((supblk.flags & 0xFFFFFFF8) != 0)
-                sb.AppendFormat("Unknown set flags: {0:X8}", supblk.flags);
-
-            sb.AppendLine();
-
-            sb.AppendFormat("Default mount options…:").AppendLine();
-
-            if((supblk.default_mnt_opts & EXT2_DEFM_DEBUG) == EXT2_DEFM_DEBUG)
-                sb.AppendLine("(debug): Enable debugging code");
-
-            if((supblk.default_mnt_opts & EXT2_DEFM_BSDGROUPS) == EXT2_DEFM_BSDGROUPS)
-                sb.AppendLine("(bsdgroups): Emulate BSD behaviour when creating new files");
-
-            if((supblk.default_mnt_opts & EXT2_DEFM_XATTR_USER) == EXT2_DEFM_XATTR_USER)
-                sb.AppendLine("(user_xattr): Enable user-specified extended attributes");
-
-            if((supblk.default_mnt_opts & EXT2_DEFM_ACL) == EXT2_DEFM_ACL)
-                sb.AppendLine("(acl): Enable POSIX ACLs");
-
-            if((supblk.default_mnt_opts & EXT2_DEFM_UID16) == EXT2_DEFM_UID16)
-                sb.AppendLine("(uid16): Disable 32bit UIDs and GIDs");
-
-            if((supblk.default_mnt_opts & EXT3_DEFM_JMODE_DATA) == EXT3_DEFM_JMODE_DATA)
-                sb.AppendLine("(journal_data): Journal data and metadata");
-
-            if((supblk.default_mnt_opts & EXT3_DEFM_JMODE_ORDERED) == EXT3_DEFM_JMODE_ORDERED)
-                sb.AppendLine("(journal_data_ordered): Write data before journaling metadata");
-
-            if((supblk.default_mnt_opts & EXT3_DEFM_JMODE_WBACK) == EXT3_DEFM_JMODE_WBACK)
-                sb.AppendLine("(journal_data_writeback): Write journal before data");
-
-            if((supblk.default_mnt_opts & 0xFFFFFE20) != 0)
-                sb.AppendFormat("Unknown set default mount options: {0:X8}", supblk.default_mnt_opts);
-
-            sb.AppendLine();
-
-            sb.AppendFormat("Compatible features…:").AppendLine();
-
-            if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_DIR_PREALLOC) == EXT2_FEATURE_COMPAT_DIR_PREALLOC)
-                sb.AppendLine("Pre-allocate directories");
-
-            if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_IMAGIC_INODES) == EXT2_FEATURE_COMPAT_IMAGIC_INODES)
-                sb.AppendLine("imagic inodes ?");
-
-            if((supblk.ftr_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) == EXT3_FEATURE_COMPAT_HAS_JOURNAL)
-                sb.AppendLine("Has journal (ext3)");
-
-            if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_EXT_ATTR) == EXT2_FEATURE_COMPAT_EXT_ATTR)
-                sb.AppendLine("Has extended attribute blocks");
-
-            if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_RESIZE_INO) == EXT2_FEATURE_COMPAT_RESIZE_INO)
-                sb.AppendLine("Has online filesystem resize reservations");
-
-            if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) == EXT2_FEATURE_COMPAT_DIR_INDEX)
-                sb.AppendLine("Can use hashed indexes on directories");
-
-            if((supblk.ftr_compat & 0xFFFFFFC0) != 0)
-                sb.AppendFormat("Unknown compatible features: {0:X8}", supblk.ftr_compat);
-
-            sb.AppendLine();
-
-            sb.AppendFormat("Compatible features if read-only…:").AppendLine();
-
-            if((supblk.ftr_ro_compat & EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER) == EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)
-                sb.AppendLine("Reduced number of superblocks");
-
-            if((supblk.ftr_ro_compat & EXT2_FEATURE_RO_COMPAT_LARGE_FILE) == EXT2_FEATURE_RO_COMPAT_LARGE_FILE)
-                sb.AppendLine("Can have files bigger than 2GiB");
-
-            if((supblk.ftr_ro_compat & EXT2_FEATURE_RO_COMPAT_BTREE_DIR) == EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
-                sb.AppendLine("Uses B-Tree for directories");
-
-            if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE) == EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
-                sb.AppendLine("Can have files bigger than 2TiB (ext4)");
-
-            if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM) == EXT4_FEATURE_RO_COMPAT_GDT_CSUM)
-                sb.AppendLine("Group descriptor checksums and sparse inode table (ext4)");
-
-            if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_DIR_NLINK) == EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
-                sb.AppendLine("More than 32000 directory entries (ext4)");
-
-            if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE) == EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)
-                sb.AppendLine("Supports nanosecond timestamps and creation time (ext4)");
-
-            if((supblk.ftr_ro_compat & 0xFFFFFF80) != 0)
-                sb.AppendFormat("Unknown read-only compatible features: {0:X8}", supblk.ftr_ro_compat);
-
-            sb.AppendLine();
-
-            sb.AppendFormat("Incompatible features…:").AppendLine();
-
-            if((supblk.ftr_incompat & EXT2_FEATURE_INCOMPAT_COMPRESSION) == EXT2_FEATURE_INCOMPAT_COMPRESSION)
-                sb.AppendLine("Uses compression");
-
-            if((supblk.ftr_incompat & EXT2_FEATURE_INCOMPAT_FILETYPE) == EXT2_FEATURE_INCOMPAT_FILETYPE)
-                sb.AppendLine("Filetype in directory entries");
-
-            if((supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_RECOVER) == EXT3_FEATURE_INCOMPAT_RECOVER)
-                sb.AppendLine("Journal needs recovery (ext3)");
-
-            if((supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) == EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
-                sb.AppendLine("Has journal on another device (ext3)");
-
-            if((supblk.ftr_incompat & EXT2_FEATURE_INCOMPAT_META_BG) == EXT2_FEATURE_INCOMPAT_META_BG)
-                sb.AppendLine("Reduced block group backups");
-
-            if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_EXTENTS) == EXT4_FEATURE_INCOMPAT_EXTENTS)
-                sb.AppendLine("Volume use extents (ext4)");
-
-            if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_64BIT) == EXT4_FEATURE_INCOMPAT_64BIT)
-                sb.AppendLine("Supports volumes bigger than 2^32 blocks (ext4)");
-
-            if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_MMP) == EXT4_FEATURE_INCOMPAT_MMP)
-                sb.AppendLine("Multi-mount protection (ext4)");
-
-            if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG) == EXT4_FEATURE_INCOMPAT_FLEX_BG)
-                sb.AppendLine("Flexible block group metadata location (ext4)");
-
-            if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_EA_INODE) == EXT4_FEATURE_INCOMPAT_EA_INODE)
-                sb.AppendLine("Extended attributes can reside in inode (ext4)");
-
-            if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_DIRDATA) == EXT4_FEATURE_INCOMPAT_DIRDATA)
-                sb.AppendLine("Data can reside in directory entry (ext4)");
-
-            if((supblk.ftr_incompat & 0xFFFFF020) != 0)
-                sb.AppendFormat("Unknown incompatible features: {0:X8}", supblk.ftr_incompat);
-
-            information = sb.ToString();
+            XmlFsType.ModificationDate          = DateHandlers.UnixUnsignedToDateTime(supblk.write_t);
+            XmlFsType.ModificationDateSpecified = true;
         }
+        else
+            sb.AppendLine("Volume has never been written");
 
-        /// <summary>ext2/3/4 superblock</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct SuperBlock
+        XmlFsType.Dirty = true;
+
+        switch(supblk.state)
         {
-            /// <summary>0x000, inodes on volume</summary>
-            public readonly uint inodes;
-            /// <summary>0x004, blocks on volume</summary>
-            public readonly uint blocks;
-            /// <summary>0x008, reserved blocks</summary>
-            public readonly uint reserved_blocks;
-            /// <summary>0x00C, free blocks count</summary>
-            public readonly uint free_blocks;
-            /// <summary>0x010, free inodes count</summary>
-            public readonly uint free_inodes;
-            /// <summary>0x014, first data block</summary>
-            public readonly uint first_block;
-            /// <summary>0x018, block size</summary>
-            public uint block_size;
-            /// <summary>0x01C, fragment size</summary>
-            public readonly int frag_size;
-            /// <summary>0x020, blocks per group</summary>
-            public readonly uint blocks_per_grp;
-            /// <summary>0x024, fragments per group</summary>
-            public readonly uint flags_per_grp;
-            /// <summary>0x028, inodes per group</summary>
-            public readonly uint inodes_per_grp;
-            /// <summary>0x02C, last mount time</summary>
-            public readonly uint mount_t;
-            /// <summary>0x030, last write time</summary>
-            public readonly uint write_t;
-            /// <summary>0x034, mounts count</summary>
-            public readonly ushort mount_c;
-            /// <summary>0x036, max mounts</summary>
-            public readonly short max_mount_c;
-            /// <summary>0x038, (little endian)</summary>
-            public readonly ushort magic;
-            /// <summary>0x03A, filesystem state</summary>
-            public readonly ushort state;
-            /// <summary>0x03C, behaviour on errors</summary>
-            public readonly ushort err_behaviour;
-            /// <summary>0x03E, From 0.5b onward</summary>
-            public readonly ushort minor_revision;
-            /// <summary>0x040, last check time</summary>
-            public readonly uint check_t;
-            /// <summary>0x044, max time between checks</summary>
-            public readonly uint check_inv;
+            case EXT2_VALID_FS:
+                sb.AppendLine("Volume is clean");
+                XmlFsType.Dirty = false;
 
-            // From 0.5a onward
-            /// <summary>0x048, Creation OS</summary>
-            public readonly uint creator_os;
-            /// <summary>0x04C, Revison level</summary>
-            public readonly uint revision;
-            /// <summary>0x050, Default UID for reserved blocks</summary>
-            public readonly ushort default_uid;
-            /// <summary>0x052, Default GID for reserved blocks</summary>
-            public readonly ushort default_gid;
+                break;
+            case EXT2_ERROR_FS:
+                sb.AppendLine("Volume is dirty");
 
-            // From 0.5b onward
-            /// <summary>0x054, First unreserved inode</summary>
-            public readonly uint first_inode;
-            /// <summary>0x058, inode size</summary>
-            public readonly ushort inode_size;
-            /// <summary>0x05A, Block group number of THIS superblock</summary>
-            public readonly ushort block_group_no;
-            /// <summary>0x05C, Compatible features set</summary>
-            public readonly uint ftr_compat;
-            /// <summary>0x060, Incompatible features set</summary>
-            public readonly uint ftr_incompat;
+                break;
+            case EXT3_ORPHAN_FS:
+                sb.AppendLine("Volume is recovering orphan files");
 
-            // Found on Linux 2.0.40
-            /// <summary>0x064, Read-only compatible features set</summary>
-            public readonly uint ftr_ro_compat;
+                break;
+            default:
+                sb.AppendFormat("Volume is in an unknown state ({0})", supblk.state).AppendLine();
 
-            // Found on Linux 2.1.132
-            /// <summary>0x068, 16 bytes, UUID</summary>
-            public readonly Guid uuid;
-            /// <summary>0x078, 16 bytes, volume name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] volume_name;
-            /// <summary>0x088, 64 bytes, where last mounted</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] last_mount_dir;
-            /// <summary>0x0C8, Usage bitmap algorithm, for compression</summary>
-            public readonly uint algo_usage_bmp;
-            /// <summary>0x0CC, Block to try to preallocate</summary>
-            public readonly byte prealloc_blks;
-            /// <summary>0x0CD, Blocks to try to preallocate for directories</summary>
-            public readonly byte prealloc_dir_blks;
-            /// <summary>0x0CE, Per-group desc for online growth</summary>
-            public readonly ushort rsrvd_gdt_blocks;
-
-            // Found on Linux 2.4
-            // ext3
-            /// <summary>0x0D0, 16 bytes, UUID of journal superblock</summary>
-            public readonly Guid journal_uuid;
-            /// <summary>0x0E0, inode no. of journal file</summary>
-            public readonly uint journal_inode;
-            /// <summary>0x0E4, device no. of journal file</summary>
-            public readonly uint journal_dev;
-            /// <summary>0x0E8, Start of list of inodes to delete</summary>
-            public readonly uint last_orphan;
-            /// <summary>0x0EC, First byte of 128bit HTREE hash seed</summary>
-            public readonly uint hash_seed_1;
-            /// <summary>0x0F0, Second byte of 128bit HTREE hash seed</summary>
-            public readonly uint hash_seed_2;
-            /// <summary>0x0F4, Third byte of 128bit HTREE hash seed</summary>
-            public readonly uint hash_seed_3;
-            /// <summary>0x0F8, Fourth byte of 128bit HTREE hash seed</summary>
-            public readonly uint hash_seed_4;
-            /// <summary>0x0FC, Hash version</summary>
-            public readonly byte hash_version;
-            /// <summary>0x0FD, Journal backup type</summary>
-            public readonly byte jnl_backup_type;
-            /// <summary>0x0FE, Size of group descriptor</summary>
-            public readonly ushort desc_grp_size;
-            /// <summary>0x100, Default mount options</summary>
-            public readonly uint default_mnt_opts;
-            /// <summary>0x104, First metablock block group</summary>
-            public readonly uint first_meta_bg;
-
-            // Introduced with ext4, some can be ext3
-            /// <summary>0x108, Filesystem creation time</summary>
-            public readonly uint mkfs_t;
-
-            /// <summary>Backup of the journal inode</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public readonly uint[] jnl_blocks;
-
-            // Following 3 fields are valid if EXT4_FEATURE_COMPAT_64BIT is set
-            /// <summary>0x14C, High 32bits of blocks no.</summary>
-            public readonly uint blocks_hi;
-            /// <summary>0x150, High 32bits of reserved blocks no.</summary>
-            public readonly uint reserved_blocks_hi;
-            /// <summary>0x154, High 32bits of free blocks no.</summary>
-            public readonly uint free_blocks_hi;
-            /// <summary>0x158, inodes minimal size in bytes</summary>
-            public readonly ushort min_inode_size;
-            /// <summary>0x15A, Bytes reserved by new inodes</summary>
-            public readonly ushort rsv_inode_size;
-            /// <summary>0x15C, Flags</summary>
-            public readonly uint flags;
-            /// <summary>0x160, RAID stride</summary>
-            public readonly ushort raid_stride;
-            /// <summary>0x162, Waiting seconds in MMP check</summary>
-            public readonly ushort mmp_interval;
-            /// <summary>0x164, Block for multi-mount protection</summary>
-            public readonly ulong mmp_block;
-            /// <summary>0x16C, Blocks on all data disks (N*stride)</summary>
-            public readonly uint raid_stripe_width;
-            /// <summary>0x170, FLEX_BG group size</summary>
-            public readonly byte flex_bg_grp_size;
-            /// <summary>0x171 Metadata checksum algorithm</summary>
-            public readonly byte checksum_type;
-            /// <summary>0x172 Versioning level for encryption</summary>
-            public readonly byte encryption_level;
-            /// <summary>0x173 Padding</summary>
-            public readonly ushort padding;
-
-            // Following are introduced with ext4
-            /// <summary>0x174, Kibibytes written in volume lifetime</summary>
-            public readonly ulong kbytes_written;
-            /// <summary>0x17C, Active snapshot inode number</summary>
-            public readonly uint snapshot_inum;
-            /// <summary>0x180, Active snapshot sequential ID</summary>
-            public readonly uint snapshot_id;
-            /// <summary>0x184, Reserved blocks for active snapshot's future use</summary>
-            public readonly ulong snapshot_blocks;
-            /// <summary>0x18C, inode number of the on-disk start of the snapshot list</summary>
-            public readonly uint snapshot_list;
-
-            // Optional ext4 error-handling features
-            /// <summary>0x190, total registered filesystem errors</summary>
-            public readonly uint error_count;
-            /// <summary>0x194, time on first error</summary>
-            public readonly uint first_error_t;
-            /// <summary>0x198, inode involved in first error</summary>
-            public readonly uint first_error_inode;
-            /// <summary>0x19C, block involved of first error</summary>
-            public readonly ulong first_error_block;
-            /// <summary>0x1A0, 32 bytes, function where the error happened</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] first_error_func;
-            /// <summary>0x1B0, line number where error happened</summary>
-            public readonly uint first_error_line;
-            /// <summary>0x1B4, time of most recent error</summary>
-            public readonly uint last_error_t;
-            /// <summary>0x1B8, inode involved in last error</summary>
-            public readonly uint last_error_inode;
-            /// <summary>0x1BC, line number where error happened</summary>
-            public readonly uint last_error_line;
-            /// <summary>0x1C0, block involved of last error</summary>
-            public readonly ulong last_error_block;
-            /// <summary>0x1C8, 32 bytes, function where the error happened</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] last_error_func;
-
-            // End of optional error-handling features
-
-            // 0x1D8, 64 bytes, last used mount options</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] mount_options;
-
-            /// <summary>Inode for user quota</summary>
-            public readonly uint usr_quota_inum;
-            /// <summary>Inode for group quota</summary>
-            public readonly uint grp_quota_inum;
-            /// <summary>Overhead clusters in volume</summary>
-            public readonly uint overhead_clusters;
-            /// <summary>Groups with sparse_super2 SBs</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly uint[] backup_bgs;
-            /// <summary>Encryption algorithms in use</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] encrypt_algos;
-            /// <summary>Salt used for string2key algorithm</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] encrypt_pw_salt;
-            /// <summary>Inode number of lost+found</summary>
-            public readonly uint lpf_inum;
-            /// <summary>Inode number for tracking project quota</summary>
-            public readonly uint prj_quota_inum;
-            /// <summary>crc32c(uuid) if csum_seed is set</summary>
-            public readonly uint checksum_seed;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 98)]
-            public readonly byte[] reserved;
-            /// <summary>crc32c(superblock)</summary>
-            public readonly uint checksum;
+                break;
         }
+
+        if(!string.IsNullOrEmpty(StringHandlers.CToString(supblk.volume_name, Encoding)))
+        {
+            sb.AppendFormat("Volume name: \"{0}\"", StringHandlers.CToString(supblk.volume_name, Encoding)).
+               AppendLine();
+
+            XmlFsType.VolumeName = StringHandlers.CToString(supblk.volume_name, Encoding);
+        }
+
+        switch(supblk.err_behaviour)
+        {
+            case EXT2_ERRORS_CONTINUE:
+                sb.AppendLine("On errors, filesystem should continue");
+
+                break;
+            case EXT2_ERRORS_RO:
+                sb.AppendLine("On errors, filesystem should remount read-only");
+
+                break;
+            case EXT2_ERRORS_PANIC:
+                sb.AppendLine("On errors, filesystem should panic");
+
+                break;
+            default:
+                sb.AppendFormat("On errors filesystem will do an unknown thing ({0})", supblk.err_behaviour).
+                   AppendLine();
+
+                break;
+        }
+
+        if(supblk.revision > 0)
+            sb.AppendFormat("Filesystem revision: {0}.{1}", supblk.revision, supblk.minor_revision).AppendLine();
+
+        if(supblk.uuid != Guid.Empty)
+        {
+            sb.AppendFormat("Volume UUID: {0}", supblk.uuid).AppendLine();
+            XmlFsType.VolumeSerial = supblk.uuid.ToString();
+        }
+
+        if(supblk.kbytes_written > 0)
+            sb.AppendFormat("{0} KiB has been written on volume", supblk.kbytes_written).AppendLine();
+
+        sb.AppendFormat("{0} reserved and {1} free blocks", reserved, free).AppendLine();
+        XmlFsType.FreeClusters          = free;
+        XmlFsType.FreeClustersSpecified = true;
+
+        sb.AppendFormat("{0} inodes with {1} free inodes ({2}%)", supblk.inodes, supblk.free_inodes,
+                        supblk.free_inodes * 100 / supblk.inodes).AppendLine();
+
+        if(supblk.first_inode > 0)
+            sb.AppendFormat("First inode is {0}", supblk.first_inode).AppendLine();
+
+        if(supblk.frag_size > 0)
+            sb.AppendFormat("{0} bytes per fragment", supblk.frag_size).AppendLine();
+
+        if(supblk.blocks_per_grp > 0 &&
+           supblk.flags_per_grp  > 0 &&
+           supblk.inodes_per_grp > 0)
+            sb.AppendFormat("{0} blocks, {1} flags and {2} inodes per group", supblk.blocks_per_grp,
+                            supblk.flags_per_grp, supblk.inodes_per_grp).AppendLine();
+
+        if(supblk.first_block > 0)
+            sb.AppendFormat("{0} is first data block", supblk.first_block).AppendLine();
+
+        sb.AppendFormat("Default UID: {0}, GID: {1}", supblk.default_uid, supblk.default_gid).AppendLine();
+
+        if(supblk.block_group_no > 0)
+            sb.AppendFormat("Block group number is {0}", supblk.block_group_no).AppendLine();
+
+        if(supblk.desc_grp_size > 0)
+            sb.AppendFormat("Group descriptor size is {0} bytes", supblk.desc_grp_size).AppendLine();
+
+        if(supblk.first_meta_bg > 0)
+            sb.AppendFormat("First metablock group is {0}", supblk.first_meta_bg).AppendLine();
+
+        if(supblk.raid_stride > 0)
+            sb.AppendFormat("RAID stride: {0}", supblk.raid_stride).AppendLine();
+
+        if(supblk.raid_stripe_width > 0)
+            sb.AppendFormat("{0} blocks on all data disks", supblk.raid_stripe_width).AppendLine();
+
+        if(supblk.mmp_interval > 0 &&
+           supblk.mmp_block    > 0)
+            sb.AppendFormat("{0} seconds for multi-mount protection wait, on block {1}", supblk.mmp_interval,
+                            supblk.mmp_block).AppendLine();
+
+        if(supblk.flex_bg_grp_size > 0)
+            sb.AppendFormat("{0} Flexible block group size", supblk.flex_bg_grp_size).AppendLine();
+
+        if(supblk.hash_seed_1 > 0 &&
+           supblk.hash_seed_2 > 0 &&
+           supblk.hash_seed_3 > 0 &&
+           supblk.hash_seed_4 > 0)
+            sb.AppendFormat("Hash seed: {0:X8}{1:X8}{2:X8}{3:X8}, version {4}", supblk.hash_seed_1,
+                            supblk.hash_seed_2, supblk.hash_seed_3, supblk.hash_seed_4, supblk.hash_version).
+               AppendLine();
+
+        if((supblk.ftr_compat   & EXT3_FEATURE_COMPAT_HAS_JOURNAL)   == EXT3_FEATURE_COMPAT_HAS_JOURNAL ||
+           (supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) == EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
+        {
+            sb.AppendLine("Volume is journaled");
+
+            if(supblk.journal_uuid != Guid.Empty)
+                sb.AppendFormat("Journal UUID: {0}", supblk.journal_uuid).AppendLine();
+
+            sb.AppendFormat("Journal has inode {0}", supblk.journal_inode).AppendLine();
+
+            if((supblk.ftr_compat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) == EXT3_FEATURE_INCOMPAT_JOURNAL_DEV &&
+               supblk.journal_dev                                      > 0)
+                sb.AppendFormat("Journal is on device {0}", supblk.journal_dev).AppendLine();
+
+            if(supblk.jnl_backup_type > 0)
+                sb.AppendFormat("Journal backup type: {0}", supblk.jnl_backup_type).AppendLine();
+
+            if(supblk.last_orphan > 0)
+                sb.AppendFormat("Last orphaned inode is {0}", supblk.last_orphan).AppendLine();
+            else
+                sb.AppendLine("There are no orphaned inodes");
+        }
+
+        if(ext4)
+        {
+            if(supblk.snapshot_id > 0)
+                sb.
+                    AppendFormat("Active snapshot has ID {0}, on inode {1}, with {2} blocks reserved, list starting on block {3}",
+                                 supblk.snapshot_id, supblk.snapshot_inum, supblk.snapshot_blocks,
+                                 supblk.snapshot_list).AppendLine();
+
+            if(supblk.error_count > 0)
+            {
+                sb.AppendFormat("{0} errors registered", supblk.error_count).AppendLine();
+
+                sb.AppendFormat("First error occurred on {0}, last on {1}",
+                                DateHandlers.UnixUnsignedToDateTime(supblk.first_error_t),
+                                DateHandlers.UnixUnsignedToDateTime(supblk.last_error_t)).AppendLine();
+
+                sb.AppendFormat("First error inode is {0}, last is {1}", supblk.first_error_inode,
+                                supblk.last_error_inode).AppendLine();
+
+                sb.AppendFormat("First error block is {0}, last is {1}", supblk.first_error_block,
+                                supblk.last_error_block).AppendLine();
+
+                sb.AppendFormat("First error function is \"{0}\", last is \"{1}\"", supblk.first_error_func,
+                                supblk.last_error_func).AppendLine();
+            }
+        }
+
+        sb.AppendFormat("Flags…:").AppendLine();
+
+        if((supblk.flags & EXT2_FLAGS_SIGNED_HASH) == EXT2_FLAGS_SIGNED_HASH)
+            sb.AppendLine("Signed directory hash is in use");
+
+        if((supblk.flags & EXT2_FLAGS_UNSIGNED_HASH) == EXT2_FLAGS_UNSIGNED_HASH)
+            sb.AppendLine("Unsigned directory hash is in use");
+
+        if((supblk.flags & EXT2_FLAGS_TEST_FILESYS) == EXT2_FLAGS_TEST_FILESYS)
+            sb.AppendLine("Volume is testing development code");
+
+        if((supblk.flags & 0xFFFFFFF8) != 0)
+            sb.AppendFormat("Unknown set flags: {0:X8}", supblk.flags);
+
+        sb.AppendLine();
+
+        sb.AppendFormat("Default mount options…:").AppendLine();
+
+        if((supblk.default_mnt_opts & EXT2_DEFM_DEBUG) == EXT2_DEFM_DEBUG)
+            sb.AppendLine("(debug): Enable debugging code");
+
+        if((supblk.default_mnt_opts & EXT2_DEFM_BSDGROUPS) == EXT2_DEFM_BSDGROUPS)
+            sb.AppendLine("(bsdgroups): Emulate BSD behaviour when creating new files");
+
+        if((supblk.default_mnt_opts & EXT2_DEFM_XATTR_USER) == EXT2_DEFM_XATTR_USER)
+            sb.AppendLine("(user_xattr): Enable user-specified extended attributes");
+
+        if((supblk.default_mnt_opts & EXT2_DEFM_ACL) == EXT2_DEFM_ACL)
+            sb.AppendLine("(acl): Enable POSIX ACLs");
+
+        if((supblk.default_mnt_opts & EXT2_DEFM_UID16) == EXT2_DEFM_UID16)
+            sb.AppendLine("(uid16): Disable 32bit UIDs and GIDs");
+
+        if((supblk.default_mnt_opts & EXT3_DEFM_JMODE_DATA) == EXT3_DEFM_JMODE_DATA)
+            sb.AppendLine("(journal_data): Journal data and metadata");
+
+        if((supblk.default_mnt_opts & EXT3_DEFM_JMODE_ORDERED) == EXT3_DEFM_JMODE_ORDERED)
+            sb.AppendLine("(journal_data_ordered): Write data before journaling metadata");
+
+        if((supblk.default_mnt_opts & EXT3_DEFM_JMODE_WBACK) == EXT3_DEFM_JMODE_WBACK)
+            sb.AppendLine("(journal_data_writeback): Write journal before data");
+
+        if((supblk.default_mnt_opts & 0xFFFFFE20) != 0)
+            sb.AppendFormat("Unknown set default mount options: {0:X8}", supblk.default_mnt_opts);
+
+        sb.AppendLine();
+
+        sb.AppendFormat("Compatible features…:").AppendLine();
+
+        if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_DIR_PREALLOC) == EXT2_FEATURE_COMPAT_DIR_PREALLOC)
+            sb.AppendLine("Pre-allocate directories");
+
+        if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_IMAGIC_INODES) == EXT2_FEATURE_COMPAT_IMAGIC_INODES)
+            sb.AppendLine("imagic inodes ?");
+
+        if((supblk.ftr_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) == EXT3_FEATURE_COMPAT_HAS_JOURNAL)
+            sb.AppendLine("Has journal (ext3)");
+
+        if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_EXT_ATTR) == EXT2_FEATURE_COMPAT_EXT_ATTR)
+            sb.AppendLine("Has extended attribute blocks");
+
+        if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_RESIZE_INO) == EXT2_FEATURE_COMPAT_RESIZE_INO)
+            sb.AppendLine("Has online filesystem resize reservations");
+
+        if((supblk.ftr_compat & EXT2_FEATURE_COMPAT_DIR_INDEX) == EXT2_FEATURE_COMPAT_DIR_INDEX)
+            sb.AppendLine("Can use hashed indexes on directories");
+
+        if((supblk.ftr_compat & 0xFFFFFFC0) != 0)
+            sb.AppendFormat("Unknown compatible features: {0:X8}", supblk.ftr_compat);
+
+        sb.AppendLine();
+
+        sb.AppendFormat("Compatible features if read-only…:").AppendLine();
+
+        if((supblk.ftr_ro_compat & EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER) == EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)
+            sb.AppendLine("Reduced number of superblocks");
+
+        if((supblk.ftr_ro_compat & EXT2_FEATURE_RO_COMPAT_LARGE_FILE) == EXT2_FEATURE_RO_COMPAT_LARGE_FILE)
+            sb.AppendLine("Can have files bigger than 2GiB");
+
+        if((supblk.ftr_ro_compat & EXT2_FEATURE_RO_COMPAT_BTREE_DIR) == EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
+            sb.AppendLine("Uses B-Tree for directories");
+
+        if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE) == EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
+            sb.AppendLine("Can have files bigger than 2TiB (ext4)");
+
+        if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM) == EXT4_FEATURE_RO_COMPAT_GDT_CSUM)
+            sb.AppendLine("Group descriptor checksums and sparse inode table (ext4)");
+
+        if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_DIR_NLINK) == EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
+            sb.AppendLine("More than 32000 directory entries (ext4)");
+
+        if((supblk.ftr_ro_compat & EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE) == EXT4_FEATURE_RO_COMPAT_EXTRA_ISIZE)
+            sb.AppendLine("Supports nanosecond timestamps and creation time (ext4)");
+
+        if((supblk.ftr_ro_compat & 0xFFFFFF80) != 0)
+            sb.AppendFormat("Unknown read-only compatible features: {0:X8}", supblk.ftr_ro_compat);
+
+        sb.AppendLine();
+
+        sb.AppendFormat("Incompatible features…:").AppendLine();
+
+        if((supblk.ftr_incompat & EXT2_FEATURE_INCOMPAT_COMPRESSION) == EXT2_FEATURE_INCOMPAT_COMPRESSION)
+            sb.AppendLine("Uses compression");
+
+        if((supblk.ftr_incompat & EXT2_FEATURE_INCOMPAT_FILETYPE) == EXT2_FEATURE_INCOMPAT_FILETYPE)
+            sb.AppendLine("Filetype in directory entries");
+
+        if((supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_RECOVER) == EXT3_FEATURE_INCOMPAT_RECOVER)
+            sb.AppendLine("Journal needs recovery (ext3)");
+
+        if((supblk.ftr_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) == EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
+            sb.AppendLine("Has journal on another device (ext3)");
+
+        if((supblk.ftr_incompat & EXT2_FEATURE_INCOMPAT_META_BG) == EXT2_FEATURE_INCOMPAT_META_BG)
+            sb.AppendLine("Reduced block group backups");
+
+        if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_EXTENTS) == EXT4_FEATURE_INCOMPAT_EXTENTS)
+            sb.AppendLine("Volume use extents (ext4)");
+
+        if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_64BIT) == EXT4_FEATURE_INCOMPAT_64BIT)
+            sb.AppendLine("Supports volumes bigger than 2^32 blocks (ext4)");
+
+        if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_MMP) == EXT4_FEATURE_INCOMPAT_MMP)
+            sb.AppendLine("Multi-mount protection (ext4)");
+
+        if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_FLEX_BG) == EXT4_FEATURE_INCOMPAT_FLEX_BG)
+            sb.AppendLine("Flexible block group metadata location (ext4)");
+
+        if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_EA_INODE) == EXT4_FEATURE_INCOMPAT_EA_INODE)
+            sb.AppendLine("Extended attributes can reside in inode (ext4)");
+
+        if((supblk.ftr_incompat & EXT4_FEATURE_INCOMPAT_DIRDATA) == EXT4_FEATURE_INCOMPAT_DIRDATA)
+            sb.AppendLine("Data can reside in directory entry (ext4)");
+
+        if((supblk.ftr_incompat & 0xFFFFF020) != 0)
+            sb.AppendFormat("Unknown incompatible features: {0:X8}", supblk.ftr_incompat);
+
+        information = sb.ToString();
+    }
+
+    /// <summary>ext2/3/4 superblock</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1), SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct SuperBlock
+    {
+        /// <summary>0x000, inodes on volume</summary>
+        public readonly uint inodes;
+        /// <summary>0x004, blocks on volume</summary>
+        public readonly uint blocks;
+        /// <summary>0x008, reserved blocks</summary>
+        public readonly uint reserved_blocks;
+        /// <summary>0x00C, free blocks count</summary>
+        public readonly uint free_blocks;
+        /// <summary>0x010, free inodes count</summary>
+        public readonly uint free_inodes;
+        /// <summary>0x014, first data block</summary>
+        public readonly uint first_block;
+        /// <summary>0x018, block size</summary>
+        public uint block_size;
+        /// <summary>0x01C, fragment size</summary>
+        public readonly int frag_size;
+        /// <summary>0x020, blocks per group</summary>
+        public readonly uint blocks_per_grp;
+        /// <summary>0x024, fragments per group</summary>
+        public readonly uint flags_per_grp;
+        /// <summary>0x028, inodes per group</summary>
+        public readonly uint inodes_per_grp;
+        /// <summary>0x02C, last mount time</summary>
+        public readonly uint mount_t;
+        /// <summary>0x030, last write time</summary>
+        public readonly uint write_t;
+        /// <summary>0x034, mounts count</summary>
+        public readonly ushort mount_c;
+        /// <summary>0x036, max mounts</summary>
+        public readonly short max_mount_c;
+        /// <summary>0x038, (little endian)</summary>
+        public readonly ushort magic;
+        /// <summary>0x03A, filesystem state</summary>
+        public readonly ushort state;
+        /// <summary>0x03C, behaviour on errors</summary>
+        public readonly ushort err_behaviour;
+        /// <summary>0x03E, From 0.5b onward</summary>
+        public readonly ushort minor_revision;
+        /// <summary>0x040, last check time</summary>
+        public readonly uint check_t;
+        /// <summary>0x044, max time between checks</summary>
+        public readonly uint check_inv;
+
+        // From 0.5a onward
+        /// <summary>0x048, Creation OS</summary>
+        public readonly uint creator_os;
+        /// <summary>0x04C, Revison level</summary>
+        public readonly uint revision;
+        /// <summary>0x050, Default UID for reserved blocks</summary>
+        public readonly ushort default_uid;
+        /// <summary>0x052, Default GID for reserved blocks</summary>
+        public readonly ushort default_gid;
+
+        // From 0.5b onward
+        /// <summary>0x054, First unreserved inode</summary>
+        public readonly uint first_inode;
+        /// <summary>0x058, inode size</summary>
+        public readonly ushort inode_size;
+        /// <summary>0x05A, Block group number of THIS superblock</summary>
+        public readonly ushort block_group_no;
+        /// <summary>0x05C, Compatible features set</summary>
+        public readonly uint ftr_compat;
+        /// <summary>0x060, Incompatible features set</summary>
+        public readonly uint ftr_incompat;
+
+        // Found on Linux 2.0.40
+        /// <summary>0x064, Read-only compatible features set</summary>
+        public readonly uint ftr_ro_compat;
+
+        // Found on Linux 2.1.132
+        /// <summary>0x068, 16 bytes, UUID</summary>
+        public readonly Guid uuid;
+        /// <summary>0x078, 16 bytes, volume name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] volume_name;
+        /// <summary>0x088, 64 bytes, where last mounted</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] last_mount_dir;
+        /// <summary>0x0C8, Usage bitmap algorithm, for compression</summary>
+        public readonly uint algo_usage_bmp;
+        /// <summary>0x0CC, Block to try to preallocate</summary>
+        public readonly byte prealloc_blks;
+        /// <summary>0x0CD, Blocks to try to preallocate for directories</summary>
+        public readonly byte prealloc_dir_blks;
+        /// <summary>0x0CE, Per-group desc for online growth</summary>
+        public readonly ushort rsrvd_gdt_blocks;
+
+        // Found on Linux 2.4
+        // ext3
+        /// <summary>0x0D0, 16 bytes, UUID of journal superblock</summary>
+        public readonly Guid journal_uuid;
+        /// <summary>0x0E0, inode no. of journal file</summary>
+        public readonly uint journal_inode;
+        /// <summary>0x0E4, device no. of journal file</summary>
+        public readonly uint journal_dev;
+        /// <summary>0x0E8, Start of list of inodes to delete</summary>
+        public readonly uint last_orphan;
+        /// <summary>0x0EC, First byte of 128bit HTREE hash seed</summary>
+        public readonly uint hash_seed_1;
+        /// <summary>0x0F0, Second byte of 128bit HTREE hash seed</summary>
+        public readonly uint hash_seed_2;
+        /// <summary>0x0F4, Third byte of 128bit HTREE hash seed</summary>
+        public readonly uint hash_seed_3;
+        /// <summary>0x0F8, Fourth byte of 128bit HTREE hash seed</summary>
+        public readonly uint hash_seed_4;
+        /// <summary>0x0FC, Hash version</summary>
+        public readonly byte hash_version;
+        /// <summary>0x0FD, Journal backup type</summary>
+        public readonly byte jnl_backup_type;
+        /// <summary>0x0FE, Size of group descriptor</summary>
+        public readonly ushort desc_grp_size;
+        /// <summary>0x100, Default mount options</summary>
+        public readonly uint default_mnt_opts;
+        /// <summary>0x104, First metablock block group</summary>
+        public readonly uint first_meta_bg;
+
+        // Introduced with ext4, some can be ext3
+        /// <summary>0x108, Filesystem creation time</summary>
+        public readonly uint mkfs_t;
+
+        /// <summary>Backup of the journal inode</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
+        public readonly uint[] jnl_blocks;
+
+        // Following 3 fields are valid if EXT4_FEATURE_COMPAT_64BIT is set
+        /// <summary>0x14C, High 32bits of blocks no.</summary>
+        public readonly uint blocks_hi;
+        /// <summary>0x150, High 32bits of reserved blocks no.</summary>
+        public readonly uint reserved_blocks_hi;
+        /// <summary>0x154, High 32bits of free blocks no.</summary>
+        public readonly uint free_blocks_hi;
+        /// <summary>0x158, inodes minimal size in bytes</summary>
+        public readonly ushort min_inode_size;
+        /// <summary>0x15A, Bytes reserved by new inodes</summary>
+        public readonly ushort rsv_inode_size;
+        /// <summary>0x15C, Flags</summary>
+        public readonly uint flags;
+        /// <summary>0x160, RAID stride</summary>
+        public readonly ushort raid_stride;
+        /// <summary>0x162, Waiting seconds in MMP check</summary>
+        public readonly ushort mmp_interval;
+        /// <summary>0x164, Block for multi-mount protection</summary>
+        public readonly ulong mmp_block;
+        /// <summary>0x16C, Blocks on all data disks (N*stride)</summary>
+        public readonly uint raid_stripe_width;
+        /// <summary>0x170, FLEX_BG group size</summary>
+        public readonly byte flex_bg_grp_size;
+        /// <summary>0x171 Metadata checksum algorithm</summary>
+        public readonly byte checksum_type;
+        /// <summary>0x172 Versioning level for encryption</summary>
+        public readonly byte encryption_level;
+        /// <summary>0x173 Padding</summary>
+        public readonly ushort padding;
+
+        // Following are introduced with ext4
+        /// <summary>0x174, Kibibytes written in volume lifetime</summary>
+        public readonly ulong kbytes_written;
+        /// <summary>0x17C, Active snapshot inode number</summary>
+        public readonly uint snapshot_inum;
+        /// <summary>0x180, Active snapshot sequential ID</summary>
+        public readonly uint snapshot_id;
+        /// <summary>0x184, Reserved blocks for active snapshot's future use</summary>
+        public readonly ulong snapshot_blocks;
+        /// <summary>0x18C, inode number of the on-disk start of the snapshot list</summary>
+        public readonly uint snapshot_list;
+
+        // Optional ext4 error-handling features
+        /// <summary>0x190, total registered filesystem errors</summary>
+        public readonly uint error_count;
+        /// <summary>0x194, time on first error</summary>
+        public readonly uint first_error_t;
+        /// <summary>0x198, inode involved in first error</summary>
+        public readonly uint first_error_inode;
+        /// <summary>0x19C, block involved of first error</summary>
+        public readonly ulong first_error_block;
+        /// <summary>0x1A0, 32 bytes, function where the error happened</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] first_error_func;
+        /// <summary>0x1B0, line number where error happened</summary>
+        public readonly uint first_error_line;
+        /// <summary>0x1B4, time of most recent error</summary>
+        public readonly uint last_error_t;
+        /// <summary>0x1B8, inode involved in last error</summary>
+        public readonly uint last_error_inode;
+        /// <summary>0x1BC, line number where error happened</summary>
+        public readonly uint last_error_line;
+        /// <summary>0x1C0, block involved of last error</summary>
+        public readonly ulong last_error_block;
+        /// <summary>0x1C8, 32 bytes, function where the error happened</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] last_error_func;
+
+        // End of optional error-handling features
+
+        // 0x1D8, 64 bytes, last used mount options</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] mount_options;
+
+        /// <summary>Inode for user quota</summary>
+        public readonly uint usr_quota_inum;
+        /// <summary>Inode for group quota</summary>
+        public readonly uint grp_quota_inum;
+        /// <summary>Overhead clusters in volume</summary>
+        public readonly uint overhead_clusters;
+        /// <summary>Groups with sparse_super2 SBs</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly uint[] backup_bgs;
+        /// <summary>Encryption algorithms in use</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] encrypt_algos;
+        /// <summary>Salt used for string2key algorithm</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] encrypt_pw_salt;
+        /// <summary>Inode number of lost+found</summary>
+        public readonly uint lpf_inum;
+        /// <summary>Inode number for tracking project quota</summary>
+        public readonly uint prj_quota_inum;
+        /// <summary>crc32c(uuid) if csum_seed is set</summary>
+        public readonly uint checksum_seed;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 98)]
+        public readonly byte[] reserved;
+        /// <summary>crc32c(superblock)</summary>
+        public readonly uint checksum;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filesystems/extFS.cs b/Aaru.Filesystems/extFS.cs
index 596fabfa9..dbc202a35 100644
--- a/Aaru.Filesystems/extFS.cs
+++ b/Aaru.Filesystems/extFS.cs
@@ -38,156 +38,155 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Schemas;
 
-namespace Aaru.Filesystems
+namespace Aaru.Filesystems;
+
+// Information from the Linux kernel
+/// <inheritdoc />
+/// <summary>Implements detection of the Linux extended filesystem</summary>
+public sealed class extFS : IFilesystem
 {
-    // Information from the Linux kernel
+    const int SB_POS = 0x400;
+
+    /// <summary>ext superblock magic</summary>
+    const ushort EXT_MAGIC = 0x137D;
+
     /// <inheritdoc />
-    /// <summary>Implements detection of the Linux extended filesystem</summary>
-    public sealed class extFS : IFilesystem
+    public FileSystemType XmlFsType { get; private set; }
+    /// <inheritdoc />
+    public string Name => "Linux extended Filesystem";
+    /// <inheritdoc />
+    public Guid Id => new("076CB3A2-08C2-4D69-BC8A-FCAA2E502BE2");
+    /// <inheritdoc />
+    public Encoding Encoding { get; private set; }
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool Identify(IMediaImage imagePlugin, Partition partition)
     {
-        const int SB_POS = 0x400;
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
 
-        /// <summary>ext superblock magic</summary>
-        const ushort EXT_MAGIC = 0x137D;
+        ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
+        uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public FileSystemType XmlFsType { get; private set; }
-        /// <inheritdoc />
-        public string Name => "Linux extended Filesystem";
-        /// <inheritdoc />
-        public Guid Id => new("076CB3A2-08C2-4D69-BC8A-FCAA2E502BE2");
-        /// <inheritdoc />
-        public Encoding Encoding { get; private set; }
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(sbSectorOff + partition.Start >= partition.End)
+            return false;
 
-        /// <inheritdoc />
-        public bool Identify(IMediaImage imagePlugin, Partition partition)
+        ErrorNumber errno = imagePlugin.ReadSector(sbSectorOff + partition.Start, out byte[] sbSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        byte[] sb = new byte[512];
+
+        if(sbOff + 512 > sbSector.Length)
+            return false;
+
+        Array.Copy(sbSector, sbOff, sb, 0, 512);
+
+        ushort magic = BitConverter.ToUInt16(sb, 0x038);
+
+        return magic == EXT_MAGIC;
+    }
+
+    /// <inheritdoc />
+    public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
+                               Encoding encoding)
+    {
+        Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
+        information = "";
+
+        var sb = new StringBuilder();
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return;
+
+        ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
+        uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
+
+        if(sbSectorOff + partition.Start >= partition.End)
+            return;
+
+        ErrorNumber errno = imagePlugin.ReadSector(sbSectorOff + partition.Start, out byte[] sblock);
+
+        if(errno != ErrorNumber.NoError)
+            return;
+
+        byte[] sbSector = new byte[512];
+        Array.Copy(sblock, sbOff, sbSector, 0, 512);
+
+        var extSb = new SuperBlock
         {
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
+            inodes        = BitConverter.ToUInt32(sbSector, 0x000),
+            zones         = BitConverter.ToUInt32(sbSector, 0x004),
+            firstfreeblk  = BitConverter.ToUInt32(sbSector, 0x008),
+            freecountblk  = BitConverter.ToUInt32(sbSector, 0x00C),
+            firstfreeind  = BitConverter.ToUInt32(sbSector, 0x010),
+            freecountind  = BitConverter.ToUInt32(sbSector, 0x014),
+            firstdatazone = BitConverter.ToUInt32(sbSector, 0x018),
+            logzonesize   = BitConverter.ToUInt32(sbSector, 0x01C),
+            maxsize       = BitConverter.ToUInt32(sbSector, 0x020)
+        };
 
-            ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
-            uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
+        sb.AppendLine("ext filesystem");
+        sb.AppendFormat("{0} zones on volume", extSb.zones);
+        sb.AppendFormat("{0} free blocks ({1} bytes)", extSb.freecountblk, extSb.freecountblk * 1024);
 
-            if(sbSectorOff + partition.Start >= partition.End)
-                return false;
+        sb.AppendFormat("{0} inodes on volume, {1} free ({2}%)", extSb.inodes, extSb.freecountind,
+                        extSb.freecountind * 100 / extSb.inodes);
 
-            ErrorNumber errno = imagePlugin.ReadSector(sbSectorOff + partition.Start, out byte[] sbSector);
+        sb.AppendFormat("First free inode is {0}", extSb.firstfreeind);
+        sb.AppendFormat("First free block is {0}", extSb.firstfreeblk);
+        sb.AppendFormat("First data zone is {0}", extSb.firstdatazone);
+        sb.AppendFormat("Log zone size: {0}", extSb.logzonesize);
+        sb.AppendFormat("Max zone size: {0}", extSb.maxsize);
 
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            byte[] sb = new byte[512];
-
-            if(sbOff + 512 > sbSector.Length)
-                return false;
-
-            Array.Copy(sbSector, sbOff, sb, 0, 512);
-
-            ushort magic = BitConverter.ToUInt16(sb, 0x038);
-
-            return magic == EXT_MAGIC;
-        }
-
-        /// <inheritdoc />
-        public void GetInformation(IMediaImage imagePlugin, Partition partition, out string information,
-                                   Encoding encoding)
+        XmlFsType = new FileSystemType
         {
-            Encoding    = encoding ?? Encoding.GetEncoding("iso-8859-15");
-            information = "";
+            Type                  = "ext",
+            FreeClusters          = extSb.freecountblk,
+            FreeClustersSpecified = true,
+            ClusterSize           = 1024,
+            Clusters              = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize / 1024
+        };
 
-            var sb = new StringBuilder();
+        information = sb.ToString();
+    }
 
-            if(imagePlugin.Info.SectorSize < 512)
-                return;
-
-            ulong sbSectorOff = SB_POS / imagePlugin.Info.SectorSize;
-            uint  sbOff       = SB_POS % imagePlugin.Info.SectorSize;
-
-            if(sbSectorOff + partition.Start >= partition.End)
-                return;
-
-            ErrorNumber errno = imagePlugin.ReadSector(sbSectorOff + partition.Start, out byte[] sblock);
-
-            if(errno != ErrorNumber.NoError)
-                return;
-
-            byte[] sbSector = new byte[512];
-            Array.Copy(sblock, sbOff, sbSector, 0, 512);
-
-            var extSb = new SuperBlock
-            {
-                inodes        = BitConverter.ToUInt32(sbSector, 0x000),
-                zones         = BitConverter.ToUInt32(sbSector, 0x004),
-                firstfreeblk  = BitConverter.ToUInt32(sbSector, 0x008),
-                freecountblk  = BitConverter.ToUInt32(sbSector, 0x00C),
-                firstfreeind  = BitConverter.ToUInt32(sbSector, 0x010),
-                freecountind  = BitConverter.ToUInt32(sbSector, 0x014),
-                firstdatazone = BitConverter.ToUInt32(sbSector, 0x018),
-                logzonesize   = BitConverter.ToUInt32(sbSector, 0x01C),
-                maxsize       = BitConverter.ToUInt32(sbSector, 0x020)
-            };
-
-            sb.AppendLine("ext filesystem");
-            sb.AppendFormat("{0} zones on volume", extSb.zones);
-            sb.AppendFormat("{0} free blocks ({1} bytes)", extSb.freecountblk, extSb.freecountblk * 1024);
-
-            sb.AppendFormat("{0} inodes on volume, {1} free ({2}%)", extSb.inodes, extSb.freecountind,
-                            extSb.freecountind * 100 / extSb.inodes);
-
-            sb.AppendFormat("First free inode is {0}", extSb.firstfreeind);
-            sb.AppendFormat("First free block is {0}", extSb.firstfreeblk);
-            sb.AppendFormat("First data zone is {0}", extSb.firstdatazone);
-            sb.AppendFormat("Log zone size: {0}", extSb.logzonesize);
-            sb.AppendFormat("Max zone size: {0}", extSb.maxsize);
-
-            XmlFsType = new FileSystemType
-            {
-                Type                  = "ext",
-                FreeClusters          = extSb.freecountblk,
-                FreeClustersSpecified = true,
-                ClusterSize           = 1024,
-                Clusters              = (partition.End - partition.Start + 1) * imagePlugin.Info.SectorSize / 1024
-            };
-
-            information = sb.ToString();
-        }
-
-        /// <summary>ext superblock</summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct SuperBlock
-        {
-            /// <summary>0x000, inodes on volume</summary>
-            public uint inodes;
-            /// <summary>0x004, zones on volume</summary>
-            public uint zones;
-            /// <summary>0x008, first free block</summary>
-            public uint firstfreeblk;
-            /// <summary>0x00C, free blocks count</summary>
-            public uint freecountblk;
-            /// <summary>0x010, first free inode</summary>
-            public uint firstfreeind;
-            /// <summary>0x014, free inodes count</summary>
-            public uint freecountind;
-            /// <summary>0x018, first data zone</summary>
-            public uint firstdatazone;
-            /// <summary>0x01C, log zone size</summary>
-            public uint logzonesize;
-            /// <summary>0x020, max zone size</summary>
-            public uint maxsize;
-            /// <summary>0x024, reserved</summary>
-            public uint reserved1;
-            /// <summary>0x028, reserved</summary>
-            public uint reserved2;
-            /// <summary>0x02C, reserved</summary>
-            public uint reserved3;
-            /// <summary>0x030, reserved</summary>
-            public uint reserved4;
-            /// <summary>0x034, reserved</summary>
-            public uint reserved5;
-            /// <summary>0x038, 0x137D (little endian)</summary>
-            public ushort magic;
-        }
+    /// <summary>ext superblock</summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct SuperBlock
+    {
+        /// <summary>0x000, inodes on volume</summary>
+        public uint inodes;
+        /// <summary>0x004, zones on volume</summary>
+        public uint zones;
+        /// <summary>0x008, first free block</summary>
+        public uint firstfreeblk;
+        /// <summary>0x00C, free blocks count</summary>
+        public uint freecountblk;
+        /// <summary>0x010, first free inode</summary>
+        public uint firstfreeind;
+        /// <summary>0x014, free inodes count</summary>
+        public uint freecountind;
+        /// <summary>0x018, first data zone</summary>
+        public uint firstdatazone;
+        /// <summary>0x01C, log zone size</summary>
+        public uint logzonesize;
+        /// <summary>0x020, max zone size</summary>
+        public uint maxsize;
+        /// <summary>0x024, reserved</summary>
+        public uint reserved1;
+        /// <summary>0x028, reserved</summary>
+        public uint reserved2;
+        /// <summary>0x02C, reserved</summary>
+        public uint reserved3;
+        /// <summary>0x030, reserved</summary>
+        public uint reserved4;
+        /// <summary>0x034, reserved</summary>
+        public uint reserved5;
+        /// <summary>0x038, 0x137D (little endian)</summary>
+        public ushort magic;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filters/AppleDouble.cs b/Aaru.Filters/AppleDouble.cs
index 3c8fc66b9..def6a1cf3 100644
--- a/Aaru.Filters/AppleDouble.cs
+++ b/Aaru.Filters/AppleDouble.cs
@@ -40,644 +40,643 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+/// <inheritdoc />
+/// <summary>Decodes AppleDouble files</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class AppleDouble : IFilter
 {
-    /// <inheritdoc />
-    /// <summary>Decodes AppleDouble files</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class AppleDouble : IFilter
+    const uint MAGIC    = 0x00051607;
+    const uint VERSION  = 0x00010000;
+    const uint VERSION2 = 0x00020000;
+    readonly byte[] _dosHome =
     {
-        const uint MAGIC    = 0x00051607;
-        const uint VERSION  = 0x00010000;
-        const uint VERSION2 = 0x00020000;
-        readonly byte[] _dosHome =
+        0x4D, 0x53, 0x2D, 0x44, 0x4F, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+
+    readonly byte[] _macintoshHome =
+    {
+        0x4D, 0x61, 0x63, 0x69, 0x6E, 0x74, 0x6F, 0x73, 0x68, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+    readonly byte[] _osxHome =
+    {
+        0x4D, 0x61, 0x63, 0x20, 0x4F, 0x53, 0x20, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+    readonly byte[] _proDosHome =
+    {
+        0x50, 0x72, 0x6F, 0x44, 0x4F, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+    readonly byte[] _unixHome =
+    {
+        0x55, 0x6E, 0x69, 0x78, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+    readonly byte[] _vmsHome =
+    {
+        0x56, 0x41, 0x58, 0x20, 0x56, 0x4D, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+    Entry  _dataFork;
+    Header _header;
+    string _headerPath;
+    Entry  _rsrcFork;
+
+    /// <inheritdoc />
+    public string Name => "AppleDouble";
+    /// <inheritdoc />
+    public Guid Id => new("1B2165EE-C9DF-4B21-BBBB-9E5892B2DF4D");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public void Close() {}
+
+    /// <inheritdoc />
+    public string BasePath { get; private set; }
+
+    /// <inheritdoc />
+    public DateTime CreationTime { get; private set; }
+
+    /// <inheritdoc />
+    public long DataForkLength => _dataFork.length;
+
+    /// <inheritdoc />
+    public Stream GetDataForkStream() => new FileStream(BasePath, FileMode.Open, FileAccess.Read);
+
+    /// <inheritdoc />
+    public string Filename => System.IO.Path.GetFileName(BasePath);
+
+    /// <inheritdoc />
+    public DateTime LastWriteTime { get; private set; }
+
+    /// <inheritdoc />
+    public long Length => _dataFork.length + _rsrcFork.length;
+
+    /// <inheritdoc />
+    public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
+
+    /// <inheritdoc />
+    public string Path => BasePath;
+
+    /// <inheritdoc />
+    public long ResourceForkLength => _rsrcFork.length;
+
+    /// <inheritdoc />
+    public Stream GetResourceForkStream()
+    {
+        if(_rsrcFork.length == 0)
+            return null;
+
+        return new OffsetStream(_headerPath, FileMode.Open, FileAccess.Read, _rsrcFork.offset,
+                                _rsrcFork.offset + _rsrcFork.length - 1);
+    }
+
+    /// <inheritdoc />
+    public bool HasResourceFork => _rsrcFork.length > 0;
+
+    /// <inheritdoc />
+    public bool Identify(byte[] buffer) => false;
+
+    /// <inheritdoc />
+    public bool Identify(Stream stream) => false;
+
+    /// <inheritdoc />
+    public bool Identify(string path)
+    {
+        string filename      = System.IO.Path.GetFileName(path);
+        string filenameNoExt = System.IO.Path.GetFileNameWithoutExtension(path);
+        string parentFolder  = System.IO.Path.GetDirectoryName(path);
+
+        parentFolder ??= "";
+
+        if(filename is null ||
+           filenameNoExt is null)
+            return false;
+
+        // Prepend data fork name with "R."
+        string proDosAppleDouble = System.IO.Path.Combine(parentFolder, "R." + filename);
+
+        // Prepend data fork name with '%'
+        string unixAppleDouble = System.IO.Path.Combine(parentFolder, "%" + filename);
+
+        // Change file extension to ADF
+        string dosAppleDouble = System.IO.Path.Combine(parentFolder, filenameNoExt + ".ADF");
+
+        // Change file extension to adf
+        string dosAppleDoubleLower = System.IO.Path.Combine(parentFolder, filenameNoExt + ".adf");
+
+        // Store AppleDouble header file in ".AppleDouble" folder with same name
+        string netatalkAppleDouble = System.IO.Path.Combine(parentFolder, ".AppleDouble", filename);
+
+        // Store AppleDouble header file in "resource.frk" folder with same name
+        string daveAppleDouble = System.IO.Path.Combine(parentFolder, "resource.frk", filename);
+
+        // Prepend data fork name with "._"
+        string osxAppleDouble = System.IO.Path.Combine(parentFolder, "._" + filename);
+
+        // Adds ".rsrc" extension
+        string unArAppleDouble = System.IO.Path.Combine(parentFolder, filename + ".rsrc");
+
+        // Check AppleDouble created by A/UX in ProDOS filesystem
+        if(File.Exists(proDosAppleDouble))
         {
-            0x4D, 0x53, 0x2D, 0x44, 0x4F, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
+            var prodosStream = new FileStream(proDosAppleDouble, FileMode.Open, FileAccess.Read);
 
-        readonly byte[] _macintoshHome =
-        {
-            0x4D, 0x61, 0x63, 0x69, 0x6E, 0x74, 0x6F, 0x73, 0x68, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
-        readonly byte[] _osxHome =
-        {
-            0x4D, 0x61, 0x63, 0x20, 0x4F, 0x53, 0x20, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
-        readonly byte[] _proDosHome =
-        {
-            0x50, 0x72, 0x6F, 0x44, 0x4F, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
-        readonly byte[] _unixHome =
-        {
-            0x55, 0x6E, 0x69, 0x78, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
-        readonly byte[] _vmsHome =
-        {
-            0x56, 0x41, 0x58, 0x20, 0x56, 0x4D, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
-        Entry  _dataFork;
-        Header _header;
-        string _headerPath;
-        Entry  _rsrcFork;
+            if(prodosStream.Length > 26)
+            {
+                byte[] prodosB = new byte[26];
+                prodosStream.Read(prodosB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(prodosB);
+                prodosStream.Close();
 
-        /// <inheritdoc />
-        public string Name => "AppleDouble";
-        /// <inheritdoc />
-        public Guid Id => new("1B2165EE-C9DF-4B21-BBBB-9E5892B2DF4D");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public void Close() {}
-
-        /// <inheritdoc />
-        public string BasePath { get; private set; }
-
-        /// <inheritdoc />
-        public DateTime CreationTime { get; private set; }
-
-        /// <inheritdoc />
-        public long DataForkLength => _dataFork.length;
-
-        /// <inheritdoc />
-        public Stream GetDataForkStream() => new FileStream(BasePath, FileMode.Open, FileAccess.Read);
-
-        /// <inheritdoc />
-        public string Filename => System.IO.Path.GetFileName(BasePath);
-
-        /// <inheritdoc />
-        public DateTime LastWriteTime { get; private set; }
-
-        /// <inheritdoc />
-        public long Length => _dataFork.length + _rsrcFork.length;
-
-        /// <inheritdoc />
-        public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
-
-        /// <inheritdoc />
-        public string Path => BasePath;
-
-        /// <inheritdoc />
-        public long ResourceForkLength => _rsrcFork.length;
-
-        /// <inheritdoc />
-        public Stream GetResourceForkStream()
-        {
-            if(_rsrcFork.length == 0)
-                return null;
-
-            return new OffsetStream(_headerPath, FileMode.Open, FileAccess.Read, _rsrcFork.offset,
-                                    _rsrcFork.offset + _rsrcFork.length - 1);
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    return true;
+            }
         }
 
-        /// <inheritdoc />
-        public bool HasResourceFork => _rsrcFork.length > 0;
-
-        /// <inheritdoc />
-        public bool Identify(byte[] buffer) => false;
-
-        /// <inheritdoc />
-        public bool Identify(Stream stream) => false;
-
-        /// <inheritdoc />
-        public bool Identify(string path)
+        // Check AppleDouble created by A/UX in UFS filesystem
+        if(File.Exists(unixAppleDouble))
         {
-            string filename      = System.IO.Path.GetFileName(path);
-            string filenameNoExt = System.IO.Path.GetFileNameWithoutExtension(path);
-            string parentFolder  = System.IO.Path.GetDirectoryName(path);
+            var unixStream = new FileStream(unixAppleDouble, FileMode.Open, FileAccess.Read);
 
-            parentFolder ??= "";
-
-            if(filename is null ||
-               filenameNoExt is null)
-                return false;
-
-            // Prepend data fork name with "R."
-            string proDosAppleDouble = System.IO.Path.Combine(parentFolder, "R." + filename);
-
-            // Prepend data fork name with '%'
-            string unixAppleDouble = System.IO.Path.Combine(parentFolder, "%" + filename);
-
-            // Change file extension to ADF
-            string dosAppleDouble = System.IO.Path.Combine(parentFolder, filenameNoExt + ".ADF");
-
-            // Change file extension to adf
-            string dosAppleDoubleLower = System.IO.Path.Combine(parentFolder, filenameNoExt + ".adf");
-
-            // Store AppleDouble header file in ".AppleDouble" folder with same name
-            string netatalkAppleDouble = System.IO.Path.Combine(parentFolder, ".AppleDouble", filename);
-
-            // Store AppleDouble header file in "resource.frk" folder with same name
-            string daveAppleDouble = System.IO.Path.Combine(parentFolder, "resource.frk", filename);
-
-            // Prepend data fork name with "._"
-            string osxAppleDouble = System.IO.Path.Combine(parentFolder, "._" + filename);
-
-            // Adds ".rsrc" extension
-            string unArAppleDouble = System.IO.Path.Combine(parentFolder, filename + ".rsrc");
-
-            // Check AppleDouble created by A/UX in ProDOS filesystem
-            if(File.Exists(proDosAppleDouble))
+            if(unixStream.Length > 26)
             {
-                var prodosStream = new FileStream(proDosAppleDouble, FileMode.Open, FileAccess.Read);
+                byte[] unixB = new byte[26];
+                unixStream.Read(unixB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(unixB);
+                unixStream.Close();
 
-                if(prodosStream.Length > 26)
-                {
-                    byte[] prodosB = new byte[26];
-                    prodosStream.Read(prodosB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(prodosB);
-                    prodosStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        return true;
-                }
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    return true;
             }
+        }
 
-            // Check AppleDouble created by A/UX in UFS filesystem
-            if(File.Exists(unixAppleDouble))
+        // Check AppleDouble created by A/UX in FAT filesystem
+        if(File.Exists(dosAppleDouble))
+        {
+            var dosStream = new FileStream(dosAppleDouble, FileMode.Open, FileAccess.Read);
+
+            if(dosStream.Length > 26)
             {
-                var unixStream = new FileStream(unixAppleDouble, FileMode.Open, FileAccess.Read);
+                byte[] dosB = new byte[26];
+                dosStream.Read(dosB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(dosB);
+                dosStream.Close();
 
-                if(unixStream.Length > 26)
-                {
-                    byte[] unixB = new byte[26];
-                    unixStream.Read(unixB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(unixB);
-                    unixStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        return true;
-                }
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    return true;
             }
+        }
 
-            // Check AppleDouble created by A/UX in FAT filesystem
-            if(File.Exists(dosAppleDouble))
+        // Check AppleDouble created by A/UX in case preserving FAT filesystem
+        if(File.Exists(dosAppleDoubleLower))
+        {
+            var doslStream = new FileStream(dosAppleDoubleLower, FileMode.Open, FileAccess.Read);
+
+            if(doslStream.Length > 26)
             {
-                var dosStream = new FileStream(dosAppleDouble, FileMode.Open, FileAccess.Read);
+                byte[] doslB = new byte[26];
+                doslStream.Read(doslB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(doslB);
+                doslStream.Close();
 
-                if(dosStream.Length > 26)
-                {
-                    byte[] dosB = new byte[26];
-                    dosStream.Read(dosB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(dosB);
-                    dosStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        return true;
-                }
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    return true;
             }
+        }
 
-            // Check AppleDouble created by A/UX in case preserving FAT filesystem
-            if(File.Exists(dosAppleDoubleLower))
+        // Check AppleDouble created by Netatalk
+        if(File.Exists(netatalkAppleDouble))
+        {
+            var netatalkStream = new FileStream(netatalkAppleDouble, FileMode.Open, FileAccess.Read);
+
+            if(netatalkStream.Length > 26)
             {
-                var doslStream = new FileStream(dosAppleDoubleLower, FileMode.Open, FileAccess.Read);
+                byte[] netatalkB = new byte[26];
+                netatalkStream.Read(netatalkB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(netatalkB);
+                netatalkStream.Close();
 
-                if(doslStream.Length > 26)
-                {
-                    byte[] doslB = new byte[26];
-                    doslStream.Read(doslB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(doslB);
-                    doslStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        return true;
-                }
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    return true;
             }
+        }
 
-            // Check AppleDouble created by Netatalk
-            if(File.Exists(netatalkAppleDouble))
+        // Check AppleDouble created by DAVE
+        if(File.Exists(daveAppleDouble))
+        {
+            var daveStream = new FileStream(daveAppleDouble, FileMode.Open, FileAccess.Read);
+
+            if(daveStream.Length > 26)
             {
-                var netatalkStream = new FileStream(netatalkAppleDouble, FileMode.Open, FileAccess.Read);
+                byte[] daveB = new byte[26];
+                daveStream.Read(daveB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(daveB);
+                daveStream.Close();
 
-                if(netatalkStream.Length > 26)
-                {
-                    byte[] netatalkB = new byte[26];
-                    netatalkStream.Read(netatalkB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(netatalkB);
-                    netatalkStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        return true;
-                }
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    return true;
             }
+        }
 
-            // Check AppleDouble created by DAVE
-            if(File.Exists(daveAppleDouble))
+        // Check AppleDouble created by Mac OS X
+        if(File.Exists(osxAppleDouble))
+        {
+            var osxStream = new FileStream(osxAppleDouble, FileMode.Open, FileAccess.Read);
+
+            if(osxStream.Length > 26)
             {
-                var daveStream = new FileStream(daveAppleDouble, FileMode.Open, FileAccess.Read);
+                byte[] osxB = new byte[26];
+                osxStream.Read(osxB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(osxB);
+                osxStream.Close();
 
-                if(daveStream.Length > 26)
-                {
-                    byte[] daveB = new byte[26];
-                    daveStream.Read(daveB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(daveB);
-                    daveStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        return true;
-                }
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    return true;
             }
+        }
 
-            // Check AppleDouble created by Mac OS X
-            if(File.Exists(osxAppleDouble))
+        // Check AppleDouble created by UnAr (from The Unarchiver)
+        if(!File.Exists(unArAppleDouble))
+            return false;
+
+        var unarStream = new FileStream(unArAppleDouble, FileMode.Open, FileAccess.Read);
+
+        if(unarStream.Length <= 26)
+            return false;
+
+        byte[] unarB = new byte[26];
+        unarStream.Read(unarB, 0, 26);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(unarB);
+        unarStream.Close();
+
+        return _header.magic == MAGIC && (_header.version == VERSION || _header.version == VERSION2);
+    }
+
+    // Now way to have two files in a single byte array
+    /// <inheritdoc />
+    public ErrorNumber Open(byte[] buffer) => ErrorNumber.NotSupported;
+
+    // Now way to have two files in a single stream
+    /// <inheritdoc />
+    public ErrorNumber Open(Stream stream) => ErrorNumber.NotSupported;
+
+    /// <inheritdoc />
+    public ErrorNumber Open(string path)
+    {
+        string filename      = System.IO.Path.GetFileName(path);
+        string filenameNoExt = System.IO.Path.GetFileNameWithoutExtension(path);
+        string parentFolder  = System.IO.Path.GetDirectoryName(path);
+
+        parentFolder ??= "";
+
+        if(filename is null ||
+           filenameNoExt is null)
+            return ErrorNumber.InvalidArgument;
+
+        // Prepend data fork name with "R."
+        string proDosAppleDouble = System.IO.Path.Combine(parentFolder, "R." + filename);
+
+        // Prepend data fork name with '%'
+        string unixAppleDouble = System.IO.Path.Combine(parentFolder, "%" + filename);
+
+        // Change file extension to ADF
+        string dosAppleDouble = System.IO.Path.Combine(parentFolder, filenameNoExt + ".ADF");
+
+        // Change file extension to adf
+        string dosAppleDoubleLower = System.IO.Path.Combine(parentFolder, filenameNoExt + ".adf");
+
+        // Store AppleDouble header file in ".AppleDouble" folder with same name
+        string netatalkAppleDouble = System.IO.Path.Combine(parentFolder, ".AppleDouble", filename);
+
+        // Store AppleDouble header file in "resource.frk" folder with same name
+        string daveAppleDouble = System.IO.Path.Combine(parentFolder, "resource.frk", filename);
+
+        // Prepend data fork name with "._"
+        string osxAppleDouble = System.IO.Path.Combine(parentFolder, "._" + filename);
+
+        // Adds ".rsrc" extension
+        string unArAppleDouble = System.IO.Path.Combine(parentFolder, filename + ".rsrc");
+
+        // Check AppleDouble created by A/UX in ProDOS filesystem
+        if(File.Exists(proDosAppleDouble))
+        {
+            var prodosStream = new FileStream(proDosAppleDouble, FileMode.Open, FileAccess.Read);
+
+            if(prodosStream.Length > 26)
             {
-                var osxStream = new FileStream(osxAppleDouble, FileMode.Open, FileAccess.Read);
+                byte[] prodosB = new byte[26];
+                prodosStream.Read(prodosB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(prodosB);
+                prodosStream.Close();
 
-                if(osxStream.Length > 26)
-                {
-                    byte[] osxB = new byte[26];
-                    osxStream.Read(osxB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(osxB);
-                    osxStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        return true;
-                }
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    _headerPath = proDosAppleDouble;
             }
+        }
 
-            // Check AppleDouble created by UnAr (from The Unarchiver)
-            if(!File.Exists(unArAppleDouble))
-                return false;
+        // Check AppleDouble created by A/UX in UFS filesystem
+        if(File.Exists(unixAppleDouble))
+        {
+            var unixStream = new FileStream(unixAppleDouble, FileMode.Open, FileAccess.Read);
 
+            if(unixStream.Length > 26)
+            {
+                byte[] unixB = new byte[26];
+                unixStream.Read(unixB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(unixB);
+                unixStream.Close();
+
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    _headerPath = unixAppleDouble;
+            }
+        }
+
+        // Check AppleDouble created by A/UX in FAT filesystem
+        if(File.Exists(dosAppleDouble))
+        {
+            var dosStream = new FileStream(dosAppleDouble, FileMode.Open, FileAccess.Read);
+
+            if(dosStream.Length > 26)
+            {
+                byte[] dosB = new byte[26];
+                dosStream.Read(dosB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(dosB);
+                dosStream.Close();
+
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    _headerPath = dosAppleDouble;
+            }
+        }
+
+        // Check AppleDouble created by A/UX in case preserving FAT filesystem
+        if(File.Exists(dosAppleDoubleLower))
+        {
+            var doslStream = new FileStream(dosAppleDoubleLower, FileMode.Open, FileAccess.Read);
+
+            if(doslStream.Length > 26)
+            {
+                byte[] doslB = new byte[26];
+                doslStream.Read(doslB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(doslB);
+                doslStream.Close();
+
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    _headerPath = dosAppleDoubleLower;
+            }
+        }
+
+        // Check AppleDouble created by Netatalk
+        if(File.Exists(netatalkAppleDouble))
+        {
+            var netatalkStream = new FileStream(netatalkAppleDouble, FileMode.Open, FileAccess.Read);
+
+            if(netatalkStream.Length > 26)
+            {
+                byte[] netatalkB = new byte[26];
+                netatalkStream.Read(netatalkB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(netatalkB);
+                netatalkStream.Close();
+
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    _headerPath = netatalkAppleDouble;
+            }
+        }
+
+        // Check AppleDouble created by DAVE
+        if(File.Exists(daveAppleDouble))
+        {
+            var daveStream = new FileStream(daveAppleDouble, FileMode.Open, FileAccess.Read);
+
+            if(daveStream.Length > 26)
+            {
+                byte[] daveB = new byte[26];
+                daveStream.Read(daveB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(daveB);
+                daveStream.Close();
+
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    _headerPath = daveAppleDouble;
+            }
+        }
+
+        // Check AppleDouble created by Mac OS X
+        if(File.Exists(osxAppleDouble))
+        {
+            var osxStream = new FileStream(osxAppleDouble, FileMode.Open, FileAccess.Read);
+
+            if(osxStream.Length > 26)
+            {
+                byte[] osxB = new byte[26];
+                osxStream.Read(osxB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(osxB);
+                osxStream.Close();
+
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    _headerPath = osxAppleDouble;
+            }
+        }
+
+        // Check AppleDouble created by UnAr (from The Unarchiver)
+        if(File.Exists(unArAppleDouble))
+        {
             var unarStream = new FileStream(unArAppleDouble, FileMode.Open, FileAccess.Read);
 
-            if(unarStream.Length <= 26)
-                return false;
+            if(unarStream.Length > 26)
+            {
+                byte[] unarB = new byte[26];
+                unarStream.Read(unarB, 0, 26);
+                _header = Marshal.ByteArrayToStructureBigEndian<Header>(unarB);
+                unarStream.Close();
 
-            byte[] unarB = new byte[26];
-            unarStream.Read(unarB, 0, 26);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(unarB);
-            unarStream.Close();
-
-            return _header.magic == MAGIC && (_header.version == VERSION || _header.version == VERSION2);
+                if(_header.magic == MAGIC &&
+                   (_header.version == VERSION || _header.version == VERSION2))
+                    _headerPath = unArAppleDouble;
+            }
         }
 
-        // Now way to have two files in a single byte array
-        /// <inheritdoc />
-        public ErrorNumber Open(byte[] buffer) => ErrorNumber.NotSupported;
+        // TODO: More appropriate error
+        if(_headerPath is null)
+            return ErrorNumber.NotSupported;
 
-        // Now way to have two files in a single stream
-        /// <inheritdoc />
-        public ErrorNumber Open(Stream stream) => ErrorNumber.NotSupported;
+        var fs = new FileStream(_headerPath, FileMode.Open, FileAccess.Read);
+        fs.Seek(0, SeekOrigin.Begin);
 
-        /// <inheritdoc />
-        public ErrorNumber Open(string path)
+        byte[] hdrB = new byte[26];
+        fs.Read(hdrB, 0, 26);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+
+        Entry[] entries = new Entry[_header.entries];
+
+        for(int i = 0; i < _header.entries; i++)
         {
-            string filename      = System.IO.Path.GetFileName(path);
-            string filenameNoExt = System.IO.Path.GetFileNameWithoutExtension(path);
-            string parentFolder  = System.IO.Path.GetDirectoryName(path);
-
-            parentFolder ??= "";
-
-            if(filename is null ||
-               filenameNoExt is null)
-                return ErrorNumber.InvalidArgument;
-
-            // Prepend data fork name with "R."
-            string proDosAppleDouble = System.IO.Path.Combine(parentFolder, "R." + filename);
-
-            // Prepend data fork name with '%'
-            string unixAppleDouble = System.IO.Path.Combine(parentFolder, "%" + filename);
-
-            // Change file extension to ADF
-            string dosAppleDouble = System.IO.Path.Combine(parentFolder, filenameNoExt + ".ADF");
-
-            // Change file extension to adf
-            string dosAppleDoubleLower = System.IO.Path.Combine(parentFolder, filenameNoExt + ".adf");
-
-            // Store AppleDouble header file in ".AppleDouble" folder with same name
-            string netatalkAppleDouble = System.IO.Path.Combine(parentFolder, ".AppleDouble", filename);
-
-            // Store AppleDouble header file in "resource.frk" folder with same name
-            string daveAppleDouble = System.IO.Path.Combine(parentFolder, "resource.frk", filename);
-
-            // Prepend data fork name with "._"
-            string osxAppleDouble = System.IO.Path.Combine(parentFolder, "._" + filename);
-
-            // Adds ".rsrc" extension
-            string unArAppleDouble = System.IO.Path.Combine(parentFolder, filename + ".rsrc");
-
-            // Check AppleDouble created by A/UX in ProDOS filesystem
-            if(File.Exists(proDosAppleDouble))
-            {
-                var prodosStream = new FileStream(proDosAppleDouble, FileMode.Open, FileAccess.Read);
-
-                if(prodosStream.Length > 26)
-                {
-                    byte[] prodosB = new byte[26];
-                    prodosStream.Read(prodosB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(prodosB);
-                    prodosStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        _headerPath = proDosAppleDouble;
-                }
-            }
-
-            // Check AppleDouble created by A/UX in UFS filesystem
-            if(File.Exists(unixAppleDouble))
-            {
-                var unixStream = new FileStream(unixAppleDouble, FileMode.Open, FileAccess.Read);
-
-                if(unixStream.Length > 26)
-                {
-                    byte[] unixB = new byte[26];
-                    unixStream.Read(unixB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(unixB);
-                    unixStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        _headerPath = unixAppleDouble;
-                }
-            }
-
-            // Check AppleDouble created by A/UX in FAT filesystem
-            if(File.Exists(dosAppleDouble))
-            {
-                var dosStream = new FileStream(dosAppleDouble, FileMode.Open, FileAccess.Read);
-
-                if(dosStream.Length > 26)
-                {
-                    byte[] dosB = new byte[26];
-                    dosStream.Read(dosB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(dosB);
-                    dosStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        _headerPath = dosAppleDouble;
-                }
-            }
-
-            // Check AppleDouble created by A/UX in case preserving FAT filesystem
-            if(File.Exists(dosAppleDoubleLower))
-            {
-                var doslStream = new FileStream(dosAppleDoubleLower, FileMode.Open, FileAccess.Read);
-
-                if(doslStream.Length > 26)
-                {
-                    byte[] doslB = new byte[26];
-                    doslStream.Read(doslB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(doslB);
-                    doslStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        _headerPath = dosAppleDoubleLower;
-                }
-            }
-
-            // Check AppleDouble created by Netatalk
-            if(File.Exists(netatalkAppleDouble))
-            {
-                var netatalkStream = new FileStream(netatalkAppleDouble, FileMode.Open, FileAccess.Read);
-
-                if(netatalkStream.Length > 26)
-                {
-                    byte[] netatalkB = new byte[26];
-                    netatalkStream.Read(netatalkB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(netatalkB);
-                    netatalkStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        _headerPath = netatalkAppleDouble;
-                }
-            }
-
-            // Check AppleDouble created by DAVE
-            if(File.Exists(daveAppleDouble))
-            {
-                var daveStream = new FileStream(daveAppleDouble, FileMode.Open, FileAccess.Read);
-
-                if(daveStream.Length > 26)
-                {
-                    byte[] daveB = new byte[26];
-                    daveStream.Read(daveB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(daveB);
-                    daveStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        _headerPath = daveAppleDouble;
-                }
-            }
-
-            // Check AppleDouble created by Mac OS X
-            if(File.Exists(osxAppleDouble))
-            {
-                var osxStream = new FileStream(osxAppleDouble, FileMode.Open, FileAccess.Read);
-
-                if(osxStream.Length > 26)
-                {
-                    byte[] osxB = new byte[26];
-                    osxStream.Read(osxB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(osxB);
-                    osxStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        _headerPath = osxAppleDouble;
-                }
-            }
-
-            // Check AppleDouble created by UnAr (from The Unarchiver)
-            if(File.Exists(unArAppleDouble))
-            {
-                var unarStream = new FileStream(unArAppleDouble, FileMode.Open, FileAccess.Read);
-
-                if(unarStream.Length > 26)
-                {
-                    byte[] unarB = new byte[26];
-                    unarStream.Read(unarB, 0, 26);
-                    _header = Marshal.ByteArrayToStructureBigEndian<Header>(unarB);
-                    unarStream.Close();
-
-                    if(_header.magic == MAGIC &&
-                       (_header.version == VERSION || _header.version == VERSION2))
-                        _headerPath = unArAppleDouble;
-                }
-            }
-
-            // TODO: More appropriate error
-            if(_headerPath is null)
-                return ErrorNumber.NotSupported;
-
-            var fs = new FileStream(_headerPath, FileMode.Open, FileAccess.Read);
-            fs.Seek(0, SeekOrigin.Begin);
-
-            byte[] hdrB = new byte[26];
-            fs.Read(hdrB, 0, 26);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
-
-            Entry[] entries = new Entry[_header.entries];
-
-            for(int i = 0; i < _header.entries; i++)
-            {
-                byte[] entry = new byte[12];
-                fs.Read(entry, 0, 12);
-                entries[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(entry);
-            }
-
-            CreationTime  = DateTime.UtcNow;
-            LastWriteTime = CreationTime;
-
-            foreach(Entry entry in entries)
-                switch((EntryId)entry.id)
-                {
-                    case EntryId.DataFork:
-                        // AppleDouble have datafork in separated file
-                        break;
-                    case EntryId.FileDates:
-                        fs.Seek(entry.offset, SeekOrigin.Begin);
-                        byte[] datesB = new byte[16];
-                        fs.Read(datesB, 0, 16);
-
-                        FileDates dates = Marshal.ByteArrayToStructureBigEndian<FileDates>(datesB);
-
-                        CreationTime  = DateHandlers.UnixUnsignedToDateTime(dates.creationDate);
-                        LastWriteTime = DateHandlers.UnixUnsignedToDateTime(dates.modificationDate);
-
-                        break;
-                    case EntryId.FileInfo:
-                        fs.Seek(entry.offset, SeekOrigin.Begin);
-                        byte[] finfo = new byte[entry.length];
-                        fs.Read(finfo, 0, finfo.Length);
-
-                        if(_macintoshHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian<MacFileInfo>(finfo);
-
-                            CreationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
-                            LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
-                        }
-                        else if(_proDosHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian<ProDOSFileInfo>(finfo);
-
-                            CreationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
-                            LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
-                        }
-                        else if(_unixHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian<UnixFileInfo>(finfo);
-
-                            CreationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
-                            LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
-                        }
-                        else if(_dosHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian<DOSFileInfo>(finfo);
-
-                            LastWriteTime =
-                                DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
-                        }
-
-                        break;
-                    case EntryId.ResourceFork:
-                        _rsrcFork = entry;
-
-                        break;
-                }
-
-            _dataFork = new Entry
-            {
-                id = (uint)EntryId.DataFork
-            };
-
-            if(File.Exists(path))
-            {
-                var dataFs = new FileStream(path, FileMode.Open, FileAccess.Read);
-                _dataFork.length = (uint)dataFs.Length;
-                dataFs.Close();
-            }
-
-            fs.Close();
-            BasePath = path;
-
-            return ErrorNumber.NoError;
+            byte[] entry = new byte[12];
+            fs.Read(entry, 0, 12);
+            entries[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(entry);
         }
 
-        enum EntryId : uint
+        CreationTime  = DateTime.UtcNow;
+        LastWriteTime = CreationTime;
+
+        foreach(Entry entry in entries)
+            switch((EntryId)entry.id)
+            {
+                case EntryId.DataFork:
+                    // AppleDouble have datafork in separated file
+                    break;
+                case EntryId.FileDates:
+                    fs.Seek(entry.offset, SeekOrigin.Begin);
+                    byte[] datesB = new byte[16];
+                    fs.Read(datesB, 0, 16);
+
+                    FileDates dates = Marshal.ByteArrayToStructureBigEndian<FileDates>(datesB);
+
+                    CreationTime  = DateHandlers.UnixUnsignedToDateTime(dates.creationDate);
+                    LastWriteTime = DateHandlers.UnixUnsignedToDateTime(dates.modificationDate);
+
+                    break;
+                case EntryId.FileInfo:
+                    fs.Seek(entry.offset, SeekOrigin.Begin);
+                    byte[] finfo = new byte[entry.length];
+                    fs.Read(finfo, 0, finfo.Length);
+
+                    if(_macintoshHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian<MacFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
+                        LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
+                    }
+                    else if(_proDosHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian<ProDOSFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
+                        LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
+                    }
+                    else if(_unixHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian<UnixFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
+                        LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
+                    }
+                    else if(_dosHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian<DOSFileInfo>(finfo);
+
+                        LastWriteTime =
+                            DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
+                    }
+
+                    break;
+                case EntryId.ResourceFork:
+                    _rsrcFork = entry;
+
+                    break;
+            }
+
+        _dataFork = new Entry
         {
-            Invalid     = 0, DataFork    = 1, ResourceFork    = 2,
-            RealName    = 3, Comment     = 4, Icon            = 5,
-            ColorIcon   = 6, FileInfo    = 7, FileDates       = 8,
-            FinderInfo  = 9, MacFileInfo = 10, ProDOSFileInfo = 11,
-            DOSFileInfo = 12, ShortName  = 13, AfpFileInfo    = 14,
-            DirectoryID = 15
+            id = (uint)EntryId.DataFork
+        };
+
+        if(File.Exists(path))
+        {
+            var dataFs = new FileStream(path, FileMode.Open, FileAccess.Read);
+            _dataFork.length = (uint)dataFs.Length;
+            dataFs.Close();
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Header
-        {
-            public readonly uint magic;
-            public readonly uint version;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] homeFilesystem;
-            public readonly ushort entries;
-        }
+        fs.Close();
+        BasePath = path;
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Entry
-        {
-            public          uint id;
-            public readonly uint offset;
-            public          uint length;
-        }
+        return ErrorNumber.NoError;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct FileDates
-        {
-            public readonly uint creationDate;
-            public readonly uint modificationDate;
-            public readonly uint backupDate;
-            public readonly uint accessDate;
-        }
+    enum EntryId : uint
+    {
+        Invalid     = 0, DataFork    = 1, ResourceFork    = 2,
+        RealName    = 3, Comment     = 4, Icon            = 5,
+        ColorIcon   = 6, FileInfo    = 7, FileDates       = 8,
+        FinderInfo  = 9, MacFileInfo = 10, ProDOSFileInfo = 11,
+        DOSFileInfo = 12, ShortName  = 13, AfpFileInfo    = 14,
+        DirectoryID = 15
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MacFileInfo
-        {
-            public readonly uint creationDate;
-            public readonly uint modificationDate;
-            public readonly uint backupDate;
-            public readonly uint accessDate;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Header
+    {
+        public readonly uint magic;
+        public readonly uint version;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] homeFilesystem;
+        public readonly ushort entries;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct UnixFileInfo
-        {
-            public readonly uint creationDate;
-            public readonly uint accessDate;
-            public readonly uint modificationDate;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Entry
+    {
+        public          uint id;
+        public readonly uint offset;
+        public          uint length;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DOSFileInfo
-        {
-            public readonly ushort modificationDate;
-            public readonly ushort modificationTime;
-            public readonly ushort attributes;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct FileDates
+    {
+        public readonly uint creationDate;
+        public readonly uint modificationDate;
+        public readonly uint backupDate;
+        public readonly uint accessDate;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ProDOSFileInfo
-        {
-            public readonly uint   creationDate;
-            public readonly uint   modificationDate;
-            public readonly uint   backupDate;
-            public readonly ushort access;
-            public readonly ushort fileType;
-            public readonly uint   auxType;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MacFileInfo
+    {
+        public readonly uint creationDate;
+        public readonly uint modificationDate;
+        public readonly uint backupDate;
+        public readonly uint accessDate;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct UnixFileInfo
+    {
+        public readonly uint creationDate;
+        public readonly uint accessDate;
+        public readonly uint modificationDate;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DOSFileInfo
+    {
+        public readonly ushort modificationDate;
+        public readonly ushort modificationTime;
+        public readonly ushort attributes;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ProDOSFileInfo
+    {
+        public readonly uint   creationDate;
+        public readonly uint   modificationDate;
+        public readonly uint   backupDate;
+        public readonly ushort access;
+        public readonly ushort fileType;
+        public readonly uint   auxType;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filters/AppleSingle.cs b/Aaru.Filters/AppleSingle.cs
index e92da6338..b9e8a1a57 100644
--- a/Aaru.Filters/AppleSingle.cs
+++ b/Aaru.Filters/AppleSingle.cs
@@ -40,516 +40,515 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+/// <inheritdoc />
+/// <summary>Decodes AppleSingle files</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class AppleSingle : IFilter
 {
-    /// <inheritdoc />
-    /// <summary>Decodes AppleSingle files</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class AppleSingle : IFilter
+    const uint MAGIC    = 0x00051600;
+    const uint VERSION  = 0x00010000;
+    const uint VERSION2 = 0x00020000;
+    readonly byte[] _dosHome =
     {
-        const uint MAGIC    = 0x00051600;
-        const uint VERSION  = 0x00010000;
-        const uint VERSION2 = 0x00020000;
-        readonly byte[] _dosHome =
-        {
-            0x4D, 0x53, 0x2D, 0x44, 0x4F, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
+        0x4D, 0x53, 0x2D, 0x44, 0x4F, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
 
-        readonly byte[] _macintoshHome =
-        {
-            0x4D, 0x61, 0x63, 0x69, 0x6E, 0x74, 0x6F, 0x73, 0x68, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
-        readonly byte[] _osxHome =
-        {
-            0x4D, 0x61, 0x63, 0x20, 0x4F, 0x53, 0x20, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
-        readonly byte[] _proDosHome =
-        {
-            0x50, 0x72, 0x6F, 0x44, 0x4F, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
-        readonly byte[] _unixHome =
-        {
-            0x55, 0x6E, 0x69, 0x78, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
-        readonly byte[] _vmsHome =
-        {
-            0x56, 0x41, 0x58, 0x20, 0x56, 0x4D, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
-        };
-        byte[] _bytes;
-        Entry  _dataFork;
-        Header _header;
-        bool   _isBytes, _isStream, _isPath;
-        Entry  _rsrcFork;
-        Stream _stream;
+    readonly byte[] _macintoshHome =
+    {
+        0x4D, 0x61, 0x63, 0x69, 0x6E, 0x74, 0x6F, 0x73, 0x68, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+    readonly byte[] _osxHome =
+    {
+        0x4D, 0x61, 0x63, 0x20, 0x4F, 0x53, 0x20, 0x58, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+    readonly byte[] _proDosHome =
+    {
+        0x50, 0x72, 0x6F, 0x44, 0x4F, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+    readonly byte[] _unixHome =
+    {
+        0x55, 0x6E, 0x69, 0x78, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+    readonly byte[] _vmsHome =
+    {
+        0x56, 0x41, 0x58, 0x20, 0x56, 0x4D, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20
+    };
+    byte[] _bytes;
+    Entry  _dataFork;
+    Header _header;
+    bool   _isBytes, _isStream, _isPath;
+    Entry  _rsrcFork;
+    Stream _stream;
 
-        /// <inheritdoc />
-        public string Name => "AppleSingle";
-        /// <inheritdoc />
-        public Guid Id => new("A69B20E8-F4D3-42BB-BD2B-4A7263394A05");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Name => "AppleSingle";
+    /// <inheritdoc />
+    public Guid Id => new("A69B20E8-F4D3-42BB-BD2B-4A7263394A05");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
 
-        /// <inheritdoc />
-        public void Close()
-        {
-            _bytes = null;
-            _stream?.Close();
-            _isBytes  = false;
-            _isStream = false;
-            _isPath   = false;
-        }
+    /// <inheritdoc />
+    public void Close()
+    {
+        _bytes = null;
+        _stream?.Close();
+        _isBytes  = false;
+        _isStream = false;
+        _isPath   = false;
+    }
 
-        /// <inheritdoc />
-        public string BasePath { get; private set; }
+    /// <inheritdoc />
+    public string BasePath { get; private set; }
 
-        /// <inheritdoc />
-        public DateTime CreationTime { get; private set; }
+    /// <inheritdoc />
+    public DateTime CreationTime { get; private set; }
 
-        /// <inheritdoc />
-        public long DataForkLength => _dataFork.length;
-
-        /// <inheritdoc />
-        public Stream GetDataForkStream()
-        {
-            if(_dataFork.length == 0)
-                return null;
-
-            if(_isBytes)
-                return new OffsetStream(_bytes, _dataFork.offset, _dataFork.offset + _dataFork.length - 1);
-
-            if(_isStream)
-                return new OffsetStream(_stream, _dataFork.offset, _dataFork.offset + _dataFork.length - 1);
-
-            if(_isPath)
-                return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _dataFork.offset,
-                                        _dataFork.offset + _dataFork.length - 1);
+    /// <inheritdoc />
+    public long DataForkLength => _dataFork.length;
 
+    /// <inheritdoc />
+    public Stream GetDataForkStream()
+    {
+        if(_dataFork.length == 0)
             return null;
-        }
 
-        /// <inheritdoc />
-        public string Filename => System.IO.Path.GetFileName(BasePath);
+        if(_isBytes)
+            return new OffsetStream(_bytes, _dataFork.offset, _dataFork.offset + _dataFork.length - 1);
 
-        /// <inheritdoc />
-        public DateTime LastWriteTime { get; private set; }
+        if(_isStream)
+            return new OffsetStream(_stream, _dataFork.offset, _dataFork.offset + _dataFork.length - 1);
 
-        /// <inheritdoc />
-        public long Length => _dataFork.length + _rsrcFork.length;
+        if(_isPath)
+            return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _dataFork.offset,
+                                    _dataFork.offset + _dataFork.length - 1);
 
-        /// <inheritdoc />
-        public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
+        return null;
+    }
 
-        /// <inheritdoc />
-        public string Path => BasePath;
+    /// <inheritdoc />
+    public string Filename => System.IO.Path.GetFileName(BasePath);
 
-        /// <inheritdoc />
-        public long ResourceForkLength => _rsrcFork.length;
+    /// <inheritdoc />
+    public DateTime LastWriteTime { get; private set; }
 
-        /// <inheritdoc />
-        public Stream GetResourceForkStream()
-        {
-            if(_rsrcFork.length == 0)
-                return null;
+    /// <inheritdoc />
+    public long Length => _dataFork.length + _rsrcFork.length;
 
-            if(_isBytes)
-                return new OffsetStream(_bytes, _rsrcFork.offset, _rsrcFork.offset + _rsrcFork.length - 1);
+    /// <inheritdoc />
+    public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
 
-            if(_isStream)
-                return new OffsetStream(_stream, _rsrcFork.offset, _rsrcFork.offset + _rsrcFork.length - 1);
+    /// <inheritdoc />
+    public string Path => BasePath;
 
-            if(_isPath)
-                return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _rsrcFork.offset,
-                                        _rsrcFork.offset + _rsrcFork.length - 1);
+    /// <inheritdoc />
+    public long ResourceForkLength => _rsrcFork.length;
 
+    /// <inheritdoc />
+    public Stream GetResourceForkStream()
+    {
+        if(_rsrcFork.length == 0)
             return null;
+
+        if(_isBytes)
+            return new OffsetStream(_bytes, _rsrcFork.offset, _rsrcFork.offset + _rsrcFork.length - 1);
+
+        if(_isStream)
+            return new OffsetStream(_stream, _rsrcFork.offset, _rsrcFork.offset + _rsrcFork.length - 1);
+
+        if(_isPath)
+            return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _rsrcFork.offset,
+                                    _rsrcFork.offset + _rsrcFork.length - 1);
+
+        return null;
+    }
+
+    /// <inheritdoc />
+    public bool HasResourceFork => _rsrcFork.length > 0;
+
+    /// <inheritdoc />
+    public bool Identify(byte[] buffer)
+    {
+        if(buffer        == null ||
+           buffer.Length < 26)
+            return false;
+
+        byte[] hdrB = new byte[26];
+        Array.Copy(buffer, 0, hdrB, 0, 26);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+
+        return _header.magic == MAGIC && (_header.version == VERSION || _header.version == VERSION2);
+    }
+
+    /// <inheritdoc />
+    public bool Identify(Stream stream)
+    {
+        if(stream        == null ||
+           stream.Length < 26)
+            return false;
+
+        byte[] hdrB = new byte[26];
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(hdrB, 0, 26);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+
+        return _header.magic == MAGIC && (_header.version == VERSION || _header.version == VERSION2);
+    }
+
+    /// <inheritdoc />
+    public bool Identify(string path)
+    {
+        if(!File.Exists(path))
+            return false;
+
+        var fstream = new FileStream(path, FileMode.Open, FileAccess.Read);
+
+        if(fstream.Length < 26)
+            return false;
+
+        byte[] hdrB = new byte[26];
+        fstream.Read(hdrB, 0, 26);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+
+        fstream.Close();
+
+        return _header.magic == MAGIC && (_header.version == VERSION || _header.version == VERSION2);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(byte[] buffer)
+    {
+        var ms = new MemoryStream(buffer);
+        ms.Seek(0, SeekOrigin.Begin);
+
+        byte[] hdrB = new byte[26];
+        ms.Read(hdrB, 0, 26);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+
+        Entry[] entries = new Entry[_header.entries];
+
+        for(int i = 0; i < _header.entries; i++)
+        {
+            byte[] entry = new byte[12];
+            ms.Read(entry, 0, 12);
+            entries[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(entry);
         }
 
-        /// <inheritdoc />
-        public bool HasResourceFork => _rsrcFork.length > 0;
+        CreationTime  = DateTime.UtcNow;
+        LastWriteTime = CreationTime;
 
-        /// <inheritdoc />
-        public bool Identify(byte[] buffer)
-        {
-            if(buffer        == null ||
-               buffer.Length < 26)
-                return false;
-
-            byte[] hdrB = new byte[26];
-            Array.Copy(buffer, 0, hdrB, 0, 26);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
-
-            return _header.magic == MAGIC && (_header.version == VERSION || _header.version == VERSION2);
-        }
-
-        /// <inheritdoc />
-        public bool Identify(Stream stream)
-        {
-            if(stream        == null ||
-               stream.Length < 26)
-                return false;
-
-            byte[] hdrB = new byte[26];
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(hdrB, 0, 26);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
-
-            return _header.magic == MAGIC && (_header.version == VERSION || _header.version == VERSION2);
-        }
-
-        /// <inheritdoc />
-        public bool Identify(string path)
-        {
-            if(!File.Exists(path))
-                return false;
-
-            var fstream = new FileStream(path, FileMode.Open, FileAccess.Read);
-
-            if(fstream.Length < 26)
-                return false;
-
-            byte[] hdrB = new byte[26];
-            fstream.Read(hdrB, 0, 26);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
-
-            fstream.Close();
-
-            return _header.magic == MAGIC && (_header.version == VERSION || _header.version == VERSION2);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(byte[] buffer)
-        {
-            var ms = new MemoryStream(buffer);
-            ms.Seek(0, SeekOrigin.Begin);
-
-            byte[] hdrB = new byte[26];
-            ms.Read(hdrB, 0, 26);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
-
-            Entry[] entries = new Entry[_header.entries];
-
-            for(int i = 0; i < _header.entries; i++)
+        foreach(Entry entry in entries)
+            switch((AppleSingleEntryID)entry.id)
             {
-                byte[] entry = new byte[12];
-                ms.Read(entry, 0, 12);
-                entries[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(entry);
+                case AppleSingleEntryID.DataFork:
+                    _dataFork = entry;
+
+                    break;
+                case AppleSingleEntryID.FileDates:
+                    ms.Seek(entry.offset, SeekOrigin.Begin);
+                    byte[] datesB = new byte[16];
+                    ms.Read(datesB, 0, 16);
+
+                    FileDates dates = Marshal.ByteArrayToStructureBigEndian<FileDates>(datesB);
+
+                    CreationTime  = DateHandlers.UnixUnsignedToDateTime(dates.creationDate);
+                    LastWriteTime = DateHandlers.UnixUnsignedToDateTime(dates.modificationDate);
+
+                    break;
+                case AppleSingleEntryID.FileInfo:
+                    ms.Seek(entry.offset, SeekOrigin.Begin);
+                    byte[] finfo = new byte[entry.length];
+                    ms.Read(finfo, 0, finfo.Length);
+
+                    if(_macintoshHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian<MacFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
+                        LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
+                    }
+                    else if(_proDosHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian<ProDOSFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
+                        LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
+                    }
+                    else if(_unixHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian<UnixFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
+                        LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
+                    }
+                    else if(_dosHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian<DOSFileInfo>(finfo);
+
+                        LastWriteTime =
+                            DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
+                    }
+
+                    break;
+                case AppleSingleEntryID.ResourceFork:
+                    _rsrcFork = entry;
+
+                    break;
             }
 
-            CreationTime  = DateTime.UtcNow;
-            LastWriteTime = CreationTime;
+        ms.Close();
+        _isBytes = true;
+        _bytes   = buffer;
 
-            foreach(Entry entry in entries)
-                switch((AppleSingleEntryID)entry.id)
-                {
-                    case AppleSingleEntryID.DataFork:
-                        _dataFork = entry;
+        return ErrorNumber.NoError;
+    }
 
-                        break;
-                    case AppleSingleEntryID.FileDates:
-                        ms.Seek(entry.offset, SeekOrigin.Begin);
-                        byte[] datesB = new byte[16];
-                        ms.Read(datesB, 0, 16);
+    /// <inheritdoc />
+    public ErrorNumber Open(Stream stream)
+    {
+        stream.Seek(0, SeekOrigin.Begin);
 
-                        FileDates dates = Marshal.ByteArrayToStructureBigEndian<FileDates>(datesB);
+        byte[] hdrB = new byte[26];
+        stream.Read(hdrB, 0, 26);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
 
-                        CreationTime  = DateHandlers.UnixUnsignedToDateTime(dates.creationDate);
-                        LastWriteTime = DateHandlers.UnixUnsignedToDateTime(dates.modificationDate);
+        Entry[] entries = new Entry[_header.entries];
 
-                        break;
-                    case AppleSingleEntryID.FileInfo:
-                        ms.Seek(entry.offset, SeekOrigin.Begin);
-                        byte[] finfo = new byte[entry.length];
-                        ms.Read(finfo, 0, finfo.Length);
-
-                        if(_macintoshHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian<MacFileInfo>(finfo);
-
-                            CreationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
-                            LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
-                        }
-                        else if(_proDosHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian<ProDOSFileInfo>(finfo);
-
-                            CreationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
-                            LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
-                        }
-                        else if(_unixHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian<UnixFileInfo>(finfo);
-
-                            CreationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
-                            LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
-                        }
-                        else if(_dosHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian<DOSFileInfo>(finfo);
-
-                            LastWriteTime =
-                                DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
-                        }
-
-                        break;
-                    case AppleSingleEntryID.ResourceFork:
-                        _rsrcFork = entry;
-
-                        break;
-                }
-
-            ms.Close();
-            _isBytes = true;
-            _bytes   = buffer;
-
-            return ErrorNumber.NoError;
+        for(int i = 0; i < _header.entries; i++)
+        {
+            byte[] entry = new byte[12];
+            stream.Read(entry, 0, 12);
+            entries[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(entry);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Open(Stream stream)
-        {
-            stream.Seek(0, SeekOrigin.Begin);
+        CreationTime  = DateTime.UtcNow;
+        LastWriteTime = CreationTime;
 
-            byte[] hdrB = new byte[26];
-            stream.Read(hdrB, 0, 26);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
-
-            Entry[] entries = new Entry[_header.entries];
-
-            for(int i = 0; i < _header.entries; i++)
+        foreach(Entry entry in entries)
+            switch((AppleSingleEntryID)entry.id)
             {
-                byte[] entry = new byte[12];
-                stream.Read(entry, 0, 12);
-                entries[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(entry);
+                case AppleSingleEntryID.DataFork:
+                    _dataFork = entry;
+
+                    break;
+                case AppleSingleEntryID.FileDates:
+                    stream.Seek(entry.offset, SeekOrigin.Begin);
+                    byte[] datesB = new byte[16];
+                    stream.Read(datesB, 0, 16);
+
+                    FileDates dates = Marshal.ByteArrayToStructureBigEndian<FileDates>(datesB);
+
+                    CreationTime  = DateHandlers.MacToDateTime(dates.creationDate);
+                    LastWriteTime = DateHandlers.MacToDateTime(dates.modificationDate);
+
+                    break;
+                case AppleSingleEntryID.FileInfo:
+                    stream.Seek(entry.offset, SeekOrigin.Begin);
+                    byte[] finfo = new byte[entry.length];
+                    stream.Read(finfo, 0, finfo.Length);
+
+                    if(_macintoshHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian<MacFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
+                        LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
+                    }
+                    else if(_proDosHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian<ProDOSFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
+                        LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
+                    }
+                    else if(_unixHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian<UnixFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
+                        LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
+                    }
+                    else if(_dosHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian<DOSFileInfo>(finfo);
+
+                        LastWriteTime =
+                            DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
+                    }
+
+                    break;
+                case AppleSingleEntryID.ResourceFork:
+                    _rsrcFork = entry;
+
+                    break;
             }
 
-            CreationTime  = DateTime.UtcNow;
-            LastWriteTime = CreationTime;
+        stream.Seek(0, SeekOrigin.Begin);
+        _isStream = true;
+        _stream   = stream;
 
-            foreach(Entry entry in entries)
-                switch((AppleSingleEntryID)entry.id)
-                {
-                    case AppleSingleEntryID.DataFork:
-                        _dataFork = entry;
+        return ErrorNumber.NoError;
+    }
 
-                        break;
-                    case AppleSingleEntryID.FileDates:
-                        stream.Seek(entry.offset, SeekOrigin.Begin);
-                        byte[] datesB = new byte[16];
-                        stream.Read(datesB, 0, 16);
+    /// <inheritdoc />
+    public ErrorNumber Open(string path)
+    {
+        var fs = new FileStream(path, FileMode.Open, FileAccess.Read);
+        fs.Seek(0, SeekOrigin.Begin);
 
-                        FileDates dates = Marshal.ByteArrayToStructureBigEndian<FileDates>(datesB);
+        byte[] hdrB = new byte[26];
+        fs.Read(hdrB, 0, 26);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
 
-                        CreationTime  = DateHandlers.MacToDateTime(dates.creationDate);
-                        LastWriteTime = DateHandlers.MacToDateTime(dates.modificationDate);
+        Entry[] entries = new Entry[_header.entries];
 
-                        break;
-                    case AppleSingleEntryID.FileInfo:
-                        stream.Seek(entry.offset, SeekOrigin.Begin);
-                        byte[] finfo = new byte[entry.length];
-                        stream.Read(finfo, 0, finfo.Length);
-
-                        if(_macintoshHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian<MacFileInfo>(finfo);
-
-                            CreationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
-                            LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
-                        }
-                        else if(_proDosHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian<ProDOSFileInfo>(finfo);
-
-                            CreationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
-                            LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
-                        }
-                        else if(_unixHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian<UnixFileInfo>(finfo);
-
-                            CreationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
-                            LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
-                        }
-                        else if(_dosHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian<DOSFileInfo>(finfo);
-
-                            LastWriteTime =
-                                DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
-                        }
-
-                        break;
-                    case AppleSingleEntryID.ResourceFork:
-                        _rsrcFork = entry;
-
-                        break;
-                }
-
-            stream.Seek(0, SeekOrigin.Begin);
-            _isStream = true;
-            _stream   = stream;
-
-            return ErrorNumber.NoError;
+        for(int i = 0; i < _header.entries; i++)
+        {
+            byte[] entry = new byte[12];
+            fs.Read(entry, 0, 12);
+            entries[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(entry);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Open(string path)
-        {
-            var fs = new FileStream(path, FileMode.Open, FileAccess.Read);
-            fs.Seek(0, SeekOrigin.Begin);
+        CreationTime  = DateTime.UtcNow;
+        LastWriteTime = CreationTime;
 
-            byte[] hdrB = new byte[26];
-            fs.Read(hdrB, 0, 26);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
-
-            Entry[] entries = new Entry[_header.entries];
-
-            for(int i = 0; i < _header.entries; i++)
+        foreach(Entry entry in entries)
+            switch((AppleSingleEntryID)entry.id)
             {
-                byte[] entry = new byte[12];
-                fs.Read(entry, 0, 12);
-                entries[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(entry);
+                case AppleSingleEntryID.DataFork:
+                    _dataFork = entry;
+
+                    break;
+                case AppleSingleEntryID.FileDates:
+                    fs.Seek(entry.offset, SeekOrigin.Begin);
+                    byte[] datesB = new byte[16];
+                    fs.Read(datesB, 0, 16);
+
+                    FileDates dates = Marshal.ByteArrayToStructureBigEndian<FileDates>(datesB);
+
+                    CreationTime  = DateHandlers.MacToDateTime(dates.creationDate);
+                    LastWriteTime = DateHandlers.MacToDateTime(dates.modificationDate);
+
+                    break;
+                case AppleSingleEntryID.FileInfo:
+                    fs.Seek(entry.offset, SeekOrigin.Begin);
+                    byte[] finfo = new byte[entry.length];
+                    fs.Read(finfo, 0, finfo.Length);
+
+                    if(_macintoshHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian<MacFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
+                        LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
+                    }
+                    else if(_proDosHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian<ProDOSFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
+                        LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
+                    }
+                    else if(_unixHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian<UnixFileInfo>(finfo);
+
+                        CreationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
+                        LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
+                    }
+                    else if(_dosHome.SequenceEqual(_header.homeFilesystem))
+                    {
+                        DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian<DOSFileInfo>(finfo);
+
+                        LastWriteTime =
+                            DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
+                    }
+
+                    break;
+                case AppleSingleEntryID.ResourceFork:
+                    _rsrcFork = entry;
+
+                    break;
             }
 
-            CreationTime  = DateTime.UtcNow;
-            LastWriteTime = CreationTime;
+        fs.Close();
+        _isPath  = true;
+        BasePath = path;
 
-            foreach(Entry entry in entries)
-                switch((AppleSingleEntryID)entry.id)
-                {
-                    case AppleSingleEntryID.DataFork:
-                        _dataFork = entry;
+        return ErrorNumber.NoError;
+    }
 
-                        break;
-                    case AppleSingleEntryID.FileDates:
-                        fs.Seek(entry.offset, SeekOrigin.Begin);
-                        byte[] datesB = new byte[16];
-                        fs.Read(datesB, 0, 16);
+    enum AppleSingleEntryID : uint
+    {
+        Invalid     = 0, DataFork    = 1, ResourceFork    = 2,
+        RealName    = 3, Comment     = 4, Icon            = 5,
+        ColorIcon   = 6, FileInfo    = 7, FileDates       = 8,
+        FinderInfo  = 9, MacFileInfo = 10, ProDOSFileInfo = 11,
+        DOSFileInfo = 12, ShortName  = 13, AfpFileInfo    = 14,
+        DirectoryID = 15
+    }
 
-                        FileDates dates = Marshal.ByteArrayToStructureBigEndian<FileDates>(datesB);
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Header
+    {
+        public readonly uint magic;
+        public readonly uint version;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] homeFilesystem;
+        public readonly ushort entries;
+    }
 
-                        CreationTime  = DateHandlers.MacToDateTime(dates.creationDate);
-                        LastWriteTime = DateHandlers.MacToDateTime(dates.modificationDate);
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Entry
+    {
+        public readonly uint id;
+        public readonly uint offset;
+        public readonly uint length;
+    }
 
-                        break;
-                    case AppleSingleEntryID.FileInfo:
-                        fs.Seek(entry.offset, SeekOrigin.Begin);
-                        byte[] finfo = new byte[entry.length];
-                        fs.Read(finfo, 0, finfo.Length);
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct FileDates
+    {
+        public readonly uint creationDate;
+        public readonly uint modificationDate;
+        public readonly uint backupDate;
+        public readonly uint accessDate;
+    }
 
-                        if(_macintoshHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            MacFileInfo macinfo = Marshal.ByteArrayToStructureBigEndian<MacFileInfo>(finfo);
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MacFileInfo
+    {
+        public readonly uint creationDate;
+        public readonly uint modificationDate;
+        public readonly uint backupDate;
+        public readonly uint accessDate;
+    }
 
-                            CreationTime  = DateHandlers.MacToDateTime(macinfo.creationDate);
-                            LastWriteTime = DateHandlers.MacToDateTime(macinfo.modificationDate);
-                        }
-                        else if(_proDosHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            ProDOSFileInfo prodosinfo = Marshal.ByteArrayToStructureBigEndian<ProDOSFileInfo>(finfo);
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct UnixFileInfo
+    {
+        public readonly uint creationDate;
+        public readonly uint accessDate;
+        public readonly uint modificationDate;
+    }
 
-                            CreationTime  = DateHandlers.MacToDateTime(prodosinfo.creationDate);
-                            LastWriteTime = DateHandlers.MacToDateTime(prodosinfo.modificationDate);
-                        }
-                        else if(_unixHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            UnixFileInfo unixinfo = Marshal.ByteArrayToStructureBigEndian<UnixFileInfo>(finfo);
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DOSFileInfo
+    {
+        public readonly ushort modificationDate;
+        public readonly ushort modificationTime;
+        public readonly ushort attributes;
+    }
 
-                            CreationTime  = DateHandlers.UnixUnsignedToDateTime(unixinfo.creationDate);
-                            LastWriteTime = DateHandlers.UnixUnsignedToDateTime(unixinfo.modificationDate);
-                        }
-                        else if(_dosHome.SequenceEqual(_header.homeFilesystem))
-                        {
-                            DOSFileInfo dosinfo = Marshal.ByteArrayToStructureBigEndian<DOSFileInfo>(finfo);
-
-                            LastWriteTime =
-                                DateHandlers.DosToDateTime(dosinfo.modificationDate, dosinfo.modificationTime);
-                        }
-
-                        break;
-                    case AppleSingleEntryID.ResourceFork:
-                        _rsrcFork = entry;
-
-                        break;
-                }
-
-            fs.Close();
-            _isPath  = true;
-            BasePath = path;
-
-            return ErrorNumber.NoError;
-        }
-
-        enum AppleSingleEntryID : uint
-        {
-            Invalid     = 0, DataFork    = 1, ResourceFork    = 2,
-            RealName    = 3, Comment     = 4, Icon            = 5,
-            ColorIcon   = 6, FileInfo    = 7, FileDates       = 8,
-            FinderInfo  = 9, MacFileInfo = 10, ProDOSFileInfo = 11,
-            DOSFileInfo = 12, ShortName  = 13, AfpFileInfo    = 14,
-            DirectoryID = 15
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Header
-        {
-            public readonly uint magic;
-            public readonly uint version;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] homeFilesystem;
-            public readonly ushort entries;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Entry
-        {
-            public readonly uint id;
-            public readonly uint offset;
-            public readonly uint length;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct FileDates
-        {
-            public readonly uint creationDate;
-            public readonly uint modificationDate;
-            public readonly uint backupDate;
-            public readonly uint accessDate;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MacFileInfo
-        {
-            public readonly uint creationDate;
-            public readonly uint modificationDate;
-            public readonly uint backupDate;
-            public readonly uint accessDate;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct UnixFileInfo
-        {
-            public readonly uint creationDate;
-            public readonly uint accessDate;
-            public readonly uint modificationDate;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DOSFileInfo
-        {
-            public readonly ushort modificationDate;
-            public readonly ushort modificationTime;
-            public readonly ushort attributes;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ProDOSFileInfo
-        {
-            public readonly uint   creationDate;
-            public readonly uint   modificationDate;
-            public readonly uint   backupDate;
-            public readonly ushort access;
-            public readonly ushort fileType;
-            public readonly uint   auxType;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ProDOSFileInfo
+    {
+        public readonly uint   creationDate;
+        public readonly uint   modificationDate;
+        public readonly uint   backupDate;
+        public readonly ushort access;
+        public readonly ushort fileType;
+        public readonly uint   auxType;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filters/BZip2.cs b/Aaru.Filters/BZip2.cs
index 919d5dd50..abc9b2511 100644
--- a/Aaru.Filters/BZip2.cs
+++ b/Aaru.Filters/BZip2.cs
@@ -37,189 +37,188 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Ionic.BZip2;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+/// <inheritdoc />
+/// <summary>Decompress bz2 files while reading</summary>
+public class BZip2 : IFilter
 {
+    Stream _dataStream;
+    Stream _innerStream;
+
     /// <inheritdoc />
-    /// <summary>Decompress bz2 files while reading</summary>
-    public class BZip2 : IFilter
+    public string Name => "BZip2";
+    /// <inheritdoc />
+    public Guid Id => new("FCCFB0C3-32EF-40D8-9714-2333F6AC72A9");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public void Close()
     {
-        Stream _dataStream;
-        Stream _innerStream;
-
-        /// <inheritdoc />
-        public string Name => "BZip2";
-        /// <inheritdoc />
-        public Guid Id => new("FCCFB0C3-32EF-40D8-9714-2333F6AC72A9");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public void Close()
-        {
-            _dataStream?.Close();
-            _dataStream = null;
-            BasePath    = null;
-        }
-
-        /// <inheritdoc />
-        public string BasePath { get; private set; }
-
-        /// <inheritdoc />
-        public Stream GetDataForkStream() => _innerStream;
-
-        /// <inheritdoc />
-        public string Path => BasePath;
-
-        /// <inheritdoc />
-        public Stream GetResourceForkStream() => null;
-
-        /// <inheritdoc />
-        public bool HasResourceFork => false;
-
-        /// <inheritdoc />
-        public bool Identify(byte[] buffer)
-        {
-            if(buffer[0] != 0x42 ||
-               buffer[1] != 0x5A ||
-               buffer[2] != 0x68 ||
-               buffer[3] < 0x31  ||
-               buffer[3] > 0x39)
-                return false;
-
-            if(buffer.Length <= 512)
-                return true;
-
-            return buffer[^512] != 0x6B || buffer[^511] != 0x6F || buffer[^510] != 0x6C || buffer[^509] != 0x79;
-        }
-
-        /// <inheritdoc />
-        public bool Identify(Stream stream)
-        {
-            byte[] buffer = new byte[4];
-
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, 4);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            if(buffer[0] != 0x42 ||
-               buffer[1] != 0x5A ||
-               buffer[2] != 0x68 ||
-               buffer[3] < 0x31  ||
-               buffer[3] > 0x39)
-                return false;
-
-            if(stream.Length <= 512)
-                return true;
-
-            stream.Seek(-512, SeekOrigin.End);
-            stream.Read(buffer, 0, 4);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            // Check it is not an UDIF
-            return buffer[0] != 0x6B || buffer[1] != 0x6F || buffer[2] != 0x6C || buffer[3] != 0x79;
-        }
-
-        /// <inheritdoc />
-        public bool Identify(string path)
-        {
-            if(!File.Exists(path))
-                return false;
-
-            var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            byte[] buffer = new byte[4];
-
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, 4);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            if(buffer[0] != 0x42 ||
-               buffer[1] != 0x5A ||
-               buffer[2] != 0x68 ||
-               buffer[3] < 0x31  ||
-               buffer[3] > 0x39)
-                return false;
-
-            if(stream.Length <= 512)
-                return true;
-
-            stream.Seek(-512, SeekOrigin.End);
-            stream.Read(buffer, 0, 4);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            // Check it is not an UDIF
-            return buffer[0] != 0x6B || buffer[1] != 0x6F || buffer[2] != 0x6C || buffer[3] != 0x79;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(byte[] buffer)
-        {
-            _dataStream    = new MemoryStream(buffer);
-            BasePath       = null;
-            CreationTime   = DateTime.UtcNow;
-            LastWriteTime  = CreationTime;
-            _innerStream   = new ForcedSeekStream<BZip2InputStream>(_dataStream, false);
-            DataForkLength = _innerStream.Length;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(Stream stream)
-        {
-            _dataStream    = stream;
-            BasePath       = null;
-            CreationTime   = DateTime.UtcNow;
-            LastWriteTime  = CreationTime;
-            _innerStream   = new ForcedSeekStream<BZip2InputStream>(_dataStream, false);
-            DataForkLength = _innerStream.Length;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(string path)
-        {
-            _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            BasePath    = System.IO.Path.GetFullPath(path);
-
-            var fi = new FileInfo(path);
-            CreationTime   = fi.CreationTimeUtc;
-            LastWriteTime  = fi.LastWriteTimeUtc;
-            _innerStream   = new ForcedSeekStream<BZip2InputStream>(_dataStream, false);
-            DataForkLength = _innerStream.Length;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public DateTime CreationTime { get; private set; }
-
-        /// <inheritdoc />
-        public long DataForkLength { get; private set; }
-
-        /// <inheritdoc />
-        public DateTime LastWriteTime { get; private set; }
-
-        /// <inheritdoc />
-        public long Length => DataForkLength;
-
-        /// <inheritdoc />
-        public long ResourceForkLength => 0;
-
-        /// <inheritdoc />
-        public string Filename
-        {
-            get
-            {
-                if(BasePath?.EndsWith(".bz2", StringComparison.InvariantCultureIgnoreCase) == true)
-                    return BasePath.Substring(0, BasePath.Length - 4);
-
-                return BasePath?.EndsWith(".bzip2", StringComparison.InvariantCultureIgnoreCase) == true
-                           ? BasePath.Substring(0, BasePath.Length - 6) : BasePath;
-            }
-        }
-
-        /// <inheritdoc />
-        public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
+        _dataStream?.Close();
+        _dataStream = null;
+        BasePath    = null;
     }
+
+    /// <inheritdoc />
+    public string BasePath { get; private set; }
+
+    /// <inheritdoc />
+    public Stream GetDataForkStream() => _innerStream;
+
+    /// <inheritdoc />
+    public string Path => BasePath;
+
+    /// <inheritdoc />
+    public Stream GetResourceForkStream() => null;
+
+    /// <inheritdoc />
+    public bool HasResourceFork => false;
+
+    /// <inheritdoc />
+    public bool Identify(byte[] buffer)
+    {
+        if(buffer[0] != 0x42 ||
+           buffer[1] != 0x5A ||
+           buffer[2] != 0x68 ||
+           buffer[3] < 0x31  ||
+           buffer[3] > 0x39)
+            return false;
+
+        if(buffer.Length <= 512)
+            return true;
+
+        return buffer[^512] != 0x6B || buffer[^511] != 0x6F || buffer[^510] != 0x6C || buffer[^509] != 0x79;
+    }
+
+    /// <inheritdoc />
+    public bool Identify(Stream stream)
+    {
+        byte[] buffer = new byte[4];
+
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, 4);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(buffer[0] != 0x42 ||
+           buffer[1] != 0x5A ||
+           buffer[2] != 0x68 ||
+           buffer[3] < 0x31  ||
+           buffer[3] > 0x39)
+            return false;
+
+        if(stream.Length <= 512)
+            return true;
+
+        stream.Seek(-512, SeekOrigin.End);
+        stream.Read(buffer, 0, 4);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        // Check it is not an UDIF
+        return buffer[0] != 0x6B || buffer[1] != 0x6F || buffer[2] != 0x6C || buffer[3] != 0x79;
+    }
+
+    /// <inheritdoc />
+    public bool Identify(string path)
+    {
+        if(!File.Exists(path))
+            return false;
+
+        var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        byte[] buffer = new byte[4];
+
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, 4);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(buffer[0] != 0x42 ||
+           buffer[1] != 0x5A ||
+           buffer[2] != 0x68 ||
+           buffer[3] < 0x31  ||
+           buffer[3] > 0x39)
+            return false;
+
+        if(stream.Length <= 512)
+            return true;
+
+        stream.Seek(-512, SeekOrigin.End);
+        stream.Read(buffer, 0, 4);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        // Check it is not an UDIF
+        return buffer[0] != 0x6B || buffer[1] != 0x6F || buffer[2] != 0x6C || buffer[3] != 0x79;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(byte[] buffer)
+    {
+        _dataStream    = new MemoryStream(buffer);
+        BasePath       = null;
+        CreationTime   = DateTime.UtcNow;
+        LastWriteTime  = CreationTime;
+        _innerStream   = new ForcedSeekStream<BZip2InputStream>(_dataStream, false);
+        DataForkLength = _innerStream.Length;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(Stream stream)
+    {
+        _dataStream    = stream;
+        BasePath       = null;
+        CreationTime   = DateTime.UtcNow;
+        LastWriteTime  = CreationTime;
+        _innerStream   = new ForcedSeekStream<BZip2InputStream>(_dataStream, false);
+        DataForkLength = _innerStream.Length;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(string path)
+    {
+        _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        BasePath    = System.IO.Path.GetFullPath(path);
+
+        var fi = new FileInfo(path);
+        CreationTime   = fi.CreationTimeUtc;
+        LastWriteTime  = fi.LastWriteTimeUtc;
+        _innerStream   = new ForcedSeekStream<BZip2InputStream>(_dataStream, false);
+        DataForkLength = _innerStream.Length;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public DateTime CreationTime { get; private set; }
+
+    /// <inheritdoc />
+    public long DataForkLength { get; private set; }
+
+    /// <inheritdoc />
+    public DateTime LastWriteTime { get; private set; }
+
+    /// <inheritdoc />
+    public long Length => DataForkLength;
+
+    /// <inheritdoc />
+    public long ResourceForkLength => 0;
+
+    /// <inheritdoc />
+    public string Filename
+    {
+        get
+        {
+            if(BasePath?.EndsWith(".bz2", StringComparison.InvariantCultureIgnoreCase) == true)
+                return BasePath.Substring(0, BasePath.Length - 4);
+
+            return BasePath?.EndsWith(".bzip2", StringComparison.InvariantCultureIgnoreCase) == true
+                       ? BasePath.Substring(0, BasePath.Length - 6) : BasePath;
+        }
+    }
+
+    /// <inheritdoc />
+    public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
 }
\ No newline at end of file
diff --git a/Aaru.Filters/ForcedSeekStream.cs b/Aaru.Filters/ForcedSeekStream.cs
index a225e7ef4..d1483e097 100644
--- a/Aaru.Filters/ForcedSeekStream.cs
+++ b/Aaru.Filters/ForcedSeekStream.cs
@@ -33,129 +33,115 @@
 using System;
 using System.IO;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+/// <summary>
+///     ForcedSeekStream allows to seek a forward-readable stream (like System.IO.Compression streams) by doing the
+///     slow and known trick of rewinding and forward reading until arriving the desired position.
+/// </summary>
+/// <inheritdoc />
+public sealed class ForcedSeekStream<T> : Stream where T : Stream
 {
-    /// <summary>
-    ///     ForcedSeekStream allows to seek a forward-readable stream (like System.IO.Compression streams) by doing the
-    ///     slow and known trick of rewinding and forward reading until arriving the desired position.
-    /// </summary>
+    const    int        BUFFER_LEN = 1048576;
+    readonly string     _backFile;
+    readonly FileStream _backStream;
+    readonly T          _baseStream;
+    long                _streamLength;
+
+    /// <summary>Initializes a new instance of the <see cref="T:Aaru.Filters.ForcedSeekStream`1" /> class.</summary>
+    /// <param name="length">The real (uncompressed) length of the stream.</param>
+    /// <param name="args">Parameters that are used to create the base stream.</param>
     /// <inheritdoc />
-    public sealed class ForcedSeekStream<T> : Stream where T : Stream
+    public ForcedSeekStream(long length, params object[] args)
     {
-        const    int        BUFFER_LEN = 1048576;
-        readonly string     _backFile;
-        readonly FileStream _backStream;
-        readonly T          _baseStream;
-        long                _streamLength;
+        _streamLength = length;
+        _baseStream   = (T)Activator.CreateInstance(typeof(T), args);
+        _backFile     = Path.GetTempFileName();
+        _backStream   = new FileStream(_backFile, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
 
-        /// <summary>Initializes a new instance of the <see cref="T:Aaru.Filters.ForcedSeekStream`1" /> class.</summary>
-        /// <param name="length">The real (uncompressed) length of the stream.</param>
-        /// <param name="args">Parameters that are used to create the base stream.</param>
-        /// <inheritdoc />
-        public ForcedSeekStream(long length, params object[] args)
-        {
-            _streamLength = length;
-            _baseStream   = (T)Activator.CreateInstance(typeof(T), args);
-            _backFile     = Path.GetTempFileName();
-            _backStream   = new FileStream(_backFile, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
-
-            if(length == 0)
-                CalculateLength();
-        }
-
-        /// <summary>Initializes a new instance of the <see cref="T:Aaru.Filters.ForcedSeekStream`1" /> class.</summary>
-        /// <param name="args">Parameters that are used to create the base stream.</param>
-        /// <inheritdoc />
-        public ForcedSeekStream(params object[] args)
-        {
-            _baseStream = (T)Activator.CreateInstance(typeof(T), args);
-            _backFile   = Path.GetTempFileName();
-            _backStream = new FileStream(_backFile, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
+        if(length == 0)
             CalculateLength();
+    }
+
+    /// <summary>Initializes a new instance of the <see cref="T:Aaru.Filters.ForcedSeekStream`1" /> class.</summary>
+    /// <param name="args">Parameters that are used to create the base stream.</param>
+    /// <inheritdoc />
+    public ForcedSeekStream(params object[] args)
+    {
+        _baseStream = (T)Activator.CreateInstance(typeof(T), args);
+        _backFile   = Path.GetTempFileName();
+        _backStream = new FileStream(_backFile, FileMode.Open, FileAccess.ReadWrite, FileShare.None);
+        CalculateLength();
+    }
+
+    /// <inheritdoc />
+    public override bool CanRead => _baseStream.CanRead;
+
+    /// <inheritdoc />
+    public override bool CanSeek => true;
+
+    /// <inheritdoc />
+    public override bool CanWrite => false;
+
+    /// <inheritdoc />
+    public override long Length => _streamLength;
+
+    /// <inheritdoc />
+    public override long Position
+    {
+        get => _backStream.Position;
+
+        set => SetPosition(value);
+    }
+
+    /// <summary>
+    ///     Calculates the real (uncompressed) length of the stream. It basically reads (uncompresses) the whole stream to
+    ///     memory discarding its contents, so it should be used as a last resort.
+    /// </summary>
+    /// <returns>The length.</returns>
+    public void CalculateLength()
+    {
+        int read;
+
+        do
+        {
+            byte[] buffer = new byte[BUFFER_LEN];
+            read = _baseStream.Read(buffer, 0, BUFFER_LEN);
+            _backStream.Write(buffer, 0, read);
+        } while(read == BUFFER_LEN);
+
+        _streamLength        = _backStream.Length;
+        _backStream.Position = 0;
+    }
+
+    void SetPosition(long position)
+    {
+        if(position == _backStream.Position)
+            return;
+
+        if(position < _backStream.Length)
+        {
+            _backStream.Position = position;
+
+            return;
         }
 
-        /// <inheritdoc />
-        public override bool CanRead => _baseStream.CanRead;
+        if(position > _streamLength)
+            position = _streamLength;
 
-        /// <inheritdoc />
-        public override bool CanSeek => true;
+        _backStream.Position = _backStream.Length;
+        long   toPosition      = position - _backStream.Position;
+        int    fullBufferReads = (int)(toPosition / BUFFER_LEN);
+        int    restToRead      = (int)(toPosition % BUFFER_LEN);
+        byte[] buffer;
+        var    bufPos = 0;
+        var    left   = BUFFER_LEN;
 
-        /// <inheritdoc />
-        public override bool CanWrite => false;
-
-        /// <inheritdoc />
-        public override long Length => _streamLength;
-
-        /// <inheritdoc />
-        public override long Position
+        for(int i = 0; i < fullBufferReads; i++)
         {
-            get => _backStream.Position;
-
-            set => SetPosition(value);
-        }
-
-        /// <summary>
-        ///     Calculates the real (uncompressed) length of the stream. It basically reads (uncompresses) the whole stream to
-        ///     memory discarding its contents, so it should be used as a last resort.
-        /// </summary>
-        /// <returns>The length.</returns>
-        public void CalculateLength()
-        {
-            int read;
-
-            do
-            {
-                byte[] buffer = new byte[BUFFER_LEN];
-                read = _baseStream.Read(buffer, 0, BUFFER_LEN);
-                _backStream.Write(buffer, 0, read);
-            } while(read == BUFFER_LEN);
-
-            _streamLength        = _backStream.Length;
-            _backStream.Position = 0;
-        }
-
-        void SetPosition(long position)
-        {
-            if(position == _backStream.Position)
-                return;
-
-            if(position < _backStream.Length)
-            {
-                _backStream.Position = position;
-
-                return;
-            }
-
-            if(position > _streamLength)
-                position = _streamLength;
-
-            _backStream.Position = _backStream.Length;
-            long   toPosition      = position - _backStream.Position;
-            int    fullBufferReads = (int)(toPosition / BUFFER_LEN);
-            int    restToRead      = (int)(toPosition % BUFFER_LEN);
-            byte[] buffer;
-            var    bufPos = 0;
-            var    left   = BUFFER_LEN;
-
-            for(int i = 0; i < fullBufferReads; i++)
-            {
-                buffer = new byte[BUFFER_LEN];
-                bufPos = 0;
-                left   = BUFFER_LEN;
-
-                while(left > 0)
-                {
-                    var done = _baseStream.Read(buffer, bufPos, left);
-                    left   -= done;
-                    bufPos += done;
-                }
-
-                _backStream.Write(buffer, 0, BUFFER_LEN);
-            }
-
-            buffer = new byte[restToRead];
+            buffer = new byte[BUFFER_LEN];
             bufPos = 0;
-            left   = restToRead;
+            left   = BUFFER_LEN;
 
             while(left > 0)
             {
@@ -164,95 +150,108 @@ namespace Aaru.Filters
                 bufPos += done;
             }
 
-            _backStream.Write(buffer, 0, restToRead);
+            _backStream.Write(buffer, 0, BUFFER_LEN);
         }
 
-        /// <inheritdoc />
-        public override void Flush()
+        buffer = new byte[restToRead];
+        bufPos = 0;
+        left   = restToRead;
+
+        while(left > 0)
         {
-            _baseStream.Flush();
-            _backStream.Flush();
+            var done = _baseStream.Read(buffer, bufPos, left);
+            left   -= done;
+            bufPos += done;
         }
 
-        /// <inheritdoc />
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            if(_backStream.Position + count > _streamLength)
-                count = (int)(_streamLength - _backStream.Position);
+        _backStream.Write(buffer, 0, restToRead);
+    }
 
-            if(_backStream.Position + count <= _backStream.Length)
-                return _backStream.Read(buffer, offset, count);
+    /// <inheritdoc />
+    public override void Flush()
+    {
+        _baseStream.Flush();
+        _backStream.Flush();
+    }
 
-            var oldPosition = _backStream.Position;
-            SetPosition(_backStream.Position + count);
-            SetPosition(oldPosition);
+    /// <inheritdoc />
+    public override int Read(byte[] buffer, int offset, int count)
+    {
+        if(_backStream.Position + count > _streamLength)
+            count = (int)(_streamLength - _backStream.Position);
 
+        if(_backStream.Position + count <= _backStream.Length)
             return _backStream.Read(buffer, offset, count);
-        }
 
-        /// <inheritdoc />
-        public override int ReadByte()
-        {
-            if(_backStream.Position + 1 > _streamLength)
-                return -1;
+        var oldPosition = _backStream.Position;
+        SetPosition(_backStream.Position + count);
+        SetPosition(oldPosition);
 
-            if(_backStream.Position + 1 <= _backStream.Length)
-                return _backStream.ReadByte();
+        return _backStream.Read(buffer, offset, count);
+    }
 
-            SetPosition(_backStream.Position + 1);
-            SetPosition(_backStream.Position - 1);
+    /// <inheritdoc />
+    public override int ReadByte()
+    {
+        if(_backStream.Position + 1 > _streamLength)
+            return -1;
 
+        if(_backStream.Position + 1 <= _backStream.Length)
             return _backStream.ReadByte();
-        }
 
-        /// <inheritdoc />
-        public override long Seek(long offset, SeekOrigin origin)
+        SetPosition(_backStream.Position + 1);
+        SetPosition(_backStream.Position - 1);
+
+        return _backStream.ReadByte();
+    }
+
+    /// <inheritdoc />
+    public override long Seek(long offset, SeekOrigin origin)
+    {
+        switch(origin)
         {
-            switch(origin)
-            {
-                case SeekOrigin.Begin:
-                    if(offset < 0)
-                        throw new IOException("Cannot seek before stream start.");
+            case SeekOrigin.Begin:
+                if(offset < 0)
+                    throw new IOException("Cannot seek before stream start.");
 
-                    SetPosition(offset);
+                SetPosition(offset);
 
-                    break;
-                case SeekOrigin.End:
-                    if(offset > 0)
-                        throw new IOException("Cannot seek after stream end.");
+                break;
+            case SeekOrigin.End:
+                if(offset > 0)
+                    throw new IOException("Cannot seek after stream end.");
 
-                    if(_streamLength == 0)
-                        CalculateLength();
+                if(_streamLength == 0)
+                    CalculateLength();
 
-                    SetPosition(_streamLength + offset);
+                SetPosition(_streamLength + offset);
 
-                    break;
-                default:
-                    SetPosition(_backStream.Position + offset);
+                break;
+            default:
+                SetPosition(_backStream.Position + offset);
 
-                    break;
-            }
-
-            return _backStream.Position;
+                break;
         }
 
-        /// <inheritdoc />
-        public override void SetLength(long value) => throw new NotSupportedException();
+        return _backStream.Position;
+    }
 
-        /// <inheritdoc />
-        public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
+    /// <inheritdoc />
+    public override void SetLength(long value) => throw new NotSupportedException();
 
-        /// <inheritdoc />
-        public override void Close()
-        {
-            _backStream?.Close();
-            File.Delete(_backFile);
-        }
+    /// <inheritdoc />
+    public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException();
 
-        ~ForcedSeekStream()
-        {
-            _backStream?.Close();
-            File.Delete(_backFile);
-        }
+    /// <inheritdoc />
+    public override void Close()
+    {
+        _backStream?.Close();
+        File.Delete(_backFile);
+    }
+
+    ~ForcedSeekStream()
+    {
+        _backStream?.Close();
+        File.Delete(_backFile);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filters/GZip.cs b/Aaru.Filters/GZip.cs
index 4decb70e9..4aae13e57 100644
--- a/Aaru.Filters/GZip.cs
+++ b/Aaru.Filters/GZip.cs
@@ -37,187 +37,186 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+/// <inheritdoc />
+/// <summary>Decompress gzip files while reading</summary>
+public sealed class GZip : IFilter
 {
+    Stream _dataStream;
+    uint   _decompressedSize;
+    Stream _zStream;
+
     /// <inheritdoc />
-    /// <summary>Decompress gzip files while reading</summary>
-    public sealed class GZip : IFilter
+    public string Name => "GZip";
+    /// <inheritdoc />
+    public Guid Id => new("F4996661-4A29-42C9-A2C7-3904EF40F3B0");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public void Close()
     {
-        Stream _dataStream;
-        uint   _decompressedSize;
-        Stream _zStream;
-
-        /// <inheritdoc />
-        public string Name => "GZip";
-        /// <inheritdoc />
-        public Guid Id => new("F4996661-4A29-42C9-A2C7-3904EF40F3B0");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public void Close()
-        {
-            _dataStream?.Close();
-            _dataStream = null;
-            BasePath    = null;
-        }
-
-        /// <inheritdoc />
-        public string BasePath { get; private set; }
-
-        /// <inheritdoc />
-        public Stream GetDataForkStream() => _zStream;
-
-        /// <inheritdoc />
-        public string Path => BasePath;
-
-        /// <inheritdoc />
-        public Stream GetResourceForkStream() => null;
-
-        /// <inheritdoc />
-        public bool HasResourceFork => false;
-
-        /// <inheritdoc />
-        public bool Identify(byte[] buffer) => buffer[0] == 0x1F && buffer[1] == 0x8B && buffer[2] == 0x08;
-
-        /// <inheritdoc />
-        public bool Identify(Stream stream)
-        {
-            byte[] buffer = new byte[3];
-
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, 3);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            return buffer[0] == 0x1F && buffer[1] == 0x8B && buffer[2] == 0x08;
-        }
-
-        /// <inheritdoc />
-        public bool Identify(string path)
-        {
-            if(!File.Exists(path))
-                return false;
-
-            var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            byte[] buffer = new byte[3];
-
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, 3);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            return buffer[0] == 0x1F && buffer[1] == 0x8B && buffer[2] == 0x08;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(byte[] buffer)
-        {
-            byte[] mtimeB = new byte[4];
-            byte[] isizeB = new byte[4];
-
-            _dataStream = new MemoryStream(buffer);
-            BasePath    = null;
-
-            _dataStream.Seek(4, SeekOrigin.Begin);
-            _dataStream.Read(mtimeB, 0, 4);
-            _dataStream.Seek(-4, SeekOrigin.End);
-            _dataStream.Read(isizeB, 0, 4);
-            _dataStream.Seek(0, SeekOrigin.Begin);
-
-            uint mtime = BitConverter.ToUInt32(mtimeB, 0);
-            uint isize = BitConverter.ToUInt32(isizeB, 0);
-
-            _decompressedSize = isize;
-            CreationTime      = DateHandlers.UnixUnsignedToDateTime(mtime);
-            LastWriteTime     = CreationTime;
-
-            _zStream = new ForcedSeekStream<GZipStream>(_decompressedSize, _dataStream, CompressionMode.Decompress);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(Stream stream)
-        {
-            byte[] mtimeB = new byte[4];
-            byte[] isizeB = new byte[4];
-
-            _dataStream = stream;
-            BasePath    = null;
-
-            _dataStream.Seek(4, SeekOrigin.Begin);
-            _dataStream.Read(mtimeB, 0, 4);
-            _dataStream.Seek(-4, SeekOrigin.End);
-            _dataStream.Read(isizeB, 0, 4);
-            _dataStream.Seek(0, SeekOrigin.Begin);
-
-            uint mtime = BitConverter.ToUInt32(mtimeB, 0);
-            uint isize = BitConverter.ToUInt32(isizeB, 0);
-
-            _decompressedSize = isize;
-            CreationTime      = DateHandlers.UnixUnsignedToDateTime(mtime);
-            LastWriteTime     = CreationTime;
-
-            _zStream = new ForcedSeekStream<GZipStream>(_decompressedSize, _dataStream, CompressionMode.Decompress);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(string path)
-        {
-            byte[] mtimeB = new byte[4];
-            byte[] isizeB = new byte[4];
-
-            _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            BasePath    = System.IO.Path.GetFullPath(path);
-
-            _dataStream.Seek(4, SeekOrigin.Begin);
-            _dataStream.Read(mtimeB, 0, 4);
-            _dataStream.Seek(-4, SeekOrigin.End);
-            _dataStream.Read(isizeB, 0, 4);
-            _dataStream.Seek(0, SeekOrigin.Begin);
-
-            uint mtime = BitConverter.ToUInt32(mtimeB, 0);
-            uint isize = BitConverter.ToUInt32(isizeB, 0);
-
-            _decompressedSize = isize;
-            var fi = new FileInfo(path);
-            CreationTime = fi.CreationTimeUtc;
-            LastWriteTime = DateHandlers.UnixUnsignedToDateTime(mtime);
-            _zStream = new ForcedSeekStream<GZipStream>(_decompressedSize, _dataStream, CompressionMode.Decompress);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public DateTime CreationTime { get; private set; }
-
-        /// <inheritdoc />
-        public long DataForkLength => _decompressedSize;
-
-        /// <inheritdoc />
-        public DateTime LastWriteTime { get; private set; }
-
-        /// <inheritdoc />
-        public long Length => _decompressedSize;
-
-        /// <inheritdoc />
-        public long ResourceForkLength => 0;
-
-        /// <inheritdoc />
-        public string Filename
-        {
-            get
-            {
-                if(BasePath?.EndsWith(".gz", StringComparison.InvariantCultureIgnoreCase) == true)
-                    return BasePath.Substring(0, BasePath.Length - 3);
-
-                return BasePath?.EndsWith(".gzip", StringComparison.InvariantCultureIgnoreCase) == true
-                           ? BasePath.Substring(0, BasePath.Length - 5) : BasePath;
-            }
-        }
-
-        /// <inheritdoc />
-        public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
+        _dataStream?.Close();
+        _dataStream = null;
+        BasePath    = null;
     }
+
+    /// <inheritdoc />
+    public string BasePath { get; private set; }
+
+    /// <inheritdoc />
+    public Stream GetDataForkStream() => _zStream;
+
+    /// <inheritdoc />
+    public string Path => BasePath;
+
+    /// <inheritdoc />
+    public Stream GetResourceForkStream() => null;
+
+    /// <inheritdoc />
+    public bool HasResourceFork => false;
+
+    /// <inheritdoc />
+    public bool Identify(byte[] buffer) => buffer[0] == 0x1F && buffer[1] == 0x8B && buffer[2] == 0x08;
+
+    /// <inheritdoc />
+    public bool Identify(Stream stream)
+    {
+        byte[] buffer = new byte[3];
+
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, 3);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        return buffer[0] == 0x1F && buffer[1] == 0x8B && buffer[2] == 0x08;
+    }
+
+    /// <inheritdoc />
+    public bool Identify(string path)
+    {
+        if(!File.Exists(path))
+            return false;
+
+        var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        byte[] buffer = new byte[3];
+
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, 3);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        return buffer[0] == 0x1F && buffer[1] == 0x8B && buffer[2] == 0x08;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(byte[] buffer)
+    {
+        byte[] mtimeB = new byte[4];
+        byte[] isizeB = new byte[4];
+
+        _dataStream = new MemoryStream(buffer);
+        BasePath    = null;
+
+        _dataStream.Seek(4, SeekOrigin.Begin);
+        _dataStream.Read(mtimeB, 0, 4);
+        _dataStream.Seek(-4, SeekOrigin.End);
+        _dataStream.Read(isizeB, 0, 4);
+        _dataStream.Seek(0, SeekOrigin.Begin);
+
+        uint mtime = BitConverter.ToUInt32(mtimeB, 0);
+        uint isize = BitConverter.ToUInt32(isizeB, 0);
+
+        _decompressedSize = isize;
+        CreationTime      = DateHandlers.UnixUnsignedToDateTime(mtime);
+        LastWriteTime     = CreationTime;
+
+        _zStream = new ForcedSeekStream<GZipStream>(_decompressedSize, _dataStream, CompressionMode.Decompress);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(Stream stream)
+    {
+        byte[] mtimeB = new byte[4];
+        byte[] isizeB = new byte[4];
+
+        _dataStream = stream;
+        BasePath    = null;
+
+        _dataStream.Seek(4, SeekOrigin.Begin);
+        _dataStream.Read(mtimeB, 0, 4);
+        _dataStream.Seek(-4, SeekOrigin.End);
+        _dataStream.Read(isizeB, 0, 4);
+        _dataStream.Seek(0, SeekOrigin.Begin);
+
+        uint mtime = BitConverter.ToUInt32(mtimeB, 0);
+        uint isize = BitConverter.ToUInt32(isizeB, 0);
+
+        _decompressedSize = isize;
+        CreationTime      = DateHandlers.UnixUnsignedToDateTime(mtime);
+        LastWriteTime     = CreationTime;
+
+        _zStream = new ForcedSeekStream<GZipStream>(_decompressedSize, _dataStream, CompressionMode.Decompress);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(string path)
+    {
+        byte[] mtimeB = new byte[4];
+        byte[] isizeB = new byte[4];
+
+        _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        BasePath    = System.IO.Path.GetFullPath(path);
+
+        _dataStream.Seek(4, SeekOrigin.Begin);
+        _dataStream.Read(mtimeB, 0, 4);
+        _dataStream.Seek(-4, SeekOrigin.End);
+        _dataStream.Read(isizeB, 0, 4);
+        _dataStream.Seek(0, SeekOrigin.Begin);
+
+        uint mtime = BitConverter.ToUInt32(mtimeB, 0);
+        uint isize = BitConverter.ToUInt32(isizeB, 0);
+
+        _decompressedSize = isize;
+        var fi = new FileInfo(path);
+        CreationTime  = fi.CreationTimeUtc;
+        LastWriteTime = DateHandlers.UnixUnsignedToDateTime(mtime);
+        _zStream      = new ForcedSeekStream<GZipStream>(_decompressedSize, _dataStream, CompressionMode.Decompress);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public DateTime CreationTime { get; private set; }
+
+    /// <inheritdoc />
+    public long DataForkLength => _decompressedSize;
+
+    /// <inheritdoc />
+    public DateTime LastWriteTime { get; private set; }
+
+    /// <inheritdoc />
+    public long Length => _decompressedSize;
+
+    /// <inheritdoc />
+    public long ResourceForkLength => 0;
+
+    /// <inheritdoc />
+    public string Filename
+    {
+        get
+        {
+            if(BasePath?.EndsWith(".gz", StringComparison.InvariantCultureIgnoreCase) == true)
+                return BasePath.Substring(0, BasePath.Length - 3);
+
+            return BasePath?.EndsWith(".gzip", StringComparison.InvariantCultureIgnoreCase) == true
+                       ? BasePath.Substring(0, BasePath.Length - 5) : BasePath;
+        }
+    }
+
+    /// <inheritdoc />
+    public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
 }
\ No newline at end of file
diff --git a/Aaru.Filters/LZip.cs b/Aaru.Filters/LZip.cs
index 80cf06ad3..1cb47db0a 100644
--- a/Aaru.Filters/LZip.cs
+++ b/Aaru.Filters/LZip.cs
@@ -37,158 +37,157 @@ using Aaru.CommonTypes.Interfaces;
 using SharpCompress.Compressors;
 using SharpCompress.Compressors.LZMA;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+/// <inheritdoc />
+/// <summary>Decompress lzip files while reading</summary>
+public sealed class LZip : IFilter
 {
+    Stream _dataStream;
+    Stream _innerStream;
+
     /// <inheritdoc />
-    /// <summary>Decompress lzip files while reading</summary>
-    public sealed class LZip : IFilter
+    public string Name => "LZip";
+    /// <inheritdoc />
+    public Guid Id => new("09D715E9-20C0-48B1-A8D9-D8897CEC57C9");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public void Close()
     {
-        Stream _dataStream;
-        Stream _innerStream;
-
-        /// <inheritdoc />
-        public string Name => "LZip";
-        /// <inheritdoc />
-        public Guid Id => new("09D715E9-20C0-48B1-A8D9-D8897CEC57C9");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public void Close()
-        {
-            _dataStream?.Close();
-            _dataStream = null;
-            BasePath    = null;
-        }
-
-        /// <inheritdoc />
-        public string BasePath { get; private set; }
-
-        /// <inheritdoc />
-        public Stream GetDataForkStream() => _innerStream;
-
-        /// <inheritdoc />
-        public string Path => BasePath;
-
-        /// <inheritdoc />
-        public Stream GetResourceForkStream() => null;
-
-        /// <inheritdoc />
-        public bool HasResourceFork => false;
-
-        /// <inheritdoc />
-        public bool Identify(byte[] buffer) => buffer[0] == 0x4C && buffer[1] == 0x5A && buffer[2] == 0x49 &&
-                                               buffer[3] == 0x50 && buffer[4] == 0x01;
-
-        /// <inheritdoc />
-        public bool Identify(Stream stream)
-        {
-            byte[] buffer = new byte[5];
-
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, 5);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            return buffer[0] == 0x4C && buffer[1] == 0x5A && buffer[2] == 0x49 && buffer[3] == 0x50 &&
-                   buffer[4] == 0x01;
-        }
-
-        /// <inheritdoc />
-        public bool Identify(string path)
-        {
-            if(!File.Exists(path))
-                return false;
-
-            var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            byte[] buffer = new byte[5];
-
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, 5);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            return buffer[0] == 0x4C && buffer[1] == 0x5A && buffer[2] == 0x49 && buffer[3] == 0x50 &&
-                   buffer[4] == 0x01;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(byte[] buffer)
-        {
-            _dataStream    = new MemoryStream(buffer);
-            BasePath       = null;
-            CreationTime   = DateTime.UtcNow;
-            LastWriteTime  = CreationTime;
-            DataForkLength = BitConverter.ToInt64(buffer, buffer.Length - 16);
-
-            _innerStream = new ForcedSeekStream<LZipStream>(DataForkLength, _dataStream, CompressionMode.Decompress);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(Stream stream)
-        {
-            _dataStream   = stream;
-            BasePath      = null;
-            CreationTime  = DateTime.UtcNow;
-            LastWriteTime = CreationTime;
-            byte[] tmp = new byte[8];
-            _dataStream.Seek(-16, SeekOrigin.End);
-            _dataStream.Read(tmp, 0, 8);
-            DataForkLength = BitConverter.ToInt64(tmp, 0);
-            _dataStream.Seek(0, SeekOrigin.Begin);
-            _innerStream = new ForcedSeekStream<LZipStream>(DataForkLength, _dataStream, CompressionMode.Decompress);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(string path)
-        {
-            _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            BasePath    = System.IO.Path.GetFullPath(path);
-
-            var fi = new FileInfo(path);
-            CreationTime  = fi.CreationTimeUtc;
-            LastWriteTime = fi.LastWriteTimeUtc;
-            byte[] tmp = new byte[8];
-            _dataStream.Seek(-16, SeekOrigin.End);
-            _dataStream.Read(tmp, 0, 8);
-            DataForkLength = BitConverter.ToInt64(tmp, 0);
-            _dataStream.Seek(0, SeekOrigin.Begin);
-            _innerStream = new ForcedSeekStream<LZipStream>(DataForkLength, _dataStream, CompressionMode.Decompress);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public DateTime CreationTime { get; private set; }
-
-        /// <inheritdoc />
-        public long DataForkLength { get; private set; }
-
-        /// <inheritdoc />
-        public DateTime LastWriteTime { get; private set; }
-
-        /// <inheritdoc />
-        public long Length => DataForkLength;
-
-        /// <inheritdoc />
-        public long ResourceForkLength => 0;
-
-        /// <inheritdoc />
-        public string Filename
-        {
-            get
-            {
-                if(BasePath?.EndsWith(".lz", StringComparison.InvariantCultureIgnoreCase) == true)
-                    return BasePath.Substring(0, BasePath.Length - 3);
-
-                return BasePath?.EndsWith(".lzip", StringComparison.InvariantCultureIgnoreCase) == true
-                           ? BasePath.Substring(0, BasePath.Length - 5) : BasePath;
-            }
-        }
-
-        /// <inheritdoc />
-        public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
+        _dataStream?.Close();
+        _dataStream = null;
+        BasePath    = null;
     }
+
+    /// <inheritdoc />
+    public string BasePath { get; private set; }
+
+    /// <inheritdoc />
+    public Stream GetDataForkStream() => _innerStream;
+
+    /// <inheritdoc />
+    public string Path => BasePath;
+
+    /// <inheritdoc />
+    public Stream GetResourceForkStream() => null;
+
+    /// <inheritdoc />
+    public bool HasResourceFork => false;
+
+    /// <inheritdoc />
+    public bool Identify(byte[] buffer) => buffer[0] == 0x4C && buffer[1] == 0x5A && buffer[2] == 0x49 &&
+                                           buffer[3] == 0x50 && buffer[4] == 0x01;
+
+    /// <inheritdoc />
+    public bool Identify(Stream stream)
+    {
+        byte[] buffer = new byte[5];
+
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, 5);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        return buffer[0] == 0x4C && buffer[1] == 0x5A && buffer[2] == 0x49 && buffer[3] == 0x50 &&
+               buffer[4] == 0x01;
+    }
+
+    /// <inheritdoc />
+    public bool Identify(string path)
+    {
+        if(!File.Exists(path))
+            return false;
+
+        var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        byte[] buffer = new byte[5];
+
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, 5);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        return buffer[0] == 0x4C && buffer[1] == 0x5A && buffer[2] == 0x49 && buffer[3] == 0x50 &&
+               buffer[4] == 0x01;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(byte[] buffer)
+    {
+        _dataStream    = new MemoryStream(buffer);
+        BasePath       = null;
+        CreationTime   = DateTime.UtcNow;
+        LastWriteTime  = CreationTime;
+        DataForkLength = BitConverter.ToInt64(buffer, buffer.Length - 16);
+
+        _innerStream = new ForcedSeekStream<LZipStream>(DataForkLength, _dataStream, CompressionMode.Decompress);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(Stream stream)
+    {
+        _dataStream   = stream;
+        BasePath      = null;
+        CreationTime  = DateTime.UtcNow;
+        LastWriteTime = CreationTime;
+        byte[] tmp = new byte[8];
+        _dataStream.Seek(-16, SeekOrigin.End);
+        _dataStream.Read(tmp, 0, 8);
+        DataForkLength = BitConverter.ToInt64(tmp, 0);
+        _dataStream.Seek(0, SeekOrigin.Begin);
+        _innerStream = new ForcedSeekStream<LZipStream>(DataForkLength, _dataStream, CompressionMode.Decompress);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(string path)
+    {
+        _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        BasePath    = System.IO.Path.GetFullPath(path);
+
+        var fi = new FileInfo(path);
+        CreationTime  = fi.CreationTimeUtc;
+        LastWriteTime = fi.LastWriteTimeUtc;
+        byte[] tmp = new byte[8];
+        _dataStream.Seek(-16, SeekOrigin.End);
+        _dataStream.Read(tmp, 0, 8);
+        DataForkLength = BitConverter.ToInt64(tmp, 0);
+        _dataStream.Seek(0, SeekOrigin.Begin);
+        _innerStream = new ForcedSeekStream<LZipStream>(DataForkLength, _dataStream, CompressionMode.Decompress);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public DateTime CreationTime { get; private set; }
+
+    /// <inheritdoc />
+    public long DataForkLength { get; private set; }
+
+    /// <inheritdoc />
+    public DateTime LastWriteTime { get; private set; }
+
+    /// <inheritdoc />
+    public long Length => DataForkLength;
+
+    /// <inheritdoc />
+    public long ResourceForkLength => 0;
+
+    /// <inheritdoc />
+    public string Filename
+    {
+        get
+        {
+            if(BasePath?.EndsWith(".lz", StringComparison.InvariantCultureIgnoreCase) == true)
+                return BasePath.Substring(0, BasePath.Length - 3);
+
+            return BasePath?.EndsWith(".lzip", StringComparison.InvariantCultureIgnoreCase) == true
+                       ? BasePath.Substring(0, BasePath.Length - 5) : BasePath;
+        }
+    }
+
+    /// <inheritdoc />
+    public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
 }
\ No newline at end of file
diff --git a/Aaru.Filters/MacBinary.cs b/Aaru.Filters/MacBinary.cs
index ff72ed9ad..b4ca54d3b 100644
--- a/Aaru.Filters/MacBinary.cs
+++ b/Aaru.Filters/MacBinary.cs
@@ -40,334 +40,333 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+// TODO: Interpret fdScript
+/// <inheritdoc />
+/// <summary>Decodes MacBinary files</summary>
+public sealed class MacBinary : IFilter
 {
-    // TODO: Interpret fdScript
+    const uint MAGIC = 0x6D42494E;
+    byte[]     _bytes;
+    long       _dataForkOff;
+    Header     _header;
+    bool       _isBytes, _isStream, _isPath;
+    long       _rsrcForkOff;
+    Stream     _stream;
+
     /// <inheritdoc />
-    /// <summary>Decodes MacBinary files</summary>
-    public sealed class MacBinary : IFilter
+    public string Name => "MacBinary";
+    /// <inheritdoc />
+    public Guid Id => new("D7C321D3-E51F-45DF-A150-F6BFDF0D7704");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public void Close()
     {
-        const uint MAGIC = 0x6D42494E;
-        byte[]     _bytes;
-        long       _dataForkOff;
-        Header     _header;
-        bool       _isBytes, _isStream, _isPath;
-        long       _rsrcForkOff;
-        Stream     _stream;
+        _bytes = null;
+        _stream?.Close();
+        _isBytes  = false;
+        _isStream = false;
+        _isPath   = false;
+    }
 
-        /// <inheritdoc />
-        public string Name => "MacBinary";
-        /// <inheritdoc />
-        public Guid Id => new("D7C321D3-E51F-45DF-A150-F6BFDF0D7704");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string BasePath { get; private set; }
 
-        /// <inheritdoc />
-        public void Close()
-        {
-            _bytes = null;
-            _stream?.Close();
-            _isBytes  = false;
-            _isStream = false;
-            _isPath   = false;
-        }
+    /// <inheritdoc />
+    public DateTime CreationTime { get; private set; }
 
-        /// <inheritdoc />
-        public string BasePath { get; private set; }
-
-        /// <inheritdoc />
-        public DateTime CreationTime { get; private set; }
-
-        /// <inheritdoc />
-        public long DataForkLength => _header.dataLength;
-
-        /// <inheritdoc />
-        public Stream GetDataForkStream()
-        {
-            if(_header.dataLength == 0)
-                return null;
-
-            if(_isBytes)
-                return new OffsetStream(_bytes, _dataForkOff, _dataForkOff + _header.dataLength - 1);
-
-            if(_isStream)
-                return new OffsetStream(_stream, _dataForkOff, _dataForkOff + _header.dataLength - 1);
-
-            if(_isPath)
-                return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _dataForkOff,
-                                        _dataForkOff + _header.dataLength - 1);
+    /// <inheritdoc />
+    public long DataForkLength => _header.dataLength;
 
+    /// <inheritdoc />
+    public Stream GetDataForkStream()
+    {
+        if(_header.dataLength == 0)
             return null;
-        }
 
-        /// <inheritdoc />
-        public string Filename { get; private set; }
+        if(_isBytes)
+            return new OffsetStream(_bytes, _dataForkOff, _dataForkOff + _header.dataLength - 1);
 
-        /// <inheritdoc />
-        public DateTime LastWriteTime { get; private set; }
+        if(_isStream)
+            return new OffsetStream(_stream, _dataForkOff, _dataForkOff + _header.dataLength - 1);
 
-        /// <inheritdoc />
-        public long Length => _header.dataLength + _header.resourceLength;
+        if(_isPath)
+            return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _dataForkOff,
+                                    _dataForkOff + _header.dataLength - 1);
 
-        /// <inheritdoc />
-        public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
+        return null;
+    }
 
-        /// <inheritdoc />
-        public string Path => BasePath;
+    /// <inheritdoc />
+    public string Filename { get; private set; }
 
-        /// <inheritdoc />
-        public long ResourceForkLength => _header.resourceLength;
+    /// <inheritdoc />
+    public DateTime LastWriteTime { get; private set; }
 
-        /// <inheritdoc />
-        public Stream GetResourceForkStream()
-        {
-            if(_header.resourceLength == 0)
-                return null;
+    /// <inheritdoc />
+    public long Length => _header.dataLength + _header.resourceLength;
 
-            if(_isBytes)
-                return new OffsetStream(_bytes, _rsrcForkOff, _rsrcForkOff + _header.resourceLength - 1);
+    /// <inheritdoc />
+    public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
 
-            if(_isStream)
-                return new OffsetStream(_stream, _rsrcForkOff, _rsrcForkOff + _header.resourceLength - 1);
+    /// <inheritdoc />
+    public string Path => BasePath;
 
-            if(_isPath)
-                return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _rsrcForkOff,
-                                        _rsrcForkOff + _header.resourceLength - 1);
+    /// <inheritdoc />
+    public long ResourceForkLength => _header.resourceLength;
 
+    /// <inheritdoc />
+    public Stream GetResourceForkStream()
+    {
+        if(_header.resourceLength == 0)
             return null;
-        }
 
-        /// <inheritdoc />
-        public bool HasResourceFork => _header.resourceLength > 0;
+        if(_isBytes)
+            return new OffsetStream(_bytes, _rsrcForkOff, _rsrcForkOff + _header.resourceLength - 1);
 
-        /// <inheritdoc />
-        public bool Identify(byte[] buffer)
-        {
-            if(buffer        == null ||
-               buffer.Length < 128)
-                return false;
+        if(_isStream)
+            return new OffsetStream(_stream, _rsrcForkOff, _rsrcForkOff + _header.resourceLength - 1);
 
-            byte[] hdrB = new byte[128];
-            Array.Copy(buffer, 0, hdrB, 0, 128);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+        if(_isPath)
+            return new OffsetStream(BasePath, FileMode.Open, FileAccess.Read, _rsrcForkOff,
+                                    _rsrcForkOff + _header.resourceLength - 1);
 
-            return _header.magic == MAGIC || (_header.version     == 0 && _header.filename[0] > 0 &&
-                                              _header.filename[0] < 64 && _header.zero1 == 0 && _header.zero2 == 0 &&
-                                              _header.reserved    == 0 &&
-                                              (_header.dataLength > 0 || _header.resourceLength > 0));
-        }
+        return null;
+    }
 
-        /// <inheritdoc />
-        public bool Identify(Stream stream)
-        {
-            if(stream        == null ||
-               stream.Length < 128)
-                return false;
+    /// <inheritdoc />
+    public bool HasResourceFork => _header.resourceLength > 0;
 
-            byte[] hdrB = new byte[128];
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(hdrB, 0, 128);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+    /// <inheritdoc />
+    public bool Identify(byte[] buffer)
+    {
+        if(buffer        == null ||
+           buffer.Length < 128)
+            return false;
 
-            return _header.magic == MAGIC || (_header.version     == 0 && _header.filename[0] > 0 &&
-                                              _header.filename[0] < 64 && _header.zero1 == 0 && _header.zero2 == 0 &&
-                                              _header.reserved    == 0 &&
-                                              (_header.dataLength > 0 || _header.resourceLength > 0));
-        }
+        byte[] hdrB = new byte[128];
+        Array.Copy(buffer, 0, hdrB, 0, 128);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
 
-        /// <inheritdoc />
-        public bool Identify(string path)
-        {
-            if(!File.Exists(path))
-                return false;
+        return _header.magic == MAGIC || (_header.version     == 0 && _header.filename[0] > 0  &&
+                                          _header.filename[0] < 64 && _header.zero1       == 0 && _header.zero2 == 0 &&
+                                          _header.reserved    == 0 &&
+                                          (_header.dataLength > 0 || _header.resourceLength > 0));
+    }
 
-            var fstream = new FileStream(path, FileMode.Open, FileAccess.Read);
+    /// <inheritdoc />
+    public bool Identify(Stream stream)
+    {
+        if(stream        == null ||
+           stream.Length < 128)
+            return false;
 
-            if(fstream.Length < 128)
-                return false;
+        byte[] hdrB = new byte[128];
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(hdrB, 0, 128);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
 
-            byte[] hdrB = new byte[128];
-            fstream.Read(hdrB, 0, 128);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+        return _header.magic == MAGIC || (_header.version     == 0 && _header.filename[0] > 0  &&
+                                          _header.filename[0] < 64 && _header.zero1       == 0 && _header.zero2 == 0 &&
+                                          _header.reserved    == 0 &&
+                                          (_header.dataLength > 0 || _header.resourceLength > 0));
+    }
 
-            fstream.Close();
+    /// <inheritdoc />
+    public bool Identify(string path)
+    {
+        if(!File.Exists(path))
+            return false;
 
-            return _header.magic == MAGIC || (_header.version     == 0 && _header.filename[0] > 0 &&
-                                              _header.filename[0] < 64 && _header.zero1 == 0 && _header.zero2 == 0 &&
-                                              _header.reserved    == 0 &&
-                                              (_header.dataLength > 0 || _header.resourceLength > 0));
-        }
+        var fstream = new FileStream(path, FileMode.Open, FileAccess.Read);
 
-        /// <inheritdoc />
-        public ErrorNumber Open(byte[] buffer)
-        {
-            var ms = new MemoryStream(buffer);
-            ms.Seek(0, SeekOrigin.Begin);
+        if(fstream.Length < 128)
+            return false;
 
-            byte[] hdrB = new byte[128];
-            ms.Read(hdrB, 0, 128);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+        byte[] hdrB = new byte[128];
+        fstream.Read(hdrB, 0, 128);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
 
-            uint blocks = 1;
-            blocks += (uint)(_header.secondaryHeaderLength / 128);
+        fstream.Close();
 
-            if(_header.secondaryHeaderLength % 128 > 0)
-                blocks++;
+        return _header.magic == MAGIC || (_header.version     == 0 && _header.filename[0] > 0  &&
+                                          _header.filename[0] < 64 && _header.zero1       == 0 && _header.zero2 == 0 &&
+                                          _header.reserved    == 0 &&
+                                          (_header.dataLength > 0 || _header.resourceLength > 0));
+    }
 
-            _dataForkOff =  blocks             * 128;
-            blocks       += _header.dataLength / 128;
+    /// <inheritdoc />
+    public ErrorNumber Open(byte[] buffer)
+    {
+        var ms = new MemoryStream(buffer);
+        ms.Seek(0, SeekOrigin.Begin);
 
-            if(_header.dataLength % 128 > 0)
-                blocks++;
+        byte[] hdrB = new byte[128];
+        ms.Read(hdrB, 0, 128);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
 
-            _rsrcForkOff = blocks * 128;
+        uint blocks = 1;
+        blocks += (uint)(_header.secondaryHeaderLength / 128);
 
-            Filename      = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh"));
-            CreationTime  = DateHandlers.MacToDateTime(_header.creationTime);
-            LastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime);
+        if(_header.secondaryHeaderLength % 128 > 0)
+            blocks++;
 
-            ms.Close();
-            _isBytes = true;
-            _bytes   = buffer;
+        _dataForkOff =  blocks             * 128;
+        blocks       += _header.dataLength / 128;
 
-            return ErrorNumber.NoError;
-        }
+        if(_header.dataLength % 128 > 0)
+            blocks++;
 
-        /// <inheritdoc />
-        public ErrorNumber Open(Stream stream)
-        {
-            stream.Seek(0, SeekOrigin.Begin);
+        _rsrcForkOff = blocks * 128;
 
-            byte[] hdrB = new byte[128];
-            stream.Read(hdrB, 0, 128);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+        Filename      = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh"));
+        CreationTime  = DateHandlers.MacToDateTime(_header.creationTime);
+        LastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime);
 
-            uint blocks = 1;
-            blocks += (uint)(_header.secondaryHeaderLength / 128);
+        ms.Close();
+        _isBytes = true;
+        _bytes   = buffer;
 
-            if(_header.secondaryHeaderLength % 128 > 0)
-                blocks++;
+        return ErrorNumber.NoError;
+    }
 
-            _dataForkOff =  blocks             * 128;
-            blocks       += _header.dataLength / 128;
+    /// <inheritdoc />
+    public ErrorNumber Open(Stream stream)
+    {
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(_header.dataLength % 128 > 0)
-                blocks++;
+        byte[] hdrB = new byte[128];
+        stream.Read(hdrB, 0, 128);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
 
-            _rsrcForkOff = blocks * 128;
+        uint blocks = 1;
+        blocks += (uint)(_header.secondaryHeaderLength / 128);
 
-            Filename      = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh"));
-            CreationTime  = DateHandlers.MacToDateTime(_header.creationTime);
-            LastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime);
+        if(_header.secondaryHeaderLength % 128 > 0)
+            blocks++;
 
-            stream.Seek(0, SeekOrigin.Begin);
-            _isStream = true;
-            _stream   = stream;
+        _dataForkOff =  blocks             * 128;
+        blocks       += _header.dataLength / 128;
 
-            return ErrorNumber.NoError;
-        }
+        if(_header.dataLength % 128 > 0)
+            blocks++;
 
-        /// <inheritdoc />
-        public ErrorNumber Open(string path)
-        {
-            var fs = new FileStream(path, FileMode.Open, FileAccess.Read);
-            fs.Seek(0, SeekOrigin.Begin);
+        _rsrcForkOff = blocks * 128;
 
-            byte[] hdrB = new byte[128];
-            fs.Read(hdrB, 0, 128);
-            _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
+        Filename      = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh"));
+        CreationTime  = DateHandlers.MacToDateTime(_header.creationTime);
+        LastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime);
 
-            uint blocks = 1;
-            blocks += (uint)(_header.secondaryHeaderLength / 128);
+        stream.Seek(0, SeekOrigin.Begin);
+        _isStream = true;
+        _stream   = stream;
 
-            if(_header.secondaryHeaderLength % 128 > 0)
-                blocks++;
+        return ErrorNumber.NoError;
+    }
 
-            _dataForkOff =  blocks             * 128;
-            blocks       += _header.dataLength / 128;
+    /// <inheritdoc />
+    public ErrorNumber Open(string path)
+    {
+        var fs = new FileStream(path, FileMode.Open, FileAccess.Read);
+        fs.Seek(0, SeekOrigin.Begin);
 
-            if(_header.dataLength % 128 > 0)
-                blocks++;
+        byte[] hdrB = new byte[128];
+        fs.Read(hdrB, 0, 128);
+        _header = Marshal.ByteArrayToStructureBigEndian<Header>(hdrB);
 
-            _rsrcForkOff = blocks * 128;
+        uint blocks = 1;
+        blocks += (uint)(_header.secondaryHeaderLength / 128);
 
-            Filename      = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh"));
-            CreationTime  = DateHandlers.MacToDateTime(_header.creationTime);
-            LastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime);
+        if(_header.secondaryHeaderLength % 128 > 0)
+            blocks++;
 
-            fs.Close();
-            _isPath  = true;
-            BasePath = path;
+        _dataForkOff =  blocks             * 128;
+        blocks       += _header.dataLength / 128;
 
-            return ErrorNumber.NoError;
-        }
+        if(_header.dataLength % 128 > 0)
+            blocks++;
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            /// <summary>0x00, MacBinary version, 0</summary>
-            public readonly byte version;
-            /// <summary>0x01, Str63 Pascal filename</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] filename;
-            /// <summary>0x41, File type</summary>
-            public readonly uint type;
-            /// <summary>0x45, File creator</summary>
-            public readonly uint creator;
-            /// <summary>0x49, High byte of Finder flags</summary>
-            public readonly byte finderFlags;
-            /// <summary>0x4A, Must be 0</summary>
-            public readonly byte zero1;
-            /// <summary>0x4B, File's icon vertical position within its window</summary>
-            public readonly ushort verticalPosition;
-            /// <summary>0x4D, File's icon horizontal position within its window</summary>
-            public readonly ushort horizontalPosition;
-            /// <summary>0x4F, File's window or folder ID</summary>
-            public readonly short windowID;
-            /// <summary>0x51, Protected flag</summary>
-            public readonly byte protect;
-            /// <summary>0x52, Must be 0</summary>
-            public readonly byte zero2;
-            /// <summary>0x53, Size of data fork</summary>
-            public readonly uint dataLength;
-            /// <summary>0x57, Size of resource fork</summary>
-            public readonly uint resourceLength;
-            /// <summary>0x5B, File's creation time</summary>
-            public readonly uint creationTime;
-            /// <summary>0x5F, File's last modified time</summary>
-            public readonly uint modificationTime;
-            /// <summary>0x63, Length of Get Info comment</summary>
-            public readonly ushort commentLength;
-            /// <summary>0x65, Low byte of Finder flags</summary>
-            public readonly byte finderFlags2;
+        _rsrcForkOff = blocks * 128;
 
-            #region MacBinary III
-            /// <summary>0x66, magic identifier, "mBIN"</summary>
-            public readonly uint magic;
-            /// <summary>0x6A, fdScript from fxInfo, identifies codepage of filename</summary>
-            public readonly byte fdScript;
-            /// <summary>0x6B, fdXFlags from fxInfo, extended Mac OS 8 finder flags</summary>
-            public readonly byte fdXFlags;
-            #endregion MacBinary III
+        Filename      = StringHandlers.PascalToString(_header.filename, Encoding.GetEncoding("macintosh"));
+        CreationTime  = DateHandlers.MacToDateTime(_header.creationTime);
+        LastWriteTime = DateHandlers.MacToDateTime(_header.modificationTime);
 
-            /// <summary>0x6C, unused</summary>
-            public readonly ulong reserved;
-            /// <summary>0x74, Total unpacked files</summary>
-            public readonly uint totalPackedFiles;
+        fs.Close();
+        _isPath  = true;
+        BasePath = path;
 
-            #region MacBinary II
-            /// <summary>0x78, Length of secondary header</summary>
-            public readonly ushort secondaryHeaderLength;
-            /// <summary>0x7A, version number of MacBinary that wrote this file, starts at 129</summary>
-            public readonly byte version2;
-            /// <summary>0x7B, version number of MacBinary required to open this file, starts at 129</summary>
-            public readonly byte minVersion;
-            /// <summary>0x7C, CRC of previous bytes</summary>
-            public readonly short crc;
-            #endregion MacBinary II
+        return ErrorNumber.NoError;
+    }
 
-            /// <summary>0x7E, Reserved for computer type and OS ID</summary>
-            public readonly short computerID;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
+    {
+        /// <summary>0x00, MacBinary version, 0</summary>
+        public readonly byte version;
+        /// <summary>0x01, Str63 Pascal filename</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] filename;
+        /// <summary>0x41, File type</summary>
+        public readonly uint type;
+        /// <summary>0x45, File creator</summary>
+        public readonly uint creator;
+        /// <summary>0x49, High byte of Finder flags</summary>
+        public readonly byte finderFlags;
+        /// <summary>0x4A, Must be 0</summary>
+        public readonly byte zero1;
+        /// <summary>0x4B, File's icon vertical position within its window</summary>
+        public readonly ushort verticalPosition;
+        /// <summary>0x4D, File's icon horizontal position within its window</summary>
+        public readonly ushort horizontalPosition;
+        /// <summary>0x4F, File's window or folder ID</summary>
+        public readonly short windowID;
+        /// <summary>0x51, Protected flag</summary>
+        public readonly byte protect;
+        /// <summary>0x52, Must be 0</summary>
+        public readonly byte zero2;
+        /// <summary>0x53, Size of data fork</summary>
+        public readonly uint dataLength;
+        /// <summary>0x57, Size of resource fork</summary>
+        public readonly uint resourceLength;
+        /// <summary>0x5B, File's creation time</summary>
+        public readonly uint creationTime;
+        /// <summary>0x5F, File's last modified time</summary>
+        public readonly uint modificationTime;
+        /// <summary>0x63, Length of Get Info comment</summary>
+        public readonly ushort commentLength;
+        /// <summary>0x65, Low byte of Finder flags</summary>
+        public readonly byte finderFlags2;
+
+        #region MacBinary III
+        /// <summary>0x66, magic identifier, "mBIN"</summary>
+        public readonly uint magic;
+        /// <summary>0x6A, fdScript from fxInfo, identifies codepage of filename</summary>
+        public readonly byte fdScript;
+        /// <summary>0x6B, fdXFlags from fxInfo, extended Mac OS 8 finder flags</summary>
+        public readonly byte fdXFlags;
+        #endregion MacBinary III
+
+        /// <summary>0x6C, unused</summary>
+        public readonly ulong reserved;
+        /// <summary>0x74, Total unpacked files</summary>
+        public readonly uint totalPackedFiles;
+
+        #region MacBinary II
+        /// <summary>0x78, Length of secondary header</summary>
+        public readonly ushort secondaryHeaderLength;
+        /// <summary>0x7A, version number of MacBinary that wrote this file, starts at 129</summary>
+        public readonly byte version2;
+        /// <summary>0x7B, version number of MacBinary required to open this file, starts at 129</summary>
+        public readonly byte minVersion;
+        /// <summary>0x7C, CRC of previous bytes</summary>
+        public readonly short crc;
+        #endregion MacBinary II
+
+        /// <summary>0x7E, Reserved for computer type and OS ID</summary>
+        public readonly short computerID;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filters/PCExchange.cs b/Aaru.Filters/PCExchange.cs
index 99ad98c62..e051cb428 100644
--- a/Aaru.Filters/PCExchange.cs
+++ b/Aaru.Filters/PCExchange.cs
@@ -42,242 +42,241 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 using Marshal = System.Runtime.InteropServices.Marshal;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+/// <inheritdoc />
+/// <summary>Decodes PCExchange files</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class PcExchange : IFilter
 {
+    const string FILE_ID     = "FILEID.DAT";
+    const string FINDER_INFO = "FINDER.DAT";
+    const string RESOURCES   = "RESOURCE.FRK";
+    string       _dataPath;
+    string       _rsrcPath;
+
     /// <inheritdoc />
-    /// <summary>Decodes PCExchange files</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class PcExchange : IFilter
+    public string Name => "PCExchange";
+    /// <inheritdoc />
+    public Guid Id => new("9264EB9F-D634-4F9B-BE12-C24CD44988C6");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public void Close() {}
+
+    /// <inheritdoc />
+    public string BasePath { get; private set; }
+
+    /// <inheritdoc />
+    public DateTime CreationTime { get; private set; }
+
+    /// <inheritdoc />
+    public long DataForkLength { get; private set; }
+
+    /// <inheritdoc />
+    public Stream GetDataForkStream() => new FileStream(_dataPath, FileMode.Open, FileAccess.Read);
+
+    /// <inheritdoc />
+    public string Filename => System.IO.Path.GetFileName(BasePath);
+
+    /// <inheritdoc />
+    public DateTime LastWriteTime { get; private set; }
+
+    /// <inheritdoc />
+    public long Length => DataForkLength + ResourceForkLength;
+
+    /// <inheritdoc />
+    public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
+
+    /// <inheritdoc />
+    public string Path => BasePath;
+
+    /// <inheritdoc />
+    public long ResourceForkLength { get; private set; }
+
+    /// <inheritdoc />
+    public Stream GetResourceForkStream() => new FileStream(_rsrcPath, FileMode.Open, FileAccess.Read);
+
+    /// <inheritdoc />
+    public bool HasResourceFork => _rsrcPath != null;
+
+    /// <inheritdoc />
+    public bool Identify(byte[] buffer) => false;
+
+    /// <inheritdoc />
+    public bool Identify(Stream stream) => false;
+
+    /// <inheritdoc />
+    public bool Identify(string path)
     {
-        const string FILE_ID     = "FILEID.DAT";
-        const string FINDER_INFO = "FINDER.DAT";
-        const string RESOURCES   = "RESOURCE.FRK";
-        string       _dataPath;
-        string       _rsrcPath;
+        string parentFolder = System.IO.Path.GetDirectoryName(path);
 
-        /// <inheritdoc />
-        public string Name => "PCExchange";
-        /// <inheritdoc />
-        public Guid Id => new("9264EB9F-D634-4F9B-BE12-C24CD44988C6");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        parentFolder ??= "";
 
-        /// <inheritdoc />
-        public void Close() {}
+        if(!File.Exists(System.IO.Path.Combine(parentFolder, FINDER_INFO)))
+            return false;
 
-        /// <inheritdoc />
-        public string BasePath { get; private set; }
+        if(!Directory.Exists(System.IO.Path.Combine(parentFolder, RESOURCES)))
+            return false;
 
-        /// <inheritdoc />
-        public DateTime CreationTime { get; private set; }
+        string baseFilename = System.IO.Path.GetFileName(path);
 
-        /// <inheritdoc />
-        public long DataForkLength { get; private set; }
+        bool dataFound = false;
+        bool rsrcFound = false;
 
-        /// <inheritdoc />
-        public Stream GetDataForkStream() => new FileStream(_dataPath, FileMode.Open, FileAccess.Read);
+        var finderDatStream = new FileStream(System.IO.Path.Combine(parentFolder, FINDER_INFO), FileMode.Open,
+                                             FileAccess.Read);
 
-        /// <inheritdoc />
-        public string Filename => System.IO.Path.GetFileName(BasePath);
-
-        /// <inheritdoc />
-        public DateTime LastWriteTime { get; private set; }
-
-        /// <inheritdoc />
-        public long Length => DataForkLength + ResourceForkLength;
-
-        /// <inheritdoc />
-        public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
-
-        /// <inheritdoc />
-        public string Path => BasePath;
-
-        /// <inheritdoc />
-        public long ResourceForkLength { get; private set; }
-
-        /// <inheritdoc />
-        public Stream GetResourceForkStream() => new FileStream(_rsrcPath, FileMode.Open, FileAccess.Read);
-
-        /// <inheritdoc />
-        public bool HasResourceFork => _rsrcPath != null;
-
-        /// <inheritdoc />
-        public bool Identify(byte[] buffer) => false;
-
-        /// <inheritdoc />
-        public bool Identify(Stream stream) => false;
-
-        /// <inheritdoc />
-        public bool Identify(string path)
+        while(finderDatStream.Position + 0x5C <= finderDatStream.Length)
         {
-            string parentFolder = System.IO.Path.GetDirectoryName(path);
+            var    datEntry  = new Entry();
+            byte[] datEntryB = new byte[Marshal.SizeOf(datEntry)];
+            finderDatStream.Read(datEntryB, 0, Marshal.SizeOf(datEntry));
+            datEntry = Helpers.Marshal.ByteArrayToStructureBigEndian<Entry>(datEntryB);
 
-            parentFolder ??= "";
+            // TODO: Add support for encoding on filters
+            string macName = StringHandlers.PascalToString(datEntry.macName, Encoding.GetEncoding("macintosh"));
 
-            if(!File.Exists(System.IO.Path.Combine(parentFolder, FINDER_INFO)))
-                return false;
+            byte[] tmpDosNameB = new byte[8];
+            byte[] tmpDosExtB  = new byte[3];
+            Array.Copy(datEntry.dosName, 0, tmpDosNameB, 0, 8);
+            Array.Copy(datEntry.dosName, 8, tmpDosExtB, 0, 3);
 
-            if(!Directory.Exists(System.IO.Path.Combine(parentFolder, RESOURCES)))
-                return false;
+            string dosName = Encoding.ASCII.GetString(tmpDosNameB).Trim() + "." +
+                             Encoding.ASCII.GetString(tmpDosExtB).Trim();
 
-            string baseFilename = System.IO.Path.GetFileName(path);
+            string dosNameLow = dosName.ToLower(CultureInfo.CurrentCulture);
 
-            bool dataFound = false;
-            bool rsrcFound = false;
+            if(baseFilename != macName &&
+               baseFilename != dosName &&
+               baseFilename != dosNameLow)
+                continue;
 
-            var finderDatStream = new FileStream(System.IO.Path.Combine(parentFolder, FINDER_INFO), FileMode.Open,
-                                                 FileAccess.Read);
+            dataFound |=
+                File.Exists(System.IO.Path.Combine(parentFolder,
+                                                   macName ?? throw new InvalidOperationException())) ||
+                File.Exists(System.IO.Path.Combine(parentFolder, dosName))                            ||
+                File.Exists(System.IO.Path.Combine(parentFolder, dosNameLow));
 
-            while(finderDatStream.Position + 0x5C <= finderDatStream.Length)
-            {
-                var    datEntry  = new Entry();
-                byte[] datEntryB = new byte[Marshal.SizeOf(datEntry)];
-                finderDatStream.Read(datEntryB, 0, Marshal.SizeOf(datEntry));
-                datEntry = Helpers.Marshal.ByteArrayToStructureBigEndian<Entry>(datEntryB);
+            rsrcFound |= File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosName)) ||
+                         File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosNameLow));
 
-                // TODO: Add support for encoding on filters
-                string macName = StringHandlers.PascalToString(datEntry.macName, Encoding.GetEncoding("macintosh"));
-
-                byte[] tmpDosNameB = new byte[8];
-                byte[] tmpDosExtB  = new byte[3];
-                Array.Copy(datEntry.dosName, 0, tmpDosNameB, 0, 8);
-                Array.Copy(datEntry.dosName, 8, tmpDosExtB, 0, 3);
-
-                string dosName = Encoding.ASCII.GetString(tmpDosNameB).Trim() + "." +
-                                 Encoding.ASCII.GetString(tmpDosExtB).Trim();
-
-                string dosNameLow = dosName.ToLower(CultureInfo.CurrentCulture);
-
-                if(baseFilename != macName &&
-                   baseFilename != dosName &&
-                   baseFilename != dosNameLow)
-                    continue;
-
-                dataFound |=
-                    File.Exists(System.IO.Path.Combine(parentFolder,
-                                                       macName ?? throw new InvalidOperationException())) ||
-                    File.Exists(System.IO.Path.Combine(parentFolder, dosName))                            ||
-                    File.Exists(System.IO.Path.Combine(parentFolder, dosNameLow));
-
-                rsrcFound |= File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosName)) ||
-                             File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosNameLow));
-
-                break;
-            }
-
-            finderDatStream.Close();
-
-            return dataFound && rsrcFound;
+            break;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber Open(byte[] buffer) => ErrorNumber.NotSupported;
+        finderDatStream.Close();
 
-        /// <inheritdoc />
-        public ErrorNumber Open(Stream stream) => ErrorNumber.NotSupported;
+        return dataFound && rsrcFound;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber Open(string path)
+    /// <inheritdoc />
+    public ErrorNumber Open(byte[] buffer) => ErrorNumber.NotSupported;
+
+    /// <inheritdoc />
+    public ErrorNumber Open(Stream stream) => ErrorNumber.NotSupported;
+
+    /// <inheritdoc />
+    public ErrorNumber Open(string path)
+    {
+        string parentFolder = System.IO.Path.GetDirectoryName(path);
+        string baseFilename = System.IO.Path.GetFileName(path);
+
+        parentFolder ??= "";
+
+        var finderDatStream = new FileStream(System.IO.Path.Combine(parentFolder, FINDER_INFO), FileMode.Open,
+                                             FileAccess.Read);
+
+        while(finderDatStream.Position + 0x5C <= finderDatStream.Length)
         {
-            string parentFolder = System.IO.Path.GetDirectoryName(path);
-            string baseFilename = System.IO.Path.GetFileName(path);
+            var    datEntry  = new Entry();
+            byte[] datEntryB = new byte[Marshal.SizeOf(datEntry)];
+            finderDatStream.Read(datEntryB, 0, Marshal.SizeOf(datEntry));
+            datEntry = Helpers.Marshal.ByteArrayToStructureBigEndian<Entry>(datEntryB);
 
-            parentFolder ??= "";
+            string macName = StringHandlers.PascalToString(datEntry.macName, Encoding.GetEncoding("macintosh"));
 
-            var finderDatStream = new FileStream(System.IO.Path.Combine(parentFolder, FINDER_INFO), FileMode.Open,
-                                                 FileAccess.Read);
+            byte[] tmpDosNameB = new byte[8];
+            byte[] tmpDosExtB  = new byte[3];
+            Array.Copy(datEntry.dosName, 0, tmpDosNameB, 0, 8);
+            Array.Copy(datEntry.dosName, 8, tmpDosExtB, 0, 3);
 
-            while(finderDatStream.Position + 0x5C <= finderDatStream.Length)
-            {
-                var    datEntry  = new Entry();
-                byte[] datEntryB = new byte[Marshal.SizeOf(datEntry)];
-                finderDatStream.Read(datEntryB, 0, Marshal.SizeOf(datEntry));
-                datEntry = Helpers.Marshal.ByteArrayToStructureBigEndian<Entry>(datEntryB);
+            string dosName = Encoding.ASCII.GetString(tmpDosNameB).Trim() + "." +
+                             Encoding.ASCII.GetString(tmpDosExtB).Trim();
 
-                string macName = StringHandlers.PascalToString(datEntry.macName, Encoding.GetEncoding("macintosh"));
+            string dosNameLow = dosName.ToLower(CultureInfo.CurrentCulture);
 
-                byte[] tmpDosNameB = new byte[8];
-                byte[] tmpDosExtB  = new byte[3];
-                Array.Copy(datEntry.dosName, 0, tmpDosNameB, 0, 8);
-                Array.Copy(datEntry.dosName, 8, tmpDosExtB, 0, 3);
+            if(baseFilename != macName &&
+               baseFilename != dosName &&
+               baseFilename != dosNameLow)
+                continue;
 
-                string dosName = Encoding.ASCII.GetString(tmpDosNameB).Trim() + "." +
-                                 Encoding.ASCII.GetString(tmpDosExtB).Trim();
+            if(File.Exists(System.IO.Path.Combine(parentFolder, macName ?? throw new InvalidOperationException())))
+                _dataPath = System.IO.Path.Combine(parentFolder, macName);
+            else if(File.Exists(System.IO.Path.Combine(parentFolder, dosName)))
+                _dataPath = System.IO.Path.Combine(parentFolder, dosName);
+            else if(File.Exists(System.IO.Path.Combine(parentFolder, dosNameLow)))
+                _dataPath = System.IO.Path.Combine(parentFolder, dosNameLow);
+            else
+                _dataPath = null;
 
-                string dosNameLow = dosName.ToLower(CultureInfo.CurrentCulture);
+            if(File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosName)))
+                _rsrcPath = System.IO.Path.Combine(parentFolder, RESOURCES, dosName);
+            else if(File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosNameLow)))
+                _rsrcPath = System.IO.Path.Combine(parentFolder, RESOURCES, dosNameLow);
+            else
+                _rsrcPath = null;
 
-                if(baseFilename != macName &&
-                   baseFilename != dosName &&
-                   baseFilename != dosNameLow)
-                    continue;
+            LastWriteTime = DateHandlers.MacToDateTime(datEntry.modificationDate);
+            CreationTime  = DateHandlers.MacToDateTime(datEntry.creationDate);
 
-                if(File.Exists(System.IO.Path.Combine(parentFolder, macName ?? throw new InvalidOperationException())))
-                    _dataPath = System.IO.Path.Combine(parentFolder, macName);
-                else if(File.Exists(System.IO.Path.Combine(parentFolder, dosName)))
-                    _dataPath = System.IO.Path.Combine(parentFolder, dosName);
-                else if(File.Exists(System.IO.Path.Combine(parentFolder, dosNameLow)))
-                    _dataPath = System.IO.Path.Combine(parentFolder, dosNameLow);
-                else
-                    _dataPath = null;
-
-                if(File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosName)))
-                    _rsrcPath = System.IO.Path.Combine(parentFolder, RESOURCES, dosName);
-                else if(File.Exists(System.IO.Path.Combine(parentFolder, RESOURCES, dosNameLow)))
-                    _rsrcPath = System.IO.Path.Combine(parentFolder, RESOURCES, dosNameLow);
-                else
-                    _rsrcPath = null;
-
-                LastWriteTime = DateHandlers.MacToDateTime(datEntry.modificationDate);
-                CreationTime  = DateHandlers.MacToDateTime(datEntry.creationDate);
-
-                break;
-            }
-
-            DataForkLength     = new FileInfo(_dataPath ?? throw new InvalidOperationException()).Length;
-            ResourceForkLength = new FileInfo(_rsrcPath ?? throw new InvalidOperationException()).Length;
-
-            BasePath = path;
-
-            finderDatStream.Close();
-
-            return ErrorNumber.NoError;
+            break;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Entry
-        {
-            /// <summary>
-            ///     Name in Macintosh. If PCExchange version supports FAT's LFN they are the same. Illegal characters for FAT get
-            ///     substituted with '_' both here and in FAT's LFN entry.
-            /// </summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] macName;
-            /// <summary>File type</summary>
-            public readonly uint type;
-            /// <summary>File creator</summary>
-            public readonly uint creator;
-            /// <summary>Finder flags</summary>
-            public readonly ushort fdFlags;
-            /// <summary>File's icon vertical position within its window</summary>
-            public readonly ushort verticalPosition;
-            /// <summary>File's icon horizontal position within its window</summary>
-            public readonly ushort horizontalPosition;
-            /// <summary>Unknown, all bytes are empty but last, except in volume's label entry</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 18)]
-            public readonly byte[] unknown1;
-            /// <summary>File's creation date</summary>
-            public readonly uint creationDate;
-            /// <summary>File's modification date</summary>
-            public readonly uint modificationDate;
-            /// <summary>File's last backup date</summary>
-            public readonly uint backupDate;
-            /// <summary>Unknown, but is unique, starts 0x7FFFFFFF and counts in reverse. Probably file ID for alias look up?</summary>
-            public readonly uint unknown2;
-            /// <summary>Name as in FAT entry (not LFN). Resource fork file is always using this name, never LFN.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] dosName;
-            /// <summary>Unknown, flags?</summary>
-            public readonly byte unknown3;
-        }
+        DataForkLength     = new FileInfo(_dataPath ?? throw new InvalidOperationException()).Length;
+        ResourceForkLength = new FileInfo(_rsrcPath ?? throw new InvalidOperationException()).Length;
+
+        BasePath = path;
+
+        finderDatStream.Close();
+
+        return ErrorNumber.NoError;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Entry
+    {
+        /// <summary>
+        ///     Name in Macintosh. If PCExchange version supports FAT's LFN they are the same. Illegal characters for FAT get
+        ///     substituted with '_' both here and in FAT's LFN entry.
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] macName;
+        /// <summary>File type</summary>
+        public readonly uint type;
+        /// <summary>File creator</summary>
+        public readonly uint creator;
+        /// <summary>Finder flags</summary>
+        public readonly ushort fdFlags;
+        /// <summary>File's icon vertical position within its window</summary>
+        public readonly ushort verticalPosition;
+        /// <summary>File's icon horizontal position within its window</summary>
+        public readonly ushort horizontalPosition;
+        /// <summary>Unknown, all bytes are empty but last, except in volume's label entry</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 18)]
+        public readonly byte[] unknown1;
+        /// <summary>File's creation date</summary>
+        public readonly uint creationDate;
+        /// <summary>File's modification date</summary>
+        public readonly uint modificationDate;
+        /// <summary>File's last backup date</summary>
+        public readonly uint backupDate;
+        /// <summary>Unknown, but is unique, starts 0x7FFFFFFF and counts in reverse. Probably file ID for alias look up?</summary>
+        public readonly uint unknown2;
+        /// <summary>Name as in FAT entry (not LFN). Resource fork file is always using this name, never LFN.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] dosName;
+        /// <summary>Unknown, flags?</summary>
+        public readonly byte unknown3;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Filters/SplitJoinStream.cs b/Aaru.Filters/SplitJoinStream.cs
index b6d1bf5ce..89718e4d3 100644
--- a/Aaru.Filters/SplitJoinStream.cs
+++ b/Aaru.Filters/SplitJoinStream.cs
@@ -6,371 +6,370 @@ using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 using Microsoft.Win32.SafeHandles;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+/// <inheritdoc />
+/// <summary>Implements a stream that joins two or more files (sequentially) as a single stream</summary>
+public class SplitJoinStream : Stream
 {
+    readonly Dictionary<long, Stream> _baseStreams;
+    long                              _position;
+    long                              _streamLength;
+
     /// <inheritdoc />
-    /// <summary>Implements a stream that joins two or more files (sequentially) as a single stream</summary>
-    public class SplitJoinStream : Stream
+    public SplitJoinStream()
     {
-        readonly Dictionary<long, Stream> _baseStreams;
-        long                              _position;
-        long                              _streamLength;
+        _baseStreams  = new Dictionary<long, Stream>();
+        _streamLength = 0;
+        _position     = 0;
+        Filter        = new ZZZNoFilter();
+        Filter.Open(this);
+    }
 
-        /// <inheritdoc />
-        public SplitJoinStream()
+    /// <inheritdoc />
+    public override bool CanRead => true;
+
+    /// <inheritdoc />
+    public override bool CanSeek => true;
+
+    /// <inheritdoc />
+    public override bool CanWrite => false;
+
+    /// <inheritdoc />
+    public override long Length => _streamLength;
+
+    /// <inheritdoc />
+    public override long Position
+    {
+        get => _position;
+
+        set
         {
-            _baseStreams  = new Dictionary<long, Stream>();
-            _streamLength = 0;
-            _position     = 0;
-            Filter        = new ZZZNoFilter();
-            Filter.Open(this);
+            if(value >= _streamLength)
+                throw new IOException("Cannot set position past stream end.");
+
+            _position = value;
+        }
+    }
+
+    /// <summary>Gets a filter from this stream</summary>
+    public IFilter Filter { get; }
+
+    /// <summary>Adds a stream at the end of the current stream</summary>
+    /// <param name="stream">Stream to add</param>
+    /// <exception cref="ArgumentException">The specified stream is non-readable or non-seekable</exception>
+    public void Add(Stream stream)
+    {
+        if(!stream.CanSeek)
+            throw new ArgumentException("Non-seekable streams are not supported");
+
+        if(!stream.CanRead)
+            throw new ArgumentException("Non-readable streams are not supported");
+
+        _baseStreams[_streamLength] =  stream;
+        _streamLength               += stream.Length;
+    }
+
+    /// <summary>Adds the specified file to the end of the current stream</summary>
+    /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
+    /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
+    /// <param name="access">
+    ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
+    ///     <see cref="FileStream" /> object.
+    /// </param>
+    /// <param name="share">
+    ///     A bitwise combination of the enumeration values that determines how the file will be shared by
+    ///     processes.
+    /// </param>
+    /// <param name="bufferSize">
+    ///     A positive Int32 value greater than 0 indicating the buffer size. The default buffer size is
+    ///     4096.
+    /// </param>
+    /// <param name="options">A bitwise combination of the enumeration values that specifies additional file options.</param>
+    public void Add(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize,
+                    FileOptions options) => Add(new FileStream(path, mode, access, share, bufferSize, options));
+
+    /// <summary>Adds the specified file to the end of the current stream</summary>
+    /// <param name="handle">A file handle for the file that the stream will encapsulate.</param>
+    /// <param name="access">
+    ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
+    ///     <see cref="FileStream" /> object.
+    /// </param>
+    public void Add(SafeFileHandle handle, FileAccess access) => Add(new FileStream(handle, access));
+
+    /// <summary>Adds the specified file to the end of the current stream</summary>
+    /// <param name="handle">A file handle for the file that the stream will encapsulate.</param>
+    /// <param name="access">
+    ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
+    ///     <see cref="FileStream" /> object.
+    /// </param>
+    /// <param name="bufferSize">
+    ///     A positive Int32 value greater than 0 indicating the buffer size. The default buffer size is
+    ///     4096.
+    /// </param>
+    public void Add(SafeFileHandle handle, FileAccess access, int bufferSize) =>
+        Add(new FileStream(handle, access, bufferSize));
+
+    /// <summary>Adds the specified file to the end of the current stream</summary>
+    /// <param name="handle">A file handle for the file that the stream will encapsulate.</param>
+    /// <param name="access">
+    ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
+    ///     <see cref="FileStream" /> object.
+    /// </param>
+    /// <param name="bufferSize">
+    ///     A positive Int32 value greater than 0 indicating the buffer size. The default buffer size is
+    ///     4096.
+    /// </param>
+    /// <param name="isAsync">Specifies whether to use asynchronous I/O or synchronous I/O.</param>
+    public void Add(SafeFileHandle handle, FileAccess access, int bufferSize, bool isAsync) =>
+        Add(new FileStream(handle, access, bufferSize, isAsync));
+
+    /// <summary>Adds the specified file to the end of the current stream</summary>
+    /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
+    /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
+    /// <param name="access">
+    ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
+    ///     <see cref="FileStream" /> object.
+    /// </param>
+    /// <param name="share">
+    ///     A bitwise combination of the enumeration values that determines how the file will be shared by
+    ///     processes.
+    /// </param>
+    /// <param name="bufferSize">
+    ///     A positive Int32 value greater than 0 indicating the buffer size. The default buffer size is
+    ///     4096.
+    /// </param>
+    /// <param name="useAsync">Specifies whether to use asynchronous I/O or synchronous I/O.</param>
+    public void Add(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize,
+                    bool useAsync) => Add(new FileStream(path, mode, access, share, bufferSize, useAsync));
+
+    /// <summary>Adds the specified file to the end of the current stream</summary>
+    /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
+    /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
+    /// <param name="access">
+    ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
+    ///     <see cref="FileStream" /> object.
+    /// </param>
+    /// <param name="share">
+    ///     A bitwise combination of the enumeration values that determines how the file will be shared by
+    ///     processes.
+    /// </param>
+    /// <param name="bufferSize">
+    ///     A positive Int32 value greater than 0 indicating the buffer size. The default buffer size is
+    ///     4096.
+    /// </param>
+    public void Add(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize) =>
+        Add(new FileStream(path, mode, access, share, bufferSize));
+
+    /// <summary>Adds the specified file to the end of the current stream</summary>
+    /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
+    /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
+    /// <param name="access">
+    ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
+    ///     <see cref="FileStream" /> object.
+    /// </param>
+    /// <param name="share">
+    ///     A bitwise combination of the enumeration values that determines how the file will be shared by
+    ///     processes.
+    /// </param>
+    public void Add(string path, FileMode mode, FileAccess access, FileShare share) =>
+        Add(new FileStream(path, mode, access, share));
+
+    /// <summary>Adds the specified file to the end of the current stream</summary>
+    /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
+    /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
+    /// <param name="access">
+    ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
+    ///     <see cref="FileStream" /> object.
+    /// </param>
+    public void Add(string path, FileMode mode, FileAccess access) => Add(new FileStream(path, mode, access));
+
+    /// <summary>Adds the specified file to the end of the current stream</summary>
+    /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
+    /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
+    public void Add(string path, FileMode mode) => Add(new FileStream(path, mode));
+
+    /// <summary>Adds the specified byte array to the end of the current stream</summary>
+    /// <param name="buffer">The array of unsigned bytes to add at the end of this stream.</param>
+    /// <param name="index">The index into <paramref name="buffer" /> at which the stream begins.</param>
+    /// <param name="count">The length in bytes to add to the end of the current stream.</param>
+    /// <param name="writable">The setting of the CanWrite property, currently ignored.</param>
+    /// <param name="publiclyVisible">Currently ignored.</param>
+    public void Add(byte[] buffer, int index, int count, bool writable, bool publiclyVisible) =>
+        Add(new MemoryStream(buffer, index, count, writable, publiclyVisible));
+
+    /// <summary>Adds the specified byte array to the end of the current stream</summary>
+    /// <param name="buffer">The array of unsigned bytes to add at the end of this stream.</param>
+    /// <param name="index">The index into <paramref name="buffer" /> at which the stream begins.</param>
+    /// <param name="count">The length in bytes to add to the end of the current stream.</param>
+    /// <param name="writable">The setting of the CanWrite property, currently ignored.</param>
+    public void Add(byte[] buffer, int index, int count, bool writable) =>
+        Add(new MemoryStream(buffer, index, count, writable));
+
+    /// <summary>Adds the specified byte array to the end of the current stream</summary>
+    /// <param name="buffer">The array of unsigned bytes to add at the end of this stream.</param>
+    /// <param name="index">The index into <paramref name="buffer" /> at which the stream begins.</param>
+    /// <param name="count">The length in bytes to add to the end of the current stream.</param>
+    public void Add(byte[] buffer, int index, int count) => Add(new MemoryStream(buffer, index, count));
+
+    /// <summary>Adds the specified byte array to the end of the current stream</summary>
+    /// <param name="buffer">The array of unsigned bytes to add at the end of this stream.</param>
+    /// <param name="writable">The setting of the CanWrite property, currently ignored.</param>
+    public void Add(byte[] buffer, bool writable) => Add(new MemoryStream(buffer, writable));
+
+    /// <summary>Adds the specified byte array to the end of the current stream</summary>
+    /// <param name="buffer">The array of unsigned bytes to add at the end of this stream.</param>
+    public void Add(byte[] buffer) => Add(new MemoryStream(buffer));
+
+    /// <summary>Adds the data fork of the specified filter to the end of the current stream</summary>
+    /// <param name="filter">Filter</param>
+    public void Add(IFilter filter) => Add(filter.GetDataForkStream());
+
+    /// <summary>Adds a range of files to the end of the current stream, alphabetically sorted</summary>
+    /// <param name="basePath">Base file path, directory path only</param>
+    /// <param name="counterFormat">Counter format, includes filename and a formatting string</param>
+    /// <param name="counterStart">Counter start, defaults to 0</param>
+    public void AddRange(string basePath, string counterFormat = "{0:D3}", int counterStart = 0)
+    {
+        while(true)
+        {
+            string filePath = Path.Combine(basePath, string.Format(counterFormat, counterStart));
+
+            if(!File.Exists(filePath))
+                break;
+
+            Add(filePath, FileMode.Open);
+
+            counterStart++;
+        }
+    }
+
+    ~SplitJoinStream()
+    {
+        foreach(Stream stream in _baseStreams.Values)
+        {
+            stream.Close();
+            stream.Dispose();
         }
 
-        /// <inheritdoc />
-        public override bool CanRead => true;
+        _baseStreams.Clear();
+        _position = 0;
+    }
 
-        /// <inheritdoc />
-        public override bool CanSeek => true;
+    /// <inheritdoc />
+    public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback,
+                                           object state) =>
+        throw new NotSupportedException("Asynchronous I/O is not supported.");
 
-        /// <inheritdoc />
-        public override bool CanWrite => false;
+    /// <inheritdoc />
+    public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback,
+                                            object state) =>
+        throw new NotSupportedException("Asynchronous I/O is not supported.");
 
-        /// <inheritdoc />
-        public override long Length => _streamLength;
+    /// <inheritdoc />
+    public override void Close()
+    {
+        foreach(Stream stream in _baseStreams.Values)
+            stream.Close();
 
-        /// <inheritdoc />
-        public override long Position
+        _baseStreams.Clear();
+        _position = 0;
+    }
+
+    /// <inheritdoc />
+    public override int EndRead(IAsyncResult asyncResult) =>
+        throw new NotSupportedException("Asynchronous I/O is not supported.");
+
+    /// <inheritdoc />
+    public override void EndWrite(IAsyncResult asyncResult) =>
+        throw new NotSupportedException("Asynchronous I/O is not supported.");
+
+    /// <inheritdoc />
+    public override int ReadByte()
+    {
+        if(_position >= _streamLength)
+            return -1;
+
+        KeyValuePair<long, Stream> baseStream = _baseStreams.FirstOrDefault(s => s.Key >= _position);
+
+        if(baseStream.Value == null)
+            return -1;
+
+        baseStream.Value.Position = _position - baseStream.Key;
+        _position++;
+
+        return baseStream.Value.ReadByte();
+    }
+
+    /// <inheritdoc />
+    public override void WriteByte(byte value) => throw new ReadOnlyException("This stream is read-only");
+
+    /// <inheritdoc />
+    public override void Flush() {}
+
+    /// <inheritdoc />
+    public override int Read(byte[] buffer, int offset, int count)
+    {
+        int read = 0;
+
+        while(count > 0)
         {
-            get => _position;
-
-            set
-            {
-                if(value >= _streamLength)
-                    throw new IOException("Cannot set position past stream end.");
-
-                _position = value;
-            }
-        }
-
-        /// <summary>Gets a filter from this stream</summary>
-        public IFilter Filter { get; }
-
-        /// <summary>Adds a stream at the end of the current stream</summary>
-        /// <param name="stream">Stream to add</param>
-        /// <exception cref="ArgumentException">The specified stream is non-readable or non-seekable</exception>
-        public void Add(Stream stream)
-        {
-            if(!stream.CanSeek)
-                throw new ArgumentException("Non-seekable streams are not supported");
-
-            if(!stream.CanRead)
-                throw new ArgumentException("Non-readable streams are not supported");
-
-            _baseStreams[_streamLength] =  stream;
-            _streamLength               += stream.Length;
-        }
-
-        /// <summary>Adds the specified file to the end of the current stream</summary>
-        /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
-        /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
-        /// <param name="access">
-        ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
-        ///     <see cref="FileStream" /> object.
-        /// </param>
-        /// <param name="share">
-        ///     A bitwise combination of the enumeration values that determines how the file will be shared by
-        ///     processes.
-        /// </param>
-        /// <param name="bufferSize">
-        ///     A positive Int32 value greater than 0 indicating the buffer size. The default buffer size is
-        ///     4096.
-        /// </param>
-        /// <param name="options">A bitwise combination of the enumeration values that specifies additional file options.</param>
-        public void Add(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize,
-                        FileOptions options) => Add(new FileStream(path, mode, access, share, bufferSize, options));
-
-        /// <summary>Adds the specified file to the end of the current stream</summary>
-        /// <param name="handle">A file handle for the file that the stream will encapsulate.</param>
-        /// <param name="access">
-        ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
-        ///     <see cref="FileStream" /> object.
-        /// </param>
-        public void Add(SafeFileHandle handle, FileAccess access) => Add(new FileStream(handle, access));
-
-        /// <summary>Adds the specified file to the end of the current stream</summary>
-        /// <param name="handle">A file handle for the file that the stream will encapsulate.</param>
-        /// <param name="access">
-        ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
-        ///     <see cref="FileStream" /> object.
-        /// </param>
-        /// <param name="bufferSize">
-        ///     A positive Int32 value greater than 0 indicating the buffer size. The default buffer size is
-        ///     4096.
-        /// </param>
-        public void Add(SafeFileHandle handle, FileAccess access, int bufferSize) =>
-            Add(new FileStream(handle, access, bufferSize));
-
-        /// <summary>Adds the specified file to the end of the current stream</summary>
-        /// <param name="handle">A file handle for the file that the stream will encapsulate.</param>
-        /// <param name="access">
-        ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
-        ///     <see cref="FileStream" /> object.
-        /// </param>
-        /// <param name="bufferSize">
-        ///     A positive Int32 value greater than 0 indicating the buffer size. The default buffer size is
-        ///     4096.
-        /// </param>
-        /// <param name="isAsync">Specifies whether to use asynchronous I/O or synchronous I/O.</param>
-        public void Add(SafeFileHandle handle, FileAccess access, int bufferSize, bool isAsync) =>
-            Add(new FileStream(handle, access, bufferSize, isAsync));
-
-        /// <summary>Adds the specified file to the end of the current stream</summary>
-        /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
-        /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
-        /// <param name="access">
-        ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
-        ///     <see cref="FileStream" /> object.
-        /// </param>
-        /// <param name="share">
-        ///     A bitwise combination of the enumeration values that determines how the file will be shared by
-        ///     processes.
-        /// </param>
-        /// <param name="bufferSize">
-        ///     A positive Int32 value greater than 0 indicating the buffer size. The default buffer size is
-        ///     4096.
-        /// </param>
-        /// <param name="useAsync">Specifies whether to use asynchronous I/O or synchronous I/O.</param>
-        public void Add(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize,
-                        bool useAsync) => Add(new FileStream(path, mode, access, share, bufferSize, useAsync));
-
-        /// <summary>Adds the specified file to the end of the current stream</summary>
-        /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
-        /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
-        /// <param name="access">
-        ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
-        ///     <see cref="FileStream" /> object.
-        /// </param>
-        /// <param name="share">
-        ///     A bitwise combination of the enumeration values that determines how the file will be shared by
-        ///     processes.
-        /// </param>
-        /// <param name="bufferSize">
-        ///     A positive Int32 value greater than 0 indicating the buffer size. The default buffer size is
-        ///     4096.
-        /// </param>
-        public void Add(string path, FileMode mode, FileAccess access, FileShare share, int bufferSize) =>
-            Add(new FileStream(path, mode, access, share, bufferSize));
-
-        /// <summary>Adds the specified file to the end of the current stream</summary>
-        /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
-        /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
-        /// <param name="access">
-        ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
-        ///     <see cref="FileStream" /> object.
-        /// </param>
-        /// <param name="share">
-        ///     A bitwise combination of the enumeration values that determines how the file will be shared by
-        ///     processes.
-        /// </param>
-        public void Add(string path, FileMode mode, FileAccess access, FileShare share) =>
-            Add(new FileStream(path, mode, access, share));
-
-        /// <summary>Adds the specified file to the end of the current stream</summary>
-        /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
-        /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
-        /// <param name="access">
-        ///     A bitwise combination of the enumeration values that determines how the file can be accessed by a
-        ///     <see cref="FileStream" /> object.
-        /// </param>
-        public void Add(string path, FileMode mode, FileAccess access) => Add(new FileStream(path, mode, access));
-
-        /// <summary>Adds the specified file to the end of the current stream</summary>
-        /// <param name="path">A relative or absolute path for the file that the stream will encapsulate.</param>
-        /// <param name="mode">One of the enumeration values that determines how to open or create the file.</param>
-        public void Add(string path, FileMode mode) => Add(new FileStream(path, mode));
-
-        /// <summary>Adds the specified byte array to the end of the current stream</summary>
-        /// <param name="buffer">The array of unsigned bytes to add at the end of this stream.</param>
-        /// <param name="index">The index into <paramref name="buffer" /> at which the stream begins.</param>
-        /// <param name="count">The length in bytes to add to the end of the current stream.</param>
-        /// <param name="writable">The setting of the CanWrite property, currently ignored.</param>
-        /// <param name="publiclyVisible">Currently ignored.</param>
-        public void Add(byte[] buffer, int index, int count, bool writable, bool publiclyVisible) =>
-            Add(new MemoryStream(buffer, index, count, writable, publiclyVisible));
-
-        /// <summary>Adds the specified byte array to the end of the current stream</summary>
-        /// <param name="buffer">The array of unsigned bytes to add at the end of this stream.</param>
-        /// <param name="index">The index into <paramref name="buffer" /> at which the stream begins.</param>
-        /// <param name="count">The length in bytes to add to the end of the current stream.</param>
-        /// <param name="writable">The setting of the CanWrite property, currently ignored.</param>
-        public void Add(byte[] buffer, int index, int count, bool writable) =>
-            Add(new MemoryStream(buffer, index, count, writable));
-
-        /// <summary>Adds the specified byte array to the end of the current stream</summary>
-        /// <param name="buffer">The array of unsigned bytes to add at the end of this stream.</param>
-        /// <param name="index">The index into <paramref name="buffer" /> at which the stream begins.</param>
-        /// <param name="count">The length in bytes to add to the end of the current stream.</param>
-        public void Add(byte[] buffer, int index, int count) => Add(new MemoryStream(buffer, index, count));
-
-        /// <summary>Adds the specified byte array to the end of the current stream</summary>
-        /// <param name="buffer">The array of unsigned bytes to add at the end of this stream.</param>
-        /// <param name="writable">The setting of the CanWrite property, currently ignored.</param>
-        public void Add(byte[] buffer, bool writable) => Add(new MemoryStream(buffer, writable));
-
-        /// <summary>Adds the specified byte array to the end of the current stream</summary>
-        /// <param name="buffer">The array of unsigned bytes to add at the end of this stream.</param>
-        public void Add(byte[] buffer) => Add(new MemoryStream(buffer));
-
-        /// <summary>Adds the data fork of the specified filter to the end of the current stream</summary>
-        /// <param name="filter">Filter</param>
-        public void Add(IFilter filter) => Add(filter.GetDataForkStream());
-
-        /// <summary>Adds a range of files to the end of the current stream, alphabetically sorted</summary>
-        /// <param name="basePath">Base file path, directory path only</param>
-        /// <param name="counterFormat">Counter format, includes filename and a formatting string</param>
-        /// <param name="counterStart">Counter start, defaults to 0</param>
-        public void AddRange(string basePath, string counterFormat = "{0:D3}", int counterStart = 0)
-        {
-            while(true)
-            {
-                string filePath = Path.Combine(basePath, string.Format(counterFormat, counterStart));
-
-                if(!File.Exists(filePath))
-                    break;
-
-                Add(filePath, FileMode.Open);
-
-                counterStart++;
-            }
-        }
-
-        ~SplitJoinStream()
-        {
-            foreach(Stream stream in _baseStreams.Values)
-            {
-                stream.Close();
-                stream.Dispose();
-            }
-
-            _baseStreams.Clear();
-            _position = 0;
-        }
-
-        /// <inheritdoc />
-        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback,
-                                               object state) =>
-            throw new NotSupportedException("Asynchronous I/O is not supported.");
-
-        /// <inheritdoc />
-        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback,
-                                                object state) =>
-            throw new NotSupportedException("Asynchronous I/O is not supported.");
-
-        /// <inheritdoc />
-        public override void Close()
-        {
-            foreach(Stream stream in _baseStreams.Values)
-                stream.Close();
-
-            _baseStreams.Clear();
-            _position = 0;
-        }
-
-        /// <inheritdoc />
-        public override int EndRead(IAsyncResult asyncResult) =>
-            throw new NotSupportedException("Asynchronous I/O is not supported.");
-
-        /// <inheritdoc />
-        public override void EndWrite(IAsyncResult asyncResult) =>
-            throw new NotSupportedException("Asynchronous I/O is not supported.");
-
-        /// <inheritdoc />
-        public override int ReadByte()
-        {
-            if(_position >= _streamLength)
-                return -1;
-
-            KeyValuePair<long, Stream> baseStream = _baseStreams.FirstOrDefault(s => s.Key >= _position);
+            KeyValuePair<long, Stream> baseStream = _baseStreams.LastOrDefault(s => s.Key <= _position);
 
             if(baseStream.Value == null)
-                return -1;
+                break;
 
             baseStream.Value.Position = _position - baseStream.Key;
-            _position++;
 
-            return baseStream.Value.ReadByte();
+            int currentCount = count;
+
+            if(baseStream.Value.Position + currentCount > baseStream.Value.Length)
+                currentCount = (int)(baseStream.Value.Length - baseStream.Value.Position);
+
+            read += baseStream.Value.Read(buffer, offset, currentCount);
+
+            count  -= currentCount;
+            offset += currentCount;
         }
 
-        /// <inheritdoc />
-        public override void WriteByte(byte value) => throw new ReadOnlyException("This stream is read-only");
-
-        /// <inheritdoc />
-        public override void Flush() {}
-
-        /// <inheritdoc />
-        public override int Read(byte[] buffer, int offset, int count)
-        {
-            int read = 0;
-
-            while(count > 0)
-            {
-                KeyValuePair<long, Stream> baseStream = _baseStreams.LastOrDefault(s => s.Key <= _position);
-
-                if(baseStream.Value == null)
-                    break;
-
-                baseStream.Value.Position = _position - baseStream.Key;
-
-                int currentCount = count;
-
-                if(baseStream.Value.Position + currentCount > baseStream.Value.Length)
-                    currentCount = (int)(baseStream.Value.Length - baseStream.Value.Position);
-
-                read += baseStream.Value.Read(buffer, offset, currentCount);
-
-                count  -= currentCount;
-                offset += currentCount;
-            }
-
-            return read;
-        }
-
-        /// <inheritdoc />
-        public override long Seek(long offset, SeekOrigin origin)
-        {
-            switch(origin)
-            {
-                case SeekOrigin.Begin:
-                    if(offset >= _streamLength)
-                        throw new IOException("Cannot seek past stream end.");
-
-                    _position = offset;
-
-                    break;
-                case SeekOrigin.End:
-                    if(_position - offset < 0)
-                        throw new IOException("Cannot seek before stream start.");
-
-                    _position -= offset;
-
-                    break;
-                default:
-                    if(_position + offset >= _streamLength)
-                        throw new IOException("Cannot seek past stream end.");
-
-                    _position += offset;
-
-                    break;
-            }
-
-            return _position;
-        }
-
-        /// <inheritdoc />
-        public override void SetLength(long value) => throw new ReadOnlyException("This stream is read-only");
-
-        /// <inheritdoc />
-        public override void Write(byte[] buffer, int offset, int count) =>
-            throw new ReadOnlyException("This stream is read-only");
+        return read;
     }
+
+    /// <inheritdoc />
+    public override long Seek(long offset, SeekOrigin origin)
+    {
+        switch(origin)
+        {
+            case SeekOrigin.Begin:
+                if(offset >= _streamLength)
+                    throw new IOException("Cannot seek past stream end.");
+
+                _position = offset;
+
+                break;
+            case SeekOrigin.End:
+                if(_position - offset < 0)
+                    throw new IOException("Cannot seek before stream start.");
+
+                _position -= offset;
+
+                break;
+            default:
+                if(_position + offset >= _streamLength)
+                    throw new IOException("Cannot seek past stream end.");
+
+                _position += offset;
+
+                break;
+        }
+
+        return _position;
+    }
+
+    /// <inheritdoc />
+    public override void SetLength(long value) => throw new ReadOnlyException("This stream is read-only");
+
+    /// <inheritdoc />
+    public override void Write(byte[] buffer, int offset, int count) =>
+        throw new ReadOnlyException("This stream is read-only");
 }
\ No newline at end of file
diff --git a/Aaru.Filters/XZ.cs b/Aaru.Filters/XZ.cs
index 5b445fd08..834a10cbb 100644
--- a/Aaru.Filters/XZ.cs
+++ b/Aaru.Filters/XZ.cs
@@ -36,214 +36,213 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using SharpCompress.Compressors.Xz;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+/// <inheritdoc />
+/// <summary>Decompress xz files while reading</summary>
+public sealed class XZ : IFilter
 {
+    Stream _dataStream;
+    Stream _innerStream;
+
     /// <inheritdoc />
-    /// <summary>Decompress xz files while reading</summary>
-    public sealed class XZ : IFilter
+    public string Name => "XZ";
+    /// <inheritdoc />
+    public Guid Id => new("666A8617-0444-4C05-9F4F-DF0FD758D0D2");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public void Close()
     {
-        Stream _dataStream;
-        Stream _innerStream;
+        _dataStream?.Close();
+        _dataStream = null;
+        BasePath    = null;
+    }
 
-        /// <inheritdoc />
-        public string Name => "XZ";
-        /// <inheritdoc />
-        public Guid Id => new("666A8617-0444-4C05-9F4F-DF0FD758D0D2");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string BasePath { get; private set; }
 
-        /// <inheritdoc />
-        public void Close()
+    /// <inheritdoc />
+    public Stream GetDataForkStream() => _innerStream;
+
+    /// <inheritdoc />
+    public string Path => BasePath;
+
+    /// <inheritdoc />
+    public Stream GetResourceForkStream() => null;
+
+    /// <inheritdoc />
+    public bool HasResourceFork => false;
+
+    /// <inheritdoc />
+    public bool Identify(byte[] buffer) => buffer[0]  == 0xFD && buffer[1]  == 0x37 && buffer[2] == 0x7A &&
+                                           buffer[3]  == 0x58 && buffer[4]  == 0x5A && buffer[5] == 0x00 &&
+                                           buffer[^2] == 0x59 && buffer[^1] == 0x5A;
+
+    /// <inheritdoc />
+    public bool Identify(Stream stream)
+    {
+        byte[] buffer = new byte[6];
+        byte[] footer = new byte[2];
+
+        if(stream.Length < 8)
+            return false;
+
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, 6);
+        stream.Seek(-2, SeekOrigin.End);
+        stream.Read(footer, 0, 2);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        return buffer[0] == 0xFD && buffer[1] == 0x37 && buffer[2] == 0x7A && buffer[3] == 0x58 &&
+               buffer[4] == 0x5A && buffer[5] == 0x00 && footer[0] == 0x59 && footer[1] == 0x5A;
+    }
+
+    /// <inheritdoc />
+    public bool Identify(string path)
+    {
+        if(!File.Exists(path))
+            return false;
+
+        var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        byte[] buffer = new byte[6];
+        byte[] footer = new byte[2];
+
+        if(stream.Length < 8)
+            return false;
+
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, 6);
+        stream.Seek(-2, SeekOrigin.End);
+        stream.Read(footer, 0, 2);
+        stream.Seek(0, SeekOrigin.Begin);
+
+        return buffer[0] == 0xFD && buffer[1] == 0x37 && buffer[2] == 0x7A && buffer[3] == 0x58 &&
+               buffer[4] == 0x5A && buffer[5] == 0x00 && footer[0] == 0x59 && footer[1] == 0x5A;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(byte[] buffer)
+    {
+        _dataStream   = new MemoryStream(buffer);
+        BasePath      = null;
+        CreationTime  = DateTime.UtcNow;
+        LastWriteTime = CreationTime;
+        GuessSize();
+        _innerStream = new ForcedSeekStream<XZStream>(DataForkLength, _dataStream);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(Stream stream)
+    {
+        _dataStream   = stream;
+        BasePath      = null;
+        CreationTime  = DateTime.UtcNow;
+        LastWriteTime = CreationTime;
+        GuessSize();
+        _innerStream = new ForcedSeekStream<XZStream>(DataForkLength, _dataStream);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(string path)
+    {
+        _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        BasePath    = System.IO.Path.GetFullPath(path);
+
+        var fi = new FileInfo(path);
+        CreationTime  = fi.CreationTimeUtc;
+        LastWriteTime = fi.LastWriteTimeUtc;
+        GuessSize();
+        _innerStream = new ForcedSeekStream<XZStream>(DataForkLength, _dataStream);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public DateTime CreationTime { get; private set; }
+
+    /// <inheritdoc />
+    public long DataForkLength { get; private set; }
+
+    /// <inheritdoc />
+    public DateTime LastWriteTime { get; private set; }
+
+    /// <inheritdoc />
+    public long Length => DataForkLength;
+
+    /// <inheritdoc />
+    public long ResourceForkLength => 0;
+
+    /// <inheritdoc />
+    public string Filename
+    {
+        get
         {
-            _dataStream?.Close();
-            _dataStream = null;
-            BasePath    = null;
-        }
+            if(BasePath?.EndsWith(".xz", StringComparison.InvariantCultureIgnoreCase) == true)
+                return BasePath.Substring(0, BasePath.Length - 3);
 
-        /// <inheritdoc />
-        public string BasePath { get; private set; }
-
-        /// <inheritdoc />
-        public Stream GetDataForkStream() => _innerStream;
-
-        /// <inheritdoc />
-        public string Path => BasePath;
-
-        /// <inheritdoc />
-        public Stream GetResourceForkStream() => null;
-
-        /// <inheritdoc />
-        public bool HasResourceFork => false;
-
-        /// <inheritdoc />
-        public bool Identify(byte[] buffer) => buffer[0]  == 0xFD && buffer[1]  == 0x37 && buffer[2] == 0x7A &&
-                                               buffer[3]  == 0x58 && buffer[4]  == 0x5A && buffer[5] == 0x00 &&
-                                               buffer[^2] == 0x59 && buffer[^1] == 0x5A;
-
-        /// <inheritdoc />
-        public bool Identify(Stream stream)
-        {
-            byte[] buffer = new byte[6];
-            byte[] footer = new byte[2];
-
-            if(stream.Length < 8)
-                return false;
-
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, 6);
-            stream.Seek(-2, SeekOrigin.End);
-            stream.Read(footer, 0, 2);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            return buffer[0] == 0xFD && buffer[1] == 0x37 && buffer[2] == 0x7A && buffer[3] == 0x58 &&
-                   buffer[4] == 0x5A && buffer[5] == 0x00 && footer[0] == 0x59 && footer[1] == 0x5A;
-        }
-
-        /// <inheritdoc />
-        public bool Identify(string path)
-        {
-            if(!File.Exists(path))
-                return false;
-
-            var    stream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            byte[] buffer = new byte[6];
-            byte[] footer = new byte[2];
-
-            if(stream.Length < 8)
-                return false;
-
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, 6);
-            stream.Seek(-2, SeekOrigin.End);
-            stream.Read(footer, 0, 2);
-            stream.Seek(0, SeekOrigin.Begin);
-
-            return buffer[0] == 0xFD && buffer[1] == 0x37 && buffer[2] == 0x7A && buffer[3] == 0x58 &&
-                   buffer[4] == 0x5A && buffer[5] == 0x00 && footer[0] == 0x59 && footer[1] == 0x5A;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(byte[] buffer)
-        {
-            _dataStream   = new MemoryStream(buffer);
-            BasePath      = null;
-            CreationTime  = DateTime.UtcNow;
-            LastWriteTime = CreationTime;
-            GuessSize();
-            _innerStream = new ForcedSeekStream<XZStream>(DataForkLength, _dataStream);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(Stream stream)
-        {
-            _dataStream   = stream;
-            BasePath      = null;
-            CreationTime  = DateTime.UtcNow;
-            LastWriteTime = CreationTime;
-            GuessSize();
-            _innerStream = new ForcedSeekStream<XZStream>(DataForkLength, _dataStream);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(string path)
-        {
-            _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            BasePath    = System.IO.Path.GetFullPath(path);
-
-            var fi = new FileInfo(path);
-            CreationTime  = fi.CreationTimeUtc;
-            LastWriteTime = fi.LastWriteTimeUtc;
-            GuessSize();
-            _innerStream = new ForcedSeekStream<XZStream>(DataForkLength, _dataStream);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public DateTime CreationTime { get; private set; }
-
-        /// <inheritdoc />
-        public long DataForkLength { get; private set; }
-
-        /// <inheritdoc />
-        public DateTime LastWriteTime { get; private set; }
-
-        /// <inheritdoc />
-        public long Length => DataForkLength;
-
-        /// <inheritdoc />
-        public long ResourceForkLength => 0;
-
-        /// <inheritdoc />
-        public string Filename
-        {
-            get
-            {
-                if(BasePath?.EndsWith(".xz", StringComparison.InvariantCultureIgnoreCase) == true)
-                    return BasePath.Substring(0, BasePath.Length - 3);
-
-                return BasePath?.EndsWith(".xzip", StringComparison.InvariantCultureIgnoreCase) == true
-                           ? BasePath.Substring(0, BasePath.Length - 5) : BasePath;
-            }
-        }
-
-        /// <inheritdoc />
-        public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
-
-        void GuessSize()
-        {
-            DataForkLength = 0;
-
-            // Seek to footer backwards size field
-            _dataStream.Seek(-8, SeekOrigin.End);
-            byte[] tmp = new byte[4];
-            _dataStream.Read(tmp, 0, 4);
-            uint backwardSize = (BitConverter.ToUInt32(tmp, 0) + 1) * 4;
-
-            // Seek to first indexed record
-            _dataStream.Seek(-12 - (backwardSize - 2), SeekOrigin.End);
-
-            // Skip compressed size
-            tmp = new byte[backwardSize - 2];
-            _dataStream.Read(tmp, 0, tmp.Length);
-            ulong number = 0;
-            int   ignore = Decode(tmp, tmp.Length, ref number);
-
-            // Get compressed size
-            _dataStream.Seek(-12 - (backwardSize - 2 - ignore), SeekOrigin.End);
-            tmp = new byte[backwardSize - 2 - ignore];
-            _dataStream.Read(tmp, 0, tmp.Length);
-            Decode(tmp, tmp.Length, ref number);
-            DataForkLength = (long)number;
-
-            _dataStream.Seek(0, SeekOrigin.Begin);
-        }
-
-        int Decode(byte[] buf, int sizeMax, ref ulong num)
-        {
-            if(sizeMax == 0)
-                return 0;
-
-            if(sizeMax > 9)
-                sizeMax = 9;
-
-            num = (ulong)(buf[0] & 0x7F);
-            int i = 0;
-
-            while((buf[i++] & 0x80) == 0x80)
-            {
-                if(i      >= sizeMax ||
-                   buf[i] == 0x00)
-                    return 0;
-
-                num |= (ulong)(buf[i] & 0x7F) << (i * 7);
-            }
-
-            return i;
+            return BasePath?.EndsWith(".xzip", StringComparison.InvariantCultureIgnoreCase) == true
+                       ? BasePath.Substring(0, BasePath.Length - 5) : BasePath;
         }
     }
+
+    /// <inheritdoc />
+    public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
+
+    void GuessSize()
+    {
+        DataForkLength = 0;
+
+        // Seek to footer backwards size field
+        _dataStream.Seek(-8, SeekOrigin.End);
+        byte[] tmp = new byte[4];
+        _dataStream.Read(tmp, 0, 4);
+        uint backwardSize = (BitConverter.ToUInt32(tmp, 0) + 1) * 4;
+
+        // Seek to first indexed record
+        _dataStream.Seek(-12 - (backwardSize - 2), SeekOrigin.End);
+
+        // Skip compressed size
+        tmp = new byte[backwardSize - 2];
+        _dataStream.Read(tmp, 0, tmp.Length);
+        ulong number = 0;
+        int   ignore = Decode(tmp, tmp.Length, ref number);
+
+        // Get compressed size
+        _dataStream.Seek(-12 - (backwardSize - 2 - ignore), SeekOrigin.End);
+        tmp = new byte[backwardSize - 2 - ignore];
+        _dataStream.Read(tmp, 0, tmp.Length);
+        Decode(tmp, tmp.Length, ref number);
+        DataForkLength = (long)number;
+
+        _dataStream.Seek(0, SeekOrigin.Begin);
+    }
+
+    int Decode(byte[] buf, int sizeMax, ref ulong num)
+    {
+        if(sizeMax == 0)
+            return 0;
+
+        if(sizeMax > 9)
+            sizeMax = 9;
+
+        num = (ulong)(buf[0] & 0x7F);
+        int i = 0;
+
+        while((buf[i++] & 0x80) == 0x80)
+        {
+            if(i      >= sizeMax ||
+               buf[i] == 0x00)
+                return 0;
+
+            num |= (ulong)(buf[i] & 0x7F) << (i * 7);
+        }
+
+        return i;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Filters/ZZZNoFilter.cs b/Aaru.Filters/ZZZNoFilter.cs
index d0369b1e8..01a330af3 100644
--- a/Aaru.Filters/ZZZNoFilter.cs
+++ b/Aaru.Filters/ZZZNoFilter.cs
@@ -35,106 +35,105 @@ using System.IO;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.Filters
+namespace Aaru.Filters;
+
+/// <inheritdoc />
+/// <summary>No filter for reading files not recognized by any filter</summary>
+public sealed class ZZZNoFilter : IFilter
 {
+    Stream _dataStream;
+
     /// <inheritdoc />
-    /// <summary>No filter for reading files not recognized by any filter</summary>
-    public sealed class ZZZNoFilter : IFilter
+    public string Name => "No filter";
+    /// <inheritdoc />
+    public Guid Id => new("12345678-AAAA-BBBB-CCCC-123456789000");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public void Close()
     {
-        Stream _dataStream;
-
-        /// <inheritdoc />
-        public string Name => "No filter";
-        /// <inheritdoc />
-        public Guid Id => new("12345678-AAAA-BBBB-CCCC-123456789000");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public void Close()
-        {
-            _dataStream?.Close();
-            _dataStream = null;
-            BasePath    = null;
-        }
-
-        /// <inheritdoc />
-        public string BasePath { get; private set; }
-
-        /// <inheritdoc />
-        public Stream GetDataForkStream() => _dataStream;
-
-        /// <inheritdoc />
-        public string Path => BasePath;
-
-        /// <inheritdoc />
-        public Stream GetResourceForkStream() => null;
-
-        /// <inheritdoc />
-        public bool HasResourceFork => false;
-
-        /// <inheritdoc />
-        public bool Identify(byte[] buffer) => buffer != null && buffer.Length > 0;
-
-        /// <inheritdoc />
-        public bool Identify(Stream stream) => stream != null && stream.Length > 0;
-
-        /// <inheritdoc />
-        public bool Identify(string path) => File.Exists(path);
-
-        /// <inheritdoc />
-        public ErrorNumber Open(byte[] buffer)
-        {
-            _dataStream   = new MemoryStream(buffer);
-            BasePath      = null;
-            CreationTime  = DateTime.UtcNow;
-            LastWriteTime = CreationTime;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(Stream stream)
-        {
-            _dataStream   = stream;
-            BasePath      = null;
-            CreationTime  = DateTime.UtcNow;
-            LastWriteTime = CreationTime;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber Open(string path)
-        {
-            _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
-            BasePath    = System.IO.Path.GetFullPath(path);
-            var fi = new FileInfo(path);
-            CreationTime  = fi.CreationTimeUtc;
-            LastWriteTime = fi.LastWriteTimeUtc;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public DateTime CreationTime { get; private set; }
-
-        /// <inheritdoc />
-        public long DataForkLength => _dataStream.Length;
-
-        /// <inheritdoc />
-        public DateTime LastWriteTime { get; private set; }
-
-        /// <inheritdoc />
-        public long Length => _dataStream.Length;
-
-        /// <inheritdoc />
-        public long ResourceForkLength => 0;
-
-        /// <inheritdoc />
-        public string Filename => System.IO.Path.GetFileName(BasePath);
-
-        /// <inheritdoc />
-        public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
+        _dataStream?.Close();
+        _dataStream = null;
+        BasePath    = null;
     }
+
+    /// <inheritdoc />
+    public string BasePath { get; private set; }
+
+    /// <inheritdoc />
+    public Stream GetDataForkStream() => _dataStream;
+
+    /// <inheritdoc />
+    public string Path => BasePath;
+
+    /// <inheritdoc />
+    public Stream GetResourceForkStream() => null;
+
+    /// <inheritdoc />
+    public bool HasResourceFork => false;
+
+    /// <inheritdoc />
+    public bool Identify(byte[] buffer) => buffer != null && buffer.Length > 0;
+
+    /// <inheritdoc />
+    public bool Identify(Stream stream) => stream != null && stream.Length > 0;
+
+    /// <inheritdoc />
+    public bool Identify(string path) => File.Exists(path);
+
+    /// <inheritdoc />
+    public ErrorNumber Open(byte[] buffer)
+    {
+        _dataStream   = new MemoryStream(buffer);
+        BasePath      = null;
+        CreationTime  = DateTime.UtcNow;
+        LastWriteTime = CreationTime;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(Stream stream)
+    {
+        _dataStream   = stream;
+        BasePath      = null;
+        CreationTime  = DateTime.UtcNow;
+        LastWriteTime = CreationTime;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber Open(string path)
+    {
+        _dataStream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        BasePath    = System.IO.Path.GetFullPath(path);
+        var fi = new FileInfo(path);
+        CreationTime  = fi.CreationTimeUtc;
+        LastWriteTime = fi.LastWriteTimeUtc;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public DateTime CreationTime { get; private set; }
+
+    /// <inheritdoc />
+    public long DataForkLength => _dataStream.Length;
+
+    /// <inheritdoc />
+    public DateTime LastWriteTime { get; private set; }
+
+    /// <inheritdoc />
+    public long Length => _dataStream.Length;
+
+    /// <inheritdoc />
+    public long ResourceForkLength => 0;
+
+    /// <inheritdoc />
+    public string Filename => System.IO.Path.GetFileName(BasePath);
+
+    /// <inheritdoc />
+    public string ParentFolder => System.IO.Path.GetDirectoryName(BasePath);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/App.xaml.cs b/Aaru.Gui/App.xaml.cs
index ee6606459..bc9a5799f 100644
--- a/Aaru.Gui/App.xaml.cs
+++ b/Aaru.Gui/App.xaml.cs
@@ -41,77 +41,76 @@ using Avalonia.Markup.Xaml;
 // ReSharper disable UnusedMember.Local
 // ReSharper disable UnusedParameter.Local
 
-namespace Aaru.Gui
+namespace Aaru.Gui;
+
+public sealed class App : Application
 {
-    public sealed class App : Application
+    public override void Initialize() => AvaloniaXamlLoader.Load(this);
+
+    public override void OnFrameworkInitializationCompleted()
     {
-        public override void Initialize() => AvaloniaXamlLoader.Load(this);
-
-        public override void OnFrameworkInitializationCompleted()
+        if(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            if(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
-            {
-                var splashWindow = new SplashWindow();
-                var swvm         = new SplashWindowViewModel(splashWindow);
-                swvm.WorkFinished        += OnSplashFinished;
-                splashWindow.DataContext =  swvm;
-                desktop.MainWindow       =  splashWindow;
-            }
-
-            base.OnFrameworkInitializationCompleted();
+            var splashWindow = new SplashWindow();
+            var swvm         = new SplashWindowViewModel(splashWindow);
+            swvm.WorkFinished        += OnSplashFinished;
+            splashWindow.DataContext =  swvm;
+            desktop.MainWindow       =  splashWindow;
         }
 
-        void OnSplashFinished(object sender, EventArgs e)
-        {
-            if(!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop))
-                return;
+        base.OnFrameworkInitializationCompleted();
+    }
 
-            // Ensure not exit
-            desktop.ShutdownMode = ShutdownMode.OnExplicitShutdown;
+    void OnSplashFinished(object sender, EventArgs e)
+    {
+        if(!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop))
+            return;
 
-            // Close splash window
-            desktop.MainWindow.Close();
+        // Ensure not exit
+        desktop.ShutdownMode = ShutdownMode.OnExplicitShutdown;
 
-            // Create and show main window
-            desktop.MainWindow             = new MainWindow();
-            desktop.MainWindow.DataContext = new MainWindowViewModel(desktop.MainWindow as MainWindow);
-            desktop.MainWindow.Show();
+        // Close splash window
+        desktop.MainWindow.Close();
 
-            // Now can close when all windows are closed
-            desktop.ShutdownMode = ShutdownMode.OnLastWindowClose;
-        }
+        // Create and show main window
+        desktop.MainWindow             = new MainWindow();
+        desktop.MainWindow.DataContext = new MainWindowViewModel(desktop.MainWindow as MainWindow);
+        desktop.MainWindow.Show();
 
-        void OnAboutClicked(object sender, EventArgs args)
-        {
-            if(!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime
-                    {
-                        MainWindow: MainWindow { DataContext: MainWindowViewModel mainWindowViewModel }
-                    }))
-                return;
+        // Now can close when all windows are closed
+        desktop.ShutdownMode = ShutdownMode.OnLastWindowClose;
+    }
 
-            mainWindowViewModel.ExecuteAboutCommand();
-        }
+    void OnAboutClicked(object sender, EventArgs args)
+    {
+        if(!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime
+                {
+                    MainWindow: MainWindow { DataContext: MainWindowViewModel mainWindowViewModel }
+                }))
+            return;
 
-        void OnQuitClicked(object sender, EventArgs args)
-        {
-            if(!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime
-                    {
-                        MainWindow: MainWindow { DataContext: MainWindowViewModel mainWindowViewModel }
-                    }))
-                return;
+        mainWindowViewModel.ExecuteAboutCommand();
+    }
 
-            mainWindowViewModel.ExecuteExitCommand();
-        }
+    void OnQuitClicked(object sender, EventArgs args)
+    {
+        if(!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime
+                {
+                    MainWindow: MainWindow { DataContext: MainWindowViewModel mainWindowViewModel }
+                }))
+            return;
 
-        void OnPreferencesClicked(object sender, EventArgs args)
-        {
-            if(!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime
-                    {
-                        MainWindow: MainWindow { DataContext: MainWindowViewModel mainWindowViewModel }
-                    }))
-                return;
+        mainWindowViewModel.ExecuteExitCommand();
+    }
 
-            mainWindowViewModel.ExecuteSettingsCommand();
-        }
+    void OnPreferencesClicked(object sender, EventArgs args)
+    {
+        if(!(ApplicationLifetime is IClassicDesktopStyleApplicationLifetime
+                {
+                    MainWindow: MainWindow { DataContext: MainWindowViewModel mainWindowViewModel }
+                }))
+            return;
+
+        mainWindowViewModel.ExecuteSettingsCommand();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ConsoleHandler.cs b/Aaru.Gui/ConsoleHandler.cs
index 86c481ba7..b8dea796a 100644
--- a/Aaru.Gui/ConsoleHandler.cs
+++ b/Aaru.Gui/ConsoleHandler.cs
@@ -36,121 +36,120 @@ using System.Collections.ObjectModel;
 using Aaru.Console;
 using JetBrains.Annotations;
 
-namespace Aaru.Gui
+namespace Aaru.Gui;
+
+internal static class ConsoleHandler
 {
-    internal static class ConsoleHandler
+    static bool _debug;
+    static bool _verbose;
+
+    public static bool Debug
     {
-        static bool _debug;
-        static bool _verbose;
-
-        public static bool Debug
+        get => _debug;
+        set
         {
-            get => _debug;
-            set
-            {
-                if(_debug == value)
-                    return;
-
-                _debug = value;
-
-                if(_debug)
-                    AaruConsole.DebugWithModuleWriteLineEvent += OnDebugWriteHandler;
-                else
-                    AaruConsole.DebugWithModuleWriteLineEvent -= OnDebugWriteHandler;
-            }
-        }
-
-        public static bool Verbose
-        {
-            get => _verbose;
-            set
-            {
-                if(_verbose == value)
-                    return;
-
-                _verbose = value;
-
-                if(_verbose)
-                    AaruConsole.VerboseWriteLineEvent += OnVerboseWriteHandler;
-                else
-                    AaruConsole.VerboseWriteLineEvent -= OnVerboseWriteHandler;
-            }
-        }
-
-        public static ObservableCollection<LogEntry> Entries { get; } = new ObservableCollection<LogEntry>();
-
-        internal static void Init()
-        {
-            AaruConsole.WriteLineEvent      += OnWriteHandler;
-            AaruConsole.ErrorWriteLineEvent += OnErrorWriteHandler;
-        }
-
-        static void OnWriteHandler([CanBeNull] string format, [CanBeNull] params object[] arg)
-        {
-            if(format == null ||
-               arg    == null)
+            if(_debug == value)
                 return;
 
-            Entries.Add(new LogEntry
-            {
-                Message   = string.Format(format, arg),
-                Module    = null,
-                Timestamp = DateTime.Now,
-                Type      = "Info"
-            });
-        }
+            _debug = value;
 
-        static void OnErrorWriteHandler([CanBeNull] string format, [CanBeNull] params object[] arg)
-        {
-            if(format == null ||
-               arg    == null)
-                return;
-
-            Entries.Add(new LogEntry
-            {
-                Message   = string.Format(format, arg),
-                Module    = null,
-                Timestamp = DateTime.Now,
-                Type      = "Error"
-            });
-        }
-
-        static void OnVerboseWriteHandler([CanBeNull] string format, [CanBeNull] params object[] arg)
-        {
-            if(format == null ||
-               arg    == null)
-                return;
-
-            Entries.Add(new LogEntry
-            {
-                Message   = string.Format(format, arg),
-                Module    = null,
-                Timestamp = DateTime.Now,
-                Type      = "Verbose"
-            });
-        }
-
-        static void OnDebugWriteHandler(string module, [CanBeNull] string format, [CanBeNull] params object[] arg)
-        {
-            if(format == null ||
-               arg    == null)
-                return;
-
-            Entries.Add(new LogEntry
-            {
-                Message   = string.Format(format, arg),
-                Module    = module,
-                Timestamp = DateTime.Now,
-                Type      = "Debug"
-            });
+            if(_debug)
+                AaruConsole.DebugWithModuleWriteLineEvent += OnDebugWriteHandler;
+            else
+                AaruConsole.DebugWithModuleWriteLineEvent -= OnDebugWriteHandler;
         }
     }
 
-    public sealed class LogEntry
+    public static bool Verbose
     {
-        public string   Message   { get; set; }
-        public string   Module    { get; set; }
-        public DateTime Timestamp { get; set; }
-        public string   Type      { get; set; }
+        get => _verbose;
+        set
+        {
+            if(_verbose == value)
+                return;
+
+            _verbose = value;
+
+            if(_verbose)
+                AaruConsole.VerboseWriteLineEvent += OnVerboseWriteHandler;
+            else
+                AaruConsole.VerboseWriteLineEvent -= OnVerboseWriteHandler;
+        }
     }
+
+    public static ObservableCollection<LogEntry> Entries { get; } = new ObservableCollection<LogEntry>();
+
+    internal static void Init()
+    {
+        AaruConsole.WriteLineEvent      += OnWriteHandler;
+        AaruConsole.ErrorWriteLineEvent += OnErrorWriteHandler;
+    }
+
+    static void OnWriteHandler([CanBeNull] string format, [CanBeNull] params object[] arg)
+    {
+        if(format == null ||
+           arg    == null)
+            return;
+
+        Entries.Add(new LogEntry
+        {
+            Message   = string.Format(format, arg),
+            Module    = null,
+            Timestamp = DateTime.Now,
+            Type      = "Info"
+        });
+    }
+
+    static void OnErrorWriteHandler([CanBeNull] string format, [CanBeNull] params object[] arg)
+    {
+        if(format == null ||
+           arg    == null)
+            return;
+
+        Entries.Add(new LogEntry
+        {
+            Message   = string.Format(format, arg),
+            Module    = null,
+            Timestamp = DateTime.Now,
+            Type      = "Error"
+        });
+    }
+
+    static void OnVerboseWriteHandler([CanBeNull] string format, [CanBeNull] params object[] arg)
+    {
+        if(format == null ||
+           arg    == null)
+            return;
+
+        Entries.Add(new LogEntry
+        {
+            Message   = string.Format(format, arg),
+            Module    = null,
+            Timestamp = DateTime.Now,
+            Type      = "Verbose"
+        });
+    }
+
+    static void OnDebugWriteHandler(string module, [CanBeNull] string format, [CanBeNull] params object[] arg)
+    {
+        if(format == null ||
+           arg    == null)
+            return;
+
+        Entries.Add(new LogEntry
+        {
+            Message   = string.Format(format, arg),
+            Module    = module,
+            Timestamp = DateTime.Now,
+            Type      = "Debug"
+        });
+    }
+}
+
+public sealed class LogEntry
+{
+    public string   Message   { get; set; }
+    public string   Module    { get; set; }
+    public DateTime Timestamp { get; set; }
+    public string   Type      { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Controls/BlockMap.cs b/Aaru.Gui/Controls/BlockMap.cs
index 63a3f86bd..ee454e7ab 100644
--- a/Aaru.Gui/Controls/BlockMap.cs
+++ b/Aaru.Gui/Controls/BlockMap.cs
@@ -43,450 +43,449 @@ using Avalonia.Threading;
 using Avalonia.Visuals.Media.Imaging;
 using JetBrains.Annotations;
 
-namespace Aaru.Gui.Controls
+namespace Aaru.Gui.Controls;
+
+// TODO: Partially fill clusters
+// TODO: React to size changes
+// TODO: Optimize block size to viewport
+// TODO: Writing one more than it should
+public sealed class BlockMap : ItemsControl
 {
-    // TODO: Partially fill clusters
-    // TODO: React to size changes
-    // TODO: Optimize block size to viewport
-    // TODO: Writing one more than it should
-    public sealed class BlockMap : ItemsControl
+    const int BLOCK_SIZE = 15;
+    public static readonly StyledProperty<ulong> BlocksProperty =
+        AvaloniaProperty.Register<Border, ulong>(nameof(Blocks));
+
+    public static readonly StyledProperty<IBrush> SuperFastColorProperty =
+        AvaloniaProperty.Register<Border, IBrush>(nameof(SuperFastColor), Brushes.LightGreen);
+
+    public static readonly StyledProperty<IBrush> FastColorProperty =
+        AvaloniaProperty.Register<Border, IBrush>(nameof(FastColor), Brushes.Green);
+
+    public static readonly StyledProperty<IBrush> AverageColorProperty =
+        AvaloniaProperty.Register<Border, IBrush>(nameof(AverageColor), Brushes.DarkGreen);
+
+    public static readonly StyledProperty<IBrush> SlowColorProperty =
+        AvaloniaProperty.Register<Border, IBrush>(nameof(SlowColor), Brushes.Yellow);
+
+    public static readonly StyledProperty<IBrush> SuperSlowColorProperty =
+        AvaloniaProperty.Register<Border, IBrush>(nameof(SuperSlowColor), Brushes.Orange);
+
+    public static readonly StyledProperty<IBrush> ProblematicColorProperty =
+        AvaloniaProperty.Register<Border, IBrush>(nameof(ProblematicColor), Brushes.Red);
+
+    public static readonly StyledProperty<double> SuperFastMaxTimeProperty =
+        AvaloniaProperty.Register<Border, double>(nameof(SuperFastMaxTime), 3);
+
+    public static readonly StyledProperty<double> FastMaxTimeProperty =
+        AvaloniaProperty.Register<Border, double>(nameof(FastMaxTime), 10);
+
+    public static readonly StyledProperty<double> AverageMaxTimeProperty =
+        AvaloniaProperty.Register<Border, double>(nameof(AverageMaxTime), 50);
+
+    public static readonly StyledProperty<double> SlowMaxTimeProperty =
+        AvaloniaProperty.Register<Border, double>(nameof(SlowMaxTime), 150);
+
+    public static readonly StyledProperty<double> SuperSlowMaxTimeProperty =
+        AvaloniaProperty.Register<Border, double>(nameof(SuperSlowMaxTime), 500);
+    RenderTargetBitmap _bitmap;
+    ulong              _clusterSize;
+    ulong              _maxBlocks;
+
+    public double SuperFastMaxTime
     {
-        const int BLOCK_SIZE = 15;
-        public static readonly StyledProperty<ulong> BlocksProperty =
-            AvaloniaProperty.Register<Border, ulong>(nameof(Blocks));
+        get => GetValue(SuperFastMaxTimeProperty);
+        set => SetValue(SuperFastMaxTimeProperty, value);
+    }
 
-        public static readonly StyledProperty<IBrush> SuperFastColorProperty =
-            AvaloniaProperty.Register<Border, IBrush>(nameof(SuperFastColor), Brushes.LightGreen);
+    public double FastMaxTime
+    {
+        get => GetValue(FastMaxTimeProperty);
+        set => SetValue(FastMaxTimeProperty, value);
+    }
 
-        public static readonly StyledProperty<IBrush> FastColorProperty =
-            AvaloniaProperty.Register<Border, IBrush>(nameof(FastColor), Brushes.Green);
+    public double AverageMaxTime
+    {
+        get => GetValue(AverageMaxTimeProperty);
+        set => SetValue(AverageMaxTimeProperty, value);
+    }
 
-        public static readonly StyledProperty<IBrush> AverageColorProperty =
-            AvaloniaProperty.Register<Border, IBrush>(nameof(AverageColor), Brushes.DarkGreen);
+    public double SlowMaxTime
+    {
+        get => GetValue(SlowMaxTimeProperty);
+        set => SetValue(SlowMaxTimeProperty, value);
+    }
 
-        public static readonly StyledProperty<IBrush> SlowColorProperty =
-            AvaloniaProperty.Register<Border, IBrush>(nameof(SlowColor), Brushes.Yellow);
+    public double SuperSlowMaxTime
+    {
+        get => GetValue(SuperSlowMaxTimeProperty);
+        set => SetValue(SuperSlowMaxTimeProperty, value);
+    }
 
-        public static readonly StyledProperty<IBrush> SuperSlowColorProperty =
-            AvaloniaProperty.Register<Border, IBrush>(nameof(SuperSlowColor), Brushes.Orange);
+    public IBrush SuperFastColor
+    {
+        get => GetValue(SuperFastColorProperty);
+        set => SetValue(SuperFastColorProperty, value);
+    }
 
-        public static readonly StyledProperty<IBrush> ProblematicColorProperty =
-            AvaloniaProperty.Register<Border, IBrush>(nameof(ProblematicColor), Brushes.Red);
+    public IBrush FastColor
+    {
+        get => GetValue(FastColorProperty);
+        set => SetValue(FastColorProperty, value);
+    }
 
-        public static readonly StyledProperty<double> SuperFastMaxTimeProperty =
-            AvaloniaProperty.Register<Border, double>(nameof(SuperFastMaxTime), 3);
+    public IBrush AverageColor
+    {
+        get => GetValue(AverageColorProperty);
+        set => SetValue(AverageColorProperty, value);
+    }
 
-        public static readonly StyledProperty<double> FastMaxTimeProperty =
-            AvaloniaProperty.Register<Border, double>(nameof(FastMaxTime), 10);
+    public IBrush SlowColor
+    {
+        get => GetValue(SlowColorProperty);
+        set => SetValue(SlowColorProperty, value);
+    }
 
-        public static readonly StyledProperty<double> AverageMaxTimeProperty =
-            AvaloniaProperty.Register<Border, double>(nameof(AverageMaxTime), 50);
+    public IBrush SuperSlowColor
+    {
+        get => GetValue(SuperSlowColorProperty);
+        set => SetValue(SuperSlowColorProperty, value);
+    }
 
-        public static readonly StyledProperty<double> SlowMaxTimeProperty =
-            AvaloniaProperty.Register<Border, double>(nameof(SlowMaxTime), 150);
+    public IBrush ProblematicColor
+    {
+        get => GetValue(ProblematicColorProperty);
+        set => SetValue(ProblematicColorProperty, value);
+    }
 
-        public static readonly StyledProperty<double> SuperSlowMaxTimeProperty =
-            AvaloniaProperty.Register<Border, double>(nameof(SuperSlowMaxTime), 500);
-        RenderTargetBitmap _bitmap;
-        ulong              _clusterSize;
-        ulong              _maxBlocks;
+    public ulong Blocks
+    {
+        get => GetValue(BlocksProperty);
+        set => SetValue(BlocksProperty, value);
+    }
 
-        public double SuperFastMaxTime
+    protected override void OnPropertyChanged<T>([NotNull] AvaloniaPropertyChangedEventArgs<T> e)
+    {
+        base.OnPropertyChanged(e);
+
+        switch(e.Property.Name)
         {
-            get => GetValue(SuperFastMaxTimeProperty);
-            set => SetValue(SuperFastMaxTimeProperty, value);
-        }
+            case nameof(Blocks):
+                if(_maxBlocks == 0)
+                    _maxBlocks = (ulong)(Width / BLOCK_SIZE * (Height / BLOCK_SIZE));
 
-        public double FastMaxTime
-        {
-            get => GetValue(FastMaxTimeProperty);
-            set => SetValue(FastMaxTimeProperty, value);
-        }
+                if(Blocks > _maxBlocks)
+                {
+                    _clusterSize = Blocks / _maxBlocks;
 
-        public double AverageMaxTime
-        {
-            get => GetValue(AverageMaxTimeProperty);
-            set => SetValue(AverageMaxTimeProperty, value);
-        }
+                    if(Blocks % _maxBlocks > 0)
+                        _clusterSize++;
 
-        public double SlowMaxTime
-        {
-            get => GetValue(SlowMaxTimeProperty);
-            set => SetValue(SlowMaxTimeProperty, value);
-        }
-
-        public double SuperSlowMaxTime
-        {
-            get => GetValue(SuperSlowMaxTimeProperty);
-            set => SetValue(SuperSlowMaxTimeProperty, value);
-        }
-
-        public IBrush SuperFastColor
-        {
-            get => GetValue(SuperFastColorProperty);
-            set => SetValue(SuperFastColorProperty, value);
-        }
-
-        public IBrush FastColor
-        {
-            get => GetValue(FastColorProperty);
-            set => SetValue(FastColorProperty, value);
-        }
-
-        public IBrush AverageColor
-        {
-            get => GetValue(AverageColorProperty);
-            set => SetValue(AverageColorProperty, value);
-        }
-
-        public IBrush SlowColor
-        {
-            get => GetValue(SlowColorProperty);
-            set => SetValue(SlowColorProperty, value);
-        }
-
-        public IBrush SuperSlowColor
-        {
-            get => GetValue(SuperSlowColorProperty);
-            set => SetValue(SuperSlowColorProperty, value);
-        }
-
-        public IBrush ProblematicColor
-        {
-            get => GetValue(ProblematicColorProperty);
-            set => SetValue(ProblematicColorProperty, value);
-        }
-
-        public ulong Blocks
-        {
-            get => GetValue(BlocksProperty);
-            set => SetValue(BlocksProperty, value);
-        }
-
-        protected override void OnPropertyChanged<T>([NotNull] AvaloniaPropertyChangedEventArgs<T> e)
-        {
-            base.OnPropertyChanged(e);
-
-            switch(e.Property.Name)
-            {
-                case nameof(Blocks):
-                    if(_maxBlocks == 0)
-                        _maxBlocks = (ulong)(Width / BLOCK_SIZE * (Height / BLOCK_SIZE));
-
-                    if(Blocks > _maxBlocks)
+                    if(Blocks / _clusterSize < _maxBlocks)
                     {
-                        _clusterSize = Blocks / _maxBlocks;
+                        _maxBlocks = Blocks / _clusterSize;
 
-                        if(Blocks % _maxBlocks > 0)
-                            _clusterSize++;
-
-                        if(Blocks / _clusterSize < _maxBlocks)
-                        {
-                            _maxBlocks = Blocks / _clusterSize;
-
-                            if(Blocks % _clusterSize > 0)
-                                _maxBlocks++;
-                        }
-                    }
-                    else
-                    {
-                        _clusterSize = 1;
-                        _maxBlocks   = Blocks;
+                        if(Blocks % _clusterSize > 0)
+                            _maxBlocks++;
                     }
+                }
+                else
+                {
+                    _clusterSize = 1;
+                    _maxBlocks   = Blocks;
+                }
 
-                    CreateBitmap();
-                    DrawGrid();
-                    RedrawAll();
-                    Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
-
-                    break;
-                case nameof(SuperFastMaxTime):
-                case nameof(FastMaxTime):
-                case nameof(AverageMaxTime):
-                case nameof(SlowMaxTime):
-                case nameof(SuperSlowMaxTime):
-                case nameof(SuperFastColor):
-                case nameof(FastColor):
-                case nameof(AverageColor):
-                case nameof(SlowColor):
-                case nameof(SuperSlowColor):
-                case nameof(ProblematicColor):
-
-                    CreateBitmap();
-                    DrawGrid();
-                    RedrawAll();
-                    Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
-
-                    break;
-            }
-        }
-
-        public override void Render([NotNull] DrawingContext context)
-        {
-            if((int?)_bitmap?.Size.Height != (int)Height ||
-               (int?)_bitmap?.Size.Width  != (int)Width)
-            {
-                _maxBlocks = (ulong)(Width / BLOCK_SIZE * (Height / BLOCK_SIZE));
                 CreateBitmap();
-            }
-
-            context.DrawImage(_bitmap, new Rect(0, 0, Width, Height), new Rect(0, 0, Width, Height),
-                              BitmapInterpolationMode.HighQuality);
-
-            Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
-            base.Render(context);
-        }
-
-        protected override void ItemsCollectionChanged(object sender, [NotNull] NotifyCollectionChangedEventArgs e)
-        {
-            base.ItemsCollectionChanged(sender, e);
-
-            switch(e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                case NotifyCollectionChangedAction.Replace:
-                {
-                    if(!(e.NewItems is {} items))
-                        throw new ArgumentException("Invalid list of items");
-
-                    using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
-                    using var                 ctx  = new DrawingContext(ctxi, false);
-
-                    foreach(object item in items)
-                    {
-                        if(!(item is ValueTuple<ulong, double> block))
-                            throw new ArgumentException("Invalid item in list", nameof(Items));
-
-                        DrawCluster(block.Item1, block.Item2, false, ctx);
-                    }
-
-                    Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
-
-                    break;
-                }
-                case NotifyCollectionChangedAction.Remove:
-                case NotifyCollectionChangedAction.Move:
-                {
-                    if(!(e.NewItems is {} newItems) ||
-                       !(e.OldItems is {} oldItems))
-                        throw new ArgumentException("Invalid list of items");
-
-                    using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
-                    using var                 ctx  = new DrawingContext(ctxi, false);
-
-                    foreach(object item in oldItems)
-                    {
-                        if(!(item is ValueTuple<ulong, double> block))
-                            throw new ArgumentException("Invalid item in list", nameof(Items));
-
-                        DrawCluster(block.Item1, block.Item2, false, ctx);
-                    }
-
-                    foreach(object item in newItems)
-                    {
-                        if(!(item is ValueTuple<ulong, double> block))
-                            throw new ArgumentException("Invalid item in list", nameof(Items));
-
-                        DrawCluster(block.Item1, block.Item2, false, ctx);
-                    }
-
-                    Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
-
-                    break;
-                }
-                case NotifyCollectionChangedAction.Reset:
-                    CreateBitmap();
-                    DrawGrid();
-                    Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
-
-                    break;
-                default: throw new ArgumentOutOfRangeException();
-            }
-        }
-
-        void RedrawAll()
-        {
-            if(Items is null)
-                return;
-
-            using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
-            using var                 ctx  = new DrawingContext(ctxi, false);
-
-            foreach(object item in Items)
-            {
-                if(!(item is ValueTuple<ulong, double> block))
-                    throw new ArgumentException("Invalid item in list", nameof(Items));
-
-                DrawCluster(block.Item1, block.Item2, false, ctx);
-            }
-
-            Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
-        }
-
-        void DrawCluster(ulong block, double duration, bool clear = false, DrawingContext ctx = null)
-        {
-            if(double.IsNegative(duration) ||
-               double.IsInfinity(duration))
-                throw new ArgumentException("Duration cannot be negative or infinite", nameof(duration));
-
-            bool  newContext     = ctx is null;
-            ulong clustersPerRow = (ulong)Width / BLOCK_SIZE;
-            ulong cluster        = block        / _clusterSize;
-            ulong row            = cluster      / clustersPerRow;
-            ulong column         = cluster      % clustersPerRow;
-            ulong x              = column       * BLOCK_SIZE;
-            ulong y              = row          * BLOCK_SIZE;
-            var   pen            = new Pen(Foreground);
-
-            IBrush brush;
-
-            if(clear)
-                brush = Background;
-            else if(duration < SuperFastMaxTime)
-                brush = SuperFastColor;
-            else if(duration >= SuperFastMaxTime &&
-                    duration < FastMaxTime)
-                brush = FastColor;
-            else if(duration >= FastMaxTime &&
-                    duration < AverageMaxTime)
-                brush = AverageColor;
-            else if(duration >= AverageMaxTime &&
-                    duration < SlowMaxTime)
-                brush = SlowColor;
-            else if(duration >= SlowMaxTime &&
-                    duration < SuperSlowMaxTime)
-                brush = SuperSlowColor;
-            else if(duration >= SuperSlowMaxTime ||
-                    double.IsNaN(duration))
-                brush = ProblematicColor;
-            else
-                brush = Background;
-
-            if(newContext)
-            {
-                using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
-                ctx = new DrawingContext(ctxi, false);
-            }
-
-            ctx.FillRectangle(brush, new Rect(x, y, BLOCK_SIZE, BLOCK_SIZE));
-            ctx.DrawRectangle(pen, new Rect(x, y, BLOCK_SIZE, BLOCK_SIZE));
-
-            if(double.IsNaN(duration))
-            {
-                ctx.DrawLine(pen, new Point(x, y), new Point(x + BLOCK_SIZE, y            + BLOCK_SIZE));
-                ctx.DrawLine(pen, new Point(x, y               + BLOCK_SIZE), new Point(x + BLOCK_SIZE, y));
-            }
-
-            if(newContext)
+                DrawGrid();
+                RedrawAll();
                 Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
-        }
 
-        protected override void ItemsChanged([NotNull] AvaloniaPropertyChangedEventArgs e)
-        {
-            if(e.NewValue != null &&
-               !(e.NewValue is IList<(ulong, double)>))
-            {
-                throw new
-                    ArgumentException("Items must be a IList<(ulong, double)> with ulong being the block and double being the time spent reading it, or NaN for an error.");
-            }
+                break;
+            case nameof(SuperFastMaxTime):
+            case nameof(FastMaxTime):
+            case nameof(AverageMaxTime):
+            case nameof(SlowMaxTime):
+            case nameof(SuperSlowMaxTime):
+            case nameof(SuperFastColor):
+            case nameof(FastColor):
+            case nameof(AverageColor):
+            case nameof(SlowColor):
+            case nameof(SuperSlowColor):
+            case nameof(ProblematicColor):
 
-            base.ItemsChanged(e);
+                CreateBitmap();
+                DrawGrid();
+                RedrawAll();
+                Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
 
-            CreateBitmap();
-            DrawGrid();
-            RedrawAll();
-            Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
-        }
-
-        void CreateBitmap()
-        {
-            if(_maxBlocks == 0)
-                _maxBlocks = (ulong)(Width / BLOCK_SIZE * (Height / BLOCK_SIZE));
-
-            _bitmap?.Dispose();
-
-            _bitmap = new RenderTargetBitmap(new PixelSize((int)Width, (int)Height), new Vector(96, 96));
-
-            using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
-            using var                 ctx  = new DrawingContext(ctxi, false);
-
-            ctx.FillRectangle(Background, new Rect(0, 0, Width, Height));
-        }
-
-        void DrawGrid()
-        {
-            using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
-            using var                 ctx  = new DrawingContext(ctxi, false);
-
-            ulong clustersPerRow = (ulong)Width / BLOCK_SIZE;
-
-            bool allBlocksDrawn = false;
-
-            for(ulong y = 0; y < Height && !allBlocksDrawn; y += BLOCK_SIZE)
-            {
-                for(ulong x = 0; x < Width; x += BLOCK_SIZE)
-                {
-                    ulong currentBlockValue = (y * clustersPerRow / BLOCK_SIZE) + (x / BLOCK_SIZE);
-
-                    if(currentBlockValue >= _maxBlocks ||
-                       currentBlockValue >= Blocks)
-                    {
-                        allBlocksDrawn = true;
-
-                        break;
-                    }
-
-                    ctx.DrawRectangle(new Pen(Foreground), new Rect(x, y, BLOCK_SIZE, BLOCK_SIZE));
-                }
-            }
-        }
-
-        void DrawSquares(Color[] colors, int borderWidth, int sideLength)
-        {
-            using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
-            using var                 ctx  = new DrawingContext(ctxi, false);
-
-            int squareWidth  = (sideLength - (2 * borderWidth)) / colors.Length;
-            int squareHeight = squareWidth;
-            int x            = 0;
-            int y            = 0;
-
-            foreach(Color color in colors)
-            {
-                ctx.FillRectangle(new SolidColorBrush(color), new Rect(x, y, squareWidth, squareHeight));
-                x += squareWidth + (2 * borderWidth);
-
-                if(x >= sideLength)
-                {
-                    x =  0;
-                    y += squareHeight + (2 * borderWidth);
-                }
-            }
-        }
-
-        protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-            if(Width  < 1          ||
-               Height < 1          ||
-               double.IsNaN(Width) ||
-               double.IsNaN(Height))
-            {
-                base.OnAttachedToLogicalTree(e);
-
-                return;
-            }
-
-            CreateBitmap();
-            DrawGrid();
-
-            base.OnAttachedToLogicalTree(e);
-        }
-
-        protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
-        {
-            _bitmap.Dispose();
-            _bitmap = null;
-            base.OnDetachedFromLogicalTree(e);
+                break;
         }
     }
+
+    public override void Render([NotNull] DrawingContext context)
+    {
+        if((int?)_bitmap?.Size.Height != (int)Height ||
+           (int?)_bitmap?.Size.Width  != (int)Width)
+        {
+            _maxBlocks = (ulong)(Width / BLOCK_SIZE * (Height / BLOCK_SIZE));
+            CreateBitmap();
+        }
+
+        context.DrawImage(_bitmap, new Rect(0, 0, Width, Height), new Rect(0, 0, Width, Height),
+                          BitmapInterpolationMode.HighQuality);
+
+        Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+        base.Render(context);
+    }
+
+    protected override void ItemsCollectionChanged(object sender, [NotNull] NotifyCollectionChangedEventArgs e)
+    {
+        base.ItemsCollectionChanged(sender, e);
+
+        switch(e.Action)
+        {
+            case NotifyCollectionChangedAction.Add:
+            case NotifyCollectionChangedAction.Replace:
+            {
+                if(!(e.NewItems is {} items))
+                    throw new ArgumentException("Invalid list of items");
+
+                using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
+                using var                 ctx  = new DrawingContext(ctxi, false);
+
+                foreach(object item in items)
+                {
+                    if(!(item is ValueTuple<ulong, double> block))
+                        throw new ArgumentException("Invalid item in list", nameof(Items));
+
+                    DrawCluster(block.Item1, block.Item2, false, ctx);
+                }
+
+                Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+
+                break;
+            }
+            case NotifyCollectionChangedAction.Remove:
+            case NotifyCollectionChangedAction.Move:
+            {
+                if(!(e.NewItems is {} newItems) ||
+                   !(e.OldItems is {} oldItems))
+                    throw new ArgumentException("Invalid list of items");
+
+                using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
+                using var                 ctx  = new DrawingContext(ctxi, false);
+
+                foreach(object item in oldItems)
+                {
+                    if(!(item is ValueTuple<ulong, double> block))
+                        throw new ArgumentException("Invalid item in list", nameof(Items));
+
+                    DrawCluster(block.Item1, block.Item2, false, ctx);
+                }
+
+                foreach(object item in newItems)
+                {
+                    if(!(item is ValueTuple<ulong, double> block))
+                        throw new ArgumentException("Invalid item in list", nameof(Items));
+
+                    DrawCluster(block.Item1, block.Item2, false, ctx);
+                }
+
+                Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+
+                break;
+            }
+            case NotifyCollectionChangedAction.Reset:
+                CreateBitmap();
+                DrawGrid();
+                Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+
+                break;
+            default: throw new ArgumentOutOfRangeException();
+        }
+    }
+
+    void RedrawAll()
+    {
+        if(Items is null)
+            return;
+
+        using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
+        using var                 ctx  = new DrawingContext(ctxi, false);
+
+        foreach(object item in Items)
+        {
+            if(!(item is ValueTuple<ulong, double> block))
+                throw new ArgumentException("Invalid item in list", nameof(Items));
+
+            DrawCluster(block.Item1, block.Item2, false, ctx);
+        }
+
+        Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+    }
+
+    void DrawCluster(ulong block, double duration, bool clear = false, DrawingContext ctx = null)
+    {
+        if(double.IsNegative(duration) ||
+           double.IsInfinity(duration))
+            throw new ArgumentException("Duration cannot be negative or infinite", nameof(duration));
+
+        bool  newContext     = ctx is null;
+        ulong clustersPerRow = (ulong)Width / BLOCK_SIZE;
+        ulong cluster        = block        / _clusterSize;
+        ulong row            = cluster      / clustersPerRow;
+        ulong column         = cluster      % clustersPerRow;
+        ulong x              = column       * BLOCK_SIZE;
+        ulong y              = row          * BLOCK_SIZE;
+        var   pen            = new Pen(Foreground);
+
+        IBrush brush;
+
+        if(clear)
+            brush = Background;
+        else if(duration < SuperFastMaxTime)
+            brush = SuperFastColor;
+        else if(duration >= SuperFastMaxTime &&
+                duration < FastMaxTime)
+            brush = FastColor;
+        else if(duration >= FastMaxTime &&
+                duration < AverageMaxTime)
+            brush = AverageColor;
+        else if(duration >= AverageMaxTime &&
+                duration < SlowMaxTime)
+            brush = SlowColor;
+        else if(duration >= SlowMaxTime &&
+                duration < SuperSlowMaxTime)
+            brush = SuperSlowColor;
+        else if(duration >= SuperSlowMaxTime ||
+                double.IsNaN(duration))
+            brush = ProblematicColor;
+        else
+            brush = Background;
+
+        if(newContext)
+        {
+            using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
+            ctx = new DrawingContext(ctxi, false);
+        }
+
+        ctx.FillRectangle(brush, new Rect(x, y, BLOCK_SIZE, BLOCK_SIZE));
+        ctx.DrawRectangle(pen, new Rect(x, y, BLOCK_SIZE, BLOCK_SIZE));
+
+        if(double.IsNaN(duration))
+        {
+            ctx.DrawLine(pen, new Point(x, y), new Point(x + BLOCK_SIZE, y            + BLOCK_SIZE));
+            ctx.DrawLine(pen, new Point(x, y               + BLOCK_SIZE), new Point(x + BLOCK_SIZE, y));
+        }
+
+        if(newContext)
+            Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+    }
+
+    protected override void ItemsChanged([NotNull] AvaloniaPropertyChangedEventArgs e)
+    {
+        if(e.NewValue != null &&
+           !(e.NewValue is IList<(ulong, double)>))
+        {
+            throw new
+                ArgumentException("Items must be a IList<(ulong, double)> with ulong being the block and double being the time spent reading it, or NaN for an error.");
+        }
+
+        base.ItemsChanged(e);
+
+        CreateBitmap();
+        DrawGrid();
+        RedrawAll();
+        Dispatcher.UIThread.Post(InvalidateVisual, DispatcherPriority.Background);
+    }
+
+    void CreateBitmap()
+    {
+        if(_maxBlocks == 0)
+            _maxBlocks = (ulong)(Width / BLOCK_SIZE * (Height / BLOCK_SIZE));
+
+        _bitmap?.Dispose();
+
+        _bitmap = new RenderTargetBitmap(new PixelSize((int)Width, (int)Height), new Vector(96, 96));
+
+        using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
+        using var                 ctx  = new DrawingContext(ctxi, false);
+
+        ctx.FillRectangle(Background, new Rect(0, 0, Width, Height));
+    }
+
+    void DrawGrid()
+    {
+        using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
+        using var                 ctx  = new DrawingContext(ctxi, false);
+
+        ulong clustersPerRow = (ulong)Width / BLOCK_SIZE;
+
+        bool allBlocksDrawn = false;
+
+        for(ulong y = 0; y < Height && !allBlocksDrawn; y += BLOCK_SIZE)
+        {
+            for(ulong x = 0; x < Width; x += BLOCK_SIZE)
+            {
+                ulong currentBlockValue = (y * clustersPerRow / BLOCK_SIZE) + (x / BLOCK_SIZE);
+
+                if(currentBlockValue >= _maxBlocks ||
+                   currentBlockValue >= Blocks)
+                {
+                    allBlocksDrawn = true;
+
+                    break;
+                }
+
+                ctx.DrawRectangle(new Pen(Foreground), new Rect(x, y, BLOCK_SIZE, BLOCK_SIZE));
+            }
+        }
+    }
+
+    void DrawSquares(Color[] colors, int borderWidth, int sideLength)
+    {
+        using IDrawingContextImpl ctxi = _bitmap.CreateDrawingContext(null);
+        using var                 ctx  = new DrawingContext(ctxi, false);
+
+        int squareWidth  = (sideLength - (2 * borderWidth)) / colors.Length;
+        int squareHeight = squareWidth;
+        int x            = 0;
+        int y            = 0;
+
+        foreach(Color color in colors)
+        {
+            ctx.FillRectangle(new SolidColorBrush(color), new Rect(x, y, squareWidth, squareHeight));
+            x += squareWidth + (2 * borderWidth);
+
+            if(x >= sideLength)
+            {
+                x =  0;
+                y += squareHeight + (2 * borderWidth);
+            }
+        }
+    }
+
+    protected override void OnAttachedToLogicalTree(LogicalTreeAttachmentEventArgs e)
+    {
+        if(Width  < 1          ||
+           Height < 1          ||
+           double.IsNaN(Width) ||
+           double.IsNaN(Height))
+        {
+            base.OnAttachedToLogicalTree(e);
+
+            return;
+        }
+
+        CreateBitmap();
+        DrawGrid();
+
+        base.OnAttachedToLogicalTree(e);
+    }
+
+    protected override void OnDetachedFromLogicalTree(LogicalTreeAttachmentEventArgs e)
+    {
+        _bitmap.Dispose();
+        _bitmap = null;
+        base.OnDetachedFromLogicalTree(e);
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Main.cs b/Aaru.Gui/Main.cs
index 62a140668..f490441e1 100644
--- a/Aaru.Gui/Main.cs
+++ b/Aaru.Gui/Main.cs
@@ -31,19 +31,18 @@ using Avalonia;
 using Avalonia.Dialogs;
 using Avalonia.ReactiveUI;
 
-namespace Aaru.Gui
+namespace Aaru.Gui;
+
+public static class Main
 {
-    public static class Main
+    public static int Start(string[] args)
     {
-        public static int Start(string[] args)
-        {
-            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
-            return BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
-        }
-
-        // Avalonia configuration, don't remove; also used by visual designer.
-        public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<App>().UsePlatformDetect().LogToDebug().
-                                                                  UseReactiveUI().UseManagedSystemDialogs();
+        return BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
     }
+
+    // Avalonia configuration, don't remove; also used by visual designer.
+    public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure<App>().UsePlatformDetect().LogToDebug().
+                                                              UseReactiveUI().UseManagedSystemDialogs();
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/AssemblyModel.cs b/Aaru.Gui/Models/AssemblyModel.cs
index 1f7e98251..952c74fa5 100644
--- a/Aaru.Gui/Models/AssemblyModel.cs
+++ b/Aaru.Gui/Models/AssemblyModel.cs
@@ -30,11 +30,10 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class AssemblyModel
 {
-    public sealed class AssemblyModel
-    {
-        public string Name    { get; set; }
-        public string Version { get; set; }
-    }
+    public string Name    { get; set; }
+    public string Version { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/ChecksumModel.cs b/Aaru.Gui/Models/ChecksumModel.cs
index 155a6d0ad..92e193fb4 100644
--- a/Aaru.Gui/Models/ChecksumModel.cs
+++ b/Aaru.Gui/Models/ChecksumModel.cs
@@ -30,12 +30,11 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class ChecksumModel
 {
-    public sealed class ChecksumModel
-    {
-        public string Track     { get; set; }
-        public string Algorithm { get; set; }
-        public string Hash      { get; set; }
-    }
+    public string Track     { get; set; }
+    public string Algorithm { get; set; }
+    public string Hash      { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/DeviceModel.cs b/Aaru.Gui/Models/DeviceModel.cs
index 1a96df566..5fb59f811 100644
--- a/Aaru.Gui/Models/DeviceModel.cs
+++ b/Aaru.Gui/Models/DeviceModel.cs
@@ -34,17 +34,16 @@ using System.Collections.ObjectModel;
 using Aaru.Gui.ViewModels.Panels;
 using Avalonia.Media.Imaging;
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class DeviceModel
 {
-    public sealed class DeviceModel
-    {
-        public DeviceModel() => Media = new ObservableCollection<MediaModel>();
+    public DeviceModel() => Media = new ObservableCollection<MediaModel>();
 
-        public Bitmap              Icon      { get; set; }
-        public string              Name      { get; set; }
-        public string              Path      { get; set; }
-        public DeviceInfoViewModel ViewModel { get; set; }
+    public Bitmap              Icon      { get; set; }
+    public string              Name      { get; set; }
+    public string              Path      { get; set; }
+    public DeviceInfoViewModel ViewModel { get; set; }
 
-        public ObservableCollection<MediaModel> Media { get; }
-    }
+    public ObservableCollection<MediaModel> Media { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/DeviceStatsModel.cs b/Aaru.Gui/Models/DeviceStatsModel.cs
index 7c3d07c56..72ef9d828 100644
--- a/Aaru.Gui/Models/DeviceStatsModel.cs
+++ b/Aaru.Gui/Models/DeviceStatsModel.cs
@@ -30,13 +30,12 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class DeviceStatsModel
 {
-    public sealed class DeviceStatsModel
-    {
-        public string Model        { get; set; }
-        public string Manufacturer { get; set; }
-        public string Revision     { get; set; }
-        public string Bus          { get; set; }
-    }
+    public string Model        { get; set; }
+    public string Manufacturer { get; set; }
+    public string Revision     { get; set; }
+    public string Bus          { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/DevicesRootModel.cs b/Aaru.Gui/Models/DevicesRootModel.cs
index 989e3b561..165faba61 100644
--- a/Aaru.Gui/Models/DevicesRootModel.cs
+++ b/Aaru.Gui/Models/DevicesRootModel.cs
@@ -32,12 +32,11 @@
 
 using System.Collections.ObjectModel;
 
-namespace Aaru.Gui.Models
-{
-    public sealed class DevicesRootModel : RootModel
-    {
-        public DevicesRootModel() => Devices = new ObservableCollection<DeviceModel>();
+namespace Aaru.Gui.Models;
 
-        public ObservableCollection<DeviceModel> Devices { get; }
-    }
+public sealed class DevicesRootModel : RootModel
+{
+    public DevicesRootModel() => Devices = new ObservableCollection<DeviceModel>();
+
+    public ObservableCollection<DeviceModel> Devices { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/DumpHardwareModel.cs b/Aaru.Gui/Models/DumpHardwareModel.cs
index 9a103521a..e987c413b 100644
--- a/Aaru.Gui/Models/DumpHardwareModel.cs
+++ b/Aaru.Gui/Models/DumpHardwareModel.cs
@@ -30,22 +30,21 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class DumpHardwareModel
 {
-    public sealed class DumpHardwareModel
-    {
-        public string Manufacturer { get; set; }
+    public string Manufacturer { get; set; }
 
-        public string Model { get; set; }
+    public string Model { get; set; }
 
-        public string Revision { get; set; }
+    public string Revision { get; set; }
 
-        public string Serial { get; set; }
+    public string Serial { get; set; }
 
-        public string SoftwareName    { get; set; }
-        public string SoftwareVersion { get; set; }
-        public string OperatingSystem { get; set; }
-        public ulong  Start           { get; set; }
-        public ulong  End             { get; set; }
-    }
+    public string SoftwareName    { get; set; }
+    public string SoftwareVersion { get; set; }
+    public string OperatingSystem { get; set; }
+    public ulong  Start           { get; set; }
+    public ulong  End             { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/EncodingModel.cs b/Aaru.Gui/Models/EncodingModel.cs
index f54ab4c0c..03ab626e8 100644
--- a/Aaru.Gui/Models/EncodingModel.cs
+++ b/Aaru.Gui/Models/EncodingModel.cs
@@ -30,11 +30,10 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class EncodingModel
 {
-    public sealed class EncodingModel
-    {
-        public string Name        { get; set; }
-        public string DisplayName { get; set; }
-    }
+    public string Name        { get; set; }
+    public string DisplayName { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/FileModel.cs b/Aaru.Gui/Models/FileModel.cs
index 8f7e6ae3e..a7ee20a07 100644
--- a/Aaru.Gui/Models/FileModel.cs
+++ b/Aaru.Gui/Models/FileModel.cs
@@ -34,35 +34,34 @@ using System;
 using Aaru.CommonTypes.Structs;
 using JetBrains.Annotations;
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class FileModel
 {
-    public sealed class FileModel
-    {
-        public string Name { get; set; }
-        [NotNull]
-        public string Size => $"{Stat.Length}";
-        [NotNull]
-        public string CreationTime => Stat.CreationTime == default(DateTime) ? "" : $"{Stat.CreationTime:G}";
-        [NotNull]
-        public string LastAccessTime => Stat.AccessTime == default(DateTime) ? "" : $"{Stat.AccessTime:G}";
-        [NotNull]
-        public string ChangedTime => Stat.StatusChangeTime == default(DateTime) ? "" : $"{Stat.StatusChangeTime:G}";
-        [NotNull]
-        public string LastBackupTime => Stat.BackupTime == default(DateTime) ? "" : $"{Stat.BackupTime:G}";
-        [NotNull]
-        public string LastWriteTime => Stat.LastWriteTime == default(DateTime) ? "" : $"{Stat.LastWriteTime:G}";
-        [NotNull]
-        public string Attributes => $"{Stat.Attributes}";
-        [NotNull]
-        public string Gid => $"{Stat.GID}";
-        [NotNull]
-        public string Uid => $"{Stat.UID}";
-        [NotNull]
-        public string Inode => $"{Stat.Inode}";
-        [NotNull]
-        public string Links => $"{Stat.Links}";
-        [NotNull]
-        public string Mode => $"{Stat.Mode}";
-        public FileEntryInfo Stat { get; set; }
-    }
+    public string Name { get; set; }
+    [NotNull]
+    public string Size => $"{Stat.Length}";
+    [NotNull]
+    public string CreationTime => Stat.CreationTime == default(DateTime) ? "" : $"{Stat.CreationTime:G}";
+    [NotNull]
+    public string LastAccessTime => Stat.AccessTime == default(DateTime) ? "" : $"{Stat.AccessTime:G}";
+    [NotNull]
+    public string ChangedTime => Stat.StatusChangeTime == default(DateTime) ? "" : $"{Stat.StatusChangeTime:G}";
+    [NotNull]
+    public string LastBackupTime => Stat.BackupTime == default(DateTime) ? "" : $"{Stat.BackupTime:G}";
+    [NotNull]
+    public string LastWriteTime => Stat.LastWriteTime == default(DateTime) ? "" : $"{Stat.LastWriteTime:G}";
+    [NotNull]
+    public string Attributes => $"{Stat.Attributes}";
+    [NotNull]
+    public string Gid => $"{Stat.GID}";
+    [NotNull]
+    public string Uid => $"{Stat.UID}";
+    [NotNull]
+    public string Inode => $"{Stat.Inode}";
+    [NotNull]
+    public string Links => $"{Stat.Links}";
+    [NotNull]
+    public string Mode => $"{Stat.Mode}";
+    public FileEntryInfo Stat { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/FileSystemModel.cs b/Aaru.Gui/Models/FileSystemModel.cs
index 0c9638fa8..f3e636ee7 100644
--- a/Aaru.Gui/Models/FileSystemModel.cs
+++ b/Aaru.Gui/Models/FileSystemModel.cs
@@ -34,16 +34,15 @@ using System.Collections.ObjectModel;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Gui.ViewModels.Panels;
 
-namespace Aaru.Gui.Models
-{
-    public sealed class FileSystemModel : RootModel
-    {
-        public FileSystemModel() => Roots = new ObservableCollection<SubdirectoryModel>();
+namespace Aaru.Gui.Models;
 
-        public string                                  VolumeName         { get; set; }
-        public IFilesystem                             Filesystem         { get; set; }
-        public IReadOnlyFilesystem                     ReadOnlyFilesystem { get; set; }
-        public FileSystemViewModel                     ViewModel          { get; set; }
-        public ObservableCollection<SubdirectoryModel> Roots              { get; set; }
-    }
+public sealed class FileSystemModel : RootModel
+{
+    public FileSystemModel() => Roots = new ObservableCollection<SubdirectoryModel>();
+
+    public string                                  VolumeName         { get; set; }
+    public IFilesystem                             Filesystem         { get; set; }
+    public IReadOnlyFilesystem                     ReadOnlyFilesystem { get; set; }
+    public FileSystemViewModel                     ViewModel          { get; set; }
+    public ObservableCollection<SubdirectoryModel> Roots              { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/ImageModel.cs b/Aaru.Gui/Models/ImageModel.cs
index 60178a7c9..86732d980 100644
--- a/Aaru.Gui/Models/ImageModel.cs
+++ b/Aaru.Gui/Models/ImageModel.cs
@@ -35,18 +35,17 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Gui.ViewModels.Panels;
 using Avalonia.Media.Imaging;
 
-namespace Aaru.Gui.Models
-{
-    public sealed class ImageModel
-    {
-        public ImageModel() => PartitionSchemesOrFileSystems = new ObservableCollection<RootModel>();
+namespace Aaru.Gui.Models;
 
-        public string                          Path                          { get; set; }
-        public string                          FileName                      { get; set; }
-        public Bitmap                          Icon                          { get; set; }
-        public ObservableCollection<RootModel> PartitionSchemesOrFileSystems { get; }
-        public IMediaImage                     Image                         { get; set; }
-        public ImageInfoViewModel              ViewModel                     { get; set; }
-        public IFilter                         Filter                        { get; set; }
-    }
+public sealed class ImageModel
+{
+    public ImageModel() => PartitionSchemesOrFileSystems = new ObservableCollection<RootModel>();
+
+    public string                          Path                          { get; set; }
+    public string                          FileName                      { get; set; }
+    public Bitmap                          Icon                          { get; set; }
+    public ObservableCollection<RootModel> PartitionSchemesOrFileSystems { get; }
+    public IMediaImage                     Image                         { get; set; }
+    public ImageInfoViewModel              ViewModel                     { get; set; }
+    public IFilter                         Filter                        { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/ImagePluginModel.cs b/Aaru.Gui/Models/ImagePluginModel.cs
index e665cfca3..200528554 100644
--- a/Aaru.Gui/Models/ImagePluginModel.cs
+++ b/Aaru.Gui/Models/ImagePluginModel.cs
@@ -32,11 +32,10 @@
 
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class ImagePluginModel
 {
-    public sealed class ImagePluginModel
-    {
-        public string         Name   => Plugin.Name;
-        public IWritableImage Plugin { get; set; }
-    }
+    public string         Name   => Plugin.Name;
+    public IWritableImage Plugin { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/ImagesRootModel.cs b/Aaru.Gui/Models/ImagesRootModel.cs
index cf47f0709..bcddbd33e 100644
--- a/Aaru.Gui/Models/ImagesRootModel.cs
+++ b/Aaru.Gui/Models/ImagesRootModel.cs
@@ -32,12 +32,11 @@
 
 using System.Collections.ObjectModel;
 
-namespace Aaru.Gui.Models
-{
-    public sealed class ImagesRootModel : RootModel
-    {
-        public ImagesRootModel() => Images = new ObservableCollection<ImageModel>();
+namespace Aaru.Gui.Models;
 
-        public ObservableCollection<ImageModel> Images { get; }
-    }
+public sealed class ImagesRootModel : RootModel
+{
+    public ImagesRootModel() => Images = new ObservableCollection<ImageModel>();
+
+    public ObservableCollection<ImageModel> Images { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/IsrcModel.cs b/Aaru.Gui/Models/IsrcModel.cs
index 18d00888e..60ac1029c 100644
--- a/Aaru.Gui/Models/IsrcModel.cs
+++ b/Aaru.Gui/Models/IsrcModel.cs
@@ -30,11 +30,10 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class IsrcModel
 {
-    public sealed class IsrcModel
-    {
-        public string Track { get; set; }
-        public string Isrc  { get; set; }
-    }
+    public string Track { get; set; }
+    public string Isrc  { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/LbaModel.cs b/Aaru.Gui/Models/LbaModel.cs
index 27f850ecd..e7a449cc7 100644
--- a/Aaru.Gui/Models/LbaModel.cs
+++ b/Aaru.Gui/Models/LbaModel.cs
@@ -30,10 +30,9 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class LbaModel
 {
-    public sealed class LbaModel
-    {
-        public string Lba { get; set; }
-    }
+    public string Lba { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/MediaModel.cs b/Aaru.Gui/Models/MediaModel.cs
index 40e47c11e..c2fea59f1 100644
--- a/Aaru.Gui/Models/MediaModel.cs
+++ b/Aaru.Gui/Models/MediaModel.cs
@@ -33,15 +33,14 @@
 using Aaru.Gui.ViewModels.Panels;
 using Avalonia.Media.Imaging;
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class MediaModel
 {
-    public sealed class MediaModel
-    {
-        public Bitmap             Icon            { get; set; }
-        public string             Name            { get; set; }
-        public string             DevicePath      { get; set; }
-        public bool               NonRemovable    { get; set; }
-        public bool               NoMediaInserted { get; set; }
-        public MediaInfoViewModel ViewModel       { get; set; }
-    }
+    public Bitmap             Icon            { get; set; }
+    public string             Name            { get; set; }
+    public string             DevicePath      { get; set; }
+    public bool               NonRemovable    { get; set; }
+    public bool               NoMediaInserted { get; set; }
+    public MediaInfoViewModel ViewModel       { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/MediaStatsModel.cs b/Aaru.Gui/Models/MediaStatsModel.cs
index df51a0e84..9fdaf2ba8 100644
--- a/Aaru.Gui/Models/MediaStatsModel.cs
+++ b/Aaru.Gui/Models/MediaStatsModel.cs
@@ -30,12 +30,11 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class MediaStatsModel
 {
-    public sealed class MediaStatsModel
-    {
-        public string Name  { get; set; }
-        public ulong  Count { get; set; }
-        public string Type  { get; set; }
-    }
+    public string Name  { get; set; }
+    public ulong  Count { get; set; }
+    public string Type  { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/MediaTagModel.cs b/Aaru.Gui/Models/MediaTagModel.cs
index 57c31bd7b..6edc6ca5a 100644
--- a/Aaru.Gui/Models/MediaTagModel.cs
+++ b/Aaru.Gui/Models/MediaTagModel.cs
@@ -33,14 +33,13 @@
 using Aaru.CommonTypes.Enums;
 using JetBrains.Annotations;
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class MediaTagModel
 {
-    public sealed class MediaTagModel
-    {
-        public MediaTagType Tag     { get; set; }
-        public byte[]       Data    { get; set; }
-        public string       Decoded { get; set; }
-        [NotNull]
-        public string Name => Tag.ToString();
-    }
+    public MediaTagType Tag     { get; set; }
+    public byte[]       Data    { get; set; }
+    public string       Decoded { get; set; }
+    [NotNull]
+    public string Name => Tag.ToString();
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/NameCountModel.cs b/Aaru.Gui/Models/NameCountModel.cs
index 73e561a32..36691091e 100644
--- a/Aaru.Gui/Models/NameCountModel.cs
+++ b/Aaru.Gui/Models/NameCountModel.cs
@@ -30,11 +30,10 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class NameCountModel
 {
-    public sealed class NameCountModel
-    {
-        public string Name  { get; set; }
-        public ulong  Count { get; set; }
-    }
+    public string Name  { get; set; }
+    public ulong  Count { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/PartitionModel.cs b/Aaru.Gui/Models/PartitionModel.cs
index 5af445f10..492809801 100644
--- a/Aaru.Gui/Models/PartitionModel.cs
+++ b/Aaru.Gui/Models/PartitionModel.cs
@@ -35,16 +35,15 @@ using Aaru.CommonTypes;
 using Aaru.Gui.ViewModels.Panels;
 using Avalonia.Media.Imaging;
 
-namespace Aaru.Gui.Models
-{
-    public sealed class PartitionModel
-    {
-        public PartitionModel() => FileSystems = new ObservableCollection<FileSystemModel>();
+namespace Aaru.Gui.Models;
 
-        public string                                Name        { get; set; }
-        public Bitmap                                Icon        { get; set; }
-        public ObservableCollection<FileSystemModel> FileSystems { get; }
-        public Partition                             Partition   { get; set; }
-        public PartitionViewModel                    ViewModel   { get; set; }
-    }
+public sealed class PartitionModel
+{
+    public PartitionModel() => FileSystems = new ObservableCollection<FileSystemModel>();
+
+    public string                                Name        { get; set; }
+    public Bitmap                                Icon        { get; set; }
+    public ObservableCollection<FileSystemModel> FileSystems { get; }
+    public Partition                             Partition   { get; set; }
+    public PartitionViewModel                    ViewModel   { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/PartitionSchemeModel.cs b/Aaru.Gui/Models/PartitionSchemeModel.cs
index b374336e1..67a395471 100644
--- a/Aaru.Gui/Models/PartitionSchemeModel.cs
+++ b/Aaru.Gui/Models/PartitionSchemeModel.cs
@@ -33,13 +33,12 @@
 using System.Collections.ObjectModel;
 using Avalonia.Media.Imaging;
 
-namespace Aaru.Gui.Models
-{
-    public sealed class PartitionSchemeModel : RootModel
-    {
-        public PartitionSchemeModel() => Partitions = new ObservableCollection<PartitionModel>();
+namespace Aaru.Gui.Models;
 
-        public Bitmap                               Icon       { get; set; }
-        public ObservableCollection<PartitionModel> Partitions { get; }
-    }
+public sealed class PartitionSchemeModel : RootModel
+{
+    public PartitionSchemeModel() => Partitions = new ObservableCollection<PartitionModel>();
+
+    public Bitmap                               Icon       { get; set; }
+    public ObservableCollection<PartitionModel> Partitions { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/PcmciaCisModel.cs b/Aaru.Gui/Models/PcmciaCisModel.cs
index b5c4a823f..020b93bf4 100644
--- a/Aaru.Gui/Models/PcmciaCisModel.cs
+++ b/Aaru.Gui/Models/PcmciaCisModel.cs
@@ -30,11 +30,10 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class PcmciaCisModel
 {
-    public sealed class PcmciaCisModel
-    {
-        public string Code        { get; set; }
-        public string Description { get; set; }
-    }
+    public string Code        { get; set; }
+    public string Description { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/PluginModel.cs b/Aaru.Gui/Models/PluginModel.cs
index c85827daa..8bcd2183e 100644
--- a/Aaru.Gui/Models/PluginModel.cs
+++ b/Aaru.Gui/Models/PluginModel.cs
@@ -32,13 +32,12 @@
 
 using System;
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class PluginModel
 {
-    public sealed class PluginModel
-    {
-        public string Name    { get; set; }
-        public Guid   Uuid    { get; set; }
-        public string Version { get; set; }
-        public string Author  { get; set; }
-    }
+    public string Name    { get; set; }
+    public Guid   Uuid    { get; set; }
+    public string Version { get; set; }
+    public string Author  { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/RootModel.cs b/Aaru.Gui/Models/RootModel.cs
index 920fefae0..32516ac3e 100644
--- a/Aaru.Gui/Models/RootModel.cs
+++ b/Aaru.Gui/Models/RootModel.cs
@@ -30,10 +30,9 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public class RootModel
 {
-    public class RootModel
-    {
-        public string Name { get; set; }
-    }
+    public string Name { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/ScsiPageModel.cs b/Aaru.Gui/Models/ScsiPageModel.cs
index d3e9e2a1e..5193eb256 100644
--- a/Aaru.Gui/Models/ScsiPageModel.cs
+++ b/Aaru.Gui/Models/ScsiPageModel.cs
@@ -30,12 +30,11 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class ScsiPageModel
 {
-    public sealed class ScsiPageModel
-    {
-        public byte[] Data;
-        public string Page        { get; set; }
-        public string Description { get; set; }
-    }
+    public byte[] Data;
+    public string Page        { get; set; }
+    public string Description { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/SubdirectoryModel.cs b/Aaru.Gui/Models/SubdirectoryModel.cs
index 85d357e96..2a086c656 100644
--- a/Aaru.Gui/Models/SubdirectoryModel.cs
+++ b/Aaru.Gui/Models/SubdirectoryModel.cs
@@ -33,16 +33,15 @@
 using System.Collections.ObjectModel;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.Gui.Models
-{
-    public sealed class SubdirectoryModel
-    {
-        public SubdirectoryModel() => Subdirectories = new ObservableCollection<SubdirectoryModel>();
+namespace Aaru.Gui.Models;
 
-        public string                                  Name           { get; set; }
-        public string                                  Path           { get; set; }
-        public ObservableCollection<SubdirectoryModel> Subdirectories { get; set; }
-        public IReadOnlyFilesystem                     Plugin         { get; set; }
-        public bool                                    Listed         { get; set; }
-    }
+public sealed class SubdirectoryModel
+{
+    public SubdirectoryModel() => Subdirectories = new ObservableCollection<SubdirectoryModel>();
+
+    public string                                  Name           { get; set; }
+    public string                                  Path           { get; set; }
+    public ObservableCollection<SubdirectoryModel> Subdirectories { get; set; }
+    public IReadOnlyFilesystem                     Plugin         { get; set; }
+    public bool                                    Listed         { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Models/TrackEntropyModel.cs b/Aaru.Gui/Models/TrackEntropyModel.cs
index 6665beda5..4a0872f30 100644
--- a/Aaru.Gui/Models/TrackEntropyModel.cs
+++ b/Aaru.Gui/Models/TrackEntropyModel.cs
@@ -30,12 +30,11 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Gui.Models
+namespace Aaru.Gui.Models;
+
+public sealed class TrackEntropyModel
 {
-    public sealed class TrackEntropyModel
-    {
-        public string Track         { get; set; }
-        public string Entropy       { get; set; }
-        public string UniqueSectors { get; set; }
-    }
+    public string Track         { get; set; }
+    public string Entropy       { get; set; }
+    public string UniqueSectors { get; set; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ResourceHandler.cs b/Aaru.Gui/ResourceHandler.cs
index af48c6a8c..f8d83c739 100644
--- a/Aaru.Gui/ResourceHandler.cs
+++ b/Aaru.Gui/ResourceHandler.cs
@@ -34,12 +34,11 @@ using System.IO;
 using System.Reflection;
 using JetBrains.Annotations;
 
-namespace Aaru.Gui
+namespace Aaru.Gui;
+
+internal static class ResourceHandler
 {
-    internal static class ResourceHandler
-    {
-        [CanBeNull]
-        internal static Stream GetResourceStream([NotNull] string resourcePath) =>
-            Assembly.GetExecutingAssembly().GetManifestResourceStream(resourcePath);
-    }
+    [CanBeNull]
+    internal static Stream GetResourceStream([NotNull] string resourcePath) =>
+        Assembly.GetExecutingAssembly().GetManifestResourceStream(resourcePath);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewLocator.cs b/Aaru.Gui/ViewLocator.cs
index 6fc89b261..31d1fe79a 100644
--- a/Aaru.Gui/ViewLocator.cs
+++ b/Aaru.Gui/ViewLocator.cs
@@ -36,33 +36,32 @@ using Avalonia.Controls;
 using Avalonia.Controls.Templates;
 using JetBrains.Annotations;
 
-namespace Aaru.Gui
+namespace Aaru.Gui;
+
+public sealed class ViewLocator : IDataTemplate
 {
-    public sealed class ViewLocator : IDataTemplate
+    public bool SupportsRecycling => false;
+
+    [CanBeNull]
+    public IControl Build([NotNull] object data)
     {
-        public bool SupportsRecycling => false;
+        string name = data.GetType().FullName?.Replace("ViewModel", "View");
 
-        [CanBeNull]
-        public IControl Build([NotNull] object data)
+        if(name is null)
+            return null;
+
+        var type = Type.GetType(name);
+
+        if(type != null)
         {
-            string name = data.GetType().FullName?.Replace("ViewModel", "View");
-
-            if(name is null)
-                return null;
-
-            var type = Type.GetType(name);
-
-            if(type != null)
-            {
-                return (Control)Activator.CreateInstance(type);
-            }
-
-            return new TextBlock
-            {
-                Text = "Not Found: " + name
-            };
+            return (Control)Activator.CreateInstance(type);
         }
 
-        public bool Match(object data) => data is ViewModelBase;
+        return new TextBlock
+        {
+            Text = "Not Found: " + name
+        };
     }
+
+    public bool Match(object data) => data is ViewModelBase;
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs
index ec8f40f13..0b56adb0b 100644
--- a/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs
+++ b/Aaru.Gui/ViewModels/Dialogs/AboutViewModel.cs
@@ -43,76 +43,76 @@ using Aaru.Gui.Views.Dialogs;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Dialogs
+namespace Aaru.Gui.ViewModels.Dialogs;
+
+public sealed class AboutViewModel : ViewModelBase
 {
-    public sealed class AboutViewModel : ViewModelBase
+    readonly About _view;
+    string         _versionText;
+
+    public AboutViewModel(About view)
     {
-        readonly About _view;
-        string         _versionText;
+        _view = view;
 
-        public AboutViewModel(About view)
+        VersionText =
+            (Attribute.GetCustomAttribute(typeof(App).Assembly, typeof(AssemblyInformationalVersionAttribute)) as
+                 AssemblyInformationalVersionAttribute)?.InformationalVersion;
+
+        WebsiteCommand = ReactiveCommand.Create(ExecuteWebsiteCommand);
+        LicenseCommand = ReactiveCommand.Create(ExecuteLicenseCommand);
+        CloseCommand   = ReactiveCommand.Create(ExecuteCloseCommand);
+
+        Assemblies = new ObservableCollection<AssemblyModel>();
+
+        Task.Run(() =>
         {
-            _view = view;
-
-            VersionText =
-                (Attribute.GetCustomAttribute(typeof(App).Assembly, typeof(AssemblyInformationalVersionAttribute)) as
-                     AssemblyInformationalVersionAttribute)?.InformationalVersion;
-
-            WebsiteCommand = ReactiveCommand.Create(ExecuteWebsiteCommand);
-            LicenseCommand = ReactiveCommand.Create(ExecuteLicenseCommand);
-            CloseCommand   = ReactiveCommand.Create(ExecuteCloseCommand);
-
-            Assemblies = new ObservableCollection<AssemblyModel>();
-
-            Task.Run(() =>
+            foreach(Assembly assembly in AppDomain.CurrentDomain.GetAssemblies().OrderBy(a => a.FullName))
             {
-                foreach(Assembly assembly in AppDomain.CurrentDomain.GetAssemblies().OrderBy(a => a.FullName))
+                string name = assembly.GetName().Name;
+
+                string version =
+                    (Attribute.GetCustomAttribute(assembly, typeof(AssemblyInformationalVersionAttribute)) as
+                         AssemblyInformationalVersionAttribute)?.InformationalVersion;
+
+                if(name is null ||
+                   version is null)
+                    continue;
+
+                Assemblies.Add(new AssemblyModel
                 {
-                    string name = assembly.GetName().Name;
+                    Name    = name,
+                    Version = version
+                });
+            }
+        });
+    }
 
-                    string version =
-                        (Attribute.GetCustomAttribute(assembly, typeof(AssemblyInformationalVersionAttribute)) as
-                             AssemblyInformationalVersionAttribute)?.InformationalVersion;
-
-                    if(name is null ||
-                       version is null)
-                        continue;
-
-                    Assemblies.Add(new AssemblyModel
-                    {
-                        Name    = name,
-                        Version = version
-                    });
-                }
-            });
-        }
-
-        [NotNull]
-        public string AboutLabel => "About";
-        [NotNull]
-        public string LibrariesLabel => "Libraries";
-        [NotNull]
-        public string AuthorsLabel => "Authors";
-        [NotNull]
-        public string Title => "About Aaru";
-        [NotNull]
-        public string SoftwareName => "Aaru";
-        [NotNull]
-        public string SuiteName => "Aaru Data Preservation Suite";
-        [NotNull]
-        public string Copyright => "© 2011-2022 Natalia Portillo";
-        [NotNull]
-        public string Website => "https://aaru.app";
-        [NotNull]
-        public string License => "License: GNU General Public License Version 3";
-        [NotNull]
-        public string CloseLabel => "Close";
-        [NotNull]
-        public string AssembliesLibraryText => "Library";
-        [NotNull]
-        public string AssembliesVersionText => "Version";
-        [NotNull]
-        public string Authors => @"Developers:
+    [NotNull]
+    public string AboutLabel => "About";
+    [NotNull]
+    public string LibrariesLabel => "Libraries";
+    [NotNull]
+    public string AuthorsLabel => "Authors";
+    [NotNull]
+    public string Title => "About Aaru";
+    [NotNull]
+    public string SoftwareName => "Aaru";
+    [NotNull]
+    public string SuiteName => "Aaru Data Preservation Suite";
+    [NotNull]
+    public string Copyright => "© 2011-2022 Natalia Portillo";
+    [NotNull]
+    public string Website => "https://aaru.app";
+    [NotNull]
+    public string License => "License: GNU General Public License Version 3";
+    [NotNull]
+    public string CloseLabel => "Close";
+    [NotNull]
+    public string AssembliesLibraryText => "Library";
+    [NotNull]
+    public string AssembliesVersionText => "Version";
+    [NotNull]
+    public string Authors => @"Developers:
     Natalia Portillo
     Michael Drüing
     Rebecca Wallander
@@ -125,51 +125,50 @@ Public relations:
 
 Logo and art:
     Juan Carlos Pastor Segura (Denymetanol)";
-        public ReactiveCommand<Unit, Unit>         WebsiteCommand { get; }
-        public ReactiveCommand<Unit, Unit>         LicenseCommand { get; }
-        public ReactiveCommand<Unit, Unit>         CloseCommand   { get; }
-        public ObservableCollection<AssemblyModel> Assemblies     { get; }
+    public ReactiveCommand<Unit, Unit>         WebsiteCommand { get; }
+    public ReactiveCommand<Unit, Unit>         LicenseCommand { get; }
+    public ReactiveCommand<Unit, Unit>         CloseCommand   { get; }
+    public ObservableCollection<AssemblyModel> Assemblies     { get; }
 
-        public string VersionText
-        {
-            get => _versionText;
-            set => this.RaiseAndSetIfChanged(ref _versionText, value);
-        }
-
-        void ExecuteWebsiteCommand()
-        {
-            var process = new Process
-            {
-                StartInfo =
-                {
-                    UseShellExecute = false,
-                    CreateNoWindow  = true,
-                    Arguments       = "https://aaru.app"
-                }
-            };
-
-            if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                process.StartInfo.FileName  = "cmd";
-                process.StartInfo.Arguments = $"/c start {process.StartInfo.Arguments.Replace("&", "^&")}";
-            }
-            else if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                process.StartInfo.FileName = "xdg-open";
-            else if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                process.StartInfo.FileName = "open";
-            else
-                return;
-
-            process.Start();
-        }
-
-        void ExecuteLicenseCommand()
-        {
-            var dialog = new LicenseDialog();
-            dialog.DataContext = new LicenseViewModel(dialog);
-            dialog.ShowDialog(_view);
-        }
-
-        void ExecuteCloseCommand() => _view.Close();
+    public string VersionText
+    {
+        get => _versionText;
+        set => this.RaiseAndSetIfChanged(ref _versionText, value);
     }
+
+    void ExecuteWebsiteCommand()
+    {
+        var process = new Process
+        {
+            StartInfo =
+            {
+                UseShellExecute = false,
+                CreateNoWindow  = true,
+                Arguments       = "https://aaru.app"
+            }
+        };
+
+        if(RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            process.StartInfo.FileName  = "cmd";
+            process.StartInfo.Arguments = $"/c start {process.StartInfo.Arguments.Replace("&", "^&")}";
+        }
+        else if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            process.StartInfo.FileName = "xdg-open";
+        else if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            process.StartInfo.FileName = "open";
+        else
+            return;
+
+        process.Start();
+    }
+
+    void ExecuteLicenseCommand()
+    {
+        var dialog = new LicenseDialog();
+        dialog.DataContext = new LicenseViewModel(dialog);
+        dialog.ShowDialog(_view);
+    }
+
+    void ExecuteCloseCommand() => _view.Close();
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
index 14aba4120..598e3baad 100644
--- a/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
+++ b/Aaru.Gui/ViewModels/Dialogs/ConsoleViewModel.cs
@@ -46,116 +46,115 @@ using ReactiveUI;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.Gui.ViewModels.Dialogs
+namespace Aaru.Gui.ViewModels.Dialogs;
+
+public sealed class ConsoleViewModel : ViewModelBase
 {
-    public sealed class ConsoleViewModel : ViewModelBase
+    readonly Views.Dialogs.Console _view;
+    bool                           _debugChecked;
+
+    public ConsoleViewModel(Views.Dialogs.Console view)
     {
-        readonly Views.Dialogs.Console _view;
-        bool                           _debugChecked;
-
-        public ConsoleViewModel(Views.Dialogs.Console view)
-        {
-            _view        = view;
-            SaveCommand  = ReactiveCommand.Create(ExecuteSaveCommand);
-            ClearCommand = ReactiveCommand.Create(ExecuteClearCommand);
-        }
-
-        [NotNull]
-        public string Title => "Console";
-        public ReactiveCommand<Unit, Unit>    ClearCommand { get; }
-        public ReactiveCommand<Unit, Unit>    SaveCommand  { get; }
-        public ObservableCollection<LogEntry> Entries      => ConsoleHandler.Entries;
-        [NotNull]
-        public string DebugText => "Enable debug console";
-        [NotNull]
-        public string SaveLabel => "Save";
-        [NotNull]
-        public string ClearLabel => "Clear";
-
-        public bool DebugChecked
-        {
-            get => _debugChecked;
-            set
-            {
-                ConsoleHandler.Debug = value;
-                this.RaiseAndSetIfChanged(ref _debugChecked, value);
-            }
-        }
-
-        async void ExecuteSaveCommand()
-        {
-            var dlgSave = new SaveFileDialog();
-
-            dlgSave.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "log"
-                }),
-                Name = "Log files"
-            });
-
-            string result = await dlgSave.ShowAsync(_view);
-
-            if(result is null)
-                return;
-
-            try
-            {
-                var logFs = new FileStream(result, FileMode.Create, FileAccess.ReadWrite);
-                var logSw = new StreamWriter(logFs);
-
-                logSw.WriteLine("Log saved at {0}", DateTime.Now);
-
-                PlatformID platId  = DetectOS.GetRealPlatformID();
-                string     platVer = DetectOS.GetVersion();
-
-                var assemblyVersion =
-                    Attribute.GetCustomAttribute(typeof(AaruConsole).Assembly,
-                                                 typeof(AssemblyInformationalVersionAttribute)) as
-                        AssemblyInformationalVersionAttribute;
-
-                logSw.WriteLine("################# System information #################");
-
-                logSw.WriteLine("{0} {1} ({2}-bit)", DetectOS.GetPlatformName(platId, platVer), platVer,
-                                Environment.Is64BitOperatingSystem ? 64 : 32);
-
-                logSw.WriteLine(".NET Core {0}", Version.GetNetCoreVersion());
-
-                logSw.WriteLine();
-
-                logSw.WriteLine("################# Program information ################");
-                logSw.WriteLine("Aaru {0}", assemblyVersion?.InformationalVersion);
-                logSw.WriteLine("Running in {0}-bit", Environment.Is64BitProcess ? 64 : 32);
-            #if DEBUG
-                logSw.WriteLine("DEBUG version");
-            #endif
-                logSw.WriteLine("Command line: {0}", Environment.CommandLine);
-                logSw.WriteLine();
-
-                logSw.WriteLine("################# Console ################");
-
-                foreach(LogEntry entry in ConsoleHandler.Entries)
-                    if(entry.Type != "Info")
-                        logSw.WriteLine("{0}: ({1}) {2}", entry.Timestamp, entry.Type.ToLower(), entry.Message);
-                    else
-                        logSw.WriteLine("{0}: {1}", entry.Timestamp, entry.Message);
-
-                logSw.Close();
-                logFs.Close();
-            }
-            catch(Exception exception)
-            {
-                await MessageBoxManager.
-                      GetMessageBoxStandardWindow("Error",
-                                                  $"Exception {exception.Message} trying to save logfile, details has been sent to console.",
-                                                  ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
-
-                AaruConsole.ErrorWriteLine("Console", exception.Message);
-                AaruConsole.ErrorWriteLine("Console", exception.StackTrace);
-            }
-        }
-
-        void ExecuteClearCommand() => ConsoleHandler.Entries.Clear();
+        _view        = view;
+        SaveCommand  = ReactiveCommand.Create(ExecuteSaveCommand);
+        ClearCommand = ReactiveCommand.Create(ExecuteClearCommand);
     }
+
+    [NotNull]
+    public string Title => "Console";
+    public ReactiveCommand<Unit, Unit>    ClearCommand { get; }
+    public ReactiveCommand<Unit, Unit>    SaveCommand  { get; }
+    public ObservableCollection<LogEntry> Entries      => ConsoleHandler.Entries;
+    [NotNull]
+    public string DebugText => "Enable debug console";
+    [NotNull]
+    public string SaveLabel => "Save";
+    [NotNull]
+    public string ClearLabel => "Clear";
+
+    public bool DebugChecked
+    {
+        get => _debugChecked;
+        set
+        {
+            ConsoleHandler.Debug = value;
+            this.RaiseAndSetIfChanged(ref _debugChecked, value);
+        }
+    }
+
+    async void ExecuteSaveCommand()
+    {
+        var dlgSave = new SaveFileDialog();
+
+        dlgSave.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "log"
+            }),
+            Name = "Log files"
+        });
+
+        string result = await dlgSave.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        try
+        {
+            var logFs = new FileStream(result, FileMode.Create, FileAccess.ReadWrite);
+            var logSw = new StreamWriter(logFs);
+
+            logSw.WriteLine("Log saved at {0}", DateTime.Now);
+
+            PlatformID platId  = DetectOS.GetRealPlatformID();
+            string     platVer = DetectOS.GetVersion();
+
+            var assemblyVersion =
+                Attribute.GetCustomAttribute(typeof(AaruConsole).Assembly,
+                                             typeof(AssemblyInformationalVersionAttribute)) as
+                    AssemblyInformationalVersionAttribute;
+
+            logSw.WriteLine("################# System information #################");
+
+            logSw.WriteLine("{0} {1} ({2}-bit)", DetectOS.GetPlatformName(platId, platVer), platVer,
+                            Environment.Is64BitOperatingSystem ? 64 : 32);
+
+            logSw.WriteLine(".NET Core {0}", Version.GetNetCoreVersion());
+
+            logSw.WriteLine();
+
+            logSw.WriteLine("################# Program information ################");
+            logSw.WriteLine("Aaru {0}", assemblyVersion?.InformationalVersion);
+            logSw.WriteLine("Running in {0}-bit", Environment.Is64BitProcess ? 64 : 32);
+        #if DEBUG
+            logSw.WriteLine("DEBUG version");
+        #endif
+            logSw.WriteLine("Command line: {0}", Environment.CommandLine);
+            logSw.WriteLine();
+
+            logSw.WriteLine("################# Console ################");
+
+            foreach(LogEntry entry in ConsoleHandler.Entries)
+                if(entry.Type != "Info")
+                    logSw.WriteLine("{0}: ({1}) {2}", entry.Timestamp, entry.Type.ToLower(), entry.Message);
+                else
+                    logSw.WriteLine("{0}: {1}", entry.Timestamp, entry.Message);
+
+            logSw.Close();
+            logFs.Close();
+        }
+        catch(Exception exception)
+        {
+            await MessageBoxManager.
+                  GetMessageBoxStandardWindow("Error",
+                                              $"Exception {exception.Message} trying to save logfile, details has been sent to console.",
+                                              ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
+
+            AaruConsole.ErrorWriteLine("Console", exception.Message);
+            AaruConsole.ErrorWriteLine("Console", exception.StackTrace);
+        }
+    }
+
+    void ExecuteClearCommand() => ConsoleHandler.Entries.Clear();
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Dialogs/EncodingsViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/EncodingsViewModel.cs
index 0aecbad50..d736d1f99 100644
--- a/Aaru.Gui/ViewModels/Dialogs/EncodingsViewModel.cs
+++ b/Aaru.Gui/ViewModels/Dialogs/EncodingsViewModel.cs
@@ -41,44 +41,43 @@ using Aaru.Gui.Views.Dialogs;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Dialogs
+namespace Aaru.Gui.ViewModels.Dialogs;
+
+public sealed class EncodingsViewModel : ViewModelBase
 {
-    public sealed class EncodingsViewModel : ViewModelBase
+    readonly Encodings _view;
+
+    public EncodingsViewModel(Encodings view)
     {
-        readonly Encodings _view;
+        _view        = view;
+        Encodings    = new ObservableCollection<EncodingModel>();
+        CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);
 
-        public EncodingsViewModel(Encodings view)
+        Task.Run(() =>
         {
-            _view        = view;
-            Encodings    = new ObservableCollection<EncodingModel>();
-            CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);
-
-            Task.Run(() =>
+            List<EncodingModel> encodings = Encoding.GetEncodings().Select(info => new EncodingModel
             {
-                List<EncodingModel> encodings = Encoding.GetEncodings().Select(info => new EncodingModel
-                {
-                    Name        = info.Name,
-                    DisplayName = info.GetEncoding().EncodingName
-                }).ToList();
+                Name        = info.Name,
+                DisplayName = info.GetEncoding().EncodingName
+            }).ToList();
 
-                encodings.AddRange(Claunia.Encoding.Encoding.GetEncodings().Select(info => new EncodingModel
-                {
-                    Name        = info.Name,
-                    DisplayName = info.DisplayName
-                }));
+            encodings.AddRange(Claunia.Encoding.Encoding.GetEncodings().Select(info => new EncodingModel
+            {
+                Name        = info.Name,
+                DisplayName = info.DisplayName
+            }));
 
-                foreach(EncodingModel encoding in encodings.OrderBy(t => t.DisplayName))
-                    Encodings.Add(encoding);
-            });
-        }
-
-        [NotNull]
-        public string Title => "Encodings";
-        [NotNull]
-        public string CloseLabel => "Close";
-        public ReactiveCommand<Unit, Unit>         CloseCommand { get; }
-        public ObservableCollection<EncodingModel> Encodings    { get; }
-
-        void ExecuteCloseCommand() => _view.Close();
+            foreach(EncodingModel encoding in encodings.OrderBy(t => t.DisplayName))
+                Encodings.Add(encoding);
+        });
     }
+
+    [NotNull]
+    public string Title => "Encodings";
+    [NotNull]
+    public string CloseLabel => "Close";
+    public ReactiveCommand<Unit, Unit>         CloseCommand { get; }
+    public ObservableCollection<EncodingModel> Encodings    { get; }
+
+    void ExecuteCloseCommand() => _view.Close();
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Dialogs/LicenseViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/LicenseViewModel.cs
index 3a9c95bc7..d299df772 100644
--- a/Aaru.Gui/ViewModels/Dialogs/LicenseViewModel.cs
+++ b/Aaru.Gui/ViewModels/Dialogs/LicenseViewModel.cs
@@ -37,35 +37,34 @@ using Aaru.Gui.Views.Dialogs;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Dialogs
+namespace Aaru.Gui.ViewModels.Dialogs;
+
+public sealed class LicenseViewModel : ViewModelBase
 {
-    public sealed class LicenseViewModel : ViewModelBase
+    readonly LicenseDialog _view;
+    string                 _versionText;
+
+    public LicenseViewModel(LicenseDialog view)
     {
-        readonly LicenseDialog _view;
-        string                 _versionText;
+        _view        = view;
+        CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);
 
-        public LicenseViewModel(LicenseDialog view)
-        {
-            _view        = view;
-            CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);
+        using Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("Aaru.Gui.LICENSE");
 
-            using Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("Aaru.Gui.LICENSE");
+        if(stream == null)
+            return;
 
-            if(stream == null)
-                return;
+        using var reader = new StreamReader(stream);
 
-            using var reader = new StreamReader(stream);
-
-            LicenseText = reader.ReadToEnd();
-        }
-
-        [NotNull]
-        public string Title => "Aaru's license";
-        [NotNull]
-        public string CloseLabel => "Close";
-        public string                      LicenseText  { get; }
-        public ReactiveCommand<Unit, Unit> CloseCommand { get; }
-
-        void ExecuteCloseCommand() => _view.Close();
+        LicenseText = reader.ReadToEnd();
     }
+
+    [NotNull]
+    public string Title => "Aaru's license";
+    [NotNull]
+    public string CloseLabel => "Close";
+    public string                      LicenseText  { get; }
+    public ReactiveCommand<Unit, Unit> CloseCommand { get; }
+
+    void ExecuteCloseCommand() => _view.Close();
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs
index d9ee15a8e..46cfe13e8 100644
--- a/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs
+++ b/Aaru.Gui/ViewModels/Dialogs/PluginsViewModel.cs
@@ -40,129 +40,128 @@ using Aaru.Gui.Views.Dialogs;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Dialogs
+namespace Aaru.Gui.ViewModels.Dialogs;
+
+public sealed class PluginsViewModel : ViewModelBase
 {
-    public sealed class PluginsViewModel : ViewModelBase
+    readonly PluginsDialog _view;
+
+    public PluginsViewModel(PluginsDialog view)
     {
-        readonly PluginsDialog _view;
+        _view                = view;
+        Filters              = new ObservableCollection<PluginModel>();
+        PartitionSchemes     = new ObservableCollection<PluginModel>();
+        Filesystems          = new ObservableCollection<PluginModel>();
+        ReadOnlyFilesystems  = new ObservableCollection<PluginModel>();
+        Images               = new ObservableCollection<PluginModel>();
+        WritableImages       = new ObservableCollection<PluginModel>();
+        FloppyImages         = new ObservableCollection<PluginModel>();
+        WritableFloppyImages = new ObservableCollection<PluginModel>();
+        CloseCommand         = ReactiveCommand.Create(ExecuteCloseCommand);
 
-        public PluginsViewModel(PluginsDialog view)
-        {
-            _view                = view;
-            Filters              = new ObservableCollection<PluginModel>();
-            PartitionSchemes     = new ObservableCollection<PluginModel>();
-            Filesystems          = new ObservableCollection<PluginModel>();
-            ReadOnlyFilesystems  = new ObservableCollection<PluginModel>();
-            Images               = new ObservableCollection<PluginModel>();
-            WritableImages       = new ObservableCollection<PluginModel>();
-            FloppyImages         = new ObservableCollection<PluginModel>();
-            WritableFloppyImages = new ObservableCollection<PluginModel>();
-            CloseCommand         = ReactiveCommand.Create(ExecuteCloseCommand);
+        // TODO: Takes too much time
+        foreach(IFilter filter in GetPluginBase.Instance.Filters.Values)
+            Filters.Add(new PluginModel
+            {
+                Name    = filter.Name,
+                Uuid    = filter.Id,
+                Version = Assembly.GetAssembly(filter.GetType())?.GetName().Version?.ToString(),
+                Author  = filter.Author
+            });
 
-            // TODO: Takes too much time
-            foreach(IFilter filter in GetPluginBase.Instance.Filters.Values)
-                Filters.Add(new PluginModel
-                {
-                    Name    = filter.Name,
-                    Uuid    = filter.Id,
-                    Version = Assembly.GetAssembly(filter.GetType())?.GetName().Version?.ToString(),
-                    Author  = filter.Author
-                });
+        foreach(IFloppyImage floppyImage in GetPluginBase.Instance.FloppyImages.Values)
+            FloppyImages.Add(new PluginModel
+            {
+                Name    = floppyImage.Name,
+                Uuid    = floppyImage.Id,
+                Version = Assembly.GetAssembly(floppyImage.GetType())?.GetName().Version?.ToString(),
+                Author  = floppyImage.Author
+            });
 
-            foreach(IFloppyImage floppyImage in GetPluginBase.Instance.FloppyImages.Values)
-                FloppyImages.Add(new PluginModel
-                {
-                    Name    = floppyImage.Name,
-                    Uuid    = floppyImage.Id,
-                    Version = Assembly.GetAssembly(floppyImage.GetType())?.GetName().Version?.ToString(),
-                    Author  = floppyImage.Author
-                });
+        foreach(IMediaImage mediaImage in GetPluginBase.Instance.ImagePluginsList.Values)
+            Images.Add(new PluginModel
+            {
+                Name    = mediaImage.Name,
+                Uuid    = mediaImage.Id,
+                Version = Assembly.GetAssembly(mediaImage.GetType())?.GetName().Version?.ToString(),
+                Author  = mediaImage.Author
+            });
 
-            foreach(IMediaImage mediaImage in GetPluginBase.Instance.ImagePluginsList.Values)
-                Images.Add(new PluginModel
-                {
-                    Name    = mediaImage.Name,
-                    Uuid    = mediaImage.Id,
-                    Version = Assembly.GetAssembly(mediaImage.GetType())?.GetName().Version?.ToString(),
-                    Author  = mediaImage.Author
-                });
+        foreach(IPartition partition in GetPluginBase.Instance.PartPluginsList.Values)
+            PartitionSchemes.Add(new PluginModel
+            {
+                Name    = partition.Name,
+                Uuid    = partition.Id,
+                Version = Assembly.GetAssembly(partition.GetType())?.GetName().Version?.ToString(),
+                Author  = partition.Author
+            });
 
-            foreach(IPartition partition in GetPluginBase.Instance.PartPluginsList.Values)
-                PartitionSchemes.Add(new PluginModel
-                {
-                    Name    = partition.Name,
-                    Uuid    = partition.Id,
-                    Version = Assembly.GetAssembly(partition.GetType())?.GetName().Version?.ToString(),
-                    Author  = partition.Author
-                });
+        foreach(IFilesystem filesystem in GetPluginBase.Instance.PluginsList.Values)
+            Filesystems.Add(new PluginModel
+            {
+                Name    = filesystem.Name,
+                Uuid    = filesystem.Id,
+                Version = Assembly.GetAssembly(filesystem.GetType())?.GetName().Version?.ToString(),
+                Author  = filesystem.Author
+            });
 
-            foreach(IFilesystem filesystem in GetPluginBase.Instance.PluginsList.Values)
-                Filesystems.Add(new PluginModel
-                {
-                    Name    = filesystem.Name,
-                    Uuid    = filesystem.Id,
-                    Version = Assembly.GetAssembly(filesystem.GetType())?.GetName().Version?.ToString(),
-                    Author  = filesystem.Author
-                });
+        foreach(IReadOnlyFilesystem readOnlyFilesystem in GetPluginBase.Instance.ReadOnlyFilesystems.Values)
+            ReadOnlyFilesystems.Add(new PluginModel
+            {
+                Name    = readOnlyFilesystem.Name,
+                Uuid    = readOnlyFilesystem.Id,
+                Version = Assembly.GetAssembly(readOnlyFilesystem.GetType())?.GetName().Version?.ToString(),
+                Author  = readOnlyFilesystem.Author
+            });
 
-            foreach(IReadOnlyFilesystem readOnlyFilesystem in GetPluginBase.Instance.ReadOnlyFilesystems.Values)
-                ReadOnlyFilesystems.Add(new PluginModel
-                {
-                    Name    = readOnlyFilesystem.Name,
-                    Uuid    = readOnlyFilesystem.Id,
-                    Version = Assembly.GetAssembly(readOnlyFilesystem.GetType())?.GetName().Version?.ToString(),
-                    Author  = readOnlyFilesystem.Author
-                });
+        foreach(IWritableFloppyImage writableFloppyImage in GetPluginBase.Instance.WritableFloppyImages.Values)
+            WritableFloppyImages.Add(new PluginModel
+            {
+                Name    = writableFloppyImage.Name,
+                Uuid    = writableFloppyImage.Id,
+                Version = Assembly.GetAssembly(writableFloppyImage.GetType())?.GetName().Version?.ToString(),
+                Author  = writableFloppyImage.Author
+            });
 
-            foreach(IWritableFloppyImage writableFloppyImage in GetPluginBase.Instance.WritableFloppyImages.Values)
-                WritableFloppyImages.Add(new PluginModel
-                {
-                    Name    = writableFloppyImage.Name,
-                    Uuid    = writableFloppyImage.Id,
-                    Version = Assembly.GetAssembly(writableFloppyImage.GetType())?.GetName().Version?.ToString(),
-                    Author  = writableFloppyImage.Author
-                });
-
-            foreach(IWritableImage writableImage in GetPluginBase.Instance.WritableImages.Values)
-                WritableImages.Add(new PluginModel
-                {
-                    Name    = writableImage.Name,
-                    Uuid    = writableImage.Id,
-                    Version = Assembly.GetAssembly(writableImage.GetType())?.GetName().Version?.ToString(),
-                    Author  = writableImage.Author
-                });
-        }
-
-        [NotNull]
-        public string Title => "Plugins";
-        [NotNull]
-        public string FiltersLabel => "Filters";
-        [NotNull]
-        public string PartitionsLabel => "Partitions";
-        [NotNull]
-        public string FilesystemsLabel => "Filesystems";
-        [NotNull]
-        public string IdentifyLabel => "Identify only:";
-        [NotNull]
-        public string ImagesLabel => "Media images";
-        [NotNull]
-        public string FloppyImagesLabel => "Floppy images";
-        [NotNull]
-        public string ReadableLabel => "Readable:";
-        [NotNull]
-        public string WritableLabel => "Writable:";
-        [NotNull]
-        public string CloseLabel => "Close";
-        public ReactiveCommand<Unit, Unit>       CloseCommand         { get; }
-        public ObservableCollection<PluginModel> Filters              { get; }
-        public ObservableCollection<PluginModel> PartitionSchemes     { get; }
-        public ObservableCollection<PluginModel> Filesystems          { get; }
-        public ObservableCollection<PluginModel> ReadOnlyFilesystems  { get; }
-        public ObservableCollection<PluginModel> Images               { get; }
-        public ObservableCollection<PluginModel> WritableImages       { get; }
-        public ObservableCollection<PluginModel> FloppyImages         { get; }
-        public ObservableCollection<PluginModel> WritableFloppyImages { get; }
-
-        void ExecuteCloseCommand() => _view.Close();
+        foreach(IWritableImage writableImage in GetPluginBase.Instance.WritableImages.Values)
+            WritableImages.Add(new PluginModel
+            {
+                Name    = writableImage.Name,
+                Uuid    = writableImage.Id,
+                Version = Assembly.GetAssembly(writableImage.GetType())?.GetName().Version?.ToString(),
+                Author  = writableImage.Author
+            });
     }
+
+    [NotNull]
+    public string Title => "Plugins";
+    [NotNull]
+    public string FiltersLabel => "Filters";
+    [NotNull]
+    public string PartitionsLabel => "Partitions";
+    [NotNull]
+    public string FilesystemsLabel => "Filesystems";
+    [NotNull]
+    public string IdentifyLabel => "Identify only:";
+    [NotNull]
+    public string ImagesLabel => "Media images";
+    [NotNull]
+    public string FloppyImagesLabel => "Floppy images";
+    [NotNull]
+    public string ReadableLabel => "Readable:";
+    [NotNull]
+    public string WritableLabel => "Writable:";
+    [NotNull]
+    public string CloseLabel => "Close";
+    public ReactiveCommand<Unit, Unit>       CloseCommand         { get; }
+    public ObservableCollection<PluginModel> Filters              { get; }
+    public ObservableCollection<PluginModel> PartitionSchemes     { get; }
+    public ObservableCollection<PluginModel> Filesystems          { get; }
+    public ObservableCollection<PluginModel> ReadOnlyFilesystems  { get; }
+    public ObservableCollection<PluginModel> Images               { get; }
+    public ObservableCollection<PluginModel> WritableImages       { get; }
+    public ObservableCollection<PluginModel> FloppyImages         { get; }
+    public ObservableCollection<PluginModel> WritableFloppyImages { get; }
+
+    void ExecuteCloseCommand() => _view.Close();
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Dialogs/SettingsViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/SettingsViewModel.cs
index 75f077992..d5ee44a1c 100644
--- a/Aaru.Gui/ViewModels/Dialogs/SettingsViewModel.cs
+++ b/Aaru.Gui/ViewModels/Dialogs/SettingsViewModel.cs
@@ -36,91 +36,91 @@ using Aaru.Settings;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Dialogs
+namespace Aaru.Gui.ViewModels.Dialogs;
+
+public sealed class SettingsViewModel : ViewModelBase
 {
-    public sealed class SettingsViewModel : ViewModelBase
+    readonly SettingsDialog _view;
+    bool                    _commandStatsChecked;
+    bool                    _deviceStatsChecked;
+    bool                    _filesystemStatsChecked;
+    bool                    _filterStatsChecked;
+    bool                    _gdprVisible;
+    bool                    _mediaImageStatsChecked;
+    bool                    _mediaScanStatsChecked;
+    bool                    _mediaStatsChecked;
+    bool                    _partitionStatsChecked;
+    bool                    _saveReportsGloballyChecked;
+    bool                    _saveStatsChecked;
+    bool                    _shareReportsChecked;
+    bool                    _shareStatsChecked;
+    int                     _tabControlSelectedIndex;
+    bool                    _verifyStatsChecked;
+
+    public SettingsViewModel(SettingsDialog view, bool gdprChange)
     {
-        readonly SettingsDialog _view;
-        bool                    _commandStatsChecked;
-        bool                    _deviceStatsChecked;
-        bool                    _filesystemStatsChecked;
-        bool                    _filterStatsChecked;
-        bool                    _gdprVisible;
-        bool                    _mediaImageStatsChecked;
-        bool                    _mediaScanStatsChecked;
-        bool                    _mediaStatsChecked;
-        bool                    _partitionStatsChecked;
-        bool                    _saveReportsGloballyChecked;
-        bool                    _saveStatsChecked;
-        bool                    _shareReportsChecked;
-        bool                    _shareStatsChecked;
-        int                     _tabControlSelectedIndex;
-        bool                    _verifyStatsChecked;
+        _view                      = view;
+        GdprVisible                = gdprChange;
+        SaveReportsGloballyChecked = Settings.Settings.Current.SaveReportsGlobally;
+        ShareReportsChecked        = Settings.Settings.Current.ShareReports;
 
-        public SettingsViewModel(SettingsDialog view, bool gdprChange)
+        if(Settings.Settings.Current.Stats != null)
         {
-            _view                      = view;
-            GdprVisible                = gdprChange;
-            SaveReportsGloballyChecked = Settings.Settings.Current.SaveReportsGlobally;
-            ShareReportsChecked        = Settings.Settings.Current.ShareReports;
-
-            if(Settings.Settings.Current.Stats != null)
-            {
-                SaveStatsChecked       = true;
-                ShareStatsChecked      = Settings.Settings.Current.Stats.ShareStats;
-                CommandStatsChecked    = Settings.Settings.Current.Stats.CommandStats;
-                DeviceStatsChecked     = Settings.Settings.Current.Stats.DeviceStats;
-                FilesystemStatsChecked = Settings.Settings.Current.Stats.FilesystemStats;
-                FilterStatsChecked     = Settings.Settings.Current.Stats.FilterStats;
-                MediaImageStatsChecked = Settings.Settings.Current.Stats.MediaImageStats;
-                MediaScanStatsChecked  = Settings.Settings.Current.Stats.MediaScanStats;
-                PartitionStatsChecked  = Settings.Settings.Current.Stats.PartitionStats;
-                MediaStatsChecked      = Settings.Settings.Current.Stats.MediaStats;
-                VerifyStatsChecked     = Settings.Settings.Current.Stats.VerifyStats;
-            }
-            else
-                SaveStatsChecked = false;
-
-            CancelCommand = ReactiveCommand.Create(ExecuteCancelCommand);
-            SaveCommand   = ReactiveCommand.Create(ExecuteSaveCommand);
-
-            if(!_gdprVisible)
-                _tabControlSelectedIndex = 1;
+            SaveStatsChecked       = true;
+            ShareStatsChecked      = Settings.Settings.Current.Stats.ShareStats;
+            CommandStatsChecked    = Settings.Settings.Current.Stats.CommandStats;
+            DeviceStatsChecked     = Settings.Settings.Current.Stats.DeviceStats;
+            FilesystemStatsChecked = Settings.Settings.Current.Stats.FilesystemStats;
+            FilterStatsChecked     = Settings.Settings.Current.Stats.FilterStats;
+            MediaImageStatsChecked = Settings.Settings.Current.Stats.MediaImageStats;
+            MediaScanStatsChecked  = Settings.Settings.Current.Stats.MediaScanStats;
+            PartitionStatsChecked  = Settings.Settings.Current.Stats.PartitionStats;
+            MediaStatsChecked      = Settings.Settings.Current.Stats.MediaStats;
+            VerifyStatsChecked     = Settings.Settings.Current.Stats.VerifyStats;
         }
+        else
+            SaveStatsChecked = false;
 
-        // TODO: Show Preferences in macOS
-        [NotNull]
-        public string Title => "Settings";
-        [NotNull]
-        public string GdprLabel => "GDPR";
-        [NotNull]
-        public string ReportsLabel => "Reports";
-        [NotNull]
-        public string StatisticsLabel => "Statistics";
-        [NotNull]
-        public string SaveLabel => "Save";
-        [NotNull]
-        public string CancelLabel => "Cancel";
-        [NotNull]
-        public string GdprText1 =>
-            @"In compliance with the European Union General Data Protection Regulation 2016/679 (GDPR),
+        CancelCommand = ReactiveCommand.Create(ExecuteCancelCommand);
+        SaveCommand   = ReactiveCommand.Create(ExecuteSaveCommand);
+
+        if(!_gdprVisible)
+            _tabControlSelectedIndex = 1;
+    }
+
+    // TODO: Show Preferences in macOS
+    [NotNull]
+    public string Title => "Settings";
+    [NotNull]
+    public string GdprLabel => "GDPR";
+    [NotNull]
+    public string ReportsLabel => "Reports";
+    [NotNull]
+    public string StatisticsLabel => "Statistics";
+    [NotNull]
+    public string SaveLabel => "Save";
+    [NotNull]
+    public string CancelLabel => "Cancel";
+    [NotNull]
+    public string GdprText1 =>
+        @"In compliance with the European Union General Data Protection Regulation 2016/679 (GDPR),
 we must give you the following information about Aaru and ask if you want to opt-in
 in some information sharing.";
 
-        [NotNull]
-        public string GdprText2 =>
-            @"Disclaimer: Because Aaru is an open source software this information, and therefore,
+    [NotNull]
+    public string GdprText2 =>
+        @"Disclaimer: Because Aaru is an open source software this information, and therefore,
 compliance with GDPR only holds true if you obtained a certificated copy from its original
 authors. In case of doubt, close Aaru now and ask in our IRC support channel.";
 
-        [NotNull]
-        public string GdprText3 =>
-            @"For any information sharing your IP address may be stored in our server, in a way that is not
+    [NotNull]
+    public string GdprText3 =>
+        @"For any information sharing your IP address may be stored in our server, in a way that is not
 possible for any person, manual, or automated process, to link with your identity, unless
 specified otherwise.";
-        [NotNull]
-        public string ReportsGloballyText =>
-            @"With the 'device-report' command, Aaru creates a report of a device, that includes its
+    [NotNull]
+    public string ReportsGloballyText =>
+        @"With the 'device-report' command, Aaru creates a report of a device, that includes its
 manufacturer, model, firmware revision and/or version, attached bus, size, and supported commands.
 The serial number of the device is not stored in the report. If used with the debug parameter,
 extra information about the device will be stored in the report. This information is known to contain
@@ -128,169 +128,168 @@ the device serial number in non-standard places that prevent the automatic remov
 of devices. A human-readable copy of the report in XML format is always created in the same directory
 where Aaru is being run from.";
 
-        [NotNull]
-        public string SaveReportsGloballyText => "Save device reports in shared folder of your computer?";
+    [NotNull]
+    public string SaveReportsGloballyText => "Save device reports in shared folder of your computer?";
 
-        [NotNull]
-        public string ReportsText =>
-            @"Sharing a report with us will send it to our server, that's in the european union territory, where it
+    [NotNull]
+    public string ReportsText =>
+        @"Sharing a report with us will send it to our server, that's in the european union territory, where it
 will be manually analyzed by an european union citizen to remove any trace of personal identification
 from it. Once that is done, it will be shared in our stats website, https://www.aaru.app
 These report will be used to improve Aaru support, and in some cases, to provide emulation of the
 devices to other open-source projects. In any case, no information linking the report to you will be stored.";
 
-        [NotNull]
-        public string ShareReportsText => "Share your device reports with us?";
-        [NotNull]
-        public string StatisticsText =>
-            @"Aaru can store some usage statistics. These statistics are limited to the number of times a
+    [NotNull]
+    public string ShareReportsText => "Share your device reports with us?";
+    [NotNull]
+    public string StatisticsText =>
+        @"Aaru can store some usage statistics. These statistics are limited to the number of times a
 command is executed, a filesystem, partition, or device is used, the operating system version, and other.
 In no case, any information besides pure statistical usage numbers is stored, and they're just joint to the
 pool with no way of using them to identify you.";
 
-        [NotNull]
-        public string SaveStatsText => "Save stats about your Aaru usage?";
-        [NotNull]
-        public string ShareStatsText => "Share your stats (anonymously)?";
-        [NotNull]
-        public string CommandStatsText => "Gather statistics about command usage?";
-        [NotNull]
-        public string DeviceStatsText => "Gather statistics about found devices?";
-        [NotNull]
-        public string FilesystemStatsText => "Gather statistics about found filesystems?";
-        [NotNull]
-        public string FilterStatsText => "Gather statistics about found file filters?";
-        [NotNull]
-        public string MediaImageStatsText => "Gather statistics about found media image formats?";
-        [NotNull]
-        public string MediaScanStatsText => "Gather statistics about scanned media?";
-        [NotNull]
-        public string PartitionStatsText => "Gather statistics about found partitioning schemes?";
-        [NotNull]
-        public string MediaStatsText => "Gather statistics about media types?";
-        [NotNull]
-        public string VerifyStatsText => "Gather statistics about media image verifications?";
+    [NotNull]
+    public string SaveStatsText => "Save stats about your Aaru usage?";
+    [NotNull]
+    public string ShareStatsText => "Share your stats (anonymously)?";
+    [NotNull]
+    public string CommandStatsText => "Gather statistics about command usage?";
+    [NotNull]
+    public string DeviceStatsText => "Gather statistics about found devices?";
+    [NotNull]
+    public string FilesystemStatsText => "Gather statistics about found filesystems?";
+    [NotNull]
+    public string FilterStatsText => "Gather statistics about found file filters?";
+    [NotNull]
+    public string MediaImageStatsText => "Gather statistics about found media image formats?";
+    [NotNull]
+    public string MediaScanStatsText => "Gather statistics about scanned media?";
+    [NotNull]
+    public string PartitionStatsText => "Gather statistics about found partitioning schemes?";
+    [NotNull]
+    public string MediaStatsText => "Gather statistics about media types?";
+    [NotNull]
+    public string VerifyStatsText => "Gather statistics about media image verifications?";
 
-        public ReactiveCommand<Unit, Unit> CancelCommand { get; }
-        public ReactiveCommand<Unit, Unit> SaveCommand   { get; }
+    public ReactiveCommand<Unit, Unit> CancelCommand { get; }
+    public ReactiveCommand<Unit, Unit> SaveCommand   { get; }
 
-        public bool GdprVisible
-        {
-            get => _gdprVisible;
-            set => this.RaiseAndSetIfChanged(ref _gdprVisible, value);
-        }
-
-        public bool SaveReportsGloballyChecked
-        {
-            get => _saveReportsGloballyChecked;
-            set => this.RaiseAndSetIfChanged(ref _saveReportsGloballyChecked, value);
-        }
-
-        public bool ShareReportsChecked
-        {
-            get => _shareReportsChecked;
-            set => this.RaiseAndSetIfChanged(ref _shareReportsChecked, value);
-        }
-
-        public bool SaveStatsChecked
-        {
-            get => _saveStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _saveStatsChecked, value);
-        }
-
-        public bool ShareStatsChecked
-        {
-            get => _shareStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _shareStatsChecked, value);
-        }
-
-        public bool CommandStatsChecked
-        {
-            get => _commandStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _commandStatsChecked, value);
-        }
-
-        public bool DeviceStatsChecked
-        {
-            get => _deviceStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _deviceStatsChecked, value);
-        }
-
-        public bool FilesystemStatsChecked
-        {
-            get => _filesystemStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _filesystemStatsChecked, value);
-        }
-
-        public bool FilterStatsChecked
-        {
-            get => _filterStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _filterStatsChecked, value);
-        }
-
-        public bool MediaImageStatsChecked
-        {
-            get => _mediaImageStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _mediaImageStatsChecked, value);
-        }
-
-        public bool MediaScanStatsChecked
-        {
-            get => _mediaScanStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _mediaScanStatsChecked, value);
-        }
-
-        public bool PartitionStatsChecked
-        {
-            get => _partitionStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _partitionStatsChecked, value);
-        }
-
-        public bool MediaStatsChecked
-        {
-            get => _mediaStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _mediaStatsChecked, value);
-        }
-
-        public bool VerifyStatsChecked
-        {
-            get => _verifyStatsChecked;
-            set => this.RaiseAndSetIfChanged(ref _verifyStatsChecked, value);
-        }
-
-        public int TabControlSelectedIndex
-        {
-            get => _tabControlSelectedIndex;
-            set => this.RaiseAndSetIfChanged(ref _tabControlSelectedIndex, value);
-        }
-
-        void ExecuteSaveCommand()
-        {
-            Settings.Settings.Current.SaveReportsGlobally = SaveReportsGloballyChecked;
-            Settings.Settings.Current.ShareReports        = ShareReportsChecked;
-
-            if(SaveStatsChecked)
-                Settings.Settings.Current.Stats = new StatsSettings
-                {
-                    ShareStats      = ShareStatsChecked,
-                    CommandStats    = CommandStatsChecked,
-                    DeviceStats     = DeviceStatsChecked,
-                    FilesystemStats = FilesystemStatsChecked,
-                    FilterStats     = FilterStatsChecked,
-                    MediaImageStats = MediaImageStatsChecked,
-                    MediaScanStats  = MediaScanStatsChecked,
-                    PartitionStats  = PartitionStatsChecked,
-                    MediaStats      = MediaStatsChecked,
-                    VerifyStats     = VerifyStatsChecked
-                };
-            else
-                Settings.Settings.Current.Stats = null;
-
-            Settings.Settings.Current.GdprCompliance = DicSettings.GDPR_LEVEL;
-            Settings.Settings.SaveSettings();
-            _view.Close();
-        }
-
-        void ExecuteCancelCommand() => _view.Close();
+    public bool GdprVisible
+    {
+        get => _gdprVisible;
+        set => this.RaiseAndSetIfChanged(ref _gdprVisible, value);
     }
+
+    public bool SaveReportsGloballyChecked
+    {
+        get => _saveReportsGloballyChecked;
+        set => this.RaiseAndSetIfChanged(ref _saveReportsGloballyChecked, value);
+    }
+
+    public bool ShareReportsChecked
+    {
+        get => _shareReportsChecked;
+        set => this.RaiseAndSetIfChanged(ref _shareReportsChecked, value);
+    }
+
+    public bool SaveStatsChecked
+    {
+        get => _saveStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _saveStatsChecked, value);
+    }
+
+    public bool ShareStatsChecked
+    {
+        get => _shareStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _shareStatsChecked, value);
+    }
+
+    public bool CommandStatsChecked
+    {
+        get => _commandStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _commandStatsChecked, value);
+    }
+
+    public bool DeviceStatsChecked
+    {
+        get => _deviceStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _deviceStatsChecked, value);
+    }
+
+    public bool FilesystemStatsChecked
+    {
+        get => _filesystemStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _filesystemStatsChecked, value);
+    }
+
+    public bool FilterStatsChecked
+    {
+        get => _filterStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _filterStatsChecked, value);
+    }
+
+    public bool MediaImageStatsChecked
+    {
+        get => _mediaImageStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _mediaImageStatsChecked, value);
+    }
+
+    public bool MediaScanStatsChecked
+    {
+        get => _mediaScanStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _mediaScanStatsChecked, value);
+    }
+
+    public bool PartitionStatsChecked
+    {
+        get => _partitionStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _partitionStatsChecked, value);
+    }
+
+    public bool MediaStatsChecked
+    {
+        get => _mediaStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _mediaStatsChecked, value);
+    }
+
+    public bool VerifyStatsChecked
+    {
+        get => _verifyStatsChecked;
+        set => this.RaiseAndSetIfChanged(ref _verifyStatsChecked, value);
+    }
+
+    public int TabControlSelectedIndex
+    {
+        get => _tabControlSelectedIndex;
+        set => this.RaiseAndSetIfChanged(ref _tabControlSelectedIndex, value);
+    }
+
+    void ExecuteSaveCommand()
+    {
+        Settings.Settings.Current.SaveReportsGlobally = SaveReportsGloballyChecked;
+        Settings.Settings.Current.ShareReports        = ShareReportsChecked;
+
+        if(SaveStatsChecked)
+            Settings.Settings.Current.Stats = new StatsSettings
+            {
+                ShareStats      = ShareStatsChecked,
+                CommandStats    = CommandStatsChecked,
+                DeviceStats     = DeviceStatsChecked,
+                FilesystemStats = FilesystemStatsChecked,
+                FilterStats     = FilterStatsChecked,
+                MediaImageStats = MediaImageStatsChecked,
+                MediaScanStats  = MediaScanStatsChecked,
+                PartitionStats  = PartitionStatsChecked,
+                MediaStats      = MediaStatsChecked,
+                VerifyStats     = VerifyStatsChecked
+            };
+        else
+            Settings.Settings.Current.Stats = null;
+
+        Settings.Settings.Current.GdprCompliance = DicSettings.GDPR_LEVEL;
+        Settings.Settings.SaveSettings();
+        _view.Close();
+    }
+
+    void ExecuteCancelCommand() => _view.Close();
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Dialogs/StatisticsViewModel.cs b/Aaru.Gui/ViewModels/Dialogs/StatisticsViewModel.cs
index 49c9d1f39..32707bf89 100644
--- a/Aaru.Gui/ViewModels/Dialogs/StatisticsViewModel.cs
+++ b/Aaru.Gui/ViewModels/Dialogs/StatisticsViewModel.cs
@@ -41,685 +41,684 @@ using JetBrains.Annotations;
 using ReactiveUI;
 using NameCountModel = Aaru.Gui.Models.NameCountModel;
 
-namespace Aaru.Gui.ViewModels.Dialogs
+namespace Aaru.Gui.ViewModels.Dialogs;
+
+public sealed class StatisticsViewModel : ViewModelBase
 {
-    public sealed class StatisticsViewModel : ViewModelBase
+    readonly StatisticsDialog _view;
+    string                    _checksumText;
+    bool                      _checksumVisible;
+    bool                      _commandsVisible;
+    string                    _compareText;
+    bool                      _compareVisible;
+    string                    _convertImageText;
+    bool                      _convertImageVisible;
+    string                    _createSidecarText;
+    bool                      _createSidecarVisible;
+    string                    _decodeText;
+    bool                      _decodeVisible;
+    string                    _deviceInfoText;
+    bool                      _deviceInfoVisible;
+    string                    _deviceReportText;
+    bool                      _deviceReportVisible;
+    bool                      _devicesVisible;
+    string                    _dumpMediaText;
+    bool                      _dumpMediaVisible;
+    string                    _entropyText;
+    bool                      _entropyVisible;
+    bool                      _filesystemsVisible;
+    bool                      _filtersVisible;
+    bool                      _formatsCommandVisible;
+    string                    _formatsText;
+    bool                      _formatsVisible;
+
+    string _fsinfoText;
+    bool   _fsinfoVisible;
+    string _imageInfoText;
+    bool   _imageInfoVisible;
+    string _mediaInfoText;
+    bool   _mediaInfoVisible;
+    string _mediaScanText;
+    bool   _mediaScanVisible;
+    bool   _mediasVisible;
+    bool   _partitionsVisible;
+    string _printHexText;
+    bool   _printHexVisible;
+    string _verifyText;
+    bool   _verifyVisible;
+
+    public StatisticsViewModel(StatisticsDialog view)
     {
-        readonly StatisticsDialog _view;
-        string                    _checksumText;
-        bool                      _checksumVisible;
-        bool                      _commandsVisible;
-        string                    _compareText;
-        bool                      _compareVisible;
-        string                    _convertImageText;
-        bool                      _convertImageVisible;
-        string                    _createSidecarText;
-        bool                      _createSidecarVisible;
-        string                    _decodeText;
-        bool                      _decodeVisible;
-        string                    _deviceInfoText;
-        bool                      _deviceInfoVisible;
-        string                    _deviceReportText;
-        bool                      _deviceReportVisible;
-        bool                      _devicesVisible;
-        string                    _dumpMediaText;
-        bool                      _dumpMediaVisible;
-        string                    _entropyText;
-        bool                      _entropyVisible;
-        bool                      _filesystemsVisible;
-        bool                      _filtersVisible;
-        bool                      _formatsCommandVisible;
-        string                    _formatsText;
-        bool                      _formatsVisible;
+        _view        = view;
+        Filters      = new ObservableCollection<NameCountModel>();
+        Formats      = new ObservableCollection<NameCountModel>();
+        Partitions   = new ObservableCollection<NameCountModel>();
+        Filesystems  = new ObservableCollection<NameCountModel>();
+        Devices      = new ObservableCollection<DeviceStatsModel>();
+        Medias       = new ObservableCollection<MediaStatsModel>();
+        CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);
+        using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
-        string _fsinfoText;
-        bool   _fsinfoVisible;
-        string _imageInfoText;
-        bool   _imageInfoVisible;
-        string _mediaInfoText;
-        bool   _mediaInfoVisible;
-        string _mediaScanText;
-        bool   _mediaScanVisible;
-        bool   _mediasVisible;
-        bool   _partitionsVisible;
-        string _printHexText;
-        bool   _printHexVisible;
-        string _verifyText;
-        bool   _verifyVisible;
-
-        public StatisticsViewModel(StatisticsDialog view)
+        if(ctx.Commands.Any())
         {
-            _view        = view;
-            Filters      = new ObservableCollection<NameCountModel>();
-            Formats      = new ObservableCollection<NameCountModel>();
-            Partitions   = new ObservableCollection<NameCountModel>();
-            Filesystems  = new ObservableCollection<NameCountModel>();
-            Devices      = new ObservableCollection<DeviceStatsModel>();
-            Medias       = new ObservableCollection<MediaStatsModel>();
-            CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);
-            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-            if(ctx.Commands.Any())
+            if(ctx.Commands.Any(c => c.Name == "analyze"))
             {
-                if(ctx.Commands.Any(c => c.Name == "analyze"))
+                foreach(Command oldAnalyze in ctx.Commands.Where(c => c.Name == "analyze"))
                 {
-                    foreach(Command oldAnalyze in ctx.Commands.Where(c => c.Name == "analyze"))
-                    {
-                        oldAnalyze.Name = "fs-info";
-                        ctx.Commands.Update(oldAnalyze);
-                    }
-
-                    ulong count = 0;
-
-                    foreach(Command fsInfo in ctx.Commands.Where(c => c.Name == "fs-info" && c.Synchronized))
-                    {
-                        count += fsInfo.Count;
-                        ctx.Remove(fsInfo);
-                    }
-
-                    if(count > 0)
-                        ctx.Commands.Add(new Command
-                        {
-                            Count        = count,
-                            Name         = "fs-info",
-                            Synchronized = true
-                        });
-
-                    ctx.SaveChanges();
+                    oldAnalyze.Name = "fs-info";
+                    ctx.Commands.Update(oldAnalyze);
                 }
 
-                if(ctx.Commands.Any(c => c.Name == "fs-info"))
+                ulong count = 0;
+
+                foreach(Command fsInfo in ctx.Commands.Where(c => c.Name == "fs-info" && c.Synchronized))
                 {
-                    ulong count = ctx.Commands.Where(c => c.Name == "fs-info" && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "fs-info" && !c.Synchronized);
-
-                    FsInfoVisible = true;
-                    FsInfoText    = $"You have called the Filesystem Info command {count} times";
+                    count += fsInfo.Count;
+                    ctx.Remove(fsInfo);
                 }
 
-                if(ctx.Commands.Any(c => c.Name == "checksum"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "checksum" && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "checksum" && !c.Synchronized);
-
-                    ChecksumVisible = true;
-                    ChecksumText    = $"You have called the Checksum command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "compare"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "compare" && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "compare" && !c.Synchronized);
-
-                    CompareVisible = true;
-                    CompareText    = $"You have called the Compare command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "convert-image"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "convert-image" && c.Synchronized).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "convert-image" && !c.Synchronized);
-
-                    ConvertImageVisible = true;
-                    ConvertImageText    = $"You have called the Convert-Image command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "create-sidecar"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "create-sidecar" && c.Synchronized).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "create-sidecar" && !c.Synchronized);
-
-                    CreateSidecarVisible = true;
-                    CreateSidecarText    = $"You have called the Create-Sidecar command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "decode"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "decode" && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "decode" && !c.Synchronized);
-
-                    DecodeVisible = true;
-                    DecodeText    = $"You have called the Decode command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "device-info"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "device-info" && c.Synchronized).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "device-info" && !c.Synchronized);
-
-                    DeviceInfoVisible = true;
-                    DeviceInfoText    = $"You have called the Device-Info command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "device-report"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "device-report" && c.Synchronized).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "device-report" && !c.Synchronized);
-
-                    DeviceReportVisible = true;
-                    DeviceReportText    = $"You have called the Device-Report command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "dump-media"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "dump-media" && c.Synchronized).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "dump-media" && !c.Synchronized);
-
-                    DumpMediaVisible = true;
-                    DumpMediaText    = $"You have called the Dump-Media command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "entropy"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "entropy" && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "entropy" && !c.Synchronized);
-
-                    EntropyVisible = true;
-                    EntropyText    = $"You have called the Entropy command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "formats"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "formats" && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "formats" && !c.Synchronized);
-
-                    FormatsCommandVisible = true;
-                    FormatsCommandText    = $"You have called the Formats command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "image-info"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "image-info" && c.Synchronized).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "image-info" && !c.Synchronized);
-
-                    ImageInfoVisible = true;
-                    ImageInfoText    = $"You have called the Image-Info command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "media-info"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "media-info" && c.Synchronized).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "media-info" && !c.Synchronized);
-
-                    MediaInfoVisible = true;
-                    MediaInfoText    = $"You have called the Media-Info command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "media-scan"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "media-scan" && c.Synchronized).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "media-scan" && !c.Synchronized);
-
-                    MediaScanVisible = true;
-                    MediaScanText    = $"You have called the Media-Scan command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "printhex"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "printhex" && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "printhex" && !c.Synchronized);
-
-                    PrintHexVisible = true;
-                    PrintHexText    = $"You have called the Print-Hex command {count} times";
-                }
-
-                if(ctx.Commands.Any(c => c.Name == "verify"))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == "verify" && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == "verify" && !c.Synchronized);
-
-                    VerifyVisible = true;
-                    VerifyText    = $"You have called the Verify command {count} times";
-                }
-
-                CommandsVisible = FsInfoVisible        || ChecksumVisible || CompareVisible || ConvertImageVisible ||
-                                  CreateSidecarVisible || DecodeVisible || DeviceInfoVisible || DeviceReportVisible ||
-                                  DumpMediaVisible     || EntropyVisible || FormatsCommandVisible || ImageInfoVisible ||
-                                  MediaInfoVisible     || MediaScanVisible || PrintHexVisible || VerifyVisible;
-            }
-
-            if(ctx.Filters.Any())
-            {
-                FiltersVisible = true;
-
-                foreach(string nvs in ctx.Filters.Select(n => n.Name).Distinct())
-                {
-                    ulong count = ctx.Filters.Where(c => c.Name == nvs && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Filters.LongCount(c => c.Name == nvs && !c.Synchronized);
-
-                    Filters.Add(new NameCountModel
-                    {
-                        Name  = nvs,
-                        Count = count
-                    });
-                }
-            }
-
-            if(ctx.MediaFormats.Any())
-            {
-                FormatsVisible = true;
-
-                foreach(string nvs in ctx.MediaFormats.Select(n => n.Name).Distinct())
-                {
-                    ulong count = ctx.MediaFormats.Where(c => c.Name == nvs && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.MediaFormats.LongCount(c => c.Name == nvs && !c.Synchronized);
-
-                    Formats.Add(new NameCountModel
-                    {
-                        Name  = nvs,
-                        Count = count
-                    });
-                }
-            }
-
-            if(ctx.Partitions.Any())
-            {
-                PartitionsVisible = true;
-
-                foreach(string nvs in ctx.Partitions.Select(n => n.Name).Distinct())
-                {
-                    ulong count = ctx.Partitions.Where(c => c.Name == nvs && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Partitions.LongCount(c => c.Name == nvs && !c.Synchronized);
-
-                    Partitions.Add(new NameCountModel
-                    {
-                        Name  = nvs,
-                        Count = count
-                    });
-                }
-            }
-
-            if(ctx.Filesystems.Any())
-            {
-                FilesystemsVisible = true;
-
-                foreach(string nvs in ctx.Filesystems.Select(n => n.Name).Distinct())
-                {
-                    ulong count = ctx.Filesystems.Where(c => c.Name == nvs && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Filesystems.LongCount(c => c.Name == nvs && !c.Synchronized);
-
-                    Filesystems.Add(new NameCountModel
-                    {
-                        Name  = nvs,
-                        Count = count
-                    });
-                }
-            }
-
-            if(ctx.SeenDevices.Any())
-            {
-                DevicesVisible = true;
-
-                foreach(DeviceStat ds in ctx.SeenDevices.OrderBy(n => n.Manufacturer).ThenBy(n => n.Manufacturer).
-                                             ThenBy(n => n.Revision).ThenBy(n => n.Bus))
-                    Devices.Add(new DeviceStatsModel
-                    {
-                        Model        = ds.Model,
-                        Manufacturer = ds.Manufacturer,
-                        Revision     = ds.Revision,
-                        Bus          = ds.Bus
-                    });
-            }
-
-            if(!ctx.Medias.Any())
-                return;
-
-            MediasVisible = true;
-
-            foreach(string media in ctx.Medias.OrderBy(ms => ms.Type).Select(ms => ms.Type).Distinct())
-            {
-                ulong count = ctx.Medias.Where(c => c.Type == media && c.Synchronized && c.Real).Select(c => c.Count).
-                                  FirstOrDefault();
-
-                count += (ulong)ctx.Medias.LongCount(c => c.Type == media && !c.Synchronized && c.Real);
-
                 if(count > 0)
-                    Medias.Add(new MediaStatsModel
+                    ctx.Commands.Add(new Command
                     {
-                        Name  = media,
-                        Count = count,
-                        Type  = "real"
+                        Count        = count,
+                        Name         = "fs-info",
+                        Synchronized = true
                     });
 
-                count = ctx.Medias.Where(c => c.Type == media && c.Synchronized && !c.Real).Select(c => c.Count).
-                            FirstOrDefault();
+                ctx.SaveChanges();
+            }
 
-                count += (ulong)ctx.Medias.LongCount(c => c.Type == media && !c.Synchronized && !c.Real);
+            if(ctx.Commands.Any(c => c.Name == "fs-info"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "fs-info" && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
 
-                if(count == 0)
-                    continue;
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "fs-info" && !c.Synchronized);
 
-                Medias.Add(new MediaStatsModel
+                FsInfoVisible = true;
+                FsInfoText    = $"You have called the Filesystem Info command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "checksum"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "checksum" && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "checksum" && !c.Synchronized);
+
+                ChecksumVisible = true;
+                ChecksumText    = $"You have called the Checksum command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "compare"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "compare" && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "compare" && !c.Synchronized);
+
+                CompareVisible = true;
+                CompareText    = $"You have called the Compare command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "convert-image"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "convert-image" && c.Synchronized).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "convert-image" && !c.Synchronized);
+
+                ConvertImageVisible = true;
+                ConvertImageText    = $"You have called the Convert-Image command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "create-sidecar"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "create-sidecar" && c.Synchronized).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "create-sidecar" && !c.Synchronized);
+
+                CreateSidecarVisible = true;
+                CreateSidecarText    = $"You have called the Create-Sidecar command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "decode"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "decode" && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "decode" && !c.Synchronized);
+
+                DecodeVisible = true;
+                DecodeText    = $"You have called the Decode command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "device-info"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "device-info" && c.Synchronized).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "device-info" && !c.Synchronized);
+
+                DeviceInfoVisible = true;
+                DeviceInfoText    = $"You have called the Device-Info command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "device-report"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "device-report" && c.Synchronized).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "device-report" && !c.Synchronized);
+
+                DeviceReportVisible = true;
+                DeviceReportText    = $"You have called the Device-Report command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "dump-media"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "dump-media" && c.Synchronized).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "dump-media" && !c.Synchronized);
+
+                DumpMediaVisible = true;
+                DumpMediaText    = $"You have called the Dump-Media command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "entropy"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "entropy" && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "entropy" && !c.Synchronized);
+
+                EntropyVisible = true;
+                EntropyText    = $"You have called the Entropy command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "formats"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "formats" && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "formats" && !c.Synchronized);
+
+                FormatsCommandVisible = true;
+                FormatsCommandText    = $"You have called the Formats command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "image-info"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "image-info" && c.Synchronized).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "image-info" && !c.Synchronized);
+
+                ImageInfoVisible = true;
+                ImageInfoText    = $"You have called the Image-Info command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "media-info"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "media-info" && c.Synchronized).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "media-info" && !c.Synchronized);
+
+                MediaInfoVisible = true;
+                MediaInfoText    = $"You have called the Media-Info command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "media-scan"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "media-scan" && c.Synchronized).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "media-scan" && !c.Synchronized);
+
+                MediaScanVisible = true;
+                MediaScanText    = $"You have called the Media-Scan command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "printhex"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "printhex" && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "printhex" && !c.Synchronized);
+
+                PrintHexVisible = true;
+                PrintHexText    = $"You have called the Print-Hex command {count} times";
+            }
+
+            if(ctx.Commands.Any(c => c.Name == "verify"))
+            {
+                ulong count = ctx.Commands.Where(c => c.Name == "verify" && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == "verify" && !c.Synchronized);
+
+                VerifyVisible = true;
+                VerifyText    = $"You have called the Verify command {count} times";
+            }
+
+            CommandsVisible = FsInfoVisible        || ChecksumVisible  || CompareVisible || ConvertImageVisible ||
+                              CreateSidecarVisible || DecodeVisible    || DeviceInfoVisible || DeviceReportVisible ||
+                              DumpMediaVisible     || EntropyVisible   || FormatsCommandVisible || ImageInfoVisible ||
+                              MediaInfoVisible     || MediaScanVisible || PrintHexVisible || VerifyVisible;
+        }
+
+        if(ctx.Filters.Any())
+        {
+            FiltersVisible = true;
+
+            foreach(string nvs in ctx.Filters.Select(n => n.Name).Distinct())
+            {
+                ulong count = ctx.Filters.Where(c => c.Name == nvs && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Filters.LongCount(c => c.Name == nvs && !c.Synchronized);
+
+                Filters.Add(new NameCountModel
                 {
-                    Name  = media,
-                    Count = count,
-                    Type  = "image"
+                    Name  = nvs,
+                    Count = count
                 });
             }
         }
 
-        public string FsInfoText
+        if(ctx.MediaFormats.Any())
         {
-            get => _fsinfoText;
-            set => this.RaiseAndSetIfChanged(ref _fsinfoText, value);
+            FormatsVisible = true;
+
+            foreach(string nvs in ctx.MediaFormats.Select(n => n.Name).Distinct())
+            {
+                ulong count = ctx.MediaFormats.Where(c => c.Name == nvs && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.MediaFormats.LongCount(c => c.Name == nvs && !c.Synchronized);
+
+                Formats.Add(new NameCountModel
+                {
+                    Name  = nvs,
+                    Count = count
+                });
+            }
         }
 
-        public bool FsInfoVisible
+        if(ctx.Partitions.Any())
         {
-            get => _fsinfoVisible;
-            set => this.RaiseAndSetIfChanged(ref _fsinfoVisible, value);
+            PartitionsVisible = true;
+
+            foreach(string nvs in ctx.Partitions.Select(n => n.Name).Distinct())
+            {
+                ulong count = ctx.Partitions.Where(c => c.Name == nvs && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Partitions.LongCount(c => c.Name == nvs && !c.Synchronized);
+
+                Partitions.Add(new NameCountModel
+                {
+                    Name  = nvs,
+                    Count = count
+                });
+            }
         }
 
-        public string ChecksumText
+        if(ctx.Filesystems.Any())
         {
-            get => _checksumText;
-            set => this.RaiseAndSetIfChanged(ref _checksumText, value);
+            FilesystemsVisible = true;
+
+            foreach(string nvs in ctx.Filesystems.Select(n => n.Name).Distinct())
+            {
+                ulong count = ctx.Filesystems.Where(c => c.Name == nvs && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Filesystems.LongCount(c => c.Name == nvs && !c.Synchronized);
+
+                Filesystems.Add(new NameCountModel
+                {
+                    Name  = nvs,
+                    Count = count
+                });
+            }
         }
 
-        public bool ChecksumVisible
+        if(ctx.SeenDevices.Any())
         {
-            get => _checksumVisible;
-            set => this.RaiseAndSetIfChanged(ref _checksumVisible, value);
+            DevicesVisible = true;
+
+            foreach(DeviceStat ds in ctx.SeenDevices.OrderBy(n => n.Manufacturer).ThenBy(n => n.Manufacturer).
+                                         ThenBy(n => n.Revision).ThenBy(n => n.Bus))
+                Devices.Add(new DeviceStatsModel
+                {
+                    Model        = ds.Model,
+                    Manufacturer = ds.Manufacturer,
+                    Revision     = ds.Revision,
+                    Bus          = ds.Bus
+                });
         }
 
-        public string CompareText
+        if(!ctx.Medias.Any())
+            return;
+
+        MediasVisible = true;
+
+        foreach(string media in ctx.Medias.OrderBy(ms => ms.Type).Select(ms => ms.Type).Distinct())
         {
-            get => _compareText;
-            set => this.RaiseAndSetIfChanged(ref _compareText, value);
+            ulong count = ctx.Medias.Where(c => c.Type == media && c.Synchronized && c.Real).Select(c => c.Count).
+                              FirstOrDefault();
+
+            count += (ulong)ctx.Medias.LongCount(c => c.Type == media && !c.Synchronized && c.Real);
+
+            if(count > 0)
+                Medias.Add(new MediaStatsModel
+                {
+                    Name  = media,
+                    Count = count,
+                    Type  = "real"
+                });
+
+            count = ctx.Medias.Where(c => c.Type == media && c.Synchronized && !c.Real).Select(c => c.Count).
+                        FirstOrDefault();
+
+            count += (ulong)ctx.Medias.LongCount(c => c.Type == media && !c.Synchronized && !c.Real);
+
+            if(count == 0)
+                continue;
+
+            Medias.Add(new MediaStatsModel
+            {
+                Name  = media,
+                Count = count,
+                Type  = "image"
+            });
         }
-
-        public bool CompareVisible
-        {
-            get => _compareVisible;
-            set => this.RaiseAndSetIfChanged(ref _compareVisible, value);
-        }
-
-        public string ConvertImageText
-        {
-            get => _convertImageText;
-            set => this.RaiseAndSetIfChanged(ref _convertImageText, value);
-        }
-
-        public bool ConvertImageVisible
-        {
-            get => _convertImageVisible;
-            set => this.RaiseAndSetIfChanged(ref _convertImageVisible, value);
-        }
-
-        public string CreateSidecarText
-        {
-            get => _createSidecarText;
-            set => this.RaiseAndSetIfChanged(ref _createSidecarText, value);
-        }
-
-        public bool CreateSidecarVisible
-        {
-            get => _createSidecarVisible;
-            set => this.RaiseAndSetIfChanged(ref _createSidecarVisible, value);
-        }
-
-        public string DecodeText
-        {
-            get => _decodeText;
-            set => this.RaiseAndSetIfChanged(ref _decodeText, value);
-        }
-
-        public bool DecodeVisible
-        {
-            get => _decodeVisible;
-            set => this.RaiseAndSetIfChanged(ref _decodeVisible, value);
-        }
-
-        public string DeviceInfoText
-        {
-            get => _deviceInfoText;
-            set => this.RaiseAndSetIfChanged(ref _deviceInfoText, value);
-        }
-
-        public bool DeviceInfoVisible
-        {
-            get => _deviceInfoVisible;
-            set => this.RaiseAndSetIfChanged(ref _deviceInfoVisible, value);
-        }
-
-        public string DeviceReportText
-        {
-            get => _deviceReportText;
-            set => this.RaiseAndSetIfChanged(ref _deviceReportText, value);
-        }
-
-        public bool DeviceReportVisible
-        {
-            get => _deviceReportVisible;
-            set => this.RaiseAndSetIfChanged(ref _deviceReportVisible, value);
-        }
-
-        public string DumpMediaText
-        {
-            get => _dumpMediaText;
-            set => this.RaiseAndSetIfChanged(ref _dumpMediaText, value);
-        }
-
-        public bool DumpMediaVisible
-        {
-            get => _dumpMediaVisible;
-            set => this.RaiseAndSetIfChanged(ref _dumpMediaVisible, value);
-        }
-
-        public string EntropyText
-        {
-            get => _entropyText;
-            set => this.RaiseAndSetIfChanged(ref _entropyText, value);
-        }
-
-        public bool EntropyVisible
-        {
-            get => _entropyVisible;
-            set => this.RaiseAndSetIfChanged(ref _entropyVisible, value);
-        }
-
-        public string FormatsCommandText
-        {
-            get => _formatsText;
-            set => this.RaiseAndSetIfChanged(ref _formatsText, value);
-        }
-
-        public bool FormatsCommandVisible
-        {
-            get => _formatsCommandVisible;
-            set => this.RaiseAndSetIfChanged(ref _formatsCommandVisible, value);
-        }
-
-        public string ImageInfoText
-        {
-            get => _imageInfoText;
-            set => this.RaiseAndSetIfChanged(ref _imageInfoText, value);
-        }
-
-        public bool ImageInfoVisible
-        {
-            get => _imageInfoVisible;
-            set => this.RaiseAndSetIfChanged(ref _imageInfoVisible, value);
-        }
-
-        public string MediaInfoText
-        {
-            get => _mediaInfoText;
-            set => this.RaiseAndSetIfChanged(ref _mediaInfoText, value);
-        }
-
-        public bool MediaInfoVisible
-        {
-            get => _mediaInfoVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaInfoVisible, value);
-        }
-
-        public string MediaScanText
-        {
-            get => _mediaScanText;
-            set => this.RaiseAndSetIfChanged(ref _mediaScanText, value);
-        }
-
-        public bool MediaScanVisible
-        {
-            get => _mediaScanVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaScanVisible, value);
-        }
-
-        public string PrintHexText
-        {
-            get => _printHexText;
-            set => this.RaiseAndSetIfChanged(ref _printHexText, value);
-        }
-
-        public bool PrintHexVisible
-        {
-            get => _printHexVisible;
-            set => this.RaiseAndSetIfChanged(ref _printHexVisible, value);
-        }
-
-        public string VerifyText
-        {
-            get => _verifyText;
-            set => this.RaiseAndSetIfChanged(ref _verifyText, value);
-        }
-
-        public bool VerifyVisible
-        {
-            get => _verifyVisible;
-            set => this.RaiseAndSetIfChanged(ref _verifyVisible, value);
-        }
-
-        public bool CommandsVisible
-        {
-            get => _commandsVisible;
-            set => this.RaiseAndSetIfChanged(ref _commandsVisible, value);
-        }
-
-        public bool FiltersVisible
-        {
-            get => _filtersVisible;
-            set => this.RaiseAndSetIfChanged(ref _filtersVisible, value);
-        }
-
-        public bool PartitionsVisible
-        {
-            get => _partitionsVisible;
-            set => this.RaiseAndSetIfChanged(ref _partitionsVisible, value);
-        }
-
-        public bool FormatsVisible
-        {
-            get => _formatsVisible;
-            set => this.RaiseAndSetIfChanged(ref _formatsVisible, value);
-        }
-
-        public bool FilesystemsVisible
-        {
-            get => _filesystemsVisible;
-            set => this.RaiseAndSetIfChanged(ref _filesystemsVisible, value);
-        }
-
-        public bool DevicesVisible
-        {
-            get => _devicesVisible;
-            set => this.RaiseAndSetIfChanged(ref _devicesVisible, value);
-        }
-
-        public bool MediasVisible
-        {
-            get => _mediasVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediasVisible, value);
-        }
-
-        [NotNull]
-        public string CommandsLabel => "Commands";
-        [NotNull]
-        public string FilterLabel => "Filter";
-        [NotNull]
-        public string PartitionLabel => "Partition";
-        [NotNull]
-        public string PartitionsLabel => "Partitions";
-        [NotNull]
-        public string FiltersLabel => "Filters";
-        [NotNull]
-        public string FormatsLabel => "Formats";
-        [NotNull]
-        public string FormatLabel => "Format";
-        [NotNull]
-        public string FilesystemsLabel => "Filesystems";
-        [NotNull]
-        public string FilesystemLabel => "Filesystem";
-        [NotNull]
-        public string TimesFoundLabel => "Times found";
-        [NotNull]
-        public string DevicesLabel => "Devices";
-        [NotNull]
-        public string DeviceLabel => "Device";
-        [NotNull]
-        public string ManufacturerLabel => "Manufacturer";
-        [NotNull]
-        public string RevisionLabel => "Revision";
-        [NotNull]
-        public string BusLabel => "Bus";
-        [NotNull]
-        public string MediasLabel => "Medias";
-        [NotNull]
-        public string MediaLabel => "Media";
-        [NotNull]
-        public string TypeLabel => "Type";
-        [NotNull]
-        public string Title => "Encodings";
-        [NotNull]
-        public string CloseLabel => "Close";
-        public ReactiveCommand<Unit, Unit>            CloseCommand { get; }
-        public ObservableCollection<NameCountModel>   Filters      { get; }
-        public ObservableCollection<NameCountModel>   Formats      { get; }
-        public ObservableCollection<NameCountModel>   Partitions   { get; }
-        public ObservableCollection<NameCountModel>   Filesystems  { get; }
-        public ObservableCollection<DeviceStatsModel> Devices      { get; }
-        public ObservableCollection<MediaStatsModel>  Medias       { get; }
-
-        void ExecuteCloseCommand() => _view.Close();
     }
+
+    public string FsInfoText
+    {
+        get => _fsinfoText;
+        set => this.RaiseAndSetIfChanged(ref _fsinfoText, value);
+    }
+
+    public bool FsInfoVisible
+    {
+        get => _fsinfoVisible;
+        set => this.RaiseAndSetIfChanged(ref _fsinfoVisible, value);
+    }
+
+    public string ChecksumText
+    {
+        get => _checksumText;
+        set => this.RaiseAndSetIfChanged(ref _checksumText, value);
+    }
+
+    public bool ChecksumVisible
+    {
+        get => _checksumVisible;
+        set => this.RaiseAndSetIfChanged(ref _checksumVisible, value);
+    }
+
+    public string CompareText
+    {
+        get => _compareText;
+        set => this.RaiseAndSetIfChanged(ref _compareText, value);
+    }
+
+    public bool CompareVisible
+    {
+        get => _compareVisible;
+        set => this.RaiseAndSetIfChanged(ref _compareVisible, value);
+    }
+
+    public string ConvertImageText
+    {
+        get => _convertImageText;
+        set => this.RaiseAndSetIfChanged(ref _convertImageText, value);
+    }
+
+    public bool ConvertImageVisible
+    {
+        get => _convertImageVisible;
+        set => this.RaiseAndSetIfChanged(ref _convertImageVisible, value);
+    }
+
+    public string CreateSidecarText
+    {
+        get => _createSidecarText;
+        set => this.RaiseAndSetIfChanged(ref _createSidecarText, value);
+    }
+
+    public bool CreateSidecarVisible
+    {
+        get => _createSidecarVisible;
+        set => this.RaiseAndSetIfChanged(ref _createSidecarVisible, value);
+    }
+
+    public string DecodeText
+    {
+        get => _decodeText;
+        set => this.RaiseAndSetIfChanged(ref _decodeText, value);
+    }
+
+    public bool DecodeVisible
+    {
+        get => _decodeVisible;
+        set => this.RaiseAndSetIfChanged(ref _decodeVisible, value);
+    }
+
+    public string DeviceInfoText
+    {
+        get => _deviceInfoText;
+        set => this.RaiseAndSetIfChanged(ref _deviceInfoText, value);
+    }
+
+    public bool DeviceInfoVisible
+    {
+        get => _deviceInfoVisible;
+        set => this.RaiseAndSetIfChanged(ref _deviceInfoVisible, value);
+    }
+
+    public string DeviceReportText
+    {
+        get => _deviceReportText;
+        set => this.RaiseAndSetIfChanged(ref _deviceReportText, value);
+    }
+
+    public bool DeviceReportVisible
+    {
+        get => _deviceReportVisible;
+        set => this.RaiseAndSetIfChanged(ref _deviceReportVisible, value);
+    }
+
+    public string DumpMediaText
+    {
+        get => _dumpMediaText;
+        set => this.RaiseAndSetIfChanged(ref _dumpMediaText, value);
+    }
+
+    public bool DumpMediaVisible
+    {
+        get => _dumpMediaVisible;
+        set => this.RaiseAndSetIfChanged(ref _dumpMediaVisible, value);
+    }
+
+    public string EntropyText
+    {
+        get => _entropyText;
+        set => this.RaiseAndSetIfChanged(ref _entropyText, value);
+    }
+
+    public bool EntropyVisible
+    {
+        get => _entropyVisible;
+        set => this.RaiseAndSetIfChanged(ref _entropyVisible, value);
+    }
+
+    public string FormatsCommandText
+    {
+        get => _formatsText;
+        set => this.RaiseAndSetIfChanged(ref _formatsText, value);
+    }
+
+    public bool FormatsCommandVisible
+    {
+        get => _formatsCommandVisible;
+        set => this.RaiseAndSetIfChanged(ref _formatsCommandVisible, value);
+    }
+
+    public string ImageInfoText
+    {
+        get => _imageInfoText;
+        set => this.RaiseAndSetIfChanged(ref _imageInfoText, value);
+    }
+
+    public bool ImageInfoVisible
+    {
+        get => _imageInfoVisible;
+        set => this.RaiseAndSetIfChanged(ref _imageInfoVisible, value);
+    }
+
+    public string MediaInfoText
+    {
+        get => _mediaInfoText;
+        set => this.RaiseAndSetIfChanged(ref _mediaInfoText, value);
+    }
+
+    public bool MediaInfoVisible
+    {
+        get => _mediaInfoVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaInfoVisible, value);
+    }
+
+    public string MediaScanText
+    {
+        get => _mediaScanText;
+        set => this.RaiseAndSetIfChanged(ref _mediaScanText, value);
+    }
+
+    public bool MediaScanVisible
+    {
+        get => _mediaScanVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaScanVisible, value);
+    }
+
+    public string PrintHexText
+    {
+        get => _printHexText;
+        set => this.RaiseAndSetIfChanged(ref _printHexText, value);
+    }
+
+    public bool PrintHexVisible
+    {
+        get => _printHexVisible;
+        set => this.RaiseAndSetIfChanged(ref _printHexVisible, value);
+    }
+
+    public string VerifyText
+    {
+        get => _verifyText;
+        set => this.RaiseAndSetIfChanged(ref _verifyText, value);
+    }
+
+    public bool VerifyVisible
+    {
+        get => _verifyVisible;
+        set => this.RaiseAndSetIfChanged(ref _verifyVisible, value);
+    }
+
+    public bool CommandsVisible
+    {
+        get => _commandsVisible;
+        set => this.RaiseAndSetIfChanged(ref _commandsVisible, value);
+    }
+
+    public bool FiltersVisible
+    {
+        get => _filtersVisible;
+        set => this.RaiseAndSetIfChanged(ref _filtersVisible, value);
+    }
+
+    public bool PartitionsVisible
+    {
+        get => _partitionsVisible;
+        set => this.RaiseAndSetIfChanged(ref _partitionsVisible, value);
+    }
+
+    public bool FormatsVisible
+    {
+        get => _formatsVisible;
+        set => this.RaiseAndSetIfChanged(ref _formatsVisible, value);
+    }
+
+    public bool FilesystemsVisible
+    {
+        get => _filesystemsVisible;
+        set => this.RaiseAndSetIfChanged(ref _filesystemsVisible, value);
+    }
+
+    public bool DevicesVisible
+    {
+        get => _devicesVisible;
+        set => this.RaiseAndSetIfChanged(ref _devicesVisible, value);
+    }
+
+    public bool MediasVisible
+    {
+        get => _mediasVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediasVisible, value);
+    }
+
+    [NotNull]
+    public string CommandsLabel => "Commands";
+    [NotNull]
+    public string FilterLabel => "Filter";
+    [NotNull]
+    public string PartitionLabel => "Partition";
+    [NotNull]
+    public string PartitionsLabel => "Partitions";
+    [NotNull]
+    public string FiltersLabel => "Filters";
+    [NotNull]
+    public string FormatsLabel => "Formats";
+    [NotNull]
+    public string FormatLabel => "Format";
+    [NotNull]
+    public string FilesystemsLabel => "Filesystems";
+    [NotNull]
+    public string FilesystemLabel => "Filesystem";
+    [NotNull]
+    public string TimesFoundLabel => "Times found";
+    [NotNull]
+    public string DevicesLabel => "Devices";
+    [NotNull]
+    public string DeviceLabel => "Device";
+    [NotNull]
+    public string ManufacturerLabel => "Manufacturer";
+    [NotNull]
+    public string RevisionLabel => "Revision";
+    [NotNull]
+    public string BusLabel => "Bus";
+    [NotNull]
+    public string MediasLabel => "Medias";
+    [NotNull]
+    public string MediaLabel => "Media";
+    [NotNull]
+    public string TypeLabel => "Type";
+    [NotNull]
+    public string Title => "Encodings";
+    [NotNull]
+    public string CloseLabel => "Close";
+    public ReactiveCommand<Unit, Unit>            CloseCommand { get; }
+    public ObservableCollection<NameCountModel>   Filters      { get; }
+    public ObservableCollection<NameCountModel>   Formats      { get; }
+    public ObservableCollection<NameCountModel>   Partitions   { get; }
+    public ObservableCollection<NameCountModel>   Filesystems  { get; }
+    public ObservableCollection<DeviceStatsModel> Devices      { get; }
+    public ObservableCollection<MediaStatsModel>  Medias       { get; }
+
+    void ExecuteCloseCommand() => _view.Close();
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
index 081689b51..0fcf6712f 100644
--- a/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/DeviceInfoViewModel.cs
@@ -42,914 +42,913 @@ using Avalonia.Controls;
 using ReactiveUI;
 using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
 
-namespace Aaru.Gui.ViewModels.Panels
+namespace Aaru.Gui.ViewModels.Panels;
+
+public sealed class DeviceInfoViewModel : ViewModelBase
 {
-    public sealed class DeviceInfoViewModel : ViewModelBase
+    readonly DeviceInfo _devInfo;
+    readonly Window     _view;
+    AtaInfo             _ataInfo;
+    string              _blockLimits;
+    string              _blockSizeGranularity;
+    string              _cid;
+    string              _csd;
+    string              _densities;
+    string              _deviceType;
+    string              _extendedCsd;
+    string              _firewireGuid;
+    string              _firewireManufacturer;
+    string              _firewireModel;
+    string              _firewireModelId;
+    string              _firewireVendorId;
+    bool                _firewireVisible;
+    bool                _kreon;
+    bool                _kreonChallengeResponse;
+    bool                _kreonChallengeResponse360;
+    bool                _kreonDecryptSs;
+    bool                _kreonDecryptSs360;
+    bool                _kreonErrorSkipping;
+    bool                _kreonLock;
+    bool                _kreonWxripperUnlock;
+    bool                _kreonWxripperUnlock360;
+    bool                _kreonXtremeUnlock;
+    bool                _kreonXtremeUnlock360;
+    string              _manufacturer;
+    string              _maxBlockSize;
+    string              _mediumDensity;
+    string              _mediumTypes;
+    string              _minBlockSize;
+    string              _model;
+    string              _ocr;
+    PcmciaInfo          _pcmciaInfo;
+    bool                _plextorBitSetting;
+    bool                _plextorBitSettingDl;
+    string              _plextorCdReadTime;
+    string              _plextorCdWriteTime;
+    string              _plextorDiscs;
+    string              _plextorDvd;
+    bool                _plextorDvdPlusWriteTest;
+    string              _plextorDvdReadTime;
+    bool                _plextorDvdTimesVisible;
+    string              _plextorDvdWriteTime;
+    bool                _plextorEepromVisible;
+    bool                _plextorGigaRec;
+    bool                _plextorHidesRecordables;
+    bool                _plextorHidesSessions;
+    bool                _plextorHiding;
+    bool                _plextorPoweRec;
+    bool                _plextorPoweRecEnabled;
+    string              _plextorPoweRecLast;
+    bool                _plextorPoweRecLastVisible;
+    string              _plextorPoweRecMax;
+    bool                _plextorPoweRecMaxVisible;
+    string              _plextorPoweRecRecommended;
+    bool                _plextorPoweRecRecommendedVisible;
+    string              _plextorPoweRecSelected;
+    bool                _plextorPoweRecSelectedVisible;
+    bool                _plextorSecuRec;
+    bool                _plextorSilentMode;
+    string              _plextorSilentModeAccessTime;
+    string              _plextorSilentModeCdReadSpeedLimit;
+    string              _plextorSilentModeCdWriteSpeedLimit;
+    string              _plextorSilentModeDvdReadSpeedLimit;
+    bool                _plextorSilentModeDvdReadSpeedLimitVisible;
+    bool                _plextorSilentModeEnabled;
+    bool                _plextorSpeedEnabled;
+    bool                _plextorSpeedRead;
+    bool                _plextorVariRec;
+    bool                _plextorVariRecDvd;
+    bool                _plextorVisible;
+    bool                _removable;
+    string              _revision;
+    bool                _saveUsbDescriptorsEnabled;
+    string              _scr;
+    ScsiInfo            _scsiInfo;
+    string              _scsiType;
+    string              _sdMm;
+    SdMmcInfo           _sdMmcInfo;
+    string              _secureDigital;
+    string              _serial;
+    bool                _ssc;
+    string              _usbConnected;
+    string              _usbManufacturer;
+    string              _usbProduct;
+    string              _usbProductId;
+    string              _usbSerial;
+    string              _usbVendorId;
+    bool                _usbVisible;
+
+    public DeviceInfoViewModel(DeviceInfo devInfo, Window view)
     {
-        readonly DeviceInfo _devInfo;
-        readonly Window     _view;
-        AtaInfo             _ataInfo;
-        string              _blockLimits;
-        string              _blockSizeGranularity;
-        string              _cid;
-        string              _csd;
-        string              _densities;
-        string              _deviceType;
-        string              _extendedCsd;
-        string              _firewireGuid;
-        string              _firewireManufacturer;
-        string              _firewireModel;
-        string              _firewireModelId;
-        string              _firewireVendorId;
-        bool                _firewireVisible;
-        bool                _kreon;
-        bool                _kreonChallengeResponse;
-        bool                _kreonChallengeResponse360;
-        bool                _kreonDecryptSs;
-        bool                _kreonDecryptSs360;
-        bool                _kreonErrorSkipping;
-        bool                _kreonLock;
-        bool                _kreonWxripperUnlock;
-        bool                _kreonWxripperUnlock360;
-        bool                _kreonXtremeUnlock;
-        bool                _kreonXtremeUnlock360;
-        string              _manufacturer;
-        string              _maxBlockSize;
-        string              _mediumDensity;
-        string              _mediumTypes;
-        string              _minBlockSize;
-        string              _model;
-        string              _ocr;
-        PcmciaInfo          _pcmciaInfo;
-        bool                _plextorBitSetting;
-        bool                _plextorBitSettingDl;
-        string              _plextorCdReadTime;
-        string              _plextorCdWriteTime;
-        string              _plextorDiscs;
-        string              _plextorDvd;
-        bool                _plextorDvdPlusWriteTest;
-        string              _plextorDvdReadTime;
-        bool                _plextorDvdTimesVisible;
-        string              _plextorDvdWriteTime;
-        bool                _plextorEepromVisible;
-        bool                _plextorGigaRec;
-        bool                _plextorHidesRecordables;
-        bool                _plextorHidesSessions;
-        bool                _plextorHiding;
-        bool                _plextorPoweRec;
-        bool                _plextorPoweRecEnabled;
-        string              _plextorPoweRecLast;
-        bool                _plextorPoweRecLastVisible;
-        string              _plextorPoweRecMax;
-        bool                _plextorPoweRecMaxVisible;
-        string              _plextorPoweRecRecommended;
-        bool                _plextorPoweRecRecommendedVisible;
-        string              _plextorPoweRecSelected;
-        bool                _plextorPoweRecSelectedVisible;
-        bool                _plextorSecuRec;
-        bool                _plextorSilentMode;
-        string              _plextorSilentModeAccessTime;
-        string              _plextorSilentModeCdReadSpeedLimit;
-        string              _plextorSilentModeCdWriteSpeedLimit;
-        string              _plextorSilentModeDvdReadSpeedLimit;
-        bool                _plextorSilentModeDvdReadSpeedLimitVisible;
-        bool                _plextorSilentModeEnabled;
-        bool                _plextorSpeedEnabled;
-        bool                _plextorSpeedRead;
-        bool                _plextorVariRec;
-        bool                _plextorVariRecDvd;
-        bool                _plextorVisible;
-        bool                _removable;
-        string              _revision;
-        bool                _saveUsbDescriptorsEnabled;
-        string              _scr;
-        ScsiInfo            _scsiInfo;
-        string              _scsiType;
-        string              _sdMm;
-        SdMmcInfo           _sdMmcInfo;
-        string              _secureDigital;
-        string              _serial;
-        bool                _ssc;
-        string              _usbConnected;
-        string              _usbManufacturer;
-        string              _usbProduct;
-        string              _usbProductId;
-        string              _usbSerial;
-        string              _usbVendorId;
-        bool                _usbVisible;
+        SaveUsbDescriptorsCommand = ReactiveCommand.Create(ExecuteSaveUsbDescriptorsCommand);
+        _view                     = view;
+        _devInfo                  = devInfo;
 
-        public DeviceInfoViewModel(DeviceInfo devInfo, Window view)
+        DeviceType   = devInfo.Type.ToString();
+        Manufacturer = devInfo.Manufacturer;
+        Model        = devInfo.Model;
+        Revision     = devInfo.FirmwareRevision;
+        Serial       = devInfo.Serial;
+        ScsiType     = devInfo.ScsiType.ToString();
+        Removable    = devInfo.IsRemovable;
+        UsbVisible   = devInfo.IsUsb;
+
+        if(devInfo.IsUsb)
         {
-            SaveUsbDescriptorsCommand = ReactiveCommand.Create(ExecuteSaveUsbDescriptorsCommand);
-            _view                     = view;
-            _devInfo                  = devInfo;
+            UsbVisible                = true;
+            SaveUsbDescriptorsEnabled = devInfo.UsbDescriptors != null;
+            UsbVendorId               = $"{devInfo.UsbVendorId:X4}";
+            UsbProductId              = $"{devInfo.UsbProductId:X4}";
+            UsbManufacturer           = devInfo.UsbManufacturerString;
+            UsbProduct                = devInfo.UsbProductString;
+            UsbSerial                 = devInfo.UsbSerialString;
+        }
 
-            DeviceType   = devInfo.Type.ToString();
-            Manufacturer = devInfo.Manufacturer;
-            Model        = devInfo.Model;
-            Revision     = devInfo.FirmwareRevision;
-            Serial       = devInfo.Serial;
-            ScsiType     = devInfo.ScsiType.ToString();
-            Removable    = devInfo.IsRemovable;
-            UsbVisible   = devInfo.IsUsb;
+        if(devInfo.IsFireWire)
+        {
+            FirewireVisible      = true;
+            FirewireVendorId     = $"{devInfo.FireWireVendor:X4}";
+            FirewireModelId      = $"{devInfo.FireWireModel:X4}";
+            FirewireManufacturer = devInfo.FireWireVendorName;
+            FirewireModel        = devInfo.FireWireModelName;
+            FirewireGuid         = $"{devInfo.FireWireGuid:X16}";
+        }
 
-            if(devInfo.IsUsb)
+        if(devInfo.IsPcmcia)
+        {
+            PcmciaInfo = new PcmciaInfo
             {
-                UsbVisible                = true;
-                SaveUsbDescriptorsEnabled = devInfo.UsbDescriptors != null;
-                UsbVendorId               = $"{devInfo.UsbVendorId:X4}";
-                UsbProductId              = $"{devInfo.UsbProductId:X4}";
-                UsbManufacturer           = devInfo.UsbManufacturerString;
-                UsbProduct                = devInfo.UsbProductString;
-                UsbSerial                 = devInfo.UsbSerialString;
-            }
-
-            if(devInfo.IsFireWire)
-            {
-                FirewireVisible      = true;
-                FirewireVendorId     = $"{devInfo.FireWireVendor:X4}";
-                FirewireModelId      = $"{devInfo.FireWireModel:X4}";
-                FirewireManufacturer = devInfo.FireWireVendorName;
-                FirewireModel        = devInfo.FireWireModelName;
-                FirewireGuid         = $"{devInfo.FireWireGuid:X16}";
-            }
-
-            if(devInfo.IsPcmcia)
-            {
-                PcmciaInfo = new PcmciaInfo
-                {
-                    DataContext = new PcmciaInfoViewModel(devInfo.Cis, _view)
-                };
-            }
-
-            if(devInfo.AtaIdentify   != null ||
-               devInfo.AtapiIdentify != null)
-            {
-                AtaInfo = new AtaInfo
-                {
-                    DataContext =
-                        new AtaInfoViewModel(devInfo.AtaIdentify, devInfo.AtapiIdentify, devInfo.AtaMcptError, _view)
-                };
-            }
-
-            if(devInfo.ScsiInquiryData != null)
-            {
-                ScsiInfo = new ScsiInfo
-                {
-                    DataContext = new ScsiInfoViewModel(devInfo.ScsiInquiryData, devInfo.ScsiInquiry,
-                                                        devInfo.ScsiEvpdPages, devInfo.ScsiMode, devInfo.ScsiType,
-                                                        devInfo.ScsiModeSense6, devInfo.ScsiModeSense10,
-                                                        devInfo.MmcConfiguration, _view)
-                };
-
-                if(devInfo.PlextorFeatures != null)
-                {
-                    PlextorVisible = true;
-
-                    if(devInfo.PlextorFeatures.Eeprom != null)
-                    {
-                        PlextorEepromVisible = true;
-                        PlextorDiscs         = $"{devInfo.PlextorFeatures.Discs}";
-                        PlextorCdReadTime    = TimeSpan.FromSeconds(devInfo.PlextorFeatures.CdReadTime).ToString();
-
-                        PlextorCdWriteTime = TimeSpan.FromSeconds(devInfo.PlextorFeatures.CdWriteTime).ToString();
-
-                        if(devInfo.PlextorFeatures.IsDvd)
-                        {
-                            PlextorDvdTimesVisible = true;
-
-                            PlextorDvdReadTime = TimeSpan.FromSeconds(devInfo.PlextorFeatures.DvdReadTime).ToString();
-
-                            PlextorDvdWriteTime = TimeSpan.FromSeconds(devInfo.PlextorFeatures.DvdWriteTime).ToString();
-                        }
-                    }
-
-                    PlextorPoweRec = devInfo.PlextorFeatures.PoweRec;
-
-                    if(devInfo.PlextorFeatures.PoweRec)
-                    {
-                        PlextorPoweRecEnabled = devInfo.PlextorFeatures.PoweRecEnabled;
-
-                        if(devInfo.PlextorFeatures.PoweRecEnabled)
-                        {
-                            PlextorPoweRecEnabled = true;
-
-                            if(devInfo.PlextorFeatures.PoweRecRecommendedSpeed > 0)
-                            {
-                                PlextorPoweRecRecommendedVisible = true;
-
-                                PlextorPoweRecRecommended =
-                                    $"{devInfo.PlextorFeatures.PoweRecRecommendedSpeed} Kb/sec.";
-                            }
-
-                            if(devInfo.PlextorFeatures.PoweRecSelected > 0)
-                            {
-                                PlextorPoweRecSelectedVisible = true;
-
-                                PlextorPoweRecSelected = $"{devInfo.PlextorFeatures.PoweRecSelected} Kb/sec.";
-                            }
-
-                            if(devInfo.PlextorFeatures.PoweRecMax > 0)
-                            {
-                                PlextorPoweRecMaxVisible = true;
-                                PlextorPoweRecMax        = $"{devInfo.PlextorFeatures.PoweRecMax} Kb/sec.";
-                            }
-
-                            if(devInfo.PlextorFeatures.PoweRecLast > 0)
-                            {
-                                PlextorPoweRecLastVisible = true;
-                                PlextorPoweRecLast        = $"{devInfo.PlextorFeatures.PoweRecLast} Kb/sec.";
-                            }
-                        }
-                    }
-
-                    PlextorSilentMode = devInfo.PlextorFeatures.SilentMode;
-
-                    if(devInfo.PlextorFeatures.SilentMode)
-                    {
-                        PlextorSilentModeEnabled = devInfo.PlextorFeatures.SilentModeEnabled;
-
-                        if(devInfo.PlextorFeatures.SilentModeEnabled)
-                        {
-                            PlextorSilentModeAccessTime = devInfo.PlextorFeatures.AccessTimeLimit == 2
-                                                              ? "\tAccess time is slow" : "\tAccess time is fast";
-
-                            PlextorSilentModeCdReadSpeedLimit =
-                                devInfo.PlextorFeatures.CdReadSpeedLimit > 0
-                                    ? $"{devInfo.PlextorFeatures.CdReadSpeedLimit}x" : "unlimited";
-
-                            PlextorSilentModeCdWriteSpeedLimit =
-                                devInfo.PlextorFeatures.CdWriteSpeedLimit > 0
-                                    ? $"{devInfo.PlextorFeatures.CdReadSpeedLimit}x" : "unlimited";
-
-                            if(devInfo.PlextorFeatures.IsDvd)
-                            {
-                                PlextorSilentModeDvdReadSpeedLimitVisible = true;
-
-                                PlextorSilentModeDvdReadSpeedLimit =
-                                    devInfo.PlextorFeatures.DvdReadSpeedLimit > 0
-                                        ? $"{devInfo.PlextorFeatures.DvdReadSpeedLimit}x" : "unlimited";
-                            }
-                        }
-                    }
-
-                    PlextorGigaRec   = devInfo.PlextorFeatures.GigaRec;
-                    PlextorSecuRec   = devInfo.PlextorFeatures.SecuRec;
-                    PlextorSpeedRead = devInfo.PlextorFeatures.SpeedRead;
-
-                    if(devInfo.PlextorFeatures.SpeedRead)
-                    {
-                        PlextorSpeedEnabled = devInfo.PlextorFeatures.SpeedReadEnabled;
-                    }
-
-                    PlextorHiding = devInfo.PlextorFeatures.Hiding;
-
-                    if(devInfo.PlextorFeatures.Hiding)
-                    {
-                        PlextorHidesRecordables = devInfo.PlextorFeatures.HidesRecordables;
-                        PlextorHidesSessions    = devInfo.PlextorFeatures.HidesSessions;
-                    }
-
-                    PlextorVariRec = devInfo.PlextorFeatures.VariRec;
-
-                    if(devInfo.PlextorFeatures.IsDvd)
-                    {
-                        PlextorVariRecDvd       = devInfo.PlextorFeatures.VariRecDvd;
-                        PlextorBitSetting       = devInfo.PlextorFeatures.BitSetting;
-                        PlextorBitSettingDl     = devInfo.PlextorFeatures.BitSettingDl;
-                        PlextorDvdPlusWriteTest = devInfo.PlextorFeatures.DvdPlusWriteTest;
-                    }
-                }
-
-                if(devInfo.ScsiInquiry?.KreonPresent == true)
-                {
-                    Kreon                  = true;
-                    KreonChallengeResponse = devInfo.KreonFeatures.HasFlag(KreonFeatures.ChallengeResponse);
-                    KreonDecryptSs         = devInfo.KreonFeatures.HasFlag(KreonFeatures.DecryptSs);
-                    KreonXtremeUnlock      = devInfo.KreonFeatures.HasFlag(KreonFeatures.XtremeUnlock);
-                    KreonWxripperUnlock    = devInfo.KreonFeatures.HasFlag(KreonFeatures.WxripperUnlock);
-
-                    KreonChallengeResponse360 = devInfo.KreonFeatures.HasFlag(KreonFeatures.ChallengeResponse360);
-
-                    KreonDecryptSs360      = devInfo.KreonFeatures.HasFlag(KreonFeatures.DecryptSs360);
-                    KreonXtremeUnlock360   = devInfo.KreonFeatures.HasFlag(KreonFeatures.XtremeUnlock360);
-                    KreonWxripperUnlock360 = devInfo.KreonFeatures.HasFlag(KreonFeatures.WxripperUnlock360);
-                    KreonLock              = devInfo.KreonFeatures.HasFlag(KreonFeatures.Lock);
-                    KreonErrorSkipping     = devInfo.KreonFeatures.HasFlag(KreonFeatures.ErrorSkipping);
-                }
-
-                if(devInfo.BlockLimits != null)
-                {
-                    BlockLimits.BlockLimitsData?
-                        blockLimits = Decoders.SCSI.SSC.BlockLimits.Decode(devInfo.BlockLimits);
-
-                    if(blockLimits.HasValue)
-                    {
-                        Ssc = true;
-
-                        if(blockLimits.Value.minBlockLen == blockLimits.Value.maxBlockLen)
-                        {
-                            MinBlockSize = $"Device's block size is fixed at {blockLimits.Value.minBlockLen} bytes";
-                        }
-                        else
-                        {
-                            MaxBlockSize = blockLimits.Value.maxBlockLen > 0
-                                               ? $"Device's maximum block size is {blockLimits.Value.maxBlockLen} bytes"
-                                               : "Device does not specify a maximum block size";
-
-                            MinBlockSize = $"Device's minimum block size is {blockLimits.Value.minBlockLen} bytes";
-
-                            if(blockLimits.Value.granularity > 0)
-                            {
-                                BlockSizeGranularity =
-                                    $"Device's needs a block size granularity of 2^{blockLimits.Value.granularity} ({Math.Pow(2, blockLimits.Value.granularity)}) bytes";
-                            }
-                        }
-                    }
-                }
-
-                if(devInfo.DensitySupport != null)
-                    if(devInfo.DensitySupportHeader.HasValue)
-                    {
-                        Densities = DensitySupport.PrettifyDensity(devInfo.DensitySupportHeader);
-                    }
-
-                if(devInfo.MediumDensitySupport != null)
-                {
-                    if(devInfo.MediaTypeSupportHeader.HasValue)
-                    {
-                        MediumTypes = DensitySupport.PrettifyMediumType(devInfo.MediaTypeSupportHeader);
-                    }
-
-                    MediumDensity = DensitySupport.PrettifyMediumType(devInfo.MediumDensitySupport);
-                }
-            }
-
-            SdMmcInfo = new SdMmcInfo
-            {
-                DataContext = new SdMmcInfoViewModel(devInfo.Type, devInfo.CID, devInfo.CSD, devInfo.OCR,
-                                                     devInfo.ExtendedCSD, devInfo.SCR)
+                DataContext = new PcmciaInfoViewModel(devInfo.Cis, _view)
             };
         }
 
-        public ReactiveCommand<Unit, Unit> SaveUsbDescriptorsCommand { get; }
-
-        public string DeviceType
+        if(devInfo.AtaIdentify   != null ||
+           devInfo.AtapiIdentify != null)
         {
-            get => _deviceType;
-            set => this.RaiseAndSetIfChanged(ref _deviceType, value);
-        }
-
-        public string Manufacturer
-        {
-            get => _manufacturer;
-            set => this.RaiseAndSetIfChanged(ref _manufacturer, value);
-        }
-
-        public string Model
-        {
-            get => _model;
-            set => this.RaiseAndSetIfChanged(ref _model, value);
-        }
-
-        public string Revision
-        {
-            get => _revision;
-            set => this.RaiseAndSetIfChanged(ref _revision, value);
-        }
-
-        public string Serial
-        {
-            get => _serial;
-            set => this.RaiseAndSetIfChanged(ref _serial, value);
-        }
-
-        public string ScsiType
-        {
-            get => _scsiType;
-            set => this.RaiseAndSetIfChanged(ref _scsiType, value);
-        }
-
-        public bool Removable
-        {
-            get => _removable;
-            set => this.RaiseAndSetIfChanged(ref _removable, value);
-        }
-
-        public string UsbConnected
-        {
-            get => _usbConnected;
-            set => this.RaiseAndSetIfChanged(ref _usbConnected, value);
-        }
-
-        public bool UsbVisible
-        {
-            get => _usbVisible;
-            set => this.RaiseAndSetIfChanged(ref _usbVisible, value);
-        }
-
-        public string UsbVendorId
-        {
-            get => _usbVendorId;
-            set => this.RaiseAndSetIfChanged(ref _usbVendorId, value);
-        }
-
-        public string UsbProductId
-        {
-            get => _usbProductId;
-            set => this.RaiseAndSetIfChanged(ref _usbProductId, value);
-        }
-
-        public string UsbManufacturer
-        {
-            get => _usbManufacturer;
-            set => this.RaiseAndSetIfChanged(ref _usbManufacturer, value);
-        }
-
-        public string UsbProduct
-        {
-            get => _usbProduct;
-            set => this.RaiseAndSetIfChanged(ref _usbProduct, value);
-        }
-
-        public string UsbSerial
-        {
-            get => _usbSerial;
-            set => this.RaiseAndSetIfChanged(ref _usbSerial, value);
-        }
-
-        public bool SaveUsbDescriptorsEnabled
-        {
-            get => _saveUsbDescriptorsEnabled;
-            set => this.RaiseAndSetIfChanged(ref _saveUsbDescriptorsEnabled, value);
-        }
-
-        public bool FirewireVisible
-        {
-            get => _firewireVisible;
-            set => this.RaiseAndSetIfChanged(ref _firewireVisible, value);
-        }
-
-        public string FirewireVendorId
-        {
-            get => _firewireVendorId;
-            set => this.RaiseAndSetIfChanged(ref _firewireVendorId, value);
-        }
-
-        public string FirewireModelId
-        {
-            get => _firewireModelId;
-            set => this.RaiseAndSetIfChanged(ref _firewireModelId, value);
-        }
-
-        public string FirewireManufacturer
-        {
-            get => _firewireManufacturer;
-            set => this.RaiseAndSetIfChanged(ref _firewireManufacturer, value);
-        }
-
-        public string FirewireModel
-        {
-            get => _firewireModel;
-            set => this.RaiseAndSetIfChanged(ref _firewireModel, value);
-        }
-
-        public string FirewireGuid
-        {
-            get => _firewireGuid;
-            set => this.RaiseAndSetIfChanged(ref _firewireGuid, value);
-        }
-
-        public bool PlextorVisible
-        {
-            get => _plextorVisible;
-            set => this.RaiseAndSetIfChanged(ref _plextorVisible, value);
-        }
-
-        public bool PlextorEepromVisible
-        {
-            get => _plextorEepromVisible;
-            set => this.RaiseAndSetIfChanged(ref _plextorEepromVisible, value);
-        }
-
-        public string PlextorDiscs
-        {
-            get => _plextorDiscs;
-            set => this.RaiseAndSetIfChanged(ref _plextorDiscs, value);
-        }
-
-        public string PlextorCdReadTime
-        {
-            get => _plextorCdReadTime;
-            set => this.RaiseAndSetIfChanged(ref _plextorCdReadTime, value);
-        }
-
-        public string PlextorCdWriteTime
-        {
-            get => _plextorCdWriteTime;
-            set => this.RaiseAndSetIfChanged(ref _plextorCdWriteTime, value);
-        }
-
-        public bool PlextorDvdTimesVisible
-        {
-            get => _plextorDvdTimesVisible;
-            set => this.RaiseAndSetIfChanged(ref _plextorDvdTimesVisible, value);
-        }
-
-        public string PlextorDvdReadTime
-        {
-            get => _plextorDvdReadTime;
-            set => this.RaiseAndSetIfChanged(ref _plextorDvdReadTime, value);
-        }
-
-        public string PlextorDvdWriteTime
-        {
-            get => _plextorDvdWriteTime;
-            set => this.RaiseAndSetIfChanged(ref _plextorDvdWriteTime, value);
-        }
-
-        public bool PlextorPoweRec
-        {
-            get => _plextorPoweRec;
-            set => this.RaiseAndSetIfChanged(ref _plextorPoweRec, value);
-        }
-
-        public bool PlextorPoweRecEnabled
-        {
-            get => _plextorPoweRecEnabled;
-            set => this.RaiseAndSetIfChanged(ref _plextorPoweRecEnabled, value);
-        }
-
-        public bool PlextorPoweRecRecommendedVisible
-        {
-            get => _plextorPoweRecRecommendedVisible;
-            set => this.RaiseAndSetIfChanged(ref _plextorPoweRecRecommendedVisible, value);
-        }
-
-        public string PlextorPoweRecRecommended
-        {
-            get => _plextorPoweRecRecommended;
-            set => this.RaiseAndSetIfChanged(ref _plextorPoweRecRecommended, value);
-        }
-
-        public bool PlextorPoweRecSelectedVisible
-        {
-            get => _plextorPoweRecSelectedVisible;
-            set => this.RaiseAndSetIfChanged(ref _plextorPoweRecSelectedVisible, value);
-        }
-
-        public string PlextorPoweRecSelected
-        {
-            get => _plextorPoweRecSelected;
-            set => this.RaiseAndSetIfChanged(ref _plextorPoweRecSelected, value);
-        }
-
-        public bool PlextorPoweRecMaxVisible
-        {
-            get => _plextorPoweRecMaxVisible;
-            set => this.RaiseAndSetIfChanged(ref _plextorPoweRecMaxVisible, value);
-        }
-
-        public string PlextorPoweRecMax
-        {
-            get => _plextorPoweRecMax;
-            set => this.RaiseAndSetIfChanged(ref _plextorPoweRecMax, value);
-        }
-
-        public bool PlextorPoweRecLastVisible
-        {
-            get => _plextorPoweRecLastVisible;
-            set => this.RaiseAndSetIfChanged(ref _plextorPoweRecLastVisible, value);
-        }
-
-        public string PlextorPoweRecLast
-        {
-            get => _plextorPoweRecLast;
-            set => this.RaiseAndSetIfChanged(ref _plextorPoweRecLast, value);
-        }
-
-        public bool PlextorSilentMode
-        {
-            get => _plextorSilentMode;
-            set => this.RaiseAndSetIfChanged(ref _plextorSilentMode, value);
-        }
-
-        public bool PlextorSilentModeEnabled
-        {
-            get => _plextorSilentModeEnabled;
-            set => this.RaiseAndSetIfChanged(ref _plextorSilentModeEnabled, value);
-        }
-
-        public string PlextorSilentModeAccessTime
-        {
-            get => _plextorSilentModeAccessTime;
-            set => this.RaiseAndSetIfChanged(ref _plextorSilentModeAccessTime, value);
-        }
-
-        public string PlextorSilentModeCdReadSpeedLimit
-        {
-            get => _plextorSilentModeCdReadSpeedLimit;
-            set => this.RaiseAndSetIfChanged(ref _plextorSilentModeCdReadSpeedLimit, value);
-        }
-
-        public string PlextorSilentModeCdWriteSpeedLimit
-        {
-            get => _plextorSilentModeCdWriteSpeedLimit;
-            set => this.RaiseAndSetIfChanged(ref _plextorSilentModeCdWriteSpeedLimit, value);
-        }
-
-        public bool PlextorSilentModeDvdReadSpeedLimitVisible
-        {
-            get => _plextorSilentModeDvdReadSpeedLimitVisible;
-            set => this.RaiseAndSetIfChanged(ref _plextorSilentModeDvdReadSpeedLimitVisible, value);
-        }
-
-        public string PlextorSilentModeDvdReadSpeedLimit
-        {
-            get => _plextorSilentModeDvdReadSpeedLimit;
-            set => this.RaiseAndSetIfChanged(ref _plextorSilentModeDvdReadSpeedLimit, value);
-        }
-
-        public bool PlextorGigaRec
-        {
-            get => _plextorGigaRec;
-            set => this.RaiseAndSetIfChanged(ref _plextorGigaRec, value);
-        }
-
-        public bool PlextorSecuRec
-        {
-            get => _plextorSecuRec;
-            set => this.RaiseAndSetIfChanged(ref _plextorSecuRec, value);
-        }
-
-        public bool PlextorSpeedRead
-        {
-            get => _plextorSpeedRead;
-            set => this.RaiseAndSetIfChanged(ref _plextorSpeedRead, value);
-        }
-
-        public bool PlextorSpeedEnabled
-        {
-            get => _plextorSpeedEnabled;
-            set => this.RaiseAndSetIfChanged(ref _plextorSpeedEnabled, value);
-        }
-
-        public bool PlextorHiding
-        {
-            get => _plextorHiding;
-            set => this.RaiseAndSetIfChanged(ref _plextorHiding, value);
-        }
-
-        public bool PlextorHidesRecordables
-        {
-            get => _plextorHidesRecordables;
-            set => this.RaiseAndSetIfChanged(ref _plextorHidesRecordables, value);
-        }
-
-        public bool PlextorHidesSessions
-        {
-            get => _plextorHidesSessions;
-            set => this.RaiseAndSetIfChanged(ref _plextorHidesSessions, value);
-        }
-
-        public bool PlextorVariRec
-        {
-            get => _plextorVariRec;
-            set => this.RaiseAndSetIfChanged(ref _plextorVariRec, value);
-        }
-
-        public string PlextorDvd
-        {
-            get => _plextorDvd;
-            set => this.RaiseAndSetIfChanged(ref _plextorDvd, value);
-        }
-
-        public bool PlextorVariRecDvd
-        {
-            get => _plextorVariRecDvd;
-            set => this.RaiseAndSetIfChanged(ref _plextorVariRecDvd, value);
-        }
-
-        public bool PlextorBitSetting
-        {
-            get => _plextorBitSetting;
-            set => this.RaiseAndSetIfChanged(ref _plextorBitSetting, value);
-        }
-
-        public bool PlextorBitSettingDl
-        {
-            get => _plextorBitSettingDl;
-            set => this.RaiseAndSetIfChanged(ref _plextorBitSettingDl, value);
-        }
-
-        public bool PlextorDvdPlusWriteTest
-        {
-            get => _plextorDvdPlusWriteTest;
-            set => this.RaiseAndSetIfChanged(ref _plextorDvdPlusWriteTest, value);
-        }
-
-        public bool Kreon
-        {
-            get => _kreon;
-            set => this.RaiseAndSetIfChanged(ref _kreon, value);
-        }
-
-        public bool KreonChallengeResponse
-        {
-            get => _kreonChallengeResponse;
-            set => this.RaiseAndSetIfChanged(ref _kreonChallengeResponse, value);
-        }
-
-        public bool KreonDecryptSs
-        {
-            get => _kreonDecryptSs;
-            set => this.RaiseAndSetIfChanged(ref _kreonDecryptSs, value);
-        }
-
-        public bool KreonXtremeUnlock
-        {
-            get => _kreonXtremeUnlock;
-            set => this.RaiseAndSetIfChanged(ref _kreonXtremeUnlock, value);
-        }
-
-        public bool KreonWxripperUnlock
-        {
-            get => _kreonWxripperUnlock;
-            set => this.RaiseAndSetIfChanged(ref _kreonWxripperUnlock, value);
-        }
-
-        public bool KreonChallengeResponse360
-        {
-            get => _kreonChallengeResponse360;
-            set => this.RaiseAndSetIfChanged(ref _kreonChallengeResponse360, value);
-        }
-
-        public bool KreonDecryptSs360
-        {
-            get => _kreonDecryptSs360;
-            set => this.RaiseAndSetIfChanged(ref _kreonDecryptSs360, value);
-        }
-
-        public bool KreonXtremeUnlock360
-        {
-            get => _kreonXtremeUnlock360;
-            set => this.RaiseAndSetIfChanged(ref _kreonXtremeUnlock360, value);
-        }
-
-        public bool KreonWxripperUnlock360
-        {
-            get => _kreonWxripperUnlock360;
-            set => this.RaiseAndSetIfChanged(ref _kreonWxripperUnlock360, value);
-        }
-
-        public bool KreonLock
-        {
-            get => _kreonLock;
-            set => this.RaiseAndSetIfChanged(ref _kreonLock, value);
-        }
-
-        public bool KreonErrorSkipping
-        {
-            get => _kreonErrorSkipping;
-            set => this.RaiseAndSetIfChanged(ref _kreonErrorSkipping, value);
-        }
-
-        public bool Ssc
-        {
-            get => _ssc;
-            set => this.RaiseAndSetIfChanged(ref _ssc, value);
-        }
-
-        public string BlockLimits
-        {
-            get => _blockLimits;
-            set => this.RaiseAndSetIfChanged(ref _blockLimits, value);
-        }
-
-        public string MinBlockSize
-        {
-            get => _minBlockSize;
-            set => this.RaiseAndSetIfChanged(ref _minBlockSize, value);
-        }
-
-        public string MaxBlockSize
-        {
-            get => _maxBlockSize;
-            set => this.RaiseAndSetIfChanged(ref _maxBlockSize, value);
-        }
-
-        public string BlockSizeGranularity
-        {
-            get => _blockSizeGranularity;
-            set => this.RaiseAndSetIfChanged(ref _blockSizeGranularity, value);
-        }
-
-        public string Densities
-        {
-            get => _densities;
-            set => this.RaiseAndSetIfChanged(ref _densities, value);
-        }
-
-        public string MediumTypes
-        {
-            get => _mediumTypes;
-            set => this.RaiseAndSetIfChanged(ref _mediumTypes, value);
-        }
-
-        public string MediumDensity
-        {
-            get => _mediumDensity;
-            set => this.RaiseAndSetIfChanged(ref _mediumDensity, value);
-        }
-
-        public string SecureDigital
-        {
-            get => _secureDigital;
-            set => this.RaiseAndSetIfChanged(ref _secureDigital, value);
-        }
-
-        public string SdMm
-        {
-            get => _sdMm;
-            set => this.RaiseAndSetIfChanged(ref _sdMm, value);
-        }
-
-        public string Cid
-        {
-            get => _cid;
-            set => this.RaiseAndSetIfChanged(ref _cid, value);
-        }
-
-        public string Csd
-        {
-            get => _csd;
-            set => this.RaiseAndSetIfChanged(ref _csd, value);
-        }
-
-        public string Ocr
-        {
-            get => _ocr;
-            set => this.RaiseAndSetIfChanged(ref _ocr, value);
-        }
-
-        public string ExtendedCsd
-        {
-            get => _extendedCsd;
-            set => this.RaiseAndSetIfChanged(ref _extendedCsd, value);
-        }
-
-        public string Scr
-        {
-            get => _scr;
-            set => this.RaiseAndSetIfChanged(ref _scr, value);
-        }
-
-        public PcmciaInfo PcmciaInfo
-        {
-            get => _pcmciaInfo;
-            set => this.RaiseAndSetIfChanged(ref _pcmciaInfo, value);
-        }
-
-        public ScsiInfo ScsiInfo
-        {
-            get => _scsiInfo;
-            set => this.RaiseAndSetIfChanged(ref _scsiInfo, value);
-        }
-
-        public AtaInfo AtaInfo
-        {
-            get => _ataInfo;
-            set => this.RaiseAndSetIfChanged(ref _ataInfo, value);
-        }
-
-        public SdMmcInfo SdMmcInfo
-        {
-            get => _sdMmcInfo;
-            set => this.RaiseAndSetIfChanged(ref _sdMmcInfo, value);
-        }
-
-        async void ExecuteSaveUsbDescriptorsCommand()
-        {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
+            AtaInfo = new AtaInfo
             {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
-
-            string result = await dlgSaveBinary.ShowAsync(_view);
-
-            if(result is null)
-                return;
-
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_devInfo.UsbDescriptors, 0, _devInfo.UsbDescriptors.Length);
-
-            saveFs.Close();
+                DataContext =
+                    new AtaInfoViewModel(devInfo.AtaIdentify, devInfo.AtapiIdentify, devInfo.AtaMcptError, _view)
+            };
         }
+
+        if(devInfo.ScsiInquiryData != null)
+        {
+            ScsiInfo = new ScsiInfo
+            {
+                DataContext = new ScsiInfoViewModel(devInfo.ScsiInquiryData, devInfo.ScsiInquiry,
+                                                    devInfo.ScsiEvpdPages, devInfo.ScsiMode, devInfo.ScsiType,
+                                                    devInfo.ScsiModeSense6, devInfo.ScsiModeSense10,
+                                                    devInfo.MmcConfiguration, _view)
+            };
+
+            if(devInfo.PlextorFeatures != null)
+            {
+                PlextorVisible = true;
+
+                if(devInfo.PlextorFeatures.Eeprom != null)
+                {
+                    PlextorEepromVisible = true;
+                    PlextorDiscs         = $"{devInfo.PlextorFeatures.Discs}";
+                    PlextorCdReadTime    = TimeSpan.FromSeconds(devInfo.PlextorFeatures.CdReadTime).ToString();
+
+                    PlextorCdWriteTime = TimeSpan.FromSeconds(devInfo.PlextorFeatures.CdWriteTime).ToString();
+
+                    if(devInfo.PlextorFeatures.IsDvd)
+                    {
+                        PlextorDvdTimesVisible = true;
+
+                        PlextorDvdReadTime = TimeSpan.FromSeconds(devInfo.PlextorFeatures.DvdReadTime).ToString();
+
+                        PlextorDvdWriteTime = TimeSpan.FromSeconds(devInfo.PlextorFeatures.DvdWriteTime).ToString();
+                    }
+                }
+
+                PlextorPoweRec = devInfo.PlextorFeatures.PoweRec;
+
+                if(devInfo.PlextorFeatures.PoweRec)
+                {
+                    PlextorPoweRecEnabled = devInfo.PlextorFeatures.PoweRecEnabled;
+
+                    if(devInfo.PlextorFeatures.PoweRecEnabled)
+                    {
+                        PlextorPoweRecEnabled = true;
+
+                        if(devInfo.PlextorFeatures.PoweRecRecommendedSpeed > 0)
+                        {
+                            PlextorPoweRecRecommendedVisible = true;
+
+                            PlextorPoweRecRecommended =
+                                $"{devInfo.PlextorFeatures.PoweRecRecommendedSpeed} Kb/sec.";
+                        }
+
+                        if(devInfo.PlextorFeatures.PoweRecSelected > 0)
+                        {
+                            PlextorPoweRecSelectedVisible = true;
+
+                            PlextorPoweRecSelected = $"{devInfo.PlextorFeatures.PoweRecSelected} Kb/sec.";
+                        }
+
+                        if(devInfo.PlextorFeatures.PoweRecMax > 0)
+                        {
+                            PlextorPoweRecMaxVisible = true;
+                            PlextorPoweRecMax        = $"{devInfo.PlextorFeatures.PoweRecMax} Kb/sec.";
+                        }
+
+                        if(devInfo.PlextorFeatures.PoweRecLast > 0)
+                        {
+                            PlextorPoweRecLastVisible = true;
+                            PlextorPoweRecLast        = $"{devInfo.PlextorFeatures.PoweRecLast} Kb/sec.";
+                        }
+                    }
+                }
+
+                PlextorSilentMode = devInfo.PlextorFeatures.SilentMode;
+
+                if(devInfo.PlextorFeatures.SilentMode)
+                {
+                    PlextorSilentModeEnabled = devInfo.PlextorFeatures.SilentModeEnabled;
+
+                    if(devInfo.PlextorFeatures.SilentModeEnabled)
+                    {
+                        PlextorSilentModeAccessTime = devInfo.PlextorFeatures.AccessTimeLimit == 2
+                                                          ? "\tAccess time is slow" : "\tAccess time is fast";
+
+                        PlextorSilentModeCdReadSpeedLimit =
+                            devInfo.PlextorFeatures.CdReadSpeedLimit > 0
+                                ? $"{devInfo.PlextorFeatures.CdReadSpeedLimit}x" : "unlimited";
+
+                        PlextorSilentModeCdWriteSpeedLimit =
+                            devInfo.PlextorFeatures.CdWriteSpeedLimit > 0
+                                ? $"{devInfo.PlextorFeatures.CdReadSpeedLimit}x" : "unlimited";
+
+                        if(devInfo.PlextorFeatures.IsDvd)
+                        {
+                            PlextorSilentModeDvdReadSpeedLimitVisible = true;
+
+                            PlextorSilentModeDvdReadSpeedLimit =
+                                devInfo.PlextorFeatures.DvdReadSpeedLimit > 0
+                                    ? $"{devInfo.PlextorFeatures.DvdReadSpeedLimit}x" : "unlimited";
+                        }
+                    }
+                }
+
+                PlextorGigaRec   = devInfo.PlextorFeatures.GigaRec;
+                PlextorSecuRec   = devInfo.PlextorFeatures.SecuRec;
+                PlextorSpeedRead = devInfo.PlextorFeatures.SpeedRead;
+
+                if(devInfo.PlextorFeatures.SpeedRead)
+                {
+                    PlextorSpeedEnabled = devInfo.PlextorFeatures.SpeedReadEnabled;
+                }
+
+                PlextorHiding = devInfo.PlextorFeatures.Hiding;
+
+                if(devInfo.PlextorFeatures.Hiding)
+                {
+                    PlextorHidesRecordables = devInfo.PlextorFeatures.HidesRecordables;
+                    PlextorHidesSessions    = devInfo.PlextorFeatures.HidesSessions;
+                }
+
+                PlextorVariRec = devInfo.PlextorFeatures.VariRec;
+
+                if(devInfo.PlextorFeatures.IsDvd)
+                {
+                    PlextorVariRecDvd       = devInfo.PlextorFeatures.VariRecDvd;
+                    PlextorBitSetting       = devInfo.PlextorFeatures.BitSetting;
+                    PlextorBitSettingDl     = devInfo.PlextorFeatures.BitSettingDl;
+                    PlextorDvdPlusWriteTest = devInfo.PlextorFeatures.DvdPlusWriteTest;
+                }
+            }
+
+            if(devInfo.ScsiInquiry?.KreonPresent == true)
+            {
+                Kreon                  = true;
+                KreonChallengeResponse = devInfo.KreonFeatures.HasFlag(KreonFeatures.ChallengeResponse);
+                KreonDecryptSs         = devInfo.KreonFeatures.HasFlag(KreonFeatures.DecryptSs);
+                KreonXtremeUnlock      = devInfo.KreonFeatures.HasFlag(KreonFeatures.XtremeUnlock);
+                KreonWxripperUnlock    = devInfo.KreonFeatures.HasFlag(KreonFeatures.WxripperUnlock);
+
+                KreonChallengeResponse360 = devInfo.KreonFeatures.HasFlag(KreonFeatures.ChallengeResponse360);
+
+                KreonDecryptSs360      = devInfo.KreonFeatures.HasFlag(KreonFeatures.DecryptSs360);
+                KreonXtremeUnlock360   = devInfo.KreonFeatures.HasFlag(KreonFeatures.XtremeUnlock360);
+                KreonWxripperUnlock360 = devInfo.KreonFeatures.HasFlag(KreonFeatures.WxripperUnlock360);
+                KreonLock              = devInfo.KreonFeatures.HasFlag(KreonFeatures.Lock);
+                KreonErrorSkipping     = devInfo.KreonFeatures.HasFlag(KreonFeatures.ErrorSkipping);
+            }
+
+            if(devInfo.BlockLimits != null)
+            {
+                BlockLimits.BlockLimitsData?
+                    blockLimits = Decoders.SCSI.SSC.BlockLimits.Decode(devInfo.BlockLimits);
+
+                if(blockLimits.HasValue)
+                {
+                    Ssc = true;
+
+                    if(blockLimits.Value.minBlockLen == blockLimits.Value.maxBlockLen)
+                    {
+                        MinBlockSize = $"Device's block size is fixed at {blockLimits.Value.minBlockLen} bytes";
+                    }
+                    else
+                    {
+                        MaxBlockSize = blockLimits.Value.maxBlockLen > 0
+                                           ? $"Device's maximum block size is {blockLimits.Value.maxBlockLen} bytes"
+                                           : "Device does not specify a maximum block size";
+
+                        MinBlockSize = $"Device's minimum block size is {blockLimits.Value.minBlockLen} bytes";
+
+                        if(blockLimits.Value.granularity > 0)
+                        {
+                            BlockSizeGranularity =
+                                $"Device's needs a block size granularity of 2^{blockLimits.Value.granularity} ({Math.Pow(2, blockLimits.Value.granularity)}) bytes";
+                        }
+                    }
+                }
+            }
+
+            if(devInfo.DensitySupport != null)
+                if(devInfo.DensitySupportHeader.HasValue)
+                {
+                    Densities = DensitySupport.PrettifyDensity(devInfo.DensitySupportHeader);
+                }
+
+            if(devInfo.MediumDensitySupport != null)
+            {
+                if(devInfo.MediaTypeSupportHeader.HasValue)
+                {
+                    MediumTypes = DensitySupport.PrettifyMediumType(devInfo.MediaTypeSupportHeader);
+                }
+
+                MediumDensity = DensitySupport.PrettifyMediumType(devInfo.MediumDensitySupport);
+            }
+        }
+
+        SdMmcInfo = new SdMmcInfo
+        {
+            DataContext = new SdMmcInfoViewModel(devInfo.Type, devInfo.CID, devInfo.CSD, devInfo.OCR,
+                                                 devInfo.ExtendedCSD, devInfo.SCR)
+        };
+    }
+
+    public ReactiveCommand<Unit, Unit> SaveUsbDescriptorsCommand { get; }
+
+    public string DeviceType
+    {
+        get => _deviceType;
+        set => this.RaiseAndSetIfChanged(ref _deviceType, value);
+    }
+
+    public string Manufacturer
+    {
+        get => _manufacturer;
+        set => this.RaiseAndSetIfChanged(ref _manufacturer, value);
+    }
+
+    public string Model
+    {
+        get => _model;
+        set => this.RaiseAndSetIfChanged(ref _model, value);
+    }
+
+    public string Revision
+    {
+        get => _revision;
+        set => this.RaiseAndSetIfChanged(ref _revision, value);
+    }
+
+    public string Serial
+    {
+        get => _serial;
+        set => this.RaiseAndSetIfChanged(ref _serial, value);
+    }
+
+    public string ScsiType
+    {
+        get => _scsiType;
+        set => this.RaiseAndSetIfChanged(ref _scsiType, value);
+    }
+
+    public bool Removable
+    {
+        get => _removable;
+        set => this.RaiseAndSetIfChanged(ref _removable, value);
+    }
+
+    public string UsbConnected
+    {
+        get => _usbConnected;
+        set => this.RaiseAndSetIfChanged(ref _usbConnected, value);
+    }
+
+    public bool UsbVisible
+    {
+        get => _usbVisible;
+        set => this.RaiseAndSetIfChanged(ref _usbVisible, value);
+    }
+
+    public string UsbVendorId
+    {
+        get => _usbVendorId;
+        set => this.RaiseAndSetIfChanged(ref _usbVendorId, value);
+    }
+
+    public string UsbProductId
+    {
+        get => _usbProductId;
+        set => this.RaiseAndSetIfChanged(ref _usbProductId, value);
+    }
+
+    public string UsbManufacturer
+    {
+        get => _usbManufacturer;
+        set => this.RaiseAndSetIfChanged(ref _usbManufacturer, value);
+    }
+
+    public string UsbProduct
+    {
+        get => _usbProduct;
+        set => this.RaiseAndSetIfChanged(ref _usbProduct, value);
+    }
+
+    public string UsbSerial
+    {
+        get => _usbSerial;
+        set => this.RaiseAndSetIfChanged(ref _usbSerial, value);
+    }
+
+    public bool SaveUsbDescriptorsEnabled
+    {
+        get => _saveUsbDescriptorsEnabled;
+        set => this.RaiseAndSetIfChanged(ref _saveUsbDescriptorsEnabled, value);
+    }
+
+    public bool FirewireVisible
+    {
+        get => _firewireVisible;
+        set => this.RaiseAndSetIfChanged(ref _firewireVisible, value);
+    }
+
+    public string FirewireVendorId
+    {
+        get => _firewireVendorId;
+        set => this.RaiseAndSetIfChanged(ref _firewireVendorId, value);
+    }
+
+    public string FirewireModelId
+    {
+        get => _firewireModelId;
+        set => this.RaiseAndSetIfChanged(ref _firewireModelId, value);
+    }
+
+    public string FirewireManufacturer
+    {
+        get => _firewireManufacturer;
+        set => this.RaiseAndSetIfChanged(ref _firewireManufacturer, value);
+    }
+
+    public string FirewireModel
+    {
+        get => _firewireModel;
+        set => this.RaiseAndSetIfChanged(ref _firewireModel, value);
+    }
+
+    public string FirewireGuid
+    {
+        get => _firewireGuid;
+        set => this.RaiseAndSetIfChanged(ref _firewireGuid, value);
+    }
+
+    public bool PlextorVisible
+    {
+        get => _plextorVisible;
+        set => this.RaiseAndSetIfChanged(ref _plextorVisible, value);
+    }
+
+    public bool PlextorEepromVisible
+    {
+        get => _plextorEepromVisible;
+        set => this.RaiseAndSetIfChanged(ref _plextorEepromVisible, value);
+    }
+
+    public string PlextorDiscs
+    {
+        get => _plextorDiscs;
+        set => this.RaiseAndSetIfChanged(ref _plextorDiscs, value);
+    }
+
+    public string PlextorCdReadTime
+    {
+        get => _plextorCdReadTime;
+        set => this.RaiseAndSetIfChanged(ref _plextorCdReadTime, value);
+    }
+
+    public string PlextorCdWriteTime
+    {
+        get => _plextorCdWriteTime;
+        set => this.RaiseAndSetIfChanged(ref _plextorCdWriteTime, value);
+    }
+
+    public bool PlextorDvdTimesVisible
+    {
+        get => _plextorDvdTimesVisible;
+        set => this.RaiseAndSetIfChanged(ref _plextorDvdTimesVisible, value);
+    }
+
+    public string PlextorDvdReadTime
+    {
+        get => _plextorDvdReadTime;
+        set => this.RaiseAndSetIfChanged(ref _plextorDvdReadTime, value);
+    }
+
+    public string PlextorDvdWriteTime
+    {
+        get => _plextorDvdWriteTime;
+        set => this.RaiseAndSetIfChanged(ref _plextorDvdWriteTime, value);
+    }
+
+    public bool PlextorPoweRec
+    {
+        get => _plextorPoweRec;
+        set => this.RaiseAndSetIfChanged(ref _plextorPoweRec, value);
+    }
+
+    public bool PlextorPoweRecEnabled
+    {
+        get => _plextorPoweRecEnabled;
+        set => this.RaiseAndSetIfChanged(ref _plextorPoweRecEnabled, value);
+    }
+
+    public bool PlextorPoweRecRecommendedVisible
+    {
+        get => _plextorPoweRecRecommendedVisible;
+        set => this.RaiseAndSetIfChanged(ref _plextorPoweRecRecommendedVisible, value);
+    }
+
+    public string PlextorPoweRecRecommended
+    {
+        get => _plextorPoweRecRecommended;
+        set => this.RaiseAndSetIfChanged(ref _plextorPoweRecRecommended, value);
+    }
+
+    public bool PlextorPoweRecSelectedVisible
+    {
+        get => _plextorPoweRecSelectedVisible;
+        set => this.RaiseAndSetIfChanged(ref _plextorPoweRecSelectedVisible, value);
+    }
+
+    public string PlextorPoweRecSelected
+    {
+        get => _plextorPoweRecSelected;
+        set => this.RaiseAndSetIfChanged(ref _plextorPoweRecSelected, value);
+    }
+
+    public bool PlextorPoweRecMaxVisible
+    {
+        get => _plextorPoweRecMaxVisible;
+        set => this.RaiseAndSetIfChanged(ref _plextorPoweRecMaxVisible, value);
+    }
+
+    public string PlextorPoweRecMax
+    {
+        get => _plextorPoweRecMax;
+        set => this.RaiseAndSetIfChanged(ref _plextorPoweRecMax, value);
+    }
+
+    public bool PlextorPoweRecLastVisible
+    {
+        get => _plextorPoweRecLastVisible;
+        set => this.RaiseAndSetIfChanged(ref _plextorPoweRecLastVisible, value);
+    }
+
+    public string PlextorPoweRecLast
+    {
+        get => _plextorPoweRecLast;
+        set => this.RaiseAndSetIfChanged(ref _plextorPoweRecLast, value);
+    }
+
+    public bool PlextorSilentMode
+    {
+        get => _plextorSilentMode;
+        set => this.RaiseAndSetIfChanged(ref _plextorSilentMode, value);
+    }
+
+    public bool PlextorSilentModeEnabled
+    {
+        get => _plextorSilentModeEnabled;
+        set => this.RaiseAndSetIfChanged(ref _plextorSilentModeEnabled, value);
+    }
+
+    public string PlextorSilentModeAccessTime
+    {
+        get => _plextorSilentModeAccessTime;
+        set => this.RaiseAndSetIfChanged(ref _plextorSilentModeAccessTime, value);
+    }
+
+    public string PlextorSilentModeCdReadSpeedLimit
+    {
+        get => _plextorSilentModeCdReadSpeedLimit;
+        set => this.RaiseAndSetIfChanged(ref _plextorSilentModeCdReadSpeedLimit, value);
+    }
+
+    public string PlextorSilentModeCdWriteSpeedLimit
+    {
+        get => _plextorSilentModeCdWriteSpeedLimit;
+        set => this.RaiseAndSetIfChanged(ref _plextorSilentModeCdWriteSpeedLimit, value);
+    }
+
+    public bool PlextorSilentModeDvdReadSpeedLimitVisible
+    {
+        get => _plextorSilentModeDvdReadSpeedLimitVisible;
+        set => this.RaiseAndSetIfChanged(ref _plextorSilentModeDvdReadSpeedLimitVisible, value);
+    }
+
+    public string PlextorSilentModeDvdReadSpeedLimit
+    {
+        get => _plextorSilentModeDvdReadSpeedLimit;
+        set => this.RaiseAndSetIfChanged(ref _plextorSilentModeDvdReadSpeedLimit, value);
+    }
+
+    public bool PlextorGigaRec
+    {
+        get => _plextorGigaRec;
+        set => this.RaiseAndSetIfChanged(ref _plextorGigaRec, value);
+    }
+
+    public bool PlextorSecuRec
+    {
+        get => _plextorSecuRec;
+        set => this.RaiseAndSetIfChanged(ref _plextorSecuRec, value);
+    }
+
+    public bool PlextorSpeedRead
+    {
+        get => _plextorSpeedRead;
+        set => this.RaiseAndSetIfChanged(ref _plextorSpeedRead, value);
+    }
+
+    public bool PlextorSpeedEnabled
+    {
+        get => _plextorSpeedEnabled;
+        set => this.RaiseAndSetIfChanged(ref _plextorSpeedEnabled, value);
+    }
+
+    public bool PlextorHiding
+    {
+        get => _plextorHiding;
+        set => this.RaiseAndSetIfChanged(ref _plextorHiding, value);
+    }
+
+    public bool PlextorHidesRecordables
+    {
+        get => _plextorHidesRecordables;
+        set => this.RaiseAndSetIfChanged(ref _plextorHidesRecordables, value);
+    }
+
+    public bool PlextorHidesSessions
+    {
+        get => _plextorHidesSessions;
+        set => this.RaiseAndSetIfChanged(ref _plextorHidesSessions, value);
+    }
+
+    public bool PlextorVariRec
+    {
+        get => _plextorVariRec;
+        set => this.RaiseAndSetIfChanged(ref _plextorVariRec, value);
+    }
+
+    public string PlextorDvd
+    {
+        get => _plextorDvd;
+        set => this.RaiseAndSetIfChanged(ref _plextorDvd, value);
+    }
+
+    public bool PlextorVariRecDvd
+    {
+        get => _plextorVariRecDvd;
+        set => this.RaiseAndSetIfChanged(ref _plextorVariRecDvd, value);
+    }
+
+    public bool PlextorBitSetting
+    {
+        get => _plextorBitSetting;
+        set => this.RaiseAndSetIfChanged(ref _plextorBitSetting, value);
+    }
+
+    public bool PlextorBitSettingDl
+    {
+        get => _plextorBitSettingDl;
+        set => this.RaiseAndSetIfChanged(ref _plextorBitSettingDl, value);
+    }
+
+    public bool PlextorDvdPlusWriteTest
+    {
+        get => _plextorDvdPlusWriteTest;
+        set => this.RaiseAndSetIfChanged(ref _plextorDvdPlusWriteTest, value);
+    }
+
+    public bool Kreon
+    {
+        get => _kreon;
+        set => this.RaiseAndSetIfChanged(ref _kreon, value);
+    }
+
+    public bool KreonChallengeResponse
+    {
+        get => _kreonChallengeResponse;
+        set => this.RaiseAndSetIfChanged(ref _kreonChallengeResponse, value);
+    }
+
+    public bool KreonDecryptSs
+    {
+        get => _kreonDecryptSs;
+        set => this.RaiseAndSetIfChanged(ref _kreonDecryptSs, value);
+    }
+
+    public bool KreonXtremeUnlock
+    {
+        get => _kreonXtremeUnlock;
+        set => this.RaiseAndSetIfChanged(ref _kreonXtremeUnlock, value);
+    }
+
+    public bool KreonWxripperUnlock
+    {
+        get => _kreonWxripperUnlock;
+        set => this.RaiseAndSetIfChanged(ref _kreonWxripperUnlock, value);
+    }
+
+    public bool KreonChallengeResponse360
+    {
+        get => _kreonChallengeResponse360;
+        set => this.RaiseAndSetIfChanged(ref _kreonChallengeResponse360, value);
+    }
+
+    public bool KreonDecryptSs360
+    {
+        get => _kreonDecryptSs360;
+        set => this.RaiseAndSetIfChanged(ref _kreonDecryptSs360, value);
+    }
+
+    public bool KreonXtremeUnlock360
+    {
+        get => _kreonXtremeUnlock360;
+        set => this.RaiseAndSetIfChanged(ref _kreonXtremeUnlock360, value);
+    }
+
+    public bool KreonWxripperUnlock360
+    {
+        get => _kreonWxripperUnlock360;
+        set => this.RaiseAndSetIfChanged(ref _kreonWxripperUnlock360, value);
+    }
+
+    public bool KreonLock
+    {
+        get => _kreonLock;
+        set => this.RaiseAndSetIfChanged(ref _kreonLock, value);
+    }
+
+    public bool KreonErrorSkipping
+    {
+        get => _kreonErrorSkipping;
+        set => this.RaiseAndSetIfChanged(ref _kreonErrorSkipping, value);
+    }
+
+    public bool Ssc
+    {
+        get => _ssc;
+        set => this.RaiseAndSetIfChanged(ref _ssc, value);
+    }
+
+    public string BlockLimits
+    {
+        get => _blockLimits;
+        set => this.RaiseAndSetIfChanged(ref _blockLimits, value);
+    }
+
+    public string MinBlockSize
+    {
+        get => _minBlockSize;
+        set => this.RaiseAndSetIfChanged(ref _minBlockSize, value);
+    }
+
+    public string MaxBlockSize
+    {
+        get => _maxBlockSize;
+        set => this.RaiseAndSetIfChanged(ref _maxBlockSize, value);
+    }
+
+    public string BlockSizeGranularity
+    {
+        get => _blockSizeGranularity;
+        set => this.RaiseAndSetIfChanged(ref _blockSizeGranularity, value);
+    }
+
+    public string Densities
+    {
+        get => _densities;
+        set => this.RaiseAndSetIfChanged(ref _densities, value);
+    }
+
+    public string MediumTypes
+    {
+        get => _mediumTypes;
+        set => this.RaiseAndSetIfChanged(ref _mediumTypes, value);
+    }
+
+    public string MediumDensity
+    {
+        get => _mediumDensity;
+        set => this.RaiseAndSetIfChanged(ref _mediumDensity, value);
+    }
+
+    public string SecureDigital
+    {
+        get => _secureDigital;
+        set => this.RaiseAndSetIfChanged(ref _secureDigital, value);
+    }
+
+    public string SdMm
+    {
+        get => _sdMm;
+        set => this.RaiseAndSetIfChanged(ref _sdMm, value);
+    }
+
+    public string Cid
+    {
+        get => _cid;
+        set => this.RaiseAndSetIfChanged(ref _cid, value);
+    }
+
+    public string Csd
+    {
+        get => _csd;
+        set => this.RaiseAndSetIfChanged(ref _csd, value);
+    }
+
+    public string Ocr
+    {
+        get => _ocr;
+        set => this.RaiseAndSetIfChanged(ref _ocr, value);
+    }
+
+    public string ExtendedCsd
+    {
+        get => _extendedCsd;
+        set => this.RaiseAndSetIfChanged(ref _extendedCsd, value);
+    }
+
+    public string Scr
+    {
+        get => _scr;
+        set => this.RaiseAndSetIfChanged(ref _scr, value);
+    }
+
+    public PcmciaInfo PcmciaInfo
+    {
+        get => _pcmciaInfo;
+        set => this.RaiseAndSetIfChanged(ref _pcmciaInfo, value);
+    }
+
+    public ScsiInfo ScsiInfo
+    {
+        get => _scsiInfo;
+        set => this.RaiseAndSetIfChanged(ref _scsiInfo, value);
+    }
+
+    public AtaInfo AtaInfo
+    {
+        get => _ataInfo;
+        set => this.RaiseAndSetIfChanged(ref _ataInfo, value);
+    }
+
+    public SdMmcInfo SdMmcInfo
+    {
+        get => _sdMmcInfo;
+        set => this.RaiseAndSetIfChanged(ref _sdMmcInfo, value);
+    }
+
+    async void ExecuteSaveUsbDescriptorsCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_devInfo.UsbDescriptors, 0, _devInfo.UsbDescriptors.Length);
+
+        saveFs.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs b/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs
index dddb30513..32e9c4112 100644
--- a/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/FileSystemViewModel.cs
@@ -33,71 +33,70 @@
 using JetBrains.Annotations;
 using Schemas;
 
-namespace Aaru.Gui.ViewModels.Panels
+namespace Aaru.Gui.ViewModels.Panels;
+
+public sealed class FileSystemViewModel
 {
-    public sealed class FileSystemViewModel
+    public FileSystemViewModel([NotNull] FileSystemType xmlFsType, string information)
     {
-        public FileSystemViewModel([NotNull] FileSystemType xmlFsType, string information)
-        {
-            TypeText                   = $"Filesystem type: {xmlFsType.Type}";
-            VolumeNameText             = $"Volume name: {xmlFsType.VolumeName}";
-            SerialNumberText           = $"Serial number: {xmlFsType.VolumeSerial}";
-            ApplicationIdentifierText  = $"Application identifier: {xmlFsType.ApplicationIdentifier}";
-            SystemIdentifierText       = $"System identifier: {xmlFsType.SystemIdentifier}";
-            VolumeSetIdentifierText    = $"Volume set identifier: {xmlFsType.VolumeSetIdentifier}";
-            DataPreparerIdentifierText = $"Data preparer identifier: {xmlFsType.DataPreparerIdentifier}";
-            PublisherIdentifierText    = $"Publisher identifier: {xmlFsType.PublisherIdentifier}";
-            CreationDateText           = $"Volume created on {xmlFsType.CreationDate:F}";
-            EffectiveDateText          = $"Volume effective from {xmlFsType.EffectiveDate:F}";
-            ModificationDateText       = $"Volume last modified on {xmlFsType.ModificationDate:F}";
-            ExpirationDateText         = $"Volume expired on {xmlFsType.ExpirationDate:F}";
-            BackupDateText             = $"Volume last backed up on {xmlFsType.BackupDate:F}";
+        TypeText                   = $"Filesystem type: {xmlFsType.Type}";
+        VolumeNameText             = $"Volume name: {xmlFsType.VolumeName}";
+        SerialNumberText           = $"Serial number: {xmlFsType.VolumeSerial}";
+        ApplicationIdentifierText  = $"Application identifier: {xmlFsType.ApplicationIdentifier}";
+        SystemIdentifierText       = $"System identifier: {xmlFsType.SystemIdentifier}";
+        VolumeSetIdentifierText    = $"Volume set identifier: {xmlFsType.VolumeSetIdentifier}";
+        DataPreparerIdentifierText = $"Data preparer identifier: {xmlFsType.DataPreparerIdentifier}";
+        PublisherIdentifierText    = $"Publisher identifier: {xmlFsType.PublisherIdentifier}";
+        CreationDateText           = $"Volume created on {xmlFsType.CreationDate:F}";
+        EffectiveDateText          = $"Volume effective from {xmlFsType.EffectiveDate:F}";
+        ModificationDateText       = $"Volume last modified on {xmlFsType.ModificationDate:F}";
+        ExpirationDateText         = $"Volume expired on {xmlFsType.ExpirationDate:F}";
+        BackupDateText             = $"Volume last backed up on {xmlFsType.BackupDate:F}";
 
-            ClustersText =
-                $"Volume has {xmlFsType.Clusters} clusters of {xmlFsType.ClusterSize} bytes each (total of {xmlFsType.Clusters * xmlFsType.ClusterSize} bytes)";
+        ClustersText =
+            $"Volume has {xmlFsType.Clusters} clusters of {xmlFsType.ClusterSize} bytes each (total of {xmlFsType.Clusters * xmlFsType.ClusterSize} bytes)";
 
-            FreeClustersText =
-                $"Volume has {xmlFsType.FreeClusters} clusters free ({xmlFsType.FreeClusters / xmlFsType.Clusters:P})";
+        FreeClustersText =
+            $"Volume has {xmlFsType.FreeClusters} clusters free ({xmlFsType.FreeClusters / xmlFsType.Clusters:P})";
 
-            FilesText       = $"Volume contains {xmlFsType.Files} files";
-            BootableChecked = xmlFsType.Bootable;
-            DirtyChecked    = xmlFsType.Dirty;
-            InformationText = information;
+        FilesText       = $"Volume contains {xmlFsType.Files} files";
+        BootableChecked = xmlFsType.Bootable;
+        DirtyChecked    = xmlFsType.Dirty;
+        InformationText = information;
 
-            CreationDateVisible     = xmlFsType.CreationDateSpecified;
-            EffectiveDateVisible    = xmlFsType.EffectiveDateSpecified;
-            ModificationDateVisible = xmlFsType.ModificationDateSpecified;
-            ExpirationDateVisible   = xmlFsType.ExpirationDateSpecified;
-            BackupDateVisible       = xmlFsType.BackupDateSpecified;
-            FreeClustersVisible     = xmlFsType.FreeClustersSpecified;
-            FilesVisible            = xmlFsType.FilesSpecified;
-        }
-
-        public string TypeText                   { get; }
-        public string VolumeNameText             { get; }
-        public string SerialNumberText           { get; }
-        public string ApplicationIdentifierText  { get; }
-        public string SystemIdentifierText       { get; }
-        public string VolumeSetIdentifierText    { get; }
-        public string DataPreparerIdentifierText { get; }
-        public string PublisherIdentifierText    { get; }
-        public string CreationDateText           { get; }
-        public string EffectiveDateText          { get; }
-        public string ModificationDateText       { get; }
-        public string ExpirationDateText         { get; }
-        public string BackupDateText             { get; }
-        public string ClustersText               { get; }
-        public string FreeClustersText           { get; }
-        public string FilesText                  { get; }
-        public bool   BootableChecked            { get; }
-        public bool   DirtyChecked               { get; }
-        public string InformationText            { get; }
-        public bool   CreationDateVisible        { get; }
-        public bool   EffectiveDateVisible       { get; }
-        public bool   ModificationDateVisible    { get; }
-        public bool   ExpirationDateVisible      { get; }
-        public bool   BackupDateVisible          { get; }
-        public bool   FreeClustersVisible        { get; }
-        public bool   FilesVisible               { get; }
+        CreationDateVisible     = xmlFsType.CreationDateSpecified;
+        EffectiveDateVisible    = xmlFsType.EffectiveDateSpecified;
+        ModificationDateVisible = xmlFsType.ModificationDateSpecified;
+        ExpirationDateVisible   = xmlFsType.ExpirationDateSpecified;
+        BackupDateVisible       = xmlFsType.BackupDateSpecified;
+        FreeClustersVisible     = xmlFsType.FreeClustersSpecified;
+        FilesVisible            = xmlFsType.FilesSpecified;
     }
+
+    public string TypeText                   { get; }
+    public string VolumeNameText             { get; }
+    public string SerialNumberText           { get; }
+    public string ApplicationIdentifierText  { get; }
+    public string SystemIdentifierText       { get; }
+    public string VolumeSetIdentifierText    { get; }
+    public string DataPreparerIdentifierText { get; }
+    public string PublisherIdentifierText    { get; }
+    public string CreationDateText           { get; }
+    public string EffectiveDateText          { get; }
+    public string ModificationDateText       { get; }
+    public string ExpirationDateText         { get; }
+    public string BackupDateText             { get; }
+    public string ClustersText               { get; }
+    public string FreeClustersText           { get; }
+    public string FilesText                  { get; }
+    public bool   BootableChecked            { get; }
+    public bool   DirtyChecked               { get; }
+    public string InformationText            { get; }
+    public bool   CreationDateVisible        { get; }
+    public bool   EffectiveDateVisible       { get; }
+    public bool   ModificationDateVisible    { get; }
+    public bool   ExpirationDateVisible      { get; }
+    public bool   BackupDateVisible          { get; }
+    public bool   FreeClustersVisible        { get; }
+    public bool   FilesVisible               { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
index 050c71bc2..74e12497d 100644
--- a/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/ImageInfoViewModel.cs
@@ -58,796 +58,795 @@ using Schemas;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 using Session = Aaru.CommonTypes.Structs.Session;
 
-namespace Aaru.Gui.ViewModels.Panels
+namespace Aaru.Gui.ViewModels.Panels;
+
+public sealed class ImageInfoViewModel : ViewModelBase
 {
-    public sealed class ImageInfoViewModel : ViewModelBase
+    readonly IFilter     _filter;
+    readonly IMediaImage _imageFormat;
+    readonly string      _imagePath;
+    DecodeMediaTags      _decodeMediaTags;
+    ImageChecksum        _imageChecksum;
+    ImageConvert         _imageConvert;
+    ImageEntropy         _imageEntropy;
+    ImageSidecar         _imageSidecar;
+    ImageVerify          _imageVerify;
+    ViewSector           _viewSector;
+
+    public ImageInfoViewModel(string imagePath, IFilter filter, IMediaImage imageFormat, Window view)
+
     {
-        readonly IFilter     _filter;
-        readonly IMediaImage _imageFormat;
-        readonly string      _imagePath;
-        DecodeMediaTags      _decodeMediaTags;
-        ImageChecksum        _imageChecksum;
-        ImageConvert         _imageConvert;
-        ImageEntropy         _imageEntropy;
-        ImageSidecar         _imageSidecar;
-        ImageVerify          _imageVerify;
-        ViewSector           _viewSector;
+        _imagePath   = imagePath;
+        _filter      = filter;
+        _imageFormat = imageFormat;
+        IAssetLoader assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
+        MediaTagsList         = new ObservableCollection<string>();
+        SectorTagsList        = new ObservableCollection<string>();
+        Sessions              = new ObservableCollection<Session>();
+        Tracks                = new ObservableCollection<Track>();
+        DumpHardwareList      = new ObservableCollection<DumpHardwareModel>();
+        EntropyCommand        = ReactiveCommand.Create(ExecuteEntropyCommand);
+        VerifyCommand         = ReactiveCommand.Create(ExecuteVerifyCommand);
+        ChecksumCommand       = ReactiveCommand.Create(ExecuteChecksumCommand);
+        ConvertCommand        = ReactiveCommand.Create(ExecuteConvertCommand);
+        CreateSidecarCommand  = ReactiveCommand.Create(ExecuteCreateSidecarCommand);
+        ViewSectorsCommand    = ReactiveCommand.Create(ExecuteViewSectorsCommand);
+        DecodeMediaTagCommand = ReactiveCommand.Create(ExecuteDecodeMediaTagCommand);
 
-        public ImageInfoViewModel(string imagePath, IFilter filter, IMediaImage imageFormat, Window view)
+        var genericHddIcon =
+            new Bitmap(assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-harddisk.png")));
 
+        var genericOpticalIcon =
+            new Bitmap(assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-optical.png")));
+
+        var genericFolderIcon =
+            new Bitmap(assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/inode-directory.png")));
+
+        var mediaResource = new Uri($"avares://Aaru.Gui/Assets/Logos/Media/{imageFormat.Info.MediaType}.png");
+
+        MediaLogo = assets.Exists(mediaResource)
+                        ? new Bitmap(assets.Open(mediaResource))
+                        : imageFormat.Info.XmlMediaType == XmlMediaType.BlockMedia
+                            ? genericHddIcon
+                            : imageFormat.Info.XmlMediaType == XmlMediaType.OpticalDisc
+                                ? genericOpticalIcon
+                                : genericFolderIcon;
+
+        ImagePathText       = $"Path: {imagePath}";
+        FilterText          = $"Filter: {filter.Name}";
+        ImageIdentifiedText = $"Image format identified by {imageFormat.Name} ({imageFormat.Id}).";
+
+        ImageFormatText = !string.IsNullOrWhiteSpace(imageFormat.Info.Version)
+                              ? $"Format: {imageFormat.Format} version {imageFormat.Info.Version}"
+                              : $"Format: {imageFormat.Format}";
+
+        ImageSizeText = $"Image without headers is {imageFormat.Info.ImageSize} bytes long";
+
+        SectorsText =
+            $"Contains a media of {imageFormat.Info.Sectors} sectors with a maximum sector size of {imageFormat.Info.SectorSize} bytes (if all sectors are of the same size this would be {imageFormat.Info.Sectors * imageFormat.Info.SectorSize} bytes)";
+
+        MediaTypeText =
+            $"Contains a media of type {imageFormat.Info.MediaType} and XML type {imageFormat.Info.XmlMediaType}";
+
+        HasPartitionsText = $"{(imageFormat.Info.HasPartitions ? "Has" : "Doesn't have")} partitions";
+        HasSessionsText   = $"{(imageFormat.Info.HasSessions ? "Has" : "Doesn't have")} sessions";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.Application))
+            ApplicationText = !string.IsNullOrWhiteSpace(imageFormat.Info.ApplicationVersion)
+                                  ? $"Was created with {imageFormat.Info.Application} version {imageFormat.Info.ApplicationVersion}"
+                                  : $"Was created with {imageFormat.Info.Application}";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.Creator))
+            CreatorText = $"Created by: {imageFormat.Info.Creator}";
+
+        if(imageFormat.Info.CreationTime != DateTime.MinValue)
+            CreationTimeText = $"Created on {imageFormat.Info.CreationTime}";
+
+        if(imageFormat.Info.LastModificationTime != DateTime.MinValue)
+            LastModificationTimeText = $"Last modified on {imageFormat.Info.LastModificationTime}";
+
+        if(imageFormat.Info.MediaSequence     != 0 &&
+           imageFormat.Info.LastMediaSequence != 0)
+            MediaSequenceText =
+                $"Media is number {imageFormat.Info.MediaSequence} on a set of {imageFormat.Info.LastMediaSequence} medias";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaTitle))
+            MediaTitleText = $"Media title: {imageFormat.Info.MediaTitle}";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaManufacturer))
+            MediaManufacturerText = $"Media manufacturer: {imageFormat.Info.MediaManufacturer}";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaModel))
+            MediaModelText = $"Media model: {imageFormat.Info.MediaModel}";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaSerialNumber))
+            MediaSerialNumberText = $"Media serial number: {imageFormat.Info.MediaSerialNumber}";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaBarcode))
+            MediaBarcodeText = $"Media barcode: {imageFormat.Info.MediaBarcode}";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaPartNumber))
+            MediaPartNumberText = $"Media part number: {imageFormat.Info.MediaPartNumber}";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveManufacturer))
+            DriveManufacturerText = $"Drive manufacturer: {imageFormat.Info.DriveManufacturer}";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveModel))
+            DriveModelText = $"Drive model: {imageFormat.Info.DriveModel}";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveSerialNumber))
+            DriveSerialNumberText = $"Drive serial number: {imageFormat.Info.DriveSerialNumber}";
+
+        if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveFirmwareRevision))
+            DriveFirmwareRevisionText = $"Drive firmware info: {imageFormat.Info.DriveFirmwareRevision}";
+
+        if(imageFormat.Info.Cylinders       > 0                         &&
+           imageFormat.Info.Heads           > 0                         &&
+           imageFormat.Info.SectorsPerTrack > 0                         &&
+           imageFormat.Info.XmlMediaType    != XmlMediaType.OpticalDisc &&
+           (!(imageFormat is ITapeImage tapeImage) || !tapeImage.IsTape))
+            MediaGeometryText =
+                $"Media geometry: {imageFormat.Info.Cylinders} cylinders, {imageFormat.Info.Heads} heads, {imageFormat.Info.SectorsPerTrack} sectors per track";
+
+        if(imageFormat.Info.ReadableMediaTags       != null &&
+           imageFormat.Info.ReadableMediaTags.Count > 0)
+            foreach(MediaTagType tag in imageFormat.Info.ReadableMediaTags.OrderBy(t => t))
+                MediaTagsList.Add(tag.ToString());
+
+        if(imageFormat.Info.ReadableSectorTags       != null &&
+           imageFormat.Info.ReadableSectorTags.Count > 0)
+            foreach(SectorTagType tag in imageFormat.Info.ReadableSectorTags.OrderBy(t => t))
+                SectorTagsList.Add(tag.ToString());
+
+        PeripheralDeviceTypes scsiDeviceType  = PeripheralDeviceTypes.DirectAccess;
+        byte[]                scsiInquiryData = null;
+        Inquiry?              scsiInquiry     = null;
+        Modes.DecodedMode?    scsiMode        = null;
+        byte[]                scsiModeSense6  = null;
+        byte[]                scsiModeSense10 = null;
+        ErrorNumber           errno;
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SCSI_INQUIRY) == true)
         {
-            _imagePath   = imagePath;
-            _filter      = filter;
-            _imageFormat = imageFormat;
-            IAssetLoader assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
-            MediaTagsList         = new ObservableCollection<string>();
-            SectorTagsList        = new ObservableCollection<string>();
-            Sessions              = new ObservableCollection<Session>();
-            Tracks                = new ObservableCollection<Track>();
-            DumpHardwareList      = new ObservableCollection<DumpHardwareModel>();
-            EntropyCommand        = ReactiveCommand.Create(ExecuteEntropyCommand);
-            VerifyCommand         = ReactiveCommand.Create(ExecuteVerifyCommand);
-            ChecksumCommand       = ReactiveCommand.Create(ExecuteChecksumCommand);
-            ConvertCommand        = ReactiveCommand.Create(ExecuteConvertCommand);
-            CreateSidecarCommand  = ReactiveCommand.Create(ExecuteCreateSidecarCommand);
-            ViewSectorsCommand    = ReactiveCommand.Create(ExecuteViewSectorsCommand);
-            DecodeMediaTagCommand = ReactiveCommand.Create(ExecuteDecodeMediaTagCommand);
-
-            var genericHddIcon =
-                new Bitmap(assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-harddisk.png")));
-
-            var genericOpticalIcon =
-                new Bitmap(assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-optical.png")));
-
-            var genericFolderIcon =
-                new Bitmap(assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/inode-directory.png")));
-
-            var mediaResource = new Uri($"avares://Aaru.Gui/Assets/Logos/Media/{imageFormat.Info.MediaType}.png");
-
-            MediaLogo = assets.Exists(mediaResource)
-                            ? new Bitmap(assets.Open(mediaResource))
-                            : imageFormat.Info.XmlMediaType == XmlMediaType.BlockMedia
-                                ? genericHddIcon
-                                : imageFormat.Info.XmlMediaType == XmlMediaType.OpticalDisc
-                                    ? genericOpticalIcon
-                                    : genericFolderIcon;
-
-            ImagePathText       = $"Path: {imagePath}";
-            FilterText          = $"Filter: {filter.Name}";
-            ImageIdentifiedText = $"Image format identified by {imageFormat.Name} ({imageFormat.Id}).";
-
-            ImageFormatText = !string.IsNullOrWhiteSpace(imageFormat.Info.Version)
-                                  ? $"Format: {imageFormat.Format} version {imageFormat.Info.Version}"
-                                  : $"Format: {imageFormat.Format}";
-
-            ImageSizeText = $"Image without headers is {imageFormat.Info.ImageSize} bytes long";
-
-            SectorsText =
-                $"Contains a media of {imageFormat.Info.Sectors} sectors with a maximum sector size of {imageFormat.Info.SectorSize} bytes (if all sectors are of the same size this would be {imageFormat.Info.Sectors * imageFormat.Info.SectorSize} bytes)";
-
-            MediaTypeText =
-                $"Contains a media of type {imageFormat.Info.MediaType} and XML type {imageFormat.Info.XmlMediaType}";
-
-            HasPartitionsText = $"{(imageFormat.Info.HasPartitions ? "Has" : "Doesn't have")} partitions";
-            HasSessionsText   = $"{(imageFormat.Info.HasSessions ? "Has" : "Doesn't have")} sessions";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.Application))
-                ApplicationText = !string.IsNullOrWhiteSpace(imageFormat.Info.ApplicationVersion)
-                                      ? $"Was created with {imageFormat.Info.Application} version {imageFormat.Info.ApplicationVersion}"
-                                      : $"Was created with {imageFormat.Info.Application}";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.Creator))
-                CreatorText = $"Created by: {imageFormat.Info.Creator}";
-
-            if(imageFormat.Info.CreationTime != DateTime.MinValue)
-                CreationTimeText = $"Created on {imageFormat.Info.CreationTime}";
-
-            if(imageFormat.Info.LastModificationTime != DateTime.MinValue)
-                LastModificationTimeText = $"Last modified on {imageFormat.Info.LastModificationTime}";
-
-            if(imageFormat.Info.MediaSequence     != 0 &&
-               imageFormat.Info.LastMediaSequence != 0)
-                MediaSequenceText =
-                    $"Media is number {imageFormat.Info.MediaSequence} on a set of {imageFormat.Info.LastMediaSequence} medias";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaTitle))
-                MediaTitleText = $"Media title: {imageFormat.Info.MediaTitle}";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaManufacturer))
-                MediaManufacturerText = $"Media manufacturer: {imageFormat.Info.MediaManufacturer}";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaModel))
-                MediaModelText = $"Media model: {imageFormat.Info.MediaModel}";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaSerialNumber))
-                MediaSerialNumberText = $"Media serial number: {imageFormat.Info.MediaSerialNumber}";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaBarcode))
-                MediaBarcodeText = $"Media barcode: {imageFormat.Info.MediaBarcode}";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.MediaPartNumber))
-                MediaPartNumberText = $"Media part number: {imageFormat.Info.MediaPartNumber}";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveManufacturer))
-                DriveManufacturerText = $"Drive manufacturer: {imageFormat.Info.DriveManufacturer}";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveModel))
-                DriveModelText = $"Drive model: {imageFormat.Info.DriveModel}";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveSerialNumber))
-                DriveSerialNumberText = $"Drive serial number: {imageFormat.Info.DriveSerialNumber}";
-
-            if(!string.IsNullOrWhiteSpace(imageFormat.Info.DriveFirmwareRevision))
-                DriveFirmwareRevisionText = $"Drive firmware info: {imageFormat.Info.DriveFirmwareRevision}";
-
-            if(imageFormat.Info.Cylinders       > 0                         &&
-               imageFormat.Info.Heads           > 0                         &&
-               imageFormat.Info.SectorsPerTrack > 0                         &&
-               imageFormat.Info.XmlMediaType    != XmlMediaType.OpticalDisc &&
-               (!(imageFormat is ITapeImage tapeImage) || !tapeImage.IsTape))
-                MediaGeometryText =
-                    $"Media geometry: {imageFormat.Info.Cylinders} cylinders, {imageFormat.Info.Heads} heads, {imageFormat.Info.SectorsPerTrack} sectors per track";
-
-            if(imageFormat.Info.ReadableMediaTags       != null &&
-               imageFormat.Info.ReadableMediaTags.Count > 0)
-                foreach(MediaTagType tag in imageFormat.Info.ReadableMediaTags.OrderBy(t => t))
-                    MediaTagsList.Add(tag.ToString());
-
-            if(imageFormat.Info.ReadableSectorTags       != null &&
-               imageFormat.Info.ReadableSectorTags.Count > 0)
-                foreach(SectorTagType tag in imageFormat.Info.ReadableSectorTags.OrderBy(t => t))
-                    SectorTagsList.Add(tag.ToString());
-
-            PeripheralDeviceTypes scsiDeviceType  = PeripheralDeviceTypes.DirectAccess;
-            byte[]                scsiInquiryData = null;
-            Inquiry?              scsiInquiry     = null;
-            Modes.DecodedMode?    scsiMode        = null;
-            byte[]                scsiModeSense6  = null;
-            byte[]                scsiModeSense10 = null;
-            ErrorNumber           errno;
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SCSI_INQUIRY) == true)
-            {
-                errno = imageFormat.ReadMediaTag(MediaTagType.SCSI_INQUIRY, out scsiInquiryData);
-
-                if(errno == ErrorNumber.NoError)
-                {
-                    scsiDeviceType = (PeripheralDeviceTypes)(scsiInquiryData[0] & 0x1F);
-
-                    scsiInquiry = Inquiry.Decode(scsiInquiryData);
-                }
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SCSI_MODESENSE_6) == true)
-            {
-                errno = imageFormat.ReadMediaTag(MediaTagType.SCSI_MODESENSE_6, out scsiModeSense6);
-
-                if(errno == ErrorNumber.NoError)
-                    scsiMode = Modes.DecodeMode6(scsiModeSense6, scsiDeviceType);
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SCSI_MODESENSE_10) == true)
-            {
-                errno = imageFormat.ReadMediaTag(MediaTagType.SCSI_MODESENSE_10, out scsiModeSense10);
-
-                if(errno == ErrorNumber.NoError)
-                    scsiMode = Modes.DecodeMode10(scsiModeSense10, scsiDeviceType);
-            }
-
-            ScsiInfo = new ScsiInfo
-            {
-                DataContext = new ScsiInfoViewModel(scsiInquiryData, scsiInquiry, null, scsiMode, scsiDeviceType,
-                                                    scsiModeSense6, scsiModeSense10, null, view)
-            };
-
-            byte[] ataIdentify   = null;
-            byte[] atapiIdentify = null;
-            errno = ErrorNumber.NoData;
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.ATA_IDENTIFY) == true)
-                errno = imageFormat.ReadMediaTag(MediaTagType.ATA_IDENTIFY, out ataIdentify);
-
-            else if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.ATAPI_IDENTIFY) == true)
-                errno = imageFormat.ReadMediaTag(MediaTagType.ATAPI_IDENTIFY, out atapiIdentify);
+            errno = imageFormat.ReadMediaTag(MediaTagType.SCSI_INQUIRY, out scsiInquiryData);
 
             if(errno == ErrorNumber.NoError)
-                AtaInfo = new AtaInfo
-                {
-                    DataContext = new AtaInfoViewModel(ataIdentify, atapiIdentify, null, view)
-                };
-
-            byte[]                 toc                  = null;
-            TOC.CDTOC?             decodedToc           = null;
-            byte[]                 fullToc              = null;
-            FullTOC.CDFullTOC?     decodedFullToc       = null;
-            byte[]                 pma                  = null;
-            byte[]                 atip                 = null;
-            ATIP.CDATIP            decodedAtip          = null;
-            byte[]                 cdtext               = null;
-            CDTextOnLeadIn.CDText? decodedCdText        = null;
-            string                 mediaCatalogueNumber = null;
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_TOC) == true)
             {
-                errno = imageFormat.ReadMediaTag(MediaTagType.CD_TOC, out toc);
+                scsiDeviceType = (PeripheralDeviceTypes)(scsiInquiryData[0] & 0x1F);
 
-                if(errno      == ErrorNumber.NoError &&
-                   toc.Length > 0)
-                {
-                    ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(toc, 0));
-
-                    if(dataLen + 2 != toc.Length)
-                    {
-                        byte[] tmp = new byte[toc.Length + 2];
-                        Array.Copy(toc, 0, tmp, 2, toc.Length);
-                        tmp[0] = (byte)((toc.Length & 0xFF00) >> 8);
-                        tmp[1] = (byte)(toc.Length & 0xFF);
-                        toc    = tmp;
-                    }
-
-                    decodedToc = TOC.Decode(toc);
-                }
+                scsiInquiry = Inquiry.Decode(scsiInquiryData);
             }
+        }
 
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_FullTOC) == true)
-            {
-                errno = imageFormat.ReadMediaTag(MediaTagType.CD_FullTOC, out fullToc);
-
-                if(errno          == ErrorNumber.NoError &&
-                   fullToc.Length > 0)
-                {
-                    ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(fullToc, 0));
-
-                    if(dataLen + 2 != fullToc.Length)
-                    {
-                        byte[] tmp = new byte[fullToc.Length + 2];
-                        Array.Copy(fullToc, 0, tmp, 2, fullToc.Length);
-                        tmp[0]  = (byte)((fullToc.Length & 0xFF00) >> 8);
-                        tmp[1]  = (byte)(fullToc.Length & 0xFF);
-                        fullToc = tmp;
-                    }
-
-                    decodedFullToc = FullTOC.Decode(fullToc);
-                }
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_PMA) == true)
-            {
-                errno = imageFormat.ReadMediaTag(MediaTagType.CD_PMA, out pma);
-
-                if(errno      == ErrorNumber.NoError &&
-                   pma.Length > 0)
-                {
-                    ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(pma, 0));
-
-                    if(dataLen + 2 != pma.Length)
-                    {
-                        byte[] tmp = new byte[pma.Length + 2];
-                        Array.Copy(pma, 0, tmp, 2, pma.Length);
-                        tmp[0] = (byte)((pma.Length & 0xFF00) >> 8);
-                        tmp[1] = (byte)(pma.Length & 0xFF);
-                        pma    = tmp;
-                    }
-                }
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_ATIP) == true)
-            {
-                errno = imageFormat.ReadMediaTag(MediaTagType.CD_ATIP, out atip);
-
-                if(errno == ErrorNumber.NoError)
-                {
-                    uint dataLen = Swapping.Swap(BitConverter.ToUInt32(atip, 0));
-
-                    if(dataLen + 4 != atip.Length)
-                    {
-                        byte[] tmp = new byte[atip.Length + 4];
-                        Array.Copy(atip, 0, tmp, 4, atip.Length);
-                        tmp[0] = (byte)((atip.Length & 0xFF000000) >> 24);
-                        tmp[1] = (byte)((atip.Length & 0xFF0000)   >> 16);
-                        tmp[2] = (byte)((atip.Length & 0xFF00)     >> 8);
-                        tmp[3] = (byte)(atip.Length & 0xFF);
-                        atip   = tmp;
-                    }
-
-                    decodedAtip = ATIP.Decode(atip);
-                }
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_TEXT) == true)
-            {
-                errno = imageFormat.ReadMediaTag(MediaTagType.CD_TEXT, out cdtext);
-
-                if(errno == ErrorNumber.NoError)
-                {
-                    uint dataLen = Swapping.Swap(BitConverter.ToUInt32(cdtext, 0));
-
-                    if(dataLen + 4 != cdtext.Length)
-                    {
-                        byte[] tmp = new byte[cdtext.Length + 4];
-                        Array.Copy(cdtext, 0, tmp, 4, cdtext.Length);
-                        tmp[0] = (byte)((cdtext.Length & 0xFF000000) >> 24);
-                        tmp[1] = (byte)((cdtext.Length & 0xFF0000)   >> 16);
-                        tmp[2] = (byte)((cdtext.Length & 0xFF00)     >> 8);
-                        tmp[3] = (byte)(cdtext.Length & 0xFF);
-                        cdtext = tmp;
-                    }
-
-                    decodedCdText = CDTextOnLeadIn.Decode(cdtext);
-                }
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_MCN) == true)
-            {
-                errno = imageFormat.ReadMediaTag(MediaTagType.CD_MCN, out byte[] mcn);
-
-                if(errno == ErrorNumber.NoError)
-                    mediaCatalogueNumber = Encoding.UTF8.GetString(mcn);
-            }
-
-            CompactDiscInfo = new CompactDiscInfo
-            {
-                DataContext = new CompactDiscInfoViewModel(toc, atip, null, null, fullToc, pma, cdtext, decodedToc,
-                                                           decodedAtip, null, decodedFullToc, decodedCdText, null,
-                                                           mediaCatalogueNumber, null, view)
-            };
-
-            byte[]                         dvdPfi                    = null;
-            byte[]                         dvdDmi                    = null;
-            byte[]                         dvdCmi                    = null;
-            byte[]                         hddvdCopyrightInformation = null;
-            byte[]                         dvdBca                    = null;
-            PFI.PhysicalFormatInformation? decodedPfi                = null;
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVD_PFI) == true)
-            {
-                errno = imageFormat.ReadMediaTag(MediaTagType.DVD_PFI, out dvdPfi);
-
-                if(errno == ErrorNumber.NoError)
-                    decodedPfi = PFI.Decode(dvdPfi, imageFormat.Info.MediaType);
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVD_DMI) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVD_DMI, out dvdDmi);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVD_CMI) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVD_CMI, out dvdCmi);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.HDDVD_CPI) == true)
-                imageFormat.ReadMediaTag(MediaTagType.HDDVD_CPI, out hddvdCopyrightInformation);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVD_BCA) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVD_BCA, out dvdBca);
-
-            DvdInfo = new DvdInfo
-            {
-                DataContext = new DvdInfoViewModel(imageFormat.Info.MediaType, dvdPfi, dvdDmi, dvdCmi,
-                                                   hddvdCopyrightInformation, dvdBca, null, decodedPfi, view)
-            };
-
-            byte[] dvdRamDds                     = null;
-            byte[] dvdRamCartridgeStatus         = null;
-            byte[] dvdRamSpareArea               = null;
-            byte[] lastBorderOutRmd              = null;
-            byte[] dvdPreRecordedInfo            = null;
-            byte[] dvdrMediaIdentifier           = null;
-            byte[] dvdrPhysicalInformation       = null;
-            byte[] hddvdrMediumStatus            = null;
-            byte[] dvdrLayerCapacity             = null;
-            byte[] dvdrDlMiddleZoneStart         = null;
-            byte[] dvdrDlJumpIntervalSize        = null;
-            byte[] dvdrDlManualLayerJumpStartLba = null;
-            byte[] dvdPlusAdip                   = null;
-            byte[] dvdPlusDcb                    = null;
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDRAM_DDS) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDRAM_DDS, out dvdRamDds);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDRAM_MediumStatus) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDRAM_MediumStatus, out dvdRamCartridgeStatus);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDRAM_SpareArea) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDRAM_SpareArea, out dvdRamSpareArea);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDR_RMD) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDR_RMD, out lastBorderOutRmd);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDR_PreRecordedInfo) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDR_PreRecordedInfo, out dvdPreRecordedInfo);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDR_MediaIdentifier) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDR_MediaIdentifier, out dvdrMediaIdentifier);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDR_PFI) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDR_PFI, out dvdrPhysicalInformation);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.HDDVD_MediumStatus) == true)
-                imageFormat.ReadMediaTag(MediaTagType.HDDVD_MediumStatus, out hddvdrMediumStatus);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDDL_LayerCapacity) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDDL_LayerCapacity, out dvdrLayerCapacity);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDDL_MiddleZoneAddress) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDDL_MiddleZoneAddress, out dvdrDlMiddleZoneStart);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDDL_JumpIntervalSize) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDDL_JumpIntervalSize, out dvdrDlJumpIntervalSize);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDDL_ManualLayerJumpLBA) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVDDL_ManualLayerJumpLBA, out dvdrDlManualLayerJumpStartLba);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVD_ADIP) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DVD_ADIP, out dvdPlusAdip);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DCB) == true)
-                imageFormat.ReadMediaTag(MediaTagType.DCB, out dvdPlusDcb);
-
-            DvdWritableInfo = new DvdWritableInfo
-            {
-                DataContext = new DvdWritableInfoViewModel(imageFormat.Info.MediaType, dvdRamDds, dvdRamCartridgeStatus,
-                                                           dvdRamSpareArea, lastBorderOutRmd, dvdPreRecordedInfo,
-                                                           dvdrMediaIdentifier, dvdrPhysicalInformation,
-                                                           hddvdrMediumStatus, null, dvdrLayerCapacity,
-                                                           dvdrDlMiddleZoneStart, dvdrDlJumpIntervalSize,
-                                                           dvdrDlManualLayerJumpStartLba, null, dvdPlusAdip, dvdPlusDcb,
-                                                           view)
-            };
-
-            byte[] blurayBurstCuttingArea     = null;
-            byte[] blurayCartridgeStatus      = null;
-            byte[] blurayDds                  = null;
-            byte[] blurayDiscInformation      = null;
-            byte[] blurayPowResources         = null;
-            byte[] bluraySpareAreaInformation = null;
-            byte[] blurayTrackResources       = null;
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.BD_BCA) == true)
-                imageFormat.ReadMediaTag(MediaTagType.BD_BCA, out blurayBurstCuttingArea);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.BD_CartridgeStatus) == true)
-                imageFormat.ReadMediaTag(MediaTagType.BD_CartridgeStatus, out blurayCartridgeStatus);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.BD_DDS) == true)
-                imageFormat.ReadMediaTag(MediaTagType.BD_DDS, out blurayDds);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.BD_DI) == true)
-                imageFormat.ReadMediaTag(MediaTagType.BD_DI, out blurayDiscInformation);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_POWResourcesInformation) == true)
-                imageFormat.ReadMediaTag(MediaTagType.MMC_POWResourcesInformation, out blurayPowResources);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.BD_SpareArea) == true)
-                imageFormat.ReadMediaTag(MediaTagType.BD_SpareArea, out bluraySpareAreaInformation);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_TrackResourcesInformation) == true)
-                imageFormat.ReadMediaTag(MediaTagType.MMC_TrackResourcesInformation, out blurayTrackResources);
-
-            BlurayInfo = new BlurayInfo
-            {
-                DataContext = new BlurayInfoViewModel(blurayDiscInformation, blurayBurstCuttingArea, blurayDds,
-                                                      blurayCartridgeStatus, bluraySpareAreaInformation,
-                                                      blurayPowResources, blurayTrackResources, null, null, view)
-            };
-
-            byte[]             xboxDmi                   = null;
-            byte[]             xboxSecuritySector        = null;
-            SS.SecuritySector? decodedXboxSecuritySector = null;
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.Xbox_DMI) == true)
-                imageFormat.ReadMediaTag(MediaTagType.Xbox_DMI, out xboxDmi);
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.Xbox_SecuritySector) == true)
-            {
-                errno = imageFormat.ReadMediaTag(MediaTagType.Xbox_SecuritySector, out xboxSecuritySector);
-
-                if(errno == ErrorNumber.NoError)
-                    decodedXboxSecuritySector = SS.Decode(xboxSecuritySector);
-            }
-
-            XboxInfo = new XboxInfo
-            {
-                DataContext = new XboxInfoViewModel(null, xboxDmi, xboxSecuritySector, decodedXboxSecuritySector, view)
-            };
-
-            errno = ErrorNumber.NoData;
-            byte[] pcmciaCis = null;
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.PCMCIA_CIS) == true)
-                errno = imageFormat.ReadMediaTag(MediaTagType.PCMCIA_CIS, out pcmciaCis);
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SCSI_MODESENSE_6) == true)
+        {
+            errno = imageFormat.ReadMediaTag(MediaTagType.SCSI_MODESENSE_6, out scsiModeSense6);
 
             if(errno == ErrorNumber.NoError)
-                PcmciaInfo = new PcmciaInfo
-                {
-                    DataContext = new PcmciaInfoViewModel(pcmciaCis, view)
-                };
+                scsiMode = Modes.DecodeMode6(scsiModeSense6, scsiDeviceType);
+        }
 
-            DeviceType deviceType  = DeviceType.Unknown;
-            byte[]     cid         = null;
-            byte[]     csd         = null;
-            byte[]     ocr         = null;
-            byte[]     extendedCsd = null;
-            byte[]     scr         = null;
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SCSI_MODESENSE_10) == true)
+        {
+            errno = imageFormat.ReadMediaTag(MediaTagType.SCSI_MODESENSE_10, out scsiModeSense10);
 
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SD_CID) == true)
+            if(errno == ErrorNumber.NoError)
+                scsiMode = Modes.DecodeMode10(scsiModeSense10, scsiDeviceType);
+        }
+
+        ScsiInfo = new ScsiInfo
+        {
+            DataContext = new ScsiInfoViewModel(scsiInquiryData, scsiInquiry, null, scsiMode, scsiDeviceType,
+                                                scsiModeSense6, scsiModeSense10, null, view)
+        };
+
+        byte[] ataIdentify   = null;
+        byte[] atapiIdentify = null;
+        errno = ErrorNumber.NoData;
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.ATA_IDENTIFY) == true)
+            errno = imageFormat.ReadMediaTag(MediaTagType.ATA_IDENTIFY, out ataIdentify);
+
+        else if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.ATAPI_IDENTIFY) == true)
+            errno = imageFormat.ReadMediaTag(MediaTagType.ATAPI_IDENTIFY, out atapiIdentify);
+
+        if(errno == ErrorNumber.NoError)
+            AtaInfo = new AtaInfo
             {
-                imageFormat.ReadMediaTag(MediaTagType.SD_CID, out cid);
-                deviceType = DeviceType.SecureDigital;
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SD_CSD) == true)
-            {
-                imageFormat.ReadMediaTag(MediaTagType.SD_CSD, out csd);
-                deviceType = DeviceType.SecureDigital;
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SD_OCR) == true)
-            {
-                imageFormat.ReadMediaTag(MediaTagType.SD_OCR, out ocr);
-                deviceType = DeviceType.SecureDigital;
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SD_SCR) == true)
-            {
-                imageFormat.ReadMediaTag(MediaTagType.SD_SCR, out scr);
-                deviceType = DeviceType.SecureDigital;
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_CID) == true)
-            {
-                imageFormat.ReadMediaTag(MediaTagType.MMC_CID, out cid);
-                deviceType = DeviceType.MMC;
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_CSD) == true)
-            {
-                imageFormat.ReadMediaTag(MediaTagType.MMC_CSD, out csd);
-                deviceType = DeviceType.MMC;
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_OCR) == true)
-            {
-                imageFormat.ReadMediaTag(MediaTagType.MMC_OCR, out ocr);
-                deviceType = DeviceType.MMC;
-            }
-
-            if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_ExtendedCSD) == true)
-            {
-                imageFormat.ReadMediaTag(MediaTagType.MMC_ExtendedCSD, out extendedCsd);
-                deviceType = DeviceType.MMC;
-            }
-
-            SdMmcInfo = new SdMmcInfo
-            {
-                DataContext = new SdMmcInfoViewModel(deviceType, cid, csd, ocr, extendedCsd, scr)
+                DataContext = new AtaInfoViewModel(ataIdentify, atapiIdentify, null, view)
             };
 
-            if(imageFormat is IOpticalMediaImage opticalMediaImage)
+        byte[]                 toc                  = null;
+        TOC.CDTOC?             decodedToc           = null;
+        byte[]                 fullToc              = null;
+        FullTOC.CDFullTOC?     decodedFullToc       = null;
+        byte[]                 pma                  = null;
+        byte[]                 atip                 = null;
+        ATIP.CDATIP            decodedAtip          = null;
+        byte[]                 cdtext               = null;
+        CDTextOnLeadIn.CDText? decodedCdText        = null;
+        string                 mediaCatalogueNumber = null;
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_TOC) == true)
+        {
+            errno = imageFormat.ReadMediaTag(MediaTagType.CD_TOC, out toc);
+
+            if(errno      == ErrorNumber.NoError &&
+               toc.Length > 0)
             {
-                try
+                ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(toc, 0));
+
+                if(dataLen + 2 != toc.Length)
                 {
-                    if(opticalMediaImage.Sessions       != null &&
-                       opticalMediaImage.Sessions.Count > 0)
-                        foreach(Session session in opticalMediaImage.Sessions)
-                            Sessions.Add(session);
-                }
-                catch
-                {
-                    // ignored
+                    byte[] tmp = new byte[toc.Length + 2];
+                    Array.Copy(toc, 0, tmp, 2, toc.Length);
+                    tmp[0] = (byte)((toc.Length & 0xFF00) >> 8);
+                    tmp[1] = (byte)(toc.Length & 0xFF);
+                    toc    = tmp;
                 }
 
-                try
+                decodedToc = TOC.Decode(toc);
+            }
+        }
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_FullTOC) == true)
+        {
+            errno = imageFormat.ReadMediaTag(MediaTagType.CD_FullTOC, out fullToc);
+
+            if(errno          == ErrorNumber.NoError &&
+               fullToc.Length > 0)
+            {
+                ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(fullToc, 0));
+
+                if(dataLen + 2 != fullToc.Length)
                 {
-                    if(opticalMediaImage.Tracks       != null &&
-                       opticalMediaImage.Tracks.Count > 0)
-                        foreach(Track track in opticalMediaImage.Tracks)
-                            Tracks.Add(track);
+                    byte[] tmp = new byte[fullToc.Length + 2];
+                    Array.Copy(fullToc, 0, tmp, 2, fullToc.Length);
+                    tmp[0]  = (byte)((fullToc.Length & 0xFF00) >> 8);
+                    tmp[1]  = (byte)(fullToc.Length & 0xFF);
+                    fullToc = tmp;
                 }
-                catch
+
+                decodedFullToc = FullTOC.Decode(fullToc);
+            }
+        }
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_PMA) == true)
+        {
+            errno = imageFormat.ReadMediaTag(MediaTagType.CD_PMA, out pma);
+
+            if(errno      == ErrorNumber.NoError &&
+               pma.Length > 0)
+            {
+                ushort dataLen = Swapping.Swap(BitConverter.ToUInt16(pma, 0));
+
+                if(dataLen + 2 != pma.Length)
                 {
-                    // ignored
+                    byte[] tmp = new byte[pma.Length + 2];
+                    Array.Copy(pma, 0, tmp, 2, pma.Length);
+                    tmp[0] = (byte)((pma.Length & 0xFF00) >> 8);
+                    tmp[1] = (byte)(pma.Length & 0xFF);
+                    pma    = tmp;
                 }
             }
+        }
 
-            if(imageFormat.DumpHardware is null)
-                return;
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_ATIP) == true)
+        {
+            errno = imageFormat.ReadMediaTag(MediaTagType.CD_ATIP, out atip);
 
-            foreach(DumpHardwareType dump in imageFormat.DumpHardware)
+            if(errno == ErrorNumber.NoError)
             {
-                foreach(ExtentType extent in dump.Extents)
-                    DumpHardwareList.Add(new DumpHardwareModel
-                    {
-                        Manufacturer    = dump.Manufacturer,
-                        Model           = dump.Model,
-                        Serial          = dump.Serial,
-                        SoftwareName    = dump.Software.Name,
-                        SoftwareVersion = dump.Software.Version,
-                        OperatingSystem = dump.Software.OperatingSystem,
-                        Start           = extent.Start,
-                        End             = extent.End
-                    });
+                uint dataLen = Swapping.Swap(BitConverter.ToUInt32(atip, 0));
+
+                if(dataLen + 4 != atip.Length)
+                {
+                    byte[] tmp = new byte[atip.Length + 4];
+                    Array.Copy(atip, 0, tmp, 4, atip.Length);
+                    tmp[0] = (byte)((atip.Length & 0xFF000000) >> 24);
+                    tmp[1] = (byte)((atip.Length & 0xFF0000)   >> 16);
+                    tmp[2] = (byte)((atip.Length & 0xFF00)     >> 8);
+                    tmp[3] = (byte)(atip.Length & 0xFF);
+                    atip   = tmp;
+                }
+
+                decodedAtip = ATIP.Decode(atip);
             }
         }
 
-        public ScsiInfo                                ScsiInfo                  { get; }
-        public AtaInfo                                 AtaInfo                   { get; }
-        public CompactDiscInfo                         CompactDiscInfo           { get; }
-        public DvdInfo                                 DvdInfo                   { get; }
-        public DvdWritableInfo                         DvdWritableInfo           { get; }
-        public BlurayInfo                              BlurayInfo                { get; }
-        public XboxInfo                                XboxInfo                  { get; }
-        public PcmciaInfo                              PcmciaInfo                { get; }
-        public SdMmcInfo                               SdMmcInfo                 { get; }
-        public Bitmap                                  MediaLogo                 { get; }
-        public string                                  ImagePathText             { get; }
-        public string                                  FilterText                { get; }
-        public string                                  ImageIdentifiedText       { get; }
-        public string                                  MediaTypeText             { get; set; }
-        public string                                  SectorsText               { get; set; }
-        public string                                  HasPartitionsText         { get; set; }
-        public string                                  HasSessionsText           { get; set; }
-        public string                                  ApplicationText           { get; set; }
-        public string                                  CreatorText               { get; set; }
-        public string                                  CreationTimeText          { get; set; }
-        public string                                  LastModificationTimeText  { get; set; }
-        public string                                  MediaSequenceText         { get; set; }
-        public string                                  MediaTitleText            { get; set; }
-        public string                                  MediaManufacturerText     { get; set; }
-        public string                                  MediaModelText            { get; set; }
-        public string                                  MediaSerialNumberText     { get; set; }
-        public string                                  MediaBarcodeText          { get; set; }
-        public string                                  MediaPartNumberText       { get; set; }
-        public string                                  CommentsText              => _imageFormat.Info.Comments;
-        public string                                  DriveManufacturerText     { get; set; }
-        public string                                  DriveModelText            { get; set; }
-        public string                                  DriveSerialNumberText     { get; set; }
-        public string                                  DriveFirmwareRevisionText { get; set; }
-        public string                                  MediaGeometryText         { get; set; }
-        public ObservableCollection<string>            MediaTagsList             { get; }
-        public ObservableCollection<string>            SectorTagsList            { get; }
-        public string                                  ImageSizeText             { get; set; }
-        public string                                  ImageFormatText           { get; set; }
-        public ObservableCollection<Session>           Sessions                  { get; }
-        public ObservableCollection<Track>             Tracks                    { get; }
-        public ObservableCollection<DumpHardwareModel> DumpHardwareList          { get; }
-        public ReactiveCommand<Unit, Unit>             EntropyCommand            { get; }
-        public ReactiveCommand<Unit, Unit>             VerifyCommand             { get; }
-        public ReactiveCommand<Unit, Unit>             ChecksumCommand           { get; }
-        public ReactiveCommand<Unit, Unit>             ConvertCommand            { get; }
-        public ReactiveCommand<Unit, Unit>             CreateSidecarCommand      { get; }
-        public ReactiveCommand<Unit, Unit>             ViewSectorsCommand        { get; }
-        public ReactiveCommand<Unit, Unit>             DecodeMediaTagCommand     { get; }
-        public bool DriveInformationVisible => DriveManufacturerText != null || DriveModelText            != null ||
-                                               DriveSerialNumberText != null || DriveFirmwareRevisionText != null ||
-                                               MediaGeometryText     != null;
-        public bool MediaInformationVisible => MediaSequenceText     != null || MediaTitleText   != null ||
-                                               MediaManufacturerText != null || MediaModelText   != null ||
-                                               MediaSerialNumberText != null || MediaBarcodeText != null ||
-                                               MediaPartNumberText   != null;
-
-        void ExecuteEntropyCommand()
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_TEXT) == true)
         {
-            if(_imageEntropy != null)
+            errno = imageFormat.ReadMediaTag(MediaTagType.CD_TEXT, out cdtext);
+
+            if(errno == ErrorNumber.NoError)
             {
-                _imageEntropy.Show();
+                uint dataLen = Swapping.Swap(BitConverter.ToUInt32(cdtext, 0));
 
-                return;
+                if(dataLen + 4 != cdtext.Length)
+                {
+                    byte[] tmp = new byte[cdtext.Length + 4];
+                    Array.Copy(cdtext, 0, tmp, 4, cdtext.Length);
+                    tmp[0] = (byte)((cdtext.Length & 0xFF000000) >> 24);
+                    tmp[1] = (byte)((cdtext.Length & 0xFF0000)   >> 16);
+                    tmp[2] = (byte)((cdtext.Length & 0xFF00)     >> 8);
+                    tmp[3] = (byte)(cdtext.Length & 0xFF);
+                    cdtext = tmp;
+                }
+
+                decodedCdText = CDTextOnLeadIn.Decode(cdtext);
             }
-
-            _imageEntropy             = new ImageEntropy();
-            _imageEntropy.DataContext = new ImageEntropyViewModel(_imageFormat, _imageEntropy);
-
-            _imageEntropy.Closed += (sender, args) => _imageEntropy = null;
-
-            _imageEntropy.Show();
         }
 
-        void ExecuteVerifyCommand()
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.CD_MCN) == true)
         {
-            if(_imageVerify != null)
-            {
-                _imageVerify.Show();
+            errno = imageFormat.ReadMediaTag(MediaTagType.CD_MCN, out byte[] mcn);
 
-                return;
-            }
-
-            _imageVerify             = new ImageVerify();
-            _imageVerify.DataContext = new ImageVerifyViewModel(_imageFormat, _imageVerify);
-
-            _imageVerify.Closed += (sender, args) => _imageVerify = null;
-
-            _imageVerify.Show();
+            if(errno == ErrorNumber.NoError)
+                mediaCatalogueNumber = Encoding.UTF8.GetString(mcn);
         }
 
-        void ExecuteChecksumCommand()
+        CompactDiscInfo = new CompactDiscInfo
         {
-            if(_imageChecksum != null)
-            {
-                _imageChecksum.Show();
+            DataContext = new CompactDiscInfoViewModel(toc, atip, null, null, fullToc, pma, cdtext, decodedToc,
+                                                       decodedAtip, null, decodedFullToc, decodedCdText, null,
+                                                       mediaCatalogueNumber, null, view)
+        };
 
-                return;
-            }
+        byte[]                         dvdPfi                    = null;
+        byte[]                         dvdDmi                    = null;
+        byte[]                         dvdCmi                    = null;
+        byte[]                         hddvdCopyrightInformation = null;
+        byte[]                         dvdBca                    = null;
+        PFI.PhysicalFormatInformation? decodedPfi                = null;
 
-            _imageChecksum             = new ImageChecksum();
-            _imageChecksum.DataContext = new ImageChecksumViewModel(_imageFormat, _imageChecksum);
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVD_PFI) == true)
+        {
+            errno = imageFormat.ReadMediaTag(MediaTagType.DVD_PFI, out dvdPfi);
 
-            _imageChecksum.Closed += (sender, args) => _imageChecksum = null;
-
-            _imageChecksum.Show();
+            if(errno == ErrorNumber.NoError)
+                decodedPfi = PFI.Decode(dvdPfi, imageFormat.Info.MediaType);
         }
 
-        void ExecuteConvertCommand()
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVD_DMI) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVD_DMI, out dvdDmi);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVD_CMI) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVD_CMI, out dvdCmi);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.HDDVD_CPI) == true)
+            imageFormat.ReadMediaTag(MediaTagType.HDDVD_CPI, out hddvdCopyrightInformation);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVD_BCA) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVD_BCA, out dvdBca);
+
+        DvdInfo = new DvdInfo
         {
-            if(_imageConvert != null)
-            {
-                _imageConvert.Show();
+            DataContext = new DvdInfoViewModel(imageFormat.Info.MediaType, dvdPfi, dvdDmi, dvdCmi,
+                                               hddvdCopyrightInformation, dvdBca, null, decodedPfi, view)
+        };
 
-                return;
-            }
+        byte[] dvdRamDds                     = null;
+        byte[] dvdRamCartridgeStatus         = null;
+        byte[] dvdRamSpareArea               = null;
+        byte[] lastBorderOutRmd              = null;
+        byte[] dvdPreRecordedInfo            = null;
+        byte[] dvdrMediaIdentifier           = null;
+        byte[] dvdrPhysicalInformation       = null;
+        byte[] hddvdrMediumStatus            = null;
+        byte[] dvdrLayerCapacity             = null;
+        byte[] dvdrDlMiddleZoneStart         = null;
+        byte[] dvdrDlJumpIntervalSize        = null;
+        byte[] dvdrDlManualLayerJumpStartLba = null;
+        byte[] dvdPlusAdip                   = null;
+        byte[] dvdPlusDcb                    = null;
 
-            _imageConvert             = new ImageConvert();
-            _imageConvert.DataContext = new ImageConvertViewModel(_imageFormat, _imagePath, _imageConvert);
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDRAM_DDS) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDRAM_DDS, out dvdRamDds);
 
-            _imageConvert.Closed += (sender, args) => _imageConvert = null;
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDRAM_MediumStatus) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDRAM_MediumStatus, out dvdRamCartridgeStatus);
 
-            _imageConvert.Show();
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDRAM_SpareArea) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDRAM_SpareArea, out dvdRamSpareArea);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDR_RMD) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDR_RMD, out lastBorderOutRmd);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDR_PreRecordedInfo) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDR_PreRecordedInfo, out dvdPreRecordedInfo);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDR_MediaIdentifier) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDR_MediaIdentifier, out dvdrMediaIdentifier);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDR_PFI) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDR_PFI, out dvdrPhysicalInformation);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.HDDVD_MediumStatus) == true)
+            imageFormat.ReadMediaTag(MediaTagType.HDDVD_MediumStatus, out hddvdrMediumStatus);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDDL_LayerCapacity) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDDL_LayerCapacity, out dvdrLayerCapacity);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDDL_MiddleZoneAddress) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDDL_MiddleZoneAddress, out dvdrDlMiddleZoneStart);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDDL_JumpIntervalSize) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDDL_JumpIntervalSize, out dvdrDlJumpIntervalSize);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVDDL_ManualLayerJumpLBA) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVDDL_ManualLayerJumpLBA, out dvdrDlManualLayerJumpStartLba);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DVD_ADIP) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DVD_ADIP, out dvdPlusAdip);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.DCB) == true)
+            imageFormat.ReadMediaTag(MediaTagType.DCB, out dvdPlusDcb);
+
+        DvdWritableInfo = new DvdWritableInfo
+        {
+            DataContext = new DvdWritableInfoViewModel(imageFormat.Info.MediaType, dvdRamDds, dvdRamCartridgeStatus,
+                                                       dvdRamSpareArea, lastBorderOutRmd, dvdPreRecordedInfo,
+                                                       dvdrMediaIdentifier, dvdrPhysicalInformation,
+                                                       hddvdrMediumStatus, null, dvdrLayerCapacity,
+                                                       dvdrDlMiddleZoneStart, dvdrDlJumpIntervalSize,
+                                                       dvdrDlManualLayerJumpStartLba, null, dvdPlusAdip, dvdPlusDcb,
+                                                       view)
+        };
+
+        byte[] blurayBurstCuttingArea     = null;
+        byte[] blurayCartridgeStatus      = null;
+        byte[] blurayDds                  = null;
+        byte[] blurayDiscInformation      = null;
+        byte[] blurayPowResources         = null;
+        byte[] bluraySpareAreaInformation = null;
+        byte[] blurayTrackResources       = null;
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.BD_BCA) == true)
+            imageFormat.ReadMediaTag(MediaTagType.BD_BCA, out blurayBurstCuttingArea);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.BD_CartridgeStatus) == true)
+            imageFormat.ReadMediaTag(MediaTagType.BD_CartridgeStatus, out blurayCartridgeStatus);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.BD_DDS) == true)
+            imageFormat.ReadMediaTag(MediaTagType.BD_DDS, out blurayDds);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.BD_DI) == true)
+            imageFormat.ReadMediaTag(MediaTagType.BD_DI, out blurayDiscInformation);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_POWResourcesInformation) == true)
+            imageFormat.ReadMediaTag(MediaTagType.MMC_POWResourcesInformation, out blurayPowResources);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.BD_SpareArea) == true)
+            imageFormat.ReadMediaTag(MediaTagType.BD_SpareArea, out bluraySpareAreaInformation);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_TrackResourcesInformation) == true)
+            imageFormat.ReadMediaTag(MediaTagType.MMC_TrackResourcesInformation, out blurayTrackResources);
+
+        BlurayInfo = new BlurayInfo
+        {
+            DataContext = new BlurayInfoViewModel(blurayDiscInformation, blurayBurstCuttingArea, blurayDds,
+                                                  blurayCartridgeStatus, bluraySpareAreaInformation,
+                                                  blurayPowResources, blurayTrackResources, null, null, view)
+        };
+
+        byte[]             xboxDmi                   = null;
+        byte[]             xboxSecuritySector        = null;
+        SS.SecuritySector? decodedXboxSecuritySector = null;
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.Xbox_DMI) == true)
+            imageFormat.ReadMediaTag(MediaTagType.Xbox_DMI, out xboxDmi);
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.Xbox_SecuritySector) == true)
+        {
+            errno = imageFormat.ReadMediaTag(MediaTagType.Xbox_SecuritySector, out xboxSecuritySector);
+
+            if(errno == ErrorNumber.NoError)
+                decodedXboxSecuritySector = SS.Decode(xboxSecuritySector);
         }
 
-        void ExecuteCreateSidecarCommand()
+        XboxInfo = new XboxInfo
         {
-            if(_imageSidecar != null)
+            DataContext = new XboxInfoViewModel(null, xboxDmi, xboxSecuritySector, decodedXboxSecuritySector, view)
+        };
+
+        errno = ErrorNumber.NoData;
+        byte[] pcmciaCis = null;
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.PCMCIA_CIS) == true)
+            errno = imageFormat.ReadMediaTag(MediaTagType.PCMCIA_CIS, out pcmciaCis);
+
+        if(errno == ErrorNumber.NoError)
+            PcmciaInfo = new PcmciaInfo
             {
-                _imageSidecar.Show();
-
-                return;
-            }
-
-            _imageSidecar = new ImageSidecar();
-
-            // TODO: Pass thru chosen default encoding
-            _imageSidecar.DataContext =
-                new ImageSidecarViewModel(_imageFormat, _imagePath, _filter.Id, null, _imageSidecar);
-
-            _imageSidecar.Closed += (sender, args) => _imageSidecar = null;
-
-            _imageSidecar.Show();
-        }
-
-        void ExecuteViewSectorsCommand()
-        {
-            if(_viewSector != null)
-            {
-                _viewSector.Show();
-
-                return;
-            }
-
-            _viewSector = new ViewSector
-            {
-                DataContext = new ViewSectorViewModel(_imageFormat)
+                DataContext = new PcmciaInfoViewModel(pcmciaCis, view)
             };
 
-            _viewSector.Closed += (sender, args) => _viewSector = null;
+        DeviceType deviceType  = DeviceType.Unknown;
+        byte[]     cid         = null;
+        byte[]     csd         = null;
+        byte[]     ocr         = null;
+        byte[]     extendedCsd = null;
+        byte[]     scr         = null;
 
-            _viewSector.Show();
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SD_CID) == true)
+        {
+            imageFormat.ReadMediaTag(MediaTagType.SD_CID, out cid);
+            deviceType = DeviceType.SecureDigital;
         }
 
-        void ExecuteDecodeMediaTagCommand()
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SD_CSD) == true)
         {
-            if(_decodeMediaTags != null)
-            {
-                _decodeMediaTags.Show();
+            imageFormat.ReadMediaTag(MediaTagType.SD_CSD, out csd);
+            deviceType = DeviceType.SecureDigital;
+        }
 
-                return;
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SD_OCR) == true)
+        {
+            imageFormat.ReadMediaTag(MediaTagType.SD_OCR, out ocr);
+            deviceType = DeviceType.SecureDigital;
+        }
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.SD_SCR) == true)
+        {
+            imageFormat.ReadMediaTag(MediaTagType.SD_SCR, out scr);
+            deviceType = DeviceType.SecureDigital;
+        }
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_CID) == true)
+        {
+            imageFormat.ReadMediaTag(MediaTagType.MMC_CID, out cid);
+            deviceType = DeviceType.MMC;
+        }
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_CSD) == true)
+        {
+            imageFormat.ReadMediaTag(MediaTagType.MMC_CSD, out csd);
+            deviceType = DeviceType.MMC;
+        }
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_OCR) == true)
+        {
+            imageFormat.ReadMediaTag(MediaTagType.MMC_OCR, out ocr);
+            deviceType = DeviceType.MMC;
+        }
+
+        if(imageFormat.Info.ReadableMediaTags?.Contains(MediaTagType.MMC_ExtendedCSD) == true)
+        {
+            imageFormat.ReadMediaTag(MediaTagType.MMC_ExtendedCSD, out extendedCsd);
+            deviceType = DeviceType.MMC;
+        }
+
+        SdMmcInfo = new SdMmcInfo
+        {
+            DataContext = new SdMmcInfoViewModel(deviceType, cid, csd, ocr, extendedCsd, scr)
+        };
+
+        if(imageFormat is IOpticalMediaImage opticalMediaImage)
+        {
+            try
+            {
+                if(opticalMediaImage.Sessions       != null &&
+                   opticalMediaImage.Sessions.Count > 0)
+                    foreach(Session session in opticalMediaImage.Sessions)
+                        Sessions.Add(session);
+            }
+            catch
+            {
+                // ignored
             }
 
-            _decodeMediaTags = new DecodeMediaTags
+            try
             {
-                DataContext = new DecodeMediaTagsViewModel(_imageFormat)
-            };
+                if(opticalMediaImage.Tracks       != null &&
+                   opticalMediaImage.Tracks.Count > 0)
+                    foreach(Track track in opticalMediaImage.Tracks)
+                        Tracks.Add(track);
+            }
+            catch
+            {
+                // ignored
+            }
+        }
 
-            _decodeMediaTags.Closed += (sender, args) => _decodeMediaTags = null;
+        if(imageFormat.DumpHardware is null)
+            return;
 
-            _decodeMediaTags.Show();
+        foreach(DumpHardwareType dump in imageFormat.DumpHardware)
+        {
+            foreach(ExtentType extent in dump.Extents)
+                DumpHardwareList.Add(new DumpHardwareModel
+                {
+                    Manufacturer    = dump.Manufacturer,
+                    Model           = dump.Model,
+                    Serial          = dump.Serial,
+                    SoftwareName    = dump.Software.Name,
+                    SoftwareVersion = dump.Software.Version,
+                    OperatingSystem = dump.Software.OperatingSystem,
+                    Start           = extent.Start,
+                    End             = extent.End
+                });
         }
     }
+
+    public ScsiInfo                                ScsiInfo                  { get; }
+    public AtaInfo                                 AtaInfo                   { get; }
+    public CompactDiscInfo                         CompactDiscInfo           { get; }
+    public DvdInfo                                 DvdInfo                   { get; }
+    public DvdWritableInfo                         DvdWritableInfo           { get; }
+    public BlurayInfo                              BlurayInfo                { get; }
+    public XboxInfo                                XboxInfo                  { get; }
+    public PcmciaInfo                              PcmciaInfo                { get; }
+    public SdMmcInfo                               SdMmcInfo                 { get; }
+    public Bitmap                                  MediaLogo                 { get; }
+    public string                                  ImagePathText             { get; }
+    public string                                  FilterText                { get; }
+    public string                                  ImageIdentifiedText       { get; }
+    public string                                  MediaTypeText             { get; set; }
+    public string                                  SectorsText               { get; set; }
+    public string                                  HasPartitionsText         { get; set; }
+    public string                                  HasSessionsText           { get; set; }
+    public string                                  ApplicationText           { get; set; }
+    public string                                  CreatorText               { get; set; }
+    public string                                  CreationTimeText          { get; set; }
+    public string                                  LastModificationTimeText  { get; set; }
+    public string                                  MediaSequenceText         { get; set; }
+    public string                                  MediaTitleText            { get; set; }
+    public string                                  MediaManufacturerText     { get; set; }
+    public string                                  MediaModelText            { get; set; }
+    public string                                  MediaSerialNumberText     { get; set; }
+    public string                                  MediaBarcodeText          { get; set; }
+    public string                                  MediaPartNumberText       { get; set; }
+    public string                                  CommentsText              => _imageFormat.Info.Comments;
+    public string                                  DriveManufacturerText     { get; set; }
+    public string                                  DriveModelText            { get; set; }
+    public string                                  DriveSerialNumberText     { get; set; }
+    public string                                  DriveFirmwareRevisionText { get; set; }
+    public string                                  MediaGeometryText         { get; set; }
+    public ObservableCollection<string>            MediaTagsList             { get; }
+    public ObservableCollection<string>            SectorTagsList            { get; }
+    public string                                  ImageSizeText             { get; set; }
+    public string                                  ImageFormatText           { get; set; }
+    public ObservableCollection<Session>           Sessions                  { get; }
+    public ObservableCollection<Track>             Tracks                    { get; }
+    public ObservableCollection<DumpHardwareModel> DumpHardwareList          { get; }
+    public ReactiveCommand<Unit, Unit>             EntropyCommand            { get; }
+    public ReactiveCommand<Unit, Unit>             VerifyCommand             { get; }
+    public ReactiveCommand<Unit, Unit>             ChecksumCommand           { get; }
+    public ReactiveCommand<Unit, Unit>             ConvertCommand            { get; }
+    public ReactiveCommand<Unit, Unit>             CreateSidecarCommand      { get; }
+    public ReactiveCommand<Unit, Unit>             ViewSectorsCommand        { get; }
+    public ReactiveCommand<Unit, Unit>             DecodeMediaTagCommand     { get; }
+    public bool DriveInformationVisible => DriveManufacturerText != null || DriveModelText            != null ||
+                                           DriveSerialNumberText != null || DriveFirmwareRevisionText != null ||
+                                           MediaGeometryText     != null;
+    public bool MediaInformationVisible => MediaSequenceText     != null || MediaTitleText   != null ||
+                                           MediaManufacturerText != null || MediaModelText   != null ||
+                                           MediaSerialNumberText != null || MediaBarcodeText != null ||
+                                           MediaPartNumberText   != null;
+
+    void ExecuteEntropyCommand()
+    {
+        if(_imageEntropy != null)
+        {
+            _imageEntropy.Show();
+
+            return;
+        }
+
+        _imageEntropy             = new ImageEntropy();
+        _imageEntropy.DataContext = new ImageEntropyViewModel(_imageFormat, _imageEntropy);
+
+        _imageEntropy.Closed += (sender, args) => _imageEntropy = null;
+
+        _imageEntropy.Show();
+    }
+
+    void ExecuteVerifyCommand()
+    {
+        if(_imageVerify != null)
+        {
+            _imageVerify.Show();
+
+            return;
+        }
+
+        _imageVerify             = new ImageVerify();
+        _imageVerify.DataContext = new ImageVerifyViewModel(_imageFormat, _imageVerify);
+
+        _imageVerify.Closed += (sender, args) => _imageVerify = null;
+
+        _imageVerify.Show();
+    }
+
+    void ExecuteChecksumCommand()
+    {
+        if(_imageChecksum != null)
+        {
+            _imageChecksum.Show();
+
+            return;
+        }
+
+        _imageChecksum             = new ImageChecksum();
+        _imageChecksum.DataContext = new ImageChecksumViewModel(_imageFormat, _imageChecksum);
+
+        _imageChecksum.Closed += (sender, args) => _imageChecksum = null;
+
+        _imageChecksum.Show();
+    }
+
+    void ExecuteConvertCommand()
+    {
+        if(_imageConvert != null)
+        {
+            _imageConvert.Show();
+
+            return;
+        }
+
+        _imageConvert             = new ImageConvert();
+        _imageConvert.DataContext = new ImageConvertViewModel(_imageFormat, _imagePath, _imageConvert);
+
+        _imageConvert.Closed += (sender, args) => _imageConvert = null;
+
+        _imageConvert.Show();
+    }
+
+    void ExecuteCreateSidecarCommand()
+    {
+        if(_imageSidecar != null)
+        {
+            _imageSidecar.Show();
+
+            return;
+        }
+
+        _imageSidecar = new ImageSidecar();
+
+        // TODO: Pass thru chosen default encoding
+        _imageSidecar.DataContext =
+            new ImageSidecarViewModel(_imageFormat, _imagePath, _filter.Id, null, _imageSidecar);
+
+        _imageSidecar.Closed += (sender, args) => _imageSidecar = null;
+
+        _imageSidecar.Show();
+    }
+
+    void ExecuteViewSectorsCommand()
+    {
+        if(_viewSector != null)
+        {
+            _viewSector.Show();
+
+            return;
+        }
+
+        _viewSector = new ViewSector
+        {
+            DataContext = new ViewSectorViewModel(_imageFormat)
+        };
+
+        _viewSector.Closed += (sender, args) => _viewSector = null;
+
+        _viewSector.Show();
+    }
+
+    void ExecuteDecodeMediaTagCommand()
+    {
+        if(_decodeMediaTags != null)
+        {
+            _decodeMediaTags.Show();
+
+            return;
+        }
+
+        _decodeMediaTags = new DecodeMediaTags
+        {
+            DataContext = new DecodeMediaTagsViewModel(_imageFormat)
+        };
+
+        _decodeMediaTags.Closed += (sender, args) => _decodeMediaTags = null;
+
+        _decodeMediaTags.Show();
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs b/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs
index 45df654b4..f97b960ee 100644
--- a/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/MediaInfoViewModel.cs
@@ -48,405 +48,404 @@ using MessageBox.Avalonia.Enums;
 using ReactiveUI;
 using ScsiInfo = Aaru.Core.Media.Info.ScsiInfo;
 
-namespace Aaru.Gui.ViewModels.Panels
+namespace Aaru.Gui.ViewModels.Panels;
+
+public sealed class MediaInfoViewModel : ViewModelBase
 {
-    public sealed class MediaInfoViewModel : ViewModelBase
+    readonly string   _devicePath;
+    readonly ScsiInfo _scsiInfo;
+    readonly Window   _view;
+    BlurayInfo        _blurayInfo;
+    CompactDiscInfo   _compactDiscInfo;
+    string            _densitySupport;
+    DvdInfo           _dvdInfo;
+    DvdWritableInfo   _dvdWritableInfo;
+    string            _generalVisible;
+    Bitmap            _mediaLogo;
+    string            _mediaSerial;
+    string            _mediaSize;
+    string            _mediaType;
+    string            _mediumSupport;
+    bool              _mmcVisible;
+    bool              _saveDensitySupportVisible;
+    bool              _saveGetConfigurationVisible;
+    bool              _saveMediumSupportVisible;
+    bool              _saveReadCapacity16Visible;
+    bool              _saveReadCapacityVisible;
+    bool              _saveReadMediaSerialVisible;
+    bool              _saveRecognizedFormatLayersVisible;
+    bool              _saveWriteProtectionStatusVisible;
+    bool              _sscVisible;
+    XboxInfo          _xboxInfo;
+
+    public MediaInfoViewModel(ScsiInfo scsiInfo, string devicePath, Window view)
     {
-        readonly string   _devicePath;
-        readonly ScsiInfo _scsiInfo;
-        readonly Window   _view;
-        BlurayInfo        _blurayInfo;
-        CompactDiscInfo   _compactDiscInfo;
-        string            _densitySupport;
-        DvdInfo           _dvdInfo;
-        DvdWritableInfo   _dvdWritableInfo;
-        string            _generalVisible;
-        Bitmap            _mediaLogo;
-        string            _mediaSerial;
-        string            _mediaSize;
-        string            _mediaType;
-        string            _mediumSupport;
-        bool              _mmcVisible;
-        bool              _saveDensitySupportVisible;
-        bool              _saveGetConfigurationVisible;
-        bool              _saveMediumSupportVisible;
-        bool              _saveReadCapacity16Visible;
-        bool              _saveReadCapacityVisible;
-        bool              _saveReadMediaSerialVisible;
-        bool              _saveRecognizedFormatLayersVisible;
-        bool              _saveWriteProtectionStatusVisible;
-        bool              _sscVisible;
-        XboxInfo          _xboxInfo;
+        _view                             = view;
+        SaveReadMediaSerialCommand        = ReactiveCommand.Create(ExecuteSaveReadMediaSerialCommand);
+        SaveReadCapacityCommand           = ReactiveCommand.Create(ExecuteSaveReadCapacityCommand);
+        SaveReadCapacity16Command         = ReactiveCommand.Create(ExecuteSaveReadCapacity16Command);
+        SaveGetConfigurationCommand       = ReactiveCommand.Create(ExecuteSaveGetConfigurationCommand);
+        SaveRecognizedFormatLayersCommand = ReactiveCommand.Create(ExecuteSaveRecognizedFormatLayersCommand);
+        SaveWriteProtectionStatusCommand  = ReactiveCommand.Create(ExecuteSaveWriteProtectionStatusCommand);
+        SaveDensitySupportCommand         = ReactiveCommand.Create(ExecuteSaveDensitySupportCommand);
+        SaveMediumSupportCommand          = ReactiveCommand.Create(ExecuteSaveMediumSupportCommand);
+        DumpCommand                       = ReactiveCommand.Create(ExecuteDumpCommand);
+        ScanCommand                       = ReactiveCommand.Create(ExecuteScanCommand);
+        IAssetLoader assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
+        _devicePath = devicePath;
+        _scsiInfo   = scsiInfo;
 
-        public MediaInfoViewModel(ScsiInfo scsiInfo, string devicePath, Window view)
+        var mediaResource = new Uri($"avares://Aaru.Gui/Assets/Logos/Media/{scsiInfo.MediaType}.png");
+
+        MediaLogo = assets.Exists(mediaResource) ? new Bitmap(assets.Open(mediaResource)) : null;
+
+        MediaType = scsiInfo.MediaType.ToString();
+
+        if(scsiInfo.Blocks    != 0 &&
+           scsiInfo.BlockSize != 0)
         {
-            _view                             = view;
-            SaveReadMediaSerialCommand        = ReactiveCommand.Create(ExecuteSaveReadMediaSerialCommand);
-            SaveReadCapacityCommand           = ReactiveCommand.Create(ExecuteSaveReadCapacityCommand);
-            SaveReadCapacity16Command         = ReactiveCommand.Create(ExecuteSaveReadCapacity16Command);
-            SaveGetConfigurationCommand       = ReactiveCommand.Create(ExecuteSaveGetConfigurationCommand);
-            SaveRecognizedFormatLayersCommand = ReactiveCommand.Create(ExecuteSaveRecognizedFormatLayersCommand);
-            SaveWriteProtectionStatusCommand  = ReactiveCommand.Create(ExecuteSaveWriteProtectionStatusCommand);
-            SaveDensitySupportCommand         = ReactiveCommand.Create(ExecuteSaveDensitySupportCommand);
-            SaveMediumSupportCommand          = ReactiveCommand.Create(ExecuteSaveMediumSupportCommand);
-            DumpCommand                       = ReactiveCommand.Create(ExecuteDumpCommand);
-            ScanCommand                       = ReactiveCommand.Create(ExecuteScanCommand);
-            IAssetLoader assets = AvaloniaLocator.Current.GetService<IAssetLoader>();
-            _devicePath = devicePath;
-            _scsiInfo   = scsiInfo;
+            ulong totalSize = scsiInfo.Blocks * scsiInfo.BlockSize;
 
-            var mediaResource = new Uri($"avares://Aaru.Gui/Assets/Logos/Media/{scsiInfo.MediaType}.png");
+            if(totalSize > 1099511627776)
+                MediaSize =
+                    $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)";
+            else if(totalSize > 1073741824)
+                MediaSize =
+                    $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)";
+            else if(totalSize > 1048576)
+                MediaSize =
+                    $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)";
+            else if(totalSize > 1024)
+                MediaSize =
+                    $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)";
+            else
+                MediaSize =
+                    $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {totalSize} bytes)";
+        }
 
-            MediaLogo = assets.Exists(mediaResource) ? new Bitmap(assets.Open(mediaResource)) : null;
+        if(scsiInfo.MediaSerialNumber != null)
+        {
+            var sbSerial = new StringBuilder();
 
-            MediaType = scsiInfo.MediaType.ToString();
+            for(int i = 4; i < scsiInfo.MediaSerialNumber.Length; i++)
+                sbSerial.AppendFormat("{0:X2}", scsiInfo.MediaSerialNumber[i]);
 
-            if(scsiInfo.Blocks    != 0 &&
-               scsiInfo.BlockSize != 0)
+            MediaSerial = sbSerial.ToString();
+        }
+
+        SaveReadMediaSerialVisible = scsiInfo.MediaSerialNumber != null;
+        SaveReadCapacityVisible    = scsiInfo.ReadCapacity      != null;
+        SaveReadCapacity16Visible  = scsiInfo.ReadCapacity16    != null;
+
+        SaveGetConfigurationVisible       = scsiInfo.MmcConfiguration       != null;
+        SaveRecognizedFormatLayersVisible = scsiInfo.RecognizedFormatLayers != null;
+        SaveWriteProtectionStatusVisible  = scsiInfo.WriteProtectionStatus  != null;
+
+        MmcVisible = SaveGetConfigurationVisible || SaveRecognizedFormatLayersVisible ||
+                     SaveWriteProtectionStatusVisible;
+
+        if(scsiInfo.DensitySupportHeader.HasValue)
+            DensitySupport = Decoders.SCSI.SSC.DensitySupport.PrettifyDensity(scsiInfo.DensitySupportHeader);
+
+        if(scsiInfo.MediaTypeSupportHeader.HasValue)
+            MediumSupport = Decoders.SCSI.SSC.DensitySupport.PrettifyMediumType(scsiInfo.MediaTypeSupportHeader);
+
+        SaveDensitySupportVisible = scsiInfo.DensitySupport   != null;
+        SaveMediumSupportVisible  = scsiInfo.MediaTypeSupport != null;
+
+        SscVisible = SaveDensitySupportVisible || SaveMediumSupportVisible;
+
+        CompactDiscInfo = new CompactDiscInfo
+        {
+            DataContext = new CompactDiscInfoViewModel(scsiInfo.Toc, scsiInfo.Atip, scsiInfo.DiscInformation,
+                                                       scsiInfo.Session, scsiInfo.RawToc, scsiInfo.Pma,
+                                                       scsiInfo.CdTextLeadIn, scsiInfo.DecodedToc,
+                                                       scsiInfo.DecodedAtip, scsiInfo.DecodedSession,
+                                                       scsiInfo.FullToc, scsiInfo.DecodedCdTextLeadIn,
+                                                       scsiInfo.DecodedDiscInformation, scsiInfo.Mcn,
+                                                       scsiInfo.Isrcs, _view)
+        };
+
+        DvdInfo = new DvdInfo
+        {
+            DataContext = new DvdInfoViewModel(scsiInfo.MediaType, scsiInfo.DvdPfi, scsiInfo.DvdDmi,
+                                               scsiInfo.DvdCmi, scsiInfo.HddvdCopyrightInformation, scsiInfo.DvdBca,
+                                               scsiInfo.DvdAacs, scsiInfo.DecodedPfi, _view)
+        };
+
+        XboxInfo = new XboxInfo
+        {
+            DataContext = new XboxInfoViewModel(scsiInfo.XgdInfo, scsiInfo.DvdDmi, scsiInfo.XboxSecuritySector,
+                                                scsiInfo.DecodedXboxSecuritySector, _view)
+        };
+
+        DvdWritableInfo = new DvdWritableInfo
+        {
+            DataContext = new DvdWritableInfoViewModel(scsiInfo.MediaType, scsiInfo.DvdRamDds,
+                                                       scsiInfo.DvdRamCartridgeStatus, scsiInfo.DvdRamSpareArea,
+                                                       scsiInfo.LastBorderOutRmd, scsiInfo.DvdPreRecordedInfo,
+                                                       scsiInfo.DvdrMediaIdentifier,
+                                                       scsiInfo.DvdrPhysicalInformation,
+                                                       scsiInfo.HddvdrMediumStatus, scsiInfo.HddvdrLastRmd,
+                                                       scsiInfo.DvdrLayerCapacity, scsiInfo.DvdrDlMiddleZoneStart,
+                                                       scsiInfo.DvdrDlJumpIntervalSize,
+                                                       scsiInfo.DvdrDlManualLayerJumpStartLba,
+                                                       scsiInfo.DvdrDlRemapAnchorPoint, scsiInfo.DvdPlusAdip,
+                                                       scsiInfo.DvdPlusDcb, _view)
+        };
+
+        BlurayInfo = new BlurayInfo
+        {
+            DataContext = new BlurayInfoViewModel(scsiInfo.BlurayDiscInformation, scsiInfo.BlurayBurstCuttingArea,
+                                                  scsiInfo.BlurayDds, scsiInfo.BlurayCartridgeStatus,
+                                                  scsiInfo.BluraySpareAreaInformation, scsiInfo.BlurayPowResources,
+                                                  scsiInfo.BlurayTrackResources, scsiInfo.BlurayRawDfl,
+                                                  scsiInfo.BlurayPac, _view)
+        };
+    }
+
+    public ReactiveCommand<Unit, Unit> SaveReadMediaSerialCommand        { get; }
+    public ReactiveCommand<Unit, Unit> SaveReadCapacityCommand           { get; }
+    public ReactiveCommand<Unit, Unit> SaveReadCapacity16Command         { get; }
+    public ReactiveCommand<Unit, Unit> SaveGetConfigurationCommand       { get; }
+    public ReactiveCommand<Unit, Unit> SaveRecognizedFormatLayersCommand { get; }
+    public ReactiveCommand<Unit, Unit> SaveWriteProtectionStatusCommand  { get; }
+    public ReactiveCommand<Unit, Unit> SaveDensitySupportCommand         { get; }
+    public ReactiveCommand<Unit, Unit> SaveMediumSupportCommand          { get; }
+    public ReactiveCommand<Unit, Unit> DumpCommand                       { get; }
+    public ReactiveCommand<Unit, Unit> ScanCommand                       { get; }
+
+    public Bitmap MediaLogo
+    {
+        get => _mediaLogo;
+        set => this.RaiseAndSetIfChanged(ref _mediaLogo, value);
+    }
+
+    public string GeneralVisible
+    {
+        get => _generalVisible;
+        set => this.RaiseAndSetIfChanged(ref _generalVisible, value);
+    }
+
+    public string MediaType
+    {
+        get => _mediaType;
+        set => this.RaiseAndSetIfChanged(ref _mediaType, value);
+    }
+
+    public string MediaSize
+    {
+        get => _mediaSize;
+        set => this.RaiseAndSetIfChanged(ref _mediaSize, value);
+    }
+
+    public string MediaSerial
+    {
+        get => _mediaSerial;
+        set => this.RaiseAndSetIfChanged(ref _mediaSerial, value);
+    }
+
+    public bool SaveReadMediaSerialVisible
+    {
+        get => _saveReadMediaSerialVisible;
+        set => this.RaiseAndSetIfChanged(ref _saveReadMediaSerialVisible, value);
+    }
+
+    public bool SaveReadCapacityVisible
+    {
+        get => _saveReadCapacityVisible;
+        set => this.RaiseAndSetIfChanged(ref _saveReadCapacityVisible, value);
+    }
+
+    public bool SaveReadCapacity16Visible
+    {
+        get => _saveReadCapacity16Visible;
+        set => this.RaiseAndSetIfChanged(ref _saveReadCapacity16Visible, value);
+    }
+
+    public bool MmcVisible
+    {
+        get => _mmcVisible;
+        set => this.RaiseAndSetIfChanged(ref _mmcVisible, value);
+    }
+
+    public bool SaveGetConfigurationVisible
+    {
+        get => _saveGetConfigurationVisible;
+        set => this.RaiseAndSetIfChanged(ref _saveGetConfigurationVisible, value);
+    }
+
+    public bool SaveRecognizedFormatLayersVisible
+    {
+        get => _saveRecognizedFormatLayersVisible;
+        set => this.RaiseAndSetIfChanged(ref _saveRecognizedFormatLayersVisible, value);
+    }
+
+    public bool SaveWriteProtectionStatusVisible
+    {
+        get => _saveWriteProtectionStatusVisible;
+        set => this.RaiseAndSetIfChanged(ref _saveWriteProtectionStatusVisible, value);
+    }
+
+    public bool SscVisible
+    {
+        get => _sscVisible;
+        set => this.RaiseAndSetIfChanged(ref _sscVisible, value);
+    }
+
+    public string DensitySupport
+    {
+        get => _densitySupport;
+        set => this.RaiseAndSetIfChanged(ref _densitySupport, value);
+    }
+
+    public string MediumSupport
+    {
+        get => _mediumSupport;
+        set => this.RaiseAndSetIfChanged(ref _mediumSupport, value);
+    }
+
+    public bool SaveDensitySupportVisible
+    {
+        get => _saveDensitySupportVisible;
+        set => this.RaiseAndSetIfChanged(ref _saveDensitySupportVisible, value);
+    }
+
+    public bool SaveMediumSupportVisible
+    {
+        get => _saveMediumSupportVisible;
+        set => this.RaiseAndSetIfChanged(ref _saveMediumSupportVisible, value);
+    }
+
+    public CompactDiscInfo CompactDiscInfo
+    {
+        get => _compactDiscInfo;
+        set => this.RaiseAndSetIfChanged(ref _compactDiscInfo, value);
+    }
+
+    public DvdInfo DvdInfo
+    {
+        get => _dvdInfo;
+        set => this.RaiseAndSetIfChanged(ref _dvdInfo, value);
+    }
+
+    public DvdWritableInfo DvdWritableInfo
+    {
+        get => _dvdWritableInfo;
+        set => this.RaiseAndSetIfChanged(ref _dvdWritableInfo, value);
+    }
+
+    public XboxInfo XboxInfo
+    {
+        get => _xboxInfo;
+        set => this.RaiseAndSetIfChanged(ref _xboxInfo, value);
+    }
+
+    public BlurayInfo BlurayInfo
+    {
+        get => _blurayInfo;
+        set => this.RaiseAndSetIfChanged(ref _blurayInfo, value);
+    }
+
+    async void SaveElement(byte[] data)
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
             {
-                ulong totalSize = scsiInfo.Blocks * scsiInfo.BlockSize;
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
 
-                if(totalSize > 1099511627776)
-                    MediaSize =
-                        $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {totalSize / 1099511627776d:F3} TiB)";
-                else if(totalSize > 1073741824)
-                    MediaSize =
-                        $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {totalSize / 1073741824d:F3} GiB)";
-                else if(totalSize > 1048576)
-                    MediaSize =
-                        $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {totalSize / 1048576d:F3} MiB)";
-                else if(totalSize > 1024)
-                    MediaSize =
-                        $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {totalSize / 1024d:F3} KiB)";
-                else
-                    MediaSize =
-                        $"Media has {scsiInfo.Blocks} blocks of {scsiInfo.BlockSize} bytes/each. (for a total of {totalSize} bytes)";
-            }
+        string result = await dlgSaveBinary.ShowAsync(_view);
 
-            if(scsiInfo.MediaSerialNumber != null)
-            {
-                var sbSerial = new StringBuilder();
+        if(result is null)
+            return;
 
-                for(int i = 4; i < scsiInfo.MediaSerialNumber.Length; i++)
-                    sbSerial.AppendFormat("{0:X2}", scsiInfo.MediaSerialNumber[i]);
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(data, 0, data.Length);
 
-                MediaSerial = sbSerial.ToString();
-            }
+        saveFs.Close();
+    }
 
-            SaveReadMediaSerialVisible = scsiInfo.MediaSerialNumber != null;
-            SaveReadCapacityVisible    = scsiInfo.ReadCapacity      != null;
-            SaveReadCapacity16Visible  = scsiInfo.ReadCapacity16    != null;
+    void ExecuteSaveReadMediaSerialCommand() => SaveElement(_scsiInfo.MediaSerialNumber);
 
-            SaveGetConfigurationVisible       = scsiInfo.MmcConfiguration       != null;
-            SaveRecognizedFormatLayersVisible = scsiInfo.RecognizedFormatLayers != null;
-            SaveWriteProtectionStatusVisible  = scsiInfo.WriteProtectionStatus  != null;
+    void ExecuteSaveReadCapacityCommand() => SaveElement(_scsiInfo.ReadCapacity);
 
-            MmcVisible = SaveGetConfigurationVisible || SaveRecognizedFormatLayersVisible ||
-                         SaveWriteProtectionStatusVisible;
+    void ExecuteSaveReadCapacity16Command() => SaveElement(_scsiInfo.ReadCapacity16);
 
-            if(scsiInfo.DensitySupportHeader.HasValue)
-                DensitySupport = Decoders.SCSI.SSC.DensitySupport.PrettifyDensity(scsiInfo.DensitySupportHeader);
+    void ExecuteSaveGetConfigurationCommand() => SaveElement(_scsiInfo.MmcConfiguration);
 
-            if(scsiInfo.MediaTypeSupportHeader.HasValue)
-                MediumSupport = Decoders.SCSI.SSC.DensitySupport.PrettifyMediumType(scsiInfo.MediaTypeSupportHeader);
+    void ExecuteSaveRecognizedFormatLayersCommand() => SaveElement(_scsiInfo.RecognizedFormatLayers);
 
-            SaveDensitySupportVisible = scsiInfo.DensitySupport   != null;
-            SaveMediumSupportVisible  = scsiInfo.MediaTypeSupport != null;
+    void ExecuteSaveWriteProtectionStatusCommand() => SaveElement(_scsiInfo.WriteProtectionStatus);
 
-            SscVisible = SaveDensitySupportVisible || SaveMediumSupportVisible;
+    void ExecuteSaveDensitySupportCommand() => SaveElement(_scsiInfo.DensitySupport);
 
-            CompactDiscInfo = new CompactDiscInfo
-            {
-                DataContext = new CompactDiscInfoViewModel(scsiInfo.Toc, scsiInfo.Atip, scsiInfo.DiscInformation,
-                                                           scsiInfo.Session, scsiInfo.RawToc, scsiInfo.Pma,
-                                                           scsiInfo.CdTextLeadIn, scsiInfo.DecodedToc,
-                                                           scsiInfo.DecodedAtip, scsiInfo.DecodedSession,
-                                                           scsiInfo.FullToc, scsiInfo.DecodedCdTextLeadIn,
-                                                           scsiInfo.DecodedDiscInformation, scsiInfo.Mcn,
-                                                           scsiInfo.Isrcs, _view)
-            };
+    void ExecuteSaveMediumSupportCommand() => SaveElement(_scsiInfo.MediaTypeSupport);
 
-            DvdInfo = new DvdInfo
-            {
-                DataContext = new DvdInfoViewModel(scsiInfo.MediaType, scsiInfo.DvdPfi, scsiInfo.DvdDmi,
-                                                   scsiInfo.DvdCmi, scsiInfo.HddvdCopyrightInformation, scsiInfo.DvdBca,
-                                                   scsiInfo.DvdAacs, scsiInfo.DecodedPfi, _view)
-            };
+    async void ExecuteDumpCommand()
+    {
+        if(_scsiInfo.MediaType == CommonTypes.MediaType.GDR ||
+           _scsiInfo.MediaType == CommonTypes.MediaType.GDROM)
+        {
+            await MessageBoxManager.
+                  GetMessageBoxStandardWindow("Error", "GD-ROM dump support is not yet implemented.", ButtonEnum.Ok,
+                                              Icon.Error).ShowDialog(_view);
 
-            XboxInfo = new XboxInfo
-            {
-                DataContext = new XboxInfoViewModel(scsiInfo.XgdInfo, scsiInfo.DvdDmi, scsiInfo.XboxSecuritySector,
-                                                    scsiInfo.DecodedXboxSecuritySector, _view)
-            };
-
-            DvdWritableInfo = new DvdWritableInfo
-            {
-                DataContext = new DvdWritableInfoViewModel(scsiInfo.MediaType, scsiInfo.DvdRamDds,
-                                                           scsiInfo.DvdRamCartridgeStatus, scsiInfo.DvdRamSpareArea,
-                                                           scsiInfo.LastBorderOutRmd, scsiInfo.DvdPreRecordedInfo,
-                                                           scsiInfo.DvdrMediaIdentifier,
-                                                           scsiInfo.DvdrPhysicalInformation,
-                                                           scsiInfo.HddvdrMediumStatus, scsiInfo.HddvdrLastRmd,
-                                                           scsiInfo.DvdrLayerCapacity, scsiInfo.DvdrDlMiddleZoneStart,
-                                                           scsiInfo.DvdrDlJumpIntervalSize,
-                                                           scsiInfo.DvdrDlManualLayerJumpStartLba,
-                                                           scsiInfo.DvdrDlRemapAnchorPoint, scsiInfo.DvdPlusAdip,
-                                                           scsiInfo.DvdPlusDcb, _view)
-            };
-
-            BlurayInfo = new BlurayInfo
-            {
-                DataContext = new BlurayInfoViewModel(scsiInfo.BlurayDiscInformation, scsiInfo.BlurayBurstCuttingArea,
-                                                      scsiInfo.BlurayDds, scsiInfo.BlurayCartridgeStatus,
-                                                      scsiInfo.BluraySpareAreaInformation, scsiInfo.BlurayPowResources,
-                                                      scsiInfo.BlurayTrackResources, scsiInfo.BlurayRawDfl,
-                                                      scsiInfo.BlurayPac, _view)
-            };
+            return;
         }
 
-        public ReactiveCommand<Unit, Unit> SaveReadMediaSerialCommand        { get; }
-        public ReactiveCommand<Unit, Unit> SaveReadCapacityCommand           { get; }
-        public ReactiveCommand<Unit, Unit> SaveReadCapacity16Command         { get; }
-        public ReactiveCommand<Unit, Unit> SaveGetConfigurationCommand       { get; }
-        public ReactiveCommand<Unit, Unit> SaveRecognizedFormatLayersCommand { get; }
-        public ReactiveCommand<Unit, Unit> SaveWriteProtectionStatusCommand  { get; }
-        public ReactiveCommand<Unit, Unit> SaveDensitySupportCommand         { get; }
-        public ReactiveCommand<Unit, Unit> SaveMediumSupportCommand          { get; }
-        public ReactiveCommand<Unit, Unit> DumpCommand                       { get; }
-        public ReactiveCommand<Unit, Unit> ScanCommand                       { get; }
-
-        public Bitmap MediaLogo
+        if((_scsiInfo.MediaType == CommonTypes.MediaType.XGD || _scsiInfo.MediaType == CommonTypes.MediaType.XGD2 ||
+            _scsiInfo.MediaType == CommonTypes.MediaType.XGD3) &&
+           _scsiInfo.DeviceInfo.ScsiInquiry?.KreonPresent != true)
         {
-            get => _mediaLogo;
-            set => this.RaiseAndSetIfChanged(ref _mediaLogo, value);
+            await MessageBoxManager.
+                  GetMessageBoxStandardWindow("Error", "Dumping Xbox discs require a Kreon drive.", ButtonEnum.Ok,
+                                              Icon.Error).ShowDialog(_view);
+
+            return;
         }
 
-        public string GeneralVisible
+        var mediaDumpWindow = new MediaDump();
+
+        mediaDumpWindow.DataContext =
+            new MediaDumpViewModel(_devicePath, _scsiInfo.DeviceInfo, mediaDumpWindow, _scsiInfo);
+
+        mediaDumpWindow.Show();
+    }
+
+    async void ExecuteScanCommand()
+    {
+        switch(_scsiInfo.MediaType)
         {
-            get => _generalVisible;
-            set => this.RaiseAndSetIfChanged(ref _generalVisible, value);
-        }
-
-        public string MediaType
-        {
-            get => _mediaType;
-            set => this.RaiseAndSetIfChanged(ref _mediaType, value);
-        }
-
-        public string MediaSize
-        {
-            get => _mediaSize;
-            set => this.RaiseAndSetIfChanged(ref _mediaSize, value);
-        }
-
-        public string MediaSerial
-        {
-            get => _mediaSerial;
-            set => this.RaiseAndSetIfChanged(ref _mediaSerial, value);
-        }
-
-        public bool SaveReadMediaSerialVisible
-        {
-            get => _saveReadMediaSerialVisible;
-            set => this.RaiseAndSetIfChanged(ref _saveReadMediaSerialVisible, value);
-        }
-
-        public bool SaveReadCapacityVisible
-        {
-            get => _saveReadCapacityVisible;
-            set => this.RaiseAndSetIfChanged(ref _saveReadCapacityVisible, value);
-        }
-
-        public bool SaveReadCapacity16Visible
-        {
-            get => _saveReadCapacity16Visible;
-            set => this.RaiseAndSetIfChanged(ref _saveReadCapacity16Visible, value);
-        }
-
-        public bool MmcVisible
-        {
-            get => _mmcVisible;
-            set => this.RaiseAndSetIfChanged(ref _mmcVisible, value);
-        }
-
-        public bool SaveGetConfigurationVisible
-        {
-            get => _saveGetConfigurationVisible;
-            set => this.RaiseAndSetIfChanged(ref _saveGetConfigurationVisible, value);
-        }
-
-        public bool SaveRecognizedFormatLayersVisible
-        {
-            get => _saveRecognizedFormatLayersVisible;
-            set => this.RaiseAndSetIfChanged(ref _saveRecognizedFormatLayersVisible, value);
-        }
-
-        public bool SaveWriteProtectionStatusVisible
-        {
-            get => _saveWriteProtectionStatusVisible;
-            set => this.RaiseAndSetIfChanged(ref _saveWriteProtectionStatusVisible, value);
-        }
-
-        public bool SscVisible
-        {
-            get => _sscVisible;
-            set => this.RaiseAndSetIfChanged(ref _sscVisible, value);
-        }
-
-        public string DensitySupport
-        {
-            get => _densitySupport;
-            set => this.RaiseAndSetIfChanged(ref _densitySupport, value);
-        }
-
-        public string MediumSupport
-        {
-            get => _mediumSupport;
-            set => this.RaiseAndSetIfChanged(ref _mediumSupport, value);
-        }
-
-        public bool SaveDensitySupportVisible
-        {
-            get => _saveDensitySupportVisible;
-            set => this.RaiseAndSetIfChanged(ref _saveDensitySupportVisible, value);
-        }
-
-        public bool SaveMediumSupportVisible
-        {
-            get => _saveMediumSupportVisible;
-            set => this.RaiseAndSetIfChanged(ref _saveMediumSupportVisible, value);
-        }
-
-        public CompactDiscInfo CompactDiscInfo
-        {
-            get => _compactDiscInfo;
-            set => this.RaiseAndSetIfChanged(ref _compactDiscInfo, value);
-        }
-
-        public DvdInfo DvdInfo
-        {
-            get => _dvdInfo;
-            set => this.RaiseAndSetIfChanged(ref _dvdInfo, value);
-        }
-
-        public DvdWritableInfo DvdWritableInfo
-        {
-            get => _dvdWritableInfo;
-            set => this.RaiseAndSetIfChanged(ref _dvdWritableInfo, value);
-        }
-
-        public XboxInfo XboxInfo
-        {
-            get => _xboxInfo;
-            set => this.RaiseAndSetIfChanged(ref _xboxInfo, value);
-        }
-
-        public BlurayInfo BlurayInfo
-        {
-            get => _blurayInfo;
-            set => this.RaiseAndSetIfChanged(ref _blurayInfo, value);
-        }
-
-        async void SaveElement(byte[] data)
-        {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
-
-            string result = await dlgSaveBinary.ShowAsync(_view);
-
-            if(result is null)
-                return;
-
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(data, 0, data.Length);
-
-            saveFs.Close();
-        }
-
-        void ExecuteSaveReadMediaSerialCommand() => SaveElement(_scsiInfo.MediaSerialNumber);
-
-        void ExecuteSaveReadCapacityCommand() => SaveElement(_scsiInfo.ReadCapacity);
-
-        void ExecuteSaveReadCapacity16Command() => SaveElement(_scsiInfo.ReadCapacity16);
-
-        void ExecuteSaveGetConfigurationCommand() => SaveElement(_scsiInfo.MmcConfiguration);
-
-        void ExecuteSaveRecognizedFormatLayersCommand() => SaveElement(_scsiInfo.RecognizedFormatLayers);
-
-        void ExecuteSaveWriteProtectionStatusCommand() => SaveElement(_scsiInfo.WriteProtectionStatus);
-
-        void ExecuteSaveDensitySupportCommand() => SaveElement(_scsiInfo.DensitySupport);
-
-        void ExecuteSaveMediumSupportCommand() => SaveElement(_scsiInfo.MediaTypeSupport);
-
-        async void ExecuteDumpCommand()
-        {
-            if(_scsiInfo.MediaType == CommonTypes.MediaType.GDR ||
-               _scsiInfo.MediaType == CommonTypes.MediaType.GDROM)
-            {
+            // TODO: GD-ROM
+            case CommonTypes.MediaType.GDR:
+            case CommonTypes.MediaType.GDROM:
                 await MessageBoxManager.
-                      GetMessageBoxStandardWindow("Error", "GD-ROM dump support is not yet implemented.", ButtonEnum.Ok,
-                                                  Icon.Error).ShowDialog(_view);
+                      GetMessageBoxStandardWindow("Error", "GD-ROM scan support is not yet implemented.",
+                                                  ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
 
                 return;
-            }
 
-            if((_scsiInfo.MediaType == CommonTypes.MediaType.XGD || _scsiInfo.MediaType == CommonTypes.MediaType.XGD2 ||
-                _scsiInfo.MediaType == CommonTypes.MediaType.XGD3) &&
-               _scsiInfo.DeviceInfo.ScsiInquiry?.KreonPresent != true)
-            {
+            // TODO: Xbox
+            case CommonTypes.MediaType.XGD:
+            case CommonTypes.MediaType.XGD2:
+            case CommonTypes.MediaType.XGD3:
                 await MessageBoxManager.
-                      GetMessageBoxStandardWindow("Error", "Dumping Xbox discs require a Kreon drive.", ButtonEnum.Ok,
-                                                  Icon.Error).ShowDialog(_view);
+                      GetMessageBoxStandardWindow("Error", "Scanning Xbox discs is not yet supported.",
+                                                  ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
 
                 return;
-            }
-
-            var mediaDumpWindow = new MediaDump();
-
-            mediaDumpWindow.DataContext =
-                new MediaDumpViewModel(_devicePath, _scsiInfo.DeviceInfo, mediaDumpWindow, _scsiInfo);
-
-            mediaDumpWindow.Show();
         }
 
-        async void ExecuteScanCommand()
-        {
-            switch(_scsiInfo.MediaType)
-            {
-                // TODO: GD-ROM
-                case CommonTypes.MediaType.GDR:
-                case CommonTypes.MediaType.GDROM:
-                    await MessageBoxManager.
-                          GetMessageBoxStandardWindow("Error", "GD-ROM scan support is not yet implemented.",
-                                                      ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
+        var mediaScanWindow = new MediaScan();
 
-                    return;
+        mediaScanWindow.DataContext = new MediaScanViewModel(_devicePath, mediaScanWindow);
 
-                // TODO: Xbox
-                case CommonTypes.MediaType.XGD:
-                case CommonTypes.MediaType.XGD2:
-                case CommonTypes.MediaType.XGD3:
-                    await MessageBoxManager.
-                          GetMessageBoxStandardWindow("Error", "Scanning Xbox discs is not yet supported.",
-                                                      ButtonEnum.Ok, Icon.Error).ShowDialog(_view);
-
-                    return;
-            }
-
-            var mediaScanWindow = new MediaScan();
-
-            mediaScanWindow.DataContext = new MediaScanViewModel(_devicePath, mediaScanWindow);
-
-            mediaScanWindow.Show();
-        }
+        mediaScanWindow.Show();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs b/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs
index 79ca8d48c..01d6cad2f 100644
--- a/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/PartitionViewModel.cs
@@ -32,25 +32,24 @@
 
 using Aaru.CommonTypes;
 
-namespace Aaru.Gui.ViewModels.Panels
-{
-    public sealed class PartitionViewModel
-    {
-        public PartitionViewModel(Partition partition)
-        {
-            NameText             = $"Partition name: {partition.Name}";
-            TypeText             = $"Partition type: {partition.Type}";
-            StartText            = $"Partition start: sector {partition.Start}, byte {partition.Offset}";
-            LengthText           = $"Partition length: {partition.Length} sectors, {partition.Size} bytes";
-            DescriptionLabelText = "Partition description:";
-            DescriptionText      = partition.Description;
-        }
+namespace Aaru.Gui.ViewModels.Panels;
 
-        public string NameText             { get; }
-        public string TypeText             { get; }
-        public string StartText            { get; }
-        public string LengthText           { get; }
-        public string DescriptionLabelText { get; }
-        public string DescriptionText      { get; }
+public sealed class PartitionViewModel
+{
+    public PartitionViewModel(Partition partition)
+    {
+        NameText             = $"Partition name: {partition.Name}";
+        TypeText             = $"Partition type: {partition.Type}";
+        StartText            = $"Partition start: sector {partition.Start}, byte {partition.Offset}";
+        LengthText           = $"Partition length: {partition.Length} sectors, {partition.Size} bytes";
+        DescriptionLabelText = "Partition description:";
+        DescriptionText      = partition.Description;
     }
+
+    public string NameText             { get; }
+    public string TypeText             { get; }
+    public string StartText            { get; }
+    public string LengthText           { get; }
+    public string DescriptionLabelText { get; }
+    public string DescriptionText      { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
index d5e5e3ff1..e475870d3 100644
--- a/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
+++ b/Aaru.Gui/ViewModels/Panels/SubdirectoryViewModel.cs
@@ -49,221 +49,204 @@ using MessageBox.Avalonia.Enums;
 using ReactiveUI;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Gui.ViewModels.Panels
+namespace Aaru.Gui.ViewModels.Panels;
+
+public sealed class SubdirectoryViewModel
 {
-    public sealed class SubdirectoryViewModel
+    readonly SubdirectoryModel _model;
+    readonly Window            _view;
+
+    public SubdirectoryViewModel([NotNull] SubdirectoryModel model, Window view)
     {
-        readonly SubdirectoryModel _model;
-        readonly Window            _view;
+        Entries             = new ObservableCollection<FileModel>();
+        SelectedEntries     = new List<FileModel>();
+        ExtractFilesCommand = ReactiveCommand.Create(ExecuteExtractFilesCommand);
+        _model              = model;
+        _view               = view;
 
-        public SubdirectoryViewModel([NotNull] SubdirectoryModel model, Window view)
+        ErrorNumber errno = model.Plugin.ReadDir(model.Path, out List<string> dirents);
+
+        if(errno != ErrorNumber.NoError)
         {
-            Entries             = new ObservableCollection<FileModel>();
-            SelectedEntries     = new List<FileModel>();
-            ExtractFilesCommand = ReactiveCommand.Create(ExecuteExtractFilesCommand);
-            _model              = model;
-            _view               = view;
+            MessageBoxManager.
+                GetMessageBoxStandardWindow("Error",
+                                            $"Error {errno} trying to read \"{model.Path}\" of chosen filesystem",
+                                            ButtonEnum.Ok, Icon.Error).ShowDialog(view);
 
-            ErrorNumber errno = model.Plugin.ReadDir(model.Path, out List<string> dirents);
+            return;
+        }
+
+        foreach(string dirent in dirents)
+        {
+            errno = model.Plugin.Stat(model.Path + "/" + dirent, out FileEntryInfo stat);
 
             if(errno != ErrorNumber.NoError)
             {
-                MessageBoxManager.
-                    GetMessageBoxStandardWindow("Error",
-                                                $"Error {errno} trying to read \"{model.Path}\" of chosen filesystem",
-                                                ButtonEnum.Ok, Icon.Error).ShowDialog(view);
+                AaruConsole.
+                    ErrorWriteLine($"Error {errno} trying to get information about filesystem entry named {dirent}");
 
-                return;
+                continue;
             }
 
-            foreach(string dirent in dirents)
+            if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
+               !model.Listed)
             {
-                errno = model.Plugin.Stat(model.Path + "/" + dirent, out FileEntryInfo stat);
-
-                if(errno != ErrorNumber.NoError)
+                model.Subdirectories.Add(new SubdirectoryModel
                 {
-                    AaruConsole.
-                        ErrorWriteLine($"Error {errno} trying to get information about filesystem entry named {dirent}");
-
-                    continue;
-                }
-
-                if(stat.Attributes.HasFlag(FileAttributes.Directory) &&
-                   !model.Listed)
-                {
-                    model.Subdirectories.Add(new SubdirectoryModel
-                    {
-                        Name   = dirent,
-                        Path   = model.Path + "/" + dirent,
-                        Plugin = model.Plugin
-                    });
-
-                    continue;
-                }
-
-                Entries.Add(new FileModel
-                {
-                    Name = dirent,
-                    Stat = stat
+                    Name   = dirent,
+                    Path   = model.Path + "/" + dirent,
+                    Plugin = model.Plugin
                 });
+
+                continue;
             }
+
+            Entries.Add(new FileModel
+            {
+                Name = dirent,
+                Stat = stat
+            });
         }
+    }
 
-        public ObservableCollection<FileModel> Entries             { get; }
-        public List<FileModel>                 SelectedEntries     { get; }
-        public ReactiveCommand<Unit, Unit>     ExtractFilesCommand { get; }
+    public ObservableCollection<FileModel> Entries             { get; }
+    public List<FileModel>                 SelectedEntries     { get; }
+    public ReactiveCommand<Unit, Unit>     ExtractFilesCommand { get; }
 
-        async void ExecuteExtractFilesCommand()
+    async void ExecuteExtractFilesCommand()
+    {
+        if(SelectedEntries.Count == 0)
+            return;
+
+        ButtonResult mboxResult;
+
+        var saveFilesFolderDialog = new OpenFolderDialog
         {
-            if(SelectedEntries.Count == 0)
-                return;
+            Title = "Choose destination folder..."
+        };
 
-            ButtonResult mboxResult;
+        string result = await saveFilesFolderDialog.ShowAsync(_view);
 
-            var saveFilesFolderDialog = new OpenFolderDialog
-            {
-                Title = "Choose destination folder..."
-            };
+        if(result is null)
+            return;
 
-            string result = await saveFilesFolderDialog.ShowAsync(_view);
+        Statistics.AddCommand("extract-files");
 
-            if(result is null)
-                return;
+        string folder = saveFilesFolderDialog.Directory;
 
-            Statistics.AddCommand("extract-files");
+        foreach(FileModel file in SelectedEntries)
+        {
+            string filename = file.Name;
 
-            string folder = saveFilesFolderDialog.Directory;
+            if(DetectOS.IsWindows)
+                if(filename.Contains('<')                ||
+                   filename.Contains('>')                ||
+                   filename.Contains(':')                ||
+                   filename.Contains('\\')               ||
+                   filename.Contains('/')                ||
+                   filename.Contains('|')                ||
+                   filename.Contains('?')                ||
+                   filename.Contains('*')                ||
+                   filename.Any(c => c < 32)             ||
+                   filename.ToUpperInvariant() == "CON"  ||
+                   filename.ToUpperInvariant() == "PRN"  ||
+                   filename.ToUpperInvariant() == "AUX"  ||
+                   filename.ToUpperInvariant() == "COM1" ||
+                   filename.ToUpperInvariant() == "COM2" ||
+                   filename.ToUpperInvariant() == "COM3" ||
+                   filename.ToUpperInvariant() == "COM4" ||
+                   filename.ToUpperInvariant() == "COM5" ||
+                   filename.ToUpperInvariant() == "COM6" ||
+                   filename.ToUpperInvariant() == "COM7" ||
+                   filename.ToUpperInvariant() == "COM8" ||
+                   filename.ToUpperInvariant() == "COM9" ||
+                   filename.ToUpperInvariant() == "LPT1" ||
+                   filename.ToUpperInvariant() == "LPT2" ||
+                   filename.ToUpperInvariant() == "LPT3" ||
+                   filename.ToUpperInvariant() == "LPT4" ||
+                   filename.ToUpperInvariant() == "LPT5" ||
+                   filename.ToUpperInvariant() == "LPT6" ||
+                   filename.ToUpperInvariant() == "LPT7" ||
+                   filename.ToUpperInvariant() == "LPT8" ||
+                   filename.ToUpperInvariant() == "LPT9" ||
+                   filename.Last()             == '.'    ||
+                   filename.Last()             == ' ')
+                {
+                    char[] chars;
 
-            foreach(FileModel file in SelectedEntries)
-            {
-                string filename = file.Name;
+                    if(filename.Last() == '.' ||
+                       filename.Last() == ' ')
+                        chars = new char[filename.Length - 1];
+                    else
+                        chars = new char[filename.Length];
 
-                if(DetectOS.IsWindows)
-                    if(filename.Contains('<')                ||
-                       filename.Contains('>')                ||
-                       filename.Contains(':')                ||
-                       filename.Contains('\\')               ||
-                       filename.Contains('/')                ||
-                       filename.Contains('|')                ||
-                       filename.Contains('?')                ||
-                       filename.Contains('*')                ||
-                       filename.Any(c => c < 32)             ||
-                       filename.ToUpperInvariant() == "CON"  ||
-                       filename.ToUpperInvariant() == "PRN"  ||
-                       filename.ToUpperInvariant() == "AUX"  ||
-                       filename.ToUpperInvariant() == "COM1" ||
-                       filename.ToUpperInvariant() == "COM2" ||
-                       filename.ToUpperInvariant() == "COM3" ||
-                       filename.ToUpperInvariant() == "COM4" ||
-                       filename.ToUpperInvariant() == "COM5" ||
-                       filename.ToUpperInvariant() == "COM6" ||
-                       filename.ToUpperInvariant() == "COM7" ||
-                       filename.ToUpperInvariant() == "COM8" ||
-                       filename.ToUpperInvariant() == "COM9" ||
-                       filename.ToUpperInvariant() == "LPT1" ||
-                       filename.ToUpperInvariant() == "LPT2" ||
-                       filename.ToUpperInvariant() == "LPT3" ||
-                       filename.ToUpperInvariant() == "LPT4" ||
-                       filename.ToUpperInvariant() == "LPT5" ||
-                       filename.ToUpperInvariant() == "LPT6" ||
-                       filename.ToUpperInvariant() == "LPT7" ||
-                       filename.ToUpperInvariant() == "LPT8" ||
-                       filename.ToUpperInvariant() == "LPT9" ||
-                       filename.Last()             == '.'    ||
-                       filename.Last()             == ' ')
-                    {
-                        char[] chars;
-
-                        if(filename.Last() == '.' ||
-                           filename.Last() == ' ')
-                            chars = new char[filename.Length - 1];
-                        else
-                            chars = new char[filename.Length];
-
-                        for(int ci = 0; ci < chars.Length; ci++)
-                            switch(filename[ci])
-                            {
-                                case '<':
-                                case '>':
-                                case ':':
-                                case '\\':
-                                case '/':
-                                case '|':
-                                case '?':
-                                case '*':
-                                case '\u0000':
-                                case '\u0001':
-                                case '\u0002':
-                                case '\u0003':
-                                case '\u0004':
-                                case '\u0005':
-                                case '\u0006':
-                                case '\u0007':
-                                case '\u0008':
-                                case '\u0009':
-                                case '\u000A':
-                                case '\u000B':
-                                case '\u000C':
-                                case '\u000D':
-                                case '\u000E':
-                                case '\u000F':
-                                case '\u0010':
-                                case '\u0011':
-                                case '\u0012':
-                                case '\u0013':
-                                case '\u0014':
-                                case '\u0015':
-                                case '\u0016':
-                                case '\u0017':
-                                case '\u0018':
-                                case '\u0019':
-                                case '\u001A':
-                                case '\u001B':
-                                case '\u001C':
-                                case '\u001D':
-                                case '\u001E':
-                                case '\u001F':
-                                    chars[ci] = '_';
-
-                                    break;
-                                default:
-                                    chars[ci] = filename[ci];
-
-                                    break;
-                            }
-
-                        if(filename.StartsWith("CON", StringComparison.InvariantCultureIgnoreCase) ||
-                           filename.StartsWith("PRN", StringComparison.InvariantCultureIgnoreCase) ||
-                           filename.StartsWith("AUX", StringComparison.InvariantCultureIgnoreCase) ||
-                           filename.StartsWith("COM", StringComparison.InvariantCultureIgnoreCase) ||
-                           filename.StartsWith("LPT", StringComparison.InvariantCultureIgnoreCase))
+                    for(int ci = 0; ci < chars.Length; ci++)
+                        switch(filename[ci])
                         {
-                            chars[0] = '_';
-                            chars[1] = '_';
-                            chars[2] = '_';
+                            case '<':
+                            case '>':
+                            case ':':
+                            case '\\':
+                            case '/':
+                            case '|':
+                            case '?':
+                            case '*':
+                            case '\u0000':
+                            case '\u0001':
+                            case '\u0002':
+                            case '\u0003':
+                            case '\u0004':
+                            case '\u0005':
+                            case '\u0006':
+                            case '\u0007':
+                            case '\u0008':
+                            case '\u0009':
+                            case '\u000A':
+                            case '\u000B':
+                            case '\u000C':
+                            case '\u000D':
+                            case '\u000E':
+                            case '\u000F':
+                            case '\u0010':
+                            case '\u0011':
+                            case '\u0012':
+                            case '\u0013':
+                            case '\u0014':
+                            case '\u0015':
+                            case '\u0016':
+                            case '\u0017':
+                            case '\u0018':
+                            case '\u0019':
+                            case '\u001A':
+                            case '\u001B':
+                            case '\u001C':
+                            case '\u001D':
+                            case '\u001E':
+                            case '\u001F':
+                                chars[ci] = '_';
+
+                                break;
+                            default:
+                                chars[ci] = filename[ci];
+
+                                break;
                         }
 
-                        string corrected = new(chars);
-
-                        mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow("Unsupported filename",
-                                         $"The file name {filename} is not supported on this platform.\nDo you want to rename it to {corrected}?",
-                                         ButtonEnum.YesNoCancel, Icon.Warning).ShowDialog(_view);
-
-                        if(mboxResult == ButtonResult.Cancel)
-                            return;
-
-                        if(mboxResult == ButtonResult.No)
-                            continue;
-
-                        filename = corrected;
+                    if(filename.StartsWith("CON", StringComparison.InvariantCultureIgnoreCase) ||
+                       filename.StartsWith("PRN", StringComparison.InvariantCultureIgnoreCase) ||
+                       filename.StartsWith("AUX", StringComparison.InvariantCultureIgnoreCase) ||
+                       filename.StartsWith("COM", StringComparison.InvariantCultureIgnoreCase) ||
+                       filename.StartsWith("LPT", StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        chars[0] = '_';
+                        chars[1] = '_';
+                        chars[2] = '_';
                     }
 
-                string outputPath = Path.Combine(folder, filename);
+                    string corrected = new(chars);
 
-                if(File.Exists(outputPath))
-                {
-                    mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow("Existing file",
-                                     $"A file named {filename} already exists on the destination folder.\nDo you want to overwrite it?",
+                    mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow("Unsupported filename",
+                                     $"The file name {filename} is not supported on this platform.\nDo you want to rename it to {corrected}?",
                                      ButtonEnum.YesNoCancel, Icon.Warning).ShowDialog(_view);
 
                     if(mboxResult == ButtonResult.Cancel)
@@ -272,87 +255,103 @@ namespace Aaru.Gui.ViewModels.Panels
                     if(mboxResult == ButtonResult.No)
                         continue;
 
-                    try
-                    {
-                        File.Delete(outputPath);
-                    }
-                    catch(IOException)
-                    {
-                        mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow("Cannot delete",
-                                         "Could not delete existing file.\nDo you want to continue?",
-                                         ButtonEnum.YesNo, Icon.Error).ShowDialog(_view);
-
-                        if(mboxResult == ButtonResult.No)
-                            return;
-                    }
+                    filename = corrected;
                 }
 
+            string outputPath = Path.Combine(folder, filename);
+
+            if(File.Exists(outputPath))
+            {
+                mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow("Existing file",
+                                 $"A file named {filename} already exists on the destination folder.\nDo you want to overwrite it?",
+                                 ButtonEnum.YesNoCancel, Icon.Warning).ShowDialog(_view);
+
+                if(mboxResult == ButtonResult.Cancel)
+                    return;
+
+                if(mboxResult == ButtonResult.No)
+                    continue;
+
                 try
                 {
-                    byte[] outBuf = Array.Empty<byte>();
-
-                    ErrorNumber error =
-                        _model.Plugin.Read(_model.Path + "/" + file.Name, 0, file.Stat.Length, ref outBuf);
-
-                    if(error != ErrorNumber.NoError)
-                    {
-                        mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow("Error reading file",
-                                         $"Error {error} reading file.\nDo you want to continue?",
-                                         ButtonEnum.YesNo, Icon.Error).ShowDialog(_view);
-
-                        if(mboxResult == ButtonResult.No)
-                            return;
-
-                        continue;
-                    }
-
-                    var fs = new FileStream(outputPath, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None);
-
-                    fs.Write(outBuf, 0, outBuf.Length);
-                    fs.Close();
-                    var fi = new FileInfo(outputPath);
-                    #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
-                    try
-                    {
-                        if(file.Stat.CreationTimeUtc.HasValue)
-                            fi.CreationTimeUtc = file.Stat.CreationTimeUtc.Value;
-                    }
-                    catch
-                    {
-                        // ignored
-                    }
-
-                    try
-                    {
-                        if(file.Stat.LastWriteTimeUtc.HasValue)
-                            fi.LastWriteTimeUtc = file.Stat.LastWriteTimeUtc.Value;
-                    }
-                    catch
-                    {
-                        // ignored
-                    }
-
-                    try
-                    {
-                        if(file.Stat.AccessTimeUtc.HasValue)
-                            fi.LastAccessTimeUtc = file.Stat.AccessTimeUtc.Value;
-                    }
-                    catch
-                    {
-                        // ignored
-                    }
-                    #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
+                    File.Delete(outputPath);
                 }
                 catch(IOException)
                 {
-                    mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow("Cannot create file",
-                                     "Could not create destination file.\nDo you want to continue?",
+                    mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow("Cannot delete",
+                                     "Could not delete existing file.\nDo you want to continue?",
                                      ButtonEnum.YesNo, Icon.Error).ShowDialog(_view);
 
                     if(mboxResult == ButtonResult.No)
                         return;
                 }
             }
+
+            try
+            {
+                byte[] outBuf = Array.Empty<byte>();
+
+                ErrorNumber error =
+                    _model.Plugin.Read(_model.Path + "/" + file.Name, 0, file.Stat.Length, ref outBuf);
+
+                if(error != ErrorNumber.NoError)
+                {
+                    mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow("Error reading file",
+                                     $"Error {error} reading file.\nDo you want to continue?",
+                                     ButtonEnum.YesNo, Icon.Error).ShowDialog(_view);
+
+                    if(mboxResult == ButtonResult.No)
+                        return;
+
+                    continue;
+                }
+
+                var fs = new FileStream(outputPath, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None);
+
+                fs.Write(outBuf, 0, outBuf.Length);
+                fs.Close();
+                var fi = new FileInfo(outputPath);
+                #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
+                try
+                {
+                    if(file.Stat.CreationTimeUtc.HasValue)
+                        fi.CreationTimeUtc = file.Stat.CreationTimeUtc.Value;
+                }
+                catch
+                {
+                    // ignored
+                }
+
+                try
+                {
+                    if(file.Stat.LastWriteTimeUtc.HasValue)
+                        fi.LastWriteTimeUtc = file.Stat.LastWriteTimeUtc.Value;
+                }
+                catch
+                {
+                    // ignored
+                }
+
+                try
+                {
+                    if(file.Stat.AccessTimeUtc.HasValue)
+                        fi.LastAccessTimeUtc = file.Stat.AccessTimeUtc.Value;
+                }
+                catch
+                {
+                    // ignored
+                }
+                #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
+            }
+            catch(IOException)
+            {
+                mboxResult = await MessageBoxManager.GetMessageBoxStandardWindow("Cannot create file",
+                                 "Could not create destination file.\nDo you want to continue?",
+                                 ButtonEnum.YesNo, Icon.Error).ShowDialog(_view);
+
+                if(mboxResult == ButtonResult.No)
+                    return;
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs
index c35342e16..fe4a03ed3 100644
--- a/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/AtaInfoViewModel.cs
@@ -38,143 +38,142 @@ using Avalonia.Controls;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Tabs
+namespace Aaru.Gui.ViewModels.Tabs;
+
+public sealed class AtaInfoViewModel : ViewModelBase
 {
-    public sealed class AtaInfoViewModel : ViewModelBase
+    readonly byte[] _ata;
+    readonly byte[] _atapi;
+    readonly Window _view;
+
+    public AtaInfoViewModel([CanBeNull] byte[] ataIdentify, byte[] atapiIdentify,
+                            AtaErrorRegistersChs? ataMcptError, Window view)
     {
-        readonly byte[] _ata;
-        readonly byte[] _atapi;
-        readonly Window _view;
+        SaveAtaBinaryCommand = ReactiveCommand.Create(ExecuteSaveAtaBinaryCommand);
+        SaveAtaTextCommand   = ReactiveCommand.Create(ExecuteSaveAtaTextCommand);
 
-        public AtaInfoViewModel([CanBeNull] byte[] ataIdentify, byte[] atapiIdentify,
-                                AtaErrorRegistersChs? ataMcptError, Window view)
+        _ata   = ataIdentify;
+        _atapi = atapiIdentify;
+        _view  = view;
+
+        if(ataIdentify   == null &&
+           atapiIdentify == null)
+            return;
+
+        if(ataIdentify != null)
         {
-            SaveAtaBinaryCommand = ReactiveCommand.Create(ExecuteSaveAtaBinaryCommand);
-            SaveAtaTextCommand   = ReactiveCommand.Create(ExecuteSaveAtaTextCommand);
+            AtaMcptVisible = true;
+            AtaMcptChecked = ataMcptError.HasValue;
+            AtaOrAtapiText = "ATA IDENTIFY DEVICE";
 
-            _ata   = ataIdentify;
-            _atapi = atapiIdentify;
-            _view  = view;
-
-            if(ataIdentify   == null &&
-               atapiIdentify == null)
-                return;
-
-            if(ataIdentify != null)
+            if(ataMcptError.HasValue)
             {
-                AtaMcptVisible = true;
-                AtaMcptChecked = ataMcptError.HasValue;
-                AtaOrAtapiText = "ATA IDENTIFY DEVICE";
-
-                if(ataMcptError.HasValue)
+                switch(ataMcptError.Value.DeviceHead & 0x7)
                 {
-                    switch(ataMcptError.Value.DeviceHead & 0x7)
-                    {
-                        case 0:
-                            AtaMcptText = "Device reports incorrect media card type";
+                    case 0:
+                        AtaMcptText = "Device reports incorrect media card type";
 
-                            break;
-                        case 1:
-                            AtaMcptText = "Device contains a Secure Digital card";
+                        break;
+                    case 1:
+                        AtaMcptText = "Device contains a Secure Digital card";
 
-                            break;
-                        case 2:
-                            AtaMcptText = "Device contains a MultiMediaCard ";
+                        break;
+                    case 2:
+                        AtaMcptText = "Device contains a MultiMediaCard ";
 
-                            break;
-                        case 3:
-                            AtaMcptText = "Device contains a Secure Digital I/O card";
+                        break;
+                    case 3:
+                        AtaMcptText = "Device contains a Secure Digital I/O card";
 
-                            break;
-                        case 4:
-                            AtaMcptText = "Device contains a Smart Media card";
+                        break;
+                    case 4:
+                        AtaMcptText = "Device contains a Smart Media card";
 
-                            break;
-                        default:
-                            AtaMcptText =
-                                $"Device contains unknown media card type {ataMcptError.Value.DeviceHead & 0x07}";
+                        break;
+                    default:
+                        AtaMcptText =
+                            $"Device contains unknown media card type {ataMcptError.Value.DeviceHead & 0x07}";
 
-                            break;
-                    }
-
-                    AtaMcptWriteProtectionChecked = (ataMcptError.Value.DeviceHead & 0x08) == 0x08;
-
-                    ushort specificData = (ushort)((ataMcptError.Value.CylinderHigh * 0x100) +
-                                                   ataMcptError.Value.CylinderLow);
-
-                    AtaMcptSpecificDataText = $"Card specific data: 0x{specificData:X4}";
+                        break;
                 }
 
-                AtaIdentifyText = Identify.Prettify(_ata);
-            }
-            else
-            {
-                AtaOrAtapiText  = "ATA PACKET IDENTIFY DEVICE";
-                AtaIdentifyText = Identify.Prettify(_atapi);
+                AtaMcptWriteProtectionChecked = (ataMcptError.Value.DeviceHead & 0x08) == 0x08;
+
+                ushort specificData = (ushort)((ataMcptError.Value.CylinderHigh * 0x100) +
+                                               ataMcptError.Value.CylinderLow);
+
+                AtaMcptSpecificDataText = $"Card specific data: 0x{specificData:X4}";
             }
+
+            AtaIdentifyText = Identify.Prettify(_ata);
         }
-
-        public string                      AtaIdentifyText               { get; }
-        public string                      AtaMcptText                   { get; }
-        public string                      AtaMcptSpecificDataText       { get; }
-        public bool                        AtaMcptChecked                { get; }
-        public bool                        AtaMcptWriteProtectionChecked { get; }
-        public bool                        AtaMcptVisible                { get; }
-        public ReactiveCommand<Unit, Unit> SaveAtaBinaryCommand          { get; }
-        public ReactiveCommand<Unit, Unit> SaveAtaTextCommand            { get; }
-
-        public string AtaOrAtapiText { get; }
-
-        async void ExecuteSaveAtaBinaryCommand()
+        else
         {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
-
-            string result = await dlgSaveBinary.ShowAsync(_view);
-
-            if(result is null)
-                return;
-
-            var saveFs = new FileStream(result, FileMode.Create);
-
-            if(_ata != null)
-                saveFs.Write(_ata, 0, _ata.Length);
-            else if(_atapi != null)
-                saveFs.Write(_atapi, 0, _atapi.Length);
-
-            saveFs.Close();
-        }
-
-        async void ExecuteSaveAtaTextCommand()
-        {
-            var dlgSaveText = new SaveFileDialog();
-
-            dlgSaveText.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.txt"
-                }),
-                Name = "Text"
-            });
-
-            string result = await dlgSaveText.ShowAsync(_view);
-
-            if(result is null)
-                return;
-
-            var saveFs = new FileStream(result, FileMode.Create);
-            var saveSw = new StreamWriter(saveFs);
-            saveSw.Write(AtaIdentifyText);
-            saveFs.Close();
+            AtaOrAtapiText  = "ATA PACKET IDENTIFY DEVICE";
+            AtaIdentifyText = Identify.Prettify(_atapi);
         }
     }
+
+    public string                      AtaIdentifyText               { get; }
+    public string                      AtaMcptText                   { get; }
+    public string                      AtaMcptSpecificDataText       { get; }
+    public bool                        AtaMcptChecked                { get; }
+    public bool                        AtaMcptWriteProtectionChecked { get; }
+    public bool                        AtaMcptVisible                { get; }
+    public ReactiveCommand<Unit, Unit> SaveAtaBinaryCommand          { get; }
+    public ReactiveCommand<Unit, Unit> SaveAtaTextCommand            { get; }
+
+    public string AtaOrAtapiText { get; }
+
+    async void ExecuteSaveAtaBinaryCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+
+        if(_ata != null)
+            saveFs.Write(_ata, 0, _ata.Length);
+        else if(_atapi != null)
+            saveFs.Write(_atapi, 0, _atapi.Length);
+
+        saveFs.Close();
+    }
+
+    async void ExecuteSaveAtaTextCommand()
+    {
+        var dlgSaveText = new SaveFileDialog();
+
+        dlgSaveText.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.txt"
+            }),
+            Name = "Text"
+        });
+
+        string result = await dlgSaveText.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        var saveSw = new StreamWriter(saveFs);
+        saveSw.Write(AtaIdentifyText);
+        saveFs.Close();
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs
index 5e253c004..75a10ae81 100644
--- a/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/BlurayInfoViewModel.cs
@@ -39,162 +39,161 @@ using Avalonia.Controls;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Tabs
+namespace Aaru.Gui.ViewModels.Tabs;
+
+public sealed class BlurayInfoViewModel
 {
-    public sealed class BlurayInfoViewModel
+    readonly byte[] _burstCuttingArea;
+    readonly byte[] _cartridgeStatus;
+    readonly byte[] _dds;
+    readonly byte[] _discInformation;
+    readonly byte[] _pac;
+    readonly byte[] _powResources;
+    readonly byte[] _rawDfl;
+    readonly byte[] _spareAreaInformation;
+    readonly byte[] _trackResources;
+    readonly Window _view;
+
+    public BlurayInfoViewModel([CanBeNull] byte[] blurayDiscInformation, [CanBeNull] byte[] blurayBurstCuttingArea,
+                               [CanBeNull] byte[] blurayDds, [CanBeNull] byte[] blurayCartridgeStatus,
+                               [CanBeNull] byte[] bluraySpareAreaInformation, [CanBeNull] byte[] blurayPowResources,
+                               [CanBeNull] byte[] blurayTrackResources, [CanBeNull] byte[] blurayRawDfl,
+                               [CanBeNull] byte[] blurayPac, Window view)
     {
-        readonly byte[] _burstCuttingArea;
-        readonly byte[] _cartridgeStatus;
-        readonly byte[] _dds;
-        readonly byte[] _discInformation;
-        readonly byte[] _pac;
-        readonly byte[] _powResources;
-        readonly byte[] _rawDfl;
-        readonly byte[] _spareAreaInformation;
-        readonly byte[] _trackResources;
-        readonly Window _view;
+        _view                             = view;
+        _discInformation                  = blurayDiscInformation;
+        _burstCuttingArea                 = blurayBurstCuttingArea;
+        _dds                              = blurayDds;
+        _cartridgeStatus                  = blurayCartridgeStatus;
+        _spareAreaInformation             = bluraySpareAreaInformation;
+        _powResources                     = blurayPowResources;
+        _trackResources                   = blurayTrackResources;
+        _rawDfl                           = blurayRawDfl;
+        _pac                              = blurayPac;
+        SaveBlurayDiscInformationCommand  = ReactiveCommand.Create(ExecuteSaveBlurayDiscInformationCommand);
+        SaveBlurayBurstCuttingAreaCommand = ReactiveCommand.Create(ExecuteSaveBlurayBurstCuttingAreaCommand);
+        SaveBlurayDdsCommand              = ReactiveCommand.Create(ExecuteSaveBlurayDdsCommand);
+        SaveBlurayCartridgeStatusCommand  = ReactiveCommand.Create(ExecuteSaveBlurayCartridgeStatusCommand);
 
-        public BlurayInfoViewModel([CanBeNull] byte[] blurayDiscInformation, [CanBeNull] byte[] blurayBurstCuttingArea,
-                                   [CanBeNull] byte[] blurayDds, [CanBeNull] byte[] blurayCartridgeStatus,
-                                   [CanBeNull] byte[] bluraySpareAreaInformation, [CanBeNull] byte[] blurayPowResources,
-                                   [CanBeNull] byte[] blurayTrackResources, [CanBeNull] byte[] blurayRawDfl,
-                                   [CanBeNull] byte[] blurayPac, Window view)
+        SaveBluraySpareAreaInformationCommand =
+            ReactiveCommand.Create(ExecuteSaveBluraySpareAreaInformationCommand);
+
+        SaveBlurayPowResourcesCommand   = ReactiveCommand.Create(ExecuteSaveBlurayPowResourcesCommand);
+        SaveBlurayTrackResourcesCommand = ReactiveCommand.Create(ExecuteSaveBlurayTrackResourcesCommand);
+        SaveBlurayRawDflCommand         = ReactiveCommand.Create(ExecuteSaveBlurayRawDflCommand);
+        SaveBlurayPacCommand            = ReactiveCommand.Create(ExecuteSaveBlurayPacCommand);
+
+        if(blurayDiscInformation != null)
         {
-            _view                             = view;
-            _discInformation                  = blurayDiscInformation;
-            _burstCuttingArea                 = blurayBurstCuttingArea;
-            _dds                              = blurayDds;
-            _cartridgeStatus                  = blurayCartridgeStatus;
-            _spareAreaInformation             = bluraySpareAreaInformation;
-            _powResources                     = blurayPowResources;
-            _trackResources                   = blurayTrackResources;
-            _rawDfl                           = blurayRawDfl;
-            _pac                              = blurayPac;
-            SaveBlurayDiscInformationCommand  = ReactiveCommand.Create(ExecuteSaveBlurayDiscInformationCommand);
-            SaveBlurayBurstCuttingAreaCommand = ReactiveCommand.Create(ExecuteSaveBlurayBurstCuttingAreaCommand);
-            SaveBlurayDdsCommand              = ReactiveCommand.Create(ExecuteSaveBlurayDdsCommand);
-            SaveBlurayCartridgeStatusCommand  = ReactiveCommand.Create(ExecuteSaveBlurayCartridgeStatusCommand);
-
-            SaveBluraySpareAreaInformationCommand =
-                ReactiveCommand.Create(ExecuteSaveBluraySpareAreaInformationCommand);
-
-            SaveBlurayPowResourcesCommand   = ReactiveCommand.Create(ExecuteSaveBlurayPowResourcesCommand);
-            SaveBlurayTrackResourcesCommand = ReactiveCommand.Create(ExecuteSaveBlurayTrackResourcesCommand);
-            SaveBlurayRawDflCommand         = ReactiveCommand.Create(ExecuteSaveBlurayRawDflCommand);
-            SaveBlurayPacCommand            = ReactiveCommand.Create(ExecuteSaveBlurayPacCommand);
-
-            if(blurayDiscInformation != null)
-            {
-                SaveBlurayDiscInformationVisible = true;
-                BlurayDiscInformationText        = DI.Prettify(blurayDiscInformation);
-            }
-
-            if(blurayBurstCuttingArea != null)
-            {
-                SaveBlurayBurstCuttingAreaVisible = true;
-                BlurayBurstCuttingAreaText        = BCA.Prettify(blurayBurstCuttingArea);
-            }
-
-            if(blurayDds != null)
-            {
-                SaveBlurayDdsVisible = true;
-                BlurayDdsText        = DDS.Prettify(blurayDds);
-            }
-
-            if(blurayCartridgeStatus != null)
-            {
-                SaveBlurayCartridgeStatusVisible = true;
-                BlurayCartridgeStatusText        = Cartridge.Prettify(blurayCartridgeStatus);
-            }
-
-            if(bluraySpareAreaInformation != null)
-            {
-                SaveBluraySpareAreaInformationVisible = true;
-                BluraySpareAreaInformationText        = Spare.Prettify(bluraySpareAreaInformation);
-            }
-
-            if(blurayPowResources != null)
-            {
-                SaveBlurayPowResourcesVisible = true;
-                BlurayPowResourcesText        = DiscInformation.Prettify(blurayPowResources);
-            }
-
-            if(blurayTrackResources != null)
-            {
-                SaveBlurayTrackResourcesVisible = true;
-                BlurayTrackResourcesText        = DiscInformation.Prettify(blurayTrackResources);
-            }
-
-            SaveBlurayRawDflVisible = blurayRawDfl != null;
-            SaveBlurayPacVisible    = blurayPac    != null;
+            SaveBlurayDiscInformationVisible = true;
+            BlurayDiscInformationText        = DI.Prettify(blurayDiscInformation);
         }
 
-        public string                      BlurayDiscInformationText             { get; }
-        public string                      BlurayBurstCuttingAreaText            { get; }
-        public string                      BlurayDdsText                         { get; }
-        public string                      BlurayCartridgeStatusText             { get; }
-        public string                      BluraySpareAreaInformationText        { get; }
-        public string                      BlurayPowResourcesText                { get; }
-        public string                      BlurayTrackResourcesText              { get; }
-        public ReactiveCommand<Unit, Unit> SaveBlurayDiscInformationCommand      { get; }
-        public ReactiveCommand<Unit, Unit> SaveBlurayBurstCuttingAreaCommand     { get; }
-        public ReactiveCommand<Unit, Unit> SaveBlurayDdsCommand                  { get; }
-        public ReactiveCommand<Unit, Unit> SaveBlurayCartridgeStatusCommand      { get; }
-        public ReactiveCommand<Unit, Unit> SaveBluraySpareAreaInformationCommand { get; }
-        public ReactiveCommand<Unit, Unit> SaveBlurayPowResourcesCommand         { get; }
-        public ReactiveCommand<Unit, Unit> SaveBlurayTrackResourcesCommand       { get; }
-        public ReactiveCommand<Unit, Unit> SaveBlurayRawDflCommand               { get; }
-        public ReactiveCommand<Unit, Unit> SaveBlurayPacCommand                  { get; }
-        public bool                        SaveBlurayDiscInformationVisible      { get; }
-        public bool                        SaveBlurayBurstCuttingAreaVisible     { get; }
-        public bool                        SaveBlurayDdsVisible                  { get; }
-        public bool                        SaveBlurayCartridgeStatusVisible      { get; }
-        public bool                        SaveBluraySpareAreaInformationVisible { get; }
-        public bool                        SaveBlurayPowResourcesVisible         { get; }
-        public bool                        SaveBlurayTrackResourcesVisible       { get; }
-        public bool                        SaveBlurayRawDflVisible               { get; }
-        public bool                        SaveBlurayPacVisible                  { get; }
-
-        async void SaveElement(byte[] data)
+        if(blurayBurstCuttingArea != null)
         {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
-
-            string result = await dlgSaveBinary.ShowAsync(_view);
-
-            if(result is null)
-                return;
-
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(data, 0, data.Length);
-
-            saveFs.Close();
+            SaveBlurayBurstCuttingAreaVisible = true;
+            BlurayBurstCuttingAreaText        = BCA.Prettify(blurayBurstCuttingArea);
         }
 
-        void ExecuteSaveBlurayDiscInformationCommand() => SaveElement(_discInformation);
+        if(blurayDds != null)
+        {
+            SaveBlurayDdsVisible = true;
+            BlurayDdsText        = DDS.Prettify(blurayDds);
+        }
 
-        void ExecuteSaveBlurayBurstCuttingAreaCommand() => SaveElement(_burstCuttingArea);
+        if(blurayCartridgeStatus != null)
+        {
+            SaveBlurayCartridgeStatusVisible = true;
+            BlurayCartridgeStatusText        = Cartridge.Prettify(blurayCartridgeStatus);
+        }
 
-        void ExecuteSaveBlurayDdsCommand() => SaveElement(_dds);
+        if(bluraySpareAreaInformation != null)
+        {
+            SaveBluraySpareAreaInformationVisible = true;
+            BluraySpareAreaInformationText        = Spare.Prettify(bluraySpareAreaInformation);
+        }
 
-        void ExecuteSaveBlurayCartridgeStatusCommand() => SaveElement(_cartridgeStatus);
+        if(blurayPowResources != null)
+        {
+            SaveBlurayPowResourcesVisible = true;
+            BlurayPowResourcesText        = DiscInformation.Prettify(blurayPowResources);
+        }
 
-        void ExecuteSaveBluraySpareAreaInformationCommand() => SaveElement(_spareAreaInformation);
+        if(blurayTrackResources != null)
+        {
+            SaveBlurayTrackResourcesVisible = true;
+            BlurayTrackResourcesText        = DiscInformation.Prettify(blurayTrackResources);
+        }
 
-        void ExecuteSaveBlurayPowResourcesCommand() => SaveElement(_powResources);
-
-        void ExecuteSaveBlurayTrackResourcesCommand() => SaveElement(_trackResources);
-
-        void ExecuteSaveBlurayRawDflCommand() => SaveElement(_rawDfl);
-
-        void ExecuteSaveBlurayPacCommand() => SaveElement(_pac);
+        SaveBlurayRawDflVisible = blurayRawDfl != null;
+        SaveBlurayPacVisible    = blurayPac    != null;
     }
+
+    public string                      BlurayDiscInformationText             { get; }
+    public string                      BlurayBurstCuttingAreaText            { get; }
+    public string                      BlurayDdsText                         { get; }
+    public string                      BlurayCartridgeStatusText             { get; }
+    public string                      BluraySpareAreaInformationText        { get; }
+    public string                      BlurayPowResourcesText                { get; }
+    public string                      BlurayTrackResourcesText              { get; }
+    public ReactiveCommand<Unit, Unit> SaveBlurayDiscInformationCommand      { get; }
+    public ReactiveCommand<Unit, Unit> SaveBlurayBurstCuttingAreaCommand     { get; }
+    public ReactiveCommand<Unit, Unit> SaveBlurayDdsCommand                  { get; }
+    public ReactiveCommand<Unit, Unit> SaveBlurayCartridgeStatusCommand      { get; }
+    public ReactiveCommand<Unit, Unit> SaveBluraySpareAreaInformationCommand { get; }
+    public ReactiveCommand<Unit, Unit> SaveBlurayPowResourcesCommand         { get; }
+    public ReactiveCommand<Unit, Unit> SaveBlurayTrackResourcesCommand       { get; }
+    public ReactiveCommand<Unit, Unit> SaveBlurayRawDflCommand               { get; }
+    public ReactiveCommand<Unit, Unit> SaveBlurayPacCommand                  { get; }
+    public bool                        SaveBlurayDiscInformationVisible      { get; }
+    public bool                        SaveBlurayBurstCuttingAreaVisible     { get; }
+    public bool                        SaveBlurayDdsVisible                  { get; }
+    public bool                        SaveBlurayCartridgeStatusVisible      { get; }
+    public bool                        SaveBluraySpareAreaInformationVisible { get; }
+    public bool                        SaveBlurayPowResourcesVisible         { get; }
+    public bool                        SaveBlurayTrackResourcesVisible       { get; }
+    public bool                        SaveBlurayRawDflVisible               { get; }
+    public bool                        SaveBlurayPacVisible                  { get; }
+
+    async void SaveElement(byte[] data)
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(data, 0, data.Length);
+
+        saveFs.Close();
+    }
+
+    void ExecuteSaveBlurayDiscInformationCommand() => SaveElement(_discInformation);
+
+    void ExecuteSaveBlurayBurstCuttingAreaCommand() => SaveElement(_burstCuttingArea);
+
+    void ExecuteSaveBlurayDdsCommand() => SaveElement(_dds);
+
+    void ExecuteSaveBlurayCartridgeStatusCommand() => SaveElement(_cartridgeStatus);
+
+    void ExecuteSaveBluraySpareAreaInformationCommand() => SaveElement(_spareAreaInformation);
+
+    void ExecuteSaveBlurayPowResourcesCommand() => SaveElement(_powResources);
+
+    void ExecuteSaveBlurayTrackResourcesCommand() => SaveElement(_trackResources);
+
+    void ExecuteSaveBlurayRawDflCommand() => SaveElement(_rawDfl);
+
+    void ExecuteSaveBlurayPacCommand() => SaveElement(_pac);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs
index cfade5642..af8ee046e 100644
--- a/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/CompactDiscInfoViewModel.cs
@@ -40,263 +40,262 @@ using Aaru.Gui.Models;
 using Avalonia.Controls;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Tabs
+namespace Aaru.Gui.ViewModels.Tabs;
+
+public sealed class CompactDiscInfoViewModel : ViewModelBase
 {
-    public sealed class CompactDiscInfoViewModel : ViewModelBase
+    readonly byte[] _atipData;
+    readonly byte[] _cdTextLeadInData;
+    readonly byte[] _compactDiscInformationData;
+    readonly byte[] _pmaData;
+    readonly byte[] _rawTocData;
+    readonly byte[] _sessionData;
+    readonly byte[] _tocData;
+    readonly Window _view;
+
+    public CompactDiscInfoViewModel(byte[] toc, byte[] atip, byte[] compactDiscInformation, byte[] session,
+                                    byte[] rawToc, byte[] pma, byte[] cdTextLeadIn, TOC.CDTOC? decodedToc,
+                                    ATIP.CDATIP decodedAtip, Session.CDSessionInfo? decodedSession,
+                                    FullTOC.CDFullTOC? fullToc, CDTextOnLeadIn.CDText? decodedCdTextLeadIn,
+                                    DiscInformation.StandardDiscInformation? decodedCompactDiscInformation,
+                                    string mcn, Dictionary<byte, string> isrcs, Window view)
     {
-        readonly byte[] _atipData;
-        readonly byte[] _cdTextLeadInData;
-        readonly byte[] _compactDiscInformationData;
-        readonly byte[] _pmaData;
-        readonly byte[] _rawTocData;
-        readonly byte[] _sessionData;
-        readonly byte[] _tocData;
-        readonly Window _view;
+        _tocData                    = toc;
+        _atipData                   = atip;
+        _compactDiscInformationData = compactDiscInformation;
+        _sessionData                = session;
+        _rawTocData                 = rawToc;
+        _pmaData                    = pma;
+        _cdTextLeadInData           = cdTextLeadIn;
+        _view                       = view;
+        IsrcList                    = new ObservableCollection<IsrcModel>();
+        SaveCdInformationCommand    = ReactiveCommand.Create(ExecuteSaveCdInformationCommand);
+        SaveCdTocCommand            = ReactiveCommand.Create(ExecuteSaveCdTocCommand);
+        SaveCdFullTocCommand        = ReactiveCommand.Create(ExecuteSaveCdFullTocCommand);
+        SaveCdSessionCommand        = ReactiveCommand.Create(ExecuteSaveCdSessionCommand);
+        SaveCdTextCommand           = ReactiveCommand.Create(ExecuteSaveCdTextCommand);
+        SaveCdAtipCommand           = ReactiveCommand.Create(ExecuteSaveCdAtipCommand);
+        SaveCdPmaCommand            = ReactiveCommand.Create(ExecuteSaveCdPmaCommand);
 
-        public CompactDiscInfoViewModel(byte[] toc, byte[] atip, byte[] compactDiscInformation, byte[] session,
-                                        byte[] rawToc, byte[] pma, byte[] cdTextLeadIn, TOC.CDTOC? decodedToc,
-                                        ATIP.CDATIP decodedAtip, Session.CDSessionInfo? decodedSession,
-                                        FullTOC.CDFullTOC? fullToc, CDTextOnLeadIn.CDText? decodedCdTextLeadIn,
-                                        DiscInformation.StandardDiscInformation? decodedCompactDiscInformation,
-                                        string mcn, Dictionary<byte, string> isrcs, Window view)
+        if(decodedCompactDiscInformation.HasValue)
+            CdInformationText = DiscInformation.Prettify000b(decodedCompactDiscInformation);
+
+        if(decodedToc.HasValue)
+            CdTocText = TOC.Prettify(decodedToc);
+
+        if(fullToc.HasValue)
+            CdFullTocText = FullTOC.Prettify(fullToc);
+
+        if(decodedSession.HasValue)
+            CdSessionText = Session.Prettify(decodedSession);
+
+        if(decodedCdTextLeadIn.HasValue)
+            CdTextText = CDTextOnLeadIn.Prettify(decodedCdTextLeadIn);
+
+        if(decodedAtip != null)
+            CdAtipText = ATIP.Prettify(atip);
+
+        if(!string.IsNullOrEmpty(mcn))
+            McnText = mcn;
+
+        if(isrcs       != null &&
+           isrcs.Count > 0)
         {
-            _tocData                    = toc;
-            _atipData                   = atip;
-            _compactDiscInformationData = compactDiscInformation;
-            _sessionData                = session;
-            _rawTocData                 = rawToc;
-            _pmaData                    = pma;
-            _cdTextLeadInData           = cdTextLeadIn;
-            _view                       = view;
-            IsrcList                    = new ObservableCollection<IsrcModel>();
-            SaveCdInformationCommand    = ReactiveCommand.Create(ExecuteSaveCdInformationCommand);
-            SaveCdTocCommand            = ReactiveCommand.Create(ExecuteSaveCdTocCommand);
-            SaveCdFullTocCommand        = ReactiveCommand.Create(ExecuteSaveCdFullTocCommand);
-            SaveCdSessionCommand        = ReactiveCommand.Create(ExecuteSaveCdSessionCommand);
-            SaveCdTextCommand           = ReactiveCommand.Create(ExecuteSaveCdTextCommand);
-            SaveCdAtipCommand           = ReactiveCommand.Create(ExecuteSaveCdAtipCommand);
-            SaveCdPmaCommand            = ReactiveCommand.Create(ExecuteSaveCdPmaCommand);
-
-            if(decodedCompactDiscInformation.HasValue)
-                CdInformationText = DiscInformation.Prettify000b(decodedCompactDiscInformation);
-
-            if(decodedToc.HasValue)
-                CdTocText = TOC.Prettify(decodedToc);
-
-            if(fullToc.HasValue)
-                CdFullTocText = FullTOC.Prettify(fullToc);
-
-            if(decodedSession.HasValue)
-                CdSessionText = Session.Prettify(decodedSession);
-
-            if(decodedCdTextLeadIn.HasValue)
-                CdTextText = CDTextOnLeadIn.Prettify(decodedCdTextLeadIn);
-
-            if(decodedAtip != null)
-                CdAtipText = ATIP.Prettify(atip);
-
-            if(!string.IsNullOrEmpty(mcn))
-                McnText = mcn;
-
-            if(isrcs       != null &&
-               isrcs.Count > 0)
-            {
-                foreach(KeyValuePair<byte, string> isrc in isrcs)
-                    IsrcList.Add(new IsrcModel
-                    {
-                        Track = isrc.Key.ToString(),
-                        Isrc  = isrc.Value
-                    });
-            }
-
-            MiscellaneousVisible = McnText != null || isrcs?.Count > 0 || pma != null;
-            CdPmaVisible         = pma != null;
-        }
-
-        public string                          CdInformationText        { get; }
-        public string                          CdTocText                { get; }
-        public string                          CdFullTocText            { get; }
-        public string                          CdSessionText            { get; }
-        public string                          CdTextText               { get; }
-        public string                          CdAtipText               { get; }
-        public bool                            MiscellaneousVisible     { get; }
-        public string                          McnText                  { get; }
-        public bool                            CdPmaVisible             { get; }
-        public ReactiveCommand<Unit, Unit>     SaveCdInformationCommand { get; }
-        public ReactiveCommand<Unit, Unit>     SaveCdTocCommand         { get; }
-        public ReactiveCommand<Unit, Unit>     SaveCdFullTocCommand     { get; }
-        public ReactiveCommand<Unit, Unit>     SaveCdSessionCommand     { get; }
-        public ReactiveCommand<Unit, Unit>     SaveCdTextCommand        { get; }
-        public ReactiveCommand<Unit, Unit>     SaveCdAtipCommand        { get; }
-        public ReactiveCommand<Unit, Unit>     SaveCdPmaCommand         { get; }
-        public ObservableCollection<IsrcModel> IsrcList                 { get; }
-
-        async void ExecuteSaveCdInformationCommand()
-        {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
+            foreach(KeyValuePair<byte, string> isrc in isrcs)
+                IsrcList.Add(new IsrcModel
                 {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
-
-            string result = await dlgSaveBinary.ShowAsync(_view);
-
-            if(result is null)
-                return;
-
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_compactDiscInformationData, 0, _compactDiscInformationData.Length);
-
-            saveFs.Close();
+                    Track = isrc.Key.ToString(),
+                    Isrc  = isrc.Value
+                });
         }
 
-        async void ExecuteSaveCdTocCommand()
+        MiscellaneousVisible = McnText != null || isrcs?.Count > 0 || pma != null;
+        CdPmaVisible         = pma != null;
+    }
+
+    public string                          CdInformationText        { get; }
+    public string                          CdTocText                { get; }
+    public string                          CdFullTocText            { get; }
+    public string                          CdSessionText            { get; }
+    public string                          CdTextText               { get; }
+    public string                          CdAtipText               { get; }
+    public bool                            MiscellaneousVisible     { get; }
+    public string                          McnText                  { get; }
+    public bool                            CdPmaVisible             { get; }
+    public ReactiveCommand<Unit, Unit>     SaveCdInformationCommand { get; }
+    public ReactiveCommand<Unit, Unit>     SaveCdTocCommand         { get; }
+    public ReactiveCommand<Unit, Unit>     SaveCdFullTocCommand     { get; }
+    public ReactiveCommand<Unit, Unit>     SaveCdSessionCommand     { get; }
+    public ReactiveCommand<Unit, Unit>     SaveCdTextCommand        { get; }
+    public ReactiveCommand<Unit, Unit>     SaveCdAtipCommand        { get; }
+    public ReactiveCommand<Unit, Unit>     SaveCdPmaCommand         { get; }
+    public ObservableCollection<IsrcModel> IsrcList                 { get; }
+
+    async void ExecuteSaveCdInformationCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
         {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
+            Extensions = new List<string>(new[]
             {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+        string result = await dlgSaveBinary.ShowAsync(_view);
 
-            if(result is null)
-                return;
+        if(result is null)
+            return;
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_tocData, 0, _tocData.Length);
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_compactDiscInformationData, 0, _compactDiscInformationData.Length);
 
-            saveFs.Close();
-        }
+        saveFs.Close();
+    }
 
-        async void ExecuteSaveCdFullTocCommand()
+    async void ExecuteSaveCdTocCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
         {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
+            Extensions = new List<string>(new[]
             {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+        string result = await dlgSaveBinary.ShowAsync(_view);
 
-            if(result is null)
-                return;
+        if(result is null)
+            return;
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_rawTocData, 0, _rawTocData.Length);
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_tocData, 0, _tocData.Length);
 
-            saveFs.Close();
-        }
+        saveFs.Close();
+    }
 
-        async void ExecuteSaveCdSessionCommand()
+    async void ExecuteSaveCdFullTocCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
         {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
+            Extensions = new List<string>(new[]
             {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+        string result = await dlgSaveBinary.ShowAsync(_view);
 
-            if(result is null)
-                return;
+        if(result is null)
+            return;
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_sessionData, 0, _sessionData.Length);
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_rawTocData, 0, _rawTocData.Length);
 
-            saveFs.Close();
-        }
+        saveFs.Close();
+    }
 
-        async void ExecuteSaveCdTextCommand()
+    async void ExecuteSaveCdSessionCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
         {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
+            Extensions = new List<string>(new[]
             {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+        string result = await dlgSaveBinary.ShowAsync(_view);
 
-            if(result is null)
-                return;
+        if(result is null)
+            return;
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_cdTextLeadInData, 0, _cdTextLeadInData.Length);
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_sessionData, 0, _sessionData.Length);
 
-            saveFs.Close();
-        }
+        saveFs.Close();
+    }
 
-        async void ExecuteSaveCdAtipCommand()
+    async void ExecuteSaveCdTextCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
         {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
+            Extensions = new List<string>(new[]
             {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+        string result = await dlgSaveBinary.ShowAsync(_view);
 
-            if(result is null)
-                return;
+        if(result is null)
+            return;
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_atipData, 0, _atipData.Length);
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_cdTextLeadInData, 0, _cdTextLeadInData.Length);
 
-            saveFs.Close();
-        }
+        saveFs.Close();
+    }
 
-        async void ExecuteSaveCdPmaCommand()
+    async void ExecuteSaveCdAtipCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
         {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
+            Extensions = new List<string>(new[]
             {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+        string result = await dlgSaveBinary.ShowAsync(_view);
 
-            if(result is null)
-                return;
+        if(result is null)
+            return;
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_pmaData, 0, _pmaData.Length);
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_atipData, 0, _atipData.Length);
 
-            saveFs.Close();
-        }
+        saveFs.Close();
+    }
+
+    async void ExecuteSaveCdPmaCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_pmaData, 0, _pmaData.Length);
+
+        saveFs.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs
index 20711119e..9b0fc097d 100644
--- a/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/DvdInfoViewModel.cs
@@ -39,119 +39,118 @@ using Avalonia.Controls;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Tabs
+namespace Aaru.Gui.ViewModels.Tabs;
+
+public sealed class DvdInfoViewModel
 {
-    public sealed class DvdInfoViewModel
+    readonly byte[] _dvdAacs;
+    readonly byte[] _dvdBca;
+    readonly byte[] _dvdCmi;
+    readonly byte[] _dvdDmi;
+    readonly byte[] _dvdPfi;
+    readonly byte[] _hddvdCopyrightInformation;
+    readonly Window _view;
+
+    public DvdInfoViewModel(MediaType mediaType, [CanBeNull] byte[] pfi, [CanBeNull] byte[] dmi,
+                            [CanBeNull] byte[] cmi, [CanBeNull] byte[] hdCopyrightInformation,
+                            [CanBeNull] byte[] bca, [CanBeNull] byte[] aacs,
+                            PFI.PhysicalFormatInformation? decodedPfi, Window view)
     {
-        readonly byte[] _dvdAacs;
-        readonly byte[] _dvdBca;
-        readonly byte[] _dvdCmi;
-        readonly byte[] _dvdDmi;
-        readonly byte[] _dvdPfi;
-        readonly byte[] _hddvdCopyrightInformation;
-        readonly Window _view;
+        _dvdPfi                    = pfi;
+        _dvdDmi                    = dmi;
+        _dvdCmi                    = cmi;
+        _hddvdCopyrightInformation = hdCopyrightInformation;
+        _dvdBca                    = bca;
+        _dvdAacs                   = aacs;
+        _view                      = view;
+        SaveDvdPfiCommand          = ReactiveCommand.Create(ExecuteSaveDvdPfiCommand);
+        SaveDvdDmiCommand          = ReactiveCommand.Create(ExecuteSaveDvdDmiCommand);
+        SaveDvdCmiCommand          = ReactiveCommand.Create(ExecuteSaveDvdCmiCommand);
+        SaveHdDvdCmiCommand        = ReactiveCommand.Create(ExecuteSaveHdDvdCmiCommand);
+        SaveDvdBcaCommand          = ReactiveCommand.Create(ExecuteSaveDvdBcaCommand);
+        SaveDvdAacsCommand         = ReactiveCommand.Create(ExecuteSaveDvdAacsCommand);
 
-        public DvdInfoViewModel(MediaType mediaType, [CanBeNull] byte[] pfi, [CanBeNull] byte[] dmi,
-                                [CanBeNull] byte[] cmi, [CanBeNull] byte[] hdCopyrightInformation,
-                                [CanBeNull] byte[] bca, [CanBeNull] byte[] aacs,
-                                PFI.PhysicalFormatInformation? decodedPfi, Window view)
+        /* TODO: Pass back
+        switch(mediaType)
         {
-            _dvdPfi                    = pfi;
-            _dvdDmi                    = dmi;
-            _dvdCmi                    = cmi;
-            _hddvdCopyrightInformation = hdCopyrightInformation;
-            _dvdBca                    = bca;
-            _dvdAacs                   = aacs;
-            _view                      = view;
-            SaveDvdPfiCommand          = ReactiveCommand.Create(ExecuteSaveDvdPfiCommand);
-            SaveDvdDmiCommand          = ReactiveCommand.Create(ExecuteSaveDvdDmiCommand);
-            SaveDvdCmiCommand          = ReactiveCommand.Create(ExecuteSaveDvdCmiCommand);
-            SaveHdDvdCmiCommand        = ReactiveCommand.Create(ExecuteSaveHdDvdCmiCommand);
-            SaveDvdBcaCommand          = ReactiveCommand.Create(ExecuteSaveDvdBcaCommand);
-            SaveDvdAacsCommand         = ReactiveCommand.Create(ExecuteSaveDvdAacsCommand);
+            case MediaType.HDDVDROM:
+            case MediaType.HDDVDRAM:
+            case MediaType.HDDVDR:
+            case MediaType.HDDVDRW:
+            case MediaType.HDDVDRDL:
+            case MediaType.HDDVDRWDL:
+                Text = "HD DVD";
 
-            /* TODO: Pass back
-            switch(mediaType)
-            {
-                case MediaType.HDDVDROM:
-                case MediaType.HDDVDRAM:
-                case MediaType.HDDVDR:
-                case MediaType.HDDVDRW:
-                case MediaType.HDDVDRDL:
-                case MediaType.HDDVDRWDL:
-                    Text = "HD DVD";
+                break;
+            default:
+                Text = "DVD";
 
-                    break;
-                default:
-                    Text = "DVD";
-
-                    break;
-            }
-            */
-
-            if(decodedPfi.HasValue)
-                DvdPfiText = PFI.Prettify(decodedPfi);
-
-            if(cmi != null)
-                DvdCmiText = CSS_CPRM.PrettifyLeadInCopyright(cmi);
-
-            SaveDvdPfiVisible   = pfi                    != null;
-            SaveDvdDmiVisible   = dmi                    != null;
-            SaveDvdCmiVisible   = cmi                    != null;
-            SaveHdDvdCmiVisible = hdCopyrightInformation != null;
-            SaveDvdBcaVisible   = bca                    != null;
-            SaveDvdAacsVisible  = aacs                   != null;
+                break;
         }
+        */
 
-        public ReactiveCommand<Unit, Unit> SaveDvdPfiCommand   { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdDmiCommand   { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdCmiCommand   { get; }
-        public ReactiveCommand<Unit, Unit> SaveHdDvdCmiCommand { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdBcaCommand   { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdAacsCommand  { get; }
-        public string                      DvdPfiText          { get; }
-        public string                      DvdCmiText          { get; }
-        public bool                        SaveDvdPfiVisible   { get; }
-        public bool                        SaveDvdDmiVisible   { get; }
-        public bool                        SaveDvdCmiVisible   { get; }
-        public bool                        SaveHdDvdCmiVisible { get; }
-        public bool                        SaveDvdBcaVisible   { get; }
-        public bool                        SaveDvdAacsVisible  { get; }
+        if(decodedPfi.HasValue)
+            DvdPfiText = PFI.Prettify(decodedPfi);
 
-        async void SaveElement(byte[] data)
-        {
-            var dlgSaveBinary = new SaveFileDialog();
+        if(cmi != null)
+            DvdCmiText = CSS_CPRM.PrettifyLeadInCopyright(cmi);
 
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
-
-            string result = await dlgSaveBinary.ShowAsync(_view);
-
-            if(result is null)
-                return;
-
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(data, 0, data.Length);
-
-            saveFs.Close();
-        }
-
-        void ExecuteSaveDvdPfiCommand() => SaveElement(_dvdPfi);
-
-        void ExecuteSaveDvdDmiCommand() => SaveElement(_dvdDmi);
-
-        void ExecuteSaveDvdCmiCommand() => SaveElement(_dvdCmi);
-
-        void ExecuteSaveHdDvdCmiCommand() => SaveElement(_hddvdCopyrightInformation);
-
-        void ExecuteSaveDvdBcaCommand() => SaveElement(_dvdBca);
-
-        void ExecuteSaveDvdAacsCommand() => SaveElement(_dvdAacs);
+        SaveDvdPfiVisible   = pfi                    != null;
+        SaveDvdDmiVisible   = dmi                    != null;
+        SaveDvdCmiVisible   = cmi                    != null;
+        SaveHdDvdCmiVisible = hdCopyrightInformation != null;
+        SaveDvdBcaVisible   = bca                    != null;
+        SaveDvdAacsVisible  = aacs                   != null;
     }
+
+    public ReactiveCommand<Unit, Unit> SaveDvdPfiCommand   { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdDmiCommand   { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdCmiCommand   { get; }
+    public ReactiveCommand<Unit, Unit> SaveHdDvdCmiCommand { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdBcaCommand   { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdAacsCommand  { get; }
+    public string                      DvdPfiText          { get; }
+    public string                      DvdCmiText          { get; }
+    public bool                        SaveDvdPfiVisible   { get; }
+    public bool                        SaveDvdDmiVisible   { get; }
+    public bool                        SaveDvdCmiVisible   { get; }
+    public bool                        SaveHdDvdCmiVisible { get; }
+    public bool                        SaveDvdBcaVisible   { get; }
+    public bool                        SaveDvdAacsVisible  { get; }
+
+    async void SaveElement(byte[] data)
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(data, 0, data.Length);
+
+        saveFs.Close();
+    }
+
+    void ExecuteSaveDvdPfiCommand() => SaveElement(_dvdPfi);
+
+    void ExecuteSaveDvdDmiCommand() => SaveElement(_dvdDmi);
+
+    void ExecuteSaveDvdCmiCommand() => SaveElement(_dvdCmi);
+
+    void ExecuteSaveHdDvdCmiCommand() => SaveElement(_hddvdCopyrightInformation);
+
+    void ExecuteSaveDvdBcaCommand() => SaveElement(_dvdBca);
+
+    void ExecuteSaveDvdAacsCommand() => SaveElement(_dvdAacs);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs
index 1814b62cc..ae63db73d 100644
--- a/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/DvdWritableInfoViewModel.cs
@@ -38,255 +38,254 @@ using Aaru.Decoders.DVD;
 using Avalonia.Controls;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Tabs
+namespace Aaru.Gui.ViewModels.Tabs;
+
+public sealed class DvdWritableInfoViewModel
 {
-    public sealed class DvdWritableInfoViewModel
+    readonly byte[] _dvdLastBorderOutRmd;
+    readonly byte[] _dvdPlusAdip;
+    readonly byte[] _dvdPlusDcb;
+    readonly byte[] _dvdPreRecordedInfo;
+    readonly byte[] _dvdRamCartridgeStatus;
+    readonly byte[] _dvdRamDds;
+    readonly byte[] _dvdRamSpareArea;
+    readonly byte[] _dvdrDlJumpIntervalSize;
+    readonly byte[] _dvdrDlManualLayerJumpStartLba;
+    readonly byte[] _dvdrDlMiddleZoneStart;
+    readonly byte[] _dvdrDlRemapAnchorPoint;
+    readonly byte[] _dvdrLayerCapacity;
+    readonly byte[] _dvdrMediaIdentifier;
+    readonly byte[] _dvdrPhysicalInformation;
+    readonly byte[] _hddvdrLastRmd;
+    readonly byte[] _hddvdrMediumStatus;
+    readonly Window _view;
+
+    public DvdWritableInfoViewModel(MediaType mediaType, byte[] dds, byte[] cartridgeStatus, byte[] spareArea,
+                                    byte[] lastBorderOutRmd, byte[] preRecordedInfo, byte[] mediaIdentifier,
+                                    byte[] physicalInformation, byte[] mediumStatus, byte[] hdLastRmd,
+                                    byte[] layerCapacity, byte[] middleZoneStart, byte[] jumpIntervalSize,
+                                    byte[] manualLayerJumpStartLba, byte[] remapAnchorPoint, byte[] adip,
+                                    byte[] dcb, Window view)
     {
-        readonly byte[] _dvdLastBorderOutRmd;
-        readonly byte[] _dvdPlusAdip;
-        readonly byte[] _dvdPlusDcb;
-        readonly byte[] _dvdPreRecordedInfo;
-        readonly byte[] _dvdRamCartridgeStatus;
-        readonly byte[] _dvdRamDds;
-        readonly byte[] _dvdRamSpareArea;
-        readonly byte[] _dvdrDlJumpIntervalSize;
-        readonly byte[] _dvdrDlManualLayerJumpStartLba;
-        readonly byte[] _dvdrDlMiddleZoneStart;
-        readonly byte[] _dvdrDlRemapAnchorPoint;
-        readonly byte[] _dvdrLayerCapacity;
-        readonly byte[] _dvdrMediaIdentifier;
-        readonly byte[] _dvdrPhysicalInformation;
-        readonly byte[] _hddvdrLastRmd;
-        readonly byte[] _hddvdrMediumStatus;
-        readonly Window _view;
+        _view                            = view;
+        SaveDvdRamDdsCommand             = ReactiveCommand.Create(ExecuteSaveDvdRamDdsCommand);
+        SaveDvdRamCartridgeStatusCommand = ReactiveCommand.Create(ExecuteSaveDvdRamCartridgeStatusCommand);
 
-        public DvdWritableInfoViewModel(MediaType mediaType, byte[] dds, byte[] cartridgeStatus, byte[] spareArea,
-                                        byte[] lastBorderOutRmd, byte[] preRecordedInfo, byte[] mediaIdentifier,
-                                        byte[] physicalInformation, byte[] mediumStatus, byte[] hdLastRmd,
-                                        byte[] layerCapacity, byte[] middleZoneStart, byte[] jumpIntervalSize,
-                                        byte[] manualLayerJumpStartLba, byte[] remapAnchorPoint, byte[] adip,
-                                        byte[] dcb, Window view)
+        SaveDvdRamSpareAreaInformationCommand =
+            ReactiveCommand.Create(ExecuteSaveDvdRamSpareAreaInformationCommand);
+
+        SaveLastBorderOutRmdCommand        = ReactiveCommand.Create(ExecuteSaveLastBorderOutRmdCommand);
+        SaveDvdPreRecordedInfoCommand      = ReactiveCommand.Create(ExecuteSaveDvdPreRecordedInfoCommand);
+        SaveDvdrMediaIdentifierCommand     = ReactiveCommand.Create(ExecuteSaveDvdrMediaIdentifierCommand);
+        SaveDvdrPhysicalInformationCommand = ReactiveCommand.Create(ExecuteSaveDvdrPhysicalInformationCommand);
+        SaveHddvdrMediumStatusCommand      = ReactiveCommand.Create(ExecuteSaveHddvdrMediumStatusCommand);
+        SaveHddvdrLastRmdCommand           = ReactiveCommand.Create(ExecuteSaveHddvdrLastRmdCommand);
+        SaveDvdrLayerCapacityCommand       = ReactiveCommand.Create(ExecuteSaveDvdrLayerCapacityCommand);
+        SaveDvdrDlMiddleZoneStartCommand   = ReactiveCommand.Create(ExecuteSaveDvdrDlMiddleZoneStartCommand);
+        SaveDvdrDlJumpIntervalSizeCommand  = ReactiveCommand.Create(ExecuteSaveDvdrDlJumpIntervalSizeCommand);
+
+        SaveDvdrDlManualLayerJumpStartLbaCommand =
+            ReactiveCommand.Create(ExecuteSaveDvdrDlManualLayerJumpStartLbaCommand);
+
+        SaveDvdrDlRemapAnchorPointCommand = ReactiveCommand.Create(ExecuteSaveDvdrDlRemapAnchorPointCommand);
+        SaveDvdPlusAdipCommand            = ReactiveCommand.Create(ExecuteSaveDvdPlusAdipCommand);
+        SaveDvdPlusDcbCommand             = ReactiveCommand.Create(ExecuteSaveDvdPlusDcbCommand);
+
+        _dvdRamDds                     = dds;
+        _dvdRamCartridgeStatus         = cartridgeStatus;
+        _dvdRamSpareArea               = spareArea;
+        _dvdLastBorderOutRmd           = lastBorderOutRmd;
+        _dvdPreRecordedInfo            = preRecordedInfo;
+        _dvdrMediaIdentifier           = mediaIdentifier;
+        _dvdrPhysicalInformation       = physicalInformation;
+        _hddvdrMediumStatus            = mediumStatus;
+        _hddvdrLastRmd                 = hdLastRmd;
+        _dvdrLayerCapacity             = layerCapacity;
+        _dvdrDlMiddleZoneStart         = middleZoneStart;
+        _dvdrDlJumpIntervalSize        = jumpIntervalSize;
+        _dvdrDlManualLayerJumpStartLba = manualLayerJumpStartLba;
+        _dvdrDlRemapAnchorPoint        = remapAnchorPoint;
+        _dvdPlusAdip                   = adip;
+        _dvdPlusDcb                    = dcb;
+
+        /* TODO: Pass back
+        switch(mediaType)
         {
-            _view                            = view;
-            SaveDvdRamDdsCommand             = ReactiveCommand.Create(ExecuteSaveDvdRamDdsCommand);
-            SaveDvdRamCartridgeStatusCommand = ReactiveCommand.Create(ExecuteSaveDvdRamCartridgeStatusCommand);
+            case MediaType.DVDR:
+                Text = "DVD-R";
 
-            SaveDvdRamSpareAreaInformationCommand =
-                ReactiveCommand.Create(ExecuteSaveDvdRamSpareAreaInformationCommand);
+                break;
+            case MediaType.DVDRW:
+                Text = "DVD-RW";
 
-            SaveLastBorderOutRmdCommand        = ReactiveCommand.Create(ExecuteSaveLastBorderOutRmdCommand);
-            SaveDvdPreRecordedInfoCommand      = ReactiveCommand.Create(ExecuteSaveDvdPreRecordedInfoCommand);
-            SaveDvdrMediaIdentifierCommand     = ReactiveCommand.Create(ExecuteSaveDvdrMediaIdentifierCommand);
-            SaveDvdrPhysicalInformationCommand = ReactiveCommand.Create(ExecuteSaveDvdrPhysicalInformationCommand);
-            SaveHddvdrMediumStatusCommand      = ReactiveCommand.Create(ExecuteSaveHddvdrMediumStatusCommand);
-            SaveHddvdrLastRmdCommand           = ReactiveCommand.Create(ExecuteSaveHddvdrLastRmdCommand);
-            SaveDvdrLayerCapacityCommand       = ReactiveCommand.Create(ExecuteSaveDvdrLayerCapacityCommand);
-            SaveDvdrDlMiddleZoneStartCommand   = ReactiveCommand.Create(ExecuteSaveDvdrDlMiddleZoneStartCommand);
-            SaveDvdrDlJumpIntervalSizeCommand  = ReactiveCommand.Create(ExecuteSaveDvdrDlJumpIntervalSizeCommand);
+                break;
+            case MediaType.DVDPR:
+                Text = "DVD+R";
 
-            SaveDvdrDlManualLayerJumpStartLbaCommand =
-                ReactiveCommand.Create(ExecuteSaveDvdrDlManualLayerJumpStartLbaCommand);
+                break;
+            case MediaType.DVDPRW:
+                Text = "DVD+RW";
 
-            SaveDvdrDlRemapAnchorPointCommand = ReactiveCommand.Create(ExecuteSaveDvdrDlRemapAnchorPointCommand);
-            SaveDvdPlusAdipCommand            = ReactiveCommand.Create(ExecuteSaveDvdPlusAdipCommand);
-            SaveDvdPlusDcbCommand             = ReactiveCommand.Create(ExecuteSaveDvdPlusDcbCommand);
+                break;
+            case MediaType.DVDPRWDL:
+                Text = "DVD+RW DL";
 
-            _dvdRamDds                     = dds;
-            _dvdRamCartridgeStatus         = cartridgeStatus;
-            _dvdRamSpareArea               = spareArea;
-            _dvdLastBorderOutRmd           = lastBorderOutRmd;
-            _dvdPreRecordedInfo            = preRecordedInfo;
-            _dvdrMediaIdentifier           = mediaIdentifier;
-            _dvdrPhysicalInformation       = physicalInformation;
-            _hddvdrMediumStatus            = mediumStatus;
-            _hddvdrLastRmd                 = hdLastRmd;
-            _dvdrLayerCapacity             = layerCapacity;
-            _dvdrDlMiddleZoneStart         = middleZoneStart;
-            _dvdrDlJumpIntervalSize        = jumpIntervalSize;
-            _dvdrDlManualLayerJumpStartLba = manualLayerJumpStartLba;
-            _dvdrDlRemapAnchorPoint        = remapAnchorPoint;
-            _dvdPlusAdip                   = adip;
-            _dvdPlusDcb                    = dcb;
+                break;
+            case MediaType.DVDRDL:
+                Text = "DVD-R DL";
 
-            /* TODO: Pass back
-            switch(mediaType)
-            {
-                case MediaType.DVDR:
-                    Text = "DVD-R";
+                break;
+            case MediaType.DVDPRDL:
+                Text = "DVD+R DL";
 
-                    break;
-                case MediaType.DVDRW:
-                    Text = "DVD-RW";
+                break;
+            case MediaType.DVDRAM:
+                Text = "DVD-RAM";
 
-                    break;
-                case MediaType.DVDPR:
-                    Text = "DVD+R";
+                break;
+            case MediaType.DVDRWDL:
+                Text = "DVD-RW DL";
 
-                    break;
-                case MediaType.DVDPRW:
-                    Text = "DVD+RW";
+                break;
+            case MediaType.HDDVDRAM:
+                Text = "HD DVD-RAM";
 
-                    break;
-                case MediaType.DVDPRWDL:
-                    Text = "DVD+RW DL";
+                break;
+            case MediaType.HDDVDR:
+                Text = "HD DVD-R";
 
-                    break;
-                case MediaType.DVDRDL:
-                    Text = "DVD-R DL";
+                break;
+            case MediaType.HDDVDRW:
+                Text = "HD DVD-RW";
 
-                    break;
-                case MediaType.DVDPRDL:
-                    Text = "DVD+R DL";
+                break;
+            case MediaType.HDDVDRDL:
+                Text = "HD DVD-R DL";
 
-                    break;
-                case MediaType.DVDRAM:
-                    Text = "DVD-RAM";
+                break;
+            case MediaType.HDDVDRWDL:
+                Text = "HD DVD-RW DL";
 
-                    break;
-                case MediaType.DVDRWDL:
-                    Text = "DVD-RW DL";
-
-                    break;
-                case MediaType.HDDVDRAM:
-                    Text = "HD DVD-RAM";
-
-                    break;
-                case MediaType.HDDVDR:
-                    Text = "HD DVD-R";
-
-                    break;
-                case MediaType.HDDVDRW:
-                    Text = "HD DVD-RW";
-
-                    break;
-                case MediaType.HDDVDRDL:
-                    Text = "HD DVD-R DL";
-
-                    break;
-                case MediaType.HDDVDRWDL:
-                    Text = "HD DVD-RW DL";
-
-                    break;
-            }
-            */
-
-            if(dds != null)
-                DvdRamDdsText = DDS.Prettify(dds);
-
-            if(cartridgeStatus != null)
-                DvdRamCartridgeStatusText = Cartridge.Prettify(cartridgeStatus);
-
-            if(spareArea != null)
-                DvdRamSpareAreaInformationText = Spare.Prettify(spareArea);
-
-            SaveDvdRamDdsVisible                     = dds                     != null;
-            SaveDvdRamCartridgeStatusVisible         = cartridgeStatus         != null;
-            SaveDvdRamSpareAreaInformationVisible    = spareArea               != null;
-            SaveLastBorderOutRmdVisible              = lastBorderOutRmd        != null;
-            SaveDvdPreRecordedInfoVisible            = preRecordedInfo         != null;
-            SaveDvdrMediaIdentifierVisible           = mediaIdentifier         != null;
-            SaveDvdrPhysicalInformationVisible       = physicalInformation     != null;
-            SaveHddvdrMediumStatusVisible            = mediumStatus            != null;
-            SaveHddvdrLastRmdVisible                 = hdLastRmd               != null;
-            SaveDvdrLayerCapacityVisible             = layerCapacity           != null;
-            SaveDvdrDlMiddleZoneStartVisible         = middleZoneStart         != null;
-            SaveDvdrDlJumpIntervalSizeVisible        = jumpIntervalSize        != null;
-            SaveDvdrDlManualLayerJumpStartLbaVisible = manualLayerJumpStartLba != null;
-            SaveDvdrDlRemapAnchorPointVisible        = remapAnchorPoint        != null;
-            SaveDvdPlusAdipVisible                   = adip                    != null;
-            SaveDvdPlusDcbVisible                    = dcb                     != null;
+                break;
         }
+        */
 
-        public string                      DvdRamDdsText                            { get; }
-        public string                      DvdRamCartridgeStatusText                { get; }
-        public string                      DvdRamSpareAreaInformationText           { get; }
-        public bool                        SaveDvdRamDdsVisible                     { get; }
-        public bool                        SaveDvdRamCartridgeStatusVisible         { get; }
-        public bool                        SaveDvdRamSpareAreaInformationVisible    { get; }
-        public bool                        SaveLastBorderOutRmdVisible              { get; }
-        public bool                        SaveDvdPreRecordedInfoVisible            { get; }
-        public bool                        SaveDvdrMediaIdentifierVisible           { get; }
-        public bool                        SaveDvdrPhysicalInformationVisible       { get; }
-        public bool                        SaveHddvdrMediumStatusVisible            { get; }
-        public bool                        SaveHddvdrLastRmdVisible                 { get; }
-        public bool                        SaveDvdrLayerCapacityVisible             { get; }
-        public bool                        SaveDvdrDlMiddleZoneStartVisible         { get; }
-        public bool                        SaveDvdrDlJumpIntervalSizeVisible        { get; }
-        public bool                        SaveDvdrDlManualLayerJumpStartLbaVisible { get; }
-        public bool                        SaveDvdrDlRemapAnchorPointVisible        { get; }
-        public bool                        SaveDvdPlusAdipVisible                   { get; }
-        public bool                        SaveDvdPlusDcbVisible                    { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdRamDdsCommand                     { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdRamCartridgeStatusCommand         { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdRamSpareAreaInformationCommand    { get; }
-        public ReactiveCommand<Unit, Unit> SaveLastBorderOutRmdCommand              { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdPreRecordedInfoCommand            { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdrMediaIdentifierCommand           { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdrPhysicalInformationCommand       { get; }
-        public ReactiveCommand<Unit, Unit> SaveHddvdrMediumStatusCommand            { get; }
-        public ReactiveCommand<Unit, Unit> SaveHddvdrLastRmdCommand                 { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdrLayerCapacityCommand             { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdrDlMiddleZoneStartCommand         { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdrDlJumpIntervalSizeCommand        { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdrDlManualLayerJumpStartLbaCommand { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdrDlRemapAnchorPointCommand        { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdPlusAdipCommand                   { get; }
-        public ReactiveCommand<Unit, Unit> SaveDvdPlusDcbCommand                    { get; }
+        if(dds != null)
+            DvdRamDdsText = DDS.Prettify(dds);
 
-        async void SaveElement(byte[] data)
-        {
-            var dlgSaveBinary = new SaveFileDialog();
+        if(cartridgeStatus != null)
+            DvdRamCartridgeStatusText = Cartridge.Prettify(cartridgeStatus);
 
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+        if(spareArea != null)
+            DvdRamSpareAreaInformationText = Spare.Prettify(spareArea);
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
-
-            if(result is null)
-                return;
-
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(data, 0, data.Length);
-
-            saveFs.Close();
-        }
-
-        void ExecuteSaveDvdRamDdsCommand() => SaveElement(_dvdRamDds);
-
-        void ExecuteSaveDvdRamCartridgeStatusCommand() => SaveElement(_dvdRamCartridgeStatus);
-
-        void ExecuteSaveDvdRamSpareAreaInformationCommand() => SaveElement(_dvdRamSpareArea);
-
-        void ExecuteSaveLastBorderOutRmdCommand() => SaveElement(_dvdLastBorderOutRmd);
-
-        void ExecuteSaveDvdPreRecordedInfoCommand() => SaveElement(_dvdPreRecordedInfo);
-
-        void ExecuteSaveDvdrMediaIdentifierCommand() => SaveElement(_dvdrMediaIdentifier);
-
-        void ExecuteSaveDvdrPhysicalInformationCommand() => SaveElement(_dvdrPhysicalInformation);
-
-        void ExecuteSaveHddvdrMediumStatusCommand() => SaveElement(_hddvdrMediumStatus);
-
-        void ExecuteSaveHddvdrLastRmdCommand() => SaveElement(_hddvdrLastRmd);
-
-        void ExecuteSaveDvdrLayerCapacityCommand() => SaveElement(_dvdrLayerCapacity);
-
-        void ExecuteSaveDvdrDlMiddleZoneStartCommand() => SaveElement(_dvdrDlMiddleZoneStart);
-
-        void ExecuteSaveDvdrDlJumpIntervalSizeCommand() => SaveElement(_dvdrDlJumpIntervalSize);
-
-        void ExecuteSaveDvdrDlManualLayerJumpStartLbaCommand() => SaveElement(_dvdrDlManualLayerJumpStartLba);
-
-        void ExecuteSaveDvdrDlRemapAnchorPointCommand() => SaveElement(_dvdrDlRemapAnchorPoint);
-
-        void ExecuteSaveDvdPlusAdipCommand() => SaveElement(_dvdPlusAdip);
-
-        void ExecuteSaveDvdPlusDcbCommand() => SaveElement(_dvdPlusDcb);
+        SaveDvdRamDdsVisible                     = dds                     != null;
+        SaveDvdRamCartridgeStatusVisible         = cartridgeStatus         != null;
+        SaveDvdRamSpareAreaInformationVisible    = spareArea               != null;
+        SaveLastBorderOutRmdVisible              = lastBorderOutRmd        != null;
+        SaveDvdPreRecordedInfoVisible            = preRecordedInfo         != null;
+        SaveDvdrMediaIdentifierVisible           = mediaIdentifier         != null;
+        SaveDvdrPhysicalInformationVisible       = physicalInformation     != null;
+        SaveHddvdrMediumStatusVisible            = mediumStatus            != null;
+        SaveHddvdrLastRmdVisible                 = hdLastRmd               != null;
+        SaveDvdrLayerCapacityVisible             = layerCapacity           != null;
+        SaveDvdrDlMiddleZoneStartVisible         = middleZoneStart         != null;
+        SaveDvdrDlJumpIntervalSizeVisible        = jumpIntervalSize        != null;
+        SaveDvdrDlManualLayerJumpStartLbaVisible = manualLayerJumpStartLba != null;
+        SaveDvdrDlRemapAnchorPointVisible        = remapAnchorPoint        != null;
+        SaveDvdPlusAdipVisible                   = adip                    != null;
+        SaveDvdPlusDcbVisible                    = dcb                     != null;
     }
+
+    public string                      DvdRamDdsText                            { get; }
+    public string                      DvdRamCartridgeStatusText                { get; }
+    public string                      DvdRamSpareAreaInformationText           { get; }
+    public bool                        SaveDvdRamDdsVisible                     { get; }
+    public bool                        SaveDvdRamCartridgeStatusVisible         { get; }
+    public bool                        SaveDvdRamSpareAreaInformationVisible    { get; }
+    public bool                        SaveLastBorderOutRmdVisible              { get; }
+    public bool                        SaveDvdPreRecordedInfoVisible            { get; }
+    public bool                        SaveDvdrMediaIdentifierVisible           { get; }
+    public bool                        SaveDvdrPhysicalInformationVisible       { get; }
+    public bool                        SaveHddvdrMediumStatusVisible            { get; }
+    public bool                        SaveHddvdrLastRmdVisible                 { get; }
+    public bool                        SaveDvdrLayerCapacityVisible             { get; }
+    public bool                        SaveDvdrDlMiddleZoneStartVisible         { get; }
+    public bool                        SaveDvdrDlJumpIntervalSizeVisible        { get; }
+    public bool                        SaveDvdrDlManualLayerJumpStartLbaVisible { get; }
+    public bool                        SaveDvdrDlRemapAnchorPointVisible        { get; }
+    public bool                        SaveDvdPlusAdipVisible                   { get; }
+    public bool                        SaveDvdPlusDcbVisible                    { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdRamDdsCommand                     { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdRamCartridgeStatusCommand         { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdRamSpareAreaInformationCommand    { get; }
+    public ReactiveCommand<Unit, Unit> SaveLastBorderOutRmdCommand              { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdPreRecordedInfoCommand            { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdrMediaIdentifierCommand           { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdrPhysicalInformationCommand       { get; }
+    public ReactiveCommand<Unit, Unit> SaveHddvdrMediumStatusCommand            { get; }
+    public ReactiveCommand<Unit, Unit> SaveHddvdrLastRmdCommand                 { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdrLayerCapacityCommand             { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdrDlMiddleZoneStartCommand         { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdrDlJumpIntervalSizeCommand        { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdrDlManualLayerJumpStartLbaCommand { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdrDlRemapAnchorPointCommand        { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdPlusAdipCommand                   { get; }
+    public ReactiveCommand<Unit, Unit> SaveDvdPlusDcbCommand                    { get; }
+
+    async void SaveElement(byte[] data)
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(data, 0, data.Length);
+
+        saveFs.Close();
+    }
+
+    void ExecuteSaveDvdRamDdsCommand() => SaveElement(_dvdRamDds);
+
+    void ExecuteSaveDvdRamCartridgeStatusCommand() => SaveElement(_dvdRamCartridgeStatus);
+
+    void ExecuteSaveDvdRamSpareAreaInformationCommand() => SaveElement(_dvdRamSpareArea);
+
+    void ExecuteSaveLastBorderOutRmdCommand() => SaveElement(_dvdLastBorderOutRmd);
+
+    void ExecuteSaveDvdPreRecordedInfoCommand() => SaveElement(_dvdPreRecordedInfo);
+
+    void ExecuteSaveDvdrMediaIdentifierCommand() => SaveElement(_dvdrMediaIdentifier);
+
+    void ExecuteSaveDvdrPhysicalInformationCommand() => SaveElement(_dvdrPhysicalInformation);
+
+    void ExecuteSaveHddvdrMediumStatusCommand() => SaveElement(_hddvdrMediumStatus);
+
+    void ExecuteSaveHddvdrLastRmdCommand() => SaveElement(_hddvdrLastRmd);
+
+    void ExecuteSaveDvdrLayerCapacityCommand() => SaveElement(_dvdrLayerCapacity);
+
+    void ExecuteSaveDvdrDlMiddleZoneStartCommand() => SaveElement(_dvdrDlMiddleZoneStart);
+
+    void ExecuteSaveDvdrDlJumpIntervalSizeCommand() => SaveElement(_dvdrDlJumpIntervalSize);
+
+    void ExecuteSaveDvdrDlManualLayerJumpStartLbaCommand() => SaveElement(_dvdrDlManualLayerJumpStartLba);
+
+    void ExecuteSaveDvdrDlRemapAnchorPointCommand() => SaveElement(_dvdrDlRemapAnchorPoint);
+
+    void ExecuteSaveDvdPlusAdipCommand() => SaveElement(_dvdPlusAdip);
+
+    void ExecuteSaveDvdPlusDcbCommand() => SaveElement(_dvdPlusDcb);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
index 78cb6c946..618b98e9d 100644
--- a/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/PcmciaInfoViewModel.cs
@@ -41,154 +41,153 @@ using Avalonia.Controls;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Tabs
+namespace Aaru.Gui.ViewModels.Tabs;
+
+public class PcmciaInfoViewModel : ViewModelBase
 {
-    public class PcmciaInfoViewModel : ViewModelBase
+    readonly byte[] _cis;
+    readonly Window _view;
+    string          _pcmciaCisText;
+    PcmciaCisModel  _selectedCis;
+
+    internal PcmciaInfoViewModel([CanBeNull] byte[] pcmciaCis, Window view)
     {
-        readonly byte[] _cis;
-        readonly Window _view;
-        string          _pcmciaCisText;
-        PcmciaCisModel  _selectedCis;
+        if(pcmciaCis == null)
+            return;
 
-        internal PcmciaInfoViewModel([CanBeNull] byte[] pcmciaCis, Window view)
-        {
-            if(pcmciaCis == null)
-                return;
+        _cis                 = pcmciaCis;
+        CisList              = new ObservableCollection<PcmciaCisModel>();
+        SavePcmciaCisCommand = ReactiveCommand.Create(ExecuteSavePcmciaCisCommand);
 
-            _cis                 = pcmciaCis;
-            CisList              = new ObservableCollection<PcmciaCisModel>();
-            SavePcmciaCisCommand = ReactiveCommand.Create(ExecuteSavePcmciaCisCommand);
+        _view = view;
 
-            _view = view;
+        Tuple[] tuples = CIS.GetTuples(_cis);
 
-            Tuple[] tuples = CIS.GetTuples(_cis);
+        if(tuples != null)
+            foreach(Tuple tuple in tuples)
+            {
+                string tupleCode;
+                string tupleDescription;
 
-            if(tuples != null)
-                foreach(Tuple tuple in tuples)
+                switch(tuple.Code)
                 {
-                    string tupleCode;
-                    string tupleDescription;
+                    case TupleCodes.CISTPL_NULL:
+                    case TupleCodes.CISTPL_END: continue;
+                    case TupleCodes.CISTPL_DEVICEGEO:
+                    case TupleCodes.CISTPL_DEVICEGEO_A:
+                        tupleCode        = "Device Geometry Tuples";
+                        tupleDescription = CIS.PrettifyDeviceGeometryTuple(tuple);
 
-                    switch(tuple.Code)
-                    {
-                        case TupleCodes.CISTPL_NULL:
-                        case TupleCodes.CISTPL_END: continue;
-                        case TupleCodes.CISTPL_DEVICEGEO:
-                        case TupleCodes.CISTPL_DEVICEGEO_A:
-                            tupleCode        = "Device Geometry Tuples";
-                            tupleDescription = CIS.PrettifyDeviceGeometryTuple(tuple);
+                        break;
+                    case TupleCodes.CISTPL_MANFID:
+                        tupleCode        = "Manufacturer Identification Tuple";
+                        tupleDescription = CIS.PrettifyManufacturerIdentificationTuple(tuple);
 
-                            break;
-                        case TupleCodes.CISTPL_MANFID:
-                            tupleCode        = "Manufacturer Identification Tuple";
-                            tupleDescription = CIS.PrettifyManufacturerIdentificationTuple(tuple);
+                        break;
+                    case TupleCodes.CISTPL_VERS_1:
+                        tupleCode        = "Level 1 Version / Product Information Tuple";
+                        tupleDescription = CIS.PrettifyLevel1VersionTuple(tuple);
 
-                            break;
-                        case TupleCodes.CISTPL_VERS_1:
-                            tupleCode        = "Level 1 Version / Product Information Tuple";
-                            tupleDescription = CIS.PrettifyLevel1VersionTuple(tuple);
+                        break;
+                    case TupleCodes.CISTPL_ALTSTR:
+                    case TupleCodes.CISTPL_BAR:
+                    case TupleCodes.CISTPL_BATTERY:
+                    case TupleCodes.CISTPL_BYTEORDER:
+                    case TupleCodes.CISTPL_CFTABLE_ENTRY:
+                    case TupleCodes.CISTPL_CFTABLE_ENTRY_CB:
+                    case TupleCodes.CISTPL_CHECKSUM:
+                    case TupleCodes.CISTPL_CONFIG:
+                    case TupleCodes.CISTPL_CONFIG_CB:
+                    case TupleCodes.CISTPL_DATE:
+                    case TupleCodes.CISTPL_DEVICE:
+                    case TupleCodes.CISTPL_DEVICE_A:
+                    case TupleCodes.CISTPL_DEVICE_OA:
+                    case TupleCodes.CISTPL_DEVICE_OC:
+                    case TupleCodes.CISTPL_EXTDEVIC:
+                    case TupleCodes.CISTPL_FORMAT:
+                    case TupleCodes.CISTPL_FORMAT_A:
+                    case TupleCodes.CISTPL_FUNCE:
+                    case TupleCodes.CISTPL_FUNCID:
+                    case TupleCodes.CISTPL_GEOMETRY:
+                    case TupleCodes.CISTPL_INDIRECT:
+                    case TupleCodes.CISTPL_JEDEC_A:
+                    case TupleCodes.CISTPL_JEDEC_C:
+                    case TupleCodes.CISTPL_LINKTARGET:
+                    case TupleCodes.CISTPL_LONGLINK_A:
+                    case TupleCodes.CISTPL_LONGLINK_C:
+                    case TupleCodes.CISTPL_LONGLINK_CB:
+                    case TupleCodes.CISTPL_LONGLINK_MFC:
+                    case TupleCodes.CISTPL_NO_LINK:
+                    case TupleCodes.CISTPL_ORG:
+                    case TupleCodes.CISTPL_PWR_MGMNT:
+                    case TupleCodes.CISTPL_SPCL:
+                    case TupleCodes.CISTPL_SWIL:
+                    case TupleCodes.CISTPL_VERS_2:
+                        tupleCode        = $"Undecoded tuple ID {tuple.Code}";
+                        tupleDescription = $"Undecoded tuple ID {tuple.Code}";
 
-                            break;
-                        case TupleCodes.CISTPL_ALTSTR:
-                        case TupleCodes.CISTPL_BAR:
-                        case TupleCodes.CISTPL_BATTERY:
-                        case TupleCodes.CISTPL_BYTEORDER:
-                        case TupleCodes.CISTPL_CFTABLE_ENTRY:
-                        case TupleCodes.CISTPL_CFTABLE_ENTRY_CB:
-                        case TupleCodes.CISTPL_CHECKSUM:
-                        case TupleCodes.CISTPL_CONFIG:
-                        case TupleCodes.CISTPL_CONFIG_CB:
-                        case TupleCodes.CISTPL_DATE:
-                        case TupleCodes.CISTPL_DEVICE:
-                        case TupleCodes.CISTPL_DEVICE_A:
-                        case TupleCodes.CISTPL_DEVICE_OA:
-                        case TupleCodes.CISTPL_DEVICE_OC:
-                        case TupleCodes.CISTPL_EXTDEVIC:
-                        case TupleCodes.CISTPL_FORMAT:
-                        case TupleCodes.CISTPL_FORMAT_A:
-                        case TupleCodes.CISTPL_FUNCE:
-                        case TupleCodes.CISTPL_FUNCID:
-                        case TupleCodes.CISTPL_GEOMETRY:
-                        case TupleCodes.CISTPL_INDIRECT:
-                        case TupleCodes.CISTPL_JEDEC_A:
-                        case TupleCodes.CISTPL_JEDEC_C:
-                        case TupleCodes.CISTPL_LINKTARGET:
-                        case TupleCodes.CISTPL_LONGLINK_A:
-                        case TupleCodes.CISTPL_LONGLINK_C:
-                        case TupleCodes.CISTPL_LONGLINK_CB:
-                        case TupleCodes.CISTPL_LONGLINK_MFC:
-                        case TupleCodes.CISTPL_NO_LINK:
-                        case TupleCodes.CISTPL_ORG:
-                        case TupleCodes.CISTPL_PWR_MGMNT:
-                        case TupleCodes.CISTPL_SPCL:
-                        case TupleCodes.CISTPL_SWIL:
-                        case TupleCodes.CISTPL_VERS_2:
-                            tupleCode        = $"Undecoded tuple ID {tuple.Code}";
-                            tupleDescription = $"Undecoded tuple ID {tuple.Code}";
+                        break;
+                    default:
+                        tupleCode        = $"0x{(byte)tuple.Code:X2}";
+                        tupleDescription = $"Found unknown tuple ID 0x{(byte)tuple.Code:X2}";
 
-                            break;
-                        default:
-                            tupleCode        = $"0x{(byte)tuple.Code:X2}";
-                            tupleDescription = $"Found unknown tuple ID 0x{(byte)tuple.Code:X2}";
-
-                            break;
-                    }
-
-                    CisList.Add(new PcmciaCisModel
-                    {
-                        Code        = tupleCode,
-                        Description = tupleDescription
-                    });
+                        break;
                 }
-            else
-                AaruConsole.DebugWriteLine("Device-Info command", "PCMCIA CIS returned no tuples");
-        }
 
-        public ObservableCollection<PcmciaCisModel> CisList { get; }
-
-        public string PcmciaCisText
-        {
-            get => _pcmciaCisText;
-            set => this.RaiseAndSetIfChanged(ref _pcmciaCisText, value);
-        }
-
-        public PcmciaCisModel SelectedCis
-        {
-            get => _selectedCis;
-            set
-            {
-                if(_selectedCis == value)
-                    return;
-
-                PcmciaCisText = value?.Description;
-                this.RaiseAndSetIfChanged(ref _selectedCis, value);
-            }
-        }
-
-        public ReactiveCommand<Unit, Unit> SavePcmciaCisCommand { get; }
-
-        async void ExecuteSavePcmciaCisCommand()
-        {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
+                CisList.Add(new PcmciaCisModel
                 {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                    Code        = tupleCode,
+                    Description = tupleDescription
+                });
+            }
+        else
+            AaruConsole.DebugWriteLine("Device-Info command", "PCMCIA CIS returned no tuples");
+    }
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+    public ObservableCollection<PcmciaCisModel> CisList { get; }
 
-            if(result is null)
+    public string PcmciaCisText
+    {
+        get => _pcmciaCisText;
+        set => this.RaiseAndSetIfChanged(ref _pcmciaCisText, value);
+    }
+
+    public PcmciaCisModel SelectedCis
+    {
+        get => _selectedCis;
+        set
+        {
+            if(_selectedCis == value)
                 return;
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_cis, 0, _cis.Length);
-
-            saveFs.Close();
+            PcmciaCisText = value?.Description;
+            this.RaiseAndSetIfChanged(ref _selectedCis, value);
         }
     }
+
+    public ReactiveCommand<Unit, Unit> SavePcmciaCisCommand { get; }
+
+    async void ExecuteSavePcmciaCisCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_cis, 0, _cis.Length);
+
+        saveFs.Close();
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
index 46a945f6e..7a7b006c3 100644
--- a/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/ScsiInfoViewModel.cs
@@ -45,1082 +45,1081 @@ using Avalonia.Controls;
 using ReactiveUI;
 using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 
-namespace Aaru.Gui.ViewModels.Tabs
+namespace Aaru.Gui.ViewModels.Tabs;
+
+public sealed class ScsiInfoViewModel : ViewModelBase
 {
-    public sealed class ScsiInfoViewModel : ViewModelBase
+    readonly byte[] _configuration;
+    readonly byte[] _scsiModeSense10;
+    readonly byte[] _scsiModeSense6;
+    readonly Window _view;
+    string          _evpdPageText;
+    string          _mmcFeatureText;
+    string          _scsiModeSensePageText;
+    object          _selectedEvpdPage;
+    object          _selectedMmcFeature;
+    object          _selectedModeSensePage;
+
+    public ScsiInfoViewModel(byte[] scsiInquiryData, Inquiry? scsiInquiry, Dictionary<byte, byte[]> scsiEvpdPages,
+                             Modes.DecodedMode? scsiMode, PeripheralDeviceTypes scsiType, byte[] scsiModeSense6,
+                             byte[] scsiModeSense10, byte[] mmcConfiguration, Window view)
     {
-        readonly byte[] _configuration;
-        readonly byte[] _scsiModeSense10;
-        readonly byte[] _scsiModeSense6;
-        readonly Window _view;
-        string          _evpdPageText;
-        string          _mmcFeatureText;
-        string          _scsiModeSensePageText;
-        object          _selectedEvpdPage;
-        object          _selectedMmcFeature;
-        object          _selectedModeSensePage;
+        InquiryData              = scsiInquiryData;
+        _scsiModeSense6          = scsiModeSense6;
+        _scsiModeSense10         = scsiModeSense10;
+        _configuration           = mmcConfiguration;
+        _view                    = view;
+        ModeSensePages           = new ObservableCollection<ScsiPageModel>();
+        EvpdPages                = new ObservableCollection<ScsiPageModel>();
+        MmcFeatures              = new ObservableCollection<ScsiPageModel>();
+        SaveInquiryBinaryCommand = ReactiveCommand.Create(ExecuteSaveInquiryBinaryCommand);
+        SaveInquiryTextCommand   = ReactiveCommand.Create(ExecuteSaveInquiryTextCommand);
+        SaveModeSense6Command    = ReactiveCommand.Create(ExecuteSaveModeSense6Command);
+        SaveModeSense10Command   = ReactiveCommand.Create(ExecuteSaveModeSense10Command);
+        SaveEvpdPageCommand      = ReactiveCommand.Create(ExecuteSaveEvpdPageCommand);
+        SaveMmcFeaturesCommand   = ReactiveCommand.Create(ExecuteSaveMmcFeaturesCommand);
 
-        public ScsiInfoViewModel(byte[] scsiInquiryData, Inquiry? scsiInquiry, Dictionary<byte, byte[]> scsiEvpdPages,
-                                 Modes.DecodedMode? scsiMode, PeripheralDeviceTypes scsiType, byte[] scsiModeSense6,
-                                 byte[] scsiModeSense10, byte[] mmcConfiguration, Window view)
+        if(InquiryData == null ||
+           !scsiInquiry.HasValue)
+            return;
+
+        ScsiInquiryText = Decoders.SCSI.Inquiry.Prettify(scsiInquiry);
+
+        if(scsiMode.HasValue)
         {
-            InquiryData              = scsiInquiryData;
-            _scsiModeSense6          = scsiModeSense6;
-            _scsiModeSense10         = scsiModeSense10;
-            _configuration           = mmcConfiguration;
-            _view                    = view;
-            ModeSensePages           = new ObservableCollection<ScsiPageModel>();
-            EvpdPages                = new ObservableCollection<ScsiPageModel>();
-            MmcFeatures              = new ObservableCollection<ScsiPageModel>();
-            SaveInquiryBinaryCommand = ReactiveCommand.Create(ExecuteSaveInquiryBinaryCommand);
-            SaveInquiryTextCommand   = ReactiveCommand.Create(ExecuteSaveInquiryTextCommand);
-            SaveModeSense6Command    = ReactiveCommand.Create(ExecuteSaveModeSense6Command);
-            SaveModeSense10Command   = ReactiveCommand.Create(ExecuteSaveModeSense10Command);
-            SaveEvpdPageCommand      = ReactiveCommand.Create(ExecuteSaveEvpdPageCommand);
-            SaveMmcFeaturesCommand   = ReactiveCommand.Create(ExecuteSaveMmcFeaturesCommand);
-
-            if(InquiryData == null ||
-               !scsiInquiry.HasValue)
-                return;
-
-            ScsiInquiryText = Decoders.SCSI.Inquiry.Prettify(scsiInquiry);
-
-            if(scsiMode.HasValue)
+            ModeSensePages.Add(new ScsiPageModel
             {
-                ModeSensePages.Add(new ScsiPageModel
+                Page        = "Header",
+                Description = Modes.PrettifyModeHeader(scsiMode.Value.Header, scsiType)
+            });
+
+            if(scsiMode.Value.Pages != null)
+                foreach(Modes.ModePage page in scsiMode.Value.Pages.OrderBy(t => t.Page).ThenBy(t => t.Subpage))
                 {
-                    Page        = "Header",
-                    Description = Modes.PrettifyModeHeader(scsiMode.Value.Header, scsiType)
-                });
+                    string pageNumberText = page.Subpage == 0 ? $"MODE {page.Page:X2}h"
+                                                : $"MODE {page.Page:X2} Subpage {page.Subpage:X2}";
 
-                if(scsiMode.Value.Pages != null)
-                    foreach(Modes.ModePage page in scsiMode.Value.Pages.OrderBy(t => t.Page).ThenBy(t => t.Subpage))
+                    string decodedText;
+
+                    switch(page.Page)
                     {
-                        string pageNumberText = page.Subpage == 0 ? $"MODE {page.Page:X2}h"
-                                                    : $"MODE {page.Page:X2} Subpage {page.Subpage:X2}";
-
-                        string decodedText;
-
-                        switch(page.Page)
+                        case 0x00:
                         {
-                            case 0x00:
-                            {
-                                if(scsiType     == PeripheralDeviceTypes.MultiMediaDevice &&
-                                   page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_00_SFF(page.PageResponse);
-                                else
-                                    decodedText = "Undecoded";
-
-                                break;
-                            }
-                            case 0x01:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = scsiType == PeripheralDeviceTypes.MultiMediaDevice
-                                                      ? Modes.PrettifyModePage_01_MMC(page.PageResponse)
-                                                      : Modes.PrettifyModePage_01(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x02:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_02(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x03:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_03(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x04:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_04(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x05:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_05(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x06:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_06(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x07:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = scsiType == PeripheralDeviceTypes.MultiMediaDevice
-                                                      ? Modes.PrettifyModePage_07_MMC(page.PageResponse)
-                                                      : Modes.PrettifyModePage_07(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x08:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_08(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x0A:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_0A(page.PageResponse);
-                                else if(page.Subpage == 1)
-                                    decodedText = Modes.PrettifyModePage_0A_S01(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x0B:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_0B(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x0D:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_0D(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x0E:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_0E(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x0F:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_0F(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x10:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = scsiType == PeripheralDeviceTypes.SequentialAccess
-                                                      ? Modes.PrettifyModePage_10_SSC(page.PageResponse)
-                                                      : Modes.PrettifyModePage_10(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x11:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_11(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x12:
-                            case 0x13:
-                            case 0x14:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_12_13_14(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x1A:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_1A(page.PageResponse);
-                                else if(page.Subpage == 1)
-                                    decodedText = Modes.PrettifyModePage_1A_S01(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x1B:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_1B(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x1C:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = scsiType == PeripheralDeviceTypes.MultiMediaDevice
-                                                      ? Modes.PrettifyModePage_1C_SFF(page.PageResponse)
-                                                      : Modes.PrettifyModePage_1C(page.PageResponse);
-                                else if(page.Subpage == 1)
-                                    decodedText = Modes.PrettifyModePage_1C_S01(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x1D:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_1D(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x21:
-                            {
-                                if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() ==
-                                   "CERTANCE")
-                                    decodedText = Modes.PrettifyCertanceModePage_21(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x22:
-                            {
-                                if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() ==
-                                   "CERTANCE")
-                                    decodedText = Modes.PrettifyCertanceModePage_22(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x24:
-                            {
-                                if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "IBM")
-                                    decodedText = Modes.PrettifyIBMModePage_24(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x2A:
-                            {
-                                if(page.Subpage == 0)
-                                    decodedText = Modes.PrettifyModePage_2A(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x2F:
-                            {
-                                if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "IBM")
-                                    decodedText = Modes.PrettifyIBMModePage_2F(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x30:
-                            {
-                                if(Modes.IsAppleModePage_30(page.PageResponse))
-                                    decodedText = "Drive identifies as Apple OEM drive";
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x3B:
-                            {
-                                if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "HP")
-                                    decodedText = Modes.PrettifyHPModePage_3B(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x3C:
-                            {
-                                if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "HP")
-                                    decodedText = Modes.PrettifyHPModePage_3C(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x3D:
-                            {
-                                if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "IBM")
-                                    decodedText = Modes.PrettifyIBMModePage_3D(page.PageResponse);
-                                else if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "HP")
-                                    decodedText = Modes.PrettifyHPModePage_3D(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            case 0x3E:
-                            {
-                                if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "FUJITSU")
-                                    decodedText = Modes.PrettifyFujitsuModePage_3E(page.PageResponse);
-                                else if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "HP")
-                                    decodedText = Modes.PrettifyHPModePage_3E(page.PageResponse);
-                                else
-                                    goto default;
-
-                                break;
-                            }
-                            default:
-                            {
+                            if(scsiType     == PeripheralDeviceTypes.MultiMediaDevice &&
+                               page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_00_SFF(page.PageResponse);
+                            else
                                 decodedText = "Undecoded";
 
-                                break;
-                            }
+                            break;
                         }
-
-                        // TODO: Automatic error reporting
-                        if(decodedText == null)
-                            decodedText = "Error decoding page, please open an issue.";
-
-                        ModeSensePages.Add(new ScsiPageModel
+                        case 0x01:
                         {
-                            Page        = pageNumberText,
-                            Description = decodedText
-                        });
-                    }
-            }
+                            if(page.Subpage == 0)
+                                decodedText = scsiType == PeripheralDeviceTypes.MultiMediaDevice
+                                                  ? Modes.PrettifyModePage_01_MMC(page.PageResponse)
+                                                  : Modes.PrettifyModePage_01(page.PageResponse);
+                            else
+                                goto default;
 
-            if(scsiEvpdPages != null)
-            {
-                foreach(KeyValuePair<byte, byte[]> page in scsiEvpdPages.OrderBy(t => t.Key))
-                {
-                    string evpdPageTitle = "";
-                    string evpdDecodedPage;
-
-                    if(page.Key >= 0x01 &&
-                       page.Key <= 0x7F)
-                    {
-                        evpdPageTitle   = $"ASCII Page {page.Key:X2}h";
-                        evpdDecodedPage = EVPD.DecodeASCIIPage(page.Value);
-                    }
-                    else if(page.Key == 0x80)
-                    {
-                        evpdPageTitle   = "Unit Serial Number";
-                        evpdDecodedPage = EVPD.DecodePage80(page.Value);
-                    }
-                    else if(page.Key == 0x81)
-                    {
-                        evpdPageTitle   = "SCSI Implemented operating definitions";
-                        evpdDecodedPage = EVPD.PrettifyPage_81(page.Value);
-                    }
-                    else if(page.Key == 0x82)
-                    {
-                        evpdPageTitle   = "ASCII implemented operating definitions";
-                        evpdDecodedPage = EVPD.DecodePage82(page.Value);
-                    }
-                    else if(page.Key == 0x83)
-                    {
-                        evpdPageTitle   = "SCSI Device identification";
-                        evpdDecodedPage = EVPD.PrettifyPage_83(page.Value);
-                    }
-                    else if(page.Key == 0x84)
-                    {
-                        evpdPageTitle   = "SCSI Software Interface Identifiers";
-                        evpdDecodedPage = EVPD.PrettifyPage_84(page.Value);
-                    }
-                    else if(page.Key == 0x85)
-                    {
-                        evpdPageTitle   = "SCSI Management Network Addresses";
-                        evpdDecodedPage = EVPD.PrettifyPage_85(page.Value);
-                    }
-                    else if(page.Key == 0x86)
-                    {
-                        evpdPageTitle   = "SCSI Extended INQUIRY Data";
-                        evpdDecodedPage = EVPD.PrettifyPage_86(page.Value);
-                    }
-                    else if(page.Key == 0x89)
-                    {
-                        evpdPageTitle   = "SCSI to ATA Translation Layer Data";
-                        evpdDecodedPage = EVPD.PrettifyPage_89(page.Value);
-                    }
-                    else if(page.Key == 0xB0)
-                    {
-                        evpdPageTitle   = "SCSI Sequential-access Device Capabilities";
-                        evpdDecodedPage = EVPD.PrettifyPage_B0(page.Value);
-                    }
-                    else if(page.Key == 0xB1)
-                    {
-                        evpdPageTitle   = "Manufacturer-assigned Serial Number";
-                        evpdDecodedPage = EVPD.DecodePageB1(page.Value);
-                    }
-                    else if(page.Key == 0xB2)
-                    {
-                        evpdPageTitle   = "TapeAlert Supported Flags Bitmap";
-                        evpdDecodedPage = $"0x{EVPD.DecodePageB2(page.Value):X16}";
-                    }
-                    else if(page.Key == 0xB3)
-                    {
-                        evpdPageTitle   = "Automation Device Serial Number";
-                        evpdDecodedPage = EVPD.DecodePageB3(page.Value);
-                    }
-                    else if(page.Key == 0xB4)
-                    {
-                        evpdPageTitle   = "Data Transfer Device Element Address";
-                        evpdDecodedPage = EVPD.DecodePageB4(page.Value);
-                    }
-                    else if(page.Key == 0xC0 &&
-                            StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
-                                           Trim() == "quantum")
-                    {
-                        evpdPageTitle   = "Quantum Firmware Build Information page";
-                        evpdDecodedPage = EVPD.PrettifyPage_C0_Quantum(page.Value);
-                    }
-                    else if(page.Key == 0xC0 &&
-                            StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
-                                           Trim() == "seagate")
-                    {
-                        evpdPageTitle   = "Seagate Firmware Numbers page";
-                        evpdDecodedPage = EVPD.PrettifyPage_C0_Seagate(page.Value);
-                    }
-                    else if(page.Key == 0xC0 &&
-                            StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
-                                           Trim() == "ibm")
-                    {
-                        evpdPageTitle   = "IBM Drive Component Revision Levels page";
-                        evpdDecodedPage = EVPD.PrettifyPage_C0_IBM(page.Value);
-                    }
-                    else if(page.Key == 0xC1 &&
-                            StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
-                                           Trim() == "ibm")
-                    {
-                        evpdPageTitle   = "IBM Drive Serial Numbers page";
-                        evpdDecodedPage = EVPD.PrettifyPage_C1_IBM(page.Value);
-                    }
-                    else if((page.Key == 0xC0 || page.Key == 0xC1) &&
-                            StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
-                                           Trim() == "certance")
-                    {
-                        evpdPageTitle   = "Certance Drive Component Revision Levels page";
-                        evpdDecodedPage = EVPD.PrettifyPage_C0_C1_Certance(page.Value);
-                    }
-                    else if((page.Key == 0xC2 || page.Key == 0xC3 || page.Key == 0xC4 || page.Key == 0xC5 ||
-                             page.Key == 0xC6) &&
-                            StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
-                                           Trim() == "certance")
-                    {
-                        switch(page.Key)
-                        {
-                            case 0xC2:
-                                evpdPageTitle = "Head Assembly Serial Number";
-
-                                break;
-                            case 0xC3:
-                                evpdPageTitle = "Reel Motor 1 Serial Number";
-
-                                break;
-                            case 0xC4:
-                                evpdPageTitle = "Reel Motor 2 Serial Number";
-
-                                break;
-                            case 0xC5:
-                                evpdPageTitle = "Board Serial Number";
-
-                                break;
-                            case 0xC6:
-                                evpdPageTitle = "Base Mechanical Serial Number";
-
-                                break;
+                            break;
                         }
-
-                        evpdDecodedPage = EVPD.PrettifyPage_C2_C3_C4_C5_C6_Certance(page.Value);
-                    }
-                    else if((page.Key == 0xC0 || page.Key == 0xC1 || page.Key == 0xC2 || page.Key == 0xC3 ||
-                             page.Key == 0xC4 || page.Key == 0xC5) &&
-                            StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
-                                           Trim() == "hp")
-                    {
-                        switch(page.Key)
+                        case 0x02:
                         {
-                            case 0xC0:
-                                evpdPageTitle = "HP Drive Firmware Revision Levels page:";
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_02(page.PageResponse);
+                            else
+                                goto default;
 
-                                break;
-                            case 0xC1:
-                                evpdPageTitle = "HP Drive Hardware Revision Levels page:";
-
-                                break;
-                            case 0xC2:
-                                evpdPageTitle = "HP Drive PCA Revision Levels page:";
-
-                                break;
-                            case 0xC3:
-                                evpdPageTitle = "HP Drive Mechanism Revision Levels page:";
-
-                                break;
-                            case 0xC4:
-                                evpdPageTitle = "HP Drive Head Assembly Revision Levels page:";
-
-                                break;
-                            case 0xC5:
-                                evpdPageTitle = "HP Drive ACI Revision Levels page:";
-
-                                break;
+                            break;
                         }
+                        case 0x03:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_03(page.PageResponse);
+                            else
+                                goto default;
 
-                        evpdDecodedPage = EVPD.PrettifyPage_C0_to_C5_HP(page.Value);
-                    }
-                    else if(page.Key == 0xDF &&
-                            StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
-                                           Trim() == "certance")
-                    {
-                        evpdPageTitle   = "Certance drive status page";
-                        evpdDecodedPage = EVPD.PrettifyPage_DF_Certance(page.Value);
-                    }
-                    else
-                    {
-                        if(page.Key == 0x00)
-                            continue;
+                            break;
+                        }
+                        case 0x04:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_04(page.PageResponse);
+                            else
+                                goto default;
 
-                        evpdPageTitle   = $"Page {page.Key:X2}h";
-                        evpdDecodedPage = "Undecoded";
+                            break;
+                        }
+                        case 0x05:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_05(page.PageResponse);
+                            else
+                                goto default;
 
-                        AaruConsole.DebugWriteLine("Device-Info command", "Found undecoded SCSI VPD page 0x{0:X2}",
-                                                   page.Key);
+                            break;
+                        }
+                        case 0x06:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_06(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x07:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = scsiType == PeripheralDeviceTypes.MultiMediaDevice
+                                                  ? Modes.PrettifyModePage_07_MMC(page.PageResponse)
+                                                  : Modes.PrettifyModePage_07(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x08:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_08(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x0A:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_0A(page.PageResponse);
+                            else if(page.Subpage == 1)
+                                decodedText = Modes.PrettifyModePage_0A_S01(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x0B:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_0B(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x0D:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_0D(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x0E:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_0E(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x0F:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_0F(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x10:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = scsiType == PeripheralDeviceTypes.SequentialAccess
+                                                  ? Modes.PrettifyModePage_10_SSC(page.PageResponse)
+                                                  : Modes.PrettifyModePage_10(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x11:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_11(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x12:
+                        case 0x13:
+                        case 0x14:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_12_13_14(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x1A:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_1A(page.PageResponse);
+                            else if(page.Subpage == 1)
+                                decodedText = Modes.PrettifyModePage_1A_S01(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x1B:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_1B(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x1C:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = scsiType == PeripheralDeviceTypes.MultiMediaDevice
+                                                  ? Modes.PrettifyModePage_1C_SFF(page.PageResponse)
+                                                  : Modes.PrettifyModePage_1C(page.PageResponse);
+                            else if(page.Subpage == 1)
+                                decodedText = Modes.PrettifyModePage_1C_S01(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x1D:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_1D(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x21:
+                        {
+                            if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() ==
+                               "CERTANCE")
+                                decodedText = Modes.PrettifyCertanceModePage_21(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x22:
+                        {
+                            if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() ==
+                               "CERTANCE")
+                                decodedText = Modes.PrettifyCertanceModePage_22(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x24:
+                        {
+                            if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "IBM")
+                                decodedText = Modes.PrettifyIBMModePage_24(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x2A:
+                        {
+                            if(page.Subpage == 0)
+                                decodedText = Modes.PrettifyModePage_2A(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x2F:
+                        {
+                            if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "IBM")
+                                decodedText = Modes.PrettifyIBMModePage_2F(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x30:
+                        {
+                            if(Modes.IsAppleModePage_30(page.PageResponse))
+                                decodedText = "Drive identifies as Apple OEM drive";
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x3B:
+                        {
+                            if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "HP")
+                                decodedText = Modes.PrettifyHPModePage_3B(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x3C:
+                        {
+                            if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "HP")
+                                decodedText = Modes.PrettifyHPModePage_3C(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x3D:
+                        {
+                            if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "IBM")
+                                decodedText = Modes.PrettifyIBMModePage_3D(page.PageResponse);
+                            else if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "HP")
+                                decodedText = Modes.PrettifyHPModePage_3D(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        case 0x3E:
+                        {
+                            if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "FUJITSU")
+                                decodedText = Modes.PrettifyFujitsuModePage_3E(page.PageResponse);
+                            else if(StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).Trim() == "HP")
+                                decodedText = Modes.PrettifyHPModePage_3E(page.PageResponse);
+                            else
+                                goto default;
+
+                            break;
+                        }
+                        default:
+                        {
+                            decodedText = "Undecoded";
+
+                            break;
+                        }
                     }
 
-                    EvpdPages.Add(new ScsiPageModel
+                    // TODO: Automatic error reporting
+                    if(decodedText == null)
+                        decodedText = "Error decoding page, please open an issue.";
+
+                    ModeSensePages.Add(new ScsiPageModel
                     {
-                        Page        = evpdPageTitle,
-                        Data        = page.Value,
-                        Description = evpdDecodedPage
+                        Page        = pageNumberText,
+                        Description = decodedText
                     });
                 }
-            }
+        }
 
-            if(_configuration != null)
+        if(scsiEvpdPages != null)
+        {
+            foreach(KeyValuePair<byte, byte[]> page in scsiEvpdPages.OrderBy(t => t.Key))
             {
-                Features.SeparatedFeatures ftr = Features.Separate(_configuration);
+                string evpdPageTitle = "";
+                string evpdDecodedPage;
 
-                AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION length is {0} bytes",
-                                           ftr.DataLength);
-
-                AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION current profile is {0:X4}h",
-                                           ftr.CurrentProfile);
-
-                if(ftr.Descriptors != null)
-                    foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
+                if(page.Key >= 0x01 &&
+                   page.Key <= 0x7F)
+                {
+                    evpdPageTitle   = $"ASCII Page {page.Key:X2}h";
+                    evpdDecodedPage = EVPD.DecodeASCIIPage(page.Value);
+                }
+                else if(page.Key == 0x80)
+                {
+                    evpdPageTitle   = "Unit Serial Number";
+                    evpdDecodedPage = EVPD.DecodePage80(page.Value);
+                }
+                else if(page.Key == 0x81)
+                {
+                    evpdPageTitle   = "SCSI Implemented operating definitions";
+                    evpdDecodedPage = EVPD.PrettifyPage_81(page.Value);
+                }
+                else if(page.Key == 0x82)
+                {
+                    evpdPageTitle   = "ASCII implemented operating definitions";
+                    evpdDecodedPage = EVPD.DecodePage82(page.Value);
+                }
+                else if(page.Key == 0x83)
+                {
+                    evpdPageTitle   = "SCSI Device identification";
+                    evpdDecodedPage = EVPD.PrettifyPage_83(page.Value);
+                }
+                else if(page.Key == 0x84)
+                {
+                    evpdPageTitle   = "SCSI Software Interface Identifiers";
+                    evpdDecodedPage = EVPD.PrettifyPage_84(page.Value);
+                }
+                else if(page.Key == 0x85)
+                {
+                    evpdPageTitle   = "SCSI Management Network Addresses";
+                    evpdDecodedPage = EVPD.PrettifyPage_85(page.Value);
+                }
+                else if(page.Key == 0x86)
+                {
+                    evpdPageTitle   = "SCSI Extended INQUIRY Data";
+                    evpdDecodedPage = EVPD.PrettifyPage_86(page.Value);
+                }
+                else if(page.Key == 0x89)
+                {
+                    evpdPageTitle   = "SCSI to ATA Translation Layer Data";
+                    evpdDecodedPage = EVPD.PrettifyPage_89(page.Value);
+                }
+                else if(page.Key == 0xB0)
+                {
+                    evpdPageTitle   = "SCSI Sequential-access Device Capabilities";
+                    evpdDecodedPage = EVPD.PrettifyPage_B0(page.Value);
+                }
+                else if(page.Key == 0xB1)
+                {
+                    evpdPageTitle   = "Manufacturer-assigned Serial Number";
+                    evpdDecodedPage = EVPD.DecodePageB1(page.Value);
+                }
+                else if(page.Key == 0xB2)
+                {
+                    evpdPageTitle   = "TapeAlert Supported Flags Bitmap";
+                    evpdDecodedPage = $"0x{EVPD.DecodePageB2(page.Value):X16}";
+                }
+                else if(page.Key == 0xB3)
+                {
+                    evpdPageTitle   = "Automation Device Serial Number";
+                    evpdDecodedPage = EVPD.DecodePageB3(page.Value);
+                }
+                else if(page.Key == 0xB4)
+                {
+                    evpdPageTitle   = "Data Transfer Device Element Address";
+                    evpdDecodedPage = EVPD.DecodePageB4(page.Value);
+                }
+                else if(page.Key == 0xC0 &&
+                        StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
+                                       Trim() == "quantum")
+                {
+                    evpdPageTitle   = "Quantum Firmware Build Information page";
+                    evpdDecodedPage = EVPD.PrettifyPage_C0_Quantum(page.Value);
+                }
+                else if(page.Key == 0xC0 &&
+                        StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
+                                       Trim() == "seagate")
+                {
+                    evpdPageTitle   = "Seagate Firmware Numbers page";
+                    evpdDecodedPage = EVPD.PrettifyPage_C0_Seagate(page.Value);
+                }
+                else if(page.Key == 0xC0 &&
+                        StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
+                                       Trim() == "ibm")
+                {
+                    evpdPageTitle   = "IBM Drive Component Revision Levels page";
+                    evpdDecodedPage = EVPD.PrettifyPage_C0_IBM(page.Value);
+                }
+                else if(page.Key == 0xC1 &&
+                        StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
+                                       Trim() == "ibm")
+                {
+                    evpdPageTitle   = "IBM Drive Serial Numbers page";
+                    evpdDecodedPage = EVPD.PrettifyPage_C1_IBM(page.Value);
+                }
+                else if((page.Key == 0xC0 || page.Key == 0xC1) &&
+                        StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
+                                       Trim() == "certance")
+                {
+                    evpdPageTitle   = "Certance Drive Component Revision Levels page";
+                    evpdDecodedPage = EVPD.PrettifyPage_C0_C1_Certance(page.Value);
+                }
+                else if((page.Key == 0xC2 || page.Key == 0xC3 || page.Key == 0xC4 || page.Key == 0xC5 ||
+                         page.Key == 0xC6) &&
+                        StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
+                                       Trim() == "certance")
+                {
+                    switch(page.Key)
                     {
-                        string featureNumber = $"Feature {desc.Code:X4}h";
-                        string featureDescription;
-                        AaruConsole.DebugWriteLine("Device-Info command", "Feature {0:X4}h", desc.Code);
+                        case 0xC2:
+                            evpdPageTitle = "Head Assembly Serial Number";
 
-                        switch(desc.Code)
-                        {
-                            case 0x0000:
-                                featureDescription = Features.Prettify_0000(desc.Data);
+                            break;
+                        case 0xC3:
+                            evpdPageTitle = "Reel Motor 1 Serial Number";
 
-                                break;
-                            case 0x0001:
-                                featureDescription = Features.Prettify_0001(desc.Data);
+                            break;
+                        case 0xC4:
+                            evpdPageTitle = "Reel Motor 2 Serial Number";
 
-                                break;
-                            case 0x0002:
-                                featureDescription = Features.Prettify_0002(desc.Data);
+                            break;
+                        case 0xC5:
+                            evpdPageTitle = "Board Serial Number";
 
-                                break;
-                            case 0x0003:
-                                featureDescription = Features.Prettify_0003(desc.Data);
+                            break;
+                        case 0xC6:
+                            evpdPageTitle = "Base Mechanical Serial Number";
 
-                                break;
-                            case 0x0004:
-                                featureDescription = Features.Prettify_0004(desc.Data);
-
-                                break;
-                            case 0x0010:
-                                featureDescription = Features.Prettify_0010(desc.Data);
-
-                                break;
-                            case 0x001D:
-                                featureDescription = Features.Prettify_001D(desc.Data);
-
-                                break;
-                            case 0x001E:
-                                featureDescription = Features.Prettify_001E(desc.Data);
-
-                                break;
-                            case 0x001F:
-                                featureDescription = Features.Prettify_001F(desc.Data);
-
-                                break;
-                            case 0x0020:
-                                featureDescription = Features.Prettify_0020(desc.Data);
-
-                                break;
-                            case 0x0021:
-                                featureDescription = Features.Prettify_0021(desc.Data);
-
-                                break;
-                            case 0x0022:
-                                featureDescription = Features.Prettify_0022(desc.Data);
-
-                                break;
-                            case 0x0023:
-                                featureDescription = Features.Prettify_0023(desc.Data);
-
-                                break;
-                            case 0x0024:
-                                featureDescription = Features.Prettify_0024(desc.Data);
-
-                                break;
-                            case 0x0025:
-                                featureDescription = Features.Prettify_0025(desc.Data);
-
-                                break;
-                            case 0x0026:
-                                featureDescription = Features.Prettify_0026(desc.Data);
-
-                                break;
-                            case 0x0027:
-                                featureDescription = Features.Prettify_0027(desc.Data);
-
-                                break;
-                            case 0x0028:
-                                featureDescription = Features.Prettify_0028(desc.Data);
-
-                                break;
-                            case 0x0029:
-                                featureDescription = Features.Prettify_0029(desc.Data);
-
-                                break;
-                            case 0x002A:
-                                featureDescription = Features.Prettify_002A(desc.Data);
-
-                                break;
-                            case 0x002B:
-                                featureDescription = Features.Prettify_002B(desc.Data);
-
-                                break;
-                            case 0x002C:
-                                featureDescription = Features.Prettify_002C(desc.Data);
-
-                                break;
-                            case 0x002D:
-                                featureDescription = Features.Prettify_002D(desc.Data);
-
-                                break;
-                            case 0x002E:
-                                featureDescription = Features.Prettify_002E(desc.Data);
-
-                                break;
-                            case 0x002F:
-                                featureDescription = Features.Prettify_002F(desc.Data);
-
-                                break;
-                            case 0x0030:
-                                featureDescription = Features.Prettify_0030(desc.Data);
-
-                                break;
-                            case 0x0031:
-                                featureDescription = Features.Prettify_0031(desc.Data);
-
-                                break;
-                            case 0x0032:
-                                featureDescription = Features.Prettify_0032(desc.Data);
-
-                                break;
-                            case 0x0033:
-                                featureDescription = Features.Prettify_0033(desc.Data);
-
-                                break;
-                            case 0x0035:
-                                featureDescription = Features.Prettify_0035(desc.Data);
-
-                                break;
-                            case 0x0037:
-                                featureDescription = Features.Prettify_0037(desc.Data);
-
-                                break;
-                            case 0x0038:
-                                featureDescription = Features.Prettify_0038(desc.Data);
-
-                                break;
-                            case 0x003A:
-                                featureDescription = Features.Prettify_003A(desc.Data);
-
-                                break;
-                            case 0x003B:
-                                featureDescription = Features.Prettify_003B(desc.Data);
-
-                                break;
-                            case 0x0040:
-                                featureDescription = Features.Prettify_0040(desc.Data);
-
-                                break;
-                            case 0x0041:
-                                featureDescription = Features.Prettify_0041(desc.Data);
-
-                                break;
-                            case 0x0042:
-                                featureDescription = Features.Prettify_0042(desc.Data);
-
-                                break;
-                            case 0x0050:
-                                featureDescription = Features.Prettify_0050(desc.Data);
-
-                                break;
-                            case 0x0051:
-                                featureDescription = Features.Prettify_0051(desc.Data);
-
-                                break;
-                            case 0x0080:
-                                featureDescription = Features.Prettify_0080(desc.Data);
-
-                                break;
-                            case 0x0100:
-                                featureDescription = Features.Prettify_0100(desc.Data);
-
-                                break;
-                            case 0x0101:
-                                featureDescription = Features.Prettify_0101(desc.Data);
-
-                                break;
-                            case 0x0102:
-                                featureDescription = Features.Prettify_0102(desc.Data);
-
-                                break;
-                            case 0x0103:
-                                featureDescription = Features.Prettify_0103(desc.Data);
-
-                                break;
-                            case 0x0104:
-                                featureDescription = Features.Prettify_0104(desc.Data);
-
-                                break;
-                            case 0x0105:
-                                featureDescription = Features.Prettify_0105(desc.Data);
-
-                                break;
-                            case 0x0106:
-                                featureDescription = Features.Prettify_0106(desc.Data);
-
-                                break;
-                            case 0x0107:
-                                featureDescription = Features.Prettify_0107(desc.Data);
-
-                                break;
-                            case 0x0108:
-                                featureDescription = Features.Prettify_0108(desc.Data);
-
-                                break;
-                            case 0x0109:
-                                featureDescription = Features.Prettify_0109(desc.Data);
-
-                                break;
-                            case 0x010A:
-                                featureDescription = Features.Prettify_010A(desc.Data);
-
-                                break;
-                            case 0x010B:
-                                featureDescription = Features.Prettify_010B(desc.Data);
-
-                                break;
-                            case 0x010C:
-                                featureDescription = Features.Prettify_010C(desc.Data);
-
-                                break;
-                            case 0x010D:
-                                featureDescription = Features.Prettify_010D(desc.Data);
-
-                                break;
-                            case 0x010E:
-                                featureDescription = Features.Prettify_010E(desc.Data);
-
-                                break;
-                            case 0x0110:
-                                featureDescription = Features.Prettify_0110(desc.Data);
-
-                                break;
-                            case 0x0113:
-                                featureDescription = Features.Prettify_0113(desc.Data);
-
-                                break;
-                            case 0x0142:
-                                featureDescription = Features.Prettify_0142(desc.Data);
-
-                                break;
-                            default:
-                                featureDescription = "Unknown feature";
-
-                                break;
-                        }
-
-                        MmcFeatures.Add(new ScsiPageModel
-                        {
-                            Page        = featureNumber,
-                            Description = featureDescription
-                        });
+                            break;
                     }
+
+                    evpdDecodedPage = EVPD.PrettifyPage_C2_C3_C4_C5_C6_Certance(page.Value);
+                }
+                else if((page.Key == 0xC0 || page.Key == 0xC1 || page.Key == 0xC2 || page.Key == 0xC3 ||
+                         page.Key == 0xC4 || page.Key == 0xC5) &&
+                        StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
+                                       Trim() == "hp")
+                {
+                    switch(page.Key)
+                    {
+                        case 0xC0:
+                            evpdPageTitle = "HP Drive Firmware Revision Levels page:";
+
+                            break;
+                        case 0xC1:
+                            evpdPageTitle = "HP Drive Hardware Revision Levels page:";
+
+                            break;
+                        case 0xC2:
+                            evpdPageTitle = "HP Drive PCA Revision Levels page:";
+
+                            break;
+                        case 0xC3:
+                            evpdPageTitle = "HP Drive Mechanism Revision Levels page:";
+
+                            break;
+                        case 0xC4:
+                            evpdPageTitle = "HP Drive Head Assembly Revision Levels page:";
+
+                            break;
+                        case 0xC5:
+                            evpdPageTitle = "HP Drive ACI Revision Levels page:";
+
+                            break;
+                    }
+
+                    evpdDecodedPage = EVPD.PrettifyPage_C0_to_C5_HP(page.Value);
+                }
+                else if(page.Key == 0xDF &&
+                        StringHandlers.CToString(scsiInquiry.Value.VendorIdentification).ToLowerInvariant().
+                                       Trim() == "certance")
+                {
+                    evpdPageTitle   = "Certance drive status page";
+                    evpdDecodedPage = EVPD.PrettifyPage_DF_Certance(page.Value);
+                }
                 else
-                    AaruConsole.DebugWriteLine("Device-Info command",
-                                               "GET CONFIGURATION returned no feature descriptors");
+                {
+                    if(page.Key == 0x00)
+                        continue;
+
+                    evpdPageTitle   = $"Page {page.Key:X2}h";
+                    evpdDecodedPage = "Undecoded";
+
+                    AaruConsole.DebugWriteLine("Device-Info command", "Found undecoded SCSI VPD page 0x{0:X2}",
+                                               page.Key);
+                }
+
+                EvpdPages.Add(new ScsiPageModel
+                {
+                    Page        = evpdPageTitle,
+                    Data        = page.Value,
+                    Description = evpdDecodedPage
+                });
             }
         }
 
-        public byte[]                              InquiryData              { get; }
-        public string                              ScsiInquiryText          { get; }
-        public ObservableCollection<ScsiPageModel> ModeSensePages           { get; }
-        public ObservableCollection<ScsiPageModel> EvpdPages                { get; }
-        public ObservableCollection<ScsiPageModel> MmcFeatures              { get; }
-        public ReactiveCommand<Unit, Unit>         SaveInquiryBinaryCommand { get; }
-        public ReactiveCommand<Unit, Unit>         SaveInquiryTextCommand   { get; }
-        public ReactiveCommand<Unit, Unit>         SaveModeSense6Command    { get; }
-        public ReactiveCommand<Unit, Unit>         SaveModeSense10Command   { get; }
-        public ReactiveCommand<Unit, Unit>         SaveEvpdPageCommand      { get; }
-        public ReactiveCommand<Unit, Unit>         SaveMmcFeaturesCommand   { get; }
-
-        public object SelectedModeSensePage
+        if(_configuration != null)
         {
-            get => _selectedModeSensePage;
-            set
-            {
-                if(value == _selectedModeSensePage)
-                    return;
+            Features.SeparatedFeatures ftr = Features.Separate(_configuration);
 
-                if(value is ScsiPageModel pageModel)
-                    ModeSensePageText = pageModel.Description;
+            AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION length is {0} bytes",
+                                       ftr.DataLength);
 
-                this.RaiseAndSetIfChanged(ref _selectedModeSensePage, value);
-            }
-        }
+            AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION current profile is {0:X4}h",
+                                       ftr.CurrentProfile);
 
-        public string ModeSensePageText
-        {
-            get => _scsiModeSensePageText;
-            set => this.RaiseAndSetIfChanged(ref _scsiModeSensePageText, value);
-        }
-
-        public object SelectedEvpdPage
-        {
-            get => _selectedEvpdPage;
-            set
-            {
-                if(value == _selectedEvpdPage)
-                    return;
-
-                if(value is ScsiPageModel pageModel)
-                    EvpdPageText = pageModel.Description;
-
-                this.RaiseAndSetIfChanged(ref _selectedEvpdPage, value);
-            }
-        }
-
-        public string EvpdPageText
-        {
-            get => _evpdPageText;
-            set => this.RaiseAndSetIfChanged(ref _evpdPageText, value);
-        }
-
-        public object SelectedMmcFeature
-        {
-            get => _selectedMmcFeature;
-            set
-            {
-                if(value == _selectedMmcFeature)
-                    return;
-
-                if(value is ScsiPageModel pageModel)
-                    MmcFeatureText = pageModel.Description;
-
-                this.RaiseAndSetIfChanged(ref _selectedMmcFeature, value);
-            }
-        }
-
-        public string MmcFeatureText
-        {
-            get => _mmcFeatureText;
-            set => this.RaiseAndSetIfChanged(ref _mmcFeatureText, value);
-        }
-
-        async void ExecuteSaveInquiryBinaryCommand()
-        {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
+            if(ftr.Descriptors != null)
+                foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
                 {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                    string featureNumber = $"Feature {desc.Code:X4}h";
+                    string featureDescription;
+                    AaruConsole.DebugWriteLine("Device-Info command", "Feature {0:X4}h", desc.Code);
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+                    switch(desc.Code)
+                    {
+                        case 0x0000:
+                            featureDescription = Features.Prettify_0000(desc.Data);
 
-            if(result is null)
-                return;
+                            break;
+                        case 0x0001:
+                            featureDescription = Features.Prettify_0001(desc.Data);
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(InquiryData, 0, InquiryData.Length);
+                            break;
+                        case 0x0002:
+                            featureDescription = Features.Prettify_0002(desc.Data);
 
-            saveFs.Close();
-        }
+                            break;
+                        case 0x0003:
+                            featureDescription = Features.Prettify_0003(desc.Data);
 
-        async void ExecuteSaveInquiryTextCommand()
-        {
-            var dlgSaveText = new SaveFileDialog();
+                            break;
+                        case 0x0004:
+                            featureDescription = Features.Prettify_0004(desc.Data);
 
-            dlgSaveText.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.txt"
-                }),
-                Name = "Text"
-            });
+                            break;
+                        case 0x0010:
+                            featureDescription = Features.Prettify_0010(desc.Data);
 
-            string result = await dlgSaveText.ShowAsync(_view);
+                            break;
+                        case 0x001D:
+                            featureDescription = Features.Prettify_001D(desc.Data);
 
-            if(result is null)
-                return;
+                            break;
+                        case 0x001E:
+                            featureDescription = Features.Prettify_001E(desc.Data);
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            var saveSw = new StreamWriter(saveFs);
-            saveSw.Write(ScsiInquiryText);
-            saveFs.Close();
-        }
+                            break;
+                        case 0x001F:
+                            featureDescription = Features.Prettify_001F(desc.Data);
 
-        async void ExecuteSaveModeSense6Command()
-        {
-            var dlgSaveBinary = new SaveFileDialog();
+                            break;
+                        case 0x0020:
+                            featureDescription = Features.Prettify_0020(desc.Data);
 
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                            break;
+                        case 0x0021:
+                            featureDescription = Features.Prettify_0021(desc.Data);
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+                            break;
+                        case 0x0022:
+                            featureDescription = Features.Prettify_0022(desc.Data);
 
-            if(result is null)
-                return;
+                            break;
+                        case 0x0023:
+                            featureDescription = Features.Prettify_0023(desc.Data);
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_scsiModeSense6, 0, _scsiModeSense6.Length);
+                            break;
+                        case 0x0024:
+                            featureDescription = Features.Prettify_0024(desc.Data);
 
-            saveFs.Close();
-        }
+                            break;
+                        case 0x0025:
+                            featureDescription = Features.Prettify_0025(desc.Data);
 
-        async void ExecuteSaveModeSense10Command()
-        {
-            var dlgSaveBinary = new SaveFileDialog();
+                            break;
+                        case 0x0026:
+                            featureDescription = Features.Prettify_0026(desc.Data);
 
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                            break;
+                        case 0x0027:
+                            featureDescription = Features.Prettify_0027(desc.Data);
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+                            break;
+                        case 0x0028:
+                            featureDescription = Features.Prettify_0028(desc.Data);
 
-            if(result is null)
-                return;
+                            break;
+                        case 0x0029:
+                            featureDescription = Features.Prettify_0029(desc.Data);
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_scsiModeSense10, 0, _scsiModeSense10.Length);
+                            break;
+                        case 0x002A:
+                            featureDescription = Features.Prettify_002A(desc.Data);
 
-            saveFs.Close();
-        }
+                            break;
+                        case 0x002B:
+                            featureDescription = Features.Prettify_002B(desc.Data);
 
-        async void ExecuteSaveEvpdPageCommand()
-        {
-            if(!(SelectedEvpdPage is ScsiPageModel pageModel))
-                return;
+                            break;
+                        case 0x002C:
+                            featureDescription = Features.Prettify_002C(desc.Data);
 
-            var dlgSaveBinary = new SaveFileDialog();
+                            break;
+                        case 0x002D:
+                            featureDescription = Features.Prettify_002D(desc.Data);
 
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                            break;
+                        case 0x002E:
+                            featureDescription = Features.Prettify_002E(desc.Data);
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+                            break;
+                        case 0x002F:
+                            featureDescription = Features.Prettify_002F(desc.Data);
 
-            if(result is null)
-                return;
+                            break;
+                        case 0x0030:
+                            featureDescription = Features.Prettify_0030(desc.Data);
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(pageModel.Data, 0, pageModel.Data.Length);
+                            break;
+                        case 0x0031:
+                            featureDescription = Features.Prettify_0031(desc.Data);
 
-            saveFs.Close();
-        }
+                            break;
+                        case 0x0032:
+                            featureDescription = Features.Prettify_0032(desc.Data);
 
-        async void ExecuteSaveMmcFeaturesCommand()
-        {
-            var dlgSaveBinary = new SaveFileDialog();
+                            break;
+                        case 0x0033:
+                            featureDescription = Features.Prettify_0033(desc.Data);
 
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
+                            break;
+                        case 0x0035:
+                            featureDescription = Features.Prettify_0035(desc.Data);
 
-            string result = await dlgSaveBinary.ShowAsync(_view);
+                            break;
+                        case 0x0037:
+                            featureDescription = Features.Prettify_0037(desc.Data);
 
-            if(result is null)
-                return;
+                            break;
+                        case 0x0038:
+                            featureDescription = Features.Prettify_0038(desc.Data);
 
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(_configuration, 0, _configuration.Length);
+                            break;
+                        case 0x003A:
+                            featureDescription = Features.Prettify_003A(desc.Data);
 
-            saveFs.Close();
+                            break;
+                        case 0x003B:
+                            featureDescription = Features.Prettify_003B(desc.Data);
+
+                            break;
+                        case 0x0040:
+                            featureDescription = Features.Prettify_0040(desc.Data);
+
+                            break;
+                        case 0x0041:
+                            featureDescription = Features.Prettify_0041(desc.Data);
+
+                            break;
+                        case 0x0042:
+                            featureDescription = Features.Prettify_0042(desc.Data);
+
+                            break;
+                        case 0x0050:
+                            featureDescription = Features.Prettify_0050(desc.Data);
+
+                            break;
+                        case 0x0051:
+                            featureDescription = Features.Prettify_0051(desc.Data);
+
+                            break;
+                        case 0x0080:
+                            featureDescription = Features.Prettify_0080(desc.Data);
+
+                            break;
+                        case 0x0100:
+                            featureDescription = Features.Prettify_0100(desc.Data);
+
+                            break;
+                        case 0x0101:
+                            featureDescription = Features.Prettify_0101(desc.Data);
+
+                            break;
+                        case 0x0102:
+                            featureDescription = Features.Prettify_0102(desc.Data);
+
+                            break;
+                        case 0x0103:
+                            featureDescription = Features.Prettify_0103(desc.Data);
+
+                            break;
+                        case 0x0104:
+                            featureDescription = Features.Prettify_0104(desc.Data);
+
+                            break;
+                        case 0x0105:
+                            featureDescription = Features.Prettify_0105(desc.Data);
+
+                            break;
+                        case 0x0106:
+                            featureDescription = Features.Prettify_0106(desc.Data);
+
+                            break;
+                        case 0x0107:
+                            featureDescription = Features.Prettify_0107(desc.Data);
+
+                            break;
+                        case 0x0108:
+                            featureDescription = Features.Prettify_0108(desc.Data);
+
+                            break;
+                        case 0x0109:
+                            featureDescription = Features.Prettify_0109(desc.Data);
+
+                            break;
+                        case 0x010A:
+                            featureDescription = Features.Prettify_010A(desc.Data);
+
+                            break;
+                        case 0x010B:
+                            featureDescription = Features.Prettify_010B(desc.Data);
+
+                            break;
+                        case 0x010C:
+                            featureDescription = Features.Prettify_010C(desc.Data);
+
+                            break;
+                        case 0x010D:
+                            featureDescription = Features.Prettify_010D(desc.Data);
+
+                            break;
+                        case 0x010E:
+                            featureDescription = Features.Prettify_010E(desc.Data);
+
+                            break;
+                        case 0x0110:
+                            featureDescription = Features.Prettify_0110(desc.Data);
+
+                            break;
+                        case 0x0113:
+                            featureDescription = Features.Prettify_0113(desc.Data);
+
+                            break;
+                        case 0x0142:
+                            featureDescription = Features.Prettify_0142(desc.Data);
+
+                            break;
+                        default:
+                            featureDescription = "Unknown feature";
+
+                            break;
+                    }
+
+                    MmcFeatures.Add(new ScsiPageModel
+                    {
+                        Page        = featureNumber,
+                        Description = featureDescription
+                    });
+                }
+            else
+                AaruConsole.DebugWriteLine("Device-Info command",
+                                           "GET CONFIGURATION returned no feature descriptors");
         }
     }
+
+    public byte[]                              InquiryData              { get; }
+    public string                              ScsiInquiryText          { get; }
+    public ObservableCollection<ScsiPageModel> ModeSensePages           { get; }
+    public ObservableCollection<ScsiPageModel> EvpdPages                { get; }
+    public ObservableCollection<ScsiPageModel> MmcFeatures              { get; }
+    public ReactiveCommand<Unit, Unit>         SaveInquiryBinaryCommand { get; }
+    public ReactiveCommand<Unit, Unit>         SaveInquiryTextCommand   { get; }
+    public ReactiveCommand<Unit, Unit>         SaveModeSense6Command    { get; }
+    public ReactiveCommand<Unit, Unit>         SaveModeSense10Command   { get; }
+    public ReactiveCommand<Unit, Unit>         SaveEvpdPageCommand      { get; }
+    public ReactiveCommand<Unit, Unit>         SaveMmcFeaturesCommand   { get; }
+
+    public object SelectedModeSensePage
+    {
+        get => _selectedModeSensePage;
+        set
+        {
+            if(value == _selectedModeSensePage)
+                return;
+
+            if(value is ScsiPageModel pageModel)
+                ModeSensePageText = pageModel.Description;
+
+            this.RaiseAndSetIfChanged(ref _selectedModeSensePage, value);
+        }
+    }
+
+    public string ModeSensePageText
+    {
+        get => _scsiModeSensePageText;
+        set => this.RaiseAndSetIfChanged(ref _scsiModeSensePageText, value);
+    }
+
+    public object SelectedEvpdPage
+    {
+        get => _selectedEvpdPage;
+        set
+        {
+            if(value == _selectedEvpdPage)
+                return;
+
+            if(value is ScsiPageModel pageModel)
+                EvpdPageText = pageModel.Description;
+
+            this.RaiseAndSetIfChanged(ref _selectedEvpdPage, value);
+        }
+    }
+
+    public string EvpdPageText
+    {
+        get => _evpdPageText;
+        set => this.RaiseAndSetIfChanged(ref _evpdPageText, value);
+    }
+
+    public object SelectedMmcFeature
+    {
+        get => _selectedMmcFeature;
+        set
+        {
+            if(value == _selectedMmcFeature)
+                return;
+
+            if(value is ScsiPageModel pageModel)
+                MmcFeatureText = pageModel.Description;
+
+            this.RaiseAndSetIfChanged(ref _selectedMmcFeature, value);
+        }
+    }
+
+    public string MmcFeatureText
+    {
+        get => _mmcFeatureText;
+        set => this.RaiseAndSetIfChanged(ref _mmcFeatureText, value);
+    }
+
+    async void ExecuteSaveInquiryBinaryCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(InquiryData, 0, InquiryData.Length);
+
+        saveFs.Close();
+    }
+
+    async void ExecuteSaveInquiryTextCommand()
+    {
+        var dlgSaveText = new SaveFileDialog();
+
+        dlgSaveText.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.txt"
+            }),
+            Name = "Text"
+        });
+
+        string result = await dlgSaveText.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        var saveSw = new StreamWriter(saveFs);
+        saveSw.Write(ScsiInquiryText);
+        saveFs.Close();
+    }
+
+    async void ExecuteSaveModeSense6Command()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_scsiModeSense6, 0, _scsiModeSense6.Length);
+
+        saveFs.Close();
+    }
+
+    async void ExecuteSaveModeSense10Command()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_scsiModeSense10, 0, _scsiModeSense10.Length);
+
+        saveFs.Close();
+    }
+
+    async void ExecuteSaveEvpdPageCommand()
+    {
+        if(!(SelectedEvpdPage is ScsiPageModel pageModel))
+            return;
+
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(pageModel.Data, 0, pageModel.Data.Length);
+
+        saveFs.Close();
+    }
+
+    async void ExecuteSaveMmcFeaturesCommand()
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(_configuration, 0, _configuration.Length);
+
+        saveFs.Close();
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs
index 6777d9a9e..cfc9a182c 100644
--- a/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/SdMmcInfoViewModel.cs
@@ -33,58 +33,57 @@
 using Aaru.CommonTypes.Enums;
 using JetBrains.Annotations;
 
-namespace Aaru.Gui.ViewModels.Tabs
+namespace Aaru.Gui.ViewModels.Tabs;
+
+public sealed class SdMmcInfoViewModel
 {
-    public sealed class SdMmcInfoViewModel
+    public SdMmcInfoViewModel(DeviceType deviceType, [CanBeNull] byte[] cid, [CanBeNull] byte[] csd,
+                              [CanBeNull] byte[] ocr, [CanBeNull] byte[] extendedCsd, [CanBeNull] byte[] scr)
     {
-        public SdMmcInfoViewModel(DeviceType deviceType, [CanBeNull] byte[] cid, [CanBeNull] byte[] csd,
-                                  [CanBeNull] byte[] ocr, [CanBeNull] byte[] extendedCsd, [CanBeNull] byte[] scr)
+        switch(deviceType)
         {
-            switch(deviceType)
+            case DeviceType.MMC:
             {
-                case DeviceType.MMC:
-                {
-                    //Text = "MultiMediaCard";
+                //Text = "MultiMediaCard";
 
-                    if(cid != null)
-                        CidText = Decoders.MMC.Decoders.PrettifyCID(cid);
+                if(cid != null)
+                    CidText = Decoders.MMC.Decoders.PrettifyCID(cid);
 
-                    if(csd != null)
-                        CsdText = Decoders.MMC.Decoders.PrettifyCSD(csd);
+                if(csd != null)
+                    CsdText = Decoders.MMC.Decoders.PrettifyCSD(csd);
 
-                    if(ocr != null)
-                        OcrText = Decoders.MMC.Decoders.PrettifyOCR(ocr);
+                if(ocr != null)
+                    OcrText = Decoders.MMC.Decoders.PrettifyOCR(ocr);
 
-                    if(extendedCsd != null)
-                        ExtendedCsdText = Decoders.MMC.Decoders.PrettifyExtendedCSD(extendedCsd);
-                }
-
-                    break;
-                case DeviceType.SecureDigital:
-                {
-                    //Text = "SecureDigital";
-
-                    if(cid != null)
-                        CidText = Decoders.SecureDigital.Decoders.PrettifyCID(cid);
-
-                    if(csd != null)
-                        CsdText = Decoders.SecureDigital.Decoders.PrettifyCSD(csd);
-
-                    if(ocr != null)
-                        OcrText = Decoders.SecureDigital.Decoders.PrettifyOCR(ocr);
-
-                    if(scr != null)
-                        ScrText = Decoders.SecureDigital.Decoders.PrettifySCR(scr);
-                }
-
-                    break;
+                if(extendedCsd != null)
+                    ExtendedCsdText = Decoders.MMC.Decoders.PrettifyExtendedCSD(extendedCsd);
             }
-        }
 
-        public string CidText         { get; }
-        public string CsdText         { get; }
-        public string OcrText         { get; }
-        public string ExtendedCsdText { get; }
-        public string ScrText         { get; }
+                break;
+            case DeviceType.SecureDigital:
+            {
+                //Text = "SecureDigital";
+
+                if(cid != null)
+                    CidText = Decoders.SecureDigital.Decoders.PrettifyCID(cid);
+
+                if(csd != null)
+                    CsdText = Decoders.SecureDigital.Decoders.PrettifyCSD(csd);
+
+                if(ocr != null)
+                    OcrText = Decoders.SecureDigital.Decoders.PrettifyOCR(ocr);
+
+                if(scr != null)
+                    ScrText = Decoders.SecureDigital.Decoders.PrettifySCR(scr);
+            }
+
+                break;
+        }
     }
+
+    public string CidText         { get; }
+    public string CsdText         { get; }
+    public string OcrText         { get; }
+    public string ExtendedCsdText { get; }
+    public string ScrText         { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs b/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs
index c26d03630..1888559c7 100644
--- a/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs
+++ b/Aaru.Gui/ViewModels/Tabs/XboxInfoViewModel.cs
@@ -39,81 +39,80 @@ using Avalonia.Controls;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Tabs
+namespace Aaru.Gui.ViewModels.Tabs;
+
+public sealed class XboxInfoViewModel
 {
-    public sealed class XboxInfoViewModel
+    readonly Window _view;
+    readonly byte[] _xboxSecuritySector;
+
+    public XboxInfoViewModel([CanBeNull] XgdInfo xgdInfo, [CanBeNull] byte[] dmi, [CanBeNull] byte[] securitySector,
+                             SS.SecuritySector? decodedSecuritySector, Window view)
     {
-        readonly Window _view;
-        readonly byte[] _xboxSecuritySector;
+        _xboxSecuritySector = securitySector;
+        _view               = view;
+        SaveXboxSsCommand   = ReactiveCommand.Create(ExecuteSaveXboxSsCommand);
 
-        public XboxInfoViewModel([CanBeNull] XgdInfo xgdInfo, [CanBeNull] byte[] dmi, [CanBeNull] byte[] securitySector,
-                                 SS.SecuritySector? decodedSecuritySector, Window view)
+        if(xgdInfo != null)
         {
-            _xboxSecuritySector = securitySector;
-            _view               = view;
-            SaveXboxSsCommand   = ReactiveCommand.Create(ExecuteSaveXboxSsCommand);
-
-            if(xgdInfo != null)
-            {
-                XboxInformationVisible = true;
-                XboxL0VideoText        = $"{xgdInfo.L0Video} sectors";
-                XboxL1VideoText        = $"{xgdInfo.L1Video} sectors";
-                XboxMiddleZoneText     = $"{xgdInfo.MiddleZone} sectors";
-                XboxGameSizeText       = $"{xgdInfo.GameSize} sectors";
-                XboxTotalSizeText      = $"{xgdInfo.TotalSize} sectors";
-                XboxRealBreakText      = xgdInfo.LayerBreak.ToString();
-            }
-
-            if(dmi != null)
-            {
-                if(DMI.IsXbox(dmi))
-                    XboxDmiText = DMI.PrettifyXbox(dmi);
-                else if(DMI.IsXbox360(dmi))
-                    XboxDmiText = DMI.PrettifyXbox360(dmi);
-            }
-
-            if(decodedSecuritySector.HasValue)
-                XboxSsText = SS.Prettify(decodedSecuritySector);
-
-            SaveXboxSsVisible = securitySector != null;
+            XboxInformationVisible = true;
+            XboxL0VideoText        = $"{xgdInfo.L0Video} sectors";
+            XboxL1VideoText        = $"{xgdInfo.L1Video} sectors";
+            XboxMiddleZoneText     = $"{xgdInfo.MiddleZone} sectors";
+            XboxGameSizeText       = $"{xgdInfo.GameSize} sectors";
+            XboxTotalSizeText      = $"{xgdInfo.TotalSize} sectors";
+            XboxRealBreakText      = xgdInfo.LayerBreak.ToString();
         }
 
-        public ReactiveCommand<Unit, Unit> SaveXboxSsCommand      { get; }
-        public bool                        XboxInformationVisible { get; }
-        public bool                        SaveXboxSsVisible      { get; }
-        public string                      XboxL0VideoText        { get; }
-        public string                      XboxL1VideoText        { get; }
-        public string                      XboxMiddleZoneText     { get; }
-        public string                      XboxGameSizeText       { get; }
-        public string                      XboxTotalSizeText      { get; }
-        public string                      XboxRealBreakText      { get; }
-        public string                      XboxDmiText            { get; }
-        public string                      XboxSsText             { get; }
-
-        async void SaveElement(byte[] data)
+        if(dmi != null)
         {
-            var dlgSaveBinary = new SaveFileDialog();
-
-            dlgSaveBinary.Filters.Add(new FileDialogFilter
-            {
-                Extensions = new List<string>(new[]
-                {
-                    "*.bin"
-                }),
-                Name = "Binary"
-            });
-
-            string result = await dlgSaveBinary.ShowAsync(_view);
-
-            if(result is null)
-                return;
-
-            var saveFs = new FileStream(result, FileMode.Create);
-            saveFs.Write(data, 0, data.Length);
-
-            saveFs.Close();
+            if(DMI.IsXbox(dmi))
+                XboxDmiText = DMI.PrettifyXbox(dmi);
+            else if(DMI.IsXbox360(dmi))
+                XboxDmiText = DMI.PrettifyXbox360(dmi);
         }
 
-        public void ExecuteSaveXboxSsCommand() => SaveElement(_xboxSecuritySector);
+        if(decodedSecuritySector.HasValue)
+            XboxSsText = SS.Prettify(decodedSecuritySector);
+
+        SaveXboxSsVisible = securitySector != null;
     }
+
+    public ReactiveCommand<Unit, Unit> SaveXboxSsCommand      { get; }
+    public bool                        XboxInformationVisible { get; }
+    public bool                        SaveXboxSsVisible      { get; }
+    public string                      XboxL0VideoText        { get; }
+    public string                      XboxL1VideoText        { get; }
+    public string                      XboxMiddleZoneText     { get; }
+    public string                      XboxGameSizeText       { get; }
+    public string                      XboxTotalSizeText      { get; }
+    public string                      XboxRealBreakText      { get; }
+    public string                      XboxDmiText            { get; }
+    public string                      XboxSsText             { get; }
+
+    async void SaveElement(byte[] data)
+    {
+        var dlgSaveBinary = new SaveFileDialog();
+
+        dlgSaveBinary.Filters.Add(new FileDialogFilter
+        {
+            Extensions = new List<string>(new[]
+            {
+                "*.bin"
+            }),
+            Name = "Binary"
+        });
+
+        string result = await dlgSaveBinary.ShowAsync(_view);
+
+        if(result is null)
+            return;
+
+        var saveFs = new FileStream(result, FileMode.Create);
+        saveFs.Write(data, 0, data.Length);
+
+        saveFs.Close();
+    }
+
+    public void ExecuteSaveXboxSsCommand() => SaveElement(_xboxSecuritySector);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/ViewModelBase.cs b/Aaru.Gui/ViewModels/ViewModelBase.cs
index 5c8e01bee..e54d944f8 100644
--- a/Aaru.Gui/ViewModels/ViewModelBase.cs
+++ b/Aaru.Gui/ViewModels/ViewModelBase.cs
@@ -32,7 +32,6 @@
 
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels
-{
-    public class ViewModelBase : ReactiveObject {}
-}
\ No newline at end of file
+namespace Aaru.Gui.ViewModels;
+
+public class ViewModelBase : ReactiveObject {}
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
index 534aa2e62..7a344943a 100644
--- a/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/DecodeMediaTagsViewModel.cs
@@ -54,199 +54,198 @@ using DMI = Aaru.Decoders.Xbox.DMI;
 using Inquiry = Aaru.Decoders.SCSI.Inquiry;
 using Spare = Aaru.Decoders.DVD.Spare;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class DecodeMediaTagsViewModel : ViewModelBase
 {
-    public sealed class DecodeMediaTagsViewModel : ViewModelBase
+    const    int       HEX_COLUMNS = 32;
+    readonly MediaType _mediaType;
+    string             _decodedText;
+    bool               _decodedVisible;
+    string             _hexViewText;
+    MediaTagModel      _selectedTag;
+
+    public DecodeMediaTagsViewModel([NotNull] IMediaImage inputFormat)
     {
-        const    int       HEX_COLUMNS = 32;
-        readonly MediaType _mediaType;
-        string             _decodedText;
-        bool               _decodedVisible;
-        string             _hexViewText;
-        MediaTagModel      _selectedTag;
+        TagsList = new ObservableCollection<MediaTagModel>();
 
-        public DecodeMediaTagsViewModel([NotNull] IMediaImage inputFormat)
+        _mediaType = inputFormat.Info.MediaType;
+
+        foreach(MediaTagType tag in inputFormat.Info.ReadableMediaTags)
         {
-            TagsList = new ObservableCollection<MediaTagModel>();
+            ErrorNumber errno = inputFormat.ReadMediaTag(tag, out byte[] data);
 
-            _mediaType = inputFormat.Info.MediaType;
-
-            foreach(MediaTagType tag in inputFormat.Info.ReadableMediaTags)
-            {
-                ErrorNumber errno = inputFormat.ReadMediaTag(tag, out byte[] data);
-
-                if(errno == ErrorNumber.NoError)
-                    TagsList.Add(new MediaTagModel
-                    {
-                        Tag  = tag,
-                        Data = data
-                    });
-            }
-        }
-
-        public string                              Title    { get; }
-        public ObservableCollection<MediaTagModel> TagsList { get; }
-
-        public MediaTagModel SelectedTag
-        {
-            get => _selectedTag;
-            set
-            {
-                this.RaiseAndSetIfChanged(ref _selectedTag, value);
-
-                if(value is null)
-                    return;
-
-                // TODO: Decoders should be able to handle tags with/without length header
-                HexViewText    = PrintHex.ByteArrayToHexArrayString(value.Data, HEX_COLUMNS);
-                DecodedVisible = true;
-
-                if(value.Decoded != null)
+            if(errno == ErrorNumber.NoError)
+                TagsList.Add(new MediaTagModel
                 {
-                    DecodedText = value.Decoded;
-
-                    return;
-                }
-
-                switch(value.Tag)
-                {
-                    case MediaTagType.CD_TOC:
-                        DecodedText = TOC.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.CD_SessionInfo:
-                        DecodedText = Session.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.CD_FullTOC:
-                        DecodedText = FullTOC.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.CD_PMA:
-                        DecodedText = PMA.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.CD_ATIP:
-                        DecodedText = ATIP.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.CD_TEXT:
-                        DecodedText = CDTextOnLeadIn.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.CD_MCN:
-                        DecodedText = Encoding.ASCII.GetString(value.Data);
-
-                        break;
-                    case MediaTagType.DVD_PFI:
-                        DecodedText = PFI.Prettify(value.Data, _mediaType);
-
-                        break;
-                    case MediaTagType.DVD_CMI:
-                        DecodedText = CSS_CPRM.PrettifyLeadInCopyright(value.Data);
-
-                        break;
-                    case MediaTagType.DVDRAM_DDS:
-                        DecodedText = DDS.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.DVDRAM_SpareArea:
-                        DecodedText = Spare.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.DVDR_PFI:
-                        DecodedText = PFI.Prettify(value.Data, _mediaType);
-
-                        break;
-                    case MediaTagType.HDDVD_MediumStatus:
-                        DecodedText = PFI.Prettify(value.Data, _mediaType);
-
-                        break;
-                    case MediaTagType.BD_DI:
-                        DecodedText = DI.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.BD_BCA:
-                        DecodedText = BCA.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.BD_DDS:
-                        DecodedText = Decoders.Bluray.DDS.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.BD_CartridgeStatus:
-                        DecodedText = Cartridge.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.BD_SpareArea:
-                        DecodedText = Decoders.Bluray.Spare.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.MMC_WriteProtection:
-                        DecodedText = WriteProtect.PrettifyWriteProtectionStatus(value.Data);
-
-                        break;
-                    case MediaTagType.MMC_DiscInformation:
-                        DecodedText = DiscInformation.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.SCSI_INQUIRY:
-                        DecodedText = Inquiry.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.SCSI_MODEPAGE_2A:
-                        DecodedText = Modes.PrettifyModePage_2A(value.Data);
-
-                        break;
-                    case MediaTagType.ATA_IDENTIFY:
-                    case MediaTagType.ATAPI_IDENTIFY:
-                        DecodedText = Identify.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.Xbox_SecuritySector:
-                        DecodedText = SS.Prettify(value.Data);
-
-                        break;
-                    case MediaTagType.SCSI_MODESENSE_6:
-                        DecodedText = Modes.PrettifyModeHeader6(value.Data, PeripheralDeviceTypes.DirectAccess);
-
-                        break;
-                    case MediaTagType.SCSI_MODESENSE_10:
-                        DecodedText = Modes.PrettifyModeHeader10(value.Data, PeripheralDeviceTypes.DirectAccess);
-
-                        break;
-                    case MediaTagType.Xbox_DMI:
-                        DecodedText = DMI.IsXbox360(value.Data) ? DMI.PrettifyXbox360(value.Data)
-                                          : DMI.PrettifyXbox(value.Data);
-
-                        break;
-                    default:
-                        DecodedVisible = false;
-
-                        break;
-                }
-
-                if(DecodedText != null)
-                    value.Decoded = DecodedText;
-            }
-        }
-
-        public string HexViewText
-        {
-            get => _hexViewText;
-            set => this.RaiseAndSetIfChanged(ref _hexViewText, value);
-        }
-
-        public bool DecodedVisible
-        {
-            get => _decodedVisible;
-            set => this.RaiseAndSetIfChanged(ref _decodedVisible, value);
-        }
-
-        public string DecodedText
-        {
-            get => _decodedText;
-            set => this.RaiseAndSetIfChanged(ref _decodedText, value);
+                    Tag  = tag,
+                    Data = data
+                });
         }
     }
+
+    public string                              Title    { get; }
+    public ObservableCollection<MediaTagModel> TagsList { get; }
+
+    public MediaTagModel SelectedTag
+    {
+        get => _selectedTag;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _selectedTag, value);
+
+            if(value is null)
+                return;
+
+            // TODO: Decoders should be able to handle tags with/without length header
+            HexViewText    = PrintHex.ByteArrayToHexArrayString(value.Data, HEX_COLUMNS);
+            DecodedVisible = true;
+
+            if(value.Decoded != null)
+            {
+                DecodedText = value.Decoded;
+
+                return;
+            }
+
+            switch(value.Tag)
+            {
+                case MediaTagType.CD_TOC:
+                    DecodedText = TOC.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.CD_SessionInfo:
+                    DecodedText = Session.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.CD_FullTOC:
+                    DecodedText = FullTOC.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.CD_PMA:
+                    DecodedText = PMA.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.CD_ATIP:
+                    DecodedText = ATIP.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.CD_TEXT:
+                    DecodedText = CDTextOnLeadIn.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.CD_MCN:
+                    DecodedText = Encoding.ASCII.GetString(value.Data);
+
+                    break;
+                case MediaTagType.DVD_PFI:
+                    DecodedText = PFI.Prettify(value.Data, _mediaType);
+
+                    break;
+                case MediaTagType.DVD_CMI:
+                    DecodedText = CSS_CPRM.PrettifyLeadInCopyright(value.Data);
+
+                    break;
+                case MediaTagType.DVDRAM_DDS:
+                    DecodedText = DDS.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.DVDRAM_SpareArea:
+                    DecodedText = Spare.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.DVDR_PFI:
+                    DecodedText = PFI.Prettify(value.Data, _mediaType);
+
+                    break;
+                case MediaTagType.HDDVD_MediumStatus:
+                    DecodedText = PFI.Prettify(value.Data, _mediaType);
+
+                    break;
+                case MediaTagType.BD_DI:
+                    DecodedText = DI.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.BD_BCA:
+                    DecodedText = BCA.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.BD_DDS:
+                    DecodedText = Decoders.Bluray.DDS.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.BD_CartridgeStatus:
+                    DecodedText = Cartridge.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.BD_SpareArea:
+                    DecodedText = Decoders.Bluray.Spare.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.MMC_WriteProtection:
+                    DecodedText = WriteProtect.PrettifyWriteProtectionStatus(value.Data);
+
+                    break;
+                case MediaTagType.MMC_DiscInformation:
+                    DecodedText = DiscInformation.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.SCSI_INQUIRY:
+                    DecodedText = Inquiry.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.SCSI_MODEPAGE_2A:
+                    DecodedText = Modes.PrettifyModePage_2A(value.Data);
+
+                    break;
+                case MediaTagType.ATA_IDENTIFY:
+                case MediaTagType.ATAPI_IDENTIFY:
+                    DecodedText = Identify.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.Xbox_SecuritySector:
+                    DecodedText = SS.Prettify(value.Data);
+
+                    break;
+                case MediaTagType.SCSI_MODESENSE_6:
+                    DecodedText = Modes.PrettifyModeHeader6(value.Data, PeripheralDeviceTypes.DirectAccess);
+
+                    break;
+                case MediaTagType.SCSI_MODESENSE_10:
+                    DecodedText = Modes.PrettifyModeHeader10(value.Data, PeripheralDeviceTypes.DirectAccess);
+
+                    break;
+                case MediaTagType.Xbox_DMI:
+                    DecodedText = DMI.IsXbox360(value.Data) ? DMI.PrettifyXbox360(value.Data)
+                                      : DMI.PrettifyXbox(value.Data);
+
+                    break;
+                default:
+                    DecodedVisible = false;
+
+                    break;
+            }
+
+            if(DecodedText != null)
+                value.Decoded = DecodedText;
+        }
+    }
+
+    public string HexViewText
+    {
+        get => _hexViewText;
+        set => this.RaiseAndSetIfChanged(ref _hexViewText, value);
+    }
+
+    public bool DecodedVisible
+    {
+        get => _decodedVisible;
+        set => this.RaiseAndSetIfChanged(ref _decodedVisible, value);
+    }
+
+    public string DecodedText
+    {
+        get => _decodedText;
+        set => this.RaiseAndSetIfChanged(ref _decodedText, value);
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs
index 0c3dca47b..9c6008d03 100644
--- a/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ImageChecksumViewModel.cs
@@ -45,554 +45,425 @@ using Avalonia.Threading;
 using ReactiveUI;
 using Schemas;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class ImageChecksumViewModel : ViewModelBase
 {
-    public sealed class ImageChecksumViewModel : ViewModelBase
+    // How many sectors to read at once
+    const    uint        SECTORS_TO_READ = 256;
+    readonly IMediaImage _inputFormat;
+    readonly Window      _view;
+    bool                 _adler32Checked;
+    bool                 _cancel;
+    bool                 _checksumMediaChecked;
+    bool                 _checksumTracksChecked;
+    bool                 _checksumTracksVisible;
+    bool                 _closeCommandEnabled;
+    bool                 _closeCommandVisible;
+    bool                 _crc16Checked;
+    bool                 _crc32Checked;
+    bool                 _crc64Checked;
+    bool                 _fletcher16Checked;
+    bool                 _fletcher32Checked;
+    bool                 _md5Checked;
+    bool                 _mediaChecksumsVisible;
+    bool                 _optionsEnabled;
+    bool                 _progress1Visible;
+    double               _progress2Max;
+    string               _progress2Text;
+    double               _progress2Value;
+    bool                 _progress2Visible;
+    double               _progressMax;
+    string               _progressText;
+    double               _progressValue;
+    bool                 _progressVisible;
+    bool                 _resultsVisible;
+    bool                 _sha1Checked;
+    bool                 _sha256Checked;
+    bool                 _sha384Checked;
+    bool                 _sha512Checked;
+    bool                 _spamsumChecked;
+    bool                 _startCommandEnabled;
+    bool                 _startCommandVisible;
+    bool                 _stopCommandEnabled;
+    bool                 _stopCommandVisible;
+    string               _title;
+    bool                 _trackChecksumsVisible;
+
+    public ImageChecksumViewModel(IMediaImage inputFormat, Window view)
     {
-        // How many sectors to read at once
-        const    uint        SECTORS_TO_READ = 256;
-        readonly IMediaImage _inputFormat;
-        readonly Window      _view;
-        bool                 _adler32Checked;
-        bool                 _cancel;
-        bool                 _checksumMediaChecked;
-        bool                 _checksumTracksChecked;
-        bool                 _checksumTracksVisible;
-        bool                 _closeCommandEnabled;
-        bool                 _closeCommandVisible;
-        bool                 _crc16Checked;
-        bool                 _crc32Checked;
-        bool                 _crc64Checked;
-        bool                 _fletcher16Checked;
-        bool                 _fletcher32Checked;
-        bool                 _md5Checked;
-        bool                 _mediaChecksumsVisible;
-        bool                 _optionsEnabled;
-        bool                 _progress1Visible;
-        double               _progress2Max;
-        string               _progress2Text;
-        double               _progress2Value;
-        bool                 _progress2Visible;
-        double               _progressMax;
-        string               _progressText;
-        double               _progressValue;
-        bool                 _progressVisible;
-        bool                 _resultsVisible;
-        bool                 _sha1Checked;
-        bool                 _sha256Checked;
-        bool                 _sha384Checked;
-        bool                 _sha512Checked;
-        bool                 _spamsumChecked;
-        bool                 _startCommandEnabled;
-        bool                 _startCommandVisible;
-        bool                 _stopCommandEnabled;
-        bool                 _stopCommandVisible;
-        string               _title;
-        bool                 _trackChecksumsVisible;
+        _view                 = view;
+        _cancel               = false;
+        _inputFormat          = inputFormat;
+        ChecksumTracksChecked = ChecksumTracksVisible;
+        OptionsEnabled        = true;
+        ChecksumMediaChecked  = true;
+        ChecksumTracksChecked = true;
+        Adler32Checked        = true;
+        Crc16Checked          = true;
+        Crc32Checked          = true;
+        Md5Checked            = true;
+        Sha1Checked           = true;
+        SpamsumChecked        = true;
+        TrackChecksums        = new ObservableCollection<ChecksumModel>();
+        MediaChecksums        = new ObservableCollection<ChecksumModel>();
+        StartCommand          = ReactiveCommand.Create(ExecuteStartCommand);
+        CloseCommand          = ReactiveCommand.Create(ExecuteCloseCommand);
+        StopCommand           = ReactiveCommand.Create(ExecuteStopCommand);
+        StopCommandVisible    = false;
+        StartCommandVisible   = true;
+        CloseCommandVisible   = true;
+        StopCommandEnabled    = true;
+        StartCommandEnabled   = true;
+        CloseCommandEnabled   = true;
 
-        public ImageChecksumViewModel(IMediaImage inputFormat, Window view)
+        try
         {
-            _view                 = view;
-            _cancel               = false;
-            _inputFormat          = inputFormat;
-            ChecksumTracksChecked = ChecksumTracksVisible;
-            OptionsEnabled        = true;
-            ChecksumMediaChecked  = true;
-            ChecksumTracksChecked = true;
-            Adler32Checked        = true;
-            Crc16Checked          = true;
-            Crc32Checked          = true;
-            Md5Checked            = true;
-            Sha1Checked           = true;
-            SpamsumChecked        = true;
-            TrackChecksums        = new ObservableCollection<ChecksumModel>();
-            MediaChecksums        = new ObservableCollection<ChecksumModel>();
-            StartCommand          = ReactiveCommand.Create(ExecuteStartCommand);
-            CloseCommand          = ReactiveCommand.Create(ExecuteCloseCommand);
-            StopCommand           = ReactiveCommand.Create(ExecuteStopCommand);
-            StopCommandVisible    = false;
-            StartCommandVisible   = true;
-            CloseCommandVisible   = true;
-            StopCommandEnabled    = true;
-            StartCommandEnabled   = true;
-            CloseCommandEnabled   = true;
+            ChecksumTracksVisible = (inputFormat as IOpticalMediaImage)?.Tracks?.Count > 0;
+        }
+        catch
+        {
+            ChecksumTracksVisible = false;
+        }
+    }
 
+    public string Title
+    {
+        get => _title;
+        set => this.RaiseAndSetIfChanged(ref _title, value);
+    }
+
+    public bool OptionsEnabled
+    {
+        get => _optionsEnabled;
+        set => this.RaiseAndSetIfChanged(ref _optionsEnabled, value);
+    }
+
+    public bool ChecksumMediaChecked
+    {
+        get => _checksumMediaChecked;
+        set => this.RaiseAndSetIfChanged(ref _checksumMediaChecked, value);
+    }
+
+    public bool ChecksumTracksChecked
+    {
+        get => _checksumTracksChecked;
+        set => this.RaiseAndSetIfChanged(ref _checksumTracksChecked, value);
+    }
+
+    public bool Adler32Checked
+    {
+        get => _adler32Checked;
+        set => this.RaiseAndSetIfChanged(ref _adler32Checked, value);
+    }
+
+    public bool Crc16Checked
+    {
+        get => _crc16Checked;
+        set => this.RaiseAndSetIfChanged(ref _crc16Checked, value);
+    }
+
+    public bool Crc32Checked
+    {
+        get => _crc32Checked;
+        set => this.RaiseAndSetIfChanged(ref _crc32Checked, value);
+    }
+
+    public bool Crc64Checked
+    {
+        get => _crc64Checked;
+        set => this.RaiseAndSetIfChanged(ref _crc64Checked, value);
+    }
+
+    public bool Fletcher16Checked
+    {
+        get => _fletcher16Checked;
+        set => this.RaiseAndSetIfChanged(ref _fletcher16Checked, value);
+    }
+
+    public bool Fletcher32Checked
+    {
+        get => _fletcher32Checked;
+        set => this.RaiseAndSetIfChanged(ref _fletcher32Checked, value);
+    }
+
+    public bool Md5Checked
+    {
+        get => _md5Checked;
+        set => this.RaiseAndSetIfChanged(ref _md5Checked, value);
+    }
+
+    public bool Sha1Checked
+    {
+        get => _sha1Checked;
+        set => this.RaiseAndSetIfChanged(ref _sha1Checked, value);
+    }
+
+    public bool Sha256Checked
+    {
+        get => _sha256Checked;
+        set => this.RaiseAndSetIfChanged(ref _sha256Checked, value);
+    }
+
+    public bool Sha384Checked
+    {
+        get => _sha384Checked;
+        set => this.RaiseAndSetIfChanged(ref _sha384Checked, value);
+    }
+
+    public bool Sha512Checked
+    {
+        get => _sha512Checked;
+        set => this.RaiseAndSetIfChanged(ref _sha512Checked, value);
+    }
+
+    public bool SpamsumChecked
+    {
+        get => _spamsumChecked;
+        set => this.RaiseAndSetIfChanged(ref _spamsumChecked, value);
+    }
+
+    public bool ResultsVisible
+    {
+        get => _resultsVisible;
+        set => this.RaiseAndSetIfChanged(ref _resultsVisible, value);
+    }
+
+    public bool TrackChecksumsVisible
+    {
+        get => _trackChecksumsVisible;
+        set => this.RaiseAndSetIfChanged(ref _trackChecksumsVisible, value);
+    }
+
+    public bool MediaChecksumsVisible
+    {
+        get => _mediaChecksumsVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaChecksumsVisible, value);
+    }
+
+    public bool ProgressVisible
+    {
+        get => _progressVisible;
+        set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
+    }
+
+    public bool Progress1Visible
+    {
+        get => _progress1Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
+    }
+
+    public string ProgressText
+    {
+        get => _progressText;
+        set => this.RaiseAndSetIfChanged(ref _progressText, value);
+    }
+
+    public double ProgressMax
+    {
+        get => _progressMax;
+        set => this.RaiseAndSetIfChanged(ref _progressMax, value);
+    }
+
+    public double ProgressValue
+    {
+        get => _progressValue;
+        set => this.RaiseAndSetIfChanged(ref _progressValue, value);
+    }
+
+    public bool Progress2Visible
+    {
+        get => _progress2Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
+    }
+
+    public string Progress2Text
+    {
+        get => _progress2Text;
+        set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
+    }
+
+    public double Progress2Max
+    {
+        get => _progress2Max;
+        set => this.RaiseAndSetIfChanged(ref _progress2Max, value);
+    }
+
+    public double Progress2Value
+    {
+        get => _progress2Value;
+        set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
+    }
+
+    public bool StartCommandEnabled
+    {
+        get => _startCommandEnabled;
+        set => this.RaiseAndSetIfChanged(ref _startCommandEnabled, value);
+    }
+
+    public bool StartCommandVisible
+    {
+        get => _startCommandVisible;
+        set => this.RaiseAndSetIfChanged(ref _startCommandVisible, value);
+    }
+
+    public bool CloseCommandEnabled
+    {
+        get => _closeCommandEnabled;
+        set => this.RaiseAndSetIfChanged(ref _closeCommandEnabled, value);
+    }
+
+    public bool CloseCommandVisible
+    {
+        get => _closeCommandVisible;
+        set => this.RaiseAndSetIfChanged(ref _closeCommandVisible, value);
+    }
+
+    public bool StopCommandEnabled
+    {
+        get => _stopCommandEnabled;
+        set => this.RaiseAndSetIfChanged(ref _stopCommandEnabled, value);
+    }
+
+    public bool StopCommandVisible
+    {
+        get => _stopCommandVisible;
+        set => this.RaiseAndSetIfChanged(ref _stopCommandVisible, value);
+    }
+
+    public bool ChecksumTracksVisible
+    {
+        get => _checksumTracksVisible;
+        set => this.RaiseAndSetIfChanged(ref _stopCommandVisible, value);
+    }
+
+    public ObservableCollection<ChecksumModel> TrackChecksums { get; }
+    public ObservableCollection<ChecksumModel> MediaChecksums { get; }
+    public ReactiveCommand<Unit, Unit>         StartCommand   { get; }
+    public ReactiveCommand<Unit, Unit>         CloseCommand   { get; }
+    public ReactiveCommand<Unit, Unit>         StopCommand    { get; }
+
+    void ExecuteStartCommand()
+    {
+        OptionsEnabled      = false;
+        CloseCommandVisible = false;
+        StartCommandVisible = false;
+        StopCommandVisible  = true;
+        ProgressVisible     = true;
+        Progress1Visible    = true;
+        Progress2Visible    = false;
+
+        new Thread(DoWork)
+        {
+            Priority = ThreadPriority.BelowNormal
+        }.Start();
+    }
+
+    void ExecuteCloseCommand() => _view.Close();
+
+    internal void ExecuteStopCommand()
+    {
+        _cancel            = true;
+        StopCommandEnabled = false;
+    }
+
+    async void DoWork()
+    {
+        var  opticalMediaImage = _inputFormat as IOpticalMediaImage;
+        bool formatHasTracks   = false;
+
+        if(opticalMediaImage != null)
             try
             {
-                ChecksumTracksVisible = (inputFormat as IOpticalMediaImage)?.Tracks?.Count > 0;
+                formatHasTracks = opticalMediaImage.Tracks?.Count > 0;
             }
             catch
             {
-                ChecksumTracksVisible = false;
+                formatHasTracks = false;
             }
-        }
 
-        public string Title
+        // Setup progress bars
+        await Dispatcher.UIThread.InvokeAsync(() =>
         {
-            get => _title;
-            set => this.RaiseAndSetIfChanged(ref _title, value);
-        }
+            ProgressVisible  = true;
+            Progress1Visible = true;
+            Progress2Visible = true;
+            ProgressMax      = 1;
+            Progress2Max     = (int)(_inputFormat.Info.Sectors / SECTORS_TO_READ);
 
-        public bool OptionsEnabled
-        {
-            get => _optionsEnabled;
-            set => this.RaiseAndSetIfChanged(ref _optionsEnabled, value);
-        }
-
-        public bool ChecksumMediaChecked
-        {
-            get => _checksumMediaChecked;
-            set => this.RaiseAndSetIfChanged(ref _checksumMediaChecked, value);
-        }
-
-        public bool ChecksumTracksChecked
-        {
-            get => _checksumTracksChecked;
-            set => this.RaiseAndSetIfChanged(ref _checksumTracksChecked, value);
-        }
-
-        public bool Adler32Checked
-        {
-            get => _adler32Checked;
-            set => this.RaiseAndSetIfChanged(ref _adler32Checked, value);
-        }
-
-        public bool Crc16Checked
-        {
-            get => _crc16Checked;
-            set => this.RaiseAndSetIfChanged(ref _crc16Checked, value);
-        }
-
-        public bool Crc32Checked
-        {
-            get => _crc32Checked;
-            set => this.RaiseAndSetIfChanged(ref _crc32Checked, value);
-        }
-
-        public bool Crc64Checked
-        {
-            get => _crc64Checked;
-            set => this.RaiseAndSetIfChanged(ref _crc64Checked, value);
-        }
-
-        public bool Fletcher16Checked
-        {
-            get => _fletcher16Checked;
-            set => this.RaiseAndSetIfChanged(ref _fletcher16Checked, value);
-        }
-
-        public bool Fletcher32Checked
-        {
-            get => _fletcher32Checked;
-            set => this.RaiseAndSetIfChanged(ref _fletcher32Checked, value);
-        }
-
-        public bool Md5Checked
-        {
-            get => _md5Checked;
-            set => this.RaiseAndSetIfChanged(ref _md5Checked, value);
-        }
-
-        public bool Sha1Checked
-        {
-            get => _sha1Checked;
-            set => this.RaiseAndSetIfChanged(ref _sha1Checked, value);
-        }
-
-        public bool Sha256Checked
-        {
-            get => _sha256Checked;
-            set => this.RaiseAndSetIfChanged(ref _sha256Checked, value);
-        }
-
-        public bool Sha384Checked
-        {
-            get => _sha384Checked;
-            set => this.RaiseAndSetIfChanged(ref _sha384Checked, value);
-        }
-
-        public bool Sha512Checked
-        {
-            get => _sha512Checked;
-            set => this.RaiseAndSetIfChanged(ref _sha512Checked, value);
-        }
-
-        public bool SpamsumChecked
-        {
-            get => _spamsumChecked;
-            set => this.RaiseAndSetIfChanged(ref _spamsumChecked, value);
-        }
-
-        public bool ResultsVisible
-        {
-            get => _resultsVisible;
-            set => this.RaiseAndSetIfChanged(ref _resultsVisible, value);
-        }
-
-        public bool TrackChecksumsVisible
-        {
-            get => _trackChecksumsVisible;
-            set => this.RaiseAndSetIfChanged(ref _trackChecksumsVisible, value);
-        }
-
-        public bool MediaChecksumsVisible
-        {
-            get => _mediaChecksumsVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaChecksumsVisible, value);
-        }
-
-        public bool ProgressVisible
-        {
-            get => _progressVisible;
-            set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
-        }
-
-        public bool Progress1Visible
-        {
-            get => _progress1Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
-        }
-
-        public string ProgressText
-        {
-            get => _progressText;
-            set => this.RaiseAndSetIfChanged(ref _progressText, value);
-        }
-
-        public double ProgressMax
-        {
-            get => _progressMax;
-            set => this.RaiseAndSetIfChanged(ref _progressMax, value);
-        }
-
-        public double ProgressValue
-        {
-            get => _progressValue;
-            set => this.RaiseAndSetIfChanged(ref _progressValue, value);
-        }
-
-        public bool Progress2Visible
-        {
-            get => _progress2Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
-        }
-
-        public string Progress2Text
-        {
-            get => _progress2Text;
-            set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
-        }
-
-        public double Progress2Max
-        {
-            get => _progress2Max;
-            set => this.RaiseAndSetIfChanged(ref _progress2Max, value);
-        }
-
-        public double Progress2Value
-        {
-            get => _progress2Value;
-            set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
-        }
-
-        public bool StartCommandEnabled
-        {
-            get => _startCommandEnabled;
-            set => this.RaiseAndSetIfChanged(ref _startCommandEnabled, value);
-        }
-
-        public bool StartCommandVisible
-        {
-            get => _startCommandVisible;
-            set => this.RaiseAndSetIfChanged(ref _startCommandVisible, value);
-        }
-
-        public bool CloseCommandEnabled
-        {
-            get => _closeCommandEnabled;
-            set => this.RaiseAndSetIfChanged(ref _closeCommandEnabled, value);
-        }
-
-        public bool CloseCommandVisible
-        {
-            get => _closeCommandVisible;
-            set => this.RaiseAndSetIfChanged(ref _closeCommandVisible, value);
-        }
-
-        public bool StopCommandEnabled
-        {
-            get => _stopCommandEnabled;
-            set => this.RaiseAndSetIfChanged(ref _stopCommandEnabled, value);
-        }
-
-        public bool StopCommandVisible
-        {
-            get => _stopCommandVisible;
-            set => this.RaiseAndSetIfChanged(ref _stopCommandVisible, value);
-        }
-
-        public bool ChecksumTracksVisible
-        {
-            get => _checksumTracksVisible;
-            set => this.RaiseAndSetIfChanged(ref _stopCommandVisible, value);
-        }
-
-        public ObservableCollection<ChecksumModel> TrackChecksums { get; }
-        public ObservableCollection<ChecksumModel> MediaChecksums { get; }
-        public ReactiveCommand<Unit, Unit>         StartCommand   { get; }
-        public ReactiveCommand<Unit, Unit>         CloseCommand   { get; }
-        public ReactiveCommand<Unit, Unit>         StopCommand    { get; }
-
-        void ExecuteStartCommand()
-        {
-            OptionsEnabled      = false;
-            CloseCommandVisible = false;
-            StartCommandVisible = false;
-            StopCommandVisible  = true;
-            ProgressVisible     = true;
-            Progress1Visible    = true;
-            Progress2Visible    = false;
-
-            new Thread(DoWork)
+            if(formatHasTracks       &&
+               ChecksumTracksChecked &&
+               opticalMediaImage != null)
+                ProgressMax += opticalMediaImage.Tracks.Count;
+            else
             {
-                Priority = ThreadPriority.BelowNormal
-            }.Start();
-        }
+                ProgressMax      = 2;
+                Progress2Visible = false;
+            }
+        });
 
-        void ExecuteCloseCommand() => _view.Close();
+        var enabledChecksums = new EnableChecksum();
 
-        internal void ExecuteStopCommand()
-        {
-            _cancel            = true;
-            StopCommandEnabled = false;
-        }
+        if(Adler32Checked)
+            enabledChecksums |= EnableChecksum.Adler32;
 
-        async void DoWork()
-        {
-            var  opticalMediaImage = _inputFormat as IOpticalMediaImage;
-            bool formatHasTracks   = false;
+        if(Crc16Checked)
+            enabledChecksums |= EnableChecksum.Crc16;
 
-            if(opticalMediaImage != null)
-                try
-                {
-                    formatHasTracks = opticalMediaImage.Tracks?.Count > 0;
-                }
-                catch
-                {
-                    formatHasTracks = false;
-                }
+        if(Crc32Checked)
+            enabledChecksums |= EnableChecksum.Crc32;
 
-            // Setup progress bars
-            await Dispatcher.UIThread.InvokeAsync(() =>
+        if(Crc64Checked)
+            enabledChecksums |= EnableChecksum.Crc64;
+
+        if(Md5Checked)
+            enabledChecksums |= EnableChecksum.Md5;
+
+        if(Sha1Checked)
+            enabledChecksums |= EnableChecksum.Sha1;
+
+        if(Sha256Checked)
+            enabledChecksums |= EnableChecksum.Sha256;
+
+        if(Sha384Checked)
+            enabledChecksums |= EnableChecksum.Sha384;
+
+        if(Sha512Checked)
+            enabledChecksums |= EnableChecksum.Sha512;
+
+        if(SpamsumChecked)
+            enabledChecksums |= EnableChecksum.SpamSum;
+
+        if(Fletcher16Checked)
+            enabledChecksums |= EnableChecksum.Fletcher16;
+
+        if(Fletcher32Checked)
+            enabledChecksums |= EnableChecksum.Fletcher32;
+
+        Checksum    mediaChecksum = null;
+        ErrorNumber errno;
+
+        if(opticalMediaImage?.Tracks != null)
+            try
             {
-                ProgressVisible  = true;
-                Progress1Visible = true;
-                Progress2Visible = true;
-                ProgressMax      = 1;
-                Progress2Max     = (int)(_inputFormat.Info.Sectors / SECTORS_TO_READ);
+                Checksum trackChecksum = null;
 
-                if(formatHasTracks       &&
-                   ChecksumTracksChecked &&
-                   opticalMediaImage != null)
-                    ProgressMax += opticalMediaImage.Tracks.Count;
-                else
+                if(ChecksumMediaChecked)
+                    mediaChecksum = new Checksum(enabledChecksums);
+
+                ulong previousTrackEnd = 0;
+
+                foreach(Track currentTrack in opticalMediaImage.Tracks)
                 {
-                    ProgressMax      = 2;
-                    Progress2Visible = false;
-                }
-            });
-
-            var enabledChecksums = new EnableChecksum();
-
-            if(Adler32Checked)
-                enabledChecksums |= EnableChecksum.Adler32;
-
-            if(Crc16Checked)
-                enabledChecksums |= EnableChecksum.Crc16;
-
-            if(Crc32Checked)
-                enabledChecksums |= EnableChecksum.Crc32;
-
-            if(Crc64Checked)
-                enabledChecksums |= EnableChecksum.Crc64;
-
-            if(Md5Checked)
-                enabledChecksums |= EnableChecksum.Md5;
-
-            if(Sha1Checked)
-                enabledChecksums |= EnableChecksum.Sha1;
-
-            if(Sha256Checked)
-                enabledChecksums |= EnableChecksum.Sha256;
-
-            if(Sha384Checked)
-                enabledChecksums |= EnableChecksum.Sha384;
-
-            if(Sha512Checked)
-                enabledChecksums |= EnableChecksum.Sha512;
-
-            if(SpamsumChecked)
-                enabledChecksums |= EnableChecksum.SpamSum;
-
-            if(Fletcher16Checked)
-                enabledChecksums |= EnableChecksum.Fletcher16;
-
-            if(Fletcher32Checked)
-                enabledChecksums |= EnableChecksum.Fletcher32;
-
-            Checksum    mediaChecksum = null;
-            ErrorNumber errno;
-
-            if(opticalMediaImage?.Tracks != null)
-                try
-                {
-                    Checksum trackChecksum = null;
-
-                    if(ChecksumMediaChecked)
-                        mediaChecksum = new Checksum(enabledChecksums);
-
-                    ulong previousTrackEnd = 0;
-
-                    foreach(Track currentTrack in opticalMediaImage.Tracks)
+                    await Dispatcher.UIThread.InvokeAsync(() =>
                     {
-                        await Dispatcher.UIThread.InvokeAsync(() =>
-                        {
-                            ProgressText = $"Hashing track {currentTrack.Sequence} of {opticalMediaImage.Tracks.Count}";
+                        ProgressText = $"Hashing track {currentTrack.Sequence} of {opticalMediaImage.Tracks.Count}";
 
-                            ProgressValue++;
-                        });
+                        ProgressValue++;
+                    });
 
-                        if(currentTrack.StartSector - previousTrackEnd != 0 && ChecksumMediaChecked)
-                            for(ulong i = previousTrackEnd + 1; i < currentTrack.StartSector; i++)
-                            {
-                                ulong sector = i;
-
-                                await Dispatcher.UIThread.InvokeAsync(() =>
-                                {
-                                    Progress2Value = (int)(sector / SECTORS_TO_READ);
-                                    Progress2Text  = $"Hashing track-less sector {sector}";
-                                });
-
-                                errno = opticalMediaImage.ReadSector(i, out byte[] hiddenSector);
-
-                                if(errno != ErrorNumber.NoError)
-                                {
-                                    AaruConsole.ErrorWriteLine($"Error {errno} reading sector {i}");
-                                    _cancel = true;
-
-                                    break;
-                                }
-
-                                mediaChecksum?.Update(hiddenSector);
-                            }
-
-                        AaruConsole.DebugWriteLine("Checksum command",
-                                                   "Track {0} starts at sector {1} and ends at sector {2}",
-                                                   currentTrack.Sequence, currentTrack.StartSector,
-                                                   currentTrack.EndSector);
-
-                        if(ChecksumTracksChecked)
-                            trackChecksum = new Checksum(enabledChecksums);
-
-                        ulong sectors     = currentTrack.EndSector - currentTrack.StartSector + 1;
-                        ulong doneSectors = 0;
-
-                        while(doneSectors < sectors)
-                        {
-                            if(_cancel)
-                            {
-                                await Dispatcher.UIThread.InvokeAsync(() =>
-                                {
-                                    CloseCommandVisible = true;
-                                    StartCommandVisible = false;
-                                    StopCommandVisible  = false;
-                                });
-
-                                return;
-                            }
-
-                            byte[] sector;
-
-                            if(sectors - doneSectors >= SECTORS_TO_READ)
-                            {
-                                errno = opticalMediaImage.ReadSectors(doneSectors, SECTORS_TO_READ,
-                                                                      currentTrack.Sequence, out sector);
-
-                                if(errno != ErrorNumber.NoError)
-                                {
-                                    AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
-                                    _cancel = true;
-
-                                    continue;
-                                }
-
-                                ulong doneSectorsToInvoke = doneSectors;
-
-                                await Dispatcher.UIThread.InvokeAsync(() =>
-                                {
-                                    Progress2Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
-
-                                    Progress2Text =
-                                        $"Hashing sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + SECTORS_TO_READ} of track {currentTrack.Sequence}";
-                                });
-
-                                doneSectors += SECTORS_TO_READ;
-                            }
-                            else
-                            {
-                                errno = opticalMediaImage.ReadSectors(doneSectors, (uint)(sectors - doneSectors),
-                                                                      currentTrack.Sequence, out sector);
-
-                                if(errno != ErrorNumber.NoError)
-                                {
-                                    AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
-                                    _cancel = true;
-
-                                    continue;
-                                }
-
-                                ulong doneSectorsToInvoke = doneSectors;
-
-                                await Dispatcher.UIThread.InvokeAsync(() =>
-                                {
-                                    Progress2Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
-
-                                    Progress2Text =
-                                        $"Hashing sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + (sectors - doneSectorsToInvoke)} of track {currentTrack.Sequence}";
-                                });
-
-                                doneSectors += sectors - doneSectors;
-                            }
-
-                            if(ChecksumMediaChecked)
-                                mediaChecksum?.Update(sector);
-
-                            if(ChecksumTracksChecked)
-                                trackChecksum?.Update(sector);
-                        }
-
-                        await Dispatcher.UIThread.InvokeAsync(() =>
-                        {
-                            if(ChecksumTracksChecked != true)
-                                return;
-
-                            if(trackChecksum == null)
-                                return;
-
-                            foreach(ChecksumType chk in trackChecksum.End())
-                                TrackChecksums.Add(new ChecksumModel
-                                {
-                                    Track     = currentTrack.Sequence.ToString(),
-                                    Algorithm = chk.type.ToString(),
-                                    Hash      = chk.Value
-                                });
-                        });
-
-                        previousTrackEnd = currentTrack.EndSector;
-                    }
-
-                    if(opticalMediaImage.Info.Sectors - previousTrackEnd != 0 && ChecksumMediaChecked)
-                        for(ulong i = previousTrackEnd + 1; i < opticalMediaImage.Info.Sectors; i++)
+                    if(currentTrack.StartSector - previousTrackEnd != 0 && ChecksumMediaChecked)
+                        for(ulong i = previousTrackEnd + 1; i < currentTrack.StartSector; i++)
                         {
                             ulong sector = i;
 
@@ -615,106 +486,140 @@ namespace Aaru.Gui.ViewModels.Windows
                             mediaChecksum?.Update(hiddenSector);
                         }
 
+                    AaruConsole.DebugWriteLine("Checksum command",
+                                               "Track {0} starts at sector {1} and ends at sector {2}",
+                                               currentTrack.Sequence, currentTrack.StartSector,
+                                               currentTrack.EndSector);
+
+                    if(ChecksumTracksChecked)
+                        trackChecksum = new Checksum(enabledChecksums);
+
+                    ulong sectors     = currentTrack.EndSector - currentTrack.StartSector + 1;
+                    ulong doneSectors = 0;
+
+                    while(doneSectors < sectors)
+                    {
+                        if(_cancel)
+                        {
+                            await Dispatcher.UIThread.InvokeAsync(() =>
+                            {
+                                CloseCommandVisible = true;
+                                StartCommandVisible = false;
+                                StopCommandVisible  = false;
+                            });
+
+                            return;
+                        }
+
+                        byte[] sector;
+
+                        if(sectors - doneSectors >= SECTORS_TO_READ)
+                        {
+                            errno = opticalMediaImage.ReadSectors(doneSectors, SECTORS_TO_READ,
+                                                                  currentTrack.Sequence, out sector);
+
+                            if(errno != ErrorNumber.NoError)
+                            {
+                                AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
+                                _cancel = true;
+
+                                continue;
+                            }
+
+                            ulong doneSectorsToInvoke = doneSectors;
+
+                            await Dispatcher.UIThread.InvokeAsync(() =>
+                            {
+                                Progress2Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
+
+                                Progress2Text =
+                                    $"Hashing sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + SECTORS_TO_READ} of track {currentTrack.Sequence}";
+                            });
+
+                            doneSectors += SECTORS_TO_READ;
+                        }
+                        else
+                        {
+                            errno = opticalMediaImage.ReadSectors(doneSectors, (uint)(sectors - doneSectors),
+                                                                  currentTrack.Sequence, out sector);
+
+                            if(errno != ErrorNumber.NoError)
+                            {
+                                AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
+                                _cancel = true;
+
+                                continue;
+                            }
+
+                            ulong doneSectorsToInvoke = doneSectors;
+
+                            await Dispatcher.UIThread.InvokeAsync(() =>
+                            {
+                                Progress2Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
+
+                                Progress2Text =
+                                    $"Hashing sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + (sectors - doneSectorsToInvoke)} of track {currentTrack.Sequence}";
+                            });
+
+                            doneSectors += sectors - doneSectors;
+                        }
+
+                        if(ChecksumMediaChecked)
+                            mediaChecksum?.Update(sector);
+
+                        if(ChecksumTracksChecked)
+                            trackChecksum?.Update(sector);
+                    }
+
                     await Dispatcher.UIThread.InvokeAsync(() =>
                     {
-                        if(mediaChecksum == null)
+                        if(ChecksumTracksChecked != true)
                             return;
 
-                        foreach(ChecksumType chk in mediaChecksum.End())
-                            MediaChecksums.Add(new ChecksumModel
+                        if(trackChecksum == null)
+                            return;
+
+                        foreach(ChecksumType chk in trackChecksum.End())
+                            TrackChecksums.Add(new ChecksumModel
                             {
+                                Track     = currentTrack.Sequence.ToString(),
                                 Algorithm = chk.type.ToString(),
                                 Hash      = chk.Value
                             });
                     });
+
+                    previousTrackEnd = currentTrack.EndSector;
                 }
-                catch(Exception ex)
-                {
-                    AaruConsole.DebugWriteLine("Could not get tracks because {0}", ex.Message);
-                    AaruConsole.WriteLine("Unable to get separate tracks, not checksumming them");
-                }
-            else
-            {
-                await Dispatcher.UIThread.InvokeAsync(() =>
-                {
-                    Progress1Visible = false;
-                });
 
-                mediaChecksum = new Checksum(enabledChecksums);
-
-                ulong doneSectors = 0;
-
-                while(doneSectors < _inputFormat.Info.Sectors)
-                {
-                    if(_cancel)
+                if(opticalMediaImage.Info.Sectors - previousTrackEnd != 0 && ChecksumMediaChecked)
+                    for(ulong i = previousTrackEnd + 1; i < opticalMediaImage.Info.Sectors; i++)
                     {
+                        ulong sector = i;
+
                         await Dispatcher.UIThread.InvokeAsync(() =>
                         {
-                            CloseCommandVisible = true;
-                            StartCommandVisible = false;
-                            StopCommandVisible  = false;
+                            Progress2Value = (int)(sector / SECTORS_TO_READ);
+                            Progress2Text  = $"Hashing track-less sector {sector}";
                         });
 
+                        errno = opticalMediaImage.ReadSector(i, out byte[] hiddenSector);
+
+                        if(errno != ErrorNumber.NoError)
+                        {
+                            AaruConsole.ErrorWriteLine($"Error {errno} reading sector {i}");
+                            _cancel = true;
+
+                            break;
+                        }
+
+                        mediaChecksum?.Update(hiddenSector);
+                    }
+
+                await Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    if(mediaChecksum == null)
                         return;
-                    }
 
-                    byte[] sector;
-
-                    if(_inputFormat.Info.Sectors - doneSectors >= SECTORS_TO_READ)
-                    {
-                        errno = _inputFormat.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
-
-                        if(errno != ErrorNumber.NoError)
-                        {
-                            AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
-                            _cancel = true;
-
-                            continue;
-                        }
-
-                        ulong doneSectorsToInvoke = doneSectors;
-
-                        await Dispatcher.UIThread.InvokeAsync(() =>
-                        {
-                            Progress2Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
-
-                            Progress2Text =
-                                $"Hashing sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + SECTORS_TO_READ}";
-                        });
-
-                        doneSectors += SECTORS_TO_READ;
-                    }
-                    else
-                    {
-                        errno = _inputFormat.ReadSectors(doneSectors, (uint)(_inputFormat.Info.Sectors - doneSectors),
-                                                         out sector);
-
-                        if(errno != ErrorNumber.NoError)
-                        {
-                            AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
-                            _cancel = true;
-
-                            continue;
-                        }
-
-                        ulong doneSectorsToInvoke = doneSectors;
-
-                        await Dispatcher.UIThread.InvokeAsync(() =>
-                        {
-                            Progress2Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
-
-                            Progress2Text =
-                                $"Hashing sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + (_inputFormat.Info.Sectors - doneSectorsToInvoke)}";
-                        });
-
-                        doneSectors += _inputFormat.Info.Sectors - doneSectors;
-                    }
-
-                    mediaChecksum.Update(sector);
-                }
-
-                await Dispatcher.UIThread.InvokeAsync(() =>
-                {
                     foreach(ChecksumType chk in mediaChecksum.End())
                         MediaChecksums.Add(new ChecksumModel
                         {
@@ -723,30 +628,124 @@ namespace Aaru.Gui.ViewModels.Windows
                         });
                 });
             }
+            catch(Exception ex)
+            {
+                AaruConsole.DebugWriteLine("Could not get tracks because {0}", ex.Message);
+                AaruConsole.WriteLine("Unable to get separate tracks, not checksumming them");
+            }
+        else
+        {
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                Progress1Visible = false;
+            });
 
-            if(ChecksumTracksChecked)
-                await Dispatcher.UIThread.InvokeAsync(() =>
+            mediaChecksum = new Checksum(enabledChecksums);
+
+            ulong doneSectors = 0;
+
+            while(doneSectors < _inputFormat.Info.Sectors)
+            {
+                if(_cancel)
                 {
-                    TrackChecksumsVisible = true;
-                });
+                    await Dispatcher.UIThread.InvokeAsync(() =>
+                    {
+                        CloseCommandVisible = true;
+                        StartCommandVisible = false;
+                        StopCommandVisible  = false;
+                    });
 
-            if(ChecksumMediaChecked)
-                await Dispatcher.UIThread.InvokeAsync(() =>
+                    return;
+                }
+
+                byte[] sector;
+
+                if(_inputFormat.Info.Sectors - doneSectors >= SECTORS_TO_READ)
                 {
-                    MediaChecksumsVisible = true;
-                });
+                    errno = _inputFormat.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
 
-            Statistics.AddCommand("checksum");
+                    if(errno != ErrorNumber.NoError)
+                    {
+                        AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
+                        _cancel = true;
+
+                        continue;
+                    }
+
+                    ulong doneSectorsToInvoke = doneSectors;
+
+                    await Dispatcher.UIThread.InvokeAsync(() =>
+                    {
+                        Progress2Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
+
+                        Progress2Text =
+                            $"Hashing sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + SECTORS_TO_READ}";
+                    });
+
+                    doneSectors += SECTORS_TO_READ;
+                }
+                else
+                {
+                    errno = _inputFormat.ReadSectors(doneSectors, (uint)(_inputFormat.Info.Sectors - doneSectors),
+                                                     out sector);
+
+                    if(errno != ErrorNumber.NoError)
+                    {
+                        AaruConsole.ErrorWriteLine($"Error {errno} reading sector {doneSectors}");
+                        _cancel = true;
+
+                        continue;
+                    }
+
+                    ulong doneSectorsToInvoke = doneSectors;
+
+                    await Dispatcher.UIThread.InvokeAsync(() =>
+                    {
+                        Progress2Value = (int)(doneSectorsToInvoke / SECTORS_TO_READ);
+
+                        Progress2Text =
+                            $"Hashing sectors {doneSectorsToInvoke} to {doneSectorsToInvoke + (_inputFormat.Info.Sectors - doneSectorsToInvoke)}";
+                    });
+
+                    doneSectors += _inputFormat.Info.Sectors - doneSectors;
+                }
+
+                mediaChecksum.Update(sector);
+            }
 
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
-                OptionsEnabled      = false;
-                ResultsVisible      = true;
-                ProgressVisible     = false;
-                StartCommandVisible = false;
-                StopCommandVisible  = false;
-                CloseCommandVisible = true;
+                foreach(ChecksumType chk in mediaChecksum.End())
+                    MediaChecksums.Add(new ChecksumModel
+                    {
+                        Algorithm = chk.type.ToString(),
+                        Hash      = chk.Value
+                    });
             });
         }
+
+        if(ChecksumTracksChecked)
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                TrackChecksumsVisible = true;
+            });
+
+        if(ChecksumMediaChecked)
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                MediaChecksumsVisible = true;
+            });
+
+        Statistics.AddCommand("checksum");
+
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            OptionsEnabled      = false;
+            ResultsVisible      = true;
+            ProgressVisible     = false;
+            StartCommandVisible = false;
+            StopCommandVisible  = false;
+            CloseCommandVisible = true;
+        });
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
index ca491666d..9917f92f8 100644
--- a/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ImageConvertViewModel.cs
@@ -59,881 +59,1080 @@ using Schemas;
 using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class ImageConvertViewModel : ViewModelBase
 {
-    public sealed class ImageConvertViewModel : ViewModelBase
+    readonly IMediaImage   _inputFormat;
+    readonly Window        _view;
+    bool                   _cancel;
+    CICMMetadataType       _cicmMetadata;
+    bool                   _cicmXmlFromImageVisible;
+    string                 _cicmXmlText;
+    bool                   _closeVisible;
+    string                 _commentsText;
+    bool                   _commentsVisible;
+    string                 _creatorText;
+    bool                   _creatorVisible;
+    bool                   _destinationEnabled;
+    string                 _destinationText;
+    bool                   _destinationVisible;
+    string                 _driveFirmwareRevisionText;
+    bool                   _driveFirmwareRevisionVisible;
+    string                 _driveManufacturerText;
+    bool                   _driveManufacturerVisible;
+    string                 _driveModelText;
+    bool                   _driveModelVisible;
+    string                 _driveSerialNumberText;
+    bool                   _driveSerialNumberVisible;
+    List<DumpHardwareType> _dumpHardware;
+    bool                   _forceChecked;
+    bool                   _formatReadOnly;
+    double                 _lastMediaSequenceValue;
+    bool                   _lastMediaSequenceVisible;
+    string                 _mediaBarcodeText;
+    bool                   _mediaBarcodeVisible;
+    string                 _mediaManufacturerText;
+    bool                   _mediaManufacturerVisible;
+    string                 _mediaModelText;
+    bool                   _mediaModelVisible;
+    string                 _mediaPartNumberText;
+    bool                   _mediaPartNumberVisible;
+    double                 _mediaSequenceValue;
+    bool                   _mediaSequenceVisible;
+    string                 _mediaSerialNumberText;
+    bool                   _mediaSerialNumberVisible;
+    string                 _mediaTitleText;
+    bool                   _mediaTitleVisible;
+    bool                   _optionsVisible;
+    bool                   _progress1Visible;
+    bool                   _progress2Indeterminate;
+    double                 _progress2MaxValue;
+    string                 _progress2Text;
+    double                 _progress2Value;
+    bool                   _progress2Visible;
+    bool                   _progressIndeterminate;
+    double                 _progressMaxValue;
+    string                 _progressText;
+    double                 _progressValue;
+    bool                   _progressVisible;
+    bool                   _resumeFileFromImageVisible;
+    string                 _resumeFileText;
+    double                 _sectorsValue;
+    ImagePluginModel       _selectedPlugin;
+    string                 _sourceText;
+    bool                   _startVisible;
+    bool                   _stopEnabled;
+    bool                   _stopVisible;
+    string                 _title;
+
+    public ImageConvertViewModel([NotNull] IMediaImage inputFormat, string imageSource, Window view)
     {
-        readonly IMediaImage   _inputFormat;
-        readonly Window        _view;
-        bool                   _cancel;
-        CICMMetadataType       _cicmMetadata;
-        bool                   _cicmXmlFromImageVisible;
-        string                 _cicmXmlText;
-        bool                   _closeVisible;
-        string                 _commentsText;
-        bool                   _commentsVisible;
-        string                 _creatorText;
-        bool                   _creatorVisible;
-        bool                   _destinationEnabled;
-        string                 _destinationText;
-        bool                   _destinationVisible;
-        string                 _driveFirmwareRevisionText;
-        bool                   _driveFirmwareRevisionVisible;
-        string                 _driveManufacturerText;
-        bool                   _driveManufacturerVisible;
-        string                 _driveModelText;
-        bool                   _driveModelVisible;
-        string                 _driveSerialNumberText;
-        bool                   _driveSerialNumberVisible;
-        List<DumpHardwareType> _dumpHardware;
-        bool                   _forceChecked;
-        bool                   _formatReadOnly;
-        double                 _lastMediaSequenceValue;
-        bool                   _lastMediaSequenceVisible;
-        string                 _mediaBarcodeText;
-        bool                   _mediaBarcodeVisible;
-        string                 _mediaManufacturerText;
-        bool                   _mediaManufacturerVisible;
-        string                 _mediaModelText;
-        bool                   _mediaModelVisible;
-        string                 _mediaPartNumberText;
-        bool                   _mediaPartNumberVisible;
-        double                 _mediaSequenceValue;
-        bool                   _mediaSequenceVisible;
-        string                 _mediaSerialNumberText;
-        bool                   _mediaSerialNumberVisible;
-        string                 _mediaTitleText;
-        bool                   _mediaTitleVisible;
-        bool                   _optionsVisible;
-        bool                   _progress1Visible;
-        bool                   _progress2Indeterminate;
-        double                 _progress2MaxValue;
-        string                 _progress2Text;
-        double                 _progress2Value;
-        bool                   _progress2Visible;
-        bool                   _progressIndeterminate;
-        double                 _progressMaxValue;
-        string                 _progressText;
-        double                 _progressValue;
-        bool                   _progressVisible;
-        bool                   _resumeFileFromImageVisible;
-        string                 _resumeFileText;
-        double                 _sectorsValue;
-        ImagePluginModel       _selectedPlugin;
-        string                 _sourceText;
-        bool                   _startVisible;
-        bool                   _stopEnabled;
-        bool                   _stopVisible;
-        string                 _title;
+        _view                        = view;
+        _inputFormat                 = inputFormat;
+        _cancel                      = false;
+        DestinationCommand           = ReactiveCommand.Create(ExecuteDestinationCommand);
+        CreatorCommand               = ReactiveCommand.Create(ExecuteCreatorCommand);
+        MediaTitleCommand            = ReactiveCommand.Create(ExecuteMediaTitleCommand);
+        MediaManufacturerCommand     = ReactiveCommand.Create(ExecuteMediaManufacturerCommand);
+        MediaModelCommand            = ReactiveCommand.Create(ExecuteMediaModelCommand);
+        MediaSerialNumberCommand     = ReactiveCommand.Create(ExecuteMediaSerialNumberCommand);
+        MediaBarcodeCommand          = ReactiveCommand.Create(ExecuteMediaBarcodeCommand);
+        MediaPartNumberCommand       = ReactiveCommand.Create(ExecuteMediaPartNumberCommand);
+        MediaSequenceCommand         = ReactiveCommand.Create(ExecuteMediaSequenceCommand);
+        LastMediaSequenceCommand     = ReactiveCommand.Create(ExecuteLastMediaSequenceCommand);
+        DriveManufacturerCommand     = ReactiveCommand.Create(ExecuteDriveManufacturerCommand);
+        DriveModelCommand            = ReactiveCommand.Create(ExecuteDriveModelCommand);
+        DriveSerialNumberCommand     = ReactiveCommand.Create(ExecuteDriveSerialNumberCommand);
+        DriveFirmwareRevisionCommand = ReactiveCommand.Create(ExecuteDriveFirmwareRevisionCommand);
+        CommentsCommand              = ReactiveCommand.Create(ExecuteCommentsCommand);
+        CicmXmlFromImageCommand      = ReactiveCommand.Create(ExecuteCicmXmlFromImageCommand);
+        CicmXmlCommand               = ReactiveCommand.Create(ExecuteCicmXmlCommand);
+        ResumeFileFromImageCommand   = ReactiveCommand.Create(ExecuteResumeFileFromImageCommand);
+        ResumeFileCommand            = ReactiveCommand.Create(ExecuteResumeFileCommand);
+        StartCommand                 = ReactiveCommand.Create(ExecuteStartCommand);
+        CloseCommand                 = ReactiveCommand.Create(ExecuteCloseCommand);
+        StopCommand                  = ReactiveCommand.Create(ExecuteStopCommand);
+        SourceText                   = imageSource;
+        CreatorVisible               = !string.IsNullOrWhiteSpace(inputFormat.Info.Creator);
+        MediaTitleVisible            = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaTitle);
+        CommentsVisible              = !string.IsNullOrWhiteSpace(inputFormat.Info.Comments);
+        MediaManufacturerVisible     = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaManufacturer);
+        MediaModelVisible            = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaModel);
+        MediaSerialNumberVisible     = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaSerialNumber);
+        MediaBarcodeVisible          = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaBarcode);
+        MediaPartNumberVisible       = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaPartNumber);
+        MediaSequenceVisible         = inputFormat.Info.MediaSequence != 0 && inputFormat.Info.LastMediaSequence != 0;
+        LastMediaSequenceVisible     = inputFormat.Info.MediaSequence != 0 && inputFormat.Info.LastMediaSequence != 0;
+        DriveManufacturerVisible     = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveManufacturer);
+        DriveModelVisible            = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveModel);
+        DriveSerialNumberVisible     = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveSerialNumber);
+        DriveFirmwareRevisionVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveFirmwareRevision);
 
-        public ImageConvertViewModel([NotNull] IMediaImage inputFormat, string imageSource, Window view)
-        {
-            _view = view;
-            _inputFormat = inputFormat;
-            _cancel = false;
-            DestinationCommand = ReactiveCommand.Create(ExecuteDestinationCommand);
-            CreatorCommand = ReactiveCommand.Create(ExecuteCreatorCommand);
-            MediaTitleCommand = ReactiveCommand.Create(ExecuteMediaTitleCommand);
-            MediaManufacturerCommand = ReactiveCommand.Create(ExecuteMediaManufacturerCommand);
-            MediaModelCommand = ReactiveCommand.Create(ExecuteMediaModelCommand);
-            MediaSerialNumberCommand = ReactiveCommand.Create(ExecuteMediaSerialNumberCommand);
-            MediaBarcodeCommand = ReactiveCommand.Create(ExecuteMediaBarcodeCommand);
-            MediaPartNumberCommand = ReactiveCommand.Create(ExecuteMediaPartNumberCommand);
-            MediaSequenceCommand = ReactiveCommand.Create(ExecuteMediaSequenceCommand);
-            LastMediaSequenceCommand = ReactiveCommand.Create(ExecuteLastMediaSequenceCommand);
-            DriveManufacturerCommand = ReactiveCommand.Create(ExecuteDriveManufacturerCommand);
-            DriveModelCommand = ReactiveCommand.Create(ExecuteDriveModelCommand);
-            DriveSerialNumberCommand = ReactiveCommand.Create(ExecuteDriveSerialNumberCommand);
-            DriveFirmwareRevisionCommand = ReactiveCommand.Create(ExecuteDriveFirmwareRevisionCommand);
-            CommentsCommand = ReactiveCommand.Create(ExecuteCommentsCommand);
-            CicmXmlFromImageCommand = ReactiveCommand.Create(ExecuteCicmXmlFromImageCommand);
-            CicmXmlCommand = ReactiveCommand.Create(ExecuteCicmXmlCommand);
-            ResumeFileFromImageCommand = ReactiveCommand.Create(ExecuteResumeFileFromImageCommand);
-            ResumeFileCommand = ReactiveCommand.Create(ExecuteResumeFileCommand);
-            StartCommand = ReactiveCommand.Create(ExecuteStartCommand);
-            CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);
-            StopCommand = ReactiveCommand.Create(ExecuteStopCommand);
-            SourceText = imageSource;
-            CreatorVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.Creator);
-            MediaTitleVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaTitle);
-            CommentsVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.Comments);
-            MediaManufacturerVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaManufacturer);
-            MediaModelVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaModel);
-            MediaSerialNumberVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaSerialNumber);
-            MediaBarcodeVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaBarcode);
-            MediaPartNumberVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.MediaPartNumber);
-            MediaSequenceVisible = inputFormat.Info.MediaSequence != 0 && inputFormat.Info.LastMediaSequence != 0;
-            LastMediaSequenceVisible = inputFormat.Info.MediaSequence != 0 && inputFormat.Info.LastMediaSequence != 0;
-            DriveManufacturerVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveManufacturer);
-            DriveModelVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveModel);
-            DriveSerialNumberVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveSerialNumber);
-            DriveFirmwareRevisionVisible = !string.IsNullOrWhiteSpace(inputFormat.Info.DriveFirmwareRevision);
+        PluginBase plugins = GetPluginBase.Instance;
 
-            PluginBase plugins = GetPluginBase.Instance;
-
-            foreach(IWritableImage plugin in
+        foreach(IWritableImage plugin in
                 plugins.WritableImages.Values.Where(p => p.SupportedMediaTypes.Contains(inputFormat.Info.MediaType)))
-                PluginsList.Add(new ImagePluginModel
-                {
-                    Plugin = plugin
-                });
-
-            CicmXmlFromImageVisible    = inputFormat.CicmMetadata        != null;
-            ResumeFileFromImageVisible = inputFormat.DumpHardware?.Any() == true;
-            _cicmMetadata              = inputFormat.CicmMetadata;
-
-            _dumpHardware = inputFormat.DumpHardware?.Any() == true ? inputFormat.DumpHardware : null;
-
-            CicmXmlText    = _cicmMetadata == null ? "" : "<From image>";
-            ResumeFileText = _dumpHardware == null ? "" : "<From image>";
-        }
-
-        public string Title
-        {
-            get => _title;
-            set => this.RaiseAndSetIfChanged(ref _title, value);
-        }
-
-        public string SourceText
-        {
-            get => _sourceText;
-            set => this.RaiseAndSetIfChanged(ref _sourceText, value);
-        }
-
-        public ObservableCollection<ImagePluginModel> PluginsList { get; }
-
-        public ImagePluginModel SelectedPlugin
-        {
-            get => _selectedPlugin;
-            set => this.RaiseAndSetIfChanged(ref _selectedPlugin, value);
-        }
-
-        public string DestinationText
-        {
-            get => _destinationText;
-            set => this.RaiseAndSetIfChanged(ref _destinationText, value);
-        }
-
-        public bool OptionsVisible
-        {
-            get => _optionsVisible;
-            set => this.RaiseAndSetIfChanged(ref _optionsVisible, value);
-        }
-
-        public double SectorsValue
-        {
-            get => _sectorsValue;
-            set => this.RaiseAndSetIfChanged(ref _sectorsValue, value);
-        }
-
-        public bool ForceChecked
-        {
-            get => _forceChecked;
-            set => this.RaiseAndSetIfChanged(ref _forceChecked, value);
-        }
-
-        public string CreatorText
-        {
-            get => _creatorText;
-            set => this.RaiseAndSetIfChanged(ref _creatorText, value);
-        }
-
-        public string MediaTitleText
-        {
-            get => _mediaTitleText;
-            set => this.RaiseAndSetIfChanged(ref _mediaTitleText, value);
-        }
-
-        public string MediaManufacturerText
-        {
-            get => _mediaManufacturerText;
-            set => this.RaiseAndSetIfChanged(ref _mediaManufacturerText, value);
-        }
-
-        public string MediaModelText
-        {
-            get => _mediaModelText;
-            set => this.RaiseAndSetIfChanged(ref _mediaModelText, value);
-        }
-
-        public string MediaSerialNumberText
-        {
-            get => _mediaSerialNumberText;
-            set => this.RaiseAndSetIfChanged(ref _mediaSerialNumberText, value);
-        }
-
-        public string MediaBarcodeText
-        {
-            get => _mediaBarcodeText;
-            set => this.RaiseAndSetIfChanged(ref _mediaBarcodeText, value);
-        }
-
-        public string MediaPartNumberText
-        {
-            get => _mediaPartNumberText;
-            set => this.RaiseAndSetIfChanged(ref _mediaPartNumberText, value);
-        }
-
-        public double MediaSequenceValue
-        {
-            get => _mediaSequenceValue;
-            set => this.RaiseAndSetIfChanged(ref _mediaSequenceValue, value);
-        }
-
-        public double LastMediaSequenceValue
-        {
-            get => _lastMediaSequenceValue;
-            set => this.RaiseAndSetIfChanged(ref _lastMediaSequenceValue, value);
-        }
-
-        public string DriveManufacturerText
-        {
-            get => _driveManufacturerText;
-            set => this.RaiseAndSetIfChanged(ref _driveManufacturerText, value);
-        }
-
-        public string DriveModelText
-        {
-            get => _driveModelText;
-            set => this.RaiseAndSetIfChanged(ref _driveModelText, value);
-        }
-
-        public string DriveSerialNumberText
-        {
-            get => _driveSerialNumberText;
-            set => this.RaiseAndSetIfChanged(ref _driveSerialNumberText, value);
-        }
-
-        public string DriveFirmwareRevisionText
-        {
-            get => _driveFirmwareRevisionText;
-            set => this.RaiseAndSetIfChanged(ref _driveFirmwareRevisionText, value);
-        }
-
-        public string CommentsText
-        {
-            get => _commentsText;
-            set => this.RaiseAndSetIfChanged(ref _commentsText, value);
-        }
-
-        public string CicmXmlText
-        {
-            get => _cicmXmlText;
-            set => this.RaiseAndSetIfChanged(ref _cicmXmlText, value);
-        }
-
-        public string ResumeFileText
-        {
-            get => _resumeFileText;
-            set => this.RaiseAndSetIfChanged(ref _resumeFileText, value);
-        }
-
-        public bool ProgressVisible
-        {
-            get => _progressVisible;
-            set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
-        }
-
-        public bool Progress1Visible
-        {
-            get => _progress1Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
-        }
-
-        public string ProgressText
-        {
-            get => _progressText;
-            set => this.RaiseAndSetIfChanged(ref _progressText, value);
-        }
-
-        public double ProgressValue
-        {
-            get => _progressValue;
-            set => this.RaiseAndSetIfChanged(ref _progressValue, value);
-        }
-
-        public double ProgressMaxValue
-        {
-            get => _progressMaxValue;
-            set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
-        }
-
-        public bool ProgressIndeterminate
-        {
-            get => _progressIndeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
-        }
-
-        public bool Progress2Visible
-        {
-            get => _progress2Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
-        }
-
-        public string Progress2Text
-        {
-            get => _progress2Text;
-            set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
-        }
-
-        public double Progress2Value
-        {
-            get => _progress2Value;
-            set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
-        }
-
-        public double Progress2MaxValue
-        {
-            get => _progress2MaxValue;
-            set => this.RaiseAndSetIfChanged(ref _progress2MaxValue, value);
-        }
-
-        public bool Progress2Indeterminate
-        {
-            get => _progress2Indeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
-        }
-
-        public bool StartVisible
-        {
-            get => _startVisible;
-            set => this.RaiseAndSetIfChanged(ref _startVisible, value);
-        }
-
-        public bool CloseVisible
-        {
-            get => _closeVisible;
-            set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
-        }
-
-        public bool StopVisible
-        {
-            get => _stopVisible;
-            set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
-        }
-
-        public bool StopEnabled
-        {
-            get => _stopEnabled;
-            set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
-        }
-
-        public bool CreatorVisible
-        {
-            get => _creatorVisible;
-            set => this.RaiseAndSetIfChanged(ref _creatorVisible, value);
-        }
-
-        public bool MediaTitleVisible
-        {
-            get => _mediaTitleVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaTitleVisible, value);
-        }
-
-        public bool CommentsVisible
-        {
-            get => _commentsVisible;
-            set => this.RaiseAndSetIfChanged(ref _commentsVisible, value);
-        }
-
-        public bool MediaManufacturerVisible
-        {
-            get => _mediaManufacturerVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaManufacturerVisible, value);
-        }
-
-        public bool MediaModelVisible
-        {
-            get => _mediaModelVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaModelVisible, value);
-        }
-
-        public bool MediaSerialNumberVisible
-        {
-            get => _mediaSerialNumberVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaSerialNumberVisible, value);
-        }
-
-        public bool MediaBarcodeVisible
-        {
-            get => _mediaBarcodeVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaBarcodeVisible, value);
-        }
-
-        public bool MediaPartNumberVisible
-        {
-            get => _mediaPartNumberVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaPartNumberVisible, value);
-        }
-
-        public bool MediaSequenceVisible
-        {
-            get => _mediaSequenceVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaSequenceVisible, value);
-        }
-
-        public bool LastMediaSequenceVisible
-        {
-            get => _lastMediaSequenceVisible;
-            set => this.RaiseAndSetIfChanged(ref _lastMediaSequenceVisible, value);
-        }
-
-        public bool DriveManufacturerVisible
-        {
-            get => _driveManufacturerVisible;
-            set => this.RaiseAndSetIfChanged(ref _driveManufacturerVisible, value);
-        }
-
-        public bool DriveModelVisible
-        {
-            get => _driveModelVisible;
-            set => this.RaiseAndSetIfChanged(ref _driveModelVisible, value);
-        }
-
-        public bool DriveSerialNumberVisible
-        {
-            get => _driveSerialNumberVisible;
-            set => this.RaiseAndSetIfChanged(ref _driveSerialNumberVisible, value);
-        }
-
-        public bool DriveFirmwareRevisionVisible
-        {
-            get => _driveFirmwareRevisionVisible;
-            set => this.RaiseAndSetIfChanged(ref _driveFirmwareRevisionVisible, value);
-        }
-
-        public bool CicmXmlFromImageVisible
-        {
-            get => _cicmXmlFromImageVisible;
-            set => this.RaiseAndSetIfChanged(ref _cicmXmlFromImageVisible, value);
-        }
-
-        public bool ResumeFileFromImageVisible
-        {
-            get => _resumeFileFromImageVisible;
-            set => this.RaiseAndSetIfChanged(ref _resumeFileFromImageVisible, value);
-        }
-
-        public bool DestinationEnabled
-        {
-            get => _destinationEnabled;
-            set => this.RaiseAndSetIfChanged(ref _destinationEnabled, value);
-        }
-
-        public ReactiveCommand<Unit, Unit> DestinationCommand           { get; }
-        public ReactiveCommand<Unit, Unit> CreatorCommand               { get; }
-        public ReactiveCommand<Unit, Unit> MediaTitleCommand            { get; }
-        public ReactiveCommand<Unit, Unit> MediaManufacturerCommand     { get; }
-        public ReactiveCommand<Unit, Unit> MediaModelCommand            { get; }
-        public ReactiveCommand<Unit, Unit> MediaSerialNumberCommand     { get; }
-        public ReactiveCommand<Unit, Unit> MediaBarcodeCommand          { get; }
-        public ReactiveCommand<Unit, Unit> MediaPartNumberCommand       { get; }
-        public ReactiveCommand<Unit, Unit> MediaSequenceCommand         { get; }
-        public ReactiveCommand<Unit, Unit> LastMediaSequenceCommand     { get; }
-        public ReactiveCommand<Unit, Unit> DriveManufacturerCommand     { get; }
-        public ReactiveCommand<Unit, Unit> DriveModelCommand            { get; }
-        public ReactiveCommand<Unit, Unit> DriveSerialNumberCommand     { get; }
-        public ReactiveCommand<Unit, Unit> DriveFirmwareRevisionCommand { get; }
-        public ReactiveCommand<Unit, Unit> CommentsCommand              { get; }
-        public ReactiveCommand<Unit, Unit> CicmXmlFromImageCommand      { get; }
-        public ReactiveCommand<Unit, Unit> CicmXmlCommand               { get; }
-        public ReactiveCommand<Unit, Unit> ResumeFileFromImageCommand   { get; }
-        public ReactiveCommand<Unit, Unit> ResumeFileCommand            { get; }
-        public ReactiveCommand<Unit, Unit> StartCommand                 { get; }
-        public ReactiveCommand<Unit, Unit> CloseCommand                 { get; }
-        public ReactiveCommand<Unit, Unit> StopCommand                  { get; }
-
-        public bool FormatReadOnly
-        {
-            get => _formatReadOnly;
-            set => this.RaiseAndSetIfChanged(ref _formatReadOnly, value);
-        }
-
-        public bool DestinationVisible
-        {
-            get => _destinationVisible;
-            set => this.RaiseAndSetIfChanged(ref _destinationVisible, value);
-        }
-
-        async void ExecuteStartCommand()
-        {
-            if(SelectedPlugin is null)
+            PluginsList.Add(new ImagePluginModel
             {
-                await MessageBoxManager.GetMessageBoxStandardWindow("Error", "Error trying to find selected plugin",
-                                                                    icon: Icon.Error).ShowDialog(_view);
+                Plugin = plugin
+            });
 
-                return;
-            }
+        CicmXmlFromImageVisible    = inputFormat.CicmMetadata        != null;
+        ResumeFileFromImageVisible = inputFormat.DumpHardware?.Any() == true;
+        _cicmMetadata              = inputFormat.CicmMetadata;
 
-            new Thread(DoWork).Start(SelectedPlugin.Plugin);
+        _dumpHardware = inputFormat.DumpHardware?.Any() == true ? inputFormat.DumpHardware : null;
+
+        CicmXmlText    = _cicmMetadata == null ? "" : "<From image>";
+        ResumeFileText = _dumpHardware == null ? "" : "<From image>";
+    }
+
+    public string Title
+    {
+        get => _title;
+        set => this.RaiseAndSetIfChanged(ref _title, value);
+    }
+
+    public string SourceText
+    {
+        get => _sourceText;
+        set => this.RaiseAndSetIfChanged(ref _sourceText, value);
+    }
+
+    public ObservableCollection<ImagePluginModel> PluginsList { get; }
+
+    public ImagePluginModel SelectedPlugin
+    {
+        get => _selectedPlugin;
+        set => this.RaiseAndSetIfChanged(ref _selectedPlugin, value);
+    }
+
+    public string DestinationText
+    {
+        get => _destinationText;
+        set => this.RaiseAndSetIfChanged(ref _destinationText, value);
+    }
+
+    public bool OptionsVisible
+    {
+        get => _optionsVisible;
+        set => this.RaiseAndSetIfChanged(ref _optionsVisible, value);
+    }
+
+    public double SectorsValue
+    {
+        get => _sectorsValue;
+        set => this.RaiseAndSetIfChanged(ref _sectorsValue, value);
+    }
+
+    public bool ForceChecked
+    {
+        get => _forceChecked;
+        set => this.RaiseAndSetIfChanged(ref _forceChecked, value);
+    }
+
+    public string CreatorText
+    {
+        get => _creatorText;
+        set => this.RaiseAndSetIfChanged(ref _creatorText, value);
+    }
+
+    public string MediaTitleText
+    {
+        get => _mediaTitleText;
+        set => this.RaiseAndSetIfChanged(ref _mediaTitleText, value);
+    }
+
+    public string MediaManufacturerText
+    {
+        get => _mediaManufacturerText;
+        set => this.RaiseAndSetIfChanged(ref _mediaManufacturerText, value);
+    }
+
+    public string MediaModelText
+    {
+        get => _mediaModelText;
+        set => this.RaiseAndSetIfChanged(ref _mediaModelText, value);
+    }
+
+    public string MediaSerialNumberText
+    {
+        get => _mediaSerialNumberText;
+        set => this.RaiseAndSetIfChanged(ref _mediaSerialNumberText, value);
+    }
+
+    public string MediaBarcodeText
+    {
+        get => _mediaBarcodeText;
+        set => this.RaiseAndSetIfChanged(ref _mediaBarcodeText, value);
+    }
+
+    public string MediaPartNumberText
+    {
+        get => _mediaPartNumberText;
+        set => this.RaiseAndSetIfChanged(ref _mediaPartNumberText, value);
+    }
+
+    public double MediaSequenceValue
+    {
+        get => _mediaSequenceValue;
+        set => this.RaiseAndSetIfChanged(ref _mediaSequenceValue, value);
+    }
+
+    public double LastMediaSequenceValue
+    {
+        get => _lastMediaSequenceValue;
+        set => this.RaiseAndSetIfChanged(ref _lastMediaSequenceValue, value);
+    }
+
+    public string DriveManufacturerText
+    {
+        get => _driveManufacturerText;
+        set => this.RaiseAndSetIfChanged(ref _driveManufacturerText, value);
+    }
+
+    public string DriveModelText
+    {
+        get => _driveModelText;
+        set => this.RaiseAndSetIfChanged(ref _driveModelText, value);
+    }
+
+    public string DriveSerialNumberText
+    {
+        get => _driveSerialNumberText;
+        set => this.RaiseAndSetIfChanged(ref _driveSerialNumberText, value);
+    }
+
+    public string DriveFirmwareRevisionText
+    {
+        get => _driveFirmwareRevisionText;
+        set => this.RaiseAndSetIfChanged(ref _driveFirmwareRevisionText, value);
+    }
+
+    public string CommentsText
+    {
+        get => _commentsText;
+        set => this.RaiseAndSetIfChanged(ref _commentsText, value);
+    }
+
+    public string CicmXmlText
+    {
+        get => _cicmXmlText;
+        set => this.RaiseAndSetIfChanged(ref _cicmXmlText, value);
+    }
+
+    public string ResumeFileText
+    {
+        get => _resumeFileText;
+        set => this.RaiseAndSetIfChanged(ref _resumeFileText, value);
+    }
+
+    public bool ProgressVisible
+    {
+        get => _progressVisible;
+        set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
+    }
+
+    public bool Progress1Visible
+    {
+        get => _progress1Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
+    }
+
+    public string ProgressText
+    {
+        get => _progressText;
+        set => this.RaiseAndSetIfChanged(ref _progressText, value);
+    }
+
+    public double ProgressValue
+    {
+        get => _progressValue;
+        set => this.RaiseAndSetIfChanged(ref _progressValue, value);
+    }
+
+    public double ProgressMaxValue
+    {
+        get => _progressMaxValue;
+        set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
+    }
+
+    public bool ProgressIndeterminate
+    {
+        get => _progressIndeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
+    }
+
+    public bool Progress2Visible
+    {
+        get => _progress2Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
+    }
+
+    public string Progress2Text
+    {
+        get => _progress2Text;
+        set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
+    }
+
+    public double Progress2Value
+    {
+        get => _progress2Value;
+        set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
+    }
+
+    public double Progress2MaxValue
+    {
+        get => _progress2MaxValue;
+        set => this.RaiseAndSetIfChanged(ref _progress2MaxValue, value);
+    }
+
+    public bool Progress2Indeterminate
+    {
+        get => _progress2Indeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
+    }
+
+    public bool StartVisible
+    {
+        get => _startVisible;
+        set => this.RaiseAndSetIfChanged(ref _startVisible, value);
+    }
+
+    public bool CloseVisible
+    {
+        get => _closeVisible;
+        set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
+    }
+
+    public bool StopVisible
+    {
+        get => _stopVisible;
+        set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
+    }
+
+    public bool StopEnabled
+    {
+        get => _stopEnabled;
+        set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
+    }
+
+    public bool CreatorVisible
+    {
+        get => _creatorVisible;
+        set => this.RaiseAndSetIfChanged(ref _creatorVisible, value);
+    }
+
+    public bool MediaTitleVisible
+    {
+        get => _mediaTitleVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaTitleVisible, value);
+    }
+
+    public bool CommentsVisible
+    {
+        get => _commentsVisible;
+        set => this.RaiseAndSetIfChanged(ref _commentsVisible, value);
+    }
+
+    public bool MediaManufacturerVisible
+    {
+        get => _mediaManufacturerVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaManufacturerVisible, value);
+    }
+
+    public bool MediaModelVisible
+    {
+        get => _mediaModelVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaModelVisible, value);
+    }
+
+    public bool MediaSerialNumberVisible
+    {
+        get => _mediaSerialNumberVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaSerialNumberVisible, value);
+    }
+
+    public bool MediaBarcodeVisible
+    {
+        get => _mediaBarcodeVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaBarcodeVisible, value);
+    }
+
+    public bool MediaPartNumberVisible
+    {
+        get => _mediaPartNumberVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaPartNumberVisible, value);
+    }
+
+    public bool MediaSequenceVisible
+    {
+        get => _mediaSequenceVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaSequenceVisible, value);
+    }
+
+    public bool LastMediaSequenceVisible
+    {
+        get => _lastMediaSequenceVisible;
+        set => this.RaiseAndSetIfChanged(ref _lastMediaSequenceVisible, value);
+    }
+
+    public bool DriveManufacturerVisible
+    {
+        get => _driveManufacturerVisible;
+        set => this.RaiseAndSetIfChanged(ref _driveManufacturerVisible, value);
+    }
+
+    public bool DriveModelVisible
+    {
+        get => _driveModelVisible;
+        set => this.RaiseAndSetIfChanged(ref _driveModelVisible, value);
+    }
+
+    public bool DriveSerialNumberVisible
+    {
+        get => _driveSerialNumberVisible;
+        set => this.RaiseAndSetIfChanged(ref _driveSerialNumberVisible, value);
+    }
+
+    public bool DriveFirmwareRevisionVisible
+    {
+        get => _driveFirmwareRevisionVisible;
+        set => this.RaiseAndSetIfChanged(ref _driveFirmwareRevisionVisible, value);
+    }
+
+    public bool CicmXmlFromImageVisible
+    {
+        get => _cicmXmlFromImageVisible;
+        set => this.RaiseAndSetIfChanged(ref _cicmXmlFromImageVisible, value);
+    }
+
+    public bool ResumeFileFromImageVisible
+    {
+        get => _resumeFileFromImageVisible;
+        set => this.RaiseAndSetIfChanged(ref _resumeFileFromImageVisible, value);
+    }
+
+    public bool DestinationEnabled
+    {
+        get => _destinationEnabled;
+        set => this.RaiseAndSetIfChanged(ref _destinationEnabled, value);
+    }
+
+    public ReactiveCommand<Unit, Unit> DestinationCommand           { get; }
+    public ReactiveCommand<Unit, Unit> CreatorCommand               { get; }
+    public ReactiveCommand<Unit, Unit> MediaTitleCommand            { get; }
+    public ReactiveCommand<Unit, Unit> MediaManufacturerCommand     { get; }
+    public ReactiveCommand<Unit, Unit> MediaModelCommand            { get; }
+    public ReactiveCommand<Unit, Unit> MediaSerialNumberCommand     { get; }
+    public ReactiveCommand<Unit, Unit> MediaBarcodeCommand          { get; }
+    public ReactiveCommand<Unit, Unit> MediaPartNumberCommand       { get; }
+    public ReactiveCommand<Unit, Unit> MediaSequenceCommand         { get; }
+    public ReactiveCommand<Unit, Unit> LastMediaSequenceCommand     { get; }
+    public ReactiveCommand<Unit, Unit> DriveManufacturerCommand     { get; }
+    public ReactiveCommand<Unit, Unit> DriveModelCommand            { get; }
+    public ReactiveCommand<Unit, Unit> DriveSerialNumberCommand     { get; }
+    public ReactiveCommand<Unit, Unit> DriveFirmwareRevisionCommand { get; }
+    public ReactiveCommand<Unit, Unit> CommentsCommand              { get; }
+    public ReactiveCommand<Unit, Unit> CicmXmlFromImageCommand      { get; }
+    public ReactiveCommand<Unit, Unit> CicmXmlCommand               { get; }
+    public ReactiveCommand<Unit, Unit> ResumeFileFromImageCommand   { get; }
+    public ReactiveCommand<Unit, Unit> ResumeFileCommand            { get; }
+    public ReactiveCommand<Unit, Unit> StartCommand                 { get; }
+    public ReactiveCommand<Unit, Unit> CloseCommand                 { get; }
+    public ReactiveCommand<Unit, Unit> StopCommand                  { get; }
+
+    public bool FormatReadOnly
+    {
+        get => _formatReadOnly;
+        set => this.RaiseAndSetIfChanged(ref _formatReadOnly, value);
+    }
+
+    public bool DestinationVisible
+    {
+        get => _destinationVisible;
+        set => this.RaiseAndSetIfChanged(ref _destinationVisible, value);
+    }
+
+    async void ExecuteStartCommand()
+    {
+        if(SelectedPlugin is null)
+        {
+            await MessageBoxManager.GetMessageBoxStandardWindow("Error", "Error trying to find selected plugin",
+                                                                icon: Icon.Error).ShowDialog(_view);
+
+            return;
         }
 
-        async void DoWork(object plugin)
+        new Thread(DoWork).Start(SelectedPlugin.Plugin);
+    }
+
+    async void DoWork(object plugin)
+    {
+        bool warning = false;
+
+        if(!(plugin is IWritableImage outputFormat))
         {
-            bool warning = false;
+            await MessageBoxManager.GetMessageBoxStandardWindow("Error", "Error trying to find selected plugin",
+                                                                icon: Icon.Error).ShowDialog(_view);
 
-            if(!(plugin is IWritableImage outputFormat))
-            {
-                await MessageBoxManager.GetMessageBoxStandardWindow("Error", "Error trying to find selected plugin",
-                                                                    icon: Icon.Error).ShowDialog(_view);
+            return;
+        }
 
-                return;
-            }
+        var inputOptical  = _inputFormat as IOpticalMediaImage;
+        var outputOptical = outputFormat as IWritableOpticalImage;
 
-            var inputOptical  = _inputFormat as IOpticalMediaImage;
-            var outputOptical = outputFormat as IWritableOpticalImage;
+        List<Track> tracks;
 
-            List<Track> tracks;
+        try
+        {
+            tracks = inputOptical?.Tracks;
+        }
+        catch(Exception)
+        {
+            tracks = null;
+        }
 
-            try
-            {
-                tracks = inputOptical?.Tracks;
-            }
-            catch(Exception)
-            {
-                tracks = null;
-            }
+        // Prepare UI
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            CloseVisible       = false;
+            StartVisible       = false;
+            StopVisible        = true;
+            ProgressVisible    = true;
+            OptionsVisible     = false;
+            StopEnabled        = true;
+            FormatReadOnly     = true;
+            DestinationVisible = false;
 
-            // Prepare UI
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                CloseVisible       = false;
-                StartVisible       = false;
-                StopVisible        = true;
-                ProgressVisible    = true;
-                OptionsVisible     = false;
-                StopEnabled        = true;
-                FormatReadOnly     = true;
-                DestinationVisible = false;
+            ProgressMaxValue =  1d;
+            ProgressMaxValue += _inputFormat.Info.ReadableMediaTags.Count;
+            ProgressMaxValue++;
 
-                ProgressMaxValue =  1d;
-                ProgressMaxValue += _inputFormat.Info.ReadableMediaTags.Count;
+            if(tracks != null)
                 ProgressMaxValue++;
 
-                if(tracks != null)
-                    ProgressMaxValue++;
+            if(tracks == null)
+            {
+                ProgressMaxValue += 2;
 
-                if(tracks == null)
+                foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags)
                 {
-                    ProgressMaxValue += 2;
-
-                    foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags)
+                    switch(tag)
                     {
-                        switch(tag)
-                        {
-                            case SectorTagType.AppleSectorTag:
-                            case SectorTagType.CdSectorSync:
-                            case SectorTagType.CdSectorHeader:
-                            case SectorTagType.CdSectorSubHeader:
-                            case SectorTagType.CdSectorEdc:
-                            case SectorTagType.CdSectorEccP:
-                            case SectorTagType.CdSectorEccQ:
-                            case SectorTagType.CdSectorEcc:
-                                // This tags are inline in long sector
-                                continue;
-                        }
-
-                        if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag))
+                        case SectorTagType.AppleSectorTag:
+                        case SectorTagType.CdSectorSync:
+                        case SectorTagType.CdSectorHeader:
+                        case SectorTagType.CdSectorSubHeader:
+                        case SectorTagType.CdSectorEdc:
+                        case SectorTagType.CdSectorEccP:
+                        case SectorTagType.CdSectorEccQ:
+                        case SectorTagType.CdSectorEcc:
+                            // This tags are inline in long sector
                             continue;
-
-                        ProgressMaxValue++;
                     }
+
+                    if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag))
+                        continue;
+
+                    ProgressMaxValue++;
                 }
-                else
+            }
+            else
+            {
+                ProgressMaxValue += tracks.Count;
+
+                foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.OrderBy(t => t))
                 {
+                    switch(tag)
+                    {
+                        case SectorTagType.AppleSectorTag:
+                        case SectorTagType.CdSectorSync:
+                        case SectorTagType.CdSectorHeader:
+                        case SectorTagType.CdSectorSubHeader:
+                        case SectorTagType.CdSectorEdc:
+                        case SectorTagType.CdSectorEccP:
+                        case SectorTagType.CdSectorEccQ:
+                        case SectorTagType.CdSectorEcc:
+                            // This tags are inline in long sector
+                            continue;
+                    }
+
+                    if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag))
+                        continue;
+
                     ProgressMaxValue += tracks.Count;
-
-                    foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.OrderBy(t => t))
-                    {
-                        switch(tag)
-                        {
-                            case SectorTagType.AppleSectorTag:
-                            case SectorTagType.CdSectorSync:
-                            case SectorTagType.CdSectorHeader:
-                            case SectorTagType.CdSectorSubHeader:
-                            case SectorTagType.CdSectorEdc:
-                            case SectorTagType.CdSectorEccP:
-                            case SectorTagType.CdSectorEccQ:
-                            case SectorTagType.CdSectorEcc:
-                                // This tags are inline in long sector
-                                continue;
-                        }
-
-                        if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag))
-                            continue;
-
-                        ProgressMaxValue += tracks.Count;
-                    }
                 }
+            }
 
-                if(_dumpHardware != null)
-                    ProgressMaxValue++;
-
-                if(_cicmMetadata != null)
-                    ProgressMaxValue++;
-
+            if(_dumpHardware != null)
                 ProgressMaxValue++;
-            });
 
-            foreach(MediaTagType mediaTag in _inputFormat.Info.ReadableMediaTags.Where(mediaTag =>
-                !outputFormat.SupportedMediaTags.Contains(mediaTag) && !ForceChecked))
+            if(_cicmMetadata != null)
+                ProgressMaxValue++;
+
+            ProgressMaxValue++;
+        });
+
+        foreach(MediaTagType mediaTag in _inputFormat.Info.ReadableMediaTags.Where(mediaTag =>
+                    !outputFormat.SupportedMediaTags.Contains(mediaTag) && !ForceChecked))
+        {
+            await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                            GetMessageBoxStandardWindow("Error",
+                                                                                $"Converting image will lose media tag {mediaTag}, not continuing...",
+                                                                                icon: Icon.Error).
+                                                                            ShowDialog(_view));
+
+            return;
+        }
+
+        bool useLong = _inputFormat.Info.ReadableSectorTags.Count != 0;
+
+        foreach(SectorTagType sectorTag in _inputFormat.Info.ReadableSectorTags.Where(sectorTag =>
+                    !outputFormat.SupportedSectorTags.Contains(sectorTag)))
+        {
+            if(ForceChecked)
             {
-                await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                              GetMessageBoxStandardWindow("Error",
-                                                                                  $"Converting image will lose media tag {mediaTag}, not continuing...",
-                                                                                  icon: Icon.Error).
-                                                                              ShowDialog(_view));
+                if(sectorTag != SectorTagType.CdTrackFlags &&
+                   sectorTag != SectorTagType.CdTrackIsrc  &&
+                   sectorTag != SectorTagType.CdSectorSubchannel)
+                    useLong = false;
 
-                return;
+                continue;
             }
 
-            bool useLong = _inputFormat.Info.ReadableSectorTags.Count != 0;
+            await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                            GetMessageBoxStandardWindow("Error",
+                                                                                $"Converting image will lose sector tag {sectorTag}, not continuing...",
+                                                                                icon: Icon.Error).
+                                                                            ShowDialog(_view));
 
-            foreach(SectorTagType sectorTag in _inputFormat.Info.ReadableSectorTags.Where(sectorTag =>
-                !outputFormat.SupportedSectorTags.Contains(sectorTag)))
+            return;
+        }
+
+        Dictionary<string, string> parsedOptions = new();
+
+        /* TODO:
+        if(grpOptions.Content is StackLayout stkImageOptions)
+            foreach(Control option in stkImageOptions.Children)
             {
-                if(ForceChecked)
+                if(cancel)
+                    break;
+
+                string value;
+
+                switch(option)
                 {
-                    if(sectorTag != SectorTagType.CdTrackFlags &&
-                       sectorTag != SectorTagType.CdTrackIsrc  &&
-                       sectorTag != SectorTagType.CdSectorSubchannel)
-                        useLong = false;
+                    case CheckBox optBoolean:
+                        value = optBooleanChecked?.ToString();
 
-                    continue;
-                }
-
-                await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                              GetMessageBoxStandardWindow("Error",
-                                                                                  $"Converting image will lose sector tag {sectorTag}, not continuing...",
-                                                                                  icon: Icon.Error).
-                                                                              ShowDialog(_view));
-
-                return;
-            }
-
-            Dictionary<string, string> parsedOptions = new();
-
-            /* TODO:
-            if(grpOptions.Content is StackLayout stkImageOptions)
-                foreach(Control option in stkImageOptions.Children)
-                {
-                    if(cancel)
                         break;
+                    case NumericStepper optNumber:
+                        value = optNumber.Value.ToString(CultureInfo.CurrentCulture);
 
-                    string value;
+                        break;
+                    case TextBox optString:
+                        value = optString.Text;
 
-                    switch(option)
-                    {
-                        case CheckBox optBoolean:
-                            value = optBooleanChecked?.ToString();
-
-                            break;
-                        case NumericStepper optNumber:
-                            value = optNumber.Value.ToString(CultureInfo.CurrentCulture);
-
-                            break;
-                        case TextBox optString:
-                            value = optString.Text;
-
-                            break;
-                        default: continue;
-                    }
-
-                    string key = option.ID.Substring(3);
-
-                    parsedOptions.Add(key, value);
+                        break;
+                    default: continue;
                 }
-                */
 
-            await Dispatcher.UIThread.InvokeAsync(() =>
+                string key = option.ID.Substring(3);
+
+                parsedOptions.Add(key, value);
+            }
+            */
+
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            ProgressText           = "Creating output image";
+            Progress2Text          = "";
+            Progress2Indeterminate = true;
+        });
+
+        if(!outputFormat.Create(DestinationText, _inputFormat.Info.MediaType, parsedOptions,
+                                _inputFormat.Info.Sectors, _inputFormat.Info.SectorSize))
+        {
+            await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                            GetMessageBoxStandardWindow("Error",
+                                                                                $"Error {outputFormat.ErrorMessage} creating output image.",
+                                                                                icon: Icon.Error).
+                                                                            ShowDialog(_view));
+
+            AaruConsole.ErrorWriteLine("Error {0} creating output image.", outputFormat.ErrorMessage);
+
+            return;
+        }
+
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            ProgressText = "Setting image metadata";
+            ProgressValue++;
+            Progress2Text          = "";
+            Progress2Indeterminate = true;
+        });
+
+        var metadata = new ImageInfo
+        {
+            Application           = "Aaru",
+            ApplicationVersion    = Version.GetVersion(),
+            Comments              = CommentsText,
+            Creator               = CreatorText,
+            DriveFirmwareRevision = DriveFirmwareRevisionText,
+            DriveManufacturer     = DriveManufacturerText,
+            DriveModel            = DriveModelText,
+            DriveSerialNumber     = DriveSerialNumberText,
+            LastMediaSequence     = (int)LastMediaSequenceValue,
+            MediaBarcode          = MediaBarcodeText,
+            MediaManufacturer     = MediaManufacturerText,
+            MediaModel            = MediaModelText,
+            MediaPartNumber       = MediaPartNumberText,
+            MediaSequence         = (int)MediaSequenceValue,
+            MediaSerialNumber     = MediaSerialNumberText,
+            MediaTitle            = MediaTitleText
+        };
+
+        if(!_cancel)
+            if(!outputFormat.SetMetadata(metadata))
             {
-                ProgressText           = "Creating output image";
-                Progress2Text          = "";
-                Progress2Indeterminate = true;
-            });
+                AaruConsole.ErrorWrite("Error {0} setting metadata, ", outputFormat.ErrorMessage);
 
-            if(!outputFormat.Create(DestinationText, _inputFormat.Info.MediaType, parsedOptions,
-                                    _inputFormat.Info.Sectors, _inputFormat.Info.SectorSize))
-            {
-                await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                              GetMessageBoxStandardWindow("Error",
-                                                                                  $"Error {outputFormat.ErrorMessage} creating output image.",
-                                                                                  icon: Icon.Error).
-                                                                              ShowDialog(_view));
+                if(ForceChecked != true)
+                {
+                    await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                                  GetMessageBoxStandardWindow("Error",
+                                                                                      $"Error {outputFormat.ErrorMessage} setting metadata, not continuing...",
+                                                                                      icon: Icon.Error).ShowDialog(_view));
 
-                AaruConsole.ErrorWriteLine("Error {0} creating output image.", outputFormat.ErrorMessage);
+                    AaruConsole.ErrorWriteLine("not continuing...");
 
-                return;
+                    return;
+                }
+
+                warning = true;
+                AaruConsole.ErrorWriteLine("continuing...");
             }
 
+        if(tracks != null &&
+           !_cancel       &&
+           outputOptical != null)
+        {
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
-                ProgressText = "Setting image metadata";
+                ProgressText = "Setting tracks list";
                 ProgressValue++;
                 Progress2Text          = "";
                 Progress2Indeterminate = true;
             });
 
-            var metadata = new ImageInfo
+            if(!outputOptical.SetTracks(tracks))
             {
-                Application           = "Aaru",
-                ApplicationVersion    = Version.GetVersion(),
-                Comments              = CommentsText,
-                Creator               = CreatorText,
-                DriveFirmwareRevision = DriveFirmwareRevisionText,
-                DriveManufacturer     = DriveManufacturerText,
-                DriveModel            = DriveModelText,
-                DriveSerialNumber     = DriveSerialNumberText,
-                LastMediaSequence     = (int)LastMediaSequenceValue,
-                MediaBarcode          = MediaBarcodeText,
-                MediaManufacturer     = MediaManufacturerText,
-                MediaModel            = MediaModelText,
-                MediaPartNumber       = MediaPartNumberText,
-                MediaSequence         = (int)MediaSequenceValue,
-                MediaSerialNumber     = MediaSerialNumberText,
-                MediaTitle            = MediaTitleText
-            };
+                await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                              GetMessageBoxStandardWindow("Error",
+                                                                                  $"Error {outputFormat.ErrorMessage} sending tracks list to output image.",
+                                                                                  icon: Icon.Error).
+                                                                              ShowDialog(_view));
 
-            if(!_cancel)
-                if(!outputFormat.SetMetadata(metadata))
+                AaruConsole.ErrorWriteLine("Error {0} sending tracks list to output image.",
+                                           outputFormat.ErrorMessage);
+
+                return;
+            }
+        }
+
+        ErrorNumber errno;
+
+        foreach(MediaTagType mediaTag in _inputFormat.Info.ReadableMediaTags.TakeWhile(mediaTag => !_cancel))
+        {
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                ProgressText = $"Converting media tag {mediaTag}";
+                ProgressValue++;
+                Progress2Text          = "";
+                Progress2Indeterminate = true;
+            });
+
+            if(ForceChecked && !outputFormat.SupportedMediaTags.Contains(mediaTag))
+                continue;
+
+            errno = _inputFormat.ReadMediaTag(mediaTag, out byte[] tag);
+
+            if(errno == ErrorNumber.NoError &&
+               outputFormat.WriteMediaTag(tag, mediaTag))
+                continue;
+
+            if(ForceChecked)
+            {
+                warning = true;
+
+                if(errno == ErrorNumber.NoError)
+                    AaruConsole.ErrorWriteLine("Error {0} writing media tag, continuing...",
+                                               outputFormat.ErrorMessage);
+                else
+                    AaruConsole.ErrorWriteLine("Error {0} reading media tag, continuing...", errno);
+            }
+            else
+            {
+                if(errno == ErrorNumber.NoError)
                 {
-                    AaruConsole.ErrorWrite("Error {0} setting metadata, ", outputFormat.ErrorMessage);
+                    await Dispatcher.UIThread.InvokeAsync(action: async () =>
+                                                              await MessageBoxManager.
+                                                                    GetMessageBoxStandardWindow("Error",
+                                                                        $"Error {outputFormat.ErrorMessage} writing media tag, not continuing...",
+                                                                        icon: Icon.Error).ShowDialog(_view));
 
-                    if(ForceChecked != true)
+                    AaruConsole.ErrorWriteLine("Error {0} writing media tag, not continuing...",
+                                               outputFormat.ErrorMessage);
+                }
+                else
+                {
+                    await Dispatcher.UIThread.InvokeAsync(action: async () =>
+                                                              await MessageBoxManager.
+                                                                    GetMessageBoxStandardWindow("Error",
+                                                                        $"Error {errno} reading media tag, not continuing...",
+                                                                        icon: Icon.Error).ShowDialog(_view));
+
+                    AaruConsole.ErrorWriteLine("Error {0} reading media tag, not continuing...", errno);
+                }
+
+                return;
+            }
+        }
+
+        ulong doneSectors = 0;
+
+        if(tracks == null &&
+           !_cancel)
+        {
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                ProgressText =
+                    $"Setting geometry to {_inputFormat.Info.Cylinders} cylinders, {_inputFormat.Info.Heads} heads and {_inputFormat.Info.SectorsPerTrack} sectors per track";
+
+                ProgressValue++;
+                Progress2Text          = "";
+                Progress2Indeterminate = true;
+            });
+
+            if(!outputFormat.SetGeometry(_inputFormat.Info.Cylinders, _inputFormat.Info.Heads,
+                                         _inputFormat.Info.SectorsPerTrack))
+            {
+                warning = true;
+
+                AaruConsole.ErrorWriteLine("Error {0} setting geometry, image may be incorrect, continuing...",
+                                           outputFormat.ErrorMessage);
+            }
+
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                ProgressText = "Converting sectors";
+                ProgressValue++;
+                Progress2Text          = "";
+                Progress2Indeterminate = false;
+                Progress2MaxValue      = (int)(_inputFormat.Info.Sectors / SectorsValue);
+            });
+
+            while(doneSectors < _inputFormat.Info.Sectors)
+            {
+                if(_cancel)
+                    break;
+
+                byte[] sector;
+
+                uint sectorsToDo;
+
+                if(_inputFormat.Info.Sectors - doneSectors >= (ulong)SectorsValue)
+                    sectorsToDo = (uint)SectorsValue;
+                else
+                    sectorsToDo = (uint)(_inputFormat.Info.Sectors - doneSectors);
+
+                ulong sectors = doneSectors;
+
+                await Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    Progress2Text =
+                        $"Converting sectors {sectors} to {sectors + sectorsToDo} ({sectors / (double)_inputFormat.Info.Sectors:P2} done)";
+
+                    Progress2Value = (int)(sectors / SectorsValue);
+                });
+
+                bool result;
+
+                if(useLong)
+                {
+                    errno = sectorsToDo == 1 ? _inputFormat.ReadSectorLong(doneSectors, out sector)
+                                : _inputFormat.ReadSectorsLong(doneSectors, sectorsToDo, out sector);
+
+                    if(errno == ErrorNumber.NoError)
+                        result = sectorsToDo == 1 ? outputFormat.WriteSectorLong(sector, doneSectors)
+                                     : outputFormat.WriteSectorsLong(sector, doneSectors, sectorsToDo);
+                    else
+                    {
+                        result = true;
+
+                        if(ForceChecked)
+                        {
+                            warning = true;
+
+                            AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, continuing...", errno,
+                                                       doneSectors);
+                        }
+                        else
+                        {
+                            await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                      GetMessageBoxStandardWindow("Error",
+                                                                          $"Error {errno} reading sector {doneSectors}, not continuing...",
+                                                                          icon: Icon.Error).
+                                                                      ShowDialog(_view));
+
+                            AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, not continuing...", errno,
+                                                       doneSectors);
+
+                            return;
+                        }
+                    }
+                }
+                else
+                {
+                    errno = sectorsToDo == 1 ? _inputFormat.ReadSector(doneSectors, out sector)
+                                : _inputFormat.ReadSectors(doneSectors, sectorsToDo, out sector);
+
+                    if(errno == ErrorNumber.NoError)
+                        result = sectorsToDo == 1 ? outputFormat.WriteSector(sector, doneSectors)
+                                     : outputFormat.WriteSectors(sector, doneSectors, sectorsToDo);
+                    else
+                    {
+                        result = true;
+
+                        if(ForceChecked)
+                        {
+                            warning = true;
+
+                            AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, continuing...", errno,
+                                                       doneSectors);
+                        }
+                        else
+                        {
+                            await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                      GetMessageBoxStandardWindow("Error",
+                                                                          $"Error {errno} reading sector {doneSectors}, not continuing...",
+                                                                          icon: Icon.Error).
+                                                                      ShowDialog(_view));
+
+                            AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, not continuing...", errno,
+                                                       doneSectors);
+
+                            return;
+                        }
+                    }
+                }
+
+                if(!result)
+                    if(ForceChecked)
+                    {
+                        warning = true;
+
+                        AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, continuing...",
+                                                   outputFormat.ErrorMessage, doneSectors);
+                    }
+                    else
                     {
                         await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
                                                                   GetMessageBoxStandardWindow("Error",
-                                                                      $"Error {outputFormat.ErrorMessage} setting metadata, not continuing...",
+                                                                      $"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
                                                                       icon: Icon.Error).ShowDialog(_view));
 
-                        AaruConsole.ErrorWriteLine("not continuing...");
+                        AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, not continuing...",
+                                                   outputFormat.ErrorMessage, doneSectors);
 
                         return;
                     }
 
-                    warning = true;
-                    AaruConsole.ErrorWriteLine("continuing...");
-                }
+                doneSectors += sectorsToDo;
+            }
 
-            if(tracks != null &&
-               !_cancel       &&
-               outputOptical != null)
+            await Dispatcher.UIThread.InvokeAsync(() =>
             {
-                await Dispatcher.UIThread.InvokeAsync(() =>
+                Progress2Text =
+                    $"Converting sectors {_inputFormat.Info.Sectors} to {_inputFormat.Info.Sectors} ({1.0:P2} done)";
+
+                Progress2Value = Progress2MaxValue;
+            });
+
+            Dictionary<byte, string> isrcs                     = new();
+            Dictionary<byte, byte>   trackFlags                = new();
+            string                   mcn                       = null;
+            HashSet<int>             subchannelExtents         = new();
+            Dictionary<byte, int>    smallestPregapLbaPerTrack = new();
+
+            foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.
+                                                      Where(t => t == SectorTagType.CdTrackIsrc).OrderBy(t => t))
+            {
+                foreach(Track track in inputOptical.Tracks)
                 {
-                    ProgressText = "Setting tracks list";
-                    ProgressValue++;
-                    Progress2Text          = "";
-                    Progress2Indeterminate = true;
-                });
+                    errno = _inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] isrc);
 
-                if(!outputOptical.SetTracks(tracks))
-                {
-                    await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                                  GetMessageBoxStandardWindow("Error",
-                                                                                      $"Error {outputFormat.ErrorMessage} sending tracks list to output image.",
-                                                                                      icon: Icon.Error).
-                                                                                  ShowDialog(_view));
+                    if(errno != ErrorNumber.NoError)
+                        continue;
 
-                    AaruConsole.ErrorWriteLine("Error {0} sending tracks list to output image.",
-                                               outputFormat.ErrorMessage);
-
-                    return;
+                    isrcs[(byte)track.Sequence] = Encoding.UTF8.GetString(isrc);
                 }
             }
 
-            ErrorNumber errno;
-
-            foreach(MediaTagType mediaTag in _inputFormat.Info.ReadableMediaTags.TakeWhile(mediaTag => !_cancel))
+            foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.
+                                                      Where(t => t == SectorTagType.CdTrackFlags).OrderBy(t => t))
             {
-                await Dispatcher.UIThread.InvokeAsync(() =>
+                foreach(Track track in inputOptical.Tracks)
                 {
-                    ProgressText = $"Converting media tag {mediaTag}";
-                    ProgressValue++;
-                    Progress2Text          = "";
-                    Progress2Indeterminate = true;
-                });
+                    errno = _inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] flags);
 
-                if(ForceChecked && !outputFormat.SupportedMediaTags.Contains(mediaTag))
-                    continue;
+                    if(errno != ErrorNumber.NoError)
+                        continue;
 
-                errno = _inputFormat.ReadMediaTag(mediaTag, out byte[] tag);
-
-                if(errno == ErrorNumber.NoError &&
-                   outputFormat.WriteMediaTag(tag, mediaTag))
-                    continue;
-
-                if(ForceChecked)
-                {
-                    warning = true;
-
-                    if(errno == ErrorNumber.NoError)
-                        AaruConsole.ErrorWriteLine("Error {0} writing media tag, continuing...",
-                                                   outputFormat.ErrorMessage);
-                    else
-                        AaruConsole.ErrorWriteLine("Error {0} reading media tag, continuing...", errno);
-                }
-                else
-                {
-                    if(errno == ErrorNumber.NoError)
-                    {
-                        await Dispatcher.UIThread.InvokeAsync(action: async () =>
-                                                                  await MessageBoxManager.
-                                                                        GetMessageBoxStandardWindow("Error",
-                                                                            $"Error {outputFormat.ErrorMessage} writing media tag, not continuing...",
-                                                                            icon: Icon.Error).ShowDialog(_view));
-
-                        AaruConsole.ErrorWriteLine("Error {0} writing media tag, not continuing...",
-                                                   outputFormat.ErrorMessage);
-                    }
-                    else
-                    {
-                        await Dispatcher.UIThread.InvokeAsync(action: async () =>
-                                                                  await MessageBoxManager.
-                                                                        GetMessageBoxStandardWindow("Error",
-                                                                            $"Error {errno} reading media tag, not continuing...",
-                                                                            icon: Icon.Error).ShowDialog(_view));
-
-                        AaruConsole.ErrorWriteLine("Error {0} reading media tag, not continuing...", errno);
-                    }
-
-                    return;
+                    trackFlags[(byte)track.Sequence] = flags[0];
                 }
             }
 
-            ulong doneSectors = 0;
-
-            if(tracks == null &&
-               !_cancel)
+            for(ulong s = 0; s < _inputFormat.Info.Sectors; s++)
             {
-                await Dispatcher.UIThread.InvokeAsync(() =>
+                if(s > int.MaxValue)
+                    break;
+
+                subchannelExtents.Add((int)s);
+            }
+
+            foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.TakeWhile(tag => useLong && !_cancel))
+            {
+                switch(tag)
                 {
-                    ProgressText =
-                        $"Setting geometry to {_inputFormat.Info.Cylinders} cylinders, {_inputFormat.Info.Heads} heads and {_inputFormat.Info.SectorsPerTrack} sectors per track";
-
-                    ProgressValue++;
-                    Progress2Text          = "";
-                    Progress2Indeterminate = true;
-                });
-
-                if(!outputFormat.SetGeometry(_inputFormat.Info.Cylinders, _inputFormat.Info.Heads,
-                                             _inputFormat.Info.SectorsPerTrack))
-                {
-                    warning = true;
-
-                    AaruConsole.ErrorWriteLine("Error {0} setting geometry, image may be incorrect, continuing...",
-                                               outputFormat.ErrorMessage);
+                    case SectorTagType.AppleSectorTag:
+                    case SectorTagType.CdSectorSync:
+                    case SectorTagType.CdSectorHeader:
+                    case SectorTagType.CdSectorSubHeader:
+                    case SectorTagType.CdSectorEdc:
+                    case SectorTagType.CdSectorEccP:
+                    case SectorTagType.CdSectorEccQ:
+                    case SectorTagType.CdSectorEcc:
+                        // This tags are inline in long sector
+                        continue;
                 }
 
+                if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag))
+                    continue;
+
                 await Dispatcher.UIThread.InvokeAsync(() =>
                 {
-                    ProgressText = "Converting sectors";
+                    ProgressText = $"Converting tag {tag}";
                     ProgressValue++;
                     Progress2Text          = "";
                     Progress2Indeterminate = false;
                     Progress2MaxValue      = (int)(_inputFormat.Info.Sectors / SectorsValue);
                 });
 
+                doneSectors = 0;
+
                 while(doneSectors < _inputFormat.Info.Sectors)
                 {
                     if(_cancel)
@@ -953,21 +1152,37 @@ namespace Aaru.Gui.ViewModels.Windows
                     await Dispatcher.UIThread.InvokeAsync(() =>
                     {
                         Progress2Text =
-                            $"Converting sectors {sectors} to {sectors + sectorsToDo} ({sectors / (double)_inputFormat.Info.Sectors:P2} done)";
+                            $"Converting tag {sectors / (double)_inputFormat.Info.Sectors} for sectors {sectors} to {sectors + sectorsToDo} ({sectors / (double)_inputFormat.Info.Sectors:P2} done)";
 
                         Progress2Value = (int)(sectors / SectorsValue);
                     });
 
                     bool result;
 
-                    if(useLong)
+                    if(sectorsToDo == 1)
                     {
-                        errno = sectorsToDo == 1 ? _inputFormat.ReadSectorLong(doneSectors, out sector)
-                                    : _inputFormat.ReadSectorsLong(doneSectors, sectorsToDo, out sector);
+                        errno = _inputFormat.ReadSectorTag(doneSectors, tag, out sector);
 
                         if(errno == ErrorNumber.NoError)
-                            result = sectorsToDo == 1 ? outputFormat.WriteSectorLong(sector, doneSectors)
-                                         : outputFormat.WriteSectorsLong(sector, doneSectors, sectorsToDo);
+                        {
+                            Track track = tracks.LastOrDefault(t => t.StartSector >= doneSectors);
+
+                            if(tag   == SectorTagType.CdSectorSubchannel &&
+                               track != null)
+                            {
+                                bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
+                                    MmcSubchannel.Raw, sector, doneSectors, 1, null, isrcs,
+                                    (byte)track.Sequence, ref mcn, tracks.ToArray(), subchannelExtents, false,
+                                    outputFormat as IWritableOpticalImage, false, false, null, null, smallestPregapLbaPerTrack, false);
+
+                                if(indexesChanged)
+                                    outputOptical.SetTracks(tracks.ToList());
+
+                                result = true;
+                            }
+                            else
+                                result = outputFormat.WriteSectorTag(sector, doneSectors, tag);
+                        }
                         else
                         {
                             result = true;
@@ -996,12 +1211,29 @@ namespace Aaru.Gui.ViewModels.Windows
                     }
                     else
                     {
-                        errno = sectorsToDo == 1 ? _inputFormat.ReadSector(doneSectors, out sector)
-                                    : _inputFormat.ReadSectors(doneSectors, sectorsToDo, out sector);
+                        errno = _inputFormat.ReadSectorsTag(doneSectors, sectorsToDo, tag, out sector);
 
                         if(errno == ErrorNumber.NoError)
-                            result = sectorsToDo == 1 ? outputFormat.WriteSector(sector, doneSectors)
-                                         : outputFormat.WriteSectors(sector, doneSectors, sectorsToDo);
+                        {
+                            Track track = tracks.LastOrDefault(t => t.StartSector >= doneSectors);
+
+                            if(tag   == SectorTagType.CdSectorSubchannel &&
+                               track != null)
+
+                            {
+                                bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
+                                    MmcSubchannel.Raw, sector, doneSectors, sectorsToDo, null, isrcs,
+                                    (byte)track.Sequence, ref mcn, tracks.ToArray(), subchannelExtents, false,
+                                    outputFormat as IWritableOpticalImage, false, false, null, null, smallestPregapLbaPerTrack, false);
+
+                                if(indexesChanged)
+                                    outputOptical.SetTracks(tracks.ToList());
+
+                                result = true;
+                            }
+                            else
+                                result = outputFormat.WriteSectorsTag(sector, doneSectors, sectorsToDo, tag);
+                        }
                         else
                         {
                             result = true;
@@ -1042,7 +1274,8 @@ namespace Aaru.Gui.ViewModels.Windows
                             await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
                                                                       GetMessageBoxStandardWindow("Error",
                                                                           $"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
-                                                                          icon: Icon.Error).ShowDialog(_view));
+                                                                          icon: Icon.Error).
+                                                                      ShowDialog(_view));
 
                             AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, not continuing...",
                                                        outputFormat.ErrorMessage, doneSectors);
@@ -1056,283 +1289,267 @@ namespace Aaru.Gui.ViewModels.Windows
                 await Dispatcher.UIThread.InvokeAsync(() =>
                 {
                     Progress2Text =
-                        $"Converting sectors {_inputFormat.Info.Sectors} to {_inputFormat.Info.Sectors} ({1.0:P2} done)";
+                        $"Converting tag {tag} for sectors {_inputFormat.Info.Sectors} to {_inputFormat.Info.Sectors} ({1.0:P2} done)";
 
                     Progress2Value = Progress2MaxValue;
                 });
 
-                Dictionary<byte, string> isrcs                     = new();
-                Dictionary<byte, byte>   trackFlags                = new();
-                string                   mcn                       = null;
-                HashSet<int>             subchannelExtents         = new();
-                Dictionary<byte, int>    smallestPregapLbaPerTrack = new();
+                if(isrcs.Count > 0)
+                    foreach(KeyValuePair<byte, string> isrc in isrcs)
+                        outputOptical.WriteSectorTag(Encoding.UTF8.GetBytes(isrc.Value), isrc.Key,
+                                                     SectorTagType.CdTrackIsrc);
 
-                foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.
-                                                          Where(t => t == SectorTagType.CdTrackIsrc).OrderBy(t => t))
+                if(trackFlags.Count > 0)
+                    foreach(KeyValuePair<byte, byte> flags in trackFlags)
+                        outputOptical.WriteSectorTag(new[]
+                        {
+                            flags.Value
+                        }, flags.Key, SectorTagType.CdTrackFlags);
+
+                if(mcn != null)
+                    outputOptical.WriteMediaTag(Encoding.UTF8.GetBytes(mcn), MediaTagType.CD_MCN);
+            }
+        }
+        else
+        {
+            foreach(Track track in tracks.TakeWhile(track => !_cancel))
+            {
+                doneSectors = 0;
+                ulong trackSectors = track.EndSector - track.StartSector + 1;
+
+                await Dispatcher.UIThread.InvokeAsync(() =>
                 {
-                    foreach(Track track in inputOptical.Tracks)
-                    {
-                        errno = _inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] isrc);
+                    ProgressText = $"Converting sectors in track {track.Sequence}";
+                    ProgressValue++;
+                    Progress2Text          = "";
+                    Progress2Indeterminate = false;
+                    Progress2MaxValue      = (int)(trackSectors / SectorsValue);
+                });
 
-                        if(errno != ErrorNumber.NoError)
-                            continue;
-
-                        isrcs[(byte)track.Sequence] = Encoding.UTF8.GetString(isrc);
-                    }
-                }
-
-                foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.
-                                                          Where(t => t == SectorTagType.CdTrackFlags).OrderBy(t => t))
+                while(doneSectors < trackSectors)
                 {
-                    foreach(Track track in inputOptical.Tracks)
-                    {
-                        errno = _inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] flags);
-
-                        if(errno != ErrorNumber.NoError)
-                            continue;
-
-                        trackFlags[(byte)track.Sequence] = flags[0];
-                    }
-                }
-
-                for(ulong s = 0; s < _inputFormat.Info.Sectors; s++)
-                {
-                    if(s > int.MaxValue)
+                    if(_cancel)
                         break;
 
-                    subchannelExtents.Add((int)s);
-                }
+                    byte[] sector;
 
-                foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.TakeWhile(tag => useLong && !_cancel))
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.AppleSectorTag:
-                        case SectorTagType.CdSectorSync:
-                        case SectorTagType.CdSectorHeader:
-                        case SectorTagType.CdSectorSubHeader:
-                        case SectorTagType.CdSectorEdc:
-                        case SectorTagType.CdSectorEccP:
-                        case SectorTagType.CdSectorEccQ:
-                        case SectorTagType.CdSectorEcc:
-                            // This tags are inline in long sector
-                            continue;
-                    }
+                    uint sectorsToDo;
 
-                    if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag))
-                        continue;
+                    if(trackSectors - doneSectors >= (ulong)SectorsValue)
+                        sectorsToDo = (uint)SectorsValue;
+                    else
+                        sectorsToDo = (uint)(trackSectors - doneSectors);
+
+                    ulong sectors = doneSectors;
 
                     await Dispatcher.UIThread.InvokeAsync(() =>
                     {
-                        ProgressText = $"Converting tag {tag}";
-                        ProgressValue++;
-                        Progress2Text          = "";
-                        Progress2Indeterminate = false;
-                        Progress2MaxValue      = (int)(_inputFormat.Info.Sectors / SectorsValue);
+                        Progress2Text =
+                            $"Converting sectors {sectors + track.StartSector} to {sectors + sectorsToDo + track.StartSector} in track {track.Sequence} ({(sectors + track.StartSector) / (double)_inputFormat.Info.Sectors:P2} done)";
+
+                        Progress2Value = (int)(sectors / SectorsValue);
                     });
 
-                    doneSectors = 0;
+                    bool result;
 
-                    while(doneSectors < _inputFormat.Info.Sectors)
+                    if(useLong)
                     {
-                        if(_cancel)
-                            break;
+                        errno = sectorsToDo == 1
+                                    ? _inputFormat.ReadSectorLong(doneSectors + track.StartSector, out sector)
+                                    : _inputFormat.ReadSectorsLong(doneSectors + track.StartSector, sectorsToDo,
+                                                                   out sector);
 
-                        byte[] sector;
-
-                        uint sectorsToDo;
-
-                        if(_inputFormat.Info.Sectors - doneSectors >= (ulong)SectorsValue)
-                            sectorsToDo = (uint)SectorsValue;
-                        else
-                            sectorsToDo = (uint)(_inputFormat.Info.Sectors - doneSectors);
-
-                        ulong sectors = doneSectors;
-
-                        await Dispatcher.UIThread.InvokeAsync(() =>
-                        {
-                            Progress2Text =
-                                $"Converting tag {sectors / (double)_inputFormat.Info.Sectors} for sectors {sectors} to {sectors + sectorsToDo} ({sectors / (double)_inputFormat.Info.Sectors:P2} done)";
-
-                            Progress2Value = (int)(sectors / SectorsValue);
-                        });
-
-                        bool result;
-
-                        if(sectorsToDo == 1)
-                        {
-                            errno = _inputFormat.ReadSectorTag(doneSectors, tag, out sector);
-
-                            if(errno == ErrorNumber.NoError)
-                            {
-                                Track track = tracks.LastOrDefault(t => t.StartSector >= doneSectors);
-
-                                if(tag   == SectorTagType.CdSectorSubchannel &&
-                                   track != null)
-                                {
-                                    bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
-                                        MmcSubchannel.Raw, sector, doneSectors, 1, null, isrcs,
-                                        (byte)track.Sequence, ref mcn, tracks.ToArray(), subchannelExtents, false,
-                                        outputFormat as IWritableOpticalImage, false, false, null, null, smallestPregapLbaPerTrack, false);
-
-                                    if(indexesChanged)
-                                        outputOptical.SetTracks(tracks.ToList());
-
-                                    result = true;
-                                }
-                                else
-                                    result = outputFormat.WriteSectorTag(sector, doneSectors, tag);
-                            }
-                            else
-                            {
-                                result = true;
-
-                                if(ForceChecked)
-                                {
-                                    warning = true;
-
-                                    AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, continuing...", errno,
-                                                               doneSectors);
-                                }
-                                else
-                                {
-                                    await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                              GetMessageBoxStandardWindow("Error",
-                                                                                  $"Error {errno} reading sector {doneSectors}, not continuing...",
-                                                                                  icon: Icon.Error).
-                                                                              ShowDialog(_view));
-
-                                    AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, not continuing...", errno,
-                                                               doneSectors);
-
-                                    return;
-                                }
-                            }
-                        }
+                        if(errno == ErrorNumber.NoError)
+                            result = sectorsToDo == 1
+                                         ? outputFormat.WriteSectorLong(sector, doneSectors + track.StartSector)
+                                         : outputFormat.WriteSectorsLong(sector, doneSectors + track.StartSector,
+                                                                         sectorsToDo);
                         else
                         {
-                            errno = _inputFormat.ReadSectorsTag(doneSectors, sectorsToDo, tag, out sector);
+                            result = true;
 
-                            if(errno == ErrorNumber.NoError)
-                            {
-                                Track track = tracks.LastOrDefault(t => t.StartSector >= doneSectors);
-
-                                if(tag   == SectorTagType.CdSectorSubchannel &&
-                                   track != null)
-
-                                {
-                                    bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
-                                        MmcSubchannel.Raw, sector, doneSectors, sectorsToDo, null, isrcs,
-                                        (byte)track.Sequence, ref mcn, tracks.ToArray(), subchannelExtents, false,
-                                        outputFormat as IWritableOpticalImage, false, false, null, null, smallestPregapLbaPerTrack, false);
-
-                                    if(indexesChanged)
-                                        outputOptical.SetTracks(tracks.ToList());
-
-                                    result = true;
-                                }
-                                else
-                                    result = outputFormat.WriteSectorsTag(sector, doneSectors, sectorsToDo, tag);
-                            }
-                            else
-                            {
-                                result = true;
-
-                                if(ForceChecked)
-                                {
-                                    warning = true;
-
-                                    AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, continuing...", errno,
-                                                               doneSectors);
-                                }
-                                else
-                                {
-                                    await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                              GetMessageBoxStandardWindow("Error",
-                                                                                  $"Error {errno} reading sector {doneSectors}, not continuing...",
-                                                                                  icon: Icon.Error).
-                                                                              ShowDialog(_view));
-
-                                    AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, not continuing...", errno,
-                                                               doneSectors);
-
-                                    return;
-                                }
-                            }
-                        }
-
-                        if(!result)
                             if(ForceChecked)
                             {
                                 warning = true;
 
-                                AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, continuing...",
-                                                           outputFormat.ErrorMessage, doneSectors);
+                                AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, continuing...", errno,
+                                                           doneSectors);
                             }
                             else
                             {
                                 await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
                                                                           GetMessageBoxStandardWindow("Error",
-                                                                              $"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
+                                                                              $"Error {errno} reading sector {doneSectors}, not continuing...",
                                                                               icon: Icon.Error).
                                                                           ShowDialog(_view));
 
-                                AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, not continuing...",
-                                                           outputFormat.ErrorMessage, doneSectors);
+                                return;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        errno = sectorsToDo == 1
+                                    ? _inputFormat.ReadSector(doneSectors + track.StartSector, out sector)
+                                    : _inputFormat.ReadSectors(doneSectors + track.StartSector, sectorsToDo,
+                                                               out sector);
+
+                        if(errno == ErrorNumber.NoError)
+                            result = sectorsToDo == 1
+                                         ? outputFormat.WriteSector(sector, doneSectors + track.StartSector)
+                                         : outputFormat.WriteSectors(sector, doneSectors + track.StartSector,
+                                                                     sectorsToDo);
+                        else
+                        {
+                            result = true;
+
+                            if(ForceChecked)
+                            {
+                                warning = true;
+
+                                AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, continuing...", errno,
+                                                           doneSectors);
+                            }
+                            else
+                            {
+                                await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                          GetMessageBoxStandardWindow("Error",
+                                                                              $"Error {errno} reading sector {doneSectors}, not continuing...",
+                                                                              icon: Icon.Error).
+                                                                          ShowDialog(_view));
 
                                 return;
                             }
-
-                        doneSectors += sectorsToDo;
+                        }
                     }
 
-                    await Dispatcher.UIThread.InvokeAsync(() =>
-                    {
-                        Progress2Text =
-                            $"Converting tag {tag} for sectors {_inputFormat.Info.Sectors} to {_inputFormat.Info.Sectors} ({1.0:P2} done)";
+                    if(!result)
+                        if(ForceChecked)
+                        {
+                            warning = true;
 
-                        Progress2Value = Progress2MaxValue;
-                    });
+                            AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, continuing...",
+                                                       outputFormat.ErrorMessage, doneSectors);
+                        }
+                        else
+                        {
+                            await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                      GetMessageBoxStandardWindow("Error",
+                                                                          $"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
+                                                                          icon: Icon.Error).
+                                                                      ShowDialog(_view));
 
-                    if(isrcs.Count > 0)
-                        foreach(KeyValuePair<byte, string> isrc in isrcs)
-                            outputOptical.WriteSectorTag(Encoding.UTF8.GetBytes(isrc.Value), isrc.Key,
-                                                         SectorTagType.CdTrackIsrc);
+                            return;
+                        }
 
-                    if(trackFlags.Count > 0)
-                        foreach(KeyValuePair<byte, byte> flags in trackFlags)
-                            outputOptical.WriteSectorTag(new[]
-                            {
-                                flags.Value
-                            }, flags.Key, SectorTagType.CdTrackFlags);
-
-                    if(mcn != null)
-                        outputOptical.WriteMediaTag(Encoding.UTF8.GetBytes(mcn), MediaTagType.CD_MCN);
+                    doneSectors += sectorsToDo;
                 }
             }
-            else
+
+            await Dispatcher.UIThread.InvokeAsync(() =>
             {
+                Progress2Text =
+                    $"Converting sectors {_inputFormat.Info.Sectors} to {_inputFormat.Info.Sectors} in track {tracks.Count} ({1.0:P2} done)";
+
+                Progress2Value = Progress2MaxValue;
+            });
+
+            foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.OrderBy(t => t).
+                                                      TakeWhile(tag => useLong && !_cancel))
+            {
+                switch(tag)
+                {
+                    case SectorTagType.AppleSectorTag:
+                    case SectorTagType.CdSectorSync:
+                    case SectorTagType.CdSectorHeader:
+                    case SectorTagType.CdSectorSubHeader:
+                    case SectorTagType.CdSectorEdc:
+                    case SectorTagType.CdSectorEccP:
+                    case SectorTagType.CdSectorEccQ:
+                    case SectorTagType.CdSectorEcc:
+                        // This tags are inline in long sector
+                        continue;
+                }
+
+                if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag))
+                    continue;
+
                 foreach(Track track in tracks.TakeWhile(track => !_cancel))
                 {
                     doneSectors = 0;
-                    ulong trackSectors = track.EndSector - track.StartSector + 1;
+                    ulong  trackSectors = track.EndSector - track.StartSector + 1;
+                    byte[] sector;
+                    bool   result;
 
                     await Dispatcher.UIThread.InvokeAsync(() =>
                     {
-                        ProgressText = $"Converting sectors in track {track.Sequence}";
+                        ProgressText = $"Converting tag {tag} in track {track.Sequence}.";
                         ProgressValue++;
                         Progress2Text          = "";
                         Progress2Indeterminate = false;
                         Progress2MaxValue      = (int)(trackSectors / SectorsValue);
                     });
 
+                    switch(tag)
+                    {
+                        case SectorTagType.CdTrackFlags:
+                        case SectorTagType.CdTrackIsrc:
+
+                            errno = _inputFormat.ReadSectorTag(track.Sequence, tag, out sector);
+
+                            if(errno == ErrorNumber.NoError)
+                                result = outputFormat.WriteSectorTag(sector, track.Sequence, tag);
+                            else
+                            {
+                                if(ForceChecked)
+                                {
+                                    warning = true;
+
+                                    AaruConsole.ErrorWriteLine("Error {0} reading tag, continuing...", errno);
+                                }
+                                else
+                                {
+                                    await Dispatcher.UIThread.InvokeAsync(action: async () =>
+                                                                              await MessageBoxManager.
+                                                                                  GetMessageBoxStandardWindow("Error",
+                                                                                      $"Error {errno} reading tag, not continuing...",
+                                                                                      icon: Icon.Error).
+                                                                                  ShowDialog(_view));
+
+                                    return;
+                                }
+
+                                continue;
+                            }
+
+                            if(!result)
+                                if(ForceChecked)
+                                {
+                                    warning = true;
+
+                                    AaruConsole.ErrorWriteLine("Error {0} writing tag, continuing...",
+                                                               outputFormat.ErrorMessage);
+                                }
+                                else
+                                {
+                                    await Dispatcher.UIThread.InvokeAsync(action: async () =>
+                                                                              await MessageBoxManager.
+                                                                                  GetMessageBoxStandardWindow("Error",
+                                                                                      $"Error {outputFormat.ErrorMessage} writing tag, not continuing...",
+                                                                                      icon: Icon.Error).
+                                                                                  ShowDialog(_view));
+
+                                    return;
+                                }
+
+                            continue;
+                    }
+
                     while(doneSectors < trackSectors)
                     {
                         if(_cancel)
                             break;
 
-                        byte[] sector;
-
                         uint sectorsToDo;
 
                         if(trackSectors - doneSectors >= (ulong)SectorsValue)
@@ -1345,81 +1562,43 @@ namespace Aaru.Gui.ViewModels.Windows
                         await Dispatcher.UIThread.InvokeAsync(() =>
                         {
                             Progress2Text =
-                                $"Converting sectors {sectors + track.StartSector} to {sectors + sectorsToDo + track.StartSector} in track {track.Sequence} ({(sectors + track.StartSector) / (double)_inputFormat.Info.Sectors:P2} done)";
+                                $"Converting tag {tag} for sectors {sectors + track.StartSector} to {sectors + sectorsToDo + track.StartSector} in track {track.Sequence} ({(sectors + track.StartSector) / (double)_inputFormat.Info.Sectors:P2} done)";
 
                             Progress2Value = (int)(sectors / SectorsValue);
                         });
 
-                        bool result;
+                        errno = sectorsToDo == 1
+                                    ? _inputFormat.ReadSectorTag(doneSectors + track.StartSector, tag, out sector)
+                                    : _inputFormat.ReadSectorsTag(doneSectors + track.StartSector, sectorsToDo, tag,
+                                                                  out sector);
 
-                        if(useLong)
+                        if(errno == ErrorNumber.NoError)
                         {
-                            errno = sectorsToDo == 1
-                                        ? _inputFormat.ReadSectorLong(doneSectors + track.StartSector, out sector)
-                                        : _inputFormat.ReadSectorsLong(doneSectors + track.StartSector, sectorsToDo,
-                                                                       out sector);
-
-                            if(errno == ErrorNumber.NoError)
-                                result = sectorsToDo == 1
-                                             ? outputFormat.WriteSectorLong(sector, doneSectors + track.StartSector)
-                                             : outputFormat.WriteSectorsLong(sector, doneSectors + track.StartSector,
-                                                                             sectorsToDo);
-                            else
-                            {
-                                result = true;
-
-                                if(ForceChecked)
-                                {
-                                    warning = true;
-
-                                    AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, continuing...", errno,
-                                                               doneSectors);
-                                }
-                                else
-                                {
-                                    await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                              GetMessageBoxStandardWindow("Error",
-                                                                                  $"Error {errno} reading sector {doneSectors}, not continuing...",
-                                                                                  icon: Icon.Error).
-                                                                              ShowDialog(_view));
-
-                                    return;
-                                }
-                            }
+                            result = sectorsToDo == 1
+                                         ? outputFormat.WriteSectorTag(sector, doneSectors + track.StartSector, tag)
+                                         : outputFormat.WriteSectorsTag(sector, doneSectors + track.StartSector,
+                                                                        sectorsToDo, tag);
                         }
                         else
                         {
-                            errno = sectorsToDo == 1
-                                        ? _inputFormat.ReadSector(doneSectors + track.StartSector, out sector)
-                                        : _inputFormat.ReadSectors(doneSectors + track.StartSector, sectorsToDo,
-                                                                   out sector);
+                            result = true;
 
-                            if(errno == ErrorNumber.NoError)
-                                result = sectorsToDo == 1
-                                             ? outputFormat.WriteSector(sector, doneSectors + track.StartSector)
-                                             : outputFormat.WriteSectors(sector, doneSectors + track.StartSector,
-                                                                         sectorsToDo);
+                            if(ForceChecked)
+                            {
+                                warning = true;
+
+                                AaruConsole.ErrorWriteLine("Error {0} reading tag for sector {1}, continuing...",
+                                                           errno, doneSectors);
+                            }
                             else
                             {
-                                result = true;
+                                await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                          GetMessageBoxStandardWindow("Error",
+                                                                              $"Error {errno} reading tag for sector {doneSectors}, not continuing...",
+                                                                              icon: Icon.Error).
+                                                                          ShowDialog(_view));
 
-                                if(ForceChecked)
-                                {
-                                    warning = true;
-
-                                    AaruConsole.ErrorWriteLine("Error {0} reading sector {1}, continuing...", errno,
-                                                               doneSectors);
-                                }
-                                else
-                                {
-                                    await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                              GetMessageBoxStandardWindow("Error",
-                                                                                  $"Error {errno} reading sector {doneSectors}, not continuing...",
-                                                                                  icon: Icon.Error).
-                                                                              ShowDialog(_view));
-
-                                    return;
-                                }
+                                return;
                             }
                         }
 
@@ -1428,14 +1607,14 @@ namespace Aaru.Gui.ViewModels.Windows
                             {
                                 warning = true;
 
-                                AaruConsole.ErrorWriteLine("Error {0} writing sector {1}, continuing...",
+                                AaruConsole.ErrorWriteLine("Error {0} writing tag for sector {1}, continuing...",
                                                            outputFormat.ErrorMessage, doneSectors);
                             }
                             else
                             {
                                 await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
                                                                           GetMessageBoxStandardWindow("Error",
-                                                                              $"Error {outputFormat.ErrorMessage} writing sector {doneSectors}, not continuing...",
+                                                                              $"Error {outputFormat.ErrorMessage} writing tag for sector {doneSectors}, not continuing...",
                                                                               icon: Icon.Error).
                                                                           ShowDialog(_view));
 
@@ -1445,587 +1624,407 @@ namespace Aaru.Gui.ViewModels.Windows
                         doneSectors += sectorsToDo;
                     }
                 }
-
-                await Dispatcher.UIThread.InvokeAsync(() =>
-                {
-                    Progress2Text =
-                        $"Converting sectors {_inputFormat.Info.Sectors} to {_inputFormat.Info.Sectors} in track {tracks.Count} ({1.0:P2} done)";
-
-                    Progress2Value = Progress2MaxValue;
-                });
-
-                foreach(SectorTagType tag in _inputFormat.Info.ReadableSectorTags.OrderBy(t => t).
-                                                          TakeWhile(tag => useLong && !_cancel))
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.AppleSectorTag:
-                        case SectorTagType.CdSectorSync:
-                        case SectorTagType.CdSectorHeader:
-                        case SectorTagType.CdSectorSubHeader:
-                        case SectorTagType.CdSectorEdc:
-                        case SectorTagType.CdSectorEccP:
-                        case SectorTagType.CdSectorEccQ:
-                        case SectorTagType.CdSectorEcc:
-                            // This tags are inline in long sector
-                            continue;
-                    }
-
-                    if(ForceChecked && !outputFormat.SupportedSectorTags.Contains(tag))
-                        continue;
-
-                    foreach(Track track in tracks.TakeWhile(track => !_cancel))
-                    {
-                        doneSectors = 0;
-                        ulong  trackSectors = track.EndSector - track.StartSector + 1;
-                        byte[] sector;
-                        bool   result;
-
-                        await Dispatcher.UIThread.InvokeAsync(() =>
-                        {
-                            ProgressText = $"Converting tag {tag} in track {track.Sequence}.";
-                            ProgressValue++;
-                            Progress2Text          = "";
-                            Progress2Indeterminate = false;
-                            Progress2MaxValue      = (int)(trackSectors / SectorsValue);
-                        });
-
-                        switch(tag)
-                        {
-                            case SectorTagType.CdTrackFlags:
-                            case SectorTagType.CdTrackIsrc:
-
-                                errno = _inputFormat.ReadSectorTag(track.Sequence, tag, out sector);
-
-                                if(errno == ErrorNumber.NoError)
-                                    result = outputFormat.WriteSectorTag(sector, track.Sequence, tag);
-                                else
-                                {
-                                    if(ForceChecked)
-                                    {
-                                        warning = true;
-
-                                        AaruConsole.ErrorWriteLine("Error {0} reading tag, continuing...", errno);
-                                    }
-                                    else
-                                    {
-                                        await Dispatcher.UIThread.InvokeAsync(action: async () =>
-                                                                                  await MessageBoxManager.
-                                                                                      GetMessageBoxStandardWindow("Error",
-                                                                                          $"Error {errno} reading tag, not continuing...",
-                                                                                          icon: Icon.Error).
-                                                                                      ShowDialog(_view));
-
-                                        return;
-                                    }
-
-                                    continue;
-                                }
-
-                                if(!result)
-                                    if(ForceChecked)
-                                    {
-                                        warning = true;
-
-                                        AaruConsole.ErrorWriteLine("Error {0} writing tag, continuing...",
-                                                                   outputFormat.ErrorMessage);
-                                    }
-                                    else
-                                    {
-                                        await Dispatcher.UIThread.InvokeAsync(action: async () =>
-                                                                                  await MessageBoxManager.
-                                                                                      GetMessageBoxStandardWindow("Error",
-                                                                                          $"Error {outputFormat.ErrorMessage} writing tag, not continuing...",
-                                                                                          icon: Icon.Error).
-                                                                                      ShowDialog(_view));
-
-                                        return;
-                                    }
-
-                                continue;
-                        }
-
-                        while(doneSectors < trackSectors)
-                        {
-                            if(_cancel)
-                                break;
-
-                            uint sectorsToDo;
-
-                            if(trackSectors - doneSectors >= (ulong)SectorsValue)
-                                sectorsToDo = (uint)SectorsValue;
-                            else
-                                sectorsToDo = (uint)(trackSectors - doneSectors);
-
-                            ulong sectors = doneSectors;
-
-                            await Dispatcher.UIThread.InvokeAsync(() =>
-                            {
-                                Progress2Text =
-                                    $"Converting tag {tag} for sectors {sectors + track.StartSector} to {sectors + sectorsToDo + track.StartSector} in track {track.Sequence} ({(sectors + track.StartSector) / (double)_inputFormat.Info.Sectors:P2} done)";
-
-                                Progress2Value = (int)(sectors / SectorsValue);
-                            });
-
-                            errno = sectorsToDo == 1
-                                        ? _inputFormat.ReadSectorTag(doneSectors + track.StartSector, tag, out sector)
-                                        : _inputFormat.ReadSectorsTag(doneSectors + track.StartSector, sectorsToDo, tag,
-                                                                      out sector);
-
-                            if(errno == ErrorNumber.NoError)
-                            {
-                                result = sectorsToDo == 1
-                                             ? outputFormat.WriteSectorTag(sector, doneSectors + track.StartSector, tag)
-                                             : outputFormat.WriteSectorsTag(sector, doneSectors + track.StartSector,
-                                                                            sectorsToDo, tag);
-                            }
-                            else
-                            {
-                                result = true;
-
-                                if(ForceChecked)
-                                {
-                                    warning = true;
-
-                                    AaruConsole.ErrorWriteLine("Error {0} reading tag for sector {1}, continuing...",
-                                                               errno, doneSectors);
-                                }
-                                else
-                                {
-                                    await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                              GetMessageBoxStandardWindow("Error",
-                                                                                  $"Error {errno} reading tag for sector {doneSectors}, not continuing...",
-                                                                                  icon: Icon.Error).
-                                                                              ShowDialog(_view));
-
-                                    return;
-                                }
-                            }
-
-                            if(!result)
-                                if(ForceChecked)
-                                {
-                                    warning = true;
-
-                                    AaruConsole.ErrorWriteLine("Error {0} writing tag for sector {1}, continuing...",
-                                                               outputFormat.ErrorMessage, doneSectors);
-                                }
-                                else
-                                {
-                                    await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                              GetMessageBoxStandardWindow("Error",
-                                                                                  $"Error {outputFormat.ErrorMessage} writing tag for sector {doneSectors}, not continuing...",
-                                                                                  icon: Icon.Error).
-                                                                              ShowDialog(_view));
-
-                                    return;
-                                }
-
-                            doneSectors += sectorsToDo;
-                        }
-                    }
-                }
             }
+        }
 
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            Progress2Visible = false;
+            Progress2Visible = false;
+        });
+
+        bool ret;
+
+        if(_dumpHardware != null &&
+           !_cancel)
+        {
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
-                Progress2Visible = false;
-                Progress2Visible = false;
+                ProgressText = "Writing dump hardware list to output image.";
+                ProgressValue++;
             });
 
-            bool ret;
+            ret = outputFormat.SetDumpHardware(_dumpHardware);
 
-            if(_dumpHardware != null &&
-               !_cancel)
-            {
-                await Dispatcher.UIThread.InvokeAsync(() =>
-                {
-                    ProgressText = "Writing dump hardware list to output image.";
-                    ProgressValue++;
-                });
+            if(!ret)
+                AaruConsole.WriteLine("Error {0} writing dump hardware list to output image.",
+                                      outputFormat.ErrorMessage);
+        }
 
-                ret = outputFormat.SetDumpHardware(_dumpHardware);
-
-                if(!ret)
-                    AaruConsole.WriteLine("Error {0} writing dump hardware list to output image.",
-                                          outputFormat.ErrorMessage);
-            }
-
-            ret = false;
-
-            if(_cicmMetadata != null &&
-               !_cancel)
-            {
-                await Dispatcher.UIThread.InvokeAsync(() =>
-                {
-                    ProgressText = "Writing CICM XML metadata to output image.";
-                    ProgressValue++;
-                });
-
-                outputFormat.SetCicmMetadata(_cicmMetadata);
-
-                if(!ret)
-                    AaruConsole.WriteLine("Error {0} writing CICM XML metadata to output image.",
-                                          outputFormat.ErrorMessage);
-            }
+        ret = false;
 
+        if(_cicmMetadata != null &&
+           !_cancel)
+        {
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
-                ProgressText          = "Closing output image.";
-                ProgressIndeterminate = true;
+                ProgressText = "Writing CICM XML metadata to output image.";
+                ProgressValue++;
             });
 
-            if(_cancel)
-            {
-                await Dispatcher.UIThread.InvokeAsync(action: async () =>
-                {
-                    await MessageBoxManager.
-                          GetMessageBoxStandardWindow("Error", "Operation canceled, the output file is not correct.",
-                                                      icon: Icon.Error).ShowDialog(_view);
+            outputFormat.SetCicmMetadata(_cicmMetadata);
 
-                    CloseVisible    = true;
-                    StopVisible     = false;
-                    ProgressVisible = false;
-                });
+            if(!ret)
+                AaruConsole.WriteLine("Error {0} writing CICM XML metadata to output image.",
+                                      outputFormat.ErrorMessage);
+        }
 
-                return;
-            }
-
-            if(!outputFormat.Close())
-            {
-                await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
-                                                                              GetMessageBoxStandardWindow("Error",
-                                                                                  $"Error {outputFormat.ErrorMessage} closing output image... Contents are not correct.",
-                                                                                  icon: Icon.Error).
-                                                                              ShowDialog(_view));
-
-                return;
-            }
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            ProgressText          = "Closing output image.";
+            ProgressIndeterminate = true;
+        });
 
+        if(_cancel)
+        {
             await Dispatcher.UIThread.InvokeAsync(action: async () =>
             {
-                await MessageBoxManager.GetMessageBoxStandardWindow(warning ? "Warning" : "Conversion success",
-                                                                    warning
-                                                                        ? "Some warnings happened. Check console for more information. Image should be correct."
-                                                                        : "Image converted successfully.",
-                                                                    icon: warning ? Icon.Warning : Icon.Info).
-                                        ShowDialog(_view);
+                await MessageBoxManager.
+                      GetMessageBoxStandardWindow("Error", "Operation canceled, the output file is not correct.",
+                                                  icon: Icon.Error).ShowDialog(_view);
 
                 CloseVisible    = true;
                 StopVisible     = false;
                 ProgressVisible = false;
             });
 
-            Statistics.AddCommand("convert-image");
+            return;
         }
 
-        void ExecuteCloseCommand() => _view.Close();
-
-        internal void ExecuteStopCommand()
+        if(!outputFormat.Close())
         {
-            _cancel     = true;
-            StopEnabled = false;
+            await Dispatcher.UIThread.InvokeAsync(action: async () => await MessageBoxManager.
+                                                                            GetMessageBoxStandardWindow("Error",
+                                                                                $"Error {outputFormat.ErrorMessage} closing output image... Contents are not correct.",
+                                                                                icon: Icon.Error).
+                                                                            ShowDialog(_view));
+
+            return;
         }
 
-        /* TODO
-                void OnCmbFormatSelectedIndexChanged()
+        await Dispatcher.UIThread.InvokeAsync(action: async () =>
+        {
+            await MessageBoxManager.GetMessageBoxStandardWindow(warning ? "Warning" : "Conversion success",
+                                                                warning
+                                                                    ? "Some warnings happened. Check console for more information. Image should be correct."
+                                                                    : "Image converted successfully.",
+                                                                icon: warning ? Icon.Warning : Icon.Info).
+                                    ShowDialog(_view);
+
+            CloseVisible    = true;
+            StopVisible     = false;
+            ProgressVisible = false;
+        });
+
+        Statistics.AddCommand("convert-image");
+    }
+
+    void ExecuteCloseCommand() => _view.Close();
+
+    internal void ExecuteStopCommand()
+    {
+        _cancel     = true;
+        StopEnabled = false;
+    }
+
+    /* TODO
+            void OnCmbFormatSelectedIndexChanged()
+            {
+                txtDestination.Text = "";
+
+                if(!(cmbFormat.SelectedValue is IWritableImage plugin))
                 {
-                    txtDestination.Text = "";
+                    grpOptions.Visible     = false;
+                    btnDestination.Enabled = false;
 
-                    if(!(cmbFormat.SelectedValue is IWritableImage plugin))
-                    {
-                        grpOptions.Visible     = false;
-                        btnDestination.Enabled = false;
-
-                        return;
-                    }
-
-                    btnDestination.Enabled = true;
-
-                    if(!plugin.SupportedOptions.Any())
-                    {
-                        grpOptions.Content = null;
-                        grpOptions.Visible = false;
-
-                        return;
-                    }
-
-                    chkForce.Visible = false;
-
-                    foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags)
-                    {
-                        if(plugin.SupportedMediaTags.Contains(mediaTag))
-                            continue;
-
-                        chkForce.Visible = true;
-                        ForceChecked = true;
-
-                        break;
-                    }
-
-                    foreach(SectorTagType sectorTag in inputFormat.Info.ReadableSectorTags)
-                    {
-                        if(plugin.SupportedSectorTags.Contains(sectorTag))
-                            continue;
-
-                        chkForce.Visible = true;
-                        ForceChecked = true;
-
-                        break;
-                    }
-
-                    grpOptions.Visible = true;
-
-                    var stkImageOptions = new StackLayout
-                    {
-                        Orientation = Orientation.Vertical
-                    };
-
-                    foreach((string name, Type type, string description, object @default) option in plugin.SupportedOptions)
-                        switch(option.type.ToString())
-                        {
-                            case "System.Boolean":
-                                var optBoolean = new CheckBox();
-                                optBoolean.ID      = "opt" + option.name;
-                                optBoolean.Text    = option.description;
-                                optBooleanChecked = (bool)option.@default;
-                                stkImageOptions.Items.Add(optBoolean);
-
-                                break;
-                            case "System.SByte":
-                            case "System.Int16":
-                            case "System.Int32":
-                            case "System.Int64":
-                                var stkNumber = new StackLayout();
-                                stkNumber.Orientation = Orientation.Horizontal;
-                                var optNumber = new NumericStepper();
-                                optNumber.ID    = "opt" + option.name;
-                                optNumber.Value = Convert.ToDouble(option.@default);
-                                stkNumber.Items.Add(optNumber);
-                                var lblNumber = new Label();
-                                lblNumber.Text = option.description;
-                                stkNumber.Items.Add(lblNumber);
-                                stkImageOptions.Items.Add(stkNumber);
-
-                                break;
-                            case "System.Byte":
-                            case "System.UInt16":
-                            case "System.UInt32":
-                            case "System.UInt64":
-                                var stkUnsigned = new StackLayout();
-                                stkUnsigned.Orientation = Orientation.Horizontal;
-                                var optUnsigned = new NumericStepper();
-                                optUnsigned.ID       = "opt" + option.name;
-                                optUnsigned.MinValue = 0;
-                                optUnsigned.Value    = Convert.ToDouble(option.@default);
-                                stkUnsigned.Items.Add(optUnsigned);
-                                var lblUnsigned = new Label();
-                                lblUnsigned.Text = option.description;
-                                stkUnsigned.Items.Add(lblUnsigned);
-                                stkImageOptions.Items.Add(stkUnsigned);
-
-                                break;
-                            case "System.Single":
-                            case "System.Double":
-                                var stkFloat = new StackLayout();
-                                stkFloat.Orientation = Orientation.Horizontal;
-                                var optFloat = new NumericStepper();
-                                optFloat.ID            = "opt" + option.name;
-                                optFloat.DecimalPlaces = 2;
-                                optFloat.Value         = Convert.ToDouble(option.@default);
-                                stkFloat.Items.Add(optFloat);
-                                var lblFloat = new Label();
-                                lblFloat.Text = option.description;
-                                stkFloat.Items.Add(lblFloat);
-                                stkImageOptions.Items.Add(stkFloat);
-
-                                break;
-                            case "System.Guid":
-                                // TODO
-                                break;
-                            case "System.String":
-                                var stkString = new StackLayout();
-                                stkString.Orientation = Orientation.Horizontal;
-                                var lblString = new Label();
-                                lblString.Text = option.description;
-                                stkString.Items.Add(lblString);
-                                var optString = new TextBox();
-                                optString.ID   = "opt" + option.name;
-                                optString.Text = (string)option.@default;
-                                stkString.Items.Add(optString);
-                                stkImageOptions.Items.Add(stkString);
-
-                                break;
-                        }
-
-                    grpOptions.Content = stkImageOptions;
+                    return;
                 }
-        */
-        async void ExecuteDestinationCommand()
-        {
-            if(SelectedPlugin is null)
-                return;
 
-            var dlgDestination = new SaveFileDialog
-            {
-                Title = "Choose destination file"
-            };
+                btnDestination.Enabled = true;
 
-            dlgDestination.Filters.Add(new FileDialogFilter
-            {
-                Name       = SelectedPlugin.Plugin.Name,
-                Extensions = SelectedPlugin.Plugin.KnownExtensions.ToList()
-            });
-
-            string result = await dlgDestination.ShowAsync(_view);
-
-            if(result is null ||
-               result.Length != 1)
-            {
-                DestinationText = "";
-
-                return;
-            }
-
-            if(string.IsNullOrEmpty(Path.GetExtension(result)))
-                result += SelectedPlugin.Plugin.KnownExtensions.First();
-
-            DestinationText = result;
-        }
-
-        void ExecuteCreatorCommand() => CreatorText = _inputFormat.Info.Creator;
-
-        void ExecuteMediaTitleCommand() => MediaTitleText = _inputFormat.Info.MediaTitle;
-
-        void ExecuteCommentsCommand() => CommentsText = _inputFormat.Info.Comments;
-
-        void ExecuteMediaManufacturerCommand() => MediaManufacturerText = _inputFormat.Info.MediaManufacturer;
-
-        void ExecuteMediaModelCommand() => MediaModelText = _inputFormat.Info.MediaModel;
-
-        void ExecuteMediaSerialNumberCommand() => MediaSerialNumberText = _inputFormat.Info.MediaSerialNumber;
-
-        void ExecuteMediaBarcodeCommand() => MediaBarcodeText = _inputFormat.Info.MediaBarcode;
-
-        void ExecuteMediaPartNumberCommand() => MediaPartNumberText = _inputFormat.Info.MediaPartNumber;
-
-        void ExecuteMediaSequenceCommand() => MediaSequenceValue = _inputFormat.Info.MediaSequence;
-
-        void ExecuteLastMediaSequenceCommand() => LastMediaSequenceValue = _inputFormat.Info.LastMediaSequence;
-
-        void ExecuteDriveManufacturerCommand() => DriveManufacturerText = _inputFormat.Info.DriveManufacturer;
-
-        void ExecuteDriveModelCommand() => DriveModelText = _inputFormat.Info.DriveModel;
-
-        void ExecuteDriveSerialNumberCommand() => DriveSerialNumberText = _inputFormat.Info.DriveSerialNumber;
-
-        void ExecuteDriveFirmwareRevisionCommand() =>
-            DriveFirmwareRevisionText = _inputFormat.Info.DriveFirmwareRevision;
-
-        void ExecuteCicmXmlFromImageCommand()
-        {
-            CicmXmlText   = "<From image>";
-            _cicmMetadata = _inputFormat.CicmMetadata;
-        }
-
-        async void ExecuteCicmXmlCommand()
-        {
-            _cicmMetadata = null;
-            CicmXmlText   = "";
-
-            var dlgMetadata = new OpenFileDialog
-            {
-                Title = "Choose existing metadata sidecar"
-            };
-
-            dlgMetadata.Filters.Add(new FileDialogFilter
-            {
-                Name = "CICM XML metadata",
-                Extensions = new List<string>(new[]
+                if(!plugin.SupportedOptions.Any())
                 {
-                    ".xml"
-                })
-            });
+                    grpOptions.Content = null;
+                    grpOptions.Visible = false;
 
-            string[] result = await dlgMetadata.ShowAsync(_view);
-
-            if(result is null ||
-               result.Length != 1)
-                return;
-
-            var sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
-
-            try
-            {
-                var sr = new StreamReader(result[0]);
-                _cicmMetadata = (CICMMetadataType)sidecarXs.Deserialize(sr);
-                sr.Close();
-                CicmXmlText = result[0];
-            }
-            catch
-            {
-                await MessageBoxManager.GetMessageBoxStandardWindow("Error", "Incorrect metadata sidecar file...",
-                                                                    icon: Icon.Error).ShowDialog(_view);
-            }
-        }
-
-        void ExecuteResumeFileFromImageCommand()
-        {
-            ResumeFileText = "<From image>";
-            _dumpHardware  = _inputFormat.DumpHardware;
-        }
-
-        async void ExecuteResumeFileCommand()
-        {
-            _dumpHardware  = null;
-            ResumeFileText = "";
-
-            var dlgMetadata = new OpenFileDialog
-            {
-                Title = "Choose existing resume file"
-            };
-
-            dlgMetadata.Filters.Add(new FileDialogFilter
-            {
-                Name = "CICM XML metadata",
-                Extensions = new List<string>(new[]
-                {
-                    ".xml"
-                })
-            });
-
-            string[] result = await dlgMetadata.ShowAsync(_view);
-
-            if(result is null ||
-               result.Length != 1)
-                return;
-
-            var sidecarXs = new XmlSerializer(typeof(Resume));
-
-            try
-            {
-                var sr     = new StreamReader(result[0]);
-                var resume = (Resume)sidecarXs.Deserialize(sr);
-
-                if(resume.Tries?.Any() == false)
-                {
-                    _dumpHardware  = resume.Tries;
-                    ResumeFileText = result[0];
+                    return;
                 }
-                else
-                    await MessageBoxManager.
-                          GetMessageBoxStandardWindow("Error",
-                                                      "Resume file does not contain dump hardware information...",
-                                                      icon: Icon.Error).ShowDialog(_view);
 
-                sr.Close();
+                chkForce.Visible = false;
+
+                foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags)
+                {
+                    if(plugin.SupportedMediaTags.Contains(mediaTag))
+                        continue;
+
+                    chkForce.Visible = true;
+                    ForceChecked = true;
+
+                    break;
+                }
+
+                foreach(SectorTagType sectorTag in inputFormat.Info.ReadableSectorTags)
+                {
+                    if(plugin.SupportedSectorTags.Contains(sectorTag))
+                        continue;
+
+                    chkForce.Visible = true;
+                    ForceChecked = true;
+
+                    break;
+                }
+
+                grpOptions.Visible = true;
+
+                var stkImageOptions = new StackLayout
+                {
+                    Orientation = Orientation.Vertical
+                };
+
+                foreach((string name, Type type, string description, object @default) option in plugin.SupportedOptions)
+                    switch(option.type.ToString())
+                    {
+                        case "System.Boolean":
+                            var optBoolean = new CheckBox();
+                            optBoolean.ID      = "opt" + option.name;
+                            optBoolean.Text    = option.description;
+                            optBooleanChecked = (bool)option.@default;
+                            stkImageOptions.Items.Add(optBoolean);
+
+                            break;
+                        case "System.SByte":
+                        case "System.Int16":
+                        case "System.Int32":
+                        case "System.Int64":
+                            var stkNumber = new StackLayout();
+                            stkNumber.Orientation = Orientation.Horizontal;
+                            var optNumber = new NumericStepper();
+                            optNumber.ID    = "opt" + option.name;
+                            optNumber.Value = Convert.ToDouble(option.@default);
+                            stkNumber.Items.Add(optNumber);
+                            var lblNumber = new Label();
+                            lblNumber.Text = option.description;
+                            stkNumber.Items.Add(lblNumber);
+                            stkImageOptions.Items.Add(stkNumber);
+
+                            break;
+                        case "System.Byte":
+                        case "System.UInt16":
+                        case "System.UInt32":
+                        case "System.UInt64":
+                            var stkUnsigned = new StackLayout();
+                            stkUnsigned.Orientation = Orientation.Horizontal;
+                            var optUnsigned = new NumericStepper();
+                            optUnsigned.ID       = "opt" + option.name;
+                            optUnsigned.MinValue = 0;
+                            optUnsigned.Value    = Convert.ToDouble(option.@default);
+                            stkUnsigned.Items.Add(optUnsigned);
+                            var lblUnsigned = new Label();
+                            lblUnsigned.Text = option.description;
+                            stkUnsigned.Items.Add(lblUnsigned);
+                            stkImageOptions.Items.Add(stkUnsigned);
+
+                            break;
+                        case "System.Single":
+                        case "System.Double":
+                            var stkFloat = new StackLayout();
+                            stkFloat.Orientation = Orientation.Horizontal;
+                            var optFloat = new NumericStepper();
+                            optFloat.ID            = "opt" + option.name;
+                            optFloat.DecimalPlaces = 2;
+                            optFloat.Value         = Convert.ToDouble(option.@default);
+                            stkFloat.Items.Add(optFloat);
+                            var lblFloat = new Label();
+                            lblFloat.Text = option.description;
+                            stkFloat.Items.Add(lblFloat);
+                            stkImageOptions.Items.Add(stkFloat);
+
+                            break;
+                        case "System.Guid":
+                            // TODO
+                            break;
+                        case "System.String":
+                            var stkString = new StackLayout();
+                            stkString.Orientation = Orientation.Horizontal;
+                            var lblString = new Label();
+                            lblString.Text = option.description;
+                            stkString.Items.Add(lblString);
+                            var optString = new TextBox();
+                            optString.ID   = "opt" + option.name;
+                            optString.Text = (string)option.@default;
+                            stkString.Items.Add(optString);
+                            stkImageOptions.Items.Add(stkString);
+
+                            break;
+                    }
+
+                grpOptions.Content = stkImageOptions;
             }
-            catch
+    */
+    async void ExecuteDestinationCommand()
+    {
+        if(SelectedPlugin is null)
+            return;
+
+        var dlgDestination = new SaveFileDialog
+        {
+            Title = "Choose destination file"
+        };
+
+        dlgDestination.Filters.Add(new FileDialogFilter
+        {
+            Name       = SelectedPlugin.Plugin.Name,
+            Extensions = SelectedPlugin.Plugin.KnownExtensions.ToList()
+        });
+
+        string result = await dlgDestination.ShowAsync(_view);
+
+        if(result is null ||
+           result.Length != 1)
+        {
+            DestinationText = "";
+
+            return;
+        }
+
+        if(string.IsNullOrEmpty(Path.GetExtension(result)))
+            result += SelectedPlugin.Plugin.KnownExtensions.First();
+
+        DestinationText = result;
+    }
+
+    void ExecuteCreatorCommand() => CreatorText = _inputFormat.Info.Creator;
+
+    void ExecuteMediaTitleCommand() => MediaTitleText = _inputFormat.Info.MediaTitle;
+
+    void ExecuteCommentsCommand() => CommentsText = _inputFormat.Info.Comments;
+
+    void ExecuteMediaManufacturerCommand() => MediaManufacturerText = _inputFormat.Info.MediaManufacturer;
+
+    void ExecuteMediaModelCommand() => MediaModelText = _inputFormat.Info.MediaModel;
+
+    void ExecuteMediaSerialNumberCommand() => MediaSerialNumberText = _inputFormat.Info.MediaSerialNumber;
+
+    void ExecuteMediaBarcodeCommand() => MediaBarcodeText = _inputFormat.Info.MediaBarcode;
+
+    void ExecuteMediaPartNumberCommand() => MediaPartNumberText = _inputFormat.Info.MediaPartNumber;
+
+    void ExecuteMediaSequenceCommand() => MediaSequenceValue = _inputFormat.Info.MediaSequence;
+
+    void ExecuteLastMediaSequenceCommand() => LastMediaSequenceValue = _inputFormat.Info.LastMediaSequence;
+
+    void ExecuteDriveManufacturerCommand() => DriveManufacturerText = _inputFormat.Info.DriveManufacturer;
+
+    void ExecuteDriveModelCommand() => DriveModelText = _inputFormat.Info.DriveModel;
+
+    void ExecuteDriveSerialNumberCommand() => DriveSerialNumberText = _inputFormat.Info.DriveSerialNumber;
+
+    void ExecuteDriveFirmwareRevisionCommand() =>
+        DriveFirmwareRevisionText = _inputFormat.Info.DriveFirmwareRevision;
+
+    void ExecuteCicmXmlFromImageCommand()
+    {
+        CicmXmlText   = "<From image>";
+        _cicmMetadata = _inputFormat.CicmMetadata;
+    }
+
+    async void ExecuteCicmXmlCommand()
+    {
+        _cicmMetadata = null;
+        CicmXmlText   = "";
+
+        var dlgMetadata = new OpenFileDialog
+        {
+            Title = "Choose existing metadata sidecar"
+        };
+
+        dlgMetadata.Filters.Add(new FileDialogFilter
+        {
+            Name = "CICM XML metadata",
+            Extensions = new List<string>(new[]
             {
+                ".xml"
+            })
+        });
+
+        string[] result = await dlgMetadata.ShowAsync(_view);
+
+        if(result is null ||
+           result.Length != 1)
+            return;
+
+        var sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
+
+        try
+        {
+            var sr = new StreamReader(result[0]);
+            _cicmMetadata = (CICMMetadataType)sidecarXs.Deserialize(sr);
+            sr.Close();
+            CicmXmlText = result[0];
+        }
+        catch
+        {
+            await MessageBoxManager.GetMessageBoxStandardWindow("Error", "Incorrect metadata sidecar file...",
+                                                                icon: Icon.Error).ShowDialog(_view);
+        }
+    }
+
+    void ExecuteResumeFileFromImageCommand()
+    {
+        ResumeFileText = "<From image>";
+        _dumpHardware  = _inputFormat.DumpHardware;
+    }
+
+    async void ExecuteResumeFileCommand()
+    {
+        _dumpHardware  = null;
+        ResumeFileText = "";
+
+        var dlgMetadata = new OpenFileDialog
+        {
+            Title = "Choose existing resume file"
+        };
+
+        dlgMetadata.Filters.Add(new FileDialogFilter
+        {
+            Name = "CICM XML metadata",
+            Extensions = new List<string>(new[]
+            {
+                ".xml"
+            })
+        });
+
+        string[] result = await dlgMetadata.ShowAsync(_view);
+
+        if(result is null ||
+           result.Length != 1)
+            return;
+
+        var sidecarXs = new XmlSerializer(typeof(Resume));
+
+        try
+        {
+            var sr     = new StreamReader(result[0]);
+            var resume = (Resume)sidecarXs.Deserialize(sr);
+
+            if(resume.Tries?.Any() == false)
+            {
+                _dumpHardware  = resume.Tries;
+                ResumeFileText = result[0];
+            }
+            else
                 await MessageBoxManager.
-                      GetMessageBoxStandardWindow("Error", "Incorrect resume file...", icon: Icon.Error).
-                      ShowDialog(_view);
-            }
+                      GetMessageBoxStandardWindow("Error",
+                                                  "Resume file does not contain dump hardware information...",
+                                                  icon: Icon.Error).ShowDialog(_view);
+
+            sr.Close();
+        }
+        catch
+        {
+            await MessageBoxManager.
+                  GetMessageBoxStandardWindow("Error", "Incorrect resume file...", icon: Icon.Error).
+                  ShowDialog(_view);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs
index 8f03362dd..2001f0e0a 100644
--- a/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ImageEntropyViewModel.cs
@@ -44,384 +44,383 @@ using Avalonia.Threading;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class ImageEntropyViewModel : ViewModelBase
 {
-    public sealed class ImageEntropyViewModel : ViewModelBase
+    readonly IMediaImage _inputFormat;
+    readonly Window      _view;
+    bool                 _closeVisible;
+    bool                 _duplicatedSectorsChecked;
+    bool                 _duplicatedSectorsEnabled;
+    EntropyResults       _entropy;
+    string               _mediaEntropyText;
+    bool                 _mediaEntropyVisible;
+    string               _mediaUniqueSectorsText;
+    bool                 _mediaUniqueSectorsVisible;
+    bool                 _optionsVisible;
+    bool                 _progress1Visible;
+    bool                 _progress2Indeterminate;
+    double               _progress2Max;
+    string               _progress2Text;
+    double               _progress2Value;
+    bool                 _progress2Visible;
+    bool                 _progressIndeterminate;
+    double               _progressMax;
+    string               _progressText;
+    double               _progressValue;
+    bool                 _progressVisible;
+    bool                 _resultsVisible;
+    bool                 _separatedTracksChecked;
+    bool                 _separatedTracksEnabled;
+    bool                 _separatedTracksVisible;
+    bool                 _startVisible;
+    bool                 _stopVisible;
+    EntropyResults[]     _tracksEntropy;
+    bool                 _wholeDiscChecked;
+    bool                 _wholeDiscEnabled;
+    bool                 _wholeDiscVisible;
+
+    public ImageEntropyViewModel(IMediaImage inputFormat, Window view)
     {
-        readonly IMediaImage _inputFormat;
-        readonly Window      _view;
-        bool                 _closeVisible;
-        bool                 _duplicatedSectorsChecked;
-        bool                 _duplicatedSectorsEnabled;
-        EntropyResults       _entropy;
-        string               _mediaEntropyText;
-        bool                 _mediaEntropyVisible;
-        string               _mediaUniqueSectorsText;
-        bool                 _mediaUniqueSectorsVisible;
-        bool                 _optionsVisible;
-        bool                 _progress1Visible;
-        bool                 _progress2Indeterminate;
-        double               _progress2Max;
-        string               _progress2Text;
-        double               _progress2Value;
-        bool                 _progress2Visible;
-        bool                 _progressIndeterminate;
-        double               _progressMax;
-        string               _progressText;
-        double               _progressValue;
-        bool                 _progressVisible;
-        bool                 _resultsVisible;
-        bool                 _separatedTracksChecked;
-        bool                 _separatedTracksEnabled;
-        bool                 _separatedTracksVisible;
-        bool                 _startVisible;
-        bool                 _stopVisible;
-        EntropyResults[]     _tracksEntropy;
-        bool                 _wholeDiscChecked;
-        bool                 _wholeDiscEnabled;
-        bool                 _wholeDiscVisible;
+        _inputFormat             = inputFormat;
+        _view                    = view;
+        TrackEntropy             = new ObservableCollection<TrackEntropyModel>();
+        StartCommand             = ReactiveCommand.Create(ExecuteStartCommand);
+        CloseCommand             = ReactiveCommand.Create(ExecuteCloseCommand);
+        StopCommand              = ReactiveCommand.Create(ExecuteStopCommand);
+        OptionsVisible           = true;
+        DuplicatedSectorsChecked = true;
+        SeparatedTracksChecked   = true;
+        WholeDiscChecked         = true;
+        StartVisible             = true;
 
-        public ImageEntropyViewModel(IMediaImage inputFormat, Window view)
+        var inputOptical = inputFormat as IOpticalMediaImage;
+
+        if(inputOptical?.Tracks.Count > 0)
         {
-            _inputFormat             = inputFormat;
-            _view                    = view;
-            TrackEntropy             = new ObservableCollection<TrackEntropyModel>();
-            StartCommand             = ReactiveCommand.Create(ExecuteStartCommand);
-            CloseCommand             = ReactiveCommand.Create(ExecuteCloseCommand);
-            StopCommand              = ReactiveCommand.Create(ExecuteStopCommand);
-            OptionsVisible           = true;
-            DuplicatedSectorsChecked = true;
-            SeparatedTracksChecked   = true;
-            WholeDiscChecked         = true;
-            StartVisible             = true;
+            SeparatedTracksVisible = true;
+            WholeDiscVisible       = true;
+        }
+        else
+        {
+            SeparatedTracksChecked = false;
+            WholeDiscChecked       = true;
+        }
+    }
 
-            var inputOptical = inputFormat as IOpticalMediaImage;
+    public bool SeparatedTracksVisible
+    {
+        get => _separatedTracksVisible;
+        set => this.RaiseAndSetIfChanged(ref _separatedTracksVisible, value);
+    }
 
-            if(inputOptical?.Tracks.Count > 0)
-            {
-                SeparatedTracksVisible = true;
-                WholeDiscVisible       = true;
-            }
-            else
-            {
-                SeparatedTracksChecked = false;
-                WholeDiscChecked       = true;
-            }
+    public bool WholeDiscVisible
+    {
+        get => _wholeDiscVisible;
+        set => this.RaiseAndSetIfChanged(ref _wholeDiscVisible, value);
+    }
+
+    public bool SeparatedTracksChecked
+    {
+        get => _separatedTracksChecked;
+        set => this.RaiseAndSetIfChanged(ref _separatedTracksChecked, value);
+    }
+
+    public bool WholeDiscChecked
+    {
+        get => _wholeDiscChecked;
+        set => this.RaiseAndSetIfChanged(ref _wholeDiscChecked, value);
+    }
+
+    public bool DuplicatedSectorsEnabled
+    {
+        get => _duplicatedSectorsEnabled;
+        set => this.RaiseAndSetIfChanged(ref _duplicatedSectorsEnabled, value);
+    }
+
+    public bool SeparatedTracksEnabled
+    {
+        get => _separatedTracksEnabled;
+        set => this.RaiseAndSetIfChanged(ref _separatedTracksEnabled, value);
+    }
+
+    public bool WholeDiscEnabled
+    {
+        get => _wholeDiscEnabled;
+        set => this.RaiseAndSetIfChanged(ref _wholeDiscEnabled, value);
+    }
+
+    public bool CloseVisible
+    {
+        get => _closeVisible;
+        set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
+    }
+
+    public bool StartVisible
+    {
+        get => _startVisible;
+        set => this.RaiseAndSetIfChanged(ref _startVisible, value);
+    }
+
+    public bool StopVisible
+    {
+        get => _stopVisible;
+        set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
+    }
+
+    public bool ProgressVisible
+    {
+        get => _progressVisible;
+        set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
+    }
+
+    public bool DuplicatedSectorsChecked
+    {
+        get => _duplicatedSectorsChecked;
+        set => this.RaiseAndSetIfChanged(ref _duplicatedSectorsChecked, value);
+    }
+
+    public bool OptionsVisible
+    {
+        get => _optionsVisible;
+        set => this.RaiseAndSetIfChanged(ref _optionsVisible, value);
+    }
+
+    public bool ResultsVisible
+    {
+        get => _resultsVisible;
+        set => this.RaiseAndSetIfChanged(ref _resultsVisible, value);
+    }
+
+    public string MediaEntropyText
+    {
+        get => _mediaEntropyText;
+        set => this.RaiseAndSetIfChanged(ref _mediaEntropyText, value);
+    }
+
+    public bool MediaEntropyVisible
+    {
+        get => _mediaEntropyVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaEntropyVisible, value);
+    }
+
+    public string MediaUniqueSectorsText
+    {
+        get => _mediaUniqueSectorsText;
+        set => this.RaiseAndSetIfChanged(ref _mediaUniqueSectorsText, value);
+    }
+
+    public bool MediaUniqueSectorsVisible
+    {
+        get => _mediaUniqueSectorsVisible;
+        set => this.RaiseAndSetIfChanged(ref _mediaUniqueSectorsVisible, value);
+    }
+
+    public bool Progress1Visible
+    {
+        get => _progress1Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
+    }
+
+    public bool Progress2Visible
+    {
+        get => _progress2Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
+    }
+
+    public string ProgressText
+    {
+        get => _progressText;
+        set => this.RaiseAndSetIfChanged(ref _progressText, value);
+    }
+
+    public bool ProgressIndeterminate
+    {
+        get => _progressIndeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
+    }
+
+    public double ProgressMax
+    {
+        get => _progressMax;
+        set => this.RaiseAndSetIfChanged(ref _progressMax, value);
+    }
+
+    public double ProgressValue
+    {
+        get => _progressValue;
+        set => this.RaiseAndSetIfChanged(ref _progressValue, value);
+    }
+
+    public string Progress2Text
+    {
+        get => _progress2Text;
+        set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
+    }
+
+    public bool Progress2Indeterminate
+    {
+        get => _progress2Indeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
+    }
+
+    public double Progress2Max
+    {
+        get => _progress2Max;
+        set => this.RaiseAndSetIfChanged(ref _progress2Max, value);
+    }
+
+    public double Progress2Value
+    {
+        get => _progress2Value;
+        set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
+    }
+
+    [NotNull]
+    public string Title => "Calculating entropy";
+    public ObservableCollection<TrackEntropyModel> TrackEntropy { get; }
+    public ReactiveCommand<Unit, Unit>             StartCommand { get; }
+    public ReactiveCommand<Unit, Unit>             CloseCommand { get; }
+    public ReactiveCommand<Unit, Unit>             StopCommand  { get; }
+
+    void ExecuteStartCommand()
+    {
+        var entropyCalculator = new Entropy(false, _inputFormat);
+        entropyCalculator.InitProgressEvent    += InitProgress;
+        entropyCalculator.InitProgress2Event   += InitProgress2;
+        entropyCalculator.UpdateProgressEvent  += UpdateProgress;
+        entropyCalculator.UpdateProgress2Event += UpdateProgress2;
+        entropyCalculator.EndProgressEvent     += EndProgress;
+        entropyCalculator.EndProgress2Event    += EndProgress2;
+        DuplicatedSectorsEnabled               =  false;
+        SeparatedTracksEnabled                 =  false;
+        WholeDiscEnabled                       =  false;
+        CloseVisible                           =  false;
+        StartVisible                           =  false;
+        StopVisible                            =  false;
+        ProgressVisible                        =  true;
+
+        if(WholeDiscChecked                                 &&
+           _inputFormat is IOpticalMediaImage opticalFormat &&
+           opticalFormat.Sessions?.Count > 1)
+        {
+            AaruConsole.ErrorWriteLine("Calculating disc entropy of multisession images is not yet implemented.");
+            WholeDiscChecked = false;
         }
 
-        public bool SeparatedTracksVisible
+        var thread = new Thread(async () =>
         {
-            get => _separatedTracksVisible;
-            set => this.RaiseAndSetIfChanged(ref _separatedTracksVisible, value);
-        }
-
-        public bool WholeDiscVisible
-        {
-            get => _wholeDiscVisible;
-            set => this.RaiseAndSetIfChanged(ref _wholeDiscVisible, value);
-        }
-
-        public bool SeparatedTracksChecked
-        {
-            get => _separatedTracksChecked;
-            set => this.RaiseAndSetIfChanged(ref _separatedTracksChecked, value);
-        }
-
-        public bool WholeDiscChecked
-        {
-            get => _wholeDiscChecked;
-            set => this.RaiseAndSetIfChanged(ref _wholeDiscChecked, value);
-        }
-
-        public bool DuplicatedSectorsEnabled
-        {
-            get => _duplicatedSectorsEnabled;
-            set => this.RaiseAndSetIfChanged(ref _duplicatedSectorsEnabled, value);
-        }
-
-        public bool SeparatedTracksEnabled
-        {
-            get => _separatedTracksEnabled;
-            set => this.RaiseAndSetIfChanged(ref _separatedTracksEnabled, value);
-        }
-
-        public bool WholeDiscEnabled
-        {
-            get => _wholeDiscEnabled;
-            set => this.RaiseAndSetIfChanged(ref _wholeDiscEnabled, value);
-        }
-
-        public bool CloseVisible
-        {
-            get => _closeVisible;
-            set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
-        }
-
-        public bool StartVisible
-        {
-            get => _startVisible;
-            set => this.RaiseAndSetIfChanged(ref _startVisible, value);
-        }
-
-        public bool StopVisible
-        {
-            get => _stopVisible;
-            set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
-        }
-
-        public bool ProgressVisible
-        {
-            get => _progressVisible;
-            set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
-        }
-
-        public bool DuplicatedSectorsChecked
-        {
-            get => _duplicatedSectorsChecked;
-            set => this.RaiseAndSetIfChanged(ref _duplicatedSectorsChecked, value);
-        }
-
-        public bool OptionsVisible
-        {
-            get => _optionsVisible;
-            set => this.RaiseAndSetIfChanged(ref _optionsVisible, value);
-        }
-
-        public bool ResultsVisible
-        {
-            get => _resultsVisible;
-            set => this.RaiseAndSetIfChanged(ref _resultsVisible, value);
-        }
-
-        public string MediaEntropyText
-        {
-            get => _mediaEntropyText;
-            set => this.RaiseAndSetIfChanged(ref _mediaEntropyText, value);
-        }
-
-        public bool MediaEntropyVisible
-        {
-            get => _mediaEntropyVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaEntropyVisible, value);
-        }
-
-        public string MediaUniqueSectorsText
-        {
-            get => _mediaUniqueSectorsText;
-            set => this.RaiseAndSetIfChanged(ref _mediaUniqueSectorsText, value);
-        }
-
-        public bool MediaUniqueSectorsVisible
-        {
-            get => _mediaUniqueSectorsVisible;
-            set => this.RaiseAndSetIfChanged(ref _mediaUniqueSectorsVisible, value);
-        }
-
-        public bool Progress1Visible
-        {
-            get => _progress1Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
-        }
-
-        public bool Progress2Visible
-        {
-            get => _progress2Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
-        }
-
-        public string ProgressText
-        {
-            get => _progressText;
-            set => this.RaiseAndSetIfChanged(ref _progressText, value);
-        }
-
-        public bool ProgressIndeterminate
-        {
-            get => _progressIndeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
-        }
-
-        public double ProgressMax
-        {
-            get => _progressMax;
-            set => this.RaiseAndSetIfChanged(ref _progressMax, value);
-        }
-
-        public double ProgressValue
-        {
-            get => _progressValue;
-            set => this.RaiseAndSetIfChanged(ref _progressValue, value);
-        }
-
-        public string Progress2Text
-        {
-            get => _progress2Text;
-            set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
-        }
-
-        public bool Progress2Indeterminate
-        {
-            get => _progress2Indeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
-        }
-
-        public double Progress2Max
-        {
-            get => _progress2Max;
-            set => this.RaiseAndSetIfChanged(ref _progress2Max, value);
-        }
-
-        public double Progress2Value
-        {
-            get => _progress2Value;
-            set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
-        }
-
-        [NotNull]
-        public string Title => "Calculating entropy";
-        public ObservableCollection<TrackEntropyModel> TrackEntropy { get; }
-        public ReactiveCommand<Unit, Unit>             StartCommand { get; }
-        public ReactiveCommand<Unit, Unit>             CloseCommand { get; }
-        public ReactiveCommand<Unit, Unit>             StopCommand  { get; }
-
-        void ExecuteStartCommand()
-        {
-            var entropyCalculator = new Entropy(false, _inputFormat);
-            entropyCalculator.InitProgressEvent    += InitProgress;
-            entropyCalculator.InitProgress2Event   += InitProgress2;
-            entropyCalculator.UpdateProgressEvent  += UpdateProgress;
-            entropyCalculator.UpdateProgress2Event += UpdateProgress2;
-            entropyCalculator.EndProgressEvent     += EndProgress;
-            entropyCalculator.EndProgress2Event    += EndProgress2;
-            DuplicatedSectorsEnabled               =  false;
-            SeparatedTracksEnabled                 =  false;
-            WholeDiscEnabled                       =  false;
-            CloseVisible                           =  false;
-            StartVisible                           =  false;
-            StopVisible                            =  false;
-            ProgressVisible                        =  true;
-
-            if(WholeDiscChecked                                 &&
-               _inputFormat is IOpticalMediaImage opticalFormat &&
-               opticalFormat.Sessions?.Count > 1)
-            {
-                AaruConsole.ErrorWriteLine("Calculating disc entropy of multisession images is not yet implemented.");
-                WholeDiscChecked = false;
-            }
-
-            var thread = new Thread(async () =>
-            {
-                if(SeparatedTracksChecked)
-                {
-                    _tracksEntropy = entropyCalculator.CalculateTracksEntropy(DuplicatedSectorsChecked);
-
-                    foreach(EntropyResults trackEntropy in _tracksEntropy)
-                    {
-                        AaruConsole.WriteLine("Entropy for track {0} is {1:F4}.", trackEntropy.Track,
-                                              trackEntropy.Entropy);
-
-                        if(trackEntropy.UniqueSectors != null)
-                            AaruConsole.WriteLine("Track {0} has {1} unique sectors ({2:P3})", trackEntropy.Track,
-                                                  trackEntropy.UniqueSectors,
-                                                  (double)trackEntropy.UniqueSectors / trackEntropy.Sectors);
-                    }
-                }
-
-                if(WholeDiscChecked != true)
-                    return;
-
-                _entropy = entropyCalculator.CalculateMediaEntropy(DuplicatedSectorsChecked);
-
-                await Dispatcher.UIThread.InvokeAsync(Finish);
-            });
-
-            Statistics.AddCommand("entropy");
-
-            thread.Start();
-        }
-
-        void Finish()
-        {
-            OptionsVisible  = false;
-            CloseVisible    = true;
-            ProgressVisible = false;
-            ResultsVisible  = true;
-
             if(SeparatedTracksChecked)
             {
+                _tracksEntropy = entropyCalculator.CalculateTracksEntropy(DuplicatedSectorsChecked);
+
                 foreach(EntropyResults trackEntropy in _tracksEntropy)
-                    TrackEntropy.Add(new TrackEntropyModel
-                    {
-                        Track = trackEntropy.Track.ToString(),
-                        Entropy = trackEntropy.Entropy.ToString(CultureInfo.CurrentUICulture),
-                        UniqueSectors =
-                            $"{trackEntropy.UniqueSectors} ({(trackEntropy.UniqueSectors ?? 0) / (double)trackEntropy.Sectors:P3})"
-                    });
+                {
+                    AaruConsole.WriteLine("Entropy for track {0} is {1:F4}.", trackEntropy.Track,
+                                          trackEntropy.Entropy);
+
+                    if(trackEntropy.UniqueSectors != null)
+                        AaruConsole.WriteLine("Track {0} has {1} unique sectors ({2:P3})", trackEntropy.Track,
+                                              trackEntropy.UniqueSectors,
+                                              (double)trackEntropy.UniqueSectors / trackEntropy.Sectors);
+                }
             }
 
             if(WholeDiscChecked != true)
                 return;
 
-            MediaEntropyText    = $"Entropy for disk is {_entropy.Entropy:F4}.";
-            MediaEntropyVisible = true;
+            _entropy = entropyCalculator.CalculateMediaEntropy(DuplicatedSectorsChecked);
 
-            if(_entropy.UniqueSectors == null)
-                return;
+            await Dispatcher.UIThread.InvokeAsync(Finish);
+        });
 
-            MediaUniqueSectorsText =
-                $"Disk has {_entropy.UniqueSectors} unique sectors ({(double)_entropy.UniqueSectors / _entropy.Sectors:P3})";
+        Statistics.AddCommand("entropy");
 
-            MediaUniqueSectorsVisible = true;
+        thread.Start();
+    }
+
+    void Finish()
+    {
+        OptionsVisible  = false;
+        CloseVisible    = true;
+        ProgressVisible = false;
+        ResultsVisible  = true;
+
+        if(SeparatedTracksChecked)
+        {
+            foreach(EntropyResults trackEntropy in _tracksEntropy)
+                TrackEntropy.Add(new TrackEntropyModel
+                {
+                    Track = trackEntropy.Track.ToString(),
+                    Entropy = trackEntropy.Entropy.ToString(CultureInfo.CurrentUICulture),
+                    UniqueSectors =
+                        $"{trackEntropy.UniqueSectors} ({(trackEntropy.UniqueSectors ?? 0) / (double)trackEntropy.Sectors:P3})"
+                });
         }
 
-        void ExecuteCloseCommand() => _view.Close();
+        if(WholeDiscChecked != true)
+            return;
 
-        internal void ExecuteStopCommand() => throw new NotImplementedException();
+        MediaEntropyText    = $"Entropy for disk is {_entropy.Entropy:F4}.";
+        MediaEntropyVisible = true;
 
-        void InitProgress() => Progress1Visible = true;
+        if(_entropy.UniqueSectors == null)
+            return;
 
-        void EndProgress() => Progress1Visible = false;
+        MediaUniqueSectorsText =
+            $"Disk has {_entropy.UniqueSectors} unique sectors ({(double)_entropy.UniqueSectors / _entropy.Sectors:P3})";
 
-        void InitProgress2() => Progress2Visible = true;
-
-        void EndProgress2() => Progress2Visible = false;
-
-        async void UpdateProgress(string text, long current, long maximum) =>
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                ProgressText = text;
-
-                if(maximum == 0)
-                {
-                    ProgressIndeterminate = true;
-
-                    return;
-                }
-
-                if(ProgressIndeterminate)
-                    ProgressIndeterminate = false;
-
-                ProgressMax   = maximum;
-                ProgressValue = current;
-            });
-
-        async void UpdateProgress2(string text, long current, long maximum) =>
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                Progress2Text = text;
-
-                if(maximum == 0)
-                {
-                    Progress2Indeterminate = true;
-
-                    return;
-                }
-
-                if(Progress2Indeterminate)
-                    Progress2Indeterminate = false;
-
-                Progress2Max   = maximum;
-                Progress2Value = current;
-            });
+        MediaUniqueSectorsVisible = true;
     }
+
+    void ExecuteCloseCommand() => _view.Close();
+
+    internal void ExecuteStopCommand() => throw new NotImplementedException();
+
+    void InitProgress() => Progress1Visible = true;
+
+    void EndProgress() => Progress1Visible = false;
+
+    void InitProgress2() => Progress2Visible = true;
+
+    void EndProgress2() => Progress2Visible = false;
+
+    async void UpdateProgress(string text, long current, long maximum) =>
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            ProgressText = text;
+
+            if(maximum == 0)
+            {
+                ProgressIndeterminate = true;
+
+                return;
+            }
+
+            if(ProgressIndeterminate)
+                ProgressIndeterminate = false;
+
+            ProgressMax   = maximum;
+            ProgressValue = current;
+        });
+
+    async void UpdateProgress2(string text, long current, long maximum) =>
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            Progress2Text = text;
+
+            if(maximum == 0)
+            {
+                Progress2Indeterminate = true;
+
+                return;
+            }
+
+            if(Progress2Indeterminate)
+                Progress2Indeterminate = false;
+
+            Progress2Max   = maximum;
+            Progress2Value = current;
+        });
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs
index ee700c413..4fc9aface 100644
--- a/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ImageSidecarViewModel.cs
@@ -45,305 +45,304 @@ using Avalonia.Threading;
 using ReactiveUI;
 using Schemas;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class ImageSidecarViewModel : ViewModelBase
 {
-    public sealed class ImageSidecarViewModel : ViewModelBase
+    readonly Encoding    _encoding;
+    readonly Guid        _filterId;
+    readonly string      _imageSource;
+    readonly IMediaImage _inputFormat;
+    readonly Window      _view;
+    bool                 _closeVisible;
+    bool                 _destinationEnabled;
+    string               _destinationText;
+    bool                 _progress1Visible;
+    bool                 _progress2Indeterminate;
+    double               _progress2MaxValue;
+    string               _progress2Text;
+    double               _progress2Value;
+    bool                 _progress2Visible;
+    bool                 _progressIndeterminate;
+    double               _progressMaxValue;
+    string               _progressText;
+    double               _progressValue;
+    bool                 _progressVisible;
+    Sidecar              _sidecarClass;
+    bool                 _startVisible;
+    string               _statusText;
+    bool                 _statusVisible;
+    bool                 _stopEnabled;
+    bool                 _stopVisible;
+
+    public ImageSidecarViewModel(IMediaImage inputFormat, string imageSource, Guid filterId, Encoding encoding,
+                                 Window view)
     {
-        readonly Encoding    _encoding;
-        readonly Guid        _filterId;
-        readonly string      _imageSource;
-        readonly IMediaImage _inputFormat;
-        readonly Window      _view;
-        bool                 _closeVisible;
-        bool                 _destinationEnabled;
-        string               _destinationText;
-        bool                 _progress1Visible;
-        bool                 _progress2Indeterminate;
-        double               _progress2MaxValue;
-        string               _progress2Text;
-        double               _progress2Value;
-        bool                 _progress2Visible;
-        bool                 _progressIndeterminate;
-        double               _progressMaxValue;
-        string               _progressText;
-        double               _progressValue;
-        bool                 _progressVisible;
-        Sidecar              _sidecarClass;
-        bool                 _startVisible;
-        string               _statusText;
-        bool                 _statusVisible;
-        bool                 _stopEnabled;
-        bool                 _stopVisible;
+        _view        = view;
+        _inputFormat = inputFormat;
+        _imageSource = imageSource;
+        _filterId    = filterId;
+        _encoding    = encoding;
 
-        public ImageSidecarViewModel(IMediaImage inputFormat, string imageSource, Guid filterId, Encoding encoding,
-                                     Window view)
+        DestinationText = Path.Combine(Path.GetDirectoryName(imageSource) ?? "",
+                                       Path.GetFileNameWithoutExtension(imageSource) + ".cicm.xml");
+
+        DestinationEnabled = true;
+        StartVisible       = true;
+        CloseVisible       = true;
+        DestinationCommand = ReactiveCommand.Create(ExecuteDestinationCommand);
+        StartCommand       = ReactiveCommand.Create(ExecuteStartCommand);
+        CloseCommand       = ReactiveCommand.Create(ExecuteCloseCommand);
+        StopCommand        = ReactiveCommand.Create(ExecuteStopCommand);
+    }
+
+    public string                      Title              { get; }
+    public ReactiveCommand<Unit, Unit> DestinationCommand { get; }
+    public ReactiveCommand<Unit, Unit> StartCommand       { get; }
+    public ReactiveCommand<Unit, Unit> CloseCommand       { get; }
+    public ReactiveCommand<Unit, Unit> StopCommand        { get; }
+
+    public bool ProgressIndeterminate
+    {
+        get => _progressIndeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
+    }
+
+    public bool ProgressVisible
+    {
+        get => _progressVisible;
+        set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
+    }
+
+    public bool Progress1Visible
+    {
+        get => _progress1Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
+    }
+
+    public bool Progress2Visible
+    {
+        get => _progress2Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
+    }
+
+    public bool Progress2Indeterminate
+    {
+        get => _progress2Indeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
+    }
+
+    public double ProgressMaxValue
+    {
+        get => _progressMaxValue;
+        set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
+    }
+
+    public double Progress2MaxValue
+    {
+        get => _progress2MaxValue;
+        set => this.RaiseAndSetIfChanged(ref _progress2MaxValue, value);
+    }
+
+    public string ProgressText
+    {
+        get => _progressText;
+        set => this.RaiseAndSetIfChanged(ref _progressText, value);
+    }
+
+    public double ProgressValue
+    {
+        get => _progressValue;
+        set => this.RaiseAndSetIfChanged(ref _progressValue, value);
+    }
+
+    public double Progress2Value
+    {
+        get => _progress2Value;
+        set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
+    }
+
+    public string Progress2Text
+    {
+        get => _progress2Text;
+        set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
+    }
+
+    public string DestinationText
+    {
+        get => _destinationText;
+        set => this.RaiseAndSetIfChanged(ref _destinationText, value);
+    }
+
+    public bool DestinationEnabled
+    {
+        get => _destinationEnabled;
+        set => this.RaiseAndSetIfChanged(ref _destinationEnabled, value);
+    }
+
+    public string StatusText
+    {
+        get => _statusText;
+        set => this.RaiseAndSetIfChanged(ref _statusText, value);
+    }
+
+    public bool StatusVisible
+    {
+        get => _statusVisible;
+        set => this.RaiseAndSetIfChanged(ref _statusVisible, value);
+    }
+
+    public bool StartVisible
+    {
+        get => _startVisible;
+        set => this.RaiseAndSetIfChanged(ref _startVisible, value);
+    }
+
+    public bool CloseVisible
+    {
+        get => _closeVisible;
+        set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
+    }
+
+    public bool StopEnabled
+    {
+        get => _stopEnabled;
+        set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
+    }
+
+    public bool StopVisible
+    {
+        get => _stopVisible;
+        set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
+    }
+
+    void ExecuteStartCommand() => new Thread(DoWork).Start();
+
+    async void DoWork()
+    {
+        // Prepare UI
+        await Dispatcher.UIThread.InvokeAsync(() =>
         {
-            _view        = view;
-            _inputFormat = inputFormat;
-            _imageSource = imageSource;
-            _filterId    = filterId;
-            _encoding    = encoding;
-
-            DestinationText = Path.Combine(Path.GetDirectoryName(imageSource) ?? "",
-                                           Path.GetFileNameWithoutExtension(imageSource) + ".cicm.xml");
-
-            DestinationEnabled = true;
-            StartVisible       = true;
-            CloseVisible       = true;
-            DestinationCommand = ReactiveCommand.Create(ExecuteDestinationCommand);
-            StartCommand       = ReactiveCommand.Create(ExecuteStartCommand);
-            CloseCommand       = ReactiveCommand.Create(ExecuteCloseCommand);
-            StopCommand        = ReactiveCommand.Create(ExecuteStopCommand);
-        }
-
-        public string                      Title              { get; }
-        public ReactiveCommand<Unit, Unit> DestinationCommand { get; }
-        public ReactiveCommand<Unit, Unit> StartCommand       { get; }
-        public ReactiveCommand<Unit, Unit> CloseCommand       { get; }
-        public ReactiveCommand<Unit, Unit> StopCommand        { get; }
-
-        public bool ProgressIndeterminate
-        {
-            get => _progressIndeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
-        }
-
-        public bool ProgressVisible
-        {
-            get => _progressVisible;
-            set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
-        }
-
-        public bool Progress1Visible
-        {
-            get => _progress1Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
-        }
-
-        public bool Progress2Visible
-        {
-            get => _progress2Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
-        }
-
-        public bool Progress2Indeterminate
-        {
-            get => _progress2Indeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
-        }
-
-        public double ProgressMaxValue
-        {
-            get => _progressMaxValue;
-            set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
-        }
-
-        public double Progress2MaxValue
-        {
-            get => _progress2MaxValue;
-            set => this.RaiseAndSetIfChanged(ref _progress2MaxValue, value);
-        }
-
-        public string ProgressText
-        {
-            get => _progressText;
-            set => this.RaiseAndSetIfChanged(ref _progressText, value);
-        }
-
-        public double ProgressValue
-        {
-            get => _progressValue;
-            set => this.RaiseAndSetIfChanged(ref _progressValue, value);
-        }
-
-        public double Progress2Value
-        {
-            get => _progress2Value;
-            set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
-        }
-
-        public string Progress2Text
-        {
-            get => _progress2Text;
-            set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
-        }
-
-        public string DestinationText
-        {
-            get => _destinationText;
-            set => this.RaiseAndSetIfChanged(ref _destinationText, value);
-        }
-
-        public bool DestinationEnabled
-        {
-            get => _destinationEnabled;
-            set => this.RaiseAndSetIfChanged(ref _destinationEnabled, value);
-        }
-
-        public string StatusText
-        {
-            get => _statusText;
-            set => this.RaiseAndSetIfChanged(ref _statusText, value);
-        }
-
-        public bool StatusVisible
-        {
-            get => _statusVisible;
-            set => this.RaiseAndSetIfChanged(ref _statusVisible, value);
-        }
-
-        public bool StartVisible
-        {
-            get => _startVisible;
-            set => this.RaiseAndSetIfChanged(ref _startVisible, value);
-        }
-
-        public bool CloseVisible
-        {
-            get => _closeVisible;
-            set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
-        }
-
-        public bool StopEnabled
-        {
-            get => _stopEnabled;
-            set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
-        }
-
-        public bool StopVisible
-        {
-            get => _stopVisible;
-            set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
-        }
-
-        void ExecuteStartCommand() => new Thread(DoWork).Start();
-
-        async void DoWork()
-        {
-            // Prepare UI
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                CloseVisible       = false;
-                StartVisible       = false;
-                StopVisible        = true;
-                StopEnabled        = true;
-                ProgressVisible    = true;
-                DestinationEnabled = false;
-                StatusVisible      = true;
-            });
-
-            _sidecarClass                      =  new Sidecar(_inputFormat, _imageSource, _filterId, _encoding);
-            _sidecarClass.UpdateStatusEvent    += UpdateStatus;
-            _sidecarClass.InitProgressEvent    += InitProgress;
-            _sidecarClass.UpdateProgressEvent  += UpdateProgress;
-            _sidecarClass.EndProgressEvent     += EndProgress;
-            _sidecarClass.InitProgressEvent2   += InitProgress2;
-            _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
-            _sidecarClass.EndProgressEvent2    += EndProgress2;
-            CICMMetadataType sidecar = _sidecarClass.Create();
-
-            AaruConsole.WriteLine("Writing metadata sidecar");
-
-            var xmlFs = new FileStream(DestinationText, FileMode.Create);
-
-            var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
-            xmlSer.Serialize(xmlFs, sidecar);
-            xmlFs.Close();
-
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                CloseVisible    = true;
-                StopVisible     = false;
-                ProgressVisible = false;
-                StatusVisible   = false;
-            });
-
-            Statistics.AddCommand("create-sidecar");
-        }
-
-        async void EndProgress2() => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Progress2Visible = false;
+            CloseVisible       = false;
+            StartVisible       = false;
+            StopVisible        = true;
+            StopEnabled        = true;
+            ProgressVisible    = true;
+            DestinationEnabled = false;
+            StatusVisible      = true;
         });
 
-        async void UpdateProgress2(string text, long current, long maximum) =>
-            await Dispatcher.UIThread.InvokeAsync(() =>
+        _sidecarClass                      =  new Sidecar(_inputFormat, _imageSource, _filterId, _encoding);
+        _sidecarClass.UpdateStatusEvent    += UpdateStatus;
+        _sidecarClass.InitProgressEvent    += InitProgress;
+        _sidecarClass.UpdateProgressEvent  += UpdateProgress;
+        _sidecarClass.EndProgressEvent     += EndProgress;
+        _sidecarClass.InitProgressEvent2   += InitProgress2;
+        _sidecarClass.UpdateProgressEvent2 += UpdateProgress2;
+        _sidecarClass.EndProgressEvent2    += EndProgress2;
+        CICMMetadataType sidecar = _sidecarClass.Create();
+
+        AaruConsole.WriteLine("Writing metadata sidecar");
+
+        var xmlFs = new FileStream(DestinationText, FileMode.Create);
+
+        var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
+        xmlSer.Serialize(xmlFs, sidecar);
+        xmlFs.Close();
+
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            CloseVisible    = true;
+            StopVisible     = false;
+            ProgressVisible = false;
+            StatusVisible   = false;
+        });
+
+        Statistics.AddCommand("create-sidecar");
+    }
+
+    async void EndProgress2() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Progress2Visible = false;
+    });
+
+    async void UpdateProgress2(string text, long current, long maximum) =>
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            Progress2Text          = text;
+            Progress2Indeterminate = false;
+
+            Progress2MaxValue = maximum;
+            Progress2Value    = current;
+        });
+
+    async void InitProgress2() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Progress2Visible = true;
+    });
+
+    async void EndProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Progress1Visible = false;
+    });
+
+    async void UpdateProgress(string text, long current, long maximum) =>
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            ProgressText          = text;
+            ProgressIndeterminate = false;
+
+            ProgressMaxValue = maximum;
+            ProgressValue    = current;
+        });
+
+    async void InitProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Progress1Visible = true;
+    });
+
+    async void UpdateStatus(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        StatusText = text;
+    });
+
+    void ExecuteCloseCommand() => _view.Close();
+
+    void ExecuteStopCommand()
+    {
+        ProgressText = "Aborting...";
+        StopEnabled  = false;
+        _sidecarClass.Abort();
+    }
+
+    async void ExecuteDestinationCommand()
+    {
+        var dlgDestination = new SaveFileDialog
+        {
+            Title = "Choose destination file"
+        };
+
+        dlgDestination.Filters.Add(new FileDialogFilter
+        {
+            Name = "CICM XML metadata",
+            Extensions = new List<string>(new[]
             {
-                Progress2Text          = text;
-                Progress2Indeterminate = false;
-
-                Progress2MaxValue = maximum;
-                Progress2Value    = current;
-            });
-
-        async void InitProgress2() => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Progress2Visible = true;
+                "*.xml"
+            })
         });
 
-        async void EndProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
+        string result = await dlgDestination.ShowAsync(_view);
+
+        if(result is null)
         {
-            Progress1Visible = false;
-        });
+            DestinationText = "";
 
-        async void UpdateProgress(string text, long current, long maximum) =>
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                ProgressText          = text;
-                ProgressIndeterminate = false;
-
-                ProgressMaxValue = maximum;
-                ProgressValue    = current;
-            });
-
-        async void InitProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Progress1Visible = true;
-        });
-
-        async void UpdateStatus(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            StatusText = text;
-        });
-
-        void ExecuteCloseCommand() => _view.Close();
-
-        void ExecuteStopCommand()
-        {
-            ProgressText = "Aborting...";
-            StopEnabled  = false;
-            _sidecarClass.Abort();
+            return;
         }
 
-        async void ExecuteDestinationCommand()
-        {
-            var dlgDestination = new SaveFileDialog
-            {
-                Title = "Choose destination file"
-            };
+        if(string.IsNullOrEmpty(Path.GetExtension(result)))
+            result += ".xml";
 
-            dlgDestination.Filters.Add(new FileDialogFilter
-            {
-                Name = "CICM XML metadata",
-                Extensions = new List<string>(new[]
-                {
-                    "*.xml"
-                })
-            });
-
-            string result = await dlgDestination.ShowAsync(_view);
-
-            if(result is null)
-            {
-                DestinationText = "";
-
-                return;
-            }
-
-            if(string.IsNullOrEmpty(Path.GetExtension(result)))
-                result += ".xml";
-
-            DestinationText = result;
-        }
+        DestinationText = result;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs b/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs
index b84494f4c..5197bd81a 100644
--- a/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ImageVerifyViewModel.cs
@@ -44,498 +44,436 @@ using Avalonia.Controls;
 using Avalonia.Threading;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class ImageVerifyViewModel : ViewModelBase
 {
-    public sealed class ImageVerifyViewModel : ViewModelBase
+    readonly IMediaImage _inputFormat;
+    readonly Window      _view;
+    bool                 _cancel;
+    bool                 _closeVisible;
+    string               _imageResultText;
+    bool                 _imageResultVisible;
+    bool                 _optionsVisible;
+    bool                 _progress2Indeterminate;
+    double               _progress2MaxValue;
+    string               _progress2Text;
+    double               _progress2Value;
+    bool                 _progress2Visible;
+    bool                 _progressIndeterminate;
+    double               _progressMaxValue;
+    string               _progressText;
+    double               _progressValue;
+    bool                 _progressVisible;
+    bool                 _resultsVisible;
+    string               _sectorErrorsText;
+    bool                 _sectorErrorsVisible;
+    string               _sectorsErrorsAllText;
+    bool                 _sectorsErrorsAllVisible;
+    bool                 _sectorSummaryVisible;
+    string               _sectorsUnknownAllText;
+    bool                 _sectorsUnknownAllVisible;
+    string               _sectorsUnknownsText;
+    bool                 _sectorsUnknownsVisible;
+    bool                 _startVisible;
+    bool                 _stopEnabled;
+    bool                 _stopVisible;
+    string               _totalSectorErrorsText;
+    string               _totalSectorErrorsUnknownsText;
+    string               _totalSectorsText;
+    string               _totalSectorUnknownsText;
+    bool                 _verifyImageChecked;
+    bool                 _verifyImageEnabled;
+    bool                 _verifySectorsChecked;
+    bool                 _verifySectorsEnabled;
+    bool                 _verifySectorsVisible;
+
+    public ImageVerifyViewModel(IMediaImage inputFormat, Window view)
     {
-        readonly IMediaImage _inputFormat;
-        readonly Window      _view;
-        bool                 _cancel;
-        bool                 _closeVisible;
-        string               _imageResultText;
-        bool                 _imageResultVisible;
-        bool                 _optionsVisible;
-        bool                 _progress2Indeterminate;
-        double               _progress2MaxValue;
-        string               _progress2Text;
-        double               _progress2Value;
-        bool                 _progress2Visible;
-        bool                 _progressIndeterminate;
-        double               _progressMaxValue;
-        string               _progressText;
-        double               _progressValue;
-        bool                 _progressVisible;
-        bool                 _resultsVisible;
-        string               _sectorErrorsText;
-        bool                 _sectorErrorsVisible;
-        string               _sectorsErrorsAllText;
-        bool                 _sectorsErrorsAllVisible;
-        bool                 _sectorSummaryVisible;
-        string               _sectorsUnknownAllText;
-        bool                 _sectorsUnknownAllVisible;
-        string               _sectorsUnknownsText;
-        bool                 _sectorsUnknownsVisible;
-        bool                 _startVisible;
-        bool                 _stopEnabled;
-        bool                 _stopVisible;
-        string               _totalSectorErrorsText;
-        string               _totalSectorErrorsUnknownsText;
-        string               _totalSectorsText;
-        string               _totalSectorUnknownsText;
-        bool                 _verifyImageChecked;
-        bool                 _verifyImageEnabled;
-        bool                 _verifySectorsChecked;
-        bool                 _verifySectorsEnabled;
-        bool                 _verifySectorsVisible;
+        _view                = view;
+        StartCommand         = ReactiveCommand.Create(ExecuteStartCommand);
+        CloseCommand         = ReactiveCommand.Create(ExecuteCloseCommand);
+        StopCommand          = ReactiveCommand.Create(ExecuteStopCommand);
+        _inputFormat         = inputFormat;
+        _cancel              = false;
+        ErrorList            = new ObservableCollection<LbaModel>();
+        UnknownList          = new ObservableCollection<LbaModel>();
+        VerifyImageEnabled   = true;
+        VerifySectorsEnabled = true;
+        CloseVisible         = true;
+        StartVisible         = true;
+        OptionsVisible       = true;
+    }
 
-        public ImageVerifyViewModel(IMediaImage inputFormat, Window view)
+    public ObservableCollection<LbaModel> ErrorList    { get; }
+    public ObservableCollection<LbaModel> UnknownList  { get; }
+    public ReactiveCommand<Unit, Unit>    StartCommand { get; }
+    public ReactiveCommand<Unit, Unit>    CloseCommand { get; }
+    public ReactiveCommand<Unit, Unit>    StopCommand  { get; }
+
+    public bool VerifyImageEnabled
+    {
+        get => _verifyImageEnabled;
+        set => this.RaiseAndSetIfChanged(ref _verifyImageEnabled, value);
+    }
+
+    public bool VerifySectorsEnabled
+    {
+        get => _verifySectorsEnabled;
+        set => this.RaiseAndSetIfChanged(ref _verifySectorsEnabled, value);
+    }
+
+    public bool VerifySectorsVisible
+    {
+        get => _verifySectorsVisible;
+        set => this.RaiseAndSetIfChanged(ref _verifySectorsVisible, value);
+    }
+
+    public double ProgressMaxValue
+    {
+        get => _progressMaxValue;
+        set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
+    }
+
+    public bool VerifyImageChecked
+    {
+        get => _verifyImageChecked;
+        set => this.RaiseAndSetIfChanged(ref _verifyImageChecked, value);
+    }
+
+    public bool ProgressIndeterminate
+    {
+        get => _progressIndeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
+    }
+
+    public bool ImageResultVisible
+    {
+        get => _imageResultVisible;
+        set => this.RaiseAndSetIfChanged(ref _imageResultVisible, value);
+    }
+
+    public string ImageResultText
+    {
+        get => _imageResultText;
+        set => this.RaiseAndSetIfChanged(ref _imageResultText, value);
+    }
+
+    public bool VerifySectorsChecked
+    {
+        get => _verifySectorsChecked;
+        set => this.RaiseAndSetIfChanged(ref _verifySectorsChecked, value);
+    }
+
+    public bool Progress2Visible
+    {
+        get => _progress2Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
+    }
+
+    public bool Progress2Indeterminate
+    {
+        get => _progress2Indeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
+    }
+
+    public double Progress2MaxValue
+    {
+        get => _progress2MaxValue;
+        set => this.RaiseAndSetIfChanged(ref _progress2MaxValue, value);
+    }
+
+    public string ProgressText
+    {
+        get => _progressText;
+        set => this.RaiseAndSetIfChanged(ref _progressText, value);
+    }
+
+    public double ProgressValue
+    {
+        get => _progressValue;
+        set => this.RaiseAndSetIfChanged(ref _progressValue, value);
+    }
+
+    public double Progress2Value
+    {
+        get => _progress2Value;
+        set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
+    }
+
+    public string Progress2Text
+    {
+        get => _progress2Text;
+        set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
+    }
+
+    public bool SectorsErrorsAllVisible
+    {
+        get => _sectorsErrorsAllVisible;
+        set => this.RaiseAndSetIfChanged(ref _sectorsErrorsAllVisible, value);
+    }
+
+    public string SectorsErrorsAllText
+    {
+        get => _sectorsErrorsAllText;
+        set => this.RaiseAndSetIfChanged(ref _sectorsErrorsAllText, value);
+    }
+
+    public bool SectorsUnknownAllVisible
+    {
+        get => _sectorsUnknownAllVisible;
+        set => this.RaiseAndSetIfChanged(ref _sectorsUnknownAllVisible, value);
+    }
+
+    public string SectorsUnknownAllText
+    {
+        get => _sectorsUnknownAllText;
+        set => this.RaiseAndSetIfChanged(ref _sectorsUnknownAllText, value);
+    }
+
+    public string SectorErrorsText
+    {
+        get => _sectorErrorsText;
+        set => this.RaiseAndSetIfChanged(ref _sectorErrorsText, value);
+    }
+
+    public bool SectorErrorsVisible
+    {
+        get => _sectorErrorsVisible;
+        set => this.RaiseAndSetIfChanged(ref _sectorErrorsVisible, value);
+    }
+
+    public bool SectorsUnknownsVisible
+    {
+        get => _sectorsUnknownsVisible;
+        set => this.RaiseAndSetIfChanged(ref _sectorsUnknownsVisible, value);
+    }
+
+    public string SectorsUnknownsText
+    {
+        get => _sectorsUnknownsText;
+        set => this.RaiseAndSetIfChanged(ref _sectorsUnknownsText, value);
+    }
+
+    public bool SectorSummaryVisible
+    {
+        get => _sectorSummaryVisible;
+        set => this.RaiseAndSetIfChanged(ref _sectorSummaryVisible, value);
+    }
+
+    public string TotalSectorsText
+    {
+        get => _totalSectorsText;
+        set => this.RaiseAndSetIfChanged(ref _totalSectorsText, value);
+    }
+
+    public string TotalSectorErrorsText
+    {
+        get => _totalSectorErrorsText;
+        set => this.RaiseAndSetIfChanged(ref _totalSectorErrorsText, value);
+    }
+
+    public string TotalSectorUnknownsText
+    {
+        get => _totalSectorUnknownsText;
+        set => this.RaiseAndSetIfChanged(ref _totalSectorUnknownsText, value);
+    }
+
+    public string TotalSectorErrorsUnknownsText
+    {
+        get => _totalSectorErrorsUnknownsText;
+        set => this.RaiseAndSetIfChanged(ref _totalSectorErrorsUnknownsText, value);
+    }
+
+    public bool OptionsVisible
+    {
+        get => _optionsVisible;
+        set => this.RaiseAndSetIfChanged(ref _optionsVisible, value);
+    }
+
+    public bool ResultsVisible
+    {
+        get => _resultsVisible;
+        set => this.RaiseAndSetIfChanged(ref _resultsVisible, value);
+    }
+
+    public bool ProgressVisible
+    {
+        get => _progressVisible;
+        set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
+    }
+
+    public bool StartVisible
+    {
+        get => _startVisible;
+        set => this.RaiseAndSetIfChanged(ref _startVisible, value);
+    }
+
+    public bool StopVisible
+    {
+        get => _stopVisible;
+        set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
+    }
+
+    public bool CloseVisible
+    {
+        get => _closeVisible;
+        set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
+    }
+
+    public bool StopEnabled
+    {
+        get => _stopEnabled;
+        set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
+    }
+
+    void ExecuteStartCommand()
+    {
+        VerifyImageEnabled   = false;
+        VerifySectorsEnabled = false;
+        CloseVisible         = false;
+        StartVisible         = false;
+        StopVisible          = true;
+        ProgressVisible      = true;
+        Progress2Visible     = false;
+
+        VerifySectorsVisible = _inputFormat is IOpticalMediaImage || _inputFormat is IVerifiableSectorsImage;
+
+        // TODO: Do not offer the option to use this form if the image does not support any kind of verification
+        new Thread(DoWork).Start();
+    }
+
+    async void DoWork()
+    {
+        bool formatHasTracks;
+        var  inputOptical           = _inputFormat as IOpticalMediaImage;
+        var  verifiableSectorsImage = _inputFormat as IVerifiableSectorsImage;
+
+        try
         {
-            _view                = view;
-            StartCommand         = ReactiveCommand.Create(ExecuteStartCommand);
-            CloseCommand         = ReactiveCommand.Create(ExecuteCloseCommand);
-            StopCommand          = ReactiveCommand.Create(ExecuteStopCommand);
-            _inputFormat         = inputFormat;
-            _cancel              = false;
-            ErrorList            = new ObservableCollection<LbaModel>();
-            UnknownList          = new ObservableCollection<LbaModel>();
-            VerifyImageEnabled   = true;
-            VerifySectorsEnabled = true;
-            CloseVisible         = true;
-            StartVisible         = true;
-            OptionsVisible       = true;
+            formatHasTracks = inputOptical?.Tracks?.Count > 0;
+        }
+        catch
+        {
+            formatHasTracks = false;
         }
 
-        public ObservableCollection<LbaModel> ErrorList    { get; }
-        public ObservableCollection<LbaModel> UnknownList  { get; }
-        public ReactiveCommand<Unit, Unit>    StartCommand { get; }
-        public ReactiveCommand<Unit, Unit>    CloseCommand { get; }
-        public ReactiveCommand<Unit, Unit>    StopCommand  { get; }
-
-        public bool VerifyImageEnabled
+        // Setup progress bars
+        await Dispatcher.UIThread.InvokeAsync(() =>
         {
-            get => _verifyImageEnabled;
-            set => this.RaiseAndSetIfChanged(ref _verifyImageEnabled, value);
-        }
+            ProgressVisible  = true;
+            ProgressMaxValue = 0;
 
-        public bool VerifySectorsEnabled
-        {
-            get => _verifySectorsEnabled;
-            set => this.RaiseAndSetIfChanged(ref _verifySectorsEnabled, value);
-        }
+            if(VerifyImageChecked || VerifySectorsChecked)
+                ProgressMaxValue = 1;
 
-        public bool VerifySectorsVisible
-        {
-            get => _verifySectorsVisible;
-            set => this.RaiseAndSetIfChanged(ref _verifySectorsVisible, value);
-        }
-
-        public double ProgressMaxValue
-        {
-            get => _progressMaxValue;
-            set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
-        }
-
-        public bool VerifyImageChecked
-        {
-            get => _verifyImageChecked;
-            set => this.RaiseAndSetIfChanged(ref _verifyImageChecked, value);
-        }
-
-        public bool ProgressIndeterminate
-        {
-            get => _progressIndeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
-        }
-
-        public bool ImageResultVisible
-        {
-            get => _imageResultVisible;
-            set => this.RaiseAndSetIfChanged(ref _imageResultVisible, value);
-        }
-
-        public string ImageResultText
-        {
-            get => _imageResultText;
-            set => this.RaiseAndSetIfChanged(ref _imageResultText, value);
-        }
-
-        public bool VerifySectorsChecked
-        {
-            get => _verifySectorsChecked;
-            set => this.RaiseAndSetIfChanged(ref _verifySectorsChecked, value);
-        }
-
-        public bool Progress2Visible
-        {
-            get => _progress2Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
-        }
-
-        public bool Progress2Indeterminate
-        {
-            get => _progress2Indeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
-        }
-
-        public double Progress2MaxValue
-        {
-            get => _progress2MaxValue;
-            set => this.RaiseAndSetIfChanged(ref _progress2MaxValue, value);
-        }
-
-        public string ProgressText
-        {
-            get => _progressText;
-            set => this.RaiseAndSetIfChanged(ref _progressText, value);
-        }
-
-        public double ProgressValue
-        {
-            get => _progressValue;
-            set => this.RaiseAndSetIfChanged(ref _progressValue, value);
-        }
-
-        public double Progress2Value
-        {
-            get => _progress2Value;
-            set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
-        }
-
-        public string Progress2Text
-        {
-            get => _progress2Text;
-            set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
-        }
-
-        public bool SectorsErrorsAllVisible
-        {
-            get => _sectorsErrorsAllVisible;
-            set => this.RaiseAndSetIfChanged(ref _sectorsErrorsAllVisible, value);
-        }
-
-        public string SectorsErrorsAllText
-        {
-            get => _sectorsErrorsAllText;
-            set => this.RaiseAndSetIfChanged(ref _sectorsErrorsAllText, value);
-        }
-
-        public bool SectorsUnknownAllVisible
-        {
-            get => _sectorsUnknownAllVisible;
-            set => this.RaiseAndSetIfChanged(ref _sectorsUnknownAllVisible, value);
-        }
-
-        public string SectorsUnknownAllText
-        {
-            get => _sectorsUnknownAllText;
-            set => this.RaiseAndSetIfChanged(ref _sectorsUnknownAllText, value);
-        }
-
-        public string SectorErrorsText
-        {
-            get => _sectorErrorsText;
-            set => this.RaiseAndSetIfChanged(ref _sectorErrorsText, value);
-        }
-
-        public bool SectorErrorsVisible
-        {
-            get => _sectorErrorsVisible;
-            set => this.RaiseAndSetIfChanged(ref _sectorErrorsVisible, value);
-        }
-
-        public bool SectorsUnknownsVisible
-        {
-            get => _sectorsUnknownsVisible;
-            set => this.RaiseAndSetIfChanged(ref _sectorsUnknownsVisible, value);
-        }
-
-        public string SectorsUnknownsText
-        {
-            get => _sectorsUnknownsText;
-            set => this.RaiseAndSetIfChanged(ref _sectorsUnknownsText, value);
-        }
-
-        public bool SectorSummaryVisible
-        {
-            get => _sectorSummaryVisible;
-            set => this.RaiseAndSetIfChanged(ref _sectorSummaryVisible, value);
-        }
-
-        public string TotalSectorsText
-        {
-            get => _totalSectorsText;
-            set => this.RaiseAndSetIfChanged(ref _totalSectorsText, value);
-        }
-
-        public string TotalSectorErrorsText
-        {
-            get => _totalSectorErrorsText;
-            set => this.RaiseAndSetIfChanged(ref _totalSectorErrorsText, value);
-        }
-
-        public string TotalSectorUnknownsText
-        {
-            get => _totalSectorUnknownsText;
-            set => this.RaiseAndSetIfChanged(ref _totalSectorUnknownsText, value);
-        }
-
-        public string TotalSectorErrorsUnknownsText
-        {
-            get => _totalSectorErrorsUnknownsText;
-            set => this.RaiseAndSetIfChanged(ref _totalSectorErrorsUnknownsText, value);
-        }
-
-        public bool OptionsVisible
-        {
-            get => _optionsVisible;
-            set => this.RaiseAndSetIfChanged(ref _optionsVisible, value);
-        }
-
-        public bool ResultsVisible
-        {
-            get => _resultsVisible;
-            set => this.RaiseAndSetIfChanged(ref _resultsVisible, value);
-        }
-
-        public bool ProgressVisible
-        {
-            get => _progressVisible;
-            set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
-        }
-
-        public bool StartVisible
-        {
-            get => _startVisible;
-            set => this.RaiseAndSetIfChanged(ref _startVisible, value);
-        }
-
-        public bool StopVisible
-        {
-            get => _stopVisible;
-            set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
-        }
-
-        public bool CloseVisible
-        {
-            get => _closeVisible;
-            set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
-        }
-
-        public bool StopEnabled
-        {
-            get => _stopEnabled;
-            set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
-        }
-
-        void ExecuteStartCommand()
-        {
-            VerifyImageEnabled   = false;
-            VerifySectorsEnabled = false;
-            CloseVisible         = false;
-            StartVisible         = false;
-            StopVisible          = true;
-            ProgressVisible      = true;
-            Progress2Visible     = false;
-
-            VerifySectorsVisible = _inputFormat is IOpticalMediaImage || _inputFormat is IVerifiableSectorsImage;
-
-            // TODO: Do not offer the option to use this form if the image does not support any kind of verification
-            new Thread(DoWork).Start();
-        }
-
-        async void DoWork()
-        {
-            bool formatHasTracks;
-            var  inputOptical           = _inputFormat as IOpticalMediaImage;
-            var  verifiableSectorsImage = _inputFormat as IVerifiableSectorsImage;
-
-            try
+            if(formatHasTracks && inputOptical != null)
+                ProgressMaxValue += inputOptical.Tracks.Count;
+            else
             {
-                formatHasTracks = inputOptical?.Tracks?.Count > 0;
-            }
-            catch
-            {
-                formatHasTracks = false;
-            }
-
-            // Setup progress bars
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                ProgressVisible  = true;
-                ProgressMaxValue = 0;
-
-                if(VerifyImageChecked || VerifySectorsChecked)
-                    ProgressMaxValue = 1;
-
-                if(formatHasTracks && inputOptical != null)
-                    ProgressMaxValue += inputOptical.Tracks.Count;
+                if(VerifySectorsChecked)
+                {
+                    ProgressMaxValue = 2;
+                    Progress2Visible = false;
+                    Progress2Visible = false;
+                }
                 else
                 {
+                    Progress2Visible = true;
+                    Progress2Visible = true;
+                }
+            }
+
+            ProgressMaxValue++;
+        });
+
+        if(VerifyImageChecked)
+        {
+            if(!(_inputFormat is IVerifiableImage verifiableImage))
+                await Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    ImageResultVisible = true;
+                    ImageResultText    = "Disc image does not support verification.";
+                });
+            else
+            {
+                await Dispatcher.UIThread.InvokeAsync(() =>
+                {
+                    ProgressText = "Checking media image...";
+
                     if(VerifySectorsChecked)
-                    {
-                        ProgressMaxValue = 2;
-                        Progress2Visible = false;
-                        Progress2Visible = false;
-                    }
+                        ProgressValue = 1;
                     else
-                    {
-                        Progress2Visible = true;
-                        Progress2Visible = true;
-                    }
-                }
+                        ProgressIndeterminate = true;
 
-                ProgressMaxValue++;
-            });
+                    Progress2Indeterminate = true;
+                });
 
-            if(VerifyImageChecked)
-            {
-                if(!(_inputFormat is IVerifiableImage verifiableImage))
-                    await Dispatcher.UIThread.InvokeAsync(() =>
-                    {
-                        ImageResultVisible = true;
-                        ImageResultText    = "Disc image does not support verification.";
-                    });
-                else
-                {
-                    await Dispatcher.UIThread.InvokeAsync(() =>
-                    {
-                        ProgressText = "Checking media image...";
+                DateTime startCheck      = DateTime.UtcNow;
+                bool?    discCheckStatus = verifiableImage.VerifyMediaImage();
+                DateTime endCheck        = DateTime.UtcNow;
 
-                        if(VerifySectorsChecked)
-                            ProgressValue = 1;
-                        else
-                            ProgressIndeterminate = true;
-
-                        Progress2Indeterminate = true;
-                    });
-
-                    DateTime startCheck      = DateTime.UtcNow;
-                    bool?    discCheckStatus = verifiableImage.VerifyMediaImage();
-                    DateTime endCheck        = DateTime.UtcNow;
-
-                    TimeSpan checkTime = endCheck - startCheck;
-
-                    await Dispatcher.UIThread.InvokeAsync(() =>
-                    {
-                        ImageResultVisible = true;
-
-                        switch(discCheckStatus)
-                        {
-                            case true:
-                                ImageResultText = "Disc image checksums are correct";
-
-                                break;
-                            case false:
-                                ImageResultText = "Disc image checksums are incorrect";
-
-                                break;
-                            case null:
-                                ImageResultText = "Disc image does not contain checksums";
-
-                                break;
-                        }
-                    });
-
-                    AaruConsole.VerboseWriteLine("Checking disc image checksums took {0} seconds",
-                                                 checkTime.TotalSeconds);
-                }
-            }
-
-            if(VerifySectorsChecked)
-            {
-                DateTime    startCheck  = DateTime.Now;
-                DateTime    endCheck    = startCheck;
-                List<ulong> failingLbas = new();
-                List<ulong> unknownLbas = new();
+                TimeSpan checkTime = endCheck - startCheck;
 
                 await Dispatcher.UIThread.InvokeAsync(() =>
                 {
-                    Progress2Visible       = true;
-                    Progress2Indeterminate = false;
-                    Progress2MaxValue      = _inputFormat.Info.Sectors / 512d;
-                    StopEnabled            = true;
+                    ImageResultVisible = true;
+
+                    switch(discCheckStatus)
+                    {
+                        case true:
+                            ImageResultText = "Disc image checksums are correct";
+
+                            break;
+                        case false:
+                            ImageResultText = "Disc image checksums are incorrect";
+
+                            break;
+                        case null:
+                            ImageResultText = "Disc image does not contain checksums";
+
+                            break;
+                    }
                 });
 
-                if(formatHasTracks)
+                AaruConsole.VerboseWriteLine("Checking disc image checksums took {0} seconds",
+                                             checkTime.TotalSeconds);
+            }
+        }
+
+        if(VerifySectorsChecked)
+        {
+            DateTime    startCheck  = DateTime.Now;
+            DateTime    endCheck    = startCheck;
+            List<ulong> failingLbas = new();
+            List<ulong> unknownLbas = new();
+
+            await Dispatcher.UIThread.InvokeAsync(() =>
+            {
+                Progress2Visible       = true;
+                Progress2Indeterminate = false;
+                Progress2MaxValue      = _inputFormat.Info.Sectors / 512d;
+                StopEnabled            = true;
+            });
+
+            if(formatHasTracks)
+            {
+                ulong currentSectorAll = 0;
+
+                startCheck = DateTime.UtcNow;
+
+                foreach(Track currentTrack in inputOptical.Tracks)
                 {
-                    ulong currentSectorAll = 0;
-
-                    startCheck = DateTime.UtcNow;
-
-                    foreach(Track currentTrack in inputOptical.Tracks)
+                    await Dispatcher.UIThread.InvokeAsync(() =>
                     {
-                        await Dispatcher.UIThread.InvokeAsync(() =>
-                        {
-                            ProgressText = $"Verifying track {currentTrack.Sequence} of {inputOptical.Tracks.Count}";
+                        ProgressText = $"Verifying track {currentTrack.Sequence} of {inputOptical.Tracks.Count}";
 
-                            ProgressValue++;
-                        });
+                        ProgressValue++;
+                    });
 
-                        ulong remainingSectors = currentTrack.EndSector - currentTrack.StartSector;
-                        ulong currentSector    = 0;
-
-                        while(remainingSectors > 0)
-                        {
-                            if(_cancel)
-                            {
-                                await Dispatcher.UIThread.InvokeAsync(() =>
-                                {
-                                    CloseVisible = true;
-                                    StartVisible = false;
-                                    StopVisible  = false;
-                                });
-
-                                return;
-                            }
-
-                            ulong all = currentSectorAll;
-
-                            await Dispatcher.UIThread.InvokeAsync(() =>
-                            {
-                                Progress2Value = all / 512d;
-
-                                Progress2Text =
-                                    $"Checking sector {all} of {_inputFormat.Info.Sectors}, on track {currentTrack.Sequence}";
-                            });
-
-                            List<ulong> tempFailingLbas;
-                            List<ulong> tempUnknownLbas;
-
-                            if(remainingSectors < 512)
-                                inputOptical.VerifySectors(currentSector, (uint)remainingSectors, currentTrack.Sequence,
-                                                           out tempFailingLbas, out tempUnknownLbas);
-                            else
-                                inputOptical.VerifySectors(currentSector, 512, currentTrack.Sequence,
-                                                           out tempFailingLbas, out tempUnknownLbas);
-
-                            failingLbas.AddRange(tempFailingLbas);
-
-                            unknownLbas.AddRange(tempUnknownLbas);
-
-                            if(remainingSectors < 512)
-                            {
-                                currentSector    += remainingSectors;
-                                currentSectorAll += remainingSectors;
-                                remainingSectors =  0;
-                            }
-                            else
-                            {
-                                currentSector    += 512;
-                                currentSectorAll += 512;
-                                remainingSectors -= 512;
-                            }
-                        }
-                    }
-
-                    endCheck = DateTime.UtcNow;
-                }
-                else if(!(verifiableSectorsImage is null))
-                {
-                    ulong remainingSectors = _inputFormat.Info.Sectors;
+                    ulong remainingSectors = currentTrack.EndSector - currentTrack.StartSector;
                     ulong currentSector    = 0;
 
-                    startCheck = DateTime.UtcNow;
-
                     while(remainingSectors > 0)
                     {
                         if(_cancel)
@@ -550,23 +488,25 @@ namespace Aaru.Gui.ViewModels.Windows
                             return;
                         }
 
-                        ulong sector = currentSector;
+                        ulong all = currentSectorAll;
 
                         await Dispatcher.UIThread.InvokeAsync(() =>
                         {
-                            Progress2Value = (int)(sector / 512);
-                            Progress2Text  = $"Checking sector {sector} of {_inputFormat.Info.Sectors}";
+                            Progress2Value = all / 512d;
+
+                            Progress2Text =
+                                $"Checking sector {all} of {_inputFormat.Info.Sectors}, on track {currentTrack.Sequence}";
                         });
 
                         List<ulong> tempFailingLbas;
                         List<ulong> tempUnknownLbas;
 
                         if(remainingSectors < 512)
-                            verifiableSectorsImage.VerifySectors(currentSector, (uint)remainingSectors,
-                                                                 out tempFailingLbas, out tempUnknownLbas);
+                            inputOptical.VerifySectors(currentSector, (uint)remainingSectors, currentTrack.Sequence,
+                                                       out tempFailingLbas, out tempUnknownLbas);
                         else
-                            verifiableSectorsImage.VerifySectors(currentSector, 512, out tempFailingLbas,
-                                                                 out tempUnknownLbas);
+                            inputOptical.VerifySectors(currentSector, 512, currentTrack.Sequence,
+                                                       out tempFailingLbas, out tempUnknownLbas);
 
                         failingLbas.AddRange(tempFailingLbas);
 
@@ -575,91 +515,150 @@ namespace Aaru.Gui.ViewModels.Windows
                         if(remainingSectors < 512)
                         {
                             currentSector    += remainingSectors;
+                            currentSectorAll += remainingSectors;
                             remainingSectors =  0;
                         }
                         else
                         {
                             currentSector    += 512;
+                            currentSectorAll += 512;
                             remainingSectors -= 512;
                         }
                     }
-
-                    endCheck = DateTime.UtcNow;
                 }
 
-                TimeSpan checkTime = endCheck - startCheck;
-                AaruConsole.VerboseWriteLine("Checking sector checksums took {0} seconds", checkTime.TotalSeconds);
+                endCheck = DateTime.UtcNow;
+            }
+            else if(!(verifiableSectorsImage is null))
+            {
+                ulong remainingSectors = _inputFormat.Info.Sectors;
+                ulong currentSector    = 0;
 
-                await Dispatcher.UIThread.InvokeAsync(() =>
+                startCheck = DateTime.UtcNow;
+
+                while(remainingSectors > 0)
                 {
-                    if(failingLbas.Count > 0)
+                    if(_cancel)
                     {
-                        if(failingLbas.Count == (int)_inputFormat.Info.Sectors)
+                        await Dispatcher.UIThread.InvokeAsync(() =>
                         {
-                            SectorsErrorsAllVisible = true;
-                            SectorsErrorsAllText    = "All sectors contain errors";
-                        }
-                        else
-                        {
-                            SectorErrorsText    = "LBAs with error:";
-                            SectorErrorsVisible = true;
+                            CloseVisible = true;
+                            StartVisible = false;
+                            StopVisible  = false;
+                        });
 
-                            foreach(ulong t in failingLbas)
-                                ErrorList.Add(new LbaModel
-                                {
-                                    Lba = t.ToString()
-                                });
-                        }
+                        return;
                     }
 
-                    if(unknownLbas.Count > 0)
+                    ulong sector = currentSector;
+
+                    await Dispatcher.UIThread.InvokeAsync(() =>
                     {
-                        if(unknownLbas.Count == (int)_inputFormat.Info.Sectors)
-                        {
-                            SectorsUnknownAllVisible = true;
-                            SectorsUnknownAllText    = "All sectors are unknown";
-                        }
-                        else
-                        {
-                            SectorsUnknownsText    = "Unknown LBAs:";
-                            SectorsUnknownsVisible = true;
+                        Progress2Value = (int)(sector / 512);
+                        Progress2Text  = $"Checking sector {sector} of {_inputFormat.Info.Sectors}";
+                    });
 
-                            foreach(ulong t in unknownLbas)
-                                UnknownList.Add(new LbaModel
-                                {
-                                    Lba = t.ToString()
-                                });
-                        }
+                    List<ulong> tempFailingLbas;
+                    List<ulong> tempUnknownLbas;
+
+                    if(remainingSectors < 512)
+                        verifiableSectorsImage.VerifySectors(currentSector, (uint)remainingSectors,
+                                                             out tempFailingLbas, out tempUnknownLbas);
+                    else
+                        verifiableSectorsImage.VerifySectors(currentSector, 512, out tempFailingLbas,
+                                                             out tempUnknownLbas);
+
+                    failingLbas.AddRange(tempFailingLbas);
+
+                    unknownLbas.AddRange(tempUnknownLbas);
+
+                    if(remainingSectors < 512)
+                    {
+                        currentSector    += remainingSectors;
+                        remainingSectors =  0;
                     }
+                    else
+                    {
+                        currentSector    += 512;
+                        remainingSectors -= 512;
+                    }
+                }
 
-                    SectorSummaryVisible    = true;
-                    TotalSectorsText        = $"Total sectors........... {_inputFormat.Info.Sectors}";
-                    TotalSectorErrorsText   = $"Total errors............ {failingLbas.Count}";
-                    TotalSectorUnknownsText = $"Total unknowns.......... {unknownLbas.Count}";
-
-                    TotalSectorErrorsUnknownsText = $"Total errors+unknowns... {failingLbas.Count + unknownLbas.Count}";
-                });
+                endCheck = DateTime.UtcNow;
             }
 
-            Statistics.AddCommand("verify");
+            TimeSpan checkTime = endCheck - startCheck;
+            AaruConsole.VerboseWriteLine("Checking sector checksums took {0} seconds", checkTime.TotalSeconds);
 
             await Dispatcher.UIThread.InvokeAsync(() =>
             {
-                OptionsVisible  = false;
-                ResultsVisible  = true;
-                ProgressVisible = false;
-                StartVisible    = false;
-                StopVisible     = false;
-                CloseVisible    = true;
+                if(failingLbas.Count > 0)
+                {
+                    if(failingLbas.Count == (int)_inputFormat.Info.Sectors)
+                    {
+                        SectorsErrorsAllVisible = true;
+                        SectorsErrorsAllText    = "All sectors contain errors";
+                    }
+                    else
+                    {
+                        SectorErrorsText    = "LBAs with error:";
+                        SectorErrorsVisible = true;
+
+                        foreach(ulong t in failingLbas)
+                            ErrorList.Add(new LbaModel
+                            {
+                                Lba = t.ToString()
+                            });
+                    }
+                }
+
+                if(unknownLbas.Count > 0)
+                {
+                    if(unknownLbas.Count == (int)_inputFormat.Info.Sectors)
+                    {
+                        SectorsUnknownAllVisible = true;
+                        SectorsUnknownAllText    = "All sectors are unknown";
+                    }
+                    else
+                    {
+                        SectorsUnknownsText    = "Unknown LBAs:";
+                        SectorsUnknownsVisible = true;
+
+                        foreach(ulong t in unknownLbas)
+                            UnknownList.Add(new LbaModel
+                            {
+                                Lba = t.ToString()
+                            });
+                    }
+                }
+
+                SectorSummaryVisible    = true;
+                TotalSectorsText        = $"Total sectors........... {_inputFormat.Info.Sectors}";
+                TotalSectorErrorsText   = $"Total errors............ {failingLbas.Count}";
+                TotalSectorUnknownsText = $"Total unknowns.......... {unknownLbas.Count}";
+
+                TotalSectorErrorsUnknownsText = $"Total errors+unknowns... {failingLbas.Count + unknownLbas.Count}";
             });
         }
 
-        void ExecuteCloseCommand() => _view.Close();
+        Statistics.AddCommand("verify");
 
-        internal void ExecuteStopCommand()
+        await Dispatcher.UIThread.InvokeAsync(() =>
         {
-            _cancel     = true;
-            StopEnabled = false;
-        }
+            OptionsVisible  = false;
+            ResultsVisible  = true;
+            ProgressVisible = false;
+            StartVisible    = false;
+            StopVisible     = false;
+            CloseVisible    = true;
+        });
+    }
+
+    void ExecuteCloseCommand() => _view.Close();
+
+    internal void ExecuteStopCommand()
+    {
+        _cancel     = true;
+        StopEnabled = false;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
index b7aab9b11..5af157613 100644
--- a/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/MainWindowViewModel.cs
@@ -67,788 +67,787 @@ using ImageInfo = Aaru.Gui.Views.Panels.ImageInfo;
 using Partition = Aaru.Gui.Views.Panels.Partition;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class MainWindowViewModel : ViewModelBase
 {
-    public sealed class MainWindowViewModel : ViewModelBase
+    readonly IAssetLoader     _assets;
+    readonly DevicesRootModel _devicesRoot;
+    readonly Bitmap           _ejectIcon;
+    readonly Bitmap           _genericFolderIcon;
+    readonly Bitmap           _genericHddIcon;
+    readonly Bitmap           _genericOpticalIcon;
+    readonly Bitmap           _genericTapeIcon;
+    readonly ImagesRootModel  _imagesRoot;
+    readonly Bitmap           _removableIcon;
+    readonly Bitmap           _sdIcon;
+    readonly Bitmap           _usbIcon;
+    readonly MainWindow       _view;
+    Views.Dialogs.Console     _console;
+    object                    _contentPanel;
+    bool                      _devicesSupported;
+    object                    _treeViewSelectedItem;
+
+    public MainWindowViewModel(MainWindow view)
     {
-        readonly IAssetLoader     _assets;
-        readonly DevicesRootModel _devicesRoot;
-        readonly Bitmap           _ejectIcon;
-        readonly Bitmap           _genericFolderIcon;
-        readonly Bitmap           _genericHddIcon;
-        readonly Bitmap           _genericOpticalIcon;
-        readonly Bitmap           _genericTapeIcon;
-        readonly ImagesRootModel  _imagesRoot;
-        readonly Bitmap           _removableIcon;
-        readonly Bitmap           _sdIcon;
-        readonly Bitmap           _usbIcon;
-        readonly MainWindow       _view;
-        Views.Dialogs.Console     _console;
-        object                    _contentPanel;
-        bool                      _devicesSupported;
-        object                    _treeViewSelectedItem;
+        AboutCommand                = ReactiveCommand.Create(ExecuteAboutCommand);
+        EncodingsCommand            = ReactiveCommand.Create(ExecuteEncodingsCommand);
+        PluginsCommand              = ReactiveCommand.Create(ExecutePluginsCommand);
+        StatisticsCommand           = ReactiveCommand.Create(ExecuteStatisticsCommand);
+        ExitCommand                 = ReactiveCommand.Create(ExecuteExitCommand);
+        SettingsCommand             = ReactiveCommand.Create(ExecuteSettingsCommand);
+        ConsoleCommand              = ReactiveCommand.Create(ExecuteConsoleCommand);
+        OpenCommand                 = ReactiveCommand.Create(ExecuteOpenCommand);
+        CalculateEntropyCommand     = ReactiveCommand.Create(ExecuteCalculateEntropyCommand);
+        VerifyImageCommand          = ReactiveCommand.Create(ExecuteVerifyImageCommand);
+        ChecksumImageCommand        = ReactiveCommand.Create(ExecuteChecksumImageCommand);
+        ConvertImageCommand         = ReactiveCommand.Create(ExecuteConvertImageCommand);
+        CreateSidecarCommand        = ReactiveCommand.Create(ExecuteCreateSidecarCommand);
+        ViewImageSectorsCommand     = ReactiveCommand.Create(ExecuteViewImageSectorsCommand);
+        DecodeImageMediaTagsCommand = ReactiveCommand.Create(ExecuteDecodeImageMediaTagsCommand);
+        RefreshDevicesCommand       = ReactiveCommand.Create(ExecuteRefreshDevicesCommand);
+        _view                       = view;
+        TreeRoot                    = new ObservableCollection<RootModel>();
+        _assets                     = AvaloniaLocator.Current.GetService<IAssetLoader>();
+        ContentPanel                = Greeting;
 
-        public MainWindowViewModel(MainWindow view)
+        _imagesRoot = new ImagesRootModel
         {
-            AboutCommand                = ReactiveCommand.Create(ExecuteAboutCommand);
-            EncodingsCommand            = ReactiveCommand.Create(ExecuteEncodingsCommand);
-            PluginsCommand              = ReactiveCommand.Create(ExecutePluginsCommand);
-            StatisticsCommand           = ReactiveCommand.Create(ExecuteStatisticsCommand);
-            ExitCommand                 = ReactiveCommand.Create(ExecuteExitCommand);
-            SettingsCommand             = ReactiveCommand.Create(ExecuteSettingsCommand);
-            ConsoleCommand              = ReactiveCommand.Create(ExecuteConsoleCommand);
-            OpenCommand                 = ReactiveCommand.Create(ExecuteOpenCommand);
-            CalculateEntropyCommand     = ReactiveCommand.Create(ExecuteCalculateEntropyCommand);
-            VerifyImageCommand          = ReactiveCommand.Create(ExecuteVerifyImageCommand);
-            ChecksumImageCommand        = ReactiveCommand.Create(ExecuteChecksumImageCommand);
-            ConvertImageCommand         = ReactiveCommand.Create(ExecuteConvertImageCommand);
-            CreateSidecarCommand        = ReactiveCommand.Create(ExecuteCreateSidecarCommand);
-            ViewImageSectorsCommand     = ReactiveCommand.Create(ExecuteViewImageSectorsCommand);
-            DecodeImageMediaTagsCommand = ReactiveCommand.Create(ExecuteDecodeImageMediaTagsCommand);
-            RefreshDevicesCommand       = ReactiveCommand.Create(ExecuteRefreshDevicesCommand);
-            _view                       = view;
-            TreeRoot                    = new ObservableCollection<RootModel>();
-            _assets                     = AvaloniaLocator.Current.GetService<IAssetLoader>();
-            ContentPanel                = Greeting;
+            Name = "Images"
+        };
 
-            _imagesRoot = new ImagesRootModel
+        TreeRoot.Add(_imagesRoot);
+
+        switch(DetectOS.GetRealPlatformID())
+        {
+            case PlatformID.Win32NT:
+            case PlatformID.Linux:
+            case PlatformID.FreeBSD:
+                _devicesRoot = new DevicesRootModel
+                {
+                    Name = "Devices"
+                };
+
+                TreeRoot.Add(_devicesRoot);
+                DevicesSupported = true;
+
+                break;
+        }
+
+        _genericHddIcon =
+            new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-harddisk.png")));
+
+        _genericOpticalIcon =
+            new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-optical.png")));
+
+        _genericTapeIcon =
+            new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/media-tape.png")));
+
+        _genericFolderIcon =
+            new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/inode-directory.png")));
+
+        _usbIcon =
+            new
+                Bitmap(_assets.Open(new
+                                        Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-removable-media-usb.png")));
+
+        _removableIcon =
+            new
+                Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-removable-media.png")));
+
+        _sdIcon =
+            new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/media-flash-sd-mmc.png")));
+
+        _ejectIcon =
+            new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/media-eject.png")));
+    }
+
+    public bool DevicesSupported
+    {
+        get => _devicesSupported;
+        set => this.RaiseAndSetIfChanged(ref _devicesSupported, value);
+    }
+
+    public bool NativeMenuSupported =>
+        NativeMenu.GetIsNativeMenuExported((Application.Current.ApplicationLifetime as
+                                                IClassicDesktopStyleApplicationLifetime)?.MainWindow);
+
+    [NotNull]
+    public string Greeting => "Welcome to Aaru!";
+    public ObservableCollection<RootModel> TreeRoot                    { get; }
+    public ReactiveCommand<Unit, Unit>     AboutCommand                { get; }
+    public ReactiveCommand<Unit, Unit>     ConsoleCommand              { get; }
+    public ReactiveCommand<Unit, Unit>     EncodingsCommand            { get; }
+    public ReactiveCommand<Unit, Unit>     PluginsCommand              { get; }
+    public ReactiveCommand<Unit, Unit>     StatisticsCommand           { get; }
+    public ReactiveCommand<Unit, Unit>     ExitCommand                 { get; }
+    public ReactiveCommand<Unit, Unit>     SettingsCommand             { get; }
+    public ReactiveCommand<Unit, Unit>     OpenCommand                 { get; }
+    public ReactiveCommand<Unit, Unit>     CalculateEntropyCommand     { get; }
+    public ReactiveCommand<Unit, Unit>     VerifyImageCommand          { get; }
+    public ReactiveCommand<Unit, Unit>     ChecksumImageCommand        { get; }
+    public ReactiveCommand<Unit, Unit>     ConvertImageCommand         { get; }
+    public ReactiveCommand<Unit, Unit>     CreateSidecarCommand        { get; }
+    public ReactiveCommand<Unit, Unit>     ViewImageSectorsCommand     { get; }
+    public ReactiveCommand<Unit, Unit>     DecodeImageMediaTagsCommand { get; }
+    public ReactiveCommand<Unit, Unit>     RefreshDevicesCommand       { get; }
+
+    public object ContentPanel
+    {
+        get => _contentPanel;
+        set => this.RaiseAndSetIfChanged(ref _contentPanel, value);
+    }
+
+    public object TreeViewSelectedItem
+    {
+        get => _treeViewSelectedItem;
+        set
+        {
+            if(value == _treeViewSelectedItem)
+                return;
+
+            this.RaiseAndSetIfChanged(ref _treeViewSelectedItem, value);
+
+            ContentPanel = null;
+
+            switch(value)
             {
-                Name = "Images"
-            };
-
-            TreeRoot.Add(_imagesRoot);
-
-            switch(DetectOS.GetRealPlatformID())
-            {
-                case PlatformID.Win32NT:
-                case PlatformID.Linux:
-                case PlatformID.FreeBSD:
-                    _devicesRoot = new DevicesRootModel
+                case ImageModel imageModel:
+                    ContentPanel = new ImageInfo
                     {
-                        Name = "Devices"
+                        DataContext = imageModel.ViewModel
                     };
 
-                    TreeRoot.Add(_devicesRoot);
-                    DevicesSupported = true;
+                    break;
+                case PartitionModel partitionModel:
+                    ContentPanel = new Partition
+                    {
+                        DataContext = partitionModel.ViewModel
+                    };
 
                     break;
-            }
-
-            _genericHddIcon =
-                new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-harddisk.png")));
-
-            _genericOpticalIcon =
-                new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-optical.png")));
-
-            _genericTapeIcon =
-                new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/media-tape.png")));
-
-            _genericFolderIcon =
-                new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/inode-directory.png")));
-
-            _usbIcon =
-                new
-                    Bitmap(_assets.Open(new
-                                            Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-removable-media-usb.png")));
-
-            _removableIcon =
-                new
-                    Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/drive-removable-media.png")));
-
-            _sdIcon =
-                new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/media-flash-sd-mmc.png")));
-
-            _ejectIcon =
-                new Bitmap(_assets.Open(new Uri("avares://Aaru.Gui/Assets/Icons/oxygen/32x32/media-eject.png")));
-        }
-
-        public bool DevicesSupported
-        {
-            get => _devicesSupported;
-            set => this.RaiseAndSetIfChanged(ref _devicesSupported, value);
-        }
-
-        public bool NativeMenuSupported =>
-            NativeMenu.GetIsNativeMenuExported((Application.Current.ApplicationLifetime as
-                                                    IClassicDesktopStyleApplicationLifetime)?.MainWindow);
-
-        [NotNull]
-        public string Greeting => "Welcome to Aaru!";
-        public ObservableCollection<RootModel> TreeRoot                    { get; }
-        public ReactiveCommand<Unit, Unit>     AboutCommand                { get; }
-        public ReactiveCommand<Unit, Unit>     ConsoleCommand              { get; }
-        public ReactiveCommand<Unit, Unit>     EncodingsCommand            { get; }
-        public ReactiveCommand<Unit, Unit>     PluginsCommand              { get; }
-        public ReactiveCommand<Unit, Unit>     StatisticsCommand           { get; }
-        public ReactiveCommand<Unit, Unit>     ExitCommand                 { get; }
-        public ReactiveCommand<Unit, Unit>     SettingsCommand             { get; }
-        public ReactiveCommand<Unit, Unit>     OpenCommand                 { get; }
-        public ReactiveCommand<Unit, Unit>     CalculateEntropyCommand     { get; }
-        public ReactiveCommand<Unit, Unit>     VerifyImageCommand          { get; }
-        public ReactiveCommand<Unit, Unit>     ChecksumImageCommand        { get; }
-        public ReactiveCommand<Unit, Unit>     ConvertImageCommand         { get; }
-        public ReactiveCommand<Unit, Unit>     CreateSidecarCommand        { get; }
-        public ReactiveCommand<Unit, Unit>     ViewImageSectorsCommand     { get; }
-        public ReactiveCommand<Unit, Unit>     DecodeImageMediaTagsCommand { get; }
-        public ReactiveCommand<Unit, Unit>     RefreshDevicesCommand       { get; }
-
-        public object ContentPanel
-        {
-            get => _contentPanel;
-            set => this.RaiseAndSetIfChanged(ref _contentPanel, value);
-        }
-
-        public object TreeViewSelectedItem
-        {
-            get => _treeViewSelectedItem;
-            set
-            {
-                if(value == _treeViewSelectedItem)
-                    return;
-
-                this.RaiseAndSetIfChanged(ref _treeViewSelectedItem, value);
-
-                ContentPanel = null;
-
-                switch(value)
-                {
-                    case ImageModel imageModel:
-                        ContentPanel = new ImageInfo
-                        {
-                            DataContext = imageModel.ViewModel
-                        };
-
-                        break;
-                    case PartitionModel partitionModel:
-                        ContentPanel = new Partition
-                        {
-                            DataContext = partitionModel.ViewModel
-                        };
-
-                        break;
-                    case FileSystemModel fileSystemModel:
-                        ContentPanel = new FileSystem
-                        {
-                            DataContext = fileSystemModel.ViewModel
-                        };
-
-                        break;
-                    case SubdirectoryModel subdirectoryModel:
-                        ContentPanel = new Subdirectory
-                        {
-                            DataContext = new SubdirectoryViewModel(subdirectoryModel, _view)
-                        };
-
-                        break;
-                    case DeviceModel deviceModel:
+                case FileSystemModel fileSystemModel:
+                    ContentPanel = new FileSystem
                     {
-                        if(deviceModel.ViewModel is null)
+                        DataContext = fileSystemModel.ViewModel
+                    };
+
+                    break;
+                case SubdirectoryModel subdirectoryModel:
+                    ContentPanel = new Subdirectory
+                    {
+                        DataContext = new SubdirectoryViewModel(subdirectoryModel, _view)
+                    };
+
+                    break;
+                case DeviceModel deviceModel:
+                {
+                    if(deviceModel.ViewModel is null)
+                    {
+                        try
                         {
-                            try
+                            var dev = new Device(deviceModel.Path);
+
+                            if(dev.IsRemote)
+                                Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion,
+                                                     dev.RemoteOperatingSystem, dev.RemoteOperatingSystemVersion,
+                                                     dev.RemoteArchitecture);
+
+                            if(dev.Error)
                             {
-                                var dev = new Device(deviceModel.Path);
-
-                                if(dev.IsRemote)
-                                    Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion,
-                                                         dev.RemoteOperatingSystem, dev.RemoteOperatingSystemVersion,
-                                                         dev.RemoteArchitecture);
-
-                                if(dev.Error)
-                                {
-                                    ContentPanel = $"Error {dev.LastError} opening device";
-
-                                    return;
-                                }
-
-                                var devInfo = new DeviceInfo(dev);
-
-                                deviceModel.ViewModel = new DeviceInfoViewModel(devInfo, _view);
-
-                                if(!dev.IsRemovable)
-                                    deviceModel.Media.Add(new MediaModel
-                                    {
-                                        NonRemovable = true,
-                                        Name         = "Non-removable device commands not yet implemented"
-                                    });
-                                else
-                                {
-                                    // TODO: Removable non-SCSI?
-                                    var scsiInfo = new ScsiInfo(dev);
-
-                                    if(!scsiInfo.MediaInserted)
-                                        deviceModel.Media.Add(new MediaModel
-                                        {
-                                            NoMediaInserted = true,
-                                            Icon            = _ejectIcon,
-                                            Name            = "No media inserted"
-                                        });
-                                    else
-                                    {
-                                        var mediaResource =
-                                            new Uri($"avares://Aaru.Gui/Assets/Logos/Media/{scsiInfo.MediaType}.png");
-
-                                        deviceModel.Media.Add(new MediaModel
-                                        {
-                                            DevicePath = deviceModel.Path,
-                                            Icon = _assets.Exists(mediaResource)
-                                                       ? new Bitmap(_assets.Open(mediaResource)) : null,
-                                            Name      = $"{scsiInfo.MediaType}",
-                                            ViewModel = new MediaInfoViewModel(scsiInfo, deviceModel.Path, _view)
-                                        });
-                                    }
-                                }
-
-                                dev.Close();
-                            }
-                            catch(SystemException ex)
-                            {
-                                if(Debugger.IsAttached)
-                                    throw;
-
-                                ContentPanel = ex.Message;
-                                AaruConsole.ErrorWriteLine(ex.Message);
+                                ContentPanel = $"Error {dev.LastError} opening device";
 
                                 return;
                             }
-                        }
 
-                        ContentPanel = new Views.Panels.DeviceInfo
+                            var devInfo = new DeviceInfo(dev);
+
+                            deviceModel.ViewModel = new DeviceInfoViewModel(devInfo, _view);
+
+                            if(!dev.IsRemovable)
+                                deviceModel.Media.Add(new MediaModel
+                                {
+                                    NonRemovable = true,
+                                    Name         = "Non-removable device commands not yet implemented"
+                                });
+                            else
+                            {
+                                // TODO: Removable non-SCSI?
+                                var scsiInfo = new ScsiInfo(dev);
+
+                                if(!scsiInfo.MediaInserted)
+                                    deviceModel.Media.Add(new MediaModel
+                                    {
+                                        NoMediaInserted = true,
+                                        Icon            = _ejectIcon,
+                                        Name            = "No media inserted"
+                                    });
+                                else
+                                {
+                                    var mediaResource =
+                                        new Uri($"avares://Aaru.Gui/Assets/Logos/Media/{scsiInfo.MediaType}.png");
+
+                                    deviceModel.Media.Add(new MediaModel
+                                    {
+                                        DevicePath = deviceModel.Path,
+                                        Icon = _assets.Exists(mediaResource)
+                                                   ? new Bitmap(_assets.Open(mediaResource)) : null,
+                                        Name      = $"{scsiInfo.MediaType}",
+                                        ViewModel = new MediaInfoViewModel(scsiInfo, deviceModel.Path, _view)
+                                    });
+                                }
+                            }
+
+                            dev.Close();
+                        }
+                        catch(SystemException ex)
                         {
-                            DataContext = deviceModel.ViewModel
+                            if(Debugger.IsAttached)
+                                throw;
+
+                            ContentPanel = ex.Message;
+                            AaruConsole.ErrorWriteLine(ex.Message);
+
+                            return;
+                        }
+                    }
+
+                    ContentPanel = new Views.Panels.DeviceInfo
+                    {
+                        DataContext = deviceModel.ViewModel
+                    };
+
+                    break;
+                }
+                case MediaModel { NonRemovable: true }:
+                    ContentPanel = "Non-removable device commands not yet implemented";
+
+                    break;
+                case MediaModel { NoMediaInserted: true }:
+                    ContentPanel = "No media inserted";
+
+                    break;
+                case MediaModel mediaModel:
+                {
+                    if(mediaModel.ViewModel != null)
+                        ContentPanel = new MediaInfo
+                        {
+                            DataContext = mediaModel.ViewModel
                         };
 
-                        break;
-                    }
-                    case MediaModel { NonRemovable: true }:
-                        ContentPanel = "Non-removable device commands not yet implemented";
-
-                        break;
-                    case MediaModel { NoMediaInserted: true }:
-                        ContentPanel = "No media inserted";
-
-                        break;
-                    case MediaModel mediaModel:
-                    {
-                        if(mediaModel.ViewModel != null)
-                            ContentPanel = new MediaInfo
-                            {
-                                DataContext = mediaModel.ViewModel
-                            };
-
-                        break;
-                    }
+                    break;
                 }
             }
         }
+    }
 
-        void ExecuteCalculateEntropyCommand()
+    void ExecuteCalculateEntropyCommand()
+    {
+        if(!(TreeViewSelectedItem is ImageModel imageModel))
+            return;
+
+        var imageEntropyWindow = new ImageEntropy();
+        imageEntropyWindow.DataContext = new ImageEntropyViewModel(imageModel.Image, imageEntropyWindow);
+
+        imageEntropyWindow.Closed += (sender, args) => imageEntropyWindow = null;
+
+        imageEntropyWindow.Show();
+    }
+
+    void ExecuteVerifyImageCommand()
+    {
+        if(!(TreeViewSelectedItem is ImageModel imageModel))
+            return;
+
+        var imageVerifyWindow = new ImageVerify();
+        imageVerifyWindow.DataContext = new ImageVerifyViewModel(imageModel.Image, imageVerifyWindow);
+
+        imageVerifyWindow.Closed += (sender, args) => imageVerifyWindow = null;
+
+        imageVerifyWindow.Show();
+    }
+
+    void ExecuteChecksumImageCommand()
+    {
+        if(!(TreeViewSelectedItem is ImageModel imageModel))
+            return;
+
+        var imageChecksumWindow = new ImageChecksum();
+        imageChecksumWindow.DataContext = new ImageChecksumViewModel(imageModel.Image, imageChecksumWindow);
+
+        imageChecksumWindow.Closed += (sender, args) => imageChecksumWindow = null;
+
+        imageChecksumWindow.Show();
+    }
+
+    void ExecuteConvertImageCommand()
+    {
+        if(!(TreeViewSelectedItem is ImageModel imageModel))
+            return;
+
+        var imageConvertWindow = new ImageConvert();
+
+        imageConvertWindow.DataContext =
+            new ImageConvertViewModel(imageModel.Image, imageModel.Path, imageConvertWindow);
+
+        imageConvertWindow.Closed += (sender, args) => imageConvertWindow = null;
+
+        imageConvertWindow.Show();
+    }
+
+    void ExecuteCreateSidecarCommand()
+    {
+        if(!(TreeViewSelectedItem is ImageModel imageModel))
+            return;
+
+        var imageSidecarWindow = new ImageSidecar();
+
+        // TODO: Pass thru chosen default encoding
+        imageSidecarWindow.DataContext =
+            new ImageSidecarViewModel(imageModel.Image, imageModel.Path, imageModel.Filter.Id, null,
+                                      imageSidecarWindow);
+
+        imageSidecarWindow.Show();
+    }
+
+    void ExecuteViewImageSectorsCommand()
+    {
+        if(!(TreeViewSelectedItem is ImageModel imageModel))
+            return;
+
+        new ViewSector
         {
-            if(!(TreeViewSelectedItem is ImageModel imageModel))
-                return;
+            DataContext = new ViewSectorViewModel(imageModel.Image)
+        }.Show();
+    }
 
-            var imageEntropyWindow = new ImageEntropy();
-            imageEntropyWindow.DataContext = new ImageEntropyViewModel(imageModel.Image, imageEntropyWindow);
+    void ExecuteDecodeImageMediaTagsCommand()
+    {
+        if(!(TreeViewSelectedItem is ImageModel imageModel))
+            return;
 
-            imageEntropyWindow.Closed += (sender, args) => imageEntropyWindow = null;
+        new DecodeMediaTags
+        {
+            DataContext = new DecodeMediaTagsViewModel(imageModel.Image)
+        }.Show();
+    }
 
-            imageEntropyWindow.Show();
+    internal void ExecuteAboutCommand()
+    {
+        var dialog = new About();
+        dialog.DataContext = new AboutViewModel(dialog);
+        dialog.ShowDialog(_view);
+    }
+
+    void ExecuteEncodingsCommand()
+    {
+        var dialog = new Encodings();
+        dialog.DataContext = new EncodingsViewModel(dialog);
+        dialog.ShowDialog(_view);
+    }
+
+    void ExecutePluginsCommand()
+    {
+        var dialog = new PluginsDialog();
+        dialog.DataContext = new PluginsViewModel(dialog);
+        dialog.ShowDialog(_view);
+    }
+
+    void ExecuteStatisticsCommand()
+    {
+        using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+
+        if(!ctx.Commands.Any()     &&
+           !ctx.Filesystems.Any()  &&
+           !ctx.Filters.Any()      &&
+           !ctx.MediaFormats.Any() &&
+           !ctx.Medias.Any()       &&
+           !ctx.Partitions.Any()   &&
+           !ctx.SeenDevices.Any())
+        {
+            MessageBoxManager.GetMessageBoxStandardWindow("Warning", "There are no statistics.").ShowDialog(_view);
+
+            return;
         }
 
-        void ExecuteVerifyImageCommand()
+        var dialog = new StatisticsDialog();
+        dialog.DataContext = new StatisticsViewModel(dialog);
+        dialog.ShowDialog(_view);
+    }
+
+    internal async void ExecuteSettingsCommand()
+    {
+        var dialog = new SettingsDialog();
+        dialog.DataContext = new SettingsViewModel(dialog, false);
+        await dialog.ShowDialog(_view);
+    }
+
+    internal void ExecuteExitCommand() =>
+        (Application.Current.ApplicationLifetime as ClassicDesktopStyleApplicationLifetime)?.Shutdown();
+
+    void ExecuteConsoleCommand()
+    {
+        if(_console is null)
         {
-            if(!(TreeViewSelectedItem is ImageModel imageModel))
-                return;
-
-            var imageVerifyWindow = new ImageVerify();
-            imageVerifyWindow.DataContext = new ImageVerifyViewModel(imageModel.Image, imageVerifyWindow);
-
-            imageVerifyWindow.Closed += (sender, args) => imageVerifyWindow = null;
-
-            imageVerifyWindow.Show();
+            _console             = new Views.Dialogs.Console();
+            _console.DataContext = new ConsoleViewModel(_console);
         }
 
-        void ExecuteChecksumImageCommand()
+        _console.Show();
+    }
+
+    async void ExecuteOpenCommand()
+    {
+        // TODO: Extensions
+        var dlgOpenImage = new OpenFileDialog
         {
-            if(!(TreeViewSelectedItem is ImageModel imageModel))
-                return;
+            Title         = "Choose image to open",
+            AllowMultiple = false
+        };
 
-            var imageChecksumWindow = new ImageChecksum();
-            imageChecksumWindow.DataContext = new ImageChecksumViewModel(imageModel.Image, imageChecksumWindow);
+        string[] result = await dlgOpenImage.ShowAsync(_view);
 
-            imageChecksumWindow.Closed += (sender, args) => imageChecksumWindow = null;
+        if(result?.Length != 1)
+            return;
 
-            imageChecksumWindow.Show();
+        var     filtersList = new FiltersList();
+        IFilter inputFilter = filtersList.GetFilter(result[0]);
+
+        if(inputFilter == null)
+        {
+            MessageBoxManager.GetMessageBoxStandardWindow("Error", "Cannot open specified file.", ButtonEnum.Ok,
+                                                          Icon.Error);
+
+            return;
         }
 
-        void ExecuteConvertImageCommand()
+        try
         {
-            if(!(TreeViewSelectedItem is ImageModel imageModel))
-                return;
+            IMediaImage imageFormat = ImageFormat.Detect(inputFilter) as IMediaImage;
 
-            var imageConvertWindow = new ImageConvert();
-
-            imageConvertWindow.DataContext =
-                new ImageConvertViewModel(imageModel.Image, imageModel.Path, imageConvertWindow);
-
-            imageConvertWindow.Closed += (sender, args) => imageConvertWindow = null;
-
-            imageConvertWindow.Show();
-        }
-
-        void ExecuteCreateSidecarCommand()
-        {
-            if(!(TreeViewSelectedItem is ImageModel imageModel))
-                return;
-
-            var imageSidecarWindow = new ImageSidecar();
-
-            // TODO: Pass thru chosen default encoding
-            imageSidecarWindow.DataContext =
-                new ImageSidecarViewModel(imageModel.Image, imageModel.Path, imageModel.Filter.Id, null,
-                                          imageSidecarWindow);
-
-            imageSidecarWindow.Show();
-        }
-
-        void ExecuteViewImageSectorsCommand()
-        {
-            if(!(TreeViewSelectedItem is ImageModel imageModel))
-                return;
-
-            new ViewSector
+            if(imageFormat == null)
             {
-                DataContext = new ViewSectorViewModel(imageModel.Image)
-            }.Show();
-        }
-
-        void ExecuteDecodeImageMediaTagsCommand()
-        {
-            if(!(TreeViewSelectedItem is ImageModel imageModel))
-                return;
-
-            new DecodeMediaTags
-            {
-                DataContext = new DecodeMediaTagsViewModel(imageModel.Image)
-            }.Show();
-        }
-
-        internal void ExecuteAboutCommand()
-        {
-            var dialog = new About();
-            dialog.DataContext = new AboutViewModel(dialog);
-            dialog.ShowDialog(_view);
-        }
-
-        void ExecuteEncodingsCommand()
-        {
-            var dialog = new Encodings();
-            dialog.DataContext = new EncodingsViewModel(dialog);
-            dialog.ShowDialog(_view);
-        }
-
-        void ExecutePluginsCommand()
-        {
-            var dialog = new PluginsDialog();
-            dialog.DataContext = new PluginsViewModel(dialog);
-            dialog.ShowDialog(_view);
-        }
-
-        void ExecuteStatisticsCommand()
-        {
-            using var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-            if(!ctx.Commands.Any()     &&
-               !ctx.Filesystems.Any()  &&
-               !ctx.Filters.Any()      &&
-               !ctx.MediaFormats.Any() &&
-               !ctx.Medias.Any()       &&
-               !ctx.Partitions.Any()   &&
-               !ctx.SeenDevices.Any())
-            {
-                MessageBoxManager.GetMessageBoxStandardWindow("Warning", "There are no statistics.").ShowDialog(_view);
+                MessageBoxManager.GetMessageBoxStandardWindow("Error", "Image format not identified.",
+                                                              ButtonEnum.Ok, Icon.Error);
 
                 return;
             }
 
-            var dialog = new StatisticsDialog();
-            dialog.DataContext = new StatisticsViewModel(dialog);
-            dialog.ShowDialog(_view);
-        }
-
-        internal async void ExecuteSettingsCommand()
-        {
-            var dialog = new SettingsDialog();
-            dialog.DataContext = new SettingsViewModel(dialog, false);
-            await dialog.ShowDialog(_view);
-        }
-
-        internal void ExecuteExitCommand() =>
-            (Application.Current.ApplicationLifetime as ClassicDesktopStyleApplicationLifetime)?.Shutdown();
-
-        void ExecuteConsoleCommand()
-        {
-            if(_console is null)
-            {
-                _console             = new Views.Dialogs.Console();
-                _console.DataContext = new ConsoleViewModel(_console);
-            }
-
-            _console.Show();
-        }
-
-        async void ExecuteOpenCommand()
-        {
-            // TODO: Extensions
-            var dlgOpenImage = new OpenFileDialog
-            {
-                Title         = "Choose image to open",
-                AllowMultiple = false
-            };
-
-            string[] result = await dlgOpenImage.ShowAsync(_view);
-
-            if(result?.Length != 1)
-                return;
-
-            var     filtersList = new FiltersList();
-            IFilter inputFilter = filtersList.GetFilter(result[0]);
-
-            if(inputFilter == null)
-            {
-                MessageBoxManager.GetMessageBoxStandardWindow("Error", "Cannot open specified file.", ButtonEnum.Ok,
-                                                              Icon.Error);
-
-                return;
-            }
+            AaruConsole.WriteLine("Image format identified by {0} ({1}).", imageFormat.Name, imageFormat.Id);
 
             try
             {
-                IMediaImage imageFormat = ImageFormat.Detect(inputFilter) as IMediaImage;
+                ErrorNumber opened = imageFormat.Open(inputFilter);
 
-                if(imageFormat == null)
+                if(opened != ErrorNumber.NoError)
                 {
-                    MessageBoxManager.GetMessageBoxStandardWindow("Error", "Image format not identified.",
+                    MessageBoxManager.GetMessageBoxStandardWindow("Error", $"Error {opened} opening image format.",
                                                                   ButtonEnum.Ok, Icon.Error);
 
+                    AaruConsole.ErrorWriteLine("Unable to open image format");
+                    AaruConsole.ErrorWriteLine("No error given");
+
                     return;
                 }
 
-                AaruConsole.WriteLine("Image format identified by {0} ({1}).", imageFormat.Name, imageFormat.Id);
+                var mediaResource =
+                    new Uri($"avares://Aaru.Gui/Assets/Logos/Media/{imageFormat.Info.MediaType}.png");
 
-                try
+                var imageModel = new ImageModel
                 {
-                    ErrorNumber opened = imageFormat.Open(inputFilter);
+                    Path = result[0],
+                    Icon = _assets.Exists(mediaResource)
+                               ? new Bitmap(_assets.Open(mediaResource))
+                               : imageFormat.Info.XmlMediaType == XmlMediaType.BlockMedia
+                                   ? _genericHddIcon
+                                   : imageFormat.Info.XmlMediaType == XmlMediaType.OpticalDisc
+                                       ? _genericOpticalIcon
+                                       : _genericFolderIcon,
+                    FileName  = Path.GetFileName(result[0]),
+                    Image     = imageFormat,
+                    ViewModel = new ImageInfoViewModel(result[0], inputFilter, imageFormat, _view),
+                    Filter    = inputFilter
+                };
 
-                    if(opened != ErrorNumber.NoError)
+                List<CommonTypes.Partition> partitions = Core.Partitions.GetAll(imageFormat);
+                Core.Partitions.AddSchemesToStats(partitions);
+
+                bool         checkRaw = false;
+                List<string> idPlugins;
+                IFilesystem  plugin;
+                PluginBase   plugins = GetPluginBase.Instance;
+
+                if(partitions.Count == 0)
+                {
+                    AaruConsole.DebugWriteLine("Fs-info command", "No partitions found");
+
+                    checkRaw = true;
+                }
+                else
+                {
+                    AaruConsole.WriteLine("{0} partitions found.", partitions.Count);
+
+                    foreach(string scheme in partitions.Select(p => p.Scheme).Distinct().OrderBy(s => s))
                     {
-                        MessageBoxManager.GetMessageBoxStandardWindow("Error", $"Error {opened} opening image format.",
-                                                                      ButtonEnum.Ok, Icon.Error);
-
-                        AaruConsole.ErrorWriteLine("Unable to open image format");
-                        AaruConsole.ErrorWriteLine("No error given");
-
-                        return;
-                    }
-
-                    var mediaResource =
-                        new Uri($"avares://Aaru.Gui/Assets/Logos/Media/{imageFormat.Info.MediaType}.png");
-
-                    var imageModel = new ImageModel
-                    {
-                        Path = result[0],
-                        Icon = _assets.Exists(mediaResource)
-                                   ? new Bitmap(_assets.Open(mediaResource))
-                                   : imageFormat.Info.XmlMediaType == XmlMediaType.BlockMedia
-                                       ? _genericHddIcon
-                                       : imageFormat.Info.XmlMediaType == XmlMediaType.OpticalDisc
-                                           ? _genericOpticalIcon
-                                           : _genericFolderIcon,
-                        FileName  = Path.GetFileName(result[0]),
-                        Image     = imageFormat,
-                        ViewModel = new ImageInfoViewModel(result[0], inputFilter, imageFormat, _view),
-                        Filter    = inputFilter
-                    };
-
-                    List<CommonTypes.Partition> partitions = Core.Partitions.GetAll(imageFormat);
-                    Core.Partitions.AddSchemesToStats(partitions);
-
-                    bool         checkRaw = false;
-                    List<string> idPlugins;
-                    IFilesystem  plugin;
-                    PluginBase   plugins = GetPluginBase.Instance;
-
-                    if(partitions.Count == 0)
-                    {
-                        AaruConsole.DebugWriteLine("Fs-info command", "No partitions found");
-
-                        checkRaw = true;
-                    }
-                    else
-                    {
-                        AaruConsole.WriteLine("{0} partitions found.", partitions.Count);
-
-                        foreach(string scheme in partitions.Select(p => p.Scheme).Distinct().OrderBy(s => s))
+                        // TODO: Add icons to partition schemes
+                        var schemeModel = new PartitionSchemeModel
                         {
-                            // TODO: Add icons to partition schemes
-                            var schemeModel = new PartitionSchemeModel
-                            {
-                                Name = scheme
-                            };
-
-                            foreach(CommonTypes.Partition partition in partitions.Where(p => p.Scheme == scheme).
-                                OrderBy(p => p.Start))
-                            {
-                                var partitionModel = new PartitionModel
-                                {
-                                    // TODO: Add icons to partition types
-                                    Name      = $"{partition.Name} ({partition.Type})",
-                                    Partition = partition,
-                                    ViewModel = new PartitionViewModel(partition)
-                                };
-
-                                AaruConsole.WriteLine("Identifying filesystem on partition");
-
-                                Core.Filesystems.Identify(imageFormat, out idPlugins, partition);
-
-                                if(idPlugins.Count == 0)
-                                    AaruConsole.WriteLine("Filesystem not identified");
-                                else
-                                {
-                                    AaruConsole.WriteLine($"Identified by {idPlugins.Count} plugins");
-
-                                    foreach(string pluginName in idPlugins)
-                                        if(plugins.PluginsList.TryGetValue(pluginName, out plugin))
-                                        {
-                                            plugin.GetInformation(imageFormat, partition, out string information, null);
-
-                                            var fsPlugin = plugin as IReadOnlyFilesystem;
-
-                                            if(fsPlugin != null)
-                                            {
-                                                ErrorNumber error =
-                                                    fsPlugin.Mount(imageFormat, partition, null,
-                                                                   new Dictionary<string, string>(), null);
-
-                                                if(error != ErrorNumber.NoError)
-                                                    fsPlugin = null;
-                                            }
-
-                                            var filesystemModel = new FileSystemModel
-                                            {
-                                                VolumeName =
-                                                    plugin.XmlFsType.VolumeName is null ? $"{plugin.XmlFsType.Type}"
-                                                        : $"{plugin.XmlFsType.VolumeName} ({plugin.XmlFsType.Type})",
-                                                Filesystem = plugin,
-                                                ReadOnlyFilesystem = fsPlugin,
-                                                ViewModel = new FileSystemViewModel(plugin.XmlFsType, information)
-                                            };
-
-                                            // TODO: Trap expanding item
-                                            if(fsPlugin != null)
-                                            {
-                                                filesystemModel.Roots.Add(new SubdirectoryModel
-                                                {
-                                                    Name   = "/",
-                                                    Path   = "",
-                                                    Plugin = fsPlugin
-                                                });
-
-                                                Statistics.AddCommand("ls");
-                                            }
-
-                                            Statistics.AddFilesystem(plugin.XmlFsType.Type);
-                                            partitionModel.FileSystems.Add(filesystemModel);
-                                        }
-                                }
-
-                                schemeModel.Partitions.Add(partitionModel);
-                            }
-
-                            imageModel.PartitionSchemesOrFileSystems.Add(schemeModel);
-                        }
-                    }
-
-                    if(checkRaw)
-                    {
-                        var wholePart = new CommonTypes.Partition
-                        {
-                            Name   = "Whole device",
-                            Length = imageFormat.Info.Sectors,
-                            Size   = imageFormat.Info.Sectors * imageFormat.Info.SectorSize
+                            Name = scheme
                         };
 
-                        Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
-
-                        if(idPlugins.Count == 0)
-                            AaruConsole.WriteLine("Filesystem not identified");
-                        else
+                        foreach(CommonTypes.Partition partition in partitions.Where(p => p.Scheme == scheme).
+                                                                              OrderBy(p => p.Start))
                         {
-                            AaruConsole.WriteLine($"Identified by {idPlugins.Count} plugins");
+                            var partitionModel = new PartitionModel
+                            {
+                                // TODO: Add icons to partition types
+                                Name      = $"{partition.Name} ({partition.Type})",
+                                Partition = partition,
+                                ViewModel = new PartitionViewModel(partition)
+                            };
 
-                            foreach(string pluginName in idPlugins)
-                                if(plugins.PluginsList.TryGetValue(pluginName, out plugin))
-                                {
-                                    plugin.GetInformation(imageFormat, wholePart, out string information, null);
+                            AaruConsole.WriteLine("Identifying filesystem on partition");
 
-                                    var fsPlugin = plugin as IReadOnlyFilesystem;
+                            Core.Filesystems.Identify(imageFormat, out idPlugins, partition);
 
-                                    if(fsPlugin != null)
+                            if(idPlugins.Count == 0)
+                                AaruConsole.WriteLine("Filesystem not identified");
+                            else
+                            {
+                                AaruConsole.WriteLine($"Identified by {idPlugins.Count} plugins");
+
+                                foreach(string pluginName in idPlugins)
+                                    if(plugins.PluginsList.TryGetValue(pluginName, out plugin))
                                     {
-                                        ErrorNumber error = fsPlugin.Mount(imageFormat, wholePart, null,
-                                                                           new Dictionary<string, string>(), null);
+                                        plugin.GetInformation(imageFormat, partition, out string information, null);
 
-                                        if(error != ErrorNumber.NoError)
-                                            fsPlugin = null;
-                                    }
+                                        var fsPlugin = plugin as IReadOnlyFilesystem;
 
-                                    var filesystemModel = new FileSystemModel
-                                    {
-                                        VolumeName = plugin.XmlFsType.VolumeName is null ? $"{plugin.XmlFsType.Type}"
-                                                         : $"{plugin.XmlFsType.VolumeName} ({plugin.XmlFsType.Type})",
-                                        Filesystem         = plugin,
-                                        ReadOnlyFilesystem = fsPlugin,
-                                        ViewModel          = new FileSystemViewModel(plugin.XmlFsType, information)
-                                    };
-
-                                    // TODO: Trap expanding item
-                                    if(fsPlugin != null)
-                                    {
-                                        filesystemModel.Roots.Add(new SubdirectoryModel
+                                        if(fsPlugin != null)
                                         {
-                                            Name   = "/",
-                                            Path   = "",
-                                            Plugin = fsPlugin
-                                        });
+                                            ErrorNumber error =
+                                                fsPlugin.Mount(imageFormat, partition, null,
+                                                               new Dictionary<string, string>(), null);
 
-                                        Statistics.AddCommand("ls");
+                                            if(error != ErrorNumber.NoError)
+                                                fsPlugin = null;
+                                        }
+
+                                        var filesystemModel = new FileSystemModel
+                                        {
+                                            VolumeName =
+                                                plugin.XmlFsType.VolumeName is null ? $"{plugin.XmlFsType.Type}"
+                                                    : $"{plugin.XmlFsType.VolumeName} ({plugin.XmlFsType.Type})",
+                                            Filesystem         = plugin,
+                                            ReadOnlyFilesystem = fsPlugin,
+                                            ViewModel          = new FileSystemViewModel(plugin.XmlFsType, information)
+                                        };
+
+                                        // TODO: Trap expanding item
+                                        if(fsPlugin != null)
+                                        {
+                                            filesystemModel.Roots.Add(new SubdirectoryModel
+                                            {
+                                                Name   = "/",
+                                                Path   = "",
+                                                Plugin = fsPlugin
+                                            });
+
+                                            Statistics.AddCommand("ls");
+                                        }
+
+                                        Statistics.AddFilesystem(plugin.XmlFsType.Type);
+                                        partitionModel.FileSystems.Add(filesystemModel);
                                     }
+                            }
 
-                                    Statistics.AddFilesystem(plugin.XmlFsType.Type);
-                                    imageModel.PartitionSchemesOrFileSystems.Add(filesystemModel);
-                                }
+                            schemeModel.Partitions.Add(partitionModel);
                         }
+
+                        imageModel.PartitionSchemesOrFileSystems.Add(schemeModel);
                     }
-
-                    Statistics.AddMediaFormat(imageFormat.Format);
-                    Statistics.AddMedia(imageFormat.Info.MediaType, false);
-                    Statistics.AddFilter(inputFilter.Name);
-
-                    _imagesRoot.Images.Add(imageModel);
                 }
-                catch(Exception ex)
+
+                if(checkRaw)
                 {
-                    MessageBoxManager.GetMessageBoxStandardWindow("Error", "Unable to open image format.",
-                                                                  ButtonEnum.Ok, Icon.Error);
+                    var wholePart = new CommonTypes.Partition
+                    {
+                        Name   = "Whole device",
+                        Length = imageFormat.Info.Sectors,
+                        Size   = imageFormat.Info.Sectors * imageFormat.Info.SectorSize
+                    };
 
-                    AaruConsole.ErrorWriteLine("Unable to open image format");
-                    AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
-                    AaruConsole.DebugWriteLine("Image-info command", "Stack trace: {0}", ex.StackTrace);
+                    Core.Filesystems.Identify(imageFormat, out idPlugins, wholePart);
+
+                    if(idPlugins.Count == 0)
+                        AaruConsole.WriteLine("Filesystem not identified");
+                    else
+                    {
+                        AaruConsole.WriteLine($"Identified by {idPlugins.Count} plugins");
+
+                        foreach(string pluginName in idPlugins)
+                            if(plugins.PluginsList.TryGetValue(pluginName, out plugin))
+                            {
+                                plugin.GetInformation(imageFormat, wholePart, out string information, null);
+
+                                var fsPlugin = plugin as IReadOnlyFilesystem;
+
+                                if(fsPlugin != null)
+                                {
+                                    ErrorNumber error = fsPlugin.Mount(imageFormat, wholePart, null,
+                                                                       new Dictionary<string, string>(), null);
+
+                                    if(error != ErrorNumber.NoError)
+                                        fsPlugin = null;
+                                }
+
+                                var filesystemModel = new FileSystemModel
+                                {
+                                    VolumeName = plugin.XmlFsType.VolumeName is null ? $"{plugin.XmlFsType.Type}"
+                                                     : $"{plugin.XmlFsType.VolumeName} ({plugin.XmlFsType.Type})",
+                                    Filesystem         = plugin,
+                                    ReadOnlyFilesystem = fsPlugin,
+                                    ViewModel          = new FileSystemViewModel(plugin.XmlFsType, information)
+                                };
+
+                                // TODO: Trap expanding item
+                                if(fsPlugin != null)
+                                {
+                                    filesystemModel.Roots.Add(new SubdirectoryModel
+                                    {
+                                        Name   = "/",
+                                        Path   = "",
+                                        Plugin = fsPlugin
+                                    });
+
+                                    Statistics.AddCommand("ls");
+                                }
+
+                                Statistics.AddFilesystem(plugin.XmlFsType.Type);
+                                imageModel.PartitionSchemesOrFileSystems.Add(filesystemModel);
+                            }
+                    }
                 }
+
+                Statistics.AddMediaFormat(imageFormat.Format);
+                Statistics.AddMedia(imageFormat.Info.MediaType, false);
+                Statistics.AddFilter(inputFilter.Name);
+
+                _imagesRoot.Images.Add(imageModel);
             }
             catch(Exception ex)
             {
-                MessageBoxManager.GetMessageBoxStandardWindow("Error", "Exception reading file.", ButtonEnum.Ok,
-                                                              Icon.Error);
+                MessageBoxManager.GetMessageBoxStandardWindow("Error", "Unable to open image format.",
+                                                              ButtonEnum.Ok, Icon.Error);
 
-                AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
-                AaruConsole.DebugWriteLine("Image-info command", ex.StackTrace);
+                AaruConsole.ErrorWriteLine("Unable to open image format");
+                AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
+                AaruConsole.DebugWriteLine("Image-info command", "Stack trace: {0}", ex.StackTrace);
             }
+        }
+        catch(Exception ex)
+        {
+            MessageBoxManager.GetMessageBoxStandardWindow("Error", "Exception reading file.", ButtonEnum.Ok,
+                                                          Icon.Error);
 
-            Statistics.AddCommand("image-info");
+            AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
+            AaruConsole.DebugWriteLine("Image-info command", ex.StackTrace);
         }
 
-        internal void LoadComplete() => RefreshDevices();
+        Statistics.AddCommand("image-info");
+    }
 
-        void ExecuteRefreshDevicesCommand() => RefreshDevices();
+    internal void LoadComplete() => RefreshDevices();
 
-        void RefreshDevices()
+    void ExecuteRefreshDevicesCommand() => RefreshDevices();
+
+    void RefreshDevices()
+    {
+        if(!DevicesSupported)
+            return;
+
+        try
         {
-            if(!DevicesSupported)
-                return;
+            AaruConsole.WriteLine("Refreshing devices");
+            _devicesRoot.Devices.Clear();
 
-            try
+            foreach(Devices.DeviceInfo device in Device.ListDevices().Where(d => d.Supported).
+                                                        OrderBy(d => d.Vendor).ThenBy(d => d.Model))
             {
-                AaruConsole.WriteLine("Refreshing devices");
-                _devicesRoot.Devices.Clear();
+                AaruConsole.DebugWriteLine("Main window",
+                                           "Found supported device model {0} by manufacturer {1} on bus {2} and path {3}",
+                                           device.Model, device.Vendor, device.Bus, device.Path);
 
-                foreach(Devices.DeviceInfo device in Device.ListDevices().Where(d => d.Supported).
-                                                            OrderBy(d => d.Vendor).ThenBy(d => d.Model))
+                var deviceModel = new DeviceModel
                 {
-                    AaruConsole.DebugWriteLine("Main window",
-                                               "Found supported device model {0} by manufacturer {1} on bus {2} and path {3}",
-                                               device.Model, device.Vendor, device.Bus, device.Path);
+                    Icon = _genericHddIcon,
+                    Name = $"{device.Vendor} {device.Model} ({device.Bus})",
+                    Path = device.Path
+                };
 
-                    var deviceModel = new DeviceModel
+                try
+                {
+                    var dev = new Device(device.Path);
+
+                    if(dev.IsRemote)
+                        Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
+                                             dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
+
+                    switch(dev.Type)
                     {
-                        Icon = _genericHddIcon,
-                        Name = $"{device.Vendor} {device.Model} ({device.Bus})",
-                        Path = device.Path
-                    };
+                        case DeviceType.ATAPI:
+                        case DeviceType.SCSI:
+                            switch(dev.ScsiType)
+                            {
+                                case PeripheralDeviceTypes.DirectAccess:
+                                case PeripheralDeviceTypes.SCSIZonedBlockDevice:
+                                case PeripheralDeviceTypes.SimplifiedDevice:
+                                    deviceModel.Icon = dev.IsRemovable ? dev.IsUsb
+                                                                             ? _usbIcon
+                                                                             : _removableIcon : _genericHddIcon;
 
-                    try
-                    {
-                        var dev = new Device(device.Path);
+                                    break;
+                                case PeripheralDeviceTypes.SequentialAccess:
+                                    deviceModel.Icon = _genericTapeIcon;
 
-                        if(dev.IsRemote)
-                            Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
-                                                 dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
+                                    break;
+                                case PeripheralDeviceTypes.OpticalDevice:
+                                case PeripheralDeviceTypes.WriteOnceDevice:
+                                case PeripheralDeviceTypes.OCRWDevice:
+                                    deviceModel.Icon = _removableIcon;
 
-                        switch(dev.Type)
-                        {
-                            case DeviceType.ATAPI:
-                            case DeviceType.SCSI:
-                                switch(dev.ScsiType)
-                                {
-                                    case PeripheralDeviceTypes.DirectAccess:
-                                    case PeripheralDeviceTypes.SCSIZonedBlockDevice:
-                                    case PeripheralDeviceTypes.SimplifiedDevice:
-                                        deviceModel.Icon = dev.IsRemovable ? dev.IsUsb
-                                                                                 ? _usbIcon
-                                                                                 : _removableIcon : _genericHddIcon;
+                                    break;
+                                case PeripheralDeviceTypes.MultiMediaDevice:
+                                    deviceModel.Icon = _genericOpticalIcon;
 
-                                        break;
-                                    case PeripheralDeviceTypes.SequentialAccess:
-                                        deviceModel.Icon = _genericTapeIcon;
+                                    break;
+                            }
 
-                                        break;
-                                    case PeripheralDeviceTypes.OpticalDevice:
-                                    case PeripheralDeviceTypes.WriteOnceDevice:
-                                    case PeripheralDeviceTypes.OCRWDevice:
-                                        deviceModel.Icon = _removableIcon;
+                            break;
+                        case DeviceType.SecureDigital:
+                        case DeviceType.MMC:
+                            deviceModel.Icon = _sdIcon;
 
-                                        break;
-                                    case PeripheralDeviceTypes.MultiMediaDevice:
-                                        deviceModel.Icon = _genericOpticalIcon;
+                            break;
+                        case DeviceType.NVMe:
+                            deviceModel.Icon = null;
 
-                                        break;
-                                }
-
-                                break;
-                            case DeviceType.SecureDigital:
-                            case DeviceType.MMC:
-                                deviceModel.Icon = _sdIcon;
-
-                                break;
-                            case DeviceType.NVMe:
-                                deviceModel.Icon = null;
-
-                                break;
-                        }
-
-                        dev.Close();
-                    }
-                    catch
-                    {
-                        // ignored
+                            break;
                     }
 
-                    _devicesRoot.Devices.Add(deviceModel);
+                    dev.Close();
                 }
+                catch
+                {
+                    // ignored
+                }
+
+                _devicesRoot.Devices.Add(deviceModel);
             }
-            catch(InvalidOperationException ex)
-            {
-                AaruConsole.ErrorWriteLine(ex.Message);
-            }
+        }
+        catch(InvalidOperationException ex)
+        {
+            AaruConsole.ErrorWriteLine(ex.Message);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs b/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs
index cce20e6e9..f80a64309 100644
--- a/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/MediaDumpViewModel.cs
@@ -60,853 +60,852 @@ using Schemas;
 using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
 using MediaType = Aaru.CommonTypes.MediaType;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class MediaDumpViewModel : ViewModelBase
 {
-    public sealed class MediaDumpViewModel : ViewModelBase
+    readonly string  _devicePath;
+    readonly Window  _view;
+    bool             _closeVisible;
+    string           _destination;
+    bool             _destinationEnabled;
+    Device           _dev;
+    Dump             _dumper;
+    string           _encodingEnabled;
+    bool             _encodingVisible;
+    bool             _existingMetadata;
+    bool             _force;
+    string           _formatReadOnly;
+    string           _log;
+    bool             _optionsVisible;
+    string           _outputPrefix;
+    bool             _persistent;
+    bool             _progress1Visible;
+    bool             _progress2Indeterminate;
+    double           _progress2MaxValue;
+    string           _progress2Text;
+    double           _progress2Value;
+    bool             _progress2Visible;
+    bool             _progressIndeterminate;
+    double           _progressMaxValue;
+    string           _progressText;
+    double           _progressValue;
+    bool             _progressVisible;
+    Resume           _resume;
+    double           _retries;
+    EncodingModel    _selectedEncoding;
+    ImagePluginModel _selectedPlugin;
+    CICMMetadataType _sidecar;
+    double           _skipped;
+    bool             _startVisible;
+    bool             _stopEnabled;
+    bool             _stopOnError;
+    bool             _stopVisible;
+    bool             _track1Pregap;
+    bool             _track1PregapVisible;
+    bool             _trim;
+    bool             _useResume;
+    bool             _useSidecar;
+
+    public MediaDumpViewModel(string devicePath, DeviceInfo deviceInfo, Window view,
+                              [CanBeNull] ScsiInfo scsiInfo = null)
     {
-        readonly string  _devicePath;
-        readonly Window  _view;
-        bool             _closeVisible;
-        string           _destination;
-        bool             _destinationEnabled;
-        Device           _dev;
-        Dump             _dumper;
-        string           _encodingEnabled;
-        bool             _encodingVisible;
-        bool             _existingMetadata;
-        bool             _force;
-        string           _formatReadOnly;
-        string           _log;
-        bool             _optionsVisible;
-        string           _outputPrefix;
-        bool             _persistent;
-        bool             _progress1Visible;
-        bool             _progress2Indeterminate;
-        double           _progress2MaxValue;
-        string           _progress2Text;
-        double           _progress2Value;
-        bool             _progress2Visible;
-        bool             _progressIndeterminate;
-        double           _progressMaxValue;
-        string           _progressText;
-        double           _progressValue;
-        bool             _progressVisible;
-        Resume           _resume;
-        double           _retries;
-        EncodingModel    _selectedEncoding;
-        ImagePluginModel _selectedPlugin;
-        CICMMetadataType _sidecar;
-        double           _skipped;
-        bool             _startVisible;
-        bool             _stopEnabled;
-        bool             _stopOnError;
-        bool             _stopVisible;
-        bool             _track1Pregap;
-        bool             _track1PregapVisible;
-        bool             _trim;
-        bool             _useResume;
-        bool             _useSidecar;
+        _view              = view;
+        DestinationEnabled = true;
+        StartVisible       = true;
+        CloseVisible       = true;
+        OptionsVisible     = true;
+        StartCommand       = ReactiveCommand.Create(ExecuteStartCommand);
+        CloseCommand       = ReactiveCommand.Create(ExecuteCloseCommand);
+        StopCommand        = ReactiveCommand.Create(ExecuteStopCommand);
+        DestinationCommand = ReactiveCommand.Create(ExecuteDestinationCommand);
+        PluginsList        = new ObservableCollection<ImagePluginModel>();
+        Encodings          = new ObservableCollection<EncodingModel>();
 
-        public MediaDumpViewModel(string devicePath, DeviceInfo deviceInfo, Window view,
-                                  [CanBeNull] ScsiInfo scsiInfo = null)
-        {
-            _view              = view;
-            DestinationEnabled = true;
-            StartVisible       = true;
-            CloseVisible       = true;
-            OptionsVisible     = true;
-            StartCommand       = ReactiveCommand.Create(ExecuteStartCommand);
-            CloseCommand       = ReactiveCommand.Create(ExecuteCloseCommand);
-            StopCommand        = ReactiveCommand.Create(ExecuteStopCommand);
-            DestinationCommand = ReactiveCommand.Create(ExecuteDestinationCommand);
-            PluginsList        = new ObservableCollection<ImagePluginModel>();
-            Encodings          = new ObservableCollection<EncodingModel>();
+        // Defaults
+        StopOnError      = false;
+        Force            = false;
+        Persistent       = true;
+        Resume           = true;
+        Track1Pregap     = false;
+        Sidecar          = true;
+        Trim             = true;
+        ExistingMetadata = false;
+        Retries          = 5;
+        Skipped          = 512;
 
-            // Defaults
-            StopOnError      = false;
-            Force            = false;
-            Persistent       = true;
-            Resume           = true;
-            Track1Pregap     = false;
-            Sidecar          = true;
-            Trim             = true;
-            ExistingMetadata = false;
-            Retries          = 5;
-            Skipped          = 512;
+        MediaType mediaType;
 
-            MediaType mediaType;
-
-            if(scsiInfo != null)
-                mediaType = scsiInfo.MediaType;
-            else
-                switch(deviceInfo.Type)
-                {
-                    case DeviceType.SecureDigital:
-                        mediaType = MediaType.SecureDigital;
-
-                        break;
-                    case DeviceType.MMC:
-                        mediaType = MediaType.MMC;
-
-                        break;
-                    default:
-                        if(deviceInfo.IsPcmcia)
-                            mediaType = MediaType.PCCardTypeII;
-                        else if(deviceInfo.IsCompactFlash)
-                            mediaType = MediaType.CompactFlash;
-                        else
-                            mediaType = MediaType.GENERIC_HDD;
-
-                        break;
-                }
-
-            PluginBase plugins = GetPluginBase.Instance;
-
-            foreach(IWritableImage plugin in
-                plugins.WritableImages.Values.Where(p => p.SupportedMediaTypes.Contains(mediaType)))
-                PluginsList.Add(new ImagePluginModel
-                {
-                    Plugin = plugin
-                });
-
-            Encodings.AddRange(Encoding.GetEncodings().Select(info => new EncodingModel
+        if(scsiInfo != null)
+            mediaType = scsiInfo.MediaType;
+        else
+            switch(deviceInfo.Type)
             {
-                Name        = info.Name,
-                DisplayName = info.GetEncoding().EncodingName
-            }));
+                case DeviceType.SecureDigital:
+                    mediaType = MediaType.SecureDigital;
 
-            Encodings.AddRange(Claunia.Encoding.Encoding.GetEncodings().Select(info => new EncodingModel
-            {
-                Name        = info.Name,
-                DisplayName = info.DisplayName
-            }));
-
-            switch(mediaType)
-            {
-                case MediaType.CD:
-                case MediaType.CDDA:
-                case MediaType.CDG:
-                case MediaType.CDEG:
-                case MediaType.CDI:
-                case MediaType.CDROM:
-                case MediaType.CDROMXA:
-                case MediaType.CDPLUS:
-                case MediaType.CDMO:
-                case MediaType.CDR:
-                case MediaType.CDRW:
-                case MediaType.CDMRW:
-                case MediaType.VCD:
-                case MediaType.SVCD:
-                case MediaType.PCD:
-                case MediaType.DDCD:
-                case MediaType.DDCDR:
-                case MediaType.DDCDRW:
-                case MediaType.DTSCD:
-                case MediaType.CDMIDI:
-                case MediaType.CDV:
-                case MediaType.CDIREADY:
-                case MediaType.FMTOWNS:
-                case MediaType.PS1CD:
-                case MediaType.PS2CD:
-                case MediaType.MEGACD:
-                case MediaType.SATURNCD:
-                case MediaType.GDROM:
-                case MediaType.GDR:
-                case MediaType.MilCD:
-                case MediaType.SuperCDROM2:
-                case MediaType.JaguarCD:
-                case MediaType.ThreeDO:
-                case MediaType.PCFX:
-                case MediaType.NeoGeoCD:
-                case MediaType.CDTV:
-                case MediaType.CD32:
-                case MediaType.Playdia:
-                case MediaType.Pippin:
-                case MediaType.VideoNow:
-                case MediaType.VideoNowColor:
-                case MediaType.VideoNowXp:
-                case MediaType.CVD:
-                    Track1PregapVisible = true;
+                    break;
+                case DeviceType.MMC:
+                    mediaType = MediaType.MMC;
 
                     break;
                 default:
-                    Track1PregapVisible = false;
+                    if(deviceInfo.IsPcmcia)
+                        mediaType = MediaType.PCCardTypeII;
+                    else if(deviceInfo.IsCompactFlash)
+                        mediaType = MediaType.CompactFlash;
+                    else
+                        mediaType = MediaType.GENERIC_HDD;
 
                     break;
             }
 
-            _devicePath = devicePath;
-        }
+        PluginBase plugins = GetPluginBase.Instance;
 
-        public ReactiveCommand<Unit, Unit> StartCommand       { get; }
-        public ReactiveCommand<Unit, Unit> CloseCommand       { get; }
-        public ReactiveCommand<Unit, Unit> StopCommand        { get; }
-        public ReactiveCommand<Unit, Unit> DestinationCommand { get; }
-
-        public ObservableCollection<ImagePluginModel> PluginsList { get; }
-        public ObservableCollection<EncodingModel>    Encodings   { get; }
-
-        public string Title { get; }
-
-        public bool OptionsVisible
-        {
-            get => _optionsVisible;
-            set => this.RaiseAndSetIfChanged(ref _optionsVisible, value);
-        }
-
-        public ImagePluginModel SelectedPlugin
-        {
-            get => _selectedPlugin;
-            set
+        foreach(IWritableImage plugin in
+                plugins.WritableImages.Values.Where(p => p.SupportedMediaTypes.Contains(mediaType)))
+            PluginsList.Add(new ImagePluginModel
             {
-                this.RaiseAndSetIfChanged(ref _selectedPlugin, value);
-
-                Destination = "";
-
-                if(value is null)
-                {
-                    DestinationEnabled = false;
-
-                    return;
-                }
-
-                DestinationEnabled = true;
-
-                if(!value.Plugin.SupportedOptions.Any())
-                {
-                    // Hide options
-                }
-
-                /* TODO: Plugin options
-                grpOptions.Visible = true;
-
-                var stkOptions = new StackLayout
-                {
-                    Orientation = Orientation.Vertical
-                };
-
-                foreach((string name, Type type, string description, object @default) option in plugin.SupportedOptions)
-                    switch(option.type.ToString())
-                    {
-                        case "System.Boolean":
-                            var optBoolean = new CheckBox();
-                            optBoolean.ID      = "opt" + option.name;
-                            optBoolean.Text    = option.description;
-                            optBoolean.Checked = (bool)option.@default;
-                            stkOptions.Items.Add(optBoolean);
-
-                            break;
-                        case "System.SByte":
-                        case "System.Int16":
-                        case "System.Int32":
-                        case "System.Int64":
-                            var stkNumber = new StackLayout();
-                            stkNumber.Orientation = Orientation.Horizontal;
-                            var optNumber = new NumericStepper();
-                            optNumber.ID    = "opt" + option.name;
-                            optNumber.Value = Convert.ToDouble(option.@default);
-                            stkNumber.Items.Add(optNumber);
-                            var lblNumber = new Label();
-                            lblNumber.Text = option.description;
-                            stkNumber.Items.Add(lblNumber);
-                            stkOptions.Items.Add(stkNumber);
-
-                            break;
-                        case "System.Byte":
-                        case "System.UInt16":
-                        case "System.UInt32":
-                        case "System.UInt64":
-                            var stkUnsigned = new StackLayout();
-                            stkUnsigned.Orientation = Orientation.Horizontal;
-                            var optUnsigned = new NumericStepper();
-                            optUnsigned.ID       = "opt" + option.name;
-                            optUnsigned.MinValue = 0;
-                            optUnsigned.Value    = Convert.ToDouble(option.@default);
-                            stkUnsigned.Items.Add(optUnsigned);
-                            var lblUnsigned = new Label();
-                            lblUnsigned.Text = option.description;
-                            stkUnsigned.Items.Add(lblUnsigned);
-                            stkOptions.Items.Add(stkUnsigned);
-
-                            break;
-                        case "System.Single":
-                        case "System.Double":
-                            var stkFloat = new StackLayout();
-                            stkFloat.Orientation = Orientation.Horizontal;
-                            var optFloat = new NumericStepper();
-                            optFloat.ID            = "opt" + option.name;
-                            optFloat.DecimalPlaces = 2;
-                            optFloat.Value         = Convert.ToDouble(option.@default);
-                            stkFloat.Items.Add(optFloat);
-                            var lblFloat = new Label();
-                            lblFloat.Text = option.description;
-                            stkFloat.Items.Add(lblFloat);
-                            stkOptions.Items.Add(stkFloat);
-
-                            break;
-                        case "System.Guid":
-                            // TODO
-                            break;
-                        case "System.String":
-                            var stkString = new StackLayout();
-                            stkString.Orientation = Orientation.Horizontal;
-                            var lblString = new Label();
-                            lblString.Text = option.description;
-                            stkString.Items.Add(lblString);
-                            var optString = new TextBox();
-                            optString.ID   = "opt" + option.name;
-                            optString.Text = (string)option.@default;
-                            stkString.Items.Add(optString);
-                            stkOptions.Items.Add(stkString);
-
-                            break;
-                    }
-
-                grpOptions.Content = stkOptions;
-    */
-            }
-        }
-
-        public string FormatReadOnly
-        {
-            get => _formatReadOnly;
-            set => this.RaiseAndSetIfChanged(ref _formatReadOnly, value);
-        }
-
-        public string Destination
-        {
-            get => _destination;
-            set => this.RaiseAndSetIfChanged(ref _destination, value);
-        }
-
-        public bool DestinationEnabled
-        {
-            get => _destinationEnabled;
-            set => this.RaiseAndSetIfChanged(ref _destinationEnabled, value);
-        }
-
-        public bool StopOnError
-        {
-            get => _stopOnError;
-            set => this.RaiseAndSetIfChanged(ref _stopOnError, value);
-        }
-
-        public bool Force
-        {
-            get => _force;
-            set => this.RaiseAndSetIfChanged(ref _force, value);
-        }
-
-        public double Retries
-        {
-            get => _retries;
-            set => this.RaiseAndSetIfChanged(ref _retries, value);
-        }
-
-        public bool Persistent
-        {
-            get => _persistent;
-            set => this.RaiseAndSetIfChanged(ref _persistent, value);
-        }
-
-        public bool Resume
-        {
-            get => _useResume;
-            set
-            {
-                this.RaiseAndSetIfChanged(ref _useResume, value);
-
-                if(value == false)
-                    return;
-
-                if(_outputPrefix != null)
-                    CheckResumeFile();
-            }
-        }
-
-        public bool Track1Pregap
-        {
-            get => _track1Pregap;
-            set => this.RaiseAndSetIfChanged(ref _track1Pregap, value);
-        }
-
-        public bool Track1PregapVisible
-        {
-            get => _track1PregapVisible;
-            set => this.RaiseAndSetIfChanged(ref _track1PregapVisible, value);
-        }
-
-        public double Skipped
-        {
-            get => _skipped;
-            set => this.RaiseAndSetIfChanged(ref _skipped, value);
-        }
-
-        public bool Sidecar
-        {
-            get => _useSidecar;
-            set
-            {
-                this.RaiseAndSetIfChanged(ref _useSidecar, value);
-                EncodingVisible = value;
-            }
-        }
-
-        public bool EncodingVisible
-        {
-            get => _encodingVisible;
-            set => this.RaiseAndSetIfChanged(ref _encodingVisible, value);
-        }
-
-        public bool Trim
-        {
-            get => _trim;
-            set => this.RaiseAndSetIfChanged(ref _trim, value);
-        }
-
-        public bool ExistingMetadata
-        {
-            get => _existingMetadata;
-            set
-            {
-                this.RaiseAndSetIfChanged(ref _existingMetadata, value);
-
-                if(value == false)
-                {
-                    _sidecar = null;
-
-                    return;
-                }
-
-                var dlgMetadata = new OpenFileDialog
-                {
-                    Title = "Choose existing metadata sidecar"
-                };
-
-                dlgMetadata.Filters.Add(new FileDialogFilter
-                {
-                    Name = "CICM XML metadata",
-                    Extensions = new List<string>(new[]
-                    {
-                        ".xml"
-                    })
-                });
-
-                string[] result = dlgMetadata.ShowAsync(_view).Result;
-
-                if(result?.Length != 1)
-                {
-                    ExistingMetadata = false;
-
-                    return;
-                }
-
-                var sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
-
-                try
-                {
-                    var sr = new StreamReader(result[0]);
-                    _sidecar = (CICMMetadataType)sidecarXs.Deserialize(sr);
-                    sr.Close();
-                }
-                catch
-                {
-                    // ReSharper disable AssignmentIsFullyDiscarded
-                    _ = MessageBoxManager.
-
-                        // ReSharper restore AssignmentIsFullyDiscarded
-                        GetMessageBoxStandardWindow("Error", "Incorrect metadata sidecar file...", ButtonEnum.Ok,
-                                                    Icon.Error).ShowDialog(_view).Result;
-
-                    ExistingMetadata = false;
-                }
-            }
-        }
-
-        public EncodingModel SelectedEncoding
-        {
-            get => _selectedEncoding;
-            set => this.RaiseAndSetIfChanged(ref _selectedEncoding, value);
-        }
-
-        public string EncodingEnabled
-        {
-            get => _encodingEnabled;
-            set => this.RaiseAndSetIfChanged(ref _encodingEnabled, value);
-        }
-
-        public bool ProgressVisible
-        {
-            get => _progressVisible;
-            set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
-        }
-
-        public string Log
-        {
-            get => _log;
-            set => this.RaiseAndSetIfChanged(ref _log, value);
-        }
-
-        public bool Progress1Visible
-        {
-            get => _progress1Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
-        }
-
-        public string ProgressText
-        {
-            get => _progressText;
-            set => this.RaiseAndSetIfChanged(ref _progressText, value);
-        }
-
-        public double ProgressValue
-        {
-            get => _progressValue;
-            set => this.RaiseAndSetIfChanged(ref _progressValue, value);
-        }
-
-        public double ProgressMaxValue
-        {
-            get => _progressMaxValue;
-            set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
-        }
-
-        public bool ProgressIndeterminate
-        {
-            get => _progressIndeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
-        }
-
-        public bool Progress2Visible
-        {
-            get => _progress2Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
-        }
-
-        public string Progress2Text
-        {
-            get => _progress2Text;
-            set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
-        }
-
-        public double Progress2Value
-        {
-            get => _progress2Value;
-            set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
-        }
-
-        public double Progress2MaxValue
-        {
-            get => _progress2MaxValue;
-            set => this.RaiseAndSetIfChanged(ref _progress2MaxValue, value);
-        }
-
-        public bool Progress2Indeterminate
-        {
-            get => _progress2Indeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
-        }
-
-        public bool StartVisible
-        {
-            get => _startVisible;
-            set => this.RaiseAndSetIfChanged(ref _startVisible, value);
-        }
-
-        public bool CloseVisible
-        {
-            get => _closeVisible;
-            set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
-        }
-
-        public bool StopVisible
-        {
-            get => _stopVisible;
-            set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
-        }
-
-        public bool StopEnabled
-        {
-            get => _stopEnabled;
-            set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
-        }
-
-        async void ExecuteDestinationCommand()
-        {
-            if(SelectedPlugin is null)
-                return;
-
-            var dlgDestination = new SaveFileDialog
-            {
-                Title = "Choose destination file"
-            };
-
-            dlgDestination.Filters.Add(new FileDialogFilter
-            {
-                Name       = SelectedPlugin.Plugin.Name,
-                Extensions = SelectedPlugin.Plugin.KnownExtensions.ToList()
+                Plugin = plugin
             });
 
-            string result = await dlgDestination.ShowAsync(_view);
+        Encodings.AddRange(Encoding.GetEncodings().Select(info => new EncodingModel
+        {
+            Name        = info.Name,
+            DisplayName = info.GetEncoding().EncodingName
+        }));
 
-            if(result is null)
+        Encodings.AddRange(Claunia.Encoding.Encoding.GetEncodings().Select(info => new EncodingModel
+        {
+            Name        = info.Name,
+            DisplayName = info.DisplayName
+        }));
+
+        switch(mediaType)
+        {
+            case MediaType.CD:
+            case MediaType.CDDA:
+            case MediaType.CDG:
+            case MediaType.CDEG:
+            case MediaType.CDI:
+            case MediaType.CDROM:
+            case MediaType.CDROMXA:
+            case MediaType.CDPLUS:
+            case MediaType.CDMO:
+            case MediaType.CDR:
+            case MediaType.CDRW:
+            case MediaType.CDMRW:
+            case MediaType.VCD:
+            case MediaType.SVCD:
+            case MediaType.PCD:
+            case MediaType.DDCD:
+            case MediaType.DDCDR:
+            case MediaType.DDCDRW:
+            case MediaType.DTSCD:
+            case MediaType.CDMIDI:
+            case MediaType.CDV:
+            case MediaType.CDIREADY:
+            case MediaType.FMTOWNS:
+            case MediaType.PS1CD:
+            case MediaType.PS2CD:
+            case MediaType.MEGACD:
+            case MediaType.SATURNCD:
+            case MediaType.GDROM:
+            case MediaType.GDR:
+            case MediaType.MilCD:
+            case MediaType.SuperCDROM2:
+            case MediaType.JaguarCD:
+            case MediaType.ThreeDO:
+            case MediaType.PCFX:
+            case MediaType.NeoGeoCD:
+            case MediaType.CDTV:
+            case MediaType.CD32:
+            case MediaType.Playdia:
+            case MediaType.Pippin:
+            case MediaType.VideoNow:
+            case MediaType.VideoNowColor:
+            case MediaType.VideoNowXp:
+            case MediaType.CVD:
+                Track1PregapVisible = true;
+
+                break;
+            default:
+                Track1PregapVisible = false;
+
+                break;
+        }
+
+        _devicePath = devicePath;
+    }
+
+    public ReactiveCommand<Unit, Unit> StartCommand       { get; }
+    public ReactiveCommand<Unit, Unit> CloseCommand       { get; }
+    public ReactiveCommand<Unit, Unit> StopCommand        { get; }
+    public ReactiveCommand<Unit, Unit> DestinationCommand { get; }
+
+    public ObservableCollection<ImagePluginModel> PluginsList { get; }
+    public ObservableCollection<EncodingModel>    Encodings   { get; }
+
+    public string Title { get; }
+
+    public bool OptionsVisible
+    {
+        get => _optionsVisible;
+        set => this.RaiseAndSetIfChanged(ref _optionsVisible, value);
+    }
+
+    public ImagePluginModel SelectedPlugin
+    {
+        get => _selectedPlugin;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _selectedPlugin, value);
+
+            Destination = "";
+
+            if(value is null)
             {
-                Destination   = "";
-                _outputPrefix = null;
+                DestinationEnabled = false;
 
                 return;
             }
 
-            if(string.IsNullOrEmpty(Path.GetExtension(result)))
-                result += SelectedPlugin.Plugin.KnownExtensions.First();
+            DestinationEnabled = true;
 
-            Destination = result;
+            if(!value.Plugin.SupportedOptions.Any())
+            {
+                // Hide options
+            }
 
-            _outputPrefix = Path.Combine(Path.GetDirectoryName(result) ?? "", Path.GetFileNameWithoutExtension(result));
+            /* TODO: Plugin options
+            grpOptions.Visible = true;
 
-            Resume = true;
+            var stkOptions = new StackLayout
+            {
+                Orientation = Orientation.Vertical
+            };
+
+            foreach((string name, Type type, string description, object @default) option in plugin.SupportedOptions)
+                switch(option.type.ToString())
+                {
+                    case "System.Boolean":
+                        var optBoolean = new CheckBox();
+                        optBoolean.ID      = "opt" + option.name;
+                        optBoolean.Text    = option.description;
+                        optBoolean.Checked = (bool)option.@default;
+                        stkOptions.Items.Add(optBoolean);
+
+                        break;
+                    case "System.SByte":
+                    case "System.Int16":
+                    case "System.Int32":
+                    case "System.Int64":
+                        var stkNumber = new StackLayout();
+                        stkNumber.Orientation = Orientation.Horizontal;
+                        var optNumber = new NumericStepper();
+                        optNumber.ID    = "opt" + option.name;
+                        optNumber.Value = Convert.ToDouble(option.@default);
+                        stkNumber.Items.Add(optNumber);
+                        var lblNumber = new Label();
+                        lblNumber.Text = option.description;
+                        stkNumber.Items.Add(lblNumber);
+                        stkOptions.Items.Add(stkNumber);
+
+                        break;
+                    case "System.Byte":
+                    case "System.UInt16":
+                    case "System.UInt32":
+                    case "System.UInt64":
+                        var stkUnsigned = new StackLayout();
+                        stkUnsigned.Orientation = Orientation.Horizontal;
+                        var optUnsigned = new NumericStepper();
+                        optUnsigned.ID       = "opt" + option.name;
+                        optUnsigned.MinValue = 0;
+                        optUnsigned.Value    = Convert.ToDouble(option.@default);
+                        stkUnsigned.Items.Add(optUnsigned);
+                        var lblUnsigned = new Label();
+                        lblUnsigned.Text = option.description;
+                        stkUnsigned.Items.Add(lblUnsigned);
+                        stkOptions.Items.Add(stkUnsigned);
+
+                        break;
+                    case "System.Single":
+                    case "System.Double":
+                        var stkFloat = new StackLayout();
+                        stkFloat.Orientation = Orientation.Horizontal;
+                        var optFloat = new NumericStepper();
+                        optFloat.ID            = "opt" + option.name;
+                        optFloat.DecimalPlaces = 2;
+                        optFloat.Value         = Convert.ToDouble(option.@default);
+                        stkFloat.Items.Add(optFloat);
+                        var lblFloat = new Label();
+                        lblFloat.Text = option.description;
+                        stkFloat.Items.Add(lblFloat);
+                        stkOptions.Items.Add(stkFloat);
+
+                        break;
+                    case "System.Guid":
+                        // TODO
+                        break;
+                    case "System.String":
+                        var stkString = new StackLayout();
+                        stkString.Orientation = Orientation.Horizontal;
+                        var lblString = new Label();
+                        lblString.Text = option.description;
+                        stkString.Items.Add(lblString);
+                        var optString = new TextBox();
+                        optString.ID   = "opt" + option.name;
+                        optString.Text = (string)option.@default;
+                        stkString.Items.Add(optString);
+                        stkOptions.Items.Add(stkString);
+
+                        break;
+                }
+
+            grpOptions.Content = stkOptions;
+*/
         }
+    }
 
-        async void CheckResumeFile()
+    public string FormatReadOnly
+    {
+        get => _formatReadOnly;
+        set => this.RaiseAndSetIfChanged(ref _formatReadOnly, value);
+    }
+
+    public string Destination
+    {
+        get => _destination;
+        set => this.RaiseAndSetIfChanged(ref _destination, value);
+    }
+
+    public bool DestinationEnabled
+    {
+        get => _destinationEnabled;
+        set => this.RaiseAndSetIfChanged(ref _destinationEnabled, value);
+    }
+
+    public bool StopOnError
+    {
+        get => _stopOnError;
+        set => this.RaiseAndSetIfChanged(ref _stopOnError, value);
+    }
+
+    public bool Force
+    {
+        get => _force;
+        set => this.RaiseAndSetIfChanged(ref _force, value);
+    }
+
+    public double Retries
+    {
+        get => _retries;
+        set => this.RaiseAndSetIfChanged(ref _retries, value);
+    }
+
+    public bool Persistent
+    {
+        get => _persistent;
+        set => this.RaiseAndSetIfChanged(ref _persistent, value);
+    }
+
+    public bool Resume
+    {
+        get => _useResume;
+        set
         {
-            _resume = null;
-            var xs = new XmlSerializer(typeof(Resume));
+            this.RaiseAndSetIfChanged(ref _useResume, value);
+
+            if(value == false)
+                return;
+
+            if(_outputPrefix != null)
+                CheckResumeFile();
+        }
+    }
+
+    public bool Track1Pregap
+    {
+        get => _track1Pregap;
+        set => this.RaiseAndSetIfChanged(ref _track1Pregap, value);
+    }
+
+    public bool Track1PregapVisible
+    {
+        get => _track1PregapVisible;
+        set => this.RaiseAndSetIfChanged(ref _track1PregapVisible, value);
+    }
+
+    public double Skipped
+    {
+        get => _skipped;
+        set => this.RaiseAndSetIfChanged(ref _skipped, value);
+    }
+
+    public bool Sidecar
+    {
+        get => _useSidecar;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _useSidecar, value);
+            EncodingVisible = value;
+        }
+    }
+
+    public bool EncodingVisible
+    {
+        get => _encodingVisible;
+        set => this.RaiseAndSetIfChanged(ref _encodingVisible, value);
+    }
+
+    public bool Trim
+    {
+        get => _trim;
+        set => this.RaiseAndSetIfChanged(ref _trim, value);
+    }
+
+    public bool ExistingMetadata
+    {
+        get => _existingMetadata;
+        set
+        {
+            this.RaiseAndSetIfChanged(ref _existingMetadata, value);
+
+            if(value == false)
+            {
+                _sidecar = null;
+
+                return;
+            }
+
+            var dlgMetadata = new OpenFileDialog
+            {
+                Title = "Choose existing metadata sidecar"
+            };
+
+            dlgMetadata.Filters.Add(new FileDialogFilter
+            {
+                Name = "CICM XML metadata",
+                Extensions = new List<string>(new[]
+                {
+                    ".xml"
+                })
+            });
+
+            string[] result = dlgMetadata.ShowAsync(_view).Result;
+
+            if(result?.Length != 1)
+            {
+                ExistingMetadata = false;
+
+                return;
+            }
+
+            var sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
 
             try
             {
-                var sr = new StreamReader(_outputPrefix + ".resume.xml");
-                _resume = (Resume)xs.Deserialize(sr);
+                var sr = new StreamReader(result[0]);
+                _sidecar = (CICMMetadataType)sidecarXs.Deserialize(sr);
                 sr.Close();
             }
             catch
             {
-                await MessageBoxManager.
-                      GetMessageBoxStandardWindow("Error", "Incorrect resume file, cannot use it...", ButtonEnum.Ok,
-                                                  Icon.Error).ShowDialog(_view);
+                // ReSharper disable AssignmentIsFullyDiscarded
+                _ = MessageBoxManager.
 
-                Resume = false;
+                    // ReSharper restore AssignmentIsFullyDiscarded
+                    GetMessageBoxStandardWindow("Error", "Incorrect metadata sidecar file...", ButtonEnum.Ok,
+                                                Icon.Error).ShowDialog(_view).Result;
 
-                return;
+                ExistingMetadata = false;
             }
+        }
+    }
 
-            if(_resume           == null              ||
-               _resume.NextBlock <= _resume.LastBlock ||
-               (_resume.BadBlocks.Count != 0 && !_resume.Tape))
-                return;
+    public EncodingModel SelectedEncoding
+    {
+        get => _selectedEncoding;
+        set => this.RaiseAndSetIfChanged(ref _selectedEncoding, value);
+    }
 
+    public string EncodingEnabled
+    {
+        get => _encodingEnabled;
+        set => this.RaiseAndSetIfChanged(ref _encodingEnabled, value);
+    }
+
+    public bool ProgressVisible
+    {
+        get => _progressVisible;
+        set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
+    }
+
+    public string Log
+    {
+        get => _log;
+        set => this.RaiseAndSetIfChanged(ref _log, value);
+    }
+
+    public bool Progress1Visible
+    {
+        get => _progress1Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
+    }
+
+    public string ProgressText
+    {
+        get => _progressText;
+        set => this.RaiseAndSetIfChanged(ref _progressText, value);
+    }
+
+    public double ProgressValue
+    {
+        get => _progressValue;
+        set => this.RaiseAndSetIfChanged(ref _progressValue, value);
+    }
+
+    public double ProgressMaxValue
+    {
+        get => _progressMaxValue;
+        set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
+    }
+
+    public bool ProgressIndeterminate
+    {
+        get => _progressIndeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
+    }
+
+    public bool Progress2Visible
+    {
+        get => _progress2Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress2Visible, value);
+    }
+
+    public string Progress2Text
+    {
+        get => _progress2Text;
+        set => this.RaiseAndSetIfChanged(ref _progress2Text, value);
+    }
+
+    public double Progress2Value
+    {
+        get => _progress2Value;
+        set => this.RaiseAndSetIfChanged(ref _progress2Value, value);
+    }
+
+    public double Progress2MaxValue
+    {
+        get => _progress2MaxValue;
+        set => this.RaiseAndSetIfChanged(ref _progress2MaxValue, value);
+    }
+
+    public bool Progress2Indeterminate
+    {
+        get => _progress2Indeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progress2Indeterminate, value);
+    }
+
+    public bool StartVisible
+    {
+        get => _startVisible;
+        set => this.RaiseAndSetIfChanged(ref _startVisible, value);
+    }
+
+    public bool CloseVisible
+    {
+        get => _closeVisible;
+        set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
+    }
+
+    public bool StopVisible
+    {
+        get => _stopVisible;
+        set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
+    }
+
+    public bool StopEnabled
+    {
+        get => _stopEnabled;
+        set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
+    }
+
+    async void ExecuteDestinationCommand()
+    {
+        if(SelectedPlugin is null)
+            return;
+
+        var dlgDestination = new SaveFileDialog
+        {
+            Title = "Choose destination file"
+        };
+
+        dlgDestination.Filters.Add(new FileDialogFilter
+        {
+            Name       = SelectedPlugin.Plugin.Name,
+            Extensions = SelectedPlugin.Plugin.KnownExtensions.ToList()
+        });
+
+        string result = await dlgDestination.ShowAsync(_view);
+
+        if(result is null)
+        {
+            Destination   = "";
+            _outputPrefix = null;
+
+            return;
+        }
+
+        if(string.IsNullOrEmpty(Path.GetExtension(result)))
+            result += SelectedPlugin.Plugin.KnownExtensions.First();
+
+        Destination = result;
+
+        _outputPrefix = Path.Combine(Path.GetDirectoryName(result) ?? "", Path.GetFileNameWithoutExtension(result));
+
+        Resume = true;
+    }
+
+    async void CheckResumeFile()
+    {
+        _resume = null;
+        var xs = new XmlSerializer(typeof(Resume));
+
+        try
+        {
+            var sr = new StreamReader(_outputPrefix + ".resume.xml");
+            _resume = (Resume)xs.Deserialize(sr);
+            sr.Close();
+        }
+        catch
+        {
             await MessageBoxManager.
-                  GetMessageBoxStandardWindow("Warning",
-                                              "Media already dumped correctly, please choose another destination...",
-                                              ButtonEnum.Ok, Icon.Warning).ShowDialog(_view);
+                  GetMessageBoxStandardWindow("Error", "Incorrect resume file, cannot use it...", ButtonEnum.Ok,
+                                              Icon.Error).ShowDialog(_view);
 
             Resume = false;
+
+            return;
         }
 
-        void ExecuteCloseCommand() => _view.Close();
+        if(_resume           == null              ||
+           _resume.NextBlock <= _resume.LastBlock ||
+           (_resume.BadBlocks.Count != 0 && !_resume.Tape))
+            return;
 
-        internal void ExecuteStopCommand()
+        await MessageBoxManager.
+              GetMessageBoxStandardWindow("Warning",
+                                          "Media already dumped correctly, please choose another destination...",
+                                          ButtonEnum.Ok, Icon.Warning).ShowDialog(_view);
+
+        Resume = false;
+    }
+
+    void ExecuteCloseCommand() => _view.Close();
+
+    internal void ExecuteStopCommand()
+    {
+        StopEnabled = false;
+        _dumper?.Abort();
+    }
+
+    void ExecuteStartCommand()
+    {
+        Log                = "";
+        CloseVisible       = false;
+        StartVisible       = false;
+        StopVisible        = true;
+        StopEnabled        = true;
+        ProgressVisible    = true;
+        DestinationEnabled = false;
+        OptionsVisible     = false;
+
+        UpdateStatus("Opening device...");
+
+        try
         {
-            StopEnabled = false;
-            _dumper?.Abort();
+            _dev = new Device(_devicePath);
+
+            if(_dev.IsRemote)
+                Statistics.AddRemote(_dev.RemoteApplication, _dev.RemoteVersion, _dev.RemoteOperatingSystem,
+                                     _dev.RemoteOperatingSystemVersion, _dev.RemoteArchitecture);
+
+            if(_dev.Error)
+            {
+                StoppingErrorMessage($"Error {_dev.LastError} opening device.");
+
+                return;
+            }
+        }
+        catch(Exception exception)
+        {
+            StoppingErrorMessage($"Exception {exception.Message} opening device.");
+
+            return;
         }
 
-        void ExecuteStartCommand()
+        Statistics.AddDevice(_dev);
+        Statistics.AddCommand("dump-media");
+
+        if(SelectedPlugin is null)
         {
-            Log                = "";
-            CloseVisible       = false;
-            StartVisible       = false;
-            StopVisible        = true;
-            StopEnabled        = true;
-            ProgressVisible    = true;
-            DestinationEnabled = false;
-            OptionsVisible     = false;
+            StoppingErrorMessage("Cannot open output plugin.");
 
-            UpdateStatus("Opening device...");
+            return;
+        }
 
+        Encoding encoding = null;
+
+        if(!(SelectedEncoding is null))
             try
             {
-                _dev = new Device(_devicePath);
-
-                if(_dev.IsRemote)
-                    Statistics.AddRemote(_dev.RemoteApplication, _dev.RemoteVersion, _dev.RemoteOperatingSystem,
-                                         _dev.RemoteOperatingSystemVersion, _dev.RemoteArchitecture);
-
-                if(_dev.Error)
-                {
-                    StoppingErrorMessage($"Error {_dev.LastError} opening device.");
-
-                    return;
-                }
+                encoding = Claunia.Encoding.Encoding.GetEncoding(SelectedEncoding.Name);
             }
-            catch(Exception exception)
+            catch(ArgumentException)
             {
-                StoppingErrorMessage($"Exception {exception.Message} opening device.");
+                StoppingErrorMessage("Specified encoding is not supported.");
 
                 return;
             }
 
-            Statistics.AddDevice(_dev);
-            Statistics.AddCommand("dump-media");
+        Dictionary<string, string> parsedOptions = new Dictionary<string, string>();
 
-            if(SelectedPlugin is null)
+        /* TODO: Options
+        if(grpOptions.Content is StackLayout stkFormatOptions)
+            foreach(Control option in stkFormatOptions.Children)
             {
-                StoppingErrorMessage("Cannot open output plugin.");
+                string value;
 
-                return;
+                switch(option)
+                {
+                    case CheckBox optBoolean:
+                        value = optBoolean.Checked?.ToString();
+
+                        break;
+                    case NumericStepper optNumber:
+                        value = optNumber.Value.ToString(CultureInfo.CurrentCulture);
+
+                        break;
+                    case TextBox optString:
+                        value = optString.Text;
+
+                        break;
+                    default: continue;
+                }
+
+                string key = option.ID.Substring(3);
+
+                parsedOptions.Add(key, value);
             }
+        */
 
-            Encoding encoding = null;
+        var dumpLog = new DumpLog(_outputPrefix + ".log", _dev, false);
 
-            if(!(SelectedEncoding is null))
-                try
-                {
-                    encoding = Claunia.Encoding.Encoding.GetEncoding(SelectedEncoding.Name);
-                }
-                catch(ArgumentException)
-                {
-                    StoppingErrorMessage("Specified encoding is not supported.");
+        dumpLog.WriteLine("Output image format: {0}.", SelectedPlugin.Name);
 
-                    return;
-                }
+        var errorLog = new ErrorLog(_outputPrefix + ".error.log");
 
-            Dictionary<string, string> parsedOptions = new Dictionary<string, string>();
+        _dumper = new Dump(Resume, _dev, _devicePath, SelectedPlugin.Plugin, (ushort)Retries, Force, false,
+                           Persistent, StopOnError, _resume, dumpLog, encoding, _outputPrefix, Destination,
+                           parsedOptions, _sidecar, (uint)Skipped, ExistingMetadata == false, Trim == false,
+                           Track1Pregap, true, false, DumpSubchannel.Any, 0, false, false, false, false, false,
+                           true, errorLog, false, 64, true, true, false);
 
-            /* TODO: Options
-            if(grpOptions.Content is StackLayout stkFormatOptions)
-                foreach(Control option in stkFormatOptions.Children)
-                {
-                    string value;
+        new Thread(DoWork).Start();
+    }
 
-                    switch(option)
-                    {
-                        case CheckBox optBoolean:
-                            value = optBoolean.Checked?.ToString();
+    void DoWork()
+    {
+        _dumper.UpdateStatus         += UpdateStatus;
+        _dumper.ErrorMessage         += ErrorMessage;
+        _dumper.StoppingErrorMessage += StoppingErrorMessage;
+        _dumper.PulseProgress        += PulseProgress;
+        _dumper.InitProgress         += InitProgress;
+        _dumper.UpdateProgress       += UpdateProgress;
+        _dumper.EndProgress          += EndProgress;
+        _dumper.InitProgress2        += InitProgress2;
+        _dumper.UpdateProgress2      += UpdateProgress2;
+        _dumper.EndProgress2         += EndProgress2;
 
-                            break;
-                        case NumericStepper optNumber:
-                            value = optNumber.Value.ToString(CultureInfo.CurrentCulture);
+        _dumper.Start();
 
-                            break;
-                        case TextBox optString:
-                            value = optString.Text;
+        _dev.Close();
 
-                            break;
-                        default: continue;
-                    }
+        WorkFinished();
+    }
 
-                    string key = option.ID.Substring(3);
+    async void WorkFinished() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        CloseVisible     = true;
+        StopVisible      = false;
+        Progress1Visible = false;
+        Progress2Visible = false;
+    });
 
-                    parsedOptions.Add(key, value);
-                }
-            */
+    async void EndProgress2() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Progress2Visible = false;
+    });
 
-            var dumpLog = new DumpLog(_outputPrefix + ".log", _dev, false);
-
-            dumpLog.WriteLine("Output image format: {0}.", SelectedPlugin.Name);
-
-            var errorLog = new ErrorLog(_outputPrefix + ".error.log");
-
-            _dumper = new Dump(Resume, _dev, _devicePath, SelectedPlugin.Plugin, (ushort)Retries, Force, false,
-                               Persistent, StopOnError, _resume, dumpLog, encoding, _outputPrefix, Destination,
-                               parsedOptions, _sidecar, (uint)Skipped, ExistingMetadata == false, Trim == false,
-                               Track1Pregap, true, false, DumpSubchannel.Any, 0, false, false, false, false, false,
-                               true, errorLog, false, 64, true, true, false);
-
-            new Thread(DoWork).Start();
-        }
-
-        void DoWork()
+    async void UpdateProgress2(string text, long current, long maximum) =>
+        await Dispatcher.UIThread.InvokeAsync(() =>
         {
-            _dumper.UpdateStatus         += UpdateStatus;
-            _dumper.ErrorMessage         += ErrorMessage;
-            _dumper.StoppingErrorMessage += StoppingErrorMessage;
-            _dumper.PulseProgress        += PulseProgress;
-            _dumper.InitProgress         += InitProgress;
-            _dumper.UpdateProgress       += UpdateProgress;
-            _dumper.EndProgress          += EndProgress;
-            _dumper.InitProgress2        += InitProgress2;
-            _dumper.UpdateProgress2      += UpdateProgress2;
-            _dumper.EndProgress2         += EndProgress2;
+            Progress2Text          = text;
+            Progress2Indeterminate = false;
 
-            _dumper.Start();
-
-            _dev.Close();
-
-            WorkFinished();
-        }
-
-        async void WorkFinished() => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            CloseVisible     = true;
-            StopVisible      = false;
-            Progress1Visible = false;
-            Progress2Visible = false;
+            Progress2MaxValue = maximum;
+            Progress2Value    = current;
         });
 
-        async void EndProgress2() => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Progress2Visible = false;
-        });
+    async void InitProgress2() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Progress2Visible = true;
+    });
 
-        async void UpdateProgress2(string text, long current, long maximum) =>
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                Progress2Text          = text;
-                Progress2Indeterminate = false;
+    async void EndProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Progress1Visible = false;
+    });
 
-                Progress2MaxValue = maximum;
-                Progress2Value    = current;
-            });
-
-        async void InitProgress2() => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Progress2Visible = true;
-        });
-
-        async void EndProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Progress1Visible = false;
-        });
-
-        async void UpdateProgress(string text, long current, long maximum) =>
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                ProgressText          = text;
-                ProgressIndeterminate = false;
-
-                ProgressMaxValue = maximum;
-                ProgressValue    = current;
-            });
-
-        async void InitProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Progress1Visible = true;
-        });
-
-        async void PulseProgress(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+    async void UpdateProgress(string text, long current, long maximum) =>
+        await Dispatcher.UIThread.InvokeAsync(() =>
         {
             ProgressText          = text;
-            ProgressIndeterminate = true;
+            ProgressIndeterminate = false;
+
+            ProgressMaxValue = maximum;
+            ProgressValue    = current;
         });
 
-        async void StoppingErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(async () =>
-        {
-            ErrorMessage(text);
+    async void InitProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Progress1Visible = true;
+    });
 
-            await MessageBoxManager.GetMessageBoxStandardWindow("Error", $"{text}", ButtonEnum.Ok, Icon.Error).
-                                    ShowDialog(_view);
+    async void PulseProgress(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        ProgressText          = text;
+        ProgressIndeterminate = true;
+    });
 
-            WorkFinished();
-        });
+    async void StoppingErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(async () =>
+    {
+        ErrorMessage(text);
 
-        async void ErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Log += text + Environment.NewLine;
-        });
+        await MessageBoxManager.GetMessageBoxStandardWindow("Error", $"{text}", ButtonEnum.Ok, Icon.Error).
+                                ShowDialog(_view);
 
-        async void UpdateStatus(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Log += text + Environment.NewLine;
-        });
-    }
+        WorkFinished();
+    });
+
+    async void ErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Log += text + Environment.NewLine;
+    });
+
+    async void UpdateStatus(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Log += text + Environment.NewLine;
+    });
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs b/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs
index 379fa817b..82a3fbb2f 100644
--- a/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/MediaScanViewModel.cs
@@ -44,564 +44,563 @@ using MessageBox.Avalonia.Enums;
 using OxyPlot;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class MediaScanViewModel : ViewModelBase
 {
-    public sealed class MediaScanViewModel : ViewModelBase
+    readonly Window _view;
+    string          _a;
+    string          _avgSpeed;
+    Color           _axesColor;
+    string          _b;
+    ulong           _blocks;
+    ulong           _blocksToRead;
+    string          _c;
+    bool            _closeVisible;
+    string          _d;
+    string          _devicePath;
+    string          _e;
+    string          _f;
+    Color           _lineColor;
+    ScanResults     _localResults;
+    string          _maxSpeed;
+    double          _maxX;
+    double          _maxY;
+    string          _minSpeed;
+    double          _minX;
+    double          _minY;
+    bool            _progress1Visible;
+    string          _progress2Indeterminate;
+    string          _progress2MaxValue;
+    string          _progress2Text;
+    string          _progress2Value;
+    string          _progress2Visible;
+    bool            _progressIndeterminate;
+    double          _progressMaxValue;
+    string          _progressText;
+    double          _progressValue;
+    bool            _progressVisible;
+    bool            _resultsVisible;
+    MediaScan       _scanner;
+    bool            _startVisible;
+    double          _stepsX;
+    double          _stepsY;
+    string          _stopEnabled;
+    bool            _stopVisible;
+    string          _totalTime;
+    string          _unreadableSectors;
+
+    public MediaScanViewModel(string devicePath, Window view)
     {
-        readonly Window _view;
-        string          _a;
-        string          _avgSpeed;
-        Color           _axesColor;
-        string          _b;
-        ulong           _blocks;
-        ulong           _blocksToRead;
-        string          _c;
-        bool            _closeVisible;
-        string          _d;
-        string          _devicePath;
-        string          _e;
-        string          _f;
-        Color           _lineColor;
-        ScanResults     _localResults;
-        string          _maxSpeed;
-        double          _maxX;
-        double          _maxY;
-        string          _minSpeed;
-        double          _minX;
-        double          _minY;
-        bool            _progress1Visible;
-        string          _progress2Indeterminate;
-        string          _progress2MaxValue;
-        string          _progress2Text;
-        string          _progress2Value;
-        string          _progress2Visible;
-        bool            _progressIndeterminate;
-        double          _progressMaxValue;
-        string          _progressText;
-        double          _progressValue;
-        bool            _progressVisible;
-        bool            _resultsVisible;
-        MediaScan       _scanner;
-        bool            _startVisible;
-        double          _stepsX;
-        double          _stepsY;
-        string          _stopEnabled;
-        bool            _stopVisible;
-        string          _totalTime;
-        string          _unreadableSectors;
+        _devicePath  = devicePath;
+        _view        = view;
+        StopVisible  = false;
+        StartCommand = ReactiveCommand.Create(ExecuteStartCommand);
+        CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);
+        StopCommand  = ReactiveCommand.Create(ExecuteStopCommand);
+        StartVisible = true;
+        CloseVisible = true;
+        BlockMapList = new ObservableCollection<(ulong block, double duration)>();
+        ChartPoints  = new ObservableCollection<DataPoint>();
+        StepsX       = double.NaN;
+        StepsY       = double.NaN;
+        AxesColor    = Colors.Black;
+        LineColor    = Colors.Yellow;
+    }
 
-        public MediaScanViewModel(string devicePath, Window view)
+    public Color AxesColor
+    {
+        get => _axesColor;
+        set => this.RaiseAndSetIfChanged(ref _axesColor, value);
+    }
+
+    public Color LineColor
+    {
+        get => _lineColor;
+        set => this.RaiseAndSetIfChanged(ref _lineColor, value);
+    }
+
+    public ObservableCollection<(ulong block, double duration)> BlockMapList { get; }
+    public ObservableCollection<DataPoint>                      ChartPoints  { get; }
+
+    public ulong Blocks
+    {
+        get => _blocks;
+        set => this.RaiseAndSetIfChanged(ref _blocks, value);
+    }
+
+    public string A
+    {
+        get => _a;
+        set => this.RaiseAndSetIfChanged(ref _a, value);
+    }
+
+    public string B
+    {
+        get => _b;
+        set => this.RaiseAndSetIfChanged(ref _b, value);
+    }
+
+    public string C
+    {
+        get => _c;
+        set => this.RaiseAndSetIfChanged(ref _c, value);
+    }
+
+    public string D
+    {
+        get => _d;
+        set => this.RaiseAndSetIfChanged(ref _d, value);
+    }
+
+    public string E
+    {
+        get => _e;
+        set => this.RaiseAndSetIfChanged(ref _e, value);
+    }
+
+    public string F
+    {
+        get => _f;
+        set => this.RaiseAndSetIfChanged(ref _f, value);
+    }
+
+    public string UnreadableSectors
+    {
+        get => _unreadableSectors;
+        set => this.RaiseAndSetIfChanged(ref _unreadableSectors, value);
+    }
+
+    public string TotalTime
+    {
+        get => _totalTime;
+        set => this.RaiseAndSetIfChanged(ref _totalTime, value);
+    }
+
+    public string AvgSpeed
+    {
+        get => _avgSpeed;
+        set => this.RaiseAndSetIfChanged(ref _avgSpeed, value);
+    }
+
+    public string MaxSpeed
+    {
+        get => _maxSpeed;
+        set => this.RaiseAndSetIfChanged(ref _maxSpeed, value);
+    }
+
+    public string MinSpeed
+    {
+        get => _minSpeed;
+        set => this.RaiseAndSetIfChanged(ref _minSpeed, value);
+    }
+
+    public bool ProgressVisible
+    {
+        get => _progressVisible;
+        set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
+    }
+
+    public bool Progress1Visible
+    {
+        get => _progress1Visible;
+        set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
+    }
+
+    public string ProgressText
+    {
+        get => _progressText;
+        set => this.RaiseAndSetIfChanged(ref _progressText, value);
+    }
+
+    public double ProgressMaxValue
+    {
+        get => _progressMaxValue;
+        set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
+    }
+
+    public bool ProgressIndeterminate
+    {
+        get => _progressIndeterminate;
+        set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
+    }
+
+    public double ProgressValue
+    {
+        get => _progressValue;
+        set => this.RaiseAndSetIfChanged(ref _progressValue, value);
+    }
+
+    public bool StartVisible
+    {
+        get => _startVisible;
+        set => this.RaiseAndSetIfChanged(ref _startVisible, value);
+    }
+
+    public bool CloseVisible
+    {
+        get => _closeVisible;
+        set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
+    }
+
+    public bool StopVisible
+    {
+        get => _stopVisible;
+        set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
+    }
+
+    public string StopEnabled
+    {
+        get => _stopEnabled;
+        set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
+    }
+
+    public bool ResultsVisible
+    {
+        get => _resultsVisible;
+        set => this.RaiseAndSetIfChanged(ref _resultsVisible, value);
+    }
+
+    public double MaxY
+    {
+        get => _maxY;
+        set => this.RaiseAndSetIfChanged(ref _maxY, value);
+    }
+
+    public double MaxX
+    {
+        get => _maxX;
+        set => this.RaiseAndSetIfChanged(ref _maxX, value);
+    }
+
+    public double MinY
+    {
+        get => _minY;
+        set => this.RaiseAndSetIfChanged(ref _minY, value);
+    }
+
+    public double MinX
+    {
+        get => _minX;
+        set => this.RaiseAndSetIfChanged(ref _minX, value);
+    }
+
+    public double StepsY
+    {
+        get => _stepsY;
+        set => this.RaiseAndSetIfChanged(ref _stepsY, value);
+    }
+
+    public double StepsX
+    {
+        get => _stepsX;
+        set => this.RaiseAndSetIfChanged(ref _stepsX, value);
+    }
+
+    public string Title { get; }
+
+    public ReactiveCommand<Unit, Unit> StartCommand { get; }
+    public ReactiveCommand<Unit, Unit> CloseCommand { get; }
+    public ReactiveCommand<Unit, Unit> StopCommand  { get; }
+
+    void ExecuteCloseCommand() => _view.Close();
+
+    internal void ExecuteStopCommand() => _scanner?.Abort();
+
+    void ExecuteStartCommand()
+    {
+        StopVisible     = true;
+        StartVisible    = false;
+        CloseVisible    = false;
+        ProgressVisible = true;
+        ResultsVisible  = true;
+        ChartPoints.Clear();
+        new Thread(DoWork).Start();
+    }
+
+    // TODO: Allow to save MHDD and ImgBurn log files
+    async void DoWork()
+    {
+        if(_devicePath.Length == 2   &&
+           _devicePath[1]     == ':' &&
+           _devicePath[0]     != '/' &&
+           char.IsLetter(_devicePath[0]))
+            _devicePath = "\\\\.\\" + char.ToUpper(_devicePath[0]) + ':';
+
+        var dev = new Device(_devicePath);
+
+        if(dev.IsRemote)
+            Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
+                                 dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
+
+        if(dev.Error)
         {
-            _devicePath  = devicePath;
-            _view        = view;
-            StopVisible  = false;
-            StartCommand = ReactiveCommand.Create(ExecuteStartCommand);
-            CloseCommand = ReactiveCommand.Create(ExecuteCloseCommand);
-            StopCommand  = ReactiveCommand.Create(ExecuteStopCommand);
-            StartVisible = true;
-            CloseVisible = true;
-            BlockMapList = new ObservableCollection<(ulong block, double duration)>();
-            ChartPoints  = new ObservableCollection<DataPoint>();
-            StepsX       = double.NaN;
-            StepsY       = double.NaN;
-            AxesColor    = Colors.Black;
-            LineColor    = Colors.Yellow;
-        }
+            await MessageBoxManager.
+                  GetMessageBoxStandardWindow("Error", $"Error {dev.LastError} opening device.", ButtonEnum.Ok,
+                                              Icon.Error).ShowDialog(_view);
 
-        public Color AxesColor
-        {
-            get => _axesColor;
-            set => this.RaiseAndSetIfChanged(ref _axesColor, value);
-        }
-
-        public Color LineColor
-        {
-            get => _lineColor;
-            set => this.RaiseAndSetIfChanged(ref _lineColor, value);
-        }
-
-        public ObservableCollection<(ulong block, double duration)> BlockMapList { get; }
-        public ObservableCollection<DataPoint>                      ChartPoints  { get; }
-
-        public ulong Blocks
-        {
-            get => _blocks;
-            set => this.RaiseAndSetIfChanged(ref _blocks, value);
-        }
-
-        public string A
-        {
-            get => _a;
-            set => this.RaiseAndSetIfChanged(ref _a, value);
-        }
-
-        public string B
-        {
-            get => _b;
-            set => this.RaiseAndSetIfChanged(ref _b, value);
-        }
-
-        public string C
-        {
-            get => _c;
-            set => this.RaiseAndSetIfChanged(ref _c, value);
-        }
-
-        public string D
-        {
-            get => _d;
-            set => this.RaiseAndSetIfChanged(ref _d, value);
-        }
-
-        public string E
-        {
-            get => _e;
-            set => this.RaiseAndSetIfChanged(ref _e, value);
-        }
-
-        public string F
-        {
-            get => _f;
-            set => this.RaiseAndSetIfChanged(ref _f, value);
-        }
-
-        public string UnreadableSectors
-        {
-            get => _unreadableSectors;
-            set => this.RaiseAndSetIfChanged(ref _unreadableSectors, value);
-        }
-
-        public string TotalTime
-        {
-            get => _totalTime;
-            set => this.RaiseAndSetIfChanged(ref _totalTime, value);
-        }
-
-        public string AvgSpeed
-        {
-            get => _avgSpeed;
-            set => this.RaiseAndSetIfChanged(ref _avgSpeed, value);
-        }
-
-        public string MaxSpeed
-        {
-            get => _maxSpeed;
-            set => this.RaiseAndSetIfChanged(ref _maxSpeed, value);
-        }
-
-        public string MinSpeed
-        {
-            get => _minSpeed;
-            set => this.RaiseAndSetIfChanged(ref _minSpeed, value);
-        }
-
-        public bool ProgressVisible
-        {
-            get => _progressVisible;
-            set => this.RaiseAndSetIfChanged(ref _progressVisible, value);
-        }
-
-        public bool Progress1Visible
-        {
-            get => _progress1Visible;
-            set => this.RaiseAndSetIfChanged(ref _progress1Visible, value);
-        }
-
-        public string ProgressText
-        {
-            get => _progressText;
-            set => this.RaiseAndSetIfChanged(ref _progressText, value);
-        }
-
-        public double ProgressMaxValue
-        {
-            get => _progressMaxValue;
-            set => this.RaiseAndSetIfChanged(ref _progressMaxValue, value);
-        }
-
-        public bool ProgressIndeterminate
-        {
-            get => _progressIndeterminate;
-            set => this.RaiseAndSetIfChanged(ref _progressIndeterminate, value);
-        }
-
-        public double ProgressValue
-        {
-            get => _progressValue;
-            set => this.RaiseAndSetIfChanged(ref _progressValue, value);
-        }
-
-        public bool StartVisible
-        {
-            get => _startVisible;
-            set => this.RaiseAndSetIfChanged(ref _startVisible, value);
-        }
-
-        public bool CloseVisible
-        {
-            get => _closeVisible;
-            set => this.RaiseAndSetIfChanged(ref _closeVisible, value);
-        }
-
-        public bool StopVisible
-        {
-            get => _stopVisible;
-            set => this.RaiseAndSetIfChanged(ref _stopVisible, value);
-        }
-
-        public string StopEnabled
-        {
-            get => _stopEnabled;
-            set => this.RaiseAndSetIfChanged(ref _stopEnabled, value);
-        }
-
-        public bool ResultsVisible
-        {
-            get => _resultsVisible;
-            set => this.RaiseAndSetIfChanged(ref _resultsVisible, value);
-        }
-
-        public double MaxY
-        {
-            get => _maxY;
-            set => this.RaiseAndSetIfChanged(ref _maxY, value);
-        }
-
-        public double MaxX
-        {
-            get => _maxX;
-            set => this.RaiseAndSetIfChanged(ref _maxX, value);
-        }
-
-        public double MinY
-        {
-            get => _minY;
-            set => this.RaiseAndSetIfChanged(ref _minY, value);
-        }
-
-        public double MinX
-        {
-            get => _minX;
-            set => this.RaiseAndSetIfChanged(ref _minX, value);
-        }
-
-        public double StepsY
-        {
-            get => _stepsY;
-            set => this.RaiseAndSetIfChanged(ref _stepsY, value);
-        }
-
-        public double StepsX
-        {
-            get => _stepsX;
-            set => this.RaiseAndSetIfChanged(ref _stepsX, value);
-        }
-
-        public string Title { get; }
-
-        public ReactiveCommand<Unit, Unit> StartCommand { get; }
-        public ReactiveCommand<Unit, Unit> CloseCommand { get; }
-        public ReactiveCommand<Unit, Unit> StopCommand  { get; }
-
-        void ExecuteCloseCommand() => _view.Close();
-
-        internal void ExecuteStopCommand() => _scanner?.Abort();
-
-        void ExecuteStartCommand()
-        {
-            StopVisible     = true;
-            StartVisible    = false;
-            CloseVisible    = false;
-            ProgressVisible = true;
-            ResultsVisible  = true;
-            ChartPoints.Clear();
-            new Thread(DoWork).Start();
-        }
-
-        // TODO: Allow to save MHDD and ImgBurn log files
-        async void DoWork()
-        {
-            if(_devicePath.Length == 2   &&
-               _devicePath[1]     == ':' &&
-               _devicePath[0]     != '/' &&
-               char.IsLetter(_devicePath[0]))
-                _devicePath = "\\\\.\\" + char.ToUpper(_devicePath[0]) + ':';
-
-            var dev = new Device(_devicePath);
-
-            if(dev.IsRemote)
-                Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
-                                     dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
-
-            if(dev.Error)
-            {
-                await MessageBoxManager.
-                      GetMessageBoxStandardWindow("Error", $"Error {dev.LastError} opening device.", ButtonEnum.Ok,
-                                                  Icon.Error).ShowDialog(_view);
-
-                StopVisible     = false;
-                StartVisible    = true;
-                CloseVisible    = true;
-                ProgressVisible = false;
-
-                return;
-            }
-
-            Statistics.AddDevice(dev);
-
-            _localResults                 =  new ScanResults();
-            _scanner                      =  new MediaScan(null, null, _devicePath, dev, false);
-            _scanner.ScanTime             += OnScanTime;
-            _scanner.ScanUnreadable       += OnScanUnreadable;
-            _scanner.UpdateStatus         += UpdateStatus;
-            _scanner.StoppingErrorMessage += StoppingErrorMessage;
-            _scanner.PulseProgress        += PulseProgress;
-            _scanner.InitProgress         += InitProgress;
-            _scanner.UpdateProgress       += UpdateProgress;
-            _scanner.EndProgress          += EndProgress;
-            _scanner.InitBlockMap         += InitBlockMap;
-            _scanner.ScanSpeed            += ScanSpeed;
-
-            ScanResults results = _scanner.Scan();
-
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                TotalTime =
-                    $"Took a total of {results.TotalTime} seconds ({results.ProcessingTime} processing commands).";
-
-                AvgSpeed          = $"Average speed: {results.AvgSpeed:F3} MiB/sec.";
-                MaxSpeed          = $"Fastest speed burst: {results.MaxSpeed:F3} MiB/sec.";
-                MinSpeed          = $"Slowest speed burst: {results.MinSpeed:F3} MiB/sec.";
-                A                 = $"{results.A} sectors took less than 3 ms.";
-                B                 = $"{results.B} sectors took less than 10 ms but more than 3 ms.";
-                C                 = $"{results.C} sectors took less than 50 ms but more than 10 ms.";
-                D                 = $"{results.D} sectors took less than 150 ms but more than 50 ms.";
-                E                 = $"{results.E} sectors took less than 500 ms but more than 150 ms.";
-                F                 = $"{results.F} sectors took more than 500 ms.";
-                UnreadableSectors = $"{results.UnreadableSectors.Count} sectors could not be read.";
-            });
-
-            // TODO: Show list of unreadable sectors
-            /*
-            if(results.UnreadableSectors.Count > 0)
-                foreach(ulong bad in results.UnreadableSectors)
-                    string.Format("Sector {0} could not be read", bad);
-*/
-
-            // TODO: Show results
-            /*
-            
-            if(results.SeekTotal != 0 || results.SeekMin != double.MaxValue || results.SeekMax != double.MinValue)
-                
-                string.Format("Testing {0} seeks, longest seek took {1:F3} ms, fastest one took {2:F3} ms. ({3:F3} ms average)",
-                                     results.SeekTimes, results.SeekMax, results.SeekMin, results.SeekTotal / 1000);
-                                     */
-
-            Statistics.AddCommand("media-scan");
-
-            dev.Close();
-            WorkFinished();
-        }
-
-        async void ScanSpeed(ulong sector, double currentSpeed) => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            if(ChartPoints.Count == 0)
-                ChartPoints.Add(new DataPoint(0, currentSpeed));
-
-            ChartPoints.Add(new DataPoint(sector, currentSpeed));
-
-            if(currentSpeed > MaxY)
-                MaxY = currentSpeed + (currentSpeed / 10d);
-        });
-
-        async void InitBlockMap(ulong blocks, ulong blockSize, ulong blocksToRead, ushort currentProfile) =>
-            await Dispatcher.UIThread.InvokeAsync(() =>
-            {
-                Blocks        = blocks / blocksToRead;
-                _blocksToRead = blocksToRead;
-
-                MinX = 0;
-                MinY = 0;
-
-                switch(currentProfile)
-                {
-                    case 0x0005: // CD and DDCD
-                    case 0x0008:
-                    case 0x0009:
-                    case 0x000A:
-                    case 0x0020:
-                    case 0x0021:
-                    case 0x0022:
-                        if(blocks <= 360000)
-                            MaxX = 360000;
-                        else if(blocks <= 405000)
-                            MaxX = 405000;
-                        else if(blocks <= 445500)
-                            MaxX = 445500;
-                        else
-                            MaxX = blocks;
-
-                        StepsX = MaxX   / 10;
-                        StepsY = 150    * 4;
-                        MaxY   = StepsY * 12.5;
-
-                        break;
-                    case 0x0010: // DVD SL
-                    case 0x0011:
-                    case 0x0012:
-                    case 0x0013:
-                    case 0x0014:
-                    case 0x0018:
-                    case 0x001A:
-                    case 0x001B:
-                        MaxX   = 2298496;
-                        StepsX = MaxX / 10;
-                        StepsY = 1352.5;
-                        MaxY   = StepsY * 18;
-
-                        break;
-                    case 0x0015: // DVD DL
-                    case 0x0016:
-                    case 0x0017:
-                    case 0x002A:
-                    case 0x002B:
-                        MaxX   = 4173824;
-                        StepsX = MaxX / 10;
-                        StepsY = 1352.5;
-                        MaxY   = StepsY * 18;
-
-                        break;
-                    case 0x0041:
-                    case 0x0042:
-                    case 0x0043:
-                    case 0x0040: // BD
-                        if(blocks <= 12219392)
-                            MaxX = 12219392;
-                        else if(blocks <= 24438784)
-                            MaxX = 24438784;
-                        else if(blocks <= 48878592)
-                            MaxX = 48878592;
-                        else if(blocks <= 62500864)
-                            MaxX = 62500864;
-                        else
-                            MaxX = blocks;
-
-                        StepsX = MaxX / 10;
-                        StepsY = 4394.5;
-                        MaxY   = StepsY * 18;
-
-                        break;
-                    case 0x0050: // HD DVD
-                    case 0x0051:
-                    case 0x0052:
-                    case 0x0053:
-                    case 0x0058:
-                    case 0x005A:
-                        if(blocks <= 7361599)
-                            MaxX = 7361599;
-                        else if(blocks <= 16305407)
-                            MaxX = 16305407;
-                        else
-                            MaxX = blocks;
-
-                        StepsX = MaxX / 10;
-                        StepsY = 4394.5;
-                        MaxY   = StepsY * 8;
-
-                        break;
-                    default:
-                        MaxX   = blocks;
-                        StepsX = MaxX / 10;
-                        StepsY = 625;
-                        MaxY   = StepsY;
-
-                        break;
-                }
-            });
-
-        async void WorkFinished() => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
             StopVisible     = false;
             StartVisible    = true;
             CloseVisible    = true;
             ProgressVisible = false;
-        });
 
-        async void EndProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
+            return;
+        }
+
+        Statistics.AddDevice(dev);
+
+        _localResults                 =  new ScanResults();
+        _scanner                      =  new MediaScan(null, null, _devicePath, dev, false);
+        _scanner.ScanTime             += OnScanTime;
+        _scanner.ScanUnreadable       += OnScanUnreadable;
+        _scanner.UpdateStatus         += UpdateStatus;
+        _scanner.StoppingErrorMessage += StoppingErrorMessage;
+        _scanner.PulseProgress        += PulseProgress;
+        _scanner.InitProgress         += InitProgress;
+        _scanner.UpdateProgress       += UpdateProgress;
+        _scanner.EndProgress          += EndProgress;
+        _scanner.InitBlockMap         += InitBlockMap;
+        _scanner.ScanSpeed            += ScanSpeed;
+
+        ScanResults results = _scanner.Scan();
+
+        await Dispatcher.UIThread.InvokeAsync(() =>
         {
-            Progress1Visible = false;
+            TotalTime =
+                $"Took a total of {results.TotalTime} seconds ({results.ProcessingTime} processing commands).";
+
+            AvgSpeed          = $"Average speed: {results.AvgSpeed:F3} MiB/sec.";
+            MaxSpeed          = $"Fastest speed burst: {results.MaxSpeed:F3} MiB/sec.";
+            MinSpeed          = $"Slowest speed burst: {results.MinSpeed:F3} MiB/sec.";
+            A                 = $"{results.A} sectors took less than 3 ms.";
+            B                 = $"{results.B} sectors took less than 10 ms but more than 3 ms.";
+            C                 = $"{results.C} sectors took less than 50 ms but more than 10 ms.";
+            D                 = $"{results.D} sectors took less than 150 ms but more than 50 ms.";
+            E                 = $"{results.E} sectors took less than 500 ms but more than 150 ms.";
+            F                 = $"{results.F} sectors took more than 500 ms.";
+            UnreadableSectors = $"{results.UnreadableSectors.Count} sectors could not be read.";
         });
 
-        async void UpdateProgress(string text, long current, long maximum) =>
-            await Dispatcher.UIThread.InvokeAsync(() =>
+        // TODO: Show list of unreadable sectors
+        /*
+        if(results.UnreadableSectors.Count > 0)
+            foreach(ulong bad in results.UnreadableSectors)
+                string.Format("Sector {0} could not be read", bad);
+*/
+
+        // TODO: Show results
+        /*
+        
+        if(results.SeekTotal != 0 || results.SeekMin != double.MaxValue || results.SeekMax != double.MinValue)
+            
+            string.Format("Testing {0} seeks, longest seek took {1:F3} ms, fastest one took {2:F3} ms. ({3:F3} ms average)",
+                                 results.SeekTimes, results.SeekMax, results.SeekMin, results.SeekTotal / 1000);
+                                 */
+
+        Statistics.AddCommand("media-scan");
+
+        dev.Close();
+        WorkFinished();
+    }
+
+    async void ScanSpeed(ulong sector, double currentSpeed) => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        if(ChartPoints.Count == 0)
+            ChartPoints.Add(new DataPoint(0, currentSpeed));
+
+        ChartPoints.Add(new DataPoint(sector, currentSpeed));
+
+        if(currentSpeed > MaxY)
+            MaxY = currentSpeed + (currentSpeed / 10d);
+    });
+
+    async void InitBlockMap(ulong blocks, ulong blockSize, ulong blocksToRead, ushort currentProfile) =>
+        await Dispatcher.UIThread.InvokeAsync(() =>
+        {
+            Blocks        = blocks / blocksToRead;
+            _blocksToRead = blocksToRead;
+
+            MinX = 0;
+            MinY = 0;
+
+            switch(currentProfile)
             {
-                ProgressText          = text;
-                ProgressIndeterminate = false;
+                case 0x0005: // CD and DDCD
+                case 0x0008:
+                case 0x0009:
+                case 0x000A:
+                case 0x0020:
+                case 0x0021:
+                case 0x0022:
+                    if(blocks <= 360000)
+                        MaxX = 360000;
+                    else if(blocks <= 405000)
+                        MaxX = 405000;
+                    else if(blocks <= 445500)
+                        MaxX = 445500;
+                    else
+                        MaxX = blocks;
 
-                ProgressMaxValue = maximum;
-                ProgressValue    = current;
-            });
+                    StepsX = MaxX   / 10;
+                    StepsY = 150    * 4;
+                    MaxY   = StepsY * 12.5;
 
-        async void InitProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            Progress1Visible = true;
+                    break;
+                case 0x0010: // DVD SL
+                case 0x0011:
+                case 0x0012:
+                case 0x0013:
+                case 0x0014:
+                case 0x0018:
+                case 0x001A:
+                case 0x001B:
+                    MaxX   = 2298496;
+                    StepsX = MaxX / 10;
+                    StepsY = 1352.5;
+                    MaxY   = StepsY * 18;
+
+                    break;
+                case 0x0015: // DVD DL
+                case 0x0016:
+                case 0x0017:
+                case 0x002A:
+                case 0x002B:
+                    MaxX   = 4173824;
+                    StepsX = MaxX / 10;
+                    StepsY = 1352.5;
+                    MaxY   = StepsY * 18;
+
+                    break;
+                case 0x0041:
+                case 0x0042:
+                case 0x0043:
+                case 0x0040: // BD
+                    if(blocks <= 12219392)
+                        MaxX = 12219392;
+                    else if(blocks <= 24438784)
+                        MaxX = 24438784;
+                    else if(blocks <= 48878592)
+                        MaxX = 48878592;
+                    else if(blocks <= 62500864)
+                        MaxX = 62500864;
+                    else
+                        MaxX = blocks;
+
+                    StepsX = MaxX / 10;
+                    StepsY = 4394.5;
+                    MaxY   = StepsY * 18;
+
+                    break;
+                case 0x0050: // HD DVD
+                case 0x0051:
+                case 0x0052:
+                case 0x0053:
+                case 0x0058:
+                case 0x005A:
+                    if(blocks <= 7361599)
+                        MaxX = 7361599;
+                    else if(blocks <= 16305407)
+                        MaxX = 16305407;
+                    else
+                        MaxX = blocks;
+
+                    StepsX = MaxX / 10;
+                    StepsY = 4394.5;
+                    MaxY   = StepsY * 8;
+
+                    break;
+                default:
+                    MaxX   = blocks;
+                    StepsX = MaxX / 10;
+                    StepsY = 625;
+                    MaxY   = StepsY;
+
+                    break;
+            }
         });
 
-        async void PulseProgress(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+    async void WorkFinished() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        StopVisible     = false;
+        StartVisible    = true;
+        CloseVisible    = true;
+        ProgressVisible = false;
+    });
+
+    async void EndProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Progress1Visible = false;
+    });
+
+    async void UpdateProgress(string text, long current, long maximum) =>
+        await Dispatcher.UIThread.InvokeAsync(() =>
         {
             ProgressText          = text;
-            ProgressIndeterminate = true;
+            ProgressIndeterminate = false;
+
+            ProgressMaxValue = maximum;
+            ProgressValue    = current;
         });
 
-        async void StoppingErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(action: async () =>
-        {
-            ProgressText = text;
+    async void InitProgress() => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        Progress1Visible = true;
+    });
 
-            await MessageBoxManager.GetMessageBoxStandardWindow("Error", $"{text}", ButtonEnum.Ok, Icon.Error).
-                                    ShowDialog(_view);
+    async void PulseProgress(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        ProgressText          = text;
+        ProgressIndeterminate = true;
+    });
 
-            WorkFinished();
-        });
+    async void StoppingErrorMessage(string text) => await Dispatcher.UIThread.InvokeAsync(action: async () =>
+    {
+        ProgressText = text;
 
-        async void UpdateStatus(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            ProgressText = text;
-        });
+        await MessageBoxManager.GetMessageBoxStandardWindow("Error", $"{text}", ButtonEnum.Ok, Icon.Error).
+                                ShowDialog(_view);
 
-        async void OnScanUnreadable(ulong sector) => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            _localResults.Errored += _blocksToRead;
-            UnreadableSectors     =  $"{_localResults.Errored} sectors could not be read.";
-            BlockMapList.Add((sector / _blocksToRead, double.NaN));
-        });
+        WorkFinished();
+    });
 
-        async void OnScanTime(ulong sector, double duration) => await Dispatcher.UIThread.InvokeAsync(() =>
-        {
-            BlockMapList.Add((sector / _blocksToRead, duration));
+    async void UpdateStatus(string text) => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        ProgressText = text;
+    });
 
-            if(duration < 3)
-                _localResults.A += _blocksToRead;
-            else if(duration >= 3 &&
-                    duration < 10)
-                _localResults.B += _blocksToRead;
-            else if(duration >= 10 &&
-                    duration < 50)
-                _localResults.C += _blocksToRead;
-            else if(duration >= 50 &&
-                    duration < 150)
-                _localResults.D += _blocksToRead;
-            else if(duration >= 150 &&
-                    duration < 500)
-                _localResults.E += _blocksToRead;
-            else if(duration >= 500)
-                _localResults.F += _blocksToRead;
+    async void OnScanUnreadable(ulong sector) => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        _localResults.Errored += _blocksToRead;
+        UnreadableSectors     =  $"{_localResults.Errored} sectors could not be read.";
+        BlockMapList.Add((sector / _blocksToRead, double.NaN));
+    });
 
-            A = $"{_localResults.A} sectors took less than 3 ms.";
-            B = $"{_localResults.B} sectors took less than 10 ms but more than 3 ms.";
-            C = $"{_localResults.C} sectors took less than 50 ms but more than 10 ms.";
-            D = $"{_localResults.D} sectors took less than 150 ms but more than 50 ms.";
-            E = $"{_localResults.E} sectors took less than 500 ms but more than 150 ms.";
-            F = $"{_localResults.F} sectors took more than 500 ms.";
-        });
-    }
+    async void OnScanTime(ulong sector, double duration) => await Dispatcher.UIThread.InvokeAsync(() =>
+    {
+        BlockMapList.Add((sector / _blocksToRead, duration));
+
+        if(duration < 3)
+            _localResults.A += _blocksToRead;
+        else if(duration >= 3 &&
+                duration < 10)
+            _localResults.B += _blocksToRead;
+        else if(duration >= 10 &&
+                duration < 50)
+            _localResults.C += _blocksToRead;
+        else if(duration >= 50 &&
+                duration < 150)
+            _localResults.D += _blocksToRead;
+        else if(duration >= 150 &&
+                duration < 500)
+            _localResults.E += _blocksToRead;
+        else if(duration >= 500)
+            _localResults.F += _blocksToRead;
+
+        A = $"{_localResults.A} sectors took less than 3 ms.";
+        B = $"{_localResults.B} sectors took less than 10 ms but more than 3 ms.";
+        C = $"{_localResults.C} sectors took less than 50 ms but more than 10 ms.";
+        D = $"{_localResults.D} sectors took less than 150 ms but more than 50 ms.";
+        E = $"{_localResults.E} sectors took less than 500 ms but more than 150 ms.";
+        F = $"{_localResults.F} sectors took more than 500 ms.";
+    });
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs b/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
index 4d3f63973..486530694 100644
--- a/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/SplashWindowViewModel.cs
@@ -46,250 +46,249 @@ using Avalonia.Threading;
 using Microsoft.EntityFrameworkCore;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class SplashWindowViewModel : ViewModelBase
 {
-    public sealed class SplashWindowViewModel : ViewModelBase
+    readonly SplashWindow _view;
+    double                _currentProgress;
+    double                _maxProgress;
+    string                _message;
+
+    public SplashWindowViewModel(SplashWindow view) => _view = view;
+
+    public string Message
     {
-        readonly SplashWindow _view;
-        double                _currentProgress;
-        double                _maxProgress;
-        string                _message;
+        get => _message;
+        set => this.RaiseAndSetIfChanged(ref _message, value);
+    }
 
-        public SplashWindowViewModel(SplashWindow view) => _view = view;
+    public double MaxProgress
+    {
+        get => _maxProgress;
+        set => this.RaiseAndSetIfChanged(ref _maxProgress, value);
+    }
 
-        public string Message
+    public double CurrentProgress
+    {
+        get => _currentProgress;
+        set => this.RaiseAndSetIfChanged(ref _currentProgress, value);
+    }
+
+    internal void OnOpened()
+    {
+        Message         = "Welcome to Aaru!";
+        MaxProgress     = 9;
+        CurrentProgress = 0;
+
+        Dispatcher.UIThread.Post(InitializeConsole);
+    }
+
+    void InitializeConsole()
+    {
+        CurrentProgress++;
+        Message = "Initializing console...";
+
+        Task.Run(() =>
         {
-            get => _message;
-            set => this.RaiseAndSetIfChanged(ref _message, value);
-        }
+            ConsoleHandler.Init();
+            AaruConsole.WriteLine("Aaru started!");
 
-        public double MaxProgress
+            Dispatcher.UIThread.Post(LoadSettings);
+        });
+    }
+
+    void LoadSettings()
+    {
+        CurrentProgress++;
+        Message = "Loading settings...";
+        AaruConsole.WriteLine("Loading settings...");
+
+        Task.Run(() =>
         {
-            get => _maxProgress;
-            set => this.RaiseAndSetIfChanged(ref _maxProgress, value);
-        }
+            // TODO: Detect there are no settings yet
+            Settings.Settings.LoadSettings();
 
-        public double CurrentProgress
+            Dispatcher.UIThread.Post(MigrateLocalDatabase);
+        });
+    }
+
+    void MigrateLocalDatabase()
+    {
+        CurrentProgress++;
+        Message = "Migrating local database...";
+        AaruConsole.WriteLine("Migrating local database...");
+
+        Task.Run(() =>
         {
-            get => _currentProgress;
-            set => this.RaiseAndSetIfChanged(ref _currentProgress, value);
-        }
+            AaruContext ctx = null;
 
-        internal void OnOpened()
-        {
-            Message         = "Welcome to Aaru!";
-            MaxProgress     = 9;
-            CurrentProgress = 0;
-
-            Dispatcher.UIThread.Post(InitializeConsole);
-        }
-
-        void InitializeConsole()
-        {
-            CurrentProgress++;
-            Message = "Initializing console...";
-
-            Task.Run(() =>
+            try
             {
-                ConsoleHandler.Init();
-                AaruConsole.WriteLine("Aaru started!");
-
-                Dispatcher.UIThread.Post(LoadSettings);
-            });
-        }
-
-        void LoadSettings()
-        {
-            CurrentProgress++;
-            Message = "Loading settings...";
-            AaruConsole.WriteLine("Loading settings...");
-
-            Task.Run(() =>
+                ctx = AaruContext.Create(Settings.Settings.LocalDbPath, false);
+                ctx.Database.Migrate();
+            }
+            catch(NotSupportedException)
             {
-                // TODO: Detect there are no settings yet
-                Settings.Settings.LoadSettings();
+                try
+                {
+                    ctx?.Database.CloseConnection();
+                    ctx?.Dispose();
+                }
+                catch(Exception)
+                {
+                    // Should not ever arrive here, but if it does, keep trying to replace it anyway
+                }
 
-                Dispatcher.UIThread.Post(MigrateLocalDatabase);
-            });
-        }
+                File.Delete(Settings.Settings.LocalDbPath);
+                ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+                ctx.Database.EnsureCreated();
 
-        void MigrateLocalDatabase()
+                ctx.Database.
+                    ExecuteSqlRaw("CREATE TABLE IF NOT EXISTS \"__EFMigrationsHistory\" (\"MigrationId\" TEXT PRIMARY KEY, \"ProductVersion\" TEXT)");
+
+                foreach(string migration in ctx.Database.GetPendingMigrations())
+                {
+                    ctx.Database.
+                        ExecuteSqlRaw($"INSERT INTO \"__EFMigrationsHistory\" (MigrationId, ProductVersion) VALUES ('{migration}', '0.0.0')");
+                }
+
+                ctx.SaveChanges();
+            }
+
+            // Remove duplicates
+            foreach(var duplicate in ctx.SeenDevices.AsEnumerable()!.GroupBy(a => new
+                    {
+                        a.Manufacturer,
+                        a.Model,
+                        a.Revision,
+                        a.Bus
+                    }).Where(a => a.Count() > 1).Distinct().Select(a => a.Key))
+                ctx.RemoveRange(ctx.SeenDevices!.
+                                    Where(d => d.Manufacturer == duplicate.Manufacturer &&
+                                               d.Model        == duplicate.Model && d.Revision == duplicate.Revision &&
+                                               d.Bus          == duplicate.Bus).Skip(1));
+
+            // Remove nulls
+            ctx.RemoveRange(ctx.SeenDevices!.Where(d => d.Manufacturer == null && d.Model == null &&
+                                                        d.Revision     == null));
+
+            ctx.SaveChanges();
+
+            Dispatcher.UIThread.Post(UpdateMainDatabase);
+        });
+    }
+
+    void UpdateMainDatabase()
+    {
+        CurrentProgress++;
+        Message = "Updating main database...";
+        AaruConsole.WriteLine("Updating main database...");
+
+        Task.Run(() =>
         {
-            CurrentProgress++;
-            Message = "Migrating local database...";
-            AaruConsole.WriteLine("Migrating local database...");
+            bool mainDbUpdate = false;
 
-            Task.Run(() =>
+            if(!File.Exists(Settings.Settings.MainDbPath))
             {
-                AaruContext ctx = null;
+                mainDbUpdate = true;
+
+                // TODO: Update database
+            }
+
+            var mainContext = AaruContext.Create(Settings.Settings.MainDbPath, false);
+
+            if(mainContext.Database.GetPendingMigrations().Any())
+            {
+                AaruConsole.WriteLine("New database version, updating...");
 
                 try
                 {
-                    ctx = AaruContext.Create(Settings.Settings.LocalDbPath, false);
-                    ctx.Database.Migrate();
+                    File.Delete(Settings.Settings.MainDbPath);
                 }
-                catch(NotSupportedException)
+                catch(Exception)
                 {
-                    try
-                    {
-                        ctx?.Database.CloseConnection();
-                        ctx?.Dispose();
-                    }
-                    catch(Exception)
-                    {
-                        // Should not ever arrive here, but if it does, keep trying to replace it anyway
-                    }
+                    AaruConsole.
+                        ErrorWriteLine("Exception trying to remove old database version, cannot continue...");
 
-                    File.Delete(Settings.Settings.LocalDbPath);
-                    ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-                    ctx.Database.EnsureCreated();
+                    AaruConsole.ErrorWriteLine("Please manually remove file at {0}", Settings.Settings.MainDbPath);
 
-                    ctx.Database.
-                        ExecuteSqlRaw("CREATE TABLE IF NOT EXISTS \"__EFMigrationsHistory\" (\"MigrationId\" TEXT PRIMARY KEY, \"ProductVersion\" TEXT)");
-
-                    foreach(string migration in ctx.Database.GetPendingMigrations())
-                    {
-                        ctx.Database.
-                            ExecuteSqlRaw($"INSERT INTO \"__EFMigrationsHistory\" (MigrationId, ProductVersion) VALUES ('{migration}', '0.0.0')");
-                    }
-
-                    ctx.SaveChanges();
+                    return;
                 }
 
-                // Remove duplicates
-                foreach(var duplicate in ctx.SeenDevices.AsEnumerable()!.GroupBy(a => new
-                {
-                    a.Manufacturer,
-                    a.Model,
-                    a.Revision,
-                    a.Bus
-                }).Where(a => a.Count() > 1).Distinct().Select(a => a.Key))
-                    ctx.RemoveRange(ctx.SeenDevices!.
-                                        Where(d => d.Manufacturer == duplicate.Manufacturer &&
-                                                   d.Model == duplicate.Model && d.Revision == duplicate.Revision &&
-                                                   d.Bus == duplicate.Bus).Skip(1));
-
-                // Remove nulls
-                ctx.RemoveRange(ctx.SeenDevices!.Where(d => d.Manufacturer == null && d.Model == null &&
-                                                            d.Revision     == null));
-
-                ctx.SaveChanges();
-
-                Dispatcher.UIThread.Post(UpdateMainDatabase);
-            });
-        }
-
-        void UpdateMainDatabase()
-        {
-            CurrentProgress++;
-            Message = "Updating main database...";
-            AaruConsole.WriteLine("Updating main database...");
-
-            Task.Run(() =>
-            {
-                bool mainDbUpdate = false;
-
-                if(!File.Exists(Settings.Settings.MainDbPath))
-                {
-                    mainDbUpdate = true;
-
-                    // TODO: Update database
-                }
-
-                var mainContext = AaruContext.Create(Settings.Settings.MainDbPath, false);
-
-                if(mainContext.Database.GetPendingMigrations().Any())
-                {
-                    AaruConsole.WriteLine("New database version, updating...");
-
-                    try
-                    {
-                        File.Delete(Settings.Settings.MainDbPath);
-                    }
-                    catch(Exception)
-                    {
-                        AaruConsole.
-                            ErrorWriteLine("Exception trying to remove old database version, cannot continue...");
-
-                        AaruConsole.ErrorWriteLine("Please manually remove file at {0}", Settings.Settings.MainDbPath);
-
-                        return;
-                    }
-
-                    // TODO: Update database
-                }
-
-                Dispatcher.UIThread.Post(CheckGdprCompliance);
-            });
-        }
-
-        async void CheckGdprCompliance()
-        {
-            CurrentProgress++;
-            Message = "Checking GDPR compliance...";
-            AaruConsole.WriteLine("Checking GDPR compliance...");
-
-            if(Settings.Settings.Current.GdprCompliance < DicSettings.GDPR_LEVEL)
-            {
-                var settingsDialog          = new SettingsDialog();
-                var settingsDialogViewModel = new SettingsViewModel(settingsDialog, true);
-                settingsDialog.DataContext = settingsDialogViewModel;
-                await settingsDialog.ShowDialog(_view);
+                // TODO: Update database
             }
 
-            LoadStatistics();
-        }
-
-        void LoadStatistics()
-        {
-            CurrentProgress++;
-            Message = "Loading statistics...";
-            AaruConsole.WriteLine("Loading statistics...");
-
-            Task.Run(() =>
-            {
-                Statistics.LoadStats();
-
-                Dispatcher.UIThread.Post(RegisterEncodings);
-            });
-        }
-
-        void RegisterEncodings()
-        {
-            CurrentProgress++;
-            Message = "Registering encodings...";
-            AaruConsole.WriteLine("Registering encodings...");
-
-            Task.Run(() =>
-            {
-                Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-
-                Dispatcher.UIThread.Post(SaveStatistics);
-            });
-        }
-
-        void SaveStatistics()
-        {
-            CurrentProgress++;
-            Message = "Saving statistics...";
-            AaruConsole.WriteLine("Saving statistics...");
-
-            Task.Run(() =>
-            {
-                Statistics.SaveStats();
-
-                Dispatcher.UIThread.Post(LoadMainWindow);
-            });
-        }
-
-        void LoadMainWindow()
-        {
-            CurrentProgress++;
-            Message = "Loading main window...";
-            AaruConsole.WriteLine("Loading main window...");
-            WorkFinished?.Invoke(this, EventArgs.Empty);
-        }
-
-        internal event EventHandler WorkFinished;
+            Dispatcher.UIThread.Post(CheckGdprCompliance);
+        });
     }
+
+    async void CheckGdprCompliance()
+    {
+        CurrentProgress++;
+        Message = "Checking GDPR compliance...";
+        AaruConsole.WriteLine("Checking GDPR compliance...");
+
+        if(Settings.Settings.Current.GdprCompliance < DicSettings.GDPR_LEVEL)
+        {
+            var settingsDialog          = new SettingsDialog();
+            var settingsDialogViewModel = new SettingsViewModel(settingsDialog, true);
+            settingsDialog.DataContext = settingsDialogViewModel;
+            await settingsDialog.ShowDialog(_view);
+        }
+
+        LoadStatistics();
+    }
+
+    void LoadStatistics()
+    {
+        CurrentProgress++;
+        Message = "Loading statistics...";
+        AaruConsole.WriteLine("Loading statistics...");
+
+        Task.Run(() =>
+        {
+            Statistics.LoadStats();
+
+            Dispatcher.UIThread.Post(RegisterEncodings);
+        });
+    }
+
+    void RegisterEncodings()
+    {
+        CurrentProgress++;
+        Message = "Registering encodings...";
+        AaruConsole.WriteLine("Registering encodings...");
+
+        Task.Run(() =>
+        {
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+
+            Dispatcher.UIThread.Post(SaveStatistics);
+        });
+    }
+
+    void SaveStatistics()
+    {
+        CurrentProgress++;
+        Message = "Saving statistics...";
+        AaruConsole.WriteLine("Saving statistics...");
+
+        Task.Run(() =>
+        {
+            Statistics.SaveStats();
+
+            Dispatcher.UIThread.Post(LoadMainWindow);
+        });
+    }
+
+    void LoadMainWindow()
+    {
+        CurrentProgress++;
+        Message = "Loading main window...";
+        AaruConsole.WriteLine("Loading main window...");
+        WorkFinished?.Invoke(this, EventArgs.Empty);
+    }
+
+    internal event EventHandler WorkFinished;
 }
\ No newline at end of file
diff --git a/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs b/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs
index 27e045980..0aa0170ea 100644
--- a/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs
+++ b/Aaru.Gui/ViewModels/Windows/ViewSectorViewModel.cs
@@ -36,72 +36,71 @@ using Aaru.Helpers;
 using JetBrains.Annotations;
 using ReactiveUI;
 
-namespace Aaru.Gui.ViewModels.Windows
+namespace Aaru.Gui.ViewModels.Windows;
+
+public sealed class ViewSectorViewModel : ViewModelBase
 {
-    public sealed class ViewSectorViewModel : ViewModelBase
+    const    int         HEX_COLUMNS = 32;
+    readonly IMediaImage _inputFormat;
+    bool                 _longSectorChecked;
+    bool                 _longSectorVisible;
+    string               _printHexText;
+    double               _sectorNumber;
+    string               _title;
+    string               _totalSectorsText;
+
+    public ViewSectorViewModel([NotNull] IMediaImage inputFormat)
     {
-        const    int         HEX_COLUMNS = 32;
-        readonly IMediaImage _inputFormat;
-        bool                 _longSectorChecked;
-        bool                 _longSectorVisible;
-        string               _printHexText;
-        double               _sectorNumber;
-        string               _title;
-        string               _totalSectorsText;
+        _inputFormat = inputFormat;
 
-        public ViewSectorViewModel([NotNull] IMediaImage inputFormat)
+        ErrorNumber errno = inputFormat.ReadSectorLong(0, out _);
+
+        if(errno == ErrorNumber.NoError)
+            LongSectorChecked = true;
+        else
+            LongSectorVisible = false;
+
+        TotalSectorsText = $"of {inputFormat.Info.Sectors}";
+        SectorNumber     = 0;
+    }
+
+    public string Title
+    {
+        get => _title;
+        set => this.RaiseAndSetIfChanged(ref _title, value);
+    }
+
+    public double SectorNumber
+    {
+        get => _sectorNumber;
+        set
         {
-            _inputFormat = inputFormat;
+            this.RaiseAndSetIfChanged(ref _sectorNumber, value);
 
-            ErrorNumber errno = inputFormat.ReadSectorLong(0, out _);
+            byte[]      sector;
+            ErrorNumber errno;
+
+            errno = LongSectorChecked ? _inputFormat.ReadSectorLong((ulong)SectorNumber, out sector)
+                        : _inputFormat.ReadSector((ulong)SectorNumber, out sector);
 
             if(errno == ErrorNumber.NoError)
-                LongSectorChecked = true;
-            else
-                LongSectorVisible = false;
-
-            TotalSectorsText = $"of {inputFormat.Info.Sectors}";
-            SectorNumber     = 0;
-        }
-
-        public string Title
-        {
-            get => _title;
-            set => this.RaiseAndSetIfChanged(ref _title, value);
-        }
-
-        public double SectorNumber
-        {
-            get => _sectorNumber;
-            set
-            {
-                this.RaiseAndSetIfChanged(ref _sectorNumber, value);
-
-                byte[]      sector;
-                ErrorNumber errno;
-
-                errno = LongSectorChecked ? _inputFormat.ReadSectorLong((ulong)SectorNumber, out sector)
-                            : _inputFormat.ReadSector((ulong)SectorNumber, out sector);
-
-                if(errno == ErrorNumber.NoError)
-                    PrintHexText = PrintHex.ByteArrayToHexArrayString(sector, HEX_COLUMNS);
-            }
-        }
-
-        public string TotalSectorsText { get; }
-
-        public bool LongSectorChecked
-        {
-            get => _longSectorChecked;
-            set => this.RaiseAndSetIfChanged(ref _longSectorChecked, value);
-        }
-
-        public bool LongSectorVisible { get; }
-
-        public string PrintHexText
-        {
-            get => _printHexText;
-            set => this.RaiseAndSetIfChanged(ref _printHexText, value);
+                PrintHexText = PrintHex.ByteArrayToHexArrayString(sector, HEX_COLUMNS);
         }
     }
+
+    public string TotalSectorsText { get; }
+
+    public bool LongSectorChecked
+    {
+        get => _longSectorChecked;
+        set => this.RaiseAndSetIfChanged(ref _longSectorChecked, value);
+    }
+
+    public bool LongSectorVisible { get; }
+
+    public string PrintHexText
+    {
+        get => _printHexText;
+        set => this.RaiseAndSetIfChanged(ref _printHexText, value);
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Dialogs/About.xaml.cs b/Aaru.Gui/Views/Dialogs/About.xaml.cs
index 341e11420..550698034 100644
--- a/Aaru.Gui/Views/Dialogs/About.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/About.xaml.cs
@@ -34,18 +34,17 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Dialogs
-{
-    public sealed class About : Window
-    {
-        public About()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+namespace Aaru.Gui.Views.Dialogs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+public sealed class About : Window
+{
+    public About()
+    {
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
     }
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Dialogs/Console.xaml.cs b/Aaru.Gui/Views/Dialogs/Console.xaml.cs
index 2d0acea15..f4a9bc60d 100644
--- a/Aaru.Gui/Views/Dialogs/Console.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/Console.xaml.cs
@@ -36,26 +36,25 @@ using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 using JetBrains.Annotations;
 
-namespace Aaru.Gui.Views.Dialogs
+namespace Aaru.Gui.Views.Dialogs;
+
+public sealed class Console : Window
 {
-    public sealed class Console : Window
+    public Console()
     {
-        public Console()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
+    }
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 
-        protected override void OnClosing([NotNull] CancelEventArgs e)
-        {
-            e.Cancel = true;
-            Hide();
+    protected override void OnClosing([NotNull] CancelEventArgs e)
+    {
+        e.Cancel = true;
+        Hide();
 
-            base.OnClosing(e);
-        }
+        base.OnClosing(e);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Dialogs/Encodings.xaml.cs b/Aaru.Gui/Views/Dialogs/Encodings.xaml.cs
index 9ceca3010..64ec09a1d 100644
--- a/Aaru.Gui/Views/Dialogs/Encodings.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/Encodings.xaml.cs
@@ -34,18 +34,17 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Dialogs
-{
-    public sealed class Encodings : Window
-    {
-        public Encodings()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+namespace Aaru.Gui.Views.Dialogs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+public sealed class Encodings : Window
+{
+    public Encodings()
+    {
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
     }
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs
index 9ae523edd..f4d0f0412 100644
--- a/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/LicenseDialog.xaml.cs
@@ -34,18 +34,17 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Dialogs
-{
-    public sealed class LicenseDialog : Window
-    {
-        public LicenseDialog()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+namespace Aaru.Gui.Views.Dialogs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+public sealed class LicenseDialog : Window
+{
+    public LicenseDialog()
+    {
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
     }
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs
index e03c24848..6d20dd0cb 100644
--- a/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/PluginsDialog.xaml.cs
@@ -34,18 +34,17 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Dialogs
-{
-    public sealed class PluginsDialog : Window
-    {
-        public PluginsDialog()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+namespace Aaru.Gui.Views.Dialogs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+public sealed class PluginsDialog : Window
+{
+    public PluginsDialog()
+    {
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
     }
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs
index f3d966c3e..f640a9a8c 100644
--- a/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/SettingsDialog.xaml.cs
@@ -34,18 +34,17 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Dialogs
-{
-    public sealed class SettingsDialog : Window
-    {
-        public SettingsDialog()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+namespace Aaru.Gui.Views.Dialogs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+public sealed class SettingsDialog : Window
+{
+    public SettingsDialog()
+    {
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
     }
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs
index e6635e129..5d615ceee 100644
--- a/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs
+++ b/Aaru.Gui/Views/Dialogs/StatisticsDialog.xaml.cs
@@ -34,18 +34,17 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Dialogs
-{
-    public sealed class StatisticsDialog : Window
-    {
-        public StatisticsDialog()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+namespace Aaru.Gui.Views.Dialogs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+public sealed class StatisticsDialog : Window
+{
+    public StatisticsDialog()
+    {
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
     }
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Panels/DeviceInfo.xaml.cs b/Aaru.Gui/Views/Panels/DeviceInfo.xaml.cs
index 19a41c33d..ae68e6823 100644
--- a/Aaru.Gui/Views/Panels/DeviceInfo.xaml.cs
+++ b/Aaru.Gui/Views/Panels/DeviceInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Panels
-{
-    public sealed class DeviceInfo : UserControl
-    {
-        public DeviceInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Panels;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class DeviceInfo : UserControl
+{
+    public DeviceInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Panels/FileSystem.xaml.cs b/Aaru.Gui/Views/Panels/FileSystem.xaml.cs
index b8bb9d885..e6afd84a1 100644
--- a/Aaru.Gui/Views/Panels/FileSystem.xaml.cs
+++ b/Aaru.Gui/Views/Panels/FileSystem.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Panels
-{
-    public sealed class FileSystem : UserControl
-    {
-        public FileSystem() => InitializeComponent();
+namespace Aaru.Gui.Views.Panels;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class FileSystem : UserControl
+{
+    public FileSystem() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Panels/ImageInfo.xaml.cs b/Aaru.Gui/Views/Panels/ImageInfo.xaml.cs
index 0892f0dbc..45a9745a2 100644
--- a/Aaru.Gui/Views/Panels/ImageInfo.xaml.cs
+++ b/Aaru.Gui/Views/Panels/ImageInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Panels
-{
-    public sealed class ImageInfo : UserControl
-    {
-        public ImageInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Panels;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class ImageInfo : UserControl
+{
+    public ImageInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Panels/MediaInfo.xaml.cs b/Aaru.Gui/Views/Panels/MediaInfo.xaml.cs
index 6bcb40048..cea7e9527 100644
--- a/Aaru.Gui/Views/Panels/MediaInfo.xaml.cs
+++ b/Aaru.Gui/Views/Panels/MediaInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Panels
-{
-    public sealed class MediaInfo : UserControl
-    {
-        public MediaInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Panels;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class MediaInfo : UserControl
+{
+    public MediaInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Panels/Partition.xaml.cs b/Aaru.Gui/Views/Panels/Partition.xaml.cs
index db3c24fd6..988d4f69d 100644
--- a/Aaru.Gui/Views/Panels/Partition.xaml.cs
+++ b/Aaru.Gui/Views/Panels/Partition.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Panels
-{
-    public sealed class Partition : UserControl
-    {
-        public Partition() => InitializeComponent();
+namespace Aaru.Gui.Views.Panels;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class Partition : UserControl
+{
+    public Partition() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Panels/Subdirectory.xaml.cs b/Aaru.Gui/Views/Panels/Subdirectory.xaml.cs
index d016b18c6..d501ff033 100644
--- a/Aaru.Gui/Views/Panels/Subdirectory.xaml.cs
+++ b/Aaru.Gui/Views/Panels/Subdirectory.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Panels
-{
-    public sealed class Subdirectory : UserControl
-    {
-        public Subdirectory() => InitializeComponent();
+namespace Aaru.Gui.Views.Panels;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class Subdirectory : UserControl
+{
+    public Subdirectory() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Tabs/AtaInfo.xaml.cs b/Aaru.Gui/Views/Tabs/AtaInfo.xaml.cs
index d0af0399b..88a86fd1e 100644
--- a/Aaru.Gui/Views/Tabs/AtaInfo.xaml.cs
+++ b/Aaru.Gui/Views/Tabs/AtaInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Tabs
-{
-    public sealed class AtaInfo : UserControl
-    {
-        public AtaInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Tabs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class AtaInfo : UserControl
+{
+    public AtaInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Tabs/BlurayInfo.xaml.cs b/Aaru.Gui/Views/Tabs/BlurayInfo.xaml.cs
index 761434bc6..9e8fbc0ff 100644
--- a/Aaru.Gui/Views/Tabs/BlurayInfo.xaml.cs
+++ b/Aaru.Gui/Views/Tabs/BlurayInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Tabs
-{
-    public sealed class BlurayInfo : UserControl
-    {
-        public BlurayInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Tabs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class BlurayInfo : UserControl
+{
+    public BlurayInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml.cs b/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml.cs
index f1dc82197..67fe3ad42 100644
--- a/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml.cs
+++ b/Aaru.Gui/Views/Tabs/CompactDiscInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Tabs
-{
-    public sealed class CompactDiscInfo : UserControl
-    {
-        public CompactDiscInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Tabs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class CompactDiscInfo : UserControl
+{
+    public CompactDiscInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Tabs/DvdInfo.xaml.cs b/Aaru.Gui/Views/Tabs/DvdInfo.xaml.cs
index 30ddb2e59..02285efa8 100644
--- a/Aaru.Gui/Views/Tabs/DvdInfo.xaml.cs
+++ b/Aaru.Gui/Views/Tabs/DvdInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Tabs
-{
-    public sealed class DvdInfo : UserControl
-    {
-        public DvdInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Tabs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class DvdInfo : UserControl
+{
+    public DvdInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml.cs b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml.cs
index d1d4c552d..68e48f914 100644
--- a/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml.cs
+++ b/Aaru.Gui/Views/Tabs/DvdWritableInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Tabs
-{
-    public sealed class DvdWritableInfo : UserControl
-    {
-        public DvdWritableInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Tabs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class DvdWritableInfo : UserControl
+{
+    public DvdWritableInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml.cs b/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml.cs
index 2924a748a..9b2f1e5a6 100644
--- a/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml.cs
+++ b/Aaru.Gui/Views/Tabs/PcmciaInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Tabs
-{
-    public sealed class PcmciaInfo : UserControl
-    {
-        public PcmciaInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Tabs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class PcmciaInfo : UserControl
+{
+    public PcmciaInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Tabs/ScsiInfo.xaml.cs b/Aaru.Gui/Views/Tabs/ScsiInfo.xaml.cs
index 734357dfa..0ef594201 100644
--- a/Aaru.Gui/Views/Tabs/ScsiInfo.xaml.cs
+++ b/Aaru.Gui/Views/Tabs/ScsiInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Tabs
-{
-    public sealed class ScsiInfo : UserControl
-    {
-        public ScsiInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Tabs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class ScsiInfo : UserControl
+{
+    public ScsiInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs
index da49c2317..ed31e5982 100644
--- a/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs
+++ b/Aaru.Gui/Views/Tabs/SdMmcInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Tabs
-{
-    public sealed class SdMmcInfo : UserControl
-    {
-        public SdMmcInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Tabs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class SdMmcInfo : UserControl
+{
+    public SdMmcInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Tabs/XboxInfo.xaml.cs b/Aaru.Gui/Views/Tabs/XboxInfo.xaml.cs
index d2e9b8698..4f028d965 100644
--- a/Aaru.Gui/Views/Tabs/XboxInfo.xaml.cs
+++ b/Aaru.Gui/Views/Tabs/XboxInfo.xaml.cs
@@ -33,12 +33,11 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Tabs
-{
-    public sealed class XboxInfo : UserControl
-    {
-        public XboxInfo() => InitializeComponent();
+namespace Aaru.Gui.Views.Tabs;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
-    }
+public sealed class XboxInfo : UserControl
+{
+    public XboxInfo() => InitializeComponent();
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml.cs b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml.cs
index 6aee76c4c..3c95ab733 100644
--- a/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml.cs
+++ b/Aaru.Gui/Views/Windows/DecodeMediaTags.xaml.cs
@@ -34,18 +34,17 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
-{
-    public sealed class DecodeMediaTags : Window
-    {
-        public DecodeMediaTags()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+namespace Aaru.Gui.Views.Windows;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+public sealed class DecodeMediaTags : Window
+{
+    public DecodeMediaTags()
+    {
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
     }
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/ImageChecksum.xaml.cs b/Aaru.Gui/Views/Windows/ImageChecksum.xaml.cs
index 50bbf7a23..0ce8f833f 100644
--- a/Aaru.Gui/Views/Windows/ImageChecksum.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ImageChecksum.xaml.cs
@@ -36,24 +36,23 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
+namespace Aaru.Gui.Views.Windows;
+
+public sealed class ImageChecksum : Window
 {
-    public sealed class ImageChecksum : Window
+    public ImageChecksum()
     {
-        public ImageChecksum()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
+    }
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 
-        protected override void OnClosing(CancelEventArgs e)
-        {
-            (DataContext as ImageChecksumViewModel)?.ExecuteStopCommand();
-            base.OnClosing(e);
-        }
+    protected override void OnClosing(CancelEventArgs e)
+    {
+        (DataContext as ImageChecksumViewModel)?.ExecuteStopCommand();
+        base.OnClosing(e);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/ImageConvert.xaml.cs b/Aaru.Gui/Views/Windows/ImageConvert.xaml.cs
index bc80a6e67..4a2a32026 100644
--- a/Aaru.Gui/Views/Windows/ImageConvert.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ImageConvert.xaml.cs
@@ -36,24 +36,23 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
+namespace Aaru.Gui.Views.Windows;
+
+public sealed class ImageConvert : Window
 {
-    public sealed class ImageConvert : Window
+    public ImageConvert()
     {
-        public ImageConvert()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
+    }
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 
-        protected override void OnClosing(CancelEventArgs e)
-        {
-            (DataContext as ImageConvertViewModel)?.ExecuteStopCommand();
-            base.OnClosing(e);
-        }
+    protected override void OnClosing(CancelEventArgs e)
+    {
+        (DataContext as ImageConvertViewModel)?.ExecuteStopCommand();
+        base.OnClosing(e);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/ImageEntropy.xaml.cs b/Aaru.Gui/Views/Windows/ImageEntropy.xaml.cs
index 881e10aee..0acfba0c5 100644
--- a/Aaru.Gui/Views/Windows/ImageEntropy.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ImageEntropy.xaml.cs
@@ -36,24 +36,23 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
+namespace Aaru.Gui.Views.Windows;
+
+public sealed class ImageEntropy : Window
 {
-    public sealed class ImageEntropy : Window
+    public ImageEntropy()
     {
-        public ImageEntropy()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
+    }
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 
-        protected override void OnClosing(CancelEventArgs e)
-        {
-            (DataContext as ImageEntropyViewModel)?.ExecuteStopCommand();
-            base.OnClosing(e);
-        }
+    protected override void OnClosing(CancelEventArgs e)
+    {
+        (DataContext as ImageEntropyViewModel)?.ExecuteStopCommand();
+        base.OnClosing(e);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/ImageSidecar.xaml.cs b/Aaru.Gui/Views/Windows/ImageSidecar.xaml.cs
index 5b5a0eed5..7a239bf3e 100644
--- a/Aaru.Gui/Views/Windows/ImageSidecar.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ImageSidecar.xaml.cs
@@ -34,18 +34,17 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
-{
-    public sealed class ImageSidecar : Window
-    {
-        public ImageSidecar()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+namespace Aaru.Gui.Views.Windows;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+public sealed class ImageSidecar : Window
+{
+    public ImageSidecar()
+    {
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
     }
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/ImageVerify.xaml.cs b/Aaru.Gui/Views/Windows/ImageVerify.xaml.cs
index e4caec494..b08bb196b 100644
--- a/Aaru.Gui/Views/Windows/ImageVerify.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ImageVerify.xaml.cs
@@ -36,24 +36,23 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
+namespace Aaru.Gui.Views.Windows;
+
+public sealed class ImageVerify : Window
 {
-    public sealed class ImageVerify : Window
+    public ImageVerify()
     {
-        public ImageVerify()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
+    }
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 
-        protected override void OnClosing(CancelEventArgs e)
-        {
-            (DataContext as ImageVerifyViewModel)?.ExecuteStopCommand();
-            base.OnClosing(e);
-        }
+    protected override void OnClosing(CancelEventArgs e)
+    {
+        (DataContext as ImageVerifyViewModel)?.ExecuteStopCommand();
+        base.OnClosing(e);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/MainWindow.xaml.cs b/Aaru.Gui/Views/Windows/MainWindow.xaml.cs
index 8381e2d1f..65318cbeb 100644
--- a/Aaru.Gui/Views/Windows/MainWindow.xaml.cs
+++ b/Aaru.Gui/Views/Windows/MainWindow.xaml.cs
@@ -36,25 +36,24 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
+namespace Aaru.Gui.Views.Windows;
+
+public sealed class MainWindow : Window
 {
-    public sealed class MainWindow : Window
+    public MainWindow()
     {
-        public MainWindow()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
+    }
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 
-        protected override void OnOpened(EventArgs e)
-        {
-            base.OnOpened(e);
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
 
-            (DataContext as MainWindowViewModel)?.LoadComplete();
-        }
+        (DataContext as MainWindowViewModel)?.LoadComplete();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/MediaDump.xaml.cs b/Aaru.Gui/Views/Windows/MediaDump.xaml.cs
index 0be58729c..b8474315c 100644
--- a/Aaru.Gui/Views/Windows/MediaDump.xaml.cs
+++ b/Aaru.Gui/Views/Windows/MediaDump.xaml.cs
@@ -36,24 +36,23 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
+namespace Aaru.Gui.Views.Windows;
+
+public sealed class MediaDump : Window
 {
-    public sealed class MediaDump : Window
+    public MediaDump()
     {
-        public MediaDump()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
+    }
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 
-        protected override void OnClosing(CancelEventArgs e)
-        {
-            (DataContext as MediaDumpViewModel)?.ExecuteStopCommand();
-            base.OnClosing(e);
-        }
+    protected override void OnClosing(CancelEventArgs e)
+    {
+        (DataContext as MediaDumpViewModel)?.ExecuteStopCommand();
+        base.OnClosing(e);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/MediaScan.xaml.cs b/Aaru.Gui/Views/Windows/MediaScan.xaml.cs
index f6dce0776..24bacdba9 100644
--- a/Aaru.Gui/Views/Windows/MediaScan.xaml.cs
+++ b/Aaru.Gui/Views/Windows/MediaScan.xaml.cs
@@ -36,24 +36,23 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
+namespace Aaru.Gui.Views.Windows;
+
+public sealed class MediaScan : Window
 {
-    public sealed class MediaScan : Window
+    public MediaScan()
     {
-        public MediaScan()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
+    }
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 
-        protected override void OnClosing(CancelEventArgs e)
-        {
-            (DataContext as MediaScanViewModel)?.ExecuteStopCommand();
-            base.OnClosing(e);
-        }
+    protected override void OnClosing(CancelEventArgs e)
+    {
+        (DataContext as MediaScanViewModel)?.ExecuteStopCommand();
+        base.OnClosing(e);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs b/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs
index 6d10b52f6..fd8b0d968 100644
--- a/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs
+++ b/Aaru.Gui/Views/Windows/SplashWindow.xaml.cs
@@ -36,24 +36,23 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
+namespace Aaru.Gui.Views.Windows;
+
+public sealed class SplashWindow : Window
 {
-    public sealed class SplashWindow : Window
+    public SplashWindow()
     {
-        public SplashWindow()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
+    }
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 
-        protected override void OnOpened(EventArgs e)
-        {
-            base.OnOpened(e);
-            (DataContext as SplashWindowViewModel)?.OnOpened();
-        }
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        (DataContext as SplashWindowViewModel)?.OnOpened();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Gui/Views/Windows/ViewSector.xaml.cs b/Aaru.Gui/Views/Windows/ViewSector.xaml.cs
index 515cbb41b..228275c14 100644
--- a/Aaru.Gui/Views/Windows/ViewSector.xaml.cs
+++ b/Aaru.Gui/Views/Windows/ViewSector.xaml.cs
@@ -34,18 +34,17 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace Aaru.Gui.Views.Windows
-{
-    public sealed class ViewSector : Window
-    {
-        public ViewSector()
-        {
-            InitializeComponent();
-        #if DEBUG
-            this.AttachDevTools();
-        #endif
-        }
+namespace Aaru.Gui.Views.Windows;
 
-        void InitializeComponent() => AvaloniaXamlLoader.Load(this);
+public sealed class ViewSector : Window
+{
+    public ViewSector()
+    {
+        InitializeComponent();
+    #if DEBUG
+        this.AttachDevTools();
+    #endif
     }
+
+    void InitializeComponent() => AvaloniaXamlLoader.Load(this);
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/AaruFormat.cs b/Aaru.Images/AaruFormat/AaruFormat.cs
index c2225fcea..979a61e4d 100644
--- a/Aaru.Images/AaruFormat/AaruFormat.cs
+++ b/Aaru.Images/AaruFormat/AaruFormat.cs
@@ -78,111 +78,110 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <summary>Implements reading and writing AaruFormat media images</summary>
-    public sealed partial class AaruFormat : IWritableOpticalImage, IVerifiableImage, IWritableTapeImage
-    {
-        bool _alreadyWrittenZero;
-        /// <summary>Cache of uncompressed blocks.</summary>
-        Dictionary<ulong, byte[]> _blockCache;
-        /// <summary>Cache of block headers.</summary>
-        Dictionary<ulong, BlockHeader> _blockHeaderCache;
-        /// <summary>Provides checksum for deduplication of sectors.</summary>
-        SHA256 _checksumProvider;
-        bool            _compress;
-        byte[]          _compressedBuffer;
-        CompressionType _compressionAlgorithm;
-        /// <summary>Provides CRC64.</summary>
-        Crc64Context _crc64;
-        /// <summary>Header of the currently writing block.</summary>
-        BlockHeader _currentBlockHeader;
-        /// <summary>Sector offset of writing position in currently writing block.</summary>
-        uint _currentBlockOffset;
-        /// <summary>Current size in bytes of the block cache</summary>
-        uint _currentCacheSize;
-        /// <summary>Cache of DDT entries.</summary>
-        Dictionary<ulong, ulong> _ddtEntryCache;
-        bool _deduplicate;
-        /// <summary>On-memory deduplication table indexed by checksum.</summary>
-        Dictionary<string, ulong> _deduplicationTable;
-        /// <summary>Dictionary size for compression algorithms</summary>
-        uint _dictionarySize;
-        /// <summary>Block with logical geometry.</summary>
-        GeometryBlock _geometryBlock;
-        /// <summary>Image header.</summary>
-        AaruHeader _header;
-        /// <summary>Image information.</summary>
-        ImageInfo _imageInfo;
-        /// <summary>Image data stream.</summary>
-        Stream _imageStream;
-        /// <summary>Index.</summary>
-        List<IndexEntry> _index;
-        /// <summary>If set to <c>true</c>, the DDT entries are in-memory.</summary>
-        bool _inMemoryDdt;
-        ulong      _lastWrittenBlock;
-        Md5Context _md5Provider;
-        /// <summary>Cache of media tags.</summary>
-        Dictionary<MediaTagType, byte[]> _mediaTags;
-        byte[] _mode2Subheaders;
-        /// <summary>If DDT is on-disk, this is the image stream offset at which it starts.</summary>
-        long _outMemoryDdtPosition;
-        bool   _rewinded;
-        byte[] _sectorCpiMai;
-        byte[] _sectorDecryptedTitleKey;
-        /// <summary>Cache for data that prefixes the user data on a sector (e.g. sync).</summary>
-        byte[] _sectorPrefix;
-        uint[]       _sectorPrefixDdt;
-        MemoryStream _sectorPrefixMs;
-        /// <summary>Cache for data that goes side by side with user data (e.g. CompactDisc subchannel).</summary>
-        byte[] _sectorSubchannel;
-        /// <summary>Cache for data that suffixes the user data on a sector (e.g. edc, ecc).</summary>
-        byte[] _sectorSuffix;
-        uint[]        _sectorSuffixDdt;
-        MemoryStream  _sectorSuffixMs;
-        Sha1Context   _sha1Provider;
-        Sha256Context _sha256Provider;
-        /// <summary>Shift for calculating number of sectors in a block.</summary>
-        byte _shift;
-        SpamSumContext _spamsumProvider;
-        /// <summary>Cache for bytes to write/rad on-disk.</summary>
-        byte[] _structureBytes;
-        /// <summary>Cache for pointer for marshaling structures.</summary>
-        IntPtr _structurePointer;
-        Dictionary<ulong, ulong> _tapeDdt;
-        /// <summary>Cache of CompactDisc track's flags</summary>
-        Dictionary<byte, byte> _trackFlags;
-        /// <summary>Cache of CompactDisc track's ISRC</summary>
-        Dictionary<byte, string> _trackIsrcs;
-        /// <summary>In-memory deduplication table</summary>
-        ulong[] _userDataDdt;
-        byte[] _writingBuffer;
-        int    _writingBufferPosition;
-        bool   _writingLong;
-        ulong  _writtenSectors;
+namespace Aaru.DiscImages;
 
-        public AaruFormat() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = "Aaru",
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <summary>Implements reading and writing AaruFormat media images</summary>
+public sealed partial class AaruFormat : IWritableOpticalImage, IVerifiableImage, IWritableTapeImage
+{
+    bool _alreadyWrittenZero;
+    /// <summary>Cache of uncompressed blocks.</summary>
+    Dictionary<ulong, byte[]> _blockCache;
+    /// <summary>Cache of block headers.</summary>
+    Dictionary<ulong, BlockHeader> _blockHeaderCache;
+    /// <summary>Provides checksum for deduplication of sectors.</summary>
+    SHA256 _checksumProvider;
+    bool            _compress;
+    byte[]          _compressedBuffer;
+    CompressionType _compressionAlgorithm;
+    /// <summary>Provides CRC64.</summary>
+    Crc64Context _crc64;
+    /// <summary>Header of the currently writing block.</summary>
+    BlockHeader _currentBlockHeader;
+    /// <summary>Sector offset of writing position in currently writing block.</summary>
+    uint _currentBlockOffset;
+    /// <summary>Current size in bytes of the block cache</summary>
+    uint _currentCacheSize;
+    /// <summary>Cache of DDT entries.</summary>
+    Dictionary<ulong, ulong> _ddtEntryCache;
+    bool _deduplicate;
+    /// <summary>On-memory deduplication table indexed by checksum.</summary>
+    Dictionary<string, ulong> _deduplicationTable;
+    /// <summary>Dictionary size for compression algorithms</summary>
+    uint _dictionarySize;
+    /// <summary>Block with logical geometry.</summary>
+    GeometryBlock _geometryBlock;
+    /// <summary>Image header.</summary>
+    AaruHeader _header;
+    /// <summary>Image information.</summary>
+    ImageInfo _imageInfo;
+    /// <summary>Image data stream.</summary>
+    Stream _imageStream;
+    /// <summary>Index.</summary>
+    List<IndexEntry> _index;
+    /// <summary>If set to <c>true</c>, the DDT entries are in-memory.</summary>
+    bool _inMemoryDdt;
+    ulong      _lastWrittenBlock;
+    Md5Context _md5Provider;
+    /// <summary>Cache of media tags.</summary>
+    Dictionary<MediaTagType, byte[]> _mediaTags;
+    byte[] _mode2Subheaders;
+    /// <summary>If DDT is on-disk, this is the image stream offset at which it starts.</summary>
+    long _outMemoryDdtPosition;
+    bool   _rewinded;
+    byte[] _sectorCpiMai;
+    byte[] _sectorDecryptedTitleKey;
+    /// <summary>Cache for data that prefixes the user data on a sector (e.g. sync).</summary>
+    byte[] _sectorPrefix;
+    uint[]       _sectorPrefixDdt;
+    MemoryStream _sectorPrefixMs;
+    /// <summary>Cache for data that goes side by side with user data (e.g. CompactDisc subchannel).</summary>
+    byte[] _sectorSubchannel;
+    /// <summary>Cache for data that suffixes the user data on a sector (e.g. edc, ecc).</summary>
+    byte[] _sectorSuffix;
+    uint[]        _sectorSuffixDdt;
+    MemoryStream  _sectorSuffixMs;
+    Sha1Context   _sha1Provider;
+    Sha256Context _sha256Provider;
+    /// <summary>Shift for calculating number of sectors in a block.</summary>
+    byte _shift;
+    SpamSumContext _spamsumProvider;
+    /// <summary>Cache for bytes to write/rad on-disk.</summary>
+    byte[] _structureBytes;
+    /// <summary>Cache for pointer for marshaling structures.</summary>
+    IntPtr _structurePointer;
+    Dictionary<ulong, ulong> _tapeDdt;
+    /// <summary>Cache of CompactDisc track's flags</summary>
+    Dictionary<byte, byte> _trackFlags;
+    /// <summary>Cache of CompactDisc track's ISRC</summary>
+    Dictionary<byte, string> _trackIsrcs;
+    /// <summary>In-memory deduplication table</summary>
+    ulong[] _userDataDdt;
+    byte[] _writingBuffer;
+    int    _writingBufferPosition;
+    bool   _writingLong;
+    ulong  _writtenSectors;
+
+    public AaruFormat() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = "Aaru",
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/CdEcc.cs b/Aaru.Images/AaruFormat/CdEcc.cs
index 5507bb33d..a90810d66 100644
--- a/Aaru.Images/AaruFormat/CdEcc.cs
+++ b/Aaru.Images/AaruFormat/CdEcc.cs
@@ -34,326 +34,325 @@
 using System;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
+    byte[] _eccBTable;
+    byte[] _eccFTable;
+    uint[] _edcTable;
+    bool   _initedEdc;
+
+    void EccInit()
     {
-        byte[] _eccBTable;
-        byte[] _eccFTable;
-        uint[] _edcTable;
-        bool   _initedEdc;
+        if(_initedEdc)
+            return;
 
-        void EccInit()
+        _eccFTable = new byte[256];
+        _eccBTable = new byte[256];
+        _edcTable  = new uint[256];
+
+        for(uint i = 0; i < 256; i++)
         {
-            if(_initedEdc)
-                return;
+            uint edc = i;
+            uint j   = (uint)((i << 1) ^ ((i & 0x80) == 0x80 ? 0x11D : 0));
+            _eccFTable[i]     = (byte)j;
+            _eccBTable[i ^ j] = (byte)i;
 
-            _eccFTable = new byte[256];
-            _eccBTable = new byte[256];
-            _edcTable  = new uint[256];
+            for(j = 0; j < 8; j++)
+                edc = (edc >> 1) ^ ((edc & 1) > 0 ? 0xD8018001 : 0);
 
-            for(uint i = 0; i < 256; i++)
-            {
-                uint edc = i;
-                uint j   = (uint)((i << 1) ^ ((i & 0x80) == 0x80 ? 0x11D : 0));
-                _eccFTable[i]     = (byte)j;
-                _eccBTable[i ^ j] = (byte)i;
-
-                for(j = 0; j < 8; j++)
-                    edc = (edc >> 1) ^ ((edc & 1) > 0 ? 0xD8018001 : 0);
-
-                _edcTable[i] = edc;
-            }
-
-            _initedEdc = true;
+            _edcTable[i] = edc;
         }
 
-        bool SuffixIsCorrect(byte[] sector)
-        {
-            if(!_initedEdc)
-                EccInit();
+        _initedEdc = true;
+    }
 
-            if(sector[0x814] != 0x00 || // reserved (8 bytes)
-               sector[0x815] != 0x00 ||
-               sector[0x816] != 0x00 ||
-               sector[0x817] != 0x00 ||
-               sector[0x818] != 0x00 ||
-               sector[0x819] != 0x00 ||
-               sector[0x81A] != 0x00 ||
-               sector[0x81B] != 0x00)
+    bool SuffixIsCorrect(byte[] sector)
+    {
+        if(!_initedEdc)
+            EccInit();
+
+        if(sector[0x814] != 0x00 || // reserved (8 bytes)
+           sector[0x815] != 0x00 ||
+           sector[0x816] != 0x00 ||
+           sector[0x817] != 0x00 ||
+           sector[0x818] != 0x00 ||
+           sector[0x819] != 0x00 ||
+           sector[0x81A] != 0x00 ||
+           sector[0x81B] != 0x00)
+            return false;
+
+        bool correctEccP = CheckEcc(sector, sector, 86, 24, 2, 86, sector, 0xC, 0x10, 0x81C);
+
+        if(!correctEccP)
+            return false;
+
+        bool correctEccQ = CheckEcc(sector, sector, 52, 43, 86, 88, sector, 0xC, 0x10, 0x81C + 0xAC);
+
+        if(!correctEccQ)
+            return false;
+
+        uint storedEdc = BitConverter.ToUInt32(sector, 0x810);
+        uint edc       = 0;
+        int  size      = 0x810;
+        int  pos       = 0;
+
+        for(; size > 0; size--)
+            edc = (edc >> 8) ^ _edcTable[(edc ^ sector[pos++]) & 0xFF];
+
+        uint calculatedEdc = edc;
+
+        return calculatedEdc == storedEdc;
+    }
+
+    bool SuffixIsCorrectMode2(byte[] sector)
+    {
+        if(!_initedEdc)
+            EccInit();
+
+        byte[] zeroAddress = new byte[4];
+
+        bool correctEccP = CheckEcc(zeroAddress, sector, 86, 24, 2, 86, sector, 0, 0x10, 0x81C);
+
+        if(!correctEccP)
+            return false;
+
+        bool correctEccQ = CheckEcc(zeroAddress, sector, 52, 43, 86, 88, sector, 0, 0x10, 0x81C + 0xAC);
+
+        if(!correctEccQ)
+            return false;
+
+        uint storedEdc = BitConverter.ToUInt32(sector, 0x818);
+        uint edc       = 0;
+        int  size      = 0x808;
+        int  pos       = 0x10;
+
+        for(; size > 0; size--)
+            edc = (edc >> 8) ^ _edcTable[(edc ^ sector[pos++]) & 0xFF];
+
+        uint calculatedEdc = edc;
+
+        return calculatedEdc == storedEdc;
+    }
+
+    bool CheckEcc(byte[] address, byte[] data, uint majorCount, uint minorCount, uint majorMult, uint minorInc,
+                  byte[] ecc, int addressOffset, int dataOffset, int eccOffset)
+    {
+        uint size = majorCount * minorCount;
+        uint major;
+
+        for(major = 0; major < majorCount; major++)
+        {
+            uint idx  = ((major >> 1) * majorMult) + (major & 1);
+            byte eccA = 0;
+            byte eccB = 0;
+            uint minor;
+
+            for(minor = 0; minor < minorCount; minor++)
+            {
+                byte temp = idx < 4 ? address[idx + addressOffset] : data[idx + dataOffset - 4];
+                idx += minorInc;
+
+                if(idx >= size)
+                    idx -= size;
+
+                eccA ^= temp;
+                eccB ^= temp;
+                eccA =  _eccFTable[eccA];
+            }
+
+            eccA = _eccBTable[_eccFTable[eccA] ^ eccB];
+
+            if(ecc[major + eccOffset]              != eccA ||
+               ecc[major + majorCount + eccOffset] != (eccA ^ eccB))
                 return false;
-
-            bool correctEccP = CheckEcc(sector, sector, 86, 24, 2, 86, sector, 0xC, 0x10, 0x81C);
-
-            if(!correctEccP)
-                return false;
-
-            bool correctEccQ = CheckEcc(sector, sector, 52, 43, 86, 88, sector, 0xC, 0x10, 0x81C + 0xAC);
-
-            if(!correctEccQ)
-                return false;
-
-            uint storedEdc = BitConverter.ToUInt32(sector, 0x810);
-            uint edc       = 0;
-            int  size      = 0x810;
-            int  pos       = 0;
-
-            for(; size > 0; size--)
-                edc = (edc >> 8) ^ _edcTable[(edc ^ sector[pos++]) & 0xFF];
-
-            uint calculatedEdc = edc;
-
-            return calculatedEdc == storedEdc;
         }
 
-        bool SuffixIsCorrectMode2(byte[] sector)
+        return true;
+    }
+
+    void WriteEcc(byte[] address, byte[] data, uint majorCount, uint minorCount, uint majorMult, uint minorInc,
+                  ref byte[] ecc, int addressOffset, int dataOffset, int eccOffset)
+    {
+        uint size = majorCount * minorCount;
+        uint major;
+
+        for(major = 0; major < majorCount; major++)
         {
-            if(!_initedEdc)
-                EccInit();
+            uint idx  = ((major >> 1) * majorMult) + (major & 1);
+            byte eccA = 0;
+            byte eccB = 0;
+            uint minor;
 
-            byte[] zeroAddress = new byte[4];
-
-            bool correctEccP = CheckEcc(zeroAddress, sector, 86, 24, 2, 86, sector, 0, 0x10, 0x81C);
-
-            if(!correctEccP)
-                return false;
-
-            bool correctEccQ = CheckEcc(zeroAddress, sector, 52, 43, 86, 88, sector, 0, 0x10, 0x81C + 0xAC);
-
-            if(!correctEccQ)
-                return false;
-
-            uint storedEdc = BitConverter.ToUInt32(sector, 0x818);
-            uint edc       = 0;
-            int  size      = 0x808;
-            int  pos       = 0x10;
-
-            for(; size > 0; size--)
-                edc = (edc >> 8) ^ _edcTable[(edc ^ sector[pos++]) & 0xFF];
-
-            uint calculatedEdc = edc;
-
-            return calculatedEdc == storedEdc;
-        }
-
-        bool CheckEcc(byte[] address, byte[] data, uint majorCount, uint minorCount, uint majorMult, uint minorInc,
-                      byte[] ecc, int addressOffset, int dataOffset, int eccOffset)
-        {
-            uint size = majorCount * minorCount;
-            uint major;
-
-            for(major = 0; major < majorCount; major++)
+            for(minor = 0; minor < minorCount; minor++)
             {
-                uint idx  = ((major >> 1) * majorMult) + (major & 1);
-                byte eccA = 0;
-                byte eccB = 0;
-                uint minor;
+                byte temp = idx < 4 ? address[idx + addressOffset] : data[idx + dataOffset - 4];
+                idx += minorInc;
 
-                for(minor = 0; minor < minorCount; minor++)
-                {
-                    byte temp = idx < 4 ? address[idx + addressOffset] : data[idx + dataOffset - 4];
-                    idx += minorInc;
+                if(idx >= size)
+                    idx -= size;
 
-                    if(idx >= size)
-                        idx -= size;
-
-                    eccA ^= temp;
-                    eccB ^= temp;
-                    eccA =  _eccFTable[eccA];
-                }
-
-                eccA = _eccBTable[_eccFTable[eccA] ^ eccB];
-
-                if(ecc[major + eccOffset]              != eccA ||
-                   ecc[major + majorCount + eccOffset] != (eccA ^ eccB))
-                    return false;
+                eccA ^= temp;
+                eccB ^= temp;
+                eccA =  _eccFTable[eccA];
             }
 
-            return true;
-        }
-
-        void WriteEcc(byte[] address, byte[] data, uint majorCount, uint minorCount, uint majorMult, uint minorInc,
-                      ref byte[] ecc, int addressOffset, int dataOffset, int eccOffset)
-        {
-            uint size = majorCount * minorCount;
-            uint major;
-
-            for(major = 0; major < majorCount; major++)
-            {
-                uint idx  = ((major >> 1) * majorMult) + (major & 1);
-                byte eccA = 0;
-                byte eccB = 0;
-                uint minor;
-
-                for(minor = 0; minor < minorCount; minor++)
-                {
-                    byte temp = idx < 4 ? address[idx + addressOffset] : data[idx + dataOffset - 4];
-                    idx += minorInc;
-
-                    if(idx >= size)
-                        idx -= size;
-
-                    eccA ^= temp;
-                    eccB ^= temp;
-                    eccA =  _eccFTable[eccA];
-                }
-
-                eccA                                = _eccBTable[_eccFTable[eccA] ^ eccB];
-                ecc[major + eccOffset]              = eccA;
-                ecc[major + majorCount + eccOffset] = (byte)(eccA ^ eccB);
-            }
-        }
-
-        void EccWriteSector(byte[] address, byte[] data, ref byte[] ecc, int addressOffset, int dataOffset,
-                            int eccOffset)
-        {
-            WriteEcc(address, data, 86, 24, 2, 86, ref ecc, addressOffset, dataOffset, eccOffset);         // P
-            WriteEcc(address, data, 52, 43, 86, 88, ref ecc, addressOffset, dataOffset, eccOffset + 0xAC); // Q
-        }
-
-        static (byte minute, byte second, byte frame) LbaToMsf(long pos) =>
-            ((byte)((pos + 150) / 75 / 60), (byte)((pos + 150) / 75 % 60), (byte)((pos + 150) % 75));
-
-        void ReconstructPrefix(ref byte[] sector, // must point to a full 2352-byte sector
-                               TrackType type, long lba)
-        {
-            //
-            // Sync
-            //
-            sector[0x000] = 0x00;
-            sector[0x001] = 0xFF;
-            sector[0x002] = 0xFF;
-            sector[0x003] = 0xFF;
-            sector[0x004] = 0xFF;
-            sector[0x005] = 0xFF;
-            sector[0x006] = 0xFF;
-            sector[0x007] = 0xFF;
-            sector[0x008] = 0xFF;
-            sector[0x009] = 0xFF;
-            sector[0x00A] = 0xFF;
-            sector[0x00B] = 0x00;
-
-            (byte minute, byte second, byte frame) msf = LbaToMsf(lba);
-
-            sector[0x00C] = (byte)(((msf.minute / 10) << 4) + (msf.minute % 10));
-            sector[0x00D] = (byte)(((msf.second / 10) << 4) + (msf.second % 10));
-            sector[0x00E] = (byte)(((msf.frame  / 10) << 4) + (msf.frame  % 10));
-
-            switch(type)
-            {
-                case TrackType.CdMode1:
-                    //
-                    // Mode
-                    //
-                    sector[0x00F] = 0x01;
-
-                    break;
-                case TrackType.CdMode2Form1:
-                case TrackType.CdMode2Form2:
-                case TrackType.CdMode2Formless:
-                    //
-                    // Mode
-                    //
-                    sector[0x00F] = 0x02;
-
-                    //
-                    // Flags
-                    //
-                    sector[0x010] = sector[0x014];
-                    sector[0x011] = sector[0x015];
-                    sector[0x012] = sector[0x016];
-                    sector[0x013] = sector[0x017];
-
-                    break;
-                default: return;
-            }
-        }
-
-        void ReconstructEcc(ref byte[] sector, // must point to a full 2352-byte sector
-                            TrackType type)
-        {
-            byte[] computedEdc;
-
-            if(!_initedEdc)
-                EccInit();
-
-            switch(type)
-            {
-                //
-                // Compute EDC
-                //
-                case TrackType.CdMode1:
-                    computedEdc   = BitConverter.GetBytes(ComputeEdc(0, sector, 0x810));
-                    sector[0x810] = computedEdc[0];
-                    sector[0x811] = computedEdc[1];
-                    sector[0x812] = computedEdc[2];
-                    sector[0x813] = computedEdc[3];
-
-                    break;
-                case TrackType.CdMode2Form1:
-                    computedEdc   = BitConverter.GetBytes(ComputeEdc(0, sector, 0x808, 0x10));
-                    sector[0x818] = computedEdc[0];
-                    sector[0x819] = computedEdc[1];
-                    sector[0x81A] = computedEdc[2];
-                    sector[0x81B] = computedEdc[3];
-
-                    break;
-                case TrackType.CdMode2Form2:
-                    computedEdc   = BitConverter.GetBytes(ComputeEdc(0, sector, 0x91C, 0x10));
-                    sector[0x92C] = computedEdc[0];
-                    sector[0x92D] = computedEdc[1];
-                    sector[0x92E] = computedEdc[2];
-                    sector[0x92F] = computedEdc[3];
-
-                    break;
-                default: return;
-            }
-
-            byte[] zeroAddress = new byte[4];
-
-            switch(type)
-            {
-                //
-                // Compute ECC
-                //
-                case TrackType.CdMode1:
-                    //
-                    // Reserved
-                    //
-                    sector[0x814] = 0x00;
-                    sector[0x815] = 0x00;
-                    sector[0x816] = 0x00;
-                    sector[0x817] = 0x00;
-                    sector[0x818] = 0x00;
-                    sector[0x819] = 0x00;
-                    sector[0x81A] = 0x00;
-                    sector[0x81B] = 0x00;
-                    EccWriteSector(sector, sector, ref sector, 0xC, 0x10, 0x81C);
-
-                    break;
-                case TrackType.CdMode2Form1:
-                    EccWriteSector(zeroAddress, sector, ref sector, 0, 0x10, 0x81C);
-
-                    break;
-                default: return;
-            }
-
-            //
-            // Done
-            //
-        }
-
-        uint ComputeEdc(uint edc, byte[] src, int size, int srcOffset = 0)
-        {
-            if(!_initedEdc)
-                EccInit();
-
-            int pos = srcOffset;
-
-            for(; size > 0; size--)
-                edc = (edc >> 8) ^ _edcTable[(edc ^ src[pos++]) & 0xFF];
-
-            return edc;
+            eccA                                = _eccBTable[_eccFTable[eccA] ^ eccB];
+            ecc[major + eccOffset]              = eccA;
+            ecc[major + majorCount + eccOffset] = (byte)(eccA ^ eccB);
         }
     }
+
+    void EccWriteSector(byte[] address, byte[] data, ref byte[] ecc, int addressOffset, int dataOffset,
+                        int eccOffset)
+    {
+        WriteEcc(address, data, 86, 24, 2, 86, ref ecc, addressOffset, dataOffset, eccOffset);         // P
+        WriteEcc(address, data, 52, 43, 86, 88, ref ecc, addressOffset, dataOffset, eccOffset + 0xAC); // Q
+    }
+
+    static (byte minute, byte second, byte frame) LbaToMsf(long pos) =>
+        ((byte)((pos + 150) / 75 / 60), (byte)((pos + 150) / 75 % 60), (byte)((pos + 150) % 75));
+
+    void ReconstructPrefix(ref byte[] sector, // must point to a full 2352-byte sector
+                           TrackType type, long lba)
+    {
+        //
+        // Sync
+        //
+        sector[0x000] = 0x00;
+        sector[0x001] = 0xFF;
+        sector[0x002] = 0xFF;
+        sector[0x003] = 0xFF;
+        sector[0x004] = 0xFF;
+        sector[0x005] = 0xFF;
+        sector[0x006] = 0xFF;
+        sector[0x007] = 0xFF;
+        sector[0x008] = 0xFF;
+        sector[0x009] = 0xFF;
+        sector[0x00A] = 0xFF;
+        sector[0x00B] = 0x00;
+
+        (byte minute, byte second, byte frame) msf = LbaToMsf(lba);
+
+        sector[0x00C] = (byte)(((msf.minute / 10) << 4) + (msf.minute % 10));
+        sector[0x00D] = (byte)(((msf.second / 10) << 4) + (msf.second % 10));
+        sector[0x00E] = (byte)(((msf.frame  / 10) << 4) + (msf.frame  % 10));
+
+        switch(type)
+        {
+            case TrackType.CdMode1:
+                //
+                // Mode
+                //
+                sector[0x00F] = 0x01;
+
+                break;
+            case TrackType.CdMode2Form1:
+            case TrackType.CdMode2Form2:
+            case TrackType.CdMode2Formless:
+                //
+                // Mode
+                //
+                sector[0x00F] = 0x02;
+
+                //
+                // Flags
+                //
+                sector[0x010] = sector[0x014];
+                sector[0x011] = sector[0x015];
+                sector[0x012] = sector[0x016];
+                sector[0x013] = sector[0x017];
+
+                break;
+            default: return;
+        }
+    }
+
+    void ReconstructEcc(ref byte[] sector, // must point to a full 2352-byte sector
+                        TrackType type)
+    {
+        byte[] computedEdc;
+
+        if(!_initedEdc)
+            EccInit();
+
+        switch(type)
+        {
+            //
+            // Compute EDC
+            //
+            case TrackType.CdMode1:
+                computedEdc   = BitConverter.GetBytes(ComputeEdc(0, sector, 0x810));
+                sector[0x810] = computedEdc[0];
+                sector[0x811] = computedEdc[1];
+                sector[0x812] = computedEdc[2];
+                sector[0x813] = computedEdc[3];
+
+                break;
+            case TrackType.CdMode2Form1:
+                computedEdc   = BitConverter.GetBytes(ComputeEdc(0, sector, 0x808, 0x10));
+                sector[0x818] = computedEdc[0];
+                sector[0x819] = computedEdc[1];
+                sector[0x81A] = computedEdc[2];
+                sector[0x81B] = computedEdc[3];
+
+                break;
+            case TrackType.CdMode2Form2:
+                computedEdc   = BitConverter.GetBytes(ComputeEdc(0, sector, 0x91C, 0x10));
+                sector[0x92C] = computedEdc[0];
+                sector[0x92D] = computedEdc[1];
+                sector[0x92E] = computedEdc[2];
+                sector[0x92F] = computedEdc[3];
+
+                break;
+            default: return;
+        }
+
+        byte[] zeroAddress = new byte[4];
+
+        switch(type)
+        {
+            //
+            // Compute ECC
+            //
+            case TrackType.CdMode1:
+                //
+                // Reserved
+                //
+                sector[0x814] = 0x00;
+                sector[0x815] = 0x00;
+                sector[0x816] = 0x00;
+                sector[0x817] = 0x00;
+                sector[0x818] = 0x00;
+                sector[0x819] = 0x00;
+                sector[0x81A] = 0x00;
+                sector[0x81B] = 0x00;
+                EccWriteSector(sector, sector, ref sector, 0xC, 0x10, 0x81C);
+
+                break;
+            case TrackType.CdMode2Form1:
+                EccWriteSector(zeroAddress, sector, ref sector, 0, 0x10, 0x81C);
+
+                break;
+            default: return;
+        }
+
+        //
+        // Done
+        //
+    }
+
+    uint ComputeEdc(uint edc, byte[] src, int size, int srcOffset = 0)
+    {
+        if(!_initedEdc)
+            EccInit();
+
+        int pos = srcOffset;
+
+        for(; size > 0; size--)
+            edc = (edc >> 8) ^ _edcTable[(edc ^ src[pos++]) & 0xFF];
+
+        return edc;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
index fd13dcc9f..2904f36e5 100644
--- a/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
+++ b/Aaru.Images/AaruFormat/ClauniaSubchannelTransform.cs
@@ -33,272 +33,271 @@
 using System;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
+    static byte[] ClauniaSubchannelTransform(byte[] interleaved)
     {
-        static byte[] ClauniaSubchannelTransform(byte[] interleaved)
+        if(interleaved == null)
+            return null;
+
+        int[] p = new int[interleaved.Length / 8];
+        int[] q = new int[interleaved.Length / 8];
+        int[] r = new int[interleaved.Length / 8];
+        int[] s = new int[interleaved.Length / 8];
+        int[] t = new int[interleaved.Length / 8];
+        int[] u = new int[interleaved.Length / 8];
+        int[] v = new int[interleaved.Length / 8];
+        int[] w = new int[interleaved.Length / 8];
+
+        DateTime start = DateTime.UtcNow;
+
+        for(int i = 0; i < interleaved.Length; i += 8)
         {
-            if(interleaved == null)
-                return null;
+            p[i / 8] =  interleaved[i] & 0x80;
+            p[i / 8] += (interleaved[i + 1] & 0x80) >> 1;
+            p[i / 8] += (interleaved[i + 2] & 0x80) >> 2;
+            p[i / 8] += (interleaved[i + 3] & 0x80) >> 3;
+            p[i / 8] += (interleaved[i + 4] & 0x80) >> 4;
+            p[i / 8] += (interleaved[i + 5] & 0x80) >> 5;
+            p[i / 8] += (interleaved[i + 6] & 0x80) >> 6;
+            p[i / 8] += (interleaved[i + 7] & 0x80) >> 7;
 
-            int[] p = new int[interleaved.Length / 8];
-            int[] q = new int[interleaved.Length / 8];
-            int[] r = new int[interleaved.Length / 8];
-            int[] s = new int[interleaved.Length / 8];
-            int[] t = new int[interleaved.Length / 8];
-            int[] u = new int[interleaved.Length / 8];
-            int[] v = new int[interleaved.Length / 8];
-            int[] w = new int[interleaved.Length / 8];
+            q[i / 8] =  (interleaved[i] & 0x40) << 1;
+            q[i / 8] += interleaved[i + 1] & 0x40;
+            q[i / 8] += (interleaved[i + 2] & 0x40) >> 1;
+            q[i / 8] += (interleaved[i + 3] & 0x40) >> 2;
+            q[i / 8] += (interleaved[i + 4] & 0x40) >> 3;
+            q[i / 8] += (interleaved[i + 5] & 0x40) >> 4;
+            q[i / 8] += (interleaved[i + 6] & 0x40) >> 5;
+            q[i / 8] += (interleaved[i + 7] & 0x40) >> 6;
 
-            DateTime start = DateTime.UtcNow;
+            r[i / 8] =  (interleaved[i]     & 0x20) << 2;
+            r[i / 8] += (interleaved[i + 1] & 0x20) << 1;
+            r[i / 8] += interleaved[i + 2] & 0x20;
+            r[i / 8] += (interleaved[i + 3] & 0x20) >> 1;
+            r[i / 8] += (interleaved[i + 4] & 0x20) >> 2;
+            r[i / 8] += (interleaved[i + 5] & 0x20) >> 3;
+            r[i / 8] += (interleaved[i + 6] & 0x20) >> 4;
+            r[i / 8] += (interleaved[i + 7] & 0x20) >> 5;
 
-            for(int i = 0; i < interleaved.Length; i += 8)
-            {
-                p[i / 8] =  interleaved[i] & 0x80;
-                p[i / 8] += (interleaved[i + 1] & 0x80) >> 1;
-                p[i / 8] += (interleaved[i + 2] & 0x80) >> 2;
-                p[i / 8] += (interleaved[i + 3] & 0x80) >> 3;
-                p[i / 8] += (interleaved[i + 4] & 0x80) >> 4;
-                p[i / 8] += (interleaved[i + 5] & 0x80) >> 5;
-                p[i / 8] += (interleaved[i + 6] & 0x80) >> 6;
-                p[i / 8] += (interleaved[i + 7] & 0x80) >> 7;
+            s[i / 8] =  (interleaved[i]     & 0x10) << 3;
+            s[i / 8] += (interleaved[i + 1] & 0x10) << 2;
+            s[i / 8] += (interleaved[i + 2] & 0x10) << 1;
+            s[i / 8] += interleaved[i + 3] & 0x10;
+            s[i / 8] += (interleaved[i + 4] & 0x10) >> 1;
+            s[i / 8] += (interleaved[i + 5] & 0x10) >> 2;
+            s[i / 8] += (interleaved[i + 6] & 0x10) >> 3;
+            s[i / 8] += (interleaved[i + 7] & 0x10) >> 4;
 
-                q[i / 8] =  (interleaved[i] & 0x40) << 1;
-                q[i / 8] += interleaved[i + 1] & 0x40;
-                q[i / 8] += (interleaved[i + 2] & 0x40) >> 1;
-                q[i / 8] += (interleaved[i + 3] & 0x40) >> 2;
-                q[i / 8] += (interleaved[i + 4] & 0x40) >> 3;
-                q[i / 8] += (interleaved[i + 5] & 0x40) >> 4;
-                q[i / 8] += (interleaved[i + 6] & 0x40) >> 5;
-                q[i / 8] += (interleaved[i + 7] & 0x40) >> 6;
+            t[i / 8] =  (interleaved[i]     & 0x08) << 4;
+            t[i / 8] += (interleaved[i + 1] & 0x08) << 3;
+            t[i / 8] += (interleaved[i + 2] & 0x08) << 2;
+            t[i / 8] += (interleaved[i + 3] & 0x08) << 1;
+            t[i / 8] += interleaved[i + 4] & 0x08;
+            t[i / 8] += (interleaved[i + 5] & 0x08) >> 1;
+            t[i / 8] += (interleaved[i + 6] & 0x08) >> 2;
+            t[i / 8] += (interleaved[i + 7] & 0x08) >> 3;
 
-                r[i / 8] =  (interleaved[i]     & 0x20) << 2;
-                r[i / 8] += (interleaved[i + 1] & 0x20) << 1;
-                r[i / 8] += interleaved[i + 2] & 0x20;
-                r[i / 8] += (interleaved[i + 3] & 0x20) >> 1;
-                r[i / 8] += (interleaved[i + 4] & 0x20) >> 2;
-                r[i / 8] += (interleaved[i + 5] & 0x20) >> 3;
-                r[i / 8] += (interleaved[i + 6] & 0x20) >> 4;
-                r[i / 8] += (interleaved[i + 7] & 0x20) >> 5;
+            u[i / 8] =  (interleaved[i]     & 0x04) << 5;
+            u[i / 8] += (interleaved[i + 1] & 0x04) << 4;
+            u[i / 8] += (interleaved[i + 2] & 0x04) << 3;
+            u[i / 8] += (interleaved[i + 3] & 0x04) << 2;
+            u[i / 8] += (interleaved[i + 4] & 0x04) << 1;
+            u[i / 8] += interleaved[i + 5] & 0x04;
+            u[i / 8] += (interleaved[i + 6] & 0x04) >> 1;
+            u[i / 8] += (interleaved[i + 7] & 0x04) >> 2;
 
-                s[i / 8] =  (interleaved[i]     & 0x10) << 3;
-                s[i / 8] += (interleaved[i + 1] & 0x10) << 2;
-                s[i / 8] += (interleaved[i + 2] & 0x10) << 1;
-                s[i / 8] += interleaved[i + 3] & 0x10;
-                s[i / 8] += (interleaved[i + 4] & 0x10) >> 1;
-                s[i / 8] += (interleaved[i + 5] & 0x10) >> 2;
-                s[i / 8] += (interleaved[i + 6] & 0x10) >> 3;
-                s[i / 8] += (interleaved[i + 7] & 0x10) >> 4;
+            v[i / 8] =  (interleaved[i]     & 0x02) << 6;
+            v[i / 8] += (interleaved[i + 1] & 0x02) << 5;
+            v[i / 8] += (interleaved[i + 2] & 0x02) << 4;
+            v[i / 8] += (interleaved[i + 3] & 0x02) << 3;
+            v[i / 8] += (interleaved[i + 4] & 0x02) << 2;
+            v[i / 8] += (interleaved[i + 5] & 0x02) << 1;
+            v[i / 8] += interleaved[i + 6] & 0x02;
+            v[i / 8] += (interleaved[i + 7] & 0x02) >> 1;
 
-                t[i / 8] =  (interleaved[i]     & 0x08) << 4;
-                t[i / 8] += (interleaved[i + 1] & 0x08) << 3;
-                t[i / 8] += (interleaved[i + 2] & 0x08) << 2;
-                t[i / 8] += (interleaved[i + 3] & 0x08) << 1;
-                t[i / 8] += interleaved[i + 4] & 0x08;
-                t[i / 8] += (interleaved[i + 5] & 0x08) >> 1;
-                t[i / 8] += (interleaved[i + 6] & 0x08) >> 2;
-                t[i / 8] += (interleaved[i + 7] & 0x08) >> 3;
-
-                u[i / 8] =  (interleaved[i]     & 0x04) << 5;
-                u[i / 8] += (interleaved[i + 1] & 0x04) << 4;
-                u[i / 8] += (interleaved[i + 2] & 0x04) << 3;
-                u[i / 8] += (interleaved[i + 3] & 0x04) << 2;
-                u[i / 8] += (interleaved[i + 4] & 0x04) << 1;
-                u[i / 8] += interleaved[i + 5] & 0x04;
-                u[i / 8] += (interleaved[i + 6] & 0x04) >> 1;
-                u[i / 8] += (interleaved[i + 7] & 0x04) >> 2;
-
-                v[i / 8] =  (interleaved[i]     & 0x02) << 6;
-                v[i / 8] += (interleaved[i + 1] & 0x02) << 5;
-                v[i / 8] += (interleaved[i + 2] & 0x02) << 4;
-                v[i / 8] += (interleaved[i + 3] & 0x02) << 3;
-                v[i / 8] += (interleaved[i + 4] & 0x02) << 2;
-                v[i / 8] += (interleaved[i + 5] & 0x02) << 1;
-                v[i / 8] += interleaved[i + 6] & 0x02;
-                v[i / 8] += (interleaved[i + 7] & 0x02) >> 1;
-
-                w[i / 8] =  (interleaved[i]     & 0x01) << 7;
-                w[i / 8] += (interleaved[i + 1] & 0x01) << 6;
-                w[i / 8] += (interleaved[i + 2] & 0x01) << 5;
-                w[i / 8] += (interleaved[i + 3] & 0x01) << 4;
-                w[i / 8] += (interleaved[i + 4] & 0x01) << 3;
-                w[i / 8] += (interleaved[i + 5] & 0x01) << 2;
-                w[i / 8] += (interleaved[i + 6] & 0x01) << 1;
-                w[i / 8] += interleaved[i + 7] & 0x01;
-            }
-
-            DateTime end          = DateTime.UtcNow;
-            TimeSpan deinterleave = end - start;
-
-            byte[] sequential = new byte[interleaved.Length];
-            start = DateTime.UtcNow;
-
-            int qStart = p.Length * 1;
-            int rStart = p.Length * 2;
-            int sStart = p.Length * 3;
-            int tStart = p.Length * 4;
-            int uStart = p.Length * 5;
-            int vStart = p.Length * 6;
-            int wStart = p.Length * 7;
-
-            for(int i = 0; i < p.Length; i++)
-            {
-                sequential[i]          = (byte)p[i];
-                sequential[qStart + i] = (byte)q[i];
-                sequential[rStart + i] = (byte)r[i];
-                sequential[sStart + i] = (byte)s[i];
-                sequential[tStart + i] = (byte)t[i];
-                sequential[uStart + i] = (byte)u[i];
-                sequential[vStart + i] = (byte)v[i];
-                sequential[wStart + i] = (byte)w[i];
-            }
-
-            end = DateTime.UtcNow;
-            TimeSpan sequentialize = end - start;
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to deinterleave subchannel.",
-                                       deinterleave.TotalMilliseconds);
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to sequentialize subchannel.",
-                                       sequentialize.TotalMilliseconds);
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to transform subchannel.",
-                                       deinterleave.TotalMilliseconds + sequentialize.TotalMilliseconds);
-
-            return sequential;
+            w[i / 8] =  (interleaved[i]     & 0x01) << 7;
+            w[i / 8] += (interleaved[i + 1] & 0x01) << 6;
+            w[i / 8] += (interleaved[i + 2] & 0x01) << 5;
+            w[i / 8] += (interleaved[i + 3] & 0x01) << 4;
+            w[i / 8] += (interleaved[i + 4] & 0x01) << 3;
+            w[i / 8] += (interleaved[i + 5] & 0x01) << 2;
+            w[i / 8] += (interleaved[i + 6] & 0x01) << 1;
+            w[i / 8] += interleaved[i + 7] & 0x01;
         }
 
-        static byte[] ClauniaSubchannelUntransform(byte[] sequential)
+        DateTime end          = DateTime.UtcNow;
+        TimeSpan deinterleave = end - start;
+
+        byte[] sequential = new byte[interleaved.Length];
+        start = DateTime.UtcNow;
+
+        int qStart = p.Length * 1;
+        int rStart = p.Length * 2;
+        int sStart = p.Length * 3;
+        int tStart = p.Length * 4;
+        int uStart = p.Length * 5;
+        int vStart = p.Length * 6;
+        int wStart = p.Length * 7;
+
+        for(int i = 0; i < p.Length; i++)
         {
-            if(sequential == null)
-                return null;
-
-            int[] p = new int[sequential.Length / 8];
-            int[] q = new int[sequential.Length / 8];
-            int[] r = new int[sequential.Length / 8];
-            int[] s = new int[sequential.Length / 8];
-            int[] t = new int[sequential.Length / 8];
-            int[] u = new int[sequential.Length / 8];
-            int[] v = new int[sequential.Length / 8];
-            int[] w = new int[sequential.Length / 8];
-
-            int qStart = p.Length * 1;
-            int rStart = p.Length * 2;
-            int sStart = p.Length * 3;
-            int tStart = p.Length * 4;
-            int uStart = p.Length * 5;
-            int vStart = p.Length * 6;
-            int wStart = p.Length * 7;
-
-            DateTime start = DateTime.UtcNow;
-
-            for(int i = 0; i < p.Length; i++)
-            {
-                p[i] = sequential[i];
-                q[i] = sequential[qStart + i];
-                r[i] = sequential[rStart + i];
-                s[i] = sequential[sStart + i];
-                t[i] = sequential[tStart + i];
-                u[i] = sequential[uStart + i];
-                v[i] = sequential[vStart + i];
-                w[i] = sequential[wStart + i];
-            }
-
-            DateTime end             = DateTime.UtcNow;
-            TimeSpan desequentialize = end - start;
-
-            byte[] interleaved = new byte[sequential.Length];
-            start = DateTime.UtcNow;
-
-            for(int i = 0; i < interleaved.Length; i += 8)
-            {
-                interleaved[i]     =  (byte)((p[i / 8] & 0x80) == 0x80 ? 0x80 : 0);
-                interleaved[i + 1] += (byte)((p[i / 8] & 0x40) == 0x40 ? 0x80 : 0);
-                interleaved[i + 2] += (byte)((p[i / 8] & 0x20) == 0x20 ? 0x80 : 0);
-                interleaved[i + 3] += (byte)((p[i / 8] & 0x10) == 0x10 ? 0x80 : 0);
-                interleaved[i + 4] += (byte)((p[i / 8] & 0x08) == 0x08 ? 0x80 : 0);
-                interleaved[i + 5] += (byte)((p[i / 8] & 0x04) == 0x04 ? 0x80 : 0);
-                interleaved[i + 6] += (byte)((p[i / 8] & 0x02) == 0x02 ? 0x80 : 0);
-                interleaved[i + 7] += (byte)((p[i / 8] & 0x01) == 0x01 ? 0x80 : 0);
-
-                interleaved[i]     += (byte)((q[i / 8] & 0x80) == 0x80 ? 0x40 : 0);
-                interleaved[i + 1] += (byte)((q[i / 8] & 0x40) == 0x40 ? 0x40 : 0);
-                interleaved[i + 2] += (byte)((q[i / 8] & 0x20) == 0x20 ? 0x40 : 0);
-                interleaved[i + 3] += (byte)((q[i / 8] & 0x10) == 0x10 ? 0x40 : 0);
-                interleaved[i + 4] += (byte)((q[i / 8] & 0x08) == 0x08 ? 0x40 : 0);
-                interleaved[i + 5] += (byte)((q[i / 8] & 0x04) == 0x04 ? 0x40 : 0);
-                interleaved[i + 6] += (byte)((q[i / 8] & 0x02) == 0x02 ? 0x40 : 0);
-                interleaved[i + 7] += (byte)((q[i / 8] & 0x01) == 0x01 ? 0x40 : 0);
-
-                interleaved[i]     += (byte)((r[i / 8] & 0x80) == 0x80 ? 0x20 : 0);
-                interleaved[i + 1] += (byte)((r[i / 8] & 0x40) == 0x40 ? 0x20 : 0);
-                interleaved[i + 2] += (byte)((r[i / 8] & 0x20) == 0x20 ? 0x20 : 0);
-                interleaved[i + 3] += (byte)((r[i / 8] & 0x10) == 0x10 ? 0x20 : 0);
-                interleaved[i + 4] += (byte)((r[i / 8] & 0x08) == 0x08 ? 0x20 : 0);
-                interleaved[i + 5] += (byte)((r[i / 8] & 0x04) == 0x04 ? 0x20 : 0);
-                interleaved[i + 6] += (byte)((r[i / 8] & 0x02) == 0x02 ? 0x20 : 0);
-                interleaved[i + 7] += (byte)((r[i / 8] & 0x01) == 0x01 ? 0x20 : 0);
-
-                interleaved[i]     += (byte)((s[i / 8] & 0x80) == 0x80 ? 0x10 : 0);
-                interleaved[i + 1] += (byte)((s[i / 8] & 0x40) == 0x40 ? 0x10 : 0);
-                interleaved[i + 2] += (byte)((s[i / 8] & 0x20) == 0x20 ? 0x10 : 0);
-                interleaved[i + 3] += (byte)((s[i / 8] & 0x10) == 0x10 ? 0x10 : 0);
-                interleaved[i + 4] += (byte)((s[i / 8] & 0x08) == 0x08 ? 0x10 : 0);
-                interleaved[i + 5] += (byte)((s[i / 8] & 0x04) == 0x04 ? 0x10 : 0);
-                interleaved[i + 6] += (byte)((s[i / 8] & 0x02) == 0x02 ? 0x10 : 0);
-                interleaved[i + 7] += (byte)((s[i / 8] & 0x01) == 0x01 ? 0x10 : 0);
-
-                interleaved[i]     += (byte)((t[i / 8] & 0x80) == 0x80 ? 0x08 : 0);
-                interleaved[i + 1] += (byte)((t[i / 8] & 0x40) == 0x40 ? 0x08 : 0);
-                interleaved[i + 2] += (byte)((t[i / 8] & 0x20) == 0x20 ? 0x08 : 0);
-                interleaved[i + 3] += (byte)((t[i / 8] & 0x10) == 0x10 ? 0x08 : 0);
-                interleaved[i + 4] += (byte)((t[i / 8] & 0x08) == 0x08 ? 0x08 : 0);
-                interleaved[i + 5] += (byte)((t[i / 8] & 0x04) == 0x04 ? 0x08 : 0);
-                interleaved[i + 6] += (byte)((t[i / 8] & 0x02) == 0x02 ? 0x08 : 0);
-                interleaved[i + 7] += (byte)((t[i / 8] & 0x01) == 0x01 ? 0x08 : 0);
-
-                interleaved[i]     += (byte)((u[i / 8] & 0x80) == 0x80 ? 0x04 : 0);
-                interleaved[i + 1] += (byte)((u[i / 8] & 0x40) == 0x40 ? 0x04 : 0);
-                interleaved[i + 2] += (byte)((u[i / 8] & 0x20) == 0x20 ? 0x04 : 0);
-                interleaved[i + 3] += (byte)((u[i / 8] & 0x10) == 0x10 ? 0x04 : 0);
-                interleaved[i + 4] += (byte)((u[i / 8] & 0x08) == 0x08 ? 0x04 : 0);
-                interleaved[i + 5] += (byte)((u[i / 8] & 0x04) == 0x04 ? 0x04 : 0);
-                interleaved[i + 6] += (byte)((u[i / 8] & 0x02) == 0x02 ? 0x04 : 0);
-                interleaved[i + 7] += (byte)((u[i / 8] & 0x01) == 0x01 ? 0x04 : 0);
-
-                interleaved[i]     += (byte)((v[i / 8] & 0x80) == 0x80 ? 0x02 : 0);
-                interleaved[i + 1] += (byte)((v[i / 8] & 0x40) == 0x40 ? 0x02 : 0);
-                interleaved[i + 2] += (byte)((v[i / 8] & 0x20) == 0x20 ? 0x02 : 0);
-                interleaved[i + 3] += (byte)((v[i / 8] & 0x10) == 0x10 ? 0x02 : 0);
-                interleaved[i + 4] += (byte)((v[i / 8] & 0x08) == 0x08 ? 0x02 : 0);
-                interleaved[i + 5] += (byte)((v[i / 8] & 0x04) == 0x04 ? 0x02 : 0);
-                interleaved[i + 6] += (byte)((v[i / 8] & 0x02) == 0x02 ? 0x02 : 0);
-                interleaved[i + 7] += (byte)((v[i / 8] & 0x01) == 0x01 ? 0x02 : 0);
-
-                interleaved[i]     += (byte)((w[i / 8] & 0x80) == 0x80 ? 0x01 : 0);
-                interleaved[i + 1] += (byte)((w[i / 8] & 0x40) == 0x40 ? 0x01 : 0);
-                interleaved[i + 2] += (byte)((w[i / 8] & 0x20) == 0x20 ? 0x01 : 0);
-                interleaved[i + 3] += (byte)((w[i / 8] & 0x10) == 0x10 ? 0x01 : 0);
-                interleaved[i + 4] += (byte)((w[i / 8] & 0x08) == 0x08 ? 0x01 : 0);
-                interleaved[i + 5] += (byte)((w[i / 8] & 0x04) == 0x04 ? 0x01 : 0);
-                interleaved[i + 6] += (byte)((w[i / 8] & 0x02) == 0x02 ? 0x01 : 0);
-                interleaved[i + 7] += (byte)((w[i / 8] & 0x01) == 0x01 ? 0x01 : 0);
-            }
-
-            end = DateTime.UtcNow;
-            TimeSpan interleave = end - start;
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to de-sequentialize subchannel.",
-                                       desequentialize.TotalMilliseconds);
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to interleave subchannel.",
-                                       interleave.TotalMilliseconds);
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to untransform subchannel.",
-                                       interleave.TotalMilliseconds + desequentialize.TotalMilliseconds);
-
-            return interleaved;
+            sequential[i]          = (byte)p[i];
+            sequential[qStart + i] = (byte)q[i];
+            sequential[rStart + i] = (byte)r[i];
+            sequential[sStart + i] = (byte)s[i];
+            sequential[tStart + i] = (byte)t[i];
+            sequential[uStart + i] = (byte)u[i];
+            sequential[vStart + i] = (byte)v[i];
+            sequential[wStart + i] = (byte)w[i];
         }
+
+        end = DateTime.UtcNow;
+        TimeSpan sequentialize = end - start;
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to deinterleave subchannel.",
+                                   deinterleave.TotalMilliseconds);
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to sequentialize subchannel.",
+                                   sequentialize.TotalMilliseconds);
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to transform subchannel.",
+                                   deinterleave.TotalMilliseconds + sequentialize.TotalMilliseconds);
+
+        return sequential;
+    }
+
+    static byte[] ClauniaSubchannelUntransform(byte[] sequential)
+    {
+        if(sequential == null)
+            return null;
+
+        int[] p = new int[sequential.Length / 8];
+        int[] q = new int[sequential.Length / 8];
+        int[] r = new int[sequential.Length / 8];
+        int[] s = new int[sequential.Length / 8];
+        int[] t = new int[sequential.Length / 8];
+        int[] u = new int[sequential.Length / 8];
+        int[] v = new int[sequential.Length / 8];
+        int[] w = new int[sequential.Length / 8];
+
+        int qStart = p.Length * 1;
+        int rStart = p.Length * 2;
+        int sStart = p.Length * 3;
+        int tStart = p.Length * 4;
+        int uStart = p.Length * 5;
+        int vStart = p.Length * 6;
+        int wStart = p.Length * 7;
+
+        DateTime start = DateTime.UtcNow;
+
+        for(int i = 0; i < p.Length; i++)
+        {
+            p[i] = sequential[i];
+            q[i] = sequential[qStart + i];
+            r[i] = sequential[rStart + i];
+            s[i] = sequential[sStart + i];
+            t[i] = sequential[tStart + i];
+            u[i] = sequential[uStart + i];
+            v[i] = sequential[vStart + i];
+            w[i] = sequential[wStart + i];
+        }
+
+        DateTime end             = DateTime.UtcNow;
+        TimeSpan desequentialize = end - start;
+
+        byte[] interleaved = new byte[sequential.Length];
+        start = DateTime.UtcNow;
+
+        for(int i = 0; i < interleaved.Length; i += 8)
+        {
+            interleaved[i]     =  (byte)((p[i / 8] & 0x80) == 0x80 ? 0x80 : 0);
+            interleaved[i + 1] += (byte)((p[i / 8] & 0x40) == 0x40 ? 0x80 : 0);
+            interleaved[i + 2] += (byte)((p[i / 8] & 0x20) == 0x20 ? 0x80 : 0);
+            interleaved[i + 3] += (byte)((p[i / 8] & 0x10) == 0x10 ? 0x80 : 0);
+            interleaved[i + 4] += (byte)((p[i / 8] & 0x08) == 0x08 ? 0x80 : 0);
+            interleaved[i + 5] += (byte)((p[i / 8] & 0x04) == 0x04 ? 0x80 : 0);
+            interleaved[i + 6] += (byte)((p[i / 8] & 0x02) == 0x02 ? 0x80 : 0);
+            interleaved[i + 7] += (byte)((p[i / 8] & 0x01) == 0x01 ? 0x80 : 0);
+
+            interleaved[i]     += (byte)((q[i / 8] & 0x80) == 0x80 ? 0x40 : 0);
+            interleaved[i + 1] += (byte)((q[i / 8] & 0x40) == 0x40 ? 0x40 : 0);
+            interleaved[i + 2] += (byte)((q[i / 8] & 0x20) == 0x20 ? 0x40 : 0);
+            interleaved[i + 3] += (byte)((q[i / 8] & 0x10) == 0x10 ? 0x40 : 0);
+            interleaved[i + 4] += (byte)((q[i / 8] & 0x08) == 0x08 ? 0x40 : 0);
+            interleaved[i + 5] += (byte)((q[i / 8] & 0x04) == 0x04 ? 0x40 : 0);
+            interleaved[i + 6] += (byte)((q[i / 8] & 0x02) == 0x02 ? 0x40 : 0);
+            interleaved[i + 7] += (byte)((q[i / 8] & 0x01) == 0x01 ? 0x40 : 0);
+
+            interleaved[i]     += (byte)((r[i / 8] & 0x80) == 0x80 ? 0x20 : 0);
+            interleaved[i + 1] += (byte)((r[i / 8] & 0x40) == 0x40 ? 0x20 : 0);
+            interleaved[i + 2] += (byte)((r[i / 8] & 0x20) == 0x20 ? 0x20 : 0);
+            interleaved[i + 3] += (byte)((r[i / 8] & 0x10) == 0x10 ? 0x20 : 0);
+            interleaved[i + 4] += (byte)((r[i / 8] & 0x08) == 0x08 ? 0x20 : 0);
+            interleaved[i + 5] += (byte)((r[i / 8] & 0x04) == 0x04 ? 0x20 : 0);
+            interleaved[i + 6] += (byte)((r[i / 8] & 0x02) == 0x02 ? 0x20 : 0);
+            interleaved[i + 7] += (byte)((r[i / 8] & 0x01) == 0x01 ? 0x20 : 0);
+
+            interleaved[i]     += (byte)((s[i / 8] & 0x80) == 0x80 ? 0x10 : 0);
+            interleaved[i + 1] += (byte)((s[i / 8] & 0x40) == 0x40 ? 0x10 : 0);
+            interleaved[i + 2] += (byte)((s[i / 8] & 0x20) == 0x20 ? 0x10 : 0);
+            interleaved[i + 3] += (byte)((s[i / 8] & 0x10) == 0x10 ? 0x10 : 0);
+            interleaved[i + 4] += (byte)((s[i / 8] & 0x08) == 0x08 ? 0x10 : 0);
+            interleaved[i + 5] += (byte)((s[i / 8] & 0x04) == 0x04 ? 0x10 : 0);
+            interleaved[i + 6] += (byte)((s[i / 8] & 0x02) == 0x02 ? 0x10 : 0);
+            interleaved[i + 7] += (byte)((s[i / 8] & 0x01) == 0x01 ? 0x10 : 0);
+
+            interleaved[i]     += (byte)((t[i / 8] & 0x80) == 0x80 ? 0x08 : 0);
+            interleaved[i + 1] += (byte)((t[i / 8] & 0x40) == 0x40 ? 0x08 : 0);
+            interleaved[i + 2] += (byte)((t[i / 8] & 0x20) == 0x20 ? 0x08 : 0);
+            interleaved[i + 3] += (byte)((t[i / 8] & 0x10) == 0x10 ? 0x08 : 0);
+            interleaved[i + 4] += (byte)((t[i / 8] & 0x08) == 0x08 ? 0x08 : 0);
+            interleaved[i + 5] += (byte)((t[i / 8] & 0x04) == 0x04 ? 0x08 : 0);
+            interleaved[i + 6] += (byte)((t[i / 8] & 0x02) == 0x02 ? 0x08 : 0);
+            interleaved[i + 7] += (byte)((t[i / 8] & 0x01) == 0x01 ? 0x08 : 0);
+
+            interleaved[i]     += (byte)((u[i / 8] & 0x80) == 0x80 ? 0x04 : 0);
+            interleaved[i + 1] += (byte)((u[i / 8] & 0x40) == 0x40 ? 0x04 : 0);
+            interleaved[i + 2] += (byte)((u[i / 8] & 0x20) == 0x20 ? 0x04 : 0);
+            interleaved[i + 3] += (byte)((u[i / 8] & 0x10) == 0x10 ? 0x04 : 0);
+            interleaved[i + 4] += (byte)((u[i / 8] & 0x08) == 0x08 ? 0x04 : 0);
+            interleaved[i + 5] += (byte)((u[i / 8] & 0x04) == 0x04 ? 0x04 : 0);
+            interleaved[i + 6] += (byte)((u[i / 8] & 0x02) == 0x02 ? 0x04 : 0);
+            interleaved[i + 7] += (byte)((u[i / 8] & 0x01) == 0x01 ? 0x04 : 0);
+
+            interleaved[i]     += (byte)((v[i / 8] & 0x80) == 0x80 ? 0x02 : 0);
+            interleaved[i + 1] += (byte)((v[i / 8] & 0x40) == 0x40 ? 0x02 : 0);
+            interleaved[i + 2] += (byte)((v[i / 8] & 0x20) == 0x20 ? 0x02 : 0);
+            interleaved[i + 3] += (byte)((v[i / 8] & 0x10) == 0x10 ? 0x02 : 0);
+            interleaved[i + 4] += (byte)((v[i / 8] & 0x08) == 0x08 ? 0x02 : 0);
+            interleaved[i + 5] += (byte)((v[i / 8] & 0x04) == 0x04 ? 0x02 : 0);
+            interleaved[i + 6] += (byte)((v[i / 8] & 0x02) == 0x02 ? 0x02 : 0);
+            interleaved[i + 7] += (byte)((v[i / 8] & 0x01) == 0x01 ? 0x02 : 0);
+
+            interleaved[i]     += (byte)((w[i / 8] & 0x80) == 0x80 ? 0x01 : 0);
+            interleaved[i + 1] += (byte)((w[i / 8] & 0x40) == 0x40 ? 0x01 : 0);
+            interleaved[i + 2] += (byte)((w[i / 8] & 0x20) == 0x20 ? 0x01 : 0);
+            interleaved[i + 3] += (byte)((w[i / 8] & 0x10) == 0x10 ? 0x01 : 0);
+            interleaved[i + 4] += (byte)((w[i / 8] & 0x08) == 0x08 ? 0x01 : 0);
+            interleaved[i + 5] += (byte)((w[i / 8] & 0x04) == 0x04 ? 0x01 : 0);
+            interleaved[i + 6] += (byte)((w[i / 8] & 0x02) == 0x02 ? 0x01 : 0);
+            interleaved[i + 7] += (byte)((w[i / 8] & 0x01) == 0x01 ? 0x01 : 0);
+        }
+
+        end = DateTime.UtcNow;
+        TimeSpan interleave = end - start;
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to de-sequentialize subchannel.",
+                                   desequentialize.TotalMilliseconds);
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to interleave subchannel.",
+                                   interleave.TotalMilliseconds);
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0}ms to untransform subchannel.",
+                                   interleave.TotalMilliseconds + desequentialize.TotalMilliseconds);
+
+        return interleaved;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Constants.cs b/Aaru.Images/AaruFormat/Constants.cs
index fb263e007..5ce540ace 100644
--- a/Aaru.Images/AaruFormat/Constants.cs
+++ b/Aaru.Images/AaruFormat/Constants.cs
@@ -30,39 +30,38 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
-    {
-        /// <summary>Old magic identifier = "DICMFRMT".</summary>
-        const ulong DIC_MAGIC = 0x544D52464D434944;
-        /// <summary>Magic identifier = "AARUFRMT".</summary>
-        const ulong AARU_MAGIC = 0x544D524655524141;
-        /// <summary>
-        ///     Image format version. A change in this number indicates an incompatible change to the format that prevents
-        ///     older implementations from reading it correctly, if at all.
-        /// </summary>
-        const byte AARUFMT_VERSION_V1 = 1;
-        /// <summary>Adds new index format with 64-bit entries counter</summary>
-        const byte AARUFMT_VERSION = 2;
-        /// <summary>Maximum read cache size, 256MiB.</summary>
-        const uint MAX_CACHE_SIZE = 256 * 1024 * 1024;
-        /// <summary>Size in bytes of LZMA properties.</summary>
-        const int LZMA_PROPERTIES_LENGTH = 5;
-        /// <summary>Maximum number of entries for the DDT cache.</summary>
-        const int MAX_DDT_ENTRY_CACHE = 16000000;
-        /// <summary>How many samples are contained in a RedBook sector.</summary>
-        const int SAMPLES_PER_SECTOR = 588;
-        /// <summary>Maximum number of samples for a FLAC block. Bigger than 4608 gives no benefit.</summary>
-        const int MAX_FLAKE_BLOCK = 4608;
-        /// <summary>
-        ///     Minimum number of samples for a FLAC block. <see cref="CUETools.Codecs.Flake" /> does not support it to be
-        ///     smaller than 256.
-        /// </summary>
-        const int MIN_FLAKE_BLOCK = 256;
-        /// <summary>This mask is to check for flags in CompactDisc suffix/prefix DDT</summary>
-        const uint CD_XFIX_MASK = 0xFF000000;
-        /// <summary>This mask is to check for position in CompactDisc suffix/prefix deduplicated block</summary>
-        const uint CD_DFIX_MASK = 0x00FFFFFF;
-    }
+    /// <summary>Old magic identifier = "DICMFRMT".</summary>
+    const ulong DIC_MAGIC = 0x544D52464D434944;
+    /// <summary>Magic identifier = "AARUFRMT".</summary>
+    const ulong AARU_MAGIC = 0x544D524655524141;
+    /// <summary>
+    ///     Image format version. A change in this number indicates an incompatible change to the format that prevents
+    ///     older implementations from reading it correctly, if at all.
+    /// </summary>
+    const byte AARUFMT_VERSION_V1 = 1;
+    /// <summary>Adds new index format with 64-bit entries counter</summary>
+    const byte AARUFMT_VERSION = 2;
+    /// <summary>Maximum read cache size, 256MiB.</summary>
+    const uint MAX_CACHE_SIZE = 256 * 1024 * 1024;
+    /// <summary>Size in bytes of LZMA properties.</summary>
+    const int LZMA_PROPERTIES_LENGTH = 5;
+    /// <summary>Maximum number of entries for the DDT cache.</summary>
+    const int MAX_DDT_ENTRY_CACHE = 16000000;
+    /// <summary>How many samples are contained in a RedBook sector.</summary>
+    const int SAMPLES_PER_SECTOR = 588;
+    /// <summary>Maximum number of samples for a FLAC block. Bigger than 4608 gives no benefit.</summary>
+    const int MAX_FLAKE_BLOCK = 4608;
+    /// <summary>
+    ///     Minimum number of samples for a FLAC block. <see cref="CUETools.Codecs.Flake" /> does not support it to be
+    ///     smaller than 256.
+    /// </summary>
+    const int MIN_FLAKE_BLOCK = 256;
+    /// <summary>This mask is to check for flags in CompactDisc suffix/prefix DDT</summary>
+    const uint CD_XFIX_MASK = 0xFF000000;
+    /// <summary>This mask is to check for position in CompactDisc suffix/prefix deduplicated block</summary>
+    const uint CD_DFIX_MASK = 0x00FFFFFF;
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Enums.cs b/Aaru.Images/AaruFormat/Enums.cs
index 03ccbe3e5..264c72868 100644
--- a/Aaru.Images/AaruFormat/Enums.cs
+++ b/Aaru.Images/AaruFormat/Enums.cs
@@ -32,241 +32,240 @@
 
 // ReSharper disable UnusedMember.Local
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
+    /// <summary>List of known compression types</summary>
+    enum CompressionType : ushort
     {
-        /// <summary>List of known compression types</summary>
-        enum CompressionType : ushort
-        {
-            /// <summary>Not compressed</summary>
-            None = 0,
-            /// <summary>LZMA</summary>
-            Lzma = 1,
-            /// <summary>FLAC</summary>
-            Flac = 2,
-            /// <summary>LZMA in Claunia Subchannel Transform processed data</summary>
-            LzmaClauniaSubchannelTransform = 3
-        }
+        /// <summary>Not compressed</summary>
+        None = 0,
+        /// <summary>LZMA</summary>
+        Lzma = 1,
+        /// <summary>FLAC</summary>
+        Flac = 2,
+        /// <summary>LZMA in Claunia Subchannel Transform processed data</summary>
+        LzmaClauniaSubchannelTransform = 3
+    }
 
-        /// <summary>List of known data types</summary>
-        enum DataType : ushort
-        {
-            /// <summary>No data</summary>
-            NoData = 0,
-            /// <summary>User data</summary>
-            UserData = 1,
-            /// <summary>CompactDisc partial Table of Contents</summary>
-            CompactDiscPartialToc = 2,
-            /// <summary>CompactDisc session information</summary>
-            CompactDiscSessionInfo = 3,
-            /// <summary>CompactDisc Table of Contents</summary>
-            CompactDiscToc = 4,
-            /// <summary>CompactDisc Power Management Area</summary>
-            CompactDiscPma = 5,
-            /// <summary>CompactDisc Absolute Time In Pregroove</summary>
-            CompactDiscAtip = 6,
-            /// <summary>CompactDisc Lead-in's CD-Text</summary>
-            CompactDiscLeadInCdText = 7,
-            /// <summary>DVD Physical Format Information</summary>
-            DvdPfi = 8,
-            /// <summary>DVD Lead-in's Copyright Management Information</summary>
-            DvdLeadInCmi = 9,
-            /// <summary>DVD Disc Key</summary>
-            DvdDiscKey = 10,
-            /// <summary>DVD Burst Cutting Area</summary>
-            DvdBca = 11,
-            /// <summary>DVD DMI</summary>
-            DvdDmi = 12,
-            /// <summary>DVD Media Identifier</summary>
-            DvdMediaIdentifier = 13,
-            /// <summary>DVD Media Key Block</summary>
-            DvdMediaKeyBlock = 14,
-            /// <summary>DVD-RAM Disc Definition Structure</summary>
-            DvdRamDds = 15,
-            /// <summary>DVD-RAM Medium Status</summary>
-            DvdRamMediumStatus = 16,
-            /// <summary>DVD-RAM Spare Area Information</summary>
-            DvdRamSpareArea = 17,
-            /// <summary>DVD-R RMD</summary>
-            DvdRRmd = 18,
-            /// <summary>DVD-R Pre-recorded Information</summary>
-            DvdRPrerecordedInfo = 19,
-            /// <summary>DVD-R Media Identifier</summary>
-            DvdRMediaIdentifier = 20,
-            /// <summary>DVD-R Physical Format Information</summary>
-            DvdRPfi = 21,
-            /// <summary>DVD ADress In Pregroove</summary>
-            DvdAdip = 22,
-            /// <summary>HD DVD Copy Protection Information</summary>
-            HdDvdCpi = 23,
-            /// <summary>HD DVD Medium Status</summary>
-            HdDvdMediumStatus = 24,
-            /// <summary>DVD DL Layer Capacity</summary>
-            DvdDlLayerCapacity = 25,
-            /// <summary>DVD DL Middle Zone Address</summary>
-            DvdDlMiddleZoneAddress = 26,
-            /// <summary>DVD DL Jump Interval Size</summary>
-            DvdDlJumpIntervalSize = 27,
-            /// <summary>DVD DL Manual Layer Jump LBA</summary>
-            DvdDlManualLayerJumpLba = 28,
-            /// <summary>Bluray Disc Information</summary>
-            BlurayDi = 29,
-            /// <summary>Bluray Burst Cutting Area</summary>
-            BlurayBca = 30,
-            /// <summary>Bluray Disc Definition Structure</summary>
-            BlurayDds = 31,
-            /// <summary>Bluray Cartridge Status</summary>
-            BlurayCartridgeStatus = 32,
-            /// <summary>Bluray Spare Area Information</summary>
-            BluraySpareArea = 33,
-            /// <summary>AACS Volume Identifier</summary>
-            AacsVolumeIdentifier = 34,
-            /// <summary>AACS Serial Number</summary>
-            AacsSerialNumber = 35,
-            /// <summary>AACS Media Identifier</summary>
-            AacsMediaIdentifier = 36,
-            /// <summary>AACS Media Key Block</summary>
-            AacsMediaKeyBlock = 37,
-            /// <summary>AACS Data Keys</summary>
-            AacsDataKeys = 38,
-            /// <summary>AACS LBA Extents</summary>
-            AacsLbaExtents = 39,
-            /// <summary>CPRM Media Key Block</summary>
-            CprmMediaKeyBlock = 40,
-            /// <summary>Recognized Layers</summary>
-            HybridRecognizedLayers = 41,
-            /// <summary>MMC Write Protection</summary>
-            ScsiMmcWriteProtection = 42,
-            /// <summary>MMC Disc Information</summary>
-            ScsiMmcDiscInformation = 43,
-            /// <summary>MMC Track Resources Information</summary>
-            ScsiMmcTrackResourcesInformation = 44,
-            /// <summary>MMC POW Resources Information</summary>
-            ScsiMmcPowResourcesInformation = 45,
-            /// <summary>SCSI INQUIRY RESPONSE</summary>
-            ScsiInquiry = 46,
-            /// <summary>SCSI MODE PAGE 2Ah</summary>
-            ScsiModePage2A = 47,
-            /// <summary>ATA IDENTIFY response</summary>
-            AtaIdentify = 48,
-            /// <summary>ATAPI IDENTIFY response</summary>
-            AtapiIdentify = 49,
-            /// <summary>PCMCIA CIS</summary>
-            PcmciaCis = 50,
-            /// <summary>SecureDigital CID</summary>
-            SecureDigitalCid = 51,
-            /// <summary>SecureDigital CSD</summary>
-            SecureDigitalCsd = 52,
-            /// <summary>SecureDigital SCR</summary>
-            SecureDigitalScr = 53,
-            /// <summary>SecureDigital OCR</summary>
-            SecureDigitalOcr = 54,
-            /// <summary>MultiMediaCard CID</summary>
-            MultiMediaCardCid = 55,
-            /// <summary>MultiMediaCard CSD</summary>
-            MultiMediaCardCsd = 56,
-            /// <summary>MultiMediaCard OCR</summary>
-            MultiMediaCardOcr = 57,
-            /// <summary>MultiMediaCard Extended CSD</summary>
-            MultiMediaCardExtendedCsd = 58,
-            /// <summary>Xbox Security Sector</summary>
-            XboxSecuritySector = 59,
-            /// <summary>Floppy Lead-out</summary>
-            FloppyLeadOut = 60,
-            /// <summary>Dvd Disc Control Block</summary>
-            DvdDiscControlBlock = 61,
-            /// <summary>CompactDisc First track pregap</summary>
-            CompactDiscFirstTrackPregap = 62,
-            /// <summary>CompactDisc Lead-out</summary>
-            CompactDiscLeadOut = 63,
-            /// <summary>SCSI MODE SENSE (6) response</summary>
-            ScsiModeSense6 = 64,
-            /// <summary>SCSI MODE SENSE (10) response</summary>
-            ScsiModeSense10 = 65,
-            /// <summary>USB descriptors</summary>
-            UsbDescriptors = 66,
-            /// <summary>Xbox DMI</summary>
-            XboxDmi = 67,
-            /// <summary>Xbox Physical Format Information</summary>
-            XboxPfi = 68,
-            /// <summary>CompactDisc sector prefix (sync, header</summary>
-            CdSectorPrefix = 69,
-            /// <summary>CompactDisc sector suffix (edc, ecc p, ecc q)</summary>
-            CdSectorSuffix = 70,
-            /// <summary>CompactDisc subchannel</summary>
-            CdSectorSubchannel = 71,
-            /// <summary>Apple Profile (20 byte) tag</summary>
-            AppleProfileTag = 72,
-            /// <summary>Apple Sony (12 byte) tag</summary>
-            AppleSonyTag = 73,
-            /// <summary>Priam Data Tower (24 byte) tag</summary>
-            PriamDataTowerTag = 74,
-            /// <summary>CompactDisc Media Catalogue Number (as in Lead-in), 13 bytes, ASCII</summary>
-            CompactDiscMediaCatalogueNumber = 75,
-            /// <summary>CompactDisc sector prefix (sync, header), only incorrect stored</summary>
-            CdSectorPrefixCorrected = 76,
-            /// <summary>CompactDisc sector suffix (edc, ecc p, ecc q), only incorrect stored</summary>
-            CdSectorSuffixCorrected = 77,
-            /// <summary>CompactDisc MODE 2 subheader</summary>
-            CompactDiscMode2Subheader = 78,
-            /// <summary>CompactDisc Lead-in</summary>
-            CompactDiscLeadIn = 79,
-            /// <summary>Decrypted DVD Disc Key</summary>
-            DvdDiscKeyDecrypted = 80,
-            /// <summary>DVD CPI_MAI</summary>
-            DvdSectorCpiMai = 81,
-            /// <summary>Decrypted DVD Title Key</summary>
-            DvdSectorTitleKeyDecrypted = 82
-        }
+    /// <summary>List of known data types</summary>
+    enum DataType : ushort
+    {
+        /// <summary>No data</summary>
+        NoData = 0,
+        /// <summary>User data</summary>
+        UserData = 1,
+        /// <summary>CompactDisc partial Table of Contents</summary>
+        CompactDiscPartialToc = 2,
+        /// <summary>CompactDisc session information</summary>
+        CompactDiscSessionInfo = 3,
+        /// <summary>CompactDisc Table of Contents</summary>
+        CompactDiscToc = 4,
+        /// <summary>CompactDisc Power Management Area</summary>
+        CompactDiscPma = 5,
+        /// <summary>CompactDisc Absolute Time In Pregroove</summary>
+        CompactDiscAtip = 6,
+        /// <summary>CompactDisc Lead-in's CD-Text</summary>
+        CompactDiscLeadInCdText = 7,
+        /// <summary>DVD Physical Format Information</summary>
+        DvdPfi = 8,
+        /// <summary>DVD Lead-in's Copyright Management Information</summary>
+        DvdLeadInCmi = 9,
+        /// <summary>DVD Disc Key</summary>
+        DvdDiscKey = 10,
+        /// <summary>DVD Burst Cutting Area</summary>
+        DvdBca = 11,
+        /// <summary>DVD DMI</summary>
+        DvdDmi = 12,
+        /// <summary>DVD Media Identifier</summary>
+        DvdMediaIdentifier = 13,
+        /// <summary>DVD Media Key Block</summary>
+        DvdMediaKeyBlock = 14,
+        /// <summary>DVD-RAM Disc Definition Structure</summary>
+        DvdRamDds = 15,
+        /// <summary>DVD-RAM Medium Status</summary>
+        DvdRamMediumStatus = 16,
+        /// <summary>DVD-RAM Spare Area Information</summary>
+        DvdRamSpareArea = 17,
+        /// <summary>DVD-R RMD</summary>
+        DvdRRmd = 18,
+        /// <summary>DVD-R Pre-recorded Information</summary>
+        DvdRPrerecordedInfo = 19,
+        /// <summary>DVD-R Media Identifier</summary>
+        DvdRMediaIdentifier = 20,
+        /// <summary>DVD-R Physical Format Information</summary>
+        DvdRPfi = 21,
+        /// <summary>DVD ADress In Pregroove</summary>
+        DvdAdip = 22,
+        /// <summary>HD DVD Copy Protection Information</summary>
+        HdDvdCpi = 23,
+        /// <summary>HD DVD Medium Status</summary>
+        HdDvdMediumStatus = 24,
+        /// <summary>DVD DL Layer Capacity</summary>
+        DvdDlLayerCapacity = 25,
+        /// <summary>DVD DL Middle Zone Address</summary>
+        DvdDlMiddleZoneAddress = 26,
+        /// <summary>DVD DL Jump Interval Size</summary>
+        DvdDlJumpIntervalSize = 27,
+        /// <summary>DVD DL Manual Layer Jump LBA</summary>
+        DvdDlManualLayerJumpLba = 28,
+        /// <summary>Bluray Disc Information</summary>
+        BlurayDi = 29,
+        /// <summary>Bluray Burst Cutting Area</summary>
+        BlurayBca = 30,
+        /// <summary>Bluray Disc Definition Structure</summary>
+        BlurayDds = 31,
+        /// <summary>Bluray Cartridge Status</summary>
+        BlurayCartridgeStatus = 32,
+        /// <summary>Bluray Spare Area Information</summary>
+        BluraySpareArea = 33,
+        /// <summary>AACS Volume Identifier</summary>
+        AacsVolumeIdentifier = 34,
+        /// <summary>AACS Serial Number</summary>
+        AacsSerialNumber = 35,
+        /// <summary>AACS Media Identifier</summary>
+        AacsMediaIdentifier = 36,
+        /// <summary>AACS Media Key Block</summary>
+        AacsMediaKeyBlock = 37,
+        /// <summary>AACS Data Keys</summary>
+        AacsDataKeys = 38,
+        /// <summary>AACS LBA Extents</summary>
+        AacsLbaExtents = 39,
+        /// <summary>CPRM Media Key Block</summary>
+        CprmMediaKeyBlock = 40,
+        /// <summary>Recognized Layers</summary>
+        HybridRecognizedLayers = 41,
+        /// <summary>MMC Write Protection</summary>
+        ScsiMmcWriteProtection = 42,
+        /// <summary>MMC Disc Information</summary>
+        ScsiMmcDiscInformation = 43,
+        /// <summary>MMC Track Resources Information</summary>
+        ScsiMmcTrackResourcesInformation = 44,
+        /// <summary>MMC POW Resources Information</summary>
+        ScsiMmcPowResourcesInformation = 45,
+        /// <summary>SCSI INQUIRY RESPONSE</summary>
+        ScsiInquiry = 46,
+        /// <summary>SCSI MODE PAGE 2Ah</summary>
+        ScsiModePage2A = 47,
+        /// <summary>ATA IDENTIFY response</summary>
+        AtaIdentify = 48,
+        /// <summary>ATAPI IDENTIFY response</summary>
+        AtapiIdentify = 49,
+        /// <summary>PCMCIA CIS</summary>
+        PcmciaCis = 50,
+        /// <summary>SecureDigital CID</summary>
+        SecureDigitalCid = 51,
+        /// <summary>SecureDigital CSD</summary>
+        SecureDigitalCsd = 52,
+        /// <summary>SecureDigital SCR</summary>
+        SecureDigitalScr = 53,
+        /// <summary>SecureDigital OCR</summary>
+        SecureDigitalOcr = 54,
+        /// <summary>MultiMediaCard CID</summary>
+        MultiMediaCardCid = 55,
+        /// <summary>MultiMediaCard CSD</summary>
+        MultiMediaCardCsd = 56,
+        /// <summary>MultiMediaCard OCR</summary>
+        MultiMediaCardOcr = 57,
+        /// <summary>MultiMediaCard Extended CSD</summary>
+        MultiMediaCardExtendedCsd = 58,
+        /// <summary>Xbox Security Sector</summary>
+        XboxSecuritySector = 59,
+        /// <summary>Floppy Lead-out</summary>
+        FloppyLeadOut = 60,
+        /// <summary>Dvd Disc Control Block</summary>
+        DvdDiscControlBlock = 61,
+        /// <summary>CompactDisc First track pregap</summary>
+        CompactDiscFirstTrackPregap = 62,
+        /// <summary>CompactDisc Lead-out</summary>
+        CompactDiscLeadOut = 63,
+        /// <summary>SCSI MODE SENSE (6) response</summary>
+        ScsiModeSense6 = 64,
+        /// <summary>SCSI MODE SENSE (10) response</summary>
+        ScsiModeSense10 = 65,
+        /// <summary>USB descriptors</summary>
+        UsbDescriptors = 66,
+        /// <summary>Xbox DMI</summary>
+        XboxDmi = 67,
+        /// <summary>Xbox Physical Format Information</summary>
+        XboxPfi = 68,
+        /// <summary>CompactDisc sector prefix (sync, header</summary>
+        CdSectorPrefix = 69,
+        /// <summary>CompactDisc sector suffix (edc, ecc p, ecc q)</summary>
+        CdSectorSuffix = 70,
+        /// <summary>CompactDisc subchannel</summary>
+        CdSectorSubchannel = 71,
+        /// <summary>Apple Profile (20 byte) tag</summary>
+        AppleProfileTag = 72,
+        /// <summary>Apple Sony (12 byte) tag</summary>
+        AppleSonyTag = 73,
+        /// <summary>Priam Data Tower (24 byte) tag</summary>
+        PriamDataTowerTag = 74,
+        /// <summary>CompactDisc Media Catalogue Number (as in Lead-in), 13 bytes, ASCII</summary>
+        CompactDiscMediaCatalogueNumber = 75,
+        /// <summary>CompactDisc sector prefix (sync, header), only incorrect stored</summary>
+        CdSectorPrefixCorrected = 76,
+        /// <summary>CompactDisc sector suffix (edc, ecc p, ecc q), only incorrect stored</summary>
+        CdSectorSuffixCorrected = 77,
+        /// <summary>CompactDisc MODE 2 subheader</summary>
+        CompactDiscMode2Subheader = 78,
+        /// <summary>CompactDisc Lead-in</summary>
+        CompactDiscLeadIn = 79,
+        /// <summary>Decrypted DVD Disc Key</summary>
+        DvdDiscKeyDecrypted = 80,
+        /// <summary>DVD CPI_MAI</summary>
+        DvdSectorCpiMai = 81,
+        /// <summary>Decrypted DVD Title Key</summary>
+        DvdSectorTitleKeyDecrypted = 82
+    }
 
-        /// <summary>List of known blocks types</summary>
-        enum BlockType : uint
-        {
-            /// <summary>Block containing data</summary>
-            DataBlock = 0x4B4C4244,
-            /// <summary>Block containing a deduplication table</summary>
-            DeDuplicationTable = 0x2A544444,
-            /// <summary>Block containing the index</summary>
-            Index = 0x58444E49,
-            /// <summary>Block containing the index</summary>
-            Index2 = 0x32584449,
-            /// <summary>Block containing logical geometry</summary>
-            GeometryBlock = 0x4D4F4547,
-            /// <summary>Block containing metadata</summary>
-            MetadataBlock = 0x4154454D,
-            /// <summary>Block containing optical disc tracks</summary>
-            TracksBlock = 0x534B5254,
-            /// <summary>Block containing CICM XML metadata</summary>
-            CicmBlock = 0x4D434943,
-            /// <summary>Block containing contents checksums</summary>
-            ChecksumBlock = 0x4D534B43,
-            /// <summary>TODO: Block containing data position measurements</summary>
-            DataPositionMeasurementBlock = 0x2A4D5044,
-            /// <summary>TODO: Block containing a snapshot index</summary>
-            SnapshotBlock = 0x50414E53,
-            /// <summary>TODO: Block containing how to locate the parent image</summary>
-            ParentBlock = 0x50524E54,
-            /// <summary>Block containing an array of hardware used to create the image</summary>
-            DumpHardwareBlock = 0x2A504D44,
-            /// <summary>Block containing list of files for a tape image</summary>
-            TapeFileBlock = 0x454C4654,
-            /// <summary>Block containing list of partitions for a tape image</summary>
-            TapePartitionBlock = 0x54425054,
-            /// <summary>Block containing list of indexes for Compact Disc tracks</summary>
-            CompactDiscIndexesBlock = 0x58494443
-        }
+    /// <summary>List of known blocks types</summary>
+    enum BlockType : uint
+    {
+        /// <summary>Block containing data</summary>
+        DataBlock = 0x4B4C4244,
+        /// <summary>Block containing a deduplication table</summary>
+        DeDuplicationTable = 0x2A544444,
+        /// <summary>Block containing the index</summary>
+        Index = 0x58444E49,
+        /// <summary>Block containing the index</summary>
+        Index2 = 0x32584449,
+        /// <summary>Block containing logical geometry</summary>
+        GeometryBlock = 0x4D4F4547,
+        /// <summary>Block containing metadata</summary>
+        MetadataBlock = 0x4154454D,
+        /// <summary>Block containing optical disc tracks</summary>
+        TracksBlock = 0x534B5254,
+        /// <summary>Block containing CICM XML metadata</summary>
+        CicmBlock = 0x4D434943,
+        /// <summary>Block containing contents checksums</summary>
+        ChecksumBlock = 0x4D534B43,
+        /// <summary>TODO: Block containing data position measurements</summary>
+        DataPositionMeasurementBlock = 0x2A4D5044,
+        /// <summary>TODO: Block containing a snapshot index</summary>
+        SnapshotBlock = 0x50414E53,
+        /// <summary>TODO: Block containing how to locate the parent image</summary>
+        ParentBlock = 0x50524E54,
+        /// <summary>Block containing an array of hardware used to create the image</summary>
+        DumpHardwareBlock = 0x2A504D44,
+        /// <summary>Block containing list of files for a tape image</summary>
+        TapeFileBlock = 0x454C4654,
+        /// <summary>Block containing list of partitions for a tape image</summary>
+        TapePartitionBlock = 0x54425054,
+        /// <summary>Block containing list of indexes for Compact Disc tracks</summary>
+        CompactDiscIndexesBlock = 0x58494443
+    }
 
-        enum ChecksumAlgorithm : byte
-        {
-            Invalid = 0, Md5     = 1, Sha1 = 2,
-            Sha256  = 3, SpamSum = 4
-        }
+    enum ChecksumAlgorithm : byte
+    {
+        Invalid = 0, Md5     = 1, Sha1 = 2,
+        Sha256  = 3, SpamSum = 4
+    }
 
-        enum CdFixFlags : uint
-        {
-            NotDumped    = 0x10000000, Correct         = 0x20000000, Mode2Form1Ok = 0x30000000,
-            Mode2Form2Ok = 0x40000000, Mode2Form2NoCrc = 0x50000000
-        }
+    enum CdFixFlags : uint
+    {
+        NotDumped    = 0x10000000, Correct         = 0x20000000, Mode2Form1Ok = 0x30000000,
+        Mode2Form2Ok = 0x40000000, Mode2Form2NoCrc = 0x50000000
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Helpers.cs b/Aaru.Images/AaruFormat/Helpers.cs
index 4b2ccce07..447829125 100644
--- a/Aaru.Images/AaruFormat/Helpers.cs
+++ b/Aaru.Images/AaruFormat/Helpers.cs
@@ -38,410 +38,409 @@ using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Decoders.SecureDigital;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
+    /// <summary>Checks for media tags that may contain metadata and sets it up if not already set</summary>
+    void SetMetadataFromTags()
     {
-        /// <summary>Checks for media tags that may contain metadata and sets it up if not already set</summary>
-        void SetMetadataFromTags()
+        // Search for SecureDigital CID
+        if(_mediaTags.TryGetValue(MediaTagType.SD_CID, out byte[] sdCid))
         {
-            // Search for SecureDigital CID
-            if(_mediaTags.TryGetValue(MediaTagType.SD_CID, out byte[] sdCid))
-            {
-                CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(sdCid);
+            CID decoded = Decoders.SecureDigital.Decoders.DecodeCID(sdCid);
 
-                if(string.IsNullOrWhiteSpace(_imageInfo.DriveManufacturer))
-                    _imageInfo.DriveManufacturer = VendorString.Prettify(decoded.Manufacturer);
+            if(string.IsNullOrWhiteSpace(_imageInfo.DriveManufacturer))
+                _imageInfo.DriveManufacturer = VendorString.Prettify(decoded.Manufacturer);
 
-                if(string.IsNullOrWhiteSpace(_imageInfo.DriveModel))
-                    _imageInfo.DriveModel = decoded.ProductName;
-
-                if(string.IsNullOrWhiteSpace(_imageInfo.DriveFirmwareRevision))
-                    _imageInfo.DriveFirmwareRevision =
-                        $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
-
-                if(string.IsNullOrWhiteSpace(_imageInfo.DriveSerialNumber))
-                    _imageInfo.DriveSerialNumber = $"{decoded.ProductSerialNumber}";
-            }
-
-            // Search for MultiMediaCard CID
-            if(_mediaTags.TryGetValue(MediaTagType.MMC_CID, out byte[] mmcCid))
-            {
-                Decoders.MMC.CID decoded = Decoders.MMC.Decoders.DecodeCID(mmcCid);
-
-                if(string.IsNullOrWhiteSpace(_imageInfo.DriveManufacturer))
-                    _imageInfo.DriveManufacturer = Decoders.MMC.VendorString.Prettify(decoded.Manufacturer);
-
-                if(string.IsNullOrWhiteSpace(_imageInfo.DriveModel))
-                    _imageInfo.DriveModel = decoded.ProductName;
-
-                if(string.IsNullOrWhiteSpace(_imageInfo.DriveFirmwareRevision))
-                    _imageInfo.DriveFirmwareRevision =
-                        $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
-
-                if(string.IsNullOrWhiteSpace(_imageInfo.DriveSerialNumber))
-                    _imageInfo.DriveSerialNumber = $"{decoded.ProductSerialNumber}";
-            }
-
-            // Search for SCSI INQUIRY
-            if(_mediaTags.TryGetValue(MediaTagType.SCSI_INQUIRY, out byte[] scsiInquiry))
-            {
-                Inquiry? nullableInquiry = Inquiry.Decode(scsiInquiry);
-
-                if(nullableInquiry.HasValue)
-                {
-                    Inquiry inquiry = nullableInquiry.Value;
-
-                    if(string.IsNullOrWhiteSpace(_imageInfo.DriveManufacturer))
-                        _imageInfo.DriveManufacturer = StringHandlers.CToString(inquiry.VendorIdentification)?.Trim();
-
-                    if(string.IsNullOrWhiteSpace(_imageInfo.DriveModel))
-                        _imageInfo.DriveModel = StringHandlers.CToString(inquiry.ProductIdentification)?.Trim();
-
-                    if(string.IsNullOrWhiteSpace(_imageInfo.DriveFirmwareRevision))
-                        _imageInfo.DriveFirmwareRevision =
-                            StringHandlers.CToString(inquiry.ProductRevisionLevel)?.Trim();
-                }
-            }
-
-            // Search for ATA or ATAPI IDENTIFY
-            if(!_mediaTags.TryGetValue(MediaTagType.ATA_IDENTIFY, out byte[] ataIdentify) &&
-               !_mediaTags.TryGetValue(MediaTagType.ATAPI_IDENTIFY, out ataIdentify))
-                return;
-
-            Identify.IdentifyDevice? nullableIdentify = CommonTypes.Structs.Devices.ATA.Identify.Decode(ataIdentify);
-
-            if(!nullableIdentify.HasValue)
-                return;
-
-            Identify.IdentifyDevice identify = nullableIdentify.Value;
-
-            string[] separated = identify.Model.Split(' ');
-
-            if(separated.Length == 1)
-                if(string.IsNullOrWhiteSpace(_imageInfo.DriveModel))
-                    _imageInfo.DriveModel = separated[0];
-                else
-                {
-                    if(string.IsNullOrWhiteSpace(_imageInfo.DriveManufacturer))
-                        _imageInfo.DriveManufacturer = separated[0];
-
-                    if(string.IsNullOrWhiteSpace(_imageInfo.DriveModel))
-                        _imageInfo.DriveModel = separated[^1];
-                }
+            if(string.IsNullOrWhiteSpace(_imageInfo.DriveModel))
+                _imageInfo.DriveModel = decoded.ProductName;
 
             if(string.IsNullOrWhiteSpace(_imageInfo.DriveFirmwareRevision))
-                _imageInfo.DriveFirmwareRevision = identify.FirmwareRevision;
+                _imageInfo.DriveFirmwareRevision =
+                    $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
 
             if(string.IsNullOrWhiteSpace(_imageInfo.DriveSerialNumber))
-                _imageInfo.DriveSerialNumber = identify.SerialNumber;
+                _imageInfo.DriveSerialNumber = $"{decoded.ProductSerialNumber}";
         }
 
-        // Get the CICM XML media type from Aaru media type
-        static XmlMediaType GetXmlMediaType(MediaType type)
+        // Search for MultiMediaCard CID
+        if(_mediaTags.TryGetValue(MediaTagType.MMC_CID, out byte[] mmcCid))
         {
-            switch(type)
+            Decoders.MMC.CID decoded = Decoders.MMC.Decoders.DecodeCID(mmcCid);
+
+            if(string.IsNullOrWhiteSpace(_imageInfo.DriveManufacturer))
+                _imageInfo.DriveManufacturer = Decoders.MMC.VendorString.Prettify(decoded.Manufacturer);
+
+            if(string.IsNullOrWhiteSpace(_imageInfo.DriveModel))
+                _imageInfo.DriveModel = decoded.ProductName;
+
+            if(string.IsNullOrWhiteSpace(_imageInfo.DriveFirmwareRevision))
+                _imageInfo.DriveFirmwareRevision =
+                    $"{(decoded.ProductRevision & 0xF0) >> 4:X2}.{decoded.ProductRevision & 0x0F:X2}";
+
+            if(string.IsNullOrWhiteSpace(_imageInfo.DriveSerialNumber))
+                _imageInfo.DriveSerialNumber = $"{decoded.ProductSerialNumber}";
+        }
+
+        // Search for SCSI INQUIRY
+        if(_mediaTags.TryGetValue(MediaTagType.SCSI_INQUIRY, out byte[] scsiInquiry))
+        {
+            Inquiry? nullableInquiry = Inquiry.Decode(scsiInquiry);
+
+            if(nullableInquiry.HasValue)
             {
-                case MediaType.CD:
-                case MediaType.CDDA:
-                case MediaType.CDG:
-                case MediaType.CDEG:
-                case MediaType.CDI:
-                case MediaType.CDIREADY:
-                case MediaType.CDROM:
-                case MediaType.CDROMXA:
-                case MediaType.CDPLUS:
-                case MediaType.CDMO:
-                case MediaType.CDR:
-                case MediaType.CDRW:
-                case MediaType.CDMRW:
-                case MediaType.VCD:
-                case MediaType.SVCD:
-                case MediaType.PCD:
-                case MediaType.SACD:
-                case MediaType.DDCD:
-                case MediaType.DDCDR:
-                case MediaType.DDCDRW:
-                case MediaType.DTSCD:
-                case MediaType.CDMIDI:
-                case MediaType.CDV:
-                case MediaType.DVDROM:
-                case MediaType.DVDR:
-                case MediaType.DVDRW:
-                case MediaType.DVDPR:
-                case MediaType.DVDPRW:
-                case MediaType.DVDPRWDL:
-                case MediaType.DVDRDL:
-                case MediaType.DVDPRDL:
-                case MediaType.DVDRAM:
-                case MediaType.DVDRWDL:
-                case MediaType.DVDDownload:
-                case MediaType.HDDVDROM:
-                case MediaType.HDDVDRAM:
-                case MediaType.HDDVDR:
-                case MediaType.HDDVDRW:
-                case MediaType.HDDVDRDL:
-                case MediaType.HDDVDRWDL:
-                case MediaType.BDROM:
-                case MediaType.UHDBD:
-                case MediaType.BDR:
-                case MediaType.BDRE:
-                case MediaType.BDRXL:
-                case MediaType.BDREXL:
-                case MediaType.EVD:
-                case MediaType.FVD:
-                case MediaType.HVD:
-                case MediaType.CBHD:
-                case MediaType.HDVMD:
-                case MediaType.VCDHD:
-                case MediaType.SVOD:
-                case MediaType.FDDVD:
-                case MediaType.LD:
-                case MediaType.LDROM:
-                case MediaType.CRVdisc:
-                case MediaType.LDROM2:
-                case MediaType.LVROM:
-                case MediaType.MegaLD:
-                case MediaType.PS1CD:
-                case MediaType.PS2CD:
-                case MediaType.PS2DVD:
-                case MediaType.PS3DVD:
-                case MediaType.PS3BD:
-                case MediaType.PS4BD:
-                case MediaType.PS5BD:
-                case MediaType.UMD:
-                case MediaType.XGD:
-                case MediaType.XGD2:
-                case MediaType.XGD3:
-                case MediaType.XGD4:
-                case MediaType.MEGACD:
-                case MediaType.SATURNCD:
-                case MediaType.GDROM:
-                case MediaType.GDR:
-                case MediaType.SuperCDROM2:
-                case MediaType.JaguarCD:
-                case MediaType.ThreeDO:
-                case MediaType.PCFX:
-                case MediaType.NeoGeoCD:
-                case MediaType.GOD:
-                case MediaType.WOD:
-                case MediaType.WUOD:
-                case MediaType.CDTV:
-                case MediaType.CD32:
-                case MediaType.Nuon:
-                case MediaType.Playdia:
-                case MediaType.Pippin:
-                case MediaType.FMTOWNS:
-                case MediaType.MilCD:
-                case MediaType.VideoNow:
-                case MediaType.VideoNowColor:
-                case MediaType.VideoNowXp:
-                case MediaType.CVD: return XmlMediaType.OpticalDisc;
-                default: return XmlMediaType.BlockMedia;
+                Inquiry inquiry = nullableInquiry.Value;
+
+                if(string.IsNullOrWhiteSpace(_imageInfo.DriveManufacturer))
+                    _imageInfo.DriveManufacturer = StringHandlers.CToString(inquiry.VendorIdentification)?.Trim();
+
+                if(string.IsNullOrWhiteSpace(_imageInfo.DriveModel))
+                    _imageInfo.DriveModel = StringHandlers.CToString(inquiry.ProductIdentification)?.Trim();
+
+                if(string.IsNullOrWhiteSpace(_imageInfo.DriveFirmwareRevision))
+                    _imageInfo.DriveFirmwareRevision =
+                        StringHandlers.CToString(inquiry.ProductRevisionLevel)?.Trim();
             }
         }
 
-        // Gets a DDT entry
-        ulong GetDdtEntry(ulong sectorAddress)
+        // Search for ATA or ATAPI IDENTIFY
+        if(!_mediaTags.TryGetValue(MediaTagType.ATA_IDENTIFY, out byte[] ataIdentify) &&
+           !_mediaTags.TryGetValue(MediaTagType.ATAPI_IDENTIFY, out ataIdentify))
+            return;
+
+        Identify.IdentifyDevice? nullableIdentify = CommonTypes.Structs.Devices.ATA.Identify.Decode(ataIdentify);
+
+        if(!nullableIdentify.HasValue)
+            return;
+
+        Identify.IdentifyDevice identify = nullableIdentify.Value;
+
+        string[] separated = identify.Model.Split(' ');
+
+        if(separated.Length == 1)
+            if(string.IsNullOrWhiteSpace(_imageInfo.DriveModel))
+                _imageInfo.DriveModel = separated[0];
+            else
+            {
+                if(string.IsNullOrWhiteSpace(_imageInfo.DriveManufacturer))
+                    _imageInfo.DriveManufacturer = separated[0];
+
+                if(string.IsNullOrWhiteSpace(_imageInfo.DriveModel))
+                    _imageInfo.DriveModel = separated[^1];
+            }
+
+        if(string.IsNullOrWhiteSpace(_imageInfo.DriveFirmwareRevision))
+            _imageInfo.DriveFirmwareRevision = identify.FirmwareRevision;
+
+        if(string.IsNullOrWhiteSpace(_imageInfo.DriveSerialNumber))
+            _imageInfo.DriveSerialNumber = identify.SerialNumber;
+    }
+
+    // Get the CICM XML media type from Aaru media type
+    static XmlMediaType GetXmlMediaType(MediaType type)
+    {
+        switch(type)
         {
-            if(_inMemoryDdt)
-                return _userDataDdt[sectorAddress];
+            case MediaType.CD:
+            case MediaType.CDDA:
+            case MediaType.CDG:
+            case MediaType.CDEG:
+            case MediaType.CDI:
+            case MediaType.CDIREADY:
+            case MediaType.CDROM:
+            case MediaType.CDROMXA:
+            case MediaType.CDPLUS:
+            case MediaType.CDMO:
+            case MediaType.CDR:
+            case MediaType.CDRW:
+            case MediaType.CDMRW:
+            case MediaType.VCD:
+            case MediaType.SVCD:
+            case MediaType.PCD:
+            case MediaType.SACD:
+            case MediaType.DDCD:
+            case MediaType.DDCDR:
+            case MediaType.DDCDRW:
+            case MediaType.DTSCD:
+            case MediaType.CDMIDI:
+            case MediaType.CDV:
+            case MediaType.DVDROM:
+            case MediaType.DVDR:
+            case MediaType.DVDRW:
+            case MediaType.DVDPR:
+            case MediaType.DVDPRW:
+            case MediaType.DVDPRWDL:
+            case MediaType.DVDRDL:
+            case MediaType.DVDPRDL:
+            case MediaType.DVDRAM:
+            case MediaType.DVDRWDL:
+            case MediaType.DVDDownload:
+            case MediaType.HDDVDROM:
+            case MediaType.HDDVDRAM:
+            case MediaType.HDDVDR:
+            case MediaType.HDDVDRW:
+            case MediaType.HDDVDRDL:
+            case MediaType.HDDVDRWDL:
+            case MediaType.BDROM:
+            case MediaType.UHDBD:
+            case MediaType.BDR:
+            case MediaType.BDRE:
+            case MediaType.BDRXL:
+            case MediaType.BDREXL:
+            case MediaType.EVD:
+            case MediaType.FVD:
+            case MediaType.HVD:
+            case MediaType.CBHD:
+            case MediaType.HDVMD:
+            case MediaType.VCDHD:
+            case MediaType.SVOD:
+            case MediaType.FDDVD:
+            case MediaType.LD:
+            case MediaType.LDROM:
+            case MediaType.CRVdisc:
+            case MediaType.LDROM2:
+            case MediaType.LVROM:
+            case MediaType.MegaLD:
+            case MediaType.PS1CD:
+            case MediaType.PS2CD:
+            case MediaType.PS2DVD:
+            case MediaType.PS3DVD:
+            case MediaType.PS3BD:
+            case MediaType.PS4BD:
+            case MediaType.PS5BD:
+            case MediaType.UMD:
+            case MediaType.XGD:
+            case MediaType.XGD2:
+            case MediaType.XGD3:
+            case MediaType.XGD4:
+            case MediaType.MEGACD:
+            case MediaType.SATURNCD:
+            case MediaType.GDROM:
+            case MediaType.GDR:
+            case MediaType.SuperCDROM2:
+            case MediaType.JaguarCD:
+            case MediaType.ThreeDO:
+            case MediaType.PCFX:
+            case MediaType.NeoGeoCD:
+            case MediaType.GOD:
+            case MediaType.WOD:
+            case MediaType.WUOD:
+            case MediaType.CDTV:
+            case MediaType.CD32:
+            case MediaType.Nuon:
+            case MediaType.Playdia:
+            case MediaType.Pippin:
+            case MediaType.FMTOWNS:
+            case MediaType.MilCD:
+            case MediaType.VideoNow:
+            case MediaType.VideoNowColor:
+            case MediaType.VideoNowXp:
+            case MediaType.CVD: return XmlMediaType.OpticalDisc;
+            default: return XmlMediaType.BlockMedia;
+        }
+    }
 
-            if(_ddtEntryCache.TryGetValue(sectorAddress, out ulong entry))
-                return entry;
-
-            long oldPosition = _imageStream.Position;
-            _imageStream.Position =  _outMemoryDdtPosition + Marshal.SizeOf<DdtHeader>();
-            _imageStream.Position += (long)(sectorAddress * sizeof(ulong));
-            byte[] temp = new byte[sizeof(ulong)];
-            _imageStream.Read(temp, 0, sizeof(ulong));
-            _imageStream.Position = oldPosition;
-            entry                 = BitConverter.ToUInt64(temp, 0);
-
-            if(_ddtEntryCache.Count >= MAX_DDT_ENTRY_CACHE)
-                _ddtEntryCache.Clear();
-
-            _ddtEntryCache.Add(sectorAddress, entry);
+    // Gets a DDT entry
+    ulong GetDdtEntry(ulong sectorAddress)
+    {
+        if(_inMemoryDdt)
+            return _userDataDdt[sectorAddress];
 
+        if(_ddtEntryCache.TryGetValue(sectorAddress, out ulong entry))
             return entry;
+
+        long oldPosition = _imageStream.Position;
+        _imageStream.Position =  _outMemoryDdtPosition + Marshal.SizeOf<DdtHeader>();
+        _imageStream.Position += (long)(sectorAddress * sizeof(ulong));
+        byte[] temp = new byte[sizeof(ulong)];
+        _imageStream.Read(temp, 0, sizeof(ulong));
+        _imageStream.Position = oldPosition;
+        entry                 = BitConverter.ToUInt64(temp, 0);
+
+        if(_ddtEntryCache.Count >= MAX_DDT_ENTRY_CACHE)
+            _ddtEntryCache.Clear();
+
+        _ddtEntryCache.Add(sectorAddress, entry);
+
+        return entry;
+    }
+
+    // Sets a DDT entry
+    void SetDdtEntry(ulong sectorAddress, ulong pointer)
+    {
+        if(_inMemoryDdt)
+        {
+            if(IsTape)
+                _tapeDdt[sectorAddress] = pointer;
+            else
+                _userDataDdt[sectorAddress] = pointer;
+
+            return;
         }
 
-        // Sets a DDT entry
-        void SetDdtEntry(ulong sectorAddress, ulong pointer)
+        long oldPosition = _imageStream.Position;
+        _imageStream.Position =  _outMemoryDdtPosition + Marshal.SizeOf<DdtHeader>();
+        _imageStream.Position += (long)(sectorAddress * sizeof(ulong));
+        _imageStream.Write(BitConverter.GetBytes(pointer), 0, sizeof(ulong));
+        _imageStream.Position = oldPosition;
+    }
+
+    // Converts between image data type and Aaru media tag type
+    static MediaTagType GetMediaTagTypeForDataType(DataType type)
+    {
+        switch(type)
         {
-            if(_inMemoryDdt)
-            {
-                if(IsTape)
-                    _tapeDdt[sectorAddress] = pointer;
-                else
-                    _userDataDdt[sectorAddress] = pointer;
-
-                return;
-            }
-
-            long oldPosition = _imageStream.Position;
-            _imageStream.Position =  _outMemoryDdtPosition + Marshal.SizeOf<DdtHeader>();
-            _imageStream.Position += (long)(sectorAddress * sizeof(ulong));
-            _imageStream.Write(BitConverter.GetBytes(pointer), 0, sizeof(ulong));
-            _imageStream.Position = oldPosition;
+            case DataType.CompactDiscPartialToc:            return MediaTagType.CD_TOC;
+            case DataType.CompactDiscSessionInfo:           return MediaTagType.CD_SessionInfo;
+            case DataType.CompactDiscToc:                   return MediaTagType.CD_FullTOC;
+            case DataType.CompactDiscPma:                   return MediaTagType.CD_PMA;
+            case DataType.CompactDiscAtip:                  return MediaTagType.CD_ATIP;
+            case DataType.CompactDiscLeadInCdText:          return MediaTagType.CD_TEXT;
+            case DataType.DvdPfi:                           return MediaTagType.DVD_PFI;
+            case DataType.DvdLeadInCmi:                     return MediaTagType.DVD_CMI;
+            case DataType.DvdDiscKey:                       return MediaTagType.DVD_DiscKey;
+            case DataType.DvdBca:                           return MediaTagType.DVD_BCA;
+            case DataType.DvdDmi:                           return MediaTagType.DVD_DMI;
+            case DataType.DvdMediaIdentifier:               return MediaTagType.DVD_MediaIdentifier;
+            case DataType.DvdMediaKeyBlock:                 return MediaTagType.DVD_MKB;
+            case DataType.DvdRamDds:                        return MediaTagType.DVDRAM_DDS;
+            case DataType.DvdRamMediumStatus:               return MediaTagType.DVDRAM_MediumStatus;
+            case DataType.DvdRamSpareArea:                  return MediaTagType.DVDRAM_SpareArea;
+            case DataType.DvdRRmd:                          return MediaTagType.DVDR_RMD;
+            case DataType.DvdRPrerecordedInfo:              return MediaTagType.DVDR_PreRecordedInfo;
+            case DataType.DvdRMediaIdentifier:              return MediaTagType.DVDR_MediaIdentifier;
+            case DataType.DvdRPfi:                          return MediaTagType.DVDR_PFI;
+            case DataType.DvdAdip:                          return MediaTagType.DVD_ADIP;
+            case DataType.HdDvdCpi:                         return MediaTagType.HDDVD_CPI;
+            case DataType.HdDvdMediumStatus:                return MediaTagType.HDDVD_MediumStatus;
+            case DataType.DvdDlLayerCapacity:               return MediaTagType.DVDDL_LayerCapacity;
+            case DataType.DvdDlMiddleZoneAddress:           return MediaTagType.DVDDL_MiddleZoneAddress;
+            case DataType.DvdDlJumpIntervalSize:            return MediaTagType.DVDDL_JumpIntervalSize;
+            case DataType.DvdDlManualLayerJumpLba:          return MediaTagType.DVDDL_ManualLayerJumpLBA;
+            case DataType.BlurayDi:                         return MediaTagType.BD_DI;
+            case DataType.BlurayBca:                        return MediaTagType.BD_BCA;
+            case DataType.BlurayDds:                        return MediaTagType.BD_DDS;
+            case DataType.BlurayCartridgeStatus:            return MediaTagType.BD_CartridgeStatus;
+            case DataType.BluraySpareArea:                  return MediaTagType.BD_SpareArea;
+            case DataType.AacsVolumeIdentifier:             return MediaTagType.AACS_VolumeIdentifier;
+            case DataType.AacsSerialNumber:                 return MediaTagType.AACS_SerialNumber;
+            case DataType.AacsMediaIdentifier:              return MediaTagType.AACS_MediaIdentifier;
+            case DataType.AacsMediaKeyBlock:                return MediaTagType.AACS_MKB;
+            case DataType.AacsDataKeys:                     return MediaTagType.AACS_DataKeys;
+            case DataType.AacsLbaExtents:                   return MediaTagType.AACS_LBAExtents;
+            case DataType.CprmMediaKeyBlock:                return MediaTagType.AACS_CPRM_MKB;
+            case DataType.HybridRecognizedLayers:           return MediaTagType.Hybrid_RecognizedLayers;
+            case DataType.ScsiMmcWriteProtection:           return MediaTagType.MMC_WriteProtection;
+            case DataType.ScsiMmcDiscInformation:           return MediaTagType.MMC_DiscInformation;
+            case DataType.ScsiMmcTrackResourcesInformation: return MediaTagType.MMC_TrackResourcesInformation;
+            case DataType.ScsiMmcPowResourcesInformation:   return MediaTagType.MMC_POWResourcesInformation;
+            case DataType.ScsiInquiry:                      return MediaTagType.SCSI_INQUIRY;
+            case DataType.ScsiModePage2A:                   return MediaTagType.SCSI_MODEPAGE_2A;
+            case DataType.AtaIdentify:                      return MediaTagType.ATA_IDENTIFY;
+            case DataType.AtapiIdentify:                    return MediaTagType.ATAPI_IDENTIFY;
+            case DataType.PcmciaCis:                        return MediaTagType.PCMCIA_CIS;
+            case DataType.SecureDigitalCid:                 return MediaTagType.SD_CID;
+            case DataType.SecureDigitalCsd:                 return MediaTagType.SD_CSD;
+            case DataType.SecureDigitalScr:                 return MediaTagType.SD_SCR;
+            case DataType.SecureDigitalOcr:                 return MediaTagType.SD_OCR;
+            case DataType.MultiMediaCardCid:                return MediaTagType.MMC_CID;
+            case DataType.MultiMediaCardCsd:                return MediaTagType.MMC_CSD;
+            case DataType.MultiMediaCardOcr:                return MediaTagType.MMC_OCR;
+            case DataType.MultiMediaCardExtendedCsd:        return MediaTagType.MMC_ExtendedCSD;
+            case DataType.XboxSecuritySector:               return MediaTagType.Xbox_SecuritySector;
+            case DataType.FloppyLeadOut:                    return MediaTagType.Floppy_LeadOut;
+            case DataType.DvdDiscControlBlock:              return MediaTagType.DCB;
+            case DataType.CompactDiscFirstTrackPregap:      return MediaTagType.CD_FirstTrackPregap;
+            case DataType.CompactDiscLeadOut:               return MediaTagType.CD_LeadOut;
+            case DataType.ScsiModeSense6:                   return MediaTagType.SCSI_MODESENSE_6;
+            case DataType.ScsiModeSense10:                  return MediaTagType.SCSI_MODESENSE_10;
+            case DataType.UsbDescriptors:                   return MediaTagType.USB_Descriptors;
+            case DataType.XboxDmi:                          return MediaTagType.Xbox_DMI;
+            case DataType.XboxPfi:                          return MediaTagType.Xbox_PFI;
+            case DataType.CompactDiscMediaCatalogueNumber:  return MediaTagType.CD_MCN;
+            case DataType.CompactDiscLeadIn:                return MediaTagType.CD_LeadIn;
+            case DataType.DvdDiscKeyDecrypted:              return MediaTagType.DVD_DiscKey_Decrypted;
+            default:                                        throw new ArgumentOutOfRangeException();
         }
+    }
 
-        // Converts between image data type and Aaru media tag type
-        static MediaTagType GetMediaTagTypeForDataType(DataType type)
+    // Converts between Aaru media tag type and image data type
+    static DataType GetDataTypeForMediaTag(MediaTagType tag)
+    {
+        switch(tag)
         {
-            switch(type)
-            {
-                case DataType.CompactDiscPartialToc:            return MediaTagType.CD_TOC;
-                case DataType.CompactDiscSessionInfo:           return MediaTagType.CD_SessionInfo;
-                case DataType.CompactDiscToc:                   return MediaTagType.CD_FullTOC;
-                case DataType.CompactDiscPma:                   return MediaTagType.CD_PMA;
-                case DataType.CompactDiscAtip:                  return MediaTagType.CD_ATIP;
-                case DataType.CompactDiscLeadInCdText:          return MediaTagType.CD_TEXT;
-                case DataType.DvdPfi:                           return MediaTagType.DVD_PFI;
-                case DataType.DvdLeadInCmi:                     return MediaTagType.DVD_CMI;
-                case DataType.DvdDiscKey:                       return MediaTagType.DVD_DiscKey;
-                case DataType.DvdBca:                           return MediaTagType.DVD_BCA;
-                case DataType.DvdDmi:                           return MediaTagType.DVD_DMI;
-                case DataType.DvdMediaIdentifier:               return MediaTagType.DVD_MediaIdentifier;
-                case DataType.DvdMediaKeyBlock:                 return MediaTagType.DVD_MKB;
-                case DataType.DvdRamDds:                        return MediaTagType.DVDRAM_DDS;
-                case DataType.DvdRamMediumStatus:               return MediaTagType.DVDRAM_MediumStatus;
-                case DataType.DvdRamSpareArea:                  return MediaTagType.DVDRAM_SpareArea;
-                case DataType.DvdRRmd:                          return MediaTagType.DVDR_RMD;
-                case DataType.DvdRPrerecordedInfo:              return MediaTagType.DVDR_PreRecordedInfo;
-                case DataType.DvdRMediaIdentifier:              return MediaTagType.DVDR_MediaIdentifier;
-                case DataType.DvdRPfi:                          return MediaTagType.DVDR_PFI;
-                case DataType.DvdAdip:                          return MediaTagType.DVD_ADIP;
-                case DataType.HdDvdCpi:                         return MediaTagType.HDDVD_CPI;
-                case DataType.HdDvdMediumStatus:                return MediaTagType.HDDVD_MediumStatus;
-                case DataType.DvdDlLayerCapacity:               return MediaTagType.DVDDL_LayerCapacity;
-                case DataType.DvdDlMiddleZoneAddress:           return MediaTagType.DVDDL_MiddleZoneAddress;
-                case DataType.DvdDlJumpIntervalSize:            return MediaTagType.DVDDL_JumpIntervalSize;
-                case DataType.DvdDlManualLayerJumpLba:          return MediaTagType.DVDDL_ManualLayerJumpLBA;
-                case DataType.BlurayDi:                         return MediaTagType.BD_DI;
-                case DataType.BlurayBca:                        return MediaTagType.BD_BCA;
-                case DataType.BlurayDds:                        return MediaTagType.BD_DDS;
-                case DataType.BlurayCartridgeStatus:            return MediaTagType.BD_CartridgeStatus;
-                case DataType.BluraySpareArea:                  return MediaTagType.BD_SpareArea;
-                case DataType.AacsVolumeIdentifier:             return MediaTagType.AACS_VolumeIdentifier;
-                case DataType.AacsSerialNumber:                 return MediaTagType.AACS_SerialNumber;
-                case DataType.AacsMediaIdentifier:              return MediaTagType.AACS_MediaIdentifier;
-                case DataType.AacsMediaKeyBlock:                return MediaTagType.AACS_MKB;
-                case DataType.AacsDataKeys:                     return MediaTagType.AACS_DataKeys;
-                case DataType.AacsLbaExtents:                   return MediaTagType.AACS_LBAExtents;
-                case DataType.CprmMediaKeyBlock:                return MediaTagType.AACS_CPRM_MKB;
-                case DataType.HybridRecognizedLayers:           return MediaTagType.Hybrid_RecognizedLayers;
-                case DataType.ScsiMmcWriteProtection:           return MediaTagType.MMC_WriteProtection;
-                case DataType.ScsiMmcDiscInformation:           return MediaTagType.MMC_DiscInformation;
-                case DataType.ScsiMmcTrackResourcesInformation: return MediaTagType.MMC_TrackResourcesInformation;
-                case DataType.ScsiMmcPowResourcesInformation:   return MediaTagType.MMC_POWResourcesInformation;
-                case DataType.ScsiInquiry:                      return MediaTagType.SCSI_INQUIRY;
-                case DataType.ScsiModePage2A:                   return MediaTagType.SCSI_MODEPAGE_2A;
-                case DataType.AtaIdentify:                      return MediaTagType.ATA_IDENTIFY;
-                case DataType.AtapiIdentify:                    return MediaTagType.ATAPI_IDENTIFY;
-                case DataType.PcmciaCis:                        return MediaTagType.PCMCIA_CIS;
-                case DataType.SecureDigitalCid:                 return MediaTagType.SD_CID;
-                case DataType.SecureDigitalCsd:                 return MediaTagType.SD_CSD;
-                case DataType.SecureDigitalScr:                 return MediaTagType.SD_SCR;
-                case DataType.SecureDigitalOcr:                 return MediaTagType.SD_OCR;
-                case DataType.MultiMediaCardCid:                return MediaTagType.MMC_CID;
-                case DataType.MultiMediaCardCsd:                return MediaTagType.MMC_CSD;
-                case DataType.MultiMediaCardOcr:                return MediaTagType.MMC_OCR;
-                case DataType.MultiMediaCardExtendedCsd:        return MediaTagType.MMC_ExtendedCSD;
-                case DataType.XboxSecuritySector:               return MediaTagType.Xbox_SecuritySector;
-                case DataType.FloppyLeadOut:                    return MediaTagType.Floppy_LeadOut;
-                case DataType.DvdDiscControlBlock:              return MediaTagType.DCB;
-                case DataType.CompactDiscFirstTrackPregap:      return MediaTagType.CD_FirstTrackPregap;
-                case DataType.CompactDiscLeadOut:               return MediaTagType.CD_LeadOut;
-                case DataType.ScsiModeSense6:                   return MediaTagType.SCSI_MODESENSE_6;
-                case DataType.ScsiModeSense10:                  return MediaTagType.SCSI_MODESENSE_10;
-                case DataType.UsbDescriptors:                   return MediaTagType.USB_Descriptors;
-                case DataType.XboxDmi:                          return MediaTagType.Xbox_DMI;
-                case DataType.XboxPfi:                          return MediaTagType.Xbox_PFI;
-                case DataType.CompactDiscMediaCatalogueNumber:  return MediaTagType.CD_MCN;
-                case DataType.CompactDiscLeadIn:                return MediaTagType.CD_LeadIn;
-                case DataType.DvdDiscKeyDecrypted:              return MediaTagType.DVD_DiscKey_Decrypted;
-                default:                                        throw new ArgumentOutOfRangeException();
-            }
-        }
-
-        // Converts between Aaru media tag type and image data type
-        static DataType GetDataTypeForMediaTag(MediaTagType tag)
-        {
-            switch(tag)
-            {
-                case MediaTagType.CD_TOC: return DataType.CompactDiscPartialToc;
-                case MediaTagType.CD_SessionInfo: return DataType.CompactDiscSessionInfo;
-                case MediaTagType.CD_FullTOC: return DataType.CompactDiscToc;
-                case MediaTagType.CD_PMA: return DataType.CompactDiscPma;
-                case MediaTagType.CD_ATIP: return DataType.CompactDiscAtip;
-                case MediaTagType.CD_TEXT: return DataType.CompactDiscLeadInCdText;
-                case MediaTagType.DVD_PFI: return DataType.DvdPfi;
-                case MediaTagType.DVD_CMI: return DataType.DvdLeadInCmi;
-                case MediaTagType.DVD_DiscKey: return DataType.DvdDiscKey;
-                case MediaTagType.DVD_BCA: return DataType.DvdBca;
-                case MediaTagType.DVD_DMI: return DataType.DvdDmi;
-                case MediaTagType.DVD_MediaIdentifier: return DataType.DvdMediaIdentifier;
-                case MediaTagType.DVD_MKB: return DataType.DvdMediaKeyBlock;
-                case MediaTagType.DVDRAM_DDS: return DataType.DvdRamDds;
-                case MediaTagType.DVDRAM_MediumStatus: return DataType.DvdRamMediumStatus;
-                case MediaTagType.DVDRAM_SpareArea: return DataType.DvdRamSpareArea;
-                case MediaTagType.DVDR_RMD: return DataType.DvdRRmd;
-                case MediaTagType.DVDR_PreRecordedInfo: return DataType.DvdRPrerecordedInfo;
-                case MediaTagType.DVDR_MediaIdentifier: return DataType.DvdRMediaIdentifier;
-                case MediaTagType.DVDR_PFI: return DataType.DvdRPfi;
-                case MediaTagType.DVD_ADIP: return DataType.DvdAdip;
-                case MediaTagType.HDDVD_CPI: return DataType.HdDvdCpi;
-                case MediaTagType.HDDVD_MediumStatus: return DataType.HdDvdMediumStatus;
-                case MediaTagType.DVDDL_LayerCapacity: return DataType.DvdDlLayerCapacity;
-                case MediaTagType.DVDDL_MiddleZoneAddress: return DataType.DvdDlMiddleZoneAddress;
-                case MediaTagType.DVDDL_JumpIntervalSize: return DataType.DvdDlJumpIntervalSize;
-                case MediaTagType.DVDDL_ManualLayerJumpLBA: return DataType.DvdDlManualLayerJumpLba;
-                case MediaTagType.BD_DI: return DataType.BlurayDi;
-                case MediaTagType.BD_BCA: return DataType.BlurayBca;
-                case MediaTagType.BD_DDS: return DataType.BlurayDds;
-                case MediaTagType.BD_CartridgeStatus: return DataType.BlurayCartridgeStatus;
-                case MediaTagType.BD_SpareArea: return DataType.BluraySpareArea;
-                case MediaTagType.AACS_VolumeIdentifier: return DataType.AacsVolumeIdentifier;
-                case MediaTagType.AACS_SerialNumber: return DataType.AacsSerialNumber;
-                case MediaTagType.AACS_MediaIdentifier: return DataType.AacsMediaIdentifier;
-                case MediaTagType.AACS_MKB: return DataType.AacsMediaKeyBlock;
-                case MediaTagType.AACS_DataKeys: return DataType.AacsDataKeys;
-                case MediaTagType.AACS_LBAExtents: return DataType.AacsLbaExtents;
-                case MediaTagType.AACS_CPRM_MKB: return DataType.CprmMediaKeyBlock;
-                case MediaTagType.Hybrid_RecognizedLayers: return DataType.HybridRecognizedLayers;
-                case MediaTagType.MMC_WriteProtection: return DataType.ScsiMmcWriteProtection;
-                case MediaTagType.MMC_DiscInformation: return DataType.ScsiMmcDiscInformation;
-                case MediaTagType.MMC_TrackResourcesInformation: return DataType.ScsiMmcTrackResourcesInformation;
-                case MediaTagType.MMC_POWResourcesInformation: return DataType.ScsiMmcPowResourcesInformation;
-                case MediaTagType.SCSI_INQUIRY: return DataType.ScsiInquiry;
-                case MediaTagType.SCSI_MODEPAGE_2A: return DataType.ScsiModePage2A;
-                case MediaTagType.ATA_IDENTIFY: return DataType.AtaIdentify;
-                case MediaTagType.ATAPI_IDENTIFY: return DataType.AtapiIdentify;
-                case MediaTagType.PCMCIA_CIS: return DataType.PcmciaCis;
-                case MediaTagType.SD_CID: return DataType.SecureDigitalCid;
-                case MediaTagType.SD_CSD: return DataType.SecureDigitalCsd;
-                case MediaTagType.SD_SCR: return DataType.SecureDigitalScr;
-                case MediaTagType.SD_OCR: return DataType.SecureDigitalOcr;
-                case MediaTagType.MMC_CID: return DataType.MultiMediaCardCid;
-                case MediaTagType.MMC_CSD: return DataType.MultiMediaCardCsd;
-                case MediaTagType.MMC_OCR: return DataType.MultiMediaCardOcr;
-                case MediaTagType.MMC_ExtendedCSD: return DataType.MultiMediaCardExtendedCsd;
-                case MediaTagType.Xbox_SecuritySector: return DataType.XboxSecuritySector;
-                case MediaTagType.Floppy_LeadOut: return DataType.FloppyLeadOut;
-                case MediaTagType.DCB: return DataType.DvdDiscControlBlock;
-                case MediaTagType.CD_FirstTrackPregap: return DataType.CompactDiscFirstTrackPregap;
-                case MediaTagType.CD_LeadOut: return DataType.CompactDiscLeadOut;
-                case MediaTagType.SCSI_MODESENSE_6: return DataType.ScsiModeSense6;
-                case MediaTagType.SCSI_MODESENSE_10: return DataType.ScsiModeSense10;
-                case MediaTagType.USB_Descriptors: return DataType.UsbDescriptors;
-                case MediaTagType.Xbox_DMI: return DataType.XboxDmi;
-                case MediaTagType.Xbox_PFI: return DataType.XboxPfi;
-                case MediaTagType.CD_MCN: return DataType.CompactDiscMediaCatalogueNumber;
-                case MediaTagType.CD_LeadIn: return DataType.CompactDiscLeadIn;
-                case MediaTagType.DVD_DiscKey_Decrypted: return DataType.DvdDiscKeyDecrypted;
-                default: throw new ArgumentOutOfRangeException(nameof(tag), tag, null);
-            }
+            case MediaTagType.CD_TOC: return DataType.CompactDiscPartialToc;
+            case MediaTagType.CD_SessionInfo: return DataType.CompactDiscSessionInfo;
+            case MediaTagType.CD_FullTOC: return DataType.CompactDiscToc;
+            case MediaTagType.CD_PMA: return DataType.CompactDiscPma;
+            case MediaTagType.CD_ATIP: return DataType.CompactDiscAtip;
+            case MediaTagType.CD_TEXT: return DataType.CompactDiscLeadInCdText;
+            case MediaTagType.DVD_PFI: return DataType.DvdPfi;
+            case MediaTagType.DVD_CMI: return DataType.DvdLeadInCmi;
+            case MediaTagType.DVD_DiscKey: return DataType.DvdDiscKey;
+            case MediaTagType.DVD_BCA: return DataType.DvdBca;
+            case MediaTagType.DVD_DMI: return DataType.DvdDmi;
+            case MediaTagType.DVD_MediaIdentifier: return DataType.DvdMediaIdentifier;
+            case MediaTagType.DVD_MKB: return DataType.DvdMediaKeyBlock;
+            case MediaTagType.DVDRAM_DDS: return DataType.DvdRamDds;
+            case MediaTagType.DVDRAM_MediumStatus: return DataType.DvdRamMediumStatus;
+            case MediaTagType.DVDRAM_SpareArea: return DataType.DvdRamSpareArea;
+            case MediaTagType.DVDR_RMD: return DataType.DvdRRmd;
+            case MediaTagType.DVDR_PreRecordedInfo: return DataType.DvdRPrerecordedInfo;
+            case MediaTagType.DVDR_MediaIdentifier: return DataType.DvdRMediaIdentifier;
+            case MediaTagType.DVDR_PFI: return DataType.DvdRPfi;
+            case MediaTagType.DVD_ADIP: return DataType.DvdAdip;
+            case MediaTagType.HDDVD_CPI: return DataType.HdDvdCpi;
+            case MediaTagType.HDDVD_MediumStatus: return DataType.HdDvdMediumStatus;
+            case MediaTagType.DVDDL_LayerCapacity: return DataType.DvdDlLayerCapacity;
+            case MediaTagType.DVDDL_MiddleZoneAddress: return DataType.DvdDlMiddleZoneAddress;
+            case MediaTagType.DVDDL_JumpIntervalSize: return DataType.DvdDlJumpIntervalSize;
+            case MediaTagType.DVDDL_ManualLayerJumpLBA: return DataType.DvdDlManualLayerJumpLba;
+            case MediaTagType.BD_DI: return DataType.BlurayDi;
+            case MediaTagType.BD_BCA: return DataType.BlurayBca;
+            case MediaTagType.BD_DDS: return DataType.BlurayDds;
+            case MediaTagType.BD_CartridgeStatus: return DataType.BlurayCartridgeStatus;
+            case MediaTagType.BD_SpareArea: return DataType.BluraySpareArea;
+            case MediaTagType.AACS_VolumeIdentifier: return DataType.AacsVolumeIdentifier;
+            case MediaTagType.AACS_SerialNumber: return DataType.AacsSerialNumber;
+            case MediaTagType.AACS_MediaIdentifier: return DataType.AacsMediaIdentifier;
+            case MediaTagType.AACS_MKB: return DataType.AacsMediaKeyBlock;
+            case MediaTagType.AACS_DataKeys: return DataType.AacsDataKeys;
+            case MediaTagType.AACS_LBAExtents: return DataType.AacsLbaExtents;
+            case MediaTagType.AACS_CPRM_MKB: return DataType.CprmMediaKeyBlock;
+            case MediaTagType.Hybrid_RecognizedLayers: return DataType.HybridRecognizedLayers;
+            case MediaTagType.MMC_WriteProtection: return DataType.ScsiMmcWriteProtection;
+            case MediaTagType.MMC_DiscInformation: return DataType.ScsiMmcDiscInformation;
+            case MediaTagType.MMC_TrackResourcesInformation: return DataType.ScsiMmcTrackResourcesInformation;
+            case MediaTagType.MMC_POWResourcesInformation: return DataType.ScsiMmcPowResourcesInformation;
+            case MediaTagType.SCSI_INQUIRY: return DataType.ScsiInquiry;
+            case MediaTagType.SCSI_MODEPAGE_2A: return DataType.ScsiModePage2A;
+            case MediaTagType.ATA_IDENTIFY: return DataType.AtaIdentify;
+            case MediaTagType.ATAPI_IDENTIFY: return DataType.AtapiIdentify;
+            case MediaTagType.PCMCIA_CIS: return DataType.PcmciaCis;
+            case MediaTagType.SD_CID: return DataType.SecureDigitalCid;
+            case MediaTagType.SD_CSD: return DataType.SecureDigitalCsd;
+            case MediaTagType.SD_SCR: return DataType.SecureDigitalScr;
+            case MediaTagType.SD_OCR: return DataType.SecureDigitalOcr;
+            case MediaTagType.MMC_CID: return DataType.MultiMediaCardCid;
+            case MediaTagType.MMC_CSD: return DataType.MultiMediaCardCsd;
+            case MediaTagType.MMC_OCR: return DataType.MultiMediaCardOcr;
+            case MediaTagType.MMC_ExtendedCSD: return DataType.MultiMediaCardExtendedCsd;
+            case MediaTagType.Xbox_SecuritySector: return DataType.XboxSecuritySector;
+            case MediaTagType.Floppy_LeadOut: return DataType.FloppyLeadOut;
+            case MediaTagType.DCB: return DataType.DvdDiscControlBlock;
+            case MediaTagType.CD_FirstTrackPregap: return DataType.CompactDiscFirstTrackPregap;
+            case MediaTagType.CD_LeadOut: return DataType.CompactDiscLeadOut;
+            case MediaTagType.SCSI_MODESENSE_6: return DataType.ScsiModeSense6;
+            case MediaTagType.SCSI_MODESENSE_10: return DataType.ScsiModeSense10;
+            case MediaTagType.USB_Descriptors: return DataType.UsbDescriptors;
+            case MediaTagType.Xbox_DMI: return DataType.XboxDmi;
+            case MediaTagType.Xbox_PFI: return DataType.XboxPfi;
+            case MediaTagType.CD_MCN: return DataType.CompactDiscMediaCatalogueNumber;
+            case MediaTagType.CD_LeadIn: return DataType.CompactDiscLeadIn;
+            case MediaTagType.DVD_DiscKey_Decrypted: return DataType.DvdDiscKeyDecrypted;
+            default: throw new ArgumentOutOfRangeException(nameof(tag), tag, null);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Identify.cs b/Aaru.Images/AaruFormat/Identify.cs
index 88dc712d4..de6ca9b8e 100644
--- a/Aaru.Images/AaruFormat/Identify.cs
+++ b/Aaru.Images/AaruFormat/Identify.cs
@@ -34,25 +34,24 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            _imageStream = imageFilter.GetDataForkStream();
-            _imageStream.Seek(0, SeekOrigin.Begin);
+        _imageStream = imageFilter.GetDataForkStream();
+        _imageStream.Seek(0, SeekOrigin.Begin);
 
-            if(_imageStream.Length < Marshal.SizeOf<AaruHeader>())
-                return false;
+        if(_imageStream.Length < Marshal.SizeOf<AaruHeader>())
+            return false;
 
-            _structureBytes = new byte[Marshal.SizeOf<AaruHeader>()];
-            _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-            _header = Marshal.ByteArrayToStructureLittleEndian<AaruHeader>(_structureBytes);
+        _structureBytes = new byte[Marshal.SizeOf<AaruHeader>()];
+        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+        _header = Marshal.ByteArrayToStructureLittleEndian<AaruHeader>(_structureBytes);
 
-            return (_header.identifier == DIC_MAGIC || _header.identifier == AARU_MAGIC) &&
-                   _header.imageMajorVersion <= AARUFMT_VERSION;
-        }
+        return (_header.identifier == DIC_MAGIC || _header.identifier == AARU_MAGIC) &&
+               _header.imageMajorVersion <= AARUFMT_VERSION;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Properties.cs b/Aaru.Images/AaruFormat/Properties.cs
index 13d0d8a2a..bb664a519 100644
--- a/Aaru.Images/AaruFormat/Properties.cs
+++ b/Aaru.Images/AaruFormat/Properties.cs
@@ -38,78 +38,77 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
+    /// <inheritdoc />
+    public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks    |
+                                                           OpticalImageCapabilities.CanStoreDataTracks     |
+                                                           OpticalImageCapabilities.CanStorePregaps        |
+                                                           OpticalImageCapabilities.CanStoreSubchannelRw   |
+                                                           OpticalImageCapabilities.CanStoreSessions       |
+                                                           OpticalImageCapabilities.CanStoreIsrc           |
+                                                           OpticalImageCapabilities.CanStoreCdText         |
+                                                           OpticalImageCapabilities.CanStoreMcn            |
+                                                           OpticalImageCapabilities.CanStoreRawData        |
+                                                           OpticalImageCapabilities.CanStoreCookedData     |
+                                                           OpticalImageCapabilities.CanStoreMultipleTracks |
+                                                           OpticalImageCapabilities.CanStoreNotCdSessions  |
+                                                           OpticalImageCapabilities.CanStoreNotCdTracks    |
+                                                           OpticalImageCapabilities.CanStoreIndexes;
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "Aaru Format";
+    /// <inheritdoc />
+    public Guid Id => new Guid("49360069-1784-4A2F-B723-0C844D610B0A");
+    /// <inheritdoc />
+    public string Format => "Aaru";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<Partition> Partitions { get; private set; }
+    /// <inheritdoc />
+    public List<Track> Tracks { get; private set; }
+    /// <inheritdoc />
+    public List<Session> Sessions { get; private set; }
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware { get; private set; }
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata { get; private set; }
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags =>
+        Enum.GetValues(typeof(MediaTagType)).Cast<MediaTagType>();
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags =>
+        Enum.GetValues(typeof(SectorTagType)).Cast<SectorTagType>();
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => Enum.GetValues(typeof(MediaType)).Cast<MediaType>();
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
     {
-        /// <inheritdoc />
-        public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks    |
-                                                               OpticalImageCapabilities.CanStoreDataTracks     |
-                                                               OpticalImageCapabilities.CanStorePregaps        |
-                                                               OpticalImageCapabilities.CanStoreSubchannelRw   |
-                                                               OpticalImageCapabilities.CanStoreSessions       |
-                                                               OpticalImageCapabilities.CanStoreIsrc           |
-                                                               OpticalImageCapabilities.CanStoreCdText         |
-                                                               OpticalImageCapabilities.CanStoreMcn            |
-                                                               OpticalImageCapabilities.CanStoreRawData        |
-                                                               OpticalImageCapabilities.CanStoreCookedData     |
-                                                               OpticalImageCapabilities.CanStoreMultipleTracks |
-                                                               OpticalImageCapabilities.CanStoreNotCdSessions  |
-                                                               OpticalImageCapabilities.CanStoreNotCdTracks    |
-                                                               OpticalImageCapabilities.CanStoreIndexes;
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "Aaru Format";
-        /// <inheritdoc />
-        public Guid Id => new Guid("49360069-1784-4A2F-B723-0C844D610B0A");
-        /// <inheritdoc />
-        public string Format => "Aaru";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<Partition> Partitions { get; private set; }
-        /// <inheritdoc />
-        public List<Track> Tracks { get; private set; }
-        /// <inheritdoc />
-        public List<Session> Sessions { get; private set; }
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware { get; private set; }
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata { get; private set; }
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags =>
-            Enum.GetValues(typeof(MediaTagType)).Cast<MediaTagType>();
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags =>
-            Enum.GetValues(typeof(SectorTagType)).Cast<SectorTagType>();
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => Enum.GetValues(typeof(MediaType)).Cast<MediaType>();
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
-        {
-            ("sectors_per_block", typeof(uint),
-             "How many sectors to store per block (will be rounded to next power of two)", 4096U),
-            ("dictionary", typeof(uint), "Size, in bytes, of the LZMA dictionary", (uint)(1 << 25)),
-            ("max_ddt_size", typeof(uint),
-             "Maximum size, in mebibytes, for in-memory DDT. If image needs a bigger one, it will be on-disk", 256U),
-            ("md5", typeof(bool), "Calculate and store MD5 of image's user data", false),
-            ("sha1", typeof(bool), "Calculate and store SHA1 of image's user data", false),
-            ("sha256", typeof(bool), "Calculate and store SHA256 of image's user data", false),
-            ("spamsum", typeof(bool), "Calculate and store SpamSum of image's user data", false),
-            ("deduplicate", typeof(bool),
-             "Store only unique sectors. This consumes more memory and is slower, but it's enabled by default", true),
-            ("compress", typeof(bool), "Compress user data blocks. Other blocks will always be compressed",
-             (object)true)
-        };
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".dicf", ".aaru", ".aaruformat", ".aaruf", ".aif"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+        ("sectors_per_block", typeof(uint),
+         "How many sectors to store per block (will be rounded to next power of two)", 4096U),
+        ("dictionary", typeof(uint), "Size, in bytes, of the LZMA dictionary", (uint)(1 << 25)),
+        ("max_ddt_size", typeof(uint),
+         "Maximum size, in mebibytes, for in-memory DDT. If image needs a bigger one, it will be on-disk", 256U),
+        ("md5", typeof(bool), "Calculate and store MD5 of image's user data", false),
+        ("sha1", typeof(bool), "Calculate and store SHA1 of image's user data", false),
+        ("sha256", typeof(bool), "Calculate and store SHA256 of image's user data", false),
+        ("spamsum", typeof(bool), "Calculate and store SpamSum of image's user data", false),
+        ("deduplicate", typeof(bool),
+         "Store only unique sectors. This consumes more memory and is slower, but it's enabled by default", true),
+        ("compress", typeof(bool), "Compress user data blocks. Other blocks will always be compressed",
+         (object)true)
+    };
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".dicf", ".aaru", ".aaruformat", ".aaruf", ".aif"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Read.cs b/Aaru.Images/AaruFormat/Read.cs
index f72191866..159eab985 100644
--- a/Aaru.Images/AaruFormat/Read.cs
+++ b/Aaru.Images/AaruFormat/Read.cs
@@ -52,1659 +52,1975 @@ using Marshal = Aaru.Helpers.Marshal;
 using Session = Aaru.CommonTypes.Structs.Session;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+
+        _imageStream = imageFilter.GetDataForkStream();
+        _imageStream.Seek(0, SeekOrigin.Begin);
+
+        if(_imageStream.Length < Marshal.SizeOf<AaruHeader>())
+            return ErrorNumber.InvalidArgument;
+
+        _structureBytes = new byte[Marshal.SizeOf<AaruHeader>()];
+        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+        _header = Marshal.ByteArrayToStructureLittleEndian<AaruHeader>(_structureBytes);
+
+        if(_header.imageMajorVersion > AARUFMT_VERSION)
         {
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+            AaruConsole.ErrorWriteLine($"Image version {_header.imageMajorVersion} not recognized.");
 
-            _imageStream = imageFilter.GetDataForkStream();
-            _imageStream.Seek(0, SeekOrigin.Begin);
+            return ErrorNumber.NotSupported;
+        }
 
-            if(_imageStream.Length < Marshal.SizeOf<AaruHeader>())
-                return ErrorNumber.InvalidArgument;
+        _imageInfo.Application        = _header.application;
+        _imageInfo.ApplicationVersion = $"{_header.applicationMajorVersion}.{_header.applicationMinorVersion}";
+        _imageInfo.Version            = $"{_header.imageMajorVersion}.{_header.imageMinorVersion}";
+        _imageInfo.MediaType          = _header.mediaType;
 
-            _structureBytes = new byte[Marshal.SizeOf<AaruHeader>()];
-            _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-            _header = Marshal.ByteArrayToStructureLittleEndian<AaruHeader>(_structureBytes);
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
 
-            if(_header.imageMajorVersion > AARUFMT_VERSION)
-            {
-                AaruConsole.ErrorWriteLine($"Image version {_header.imageMajorVersion} not recognized.");
+        // Read the index header
+        _imageStream.Position = (long)_header.indexOffset;
+        _structureBytes       = new byte[Marshal.SizeOf<IndexHeader>()];
+        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+        IndexHeader idxHeader = Marshal.SpanToStructureLittleEndian<IndexHeader>(_structureBytes);
 
-                return ErrorNumber.NotSupported;
-            }
+        if(idxHeader.identifier != BlockType.Index &&
+           idxHeader.identifier != BlockType.Index2)
+        {
+            AaruConsole.ErrorWriteLine("Index not found!");
 
-            _imageInfo.Application        = _header.application;
-            _imageInfo.ApplicationVersion = $"{_header.applicationMajorVersion}.{_header.applicationMinorVersion}";
-            _imageInfo.Version            = $"{_header.imageMajorVersion}.{_header.imageMinorVersion}";
-            _imageInfo.MediaType          = _header.mediaType;
+            return ErrorNumber.InvalidArgument;
+        }
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
-
-            // Read the index header
+        if(idxHeader.identifier == BlockType.Index2)
+        {
             _imageStream.Position = (long)_header.indexOffset;
-            _structureBytes       = new byte[Marshal.SizeOf<IndexHeader>()];
+            _structureBytes       = new byte[Marshal.SizeOf<IndexHeader2>()];
             _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-            IndexHeader idxHeader = Marshal.SpanToStructureLittleEndian<IndexHeader>(_structureBytes);
+            IndexHeader2 idxHeader2 = Marshal.SpanToStructureLittleEndian<IndexHeader2>(_structureBytes);
 
-            if(idxHeader.identifier != BlockType.Index &&
-               idxHeader.identifier != BlockType.Index2)
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
+                                       _header.indexOffset, idxHeader2.entries);
+
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                       GC.GetTotalMemory(false));
+
+            // Fill in-memory index
+            _index = new List<IndexEntry>();
+
+            for(ulong i = 0; i < idxHeader2.entries; i++)
             {
-                AaruConsole.ErrorWriteLine("Index not found!");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(idxHeader.identifier == BlockType.Index2)
-            {
-                _imageStream.Position = (long)_header.indexOffset;
-                _structureBytes       = new byte[Marshal.SizeOf<IndexHeader2>()];
+                _structureBytes = new byte[Marshal.SizeOf<IndexEntry>()];
                 _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                IndexHeader2 idxHeader2 = Marshal.SpanToStructureLittleEndian<IndexHeader2>(_structureBytes);
+                IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(_structureBytes);
 
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
-                                           _header.indexOffset, idxHeader2.entries);
+                AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                           "Block type {0} with data type {1} is indexed to be at {2}",
+                                           entry.blockType, entry.dataType, entry.offset);
 
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                           GC.GetTotalMemory(false));
+                _index.Add(entry);
+            }
+        }
+        else
+        {
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
+                                       _header.indexOffset, idxHeader.entries);
 
-                // Fill in-memory index
-                _index = new List<IndexEntry>();
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                       GC.GetTotalMemory(false));
 
-                for(ulong i = 0; i < idxHeader2.entries; i++)
-                {
-                    _structureBytes = new byte[Marshal.SizeOf<IndexEntry>()];
+            // Fill in-memory index
+            _index = new List<IndexEntry>();
+
+            for(ushort i = 0; i < idxHeader.entries; i++)
+            {
+                _structureBytes = new byte[Marshal.SizeOf<IndexEntry>()];
+                _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(_structureBytes);
+
+                AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                           "Block type {0} with data type {1} is indexed to be at {2}",
+                                           entry.blockType, entry.dataType, entry.offset);
+
+                _index.Add(entry);
+            }
+        }
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+
+        _imageInfo.ImageSize = 0;
+
+        bool foundUserDataDdt = false;
+        _mediaTags = new Dictionary<MediaTagType, byte[]>();
+        List<CompactDiscIndexEntry> compactDiscIndexes = null;
+
+        foreach(IndexEntry entry in _index)
+        {
+            _imageStream.Position = (long)entry.offset;
+
+            switch(entry.blockType)
+            {
+                case BlockType.DataBlock:
+                    // NOP block, skip
+                    if(entry.dataType == DataType.NoData)
+                        break;
+
+                    _imageStream.Position = (long)entry.offset;
+
+                    _structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
                     _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                    IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(_structureBytes);
+                    BlockHeader blockHeader = Marshal.SpanToStructureLittleEndian<BlockHeader>(_structureBytes);
+                    _imageInfo.ImageSize += blockHeader.cmpLength;
 
-                    AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                               "Block type {0} with data type {1} is indexed to be at {2}",
-                                               entry.blockType, entry.dataType, entry.offset);
-
-                    _index.Add(entry);
-                }
-            }
-            else
-            {
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries",
-                                           _header.indexOffset, idxHeader.entries);
-
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                           GC.GetTotalMemory(false));
-
-                // Fill in-memory index
-                _index = new List<IndexEntry>();
-
-                for(ushort i = 0; i < idxHeader.entries; i++)
-                {
-                    _structureBytes = new byte[Marshal.SizeOf<IndexEntry>()];
-                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                    IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(_structureBytes);
-
-                    AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                               "Block type {0} with data type {1} is indexed to be at {2}",
-                                               entry.blockType, entry.dataType, entry.offset);
-
-                    _index.Add(entry);
-                }
-            }
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
-
-            _imageInfo.ImageSize = 0;
-
-            bool foundUserDataDdt = false;
-            _mediaTags = new Dictionary<MediaTagType, byte[]>();
-            List<CompactDiscIndexEntry> compactDiscIndexes = null;
-
-            foreach(IndexEntry entry in _index)
-            {
-                _imageStream.Position = (long)entry.offset;
-
-                switch(entry.blockType)
-                {
-                    case BlockType.DataBlock:
-                        // NOP block, skip
-                        if(entry.dataType == DataType.NoData)
-                            break;
-
-                        _imageStream.Position = (long)entry.offset;
-
-                        _structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        BlockHeader blockHeader = Marshal.SpanToStructureLittleEndian<BlockHeader>(_structureBytes);
-                        _imageInfo.ImageSize += blockHeader.cmpLength;
-
-                        // Unused, skip
-                        if(entry.dataType == DataType.UserData)
-                        {
-                            if(blockHeader.sectorSize > _imageInfo.SectorSize)
-                                _imageInfo.SectorSize = blockHeader.sectorSize;
-
-                            break;
-                        }
-
-                        if(blockHeader.identifier != entry.blockType)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Incorrect identifier for data block at position {0}",
-                                                       entry.offset);
-
-                            break;
-                        }
-
-                        if(blockHeader.type != entry.dataType)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Expected block with data type {0} at position {1} but found data type {2}",
-                                                       entry.dataType, entry.offset, blockHeader.type);
-
-                            break;
-                        }
-
-                        byte[] data;
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Found data block type {0} at position {1}",
-                                                   entry.dataType, entry.offset);
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                   GC.GetTotalMemory(false));
-
-                        // Decompress media tag
-                        if(blockHeader.compression == CompressionType.Lzma ||
-                           blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform)
-                        {
-                            if(blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform &&
-                               entry.dataType          != DataType.CdSectorSubchannel)
-                            {
-                                AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                           "Invalid compression type {0} for block with data type {1}, continuing...",
-                                                           blockHeader.compression, entry.dataType);
-
-                                break;
-                            }
-
-                            DateTime startDecompress = DateTime.Now;
-                            byte[]   compressedTag   = new byte[blockHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
-                            byte[]   lzmaProperties  = new byte[LZMA_PROPERTIES_LENGTH];
-                            _imageStream.Read(lzmaProperties, 0, LZMA_PROPERTIES_LENGTH);
-                            _imageStream.Read(compressedTag, 0, compressedTag.Length);
-                            data = new byte[blockHeader.length];
-                            int decompressedLength = LZMA.DecodeBuffer(compressedTag, data, lzmaProperties);
-
-                            if(decompressedLength != blockHeader.length)
-                            {
-                                AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                           "Error decompressing block, should be {0} bytes but got {1} bytes.",
-                                                           blockHeader.length, decompressedLength);
-
-                                return ErrorNumber.InOutError;
-                            }
-
-                            if(blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform)
-                                data = ClauniaSubchannelUntransform(data);
-
-                            DateTime endDecompress = DateTime.Now;
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0} seconds to decompress block",
-                                                       (endDecompress - startDecompress).TotalSeconds);
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                       GC.GetTotalMemory(false));
-                        }
-                        else if(blockHeader.compression == CompressionType.None)
-                        {
-                            data = new byte[blockHeader.length];
-                            _imageStream.Read(data, 0, (int)blockHeader.length);
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                       GC.GetTotalMemory(false));
-                        }
-                        else
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Found unknown compression type {0}, continuing...",
-                                                       (ushort)blockHeader.compression);
-
-                            break;
-                        }
-
-                        // Check CRC, if not correct, skip it
-                        Crc64Context.Data(data, out byte[] blockCrc);
-
-                        if(BitConverter.ToUInt64(blockCrc, 0) != blockHeader.crc64 &&
-                           blockHeader.crc64                  != 0)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
-                                                       BitConverter.ToUInt64(blockCrc, 0), blockHeader.crc64);
-
-                            break;
-                        }
-
-                        // Check if it's not a media tag, but a sector tag, and fill the appropriate table then
-                        switch(entry.dataType)
-                        {
-                            case DataType.CdSectorPrefix:
-                            case DataType.CdSectorPrefixCorrected:
-                                if(entry.dataType == DataType.CdSectorPrefixCorrected)
-                                {
-                                    _sectorPrefixMs ??= new MemoryStream();
-                                    _sectorPrefixMs.Write(data, 0, data.Length);
-                                }
-                                else
-                                    _sectorPrefix = data;
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                break;
-                            case DataType.CdSectorSuffix:
-                            case DataType.CdSectorSuffixCorrected:
-                                if(entry.dataType == DataType.CdSectorSuffixCorrected)
-                                {
-                                    _sectorSuffixMs ??= new MemoryStream();
-                                    _sectorSuffixMs.Write(data, 0, data.Length);
-                                }
-                                else
-                                    _sectorSuffix = data;
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                break;
-                            case DataType.CdSectorSubchannel:
-                                _sectorSubchannel = data;
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                break;
-                            case DataType.AppleProfileTag:
-                            case DataType.AppleSonyTag:
-                            case DataType.PriamDataTowerTag:
-                                _sectorSubchannel = data;
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                break;
-                            case DataType.CompactDiscMode2Subheader:
-                                _mode2Subheaders = data;
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                break;
-                            case DataType.DvdSectorCpiMai:
-                                _sectorCpiMai = data;
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdCmi))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdCmi);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdTitleKey))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdTitleKey);
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                break;
-                            case DataType.DvdSectorTitleKeyDecrypted:
-                                _sectorDecryptedTitleKey = data;
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdTitleKeyDecrypted))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdTitleKeyDecrypted);
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                break;
-                            default:
-                                MediaTagType mediaTagType = GetMediaTagTypeForDataType(blockHeader.type);
-
-                                if(_mediaTags.ContainsKey(mediaTagType))
-                                {
-                                    AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                               "Media tag type {0} duplicated, removing previous entry...",
-                                                               mediaTagType);
-
-                                    _mediaTags.Remove(mediaTagType);
-                                }
-
-                                _mediaTags.Add(mediaTagType, data);
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                break;
-                        }
-
-                        break;
-                    case BlockType.DeDuplicationTable:
-                        _structureBytes = new byte[Marshal.SizeOf<DdtHeader>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        DdtHeader ddtHeader = Marshal.SpanToStructureLittleEndian<DdtHeader>(_structureBytes);
-                        _imageInfo.ImageSize += ddtHeader.cmpLength;
-
-                        if(ddtHeader.identifier != BlockType.DeDuplicationTable)
-                            break;
-
-                        switch(entry.dataType)
-                        {
-                            case DataType.UserData:
-                                _imageInfo.Sectors = ddtHeader.entries;
-                                _shift             = ddtHeader.shift;
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                // Check for DDT compression
-                                switch(ddtHeader.compression)
-                                {
-                                    case CompressionType.Lzma:
-                                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Decompressing DDT...");
-                                        DateTime ddtStart = DateTime.UtcNow;
-                                        byte[]   compressedDdt = new byte[ddtHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
-                                        byte[]   lzmaProperties = new byte[LZMA_PROPERTIES_LENGTH];
-                                        _imageStream.Read(lzmaProperties, 0, LZMA_PROPERTIES_LENGTH);
-                                        _imageStream.Read(compressedDdt, 0, compressedDdt.Length);
-                                        byte[] decompressedDdt = new byte[ddtHeader.length];
-
-                                        ulong decompressedLength =
-                                            (ulong)LZMA.DecodeBuffer(compressedDdt, decompressedDdt, lzmaProperties);
-
-                                        if(decompressedLength != ddtHeader.length)
-                                        {
-                                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                                       "Error decompressing DDT, should be {0} bytes but got {1} bytes.",
-                                                                       ddtHeader.length, decompressedLength);
-
-                                            return ErrorNumber.InOutError;
-                                        }
-
-                                        _userDataDdt = MemoryMarshal.Cast<byte, ulong>(decompressedDdt).ToArray();
-                                        DateTime ddtEnd = DateTime.UtcNow;
-                                        _inMemoryDdt = true;
-
-                                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                                   "Took {0} seconds to decompress DDT",
-                                                                   (ddtEnd - ddtStart).TotalSeconds);
-
-                                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                                   GC.GetTotalMemory(false));
-
-                                        break;
-                                    case CompressionType.None:
-                                        _inMemoryDdt          = false;
-                                        _outMemoryDdtPosition = (long)entry.offset;
-
-                                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                                   GC.GetTotalMemory(false));
-
-                                        break;
-                                    default:
-                                        AaruConsole.
-                                            ErrorWriteLine($"Found unsupported compression algorithm {(ushort)ddtHeader.compression}");
-
-                                        return ErrorNumber.NotSupported;
-                                }
-
-                                foundUserDataDdt = true;
-
-                                break;
-                            case DataType.CdSectorPrefixCorrected:
-                            case DataType.CdSectorSuffixCorrected:
-                            {
-                                byte[] decompressedDdt = new byte[ddtHeader.length];
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                // Check for DDT compression
-                                switch(ddtHeader.compression)
-                                {
-                                    case CompressionType.Lzma:
-                                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Decompressing DDT...");
-                                        DateTime ddtStart = DateTime.UtcNow;
-                                        byte[]   compressedDdt = new byte[ddtHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
-                                        byte[]   lzmaProperties = new byte[LZMA_PROPERTIES_LENGTH];
-                                        _imageStream.Read(lzmaProperties, 0, LZMA_PROPERTIES_LENGTH);
-                                        _imageStream.Read(compressedDdt, 0, compressedDdt.Length);
-
-                                        ulong decompressedLength =
-                                            (ulong)LZMA.DecodeBuffer(compressedDdt, decompressedDdt, lzmaProperties);
-
-                                        DateTime ddtEnd = DateTime.UtcNow;
-
-                                        if(decompressedLength != ddtHeader.length)
-                                        {
-                                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                                       "Error decompressing DDT, should be {0} bytes but got {1} bytes.",
-                                                                       ddtHeader.length, decompressedLength);
-
-                                            return ErrorNumber.InOutError;
-                                        }
-
-                                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                                   "Took {0} seconds to decompress DDT",
-                                                                   (ddtEnd - ddtStart).TotalSeconds);
-
-                                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                                   GC.GetTotalMemory(false));
-
-                                        break;
-                                    case CompressionType.None:
-                                        _imageStream.Read(decompressedDdt, 0, decompressedDdt.Length);
-
-                                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                                   GC.GetTotalMemory(false));
-
-                                        break;
-                                    default:
-                                        AaruConsole.
-                                            ErrorWriteLine($"Found unsupported compression algorithm {(ushort)ddtHeader.compression}");
-
-                                        return ErrorNumber.NotSupported;
-                                }
-
-                                uint[] cdDdt = MemoryMarshal.Cast<byte, uint>(decompressedDdt).ToArray();
-
-                                switch(entry.dataType)
-                                {
-                                    case DataType.CdSectorPrefixCorrected:
-                                        _sectorPrefixDdt = cdDdt;
-                                        _sectorPrefixMs  = new MemoryStream();
-
-                                        break;
-                                    case DataType.CdSectorSuffixCorrected:
-                                        _sectorSuffixDdt = cdDdt;
-                                        _sectorSuffixMs  = new MemoryStream();
-
-                                        break;
-                                }
-
-                                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                           GC.GetTotalMemory(false));
-
-                                break;
-                            }
-                        }
-
-                        break;
-
-                    // Logical geometry block. It doesn't have a CRC coz, well, it's not so important
-                    case BlockType.GeometryBlock:
-                        _structureBytes = new byte[Marshal.SizeOf<GeometryBlock>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        _geometryBlock = Marshal.SpanToStructureLittleEndian<GeometryBlock>(_structureBytes);
-
-                        if(_geometryBlock.identifier == BlockType.GeometryBlock)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Geometry set to {0} cylinders {1} heads {2} sectors per track",
-                                                       _geometryBlock.cylinders, _geometryBlock.heads,
-                                                       _geometryBlock.sectorsPerTrack);
-
-                            _imageInfo.Cylinders       = _geometryBlock.cylinders;
-                            _imageInfo.Heads           = _geometryBlock.heads;
-                            _imageInfo.SectorsPerTrack = _geometryBlock.sectorsPerTrack;
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                       GC.GetTotalMemory(false));
-                        }
-
-                        break;
-
-                    // Metadata block
-                    case BlockType.MetadataBlock:
-                        _structureBytes = new byte[Marshal.SizeOf<MetadataBlock>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-
-                        MetadataBlock metadataBlock =
-                            Marshal.SpanToStructureLittleEndian<MetadataBlock>(_structureBytes);
-
-                        if(metadataBlock.identifier != entry.blockType)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Incorrect identifier for data block at position {0}",
-                                                       entry.offset);
-
-                            break;
-                        }
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Found metadata block at position {0}",
-                                                   entry.offset);
-
-                        byte[] metadata = new byte[metadataBlock.blockSize];
-                        _imageStream.Position = (long)entry.offset;
-                        _imageStream.Read(metadata, 0, metadata.Length);
-
-                        if(metadataBlock.mediaSequence     > 0 &&
-                           metadataBlock.lastMediaSequence > 0)
-                        {
-                            _imageInfo.MediaSequence     = metadataBlock.mediaSequence;
-                            _imageInfo.LastMediaSequence = metadataBlock.lastMediaSequence;
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media sequence as {0} of {1}",
-                                                       _imageInfo.MediaSequence, _imageInfo.LastMediaSequence);
-                        }
-
-                        if(metadataBlock.creatorLength                               > 0 &&
-                           metadataBlock.creatorLength + metadataBlock.creatorOffset <= metadata.Length)
-                        {
-                            _imageInfo.Creator = Encoding.Unicode.GetString(metadata, (int)metadataBlock.creatorOffset,
-                                                                            (int)(metadataBlock.creatorLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting creator: {0}",
-                                                       _imageInfo.Creator);
-                        }
-
-                        if(metadataBlock.commentsOffset                                > 0 &&
-                           metadataBlock.commentsLength + metadataBlock.commentsOffset <= metadata.Length)
-                        {
-                            _imageInfo.Comments =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.commentsOffset,
-                                                           (int)(metadataBlock.commentsLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting comments: {0}",
-                                                       _imageInfo.Comments);
-                        }
-
-                        if(metadataBlock.mediaTitleOffset                                  > 0 &&
-                           metadataBlock.mediaTitleLength + metadataBlock.mediaTitleOffset <= metadata.Length)
-                        {
-                            _imageInfo.MediaTitle =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaTitleOffset,
-                                                           (int)(metadataBlock.mediaTitleLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media title: {0}",
-                                                       _imageInfo.MediaTitle);
-                        }
-
-                        if(metadataBlock.mediaManufacturerOffset > 0 &&
-                           metadataBlock.mediaManufacturerLength + metadataBlock.mediaManufacturerOffset <=
-                           metadata.Length)
-                        {
-                            _imageInfo.MediaManufacturer =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaManufacturerOffset,
-                                                           (int)(metadataBlock.mediaManufacturerLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media manufacturer: {0}",
-                                                       _imageInfo.MediaManufacturer);
-                        }
-
-                        if(metadataBlock.mediaModelOffset                                  > 0 &&
-                           metadataBlock.mediaModelLength + metadataBlock.mediaModelOffset <= metadata.Length)
-                        {
-                            _imageInfo.MediaModel =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaModelOffset,
-                                                           (int)(metadataBlock.mediaModelLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media model: {0}",
-                                                       _imageInfo.MediaModel);
-                        }
-
-                        if(metadataBlock.mediaSerialNumberOffset > 0 &&
-                           metadataBlock.mediaSerialNumberLength + metadataBlock.mediaSerialNumberOffset <=
-                           metadata.Length)
-                        {
-                            _imageInfo.MediaSerialNumber =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaSerialNumberOffset,
-                                                           (int)(metadataBlock.mediaSerialNumberLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media serial number: {0}",
-                                                       _imageInfo.MediaSerialNumber);
-                        }
-
-                        if(metadataBlock.mediaBarcodeOffset                                    > 0 &&
-                           metadataBlock.mediaBarcodeLength + metadataBlock.mediaBarcodeOffset <= metadata.Length)
-                        {
-                            _imageInfo.MediaBarcode =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaBarcodeOffset,
-                                                           (int)(metadataBlock.mediaBarcodeLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media barcode: {0}",
-                                                       _imageInfo.MediaBarcode);
-                        }
-
-                        if(metadataBlock.mediaPartNumberOffset                                       > 0 &&
-                           metadataBlock.mediaPartNumberLength + metadataBlock.mediaPartNumberOffset <= metadata.Length)
-                        {
-                            _imageInfo.MediaPartNumber =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaPartNumberOffset,
-                                                           (int)(metadataBlock.mediaPartNumberLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media part number: {0}",
-                                                       _imageInfo.MediaPartNumber);
-                        }
-
-                        if(metadataBlock.driveManufacturerOffset > 0 &&
-                           metadataBlock.driveManufacturerLength + metadataBlock.driveManufacturerOffset <=
-                           metadata.Length)
-                        {
-                            _imageInfo.DriveManufacturer =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveManufacturerOffset,
-                                                           (int)(metadataBlock.driveManufacturerLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive manufacturer: {0}",
-                                                       _imageInfo.DriveManufacturer);
-                        }
-
-                        if(metadataBlock.driveModelOffset                                  > 0 &&
-                           metadataBlock.driveModelLength + metadataBlock.driveModelOffset <= metadata.Length)
-                        {
-                            _imageInfo.DriveModel =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveModelOffset,
-                                                           (int)(metadataBlock.driveModelLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive model: {0}",
-                                                       _imageInfo.DriveModel);
-                        }
-
-                        if(metadataBlock.driveSerialNumberOffset > 0 &&
-                           metadataBlock.driveSerialNumberLength + metadataBlock.driveSerialNumberOffset <=
-                           metadata.Length)
-                        {
-                            _imageInfo.DriveSerialNumber =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveSerialNumberOffset,
-                                                           (int)(metadataBlock.driveSerialNumberLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive serial number: {0}",
-                                                       _imageInfo.DriveSerialNumber);
-                        }
-
-                        if(metadataBlock.driveFirmwareRevisionOffset > 0 &&
-                           metadataBlock.driveFirmwareRevisionLength + metadataBlock.driveFirmwareRevisionOffset <=
-                           metadata.Length)
-                        {
-                            _imageInfo.DriveFirmwareRevision =
-                                Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveFirmwareRevisionOffset,
-                                                           (int)(metadataBlock.driveFirmwareRevisionLength - 2));
-
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive firmware revision: {0}",
-                                                       _imageInfo.DriveFirmwareRevision);
-                        }
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                   GC.GetTotalMemory(false));
-
-                        break;
-
-                    // Optical disc tracks block
-                    case BlockType.TracksBlock:
-                        _structureBytes = new byte[Marshal.SizeOf<TracksHeader>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        TracksHeader tracksHeader = Marshal.SpanToStructureLittleEndian<TracksHeader>(_structureBytes);
-
-                        if(tracksHeader.identifier != BlockType.TracksBlock)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Incorrect identifier for tracks block at position {0}",
-                                                       entry.offset);
-
-                            break;
-                        }
-
-                        _structureBytes = new byte[Marshal.SizeOf<TrackEntry>() * tracksHeader.entries];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        Crc64Context.Data(_structureBytes, out byte[] trksCrc);
-
-                        if(BitConverter.ToUInt64(trksCrc, 0) != tracksHeader.crc64)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
-                                                       BitConverter.ToUInt64(trksCrc, 0), tracksHeader.crc64);
-
-                            break;
-                        }
-
-                        _imageStream.Position -= _structureBytes.Length;
-
-                        Tracks      = new List<Track>();
-                        _trackFlags = new Dictionary<byte, byte>();
-                        _trackIsrcs = new Dictionary<byte, string>();
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Found {0} tracks at position {0}",
-                                                   tracksHeader.entries, entry.offset);
-
-                        for(ushort i = 0; i < tracksHeader.entries; i++)
-                        {
-                            _structureBytes = new byte[Marshal.SizeOf<TrackEntry>()];
-                            _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-
-                            TrackEntry trackEntry =
-                                Marshal.ByteArrayToStructureLittleEndian<TrackEntry>(_structureBytes);
-
-                            Tracks.Add(new Track
-                            {
-                                Sequence    = trackEntry.sequence,
-                                Type        = trackEntry.type,
-                                StartSector = (ulong)trackEntry.start,
-                                EndSector   = (ulong)trackEntry.end,
-                                Pregap      = (ulong)trackEntry.pregap,
-                                Session     = trackEntry.session,
-                                File        = imageFilter.Filename,
-                                FileType    = "BINARY",
-                                Filter      = imageFilter
-                            });
-
-                            if(trackEntry.type == TrackType.Data)
-                                continue;
-
-                            _trackFlags.Add(trackEntry.sequence, trackEntry.flags);
-
-                            if(!string.IsNullOrEmpty(trackEntry.isrc))
-                                _trackIsrcs.Add(trackEntry.sequence, trackEntry.isrc);
-                        }
-
-                        if(_trackFlags.Count > 0 &&
-                           !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-
-                        if(_trackIsrcs.Count > 0 &&
-                           !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
-
-                        _imageInfo.HasPartitions = true;
-                        _imageInfo.HasSessions   = true;
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                   GC.GetTotalMemory(false));
-
-                        break;
-
-                    // CICM XML metadata block
-                    case BlockType.CicmBlock:
-                        _structureBytes = new byte[Marshal.SizeOf<CicmMetadataBlock>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-
-                        CicmMetadataBlock cicmBlock =
-                            Marshal.SpanToStructureLittleEndian<CicmMetadataBlock>(_structureBytes);
-
-                        if(cicmBlock.identifier != BlockType.CicmBlock)
-                            break;
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                   "Found CICM XML metadata block at position {0}", entry.offset);
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                   GC.GetTotalMemory(false));
-
-                        byte[] cicmBytes = new byte[cicmBlock.length];
-                        _imageStream.Read(cicmBytes, 0, cicmBytes.Length);
-                        var cicmMs = new MemoryStream(cicmBytes);
-                        var cicmXs = new XmlSerializer(typeof(CICMMetadataType));
-
-                        try
-                        {
-                            var sr = new StreamReader(cicmMs);
-                            CicmMetadata = (CICMMetadataType)cicmXs.Deserialize(sr);
-                            sr.Close();
-                        }
-                        catch(XmlException ex)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Exception {0} processing CICM XML metadata block", ex.Message);
-
-                            CicmMetadata = null;
-                        }
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                   GC.GetTotalMemory(false));
-
-                        break;
-
-                    // Dump hardware block
-                    case BlockType.DumpHardwareBlock:
-                        _structureBytes = new byte[Marshal.SizeOf<DumpHardwareHeader>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-
-                        DumpHardwareHeader dumpBlock =
-                            Marshal.SpanToStructureLittleEndian<DumpHardwareHeader>(_structureBytes);
-
-                        if(dumpBlock.identifier != BlockType.DumpHardwareBlock)
-                            break;
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Found dump hardware block at position {0}",
-                                                   entry.offset);
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                   GC.GetTotalMemory(false));
-
-                        _structureBytes = new byte[dumpBlock.length];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        Crc64Context.Data(_structureBytes, out byte[] dumpCrc);
-
-                        if(BitConverter.ToUInt64(dumpCrc, 0) != dumpBlock.crc64)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
-                                                       BitConverter.ToUInt64(dumpCrc, 0), dumpBlock.crc64);
-
-                            break;
-                        }
-
-                        _imageStream.Position -= _structureBytes.Length;
-
-                        DumpHardware = new List<DumpHardwareType>();
-
-                        for(ushort i = 0; i < dumpBlock.entries; i++)
-                        {
-                            _structureBytes = new byte[Marshal.SizeOf<DumpHardwareEntry>()];
-                            _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-
-                            DumpHardwareEntry dumpEntry =
-                                Marshal.SpanToStructureLittleEndian<DumpHardwareEntry>(_structureBytes);
-
-                            var dump = new DumpHardwareType
-                            {
-                                Software = new SoftwareType(),
-                                Extents  = new ExtentType[dumpEntry.extents]
-                            };
-
-                            byte[] tmp;
-
-                            if(dumpEntry.manufacturerLength > 0)
-                            {
-                                tmp = new byte[dumpEntry.manufacturerLength - 1];
-                                _imageStream.Read(tmp, 0, tmp.Length);
-                                _imageStream.Position += 1;
-                                dump.Manufacturer     =  Encoding.UTF8.GetString(tmp);
-                            }
-
-                            if(dumpEntry.modelLength > 0)
-                            {
-                                tmp = new byte[dumpEntry.modelLength - 1];
-                                _imageStream.Read(tmp, 0, tmp.Length);
-                                _imageStream.Position += 1;
-                                dump.Model            =  Encoding.UTF8.GetString(tmp);
-                            }
-
-                            if(dumpEntry.revisionLength > 0)
-                            {
-                                tmp = new byte[dumpEntry.revisionLength - 1];
-                                _imageStream.Read(tmp, 0, tmp.Length);
-                                _imageStream.Position += 1;
-                                dump.Revision         =  Encoding.UTF8.GetString(tmp);
-                            }
-
-                            if(dumpEntry.firmwareLength > 0)
-                            {
-                                tmp = new byte[dumpEntry.firmwareLength - 1];
-                                _imageStream.Read(tmp, 0, tmp.Length);
-                                _imageStream.Position += 1;
-                                dump.Firmware         =  Encoding.UTF8.GetString(tmp);
-                            }
-
-                            if(dumpEntry.serialLength > 0)
-                            {
-                                tmp = new byte[dumpEntry.serialLength - 1];
-                                _imageStream.Read(tmp, 0, tmp.Length);
-                                _imageStream.Position += 1;
-                                dump.Serial           =  Encoding.UTF8.GetString(tmp);
-                            }
-
-                            if(dumpEntry.softwareNameLength > 0)
-                            {
-                                tmp = new byte[dumpEntry.softwareNameLength - 1];
-                                _imageStream.Read(tmp, 0, tmp.Length);
-                                _imageStream.Position += 1;
-                                dump.Software.Name    =  Encoding.UTF8.GetString(tmp);
-                            }
-
-                            if(dumpEntry.softwareVersionLength > 0)
-                            {
-                                tmp = new byte[dumpEntry.softwareVersionLength - 1];
-                                _imageStream.Read(tmp, 0, tmp.Length);
-                                _imageStream.Position += 1;
-                                dump.Software.Version =  Encoding.UTF8.GetString(tmp);
-                            }
-
-                            if(dumpEntry.softwareOperatingSystemLength > 0)
-                            {
-                                tmp = new byte[dumpEntry.softwareOperatingSystemLength - 1];
-                                _imageStream.Read(tmp, 0, tmp.Length);
-                                _imageStream.Position         += 1;
-                                dump.Software.OperatingSystem =  Encoding.UTF8.GetString(tmp);
-                            }
-
-                            tmp = new byte[16];
-
-                            for(uint j = 0; j < dumpEntry.extents; j++)
-                            {
-                                _imageStream.Read(tmp, 0, tmp.Length);
-
-                                dump.Extents[j] = new ExtentType
-                                {
-                                    Start = BitConverter.ToUInt64(tmp, 0),
-                                    End   = BitConverter.ToUInt64(tmp, 8)
-                                };
-                            }
-
-                            dump.Extents = dump.Extents.OrderBy(t => t.Start).ToArray();
-
-                            if(dump.Extents.Length > 0)
-                                DumpHardware.Add(dump);
-                        }
-
-                        if(DumpHardware.Count == 0)
-                            DumpHardware = null;
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                   GC.GetTotalMemory(false));
-
-                        break;
-
-                    // Tape partition block
-                    case BlockType.TapePartitionBlock:
-                        _structureBytes = new byte[Marshal.SizeOf<TapePartitionHeader>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-
-                        TapePartitionHeader partitionHeader =
-                            Marshal.SpanToStructureLittleEndian<TapePartitionHeader>(_structureBytes);
-
-                        if(partitionHeader.identifier != BlockType.TapePartitionBlock)
-                            break;
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Found tape partition block at position {0}",
-                                                   entry.offset);
-
-                        byte[] tapePartitionBytes = new byte[partitionHeader.length];
-                        _imageStream.Read(tapePartitionBytes, 0, tapePartitionBytes.Length);
-
-                        Span<TapePartitionEntry> tapePartitions =
-                            MemoryMarshal.Cast<byte, TapePartitionEntry>(tapePartitionBytes);
-
-                        TapePartitions = new List<TapePartition>();
-
-                        foreach(TapePartitionEntry tapePartition in tapePartitions)
-                            TapePartitions.Add(new TapePartition
-                            {
-                                FirstBlock = tapePartition.FirstBlock,
-                                LastBlock  = tapePartition.LastBlock,
-                                Number     = tapePartition.Number
-                            });
-
-                        IsTape = true;
-
-                        break;
-
-                    // Tape file block
-                    case BlockType.TapeFileBlock:
-                        _structureBytes = new byte[Marshal.SizeOf<TapeFileHeader>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-
-                        TapeFileHeader fileHeader =
-                            Marshal.SpanToStructureLittleEndian<TapeFileHeader>(_structureBytes);
-
-                        if(fileHeader.identifier != BlockType.TapeFileBlock)
-                            break;
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Found tape file block at position {0}",
-                                                   entry.offset);
-
-                        byte[] tapeFileBytes = new byte[fileHeader.length];
-                        _imageStream.Read(tapeFileBytes, 0, tapeFileBytes.Length);
-                        Span<TapeFileEntry> tapeFiles = MemoryMarshal.Cast<byte, TapeFileEntry>(tapeFileBytes);
-                        Files = new List<TapeFile>();
-
-                        foreach(TapeFileEntry file in tapeFiles)
-                            Files.Add(new TapeFile
-                            {
-                                FirstBlock = file.FirstBlock,
-                                LastBlock  = file.LastBlock,
-                                Partition  = file.Partition,
-                                File       = file.File
-                            });
-
-                        IsTape = true;
-
-                        break;
-
-                    // Optical disc tracks block
-                    case BlockType.CompactDiscIndexesBlock:
-                        _structureBytes = new byte[Marshal.SizeOf<CompactDiscIndexesHeader>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-
-                        CompactDiscIndexesHeader indexesHeader =
-                            Marshal.SpanToStructureLittleEndian<CompactDiscIndexesHeader>(_structureBytes);
-
-                        if(indexesHeader.identifier != BlockType.CompactDiscIndexesBlock)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Incorrect identifier for compact disc indexes block at position {0}",
-                                                       entry.offset);
-
-                            break;
-                        }
-
-                        _structureBytes = new byte[Marshal.SizeOf<CompactDiscIndexEntry>() * indexesHeader.entries];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        Crc64Context.Data(_structureBytes, out byte[] idsxCrc);
-
-                        if(BitConverter.ToUInt64(idsxCrc, 0) != indexesHeader.crc64)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
-                                                       BitConverter.ToUInt64(idsxCrc, 0), indexesHeader.crc64);
-
-                            break;
-                        }
-
-                        _imageStream.Position -= _structureBytes.Length;
-
-                        compactDiscIndexes = new List<CompactDiscIndexEntry>();
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                   "Found {0} compact disc indexes at position {0}",
-                                                   indexesHeader.entries, entry.offset);
-
-                        for(ushort i = 0; i < indexesHeader.entries; i++)
-                        {
-                            _structureBytes = new byte[Marshal.SizeOf<CompactDiscIndexEntry>()];
-                            _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-
-                            compactDiscIndexes.Add(Marshal.
-                                                       ByteArrayToStructureLittleEndian<
-                                                           CompactDiscIndexEntry>(_structureBytes));
-                        }
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                                   GC.GetTotalMemory(false));
-
-                        break;
-                }
-            }
-
-            if(!foundUserDataDdt)
-            {
-                AaruConsole.ErrorWriteLine("Could not find user data deduplication table.");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            _imageInfo.CreationTime = DateTime.FromFileTimeUtc(_header.creationTime);
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Image created on {0}", _imageInfo.CreationTime);
-            _imageInfo.LastModificationTime = DateTime.FromFileTimeUtc(_header.lastWrittenTime);
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Image last written on {0}",
-                                       _imageInfo.LastModificationTime);
-
-            _imageInfo.XmlMediaType = GetXmlMediaType(_header.mediaType);
-
-            if(_geometryBlock.identifier != BlockType.GeometryBlock &&
-               _imageInfo.XmlMediaType   == XmlMediaType.BlockMedia)
-            {
-                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-                _imageInfo.Heads           = 16;
-                _imageInfo.SectorsPerTrack = 63;
-            }
-
-            _imageInfo.ReadableMediaTags.AddRange(_mediaTags.Keys);
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
-
-            // Initialize caches
-            _blockCache       = new Dictionary<ulong, byte[]>();
-            _blockHeaderCache = new Dictionary<ulong, BlockHeader>();
-            _currentCacheSize = 0;
-
-            if(!_inMemoryDdt)
-                _ddtEntryCache = new Dictionary<ulong, ulong>();
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
-
-            // Initialize tracks, sessions and partitions
-            if(_imageInfo.XmlMediaType == XmlMediaType.OpticalDisc)
-            {
-                if(Tracks != null)
-                {
-                    bool leadOutFixed       = false;
-                    bool sessionPregapFixed = false;
-
-                    if(_mediaTags.TryGetValue(MediaTagType.CD_FullTOC, out byte[] fullToc))
+                    // Unused, skip
+                    if(entry.dataType == DataType.UserData)
                     {
-                        byte[] tmp = new byte[fullToc.Length + 2];
-                        Array.Copy(fullToc, 0, tmp, 2, fullToc.Length);
-                        tmp[0] = (byte)(fullToc.Length >> 8);
-                        tmp[1] = (byte)(fullToc.Length & 0xFF);
+                        if(blockHeader.sectorSize > _imageInfo.SectorSize)
+                            _imageInfo.SectorSize = blockHeader.sectorSize;
 
-                        FullTOC.CDFullTOC? decodedFullToc = FullTOC.Decode(tmp);
+                        break;
+                    }
 
-                        if(decodedFullToc.HasValue)
+                    if(blockHeader.identifier != entry.blockType)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Incorrect identifier for data block at position {0}",
+                                                   entry.offset);
+
+                        break;
+                    }
+
+                    if(blockHeader.type != entry.dataType)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Expected block with data type {0} at position {1} but found data type {2}",
+                                                   entry.dataType, entry.offset, blockHeader.type);
+
+                        break;
+                    }
+
+                    byte[] data;
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Found data block type {0} at position {1}",
+                                               entry.dataType, entry.offset);
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                               GC.GetTotalMemory(false));
+
+                    // Decompress media tag
+                    if(blockHeader.compression == CompressionType.Lzma ||
+                       blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform)
+                    {
+                        if(blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform &&
+                           entry.dataType          != DataType.CdSectorSubchannel)
                         {
-                            Dictionary<int, long> leadOutStarts = new(); // Lead-out starts
+                            AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                       "Invalid compression type {0} for block with data type {1}, continuing...",
+                                                       blockHeader.compression, entry.dataType);
 
-                            foreach(FullTOC.TrackDataDescriptor trk in
+                            break;
+                        }
+
+                        DateTime startDecompress = DateTime.Now;
+                        byte[]   compressedTag   = new byte[blockHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
+                        byte[]   lzmaProperties  = new byte[LZMA_PROPERTIES_LENGTH];
+                        _imageStream.Read(lzmaProperties, 0, LZMA_PROPERTIES_LENGTH);
+                        _imageStream.Read(compressedTag, 0, compressedTag.Length);
+                        data = new byte[blockHeader.length];
+                        int decompressedLength = LZMA.DecodeBuffer(compressedTag, data, lzmaProperties);
+
+                        if(decompressedLength != blockHeader.length)
+                        {
+                            AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                       "Error decompressing block, should be {0} bytes but got {1} bytes.",
+                                                       blockHeader.length, decompressedLength);
+
+                            return ErrorNumber.InOutError;
+                        }
+
+                        if(blockHeader.compression == CompressionType.LzmaClauniaSubchannelTransform)
+                            data = ClauniaSubchannelUntransform(data);
+
+                        DateTime endDecompress = DateTime.Now;
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Took {0} seconds to decompress block",
+                                                   (endDecompress - startDecompress).TotalSeconds);
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                   GC.GetTotalMemory(false));
+                    }
+                    else if(blockHeader.compression == CompressionType.None)
+                    {
+                        data = new byte[blockHeader.length];
+                        _imageStream.Read(data, 0, (int)blockHeader.length);
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                   GC.GetTotalMemory(false));
+                    }
+                    else
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Found unknown compression type {0}, continuing...",
+                                                   (ushort)blockHeader.compression);
+
+                        break;
+                    }
+
+                    // Check CRC, if not correct, skip it
+                    Crc64Context.Data(data, out byte[] blockCrc);
+
+                    if(BitConverter.ToUInt64(blockCrc, 0) != blockHeader.crc64 &&
+                       blockHeader.crc64                  != 0)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
+                                                   BitConverter.ToUInt64(blockCrc, 0), blockHeader.crc64);
+
+                        break;
+                    }
+
+                    // Check if it's not a media tag, but a sector tag, and fill the appropriate table then
+                    switch(entry.dataType)
+                    {
+                        case DataType.CdSectorPrefix:
+                        case DataType.CdSectorPrefixCorrected:
+                            if(entry.dataType == DataType.CdSectorPrefixCorrected)
+                            {
+                                _sectorPrefixMs ??= new MemoryStream();
+                                _sectorPrefixMs.Write(data, 0, data.Length);
+                            }
+                            else
+                                _sectorPrefix = data;
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            break;
+                        case DataType.CdSectorSuffix:
+                        case DataType.CdSectorSuffixCorrected:
+                            if(entry.dataType == DataType.CdSectorSuffixCorrected)
+                            {
+                                _sectorSuffixMs ??= new MemoryStream();
+                                _sectorSuffixMs.Write(data, 0, data.Length);
+                            }
+                            else
+                                _sectorSuffix = data;
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            break;
+                        case DataType.CdSectorSubchannel:
+                            _sectorSubchannel = data;
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            break;
+                        case DataType.AppleProfileTag:
+                        case DataType.AppleSonyTag:
+                        case DataType.PriamDataTowerTag:
+                            _sectorSubchannel = data;
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.AppleSectorTag))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            break;
+                        case DataType.CompactDiscMode2Subheader:
+                            _mode2Subheaders = data;
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            break;
+                        case DataType.DvdSectorCpiMai:
+                            _sectorCpiMai = data;
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdCmi))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdCmi);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdTitleKey))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdTitleKey);
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            break;
+                        case DataType.DvdSectorTitleKeyDecrypted:
+                            _sectorDecryptedTitleKey = data;
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.DvdTitleKeyDecrypted))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.DvdTitleKeyDecrypted);
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            break;
+                        default:
+                            MediaTagType mediaTagType = GetMediaTagTypeForDataType(blockHeader.type);
+
+                            if(_mediaTags.ContainsKey(mediaTagType))
+                            {
+                                AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                           "Media tag type {0} duplicated, removing previous entry...",
+                                                           mediaTagType);
+
+                                _mediaTags.Remove(mediaTagType);
+                            }
+
+                            _mediaTags.Add(mediaTagType, data);
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            break;
+                    }
+
+                    break;
+                case BlockType.DeDuplicationTable:
+                    _structureBytes = new byte[Marshal.SizeOf<DdtHeader>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                    DdtHeader ddtHeader = Marshal.SpanToStructureLittleEndian<DdtHeader>(_structureBytes);
+                    _imageInfo.ImageSize += ddtHeader.cmpLength;
+
+                    if(ddtHeader.identifier != BlockType.DeDuplicationTable)
+                        break;
+
+                    switch(entry.dataType)
+                    {
+                        case DataType.UserData:
+                            _imageInfo.Sectors = ddtHeader.entries;
+                            _shift             = ddtHeader.shift;
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            // Check for DDT compression
+                            switch(ddtHeader.compression)
+                            {
+                                case CompressionType.Lzma:
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Decompressing DDT...");
+                                    DateTime ddtStart       = DateTime.UtcNow;
+                                    byte[]   compressedDdt  = new byte[ddtHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
+                                    byte[]   lzmaProperties = new byte[LZMA_PROPERTIES_LENGTH];
+                                    _imageStream.Read(lzmaProperties, 0, LZMA_PROPERTIES_LENGTH);
+                                    _imageStream.Read(compressedDdt, 0, compressedDdt.Length);
+                                    byte[] decompressedDdt = new byte[ddtHeader.length];
+
+                                    ulong decompressedLength =
+                                        (ulong)LZMA.DecodeBuffer(compressedDdt, decompressedDdt, lzmaProperties);
+
+                                    if(decompressedLength != ddtHeader.length)
+                                    {
+                                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                                   "Error decompressing DDT, should be {0} bytes but got {1} bytes.",
+                                                                   ddtHeader.length, decompressedLength);
+
+                                        return ErrorNumber.InOutError;
+                                    }
+
+                                    _userDataDdt = MemoryMarshal.Cast<byte, ulong>(decompressedDdt).ToArray();
+                                    DateTime ddtEnd = DateTime.UtcNow;
+                                    _inMemoryDdt = true;
+
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                               "Took {0} seconds to decompress DDT",
+                                                               (ddtEnd - ddtStart).TotalSeconds);
+
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                               GC.GetTotalMemory(false));
+
+                                    break;
+                                case CompressionType.None:
+                                    _inMemoryDdt          = false;
+                                    _outMemoryDdtPosition = (long)entry.offset;
+
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                               GC.GetTotalMemory(false));
+
+                                    break;
+                                default:
+                                    AaruConsole.
+                                        ErrorWriteLine($"Found unsupported compression algorithm {(ushort)ddtHeader.compression}");
+
+                                    return ErrorNumber.NotSupported;
+                            }
+
+                            foundUserDataDdt = true;
+
+                            break;
+                        case DataType.CdSectorPrefixCorrected:
+                        case DataType.CdSectorSuffixCorrected:
+                        {
+                            byte[] decompressedDdt = new byte[ddtHeader.length];
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            // Check for DDT compression
+                            switch(ddtHeader.compression)
+                            {
+                                case CompressionType.Lzma:
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Decompressing DDT...");
+                                    DateTime ddtStart       = DateTime.UtcNow;
+                                    byte[]   compressedDdt  = new byte[ddtHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
+                                    byte[]   lzmaProperties = new byte[LZMA_PROPERTIES_LENGTH];
+                                    _imageStream.Read(lzmaProperties, 0, LZMA_PROPERTIES_LENGTH);
+                                    _imageStream.Read(compressedDdt, 0, compressedDdt.Length);
+
+                                    ulong decompressedLength =
+                                        (ulong)LZMA.DecodeBuffer(compressedDdt, decompressedDdt, lzmaProperties);
+
+                                    DateTime ddtEnd = DateTime.UtcNow;
+
+                                    if(decompressedLength != ddtHeader.length)
+                                    {
+                                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                                   "Error decompressing DDT, should be {0} bytes but got {1} bytes.",
+                                                                   ddtHeader.length, decompressedLength);
+
+                                        return ErrorNumber.InOutError;
+                                    }
+
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                               "Took {0} seconds to decompress DDT",
+                                                               (ddtEnd - ddtStart).TotalSeconds);
+
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                               GC.GetTotalMemory(false));
+
+                                    break;
+                                case CompressionType.None:
+                                    _imageStream.Read(decompressedDdt, 0, decompressedDdt.Length);
+
+                                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                               GC.GetTotalMemory(false));
+
+                                    break;
+                                default:
+                                    AaruConsole.
+                                        ErrorWriteLine($"Found unsupported compression algorithm {(ushort)ddtHeader.compression}");
+
+                                    return ErrorNumber.NotSupported;
+                            }
+
+                            uint[] cdDdt = MemoryMarshal.Cast<byte, uint>(decompressedDdt).ToArray();
+
+                            switch(entry.dataType)
+                            {
+                                case DataType.CdSectorPrefixCorrected:
+                                    _sectorPrefixDdt = cdDdt;
+                                    _sectorPrefixMs  = new MemoryStream();
+
+                                    break;
+                                case DataType.CdSectorSuffixCorrected:
+                                    _sectorSuffixDdt = cdDdt;
+                                    _sectorSuffixMs  = new MemoryStream();
+
+                                    break;
+                            }
+
+                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                       GC.GetTotalMemory(false));
+
+                            break;
+                        }
+                    }
+
+                    break;
+
+                // Logical geometry block. It doesn't have a CRC coz, well, it's not so important
+                case BlockType.GeometryBlock:
+                    _structureBytes = new byte[Marshal.SizeOf<GeometryBlock>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                    _geometryBlock = Marshal.SpanToStructureLittleEndian<GeometryBlock>(_structureBytes);
+
+                    if(_geometryBlock.identifier == BlockType.GeometryBlock)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Geometry set to {0} cylinders {1} heads {2} sectors per track",
+                                                   _geometryBlock.cylinders, _geometryBlock.heads,
+                                                   _geometryBlock.sectorsPerTrack);
+
+                        _imageInfo.Cylinders       = _geometryBlock.cylinders;
+                        _imageInfo.Heads           = _geometryBlock.heads;
+                        _imageInfo.SectorsPerTrack = _geometryBlock.sectorsPerTrack;
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                                   GC.GetTotalMemory(false));
+                    }
+
+                    break;
+
+                // Metadata block
+                case BlockType.MetadataBlock:
+                    _structureBytes = new byte[Marshal.SizeOf<MetadataBlock>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+
+                    MetadataBlock metadataBlock =
+                        Marshal.SpanToStructureLittleEndian<MetadataBlock>(_structureBytes);
+
+                    if(metadataBlock.identifier != entry.blockType)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Incorrect identifier for data block at position {0}",
+                                                   entry.offset);
+
+                        break;
+                    }
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Found metadata block at position {0}",
+                                               entry.offset);
+
+                    byte[] metadata = new byte[metadataBlock.blockSize];
+                    _imageStream.Position = (long)entry.offset;
+                    _imageStream.Read(metadata, 0, metadata.Length);
+
+                    if(metadataBlock.mediaSequence     > 0 &&
+                       metadataBlock.lastMediaSequence > 0)
+                    {
+                        _imageInfo.MediaSequence     = metadataBlock.mediaSequence;
+                        _imageInfo.LastMediaSequence = metadataBlock.lastMediaSequence;
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media sequence as {0} of {1}",
+                                                   _imageInfo.MediaSequence, _imageInfo.LastMediaSequence);
+                    }
+
+                    if(metadataBlock.creatorLength                               > 0 &&
+                       metadataBlock.creatorLength + metadataBlock.creatorOffset <= metadata.Length)
+                    {
+                        _imageInfo.Creator = Encoding.Unicode.GetString(metadata, (int)metadataBlock.creatorOffset,
+                                                                        (int)(metadataBlock.creatorLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting creator: {0}",
+                                                   _imageInfo.Creator);
+                    }
+
+                    if(metadataBlock.commentsOffset                                > 0 &&
+                       metadataBlock.commentsLength + metadataBlock.commentsOffset <= metadata.Length)
+                    {
+                        _imageInfo.Comments =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.commentsOffset,
+                                                       (int)(metadataBlock.commentsLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting comments: {0}",
+                                                   _imageInfo.Comments);
+                    }
+
+                    if(metadataBlock.mediaTitleOffset                                  > 0 &&
+                       metadataBlock.mediaTitleLength + metadataBlock.mediaTitleOffset <= metadata.Length)
+                    {
+                        _imageInfo.MediaTitle =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaTitleOffset,
+                                                       (int)(metadataBlock.mediaTitleLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media title: {0}",
+                                                   _imageInfo.MediaTitle);
+                    }
+
+                    if(metadataBlock.mediaManufacturerOffset > 0 &&
+                       metadataBlock.mediaManufacturerLength + metadataBlock.mediaManufacturerOffset <=
+                       metadata.Length)
+                    {
+                        _imageInfo.MediaManufacturer =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaManufacturerOffset,
+                                                       (int)(metadataBlock.mediaManufacturerLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media manufacturer: {0}",
+                                                   _imageInfo.MediaManufacturer);
+                    }
+
+                    if(metadataBlock.mediaModelOffset                                  > 0 &&
+                       metadataBlock.mediaModelLength + metadataBlock.mediaModelOffset <= metadata.Length)
+                    {
+                        _imageInfo.MediaModel =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaModelOffset,
+                                                       (int)(metadataBlock.mediaModelLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media model: {0}",
+                                                   _imageInfo.MediaModel);
+                    }
+
+                    if(metadataBlock.mediaSerialNumberOffset > 0 &&
+                       metadataBlock.mediaSerialNumberLength + metadataBlock.mediaSerialNumberOffset <=
+                       metadata.Length)
+                    {
+                        _imageInfo.MediaSerialNumber =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaSerialNumberOffset,
+                                                       (int)(metadataBlock.mediaSerialNumberLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media serial number: {0}",
+                                                   _imageInfo.MediaSerialNumber);
+                    }
+
+                    if(metadataBlock.mediaBarcodeOffset                                    > 0 &&
+                       metadataBlock.mediaBarcodeLength + metadataBlock.mediaBarcodeOffset <= metadata.Length)
+                    {
+                        _imageInfo.MediaBarcode =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaBarcodeOffset,
+                                                       (int)(metadataBlock.mediaBarcodeLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media barcode: {0}",
+                                                   _imageInfo.MediaBarcode);
+                    }
+
+                    if(metadataBlock.mediaPartNumberOffset                                       > 0 &&
+                       metadataBlock.mediaPartNumberLength + metadataBlock.mediaPartNumberOffset <= metadata.Length)
+                    {
+                        _imageInfo.MediaPartNumber =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.mediaPartNumberOffset,
+                                                       (int)(metadataBlock.mediaPartNumberLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting media part number: {0}",
+                                                   _imageInfo.MediaPartNumber);
+                    }
+
+                    if(metadataBlock.driveManufacturerOffset > 0 &&
+                       metadataBlock.driveManufacturerLength + metadataBlock.driveManufacturerOffset <=
+                       metadata.Length)
+                    {
+                        _imageInfo.DriveManufacturer =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveManufacturerOffset,
+                                                       (int)(metadataBlock.driveManufacturerLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive manufacturer: {0}",
+                                                   _imageInfo.DriveManufacturer);
+                    }
+
+                    if(metadataBlock.driveModelOffset                                  > 0 &&
+                       metadataBlock.driveModelLength + metadataBlock.driveModelOffset <= metadata.Length)
+                    {
+                        _imageInfo.DriveModel =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveModelOffset,
+                                                       (int)(metadataBlock.driveModelLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive model: {0}",
+                                                   _imageInfo.DriveModel);
+                    }
+
+                    if(metadataBlock.driveSerialNumberOffset > 0 &&
+                       metadataBlock.driveSerialNumberLength + metadataBlock.driveSerialNumberOffset <=
+                       metadata.Length)
+                    {
+                        _imageInfo.DriveSerialNumber =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveSerialNumberOffset,
+                                                       (int)(metadataBlock.driveSerialNumberLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive serial number: {0}",
+                                                   _imageInfo.DriveSerialNumber);
+                    }
+
+                    if(metadataBlock.driveFirmwareRevisionOffset > 0 &&
+                       metadataBlock.driveFirmwareRevisionLength + metadataBlock.driveFirmwareRevisionOffset <=
+                       metadata.Length)
+                    {
+                        _imageInfo.DriveFirmwareRevision =
+                            Encoding.Unicode.GetString(metadata, (int)metadataBlock.driveFirmwareRevisionOffset,
+                                                       (int)(metadataBlock.driveFirmwareRevisionLength - 2));
+
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Setting drive firmware revision: {0}",
+                                                   _imageInfo.DriveFirmwareRevision);
+                    }
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                               GC.GetTotalMemory(false));
+
+                    break;
+
+                // Optical disc tracks block
+                case BlockType.TracksBlock:
+                    _structureBytes = new byte[Marshal.SizeOf<TracksHeader>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                    TracksHeader tracksHeader = Marshal.SpanToStructureLittleEndian<TracksHeader>(_structureBytes);
+
+                    if(tracksHeader.identifier != BlockType.TracksBlock)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Incorrect identifier for tracks block at position {0}",
+                                                   entry.offset);
+
+                        break;
+                    }
+
+                    _structureBytes = new byte[Marshal.SizeOf<TrackEntry>() * tracksHeader.entries];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                    Crc64Context.Data(_structureBytes, out byte[] trksCrc);
+
+                    if(BitConverter.ToUInt64(trksCrc, 0) != tracksHeader.crc64)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
+                                                   BitConverter.ToUInt64(trksCrc, 0), tracksHeader.crc64);
+
+                        break;
+                    }
+
+                    _imageStream.Position -= _structureBytes.Length;
+
+                    Tracks      = new List<Track>();
+                    _trackFlags = new Dictionary<byte, byte>();
+                    _trackIsrcs = new Dictionary<byte, string>();
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Found {0} tracks at position {0}",
+                                               tracksHeader.entries, entry.offset);
+
+                    for(ushort i = 0; i < tracksHeader.entries; i++)
+                    {
+                        _structureBytes = new byte[Marshal.SizeOf<TrackEntry>()];
+                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+
+                        TrackEntry trackEntry =
+                            Marshal.ByteArrayToStructureLittleEndian<TrackEntry>(_structureBytes);
+
+                        Tracks.Add(new Track
+                        {
+                            Sequence    = trackEntry.sequence,
+                            Type        = trackEntry.type,
+                            StartSector = (ulong)trackEntry.start,
+                            EndSector   = (ulong)trackEntry.end,
+                            Pregap      = (ulong)trackEntry.pregap,
+                            Session     = trackEntry.session,
+                            File        = imageFilter.Filename,
+                            FileType    = "BINARY",
+                            Filter      = imageFilter
+                        });
+
+                        if(trackEntry.type == TrackType.Data)
+                            continue;
+
+                        _trackFlags.Add(trackEntry.sequence, trackEntry.flags);
+
+                        if(!string.IsNullOrEmpty(trackEntry.isrc))
+                            _trackIsrcs.Add(trackEntry.sequence, trackEntry.isrc);
+                    }
+
+                    if(_trackFlags.Count > 0 &&
+                       !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+
+                    if(_trackIsrcs.Count > 0 &&
+                       !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
+
+                    _imageInfo.HasPartitions = true;
+                    _imageInfo.HasSessions   = true;
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                               GC.GetTotalMemory(false));
+
+                    break;
+
+                // CICM XML metadata block
+                case BlockType.CicmBlock:
+                    _structureBytes = new byte[Marshal.SizeOf<CicmMetadataBlock>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+
+                    CicmMetadataBlock cicmBlock =
+                        Marshal.SpanToStructureLittleEndian<CicmMetadataBlock>(_structureBytes);
+
+                    if(cicmBlock.identifier != BlockType.CicmBlock)
+                        break;
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                               "Found CICM XML metadata block at position {0}", entry.offset);
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                               GC.GetTotalMemory(false));
+
+                    byte[] cicmBytes = new byte[cicmBlock.length];
+                    _imageStream.Read(cicmBytes, 0, cicmBytes.Length);
+                    var cicmMs = new MemoryStream(cicmBytes);
+                    var cicmXs = new XmlSerializer(typeof(CICMMetadataType));
+
+                    try
+                    {
+                        var sr = new StreamReader(cicmMs);
+                        CicmMetadata = (CICMMetadataType)cicmXs.Deserialize(sr);
+                        sr.Close();
+                    }
+                    catch(XmlException ex)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Exception {0} processing CICM XML metadata block", ex.Message);
+
+                        CicmMetadata = null;
+                    }
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                               GC.GetTotalMemory(false));
+
+                    break;
+
+                // Dump hardware block
+                case BlockType.DumpHardwareBlock:
+                    _structureBytes = new byte[Marshal.SizeOf<DumpHardwareHeader>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+
+                    DumpHardwareHeader dumpBlock =
+                        Marshal.SpanToStructureLittleEndian<DumpHardwareHeader>(_structureBytes);
+
+                    if(dumpBlock.identifier != BlockType.DumpHardwareBlock)
+                        break;
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Found dump hardware block at position {0}",
+                                               entry.offset);
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                               GC.GetTotalMemory(false));
+
+                    _structureBytes = new byte[dumpBlock.length];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                    Crc64Context.Data(_structureBytes, out byte[] dumpCrc);
+
+                    if(BitConverter.ToUInt64(dumpCrc, 0) != dumpBlock.crc64)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
+                                                   BitConverter.ToUInt64(dumpCrc, 0), dumpBlock.crc64);
+
+                        break;
+                    }
+
+                    _imageStream.Position -= _structureBytes.Length;
+
+                    DumpHardware = new List<DumpHardwareType>();
+
+                    for(ushort i = 0; i < dumpBlock.entries; i++)
+                    {
+                        _structureBytes = new byte[Marshal.SizeOf<DumpHardwareEntry>()];
+                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+
+                        DumpHardwareEntry dumpEntry =
+                            Marshal.SpanToStructureLittleEndian<DumpHardwareEntry>(_structureBytes);
+
+                        var dump = new DumpHardwareType
+                        {
+                            Software = new SoftwareType(),
+                            Extents  = new ExtentType[dumpEntry.extents]
+                        };
+
+                        byte[] tmp;
+
+                        if(dumpEntry.manufacturerLength > 0)
+                        {
+                            tmp = new byte[dumpEntry.manufacturerLength - 1];
+                            _imageStream.Read(tmp, 0, tmp.Length);
+                            _imageStream.Position += 1;
+                            dump.Manufacturer     =  Encoding.UTF8.GetString(tmp);
+                        }
+
+                        if(dumpEntry.modelLength > 0)
+                        {
+                            tmp = new byte[dumpEntry.modelLength - 1];
+                            _imageStream.Read(tmp, 0, tmp.Length);
+                            _imageStream.Position += 1;
+                            dump.Model            =  Encoding.UTF8.GetString(tmp);
+                        }
+
+                        if(dumpEntry.revisionLength > 0)
+                        {
+                            tmp = new byte[dumpEntry.revisionLength - 1];
+                            _imageStream.Read(tmp, 0, tmp.Length);
+                            _imageStream.Position += 1;
+                            dump.Revision         =  Encoding.UTF8.GetString(tmp);
+                        }
+
+                        if(dumpEntry.firmwareLength > 0)
+                        {
+                            tmp = new byte[dumpEntry.firmwareLength - 1];
+                            _imageStream.Read(tmp, 0, tmp.Length);
+                            _imageStream.Position += 1;
+                            dump.Firmware         =  Encoding.UTF8.GetString(tmp);
+                        }
+
+                        if(dumpEntry.serialLength > 0)
+                        {
+                            tmp = new byte[dumpEntry.serialLength - 1];
+                            _imageStream.Read(tmp, 0, tmp.Length);
+                            _imageStream.Position += 1;
+                            dump.Serial           =  Encoding.UTF8.GetString(tmp);
+                        }
+
+                        if(dumpEntry.softwareNameLength > 0)
+                        {
+                            tmp = new byte[dumpEntry.softwareNameLength - 1];
+                            _imageStream.Read(tmp, 0, tmp.Length);
+                            _imageStream.Position += 1;
+                            dump.Software.Name    =  Encoding.UTF8.GetString(tmp);
+                        }
+
+                        if(dumpEntry.softwareVersionLength > 0)
+                        {
+                            tmp = new byte[dumpEntry.softwareVersionLength - 1];
+                            _imageStream.Read(tmp, 0, tmp.Length);
+                            _imageStream.Position += 1;
+                            dump.Software.Version =  Encoding.UTF8.GetString(tmp);
+                        }
+
+                        if(dumpEntry.softwareOperatingSystemLength > 0)
+                        {
+                            tmp = new byte[dumpEntry.softwareOperatingSystemLength - 1];
+                            _imageStream.Read(tmp, 0, tmp.Length);
+                            _imageStream.Position         += 1;
+                            dump.Software.OperatingSystem =  Encoding.UTF8.GetString(tmp);
+                        }
+
+                        tmp = new byte[16];
+
+                        for(uint j = 0; j < dumpEntry.extents; j++)
+                        {
+                            _imageStream.Read(tmp, 0, tmp.Length);
+
+                            dump.Extents[j] = new ExtentType
+                            {
+                                Start = BitConverter.ToUInt64(tmp, 0),
+                                End   = BitConverter.ToUInt64(tmp, 8)
+                            };
+                        }
+
+                        dump.Extents = dump.Extents.OrderBy(t => t.Start).ToArray();
+
+                        if(dump.Extents.Length > 0)
+                            DumpHardware.Add(dump);
+                    }
+
+                    if(DumpHardware.Count == 0)
+                        DumpHardware = null;
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                               GC.GetTotalMemory(false));
+
+                    break;
+
+                // Tape partition block
+                case BlockType.TapePartitionBlock:
+                    _structureBytes = new byte[Marshal.SizeOf<TapePartitionHeader>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+
+                    TapePartitionHeader partitionHeader =
+                        Marshal.SpanToStructureLittleEndian<TapePartitionHeader>(_structureBytes);
+
+                    if(partitionHeader.identifier != BlockType.TapePartitionBlock)
+                        break;
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Found tape partition block at position {0}",
+                                               entry.offset);
+
+                    byte[] tapePartitionBytes = new byte[partitionHeader.length];
+                    _imageStream.Read(tapePartitionBytes, 0, tapePartitionBytes.Length);
+
+                    Span<TapePartitionEntry> tapePartitions =
+                        MemoryMarshal.Cast<byte, TapePartitionEntry>(tapePartitionBytes);
+
+                    TapePartitions = new List<TapePartition>();
+
+                    foreach(TapePartitionEntry tapePartition in tapePartitions)
+                        TapePartitions.Add(new TapePartition
+                        {
+                            FirstBlock = tapePartition.FirstBlock,
+                            LastBlock  = tapePartition.LastBlock,
+                            Number     = tapePartition.Number
+                        });
+
+                    IsTape = true;
+
+                    break;
+
+                // Tape file block
+                case BlockType.TapeFileBlock:
+                    _structureBytes = new byte[Marshal.SizeOf<TapeFileHeader>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+
+                    TapeFileHeader fileHeader =
+                        Marshal.SpanToStructureLittleEndian<TapeFileHeader>(_structureBytes);
+
+                    if(fileHeader.identifier != BlockType.TapeFileBlock)
+                        break;
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Found tape file block at position {0}",
+                                               entry.offset);
+
+                    byte[] tapeFileBytes = new byte[fileHeader.length];
+                    _imageStream.Read(tapeFileBytes, 0, tapeFileBytes.Length);
+                    Span<TapeFileEntry> tapeFiles = MemoryMarshal.Cast<byte, TapeFileEntry>(tapeFileBytes);
+                    Files = new List<TapeFile>();
+
+                    foreach(TapeFileEntry file in tapeFiles)
+                        Files.Add(new TapeFile
+                        {
+                            FirstBlock = file.FirstBlock,
+                            LastBlock  = file.LastBlock,
+                            Partition  = file.Partition,
+                            File       = file.File
+                        });
+
+                    IsTape = true;
+
+                    break;
+
+                // Optical disc tracks block
+                case BlockType.CompactDiscIndexesBlock:
+                    _structureBytes = new byte[Marshal.SizeOf<CompactDiscIndexesHeader>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+
+                    CompactDiscIndexesHeader indexesHeader =
+                        Marshal.SpanToStructureLittleEndian<CompactDiscIndexesHeader>(_structureBytes);
+
+                    if(indexesHeader.identifier != BlockType.CompactDiscIndexesBlock)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Incorrect identifier for compact disc indexes block at position {0}",
+                                                   entry.offset);
+
+                        break;
+                    }
+
+                    _structureBytes = new byte[Marshal.SizeOf<CompactDiscIndexEntry>() * indexesHeader.entries];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                    Crc64Context.Data(_structureBytes, out byte[] idsxCrc);
+
+                    if(BitConverter.ToUInt64(idsxCrc, 0) != indexesHeader.crc64)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Incorrect CRC found: 0x{0:X16} found, expected 0x{1:X16}, continuing...",
+                                                   BitConverter.ToUInt64(idsxCrc, 0), indexesHeader.crc64);
+
+                        break;
+                    }
+
+                    _imageStream.Position -= _structureBytes.Length;
+
+                    compactDiscIndexes = new List<CompactDiscIndexEntry>();
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                               "Found {0} compact disc indexes at position {0}",
+                                               indexesHeader.entries, entry.offset);
+
+                    for(ushort i = 0; i < indexesHeader.entries; i++)
+                    {
+                        _structureBytes = new byte[Marshal.SizeOf<CompactDiscIndexEntry>()];
+                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+
+                        compactDiscIndexes.Add(Marshal.
+                                                   ByteArrayToStructureLittleEndian<
+                                                       CompactDiscIndexEntry>(_structureBytes));
+                    }
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                               GC.GetTotalMemory(false));
+
+                    break;
+            }
+        }
+
+        if(!foundUserDataDdt)
+        {
+            AaruConsole.ErrorWriteLine("Could not find user data deduplication table.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        _imageInfo.CreationTime = DateTime.FromFileTimeUtc(_header.creationTime);
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Image created on {0}", _imageInfo.CreationTime);
+        _imageInfo.LastModificationTime = DateTime.FromFileTimeUtc(_header.lastWrittenTime);
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Image last written on {0}",
+                                   _imageInfo.LastModificationTime);
+
+        _imageInfo.XmlMediaType = GetXmlMediaType(_header.mediaType);
+
+        if(_geometryBlock.identifier != BlockType.GeometryBlock &&
+           _imageInfo.XmlMediaType   == XmlMediaType.BlockMedia)
+        {
+            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+            _imageInfo.Heads           = 16;
+            _imageInfo.SectorsPerTrack = 63;
+        }
+
+        _imageInfo.ReadableMediaTags.AddRange(_mediaTags.Keys);
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+
+        // Initialize caches
+        _blockCache       = new Dictionary<ulong, byte[]>();
+        _blockHeaderCache = new Dictionary<ulong, BlockHeader>();
+        _currentCacheSize = 0;
+
+        if(!_inMemoryDdt)
+            _ddtEntryCache = new Dictionary<ulong, ulong>();
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+
+        // Initialize tracks, sessions and partitions
+        if(_imageInfo.XmlMediaType == XmlMediaType.OpticalDisc)
+        {
+            if(Tracks != null)
+            {
+                bool leadOutFixed       = false;
+                bool sessionPregapFixed = false;
+
+                if(_mediaTags.TryGetValue(MediaTagType.CD_FullTOC, out byte[] fullToc))
+                {
+                    byte[] tmp = new byte[fullToc.Length + 2];
+                    Array.Copy(fullToc, 0, tmp, 2, fullToc.Length);
+                    tmp[0] = (byte)(fullToc.Length >> 8);
+                    tmp[1] = (byte)(fullToc.Length & 0xFF);
+
+                    FullTOC.CDFullTOC? decodedFullToc = FullTOC.Decode(tmp);
+
+                    if(decodedFullToc.HasValue)
+                    {
+                        Dictionary<int, long> leadOutStarts = new(); // Lead-out starts
+
+                        foreach(FullTOC.TrackDataDescriptor trk in
                                 decodedFullToc.Value.TrackDescriptors.Where(trk => (trk.ADR == 1 || trk.ADR == 4) &&
                                                                                 trk.POINT == 0xA2))
+                        {
+                            int phour, pmin, psec, pframe;
+
+                            if(trk.PFRAME == 0)
                             {
-                                int phour, pmin, psec, pframe;
+                                pframe = 74;
 
-                                if(trk.PFRAME == 0)
+                                if(trk.PSEC == 0)
                                 {
-                                    pframe = 74;
+                                    psec = 59;
 
-                                    if(trk.PSEC == 0)
+                                    if(trk.PMIN == 0)
                                     {
-                                        psec = 59;
-
-                                        if(trk.PMIN == 0)
-                                        {
-                                            pmin  = 59;
-                                            phour = trk.PHOUR - 1;
-                                        }
-                                        else
-                                        {
-                                            pmin  = trk.PMIN - 1;
-                                            phour = trk.PHOUR;
-                                        }
+                                        pmin  = 59;
+                                        phour = trk.PHOUR - 1;
                                     }
                                     else
                                     {
-                                        psec  = trk.PSEC - 1;
-                                        pmin  = trk.PMIN;
+                                        pmin  = trk.PMIN - 1;
                                         phour = trk.PHOUR;
                                     }
                                 }
                                 else
                                 {
-                                    pframe = trk.PFRAME - 1;
-                                    psec   = trk.PSEC;
-                                    pmin   = trk.PMIN;
-                                    phour  = trk.PHOUR;
+                                    psec  = trk.PSEC - 1;
+                                    pmin  = trk.PMIN;
+                                    phour = trk.PHOUR;
                                 }
-
-                                int lastSector = (phour * 3600 * 75) + (pmin * 60 * 75) + (psec * 75) + pframe - 150;
-                                leadOutStarts?.Add(trk.SessionNumber, lastSector                               + 1);
                             }
-
-                            foreach(KeyValuePair<int, long> leadOuts in leadOutStarts)
+                            else
                             {
-                                var lastTrackInSession = new Track();
-
-                                foreach(Track trk in Tracks.Where(trk => trk.Session  == leadOuts.Key).
-                                                            Where(trk => trk.Sequence > lastTrackInSession.Sequence))
-                                    lastTrackInSession = trk;
-
-                                if(lastTrackInSession.Sequence  == 0 ||
-                                   lastTrackInSession.EndSector == (ulong)leadOuts.Value - 1)
-                                    continue;
-
-                                lastTrackInSession.EndSector = (ulong)leadOuts.Value - 1;
-                                leadOutFixed                 = true;
+                                pframe = trk.PFRAME - 1;
+                                psec   = trk.PSEC;
+                                pmin   = trk.PMIN;
+                                phour  = trk.PHOUR;
                             }
-                        }
-                    }
 
-                    if(_header.imageMajorVersion <= 1)
-                    {
-                        foreach(Track track in Tracks)
+                            int lastSector = (phour * 3600 * 75) + (pmin * 60 * 75) + (psec * 75) + pframe - 150;
+                            leadOutStarts?.Add(trk.SessionNumber, lastSector                               + 1);
+                        }
+
+                        foreach(KeyValuePair<int, long> leadOuts in leadOutStarts)
                         {
-                            if(track.Sequence <= 1)
+                            var lastTrackInSession = new Track();
+
+                            foreach(Track trk in Tracks.Where(trk => trk.Session  == leadOuts.Key).
+                                                        Where(trk => trk.Sequence > lastTrackInSession.Sequence))
+                                lastTrackInSession = trk;
+
+                            if(lastTrackInSession.Sequence  == 0 ||
+                               lastTrackInSession.EndSector == (ulong)leadOuts.Value - 1)
                                 continue;
 
-                            uint firstTrackNumberInSameSession = Tracks.
-                                                                 Where(t => t.Session == track.Session).
-                                                                 Min(t => t.Sequence);
-
-                            if(firstTrackNumberInSameSession != track.Sequence)
-                                continue;
-
-                            if(track.Pregap == 150)
-                                continue;
-
-                            long dif = (long)track.Pregap                       - 150;
-                            track.Pregap      = (ulong)((long)track.Pregap      - dif);
-                            track.StartSector = (ulong)((long)track.StartSector + dif);
-
-                            sessionPregapFixed = true;
+                            lastTrackInSession.EndSector = (ulong)leadOuts.Value - 1;
+                            leadOutFixed                 = true;
                         }
                     }
-
-                    if(leadOutFixed)
-                        AaruConsole.ErrorWriteLine("This image has a corrupted track list, convert will fix it.");
-
-                    if(sessionPregapFixed)
-                        AaruConsole.
-                            ErrorWriteLine("This image has a corrupted track list, a best effort has been tried but may require manual editing or redump.");
                 }
 
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                           GC.GetTotalMemory(false));
-
-                if(Tracks       == null ||
-                   Tracks.Count == 0)
+                if(_header.imageMajorVersion <= 1)
                 {
-                    Tracks = new List<Track>
+                    foreach(Track track in Tracks)
                     {
-                        new()
-                        {
-                            BytesPerSector    = (int)_imageInfo.SectorSize,
-                            EndSector         = _imageInfo.Sectors - 1,
-                            File              = imageFilter.Filename,
-                            FileType          = "BINARY",
-                            Filter            = imageFilter,
-                            RawBytesPerSector = (int)_imageInfo.SectorSize,
-                            Session           = 1,
-                            Sequence          = 1,
-                            Type              = TrackType.Data
-                        }
-                    };
-
-                    _trackFlags = new Dictionary<byte, byte>
-                    {
-                        {
-                            1, (byte)CdFlags.DataTrack
-                        }
-                    };
-
-                    _trackIsrcs = new Dictionary<byte, string>();
-                }
-
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                           GC.GetTotalMemory(false));
-
-                Sessions = new List<Session>();
-
-                for(int i = 1; i <= Tracks.Max(t => t.Session); i++)
-                    Sessions.Add(new Session
-                    {
-                        Sequence    = (ushort)i,
-                        StartTrack  = Tracks.Where(t => t.Session == i).Min(t => t.Sequence),
-                        EndTrack    = Tracks.Where(t => t.Session == i).Max(t => t.Sequence),
-                        StartSector = Tracks.Where(t => t.Session == i).Min(t => t.StartSector),
-                        EndSector   = Tracks.Where(t => t.Session == i).Max(t => t.EndSector)
-                    });
-
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                           GC.GetTotalMemory(false));
-
-                foreach(Track track in Tracks.OrderBy(t => t.StartSector))
-                {
-                    if(track.Sequence == 1)
-                    {
-                        track.Pregap     = 150;
-                        track.Indexes[0] = -150;
-                        track.Indexes[1] = (int)track.StartSector;
-
-                        continue;
-                    }
-
-                    if(track.Pregap > 0)
-                    {
-                        track.Indexes[0] = (int)track.StartSector;
-                        track.Indexes[1] = (int)(track.StartSector + track.Pregap);
-                    }
-                    else
-                        track.Indexes[1] = (int)track.StartSector;
-                }
-
-                ulong currentTrackOffset = 0;
-                Partitions = new List<Partition>();
-
-                foreach(Track track in Tracks.OrderBy(t => t.StartSector))
-                {
-                    Partitions.Add(new Partition
-                    {
-                        Sequence = track.Sequence,
-                        Type     = track.Type.ToString(),
-                        Name     = $"Track {track.Sequence}",
-                        Offset   = currentTrackOffset,
-                        Start    = (ulong)track.Indexes[1],
-                        Size     = (track.EndSector - (ulong)track.Indexes[1] + 1) * (ulong)track.BytesPerSector,
-                        Length   = track.EndSector - (ulong)track.Indexes[1] + 1,
-                        Scheme   = "Optical disc track"
-                    });
-
-                    currentTrackOffset += (track.EndSector - track.StartSector + 1) * (ulong)track.BytesPerSector;
-                }
-
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                           GC.GetTotalMemory(false));
-
-                Track[] tracks = Tracks.ToArray();
-
-                foreach(Track trk in tracks)
-                {
-                    ErrorNumber errno = ReadSector(trk.StartSector, out byte[] sector);
-
-                    if(errno != ErrorNumber.NoError)
-                        continue;
-
-                    trk.BytesPerSector = sector.Length;
-
-                    trk.RawBytesPerSector =
-                        (_sectorPrefix    != null && _sectorSuffix    != null) ||
-                        (_sectorPrefixDdt != null && _sectorSuffixDdt != null) ? 2352 : sector.Length;
-
-                    if(_sectorSubchannel == null)
-                        continue;
-
-                    trk.SubchannelFile   = trk.File;
-                    trk.SubchannelFilter = trk.Filter;
-                    trk.SubchannelType   = TrackSubchannelType.Raw;
-                }
-
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                           GC.GetTotalMemory(false));
-
-                Tracks = tracks.ToList();
-
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                           GC.GetTotalMemory(false));
-
-                if(compactDiscIndexes != null)
-                {
-                    foreach(CompactDiscIndexEntry compactDiscIndex in compactDiscIndexes.OrderBy(i => i.Track).
-                        ThenBy(i => i.Index))
-                    {
-                        Track track = Tracks.FirstOrDefault(t => t.Sequence == compactDiscIndex.Track);
-
-                        if(track is null)
+                        if(track.Sequence <= 1)
                             continue;
 
-                        track.Indexes[compactDiscIndex.Index] = compactDiscIndex.Lba;
+                        uint firstTrackNumberInSameSession = Tracks.
+                                                             Where(t => t.Session == track.Session).
+                                                             Min(t => t.Sequence);
+
+                        if(firstTrackNumberInSameSession != track.Sequence)
+                            continue;
+
+                        if(track.Pregap == 150)
+                            continue;
+
+                        long dif = (long)track.Pregap                       - 150;
+                        track.Pregap      = (ulong)((long)track.Pregap      - dif);
+                        track.StartSector = (ulong)((long)track.StartSector + dif);
+
+                        sessionPregapFixed = true;
                     }
                 }
-            }
-            else
-            {
-                Tracks     = null;
-                Sessions   = null;
-                Partitions = null;
+
+                if(leadOutFixed)
+                    AaruConsole.ErrorWriteLine("This image has a corrupted track list, convert will fix it.");
+
+                if(sessionPregapFixed)
+                    AaruConsole.
+                        ErrorWriteLine("This image has a corrupted track list, a best effort has been tried but may require manual editing or redump.");
             }
 
-            SetMetadataFromTags();
-
-            if(_sectorSuffixDdt != null)
-                EccInit();
-
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NoError;
-
-            if(_imageInfo.MediaType == MediaType.CD            ||
-               _imageInfo.MediaType == MediaType.CDDA          ||
-               _imageInfo.MediaType == MediaType.CDG           ||
-               _imageInfo.MediaType == MediaType.CDEG          ||
-               _imageInfo.MediaType == MediaType.CDI           ||
-               _imageInfo.MediaType == MediaType.CDROM         ||
-               _imageInfo.MediaType == MediaType.CDROMXA       ||
-               _imageInfo.MediaType == MediaType.CDPLUS        ||
-               _imageInfo.MediaType == MediaType.CDMO          ||
-               _imageInfo.MediaType == MediaType.CDR           ||
-               _imageInfo.MediaType == MediaType.CDRW          ||
-               _imageInfo.MediaType == MediaType.CDMRW         ||
-               _imageInfo.MediaType == MediaType.VCD           ||
-               _imageInfo.MediaType == MediaType.SVCD          ||
-               _imageInfo.MediaType == MediaType.PCD           ||
-               _imageInfo.MediaType == MediaType.DTSCD         ||
-               _imageInfo.MediaType == MediaType.CDMIDI        ||
-               _imageInfo.MediaType == MediaType.CDV           ||
-               _imageInfo.MediaType == MediaType.CDIREADY      ||
-               _imageInfo.MediaType == MediaType.FMTOWNS       ||
-               _imageInfo.MediaType == MediaType.PS1CD         ||
-               _imageInfo.MediaType == MediaType.PS2CD         ||
-               _imageInfo.MediaType == MediaType.MEGACD        ||
-               _imageInfo.MediaType == MediaType.SATURNCD      ||
-               _imageInfo.MediaType == MediaType.GDROM         ||
-               _imageInfo.MediaType == MediaType.GDR           ||
-               _imageInfo.MediaType == MediaType.MilCD         ||
-               _imageInfo.MediaType == MediaType.SuperCDROM2   ||
-               _imageInfo.MediaType == MediaType.JaguarCD      ||
-               _imageInfo.MediaType == MediaType.ThreeDO       ||
-               _imageInfo.MediaType == MediaType.PCFX          ||
-               _imageInfo.MediaType == MediaType.NeoGeoCD      ||
-               _imageInfo.MediaType == MediaType.CDTV          ||
-               _imageInfo.MediaType == MediaType.CD32          ||
-               _imageInfo.MediaType == MediaType.Playdia       ||
-               _imageInfo.MediaType == MediaType.Pippin        ||
-               _imageInfo.MediaType == MediaType.VideoNow      ||
-               _imageInfo.MediaType == MediaType.VideoNowColor ||
-               _imageInfo.MediaType == MediaType.VideoNowXp    ||
-               _imageInfo.MediaType == MediaType.CVD)
-                return ErrorNumber.NoError;
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                       GC.GetTotalMemory(false));
 
+            if(Tracks       == null ||
+               Tracks.Count == 0)
             {
-                foreach(Track track in Tracks)
+                Tracks = new List<Track>
                 {
-                    track.Pregap = 0;
-                    track.Indexes?.Clear();
+                    new()
+                    {
+                        BytesPerSector    = (int)_imageInfo.SectorSize,
+                        EndSector         = _imageInfo.Sectors - 1,
+                        File              = imageFilter.Filename,
+                        FileType          = "BINARY",
+                        Filter            = imageFilter,
+                        RawBytesPerSector = (int)_imageInfo.SectorSize,
+                        Session           = 1,
+                        Sequence          = 1,
+                        Type              = TrackType.Data
+                    }
+                };
+
+                _trackFlags = new Dictionary<byte, byte>
+                {
+                    {
+                        1, (byte)CdFlags.DataTrack
+                    }
+                };
+
+                _trackIsrcs = new Dictionary<byte, string>();
+            }
+
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                       GC.GetTotalMemory(false));
+
+            Sessions = new List<Session>();
+
+            for(int i = 1; i <= Tracks.Max(t => t.Session); i++)
+                Sessions.Add(new Session
+                {
+                    Sequence    = (ushort)i,
+                    StartTrack  = Tracks.Where(t => t.Session == i).Min(t => t.Sequence),
+                    EndTrack    = Tracks.Where(t => t.Session == i).Max(t => t.Sequence),
+                    StartSector = Tracks.Where(t => t.Session == i).Min(t => t.StartSector),
+                    EndSector   = Tracks.Where(t => t.Session == i).Max(t => t.EndSector)
+                });
+
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                       GC.GetTotalMemory(false));
+
+            foreach(Track track in Tracks.OrderBy(t => t.StartSector))
+            {
+                if(track.Sequence == 1)
+                {
+                    track.Pregap     = 150;
+                    track.Indexes[0] = -150;
+                    track.Indexes[1] = (int)track.StartSector;
+
+                    continue;
+                }
+
+                if(track.Pregap > 0)
+                {
+                    track.Indexes[0] = (int)track.StartSector;
+                    track.Indexes[1] = (int)(track.StartSector + track.Pregap);
+                }
+                else
+                    track.Indexes[1] = (int)track.StartSector;
+            }
+
+            ulong currentTrackOffset = 0;
+            Partitions = new List<Partition>();
+
+            foreach(Track track in Tracks.OrderBy(t => t.StartSector))
+            {
+                Partitions.Add(new Partition
+                {
+                    Sequence = track.Sequence,
+                    Type     = track.Type.ToString(),
+                    Name     = $"Track {track.Sequence}",
+                    Offset   = currentTrackOffset,
+                    Start    = (ulong)track.Indexes[1],
+                    Size     = (track.EndSector - (ulong)track.Indexes[1] + 1) * (ulong)track.BytesPerSector,
+                    Length   = track.EndSector - (ulong)track.Indexes[1] + 1,
+                    Scheme   = "Optical disc track"
+                });
+
+                currentTrackOffset += (track.EndSector - track.StartSector + 1) * (ulong)track.BytesPerSector;
+            }
+
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                       GC.GetTotalMemory(false));
+
+            Track[] tracks = Tracks.ToArray();
+
+            foreach(Track trk in tracks)
+            {
+                ErrorNumber errno = ReadSector(trk.StartSector, out byte[] sector);
+
+                if(errno != ErrorNumber.NoError)
+                    continue;
+
+                trk.BytesPerSector = sector.Length;
+
+                trk.RawBytesPerSector =
+                    (_sectorPrefix    != null && _sectorSuffix    != null) ||
+                    (_sectorPrefixDdt != null && _sectorSuffixDdt != null) ? 2352 : sector.Length;
+
+                if(_sectorSubchannel == null)
+                    continue;
+
+                trk.SubchannelFile   = trk.File;
+                trk.SubchannelFilter = trk.Filter;
+                trk.SubchannelType   = TrackSubchannelType.Raw;
+            }
+
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                       GC.GetTotalMemory(false));
+
+            Tracks = tracks.ToList();
+
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                       GC.GetTotalMemory(false));
+
+            if(compactDiscIndexes != null)
+            {
+                foreach(CompactDiscIndexEntry compactDiscIndex in compactDiscIndexes.OrderBy(i => i.Track).
+                            ThenBy(i => i.Index))
+                {
+                    Track track = Tracks.FirstOrDefault(t => t.Sequence == compactDiscIndex.Track);
+
+                    if(track is null)
+                        continue;
+
+                    track.Indexes[compactDiscIndex.Index] = compactDiscIndex.Lba;
                 }
             }
+        }
+        else
+        {
+            Tracks     = null;
+            Sessions   = null;
+            Partitions = null;
+        }
+
+        SetMetadataFromTags();
+
+        if(_sectorSuffixDdt != null)
+            EccInit();
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return ErrorNumber.NoError;
+
+        if(_imageInfo.MediaType == MediaType.CD            ||
+           _imageInfo.MediaType == MediaType.CDDA          ||
+           _imageInfo.MediaType == MediaType.CDG           ||
+           _imageInfo.MediaType == MediaType.CDEG          ||
+           _imageInfo.MediaType == MediaType.CDI           ||
+           _imageInfo.MediaType == MediaType.CDROM         ||
+           _imageInfo.MediaType == MediaType.CDROMXA       ||
+           _imageInfo.MediaType == MediaType.CDPLUS        ||
+           _imageInfo.MediaType == MediaType.CDMO          ||
+           _imageInfo.MediaType == MediaType.CDR           ||
+           _imageInfo.MediaType == MediaType.CDRW          ||
+           _imageInfo.MediaType == MediaType.CDMRW         ||
+           _imageInfo.MediaType == MediaType.VCD           ||
+           _imageInfo.MediaType == MediaType.SVCD          ||
+           _imageInfo.MediaType == MediaType.PCD           ||
+           _imageInfo.MediaType == MediaType.DTSCD         ||
+           _imageInfo.MediaType == MediaType.CDMIDI        ||
+           _imageInfo.MediaType == MediaType.CDV           ||
+           _imageInfo.MediaType == MediaType.CDIREADY      ||
+           _imageInfo.MediaType == MediaType.FMTOWNS       ||
+           _imageInfo.MediaType == MediaType.PS1CD         ||
+           _imageInfo.MediaType == MediaType.PS2CD         ||
+           _imageInfo.MediaType == MediaType.MEGACD        ||
+           _imageInfo.MediaType == MediaType.SATURNCD      ||
+           _imageInfo.MediaType == MediaType.GDROM         ||
+           _imageInfo.MediaType == MediaType.GDR           ||
+           _imageInfo.MediaType == MediaType.MilCD         ||
+           _imageInfo.MediaType == MediaType.SuperCDROM2   ||
+           _imageInfo.MediaType == MediaType.JaguarCD      ||
+           _imageInfo.MediaType == MediaType.ThreeDO       ||
+           _imageInfo.MediaType == MediaType.PCFX          ||
+           _imageInfo.MediaType == MediaType.NeoGeoCD      ||
+           _imageInfo.MediaType == MediaType.CDTV          ||
+           _imageInfo.MediaType == MediaType.CD32          ||
+           _imageInfo.MediaType == MediaType.Playdia       ||
+           _imageInfo.MediaType == MediaType.Pippin        ||
+           _imageInfo.MediaType == MediaType.VideoNow      ||
+           _imageInfo.MediaType == MediaType.VideoNowColor ||
+           _imageInfo.MediaType == MediaType.VideoNowXp    ||
+           _imageInfo.MediaType == MediaType.CVD)
+            return ErrorNumber.NoError;
+
+        {
+            foreach(Track track in Tracks)
+            {
+                track.Pregap = 0;
+                track.Indexes?.Clear();
+            }
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        return _mediaTags.TryGetValue(tag, out buffer) ? ErrorNumber.NoError : ErrorNumber.NoData;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        ulong ddtEntry    = GetDdtEntry(sectorAddress);
+        uint  offsetMask  = (uint)((1 << _shift) - 1);
+        ulong offset      = ddtEntry & offsetMask;
+        ulong blockOffset = ddtEntry >> _shift;
+
+        // Partially written image... as we can't know the real sector size just assume it's common :/
+        if(ddtEntry == 0)
+        {
+            buffer = new byte[_imageInfo.SectorSize];
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+        // Check if block is cached
+        if(_blockCache.TryGetValue(blockOffset, out byte[] block) &&
+           _blockHeaderCache.TryGetValue(blockOffset, out BlockHeader blockHeader))
         {
-            buffer = null;
-
-            return _mediaTags.TryGetValue(tag, out buffer) ? ErrorNumber.NoError : ErrorNumber.NoData;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            ulong ddtEntry    = GetDdtEntry(sectorAddress);
-            uint  offsetMask  = (uint)((1 << _shift) - 1);
-            ulong offset      = ddtEntry & offsetMask;
-            ulong blockOffset = ddtEntry >> _shift;
-
-            // Partially written image... as we can't know the real sector size just assume it's common :/
-            if(ddtEntry == 0)
-            {
-                buffer = new byte[_imageInfo.SectorSize];
-
-                return ErrorNumber.NoError;
-            }
-
-            // Check if block is cached
-            if(_blockCache.TryGetValue(blockOffset, out byte[] block) &&
-               _blockHeaderCache.TryGetValue(blockOffset, out BlockHeader blockHeader))
-            {
-                buffer = new byte[blockHeader.sectorSize];
-                Array.Copy(block, (long)(offset * blockHeader.sectorSize), buffer, 0, blockHeader.sectorSize);
-
-                return ErrorNumber.NoError;
-            }
-
-            // Read block header
-            _imageStream.Position = (long)blockOffset;
-            _structureBytes       = new byte[Marshal.SizeOf<BlockHeader>()];
-            _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-            blockHeader = Marshal.SpanToStructureLittleEndian<BlockHeader>(_structureBytes);
-
-            // Decompress block
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
-
-            ulong decompressedLength;
-
-            switch(blockHeader.compression)
-            {
-                case CompressionType.None:
-                    block = new byte[blockHeader.length];
-                    _imageStream.Read(block, 0, (int)blockHeader.length);
-
-                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                               GC.GetTotalMemory(false));
-
-                    break;
-                case CompressionType.Lzma:
-                    byte[] compressedBlock = new byte[blockHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
-                    byte[] lzmaProperties  = new byte[LZMA_PROPERTIES_LENGTH];
-                    _imageStream.Read(lzmaProperties, 0, LZMA_PROPERTIES_LENGTH);
-                    _imageStream.Read(compressedBlock, 0, compressedBlock.Length);
-                    block              = new byte[blockHeader.length];
-                    decompressedLength = (ulong)LZMA.DecodeBuffer(compressedBlock, block, lzmaProperties);
-
-                    if(decompressedLength != blockHeader.length)
-                    {
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                   "Error decompressing block, should be {0} bytes but got {1} bytes.",
-                                                   blockHeader.length, decompressedLength);
-
-                        return ErrorNumber.InOutError;
-                    }
-
-                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                               GC.GetTotalMemory(false));
-
-                    break;
-                case CompressionType.Flac:
-                    byte[] flacBlock = new byte[blockHeader.cmpLength];
-                    _imageStream.Read(flacBlock, 0, flacBlock.Length);
-                    block              = new byte[blockHeader.length];
-                    decompressedLength = (ulong)FLAC.DecodeBuffer(flacBlock, block);
-
-                    if(decompressedLength != blockHeader.length)
-                    {
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                   "Error decompressing block, should be {0} bytes but got {1} bytes.",
-                                                   blockHeader.length, decompressedLength);
-
-                        return ErrorNumber.InOutError;
-                    }
-
-                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
-                                               GC.GetTotalMemory(false));
-
-                    break;
-                default: return ErrorNumber.NotSupported;
-            }
-
-            // Check if cache needs to be emptied
-            if(_currentCacheSize + blockHeader.length >= MAX_CACHE_SIZE)
-            {
-                _currentCacheSize = 0;
-                _blockHeaderCache = new Dictionary<ulong, BlockHeader>();
-                _blockCache       = new Dictionary<ulong, byte[]>();
-            }
-
-            // Add block to cache
-            _currentCacheSize += blockHeader.length;
-            _blockHeaderCache.Add(blockOffset, blockHeader);
-            _blockCache.Add(blockOffset, block);
-
             buffer = new byte[blockHeader.sectorSize];
             Array.Copy(block, (long)(offset * blockHeader.sectorSize), buffer, 0, blockHeader.sectorSize);
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
-
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+        // Read block header
+        _imageStream.Position = (long)blockOffset;
+        _structureBytes       = new byte[Marshal.SizeOf<BlockHeader>()];
+        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+        blockHeader = Marshal.SpanToStructureLittleEndian<BlockHeader>(_structureBytes);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer)
+        // Decompress block
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+
+        ulong decompressedLength;
+
+        switch(blockHeader.compression)
         {
-            buffer = null;
+            case CompressionType.None:
+                block = new byte[blockHeader.length];
+                _imageStream.Read(block, 0, (int)blockHeader.length);
 
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NotSupported;
+                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                           GC.GetTotalMemory(false));
 
-            Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
+                break;
+            case CompressionType.Lzma:
+                byte[] compressedBlock = new byte[blockHeader.cmpLength - LZMA_PROPERTIES_LENGTH];
+                byte[] lzmaProperties  = new byte[LZMA_PROPERTIES_LENGTH];
+                _imageStream.Read(lzmaProperties, 0, LZMA_PROPERTIES_LENGTH);
+                _imageStream.Read(compressedBlock, 0, compressedBlock.Length);
+                block              = new byte[blockHeader.length];
+                decompressedLength = (ulong)LZMA.DecodeBuffer(compressedBlock, block, lzmaProperties);
 
-            return trk?.Sequence != track ? ErrorNumber.SectorNotFound
-                       : ReadSector(trk.StartSector + sectorAddress, out buffer);
+                if(decompressedLength != blockHeader.length)
+                {
+                    AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                               "Error decompressing block, should be {0} bytes but got {1} bytes.",
+                                               blockHeader.length, decompressedLength);
+
+                    return ErrorNumber.InOutError;
+                }
+
+                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                           GC.GetTotalMemory(false));
+
+                break;
+            case CompressionType.Flac:
+                byte[] flacBlock = new byte[blockHeader.cmpLength];
+                _imageStream.Read(flacBlock, 0, flacBlock.Length);
+                block              = new byte[blockHeader.length];
+                decompressedLength = (ulong)FLAC.DecodeBuffer(flacBlock, block);
+
+                if(decompressedLength != blockHeader.length)
+                {
+                    AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                               "Error decompressing block, should be {0} bytes but got {1} bytes.",
+                                               blockHeader.length, decompressedLength);
+
+                    return ErrorNumber.InOutError;
+                }
+
+                AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes",
+                                           GC.GetTotalMemory(false));
+
+                break;
+            default: return ErrorNumber.NotSupported;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer)
+        // Check if cache needs to be emptied
+        if(_currentCacheSize + blockHeader.length >= MAX_CACHE_SIZE)
         {
-            buffer = null;
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NotSupported;
-
-            Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
-
-            return trk?.Sequence != track ? ErrorNumber.SectorNotFound
-                       : ReadSectorTag(trk.StartSector + sectorAddress, tag, out buffer);
+            _currentCacheSize = 0;
+            _blockHeaderCache = new Dictionary<ulong, BlockHeader>();
+            _blockCache       = new Dictionary<ulong, byte[]>();
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        // Add block to cache
+        _currentCacheSize += blockHeader.length;
+        _blockHeaderCache.Add(blockOffset, blockHeader);
+        _blockCache.Add(blockOffset, block);
+
+        buffer = new byte[blockHeader.sectorSize];
+        Array.Copy(block, (long)(offset * blockHeader.sectorSize), buffer, 0, blockHeader.sectorSize);
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Memory snapshot: {0} bytes", GC.GetTotalMemory(false));
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return ErrorNumber.NotSupported;
+
+        Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
+
+        return trk?.Sequence != track ? ErrorNumber.SectorNotFound
+                   : ReadSector(trk.StartSector + sectorAddress, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return ErrorNumber.NotSupported;
+
+        Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
+
+        return trk?.Sequence != track ? ErrorNumber.SectorNotFound
+                   : ReadSectorTag(trk.StartSector + sectorAddress, tag, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+            ms.Write(sector, 0, sector.Length);
+        }
 
-            var ms = new MemoryStream();
+        buffer = ms.ToArray();
 
-            for(uint i = 0; i < length; i++)
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        uint   sectorOffset;
+        uint   sectorSize;
+        uint   sectorSkip;
+        byte[] dataSource;
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType == XmlMediaType.OpticalDisc)
+        {
+            Track trk = Tracks.FirstOrDefault(t => sectorAddress >= t.StartSector && sectorAddress <= t.EndSector);
+
+            if(trk is null)
+                return ErrorNumber.SectorNotFound;
+
+            if(trk.Sequence    == 0 &&
+               trk.StartSector == 0 &&
+               trk.EndSector   == 0)
+                return ErrorNumber.SectorNotFound;
+
+            if(trk.Type == TrackType.Data)
+                return ErrorNumber.NotSupported;
+
+            switch(tag)
             {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+                case SectorTagType.CdSectorEcc:
+                case SectorTagType.CdSectorEccP:
+                case SectorTagType.CdSectorEccQ:
+                case SectorTagType.CdSectorEdc:
+                case SectorTagType.CdSectorHeader:
+                case SectorTagType.CdSectorSubchannel:
+                case SectorTagType.CdSectorSubHeader:
+                case SectorTagType.CdSectorSync:
+                case SectorTagType.DvdCmi:
+                case SectorTagType.DvdTitleKey:
+                case SectorTagType.DvdTitleKeyDecrypted: break;
+                case SectorTagType.CdTrackFlags:
+                    if(!_trackFlags.TryGetValue((byte)sectorAddress, out byte flags))
+                        return ErrorNumber.NoData;
 
-                if(errno != ErrorNumber.NoError)
-                    return errno;
+                    buffer = new[]
+                    {
+                        flags
+                    };
 
-                ms.Write(sector, 0, sector.Length);
+                    return ErrorNumber.NoError;
+                case SectorTagType.CdTrackIsrc:
+                    if(!_trackIsrcs.TryGetValue((byte)sectorAddress, out string isrc))
+                        return ErrorNumber.NoData;
+
+                    buffer = Encoding.UTF8.GetBytes(isrc);
+
+                    return ErrorNumber.NoError;
+                default: return ErrorNumber.NotSupported;
             }
 
-            buffer = ms.ToArray();
+            switch(trk.Type)
+            {
+                case TrackType.CdMode1:
+                    switch(tag)
+                    {
+                        case SectorTagType.CdSectorSync:
+                        {
+                            sectorOffset = 0;
+                            sectorSize   = 12;
+                            sectorSkip   = 4;
+                            dataSource   = _sectorPrefix;
+
+                            break;
+                        }
+
+                        case SectorTagType.CdSectorHeader:
+                        {
+                            sectorOffset = 12;
+                            sectorSize   = 4;
+                            sectorSkip   = 2336;
+                            dataSource   = _sectorPrefix;
+
+                            break;
+                        }
+
+                        case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                        case SectorTagType.CdSectorEcc:
+                        {
+                            sectorOffset = 12;
+                            sectorSize   = 276;
+                            sectorSkip   = 0;
+                            dataSource   = _sectorSuffix;
+
+                            break;
+                        }
+
+                        case SectorTagType.CdSectorEccP:
+                        {
+                            sectorOffset = 12;
+                            sectorSize   = 172;
+                            sectorSkip   = 104;
+                            dataSource   = _sectorSuffix;
+
+                            break;
+                        }
+
+                        case SectorTagType.CdSectorEccQ:
+                        {
+                            sectorOffset = 184;
+                            sectorSize   = 104;
+                            sectorSkip   = 0;
+                            dataSource   = _sectorSuffix;
+
+                            break;
+                        }
+
+                        case SectorTagType.CdSectorEdc:
+                        {
+                            sectorOffset = 0;
+                            sectorSize   = 4;
+                            sectorSkip   = 284;
+                            dataSource   = _sectorSuffix;
+
+                            break;
+                        }
+
+                        case SectorTagType.CdSectorSubchannel:
+                        {
+                            sectorOffset = 0;
+                            sectorSize   = 96;
+                            sectorSkip   = 0;
+                            dataSource   = _sectorSubchannel;
+
+                            break;
+                        }
+
+                        default: return ErrorNumber.NotSupported;
+                    }
+
+                    break;
+                case TrackType.CdMode2Formless:
+                case TrackType.CdMode2Form1:
+                case TrackType.CdMode2Form2:
+                {
+                    switch(tag)
+                    {
+                        case SectorTagType.CdSectorSync:
+                        {
+                            sectorOffset = 0;
+                            sectorSize   = 12;
+                            sectorSkip   = 4;
+                            dataSource   = _sectorPrefix;
+
+                            break;
+                        }
+
+                        case SectorTagType.CdSectorHeader:
+                        {
+                            sectorOffset = 12;
+                            sectorSize   = 4;
+                            sectorSkip   = 0;
+                            dataSource   = _sectorPrefix;
+
+                            break;
+                        }
+
+                        case SectorTagType.CdSectorSubHeader:
+                        {
+                            sectorOffset = 0;
+                            sectorSize   = 8;
+                            sectorSkip   = 0;
+                            dataSource   = _mode2Subheaders;
+
+                            break;
+                        }
+
+                        // These could be implemented
+                        case SectorTagType.CdSectorEcc:
+                        case SectorTagType.CdSectorEccP:
+                        case SectorTagType.CdSectorEccQ:
+                        case SectorTagType.CdSectorEdc: return ErrorNumber.NotSupported;
+                        case SectorTagType.CdSectorSubchannel:
+                        {
+                            sectorOffset = 0;
+                            sectorSize   = 96;
+                            sectorSkip   = 0;
+                            dataSource   = _sectorSubchannel;
+
+                            break;
+                        }
+
+                        default: return ErrorNumber.NotSupported;
+                    }
+
+                    break;
+                }
+
+                case TrackType.Audio:
+                {
+                    switch(tag)
+                    {
+                        case SectorTagType.CdSectorSubchannel:
+                        {
+                            sectorOffset = 0;
+                            sectorSize   = 96;
+                            sectorSkip   = 0;
+                            dataSource   = _sectorSubchannel;
+
+                            break;
+                        }
+
+                        default: return ErrorNumber.NotSupported;
+                    }
+
+                    break;
+                }
+
+                case TrackType.Data:
+                {
+                    if(_imageInfo.MediaType == MediaType.DVDROM)
+                    {
+                        switch(tag)
+                        {
+                            case SectorTagType.DvdCmi:
+                            {
+                                sectorOffset = 0;
+                                sectorSize   = 1;
+                                sectorSkip   = 5;
+                                dataSource   = _sectorCpiMai;
+
+                                break;
+                            }
+                            case SectorTagType.DvdTitleKey:
+                            {
+                                sectorOffset = 1;
+                                sectorSize   = 5;
+                                sectorSkip   = 0;
+                                dataSource   = _sectorCpiMai;
+
+                                break;
+                            }
+                            case SectorTagType.DvdTitleKeyDecrypted:
+                            {
+                                sectorOffset = 0;
+                                sectorSize   = 5;
+                                sectorSkip   = 0;
+                                dataSource   = _sectorDecryptedTitleKey;
+
+                                break;
+                            }
+                            default: return ErrorNumber.NotSupported;
+                        }
+                    }
+                    else
+                        return ErrorNumber.NotSupported;
+
+                    break;
+                }
+
+                default: return ErrorNumber.NotSupported;
+            }
+        }
+        else
+            return ErrorNumber.NoData;
+
+        if(dataSource == null)
+            return ErrorNumber.NotSupported;
+
+        buffer = new byte[sectorSize * length];
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+        {
+            Array.Copy(dataSource, (long)(sectorAddress * sectorSize), buffer, 0, length * sectorSize);
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            uint   sectorOffset;
-            uint   sectorSize;
-            uint   sectorSkip;
-            byte[] dataSource;
-            buffer = null;
+        for(int i = 0; i < length; i++)
+            Array.Copy(dataSource, (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), buffer,
+                       i * sectorSize, sectorSize);
 
-            if(_imageInfo.XmlMediaType == XmlMediaType.OpticalDisc)
-            {
-                Track trk = Tracks.FirstOrDefault(t => sectorAddress >= t.StartSector && sectorAddress <= t.EndSector);
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return ErrorNumber.NotSupported;
+
+        Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
+
+        if(trk?.Sequence != track)
+            return ErrorNumber.SectorNotFound;
+
+        return trk.StartSector + sectorAddress + length > trk.EndSector + 1 ? ErrorNumber.OutOfRange
+                   : ReadSectors(trk.StartSector + sectorAddress, length, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return ErrorNumber.NotSupported;
+
+        Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
+
+        return trk?.Sequence != track
+                   ? ErrorNumber.SectorNotFound
+                   : trk.StartSector + sectorAddress + length > trk.EndSector + 1
+                       ? ErrorNumber.OutOfRange
+                       : ReadSectorsTag(trk.StartSector + sectorAddress, length, tag, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        ErrorNumber errno;
+        buffer = null;
+
+        switch(_imageInfo.XmlMediaType)
+        {
+            case XmlMediaType.OpticalDisc:
+                Track trk = Tracks.FirstOrDefault(t => sectorAddress >= t.StartSector &&
+                                                       sectorAddress <= t.EndSector);
 
                 if(trk is null)
                     return ErrorNumber.SectorNotFound;
@@ -1714,729 +2030,412 @@ namespace Aaru.DiscImages
                    trk.EndSector   == 0)
                     return ErrorNumber.SectorNotFound;
 
-                if(trk.Type == TrackType.Data)
-                    return ErrorNumber.NotSupported;
+                if((_sectorSuffix    == null || _sectorPrefix    == null) &&
+                   (_sectorSuffixDdt == null || _sectorPrefixDdt == null))
+                    return ReadSector(sectorAddress, out buffer);
 
-                switch(tag)
-                {
-                    case SectorTagType.CdSectorEcc:
-                    case SectorTagType.CdSectorEccP:
-                    case SectorTagType.CdSectorEccQ:
-                    case SectorTagType.CdSectorEdc:
-                    case SectorTagType.CdSectorHeader:
-                    case SectorTagType.CdSectorSubchannel:
-                    case SectorTagType.CdSectorSubHeader:
-                    case SectorTagType.CdSectorSync:
-                    case SectorTagType.DvdCmi:
-                    case SectorTagType.DvdTitleKey:
-                    case SectorTagType.DvdTitleKeyDecrypted: break;
-                    case SectorTagType.CdTrackFlags:
-                        if(!_trackFlags.TryGetValue((byte)sectorAddress, out byte flags))
-                            return ErrorNumber.NoData;
+                buffer = new byte[2352];
+                errno  = ReadSector(sectorAddress, out byte[] data);
 
-                        buffer = new[]
-                        {
-                            flags
-                        };
-
-                        return ErrorNumber.NoError;
-                    case SectorTagType.CdTrackIsrc:
-                        if(!_trackIsrcs.TryGetValue((byte)sectorAddress, out string isrc))
-                            return ErrorNumber.NoData;
-
-                        buffer = Encoding.UTF8.GetBytes(isrc);
-
-                        return ErrorNumber.NoError;
-                    default: return ErrorNumber.NotSupported;
-                }
+                if(errno != ErrorNumber.NoError)
+                    return errno;
 
                 switch(trk.Type)
                 {
-                    case TrackType.CdMode1:
-                        switch(tag)
-                        {
-                            case SectorTagType.CdSectorSync:
-                            {
-                                sectorOffset = 0;
-                                sectorSize   = 12;
-                                sectorSkip   = 4;
-                                dataSource   = _sectorPrefix;
-
-                                break;
-                            }
-
-                            case SectorTagType.CdSectorHeader:
-                            {
-                                sectorOffset = 12;
-                                sectorSize   = 4;
-                                sectorSkip   = 2336;
-                                dataSource   = _sectorPrefix;
-
-                                break;
-                            }
-
-                            case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                            case SectorTagType.CdSectorEcc:
-                            {
-                                sectorOffset = 12;
-                                sectorSize   = 276;
-                                sectorSkip   = 0;
-                                dataSource   = _sectorSuffix;
-
-                                break;
-                            }
-
-                            case SectorTagType.CdSectorEccP:
-                            {
-                                sectorOffset = 12;
-                                sectorSize   = 172;
-                                sectorSkip   = 104;
-                                dataSource   = _sectorSuffix;
-
-                                break;
-                            }
-
-                            case SectorTagType.CdSectorEccQ:
-                            {
-                                sectorOffset = 184;
-                                sectorSize   = 104;
-                                sectorSkip   = 0;
-                                dataSource   = _sectorSuffix;
-
-                                break;
-                            }
-
-                            case SectorTagType.CdSectorEdc:
-                            {
-                                sectorOffset = 0;
-                                sectorSize   = 4;
-                                sectorSkip   = 284;
-                                dataSource   = _sectorSuffix;
-
-                                break;
-                            }
-
-                            case SectorTagType.CdSectorSubchannel:
-                            {
-                                sectorOffset = 0;
-                                sectorSize   = 96;
-                                sectorSkip   = 0;
-                                dataSource   = _sectorSubchannel;
-
-                                break;
-                            }
-
-                            default: return ErrorNumber.NotSupported;
-                        }
-
-                        break;
-                    case TrackType.CdMode2Formless:
-                    case TrackType.CdMode2Form1:
-                    case TrackType.CdMode2Form2:
-                    {
-                        switch(tag)
-                        {
-                            case SectorTagType.CdSectorSync:
-                            {
-                                sectorOffset = 0;
-                                sectorSize   = 12;
-                                sectorSkip   = 4;
-                                dataSource   = _sectorPrefix;
-
-                                break;
-                            }
-
-                            case SectorTagType.CdSectorHeader:
-                            {
-                                sectorOffset = 12;
-                                sectorSize   = 4;
-                                sectorSkip   = 0;
-                                dataSource   = _sectorPrefix;
-
-                                break;
-                            }
-
-                            case SectorTagType.CdSectorSubHeader:
-                            {
-                                sectorOffset = 0;
-                                sectorSize   = 8;
-                                sectorSkip   = 0;
-                                dataSource   = _mode2Subheaders;
-
-                                break;
-                            }
-
-                            // These could be implemented
-                            case SectorTagType.CdSectorEcc:
-                            case SectorTagType.CdSectorEccP:
-                            case SectorTagType.CdSectorEccQ:
-                            case SectorTagType.CdSectorEdc: return ErrorNumber.NotSupported;
-                            case SectorTagType.CdSectorSubchannel:
-                            {
-                                sectorOffset = 0;
-                                sectorSize   = 96;
-                                sectorSkip   = 0;
-                                dataSource   = _sectorSubchannel;
-
-                                break;
-                            }
-
-                            default: return ErrorNumber.NotSupported;
-                        }
-
-                        break;
-                    }
-
                     case TrackType.Audio:
-                    {
-                        switch(tag)
-                        {
-                            case SectorTagType.CdSectorSubchannel:
-                            {
-                                sectorOffset = 0;
-                                sectorSize   = 96;
-                                sectorSkip   = 0;
-                                dataSource   = _sectorSubchannel;
-
-                                break;
-                            }
-
-                            default: return ErrorNumber.NotSupported;
-                        }
-
-                        break;
-                    }
-
                     case TrackType.Data:
-                    {
-                        if(_imageInfo.MediaType == MediaType.DVDROM)
+                        buffer = data;
+
+                        return ErrorNumber.NoError;
+                    case TrackType.CdMode1:
+                        Array.Copy(data, 0, buffer, 16, 2048);
+
+                        if(_sectorPrefix != null)
+                            Array.Copy(_sectorPrefix, (int)sectorAddress * 16, buffer, 0, 16);
+                        else if(_sectorPrefixDdt != null)
                         {
-                            switch(tag)
+                            if((_sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Correct)
+                                ReconstructPrefix(ref buffer, trk.Type, (long)sectorAddress);
+                            else if((_sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) ==
+                                    (uint)CdFixFlags.NotDumped ||
+                                    _sectorPrefixDdt[sectorAddress] == 0)
                             {
-                                case SectorTagType.DvdCmi:
-                                {
-                                    sectorOffset = 0;
-                                    sectorSize   = 1;
-                                    sectorSkip   = 5;
-                                    dataSource   = _sectorCpiMai;
+                                // Do nothing
+                            }
+                            else
+                            {
+                                uint prefixPosition = ((_sectorPrefixDdt[sectorAddress] & CD_DFIX_MASK) - 1) * 16;
 
-                                    break;
-                                }
-                                case SectorTagType.DvdTitleKey:
-                                {
-                                    sectorOffset = 1;
-                                    sectorSize   = 5;
-                                    sectorSkip   = 0;
-                                    dataSource   = _sectorCpiMai;
+                                if(prefixPosition > _sectorPrefixMs.Length)
+                                    return ErrorNumber.InvalidArgument;
 
-                                    break;
-                                }
-                                case SectorTagType.DvdTitleKeyDecrypted:
-                                {
-                                    sectorOffset = 0;
-                                    sectorSize   = 5;
-                                    sectorSkip   = 0;
-                                    dataSource   = _sectorDecryptedTitleKey;
+                                _sectorPrefixMs.Position = prefixPosition;
 
-                                    break;
-                                }
-                                default: return ErrorNumber.NotSupported;
+                                _sectorPrefixMs.Read(buffer, 0, 16);
                             }
                         }
                         else
-                            return ErrorNumber.NotSupported;
+                            return ErrorNumber.InvalidArgument;
 
-                        break;
-                    }
+                        if(_sectorSuffix != null)
+                            Array.Copy(_sectorSuffix, (int)sectorAddress * 288, buffer, 2064, 288);
+                        else if(_sectorSuffixDdt != null)
+                        {
+                            if((_sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Correct)
+                                ReconstructEcc(ref buffer, trk.Type);
+                            else if((_sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) ==
+                                    (uint)CdFixFlags.NotDumped ||
+                                    _sectorSuffixDdt[sectorAddress] == 0)
+                            {
+                                // Do nothing
+                            }
+                            else
+                            {
+                                uint suffixPosition = ((_sectorSuffixDdt[sectorAddress] & CD_DFIX_MASK) - 1) * 288;
 
-                    default: return ErrorNumber.NotSupported;
+                                if(suffixPosition > _sectorSuffixMs.Length)
+                                    return ErrorNumber.InvalidArgument;
+
+                                _sectorSuffixMs.Position = suffixPosition;
+
+                                _sectorSuffixMs.Read(buffer, 2064, 288);
+                            }
+                        }
+                        else
+                            return ErrorNumber.InvalidArgument;
+
+                        return ErrorNumber.NoError;
+                    case TrackType.CdMode2Formless:
+                    case TrackType.CdMode2Form1:
+                    case TrackType.CdMode2Form2:
+                        if(_sectorPrefix != null)
+                            Array.Copy(_sectorPrefix, (int)sectorAddress * 16, buffer, 0, 16);
+                        else if(_sectorPrefixMs != null)
+                        {
+                            if((_sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Correct)
+                                ReconstructPrefix(ref buffer, trk.Type, (long)sectorAddress);
+                            else if((_sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) ==
+                                    (uint)CdFixFlags.NotDumped ||
+                                    _sectorPrefixDdt[sectorAddress] == 0)
+                            {
+                                // Do nothing
+                            }
+                            else
+                            {
+                                uint prefixPosition = ((_sectorPrefixDdt[sectorAddress] & CD_DFIX_MASK) - 1) * 16;
+
+                                if(prefixPosition > _sectorPrefixMs.Length)
+                                    return ErrorNumber.InvalidArgument;
+
+                                _sectorPrefixMs.Position = prefixPosition;
+
+                                _sectorPrefixMs.Read(buffer, 0, 16);
+                            }
+                        }
+                        else
+                            return ErrorNumber.InvalidArgument;
+
+                        if(_mode2Subheaders != null &&
+                           _sectorSuffixDdt != null)
+                        {
+                            Array.Copy(_mode2Subheaders, (int)sectorAddress * 8, buffer, 16, 8);
+
+                            switch(_sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK)
+                            {
+                                case (uint)CdFixFlags.Mode2Form1Ok:
+                                    Array.Copy(data, 0, buffer, 24, 2048);
+                                    ReconstructEcc(ref buffer, TrackType.CdMode2Form1);
+
+                                    break;
+                                case (uint)CdFixFlags.Mode2Form2Ok:
+                                case (uint)CdFixFlags.Mode2Form2NoCrc:
+                                {
+                                    Array.Copy(data, 0, buffer, 24, 2324);
+
+                                    if((_sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) ==
+                                       (uint)CdFixFlags.Mode2Form2Ok)
+                                        ReconstructEcc(ref buffer, TrackType.CdMode2Form2);
+
+                                    break;
+                                }
+                                default:
+                                {
+                                    if((_sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) ==
+                                       (uint)CdFixFlags.NotDumped ||
+                                       _sectorSuffixDdt[sectorAddress] == 0)
+                                    {
+                                        // Do nothing
+                                    }
+                                    else // Mode 2 where EDC failed
+                                    {
+                                        // Incorrectly written images
+                                        if(data.Length == 2328)
+                                        {
+                                            Array.Copy(data, 0, buffer, 24, 2328);
+                                        }
+                                        else
+                                        {
+                                            bool form2 = (buffer[18] & 0x20) == 0x20 || (buffer[22] & 0x20) == 0x20;
+
+                                            uint suffixPosition =
+                                                ((_sectorSuffixDdt[sectorAddress] & CD_DFIX_MASK) - 1) * 288;
+
+                                            if(suffixPosition > _sectorSuffixMs.Length)
+                                                return ErrorNumber.InvalidArgument;
+
+                                            _sectorSuffixMs.Position = suffixPosition;
+
+                                            _sectorSuffixMs.Read(buffer, form2 ? 2348 : 2072, form2 ? 4 : 280);
+                                            Array.Copy(data, 0, buffer, 24, form2 ? 2324 : 2048);
+                                        }
+                                    }
+
+                                    break;
+                                }
+                            }
+                        }
+                        else if(_mode2Subheaders != null)
+                        {
+                            Array.Copy(_mode2Subheaders, (int)sectorAddress * 8, buffer, 16, 8);
+                            Array.Copy(data, 0, buffer, 24, 2328);
+                        }
+                        else
+                            Array.Copy(data, 0, buffer, 16, 2336);
+
+                        return ErrorNumber.NoError;
                 }
-            }
-            else
-                return ErrorNumber.NoData;
 
-            if(dataSource == null)
-                return ErrorNumber.NotSupported;
+                break;
+            case XmlMediaType.BlockMedia:
+                switch(_imageInfo.MediaType)
+                {
+                    case MediaType.AppleFileWare:
+                    case MediaType.AppleProfile:
+                    case MediaType.AppleSonySS:
+                    case MediaType.AppleSonyDS:
+                    case MediaType.AppleWidget:
+                    case MediaType.PriamDataTower: return ReadSectorsLong(sectorAddress, 1, out buffer);
+                }
 
-            buffer = new byte[sectorSize * length];
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-            {
-                Array.Copy(dataSource, (long)(sectorAddress * sectorSize), buffer, 0, length * sectorSize);
-
-                return ErrorNumber.NoError;
-            }
-
-            for(int i = 0; i < length; i++)
-                Array.Copy(dataSource, (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), buffer,
-                           i * sectorSize, sectorSize);
-
-            return ErrorNumber.NoError;
+                break;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
+        return ErrorNumber.NotSupported;
+    }
 
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NotSupported;
-
-            Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
-
-            if(trk?.Sequence != track)
-                return ErrorNumber.SectorNotFound;
-
-            return trk.StartSector + sectorAddress + length > trk.EndSector + 1 ? ErrorNumber.OutOfRange
-                       : ReadSectors(trk.StartSector + sectorAddress, length, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NotSupported;
-
-            Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
-
-            return trk?.Sequence != track
-                       ? ErrorNumber.SectorNotFound
-                       : trk.StartSector + sectorAddress + length > trk.EndSector + 1
-                           ? ErrorNumber.OutOfRange
-                           : ReadSectorsTag(trk.StartSector + sectorAddress, length, tag, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            ErrorNumber errno;
-            buffer = null;
-
-            switch(_imageInfo.XmlMediaType)
-            {
-                case XmlMediaType.OpticalDisc:
-                    Track trk = Tracks.FirstOrDefault(t => sectorAddress >= t.StartSector &&
-                                                           sectorAddress <= t.EndSector);
-
-                    if(trk is null)
-                        return ErrorNumber.SectorNotFound;
-
-                    if(trk.Sequence    == 0 &&
-                       trk.StartSector == 0 &&
-                       trk.EndSector   == 0)
-                        return ErrorNumber.SectorNotFound;
-
-                    if((_sectorSuffix    == null || _sectorPrefix    == null) &&
-                       (_sectorSuffixDdt == null || _sectorPrefixDdt == null))
-                        return ReadSector(sectorAddress, out buffer);
-
-                    buffer = new byte[2352];
-                    errno  = ReadSector(sectorAddress, out byte[] data);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    switch(trk.Type)
-                    {
-                        case TrackType.Audio:
-                        case TrackType.Data:
-                            buffer = data;
-
-                            return ErrorNumber.NoError;
-                        case TrackType.CdMode1:
-                            Array.Copy(data, 0, buffer, 16, 2048);
-
-                            if(_sectorPrefix != null)
-                                Array.Copy(_sectorPrefix, (int)sectorAddress * 16, buffer, 0, 16);
-                            else if(_sectorPrefixDdt != null)
-                            {
-                                if((_sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Correct)
-                                    ReconstructPrefix(ref buffer, trk.Type, (long)sectorAddress);
-                                else if((_sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) ==
-                                        (uint)CdFixFlags.NotDumped ||
-                                        _sectorPrefixDdt[sectorAddress] == 0)
-                                {
-                                    // Do nothing
-                                }
-                                else
-                                {
-                                    uint prefixPosition = ((_sectorPrefixDdt[sectorAddress] & CD_DFIX_MASK) - 1) * 16;
-
-                                    if(prefixPosition > _sectorPrefixMs.Length)
-                                        return ErrorNumber.InvalidArgument;
-
-                                    _sectorPrefixMs.Position = prefixPosition;
-
-                                    _sectorPrefixMs.Read(buffer, 0, 16);
-                                }
-                            }
-                            else
-                                return ErrorNumber.InvalidArgument;
-
-                            if(_sectorSuffix != null)
-                                Array.Copy(_sectorSuffix, (int)sectorAddress * 288, buffer, 2064, 288);
-                            else if(_sectorSuffixDdt != null)
-                            {
-                                if((_sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Correct)
-                                    ReconstructEcc(ref buffer, trk.Type);
-                                else if((_sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) ==
-                                        (uint)CdFixFlags.NotDumped ||
-                                        _sectorSuffixDdt[sectorAddress] == 0)
-                                {
-                                    // Do nothing
-                                }
-                                else
-                                {
-                                    uint suffixPosition = ((_sectorSuffixDdt[sectorAddress] & CD_DFIX_MASK) - 1) * 288;
-
-                                    if(suffixPosition > _sectorSuffixMs.Length)
-                                        return ErrorNumber.InvalidArgument;
-
-                                    _sectorSuffixMs.Position = suffixPosition;
-
-                                    _sectorSuffixMs.Read(buffer, 2064, 288);
-                                }
-                            }
-                            else
-                                return ErrorNumber.InvalidArgument;
-
-                            return ErrorNumber.NoError;
-                        case TrackType.CdMode2Formless:
-                        case TrackType.CdMode2Form1:
-                        case TrackType.CdMode2Form2:
-                            if(_sectorPrefix != null)
-                                Array.Copy(_sectorPrefix, (int)sectorAddress * 16, buffer, 0, 16);
-                            else if(_sectorPrefixMs != null)
-                            {
-                                if((_sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) == (uint)CdFixFlags.Correct)
-                                    ReconstructPrefix(ref buffer, trk.Type, (long)sectorAddress);
-                                else if((_sectorPrefixDdt[sectorAddress] & CD_XFIX_MASK) ==
-                                        (uint)CdFixFlags.NotDumped ||
-                                        _sectorPrefixDdt[sectorAddress] == 0)
-                                {
-                                    // Do nothing
-                                }
-                                else
-                                {
-                                    uint prefixPosition = ((_sectorPrefixDdt[sectorAddress] & CD_DFIX_MASK) - 1) * 16;
-
-                                    if(prefixPosition > _sectorPrefixMs.Length)
-                                        return ErrorNumber.InvalidArgument;
-
-                                    _sectorPrefixMs.Position = prefixPosition;
-
-                                    _sectorPrefixMs.Read(buffer, 0, 16);
-                                }
-                            }
-                            else
-                                return ErrorNumber.InvalidArgument;
-
-                            if(_mode2Subheaders != null &&
-                               _sectorSuffixDdt != null)
-                            {
-                                Array.Copy(_mode2Subheaders, (int)sectorAddress * 8, buffer, 16, 8);
-
-                                switch(_sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK)
-                                {
-                                    case (uint)CdFixFlags.Mode2Form1Ok:
-                                        Array.Copy(data, 0, buffer, 24, 2048);
-                                        ReconstructEcc(ref buffer, TrackType.CdMode2Form1);
-
-                                        break;
-                                    case (uint)CdFixFlags.Mode2Form2Ok:
-                                    case (uint)CdFixFlags.Mode2Form2NoCrc:
-                                    {
-                                        Array.Copy(data, 0, buffer, 24, 2324);
-
-                                        if((_sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) ==
-                                           (uint)CdFixFlags.Mode2Form2Ok)
-                                            ReconstructEcc(ref buffer, TrackType.CdMode2Form2);
-
-                                        break;
-                                    }
-                                    default:
-                                    {
-                                        if((_sectorSuffixDdt[sectorAddress] & CD_XFIX_MASK) ==
-                                           (uint)CdFixFlags.NotDumped ||
-                                           _sectorSuffixDdt[sectorAddress] == 0)
-                                        {
-                                            // Do nothing
-                                        }
-                                        else // Mode 2 where EDC failed
-                                        {
-                                            // Incorrectly written images
-                                            if(data.Length == 2328)
-                                            {
-                                                Array.Copy(data, 0, buffer, 24, 2328);
-                                            }
-                                            else
-                                            {
-                                                bool form2 = (buffer[18] & 0x20) == 0x20 || (buffer[22] & 0x20) == 0x20;
-
-                                                uint suffixPosition =
-                                                    ((_sectorSuffixDdt[sectorAddress] & CD_DFIX_MASK) - 1) * 288;
-
-                                                if(suffixPosition > _sectorSuffixMs.Length)
-                                                    return ErrorNumber.InvalidArgument;
-
-                                                _sectorSuffixMs.Position = suffixPosition;
-
-                                                _sectorSuffixMs.Read(buffer, form2 ? 2348 : 2072, form2 ? 4 : 280);
-                                                Array.Copy(data, 0, buffer, 24, form2 ? 2324 : 2048);
-                                            }
-                                        }
-
-                                        break;
-                                    }
-                                }
-                            }
-                            else if(_mode2Subheaders != null)
-                            {
-                                Array.Copy(_mode2Subheaders, (int)sectorAddress * 8, buffer, 16, 8);
-                                Array.Copy(data, 0, buffer, 24, 2328);
-                            }
-                            else
-                                Array.Copy(data, 0, buffer, 16, 2336);
-
-                            return ErrorNumber.NoError;
-                    }
-
-                    break;
-                case XmlMediaType.BlockMedia:
-                    switch(_imageInfo.MediaType)
-                    {
-                        case MediaType.AppleFileWare:
-                        case MediaType.AppleProfile:
-                        case MediaType.AppleSonySS:
-                        case MediaType.AppleSonyDS:
-                        case MediaType.AppleWidget:
-                        case MediaType.PriamDataTower: return ReadSectorsLong(sectorAddress, 1, out buffer);
-                    }
-
-                    break;
-            }
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer)
+    {
+        buffer = null;
 
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
             return ErrorNumber.NotSupported;
-        }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer)
+        Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
+
+        return trk?.Sequence != track ? ErrorNumber.SectorNotFound
+                   : ReadSectorLong(trk.StartSector + sectorAddress, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        byte[]      data;
+        ErrorNumber errno;
+        buffer = null;
+
+        switch(_imageInfo.XmlMediaType)
         {
-            buffer = null;
+            case XmlMediaType.OpticalDisc:
+                Track trk = Tracks.FirstOrDefault(t => sectorAddress >= t.StartSector &&
+                                                       sectorAddress <= t.EndSector);
 
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NotSupported;
+                if(trk is null)
+                    return ErrorNumber.SectorNotFound;
 
-            Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
+                if(trk.Sequence    == 0 &&
+                   trk.StartSector == 0 &&
+                   trk.EndSector   == 0)
+                    return ErrorNumber.SectorNotFound;
 
-            return trk?.Sequence != track ? ErrorNumber.SectorNotFound
-                       : ReadSectorLong(trk.StartSector + sectorAddress, out buffer);
-        }
+                if(sectorAddress + length > trk.EndSector + 1)
+                    return ErrorNumber.OutOfRange;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            byte[]      data;
-            ErrorNumber errno;
-            buffer = null;
+                switch(trk.Type)
+                {
+                    // These types only contain user data
+                    case TrackType.Audio:
+                    case TrackType.Data: return ReadSectors(sectorAddress, length, out buffer);
 
-            switch(_imageInfo.XmlMediaType)
-            {
-                case XmlMediaType.OpticalDisc:
-                    Track trk = Tracks.FirstOrDefault(t => sectorAddress >= t.StartSector &&
-                                                           sectorAddress <= t.EndSector);
-
-                    if(trk is null)
-                        return ErrorNumber.SectorNotFound;
-
-                    if(trk.Sequence    == 0 &&
-                       trk.StartSector == 0 &&
-                       trk.EndSector   == 0)
-                        return ErrorNumber.SectorNotFound;
-
-                    if(sectorAddress + length > trk.EndSector + 1)
-                        return ErrorNumber.OutOfRange;
-
-                    switch(trk.Type)
-                    {
-                        // These types only contain user data
-                        case TrackType.Audio:
-                        case TrackType.Data: return ReadSectors(sectorAddress, length, out buffer);
-
-                        // Join prefix (sync, header) with user data with suffix (edc, ecc p, ecc q)
-                        case TrackType.CdMode1:
-                            if(_sectorPrefix != null &&
-                               _sectorSuffix != null)
-                            {
-                                buffer = new byte[2352 * length];
-                                errno  = ReadSectors(sectorAddress, length, out data);
-
-                                if(errno != ErrorNumber.NoError)
-                                    return errno;
-
-                                for(uint i = 0; i < length; i++)
-                                {
-                                    Array.Copy(_sectorPrefix, (int)((sectorAddress + i) * 16), buffer, (int)(i * 2352),
-                                               16);
-
-                                    Array.Copy(data, (int)(i * 2048), buffer, (int)(i * 2352) + 16, 2048);
-
-                                    Array.Copy(_sectorSuffix, (int)((sectorAddress + i) * 288), buffer,
-                                               (int)(i * 2352) + 2064, 288);
-                                }
-
-                                return ErrorNumber.NoError;
-                            }
-                            else if(_sectorPrefixDdt != null &&
-                                    _sectorSuffixDdt != null)
-                            {
-                                buffer = new byte[2352 * length];
-
-                                for(uint i = 0; i < length; i++)
-                                {
-                                    errno = ReadSectorLong(sectorAddress + i, out byte[] temp);
-
-                                    if(errno != ErrorNumber.NoError)
-                                        return errno;
-
-                                    Array.Copy(temp, 0, buffer, 2352 * i, 2352);
-                                }
-
-                                return ErrorNumber.NoError;
-                            }
-                            else
-                                return ReadSectors(sectorAddress, length, out buffer);
-
-                        // Join prefix (sync, header) with user data
-                        case TrackType.CdMode2Formless:
-                        case TrackType.CdMode2Form1:
-                        case TrackType.CdMode2Form2:
-                            if(_sectorPrefix != null &&
-                               _sectorSuffix != null)
-                            {
-                                buffer = new byte[2352 * length];
-                                errno  = ReadSectors(sectorAddress, length, out data);
-
-                                if(errno != ErrorNumber.NoError)
-                                    return errno;
-
-                                for(uint i = 0; i < length; i++)
-                                {
-                                    Array.Copy(_sectorPrefix, (int)((sectorAddress + i) * 16), buffer, (int)(i * 2352),
-                                               16);
-
-                                    Array.Copy(data, (int)(i * 2336), buffer, (int)(i * 2352) + 16, 2336);
-                                }
-
-                                return ErrorNumber.NoError;
-                            }
-                            else if(_sectorPrefixDdt != null &&
-                                    _sectorSuffixDdt != null)
-                            {
-                                buffer = new byte[2352 * length];
-
-                                for(uint i = 0; i < length; i++)
-                                {
-                                    errno = ReadSectorLong(sectorAddress + i, out byte[] temp);
-
-                                    if(errno != ErrorNumber.NoError)
-                                        return errno;
-
-                                    Array.Copy(temp, 0, buffer, 2352 * i, 2352);
-                                }
-
-                                return ErrorNumber.NoError;
-                            }
-
-                            return ReadSectors(sectorAddress, length, out buffer);
-                    }
-
-                    break;
-                case XmlMediaType.BlockMedia:
-                    switch(_imageInfo.MediaType)
-                    {
-                        // Join user data with tags
-                        case MediaType.AppleFileWare:
-                        case MediaType.AppleProfile:
-                        case MediaType.AppleSonySS:
-                        case MediaType.AppleSonyDS:
-                        case MediaType.AppleWidget:
-                        case MediaType.PriamDataTower:
-                            if(_sectorSubchannel == null)
-                                return ReadSector(sectorAddress, out buffer);
-
-                            uint tagSize = 0;
-
-                            switch(_imageInfo.MediaType)
-                            {
-                                case MediaType.AppleFileWare:
-                                case MediaType.AppleProfile:
-                                case MediaType.AppleWidget:
-                                    tagSize = 20;
-
-                                    break;
-                                case MediaType.AppleSonySS:
-                                case MediaType.AppleSonyDS:
-                                    tagSize = 12;
-
-                                    break;
-                                case MediaType.PriamDataTower:
-                                    tagSize = 24;
-
-                                    break;
-                            }
-
-                            uint sectorSize = 512 + tagSize;
-                            errno = ReadSectors(sectorAddress, length, out data);
+                    // Join prefix (sync, header) with user data with suffix (edc, ecc p, ecc q)
+                    case TrackType.CdMode1:
+                        if(_sectorPrefix != null &&
+                           _sectorSuffix != null)
+                        {
+                            buffer = new byte[2352 * length];
+                            errno  = ReadSectors(sectorAddress, length, out data);
 
                             if(errno != ErrorNumber.NoError)
                                 return errno;
 
-                            buffer = new byte[(sectorSize + 512) * length];
-
                             for(uint i = 0; i < length; i++)
                             {
-                                Array.Copy(_sectorSubchannel, (int)((sectorAddress + i) * tagSize), buffer,
-                                           (int)((i * sectorSize) + 512), tagSize);
+                                Array.Copy(_sectorPrefix, (int)((sectorAddress + i) * 16), buffer, (int)(i * 2352),
+                                           16);
 
-                                Array.Copy(data, (int)((sectorAddress + i) * 512), buffer, (int)(i * 512), 512);
+                                Array.Copy(data, (int)(i * 2048), buffer, (int)(i * 2352) + 16, 2048);
+
+                                Array.Copy(_sectorSuffix, (int)((sectorAddress + i) * 288), buffer,
+                                           (int)(i * 2352) + 2064, 288);
                             }
 
                             return ErrorNumber.NoError;
-                    }
+                        }
+                        else if(_sectorPrefixDdt != null &&
+                                _sectorSuffixDdt != null)
+                        {
+                            buffer = new byte[2352 * length];
 
-                    break;
-            }
+                            for(uint i = 0; i < length; i++)
+                            {
+                                errno = ReadSectorLong(sectorAddress + i, out byte[] temp);
 
-            return ErrorNumber.NotSupported;
+                                if(errno != ErrorNumber.NoError)
+                                    return errno;
+
+                                Array.Copy(temp, 0, buffer, 2352 * i, 2352);
+                            }
+
+                            return ErrorNumber.NoError;
+                        }
+                        else
+                            return ReadSectors(sectorAddress, length, out buffer);
+
+                    // Join prefix (sync, header) with user data
+                    case TrackType.CdMode2Formless:
+                    case TrackType.CdMode2Form1:
+                    case TrackType.CdMode2Form2:
+                        if(_sectorPrefix != null &&
+                           _sectorSuffix != null)
+                        {
+                            buffer = new byte[2352 * length];
+                            errno  = ReadSectors(sectorAddress, length, out data);
+
+                            if(errno != ErrorNumber.NoError)
+                                return errno;
+
+                            for(uint i = 0; i < length; i++)
+                            {
+                                Array.Copy(_sectorPrefix, (int)((sectorAddress + i) * 16), buffer, (int)(i * 2352),
+                                           16);
+
+                                Array.Copy(data, (int)(i * 2336), buffer, (int)(i * 2352) + 16, 2336);
+                            }
+
+                            return ErrorNumber.NoError;
+                        }
+                        else if(_sectorPrefixDdt != null &&
+                                _sectorSuffixDdt != null)
+                        {
+                            buffer = new byte[2352 * length];
+
+                            for(uint i = 0; i < length; i++)
+                            {
+                                errno = ReadSectorLong(sectorAddress + i, out byte[] temp);
+
+                                if(errno != ErrorNumber.NoError)
+                                    return errno;
+
+                                Array.Copy(temp, 0, buffer, 2352 * i, 2352);
+                            }
+
+                            return ErrorNumber.NoError;
+                        }
+
+                        return ReadSectors(sectorAddress, length, out buffer);
+                }
+
+                break;
+            case XmlMediaType.BlockMedia:
+                switch(_imageInfo.MediaType)
+                {
+                    // Join user data with tags
+                    case MediaType.AppleFileWare:
+                    case MediaType.AppleProfile:
+                    case MediaType.AppleSonySS:
+                    case MediaType.AppleSonyDS:
+                    case MediaType.AppleWidget:
+                    case MediaType.PriamDataTower:
+                        if(_sectorSubchannel == null)
+                            return ReadSector(sectorAddress, out buffer);
+
+                        uint tagSize = 0;
+
+                        switch(_imageInfo.MediaType)
+                        {
+                            case MediaType.AppleFileWare:
+                            case MediaType.AppleProfile:
+                            case MediaType.AppleWidget:
+                                tagSize = 20;
+
+                                break;
+                            case MediaType.AppleSonySS:
+                            case MediaType.AppleSonyDS:
+                                tagSize = 12;
+
+                                break;
+                            case MediaType.PriamDataTower:
+                                tagSize = 24;
+
+                                break;
+                        }
+
+                        uint sectorSize = 512 + tagSize;
+                        errno = ReadSectors(sectorAddress, length, out data);
+
+                        if(errno != ErrorNumber.NoError)
+                            return errno;
+
+                        buffer = new byte[(sectorSize + 512) * length];
+
+                        for(uint i = 0; i < length; i++)
+                        {
+                            Array.Copy(_sectorSubchannel, (int)((sectorAddress + i) * tagSize), buffer,
+                                       (int)((i * sectorSize) + 512), tagSize);
+
+                            Array.Copy(data, (int)((sectorAddress + i) * 512), buffer, (int)(i * 512), 512);
+                        }
+
+                        return ErrorNumber.NoError;
+                }
+
+                break;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NotSupported;
-
-            Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
-
-            return trk?.Sequence != track
-                       ? ErrorNumber.SectorNotFound
-                       : trk.StartSector + sectorAddress + length > trk.EndSector + 1
-                           ? ErrorNumber.OutOfRange
-                           : ReadSectorsLong(trk.StartSector + sectorAddress, length, out buffer);
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(Session session) =>
-            Tracks.Where(t => t.Sequence == session.Sequence).ToList();
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session) => Tracks.Where(t => t.Sequence == session).ToList();
+        return ErrorNumber.NotSupported;
     }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return ErrorNumber.NotSupported;
+
+        Track trk = Tracks.FirstOrDefault(t => t.Sequence == track);
+
+        return trk?.Sequence != track
+                   ? ErrorNumber.SectorNotFound
+                   : trk.StartSector + sectorAddress + length > trk.EndSector + 1
+                       ? ErrorNumber.OutOfRange
+                       : ReadSectorsLong(trk.StartSector + sectorAddress, length, out buffer);
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(Session session) =>
+        Tracks.Where(t => t.Sequence == session.Sequence).ToList();
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session) => Tracks.Where(t => t.Sequence == session).ToList();
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Structs.cs b/Aaru.Images/AaruFormat/Structs.cs
index 1cedb2a09..5717acd46 100644
--- a/Aaru.Images/AaruFormat/Structs.cs
+++ b/Aaru.Images/AaruFormat/Structs.cs
@@ -34,379 +34,378 @@ using System.Runtime.InteropServices;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
+    /// <summary>Header, at start of file</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1, CharSet = CharSet.Unicode)]
+    struct AaruHeader
     {
-        /// <summary>Header, at start of file</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1, CharSet = CharSet.Unicode)]
-        struct AaruHeader
-        {
-            /// <summary>Header identifier, <see cref="AARU_MAGIC" /></summary>
-            public ulong identifier;
-            /// <summary>UTF-16LE name of the application that created the image</summary>
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
-            public string application;
-            /// <summary>Image format major version. A new major version means a possibly incompatible change of format</summary>
-            public byte imageMajorVersion;
-            /// <summary>Image format minor version. A new minor version indicates a compatible change of format</summary>
-            public byte imageMinorVersion;
-            /// <summary>Major version of the application that created the image</summary>
-            public byte applicationMajorVersion;
-            /// <summary>Minor version of the application that created the image</summary>
-            public byte applicationMinorVersion;
-            /// <summary>Type of media contained on image</summary>
-            public MediaType mediaType;
-            /// <summary>Offset to index</summary>
-            public ulong indexOffset;
-            /// <summary>Windows filetime (100 nanoseconds since 1601/01/01 00:00:00 UTC) of image creation time</summary>
-            public long creationTime;
-            /// <summary>Windows filetime (100 nanoseconds since 1601/01/01 00:00:00 UTC) of image last written time</summary>
-            public long lastWrittenTime;
-        }
+        /// <summary>Header identifier, <see cref="AARU_MAGIC" /></summary>
+        public ulong identifier;
+        /// <summary>UTF-16LE name of the application that created the image</summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
+        public string application;
+        /// <summary>Image format major version. A new major version means a possibly incompatible change of format</summary>
+        public byte imageMajorVersion;
+        /// <summary>Image format minor version. A new minor version indicates a compatible change of format</summary>
+        public byte imageMinorVersion;
+        /// <summary>Major version of the application that created the image</summary>
+        public byte applicationMajorVersion;
+        /// <summary>Minor version of the application that created the image</summary>
+        public byte applicationMinorVersion;
+        /// <summary>Type of media contained on image</summary>
+        public MediaType mediaType;
+        /// <summary>Offset to index</summary>
+        public ulong indexOffset;
+        /// <summary>Windows filetime (100 nanoseconds since 1601/01/01 00:00:00 UTC) of image creation time</summary>
+        public long creationTime;
+        /// <summary>Windows filetime (100 nanoseconds since 1601/01/01 00:00:00 UTC) of image last written time</summary>
+        public long lastWrittenTime;
+    }
 
-        /// <summary>Header for a deduplication table. Table follows it</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct DdtHeader
-        {
-            /// <summary>Identifier, <see cref="BlockType.DeDuplicationTable" /></summary>
-            public BlockType identifier;
-            /// <summary>Type of data pointed by this DDT</summary>
-            public DataType type;
-            /// <summary>Compression algorithm used to compress the DDT</summary>
-            public CompressionType compression;
-            /// <summary>Each entry is ((byte offset in file) &lt;&lt; shift) + (sector offset in block)</summary>
-            public byte shift;
-            /// <summary>How many entries are in the table</summary>
-            public ulong entries;
-            /// <summary>Compressed length for the DDT</summary>
-            public ulong cmpLength;
-            /// <summary>Uncompressed length for the DDT</summary>
-            public ulong length;
-            /// <summary>CRC64-ECMA of the compressed DDT</summary>
-            public ulong cmpCrc64;
-            /// <summary>CRC64-ECMA of the uncompressed DDT</summary>
-            public readonly ulong crc64;
-        }
+    /// <summary>Header for a deduplication table. Table follows it</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct DdtHeader
+    {
+        /// <summary>Identifier, <see cref="BlockType.DeDuplicationTable" /></summary>
+        public BlockType identifier;
+        /// <summary>Type of data pointed by this DDT</summary>
+        public DataType type;
+        /// <summary>Compression algorithm used to compress the DDT</summary>
+        public CompressionType compression;
+        /// <summary>Each entry is ((byte offset in file) &lt;&lt; shift) + (sector offset in block)</summary>
+        public byte shift;
+        /// <summary>How many entries are in the table</summary>
+        public ulong entries;
+        /// <summary>Compressed length for the DDT</summary>
+        public ulong cmpLength;
+        /// <summary>Uncompressed length for the DDT</summary>
+        public ulong length;
+        /// <summary>CRC64-ECMA of the compressed DDT</summary>
+        public ulong cmpCrc64;
+        /// <summary>CRC64-ECMA of the uncompressed DDT</summary>
+        public readonly ulong crc64;
+    }
 
-        /// <summary>Header for the index, followed by entries</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct IndexHeader
-        {
-            /// <summary>Identifier, <see cref="BlockType.Index" /></summary>
-            public BlockType identifier;
-            /// <summary>How many entries follow this header</summary>
-            public ushort entries;
-            /// <summary>CRC64-ECMA of the index</summary>
-            public ulong crc64;
-        }
+    /// <summary>Header for the index, followed by entries</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct IndexHeader
+    {
+        /// <summary>Identifier, <see cref="BlockType.Index" /></summary>
+        public BlockType identifier;
+        /// <summary>How many entries follow this header</summary>
+        public ushort entries;
+        /// <summary>CRC64-ECMA of the index</summary>
+        public ulong crc64;
+    }
 
-        /// <summary>Header for the index, followed by entries</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct IndexHeader2
-        {
-            /// <summary>Identifier, <see cref="BlockType.Index2" /></summary>
-            public BlockType identifier;
-            /// <summary>How many entries follow this header</summary>
-            public ulong entries;
-            /// <summary>CRC64-ECMA of the index</summary>
-            public ulong crc64;
-        }
+    /// <summary>Header for the index, followed by entries</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct IndexHeader2
+    {
+        /// <summary>Identifier, <see cref="BlockType.Index2" /></summary>
+        public BlockType identifier;
+        /// <summary>How many entries follow this header</summary>
+        public ulong entries;
+        /// <summary>CRC64-ECMA of the index</summary>
+        public ulong crc64;
+    }
 
-        /// <summary>Index entry</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct IndexEntry
-        {
-            /// <summary>Type of item pointed by this entry</summary>
-            public BlockType blockType;
-            /// <summary>Type of data contained by the block pointed by this entry</summary>
-            public DataType dataType;
-            /// <summary>Offset in file where item is stored</summary>
-            public ulong offset;
-        }
+    /// <summary>Index entry</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct IndexEntry
+    {
+        /// <summary>Type of item pointed by this entry</summary>
+        public BlockType blockType;
+        /// <summary>Type of data contained by the block pointed by this entry</summary>
+        public DataType dataType;
+        /// <summary>Offset in file where item is stored</summary>
+        public ulong offset;
+    }
 
-        /// <summary>Block header, precedes block data</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BlockHeader
-        {
-            /// <summary>Identifier, <see cref="BlockType.DataBlock" /></summary>
-            public BlockType identifier;
-            /// <summary>Type of data contained by this block</summary>
-            public DataType type;
-            /// <summary>Compression algorithm used to compress the block</summary>
-            public CompressionType compression;
-            /// <summary>Size in bytes of each sector contained in this block</summary>
-            public uint sectorSize;
-            /// <summary>Compressed length for the block</summary>
-            public uint cmpLength;
-            /// <summary>Uncompressed length for the block</summary>
-            public uint length;
-            /// <summary>CRC64-ECMA of the compressed block</summary>
-            public ulong cmpCrc64;
-            /// <summary>CRC64-ECMA of the uncompressed block</summary>
-            public ulong crc64;
-        }
+    /// <summary>Block header, precedes block data</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BlockHeader
+    {
+        /// <summary>Identifier, <see cref="BlockType.DataBlock" /></summary>
+        public BlockType identifier;
+        /// <summary>Type of data contained by this block</summary>
+        public DataType type;
+        /// <summary>Compression algorithm used to compress the block</summary>
+        public CompressionType compression;
+        /// <summary>Size in bytes of each sector contained in this block</summary>
+        public uint sectorSize;
+        /// <summary>Compressed length for the block</summary>
+        public uint cmpLength;
+        /// <summary>Uncompressed length for the block</summary>
+        public uint length;
+        /// <summary>CRC64-ECMA of the compressed block</summary>
+        public ulong cmpCrc64;
+        /// <summary>CRC64-ECMA of the uncompressed block</summary>
+        public ulong crc64;
+    }
 
-        /// <summary>Geometry block, contains physical geometry information</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct GeometryBlock
-        {
-            /// <summary>Identifier, <see cref="BlockType.GeometryBlock" /></summary>
-            public BlockType identifier;
-            public uint cylinders;
-            public uint heads;
-            public uint sectorsPerTrack;
-        }
+    /// <summary>Geometry block, contains physical geometry information</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct GeometryBlock
+    {
+        /// <summary>Identifier, <see cref="BlockType.GeometryBlock" /></summary>
+        public BlockType identifier;
+        public uint cylinders;
+        public uint heads;
+        public uint sectorsPerTrack;
+    }
 
-        /// <summary>Metadata block, contains metadata</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct MetadataBlock
-        {
-            /// <summary>Identifier, <see cref="BlockType.MetadataBlock" /></summary>
-            public BlockType identifier;
-            /// <summary>Size in bytes of this whole metadata block</summary>
-            public uint blockSize;
-            /// <summary>Sequence of media set this media belongs to</summary>
-            public int mediaSequence;
-            /// <summary>Total number of media on the media set this media belongs to</summary>
-            public int lastMediaSequence;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint creatorOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint creatorLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint commentsOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint commentsLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint mediaTitleOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint mediaTitleLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint mediaManufacturerOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint mediaManufacturerLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint mediaModelOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint mediaModelLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint mediaSerialNumberOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint mediaSerialNumberLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint mediaBarcodeOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint mediaBarcodeLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint mediaPartNumberOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint mediaPartNumberLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint driveManufacturerOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint driveManufacturerLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint driveModelOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint driveModelLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint driveSerialNumberOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint driveSerialNumberLength;
-            /// <summary>Offset to start of creator string from start of this block</summary>
-            public uint driveFirmwareRevisionOffset;
-            /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
-            public uint driveFirmwareRevisionLength;
-        }
+    /// <summary>Metadata block, contains metadata</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct MetadataBlock
+    {
+        /// <summary>Identifier, <see cref="BlockType.MetadataBlock" /></summary>
+        public BlockType identifier;
+        /// <summary>Size in bytes of this whole metadata block</summary>
+        public uint blockSize;
+        /// <summary>Sequence of media set this media belongs to</summary>
+        public int mediaSequence;
+        /// <summary>Total number of media on the media set this media belongs to</summary>
+        public int lastMediaSequence;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint creatorOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint creatorLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint commentsOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint commentsLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint mediaTitleOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint mediaTitleLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint mediaManufacturerOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint mediaManufacturerLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint mediaModelOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint mediaModelLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint mediaSerialNumberOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint mediaSerialNumberLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint mediaBarcodeOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint mediaBarcodeLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint mediaPartNumberOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint mediaPartNumberLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint driveManufacturerOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint driveManufacturerLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint driveModelOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint driveModelLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint driveSerialNumberOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint driveSerialNumberLength;
+        /// <summary>Offset to start of creator string from start of this block</summary>
+        public uint driveFirmwareRevisionOffset;
+        /// <summary>Length in bytes of the null-terminated UTF-16LE creator string</summary>
+        public uint driveFirmwareRevisionLength;
+    }
 
-        /// <summary>Contains list of optical disc tracks</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct TracksHeader
-        {
-            /// <summary>Identifier, <see cref="BlockType.TracksBlock" /></summary>
-            public BlockType identifier;
-            /// <summary>How many entries follow this header</summary>
-            public ushort entries;
-            /// <summary>CRC64-ECMA of the block</summary>
-            public ulong crc64;
-        }
+    /// <summary>Contains list of optical disc tracks</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct TracksHeader
+    {
+        /// <summary>Identifier, <see cref="BlockType.TracksBlock" /></summary>
+        public BlockType identifier;
+        /// <summary>How many entries follow this header</summary>
+        public ushort entries;
+        /// <summary>CRC64-ECMA of the block</summary>
+        public ulong crc64;
+    }
 
-        /// <summary>Optical disc track</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1, CharSet = CharSet.Ansi)]
-        struct TrackEntry
-        {
-            /// <summary>Track sequence</summary>
-            public byte sequence;
-            /// <summary>Track type</summary>
-            public TrackType type;
-            /// <summary>Track starting LBA</summary>
-            public long start;
-            /// <summary>Track last LBA</summary>
-            public long end;
-            /// <summary>Track pregap in sectors</summary>
-            public long pregap;
-            /// <summary>Track session</summary>
-            public byte session;
-            /// <summary>Track's ISRC in ASCII</summary>
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 13)]
-            public string isrc;
-            /// <summary>Track flags</summary>
-            public byte flags;
-        }
+    /// <summary>Optical disc track</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1, CharSet = CharSet.Ansi)]
+    struct TrackEntry
+    {
+        /// <summary>Track sequence</summary>
+        public byte sequence;
+        /// <summary>Track type</summary>
+        public TrackType type;
+        /// <summary>Track starting LBA</summary>
+        public long start;
+        /// <summary>Track last LBA</summary>
+        public long end;
+        /// <summary>Track pregap in sectors</summary>
+        public long pregap;
+        /// <summary>Track session</summary>
+        public byte session;
+        /// <summary>Track's ISRC in ASCII</summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 13)]
+        public string isrc;
+        /// <summary>Track flags</summary>
+        public byte flags;
+    }
 
-        /// <summary>Geometry block, contains physical geometry information</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct CicmMetadataBlock
-        {
-            /// <summary>Identifier, <see cref="BlockType.CicmBlock" /></summary>
-            public BlockType identifier;
-            public uint length;
-        }
+    /// <summary>Geometry block, contains physical geometry information</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct CicmMetadataBlock
+    {
+        /// <summary>Identifier, <see cref="BlockType.CicmBlock" /></summary>
+        public BlockType identifier;
+        public uint length;
+    }
 
-        /// <summary>Dump hardware block, contains a list of hardware used to dump the media on this image</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct DumpHardwareHeader
-        {
-            /// <summary>Identifier, <see cref="BlockType.DumpHardwareBlock" /></summary>
-            public BlockType identifier;
-            /// <summary>How many entries follow this header</summary>
-            public ushort entries;
-            /// <summary>Size of the whole block, not including this header, in bytes</summary>
-            public uint length;
-            /// <summary>CRC64-ECMA of the block</summary>
-            public ulong crc64;
-        }
+    /// <summary>Dump hardware block, contains a list of hardware used to dump the media on this image</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct DumpHardwareHeader
+    {
+        /// <summary>Identifier, <see cref="BlockType.DumpHardwareBlock" /></summary>
+        public BlockType identifier;
+        /// <summary>How many entries follow this header</summary>
+        public ushort entries;
+        /// <summary>Size of the whole block, not including this header, in bytes</summary>
+        public uint length;
+        /// <summary>CRC64-ECMA of the block</summary>
+        public ulong crc64;
+    }
 
-        /// <summary>Dump hardware entry, contains length of strings that follow, in the same order as the length, this structure</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct DumpHardwareEntry
-        {
-            /// <summary>Length of UTF-8 manufacturer string</summary>
-            public uint manufacturerLength;
-            /// <summary>Length of UTF-8 model string</summary>
-            public uint modelLength;
-            /// <summary>Length of UTF-8 revision string</summary>
-            public uint revisionLength;
-            /// <summary>Length of UTF-8 firmware version string</summary>
-            public uint firmwareLength;
-            /// <summary>Length of UTF-8 serial string</summary>
-            public uint serialLength;
-            /// <summary>Length of UTF-8 software name string</summary>
-            public uint softwareNameLength;
-            /// <summary>Length of UTF-8 software version string</summary>
-            public uint softwareVersionLength;
-            /// <summary>Length of UTF-8 software operating system string</summary>
-            public uint softwareOperatingSystemLength;
-            /// <summary>How many extents are after the strings</summary>
-            public uint extents;
-        }
+    /// <summary>Dump hardware entry, contains length of strings that follow, in the same order as the length, this structure</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct DumpHardwareEntry
+    {
+        /// <summary>Length of UTF-8 manufacturer string</summary>
+        public uint manufacturerLength;
+        /// <summary>Length of UTF-8 model string</summary>
+        public uint modelLength;
+        /// <summary>Length of UTF-8 revision string</summary>
+        public uint revisionLength;
+        /// <summary>Length of UTF-8 firmware version string</summary>
+        public uint firmwareLength;
+        /// <summary>Length of UTF-8 serial string</summary>
+        public uint serialLength;
+        /// <summary>Length of UTF-8 software name string</summary>
+        public uint softwareNameLength;
+        /// <summary>Length of UTF-8 software version string</summary>
+        public uint softwareVersionLength;
+        /// <summary>Length of UTF-8 software operating system string</summary>
+        public uint softwareOperatingSystemLength;
+        /// <summary>How many extents are after the strings</summary>
+        public uint extents;
+    }
 
-        /// <summary>
-        ///     Checksum block, contains a checksum of all user data sectors (except for optical discs that is 2352 bytes raw
-        ///     sector if available
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct ChecksumHeader
-        {
-            /// <summary>Identifier, <see cref="BlockType.ChecksumBlock" /></summary>
-            public BlockType identifier;
-            /// <summary>Length in bytes of the block</summary>
-            public uint length;
-            /// <summary>How many checksums follow</summary>
-            public byte entries;
-        }
+    /// <summary>
+    ///     Checksum block, contains a checksum of all user data sectors (except for optical discs that is 2352 bytes raw
+    ///     sector if available
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ChecksumHeader
+    {
+        /// <summary>Identifier, <see cref="BlockType.ChecksumBlock" /></summary>
+        public BlockType identifier;
+        /// <summary>Length in bytes of the block</summary>
+        public uint length;
+        /// <summary>How many checksums follow</summary>
+        public byte entries;
+    }
 
-        /// <summary>Checksum entry, followed by checksum data itself</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct ChecksumEntry
-        {
-            /// <summary>Checksum algorithm</summary>
-            public ChecksumAlgorithm type;
-            /// <summary>Length in bytes of checksum that follows this structure</summary>
-            public uint length;
-        }
+    /// <summary>Checksum entry, followed by checksum data itself</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ChecksumEntry
+    {
+        /// <summary>Checksum algorithm</summary>
+        public ChecksumAlgorithm type;
+        /// <summary>Length in bytes of checksum that follows this structure</summary>
+        public uint length;
+    }
 
-        /// <summary>Tape file block, contains a list of all files in a tape</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct TapeFileHeader
-        {
-            /// <summary>Identifier, <see cref="BlockType.TapeFileBlock" /></summary>
-            public BlockType identifier;
-            /// <summary>How many entries follow this header</summary>
-            public uint entries;
-            /// <summary>Size of the whole block, not including this header, in bytes</summary>
-            public ulong length;
-            /// <summary>CRC64-ECMA of the block</summary>
-            public ulong crc64;
-        }
+    /// <summary>Tape file block, contains a list of all files in a tape</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct TapeFileHeader
+    {
+        /// <summary>Identifier, <see cref="BlockType.TapeFileBlock" /></summary>
+        public BlockType identifier;
+        /// <summary>How many entries follow this header</summary>
+        public uint entries;
+        /// <summary>Size of the whole block, not including this header, in bytes</summary>
+        public ulong length;
+        /// <summary>CRC64-ECMA of the block</summary>
+        public ulong crc64;
+    }
 
-        /// <summary>Tape file entry</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct TapeFileEntry
-        {
-            /// <summary>File number</summary>
-            public uint File;
-            /// <summary>Partition number</summary>
-            public readonly byte Partition;
-            /// <summary>First block, inclusive, of the file</summary>
-            public ulong FirstBlock;
-            /// <summary>Last block, inclusive, of the file</summary>
-            public ulong LastBlock;
-        }
+    /// <summary>Tape file entry</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct TapeFileEntry
+    {
+        /// <summary>File number</summary>
+        public uint File;
+        /// <summary>Partition number</summary>
+        public readonly byte Partition;
+        /// <summary>First block, inclusive, of the file</summary>
+        public ulong FirstBlock;
+        /// <summary>Last block, inclusive, of the file</summary>
+        public ulong LastBlock;
+    }
 
-        /// <summary>Tape partition block, contains a list of all partitions in a tape</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct TapePartitionHeader
-        {
-            /// <summary>Identifier, <see cref="BlockType.TapePartitionBlock" /></summary>
-            public BlockType identifier;
-            /// <summary>How many entries follow this header</summary>
-            public byte entries;
-            /// <summary>Size of the whole block, not including this header, in bytes</summary>
-            public ulong length;
-            /// <summary>CRC64-ECMA of the block</summary>
-            public ulong crc64;
-        }
+    /// <summary>Tape partition block, contains a list of all partitions in a tape</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct TapePartitionHeader
+    {
+        /// <summary>Identifier, <see cref="BlockType.TapePartitionBlock" /></summary>
+        public BlockType identifier;
+        /// <summary>How many entries follow this header</summary>
+        public byte entries;
+        /// <summary>Size of the whole block, not including this header, in bytes</summary>
+        public ulong length;
+        /// <summary>CRC64-ECMA of the block</summary>
+        public ulong crc64;
+    }
 
-        /// <summary>Tape partition entry</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public struct TapePartitionEntry
-        {
-            /// <summary>Partition number</summary>
-            public byte Number;
-            /// <summary>First block, inclusive, of the partition</summary>
-            public ulong FirstBlock;
-            /// <summary>Last block, inclusive, of the partition</summary>
-            public ulong LastBlock;
-        }
+    /// <summary>Tape partition entry</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct TapePartitionEntry
+    {
+        /// <summary>Partition number</summary>
+        public byte Number;
+        /// <summary>First block, inclusive, of the partition</summary>
+        public ulong FirstBlock;
+        /// <summary>Last block, inclusive, of the partition</summary>
+        public ulong LastBlock;
+    }
 
-        /// <summary>
-        ///     Compact Disc track indexes block, contains a cache of all Compact Disc indexes to not need to interpret
-        ///     subchannel
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct CompactDiscIndexesHeader
-        {
-            /// <summary>Identifier, <see cref="BlockType.CompactDiscIndexesBlock" /></summary>
-            public BlockType identifier;
-            /// <summary>How many entries follow this header</summary>
-            public ushort entries;
-            /// <summary>Size of the whole block, not including this header, in bytes</summary>
-            public readonly ulong length;
-            /// <summary>CRC64-ECMA of the block</summary>
-            public ulong crc64;
-        }
+    /// <summary>
+    ///     Compact Disc track indexes block, contains a cache of all Compact Disc indexes to not need to interpret
+    ///     subchannel
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct CompactDiscIndexesHeader
+    {
+        /// <summary>Identifier, <see cref="BlockType.CompactDiscIndexesBlock" /></summary>
+        public BlockType identifier;
+        /// <summary>How many entries follow this header</summary>
+        public ushort entries;
+        /// <summary>Size of the whole block, not including this header, in bytes</summary>
+        public readonly ulong length;
+        /// <summary>CRC64-ECMA of the block</summary>
+        public ulong crc64;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct CompactDiscIndexEntry
-        {
-            /// <summary>How many entries follow this header</summary>
-            public ushort Track;
-            /// <summary>Size of the whole block, not including this header, in bytes</summary>
-            public ushort Index;
-            /// <summary>CRC64-ECMA of the block</summary>
-            public int Lba;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct CompactDiscIndexEntry
+    {
+        /// <summary>How many entries follow this header</summary>
+        public ushort Track;
+        /// <summary>Size of the whole block, not including this header, in bytes</summary>
+        public ushort Index;
+        /// <summary>CRC64-ECMA of the block</summary>
+        public int Lba;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Tape.cs b/Aaru.Images/AaruFormat/Tape.cs
index fb6fd02e6..37bd618fc 100644
--- a/Aaru.Images/AaruFormat/Tape.cs
+++ b/Aaru.Images/AaruFormat/Tape.cs
@@ -34,52 +34,51 @@ using System.Collections.Generic;
 using System.Linq;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
+    /// <inheritdoc />
+    public List<TapeFile> Files { get; private set; }
+    /// <inheritdoc />
+    public List<TapePartition> TapePartitions { get; private set; }
+    /// <inheritdoc />
+    public bool IsTape { get; private set; }
+
+    /// <inheritdoc />
+    public bool AddFile(TapeFile file)
     {
-        /// <inheritdoc />
-        public List<TapeFile> Files { get; private set; }
-        /// <inheritdoc />
-        public List<TapePartition> TapePartitions { get; private set; }
-        /// <inheritdoc />
-        public bool IsTape { get; private set; }
-
-        /// <inheritdoc />
-        public bool AddFile(TapeFile file)
+        if(Files.Any(f => f.File == file.File))
         {
-            if(Files.Any(f => f.File == file.File))
-            {
-                TapeFile removeMe = Files.FirstOrDefault(f => f.File == file.File);
-                Files.Remove(removeMe);
-            }
-
-            Files.Add(file);
-
-            return true;
+            TapeFile removeMe = Files.FirstOrDefault(f => f.File == file.File);
+            Files.Remove(removeMe);
         }
 
-        /// <inheritdoc />
-        public bool AddPartition(TapePartition partition)
+        Files.Add(file);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool AddPartition(TapePartition partition)
+    {
+        if(TapePartitions.Any(f => f.Number == partition.Number))
         {
-            if(TapePartitions.Any(f => f.Number == partition.Number))
-            {
-                TapePartition removeMe = TapePartitions.FirstOrDefault(f => f.Number == partition.Number);
-                TapePartitions.Remove(removeMe);
-            }
-
-            TapePartitions.Add(partition);
-
-            return true;
+            TapePartition removeMe = TapePartitions.FirstOrDefault(f => f.Number == partition.Number);
+            TapePartitions.Remove(removeMe);
         }
 
-        /// <inheritdoc />
-        public bool SetTape()
-        {
-            Files          = new List<TapeFile>();
-            TapePartitions = new List<TapePartition>();
+        TapePartitions.Add(partition);
 
-            return IsTape = true;
-        }
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetTape()
+    {
+        Files          = new List<TapeFile>();
+        TapePartitions = new List<TapePartition>();
+
+        return IsTape = true;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AaruFormat/Verify.cs b/Aaru.Images/AaruFormat/Verify.cs
index 0fc49c4cf..2bb248835 100644
--- a/Aaru.Images/AaruFormat/Verify.cs
+++ b/Aaru.Images/AaruFormat/Verify.cs
@@ -37,285 +37,284 @@ using Aaru.CommonTypes.Enums;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AaruFormat
 {
-    public sealed partial class AaruFormat
+    /// <inheritdoc />
+    public bool? VerifyMediaImage()
     {
-        /// <inheritdoc />
-        public bool? VerifyMediaImage()
+        // This will traverse all blocks and check their CRC64 without uncompressing them
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Checking index integrity at {0}", _header.indexOffset);
+        _imageStream.Position = (long)_header.indexOffset;
+
+        _structureBytes = new byte[Marshal.SizeOf<IndexHeader>()];
+        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+        IndexHeader idxHeader = Marshal.SpanToStructureLittleEndian<IndexHeader>(_structureBytes);
+
+        if(idxHeader.identifier != BlockType.Index)
         {
-            // This will traverse all blocks and check their CRC64 without uncompressing them
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Checking index integrity at {0}", _header.indexOffset);
-            _imageStream.Position = (long)_header.indexOffset;
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Incorrect index identifier");
 
-            _structureBytes = new byte[Marshal.SizeOf<IndexHeader>()];
+            return false;
+        }
+
+        AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries", _header.indexOffset,
+                                   idxHeader.entries);
+
+        _structureBytes = new byte[Marshal.SizeOf<IndexEntry>() * idxHeader.entries];
+        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+        Crc64Context.Data(_structureBytes, out byte[] verifyCrc);
+
+        if(BitConverter.ToUInt64(verifyCrc, 0) != idxHeader.crc64)
+        {
+            AaruConsole.DebugWriteLine("Aaru Format plugin", "Expected index CRC {0:X16} but got {1:X16}",
+                                       idxHeader.crc64, BitConverter.ToUInt64(verifyCrc, 0));
+
+            return false;
+        }
+
+        _imageStream.Position -= _structureBytes.Length;
+
+        List<IndexEntry> vrIndex = new();
+
+        for(ushort i = 0; i < idxHeader.entries; i++)
+        {
+            _structureBytes = new byte[Marshal.SizeOf<IndexEntry>()];
             _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-            IndexHeader idxHeader = Marshal.SpanToStructureLittleEndian<IndexHeader>(_structureBytes);
+            IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(_structureBytes);
 
-            if(idxHeader.identifier != BlockType.Index)
+            AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                       "Block type {0} with data type {1} is indexed to be at {2}", entry.blockType,
+                                       entry.dataType, entry.offset);
+
+            vrIndex.Add(entry);
+        }
+
+        // Read up to 1MiB at a time for verification
+        const int verifySize = 1024 * 1024;
+
+        foreach(IndexEntry entry in vrIndex)
+        {
+            _imageStream.Position = (long)entry.offset;
+            Crc64Context crcVerify;
+            ulong        readBytes;
+            byte[]       verifyBytes;
+
+            switch(entry.blockType)
             {
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Incorrect index identifier");
+                case BlockType.DataBlock:
+                    _structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                    BlockHeader blockHeader = Marshal.SpanToStructureLittleEndian<BlockHeader>(_structureBytes);
 
-                return false;
-            }
+                    crcVerify = new Crc64Context();
+                    readBytes = 0;
 
-            AaruConsole.DebugWriteLine("Aaru Format plugin", "Index at {0} contains {1} entries", _header.indexOffset,
-                                       idxHeader.entries);
+                    AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                               "Verifying data block type {0} at position {1}", entry.dataType,
+                                               entry.offset);
 
-            _structureBytes = new byte[Marshal.SizeOf<IndexEntry>() * idxHeader.entries];
-            _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-            Crc64Context.Data(_structureBytes, out byte[] verifyCrc);
-
-            if(BitConverter.ToUInt64(verifyCrc, 0) != idxHeader.crc64)
-            {
-                AaruConsole.DebugWriteLine("Aaru Format plugin", "Expected index CRC {0:X16} but got {1:X16}",
-                                           idxHeader.crc64, BitConverter.ToUInt64(verifyCrc, 0));
-
-                return false;
-            }
-
-            _imageStream.Position -= _structureBytes.Length;
-
-            List<IndexEntry> vrIndex = new();
-
-            for(ushort i = 0; i < idxHeader.entries; i++)
-            {
-                _structureBytes = new byte[Marshal.SizeOf<IndexEntry>()];
-                _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                IndexEntry entry = Marshal.SpanToStructureLittleEndian<IndexEntry>(_structureBytes);
-
-                AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                           "Block type {0} with data type {1} is indexed to be at {2}", entry.blockType,
-                                           entry.dataType, entry.offset);
-
-                vrIndex.Add(entry);
-            }
-
-            // Read up to 1MiB at a time for verification
-            const int verifySize = 1024 * 1024;
-
-            foreach(IndexEntry entry in vrIndex)
-            {
-                _imageStream.Position = (long)entry.offset;
-                Crc64Context crcVerify;
-                ulong        readBytes;
-                byte[]       verifyBytes;
-
-                switch(entry.blockType)
-                {
-                    case BlockType.DataBlock:
-                        _structureBytes = new byte[Marshal.SizeOf<BlockHeader>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        BlockHeader blockHeader = Marshal.SpanToStructureLittleEndian<BlockHeader>(_structureBytes);
-
-                        crcVerify = new Crc64Context();
-                        readBytes = 0;
-
-                        AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                   "Verifying data block type {0} at position {1}", entry.dataType,
-                                                   entry.offset);
-
-                        while(readBytes + verifySize < blockHeader.cmpLength)
-                        {
-                            verifyBytes = new byte[verifySize];
-                            _imageStream.Read(verifyBytes, 0, verifyBytes.Length);
-                            crcVerify.Update(verifyBytes);
-                            readBytes += (ulong)verifyBytes.LongLength;
-                        }
-
-                        verifyBytes = new byte[blockHeader.cmpLength - readBytes];
+                    while(readBytes + verifySize < blockHeader.cmpLength)
+                    {
+                        verifyBytes = new byte[verifySize];
                         _imageStream.Read(verifyBytes, 0, verifyBytes.Length);
                         crcVerify.Update(verifyBytes);
+                        readBytes += (ulong)verifyBytes.LongLength;
+                    }
 
-                        verifyCrc = crcVerify.Final();
+                    verifyBytes = new byte[blockHeader.cmpLength - readBytes];
+                    _imageStream.Read(verifyBytes, 0, verifyBytes.Length);
+                    crcVerify.Update(verifyBytes);
 
-                        if(BitConverter.ToUInt64(verifyCrc, 0) != blockHeader.cmpCrc64)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Expected block CRC {0:X16} but got {1:X16}",
-                                                       blockHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0));
-
-                            return false;
-                        }
-
-                        break;
-                    case BlockType.DeDuplicationTable:
-                        _structureBytes = new byte[Marshal.SizeOf<DdtHeader>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        DdtHeader ddtHeader = Marshal.SpanToStructureLittleEndian<DdtHeader>(_structureBytes);
-
-                        crcVerify = new Crc64Context();
-                        readBytes = 0;
+                    verifyCrc = crcVerify.Final();
 
+                    if(BitConverter.ToUInt64(verifyCrc, 0) != blockHeader.cmpCrc64)
+                    {
                         AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                   "Verifying deduplication table type {0} at position {1}",
-                                                   entry.dataType, entry.offset);
+                                                   "Expected block CRC {0:X16} but got {1:X16}",
+                                                   blockHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0));
 
-                        while(readBytes + verifySize < ddtHeader.cmpLength)
-                        {
-                            verifyBytes = new byte[readBytes];
-                            _imageStream.Read(verifyBytes, 0, verifyBytes.Length);
-                            crcVerify.Update(verifyBytes);
-                            readBytes += (ulong)verifyBytes.LongLength;
-                        }
+                        return false;
+                    }
 
-                        verifyBytes = new byte[ddtHeader.cmpLength - readBytes];
+                    break;
+                case BlockType.DeDuplicationTable:
+                    _structureBytes = new byte[Marshal.SizeOf<DdtHeader>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                    DdtHeader ddtHeader = Marshal.SpanToStructureLittleEndian<DdtHeader>(_structureBytes);
+
+                    crcVerify = new Crc64Context();
+                    readBytes = 0;
+
+                    AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                               "Verifying deduplication table type {0} at position {1}",
+                                               entry.dataType, entry.offset);
+
+                    while(readBytes + verifySize < ddtHeader.cmpLength)
+                    {
+                        verifyBytes = new byte[readBytes];
                         _imageStream.Read(verifyBytes, 0, verifyBytes.Length);
                         crcVerify.Update(verifyBytes);
+                        readBytes += (ulong)verifyBytes.LongLength;
+                    }
 
-                        verifyCrc = crcVerify.Final();
+                    verifyBytes = new byte[ddtHeader.cmpLength - readBytes];
+                    _imageStream.Read(verifyBytes, 0, verifyBytes.Length);
+                    crcVerify.Update(verifyBytes);
 
-                        if(BitConverter.ToUInt64(verifyCrc, 0) != ddtHeader.cmpCrc64)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin", "Expected DDT CRC {0:X16} but got {1:X16}",
-                                                       ddtHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0));
+                    verifyCrc = crcVerify.Final();
 
-                            return false;
-                        }
+                    if(BitConverter.ToUInt64(verifyCrc, 0) != ddtHeader.cmpCrc64)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Expected DDT CRC {0:X16} but got {1:X16}",
+                                                   ddtHeader.cmpCrc64, BitConverter.ToUInt64(verifyCrc, 0));
 
-                        break;
-                    case BlockType.TracksBlock:
-                        _structureBytes = new byte[Marshal.SizeOf<TracksHeader>()];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        TracksHeader trkHeader = Marshal.SpanToStructureLittleEndian<TracksHeader>(_structureBytes);
+                        return false;
+                    }
 
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Track block at {0} contains {1} entries",
-                                                   _header.indexOffset, trkHeader.entries);
+                    break;
+                case BlockType.TracksBlock:
+                    _structureBytes = new byte[Marshal.SizeOf<TracksHeader>()];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                    TracksHeader trkHeader = Marshal.SpanToStructureLittleEndian<TracksHeader>(_structureBytes);
 
-                        _structureBytes = new byte[Marshal.SizeOf<TrackEntry>() * trkHeader.entries];
-                        _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
-                        Crc64Context.Data(_structureBytes, out verifyCrc);
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Track block at {0} contains {1} entries",
+                                               _header.indexOffset, trkHeader.entries);
 
-                        if(BitConverter.ToUInt64(verifyCrc, 0) != trkHeader.crc64)
-                        {
-                            AaruConsole.DebugWriteLine("Aaru Format plugin",
-                                                       "Expected index CRC {0:X16} but got {1:X16}", trkHeader.crc64,
-                                                       BitConverter.ToUInt64(verifyCrc, 0));
+                    _structureBytes = new byte[Marshal.SizeOf<TrackEntry>() * trkHeader.entries];
+                    _imageStream.Read(_structureBytes, 0, _structureBytes.Length);
+                    Crc64Context.Data(_structureBytes, out verifyCrc);
 
-                            return false;
-                        }
+                    if(BitConverter.ToUInt64(verifyCrc, 0) != trkHeader.crc64)
+                    {
+                        AaruConsole.DebugWriteLine("Aaru Format plugin",
+                                                   "Expected index CRC {0:X16} but got {1:X16}", trkHeader.crc64,
+                                                   BitConverter.ToUInt64(verifyCrc, 0));
 
-                        break;
-                    default:
-                        AaruConsole.DebugWriteLine("Aaru Format plugin", "Ignored field type {0}", entry.blockType);
+                        return false;
+                    }
 
-                        break;
-                }
+                    break;
+                default:
+                    AaruConsole.DebugWriteLine("Aaru Format plugin", "Ignored field type {0}", entry.blockType);
+
+                    break;
             }
-
-            return true;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
+    {
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return null;
+
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+
+        // Right now only CompactDisc sectors are verifiable
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
         {
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return null;
+            for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+                unknownLbas.Add(i);
 
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
-
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+            return null;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+
+        for(int i = 0; i < length; i++)
+        {
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+
+            switch(sectorStatus)
+            {
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
+
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
+
+                    break;
+            }
+        }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        // Right now only CompactDisc sectors are verifiable
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
         {
             failingLbas = new List<ulong>();
             unknownLbas = new List<ulong>();
 
-            // Right now only CompactDisc sectors are verifiable
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-            {
-                for(ulong i = sectorAddress; i < sectorAddress + length; i++)
-                    unknownLbas.Add(i);
+            for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+                unknownLbas.Add(i);
 
-                return null;
-            }
-
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-
-            for(int i = 0; i < length; i++)
-            {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
-
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
-            }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
+            return null;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            // Right now only CompactDisc sectors are verifiable
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+
+            switch(sectorStatus)
             {
-                failingLbas = new List<ulong>();
-                unknownLbas = new List<ulong>();
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                for(ulong i = sectorAddress; i < sectorAddress + length; i++)
-                    unknownLbas.Add(i);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                return null;
+                    break;
             }
-
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
-            {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
-
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
-            }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Alcohol120.cs b/Aaru.Images/Alcohol120/Alcohol120.cs
index 16c1063ee..d495979de 100644
--- a/Aaru.Images/Alcohol120/Alcohol120.cs
+++ b/Aaru.Images/Alcohol120/Alcohol120.cs
@@ -36,53 +36,52 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing Alcohol 120% disk images</summary>
-    public sealed partial class Alcohol120 : IWritableOpticalImage
-    {
-        Footer                                  _alcFooter;
-        IFilter                                 _alcImage;
-        Dictionary<int, Session>                _alcSessions;
-        Dictionary<int, Dictionary<int, Track>> _alcToc;
-        Dictionary<int, TrackExtra>             _alcTrackExtras;
-        Dictionary<int, Track>                  _alcTracks;
-        byte[]                                  _bca;
-        FileStream                              _descriptorStream;
-        byte[]                                  _dmi;
-        byte[]                                  _fullToc;
-        Header                                  _header;
-        ImageInfo                               _imageInfo;
-        Stream                                  _imageStream;
-        bool                                    _isDvd;
-        Dictionary<uint, ulong>                 _offsetMap;
-        byte[]                                  _pfi;
-        Dictionary<byte, byte>                  _trackFlags;
-        List<CommonTypes.Structs.Track>         _writingTracks;
+namespace Aaru.DiscImages;
 
-        public Alcohol120() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = true,
-            HasSessions           = true,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing Alcohol 120% disk images</summary>
+public sealed partial class Alcohol120 : IWritableOpticalImage
+{
+    Footer                                  _alcFooter;
+    IFilter                                 _alcImage;
+    Dictionary<int, Session>                _alcSessions;
+    Dictionary<int, Dictionary<int, Track>> _alcToc;
+    Dictionary<int, TrackExtra>             _alcTrackExtras;
+    Dictionary<int, Track>                  _alcTracks;
+    byte[]                                  _bca;
+    FileStream                              _descriptorStream;
+    byte[]                                  _dmi;
+    byte[]                                  _fullToc;
+    Header                                  _header;
+    ImageInfo                               _imageInfo;
+    Stream                                  _imageStream;
+    bool                                    _isDvd;
+    Dictionary<uint, ulong>                 _offsetMap;
+    byte[]                                  _pfi;
+    Dictionary<byte, byte>                  _trackFlags;
+    List<CommonTypes.Structs.Track>         _writingTracks;
+
+    public Alcohol120() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = true,
+        HasSessions           = true,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Constants.cs b/Aaru.Images/Alcohol120/Constants.cs
index 73ded6780..9c09b0ce7 100644
--- a/Aaru.Images/Alcohol120/Constants.cs
+++ b/Aaru.Images/Alcohol120/Constants.cs
@@ -30,14 +30,13 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Alcohol120
 {
-    public sealed partial class Alcohol120
+    const byte MAXIMUM_SUPPORTED_VERSION = 1;
+    readonly byte[] _alcoholSignature =
     {
-        const byte MAXIMUM_SUPPORTED_VERSION = 1;
-        readonly byte[] _alcoholSignature =
-        {
-            0x4d, 0x45, 0x44, 0x49, 0x41, 0x20, 0x44, 0x45, 0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x4f, 0x52
-        };
-    }
+        0x4d, 0x45, 0x44, 0x49, 0x41, 0x20, 0x44, 0x45, 0x53, 0x43, 0x52, 0x49, 0x50, 0x54, 0x4f, 0x52
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Enums.cs b/Aaru.Images/Alcohol120/Enums.cs
index a67c0701e..aaf4cb8d0 100644
--- a/Aaru.Images/Alcohol120/Enums.cs
+++ b/Aaru.Images/Alcohol120/Enums.cs
@@ -32,29 +32,28 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Alcohol120
 {
-    public sealed partial class Alcohol120
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum MediumType : ushort
     {
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum MediumType : ushort
-        {
-            CD  = 0x00, CDR  = 0x01, CDRW = 0x02,
-            DVD = 0x10, DVDR = 0x12
-        }
+        CD  = 0x00, CDR  = 0x01, CDRW = 0x02,
+        DVD = 0x10, DVDR = 0x12
+    }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum TrackMode : byte
-        {
-            NoData     = 0x00, DVD        = 0x02, Audio    = 0xA9,
-            AudioAlt   = 0xE9, Mode1      = 0xAA, Mode1Alt = 0xEA,
-            Mode2      = 0xAB, Mode2F1    = 0xEC, Mode2F2  = 0xED,
-            Mode2F1Alt = 0xAC, Mode2F2Alt = 0xAD
-        }
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum TrackMode : byte
+    {
+        NoData     = 0x00, DVD        = 0x02, Audio    = 0xA9,
+        AudioAlt   = 0xE9, Mode1      = 0xAA, Mode1Alt = 0xEA,
+        Mode2      = 0xAB, Mode2F1    = 0xEC, Mode2F2  = 0xED,
+        Mode2F1Alt = 0xAC, Mode2F2Alt = 0xAD
+    }
 
-        enum SubchannelMode : byte
-        {
-            None = 0x00, Interleaved = 0x08
-        }
+    enum SubchannelMode : byte
+    {
+        None = 0x00, Interleaved = 0x08
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Helpers.cs b/Aaru.Images/Alcohol120/Helpers.cs
index 0a4f3c286..b1906aa09 100644
--- a/Aaru.Images/Alcohol120/Helpers.cs
+++ b/Aaru.Images/Alcohol120/Helpers.cs
@@ -33,124 +33,123 @@
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Alcohol120
 {
-    public sealed partial class Alcohol120
+    static ushort TrackModeToCookedBytesPerSector(TrackMode trackMode)
     {
-        static ushort TrackModeToCookedBytesPerSector(TrackMode trackMode)
+        switch(trackMode)
         {
-            switch(trackMode)
-            {
-                case TrackMode.Mode1:
-                case TrackMode.Mode1Alt:
-                case TrackMode.Mode2F1:
-                case TrackMode.Mode2F1Alt: return 2048;
-                case TrackMode.Mode2F2:
-                case TrackMode.Mode2F2Alt: return 2324;
-                case TrackMode.Mode2: return 2336;
-                case TrackMode.Audio:
-                case TrackMode.AudioAlt: return 2352;
-                case TrackMode.DVD: return 2048;
-                default:            return 0;
-            }
+            case TrackMode.Mode1:
+            case TrackMode.Mode1Alt:
+            case TrackMode.Mode2F1:
+            case TrackMode.Mode2F1Alt: return 2048;
+            case TrackMode.Mode2F2:
+            case TrackMode.Mode2F2Alt: return 2324;
+            case TrackMode.Mode2: return 2336;
+            case TrackMode.Audio:
+            case TrackMode.AudioAlt: return 2352;
+            case TrackMode.DVD: return 2048;
+            default:            return 0;
         }
-
-        static TrackType TrackModeToTrackType(TrackMode trackType)
-        {
-            switch(trackType)
-            {
-                case TrackMode.Mode1:
-                case TrackMode.Mode1Alt: return TrackType.CdMode1;
-                case TrackMode.Mode2F1:
-                case TrackMode.Mode2F1Alt: return TrackType.CdMode2Form1;
-                case TrackMode.Mode2F2:
-                case TrackMode.Mode2F2Alt: return TrackType.CdMode2Form2;
-                case TrackMode.Mode2: return TrackType.CdMode2Formless;
-                case TrackMode.Audio:
-                case TrackMode.AudioAlt: return TrackType.Audio;
-                default: return TrackType.Data;
-            }
-        }
-
-        static MediaType MediumTypeToMediaType(MediumType discType)
-        {
-            switch(discType)
-            {
-                case MediumType.CD:   return MediaType.CD;
-                case MediumType.CDR:  return MediaType.CDR;
-                case MediumType.CDRW: return MediaType.CDRW;
-                case MediumType.DVD:  return MediaType.DVDROM;
-                case MediumType.DVDR: return MediaType.DVDR;
-                default:              return MediaType.Unknown;
-            }
-        }
-
-        static MediumType MediaTypeToMediumType(MediaType type)
-        {
-            switch(type)
-            {
-                case MediaType.CD:
-                case MediaType.CDDA:
-                case MediaType.CDEG:
-                case MediaType.CDG:
-                case MediaType.CDI:
-                case MediaType.CDMIDI:
-                case MediaType.CDPLUS:
-                case MediaType.CDROM:
-                case MediaType.CDROMXA:
-                case MediaType.CDV:
-                case MediaType.DTSCD:
-                case MediaType.JaguarCD:
-                case MediaType.MEGACD:
-                case MediaType.PS1CD:
-                case MediaType.PS2CD:
-                case MediaType.SuperCDROM2:
-                case MediaType.SVCD:
-                case MediaType.SATURNCD:
-                case MediaType.ThreeDO:
-                case MediaType.VCD:
-                case MediaType.VCDHD:
-                case MediaType.NeoGeoCD:
-                case MediaType.PCFX:
-                case MediaType.CDTV:
-                case MediaType.CD32:
-                case MediaType.Nuon:
-                case MediaType.Playdia:
-                case MediaType.Pippin:
-                case MediaType.FMTOWNS:
-                case MediaType.MilCD:
-                case MediaType.VideoNow:
-                case MediaType.VideoNowColor:
-                case MediaType.VideoNowXp:
-                case MediaType.CVD: return MediumType.CD;
-                case MediaType.CDR: return MediumType.CDR;
-                case MediaType.CDRW:
-                case MediaType.CDMRW: return MediumType.CDRW;
-                case MediaType.DVDR:
-                case MediaType.DVDRW:
-                case MediaType.DVDPR:
-                case MediaType.DVDRDL:
-                case MediaType.DVDRWDL:
-                case MediaType.DVDPRDL:
-                case MediaType.DVDPRWDL: return MediumType.DVDR;
-                default: return MediumType.DVD;
-            }
-        }
-
-        static TrackMode TrackTypeToTrackMode(TrackType type)
-        {
-            switch(type)
-            {
-                case TrackType.Audio:           return TrackMode.Audio;
-                case TrackType.CdMode1:         return TrackMode.Mode1;
-                case TrackType.CdMode2Formless: return TrackMode.Mode2;
-                case TrackType.CdMode2Form1:    return TrackMode.Mode2F1;
-                case TrackType.CdMode2Form2:    return TrackMode.Mode2F2;
-                default:                        return TrackMode.DVD;
-            }
-        }
-
-        static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
-            ((byte)((sector + 150) / 75 / 60), (byte)((sector + 150) / 75 % 60), (byte)((sector + 150) % 75));
     }
+
+    static TrackType TrackModeToTrackType(TrackMode trackType)
+    {
+        switch(trackType)
+        {
+            case TrackMode.Mode1:
+            case TrackMode.Mode1Alt: return TrackType.CdMode1;
+            case TrackMode.Mode2F1:
+            case TrackMode.Mode2F1Alt: return TrackType.CdMode2Form1;
+            case TrackMode.Mode2F2:
+            case TrackMode.Mode2F2Alt: return TrackType.CdMode2Form2;
+            case TrackMode.Mode2: return TrackType.CdMode2Formless;
+            case TrackMode.Audio:
+            case TrackMode.AudioAlt: return TrackType.Audio;
+            default: return TrackType.Data;
+        }
+    }
+
+    static MediaType MediumTypeToMediaType(MediumType discType)
+    {
+        switch(discType)
+        {
+            case MediumType.CD:   return MediaType.CD;
+            case MediumType.CDR:  return MediaType.CDR;
+            case MediumType.CDRW: return MediaType.CDRW;
+            case MediumType.DVD:  return MediaType.DVDROM;
+            case MediumType.DVDR: return MediaType.DVDR;
+            default:              return MediaType.Unknown;
+        }
+    }
+
+    static MediumType MediaTypeToMediumType(MediaType type)
+    {
+        switch(type)
+        {
+            case MediaType.CD:
+            case MediaType.CDDA:
+            case MediaType.CDEG:
+            case MediaType.CDG:
+            case MediaType.CDI:
+            case MediaType.CDMIDI:
+            case MediaType.CDPLUS:
+            case MediaType.CDROM:
+            case MediaType.CDROMXA:
+            case MediaType.CDV:
+            case MediaType.DTSCD:
+            case MediaType.JaguarCD:
+            case MediaType.MEGACD:
+            case MediaType.PS1CD:
+            case MediaType.PS2CD:
+            case MediaType.SuperCDROM2:
+            case MediaType.SVCD:
+            case MediaType.SATURNCD:
+            case MediaType.ThreeDO:
+            case MediaType.VCD:
+            case MediaType.VCDHD:
+            case MediaType.NeoGeoCD:
+            case MediaType.PCFX:
+            case MediaType.CDTV:
+            case MediaType.CD32:
+            case MediaType.Nuon:
+            case MediaType.Playdia:
+            case MediaType.Pippin:
+            case MediaType.FMTOWNS:
+            case MediaType.MilCD:
+            case MediaType.VideoNow:
+            case MediaType.VideoNowColor:
+            case MediaType.VideoNowXp:
+            case MediaType.CVD: return MediumType.CD;
+            case MediaType.CDR: return MediumType.CDR;
+            case MediaType.CDRW:
+            case MediaType.CDMRW: return MediumType.CDRW;
+            case MediaType.DVDR:
+            case MediaType.DVDRW:
+            case MediaType.DVDPR:
+            case MediaType.DVDRDL:
+            case MediaType.DVDRWDL:
+            case MediaType.DVDPRDL:
+            case MediaType.DVDPRWDL: return MediumType.DVDR;
+            default: return MediumType.DVD;
+        }
+    }
+
+    static TrackMode TrackTypeToTrackMode(TrackType type)
+    {
+        switch(type)
+        {
+            case TrackType.Audio:           return TrackMode.Audio;
+            case TrackType.CdMode1:         return TrackMode.Mode1;
+            case TrackType.CdMode2Formless: return TrackMode.Mode2;
+            case TrackType.CdMode2Form1:    return TrackMode.Mode2F1;
+            case TrackType.CdMode2Form2:    return TrackMode.Mode2F2;
+            default:                        return TrackMode.DVD;
+        }
+    }
+
+    static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
+        ((byte)((sector + 150) / 75 / 60), (byte)((sector + 150) / 75 % 60), (byte)((sector + 150) % 75));
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Identify.cs b/Aaru.Images/Alcohol120/Identify.cs
index fb875b8a4..ae1b3cbbd 100644
--- a/Aaru.Images/Alcohol120/Identify.cs
+++ b/Aaru.Images/Alcohol120/Identify.cs
@@ -35,24 +35,23 @@ using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Alcohol120
 {
-    public sealed partial class Alcohol120
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 88)
-                return false;
+        if(stream.Length < 88)
+            return false;
 
-            byte[] hdr = new byte[88];
-            stream.Read(hdr, 0, 88);
-            Header header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
+        byte[] hdr = new byte[88];
+        stream.Read(hdr, 0, 88);
+        Header header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
 
-            return header.signature.SequenceEqual(_alcoholSignature) && header.version[0] <= MAXIMUM_SUPPORTED_VERSION;
-        }
+        return header.signature.SequenceEqual(_alcoholSignature) && header.version[0] <= MAXIMUM_SUPPORTED_VERSION;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Properties.cs b/Aaru.Images/Alcohol120/Properties.cs
index 87524bdbc..c15f7ffe0 100644
--- a/Aaru.Images/Alcohol120/Properties.cs
+++ b/Aaru.Images/Alcohol120/Properties.cs
@@ -38,165 +38,164 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Alcohol120
 {
-    public sealed partial class Alcohol120
+    /// <inheritdoc />
+    public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks  |
+                                                           OpticalImageCapabilities.CanStoreDataTracks   |
+                                                           OpticalImageCapabilities.CanStoreSubchannelRw |
+
+                                                           // TODO: Disabled until 6.0
+                                                           //OpticalImageCapabilities.CanStoreSessions     |
+                                                           OpticalImageCapabilities.CanStoreIsrc       |
+                                                           OpticalImageCapabilities.CanStoreCdText     |
+                                                           OpticalImageCapabilities.CanStoreMcn        |
+                                                           OpticalImageCapabilities.CanStoreRawData    |
+                                                           OpticalImageCapabilities.CanStoreCookedData |
+                                                           OpticalImageCapabilities.CanStoreMultipleTracks;
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "Alcohol 120% Media Descriptor Structure";
+    /// <inheritdoc />
+    public Guid Id => new("A78FBEBA-0307-4915-BDE3-B8A3B57F843F");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public string Format => "Alcohol 120% Media Descriptor Structure";
+
+    /// <inheritdoc />
+    public List<Partition> Partitions { get; private set; }
+
+    /// <inheritdoc />
+    public List<CommonTypes.Structs.Track> Tracks
     {
-        /// <inheritdoc />
-        public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks  |
-                                                               OpticalImageCapabilities.CanStoreDataTracks   |
-                                                               OpticalImageCapabilities.CanStoreSubchannelRw |
-
-                                                               // TODO: Disabled until 6.0
-                                                               //OpticalImageCapabilities.CanStoreSessions     |
-                                                               OpticalImageCapabilities.CanStoreIsrc       |
-                                                               OpticalImageCapabilities.CanStoreCdText     |
-                                                               OpticalImageCapabilities.CanStoreMcn        |
-                                                               OpticalImageCapabilities.CanStoreRawData    |
-                                                               OpticalImageCapabilities.CanStoreCookedData |
-                                                               OpticalImageCapabilities.CanStoreMultipleTracks;
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "Alcohol 120% Media Descriptor Structure";
-        /// <inheritdoc />
-        public Guid Id => new("A78FBEBA-0307-4915-BDE3-B8A3B57F843F");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public string Format => "Alcohol 120% Media Descriptor Structure";
-
-        /// <inheritdoc />
-        public List<Partition> Partitions { get; private set; }
-
-        /// <inheritdoc />
-        public List<CommonTypes.Structs.Track> Tracks
+        get
         {
-            get
+            if(_writingTracks != null &&
+               _alcTracks     == null)
+                return _writingTracks;
+
+            List<CommonTypes.Structs.Track> tracks = new();
+            _alcTracks ??= new Dictionary<int, Track>();
+
+            foreach(Track alcTrack in _alcTracks.Values)
             {
-                if(_writingTracks != null &&
-                   _alcTracks     == null)
-                    return _writingTracks;
+                ushort sessionNo =
+                    (from session in Sessions
+                     where alcTrack.point >= session.StartTrack && alcTrack.point <= session.EndTrack
+                     select session.Sequence).FirstOrDefault();
 
-                List<CommonTypes.Structs.Track> tracks = new();
-                _alcTracks ??= new Dictionary<int, Track>();
+                if(!_alcTrackExtras.TryGetValue(alcTrack.point, out TrackExtra alcExtra))
+                    continue;
 
-                foreach(Track alcTrack in _alcTracks.Values)
+                var aaruTrack = new CommonTypes.Structs.Track
                 {
-                    ushort sessionNo =
-                        (from session in Sessions
-                         where alcTrack.point >= session.StartTrack && alcTrack.point <= session.EndTrack
-                         select session.Sequence).FirstOrDefault();
+                    StartSector       = alcTrack.startLba,
+                    EndSector         = alcTrack.startLba + alcExtra.sectors - 1,
+                    Pregap            = alcExtra.pregap,
+                    Session           = sessionNo,
+                    Sequence          = alcTrack.point,
+                    Type              = TrackModeToTrackType(alcTrack.mode),
+                    Filter            = _alcImage,
+                    File              = _alcImage.Filename,
+                    FileOffset        = alcTrack.startOffset,
+                    FileType          = "BINARY",
+                    RawBytesPerSector = alcTrack.sectorSize,
+                    BytesPerSector    = TrackModeToCookedBytesPerSector(alcTrack.mode)
+                };
 
-                    if(!_alcTrackExtras.TryGetValue(alcTrack.point, out TrackExtra alcExtra))
-                        continue;
+                if(alcExtra.pregap > 0)
+                    aaruTrack.Indexes.Add(0, (int)(alcTrack.startLba - alcExtra.pregap));
 
-                    var aaruTrack = new CommonTypes.Structs.Track
-                    {
-                        StartSector       = alcTrack.startLba,
-                        EndSector         = alcTrack.startLba + alcExtra.sectors - 1,
-                        Pregap            = alcExtra.pregap,
-                        Session           = sessionNo,
-                        Sequence          = alcTrack.point,
-                        Type              = TrackModeToTrackType(alcTrack.mode),
-                        Filter            = _alcImage,
-                        File              = _alcImage.Filename,
-                        FileOffset        = alcTrack.startOffset,
-                        FileType          = "BINARY",
-                        RawBytesPerSector = alcTrack.sectorSize,
-                        BytesPerSector    = TrackModeToCookedBytesPerSector(alcTrack.mode)
-                    };
+                aaruTrack.Indexes.Add(1, (int)alcTrack.startLba);
 
-                    if(alcExtra.pregap > 0)
-                        aaruTrack.Indexes.Add(0, (int)(alcTrack.startLba - alcExtra.pregap));
+                if(aaruTrack.Indexes.ContainsKey(0) &&
+                   aaruTrack.Indexes[0] >= 0)
+                    aaruTrack.StartSector = (ulong)aaruTrack.Indexes[0];
 
-                    aaruTrack.Indexes.Add(1, (int)alcTrack.startLba);
+                switch(alcTrack.subMode)
+                {
+                    case SubchannelMode.Interleaved:
+                        aaruTrack.SubchannelFilter = _alcImage;
+                        aaruTrack.SubchannelFile   = _alcImage.Filename;
+                        aaruTrack.SubchannelOffset = alcTrack.startOffset;
+                        aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
 
-                    if(aaruTrack.Indexes.ContainsKey(0) &&
-                       aaruTrack.Indexes[0] >= 0)
-                        aaruTrack.StartSector = (ulong)aaruTrack.Indexes[0];
+                        break;
+                    case SubchannelMode.None:
+                        aaruTrack.SubchannelType = TrackSubchannelType.None;
 
-                    switch(alcTrack.subMode)
-                    {
-                        case SubchannelMode.Interleaved:
-                            aaruTrack.SubchannelFilter = _alcImage;
-                            aaruTrack.SubchannelFile   = _alcImage.Filename;
-                            aaruTrack.SubchannelOffset = alcTrack.startOffset;
-                            aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
-
-                            break;
-                        case SubchannelMode.None:
-                            aaruTrack.SubchannelType = TrackSubchannelType.None;
-
-                            break;
-                    }
-
-                    if(_header.type != MediumType.CD  &&
-                       _header.type != MediumType.CDR &&
-                       _header.type != MediumType.CDRW)
-                    {
-                        aaruTrack.Pregap = 0;
-                        aaruTrack.Indexes?.Clear();
-                    }
-
-                    tracks.Add(aaruTrack);
+                        break;
                 }
 
-                return tracks;
+                if(_header.type != MediumType.CD  &&
+                   _header.type != MediumType.CDR &&
+                   _header.type != MediumType.CDRW)
+                {
+                    aaruTrack.Pregap = 0;
+                    aaruTrack.Indexes?.Clear();
+                }
+
+                tracks.Add(aaruTrack);
             }
+
+            return tracks;
         }
-
-        /// <inheritdoc />
-        public List<CommonTypes.Structs.Session> Sessions { get; private set; }
-
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new[]
-        {
-            MediaTagType.CD_FullTOC, MediaTagType.DVD_BCA, MediaTagType.DVD_DMI, MediaTagType.DVD_PFI
-        };
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
-        {
-            SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
-            SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubHeader,
-            SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags, SectorTagType.CdSectorSubchannel
-        };
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.BDR, MediaType.BDRE, MediaType.BDREXL, MediaType.BDROM, MediaType.UHDBD, MediaType.BDRXL,
-            MediaType.CBHD, MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI,
-            MediaType.CDMIDI, MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA,
-            MediaType.CDRW, MediaType.CDV, MediaType.DVDDownload, MediaType.DVDPR, MediaType.DVDPRDL, MediaType.DVDPRW,
-            MediaType.DVDPRWDL, MediaType.DVDR, MediaType.DVDRAM, MediaType.DVDRDL, MediaType.DVDROM, MediaType.DVDRW,
-            MediaType.DVDRWDL, MediaType.EVD, MediaType.FDDVD, MediaType.DTSCD, MediaType.FVD, MediaType.HDDVDR,
-            MediaType.HDDVDRAM, MediaType.HDDVDRDL, MediaType.HDDVDROM, MediaType.HDDVDRW, MediaType.HDDVDRWDL,
-            MediaType.HDVMD, MediaType.HVD, MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD,
-            MediaType.PS2DVD, MediaType.PS3BD, MediaType.PS3DVD, MediaType.PS4BD, MediaType.PS5BD,
-            MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO,
-            MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD,
-            MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin,
-            MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, MediaType.VideoNowColor, MediaType.VideoNowXp,
-            MediaType.CVD, MediaType.PCD
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".mds"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
     }
+
+    /// <inheritdoc />
+    public List<CommonTypes.Structs.Session> Sessions { get; private set; }
+
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new[]
+    {
+        MediaTagType.CD_FullTOC, MediaTagType.DVD_BCA, MediaTagType.DVD_DMI, MediaTagType.DVD_PFI
+    };
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new[]
+    {
+        SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
+        SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubHeader,
+        SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags, SectorTagType.CdSectorSubchannel
+    };
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.BDR, MediaType.BDRE, MediaType.BDREXL, MediaType.BDROM, MediaType.UHDBD, MediaType.BDRXL,
+        MediaType.CBHD, MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI,
+        MediaType.CDMIDI, MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA,
+        MediaType.CDRW, MediaType.CDV, MediaType.DVDDownload, MediaType.DVDPR, MediaType.DVDPRDL, MediaType.DVDPRW,
+        MediaType.DVDPRWDL, MediaType.DVDR, MediaType.DVDRAM, MediaType.DVDRDL, MediaType.DVDROM, MediaType.DVDRW,
+        MediaType.DVDRWDL, MediaType.EVD, MediaType.FDDVD, MediaType.DTSCD, MediaType.FVD, MediaType.HDDVDR,
+        MediaType.HDDVDRAM, MediaType.HDDVDRDL, MediaType.HDDVDROM, MediaType.HDDVDRW, MediaType.HDDVDRWDL,
+        MediaType.HDVMD, MediaType.HVD, MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD,
+        MediaType.PS2DVD, MediaType.PS3BD, MediaType.PS3DVD, MediaType.PS4BD, MediaType.PS5BD,
+        MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO,
+        MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD, MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD,
+        MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon, MediaType.Playdia, MediaType.Pippin,
+        MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow, MediaType.VideoNowColor, MediaType.VideoNowXp,
+        MediaType.CVD, MediaType.PCD
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
+            {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".mds"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Read.cs b/Aaru.Images/Alcohol120/Read.cs
index d7f62ad1b..514fc1526 100644
--- a/Aaru.Images/Alcohol120/Read.cs
+++ b/Aaru.Images/Alcohol120/Read.cs
@@ -44,1510 +44,1509 @@ using Aaru.Decoders.DVD;
 using Aaru.Helpers;
 using DMI = Aaru.Decoders.Xbox.DMI;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Alcohol120
 {
-    public sealed partial class Alcohol120
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 88)
+            return ErrorNumber.InvalidArgument;
+
+        _isDvd = false;
+        byte[] hdr = new byte[88];
+        stream.Read(hdr, 0, 88);
+        _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
+
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.signature = {0}",
+                                   Encoding.ASCII.GetString(_header.signature));
+
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.version = {0}.{1}", _header.version[0],
+                                   _header.version[1]);
+
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.type = {0}", _header.type);
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.sessions = {0}", _header.sessions);
+
+        for(int i = 0; i < _header.unknown1.Length; i++)
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown1[{1}] = 0x{0:X4}",
+                                       _header.unknown1[i], i);
+
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.bcaLength = {0}", _header.bcaLength);
+
+        for(int i = 0; i < _header.unknown2.Length; i++)
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown2[{1}] = 0x{0:X8}",
+                                       _header.unknown2[i], i);
+
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.bcaOffset = {0}", _header.bcaOffset);
+
+        for(int i = 0; i < _header.unknown3.Length; i++)
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown3[{1}] = 0x{0:X8}",
+                                       _header.unknown3[i], i);
+
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.structuresOffset = {0}",
+                                   _header.structuresOffset);
+
+        for(int i = 0; i < _header.unknown4.Length; i++)
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown4[{1}] = 0x{0:X8}",
+                                       _header.unknown4[i], i);
+
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.sessionOffset = {0}", _header.sessionOffset);
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.dpmOffset = {0}", _header.dpmOffset);
+
+        if(_header.version[0] > MAXIMUM_SUPPORTED_VERSION)
+            return ErrorNumber.NotSupported;
+
+        stream.Seek(_header.sessionOffset, SeekOrigin.Begin);
+        _alcSessions = new Dictionary<int, Session>();
+
+        for(int i = 0; i < _header.sessions; i++)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            byte[] sesHdr = new byte[24];
+            stream.Read(sesHdr, 0, 24);
+            Session session = Marshal.SpanToStructureLittleEndian<Session>(sesHdr);
 
-            if(stream.Length < 88)
-                return ErrorNumber.InvalidArgument;
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionStart = {0}",
+                                       session.sessionStart, i);
 
-            _isDvd = false;
-            byte[] hdr = new byte[88];
-            stream.Read(hdr, 0, 88);
-            _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionEnd = {0}", session.sessionEnd,
+                                       i);
 
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.signature = {0}",
-                                       Encoding.ASCII.GetString(_header.signature));
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionSequence = {0}",
+                                       session.sessionSequence, i);
 
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.version = {0}.{1}", _header.version[0],
-                                       _header.version[1]);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].allBlocks = {0}", session.allBlocks, i);
 
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.type = {0}", _header.type);
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.sessions = {0}", _header.sessions);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].nonTrackBlocks = {0}",
+                                       session.nonTrackBlocks, i);
 
-            for(int i = 0; i < _header.unknown1.Length; i++)
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown1[{1}] = 0x{0:X4}",
-                                           _header.unknown1[i], i);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].firstTrack = {0}", session.firstTrack,
+                                       i);
 
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.bcaLength = {0}", _header.bcaLength);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].lastTrack = {0}", session.lastTrack, i);
 
-            for(int i = 0; i < _header.unknown2.Length; i++)
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown2[{1}] = 0x{0:X8}",
-                                           _header.unknown2[i], i);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].unknown = 0x{0:X8}", session.unknown,
+                                       i);
 
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.bcaOffset = {0}", _header.bcaOffset);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].trackOffset = {0}", session.trackOffset,
+                                       i);
 
-            for(int i = 0; i < _header.unknown3.Length; i++)
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown3[{1}] = 0x{0:X8}",
-                                           _header.unknown3[i], i);
-
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.structuresOffset = {0}",
-                                       _header.structuresOffset);
-
-            for(int i = 0; i < _header.unknown4.Length; i++)
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.unknown4[{1}] = 0x{0:X8}",
-                                           _header.unknown4[i], i);
-
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.sessionOffset = {0}", _header.sessionOffset);
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "header.dpmOffset = {0}", _header.dpmOffset);
-
-            if(_header.version[0] > MAXIMUM_SUPPORTED_VERSION)
-                return ErrorNumber.NotSupported;
-
-            stream.Seek(_header.sessionOffset, SeekOrigin.Begin);
-            _alcSessions = new Dictionary<int, Session>();
-
-            for(int i = 0; i < _header.sessions; i++)
-            {
-                byte[] sesHdr = new byte[24];
-                stream.Read(sesHdr, 0, 24);
-                Session session = Marshal.SpanToStructureLittleEndian<Session>(sesHdr);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionStart = {0}",
-                                           session.sessionStart, i);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionEnd = {0}", session.sessionEnd,
-                                           i);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].sessionSequence = {0}",
-                                           session.sessionSequence, i);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].allBlocks = {0}", session.allBlocks, i);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].nonTrackBlocks = {0}",
-                                           session.nonTrackBlocks, i);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].firstTrack = {0}", session.firstTrack,
-                                           i);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].lastTrack = {0}", session.lastTrack, i);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].unknown = 0x{0:X8}", session.unknown,
-                                           i);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{1}].trackOffset = {0}", session.trackOffset,
-                                           i);
-
-                _alcSessions.Add(session.sessionSequence, session);
-            }
-
-            long footerOff         = 0;
-            bool oldIncorrectImage = false;
-
-            _alcTracks = new Dictionary<int, Track>();
-            _alcToc    = new Dictionary<int, Dictionary<int, Track>>();
-            uint track1Index1 = 0;
-
-            foreach(Session session in _alcSessions.Values)
-            {
-                stream.Seek(session.trackOffset, SeekOrigin.Begin);
-                Dictionary<int, Track> sesToc = new();
-
-                for(int i = 0; i < session.allBlocks; i++)
-                {
-                    byte[] trkHdr = new byte[80];
-                    stream.Read(trkHdr, 0, 80);
-                    Track track = Marshal.ByteArrayToStructureLittleEndian<Track>(trkHdr);
-
-                    if(track.mode == TrackMode.Mode2F1Alt ||
-                       track.mode == TrackMode.Mode2F1Alt)
-                        oldIncorrectImage = true;
-
-                    // Solve our own mistake here, sorry, but anyway seems Alcohol doesn't support DDCD
-                    if(track.zero  > 0  &&
-                       track.point >= 1 &&
-                       track.point <= 99)
-                    {
-                        track.pmin        += (byte)(track.zero * 60);
-                        track.zero        =  0;
-                        oldIncorrectImage =  true;
-                    }
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].mode = {0}", track.mode,
-                                               track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].subMode = {0}",
-                                               track.subMode, track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].adrCtl = {0}",
-                                               track.adrCtl, track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].tno = {0}", track.tno,
-                                               track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].point = {0:X2}",
-                                               track.point, track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].min = {0}", track.min,
-                                               track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].sec = {0}", track.sec,
-                                               track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].frame = {0}",
-                                               track.frame, track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].zero = {0}", track.zero,
-                                               track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].pmin = {0}", track.pmin,
-                                               track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].psec = {0}", track.psec,
-                                               track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].pframe = {0}",
-                                               track.pframe, track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].extraOffset = {0}",
-                                               track.extraOffset, track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].sectorSize = {0}",
-                                               track.sectorSize, track.point, session.sessionSequence);
-
-                    //for(int j = 0; j < track.unknown.Length; j++)
-                    //    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].unknown[{2}] = {0}", track.unknown[j], i, j, session.sessionSequence);
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].startLba = {0}",
-                                               track.startLba, track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].startOffset = {0}",
-                                               track.startOffset, track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].files = {0}",
-                                               track.files, track.point, session.sessionSequence);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].footerOffset = {0}",
-                                               track.footerOffset, track.point, session.sessionSequence);
-
-                    //for(int j = 0; j < track.unknown2.Length; j++)
-                    //    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].unknown2[{2}] = {0}", track.unknown2[j], i, j, session.sessionSequence);
-
-                    if(track.subMode == SubchannelMode.Interleaved)
-                        track.sectorSize -= 96;
-
-                    if(track.point    == 1 &&
-                       track.startLba > 0)
-                    {
-                        AaruConsole.
-                            ErrorWriteLine("The disc this image represents contained a hidden track in the first pregap, that this image format cannot store. This dump is therefore, incorrect.");
-
-                        track1Index1   = track.startLba;
-                        track.startLba = 0;
-                    }
-
-                    if(!sesToc.ContainsKey(track.point))
-                        sesToc.Add(track.point, track);
-
-                    if(track.point < 0xA0)
-                        _alcTracks.Add(track.point, track);
-
-                    if(footerOff == 0)
-                        footerOff = track.footerOffset;
-
-                    _isDvd |= track.mode == TrackMode.DVD;
-                }
-
-                _alcToc.Add(session.sessionSequence, sesToc);
-            }
-
-            _alcTrackExtras = new Dictionary<int, TrackExtra>();
-
-            foreach(Track track in _alcTracks.Values)
-                if(track.extraOffset > 0 &&
-                   !_isDvd)
-                {
-                    byte[] extHdr = new byte[8];
-                    stream.Seek(track.extraOffset, SeekOrigin.Begin);
-                    stream.Read(extHdr, 0, 8);
-                    TrackExtra extra = Marshal.SpanToStructureLittleEndian<TrackExtra>(extHdr);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "track[{1}].extra.pregap = {0}", extra.pregap,
-                                               track.point);
-
-                    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "track[{1}].extra.sectors = {0}", extra.sectors,
-                                               track.point);
-
-                    if(track.point == 1)
-                    {
-                        extra.pregap  =  track1Index1 + 150; // Needed because faulty UltraISO implementation
-                        extra.sectors += extra.pregap - 150;
-                    }
-
-                    _alcTrackExtras.Add(track.point, extra);
-                }
-                else if(_isDvd)
-                {
-                    var extra = new TrackExtra
-                    {
-                        sectors = track.extraOffset
-                    };
-
-                    _alcTrackExtras.Add(track.point, extra);
-                }
-
-            if(footerOff > 0)
-            {
-                byte[] footer = new byte[16];
-                stream.Seek(footerOff, SeekOrigin.Begin);
-                stream.Read(footer, 0, 16);
-                _alcFooter = Marshal.SpanToStructureLittleEndian<Footer>(footer);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.filenameOffset = {0}",
-                                           _alcFooter.filenameOffset);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.widechar = {0}", _alcFooter.widechar);
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.unknown1 = 0x{0:X8}", _alcFooter.unknown1);
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.unknown2 = 0x{0:X8}", _alcFooter.unknown2);
-            }
-
-            string alcFile = "*.mdf";
-
-            if(_alcFooter.filenameOffset > 0)
-            {
-                stream.Seek(_alcFooter.filenameOffset, SeekOrigin.Begin);
-
-                byte[] filename = _header.dpmOffset == 0 ? new byte[stream.Length - stream.Position]
-                                      : new byte[_header.dpmOffset                - stream.Position];
-
-                stream.Read(filename, 0, filename.Length);
-
-                alcFile = _alcFooter.widechar == 1 ? StringHandlers.CToString(filename, Encoding.Unicode, true)
-                              : StringHandlers.CToString(filename, Encoding.Default);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.filename = {0}", alcFile);
-            }
-
-            if(_alcFooter.filenameOffset == 0)
-            {
-                if(Path.GetExtension(imageFilter.BasePath).ToLowerInvariant() == ".mds")
-                    alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".mdf";
-                else if(Path.GetExtension(imageFilter.BasePath).ToLowerInvariant() == ".xmd")
-                    alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".xmf";
-            }
-            else if(string.Compare(alcFile, "*.mdf", StringComparison.InvariantCultureIgnoreCase) == 0)
-                alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".mdf";
-            else if(string.Compare(alcFile, "*.xmf", StringComparison.InvariantCultureIgnoreCase) == 0)
-                alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".xmf";
-
-            if(_header.bcaLength > 0 &&
-               _header.bcaOffset > 0 &&
-               _isDvd)
-            {
-                _bca = new byte[_header.bcaLength];
-                stream.Seek(_header.bcaOffset, SeekOrigin.Begin);
-                int readBytes = stream.Read(_bca, 0, _bca.Length);
-
-                if(readBytes == _bca.Length)
-                    switch(_header.type)
-                    {
-                        case MediumType.DVD:
-                        case MediumType.DVDR:
-                            _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_BCA);
-
-                            break;
-                    }
-            }
-
-            _imageInfo.MediaType = MediumTypeToMediaType(_header.type);
-
-            Sessions = new List<CommonTypes.Structs.Session>();
-
-            foreach(Session alcSes in _alcSessions.Values)
-            {
-                var session = new CommonTypes.Structs.Session();
-
-                if(!_alcTracks.TryGetValue(alcSes.firstTrack, out Track startingTrack))
-                    break;
-
-                if(!_alcTracks.TryGetValue(alcSes.lastTrack, out Track endingTrack))
-                    break;
-
-                if(!_alcTrackExtras.TryGetValue(alcSes.firstTrack, out _))
-                    break;
-
-                if(!_alcTrackExtras.TryGetValue(alcSes.lastTrack, out TrackExtra endingTrackExtra))
-                    break;
-
-                session.StartSector = startingTrack.startLba;
-                session.StartTrack  = alcSes.firstTrack;
-                session.Sequence    = alcSes.sessionSequence;
-                session.EndSector   = endingTrack.startLba + endingTrackExtra.sectors - 1;
-                session.EndTrack    = alcSes.lastTrack;
-
-                Sessions.Add(session);
-
-                if(session.EndSector > _imageInfo.Sectors)
-                    _imageInfo.Sectors = session.EndSector + 1;
-            }
-
-            if(_isDvd)
-            {
-                // TODO: Second layer
-                if(_header.structuresOffset > 0)
-                {
-                    byte[] structures = new byte[4100];
-                    stream.Seek(_header.structuresOffset, SeekOrigin.Begin);
-                    stream.Read(structures, 0, 4100);
-                    _dmi = new byte[2052];
-                    _pfi = new byte[2052];
-
-                    // TODO: CMI
-                    Array.Copy(structures, 4, _dmi, 4, 2048);
-                    Array.Copy(structures, 0x804, _pfi, 4, 2048);
-
-                    _pfi[0] = 0x08;
-                    _pfi[1] = 0x02;
-                    _dmi[0] = 0x08;
-                    _dmi[1] = 0x02;
-
-                    PFI.PhysicalFormatInformation? pfi0 = PFI.Decode(_pfi, _imageInfo.MediaType);
-
-                    // All discs I tested the disk category and part version (as well as the start PSN for DVD-RAM) where modified by Alcohol
-                    // So much for archival value
-                    if(pfi0.HasValue)
-                    {
-                        switch(pfi0.Value.DiskCategory)
-                        {
-                            case DiskCategory.DVDPR:
-                                _imageInfo.MediaType = MediaType.DVDPR;
-
-                                break;
-                            case DiskCategory.DVDPRDL:
-                                _imageInfo.MediaType = MediaType.DVDPRDL;
-
-                                break;
-                            case DiskCategory.DVDPRW:
-                                _imageInfo.MediaType = MediaType.DVDPRW;
-
-                                break;
-                            case DiskCategory.DVDPRWDL:
-                                _imageInfo.MediaType = MediaType.DVDPRWDL;
-
-                                break;
-                            case DiskCategory.DVDR:
-                                _imageInfo.MediaType = pfi0.Value.PartVersion >= 6 ? MediaType.DVDRDL : MediaType.DVDR;
-
-                                break;
-                            case DiskCategory.DVDRAM:
-                                _imageInfo.MediaType = MediaType.DVDRAM;
-
-                                break;
-                            default:
-                                _imageInfo.MediaType = MediaType.DVDROM;
-
-                                break;
-                            case DiskCategory.DVDRW:
-                                _imageInfo.MediaType =
-                                    pfi0.Value.PartVersion >= 15 ? MediaType.DVDRWDL : MediaType.DVDRW;
-
-                                break;
-                            case DiskCategory.HDDVDR:
-                                _imageInfo.MediaType = MediaType.HDDVDR;
-
-                                break;
-                            case DiskCategory.HDDVDRAM:
-                                _imageInfo.MediaType = MediaType.HDDVDRAM;
-
-                                break;
-                            case DiskCategory.HDDVDROM:
-                                _imageInfo.MediaType = MediaType.HDDVDROM;
-
-                                break;
-                            case DiskCategory.HDDVDRW:
-                                _imageInfo.MediaType = MediaType.HDDVDRW;
-
-                                break;
-                            case DiskCategory.Nintendo:
-                                _imageInfo.MediaType =
-                                    pfi0.Value.DiscSize == DVDSize.Eighty ? MediaType.GOD : MediaType.WOD;
-
-                                break;
-                            case DiskCategory.UMD:
-                                _imageInfo.MediaType = MediaType.UMD;
-
-                                break;
-                        }
-
-                        if(DMI.IsXbox(_dmi))
-                            _imageInfo.MediaType = MediaType.XGD;
-                        else if(DMI.IsXbox360(_dmi))
-                            _imageInfo.MediaType = MediaType.XGD2;
-
-                        byte[] tmp = new byte[2048];
-                        Array.Copy(_dmi, 4, tmp, 0, 2048);
-                        _dmi = tmp;
-                        tmp  = new byte[2048];
-                        Array.Copy(_pfi, 4, tmp, 0, 2048);
-                        _pfi = tmp;
-
-                        _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_PFI);
-                        _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_DMI);
-                    }
-                }
-            }
-            else if(_header.type == MediumType.CD)
-            {
-                bool data       = false;
-                bool mode2      = false;
-                bool firstAudio = false;
-                bool firstData  = false;
-                bool audio      = false;
-
-                foreach(Track alcoholTrack in _alcTracks.Values)
-                {
-                    // First track is audio
-                    firstAudio |= alcoholTrack.point == 1 &&
-                                  (alcoholTrack.mode == TrackMode.Audio || alcoholTrack.mode == TrackMode.AudioAlt);
-
-                    // First track is data
-                    firstData |= alcoholTrack.point == 1 &&
-                                 (alcoholTrack.mode != TrackMode.Audio || alcoholTrack.mode != TrackMode.AudioAlt);
-
-                    // Any non first track is data
-                    data |= alcoholTrack.point != 1 &&
-                            (alcoholTrack.mode != TrackMode.Audio || alcoholTrack.mode != TrackMode.AudioAlt);
-
-                    // Any non first track is audio
-                    audio |= alcoholTrack.point != 1 &&
-                             (alcoholTrack.mode == TrackMode.Audio || alcoholTrack.mode == TrackMode.AudioAlt);
-
-                    switch(alcoholTrack.mode)
-                    {
-                        case TrackMode.Mode2:
-                        case TrackMode.Mode2F1:
-                        case TrackMode.Mode2F2:
-                        case TrackMode.Mode2F1Alt:
-                        case TrackMode.Mode2F2Alt:
-                            mode2 = true;
-
-                            break;
-                    }
-                }
-
-                if(!data &&
-                   !firstData)
-                    _imageInfo.MediaType = MediaType.CDDA;
-                else if(firstAudio         &&
-                        data               &&
-                        Sessions.Count > 1 &&
-                        mode2)
-                    _imageInfo.MediaType = MediaType.CDPLUS;
-                else if((firstData && audio) || mode2)
-                    _imageInfo.MediaType = MediaType.CDROMXA;
-                else if(!audio)
-                    _imageInfo.MediaType = MediaType.CDROM;
-                else
-                    _imageInfo.MediaType = MediaType.CD;
-            }
-
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "ImageInfo.mediaType = {0}", _imageInfo.MediaType);
-
-            Partitions = new List<Partition>();
-            _offsetMap = new Dictionary<uint, ulong>();
-
-            foreach(Track trk in _alcTracks.Values)
-            {
-                if(_alcTrackExtras.TryGetValue(trk.point, out TrackExtra extra))
-                {
-                    var partition = new Partition
-                    {
-                        Description = $"Track {trk.point}.",
-                        Start       = trk.startLba,
-                        Size        = extra.sectors * trk.sectorSize,
-                        Length      = extra.sectors,
-                        Sequence    = trk.point,
-                        Offset      = trk.startOffset,
-                        Type        = trk.mode.ToString()
-                    };
-
-                    Partitions.Add(partition);
-                }
-
-                if(trk.startLba >= extra.pregap)
-                    _offsetMap[trk.point] = trk.startLba - extra.pregap;
-                else
-                    _offsetMap[trk.point] = trk.startLba;
-
-                switch(trk.mode)
-                {
-                    case TrackMode.Mode1:
-                    case TrackMode.Mode1Alt:
-                    case TrackMode.Mode2F1:
-                    case TrackMode.Mode2F1Alt:
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                        if(_imageInfo.SectorSize < 2048)
-                            _imageInfo.SectorSize = 2048;
-
-                        break;
-                    case TrackMode.Mode2:
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                        if(_imageInfo.SectorSize < 2336)
-                            _imageInfo.SectorSize = 2336;
-
-                        break;
-                    case TrackMode.Mode2F2:
-                    case TrackMode.Mode2F2Alt:
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                        if(_imageInfo.SectorSize < 2324)
-                            _imageInfo.SectorSize = 2324;
-
-                        break;
-                    case TrackMode.DVD:
-                        _imageInfo.SectorSize = 2048;
-
-                        break;
-                    default:
-                        _imageInfo.SectorSize = 2352;
-
-                        break;
-                }
-
-                if(trk.subMode != SubchannelMode.None &&
-                   !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-            }
-
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "printing partition map");
-
-            foreach(Partition partition in Partitions)
-            {
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "Partition sequence: {0}", partition.Sequence);
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition name: {0}", partition.Name);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition description: {0}",
-                                           partition.Description);
-
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition type: {0}", partition.Type);
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting sector: {0}", partition.Start);
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition sectors: {0}", partition.Length);
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting offset: {0}", partition.Offset);
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition size in bytes: {0}", partition.Size);
-            }
-
-            _imageInfo.Application = "Alcohol 120%";
-
-            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "Data filename: {0}", alcFile);
-
-            var filtersList = new FiltersList();
-            _alcImage = filtersList.GetFilter(alcFile);
-
-            if(_alcImage == null)
-            {
-                AaruConsole.ErrorWriteLine("Cannot open data file");
-
-                return ErrorNumber.NoSuchFile;
-            }
-
-            _imageInfo.ImageSize            = (ulong)_alcImage.DataForkLength;
-            _imageInfo.CreationTime         = _alcImage.CreationTime;
-            _imageInfo.LastModificationTime = _alcImage.LastWriteTime;
-            _imageInfo.XmlMediaType         = XmlMediaType.OpticalDisc;
-            _imageInfo.Version              = $"{_header.version[0]}.{_header.version[1]}";
-
-            if(!_isDvd)
-            {
-                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "Rebuilding TOC");
-                byte firstSession = byte.MaxValue;
-                byte lastSession  = 0;
-                var  tocMs        = new MemoryStream();
-
-                tocMs.Write(new byte[]
-                {
-                    0, 0
-                }, 0, 2); // Reserved for TOC session numbers
-
-                foreach(KeyValuePair<int, Dictionary<int, Track>> sessionToc in _alcToc)
-                {
-                    if(sessionToc.Key < firstSession)
-                        firstSession = (byte)sessionToc.Key;
-
-                    if(sessionToc.Key > lastSession)
-                        lastSession = (byte)sessionToc.Key;
-
-                    foreach(Track sessionTrack in sessionToc.Value.Values)
-                    {
-                        tocMs.WriteByte((byte)sessionToc.Key);
-                        tocMs.WriteByte(sessionTrack.adrCtl);
-                        tocMs.WriteByte(sessionTrack.tno);
-                        tocMs.WriteByte(sessionTrack.point);
-                        tocMs.WriteByte(sessionTrack.min);
-                        tocMs.WriteByte(sessionTrack.sec);
-                        tocMs.WriteByte(sessionTrack.frame);
-                        tocMs.WriteByte(sessionTrack.zero);
-                        tocMs.WriteByte(sessionTrack.pmin);
-                        tocMs.WriteByte(sessionTrack.psec);
-                        tocMs.WriteByte(sessionTrack.pframe);
-                    }
-                }
-
-                _fullToc    = tocMs.ToArray();
-                _fullToc[0] = firstSession;
-                _fullToc[1] = lastSession;
-
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_FullTOC);
-                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-            }
-
-            if(_imageInfo.MediaType == MediaType.XGD2)
-                if(_imageInfo.Sectors == 25063   || // Locked (or non compatible drive)
-                   _imageInfo.Sectors == 4229664 || // Xtreme unlock
-                   _imageInfo.Sectors == 4246304)   // Wxripper unlock
-                    _imageInfo.MediaType = MediaType.XGD3;
-
-            AaruConsole.VerboseWriteLine("Alcohol 120% image describes a disc of type {0}", _imageInfo.MediaType);
-
-            if(oldIncorrectImage)
-                AaruConsole.
-                    WriteLine("Incorrect Alcohol 120% image created by an old version of Aaru. Convert image to correct it.");
-
-            return ErrorNumber.NoError;
+            _alcSessions.Add(session.sessionSequence, session);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+        long footerOff         = 0;
+        bool oldIncorrectImage = false;
+
+        _alcTracks = new Dictionary<int, Track>();
+        _alcToc    = new Dictionary<int, Dictionary<int, Track>>();
+        uint track1Index1 = 0;
+
+        foreach(Session session in _alcSessions.Values)
         {
-            buffer = null;
+            stream.Seek(session.trackOffset, SeekOrigin.Begin);
+            Dictionary<int, Track> sesToc = new();
 
-            switch(tag)
+            for(int i = 0; i < session.allBlocks; i++)
             {
-                case MediaTagType.DVD_BCA:
-                    buffer = _bca?.Clone() as byte[];
+                byte[] trkHdr = new byte[80];
+                stream.Read(trkHdr, 0, 80);
+                Track track = Marshal.ByteArrayToStructureLittleEndian<Track>(trkHdr);
 
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+                if(track.mode == TrackMode.Mode2F1Alt ||
+                   track.mode == TrackMode.Mode2F1Alt)
+                    oldIncorrectImage = true;
 
-                case MediaTagType.DVD_PFI:
-                    buffer = _bca?.Clone() as byte[];
+                // Solve our own mistake here, sorry, but anyway seems Alcohol doesn't support DDCD
+                if(track.zero  > 0  &&
+                   track.point >= 1 &&
+                   track.point <= 99)
+                {
+                    track.pmin        += (byte)(track.zero * 60);
+                    track.zero        =  0;
+                    oldIncorrectImage =  true;
+                }
 
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].mode = {0}", track.mode,
+                                           track.point, session.sessionSequence);
 
-                case MediaTagType.DVD_DMI:
-                    buffer = _bca?.Clone() as byte[];
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].subMode = {0}",
+                                           track.subMode, track.point, session.sessionSequence);
 
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].adrCtl = {0}",
+                                           track.adrCtl, track.point, session.sessionSequence);
 
-                case MediaTagType.CD_FullTOC:
-                    buffer = _bca?.Clone() as byte[];
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].tno = {0}", track.tno,
+                                           track.point, session.sessionSequence);
 
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].point = {0:X2}",
+                                           track.point, track.point, session.sessionSequence);
 
-                default: return ErrorNumber.NotSupported;
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].min = {0}", track.min,
+                                           track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].sec = {0}", track.sec,
+                                           track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].frame = {0}",
+                                           track.frame, track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].zero = {0}", track.zero,
+                                           track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].pmin = {0}", track.pmin,
+                                           track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].psec = {0}", track.psec,
+                                           track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].pframe = {0}",
+                                           track.pframe, track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].extraOffset = {0}",
+                                           track.extraOffset, track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].sectorSize = {0}",
+                                           track.sectorSize, track.point, session.sessionSequence);
+
+                //for(int j = 0; j < track.unknown.Length; j++)
+                //    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].unknown[{2}] = {0}", track.unknown[j], i, j, session.sessionSequence);
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].startLba = {0}",
+                                           track.startLba, track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].startOffset = {0}",
+                                           track.startOffset, track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].files = {0}",
+                                           track.files, track.point, session.sessionSequence);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].footerOffset = {0}",
+                                           track.footerOffset, track.point, session.sessionSequence);
+
+                //for(int j = 0; j < track.unknown2.Length; j++)
+                //    AaruConsole.DebugWriteLine("Alcohol 120% plugin", "session[{2}].track[{1}].unknown2[{2}] = {0}", track.unknown2[j], i, j, session.sessionSequence);
+
+                if(track.subMode == SubchannelMode.Interleaved)
+                    track.sectorSize -= 96;
+
+                if(track.point    == 1 &&
+                   track.startLba > 0)
+                {
+                    AaruConsole.
+                        ErrorWriteLine("The disc this image represents contained a hidden track in the first pregap, that this image format cannot store. This dump is therefore, incorrect.");
+
+                    track1Index1   = track.startLba;
+                    track.startLba = 0;
+                }
+
+                if(!sesToc.ContainsKey(track.point))
+                    sesToc.Add(track.point, track);
+
+                if(track.point < 0xA0)
+                    _alcTracks.Add(track.point, track);
+
+                if(footerOff == 0)
+                    footerOff = track.footerOffset;
+
+                _isDvd |= track.mode == TrackMode.DVD;
             }
+
+            _alcToc.Add(session.sessionSequence, sesToc);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        _alcTrackExtras = new Dictionary<int, TrackExtra>();
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in _offsetMap)
-                if(sectorAddress >= kvp.Value)
-                    foreach(Track track in _alcTracks.Values)
-                    {
-                        if(track.point != kvp.Key ||
-                           !_alcTrackExtras.TryGetValue(track.point, out TrackExtra extra))
-                            continue;
-
-                        if(sectorAddress - kvp.Value >= extra.sectors + extra.pregap)
-                            continue;
-
-                        return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-                    }
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in _offsetMap)
-                if(sectorAddress >= kvp.Value)
-                    foreach(Track track in _alcTracks.Values)
-                    {
-                        if(track.point != kvp.Key ||
-                           !_alcTrackExtras.TryGetValue(track.point, out TrackExtra extra))
-                            continue;
-
-                        if(sectorAddress - kvp.Value >= extra.sectors + extra.pregap)
-                            continue;
-
-                        return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
-                    }
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(!_alcTracks.TryGetValue((int)track, out Track alcTrack) ||
-               !_alcTrackExtras.TryGetValue((int)track, out TrackExtra alcExtra))
-                return ErrorNumber.OutOfRange;
-
-            if(length + sectorAddress > alcExtra.sectors + alcExtra.pregap)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-            bool mode2 = false;
-
-            switch(alcTrack.mode)
+        foreach(Track track in _alcTracks.Values)
+            if(track.extraOffset > 0 &&
+               !_isDvd)
             {
-                case TrackMode.Mode1:
-                case TrackMode.Mode1Alt:
-                {
-                    sectorOffset = 16;
-                    sectorSize   = 2048;
-                    sectorSkip   = 288;
+                byte[] extHdr = new byte[8];
+                stream.Seek(track.extraOffset, SeekOrigin.Begin);
+                stream.Read(extHdr, 0, 8);
+                TrackExtra extra = Marshal.SpanToStructureLittleEndian<TrackExtra>(extHdr);
 
-                    break;
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "track[{1}].extra.pregap = {0}", extra.pregap,
+                                           track.point);
+
+                AaruConsole.DebugWriteLine("Alcohol 120% plugin", "track[{1}].extra.sectors = {0}", extra.sectors,
+                                           track.point);
+
+                if(track.point == 1)
+                {
+                    extra.pregap  =  track1Index1 + 150; // Needed because faulty UltraISO implementation
+                    extra.sectors += extra.pregap - 150;
                 }
 
-                case TrackMode.Mode2:
-                case TrackMode.Mode2F1:
-                case TrackMode.Mode2F1Alt:
-                case TrackMode.Mode2F2:
-                case TrackMode.Mode2F2Alt:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                case TrackMode.Audio:
-                case TrackMode.AudioAlt:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                case TrackMode.DVD:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2048;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                default: return ErrorNumber.NotSupported;
+                _alcTrackExtras.Add(track.point, extra);
             }
-
-            switch(alcTrack.subMode)
+            else if(_isDvd)
             {
-                case SubchannelMode.None:
-                    sectorSkip += 0;
-
-                    break;
-                case SubchannelMode.Interleaved:
-                    sectorSkip += 96;
-
-                    break;
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            if(alcTrack.point  == 1 &&
-               alcExtra.pregap > 150)
-            {
-                if(sectorAddress + 150 < alcExtra.pregap)
-                    return ErrorNumber.NoError;
-
-                sectorAddress -= alcExtra.pregap - 150;
-            }
-
-            uint pregapBytes = alcExtra.pregap * (sectorOffset + sectorSize + sectorSkip);
-            long fileOffset  = (long)alcTrack.startOffset;
-
-            if(alcTrack.startOffset >= pregapBytes)
-                fileOffset = (long)(alcTrack.startOffset - pregapBytes);
-
-            _imageStream = _alcImage.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.Seek(fileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                               SeekOrigin.Begin);
-
-            if(mode2)
-            {
-                var mode2Ms = new MemoryStream((int)(sectorSize * length));
-
-                buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length));
-
-                for(int i = 0; i < length; i++)
+                var extra = new TrackExtra
                 {
-                    byte[] sector = new byte[sectorSize];
-                    Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize);
-                    sector = Sector.GetUserDataFromMode2(sector);
-                    mode2Ms.Write(sector, 0, sector.Length);
-                }
-
-                buffer = mode2Ms.ToArray();
-            }
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
-        {
-            buffer = null;
-
-            if(tag == SectorTagType.CdTrackFlags)
-                track = (uint)sectorAddress;
-
-            if(!_alcTracks.TryGetValue((int)track, out Track alcTrack) ||
-               !_alcTrackExtras.TryGetValue((int)track, out TrackExtra alcExtra))
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress > alcExtra.sectors + alcExtra.pregap)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            if(alcTrack.mode == TrackMode.DVD)
-                return ErrorNumber.NotSupported;
-
-            switch(tag)
-            {
-                case SectorTagType.CdSectorEcc:
-                case SectorTagType.CdSectorEccP:
-                case SectorTagType.CdSectorEccQ:
-                case SectorTagType.CdSectorEdc:
-                case SectorTagType.CdSectorHeader:
-                case SectorTagType.CdSectorSubchannel:
-                case SectorTagType.CdSectorSubHeader:
-                case SectorTagType.CdSectorSync: break;
-                case SectorTagType.CdTrackFlags:
-                    buffer = new[]
-                    {
-                        (byte)(alcTrack.adrCtl & 0x0F)
-                    };
-
-                    return ErrorNumber.NoError;
-                default: return ErrorNumber.NotSupported;
-            }
-
-            switch(alcTrack.mode)
-            {
-                case TrackMode.Mode1:
-                case TrackMode.Mode1Alt:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2064;
-                            sectorSize   = 4;
-                            sectorSkip   = 284;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            switch(alcTrack.subMode)
-                            {
-                                case SubchannelMode.Interleaved:
-
-                                    sectorOffset = 2352;
-                                    sectorSize   = 96;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                default: return ErrorNumber.NotSupported;
-                            }
-
-                            break;
-                        }
-
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case TrackMode.Mode2:
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        case SectorTagType.CdSectorHeader:
-                        case SectorTagType.CdSectorEcc:
-                        case SectorTagType.CdSectorEccP:
-                        case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2332;
-                            sectorSize   = 4;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            switch(alcTrack.subMode)
-                            {
-                                case SubchannelMode.Interleaved:
-
-                                    sectorOffset = 2352;
-                                    sectorSize   = 96;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                default: return ErrorNumber.NotSupported;
-                            }
-
-                            break;
-                        }
-
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-
-                case TrackMode.Mode2F1:
-                case TrackMode.Mode2F1Alt:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 16;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2072;
-                            sectorSize   = 4;
-                            sectorSkip   = 276;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            switch(alcTrack.subMode)
-                            {
-                                case SubchannelMode.Interleaved:
-
-                                    sectorOffset = 2352;
-                                    sectorSize   = 96;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                default: return ErrorNumber.NotSupported;
-                            }
-
-                            break;
-                        }
-
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case TrackMode.Mode2F2:
-                case TrackMode.Mode2F2Alt:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 16;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2348;
-                            sectorSize   = 4;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            switch(alcTrack.subMode)
-                            {
-                                case SubchannelMode.Interleaved:
-
-                                    sectorOffset = 2352;
-                                    sectorSize   = 96;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                default: return ErrorNumber.NotSupported;
-                            }
-
-                            break;
-                        }
-
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case TrackMode.Audio:
-                case TrackMode.AudioAlt:
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            switch(alcTrack.subMode)
-                            {
-                                case SubchannelMode.Interleaved:
-
-                                    sectorOffset = 2352;
-                                    sectorSize   = 96;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                default: return ErrorNumber.NotSupported;
-                            }
-
-                            break;
-                        }
-
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-
-                default: return ErrorNumber.NotSupported;
-            }
-
-            switch(alcTrack.subMode)
-            {
-                case SubchannelMode.None:
-                    sectorSkip += 0;
-
-                    break;
-                case SubchannelMode.Interleaved:
-                    if(tag != SectorTagType.CdSectorSubchannel)
-                        sectorSkip += 96;
-
-                    break;
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            if(alcTrack.point  == 1 &&
-               alcExtra.pregap > 150)
-            {
-                if(sectorAddress + 150 < alcExtra.pregap)
-                    return ErrorNumber.NoError;
-
-                sectorAddress -= alcExtra.pregap - 150;
-            }
-
-            uint pregapBytes = alcExtra.pregap * (sectorOffset + sectorSize + sectorSkip);
-            long fileOffset  = (long)alcTrack.startOffset;
-
-            if(alcTrack.startOffset >= pregapBytes)
-                fileOffset = (long)(alcTrack.startOffset - pregapBytes);
-
-            _imageStream = _alcImage.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.Seek(fileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                               SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in _offsetMap)
-                if(sectorAddress >= kvp.Value)
-                    foreach(Track alcTrack in _alcTracks.Values)
-                    {
-                        if(alcTrack.point != kvp.Key ||
-                           !_alcTrackExtras.TryGetValue(alcTrack.point, out TrackExtra alcExtra))
-                            continue;
-
-                        if(sectorAddress - kvp.Value >= alcExtra.sectors + alcExtra.pregap)
-                            continue;
-
-                        return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-                    }
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(!_alcTracks.TryGetValue((int)track, out Track alcTrack) ||
-               !_alcTrackExtras.TryGetValue((int)track, out TrackExtra alcExtra))
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress > alcExtra.sectors + alcExtra.pregap)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch(alcTrack.mode)
-            {
-                case TrackMode.Mode1:
-                case TrackMode.Mode1Alt:
-                case TrackMode.Mode2:
-                case TrackMode.Mode2F1:
-                case TrackMode.Mode2F1Alt:
-                case TrackMode.Mode2F2:
-                case TrackMode.Mode2F2Alt:
-                case TrackMode.Audio:
-                case TrackMode.AudioAlt:
-                case TrackMode.DVD:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = alcTrack.sectorSize;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                default: return ErrorNumber.NotSupported;
-            }
-
-            if(alcTrack.subMode == SubchannelMode.Interleaved)
-                sectorSkip = 96;
-
-            buffer = new byte[sectorSize * length];
-
-            if(alcTrack.point  == 1 &&
-               alcExtra.pregap > 150)
-            {
-                if(sectorAddress + 150 < alcExtra.pregap)
-                    return ErrorNumber.NoError;
-
-                sectorAddress -= alcExtra.pregap - 150;
-            }
-
-            uint pregapBytes = alcExtra.pregap * (sectorOffset + sectorSize + sectorSkip);
-            long fileOffset  = (long)alcTrack.startOffset;
-
-            if(alcTrack.startOffset >= pregapBytes)
-                fileOffset = (long)(alcTrack.startOffset - pregapBytes);
-
-            _imageStream = _alcImage.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.Seek(fileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                               SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public List<CommonTypes.Structs.Track> GetSessionTracks(CommonTypes.Structs.Session session) =>
-            Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null;
-
-        /// <inheritdoc />
-        public List<CommonTypes.Structs.Track> GetSessionTracks(ushort session)
-        {
-            List<CommonTypes.Structs.Track> tracks = new();
-
-            foreach(Track alcTrack in _alcTracks.Values)
-            {
-                ushort sessionNo =
-                    (from ses in Sessions where alcTrack.point >= ses.StartTrack || alcTrack.point <= ses.EndTrack
-                     select ses.Sequence).FirstOrDefault();
-
-                if(!_alcTrackExtras.TryGetValue(alcTrack.point, out TrackExtra alcExtra) ||
-                   session != sessionNo)
-                    continue;
-
-                var aaruTrack = new CommonTypes.Structs.Track
-                {
-                    StartSector       = alcTrack.startLba,
-                    EndSector         = alcExtra.sectors - 1,
-                    Pregap            = alcExtra.pregap,
-                    Session           = sessionNo,
-                    Sequence          = alcTrack.point,
-                    Type              = TrackModeToTrackType(alcTrack.mode),
-                    Filter            = _alcImage,
-                    File              = _alcImage.Filename,
-                    FileOffset        = alcTrack.startOffset,
-                    FileType          = "BINARY",
-                    RawBytesPerSector = alcTrack.sectorSize,
-                    BytesPerSector    = TrackModeToCookedBytesPerSector(alcTrack.mode)
+                    sectors = track.extraOffset
                 };
 
-                if(alcExtra.pregap > 0)
-                    aaruTrack.Indexes.Add(0, (int)(alcTrack.startLba - alcExtra.pregap));
+                _alcTrackExtras.Add(track.point, extra);
+            }
 
-                aaruTrack.Indexes.Add(1, (int)alcTrack.startLba);
+        if(footerOff > 0)
+        {
+            byte[] footer = new byte[16];
+            stream.Seek(footerOff, SeekOrigin.Begin);
+            stream.Read(footer, 0, 16);
+            _alcFooter = Marshal.SpanToStructureLittleEndian<Footer>(footer);
 
-                switch(alcTrack.subMode)
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.filenameOffset = {0}",
+                                       _alcFooter.filenameOffset);
+
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.widechar = {0}", _alcFooter.widechar);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.unknown1 = 0x{0:X8}", _alcFooter.unknown1);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.unknown2 = 0x{0:X8}", _alcFooter.unknown2);
+        }
+
+        string alcFile = "*.mdf";
+
+        if(_alcFooter.filenameOffset > 0)
+        {
+            stream.Seek(_alcFooter.filenameOffset, SeekOrigin.Begin);
+
+            byte[] filename = _header.dpmOffset == 0 ? new byte[stream.Length - stream.Position]
+                                  : new byte[_header.dpmOffset                - stream.Position];
+
+            stream.Read(filename, 0, filename.Length);
+
+            alcFile = _alcFooter.widechar == 1 ? StringHandlers.CToString(filename, Encoding.Unicode, true)
+                          : StringHandlers.CToString(filename, Encoding.Default);
+
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "footer.filename = {0}", alcFile);
+        }
+
+        if(_alcFooter.filenameOffset == 0)
+        {
+            if(Path.GetExtension(imageFilter.BasePath).ToLowerInvariant() == ".mds")
+                alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".mdf";
+            else if(Path.GetExtension(imageFilter.BasePath).ToLowerInvariant() == ".xmd")
+                alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".xmf";
+        }
+        else if(string.Compare(alcFile, "*.mdf", StringComparison.InvariantCultureIgnoreCase) == 0)
+            alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".mdf";
+        else if(string.Compare(alcFile, "*.xmf", StringComparison.InvariantCultureIgnoreCase) == 0)
+            alcFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".xmf";
+
+        if(_header.bcaLength > 0 &&
+           _header.bcaOffset > 0 &&
+           _isDvd)
+        {
+            _bca = new byte[_header.bcaLength];
+            stream.Seek(_header.bcaOffset, SeekOrigin.Begin);
+            int readBytes = stream.Read(_bca, 0, _bca.Length);
+
+            if(readBytes == _bca.Length)
+                switch(_header.type)
                 {
-                    case SubchannelMode.Interleaved:
-                        aaruTrack.SubchannelFilter = _alcImage;
-                        aaruTrack.SubchannelFile   = _alcImage.Filename;
-                        aaruTrack.SubchannelOffset = alcTrack.startOffset;
-                        aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
-
-                        break;
-                    case SubchannelMode.None:
-                        aaruTrack.SubchannelType = TrackSubchannelType.None;
+                    case MediumType.DVD:
+                    case MediumType.DVDR:
+                        _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_BCA);
 
                         break;
                 }
+        }
 
-                tracks.Add(aaruTrack);
+        _imageInfo.MediaType = MediumTypeToMediaType(_header.type);
+
+        Sessions = new List<CommonTypes.Structs.Session>();
+
+        foreach(Session alcSes in _alcSessions.Values)
+        {
+            var session = new CommonTypes.Structs.Session();
+
+            if(!_alcTracks.TryGetValue(alcSes.firstTrack, out Track startingTrack))
+                break;
+
+            if(!_alcTracks.TryGetValue(alcSes.lastTrack, out Track endingTrack))
+                break;
+
+            if(!_alcTrackExtras.TryGetValue(alcSes.firstTrack, out _))
+                break;
+
+            if(!_alcTrackExtras.TryGetValue(alcSes.lastTrack, out TrackExtra endingTrackExtra))
+                break;
+
+            session.StartSector = startingTrack.startLba;
+            session.StartTrack  = alcSes.firstTrack;
+            session.Sequence    = alcSes.sessionSequence;
+            session.EndSector   = endingTrack.startLba + endingTrackExtra.sectors - 1;
+            session.EndTrack    = alcSes.lastTrack;
+
+            Sessions.Add(session);
+
+            if(session.EndSector > _imageInfo.Sectors)
+                _imageInfo.Sectors = session.EndSector + 1;
+        }
+
+        if(_isDvd)
+        {
+            // TODO: Second layer
+            if(_header.structuresOffset > 0)
+            {
+                byte[] structures = new byte[4100];
+                stream.Seek(_header.structuresOffset, SeekOrigin.Begin);
+                stream.Read(structures, 0, 4100);
+                _dmi = new byte[2052];
+                _pfi = new byte[2052];
+
+                // TODO: CMI
+                Array.Copy(structures, 4, _dmi, 4, 2048);
+                Array.Copy(structures, 0x804, _pfi, 4, 2048);
+
+                _pfi[0] = 0x08;
+                _pfi[1] = 0x02;
+                _dmi[0] = 0x08;
+                _dmi[1] = 0x02;
+
+                PFI.PhysicalFormatInformation? pfi0 = PFI.Decode(_pfi, _imageInfo.MediaType);
+
+                // All discs I tested the disk category and part version (as well as the start PSN for DVD-RAM) where modified by Alcohol
+                // So much for archival value
+                if(pfi0.HasValue)
+                {
+                    switch(pfi0.Value.DiskCategory)
+                    {
+                        case DiskCategory.DVDPR:
+                            _imageInfo.MediaType = MediaType.DVDPR;
+
+                            break;
+                        case DiskCategory.DVDPRDL:
+                            _imageInfo.MediaType = MediaType.DVDPRDL;
+
+                            break;
+                        case DiskCategory.DVDPRW:
+                            _imageInfo.MediaType = MediaType.DVDPRW;
+
+                            break;
+                        case DiskCategory.DVDPRWDL:
+                            _imageInfo.MediaType = MediaType.DVDPRWDL;
+
+                            break;
+                        case DiskCategory.DVDR:
+                            _imageInfo.MediaType = pfi0.Value.PartVersion >= 6 ? MediaType.DVDRDL : MediaType.DVDR;
+
+                            break;
+                        case DiskCategory.DVDRAM:
+                            _imageInfo.MediaType = MediaType.DVDRAM;
+
+                            break;
+                        default:
+                            _imageInfo.MediaType = MediaType.DVDROM;
+
+                            break;
+                        case DiskCategory.DVDRW:
+                            _imageInfo.MediaType =
+                                pfi0.Value.PartVersion >= 15 ? MediaType.DVDRWDL : MediaType.DVDRW;
+
+                            break;
+                        case DiskCategory.HDDVDR:
+                            _imageInfo.MediaType = MediaType.HDDVDR;
+
+                            break;
+                        case DiskCategory.HDDVDRAM:
+                            _imageInfo.MediaType = MediaType.HDDVDRAM;
+
+                            break;
+                        case DiskCategory.HDDVDROM:
+                            _imageInfo.MediaType = MediaType.HDDVDROM;
+
+                            break;
+                        case DiskCategory.HDDVDRW:
+                            _imageInfo.MediaType = MediaType.HDDVDRW;
+
+                            break;
+                        case DiskCategory.Nintendo:
+                            _imageInfo.MediaType =
+                                pfi0.Value.DiscSize == DVDSize.Eighty ? MediaType.GOD : MediaType.WOD;
+
+                            break;
+                        case DiskCategory.UMD:
+                            _imageInfo.MediaType = MediaType.UMD;
+
+                            break;
+                    }
+
+                    if(DMI.IsXbox(_dmi))
+                        _imageInfo.MediaType = MediaType.XGD;
+                    else if(DMI.IsXbox360(_dmi))
+                        _imageInfo.MediaType = MediaType.XGD2;
+
+                    byte[] tmp = new byte[2048];
+                    Array.Copy(_dmi, 4, tmp, 0, 2048);
+                    _dmi = tmp;
+                    tmp  = new byte[2048];
+                    Array.Copy(_pfi, 4, tmp, 0, 2048);
+                    _pfi = tmp;
+
+                    _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_PFI);
+                    _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_DMI);
+                }
+            }
+        }
+        else if(_header.type == MediumType.CD)
+        {
+            bool data       = false;
+            bool mode2      = false;
+            bool firstAudio = false;
+            bool firstData  = false;
+            bool audio      = false;
+
+            foreach(Track alcoholTrack in _alcTracks.Values)
+            {
+                // First track is audio
+                firstAudio |= alcoholTrack.point == 1 &&
+                              (alcoholTrack.mode == TrackMode.Audio || alcoholTrack.mode == TrackMode.AudioAlt);
+
+                // First track is data
+                firstData |= alcoholTrack.point == 1 &&
+                             (alcoholTrack.mode != TrackMode.Audio || alcoholTrack.mode != TrackMode.AudioAlt);
+
+                // Any non first track is data
+                data |= alcoholTrack.point != 1 &&
+                        (alcoholTrack.mode != TrackMode.Audio || alcoholTrack.mode != TrackMode.AudioAlt);
+
+                // Any non first track is audio
+                audio |= alcoholTrack.point != 1 &&
+                         (alcoholTrack.mode == TrackMode.Audio || alcoholTrack.mode == TrackMode.AudioAlt);
+
+                switch(alcoholTrack.mode)
+                {
+                    case TrackMode.Mode2:
+                    case TrackMode.Mode2F1:
+                    case TrackMode.Mode2F2:
+                    case TrackMode.Mode2F1Alt:
+                    case TrackMode.Mode2F2Alt:
+                        mode2 = true;
+
+                        break;
+                }
             }
 
-            return tracks;
+            if(!data &&
+               !firstData)
+                _imageInfo.MediaType = MediaType.CDDA;
+            else if(firstAudio         &&
+                    data               &&
+                    Sessions.Count > 1 &&
+                    mode2)
+                _imageInfo.MediaType = MediaType.CDPLUS;
+            else if((firstData && audio) || mode2)
+                _imageInfo.MediaType = MediaType.CDROMXA;
+            else if(!audio)
+                _imageInfo.MediaType = MediaType.CDROM;
+            else
+                _imageInfo.MediaType = MediaType.CD;
+        }
+
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "ImageInfo.mediaType = {0}", _imageInfo.MediaType);
+
+        Partitions = new List<Partition>();
+        _offsetMap = new Dictionary<uint, ulong>();
+
+        foreach(Track trk in _alcTracks.Values)
+        {
+            if(_alcTrackExtras.TryGetValue(trk.point, out TrackExtra extra))
+            {
+                var partition = new Partition
+                {
+                    Description = $"Track {trk.point}.",
+                    Start       = trk.startLba,
+                    Size        = extra.sectors * trk.sectorSize,
+                    Length      = extra.sectors,
+                    Sequence    = trk.point,
+                    Offset      = trk.startOffset,
+                    Type        = trk.mode.ToString()
+                };
+
+                Partitions.Add(partition);
+            }
+
+            if(trk.startLba >= extra.pregap)
+                _offsetMap[trk.point] = trk.startLba - extra.pregap;
+            else
+                _offsetMap[trk.point] = trk.startLba;
+
+            switch(trk.mode)
+            {
+                case TrackMode.Mode1:
+                case TrackMode.Mode1Alt:
+                case TrackMode.Mode2F1:
+                case TrackMode.Mode2F1Alt:
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                    if(_imageInfo.SectorSize < 2048)
+                        _imageInfo.SectorSize = 2048;
+
+                    break;
+                case TrackMode.Mode2:
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                    if(_imageInfo.SectorSize < 2336)
+                        _imageInfo.SectorSize = 2336;
+
+                    break;
+                case TrackMode.Mode2F2:
+                case TrackMode.Mode2F2Alt:
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                    if(_imageInfo.SectorSize < 2324)
+                        _imageInfo.SectorSize = 2324;
+
+                    break;
+                case TrackMode.DVD:
+                    _imageInfo.SectorSize = 2048;
+
+                    break;
+                default:
+                    _imageInfo.SectorSize = 2352;
+
+                    break;
+            }
+
+            if(trk.subMode != SubchannelMode.None &&
+               !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+        }
+
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "printing partition map");
+
+        foreach(Partition partition in Partitions)
+        {
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "Partition sequence: {0}", partition.Sequence);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition name: {0}", partition.Name);
+
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition description: {0}",
+                                       partition.Description);
+
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition type: {0}", partition.Type);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting sector: {0}", partition.Start);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition sectors: {0}", partition.Length);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition starting offset: {0}", partition.Offset);
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "\tPartition size in bytes: {0}", partition.Size);
+        }
+
+        _imageInfo.Application = "Alcohol 120%";
+
+        AaruConsole.DebugWriteLine("Alcohol 120% plugin", "Data filename: {0}", alcFile);
+
+        var filtersList = new FiltersList();
+        _alcImage = filtersList.GetFilter(alcFile);
+
+        if(_alcImage == null)
+        {
+            AaruConsole.ErrorWriteLine("Cannot open data file");
+
+            return ErrorNumber.NoSuchFile;
+        }
+
+        _imageInfo.ImageSize            = (ulong)_alcImage.DataForkLength;
+        _imageInfo.CreationTime         = _alcImage.CreationTime;
+        _imageInfo.LastModificationTime = _alcImage.LastWriteTime;
+        _imageInfo.XmlMediaType         = XmlMediaType.OpticalDisc;
+        _imageInfo.Version              = $"{_header.version[0]}.{_header.version[1]}";
+
+        if(!_isDvd)
+        {
+            AaruConsole.DebugWriteLine("Alcohol 120% plugin", "Rebuilding TOC");
+            byte firstSession = byte.MaxValue;
+            byte lastSession  = 0;
+            var  tocMs        = new MemoryStream();
+
+            tocMs.Write(new byte[]
+            {
+                0, 0
+            }, 0, 2); // Reserved for TOC session numbers
+
+            foreach(KeyValuePair<int, Dictionary<int, Track>> sessionToc in _alcToc)
+            {
+                if(sessionToc.Key < firstSession)
+                    firstSession = (byte)sessionToc.Key;
+
+                if(sessionToc.Key > lastSession)
+                    lastSession = (byte)sessionToc.Key;
+
+                foreach(Track sessionTrack in sessionToc.Value.Values)
+                {
+                    tocMs.WriteByte((byte)sessionToc.Key);
+                    tocMs.WriteByte(sessionTrack.adrCtl);
+                    tocMs.WriteByte(sessionTrack.tno);
+                    tocMs.WriteByte(sessionTrack.point);
+                    tocMs.WriteByte(sessionTrack.min);
+                    tocMs.WriteByte(sessionTrack.sec);
+                    tocMs.WriteByte(sessionTrack.frame);
+                    tocMs.WriteByte(sessionTrack.zero);
+                    tocMs.WriteByte(sessionTrack.pmin);
+                    tocMs.WriteByte(sessionTrack.psec);
+                    tocMs.WriteByte(sessionTrack.pframe);
+                }
+            }
+
+            _fullToc    = tocMs.ToArray();
+            _fullToc[0] = firstSession;
+            _fullToc[1] = lastSession;
+
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_FullTOC);
+            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+        }
+
+        if(_imageInfo.MediaType == MediaType.XGD2)
+            if(_imageInfo.Sectors == 25063   || // Locked (or non compatible drive)
+               _imageInfo.Sectors == 4229664 || // Xtreme unlock
+               _imageInfo.Sectors == 4246304)   // Wxripper unlock
+                _imageInfo.MediaType = MediaType.XGD3;
+
+        AaruConsole.VerboseWriteLine("Alcohol 120% image describes a disc of type {0}", _imageInfo.MediaType);
+
+        if(oldIncorrectImage)
+            AaruConsole.
+                WriteLine("Incorrect Alcohol 120% image created by an old version of Aaru. Convert image to correct it.");
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        switch(tag)
+        {
+            case MediaTagType.DVD_BCA:
+                buffer = _bca?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+
+            case MediaTagType.DVD_PFI:
+                buffer = _bca?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+
+            case MediaTagType.DVD_DMI:
+                buffer = _bca?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+
+            case MediaTagType.CD_FullTOC:
+                buffer = _bca?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+
+            default: return ErrorNumber.NotSupported;
         }
     }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in _offsetMap)
+            if(sectorAddress >= kvp.Value)
+                foreach(Track track in _alcTracks.Values)
+                {
+                    if(track.point != kvp.Key ||
+                       !_alcTrackExtras.TryGetValue(track.point, out TrackExtra extra))
+                        continue;
+
+                    if(sectorAddress - kvp.Value >= extra.sectors + extra.pregap)
+                        continue;
+
+                    return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+                }
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in _offsetMap)
+            if(sectorAddress >= kvp.Value)
+                foreach(Track track in _alcTracks.Values)
+                {
+                    if(track.point != kvp.Key ||
+                       !_alcTrackExtras.TryGetValue(track.point, out TrackExtra extra))
+                        continue;
+
+                    if(sectorAddress - kvp.Value >= extra.sectors + extra.pregap)
+                        continue;
+
+                    return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
+                }
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(!_alcTracks.TryGetValue((int)track, out Track alcTrack) ||
+           !_alcTrackExtras.TryGetValue((int)track, out TrackExtra alcExtra))
+            return ErrorNumber.OutOfRange;
+
+        if(length + sectorAddress > alcExtra.sectors + alcExtra.pregap)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+        bool mode2 = false;
+
+        switch(alcTrack.mode)
+        {
+            case TrackMode.Mode1:
+            case TrackMode.Mode1Alt:
+            {
+                sectorOffset = 16;
+                sectorSize   = 2048;
+                sectorSkip   = 288;
+
+                break;
+            }
+
+            case TrackMode.Mode2:
+            case TrackMode.Mode2F1:
+            case TrackMode.Mode2F1Alt:
+            case TrackMode.Mode2F2:
+            case TrackMode.Mode2F2Alt:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            case TrackMode.Audio:
+            case TrackMode.AudioAlt:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            case TrackMode.DVD:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2048;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            default: return ErrorNumber.NotSupported;
+        }
+
+        switch(alcTrack.subMode)
+        {
+            case SubchannelMode.None:
+                sectorSkip += 0;
+
+                break;
+            case SubchannelMode.Interleaved:
+                sectorSkip += 96;
+
+                break;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        if(alcTrack.point  == 1 &&
+           alcExtra.pregap > 150)
+        {
+            if(sectorAddress + 150 < alcExtra.pregap)
+                return ErrorNumber.NoError;
+
+            sectorAddress -= alcExtra.pregap - 150;
+        }
+
+        uint pregapBytes = alcExtra.pregap * (sectorOffset + sectorSize + sectorSkip);
+        long fileOffset  = (long)alcTrack.startOffset;
+
+        if(alcTrack.startOffset >= pregapBytes)
+            fileOffset = (long)(alcTrack.startOffset - pregapBytes);
+
+        _imageStream = _alcImage.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.Seek(fileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                           SeekOrigin.Begin);
+
+        if(mode2)
+        {
+            var mode2Ms = new MemoryStream((int)(sectorSize * length));
+
+            buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length));
+
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize);
+                sector = Sector.GetUserDataFromMode2(sector);
+                mode2Ms.Write(sector, 0, sector.Length);
+            }
+
+            buffer = mode2Ms.ToArray();
+        }
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag == SectorTagType.CdTrackFlags)
+            track = (uint)sectorAddress;
+
+        if(!_alcTracks.TryGetValue((int)track, out Track alcTrack) ||
+           !_alcTrackExtras.TryGetValue((int)track, out TrackExtra alcExtra))
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > alcExtra.sectors + alcExtra.pregap)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        if(alcTrack.mode == TrackMode.DVD)
+            return ErrorNumber.NotSupported;
+
+        switch(tag)
+        {
+            case SectorTagType.CdSectorEcc:
+            case SectorTagType.CdSectorEccP:
+            case SectorTagType.CdSectorEccQ:
+            case SectorTagType.CdSectorEdc:
+            case SectorTagType.CdSectorHeader:
+            case SectorTagType.CdSectorSubchannel:
+            case SectorTagType.CdSectorSubHeader:
+            case SectorTagType.CdSectorSync: break;
+            case SectorTagType.CdTrackFlags:
+                buffer = new[]
+                {
+                    (byte)(alcTrack.adrCtl & 0x0F)
+                };
+
+                return ErrorNumber.NoError;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        switch(alcTrack.mode)
+        {
+            case TrackMode.Mode1:
+            case TrackMode.Mode1Alt:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2064;
+                        sectorSize   = 4;
+                        sectorSkip   = 284;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        switch(alcTrack.subMode)
+                        {
+                            case SubchannelMode.Interleaved:
+
+                                sectorOffset = 2352;
+                                sectorSize   = 96;
+                                sectorSkip   = 0;
+
+                                break;
+                            default: return ErrorNumber.NotSupported;
+                        }
+
+                        break;
+                    }
+
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            case TrackMode.Mode2:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    case SectorTagType.CdSectorHeader:
+                    case SectorTagType.CdSectorEcc:
+                    case SectorTagType.CdSectorEccP:
+                    case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2332;
+                        sectorSize   = 4;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        switch(alcTrack.subMode)
+                        {
+                            case SubchannelMode.Interleaved:
+
+                                sectorOffset = 2352;
+                                sectorSize   = 96;
+                                sectorSkip   = 0;
+
+                                break;
+                            default: return ErrorNumber.NotSupported;
+                        }
+
+                        break;
+                    }
+
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+
+            case TrackMode.Mode2F1:
+            case TrackMode.Mode2F1Alt:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 16;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2072;
+                        sectorSize   = 4;
+                        sectorSkip   = 276;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        switch(alcTrack.subMode)
+                        {
+                            case SubchannelMode.Interleaved:
+
+                                sectorOffset = 2352;
+                                sectorSize   = 96;
+                                sectorSkip   = 0;
+
+                                break;
+                            default: return ErrorNumber.NotSupported;
+                        }
+
+                        break;
+                    }
+
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            case TrackMode.Mode2F2:
+            case TrackMode.Mode2F2Alt:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 16;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2348;
+                        sectorSize   = 4;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        switch(alcTrack.subMode)
+                        {
+                            case SubchannelMode.Interleaved:
+
+                                sectorOffset = 2352;
+                                sectorSize   = 96;
+                                sectorSkip   = 0;
+
+                                break;
+                            default: return ErrorNumber.NotSupported;
+                        }
+
+                        break;
+                    }
+
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            case TrackMode.Audio:
+            case TrackMode.AudioAlt:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        switch(alcTrack.subMode)
+                        {
+                            case SubchannelMode.Interleaved:
+
+                                sectorOffset = 2352;
+                                sectorSize   = 96;
+                                sectorSkip   = 0;
+
+                                break;
+                            default: return ErrorNumber.NotSupported;
+                        }
+
+                        break;
+                    }
+
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+
+            default: return ErrorNumber.NotSupported;
+        }
+
+        switch(alcTrack.subMode)
+        {
+            case SubchannelMode.None:
+                sectorSkip += 0;
+
+                break;
+            case SubchannelMode.Interleaved:
+                if(tag != SectorTagType.CdSectorSubchannel)
+                    sectorSkip += 96;
+
+                break;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        if(alcTrack.point  == 1 &&
+           alcExtra.pregap > 150)
+        {
+            if(sectorAddress + 150 < alcExtra.pregap)
+                return ErrorNumber.NoError;
+
+            sectorAddress -= alcExtra.pregap - 150;
+        }
+
+        uint pregapBytes = alcExtra.pregap * (sectorOffset + sectorSize + sectorSkip);
+        long fileOffset  = (long)alcTrack.startOffset;
+
+        if(alcTrack.startOffset >= pregapBytes)
+            fileOffset = (long)(alcTrack.startOffset - pregapBytes);
+
+        _imageStream = _alcImage.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.Seek(fileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                           SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in _offsetMap)
+            if(sectorAddress >= kvp.Value)
+                foreach(Track alcTrack in _alcTracks.Values)
+                {
+                    if(alcTrack.point != kvp.Key ||
+                       !_alcTrackExtras.TryGetValue(alcTrack.point, out TrackExtra alcExtra))
+                        continue;
+
+                    if(sectorAddress - kvp.Value >= alcExtra.sectors + alcExtra.pregap)
+                        continue;
+
+                    return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+                }
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(!_alcTracks.TryGetValue((int)track, out Track alcTrack) ||
+           !_alcTrackExtras.TryGetValue((int)track, out TrackExtra alcExtra))
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > alcExtra.sectors + alcExtra.pregap)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(alcTrack.mode)
+        {
+            case TrackMode.Mode1:
+            case TrackMode.Mode1Alt:
+            case TrackMode.Mode2:
+            case TrackMode.Mode2F1:
+            case TrackMode.Mode2F1Alt:
+            case TrackMode.Mode2F2:
+            case TrackMode.Mode2F2Alt:
+            case TrackMode.Audio:
+            case TrackMode.AudioAlt:
+            case TrackMode.DVD:
+            {
+                sectorOffset = 0;
+                sectorSize   = alcTrack.sectorSize;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            default: return ErrorNumber.NotSupported;
+        }
+
+        if(alcTrack.subMode == SubchannelMode.Interleaved)
+            sectorSkip = 96;
+
+        buffer = new byte[sectorSize * length];
+
+        if(alcTrack.point  == 1 &&
+           alcExtra.pregap > 150)
+        {
+            if(sectorAddress + 150 < alcExtra.pregap)
+                return ErrorNumber.NoError;
+
+            sectorAddress -= alcExtra.pregap - 150;
+        }
+
+        uint pregapBytes = alcExtra.pregap * (sectorOffset + sectorSize + sectorSkip);
+        long fileOffset  = (long)alcTrack.startOffset;
+
+        if(alcTrack.startOffset >= pregapBytes)
+            fileOffset = (long)(alcTrack.startOffset - pregapBytes);
+
+        _imageStream = _alcImage.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.Seek(fileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                           SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public List<CommonTypes.Structs.Track> GetSessionTracks(CommonTypes.Structs.Session session) =>
+        Sessions.Contains(session) ? GetSessionTracks(session.Sequence) : null;
+
+    /// <inheritdoc />
+    public List<CommonTypes.Structs.Track> GetSessionTracks(ushort session)
+    {
+        List<CommonTypes.Structs.Track> tracks = new();
+
+        foreach(Track alcTrack in _alcTracks.Values)
+        {
+            ushort sessionNo =
+                (from ses in Sessions where alcTrack.point >= ses.StartTrack || alcTrack.point <= ses.EndTrack
+                 select ses.Sequence).FirstOrDefault();
+
+            if(!_alcTrackExtras.TryGetValue(alcTrack.point, out TrackExtra alcExtra) ||
+               session != sessionNo)
+                continue;
+
+            var aaruTrack = new CommonTypes.Structs.Track
+            {
+                StartSector       = alcTrack.startLba,
+                EndSector         = alcExtra.sectors - 1,
+                Pregap            = alcExtra.pregap,
+                Session           = sessionNo,
+                Sequence          = alcTrack.point,
+                Type              = TrackModeToTrackType(alcTrack.mode),
+                Filter            = _alcImage,
+                File              = _alcImage.Filename,
+                FileOffset        = alcTrack.startOffset,
+                FileType          = "BINARY",
+                RawBytesPerSector = alcTrack.sectorSize,
+                BytesPerSector    = TrackModeToCookedBytesPerSector(alcTrack.mode)
+            };
+
+            if(alcExtra.pregap > 0)
+                aaruTrack.Indexes.Add(0, (int)(alcTrack.startLba - alcExtra.pregap));
+
+            aaruTrack.Indexes.Add(1, (int)alcTrack.startLba);
+
+            switch(alcTrack.subMode)
+            {
+                case SubchannelMode.Interleaved:
+                    aaruTrack.SubchannelFilter = _alcImage;
+                    aaruTrack.SubchannelFile   = _alcImage.Filename;
+                    aaruTrack.SubchannelOffset = alcTrack.startOffset;
+                    aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
+
+                    break;
+                case SubchannelMode.None:
+                    aaruTrack.SubchannelType = TrackSubchannelType.None;
+
+                    break;
+            }
+
+            tracks.Add(aaruTrack);
+        }
+
+        return tracks;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Structs.cs b/Aaru.Images/Alcohol120/Structs.cs
index d87466f91..bf860e680 100644
--- a/Aaru.Images/Alcohol120/Structs.cs
+++ b/Aaru.Images/Alcohol120/Structs.cs
@@ -32,89 +32,88 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Alcohol120
 {
-    public sealed partial class Alcohol120
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] signature;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public byte[] version;
-            public MediumType type;
-            public ushort     sessions;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public ushort[] unknown1;
-            public readonly ushort bcaLength;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public uint[] unknown2;
-            public uint bcaOffset;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
-            public uint[] unknown3;
-            public uint structuresOffset;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public uint[] unknown4;
-            public          uint sessionOffset;
-            public readonly uint dpmOffset;
-        }
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public byte[] signature;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public byte[] version;
+        public MediumType type;
+        public ushort     sessions;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public ushort[] unknown1;
+        public readonly ushort bcaLength;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public uint[] unknown2;
+        public uint bcaOffset;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]
+        public uint[] unknown3;
+        public uint structuresOffset;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public uint[] unknown4;
+        public          uint sessionOffset;
+        public readonly uint dpmOffset;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Session
-        {
-            public          int    sessionStart;
-            public          int    sessionEnd;
-            public          ushort sessionSequence;
-            public          byte   allBlocks;
-            public          byte   nonTrackBlocks;
-            public          ushort firstTrack;
-            public          ushort lastTrack;
-            public readonly uint   unknown;
-            public          uint   trackOffset;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Session
+    {
+        public          int    sessionStart;
+        public          int    sessionEnd;
+        public          ushort sessionSequence;
+        public          byte   allBlocks;
+        public          byte   nonTrackBlocks;
+        public          ushort firstTrack;
+        public          ushort lastTrack;
+        public readonly uint   unknown;
+        public          uint   trackOffset;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Track
-        {
-            public TrackMode      mode;
-            public SubchannelMode subMode;
-            public byte           adrCtl;
-            public byte           tno;
-            public byte           point;
-            public byte           min;
-            public byte           sec;
-            public byte           frame;
-            public byte           zero;
-            public byte           pmin;
-            public byte           psec;
-            public byte           pframe;
-            public uint           extraOffset;
-            public ushort         sectorSize;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 18)]
-            public byte[] unknown;
-            public uint  startLba;
-            public ulong startOffset;
-            public uint  files;
-            public uint  footerOffset;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
-            public byte[] unknown2;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Track
+    {
+        public TrackMode      mode;
+        public SubchannelMode subMode;
+        public byte           adrCtl;
+        public byte           tno;
+        public byte           point;
+        public byte           min;
+        public byte           sec;
+        public byte           frame;
+        public byte           zero;
+        public byte           pmin;
+        public byte           psec;
+        public byte           pframe;
+        public uint           extraOffset;
+        public ushort         sectorSize;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 18)]
+        public byte[] unknown;
+        public uint  startLba;
+        public ulong startOffset;
+        public uint  files;
+        public uint  footerOffset;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
+        public byte[] unknown2;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct TrackExtra
-        {
-            public uint pregap;
-            public uint sectors;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct TrackExtra
+    {
+        public uint pregap;
+        public uint sectors;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Footer
-        {
-            public          uint filenameOffset;
-            public          uint widechar;
-            public readonly uint unknown1;
-            public readonly uint unknown2;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Footer
+    {
+        public          uint filenameOffset;
+        public          uint widechar;
+        public readonly uint unknown1;
+        public readonly uint unknown2;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Verify.cs b/Aaru.Images/Alcohol120/Verify.cs
index 1e308e226..972941b6f 100644
--- a/Aaru.Images/Alcohol120/Verify.cs
+++ b/Aaru.Images/Alcohol120/Verify.cs
@@ -35,92 +35,91 @@ using System.Collections.Generic;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Alcohol120
 {
-    public sealed partial class Alcohol120
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
     {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Alcohol120/Write.cs b/Aaru.Images/Alcohol120/Write.cs
index 56a4ee664..bc1352655 100644
--- a/Aaru.Images/Alcohol120/Write.cs
+++ b/Aaru.Images/Alcohol120/Write.cs
@@ -43,1137 +43,1136 @@ using Aaru.Helpers;
 using Schemas;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Alcohol120
 {
-    public sealed partial class Alcohol120
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _descriptorStream = new FileStream(path, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
-
-                _imageStream =
-                    new
-                        FileStream(Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path)) + ".mdf",
-                                   FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            _imageInfo.MediaType = mediaType;
-
-            switch(mediaType)
-            {
-                case MediaType.CD:
-                case MediaType.CDDA:
-                case MediaType.CDEG:
-                case MediaType.CDG:
-                case MediaType.CDI:
-                case MediaType.CDMIDI:
-                case MediaType.CDMRW:
-                case MediaType.CDPLUS:
-                case MediaType.CDR:
-                case MediaType.CDROM:
-                case MediaType.CDROMXA:
-                case MediaType.CDRW:
-                case MediaType.CDV:
-                case MediaType.DTSCD:
-                case MediaType.JaguarCD:
-                case MediaType.MEGACD:
-                case MediaType.PS1CD:
-                case MediaType.PS2CD:
-                case MediaType.SuperCDROM2:
-                case MediaType.SVCD:
-                case MediaType.SATURNCD:
-                case MediaType.ThreeDO:
-                case MediaType.VCD:
-                case MediaType.VCDHD:
-                case MediaType.NeoGeoCD:
-                case MediaType.PCFX:
-                case MediaType.CDTV:
-                case MediaType.CD32:
-                case MediaType.Nuon:
-                case MediaType.Playdia:
-                case MediaType.Pippin:
-                case MediaType.FMTOWNS:
-                case MediaType.MilCD:
-                case MediaType.VideoNow:
-                case MediaType.VideoNowColor:
-                case MediaType.VideoNowXp:
-                case MediaType.CVD:
-                    _isDvd = false;
-
-                    break;
-                default:
-                    _isDvd = true;
-
-                    break;
-            }
-
-            _trackFlags = new Dictionary<byte, byte>();
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            switch(tag)
-            {
-                case MediaTagType.CD_FullTOC:
-                    if(_isDvd)
-                    {
-                        ErrorMessage = $"Unsupported media tag {tag} for medium type {_imageInfo.MediaType}";
-
-                        return false;
-                    }
-
-                    _fullToc = data;
-
-                    return true;
-                case MediaTagType.DVD_PFI:
-                    if(!_isDvd)
-                    {
-                        ErrorMessage = $"Unsupported media tag {tag} for medium type {_imageInfo.MediaType}";
-
-                        return false;
-                    }
-
-                    _pfi = data;
-
-                    return true;
-                case MediaTagType.DVD_DMI:
-                    if(!_isDvd)
-                    {
-                        ErrorMessage = $"Unsupported media tag {tag} for medium type {_imageInfo.MediaType}";
-
-                        return false;
-                    }
-
-                    _dmi = data;
-
-                    return true;
-                case MediaTagType.DVD_BCA:
-                    if(!_isDvd)
-                    {
-                        ErrorMessage = $"Unsupported media tag {tag} for medium type {_imageInfo.MediaType}";
-
-                        return false;
-                    }
-
-                    _bca = data;
-
-                    return true;
-                default:
-                    ErrorMessage = $"Unsupported media tag {tag}";
-
-                    return false;
-            }
-        }
-
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            CommonTypes.Structs.Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(!_isDvd)
-            {
-                ErrorMessage = "Cannot write non-long sectors to CD images.";
-
-                return false;
-            }
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(track.BytesPerSector != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Invalid write mode for this sector";
-
-                return false;
-            }
-
-            if(data.Length != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            _imageStream.
-                Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
-                     SeekOrigin.Begin);
-
-            _imageStream.Write(data, 0, data.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(!_isDvd)
-            {
-                ErrorMessage = "Cannot write non-long sectors to CD images.";
-
-                return false;
-            }
-
-            CommonTypes.Structs.Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(track.BytesPerSector != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Invalid write mode for this sector";
-
-                return false;
-            }
-
-            if(sectorAddress + length > track.EndSector + 1)
-            {
-                ErrorMessage = "Can't cross tracks";
-
-                return false;
-            }
-
-            if(data.Length % track.RawBytesPerSector != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            switch(track.SubchannelType)
-            {
-                case TrackSubchannelType.None:
-                    _imageStream.
-                        Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
-                             SeekOrigin.Begin);
-
-                    _imageStream.Write(data, 0, data.Length);
-
-                    ErrorMessage = "";
-
-                    return true;
-                case TrackSubchannelType.Raw:
-                case TrackSubchannelType.RawInterleaved:
-                    _imageStream.
-                        Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))),
-                             SeekOrigin.Begin);
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        _imageStream.Write(data, (int)(i * track.RawBytesPerSector), track.RawBytesPerSector);
-                        _imageStream.Position += 96;
-                    }
-
-                    ErrorMessage = "";
-
-                    return true;
-                default:
-                    ErrorMessage = "Invalid subchannel mode for this sector";
-
-                    return false;
-            }
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            CommonTypes.Structs.Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(data.Length != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            uint subchannelSize = (uint)(track.SubchannelType != TrackSubchannelType.None ? 96 : 0);
-
-            _imageStream.
-                Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + subchannelSize))),
-                     SeekOrigin.Begin);
-
-            _imageStream.Write(data, 0, data.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            CommonTypes.Structs.Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(sectorAddress + length > track.EndSector + 1)
-            {
-                ErrorMessage = "Can't cross tracks";
-
-                return false;
-            }
-
-            if(data.Length % track.RawBytesPerSector != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            uint subchannelSize = (uint)(track.SubchannelType != TrackSubchannelType.None ? 96 : 0);
-
-            for(uint i = 0; i < length; i++)
-            {
-                _imageStream.
-                    Seek((long)(track.FileOffset + ((i + sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + subchannelSize))),
-                         SeekOrigin.Begin);
-
-                _imageStream.Write(data, (int)(i * track.RawBytesPerSector), track.RawBytesPerSector);
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetTracks(List<CommonTypes.Structs.Track> tracks)
-        {
-            ulong currentDataOffset = 0;
-
-            _writingTracks = new List<CommonTypes.Structs.Track>();
-
-            if(!_isDvd)
-            {
-                CommonTypes.Structs.Track[] tmpTracks = tracks.OrderBy(t => t.Sequence).ToArray();
-
-                for(int i = 1; i < tmpTracks.Length; i++)
-                {
-                    CommonTypes.Structs.Track firstTrackInSession =
-                        tracks.FirstOrDefault(t => t.Session == tmpTracks[i].Session);
-
-                    if(firstTrackInSession is null)
-                        continue;
-
-                    if(tmpTracks[i].Sequence == firstTrackInSession.Sequence)
-                    {
-                        if(tmpTracks[i].Sequence > 1)
-                            tmpTracks[i].StartSector += 150;
-
-                        continue;
-                    }
-
-                    tmpTracks[i - 1].EndSector += tmpTracks[i].Pregap;
-                    tmpTracks[i].Pregap        =  0;
-                    tmpTracks[i].StartSector   =  tmpTracks[i - 1].EndSector + 1;
-                }
-
-                tracks = tmpTracks.ToList();
-            }
-
-            foreach(CommonTypes.Structs.Track track in tracks.OrderBy(t => t.Sequence))
-            {
-                CommonTypes.Structs.Track newTrack = track;
-                uint                      subchannelSize;
-
-                switch(track.SubchannelType)
-                {
-                    case TrackSubchannelType.None:
-                        subchannelSize = 0;
-
-                        break;
-                    case TrackSubchannelType.Raw:
-                    case TrackSubchannelType.RawInterleaved:
-                        subchannelSize = 96;
-
-                        break;
-                    default:
-                        ErrorMessage = $"Unsupported subchannel type {track.SubchannelType}";
-
-                        return false;
-                }
-
-                newTrack.FileOffset = currentDataOffset;
-
-                currentDataOffset += (ulong)(newTrack.RawBytesPerSector + subchannelSize) *
-                                     (newTrack.EndSector                - newTrack.StartSector + 1);
-
-                _writingTracks.Add(newTrack);
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            byte sessions = byte.MinValue;
-
-            foreach(CommonTypes.Structs.Track t in _writingTracks.Where(t => t.Session > byte.MinValue))
-                sessions = (byte)t.Session;
-
-            var header = new Header
-            {
-                signature = _alcoholSignature,
-                version = new byte[]
-                {
-                    1, 5
-                },
-                type             = MediaTypeToMediumType(_imageInfo.MediaType),
-                sessions         = sessions,
-                structuresOffset = (uint)(_pfi == null ? 0 : 96),
-                sessionOffset    = (uint)(_pfi == null ? 96 : 4196),
-                unknown1         = new ushort[2],
-                unknown2         = new uint[2],
-                unknown3         = new uint[6],
-                unknown4         = new uint[3]
-            };
-
-            // Alcohol sets this always, Daemon Tool expects this
-            header.unknown1[0] = 2;
-
-            _alcSessions    = new Dictionary<int, Session>();
-            _alcTracks      = new Dictionary<int, Track>();
-            _alcToc         = new Dictionary<int, Dictionary<int, Track>>();
-            _writingTracks  = _writingTracks.OrderBy(t => t.Session).ThenBy(t => t.Sequence).ToList();
-            _alcTrackExtras = new Dictionary<int, TrackExtra>();
-            long currentTrackOffset = header.sessionOffset + (Marshal.SizeOf<Session>() * sessions);
-
-            byte[] tmpToc = null;
-
-            if(_fullToc != null)
-            {
-                byte[] fullTocSize = BigEndianBitConverter.GetBytes((short)_fullToc.Length);
-                tmpToc = new byte[_fullToc.Length + 2];
-                Array.Copy(_fullToc, 0, tmpToc, 2, _fullToc.Length);
-                tmpToc[0] = fullTocSize[0];
-                tmpToc[1] = fullTocSize[1];
-            }
-
-            FullTOC.CDFullTOC? decodedToc = FullTOC.Decode(tmpToc);
-
-            long currentExtraOffset = currentTrackOffset;
-            int  extraCount         = 0;
-
-            for(int i = 1; i <= sessions; i++)
-                if(decodedToc.HasValue)
-                {
-                    extraCount += decodedToc.Value.TrackDescriptors.Count(t => t.SessionNumber == i);
-
-                    currentExtraOffset += Marshal.SizeOf<Track>() *
-                                          decodedToc.Value.TrackDescriptors.Count(t => t.SessionNumber == i);
-                }
-                else
-                {
-                    currentExtraOffset += Marshal.SizeOf<Track>() * 3;
-                    extraCount         += 3;
-
-                    currentExtraOffset += Marshal.SizeOf<Track>() * _writingTracks.Count(t => t.Session == i);
-
-                    extraCount += _writingTracks.Count(t => t.Session == i);
-
-                    if(i < sessions)
-                    {
-                        currentExtraOffset += Marshal.SizeOf<Track>() * 2;
-                        extraCount         += 2;
-                    }
-                }
-
-            long footerOffset = currentExtraOffset + (Marshal.SizeOf<TrackExtra>() * extraCount);
-
-            if(_bca != null)
-            {
-                header.bcaOffset =  (uint)footerOffset;
-                footerOffset     += _bca.Length;
-            }
-
-            if(_isDvd)
-            {
-                _alcSessions.Add(1, new Session
-                {
-                    sessionEnd      = (int)(_writingTracks[0].EndSector - _writingTracks[0].StartSector + 1),
-                    sessionSequence = 1,
-                    allBlocks       = 1,
-                    nonTrackBlocks  = 3,
-                    firstTrack      = 1,
-                    lastTrack       = 1,
-                    trackOffset     = 4220
-                });
-
-                footerOffset = 4300;
-
-                if(_bca != null)
-                    footerOffset += _bca.Length;
-
-                _alcTracks.Add(1, new Track
-                {
-                    mode         = TrackMode.DVD,
-                    adrCtl       = 20,
-                    point        = 1,
-                    extraOffset  = (uint)(_writingTracks[0].EndSector - _writingTracks[0].StartSector + 1),
-                    sectorSize   = 2048,
-                    files        = 1,
-                    footerOffset = (uint)footerOffset,
-                    unknown      = new byte[18],
-                    unknown2     = new byte[24]
-                });
-
-                _alcToc.Add(1, _alcTracks);
-            }
-            else
-                for(int i = 1; i <= sessions; i++)
-                {
-                    CommonTypes.Structs.Track firstTrack = _writingTracks.First(t => t.Session == i);
-                    CommonTypes.Structs.Track lastTrack  = _writingTracks.Last(t => t.Session  == i);
-
-                    _alcSessions.Add(i, new Session
-                    {
-                        sessionStart    = (int)firstTrack.StartSector - 150,
-                        sessionEnd      = (int)lastTrack.EndSector    + 1,
-                        sessionSequence = (ushort)i,
-                        allBlocks = (byte)(decodedToc?.TrackDescriptors.Count(t => t.SessionNumber == i) ??
-                                           _writingTracks.Count(t => t.Session == i) + 3),
-                        nonTrackBlocks =
-                            (byte)(decodedToc?.TrackDescriptors.Count(t => t.SessionNumber == i && t.POINT >= 0xA0 &&
-                                                                           t.POINT         <= 0xAF) ?? 3),
-                        firstTrack  = (ushort)firstTrack.Sequence,
-                        lastTrack   = (ushort)lastTrack.Sequence,
-                        trackOffset = (uint)currentTrackOffset
-                    });
-
-                    Dictionary<int, Track> thisSessionTracks = new();
-                    _trackFlags.TryGetValue((byte)firstTrack.Sequence, out byte firstTrackControl);
-                    _trackFlags.TryGetValue((byte)lastTrack.Sequence, out byte lastTrackControl);
-
-                    if(firstTrackControl == 0 &&
-                       firstTrack.Type   != TrackType.Audio)
-                        firstTrackControl = (byte)CdFlags.DataTrack;
-
-                    if(lastTrackControl == 0 &&
-                       lastTrack.Type   != TrackType.Audio)
-                        lastTrackControl = (byte)CdFlags.DataTrack;
-
-                    (byte minute, byte second, byte frame) leadinPmsf = LbaToMsf(lastTrack.EndSector + 1);
-
-                    if(decodedToc?.TrackDescriptors.Any(t => t.SessionNumber == i && t.POINT >= 0xA0 &&
-                                                             t.POINT         <= 0xAF) == true)
-                        foreach(FullTOC.TrackDataDescriptor tocTrk in
-                            decodedToc.Value.TrackDescriptors.Where(t => t.SessionNumber == i && t.POINT >= 0xA0 &&
-                                                                         t.POINT         <= 0xAF))
-                        {
-                            thisSessionTracks.Add(tocTrk.POINT, new Track
-                            {
-                                adrCtl      = (byte)((tocTrk.ADR << 4) + tocTrk.CONTROL),
-                                tno         = tocTrk.TNO,
-                                point       = tocTrk.POINT,
-                                min         = tocTrk.Min,
-                                sec         = tocTrk.Sec,
-                                frame       = tocTrk.Frame,
-                                zero        = tocTrk.Zero,
-                                pmin        = tocTrk.PMIN,
-                                psec        = tocTrk.PSEC,
-                                pframe      = tocTrk.PFRAME,
-                                mode        = TrackMode.NoData,
-                                unknown     = new byte[18],
-                                unknown2    = new byte[24],
-                                extraOffset = (uint)currentExtraOffset
-                            });
-
-                            currentTrackOffset += Marshal.SizeOf<Track>();
-                            currentExtraOffset += Marshal.SizeOf<TrackExtra>();
-                        }
-                    else
-                    {
-                        thisSessionTracks.Add(0xA0, new Track
-                        {
-                            adrCtl   = (byte)((1 << 4) + firstTrackControl),
-                            pmin     = (byte)firstTrack.Sequence,
-                            mode     = TrackMode.NoData,
-                            point    = 0xA0,
-                            unknown  = new byte[18],
-                            unknown2 = new byte[24],
-                            psec = (byte)(_imageInfo.MediaType == MediaType.CDI
-                                              ? 0x10
-                                              : _writingTracks.Any(t => t.Type == TrackType.CdMode2Form1 ||
-                                                                        t.Type == TrackType.CdMode2Form2 ||
-                                                                        t.Type == TrackType.CdMode2Formless)
-                                                  ? 0x20
-                                                  : 0),
-                            extraOffset = (uint)currentExtraOffset
-                        });
-
-                        thisSessionTracks.Add(0xA1, new Track
-                        {
-                            adrCtl      = (byte)((1 << 4) + lastTrackControl),
-                            pmin        = (byte)lastTrack.Sequence,
-                            mode        = TrackMode.NoData,
-                            point       = 0xA1,
-                            unknown     = new byte[18],
-                            unknown2    = new byte[24],
-                            extraOffset = (uint)currentExtraOffset
-                        });
-
-                        thisSessionTracks.Add(0xA2, new Track
-                        {
-                            adrCtl      = (byte)((1 << 4) + firstTrackControl),
-                            zero        = 0,
-                            pmin        = leadinPmsf.minute,
-                            psec        = leadinPmsf.second,
-                            pframe      = leadinPmsf.frame,
-                            mode        = TrackMode.NoData,
-                            point       = 0xA2,
-                            unknown     = new byte[18],
-                            unknown2    = new byte[24],
-                            extraOffset = (uint)currentExtraOffset
-                        });
-
-                        currentExtraOffset += Marshal.SizeOf<TrackExtra>() * 3;
-                        currentTrackOffset += Marshal.SizeOf<Track>()      * 3;
-                    }
-
-                    foreach(CommonTypes.Structs.Track track in _writingTracks.Where(t => t.Session == i).
-                                                                              OrderBy(t => t.Sequence))
-                    {
-                        var alcTrk = new Track();
-
-                        if(decodedToc?.TrackDescriptors.Any(t => t.SessionNumber == i && t.POINT == track.Sequence) ==
-                           true)
-                        {
-                            FullTOC.TrackDataDescriptor tocTrk =
-                                decodedToc.Value.TrackDescriptors.First(t => t.SessionNumber == i &&
-                                                                             t.POINT         == track.Sequence);
-
-                            alcTrk.adrCtl = (byte)((tocTrk.ADR << 4) + tocTrk.CONTROL);
-                            alcTrk.tno    = tocTrk.TNO;
-                            alcTrk.point  = tocTrk.POINT;
-                            alcTrk.min    = tocTrk.Min;
-                            alcTrk.sec    = tocTrk.Sec;
-                            alcTrk.frame  = tocTrk.Frame;
-                            alcTrk.zero   = tocTrk.Zero;
-                            alcTrk.pmin   = tocTrk.PMIN;
-                            alcTrk.psec   = tocTrk.PSEC;
-                            alcTrk.pframe = tocTrk.PFRAME;
-                        }
-                        else
-                        {
-                            (byte minute, byte second, byte frame) msf = LbaToMsf((ulong)track.Indexes[1]);
-                            _trackFlags.TryGetValue((byte)track.Sequence, out byte trackControl);
-
-                            if(trackControl == 0 &&
-                               track.Type   != TrackType.Audio)
-                                trackControl = (byte)CdFlags.DataTrack;
-
-                            alcTrk.adrCtl = (byte)((1 << 4) + trackControl);
-                            alcTrk.point  = (byte)track.Sequence;
-                            alcTrk.zero   = 0;
-                            alcTrk.pmin   = msf.minute;
-                            alcTrk.psec   = msf.second;
-                            alcTrk.pframe = msf.frame;
-                        }
-
-                        alcTrk.mode = TrackTypeToTrackMode(track.Type);
-
-                        alcTrk.subMode = track.SubchannelType != TrackSubchannelType.None ? SubchannelMode.Interleaved
-                                             : SubchannelMode.None;
-
-                        alcTrk.sectorSize = (ushort)(track.RawBytesPerSector +
-                                                     (track.SubchannelType != TrackSubchannelType.None ? 96 : 0));
-
-                        alcTrk.startLba     = (uint)(track.StartSector + track.Pregap);
-                        alcTrk.startOffset  = track.FileOffset + (alcTrk.sectorSize * track.Pregap);
-                        alcTrk.files        = 1;
-                        alcTrk.extraOffset  = (uint)currentExtraOffset;
-                        alcTrk.footerOffset = (uint)footerOffset;
-
-                        if(track.Sequence == firstTrack.Sequence)
-                        {
-                            alcTrk.startLba    -= (uint)track.Pregap;
-                            alcTrk.startOffset -= alcTrk.sectorSize * track.Pregap;
-                        }
-
-                        // Alcohol seems to set that for all CD tracks
-                        // Daemon Tools expect it to be like this
-                        alcTrk.unknown = new byte[]
-                        {
-                            0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                            0x00, 0x00, 0x00
-                        };
-
-                        alcTrk.unknown2 = new byte[24];
-
-                        thisSessionTracks.Add((int)track.Sequence, alcTrk);
-
-                        currentTrackOffset += Marshal.SizeOf<Track>();
-                        currentExtraOffset += Marshal.SizeOf<TrackExtra>();
-
-                        var trkExtra = new TrackExtra
-                        {
-                            sectors = (uint)(track.EndSector - track.StartSector + 1)
-                        };
-
-                        if(track.Sequence == firstTrack.Sequence)
-                            trkExtra.pregap = 150;
-
-                        // When track mode changes there's a mandatory gap, Alcohol needs it
-                        else if(thisSessionTracks.TryGetValue((int)(track.Sequence - 1), out Track previousTrack) &&
-                                _alcTrackExtras.TryGetValue((int)(track.Sequence - 1), out TrackExtra previousExtra) &&
-                                previousTrack.mode != alcTrk.mode)
-                        {
-                            previousExtra.sectors -= 150;
-                            trkExtra.pregap       =  150;
-                            _alcTrackExtras.Remove((int)(track.Sequence - 1));
-                            _alcTrackExtras.Add((int)(track.Sequence    - 1), previousExtra);
-                        }
-                        else
-                            trkExtra.pregap = 0;
-
-                        _alcTrackExtras.Add((int)track.Sequence, trkExtra);
-                    }
-
-                    if(decodedToc?.TrackDescriptors.Any(t => t.SessionNumber == i && t.POINT >= 0xB0) == true)
-                        foreach(FullTOC.TrackDataDescriptor tocTrk in
-                            decodedToc.Value.TrackDescriptors.Where(t => t.SessionNumber == i && t.POINT >= 0xB0))
-                        {
-                            thisSessionTracks.Add(tocTrk.POINT, new Track
-                            {
-                                adrCtl      = (byte)((tocTrk.ADR << 4) + tocTrk.CONTROL),
-                                tno         = tocTrk.TNO,
-                                point       = tocTrk.POINT,
-                                min         = tocTrk.Min,
-                                sec         = tocTrk.Sec,
-                                frame       = tocTrk.Frame,
-                                zero        = tocTrk.Zero,
-                                pmin        = tocTrk.PMIN,
-                                psec        = tocTrk.PSEC,
-                                pframe      = tocTrk.PFRAME,
-                                mode        = TrackMode.NoData,
-                                unknown     = new byte[18],
-                                unknown2    = new byte[24],
-                                extraOffset = (uint)currentExtraOffset
-                            });
-
-                            currentExtraOffset += Marshal.SizeOf<TrackExtra>();
-                            currentTrackOffset += Marshal.SizeOf<Track>();
-                        }
-                    else if(i < sessions)
-                    {
-                        (byte minute, byte second, byte frame) leadoutAmsf =
-                            LbaToMsf(_writingTracks.First(t => t.Session == i + 1).StartSector - 150);
-
-                        (byte minute, byte second, byte frame) leadoutPmsf =
-                            LbaToMsf(_writingTracks.OrderBy(t => t.Session).ThenBy(t => t.Sequence).Last().StartSector);
-
-                        thisSessionTracks.Add(0xB0, new Track
-                        {
-                            point    = 0xB0,
-                            adrCtl   = 0x50,
-                            zero     = 0,
-                            min      = leadoutAmsf.minute,
-                            sec      = leadoutAmsf.second,
-                            frame    = leadoutAmsf.frame,
-                            pmin     = leadoutPmsf.minute,
-                            psec     = leadoutPmsf.second,
-                            pframe   = leadoutPmsf.frame,
-                            unknown  = new byte[18],
-                            unknown2 = new byte[24]
-                        });
-
-                        thisSessionTracks.Add(0xC0, new Track
-                        {
-                            point    = 0xC0,
-                            adrCtl   = 0x50,
-                            min      = 128,
-                            pmin     = 97,
-                            psec     = 25,
-                            unknown  = new byte[18],
-                            unknown2 = new byte[24]
-                        });
-
-                        currentTrackOffset += Marshal.SizeOf<Track>() * 2;
-                    }
-
-                    _alcToc.Add(i, thisSessionTracks);
-                }
-
-            _alcFooter = new Footer
-            {
-                filenameOffset = (uint)(footerOffset + Marshal.SizeOf<Footer>()),
-                widechar       = 1
-            };
-
-            byte[] filename = Encoding.Unicode.GetBytes("*.mdf"); // Yup, Alcohol stores no filename but a wildcard.
-
-            // Write header
-            _descriptorStream.Seek(0, SeekOrigin.Begin);
-            byte[] block    = new byte[Marshal.SizeOf<Header>()];
-            IntPtr blockPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(header, blockPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
-            _descriptorStream.Write(block, 0, block.Length);
-
-            // Write DVD structures if present
-            if(header.structuresOffset != 0)
-            {
-                if(_dmi != null)
-                {
-                    _descriptorStream.Seek(header.structuresOffset, SeekOrigin.Begin);
-
-                    switch(_dmi.Length)
-                    {
-                        case 2052:
-                            _descriptorStream.Write(_dmi, 0, 2052);
-
-                            break;
-                        case 2048:
-                            _descriptorStream.Write(new byte[]
-                            {
-                                0x08, 0x02, 0x00, 0x00
-                            }, 0, 4);
-
-                            _descriptorStream.Write(_dmi, 0, 2048);
-
-                            break;
-                    }
-                }
-
-                // TODO: Create fake PFI if none present
-                if(_pfi != null)
-                {
-                    _descriptorStream.Seek(header.structuresOffset + 2052, SeekOrigin.Begin);
-                    _descriptorStream.Write(_pfi, _pfi.Length      - 2048, 2048);
-                }
-            }
-
-            // Write sessions
-            _descriptorStream.Seek(header.sessionOffset, SeekOrigin.Begin);
-
-            foreach(Session session in _alcSessions.Values)
-            {
-                block    = new byte[Marshal.SizeOf<Session>()];
-                blockPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Session>());
-                System.Runtime.InteropServices.Marshal.StructureToPtr(session, blockPtr, true);
-                System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
-                System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
-                _descriptorStream.Write(block, 0, block.Length);
-            }
-
-            // Write tracks
-            foreach(KeyValuePair<int, Dictionary<int, Track>> kvp in _alcToc)
-            {
-                _descriptorStream.Seek(_alcSessions.First(t => t.Key == kvp.Key).Value.trackOffset, SeekOrigin.Begin);
-
-                foreach(Track track in kvp.Value.Values)
-                {
-                    Track alcoholTrack = track;
-
-                    // Write extra
-                    if(!_isDvd)
-                    {
-                        long position = _descriptorStream.Position;
-                        _descriptorStream.Seek(alcoholTrack.extraOffset, SeekOrigin.Begin);
-
-                        block = new byte[Marshal.SizeOf<TrackExtra>()];
-
-                        if(_alcTrackExtras.TryGetValue(alcoholTrack.point, out TrackExtra extra))
-                        {
-                            blockPtr = System.Runtime.InteropServices.Marshal.
-                                              AllocHGlobal(Marshal.SizeOf<TrackExtra>());
-
-                            System.Runtime.InteropServices.Marshal.StructureToPtr(extra, blockPtr, true);
-                            System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
-                            System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
-                        }
-                        else
-                            alcoholTrack.extraOffset = 0;
-
-                        _descriptorStream.Write(block, 0, block.Length);
-
-                        _descriptorStream.Seek(position, SeekOrigin.Begin);
-                    }
-
-                    block    = new byte[Marshal.SizeOf<Track>()];
-                    blockPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Track>());
-                    System.Runtime.InteropServices.Marshal.StructureToPtr(alcoholTrack, blockPtr, true);
-                    System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
-                    System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
-                    _descriptorStream.Write(block, 0, block.Length);
-                }
-            }
-
-            // Write BCA
-            if(_bca != null)
-            {
-                _descriptorStream.Seek(header.bcaOffset, SeekOrigin.Begin);
-                _descriptorStream.Write(_bca, 0, _bca.Length);
-            }
-
-            // Write footer
-            _descriptorStream.Seek(footerOffset, SeekOrigin.Begin);
-            block    = new byte[Marshal.SizeOf<Footer>()];
-            blockPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Footer>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(_alcFooter, blockPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
-            _descriptorStream.Write(block, 0, block.Length);
-
-            // Write filename
-            _descriptorStream.Write(filename, 0, filename.Length);
-
-            // Write filename null termination
-            _descriptorStream.Write(new byte[]
-            {
-                0, 0
-            }, 0, 2);
-
-            _descriptorStream.Flush();
-            _descriptorStream.Close();
-            _imageStream.Flush();
-            _imageStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
-        {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
+        try
+        {
+            _descriptorStream = new FileStream(path, FileMode.Create, FileAccess.ReadWrite, FileShare.None);
 
-            CommonTypes.Structs.Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
+            _imageStream =
+                new
+                    FileStream(Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path)) + ".mdf",
+                               FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
+            return false;
+        }
 
-                return false;
-            }
+        _imageInfo.MediaType = mediaType;
 
-            switch(tag)
-            {
-                case SectorTagType.CdTrackFlags:
+        switch(mediaType)
+        {
+            case MediaType.CD:
+            case MediaType.CDDA:
+            case MediaType.CDEG:
+            case MediaType.CDG:
+            case MediaType.CDI:
+            case MediaType.CDMIDI:
+            case MediaType.CDMRW:
+            case MediaType.CDPLUS:
+            case MediaType.CDR:
+            case MediaType.CDROM:
+            case MediaType.CDROMXA:
+            case MediaType.CDRW:
+            case MediaType.CDV:
+            case MediaType.DTSCD:
+            case MediaType.JaguarCD:
+            case MediaType.MEGACD:
+            case MediaType.PS1CD:
+            case MediaType.PS2CD:
+            case MediaType.SuperCDROM2:
+            case MediaType.SVCD:
+            case MediaType.SATURNCD:
+            case MediaType.ThreeDO:
+            case MediaType.VCD:
+            case MediaType.VCDHD:
+            case MediaType.NeoGeoCD:
+            case MediaType.PCFX:
+            case MediaType.CDTV:
+            case MediaType.CD32:
+            case MediaType.Nuon:
+            case MediaType.Playdia:
+            case MediaType.Pippin:
+            case MediaType.FMTOWNS:
+            case MediaType.MilCD:
+            case MediaType.VideoNow:
+            case MediaType.VideoNowColor:
+            case MediaType.VideoNowXp:
+            case MediaType.CVD:
+                _isDvd = false;
+
+                break;
+            default:
+                _isDvd = true;
+
+                break;
+        }
+
+        _trackFlags = new Dictionary<byte, byte>();
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        switch(tag)
+        {
+            case MediaTagType.CD_FullTOC:
+                if(_isDvd)
                 {
-                    if(data.Length != 1)
-                    {
-                        ErrorMessage = "Incorrect data size for track flags";
+                    ErrorMessage = $"Unsupported media tag {tag} for medium type {_imageInfo.MediaType}";
 
-                        return false;
-                    }
-
-                    _trackFlags[(byte)sectorAddress] = data[0];
-
-                    return true;
+                    return false;
                 }
-                case SectorTagType.CdSectorSubchannel:
+
+                _fullToc = data;
+
+                return true;
+            case MediaTagType.DVD_PFI:
+                if(!_isDvd)
                 {
-                    if(track.SubchannelType == 0)
-                    {
-                        ErrorMessage =
-                            $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
+                    ErrorMessage = $"Unsupported media tag {tag} for medium type {_imageInfo.MediaType}";
 
-                        return false;
+                    return false;
+                }
+
+                _pfi = data;
+
+                return true;
+            case MediaTagType.DVD_DMI:
+                if(!_isDvd)
+                {
+                    ErrorMessage = $"Unsupported media tag {tag} for medium type {_imageInfo.MediaType}";
+
+                    return false;
+                }
+
+                _dmi = data;
+
+                return true;
+            case MediaTagType.DVD_BCA:
+                if(!_isDvd)
+                {
+                    ErrorMessage = $"Unsupported media tag {tag} for medium type {_imageInfo.MediaType}";
+
+                    return false;
+                }
+
+                _bca = data;
+
+                return true;
+            default:
+                ErrorMessage = $"Unsupported media tag {tag}";
+
+                return false;
+        }
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        CommonTypes.Structs.Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(!_isDvd)
+        {
+            ErrorMessage = "Cannot write non-long sectors to CD images.";
+
+            return false;
+        }
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(track.BytesPerSector != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Invalid write mode for this sector";
+
+            return false;
+        }
+
+        if(data.Length != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        _imageStream.
+            Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
+                 SeekOrigin.Begin);
+
+        _imageStream.Write(data, 0, data.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(!_isDvd)
+        {
+            ErrorMessage = "Cannot write non-long sectors to CD images.";
+
+            return false;
+        }
+
+        CommonTypes.Structs.Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(track.BytesPerSector != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Invalid write mode for this sector";
+
+            return false;
+        }
+
+        if(sectorAddress + length > track.EndSector + 1)
+        {
+            ErrorMessage = "Can't cross tracks";
+
+            return false;
+        }
+
+        if(data.Length % track.RawBytesPerSector != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        switch(track.SubchannelType)
+        {
+            case TrackSubchannelType.None:
+                _imageStream.
+                    Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
+                         SeekOrigin.Begin);
+
+                _imageStream.Write(data, 0, data.Length);
+
+                ErrorMessage = "";
+
+                return true;
+            case TrackSubchannelType.Raw:
+            case TrackSubchannelType.RawInterleaved:
+                _imageStream.
+                    Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))),
+                         SeekOrigin.Begin);
+
+                for(uint i = 0; i < length; i++)
+                {
+                    _imageStream.Write(data, (int)(i * track.RawBytesPerSector), track.RawBytesPerSector);
+                    _imageStream.Position += 96;
+                }
+
+                ErrorMessage = "";
+
+                return true;
+            default:
+                ErrorMessage = "Invalid subchannel mode for this sector";
+
+                return false;
+        }
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        CommonTypes.Structs.Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(data.Length != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        uint subchannelSize = (uint)(track.SubchannelType != TrackSubchannelType.None ? 96 : 0);
+
+        _imageStream.
+            Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + subchannelSize))),
+                 SeekOrigin.Begin);
+
+        _imageStream.Write(data, 0, data.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        CommonTypes.Structs.Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(sectorAddress + length > track.EndSector + 1)
+        {
+            ErrorMessage = "Can't cross tracks";
+
+            return false;
+        }
+
+        if(data.Length % track.RawBytesPerSector != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        uint subchannelSize = (uint)(track.SubchannelType != TrackSubchannelType.None ? 96 : 0);
+
+        for(uint i = 0; i < length; i++)
+        {
+            _imageStream.
+                Seek((long)(track.FileOffset + ((i + sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + subchannelSize))),
+                     SeekOrigin.Begin);
+
+            _imageStream.Write(data, (int)(i * track.RawBytesPerSector), track.RawBytesPerSector);
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetTracks(List<CommonTypes.Structs.Track> tracks)
+    {
+        ulong currentDataOffset = 0;
+
+        _writingTracks = new List<CommonTypes.Structs.Track>();
+
+        if(!_isDvd)
+        {
+            CommonTypes.Structs.Track[] tmpTracks = tracks.OrderBy(t => t.Sequence).ToArray();
+
+            for(int i = 1; i < tmpTracks.Length; i++)
+            {
+                CommonTypes.Structs.Track firstTrackInSession =
+                    tracks.FirstOrDefault(t => t.Session == tmpTracks[i].Session);
+
+                if(firstTrackInSession is null)
+                    continue;
+
+                if(tmpTracks[i].Sequence == firstTrackInSession.Sequence)
+                {
+                    if(tmpTracks[i].Sequence > 1)
+                        tmpTracks[i].StartSector += 150;
+
+                    continue;
+                }
+
+                tmpTracks[i - 1].EndSector += tmpTracks[i].Pregap;
+                tmpTracks[i].Pregap        =  0;
+                tmpTracks[i].StartSector   =  tmpTracks[i - 1].EndSector + 1;
+            }
+
+            tracks = tmpTracks.ToList();
+        }
+
+        foreach(CommonTypes.Structs.Track track in tracks.OrderBy(t => t.Sequence))
+        {
+            CommonTypes.Structs.Track newTrack = track;
+            uint                      subchannelSize;
+
+            switch(track.SubchannelType)
+            {
+                case TrackSubchannelType.None:
+                    subchannelSize = 0;
+
+                    break;
+                case TrackSubchannelType.Raw:
+                case TrackSubchannelType.RawInterleaved:
+                    subchannelSize = 96;
+
+                    break;
+                default:
+                    ErrorMessage = $"Unsupported subchannel type {track.SubchannelType}";
+
+                    return false;
+            }
+
+            newTrack.FileOffset = currentDataOffset;
+
+            currentDataOffset += (ulong)(newTrack.RawBytesPerSector + subchannelSize) *
+                                 (newTrack.EndSector                - newTrack.StartSector + 1);
+
+            _writingTracks.Add(newTrack);
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        byte sessions = byte.MinValue;
+
+        foreach(CommonTypes.Structs.Track t in _writingTracks.Where(t => t.Session > byte.MinValue))
+            sessions = (byte)t.Session;
+
+        var header = new Header
+        {
+            signature = _alcoholSignature,
+            version = new byte[]
+            {
+                1, 5
+            },
+            type             = MediaTypeToMediumType(_imageInfo.MediaType),
+            sessions         = sessions,
+            structuresOffset = (uint)(_pfi == null ? 0 : 96),
+            sessionOffset    = (uint)(_pfi == null ? 96 : 4196),
+            unknown1         = new ushort[2],
+            unknown2         = new uint[2],
+            unknown3         = new uint[6],
+            unknown4         = new uint[3]
+        };
+
+        // Alcohol sets this always, Daemon Tool expects this
+        header.unknown1[0] = 2;
+
+        _alcSessions    = new Dictionary<int, Session>();
+        _alcTracks      = new Dictionary<int, Track>();
+        _alcToc         = new Dictionary<int, Dictionary<int, Track>>();
+        _writingTracks  = _writingTracks.OrderBy(t => t.Session).ThenBy(t => t.Sequence).ToList();
+        _alcTrackExtras = new Dictionary<int, TrackExtra>();
+        long currentTrackOffset = header.sessionOffset + (Marshal.SizeOf<Session>() * sessions);
+
+        byte[] tmpToc = null;
+
+        if(_fullToc != null)
+        {
+            byte[] fullTocSize = BigEndianBitConverter.GetBytes((short)_fullToc.Length);
+            tmpToc = new byte[_fullToc.Length + 2];
+            Array.Copy(_fullToc, 0, tmpToc, 2, _fullToc.Length);
+            tmpToc[0] = fullTocSize[0];
+            tmpToc[1] = fullTocSize[1];
+        }
+
+        FullTOC.CDFullTOC? decodedToc = FullTOC.Decode(tmpToc);
+
+        long currentExtraOffset = currentTrackOffset;
+        int  extraCount         = 0;
+
+        for(int i = 1; i <= sessions; i++)
+            if(decodedToc.HasValue)
+            {
+                extraCount += decodedToc.Value.TrackDescriptors.Count(t => t.SessionNumber == i);
+
+                currentExtraOffset += Marshal.SizeOf<Track>() *
+                                      decodedToc.Value.TrackDescriptors.Count(t => t.SessionNumber == i);
+            }
+            else
+            {
+                currentExtraOffset += Marshal.SizeOf<Track>() * 3;
+                extraCount         += 3;
+
+                currentExtraOffset += Marshal.SizeOf<Track>() * _writingTracks.Count(t => t.Session == i);
+
+                extraCount += _writingTracks.Count(t => t.Session == i);
+
+                if(i < sessions)
+                {
+                    currentExtraOffset += Marshal.SizeOf<Track>() * 2;
+                    extraCount         += 2;
+                }
+            }
+
+        long footerOffset = currentExtraOffset + (Marshal.SizeOf<TrackExtra>() * extraCount);
+
+        if(_bca != null)
+        {
+            header.bcaOffset =  (uint)footerOffset;
+            footerOffset     += _bca.Length;
+        }
+
+        if(_isDvd)
+        {
+            _alcSessions.Add(1, new Session
+            {
+                sessionEnd      = (int)(_writingTracks[0].EndSector - _writingTracks[0].StartSector + 1),
+                sessionSequence = 1,
+                allBlocks       = 1,
+                nonTrackBlocks  = 3,
+                firstTrack      = 1,
+                lastTrack       = 1,
+                trackOffset     = 4220
+            });
+
+            footerOffset = 4300;
+
+            if(_bca != null)
+                footerOffset += _bca.Length;
+
+            _alcTracks.Add(1, new Track
+            {
+                mode         = TrackMode.DVD,
+                adrCtl       = 20,
+                point        = 1,
+                extraOffset  = (uint)(_writingTracks[0].EndSector - _writingTracks[0].StartSector + 1),
+                sectorSize   = 2048,
+                files        = 1,
+                footerOffset = (uint)footerOffset,
+                unknown      = new byte[18],
+                unknown2     = new byte[24]
+            });
+
+            _alcToc.Add(1, _alcTracks);
+        }
+        else
+            for(int i = 1; i <= sessions; i++)
+            {
+                CommonTypes.Structs.Track firstTrack = _writingTracks.First(t => t.Session == i);
+                CommonTypes.Structs.Track lastTrack  = _writingTracks.Last(t => t.Session  == i);
+
+                _alcSessions.Add(i, new Session
+                {
+                    sessionStart    = (int)firstTrack.StartSector - 150,
+                    sessionEnd      = (int)lastTrack.EndSector    + 1,
+                    sessionSequence = (ushort)i,
+                    allBlocks = (byte)(decodedToc?.TrackDescriptors.Count(t => t.SessionNumber == i) ??
+                                       _writingTracks.Count(t => t.Session == i) + 3),
+                    nonTrackBlocks =
+                        (byte)(decodedToc?.TrackDescriptors.Count(t => t.SessionNumber == i && t.POINT >= 0xA0 &&
+                                                                       t.POINT         <= 0xAF) ?? 3),
+                    firstTrack  = (ushort)firstTrack.Sequence,
+                    lastTrack   = (ushort)lastTrack.Sequence,
+                    trackOffset = (uint)currentTrackOffset
+                });
+
+                Dictionary<int, Track> thisSessionTracks = new();
+                _trackFlags.TryGetValue((byte)firstTrack.Sequence, out byte firstTrackControl);
+                _trackFlags.TryGetValue((byte)lastTrack.Sequence, out byte lastTrackControl);
+
+                if(firstTrackControl == 0 &&
+                   firstTrack.Type   != TrackType.Audio)
+                    firstTrackControl = (byte)CdFlags.DataTrack;
+
+                if(lastTrackControl == 0 &&
+                   lastTrack.Type   != TrackType.Audio)
+                    lastTrackControl = (byte)CdFlags.DataTrack;
+
+                (byte minute, byte second, byte frame) leadinPmsf = LbaToMsf(lastTrack.EndSector + 1);
+
+                if(decodedToc?.TrackDescriptors.Any(t => t.SessionNumber == i && t.POINT >= 0xA0 &&
+                                                         t.POINT         <= 0xAF) == true)
+                    foreach(FullTOC.TrackDataDescriptor tocTrk in
+                            decodedToc.Value.TrackDescriptors.Where(t => t.SessionNumber == i && t.POINT >= 0xA0 &&
+                                                                         t.POINT         <= 0xAF))
+                    {
+                        thisSessionTracks.Add(tocTrk.POINT, new Track
+                        {
+                            adrCtl      = (byte)((tocTrk.ADR << 4) + tocTrk.CONTROL),
+                            tno         = tocTrk.TNO,
+                            point       = tocTrk.POINT,
+                            min         = tocTrk.Min,
+                            sec         = tocTrk.Sec,
+                            frame       = tocTrk.Frame,
+                            zero        = tocTrk.Zero,
+                            pmin        = tocTrk.PMIN,
+                            psec        = tocTrk.PSEC,
+                            pframe      = tocTrk.PFRAME,
+                            mode        = TrackMode.NoData,
+                            unknown     = new byte[18],
+                            unknown2    = new byte[24],
+                            extraOffset = (uint)currentExtraOffset
+                        });
+
+                        currentTrackOffset += Marshal.SizeOf<Track>();
+                        currentExtraOffset += Marshal.SizeOf<TrackExtra>();
+                    }
+                else
+                {
+                    thisSessionTracks.Add(0xA0, new Track
+                    {
+                        adrCtl   = (byte)((1 << 4) + firstTrackControl),
+                        pmin     = (byte)firstTrack.Sequence,
+                        mode     = TrackMode.NoData,
+                        point    = 0xA0,
+                        unknown  = new byte[18],
+                        unknown2 = new byte[24],
+                        psec = (byte)(_imageInfo.MediaType == MediaType.CDI
+                                          ? 0x10
+                                          : _writingTracks.Any(t => t.Type == TrackType.CdMode2Form1 ||
+                                                                    t.Type == TrackType.CdMode2Form2 ||
+                                                                    t.Type == TrackType.CdMode2Formless)
+                                              ? 0x20
+                                              : 0),
+                        extraOffset = (uint)currentExtraOffset
+                    });
+
+                    thisSessionTracks.Add(0xA1, new Track
+                    {
+                        adrCtl      = (byte)((1 << 4) + lastTrackControl),
+                        pmin        = (byte)lastTrack.Sequence,
+                        mode        = TrackMode.NoData,
+                        point       = 0xA1,
+                        unknown     = new byte[18],
+                        unknown2    = new byte[24],
+                        extraOffset = (uint)currentExtraOffset
+                    });
+
+                    thisSessionTracks.Add(0xA2, new Track
+                    {
+                        adrCtl      = (byte)((1 << 4) + firstTrackControl),
+                        zero        = 0,
+                        pmin        = leadinPmsf.minute,
+                        psec        = leadinPmsf.second,
+                        pframe      = leadinPmsf.frame,
+                        mode        = TrackMode.NoData,
+                        point       = 0xA2,
+                        unknown     = new byte[18],
+                        unknown2    = new byte[24],
+                        extraOffset = (uint)currentExtraOffset
+                    });
+
+                    currentExtraOffset += Marshal.SizeOf<TrackExtra>() * 3;
+                    currentTrackOffset += Marshal.SizeOf<Track>()      * 3;
+                }
+
+                foreach(CommonTypes.Structs.Track track in _writingTracks.Where(t => t.Session == i).
+                                                                          OrderBy(t => t.Sequence))
+                {
+                    var alcTrk = new Track();
+
+                    if(decodedToc?.TrackDescriptors.Any(t => t.SessionNumber == i && t.POINT == track.Sequence) ==
+                       true)
+                    {
+                        FullTOC.TrackDataDescriptor tocTrk =
+                            decodedToc.Value.TrackDescriptors.First(t => t.SessionNumber == i &&
+                                                                         t.POINT         == track.Sequence);
+
+                        alcTrk.adrCtl = (byte)((tocTrk.ADR << 4) + tocTrk.CONTROL);
+                        alcTrk.tno    = tocTrk.TNO;
+                        alcTrk.point  = tocTrk.POINT;
+                        alcTrk.min    = tocTrk.Min;
+                        alcTrk.sec    = tocTrk.Sec;
+                        alcTrk.frame  = tocTrk.Frame;
+                        alcTrk.zero   = tocTrk.Zero;
+                        alcTrk.pmin   = tocTrk.PMIN;
+                        alcTrk.psec   = tocTrk.PSEC;
+                        alcTrk.pframe = tocTrk.PFRAME;
+                    }
+                    else
+                    {
+                        (byte minute, byte second, byte frame) msf = LbaToMsf((ulong)track.Indexes[1]);
+                        _trackFlags.TryGetValue((byte)track.Sequence, out byte trackControl);
+
+                        if(trackControl == 0 &&
+                           track.Type   != TrackType.Audio)
+                            trackControl = (byte)CdFlags.DataTrack;
+
+                        alcTrk.adrCtl = (byte)((1 << 4) + trackControl);
+                        alcTrk.point  = (byte)track.Sequence;
+                        alcTrk.zero   = 0;
+                        alcTrk.pmin   = msf.minute;
+                        alcTrk.psec   = msf.second;
+                        alcTrk.pframe = msf.frame;
                     }
 
-                    if(data.Length != 96)
-                    {
-                        ErrorMessage = "Incorrect data size for subchannel";
+                    alcTrk.mode = TrackTypeToTrackMode(track.Type);
 
-                        return false;
+                    alcTrk.subMode = track.SubchannelType != TrackSubchannelType.None ? SubchannelMode.Interleaved
+                                         : SubchannelMode.None;
+
+                    alcTrk.sectorSize = (ushort)(track.RawBytesPerSector +
+                                                 (track.SubchannelType != TrackSubchannelType.None ? 96 : 0));
+
+                    alcTrk.startLba     = (uint)(track.StartSector + track.Pregap);
+                    alcTrk.startOffset  = track.FileOffset + (alcTrk.sectorSize * track.Pregap);
+                    alcTrk.files        = 1;
+                    alcTrk.extraOffset  = (uint)currentExtraOffset;
+                    alcTrk.footerOffset = (uint)footerOffset;
+
+                    if(track.Sequence == firstTrack.Sequence)
+                    {
+                        alcTrk.startLba    -= (uint)track.Pregap;
+                        alcTrk.startOffset -= alcTrk.sectorSize * track.Pregap;
                     }
 
+                    // Alcohol seems to set that for all CD tracks
+                    // Daemon Tools expect it to be like this
+                    alcTrk.unknown = new byte[]
+                    {
+                        0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                        0x00, 0x00, 0x00
+                    };
+
+                    alcTrk.unknown2 = new byte[24];
+
+                    thisSessionTracks.Add((int)track.Sequence, alcTrk);
+
+                    currentTrackOffset += Marshal.SizeOf<Track>();
+                    currentExtraOffset += Marshal.SizeOf<TrackExtra>();
+
+                    var trkExtra = new TrackExtra
+                    {
+                        sectors = (uint)(track.EndSector - track.StartSector + 1)
+                    };
+
+                    if(track.Sequence == firstTrack.Sequence)
+                        trkExtra.pregap = 150;
+
+                    // When track mode changes there's a mandatory gap, Alcohol needs it
+                    else if(thisSessionTracks.TryGetValue((int)(track.Sequence - 1), out Track previousTrack)      &&
+                            _alcTrackExtras.TryGetValue((int)(track.Sequence   - 1), out TrackExtra previousExtra) &&
+                            previousTrack.mode != alcTrk.mode)
+                    {
+                        previousExtra.sectors -= 150;
+                        trkExtra.pregap       =  150;
+                        _alcTrackExtras.Remove((int)(track.Sequence - 1));
+                        _alcTrackExtras.Add((int)(track.Sequence    - 1), previousExtra);
+                    }
+                    else
+                        trkExtra.pregap = 0;
+
+                    _alcTrackExtras.Add((int)track.Sequence, trkExtra);
+                }
+
+                if(decodedToc?.TrackDescriptors.Any(t => t.SessionNumber == i && t.POINT >= 0xB0) == true)
+                    foreach(FullTOC.TrackDataDescriptor tocTrk in
+                            decodedToc.Value.TrackDescriptors.Where(t => t.SessionNumber == i && t.POINT >= 0xB0))
+                    {
+                        thisSessionTracks.Add(tocTrk.POINT, new Track
+                        {
+                            adrCtl      = (byte)((tocTrk.ADR << 4) + tocTrk.CONTROL),
+                            tno         = tocTrk.TNO,
+                            point       = tocTrk.POINT,
+                            min         = tocTrk.Min,
+                            sec         = tocTrk.Sec,
+                            frame       = tocTrk.Frame,
+                            zero        = tocTrk.Zero,
+                            pmin        = tocTrk.PMIN,
+                            psec        = tocTrk.PSEC,
+                            pframe      = tocTrk.PFRAME,
+                            mode        = TrackMode.NoData,
+                            unknown     = new byte[18],
+                            unknown2    = new byte[24],
+                            extraOffset = (uint)currentExtraOffset
+                        });
+
+                        currentExtraOffset += Marshal.SizeOf<TrackExtra>();
+                        currentTrackOffset += Marshal.SizeOf<Track>();
+                    }
+                else if(i < sessions)
+                {
+                    (byte minute, byte second, byte frame) leadoutAmsf =
+                        LbaToMsf(_writingTracks.First(t => t.Session == i + 1).StartSector - 150);
+
+                    (byte minute, byte second, byte frame) leadoutPmsf =
+                        LbaToMsf(_writingTracks.OrderBy(t => t.Session).ThenBy(t => t.Sequence).Last().StartSector);
+
+                    thisSessionTracks.Add(0xB0, new Track
+                    {
+                        point    = 0xB0,
+                        adrCtl   = 0x50,
+                        zero     = 0,
+                        min      = leadoutAmsf.minute,
+                        sec      = leadoutAmsf.second,
+                        frame    = leadoutAmsf.frame,
+                        pmin     = leadoutPmsf.minute,
+                        psec     = leadoutPmsf.second,
+                        pframe   = leadoutPmsf.frame,
+                        unknown  = new byte[18],
+                        unknown2 = new byte[24]
+                    });
+
+                    thisSessionTracks.Add(0xC0, new Track
+                    {
+                        point    = 0xC0,
+                        adrCtl   = 0x50,
+                        min      = 128,
+                        pmin     = 97,
+                        psec     = 25,
+                        unknown  = new byte[18],
+                        unknown2 = new byte[24]
+                    });
+
+                    currentTrackOffset += Marshal.SizeOf<Track>() * 2;
+                }
+
+                _alcToc.Add(i, thisSessionTracks);
+            }
+
+        _alcFooter = new Footer
+        {
+            filenameOffset = (uint)(footerOffset + Marshal.SizeOf<Footer>()),
+            widechar       = 1
+        };
+
+        byte[] filename = Encoding.Unicode.GetBytes("*.mdf"); // Yup, Alcohol stores no filename but a wildcard.
+
+        // Write header
+        _descriptorStream.Seek(0, SeekOrigin.Begin);
+        byte[] block    = new byte[Marshal.SizeOf<Header>()];
+        IntPtr blockPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(header, blockPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
+        _descriptorStream.Write(block, 0, block.Length);
+
+        // Write DVD structures if present
+        if(header.structuresOffset != 0)
+        {
+            if(_dmi != null)
+            {
+                _descriptorStream.Seek(header.structuresOffset, SeekOrigin.Begin);
+
+                switch(_dmi.Length)
+                {
+                    case 2052:
+                        _descriptorStream.Write(_dmi, 0, 2052);
+
+                        break;
+                    case 2048:
+                        _descriptorStream.Write(new byte[]
+                        {
+                            0x08, 0x02, 0x00, 0x00
+                        }, 0, 4);
+
+                        _descriptorStream.Write(_dmi, 0, 2048);
+
+                        break;
+                }
+            }
+
+            // TODO: Create fake PFI if none present
+            if(_pfi != null)
+            {
+                _descriptorStream.Seek(header.structuresOffset + 2052, SeekOrigin.Begin);
+                _descriptorStream.Write(_pfi, _pfi.Length      - 2048, 2048);
+            }
+        }
+
+        // Write sessions
+        _descriptorStream.Seek(header.sessionOffset, SeekOrigin.Begin);
+
+        foreach(Session session in _alcSessions.Values)
+        {
+            block    = new byte[Marshal.SizeOf<Session>()];
+            blockPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Session>());
+            System.Runtime.InteropServices.Marshal.StructureToPtr(session, blockPtr, true);
+            System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
+            System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
+            _descriptorStream.Write(block, 0, block.Length);
+        }
+
+        // Write tracks
+        foreach(KeyValuePair<int, Dictionary<int, Track>> kvp in _alcToc)
+        {
+            _descriptorStream.Seek(_alcSessions.First(t => t.Key == kvp.Key).Value.trackOffset, SeekOrigin.Begin);
+
+            foreach(Track track in kvp.Value.Values)
+            {
+                Track alcoholTrack = track;
+
+                // Write extra
+                if(!_isDvd)
+                {
+                    long position = _descriptorStream.Position;
+                    _descriptorStream.Seek(alcoholTrack.extraOffset, SeekOrigin.Begin);
+
+                    block = new byte[Marshal.SizeOf<TrackExtra>()];
+
+                    if(_alcTrackExtras.TryGetValue(alcoholTrack.point, out TrackExtra extra))
+                    {
+                        blockPtr = System.Runtime.InteropServices.Marshal.
+                                          AllocHGlobal(Marshal.SizeOf<TrackExtra>());
+
+                        System.Runtime.InteropServices.Marshal.StructureToPtr(extra, blockPtr, true);
+                        System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
+                        System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
+                    }
+                    else
+                        alcoholTrack.extraOffset = 0;
+
+                    _descriptorStream.Write(block, 0, block.Length);
+
+                    _descriptorStream.Seek(position, SeekOrigin.Begin);
+                }
+
+                block    = new byte[Marshal.SizeOf<Track>()];
+                blockPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Track>());
+                System.Runtime.InteropServices.Marshal.StructureToPtr(alcoholTrack, blockPtr, true);
+                System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
+                System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
+                _descriptorStream.Write(block, 0, block.Length);
+            }
+        }
+
+        // Write BCA
+        if(_bca != null)
+        {
+            _descriptorStream.Seek(header.bcaOffset, SeekOrigin.Begin);
+            _descriptorStream.Write(_bca, 0, _bca.Length);
+        }
+
+        // Write footer
+        _descriptorStream.Seek(footerOffset, SeekOrigin.Begin);
+        block    = new byte[Marshal.SizeOf<Footer>()];
+        blockPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Footer>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(_alcFooter, blockPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(blockPtr, block, 0, block.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(blockPtr);
+        _descriptorStream.Write(block, 0, block.Length);
+
+        // Write filename
+        _descriptorStream.Write(filename, 0, filename.Length);
+
+        // Write filename null termination
+        _descriptorStream.Write(new byte[]
+        {
+            0, 0
+        }, 0, 2);
+
+        _descriptorStream.Flush();
+        _descriptorStream.Close();
+        _imageStream.Flush();
+        _imageStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        CommonTypes.Structs.Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        switch(tag)
+        {
+            case SectorTagType.CdTrackFlags:
+            {
+                if(data.Length != 1)
+                {
+                    ErrorMessage = "Incorrect data size for track flags";
+
+                    return false;
+                }
+
+                _trackFlags[(byte)sectorAddress] = data[0];
+
+                return true;
+            }
+            case SectorTagType.CdSectorSubchannel:
+            {
+                if(track.SubchannelType == 0)
+                {
+                    ErrorMessage =
+                        $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
+
+                    return false;
+                }
+
+                if(data.Length != 96)
+                {
+                    ErrorMessage = "Incorrect data size for subchannel";
+
+                    return false;
+                }
+
+                _imageStream.
+                    Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))) + track.RawBytesPerSector,
+                         SeekOrigin.Begin);
+
+                _imageStream.Write(data, 0, data.Length);
+
+                return true;
+            }
+            default:
+                ErrorMessage = $"Unsupported tag type {tag}";
+
+                return false;
+        }
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        CommonTypes.Structs.Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        switch(tag)
+        {
+            case SectorTagType.CdTrackFlags: return WriteSectorTag(data, sectorAddress, tag);
+            case SectorTagType.CdSectorSubchannel:
+            {
+                if(track.SubchannelType == 0)
+                {
+                    ErrorMessage =
+                        $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
+
+                    return false;
+                }
+
+                if(data.Length % 96 != 0)
+                {
+                    ErrorMessage = "Incorrect data size for subchannel";
+
+                    return false;
+                }
+
+                for(uint i = 0; i < length; i++)
+                {
                     _imageStream.
-                        Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))) + track.RawBytesPerSector,
+                        Seek((long)(track.FileOffset + ((i + sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))) + track.RawBytesPerSector,
                              SeekOrigin.Begin);
 
-                    _imageStream.Write(data, 0, data.Length);
-
-                    return true;
+                    _imageStream.Write(data, (int)(i * 96), 96);
                 }
-                default:
-                    ErrorMessage = $"Unsupported tag type {tag}";
 
-                    return false;
+                return true;
             }
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+            default:
+                ErrorMessage = $"Unsupported tag type {tag}";
 
                 return false;
-            }
-
-            CommonTypes.Structs.Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            switch(tag)
-            {
-                case SectorTagType.CdTrackFlags: return WriteSectorTag(data, sectorAddress, tag);
-                case SectorTagType.CdSectorSubchannel:
-                {
-                    if(track.SubchannelType == 0)
-                    {
-                        ErrorMessage =
-                            $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
-
-                        return false;
-                    }
-
-                    if(data.Length % 96 != 0)
-                    {
-                        ErrorMessage = "Incorrect data size for subchannel";
-
-                        return false;
-                    }
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        _imageStream.
-                            Seek((long)(track.FileOffset + ((i + sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))) + track.RawBytesPerSector,
-                                 SeekOrigin.Begin);
-
-                        _imageStream.Write(data, (int)(i * 96), 96);
-                    }
-
-                    return true;
-                }
-                default:
-                    ErrorMessage = $"Unsupported tag type {tag}";
-
-                    return false;
-            }
         }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
     }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/Anex86/Anex86.cs b/Aaru.Images/Anex86/Anex86.cs
index a1561151b..a8a3608a5 100644
--- a/Aaru.Images/Anex86/Anex86.cs
+++ b/Aaru.Images/Anex86/Anex86.cs
@@ -36,39 +36,38 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing Anex-86 disk images</summary>
-    public sealed partial class Anex86 : IWritableImage
-    {
-        IFilter    _anexImageFilter;
-        Header     _header;
-        ImageInfo  _imageInfo;
-        FileStream _writingStream;
+namespace Aaru.DiscImages;
 
-        public Anex86() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing Anex-86 disk images</summary>
+public sealed partial class Anex86 : IWritableImage
+{
+    IFilter    _anexImageFilter;
+    Header     _header;
+    ImageInfo  _imageInfo;
+    FileStream _writingStream;
+
+    public Anex86() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Anex86/Identify.cs b/Aaru.Images/Anex86/Identify.cs
index 46072a35a..bd5bbbf9f 100644
--- a/Aaru.Images/Anex86/Identify.cs
+++ b/Aaru.Images/Anex86/Identify.cs
@@ -35,35 +35,34 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Anex86
 {
-    public sealed partial class Anex86
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < Marshal.SizeOf<Header>())
-                return false;
+        if(stream.Length < Marshal.SizeOf<Header>())
+            return false;
 
-            byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(hdrB, 0, hdrB.Length);
+        byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
 
-            _header = Marshal.SpanToStructureLittleEndian<Header>(hdrB);
+        _header = Marshal.SpanToStructureLittleEndian<Header>(hdrB);
 
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.unknown = {0}", _header.unknown);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.hddtype = {0}", _header.hddtype);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.hdrSize = {0}", _header.hdrSize);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.dskSize = {0}", _header.dskSize);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.bps = {0}", _header.bps);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.spt = {0}", _header.spt);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.heads = {0}", _header.heads);
-            AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.cylinders = {0}", _header.cylinders);
+        AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.unknown = {0}", _header.unknown);
+        AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.hddtype = {0}", _header.hddtype);
+        AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.hdrSize = {0}", _header.hdrSize);
+        AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.dskSize = {0}", _header.dskSize);
+        AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.bps = {0}", _header.bps);
+        AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.spt = {0}", _header.spt);
+        AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.heads = {0}", _header.heads);
+        AaruConsole.DebugWriteLine("Anex86 plugin", "fdihdr.cylinders = {0}", _header.cylinders);
 
-            return stream.Length   == _header.hdrSize + _header.dskSize &&
-                   _header.dskSize == _header.bps * _header.spt * _header.heads * _header.cylinders;
-        }
+        return stream.Length   == _header.hdrSize + _header.dskSize &&
+               _header.dskSize == _header.bps * _header.spt * _header.heads * _header.cylinders;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Anex86/Properties.cs b/Aaru.Images/Anex86/Properties.cs
index 7424f16ca..2404092a3 100644
--- a/Aaru.Images/Anex86/Properties.cs
+++ b/Aaru.Images/Anex86/Properties.cs
@@ -37,65 +37,64 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Anex86
 {
-    public sealed partial class Anex86
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "Anex86 Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("0410003E-6E7B-40E6-9328-BA5651ADF6B7");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Anex86 disk image";
+
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+
+    // TODO: Test with real hardware to see real supported media
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-
-        /// <inheritdoc />
-        public string Name => "Anex86 Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("0410003E-6E7B-40E6-9328-BA5651ADF6B7");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Anex86 disk image";
-
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        MediaType.IBM23FD, MediaType.ECMA_66, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+        MediaType.ACORN_525_SS_SD_40, MediaType.ACORN_525_SS_DD_40, MediaType.ATARI_525_SD, MediaType.ATARI_525_DD,
+        MediaType.ATARI_525_ED, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.ECMA_70,
+        MediaType.Apricot_35, MediaType.RX01, MediaType.RX02, MediaType.NEC_525_HD, MediaType.ECMA_99_15,
+        MediaType.NEC_8_SD, MediaType.RX03, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9,
+        MediaType.ACORN_525_SS_SD_80, MediaType.RX50, MediaType.ATARI_35_SS_DD_11, MediaType.ACORN_525_SS_DD_80,
+        MediaType.ACORN_35_DS_DD, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.ACORN_35_DS_HD,
+        MediaType.DOS_525_HD, MediaType.ACORN_525_DS_DD, MediaType.DOS_35_HD, MediaType.XDF_525, MediaType.DMF,
+        MediaType.XDF_35, MediaType.DOS_35_ED, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_525_HD,
+        MediaType.FDFORMAT_35_HD, MediaType.NEC_35_TD, MediaType.Unknown, MediaType.GENERIC_HDD,
+        MediaType.FlashDrive, MediaType.CompactFlash, MediaType.CompactFlashType2, MediaType.PCCardTypeI,
+        MediaType.PCCardTypeII, MediaType.PCCardTypeIII, MediaType.PCCardTypeIV, MediaType.MetaFloppy_Mod_I,
+        MediaType.MetaFloppy_Mod_II
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".fdi", ".hdi"
+    };
 
-        // TODO: Test with real hardware to see real supported media
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.IBM23FD, MediaType.ECMA_66, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
-            MediaType.ACORN_525_SS_SD_40, MediaType.ACORN_525_SS_DD_40, MediaType.ATARI_525_SD, MediaType.ATARI_525_DD,
-            MediaType.ATARI_525_ED, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.ECMA_70,
-            MediaType.Apricot_35, MediaType.RX01, MediaType.RX02, MediaType.NEC_525_HD, MediaType.ECMA_99_15,
-            MediaType.NEC_8_SD, MediaType.RX03, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9,
-            MediaType.ACORN_525_SS_SD_80, MediaType.RX50, MediaType.ATARI_35_SS_DD_11, MediaType.ACORN_525_SS_DD_80,
-            MediaType.ACORN_35_DS_DD, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.ACORN_35_DS_HD,
-            MediaType.DOS_525_HD, MediaType.ACORN_525_DS_DD, MediaType.DOS_35_HD, MediaType.XDF_525, MediaType.DMF,
-            MediaType.XDF_35, MediaType.DOS_35_ED, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_525_HD,
-            MediaType.FDFORMAT_35_HD, MediaType.NEC_35_TD, MediaType.Unknown, MediaType.GENERIC_HDD,
-            MediaType.FlashDrive, MediaType.CompactFlash, MediaType.CompactFlashType2, MediaType.PCCardTypeI,
-            MediaType.PCCardTypeII, MediaType.PCCardTypeIII, MediaType.PCCardTypeIV, MediaType.MetaFloppy_Mod_I,
-            MediaType.MetaFloppy_Mod_II
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".fdi", ".hdi"
-        };
-
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Anex86/Read.cs b/Aaru.Images/Anex86/Read.cs
index ec88ff370..f22d15653 100644
--- a/Aaru.Images/Anex86/Read.cs
+++ b/Aaru.Images/Anex86/Read.cs
@@ -37,73 +37,72 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Anex86
 {
-    public sealed partial class Anex86
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < Marshal.SizeOf<Header>())
-                return ErrorNumber.InvalidArgument;
+        if(stream.Length < Marshal.SizeOf<Header>())
+            return ErrorNumber.InvalidArgument;
 
-            byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(hdrB, 0, hdrB.Length);
+        byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
 
-            _header = Marshal.SpanToStructureLittleEndian<Header>(hdrB);
+        _header = Marshal.SpanToStructureLittleEndian<Header>(hdrB);
 
-            _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_header.cylinders, (byte)_header.heads,
-                                                          (ushort)_header.spt, (uint)_header.bps, MediaEncoding.MFM,
-                                                          false));
+        _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_header.cylinders, (byte)_header.heads,
+                                                      (ushort)_header.spt, (uint)_header.bps, MediaEncoding.MFM,
+                                                      false));
 
-            if(_imageInfo.MediaType == MediaType.Unknown)
-                _imageInfo.MediaType = MediaType.GENERIC_HDD;
+        if(_imageInfo.MediaType == MediaType.Unknown)
+            _imageInfo.MediaType = MediaType.GENERIC_HDD;
 
-            AaruConsole.DebugWriteLine("Anex86 plugin", "MediaType: {0}", _imageInfo.MediaType);
+        AaruConsole.DebugWriteLine("Anex86 plugin", "MediaType: {0}", _imageInfo.MediaType);
 
-            _imageInfo.ImageSize            = (ulong)_header.dskSize;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = (ulong)(_header.cylinders * _header.heads * _header.spt);
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.SectorSize           = (uint)_header.bps;
-            _imageInfo.Cylinders            = (uint)_header.cylinders;
-            _imageInfo.Heads                = (uint)_header.heads;
-            _imageInfo.SectorsPerTrack      = (uint)_header.spt;
+        _imageInfo.ImageSize            = (ulong)_header.dskSize;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = (ulong)(_header.cylinders * _header.heads * _header.spt);
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.SectorSize           = (uint)_header.bps;
+        _imageInfo.Cylinders            = (uint)_header.cylinders;
+        _imageInfo.Heads                = (uint)_header.heads;
+        _imageInfo.SectorsPerTrack      = (uint)_header.spt;
 
-            _anexImageFilter = imageFilter;
+        _anexImageFilter = imageFilter;
 
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
 
-            buffer = new byte[length * _imageInfo.SectorSize];
+        buffer = new byte[length * _imageInfo.SectorSize];
 
-            Stream stream = _anexImageFilter.GetDataForkStream();
+        Stream stream = _anexImageFilter.GetDataForkStream();
 
-            stream.Seek((long)((ulong)_header.hdrSize + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+        stream.Seek((long)((ulong)_header.hdrSize + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
 
-            stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
+        stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
 
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Anex86/Structs.cs b/Aaru.Images/Anex86/Structs.cs
index 5909ad3f6..3bc086a89 100644
--- a/Aaru.Images/Anex86/Structs.cs
+++ b/Aaru.Images/Anex86/Structs.cs
@@ -32,21 +32,20 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Anex86
 {
-    public sealed partial class Anex86
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            public readonly int unknown;
-            public readonly int hddtype;
-            public          int hdrSize;
-            public          int dskSize;
-            public          int bps;
-            public          int spt;
-            public          int heads;
-            public          int cylinders;
-        }
+        public readonly int unknown;
+        public readonly int hddtype;
+        public          int hdrSize;
+        public          int dskSize;
+        public          int bps;
+        public          int spt;
+        public          int heads;
+        public          int cylinders;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Anex86/Unsupported.cs b/Aaru.Images/Anex86/Unsupported.cs
index 56d148aed..f00d2cd9d 100644
--- a/Aaru.Images/Anex86/Unsupported.cs
+++ b/Aaru.Images/Anex86/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Anex86
 {
-    public sealed partial class Anex86
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Anex86/Write.cs b/Aaru.Images/Anex86/Write.cs
index f55d66fdf..f2b5366ef 100644
--- a/Aaru.Images/Anex86/Write.cs
+++ b/Aaru.Images/Anex86/Write.cs
@@ -40,264 +40,263 @@ using Aaru.CommonTypes.Structs;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Anex86
 {
-    public sealed partial class Anex86
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize == 0)
         {
-            if(sectorSize == 0)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(sectors * sectorSize > int.MaxValue ||
-               sectors              > (long)int.MaxValue * 8 * 33)
-            {
-                ErrorMessage = "Too many sectors";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            _header = new Header
-            {
-                hdrSize = 4096,
-                dskSize = (int)(sectors * sectorSize),
-                bps     = (int)sectorSize
-            };
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(sectors * sectorSize > int.MaxValue ||
+           sectors              > (long)int.MaxValue * 8 * 33)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(4096 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(4096 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
-
-            if((_imageInfo.MediaType == MediaType.Unknown || _imageInfo.MediaType == MediaType.GENERIC_HDD ||
-                _imageInfo.MediaType == MediaType.FlashDrive || _imageInfo.MediaType == MediaType.CompactFlash ||
-                _imageInfo.MediaType == MediaType.CompactFlashType2 || _imageInfo.MediaType == MediaType.PCCardTypeI ||
-                _imageInfo.MediaType == MediaType.PCCardTypeII || _imageInfo.MediaType == MediaType.PCCardTypeIII ||
-                _imageInfo.MediaType == MediaType.PCCardTypeIV) &&
-               _header.cylinders == 0)
-            {
-                _header.cylinders = (int)(_imageInfo.Sectors / 8 / 33);
-                _header.heads     = 8;
-                _header.spt       = 33;
-
-                while(_header.cylinders == 0)
-                {
-                    _header.heads--;
-
-                    if(_header.heads == 0)
-                    {
-                        _header.spt--;
-                        _header.heads = 8;
-                    }
-
-                    _header.cylinders = (int)_imageInfo.Sectors / _header.heads / _header.spt;
-
-                    if(_header.cylinders == 0 &&
-                       _header.heads     == 0 &&
-                       _header.spt       == 0)
-                        break;
-                }
-            }
-
-            byte[] hdr = new byte[Marshal.SizeOf<Header>()];
-            MemoryMarshal.Write(hdr, ref _header);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
         }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+        catch(IOException e)
         {
-            if(cylinders > int.MaxValue)
-            {
-                ErrorMessage = "Too many cylinders.";
-
-                return false;
-            }
-
-            if(heads > int.MaxValue)
-            {
-                ErrorMessage = "Too many heads.";
-
-                return false;
-            }
-
-            if(sectorsPerTrack > int.MaxValue)
-            {
-                ErrorMessage = "Too many sectors per track.";
-
-                return false;
-            }
-
-            _header.spt       = (int)sectorsPerTrack;
-            _header.heads     = (int)heads;
-            _header.cylinders = (int)cylinders;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+        _header = new Header
         {
-            ErrorMessage = "Unsupported feature";
+            hdrSize = 4096,
+            dskSize = (int)(sectors * sectorSize),
+            bps     = (int)sectorSize
+        };
 
-            return false;
-        }
+        IsWriting    = true;
+        ErrorMessage = null;
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(4096 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(4096 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        if((_imageInfo.MediaType == MediaType.Unknown           || _imageInfo.MediaType == MediaType.GENERIC_HDD   ||
+            _imageInfo.MediaType == MediaType.FlashDrive        || _imageInfo.MediaType == MediaType.CompactFlash  ||
+            _imageInfo.MediaType == MediaType.CompactFlashType2 || _imageInfo.MediaType == MediaType.PCCardTypeI   ||
+            _imageInfo.MediaType == MediaType.PCCardTypeII      || _imageInfo.MediaType == MediaType.PCCardTypeIII ||
+            _imageInfo.MediaType == MediaType.PCCardTypeIV) &&
+           _header.cylinders == 0)
+        {
+            _header.cylinders = (int)(_imageInfo.Sectors / 8 / 33);
+            _header.heads     = 8;
+            _header.spt       = 33;
+
+            while(_header.cylinders == 0)
+            {
+                _header.heads--;
+
+                if(_header.heads == 0)
+                {
+                    _header.spt--;
+                    _header.heads = 8;
+                }
+
+                _header.cylinders = (int)_imageInfo.Sectors / _header.heads / _header.spt;
+
+                if(_header.cylinders == 0 &&
+                   _header.heads     == 0 &&
+                   _header.spt       == 0)
+                    break;
+            }
+        }
+
+        byte[] hdr = new byte[Marshal.SizeOf<Header>()];
+        MemoryMarshal.Write(hdr, ref _header);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        if(cylinders > int.MaxValue)
+        {
+            ErrorMessage = "Too many cylinders.";
+
+            return false;
+        }
+
+        if(heads > int.MaxValue)
+        {
+            ErrorMessage = "Too many heads.";
+
+            return false;
+        }
+
+        if(sectorsPerTrack > int.MaxValue)
+        {
+            ErrorMessage = "Too many sectors per track.";
+
+            return false;
+        }
+
+        _header.spt       = (int)sectorsPerTrack;
+        _header.heads     = (int)heads;
+        _header.cylinders = (int)cylinders;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Apple2MG.cs b/Aaru.Images/Apple2MG/Apple2MG.cs
index a2910e810..c1f8052f4 100644
--- a/Aaru.Images/Apple2MG/Apple2MG.cs
+++ b/Aaru.Images/Apple2MG/Apple2MG.cs
@@ -36,40 +36,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing XGD emulator disk images</summary>
-    public sealed partial class Apple2Mg : IWritableImage
-    {
-        IFilter    _a2MgImageFilter;
-        byte[]     _decodedImage;
-        Header     _imageHeader;
-        ImageInfo  _imageInfo;
-        FileStream _writingStream;
+namespace Aaru.DiscImages;
 
-        public Apple2Mg() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing XGD emulator disk images</summary>
+public sealed partial class Apple2Mg : IWritableImage
+{
+    IFilter    _a2MgImageFilter;
+    byte[]     _decodedImage;
+    Header     _imageHeader;
+    ImageInfo  _imageInfo;
+    FileStream _writingStream;
+
+    public Apple2Mg() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Constants.cs b/Aaru.Images/Apple2MG/Constants.cs
index 074e37c3d..7fc5ee17d 100644
--- a/Aaru.Images/Apple2MG/Constants.cs
+++ b/Aaru.Images/Apple2MG/Constants.cs
@@ -32,42 +32,41 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
-{
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Apple2Mg
-    {
-        /// <summary>Magic number, "2IMG"</summary>
-        const uint MAGIC = 0x474D4932;
-        /// <summary>Disk image created by ASIMOV2, "!nfc"</summary>
-        const uint CREATOR_ASIMOV = 0x63666E21;
-        /// <summary>Disk image created by Bernie ][ the Rescue, "B2TR"</summary>
-        const uint CREATOR_BERNIE = 0x52543242;
-        /// <summary>Disk image created by Catakig, "CTKG"</summary>
-        const uint CREATOR_CATAKIG = 0x474B5443;
-        /// <summary>Disk image created by Sheppy's ImageMaker, "ShIm"</summary>
-        const uint CREATOR_SHEPPY = 0x6D496853;
-        /// <summary>Disk image created by Sweet16, "WOOF"</summary>
-        const uint CREATOR_SWEET = 0x464F4F57;
-        /// <summary>Disk image created by XGS, "XGS!"</summary>
-        const uint CREATOR_XGS = 0x21534758;
-        /// <summary>Disk image created by CiderPress, "CdrP"</summary>
-        const uint CREATOR_CIDER = 0x50726443;
-        /// <summary>Disk image created by DiscImageChef, "dic "</summary>
-        const uint CREATOR_DIC = 0x20636964;
-        /// <summary>Disk image created by Aaru, "aaru"</summary>
-        const uint CREATOR_AARU = 0x75726161;
+namespace Aaru.DiscImages;
 
-        const uint LOCKED_DISK         = 0x80000000;
-        const uint VALID_VOLUME_NUMBER = 0x00000100;
-        const uint VOLUME_NUMBER_MASK  = 0x000000FF;
-        readonly int[] _deinterleave =
-        {
-            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-        };
-        readonly int[] _interleave =
-        {
-            0, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 15
-        };
-    }
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Apple2Mg
+{
+    /// <summary>Magic number, "2IMG"</summary>
+    const uint MAGIC = 0x474D4932;
+    /// <summary>Disk image created by ASIMOV2, "!nfc"</summary>
+    const uint CREATOR_ASIMOV = 0x63666E21;
+    /// <summary>Disk image created by Bernie ][ the Rescue, "B2TR"</summary>
+    const uint CREATOR_BERNIE = 0x52543242;
+    /// <summary>Disk image created by Catakig, "CTKG"</summary>
+    const uint CREATOR_CATAKIG = 0x474B5443;
+    /// <summary>Disk image created by Sheppy's ImageMaker, "ShIm"</summary>
+    const uint CREATOR_SHEPPY = 0x6D496853;
+    /// <summary>Disk image created by Sweet16, "WOOF"</summary>
+    const uint CREATOR_SWEET = 0x464F4F57;
+    /// <summary>Disk image created by XGS, "XGS!"</summary>
+    const uint CREATOR_XGS = 0x21534758;
+    /// <summary>Disk image created by CiderPress, "CdrP"</summary>
+    const uint CREATOR_CIDER = 0x50726443;
+    /// <summary>Disk image created by DiscImageChef, "dic "</summary>
+    const uint CREATOR_DIC = 0x20636964;
+    /// <summary>Disk image created by Aaru, "aaru"</summary>
+    const uint CREATOR_AARU = 0x75726161;
+
+    const uint LOCKED_DISK         = 0x80000000;
+    const uint VALID_VOLUME_NUMBER = 0x00000100;
+    const uint VOLUME_NUMBER_MASK  = 0x000000FF;
+    readonly int[] _deinterleave =
+    {
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+    };
+    readonly int[] _interleave =
+    {
+        0, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 15
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Enums.cs b/Aaru.Images/Apple2MG/Enums.cs
index 1c41e8705..205c49241 100644
--- a/Aaru.Images/Apple2MG/Enums.cs
+++ b/Aaru.Images/Apple2MG/Enums.cs
@@ -30,13 +30,12 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apple2Mg
 {
-    public sealed partial class Apple2Mg
+    enum SectorOrder : uint
     {
-        enum SectorOrder : uint
-        {
-            Dos = 0, ProDos = 1, Nibbles = 2
-        }
+        Dos = 0, ProDos = 1, Nibbles = 2
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Helpers.cs b/Aaru.Images/Apple2MG/Helpers.cs
index d79f1f874..135918ea9 100644
--- a/Aaru.Images/Apple2MG/Helpers.cs
+++ b/Aaru.Images/Apple2MG/Helpers.cs
@@ -32,23 +32,22 @@
 
 using Aaru.CommonTypes;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apple2Mg
 {
-    public sealed partial class Apple2Mg
+    MediaType GetMediaType()
     {
-        MediaType GetMediaType()
+        switch(_imageInfo.Sectors)
         {
-            switch(_imageInfo.Sectors)
-            {
-                case 455:  return MediaType.Apple32SS;
-                case 910:  return MediaType.Apple32DS;
-                case 560:  return MediaType.Apple33SS;
-                case 1120: return MediaType.Apple33DS;
-                case 800:  return MediaType.AppleSonySS;
-                case 1600: return MediaType.AppleSonyDS;
-                case 2880: return MediaType.DOS_35_HD;
-                default:   return MediaType.Unknown;
-            }
+            case 455:  return MediaType.Apple32SS;
+            case 910:  return MediaType.Apple32DS;
+            case 560:  return MediaType.Apple33SS;
+            case 1120: return MediaType.Apple33DS;
+            case 800:  return MediaType.AppleSonySS;
+            case 1600: return MediaType.AppleSonyDS;
+            case 2880: return MediaType.DOS_35_HD;
+            default:   return MediaType.Unknown;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Identify.cs b/Aaru.Images/Apple2MG/Identify.cs
index d5cde3b55..78f1dd0bc 100644
--- a/Aaru.Images/Apple2MG/Identify.cs
+++ b/Aaru.Images/Apple2MG/Identify.cs
@@ -34,47 +34,46 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apple2Mg
 {
-    public sealed partial class Apple2Mg
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 65)
-                return false;
+        if(stream.Length < 65)
+            return false;
 
-            byte[] header = new byte[64];
-            stream.Read(header, 0, 64);
+        byte[] header = new byte[64];
+        stream.Read(header, 0, 64);
 
-            Header hdr = Marshal.SpanToStructureLittleEndian<Header>(header);
+        Header hdr = Marshal.SpanToStructureLittleEndian<Header>(header);
 
-            if(hdr.Magic != MAGIC)
-                return false;
+        if(hdr.Magic != MAGIC)
+            return false;
 
-            if(hdr.DataOffset > stream.Length)
-                return false;
+        if(hdr.DataOffset > stream.Length)
+            return false;
 
-            // There seems to be incorrect endian in some images on the wild
-            if(hdr.DataSize == 0x00800C00)
-                hdr.DataSize = 0x000C8000;
+        // There seems to be incorrect endian in some images on the wild
+        if(hdr.DataSize == 0x00800C00)
+            hdr.DataSize = 0x000C8000;
 
-            if(hdr.DataOffset + hdr.DataSize > stream.Length)
-                return false;
+        if(hdr.DataOffset + hdr.DataSize > stream.Length)
+            return false;
 
-            if(hdr.CommentOffset > stream.Length)
-                return false;
+        if(hdr.CommentOffset > stream.Length)
+            return false;
 
-            if(hdr.CommentOffset + hdr.CommentSize > stream.Length)
-                return false;
+        if(hdr.CommentOffset + hdr.CommentSize > stream.Length)
+            return false;
 
-            if(hdr.CreatorSpecificOffset > stream.Length)
-                return false;
+        if(hdr.CreatorSpecificOffset > stream.Length)
+            return false;
 
-            return hdr.CreatorSpecificOffset + hdr.CreatorSpecificSize <= stream.Length;
-        }
+        return hdr.CreatorSpecificOffset + hdr.CreatorSpecificSize <= stream.Length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Properties.cs b/Aaru.Images/Apple2MG/Properties.cs
index b87de09b0..52662ceae 100644
--- a/Aaru.Images/Apple2MG/Properties.cs
+++ b/Aaru.Images/Apple2MG/Properties.cs
@@ -37,53 +37,52 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apple2Mg
 {
-    public sealed partial class Apple2Mg
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "Apple 2IMG";
+    /// <inheritdoc />
+    public Guid Id => new Guid("CBAF8824-BA5F-415F-953A-19A03519B2D1");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Apple 2IMG";
+
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-
-        /// <inheritdoc />
-        public string Name => "Apple 2IMG";
-        /// <inheritdoc />
-        public Guid Id => new Guid("CBAF8824-BA5F-415F-953A-19A03519B2D1");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Apple 2IMG";
-
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        MediaType.Apple32SS, MediaType.Apple33SS, MediaType.AppleSonySS, MediaType.AppleSonyDS, MediaType.DOS_35_HD,
+        MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.Apple32SS, MediaType.Apple33SS, MediaType.AppleSonySS, MediaType.AppleSonyDS, MediaType.DOS_35_HD,
-            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".2mg"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".2mg"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Read.cs b/Aaru.Images/Apple2MG/Read.cs
index 539e54df5..64f62e74a 100644
--- a/Aaru.Images/Apple2MG/Read.cs
+++ b/Aaru.Images/Apple2MG/Read.cs
@@ -40,302 +40,301 @@ using Aaru.Console;
 using Aaru.Filters;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apple2Mg
 {
-    public sealed partial class Apple2Mg
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        _imageHeader = new Header();
+
+        byte[] header = new byte[64];
+        stream.Read(header, 0, 64);
+        byte[] magic   = new byte[4];
+        byte[] creator = new byte[4];
+
+        Array.Copy(header, 0, magic, 0, 4);
+        Array.Copy(header, 4, creator, 0, 4);
+
+        _imageHeader = Marshal.SpanToStructureLittleEndian<Header>(header);
+
+        if(_imageHeader.DataSize == 0x00800C00)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
-
-            _imageHeader = new Header();
-
-            byte[] header = new byte[64];
-            stream.Read(header, 0, 64);
-            byte[] magic   = new byte[4];
-            byte[] creator = new byte[4];
-
-            Array.Copy(header, 0, magic, 0, 4);
-            Array.Copy(header, 4, creator, 0, 4);
-
-            _imageHeader = Marshal.SpanToStructureLittleEndian<Header>(header);
-
-            if(_imageHeader.DataSize == 0x00800C00)
-            {
-                _imageHeader.DataSize = 0x000C8000;
-                AaruConsole.DebugWriteLine("2MG plugin", "Detected incorrect endian on data size field, correcting.");
-            }
-
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.magic = \"{0}\"", Encoding.ASCII.GetString(magic));
-
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.creator = \"{0}\"",
-                                       Encoding.ASCII.GetString(creator));
-
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.headerSize = {0}", _imageHeader.HeaderSize);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.version = {0}", _imageHeader.Version);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.imageFormat = {0}", _imageHeader.ImageFormat);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.flags = 0x{0:X8}", _imageHeader.Flags);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.blocks = {0}", _imageHeader.Blocks);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.dataOffset = 0x{0:X8}", _imageHeader.DataOffset);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.dataSize = {0}", _imageHeader.DataSize);
-
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.commentOffset = 0x{0:X8}",
-                                       _imageHeader.CommentOffset);
-
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.commentSize = {0}", _imageHeader.CommentSize);
-
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.creatorSpecificOffset = 0x{0:X8}",
-                                       _imageHeader.CreatorSpecificOffset);
-
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.creatorSpecificSize = {0}",
-                                       _imageHeader.CreatorSpecificSize);
-
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved1 = 0x{0:X8}", _imageHeader.Reserved1);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved2 = 0x{0:X8}", _imageHeader.Reserved2);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved3 = 0x{0:X8}", _imageHeader.Reserved3);
-            AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved4 = 0x{0:X8}", _imageHeader.Reserved4);
-
-            if(_imageHeader.DataSize    == 0 &&
-               _imageHeader.Blocks      == 0 &&
-               _imageHeader.ImageFormat != SectorOrder.ProDos)
-                return ErrorNumber.InvalidArgument;
-
-            byte[] tmp;
-            int[]  offsets;
-
-            switch(_imageHeader.ImageFormat)
-            {
-                case SectorOrder.Nibbles:
-                    tmp = new byte[_imageHeader.DataSize];
-                    stream.Seek(_imageHeader.DataOffset, SeekOrigin.Begin);
-                    stream.Read(tmp, 0, tmp.Length);
-                    var nibPlugin = new AppleNib();
-                    var noFilter  = new ZZZNoFilter();
-                    noFilter.Open(tmp);
-                    nibPlugin.Open(noFilter);
-                    ErrorNumber errno = nibPlugin.ReadSectors(0, (uint)nibPlugin.Info.Sectors, out _decodedImage);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    _imageInfo.Sectors    = nibPlugin.Info.Sectors;
-                    _imageInfo.SectorSize = nibPlugin.Info.SectorSize;
-
-                    break;
-                case SectorOrder.Dos when _imageHeader.DataSize    == 143360:
-                case SectorOrder.ProDos when _imageHeader.DataSize == 143360:
-                    stream.Seek(_imageHeader.DataOffset, SeekOrigin.Begin);
-                    tmp = new byte[_imageHeader.DataSize];
-                    stream.Read(tmp, 0, tmp.Length);
-
-                    bool isDos = tmp[0x11001] == 17 && tmp[0x11002] < 16 && tmp[0x11027] <= 122 && tmp[0x11034] == 35 &&
-                                 tmp[0x11035] == 16 && tmp[0x11036] == 0 && tmp[0x11037] == 1;
-
-                    _decodedImage = new byte[_imageHeader.DataSize];
-
-                    offsets = _imageHeader.ImageFormat == SectorOrder.Dos
-                                  ? isDos
-                                        ? _deinterleave
-                                        : _interleave
-                                  : isDos
-                                      ? _interleave
-                                      : _deinterleave;
-
-                    for(int t = 0; t < 35; t++)
-                    {
-                        for(int s = 0; s < 16; s++)
-                            Array.Copy(tmp, (t * 16 * 256) + (s          * 256), _decodedImage,
-                                       (t      * 16 * 256) + (offsets[s] * 256), 256);
-                    }
-
-                    _imageInfo.Sectors    = 560;
-                    _imageInfo.SectorSize = 256;
-
-                    break;
-                case SectorOrder.Dos when _imageHeader.DataSize == 819200:
-                    stream.Seek(_imageHeader.DataOffset, SeekOrigin.Begin);
-                    tmp = new byte[_imageHeader.DataSize];
-                    stream.Read(tmp, 0, tmp.Length);
-                    _decodedImage = new byte[_imageHeader.DataSize];
-                    offsets       = _interleave;
-
-                    for(int t = 0; t < 200; t++)
-                    {
-                        for(int s = 0; s < 16; s++)
-                            Array.Copy(tmp, (t * 16 * 256) + (s          * 256), _decodedImage,
-                                       (t      * 16 * 256) + (offsets[s] * 256), 256);
-                    }
-
-                    _imageInfo.Sectors    = 1600;
-                    _imageInfo.SectorSize = 512;
-
-                    break;
-                default:
-                    _decodedImage         = null;
-                    _imageInfo.SectorSize = 512;
-                    _imageInfo.Sectors    = _imageHeader.DataSize / 512;
-
-                    break;
-            }
-
-            _imageInfo.ImageSize = _imageHeader.DataSize;
-
-            switch(_imageHeader.Creator)
-            {
-                case CREATOR_ASIMOV:
-                    _imageInfo.Application = "ASIMOV2";
-
-                    break;
-                case CREATOR_BERNIE:
-                    _imageInfo.Application = "Bernie ][ the Rescue";
-
-                    break;
-                case CREATOR_CATAKIG:
-                    _imageInfo.Application = "Catakig";
-
-                    break;
-                case CREATOR_SHEPPY:
-                    _imageInfo.Application = "Sheppy's ImageMaker";
-
-                    break;
-                case CREATOR_SWEET:
-                    _imageInfo.Application = "Sweet16";
-
-                    break;
-                case CREATOR_XGS:
-                    _imageInfo.Application = "XGS";
-
-                    break;
-                case CREATOR_CIDER:
-                    _imageInfo.Application = "CiderPress";
-
-                    break;
-                case CREATOR_DIC:
-                    _imageInfo.Application = "DiscImageChef";
-
-                    break;
-                case CREATOR_AARU:
-                    _imageInfo.Application = "Aaru";
-
-                    break;
-                default:
-                    _imageInfo.Application = $"Unknown creator code \"{Encoding.ASCII.GetString(creator)}\"";
-
-                    break;
-            }
-
-            _imageInfo.Version = _imageHeader.Version.ToString();
-
-            if(_imageHeader.CommentOffset != 0 &&
-               _imageHeader.CommentSize   != 0)
-            {
-                stream.Seek(_imageHeader.CommentOffset, SeekOrigin.Begin);
-
-                byte[] comments = new byte[_imageHeader.CommentSize];
-                stream.Read(comments, 0, (int)_imageHeader.CommentSize);
-                _imageInfo.Comments = Encoding.ASCII.GetString(comments);
-            }
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.MediaType            = GetMediaType();
-
-            _a2MgImageFilter = imageFilter;
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-            AaruConsole.VerboseWriteLine("2MG image contains a disk of type {0}", _imageInfo.MediaType);
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                AaruConsole.VerboseWriteLine("2MG comments: {0}", _imageInfo.Comments);
-
-            switch(_imageInfo.MediaType)
-            {
-                case MediaType.Apple32SS:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 13;
-
-                    break;
-                case MediaType.Apple32DS:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 13;
-
-                    break;
-                case MediaType.Apple33SS:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.Apple33DS:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.AppleSonySS:
-                    _imageInfo.Cylinders = 80;
-                    _imageInfo.Heads     = 1;
-
-                    // Variable sectors per track, this suffices
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.AppleSonyDS:
-                    _imageInfo.Cylinders = 80;
-                    _imageInfo.Heads     = 2;
-
-                    // Variable sectors per track, this suffices
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.DOS_35_HD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 18;
-
-                    break;
-            }
-
-            return ErrorNumber.NoError;
+            _imageHeader.DataSize = 0x000C8000;
+            AaruConsole.DebugWriteLine("2MG plugin", "Detected incorrect endian on data size field, correcting.");
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.magic = \"{0}\"", Encoding.ASCII.GetString(magic));
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.creator = \"{0}\"",
+                                   Encoding.ASCII.GetString(creator));
+
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.headerSize = {0}", _imageHeader.HeaderSize);
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.version = {0}", _imageHeader.Version);
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.imageFormat = {0}", _imageHeader.ImageFormat);
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.flags = 0x{0:X8}", _imageHeader.Flags);
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.blocks = {0}", _imageHeader.Blocks);
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.dataOffset = 0x{0:X8}", _imageHeader.DataOffset);
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.dataSize = {0}", _imageHeader.DataSize);
+
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.commentOffset = 0x{0:X8}",
+                                   _imageHeader.CommentOffset);
+
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.commentSize = {0}", _imageHeader.CommentSize);
+
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.creatorSpecificOffset = 0x{0:X8}",
+                                   _imageHeader.CreatorSpecificOffset);
+
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.creatorSpecificSize = {0}",
+                                   _imageHeader.CreatorSpecificSize);
+
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved1 = 0x{0:X8}", _imageHeader.Reserved1);
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved2 = 0x{0:X8}", _imageHeader.Reserved2);
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved3 = 0x{0:X8}", _imageHeader.Reserved3);
+        AaruConsole.DebugWriteLine("2MG plugin", "ImageHeader.reserved4 = 0x{0:X8}", _imageHeader.Reserved4);
+
+        if(_imageHeader.DataSize    == 0 &&
+           _imageHeader.Blocks      == 0 &&
+           _imageHeader.ImageFormat != SectorOrder.ProDos)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] tmp;
+        int[]  offsets;
+
+        switch(_imageHeader.ImageFormat)
         {
-            buffer = null;
+            case SectorOrder.Nibbles:
+                tmp = new byte[_imageHeader.DataSize];
+                stream.Seek(_imageHeader.DataOffset, SeekOrigin.Begin);
+                stream.Read(tmp, 0, tmp.Length);
+                var nibPlugin = new AppleNib();
+                var noFilter  = new ZZZNoFilter();
+                noFilter.Open(tmp);
+                nibPlugin.Open(noFilter);
+                ErrorNumber errno = nibPlugin.ReadSectors(0, (uint)nibPlugin.Info.Sectors, out _decodedImage);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+                if(errno != ErrorNumber.NoError)
+                    return errno;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+                _imageInfo.Sectors    = nibPlugin.Info.Sectors;
+                _imageInfo.SectorSize = nibPlugin.Info.SectorSize;
 
-            buffer = new byte[length * _imageInfo.SectorSize];
+                break;
+            case SectorOrder.Dos when _imageHeader.DataSize    == 143360:
+            case SectorOrder.ProDos when _imageHeader.DataSize == 143360:
+                stream.Seek(_imageHeader.DataOffset, SeekOrigin.Begin);
+                tmp = new byte[_imageHeader.DataSize];
+                stream.Read(tmp, 0, tmp.Length);
 
-            if(_decodedImage != null)
-                Array.Copy(_decodedImage, (long)(sectorAddress * _imageInfo.SectorSize), buffer, 0,
-                           length * _imageInfo.SectorSize);
-            else
-            {
-                Stream stream = _a2MgImageFilter.GetDataForkStream();
+                bool isDos = tmp[0x11001] == 17 && tmp[0x11002] < 16 && tmp[0x11027] <= 122 && tmp[0x11034] == 35 &&
+                             tmp[0x11035] == 16 && tmp[0x11036] == 0 && tmp[0x11037] == 1;
 
-                stream.Seek((long)(_imageHeader.DataOffset + (sectorAddress * _imageInfo.SectorSize)),
-                            SeekOrigin.Begin);
+                _decodedImage = new byte[_imageHeader.DataSize];
 
-                stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
-            }
+                offsets = _imageHeader.ImageFormat == SectorOrder.Dos
+                              ? isDos
+                                    ? _deinterleave
+                                    : _interleave
+                              : isDos
+                                  ? _interleave
+                                  : _deinterleave;
 
-            return ErrorNumber.NoError;
+                for(int t = 0; t < 35; t++)
+                {
+                    for(int s = 0; s < 16; s++)
+                        Array.Copy(tmp, (t * 16 * 256) + (s          * 256), _decodedImage,
+                                   (t      * 16 * 256) + (offsets[s] * 256), 256);
+                }
+
+                _imageInfo.Sectors    = 560;
+                _imageInfo.SectorSize = 256;
+
+                break;
+            case SectorOrder.Dos when _imageHeader.DataSize == 819200:
+                stream.Seek(_imageHeader.DataOffset, SeekOrigin.Begin);
+                tmp = new byte[_imageHeader.DataSize];
+                stream.Read(tmp, 0, tmp.Length);
+                _decodedImage = new byte[_imageHeader.DataSize];
+                offsets       = _interleave;
+
+                for(int t = 0; t < 200; t++)
+                {
+                    for(int s = 0; s < 16; s++)
+                        Array.Copy(tmp, (t * 16 * 256) + (s          * 256), _decodedImage,
+                                   (t      * 16 * 256) + (offsets[s] * 256), 256);
+                }
+
+                _imageInfo.Sectors    = 1600;
+                _imageInfo.SectorSize = 512;
+
+                break;
+            default:
+                _decodedImage         = null;
+                _imageInfo.SectorSize = 512;
+                _imageInfo.Sectors    = _imageHeader.DataSize / 512;
+
+                break;
         }
+
+        _imageInfo.ImageSize = _imageHeader.DataSize;
+
+        switch(_imageHeader.Creator)
+        {
+            case CREATOR_ASIMOV:
+                _imageInfo.Application = "ASIMOV2";
+
+                break;
+            case CREATOR_BERNIE:
+                _imageInfo.Application = "Bernie ][ the Rescue";
+
+                break;
+            case CREATOR_CATAKIG:
+                _imageInfo.Application = "Catakig";
+
+                break;
+            case CREATOR_SHEPPY:
+                _imageInfo.Application = "Sheppy's ImageMaker";
+
+                break;
+            case CREATOR_SWEET:
+                _imageInfo.Application = "Sweet16";
+
+                break;
+            case CREATOR_XGS:
+                _imageInfo.Application = "XGS";
+
+                break;
+            case CREATOR_CIDER:
+                _imageInfo.Application = "CiderPress";
+
+                break;
+            case CREATOR_DIC:
+                _imageInfo.Application = "DiscImageChef";
+
+                break;
+            case CREATOR_AARU:
+                _imageInfo.Application = "Aaru";
+
+                break;
+            default:
+                _imageInfo.Application = $"Unknown creator code \"{Encoding.ASCII.GetString(creator)}\"";
+
+                break;
+        }
+
+        _imageInfo.Version = _imageHeader.Version.ToString();
+
+        if(_imageHeader.CommentOffset != 0 &&
+           _imageHeader.CommentSize   != 0)
+        {
+            stream.Seek(_imageHeader.CommentOffset, SeekOrigin.Begin);
+
+            byte[] comments = new byte[_imageHeader.CommentSize];
+            stream.Read(comments, 0, (int)_imageHeader.CommentSize);
+            _imageInfo.Comments = Encoding.ASCII.GetString(comments);
+        }
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.MediaType            = GetMediaType();
+
+        _a2MgImageFilter = imageFilter;
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
+        AaruConsole.VerboseWriteLine("2MG image contains a disk of type {0}", _imageInfo.MediaType);
+
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+            AaruConsole.VerboseWriteLine("2MG comments: {0}", _imageInfo.Comments);
+
+        switch(_imageInfo.MediaType)
+        {
+            case MediaType.Apple32SS:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 13;
+
+                break;
+            case MediaType.Apple32DS:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 13;
+
+                break;
+            case MediaType.Apple33SS:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.Apple33DS:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.AppleSonySS:
+                _imageInfo.Cylinders = 80;
+                _imageInfo.Heads     = 1;
+
+                // Variable sectors per track, this suffices
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.AppleSonyDS:
+                _imageInfo.Cylinders = 80;
+                _imageInfo.Heads     = 2;
+
+                // Variable sectors per track, this suffices
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.DOS_35_HD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 18;
+
+                break;
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        if(_decodedImage != null)
+            Array.Copy(_decodedImage, (long)(sectorAddress * _imageInfo.SectorSize), buffer, 0,
+                       length * _imageInfo.SectorSize);
+        else
+        {
+            Stream stream = _a2MgImageFilter.GetDataForkStream();
+
+            stream.Seek((long)(_imageHeader.DataOffset + (sectorAddress * _imageInfo.SectorSize)),
+                        SeekOrigin.Begin);
+
+            stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
+        }
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Structs.cs b/Aaru.Images/Apple2MG/Structs.cs
index c89f05f59..94f0f9832 100644
--- a/Aaru.Images/Apple2MG/Structs.cs
+++ b/Aaru.Images/Apple2MG/Structs.cs
@@ -33,47 +33,46 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apple2Mg
 {
-    public sealed partial class Apple2Mg
+    [SuppressMessage("ReSharper", "NotAccessedField.Local"), StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        [SuppressMessage("ReSharper", "NotAccessedField.Local"), StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            /// <summary>Offset 0x00, magic</summary>
-            public uint Magic;
-            /// <summary>Offset 0x04, disk image creator ID</summary>
-            public uint Creator;
-            /// <summary>Offset 0x08, header size, constant 0x0040</summary>
-            public ushort HeaderSize;
-            /// <summary>Offset 0x0A, disk image version</summary>
-            public ushort Version;
-            /// <summary>Offset 0x0C, disk image format</summary>
-            public SectorOrder ImageFormat;
-            /// <summary>Offset 0x10, flags and volume number</summary>
-            public uint Flags;
-            /// <summary>Offset 0x14, blocks for ProDOS, 0 otherwise</summary>
-            public uint Blocks;
-            /// <summary>Offset 0x18, offset to data</summary>
-            public uint DataOffset;
-            /// <summary>Offset 0x1C, data size in bytes</summary>
-            public uint DataSize;
-            /// <summary>Offset 0x20, offset to optional comment</summary>
-            public uint CommentOffset;
-            /// <summary>Offset 0x24, length of optional comment</summary>
-            public uint CommentSize;
-            /// <summary>Offset 0x28, offset to creator specific chunk</summary>
-            public readonly uint CreatorSpecificOffset;
-            /// <summary>Offset 0x2C, creator specific chunk size</summary>
-            public readonly uint CreatorSpecificSize;
-            /// <summary>Offset 0x30, reserved, should be zero</summary>
-            public readonly uint Reserved1;
-            /// <summary>Offset 0x34, reserved, should be zero</summary>
-            public readonly uint Reserved2;
-            /// <summary>Offset 0x38, reserved, should be zero</summary>
-            public readonly uint Reserved3;
-            /// <summary>Offset 0x3C, reserved, should be zero</summary>
-            public readonly uint Reserved4;
-        }
+        /// <summary>Offset 0x00, magic</summary>
+        public uint Magic;
+        /// <summary>Offset 0x04, disk image creator ID</summary>
+        public uint Creator;
+        /// <summary>Offset 0x08, header size, constant 0x0040</summary>
+        public ushort HeaderSize;
+        /// <summary>Offset 0x0A, disk image version</summary>
+        public ushort Version;
+        /// <summary>Offset 0x0C, disk image format</summary>
+        public SectorOrder ImageFormat;
+        /// <summary>Offset 0x10, flags and volume number</summary>
+        public uint Flags;
+        /// <summary>Offset 0x14, blocks for ProDOS, 0 otherwise</summary>
+        public uint Blocks;
+        /// <summary>Offset 0x18, offset to data</summary>
+        public uint DataOffset;
+        /// <summary>Offset 0x1C, data size in bytes</summary>
+        public uint DataSize;
+        /// <summary>Offset 0x20, offset to optional comment</summary>
+        public uint CommentOffset;
+        /// <summary>Offset 0x24, length of optional comment</summary>
+        public uint CommentSize;
+        /// <summary>Offset 0x28, offset to creator specific chunk</summary>
+        public readonly uint CreatorSpecificOffset;
+        /// <summary>Offset 0x2C, creator specific chunk size</summary>
+        public readonly uint CreatorSpecificSize;
+        /// <summary>Offset 0x30, reserved, should be zero</summary>
+        public readonly uint Reserved1;
+        /// <summary>Offset 0x34, reserved, should be zero</summary>
+        public readonly uint Reserved2;
+        /// <summary>Offset 0x38, reserved, should be zero</summary>
+        public readonly uint Reserved3;
+        /// <summary>Offset 0x3C, reserved, should be zero</summary>
+        public readonly uint Reserved4;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Unsupported.cs b/Aaru.Images/Apple2MG/Unsupported.cs
index b845b09f5..1d060a6e7 100644
--- a/Aaru.Images/Apple2MG/Unsupported.cs
+++ b/Aaru.Images/Apple2MG/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apple2Mg
 {
-    public sealed partial class Apple2Mg
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apple2MG/Write.cs b/Aaru.Images/Apple2MG/Write.cs
index a64ad525c..ab577b3c7 100644
--- a/Aaru.Images/Apple2MG/Write.cs
+++ b/Aaru.Images/Apple2MG/Write.cs
@@ -41,241 +41,240 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apple2Mg
 {
-    public sealed partial class Apple2Mg
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
+            if(sectorSize != 256 ||
+               (mediaType != MediaType.Apple32SS && mediaType != MediaType.Apple33SS))
+            {
+                ErrorMessage = "Unsupported sector size";
+
+                return false;
+            }
+
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(sectorSize != 512)
-                if(sectorSize != 256 ||
-                   (mediaType != MediaType.Apple32SS && mediaType != MediaType.Apple33SS))
-                {
-                    ErrorMessage = "Unsupported sector size";
-
-                    return false;
-                }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            if(sectors > uint.MaxValue)
-            {
-                ErrorMessage = "Too many sectors";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(sectors > uint.MaxValue)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(0x40 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(0x40 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        _imageInfo = new ImageInfo
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+        IsWriting    = true;
+        ErrorMessage = null;
 
-                return false;
-            }
-
-            _writingStream.Seek(0x40 + (17 * 16 * 256), SeekOrigin.Begin);
-            byte[] tmp = new byte[256];
-            _writingStream.Read(tmp, 0, tmp.Length);
-
-            bool isDos = tmp[0x01] == 17 && tmp[0x02] < 16 && tmp[0x27] <= 122 && tmp[0x34] == 35 && tmp[0x35] == 16 &&
-                         tmp[0x36] == 0  && tmp[0x37] == 1;
-
-            _imageHeader = new Header
-            {
-                Blocks     = (uint)(_imageInfo.Sectors * _imageInfo.SectorSize) / 512,
-                Creator    = CREATOR_AARU,
-                DataOffset = 0x40,
-                DataSize   = (uint)(_imageInfo.Sectors * _imageInfo.SectorSize),
-                Flags = (uint)(_imageInfo.LastMediaSequence != 0
-                                   ? VALID_VOLUME_NUMBER + (_imageInfo.MediaSequence & 0xFF) : 0),
-                HeaderSize  = 0x40,
-                ImageFormat = isDos ? SectorOrder.Dos : SectorOrder.ProDos,
-                Magic       = MAGIC,
-                Version     = 1
-            };
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-            {
-                _writingStream.Seek(0, SeekOrigin.End);
-                tmp                        = Encoding.UTF8.GetBytes(_imageInfo.Comments);
-                _imageHeader.CommentOffset = (uint)_writingStream.Position;
-                _imageHeader.CommentSize   = (uint)(tmp.Length + 1);
-                _writingStream.Write(tmp, 0, tmp.Length);
-                _writingStream.WriteByte(0);
-            }
-
-            byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
-            IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(_imageHeader, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata)
-        {
-            _imageInfo.Comments          = metadata.Comments;
-            _imageInfo.LastMediaSequence = metadata.LastMediaSequence;
-            _imageInfo.MediaSequence     = metadata.MediaSequence;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(0x40 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(0x40 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        _writingStream.Seek(0x40 + (17 * 16 * 256), SeekOrigin.Begin);
+        byte[] tmp = new byte[256];
+        _writingStream.Read(tmp, 0, tmp.Length);
+
+        bool isDos = tmp[0x01] == 17 && tmp[0x02] < 16 && tmp[0x27] <= 122 && tmp[0x34] == 35 && tmp[0x35] == 16 &&
+                     tmp[0x36] == 0  && tmp[0x37] == 1;
+
+        _imageHeader = new Header
+        {
+            Blocks     = (uint)(_imageInfo.Sectors * _imageInfo.SectorSize) / 512,
+            Creator    = CREATOR_AARU,
+            DataOffset = 0x40,
+            DataSize   = (uint)(_imageInfo.Sectors * _imageInfo.SectorSize),
+            Flags = (uint)(_imageInfo.LastMediaSequence != 0
+                               ? VALID_VOLUME_NUMBER + (_imageInfo.MediaSequence & 0xFF) : 0),
+            HeaderSize  = 0x40,
+            ImageFormat = isDos ? SectorOrder.Dos : SectorOrder.ProDos,
+            Magic       = MAGIC,
+            Version     = 1
+        };
+
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+        {
+            _writingStream.Seek(0, SeekOrigin.End);
+            tmp                        = Encoding.UTF8.GetBytes(_imageInfo.Comments);
+            _imageHeader.CommentOffset = (uint)_writingStream.Position;
+            _imageHeader.CommentSize   = (uint)(tmp.Length + 1);
+            _writingStream.Write(tmp, 0, tmp.Length);
+            _writingStream.WriteByte(0);
+        }
+
+        byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
+        IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(_imageHeader, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata)
+    {
+        _imageInfo.Comments          = metadata.Comments;
+        _imageInfo.LastMediaSequence = metadata.LastMediaSequence;
+        _imageInfo.MediaSequence     = metadata.MediaSequence;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleDOS/AppleDOS.cs b/Aaru.Images/AppleDOS/AppleDOS.cs
index d29492a69..876c69c92 100644
--- a/Aaru.Images/AppleDOS/AppleDOS.cs
+++ b/Aaru.Images/AppleDOS/AppleDOS.cs
@@ -36,40 +36,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing interleaved Apple DOS disk images</summary>
-    public sealed partial class AppleDos : IWritableImage
-    {
-        byte[]     _deinterleaved;
-        bool       _dos32;
-        string     _extension;
-        ImageInfo  _imageInfo;
-        FileStream _writingStream;
+namespace Aaru.DiscImages;
 
-        public AppleDos() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing interleaved Apple DOS disk images</summary>
+public sealed partial class AppleDos : IWritableImage
+{
+    byte[]     _deinterleaved;
+    bool       _dos32;
+    string     _extension;
+    ImageInfo  _imageInfo;
+    FileStream _writingStream;
+
+    public AppleDos() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleDOS/Constants.cs b/Aaru.Images/AppleDOS/Constants.cs
index 18a938b85..fc84a55b2 100644
--- a/Aaru.Images/AppleDOS/Constants.cs
+++ b/Aaru.Images/AppleDOS/Constants.cs
@@ -30,17 +30,16 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AppleDos
 {
-    public sealed partial class AppleDos
+    readonly int[] _deinterleave =
     {
-        readonly int[] _deinterleave =
-        {
-            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
-        };
-        readonly int[] _interleave =
-        {
-            0, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 15
-        };
-    }
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
+    };
+    readonly int[] _interleave =
+    {
+        0, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 15
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleDOS/Identify.cs b/Aaru.Images/AppleDOS/Identify.cs
index 2c34c5d52..8dfdeb097 100644
--- a/Aaru.Images/AppleDOS/Identify.cs
+++ b/Aaru.Images/AppleDOS/Identify.cs
@@ -33,16 +33,15 @@
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class AppleDos
-    {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            _extension = Path.GetExtension(imageFilter.Filename)?.ToLower();
+namespace Aaru.DiscImages;
 
-            return imageFilter.DataForkLength == 143360 && (_extension == ".po" || _extension == ".do");
-        }
+public sealed partial class AppleDos
+{
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
+    {
+        _extension = Path.GetExtension(imageFilter.Filename)?.ToLower();
+
+        return imageFilter.DataForkLength == 143360 && (_extension == ".po" || _extension == ".do");
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleDOS/Properties.cs b/Aaru.Images/AppleDOS/Properties.cs
index 21b751309..e2585ddb6 100644
--- a/Aaru.Images/AppleDOS/Properties.cs
+++ b/Aaru.Images/AppleDOS/Properties.cs
@@ -37,50 +37,49 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AppleDos
 {
-    public sealed partial class AppleDos
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "Apple ][ Interleaved Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("A5828AC0-62C9-4304-81D4-EFD4AAE47360");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => _extension == ".po" ? "Apple ][ Interleaved Disk Image (ProDOS order)"
+                                : "Apple ][ Interleaved Disk Image (DOS order)";
+
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-
-        /// <inheritdoc />
-        public string Name => "Apple ][ Interleaved Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("A5828AC0-62C9-4304-81D4-EFD4AAE47360");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => _extension == ".po" ? "Apple ][ Interleaved Disk Image (ProDOS order)"
-                                    : "Apple ][ Interleaved Disk Image (DOS order)";
-
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        MediaType.Apple33SS
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.Apple33SS
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".do", ".po"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".do", ".po"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleDOS/Read.cs b/Aaru.Images/AppleDOS/Read.cs
index 258b62d98..3721b7fc9 100644
--- a/Aaru.Images/AppleDOS/Read.cs
+++ b/Aaru.Images/AppleDOS/Read.cs
@@ -36,85 +36,84 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AppleDos
 {
-    public sealed partial class AppleDos
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        byte[] tmp = new byte[imageFilter.DataForkLength];
+        stream.Read(tmp, 0, tmp.Length);
+
+        _extension = Path.GetExtension(imageFilter.Filename)?.ToLower();
+
+        if((_extension == ".d13" || _extension == ".do") &&
+           tmp.Length == 116480)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            _dos32         = true;
+            _deinterleaved = tmp;
+        }
+        else
+        {
+            bool isDos = tmp[0x11001] == 17 && tmp[0x11002] < 16 && tmp[0x11027] <= 122 && tmp[0x11034] == 35 &&
+                         tmp[0x11035] == 16 && tmp[0x11036] == 0 && tmp[0x11037] == 1;
 
-            byte[] tmp = new byte[imageFilter.DataForkLength];
-            stream.Read(tmp, 0, tmp.Length);
+            _deinterleaved = new byte[tmp.Length];
 
-            _extension = Path.GetExtension(imageFilter.Filename)?.ToLower();
+            int[] offsets = _extension == ".do"
+                                ? isDos
+                                      ? _deinterleave
+                                      : _interleave
+                                : isDos
+                                    ? _interleave
+                                    : _deinterleave;
 
-            if((_extension == ".d13" || _extension == ".do") &&
-               tmp.Length == 116480)
+            for(int t = 0; t < 35; t++)
             {
-                _dos32         = true;
-                _deinterleaved = tmp;
+                for(int s = 0; s < 16; s++)
+                    Array.Copy(tmp, (t * 16 * 256) + (s * 256), _deinterleaved, (t * 16 * 256) + (offsets[s] * 256),
+                               256);
             }
-            else
-            {
-                bool isDos = tmp[0x11001] == 17 && tmp[0x11002] < 16 && tmp[0x11027] <= 122 && tmp[0x11034] == 35 &&
-                             tmp[0x11035] == 16 && tmp[0x11036] == 0 && tmp[0x11037] == 1;
-
-                _deinterleaved = new byte[tmp.Length];
-
-                int[] offsets = _extension == ".do"
-                                    ? isDos
-                                          ? _deinterleave
-                                          : _interleave
-                                    : isDos
-                                        ? _interleave
-                                        : _deinterleave;
-
-                for(int t = 0; t < 35; t++)
-                {
-                    for(int s = 0; s < 16; s++)
-                        Array.Copy(tmp, (t * 16 * 256) + (s * 256), _deinterleaved, (t * 16 * 256) + (offsets[s] * 256),
-                                   256);
-                }
-            }
-
-            _imageInfo.SectorSize           = 256;
-            _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = _dos32 ? 455u : 560u;
-            _imageInfo.MediaType            = _dos32 ? MediaType.Apple32SS : MediaType.Apple33SS;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.Cylinders            = 35;
-            _imageInfo.Heads                = 1;
-            _imageInfo.SectorsPerTrack      = _dos32 ? 13u : 16u;
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        _imageInfo.SectorSize           = 256;
+        _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = _dos32 ? 455u : 560u;
+        _imageInfo.MediaType            = _dos32 ? MediaType.Apple32SS : MediaType.Apple33SS;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.Cylinders            = 35;
+        _imageInfo.Heads                = 1;
+        _imageInfo.SectorsPerTrack      = _dos32 ? 13u : 16u;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+        return ErrorNumber.NoError;
+    }
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            buffer = new byte[length * _imageInfo.SectorSize];
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
 
-            Array.Copy(_deinterleaved, (int)(sectorAddress * _imageInfo.SectorSize), buffer, 0, buffer.Length);
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
 
-            return ErrorNumber.NoError;
-        }
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        Array.Copy(_deinterleaved, (int)(sectorAddress * _imageInfo.SectorSize), buffer, 0, buffer.Length);
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleDOS/Unsupported.cs b/Aaru.Images/AppleDOS/Unsupported.cs
index 36d4f0d2e..88a7550b0 100644
--- a/Aaru.Images/AppleDOS/Unsupported.cs
+++ b/Aaru.Images/AppleDOS/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AppleDos
 {
-    public sealed partial class AppleDos
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleDOS/Write.cs b/Aaru.Images/AppleDOS/Write.cs
index e425898e0..ce8b0f1ba 100644
--- a/Aaru.Images/AppleDOS/Write.cs
+++ b/Aaru.Images/AppleDOS/Write.cs
@@ -38,204 +38,203 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AppleDos
 {
-    public sealed partial class AppleDos
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 256)
         {
-            if(sectorSize != 256)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(mediaType != MediaType.Apple32SS &&
-               mediaType != MediaType.Apple33SS)
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            if((mediaType == MediaType.Apple32SS && sectors != 455) ||
-               (mediaType == MediaType.Apple33SS && sectors != 560))
-            {
-                ErrorMessage = "Incorrect number of sectors for media";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            _extension = Path.GetExtension(path);
-
-            if(mediaType == MediaType.Apple32SS)
-            {
-                _dos32     = true;
-                _extension = ".d13";
-            }
-
-            _deinterleaved = new byte[35 * (_dos32 ? 13 : 16) * 256];
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress) => WriteSectors(data, sectorAddress, 1);
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+        if(mediaType != MediaType.Apple32SS &&
+           mediaType != MediaType.Apple33SS)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            Array.Copy(data, 0, _deinterleaved, (int)(sectorAddress * _imageInfo.SectorSize), data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        if((mediaType == MediaType.Apple32SS && sectors != 455) ||
+           (mediaType == MediaType.Apple33SS && sectors != 560))
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Incorrect number of sectors for media";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
-
-            byte[] tmp;
-
-            if(_dos32)
-                tmp = _deinterleaved;
-            else
-            {
-                bool isDos = _deinterleaved[0x11001] == 17  && _deinterleaved[0x11002] < 16  &&
-                             _deinterleaved[0x11027] <= 122 && _deinterleaved[0x11034] == 35 &&
-                             _deinterleaved[0x11035] == 16  && _deinterleaved[0x11036] == 0  &&
-                             _deinterleaved[0x11037] == 1;
-
-                tmp = new byte[_deinterleaved.Length];
-
-                int[] offsets = _extension == ".do"
-                                    ? isDos
-                                          ? _deinterleave
-                                          : _interleave
-                                    : isDos
-                                        ? _interleave
-                                        : _deinterleave;
-
-                for(int t = 0; t < 35; t++)
-                    for(int s = 0; s < 16; s++)
-                        Array.Copy(_deinterleaved, (t * 16 * 256) + (offsets[s] * 256), tmp, (t * 16 * 256) + (s * 256),
-                                   256);
-            }
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(tmp, 0, tmp.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
         }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+        catch(IOException e)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+        _extension = Path.GetExtension(path);
 
-            return false;
+        if(mediaType == MediaType.Apple32SS)
+        {
+            _dos32     = true;
+            _extension = ".d13";
         }
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+        _deinterleaved = new byte[35 * (_dos32 ? 13 : 16) * 256];
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress) => WriteSectors(data, sectorAddress, 1);
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        Array.Copy(data, 0, _deinterleaved, (int)(sectorAddress * _imageInfo.SectorSize), data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        byte[] tmp;
+
+        if(_dos32)
+            tmp = _deinterleaved;
+        else
+        {
+            bool isDos = _deinterleaved[0x11001] == 17  && _deinterleaved[0x11002] < 16  &&
+                         _deinterleaved[0x11027] <= 122 && _deinterleaved[0x11034] == 35 &&
+                         _deinterleaved[0x11035] == 16  && _deinterleaved[0x11036] == 0  &&
+                         _deinterleaved[0x11037] == 1;
+
+            tmp = new byte[_deinterleaved.Length];
+
+            int[] offsets = _extension == ".do"
+                                ? isDos
+                                      ? _deinterleave
+                                      : _interleave
+                                : isDos
+                                    ? _interleave
+                                    : _deinterleave;
+
+            for(int t = 0; t < 35; t++)
+                for(int s = 0; s < 16; s++)
+                    Array.Copy(_deinterleaved, (t * 16 * 256) + (offsets[s] * 256), tmp, (t * 16 * 256) + (s * 256),
+                               256);
+        }
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(tmp, 0, tmp.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleNIB/AppleNIB.cs b/Aaru.Images/AppleNIB/AppleNIB.cs
index de89b82d4..17f2ed20e 100644
--- a/Aaru.Images/AppleNIB/AppleNIB.cs
+++ b/Aaru.Images/AppleNIB/AppleNIB.cs
@@ -35,40 +35,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    // TODO: Checksum sectors
-    /// <inheritdoc />
-    /// <summary>Implements reading nibbelized Apple II disk images</summary>
-    public sealed partial class AppleNib : IMediaImage
-    {
-        Dictionary<ulong, byte[]> _addressFields;
-        Dictionary<ulong, byte[]> _cookedSectors;
-        ImageInfo                 _imageInfo;
-        Dictionary<ulong, byte[]> _longSectors;
+namespace Aaru.DiscImages;
 
-        public AppleNib() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: Checksum sectors
+/// <inheritdoc />
+/// <summary>Implements reading nibbelized Apple II disk images</summary>
+public sealed partial class AppleNib : IMediaImage
+{
+    Dictionary<ulong, byte[]> _addressFields;
+    Dictionary<ulong, byte[]> _cookedSectors;
+    ImageInfo                 _imageInfo;
+    Dictionary<ulong, byte[]> _longSectors;
+
+    public AppleNib() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleNIB/Constants.cs b/Aaru.Images/AppleNIB/Constants.cs
index 725fce715..69b0a9c9b 100644
--- a/Aaru.Images/AppleNIB/Constants.cs
+++ b/Aaru.Images/AppleNIB/Constants.cs
@@ -32,55 +32,54 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class AppleNib
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class AppleNib
+    readonly byte[] _apple3Sign =
     {
-        readonly byte[] _apple3Sign =
-        {
-            0x8D, 0xD0, 0x03, 0x4C, 0xC7, 0xA4
-        };
-        readonly byte[] _cpmSign =
-        {
-            0xA2, 0x55, 0xA9, 0x00, 0x9D, 0x00, 0x0D, 0xCA
-        };
-        readonly byte[] _dosSign =
-        {
-            0xA2, 0x02, 0x8E, 0x52
-        };
-        readonly ulong[] _dosSkewing =
-        {
-            0, 7, 14, 6, 13, 5, 12, 4, 11, 3, 10, 2, 9, 1, 8, 15
-        };
-        readonly byte[] _driString =
-        {
-            0x43, 0x4F, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x28, 0x43, 0x29, 0x20, 0x31, 0x39, 0x37, 0x39,
-            0x2C, 0x20, 0x44, 0x49, 0x47, 0x49, 0x54, 0x41, 0x4C, 0x20, 0x52, 0x45, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48
-        };
-        readonly byte[] _pascalSign =
-        {
-            0x08, 0xA5, 0x0F, 0x29
-        };
-        readonly byte[] _pascalString =
-        {
-            0x53, 0x59, 0x53, 0x54, 0x45, 0x2E, 0x41, 0x50, 0x50, 0x4C, 0x45
-        };
-        readonly byte[] _pascal2Sign =
-        {
-            0xFF, 0xA2, 0x00, 0x8E
-        };
-        readonly byte[] _prodosString =
-        {
-            0x50, 0x52, 0x4F, 0x44, 0x4F, 0x53
-        };
-        readonly ulong[] _proDosSkewing =
-        {
-            0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15
-        };
-        readonly byte[] _sosSign =
-        {
-            0xC9, 0x20, 0xF0, 0x3E
-        };
-    }
+        0x8D, 0xD0, 0x03, 0x4C, 0xC7, 0xA4
+    };
+    readonly byte[] _cpmSign =
+    {
+        0xA2, 0x55, 0xA9, 0x00, 0x9D, 0x00, 0x0D, 0xCA
+    };
+    readonly byte[] _dosSign =
+    {
+        0xA2, 0x02, 0x8E, 0x52
+    };
+    readonly ulong[] _dosSkewing =
+    {
+        0, 7, 14, 6, 13, 5, 12, 4, 11, 3, 10, 2, 9, 1, 8, 15
+    };
+    readonly byte[] _driString =
+    {
+        0x43, 0x4F, 0x50, 0x59, 0x52, 0x49, 0x47, 0x48, 0x54, 0x20, 0x28, 0x43, 0x29, 0x20, 0x31, 0x39, 0x37, 0x39,
+        0x2C, 0x20, 0x44, 0x49, 0x47, 0x49, 0x54, 0x41, 0x4C, 0x20, 0x52, 0x45, 0x53, 0x45, 0x41, 0x52, 0x43, 0x48
+    };
+    readonly byte[] _pascalSign =
+    {
+        0x08, 0xA5, 0x0F, 0x29
+    };
+    readonly byte[] _pascalString =
+    {
+        0x53, 0x59, 0x53, 0x54, 0x45, 0x2E, 0x41, 0x50, 0x50, 0x4C, 0x45
+    };
+    readonly byte[] _pascal2Sign =
+    {
+        0xFF, 0xA2, 0x00, 0x8E
+    };
+    readonly byte[] _prodosString =
+    {
+        0x50, 0x52, 0x4F, 0x44, 0x4F, 0x53
+    };
+    readonly ulong[] _proDosSkewing =
+    {
+        0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15
+    };
+    readonly byte[] _sosSign =
+    {
+        0xC9, 0x20, 0xF0, 0x3E
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleNIB/Identify.cs b/Aaru.Images/AppleNIB/Identify.cs
index b5792cc2f..cf7ee3ac7 100644
--- a/Aaru.Images/AppleNIB/Identify.cs
+++ b/Aaru.Images/AppleNIB/Identify.cs
@@ -34,23 +34,22 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Decoders.Floppy;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AppleNib
 {
-    public sealed partial class AppleNib
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512)
-                return false;
+        if(stream.Length < 512)
+            return false;
 
-            byte[] test = new byte[512];
-            stream.Read(test, 0, 512);
+        byte[] test = new byte[512];
+        stream.Read(test, 0, 512);
 
-            return Apple2.IsApple2GCR(test);
-        }
+        return Apple2.IsApple2GCR(test);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleNIB/Properties.cs b/Aaru.Images/AppleNIB/Properties.cs
index 94e552103..9a3314ba0 100644
--- a/Aaru.Images/AppleNIB/Properties.cs
+++ b/Aaru.Images/AppleNIB/Properties.cs
@@ -35,24 +35,23 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class AppleNib
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public string Name => "Apple NIB";
-        /// <inheritdoc />
-        public Guid Id => new Guid("AE171AE8-6747-49CC-B861-9D450B7CD42E");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Apple nibbles";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+public sealed partial class AppleNib
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "Apple NIB";
+    /// <inheritdoc />
+    public Guid Id => new Guid("AE171AE8-6747-49CC-B861-9D450B7CD42E");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Apple nibbles";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleNIB/Read.cs b/Aaru.Images/AppleNIB/Read.cs
index acc68e49d..1f520410b 100644
--- a/Aaru.Images/AppleNIB/Read.cs
+++ b/Aaru.Images/AppleNIB/Read.cs
@@ -39,254 +39,253 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Decoders.Floppy;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class AppleNib
 {
-    public sealed partial class AppleNib
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512)
-                return ErrorNumber.InvalidArgument;
+        if(stream.Length < 512)
+            return ErrorNumber.InvalidArgument;
 
-            byte[] buffer = new byte[stream.Length];
-            stream.Read(buffer, 0, buffer.Length);
+        byte[] buffer = new byte[stream.Length];
+        stream.Read(buffer, 0, buffer.Length);
 
-            AaruConsole.DebugWriteLine("Apple NIB Plugin", "Decoding whole image");
-            List<Apple2.RawTrack> tracks = Apple2.MarshalDisk(buffer);
-            AaruConsole.DebugWriteLine("Apple NIB Plugin", "Got {0} tracks", tracks.Count);
+        AaruConsole.DebugWriteLine("Apple NIB Plugin", "Decoding whole image");
+        List<Apple2.RawTrack> tracks = Apple2.MarshalDisk(buffer);
+        AaruConsole.DebugWriteLine("Apple NIB Plugin", "Got {0} tracks", tracks.Count);
 
-            Dictionary<ulong, Apple2.RawSector> rawSectors = new();
+        Dictionary<ulong, Apple2.RawSector> rawSectors = new();
 
-            int  spt            = 0;
-            bool allTracksEqual = true;
+        int  spt            = 0;
+        bool allTracksEqual = true;
 
-            for(int i = 1; i < tracks.Count; i++)
-                allTracksEqual &= tracks[i - 1].sectors.Length == tracks[i].sectors.Length;
+        for(int i = 1; i < tracks.Count; i++)
+            allTracksEqual &= tracks[i - 1].sectors.Length == tracks[i].sectors.Length;
 
-            if(allTracksEqual)
-                spt = tracks[0].sectors.Length;
+        if(allTracksEqual)
+            spt = tracks[0].sectors.Length;
 
-            bool    skewed  = spt == 16;
-            ulong[] skewing = _proDosSkewing;
+        bool    skewed  = spt == 16;
+        ulong[] skewing = _proDosSkewing;
 
-            // Detect ProDOS skewed disks
-            if(skewed)
-                foreach(bool isDos in from sector in tracks[17].sectors
-                                      where sector.addressField.sector.SequenceEqual(new byte[]
-                                      {
-                                          170, 170
-                                      }) select Apple2.DecodeSector(sector) into sector0 where sector0 != null
-                                      select sector0[0x01] == 17 && sector0[0x02] < 16  && sector0[0x27] <= 122 &&
-                                             sector0[0x34] == 35 && sector0[0x35] == 16 && sector0[0x36] == 0   &&
-                                             sector0[0x37] == 1)
+        // Detect ProDOS skewed disks
+        if(skewed)
+            foreach(bool isDos in from sector in tracks[17].sectors
+                                  where sector.addressField.sector.SequenceEqual(new byte[]
+                                  {
+                                      170, 170
+                                  }) select Apple2.DecodeSector(sector) into sector0 where sector0 != null
+                                  select sector0[0x01] == 17 && sector0[0x02] < 16  && sector0[0x27] <= 122 &&
+                                         sector0[0x34] == 35 && sector0[0x35] == 16 && sector0[0x36] == 0   &&
+                                         sector0[0x37] == 1)
+            {
+                if(isDos)
+                    skewing = _dosSkewing;
+
+                AaruConsole.DebugWriteLine("Apple NIB Plugin", "Using {0}DOS skewing",
+                                           skewing.SequenceEqual(_dosSkewing) ? "" : "Pro");
+            }
+
+        for(int i = 0; i < tracks.Count; i++)
+            foreach(Apple2.RawSector sector in tracks[i].sectors)
+                if(skewed && spt != 0)
                 {
-                    if(isDos)
-                        skewing = _dosSkewing;
+                    ulong sectorNo = (ulong)((((sector.addressField.sector[0] & 0x55) << 1) |
+                                              (sector.addressField.sector[1] & 0x55)) & 0xFF);
 
-                    AaruConsole.DebugWriteLine("Apple NIB Plugin", "Using {0}DOS skewing",
-                                               skewing.SequenceEqual(_dosSkewing) ? "" : "Pro");
+                    AaruConsole.DebugWriteLine("Apple NIB Plugin",
+                                               "Hardware sector {0} of track {1} goes to logical sector {2}",
+                                               sectorNo, i, skewing[sectorNo] + (ulong)(i * spt));
+
+                    rawSectors.Add(skewing[sectorNo] + (ulong)(i * spt), sector);
+                    _imageInfo.Sectors++;
+                }
+                else
+                {
+                    rawSectors.Add(_imageInfo.Sectors, sector);
+                    _imageInfo.Sectors++;
                 }
 
-            for(int i = 0; i < tracks.Count; i++)
-                foreach(Apple2.RawSector sector in tracks[i].sectors)
-                    if(skewed && spt != 0)
-                    {
-                        ulong sectorNo = (ulong)((((sector.addressField.sector[0] & 0x55) << 1) |
-                                                  (sector.addressField.sector[1] & 0x55)) & 0xFF);
+        AaruConsole.DebugWriteLine("Apple NIB Plugin", "Got {0} sectors", _imageInfo.Sectors);
 
-                        AaruConsole.DebugWriteLine("Apple NIB Plugin",
-                                                   "Hardware sector {0} of track {1} goes to logical sector {2}",
-                                                   sectorNo, i, skewing[sectorNo] + (ulong)(i * spt));
+        AaruConsole.DebugWriteLine("Apple NIB Plugin", "Cooking sectors");
 
-                        rawSectors.Add(skewing[sectorNo] + (ulong)(i * spt), sector);
-                        _imageInfo.Sectors++;
-                    }
-                    else
-                    {
-                        rawSectors.Add(_imageInfo.Sectors, sector);
-                        _imageInfo.Sectors++;
-                    }
+        _longSectors   = new Dictionary<ulong, byte[]>();
+        _cookedSectors = new Dictionary<ulong, byte[]>();
+        _addressFields = new Dictionary<ulong, byte[]>();
 
-            AaruConsole.DebugWriteLine("Apple NIB Plugin", "Got {0} sectors", _imageInfo.Sectors);
-
-            AaruConsole.DebugWriteLine("Apple NIB Plugin", "Cooking sectors");
-
-            _longSectors   = new Dictionary<ulong, byte[]>();
-            _cookedSectors = new Dictionary<ulong, byte[]>();
-            _addressFields = new Dictionary<ulong, byte[]>();
-
-            foreach(KeyValuePair<ulong, Apple2.RawSector> kvp in rawSectors)
-            {
-                byte[] cooked = Apple2.DecodeSector(kvp.Value);
-                byte[] raw    = Apple2.MarshalSector(kvp.Value);
-                byte[] addr   = Apple2.MarshalAddressField(kvp.Value.addressField);
-                _longSectors.Add(kvp.Key, raw);
-                _cookedSectors.Add(kvp.Key, cooked);
-                _addressFields.Add(kvp.Key, addr);
-            }
-
-            _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-
-            if(_imageInfo.Sectors == 455)
-                _imageInfo.MediaType = MediaType.Apple32SS;
-            else if(_imageInfo.Sectors == 560)
-                _imageInfo.MediaType = MediaType.Apple33SS;
-            else
-                _imageInfo.MediaType = MediaType.Unknown;
-
-            _imageInfo.SectorSize   = 256;
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-            _imageInfo.ReadableSectorTags.Add(SectorTagType.FloppyAddressMark);
-
-            switch(_imageInfo.MediaType)
-            {
-                case MediaType.Apple32SS:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 13;
-
-                    break;
-                case MediaType.Apple33SS:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-            }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        foreach(KeyValuePair<ulong, Apple2.RawSector> kvp in rawSectors)
         {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            return _cookedSectors.TryGetValue(sectorAddress, out buffer) ? ErrorNumber.NoError
-                       : ErrorNumber.SectorNotFound;
+            byte[] cooked = Apple2.DecodeSector(kvp.Value);
+            byte[] raw    = Apple2.MarshalSector(kvp.Value);
+            byte[] addr   = Apple2.MarshalAddressField(kvp.Value.addressField);
+            _longSectors.Add(kvp.Key, raw);
+            _cookedSectors.Add(kvp.Key, cooked);
+            _addressFields.Add(kvp.Key, addr);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+
+        if(_imageInfo.Sectors == 455)
+            _imageInfo.MediaType = MediaType.Apple32SS;
+        else if(_imageInfo.Sectors == 560)
+            _imageInfo.MediaType = MediaType.Apple33SS;
+        else
+            _imageInfo.MediaType = MediaType.Unknown;
+
+        _imageInfo.SectorSize   = 256;
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+        _imageInfo.ReadableSectorTags.Add(SectorTagType.FloppyAddressMark);
+
+        switch(_imageInfo.MediaType)
         {
-            buffer = null;
+            case MediaType.Apple32SS:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 13;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.Apple33SS:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 16;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+                break;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        return _cookedSectors.TryGetValue(sectorAddress, out buffer) ? ErrorNumber.NoError
+                   : ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(tag != SectorTagType.FloppyAddressMark)
-                return ErrorNumber.NotSupported;
-
-            return _addressFields.TryGetValue(sectorAddress, out buffer) ? ErrorNumber.NoError : ErrorNumber.NoData;
+            ms.Write(sector, 0, sector.Length);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(tag != SectorTagType.FloppyAddressMark)
+            return ErrorNumber.NotSupported;
+
+        return _addressFields.TryGetValue(sectorAddress, out buffer) ? ErrorNumber.NoError : ErrorNumber.NoData;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        if(tag != SectorTagType.FloppyAddressMark)
+            return ErrorNumber.NotSupported;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSectorTag(sectorAddress + i, tag, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            if(tag != SectorTagType.FloppyAddressMark)
-                return ErrorNumber.NotSupported;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSectorTag(sectorAddress + i, tag, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            ms.Write(sector, 0, sector.Length);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        return _longSectors.TryGetValue(sectorAddress, out buffer) ? ErrorNumber.NoError
+                   : ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSectorLong(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            return _longSectors.TryGetValue(sectorAddress, out buffer) ? ErrorNumber.NoError
-                       : ErrorNumber.SectorNotFound;
+            ms.Write(sector, 0, sector.Length);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = ms.ToArray();
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSectorLong(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/AppleNIB/Unsupported.cs b/Aaru.Images/AppleNIB/Unsupported.cs
index c86f73b5f..2c9bf1f1b 100644
--- a/Aaru.Images/AppleNIB/Unsupported.cs
+++ b/Aaru.Images/AppleNIB/Unsupported.cs
@@ -32,16 +32,15 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class AppleNib
-    {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+namespace Aaru.DiscImages;
 
-            return ErrorNumber.NotSupported;
-        }
+public sealed partial class AppleNib
+{
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Apridisk.cs b/Aaru.Images/Apridisk/Apridisk.cs
index 4d33f6b51..7581759b8 100644
--- a/Aaru.Images/Apridisk/Apridisk.cs
+++ b/Aaru.Images/Apridisk/Apridisk.cs
@@ -36,41 +36,40 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+// TODO: Check writing
+/// <inheritdoc />
+/// <summary>Implements reading and writing Apridisk disk images</summary>
+public sealed partial class Apridisk : IWritableImage
 {
-    // TODO: Check writing
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing Apridisk disk images</summary>
-    public sealed partial class Apridisk : IWritableImage
+    ImageInfo _imageInfo;
+
+    // Cylinder by head, sector data matrix
+    byte[][][][] _sectorsData;
+    FileStream   _writingStream;
+
+    public Apridisk() => _imageInfo = new ImageInfo
     {
-        ImageInfo _imageInfo;
-
-        // Cylinder by head, sector data matrix
-        byte[][][][] _sectorsData;
-        FileStream   _writingStream;
-
-        public Apridisk() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Compression.cs b/Aaru.Images/Apridisk/Compression.cs
index a60cf5d3c..cedf254a0 100644
--- a/Aaru.Images/Apridisk/Compression.cs
+++ b/Aaru.Images/Apridisk/Compression.cs
@@ -33,34 +33,33 @@
 using System;
 using System.IO;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apridisk
 {
-    public sealed partial class Apridisk
+    static uint Decompress(byte[] compressed, out byte[] decompressed)
     {
-        static uint Decompress(byte[] compressed, out byte[] decompressed)
+        int readp  = 0;
+        int cLen   = compressed.Length;
+        var buffer = new MemoryStream();
+
+        uint uLen = 0;
+
+        while(cLen >= 3)
         {
-            int readp  = 0;
-            int cLen   = compressed.Length;
-            var buffer = new MemoryStream();
+            ushort blklen = BitConverter.ToUInt16(compressed, readp);
+            readp += 2;
 
-            uint uLen = 0;
+            for(int i = 0; i < blklen; i++)
+                buffer.WriteByte(compressed[readp]);
 
-            while(cLen >= 3)
-            {
-                ushort blklen = BitConverter.ToUInt16(compressed, readp);
-                readp += 2;
-
-                for(int i = 0; i < blklen; i++)
-                    buffer.WriteByte(compressed[readp]);
-
-                uLen += blklen;
-                readp++;
-                cLen -= 3;
-            }
-
-            decompressed = buffer.ToArray();
-
-            return uLen;
+            uLen += blklen;
+            readp++;
+            cLen -= 3;
         }
+
+        decompressed = buffer.ToArray();
+
+        return uLen;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Constants.cs b/Aaru.Images/Apridisk/Constants.cs
index 61be68535..e2d0f742a 100644
--- a/Aaru.Images/Apridisk/Constants.cs
+++ b/Aaru.Images/Apridisk/Constants.cs
@@ -30,20 +30,19 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apridisk
 {
-    public sealed partial class Apridisk
+    readonly byte[] _signature =
     {
-        readonly byte[] _signature =
-        {
-            0x41, 0x43, 0x54, 0x20, 0x41, 0x70, 0x72, 0x69, 0x63, 0x6F, 0x74, 0x20, 0x64, 0x69, 0x73, 0x6B, 0x20, 0x69,
-            0x6D, 0x61, 0x67, 0x65, 0x1A, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00
-        };
-    }
+        0x41, 0x43, 0x54, 0x20, 0x41, 0x70, 0x72, 0x69, 0x63, 0x6F, 0x74, 0x20, 0x64, 0x69, 0x73, 0x6B, 0x20, 0x69,
+        0x6D, 0x61, 0x67, 0x65, 0x1A, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Enums.cs b/Aaru.Images/Apridisk/Enums.cs
index ea19ed0ac..8a7cf8844 100644
--- a/Aaru.Images/Apridisk/Enums.cs
+++ b/Aaru.Images/Apridisk/Enums.cs
@@ -30,19 +30,18 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Apridisk
-    {
-        enum RecordType : uint
-        {
-            Deleted = 0xE31D0000, Sector = 0xE31D0001, Comment = 0xE31D0002,
-            Creator = 0xE31D0003
-        }
+namespace Aaru.DiscImages;
 
-        enum CompressType : ushort
-        {
-            Uncompresed = 0x9E90, Compressed = 0x3E5A
-        }
+public sealed partial class Apridisk
+{
+    enum RecordType : uint
+    {
+        Deleted = 0xE31D0000, Sector = 0xE31D0001, Comment = 0xE31D0002,
+        Creator = 0xE31D0003
+    }
+
+    enum CompressType : ushort
+    {
+        Uncompresed = 0x9E90, Compressed = 0x3E5A
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Helpers.cs b/Aaru.Images/Apridisk/Helpers.cs
index 01f0dd87f..f010e9cd6 100644
--- a/Aaru.Images/Apridisk/Helpers.cs
+++ b/Aaru.Images/Apridisk/Helpers.cs
@@ -30,17 +30,16 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Apridisk
-    {
-        (ushort cylinder, byte head, byte sector) LbaToChs(ulong lba)
-        {
-            ushort cylinder = (ushort)(lba / (_imageInfo.Heads * _imageInfo.SectorsPerTrack));
-            byte   head     = (byte)(lba / _imageInfo.SectorsPerTrack % _imageInfo.Heads);
-            byte   sector   = (byte)((lba % _imageInfo.SectorsPerTrack) + 1);
+namespace Aaru.DiscImages;
 
-            return (cylinder, head, sector);
-        }
+public sealed partial class Apridisk
+{
+    (ushort cylinder, byte head, byte sector) LbaToChs(ulong lba)
+    {
+        ushort cylinder = (ushort)(lba                            / (_imageInfo.Heads * _imageInfo.SectorsPerTrack));
+        byte   head     = (byte)(lba / _imageInfo.SectorsPerTrack % _imageInfo.Heads);
+        byte   sector   = (byte)((lba % _imageInfo.SectorsPerTrack) + 1);
+
+        return (cylinder, head, sector);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Identify.cs b/Aaru.Images/Apridisk/Identify.cs
index 54bab3bdd..73bd0fe14 100644
--- a/Aaru.Images/Apridisk/Identify.cs
+++ b/Aaru.Images/Apridisk/Identify.cs
@@ -34,23 +34,22 @@ using System.IO;
 using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apridisk
 {
-    public sealed partial class Apridisk
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < _signature.Length)
-                return false;
+        if(stream.Length < _signature.Length)
+            return false;
 
-            byte[] sigB = new byte[_signature.Length];
-            stream.Read(sigB, 0, _signature.Length);
+        byte[] sigB = new byte[_signature.Length];
+        stream.Read(sigB, 0, _signature.Length);
 
-            return sigB.SequenceEqual(_signature);
-        }
+        return sigB.SequenceEqual(_signature);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Properties.cs b/Aaru.Images/Apridisk/Properties.cs
index 12373aa16..b1a0261b8 100644
--- a/Aaru.Images/Apridisk/Properties.cs
+++ b/Aaru.Images/Apridisk/Properties.cs
@@ -37,59 +37,58 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apridisk
 {
-    public sealed partial class Apridisk
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "ACT Apricot Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("43408CF3-6DB3-449F-A779-2B0E497C5B14");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "ACT Apricot disk image";
+
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+
+    // TODO: Test with real hardware to see real supported media
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-
-        /// <inheritdoc />
-        public string Name => "ACT Apricot Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("43408CF3-6DB3-449F-A779-2B0E497C5B14");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "ACT Apricot disk image";
-
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-
-        // TODO: Test with real hardware to see real supported media
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
-            MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
-            MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
-            MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
-            MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
-            MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
-            MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525, MediaType.MetaFloppy_Mod_I, MediaType.MetaFloppy_Mod_II
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
-        {
-            ("compress", typeof(bool), "Enable Apridisk compression.", (object)false)
-        };
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".dsk"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+        MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
+        MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
+        MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
+        MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
+        MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+        MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
+        MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525, MediaType.MetaFloppy_Mod_I, MediaType.MetaFloppy_Mod_II
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
+    {
+        ("compress", typeof(bool), "Enable Apridisk compression.", (object)false)
+    };
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".dsk"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Read.cs b/Aaru.Images/Apridisk/Read.cs
index 6edfe9b59..27756d87b 100644
--- a/Aaru.Images/Apridisk/Read.cs
+++ b/Aaru.Images/Apridisk/Read.cs
@@ -37,240 +37,239 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apridisk
 {
-    public sealed partial class Apridisk
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        // Skip signature
+        stream.Seek(_signature.Length, SeekOrigin.Begin);
+
+        int totalCylinders = -1;
+        int totalHeads     = -1;
+        int maxSector      = -1;
+        int recordSize     = Marshal.SizeOf<Record>();
+
+        // Count cylinders
+        while(stream.Position < stream.Length)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            byte[] recB = new byte[recordSize];
+            stream.Read(recB, 0, recordSize);
 
-            // Skip signature
-            stream.Seek(_signature.Length, SeekOrigin.Begin);
+            Record record = Marshal.SpanToStructureLittleEndian<Record>(recB);
 
-            int totalCylinders = -1;
-            int totalHeads     = -1;
-            int maxSector      = -1;
-            int recordSize     = Marshal.SizeOf<Record>();
-
-            // Count cylinders
-            while(stream.Position < stream.Length)
+            switch(record.type)
             {
-                byte[] recB = new byte[recordSize];
-                stream.Read(recB, 0, recordSize);
+                // Deleted record, just skip it
+                case RecordType.Deleted:
+                    AaruConsole.DebugWriteLine("Apridisk plugin", "Found deleted record at {0}", stream.Position);
+                    stream.Seek(record.headerSize - recordSize + record.dataSize, SeekOrigin.Current);
 
-                Record record = Marshal.SpanToStructureLittleEndian<Record>(recB);
+                    break;
+                case RecordType.Comment:
+                    AaruConsole.DebugWriteLine("Apridisk plugin", "Found comment record at {0}", stream.Position);
+                    stream.Seek(record.headerSize - recordSize, SeekOrigin.Current);
+                    byte[] commentB = new byte[record.dataSize];
+                    stream.Read(commentB, 0, commentB.Length);
+                    _imageInfo.Comments = StringHandlers.CToString(commentB);
+                    AaruConsole.DebugWriteLine("Apridisk plugin", "Comment: \"{0}\"", _imageInfo.Comments);
 
-                switch(record.type)
-                {
-                    // Deleted record, just skip it
-                    case RecordType.Deleted:
-                        AaruConsole.DebugWriteLine("Apridisk plugin", "Found deleted record at {0}", stream.Position);
-                        stream.Seek(record.headerSize - recordSize + record.dataSize, SeekOrigin.Current);
+                    break;
+                case RecordType.Creator:
+                    AaruConsole.DebugWriteLine("Apridisk plugin", "Found creator record at {0}", stream.Position);
+                    stream.Seek(record.headerSize - recordSize, SeekOrigin.Current);
+                    byte[] creatorB = new byte[record.dataSize];
+                    stream.Read(creatorB, 0, creatorB.Length);
+                    _imageInfo.Creator = StringHandlers.CToString(creatorB);
+                    AaruConsole.DebugWriteLine("Apridisk plugin", "Creator: \"{0}\"", _imageInfo.Creator);
 
-                        break;
-                    case RecordType.Comment:
-                        AaruConsole.DebugWriteLine("Apridisk plugin", "Found comment record at {0}", stream.Position);
-                        stream.Seek(record.headerSize - recordSize, SeekOrigin.Current);
-                        byte[] commentB = new byte[record.dataSize];
-                        stream.Read(commentB, 0, commentB.Length);
-                        _imageInfo.Comments = StringHandlers.CToString(commentB);
-                        AaruConsole.DebugWriteLine("Apridisk plugin", "Comment: \"{0}\"", _imageInfo.Comments);
+                    break;
+                case RecordType.Sector:
+                    if(record.compression != CompressType.Compressed &&
+                       record.compression != CompressType.Uncompresed)
+                        return ErrorNumber.NotSupported;
 
-                        break;
-                    case RecordType.Creator:
-                        AaruConsole.DebugWriteLine("Apridisk plugin", "Found creator record at {0}", stream.Position);
-                        stream.Seek(record.headerSize - recordSize, SeekOrigin.Current);
-                        byte[] creatorB = new byte[record.dataSize];
-                        stream.Read(creatorB, 0, creatorB.Length);
-                        _imageInfo.Creator = StringHandlers.CToString(creatorB);
-                        AaruConsole.DebugWriteLine("Apridisk plugin", "Creator: \"{0}\"", _imageInfo.Creator);
+                    AaruConsole.DebugWriteLine("Apridisk plugin",
+                                               "Found {4} sector record at {0} for cylinder {1} head {2} sector {3}",
+                                               stream.Position, record.cylinder, record.head, record.sector,
+                                               record.compression == CompressType.Compressed ? "compressed"
+                                                   : "uncompressed");
 
-                        break;
-                    case RecordType.Sector:
-                        if(record.compression != CompressType.Compressed &&
-                           record.compression != CompressType.Uncompresed)
-                            return ErrorNumber.NotSupported;
+                    if(record.cylinder > totalCylinders)
+                        totalCylinders = record.cylinder;
 
-                        AaruConsole.DebugWriteLine("Apridisk plugin",
-                                                   "Found {4} sector record at {0} for cylinder {1} head {2} sector {3}",
-                                                   stream.Position, record.cylinder, record.head, record.sector,
-                                                   record.compression == CompressType.Compressed ? "compressed"
-                                                       : "uncompressed");
+                    if(record.head > totalHeads)
+                        totalHeads = record.head;
 
-                        if(record.cylinder > totalCylinders)
-                            totalCylinders = record.cylinder;
+                    if(record.sector > maxSector)
+                        maxSector = record.sector;
 
-                        if(record.head > totalHeads)
-                            totalHeads = record.head;
+                    stream.Seek(record.headerSize - recordSize + record.dataSize, SeekOrigin.Current);
 
-                        if(record.sector > maxSector)
-                            maxSector = record.sector;
-
-                        stream.Seek(record.headerSize - recordSize + record.dataSize, SeekOrigin.Current);
-
-                        break;
-                    default: return ErrorNumber.NotSupported;
-                }
+                    break;
+                default: return ErrorNumber.NotSupported;
             }
-
-            totalCylinders++;
-            totalHeads++;
-
-            if(totalCylinders <= 0 ||
-               totalHeads     <= 0)
-                return ErrorNumber.NotSupported;
-
-            _sectorsData = new byte[totalCylinders][][][];
-
-            // Total sectors per track
-            uint[][] spts = new uint[totalCylinders][];
-
-            _imageInfo.Cylinders = (ushort)totalCylinders;
-            _imageInfo.Heads     = (byte)totalHeads;
-
-            AaruConsole.DebugWriteLine("Apridisk plugin",
-                                       "Found {0} cylinders and {1} heads with a maximum sector number of {2}",
-                                       totalCylinders, totalHeads, maxSector);
-
-            // Create heads
-            for(int i = 0; i < totalCylinders; i++)
-            {
-                _sectorsData[i] = new byte[totalHeads][][];
-                spts[i]         = new uint[totalHeads];
-
-                for(int j = 0; j < totalHeads; j++)
-                    _sectorsData[i][j] = new byte[maxSector + 1][];
-            }
-
-            _imageInfo.SectorSize = uint.MaxValue;
-
-            ulong headerSizes = 0;
-
-            // Read sectors
-            stream.Seek(_signature.Length, SeekOrigin.Begin);
-
-            while(stream.Position < stream.Length)
-            {
-                byte[] recB = new byte[recordSize];
-                stream.Read(recB, 0, recordSize);
-
-                Record record = Marshal.SpanToStructureLittleEndian<Record>(recB);
-
-                switch(record.type)
-                {
-                    // Not sector record, just skip it
-                    case RecordType.Deleted:
-                    case RecordType.Comment:
-                    case RecordType.Creator:
-                        stream.Seek(record.headerSize - recordSize + record.dataSize, SeekOrigin.Current);
-                        headerSizes += record.headerSize + record.dataSize;
-
-                        break;
-                    case RecordType.Sector:
-                        stream.Seek(record.headerSize - recordSize, SeekOrigin.Current);
-
-                        byte[] data = new byte[record.dataSize];
-                        stream.Read(data, 0, data.Length);
-
-                        spts[record.cylinder][record.head]++;
-                        uint realLength = record.dataSize;
-
-                        if(record.compression == CompressType.Compressed)
-                            realLength =
-                                Decompress(data, out _sectorsData[record.cylinder][record.head][record.sector]);
-                        else
-                            _sectorsData[record.cylinder][record.head][record.sector] = data;
-
-                        if(realLength < _imageInfo.SectorSize)
-                            _imageInfo.SectorSize = realLength;
-
-                        headerSizes += record.headerSize + record.dataSize;
-
-                        break;
-                }
-            }
-
-            AaruConsole.DebugWriteLine("Apridisk plugin", "Found a minimum of {0} bytes per sector",
-                                       _imageInfo.SectorSize);
-
-            // Count sectors per track
-            uint spt = uint.MaxValue;
-
-            for(ushort cyl = 0; cyl < _imageInfo.Cylinders; cyl++)
-            {
-                for(ushort head = 0; head < _imageInfo.Heads; head++)
-                    if(spts[cyl][head] < spt)
-                        spt = spts[cyl][head];
-            }
-
-            _imageInfo.SectorsPerTrack = spt;
-
-            AaruConsole.DebugWriteLine("Apridisk plugin", "Found a minimum of {0} sectors per track",
-                                       _imageInfo.SectorsPerTrack);
-
-            _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
-                                                          (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
-                                                          false));
-
-            _imageInfo.ImageSize            = (ulong)stream.Length - headerSizes;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = _imageInfo.Cylinders * _imageInfo.Heads * _imageInfo.SectorsPerTrack;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        totalCylinders++;
+        totalHeads++;
+
+        if(totalCylinders <= 0 ||
+           totalHeads     <= 0)
+            return ErrorNumber.NotSupported;
+
+        _sectorsData = new byte[totalCylinders][][][];
+
+        // Total sectors per track
+        uint[][] spts = new uint[totalCylinders][];
+
+        _imageInfo.Cylinders = (ushort)totalCylinders;
+        _imageInfo.Heads     = (byte)totalHeads;
+
+        AaruConsole.DebugWriteLine("Apridisk plugin",
+                                   "Found {0} cylinders and {1} heads with a maximum sector number of {2}",
+                                   totalCylinders, totalHeads, maxSector);
+
+        // Create heads
+        for(int i = 0; i < totalCylinders; i++)
         {
-            buffer                                    = null;
-            (ushort cylinder, byte head, byte sector) = LbaToChs(sectorAddress);
+            _sectorsData[i] = new byte[totalHeads][][];
+            spts[i]         = new uint[totalHeads];
 
-            if(cylinder >= _sectorsData.Length)
-                return ErrorNumber.SectorNotFound;
-
-            if(head >= _sectorsData[cylinder].Length)
-                return ErrorNumber.SectorNotFound;
-
-            if(sector > _sectorsData[cylinder][head].Length)
-                return ErrorNumber.SectorNotFound;
-
-            buffer = _sectorsData[cylinder][head][sector];
-
-            return ErrorNumber.NoError;
+            for(int j = 0; j < totalHeads; j++)
+                _sectorsData[i][j] = new byte[maxSector + 1][];
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        _imageInfo.SectorSize = uint.MaxValue;
+
+        ulong headerSizes = 0;
+
+        // Read sectors
+        stream.Seek(_signature.Length, SeekOrigin.Begin);
+
+        while(stream.Position < stream.Length)
         {
-            buffer = null;
+            byte[] recB = new byte[recordSize];
+            stream.Read(recB, 0, recordSize);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            Record record = Marshal.SpanToStructureLittleEndian<Record>(recB);
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
+            switch(record.type)
             {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+                // Not sector record, just skip it
+                case RecordType.Deleted:
+                case RecordType.Comment:
+                case RecordType.Creator:
+                    stream.Seek(record.headerSize - recordSize + record.dataSize, SeekOrigin.Current);
+                    headerSizes += record.headerSize + record.dataSize;
 
-                if(errno != ErrorNumber.NoError)
-                    return errno;
+                    break;
+                case RecordType.Sector:
+                    stream.Seek(record.headerSize - recordSize, SeekOrigin.Current);
 
-                ms.Write(sector, 0, sector.Length);
+                    byte[] data = new byte[record.dataSize];
+                    stream.Read(data, 0, data.Length);
+
+                    spts[record.cylinder][record.head]++;
+                    uint realLength = record.dataSize;
+
+                    if(record.compression == CompressType.Compressed)
+                        realLength =
+                            Decompress(data, out _sectorsData[record.cylinder][record.head][record.sector]);
+                    else
+                        _sectorsData[record.cylinder][record.head][record.sector] = data;
+
+                    if(realLength < _imageInfo.SectorSize)
+                        _imageInfo.SectorSize = realLength;
+
+                    headerSizes += record.headerSize + record.dataSize;
+
+                    break;
             }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
         }
+
+        AaruConsole.DebugWriteLine("Apridisk plugin", "Found a minimum of {0} bytes per sector",
+                                   _imageInfo.SectorSize);
+
+        // Count sectors per track
+        uint spt = uint.MaxValue;
+
+        for(ushort cyl = 0; cyl < _imageInfo.Cylinders; cyl++)
+        {
+            for(ushort head = 0; head < _imageInfo.Heads; head++)
+                if(spts[cyl][head] < spt)
+                    spt = spts[cyl][head];
+        }
+
+        _imageInfo.SectorsPerTrack = spt;
+
+        AaruConsole.DebugWriteLine("Apridisk plugin", "Found a minimum of {0} sectors per track",
+                                   _imageInfo.SectorsPerTrack);
+
+        _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
+                                                      (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
+                                                      false));
+
+        _imageInfo.ImageSize            = (ulong)stream.Length - headerSizes;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = _imageInfo.Cylinders * _imageInfo.Heads * _imageInfo.SectorsPerTrack;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer                                    = null;
+        (ushort cylinder, byte head, byte sector) = LbaToChs(sectorAddress);
+
+        if(cylinder >= _sectorsData.Length)
+            return ErrorNumber.SectorNotFound;
+
+        if(head >= _sectorsData[cylinder].Length)
+            return ErrorNumber.SectorNotFound;
+
+        if(sector > _sectorsData[cylinder][head].Length)
+            return ErrorNumber.SectorNotFound;
+
+        buffer = _sectorsData[cylinder][head][sector];
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Structs.cs b/Aaru.Images/Apridisk/Structs.cs
index 452177780..08f5e5ad6 100644
--- a/Aaru.Images/Apridisk/Structs.cs
+++ b/Aaru.Images/Apridisk/Structs.cs
@@ -32,20 +32,19 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apridisk
 {
-    public sealed partial class Apridisk
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Record
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Record
-        {
-            public RecordType   type;
-            public CompressType compression;
-            public ushort       headerSize;
-            public uint         dataSize;
-            public byte         head;
-            public byte         sector;
-            public ushort       cylinder;
-        }
+        public RecordType   type;
+        public CompressType compression;
+        public ushort       headerSize;
+        public uint         dataSize;
+        public byte         head;
+        public byte         sector;
+        public ushort       cylinder;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Unsupported.cs b/Aaru.Images/Apridisk/Unsupported.cs
index 4f207303d..4779382cd 100644
--- a/Aaru.Images/Apridisk/Unsupported.cs
+++ b/Aaru.Images/Apridisk/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apridisk
 {
-    public sealed partial class Apridisk
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Apridisk/Write.cs b/Aaru.Images/Apridisk/Write.cs
index 487855c2c..1f6e8fd49 100644
--- a/Aaru.Images/Apridisk/Write.cs
+++ b/Aaru.Images/Apridisk/Write.cs
@@ -41,55 +41,88 @@ using Aaru.CommonTypes.Structs;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Apridisk
 {
-    public sealed partial class Apridisk
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        _imageInfo = new ImageInfo
+        {
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
+            return false;
+        }
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        (ushort cylinder, byte head, byte sector) = LbaToChs(sectorAddress);
+
+        if(cylinder >= _sectorsData.Length)
+        {
+            ErrorMessage = "Sector address not found";
+
+            return false;
+        }
+
+        if(head >= _sectorsData[cylinder].Length)
+        {
+            ErrorMessage = "Sector address not found";
+
+            return false;
+        }
+
+        if(sector > _sectorsData[cylinder][head].Length)
+        {
+            ErrorMessage = "Sector address not found";
+
+            return false;
+        }
+
+        _sectorsData[cylinder][head][sector] = data;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        for(uint i = 0; i < length; i++)
         {
             (ushort cylinder, byte head, byte sector) = LbaToChs(sectorAddress);
 
@@ -115,221 +148,187 @@ namespace Aaru.DiscImages
             }
 
             _sectorsData[cylinder][head][sector] = data;
-
-            return true;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            for(uint i = 0; i < length; i++)
-            {
-                (ushort cylinder, byte head, byte sector) = LbaToChs(sectorAddress);
-
-                if(cylinder >= _sectorsData.Length)
-                {
-                    ErrorMessage = "Sector address not found";
-
-                    return false;
-                }
-
-                if(head >= _sectorsData[cylinder].Length)
-                {
-                    ErrorMessage = "Sector address not found";
-
-                    return false;
-                }
-
-                if(sector > _sectorsData[cylinder][head].Length)
-                {
-                    ErrorMessage = "Sector address not found";
-
-                    return false;
-                }
-
-                _sectorsData[cylinder][head][sector] = data;
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
-
-            return false;
-        }
-
-        // TODO: Try if apridisk software supports finding other chunks, to extend metadata support
-        /// <inheritdoc />
-        public bool Close()
-        {
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(_signature, 0, _signature.Length);
-
-            byte[] hdr = new byte[Marshal.SizeOf<Record>()];
-
-            for(ushort c = 0; c < _imageInfo.Cylinders; c++)
-            {
-                for(byte h = 0; h < _imageInfo.Heads; h++)
-                {
-                    for(byte s = 0; s < _imageInfo.SectorsPerTrack; s++)
-                    {
-                        if(_sectorsData[c][h][s]        == null ||
-                           _sectorsData[c][h][s].Length == 0)
-                            continue;
-
-                        var record = new Record
-                        {
-                            type        = RecordType.Sector,
-                            compression = CompressType.Uncompresed,
-                            headerSize  = (ushort)Marshal.SizeOf<Record>(),
-                            dataSize    = (uint)_sectorsData[c][h][s].Length,
-                            head        = h,
-                            sector      = s,
-                            cylinder    = c
-                        };
-
-                        MemoryMarshal.Write(hdr, ref record);
-
-                        _writingStream.Write(hdr, 0, hdr.Length);
-                        _writingStream.Write(_sectorsData[c][h][s], 0, _sectorsData[c][h][s].Length);
-                    }
-                }
-            }
-
-            if(!string.IsNullOrEmpty(_imageInfo.Creator))
-            {
-                byte[] creatorBytes = Encoding.UTF8.GetBytes(_imageInfo.Creator);
-
-                var creatorRecord = new Record
-                {
-                    type        = RecordType.Creator,
-                    compression = CompressType.Uncompresed,
-                    headerSize  = (ushort)Marshal.SizeOf<Record>(),
-                    dataSize    = (uint)creatorBytes.Length + 1,
-                    head        = 0,
-                    sector      = 0,
-                    cylinder    = 0
-                };
-
-                MemoryMarshal.Write(hdr, ref creatorRecord);
-
-                _writingStream.Write(hdr, 0, hdr.Length);
-                _writingStream.Write(creatorBytes, 0, creatorBytes.Length);
-                _writingStream.WriteByte(0); // Termination
-            }
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-            {
-                byte[] commentBytes = Encoding.UTF8.GetBytes(_imageInfo.Comments);
-
-                var commentRecord = new Record
-                {
-                    type        = RecordType.Comment,
-                    compression = CompressType.Uncompresed,
-                    headerSize  = (ushort)Marshal.SizeOf<Record>(),
-                    dataSize    = (uint)commentBytes.Length + 1,
-                    head        = 0,
-                    sector      = 0,
-                    cylinder    = 0
-                };
-
-                MemoryMarshal.Write(hdr, ref commentRecord);
-
-                _writingStream.Write(hdr, 0, hdr.Length);
-                _writingStream.Write(commentBytes, 0, commentBytes.Length);
-                _writingStream.WriteByte(0); // Termination
-            }
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata)
-        {
-            _imageInfo.Comments = metadata.Comments;
-            _imageInfo.Creator  = metadata.Creator;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
-        {
-            if(cylinders > ushort.MaxValue)
-            {
-                ErrorMessage = "Too many cylinders";
-
-                return false;
-            }
-
-            if(heads > byte.MaxValue)
-            {
-                ErrorMessage = "Too many heads";
-
-                return false;
-            }
-
-            if(sectorsPerTrack > byte.MaxValue)
-            {
-                ErrorMessage = "Too many sectors per track";
-
-                return false;
-            }
-
-            _sectorsData = new byte[cylinders][][][];
-
-            for(ushort c = 0; c < cylinders; c++)
-            {
-                _sectorsData[c] = new byte[heads][][];
-
-                for(byte h = 0; h < heads; h++)
-                    _sectorsData[c][h] = new byte[sectorsPerTrack][];
-            }
-
-            _imageInfo.Cylinders       = cylinders;
-            _imageInfo.Heads           = heads;
-            _imageInfo.SectorsPerTrack = sectorsPerTrack;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    // TODO: Try if apridisk software supports finding other chunks, to extend metadata support
+    /// <inheritdoc />
+    public bool Close()
+    {
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(_signature, 0, _signature.Length);
+
+        byte[] hdr = new byte[Marshal.SizeOf<Record>()];
+
+        for(ushort c = 0; c < _imageInfo.Cylinders; c++)
+        {
+            for(byte h = 0; h < _imageInfo.Heads; h++)
+            {
+                for(byte s = 0; s < _imageInfo.SectorsPerTrack; s++)
+                {
+                    if(_sectorsData[c][h][s]        == null ||
+                       _sectorsData[c][h][s].Length == 0)
+                        continue;
+
+                    var record = new Record
+                    {
+                        type        = RecordType.Sector,
+                        compression = CompressType.Uncompresed,
+                        headerSize  = (ushort)Marshal.SizeOf<Record>(),
+                        dataSize    = (uint)_sectorsData[c][h][s].Length,
+                        head        = h,
+                        sector      = s,
+                        cylinder    = c
+                    };
+
+                    MemoryMarshal.Write(hdr, ref record);
+
+                    _writingStream.Write(hdr, 0, hdr.Length);
+                    _writingStream.Write(_sectorsData[c][h][s], 0, _sectorsData[c][h][s].Length);
+                }
+            }
+        }
+
+        if(!string.IsNullOrEmpty(_imageInfo.Creator))
+        {
+            byte[] creatorBytes = Encoding.UTF8.GetBytes(_imageInfo.Creator);
+
+            var creatorRecord = new Record
+            {
+                type        = RecordType.Creator,
+                compression = CompressType.Uncompresed,
+                headerSize  = (ushort)Marshal.SizeOf<Record>(),
+                dataSize    = (uint)creatorBytes.Length + 1,
+                head        = 0,
+                sector      = 0,
+                cylinder    = 0
+            };
+
+            MemoryMarshal.Write(hdr, ref creatorRecord);
+
+            _writingStream.Write(hdr, 0, hdr.Length);
+            _writingStream.Write(creatorBytes, 0, creatorBytes.Length);
+            _writingStream.WriteByte(0); // Termination
+        }
+
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+        {
+            byte[] commentBytes = Encoding.UTF8.GetBytes(_imageInfo.Comments);
+
+            var commentRecord = new Record
+            {
+                type        = RecordType.Comment,
+                compression = CompressType.Uncompresed,
+                headerSize  = (ushort)Marshal.SizeOf<Record>(),
+                dataSize    = (uint)commentBytes.Length + 1,
+                head        = 0,
+                sector      = 0,
+                cylinder    = 0
+            };
+
+            MemoryMarshal.Write(hdr, ref commentRecord);
+
+            _writingStream.Write(hdr, 0, hdr.Length);
+            _writingStream.Write(commentBytes, 0, commentBytes.Length);
+            _writingStream.WriteByte(0); // Termination
+        }
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata)
+    {
+        _imageInfo.Comments = metadata.Comments;
+        _imageInfo.Creator  = metadata.Creator;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        if(cylinders > ushort.MaxValue)
+        {
+            ErrorMessage = "Too many cylinders";
+
+            return false;
+        }
+
+        if(heads > byte.MaxValue)
+        {
+            ErrorMessage = "Too many heads";
+
+            return false;
+        }
+
+        if(sectorsPerTrack > byte.MaxValue)
+        {
+            ErrorMessage = "Too many sectors per track";
+
+            return false;
+        }
+
+        _sectorsData = new byte[cylinders][][][];
+
+        for(ushort c = 0; c < cylinders; c++)
+        {
+            _sectorsData[c] = new byte[heads][][];
+
+            for(byte h = 0; h < heads; h++)
+                _sectorsData[c][h] = new byte[sectorsPerTrack][];
+        }
+
+        _imageInfo.Cylinders       = cylinders;
+        _imageInfo.Heads           = heads;
+        _imageInfo.SectorsPerTrack = sectorsPerTrack;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/BLU/BLU.cs b/Aaru.Images/BLU/BLU.cs
index 6965e4e62..7ec646a30 100644
--- a/Aaru.Images/BLU/BLU.cs
+++ b/Aaru.Images/BLU/BLU.cs
@@ -36,47 +36,46 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+/// <summary>Implements reading Basic Lisa Utility disk images</summary>
+public sealed partial class Blu : IWritableImage, IVerifiableSectorsImage
 {
-    /// <summary>Implements reading Basic Lisa Utility disk images</summary>
-    public sealed partial class Blu : IWritableImage, IVerifiableSectorsImage
+    IFilter    _bluImageFilter;
+    int        _bptag;
+    BluHeader  _imageHeader;
+    ImageInfo  _imageInfo;
+    FileStream _writingStream;
+
+    public Blu() => _imageInfo = new ImageInfo
     {
-        IFilter    _bluImageFilter;
-        int        _bptag;
-        BluHeader  _imageHeader;
-        ImageInfo  _imageInfo;
-        FileStream _writingStream;
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 
-        public Blu() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-
-        struct BluHeader
-        {
-            public byte[] DeviceName;
-            public uint   DeviceType;
-            public uint   DeviceBlocks;
-            public ushort BytesPerBlock;
-        }
+    struct BluHeader
+    {
+        public byte[] DeviceName;
+        public uint   DeviceType;
+        public uint   DeviceBlocks;
+        public ushort BytesPerBlock;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BLU/Constants.cs b/Aaru.Images/BLU/Constants.cs
index 6e8d4ac96..9c36f2309 100644
--- a/Aaru.Images/BLU/Constants.cs
+++ b/Aaru.Images/BLU/Constants.cs
@@ -30,13 +30,12 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Blu
 {
-    public sealed partial class Blu
-    {
-        const string PROFILE_NAME   = "PROFILE      ";
-        const string PROFILE10_NAME = "PROFILE 10   ";
-        const string WIDGET_NAME    = "WIDGET-10    ";
-        const string PRIAM_NAME     = "PRIAMDTATOWER";
-    }
+    const string PROFILE_NAME   = "PROFILE      ";
+    const string PROFILE10_NAME = "PROFILE 10   ";
+    const string WIDGET_NAME    = "WIDGET-10    ";
+    const string PRIAM_NAME     = "PRIAMDTATOWER";
 }
\ No newline at end of file
diff --git a/Aaru.Images/BLU/Identify.cs b/Aaru.Images/BLU/Identify.cs
index 50b9e5b11..57dd8f9b9 100644
--- a/Aaru.Images/BLU/Identify.cs
+++ b/Aaru.Images/BLU/Identify.cs
@@ -35,37 +35,36 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Blu
-    {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+namespace Aaru.DiscImages;
 
-            if(stream.Length < 0x200)
+public sealed partial class Blu
+{
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
+    {
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 0x200)
+            return false;
+
+        byte[] header = new byte[0x17];
+        stream.Read(header, 0, 0x17);
+
+        var tmpHdr = new BluHeader
+        {
+            DeviceName = new byte[0x0D]
+        };
+
+        Array.Copy(header, 0, tmpHdr.DeviceName, 0, 0x0D);
+        tmpHdr.DeviceType    = BigEndianBitConverter.ToUInt32(header, 0x0C) & 0x00FFFFFF;
+        tmpHdr.DeviceBlocks  = BigEndianBitConverter.ToUInt32(header, 0x11) & 0x00FFFFFF;
+        tmpHdr.BytesPerBlock = BigEndianBitConverter.ToUInt16(header, 0x15);
+
+        for(int i = 0; i < 0xD; i++)
+            if(tmpHdr.DeviceName[i] < 0x20)
                 return false;
 
-            byte[] header = new byte[0x17];
-            stream.Read(header, 0, 0x17);
-
-            var tmpHdr = new BluHeader
-            {
-                DeviceName = new byte[0x0D]
-            };
-
-            Array.Copy(header, 0, tmpHdr.DeviceName, 0, 0x0D);
-            tmpHdr.DeviceType    = BigEndianBitConverter.ToUInt32(header, 0x0C) & 0x00FFFFFF;
-            tmpHdr.DeviceBlocks  = BigEndianBitConverter.ToUInt32(header, 0x11) & 0x00FFFFFF;
-            tmpHdr.BytesPerBlock = BigEndianBitConverter.ToUInt16(header, 0x15);
-
-            for(int i = 0; i < 0xD; i++)
-                if(tmpHdr.DeviceName[i] < 0x20)
-                    return false;
-
-            return (tmpHdr.BytesPerBlock & 0xFE00) == 0x200;
-        }
+        return (tmpHdr.BytesPerBlock & 0xFE00) == 0x200;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BLU/Properties.cs b/Aaru.Images/BLU/Properties.cs
index 166fa6ec0..e56be049d 100644
--- a/Aaru.Images/BLU/Properties.cs
+++ b/Aaru.Images/BLU/Properties.cs
@@ -37,51 +37,50 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Blu
 {
-    public sealed partial class Blu
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "Basic Lisa Utility";
+    /// <inheritdoc />
+    public Guid Id => new Guid("A153E2F8-4235-432D-9A7F-20807B0BCD74");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Basic Lisa Utility";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "Basic Lisa Utility";
-        /// <inheritdoc />
-        public Guid Id => new Guid("A153E2F8-4235-432D-9A7F-20807B0BCD74");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Basic Lisa Utility";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        SectorTagType.AppleSectorTag
+    };
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.AppleProfile, MediaType.AppleWidget, MediaType.PriamDataTower, MediaType.GENERIC_HDD,
+        MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash, MediaType.CompactFlashType2,
+        MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII, MediaType.PCCardTypeIV
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
-        {
-            SectorTagType.AppleSectorTag
-        };
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.AppleProfile, MediaType.AppleWidget, MediaType.PriamDataTower, MediaType.GENERIC_HDD,
-            MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash, MediaType.CompactFlashType2,
-            MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII, MediaType.PCCardTypeIV
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".blu"
-        }; // Just invented
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".blu"
+    }; // Just invented
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BLU/Read.cs b/Aaru.Images/BLU/Read.cs
index 7fa082553..b4dc530a7 100644
--- a/Aaru.Images/BLU/Read.cs
+++ b/Aaru.Images/BLU/Read.cs
@@ -38,220 +38,219 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Blu
 {
-    public sealed partial class Blu
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        _imageHeader = new BluHeader
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            DeviceName = new byte[0x0D]
+        };
 
-            _imageHeader = new BluHeader
-            {
-                DeviceName = new byte[0x0D]
-            };
+        byte[] header = new byte[0x17];
+        stream.Read(header, 0, 0x17);
+        Array.Copy(header, 0, _imageHeader.DeviceName, 0, 0x0D);
+        _imageHeader.DeviceType    = BigEndianBitConverter.ToUInt32(header, 0x0C) & 0x00FFFFFF;
+        _imageHeader.DeviceBlocks  = BigEndianBitConverter.ToUInt32(header, 0x11) & 0x00FFFFFF;
+        _imageHeader.BytesPerBlock = BigEndianBitConverter.ToUInt16(header, 0x15);
 
-            byte[] header = new byte[0x17];
-            stream.Read(header, 0, 0x17);
-            Array.Copy(header, 0, _imageHeader.DeviceName, 0, 0x0D);
-            _imageHeader.DeviceType    = BigEndianBitConverter.ToUInt32(header, 0x0C) & 0x00FFFFFF;
-            _imageHeader.DeviceBlocks  = BigEndianBitConverter.ToUInt32(header, 0x11) & 0x00FFFFFF;
-            _imageHeader.BytesPerBlock = BigEndianBitConverter.ToUInt16(header, 0x15);
+        AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceName = \"{0}\"",
+                                   StringHandlers.CToString(_imageHeader.DeviceName));
 
-            AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceName = \"{0}\"",
-                                       StringHandlers.CToString(_imageHeader.DeviceName));
+        AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceType = {0}", _imageHeader.DeviceType);
+        AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceBlock = {0}", _imageHeader.DeviceBlocks);
+        AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.bytesPerBlock = {0}", _imageHeader.BytesPerBlock);
 
-            AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceType = {0}", _imageHeader.DeviceType);
-            AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.deviceBlock = {0}", _imageHeader.DeviceBlocks);
-            AaruConsole.DebugWriteLine("BLU plugin", "ImageHeader.bytesPerBlock = {0}", _imageHeader.BytesPerBlock);
-
-            for(int i = 0; i < 0xD; i++)
-                if(_imageHeader.DeviceName[i] < 0x20)
-                    return ErrorNumber.InvalidArgument;
-
-            if((_imageHeader.BytesPerBlock & 0xFE00) != 0x200)
+        for(int i = 0; i < 0xD; i++)
+            if(_imageHeader.DeviceName[i] < 0x20)
                 return ErrorNumber.InvalidArgument;
 
-            stream.Seek(0, SeekOrigin.Begin);
-            header = new byte[_imageHeader.BytesPerBlock];
-            stream.Read(header, 0, _imageHeader.BytesPerBlock);
+        if((_imageHeader.BytesPerBlock & 0xFE00) != 0x200)
+            return ErrorNumber.InvalidArgument;
 
-            _imageInfo.SectorSize = 0x200;
+        stream.Seek(0, SeekOrigin.Begin);
+        header = new byte[_imageHeader.BytesPerBlock];
+        stream.Read(header, 0, _imageHeader.BytesPerBlock);
 
-            _imageInfo.Sectors   = _imageHeader.DeviceBlocks;
-            _imageInfo.ImageSize = _imageHeader.DeviceBlocks * _imageHeader.BytesPerBlock;
-            _bptag               = _imageHeader.BytesPerBlock - 0x200;
-            byte[] hdrTag = new byte[_bptag];
-            Array.Copy(header, 0x200, hdrTag, 0, _bptag);
+        _imageInfo.SectorSize = 0x200;
 
-            switch(StringHandlers.CToString(_imageHeader.DeviceName))
-            {
-                case PROFILE_NAME:
-                    _imageInfo.MediaType =
-                        _imageInfo.Sectors == 0x2600 ? MediaType.AppleProfile : MediaType.GENERIC_HDD;
+        _imageInfo.Sectors   = _imageHeader.DeviceBlocks;
+        _imageInfo.ImageSize = _imageHeader.DeviceBlocks * _imageHeader.BytesPerBlock;
+        _bptag               = _imageHeader.BytesPerBlock - 0x200;
+        byte[] hdrTag = new byte[_bptag];
+        Array.Copy(header, 0x200, hdrTag, 0, _bptag);
 
-                    _imageInfo.Cylinders       = 152;
-                    _imageInfo.Heads           = 4;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case PROFILE10_NAME:
-                    _imageInfo.MediaType =
-                        _imageInfo.Sectors == 0x4C00 ? MediaType.AppleProfile : MediaType.GENERIC_HDD;
-
-                    _imageInfo.Cylinders       = 304;
-                    _imageInfo.Heads           = 4;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case WIDGET_NAME:
-                    _imageInfo.MediaType = _imageInfo.Sectors == 0x4C00 ? MediaType.AppleWidget : MediaType.GENERIC_HDD;
-
-                    _imageInfo.Cylinders       = 304;
-                    _imageInfo.Heads           = 4;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case PRIAM_NAME:
-                    _imageInfo.MediaType = _imageInfo.Sectors == 0x022C7C ? MediaType.PriamDataTower
-                                               : MediaType.GENERIC_HDD;
-
-                    // This values are invented...
-                    _imageInfo.Cylinders       = 419;
-                    _imageInfo.Heads           = 4;
-                    _imageInfo.SectorsPerTrack = 85;
-
-                    break;
-                default:
-                    _imageInfo.MediaType       = MediaType.GENERIC_HDD;
-                    _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-                    _imageInfo.Heads           = 16;
-                    _imageInfo.SectorsPerTrack = 63;
-
-                    break;
-            }
-
-            _imageInfo.Application = StringHandlers.CToString(hdrTag);
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-
-            _bluImageFilter = imageFilter;
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-            if(_bptag > 0)
-                _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
-
-            AaruConsole.VerboseWriteLine("BLU image contains a disk of type {0}", _imageInfo.MediaType);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        switch(StringHandlers.CToString(_imageHeader.DeviceName))
         {
-            buffer = null;
+            case PROFILE_NAME:
+                _imageInfo.MediaType =
+                    _imageInfo.Sectors == 0x2600 ? MediaType.AppleProfile : MediaType.GENERIC_HDD;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+                _imageInfo.Cylinders       = 152;
+                _imageInfo.Heads           = 4;
+                _imageInfo.SectorsPerTrack = 16;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+                break;
+            case PROFILE10_NAME:
+                _imageInfo.MediaType =
+                    _imageInfo.Sectors == 0x4C00 ? MediaType.AppleProfile : MediaType.GENERIC_HDD;
 
-            var ms   = new MemoryStream();
-            int seek = 0;
-            int read = 0x200;
-            int skip = _bptag;
+                _imageInfo.Cylinders       = 304;
+                _imageInfo.Heads           = 4;
+                _imageInfo.SectorsPerTrack = 16;
 
-            Stream stream = _bluImageFilter.GetDataForkStream();
-            stream.Seek((long)((sectorAddress + 1) * _imageHeader.BytesPerBlock), SeekOrigin.Begin);
+                break;
+            case WIDGET_NAME:
+                _imageInfo.MediaType = _imageInfo.Sectors == 0x4C00 ? MediaType.AppleWidget : MediaType.GENERIC_HDD;
 
-            for(int i = 0; i < length; i++)
-            {
-                stream.Seek(seek, SeekOrigin.Current);
-                byte[] sector = new byte[read];
-                stream.Read(sector, 0, read);
-                ms.Write(sector, 0, read);
-                stream.Seek(skip, SeekOrigin.Current);
-            }
+                _imageInfo.Cylinders       = 304;
+                _imageInfo.Heads           = 4;
+                _imageInfo.SectorsPerTrack = 16;
 
-            buffer = ms.ToArray();
+                break;
+            case PRIAM_NAME:
+                _imageInfo.MediaType = _imageInfo.Sectors == 0x022C7C ? MediaType.PriamDataTower
+                                           : MediaType.GENERIC_HDD;
 
-            return ErrorNumber.NoError;
+                // This values are invented...
+                _imageInfo.Cylinders       = 419;
+                _imageInfo.Heads           = 4;
+                _imageInfo.SectorsPerTrack = 85;
+
+                break;
+            default:
+                _imageInfo.MediaType       = MediaType.GENERIC_HDD;
+                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+                _imageInfo.Heads           = 16;
+                _imageInfo.SectorsPerTrack = 63;
+
+                break;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+        _imageInfo.Application = StringHandlers.CToString(hdrTag);
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+
+        _bluImageFilter = imageFilter;
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
+        if(_bptag > 0)
+            _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
+
+        AaruConsole.VerboseWriteLine("BLU image contains a disk of type {0}", _imageInfo.MediaType);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms   = new MemoryStream();
+        int seek = 0;
+        int read = 0x200;
+        int skip = _bptag;
+
+        Stream stream = _bluImageFilter.GetDataForkStream();
+        stream.Seek((long)((sectorAddress + 1) * _imageHeader.BytesPerBlock), SeekOrigin.Begin);
+
+        for(int i = 0; i < length; i++)
         {
-            buffer = null;
-
-            if(tag != SectorTagType.AppleSectorTag)
-                return ErrorNumber.NotSupported;
-
-            if(_bptag == 0)
-                return ErrorNumber.NoData;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.SectorNotFound;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.SectorNotFound;
-
-            var ms   = new MemoryStream();
-            int seek = 0x200;
-            int read = _bptag;
-            int skip = 0;
-
-            Stream stream = _bluImageFilter.GetDataForkStream();
-            stream.Seek((long)((sectorAddress + 1) * _imageHeader.BytesPerBlock), SeekOrigin.Begin);
-
-            for(int i = 0; i < length; i++)
-            {
-                stream.Seek(seek, SeekOrigin.Current);
-                byte[] sector = new byte[read];
-                stream.Read(sector, 0, read);
-                ms.Write(sector, 0, read);
-                stream.Seek(skip, SeekOrigin.Current);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            stream.Seek(seek, SeekOrigin.Current);
+            byte[] sector = new byte[read];
+            stream.Read(sector, 0, read);
+            ms.Write(sector, 0, read);
+            stream.Seek(skip, SeekOrigin.Current);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
+        buffer = ms.ToArray();
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag != SectorTagType.AppleSectorTag)
+            return ErrorNumber.NotSupported;
+
+        if(_bptag == 0)
+            return ErrorNumber.NoData;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.SectorNotFound;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.SectorNotFound;
+
+        var ms   = new MemoryStream();
+        int seek = 0x200;
+        int read = _bptag;
+        int skip = 0;
+
+        Stream stream = _bluImageFilter.GetDataForkStream();
+        stream.Seek((long)((sectorAddress + 1) * _imageHeader.BytesPerBlock), SeekOrigin.Begin);
+
+        for(int i = 0; i < length; i++)
         {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            buffer = new byte[length * _imageHeader.BytesPerBlock];
-            Stream stream = _bluImageFilter.GetDataForkStream();
-            stream.Seek((long)((sectorAddress + 1) * _imageHeader.BytesPerBlock), SeekOrigin.Begin);
-            stream.Read(buffer, 0, buffer.Length);
-
-            return ErrorNumber.NoError;
+            stream.Seek(seek, SeekOrigin.Current);
+            byte[] sector = new byte[read];
+            stream.Read(sector, 0, read);
+            ms.Write(sector, 0, read);
+            stream.Seek(skip, SeekOrigin.Current);
         }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageHeader.BytesPerBlock];
+        Stream stream = _bluImageFilter.GetDataForkStream();
+        stream.Seek((long)((sectorAddress + 1) * _imageHeader.BytesPerBlock), SeekOrigin.Begin);
+        stream.Read(buffer, 0, buffer.Length);
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BLU/Unsupported.cs b/Aaru.Images/BLU/Unsupported.cs
index bf7696359..87d04c366 100644
--- a/Aaru.Images/BLU/Unsupported.cs
+++ b/Aaru.Images/BLU/Unsupported.cs
@@ -32,16 +32,15 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Blu
-    {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+namespace Aaru.DiscImages;
 
-            return ErrorNumber.NotSupported;
-        }
+public sealed partial class Blu
+{
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BLU/Verify.cs b/Aaru.Images/BLU/Verify.cs
index 3baa7b22d..bc4928c97 100644
--- a/Aaru.Images/BLU/Verify.cs
+++ b/Aaru.Images/BLU/Verify.cs
@@ -32,25 +32,24 @@
 
 using System.Collections.Generic;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Blu
 {
-    public sealed partial class Blu
+    // TODO: Check tag checksums
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress) => null;
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
     {
-        // TODO: Check tag checksums
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress) => null;
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
+        for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+            unknownLbas.Add(i);
 
-            for(ulong i = sectorAddress; i < sectorAddress + length; i++)
-                unknownLbas.Add(i);
-
-            return null;
-        }
+        return null;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BLU/Write.cs b/Aaru.Images/BLU/Write.cs
index eac72689d..03a27d2dc 100644
--- a/Aaru.Images/BLU/Write.cs
+++ b/Aaru.Images/BLU/Write.cs
@@ -43,163 +43,268 @@ using Aaru.Helpers;
 using Schemas;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Blu
 {
-    public sealed partial class Blu
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(sectors > 0xFFFFFF)
-            {
-                ErrorMessage = "Too many sectors";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(sectors > 0xFFFFFF)
         {
-            int longSectorSize = _imageInfo.MediaType == MediaType.PriamDataTower ? 536 : 532;
+            ErrorMessage = "Too many sectors";
 
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+            return false;
+        }
 
-                return false;
-            }
+        if(!SupportedMediaTypes.Contains(mediaType))
+        {
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
-            if(data.Length != 512)
-            {
+            return false;
+        }
+
+        _imageInfo = new ImageInfo
+        {
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
+            return false;
+        }
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        int longSectorSize = _imageInfo.MediaType == MediaType.PriamDataTower ? 536 : 532;
+
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != 512)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        int longSectorSize = _imageInfo.MediaType == MediaType.PriamDataTower ? 536 : 532;
+
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % 512 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        int longSectorSize = _imageInfo.MediaType == MediaType.PriamDataTower ? 536 : 532;
+
+        byte[] oldTag;
+        byte[] newTag;
+
+        switch(data.Length - 512)
+        {
+            // Sony tag, convert to Profile
+            case 12 when longSectorSize == 532:
+                oldTag = new byte[12];
+                Array.Copy(data, 512, oldTag, 0, 12);
+                newTag = LisaTag.DecodeSonyTag(oldTag)?.ToProfile().GetBytes();
+
+                break;
+
+            // Sony tag, convert to Priam
+            case 12:
+                oldTag = new byte[12];
+                Array.Copy(data, 512, oldTag, 0, 12);
+                newTag = LisaTag.DecodeSonyTag(oldTag)?.ToPriam().GetBytes();
+
+                break;
+
+            // Profile tag, copy to Profile
+            case 20 when longSectorSize == 532:
+                newTag = new byte[20];
+                Array.Copy(data, 512, newTag, 0, 20);
+
+                break;
+
+            // Profile tag, convert to Priam
+            case 20:
+                oldTag = new byte[20];
+                Array.Copy(data, 512, oldTag, 0, 20);
+                newTag = LisaTag.DecodeProfileTag(oldTag)?.ToPriam().GetBytes();
+
+                break;
+
+            // Priam tag, convert to Profile
+            case 24 when longSectorSize == 532:
+                oldTag = new byte[24];
+                Array.Copy(data, 512, oldTag, 0, 24);
+                newTag = LisaTag.DecodePriamTag(oldTag)?.ToProfile().GetBytes();
+
+                break;
+
+            // Priam tag, copy to Priam
+            case 24:
+                newTag = new byte[24];
+                Array.Copy(data, 512, newTag, 0, 24);
+
+                break;
+            case 0:
+                newTag = null;
+
+                break;
+            default:
                 ErrorMessage = "Incorrect data size";
 
                 return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+        newTag ??= new byte[longSectorSize - 512];
+
+        _writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, 512);
+        _writingStream.Write(newTag, 0, newTag.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
         {
-            int longSectorSize = _imageInfo.MediaType == MediaType.PriamDataTower ? 536 : 532;
+            ErrorMessage = "Tried to write on a non-writable image";
 
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+            return false;
+        }
 
-                return false;
-            }
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
 
-            if(data.Length % 512 != 0)
-            {
+            return false;
+        }
+
+        int  longSectorSize  = _imageInfo.MediaType == MediaType.PriamDataTower ? 536 : 532;
+        long givenSectorSize = data.Length / length;
+
+        switch(givenSectorSize)
+        {
+            case 536:
+            case 532:
+            case 524:
+            case 512: break;
+            default:
                 ErrorMessage = "Incorrect data size";
 
                 return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+        for(uint i = 0; i < length; i++)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            int longSectorSize = _imageInfo.MediaType == MediaType.PriamDataTower ? 536 : 532;
-
             byte[] oldTag;
             byte[] newTag;
 
-            switch(data.Length - 512)
+            switch(givenSectorSize - 512)
             {
                 // Sony tag, convert to Profile
                 case 12 when longSectorSize == 532:
                     oldTag = new byte[12];
-                    Array.Copy(data, 512, oldTag, 0, 12);
+                    Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 12);
                     newTag = LisaTag.DecodeSonyTag(oldTag)?.ToProfile().GetBytes();
 
                     break;
@@ -207,7 +312,7 @@ namespace Aaru.DiscImages
                 // Sony tag, convert to Priam
                 case 12:
                     oldTag = new byte[12];
-                    Array.Copy(data, 512, oldTag, 0, 12);
+                    Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 12);
                     newTag = LisaTag.DecodeSonyTag(oldTag)?.ToPriam().GetBytes();
 
                     break;
@@ -215,14 +320,14 @@ namespace Aaru.DiscImages
                 // Profile tag, copy to Profile
                 case 20 when longSectorSize == 532:
                     newTag = new byte[20];
-                    Array.Copy(data, 512, newTag, 0, 20);
+                    Array.Copy(data, (givenSectorSize * i) + 512, newTag, 0, 20);
 
                     break;
 
                 // Profile tag, convert to Priam
                 case 20:
                     oldTag = new byte[20];
-                    Array.Copy(data, 512, oldTag, 0, 20);
+                    Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 20);
                     newTag = LisaTag.DecodeProfileTag(oldTag)?.ToPriam().GetBytes();
 
                     break;
@@ -230,7 +335,7 @@ namespace Aaru.DiscImages
                 // Priam tag, convert to Profile
                 case 24 when longSectorSize == 532:
                     oldTag = new byte[24];
-                    Array.Copy(data, 512, oldTag, 0, 24);
+                    Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 24);
                     newTag = LisaTag.DecodePriamTag(oldTag)?.ToProfile().GetBytes();
 
                     break;
@@ -238,7 +343,7 @@ namespace Aaru.DiscImages
                 // Priam tag, copy to Priam
                 case 24:
                     newTag = new byte[24];
-                    Array.Copy(data, 512, newTag, 0, 24);
+                    Array.Copy(data, (givenSectorSize * i) + 512, newTag, 0, 24);
 
                     break;
                 case 0:
@@ -254,207 +359,101 @@ namespace Aaru.DiscImages
             newTag ??= new byte[longSectorSize - 512];
 
             _writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, 512);
+            _writingStream.Write(data, (int)(givenSectorSize          * i), 512);
             _writingStream.Write(newTag, 0, newTag.Length);
-
-            ErrorMessage = "";
-
-            return true;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+        ErrorMessage = "";
 
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            int  longSectorSize  = _imageInfo.MediaType == MediaType.PriamDataTower ? 536 : 532;
-            long givenSectorSize = data.Length / length;
-
-            switch(givenSectorSize)
-            {
-                case 536:
-                case 532:
-                case 524:
-                case 512: break;
-                default:
-                    ErrorMessage = "Incorrect data size";
-
-                    return false;
-            }
-
-            for(uint i = 0; i < length; i++)
-            {
-                byte[] oldTag;
-                byte[] newTag;
-
-                switch(givenSectorSize - 512)
-                {
-                    // Sony tag, convert to Profile
-                    case 12 when longSectorSize == 532:
-                        oldTag = new byte[12];
-                        Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 12);
-                        newTag = LisaTag.DecodeSonyTag(oldTag)?.ToProfile().GetBytes();
-
-                        break;
-
-                    // Sony tag, convert to Priam
-                    case 12:
-                        oldTag = new byte[12];
-                        Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 12);
-                        newTag = LisaTag.DecodeSonyTag(oldTag)?.ToPriam().GetBytes();
-
-                        break;
-
-                    // Profile tag, copy to Profile
-                    case 20 when longSectorSize == 532:
-                        newTag = new byte[20];
-                        Array.Copy(data, (givenSectorSize * i) + 512, newTag, 0, 20);
-
-                        break;
-
-                    // Profile tag, convert to Priam
-                    case 20:
-                        oldTag = new byte[20];
-                        Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 20);
-                        newTag = LisaTag.DecodeProfileTag(oldTag)?.ToPriam().GetBytes();
-
-                        break;
-
-                    // Priam tag, convert to Profile
-                    case 24 when longSectorSize == 532:
-                        oldTag = new byte[24];
-                        Array.Copy(data, (givenSectorSize * i) + 512, oldTag, 0, 24);
-                        newTag = LisaTag.DecodePriamTag(oldTag)?.ToProfile().GetBytes();
-
-                        break;
-
-                    // Priam tag, copy to Priam
-                    case 24:
-                        newTag = new byte[24];
-                        Array.Copy(data, (givenSectorSize * i) + 512, newTag, 0, 24);
-
-                        break;
-                    case 0:
-                        newTag = null;
-
-                        break;
-                    default:
-                        ErrorMessage = "Incorrect data size";
-
-                        return false;
-                }
-
-                newTag ??= new byte[longSectorSize - 512];
-
-                _writingStream.Seek(longSectorSize + ((long)sectorAddress * longSectorSize), SeekOrigin.Begin);
-                _writingStream.Write(data, (int)(givenSectorSize          * i), 512);
-                _writingStream.Write(newTag, 0, newTag.Length);
-            }
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            byte[] markerTag = Encoding.UTF8.GetBytes("Aaru " + Version.GetVersion());
-            byte[] driveName;
-            byte[] driveType      = new byte[3];
-            byte[] driveBlocks    = BigEndianBitConverter.GetBytes((uint)_imageInfo.Sectors);
-            int    longSectorSize = _imageInfo.MediaType == MediaType.PriamDataTower ? 536 : 532;
-            byte[] blockSize      = BigEndianBitConverter.GetBytes((ushort)longSectorSize);
-
-            switch(_imageInfo.MediaType)
-            {
-                case MediaType.AppleProfile when _imageInfo.Sectors == 0x4C00:
-                    driveName = Encoding.ASCII.GetBytes(PROFILE10_NAME);
-
-                    break;
-                case MediaType.AppleWidget when _imageInfo.Sectors == 0x4C00:
-                    driveType[1] = 0x01;
-                    driveName    = Encoding.ASCII.GetBytes(PROFILE10_NAME);
-
-                    break;
-                case MediaType.PriamDataTower when _imageInfo.Sectors == 0x22C7C:
-                    driveType[1] = 0xFF;
-                    driveName    = Encoding.ASCII.GetBytes(PRIAM_NAME);
-
-                    break;
-                default:
-                    driveName = Encoding.ASCII.GetBytes(PROFILE_NAME);
-
-                    break;
-            }
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(driveName, 0, driveName.Length >= 0xD ? 0xD : driveName.Length);
-            _writingStream.Seek(0xD, SeekOrigin.Begin);
-            _writingStream.Write(driveType, 0, 3);
-            _writingStream.Seek(0x12, SeekOrigin.Begin);
-            _writingStream.Write(driveBlocks, 1, 3);
-            _writingStream.Seek(0x15, SeekOrigin.Begin);
-            _writingStream.Write(blockSize, 1, 2);
-            _writingStream.Seek(512, SeekOrigin.Begin);
-
-            _writingStream.Write(markerTag, 0,
-                                 markerTag.Length >= longSectorSize - 512 ? longSectorSize - 512 : markerTag.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        byte[] markerTag = Encoding.UTF8.GetBytes("Aaru " + Version.GetVersion());
+        byte[] driveName;
+        byte[] driveType      = new byte[3];
+        byte[] driveBlocks    = BigEndianBitConverter.GetBytes((uint)_imageInfo.Sectors);
+        int    longSectorSize = _imageInfo.MediaType == MediaType.PriamDataTower ? 536 : 532;
+        byte[] blockSize      = BigEndianBitConverter.GetBytes((ushort)longSectorSize);
+
+        switch(_imageInfo.MediaType)
+        {
+            case MediaType.AppleProfile when _imageInfo.Sectors == 0x4C00:
+                driveName = Encoding.ASCII.GetBytes(PROFILE10_NAME);
+
+                break;
+            case MediaType.AppleWidget when _imageInfo.Sectors == 0x4C00:
+                driveType[1] = 0x01;
+                driveName    = Encoding.ASCII.GetBytes(PROFILE10_NAME);
+
+                break;
+            case MediaType.PriamDataTower when _imageInfo.Sectors == 0x22C7C:
+                driveType[1] = 0xFF;
+                driveName    = Encoding.ASCII.GetBytes(PRIAM_NAME);
+
+                break;
+            default:
+                driveName = Encoding.ASCII.GetBytes(PROFILE_NAME);
+
+                break;
+        }
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(driveName, 0, driveName.Length >= 0xD ? 0xD : driveName.Length);
+        _writingStream.Seek(0xD, SeekOrigin.Begin);
+        _writingStream.Write(driveType, 0, 3);
+        _writingStream.Seek(0x12, SeekOrigin.Begin);
+        _writingStream.Write(driveBlocks, 1, 3);
+        _writingStream.Seek(0x15, SeekOrigin.Begin);
+        _writingStream.Write(blockSize, 1, 2);
+        _writingStream.Seek(512, SeekOrigin.Begin);
+
+        _writingStream.Write(markerTag, 0,
+                             markerTag.Length >= longSectorSize - 512 ? longSectorSize - 512 : markerTag.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/BlindWrite4.cs b/Aaru.Images/BlindWrite4/BlindWrite4.cs
index e8591aff4..3c8ff1fb8 100644
--- a/Aaru.Images/BlindWrite4/BlindWrite4.cs
+++ b/Aaru.Images/BlindWrite4/BlindWrite4.cs
@@ -36,40 +36,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    // TODO: Too many unknowns, plus a completely unknown footer, to make this writable
-    /// <inheritdoc />
-    /// <summary>Implements reading BlindWrite 4 disc images</summary>
-    public sealed partial class BlindWrite4 : IOpticalMediaImage
-    {
-        List<TrackDescriptor>   _bwTracks;
-        IFilter                 _dataFilter, _subFilter;
-        Header                  _header;
-        ImageInfo               _imageInfo;
-        Stream                  _imageStream;
-        Dictionary<uint, ulong> _offsetMap;
-        Dictionary<uint, byte>  _trackFlags;
+namespace Aaru.DiscImages;
 
-        public BlindWrite4() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = true,
-            HasSessions           = true,
-            Version               = null,
-            ApplicationVersion    = null,
-            MediaTitle            = null,
-            Creator               = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: Too many unknowns, plus a completely unknown footer, to make this writable
+/// <inheritdoc />
+/// <summary>Implements reading BlindWrite 4 disc images</summary>
+public sealed partial class BlindWrite4 : IOpticalMediaImage
+{
+    List<TrackDescriptor>   _bwTracks;
+    IFilter                 _dataFilter, _subFilter;
+    Header                  _header;
+    ImageInfo               _imageInfo;
+    Stream                  _imageStream;
+    Dictionary<uint, ulong> _offsetMap;
+    Dictionary<uint, byte>  _trackFlags;
+
+    public BlindWrite4() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = true,
+        HasSessions           = true,
+        Version               = null,
+        ApplicationVersion    = null,
+        MediaTitle            = null,
+        Creator               = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/Constants.cs b/Aaru.Images/BlindWrite4/Constants.cs
index 6efc163d8..2a2064247 100644
--- a/Aaru.Images/BlindWrite4/Constants.cs
+++ b/Aaru.Images/BlindWrite4/Constants.cs
@@ -30,15 +30,14 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite4
 {
-    public sealed partial class BlindWrite4
+    /// <summary>"BLINDWRITE TOC FILE"</summary>
+    readonly byte[] _bw4Signature =
     {
-        /// <summary>"BLINDWRITE TOC FILE"</summary>
-        readonly byte[] _bw4Signature =
-        {
-            0x42, 0x4C, 0x49, 0x4E, 0x44, 0x57, 0x52, 0x49, 0x54, 0x45, 0x20, 0x54, 0x4F, 0x43, 0x20, 0x46, 0x49, 0x4C,
-            0x45
-        };
-    }
+        0x42, 0x4C, 0x49, 0x4E, 0x44, 0x57, 0x52, 0x49, 0x54, 0x45, 0x20, 0x54, 0x4F, 0x43, 0x20, 0x46, 0x49, 0x4C,
+        0x45
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/Enums.cs b/Aaru.Images/BlindWrite4/Enums.cs
index be207e843..bd9bde985 100644
--- a/Aaru.Images/BlindWrite4/Enums.cs
+++ b/Aaru.Images/BlindWrite4/Enums.cs
@@ -30,13 +30,12 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite4
 {
-    public sealed partial class BlindWrite4
+    enum TrackType : byte
     {
-        enum TrackType : byte
-        {
-            Audio = 0, Mode1 = 1, Mode2 = 2
-        }
+        Audio = 0, Mode1 = 1, Mode2 = 2
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/Identify.cs b/Aaru.Images/BlindWrite4/Identify.cs
index 304b3dacd..98b423a09 100644
--- a/Aaru.Images/BlindWrite4/Identify.cs
+++ b/Aaru.Images/BlindWrite4/Identify.cs
@@ -34,23 +34,22 @@ using System.IO;
 using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite4
 {
-    public sealed partial class BlindWrite4
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 19)
-                return false;
+        if(stream.Length < 19)
+            return false;
 
-            byte[] signature = new byte[19];
-            stream.Read(signature, 0, 19);
+        byte[] signature = new byte[19];
+        stream.Read(signature, 0, 19);
 
-            return _bw4Signature.SequenceEqual(signature);
-        }
+        return _bw4Signature.SequenceEqual(signature);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/Properties.cs b/Aaru.Images/BlindWrite4/Properties.cs
index 32d90fc42..0b2e3c828 100644
--- a/Aaru.Images/BlindWrite4/Properties.cs
+++ b/Aaru.Images/BlindWrite4/Properties.cs
@@ -36,33 +36,32 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite4
 {
-    public sealed partial class BlindWrite4
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
 
-        /// <inheritdoc />
-        public string Name => "BlindWrite 4";
-        /// <inheritdoc />
-        public Guid Id => new Guid("664568B2-15D4-4E64-8A7A-20BDA8B8386F");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "BlindWrite 4 TOC file";
+    /// <inheritdoc />
+    public string Name => "BlindWrite 4";
+    /// <inheritdoc />
+    public Guid Id => new Guid("664568B2-15D4-4E64-8A7A-20BDA8B8386F");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "BlindWrite 4 TOC file";
 
-        /// <inheritdoc />
-        public List<Partition> Partitions { get; set; }
+    /// <inheritdoc />
+    public List<Partition> Partitions { get; set; }
 
-        /// <inheritdoc />
-        public List<Track> Tracks { get; set; }
+    /// <inheritdoc />
+    public List<Track> Tracks { get; set; }
 
-        /// <inheritdoc />
-        public List<Session> Sessions { get; set; }
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public List<Session> Sessions { get; set; }
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/Read.cs b/Aaru.Images/BlindWrite4/Read.cs
index 41d50b3d2..9a393a0db 100644
--- a/Aaru.Images/BlindWrite4/Read.cs
+++ b/Aaru.Images/BlindWrite4/Read.cs
@@ -45,1206 +45,1205 @@ using Aaru.Decoders.CD;
 using Aaru.Helpers;
 using Session = Aaru.CommonTypes.Structs.Session;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite4
 {
-    public sealed partial class BlindWrite4
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 19)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] tmpArray  = new byte[19];
+        byte[] tmpUShort = new byte[2];
+        byte[] tmpUInt   = new byte[4];
+        byte[] tmpULong  = new byte[8];
+
+        stream.Read(tmpArray, 0, 19);
+
+        if(!_bw4Signature.SequenceEqual(tmpArray))
+            return ErrorNumber.InvalidArgument;
+
+        _header = new Header
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            Signature = tmpArray
+        };
 
-            if(stream.Length < 19)
-                return ErrorNumber.InvalidArgument;
+        // Seems to always be 2
+        stream.Read(tmpUInt, 0, 4);
+        _header.Unknown1 = BitConverter.ToUInt32(tmpUInt, 0);
 
-            byte[] tmpArray  = new byte[19];
-            byte[] tmpUShort = new byte[2];
-            byte[] tmpUInt   = new byte[4];
-            byte[] tmpULong  = new byte[8];
+        // Seems to be a timetamp
+        stream.Read(tmpULong, 0, 8);
+        _header.Timestamp = BitConverter.ToUInt64(tmpULong, 0);
 
-            stream.Read(tmpArray, 0, 19);
+        stream.Read(tmpUInt, 0, 4);
+        _header.VolumeIdLength = BitConverter.ToUInt32(tmpUInt, 0);
+        tmpArray               = new byte[_header.VolumeIdLength];
+        stream.Read(tmpArray, 0, tmpArray.Length);
+        _header.VolumeIdBytes    = tmpArray;
+        _header.VolumeIdentifier = StringHandlers.CToString(_header.VolumeIdBytes, Encoding.Default);
 
-            if(!_bw4Signature.SequenceEqual(tmpArray))
-                return ErrorNumber.InvalidArgument;
+        stream.Read(tmpUInt, 0, 4);
+        _header.SysIdLength = BitConverter.ToUInt32(tmpUInt, 0);
+        tmpArray            = new byte[_header.SysIdLength];
+        stream.Read(tmpArray, 0, tmpArray.Length);
+        _header.SysIdBytes       = tmpArray;
+        _header.SystemIdentifier = StringHandlers.CToString(_header.SysIdBytes, Encoding.Default);
 
-            _header = new Header
+        stream.Read(tmpUInt, 0, 4);
+        _header.CommentsLength = BitConverter.ToUInt32(tmpUInt, 0);
+        tmpArray               = new byte[_header.CommentsLength];
+        stream.Read(tmpArray, 0, tmpArray.Length);
+        _header.CommentsBytes = tmpArray;
+        _header.Comments      = StringHandlers.CToString(_header.CommentsBytes, Encoding.Default);
+
+        stream.Read(tmpUInt, 0, 4);
+        _header.TrackDescriptors = BitConverter.ToUInt32(tmpUInt, 0);
+
+        stream.Read(tmpUInt, 0, 4);
+        _header.DataFileLength = BitConverter.ToUInt32(tmpUInt, 0);
+        tmpArray               = new byte[_header.DataFileLength];
+        stream.Read(tmpArray, 0, tmpArray.Length);
+        _header.DataFileBytes = tmpArray;
+        _header.DataFile      = StringHandlers.CToString(_header.DataFileBytes, Encoding.Default);
+
+        stream.Read(tmpUInt, 0, 4);
+        _header.SubchannelFileLength = BitConverter.ToUInt32(tmpUInt, 0);
+        tmpArray                     = new byte[_header.SubchannelFileLength];
+        stream.Read(tmpArray, 0, tmpArray.Length);
+        _header.SubchannelFileBytes = tmpArray;
+        _header.SubchannelFile      = StringHandlers.CToString(_header.SubchannelFileBytes, Encoding.Default);
+
+        stream.Read(tmpUInt, 0, 4);
+        _header.Unknown2 = BitConverter.ToUInt32(tmpUInt, 0);
+        _header.Unknown3 = (byte)stream.ReadByte();
+        tmpArray         = new byte[_header.Unknown3];
+        stream.Read(tmpArray, 0, _header.Unknown3);
+        _header.Unknown4 = tmpArray;
+
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.signature = {0}",
+                                   StringHandlers.CToString(_header.Signature));
+
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown1 = {0}", _header.Unknown1);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.timestamp = {0}", _header.Timestamp);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.volumeIdLength = {0}", _header.VolumeIdLength);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.volumeIdentifier = {0}", _header.VolumeIdentifier);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.sysIdLength = {0}", _header.SysIdLength);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.systemIdentifier = {0}", _header.SystemIdentifier);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.commentsLength = {0}", _header.CommentsLength);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.comments = {0}", _header.Comments);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.trackDescriptors = {0}", _header.TrackDescriptors);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.dataFileLength = {0}", _header.DataFileLength);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.dataFilter = {0}", _header.DataFilter);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.dataFile = {0}", _header.DataFile);
+
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFileLength = {0}",
+                                   _header.SubchannelFileLength);
+
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFilter = {0}", _header.SubchannelFilter);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFile = {0}", _header.SubchannelFile);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown2 = {0}", _header.Unknown2);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown3 = {0}", _header.Unknown3);
+        AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown4.Length = {0}", _header.Unknown4.Length);
+
+        _bwTracks = new List<TrackDescriptor>();
+
+        for(int i = 0; i < _header.TrackDescriptors; i++)
+        {
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "stream.Position = {0}", stream.Position);
+
+            var track = new TrackDescriptor();
+
+            stream.Read(tmpUInt, 0, 4);
+            track.filenameLen = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray          = new byte[track.filenameLen];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.filenameBytes = tmpArray;
+            track.filename      = StringHandlers.CToString(track.filenameBytes, Encoding.Default);
+
+            stream.Read(tmpUInt, 0, 4);
+            track.offset     = BitConverter.ToUInt32(tmpUInt, 0);
+            track.subchannel = (byte)stream.ReadByte();
+
+            tmpArray = new byte[3];
+            stream.Read(tmpArray, 0, 3);
+            track.unknown1 = tmpArray;
+
+            stream.Read(tmpUInt, 0, 4);
+            track.unknown2 = BitConverter.ToUInt32(tmpUInt, 0);
+            track.unknown3 = (byte)stream.ReadByte();
+            track.session  = (byte)stream.ReadByte();
+            track.unknown4 = (byte)stream.ReadByte();
+            track.adrCtl   = (byte)stream.ReadByte();
+
+            track.unknown5  = (byte)stream.ReadByte();
+            track.trackMode = (TrackType)stream.ReadByte();
+            track.unknown6  = (byte)stream.ReadByte();
+            track.point     = (byte)stream.ReadByte();
+
+            stream.Read(tmpUInt, 0, 4);
+            track.unknown7 = BitConverter.ToUInt32(tmpUInt, 0);
+            stream.Read(tmpUInt, 0, 4);
+            track.unknown8 = BitConverter.ToUInt32(tmpUInt, 0);
+            stream.Read(tmpUInt, 0, 4);
+            track.pregapOffsetAdjustment = BitConverter.ToUInt32(tmpUInt, 0);
+            stream.Read(tmpUInt, 0, 4);
+            track.unknown10 = BitConverter.ToUInt32(tmpUInt, 0);
+            stream.Read(tmpUShort, 0, 2);
+            track.unknown11 = BitConverter.ToUInt16(tmpUShort, 0);
+            stream.Read(tmpUInt, 0, 4);
+            track.lastSector = BitConverter.ToUInt32(tmpUInt, 0);
+            track.unknown12  = (byte)stream.ReadByte();
+
+            // This is off by one
+            track.lastSector--;
+
+            stream.Read(tmpUInt, 0, 4);
+            track.pregap = BitConverter.ToInt32(tmpUInt, 0);
+            stream.Read(tmpUInt, 0, 4);
+            track.startSector = BitConverter.ToInt32(tmpUInt, 0);
+
+            track.unknown13 = new uint[2];
+
+            for(int j = 0; j < track.unknown13.Length; j++)
             {
-                Signature = tmpArray
-            };
-
-            // Seems to always be 2
-            stream.Read(tmpUInt, 0, 4);
-            _header.Unknown1 = BitConverter.ToUInt32(tmpUInt, 0);
-
-            // Seems to be a timetamp
-            stream.Read(tmpULong, 0, 8);
-            _header.Timestamp = BitConverter.ToUInt64(tmpULong, 0);
-
-            stream.Read(tmpUInt, 0, 4);
-            _header.VolumeIdLength = BitConverter.ToUInt32(tmpUInt, 0);
-            tmpArray               = new byte[_header.VolumeIdLength];
-            stream.Read(tmpArray, 0, tmpArray.Length);
-            _header.VolumeIdBytes    = tmpArray;
-            _header.VolumeIdentifier = StringHandlers.CToString(_header.VolumeIdBytes, Encoding.Default);
-
-            stream.Read(tmpUInt, 0, 4);
-            _header.SysIdLength = BitConverter.ToUInt32(tmpUInt, 0);
-            tmpArray            = new byte[_header.SysIdLength];
-            stream.Read(tmpArray, 0, tmpArray.Length);
-            _header.SysIdBytes       = tmpArray;
-            _header.SystemIdentifier = StringHandlers.CToString(_header.SysIdBytes, Encoding.Default);
-
-            stream.Read(tmpUInt, 0, 4);
-            _header.CommentsLength = BitConverter.ToUInt32(tmpUInt, 0);
-            tmpArray               = new byte[_header.CommentsLength];
-            stream.Read(tmpArray, 0, tmpArray.Length);
-            _header.CommentsBytes = tmpArray;
-            _header.Comments      = StringHandlers.CToString(_header.CommentsBytes, Encoding.Default);
-
-            stream.Read(tmpUInt, 0, 4);
-            _header.TrackDescriptors = BitConverter.ToUInt32(tmpUInt, 0);
-
-            stream.Read(tmpUInt, 0, 4);
-            _header.DataFileLength = BitConverter.ToUInt32(tmpUInt, 0);
-            tmpArray               = new byte[_header.DataFileLength];
-            stream.Read(tmpArray, 0, tmpArray.Length);
-            _header.DataFileBytes = tmpArray;
-            _header.DataFile      = StringHandlers.CToString(_header.DataFileBytes, Encoding.Default);
-
-            stream.Read(tmpUInt, 0, 4);
-            _header.SubchannelFileLength = BitConverter.ToUInt32(tmpUInt, 0);
-            tmpArray                     = new byte[_header.SubchannelFileLength];
-            stream.Read(tmpArray, 0, tmpArray.Length);
-            _header.SubchannelFileBytes = tmpArray;
-            _header.SubchannelFile      = StringHandlers.CToString(_header.SubchannelFileBytes, Encoding.Default);
-
-            stream.Read(tmpUInt, 0, 4);
-            _header.Unknown2 = BitConverter.ToUInt32(tmpUInt, 0);
-            _header.Unknown3 = (byte)stream.ReadByte();
-            tmpArray         = new byte[_header.Unknown3];
-            stream.Read(tmpArray, 0, _header.Unknown3);
-            _header.Unknown4 = tmpArray;
-
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.signature = {0}",
-                                       StringHandlers.CToString(_header.Signature));
-
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown1 = {0}", _header.Unknown1);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.timestamp = {0}", _header.Timestamp);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.volumeIdLength = {0}", _header.VolumeIdLength);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.volumeIdentifier = {0}", _header.VolumeIdentifier);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.sysIdLength = {0}", _header.SysIdLength);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.systemIdentifier = {0}", _header.SystemIdentifier);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.commentsLength = {0}", _header.CommentsLength);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.comments = {0}", _header.Comments);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.trackDescriptors = {0}", _header.TrackDescriptors);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.dataFileLength = {0}", _header.DataFileLength);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.dataFilter = {0}", _header.DataFilter);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.dataFile = {0}", _header.DataFile);
-
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFileLength = {0}",
-                                       _header.SubchannelFileLength);
-
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFilter = {0}", _header.SubchannelFilter);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.subchannelFile = {0}", _header.SubchannelFile);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown2 = {0}", _header.Unknown2);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown3 = {0}", _header.Unknown3);
-            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "header.unknown4.Length = {0}", _header.Unknown4.Length);
-
-            _bwTracks = new List<TrackDescriptor>();
-
-            for(int i = 0; i < _header.TrackDescriptors; i++)
-            {
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "stream.Position = {0}", stream.Position);
-
-                var track = new TrackDescriptor();
-
                 stream.Read(tmpUInt, 0, 4);
-                track.filenameLen = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray          = new byte[track.filenameLen];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.filenameBytes = tmpArray;
-                track.filename      = StringHandlers.CToString(track.filenameBytes, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.offset     = BitConverter.ToUInt32(tmpUInt, 0);
-                track.subchannel = (byte)stream.ReadByte();
-
-                tmpArray = new byte[3];
-                stream.Read(tmpArray, 0, 3);
-                track.unknown1 = tmpArray;
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unknown2 = BitConverter.ToUInt32(tmpUInt, 0);
-                track.unknown3 = (byte)stream.ReadByte();
-                track.session  = (byte)stream.ReadByte();
-                track.unknown4 = (byte)stream.ReadByte();
-                track.adrCtl   = (byte)stream.ReadByte();
-
-                track.unknown5  = (byte)stream.ReadByte();
-                track.trackMode = (TrackType)stream.ReadByte();
-                track.unknown6  = (byte)stream.ReadByte();
-                track.point     = (byte)stream.ReadByte();
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unknown7 = BitConverter.ToUInt32(tmpUInt, 0);
-                stream.Read(tmpUInt, 0, 4);
-                track.unknown8 = BitConverter.ToUInt32(tmpUInt, 0);
-                stream.Read(tmpUInt, 0, 4);
-                track.pregapOffsetAdjustment = BitConverter.ToUInt32(tmpUInt, 0);
-                stream.Read(tmpUInt, 0, 4);
-                track.unknown10 = BitConverter.ToUInt32(tmpUInt, 0);
-                stream.Read(tmpUShort, 0, 2);
-                track.unknown11 = BitConverter.ToUInt16(tmpUShort, 0);
-                stream.Read(tmpUInt, 0, 4);
-                track.lastSector = BitConverter.ToUInt32(tmpUInt, 0);
-                track.unknown12  = (byte)stream.ReadByte();
-
-                // This is off by one
-                track.lastSector--;
-
-                stream.Read(tmpUInt, 0, 4);
-                track.pregap = BitConverter.ToInt32(tmpUInt, 0);
-                stream.Read(tmpUInt, 0, 4);
-                track.startSector = BitConverter.ToInt32(tmpUInt, 0);
-
-                track.unknown13 = new uint[2];
-
-                for(int j = 0; j < track.unknown13.Length; j++)
-                {
-                    stream.Read(tmpUInt, 0, 4);
-                    track.unknown13[j] = BitConverter.ToUInt32(tmpUInt, 0);
-                }
-
-                stream.Read(tmpUInt, 0, 4);
-                track.titleLen = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray       = new byte[track.titleLen];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.titleBytes = tmpArray;
-                track.title      = StringHandlers.CToString(track.titleBytes, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.performerLen = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray           = new byte[track.performerLen];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.performerBytes = tmpArray;
-                track.performer      = StringHandlers.CToString(track.performerBytes, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen1 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray         = new byte[track.unkStrLen1];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes1 = tmpArray;
-                track.unkString1   = StringHandlers.CToString(track.unkStrBytes1, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen2 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray         = new byte[track.unkStrLen2];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes2 = tmpArray;
-                track.unkString2   = StringHandlers.CToString(track.unkStrBytes2, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen3 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray         = new byte[track.unkStrLen3];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes3 = tmpArray;
-                track.unkString3   = StringHandlers.CToString(track.unkStrBytes3, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen4 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray         = new byte[track.unkStrLen4];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes4 = tmpArray;
-                track.unkString4   = StringHandlers.CToString(track.unkStrBytes4, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.discIdLen = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray        = new byte[track.discIdLen];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.discIdBytes = tmpArray;
-                track.discId      = StringHandlers.CToString(track.discIdBytes, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen5 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray         = new byte[track.unkStrLen5];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes5 = tmpArray;
-                track.unkString5   = StringHandlers.CToString(track.unkStrBytes5, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen6 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray         = new byte[track.unkStrLen6];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes6 = tmpArray;
-                track.unkString6   = StringHandlers.CToString(track.unkStrBytes6, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen7 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray         = new byte[track.unkStrLen7];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes7 = tmpArray;
-                track.unkString7   = StringHandlers.CToString(track.unkStrBytes7, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen8 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray         = new byte[track.unkStrLen8];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes8 = tmpArray;
-                track.unkString8   = StringHandlers.CToString(track.unkStrBytes8, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen9 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray         = new byte[track.unkStrLen9];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes9 = tmpArray;
-                track.unkString9   = StringHandlers.CToString(track.unkStrBytes9, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen10 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray          = new byte[track.unkStrLen10];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes10 = tmpArray;
-                track.unkString10   = StringHandlers.CToString(track.unkStrBytes10, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.unkStrLen11 = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray          = new byte[track.unkStrLen11];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.unkStrBytes11 = tmpArray;
-                track.unkString11   = StringHandlers.CToString(track.unkStrBytes11, Encoding.Default);
-
-                stream.Read(tmpUInt, 0, 4);
-                track.isrcLen = BitConverter.ToUInt32(tmpUInt, 0);
-                tmpArray      = new byte[track.isrcLen];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                track.isrcBytes = tmpArray;
-                track.isrcUpc   = StringHandlers.CToString(track.isrcBytes, Encoding.Default);
-
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.filenameLen = {0}", track.filenameLen);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.filename = {0}", track.filename);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.offset = {0}", track.offset);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.subchannel = {0}", track.subchannel);
-
-                for(int j = 0; j < track.unknown1.Length; j++)
-                    AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown1[{1}] = 0x{0:X8}",
-                                               track.unknown1[j], j);
-
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown2 = {0}", track.unknown2);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown3 = {0}", track.unknown3);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.session = {0}", track.session);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown4 = {0}", track.unknown4);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.adrCtl = {0}", track.adrCtl);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown5 = {0}", track.unknown5);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.trackMode = {0}", track.trackMode);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown6 = {0}", track.unknown6);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.point = {0}", track.point);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown7 = {0}", track.unknown7);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown8 = {0}", track.unknown8);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown9 = {0}", track.pregapOffsetAdjustment);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown10 = {0}", track.unknown10);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown11 = {0}", track.unknown11);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.lastSector = {0}", track.lastSector);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown12 = {0}", track.unknown12);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.pregap = {0}", track.pregap);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.startSector = {0}", track.startSector);
-
-                for(int j = 0; j < track.unknown13.Length; j++)
-                    AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown13[{1}] = 0x{0:X8}",
-                                               track.unknown13[j], j);
-
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.titleLen = {0}", track.titleLen);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.title = {0}", track.title);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.performerLen = {0}", track.performerLen);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.performer = {0}", track.performer);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen1 = {0}", track.unkStrLen1);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString1 = {0}", track.unkString1);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen2 = {0}", track.unkStrLen2);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString2 = {0}", track.unkString2);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen3 = {0}", track.unkStrLen3);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString3 = {0}", track.unkString3);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen4 = {0}", track.unkStrLen4);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString4 = {0}", track.unkString4);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.discIdLen = {0}", track.discIdLen);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.discId = {0}", track.discId);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen5 = {0}", track.unkStrLen5);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString5 = {0}", track.unkString5);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen6 = {0}", track.unkStrLen6);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString6 = {0}", track.unkString6);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen7 = {0}", track.unkStrLen7);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString7 = {0}", track.unkString7);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen8 = {0}", track.unkStrLen8);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString8 = {0}", track.unkString8);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen9 = {0}", track.unkStrLen9);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString9 = {0}", track.unkString9);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen10 = {0}", track.unkStrLen10);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString10 = {0}", track.unkString10);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen11 = {0}", track.unkStrLen11);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString11 = {0}", track.unkString11);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.isrcLen = {0}", track.isrcLen);
-                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.isrcUpc = {0}", track.isrcUpc);
-
-                _bwTracks.Add(track);
+                track.unknown13[j] = BitConverter.ToUInt32(tmpUInt, 0);
             }
 
-            var filtersList = new FiltersList();
+            stream.Read(tmpUInt, 0, 4);
+            track.titleLen = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray       = new byte[track.titleLen];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.titleBytes = tmpArray;
+            track.title      = StringHandlers.CToString(track.titleBytes, Encoding.Default);
 
-            if(!string.IsNullOrEmpty(_header.DataFile))
-                while(true)
-                {
-                    _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile));
+            stream.Read(tmpUInt, 0, 4);
+            track.performerLen = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray           = new byte[track.performerLen];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.performerBytes = tmpArray;
+            track.performer      = StringHandlers.CToString(track.performerBytes, Encoding.Default);
 
-                    if(_dataFilter != null)
-                        break;
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen1 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray         = new byte[track.unkStrLen1];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes1 = tmpArray;
+            track.unkString1   = StringHandlers.CToString(track.unkStrBytes1, Encoding.Default);
 
-                    _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                     _header.DataFile.ToLower(CultureInfo.
-                                                                         CurrentCulture)));
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen2 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray         = new byte[track.unkStrLen2];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes2 = tmpArray;
+            track.unkString2   = StringHandlers.CToString(track.unkStrBytes2, Encoding.Default);
 
-                    if(_dataFilter != null)
-                        break;
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen3 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray         = new byte[track.unkStrLen3];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes3 = tmpArray;
+            track.unkString3   = StringHandlers.CToString(track.unkStrBytes3, Encoding.Default);
 
-                    _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                     _header.DataFile.ToUpper(CultureInfo.
-                                                                         CurrentCulture)));
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen4 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray         = new byte[track.unkStrLen4];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes4 = tmpArray;
+            track.unkString4   = StringHandlers.CToString(track.unkStrBytes4, Encoding.Default);
 
-                    if(_dataFilter != null)
-                        break;
+            stream.Read(tmpUInt, 0, 4);
+            track.discIdLen = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray        = new byte[track.discIdLen];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.discIdBytes = tmpArray;
+            track.discId      = StringHandlers.CToString(track.discIdBytes, Encoding.Default);
 
-                    _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.
-                                                                         Split(new[]
-                                                                         {
-                                                                             '\\'
-                                                                         }, StringSplitOptions.RemoveEmptyEntries).
-                                                                         Last()));
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen5 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray         = new byte[track.unkStrLen5];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes5 = tmpArray;
+            track.unkString5   = StringHandlers.CToString(track.unkStrBytes5, Encoding.Default);
 
-                    if(_dataFilter != null)
-                        break;
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen6 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray         = new byte[track.unkStrLen6];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes6 = tmpArray;
+            track.unkString6   = StringHandlers.CToString(track.unkStrBytes6, Encoding.Default);
 
-                    _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.
-                                                                         Split(new[]
-                                                                         {
-                                                                             '\\'
-                                                                         }, StringSplitOptions.RemoveEmptyEntries).
-                                                                         Last().ToLower(CultureInfo.CurrentCulture)));
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen7 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray         = new byte[track.unkStrLen7];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes7 = tmpArray;
+            track.unkString7   = StringHandlers.CToString(track.unkStrBytes7, Encoding.Default);
 
-                    if(_dataFilter != null)
-                        break;
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen8 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray         = new byte[track.unkStrLen8];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes8 = tmpArray;
+            track.unkString8   = StringHandlers.CToString(track.unkStrBytes8, Encoding.Default);
 
-                    _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.
-                                                                         Split(new[]
-                                                                         {
-                                                                             '\\'
-                                                                         }, StringSplitOptions.RemoveEmptyEntries).
-                                                                         Last().ToUpper(CultureInfo.CurrentCulture)));
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen9 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray         = new byte[track.unkStrLen9];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes9 = tmpArray;
+            track.unkString9   = StringHandlers.CToString(track.unkStrBytes9, Encoding.Default);
 
-                    if(_dataFilter != null)
-                        break;
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen10 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray          = new byte[track.unkStrLen10];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes10 = tmpArray;
+            track.unkString10   = StringHandlers.CToString(track.unkStrBytes10, Encoding.Default);
 
-                    AaruConsole.ErrorWriteLine($"Data file {_header.DataFile} not found");
+            stream.Read(tmpUInt, 0, 4);
+            track.unkStrLen11 = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray          = new byte[track.unkStrLen11];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.unkStrBytes11 = tmpArray;
+            track.unkString11   = StringHandlers.CToString(track.unkStrBytes11, Encoding.Default);
 
-                    return ErrorNumber.NoSuchFile;
-                }
-            else
+            stream.Read(tmpUInt, 0, 4);
+            track.isrcLen = BitConverter.ToUInt32(tmpUInt, 0);
+            tmpArray      = new byte[track.isrcLen];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            track.isrcBytes = tmpArray;
+            track.isrcUpc   = StringHandlers.CToString(track.isrcBytes, Encoding.Default);
+
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.filenameLen = {0}", track.filenameLen);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.filename = {0}", track.filename);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.offset = {0}", track.offset);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.subchannel = {0}", track.subchannel);
+
+            for(int j = 0; j < track.unknown1.Length; j++)
+                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown1[{1}] = 0x{0:X8}",
+                                           track.unknown1[j], j);
+
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown2 = {0}", track.unknown2);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown3 = {0}", track.unknown3);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.session = {0}", track.session);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown4 = {0}", track.unknown4);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.adrCtl = {0}", track.adrCtl);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown5 = {0}", track.unknown5);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.trackMode = {0}", track.trackMode);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown6 = {0}", track.unknown6);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.point = {0}", track.point);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown7 = {0}", track.unknown7);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown8 = {0}", track.unknown8);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown9 = {0}", track.pregapOffsetAdjustment);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown10 = {0}", track.unknown10);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown11 = {0}", track.unknown11);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.lastSector = {0}", track.lastSector);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown12 = {0}", track.unknown12);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.pregap = {0}", track.pregap);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.startSector = {0}", track.startSector);
+
+            for(int j = 0; j < track.unknown13.Length; j++)
+                AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unknown13[{1}] = 0x{0:X8}",
+                                           track.unknown13[j], j);
+
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.titleLen = {0}", track.titleLen);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.title = {0}", track.title);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.performerLen = {0}", track.performerLen);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.performer = {0}", track.performer);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen1 = {0}", track.unkStrLen1);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString1 = {0}", track.unkString1);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen2 = {0}", track.unkStrLen2);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString2 = {0}", track.unkString2);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen3 = {0}", track.unkStrLen3);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString3 = {0}", track.unkString3);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen4 = {0}", track.unkStrLen4);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString4 = {0}", track.unkString4);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.discIdLen = {0}", track.discIdLen);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.discId = {0}", track.discId);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen5 = {0}", track.unkStrLen5);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString5 = {0}", track.unkString5);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen6 = {0}", track.unkStrLen6);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString6 = {0}", track.unkString6);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen7 = {0}", track.unkStrLen7);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString7 = {0}", track.unkString7);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen8 = {0}", track.unkStrLen8);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString8 = {0}", track.unkString8);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen9 = {0}", track.unkStrLen9);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString9 = {0}", track.unkString9);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen10 = {0}", track.unkStrLen10);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString10 = {0}", track.unkString10);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkStrLen11 = {0}", track.unkStrLen11);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.unkString11 = {0}", track.unkString11);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.isrcLen = {0}", track.isrcLen);
+            AaruConsole.DebugWriteLine("BlindWrite4 plugin", "track.isrcUpc = {0}", track.isrcUpc);
+
+            _bwTracks.Add(track);
+        }
+
+        var filtersList = new FiltersList();
+
+        if(!string.IsNullOrEmpty(_header.DataFile))
+            while(true)
             {
-                AaruConsole.ErrorWriteLine("Unable to find data file");
+                _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile));
+
+                if(_dataFilter != null)
+                    break;
+
+                _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                 _header.DataFile.ToLower(CultureInfo.
+                                                                     CurrentCulture)));
+
+                if(_dataFilter != null)
+                    break;
+
+                _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                 _header.DataFile.ToUpper(CultureInfo.
+                                                                     CurrentCulture)));
+
+                if(_dataFilter != null)
+                    break;
+
+                _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.
+                                                                     Split(new[]
+                                                                     {
+                                                                         '\\'
+                                                                     }, StringSplitOptions.RemoveEmptyEntries).
+                                                                     Last()));
+
+                if(_dataFilter != null)
+                    break;
+
+                _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.
+                                                                     Split(new[]
+                                                                     {
+                                                                         '\\'
+                                                                     }, StringSplitOptions.RemoveEmptyEntries).
+                                                                     Last().ToLower(CultureInfo.CurrentCulture)));
+
+                if(_dataFilter != null)
+                    break;
+
+                _dataFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.DataFile.
+                                                                     Split(new[]
+                                                                     {
+                                                                         '\\'
+                                                                     }, StringSplitOptions.RemoveEmptyEntries).
+                                                                     Last().ToUpper(CultureInfo.CurrentCulture)));
+
+                if(_dataFilter != null)
+                    break;
+
+                AaruConsole.ErrorWriteLine($"Data file {_header.DataFile} not found");
 
                 return ErrorNumber.NoSuchFile;
             }
+        else
+        {
+            AaruConsole.ErrorWriteLine("Unable to find data file");
 
-            if(!string.IsNullOrEmpty(_header.SubchannelFile))
-            {
-                filtersList = new FiltersList();
+            return ErrorNumber.NoSuchFile;
+        }
 
-                _subFilter =
-                    ((((filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile)) ??
-                        filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                           _header.SubchannelFile.
-                                                                   ToLower(CultureInfo.CurrentCulture)))) ??
-                       filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                          _header.SubchannelFile.
-                                                                  ToUpper(CultureInfo.CurrentCulture)))) ??
-                      filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile.Split(new[]
-                      {
-                          '\\'
-                      }, StringSplitOptions.RemoveEmptyEntries).Last()))) ??
-                     filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile.Split(new[]
-                     {
-                         '\\'
-                     }, StringSplitOptions.RemoveEmptyEntries).Last().ToLower(CultureInfo.CurrentCulture)))) ??
-                    filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile.Split(new[]
-                    {
-                        '\\'
-                    }, StringSplitOptions.RemoveEmptyEntries).Last().ToUpper(CultureInfo.CurrentCulture)));
-            }
+        if(!string.IsNullOrEmpty(_header.SubchannelFile))
+        {
+            filtersList = new FiltersList();
 
-            Tracks      = new List<Track>();
-            Partitions  = new List<Partition>();
-            _offsetMap  = new Dictionary<uint, ulong>();
-            _trackFlags = new Dictionary<uint, byte>();
-            ushort maxSession = 0;
-
-            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-
-            foreach(TrackDescriptor bwTrack in _bwTracks)
-                if(bwTrack.point < 0xA0)
+            _subFilter =
+                ((((filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile)) ??
+                    filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                       _header.SubchannelFile.
+                                                               ToLower(CultureInfo.CurrentCulture)))) ??
+                   filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                      _header.SubchannelFile.
+                                                              ToUpper(CultureInfo.CurrentCulture)))) ??
+                  filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile.Split(new[]
+                  {
+                      '\\'
+                  }, StringSplitOptions.RemoveEmptyEntries).Last()))) ??
+                 filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile.Split(new[]
+                 {
+                     '\\'
+                 }, StringSplitOptions.RemoveEmptyEntries).Last().ToLower(CultureInfo.CurrentCulture)))) ??
+                filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, _header.SubchannelFile.Split(new[]
                 {
-                    var track = new Track
+                    '\\'
+                }, StringSplitOptions.RemoveEmptyEntries).Last().ToUpper(CultureInfo.CurrentCulture)));
+        }
+
+        Tracks      = new List<Track>();
+        Partitions  = new List<Partition>();
+        _offsetMap  = new Dictionary<uint, ulong>();
+        _trackFlags = new Dictionary<uint, byte>();
+        ushort maxSession = 0;
+
+        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+
+        foreach(TrackDescriptor bwTrack in _bwTracks)
+            if(bwTrack.point < 0xA0)
+            {
+                var track = new Track
+                {
+                    Description = bwTrack.title,
+                    EndSector   = bwTrack.lastSector
+                };
+
+                if(!string.IsNullOrEmpty(bwTrack.filename))
+                    do
                     {
-                        Description = bwTrack.title,
-                        EndSector   = bwTrack.lastSector
-                    };
+                        track.Filter =
+                            filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, bwTrack.filename));
 
-                    if(!string.IsNullOrEmpty(bwTrack.filename))
-                        do
-                        {
-                            track.Filter =
-                                filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, bwTrack.filename));
+                        if(track.Filter != null)
+                            break;
 
-                            if(track.Filter != null)
-                                break;
+                        track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                          bwTrack.filename.ToLower(CultureInfo.
+                                                                              CurrentCulture)));
 
-                            track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                              bwTrack.filename.ToLower(CultureInfo.
+                        if(track.Filter != null)
+                            break;
+
+                        track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                          bwTrack.filename.ToUpper(CultureInfo.
+                                                                              CurrentCulture)));
+
+                        if(track.Filter != null)
+                            break;
+
+                        track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                          bwTrack.filename.Split(new[]
+                                                                                  {
+                                                                                      '\\'
+                                                                                  },
+                                                                                  StringSplitOptions.
+                                                                                      RemoveEmptyEntries).
+                                                                              Last()));
+
+                        if(track.Filter != null)
+                            break;
+
+                        track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                          bwTrack.filename.Split(new[]
+                                                                                  {
+                                                                                      '\\'
+                                                                                  },
+                                                                                  StringSplitOptions.
+                                                                                      RemoveEmptyEntries).
+                                                                              Last().ToLower(CultureInfo.
                                                                                   CurrentCulture)));
 
-                            if(track.Filter != null)
-                                break;
+                        if(track.Filter != null)
+                            break;
 
-                            track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                              bwTrack.filename.ToUpper(CultureInfo.
+                        track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                          bwTrack.filename.Split(new[]
+                                                                                  {
+                                                                                      '\\'
+                                                                                  },
+                                                                                  StringSplitOptions.
+                                                                                      RemoveEmptyEntries).
+                                                                              Last().ToUpper(CultureInfo.
                                                                                   CurrentCulture)));
 
-                            if(track.Filter != null)
-                                break;
-
-                            track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                              bwTrack.filename.Split(new[]
-                                                                                  {
-                                                                                      '\\'
-                                                                                  },
-                                                                                  StringSplitOptions.
-                                                                                      RemoveEmptyEntries).
-                                                                                  Last()));
-
-                            if(track.Filter != null)
-                                break;
-
-                            track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                              bwTrack.filename.Split(new[]
-                                                                                  {
-                                                                                      '\\'
-                                                                                  },
-                                                                                  StringSplitOptions.
-                                                                                      RemoveEmptyEntries).
-                                                                                  Last().ToLower(CultureInfo.
-                                                                                      CurrentCulture)));
-
-                            if(track.Filter != null)
-                                break;
-
-                            track.Filter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                              bwTrack.filename.Split(new[]
-                                                                                  {
-                                                                                      '\\'
-                                                                                  },
-                                                                                  StringSplitOptions.
-                                                                                      RemoveEmptyEntries).
-                                                                                  Last().ToUpper(CultureInfo.
-                                                                                      CurrentCulture)));
-
-                            track.Filter = _dataFilter;
-                        } while(true);
-                    else
                         track.Filter = _dataFilter;
+                    } while(true);
+                else
+                    track.Filter = _dataFilter;
 
-                    track.File = _dataFilter.Filename;
+                track.File = _dataFilter.Filename;
 
-                    track.FileOffset = bwTrack.offset + ((150 - bwTrack.pregapOffsetAdjustment) * 2352);
+                track.FileOffset = bwTrack.offset + ((150 - bwTrack.pregapOffsetAdjustment) * 2352);
 
-                    track.SubchannelOffset = ((bwTrack.offset / 2352) + (150 - bwTrack.pregapOffsetAdjustment)) * 96;
+                track.SubchannelOffset = ((bwTrack.offset / 2352) + (150 - bwTrack.pregapOffsetAdjustment)) * 96;
 
-                    if(bwTrack.pregap > 0)
-                    {
-                        track.Pregap      = (ulong)(bwTrack.startSector - bwTrack.pregap);
-                        track.StartSector = (ulong)bwTrack.pregap;
+                if(bwTrack.pregap > 0)
+                {
+                    track.Pregap      = (ulong)(bwTrack.startSector - bwTrack.pregap);
+                    track.StartSector = (ulong)bwTrack.pregap;
 
-                        track.FileOffset       -= track.Pregap * 2352;
-                        track.SubchannelOffset -= track.Pregap * 96;
-                    }
-                    else
-                    {
-                        track.Pregap = (ulong)(bwTrack.startSector - bwTrack.pregap);
-
-                        if(bwTrack.pregap < 0)
-                            track.StartSector = 0;
-                        else
-                            track.StartSector = (ulong)bwTrack.pregap;
-                    }
-
-                    track.FileType          = "BINARY";
-                    track.RawBytesPerSector = 2352;
-                    track.Sequence          = bwTrack.point;
-                    track.Session           = bwTrack.session;
-
-                    if(track.Session > maxSession)
-                        maxSession = track.Session;
-
-                    track.SubchannelFilter = _subFilter;
-                    track.SubchannelFile   = _subFilter?.Filename;
-
-                    if(_subFilter != null)
-                    {
-                        track.SubchannelType = TrackSubchannelType.Packed;
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-                    }
-                    else
-                        track.SubchannelType = TrackSubchannelType.None;
-
-                    switch(bwTrack.trackMode)
-                    {
-                        case TrackType.Audio:
-                            track.Type            = CommonTypes.Enums.TrackType.Audio;
-                            _imageInfo.SectorSize = 2352;
-                            track.BytesPerSector  = 2352;
-
-                            break;
-                        case TrackType.Mode1:
-                            track.Type = CommonTypes.Enums.TrackType.CdMode1;
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                            if(_imageInfo.SectorSize < 2048)
-                                _imageInfo.SectorSize = 2048;
-
-                            track.BytesPerSector = 2048;
-
-                            break;
-                        case TrackType.Mode2:
-                            track.Type = CommonTypes.Enums.TrackType.CdMode2Formless;
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                            if(_imageInfo.SectorSize < 2336)
-                                _imageInfo.SectorSize = 2336;
-
-                            track.BytesPerSector = 2336;
-
-                            break;
-                        default:
-                            track.Type              = CommonTypes.Enums.TrackType.Data;
-                            track.RawBytesPerSector = 2048;
-                            _imageInfo.SectorSize   = 2048;
-                            track.BytesPerSector    = 2048;
-
-                            break;
-                    }
-
-                    if(bwTrack.pregap != 0)
-                        track.Indexes.Add(0, bwTrack.pregap);
-
-                    track.Indexes.Add(1, bwTrack.startSector);
-
-                    var partition = new Partition
-                    {
-                        Description = track.Description,
-                        Size        = (track.EndSector - track.StartSector + 1) * 2352,
-                        Length      = track.EndSector - track.StartSector + 1,
-                        Sequence    = track.Sequence,
-                        Start       = track.StartSector + track.Pregap
-                    };
-
-                    partition.Offset = partition.Start * 2352;
-                    partition.Type   = track.Type.ToString();
-
-                    Partitions.Add(partition);
-                    Tracks.Add(track);
-
-                    if(bwTrack.pregap > 0)
-                        _offsetMap[track.Sequence] = (ulong)bwTrack.pregap;
-                    else
-                        _offsetMap[track.Sequence] = 0;
-
-                    if(!_offsetMap.ContainsKey(track.Sequence))
-                        _offsetMap.Add(track.Sequence, track.StartSector);
-
-                    if(!_trackFlags.ContainsKey(track.Sequence))
-                        _trackFlags.Add(track.Sequence, (byte)(bwTrack.adrCtl & 0x0F));
-
-                    if(bwTrack.lastSector > _imageInfo.Sectors)
-                        _imageInfo.Sectors = bwTrack.lastSector + 1;
+                    track.FileOffset       -= track.Pregap * 2352;
+                    track.SubchannelOffset -= track.Pregap * 96;
                 }
                 else
                 {
-                    _imageInfo.MediaBarcode      = bwTrack.isrcUpc;
-                    _imageInfo.MediaSerialNumber = bwTrack.discId;
-                    _imageInfo.MediaTitle        = bwTrack.title;
+                    track.Pregap = (ulong)(bwTrack.startSector - bwTrack.pregap);
 
-                    if(!string.IsNullOrEmpty(bwTrack.isrcUpc) &&
-                       !_imageInfo.ReadableMediaTags.Contains(MediaTagType.CD_MCN))
-                        _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_MCN);
+                    if(bwTrack.pregap < 0)
+                        track.StartSector = 0;
+                    else
+                        track.StartSector = (ulong)bwTrack.pregap;
                 }
 
-            Sessions = new List<Session>();
+                track.FileType          = "BINARY";
+                track.RawBytesPerSector = 2352;
+                track.Sequence          = bwTrack.point;
+                track.Session           = bwTrack.session;
 
-            for(ushort i = 1; i <= maxSession; i++)
-            {
-                var session = new Session
+                if(track.Session > maxSession)
+                    maxSession = track.Session;
+
+                track.SubchannelFilter = _subFilter;
+                track.SubchannelFile   = _subFilter?.Filename;
+
+                if(_subFilter != null)
                 {
-                    Sequence    = i,
-                    StartTrack  = uint.MaxValue,
-                    StartSector = uint.MaxValue
-                };
-
-                foreach(Track track in Tracks.Where(track => track.Session == i))
-                {
-                    if(track.Sequence < session.StartTrack)
-                        session.StartTrack = track.Sequence;
-
-                    if(track.Sequence > session.EndTrack)
-                        session.StartTrack = track.Sequence;
-
-                    if(track.StartSector < session.StartSector)
-                        session.StartSector = track.StartSector;
-
-                    if(track.EndSector > session.EndSector)
-                        session.EndSector = track.EndSector;
-                }
-
-                Sessions.Add(session);
-            }
-
-            // As long as subchannel is written for any track, it is present for all tracks
-            if(Tracks.Any(t => t.SubchannelType == TrackSubchannelType.Packed))
-                foreach(Track track in Tracks)
                     track.SubchannelType = TrackSubchannelType.Packed;
 
-            _imageInfo.MediaType = MediaType.CD;
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+                }
+                else
+                    track.SubchannelType = TrackSubchannelType.None;
 
-            _imageInfo.Application        = "BlindWrite";
-            _imageInfo.ApplicationVersion = "4";
-            _imageInfo.Version            = "4";
-
-            _imageInfo.ImageSize            = (ulong)_dataFilter.DataForkLength;
-            _imageInfo.CreationTime         = _dataFilter.CreationTime;
-            _imageInfo.LastModificationTime = _dataFilter.LastWriteTime;
-            _imageInfo.XmlMediaType         = XmlMediaType.OpticalDisc;
-
-            bool data       = false;
-            bool mode2      = false;
-            bool firstAudio = false;
-            bool firstData  = false;
-            bool audio      = false;
-
-            foreach(Track bwTrack in Tracks)
-            {
-                // First track is audio
-                firstAudio |= bwTrack.Sequence == 1 && bwTrack.Type == CommonTypes.Enums.TrackType.Audio;
-
-                // First track is data
-                firstData |= bwTrack.Sequence == 1 && bwTrack.Type != CommonTypes.Enums.TrackType.Audio;
-
-                // Any non first track is data
-                data |= bwTrack.Sequence != 1 && bwTrack.Type != CommonTypes.Enums.TrackType.Audio;
-
-                // Any non first track is audio
-                audio |= bwTrack.Sequence != 1 && bwTrack.Type == CommonTypes.Enums.TrackType.Audio;
-
-                switch(bwTrack.Type)
+                switch(bwTrack.trackMode)
                 {
-                    case CommonTypes.Enums.TrackType.CdMode2Formless:
-                        mode2 = true;
+                    case TrackType.Audio:
+                        track.Type            = CommonTypes.Enums.TrackType.Audio;
+                        _imageInfo.SectorSize = 2352;
+                        track.BytesPerSector  = 2352;
+
+                        break;
+                    case TrackType.Mode1:
+                        track.Type = CommonTypes.Enums.TrackType.CdMode1;
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                        if(_imageInfo.SectorSize < 2048)
+                            _imageInfo.SectorSize = 2048;
+
+                        track.BytesPerSector = 2048;
+
+                        break;
+                    case TrackType.Mode2:
+                        track.Type = CommonTypes.Enums.TrackType.CdMode2Formless;
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                        if(_imageInfo.SectorSize < 2336)
+                            _imageInfo.SectorSize = 2336;
+
+                        track.BytesPerSector = 2336;
+
+                        break;
+                    default:
+                        track.Type              = CommonTypes.Enums.TrackType.Data;
+                        track.RawBytesPerSector = 2048;
+                        _imageInfo.SectorSize   = 2048;
+                        track.BytesPerSector    = 2048;
 
                         break;
                 }
-            }
 
-            if(!data &&
-               !firstData)
-                _imageInfo.MediaType = MediaType.CDDA;
-            else if(firstAudio         &&
-                    data               &&
-                    Sessions.Count > 1 &&
-                    mode2)
-                _imageInfo.MediaType = MediaType.CDPLUS;
-            else if((firstData && audio) || mode2)
-                _imageInfo.MediaType = MediaType.CDROMXA;
-            else if(!audio)
-                _imageInfo.MediaType = MediaType.CDROM;
+                if(bwTrack.pregap != 0)
+                    track.Indexes.Add(0, bwTrack.pregap);
+
+                track.Indexes.Add(1, bwTrack.startSector);
+
+                var partition = new Partition
+                {
+                    Description = track.Description,
+                    Size        = (track.EndSector - track.StartSector + 1) * 2352,
+                    Length      = track.EndSector - track.StartSector + 1,
+                    Sequence    = track.Sequence,
+                    Start       = track.StartSector + track.Pregap
+                };
+
+                partition.Offset = partition.Start * 2352;
+                partition.Type   = track.Type.ToString();
+
+                Partitions.Add(partition);
+                Tracks.Add(track);
+
+                if(bwTrack.pregap > 0)
+                    _offsetMap[track.Sequence] = (ulong)bwTrack.pregap;
+                else
+                    _offsetMap[track.Sequence] = 0;
+
+                if(!_offsetMap.ContainsKey(track.Sequence))
+                    _offsetMap.Add(track.Sequence, track.StartSector);
+
+                if(!_trackFlags.ContainsKey(track.Sequence))
+                    _trackFlags.Add(track.Sequence, (byte)(bwTrack.adrCtl & 0x0F));
+
+                if(bwTrack.lastSector > _imageInfo.Sectors)
+                    _imageInfo.Sectors = bwTrack.lastSector + 1;
+            }
             else
-                _imageInfo.MediaType = MediaType.CD;
-
-            _imageInfo.Comments = _header.Comments;
-
-            AaruConsole.VerboseWriteLine("BlindWrite image describes a disc of type {0}", _imageInfo.MediaType);
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                AaruConsole.VerboseWriteLine("BlindWrite comments: {0}", _imageInfo.Comments);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            switch(tag)
             {
-                case MediaTagType.CD_MCN:
-                {
-                    if(_imageInfo.MediaSerialNumber == null)
-                        return ErrorNumber.NoData;
+                _imageInfo.MediaBarcode      = bwTrack.isrcUpc;
+                _imageInfo.MediaSerialNumber = bwTrack.discId;
+                _imageInfo.MediaTitle        = bwTrack.title;
 
-                    buffer = Encoding.ASCII.GetBytes(_imageInfo.MediaSerialNumber);
-
-                    return ErrorNumber.NoError;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-                return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-            {
-                return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
-
-                return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
+                if(!string.IsNullOrEmpty(bwTrack.isrcUpc) &&
+                   !_imageInfo.ReadableMediaTags.Contains(MediaTagType.CD_MCN))
+                    _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_MCN);
             }
 
-            return ErrorNumber.SectorNotFound;
+        Sessions = new List<Session>();
+
+        for(ushort i = 1; i <= maxSession; i++)
+        {
+            var session = new Session
+            {
+                Sequence    = i,
+                StartTrack  = uint.MaxValue,
+                StartSector = uint.MaxValue
+            };
+
+            foreach(Track track in Tracks.Where(track => track.Session == i))
+            {
+                if(track.Sequence < session.StartTrack)
+                    session.StartTrack = track.Sequence;
+
+                if(track.Sequence > session.EndTrack)
+                    session.StartTrack = track.Sequence;
+
+                if(track.StartSector < session.StartSector)
+                    session.StartSector = track.StartSector;
+
+                if(track.EndSector > session.EndSector)
+                    session.EndSector = track.EndSector;
+            }
+
+            Sessions.Add(session);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+        // As long as subchannel is written for any track, it is present for all tracks
+        if(Tracks.Any(t => t.SubchannelType == TrackSubchannelType.Packed))
+            foreach(Track track in Tracks)
+                track.SubchannelType = TrackSubchannelType.Packed;
+
+        _imageInfo.MediaType = MediaType.CD;
+
+        _imageInfo.Application        = "BlindWrite";
+        _imageInfo.ApplicationVersion = "4";
+        _imageInfo.Version            = "4";
+
+        _imageInfo.ImageSize            = (ulong)_dataFilter.DataForkLength;
+        _imageInfo.CreationTime         = _dataFilter.CreationTime;
+        _imageInfo.LastModificationTime = _dataFilter.LastWriteTime;
+        _imageInfo.XmlMediaType         = XmlMediaType.OpticalDisc;
+
+        bool data       = false;
+        bool mode2      = false;
+        bool firstAudio = false;
+        bool firstData  = false;
+        bool audio      = false;
+
+        foreach(Track bwTrack in Tracks)
         {
-            buffer = null;
-            Track? aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
+            // First track is audio
+            firstAudio |= bwTrack.Sequence == 1 && bwTrack.Type == CommonTypes.Enums.TrackType.Audio;
 
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
+            // First track is data
+            firstData |= bwTrack.Sequence == 1 && bwTrack.Type != CommonTypes.Enums.TrackType.Audio;
 
-            if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
-                return ErrorNumber.OutOfRange;
+            // Any non first track is data
+            data |= bwTrack.Sequence != 1 && bwTrack.Type != CommonTypes.Enums.TrackType.Audio;
 
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-            bool mode2 = false;
+            // Any non first track is audio
+            audio |= bwTrack.Sequence != 1 && bwTrack.Type == CommonTypes.Enums.TrackType.Audio;
 
-            switch(aaruTrack.Type)
+            switch(bwTrack.Type)
             {
-                case CommonTypes.Enums.TrackType.CdMode1:
-                {
-                    sectorOffset = 16;
-                    sectorSize   = 2048;
-                    sectorSkip   = 288;
-
-                    break;
-                }
                 case CommonTypes.Enums.TrackType.CdMode2Formless:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
+                    mode2 = true;
 
                     break;
-                }
-                case CommonTypes.Enums.TrackType.Audio:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CommonTypes.Enums.TrackType.Data:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2048;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
             }
-
-            buffer = new byte[sectorSize * length];
-
-            _imageStream = aaruTrack.Filter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.FileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(mode2)
-            {
-                var mode2Ms = new MemoryStream((int)(sectorSize * length));
-
-                buffer = br.ReadBytes((int)(sectorSize * length));
-
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize);
-                    sector = Sector.GetUserDataFromMode2(sector);
-                    mode2Ms.Write(sector, 0, sector.Length);
-                }
-
-                buffer = mode2Ms.ToArray();
-            }
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
+        if(!data &&
+           !firstData)
+            _imageInfo.MediaType = MediaType.CDDA;
+        else if(firstAudio         &&
+                data               &&
+                Sessions.Count > 1 &&
+                mode2)
+            _imageInfo.MediaType = MediaType.CDPLUS;
+        else if((firstData && audio) || mode2)
+            _imageInfo.MediaType = MediaType.CDROMXA;
+        else if(!audio)
+            _imageInfo.MediaType = MediaType.CDROM;
+        else
+            _imageInfo.MediaType = MediaType.CD;
+
+        _imageInfo.Comments = _header.Comments;
+
+        AaruConsole.VerboseWriteLine("BlindWrite image describes a disc of type {0}", _imageInfo.MediaType);
+
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+            AaruConsole.VerboseWriteLine("BlindWrite comments: {0}", _imageInfo.Comments);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        switch(tag)
         {
-            buffer = null;
-            Track? aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
-
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            if(aaruTrack.Type == CommonTypes.Enums.TrackType.Data)
-                return ErrorNumber.NotSupported;
-
-            switch(tag)
+            case MediaTagType.CD_MCN:
             {
-                case SectorTagType.CdSectorEcc:
-                case SectorTagType.CdSectorEccP:
-                case SectorTagType.CdSectorEccQ:
-                case SectorTagType.CdSectorEdc:
-                case SectorTagType.CdSectorHeader:
-                case SectorTagType.CdSectorSubchannel:
-                case SectorTagType.CdSectorSubHeader:
-                case SectorTagType.CdSectorSync: break;
-                case SectorTagType.CdTrackFlags:
-                    if(!_trackFlags.TryGetValue((uint)sectorAddress, out byte flag))
-                        return ErrorNumber.NoData;
+                if(_imageInfo.MediaSerialNumber == null)
+                    return ErrorNumber.NoData;
 
-                    buffer = new[]
-                    {
-                        flag
-                    };
+                buffer = Encoding.ASCII.GetBytes(_imageInfo.MediaSerialNumber);
 
-                    return ErrorNumber.NoError;
-                default: return ErrorNumber.NotSupported;
+                return ErrorNumber.NoError;
             }
+            default: return ErrorNumber.NotSupported;
+        }
+    }
 
-            switch(aaruTrack.Type)
-            {
-                case CommonTypes.Enums.TrackType.CdMode1:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, track, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2064;
-                            sectorSize   = 4;
-                            sectorSkip   = 284;
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+            return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 96;
-                            sectorSkip   = 0;
+        return ErrorNumber.SectorNotFound;
+    }
 
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-                    break;
-                case CommonTypes.Enums.TrackType.CdMode2Formless:
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        case SectorTagType.CdSectorHeader:
-                        case SectorTagType.CdSectorEcc:
-                        case SectorTagType.CdSectorEccP:
-                        case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+        {
+            return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2332;
-                            sectorSize   = 4;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 96;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-                case CommonTypes.Enums.TrackType.Audio:
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 96;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            _imageStream = tag == SectorTagType.CdSectorSubchannel ? aaruTrack.SubchannelFilter.GetDataForkStream()
-                               : aaruTrack.Filter.GetDataForkStream();
-
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)(tag == SectorTagType.CdSectorSubchannel ? aaruTrack.SubchannelOffset : aaruTrack.FileOffset) + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            if(tag == SectorTagType.CdSectorSubchannel)
-                buffer = Subchannel.Interleave(buffer);
-
-            return ErrorNumber.NoError;
+            return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
+        return ErrorNumber.SectorNotFound;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-                return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+        Track? aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
 
+        if(aaruTrack is null)
             return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+        bool mode2 = false;
+
+        switch(aaruTrack.Type)
+        {
+            case CommonTypes.Enums.TrackType.CdMode1:
+            {
+                sectorOffset = 16;
+                sectorSize   = 2048;
+                sectorSkip   = 288;
+
+                break;
+            }
+            case CommonTypes.Enums.TrackType.CdMode2Formless:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CommonTypes.Enums.TrackType.Audio:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CommonTypes.Enums.TrackType.Data:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2048;
+                sectorSkip   = 0;
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+        buffer = new byte[sectorSize * length];
+
+        _imageStream = aaruTrack.Filter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.FileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(mode2)
         {
-            buffer = null;
-            Track aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
-
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch(aaruTrack.Type)
-            {
-                case CommonTypes.Enums.TrackType.Audio:
-                case CommonTypes.Enums.TrackType.CdMode1:
-                case CommonTypes.Enums.TrackType.CdMode2Formless:
-                case CommonTypes.Enums.TrackType.Data:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = (uint)aaruTrack.RawBytesPerSector;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-
-            _imageStream = aaruTrack.Filter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.FileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
+            var mode2Ms = new MemoryStream((int)(sectorSize * length));
 
             buffer = br.ReadBytes((int)(sectorSize * length));
 
-            return ErrorNumber.NoError;
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize);
+                sector = Sector.GetUserDataFromMode2(sector);
+                mode2Ms.Write(sector, 0, sector.Length);
+            }
+
+            buffer = mode2Ms.ToArray();
         }
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
 
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(Session session)
-        {
-            if(Sessions.Contains(session))
-                return GetSessionTracks(session.Sequence);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
 
-            return null;
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();
+        return ErrorNumber.NoError;
     }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+        Track? aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        if(aaruTrack.Type == CommonTypes.Enums.TrackType.Data)
+            return ErrorNumber.NotSupported;
+
+        switch(tag)
+        {
+            case SectorTagType.CdSectorEcc:
+            case SectorTagType.CdSectorEccP:
+            case SectorTagType.CdSectorEccQ:
+            case SectorTagType.CdSectorEdc:
+            case SectorTagType.CdSectorHeader:
+            case SectorTagType.CdSectorSubchannel:
+            case SectorTagType.CdSectorSubHeader:
+            case SectorTagType.CdSectorSync: break;
+            case SectorTagType.CdTrackFlags:
+                if(!_trackFlags.TryGetValue((uint)sectorAddress, out byte flag))
+                    return ErrorNumber.NoData;
+
+                buffer = new[]
+                {
+                    flag
+                };
+
+                return ErrorNumber.NoError;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        switch(aaruTrack.Type)
+        {
+            case CommonTypes.Enums.TrackType.CdMode1:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2064;
+                        sectorSize   = 4;
+                        sectorSkip   = 284;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 96;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            case CommonTypes.Enums.TrackType.CdMode2Formless:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    case SectorTagType.CdSectorHeader:
+                    case SectorTagType.CdSectorEcc:
+                    case SectorTagType.CdSectorEccP:
+                    case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2332;
+                        sectorSize   = 4;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 96;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+            case CommonTypes.Enums.TrackType.Audio:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 96;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream = tag == SectorTagType.CdSectorSubchannel ? aaruTrack.SubchannelFilter.GetDataForkStream()
+                           : aaruTrack.Filter.GetDataForkStream();
+
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)(tag == SectorTagType.CdSectorSubchannel ? aaruTrack.SubchannelOffset : aaruTrack.FileOffset) + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        if(tag == SectorTagType.CdSectorSubchannel)
+            buffer = Subchannel.Interleave(buffer);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+            return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+        Track aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(aaruTrack.Type)
+        {
+            case CommonTypes.Enums.TrackType.Audio:
+            case CommonTypes.Enums.TrackType.CdMode1:
+            case CommonTypes.Enums.TrackType.CdMode2Formless:
+            case CommonTypes.Enums.TrackType.Data:
+            {
+                sectorOffset = 0;
+                sectorSize   = (uint)aaruTrack.RawBytesPerSector;
+                sectorSkip   = 0;
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        _imageStream = aaruTrack.Filter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.FileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        buffer = br.ReadBytes((int)(sectorSize * length));
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(Session session)
+    {
+        if(Sessions.Contains(session))
+            return GetSessionTracks(session.Sequence);
+
+        return null;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/Structs.cs b/Aaru.Images/BlindWrite4/Structs.cs
index 6b480023d..36eb60b12 100644
--- a/Aaru.Images/BlindWrite4/Structs.cs
+++ b/Aaru.Images/BlindWrite4/Structs.cs
@@ -33,121 +33,120 @@
 using System.Runtime.InteropServices;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite4
 {
-    public sealed partial class BlindWrite4
+    struct Header
     {
-        struct Header
-        {
-            public byte[] Signature;
-            public uint   Unknown1;
-            public ulong  Timestamp;
-            public uint   VolumeIdLength;
-            public byte[] VolumeIdBytes;
-            public uint   SysIdLength;
-            public byte[] SysIdBytes;
-            public uint   CommentsLength;
-            public byte[] CommentsBytes;
-            public uint   TrackDescriptors;
-            public uint   DataFileLength;
-            public byte[] DataFileBytes;
-            public uint   SubchannelFileLength;
-            public byte[] SubchannelFileBytes;
-            public uint   Unknown2;
-            public byte   Unknown3;
-            public byte[] Unknown4;
+        public byte[] Signature;
+        public uint   Unknown1;
+        public ulong  Timestamp;
+        public uint   VolumeIdLength;
+        public byte[] VolumeIdBytes;
+        public uint   SysIdLength;
+        public byte[] SysIdBytes;
+        public uint   CommentsLength;
+        public byte[] CommentsBytes;
+        public uint   TrackDescriptors;
+        public uint   DataFileLength;
+        public byte[] DataFileBytes;
+        public uint   SubchannelFileLength;
+        public byte[] SubchannelFileBytes;
+        public uint   Unknown2;
+        public byte   Unknown3;
+        public byte[] Unknown4;
 
-            // On memory only
-            #pragma warning disable 649
-            public string  VolumeIdentifier;
-            public string  SystemIdentifier;
-            public string  Comments;
-            public IFilter DataFilter;
-            public IFilter SubchannelFilter;
-            public string  DataFile;
-            public string  SubchannelFile;
-            #pragma warning restore 649
-        }
+        // On memory only
+        #pragma warning disable 649
+        public string  VolumeIdentifier;
+        public string  SystemIdentifier;
+        public string  Comments;
+        public IFilter DataFilter;
+        public IFilter SubchannelFilter;
+        public string  DataFile;
+        public string  SubchannelFile;
+        #pragma warning restore 649
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct TrackDescriptor
-        {
-            public uint   filenameLen;
-            public byte[] filenameBytes;
-            public uint   offset;
-            public byte   subchannel;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] unknown1;
-            public uint      unknown2;
-            public byte      unknown3;
-            public byte      session;
-            public byte      unknown4;
-            public byte      adrCtl;
-            public byte      unknown5;
-            public TrackType trackMode;
-            public byte      unknown6;
-            public byte      point;
-            public uint      unknown7;
-            public uint      unknown8;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct TrackDescriptor
+    {
+        public uint   filenameLen;
+        public byte[] filenameBytes;
+        public uint   offset;
+        public byte   subchannel;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public byte[] unknown1;
+        public uint      unknown2;
+        public byte      unknown3;
+        public byte      session;
+        public byte      unknown4;
+        public byte      adrCtl;
+        public byte      unknown5;
+        public TrackType trackMode;
+        public byte      unknown6;
+        public byte      point;
+        public uint      unknown7;
+        public uint      unknown8;
 
-            // Seems to be used to adjust the offset according to the pregap
-            public uint   pregapOffsetAdjustment;
-            public uint   unknown10;
-            public ushort unknown11;
-            public uint   lastSector;
-            public byte   unknown12;
-            public int    pregap;
-            public int    startSector;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public uint[] unknown13;
-            public uint   titleLen;
-            public byte[] titleBytes;
-            public uint   performerLen;
-            public byte[] performerBytes;
-            public uint   unkStrLen1;
-            public byte[] unkStrBytes1;
-            public uint   unkStrLen2;
-            public byte[] unkStrBytes2;
-            public uint   unkStrLen3;
-            public byte[] unkStrBytes3;
-            public uint   unkStrLen4;
-            public byte[] unkStrBytes4;
-            public uint   discIdLen;
-            public byte[] discIdBytes;
-            public uint   unkStrLen5;
-            public byte[] unkStrBytes5;
-            public uint   unkStrLen6;
-            public byte[] unkStrBytes6;
-            public uint   unkStrLen7;
-            public byte[] unkStrBytes7;
-            public uint   unkStrLen8;
-            public byte[] unkStrBytes8;
-            public uint   unkStrLen9;
-            public byte[] unkStrBytes9;
-            public uint   unkStrLen10;
-            public byte[] unkStrBytes10;
-            public uint   unkStrLen11;
-            public byte[] unkStrBytes11;
-            public uint   isrcLen;
-            public byte[] isrcBytes;
+        // Seems to be used to adjust the offset according to the pregap
+        public uint   pregapOffsetAdjustment;
+        public uint   unknown10;
+        public ushort unknown11;
+        public uint   lastSector;
+        public byte   unknown12;
+        public int    pregap;
+        public int    startSector;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public uint[] unknown13;
+        public uint   titleLen;
+        public byte[] titleBytes;
+        public uint   performerLen;
+        public byte[] performerBytes;
+        public uint   unkStrLen1;
+        public byte[] unkStrBytes1;
+        public uint   unkStrLen2;
+        public byte[] unkStrBytes2;
+        public uint   unkStrLen3;
+        public byte[] unkStrBytes3;
+        public uint   unkStrLen4;
+        public byte[] unkStrBytes4;
+        public uint   discIdLen;
+        public byte[] discIdBytes;
+        public uint   unkStrLen5;
+        public byte[] unkStrBytes5;
+        public uint   unkStrLen6;
+        public byte[] unkStrBytes6;
+        public uint   unkStrLen7;
+        public byte[] unkStrBytes7;
+        public uint   unkStrLen8;
+        public byte[] unkStrBytes8;
+        public uint   unkStrLen9;
+        public byte[] unkStrBytes9;
+        public uint   unkStrLen10;
+        public byte[] unkStrBytes10;
+        public uint   unkStrLen11;
+        public byte[] unkStrBytes11;
+        public uint   isrcLen;
+        public byte[] isrcBytes;
 
-            // On memory only
-            public string filename;
-            public string title;
-            public string performer;
-            public string unkString1;
-            public string unkString2;
-            public string unkString3;
-            public string unkString4;
-            public string discId;
-            public string unkString5;
-            public string unkString6;
-            public string unkString7;
-            public string unkString8;
-            public string unkString9;
-            public string unkString10;
-            public string unkString11;
-            public string isrcUpc;
-        }
+        // On memory only
+        public string filename;
+        public string title;
+        public string performer;
+        public string unkString1;
+        public string unkString2;
+        public string unkString3;
+        public string unkString4;
+        public string discId;
+        public string unkString5;
+        public string unkString6;
+        public string unkString7;
+        public string unkString8;
+        public string unkString9;
+        public string unkString10;
+        public string unkString11;
+        public string isrcUpc;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite4/Verify.cs b/Aaru.Images/BlindWrite4/Verify.cs
index b46425cc8..c6af330f5 100644
--- a/Aaru.Images/BlindWrite4/Verify.cs
+++ b/Aaru.Images/BlindWrite4/Verify.cs
@@ -35,92 +35,91 @@ using System.Collections.Generic;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite4
 {
-    public sealed partial class BlindWrite4
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
     {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/BlindWrite5.cs b/Aaru.Images/BlindWrite5/BlindWrite5.cs
index 27577d911..4ea43dcd0 100644
--- a/Aaru.Images/BlindWrite5/BlindWrite5.cs
+++ b/Aaru.Images/BlindWrite5/BlindWrite5.cs
@@ -36,53 +36,52 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    // TODO: Too many unknowns to make this writable
-    /// <inheritdoc />
-    /// <summary>Implements reading BlindWrite 5/6/7 disc images</summary>
-    public sealed partial class BlindWrite5 : IOpticalMediaImage
-    {
-        byte[]                        _atip;
-        byte[]                        _bca;
-        List<SessionDescriptor>       _bwSessions;
-        byte[]                        _cdtext;
-        List<DataFile>                _dataFiles;
-        string                        _dataPath;
-        byte[]                        _discInformation;
-        byte[]                        _dmi;
-        byte[]                        _dpm;
-        List<DataFileCharacteristics> _filePaths;
-        byte[]                        _fullToc;
-        Header                        _header;
-        ImageInfo                     _imageInfo;
-        Stream                        _imageStream;
-        byte[]                        _mode2A;
-        Dictionary<uint, ulong>       _offsetMap;
-        byte[]                        _pfi;
-        byte[]                        _pma;
-        Dictionary<uint, byte>        _trackFlags;
-        byte[]                        _unkBlock;
+namespace Aaru.DiscImages;
 
-        public BlindWrite5() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = true,
-            HasSessions           = true,
-            Version               = null,
-            ApplicationVersion    = null,
-            MediaTitle            = null,
-            Creator               = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: Too many unknowns to make this writable
+/// <inheritdoc />
+/// <summary>Implements reading BlindWrite 5/6/7 disc images</summary>
+public sealed partial class BlindWrite5 : IOpticalMediaImage
+{
+    byte[]                        _atip;
+    byte[]                        _bca;
+    List<SessionDescriptor>       _bwSessions;
+    byte[]                        _cdtext;
+    List<DataFile>                _dataFiles;
+    string                        _dataPath;
+    byte[]                        _discInformation;
+    byte[]                        _dmi;
+    byte[]                        _dpm;
+    List<DataFileCharacteristics> _filePaths;
+    byte[]                        _fullToc;
+    Header                        _header;
+    ImageInfo                     _imageInfo;
+    Stream                        _imageStream;
+    byte[]                        _mode2A;
+    Dictionary<uint, ulong>       _offsetMap;
+    byte[]                        _pfi;
+    byte[]                        _pma;
+    Dictionary<uint, byte>        _trackFlags;
+    byte[]                        _unkBlock;
+
+    public BlindWrite5() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = true,
+        HasSessions           = true,
+        Version               = null,
+        ApplicationVersion    = null,
+        MediaTitle            = null,
+        Creator               = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/Constants.cs b/Aaru.Images/BlindWrite5/Constants.cs
index 21139c64b..01a38fe69 100644
--- a/Aaru.Images/BlindWrite5/Constants.cs
+++ b/Aaru.Images/BlindWrite5/Constants.cs
@@ -30,19 +30,18 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite5
 {
-    public sealed partial class BlindWrite5
+    /// <summary>"BWT5 STREAM FOOT"</summary>
+    readonly byte[] _bw5Footer =
     {
-        /// <summary>"BWT5 STREAM FOOT"</summary>
-        readonly byte[] _bw5Footer =
-        {
-            0x42, 0x57, 0x54, 0x35, 0x20, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4D, 0x20, 0x46, 0x4F, 0x4F, 0x54
-        };
-        /// <summary>"BWT5 STREAM SIGN"</summary>
-        readonly byte[] _bw5Signature =
-        {
-            0x42, 0x57, 0x54, 0x35, 0x20, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4D, 0x20, 0x53, 0x49, 0x47, 0x4E
-        };
-    }
+        0x42, 0x57, 0x54, 0x35, 0x20, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4D, 0x20, 0x46, 0x4F, 0x4F, 0x54
+    };
+    /// <summary>"BWT5 STREAM SIGN"</summary>
+    readonly byte[] _bw5Signature =
+    {
+        0x42, 0x57, 0x54, 0x35, 0x20, 0x53, 0x54, 0x52, 0x45, 0x41, 0x4D, 0x20, 0x53, 0x49, 0x47, 0x4E
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/Enums.cs b/Aaru.Images/BlindWrite5/Enums.cs
index aecb8ea07..c76d954bb 100644
--- a/Aaru.Images/BlindWrite5/Enums.cs
+++ b/Aaru.Images/BlindWrite5/Enums.cs
@@ -32,21 +32,20 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
-{
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class BlindWrite5
-    {
-        enum TrackType : byte
-        {
-            NotData = 0, Audio   = 1, Mode1   = 2,
-            Mode2   = 3, Mode2F1 = 4, Mode2F2 = 5,
-            Dvd     = 6
-        }
+namespace Aaru.DiscImages;
 
-        enum TrackSubchannel : byte
-        {
-            None = 0, Q16 = 2, Linear = 4
-        }
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class BlindWrite5
+{
+    enum TrackType : byte
+    {
+        NotData = 0, Audio   = 1, Mode1   = 2,
+        Mode2   = 3, Mode2F1 = 4, Mode2F2 = 5,
+        Dvd     = 6
+    }
+
+    enum TrackSubchannel : byte
+    {
+        None = 0, Q16 = 2, Linear = 4
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/Helpers.cs b/Aaru.Images/BlindWrite5/Helpers.cs
index b124fe084..e1c0c7853 100644
--- a/Aaru.Images/BlindWrite5/Helpers.cs
+++ b/Aaru.Images/BlindWrite5/Helpers.cs
@@ -33,64 +33,63 @@
 using Aaru.CommonTypes;
 using Aaru.Decoders.SCSI.MMC;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class BlindWrite5
-    {
-        static CommonTypes.Enums.TrackType BlindWriteTrackTypeToTrackType(TrackType trackType)
-        {
-            switch(trackType)
-            {
-                case TrackType.Mode1:   return CommonTypes.Enums.TrackType.CdMode1;
-                case TrackType.Mode2F1: return CommonTypes.Enums.TrackType.CdMode2Form1;
-                case TrackType.Mode2F2: return CommonTypes.Enums.TrackType.CdMode2Form2;
-                case TrackType.Mode2:   return CommonTypes.Enums.TrackType.CdMode2Formless;
-                case TrackType.Audio:   return CommonTypes.Enums.TrackType.Audio;
-                default:                return CommonTypes.Enums.TrackType.Data;
-            }
-        }
+namespace Aaru.DiscImages;
 
-        static MediaType BlindWriteProfileToMediaType(ProfileNumber profile)
+public sealed partial class BlindWrite5
+{
+    static CommonTypes.Enums.TrackType BlindWriteTrackTypeToTrackType(TrackType trackType)
+    {
+        switch(trackType)
         {
-            switch(profile)
-            {
-                case ProfileNumber.BDRE:  return MediaType.BDRE;
-                case ProfileNumber.BDROM: return MediaType.BDROM;
-                case ProfileNumber.BDRRdm:
-                case ProfileNumber.BDRSeq: return MediaType.BDR;
-                case ProfileNumber.CDR:
-                case ProfileNumber.HDBURNR: return MediaType.CDR;
-                case ProfileNumber.CDROM:
-                case ProfileNumber.HDBURNROM: return MediaType.CDROM;
-                case ProfileNumber.CDRW:
-                case ProfileNumber.HDBURNRW: return MediaType.CDRW;
-                case ProfileNumber.DDCDR:       return MediaType.DDCDR;
-                case ProfileNumber.DDCDROM:     return MediaType.DDCD;
-                case ProfileNumber.DDCDRW:      return MediaType.DDCDRW;
-                case ProfileNumber.DVDDownload: return MediaType.DVDDownload;
-                case ProfileNumber.DVDRAM:      return MediaType.DVDRAM;
-                case ProfileNumber.DVDRDLJump:
-                case ProfileNumber.DVDRDLSeq: return MediaType.DVDRDL;
-                case ProfileNumber.DVDRDLPlus:  return MediaType.DVDPRDL;
-                case ProfileNumber.DVDROM:      return MediaType.DVDROM;
-                case ProfileNumber.DVDRPlus:    return MediaType.DVDPR;
-                case ProfileNumber.DVDRSeq:     return MediaType.DVDR;
-                case ProfileNumber.DVDRWDL:     return MediaType.DVDRWDL;
-                case ProfileNumber.DVDRWDLPlus: return MediaType.DVDPRWDL;
-                case ProfileNumber.DVDRWPlus:   return MediaType.DVDPRW;
-                case ProfileNumber.DVDRWRes:
-                case ProfileNumber.DVDRWSeq: return MediaType.DVDRW;
-                case ProfileNumber.HDDVDR:    return MediaType.HDDVDR;
-                case ProfileNumber.HDDVDRAM:  return MediaType.HDDVDRAM;
-                case ProfileNumber.HDDVDRDL:  return MediaType.HDDVDRDL;
-                case ProfileNumber.HDDVDROM:  return MediaType.HDDVDROM;
-                case ProfileNumber.HDDVDRW:   return MediaType.HDDVDRW;
-                case ProfileNumber.HDDVDRWDL: return MediaType.HDDVDRWDL;
-                case ProfileNumber.ASMO:
-                case ProfileNumber.MOErasable: return MediaType.UnknownMO;
-                case ProfileNumber.NonRemovable: return MediaType.GENERIC_HDD;
-                default:                         return MediaType.CD;
-            }
+            case TrackType.Mode1:   return CommonTypes.Enums.TrackType.CdMode1;
+            case TrackType.Mode2F1: return CommonTypes.Enums.TrackType.CdMode2Form1;
+            case TrackType.Mode2F2: return CommonTypes.Enums.TrackType.CdMode2Form2;
+            case TrackType.Mode2:   return CommonTypes.Enums.TrackType.CdMode2Formless;
+            case TrackType.Audio:   return CommonTypes.Enums.TrackType.Audio;
+            default:                return CommonTypes.Enums.TrackType.Data;
+        }
+    }
+
+    static MediaType BlindWriteProfileToMediaType(ProfileNumber profile)
+    {
+        switch(profile)
+        {
+            case ProfileNumber.BDRE:  return MediaType.BDRE;
+            case ProfileNumber.BDROM: return MediaType.BDROM;
+            case ProfileNumber.BDRRdm:
+            case ProfileNumber.BDRSeq: return MediaType.BDR;
+            case ProfileNumber.CDR:
+            case ProfileNumber.HDBURNR: return MediaType.CDR;
+            case ProfileNumber.CDROM:
+            case ProfileNumber.HDBURNROM: return MediaType.CDROM;
+            case ProfileNumber.CDRW:
+            case ProfileNumber.HDBURNRW: return MediaType.CDRW;
+            case ProfileNumber.DDCDR:       return MediaType.DDCDR;
+            case ProfileNumber.DDCDROM:     return MediaType.DDCD;
+            case ProfileNumber.DDCDRW:      return MediaType.DDCDRW;
+            case ProfileNumber.DVDDownload: return MediaType.DVDDownload;
+            case ProfileNumber.DVDRAM:      return MediaType.DVDRAM;
+            case ProfileNumber.DVDRDLJump:
+            case ProfileNumber.DVDRDLSeq: return MediaType.DVDRDL;
+            case ProfileNumber.DVDRDLPlus:  return MediaType.DVDPRDL;
+            case ProfileNumber.DVDROM:      return MediaType.DVDROM;
+            case ProfileNumber.DVDRPlus:    return MediaType.DVDPR;
+            case ProfileNumber.DVDRSeq:     return MediaType.DVDR;
+            case ProfileNumber.DVDRWDL:     return MediaType.DVDRWDL;
+            case ProfileNumber.DVDRWDLPlus: return MediaType.DVDPRWDL;
+            case ProfileNumber.DVDRWPlus:   return MediaType.DVDPRW;
+            case ProfileNumber.DVDRWRes:
+            case ProfileNumber.DVDRWSeq: return MediaType.DVDRW;
+            case ProfileNumber.HDDVDR:    return MediaType.HDDVDR;
+            case ProfileNumber.HDDVDRAM:  return MediaType.HDDVDRAM;
+            case ProfileNumber.HDDVDRDL:  return MediaType.HDDVDRDL;
+            case ProfileNumber.HDDVDROM:  return MediaType.HDDVDROM;
+            case ProfileNumber.HDDVDRW:   return MediaType.HDDVDRW;
+            case ProfileNumber.HDDVDRWDL: return MediaType.HDDVDRWDL;
+            case ProfileNumber.ASMO:
+            case ProfileNumber.MOErasable: return MediaType.UnknownMO;
+            case ProfileNumber.NonRemovable: return MediaType.GENERIC_HDD;
+            default:                         return MediaType.CD;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/Identify.cs b/Aaru.Images/BlindWrite5/Identify.cs
index 101dcbdbb..8edc86643 100644
--- a/Aaru.Images/BlindWrite5/Identify.cs
+++ b/Aaru.Images/BlindWrite5/Identify.cs
@@ -34,27 +34,26 @@ using System.IO;
 using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite5
 {
-    public sealed partial class BlindWrite5
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 276)
-                return false;
+        if(stream.Length < 276)
+            return false;
 
-            byte[] signature = new byte[16];
-            stream.Read(signature, 0, 16);
+        byte[] signature = new byte[16];
+        stream.Read(signature, 0, 16);
 
-            byte[] footer = new byte[16];
-            stream.Seek(-16, SeekOrigin.End);
-            stream.Read(footer, 0, 16);
+        byte[] footer = new byte[16];
+        stream.Seek(-16, SeekOrigin.End);
+        stream.Read(footer, 0, 16);
 
-            return _bw5Signature.SequenceEqual(signature) && _bw5Footer.SequenceEqual(footer);
-        }
+        return _bw5Signature.SequenceEqual(signature) && _bw5Footer.SequenceEqual(footer);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/Properties.cs b/Aaru.Images/BlindWrite5/Properties.cs
index e27d05cb4..079a597e1 100644
--- a/Aaru.Images/BlindWrite5/Properties.cs
+++ b/Aaru.Images/BlindWrite5/Properties.cs
@@ -36,34 +36,33 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite5
 {
-    public sealed partial class BlindWrite5
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
 
-        /// <inheritdoc />
-        public string Name => "BlindWrite 5";
-        /// <inheritdoc />
-        public Guid Id => new Guid("9CB7A381-0509-4F9F-B801-3F65434BC3EE");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "BlindWrite 5 TOC file";
+    /// <inheritdoc />
+    public string Name => "BlindWrite 5";
+    /// <inheritdoc />
+    public Guid Id => new Guid("9CB7A381-0509-4F9F-B801-3F65434BC3EE");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "BlindWrite 5 TOC file";
 
-        /// <inheritdoc />
-        public List<Partition> Partitions { get; private set; }
+    /// <inheritdoc />
+    public List<Partition> Partitions { get; private set; }
 
-        /// <inheritdoc />
-        public List<Track> Tracks { get; private set; }
+    /// <inheritdoc />
+    public List<Track> Tracks { get; private set; }
 
-        /// <inheritdoc />
-        public List<Session> Sessions { get; private set; }
+    /// <inheritdoc />
+    public List<Session> Sessions { get; private set; }
 
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/Read.cs b/Aaru.Images/BlindWrite5/Read.cs
index 7f29e96b6..a508fbde6 100644
--- a/Aaru.Images/BlindWrite5/Read.cs
+++ b/Aaru.Images/BlindWrite5/Read.cs
@@ -51,429 +51,438 @@ using Aaru.Helpers;
 using DMI = Aaru.Decoders.Xbox.DMI;
 using Session = Aaru.CommonTypes.Structs.Session;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite5
 {
-    public sealed partial class BlindWrite5
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 276)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] hdr = new byte[260];
+        stream.Read(hdr, 0, 260);
+        _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.signature = {0}",
+                                   StringHandlers.CToString(_header.signature));
+
+        for(int i = 0; i < _header.unknown1.Length; i++)
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown1[{1}] = 0x{0:X8}", _header.unknown1[i],
+                                       i);
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.profile = {0}", _header.profile);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.sessions = {0}", _header.sessions);
+
+        for(int i = 0; i < _header.unknown2.Length; i++)
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown2[{1}] = 0x{0:X8}", _header.unknown2[i],
+                                       i);
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.mcnIsValid = {0}", _header.mcnIsValid);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.mcn = {0}", StringHandlers.CToString(_header.mcn));
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown3 = 0x{0:X4}", _header.unknown3);
+
+        for(int i = 0; i < _header.unknown4.Length; i++)
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown4[{1}] = 0x{0:X8}", _header.unknown4[i],
+                                       i);
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.pmaLen = {0}", _header.pmaLen);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.atipLen = {0}", _header.atipLen);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.cdtLen = {0}", _header.cdtLen);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.cdInfoLen = {0}", _header.cdInfoLen);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.bcaLen = {0}", _header.bcaLen);
+
+        for(int i = 0; i < _header.unknown5.Length; i++)
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown5[{1}] = 0x{0:X8}", _header.unknown5[i],
+                                       i);
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.dvdStrLen = {0}", _header.dvdStrLen);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.dvdInfoLen = {0}", _header.dvdInfoLen);
+
+        for(int i = 0; i < _header.unknown6.Length; i++)
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown6[{1}] = 0x{0:X2}", _header.unknown6[i],
+                                       i);
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.manufacturer = {0}",
+                                   StringHandlers.CToString(_header.manufacturer));
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.product = {0}",
+                                   StringHandlers.CToString(_header.product));
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.revision = {0}",
+                                   StringHandlers.CToString(_header.revision));
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.vendor = {0}",
+                                   StringHandlers.CToString(_header.vendor));
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.volumeId = {0}",
+                                   StringHandlers.CToString(_header.volumeId));
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.mode2ALen = {0}", _header.mode2ALen);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unkBlkLen = {0}", _header.unkBlkLen);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.dataLen = {0}", _header.dataLen);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.sessionsLen = {0}", _header.sessionsLen);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.dpmLen = {0}", _header.dpmLen);
+
+        _mode2A = new byte[_header.mode2ALen];
+
+        if(_mode2A.Length > 0)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            stream.Read(_mode2A, 0, _mode2A.Length);
+            _mode2A[1] -= 2;
+            var decoded2A = ModePage_2A.Decode(_mode2A);
 
-            if(stream.Length < 276)
-                return ErrorNumber.InvalidArgument;
+            if(!(decoded2A is null))
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "mode page 2A: {0}",
+                                           Modes.PrettifyModePage_2A(decoded2A));
+            else
+                _mode2A = null;
+        }
 
-            byte[] hdr = new byte[260];
-            stream.Read(hdr, 0, 260);
-            _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
+        _unkBlock = new byte[_header.unkBlkLen];
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.signature = {0}",
-                                       StringHandlers.CToString(_header.signature));
+        if(_unkBlock.Length > 0)
+            stream.Read(_unkBlock, 0, _unkBlock.Length);
 
-            for(int i = 0; i < _header.unknown1.Length; i++)
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown1[{1}] = 0x{0:X8}", _header.unknown1[i],
-                                           i);
+        byte[] temp = new byte[_header.pmaLen];
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.profile = {0}", _header.profile);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.sessions = {0}", _header.sessions);
+        if(temp.Length > 0)
+        {
+            byte[] tushort = BitConverter.GetBytes((ushort)(temp.Length + 2));
+            stream.Read(temp, 0, temp.Length);
+            _pma    = new byte[temp.Length + 4];
+            _pma[0] = tushort[1];
+            _pma[1] = tushort[0];
+            Array.Copy(temp, 0, _pma, 4, temp.Length);
 
-            for(int i = 0; i < _header.unknown2.Length; i++)
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown2[{1}] = 0x{0:X8}", _header.unknown2[i],
-                                           i);
+            PMA.CDPMA? decodedPma = PMA.Decode(_pma);
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.mcnIsValid = {0}", _header.mcnIsValid);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.mcn = {0}", StringHandlers.CToString(_header.mcn));
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown3 = 0x{0:X4}", _header.unknown3);
+            if(decodedPma.HasValue)
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "PMA: {0}", PMA.Prettify(decodedPma));
+            else
+                _pma = null;
+        }
 
-            for(int i = 0; i < _header.unknown4.Length; i++)
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown4[{1}] = 0x{0:X8}", _header.unknown4[i],
-                                           i);
+        _atip = new byte[_header.atipLen];
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.pmaLen = {0}", _header.pmaLen);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.atipLen = {0}", _header.atipLen);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.cdtLen = {0}", _header.cdtLen);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.cdInfoLen = {0}", _header.cdInfoLen);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.bcaLen = {0}", _header.bcaLen);
+        if(_atip.Length > 0)
+            stream.Read(_atip, 0, _atip.Length);
+        else
+            _atip = null;
 
-            for(int i = 0; i < _header.unknown5.Length; i++)
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown5[{1}] = 0x{0:X8}", _header.unknown5[i],
-                                           i);
+        _cdtext = new byte[_header.cdtLen];
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.dvdStrLen = {0}", _header.dvdStrLen);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.dvdInfoLen = {0}", _header.dvdInfoLen);
+        if(_cdtext.Length > 0)
+            stream.Read(_cdtext, 0, _cdtext.Length);
+        else
+            _cdtext = null;
 
-            for(int i = 0; i < _header.unknown6.Length; i++)
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unknown6[{1}] = 0x{0:X2}", _header.unknown6[i],
-                                           i);
+        _bca = new byte[_header.bcaLen];
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.manufacturer = {0}",
-                                       StringHandlers.CToString(_header.manufacturer));
+        if(_bca.Length > 0)
+            stream.Read(_bca, 0, _bca.Length);
+        else
+            _bca = null;
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.product = {0}",
-                                       StringHandlers.CToString(_header.product));
+        temp = new byte[_header.dvdStrLen];
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.revision = {0}",
-                                       StringHandlers.CToString(_header.revision));
+        if(temp.Length > 0)
+        {
+            stream.Read(temp, 0, temp.Length);
+            _dmi = new byte[2052];
+            _pfi = new byte[2052];
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.vendor = {0}",
-                                       StringHandlers.CToString(_header.vendor));
+            // TODO: CMI
+            Array.Copy(temp, 2, _dmi, 4, 2048);
+            Array.Copy(temp, 0x802, _pfi, 4, 2048);
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.volumeId = {0}",
-                                       StringHandlers.CToString(_header.volumeId));
+            _pfi[0] = 0x08;
+            _pfi[1] = 0x02;
+            _dmi[0] = 0x08;
+            _dmi[1] = 0x02;
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.mode2ALen = {0}", _header.mode2ALen);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.unkBlkLen = {0}", _header.unkBlkLen);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.dataLen = {0}", _header.dataLen);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.sessionsLen = {0}", _header.sessionsLen);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "header.dpmLen = {0}", _header.dpmLen);
+            PFI.PhysicalFormatInformation? decodedPfi = PFI.Decode(_pfi, MediaType.DVDROM);
 
-            _mode2A = new byte[_header.mode2ALen];
-
-            if(_mode2A.Length > 0)
+            if(decodedPfi.HasValue)
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "PFI: {0}", PFI.Prettify(decodedPfi));
+            else
             {
-                stream.Read(_mode2A, 0, _mode2A.Length);
-                _mode2A[1] -= 2;
-                var decoded2A = ModePage_2A.Decode(_mode2A);
-
-                if(!(decoded2A is null))
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "mode page 2A: {0}",
-                                               Modes.PrettifyModePage_2A(decoded2A));
-                else
-                    _mode2A = null;
+                _pfi = null;
+                _dmi = null;
             }
+        }
 
-            _unkBlock = new byte[_header.unkBlkLen];
+        switch(_header.profile)
+        {
+            case ProfileNumber.CDR:
+            case ProfileNumber.CDROM:
+            case ProfileNumber.CDRW:
+            case ProfileNumber.DDCDR:
+            case ProfileNumber.DDCDROM:
+            case ProfileNumber.DDCDRW:
+            case ProfileNumber.HDBURNROM:
+            case ProfileNumber.HDBURNR:
+            case ProfileNumber.HDBURNRW:
+                _discInformation = new byte[_header.cdInfoLen];
 
-            if(_unkBlock.Length > 0)
-                stream.Read(_unkBlock, 0, _unkBlock.Length);
+                break;
+            default:
+                _discInformation = new byte[_header.dvdInfoLen];
 
-            byte[] temp = new byte[_header.pmaLen];
+                break;
+        }
 
-            if(temp.Length > 0)
+        if(_discInformation.Length > 0)
+        {
+            stream.Read(_discInformation, 0, _discInformation.Length);
+
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Disc information: {0}",
+                                       PrintHex.ByteArrayToHexArrayString(_discInformation, 40));
+        }
+        else
+            _discInformation = null;
+
+        // How many data blocks
+        byte[] tmpArray = new byte[4];
+        stream.Read(tmpArray, 0, tmpArray.Length);
+        uint dataBlockCount = BitConverter.ToUInt32(tmpArray, 0);
+
+        stream.Read(tmpArray, 0, tmpArray.Length);
+        uint   dataPathLen   = BitConverter.ToUInt32(tmpArray, 0);
+        byte[] dataPathBytes = new byte[dataPathLen];
+        stream.Read(dataPathBytes, 0, dataPathBytes.Length);
+        _dataPath = Encoding.Unicode.GetString(dataPathBytes);
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Data path: {0}", _dataPath);
+
+        _dataFiles = new List<DataFile>();
+
+        for(int cD = 0; cD < dataBlockCount; cD++)
+        {
+            tmpArray = new byte[52];
+
+            var dataFile = new DataFile
             {
-                byte[] tushort = BitConverter.GetBytes((ushort)(temp.Length + 2));
-                stream.Read(temp, 0, temp.Length);
-                _pma    = new byte[temp.Length + 4];
-                _pma[0] = tushort[1];
-                _pma[1] = tushort[0];
-                Array.Copy(temp, 0, _pma, 4, temp.Length);
+                Unknown1 = new uint[4],
+                Unknown2 = new uint[3]
+            };
 
-                PMA.CDPMA? decodedPma = PMA.Decode(_pma);
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            dataFile.Type          = BitConverter.ToUInt32(tmpArray, 0);
+            dataFile.Length        = BitConverter.ToUInt32(tmpArray, 4);
+            dataFile.Unknown1[0]   = BitConverter.ToUInt32(tmpArray, 8);
+            dataFile.Unknown1[1]   = BitConverter.ToUInt32(tmpArray, 12);
+            dataFile.Unknown1[2]   = BitConverter.ToUInt32(tmpArray, 16);
+            dataFile.Unknown1[3]   = BitConverter.ToUInt32(tmpArray, 20);
+            dataFile.Offset        = BitConverter.ToUInt32(tmpArray, 24);
+            dataFile.Unknown2[0]   = BitConverter.ToUInt32(tmpArray, 28);
+            dataFile.Unknown2[1]   = BitConverter.ToUInt32(tmpArray, 32);
+            dataFile.Unknown2[2]   = BitConverter.ToUInt32(tmpArray, 36);
+            dataFile.StartLba      = BitConverter.ToInt32(tmpArray, 40);
+            dataFile.Sectors       = BitConverter.ToInt32(tmpArray, 44);
+            dataFile.FilenameLen   = BitConverter.ToUInt32(tmpArray, 48);
+            dataFile.FilenameBytes = new byte[dataFile.FilenameLen];
 
-                if(decodedPma.HasValue)
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "PMA: {0}", PMA.Prettify(decodedPma));
-                else
-                    _pma = null;
-            }
+            tmpArray = new byte[dataFile.FilenameLen];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            dataFile.FilenameBytes = tmpArray;
+            tmpArray               = new byte[4];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            dataFile.Unknown3 = BitConverter.ToUInt32(tmpArray, 0);
 
-            _atip = new byte[_header.atipLen];
+            dataFile.Filename = Encoding.Unicode.GetString(dataFile.FilenameBytes);
+            _dataFiles.Add(dataFile);
 
-            if(_atip.Length > 0)
-                stream.Read(_atip, 0, _atip.Length);
-            else
-                _atip = null;
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.type = 0x{0:X8}", dataFile.Type);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.length = {0}", dataFile.Length);
 
-            _cdtext = new byte[_header.cdtLen];
+            for(int i = 0; i < dataFile.Unknown1.Length; i++)
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.unknown1[{1}] = {0}",
+                                           dataFile.Unknown1[i], i);
 
-            if(_cdtext.Length > 0)
-                stream.Read(_cdtext, 0, _cdtext.Length);
-            else
-                _cdtext = null;
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.offset = {0}", dataFile.Offset);
 
-            _bca = new byte[_header.bcaLen];
+            for(int i = 0; i < dataFile.Unknown2.Length; i++)
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.unknown2[{1}] = {0}",
+                                           dataFile.Unknown2[i], i);
 
-            if(_bca.Length > 0)
-                stream.Read(_bca, 0, _bca.Length);
-            else
-                _bca = null;
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.startLba = {0}", dataFile.StartLba);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.sectors = {0}", dataFile.Sectors);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.filenameLen = {0}", dataFile.FilenameLen);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.filename = {0}", dataFile.Filename);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.unknown3 = {0}", dataFile.Unknown3);
+        }
 
-            temp = new byte[_header.dvdStrLen];
+        _bwSessions = new List<SessionDescriptor>();
 
-            if(temp.Length > 0)
+        for(int ses = 0; ses < _header.sessions; ses++)
+        {
+            var session = new SessionDescriptor();
+            tmpArray = new byte[16];
+            stream.Read(tmpArray, 0, tmpArray.Length);
+            session.Sequence   = BitConverter.ToUInt16(tmpArray, 0);
+            session.Entries    = tmpArray[2];
+            session.Unknown    = tmpArray[3];
+            session.Start      = BitConverter.ToInt32(tmpArray, 4);
+            session.End        = BitConverter.ToInt32(tmpArray, 8);
+            session.FirstTrack = BitConverter.ToUInt16(tmpArray, 12);
+            session.LastTrack  = BitConverter.ToUInt16(tmpArray, 14);
+            session.Tracks     = new TrackDescriptor[session.Entries];
+
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].filename = {1}", ses, session.Sequence);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].entries = {1}", ses, session.Entries);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].unknown = {1}", ses, session.Unknown);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].start = {1}", ses, session.Start);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].end = {1}", ses, session.End);
+
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].firstTrack = {1}", ses,
+                                       session.FirstTrack);
+
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].lastTrack = {1}", ses,
+                                       session.LastTrack);
+
+            for(int tSeq = 0; tSeq < session.Entries; tSeq++)
             {
-                stream.Read(temp, 0, temp.Length);
-                _dmi = new byte[2052];
-                _pfi = new byte[2052];
+                byte[] trk = new byte[72];
+                stream.Read(trk, 0, 72);
+                session.Tracks[tSeq] = Marshal.ByteArrayToStructureLittleEndian<TrackDescriptor>(trk);
 
-                // TODO: CMI
-                Array.Copy(temp, 2, _dmi, 4, 2048);
-                Array.Copy(temp, 0x802, _pfi, 4, 2048);
-
-                _pfi[0] = 0x08;
-                _pfi[1] = 0x02;
-                _dmi[0] = 0x08;
-                _dmi[1] = 0x02;
-
-                PFI.PhysicalFormatInformation? decodedPfi = PFI.Decode(_pfi, MediaType.DVDROM);
-
-                if(decodedPfi.HasValue)
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "PFI: {0}", PFI.Prettify(decodedPfi));
-                else
+                if(session.Tracks[tSeq].type == TrackType.Dvd ||
+                   session.Tracks[tSeq].type == TrackType.NotData)
                 {
-                    _pfi = null;
-                    _dmi = null;
+                    session.Tracks[tSeq].unknown9[0] = 0;
+                    session.Tracks[tSeq].unknown9[1] = 0;
+                    stream.Seek(-8, SeekOrigin.Current);
+                }
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].type = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].type);
+
+                for(int i = 0; i < session.Tracks[tSeq].unknown1.Length; i++)
+                    AaruConsole.DebugWriteLine("BlindWrite5 plugin",
+                                               "session[{0}].track[{1}].unknown1[{2}] = 0x{3:X2}", ses, tSeq, i,
+                                               session.Tracks[tSeq].unknown1[i]);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown2 = 0x{2:X8}", ses,
+                                           tSeq, session.Tracks[tSeq].unknown2);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].subchannel = {2}", ses,
+                                           tSeq, session.Tracks[tSeq].subchannel);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown3 = 0x{2:X2}", ses,
+                                           tSeq, session.Tracks[tSeq].unknown3);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].ctl = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].ctl);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].adr = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].adr);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].point = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].point);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown4 = 0x{2:X2}", ses,
+                                           tSeq, session.Tracks[tSeq].tno);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].min = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].min);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].sec = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].sec);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].frame = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].frame);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].zero = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].zero);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].pmin = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].pmin);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].psec = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].psec);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].pframe = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].pframe);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown5 = 0x{2:X2}", ses,
+                                           tSeq, session.Tracks[tSeq].unknown5);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].pregap = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].pregap);
+
+                for(int i = 0; i < session.Tracks[tSeq].unknown6.Length; i++)
+                    AaruConsole.DebugWriteLine("BlindWrite5 plugin",
+                                               "session[{0}].track[{1}].unknown6[{2}] = 0x{3:X8}", ses, tSeq, i,
+                                               session.Tracks[tSeq].unknown6[i]);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].startLba = {2}", ses,
+                                           tSeq, session.Tracks[tSeq].startLba);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].sectors = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].sectors);
+
+                for(int i = 0; i < session.Tracks[tSeq].unknown7.Length; i++)
+                    AaruConsole.DebugWriteLine("BlindWrite5 plugin",
+                                               "session[{0}].track[{1}].unknown7[{2}] = 0x{3:X8}", ses, tSeq, i,
+                                               session.Tracks[tSeq].unknown7[i]);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].session = {2}", ses, tSeq,
+                                           session.Tracks[tSeq].session);
+
+                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown8 = 0x{2:X4}", ses,
+                                           tSeq, session.Tracks[tSeq].unknown8);
+
+                if(session.Tracks[tSeq].type == TrackType.Dvd ||
+                   session.Tracks[tSeq].type == TrackType.NotData)
+                    continue;
+
+                {
+                    for(int i = 0; i < session.Tracks[tSeq].unknown9.Length; i++)
+                        AaruConsole.DebugWriteLine("BlindWrite5 plugin",
+                                                   "session[{0}].track[{1}].unknown9[{2}] = 0x{3:X8}", ses, tSeq, i,
+                                                   session.Tracks[tSeq].unknown9[i]);
                 }
             }
 
-            switch(_header.profile)
+            _bwSessions.Add(session);
+        }
+
+        _dpm = new byte[_header.dpmLen];
+        stream.Read(_dpm, 0, _dpm.Length);
+
+        // Unused
+        tmpArray = new byte[4];
+        stream.Read(tmpArray, 0, tmpArray.Length);
+
+        byte[] footer = new byte[16];
+        stream.Read(footer, 0, footer.Length);
+
+        if(_bw5Footer.SequenceEqual(footer))
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Correctly arrived end of image");
+        else
+            AaruConsole.
+                ErrorWriteLine("BlindWrite5 image ends after expected position. Probably new version with different data. Errors may occur.");
+
+        _filePaths = new List<DataFileCharacteristics>();
+
+        foreach(DataFile dataFile in _dataFiles)
+        {
+            var    chars       = new DataFileCharacteristics();
+            string path        = Path.Combine(_dataPath, dataFile.Filename);
+            var    filtersList = new FiltersList();
+
+            if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null)
             {
-                case ProfileNumber.CDR:
-                case ProfileNumber.CDROM:
-                case ProfileNumber.CDRW:
-                case ProfileNumber.DDCDR:
-                case ProfileNumber.DDCDROM:
-                case ProfileNumber.DDCDRW:
-                case ProfileNumber.HDBURNROM:
-                case ProfileNumber.HDBURNR:
-                case ProfileNumber.HDBURNRW:
-                    _discInformation = new byte[_header.cdInfoLen];
-
-                    break;
-                default:
-                    _discInformation = new byte[_header.dvdInfoLen];
-
-                    break;
-            }
-
-            if(_discInformation.Length > 0)
-            {
-                stream.Read(_discInformation, 0, _discInformation.Length);
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Disc information: {0}",
-                                           PrintHex.ByteArrayToHexArrayString(_discInformation, 40));
+                chars.FileFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path));
+                chars.FilePath   = path;
             }
             else
-                _discInformation = null;
-
-            // How many data blocks
-            byte[] tmpArray = new byte[4];
-            stream.Read(tmpArray, 0, tmpArray.Length);
-            uint dataBlockCount = BitConverter.ToUInt32(tmpArray, 0);
-
-            stream.Read(tmpArray, 0, tmpArray.Length);
-            uint   dataPathLen   = BitConverter.ToUInt32(tmpArray, 0);
-            byte[] dataPathBytes = new byte[dataPathLen];
-            stream.Read(dataPathBytes, 0, dataPathBytes.Length);
-            _dataPath = Encoding.Unicode.GetString(dataPathBytes);
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Data path: {0}", _dataPath);
-
-            _dataFiles = new List<DataFile>();
-
-            for(int cD = 0; cD < dataBlockCount; cD++)
             {
-                tmpArray = new byte[52];
-
-                var dataFile = new DataFile
-                {
-                    Unknown1 = new uint[4],
-                    Unknown2 = new uint[3]
-                };
-
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                dataFile.Type          = BitConverter.ToUInt32(tmpArray, 0);
-                dataFile.Length        = BitConverter.ToUInt32(tmpArray, 4);
-                dataFile.Unknown1[0]   = BitConverter.ToUInt32(tmpArray, 8);
-                dataFile.Unknown1[1]   = BitConverter.ToUInt32(tmpArray, 12);
-                dataFile.Unknown1[2]   = BitConverter.ToUInt32(tmpArray, 16);
-                dataFile.Unknown1[3]   = BitConverter.ToUInt32(tmpArray, 20);
-                dataFile.Offset        = BitConverter.ToUInt32(tmpArray, 24);
-                dataFile.Unknown2[0]   = BitConverter.ToUInt32(tmpArray, 28);
-                dataFile.Unknown2[1]   = BitConverter.ToUInt32(tmpArray, 32);
-                dataFile.Unknown2[2]   = BitConverter.ToUInt32(tmpArray, 36);
-                dataFile.StartLba      = BitConverter.ToInt32(tmpArray, 40);
-                dataFile.Sectors       = BitConverter.ToInt32(tmpArray, 44);
-                dataFile.FilenameLen   = BitConverter.ToUInt32(tmpArray, 48);
-                dataFile.FilenameBytes = new byte[dataFile.FilenameLen];
-
-                tmpArray = new byte[dataFile.FilenameLen];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                dataFile.FilenameBytes = tmpArray;
-                tmpArray               = new byte[4];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                dataFile.Unknown3 = BitConverter.ToUInt32(tmpArray, 0);
-
-                dataFile.Filename = Encoding.Unicode.GetString(dataFile.FilenameBytes);
-                _dataFiles.Add(dataFile);
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.type = 0x{0:X8}", dataFile.Type);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.length = {0}", dataFile.Length);
-
-                for(int i = 0; i < dataFile.Unknown1.Length; i++)
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.unknown1[{1}] = {0}",
-                                               dataFile.Unknown1[i], i);
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.offset = {0}", dataFile.Offset);
-
-                for(int i = 0; i < dataFile.Unknown2.Length; i++)
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.unknown2[{1}] = {0}",
-                                               dataFile.Unknown2[i], i);
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.startLba = {0}", dataFile.StartLba);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.sectors = {0}", dataFile.Sectors);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.filenameLen = {0}", dataFile.FilenameLen);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.filename = {0}", dataFile.Filename);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "dataFile.unknown3 = {0}", dataFile.Unknown3);
-            }
-
-            _bwSessions = new List<SessionDescriptor>();
-
-            for(int ses = 0; ses < _header.sessions; ses++)
-            {
-                var session = new SessionDescriptor();
-                tmpArray = new byte[16];
-                stream.Read(tmpArray, 0, tmpArray.Length);
-                session.Sequence   = BitConverter.ToUInt16(tmpArray, 0);
-                session.Entries    = tmpArray[2];
-                session.Unknown    = tmpArray[3];
-                session.Start      = BitConverter.ToInt32(tmpArray, 4);
-                session.End        = BitConverter.ToInt32(tmpArray, 8);
-                session.FirstTrack = BitConverter.ToUInt16(tmpArray, 12);
-                session.LastTrack  = BitConverter.ToUInt16(tmpArray, 14);
-                session.Tracks     = new TrackDescriptor[session.Entries];
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].filename = {1}", ses, session.Sequence);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].entries = {1}", ses, session.Entries);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].unknown = {1}", ses, session.Unknown);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].start = {1}", ses, session.Start);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].end = {1}", ses, session.End);
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].firstTrack = {1}", ses,
-                                           session.FirstTrack);
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].lastTrack = {1}", ses,
-                                           session.LastTrack);
-
-                for(int tSeq = 0; tSeq < session.Entries; tSeq++)
-                {
-                    byte[] trk = new byte[72];
-                    stream.Read(trk, 0, 72);
-                    session.Tracks[tSeq] = Marshal.ByteArrayToStructureLittleEndian<TrackDescriptor>(trk);
-
-                    if(session.Tracks[tSeq].type == TrackType.Dvd ||
-                       session.Tracks[tSeq].type == TrackType.NotData)
-                    {
-                        session.Tracks[tSeq].unknown9[0] = 0;
-                        session.Tracks[tSeq].unknown9[1] = 0;
-                        stream.Seek(-8, SeekOrigin.Current);
-                    }
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].type = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].type);
-
-                    for(int i = 0; i < session.Tracks[tSeq].unknown1.Length; i++)
-                        AaruConsole.DebugWriteLine("BlindWrite5 plugin",
-                                                   "session[{0}].track[{1}].unknown1[{2}] = 0x{3:X2}", ses, tSeq, i,
-                                                   session.Tracks[tSeq].unknown1[i]);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown2 = 0x{2:X8}", ses,
-                                               tSeq, session.Tracks[tSeq].unknown2);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].subchannel = {2}", ses,
-                                               tSeq, session.Tracks[tSeq].subchannel);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown3 = 0x{2:X2}", ses,
-                                               tSeq, session.Tracks[tSeq].unknown3);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].ctl = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].ctl);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].adr = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].adr);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].point = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].point);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown4 = 0x{2:X2}", ses,
-                                               tSeq, session.Tracks[tSeq].tno);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].min = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].min);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].sec = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].sec);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].frame = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].frame);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].zero = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].zero);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].pmin = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].pmin);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].psec = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].psec);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].pframe = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].pframe);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown5 = 0x{2:X2}", ses,
-                                               tSeq, session.Tracks[tSeq].unknown5);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].pregap = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].pregap);
-
-                    for(int i = 0; i < session.Tracks[tSeq].unknown6.Length; i++)
-                        AaruConsole.DebugWriteLine("BlindWrite5 plugin",
-                                                   "session[{0}].track[{1}].unknown6[{2}] = 0x{3:X8}", ses, tSeq, i,
-                                                   session.Tracks[tSeq].unknown6[i]);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].startLba = {2}", ses,
-                                               tSeq, session.Tracks[tSeq].startLba);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].sectors = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].sectors);
-
-                    for(int i = 0; i < session.Tracks[tSeq].unknown7.Length; i++)
-                        AaruConsole.DebugWriteLine("BlindWrite5 plugin",
-                                                   "session[{0}].track[{1}].unknown7[{2}] = 0x{3:X8}", ses, tSeq, i,
-                                                   session.Tracks[tSeq].unknown7[i]);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].session = {2}", ses, tSeq,
-                                               session.Tracks[tSeq].session);
-
-                    AaruConsole.DebugWriteLine("BlindWrite5 plugin", "session[{0}].track[{1}].unknown8 = 0x{2:X4}", ses,
-                                               tSeq, session.Tracks[tSeq].unknown8);
-
-                    if(session.Tracks[tSeq].type == TrackType.Dvd ||
-                       session.Tracks[tSeq].type == TrackType.NotData)
-                        continue;
-
-                    {
-                        for(int i = 0; i < session.Tracks[tSeq].unknown9.Length; i++)
-                            AaruConsole.DebugWriteLine("BlindWrite5 plugin",
-                                                       "session[{0}].track[{1}].unknown9[{2}] = 0x{3:X8}", ses, tSeq, i,
-                                                       session.Tracks[tSeq].unknown9[i]);
-                    }
-                }
-
-                _bwSessions.Add(session);
-            }
-
-            _dpm = new byte[_header.dpmLen];
-            stream.Read(_dpm, 0, _dpm.Length);
-
-            // Unused
-            tmpArray = new byte[4];
-            stream.Read(tmpArray, 0, tmpArray.Length);
-
-            byte[] footer = new byte[16];
-            stream.Read(footer, 0, footer.Length);
-
-            if(_bw5Footer.SequenceEqual(footer))
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Correctly arrived end of image");
-            else
-                AaruConsole.
-                    ErrorWriteLine("BlindWrite5 image ends after expected position. Probably new version with different data. Errors may occur.");
-
-            _filePaths = new List<DataFileCharacteristics>();
-
-            foreach(DataFile dataFile in _dataFiles)
-            {
-                var    chars       = new DataFileCharacteristics();
-                string path        = Path.Combine(_dataPath, dataFile.Filename);
-                var    filtersList = new FiltersList();
+                path = Path.Combine(_dataPath, dataFile.Filename.ToLower(CultureInfo.CurrentCulture));
 
                 if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null)
                 {
@@ -482,7 +491,7 @@ namespace Aaru.DiscImages
                 }
                 else
                 {
-                    path = Path.Combine(_dataPath, dataFile.Filename.ToLower(CultureInfo.CurrentCulture));
+                    path = Path.Combine(_dataPath, dataFile.Filename.ToUpper(CultureInfo.CurrentCulture));
 
                     if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null)
                     {
@@ -491,1682 +500,1546 @@ namespace Aaru.DiscImages
                     }
                     else
                     {
-                        path = Path.Combine(_dataPath, dataFile.Filename.ToUpper(CultureInfo.CurrentCulture));
+                        path = Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture), dataFile.Filename);
 
                         if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null)
                         {
                             chars.FileFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path));
-                            chars.FilePath   = path;
+
+                            chars.FilePath = path;
                         }
                         else
                         {
-                            path = Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture), dataFile.Filename);
+                            path = Path.Combine(_dataPath.ToUpper(CultureInfo.CurrentCulture), dataFile.Filename);
 
                             if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null)
                             {
-                                chars.FileFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path));
+                                chars.FileFilter =
+                                    filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path));
 
                                 chars.FilePath = path;
                             }
                             else
                             {
-                                path = Path.Combine(_dataPath.ToUpper(CultureInfo.CurrentCulture), dataFile.Filename);
+                                path = Path.Combine(_dataPath, dataFile.Filename);
 
-                                if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path)) != null)
+                                if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                      path.ToLower(CultureInfo.CurrentCulture))) !=
+                                   null)
                                 {
-                                    chars.FileFilter =
-                                        filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder, path));
+                                    chars.FilePath = path.ToLower(CultureInfo.CurrentCulture);
 
-                                    chars.FilePath = path;
+                                    chars.FileFilter =
+                                        filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                           path.ToLower(CultureInfo.
+                                                                               CurrentCulture)));
+                                }
+                                else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                           path.ToUpper(CultureInfo.
+                                                                               CurrentCulture))) != null)
+                                {
+                                    chars.FilePath = path.ToUpper(CultureInfo.CurrentCulture);
+
+                                    chars.FileFilter =
+                                        filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                           path.ToUpper(CultureInfo.
+                                                                               CurrentCulture)));
+                                }
+                                else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                           dataFile.Filename.ToLower(CultureInfo.
+                                                                               CurrentCulture))) != null)
+                                {
+                                    chars.FilePath = dataFile.Filename.ToLower(CultureInfo.CurrentCulture);
+
+                                    chars.FileFilter =
+                                        filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                           dataFile.Filename.ToLower(CultureInfo.
+                                                                               CurrentCulture)));
+                                }
+                                else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                           dataFile.Filename.ToUpper(CultureInfo.
+                                                                               CurrentCulture))) != null)
+                                {
+                                    chars.FilePath = dataFile.Filename.ToUpper(CultureInfo.CurrentCulture);
+
+                                    chars.FileFilter =
+                                        filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                           dataFile.Filename.ToUpper(CultureInfo.
+                                                                               CurrentCulture)));
+                                }
+                                else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                           dataFile.Filename)) != null)
+                                {
+                                    chars.FilePath = dataFile.Filename;
+
+                                    chars.FileFilter =
+                                        filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                           dataFile.Filename));
                                 }
                                 else
                                 {
-                                    path = Path.Combine(_dataPath, dataFile.Filename);
+                                    AaruConsole.ErrorWriteLine("Cannot find data file {0}", dataFile.Filename);
 
-                                    if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                          path.ToLower(CultureInfo.CurrentCulture))) !=
-                                       null)
-                                    {
-                                        chars.FilePath = path.ToLower(CultureInfo.CurrentCulture);
-
-                                        chars.FileFilter =
-                                            filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                               path.ToLower(CultureInfo.
-                                                                                   CurrentCulture)));
-                                    }
-                                    else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                               path.ToUpper(CultureInfo.
-                                                                                   CurrentCulture))) != null)
-                                    {
-                                        chars.FilePath = path.ToUpper(CultureInfo.CurrentCulture);
-
-                                        chars.FileFilter =
-                                            filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                               path.ToUpper(CultureInfo.
-                                                                                   CurrentCulture)));
-                                    }
-                                    else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                               dataFile.Filename.ToLower(CultureInfo.
-                                                                                   CurrentCulture))) != null)
-                                    {
-                                        chars.FilePath = dataFile.Filename.ToLower(CultureInfo.CurrentCulture);
-
-                                        chars.FileFilter =
-                                            filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                               dataFile.Filename.ToLower(CultureInfo.
-                                                                                   CurrentCulture)));
-                                    }
-                                    else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                               dataFile.Filename.ToUpper(CultureInfo.
-                                                                                   CurrentCulture))) != null)
-                                    {
-                                        chars.FilePath = dataFile.Filename.ToUpper(CultureInfo.CurrentCulture);
-
-                                        chars.FileFilter =
-                                            filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                               dataFile.Filename.ToUpper(CultureInfo.
-                                                                                   CurrentCulture)));
-                                    }
-                                    else if(filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                               dataFile.Filename)) != null)
-                                    {
-                                        chars.FilePath = dataFile.Filename;
-
-                                        chars.FileFilter =
-                                            filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                               dataFile.Filename));
-                                    }
-                                    else
-                                    {
-                                        AaruConsole.ErrorWriteLine("Cannot find data file {0}", dataFile.Filename);
-
-                                        continue;
-                                    }
+                                    continue;
                                 }
                             }
                         }
                     }
                 }
-
-                long sectorSize = dataFile.Length / dataFile.Sectors;
-
-                if(sectorSize > 2352)
-                    switch(sectorSize - 2352)
-                    {
-                        case 16:
-                            chars.Subchannel = TrackSubchannelType.Q16Interleaved;
-
-                            break;
-                        case 96:
-                            chars.Subchannel = TrackSubchannelType.PackedInterleaved;
-
-                            break;
-                        default:
-                            AaruConsole.ErrorWriteLine("BlindWrite5 found unknown subchannel size: {0}",
-                                                       sectorSize - 2352);
-
-                            return ErrorNumber.NotSupported;
-                    }
-                else
-                    chars.Subchannel = TrackSubchannelType.None;
-
-                chars.SectorSize = sectorSize;
-                chars.StartLba   = dataFile.StartLba;
-                chars.Sectors    = dataFile.Sectors;
-                chars.Offset     = dataFile.Offset;
-
-                _filePaths.Add(chars);
             }
 
-            Sessions   = new List<Session>();
-            Tracks     = new List<Track>();
-            Partitions = new List<Partition>();
-            var fullTocStream = new MemoryStream();
+            long sectorSize = dataFile.Length / dataFile.Sectors;
 
-            fullTocStream.Write(new byte[]
-            {
-                0, 0
-            }, 0, 2);
-
-            ulong offsetBytes = 0;
-            _offsetMap = new Dictionary<uint, ulong>();
-            bool isDvd        = false;
-            byte firstSession = byte.MaxValue;
-            byte lastSession  = 0;
-            _trackFlags        = new Dictionary<uint, byte>();
-            _imageInfo.Sectors = 0;
-
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Building maps");
-
-            foreach(SessionDescriptor ses in _bwSessions)
-            {
-                Sessions.Add(new Session
+            if(sectorSize > 2352)
+                switch(sectorSize - 2352)
                 {
-                    Sequence    = ses.Sequence,
-                    StartSector = ses.Start < 0 ? 0 : (ulong)ses.Start,
-                    EndSector   = (ulong)ses.End - 1,
-                    StartTrack  = ses.FirstTrack,
-                    EndTrack    = ses.LastTrack
-                });
+                    case 16:
+                        chars.Subchannel = TrackSubchannelType.Q16Interleaved;
 
-                if(ses.Sequence < firstSession)
-                    firstSession = (byte)ses.Sequence;
+                        break;
+                    case 96:
+                        chars.Subchannel = TrackSubchannelType.PackedInterleaved;
 
-                if(ses.Sequence > lastSession)
-                    lastSession = (byte)ses.Sequence;
+                        break;
+                    default:
+                        AaruConsole.ErrorWriteLine("BlindWrite5 found unknown subchannel size: {0}",
+                                                   sectorSize - 2352);
 
-                foreach(TrackDescriptor trk in ses.Tracks)
+                        return ErrorNumber.NotSupported;
+                }
+            else
+                chars.Subchannel = TrackSubchannelType.None;
+
+            chars.SectorSize = sectorSize;
+            chars.StartLba   = dataFile.StartLba;
+            chars.Sectors    = dataFile.Sectors;
+            chars.Offset     = dataFile.Offset;
+
+            _filePaths.Add(chars);
+        }
+
+        Sessions   = new List<Session>();
+        Tracks     = new List<Track>();
+        Partitions = new List<Partition>();
+        var fullTocStream = new MemoryStream();
+
+        fullTocStream.Write(new byte[]
+        {
+            0, 0
+        }, 0, 2);
+
+        ulong offsetBytes = 0;
+        _offsetMap = new Dictionary<uint, ulong>();
+        bool isDvd        = false;
+        byte firstSession = byte.MaxValue;
+        byte lastSession  = 0;
+        _trackFlags        = new Dictionary<uint, byte>();
+        _imageInfo.Sectors = 0;
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Building maps");
+
+        foreach(SessionDescriptor ses in _bwSessions)
+        {
+            Sessions.Add(new Session
+            {
+                Sequence    = ses.Sequence,
+                StartSector = ses.Start < 0 ? 0 : (ulong)ses.Start,
+                EndSector   = (ulong)ses.End - 1,
+                StartTrack  = ses.FirstTrack,
+                EndTrack    = ses.LastTrack
+            });
+
+            if(ses.Sequence < firstSession)
+                firstSession = (byte)ses.Sequence;
+
+            if(ses.Sequence > lastSession)
+                lastSession = (byte)ses.Sequence;
+
+            foreach(TrackDescriptor trk in ses.Tracks)
+            {
+                byte adrCtl = (byte)((trk.adr << 4) + trk.ctl);
+                fullTocStream.WriteByte((byte)trk.session);
+                fullTocStream.WriteByte(adrCtl);
+                fullTocStream.WriteByte(0x00);
+                fullTocStream.WriteByte(trk.point);
+                fullTocStream.WriteByte(trk.min);
+                fullTocStream.WriteByte(trk.sec);
+                fullTocStream.WriteByte(trk.frame);
+                fullTocStream.WriteByte(trk.zero);
+                fullTocStream.WriteByte(trk.pmin);
+                fullTocStream.WriteByte(trk.psec);
+                fullTocStream.WriteByte(trk.pframe);
+
+                if(trk.point >= 0xA0)
+                    continue;
+
+                var track     = new Track();
+                var partition = new Partition();
+
+                _trackFlags.Add(trk.point, trk.ctl);
+
+                switch(trk.type)
                 {
-                    byte adrCtl = (byte)((trk.adr << 4) + trk.ctl);
-                    fullTocStream.WriteByte((byte)trk.session);
-                    fullTocStream.WriteByte(adrCtl);
-                    fullTocStream.WriteByte(0x00);
-                    fullTocStream.WriteByte(trk.point);
-                    fullTocStream.WriteByte(trk.min);
-                    fullTocStream.WriteByte(trk.sec);
-                    fullTocStream.WriteByte(trk.frame);
-                    fullTocStream.WriteByte(trk.zero);
-                    fullTocStream.WriteByte(trk.pmin);
-                    fullTocStream.WriteByte(trk.psec);
-                    fullTocStream.WriteByte(trk.pframe);
+                    case TrackType.Audio:
+                        track.BytesPerSector    = 2352;
+                        track.RawBytesPerSector = 2352;
 
-                    if(trk.point >= 0xA0)
-                        continue;
+                        if(_imageInfo.SectorSize < 2352)
+                            _imageInfo.SectorSize = 2352;
 
-                    var track     = new Track();
-                    var partition = new Partition();
+                        break;
+                    case TrackType.Mode1:
+                    case TrackType.Mode2F1:
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
 
-                    _trackFlags.Add(trk.point, trk.ctl);
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
 
-                    switch(trk.type)
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                        track.BytesPerSector    = 2048;
+                        track.RawBytesPerSector = 2352;
+
+                        if(_imageInfo.SectorSize < 2048)
+                            _imageInfo.SectorSize = 2048;
+
+                        break;
+                    case TrackType.Mode2:
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                        track.BytesPerSector    = 2336;
+                        track.RawBytesPerSector = 2352;
+
+                        if(_imageInfo.SectorSize < 2336)
+                            _imageInfo.SectorSize = 2336;
+
+                        break;
+                    case TrackType.Mode2F2:
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                        track.BytesPerSector    = 2336;
+                        track.RawBytesPerSector = 2352;
+
+                        if(_imageInfo.SectorSize < 2324)
+                            _imageInfo.SectorSize = 2324;
+
+                        break;
+                    case TrackType.Dvd:
+                        track.BytesPerSector    = 2048;
+                        track.RawBytesPerSector = 2048;
+
+                        if(_imageInfo.SectorSize < 2048)
+                            _imageInfo.SectorSize = 2048;
+
+                        isDvd = true;
+
+                        break;
+                }
+
+                track.Description = $"Track {trk.point}";
+                track.StartSector = (ulong)(trk.startLba + trk.pregap);
+                track.EndSector   = (ulong)(trk.sectors + trk.startLba) - 1;
+
+                List<DataFileCharacteristics> fileCharsForThisTrack = _filePaths.
+                                                                      Where(chars =>
+                                                                                trk.startLba >=
+                                                                                chars.StartLba &&
+                                                                                trk.startLba   + trk.sectors <=
+                                                                                chars.StartLba + chars.Sectors).
+                                                                      ToList();
+
+                if(fileCharsForThisTrack.Count == 0 &&
+                   _filePaths.Any(f => Path.GetExtension(f.FilePath).ToLowerInvariant() == ".b00"))
+                {
+                    DataFileCharacteristics splitStartChars =
+                        _filePaths.FirstOrDefault(f => Path.GetExtension(f.FilePath).ToLowerInvariant() == ".b00");
+
+                    string filename           = Path.GetFileNameWithoutExtension(splitStartChars.FilePath);
+                    bool   lowerCaseExtension = false;
+                    bool   lowerCaseFileName  = false;
+                    string basePath;
+
+                    bool version5 = string.Compare(Path.GetExtension(imageFilter.Filename), ".B5T",
+                                                   StringComparison.OrdinalIgnoreCase) == 0;
+
+                    string firstExtension      = version5 ? "B5I" : "B6I";
+                    string firstExtensionLower = version5 ? "b5i" : "b6i";
+
+                    if(File.Exists(Path.Combine(imageFilter.ParentFolder, $"{filename}.{firstExtension}")))
                     {
-                        case TrackType.Audio:
-                            track.BytesPerSector    = 2352;
-                            track.RawBytesPerSector = 2352;
-
-                            if(_imageInfo.SectorSize < 2352)
-                                _imageInfo.SectorSize = 2352;
-
-                            break;
-                        case TrackType.Mode1:
-                        case TrackType.Mode2F1:
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                            track.BytesPerSector    = 2048;
-                            track.RawBytesPerSector = 2352;
-
-                            if(_imageInfo.SectorSize < 2048)
-                                _imageInfo.SectorSize = 2048;
-
-                            break;
-                        case TrackType.Mode2:
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                            track.BytesPerSector    = 2336;
-                            track.RawBytesPerSector = 2352;
-
-                            if(_imageInfo.SectorSize < 2336)
-                                _imageInfo.SectorSize = 2336;
-
-                            break;
-                        case TrackType.Mode2F2:
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                            track.BytesPerSector    = 2336;
-                            track.RawBytesPerSector = 2352;
-
-                            if(_imageInfo.SectorSize < 2324)
-                                _imageInfo.SectorSize = 2324;
-
-                            break;
-                        case TrackType.Dvd:
-                            track.BytesPerSector    = 2048;
-                            track.RawBytesPerSector = 2048;
-
-                            if(_imageInfo.SectorSize < 2048)
-                                _imageInfo.SectorSize = 2048;
-
-                            isDvd = true;
-
-                            break;
+                        basePath = imageFilter.ParentFolder;
+                    }
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
+                                                     $"{filename}.{firstExtensionLower}")))
+                    {
+                        basePath           = imageFilter.ParentFolder;
+                        lowerCaseExtension = true;
+                    }
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
+                                                     $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
+                    {
+                        basePath          = imageFilter.ParentFolder;
+                        lowerCaseFileName = true;
+                    }
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
+                                                     $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
+                    {
+                        basePath           = imageFilter.ParentFolder;
+                        lowerCaseFileName  = true;
+                        lowerCaseExtension = true;
                     }
 
-                    track.Description = $"Track {trk.point}";
-                    track.StartSector = (ulong)(trk.startLba + trk.pregap);
-                    track.EndSector   = (ulong)(trk.sectors + trk.startLba) - 1;
-
-                    List<DataFileCharacteristics> fileCharsForThisTrack = _filePaths.
-                                                                          Where(chars =>
-                                                                                    trk.startLba >=
-                                                                                    chars.StartLba &&
-                                                                                    trk.startLba   + trk.sectors <=
-                                                                                    chars.StartLba + chars.Sectors).
-                                                                          ToList();
-
-                    if(fileCharsForThisTrack.Count == 0 &&
-                       _filePaths.Any(f => Path.GetExtension(f.FilePath).ToLowerInvariant() == ".b00"))
+                    else if(File.Exists(Path.Combine(_dataPath, $"{filename}.{firstExtension}")))
                     {
-                        DataFileCharacteristics splitStartChars =
-                            _filePaths.FirstOrDefault(f => Path.GetExtension(f.FilePath).ToLowerInvariant() == ".b00");
-
-                        string filename           = Path.GetFileNameWithoutExtension(splitStartChars.FilePath);
-                        bool   lowerCaseExtension = false;
-                        bool   lowerCaseFileName  = false;
-                        string basePath;
-
-                        bool version5 = string.Compare(Path.GetExtension(imageFilter.Filename), ".B5T",
-                                                       StringComparison.OrdinalIgnoreCase) == 0;
-
-                        string firstExtension      = version5 ? "B5I" : "B6I";
-                        string firstExtensionLower = version5 ? "b5i" : "b6i";
-
-                        if(File.Exists(Path.Combine(imageFilter.ParentFolder, $"{filename}.{firstExtension}")))
-                        {
-                            basePath = imageFilter.ParentFolder;
-                        }
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
-                                                         $"{filename}.{firstExtensionLower}")))
-                        {
-                            basePath           = imageFilter.ParentFolder;
-                            lowerCaseExtension = true;
-                        }
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
-                        {
-                            basePath          = imageFilter.ParentFolder;
-                            lowerCaseFileName = true;
-                        }
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
-                        {
-                            basePath           = imageFilter.ParentFolder;
-                            lowerCaseFileName  = true;
-                            lowerCaseExtension = true;
-                        }
-
-                        else if(File.Exists(Path.Combine(_dataPath, $"{filename}.{firstExtension}")))
-                        {
-                            basePath = _dataPath;
-                        }
-                        else if(File.Exists(Path.Combine(_dataPath, $"{filename}.{firstExtensionLower}")))
-                        {
-                            basePath           = _dataPath;
-                            lowerCaseExtension = true;
-                        }
-                        else if(File.Exists(Path.Combine(_dataPath,
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
-                        {
-                            basePath          = _dataPath;
-                            lowerCaseFileName = true;
-                        }
-                        else if(File.Exists(Path.Combine(_dataPath,
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
-                        {
-                            basePath           = _dataPath;
-                            lowerCaseFileName  = true;
-                            lowerCaseExtension = true;
-                        }
-
-                        else if(File.Exists(Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture),
-                                                         $"{filename}.{firstExtension}")))
-                        {
-                            basePath = _dataPath.ToLower(CultureInfo.CurrentCulture);
-                        }
-                        else if(File.Exists(Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture),
-                                                         $"{filename}.{firstExtensionLower}")))
-                        {
-                            basePath           = _dataPath.ToLower(CultureInfo.CurrentCulture);
-                            lowerCaseExtension = true;
-                        }
-                        else if(File.Exists(Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture),
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
-                        {
-                            basePath          = _dataPath.ToLower(CultureInfo.CurrentCulture);
-                            lowerCaseFileName = true;
-                        }
-                        else if(File.Exists(Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture),
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
-                        {
-                            basePath           = _dataPath.ToLower(CultureInfo.CurrentCulture);
-                            lowerCaseFileName  = true;
-                            lowerCaseExtension = true;
-                        }
-
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath,
-                                                         $"{filename}.{firstExtension}")))
-                        {
-                            basePath = Path.Combine(imageFilter.ParentFolder, _dataPath);
-                        }
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath,
-                                                         $"{filename}.{firstExtensionLower}")))
-                        {
-                            basePath           = Path.Combine(imageFilter.ParentFolder, _dataPath);
-                            lowerCaseExtension = true;
-                        }
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath,
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
-                        {
-                            basePath          = Path.Combine(imageFilter.ParentFolder, _dataPath);
-                            lowerCaseFileName = true;
-                        }
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath,
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
-                        {
-                            basePath           = Path.Combine(imageFilter.ParentFolder, _dataPath);
-                            lowerCaseFileName  = true;
-                            lowerCaseExtension = true;
-                        }
-
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
-                                                         _dataPath.ToLower(CultureInfo.CurrentCulture),
-                                                         $"{filename}.{firstExtension}")))
-                        {
-                            basePath = Path.Combine(imageFilter.ParentFolder,
-                                                    _dataPath.ToLower(CultureInfo.CurrentCulture));
-                        }
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
-                                                         _dataPath.ToLower(CultureInfo.CurrentCulture),
-                                                         $"{filename}.b00")))
-                        {
-                            basePath = Path.Combine(imageFilter.ParentFolder,
-                                                    _dataPath.ToLower(CultureInfo.CurrentCulture));
-
-                            lowerCaseExtension = true;
-                        }
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
-                                                         _dataPath.ToLower(CultureInfo.CurrentCulture),
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
-                        {
-                            basePath = Path.Combine(imageFilter.ParentFolder,
-                                                    _dataPath.ToLower(CultureInfo.CurrentCulture));
-
-                            lowerCaseFileName = true;
-                        }
-                        else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
-                                                         _dataPath.ToLower(CultureInfo.CurrentCulture),
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
-                        {
-                            basePath = Path.Combine(imageFilter.ParentFolder,
-                                                    _dataPath.ToLower(CultureInfo.CurrentCulture));
-
-                            lowerCaseFileName  = true;
-                            lowerCaseExtension = true;
-                        }
-                        else if(File.Exists(Path.Combine("", $"{filename}.{firstExtension}")))
-                        {
-                            basePath = "";
-                        }
-                        else if(File.Exists(Path.Combine("", $"{filename}.{firstExtensionLower}")))
-                        {
-                            basePath           = "";
-                            lowerCaseExtension = true;
-                        }
-                        else if(
-                            File.Exists(Path.Combine("",
+                        basePath = _dataPath;
+                    }
+                    else if(File.Exists(Path.Combine(_dataPath, $"{filename}.{firstExtensionLower}")))
+                    {
+                        basePath           = _dataPath;
+                        lowerCaseExtension = true;
+                    }
+                    else if(File.Exists(Path.Combine(_dataPath,
                                                      $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
-                        {
-                            basePath          = "";
-                            lowerCaseFileName = true;
-                        }
-                        else if(File.Exists(Path.Combine("",
-                                                         $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
-                        {
-                            basePath           = "";
-                            lowerCaseFileName  = true;
-                            lowerCaseExtension = true;
-                        }
-                        else
-                        {
-                            AaruConsole.ErrorWriteLine("Could not find image for track {0}", trk.point);
+                    {
+                        basePath          = _dataPath;
+                        lowerCaseFileName = true;
+                    }
+                    else if(File.Exists(Path.Combine(_dataPath,
+                                                     $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
+                    {
+                        basePath           = _dataPath;
+                        lowerCaseFileName  = true;
+                        lowerCaseExtension = true;
+                    }
 
-                            return ErrorNumber.NoSuchFile;
-                        }
+                    else if(File.Exists(Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture),
+                                                     $"{filename}.{firstExtension}")))
+                    {
+                        basePath = _dataPath.ToLower(CultureInfo.CurrentCulture);
+                    }
+                    else if(File.Exists(Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture),
+                                                     $"{filename}.{firstExtensionLower}")))
+                    {
+                        basePath           = _dataPath.ToLower(CultureInfo.CurrentCulture);
+                        lowerCaseExtension = true;
+                    }
+                    else if(File.Exists(Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture),
+                                                     $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
+                    {
+                        basePath          = _dataPath.ToLower(CultureInfo.CurrentCulture);
+                        lowerCaseFileName = true;
+                    }
+                    else if(File.Exists(Path.Combine(_dataPath.ToLower(CultureInfo.CurrentCulture),
+                                                     $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
+                    {
+                        basePath           = _dataPath.ToLower(CultureInfo.CurrentCulture);
+                        lowerCaseFileName  = true;
+                        lowerCaseExtension = true;
+                    }
 
-                        var splitStream = new SplitJoinStream();
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath,
+                                                     $"{filename}.{firstExtension}")))
+                    {
+                        basePath = Path.Combine(imageFilter.ParentFolder, _dataPath);
+                    }
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath,
+                                                     $"{filename}.{firstExtensionLower}")))
+                    {
+                        basePath           = Path.Combine(imageFilter.ParentFolder, _dataPath);
+                        lowerCaseExtension = true;
+                    }
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath,
+                                                     $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
+                    {
+                        basePath          = Path.Combine(imageFilter.ParentFolder, _dataPath);
+                        lowerCaseFileName = true;
+                    }
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder, _dataPath,
+                                                     $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
+                    {
+                        basePath           = Path.Combine(imageFilter.ParentFolder, _dataPath);
+                        lowerCaseFileName  = true;
+                        lowerCaseExtension = true;
+                    }
 
-                        if(lowerCaseFileName)
-                            filename = filename.ToLower(CultureInfo.CurrentCulture);
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
+                                                     _dataPath.ToLower(CultureInfo.CurrentCulture),
+                                                     $"{filename}.{firstExtension}")))
+                    {
+                        basePath = Path.Combine(imageFilter.ParentFolder,
+                                                _dataPath.ToLower(CultureInfo.CurrentCulture));
+                    }
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
+                                                     _dataPath.ToLower(CultureInfo.CurrentCulture),
+                                                     $"{filename}.b00")))
+                    {
+                        basePath = Path.Combine(imageFilter.ParentFolder,
+                                                _dataPath.ToLower(CultureInfo.CurrentCulture));
 
-                        string extension = lowerCaseExtension ? "b{0:D2}" : "B{0:D2}";
+                        lowerCaseExtension = true;
+                    }
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
+                                                     _dataPath.ToLower(CultureInfo.CurrentCulture),
+                                                     $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
+                    {
+                        basePath = Path.Combine(imageFilter.ParentFolder,
+                                                _dataPath.ToLower(CultureInfo.CurrentCulture));
 
-                        try
-                        {
-                            splitStream.
-                                Add(Path.Combine(basePath, $"{filename}.{(lowerCaseExtension ? firstExtensionLower : firstExtension)}"),
-                                    FileMode.Open);
+                        lowerCaseFileName = true;
+                    }
+                    else if(File.Exists(Path.Combine(imageFilter.ParentFolder,
+                                                     _dataPath.ToLower(CultureInfo.CurrentCulture),
+                                                     $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
+                    {
+                        basePath = Path.Combine(imageFilter.ParentFolder,
+                                                _dataPath.ToLower(CultureInfo.CurrentCulture));
 
-                            splitStream.AddRange(basePath, $"{filename}.{extension}");
-                        }
-                        catch(Exception)
-                        {
-                            AaruConsole.ErrorWriteLine("Could not find image for track {0}", trk.point);
-
-                            return ErrorNumber.NoSuchFile;
-                        }
-
-                        track.Filter = splitStream.Filter;
-                        track.File   = $"{filename}.{extension}";
-
-                        if(trk.startLba >= 0)
-                            track.FileOffset =
-                                (ulong)((trk.startLba * splitStartChars.SectorSize) + splitStartChars.Offset);
-                        else
-                            track.FileOffset = (ulong)(trk.startLba * -1 * splitStartChars.SectorSize);
-
-                        track.FileType = "BINARY";
-
-                        if(splitStartChars.Subchannel != TrackSubchannelType.None)
-                        {
-                            track.SubchannelFilter = track.Filter;
-                            track.SubchannelFile   = track.File;
-                            track.SubchannelType   = splitStartChars.Subchannel;
-                            track.SubchannelOffset = track.FileOffset;
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-                        }
-
-                        splitStartChars.FileFilter = splitStream.Filter;
-                        splitStartChars.Sectors    = trk.sectors;
-                        splitStartChars.StartLba   = trk.startLba;
-                        _filePaths.Clear();
-                        _filePaths.Add(splitStartChars);
+                        lowerCaseFileName  = true;
+                        lowerCaseExtension = true;
+                    }
+                    else if(File.Exists(Path.Combine("", $"{filename}.{firstExtension}")))
+                    {
+                        basePath = "";
+                    }
+                    else if(File.Exists(Path.Combine("", $"{filename}.{firstExtensionLower}")))
+                    {
+                        basePath           = "";
+                        lowerCaseExtension = true;
+                    }
+                    else if(
+                        File.Exists(Path.Combine("",
+                                                 $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtension}")))
+                    {
+                        basePath          = "";
+                        lowerCaseFileName = true;
+                    }
+                    else if(File.Exists(Path.Combine("",
+                                                     $"{filename.ToLower(CultureInfo.CurrentCulture)}.{firstExtensionLower}")))
+                    {
+                        basePath           = "";
+                        lowerCaseFileName  = true;
+                        lowerCaseExtension = true;
                     }
                     else
-                        foreach(DataFileCharacteristics chars in fileCharsForThisTrack)
-                        {
-                            track.Filter = chars.FileFilter;
-                            track.File   = chars.FileFilter.Filename;
-
-                            if(trk.startLba >= 0)
-                                track.FileOffset = (ulong)((trk.startLba - chars.StartLba) * chars.SectorSize) +
-                                                   chars.Offset;
-                            else
-                                track.FileOffset = (ulong)(trk.startLba * -1 * chars.SectorSize);
-
-                            track.FileType = "BINARY";
-
-                            if(chars.Subchannel != TrackSubchannelType.None)
-                            {
-                                track.SubchannelFilter = track.Filter;
-                                track.SubchannelFile   = track.File;
-                                track.SubchannelType   = chars.Subchannel;
-                                track.SubchannelOffset = track.FileOffset;
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-                            }
-
-                            break;
-                        }
-
-                    if(track.Filter is null)
                     {
                         AaruConsole.ErrorWriteLine("Could not find image for track {0}", trk.point);
 
                         return ErrorNumber.NoSuchFile;
                     }
 
-                    track.Pregap   = trk.pregap;
-                    track.Sequence = trk.point;
-                    track.Type     = BlindWriteTrackTypeToTrackType(trk.type);
+                    var splitStream = new SplitJoinStream();
 
-                    if(trk.pregap        > 0 &&
-                       track.StartSector > 0)
+                    if(lowerCaseFileName)
+                        filename = filename.ToLower(CultureInfo.CurrentCulture);
+
+                    string extension = lowerCaseExtension ? "b{0:D2}" : "B{0:D2}";
+
+                    try
                     {
-                        track.Indexes[0] = (int)track.StartSector - (int)trk.pregap;
+                        splitStream.
+                            Add(Path.Combine(basePath, $"{filename}.{(lowerCaseExtension ? firstExtensionLower : firstExtension)}"),
+                                FileMode.Open);
 
-                        if(track.Indexes[0] < 0)
-                            track.Indexes[0] = 0;
+                        splitStream.AddRange(basePath, $"{filename}.{extension}");
+                    }
+                    catch(Exception)
+                    {
+                        AaruConsole.ErrorWriteLine("Could not find image for track {0}", trk.point);
+
+                        return ErrorNumber.NoSuchFile;
                     }
 
-                    track.Indexes[1] = (int)track.StartSector;
+                    track.Filter = splitStream.Filter;
+                    track.File   = $"{filename}.{extension}";
 
-                    partition.Description = track.Description;
+                    if(trk.startLba >= 0)
+                        track.FileOffset =
+                            (ulong)((trk.startLba * splitStartChars.SectorSize) + splitStartChars.Offset);
+                    else
+                        track.FileOffset = (ulong)(trk.startLba * -1 * splitStartChars.SectorSize);
 
-                    partition.Size = (track.EndSector - track.StartSector) * (ulong)track.RawBytesPerSector;
+                    track.FileType = "BINARY";
 
-                    partition.Length   = track.EndSector - track.StartSector + 1;
-                    partition.Sequence = track.Sequence;
-                    partition.Offset   = offsetBytes;
-                    partition.Start    = track.StartSector;
-                    partition.Type     = track.Type.ToString();
-
-                    offsetBytes += partition.Size;
-
-                    if(track.StartSector >= trk.pregap)
-                        track.StartSector -= trk.pregap;
-
-                    if(track.EndSector > _imageInfo.Sectors)
-                        _imageInfo.Sectors = track.EndSector + 1;
-
-                    Tracks.Add(track);
-                    Partitions.Add(partition);
-                    _offsetMap.Add(track.Sequence, track.StartSector);
-                }
-            }
-
-            foreach(Track track in Tracks)
-            {
-                Session trackSession =
-                    Sessions.FirstOrDefault(s => track.Sequence >= s.StartTrack && track.Sequence <= s.EndTrack);
-
-                track.Session = trackSession.Sequence;
-            }
-
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "printing track map");
-
-            foreach(Track track in Tracks)
-            {
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Partition sequence: {0}", track.Sequence);
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition description: {0}", track.Description);
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition type: {0}", track.Type);
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting sector: {0}", track.StartSector);
-
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition ending sector: {0}", track.EndSector);
-            }
-
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "printing partition map");
-
-            foreach(Partition partition in Partitions)
-            {
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Partition sequence: {0}", partition.Sequence);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition name: {0}", partition.Name);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition description: {0}", partition.Description);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition type: {0}", partition.Type);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting sector: {0}", partition.Start);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition sectors: {0}", partition.Length);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting offset: {0}", partition.Offset);
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition size in bytes: {0}", partition.Size);
-            }
-
-            if(!isDvd)
-            {
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Rebuilding TOC");
-
-                _fullToc = fullTocStream.ToArray();
-                AaruConsole.DebugWriteLine("BlindWrite5 plugin", "TOC len {0}", _fullToc.Length);
-
-                _fullToc[0] = firstSession;
-                _fullToc[1] = lastSession;
-
-                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-            }
-
-            _imageInfo.MediaType = BlindWriteProfileToMediaType(_header.profile);
-
-            if(_dmi != null &&
-               _pfi != null)
-            {
-                PFI.PhysicalFormatInformation? pfi0 = PFI.Decode(_pfi, _imageInfo.MediaType);
-
-                // All discs I tested the disk category and part version (as well as the start PSN for DVD-RAM) where modified by Alcohol
-                // So much for archival value
-                if(pfi0.HasValue)
-                {
-                    switch(pfi0.Value.DiskCategory)
+                    if(splitStartChars.Subchannel != TrackSubchannelType.None)
                     {
-                        case DiskCategory.DVDPR:
-                            _imageInfo.MediaType = MediaType.DVDPR;
+                        track.SubchannelFilter = track.Filter;
+                        track.SubchannelFile   = track.File;
+                        track.SubchannelType   = splitStartChars.Subchannel;
+                        track.SubchannelOffset = track.FileOffset;
 
-                            break;
-                        case DiskCategory.DVDPRDL:
-                            _imageInfo.MediaType = MediaType.DVDPRDL;
-
-                            break;
-                        case DiskCategory.DVDPRW:
-                            _imageInfo.MediaType = MediaType.DVDPRW;
-
-                            break;
-                        case DiskCategory.DVDPRWDL:
-                            _imageInfo.MediaType = MediaType.DVDPRWDL;
-
-                            break;
-                        case DiskCategory.DVDR:
-                            _imageInfo.MediaType = pfi0.Value.PartVersion >= 6 ? MediaType.DVDRDL : MediaType.DVDR;
-
-                            break;
-                        case DiskCategory.DVDRAM:
-                            _imageInfo.MediaType = MediaType.DVDRAM;
-
-                            break;
-                        default:
-                            _imageInfo.MediaType = MediaType.DVDROM;
-
-                            break;
-                        case DiskCategory.DVDRW:
-                            _imageInfo.MediaType = pfi0.Value.PartVersion >= 15 ? MediaType.DVDRWDL : MediaType.DVDRW;
-
-                            break;
-                        case DiskCategory.HDDVDR:
-                            _imageInfo.MediaType = MediaType.HDDVDR;
-
-                            break;
-                        case DiskCategory.HDDVDRAM:
-                            _imageInfo.MediaType = MediaType.HDDVDRAM;
-
-                            break;
-                        case DiskCategory.HDDVDROM:
-                            _imageInfo.MediaType = MediaType.HDDVDROM;
-
-                            break;
-                        case DiskCategory.HDDVDRW:
-                            _imageInfo.MediaType = MediaType.HDDVDRW;
-
-                            break;
-                        case DiskCategory.Nintendo:
-                            _imageInfo.MediaType =
-                                pfi0.Value.DiscSize == DVDSize.Eighty ? MediaType.GOD : MediaType.WOD;
-
-                            break;
-                        case DiskCategory.UMD:
-                            _imageInfo.MediaType = MediaType.UMD;
-
-                            break;
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
                     }
 
-                    if(DMI.IsXbox(_dmi))
-                        _imageInfo.MediaType = MediaType.XGD;
-                    else if(DMI.IsXbox360(_dmi))
-                        _imageInfo.MediaType = MediaType.XGD2;
+                    splitStartChars.FileFilter = splitStream.Filter;
+                    splitStartChars.Sectors    = trk.sectors;
+                    splitStartChars.StartLba   = trk.startLba;
+                    _filePaths.Clear();
+                    _filePaths.Add(splitStartChars);
                 }
-            }
-            else if(_imageInfo.MediaType == MediaType.CD ||
-                    _imageInfo.MediaType == MediaType.CDROM)
-            {
-                bool data       = false;
-                bool mode2      = false;
-                bool firstAudio = false;
-                bool firstData  = false;
-                bool audio      = false;
-
-                foreach(Track bwTrack in Tracks)
-                {
-                    // First track is audio
-                    firstAudio |= bwTrack.Sequence == 1 && bwTrack.Type == CommonTypes.Enums.TrackType.Audio;
-
-                    // First track is data
-                    firstData |= bwTrack.Sequence == 1 && bwTrack.Type != CommonTypes.Enums.TrackType.Audio;
-
-                    // Any non first track is data
-                    data |= bwTrack.Sequence != 1 && bwTrack.Type != CommonTypes.Enums.TrackType.Audio;
-
-                    // Any non first track is audio
-                    audio |= bwTrack.Sequence != 1 && bwTrack.Type == CommonTypes.Enums.TrackType.Audio;
-
-                    switch(bwTrack.Type)
-                    {
-                        case CommonTypes.Enums.TrackType.CdMode2Formless:
-                        case CommonTypes.Enums.TrackType.CdMode2Form1:
-                        case CommonTypes.Enums.TrackType.CdMode2Form2:
-                            mode2 = true;
-
-                            break;
-                    }
-                }
-
-                if(!data &&
-                   !firstData)
-                    _imageInfo.MediaType = MediaType.CDDA;
-                else if(firstAudio         &&
-                        data               &&
-                        Sessions.Count > 1 &&
-                        mode2)
-                    _imageInfo.MediaType = MediaType.CDPLUS;
-                else if((firstData && audio) || mode2)
-                    _imageInfo.MediaType = MediaType.CDROMXA;
-                else if(!audio)
-                    _imageInfo.MediaType = MediaType.CDROM;
                 else
-                    _imageInfo.MediaType = MediaType.CD;
-            }
+                    foreach(DataFileCharacteristics chars in fileCharsForThisTrack)
+                    {
+                        track.Filter = chars.FileFilter;
+                        track.File   = chars.FileFilter.Filename;
 
-            _imageInfo.DriveManufacturer     = StringHandlers.CToString(_header.manufacturer);
-            _imageInfo.DriveModel            = StringHandlers.CToString(_header.product);
-            _imageInfo.DriveFirmwareRevision = StringHandlers.CToString(_header.revision);
-            _imageInfo.Application           = "BlindWrite";
+                        if(trk.startLba >= 0)
+                            track.FileOffset = (ulong)((trk.startLba - chars.StartLba) * chars.SectorSize) +
+                                               chars.Offset;
+                        else
+                            track.FileOffset = (ulong)(trk.startLba * -1 * chars.SectorSize);
 
-            if(string.Compare(Path.GetExtension(imageFilter.Filename), ".B5T", StringComparison.OrdinalIgnoreCase) == 0)
-                _imageInfo.ApplicationVersion = "5";
-            else if(string.Compare(Path.GetExtension(imageFilter.Filename), ".B6T",
-                                   StringComparison.OrdinalIgnoreCase) == 0)
-                _imageInfo.ApplicationVersion = "6";
+                        track.FileType = "BINARY";
 
-            _imageInfo.Version = "5";
+                        if(chars.Subchannel != TrackSubchannelType.None)
+                        {
+                            track.SubchannelFilter = track.Filter;
+                            track.SubchannelFile   = track.File;
+                            track.SubchannelType   = chars.Subchannel;
+                            track.SubchannelOffset = track.FileOffset;
 
-            _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.XmlMediaType         = XmlMediaType.OpticalDisc;
-
-            if(_pma != null)
-            {
-                PMA.CDPMA pma0 = PMA.Decode(_pma).Value;
-
-                foreach(uint id in from descriptor in pma0.PMADescriptors where descriptor.ADR == 2
-                                   select (uint)((descriptor.Min << 16) + (descriptor.Sec << 8) + descriptor.Frame))
-                    _imageInfo.MediaSerialNumber = $"{id & 0x00FFFFFF:X6}";
-            }
-
-            if(_atip != null)
-            {
-                byte[] atipTmp = new byte[_atip.Length + 4];
-                Array.Copy(_atip, 0, atipTmp, 4, _atip.Length);
-                atipTmp[0] = (byte)((_atip.Length & 0xFF00) >> 8);
-                atipTmp[1] = (byte)(_atip.Length & 0xFF);
-
-                ATIP.CDATIP atip0 = ATIP.Decode(atipTmp);
-
-                _imageInfo.MediaType = atip0?.DiscType ?? false ? MediaType.CDRW : MediaType.CDR;
-
-                if(atip0.LeadInStartMin == 97)
-                {
-                    int type = atip0.LeadInStartFrame % 10;
-                    int frm  = atip0.LeadInStartFrame - type;
-                    _imageInfo.MediaManufacturer = ATIP.ManufacturerFromATIP(atip0.LeadInStartSec, frm);
-                }
-            }
-
-            bool isBd = false;
-
-            if(_imageInfo.MediaType == MediaType.BDR  ||
-               _imageInfo.MediaType == MediaType.BDRE ||
-               _imageInfo.MediaType == MediaType.BDROM)
-            {
-                isDvd = false;
-                isBd  = true;
-            }
-
-            if(isBd && _imageInfo.Sectors > 24438784)
-                switch(_imageInfo.MediaType)
-                {
-                    case MediaType.BDR:
-                        _imageInfo.MediaType = MediaType.BDRXL;
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+                        }
 
                         break;
-                    case MediaType.BDRE:
-                        _imageInfo.MediaType = MediaType.BDREXL;
+                    }
+
+                if(track.Filter is null)
+                {
+                    AaruConsole.ErrorWriteLine("Could not find image for track {0}", trk.point);
+
+                    return ErrorNumber.NoSuchFile;
+                }
+
+                track.Pregap   = trk.pregap;
+                track.Sequence = trk.point;
+                track.Type     = BlindWriteTrackTypeToTrackType(trk.type);
+
+                if(trk.pregap        > 0 &&
+                   track.StartSector > 0)
+                {
+                    track.Indexes[0] = (int)track.StartSector - (int)trk.pregap;
+
+                    if(track.Indexes[0] < 0)
+                        track.Indexes[0] = 0;
+                }
+
+                track.Indexes[1] = (int)track.StartSector;
+
+                partition.Description = track.Description;
+
+                partition.Size = (track.EndSector - track.StartSector) * (ulong)track.RawBytesPerSector;
+
+                partition.Length   = track.EndSector - track.StartSector + 1;
+                partition.Sequence = track.Sequence;
+                partition.Offset   = offsetBytes;
+                partition.Start    = track.StartSector;
+                partition.Type     = track.Type.ToString();
+
+                offsetBytes += partition.Size;
+
+                if(track.StartSector >= trk.pregap)
+                    track.StartSector -= trk.pregap;
+
+                if(track.EndSector > _imageInfo.Sectors)
+                    _imageInfo.Sectors = track.EndSector + 1;
+
+                Tracks.Add(track);
+                Partitions.Add(partition);
+                _offsetMap.Add(track.Sequence, track.StartSector);
+            }
+        }
+
+        foreach(Track track in Tracks)
+        {
+            Session trackSession =
+                Sessions.FirstOrDefault(s => track.Sequence >= s.StartTrack && track.Sequence <= s.EndTrack);
+
+            track.Session = trackSession.Sequence;
+        }
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "printing track map");
+
+        foreach(Track track in Tracks)
+        {
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Partition sequence: {0}", track.Sequence);
+
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition description: {0}", track.Description);
+
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition type: {0}", track.Type);
+
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting sector: {0}", track.StartSector);
+
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition ending sector: {0}", track.EndSector);
+        }
+
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "printing partition map");
+
+        foreach(Partition partition in Partitions)
+        {
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Partition sequence: {0}", partition.Sequence);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition name: {0}", partition.Name);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition description: {0}", partition.Description);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition type: {0}", partition.Type);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting sector: {0}", partition.Start);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition sectors: {0}", partition.Length);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition starting offset: {0}", partition.Offset);
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "\tPartition size in bytes: {0}", partition.Size);
+        }
+
+        if(!isDvd)
+        {
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "Rebuilding TOC");
+
+            _fullToc = fullTocStream.ToArray();
+            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "TOC len {0}", _fullToc.Length);
+
+            _fullToc[0] = firstSession;
+            _fullToc[1] = lastSession;
+
+            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+        }
+
+        _imageInfo.MediaType = BlindWriteProfileToMediaType(_header.profile);
+
+        if(_dmi != null &&
+           _pfi != null)
+        {
+            PFI.PhysicalFormatInformation? pfi0 = PFI.Decode(_pfi, _imageInfo.MediaType);
+
+            // All discs I tested the disk category and part version (as well as the start PSN for DVD-RAM) where modified by Alcohol
+            // So much for archival value
+            if(pfi0.HasValue)
+            {
+                switch(pfi0.Value.DiskCategory)
+                {
+                    case DiskCategory.DVDPR:
+                        _imageInfo.MediaType = MediaType.DVDPR;
+
+                        break;
+                    case DiskCategory.DVDPRDL:
+                        _imageInfo.MediaType = MediaType.DVDPRDL;
+
+                        break;
+                    case DiskCategory.DVDPRW:
+                        _imageInfo.MediaType = MediaType.DVDPRW;
+
+                        break;
+                    case DiskCategory.DVDPRWDL:
+                        _imageInfo.MediaType = MediaType.DVDPRWDL;
+
+                        break;
+                    case DiskCategory.DVDR:
+                        _imageInfo.MediaType = pfi0.Value.PartVersion >= 6 ? MediaType.DVDRDL : MediaType.DVDR;
+
+                        break;
+                    case DiskCategory.DVDRAM:
+                        _imageInfo.MediaType = MediaType.DVDRAM;
+
+                        break;
+                    default:
+                        _imageInfo.MediaType = MediaType.DVDROM;
+
+                        break;
+                    case DiskCategory.DVDRW:
+                        _imageInfo.MediaType = pfi0.Value.PartVersion >= 15 ? MediaType.DVDRWDL : MediaType.DVDRW;
+
+                        break;
+                    case DiskCategory.HDDVDR:
+                        _imageInfo.MediaType = MediaType.HDDVDR;
+
+                        break;
+                    case DiskCategory.HDDVDRAM:
+                        _imageInfo.MediaType = MediaType.HDDVDRAM;
+
+                        break;
+                    case DiskCategory.HDDVDROM:
+                        _imageInfo.MediaType = MediaType.HDDVDROM;
+
+                        break;
+                    case DiskCategory.HDDVDRW:
+                        _imageInfo.MediaType = MediaType.HDDVDRW;
+
+                        break;
+                    case DiskCategory.Nintendo:
+                        _imageInfo.MediaType =
+                            pfi0.Value.DiscSize == DVDSize.Eighty ? MediaType.GOD : MediaType.WOD;
+
+                        break;
+                    case DiskCategory.UMD:
+                        _imageInfo.MediaType = MediaType.UMD;
 
                         break;
                 }
 
-            AaruConsole.DebugWriteLine("BlindWrite5 plugin", "ImageInfo.mediaType = {0}", _imageInfo.MediaType);
-
-            if(_mode2A != null)
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.SCSI_MODEPAGE_2A);
-
-            if(_pma != null)
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_PMA);
-
-            if(_atip != null)
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_ATIP);
-
-            if(_cdtext != null)
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_TEXT);
-
-            if(_bca != null)
-                if(isDvd)
-                    _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_BCA);
-                else if(isBd)
-                    _imageInfo.ReadableMediaTags.Add(MediaTagType.BD_BCA);
-
-            byte[] tmp;
-
-            if(_dmi != null)
-            {
-                tmp = new byte[2048];
-                Array.Copy(_dmi, 4, tmp, 0, 2048);
-                _dmi = tmp;
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_DMI);
-            }
-
-            if(_pfi != null)
-            {
-                tmp = new byte[2048];
-                Array.Copy(_pfi, 4, tmp, 0, 2048);
-                _pfi = tmp;
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_PFI);
-            }
-
-            if(_fullToc != null)
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_FullTOC);
-
-            if(_imageInfo.MediaType == MediaType.XGD2)
-                if(_imageInfo.Sectors == 25063   || // Locked (or non compatible drive)
-                   _imageInfo.Sectors == 4229664 || // Xtreme unlock
-                   _imageInfo.Sectors == 4246304)   // Wxripper unlock
-                    _imageInfo.MediaType = MediaType.XGD3;
-
-            AaruConsole.VerboseWriteLine("BlindWrite image describes a disc of type {0}", _imageInfo.MediaType);
-
-            if(_header.profile != ProfileNumber.CDR  &&
-               _header.profile != ProfileNumber.CDRW &&
-               _header.profile != ProfileNumber.CDROM)
-                foreach(Track track in Tracks)
-                {
-                    track.Pregap = 0;
-                    track.Indexes?.Clear();
-                }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            switch(tag)
-            {
-                case MediaTagType.SCSI_MODEPAGE_2A:
-                    buffer = _mode2A?.Clone() as byte[];
-
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-                case MediaTagType.CD_PMA:
-                    buffer = _pma?.Clone() as byte[];
-
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-                case MediaTagType.CD_ATIP:
-                    buffer = _atip?.Clone() as byte[];
-
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-                case MediaTagType.CD_TEXT:
-                    buffer = _cdtext?.Clone() as byte[];
-
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-                case MediaTagType.DVD_BCA:
-                case MediaTagType.BD_BCA:
-                    buffer = _bca?.Clone() as byte[];
-
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-                case MediaTagType.DVD_PFI:
-                    buffer = _pfi?.Clone() as byte[];
-
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-                case MediaTagType.DVD_DMI:
-                    buffer = _dmi?.Clone() as byte[];
-
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-                case MediaTagType.CD_FullTOC:
-                    buffer = _fullToc?.Clone() as byte[];
-
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-                default: return ErrorNumber.NotSupported;
+                if(DMI.IsXbox(_dmi))
+                    _imageInfo.MediaType = MediaType.XGD;
+                else if(DMI.IsXbox360(_dmi))
+                    _imageInfo.MediaType = MediaType.XGD2;
             }
         }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        else if(_imageInfo.MediaType == MediaType.CD ||
+                _imageInfo.MediaType == MediaType.CDROM)
         {
-            buffer = null;
+            bool data       = false;
+            bool mode2      = false;
+            bool firstAudio = false;
+            bool firstData  = false;
+            bool audio      = false;
 
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-                return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-                return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            // TODO: Cross data files
-            Track? aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
-
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
-                return ErrorNumber.OutOfRange;
-
-            DataFileCharacteristics chars = (from characteristics in _filePaths let firstSector =
-                                                 characteristics.StartLba let lastSector =
-                                                 firstSector + characteristics.Sectors - 1 let wantedSector =
-                                                 (int)(sectorAddress + aaruTrack.StartSector)
-                                             where wantedSector >= firstSector && wantedSector <= lastSector
-                                             select characteristics).FirstOrDefault();
-
-            if(string.IsNullOrEmpty(chars.FilePath) ||
-               chars.FileFilter == null)
-                return ErrorNumber.SectorNotFound;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-            bool mode2 = false;
-
-            switch(aaruTrack.Type)
+            foreach(Track bwTrack in Tracks)
             {
-                case CommonTypes.Enums.TrackType.CdMode1:
-                {
-                    sectorOffset = 16;
-                    sectorSize   = 2048;
-                    sectorSkip   = 288;
+                // First track is audio
+                firstAudio |= bwTrack.Sequence == 1 && bwTrack.Type == CommonTypes.Enums.TrackType.Audio;
 
-                    break;
-                }
-                case CommonTypes.Enums.TrackType.CdMode2Formless:
-                case CommonTypes.Enums.TrackType.CdMode2Form1:
-                case CommonTypes.Enums.TrackType.CdMode2Form2:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
+                // First track is data
+                firstData |= bwTrack.Sequence == 1 && bwTrack.Type != CommonTypes.Enums.TrackType.Audio;
 
-                    break;
-                }
-                case CommonTypes.Enums.TrackType.Audio:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
+                // Any non first track is data
+                data |= bwTrack.Sequence != 1 && bwTrack.Type != CommonTypes.Enums.TrackType.Audio;
 
-                    break;
-                }
-                case CommonTypes.Enums.TrackType.Data:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2048;
-                    sectorSkip   = 0;
+                // Any non first track is audio
+                audio |= bwTrack.Sequence != 1 && bwTrack.Type == CommonTypes.Enums.TrackType.Audio;
 
-                    break;
+                switch(bwTrack.Type)
+                {
+                    case CommonTypes.Enums.TrackType.CdMode2Formless:
+                    case CommonTypes.Enums.TrackType.CdMode2Form1:
+                    case CommonTypes.Enums.TrackType.CdMode2Form2:
+                        mode2 = true;
+
+                        break;
                 }
-                default: return ErrorNumber.NotSupported;
             }
 
-            switch(chars.Subchannel)
-            {
-                case TrackSubchannelType.None:
-                    sectorSkip += 0;
-
-                    break;
-                case TrackSubchannelType.Q16Interleaved:
-                    sectorSkip += 16;
-
-                    break;
-                case TrackSubchannelType.PackedInterleaved:
-                    sectorSkip += 96;
-
-                    break;
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            _imageStream = chars.FileFilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.FileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(mode2)
-            {
-                var mode2Ms = new MemoryStream((int)(sectorSize * length));
-
-                buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length));
-
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize);
-                    sector = Sector.GetUserDataFromMode2(sector);
-                    mode2Ms.Write(sector, 0, sector.Length);
-                }
-
-                buffer = mode2Ms.ToArray();
-            }
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
+            if(!data &&
+               !firstData)
+                _imageInfo.MediaType = MediaType.CDDA;
+            else if(firstAudio         &&
+                    data               &&
+                    Sessions.Count > 1 &&
+                    mode2)
+                _imageInfo.MediaType = MediaType.CDPLUS;
+            else if((firstData && audio) || mode2)
+                _imageInfo.MediaType = MediaType.CDROMXA;
+            else if(!audio)
+                _imageInfo.MediaType = MediaType.CDROM;
             else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            return ErrorNumber.NoError;
+                _imageInfo.MediaType = MediaType.CD;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
+        _imageInfo.DriveManufacturer     = StringHandlers.CToString(_header.manufacturer);
+        _imageInfo.DriveModel            = StringHandlers.CToString(_header.product);
+        _imageInfo.DriveFirmwareRevision = StringHandlers.CToString(_header.revision);
+        _imageInfo.Application           = "BlindWrite";
+
+        if(string.Compare(Path.GetExtension(imageFilter.Filename), ".B5T", StringComparison.OrdinalIgnoreCase) == 0)
+            _imageInfo.ApplicationVersion = "5";
+        else if(string.Compare(Path.GetExtension(imageFilter.Filename), ".B6T",
+                               StringComparison.OrdinalIgnoreCase) == 0)
+            _imageInfo.ApplicationVersion = "6";
+
+        _imageInfo.Version = "5";
+
+        _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.XmlMediaType         = XmlMediaType.OpticalDisc;
+
+        if(_pma != null)
         {
-            buffer = null;
+            PMA.CDPMA pma0 = PMA.Decode(_pma).Value;
 
-            // TODO: Cross data files
-            Track? aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
+            foreach(uint id in from descriptor in pma0.PMADescriptors where descriptor.ADR == 2
+                               select (uint)((descriptor.Min << 16) + (descriptor.Sec << 8) + descriptor.Frame))
+                _imageInfo.MediaSerialNumber = $"{id & 0x00FFFFFF:X6}";
+        }
 
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
+        if(_atip != null)
+        {
+            byte[] atipTmp = new byte[_atip.Length + 4];
+            Array.Copy(_atip, 0, atipTmp, 4, _atip.Length);
+            atipTmp[0] = (byte)((_atip.Length & 0xFF00) >> 8);
+            atipTmp[1] = (byte)(_atip.Length & 0xFF);
 
-            if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
-                return ErrorNumber.OutOfRange;
+            ATIP.CDATIP atip0 = ATIP.Decode(atipTmp);
 
-            DataFileCharacteristics chars = (from characteristics in _filePaths let firstSector =
-                                                 characteristics.StartLba let lastSector =
-                                                 firstSector + characteristics.Sectors - 1 let wantedSector =
-                                                 (int)(sectorAddress + aaruTrack.StartSector)
-                                             where wantedSector >= firstSector && wantedSector <= lastSector
-                                             select characteristics).FirstOrDefault();
+            _imageInfo.MediaType = atip0?.DiscType ?? false ? MediaType.CDRW : MediaType.CDR;
 
-            if(string.IsNullOrEmpty(chars.FilePath) ||
-               chars.FileFilter == null)
-                return ErrorNumber.SectorNotFound;
-
-            if(aaruTrack.Type == CommonTypes.Enums.TrackType.Data)
-                return ErrorNumber.NotSupported;
-
-            switch(tag)
+            if(atip0.LeadInStartMin == 97)
             {
-                case SectorTagType.CdSectorEcc:
-                case SectorTagType.CdSectorEccP:
-                case SectorTagType.CdSectorEccQ:
-                case SectorTagType.CdSectorEdc:
-                case SectorTagType.CdSectorHeader:
-                case SectorTagType.CdSectorSubchannel:
-                case SectorTagType.CdSectorSubHeader:
-                case SectorTagType.CdSectorSync: break;
-                case SectorTagType.CdTrackFlags:
-                    if(!_trackFlags.TryGetValue((uint)sectorAddress, out byte flag))
-                        return ErrorNumber.NoData;
+                int type = atip0.LeadInStartFrame % 10;
+                int frm  = atip0.LeadInStartFrame - type;
+                _imageInfo.MediaManufacturer = ATIP.ManufacturerFromATIP(atip0.LeadInStartSec, frm);
+            }
+        }
 
-                    buffer = new[]
-                    {
-                        flag
-                    };
+        bool isBd = false;
 
-                    return ErrorNumber.NoError;
-                default: return ErrorNumber.NotSupported;
+        if(_imageInfo.MediaType == MediaType.BDR  ||
+           _imageInfo.MediaType == MediaType.BDRE ||
+           _imageInfo.MediaType == MediaType.BDROM)
+        {
+            isDvd = false;
+            isBd  = true;
+        }
+
+        if(isBd && _imageInfo.Sectors > 24438784)
+            switch(_imageInfo.MediaType)
+            {
+                case MediaType.BDR:
+                    _imageInfo.MediaType = MediaType.BDRXL;
+
+                    break;
+                case MediaType.BDRE:
+                    _imageInfo.MediaType = MediaType.BDREXL;
+
+                    break;
             }
 
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
+        AaruConsole.DebugWriteLine("BlindWrite5 plugin", "ImageInfo.mediaType = {0}", _imageInfo.MediaType);
 
-            switch(aaruTrack.Type)
+        if(_mode2A != null)
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.SCSI_MODEPAGE_2A);
+
+        if(_pma != null)
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_PMA);
+
+        if(_atip != null)
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_ATIP);
+
+        if(_cdtext != null)
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_TEXT);
+
+        if(_bca != null)
+            if(isDvd)
+                _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_BCA);
+            else if(isBd)
+                _imageInfo.ReadableMediaTags.Add(MediaTagType.BD_BCA);
+
+        byte[] tmp;
+
+        if(_dmi != null)
+        {
+            tmp = new byte[2048];
+            Array.Copy(_dmi, 4, tmp, 0, 2048);
+            _dmi = tmp;
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_DMI);
+        }
+
+        if(_pfi != null)
+        {
+            tmp = new byte[2048];
+            Array.Copy(_pfi, 4, tmp, 0, 2048);
+            _pfi = tmp;
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.DVD_PFI);
+        }
+
+        if(_fullToc != null)
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_FullTOC);
+
+        if(_imageInfo.MediaType == MediaType.XGD2)
+            if(_imageInfo.Sectors == 25063   || // Locked (or non compatible drive)
+               _imageInfo.Sectors == 4229664 || // Xtreme unlock
+               _imageInfo.Sectors == 4246304)   // Wxripper unlock
+                _imageInfo.MediaType = MediaType.XGD3;
+
+        AaruConsole.VerboseWriteLine("BlindWrite image describes a disc of type {0}", _imageInfo.MediaType);
+
+        if(_header.profile != ProfileNumber.CDR  &&
+           _header.profile != ProfileNumber.CDRW &&
+           _header.profile != ProfileNumber.CDROM)
+            foreach(Track track in Tracks)
             {
-                case CommonTypes.Enums.TrackType.CdMode1:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2064;
-                            sectorSize   = 4;
-                            sectorSkip   = 284;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            switch(chars.Subchannel)
-                            {
-                                case TrackSubchannelType.PackedInterleaved:
-                                {
-                                    sectorOffset = 2352;
-                                    sectorSize   = 96;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                }
-
-                                case TrackSubchannelType.Q16Interleaved:
-                                {
-                                    sectorOffset = 2352;
-                                    sectorSize   = 16;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                }
-                                case TrackSubchannelType.None:
-                                {
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                                        return ErrorNumber.NotSupported;
-
-                                    buffer = new byte[length * 96];
-
-                                    return ErrorNumber.NoError;
-                                }
-
-                                default: return ErrorNumber.NotSupported;
-                            }
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case CommonTypes.Enums.TrackType.CdMode2Formless:
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        case SectorTagType.CdSectorHeader:
-                        case SectorTagType.CdSectorEcc:
-                        case SectorTagType.CdSectorEccP:
-                        case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2332;
-                            sectorSize   = 4;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            switch(chars.Subchannel)
-                            {
-                                case TrackSubchannelType.PackedInterleaved:
-                                {
-                                    sectorOffset = 2352;
-                                    sectorSize   = 96;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                }
-
-                                case TrackSubchannelType.Q16Interleaved:
-                                {
-                                    sectorOffset = 2352;
-                                    sectorSize   = 16;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                }
-                                case TrackSubchannelType.None:
-                                {
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                                        return ErrorNumber.NotSupported;
-
-                                    buffer = new byte[length * 96];
-
-                                    return ErrorNumber.NoError;
-                                }
-
-                                default: return ErrorNumber.NotSupported;
-                            }
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-                case CommonTypes.Enums.TrackType.CdMode2Form1:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 16;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2072;
-                            sectorSize   = 4;
-                            sectorSkip   = 276;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            switch(chars.Subchannel)
-                            {
-                                case TrackSubchannelType.PackedInterleaved:
-                                {
-                                    sectorOffset = 2352;
-                                    sectorSize   = 96;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                }
-
-                                case TrackSubchannelType.Q16Interleaved:
-                                {
-                                    sectorOffset = 2352;
-                                    sectorSize   = 16;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                }
-                                case TrackSubchannelType.None:
-                                {
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                                        return ErrorNumber.NotSupported;
-
-                                    buffer = new byte[length * 96];
-
-                                    return ErrorNumber.NoError;
-                                }
-
-                                default: return ErrorNumber.NotSupported;
-                            }
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case CommonTypes.Enums.TrackType.CdMode2Form2:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 16;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2348;
-                            sectorSize   = 4;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            switch(chars.Subchannel)
-                            {
-                                case TrackSubchannelType.PackedInterleaved:
-                                {
-                                    sectorOffset = 2352;
-                                    sectorSize   = 96;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                }
-
-                                case TrackSubchannelType.Q16Interleaved:
-                                {
-                                    sectorOffset = 2352;
-                                    sectorSize   = 16;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                }
-                                case TrackSubchannelType.None:
-                                {
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                                        return ErrorNumber.NotSupported;
-
-                                    buffer = new byte[length * 96];
-
-                                    return ErrorNumber.NoError;
-                                }
-
-                                default: return ErrorNumber.NotSupported;
-                            }
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case CommonTypes.Enums.TrackType.Audio:
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            switch(chars.Subchannel)
-                            {
-                                case TrackSubchannelType.PackedInterleaved:
-                                {
-                                    sectorOffset = 2352;
-                                    sectorSize   = 96;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                }
-
-                                case TrackSubchannelType.Q16Interleaved:
-                                {
-                                    sectorOffset = 2352;
-                                    sectorSize   = 16;
-                                    sectorSkip   = 0;
-
-                                    break;
-                                }
-                                case TrackSubchannelType.None:
-                                {
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                                        return ErrorNumber.NotSupported;
-
-                                    buffer = new byte[length * 96];
-
-                                    return ErrorNumber.NoError;
-                                }
-                                default: return ErrorNumber.NotSupported;
-                            }
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
+                track.Pregap = 0;
+                track.Indexes?.Clear();
             }
 
-            if(tag != SectorTagType.CdSectorSubchannel)
-                switch(chars.Subchannel)
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        switch(tag)
+        {
+            case MediaTagType.SCSI_MODEPAGE_2A:
+                buffer = _mode2A?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+            case MediaTagType.CD_PMA:
+                buffer = _pma?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+            case MediaTagType.CD_ATIP:
+                buffer = _atip?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+            case MediaTagType.CD_TEXT:
+                buffer = _cdtext?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+            case MediaTagType.DVD_BCA:
+            case MediaTagType.BD_BCA:
+                buffer = _bca?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+            case MediaTagType.DVD_PFI:
+                buffer = _pfi?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+            case MediaTagType.DVD_DMI:
+                buffer = _dmi?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+            case MediaTagType.CD_FullTOC:
+                buffer = _fullToc?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+            default: return ErrorNumber.NotSupported;
+        }
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+            return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+            return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        // TODO: Cross data files
+        Track? aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
+            return ErrorNumber.OutOfRange;
+
+        DataFileCharacteristics chars = (from characteristics in _filePaths let firstSector =
+                                             characteristics.StartLba let lastSector =
+                                             firstSector + characteristics.Sectors - 1 let wantedSector =
+                                             (int)(sectorAddress + aaruTrack.StartSector)
+                                         where wantedSector >= firstSector && wantedSector <= lastSector
+                                         select characteristics).FirstOrDefault();
+
+        if(string.IsNullOrEmpty(chars.FilePath) ||
+           chars.FileFilter == null)
+            return ErrorNumber.SectorNotFound;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+        bool mode2 = false;
+
+        switch(aaruTrack.Type)
+        {
+            case CommonTypes.Enums.TrackType.CdMode1:
+            {
+                sectorOffset = 16;
+                sectorSize   = 2048;
+                sectorSkip   = 288;
+
+                break;
+            }
+            case CommonTypes.Enums.TrackType.CdMode2Formless:
+            case CommonTypes.Enums.TrackType.CdMode2Form1:
+            case CommonTypes.Enums.TrackType.CdMode2Form2:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CommonTypes.Enums.TrackType.Audio:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CommonTypes.Enums.TrackType.Data:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2048;
+                sectorSkip   = 0;
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        switch(chars.Subchannel)
+        {
+            case TrackSubchannelType.None:
+                sectorSkip += 0;
+
+                break;
+            case TrackSubchannelType.Q16Interleaved:
+                sectorSkip += 16;
+
+                break;
+            case TrackSubchannelType.PackedInterleaved:
+                sectorSkip += 96;
+
+                break;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream = chars.FileFilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.FileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(mode2)
+        {
+            var mode2Ms = new MemoryStream((int)(sectorSize * length));
+
+            buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length));
+
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize);
+                sector = Sector.GetUserDataFromMode2(sector);
+                mode2Ms.Write(sector, 0, sector.Length);
+            }
+
+            buffer = mode2Ms.ToArray();
+        }
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        // TODO: Cross data files
+        Track? aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
+            return ErrorNumber.OutOfRange;
+
+        DataFileCharacteristics chars = (from characteristics in _filePaths let firstSector =
+                                             characteristics.StartLba let lastSector =
+                                             firstSector + characteristics.Sectors - 1 let wantedSector =
+                                             (int)(sectorAddress + aaruTrack.StartSector)
+                                         where wantedSector >= firstSector && wantedSector <= lastSector
+                                         select characteristics).FirstOrDefault();
+
+        if(string.IsNullOrEmpty(chars.FilePath) ||
+           chars.FileFilter == null)
+            return ErrorNumber.SectorNotFound;
+
+        if(aaruTrack.Type == CommonTypes.Enums.TrackType.Data)
+            return ErrorNumber.NotSupported;
+
+        switch(tag)
+        {
+            case SectorTagType.CdSectorEcc:
+            case SectorTagType.CdSectorEccP:
+            case SectorTagType.CdSectorEccQ:
+            case SectorTagType.CdSectorEdc:
+            case SectorTagType.CdSectorHeader:
+            case SectorTagType.CdSectorSubchannel:
+            case SectorTagType.CdSectorSubHeader:
+            case SectorTagType.CdSectorSync: break;
+            case SectorTagType.CdTrackFlags:
+                if(!_trackFlags.TryGetValue((uint)sectorAddress, out byte flag))
+                    return ErrorNumber.NoData;
+
+                buffer = new[]
                 {
-                    case TrackSubchannelType.None:
-                        sectorSkip += 0;
+                    flag
+                };
+
+                return ErrorNumber.NoError;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(aaruTrack.Type)
+        {
+            case CommonTypes.Enums.TrackType.CdMode1:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
 
                         break;
-                    case TrackSubchannelType.Q16Interleaved:
-                        sectorSkip += 16;
+                    }
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
 
                         break;
-                    case TrackSubchannelType.PackedInterleaved:
-                        sectorSkip += 96;
+                    }
+                    case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
 
                         break;
+                    }
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2064;
+                        sectorSize   = 4;
+                        sectorSkip   = 284;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        switch(chars.Subchannel)
+                        {
+                            case TrackSubchannelType.PackedInterleaved:
+                            {
+                                sectorOffset = 2352;
+                                sectorSize   = 96;
+                                sectorSkip   = 0;
+
+                                break;
+                            }
+
+                            case TrackSubchannelType.Q16Interleaved:
+                            {
+                                sectorOffset = 2352;
+                                sectorSize   = 16;
+                                sectorSkip   = 0;
+
+                                break;
+                            }
+                            case TrackSubchannelType.None:
+                            {
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                                    return ErrorNumber.NotSupported;
+
+                                buffer = new byte[length * 96];
+
+                                return ErrorNumber.NoError;
+                            }
+
+                            default: return ErrorNumber.NotSupported;
+                        }
+
+                        break;
+                    }
                     default: return ErrorNumber.NotSupported;
                 }
 
-            buffer = new byte[sectorSize * length];
-
-            _imageStream = aaruTrack.Filter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.FileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            if(tag != SectorTagType.CdSectorSubchannel)
-                return ErrorNumber.NoError;
-
-            buffer = chars.Subchannel switch
+                break;
+            case CommonTypes.Enums.TrackType.CdMode2Formless:
             {
-                TrackSubchannelType.Q16Interleaved    => Subchannel.ConvertQToRaw(buffer),
-                TrackSubchannelType.PackedInterleaved => Subchannel.Interleave(buffer),
-                _                                     => buffer
-            };
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-                return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            // TODO: Cross data files
-            Track? aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
-
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
-                return ErrorNumber.OutOfRange;
-
-            DataFileCharacteristics chars = (from characteristics in _filePaths let firstSector =
-                                                 characteristics.StartLba let lastSector =
-                                                 firstSector + characteristics.Sectors - 1 let wantedSector =
-                                                 (int)(sectorAddress + aaruTrack.StartSector)
-                                             where wantedSector >= firstSector && wantedSector <= lastSector
-                                             select characteristics).FirstOrDefault();
-
-            if(string.IsNullOrEmpty(chars.FilePath) ||
-               chars.FileFilter == null)
-                return ErrorNumber.SectorNotFound;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch(aaruTrack.Type)
-            {
-                case CommonTypes.Enums.TrackType.CdMode1:
-                case CommonTypes.Enums.TrackType.CdMode2Formless:
-                case CommonTypes.Enums.TrackType.CdMode2Form1:
-                case CommonTypes.Enums.TrackType.CdMode2Form2:
-                case CommonTypes.Enums.TrackType.Audio:
+                switch(tag)
                 {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
+                    case SectorTagType.CdSectorSync:
+                    case SectorTagType.CdSectorHeader:
+                    case SectorTagType.CdSectorEcc:
+                    case SectorTagType.CdSectorEccP:
+                    case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
 
-                    break;
-                }
-                case CommonTypes.Enums.TrackType.Data:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2048;
-                    sectorSkip   = 0;
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2332;
+                        sectorSize   = 4;
+                        sectorSkip   = 0;
 
-                    break;
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        switch(chars.Subchannel)
+                        {
+                            case TrackSubchannelType.PackedInterleaved:
+                            {
+                                sectorOffset = 2352;
+                                sectorSize   = 96;
+                                sectorSkip   = 0;
+
+                                break;
+                            }
+
+                            case TrackSubchannelType.Q16Interleaved:
+                            {
+                                sectorOffset = 2352;
+                                sectorSize   = 16;
+                                sectorSkip   = 0;
+
+                                break;
+                            }
+                            case TrackSubchannelType.None:
+                            {
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                                    return ErrorNumber.NotSupported;
+
+                                buffer = new byte[length * 96];
+
+                                return ErrorNumber.NoError;
+                            }
+
+                            default: return ErrorNumber.NotSupported;
+                        }
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
                 }
-                default: return ErrorNumber.NotSupported;
+
+                break;
             }
+            case CommonTypes.Enums.TrackType.CdMode2Form1:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
 
+                        break;
+                    }
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 16;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2072;
+                        sectorSize   = 4;
+                        sectorSkip   = 276;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        switch(chars.Subchannel)
+                        {
+                            case TrackSubchannelType.PackedInterleaved:
+                            {
+                                sectorOffset = 2352;
+                                sectorSize   = 96;
+                                sectorSkip   = 0;
+
+                                break;
+                            }
+
+                            case TrackSubchannelType.Q16Interleaved:
+                            {
+                                sectorOffset = 2352;
+                                sectorSize   = 16;
+                                sectorSkip   = 0;
+
+                                break;
+                            }
+                            case TrackSubchannelType.None:
+                            {
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                                    return ErrorNumber.NotSupported;
+
+                                buffer = new byte[length * 96];
+
+                                return ErrorNumber.NoError;
+                            }
+
+                            default: return ErrorNumber.NotSupported;
+                        }
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            case CommonTypes.Enums.TrackType.CdMode2Form2:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 16;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2348;
+                        sectorSize   = 4;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        switch(chars.Subchannel)
+                        {
+                            case TrackSubchannelType.PackedInterleaved:
+                            {
+                                sectorOffset = 2352;
+                                sectorSize   = 96;
+                                sectorSkip   = 0;
+
+                                break;
+                            }
+
+                            case TrackSubchannelType.Q16Interleaved:
+                            {
+                                sectorOffset = 2352;
+                                sectorSize   = 16;
+                                sectorSkip   = 0;
+
+                                break;
+                            }
+                            case TrackSubchannelType.None:
+                            {
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                                    return ErrorNumber.NotSupported;
+
+                                buffer = new byte[length * 96];
+
+                                return ErrorNumber.NoError;
+                            }
+
+                            default: return ErrorNumber.NotSupported;
+                        }
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            case CommonTypes.Enums.TrackType.Audio:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        switch(chars.Subchannel)
+                        {
+                            case TrackSubchannelType.PackedInterleaved:
+                            {
+                                sectorOffset = 2352;
+                                sectorSize   = 96;
+                                sectorSkip   = 0;
+
+                                break;
+                            }
+
+                            case TrackSubchannelType.Q16Interleaved:
+                            {
+                                sectorOffset = 2352;
+                                sectorSize   = 16;
+                                sectorSkip   = 0;
+
+                                break;
+                            }
+                            case TrackSubchannelType.None:
+                            {
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                                    return ErrorNumber.NotSupported;
+
+                                buffer = new byte[length * 96];
+
+                                return ErrorNumber.NoError;
+                            }
+                            default: return ErrorNumber.NotSupported;
+                        }
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        if(tag != SectorTagType.CdSectorSubchannel)
             switch(chars.Subchannel)
             {
                 case TrackSubchannelType.None:
@@ -2184,41 +2057,167 @@ namespace Aaru.DiscImages
                 default: return ErrorNumber.NotSupported;
             }
 
-            buffer = new byte[sectorSize * length];
+        buffer = new byte[sectorSize * length];
 
-            _imageStream = aaruTrack.Filter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
+        _imageStream = aaruTrack.Filter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
 
-            br.BaseStream.
-               Seek((long)aaruTrack.FileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
+        br.BaseStream.
+           Seek((long)aaruTrack.FileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
 
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
 
+        if(tag != SectorTagType.CdSectorSubchannel)
             return ErrorNumber.NoError;
-        }
 
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(Session session)
+        buffer = chars.Subchannel switch
         {
-            if(Sessions.Contains(session))
-                return GetSessionTracks(session.Sequence);
+            TrackSubchannelType.Q16Interleaved    => Subchannel.ConvertQToRaw(buffer),
+            TrackSubchannelType.PackedInterleaved => Subchannel.Interleave(buffer),
+            _                                     => buffer
+        };
 
-            return null;
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+            return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        // TODO: Cross data files
+        Track? aaruTrack = Tracks.FirstOrDefault(bwTrack => bwTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
+            return ErrorNumber.OutOfRange;
+
+        DataFileCharacteristics chars = (from characteristics in _filePaths let firstSector =
+                                             characteristics.StartLba let lastSector =
+                                             firstSector + characteristics.Sectors - 1 let wantedSector =
+                                             (int)(sectorAddress + aaruTrack.StartSector)
+                                         where wantedSector >= firstSector && wantedSector <= lastSector
+                                         select characteristics).FirstOrDefault();
+
+        if(string.IsNullOrEmpty(chars.FilePath) ||
+           chars.FileFilter == null)
+            return ErrorNumber.SectorNotFound;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(aaruTrack.Type)
+        {
+            case CommonTypes.Enums.TrackType.CdMode1:
+            case CommonTypes.Enums.TrackType.CdMode2Formless:
+            case CommonTypes.Enums.TrackType.CdMode2Form1:
+            case CommonTypes.Enums.TrackType.CdMode2Form2:
+            case CommonTypes.Enums.TrackType.Audio:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CommonTypes.Enums.TrackType.Data:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2048;
+                sectorSkip   = 0;
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
         }
 
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session) =>
-            Tracks.Where(aaruTrack => aaruTrack.Session == session).ToList();
+        switch(chars.Subchannel)
+        {
+            case TrackSubchannelType.None:
+                sectorSkip += 0;
+
+                break;
+            case TrackSubchannelType.Q16Interleaved:
+                sectorSkip += 16;
+
+                break;
+            case TrackSubchannelType.PackedInterleaved:
+                sectorSkip += 96;
+
+                break;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream = aaruTrack.Filter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.FileOffset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
     }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(Session session)
+    {
+        if(Sessions.Contains(session))
+            return GetSessionTracks(session.Sequence);
+
+        return null;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session) =>
+        Tracks.Where(aaruTrack => aaruTrack.Session == session).ToList();
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/Structs.cs b/Aaru.Images/BlindWrite5/Structs.cs
index 81991134a..b8a3c4100 100644
--- a/Aaru.Images/BlindWrite5/Structs.cs
+++ b/Aaru.Images/BlindWrite5/Structs.cs
@@ -35,134 +35,133 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Decoders.SCSI.MMC;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite5
 {
-    public sealed partial class BlindWrite5
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Header
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] signature;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly uint[] unknown1;
-            public readonly ProfileNumber profile;
-            public readonly ushort        sessions;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly uint[] unknown2;
-            [MarshalAs(UnmanagedType.U1, SizeConst = 3)]
-            public readonly bool mcnIsValid;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public readonly byte[] mcn;
-            public readonly ushort unknown3;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly uint[] unknown4;
-            public readonly ushort pmaLen;
-            public readonly ushort atipLen;
-            public readonly ushort cdtLen;
-            public readonly ushort cdInfoLen;
-            public readonly uint   bcaLen;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly uint[] unknown5;
-            public readonly uint dvdStrLen;
-            public readonly uint dvdInfoLen;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] unknown6;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] manufacturer;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] product;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] revision;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] vendor;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] volumeId;
-            public readonly uint mode2ALen;
-            public readonly uint unkBlkLen;
-            public readonly uint dataLen;
-            public readonly uint sessionsLen;
-            public readonly uint dpmLen;
-        }
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] signature;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly uint[] unknown1;
+        public readonly ProfileNumber profile;
+        public readonly ushort        sessions;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly uint[] unknown2;
+        [MarshalAs(UnmanagedType.U1, SizeConst = 3)]
+        public readonly bool mcnIsValid;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
+        public readonly byte[] mcn;
+        public readonly ushort unknown3;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly uint[] unknown4;
+        public readonly ushort pmaLen;
+        public readonly ushort atipLen;
+        public readonly ushort cdtLen;
+        public readonly ushort cdInfoLen;
+        public readonly uint   bcaLen;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly uint[] unknown5;
+        public readonly uint dvdStrLen;
+        public readonly uint dvdInfoLen;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] unknown6;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] manufacturer;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] product;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] revision;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] vendor;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] volumeId;
+        public readonly uint mode2ALen;
+        public readonly uint unkBlkLen;
+        public readonly uint dataLen;
+        public readonly uint sessionsLen;
+        public readonly uint dpmLen;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct DataFile
-        {
-            public uint Type;
-            public uint Length;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public uint[] Unknown1;
-            public uint Offset;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public uint[] Unknown2;
-            public int    StartLba;
-            public int    Sectors;
-            public uint   FilenameLen;
-            public byte[] FilenameBytes;
-            public uint   Unknown3;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct DataFile
+    {
+        public uint Type;
+        public uint Length;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public uint[] Unknown1;
+        public uint Offset;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public uint[] Unknown2;
+        public int    StartLba;
+        public int    Sectors;
+        public uint   FilenameLen;
+        public byte[] FilenameBytes;
+        public uint   Unknown3;
 
-            public string Filename;
-        }
+        public string Filename;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct TrackDescriptor
-        {
-            public readonly TrackType type;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] unknown1;
-            public readonly uint            unknown2;
-            public readonly TrackSubchannel subchannel;
-            public readonly byte            unknown3;
-            public readonly byte            ctl;
-            public readonly byte            adr;
-            public readonly byte            point;
-            public readonly byte            tno;
-            public readonly byte            min;
-            public readonly byte            sec;
-            public readonly byte            frame;
-            public readonly byte            zero;
-            public readonly byte            pmin;
-            public readonly byte            psec;
-            public readonly byte            pframe;
-            public readonly byte            unknown5;
-            public readonly uint            pregap;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly uint[] unknown6;
-            public readonly int startLba;
-            public readonly int sectors;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly uint[] unknown7;
-            public readonly uint   session;
-            public readonly ushort unknown8;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct TrackDescriptor
+    {
+        public readonly TrackType type;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] unknown1;
+        public readonly uint            unknown2;
+        public readonly TrackSubchannel subchannel;
+        public readonly byte            unknown3;
+        public readonly byte            ctl;
+        public readonly byte            adr;
+        public readonly byte            point;
+        public readonly byte            tno;
+        public readonly byte            min;
+        public readonly byte            sec;
+        public readonly byte            frame;
+        public readonly byte            zero;
+        public readonly byte            pmin;
+        public readonly byte            psec;
+        public readonly byte            pframe;
+        public readonly byte            unknown5;
+        public readonly uint            pregap;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly uint[] unknown6;
+        public readonly int startLba;
+        public readonly int sectors;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly uint[] unknown7;
+        public readonly uint   session;
+        public readonly ushort unknown8;
 
-            // Seems to be only on non DVD track descriptors
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly uint[] unknown9;
-        }
+        // Seems to be only on non DVD track descriptors
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly uint[] unknown9;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct SessionDescriptor
-        {
-            public ushort            Sequence;
-            public byte              Entries;
-            public byte              Unknown;
-            public int               Start;
-            public int               End;
-            public ushort            FirstTrack;
-            public ushort            LastTrack;
-            public TrackDescriptor[] Tracks;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct SessionDescriptor
+    {
+        public ushort            Sequence;
+        public byte              Entries;
+        public byte              Unknown;
+        public int               Start;
+        public int               End;
+        public ushort            FirstTrack;
+        public ushort            LastTrack;
+        public TrackDescriptor[] Tracks;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct DataFileCharacteristics
-        {
-            public IFilter             FileFilter;
-            public string              FilePath;
-            public TrackSubchannelType Subchannel;
-            public long                SectorSize;
-            public int                 StartLba;
-            public int                 Sectors;
-            public uint                Offset;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct DataFileCharacteristics
+    {
+        public IFilter             FileFilter;
+        public string              FilePath;
+        public TrackSubchannelType Subchannel;
+        public long                SectorSize;
+        public int                 StartLba;
+        public int                 Sectors;
+        public uint                Offset;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/BlindWrite5/Verify.cs b/Aaru.Images/BlindWrite5/Verify.cs
index 67ac94a1e..9afb4fd86 100644
--- a/Aaru.Images/BlindWrite5/Verify.cs
+++ b/Aaru.Images/BlindWrite5/Verify.cs
@@ -35,92 +35,91 @@ using System.Collections.Generic;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class BlindWrite5
 {
-    public sealed partial class BlindWrite5
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
     {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/CDRDAO.cs b/Aaru.Images/CDRDAO/CDRDAO.cs
index 0a9ccf5bf..bdfb9aa8f 100644
--- a/Aaru.Images/CDRDAO/CDRDAO.cs
+++ b/Aaru.Images/CDRDAO/CDRDAO.cs
@@ -37,49 +37,48 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Decoders.CD;
 
-namespace Aaru.DiscImages
-{
-    // TODO: Doesn't support compositing from several files
-    // TODO: Doesn't support silences that are not in files
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing cdrdao cuesheet disc images</summary>
-    public sealed partial class Cdrdao : IWritableOpticalImage
-    {
-        IFilter      _cdrdaoFilter;
-        StreamWriter _descriptorStream;
-        CdrdaoDisc   _discimage;
-        ImageInfo    _imageInfo;
-        Stream       _imageStream;
-        /// <summary>Dictionary, index is track #, value is File</summary>
-        Dictionary<uint, ulong> _offsetmap;
-        SectorBuilder                _sectorBuilder;
-        bool                         _separateTracksWriting;
-        StreamReader                 _tocStream;
-        Dictionary<byte, byte>       _trackFlags;
-        Dictionary<byte, string>     _trackIsrcs;
-        string                       _writingBaseName;
-        Dictionary<uint, FileStream> _writingStreams;
-        List<Track>                  _writingTracks;
+namespace Aaru.DiscImages;
 
-        public Cdrdao() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = true,
-            HasSessions           = true,
-            Version               = null,
-            ApplicationVersion    = null,
-            MediaTitle            = null,
-            Creator               = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: Doesn't support compositing from several files
+// TODO: Doesn't support silences that are not in files
+/// <inheritdoc />
+/// <summary>Implements reading and writing cdrdao cuesheet disc images</summary>
+public sealed partial class Cdrdao : IWritableOpticalImage
+{
+    IFilter      _cdrdaoFilter;
+    StreamWriter _descriptorStream;
+    CdrdaoDisc   _discimage;
+    ImageInfo    _imageInfo;
+    Stream       _imageStream;
+    /// <summary>Dictionary, index is track #, value is File</summary>
+    Dictionary<uint, ulong> _offsetmap;
+    SectorBuilder                _sectorBuilder;
+    bool                         _separateTracksWriting;
+    StreamReader                 _tocStream;
+    Dictionary<byte, byte>       _trackFlags;
+    Dictionary<byte, string>     _trackIsrcs;
+    string                       _writingBaseName;
+    Dictionary<uint, FileStream> _writingStreams;
+    List<Track>                  _writingTracks;
+
+    public Cdrdao() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = true,
+        HasSessions           = true,
+        Version               = null,
+        ApplicationVersion    = null,
+        MediaTitle            = null,
+        Creator               = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/Constants.cs b/Aaru.Images/CDRDAO/Constants.cs
index 92ad7264d..3ae22d5e9 100644
--- a/Aaru.Images/CDRDAO/Constants.cs
+++ b/Aaru.Images/CDRDAO/Constants.cs
@@ -30,61 +30,60 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cdrdao
 {
-    public sealed partial class Cdrdao
-    {
-        /// <summary>Audio track, 2352 bytes/sector</summary>
-        const string CDRDAO_TRACK_TYPE_AUDIO = "AUDIO";
-        /// <summary>Mode 1 track, cooked, 2048 bytes/sector</summary>
-        const string CDRDAO_TRACK_TYPE_MODE1 = "MODE1";
-        /// <summary>Mode 1 track, raw, 2352 bytes/sector</summary>
-        const string CDRDAO_TRACK_TYPE_MODE1_RAW = "MODE1_RAW";
-        /// <summary>Mode 2 mixed formless, cooked, 2336 bytes/sector</summary>
-        const string CDRDAO_TRACK_TYPE_MODE2 = "MODE2";
-        /// <summary>Mode 2 form 1 track, cooked, 2048 bytes/sector</summary>
-        const string CDRDAO_TRACK_TYPE_MODE2_FORM1 = "MODE2_FORM1";
-        /// <summary>Mode 2 form 2 track, cooked, 2324 bytes/sector</summary>
-        const string CDRDAO_TRACK_TYPE_MODE2_FORM2 = "MODE2_FORM2";
-        /// <summary>Mode 2 mixed forms track, cooked, 2336 bytes/sector</summary>
-        const string CDRDAO_TRACK_TYPE_MODE2_MIX = "MODE2_FORM_MIX";
-        /// <summary>Mode 2 track, raw, 2352 bytes/sector</summary>
-        const string CDRDAO_TRACK_TYPE_MODE2_RAW = "MODE2_RAW";
+    /// <summary>Audio track, 2352 bytes/sector</summary>
+    const string CDRDAO_TRACK_TYPE_AUDIO = "AUDIO";
+    /// <summary>Mode 1 track, cooked, 2048 bytes/sector</summary>
+    const string CDRDAO_TRACK_TYPE_MODE1 = "MODE1";
+    /// <summary>Mode 1 track, raw, 2352 bytes/sector</summary>
+    const string CDRDAO_TRACK_TYPE_MODE1_RAW = "MODE1_RAW";
+    /// <summary>Mode 2 mixed formless, cooked, 2336 bytes/sector</summary>
+    const string CDRDAO_TRACK_TYPE_MODE2 = "MODE2";
+    /// <summary>Mode 2 form 1 track, cooked, 2048 bytes/sector</summary>
+    const string CDRDAO_TRACK_TYPE_MODE2_FORM1 = "MODE2_FORM1";
+    /// <summary>Mode 2 form 2 track, cooked, 2324 bytes/sector</summary>
+    const string CDRDAO_TRACK_TYPE_MODE2_FORM2 = "MODE2_FORM2";
+    /// <summary>Mode 2 mixed forms track, cooked, 2336 bytes/sector</summary>
+    const string CDRDAO_TRACK_TYPE_MODE2_MIX = "MODE2_FORM_MIX";
+    /// <summary>Mode 2 track, raw, 2352 bytes/sector</summary>
+    const string CDRDAO_TRACK_TYPE_MODE2_RAW = "MODE2_RAW";
 
-        const string REGEX_COMMENT  = @"^\s*\/{2}(?<comment>.+)$";
-        const string REGEX_COPY     = @"^\s*(?<no>NO)?\s*COPY";
-        const string REGEX_DISCTYPE = @"^\s*(?<type>(CD_DA|CD_ROM_XA|CD_ROM|CD_I))";
-        const string REGEX_EMPHASIS = @"^\s*(?<no>NO)?\s*PRE_EMPHASIS";
-        const string REGEX_FILE_AUDIO =
-            @"^\s*(AUDIO)?FILE\s*""(?<filename>.+)""\s*(#(?<base_offset>\d+))?\s*((?<start>[\d]+:[\d]+:[\d]+)|(?<start_num>\d+))\s*(?<length>[\d]+:[\d]+:[\d]+)?";
-        const string REGEX_FILE_DATA =
-            @"^\s*DATAFILE\s*""(?<filename>.+)""\s*(#(?<base_offset>\d+))?\s*(?<length>[\d]+:[\d]+:[\d]+)?";
-        const string REGEX_INDEX  = @"^\s*INDEX\s*(?<address>\d+:\d+:\d+)";
-        const string REGEX_ISRC   = @"^\s*ISRC\s*""(?<isrc>[A-Z0-9]{5,5}[0-9]{7,7})""";
-        const string REGEX_MCN    = @"^\s*CATALOG\s*""(?<catalog>[\x21-\x7F]{13,13})""";
-        const string REGEX_PREGAP = @"^\s*START\s*(?<address>\d+:\d+:\d+)?";
-        const string REGEX_STEREO = @"^\s*(?<num>(TWO|FOUR))_CHANNEL_AUDIO";
-        const string REGEX_TRACK =
-            @"^\s*TRACK\s*(?<type>(AUDIO|MODE1_RAW|MODE1|MODE2_FORM1|MODE2_FORM2|MODE2_FORM_MIX|MODE2_RAW|MODE2))\s*(?<subchan>(RW_RAW|RW))?";
-        const string REGEX_ZERO_AUDIO  = @"^\s*SILENCE\s*(?<length>\d+:\d+:\d+)";
-        const string REGEX_ZERO_DATA   = @"^\s*ZERO\s*(?<length>\d+:\d+:\d+)";
-        const string REGEX_ZERO_PREGAP = @"^\s*PREGAP\s*(?<length>\d+:\d+:\d+)";
+    const string REGEX_COMMENT  = @"^\s*\/{2}(?<comment>.+)$";
+    const string REGEX_COPY     = @"^\s*(?<no>NO)?\s*COPY";
+    const string REGEX_DISCTYPE = @"^\s*(?<type>(CD_DA|CD_ROM_XA|CD_ROM|CD_I))";
+    const string REGEX_EMPHASIS = @"^\s*(?<no>NO)?\s*PRE_EMPHASIS";
+    const string REGEX_FILE_AUDIO =
+        @"^\s*(AUDIO)?FILE\s*""(?<filename>.+)""\s*(#(?<base_offset>\d+))?\s*((?<start>[\d]+:[\d]+:[\d]+)|(?<start_num>\d+))\s*(?<length>[\d]+:[\d]+:[\d]+)?";
+    const string REGEX_FILE_DATA =
+        @"^\s*DATAFILE\s*""(?<filename>.+)""\s*(#(?<base_offset>\d+))?\s*(?<length>[\d]+:[\d]+:[\d]+)?";
+    const string REGEX_INDEX  = @"^\s*INDEX\s*(?<address>\d+:\d+:\d+)";
+    const string REGEX_ISRC   = @"^\s*ISRC\s*""(?<isrc>[A-Z0-9]{5,5}[0-9]{7,7})""";
+    const string REGEX_MCN    = @"^\s*CATALOG\s*""(?<catalog>[\x21-\x7F]{13,13})""";
+    const string REGEX_PREGAP = @"^\s*START\s*(?<address>\d+:\d+:\d+)?";
+    const string REGEX_STEREO = @"^\s*(?<num>(TWO|FOUR))_CHANNEL_AUDIO";
+    const string REGEX_TRACK =
+        @"^\s*TRACK\s*(?<type>(AUDIO|MODE1_RAW|MODE1|MODE2_FORM1|MODE2_FORM2|MODE2_FORM_MIX|MODE2_RAW|MODE2))\s*(?<subchan>(RW_RAW|RW))?";
+    const string REGEX_ZERO_AUDIO  = @"^\s*SILENCE\s*(?<length>\d+:\d+:\d+)";
+    const string REGEX_ZERO_DATA   = @"^\s*ZERO\s*(?<length>\d+:\d+:\d+)";
+    const string REGEX_ZERO_PREGAP = @"^\s*PREGAP\s*(?<length>\d+:\d+:\d+)";
 
-        // CD-Text
-        const string REGEX_ARRANGER   = @"^\s*ARRANGER\s*""(?<arranger>.+)""";
-        const string REGEX_COMPOSER   = @"^\s*COMPOSER\s*""(?<composer>.+)""";
-        const string REGEX_DISC_ID    = @"^\s*DISC_ID\s*""(?<discid>.+)""";
-        const string REGEX_MESSAGE    = @"^\s*MESSAGE\s*""(?<message>.+)""";
-        const string REGEX_PERFORMER  = @"^\s*PERFORMER\s*""(?<performer>.+)""";
-        const string REGEX_SONGWRITER = @"^\s*SONGWRITER\s*""(?<songwriter>.+)""";
-        const string REGEX_TITLE      = @"^\s*TITLE\s*""(?<title>.+)""";
-        const string REGEX_UPC        = @"^\s*UPC_EAN\s*""(?<catalog>[\d]{13,13})""";
+    // CD-Text
+    const string REGEX_ARRANGER   = @"^\s*ARRANGER\s*""(?<arranger>.+)""";
+    const string REGEX_COMPOSER   = @"^\s*COMPOSER\s*""(?<composer>.+)""";
+    const string REGEX_DISC_ID    = @"^\s*DISC_ID\s*""(?<discid>.+)""";
+    const string REGEX_MESSAGE    = @"^\s*MESSAGE\s*""(?<message>.+)""";
+    const string REGEX_PERFORMER  = @"^\s*PERFORMER\s*""(?<performer>.+)""";
+    const string REGEX_SONGWRITER = @"^\s*SONGWRITER\s*""(?<songwriter>.+)""";
+    const string REGEX_TITLE      = @"^\s*TITLE\s*""(?<title>.+)""";
+    const string REGEX_UPC        = @"^\s*UPC_EAN\s*""(?<catalog>[\d]{13,13})""";
 
-        // Unused
-        const string REGEX_CD_TEXT          = @"^\s*CD_TEXT\s*\{";
-        const string REGEX_CLOSURE          = @"^\s*\}";
-        const string REGEX_LANGUAGE         = @"^\s*LANGUAGE\s*(?<code>\d+)\s*\{";
-        const string REGEX_LANGUAGE_MAP     = @"^\s*LANGUAGE_MAP\s*\{";
-        const string REGEX_LANGUAGE_MAPPING = @"^\s*(?<code>\d+)\s?\:\s?(?<language>\d+|\w+)";
-    }
+    // Unused
+    const string REGEX_CD_TEXT          = @"^\s*CD_TEXT\s*\{";
+    const string REGEX_CLOSURE          = @"^\s*\}";
+    const string REGEX_LANGUAGE         = @"^\s*LANGUAGE\s*(?<code>\d+)\s*\{";
+    const string REGEX_LANGUAGE_MAP     = @"^\s*LANGUAGE_MAP\s*\{";
+    const string REGEX_LANGUAGE_MAPPING = @"^\s*(?<code>\d+)\s?\:\s?(?<language>\d+|\w+)";
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/Helpers.cs b/Aaru.Images/CDRDAO/Helpers.cs
index 9b18e0453..bac44b467 100644
--- a/Aaru.Images/CDRDAO/Helpers.cs
+++ b/Aaru.Images/CDRDAO/Helpers.cs
@@ -33,60 +33,59 @@
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cdrdao
 {
-    public sealed partial class Cdrdao
+    static ushort CdrdaoTrackTypeToCookedBytesPerSector(string trackType)
     {
-        static ushort CdrdaoTrackTypeToCookedBytesPerSector(string trackType)
+        switch(trackType)
         {
-            switch(trackType)
-            {
-                case CDRDAO_TRACK_TYPE_MODE1:
-                case CDRDAO_TRACK_TYPE_MODE2_FORM1:
-                case CDRDAO_TRACK_TYPE_MODE1_RAW: return 2048;
-                case CDRDAO_TRACK_TYPE_MODE2_FORM2: return 2324;
-                case CDRDAO_TRACK_TYPE_MODE2:
-                case CDRDAO_TRACK_TYPE_MODE2_MIX:
-                case CDRDAO_TRACK_TYPE_MODE2_RAW: return 2336;
-                case CDRDAO_TRACK_TYPE_AUDIO: return 2352;
-                default:                      return 0;
-            }
+            case CDRDAO_TRACK_TYPE_MODE1:
+            case CDRDAO_TRACK_TYPE_MODE2_FORM1:
+            case CDRDAO_TRACK_TYPE_MODE1_RAW: return 2048;
+            case CDRDAO_TRACK_TYPE_MODE2_FORM2: return 2324;
+            case CDRDAO_TRACK_TYPE_MODE2:
+            case CDRDAO_TRACK_TYPE_MODE2_MIX:
+            case CDRDAO_TRACK_TYPE_MODE2_RAW: return 2336;
+            case CDRDAO_TRACK_TYPE_AUDIO: return 2352;
+            default:                      return 0;
         }
+    }
 
-        static TrackType CdrdaoTrackTypeToTrackType(string trackType)
+    static TrackType CdrdaoTrackTypeToTrackType(string trackType)
+    {
+        switch(trackType)
         {
-            switch(trackType)
-            {
-                case CDRDAO_TRACK_TYPE_MODE1:
-                case CDRDAO_TRACK_TYPE_MODE1_RAW: return TrackType.CdMode1;
-                case CDRDAO_TRACK_TYPE_MODE2_FORM1: return TrackType.CdMode2Form1;
-                case CDRDAO_TRACK_TYPE_MODE2_FORM2: return TrackType.CdMode2Form2;
-                case CDRDAO_TRACK_TYPE_MODE2:
-                case CDRDAO_TRACK_TYPE_MODE2_MIX:
-                case CDRDAO_TRACK_TYPE_MODE2_RAW: return TrackType.CdMode2Formless;
-                case CDRDAO_TRACK_TYPE_AUDIO: return TrackType.Audio;
-                default:                      return TrackType.Data;
-            }
+            case CDRDAO_TRACK_TYPE_MODE1:
+            case CDRDAO_TRACK_TYPE_MODE1_RAW: return TrackType.CdMode1;
+            case CDRDAO_TRACK_TYPE_MODE2_FORM1: return TrackType.CdMode2Form1;
+            case CDRDAO_TRACK_TYPE_MODE2_FORM2: return TrackType.CdMode2Form2;
+            case CDRDAO_TRACK_TYPE_MODE2:
+            case CDRDAO_TRACK_TYPE_MODE2_MIX:
+            case CDRDAO_TRACK_TYPE_MODE2_RAW: return TrackType.CdMode2Formless;
+            case CDRDAO_TRACK_TYPE_AUDIO: return TrackType.Audio;
+            default:                      return TrackType.Data;
         }
+    }
 
-        static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
-            ((byte)(sector / 75 / 60), (byte)(sector / 75 % 60), (byte)(sector % 75));
+    static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
+        ((byte)(sector / 75 / 60), (byte)(sector / 75 % 60), (byte)(sector % 75));
 
-        static string GetTrackMode(Track track)
+    static string GetTrackMode(Track track)
+    {
+        switch(track.Type)
         {
-            switch(track.Type)
-            {
-                case TrackType.Audio when track.RawBytesPerSector == 2352: return CDRDAO_TRACK_TYPE_AUDIO;
-                case TrackType.Data: return CDRDAO_TRACK_TYPE_MODE1;
-                case TrackType.CdMode1 when track.RawBytesPerSector == 2352: return CDRDAO_TRACK_TYPE_MODE1_RAW;
-                case TrackType.CdMode2Formless when track.RawBytesPerSector != 2352: return CDRDAO_TRACK_TYPE_MODE2;
-                case TrackType.CdMode2Form1 when track.RawBytesPerSector != 2352: return CDRDAO_TRACK_TYPE_MODE2_FORM1;
-                case TrackType.CdMode2Form2 when track.RawBytesPerSector != 2352: return CDRDAO_TRACK_TYPE_MODE2_FORM2;
-                case TrackType.CdMode2Formless when track.RawBytesPerSector == 2352:
-                case TrackType.CdMode2Form1 when track.RawBytesPerSector    == 2352:
-                case TrackType.CdMode2Form2 when track.RawBytesPerSector    == 2352: return CDRDAO_TRACK_TYPE_MODE2_RAW;
-                default: return CDRDAO_TRACK_TYPE_MODE1;
-            }
+            case TrackType.Audio when track.RawBytesPerSector == 2352:           return CDRDAO_TRACK_TYPE_AUDIO;
+            case TrackType.Data:                                                 return CDRDAO_TRACK_TYPE_MODE1;
+            case TrackType.CdMode1 when track.RawBytesPerSector         == 2352: return CDRDAO_TRACK_TYPE_MODE1_RAW;
+            case TrackType.CdMode2Formless when track.RawBytesPerSector != 2352: return CDRDAO_TRACK_TYPE_MODE2;
+            case TrackType.CdMode2Form1 when track.RawBytesPerSector    != 2352: return CDRDAO_TRACK_TYPE_MODE2_FORM1;
+            case TrackType.CdMode2Form2 when track.RawBytesPerSector    != 2352: return CDRDAO_TRACK_TYPE_MODE2_FORM2;
+            case TrackType.CdMode2Formless when track.RawBytesPerSector == 2352:
+            case TrackType.CdMode2Form1 when track.RawBytesPerSector    == 2352:
+            case TrackType.CdMode2Form2 when track.RawBytesPerSector    == 2352: return CDRDAO_TRACK_TYPE_MODE2_RAW;
+            default: return CDRDAO_TRACK_TYPE_MODE1;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/Identify.cs b/Aaru.Images/CDRDAO/Identify.cs
index b5121bc3d..a9c859dd3 100644
--- a/Aaru.Images/CDRDAO/Identify.cs
+++ b/Aaru.Images/CDRDAO/Identify.cs
@@ -36,74 +36,73 @@ using System.Text.RegularExpressions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cdrdao
 {
-    public sealed partial class Cdrdao
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        try
         {
-            try
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+            byte[] testArray = new byte[512];
+            imageFilter.GetDataForkStream().Read(testArray, 0, 512);
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+
+            // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
+            bool twoConsecutiveNulls = false;
+
+            for(int i = 0; i < 512; i++)
             {
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
-                byte[] testArray = new byte[512];
-                imageFilter.GetDataForkStream().Read(testArray, 0, 512);
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+                if(i >= imageFilter.GetDataForkStream().Length)
+                    break;
 
-                // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
-                bool twoConsecutiveNulls = false;
-
-                for(int i = 0; i < 512; i++)
+                if(testArray[i] == 0)
                 {
-                    if(i >= imageFilter.GetDataForkStream().Length)
-                        break;
-
-                    if(testArray[i] == 0)
-                    {
-                        if(twoConsecutiveNulls)
-                            return false;
-
-                        twoConsecutiveNulls = true;
-                    }
-                    else
-                        twoConsecutiveNulls = false;
-
-                    if(testArray[i] < 0x20  &&
-                       testArray[i] != 0x0A &&
-                       testArray[i] != 0x0D &&
-                       testArray[i] != 0x00)
+                    if(twoConsecutiveNulls)
                         return false;
+
+                    twoConsecutiveNulls = true;
                 }
+                else
+                    twoConsecutiveNulls = false;
 
-                _tocStream = new StreamReader(imageFilter.GetDataForkStream());
-
-                var cr = new Regex(REGEX_COMMENT);
-                var dr = new Regex(REGEX_DISCTYPE);
-
-                while(_tocStream.Peek() >= 0)
-                {
-                    string line = _tocStream.ReadLine();
-
-                    Match dm = dr.Match(line ?? "");
-                    Match cm = cr.Match(line);
-
-                    // Skip comments at start of file
-                    if(cm.Success)
-                        continue;
-
-                    return dm.Success;
-                }
-
-                return false;
+                if(testArray[i] < 0x20  &&
+                   testArray[i] != 0x0A &&
+                   testArray[i] != 0x0D &&
+                   testArray[i] != 0x00)
+                    return false;
             }
-            catch(Exception ex)
+
+            _tocStream = new StreamReader(imageFilter.GetDataForkStream());
+
+            var cr = new Regex(REGEX_COMMENT);
+            var dr = new Regex(REGEX_DISCTYPE);
+
+            while(_tocStream.Peek() >= 0)
             {
-                AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", _cdrdaoFilter.Filename);
-                AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
-                AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
+                string line = _tocStream.ReadLine();
 
-                return false;
+                Match dm = dr.Match(line ?? "");
+                Match cm = cr.Match(line);
+
+                // Skip comments at start of file
+                if(cm.Success)
+                    continue;
+
+                return dm.Success;
             }
+
+            return false;
+        }
+        catch(Exception ex)
+        {
+            AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", _cdrdaoFilter.Filename);
+            AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
+            AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
+
+            return false;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/Properties.cs b/Aaru.Images/CDRDAO/Properties.cs
index 714322a86..e560f8ad9 100644
--- a/Aaru.Images/CDRDAO/Properties.cs
+++ b/Aaru.Images/CDRDAO/Properties.cs
@@ -38,170 +38,169 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cdrdao
 {
-    public sealed partial class Cdrdao
+    /// <inheritdoc />
+    public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks    |
+                                                           OpticalImageCapabilities.CanStoreDataTracks     |
+                                                           OpticalImageCapabilities.CanStorePregaps        |
+                                                           OpticalImageCapabilities.CanStoreSubchannelRw   |
+                                                           OpticalImageCapabilities.CanStoreIsrc           |
+                                                           OpticalImageCapabilities.CanStoreCdText         |
+                                                           OpticalImageCapabilities.CanStoreMcn            |
+                                                           OpticalImageCapabilities.CanStoreRawData        |
+                                                           OpticalImageCapabilities.CanStoreCookedData     |
+                                                           OpticalImageCapabilities.CanStoreMultipleTracks |
+                                                           OpticalImageCapabilities.CanStoreIndexes;
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "CDRDAO tocfile";
+    /// <inheritdoc />
+    public Guid Id => new("04D7BA12-1BE8-44D4-97A4-1B48A505463E");
+    /// <inheritdoc />
+    public string Format => "CDRDAO tocfile";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<Partition> Partitions { get; private set; }
+
+    /// <inheritdoc />
+    public List<Session> Sessions
     {
-        /// <inheritdoc />
-        public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks    |
-                                                               OpticalImageCapabilities.CanStoreDataTracks     |
-                                                               OpticalImageCapabilities.CanStorePregaps        |
-                                                               OpticalImageCapabilities.CanStoreSubchannelRw   |
-                                                               OpticalImageCapabilities.CanStoreIsrc           |
-                                                               OpticalImageCapabilities.CanStoreCdText         |
-                                                               OpticalImageCapabilities.CanStoreMcn            |
-                                                               OpticalImageCapabilities.CanStoreRawData        |
-                                                               OpticalImageCapabilities.CanStoreCookedData     |
-                                                               OpticalImageCapabilities.CanStoreMultipleTracks |
-                                                               OpticalImageCapabilities.CanStoreIndexes;
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "CDRDAO tocfile";
-        /// <inheritdoc />
-        public Guid Id => new("04D7BA12-1BE8-44D4-97A4-1B48A505463E");
-        /// <inheritdoc />
-        public string Format => "CDRDAO tocfile";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<Partition> Partitions { get; private set; }
-
-        /// <inheritdoc />
-        public List<Session> Sessions
+        get
         {
-            get
-            {
-                Track firstTrack = Tracks.First(t => t.Sequence == Tracks.Min(m => m.Sequence));
-                Track lastTrack  = Tracks.First(t => t.Sequence == Tracks.Max(m => m.Sequence));
+            Track firstTrack = Tracks.First(t => t.Sequence == Tracks.Min(m => m.Sequence));
+            Track lastTrack  = Tracks.First(t => t.Sequence == Tracks.Max(m => m.Sequence));
 
-                return new List<Session>
+            return new List<Session>
+            {
+                new()
                 {
-                    new()
-                    {
-                        Sequence    = 1,
-                        StartSector = firstTrack.StartSector,
-                        EndSector   = lastTrack.EndSector,
-                        StartTrack  = firstTrack.Sequence,
-                        EndTrack    = lastTrack.Sequence
-                    }
-                };
-            }
+                    Sequence    = 1,
+                    StartSector = firstTrack.StartSector,
+                    EndSector   = lastTrack.EndSector,
+                    StartTrack  = firstTrack.Sequence,
+                    EndTrack    = lastTrack.Sequence
+                }
+            };
         }
+    }
 
-        /// <inheritdoc />
-        public List<Track> Tracks
+    /// <inheritdoc />
+    public List<Track> Tracks
+    {
+        get
         {
-            get
+            List<Track> tracks = new();
+
+            foreach(CdrdaoTrack cdrTrack in _discimage.Tracks)
             {
-                List<Track> tracks = new();
-
-                foreach(CdrdaoTrack cdrTrack in _discimage.Tracks)
+                var aaruTrack = new Track
                 {
-                    var aaruTrack = new Track
+                    Description       = cdrTrack.Title,
+                    StartSector       = cdrTrack.StartSector,
+                    Pregap            = cdrTrack.Pregap,
+                    Session           = 1,
+                    Sequence          = cdrTrack.Sequence,
+                    Type              = CdrdaoTrackTypeToTrackType(cdrTrack.Tracktype),
+                    Filter            = cdrTrack.Trackfile.Datafilter,
+                    File              = cdrTrack.Trackfile.Datafilter.Filename,
+                    FileOffset        = cdrTrack.Trackfile.Offset,
+                    FileType          = cdrTrack.Trackfile.Filetype,
+                    RawBytesPerSector = cdrTrack.Bps,
+                    BytesPerSector    = CdrdaoTrackTypeToCookedBytesPerSector(cdrTrack.Tracktype)
+                };
+
+                aaruTrack.EndSector = aaruTrack.StartSector + cdrTrack.Sectors - 1;
+
+                if(!cdrTrack.Indexes.TryGetValue(0, out aaruTrack.StartSector))
+                    cdrTrack.Indexes.TryGetValue(1, out aaruTrack.StartSector);
+
+                if(cdrTrack.Subchannel)
+                {
+                    aaruTrack.SubchannelType = cdrTrack.Packedsubchannel ? TrackSubchannelType.PackedInterleaved
+                                                   : TrackSubchannelType.RawInterleaved;
+
+                    aaruTrack.SubchannelFilter = cdrTrack.Trackfile.Datafilter;
+                    aaruTrack.SubchannelFile   = cdrTrack.Trackfile.Datafilter.Filename;
+                    aaruTrack.SubchannelOffset = cdrTrack.Trackfile.Offset;
+                }
+                else
+                    aaruTrack.SubchannelType = TrackSubchannelType.None;
+
+                if(aaruTrack.Sequence == 1)
+                {
+                    aaruTrack.Pregap = 150;
+
+                    if(cdrTrack.Indexes.Count == 0)
                     {
-                        Description       = cdrTrack.Title,
-                        StartSector       = cdrTrack.StartSector,
-                        Pregap            = cdrTrack.Pregap,
-                        Session           = 1,
-                        Sequence          = cdrTrack.Sequence,
-                        Type              = CdrdaoTrackTypeToTrackType(cdrTrack.Tracktype),
-                        Filter            = cdrTrack.Trackfile.Datafilter,
-                        File              = cdrTrack.Trackfile.Datafilter.Filename,
-                        FileOffset        = cdrTrack.Trackfile.Offset,
-                        FileType          = cdrTrack.Trackfile.Filetype,
-                        RawBytesPerSector = cdrTrack.Bps,
-                        BytesPerSector    = CdrdaoTrackTypeToCookedBytesPerSector(cdrTrack.Tracktype)
-                    };
-
-                    aaruTrack.EndSector = aaruTrack.StartSector + cdrTrack.Sectors - 1;
-
-                    if(!cdrTrack.Indexes.TryGetValue(0, out aaruTrack.StartSector))
-                        cdrTrack.Indexes.TryGetValue(1, out aaruTrack.StartSector);
-
-                    if(cdrTrack.Subchannel)
-                    {
-                        aaruTrack.SubchannelType = cdrTrack.Packedsubchannel ? TrackSubchannelType.PackedInterleaved
-                                                       : TrackSubchannelType.RawInterleaved;
-
-                        aaruTrack.SubchannelFilter = cdrTrack.Trackfile.Datafilter;
-                        aaruTrack.SubchannelFile   = cdrTrack.Trackfile.Datafilter.Filename;
-                        aaruTrack.SubchannelOffset = cdrTrack.Trackfile.Offset;
+                        aaruTrack.Indexes[0] = -150;
+                        aaruTrack.Indexes[1] = 0;
                     }
-                    else
-                        aaruTrack.SubchannelType = TrackSubchannelType.None;
-
-                    if(aaruTrack.Sequence == 1)
+                    else if(!cdrTrack.Indexes.ContainsKey(0))
                     {
-                        aaruTrack.Pregap = 150;
+                        aaruTrack.Indexes[0] = -150;
 
-                        if(cdrTrack.Indexes.Count == 0)
-                        {
-                            aaruTrack.Indexes[0] = -150;
-                            aaruTrack.Indexes[1] = 0;
-                        }
-                        else if(!cdrTrack.Indexes.ContainsKey(0))
-                        {
-                            aaruTrack.Indexes[0] = -150;
-
-                            foreach(KeyValuePair<int, ulong> idx in cdrTrack.Indexes.OrderBy(i => i.Key))
-                                aaruTrack.Indexes[(ushort)idx.Key] = (int)idx.Value;
-                        }
-                    }
-                    else
                         foreach(KeyValuePair<int, ulong> idx in cdrTrack.Indexes.OrderBy(i => i.Key))
                             aaruTrack.Indexes[(ushort)idx.Key] = (int)idx.Value;
-
-                    tracks.Add(aaruTrack);
+                    }
                 }
+                else
+                    foreach(KeyValuePair<int, ulong> idx in cdrTrack.Indexes.OrderBy(i => i.Key))
+                        aaruTrack.Indexes[(ushort)idx.Key] = (int)idx.Value;
 
-                return tracks;
+                tracks.Add(aaruTrack);
             }
+
+            return tracks;
         }
-
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-
-        // TODO: Decode CD-Text to text
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new[]
-        {
-            MediaTagType.CD_MCN
-        };
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
-        {
-            SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
-            SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubchannel,
-            SectorTagType.CdSectorSubHeader, SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags,
-            SectorTagType.CdTrackIsrc
-        };
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI, MediaType.CDMIDI,
-            MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA, MediaType.CDRW,
-            MediaType.CDV, MediaType.DDCD, MediaType.DDCDR, MediaType.DDCDRW, MediaType.MEGACD, MediaType.PS1CD,
-            MediaType.PS2CD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD, MediaType.ThreeDO,
-            MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32,
-            MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
-            MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
-        {
-            ("separate", typeof(bool), "Write each track to a separate file.", (object)false)
-        };
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".toc"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
     }
+
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+
+    // TODO: Decode CD-Text to text
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new[]
+    {
+        MediaTagType.CD_MCN
+    };
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new[]
+    {
+        SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
+        SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubchannel,
+        SectorTagType.CdSectorSubHeader, SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags,
+        SectorTagType.CdTrackIsrc
+    };
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI, MediaType.CDMIDI,
+        MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA, MediaType.CDRW,
+        MediaType.CDV, MediaType.DDCD, MediaType.DDCDR, MediaType.DDCDRW, MediaType.MEGACD, MediaType.PS1CD,
+        MediaType.PS2CD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD, MediaType.ThreeDO,
+        MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32,
+        MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
+        MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
+    {
+        ("separate", typeof(bool), "Write each track to a separate file.", (object)false)
+    };
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".toc"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/Read.cs b/Aaru.Images/CDRDAO/Read.cs
index b957a4212..51256c1b9 100644
--- a/Aaru.Images/CDRDAO/Read.cs
+++ b/Aaru.Images/CDRDAO/Read.cs
@@ -44,1494 +44,1493 @@ using Aaru.Console;
 using Aaru.Decoders.CD;
 using Session = Aaru.CommonTypes.Structs.Session;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cdrdao
 {
-    public sealed partial class Cdrdao
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        if(imageFilter == null)
+            return ErrorNumber.NoSuchFile;
+
+        _cdrdaoFilter = imageFilter;
+
+        try
         {
-            if(imageFilter == null)
-                return ErrorNumber.NoSuchFile;
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+            _tocStream = new StreamReader(imageFilter.GetDataForkStream());
+            bool inTrack = false;
 
-            _cdrdaoFilter = imageFilter;
+            // Initialize all RegExs
+            var regexComment         = new Regex(REGEX_COMMENT);
+            var regexDiskType        = new Regex(REGEX_DISCTYPE);
+            var regexMcn             = new Regex(REGEX_MCN);
+            var regexTrack           = new Regex(REGEX_TRACK);
+            var regexCopy            = new Regex(REGEX_COPY);
+            var regexEmphasis        = new Regex(REGEX_EMPHASIS);
+            var regexStereo          = new Regex(REGEX_STEREO);
+            var regexIsrc            = new Regex(REGEX_ISRC);
+            var regexIndex           = new Regex(REGEX_INDEX);
+            var regexPregap          = new Regex(REGEX_PREGAP);
+            var regexZeroPregap      = new Regex(REGEX_ZERO_PREGAP);
+            var regexZeroData        = new Regex(REGEX_ZERO_DATA);
+            var regexZeroAudio       = new Regex(REGEX_ZERO_AUDIO);
+            var regexAudioFile       = new Regex(REGEX_FILE_AUDIO);
+            var regexFile            = new Regex(REGEX_FILE_DATA);
+            var regexTitle           = new Regex(REGEX_TITLE);
+            var regexPerformer       = new Regex(REGEX_PERFORMER);
+            var regexSongwriter      = new Regex(REGEX_SONGWRITER);
+            var regexComposer        = new Regex(REGEX_COMPOSER);
+            var regexArranger        = new Regex(REGEX_ARRANGER);
+            var regexMessage         = new Regex(REGEX_MESSAGE);
+            var regexDiscId          = new Regex(REGEX_DISC_ID);
+            var regexUpc             = new Regex(REGEX_UPC);
+            var regexCdText          = new Regex(REGEX_CD_TEXT);
+            var regexLanguage        = new Regex(REGEX_LANGUAGE);
+            var regexClosure         = new Regex(REGEX_CLOSURE);
+            var regexLanguageMap     = new Regex(REGEX_LANGUAGE_MAP);
+            var regexLanguageMapping = new Regex(REGEX_LANGUAGE_MAPPING);
 
-            try
+            // Initialize all RegEx matches
+            Match matchComment;
+            Match matchDiskType;
+
+            // Initialize disc
+            _discimage = new CdrdaoDisc
             {
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
-                _tocStream = new StreamReader(imageFilter.GetDataForkStream());
-                bool inTrack = false;
+                Tracks  = new List<CdrdaoTrack>(),
+                Comment = ""
+            };
 
-                // Initialize all RegExs
-                var regexComment         = new Regex(REGEX_COMMENT);
-                var regexDiskType        = new Regex(REGEX_DISCTYPE);
-                var regexMcn             = new Regex(REGEX_MCN);
-                var regexTrack           = new Regex(REGEX_TRACK);
-                var regexCopy            = new Regex(REGEX_COPY);
-                var regexEmphasis        = new Regex(REGEX_EMPHASIS);
-                var regexStereo          = new Regex(REGEX_STEREO);
-                var regexIsrc            = new Regex(REGEX_ISRC);
-                var regexIndex           = new Regex(REGEX_INDEX);
-                var regexPregap          = new Regex(REGEX_PREGAP);
-                var regexZeroPregap      = new Regex(REGEX_ZERO_PREGAP);
-                var regexZeroData        = new Regex(REGEX_ZERO_DATA);
-                var regexZeroAudio       = new Regex(REGEX_ZERO_AUDIO);
-                var regexAudioFile       = new Regex(REGEX_FILE_AUDIO);
-                var regexFile            = new Regex(REGEX_FILE_DATA);
-                var regexTitle           = new Regex(REGEX_TITLE);
-                var regexPerformer       = new Regex(REGEX_PERFORMER);
-                var regexSongwriter      = new Regex(REGEX_SONGWRITER);
-                var regexComposer        = new Regex(REGEX_COMPOSER);
-                var regexArranger        = new Regex(REGEX_ARRANGER);
-                var regexMessage         = new Regex(REGEX_MESSAGE);
-                var regexDiscId          = new Regex(REGEX_DISC_ID);
-                var regexUpc             = new Regex(REGEX_UPC);
-                var regexCdText          = new Regex(REGEX_CD_TEXT);
-                var regexLanguage        = new Regex(REGEX_LANGUAGE);
-                var regexClosure         = new Regex(REGEX_CLOSURE);
-                var regexLanguageMap     = new Regex(REGEX_LANGUAGE_MAP);
-                var regexLanguageMapping = new Regex(REGEX_LANGUAGE_MAPPING);
+            var  currentTrack       = new CdrdaoTrack();
+            uint currentTrackNumber = 0;
+            currentTrack.Indexes = new Dictionary<int, ulong>();
+            currentTrack.Pregap  = 0;
+            ulong currentSector  = 0;
+            int   nextIndex      = 2;
+            var   commentBuilder = new StringBuilder();
 
-                // Initialize all RegEx matches
-                Match matchComment;
-                Match matchDiskType;
+            _tocStream = new StreamReader(_cdrdaoFilter.GetDataForkStream());
+            string line;
+            int    lineNumber = 0;
 
-                // Initialize disc
-                _discimage = new CdrdaoDisc
+            while(_tocStream.Peek() >= 0)
+            {
+                lineNumber++;
+                line = _tocStream.ReadLine();
+
+                matchDiskType = regexDiskType.Match(line ?? "");
+                matchComment  = regexComment.Match(line);
+
+                // Skip comments at start of file
+                if(matchComment.Success)
+                    continue;
+
+                if(!matchDiskType.Success)
                 {
-                    Tracks  = new List<CdrdaoTrack>(),
-                    Comment = ""
-                };
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Not a CDRDAO TOC or TOC type not in line {0}.",
+                                               lineNumber);
 
-                var  currentTrack       = new CdrdaoTrack();
-                uint currentTrackNumber = 0;
-                currentTrack.Indexes = new Dictionary<int, ulong>();
-                currentTrack.Pregap  = 0;
-                ulong currentSector  = 0;
-                int   nextIndex      = 2;
-                var   commentBuilder = new StringBuilder();
-
-                _tocStream = new StreamReader(_cdrdaoFilter.GetDataForkStream());
-                string line;
-                int    lineNumber = 0;
-
-                while(_tocStream.Peek() >= 0)
-                {
-                    lineNumber++;
-                    line = _tocStream.ReadLine();
-
-                    matchDiskType = regexDiskType.Match(line ?? "");
-                    matchComment  = regexComment.Match(line);
-
-                    // Skip comments at start of file
-                    if(matchComment.Success)
-                        continue;
-
-                    if(!matchDiskType.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Not a CDRDAO TOC or TOC type not in line {0}.",
-                                                   lineNumber);
-
-                        return ErrorNumber.InvalidArgument;
-                    }
-
-                    break;
+                    return ErrorNumber.InvalidArgument;
                 }
 
-                _tocStream = new StreamReader(_cdrdaoFilter.GetDataForkStream());
-                lineNumber = 0;
+                break;
+            }
 
-                _tocStream.BaseStream.Position = 0;
+            _tocStream = new StreamReader(_cdrdaoFilter.GetDataForkStream());
+            lineNumber = 0;
 
-                while(_tocStream.Peek() >= 0)
+            _tocStream.BaseStream.Position = 0;
+
+            while(_tocStream.Peek() >= 0)
+            {
+                lineNumber++;
+                line = _tocStream.ReadLine();
+
+                matchComment  = regexComment.Match(line ?? "");
+                matchDiskType = regexDiskType.Match(line);
+                Match matchMcn             = regexMcn.Match(line);
+                Match matchTrack           = regexTrack.Match(line);
+                Match matchCopy            = regexCopy.Match(line);
+                Match matchEmphasis        = regexEmphasis.Match(line);
+                Match matchStereo          = regexStereo.Match(line);
+                Match matchIsrc            = regexIsrc.Match(line);
+                Match matchIndex           = regexIndex.Match(line);
+                Match matchPregap          = regexPregap.Match(line);
+                Match matchZeroPregap      = regexZeroPregap.Match(line);
+                Match matchZeroData        = regexZeroData.Match(line);
+                Match matchZeroAudio       = regexZeroAudio.Match(line);
+                Match matchAudioFile       = regexAudioFile.Match(line);
+                Match matchFile            = regexFile.Match(line);
+                Match matchTitle           = regexTitle.Match(line);
+                Match matchPerformer       = regexPerformer.Match(line);
+                Match matchSongwriter      = regexSongwriter.Match(line);
+                Match matchComposer        = regexComposer.Match(line);
+                Match matchArranger        = regexArranger.Match(line);
+                Match matchMessage         = regexMessage.Match(line);
+                Match matchDiscId          = regexDiscId.Match(line);
+                Match matchUpc             = regexUpc.Match(line);
+                Match matchCdText          = regexCdText.Match(line);
+                Match matchLanguage        = regexLanguage.Match(line);
+                Match matchClosure         = regexClosure.Match(line);
+                Match matchLanguageMap     = regexLanguageMap.Match(line);
+                Match matchLanguageMapping = regexLanguageMapping.Match(line);
+
+                if(matchComment.Success)
                 {
-                    lineNumber++;
-                    line = _tocStream.ReadLine();
+                    // Ignore "// Track X" comments
+                    if(matchComment.Groups["comment"].Value.StartsWith(" Track ", StringComparison.Ordinal))
+                        continue;
 
-                    matchComment  = regexComment.Match(line ?? "");
-                    matchDiskType = regexDiskType.Match(line);
-                    Match matchMcn             = regexMcn.Match(line);
-                    Match matchTrack           = regexTrack.Match(line);
-                    Match matchCopy            = regexCopy.Match(line);
-                    Match matchEmphasis        = regexEmphasis.Match(line);
-                    Match matchStereo          = regexStereo.Match(line);
-                    Match matchIsrc            = regexIsrc.Match(line);
-                    Match matchIndex           = regexIndex.Match(line);
-                    Match matchPregap          = regexPregap.Match(line);
-                    Match matchZeroPregap      = regexZeroPregap.Match(line);
-                    Match matchZeroData        = regexZeroData.Match(line);
-                    Match matchZeroAudio       = regexZeroAudio.Match(line);
-                    Match matchAudioFile       = regexAudioFile.Match(line);
-                    Match matchFile            = regexFile.Match(line);
-                    Match matchTitle           = regexTitle.Match(line);
-                    Match matchPerformer       = regexPerformer.Match(line);
-                    Match matchSongwriter      = regexSongwriter.Match(line);
-                    Match matchComposer        = regexComposer.Match(line);
-                    Match matchArranger        = regexArranger.Match(line);
-                    Match matchMessage         = regexMessage.Match(line);
-                    Match matchDiscId          = regexDiscId.Match(line);
-                    Match matchUpc             = regexUpc.Match(line);
-                    Match matchCdText          = regexCdText.Match(line);
-                    Match matchLanguage        = regexLanguage.Match(line);
-                    Match matchClosure         = regexClosure.Match(line);
-                    Match matchLanguageMap     = regexLanguageMap.Match(line);
-                    Match matchLanguageMapping = regexLanguageMapping.Match(line);
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found comment \"{1}\" at line {0}", lineNumber,
+                                               matchComment.Groups["comment"].Value.Trim());
 
-                    if(matchComment.Success)
+                    commentBuilder.AppendLine(matchComment.Groups["comment"].Value.Trim());
+                }
+                else if(matchDiskType.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1} at line {0}", lineNumber,
+                                               matchDiskType.Groups["type"].Value);
+
+                    _discimage.Disktypestr = matchDiskType.Groups["type"].Value;
+
+                    switch(matchDiskType.Groups["type"].Value)
                     {
-                        // Ignore "// Track X" comments
-                        if(matchComment.Groups["comment"].Value.StartsWith(" Track ", StringComparison.Ordinal))
-                            continue;
+                        case "CD_DA":
+                            _discimage.Disktype = MediaType.CDDA;
 
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found comment \"{1}\" at line {0}", lineNumber,
-                                                   matchComment.Groups["comment"].Value.Trim());
+                            break;
+                        case "CD_ROM":
+                            _discimage.Disktype = MediaType.CDROM;
 
-                        commentBuilder.AppendLine(matchComment.Groups["comment"].Value.Trim());
+                            break;
+                        case "CD_ROM_XA":
+                            _discimage.Disktype = MediaType.CDROMXA;
+
+                            break;
+                        case "CD_I":
+                            _discimage.Disktype = MediaType.CDI;
+
+                            break;
+                        default:
+                            _discimage.Disktype = MediaType.CD;
+
+                            break;
                     }
-                    else if(matchDiskType.Success)
+                }
+                else if(matchMcn.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found CATALOG \"{1}\" at line {0}", lineNumber,
+                                               matchMcn.Groups["catalog"].Value);
+
+                    _discimage.Mcn = matchMcn.Groups["catalog"].Value;
+                }
+                else if(matchTrack.Success)
+                {
+                    if(matchTrack.Groups["subchan"].Value == "")
+                        AaruConsole.DebugWriteLine("CDRDAO plugin",
+                                                   "Found TRACK type \"{1}\" with no subchannel at line {0}",
+                                                   lineNumber, matchTrack.Groups["type"].Value);
+                    else
+                        AaruConsole.DebugWriteLine("CDRDAO plugin",
+                                                   "Found TRACK type \"{1}\" subchannel {2} at line {0}",
+                                                   lineNumber, matchTrack.Groups["type"].Value,
+                                                   matchTrack.Groups["subchan"].Value);
+
+                    if(inTrack)
                     {
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1} at line {0}", lineNumber,
-                                                   matchDiskType.Groups["type"].Value);
+                        currentSector += currentTrack.Sectors;
 
-                        _discimage.Disktypestr = matchDiskType.Groups["type"].Value;
+                        if(currentTrack.Pregap != currentTrack.Sectors &&
+                           !currentTrack.Indexes.ContainsKey(1))
+                            currentTrack.Indexes.Add(1, currentTrack.StartSector + currentTrack.Pregap);
 
-                        switch(matchDiskType.Groups["type"].Value)
+                        _discimage.Tracks.Add(currentTrack);
+
+                        currentTrack = new CdrdaoTrack
                         {
-                            case "CD_DA":
-                                _discimage.Disktype = MediaType.CDDA;
+                            Indexes = new Dictionary<int, ulong>(),
+                            Pregap  = 0
+                        };
 
-                                break;
-                            case "CD_ROM":
-                                _discimage.Disktype = MediaType.CDROM;
+                        nextIndex = 2;
+                    }
 
-                                break;
-                            case "CD_ROM_XA":
-                                _discimage.Disktype = MediaType.CDROMXA;
+                    currentTrackNumber++;
+                    inTrack = true;
 
-                                break;
-                            case "CD_I":
-                                _discimage.Disktype = MediaType.CDI;
+                    switch(matchTrack.Groups["type"].Value)
+                    {
+                        case "AUDIO":
+                        case "MODE1_RAW":
+                        case "MODE2_RAW":
+                            currentTrack.Bps = 2352;
 
-                                break;
-                            default:
-                                _discimage.Disktype = MediaType.CD;
+                            break;
+                        case "MODE1":
+                        case "MODE2_FORM1":
+                            currentTrack.Bps = 2048;
 
-                                break;
+                            break;
+                        case "MODE2_FORM2":
+                            currentTrack.Bps = 2324;
+
+                            break;
+                        case "MODE2":
+                        case "MODE2_FORM_MIX":
+                            currentTrack.Bps = 2336;
+
+                            break;
+                        default:
+                        {
+                            AaruConsole.
+                                ErrorWriteLine($"Track mode {matchTrack.Groups["type"].Value} is unsupported");
+
+                            return ErrorNumber.NotSupported;
                         }
                     }
-                    else if(matchMcn.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found CATALOG \"{1}\" at line {0}", lineNumber,
-                                                   matchMcn.Groups["catalog"].Value);
 
-                        _discimage.Mcn = matchMcn.Groups["catalog"].Value;
-                    }
-                    else if(matchTrack.Success)
+                    switch(matchTrack.Groups["subchan"].Value)
                     {
-                        if(matchTrack.Groups["subchan"].Value == "")
-                            AaruConsole.DebugWriteLine("CDRDAO plugin",
-                                                       "Found TRACK type \"{1}\" with no subchannel at line {0}",
-                                                       lineNumber, matchTrack.Groups["type"].Value);
-                        else
-                            AaruConsole.DebugWriteLine("CDRDAO plugin",
-                                                       "Found TRACK type \"{1}\" subchannel {2} at line {0}",
-                                                       lineNumber, matchTrack.Groups["type"].Value,
-                                                       matchTrack.Groups["subchan"].Value);
+                        case "": break;
+                        case "RW":
+                            currentTrack.Packedsubchannel = true;
+                            goto case "RW_RAW";
+                        case "RW_RAW":
+                            currentTrack.Subchannel = true;
 
-                        if(inTrack)
+                            break;
+                        default:
                         {
-                            currentSector += currentTrack.Sectors;
+                            AaruConsole.
+                                ErrorWriteLine($"Track subchannel mode {matchTrack.Groups["subchan"].Value} is unsupported");
 
-                            if(currentTrack.Pregap != currentTrack.Sectors &&
-                               !currentTrack.Indexes.ContainsKey(1))
-                                currentTrack.Indexes.Add(1, currentTrack.StartSector + currentTrack.Pregap);
-
-                            _discimage.Tracks.Add(currentTrack);
-
-                            currentTrack = new CdrdaoTrack
-                            {
-                                Indexes = new Dictionary<int, ulong>(),
-                                Pregap  = 0
-                            };
-
-                            nextIndex = 2;
+                            return ErrorNumber.NotSupported;
                         }
-
-                        currentTrackNumber++;
-                        inTrack = true;
-
-                        switch(matchTrack.Groups["type"].Value)
-                        {
-                            case "AUDIO":
-                            case "MODE1_RAW":
-                            case "MODE2_RAW":
-                                currentTrack.Bps = 2352;
-
-                                break;
-                            case "MODE1":
-                            case "MODE2_FORM1":
-                                currentTrack.Bps = 2048;
-
-                                break;
-                            case "MODE2_FORM2":
-                                currentTrack.Bps = 2324;
-
-                                break;
-                            case "MODE2":
-                            case "MODE2_FORM_MIX":
-                                currentTrack.Bps = 2336;
-
-                                break;
-                            default:
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine($"Track mode {matchTrack.Groups["type"].Value} is unsupported");
-
-                                return ErrorNumber.NotSupported;
-                            }
-                        }
-
-                        switch(matchTrack.Groups["subchan"].Value)
-                        {
-                            case "": break;
-                            case "RW":
-                                currentTrack.Packedsubchannel = true;
-                                goto case "RW_RAW";
-                            case "RW_RAW":
-                                currentTrack.Subchannel = true;
-
-                                break;
-                            default:
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine($"Track subchannel mode {matchTrack.Groups["subchan"].Value} is unsupported");
-
-                                return ErrorNumber.NotSupported;
-                            }
-                        }
-
-                        currentTrack.Tracktype = matchTrack.Groups["type"].Value;
-
-                        currentTrack.Sequence    = currentTrackNumber;
-                        currentTrack.StartSector = currentSector;
                     }
-                    else if(matchCopy.Success)
+
+                    currentTrack.Tracktype = matchTrack.Groups["type"].Value;
+
+                    currentTrack.Sequence    = currentTrackNumber;
+                    currentTrack.StartSector = currentSector;
+                }
+                else if(matchCopy.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1} COPY at line {0}", lineNumber,
+                                               matchCopy.Groups["no"].Value);
+
+                    currentTrack.FlagDcp |= inTrack && matchCopy.Groups["no"].Value == "";
+                }
+                else if(matchEmphasis.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1} PRE_EMPHASIS at line {0}", lineNumber,
+                                               matchEmphasis.Groups["no"].Value);
+
+                    currentTrack.FlagPre |= inTrack && matchEmphasis.Groups["no"].Value == "";
+                }
+                else if(matchStereo.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1}_CHANNEL_AUDIO at line {0}", lineNumber,
+                                               matchStereo.Groups["num"].Value);
+
+                    currentTrack.Flag4Ch |= inTrack && matchStereo.Groups["num"].Value == "FOUR";
+                }
+                else if(matchIsrc.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found ISRC \"{1}\" at line {0}", lineNumber,
+                                               matchIsrc.Groups["isrc"].Value);
+
+                    if(inTrack)
+                        currentTrack.Isrc = matchIsrc.Groups["isrc"].Value;
+                }
+                else if(matchIndex.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found INDEX \"{1}\" at line {0}", lineNumber,
+                                               matchIndex.Groups["address"].Value);
+
+                    string[] lengthString = matchFile.Groups["length"].Value.Split(':');
+
+                    ulong nextIndexPos = (ulong.Parse(lengthString[0]) * 60 * 75) +
+                                         (ulong.Parse(lengthString[1]) * 75)      + ulong.Parse(lengthString[2]);
+
+                    currentTrack.Indexes.Add(nextIndex,
+                                             nextIndexPos + currentTrack.Pregap + currentTrack.StartSector);
+                }
+                else if(matchPregap.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found START \"{1}\" at line {0}", lineNumber,
+                                               matchPregap.Groups["address"].Value);
+
+                    currentTrack.Indexes.Add(0, currentTrack.StartSector);
+
+                    if(matchPregap.Groups["address"].Value != "")
                     {
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1} COPY at line {0}", lineNumber,
-                                                   matchCopy.Groups["no"].Value);
-
-                        currentTrack.FlagDcp |= inTrack && matchCopy.Groups["no"].Value == "";
-                    }
-                    else if(matchEmphasis.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1} PRE_EMPHASIS at line {0}", lineNumber,
-                                                   matchEmphasis.Groups["no"].Value);
-
-                        currentTrack.FlagPre |= inTrack && matchEmphasis.Groups["no"].Value == "";
-                    }
-                    else if(matchStereo.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found {1}_CHANNEL_AUDIO at line {0}", lineNumber,
-                                                   matchStereo.Groups["num"].Value);
-
-                        currentTrack.Flag4Ch |= inTrack && matchStereo.Groups["num"].Value == "FOUR";
-                    }
-                    else if(matchIsrc.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found ISRC \"{1}\" at line {0}", lineNumber,
-                                                   matchIsrc.Groups["isrc"].Value);
-
-                        if(inTrack)
-                            currentTrack.Isrc = matchIsrc.Groups["isrc"].Value;
-                    }
-                    else if(matchIndex.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found INDEX \"{1}\" at line {0}", lineNumber,
-                                                   matchIndex.Groups["address"].Value);
-
-                        string[] lengthString = matchFile.Groups["length"].Value.Split(':');
-
-                        ulong nextIndexPos = (ulong.Parse(lengthString[0]) * 60 * 75) +
-                                             (ulong.Parse(lengthString[1]) * 75)      + ulong.Parse(lengthString[2]);
-
-                        currentTrack.Indexes.Add(nextIndex,
-                                                 nextIndexPos + currentTrack.Pregap + currentTrack.StartSector);
-                    }
-                    else if(matchPregap.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found START \"{1}\" at line {0}", lineNumber,
-                                                   matchPregap.Groups["address"].Value);
-
-                        currentTrack.Indexes.Add(0, currentTrack.StartSector);
-
-                        if(matchPregap.Groups["address"].Value != "")
-                        {
-                            string[] lengthString = matchPregap.Groups["address"].Value.Split(':');
-
-                            currentTrack.Pregap = (ulong.Parse(lengthString[0]) * 60 * 75) +
-                                                  (ulong.Parse(lengthString[1]) * 75) + ulong.Parse(lengthString[2]);
-                        }
-                        else
-                            currentTrack.Pregap = currentTrack.Sectors;
-                    }
-                    else if(matchZeroPregap.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found PREGAP \"{1}\" at line {0}", lineNumber,
-                                                   matchZeroPregap.Groups["length"].Value);
-
-                        currentTrack.Indexes.Add(0, currentTrack.StartSector);
-                        string[] lengthString = matchZeroPregap.Groups["length"].Value.Split(':');
+                        string[] lengthString = matchPregap.Groups["address"].Value.Split(':');
 
                         currentTrack.Pregap = (ulong.Parse(lengthString[0]) * 60 * 75) +
                                               (ulong.Parse(lengthString[1]) * 75)      + ulong.Parse(lengthString[2]);
                     }
-                    else if(matchZeroData.Success)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found ZERO \"{1}\" at line {0}", lineNumber,
-                                                   matchZeroData.Groups["length"].Value);
-                    else if(matchZeroAudio.Success)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found SILENCE \"{1}\" at line {0}", lineNumber,
-                                                   matchZeroAudio.Groups["length"].Value);
                     else
+                        currentTrack.Pregap = currentTrack.Sectors;
+                }
+                else if(matchZeroPregap.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found PREGAP \"{1}\" at line {0}", lineNumber,
+                                               matchZeroPregap.Groups["length"].Value);
+
+                    currentTrack.Indexes.Add(0, currentTrack.StartSector);
+                    string[] lengthString = matchZeroPregap.Groups["length"].Value.Split(':');
+
+                    currentTrack.Pregap = (ulong.Parse(lengthString[0]) * 60 * 75) +
+                                          (ulong.Parse(lengthString[1]) * 75)      + ulong.Parse(lengthString[2]);
+                }
+                else if(matchZeroData.Success)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found ZERO \"{1}\" at line {0}", lineNumber,
+                                               matchZeroData.Groups["length"].Value);
+                else if(matchZeroAudio.Success)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Found SILENCE \"{1}\" at line {0}", lineNumber,
+                                               matchZeroAudio.Groups["length"].Value);
+                else
+                {
+                    FiltersList filtersList;
+
+                    if(matchAudioFile.Success)
                     {
-                        FiltersList filtersList;
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found AUDIOFILE \"{1}\" at line {0}",
+                                                   lineNumber, matchAudioFile.Groups["filename"].Value);
 
-                        if(matchAudioFile.Success)
+                        filtersList = new FiltersList();
+
+                        currentTrack.Trackfile = new CdrdaoTrackFile
                         {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found AUDIOFILE \"{1}\" at line {0}",
-                                                       lineNumber, matchAudioFile.Groups["filename"].Value);
+                            Datafilter =
+                                filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                   matchAudioFile.Groups["filename"].Value)),
+                            Datafile = matchAudioFile.Groups["filename"].Value,
+                            Offset = matchAudioFile.Groups["base_offset"].Value != ""
+                                         ? ulong.Parse(matchAudioFile.Groups["base_offset"].Value) : 0,
+                            Filetype = "BINARY",
+                            Sequence = currentTrackNumber
+                        };
 
-                            filtersList = new FiltersList();
+                        ulong startSectors = 0;
 
-                            currentTrack.Trackfile = new CdrdaoTrackFile
-                            {
-                                Datafilter =
-                                    filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                       matchAudioFile.Groups["filename"].Value)),
-                                Datafile = matchAudioFile.Groups["filename"].Value,
-                                Offset = matchAudioFile.Groups["base_offset"].Value != ""
-                                             ? ulong.Parse(matchAudioFile.Groups["base_offset"].Value) : 0,
-                                Filetype = "BINARY",
-                                Sequence = currentTrackNumber
-                            };
-
-                            ulong startSectors = 0;
-
-                            if(matchAudioFile.Groups["start"].Value != "")
-                            {
-                                string[] startString = matchAudioFile.Groups["start"].Value.Split(':');
-
-                                startSectors = (ulong.Parse(startString[0]) * 60 * 75) +
-                                               (ulong.Parse(startString[1]) * 75)      + ulong.Parse(startString[2]);
-                            }
-
-                            currentTrack.Trackfile.Offset += startSectors * currentTrack.Bps;
-
-                            if(matchAudioFile.Groups["length"].Value != "")
-                            {
-                                string[] lengthString = matchAudioFile.Groups["length"].Value.Split(':');
-
-                                currentTrack.Sectors = (ulong.Parse(lengthString[0]) * 60 * 75) +
-                                                       (ulong.Parse(lengthString[1]) * 75)      +
-                                                       ulong.Parse(lengthString[2]);
-                            }
-                            else
-                                currentTrack.Sectors =
-                                    ((ulong)currentTrack.Trackfile.Datafilter.DataForkLength -
-                                     currentTrack.Trackfile.Offset) / currentTrack.Bps;
-                        }
-                        else if(matchFile.Success)
+                        if(matchAudioFile.Groups["start"].Value != "")
                         {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found DATAFILE \"{1}\" at line {0}",
-                                                       lineNumber, matchFile.Groups["filename"].Value);
+                            string[] startString = matchAudioFile.Groups["start"].Value.Split(':');
 
-                            filtersList = new FiltersList();
-
-                            currentTrack.Trackfile = new CdrdaoTrackFile
-                            {
-                                Datafilter =
-                                    filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                       matchFile.Groups["filename"].Value)),
-                                Datafile = matchAudioFile.Groups["filename"].Value,
-                                Offset = matchFile.Groups["base_offset"].Value != ""
-                                             ? ulong.Parse(matchFile.Groups["base_offset"].Value) : 0,
-                                Filetype = "BINARY",
-                                Sequence = currentTrackNumber
-                            };
-
-                            if(matchFile.Groups["length"].Value != "")
-                            {
-                                string[] lengthString = matchFile.Groups["length"].Value.Split(':');
-
-                                currentTrack.Sectors = (ulong.Parse(lengthString[0]) * 60 * 75) +
-                                                       (ulong.Parse(lengthString[1]) * 75)      +
-                                                       ulong.Parse(lengthString[2]);
-                            }
-                            else
-                                currentTrack.Sectors =
-                                    ((ulong)currentTrack.Trackfile.Datafilter.DataForkLength -
-                                     currentTrack.Trackfile.Offset) / currentTrack.Bps;
-                        }
-                        else if(matchTitle.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found TITLE \"{1}\" at line {0}", lineNumber,
-                                                       matchTitle.Groups["title"].Value);
-
-                            if(inTrack)
-                                currentTrack.Title = matchTitle.Groups["title"].Value;
-                            else
-                                _discimage.Title = matchTitle.Groups["title"].Value;
-                        }
-                        else if(matchPerformer.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found PERFORMER \"{1}\" at line {0}",
-                                                       lineNumber, matchPerformer.Groups["performer"].Value);
-
-                            if(inTrack)
-                                currentTrack.Performer = matchPerformer.Groups["performer"].Value;
-                            else
-                                _discimage.Performer = matchPerformer.Groups["performer"].Value;
-                        }
-                        else if(matchSongwriter.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found SONGWRITER \"{1}\" at line {0}",
-                                                       lineNumber, matchSongwriter.Groups["songwriter"].Value);
-
-                            if(inTrack)
-                                currentTrack.Songwriter = matchSongwriter.Groups["songwriter"].Value;
-                            else
-                                _discimage.Songwriter = matchSongwriter.Groups["songwriter"].Value;
-                        }
-                        else if(matchComposer.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found COMPOSER \"{1}\" at line {0}",
-                                                       lineNumber, matchComposer.Groups["composer"].Value);
-
-                            if(inTrack)
-                                currentTrack.Composer = matchComposer.Groups["composer"].Value;
-                            else
-                                _discimage.Composer = matchComposer.Groups["composer"].Value;
-                        }
-                        else if(matchArranger.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found ARRANGER \"{1}\" at line {0}",
-                                                       lineNumber, matchArranger.Groups["arranger"].Value);
-
-                            if(inTrack)
-                                currentTrack.Arranger = matchArranger.Groups["arranger"].Value;
-                            else
-                                _discimage.Arranger = matchArranger.Groups["arranger"].Value;
-                        }
-                        else if(matchMessage.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found MESSAGE \"{1}\" at line {0}", lineNumber,
-                                                       matchMessage.Groups["message"].Value);
-
-                            if(inTrack)
-                                currentTrack.Message = matchMessage.Groups["message"].Value;
-                            else
-                                _discimage.Message = matchMessage.Groups["message"].Value;
-                        }
-                        else if(matchDiscId.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found DISC_ID \"{1}\" at line {0}", lineNumber,
-                                                       matchDiscId.Groups["discid"].Value);
-
-                            if(!inTrack)
-                                _discimage.DiskId = matchDiscId.Groups["discid"].Value;
-                        }
-                        else if(matchUpc.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRDAO plugin", "Found UPC_EAN \"{1}\" at line {0}", lineNumber,
-                                                       matchUpc.Groups["catalog"].Value);
-
-                            if(!inTrack)
-                                _discimage.Barcode = matchUpc.Groups["catalog"].Value;
+                            startSectors = (ulong.Parse(startString[0]) * 60 * 75) +
+                                           (ulong.Parse(startString[1]) * 75)      + ulong.Parse(startString[2]);
                         }
 
-                        // Ignored fields
-                        else if(matchCdText.Success      ||
-                                matchLanguage.Success    ||
-                                matchClosure.Success     ||
-                                matchLanguageMap.Success ||
-                                matchLanguageMapping.Success) {}
-                        else if(line == "") // Empty line, ignore it
-                        {}
+                        currentTrack.Trackfile.Offset += startSectors * currentTrack.Bps;
+
+                        if(matchAudioFile.Groups["length"].Value != "")
+                        {
+                            string[] lengthString = matchAudioFile.Groups["length"].Value.Split(':');
+
+                            currentTrack.Sectors = (ulong.Parse(lengthString[0]) * 60 * 75) +
+                                                   (ulong.Parse(lengthString[1]) * 75)      +
+                                                   ulong.Parse(lengthString[2]);
+                        }
+                        else
+                            currentTrack.Sectors =
+                                ((ulong)currentTrack.Trackfile.Datafilter.DataForkLength -
+                                 currentTrack.Trackfile.Offset) / currentTrack.Bps;
+                    }
+                    else if(matchFile.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found DATAFILE \"{1}\" at line {0}",
+                                                   lineNumber, matchFile.Groups["filename"].Value);
+
+                        filtersList = new FiltersList();
+
+                        currentTrack.Trackfile = new CdrdaoTrackFile
+                        {
+                            Datafilter =
+                                filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                   matchFile.Groups["filename"].Value)),
+                            Datafile = matchAudioFile.Groups["filename"].Value,
+                            Offset = matchFile.Groups["base_offset"].Value != ""
+                                         ? ulong.Parse(matchFile.Groups["base_offset"].Value) : 0,
+                            Filetype = "BINARY",
+                            Sequence = currentTrackNumber
+                        };
+
+                        if(matchFile.Groups["length"].Value != "")
+                        {
+                            string[] lengthString = matchFile.Groups["length"].Value.Split(':');
+
+                            currentTrack.Sectors = (ulong.Parse(lengthString[0]) * 60 * 75) +
+                                                   (ulong.Parse(lengthString[1]) * 75)      +
+                                                   ulong.Parse(lengthString[2]);
+                        }
+                        else
+                            currentTrack.Sectors =
+                                ((ulong)currentTrack.Trackfile.Datafilter.DataForkLength -
+                                 currentTrack.Trackfile.Offset) / currentTrack.Bps;
+                    }
+                    else if(matchTitle.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found TITLE \"{1}\" at line {0}", lineNumber,
+                                                   matchTitle.Groups["title"].Value);
+
+                        if(inTrack)
+                            currentTrack.Title = matchTitle.Groups["title"].Value;
+                        else
+                            _discimage.Title = matchTitle.Groups["title"].Value;
+                    }
+                    else if(matchPerformer.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found PERFORMER \"{1}\" at line {0}",
+                                                   lineNumber, matchPerformer.Groups["performer"].Value);
+
+                        if(inTrack)
+                            currentTrack.Performer = matchPerformer.Groups["performer"].Value;
+                        else
+                            _discimage.Performer = matchPerformer.Groups["performer"].Value;
+                    }
+                    else if(matchSongwriter.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found SONGWRITER \"{1}\" at line {0}",
+                                                   lineNumber, matchSongwriter.Groups["songwriter"].Value);
+
+                        if(inTrack)
+                            currentTrack.Songwriter = matchSongwriter.Groups["songwriter"].Value;
+                        else
+                            _discimage.Songwriter = matchSongwriter.Groups["songwriter"].Value;
+                    }
+                    else if(matchComposer.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found COMPOSER \"{1}\" at line {0}",
+                                                   lineNumber, matchComposer.Groups["composer"].Value);
+
+                        if(inTrack)
+                            currentTrack.Composer = matchComposer.Groups["composer"].Value;
+                        else
+                            _discimage.Composer = matchComposer.Groups["composer"].Value;
+                    }
+                    else if(matchArranger.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found ARRANGER \"{1}\" at line {0}",
+                                                   lineNumber, matchArranger.Groups["arranger"].Value);
+
+                        if(inTrack)
+                            currentTrack.Arranger = matchArranger.Groups["arranger"].Value;
+                        else
+                            _discimage.Arranger = matchArranger.Groups["arranger"].Value;
+                    }
+                    else if(matchMessage.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found MESSAGE \"{1}\" at line {0}", lineNumber,
+                                                   matchMessage.Groups["message"].Value);
+
+                        if(inTrack)
+                            currentTrack.Message = matchMessage.Groups["message"].Value;
+                        else
+                            _discimage.Message = matchMessage.Groups["message"].Value;
+                    }
+                    else if(matchDiscId.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found DISC_ID \"{1}\" at line {0}", lineNumber,
+                                                   matchDiscId.Groups["discid"].Value);
+
+                        if(!inTrack)
+                            _discimage.DiskId = matchDiscId.Groups["discid"].Value;
+                    }
+                    else if(matchUpc.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRDAO plugin", "Found UPC_EAN \"{1}\" at line {0}", lineNumber,
+                                                   matchUpc.Groups["catalog"].Value);
+
+                        if(!inTrack)
+                            _discimage.Barcode = matchUpc.Groups["catalog"].Value;
                     }
 
-                    // TODO: Regex CD-TEXT SIZE_INFO
-                    /*
-                    else // Non-empty unknown field
-                    {
-                        AaruConsole.ErrorWriteLine(string.Format("Found unknown field defined at line {0}: \"{1}\"", line, _line));
-                        return ErrorNumber.NotSupported;
-                    }
-                    */
+                    // Ignored fields
+                    else if(matchCdText.Success      ||
+                            matchLanguage.Success    ||
+                            matchClosure.Success     ||
+                            matchLanguageMap.Success ||
+                            matchLanguageMapping.Success) {}
+                    else if(line == "") // Empty line, ignore it
+                    {}
                 }
 
-                if(currentTrack.Sequence != 0)
+                // TODO: Regex CD-TEXT SIZE_INFO
+                /*
+                else // Non-empty unknown field
                 {
-                    if(currentTrack.Pregap != currentTrack.Sectors &&
-                       !currentTrack.Indexes.ContainsKey(1))
-                        currentTrack.Indexes.Add(1, currentTrack.StartSector + currentTrack.Pregap);
+                    AaruConsole.ErrorWriteLine(string.Format("Found unknown field defined at line {0}: \"{1}\"", line, _line));
+                    return ErrorNumber.NotSupported;
+                }
+                */
+            }
 
-                    _discimage.Tracks.Add(currentTrack);
+            if(currentTrack.Sequence != 0)
+            {
+                if(currentTrack.Pregap != currentTrack.Sectors &&
+                   !currentTrack.Indexes.ContainsKey(1))
+                    currentTrack.Indexes.Add(1, currentTrack.StartSector + currentTrack.Pregap);
+
+                _discimage.Tracks.Add(currentTrack);
+            }
+
+            _discimage.Comment = commentBuilder.ToString();
+
+            // DEBUG information
+            AaruConsole.DebugWriteLine("CDRDAO plugin", "Disc image parsing results");
+            AaruConsole.DebugWriteLine("CDRDAO plugin", "Disc CD-TEXT:");
+
+            if(_discimage.Arranger == null)
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tArranger is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tArranger: {0}", _discimage.Arranger);
+
+            if(_discimage.Composer == null)
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tComposer is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tComposer: {0}", _discimage.Composer);
+
+            if(_discimage.Performer == null)
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPerformer is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPerformer: {0}", _discimage.Performer);
+
+            if(_discimage.Songwriter == null)
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tSongwriter is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tSongwriter: {0}", _discimage.Songwriter);
+
+            if(_discimage.Title == null)
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tTitle is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tTitle: {0}", _discimage.Title);
+
+            AaruConsole.DebugWriteLine("CDRDAO plugin", "Disc information:");
+            AaruConsole.DebugWriteLine("CDRDAO plugin", "\tGuessed disk type: {0}", _discimage.Disktype);
+
+            if(_discimage.Barcode == null)
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tBarcode not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tBarcode: {0}", _discimage.Barcode);
+
+            if(_discimage.DiskId == null)
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tDisc ID not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tDisc ID: {0}", _discimage.DiskId);
+
+            if(_discimage.Mcn == null)
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tMCN not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tMCN: {0}", _discimage.Mcn);
+
+            if(string.IsNullOrEmpty(_discimage.Comment))
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tComment not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tComment: \"{0}\"", _discimage.Comment);
+
+            AaruConsole.DebugWriteLine("CDRDAO plugin", "Track information:");
+            AaruConsole.DebugWriteLine("CDRDAO plugin", "\tDisc contains {0} tracks", _discimage.Tracks.Count);
+
+            for(int i = 0; i < _discimage.Tracks.Count; i++)
+            {
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tTrack {0} information:",
+                                           _discimage.Tracks[i].Sequence);
+
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\t{0} bytes per sector", _discimage.Tracks[i].Bps);
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPregap: {0} sectors", _discimage.Tracks[i].Pregap);
+
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tData: {0} sectors starting at sector {1}",
+                                           _discimage.Tracks[i].Sectors, _discimage.Tracks[i].StartSector);
+
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPostgap: {0} sectors",
+                                           _discimage.Tracks[i].Postgap);
+
+                if(_discimage.Tracks[i].Flag4Ch)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack is flagged as quadraphonic");
+
+                if(_discimage.Tracks[i].FlagDcp)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack allows digital copy");
+
+                if(_discimage.Tracks[i].FlagPre)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack has pre-emphasis applied");
+
+                AaruConsole.DebugWriteLine("CDRDAO plugin",
+                                           "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
+                                           _discimage.Tracks[i].Trackfile.Datafilter.Filename,
+                                           _discimage.Tracks[i].Trackfile.Filetype,
+                                           _discimage.Tracks[i].Trackfile.Offset);
+
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tIndexes:");
+
+                foreach(KeyValuePair<int, ulong> kvp in _discimage.Tracks[i].Indexes)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\t\tIndex {0} starts at sector {1}", kvp.Key,
+                                               kvp.Value);
+
+                if(_discimage.Tracks[i].Isrc == null)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tISRC is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tISRC: {0}", _discimage.Tracks[i].Isrc);
+
+                if(_discimage.Tracks[i].Arranger == null)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tArranger is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tArranger: {0}", _discimage.Tracks[i].Arranger);
+
+                if(_discimage.Tracks[i].Composer == null)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tComposer is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tComposer: {0}", _discimage.Tracks[i].Composer);
+
+                if(_discimage.Tracks[i].Performer == null)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPerformer is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPerformer: {0}",
+                                               _discimage.Tracks[i].Performer);
+
+                if(_discimage.Tracks[i].Songwriter == null)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tSongwriter is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tSongwriter: {0}",
+                                               _discimage.Tracks[i].Songwriter);
+
+                if(_discimage.Tracks[i].Title == null)
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTitle is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTitle: {0}", _discimage.Tracks[i].Title);
+            }
+
+            AaruConsole.DebugWriteLine("CDRDAO plugin", "Building offset map");
+
+            Partitions = new List<Partition>();
+            _offsetmap = new Dictionary<uint, ulong>();
+
+            ulong byteOffset        = 0;
+            ulong partitionSequence = 0;
+
+            for(int i = 0; i < _discimage.Tracks.Count; i++)
+            {
+                ulong index0Len = 0;
+
+                if(_discimage.Tracks[i].Sequence == 1 &&
+                   i                             != 0)
+                {
+                    AaruConsole.ErrorWriteLine("Unordered tracks");
+
+                    return ErrorNumber.NotSupported;
                 }
 
-                _discimage.Comment = commentBuilder.ToString();
-
-                // DEBUG information
-                AaruConsole.DebugWriteLine("CDRDAO plugin", "Disc image parsing results");
-                AaruConsole.DebugWriteLine("CDRDAO plugin", "Disc CD-TEXT:");
-
-                if(_discimage.Arranger == null)
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tArranger is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tArranger: {0}", _discimage.Arranger);
-
-                if(_discimage.Composer == null)
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tComposer is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tComposer: {0}", _discimage.Composer);
-
-                if(_discimage.Performer == null)
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPerformer is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPerformer: {0}", _discimage.Performer);
-
-                if(_discimage.Songwriter == null)
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tSongwriter is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tSongwriter: {0}", _discimage.Songwriter);
-
-                if(_discimage.Title == null)
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tTitle is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tTitle: {0}", _discimage.Title);
-
-                AaruConsole.DebugWriteLine("CDRDAO plugin", "Disc information:");
-                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tGuessed disk type: {0}", _discimage.Disktype);
-
-                if(_discimage.Barcode == null)
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tBarcode not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tBarcode: {0}", _discimage.Barcode);
-
-                if(_discimage.DiskId == null)
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tDisc ID not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tDisc ID: {0}", _discimage.DiskId);
-
-                if(_discimage.Mcn == null)
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tMCN not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tMCN: {0}", _discimage.Mcn);
-
-                if(string.IsNullOrEmpty(_discimage.Comment))
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tComment not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tComment: \"{0}\"", _discimage.Comment);
-
-                AaruConsole.DebugWriteLine("CDRDAO plugin", "Track information:");
-                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tDisc contains {0} tracks", _discimage.Tracks.Count);
-
-                for(int i = 0; i < _discimage.Tracks.Count; i++)
+                // Index 01
+                var partition = new Partition
                 {
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tTrack {0} information:",
-                                               _discimage.Tracks[i].Sequence);
+                    Description = $"Track {_discimage.Tracks[i].Sequence}.",
+                    Name        = _discimage.Tracks[i].Title,
+                    Start       = _discimage.Tracks[i].StartSector,
+                    Size        = (_discimage.Tracks[i].Sectors - index0Len) * _discimage.Tracks[i].Bps,
+                    Length      = _discimage.Tracks[i].Sectors - index0Len,
+                    Sequence    = partitionSequence,
+                    Offset      = byteOffset,
+                    Type        = _discimage.Tracks[i].Tracktype
+                };
 
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\t{0} bytes per sector", _discimage.Tracks[i].Bps);
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPregap: {0} sectors", _discimage.Tracks[i].Pregap);
+                byteOffset += partition.Size;
+                partitionSequence++;
 
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tData: {0} sectors starting at sector {1}",
-                                               _discimage.Tracks[i].Sectors, _discimage.Tracks[i].StartSector);
-
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPostgap: {0} sectors",
-                                               _discimage.Tracks[i].Postgap);
-
-                    if(_discimage.Tracks[i].Flag4Ch)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack is flagged as quadraphonic");
-
-                    if(_discimage.Tracks[i].FlagDcp)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack allows digital copy");
-
-                    if(_discimage.Tracks[i].FlagPre)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTrack has pre-emphasis applied");
-
-                    AaruConsole.DebugWriteLine("CDRDAO plugin",
-                                               "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
-                                               _discimage.Tracks[i].Trackfile.Datafilter.Filename,
-                                               _discimage.Tracks[i].Trackfile.Filetype,
-                                               _discimage.Tracks[i].Trackfile.Offset);
-
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tIndexes:");
-
-                    foreach(KeyValuePair<int, ulong> kvp in _discimage.Tracks[i].Indexes)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\t\tIndex {0} starts at sector {1}", kvp.Key,
-                                                   kvp.Value);
-
-                    if(_discimage.Tracks[i].Isrc == null)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tISRC is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tISRC: {0}", _discimage.Tracks[i].Isrc);
-
-                    if(_discimage.Tracks[i].Arranger == null)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tArranger is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tArranger: {0}", _discimage.Tracks[i].Arranger);
-
-                    if(_discimage.Tracks[i].Composer == null)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tComposer is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tComposer: {0}", _discimage.Tracks[i].Composer);
-
-                    if(_discimage.Tracks[i].Performer == null)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPerformer is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tPerformer: {0}",
-                                                   _discimage.Tracks[i].Performer);
-
-                    if(_discimage.Tracks[i].Songwriter == null)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tSongwriter is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tSongwriter: {0}",
-                                                   _discimage.Tracks[i].Songwriter);
-
-                    if(_discimage.Tracks[i].Title == null)
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTitle is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRDAO plugin", "\t\tTitle: {0}", _discimage.Tracks[i].Title);
-                }
-
-                AaruConsole.DebugWriteLine("CDRDAO plugin", "Building offset map");
-
-                Partitions = new List<Partition>();
-                _offsetmap = new Dictionary<uint, ulong>();
-
-                ulong byteOffset        = 0;
-                ulong partitionSequence = 0;
-
-                for(int i = 0; i < _discimage.Tracks.Count; i++)
+                if(!_offsetmap.ContainsKey(_discimage.Tracks[i].Sequence))
+                    _offsetmap.Add(_discimage.Tracks[i].Sequence, partition.Start);
+                else
                 {
-                    ulong index0Len = 0;
+                    _offsetmap.TryGetValue(_discimage.Tracks[i].Sequence, out ulong oldStart);
 
-                    if(_discimage.Tracks[i].Sequence == 1 &&
-                       i                             != 0)
+                    if(partition.Start < oldStart)
                     {
-                        AaruConsole.ErrorWriteLine("Unordered tracks");
-
-                        return ErrorNumber.NotSupported;
-                    }
-
-                    // Index 01
-                    var partition = new Partition
-                    {
-                        Description = $"Track {_discimage.Tracks[i].Sequence}.",
-                        Name        = _discimage.Tracks[i].Title,
-                        Start       = _discimage.Tracks[i].StartSector,
-                        Size        = (_discimage.Tracks[i].Sectors - index0Len) * _discimage.Tracks[i].Bps,
-                        Length      = _discimage.Tracks[i].Sectors - index0Len,
-                        Sequence    = partitionSequence,
-                        Offset      = byteOffset,
-                        Type        = _discimage.Tracks[i].Tracktype
-                    };
-
-                    byteOffset += partition.Size;
-                    partitionSequence++;
-
-                    if(!_offsetmap.ContainsKey(_discimage.Tracks[i].Sequence))
+                        _offsetmap.Remove(_discimage.Tracks[i].Sequence);
                         _offsetmap.Add(_discimage.Tracks[i].Sequence, partition.Start);
-                    else
-                    {
-                        _offsetmap.TryGetValue(_discimage.Tracks[i].Sequence, out ulong oldStart);
-
-                        if(partition.Start < oldStart)
-                        {
-                            _offsetmap.Remove(_discimage.Tracks[i].Sequence);
-                            _offsetmap.Add(_discimage.Tracks[i].Sequence, partition.Start);
-                        }
-                    }
-
-                    Partitions.Add(partition);
-                }
-
-                // Print partition map
-                AaruConsole.DebugWriteLine("CDRDAO plugin", "printing partition map");
-
-                foreach(Partition partition in Partitions)
-                {
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "Partition sequence: {0}", partition.Sequence);
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition name: {0}", partition.Name);
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition description: {0}", partition.Description);
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition type: {0}", partition.Type);
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting sector: {0}", partition.Start);
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition sectors: {0}", partition.Length);
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting offset: {0}", partition.Offset);
-                    AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition size in bytes: {0}", partition.Size);
-                }
-
-                foreach(CdrdaoTrack track in _discimage.Tracks)
-                {
-                    _imageInfo.ImageSize += track.Bps * track.Sectors;
-                    _imageInfo.Sectors   += track.Sectors;
-                }
-
-                if(_discimage.Disktype != MediaType.CDG     &&
-                   _discimage.Disktype != MediaType.CDEG    &&
-                   _discimage.Disktype != MediaType.CDMIDI  &&
-                   _discimage.Disktype != MediaType.CDROMXA &&
-                   _discimage.Disktype != MediaType.CDDA    &&
-                   _discimage.Disktype != MediaType.CDI     &&
-                   _discimage.Disktype != MediaType.CDPLUS)
-                    _imageInfo.SectorSize = 2048; // Only data tracks
-                else
-                    _imageInfo.SectorSize = 2352; // All others
-
-                if(_discimage.Mcn != null)
-                    _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_MCN);
-
-                _imageInfo.Application = "CDRDAO";
-
-                _imageInfo.CreationTime         = imageFilter.CreationTime;
-                _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-
-                _imageInfo.Comments          = _discimage.Comment;
-                _imageInfo.MediaSerialNumber = _discimage.Mcn;
-                _imageInfo.MediaBarcode      = _discimage.Barcode;
-                _imageInfo.MediaType         = _discimage.Disktype;
-
-                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-
-                foreach(CdrdaoTrack track in _discimage.Tracks)
-                {
-                    if(track.Subchannel)
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-
-                    switch(track.Tracktype)
-                    {
-                        case CDRDAO_TRACK_TYPE_AUDIO:
-                        {
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
-
-                            break;
-                        }
-                        case CDRDAO_TRACK_TYPE_MODE2:
-                        case CDRDAO_TRACK_TYPE_MODE2_MIX:
-                        {
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                            break;
-                        }
-                        case CDRDAO_TRACK_TYPE_MODE2_RAW:
-                        {
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                            break;
-                        }
-                        case CDRDAO_TRACK_TYPE_MODE1_RAW:
-                        {
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                            break;
-                        }
                     }
                 }
 
-                _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
-
-                AaruConsole.VerboseWriteLine("CDRDAO image describes a disc of type {0}", _imageInfo.MediaType);
-
-                if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                    AaruConsole.VerboseWriteLine("CDRDAO comments: {0}", _imageInfo.Comments);
-
-                _sectorBuilder = new SectorBuilder();
-
-                return ErrorNumber.NoError;
-            }
-            catch(Exception ex)
-            {
-                AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter);
-                AaruConsole.ErrorWriteLine("Exception: {0}", ex);
-
-                return ErrorNumber.UnexpectedException;
-            }
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            switch(tag)
-            {
-                case MediaTagType.CD_MCN:
-                {
-                    if(_discimage.Mcn == null)
-                        return ErrorNumber.NoData;
-
-                    buffer = Encoding.ASCII.GetBytes(_discimage.Mcn);
-
-                    return ErrorNumber.NoError;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
-                                                     from cdrdaoTrack in _discimage.Tracks
-                                                     where cdrdaoTrack.Sequence      == kvp.Key
-                                                     where sectorAddress - kvp.Value < cdrdaoTrack.Sectors select kvp)
-                return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
-                                                     from cdrdaoTrack in _discimage.Tracks
-                                                     where cdrdaoTrack.Sequence      == kvp.Key
-                                                     where sectorAddress - kvp.Value < cdrdaoTrack.Sectors select kvp)
-            {
-                return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
-
-                return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
+                Partitions.Add(partition);
             }
 
-            return ErrorNumber.SectorNotFound;
-        }
+            // Print partition map
+            AaruConsole.DebugWriteLine("CDRDAO plugin", "printing partition map");
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            var aaruTrack = new CdrdaoTrack
+            foreach(Partition partition in Partitions)
             {
-                Sequence = 0
-            };
-
-            foreach(CdrdaoTrack cdrdaoTrack in _discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track))
-            {
-                aaruTrack = cdrdaoTrack;
-
-                break;
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "Partition sequence: {0}", partition.Sequence);
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition name: {0}", partition.Name);
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition description: {0}", partition.Description);
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition type: {0}", partition.Type);
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting sector: {0}", partition.Start);
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition sectors: {0}", partition.Length);
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition starting offset: {0}", partition.Offset);
+                AaruConsole.DebugWriteLine("CDRDAO plugin", "\tPartition size in bytes: {0}", partition.Size);
             }
 
-            if(aaruTrack.Sequence == 0)
-                return ErrorNumber.SectorNotFound;
-
-            if(length > aaruTrack.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-            bool mode2 = false;
-
-            switch(aaruTrack.Tracktype)
+            foreach(CdrdaoTrack track in _discimage.Tracks)
             {
-                case CDRDAO_TRACK_TYPE_MODE1:
-                case CDRDAO_TRACK_TYPE_MODE2_FORM1:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2048;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE2_FORM2:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2324;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE2:
-                case CDRDAO_TRACK_TYPE_MODE2_MIX:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2336;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_AUDIO:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE1_RAW:
-                {
-                    sectorOffset = 16;
-                    sectorSize   = 2048;
-                    sectorSkip   = 288;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE2_RAW:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
+                _imageInfo.ImageSize += track.Bps * track.Sectors;
+                _imageInfo.Sectors   += track.Sectors;
             }
 
-            if(aaruTrack.Subchannel)
-                sectorSkip += 96;
-
-            buffer = new byte[sectorSize * length];
-
-            _imageStream = aaruTrack.Trackfile.Datafilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(mode2)
-            {
-                var mode2Ms = new MemoryStream((int)(sectorSize * length));
-
-                buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length));
-
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize);
-                    sector = Sector.GetUserDataFromMode2(sector);
-                    mode2Ms.Write(sector, 0, sector.Length);
-                }
-
-                buffer = mode2Ms.ToArray();
-            }
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
+            if(_discimage.Disktype != MediaType.CDG     &&
+               _discimage.Disktype != MediaType.CDEG    &&
+               _discimage.Disktype != MediaType.CDMIDI  &&
+               _discimage.Disktype != MediaType.CDROMXA &&
+               _discimage.Disktype != MediaType.CDDA    &&
+               _discimage.Disktype != MediaType.CDI     &&
+               _discimage.Disktype != MediaType.CDPLUS)
+                _imageInfo.SectorSize = 2048; // Only data tracks
             else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
+                _imageInfo.SectorSize = 2352; // All others
 
-            // cdrdao audio tracks are endian swapped corresponding to Aaru
-            if(aaruTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO)
-                return ErrorNumber.NoError;
+            if(_discimage.Mcn != null)
+                _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_MCN);
 
-            byte[] swapped = new byte[buffer.Length];
+            _imageInfo.Application = "CDRDAO";
 
-            for(long i = 0; i < buffer.Length; i += 2)
+            _imageInfo.CreationTime         = imageFilter.CreationTime;
+            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+
+            _imageInfo.Comments          = _discimage.Comment;
+            _imageInfo.MediaSerialNumber = _discimage.Mcn;
+            _imageInfo.MediaBarcode      = _discimage.Barcode;
+            _imageInfo.MediaType         = _discimage.Disktype;
+
+            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+
+            foreach(CdrdaoTrack track in _discimage.Tracks)
             {
-                swapped[i] = buffer[i + 1];
-                swapped[i             + 1] = buffer[i];
+                if(track.Subchannel)
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+
+                switch(track.Tracktype)
+                {
+                    case CDRDAO_TRACK_TYPE_AUDIO:
+                    {
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
+
+                        break;
+                    }
+                    case CDRDAO_TRACK_TYPE_MODE2:
+                    case CDRDAO_TRACK_TYPE_MODE2_MIX:
+                    {
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                        break;
+                    }
+                    case CDRDAO_TRACK_TYPE_MODE2_RAW:
+                    {
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                        break;
+                    }
+                    case CDRDAO_TRACK_TYPE_MODE1_RAW:
+                    {
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                        break;
+                    }
+                }
             }
 
-            buffer = swapped;
+            _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
+
+            AaruConsole.VerboseWriteLine("CDRDAO image describes a disc of type {0}", _imageInfo.MediaType);
+
+            if(!string.IsNullOrEmpty(_imageInfo.Comments))
+                AaruConsole.VerboseWriteLine("CDRDAO comments: {0}", _imageInfo.Comments);
+
+            _sectorBuilder = new SectorBuilder();
 
             return ErrorNumber.NoError;
         }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
+        catch(Exception ex)
         {
-            buffer = null;
+            AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter);
+            AaruConsole.ErrorWriteLine("Exception: {0}", ex);
 
-            if(tag == SectorTagType.CdTrackFlags ||
-               tag == SectorTagType.CdTrackIsrc)
-                track = (uint)sectorAddress;
-
-            var aaruTrack = new CdrdaoTrack
-            {
-                Sequence = 0
-            };
-
-            foreach(CdrdaoTrack cdrdaoTrack in _discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track))
-            {
-                aaruTrack = cdrdaoTrack;
-
-                break;
-            }
-
-            if(aaruTrack.Sequence == 0)
-                return ErrorNumber.SectorNotFound;
-
-            if(length > aaruTrack.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip = 0;
-
-            if(!aaruTrack.Subchannel &&
-               tag == SectorTagType.CdSectorSubchannel)
-                return ErrorNumber.NoData;
-
-            switch(tag)
-            {
-                case SectorTagType.CdSectorEcc:
-                case SectorTagType.CdSectorEccP:
-                case SectorTagType.CdSectorEccQ:
-                case SectorTagType.CdSectorEdc:
-                case SectorTagType.CdSectorHeader:
-                case SectorTagType.CdSectorSubchannel:
-                case SectorTagType.CdSectorSubHeader:
-                case SectorTagType.CdSectorSync: break;
-                case SectorTagType.CdTrackFlags:
-                {
-                    CdFlags flags = 0;
-
-                    if(aaruTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO)
-                        flags |= CdFlags.DataTrack;
-
-                    if(aaruTrack.FlagDcp)
-                        flags |= CdFlags.CopyPermitted;
-
-                    if(aaruTrack.FlagPre)
-                        flags |= CdFlags.PreEmphasis;
-
-                    if(aaruTrack.Flag4Ch)
-                        flags |= CdFlags.FourChannel;
-
-                    buffer = new[]
-                    {
-                        (byte)flags
-                    };
-
-                    return ErrorNumber.NoError;
-                }
-                case SectorTagType.CdTrackIsrc:
-                    if(aaruTrack.Isrc == null)
-                        return ErrorNumber.NoData;
-
-                    buffer = Encoding.UTF8.GetBytes(aaruTrack.Isrc);
-
-                    return ErrorNumber.NoError;
-                default: return ErrorNumber.NotSupported;
-            }
-
-            switch(aaruTrack.Tracktype)
-            {
-                case CDRDAO_TRACK_TYPE_MODE1:
-                case CDRDAO_TRACK_TYPE_MODE2_FORM1:
-                    if(tag != SectorTagType.CdSectorSubchannel)
-                        return ErrorNumber.NoData;
-
-                    sectorOffset = 2048;
-                    sectorSize   = 96;
-
-                    break;
-                case CDRDAO_TRACK_TYPE_MODE2_FORM2:
-                case CDRDAO_TRACK_TYPE_MODE2_MIX:
-                    if(tag != SectorTagType.CdSectorSubchannel)
-                        return ErrorNumber.NoData;
-
-                    sectorOffset = 2336;
-                    sectorSize   = 96;
-
-                    break;
-                case CDRDAO_TRACK_TYPE_AUDIO:
-                    if(tag != SectorTagType.CdSectorSubchannel)
-                        return ErrorNumber.NoData;
-
-                    sectorOffset = 2352;
-                    sectorSize   = 96;
-
-                    break;
-                case CDRDAO_TRACK_TYPE_MODE1_RAW:
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            sectorOffset = 2352;
-                            sectorSize   = 96;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2064;
-                            sectorSize   = 4;
-                            sectorSkip   = 284;
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE2_RAW: // Requires reading sector
-                    if(tag != SectorTagType.CdSectorSubchannel)
-                        return ErrorNumber.NotImplemented;
-
-                    sectorOffset = 2352;
-                    sectorSize   = 96;
-
-                    break;
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            _imageStream = aaruTrack.Trackfile.Datafilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
-                                                     from cdrdaoTrack in _discimage.Tracks
-                                                     where cdrdaoTrack.Sequence      == kvp.Key
-                                                     where sectorAddress - kvp.Value < cdrdaoTrack.Sectors select kvp)
-                return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            var aaruTrack = new CdrdaoTrack
-            {
-                Sequence = 0
-            };
-
-            foreach(CdrdaoTrack cdrdaoTrack in _discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track))
-            {
-                aaruTrack = cdrdaoTrack;
-
-                break;
-            }
-
-            if(aaruTrack.Sequence == 0)
-                return ErrorNumber.SectorNotFound;
-
-            if(length > aaruTrack.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch(aaruTrack.Tracktype)
-            {
-                case CDRDAO_TRACK_TYPE_MODE1:
-                case CDRDAO_TRACK_TYPE_MODE2_FORM1:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2048;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE2_FORM2:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2324;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE2:
-                case CDRDAO_TRACK_TYPE_MODE2_MIX:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2336;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE1_RAW:
-                case CDRDAO_TRACK_TYPE_MODE2_RAW:
-                case CDRDAO_TRACK_TYPE_AUDIO:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-
-            if(aaruTrack.Subchannel)
-                sectorSkip += 96;
-
-            buffer = new byte[sectorSize * length];
-
-            _imageStream = aaruTrack.Trackfile.Datafilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            switch(aaruTrack.Tracktype)
-            {
-                case CDRDAO_TRACK_TYPE_MODE1:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        Array.Copy(buffer, i * 2048, fullSector, 16, 2048);
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)(sectorAddress + i));
-                        _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE2_FORM1:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        Array.Copy(buffer, i * 2048, fullSector, 24, 2048);
-
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form1,
-                                                         (long)(sectorAddress + i));
-
-                        _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form1);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE2_FORM2:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        Array.Copy(buffer, i * 2324, fullSector, 24, 2324);
-
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form2,
-                                                         (long)(sectorAddress + i));
-
-                        _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form2);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-                case CDRDAO_TRACK_TYPE_MODE2:
-                case CDRDAO_TRACK_TYPE_MODE2_MIX:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Formless,
-                                                         (long)(sectorAddress + i));
-
-                        Array.Copy(buffer, i                    * 2336, fullSector, 16, 2336);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-
-                // cdrdao audio tracks are endian swapped corresponding to Aaru
-                case CDRDAO_TRACK_TYPE_AUDIO:
-                {
-                    byte[] swapped = new byte[buffer.Length];
-
-                    for(long i = 0; i < buffer.Length; i += 2)
-                    {
-                        swapped[i] = buffer[i + 1];
-                        swapped[i             + 1] = buffer[i];
-                    }
-
-                    buffer = swapped;
-
-                    break;
-                }
-            }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(Session session) => GetSessionTracks(session.Sequence);
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session)
-        {
-            if(session == 1)
-                return Tracks;
-
-            return null;
+            return ErrorNumber.UnexpectedException;
         }
     }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        switch(tag)
+        {
+            case MediaTagType.CD_MCN:
+            {
+                if(_discimage.Mcn == null)
+                    return ErrorNumber.NoData;
+
+                buffer = Encoding.ASCII.GetBytes(_discimage.Mcn);
+
+                return ErrorNumber.NoError;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
+                                                 from cdrdaoTrack in _discimage.Tracks
+                                                 where cdrdaoTrack.Sequence      == kvp.Key
+                                                 where sectorAddress - kvp.Value < cdrdaoTrack.Sectors select kvp)
+            return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
+                                                 from cdrdaoTrack in _discimage.Tracks
+                                                 where cdrdaoTrack.Sequence      == kvp.Key
+                                                 where sectorAddress - kvp.Value < cdrdaoTrack.Sectors select kvp)
+        {
+            return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
+
+            return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
+        }
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        var aaruTrack = new CdrdaoTrack
+        {
+            Sequence = 0
+        };
+
+        foreach(CdrdaoTrack cdrdaoTrack in _discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track))
+        {
+            aaruTrack = cdrdaoTrack;
+
+            break;
+        }
+
+        if(aaruTrack.Sequence == 0)
+            return ErrorNumber.SectorNotFound;
+
+        if(length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+        bool mode2 = false;
+
+        switch(aaruTrack.Tracktype)
+        {
+            case CDRDAO_TRACK_TYPE_MODE1:
+            case CDRDAO_TRACK_TYPE_MODE2_FORM1:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2048;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE2_FORM2:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2324;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE2:
+            case CDRDAO_TRACK_TYPE_MODE2_MIX:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2336;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_AUDIO:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE1_RAW:
+            {
+                sectorOffset = 16;
+                sectorSize   = 2048;
+                sectorSkip   = 288;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE2_RAW:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        if(aaruTrack.Subchannel)
+            sectorSkip += 96;
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream = aaruTrack.Trackfile.Datafilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(mode2)
+        {
+            var mode2Ms = new MemoryStream((int)(sectorSize * length));
+
+            buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length));
+
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize);
+                sector = Sector.GetUserDataFromMode2(sector);
+                mode2Ms.Write(sector, 0, sector.Length);
+            }
+
+            buffer = mode2Ms.ToArray();
+        }
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        // cdrdao audio tracks are endian swapped corresponding to Aaru
+        if(aaruTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO)
+            return ErrorNumber.NoError;
+
+        byte[] swapped = new byte[buffer.Length];
+
+        for(long i = 0; i < buffer.Length; i += 2)
+        {
+            swapped[i] = buffer[i + 1];
+            swapped[i             + 1] = buffer[i];
+        }
+
+        buffer = swapped;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag == SectorTagType.CdTrackFlags ||
+           tag == SectorTagType.CdTrackIsrc)
+            track = (uint)sectorAddress;
+
+        var aaruTrack = new CdrdaoTrack
+        {
+            Sequence = 0
+        };
+
+        foreach(CdrdaoTrack cdrdaoTrack in _discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track))
+        {
+            aaruTrack = cdrdaoTrack;
+
+            break;
+        }
+
+        if(aaruTrack.Sequence == 0)
+            return ErrorNumber.SectorNotFound;
+
+        if(length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip = 0;
+
+        if(!aaruTrack.Subchannel &&
+           tag == SectorTagType.CdSectorSubchannel)
+            return ErrorNumber.NoData;
+
+        switch(tag)
+        {
+            case SectorTagType.CdSectorEcc:
+            case SectorTagType.CdSectorEccP:
+            case SectorTagType.CdSectorEccQ:
+            case SectorTagType.CdSectorEdc:
+            case SectorTagType.CdSectorHeader:
+            case SectorTagType.CdSectorSubchannel:
+            case SectorTagType.CdSectorSubHeader:
+            case SectorTagType.CdSectorSync: break;
+            case SectorTagType.CdTrackFlags:
+            {
+                CdFlags flags = 0;
+
+                if(aaruTrack.Tracktype != CDRDAO_TRACK_TYPE_AUDIO)
+                    flags |= CdFlags.DataTrack;
+
+                if(aaruTrack.FlagDcp)
+                    flags |= CdFlags.CopyPermitted;
+
+                if(aaruTrack.FlagPre)
+                    flags |= CdFlags.PreEmphasis;
+
+                if(aaruTrack.Flag4Ch)
+                    flags |= CdFlags.FourChannel;
+
+                buffer = new[]
+                {
+                    (byte)flags
+                };
+
+                return ErrorNumber.NoError;
+            }
+            case SectorTagType.CdTrackIsrc:
+                if(aaruTrack.Isrc == null)
+                    return ErrorNumber.NoData;
+
+                buffer = Encoding.UTF8.GetBytes(aaruTrack.Isrc);
+
+                return ErrorNumber.NoError;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        switch(aaruTrack.Tracktype)
+        {
+            case CDRDAO_TRACK_TYPE_MODE1:
+            case CDRDAO_TRACK_TYPE_MODE2_FORM1:
+                if(tag != SectorTagType.CdSectorSubchannel)
+                    return ErrorNumber.NoData;
+
+                sectorOffset = 2048;
+                sectorSize   = 96;
+
+                break;
+            case CDRDAO_TRACK_TYPE_MODE2_FORM2:
+            case CDRDAO_TRACK_TYPE_MODE2_MIX:
+                if(tag != SectorTagType.CdSectorSubchannel)
+                    return ErrorNumber.NoData;
+
+                sectorOffset = 2336;
+                sectorSize   = 96;
+
+                break;
+            case CDRDAO_TRACK_TYPE_AUDIO:
+                if(tag != SectorTagType.CdSectorSubchannel)
+                    return ErrorNumber.NoData;
+
+                sectorOffset = 2352;
+                sectorSize   = 96;
+
+                break;
+            case CDRDAO_TRACK_TYPE_MODE1_RAW:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        sectorOffset = 2352;
+                        sectorSize   = 96;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2064;
+                        sectorSize   = 4;
+                        sectorSkip   = 284;
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE2_RAW: // Requires reading sector
+                if(tag != SectorTagType.CdSectorSubchannel)
+                    return ErrorNumber.NotImplemented;
+
+                sectorOffset = 2352;
+                sectorSize   = 96;
+
+                break;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream = aaruTrack.Trackfile.Datafilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
+                                                 from cdrdaoTrack in _discimage.Tracks
+                                                 where cdrdaoTrack.Sequence      == kvp.Key
+                                                 where sectorAddress - kvp.Value < cdrdaoTrack.Sectors select kvp)
+            return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        var aaruTrack = new CdrdaoTrack
+        {
+            Sequence = 0
+        };
+
+        foreach(CdrdaoTrack cdrdaoTrack in _discimage.Tracks.Where(cdrdaoTrack => cdrdaoTrack.Sequence == track))
+        {
+            aaruTrack = cdrdaoTrack;
+
+            break;
+        }
+
+        if(aaruTrack.Sequence == 0)
+            return ErrorNumber.SectorNotFound;
+
+        if(length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(aaruTrack.Tracktype)
+        {
+            case CDRDAO_TRACK_TYPE_MODE1:
+            case CDRDAO_TRACK_TYPE_MODE2_FORM1:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2048;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE2_FORM2:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2324;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE2:
+            case CDRDAO_TRACK_TYPE_MODE2_MIX:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2336;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE1_RAW:
+            case CDRDAO_TRACK_TYPE_MODE2_RAW:
+            case CDRDAO_TRACK_TYPE_AUDIO:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        if(aaruTrack.Subchannel)
+            sectorSkip += 96;
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream = aaruTrack.Trackfile.Datafilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.Trackfile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        switch(aaruTrack.Tracktype)
+        {
+            case CDRDAO_TRACK_TYPE_MODE1:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
+                {
+                    Array.Copy(buffer, i * 2048, fullSector, 16, 2048);
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)(sectorAddress + i));
+                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
+                }
+
+                buffer = fullBuffer;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE2_FORM1:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
+                {
+                    Array.Copy(buffer, i * 2048, fullSector, 24, 2048);
+
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form1,
+                                                     (long)(sectorAddress + i));
+
+                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form1);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
+                }
+
+                buffer = fullBuffer;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE2_FORM2:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
+                {
+                    Array.Copy(buffer, i * 2324, fullSector, 24, 2324);
+
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form2,
+                                                     (long)(sectorAddress + i));
+
+                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form2);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
+                }
+
+                buffer = fullBuffer;
+
+                break;
+            }
+            case CDRDAO_TRACK_TYPE_MODE2:
+            case CDRDAO_TRACK_TYPE_MODE2_MIX:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
+                {
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Formless,
+                                                     (long)(sectorAddress + i));
+
+                    Array.Copy(buffer, i                    * 2336, fullSector, 16, 2336);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
+                }
+
+                buffer = fullBuffer;
+
+                break;
+            }
+
+            // cdrdao audio tracks are endian swapped corresponding to Aaru
+            case CDRDAO_TRACK_TYPE_AUDIO:
+            {
+                byte[] swapped = new byte[buffer.Length];
+
+                for(long i = 0; i < buffer.Length; i += 2)
+                {
+                    swapped[i] = buffer[i + 1];
+                    swapped[i             + 1] = buffer[i];
+                }
+
+                buffer = swapped;
+
+                break;
+            }
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(Session session) => GetSessionTracks(session.Sequence);
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session)
+    {
+        if(session == 1)
+            return Tracks;
+
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/Structs.cs b/Aaru.Images/CDRDAO/Structs.cs
index 32ec10678..eeb1cf59c 100644
--- a/Aaru.Images/CDRDAO/Structs.cs
+++ b/Aaru.Images/CDRDAO/Structs.cs
@@ -35,105 +35,104 @@ using System.Diagnostics.CodeAnalysis;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cdrdao
 {
-    public sealed partial class Cdrdao
+    [SuppressMessage("ReSharper", "NotAccessedField.Local")]
+    struct CdrdaoTrackFile
     {
-        [SuppressMessage("ReSharper", "NotAccessedField.Local")]
-        struct CdrdaoTrackFile
-        {
-            /// <summary>Track #</summary>
-            public uint Sequence;
-            /// <summary>Filter of file containing track</summary>
-            public IFilter Datafilter;
-            /// <summary>Path of file containing track</summary>
-            public string Datafile;
-            /// <summary>Offset of track start in file</summary>
-            public ulong Offset;
-            /// <summary>Type of file</summary>
-            public string Filetype;
-        }
-
-        #pragma warning disable 169
-        [SuppressMessage("ReSharper", "NotAccessedField.Local")]
-        struct CdrdaoTrack
-        {
-            /// <summary>Track #</summary>
-            public uint Sequence;
-            /// <summary>Track title (from CD-Text)</summary>
-            public string Title;
-            /// <summary>Track genre (from CD-Text)</summary>
-            public string Genre;
-            /// <summary>Track arranger (from CD-Text)</summary>
-            public string Arranger;
-            /// <summary>Track composer (from CD-Text)</summary>
-            public string Composer;
-            /// <summary>Track performer (from CD-Text)</summary>
-            public string Performer;
-            /// <summary>Track song writer (from CD-Text)</summary>
-            public string Songwriter;
-            /// <summary>Track ISRC</summary>
-            public string Isrc;
-            /// <summary>Disk provider's message (from CD-Text)</summary>
-            public string Message;
-            /// <summary>File struct for this track</summary>
-            public CdrdaoTrackFile Trackfile;
-            /// <summary>Indexes on this track</summary>
-            public Dictionary<int, ulong> Indexes;
-            /// <summary>Track pre-gap in sectors</summary>
-            public ulong Pregap;
-            /// <summary>Track post-gap in sectors</summary>
-            public ulong Postgap;
-            /// <summary>Digical Copy Permitted</summary>
-            public bool FlagDcp;
-            /// <summary>Track is quadraphonic</summary>
-            public bool Flag4Ch;
-            /// <summary>Track has preemphasis</summary>
-            public bool FlagPre;
-            /// <summary>Bytes per sector</summary>
-            public ushort Bps;
-            /// <summary>Sectors in track</summary>
-            public ulong Sectors;
-            /// <summary>Starting sector in track</summary>
-            public ulong StartSector;
-            /// <summary>Track type</summary>
-            public string Tracktype;
-            public bool Subchannel;
-            public bool Packedsubchannel;
-        }
-
-        [SuppressMessage("ReSharper", "NotAccessedField.Local")]
-        struct CdrdaoDisc
-        {
-            /// <summary>Disk title (from CD-Text)</summary>
-            public string Title;
-            /// <summary>Disk genre (from CD-Text)</summary>
-            public string Genre;
-            /// <summary>Disk arranger (from CD-Text)</summary>
-            public string Arranger;
-            /// <summary>Disk composer (from CD-Text)</summary>
-            public string Composer;
-            /// <summary>Disk performer (from CD-Text)</summary>
-            public string Performer;
-            /// <summary>Disk song writer (from CD-Text)</summary>
-            public string Songwriter;
-            /// <summary>Disk provider's message (from CD-Text)</summary>
-            public string Message;
-            /// <summary>Media catalog number</summary>
-            public string Mcn;
-            /// <summary>Disk type</summary>
-            public MediaType Disktype;
-            /// <summary>Disk type string</summary>
-            public string Disktypestr;
-            /// <summary>Disk CDDB ID</summary>
-            public string DiskId;
-            /// <summary>Disk UPC/EAN</summary>
-            public string Barcode;
-            /// <summary>Tracks</summary>
-            public List<CdrdaoTrack> Tracks;
-            /// <summary>Disk comment</summary>
-            public string Comment;
-        }
-        #pragma warning restore 169
+        /// <summary>Track #</summary>
+        public uint Sequence;
+        /// <summary>Filter of file containing track</summary>
+        public IFilter Datafilter;
+        /// <summary>Path of file containing track</summary>
+        public string Datafile;
+        /// <summary>Offset of track start in file</summary>
+        public ulong Offset;
+        /// <summary>Type of file</summary>
+        public string Filetype;
     }
+
+    #pragma warning disable 169
+    [SuppressMessage("ReSharper", "NotAccessedField.Local")]
+    struct CdrdaoTrack
+    {
+        /// <summary>Track #</summary>
+        public uint Sequence;
+        /// <summary>Track title (from CD-Text)</summary>
+        public string Title;
+        /// <summary>Track genre (from CD-Text)</summary>
+        public string Genre;
+        /// <summary>Track arranger (from CD-Text)</summary>
+        public string Arranger;
+        /// <summary>Track composer (from CD-Text)</summary>
+        public string Composer;
+        /// <summary>Track performer (from CD-Text)</summary>
+        public string Performer;
+        /// <summary>Track song writer (from CD-Text)</summary>
+        public string Songwriter;
+        /// <summary>Track ISRC</summary>
+        public string Isrc;
+        /// <summary>Disk provider's message (from CD-Text)</summary>
+        public string Message;
+        /// <summary>File struct for this track</summary>
+        public CdrdaoTrackFile Trackfile;
+        /// <summary>Indexes on this track</summary>
+        public Dictionary<int, ulong> Indexes;
+        /// <summary>Track pre-gap in sectors</summary>
+        public ulong Pregap;
+        /// <summary>Track post-gap in sectors</summary>
+        public ulong Postgap;
+        /// <summary>Digical Copy Permitted</summary>
+        public bool FlagDcp;
+        /// <summary>Track is quadraphonic</summary>
+        public bool Flag4Ch;
+        /// <summary>Track has preemphasis</summary>
+        public bool FlagPre;
+        /// <summary>Bytes per sector</summary>
+        public ushort Bps;
+        /// <summary>Sectors in track</summary>
+        public ulong Sectors;
+        /// <summary>Starting sector in track</summary>
+        public ulong StartSector;
+        /// <summary>Track type</summary>
+        public string Tracktype;
+        public bool Subchannel;
+        public bool Packedsubchannel;
+    }
+
+    [SuppressMessage("ReSharper", "NotAccessedField.Local")]
+    struct CdrdaoDisc
+    {
+        /// <summary>Disk title (from CD-Text)</summary>
+        public string Title;
+        /// <summary>Disk genre (from CD-Text)</summary>
+        public string Genre;
+        /// <summary>Disk arranger (from CD-Text)</summary>
+        public string Arranger;
+        /// <summary>Disk composer (from CD-Text)</summary>
+        public string Composer;
+        /// <summary>Disk performer (from CD-Text)</summary>
+        public string Performer;
+        /// <summary>Disk song writer (from CD-Text)</summary>
+        public string Songwriter;
+        /// <summary>Disk provider's message (from CD-Text)</summary>
+        public string Message;
+        /// <summary>Media catalog number</summary>
+        public string Mcn;
+        /// <summary>Disk type</summary>
+        public MediaType Disktype;
+        /// <summary>Disk type string</summary>
+        public string Disktypestr;
+        /// <summary>Disk CDDB ID</summary>
+        public string DiskId;
+        /// <summary>Disk UPC/EAN</summary>
+        public string Barcode;
+        /// <summary>Tracks</summary>
+        public List<CdrdaoTrack> Tracks;
+        /// <summary>Disk comment</summary>
+        public string Comment;
+    }
+    #pragma warning restore 169
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/Verify.cs b/Aaru.Images/CDRDAO/Verify.cs
index e7eca0f0a..a55e43af3 100644
--- a/Aaru.Images/CDRDAO/Verify.cs
+++ b/Aaru.Images/CDRDAO/Verify.cs
@@ -35,92 +35,91 @@ using System.Collections.Generic;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cdrdao
 {
-    public sealed partial class Cdrdao
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
     {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRDAO/Write.cs b/Aaru.Images/CDRDAO/Write.cs
index 4614f9ad5..9cd8dcb1b 100644
--- a/Aaru.Images/CDRDAO/Write.cs
+++ b/Aaru.Images/CDRDAO/Write.cs
@@ -41,770 +41,769 @@ using Aaru.CommonTypes.Structs;
 using Schemas;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cdrdao
 {
-    public sealed partial class Cdrdao
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(options != null)
         {
-            if(options != null)
+            if(options.TryGetValue("separate", out string tmpValue))
             {
-                if(options.TryGetValue("separate", out string tmpValue))
+                if(!bool.TryParse(tmpValue, out _separateTracksWriting))
                 {
-                    if(!bool.TryParse(tmpValue, out _separateTracksWriting))
-                    {
-                        ErrorMessage = "Invalid value for split option";
-
-                        return false;
-                    }
-
-                    if(_separateTracksWriting)
-                    {
-                        ErrorMessage = "Separate tracks not yet implemented";
-
-                        return false;
-                    }
-                }
-            }
-            else
-                _separateTracksWriting = false;
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            // TODO: Separate tracks
-            try
-            {
-                _writingBaseName =
-                    Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path));
-
-                _descriptorStream = new StreamWriter(path, false, Encoding.ASCII);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            _discimage = new CdrdaoDisc
-            {
-                Disktype = mediaType,
-                Tracks   = new List<CdrdaoTrack>()
-            };
-
-            _trackFlags = new Dictionary<byte, byte>();
-            _trackIsrcs = new Dictionary<byte, string>();
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            switch(tag)
-            {
-                case MediaTagType.CD_MCN:
-                    _discimage.Mcn = Encoding.ASCII.GetString(data);
-
-                    return true;
-                default:
-                    ErrorMessage = $"Unsupported media tag {tag}";
-
-                    return false;
-            }
-        }
-
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
-
-            if(trackStream == null)
-            {
-                ErrorMessage = $"Can't found file containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(track.BytesPerSector != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Invalid write mode for this sector";
-
-                return false;
-            }
-
-            if(data.Length != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            // cdrdao audio tracks are endian swapped corresponding to Aaru
-            if(track.Type == TrackType.Audio)
-            {
-                byte[] swapped = new byte[data.Length];
-
-                for(long i = 0; i < swapped.Length; i += 2)
-                {
-                    swapped[i] = data[i + 1];
-                    swapped[i           + 1] = data[i];
-                }
-
-                data = swapped;
-            }
-
-            trackStream.
-                Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
-                     SeekOrigin.Begin);
-
-            trackStream.Write(data, 0, data.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
-
-            if(trackStream == null)
-            {
-                ErrorMessage = $"Can't found file containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(track.BytesPerSector != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Invalid write mode for this sector";
-
-                return false;
-            }
-
-            if(sectorAddress + length > track.EndSector + 1)
-            {
-                ErrorMessage = "Can't cross tracks";
-
-                return false;
-            }
-
-            if(data.Length % track.RawBytesPerSector != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            // cdrdao audio tracks are endian swapped corresponding to Aaru
-            if(track.Type == TrackType.Audio)
-            {
-                byte[] swapped = new byte[data.Length];
-
-                for(long i = 0; i < swapped.Length; i += 2)
-                {
-                    swapped[i] = data[i + 1];
-                    swapped[i           + 1] = data[i];
-                }
-
-                data = swapped;
-            }
-
-            switch(track.SubchannelType)
-            {
-                case TrackSubchannelType.None:
-                    trackStream.
-                        Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
-                             SeekOrigin.Begin);
-
-                    trackStream.Write(data, 0, data.Length);
-
-                    ErrorMessage = "";
-
-                    return true;
-                case TrackSubchannelType.Raw:
-                case TrackSubchannelType.RawInterleaved:
-                    trackStream.
-                        Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))),
-                             SeekOrigin.Begin);
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        trackStream.Write(data, (int)(i * track.RawBytesPerSector), track.RawBytesPerSector);
-                        trackStream.Position += 96;
-                    }
-
-                    ErrorMessage = "";
-
-                    return true;
-                default:
-                    ErrorMessage = "Invalid subchannel mode for this sector";
-
-                    return false;
-            }
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
-
-            if(trackStream == null)
-            {
-                ErrorMessage = $"Can't found file containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(data.Length != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            // cdrdao audio tracks are endian swapped corresponding to Aaru
-            if(track.Type == TrackType.Audio)
-            {
-                byte[] swapped = new byte[data.Length];
-
-                for(long i = 0; i < swapped.Length; i += 2)
-                {
-                    swapped[i] = data[i + 1];
-                    swapped[i           + 1] = data[i];
-                }
-
-                data = swapped;
-            }
-
-            uint subchannelSize = (uint)(track.SubchannelType != TrackSubchannelType.None ? 96 : 0);
-
-            trackStream.
-                Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + subchannelSize))),
-                     SeekOrigin.Begin);
-
-            trackStream.Write(data, 0, data.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
-
-            if(trackStream == null)
-            {
-                ErrorMessage = $"Can't found file containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(sectorAddress + length > track.EndSector + 1)
-            {
-                ErrorMessage = "Can't cross tracks";
-
-                return false;
-            }
-
-            if(data.Length % track.RawBytesPerSector != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            // cdrdao audio tracks are endian swapped corresponding to Aaru
-            if(track.Type == TrackType.Audio)
-            {
-                byte[] swapped = new byte[data.Length];
-
-                for(long i = 0; i < swapped.Length; i += 2)
-                {
-                    swapped[i] = data[i + 1];
-                    swapped[i           + 1] = data[i];
-                }
-
-                data = swapped;
-            }
-
-            uint subchannelSize = (uint)(track.SubchannelType != TrackSubchannelType.None ? 96 : 0);
-
-            for(uint i = 0; i < length; i++)
-            {
-                trackStream.
-                    Seek((long)(track.FileOffset + ((i + sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + subchannelSize))),
-                         SeekOrigin.Begin);
-
-                trackStream.Write(data, (int)(i * track.RawBytesPerSector), track.RawBytesPerSector);
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetTracks(List<Track> tracks)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(tracks       == null ||
-               tracks.Count == 0)
-            {
-                ErrorMessage = "Invalid tracks sent";
-
-                return false;
-            }
-
-            if(_writingTracks  != null &&
-               _writingStreams != null)
-                foreach(FileStream oldTrack in _writingStreams.Select(t => t.Value).Distinct())
-                    oldTrack.Close();
-
-            ulong currentOffset = 0;
-            _writingTracks = new List<Track>();
-
-            foreach(Track track in tracks.OrderBy(t => t.Sequence))
-            {
-                if(track.SubchannelType == TrackSubchannelType.Q16 ||
-                   track.SubchannelType == TrackSubchannelType.Q16Interleaved)
-                {
-                    ErrorMessage = $"Unsupported subchannel type {track.SubchannelType} for track {track.Sequence}";
+                    ErrorMessage = "Invalid value for split option";
 
                     return false;
                 }
 
-                Track newTrack = track;
+                if(_separateTracksWriting)
+                {
+                    ErrorMessage = "Separate tracks not yet implemented";
 
-                newTrack.File = _separateTracksWriting ? _writingBaseName + $"_track{track.Sequence:D2}.bin"
-                                    : _writingBaseName                    + ".bin";
-
-                newTrack.FileOffset = _separateTracksWriting ? 0 : currentOffset;
-                _writingTracks.Add(newTrack);
-
-                currentOffset += (ulong)newTrack.RawBytesPerSector * (newTrack.EndSector - newTrack.StartSector + 1);
-
-                if(track.SubchannelType != TrackSubchannelType.None)
-                    currentOffset += 96 * (newTrack.EndSector - newTrack.StartSector + 1);
+                    return false;
+                }
             }
-
-            _writingStreams = new Dictionary<uint, FileStream>();
-
-            if(_separateTracksWriting)
-                foreach(Track track in _writingTracks)
-                    _writingStreams.Add(track.Sequence,
-                                        new FileStream(track.File, FileMode.OpenOrCreate, FileAccess.ReadWrite,
-                                                       FileShare.None));
-            else
-            {
-                var jointStream = new FileStream(_writingBaseName + ".bin", FileMode.OpenOrCreate, FileAccess.ReadWrite,
-                                                 FileShare.None);
-
-                foreach(Track track in _writingTracks)
-                    _writingStreams.Add(track.Sequence, jointStream);
-            }
-
-            return true;
         }
+        else
+            _separateTracksWriting = false;
 
-        /// <inheritdoc />
-        public bool Close()
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            if(_separateTracksWriting)
-                foreach(FileStream writingStream in _writingStreams.Values)
-                {
-                    writingStream.Flush();
-                    writingStream.Close();
-                }
-            else
-            {
-                _writingStreams.First().Value.Flush();
-                _writingStreams.First().Value.Close();
-            }
-
-            bool data = _writingTracks.Count(t => t.Type != TrackType.Audio) > 0;
-
-            bool mode2 = _writingTracks.Count(t => t.Type == TrackType.CdMode2Form1 ||
-                                                   t.Type == TrackType.CdMode2Form2 ||
-                                                   t.Type == TrackType.CdMode2Formless) > 0;
-
-            if(mode2)
-                _descriptorStream.WriteLine("CD_ROM_XA");
-            else if(data)
-                _descriptorStream.WriteLine("CD_ROM");
-            else
-                _descriptorStream.WriteLine("CD_DA");
-
-            if(!string.IsNullOrWhiteSpace(_discimage.Comment))
-            {
-                string[] commentLines = _discimage.Comment.Split(new[]
-                {
-                    '\n'
-                }, StringSplitOptions.RemoveEmptyEntries);
-
-                foreach(string line in commentLines)
-                    _descriptorStream.WriteLine("// {0}", line);
-            }
-
-            _descriptorStream.WriteLine();
-
-            if(!string.IsNullOrEmpty(_discimage.Mcn))
-                _descriptorStream.WriteLine("CATALOG {0}", _discimage.Mcn);
-
-            foreach(Track track in _writingTracks)
-            {
-                _descriptorStream.WriteLine();
-                _descriptorStream.WriteLine("// Track {0}", track.Sequence);
-
-                string subchannelType;
-
-                switch(track.SubchannelType)
-                {
-                    case TrackSubchannelType.Packed:
-                    case TrackSubchannelType.PackedInterleaved:
-                        subchannelType = " RW";
-
-                        break;
-                    case TrackSubchannelType.Raw:
-                    case TrackSubchannelType.RawInterleaved:
-                        subchannelType = " RW_RAW";
-
-                        break;
-                    default:
-                        subchannelType = "";
-
-                        break;
-                }
-
-                _descriptorStream.WriteLine("TRACK {0}{1}", GetTrackMode(track), subchannelType);
-
-                _trackFlags.TryGetValue((byte)track.Sequence, out byte flagsByte);
-
-                var flags = (CdFlags)flagsByte;
-
-                _descriptorStream.WriteLine("{0}COPY", flags.HasFlag(CdFlags.CopyPermitted) ? "" : "NO ");
-
-                if(track.Type == TrackType.Audio)
-                {
-                    _descriptorStream.WriteLine("{0}PRE_EMPHASIS", flags.HasFlag(CdFlags.PreEmphasis) ? "" : "NO ");
-
-                    _descriptorStream.WriteLine("{0}_CHANNEL_AUDIO",
-                                                flags.HasFlag(CdFlags.FourChannel) ? "FOUR" : "TWO");
-                }
-
-                if(_trackIsrcs.TryGetValue((byte)track.Sequence, out string isrc) &&
-                   !string.IsNullOrWhiteSpace(isrc))
-                    _descriptorStream.WriteLine("ISRC {0}", isrc);
-
-                (byte minute, byte second, byte frame) msf = LbaToMsf(track.EndSector - track.StartSector + 1);
-
-                _descriptorStream.WriteLine("DATAFILE \"{0}\" #{1} {2:D2}:{3:D2}:{4:D2} // length in bytes: {5}",
-                                            Path.GetFileName(track.File), track.FileOffset, msf.minute, msf.second,
-                                            msf.frame,
-                                            (track.EndSector - track.StartSector + 1) *
-                                            (ulong)(track.RawBytesPerSector +
-                                                    (track.SubchannelType != TrackSubchannelType.None ? 96 : 0)));
-
-                foreach(KeyValuePair<ushort, int> index in track.Indexes.OrderBy(i => i.Key).Where(i => i.Key > 1))
-                {
-                    msf = LbaToMsf((ulong)index.Value - (track.Pregap + track.StartSector));
-
-                    _descriptorStream.WriteLine("INDEX {0:D2}:{1:D2}:{2:D2}", msf.minute, msf.second, msf.frame);
-                }
-
-                _descriptorStream.WriteLine();
-            }
-
-            _descriptorStream.Flush();
-            _descriptorStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata)
-        {
-            _discimage.Barcode = metadata.MediaBarcode;
-            _discimage.Comment = metadata.Comments;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
-        {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        // TODO: Separate tracks
+        try
+        {
+            _writingBaseName =
+                Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path));
+
+            _descriptorStream = new StreamWriter(path, false, Encoding.ASCII);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
+            return false;
+        }
+
+        _discimage = new CdrdaoDisc
+        {
+            Disktype = mediaType,
+            Tracks   = new List<CdrdaoTrack>()
+        };
+
+        _trackFlags = new Dictionary<byte, byte>();
+        _trackIsrcs = new Dictionary<byte, string>();
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        switch(tag)
+        {
+            case MediaTagType.CD_MCN:
+                _discimage.Mcn = Encoding.ASCII.GetString(data);
+
+                return true;
+            default:
+                ErrorMessage = $"Unsupported media tag {tag}";
+
+                return false;
+        }
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
+
+        if(trackStream == null)
+        {
+            ErrorMessage = $"Can't found file containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(track.BytesPerSector != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Invalid write mode for this sector";
+
+            return false;
+        }
+
+        if(data.Length != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        // cdrdao audio tracks are endian swapped corresponding to Aaru
+        if(track.Type == TrackType.Audio)
+        {
+            byte[] swapped = new byte[data.Length];
+
+            for(long i = 0; i < swapped.Length; i += 2)
             {
-                ErrorMessage = "Tried to write on a non-writable image";
+                swapped[i] = data[i + 1];
+                swapped[i           + 1] = data[i];
+            }
+
+            data = swapped;
+        }
+
+        trackStream.
+            Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
+                 SeekOrigin.Begin);
+
+        trackStream.Write(data, 0, data.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
+
+        if(trackStream == null)
+        {
+            ErrorMessage = $"Can't found file containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(track.BytesPerSector != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Invalid write mode for this sector";
+
+            return false;
+        }
+
+        if(sectorAddress + length > track.EndSector + 1)
+        {
+            ErrorMessage = "Can't cross tracks";
+
+            return false;
+        }
+
+        if(data.Length % track.RawBytesPerSector != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        // cdrdao audio tracks are endian swapped corresponding to Aaru
+        if(track.Type == TrackType.Audio)
+        {
+            byte[] swapped = new byte[data.Length];
+
+            for(long i = 0; i < swapped.Length; i += 2)
+            {
+                swapped[i] = data[i + 1];
+                swapped[i           + 1] = data[i];
+            }
+
+            data = swapped;
+        }
+
+        switch(track.SubchannelType)
+        {
+            case TrackSubchannelType.None:
+                trackStream.
+                    Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
+                         SeekOrigin.Begin);
+
+                trackStream.Write(data, 0, data.Length);
+
+                ErrorMessage = "";
+
+                return true;
+            case TrackSubchannelType.Raw:
+            case TrackSubchannelType.RawInterleaved:
+                trackStream.
+                    Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))),
+                         SeekOrigin.Begin);
+
+                for(uint i = 0; i < length; i++)
+                {
+                    trackStream.Write(data, (int)(i * track.RawBytesPerSector), track.RawBytesPerSector);
+                    trackStream.Position += 96;
+                }
+
+                ErrorMessage = "";
+
+                return true;
+            default:
+                ErrorMessage = "Invalid subchannel mode for this sector";
+
+                return false;
+        }
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
+
+        if(trackStream == null)
+        {
+            ErrorMessage = $"Can't found file containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(data.Length != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        // cdrdao audio tracks are endian swapped corresponding to Aaru
+        if(track.Type == TrackType.Audio)
+        {
+            byte[] swapped = new byte[data.Length];
+
+            for(long i = 0; i < swapped.Length; i += 2)
+            {
+                swapped[i] = data[i + 1];
+                swapped[i           + 1] = data[i];
+            }
+
+            data = swapped;
+        }
+
+        uint subchannelSize = (uint)(track.SubchannelType != TrackSubchannelType.None ? 96 : 0);
+
+        trackStream.
+            Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + subchannelSize))),
+                 SeekOrigin.Begin);
+
+        trackStream.Write(data, 0, data.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
+
+        if(trackStream == null)
+        {
+            ErrorMessage = $"Can't found file containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(sectorAddress + length > track.EndSector + 1)
+        {
+            ErrorMessage = "Can't cross tracks";
+
+            return false;
+        }
+
+        if(data.Length % track.RawBytesPerSector != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        // cdrdao audio tracks are endian swapped corresponding to Aaru
+        if(track.Type == TrackType.Audio)
+        {
+            byte[] swapped = new byte[data.Length];
+
+            for(long i = 0; i < swapped.Length; i += 2)
+            {
+                swapped[i] = data[i + 1];
+                swapped[i           + 1] = data[i];
+            }
+
+            data = swapped;
+        }
+
+        uint subchannelSize = (uint)(track.SubchannelType != TrackSubchannelType.None ? 96 : 0);
+
+        for(uint i = 0; i < length; i++)
+        {
+            trackStream.
+                Seek((long)(track.FileOffset + ((i + sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + subchannelSize))),
+                     SeekOrigin.Begin);
+
+            trackStream.Write(data, (int)(i * track.RawBytesPerSector), track.RawBytesPerSector);
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetTracks(List<Track> tracks)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(tracks       == null ||
+           tracks.Count == 0)
+        {
+            ErrorMessage = "Invalid tracks sent";
+
+            return false;
+        }
+
+        if(_writingTracks  != null &&
+           _writingStreams != null)
+            foreach(FileStream oldTrack in _writingStreams.Select(t => t.Value).Distinct())
+                oldTrack.Close();
+
+        ulong currentOffset = 0;
+        _writingTracks = new List<Track>();
+
+        foreach(Track track in tracks.OrderBy(t => t.Sequence))
+        {
+            if(track.SubchannelType == TrackSubchannelType.Q16 ||
+               track.SubchannelType == TrackSubchannelType.Q16Interleaved)
+            {
+                ErrorMessage = $"Unsupported subchannel type {track.SubchannelType} for track {track.Sequence}";
 
                 return false;
             }
 
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
+            Track newTrack = track;
 
-            if(track is null)
+            newTrack.File = _separateTracksWriting ? _writingBaseName + $"_track{track.Sequence:D2}.bin"
+                                : _writingBaseName                    + ".bin";
+
+            newTrack.FileOffset = _separateTracksWriting ? 0 : currentOffset;
+            _writingTracks.Add(newTrack);
+
+            currentOffset += (ulong)newTrack.RawBytesPerSector * (newTrack.EndSector - newTrack.StartSector + 1);
+
+            if(track.SubchannelType != TrackSubchannelType.None)
+                currentOffset += 96 * (newTrack.EndSector - newTrack.StartSector + 1);
+        }
+
+        _writingStreams = new Dictionary<uint, FileStream>();
+
+        if(_separateTracksWriting)
+            foreach(Track track in _writingTracks)
+                _writingStreams.Add(track.Sequence,
+                                    new FileStream(track.File, FileMode.OpenOrCreate, FileAccess.ReadWrite,
+                                                   FileShare.None));
+        else
+        {
+            var jointStream = new FileStream(_writingBaseName + ".bin", FileMode.OpenOrCreate, FileAccess.ReadWrite,
+                                             FileShare.None);
+
+            foreach(Track track in _writingTracks)
+                _writingStreams.Add(track.Sequence, jointStream);
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        if(_separateTracksWriting)
+            foreach(FileStream writingStream in _writingStreams.Values)
             {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
+                writingStream.Flush();
+                writingStream.Close();
+            }
+        else
+        {
+            _writingStreams.First().Value.Flush();
+            _writingStreams.First().Value.Close();
+        }
 
-                return false;
+        bool data = _writingTracks.Count(t => t.Type != TrackType.Audio) > 0;
+
+        bool mode2 = _writingTracks.Count(t => t.Type == TrackType.CdMode2Form1 ||
+                                               t.Type == TrackType.CdMode2Form2 ||
+                                               t.Type == TrackType.CdMode2Formless) > 0;
+
+        if(mode2)
+            _descriptorStream.WriteLine("CD_ROM_XA");
+        else if(data)
+            _descriptorStream.WriteLine("CD_ROM");
+        else
+            _descriptorStream.WriteLine("CD_DA");
+
+        if(!string.IsNullOrWhiteSpace(_discimage.Comment))
+        {
+            string[] commentLines = _discimage.Comment.Split(new[]
+            {
+                '\n'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            foreach(string line in commentLines)
+                _descriptorStream.WriteLine("// {0}", line);
+        }
+
+        _descriptorStream.WriteLine();
+
+        if(!string.IsNullOrEmpty(_discimage.Mcn))
+            _descriptorStream.WriteLine("CATALOG {0}", _discimage.Mcn);
+
+        foreach(Track track in _writingTracks)
+        {
+            _descriptorStream.WriteLine();
+            _descriptorStream.WriteLine("// Track {0}", track.Sequence);
+
+            string subchannelType;
+
+            switch(track.SubchannelType)
+            {
+                case TrackSubchannelType.Packed:
+                case TrackSubchannelType.PackedInterleaved:
+                    subchannelType = " RW";
+
+                    break;
+                case TrackSubchannelType.Raw:
+                case TrackSubchannelType.RawInterleaved:
+                    subchannelType = " RW_RAW";
+
+                    break;
+                default:
+                    subchannelType = "";
+
+                    break;
             }
 
-            switch(tag)
+            _descriptorStream.WriteLine("TRACK {0}{1}", GetTrackMode(track), subchannelType);
+
+            _trackFlags.TryGetValue((byte)track.Sequence, out byte flagsByte);
+
+            var flags = (CdFlags)flagsByte;
+
+            _descriptorStream.WriteLine("{0}COPY", flags.HasFlag(CdFlags.CopyPermitted) ? "" : "NO ");
+
+            if(track.Type == TrackType.Audio)
             {
-                case SectorTagType.CdTrackFlags:
+                _descriptorStream.WriteLine("{0}PRE_EMPHASIS", flags.HasFlag(CdFlags.PreEmphasis) ? "" : "NO ");
+
+                _descriptorStream.WriteLine("{0}_CHANNEL_AUDIO",
+                                            flags.HasFlag(CdFlags.FourChannel) ? "FOUR" : "TWO");
+            }
+
+            if(_trackIsrcs.TryGetValue((byte)track.Sequence, out string isrc) &&
+               !string.IsNullOrWhiteSpace(isrc))
+                _descriptorStream.WriteLine("ISRC {0}", isrc);
+
+            (byte minute, byte second, byte frame) msf = LbaToMsf(track.EndSector - track.StartSector + 1);
+
+            _descriptorStream.WriteLine("DATAFILE \"{0}\" #{1} {2:D2}:{3:D2}:{4:D2} // length in bytes: {5}",
+                                        Path.GetFileName(track.File), track.FileOffset, msf.minute, msf.second,
+                                        msf.frame,
+                                        (track.EndSector - track.StartSector + 1) *
+                                        (ulong)(track.RawBytesPerSector +
+                                                (track.SubchannelType != TrackSubchannelType.None ? 96 : 0)));
+
+            foreach(KeyValuePair<ushort, int> index in track.Indexes.OrderBy(i => i.Key).Where(i => i.Key > 1))
+            {
+                msf = LbaToMsf((ulong)index.Value - (track.Pregap + track.StartSector));
+
+                _descriptorStream.WriteLine("INDEX {0:D2}:{1:D2}:{2:D2}", msf.minute, msf.second, msf.frame);
+            }
+
+            _descriptorStream.WriteLine();
+        }
+
+        _descriptorStream.Flush();
+        _descriptorStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata)
+    {
+        _discimage.Barcode = metadata.MediaBarcode;
+        _discimage.Comment = metadata.Comments;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        switch(tag)
+        {
+            case SectorTagType.CdTrackFlags:
+            {
+                if(data.Length != 1)
                 {
-                    if(data.Length != 1)
-                    {
-                        ErrorMessage = "Incorrect data size for track flags";
+                    ErrorMessage = "Incorrect data size for track flags";
 
-                        return false;
-                    }
-
-                    _trackFlags[(byte)sectorAddress] = data[0];
-
-                    return true;
+                    return false;
                 }
-                case SectorTagType.CdTrackIsrc:
-                {
-                    if(data != null)
-                        _trackIsrcs[(byte)sectorAddress] = Encoding.UTF8.GetString(data);
 
-                    return true;
+                _trackFlags[(byte)sectorAddress] = data[0];
+
+                return true;
+            }
+            case SectorTagType.CdTrackIsrc:
+            {
+                if(data != null)
+                    _trackIsrcs[(byte)sectorAddress] = Encoding.UTF8.GetString(data);
+
+                return true;
+            }
+            case SectorTagType.CdSectorSubchannel:
+            {
+                if(track.SubchannelType == 0)
+                {
+                    ErrorMessage =
+                        $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
+
+                    return false;
                 }
-                case SectorTagType.CdSectorSubchannel:
+
+                if(data.Length != 96)
                 {
-                    if(track.SubchannelType == 0)
-                    {
-                        ErrorMessage =
-                            $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
+                    ErrorMessage = "Incorrect data size for subchannel";
 
-                        return false;
-                    }
+                    return false;
+                }
 
-                    if(data.Length != 96)
-                    {
-                        ErrorMessage = "Incorrect data size for subchannel";
+                FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
 
-                        return false;
-                    }
+                if(trackStream == null)
+                {
+                    ErrorMessage = $"Can't found file containing {sectorAddress}";
 
-                    FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
+                    return false;
+                }
 
-                    if(trackStream == null)
-                    {
-                        ErrorMessage = $"Can't found file containing {sectorAddress}";
+                trackStream.
+                    Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))) + track.RawBytesPerSector,
+                         SeekOrigin.Begin);
 
-                        return false;
-                    }
+                trackStream.Write(data, 0, data.Length);
 
+                return true;
+            }
+            default:
+                ErrorMessage = $"Unsupported tag type {tag}";
+
+                return false;
+        }
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        switch(tag)
+        {
+            case SectorTagType.CdTrackFlags:
+            case SectorTagType.CdTrackIsrc: return WriteSectorTag(data, sectorAddress, tag);
+            case SectorTagType.CdSectorSubchannel:
+            {
+                if(track.SubchannelType == 0)
+                {
+                    ErrorMessage =
+                        $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
+
+                    return false;
+                }
+
+                if(data.Length % 96 != 0)
+                {
+                    ErrorMessage = "Incorrect data size for subchannel";
+
+                    return false;
+                }
+
+                FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
+
+                if(trackStream == null)
+                {
+                    ErrorMessage = $"Can't found file containing {sectorAddress}";
+
+                    return false;
+                }
+
+                for(uint i = 0; i < length; i++)
+                {
                     trackStream.
-                        Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))) + track.RawBytesPerSector,
+                        Seek((long)(track.FileOffset + ((i + sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))) + track.RawBytesPerSector,
                              SeekOrigin.Begin);
 
-                    trackStream.Write(data, 0, data.Length);
-
-                    return true;
+                    trackStream.Write(data, (int)(i * 96), 96);
                 }
-                default:
-                    ErrorMessage = $"Unsupported tag type {tag}";
 
-                    return false;
+                return true;
             }
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+            default:
+                ErrorMessage = $"Unsupported tag type {tag}";
 
                 return false;
-            }
-
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            switch(tag)
-            {
-                case SectorTagType.CdTrackFlags:
-                case SectorTagType.CdTrackIsrc: return WriteSectorTag(data, sectorAddress, tag);
-                case SectorTagType.CdSectorSubchannel:
-                {
-                    if(track.SubchannelType == 0)
-                    {
-                        ErrorMessage =
-                            $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
-
-                        return false;
-                    }
-
-                    if(data.Length % 96 != 0)
-                    {
-                        ErrorMessage = "Incorrect data size for subchannel";
-
-                        return false;
-                    }
-
-                    FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
-
-                    if(trackStream == null)
-                    {
-                        ErrorMessage = $"Can't found file containing {sectorAddress}";
-
-                        return false;
-                    }
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        trackStream.
-                            Seek((long)(track.FileOffset + ((i + sectorAddress - track.StartSector) * (ulong)(track.RawBytesPerSector + 96))) + track.RawBytesPerSector,
-                                 SeekOrigin.Begin);
-
-                        trackStream.Write(data, (int)(i * 96), 96);
-                    }
-
-                    return true;
-                }
-                default:
-                    ErrorMessage = $"Unsupported tag type {tag}";
-
-                    return false;
-            }
         }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
     }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRWin/CDRWin.cs b/Aaru.Images/CDRWin/CDRWin.cs
index 19e7c096d..363621174 100644
--- a/Aaru.Images/CDRWin/CDRWin.cs
+++ b/Aaru.Images/CDRWin/CDRWin.cs
@@ -37,50 +37,49 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Decoders.CD;
 
-namespace Aaru.DiscImages
-{
-    // TODO: Implement track flags
-    /// <summary>Implements reading and writing CDRWin cuesheet disc images</summary>
-    public sealed partial class CdrWin : IWritableOpticalImage, IVerifiableImage
-    {
-        IFilter      _cdrwinFilter;
-        StreamReader _cueStream;
-        StreamWriter _descriptorStream;
-        CdrWinDisc   _discImage;
-        ImageInfo    _imageInfo;
-        Stream       _imageStream;
-        bool         _isCd;
-        uint         _lostPregap;
-        bool         _negativeEnd;
-        /// <summary>Dictionary, index is track #, value is File</summary>
-        Dictionary<uint, ulong> _offsetMap;
-        SectorBuilder                _sectorBuilder;
-        bool                         _separateTracksWriting;
-        Dictionary<byte, byte>       _trackFlags;
-        Dictionary<byte, string>     _trackIsrcs;
-        string                       _writingBaseName;
-        Dictionary<uint, FileStream> _writingStreams;
-        List<Track>                  _writingTracks;
+namespace Aaru.DiscImages;
 
-        public CdrWin() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = true,
-            HasSessions           = true,
-            Version               = null,
-            ApplicationVersion    = null,
-            MediaTitle            = null,
-            Creator               = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: Implement track flags
+/// <summary>Implements reading and writing CDRWin cuesheet disc images</summary>
+public sealed partial class CdrWin : IWritableOpticalImage, IVerifiableImage
+{
+    IFilter      _cdrwinFilter;
+    StreamReader _cueStream;
+    StreamWriter _descriptorStream;
+    CdrWinDisc   _discImage;
+    ImageInfo    _imageInfo;
+    Stream       _imageStream;
+    bool         _isCd;
+    uint         _lostPregap;
+    bool         _negativeEnd;
+    /// <summary>Dictionary, index is track #, value is File</summary>
+    Dictionary<uint, ulong> _offsetMap;
+    SectorBuilder                _sectorBuilder;
+    bool                         _separateTracksWriting;
+    Dictionary<byte, byte>       _trackFlags;
+    Dictionary<byte, string>     _trackIsrcs;
+    string                       _writingBaseName;
+    Dictionary<uint, FileStream> _writingStreams;
+    List<Track>                  _writingTracks;
+
+    public CdrWin() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = true,
+        HasSessions           = true,
+        Version               = null,
+        ApplicationVersion    = null,
+        MediaTitle            = null,
+        Creator               = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRWin/Constants.cs b/Aaru.Images/CDRWin/Constants.cs
index 1b7d22bf9..cdc84d32b 100644
--- a/Aaru.Images/CDRWin/Constants.cs
+++ b/Aaru.Images/CDRWin/Constants.cs
@@ -30,156 +30,155 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CdrWin
 {
-    public sealed partial class CdrWin
-    {
-        // Type for FILE entity
-        /// <summary>Data as-is in little-endian</summary>
-        const string CDRWIN_DISK_TYPE_LITTLE_ENDIAN = "BINARY";
-        /// <summary>Data as-is in big-endian</summary>
-        const string CDRWIN_DISK_TYPE_BIG_ENDIAN = "MOTOROLA";
-        /// <summary>Audio in Apple AIF file</summary>
-        const string CDRWIN_DISK_TYPE_AIFF = "AIFF";
-        /// <summary>Audio in Microsoft WAV file</summary>
-        const string CDRWIN_DISK_TYPE_RIFF = "WAVE";
-        /// <summary>Audio in MP3 file</summary>
-        const string CDRWIN_DISK_TYPE_MP3 = "MP3";
+    // Type for FILE entity
+    /// <summary>Data as-is in little-endian</summary>
+    const string CDRWIN_DISK_TYPE_LITTLE_ENDIAN = "BINARY";
+    /// <summary>Data as-is in big-endian</summary>
+    const string CDRWIN_DISK_TYPE_BIG_ENDIAN = "MOTOROLA";
+    /// <summary>Audio in Apple AIF file</summary>
+    const string CDRWIN_DISK_TYPE_AIFF = "AIFF";
+    /// <summary>Audio in Microsoft WAV file</summary>
+    const string CDRWIN_DISK_TYPE_RIFF = "WAVE";
+    /// <summary>Audio in MP3 file</summary>
+    const string CDRWIN_DISK_TYPE_MP3 = "MP3";
 
-        // Type for TRACK entity
-        /// <summary>Audio track, 2352 bytes/sector</summary>
-        const string CDRWIN_TRACK_TYPE_AUDIO = "AUDIO";
-        /// <summary>CD+G track, 2448 bytes/sector (audio+subchannel)</summary>
-        const string CDRWIN_TRACK_TYPE_CDG = "CDG";
-        /// <summary>Mode 1 track, cooked, 2048 bytes/sector</summary>
-        const string CDRWIN_TRACK_TYPE_MODE1 = "MODE1/2048";
-        /// <summary>Mode 1 track, raw, 2352 bytes/sector</summary>
-        const string CDRWIN_TRACK_TYPE_MODE1_RAW = "MODE1/2352";
-        /// <summary>Mode 2 form 1 track, cooked, 2048 bytes/sector</summary>
-        const string CDRWIN_TRACK_TYPE_MODE2_FORM1 = "MODE2/2048";
-        /// <summary>Mode 2 form 2 track, cooked, 2324 bytes/sector</summary>
-        const string CDRWIN_TRACK_TYPE_MODE2_FORM2 = "MODE2/2324";
-        /// <summary>Mode 2 formless track, cooked, 2336 bytes/sector</summary>
-        const string CDRWIN_TRACK_TYPE_MODE2_FORMLESS = "MODE2/2336";
-        /// <summary>Mode 2 track, raw, 2352 bytes/sector</summary>
-        const string CDRWIN_TRACK_TYPE_MODE2_RAW = "MODE2/2352";
-        /// <summary>CD-i track, cooked, 2336 bytes/sector</summary>
-        const string CDRWIN_TRACK_TYPE_CDI = "CDI/2336";
-        /// <summary>CD-i track, raw, 2352 bytes/sector</summary>
-        const string CDRWIN_TRACK_TYPE_CDI_RAW = "CDI/2352";
+    // Type for TRACK entity
+    /// <summary>Audio track, 2352 bytes/sector</summary>
+    const string CDRWIN_TRACK_TYPE_AUDIO = "AUDIO";
+    /// <summary>CD+G track, 2448 bytes/sector (audio+subchannel)</summary>
+    const string CDRWIN_TRACK_TYPE_CDG = "CDG";
+    /// <summary>Mode 1 track, cooked, 2048 bytes/sector</summary>
+    const string CDRWIN_TRACK_TYPE_MODE1 = "MODE1/2048";
+    /// <summary>Mode 1 track, raw, 2352 bytes/sector</summary>
+    const string CDRWIN_TRACK_TYPE_MODE1_RAW = "MODE1/2352";
+    /// <summary>Mode 2 form 1 track, cooked, 2048 bytes/sector</summary>
+    const string CDRWIN_TRACK_TYPE_MODE2_FORM1 = "MODE2/2048";
+    /// <summary>Mode 2 form 2 track, cooked, 2324 bytes/sector</summary>
+    const string CDRWIN_TRACK_TYPE_MODE2_FORM2 = "MODE2/2324";
+    /// <summary>Mode 2 formless track, cooked, 2336 bytes/sector</summary>
+    const string CDRWIN_TRACK_TYPE_MODE2_FORMLESS = "MODE2/2336";
+    /// <summary>Mode 2 track, raw, 2352 bytes/sector</summary>
+    const string CDRWIN_TRACK_TYPE_MODE2_RAW = "MODE2/2352";
+    /// <summary>CD-i track, cooked, 2336 bytes/sector</summary>
+    const string CDRWIN_TRACK_TYPE_CDI = "CDI/2336";
+    /// <summary>CD-i track, raw, 2352 bytes/sector</summary>
+    const string CDRWIN_TRACK_TYPE_CDI_RAW = "CDI/2352";
 
-        // Type for REM ORIGINAL MEDIA-TYPE entity
-        /// <summary>DiskType.CD</summary>
-        const string CDRWIN_DISK_TYPE_CD = "CD";
-        /// <summary>DiskType.CDRW</summary>
-        const string CDRWIN_DISK_TYPE_CDRW = "CD-RW";
-        /// <summary>DiskType.CDMRW</summary>
-        const string CDRWIN_DISK_TYPE_CDMRW = "CD-MRW";
-        /// <summary>DiskType.CDMRW</summary>
-        const string CDRWIN_DISK_TYPE_CDMRW2 = "CD-(MRW)";
-        /// <summary>DiskType.DVDROM</summary>
-        const string CDRWIN_DISK_TYPE_DVD = "DVD";
-        /// <summary>DiskType.DVDPRW</summary>
-        const string CDRWIN_DISK_TYPE_DVDPMRW = "DVD+MRW";
-        /// <summary>DiskType.DVDPRW</summary>
-        const string CDRWIN_DISK_TYPE_DVDPMRW2 = "DVD+(MRW)";
-        /// <summary>DiskType.DVDPRWDL</summary>
-        const string CDRWIN_DISK_TYPE_DVDPMRWDL = "DVD+MRW DL";
-        /// <summary>DiskType.DVDPRWDL</summary>
-        const string CDRWIN_DISK_TYPE_DVDPMRWDL2 = "DVD+(MRW) DL";
-        /// <summary>DiskType.DVDPR</summary>
-        const string CDRWIN_DISK_TYPE_DVDPR = "DVD+R";
-        /// <summary>DiskType.DVDPRDL</summary>
-        const string CDRWIN_DISK_TYPE_DVDPRDL = "DVD+R DL";
-        /// <summary>DiskType.DVDPRW</summary>
-        const string CDRWIN_DISK_TYPE_DVDPRW = "DVD+RW";
-        /// <summary>DiskType.DVDPRWDL</summary>
-        const string CDRWIN_DISK_TYPE_DVDPRWDL = "DVD+RW DL";
-        /// <summary>DiskType.DVDPR</summary>
-        const string CDRWIN_DISK_TYPE_DVDPVR = "DVD+VR";
-        /// <summary>DiskType.DVDRAM</summary>
-        const string CDRWIN_DISK_TYPE_DVDRAM = "DVD-RAM";
-        /// <summary>DiskType.DVDR</summary>
-        const string CDRWIN_DISK_TYPE_DVDR = "DVD-R";
-        /// <summary>DiskType.DVDRDL</summary>
-        const string CDRWIN_DISK_TYPE_DVDRDL = "DVD-R DL";
-        /// <summary>DiskType.DVDRW</summary>
-        const string CDRWIN_DISK_TYPE_DVDRW = "DVD-RW";
-        /// <summary>DiskType.DVDRWDL</summary>
-        const string CDRWIN_DISK_TYPE_DVDRWDL = "DVD-RW DL";
-        /// <summary>DiskType.DVDR</summary>
-        const string CDRWIN_DISK_TYPE_DVDVR = "DVD-VR";
-        /// <summary>DiskType.DVDRW</summary>
-        const string CDRWIN_DISK_TYPE_DVDRW2 = "DVDRW";
-        /// <summary>DiskType.HDDVDROM</summary>
-        const string CDRWIN_DISK_TYPE_HDDVD = "HD DVD";
-        /// <summary>DiskType.HDDVDRAM</summary>
-        const string CDRWIN_DISK_TYPE_HDDVDRAM = "HD DVD-RAM";
-        /// <summary>DiskType.HDDVDR</summary>
-        const string CDRWIN_DISK_TYPE_HDDVDR = "HD DVD-R";
-        /// <summary>DiskType.HDDVDR</summary>
-        const string CDRWIN_DISK_TYPE_HDDVDRDL = "HD DVD-R DL";
-        /// <summary>DiskType.HDDVDRW</summary>
-        const string CDRWIN_DISK_TYPE_HDDVDRW = "HD DVD-RW";
-        /// <summary>DiskType.HDDVDRW</summary>
-        const string CDRWIN_DISK_TYPE_HDDVDRWDL = "HD DVD-RW DL";
-        /// <summary>DiskType.BDROM</summary>
-        const string CDRWIN_DISK_TYPE_BD = "BD";
-        /// <summary>DiskType.BDR</summary>
-        const string CDRWIN_DISK_TYPE_BDR = "BD-R";
-        /// <summary>DiskType.BDRE</summary>
-        const string CDRWIN_DISK_TYPE_BDRE = "BD-RE";
-        /// <summary>DiskType.BDR</summary>
-        const string CDRWIN_DISK_TYPE_BDRDL = "BD-R DL";
-        /// <summary>DiskType.BDRE</summary>
-        const string CDRWIN_DISK_TYPE_BDREDL = "BD-RE DL";
+    // Type for REM ORIGINAL MEDIA-TYPE entity
+    /// <summary>DiskType.CD</summary>
+    const string CDRWIN_DISK_TYPE_CD = "CD";
+    /// <summary>DiskType.CDRW</summary>
+    const string CDRWIN_DISK_TYPE_CDRW = "CD-RW";
+    /// <summary>DiskType.CDMRW</summary>
+    const string CDRWIN_DISK_TYPE_CDMRW = "CD-MRW";
+    /// <summary>DiskType.CDMRW</summary>
+    const string CDRWIN_DISK_TYPE_CDMRW2 = "CD-(MRW)";
+    /// <summary>DiskType.DVDROM</summary>
+    const string CDRWIN_DISK_TYPE_DVD = "DVD";
+    /// <summary>DiskType.DVDPRW</summary>
+    const string CDRWIN_DISK_TYPE_DVDPMRW = "DVD+MRW";
+    /// <summary>DiskType.DVDPRW</summary>
+    const string CDRWIN_DISK_TYPE_DVDPMRW2 = "DVD+(MRW)";
+    /// <summary>DiskType.DVDPRWDL</summary>
+    const string CDRWIN_DISK_TYPE_DVDPMRWDL = "DVD+MRW DL";
+    /// <summary>DiskType.DVDPRWDL</summary>
+    const string CDRWIN_DISK_TYPE_DVDPMRWDL2 = "DVD+(MRW) DL";
+    /// <summary>DiskType.DVDPR</summary>
+    const string CDRWIN_DISK_TYPE_DVDPR = "DVD+R";
+    /// <summary>DiskType.DVDPRDL</summary>
+    const string CDRWIN_DISK_TYPE_DVDPRDL = "DVD+R DL";
+    /// <summary>DiskType.DVDPRW</summary>
+    const string CDRWIN_DISK_TYPE_DVDPRW = "DVD+RW";
+    /// <summary>DiskType.DVDPRWDL</summary>
+    const string CDRWIN_DISK_TYPE_DVDPRWDL = "DVD+RW DL";
+    /// <summary>DiskType.DVDPR</summary>
+    const string CDRWIN_DISK_TYPE_DVDPVR = "DVD+VR";
+    /// <summary>DiskType.DVDRAM</summary>
+    const string CDRWIN_DISK_TYPE_DVDRAM = "DVD-RAM";
+    /// <summary>DiskType.DVDR</summary>
+    const string CDRWIN_DISK_TYPE_DVDR = "DVD-R";
+    /// <summary>DiskType.DVDRDL</summary>
+    const string CDRWIN_DISK_TYPE_DVDRDL = "DVD-R DL";
+    /// <summary>DiskType.DVDRW</summary>
+    const string CDRWIN_DISK_TYPE_DVDRW = "DVD-RW";
+    /// <summary>DiskType.DVDRWDL</summary>
+    const string CDRWIN_DISK_TYPE_DVDRWDL = "DVD-RW DL";
+    /// <summary>DiskType.DVDR</summary>
+    const string CDRWIN_DISK_TYPE_DVDVR = "DVD-VR";
+    /// <summary>DiskType.DVDRW</summary>
+    const string CDRWIN_DISK_TYPE_DVDRW2 = "DVDRW";
+    /// <summary>DiskType.HDDVDROM</summary>
+    const string CDRWIN_DISK_TYPE_HDDVD = "HD DVD";
+    /// <summary>DiskType.HDDVDRAM</summary>
+    const string CDRWIN_DISK_TYPE_HDDVDRAM = "HD DVD-RAM";
+    /// <summary>DiskType.HDDVDR</summary>
+    const string CDRWIN_DISK_TYPE_HDDVDR = "HD DVD-R";
+    /// <summary>DiskType.HDDVDR</summary>
+    const string CDRWIN_DISK_TYPE_HDDVDRDL = "HD DVD-R DL";
+    /// <summary>DiskType.HDDVDRW</summary>
+    const string CDRWIN_DISK_TYPE_HDDVDRW = "HD DVD-RW";
+    /// <summary>DiskType.HDDVDRW</summary>
+    const string CDRWIN_DISK_TYPE_HDDVDRWDL = "HD DVD-RW DL";
+    /// <summary>DiskType.BDROM</summary>
+    const string CDRWIN_DISK_TYPE_BD = "BD";
+    /// <summary>DiskType.BDR</summary>
+    const string CDRWIN_DISK_TYPE_BDR = "BD-R";
+    /// <summary>DiskType.BDRE</summary>
+    const string CDRWIN_DISK_TYPE_BDRE = "BD-RE";
+    /// <summary>DiskType.BDR</summary>
+    const string CDRWIN_DISK_TYPE_BDRDL = "BD-R DL";
+    /// <summary>DiskType.BDRE</summary>
+    const string CDRWIN_DISK_TYPE_BDREDL = "BD-RE DL";
 
-        const string REGEX_SESSION    = @"\bREM\s+SESSION\s+(?<number>\d+).*$";
-        const string REGEX_MEDIA_TYPE = @"\bREM\s+ORIGINAL MEDIA-TYPE:\s+(?<mediatype>.+)$";
-        const string REGEX_LEAD_OUT   = @"\bREM\s+LEAD-OUT\s+(?<msf>[\d]+:[\d]+:[\d]+).*$";
+    const string REGEX_SESSION    = @"\bREM\s+SESSION\s+(?<number>\d+).*$";
+    const string REGEX_MEDIA_TYPE = @"\bREM\s+ORIGINAL MEDIA-TYPE:\s+(?<mediatype>.+)$";
+    const string REGEX_LEAD_OUT   = @"\bREM\s+LEAD-OUT\s+(?<msf>[\d]+:[\d]+:[\d]+).*$";
 
-        // Not checked
-        const string REGEX_LBA        = @"\bREM MSF:\s+(?<msf>[\d]+:[\d]+:[\d]+)\s+=\s+LBA:\s+(?<lba>[\d]+)$";
-        const string REGEX_DISC_ID    = @"\bDISC_ID\s+(?<diskid>[\da-f]{8})$";
-        const string REGEX_BARCODE    = @"\bUPC_EAN\s+(?<barcode>[\d]{12,13})$";
-        const string REGEX_COMMENT    = @"\bREM\s+(?<comment>.+)$";
-        const string REGEX_CDTEXT     = @"\bCDTEXTFILE\s+(?<filename>.+)$";
-        const string REGEX_MCN        = @"^\s*CATALOG\s*(?<catalog>[\x21-\x7F]{13})$";
-        const string REGEX_TITLE      = @"\bTITLE\s+(?<title>.+)$";
-        const string REGEX_GENRE      = @"\bGENRE\s+(?<genre>.+)$";
-        const string REGEX_ARRANGER   = @"\bARRANGER\s+(?<arranger>.+)$";
-        const string REGEX_COMPOSER   = @"\bCOMPOSER\s+(?<composer>.+)$";
-        const string REGEX_PERFORMER  = @"\bPERFORMER\s+(?<performer>.+)$";
-        const string REGEX_SONGWRITER = @"\bSONGWRITER\s+(?<songwriter>.+)$";
-        const string REGEX_FILE       = @"\bFILE\s+(?<filename>.+)\s+(?<type>\S+)$";
-        const string REGEX_TRACK      = @"\bTRACK\s+(?<number>\d+)\s+(?<type>\S+)$";
-        const string REGEX_ISRC       = @"\bISRC\s+(?<isrc>\w{12})$";
-        const string REGEX_INDEX      = @"\bINDEX\s+(?<index>\d+)\s+(?<msf>[\d]+:[\d]+:[\d]+)$";
-        const string REGEX_PREGAP     = @"\bPREGAP\s+(?<msf>[\d]+:[\d]+:[\d]+)$";
-        const string REGEX_POSTGAP    = @"\bPOSTGAP\s+(?<msf>[\d]+:[\d]+:[\d]+)$";
-        const string REGEX_FLAGS      = @"\bFLAGS\s+(((?<dcp>DCP)|(?<quad>4CH)|(?<pre>PRE)|(?<scms>SCMS))\s*)+$";
+    // Not checked
+    const string REGEX_LBA        = @"\bREM MSF:\s+(?<msf>[\d]+:[\d]+:[\d]+)\s+=\s+LBA:\s+(?<lba>[\d]+)$";
+    const string REGEX_DISC_ID    = @"\bDISC_ID\s+(?<diskid>[\da-f]{8})$";
+    const string REGEX_BARCODE    = @"\bUPC_EAN\s+(?<barcode>[\d]{12,13})$";
+    const string REGEX_COMMENT    = @"\bREM\s+(?<comment>.+)$";
+    const string REGEX_CDTEXT     = @"\bCDTEXTFILE\s+(?<filename>.+)$";
+    const string REGEX_MCN        = @"^\s*CATALOG\s*(?<catalog>[\x21-\x7F]{13})$";
+    const string REGEX_TITLE      = @"\bTITLE\s+(?<title>.+)$";
+    const string REGEX_GENRE      = @"\bGENRE\s+(?<genre>.+)$";
+    const string REGEX_ARRANGER   = @"\bARRANGER\s+(?<arranger>.+)$";
+    const string REGEX_COMPOSER   = @"\bCOMPOSER\s+(?<composer>.+)$";
+    const string REGEX_PERFORMER  = @"\bPERFORMER\s+(?<performer>.+)$";
+    const string REGEX_SONGWRITER = @"\bSONGWRITER\s+(?<songwriter>.+)$";
+    const string REGEX_FILE       = @"\bFILE\s+(?<filename>.+)\s+(?<type>\S+)$";
+    const string REGEX_TRACK      = @"\bTRACK\s+(?<number>\d+)\s+(?<type>\S+)$";
+    const string REGEX_ISRC       = @"\bISRC\s+(?<isrc>\w{12})$";
+    const string REGEX_INDEX      = @"\bINDEX\s+(?<index>\d+)\s+(?<msf>[\d]+:[\d]+:[\d]+)$";
+    const string REGEX_PREGAP     = @"\bPREGAP\s+(?<msf>[\d]+:[\d]+:[\d]+)$";
+    const string REGEX_POSTGAP    = @"\bPOSTGAP\s+(?<msf>[\d]+:[\d]+:[\d]+)$";
+    const string REGEX_FLAGS      = @"\bFLAGS\s+(((?<dcp>DCP)|(?<quad>4CH)|(?<pre>PRE)|(?<scms>SCMS))\s*)+$";
 
-        // Trurip extensions
-        const string REGEX_APPLICATION        = @"\bREM\s+Ripping Tool:\s+(?<application>.+)$";
-        const string REGEX_TRURIP_DISC_HASHES = @"\bREM\s+DISC\s+HASHES$";
-        const string REGEX_TRURIP_DISC_CRC32  = @"\bREM\s+CRC32\s+:\s+(?<hash>[\da-f]{8})$";
-        const string REGEX_TRURIP_DISC_MD5    = @"\bREM\s+MD5\s+:\s+(?<hash>[\da-f]{32})$";
-        const string REGEX_TRURIP_DISC_SHA1   = @"\bREM\s+SHA1\s+:\s+(?<hash>[\da-f]{40})$";
-        const string REGEX_TRURIP_TRACK_METHOD =
-            @"\bREM\s+Gap\s+Append\s+Method:\s+(?<method>Prev|None|Next)\s+\[(?<hash>\w+)\]$";
-        const string REGEX_TRURIP_TRACK_CRC32   = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{8}$";
-        const string REGEX_TRURIP_TRACK_MD5     = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{32}$";
-        const string REGEX_TRURIP_TRACK_SHA1    = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{40}$";
-        const string REGEX_TRURIP_TRACK_UNKNOWN = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{8,}$";
+    // Trurip extensions
+    const string REGEX_APPLICATION        = @"\bREM\s+Ripping Tool:\s+(?<application>.+)$";
+    const string REGEX_TRURIP_DISC_HASHES = @"\bREM\s+DISC\s+HASHES$";
+    const string REGEX_TRURIP_DISC_CRC32  = @"\bREM\s+CRC32\s+:\s+(?<hash>[\da-f]{8})$";
+    const string REGEX_TRURIP_DISC_MD5    = @"\bREM\s+MD5\s+:\s+(?<hash>[\da-f]{32})$";
+    const string REGEX_TRURIP_DISC_SHA1   = @"\bREM\s+SHA1\s+:\s+(?<hash>[\da-f]{40})$";
+    const string REGEX_TRURIP_TRACK_METHOD =
+        @"\bREM\s+Gap\s+Append\s+Method:\s+(?<method>Prev|None|Next)\s+\[(?<hash>\w+)\]$";
+    const string REGEX_TRURIP_TRACK_CRC32   = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{8}$";
+    const string REGEX_TRURIP_TRACK_MD5     = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{32}$";
+    const string REGEX_TRURIP_TRACK_SHA1    = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{40}$";
+    const string REGEX_TRURIP_TRACK_UNKNOWN = @"\bREM\s+(Gap|Trk)\s+(?<number>\d{2}):\s+[\da-f]{8,}$";
 
-        // Redump.org extensions
-        const string REGEX_REDUMP_SD_AREA = @"\bREM\s+SINGLE-DENSITY\s+AREA$";
-        const string REGEX_REDUMP_HD_AREA = @"\bREM\s+HIGH-DENSITY\s+AREA$";
+    // Redump.org extensions
+    const string REGEX_REDUMP_SD_AREA = @"\bREM\s+SINGLE-DENSITY\s+AREA$";
+    const string REGEX_REDUMP_HD_AREA = @"\bREM\s+HIGH-DENSITY\s+AREA$";
 
-        const string REGEX_DIC_MEDIA_TYPE      = @"\bREM\s+METADATA DIC MEDIA-TYPE:\s+(?<mediatype>.+)$";
-        const string REGEX_AARU_MEDIA_TYPE     = @"\bREM\s+METADATA AARU MEDIA-TYPE:\s+(?<mediatype>.+)$";
-        const string REGEX_APPLICATION_VERSION = @"\bREM\s+Ripping Tool Version:\s+(?<application>.+)$";
-        const string REGEX_DUMP_EXTENT =
-            @"\bREM\s+METADATA DUMP EXTENT:\s+(?<application>.+)\s+\|\s+(?<version>.+)\s+\|\s+(?<os>.+)\s+\|\s+(?<manufacturer>.+)\s+\|\s+(?<model>.+)\s+\|\s+(?<firmware>.+)\s+\|\s+(?<serial>.+)\s+\|\s+(?<start>\d+):(?<end>\d+)$";
-    }
+    const string REGEX_DIC_MEDIA_TYPE      = @"\bREM\s+METADATA DIC MEDIA-TYPE:\s+(?<mediatype>.+)$";
+    const string REGEX_AARU_MEDIA_TYPE     = @"\bREM\s+METADATA AARU MEDIA-TYPE:\s+(?<mediatype>.+)$";
+    const string REGEX_APPLICATION_VERSION = @"\bREM\s+Ripping Tool Version:\s+(?<application>.+)$";
+    const string REGEX_DUMP_EXTENT =
+        @"\bREM\s+METADATA DUMP EXTENT:\s+(?<application>.+)\s+\|\s+(?<version>.+)\s+\|\s+(?<os>.+)\s+\|\s+(?<manufacturer>.+)\s+\|\s+(?<model>.+)\s+\|\s+(?<firmware>.+)\s+\|\s+(?<serial>.+)\s+\|\s+(?<start>\d+):(?<end>\d+)$";
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRWin/Helpers.cs b/Aaru.Images/CDRWin/Helpers.cs
index bd5923518..cdd071552 100644
--- a/Aaru.Images/CDRWin/Helpers.cs
+++ b/Aaru.Images/CDRWin/Helpers.cs
@@ -34,209 +34,208 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CdrWin
 {
-    public sealed partial class CdrWin
+    static int CdrWinMsfToLba(string msf)
     {
-        static int CdrWinMsfToLba(string msf)
+        string[] msfElements = msf.Split(':');
+        int      minute      = int.Parse(msfElements[0]);
+        int      second      = int.Parse(msfElements[1]);
+        int      frame       = int.Parse(msfElements[2]);
+
+        int sectors = (minute * 60 * 75) + (second * 75) + frame;
+
+        return sectors;
+    }
+
+    static ushort CdrWinTrackTypeToBytesPerSector(string trackType)
+    {
+        switch(trackType)
         {
-            string[] msfElements = msf.Split(':');
-            int      minute      = int.Parse(msfElements[0]);
-            int      second      = int.Parse(msfElements[1]);
-            int      frame       = int.Parse(msfElements[2]);
-
-            int sectors = (minute * 60 * 75) + (second * 75) + frame;
-
-            return sectors;
+            case CDRWIN_TRACK_TYPE_MODE1:
+            case CDRWIN_TRACK_TYPE_MODE2_FORM1: return 2048;
+            case CDRWIN_TRACK_TYPE_MODE2_FORM2: return 2324;
+            case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
+            case CDRWIN_TRACK_TYPE_CDI: return 2336;
+            case CDRWIN_TRACK_TYPE_AUDIO:
+            case CDRWIN_TRACK_TYPE_MODE1_RAW:
+            case CDRWIN_TRACK_TYPE_MODE2_RAW:
+            case CDRWIN_TRACK_TYPE_CDI_RAW: return 2352;
+            case CDRWIN_TRACK_TYPE_CDG: return 2448;
+            default:                    return 0;
         }
+    }
 
-        static ushort CdrWinTrackTypeToBytesPerSector(string trackType)
+    static ushort CdrWinTrackTypeToCookedBytesPerSector(string trackType)
+    {
+        switch(trackType)
         {
-            switch(trackType)
-            {
-                case CDRWIN_TRACK_TYPE_MODE1:
-                case CDRWIN_TRACK_TYPE_MODE2_FORM1: return 2048;
-                case CDRWIN_TRACK_TYPE_MODE2_FORM2: return 2324;
-                case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
-                case CDRWIN_TRACK_TYPE_CDI: return 2336;
-                case CDRWIN_TRACK_TYPE_AUDIO:
-                case CDRWIN_TRACK_TYPE_MODE1_RAW:
-                case CDRWIN_TRACK_TYPE_MODE2_RAW:
-                case CDRWIN_TRACK_TYPE_CDI_RAW: return 2352;
-                case CDRWIN_TRACK_TYPE_CDG: return 2448;
-                default:                    return 0;
-            }
+            case CDRWIN_TRACK_TYPE_MODE1:
+            case CDRWIN_TRACK_TYPE_MODE2_FORM1:
+            case CDRWIN_TRACK_TYPE_MODE1_RAW: return 2048;
+            case CDRWIN_TRACK_TYPE_MODE2_FORM2: return 2324;
+            case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
+            case CDRWIN_TRACK_TYPE_CDI:
+            case CDRWIN_TRACK_TYPE_MODE2_RAW:
+            case CDRWIN_TRACK_TYPE_CDI_RAW: return 2336;
+            case CDRWIN_TRACK_TYPE_CDG:
+            case CDRWIN_TRACK_TYPE_AUDIO: return 2352;
+            default: return 0;
         }
+    }
 
-        static ushort CdrWinTrackTypeToCookedBytesPerSector(string trackType)
+    static TrackType CdrWinTrackTypeToTrackType(string trackType)
+    {
+        switch(trackType)
         {
-            switch(trackType)
-            {
-                case CDRWIN_TRACK_TYPE_MODE1:
-                case CDRWIN_TRACK_TYPE_MODE2_FORM1:
-                case CDRWIN_TRACK_TYPE_MODE1_RAW: return 2048;
-                case CDRWIN_TRACK_TYPE_MODE2_FORM2: return 2324;
-                case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
-                case CDRWIN_TRACK_TYPE_CDI:
-                case CDRWIN_TRACK_TYPE_MODE2_RAW:
-                case CDRWIN_TRACK_TYPE_CDI_RAW: return 2336;
-                case CDRWIN_TRACK_TYPE_CDG:
-                case CDRWIN_TRACK_TYPE_AUDIO: return 2352;
-                default: return 0;
-            }
+            case CDRWIN_TRACK_TYPE_MODE1:
+            case CDRWIN_TRACK_TYPE_MODE1_RAW: return TrackType.CdMode1;
+            case CDRWIN_TRACK_TYPE_MODE2_FORM1: return TrackType.CdMode2Form1;
+            case CDRWIN_TRACK_TYPE_MODE2_FORM2: return TrackType.CdMode2Form2;
+            case CDRWIN_TRACK_TYPE_CDI_RAW:
+            case CDRWIN_TRACK_TYPE_CDI:
+            case CDRWIN_TRACK_TYPE_MODE2_RAW:
+            case CDRWIN_TRACK_TYPE_MODE2_FORMLESS: return TrackType.CdMode2Formless;
+            case CDRWIN_TRACK_TYPE_AUDIO:
+            case CDRWIN_TRACK_TYPE_CDG: return TrackType.Audio;
+            default: return TrackType.Data;
         }
+    }
 
-        static TrackType CdrWinTrackTypeToTrackType(string trackType)
+    static MediaType CdrWinIsoBusterDiscTypeToMediaType(string discType)
+    {
+        switch(discType)
         {
-            switch(trackType)
-            {
-                case CDRWIN_TRACK_TYPE_MODE1:
-                case CDRWIN_TRACK_TYPE_MODE1_RAW: return TrackType.CdMode1;
-                case CDRWIN_TRACK_TYPE_MODE2_FORM1: return TrackType.CdMode2Form1;
-                case CDRWIN_TRACK_TYPE_MODE2_FORM2: return TrackType.CdMode2Form2;
-                case CDRWIN_TRACK_TYPE_CDI_RAW:
-                case CDRWIN_TRACK_TYPE_CDI:
-                case CDRWIN_TRACK_TYPE_MODE2_RAW:
-                case CDRWIN_TRACK_TYPE_MODE2_FORMLESS: return TrackType.CdMode2Formless;
-                case CDRWIN_TRACK_TYPE_AUDIO:
-                case CDRWIN_TRACK_TYPE_CDG: return TrackType.Audio;
-                default: return TrackType.Data;
-            }
+            case CDRWIN_DISK_TYPE_CD: return MediaType.CD;
+            case CDRWIN_DISK_TYPE_CDRW:
+            case CDRWIN_DISK_TYPE_CDMRW:
+            case CDRWIN_DISK_TYPE_CDMRW2: return MediaType.CDRW;
+            case CDRWIN_DISK_TYPE_DVD: return MediaType.DVDROM;
+            case CDRWIN_DISK_TYPE_DVDPRW:
+            case CDRWIN_DISK_TYPE_DVDPMRW:
+            case CDRWIN_DISK_TYPE_DVDPMRW2: return MediaType.DVDPRW;
+            case CDRWIN_DISK_TYPE_DVDPRWDL:
+            case CDRWIN_DISK_TYPE_DVDPMRWDL:
+            case CDRWIN_DISK_TYPE_DVDPMRWDL2: return MediaType.DVDPRWDL;
+            case CDRWIN_DISK_TYPE_DVDPR:
+            case CDRWIN_DISK_TYPE_DVDPVR: return MediaType.DVDPR;
+            case CDRWIN_DISK_TYPE_DVDPRDL: return MediaType.DVDPRDL;
+            case CDRWIN_DISK_TYPE_DVDRAM:  return MediaType.DVDRAM;
+            case CDRWIN_DISK_TYPE_DVDVR:
+            case CDRWIN_DISK_TYPE_DVDR: return MediaType.DVDR;
+            case CDRWIN_DISK_TYPE_DVDRDL: return MediaType.DVDRDL;
+            case CDRWIN_DISK_TYPE_DVDRW:
+            case CDRWIN_DISK_TYPE_DVDRWDL:
+            case CDRWIN_DISK_TYPE_DVDRW2: return MediaType.DVDRW;
+            case CDRWIN_DISK_TYPE_HDDVD:    return MediaType.HDDVDROM;
+            case CDRWIN_DISK_TYPE_HDDVDRAM: return MediaType.HDDVDRAM;
+            case CDRWIN_DISK_TYPE_HDDVDR:
+            case CDRWIN_DISK_TYPE_HDDVDRDL: return MediaType.HDDVDR;
+            case CDRWIN_DISK_TYPE_HDDVDRW:
+            case CDRWIN_DISK_TYPE_HDDVDRWDL: return MediaType.HDDVDRW;
+            case CDRWIN_DISK_TYPE_BD: return MediaType.BDROM;
+            case CDRWIN_DISK_TYPE_BDR:
+            case CDRWIN_DISK_TYPE_BDRDL: return MediaType.BDR;
+            case CDRWIN_DISK_TYPE_BDRE:
+            case CDRWIN_DISK_TYPE_BDREDL: return MediaType.BDRE;
+            default: return MediaType.Unknown;
         }
+    }
 
-        static MediaType CdrWinIsoBusterDiscTypeToMediaType(string discType)
+    static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
+        ((byte)(sector / 75 / 60), (byte)(sector / 75 % 60), (byte)(sector % 75));
+
+    static string GetTrackMode(Track track)
+    {
+        switch(track.Type)
         {
-            switch(discType)
-            {
-                case CDRWIN_DISK_TYPE_CD: return MediaType.CD;
-                case CDRWIN_DISK_TYPE_CDRW:
-                case CDRWIN_DISK_TYPE_CDMRW:
-                case CDRWIN_DISK_TYPE_CDMRW2: return MediaType.CDRW;
-                case CDRWIN_DISK_TYPE_DVD: return MediaType.DVDROM;
-                case CDRWIN_DISK_TYPE_DVDPRW:
-                case CDRWIN_DISK_TYPE_DVDPMRW:
-                case CDRWIN_DISK_TYPE_DVDPMRW2: return MediaType.DVDPRW;
-                case CDRWIN_DISK_TYPE_DVDPRWDL:
-                case CDRWIN_DISK_TYPE_DVDPMRWDL:
-                case CDRWIN_DISK_TYPE_DVDPMRWDL2: return MediaType.DVDPRWDL;
-                case CDRWIN_DISK_TYPE_DVDPR:
-                case CDRWIN_DISK_TYPE_DVDPVR: return MediaType.DVDPR;
-                case CDRWIN_DISK_TYPE_DVDPRDL: return MediaType.DVDPRDL;
-                case CDRWIN_DISK_TYPE_DVDRAM:  return MediaType.DVDRAM;
-                case CDRWIN_DISK_TYPE_DVDVR:
-                case CDRWIN_DISK_TYPE_DVDR: return MediaType.DVDR;
-                case CDRWIN_DISK_TYPE_DVDRDL: return MediaType.DVDRDL;
-                case CDRWIN_DISK_TYPE_DVDRW:
-                case CDRWIN_DISK_TYPE_DVDRWDL:
-                case CDRWIN_DISK_TYPE_DVDRW2: return MediaType.DVDRW;
-                case CDRWIN_DISK_TYPE_HDDVD:    return MediaType.HDDVDROM;
-                case CDRWIN_DISK_TYPE_HDDVDRAM: return MediaType.HDDVDRAM;
-                case CDRWIN_DISK_TYPE_HDDVDR:
-                case CDRWIN_DISK_TYPE_HDDVDRDL: return MediaType.HDDVDR;
-                case CDRWIN_DISK_TYPE_HDDVDRW:
-                case CDRWIN_DISK_TYPE_HDDVDRWDL: return MediaType.HDDVDRW;
-                case CDRWIN_DISK_TYPE_BD: return MediaType.BDROM;
-                case CDRWIN_DISK_TYPE_BDR:
-                case CDRWIN_DISK_TYPE_BDRDL: return MediaType.BDR;
-                case CDRWIN_DISK_TYPE_BDRE:
-                case CDRWIN_DISK_TYPE_BDREDL: return MediaType.BDRE;
-                default: return MediaType.Unknown;
-            }
+            case TrackType.Audio when track.RawBytesPerSector == 2352:   return CDRWIN_TRACK_TYPE_AUDIO;
+            case TrackType.Data:                                         return CDRWIN_TRACK_TYPE_MODE1;
+            case TrackType.CdMode1 when track.RawBytesPerSector == 2352: return CDRWIN_TRACK_TYPE_MODE1_RAW;
+            case TrackType.CdMode2Formless
+                when track.RawBytesPerSector != 2352: return CDRWIN_TRACK_TYPE_MODE2_FORMLESS;
+            case TrackType.CdMode2Form1 when track.RawBytesPerSector != 2352: return CDRWIN_TRACK_TYPE_MODE2_FORM1;
+            case TrackType.CdMode2Form2 when track.RawBytesPerSector != 2352: return CDRWIN_TRACK_TYPE_MODE2_FORM2;
+            case TrackType.CdMode2Formless when track.RawBytesPerSector == 2352:
+            case TrackType.CdMode2Form1 when track.RawBytesPerSector    == 2352:
+            case TrackType.CdMode2Form2 when track.RawBytesPerSector    == 2352: return CDRWIN_TRACK_TYPE_MODE2_RAW;
+            default: return CDRWIN_TRACK_TYPE_MODE1;
         }
+    }
 
-        static (byte minute, byte second, byte frame) LbaToMsf(ulong sector) =>
-            ((byte)(sector / 75 / 60), (byte)(sector / 75 % 60), (byte)(sector % 75));
-
-        static string GetTrackMode(Track track)
+    static string MediaTypeToCdrwinType(MediaType type)
+    {
+        switch(type)
         {
-            switch(track.Type)
-            {
-                case TrackType.Audio when track.RawBytesPerSector == 2352:   return CDRWIN_TRACK_TYPE_AUDIO;
-                case TrackType.Data:                                         return CDRWIN_TRACK_TYPE_MODE1;
-                case TrackType.CdMode1 when track.RawBytesPerSector == 2352: return CDRWIN_TRACK_TYPE_MODE1_RAW;
-                case TrackType.CdMode2Formless
-                    when track.RawBytesPerSector != 2352: return CDRWIN_TRACK_TYPE_MODE2_FORMLESS;
-                case TrackType.CdMode2Form1 when track.RawBytesPerSector != 2352: return CDRWIN_TRACK_TYPE_MODE2_FORM1;
-                case TrackType.CdMode2Form2 when track.RawBytesPerSector != 2352: return CDRWIN_TRACK_TYPE_MODE2_FORM2;
-                case TrackType.CdMode2Formless when track.RawBytesPerSector == 2352:
-                case TrackType.CdMode2Form1 when track.RawBytesPerSector    == 2352:
-                case TrackType.CdMode2Form2 when track.RawBytesPerSector    == 2352: return CDRWIN_TRACK_TYPE_MODE2_RAW;
-                default: return CDRWIN_TRACK_TYPE_MODE1;
-            }
-        }
-
-        static string MediaTypeToCdrwinType(MediaType type)
-        {
-            switch(type)
-            {
-                case MediaType.BDRXL:
-                case MediaType.BDR: return CDRWIN_DISK_TYPE_BDR;
-                case MediaType.BDREXL:
-                case MediaType.BDRE: return CDRWIN_DISK_TYPE_BDRE;
-                case MediaType.BDROM:
-                case MediaType.UHDBD:
-                case MediaType.CBHD:
-                case MediaType.PS3BD:
-                case MediaType.PS4BD:
-                case MediaType.PS5BD:
-                case MediaType.UDO:
-                case MediaType.UDO2:
-                case MediaType.UDO2_WORM: return CDRWIN_DISK_TYPE_BD;
-                case MediaType.CDV:
-                case MediaType.DDCD:
-                case MediaType.DDCDR:
-                case MediaType.DDCDRW:
-                case MediaType.CDPLUS:
-                case MediaType.CDR:
-                case MediaType.CDROM:
-                case MediaType.CDROMXA:
-                case MediaType.CD:
-                case MediaType.CDDA:
-                case MediaType.CDEG:
-                case MediaType.CDG:
-                case MediaType.CDI:
-                case MediaType.CDMIDI:
-                case MediaType.DTSCD:
-                case MediaType.JaguarCD:
-                case MediaType.MEGACD:
-                case MediaType.PS1CD:
-                case MediaType.PS2CD:
-                case MediaType.SuperCDROM2:
-                case MediaType.SVCD:
-                case MediaType.SVOD:
-                case MediaType.SATURNCD:
-                case MediaType.ThreeDO:
-                case MediaType.VCD:
-                case MediaType.VCDHD:
-                case MediaType.MilCD:
-                case MediaType.VideoNow:
-                case MediaType.VideoNowColor:
-                case MediaType.VideoNowXp:
-                case MediaType.CVD: return CDRWIN_DISK_TYPE_CD;
-                case MediaType.CDMRW:    return CDRWIN_DISK_TYPE_CDMRW;
-                case MediaType.CDRW:     return CDRWIN_DISK_TYPE_CDRW;
-                case MediaType.DVDPR:    return CDRWIN_DISK_TYPE_DVDPR;
-                case MediaType.DVDPRDL:  return CDRWIN_DISK_TYPE_DVDPRDL;
-                case MediaType.DVDPRW:   return CDRWIN_DISK_TYPE_DVDPRW;
-                case MediaType.DVDPRWDL: return CDRWIN_DISK_TYPE_DVDPRWDL;
-                case MediaType.DVDR:     return CDRWIN_DISK_TYPE_DVDR;
-                case MediaType.DVDRAM:   return CDRWIN_DISK_TYPE_DVDRAM;
-                case MediaType.DVDRDL:   return CDRWIN_DISK_TYPE_DVDRDL;
-                case MediaType.DVDDownload:
-                case MediaType.DVDROM:
-                case MediaType.UMD:
-                case MediaType.PS2DVD:
-                case MediaType.PS3DVD: return CDRWIN_DISK_TYPE_DVD;
-                case MediaType.DVDRW:     return CDRWIN_DISK_TYPE_DVDRW;
-                case MediaType.DVDRWDL:   return CDRWIN_DISK_TYPE_DVDRWDL;
-                case MediaType.HDDVDR:    return CDRWIN_DISK_TYPE_HDDVDR;
-                case MediaType.HDDVDRAM:  return CDRWIN_DISK_TYPE_HDDVDRAM;
-                case MediaType.HDDVDRDL:  return CDRWIN_DISK_TYPE_HDDVDRDL;
-                case MediaType.HDDVDROM:  return CDRWIN_DISK_TYPE_HDDVD;
-                case MediaType.HDDVDRW:   return CDRWIN_DISK_TYPE_HDDVDRW;
-                case MediaType.HDDVDRWDL: return CDRWIN_DISK_TYPE_HDDVDRWDL;
-                default:                  return "";
-            }
+            case MediaType.BDRXL:
+            case MediaType.BDR: return CDRWIN_DISK_TYPE_BDR;
+            case MediaType.BDREXL:
+            case MediaType.BDRE: return CDRWIN_DISK_TYPE_BDRE;
+            case MediaType.BDROM:
+            case MediaType.UHDBD:
+            case MediaType.CBHD:
+            case MediaType.PS3BD:
+            case MediaType.PS4BD:
+            case MediaType.PS5BD:
+            case MediaType.UDO:
+            case MediaType.UDO2:
+            case MediaType.UDO2_WORM: return CDRWIN_DISK_TYPE_BD;
+            case MediaType.CDV:
+            case MediaType.DDCD:
+            case MediaType.DDCDR:
+            case MediaType.DDCDRW:
+            case MediaType.CDPLUS:
+            case MediaType.CDR:
+            case MediaType.CDROM:
+            case MediaType.CDROMXA:
+            case MediaType.CD:
+            case MediaType.CDDA:
+            case MediaType.CDEG:
+            case MediaType.CDG:
+            case MediaType.CDI:
+            case MediaType.CDMIDI:
+            case MediaType.DTSCD:
+            case MediaType.JaguarCD:
+            case MediaType.MEGACD:
+            case MediaType.PS1CD:
+            case MediaType.PS2CD:
+            case MediaType.SuperCDROM2:
+            case MediaType.SVCD:
+            case MediaType.SVOD:
+            case MediaType.SATURNCD:
+            case MediaType.ThreeDO:
+            case MediaType.VCD:
+            case MediaType.VCDHD:
+            case MediaType.MilCD:
+            case MediaType.VideoNow:
+            case MediaType.VideoNowColor:
+            case MediaType.VideoNowXp:
+            case MediaType.CVD: return CDRWIN_DISK_TYPE_CD;
+            case MediaType.CDMRW:    return CDRWIN_DISK_TYPE_CDMRW;
+            case MediaType.CDRW:     return CDRWIN_DISK_TYPE_CDRW;
+            case MediaType.DVDPR:    return CDRWIN_DISK_TYPE_DVDPR;
+            case MediaType.DVDPRDL:  return CDRWIN_DISK_TYPE_DVDPRDL;
+            case MediaType.DVDPRW:   return CDRWIN_DISK_TYPE_DVDPRW;
+            case MediaType.DVDPRWDL: return CDRWIN_DISK_TYPE_DVDPRWDL;
+            case MediaType.DVDR:     return CDRWIN_DISK_TYPE_DVDR;
+            case MediaType.DVDRAM:   return CDRWIN_DISK_TYPE_DVDRAM;
+            case MediaType.DVDRDL:   return CDRWIN_DISK_TYPE_DVDRDL;
+            case MediaType.DVDDownload:
+            case MediaType.DVDROM:
+            case MediaType.UMD:
+            case MediaType.PS2DVD:
+            case MediaType.PS3DVD: return CDRWIN_DISK_TYPE_DVD;
+            case MediaType.DVDRW:     return CDRWIN_DISK_TYPE_DVDRW;
+            case MediaType.DVDRWDL:   return CDRWIN_DISK_TYPE_DVDRWDL;
+            case MediaType.HDDVDR:    return CDRWIN_DISK_TYPE_HDDVDR;
+            case MediaType.HDDVDRAM:  return CDRWIN_DISK_TYPE_HDDVDRAM;
+            case MediaType.HDDVDRDL:  return CDRWIN_DISK_TYPE_HDDVDRDL;
+            case MediaType.HDDVDROM:  return CDRWIN_DISK_TYPE_HDDVD;
+            case MediaType.HDDVDRW:   return CDRWIN_DISK_TYPE_HDDVDRW;
+            case MediaType.HDDVDRWDL: return CDRWIN_DISK_TYPE_HDDVDRWDL;
+            default:                  return "";
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRWin/Identify.cs b/Aaru.Images/CDRWin/Identify.cs
index 2ceff4f6b..fcf623334 100644
--- a/Aaru.Images/CDRWin/Identify.cs
+++ b/Aaru.Images/CDRWin/Identify.cs
@@ -36,80 +36,79 @@ using System.Text.RegularExpressions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CdrWin
 {
-    public sealed partial class CdrWin
+    // Due to .cue format, this method must parse whole file, ignoring errors (those will be returned by OpenImage()).
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        // Due to .cue format, this method must parse whole file, ignoring errors (those will be returned by OpenImage()).
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        _cdrwinFilter = imageFilter;
+
+        try
         {
-            _cdrwinFilter = imageFilter;
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+            byte[] testArray = new byte[512];
+            imageFilter.GetDataForkStream().Read(testArray, 0, 512);
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
 
-            try
+            // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
+            bool twoConsecutiveNulls = false;
+
+            for(int i = 0; i < 512; i++)
             {
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
-                byte[] testArray = new byte[512];
-                imageFilter.GetDataForkStream().Read(testArray, 0, 512);
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+                if(i >= imageFilter.GetDataForkStream().Length)
+                    break;
 
-                // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
-                bool twoConsecutiveNulls = false;
-
-                for(int i = 0; i < 512; i++)
+                if(testArray[i] == 0)
                 {
-                    if(i >= imageFilter.GetDataForkStream().Length)
-                        break;
-
-                    if(testArray[i] == 0)
-                    {
-                        if(twoConsecutiveNulls)
-                            return false;
-
-                        twoConsecutiveNulls = true;
-                    }
-                    else
-                        twoConsecutiveNulls = false;
-
-                    if(testArray[i] < 0x20  &&
-                       testArray[i] != 0x0A &&
-                       testArray[i] != 0x0D &&
-                       testArray[i] != 0x00)
+                    if(twoConsecutiveNulls)
                         return false;
+
+                    twoConsecutiveNulls = true;
                 }
+                else
+                    twoConsecutiveNulls = false;
 
-                _cueStream = new StreamReader(_cdrwinFilter.GetDataForkStream());
-
-                while(_cueStream.Peek() >= 0)
-                {
-                    string line = _cueStream.ReadLine();
-
-                    var sr = new Regex(REGEX_SESSION);
-                    var rr = new Regex(REGEX_COMMENT);
-                    var cr = new Regex(REGEX_MCN);
-                    var fr = new Regex(REGEX_FILE);
-                    var tr = new Regex(REGEX_CDTEXT);
-
-                    // First line must be SESSION, REM, CATALOG, FILE or CDTEXTFILE.
-                    Match sm = sr.Match(line ?? "");
-                    Match rm = rr.Match(line);
-                    Match cm = cr.Match(line);
-                    Match fm = fr.Match(line);
-                    Match tm = tr.Match(line);
-
-                    return sm.Success || rm.Success || cm.Success || fm.Success || tm.Success;
-                }
-
-                return false;
+                if(testArray[i] < 0x20  &&
+                   testArray[i] != 0x0A &&
+                   testArray[i] != 0x0D &&
+                   testArray[i] != 0x00)
+                    return false;
             }
-            catch(Exception ex)
+
+            _cueStream = new StreamReader(_cdrwinFilter.GetDataForkStream());
+
+            while(_cueStream.Peek() >= 0)
             {
-                AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", _cdrwinFilter);
-                AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
-                AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
+                string line = _cueStream.ReadLine();
 
-                return false;
+                var sr = new Regex(REGEX_SESSION);
+                var rr = new Regex(REGEX_COMMENT);
+                var cr = new Regex(REGEX_MCN);
+                var fr = new Regex(REGEX_FILE);
+                var tr = new Regex(REGEX_CDTEXT);
+
+                // First line must be SESSION, REM, CATALOG, FILE or CDTEXTFILE.
+                Match sm = sr.Match(line ?? "");
+                Match rm = rr.Match(line);
+                Match cm = cr.Match(line);
+                Match fm = fr.Match(line);
+                Match tm = tr.Match(line);
+
+                return sm.Success || rm.Success || cm.Success || fm.Success || tm.Success;
             }
+
+            return false;
+        }
+        catch(Exception ex)
+        {
+            AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", _cdrwinFilter);
+            AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
+            AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
+
+            return false;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRWin/Properties.cs b/Aaru.Images/CDRWin/Properties.cs
index 0f386c490..0764242d3 100644
--- a/Aaru.Images/CDRWin/Properties.cs
+++ b/Aaru.Images/CDRWin/Properties.cs
@@ -38,173 +38,172 @@ using Aaru.CommonTypes.Structs;
 using Schemas;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CdrWin
 {
-    public sealed partial class CdrWin
+    /// <inheritdoc />
+    public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks    |
+                                                           OpticalImageCapabilities.CanStoreDataTracks     |
+                                                           OpticalImageCapabilities.CanStorePregaps        |
+                                                           OpticalImageCapabilities.CanStoreSessions       |
+                                                           OpticalImageCapabilities.CanStoreIsrc           |
+                                                           OpticalImageCapabilities.CanStoreCdText         |
+                                                           OpticalImageCapabilities.CanStoreMcn            |
+                                                           OpticalImageCapabilities.CanStoreRawData        |
+                                                           OpticalImageCapabilities.CanStoreCookedData     |
+                                                           OpticalImageCapabilities.CanStoreMultipleTracks |
+                                                           OpticalImageCapabilities.CanStoreNotCdSessions  |
+                                                           OpticalImageCapabilities.CanStoreNotCdTracks    |
+                                                           OpticalImageCapabilities.CanStoreIndexes;
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "CDRWin cuesheet";
+    /// <inheritdoc />
+    public Guid Id => new("664568B2-15D4-4E64-8A7A-20BDA8B8386F");
+    /// <inheritdoc />
+    public string Format => "CDRWin CUESheet";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<Partition> Partitions { get; private set; }
+
+    /// <inheritdoc />
+    public List<Track> Tracks
     {
-        /// <inheritdoc />
-        public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks    |
-                                                               OpticalImageCapabilities.CanStoreDataTracks     |
-                                                               OpticalImageCapabilities.CanStorePregaps        |
-                                                               OpticalImageCapabilities.CanStoreSessions       |
-                                                               OpticalImageCapabilities.CanStoreIsrc           |
-                                                               OpticalImageCapabilities.CanStoreCdText         |
-                                                               OpticalImageCapabilities.CanStoreMcn            |
-                                                               OpticalImageCapabilities.CanStoreRawData        |
-                                                               OpticalImageCapabilities.CanStoreCookedData     |
-                                                               OpticalImageCapabilities.CanStoreMultipleTracks |
-                                                               OpticalImageCapabilities.CanStoreNotCdSessions  |
-                                                               OpticalImageCapabilities.CanStoreNotCdTracks    |
-                                                               OpticalImageCapabilities.CanStoreIndexes;
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "CDRWin cuesheet";
-        /// <inheritdoc />
-        public Guid Id => new("664568B2-15D4-4E64-8A7A-20BDA8B8386F");
-        /// <inheritdoc />
-        public string Format => "CDRWin CUESheet";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<Partition> Partitions { get; private set; }
-
-        /// <inheritdoc />
-        public List<Track> Tracks
+        get
         {
-            get
+            List<Track> tracks = new();
+
+            ulong  previousStartSector = 0;
+            ulong  gdRomSession2Offset = 45000;
+            string previousTrackFile   = "";
+
+            foreach(CdrWinTrack cdrTrack in _discImage.Tracks)
             {
-                List<Track> tracks = new();
-
-                ulong  previousStartSector = 0;
-                ulong  gdRomSession2Offset = 45000;
-                string previousTrackFile   = "";
-
-                foreach(CdrWinTrack cdrTrack in _discImage.Tracks)
+                var aaruTrack = new Track
                 {
-                    var aaruTrack = new Track
-                    {
-                        Description       = cdrTrack.Title,
-                        Pregap            = (ulong)cdrTrack.Pregap,
-                        Session           = cdrTrack.Session,
-                        Sequence          = cdrTrack.Sequence,
-                        Type              = _isCd ? CdrWinTrackTypeToTrackType(cdrTrack.TrackType) : TrackType.Data,
-                        File              = cdrTrack.TrackFile.DataFilter.Filename,
-                        Filter            = cdrTrack.TrackFile.DataFilter,
-                        FileOffset        = cdrTrack.TrackFile.Offset,
-                        FileType          = cdrTrack.TrackFile.FileType,
-                        RawBytesPerSector = cdrTrack.Bps,
-                        BytesPerSector    = CdrWinTrackTypeToCookedBytesPerSector(cdrTrack.TrackType)
-                    };
+                    Description       = cdrTrack.Title,
+                    Pregap            = (ulong)cdrTrack.Pregap,
+                    Session           = cdrTrack.Session,
+                    Sequence          = cdrTrack.Sequence,
+                    Type              = _isCd ? CdrWinTrackTypeToTrackType(cdrTrack.TrackType) : TrackType.Data,
+                    File              = cdrTrack.TrackFile.DataFilter.Filename,
+                    Filter            = cdrTrack.TrackFile.DataFilter,
+                    FileOffset        = cdrTrack.TrackFile.Offset,
+                    FileType          = cdrTrack.TrackFile.FileType,
+                    RawBytesPerSector = cdrTrack.Bps,
+                    BytesPerSector    = CdrWinTrackTypeToCookedBytesPerSector(cdrTrack.TrackType)
+                };
 
-                    if(aaruTrack.Sequence == 1 && _isCd)
-                    {
-                        aaruTrack.Pregap     = 150;
-                        aaruTrack.Indexes[0] = -150;
-                    }
-
-                    if(previousTrackFile == aaruTrack.File ||
-                       previousTrackFile == "")
-                        if(cdrTrack.Indexes.TryGetValue(0, out int idx0))
-                            if(idx0 > 0)
-                                aaruTrack.StartSector = (ulong)idx0;
-                            else
-                                aaruTrack.StartSector = 0;
-                        else if(cdrTrack.Indexes.TryGetValue(1, out int idx1))
-                            aaruTrack.StartSector = (ulong)idx1;
-                        else
-                            aaruTrack.StartSector += previousStartSector;
-                    else
-                        aaruTrack.StartSector += previousStartSector;
-
-                    foreach((ushort index, int position) in cdrTrack.Indexes)
-                        aaruTrack.Indexes[index] = position;
-
-                    previousTrackFile = cdrTrack.TrackFile.DataFilter.Filename;
-
-                    aaruTrack.EndSector = aaruTrack.StartSector + cdrTrack.Sectors - 1;
-
-                    if(_discImage.IsRedumpGigadisc &&
-                       cdrTrack.Session    == 2    &&
-                       previousStartSector < gdRomSession2Offset)
-                    {
-                        aaruTrack.StartSector = (ulong)cdrTrack.Indexes[0];
-                        aaruTrack.EndSector   = gdRomSession2Offset + cdrTrack.Sectors - (uint)cdrTrack.Pregap - 1;
-                    }
-
-                    if(cdrTrack.TrackType == CDRWIN_TRACK_TYPE_CDG)
-                    {
-                        aaruTrack.SubchannelFilter = cdrTrack.TrackFile.DataFilter;
-                        aaruTrack.SubchannelFile   = cdrTrack.TrackFile.DataFilter.Filename;
-                        aaruTrack.SubchannelOffset = cdrTrack.TrackFile.Offset;
-                        aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
-                    }
-                    else
-                        aaruTrack.SubchannelType = TrackSubchannelType.None;
-
-                    if(!_isCd)
-                    {
-                        aaruTrack.Pregap = 0;
-                        aaruTrack.Indexes?.Clear();
-                    }
-
-                    tracks.Add(aaruTrack);
-                    previousStartSector = aaruTrack.EndSector + 1;
+                if(aaruTrack.Sequence == 1 && _isCd)
+                {
+                    aaruTrack.Pregap     = 150;
+                    aaruTrack.Indexes[0] = -150;
                 }
 
-                return tracks;
-            }
-        }
+                if(previousTrackFile == aaruTrack.File ||
+                   previousTrackFile == "")
+                    if(cdrTrack.Indexes.TryGetValue(0, out int idx0))
+                        if(idx0 > 0)
+                            aaruTrack.StartSector = (ulong)idx0;
+                        else
+                            aaruTrack.StartSector = 0;
+                    else if(cdrTrack.Indexes.TryGetValue(1, out int idx1))
+                        aaruTrack.StartSector = (ulong)idx1;
+                    else
+                        aaruTrack.StartSector += previousStartSector;
+                else
+                    aaruTrack.StartSector += previousStartSector;
 
-        /// <inheritdoc />
-        public List<Session> Sessions => _discImage.Sessions;
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware { get; private set; }
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new[]
-        {
-            MediaTagType.CD_MCN, MediaTagType.CD_TEXT
-        };
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
-        {
-            SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
-            SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubHeader,
-            SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags, SectorTagType.CdTrackIsrc
-        };
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.BDR, MediaType.BDRE, MediaType.BDREXL, MediaType.BDROM, MediaType.UHDBD, MediaType.BDRXL,
-            MediaType.CBHD, MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI,
-            MediaType.CDMIDI, MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA,
-            MediaType.CDRW, MediaType.CDV, MediaType.DDCD, MediaType.DDCDR, MediaType.DDCDRW, MediaType.DVDDownload,
-            MediaType.DVDPR, MediaType.DVDPRDL, MediaType.DVDPRW, MediaType.DVDPRWDL, MediaType.DVDR, MediaType.DVDRAM,
-            MediaType.DVDRDL, MediaType.DVDROM, MediaType.DVDRW, MediaType.DVDRWDL, MediaType.EVD, MediaType.FDDVD,
-            MediaType.DTSCD, MediaType.FVD, MediaType.HDDVDR, MediaType.HDDVDRAM, MediaType.HDDVDRDL,
-            MediaType.HDDVDROM, MediaType.HDDVDRW, MediaType.HDDVDRWDL, MediaType.HDVMD, MediaType.HVD,
-            MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD, MediaType.PS2DVD, MediaType.PS3BD,
-            MediaType.PS3DVD, MediaType.PS4BD, MediaType.PS5BD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD,
-            MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD,
-            MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32,
-            MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
-            MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
-        {
-            ("separate", typeof(bool), "Write each track to a separate file.", (object)false)
-        };
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".cue"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
+                foreach((ushort index, int position) in cdrTrack.Indexes)
+                    aaruTrack.Indexes[index] = position;
+
+                previousTrackFile = cdrTrack.TrackFile.DataFilter.Filename;
+
+                aaruTrack.EndSector = aaruTrack.StartSector + cdrTrack.Sectors - 1;
+
+                if(_discImage.IsRedumpGigadisc &&
+                   cdrTrack.Session    == 2    &&
+                   previousStartSector < gdRomSession2Offset)
+                {
+                    aaruTrack.StartSector = (ulong)cdrTrack.Indexes[0];
+                    aaruTrack.EndSector   = gdRomSession2Offset + cdrTrack.Sectors - (uint)cdrTrack.Pregap - 1;
+                }
+
+                if(cdrTrack.TrackType == CDRWIN_TRACK_TYPE_CDG)
+                {
+                    aaruTrack.SubchannelFilter = cdrTrack.TrackFile.DataFilter;
+                    aaruTrack.SubchannelFile   = cdrTrack.TrackFile.DataFilter.Filename;
+                    aaruTrack.SubchannelOffset = cdrTrack.TrackFile.Offset;
+                    aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
+                }
+                else
+                    aaruTrack.SubchannelType = TrackSubchannelType.None;
+
+                if(!_isCd)
+                {
+                    aaruTrack.Pregap = 0;
+                    aaruTrack.Indexes?.Clear();
+                }
+
+                tracks.Add(aaruTrack);
+                previousStartSector = aaruTrack.EndSector + 1;
+            }
+
+            return tracks;
+        }
     }
+
+    /// <inheritdoc />
+    public List<Session> Sessions => _discImage.Sessions;
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware { get; private set; }
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new[]
+    {
+        MediaTagType.CD_MCN, MediaTagType.CD_TEXT
+    };
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new[]
+    {
+        SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
+        SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubHeader,
+        SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags, SectorTagType.CdTrackIsrc
+    };
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.BDR, MediaType.BDRE, MediaType.BDREXL, MediaType.BDROM, MediaType.UHDBD, MediaType.BDRXL,
+        MediaType.CBHD, MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI,
+        MediaType.CDMIDI, MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA,
+        MediaType.CDRW, MediaType.CDV, MediaType.DDCD, MediaType.DDCDR, MediaType.DDCDRW, MediaType.DVDDownload,
+        MediaType.DVDPR, MediaType.DVDPRDL, MediaType.DVDPRW, MediaType.DVDPRWDL, MediaType.DVDR, MediaType.DVDRAM,
+        MediaType.DVDRDL, MediaType.DVDROM, MediaType.DVDRW, MediaType.DVDRWDL, MediaType.EVD, MediaType.FDDVD,
+        MediaType.DTSCD, MediaType.FVD, MediaType.HDDVDR, MediaType.HDDVDRAM, MediaType.HDDVDRDL,
+        MediaType.HDDVDROM, MediaType.HDDVDRW, MediaType.HDDVDRWDL, MediaType.HDVMD, MediaType.HVD,
+        MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD, MediaType.PS2DVD, MediaType.PS3BD,
+        MediaType.PS3DVD, MediaType.PS4BD, MediaType.PS5BD, MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SVOD,
+        MediaType.SATURNCD, MediaType.ThreeDO, MediaType.UDO, MediaType.UDO2, MediaType.UDO2_WORM, MediaType.UMD,
+        MediaType.VCD, MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32,
+        MediaType.Nuon, MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
+        MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
+    {
+        ("separate", typeof(bool), "Write each track to a separate file.", (object)false)
+    };
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".cue"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRWin/Read.cs b/Aaru.Images/CDRWin/Read.cs
index f90ad3510..b76a91dc6 100644
--- a/Aaru.Images/CDRWin/Read.cs
+++ b/Aaru.Images/CDRWin/Read.cs
@@ -46,2368 +46,2367 @@ using Schemas;
 using Session = Aaru.CommonTypes.Structs.Session;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CdrWin
 {
-    public sealed partial class CdrWin
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        if(imageFilter == null)
+            return ErrorNumber.InvalidArgument;
+
+        _cdrwinFilter = imageFilter;
+
+        try
         {
-            if(imageFilter == null)
-                return ErrorNumber.InvalidArgument;
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+            _cueStream = new StreamReader(imageFilter.GetDataForkStream());
+            int  lineNumber     = 0;
+            bool inTrack        = false;
+            byte currentSession = 1;
 
-            _cdrwinFilter = imageFilter;
+            // Initialize all RegExs
+            var regexSession                = new Regex(REGEX_SESSION);
+            var regexDiskType               = new Regex(REGEX_MEDIA_TYPE);
+            var regexLeadOut                = new Regex(REGEX_LEAD_OUT);
+            var regexLba                    = new Regex(REGEX_LBA);
+            var regexDiskId                 = new Regex(REGEX_DISC_ID);
+            var regexBarCode                = new Regex(REGEX_BARCODE);
+            var regexComment                = new Regex(REGEX_COMMENT);
+            var regexCdText                 = new Regex(REGEX_CDTEXT);
+            var regexMcn                    = new Regex(REGEX_MCN);
+            var regexTitle                  = new Regex(REGEX_TITLE);
+            var regexGenre                  = new Regex(REGEX_GENRE);
+            var regexArranger               = new Regex(REGEX_ARRANGER);
+            var regexComposer               = new Regex(REGEX_COMPOSER);
+            var regexPerformer              = new Regex(REGEX_PERFORMER);
+            var regexSongWriter             = new Regex(REGEX_SONGWRITER);
+            var regexFile                   = new Regex(REGEX_FILE);
+            var regexTrack                  = new Regex(REGEX_TRACK);
+            var regexIsrc                   = new Regex(REGEX_ISRC);
+            var regexIndex                  = new Regex(REGEX_INDEX);
+            var regexPregap                 = new Regex(REGEX_PREGAP);
+            var regexPostgap                = new Regex(REGEX_POSTGAP);
+            var regexFlags                  = new Regex(REGEX_FLAGS);
+            var regexApplication            = new Regex(REGEX_APPLICATION);
+            var regexTruripDisc             = new Regex(REGEX_TRURIP_DISC_HASHES);
+            var regexTruripDiscCrc32        = new Regex(REGEX_TRURIP_DISC_CRC32);
+            var regexTruripDiscMd5          = new Regex(REGEX_TRURIP_DISC_MD5);
+            var regexTruripDiscSha1         = new Regex(REGEX_TRURIP_DISC_SHA1);
+            var regexTruripTrack            = new Regex(REGEX_TRURIP_TRACK_METHOD);
+            var regexTruripTrackCrc32       = new Regex(REGEX_TRURIP_TRACK_CRC32);
+            var regexTruripTrackMd5         = new Regex(REGEX_TRURIP_TRACK_MD5);
+            var regexTruripTrackSha1        = new Regex(REGEX_TRURIP_TRACK_SHA1);
+            var regexTruripTrackUnknownHash = new Regex(REGEX_TRURIP_TRACK_UNKNOWN);
+            var regexDicMediaType           = new Regex(REGEX_DIC_MEDIA_TYPE);
+            var regexApplicationVersion     = new Regex(REGEX_APPLICATION_VERSION);
+            var regexDumpExtent             = new Regex(REGEX_DUMP_EXTENT);
+            var regexAaruMediaType          = new Regex(REGEX_AARU_MEDIA_TYPE);
+            var regexRedumpSdArea           = new Regex(REGEX_REDUMP_SD_AREA);
+            var regexRedumpHdArea           = new Regex(REGEX_REDUMP_HD_AREA);
 
-            try
+            // Initialize all RegEx matches
+            Match matchTrack;
+
+            // Initialize disc
+            _discImage = new CdrWinDisc
             {
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
-                _cueStream = new StreamReader(imageFilter.GetDataForkStream());
-                int  lineNumber     = 0;
-                bool inTrack        = false;
-                byte currentSession = 1;
+                Sessions   = new List<Session>(),
+                Tracks     = new List<CdrWinTrack>(),
+                Comment    = "",
+                DiscHashes = new Dictionary<string, string>()
+            };
 
-                // Initialize all RegExs
-                var regexSession                = new Regex(REGEX_SESSION);
-                var regexDiskType               = new Regex(REGEX_MEDIA_TYPE);
-                var regexLeadOut                = new Regex(REGEX_LEAD_OUT);
-                var regexLba                    = new Regex(REGEX_LBA);
-                var regexDiskId                 = new Regex(REGEX_DISC_ID);
-                var regexBarCode                = new Regex(REGEX_BARCODE);
-                var regexComment                = new Regex(REGEX_COMMENT);
-                var regexCdText                 = new Regex(REGEX_CDTEXT);
-                var regexMcn                    = new Regex(REGEX_MCN);
-                var regexTitle                  = new Regex(REGEX_TITLE);
-                var regexGenre                  = new Regex(REGEX_GENRE);
-                var regexArranger               = new Regex(REGEX_ARRANGER);
-                var regexComposer               = new Regex(REGEX_COMPOSER);
-                var regexPerformer              = new Regex(REGEX_PERFORMER);
-                var regexSongWriter             = new Regex(REGEX_SONGWRITER);
-                var regexFile                   = new Regex(REGEX_FILE);
-                var regexTrack                  = new Regex(REGEX_TRACK);
-                var regexIsrc                   = new Regex(REGEX_ISRC);
-                var regexIndex                  = new Regex(REGEX_INDEX);
-                var regexPregap                 = new Regex(REGEX_PREGAP);
-                var regexPostgap                = new Regex(REGEX_POSTGAP);
-                var regexFlags                  = new Regex(REGEX_FLAGS);
-                var regexApplication            = new Regex(REGEX_APPLICATION);
-                var regexTruripDisc             = new Regex(REGEX_TRURIP_DISC_HASHES);
-                var regexTruripDiscCrc32        = new Regex(REGEX_TRURIP_DISC_CRC32);
-                var regexTruripDiscMd5          = new Regex(REGEX_TRURIP_DISC_MD5);
-                var regexTruripDiscSha1         = new Regex(REGEX_TRURIP_DISC_SHA1);
-                var regexTruripTrack            = new Regex(REGEX_TRURIP_TRACK_METHOD);
-                var regexTruripTrackCrc32       = new Regex(REGEX_TRURIP_TRACK_CRC32);
-                var regexTruripTrackMd5         = new Regex(REGEX_TRURIP_TRACK_MD5);
-                var regexTruripTrackSha1        = new Regex(REGEX_TRURIP_TRACK_SHA1);
-                var regexTruripTrackUnknownHash = new Regex(REGEX_TRURIP_TRACK_UNKNOWN);
-                var regexDicMediaType           = new Regex(REGEX_DIC_MEDIA_TYPE);
-                var regexApplicationVersion     = new Regex(REGEX_APPLICATION_VERSION);
-                var regexDumpExtent             = new Regex(REGEX_DUMP_EXTENT);
-                var regexAaruMediaType          = new Regex(REGEX_AARU_MEDIA_TYPE);
-                var regexRedumpSdArea           = new Regex(REGEX_REDUMP_SD_AREA);
-                var regexRedumpHdArea           = new Regex(REGEX_REDUMP_HD_AREA);
+            var currentTrack = new CdrWinTrack
+            {
+                Indexes = new SortedDictionary<ushort, int>()
+            };
 
-                // Initialize all RegEx matches
-                Match matchTrack;
+            var  currentFile             = new CdrWinTrackFile();
+            long currentFileOffsetSector = 0;
 
-                // Initialize disc
-                _discImage = new CdrWinDisc
+            int trackCount = 0;
+
+            Dictionary<byte, int> leadouts = new();
+
+            while(_cueStream.Peek() >= 0)
+            {
+                lineNumber++;
+                string line = _cueStream.ReadLine();
+
+                matchTrack = regexTrack.Match(line);
+
+                if(!matchTrack.Success)
+                    continue;
+
+                uint trackSeq = uint.Parse(matchTrack.Groups[1].Value);
+
+                if(trackCount + 1 != trackSeq)
                 {
-                    Sessions   = new List<Session>(),
-                    Tracks     = new List<CdrWinTrack>(),
-                    Comment    = "",
-                    DiscHashes = new Dictionary<string, string>()
-                };
-
-                var currentTrack = new CdrWinTrack
-                {
-                    Indexes = new SortedDictionary<ushort, int>()
-                };
-
-                var  currentFile             = new CdrWinTrackFile();
-                long currentFileOffsetSector = 0;
-
-                int trackCount = 0;
-
-                Dictionary<byte, int> leadouts = new();
-
-                while(_cueStream.Peek() >= 0)
-                {
-                    lineNumber++;
-                    string line = _cueStream.ReadLine();
-
-                    matchTrack = regexTrack.Match(line);
-
-                    if(!matchTrack.Success)
-                        continue;
-
-                    uint trackSeq = uint.Parse(matchTrack.Groups[1].Value);
-
-                    if(trackCount + 1 != trackSeq)
-                    {
-                        AaruConsole.ErrorWriteLine($"Found TRACK {trackSeq} out of order in line {lineNumber}");
-
-                        return ErrorNumber.InvalidArgument;
-                    }
-
-                    trackCount++;
-                }
-
-                if(trackCount == 0)
-                {
-                    AaruConsole.ErrorWriteLine("No tracks found");
+                    AaruConsole.ErrorWriteLine($"Found TRACK {trackSeq} out of order in line {lineNumber}");
 
                     return ErrorNumber.InvalidArgument;
                 }
 
-                CdrWinTrack[] cueTracks = new CdrWinTrack[trackCount];
+                trackCount++;
+            }
 
-                lineNumber = 0;
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
-                _cueStream = new StreamReader(imageFilter.GetDataForkStream());
+            if(trackCount == 0)
+            {
+                AaruConsole.ErrorWriteLine("No tracks found");
 
-                var  filtersList           = new FiltersList();
-                bool inTruripDiscHash      = false;
-                bool inTruripTrackHash     = false;
-                bool firstTrackInSession   = false;
-                int  currentEmptyPregap    = 0;
-                int  cumulativeEmptyPregap = 0;
+                return ErrorNumber.InvalidArgument;
+            }
 
-                const ulong gdRomSession2Offset = 45000;
+            CdrWinTrack[] cueTracks = new CdrWinTrack[trackCount];
 
-                while(_cueStream.Peek() >= 0)
+            lineNumber = 0;
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+            _cueStream = new StreamReader(imageFilter.GetDataForkStream());
+
+            var  filtersList           = new FiltersList();
+            bool inTruripDiscHash      = false;
+            bool inTruripTrackHash     = false;
+            bool firstTrackInSession   = false;
+            int  currentEmptyPregap    = 0;
+            int  cumulativeEmptyPregap = 0;
+
+            const ulong gdRomSession2Offset = 45000;
+
+            while(_cueStream.Peek() >= 0)
+            {
+                lineNumber++;
+                string line = _cueStream.ReadLine();
+
+                Match matchSession            = regexSession.Match(line);
+                Match matchDiskType           = regexDiskType.Match(line);
+                Match matchComment            = regexComment.Match(line);
+                Match matchLba                = regexLba.Match(line);
+                Match matchLeadOut            = regexLeadOut.Match(line);
+                Match matchApplication        = regexApplication.Match(line);
+                Match matchTruripDisc         = regexTruripDisc.Match(line);
+                Match matchTruripTrack        = regexTruripTrack.Match(line);
+                Match matchDicMediaType       = regexDicMediaType.Match(line);
+                Match matchApplicationVersion = regexApplicationVersion.Match(line);
+                Match matchDumpExtent         = regexDumpExtent.Match(line);
+                Match matchAaruMediaType      = regexAaruMediaType.Match(line);
+                Match matchRedumpSdArea       = regexRedumpSdArea.Match(line);
+                Match matchRedumpHdArea       = regexRedumpHdArea.Match(line);
+
+                if(inTruripDiscHash)
                 {
-                    lineNumber++;
-                    string line = _cueStream.ReadLine();
+                    Match matchTruripDiscCrc32 = regexTruripDiscCrc32.Match(line);
+                    Match matchTruripDiscMd5   = regexTruripDiscMd5.Match(line);
+                    Match matchTruripDiscSha1  = regexTruripDiscSha1.Match(line);
 
-                    Match matchSession            = regexSession.Match(line);
-                    Match matchDiskType           = regexDiskType.Match(line);
-                    Match matchComment            = regexComment.Match(line);
-                    Match matchLba                = regexLba.Match(line);
-                    Match matchLeadOut            = regexLeadOut.Match(line);
-                    Match matchApplication        = regexApplication.Match(line);
-                    Match matchTruripDisc         = regexTruripDisc.Match(line);
-                    Match matchTruripTrack        = regexTruripTrack.Match(line);
-                    Match matchDicMediaType       = regexDicMediaType.Match(line);
-                    Match matchApplicationVersion = regexApplicationVersion.Match(line);
-                    Match matchDumpExtent         = regexDumpExtent.Match(line);
-                    Match matchAaruMediaType      = regexAaruMediaType.Match(line);
-                    Match matchRedumpSdArea       = regexRedumpSdArea.Match(line);
-                    Match matchRedumpHdArea       = regexRedumpHdArea.Match(line);
-
-                    if(inTruripDiscHash)
+                    if(matchTruripDiscCrc32.Success)
                     {
-                        Match matchTruripDiscCrc32 = regexTruripDiscCrc32.Match(line);
-                        Match matchTruripDiscMd5   = regexTruripDiscMd5.Match(line);
-                        Match matchTruripDiscSha1  = regexTruripDiscSha1.Match(line);
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM CRC32 at line {0}", lineNumber);
+                        _discImage.DiscHashes.Add("crc32", matchTruripDiscCrc32.Groups[1].Value.ToLowerInvariant());
 
-                        if(matchTruripDiscCrc32.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM CRC32 at line {0}", lineNumber);
-                            _discImage.DiscHashes.Add("crc32", matchTruripDiscCrc32.Groups[1].Value.ToLowerInvariant());
-
-                            continue;
-                        }
-
-                        if(matchTruripDiscMd5.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM MD5 at line {0}", lineNumber);
-                            _discImage.DiscHashes.Add("md5", matchTruripDiscMd5.Groups[1].Value.ToLowerInvariant());
-
-                            continue;
-                        }
-
-                        if(matchTruripDiscSha1.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM SHA1 at line {0}", lineNumber);
-                            _discImage.DiscHashes.Add("sha1", matchTruripDiscSha1.Groups[1].Value.ToLowerInvariant());
-
-                            continue;
-                        }
-                    }
-                    else if(inTruripTrackHash)
-                    {
-                        Match matchTruripTrackCrc32       = regexTruripTrackCrc32.Match(line);
-                        Match matchTruripTrackMd5         = regexTruripTrackMd5.Match(line);
-                        Match matchTruripTrackSha1        = regexTruripTrackSha1.Match(line);
-                        Match matchTruripTrackUnknownHash = regexTruripTrackUnknownHash.Match(line);
-
-                        if(matchTruripTrackCrc32.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found CRC32 for {1} {2} at line {0}",
-                                                       lineNumber,
-                                                       matchTruripTrackCrc32.Groups[1].Value == "Trk" ? "track" : "gap",
-                                                       matchTruripTrackCrc32.Groups[2].Value);
-
-                            continue;
-                        }
-
-                        if(matchTruripTrackMd5.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found CRC32 for {1} {2} at line {0}",
-                                                       lineNumber,
-                                                       matchTruripTrackMd5.Groups[1].Value == "Trk" ? "track" : "gap",
-                                                       matchTruripTrackMd5.Groups[2].Value);
-
-                            continue;
-                        }
-
-                        if(matchTruripTrackSha1.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found CRC32 for {1} {2} at line {0}",
-                                                       lineNumber,
-                                                       matchTruripTrackSha1.Groups[1].Value == "Trk" ? "track" : "gap",
-                                                       matchTruripTrackSha1.Groups[2].Value);
-
-                            continue;
-                        }
-
-                        if(matchTruripTrackUnknownHash.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin",
-                                                       "Found unknown hash for {1} {2} at line {0}. Please report this disc image.",
-                                                       lineNumber,
-                                                       matchTruripTrackUnknownHash.Groups[1].Value == "Trk" ? "track"
-                                                           : "gap", matchTruripTrackUnknownHash.Groups[2].Value);
-
-                            continue;
-                        }
+                        continue;
                     }
 
-                    inTruripDiscHash  = false;
-                    inTruripTrackHash = false;
-
-                    if(matchDumpExtent.Success                                                      &&
-                       !inTrack                                                                     &&
-                       ulong.TryParse(matchDumpExtent.Groups["start"].Value, out ulong extentStart) &&
-                       ulong.TryParse(matchDumpExtent.Groups["end"].Value, out ulong extentEnd))
+                    if(matchTruripDiscMd5.Success)
                     {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA DUMP EXTENT at line {0}",
-                                                   lineNumber);
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM MD5 at line {0}", lineNumber);
+                        _discImage.DiscHashes.Add("md5", matchTruripDiscMd5.Groups[1].Value.ToLowerInvariant());
 
-                        if(DumpHardware is null)
-                            DumpHardware = new List<DumpHardwareType>();
+                        continue;
+                    }
 
-                        DumpHardwareType existingDump =
-                            DumpHardware.FirstOrDefault(d =>
-                                                            d.Manufacturer == matchDumpExtent.Groups["manufacturer"].
-                                                                Value                                              &&
-                                                            d.Model    == matchDumpExtent.Groups["model"].Value    &&
-                                                            d.Firmware == matchDumpExtent.Groups["firmware"].Value &&
-                                                            d.Serial   == matchDumpExtent.Groups["serial"].Value   &&
-                                                            d.Software.Name == matchDumpExtent.Groups["application"].
-                                                                Value &&
-                                                            d.Software.Version == matchDumpExtent.
-                                                                Groups["version"].Value &&
-                                                            d.Software.OperatingSystem == matchDumpExtent.
-                                                                Groups["os"].Value);
+                    if(matchTruripDiscSha1.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM SHA1 at line {0}", lineNumber);
+                        _discImage.DiscHashes.Add("sha1", matchTruripDiscSha1.Groups[1].Value.ToLowerInvariant());
 
-                        if(existingDump is null)
+                        continue;
+                    }
+                }
+                else if(inTruripTrackHash)
+                {
+                    Match matchTruripTrackCrc32       = regexTruripTrackCrc32.Match(line);
+                    Match matchTruripTrackMd5         = regexTruripTrackMd5.Match(line);
+                    Match matchTruripTrackSha1        = regexTruripTrackSha1.Match(line);
+                    Match matchTruripTrackUnknownHash = regexTruripTrackUnknownHash.Match(line);
+
+                    if(matchTruripTrackCrc32.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found CRC32 for {1} {2} at line {0}",
+                                                   lineNumber,
+                                                   matchTruripTrackCrc32.Groups[1].Value == "Trk" ? "track" : "gap",
+                                                   matchTruripTrackCrc32.Groups[2].Value);
+
+                        continue;
+                    }
+
+                    if(matchTruripTrackMd5.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found CRC32 for {1} {2} at line {0}",
+                                                   lineNumber,
+                                                   matchTruripTrackMd5.Groups[1].Value == "Trk" ? "track" : "gap",
+                                                   matchTruripTrackMd5.Groups[2].Value);
+
+                        continue;
+                    }
+
+                    if(matchTruripTrackSha1.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found CRC32 for {1} {2} at line {0}",
+                                                   lineNumber,
+                                                   matchTruripTrackSha1.Groups[1].Value == "Trk" ? "track" : "gap",
+                                                   matchTruripTrackSha1.Groups[2].Value);
+
+                        continue;
+                    }
+
+                    if(matchTruripTrackUnknownHash.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin",
+                                                   "Found unknown hash for {1} {2} at line {0}. Please report this disc image.",
+                                                   lineNumber,
+                                                   matchTruripTrackUnknownHash.Groups[1].Value == "Trk" ? "track"
+                                                       : "gap", matchTruripTrackUnknownHash.Groups[2].Value);
+
+                        continue;
+                    }
+                }
+
+                inTruripDiscHash  = false;
+                inTruripTrackHash = false;
+
+                if(matchDumpExtent.Success                                                      &&
+                   !inTrack                                                                     &&
+                   ulong.TryParse(matchDumpExtent.Groups["start"].Value, out ulong extentStart) &&
+                   ulong.TryParse(matchDumpExtent.Groups["end"].Value, out ulong extentEnd))
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA DUMP EXTENT at line {0}",
+                                               lineNumber);
+
+                    if(DumpHardware is null)
+                        DumpHardware = new List<DumpHardwareType>();
+
+                    DumpHardwareType existingDump =
+                        DumpHardware.FirstOrDefault(d =>
+                                                        d.Manufacturer == matchDumpExtent.Groups["manufacturer"].
+                                                            Value                                              &&
+                                                        d.Model    == matchDumpExtent.Groups["model"].Value    &&
+                                                        d.Firmware == matchDumpExtent.Groups["firmware"].Value &&
+                                                        d.Serial   == matchDumpExtent.Groups["serial"].Value   &&
+                                                        d.Software.Name == matchDumpExtent.Groups["application"].
+                                                            Value &&
+                                                        d.Software.Version == matchDumpExtent.
+                                                                              Groups["version"].Value &&
+                                                        d.Software.OperatingSystem == matchDumpExtent.
+                                                            Groups["os"].Value);
+
+                    if(existingDump is null)
+                    {
+                        DumpHardware.Add(new DumpHardwareType
                         {
-                            DumpHardware.Add(new DumpHardwareType
+                            Extents = new[]
                             {
-                                Extents = new[]
-                                {
-                                    new ExtentType
-                                    {
-                                        Start = extentStart,
-                                        End   = extentEnd
-                                    }
-                                },
-                                Firmware     = matchDumpExtent.Groups["firmware"].Value,
-                                Manufacturer = matchDumpExtent.Groups["manufacturer"].Value,
-                                Model        = matchDumpExtent.Groups["model"].Value,
-                                Serial       = matchDumpExtent.Groups["serial"].Value,
-                                Software = new SoftwareType
-                                {
-                                    Name            = matchDumpExtent.Groups["application"].Value,
-                                    Version         = matchDumpExtent.Groups["version"].Value,
-                                    OperatingSystem = matchDumpExtent.Groups["os"].Value
-                                }
-                            });
-                        }
-                        else
-                        {
-                            existingDump.Extents = new List<ExtentType>(existingDump.Extents)
-                            {
-                                new()
+                                new ExtentType
                                 {
                                     Start = extentStart,
                                     End   = extentEnd
                                 }
-                            }.OrderBy(e => e.Start).ToArray();
-                        }
-                    }
-                    else if(matchDicMediaType.Success &&
-                            !inTrack)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA DIC MEDIA-TYPE at line {0}",
-                                                   lineNumber);
-
-                        _discImage.AaruMediaType = matchDicMediaType.Groups[1].Value;
-                    }
-                    else if(matchAaruMediaType.Success &&
-                            !inTrack)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA AARU MEDIA-TYPE at line {0}",
-                                                   lineNumber);
-
-                        _discImage.AaruMediaType = matchAaruMediaType.Groups[1].Value;
-                    }
-                    else if(matchDiskType.Success &&
-                            !inTrack)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM ORIGINAL MEDIA TYPE at line {0}",
-                                                   lineNumber);
-
-                        _discImage.OriginalMediaType = matchDiskType.Groups[1].Value;
-                    }
-                    else if(matchSession.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM SESSION at line {0}", lineNumber);
-                        currentSession      = byte.Parse(matchSession.Groups[1].Value);
-                        firstTrackInSession = true;
-                    }
-                    else if(matchRedumpSdArea.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM SINGLE-DENSITY AREA at line {0}",
-                                                   lineNumber);
-
-                        _discImage.IsRedumpGigadisc = true;
-                        firstTrackInSession         = true;
-                    }
-                    else if(matchRedumpHdArea.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM HIGH-DENSITY AREA at line {0}",
-                                                   lineNumber);
-
-                        _discImage.IsRedumpGigadisc = true;
-                        currentSession              = 2;
-                        firstTrackInSession         = true;
-                    }
-                    else if(matchLba.Success)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM MSF at line {0}", lineNumber);
-                    else if(matchLeadOut.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM LEAD-OUT at line {0}", lineNumber);
-                        leadouts[currentSession] = CdrWinMsfToLba(matchLeadOut.Groups[1].Value);
-                    }
-                    else if(matchApplication.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM Ripping Tool at line {0}", lineNumber);
-                        _imageInfo.Application = matchApplication.Groups[1].Value;
-                    }
-                    else if(matchApplicationVersion.Success &&
-                            !inTrack)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM Ripping Tool Version at line {0}",
-                                                   lineNumber);
-
-                        _imageInfo.ApplicationVersion = matchApplicationVersion.Groups[1].Value;
-                    }
-                    else if(matchTruripDisc.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM DISC HASHES at line {0}", lineNumber);
-                        inTruripDiscHash = true;
-                    }
-                    else if(matchTruripTrack.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin",
-                                                   "Found REM Gap Append Method: {1} [{2}] HASHES at line {0}",
-                                                   lineNumber, matchTruripTrack.Groups[1].Value,
-                                                   matchTruripTrack.Groups[2].Value);
-
-                        inTruripTrackHash   = true;
-                        _discImage.IsTrurip = true;
-                    }
-                    else if(matchComment.Success)
-                    {
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM at line {0}", lineNumber);
-
-                        if(_discImage.Comment == "")
-                            _discImage.Comment = matchComment.Groups[1].Value; // First comment
-                        else
-                            _discImage.Comment +=
-                                Environment.NewLine + matchComment.Groups[1].Value; // Append new comments as new lines
+                            },
+                            Firmware     = matchDumpExtent.Groups["firmware"].Value,
+                            Manufacturer = matchDumpExtent.Groups["manufacturer"].Value,
+                            Model        = matchDumpExtent.Groups["model"].Value,
+                            Serial       = matchDumpExtent.Groups["serial"].Value,
+                            Software = new SoftwareType
+                            {
+                                Name            = matchDumpExtent.Groups["application"].Value,
+                                Version         = matchDumpExtent.Groups["version"].Value,
+                                OperatingSystem = matchDumpExtent.Groups["os"].Value
+                            }
+                        });
                     }
                     else
                     {
-                        matchTrack = regexTrack.Match(line);
-                        Match matchTitle      = regexTitle.Match(line);
-                        Match matchSongWriter = regexSongWriter.Match(line);
-                        Match matchPregap     = regexPregap.Match(line);
-                        Match matchPostgap    = regexPostgap.Match(line);
-                        Match matchPerformer  = regexPerformer.Match(line);
-                        Match matchMcn        = regexMcn.Match(line);
-                        Match matchIsrc       = regexIsrc.Match(line);
-                        Match matchIndex      = regexIndex.Match(line);
-                        Match matchGenre      = regexGenre.Match(line);
-                        Match matchFlags      = regexFlags.Match(line);
-                        Match matchFile       = regexFile.Match(line);
-                        Match matchDiskId     = regexDiskId.Match(line);
-                        Match matchComposer   = regexComposer.Match(line);
-                        Match matchCdText     = regexCdText.Match(line);
-                        Match matchBarCode    = regexBarCode.Match(line);
-                        Match matchArranger   = regexArranger.Match(line);
-
-                        if(matchArranger.Success)
+                        existingDump.Extents = new List<ExtentType>(existingDump.Extents)
                         {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found ARRANGER at line {0}", lineNumber);
-
-                            if(inTrack)
-                                currentTrack.Arranger = matchArranger.Groups[1].Value;
-                            else
-                                _discImage.Arranger = matchArranger.Groups[1].Value;
-                        }
-                        else if(matchBarCode.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found UPC_EAN at line {0}", lineNumber);
-
-                            if(!inTrack)
-                                _discImage.Barcode = matchBarCode.Groups[1].Value;
-                            else
+                            new()
                             {
-                                AaruConsole.
-                                    ErrorWriteLine($"Found barcode field in incorrect place at line {lineNumber}");
-
-                                return ErrorNumber.InvalidArgument;
+                                Start = extentStart,
+                                End   = extentEnd
                             }
-                        }
-                        else if(matchCdText.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found CDTEXTFILE at line {0}", lineNumber);
-
-                            if(!inTrack)
-                                _discImage.CdTextFile = matchCdText.Groups[1].Value;
-                            else
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine($"Found CD-Text file field in incorrect place at line {lineNumber}");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-                        }
-                        else if(matchComposer.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found COMPOSER at line {0}", lineNumber);
-
-                            if(inTrack)
-                                currentTrack.Composer = matchComposer.Groups[1].Value;
-                            else
-                                _discImage.Composer = matchComposer.Groups[1].Value;
-                        }
-                        else if(matchDiskId.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found DISC_ID at line {0}", lineNumber);
-
-                            if(!inTrack)
-                                _discImage.DiscId = matchDiskId.Groups[1].Value;
-                            else
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine($"Found CDDB ID field in incorrect place at line {lineNumber}");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-                        }
-                        else if(matchFile.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found FILE at line {0}", lineNumber);
-
-                            if(currentTrack.Sequence != 0)
-                            {
-                                currentFile.Sequence   = currentTrack.Sequence;
-                                currentTrack.TrackFile = currentFile;
-
-                                _negativeEnd = currentFile.DataFilter.Length - (long)currentFile.Offset < 0;
-
-                                currentTrack.Sectors = ((ulong)currentFile.DataFilter.Length - currentFile.Offset) /
-                                                       CdrWinTrackTypeToBytesPerSector(currentTrack.TrackType);
-
-                                cueTracks[currentTrack.Sequence - 1] = currentTrack;
-                                inTrack                              = false;
-                                currentTrack                         = new CdrWinTrack();
-                                currentFile                          = new CdrWinTrackFile();
-                                filtersList                          = new FiltersList();
-                            }
-
-                            string datafile = matchFile.Groups[1].Value;
-                            currentFile.FileType = matchFile.Groups[2].Value;
-
-                            // Check if file path is quoted
-                            if(datafile[0]  == '"' &&
-                               datafile[^1] == '"')
-                                datafile = datafile.Substring(1, datafile.Length - 2); // Unquote it
-
-                            currentFile.DataFilter = filtersList.GetFilter(datafile);
-
-                            // Check if file exists
-                            if(currentFile.DataFilter == null)
-                                if(datafile[0] == '/' ||
-                                   (datafile[0] == '/' && datafile[1] == '.')) // UNIX absolute path
-                                {
-                                    var   unixPath      = new Regex("^(.+)/([^/]+)$");
-                                    Match unixPathMatch = unixPath.Match(datafile);
-
-                                    if(unixPathMatch.Success)
-                                    {
-                                        currentFile.DataFilter = filtersList.GetFilter(unixPathMatch.Groups[1].Value);
-
-                                        if(currentFile.DataFilter == null)
-                                        {
-                                            string path = imageFilter.ParentFolder + Path.PathSeparator +
-                                                          unixPathMatch.Groups[1].Value;
-
-                                            currentFile.DataFilter = filtersList.GetFilter(path);
-
-                                            if(currentFile.DataFilter == null)
-                                            {
-                                                AaruConsole.
-                                                    ErrorWriteLine($"File \"{matchFile.Groups[1].Value}\" not found.");
-
-                                                return ErrorNumber.NoSuchFile;
-                                            }
-                                        }
-                                    }
-                                    else
-                                    {
-                                        AaruConsole.ErrorWriteLine($"File \"{matchFile.Groups[1].Value}\" not found.");
-
-                                        return ErrorNumber.NoSuchFile;
-                                    }
-                                }
-                                else if((datafile[1] == ':'  && datafile[2] == '\\') ||
-                                        (datafile[0] == '\\' && datafile[1] == '\\') ||
-                                        (datafile[0] == '.'  && datafile[1] == '\\')) // Windows absolute path
-                                {
-                                    var winPath =
-                                        new
-                                            Regex("^(?:[a-zA-Z]\\:(\\\\|\\/)|file\\:\\/\\/|\\\\\\\\|\\.(\\/|\\\\))([^\\\\\\/\\:\\*\\?\\<\\>\\\"\\|]+(\\\\|\\/){0,1})+$");
-
-                                    Match winPathMatch = winPath.Match(datafile);
-
-                                    if(winPathMatch.Success)
-                                    {
-                                        currentFile.DataFilter = filtersList.GetFilter(winPathMatch.Groups[1].Value);
-
-                                        if(currentFile.DataFilter == null)
-                                        {
-                                            string path = imageFilter.ParentFolder + Path.PathSeparator +
-                                                          winPathMatch.Groups[1].Value;
-
-                                            currentFile.DataFilter = filtersList.GetFilter(path);
-
-                                            if(currentFile.DataFilter == null)
-                                            {
-                                                AaruConsole.
-                                                    ErrorWriteLine($"File \"{matchFile.Groups[1].Value}\" not found.");
-
-                                                return ErrorNumber.NoSuchFile;
-                                            }
-                                        }
-                                    }
-                                    else
-                                    {
-                                        AaruConsole.ErrorWriteLine($"File \"{matchFile.Groups[1].Value}\" not found.");
-
-                                        return ErrorNumber.NoSuchFile;
-                                    }
-                                }
-                                else
-                                {
-                                    string path = imageFilter.ParentFolder + Path.PathSeparator + datafile;
-                                    currentFile.DataFilter = filtersList.GetFilter(path);
-
-                                    if(currentFile.DataFilter == null)
-                                    {
-                                        AaruConsole.ErrorWriteLine($"File \"{matchFile.Groups[1].Value}\" not found.");
-
-                                        return ErrorNumber.NoSuchFile;
-                                    }
-                                }
-
-                            // File does exist, process it
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "File \"{0}\" found",
-                                                       currentFile.DataFilter.Filename);
-
-                            switch(currentFile.FileType)
-                            {
-                                case CDRWIN_DISK_TYPE_LITTLE_ENDIAN: break;
-                                case CDRWIN_DISK_TYPE_BIG_ENDIAN:
-                                case CDRWIN_DISK_TYPE_AIFF:
-                                case CDRWIN_DISK_TYPE_RIFF:
-                                case CDRWIN_DISK_TYPE_MP3:
-                                    AaruConsole.ErrorWriteLine($"Unsupported file type {currentFile.FileType}");
-
-                                    return ErrorNumber.NotImplemented;
-                                default:
-                                    AaruConsole.ErrorWriteLine($"Unknown file type {currentFile.FileType}");
-
-                                    return ErrorNumber.InvalidArgument;
-                            }
-
-                            currentFile.Offset   = 0;
-                            currentFile.Sequence = 0;
-                        }
-                        else if(matchFlags.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found FLAGS at line {0}", lineNumber);
-
-                            if(!inTrack)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine($"Found FLAGS field in incorrect place at line {lineNumber}");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-
-                            currentTrack.FlagDcp  |= matchFlags.Groups["dcp"].Value  == "DCP";
-                            currentTrack.Flag4Ch  |= matchFlags.Groups["quad"].Value == "4CH";
-                            currentTrack.FlagPre  |= matchFlags.Groups["pre"].Value  == "PRE";
-                            currentTrack.FlagScms |= matchFlags.Groups["scms"].Value == "SCMS";
-                        }
-                        else if(matchGenre.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found GENRE at line {0}", lineNumber);
-
-                            if(inTrack)
-                                currentTrack.Genre = matchGenre.Groups[1].Value;
-                            else
-                                _discImage.Genre = matchGenre.Groups[1].Value;
-                        }
-                        else if(matchIndex.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found INDEX at line {0}", lineNumber);
-
-                            if(!inTrack)
-                            {
-                                AaruConsole.ErrorWriteLine($"Found INDEX before a track {lineNumber}");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-
-                            ushort index  = ushort.Parse(matchIndex.Groups[1].Value);
-                            int    offset = CdrWinMsfToLba(matchIndex.Groups[2].Value) + cumulativeEmptyPregap;
-
-                            if(index                      != 0 &&
-                               index                      != 1 &&
-                               currentTrack.Indexes.Count == 0)
-                            {
-                                AaruConsole.ErrorWriteLine($"Found INDEX {index} before INDEX 00 or INDEX 01");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-
-                            if(index == 0 ||
-                               (index == 1 && !currentTrack.Indexes.ContainsKey(0)))
-                                if((int)(currentTrack.Sequence - 2) >= 0 &&
-                                   offset                           > 1)
-                                {
-                                    cueTracks[currentTrack.Sequence - 2].Sectors =
-                                        (ulong)(offset - (int)currentFileOffsetSector);
-
-                                    currentFile.Offset +=
-                                        cueTracks[currentTrack.Sequence - 2].Sectors *
-                                        cueTracks[currentTrack.Sequence - 2].Bps;
-
-                                    AaruConsole.DebugWriteLine("CDRWin plugin", "Sets currentFile.offset to {0}",
-                                                               currentFile.Offset);
-
-                                    AaruConsole.DebugWriteLine("CDRWin plugin",
-                                                               "cueTracks[currentTrack.sequence-2].sectors = {0}",
-                                                               cueTracks[currentTrack.Sequence - 2].Sectors);
-
-                                    AaruConsole.DebugWriteLine("CDRWin plugin",
-                                                               "cueTracks[currentTrack.sequence-2].bps = {0}",
-                                                               cueTracks[currentTrack.Sequence - 2].Bps);
-                                }
-
-                            if((index == 0 || (index == 1 && !currentTrack.Indexes.ContainsKey(0))) &&
-                               currentTrack.Sequence == 1)
-                            {
-                                AaruConsole.DebugWriteLine("CDRWin plugin", "Sets currentFile.offset to {0}",
-                                                           offset * currentTrack.Bps);
-
-                                currentFile.Offset = (ulong)(offset * currentTrack.Bps);
-                            }
-
-                            if(currentTrack.Indexes.Count == 0)
-                            {
-                                if(firstTrackInSession &&
-                                   index  != 0         &&
-                                   offset > 150)
-                                {
-                                    currentTrack.Indexes[0] =  offset - 150;
-                                    firstTrackInSession     =  false;
-                                    currentFileOffsetSector =  offset - 150;
-                                    currentFile.Offset      -= (ulong)(150 * currentTrack.Bps);
-                                }
-                                else
-                                    currentFileOffsetSector = offset;
-                            }
-
-                            if(index              == 1 &&
-                               currentEmptyPregap > 0  &&
-                               !currentTrack.Indexes.ContainsKey(0))
-                            {
-                                currentTrack.Indexes[0] =  offset;
-                                currentFile.Offset      -= (ulong)(currentEmptyPregap * currentTrack.Bps);
-                                offset                  += currentEmptyPregap;
-                                cumulativeEmptyPregap   += currentEmptyPregap;
-                                currentEmptyPregap      =  0;
-                            }
-
-                            currentTrack.Indexes.Add(index, offset);
-                        }
-                        else if(matchIsrc.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found ISRC at line {0}", lineNumber);
-
-                            if(!inTrack)
-                            {
-                                AaruConsole.ErrorWriteLine($"Found ISRC before a track {lineNumber}");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-
-                            currentTrack.Isrc = matchIsrc.Groups[1].Value;
-                        }
-                        else if(matchMcn.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found CATALOG at line {0}", lineNumber);
-
-                            if(!inTrack)
-                                _discImage.Mcn = matchMcn.Groups[1].Value;
-                            else
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine($"Found CATALOG field in incorrect place at line {lineNumber}");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-                        }
-                        else if(matchPerformer.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found PERFORMER at line {0}", lineNumber);
-
-                            if(inTrack)
-                                currentTrack.Performer = matchPerformer.Groups[1].Value;
-                            else
-                                _discImage.Performer = matchPerformer.Groups[1].Value;
-                        }
-                        else if(matchPostgap.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found POSTGAP at line {0}", lineNumber);
-
-                            if(inTrack)
-                                currentTrack.Postgap = CdrWinMsfToLba(matchPostgap.Groups[1].Value);
-                            else
-                            {
-                                AaruConsole.ErrorWriteLine($"Found POSTGAP field before a track at line {lineNumber}");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-                        }
-                        else if(matchPregap.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found PREGAP at line {0}", lineNumber);
-
-                            if(!inTrack)
-                            {
-                                AaruConsole.ErrorWriteLine($"Found PREGAP field before a track at line {lineNumber}");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-
-                            currentEmptyPregap = CdrWinMsfToLba(matchPregap.Groups[1].Value);
-                        }
-                        else if(matchSongWriter.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found SONGWRITER at line {0}", lineNumber);
-
-                            if(inTrack)
-                                currentTrack.Songwriter = matchSongWriter.Groups[1].Value;
-                            else
-                                _discImage.Songwriter = matchSongWriter.Groups[1].Value;
-                        }
-                        else if(matchTitle.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found TITLE at line {0}", lineNumber);
-
-                            if(inTrack)
-                                currentTrack.Title = matchTitle.Groups[1].Value;
-                            else
-                                _discImage.Title = matchTitle.Groups[1].Value;
-                        }
-                        else if(matchTrack.Success)
-                        {
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Found TRACK at line {0}", lineNumber);
-
-                            if(currentFile.DataFilter == null)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine($"Found TRACK field before a file is defined at line {lineNumber}");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-
-                            if(inTrack)
-                            {
-                                if(currentTrack.Indexes.ContainsKey(0) &&
-                                   currentTrack.Pregap == 0)
-                                    currentTrack.Indexes.TryGetValue(0, out currentTrack.Pregap);
-
-                                currentFile.Sequence                 = currentTrack.Sequence;
-                                currentTrack.TrackFile               = currentFile;
-                                cueTracks[currentTrack.Sequence - 1] = currentTrack;
-                            }
-
-                            currentTrack = new CdrWinTrack
-                            {
-                                Indexes  = new SortedDictionary<ushort, int>(),
-                                Sequence = uint.Parse(matchTrack.Groups[1].Value)
-                            };
-
-                            AaruConsole.DebugWriteLine("CDRWin plugin", "Setting currentTrack.sequence to {0}",
-                                                       currentTrack.Sequence);
-
-                            currentFile.Sequence   = currentTrack.Sequence;
-                            currentTrack.Bps       = CdrWinTrackTypeToBytesPerSector(matchTrack.Groups[2].Value);
-                            currentTrack.TrackType = matchTrack.Groups[2].Value.ToUpperInvariant();
-                            currentTrack.Session   = currentSession;
-                            inTrack                = true;
-                        }
-                        else if(line.Contains("INDEX 01 00:-2:00"))
+                        }.OrderBy(e => e.Start).ToArray();
+                    }
+                }
+                else if(matchDicMediaType.Success &&
+                        !inTrack)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA DIC MEDIA-TYPE at line {0}",
+                                               lineNumber);
+
+                    _discImage.AaruMediaType = matchDicMediaType.Groups[1].Value;
+                }
+                else if(matchAaruMediaType.Success &&
+                        !inTrack)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM METADATA AARU MEDIA-TYPE at line {0}",
+                                               lineNumber);
+
+                    _discImage.AaruMediaType = matchAaruMediaType.Groups[1].Value;
+                }
+                else if(matchDiskType.Success &&
+                        !inTrack)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM ORIGINAL MEDIA TYPE at line {0}",
+                                               lineNumber);
+
+                    _discImage.OriginalMediaType = matchDiskType.Groups[1].Value;
+                }
+                else if(matchSession.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM SESSION at line {0}", lineNumber);
+                    currentSession      = byte.Parse(matchSession.Groups[1].Value);
+                    firstTrackInSession = true;
+                }
+                else if(matchRedumpSdArea.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM SINGLE-DENSITY AREA at line {0}",
+                                               lineNumber);
+
+                    _discImage.IsRedumpGigadisc = true;
+                    firstTrackInSession         = true;
+                }
+                else if(matchRedumpHdArea.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM HIGH-DENSITY AREA at line {0}",
+                                               lineNumber);
+
+                    _discImage.IsRedumpGigadisc = true;
+                    currentSession              = 2;
+                    firstTrackInSession         = true;
+                }
+                else if(matchLba.Success)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM MSF at line {0}", lineNumber);
+                else if(matchLeadOut.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM LEAD-OUT at line {0}", lineNumber);
+                    leadouts[currentSession] = CdrWinMsfToLba(matchLeadOut.Groups[1].Value);
+                }
+                else if(matchApplication.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM Ripping Tool at line {0}", lineNumber);
+                    _imageInfo.Application = matchApplication.Groups[1].Value;
+                }
+                else if(matchApplicationVersion.Success &&
+                        !inTrack)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM Ripping Tool Version at line {0}",
+                                               lineNumber);
+
+                    _imageInfo.ApplicationVersion = matchApplicationVersion.Groups[1].Value;
+                }
+                else if(matchTruripDisc.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM DISC HASHES at line {0}", lineNumber);
+                    inTruripDiscHash = true;
+                }
+                else if(matchTruripTrack.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin",
+                                               "Found REM Gap Append Method: {1} [{2}] HASHES at line {0}",
+                                               lineNumber, matchTruripTrack.Groups[1].Value,
+                                               matchTruripTrack.Groups[2].Value);
+
+                    inTruripTrackHash   = true;
+                    _discImage.IsTrurip = true;
+                }
+                else if(matchComment.Success)
+                {
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "Found REM at line {0}", lineNumber);
+
+                    if(_discImage.Comment == "")
+                        _discImage.Comment = matchComment.Groups[1].Value; // First comment
+                    else
+                        _discImage.Comment +=
+                            Environment.NewLine + matchComment.Groups[1].Value; // Append new comments as new lines
+                }
+                else
+                {
+                    matchTrack = regexTrack.Match(line);
+                    Match matchTitle      = regexTitle.Match(line);
+                    Match matchSongWriter = regexSongWriter.Match(line);
+                    Match matchPregap     = regexPregap.Match(line);
+                    Match matchPostgap    = regexPostgap.Match(line);
+                    Match matchPerformer  = regexPerformer.Match(line);
+                    Match matchMcn        = regexMcn.Match(line);
+                    Match matchIsrc       = regexIsrc.Match(line);
+                    Match matchIndex      = regexIndex.Match(line);
+                    Match matchGenre      = regexGenre.Match(line);
+                    Match matchFlags      = regexFlags.Match(line);
+                    Match matchFile       = regexFile.Match(line);
+                    Match matchDiskId     = regexDiskId.Match(line);
+                    Match matchComposer   = regexComposer.Match(line);
+                    Match matchCdText     = regexCdText.Match(line);
+                    Match matchBarCode    = regexBarCode.Match(line);
+                    Match matchArranger   = regexArranger.Match(line);
+
+                    if(matchArranger.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found ARRANGER at line {0}", lineNumber);
+
+                        if(inTrack)
+                            currentTrack.Arranger = matchArranger.Groups[1].Value;
+                        else
+                            _discImage.Arranger = matchArranger.Groups[1].Value;
+                    }
+                    else if(matchBarCode.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found UPC_EAN at line {0}", lineNumber);
+
+                        if(!inTrack)
+                            _discImage.Barcode = matchBarCode.Groups[1].Value;
+                        else
                         {
                             AaruConsole.
-                                ErrorWriteLine("This image from PowerISO is damaged beyond possible recovery. Will not open.");
+                                ErrorWriteLine($"Found barcode field in incorrect place at line {lineNumber}");
 
                             return ErrorNumber.InvalidArgument;
                         }
-                        else if(line == "") // Empty line, ignore it
-                        {}
-                        else // Non-empty unknown field
-                        {
-                            AaruConsole.ErrorWriteLine($"Found unknown field defined at line {lineNumber}: \"{line}\"");
+                    }
+                    else if(matchCdText.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found CDTEXTFILE at line {0}", lineNumber);
 
-                            return ErrorNumber.NotSupported;
+                        if(!inTrack)
+                            _discImage.CdTextFile = matchCdText.Groups[1].Value;
+                        else
+                        {
+                            AaruConsole.
+                                ErrorWriteLine($"Found CD-Text file field in incorrect place at line {lineNumber}");
+
+                            return ErrorNumber.InvalidArgument;
                         }
                     }
-                }
-
-                if(currentTrack.Sequence != 0)
-                {
-                    currentFile.Sequence   = currentTrack.Sequence;
-                    currentTrack.TrackFile = currentFile;
-
-                    _negativeEnd = currentFile.DataFilter.Length - (long)currentFile.Offset < 0;
-
-                    currentTrack.Sectors = ((ulong)currentFile.DataFilter.Length - currentFile.Offset) /
-                                           CdrWinTrackTypeToBytesPerSector(currentTrack.TrackType);
-
-                    cueTracks[currentTrack.Sequence - 1] = currentTrack;
-                }
-
-                if(_negativeEnd)
-                {
-                    string firstFile = cueTracks[0].TrackFile.DataFilter.Path;
-
-                    if(cueTracks.Any(t => t.Session > 1 || t.TrackFile.DataFilter.Path != firstFile) ||
-                       cueTracks[0].Indexes.ContainsKey(0))
+                    else if(matchComposer.Success)
                     {
-                        AaruConsole.
-                            ErrorWriteLine("The data files are not correct according to the cuesheet file, cannot continue with this file.");
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found COMPOSER at line {0}", lineNumber);
 
-                        return ErrorNumber.InvalidArgument;
+                        if(inTrack)
+                            currentTrack.Composer = matchComposer.Groups[1].Value;
+                        else
+                            _discImage.Composer = matchComposer.Groups[1].Value;
                     }
-
-                    cueTracks[0].Pregap = cueTracks[0].Indexes[1];
-                    int reduceOffset = cueTracks[0].Pregap * cueTracks[0].Bps;
-
-                    foreach(CdrWinTrack track in cueTracks)
-                        track.TrackFile.Offset -= (ulong)reduceOffset;
-
-                    if(currentFile.DataFilter.Length - (long)cueTracks[currentTrack.Sequence - 1].TrackFile.Offset < 0)
+                    else if(matchDiskId.Success)
                     {
-                        AaruConsole.
-                            ErrorWriteLine("The data files are not correct according to the cuesheet file, cannot continue with this file.");
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found DISC_ID at line {0}", lineNumber);
 
-                        return ErrorNumber.InvalidArgument;
-                    }
-
-                    cueTracks[currentTrack.Sequence - 1].Sectors =
-                        ((ulong)currentFile.DataFilter.Length - cueTracks[currentTrack.Sequence - 1].TrackFile.Offset) /
-                        cueTracks[currentTrack.Sequence - 1].Bps;
-
-                    cueTracks[0].Indexes[0] =  0;
-                    _lostPregap             =  (uint)cueTracks[0].Pregap;
-                    cueTracks[0].Sectors    += _lostPregap;
-
-                    AaruConsole.
-                        ErrorWriteLine("The data files are missing a pregap or hidden track contents, will do best effort to make the rest of the image readable.");
-                }
-
-                Session[] sessions = new Session[currentSession];
-
-                for(int s = 1; s <= sessions.Length; s++)
-                {
-                    bool firstTrackRead = false;
-                    sessions[s - 1].Sequence = (ushort)s;
-
-                    ulong sessionSectors   = 0;
-                    int   lastSessionTrack = 0;
-                    int   firstSessionTrk  = 0;
-
-                    for(int i = 0; i < cueTracks.Length; i++)
-                        if(cueTracks[i].Session == s)
+                        if(!inTrack)
+                            _discImage.DiscId = matchDiskId.Groups[1].Value;
+                        else
                         {
-                            if(!firstTrackRead)
+                            AaruConsole.
+                                ErrorWriteLine($"Found CDDB ID field in incorrect place at line {lineNumber}");
+
+                            return ErrorNumber.InvalidArgument;
+                        }
+                    }
+                    else if(matchFile.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found FILE at line {0}", lineNumber);
+
+                        if(currentTrack.Sequence != 0)
+                        {
+                            currentFile.Sequence   = currentTrack.Sequence;
+                            currentTrack.TrackFile = currentFile;
+
+                            _negativeEnd = currentFile.DataFilter.Length - (long)currentFile.Offset < 0;
+
+                            currentTrack.Sectors = ((ulong)currentFile.DataFilter.Length - currentFile.Offset) /
+                                                   CdrWinTrackTypeToBytesPerSector(currentTrack.TrackType);
+
+                            cueTracks[currentTrack.Sequence - 1] = currentTrack;
+                            inTrack                              = false;
+                            currentTrack                         = new CdrWinTrack();
+                            currentFile                          = new CdrWinTrackFile();
+                            filtersList                          = new FiltersList();
+                        }
+
+                        string datafile = matchFile.Groups[1].Value;
+                        currentFile.FileType = matchFile.Groups[2].Value;
+
+                        // Check if file path is quoted
+                        if(datafile[0]  == '"' &&
+                           datafile[^1] == '"')
+                            datafile = datafile.Substring(1, datafile.Length - 2); // Unquote it
+
+                        currentFile.DataFilter = filtersList.GetFilter(datafile);
+
+                        // Check if file exists
+                        if(currentFile.DataFilter == null)
+                            if(datafile[0] == '/' ||
+                               (datafile[0] == '/' && datafile[1] == '.')) // UNIX absolute path
                             {
-                                firstSessionTrk = i;
-                                firstTrackRead  = true;
+                                var   unixPath      = new Regex("^(.+)/([^/]+)$");
+                                Match unixPathMatch = unixPath.Match(datafile);
+
+                                if(unixPathMatch.Success)
+                                {
+                                    currentFile.DataFilter = filtersList.GetFilter(unixPathMatch.Groups[1].Value);
+
+                                    if(currentFile.DataFilter == null)
+                                    {
+                                        string path = imageFilter.ParentFolder + Path.PathSeparator +
+                                                      unixPathMatch.Groups[1].Value;
+
+                                        currentFile.DataFilter = filtersList.GetFilter(path);
+
+                                        if(currentFile.DataFilter == null)
+                                        {
+                                            AaruConsole.
+                                                ErrorWriteLine($"File \"{matchFile.Groups[1].Value}\" not found.");
+
+                                            return ErrorNumber.NoSuchFile;
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    AaruConsole.ErrorWriteLine($"File \"{matchFile.Groups[1].Value}\" not found.");
+
+                                    return ErrorNumber.NoSuchFile;
+                                }
+                            }
+                            else if((datafile[1] == ':'  && datafile[2] == '\\') ||
+                                    (datafile[0] == '\\' && datafile[1] == '\\') ||
+                                    (datafile[0] == '.'  && datafile[1] == '\\')) // Windows absolute path
+                            {
+                                var winPath =
+                                    new
+                                        Regex("^(?:[a-zA-Z]\\:(\\\\|\\/)|file\\:\\/\\/|\\\\\\\\|\\.(\\/|\\\\))([^\\\\\\/\\:\\*\\?\\<\\>\\\"\\|]+(\\\\|\\/){0,1})+$");
+
+                                Match winPathMatch = winPath.Match(datafile);
+
+                                if(winPathMatch.Success)
+                                {
+                                    currentFile.DataFilter = filtersList.GetFilter(winPathMatch.Groups[1].Value);
+
+                                    if(currentFile.DataFilter == null)
+                                    {
+                                        string path = imageFilter.ParentFolder + Path.PathSeparator +
+                                                      winPathMatch.Groups[1].Value;
+
+                                        currentFile.DataFilter = filtersList.GetFilter(path);
+
+                                        if(currentFile.DataFilter == null)
+                                        {
+                                            AaruConsole.
+                                                ErrorWriteLine($"File \"{matchFile.Groups[1].Value}\" not found.");
+
+                                            return ErrorNumber.NoSuchFile;
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    AaruConsole.ErrorWriteLine($"File \"{matchFile.Groups[1].Value}\" not found.");
+
+                                    return ErrorNumber.NoSuchFile;
+                                }
+                            }
+                            else
+                            {
+                                string path = imageFilter.ParentFolder + Path.PathSeparator + datafile;
+                                currentFile.DataFilter = filtersList.GetFilter(path);
+
+                                if(currentFile.DataFilter == null)
+                                {
+                                    AaruConsole.ErrorWriteLine($"File \"{matchFile.Groups[1].Value}\" not found.");
+
+                                    return ErrorNumber.NoSuchFile;
+                                }
                             }
 
-                            sessionSectors += cueTracks[i].Sectors;
+                        // File does exist, process it
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "File \"{0}\" found",
+                                                   currentFile.DataFilter.Filename);
 
-                            if(i > lastSessionTrack)
-                                lastSessionTrack = i;
+                        switch(currentFile.FileType)
+                        {
+                            case CDRWIN_DISK_TYPE_LITTLE_ENDIAN: break;
+                            case CDRWIN_DISK_TYPE_BIG_ENDIAN:
+                            case CDRWIN_DISK_TYPE_AIFF:
+                            case CDRWIN_DISK_TYPE_RIFF:
+                            case CDRWIN_DISK_TYPE_MP3:
+                                AaruConsole.ErrorWriteLine($"Unsupported file type {currentFile.FileType}");
+
+                                return ErrorNumber.NotImplemented;
+                            default:
+                                AaruConsole.ErrorWriteLine($"Unknown file type {currentFile.FileType}");
+
+                                return ErrorNumber.InvalidArgument;
                         }
 
-                    if(s > 1)
-                        if(_discImage.IsRedumpGigadisc)
-                            sessions[s - 1].StartSector = gdRomSession2Offset;
+                        currentFile.Offset   = 0;
+                        currentFile.Sequence = 0;
+                    }
+                    else if(matchFlags.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found FLAGS at line {0}", lineNumber);
+
+                        if(!inTrack)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine($"Found FLAGS field in incorrect place at line {lineNumber}");
+
+                            return ErrorNumber.InvalidArgument;
+                        }
+
+                        currentTrack.FlagDcp  |= matchFlags.Groups["dcp"].Value  == "DCP";
+                        currentTrack.Flag4Ch  |= matchFlags.Groups["quad"].Value == "4CH";
+                        currentTrack.FlagPre  |= matchFlags.Groups["pre"].Value  == "PRE";
+                        currentTrack.FlagScms |= matchFlags.Groups["scms"].Value == "SCMS";
+                    }
+                    else if(matchGenre.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found GENRE at line {0}", lineNumber);
+
+                        if(inTrack)
+                            currentTrack.Genre = matchGenre.Groups[1].Value;
                         else
-                            sessions[s - 1].StartSector = sessions[s - 2].EndSector + 1;
-                    else
-                        sessions[s - 1].StartSector = 0;
-
-                    sessions[s - 1].StartTrack = cueTracks[firstSessionTrk].Sequence;
-                    sessions[s - 1].EndTrack   = cueTracks[lastSessionTrack].Sequence;
-
-                    if(leadouts.TryGetValue((byte)s, out int leadout))
-                    {
-                        int startSector;
-                        sessions[s - 1].EndSector = (ulong)(leadout - 1);
-
-                        if(!cueTracks[lastSessionTrack].Indexes.TryGetValue(0, out startSector))
-                            cueTracks[lastSessionTrack].Indexes.TryGetValue(1, out startSector);
-
-                        cueTracks[lastSessionTrack].Sectors = (ulong)(leadout - startSector);
+                            _discImage.Genre = matchGenre.Groups[1].Value;
                     }
-                    else
-                        sessions[s - 1].EndSector = sessions[s - 1].StartSector + sessionSectors - 1;
-
-                    CdrWinTrack firstSessionTrack = cueTracks.OrderBy(t => t.Sequence).First(t => t.Session == s);
-
-                    firstSessionTrack.Indexes.TryGetValue(0, out firstSessionTrack.Pregap);
-
-                    if(firstSessionTrack.Pregap < 150)
-                        firstSessionTrack.Pregap = 150;
-
-                    if(cueTracks.Any(i => i.TrackFile.DataFilter.Filename !=
-                                          cueTracks.First().TrackFile.DataFilter.Filename))
-                        continue;
-
-                    if(firstSessionTrack.Indexes.TryGetValue(0, out int sessionStart))
+                    else if(matchIndex.Success)
                     {
-                        sessions[s - 1].StartSector = (ulong)sessionStart;
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found INDEX at line {0}", lineNumber);
 
-                        continue;
+                        if(!inTrack)
+                        {
+                            AaruConsole.ErrorWriteLine($"Found INDEX before a track {lineNumber}");
+
+                            return ErrorNumber.InvalidArgument;
+                        }
+
+                        ushort index  = ushort.Parse(matchIndex.Groups[1].Value);
+                        int    offset = CdrWinMsfToLba(matchIndex.Groups[2].Value) + cumulativeEmptyPregap;
+
+                        if(index                      != 0 &&
+                           index                      != 1 &&
+                           currentTrack.Indexes.Count == 0)
+                        {
+                            AaruConsole.ErrorWriteLine($"Found INDEX {index} before INDEX 00 or INDEX 01");
+
+                            return ErrorNumber.InvalidArgument;
+                        }
+
+                        if(index == 0 ||
+                           (index == 1 && !currentTrack.Indexes.ContainsKey(0)))
+                            if((int)(currentTrack.Sequence - 2) >= 0 &&
+                               offset                           > 1)
+                            {
+                                cueTracks[currentTrack.Sequence - 2].Sectors =
+                                    (ulong)(offset - (int)currentFileOffsetSector);
+
+                                currentFile.Offset +=
+                                    cueTracks[currentTrack.Sequence - 2].Sectors *
+                                    cueTracks[currentTrack.Sequence - 2].Bps;
+
+                                AaruConsole.DebugWriteLine("CDRWin plugin", "Sets currentFile.offset to {0}",
+                                                           currentFile.Offset);
+
+                                AaruConsole.DebugWriteLine("CDRWin plugin",
+                                                           "cueTracks[currentTrack.sequence-2].sectors = {0}",
+                                                           cueTracks[currentTrack.Sequence - 2].Sectors);
+
+                                AaruConsole.DebugWriteLine("CDRWin plugin",
+                                                           "cueTracks[currentTrack.sequence-2].bps = {0}",
+                                                           cueTracks[currentTrack.Sequence - 2].Bps);
+                            }
+
+                        if((index == 0 || (index == 1 && !currentTrack.Indexes.ContainsKey(0))) &&
+                           currentTrack.Sequence == 1)
+                        {
+                            AaruConsole.DebugWriteLine("CDRWin plugin", "Sets currentFile.offset to {0}",
+                                                       offset * currentTrack.Bps);
+
+                            currentFile.Offset = (ulong)(offset * currentTrack.Bps);
+                        }
+
+                        if(currentTrack.Indexes.Count == 0)
+                        {
+                            if(firstTrackInSession &&
+                               index  != 0         &&
+                               offset > 150)
+                            {
+                                currentTrack.Indexes[0] =  offset - 150;
+                                firstTrackInSession     =  false;
+                                currentFileOffsetSector =  offset - 150;
+                                currentFile.Offset      -= (ulong)(150 * currentTrack.Bps);
+                            }
+                            else
+                                currentFileOffsetSector = offset;
+                        }
+
+                        if(index              == 1 &&
+                           currentEmptyPregap > 0  &&
+                           !currentTrack.Indexes.ContainsKey(0))
+                        {
+                            currentTrack.Indexes[0] =  offset;
+                            currentFile.Offset      -= (ulong)(currentEmptyPregap * currentTrack.Bps);
+                            offset                  += currentEmptyPregap;
+                            cumulativeEmptyPregap   += currentEmptyPregap;
+                            currentEmptyPregap      =  0;
+                        }
+
+                        currentTrack.Indexes.Add(index, offset);
                     }
-
-                    if(firstSessionTrack.Indexes.TryGetValue(1, out sessionStart))
+                    else if(matchIsrc.Success)
                     {
-                        sessions[s - 1].StartSector = (ulong)sessionStart;
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found ISRC at line {0}", lineNumber);
+
+                        if(!inTrack)
+                        {
+                            AaruConsole.ErrorWriteLine($"Found ISRC before a track {lineNumber}");
+
+                            return ErrorNumber.InvalidArgument;
+                        }
+
+                        currentTrack.Isrc = matchIsrc.Groups[1].Value;
                     }
-                }
-
-                for(int t = 1; t <= cueTracks.Length; t++)
-                {
-                    if(cueTracks[t - 1].Indexes.TryGetValue(0, out int idx0) &&
-                       cueTracks[t - 1].Indexes.TryGetValue(1, out int idx1))
-                        cueTracks[t - 1].Pregap = idx1 - idx0;
-
-                    _discImage.Tracks.Add(cueTracks[t - 1]);
-                }
-
-                // MagicISO writes 2048 bytes per data, sets Cuesheet as 2352, and fill the images with empty data.
-                if(_discImage.Tracks.Count        == 1 &&
-                   _discImage.Tracks[0].TrackType == "MODE1/2352")
-                {
-                    Stream track1Stream = _discImage.Tracks[0].TrackFile.DataFilter.GetDataForkStream();
-
-                    bool foundSync = true;
-
-                    var rnd = new Random();
-
-                    // We check 32 random positions, to prevent coincidence of data
-                    for(int i = 0; i < 32; i++)
+                    else if(matchMcn.Success)
                     {
-                        int next = rnd.Next(cueTracks[^1].Indexes[1]);
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found CATALOG at line {0}", lineNumber);
 
-                        track1Stream.Position = next * 2352;
-                        byte[] data = new byte[16];
-                        track1Stream.Read(data, 0, 16);
+                        if(!inTrack)
+                            _discImage.Mcn = matchMcn.Groups[1].Value;
+                        else
+                        {
+                            AaruConsole.
+                                ErrorWriteLine($"Found CATALOG field in incorrect place at line {lineNumber}");
 
-                        // If the position is not MODEx/2352, it can't be a correct Cuesheet.
-                        if(data[0x000] == 0x00 &&
-                           data[0x001] == 0xFF &&
-                           data[0x002] == 0xFF &&
-                           data[0x003] == 0xFF &&
-                           data[0x004] == 0xFF &&
-                           data[0x005] == 0xFF &&
-                           data[0x006] == 0xFF &&
-                           data[0x007] == 0xFF &&
-                           data[0x008] == 0xFF &&
-                           data[0x009] == 0xFF &&
-                           data[0x00A] == 0xFF &&
-                           data[0x00B] == 0x00)
-                            continue;
-
-                        foundSync = false;
-
-                        break;
+                            return ErrorNumber.InvalidArgument;
+                        }
                     }
-
-                    if(!foundSync)
+                    else if(matchPerformer.Success)
                     {
-                        _discImage.Tracks[0].Pregap    = 0;
-                        _discImage.Tracks[0].Bps       = 2048;
-                        _discImage.Tracks[0].TrackType = CDRWIN_TRACK_TYPE_MODE1;
-                        _imageInfo.Application         = "MagicISO";
-                        _discImage.MediaType           = MediaType.DVDROM;
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found PERFORMER at line {0}", lineNumber);
 
+                        if(inTrack)
+                            currentTrack.Performer = matchPerformer.Groups[1].Value;
+                        else
+                            _discImage.Performer = matchPerformer.Groups[1].Value;
+                    }
+                    else if(matchPostgap.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found POSTGAP at line {0}", lineNumber);
+
+                        if(inTrack)
+                            currentTrack.Postgap = CdrWinMsfToLba(matchPostgap.Groups[1].Value);
+                        else
+                        {
+                            AaruConsole.ErrorWriteLine($"Found POSTGAP field before a track at line {lineNumber}");
+
+                            return ErrorNumber.InvalidArgument;
+                        }
+                    }
+                    else if(matchPregap.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found PREGAP at line {0}", lineNumber);
+
+                        if(!inTrack)
+                        {
+                            AaruConsole.ErrorWriteLine($"Found PREGAP field before a track at line {lineNumber}");
+
+                            return ErrorNumber.InvalidArgument;
+                        }
+
+                        currentEmptyPregap = CdrWinMsfToLba(matchPregap.Groups[1].Value);
+                    }
+                    else if(matchSongWriter.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found SONGWRITER at line {0}", lineNumber);
+
+                        if(inTrack)
+                            currentTrack.Songwriter = matchSongWriter.Groups[1].Value;
+                        else
+                            _discImage.Songwriter = matchSongWriter.Groups[1].Value;
+                    }
+                    else if(matchTitle.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found TITLE at line {0}", lineNumber);
+
+                        if(inTrack)
+                            currentTrack.Title = matchTitle.Groups[1].Value;
+                        else
+                            _discImage.Title = matchTitle.Groups[1].Value;
+                    }
+                    else if(matchTrack.Success)
+                    {
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Found TRACK at line {0}", lineNumber);
+
+                        if(currentFile.DataFilter == null)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine($"Found TRACK field before a file is defined at line {lineNumber}");
+
+                            return ErrorNumber.InvalidArgument;
+                        }
+
+                        if(inTrack)
+                        {
+                            if(currentTrack.Indexes.ContainsKey(0) &&
+                               currentTrack.Pregap == 0)
+                                currentTrack.Indexes.TryGetValue(0, out currentTrack.Pregap);
+
+                            currentFile.Sequence                 = currentTrack.Sequence;
+                            currentTrack.TrackFile               = currentFile;
+                            cueTracks[currentTrack.Sequence - 1] = currentTrack;
+                        }
+
+                        currentTrack = new CdrWinTrack
+                        {
+                            Indexes  = new SortedDictionary<ushort, int>(),
+                            Sequence = uint.Parse(matchTrack.Groups[1].Value)
+                        };
+
+                        AaruConsole.DebugWriteLine("CDRWin plugin", "Setting currentTrack.sequence to {0}",
+                                                   currentTrack.Sequence);
+
+                        currentFile.Sequence   = currentTrack.Sequence;
+                        currentTrack.Bps       = CdrWinTrackTypeToBytesPerSector(matchTrack.Groups[2].Value);
+                        currentTrack.TrackType = matchTrack.Groups[2].Value.ToUpperInvariant();
+                        currentTrack.Session   = currentSession;
+                        inTrack                = true;
+                    }
+                    else if(line.Contains("INDEX 01 00:-2:00"))
+                    {
                         AaruConsole.
-                            ErrorWriteLine("This image is most probably corrupted beyond repair. It is highly recommended to dump it with another software.");
-                    }
-                }
-
-                if(!string.IsNullOrWhiteSpace(_discImage.AaruMediaType) &&
-                   Enum.TryParse(_discImage.AaruMediaType, true, out MediaType mediaType))
-                {
-                    _discImage.MediaType = mediaType;
-                }
-                else if(_discImage.IsRedumpGigadisc)
-                    _discImage.MediaType = MediaType.GDROM;
-                else if(_discImage.MediaType == MediaType.Unknown)
-                    _discImage.MediaType = CdrWinIsoBusterDiscTypeToMediaType(_discImage.OriginalMediaType);
-
-                if(_discImage.MediaType == MediaType.Unknown ||
-                   _discImage.MediaType == MediaType.CD)
-                {
-                    bool data       = false;
-                    bool cdg        = false;
-                    bool cdi        = false;
-                    bool mode2      = false;
-                    bool firstAudio = false;
-                    bool firstData  = false;
-                    bool audio      = false;
-
-                    for(int i = 0; i < _discImage.Tracks.Count; i++)
-                    {
-                        // First track is audio
-                        firstAudio |= i == 0 && _discImage.Tracks[i].TrackType == CDRWIN_TRACK_TYPE_AUDIO;
-
-                        // First track is data
-                        firstData |= i == 0 && _discImage.Tracks[i].TrackType != CDRWIN_TRACK_TYPE_AUDIO;
-
-                        // Any non first track is data
-                        data |= i != 0 && _discImage.Tracks[i].TrackType != CDRWIN_TRACK_TYPE_AUDIO;
-
-                        // Any non first track is audio
-                        audio |= i != 0 && _discImage.Tracks[i].TrackType == CDRWIN_TRACK_TYPE_AUDIO;
-
-                        switch(_discImage.Tracks[i].TrackType)
-                        {
-                            case CDRWIN_TRACK_TYPE_CDG:
-                                cdg = true;
-
-                                break;
-                            case CDRWIN_TRACK_TYPE_CDI:
-                            case CDRWIN_TRACK_TYPE_CDI_RAW:
-                                cdi = true;
-
-                                break;
-                            case CDRWIN_TRACK_TYPE_MODE2_FORM1:
-                            case CDRWIN_TRACK_TYPE_MODE2_FORM2:
-                            case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
-                            case CDRWIN_TRACK_TYPE_MODE2_RAW:
-                                mode2 = true;
-
-                                break;
-                        }
-                    }
-
-                    if(!data &&
-                       !firstData)
-                        _discImage.MediaType = MediaType.CDDA;
-                    else if(cdg)
-                        _discImage.MediaType = MediaType.CDG;
-                    else if(cdi)
-                        _discImage.MediaType = MediaType.CDI;
-                    else if(firstAudio          &&
-                            data                &&
-                            sessions.Length > 1 &&
-                            mode2)
-                        _discImage.MediaType = MediaType.CDPLUS;
-                    else if((firstData && audio) || mode2)
-                        _discImage.MediaType = MediaType.CDROMXA;
-                    else if(!audio)
-                        _discImage.MediaType = MediaType.CDROM;
-                    else
-                        _discImage.MediaType = MediaType.CD;
-                }
-
-                // DEBUG information
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Disc image parsing results");
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Disc CD-TEXT:");
-
-                if(_discImage.Arranger == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tArranger is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tArranger: {0}", _discImage.Arranger);
-
-                if(_discImage.Composer == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tComposer is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tComposer: {0}", _discImage.Composer);
-
-                if(_discImage.Genre == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tGenre is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tGenre: {0}", _discImage.Genre);
-
-                if(_discImage.Performer == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tPerformer is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tPerformer: {0}", _discImage.Performer);
-
-                if(_discImage.Songwriter == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tSongwriter is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tSongwriter: {0}", _discImage.Songwriter);
-
-                if(_discImage.Title == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tTitle is not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tTitle: {0}", _discImage.Title);
-
-                if(_discImage.CdTextFile == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tCD-TEXT binary file not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tCD-TEXT binary file: {0}", _discImage.CdTextFile);
-
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Disc information:");
-
-                if(_discImage.OriginalMediaType == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tISOBuster disc type not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tISOBuster disc type: {0}",
-                                               _discImage.OriginalMediaType);
-
-                AaruConsole.DebugWriteLine("CDRWin plugin", "\tGuessed disk type: {0}", _discImage.MediaType);
-
-                if(_discImage.Barcode == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tBarcode not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tBarcode: {0}", _discImage.Barcode);
-
-                if(_discImage.DiscId == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tDisc ID not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tDisc ID: {0}", _discImage.DiscId);
-
-                if(_discImage.Mcn == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tMCN not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tMCN: {0}", _discImage.Mcn);
-
-                if(_discImage.Comment == null)
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tComment not set.");
-                else
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tComment: \"{0}\"", _discImage.Comment);
-
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Track information:");
-                AaruConsole.DebugWriteLine("CDRWin plugin", "\tDisc contains {0} tracks", _discImage.Tracks.Count);
-
-                for(int i = 0; i < _discImage.Tracks.Count; i++)
-                {
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tTrack {0} information:",
-                                               _discImage.Tracks[i].Sequence);
-
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\t{0} bytes per sector", _discImage.Tracks[i].Bps);
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPregap: {0} sectors", _discImage.Tracks[i].Pregap);
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tData: {0} sectors", _discImage.Tracks[i].Sectors);
-
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPostgap: {0} sectors",
-                                               _discImage.Tracks[i].Postgap);
-
-                    if(_discImage.Tracks[i].Flag4Ch)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack is flagged as quadraphonic");
-
-                    if(_discImage.Tracks[i].FlagDcp)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack allows digital copy");
-
-                    if(_discImage.Tracks[i].FlagPre)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack has pre-emphasis applied");
-
-                    if(_discImage.Tracks[i].FlagScms)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack has SCMS");
-
-                    AaruConsole.DebugWriteLine("CDRWin plugin",
-                                               "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
-                                               _discImage.Tracks[i].TrackFile.DataFilter.Filename,
-                                               _discImage.Tracks[i].TrackFile.FileType,
-                                               _discImage.Tracks[i].TrackFile.Offset);
-
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tIndexes:");
-
-                    foreach(KeyValuePair<ushort, int> kvp in _discImage.Tracks[i].Indexes)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\t\tIndex {0} starts at sector {1}", kvp.Key,
-                                                   kvp.Value);
-
-                    if(_discImage.Tracks[i].Isrc == null)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tISRC is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tISRC: {0}", _discImage.Tracks[i].Isrc);
-
-                    if(_discImage.Tracks[i].Arranger == null)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tArranger is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tArranger: {0}", _discImage.Tracks[i].Arranger);
-
-                    if(_discImage.Tracks[i].Composer == null)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tComposer is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tComposer: {0}", _discImage.Tracks[i].Composer);
-
-                    if(_discImage.Tracks[i].Genre == null)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tGenre is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tGenre: {0}", _discImage.Tracks[i].Genre);
-
-                    if(_discImage.Tracks[i].Performer == null)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPerformer is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPerformer: {0}",
-                                                   _discImage.Tracks[i].Performer);
-
-                    if(_discImage.Tracks[i].Songwriter == null)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tSongwriter is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tSongwriter: {0}",
-                                                   _discImage.Tracks[i].Songwriter);
-
-                    if(_discImage.Tracks[i].Title == null)
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTitle is not set.");
-                    else
-                        AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTitle: {0}", _discImage.Tracks[i].Title);
-                }
-
-                foreach(CdrWinTrack track in _discImage.Tracks)
-                    _imageInfo.ImageSize += track.Bps * track.Sectors;
-
-                int    currentSector          = 0;
-                int    currentFileStartSector = 0;
-                string currentFilePath        = "";
-                firstTrackInSession = true;
-
-                foreach(CdrWinTrack track in _discImage.Tracks)
-                {
-                    if(track.TrackFile.DataFilter.BasePath != currentFilePath)
-                    {
-                        if(_discImage.IsRedumpGigadisc &&
-                           track.Session == 2          &&
-                           firstTrackInSession)
-                        {
-                            currentSector = (int)gdRomSession2Offset - track.Pregap;
-                            track.Indexes.Add(0, 0);
-                            track.Indexes[1]    =  track.Pregap;
-                            track.Sectors       += (ulong)track.Pregap;
-                            firstTrackInSession =  false;
-                        }
-
-                        currentFileStartSector = currentSector;
-                        currentFilePath        = track.TrackFile.DataFilter.BasePath;
-                    }
-
-                    SortedDictionary<ushort, int> newIndexes = new();
-
-                    foreach(KeyValuePair<ushort, int> index in track.Indexes)
-                        newIndexes[index.Key] = index.Value + currentFileStartSector;
-
-                    track.Indexes = newIndexes;
-
-                    currentSector += (int)track.Sectors;
-                }
-
-                for(int s = 0; s < sessions.Length; s++)
-                {
-                    if(!_discImage.Tracks[(int)sessions[s].StartTrack - 1].Indexes.
-                                   TryGetValue(0, out int sessionTrackStart))
-                        _discImage.Tracks[(int)sessions[s].StartTrack - 1].Indexes.
-                                   TryGetValue(1, out sessionTrackStart);
-
-                    sessions[s].StartSector = (ulong)(sessionTrackStart > 0 ? sessionTrackStart : 0);
-
-                    if(!_discImage.Tracks[(int)sessions[s].EndTrack - 1].Indexes.TryGetValue(0, out sessionTrackStart))
-                        _discImage.Tracks[(int)sessions[s].EndTrack - 1].Indexes.TryGetValue(1, out sessionTrackStart);
-
-                    sessions[s].EndSector =  (ulong)(sessionTrackStart > 0 ? sessionTrackStart : 0);
-                    sessions[s].EndSector += _discImage.Tracks[(int)sessions[s].EndTrack - 1].Sectors - 1;
-                }
-
-                for(int s = 1; s <= sessions.Length; s++)
-                    _discImage.Sessions.Add(sessions[s - 1]);
-
-                _imageInfo.Sectors = _discImage.Sessions.OrderByDescending(s => s.EndSector).First().EndSector + 1;
-
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Session information:");
-                AaruConsole.DebugWriteLine("CDRWin plugin", "\tDisc contains {0} sessions", _discImage.Sessions.Count);
-
-                for(int i = 0; i < _discImage.Sessions.Count; i++)
-                {
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tSession {0} information:", i + 1);
-
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tStarting track: {0}",
-                                               _discImage.Sessions[i].StartTrack);
-
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tStarting sector: {0}",
-                                               _discImage.Sessions[i].StartSector);
-
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tEnding track: {0}",
-                                               _discImage.Sessions[i].EndTrack);
-
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tEnding sector: {0}",
-                                               _discImage.Sessions[i].EndSector);
-                }
-
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Building offset map");
-
-                Partitions = new List<Partition>();
-
-                ulong partitionSequence = 0;
-
-                _offsetMap = new Dictionary<uint, ulong>();
-
-                for(int i = 0; i < _discImage.Tracks.Count; i++)
-                {
-                    if(_discImage.Tracks[i].Sequence == 1 &&
-                       i                             != 0)
-                    {
-                        AaruConsole.ErrorWriteLine("Unordered tracks");
+                            ErrorWriteLine("This image from PowerISO is damaged beyond possible recovery. Will not open.");
 
                         return ErrorNumber.InvalidArgument;
                     }
-
-                    var partition = new Partition();
-
-                    if(!_discImage.Tracks[i].Indexes.TryGetValue(1, out _))
+                    else if(line == "") // Empty line, ignore it
+                    {}
+                    else // Non-empty unknown field
                     {
-                        AaruConsole.ErrorWriteLine($"Track {_discImage.Tracks[i].Sequence} lacks index 01");
+                        AaruConsole.ErrorWriteLine($"Found unknown field defined at line {lineNumber}: \"{line}\"");
 
-                        return ErrorNumber.InvalidArgument;
+                        return ErrorNumber.NotSupported;
                     }
-
-                    // Index 01
-                    partition.Description = $"Track {_discImage.Tracks[i].Sequence}.";
-                    partition.Name        = _discImage.Tracks[i].Title;
-                    partition.Start       = (ulong)_discImage.Tracks[i].Indexes[1];
-                    partition.Size        = _discImage.Tracks[i].Sectors * _discImage.Tracks[i].Bps;
-                    partition.Length      = _discImage.Tracks[i].Sectors;
-                    partition.Sequence    = partitionSequence;
-                    partition.Offset      = partition.Start * 2352;
-                    partition.Type        = _discImage.Tracks[i].TrackType;
-
-                    partitionSequence++;
-
-                    if(_discImage.IsRedumpGigadisc &&
-                       _discImage.Tracks[i].Sequence == 3)
-                        _offsetMap.Add(_discImage.Tracks[i].Sequence,
-                                       gdRomSession2Offset - (ulong)_discImage.Tracks[i].Pregap);
-                    else if(_discImage.Tracks[i].Indexes.TryGetValue(0, out int idx0))
-                        _offsetMap.Add(_discImage.Tracks[i].Sequence, (ulong)idx0);
-                    else if(_discImage.Tracks[i].Sequence > 1)
-                        _offsetMap.Add(_discImage.Tracks[i].Sequence,
-                                       (ulong)(_discImage.Tracks[i].Indexes[1] - _discImage.Tracks[i].Pregap));
-                    else
-                        _offsetMap.Add(_discImage.Tracks[i].Sequence, (ulong)_discImage.Tracks[i].Indexes[1]);
-
-                    Partitions.Add(partition);
                 }
+            }
 
-                // Print offset map
-                AaruConsole.DebugWriteLine("CDRWin plugin", "printing partition map");
+            if(currentTrack.Sequence != 0)
+            {
+                currentFile.Sequence   = currentTrack.Sequence;
+                currentTrack.TrackFile = currentFile;
 
-                foreach(Partition partition in Partitions)
-                {
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "Partition sequence: {0}", partition.Sequence);
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition name: {0}", partition.Name);
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition description: {0}", partition.Description);
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition type: {0}", partition.Type);
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting sector: {0}", partition.Start);
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition sectors: {0}", partition.Length);
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting offset: {0}", partition.Offset);
-                    AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition size in bytes: {0}", partition.Size);
-                }
+                _negativeEnd = currentFile.DataFilter.Length - (long)currentFile.Offset < 0;
 
-                if(_discImage.MediaType != MediaType.CDROMXA &&
-                   _discImage.MediaType != MediaType.CDDA    &&
-                   _discImage.MediaType != MediaType.CDI     &&
-                   _discImage.MediaType != MediaType.CDPLUS  &&
-                   _discImage.MediaType != MediaType.CDG     &&
-                   _discImage.MediaType != MediaType.CDEG    &&
-                   _discImage.MediaType != MediaType.CDMIDI  &&
-                   _discImage.MediaType != MediaType.GDROM)
-                    _imageInfo.SectorSize = 2048; // Only data tracks
-                else
-                    _imageInfo.SectorSize = 2352; // All others
+                currentTrack.Sectors = ((ulong)currentFile.DataFilter.Length - currentFile.Offset) /
+                                       CdrWinTrackTypeToBytesPerSector(currentTrack.TrackType);
 
-                if(_discImage.Mcn != null)
-                    _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_MCN);
+                cueTracks[currentTrack.Sequence - 1] = currentTrack;
+            }
 
-                if(_discImage.CdTextFile != null)
-                    _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_TEXT);
+            if(_negativeEnd)
+            {
+                string firstFile = cueTracks[0].TrackFile.DataFilter.Path;
 
-                if(_imageInfo.Application is null)
-                {
-                    if(_discImage.IsTrurip)
-                        _imageInfo.Application = "trurip";
-
-                    else if(_discImage.IsRedumpGigadisc)
-                        _imageInfo.Application = "Redump.org";
-
-                    // Detect ISOBuster extensions
-                    else if(_discImage.OriginalMediaType != null               ||
-                            _discImage.Comment.ToLower().Contains("isobuster") ||
-                            sessions.Length > 1)
-                        _imageInfo.Application = "ISOBuster";
-                    else
-                        _imageInfo.Application = "CDRWin";
-                }
-
-                _imageInfo.CreationTime         = imageFilter.CreationTime;
-                _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-
-                _imageInfo.Comments          = _discImage.Comment;
-                _imageInfo.MediaSerialNumber = _discImage.Mcn;
-                _imageInfo.MediaBarcode      = _discImage.Barcode;
-                _imageInfo.MediaType         = _discImage.MediaType;
-
-                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-
-                foreach(CdrWinTrack track in _discImage.Tracks)
-                    switch(track.TrackType)
-                    {
-                        case CDRWIN_TRACK_TYPE_AUDIO:
-                        {
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
-
-                            break;
-                        }
-                        case CDRWIN_TRACK_TYPE_CDG:
-                        {
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-
-                            break;
-                        }
-                        case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
-                        case CDRWIN_TRACK_TYPE_CDI:
-                        {
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                            break;
-                        }
-                        case CDRWIN_TRACK_TYPE_MODE2_RAW:
-                        case CDRWIN_TRACK_TYPE_CDI_RAW:
-                        {
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                            break;
-                        }
-                        case CDRWIN_TRACK_TYPE_MODE1_RAW:
-                        {
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                            break;
-                        }
-                    }
-
-                _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
-
-                AaruConsole.VerboseWriteLine("CDRWIN image describes a disc of type {0}", _imageInfo.MediaType);
-
-                if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                    AaruConsole.VerboseWriteLine("CDRWIN comments: {0}", _imageInfo.Comments);
-
-                _sectorBuilder = new SectorBuilder();
-
-                int mediaTypeAsInt = (int)_discImage.MediaType;
-
-                _isCd = (mediaTypeAsInt >= 10 && mediaTypeAsInt <= 39) || mediaTypeAsInt == 112 ||
-                        mediaTypeAsInt == 113 || (mediaTypeAsInt >= 150 && mediaTypeAsInt <= 152) ||
-                        mediaTypeAsInt == 154 || mediaTypeAsInt == 155 ||
-                        (mediaTypeAsInt >= 171 && mediaTypeAsInt <= 179) ||
-                        (mediaTypeAsInt >= 740 && mediaTypeAsInt <= 749);
-
-                if(currentSession > 1           &&
-                   leadouts.Count == 0          &&
-                   !_discImage.IsRedumpGigadisc &&
-                   _isCd)
+                if(cueTracks.Any(t => t.Session > 1 || t.TrackFile.DataFilter.Path != firstFile) ||
+                   cueTracks[0].Indexes.ContainsKey(0))
                 {
                     AaruConsole.
-                        ErrorWriteLine("This image is missing vital multi-session data and cannot be read correctly.");
+                        ErrorWriteLine("The data files are not correct according to the cuesheet file, cannot continue with this file.");
 
                     return ErrorNumber.InvalidArgument;
                 }
 
-                if(_isCd)
-                    return ErrorNumber.NoError;
+                cueTracks[0].Pregap = cueTracks[0].Indexes[1];
+                int reduceOffset = cueTracks[0].Pregap * cueTracks[0].Bps;
 
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorSync);
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorHeader);
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorSubHeader);
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEcc);
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEccP);
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEccQ);
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEdc);
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackFlags);
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackIsrc);
+                foreach(CdrWinTrack track in cueTracks)
+                    track.TrackFile.Offset -= (ulong)reduceOffset;
 
-                sessions = _discImage.Sessions.ToArray();
-
-                foreach(CdrWinTrack track in _discImage.Tracks)
+                if(currentFile.DataFilter.Length - (long)cueTracks[currentTrack.Sequence - 1].TrackFile.Offset < 0)
                 {
-                    track.Indexes.Remove(0);
-                    track.Pregap = 0;
+                    AaruConsole.
+                        ErrorWriteLine("The data files are not correct according to the cuesheet file, cannot continue with this file.");
 
-                    for(int s = 0; s < sessions.Length; s++)
+                    return ErrorNumber.InvalidArgument;
+                }
+
+                cueTracks[currentTrack.Sequence - 1].Sectors =
+                    ((ulong)currentFile.DataFilter.Length - cueTracks[currentTrack.Sequence - 1].TrackFile.Offset) /
+                    cueTracks[currentTrack.Sequence - 1].Bps;
+
+                cueTracks[0].Indexes[0] =  0;
+                _lostPregap             =  (uint)cueTracks[0].Pregap;
+                cueTracks[0].Sectors    += _lostPregap;
+
+                AaruConsole.
+                    ErrorWriteLine("The data files are missing a pregap or hidden track contents, will do best effort to make the rest of the image readable.");
+            }
+
+            Session[] sessions = new Session[currentSession];
+
+            for(int s = 1; s <= sessions.Length; s++)
+            {
+                bool firstTrackRead = false;
+                sessions[s - 1].Sequence = (ushort)s;
+
+                ulong sessionSectors   = 0;
+                int   lastSessionTrack = 0;
+                int   firstSessionTrk  = 0;
+
+                for(int i = 0; i < cueTracks.Length; i++)
+                    if(cueTracks[i].Session == s)
                     {
-                        if(sessions[s].Sequence > 1 &&
-                           track.Sequence       == sessions[s].StartTrack)
+                        if(!firstTrackRead)
                         {
-                            track.TrackFile.Offset  += 307200;
-                            track.Sectors           -= 150;
-                            sessions[s].StartSector =  (ulong)track.Indexes[1];
+                            firstSessionTrk = i;
+                            firstTrackRead  = true;
                         }
+
+                        sessionSectors += cueTracks[i].Sectors;
+
+                        if(i > lastSessionTrack)
+                            lastSessionTrack = i;
+                    }
+
+                if(s > 1)
+                    if(_discImage.IsRedumpGigadisc)
+                        sessions[s - 1].StartSector = gdRomSession2Offset;
+                    else
+                        sessions[s - 1].StartSector = sessions[s - 2].EndSector + 1;
+                else
+                    sessions[s - 1].StartSector = 0;
+
+                sessions[s - 1].StartTrack = cueTracks[firstSessionTrk].Sequence;
+                sessions[s - 1].EndTrack   = cueTracks[lastSessionTrack].Sequence;
+
+                if(leadouts.TryGetValue((byte)s, out int leadout))
+                {
+                    int startSector;
+                    sessions[s - 1].EndSector = (ulong)(leadout - 1);
+
+                    if(!cueTracks[lastSessionTrack].Indexes.TryGetValue(0, out startSector))
+                        cueTracks[lastSessionTrack].Indexes.TryGetValue(1, out startSector);
+
+                    cueTracks[lastSessionTrack].Sectors = (ulong)(leadout - startSector);
+                }
+                else
+                    sessions[s - 1].EndSector = sessions[s - 1].StartSector + sessionSectors - 1;
+
+                CdrWinTrack firstSessionTrack = cueTracks.OrderBy(t => t.Sequence).First(t => t.Session == s);
+
+                firstSessionTrack.Indexes.TryGetValue(0, out firstSessionTrack.Pregap);
+
+                if(firstSessionTrack.Pregap < 150)
+                    firstSessionTrack.Pregap = 150;
+
+                if(cueTracks.Any(i => i.TrackFile.DataFilter.Filename !=
+                                      cueTracks.First().TrackFile.DataFilter.Filename))
+                    continue;
+
+                if(firstSessionTrack.Indexes.TryGetValue(0, out int sessionStart))
+                {
+                    sessions[s - 1].StartSector = (ulong)sessionStart;
+
+                    continue;
+                }
+
+                if(firstSessionTrack.Indexes.TryGetValue(1, out sessionStart))
+                {
+                    sessions[s - 1].StartSector = (ulong)sessionStart;
+                }
+            }
+
+            for(int t = 1; t <= cueTracks.Length; t++)
+            {
+                if(cueTracks[t - 1].Indexes.TryGetValue(0, out int idx0) &&
+                   cueTracks[t - 1].Indexes.TryGetValue(1, out int idx1))
+                    cueTracks[t - 1].Pregap = idx1 - idx0;
+
+                _discImage.Tracks.Add(cueTracks[t - 1]);
+            }
+
+            // MagicISO writes 2048 bytes per data, sets Cuesheet as 2352, and fill the images with empty data.
+            if(_discImage.Tracks.Count        == 1 &&
+               _discImage.Tracks[0].TrackType == "MODE1/2352")
+            {
+                Stream track1Stream = _discImage.Tracks[0].TrackFile.DataFilter.GetDataForkStream();
+
+                bool foundSync = true;
+
+                var rnd = new Random();
+
+                // We check 32 random positions, to prevent coincidence of data
+                for(int i = 0; i < 32; i++)
+                {
+                    int next = rnd.Next(cueTracks[^1].Indexes[1]);
+
+                    track1Stream.Position = next * 2352;
+                    byte[] data = new byte[16];
+                    track1Stream.Read(data, 0, 16);
+
+                    // If the position is not MODEx/2352, it can't be a correct Cuesheet.
+                    if(data[0x000] == 0x00 &&
+                       data[0x001] == 0xFF &&
+                       data[0x002] == 0xFF &&
+                       data[0x003] == 0xFF &&
+                       data[0x004] == 0xFF &&
+                       data[0x005] == 0xFF &&
+                       data[0x006] == 0xFF &&
+                       data[0x007] == 0xFF &&
+                       data[0x008] == 0xFF &&
+                       data[0x009] == 0xFF &&
+                       data[0x00A] == 0xFF &&
+                       data[0x00B] == 0x00)
+                        continue;
+
+                    foundSync = false;
+
+                    break;
+                }
+
+                if(!foundSync)
+                {
+                    _discImage.Tracks[0].Pregap    = 0;
+                    _discImage.Tracks[0].Bps       = 2048;
+                    _discImage.Tracks[0].TrackType = CDRWIN_TRACK_TYPE_MODE1;
+                    _imageInfo.Application         = "MagicISO";
+                    _discImage.MediaType           = MediaType.DVDROM;
+
+                    AaruConsole.
+                        ErrorWriteLine("This image is most probably corrupted beyond repair. It is highly recommended to dump it with another software.");
+                }
+            }
+
+            if(!string.IsNullOrWhiteSpace(_discImage.AaruMediaType) &&
+               Enum.TryParse(_discImage.AaruMediaType, true, out MediaType mediaType))
+            {
+                _discImage.MediaType = mediaType;
+            }
+            else if(_discImage.IsRedumpGigadisc)
+                _discImage.MediaType = MediaType.GDROM;
+            else if(_discImage.MediaType == MediaType.Unknown)
+                _discImage.MediaType = CdrWinIsoBusterDiscTypeToMediaType(_discImage.OriginalMediaType);
+
+            if(_discImage.MediaType == MediaType.Unknown ||
+               _discImage.MediaType == MediaType.CD)
+            {
+                bool data       = false;
+                bool cdg        = false;
+                bool cdi        = false;
+                bool mode2      = false;
+                bool firstAudio = false;
+                bool firstData  = false;
+                bool audio      = false;
+
+                for(int i = 0; i < _discImage.Tracks.Count; i++)
+                {
+                    // First track is audio
+                    firstAudio |= i == 0 && _discImage.Tracks[i].TrackType == CDRWIN_TRACK_TYPE_AUDIO;
+
+                    // First track is data
+                    firstData |= i == 0 && _discImage.Tracks[i].TrackType != CDRWIN_TRACK_TYPE_AUDIO;
+
+                    // Any non first track is data
+                    data |= i != 0 && _discImage.Tracks[i].TrackType != CDRWIN_TRACK_TYPE_AUDIO;
+
+                    // Any non first track is audio
+                    audio |= i != 0 && _discImage.Tracks[i].TrackType == CDRWIN_TRACK_TYPE_AUDIO;
+
+                    switch(_discImage.Tracks[i].TrackType)
+                    {
+                        case CDRWIN_TRACK_TYPE_CDG:
+                            cdg = true;
+
+                            break;
+                        case CDRWIN_TRACK_TYPE_CDI:
+                        case CDRWIN_TRACK_TYPE_CDI_RAW:
+                            cdi = true;
+
+                            break;
+                        case CDRWIN_TRACK_TYPE_MODE2_FORM1:
+                        case CDRWIN_TRACK_TYPE_MODE2_FORM2:
+                        case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
+                        case CDRWIN_TRACK_TYPE_MODE2_RAW:
+                            mode2 = true;
+
+                            break;
                     }
                 }
 
-                _discImage.Sessions = sessions.ToList();
+                if(!data &&
+                   !firstData)
+                    _discImage.MediaType = MediaType.CDDA;
+                else if(cdg)
+                    _discImage.MediaType = MediaType.CDG;
+                else if(cdi)
+                    _discImage.MediaType = MediaType.CDI;
+                else if(firstAudio          &&
+                        data                &&
+                        sessions.Length > 1 &&
+                        mode2)
+                    _discImage.MediaType = MediaType.CDPLUS;
+                else if((firstData && audio) || mode2)
+                    _discImage.MediaType = MediaType.CDROMXA;
+                else if(!audio)
+                    _discImage.MediaType = MediaType.CDROM;
+                else
+                    _discImage.MediaType = MediaType.CD;
+            }
+
+            // DEBUG information
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Disc image parsing results");
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Disc CD-TEXT:");
+
+            if(_discImage.Arranger == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tArranger is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tArranger: {0}", _discImage.Arranger);
+
+            if(_discImage.Composer == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tComposer is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tComposer: {0}", _discImage.Composer);
+
+            if(_discImage.Genre == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tGenre is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tGenre: {0}", _discImage.Genre);
+
+            if(_discImage.Performer == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tPerformer is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tPerformer: {0}", _discImage.Performer);
+
+            if(_discImage.Songwriter == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tSongwriter is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tSongwriter: {0}", _discImage.Songwriter);
+
+            if(_discImage.Title == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tTitle is not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tTitle: {0}", _discImage.Title);
+
+            if(_discImage.CdTextFile == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tCD-TEXT binary file not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tCD-TEXT binary file: {0}", _discImage.CdTextFile);
+
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Disc information:");
+
+            if(_discImage.OriginalMediaType == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tISOBuster disc type not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tISOBuster disc type: {0}",
+                                           _discImage.OriginalMediaType);
+
+            AaruConsole.DebugWriteLine("CDRWin plugin", "\tGuessed disk type: {0}", _discImage.MediaType);
+
+            if(_discImage.Barcode == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tBarcode not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tBarcode: {0}", _discImage.Barcode);
+
+            if(_discImage.DiscId == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tDisc ID not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tDisc ID: {0}", _discImage.DiscId);
+
+            if(_discImage.Mcn == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tMCN not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tMCN: {0}", _discImage.Mcn);
+
+            if(_discImage.Comment == null)
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tComment not set.");
+            else
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tComment: \"{0}\"", _discImage.Comment);
+
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Track information:");
+            AaruConsole.DebugWriteLine("CDRWin plugin", "\tDisc contains {0} tracks", _discImage.Tracks.Count);
+
+            for(int i = 0; i < _discImage.Tracks.Count; i++)
+            {
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tTrack {0} information:",
+                                           _discImage.Tracks[i].Sequence);
+
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\t\t{0} bytes per sector", _discImage.Tracks[i].Bps);
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPregap: {0} sectors", _discImage.Tracks[i].Pregap);
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tData: {0} sectors", _discImage.Tracks[i].Sectors);
+
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPostgap: {0} sectors",
+                                           _discImage.Tracks[i].Postgap);
+
+                if(_discImage.Tracks[i].Flag4Ch)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack is flagged as quadraphonic");
+
+                if(_discImage.Tracks[i].FlagDcp)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack allows digital copy");
+
+                if(_discImage.Tracks[i].FlagPre)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack has pre-emphasis applied");
+
+                if(_discImage.Tracks[i].FlagScms)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTrack has SCMS");
+
+                AaruConsole.DebugWriteLine("CDRWin plugin",
+                                           "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
+                                           _discImage.Tracks[i].TrackFile.DataFilter.Filename,
+                                           _discImage.Tracks[i].TrackFile.FileType,
+                                           _discImage.Tracks[i].TrackFile.Offset);
+
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tIndexes:");
+
+                foreach(KeyValuePair<ushort, int> kvp in _discImage.Tracks[i].Indexes)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\t\tIndex {0} starts at sector {1}", kvp.Key,
+                                               kvp.Value);
+
+                if(_discImage.Tracks[i].Isrc == null)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tISRC is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tISRC: {0}", _discImage.Tracks[i].Isrc);
+
+                if(_discImage.Tracks[i].Arranger == null)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tArranger is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tArranger: {0}", _discImage.Tracks[i].Arranger);
+
+                if(_discImage.Tracks[i].Composer == null)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tComposer is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tComposer: {0}", _discImage.Tracks[i].Composer);
+
+                if(_discImage.Tracks[i].Genre == null)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tGenre is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tGenre: {0}", _discImage.Tracks[i].Genre);
+
+                if(_discImage.Tracks[i].Performer == null)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPerformer is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tPerformer: {0}",
+                                               _discImage.Tracks[i].Performer);
+
+                if(_discImage.Tracks[i].Songwriter == null)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tSongwriter is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tSongwriter: {0}",
+                                               _discImage.Tracks[i].Songwriter);
+
+                if(_discImage.Tracks[i].Title == null)
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTitle is not set.");
+                else
+                    AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tTitle: {0}", _discImage.Tracks[i].Title);
+            }
+
+            foreach(CdrWinTrack track in _discImage.Tracks)
+                _imageInfo.ImageSize += track.Bps * track.Sectors;
+
+            int    currentSector          = 0;
+            int    currentFileStartSector = 0;
+            string currentFilePath        = "";
+            firstTrackInSession = true;
+
+            foreach(CdrWinTrack track in _discImage.Tracks)
+            {
+                if(track.TrackFile.DataFilter.BasePath != currentFilePath)
+                {
+                    if(_discImage.IsRedumpGigadisc &&
+                       track.Session == 2          &&
+                       firstTrackInSession)
+                    {
+                        currentSector = (int)gdRomSession2Offset - track.Pregap;
+                        track.Indexes.Add(0, 0);
+                        track.Indexes[1]    =  track.Pregap;
+                        track.Sectors       += (ulong)track.Pregap;
+                        firstTrackInSession =  false;
+                    }
+
+                    currentFileStartSector = currentSector;
+                    currentFilePath        = track.TrackFile.DataFilter.BasePath;
+                }
+
+                SortedDictionary<ushort, int> newIndexes = new();
+
+                foreach(KeyValuePair<ushort, int> index in track.Indexes)
+                    newIndexes[index.Key] = index.Value + currentFileStartSector;
+
+                track.Indexes = newIndexes;
+
+                currentSector += (int)track.Sectors;
+            }
+
+            for(int s = 0; s < sessions.Length; s++)
+            {
+                if(!_discImage.Tracks[(int)sessions[s].StartTrack - 1].Indexes.
+                               TryGetValue(0, out int sessionTrackStart))
+                    _discImage.Tracks[(int)sessions[s].StartTrack - 1].Indexes.
+                               TryGetValue(1, out sessionTrackStart);
+
+                sessions[s].StartSector = (ulong)(sessionTrackStart > 0 ? sessionTrackStart : 0);
+
+                if(!_discImage.Tracks[(int)sessions[s].EndTrack - 1].Indexes.TryGetValue(0, out sessionTrackStart))
+                    _discImage.Tracks[(int)sessions[s].EndTrack - 1].Indexes.TryGetValue(1, out sessionTrackStart);
+
+                sessions[s].EndSector =  (ulong)(sessionTrackStart > 0 ? sessionTrackStart : 0);
+                sessions[s].EndSector += _discImage.Tracks[(int)sessions[s].EndTrack - 1].Sectors - 1;
+            }
+
+            for(int s = 1; s <= sessions.Length; s++)
+                _discImage.Sessions.Add(sessions[s - 1]);
+
+            _imageInfo.Sectors = _discImage.Sessions.OrderByDescending(s => s.EndSector).First().EndSector + 1;
+
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Session information:");
+            AaruConsole.DebugWriteLine("CDRWin plugin", "\tDisc contains {0} sessions", _discImage.Sessions.Count);
+
+            for(int i = 0; i < _discImage.Sessions.Count; i++)
+            {
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tSession {0} information:", i + 1);
+
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tStarting track: {0}",
+                                           _discImage.Sessions[i].StartTrack);
+
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tStarting sector: {0}",
+                                           _discImage.Sessions[i].StartSector);
+
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tEnding track: {0}",
+                                           _discImage.Sessions[i].EndTrack);
+
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\t\tEnding sector: {0}",
+                                           _discImage.Sessions[i].EndSector);
+            }
+
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Building offset map");
+
+            Partitions = new List<Partition>();
+
+            ulong partitionSequence = 0;
+
+            _offsetMap = new Dictionary<uint, ulong>();
+
+            for(int i = 0; i < _discImage.Tracks.Count; i++)
+            {
+                if(_discImage.Tracks[i].Sequence == 1 &&
+                   i                             != 0)
+                {
+                    AaruConsole.ErrorWriteLine("Unordered tracks");
+
+                    return ErrorNumber.InvalidArgument;
+                }
+
+                var partition = new Partition();
+
+                if(!_discImage.Tracks[i].Indexes.TryGetValue(1, out _))
+                {
+                    AaruConsole.ErrorWriteLine($"Track {_discImage.Tracks[i].Sequence} lacks index 01");
+
+                    return ErrorNumber.InvalidArgument;
+                }
+
+                // Index 01
+                partition.Description = $"Track {_discImage.Tracks[i].Sequence}.";
+                partition.Name        = _discImage.Tracks[i].Title;
+                partition.Start       = (ulong)_discImage.Tracks[i].Indexes[1];
+                partition.Size        = _discImage.Tracks[i].Sectors * _discImage.Tracks[i].Bps;
+                partition.Length      = _discImage.Tracks[i].Sectors;
+                partition.Sequence    = partitionSequence;
+                partition.Offset      = partition.Start * 2352;
+                partition.Type        = _discImage.Tracks[i].TrackType;
+
+                partitionSequence++;
+
+                if(_discImage.IsRedumpGigadisc &&
+                   _discImage.Tracks[i].Sequence == 3)
+                    _offsetMap.Add(_discImage.Tracks[i].Sequence,
+                                   gdRomSession2Offset - (ulong)_discImage.Tracks[i].Pregap);
+                else if(_discImage.Tracks[i].Indexes.TryGetValue(0, out int idx0))
+                    _offsetMap.Add(_discImage.Tracks[i].Sequence, (ulong)idx0);
+                else if(_discImage.Tracks[i].Sequence > 1)
+                    _offsetMap.Add(_discImage.Tracks[i].Sequence,
+                                   (ulong)(_discImage.Tracks[i].Indexes[1] - _discImage.Tracks[i].Pregap));
+                else
+                    _offsetMap.Add(_discImage.Tracks[i].Sequence, (ulong)_discImage.Tracks[i].Indexes[1]);
+
+                Partitions.Add(partition);
+            }
+
+            // Print offset map
+            AaruConsole.DebugWriteLine("CDRWin plugin", "printing partition map");
+
+            foreach(Partition partition in Partitions)
+            {
+                AaruConsole.DebugWriteLine("CDRWin plugin", "Partition sequence: {0}", partition.Sequence);
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition name: {0}", partition.Name);
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition description: {0}", partition.Description);
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition type: {0}", partition.Type);
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting sector: {0}", partition.Start);
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition sectors: {0}", partition.Length);
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition starting offset: {0}", partition.Offset);
+                AaruConsole.DebugWriteLine("CDRWin plugin", "\tPartition size in bytes: {0}", partition.Size);
+            }
+
+            if(_discImage.MediaType != MediaType.CDROMXA &&
+               _discImage.MediaType != MediaType.CDDA    &&
+               _discImage.MediaType != MediaType.CDI     &&
+               _discImage.MediaType != MediaType.CDPLUS  &&
+               _discImage.MediaType != MediaType.CDG     &&
+               _discImage.MediaType != MediaType.CDEG    &&
+               _discImage.MediaType != MediaType.CDMIDI  &&
+               _discImage.MediaType != MediaType.GDROM)
+                _imageInfo.SectorSize = 2048; // Only data tracks
+            else
+                _imageInfo.SectorSize = 2352; // All others
+
+            if(_discImage.Mcn != null)
+                _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_MCN);
+
+            if(_discImage.CdTextFile != null)
+                _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_TEXT);
+
+            if(_imageInfo.Application is null)
+            {
+                if(_discImage.IsTrurip)
+                    _imageInfo.Application = "trurip";
+
+                else if(_discImage.IsRedumpGigadisc)
+                    _imageInfo.Application = "Redump.org";
+
+                // Detect ISOBuster extensions
+                else if(_discImage.OriginalMediaType != null               ||
+                        _discImage.Comment.ToLower().Contains("isobuster") ||
+                        sessions.Length > 1)
+                    _imageInfo.Application = "ISOBuster";
+                else
+                    _imageInfo.Application = "CDRWin";
+            }
+
+            _imageInfo.CreationTime         = imageFilter.CreationTime;
+            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+
+            _imageInfo.Comments          = _discImage.Comment;
+            _imageInfo.MediaSerialNumber = _discImage.Mcn;
+            _imageInfo.MediaBarcode      = _discImage.Barcode;
+            _imageInfo.MediaType         = _discImage.MediaType;
+
+            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+
+            foreach(CdrWinTrack track in _discImage.Tracks)
+                switch(track.TrackType)
+                {
+                    case CDRWIN_TRACK_TYPE_AUDIO:
+                    {
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
+
+                        break;
+                    }
+                    case CDRWIN_TRACK_TYPE_CDG:
+                    {
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+
+                        break;
+                    }
+                    case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
+                    case CDRWIN_TRACK_TYPE_CDI:
+                    {
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                        break;
+                    }
+                    case CDRWIN_TRACK_TYPE_MODE2_RAW:
+                    case CDRWIN_TRACK_TYPE_CDI_RAW:
+                    {
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                        break;
+                    }
+                    case CDRWIN_TRACK_TYPE_MODE1_RAW:
+                    {
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                        break;
+                    }
+                }
+
+            _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
+
+            AaruConsole.VerboseWriteLine("CDRWIN image describes a disc of type {0}", _imageInfo.MediaType);
+
+            if(!string.IsNullOrEmpty(_imageInfo.Comments))
+                AaruConsole.VerboseWriteLine("CDRWIN comments: {0}", _imageInfo.Comments);
+
+            _sectorBuilder = new SectorBuilder();
+
+            int mediaTypeAsInt = (int)_discImage.MediaType;
+
+            _isCd = (mediaTypeAsInt >= 10 && mediaTypeAsInt <= 39) || mediaTypeAsInt == 112 ||
+                    mediaTypeAsInt == 113 || (mediaTypeAsInt >= 150 && mediaTypeAsInt <= 152) ||
+                    mediaTypeAsInt == 154 || mediaTypeAsInt == 155 ||
+                    (mediaTypeAsInt >= 171 && mediaTypeAsInt <= 179) ||
+                    (mediaTypeAsInt >= 740 && mediaTypeAsInt <= 749);
+
+            if(currentSession > 1           &&
+               leadouts.Count == 0          &&
+               !_discImage.IsRedumpGigadisc &&
+               _isCd)
+            {
+                AaruConsole.
+                    ErrorWriteLine("This image is missing vital multi-session data and cannot be read correctly.");
+
+                return ErrorNumber.InvalidArgument;
+            }
+
+            if(_isCd)
+                return ErrorNumber.NoError;
+
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorSync);
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorHeader);
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorSubHeader);
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEcc);
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEccP);
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEccQ);
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEdc);
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackFlags);
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackIsrc);
+
+            sessions = _discImage.Sessions.ToArray();
+
+            foreach(CdrWinTrack track in _discImage.Tracks)
+            {
+                track.Indexes.Remove(0);
+                track.Pregap = 0;
+
+                for(int s = 0; s < sessions.Length; s++)
+                {
+                    if(sessions[s].Sequence > 1 &&
+                       track.Sequence       == sessions[s].StartTrack)
+                    {
+                        track.TrackFile.Offset  += 307200;
+                        track.Sectors           -= 150;
+                        sessions[s].StartSector =  (ulong)track.Indexes[1];
+                    }
+                }
+            }
+
+            _discImage.Sessions = sessions.ToList();
+
+            return ErrorNumber.NoError;
+        }
+        catch(Exception ex)
+        {
+            AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.Filename);
+            AaruConsole.ErrorWriteLine("Exception: {0}", ex);
+
+            return ErrorNumber.UnexpectedException;
+        }
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        switch(tag)
+        {
+            case MediaTagType.CD_MCN:
+            {
+                if(_discImage.Mcn == null)
+                    return ErrorNumber.NoData;
+
+                buffer = Encoding.ASCII.GetBytes(_discImage.Mcn);
 
                 return ErrorNumber.NoError;
             }
-            catch(Exception ex)
+            case MediaTagType.CD_TEXT:
             {
-                AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.Filename);
-                AaruConsole.ErrorWriteLine("Exception: {0}", ex);
-
-                return ErrorNumber.UnexpectedException;
+                // TODO: Check binary text file exists, open it, read it, send it to caller.
+                return _discImage.CdTextFile != null ? ErrorNumber.NotImplemented : ErrorNumber.NoData;
             }
+            default: return ErrorNumber.NotSupported;
+        }
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from cdrwinTrack in _discImage.Tracks
+                                                 where cdrwinTrack.Sequence      == kvp.Key
+                                                 where sectorAddress - kvp.Value < cdrwinTrack.Sectors select kvp)
+            return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag == SectorTagType.CdTrackFlags ||
+           tag == SectorTagType.CdTrackIsrc)
+            return ReadSectorsTag(sectorAddress, length, 0, tag, out buffer);
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from cdrwinTrack in _discImage.Tracks
+                                                 where cdrwinTrack.Sequence      == kvp.Key
+                                                 where sectorAddress - kvp.Value < cdrwinTrack.Sectors select kvp)
+            return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+        CdrWinTrack? aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+        bool mode2 = false;
+
+        switch(aaruTrack.TrackType)
+        {
+            case CDRWIN_TRACK_TYPE_MODE1:
+            case CDRWIN_TRACK_TYPE_MODE2_FORM1:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2048;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_MODE2_FORM2:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2324;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
+            case CDRWIN_TRACK_TYPE_CDI:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2336;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_AUDIO:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_MODE1_RAW:
+            {
+                sectorOffset = 16;
+                sectorSize   = 2048;
+                sectorSkip   = 288;
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_MODE2_RAW:
+            case CDRWIN_TRACK_TYPE_CDI_RAW:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_CDG:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 96;
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+        buffer = new byte[sectorSize * length];
+
+        // If it's the lost pregap
+        if(track       == 1 &&
+           _lostPregap > 0)
         {
-            buffer = null;
-
-            switch(tag)
+            if(sectorAddress < _lostPregap)
             {
-                case MediaTagType.CD_MCN:
-                {
-                    if(_discImage.Mcn == null)
-                        return ErrorNumber.NoData;
-
-                    buffer = Encoding.ASCII.GetBytes(_discImage.Mcn);
-
+                // If we need to mix lost with present data
+                if(sectorAddress + length <= _lostPregap)
                     return ErrorNumber.NoError;
-                }
-                case MediaTagType.CD_TEXT:
-                {
-                    // TODO: Check binary text file exists, open it, read it, send it to caller.
-                    return _discImage.CdTextFile != null ? ErrorNumber.NotImplemented : ErrorNumber.NoData;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-        }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+                ulong pregapPos = _lostPregap - sectorAddress;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+                ErrorNumber errno =
+                    ReadSectors(_lostPregap, (uint)(length - pregapPos), track, out byte[] presentData);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, track, out buffer);
+                if(errno != ErrorNumber.NoError)
+                    return errno;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
+                Array.Copy(presentData, 0, buffer, (long)(pregapPos * sectorSize), presentData.Length);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from cdrwinTrack in _discImage.Tracks
-                                                     where cdrwinTrack.Sequence      == kvp.Key
-                                                     where sectorAddress - kvp.Value < cdrwinTrack.Sectors select kvp)
-                return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(tag == SectorTagType.CdTrackFlags ||
-               tag == SectorTagType.CdTrackIsrc)
-                return ReadSectorsTag(sectorAddress, length, 0, tag, out buffer);
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from cdrwinTrack in _discImage.Tracks
-                                                     where cdrwinTrack.Sequence      == kvp.Key
-                                                     where sectorAddress - kvp.Value < cdrwinTrack.Sectors select kvp)
-                return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-            CdrWinTrack? aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track);
-
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length > aaruTrack.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-            bool mode2 = false;
-
-            switch(aaruTrack.TrackType)
-            {
-                case CDRWIN_TRACK_TYPE_MODE1:
-                case CDRWIN_TRACK_TYPE_MODE2_FORM1:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2048;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE2_FORM2:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2324;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
-                case CDRWIN_TRACK_TYPE_CDI:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2336;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_AUDIO:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE1_RAW:
-                {
-                    sectorOffset = 16;
-                    sectorSize   = 2048;
-                    sectorSkip   = 288;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE2_RAW:
-                case CDRWIN_TRACK_TYPE_CDI_RAW:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_CDG:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 96;
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
+                return ErrorNumber.NoError;
             }
 
-            buffer = new byte[sectorSize * length];
+            sectorAddress -= _lostPregap;
+        }
 
-            // If it's the lost pregap
-            if(track       == 1 &&
-               _lostPregap > 0)
+        if(_discImage.IsRedumpGigadisc                      &&
+           aaruTrack.Session    == 2                        &&
+           aaruTrack.Indexes[0] >= 45000 - aaruTrack.Pregap &&
+           aaruTrack.Indexes[1] <= 45000)
+        {
+            if(sectorAddress < (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]))
             {
-                if(sectorAddress < _lostPregap)
+                if(sectorAddress + length + (ulong)aaruTrack.Indexes[0] <= (ulong)aaruTrack.Indexes[1])
+                    return ErrorNumber.NoError;
+
+                ulong pregapPos = (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]) - sectorAddress;
+
+                ErrorNumber errno = ReadSectors((ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]),
+                                                (uint)(length - pregapPos), track, out byte[] presentData);
+
+                if(errno != ErrorNumber.NoError)
+                    return errno;
+
+                Array.Copy(presentData, 0, buffer, (long)(pregapPos * sectorSize), presentData.Length);
+
+                return ErrorNumber.NoError;
+            }
+
+            sectorAddress -= (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]);
+        }
+
+        _imageStream = aaruTrack.TrackFile.DataFilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(mode2)
+        {
+            var mode2Ms = new MemoryStream((int)(sectorSize * length));
+
+            buffer = br.ReadBytes((int)(sectorSize * length));
+
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize);
+                sector = Sector.GetUserDataFromMode2(sector);
+                mode2Ms.Write(sector, 0, sector.Length);
+            }
+
+            buffer = mode2Ms.ToArray();
+        }
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag == SectorTagType.CdTrackFlags ||
+           tag == SectorTagType.CdTrackIsrc)
+            track = (uint)sectorAddress;
+
+        CdrWinTrack? aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(tag)
+        {
+            case SectorTagType.CdSectorEcc:
+            case SectorTagType.CdSectorEccP:
+            case SectorTagType.CdSectorEccQ:
+            case SectorTagType.CdSectorEdc:
+            case SectorTagType.CdSectorHeader:
+            case SectorTagType.CdSectorSubchannel:
+            case SectorTagType.CdSectorSubHeader:
+            case SectorTagType.CdSectorSync: break;
+            case SectorTagType.CdTrackFlags:
+            {
+                CdFlags flags = 0;
+
+                if(aaruTrack.TrackType != CDRWIN_TRACK_TYPE_AUDIO &&
+                   aaruTrack.TrackType != CDRWIN_TRACK_TYPE_CDG)
+                    flags |= CdFlags.DataTrack;
+
+                if(aaruTrack.FlagDcp)
+                    flags |= CdFlags.CopyPermitted;
+
+                if(aaruTrack.FlagPre)
+                    flags |= CdFlags.PreEmphasis;
+
+                if(aaruTrack.Flag4Ch)
+                    flags |= CdFlags.FourChannel;
+
+                buffer = new[]
                 {
-                    // If we need to mix lost with present data
-                    if(sectorAddress + length <= _lostPregap)
+                    (byte)flags
+                };
+
+                return ErrorNumber.NoError;
+            }
+            case SectorTagType.CdTrackIsrc:
+                if(aaruTrack.Isrc == null)
+                    return ErrorNumber.NoData;
+
+                buffer = Encoding.UTF8.GetBytes(aaruTrack.Isrc);
+
+                return ErrorNumber.NoError;
+            case SectorTagType.CdTrackText: return ErrorNumber.NotImplemented;
+            default:                        return ErrorNumber.NotSupported;
+        }
+
+        switch(aaruTrack.TrackType)
+        {
+            case CDRWIN_TRACK_TYPE_MODE1:
+            case CDRWIN_TRACK_TYPE_MODE2_FORM1:
+            case CDRWIN_TRACK_TYPE_MODE2_FORM2:
+                if(tag != SectorTagType.CdSectorSubchannel                                   ||
+                   !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel) ||
+                   _discImage.Tracks.All(t => t.TrackType != CDRWIN_TRACK_TYPE_CDG))
+                    return ErrorNumber.NoData;
+
+                buffer = new byte[length * 96];
+
+                return ErrorNumber.NoError;
+
+            case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
+            case CDRWIN_TRACK_TYPE_CDI:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    case SectorTagType.CdSectorHeader:
+                    case SectorTagType.CdSectorSubchannel:
+                    case SectorTagType.CdSectorEcc:
+                    case SectorTagType.CdSectorEccP:
+                    case SectorTagType.CdSectorEccQ:
+                        if(tag != SectorTagType.CdSectorSubchannel                                   ||
+                           !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel) ||
+                           _discImage.Tracks.All(t => t.TrackType != CDRWIN_TRACK_TYPE_CDG))
+                            return ErrorNumber.NotSupported;
+
+                        buffer = new byte[length * 96];
+
                         return ErrorNumber.NoError;
 
-                    ulong pregapPos = _lostPregap - sectorAddress;
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
 
-                    ErrorNumber errno =
-                        ReadSectors(_lostPregap, (uint)(length - pregapPos), track, out byte[] presentData);
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2332;
+                        sectorSize   = 4;
+                        sectorSkip   = 0;
 
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    Array.Copy(presentData, 0, buffer, (long)(pregapPos * sectorSize), presentData.Length);
-
-                    return ErrorNumber.NoError;
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
                 }
 
-                sectorAddress -= _lostPregap;
+                break;
             }
-
-            if(_discImage.IsRedumpGigadisc                      &&
-               aaruTrack.Session    == 2                        &&
-               aaruTrack.Indexes[0] >= 45000 - aaruTrack.Pregap &&
-               aaruTrack.Indexes[1] <= 45000)
+            case CDRWIN_TRACK_TYPE_AUDIO: return ErrorNumber.NoData;
+            case CDRWIN_TRACK_TYPE_MODE1_RAW:
             {
-                if(sectorAddress < (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]))
+                switch(tag)
                 {
-                    if(sectorAddress + length + (ulong)aaruTrack.Indexes[0] <= (ulong)aaruTrack.Indexes[1])
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubchannel:
+                    case SectorTagType.CdSectorSubHeader:
+                        if(tag != SectorTagType.CdSectorSubchannel                                   ||
+                           !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel) ||
+                           _discImage.Tracks.All(t => t.TrackType != CDRWIN_TRACK_TYPE_CDG))
+                            return ErrorNumber.NotSupported;
+
+                        buffer = new byte[length * 96];
+
                         return ErrorNumber.NoError;
 
-                    ulong pregapPos = (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]) - sectorAddress;
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
 
-                    ErrorNumber errno = ReadSectors((ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]),
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2064;
+                        sectorSize   = 4;
+                        sectorSkip   = 284;
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_MODE2_RAW: // Requires reading sector
+            case CDRWIN_TRACK_TYPE_CDI_RAW: return ErrorNumber.NotImplemented;
+            case CDRWIN_TRACK_TYPE_CDG:
+            {
+                if(tag != SectorTagType.CdSectorSubchannel)
+                    return ErrorNumber.NotSupported;
+
+                sectorOffset = 2352;
+                sectorSize   = 96;
+                sectorSkip   = 0;
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        // If it's the lost pregap
+        if(track       == 1 &&
+           _lostPregap > 0)
+        {
+            if(sectorAddress < _lostPregap)
+            {
+                // If we need to mix lost with present data
+                if(sectorAddress + length <= _lostPregap)
+                    return ErrorNumber.NoError;
+
+                ulong pregapPos = _lostPregap - sectorAddress;
+
+                ErrorNumber errno =
+                    ReadSectors(_lostPregap, (uint)(length - pregapPos), track, out byte[] presentData);
+
+                if(errno != ErrorNumber.NoError)
+                    return errno;
+
+                Array.Copy(presentData, 0, buffer, (long)(pregapPos * sectorSize), presentData.Length);
+
+                return ErrorNumber.NoError;
+            }
+
+            sectorAddress -= _lostPregap;
+        }
+
+        _imageStream = aaruTrack.TrackFile.DataFilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from cdrwinTrack in _discImage.Tracks
+                                                 where cdrwinTrack.Sequence      == kvp.Key
+                                                 where sectorAddress - kvp.Value < cdrwinTrack.Sectors select kvp)
+            return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(!_isCd)
+            return ReadSectors(sectorAddress, length, track, out buffer);
+
+        CdrWinTrack? aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(aaruTrack.TrackType)
+        {
+            case CDRWIN_TRACK_TYPE_MODE1:
+            case CDRWIN_TRACK_TYPE_MODE2_FORM1:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2048;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_MODE2_FORM2:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2324;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
+            case CDRWIN_TRACK_TYPE_CDI:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2336;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_MODE1_RAW:
+            case CDRWIN_TRACK_TYPE_MODE2_RAW:
+            case CDRWIN_TRACK_TYPE_CDI_RAW:
+            case CDRWIN_TRACK_TYPE_AUDIO:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case CDRWIN_TRACK_TYPE_CDG:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 96;
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        // If it's the lost pregap
+        if(track       == 1 &&
+           _lostPregap > 0)
+        {
+            if(sectorAddress < _lostPregap)
+            {
+                // If we need to mix lost with present data
+                if(sectorAddress + length <= _lostPregap)
+                    return ErrorNumber.NoError;
+
+                ulong pregapPos = _lostPregap - sectorAddress;
+
+                ErrorNumber errno =
+                    ReadSectors(_lostPregap, (uint)(length - pregapPos), track, out byte[] presentData);
+
+                if(errno != ErrorNumber.NoError)
+                    return errno;
+
+                Array.Copy(presentData, 0, buffer, (long)(pregapPos * sectorSize), presentData.Length);
+
+                return ErrorNumber.NoError;
+            }
+
+            sectorAddress -= _lostPregap;
+        }
+
+        if(_discImage.IsRedumpGigadisc                      &&
+           aaruTrack.Session    == 2                        &&
+           aaruTrack.Indexes[0] >= 45000 - aaruTrack.Pregap &&
+           aaruTrack.Indexes[1] <= 45000)
+        {
+            if(sectorAddress < (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]))
+            {
+                if(sectorAddress + length + (ulong)aaruTrack.Indexes[0] <= (ulong)aaruTrack.Indexes[1])
+                    return ErrorNumber.NoError;
+
+                ulong pregapPos = (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]) - sectorAddress;
+
+                ErrorNumber errno = ReadSectorsLong((ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]),
                                                     (uint)(length - pregapPos), track, out byte[] presentData);
 
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
+                if(errno != ErrorNumber.NoError)
+                    return errno;
 
-                    Array.Copy(presentData, 0, buffer, (long)(pregapPos * sectorSize), presentData.Length);
+                Array.Copy(presentData, 0, buffer, (long)(pregapPos * sectorSize), presentData.Length);
 
-                    return ErrorNumber.NoError;
-                }
-
-                sectorAddress -= (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]);
+                return ErrorNumber.NoError;
             }
 
-            _imageStream = aaruTrack.TrackFile.DataFilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(mode2)
-            {
-                var mode2Ms = new MemoryStream((int)(sectorSize * length));
-
-                buffer = br.ReadBytes((int)(sectorSize * length));
-
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize);
-                    sector = Sector.GetUserDataFromMode2(sector);
-                    mode2Ms.Write(sector, 0, sector.Length);
-                }
-
-                buffer = mode2Ms.ToArray();
-            }
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            return ErrorNumber.NoError;
+            sectorAddress -= (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
+        _imageStream = aaruTrack.TrackFile.DataFilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        switch(aaruTrack.TrackType)
         {
-            buffer = null;
-
-            if(tag == SectorTagType.CdTrackFlags ||
-               tag == SectorTagType.CdTrackIsrc)
-                track = (uint)sectorAddress;
-
-            CdrWinTrack? aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track);
-
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length > aaruTrack.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch(tag)
+            case CDRWIN_TRACK_TYPE_MODE1:
             {
-                case SectorTagType.CdSectorEcc:
-                case SectorTagType.CdSectorEccP:
-                case SectorTagType.CdSectorEccQ:
-                case SectorTagType.CdSectorEdc:
-                case SectorTagType.CdSectorHeader:
-                case SectorTagType.CdSectorSubchannel:
-                case SectorTagType.CdSectorSubHeader:
-                case SectorTagType.CdSectorSync: break;
-                case SectorTagType.CdTrackFlags:
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
                 {
-                    CdFlags flags = 0;
-
-                    if(aaruTrack.TrackType != CDRWIN_TRACK_TYPE_AUDIO &&
-                       aaruTrack.TrackType != CDRWIN_TRACK_TYPE_CDG)
-                        flags |= CdFlags.DataTrack;
-
-                    if(aaruTrack.FlagDcp)
-                        flags |= CdFlags.CopyPermitted;
-
-                    if(aaruTrack.FlagPre)
-                        flags |= CdFlags.PreEmphasis;
-
-                    if(aaruTrack.Flag4Ch)
-                        flags |= CdFlags.FourChannel;
-
-                    buffer = new[]
-                    {
-                        (byte)flags
-                    };
-
-                    return ErrorNumber.NoError;
+                    Array.Copy(buffer, i * 2048, fullSector, 16, 2048);
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)(sectorAddress + i));
+                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
                 }
-                case SectorTagType.CdTrackIsrc:
-                    if(aaruTrack.Isrc == null)
-                        return ErrorNumber.NoData;
 
-                    buffer = Encoding.UTF8.GetBytes(aaruTrack.Isrc);
+                buffer = fullBuffer;
 
-                    return ErrorNumber.NoError;
-                case SectorTagType.CdTrackText: return ErrorNumber.NotImplemented;
-                default:                        return ErrorNumber.NotSupported;
+                break;
             }
-
-            switch(aaruTrack.TrackType)
+            case CDRWIN_TRACK_TYPE_MODE2_FORM1:
             {
-                case CDRWIN_TRACK_TYPE_MODE1:
-                case CDRWIN_TRACK_TYPE_MODE2_FORM1:
-                case CDRWIN_TRACK_TYPE_MODE2_FORM2:
-                    if(tag != SectorTagType.CdSectorSubchannel                                   ||
-                       !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel) ||
-                       _discImage.Tracks.All(t => t.TrackType != CDRWIN_TRACK_TYPE_CDG))
-                        return ErrorNumber.NoData;
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
 
-                    buffer = new byte[length * 96];
-
-                    return ErrorNumber.NoError;
-
-                case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
-                case CDRWIN_TRACK_TYPE_CDI:
+                for(uint i = 0; i < length; i++)
                 {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        case SectorTagType.CdSectorHeader:
-                        case SectorTagType.CdSectorSubchannel:
-                        case SectorTagType.CdSectorEcc:
-                        case SectorTagType.CdSectorEccP:
-                        case SectorTagType.CdSectorEccQ:
-                            if(tag != SectorTagType.CdSectorSubchannel                                   ||
-                               !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel) ||
-                               _discImage.Tracks.All(t => t.TrackType != CDRWIN_TRACK_TYPE_CDG))
-                                return ErrorNumber.NotSupported;
+                    Array.Copy(buffer, i * 2048, fullSector, 24, 2048);
 
-                            buffer = new byte[length * 96];
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form1,
+                                                     (long)(sectorAddress + i));
 
-                            return ErrorNumber.NoError;
-
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2332;
-                            sectorSize   = 4;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
+                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form1);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
                 }
-                case CDRWIN_TRACK_TYPE_AUDIO: return ErrorNumber.NoData;
-                case CDRWIN_TRACK_TYPE_MODE1_RAW:
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
+                buffer = fullBuffer;
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                        case SectorTagType.CdSectorSubHeader:
-                            if(tag != SectorTagType.CdSectorSubchannel                                   ||
-                               !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel) ||
-                               _discImage.Tracks.All(t => t.TrackType != CDRWIN_TRACK_TYPE_CDG))
-                                return ErrorNumber.NotSupported;
-
-                            buffer = new byte[length * 96];
-
-                            return ErrorNumber.NoError;
-
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2064;
-                            sectorSize   = 4;
-                            sectorSkip   = 284;
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE2_RAW: // Requires reading sector
-                case CDRWIN_TRACK_TYPE_CDI_RAW: return ErrorNumber.NotImplemented;
-                case CDRWIN_TRACK_TYPE_CDG:
-                {
-                    if(tag != SectorTagType.CdSectorSubchannel)
-                        return ErrorNumber.NotSupported;
-
-                    sectorOffset = 2352;
-                    sectorSize   = 96;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
+                break;
             }
-
-            buffer = new byte[sectorSize * length];
-
-            // If it's the lost pregap
-            if(track       == 1 &&
-               _lostPregap > 0)
+            case CDRWIN_TRACK_TYPE_MODE2_FORM2:
             {
-                if(sectorAddress < _lostPregap)
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
                 {
-                    // If we need to mix lost with present data
-                    if(sectorAddress + length <= _lostPregap)
-                        return ErrorNumber.NoError;
+                    Array.Copy(buffer, i * 2324, fullSector, 24, 2324);
 
-                    ulong pregapPos = _lostPregap - sectorAddress;
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form2,
+                                                     (long)(sectorAddress + i));
 
-                    ErrorNumber errno =
-                        ReadSectors(_lostPregap, (uint)(length - pregapPos), track, out byte[] presentData);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    Array.Copy(presentData, 0, buffer, (long)(pregapPos * sectorSize), presentData.Length);
-
-                    return ErrorNumber.NoError;
+                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form2);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
                 }
 
-                sectorAddress -= _lostPregap;
+                buffer = fullBuffer;
+
+                break;
             }
+            case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
+            case CDRWIN_TRACK_TYPE_CDI:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
 
-            _imageStream = aaruTrack.TrackFile.DataFilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
+                for(uint i = 0; i < length; i++)
                 {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Formless,
+                                                     (long)(sectorAddress + i));
+
+                    Array.Copy(buffer, i                    * 2336, fullSector, 16, 2336);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
                 }
 
-            return ErrorNumber.NoError;
+                buffer = fullBuffer;
+
+                break;
+            }
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from cdrwinTrack in _discImage.Tracks
-                                                     where cdrwinTrack.Sequence      == kvp.Key
-                                                     where sectorAddress - kvp.Value < cdrwinTrack.Sectors select kvp)
-                return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(!_isCd)
-                return ReadSectors(sectorAddress, length, track, out buffer);
-
-            CdrWinTrack? aaruTrack = _discImage.Tracks.FirstOrDefault(cdrwinTrack => cdrwinTrack.Sequence == track);
-
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length > aaruTrack.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch(aaruTrack.TrackType)
-            {
-                case CDRWIN_TRACK_TYPE_MODE1:
-                case CDRWIN_TRACK_TYPE_MODE2_FORM1:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2048;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE2_FORM2:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2324;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
-                case CDRWIN_TRACK_TYPE_CDI:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2336;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE1_RAW:
-                case CDRWIN_TRACK_TYPE_MODE2_RAW:
-                case CDRWIN_TRACK_TYPE_CDI_RAW:
-                case CDRWIN_TRACK_TYPE_AUDIO:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_CDG:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 96;
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            // If it's the lost pregap
-            if(track       == 1 &&
-               _lostPregap > 0)
-            {
-                if(sectorAddress < _lostPregap)
-                {
-                    // If we need to mix lost with present data
-                    if(sectorAddress + length <= _lostPregap)
-                        return ErrorNumber.NoError;
-
-                    ulong pregapPos = _lostPregap - sectorAddress;
-
-                    ErrorNumber errno =
-                        ReadSectors(_lostPregap, (uint)(length - pregapPos), track, out byte[] presentData);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    Array.Copy(presentData, 0, buffer, (long)(pregapPos * sectorSize), presentData.Length);
-
-                    return ErrorNumber.NoError;
-                }
-
-                sectorAddress -= _lostPregap;
-            }
-
-            if(_discImage.IsRedumpGigadisc                      &&
-               aaruTrack.Session    == 2                        &&
-               aaruTrack.Indexes[0] >= 45000 - aaruTrack.Pregap &&
-               aaruTrack.Indexes[1] <= 45000)
-            {
-                if(sectorAddress < (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]))
-                {
-                    if(sectorAddress + length + (ulong)aaruTrack.Indexes[0] <= (ulong)aaruTrack.Indexes[1])
-                        return ErrorNumber.NoError;
-
-                    ulong pregapPos = (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]) - sectorAddress;
-
-                    ErrorNumber errno = ReadSectorsLong((ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]),
-                                                        (uint)(length - pregapPos), track, out byte[] presentData);
-
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-
-                    Array.Copy(presentData, 0, buffer, (long)(pregapPos * sectorSize), presentData.Length);
-
-                    return ErrorNumber.NoError;
-                }
-
-                sectorAddress -= (ulong)(aaruTrack.Indexes[1] - aaruTrack.Indexes[0]);
-            }
-
-            _imageStream = aaruTrack.TrackFile.DataFilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.TrackFile.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            switch(aaruTrack.TrackType)
-            {
-                case CDRWIN_TRACK_TYPE_MODE1:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        Array.Copy(buffer, i * 2048, fullSector, 16, 2048);
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)(sectorAddress + i));
-                        _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE2_FORM1:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        Array.Copy(buffer, i * 2048, fullSector, 24, 2048);
-
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form1,
-                                                         (long)(sectorAddress + i));
-
-                        _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form1);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE2_FORM2:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        Array.Copy(buffer, i * 2324, fullSector, 24, 2324);
-
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form2,
-                                                         (long)(sectorAddress + i));
-
-                        _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form2);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-                case CDRWIN_TRACK_TYPE_MODE2_FORMLESS:
-                case CDRWIN_TRACK_TYPE_CDI:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Formless,
-                                                         (long)(sectorAddress + i));
-
-                        Array.Copy(buffer, i                    * 2336, fullSector, 16, 2336);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-            }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(Session session)
-        {
-            if(_discImage.Sessions.Contains(session))
-                return GetSessionTracks(session.Sequence);
-
-            return null;
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session) =>
-            Tracks.Where(t => t.Session == session).OrderBy(t => t.Sequence).ToList();
+        return ErrorNumber.NoError;
     }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(Session session)
+    {
+        if(_discImage.Sessions.Contains(session))
+            return GetSessionTracks(session.Sequence);
+
+        return null;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session) =>
+        Tracks.Where(t => t.Session == session).OrderBy(t => t.Sequence).ToList();
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRWin/Structs.cs b/Aaru.Images/CDRWin/Structs.cs
index 5a940b3c4..dc2eee170 100644
--- a/Aaru.Images/CDRWin/Structs.cs
+++ b/Aaru.Images/CDRWin/Structs.cs
@@ -37,106 +37,105 @@ using Aaru.CommonTypes.Structs;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CdrWin
 {
-    public sealed partial class CdrWin
+    struct CdrWinTrackFile
     {
-        struct CdrWinTrackFile
-        {
-            /// <summary>Track #</summary>
-            public uint Sequence;
-            /// <summary>Filter of file containing track</summary>
-            public IFilter DataFilter;
-            /// <summary>Offset of track start in file</summary>
-            public ulong Offset;
-            /// <summary>Type of file</summary>
-            public string FileType;
-        }
+        /// <summary>Track #</summary>
+        public uint Sequence;
+        /// <summary>Filter of file containing track</summary>
+        public IFilter DataFilter;
+        /// <summary>Offset of track start in file</summary>
+        public ulong Offset;
+        /// <summary>Type of file</summary>
+        public string FileType;
+    }
 
-        class CdrWinTrack
-        {
-            /// <summary>Track arranger (from CD-Text)</summary>
-            public string Arranger;
-            /// <summary>Bytes per sector</summary>
-            public ushort Bps;
-            /// <summary>Track composer (from CD-Text)</summary>
-            public string Composer;
-            /// <summary>Track is quadraphonic</summary>
-            public bool Flag4Ch;
-            /// <summary>Digital Copy Permitted</summary>
-            public bool FlagDcp;
-            /// <summary>Track has pre-emphasis</summary>
-            public bool FlagPre;
-            /// <summary>Track has SCMS</summary>
-            public bool FlagScms;
-            /// <summary>Track genre (from CD-Text)</summary>
-            public string Genre;
-            /// <summary>Indexes on this track</summary>
-            public SortedDictionary<ushort, int> Indexes;
-            /// <summary>Track ISRC</summary>
-            public string Isrc;
-            /// <summary>Track performer (from CD-Text)</summary>
-            public string Performer;
-            /// <summary>Track post-gap in sectors</summary>
-            public int Postgap;
-            /// <summary>Track pre-gap in sectors</summary>
-            public int Pregap;
-            /// <summary>Sectors in track</summary>
-            public ulong Sectors;
-            /// <summary>Track #</summary>
-            public uint Sequence;
-            /// <summary>Track session</summary>
-            public ushort Session;
-            /// <summary>Track song writer (from CD-Text)</summary>
-            public string Songwriter;
-            /// <summary>Track title (from CD-Text)</summary>
-            public string Title;
-            /// <summary>File struct for this track</summary>
-            public CdrWinTrackFile TrackFile;
-            /// <summary>Track type</summary>
-            public string TrackType;
-        }
+    class CdrWinTrack
+    {
+        /// <summary>Track arranger (from CD-Text)</summary>
+        public string Arranger;
+        /// <summary>Bytes per sector</summary>
+        public ushort Bps;
+        /// <summary>Track composer (from CD-Text)</summary>
+        public string Composer;
+        /// <summary>Track is quadraphonic</summary>
+        public bool Flag4Ch;
+        /// <summary>Digital Copy Permitted</summary>
+        public bool FlagDcp;
+        /// <summary>Track has pre-emphasis</summary>
+        public bool FlagPre;
+        /// <summary>Track has SCMS</summary>
+        public bool FlagScms;
+        /// <summary>Track genre (from CD-Text)</summary>
+        public string Genre;
+        /// <summary>Indexes on this track</summary>
+        public SortedDictionary<ushort, int> Indexes;
+        /// <summary>Track ISRC</summary>
+        public string Isrc;
+        /// <summary>Track performer (from CD-Text)</summary>
+        public string Performer;
+        /// <summary>Track post-gap in sectors</summary>
+        public int Postgap;
+        /// <summary>Track pre-gap in sectors</summary>
+        public int Pregap;
+        /// <summary>Sectors in track</summary>
+        public ulong Sectors;
+        /// <summary>Track #</summary>
+        public uint Sequence;
+        /// <summary>Track session</summary>
+        public ushort Session;
+        /// <summary>Track song writer (from CD-Text)</summary>
+        public string Songwriter;
+        /// <summary>Track title (from CD-Text)</summary>
+        public string Title;
+        /// <summary>File struct for this track</summary>
+        public CdrWinTrackFile TrackFile;
+        /// <summary>Track type</summary>
+        public string TrackType;
+    }
 
-        struct CdrWinDisc
-        {
-            /// <summary>Disk title (from CD-Text)</summary>
-            public string Title;
-            /// <summary>Disk genre (from CD-Text)</summary>
-            public string Genre;
-            /// <summary>Disk arranger (from CD-Text)</summary>
-            public string Arranger;
-            /// <summary>Disk composer (from CD-Text)</summary>
-            public string Composer;
-            /// <summary>Disk performer (from CD-Text)</summary>
-            public string Performer;
-            /// <summary>Disk song writer (from CD-Text)</summary>
-            public string Songwriter;
-            /// <summary>Media catalog number</summary>
-            public string Mcn;
-            /// <summary>Disk type</summary>
-            public MediaType MediaType;
-            /// <summary>Disk type string</summary>
-            public string OriginalMediaType;
-            /// <summary>Disk CDDB ID</summary>
-            public string DiscId;
-            /// <summary>Disk UPC/EAN</summary>
-            public string Barcode;
-            /// <summary>Sessions</summary>
-            public List<Session> Sessions;
-            /// <summary>Tracks</summary>
-            public List<CdrWinTrack> Tracks;
-            /// <summary>Disk comment</summary>
-            public string Comment;
-            /// <summary>File containing CD-Text</summary>
-            public string CdTextFile;
-            /// <summary>Has trurip extensions</summary>
-            public bool IsTrurip;
-            /// <summary>Disc image hashes</summary>
-            public Dictionary<string, string> DiscHashes;
-            /// <summary>Aaru media type</summary>
-            public string AaruMediaType;
-            /// <summary>Is a GDROM from Redump.org</summary>
-            public bool IsRedumpGigadisc;
-        }
+    struct CdrWinDisc
+    {
+        /// <summary>Disk title (from CD-Text)</summary>
+        public string Title;
+        /// <summary>Disk genre (from CD-Text)</summary>
+        public string Genre;
+        /// <summary>Disk arranger (from CD-Text)</summary>
+        public string Arranger;
+        /// <summary>Disk composer (from CD-Text)</summary>
+        public string Composer;
+        /// <summary>Disk performer (from CD-Text)</summary>
+        public string Performer;
+        /// <summary>Disk song writer (from CD-Text)</summary>
+        public string Songwriter;
+        /// <summary>Media catalog number</summary>
+        public string Mcn;
+        /// <summary>Disk type</summary>
+        public MediaType MediaType;
+        /// <summary>Disk type string</summary>
+        public string OriginalMediaType;
+        /// <summary>Disk CDDB ID</summary>
+        public string DiscId;
+        /// <summary>Disk UPC/EAN</summary>
+        public string Barcode;
+        /// <summary>Sessions</summary>
+        public List<Session> Sessions;
+        /// <summary>Tracks</summary>
+        public List<CdrWinTrack> Tracks;
+        /// <summary>Disk comment</summary>
+        public string Comment;
+        /// <summary>File containing CD-Text</summary>
+        public string CdTextFile;
+        /// <summary>Has trurip extensions</summary>
+        public bool IsTrurip;
+        /// <summary>Disc image hashes</summary>
+        public Dictionary<string, string> DiscHashes;
+        /// <summary>Aaru media type</summary>
+        public string AaruMediaType;
+        /// <summary>Is a GDROM from Redump.org</summary>
+        public bool IsRedumpGigadisc;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRWin/Verify.cs b/Aaru.Images/CDRWin/Verify.cs
index 2d8812bc8..418c9ea07 100644
--- a/Aaru.Images/CDRWin/Verify.cs
+++ b/Aaru.Images/CDRWin/Verify.cs
@@ -39,195 +39,194 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CdrWin
 {
-    public sealed partial class CdrWin
+    /// <inheritdoc />
+    public bool? VerifyMediaImage()
     {
-        /// <inheritdoc />
-        public bool? VerifyMediaImage()
-        {
-            if(_discImage.DiscHashes.Count == 0)
-                return null;
-
-            // Read up to 1 MiB at a time for verification
-            const int verifySize = 1024 * 1024;
-            long      readBytes;
-            byte[]    verifyBytes;
-
-            IFilter[] filters = _discImage.Tracks.OrderBy(t => t.Sequence).Select(t => t.TrackFile.DataFilter).
-                                           Distinct().ToArray();
-
-            if(_discImage.DiscHashes.TryGetValue("sha1", out string sha1))
-            {
-                var ctx = new Sha1Context();
-
-                foreach(Stream stream in filters.Select(filter => filter.GetDataForkStream()))
-                {
-                    readBytes   = 0;
-                    verifyBytes = new byte[verifySize];
-
-                    while(readBytes + verifySize < stream.Length)
-                    {
-                        stream.Read(verifyBytes, 0, verifyBytes.Length);
-                        ctx.Update(verifyBytes);
-                        readBytes += verifyBytes.LongLength;
-                    }
-
-                    verifyBytes = new byte[stream.Length - readBytes];
-                    stream.Read(verifyBytes, 0, verifyBytes.Length);
-                    ctx.Update(verifyBytes);
-                }
-
-                string verifySha1 = ctx.End();
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Calculated SHA1: {0}", verifySha1);
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Expected SHA1: {0}", sha1);
-
-                return verifySha1 == sha1;
-            }
-
-            if(_discImage.DiscHashes.TryGetValue("md5", out string md5))
-            {
-                var ctx = new Md5Context();
-
-                foreach(Stream stream in filters.Select(filter => filter.GetDataForkStream()))
-                {
-                    readBytes   = 0;
-                    verifyBytes = new byte[verifySize];
-
-                    while(readBytes + verifySize < stream.Length)
-                    {
-                        stream.Read(verifyBytes, 0, verifyBytes.Length);
-                        ctx.Update(verifyBytes);
-                        readBytes += verifyBytes.LongLength;
-                    }
-
-                    verifyBytes = new byte[stream.Length - readBytes];
-                    stream.Read(verifyBytes, 0, verifyBytes.Length);
-                    ctx.Update(verifyBytes);
-                }
-
-                string verifyMd5 = ctx.End();
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Calculated MD5: {0}", verifyMd5);
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Expected MD5: {0}", md5);
-
-                return verifyMd5 == md5;
-            }
-
-            if(_discImage.DiscHashes.TryGetValue("crc32", out string crc32))
-            {
-                var ctx = new Crc32Context();
-
-                foreach(Stream stream in filters.Select(filter => filter.GetDataForkStream()))
-                {
-                    readBytes   = 0;
-                    verifyBytes = new byte[verifySize];
-
-                    while(readBytes + verifySize < stream.Length)
-                    {
-                        stream.Read(verifyBytes, 0, verifyBytes.Length);
-                        ctx.Update(verifyBytes);
-                        readBytes += verifyBytes.LongLength;
-                    }
-
-                    verifyBytes = new byte[stream.Length - readBytes];
-                    stream.Read(verifyBytes, 0, verifyBytes.Length);
-                    ctx.Update(verifyBytes);
-                }
-
-                string verifyCrc = ctx.End();
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Calculated CRC32: {0}", verifyCrc);
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Expected CRC32: {0}", crc32);
-
-                return verifyCrc == crc32;
-            }
-
-            foreach(string hash in _discImage.DiscHashes.Keys)
-                AaruConsole.DebugWriteLine("CDRWin plugin", "Found unsupported hash {0}", hash);
-
+        if(_discImage.DiscHashes.Count == 0)
             return null;
-        }
 
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        // Read up to 1 MiB at a time for verification
+        const int verifySize = 1024 * 1024;
+        long      readBytes;
+        byte[]    verifyBytes;
+
+        IFilter[] filters = _discImage.Tracks.OrderBy(t => t.Sequence).Select(t => t.TrackFile.DataFilter).
+                                       Distinct().ToArray();
+
+        if(_discImage.DiscHashes.TryGetValue("sha1", out string sha1))
         {
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+            var ctx = new Sha1Context();
 
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            foreach(Stream stream in filters.Select(filter => filter.GetDataForkStream()))
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                readBytes   = 0;
+                verifyBytes = new byte[verifySize];
 
-                switch(sectorStatus)
+                while(readBytes + verifySize < stream.Length)
                 {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
+                    stream.Read(verifyBytes, 0, verifyBytes.Length);
+                    ctx.Update(verifyBytes);
+                    readBytes += verifyBytes.LongLength;
                 }
+
+                verifyBytes = new byte[stream.Length - readBytes];
+                stream.Read(verifyBytes, 0, verifyBytes.Length);
+                ctx.Update(verifyBytes);
             }
 
-            if(unknownLbas.Count > 0)
-                return null;
+            string verifySha1 = ctx.End();
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Calculated SHA1: {0}", verifySha1);
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Expected SHA1: {0}", sha1);
 
-            return failingLbas.Count <= 0;
+            return verifySha1 == sha1;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(_discImage.DiscHashes.TryGetValue("md5", out string md5))
         {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            var    errno  = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+            var ctx = new Md5Context();
 
-            if(errno != ErrorNumber.NoError)
-                return null;
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            foreach(Stream stream in filters.Select(filter => filter.GetDataForkStream()))
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                readBytes   = 0;
+                verifyBytes = new byte[verifySize];
 
-                switch(sectorStatus)
+                while(readBytes + verifySize < stream.Length)
                 {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
+                    stream.Read(verifyBytes, 0, verifyBytes.Length);
+                    ctx.Update(verifyBytes);
+                    readBytes += verifyBytes.LongLength;
                 }
+
+                verifyBytes = new byte[stream.Length - readBytes];
+                stream.Read(verifyBytes, 0, verifyBytes.Length);
+                ctx.Update(verifyBytes);
             }
 
-            if(unknownLbas.Count > 0)
-                return null;
+            string verifyMd5 = ctx.End();
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Calculated MD5: {0}", verifyMd5);
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Expected MD5: {0}", md5);
 
-            return failingLbas.Count <= 0;
+            return verifyMd5 == md5;
         }
+
+        if(_discImage.DiscHashes.TryGetValue("crc32", out string crc32))
+        {
+            var ctx = new Crc32Context();
+
+            foreach(Stream stream in filters.Select(filter => filter.GetDataForkStream()))
+            {
+                readBytes   = 0;
+                verifyBytes = new byte[verifySize];
+
+                while(readBytes + verifySize < stream.Length)
+                {
+                    stream.Read(verifyBytes, 0, verifyBytes.Length);
+                    ctx.Update(verifyBytes);
+                    readBytes += verifyBytes.LongLength;
+                }
+
+                verifyBytes = new byte[stream.Length - readBytes];
+                stream.Read(verifyBytes, 0, verifyBytes.Length);
+                ctx.Update(verifyBytes);
+            }
+
+            string verifyCrc = ctx.End();
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Calculated CRC32: {0}", verifyCrc);
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Expected CRC32: {0}", crc32);
+
+            return verifyCrc == crc32;
+        }
+
+        foreach(string hash in _discImage.DiscHashes.Keys)
+            AaruConsole.DebugWriteLine("CDRWin plugin", "Found unsupported hash {0}", hash);
+
+        return null;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
+    {
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
+        {
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+
+            switch(sectorStatus)
+            {
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
+
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
+
+                    break;
+            }
+        }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        var errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
+        {
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+
+            switch(sectorStatus)
+            {
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
+
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
+
+                    break;
+            }
+        }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CDRWin/Write.cs b/Aaru.Images/CDRWin/Write.cs
index 9f69e7085..108114d6d 100644
--- a/Aaru.Images/CDRWin/Write.cs
+++ b/Aaru.Images/CDRWin/Write.cs
@@ -40,652 +40,651 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CdrWin
 {
-    public sealed partial class CdrWin
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(options != null)
         {
-            if(options != null)
+            if(options.TryGetValue("separate", out string tmpValue))
             {
-                if(options.TryGetValue("separate", out string tmpValue))
+                if(!bool.TryParse(tmpValue, out _separateTracksWriting))
                 {
-                    if(!bool.TryParse(tmpValue, out _separateTracksWriting))
-                    {
-                        ErrorMessage = "Invalid value for split option";
-
-                        return false;
-                    }
-
-                    if(_separateTracksWriting)
-                    {
-                        ErrorMessage = "Separate tracks not yet implemented";
-
-                        return false;
-                    }
-                }
-            }
-            else
-                _separateTracksWriting = false;
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            // TODO: Separate tracks
-            try
-            {
-                _writingBaseName =
-                    Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path));
-
-                _descriptorStream = new StreamWriter(path, false, Encoding.ASCII);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            _discImage = new CdrWinDisc
-            {
-                MediaType = mediaType,
-                Sessions  = new List<Session>(),
-                Tracks    = new List<CdrWinTrack>()
-            };
-
-            int mediaTypeAsInt = (int)_discImage.MediaType;
-
-            _isCd = (mediaTypeAsInt >= 10  && mediaTypeAsInt <= 39) || mediaTypeAsInt == 112 || mediaTypeAsInt == 113 ||
-                    (mediaTypeAsInt >= 150 && mediaTypeAsInt <= 152) || mediaTypeAsInt == 154 ||
-                    mediaTypeAsInt == 155 || (mediaTypeAsInt >= 171 && mediaTypeAsInt <= 179) ||
-                    (mediaTypeAsInt >= 740 && mediaTypeAsInt <= 749);
-
-            if(_isCd)
-            {
-                _trackFlags = new Dictionary<byte, byte>();
-                _trackIsrcs = new Dictionary<byte, string>();
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            switch(tag)
-            {
-                case MediaTagType.CD_MCN when _isCd:
-                    _discImage.Mcn = Encoding.ASCII.GetString(data);
-
-                    return true;
-                case MediaTagType.CD_TEXT when _isCd:
-                    var cdTextStream = new FileStream(_writingBaseName + "_cdtext.bin", FileMode.Create,
-                                                      FileAccess.ReadWrite, FileShare.None);
-
-                    cdTextStream.Write(data, 0, data.Length);
-                    _discImage.CdTextFile = Path.GetFileName(cdTextStream.Name);
-                    cdTextStream.Close();
-
-                    return true;
-                default:
-                    ErrorMessage = $"Unsupported media tag {tag}";
+                    ErrorMessage = "Invalid value for split option";
 
                     return false;
-            }
-        }
-
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
-
-            if(trackStream == null)
-            {
-                ErrorMessage = $"Can't found file containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(track.BytesPerSector != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Invalid write mode for this sector";
-
-                return false;
-            }
-
-            if(data.Length != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            trackStream.
-                Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
-                     SeekOrigin.Begin);
-
-            trackStream.Write(data, 0, data.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
-
-            if(trackStream == null)
-            {
-                ErrorMessage = $"Can't found file containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(track.BytesPerSector != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Invalid write mode for this sector";
-
-                return false;
-            }
-
-            if(sectorAddress + length > track.EndSector + 1)
-            {
-                ErrorMessage = "Can't cross tracks";
-
-                return false;
-            }
-
-            if(data.Length % track.RawBytesPerSector != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            trackStream.
-                Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
-                     SeekOrigin.Begin);
-
-            trackStream.Write(data, 0, data.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
-
-            if(trackStream == null)
-            {
-                ErrorMessage = $"Can't found file containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(data.Length != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            trackStream.
-                Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
-                     SeekOrigin.Begin);
-
-            trackStream.Write(data, 0, data.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
-
-            if(trackStream == null)
-            {
-                ErrorMessage = $"Can't found file containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(sectorAddress + length > track.EndSector + 1)
-            {
-                ErrorMessage = "Can't cross tracks";
-
-                return false;
-            }
-
-            if(data.Length % track.RawBytesPerSector != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            trackStream.
-                Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
-                     SeekOrigin.Begin);
-
-            trackStream.Write(data, 0, data.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetTracks(List<Track> tracks)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(tracks       == null ||
-               tracks.Count == 0)
-            {
-                ErrorMessage = "Invalid tracks sent";
-
-                return false;
-            }
-
-            if(_writingTracks  != null &&
-               _writingStreams != null)
-                foreach(FileStream oldTrack in _writingStreams.Select(t => t.Value).Distinct())
-                    oldTrack.Close();
-
-            _writingTracks = new List<Track>();
-
-            foreach(Track track in tracks.OrderBy(t => t.Sequence))
-            {
-                Track newTrack = track;
-
-                newTrack.File = _separateTracksWriting ? _writingBaseName + $"_track{track.Sequence:D2}.bin"
-                                    : _writingBaseName                    + ".bin";
-
-                newTrack.FileOffset = _separateTracksWriting ? 0 : track.StartSector * 2352;
-                _writingTracks.Add(newTrack);
-            }
-
-            _writingStreams = new Dictionary<uint, FileStream>();
-
-            if(_separateTracksWriting)
-                foreach(Track track in _writingTracks)
-                    _writingStreams.Add(track.Sequence,
-                                        new FileStream(track.File, FileMode.OpenOrCreate, FileAccess.ReadWrite,
-                                                       FileShare.None));
-            else
-            {
-                var jointStream = new FileStream(_writingBaseName + ".bin", FileMode.OpenOrCreate, FileAccess.ReadWrite,
-                                                 FileShare.None);
-
-                foreach(Track track in _writingTracks)
-                    _writingStreams.Add(track.Sequence, jointStream);
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            if(_separateTracksWriting)
-                foreach(FileStream writingStream in _writingStreams.Values)
-                {
-                    writingStream.Flush();
-                    writingStream.Close();
                 }
-            else
-            {
-                _writingStreams.First().Value.Flush();
-                _writingStreams.First().Value.Close();
-            }
-
-            int currentSession = 0;
-
-            if(!string.IsNullOrWhiteSpace(_discImage.Comment))
-            {
-                string[] commentLines = _discImage.Comment.Split(new[]
-                {
-                    '\n'
-                }, StringSplitOptions.RemoveEmptyEntries);
-
-                foreach(string line in commentLines)
-                    _descriptorStream.WriteLine("REM {0}", line);
-            }
-
-            _descriptorStream.WriteLine("REM ORIGINAL MEDIA-TYPE: {0}", MediaTypeToCdrwinType(_imageInfo.MediaType));
-
-            _descriptorStream.WriteLine("REM METADATA AARU MEDIA-TYPE: {0}", _imageInfo.MediaType);
-
-            if(!string.IsNullOrEmpty(_imageInfo.Application))
-            {
-                _descriptorStream.WriteLine("REM Ripping Tool: {0}", _imageInfo.Application);
-
-                if(!string.IsNullOrEmpty(_imageInfo.ApplicationVersion))
-                    _descriptorStream.WriteLine("REM Ripping Tool Version: {0}", _imageInfo.ApplicationVersion);
-            }
-
-            if(DumpHardware != null)
-            {
-                foreach(var dumpData in from dump in DumpHardware from extent in dump.Extents.OrderBy(e => e.Start)
-                                        select new
-                                        {
-                                            dump.Manufacturer,
-                                            dump.Model,
-                                            dump.Firmware,
-                                            dump.Serial,
-                                            Application        = dump.Software.Name,
-                                            ApplicationVersion = dump.Software.Version,
-                                            dump.Software.OperatingSystem,
-                                            extent.Start,
-                                            extent.End
-                                        })
-                {
-                    _descriptorStream.
-                        WriteLine($"REM METADATA DUMP EXTENT: {dumpData.Application} | {dumpData.ApplicationVersion} | {dumpData.OperatingSystem} | {dumpData.Manufacturer} | {dumpData.Model} | {dumpData.Firmware} | {dumpData.Serial} | {dumpData.Start}:{dumpData.End}");
-                }
-            }
-
-            if(!string.IsNullOrEmpty(_discImage.CdTextFile))
-                _descriptorStream.WriteLine("CDTEXTFILE \"{0}\"", Path.GetFileName(_discImage.CdTextFile));
-
-            if(!string.IsNullOrEmpty(_discImage.Title))
-                _descriptorStream.WriteLine("TITLE {0}", _discImage.Title);
-
-            if(!string.IsNullOrEmpty(_discImage.Mcn))
-                _descriptorStream.WriteLine("CATALOG {0}", _discImage.Mcn);
-
-            if(!string.IsNullOrEmpty(_discImage.Barcode))
-                _descriptorStream.WriteLine("UPC_EAN {0}", _discImage.Barcode);
-
-            if(!_separateTracksWriting)
-                _descriptorStream.WriteLine("FILE \"{0}\" BINARY",
-                                            Path.GetFileName(_writingStreams.First().Value.Name));
-
-            Track trackZero = null;
-
-            foreach(Track track in _writingTracks)
-            {
-                switch(track.Sequence)
-                {
-                    // You should not be able to write CD-i Ready as this format, but just in case
-                    case 0 when _imageInfo.MediaType != MediaType.CDIREADY:
-                        trackZero = track;
-
-                        continue;
-                    case 1 when trackZero != null && !track.Indexes.ContainsKey(0):
-                        track.StartSector = trackZero.StartSector;
-                        track.Pregap      = (ulong)track.Indexes[1] - track.StartSector;
-
-                        break;
-                }
-
-                if(track.Session > currentSession)
-                    _descriptorStream.WriteLine("REM SESSION {0}", ++currentSession);
 
                 if(_separateTracksWriting)
-                    _descriptorStream.WriteLine("FILE \"{0}\" BINARY", Path.GetFileName(track.File));
-
-                (byte minute, byte second, byte frame) msf = LbaToMsf(track.StartSector);
-                _descriptorStream.WriteLine("  TRACK {0:D2} {1}", track.Sequence, GetTrackMode(track));
-
-                if(_isCd)
                 {
-                    if(_trackFlags.TryGetValue((byte)track.Sequence, out byte flagsByte))
-                        if(flagsByte != 0 &&
-                           flagsByte != (byte)CdFlags.DataTrack)
-                        {
-                            var flags = (CdFlags)flagsByte;
+                    ErrorMessage = "Separate tracks not yet implemented";
 
-                            _descriptorStream.WriteLine("    FLAGS{0}{1}{2}",
-                                                        flags.HasFlag(CdFlags.CopyPermitted) ? " DCP" : "",
-                                                        flags.HasFlag(CdFlags.FourChannel) ? " 4CH" : "",
-                                                        flags.HasFlag(CdFlags.PreEmphasis) ? " PRE" : "");
-                        }
-
-                    if(_trackIsrcs.TryGetValue((byte)track.Sequence, out string isrc) &&
-                       !string.IsNullOrWhiteSpace(isrc))
-                        _descriptorStream.WriteLine("    ISRC {0}", isrc);
+                    return false;
                 }
-
-                if(track.Pregap > 0 && _isCd)
-                {
-                    if(track.Sequence > _writingTracks.Where(t => t.Session == track.Session).Min(t => t.Sequence))
-                        _descriptorStream.WriteLine("    INDEX {0:D2} {1:D2}:{2:D2}:{3:D2}", 0, msf.minute, msf.second,
-                                                    msf.frame);
-
-                    if(track.Sequence > 1)
-                        msf = LbaToMsf(track.StartSector + track.Pregap);
-
-                    _descriptorStream.WriteLine("    INDEX {0:D2} {1:D2}:{2:D2}:{3:D2}", 1, msf.minute, msf.second,
-                                                msf.frame);
-                }
-                else
-                    _descriptorStream.WriteLine("    INDEX {0:D2} {1:D2}:{2:D2}:{3:D2}", 1, msf.minute, msf.second,
-                                                msf.frame);
-
-                if(_isCd)
-                    foreach(KeyValuePair<ushort, int> index in track.Indexes.Where(i => i.Key > 1))
-                    {
-                        msf = LbaToMsf((ulong)index.Value);
-
-                        _descriptorStream.WriteLine("    INDEX {0:D2} {1:D2}:{2:D2}:{3:D2}", index.Key, msf.minute,
-                                                    msf.second, msf.frame);
-                    }
-
-                ushort lastSession = _writingTracks.Max(t => t.Session);
-
-                if(currentSession >= lastSession)
-                    continue;
-
-                Track lastTrackInSession = _writingTracks.Where(t => t.Session == currentSession).
-                                                          OrderBy(t => t.Sequence).LastOrDefault();
-
-                if(track.Sequence != lastTrackInSession.Sequence)
-                    continue;
-
-                msf = LbaToMsf(track.EndSector + 1);
-                _descriptorStream.WriteLine("REM LEAD-OUT {0:D2}:{1:D2}:{2:D2}", msf.minute, msf.second, msf.frame);
             }
-
-            _descriptorStream.Flush();
-            _descriptorStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
         }
+        else
+            _separateTracksWriting = false;
 
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
+        // TODO: Separate tracks
+        try
+        {
+            _writingBaseName =
+                Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path));
 
-            Track track =
-                _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
-                                                     sectorAddress <= trk.EndSector);
+            _descriptorStream = new StreamWriter(path, false, Encoding.ASCII);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            switch(tag)
-            {
-                case SectorTagType.CdTrackFlags when _isCd:
-                {
-                    if(data.Length != 1)
-                    {
-                        ErrorMessage = "Incorrect data size for track flags";
-
-                        return false;
-                    }
-
-                    _trackFlags[(byte)sectorAddress] = data[0];
-
-                    return true;
-                }
-                case SectorTagType.CdTrackIsrc when _isCd:
-                {
-                    if(data != null)
-                        _trackIsrcs[(byte)sectorAddress] = Encoding.UTF8.GetString(data);
-
-                    return true;
-                }
-                default:
-                    ErrorMessage = $"Unsupported tag type {tag}";
-
-                    return false;
-            }
+            return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag) =>
-            WriteSectorTag(data, sectorAddress, tag);
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware)
+        _discImage = new CdrWinDisc
         {
-            DumpHardware = dumpHardware;
+            MediaType = mediaType,
+            Sessions  = new List<Session>(),
+            Tracks    = new List<CdrWinTrack>()
+        };
 
-            return true;
+        int mediaTypeAsInt = (int)_discImage.MediaType;
+
+        _isCd = (mediaTypeAsInt >= 10  && mediaTypeAsInt <= 39)  || mediaTypeAsInt == 112 || mediaTypeAsInt == 113 ||
+                (mediaTypeAsInt >= 150 && mediaTypeAsInt <= 152) || mediaTypeAsInt == 154 ||
+                mediaTypeAsInt == 155 || (mediaTypeAsInt >= 171 && mediaTypeAsInt <= 179) ||
+                (mediaTypeAsInt >= 740 && mediaTypeAsInt <= 749);
+
+        if(_isCd)
+        {
+            _trackFlags = new Dictionary<byte, byte>();
+            _trackIsrcs = new Dictionary<byte, string>();
         }
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        IsWriting    = true;
+        ErrorMessage = null;
 
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata)
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        if(!IsWriting)
         {
-            _discImage.Barcode            = metadata.MediaBarcode;
-            _discImage.Comment            = metadata.Comments;
-            _discImage.Title              = metadata.MediaTitle;
-            _imageInfo.Application        = metadata.Application;
-            _imageInfo.ApplicationVersion = metadata.ApplicationVersion;
+            ErrorMessage = "Tried to write on a non-writable image";
 
-            return true;
+            return false;
+        }
+
+        switch(tag)
+        {
+            case MediaTagType.CD_MCN when _isCd:
+                _discImage.Mcn = Encoding.ASCII.GetString(data);
+
+                return true;
+            case MediaTagType.CD_TEXT when _isCd:
+                var cdTextStream = new FileStream(_writingBaseName + "_cdtext.bin", FileMode.Create,
+                                                  FileAccess.ReadWrite, FileShare.None);
+
+                cdTextStream.Write(data, 0, data.Length);
+                _discImage.CdTextFile = Path.GetFileName(cdTextStream.Name);
+                cdTextStream.Close();
+
+                return true;
+            default:
+                ErrorMessage = $"Unsupported media tag {tag}";
+
+                return false;
         }
     }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
+
+        if(trackStream == null)
+        {
+            ErrorMessage = $"Can't found file containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(track.BytesPerSector != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Invalid write mode for this sector";
+
+            return false;
+        }
+
+        if(data.Length != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        trackStream.
+            Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
+                 SeekOrigin.Begin);
+
+        trackStream.Write(data, 0, data.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
+
+        if(trackStream == null)
+        {
+            ErrorMessage = $"Can't found file containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(track.BytesPerSector != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Invalid write mode for this sector";
+
+            return false;
+        }
+
+        if(sectorAddress + length > track.EndSector + 1)
+        {
+            ErrorMessage = "Can't cross tracks";
+
+            return false;
+        }
+
+        if(data.Length % track.RawBytesPerSector != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        trackStream.
+            Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
+                 SeekOrigin.Begin);
+
+        trackStream.Write(data, 0, data.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
+
+        if(trackStream == null)
+        {
+            ErrorMessage = $"Can't found file containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(data.Length != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        trackStream.
+            Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
+                 SeekOrigin.Begin);
+
+        trackStream.Write(data, 0, data.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        FileStream trackStream = _writingStreams.FirstOrDefault(kvp => kvp.Key == track.Sequence).Value;
+
+        if(trackStream == null)
+        {
+            ErrorMessage = $"Can't found file containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(sectorAddress + length > track.EndSector + 1)
+        {
+            ErrorMessage = "Can't cross tracks";
+
+            return false;
+        }
+
+        if(data.Length % track.RawBytesPerSector != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        trackStream.
+            Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
+                 SeekOrigin.Begin);
+
+        trackStream.Write(data, 0, data.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetTracks(List<Track> tracks)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(tracks       == null ||
+           tracks.Count == 0)
+        {
+            ErrorMessage = "Invalid tracks sent";
+
+            return false;
+        }
+
+        if(_writingTracks  != null &&
+           _writingStreams != null)
+            foreach(FileStream oldTrack in _writingStreams.Select(t => t.Value).Distinct())
+                oldTrack.Close();
+
+        _writingTracks = new List<Track>();
+
+        foreach(Track track in tracks.OrderBy(t => t.Sequence))
+        {
+            Track newTrack = track;
+
+            newTrack.File = _separateTracksWriting ? _writingBaseName + $"_track{track.Sequence:D2}.bin"
+                                : _writingBaseName                    + ".bin";
+
+            newTrack.FileOffset = _separateTracksWriting ? 0 : track.StartSector * 2352;
+            _writingTracks.Add(newTrack);
+        }
+
+        _writingStreams = new Dictionary<uint, FileStream>();
+
+        if(_separateTracksWriting)
+            foreach(Track track in _writingTracks)
+                _writingStreams.Add(track.Sequence,
+                                    new FileStream(track.File, FileMode.OpenOrCreate, FileAccess.ReadWrite,
+                                                   FileShare.None));
+        else
+        {
+            var jointStream = new FileStream(_writingBaseName + ".bin", FileMode.OpenOrCreate, FileAccess.ReadWrite,
+                                             FileShare.None);
+
+            foreach(Track track in _writingTracks)
+                _writingStreams.Add(track.Sequence, jointStream);
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        if(_separateTracksWriting)
+            foreach(FileStream writingStream in _writingStreams.Values)
+            {
+                writingStream.Flush();
+                writingStream.Close();
+            }
+        else
+        {
+            _writingStreams.First().Value.Flush();
+            _writingStreams.First().Value.Close();
+        }
+
+        int currentSession = 0;
+
+        if(!string.IsNullOrWhiteSpace(_discImage.Comment))
+        {
+            string[] commentLines = _discImage.Comment.Split(new[]
+            {
+                '\n'
+            }, StringSplitOptions.RemoveEmptyEntries);
+
+            foreach(string line in commentLines)
+                _descriptorStream.WriteLine("REM {0}", line);
+        }
+
+        _descriptorStream.WriteLine("REM ORIGINAL MEDIA-TYPE: {0}", MediaTypeToCdrwinType(_imageInfo.MediaType));
+
+        _descriptorStream.WriteLine("REM METADATA AARU MEDIA-TYPE: {0}", _imageInfo.MediaType);
+
+        if(!string.IsNullOrEmpty(_imageInfo.Application))
+        {
+            _descriptorStream.WriteLine("REM Ripping Tool: {0}", _imageInfo.Application);
+
+            if(!string.IsNullOrEmpty(_imageInfo.ApplicationVersion))
+                _descriptorStream.WriteLine("REM Ripping Tool Version: {0}", _imageInfo.ApplicationVersion);
+        }
+
+        if(DumpHardware != null)
+        {
+            foreach(var dumpData in from dump in DumpHardware from extent in dump.Extents.OrderBy(e => e.Start)
+                                    select new
+                                    {
+                                        dump.Manufacturer,
+                                        dump.Model,
+                                        dump.Firmware,
+                                        dump.Serial,
+                                        Application        = dump.Software.Name,
+                                        ApplicationVersion = dump.Software.Version,
+                                        dump.Software.OperatingSystem,
+                                        extent.Start,
+                                        extent.End
+                                    })
+            {
+                _descriptorStream.
+                    WriteLine($"REM METADATA DUMP EXTENT: {dumpData.Application} | {dumpData.ApplicationVersion} | {dumpData.OperatingSystem} | {dumpData.Manufacturer} | {dumpData.Model} | {dumpData.Firmware} | {dumpData.Serial} | {dumpData.Start}:{dumpData.End}");
+            }
+        }
+
+        if(!string.IsNullOrEmpty(_discImage.CdTextFile))
+            _descriptorStream.WriteLine("CDTEXTFILE \"{0}\"", Path.GetFileName(_discImage.CdTextFile));
+
+        if(!string.IsNullOrEmpty(_discImage.Title))
+            _descriptorStream.WriteLine("TITLE {0}", _discImage.Title);
+
+        if(!string.IsNullOrEmpty(_discImage.Mcn))
+            _descriptorStream.WriteLine("CATALOG {0}", _discImage.Mcn);
+
+        if(!string.IsNullOrEmpty(_discImage.Barcode))
+            _descriptorStream.WriteLine("UPC_EAN {0}", _discImage.Barcode);
+
+        if(!_separateTracksWriting)
+            _descriptorStream.WriteLine("FILE \"{0}\" BINARY",
+                                        Path.GetFileName(_writingStreams.First().Value.Name));
+
+        Track trackZero = null;
+
+        foreach(Track track in _writingTracks)
+        {
+            switch(track.Sequence)
+            {
+                // You should not be able to write CD-i Ready as this format, but just in case
+                case 0 when _imageInfo.MediaType != MediaType.CDIREADY:
+                    trackZero = track;
+
+                    continue;
+                case 1 when trackZero != null && !track.Indexes.ContainsKey(0):
+                    track.StartSector = trackZero.StartSector;
+                    track.Pregap      = (ulong)track.Indexes[1] - track.StartSector;
+
+                    break;
+            }
+
+            if(track.Session > currentSession)
+                _descriptorStream.WriteLine("REM SESSION {0}", ++currentSession);
+
+            if(_separateTracksWriting)
+                _descriptorStream.WriteLine("FILE \"{0}\" BINARY", Path.GetFileName(track.File));
+
+            (byte minute, byte second, byte frame) msf = LbaToMsf(track.StartSector);
+            _descriptorStream.WriteLine("  TRACK {0:D2} {1}", track.Sequence, GetTrackMode(track));
+
+            if(_isCd)
+            {
+                if(_trackFlags.TryGetValue((byte)track.Sequence, out byte flagsByte))
+                    if(flagsByte != 0 &&
+                       flagsByte != (byte)CdFlags.DataTrack)
+                    {
+                        var flags = (CdFlags)flagsByte;
+
+                        _descriptorStream.WriteLine("    FLAGS{0}{1}{2}",
+                                                    flags.HasFlag(CdFlags.CopyPermitted) ? " DCP" : "",
+                                                    flags.HasFlag(CdFlags.FourChannel) ? " 4CH" : "",
+                                                    flags.HasFlag(CdFlags.PreEmphasis) ? " PRE" : "");
+                    }
+
+                if(_trackIsrcs.TryGetValue((byte)track.Sequence, out string isrc) &&
+                   !string.IsNullOrWhiteSpace(isrc))
+                    _descriptorStream.WriteLine("    ISRC {0}", isrc);
+            }
+
+            if(track.Pregap > 0 && _isCd)
+            {
+                if(track.Sequence > _writingTracks.Where(t => t.Session == track.Session).Min(t => t.Sequence))
+                    _descriptorStream.WriteLine("    INDEX {0:D2} {1:D2}:{2:D2}:{3:D2}", 0, msf.minute, msf.second,
+                                                msf.frame);
+
+                if(track.Sequence > 1)
+                    msf = LbaToMsf(track.StartSector + track.Pregap);
+
+                _descriptorStream.WriteLine("    INDEX {0:D2} {1:D2}:{2:D2}:{3:D2}", 1, msf.minute, msf.second,
+                                            msf.frame);
+            }
+            else
+                _descriptorStream.WriteLine("    INDEX {0:D2} {1:D2}:{2:D2}:{3:D2}", 1, msf.minute, msf.second,
+                                            msf.frame);
+
+            if(_isCd)
+                foreach(KeyValuePair<ushort, int> index in track.Indexes.Where(i => i.Key > 1))
+                {
+                    msf = LbaToMsf((ulong)index.Value);
+
+                    _descriptorStream.WriteLine("    INDEX {0:D2} {1:D2}:{2:D2}:{3:D2}", index.Key, msf.minute,
+                                                msf.second, msf.frame);
+                }
+
+            ushort lastSession = _writingTracks.Max(t => t.Session);
+
+            if(currentSession >= lastSession)
+                continue;
+
+            Track lastTrackInSession = _writingTracks.Where(t => t.Session == currentSession).
+                                                      OrderBy(t => t.Sequence).LastOrDefault();
+
+            if(track.Sequence != lastTrackInSession.Sequence)
+                continue;
+
+            msf = LbaToMsf(track.EndSector + 1);
+            _descriptorStream.WriteLine("REM LEAD-OUT {0:D2}:{1:D2}:{2:D2}", msf.minute, msf.second, msf.frame);
+        }
+
+        _descriptorStream.Flush();
+        _descriptorStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            _writingTracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector &&
+                                                 sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        switch(tag)
+        {
+            case SectorTagType.CdTrackFlags when _isCd:
+            {
+                if(data.Length != 1)
+                {
+                    ErrorMessage = "Incorrect data size for track flags";
+
+                    return false;
+                }
+
+                _trackFlags[(byte)sectorAddress] = data[0];
+
+                return true;
+            }
+            case SectorTagType.CdTrackIsrc when _isCd:
+            {
+                if(data != null)
+                    _trackIsrcs[(byte)sectorAddress] = Encoding.UTF8.GetString(data);
+
+                return true;
+            }
+            default:
+                ErrorMessage = $"Unsupported tag type {tag}";
+
+                return false;
+        }
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag) =>
+        WriteSectorTag(data, sectorAddress, tag);
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware)
+    {
+        DumpHardware = dumpHardware;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata)
+    {
+        _discImage.Barcode            = metadata.MediaBarcode;
+        _discImage.Comment            = metadata.Comments;
+        _discImage.Title              = metadata.MediaTitle;
+        _imageInfo.Application        = metadata.Application;
+        _imageInfo.ApplicationVersion = metadata.ApplicationVersion;
+
+        return true;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/CHD.cs b/Aaru.Images/CHD/CHD.cs
index 483d7b0df..047b3ca2d 100644
--- a/Aaru.Images/CHD/CHD.cs
+++ b/Aaru.Images/CHD/CHD.cs
@@ -39,67 +39,66 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Decoders.CD;
 
-namespace Aaru.DiscImages
-{
-    // TODO: Implement PCMCIA support
-    /// <summary>Implements reading MAME CHD disk images</summary>
-    [SuppressMessage("ReSharper", "NotAccessedField.Local")]
-    public sealed partial class Chd : IOpticalMediaImage, IVerifiableImage
-    {
-        /// <summary>"MComprHD"</summary>
-        readonly byte[] _chdTag =
-        {
-            0x4D, 0x43, 0x6F, 0x6D, 0x70, 0x72, 0x48, 0x44
-        };
-        SectorBuilder             _sectorBuilder;
-        uint                      _bytesPerHunk;
-        byte[]                    _cis;
-        byte[]                    _expectedChecksum;
-        uint                      _hdrCompression;
-        uint                      _hdrCompression1;
-        uint                      _hdrCompression2;
-        uint                      _hdrCompression3;
-        Dictionary<ulong, byte[]> _hunkCache;
-        byte[]                    _hunkMap;
-        ulong[]                   _hunkTable;
-        uint[]                    _hunkTableSmall;
-        byte[]                    _identify;
-        ImageInfo                 _imageInfo;
-        Stream                    _imageStream;
-        bool                      _isCdrom;
-        bool                      _isGdrom;
-        bool                      _isHdd;
-        uint                      _mapVersion;
-        int                       _maxBlockCache;
-        int                       _maxSectorCache;
-        Dictionary<ulong, uint>   _offsetmap;
-        List<Partition>           _partitions;
-        Dictionary<ulong, byte[]> _sectorCache;
-        uint                      _sectorsPerHunk;
-        bool                      _swapAudio;
-        uint                      _totalHunks;
-        Dictionary<uint, Track>   _tracks;
+namespace Aaru.DiscImages;
 
-        public Chd() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Application           = "MAME",
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: Implement PCMCIA support
+/// <summary>Implements reading MAME CHD disk images</summary>
+[SuppressMessage("ReSharper", "NotAccessedField.Local")]
+public sealed partial class Chd : IOpticalMediaImage, IVerifiableImage
+{
+    /// <summary>"MComprHD"</summary>
+    readonly byte[] _chdTag =
+    {
+        0x4D, 0x43, 0x6F, 0x6D, 0x70, 0x72, 0x48, 0x44
+    };
+    SectorBuilder             _sectorBuilder;
+    uint                      _bytesPerHunk;
+    byte[]                    _cis;
+    byte[]                    _expectedChecksum;
+    uint                      _hdrCompression;
+    uint                      _hdrCompression1;
+    uint                      _hdrCompression2;
+    uint                      _hdrCompression3;
+    Dictionary<ulong, byte[]> _hunkCache;
+    byte[]                    _hunkMap;
+    ulong[]                   _hunkTable;
+    uint[]                    _hunkTableSmall;
+    byte[]                    _identify;
+    ImageInfo                 _imageInfo;
+    Stream                    _imageStream;
+    bool                      _isCdrom;
+    bool                      _isGdrom;
+    bool                      _isHdd;
+    uint                      _mapVersion;
+    int                       _maxBlockCache;
+    int                       _maxSectorCache;
+    Dictionary<ulong, uint>   _offsetmap;
+    List<Partition>           _partitions;
+    Dictionary<ulong, byte[]> _sectorCache;
+    uint                      _sectorsPerHunk;
+    bool                      _swapAudio;
+    uint                      _totalHunks;
+    Dictionary<uint, Track>   _tracks;
+
+    public Chd() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Application           = "MAME",
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Constants.cs b/Aaru.Images/CHD/Constants.cs
index f414bd544..2aa3b1011 100644
--- a/Aaru.Images/CHD/Constants.cs
+++ b/Aaru.Images/CHD/Constants.cs
@@ -32,62 +32,61 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Chd
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Chd
-    {
-        /// <summary>"GDDD"</summary>
-        const uint HARD_DISK_METADATA = 0x47444444;
-        /// <summary>"IDNT"</summary>
-        const uint HARD_DISK_IDENT_METADATA = 0x49444E54;
-        /// <summary>"KEY "</summary>
-        const uint HARD_DISK_KEY_METADATA = 0x4B455920;
-        /// <summary>"CIS "</summary>
-        const uint PCMCIA_CIS_METADATA = 0x43495320;
-        /// <summary>"CHCD"</summary>
-        const uint CDROM_OLD_METADATA = 0x43484344;
-        /// <summary>"CHTR"</summary>
-        const uint CDROM_TRACK_METADATA = 0x43485452;
-        /// <summary>"CHT2"</summary>
-        const uint CDROM_TRACK_METADATA2 = 0x43485432;
-        /// <summary>"CHGT"</summary>
-        const uint GDROM_OLD_METADATA = 0x43484754;
-        /// <summary>"CHGD"</summary>
-        const uint GDROM_METADATA = 0x43484744;
-        /// <summary>"AVAV"</summary>
-        const uint AV_METADATA = 0x41564156;
-        /// <summary>"AVLD"</summary>
-        const uint AV_LASER_DISC_METADATA = 0x41564C44;
+    /// <summary>"GDDD"</summary>
+    const uint HARD_DISK_METADATA = 0x47444444;
+    /// <summary>"IDNT"</summary>
+    const uint HARD_DISK_IDENT_METADATA = 0x49444E54;
+    /// <summary>"KEY "</summary>
+    const uint HARD_DISK_KEY_METADATA = 0x4B455920;
+    /// <summary>"CIS "</summary>
+    const uint PCMCIA_CIS_METADATA = 0x43495320;
+    /// <summary>"CHCD"</summary>
+    const uint CDROM_OLD_METADATA = 0x43484344;
+    /// <summary>"CHTR"</summary>
+    const uint CDROM_TRACK_METADATA = 0x43485452;
+    /// <summary>"CHT2"</summary>
+    const uint CDROM_TRACK_METADATA2 = 0x43485432;
+    /// <summary>"CHGT"</summary>
+    const uint GDROM_OLD_METADATA = 0x43484754;
+    /// <summary>"CHGD"</summary>
+    const uint GDROM_METADATA = 0x43484744;
+    /// <summary>"AVAV"</summary>
+    const uint AV_METADATA = 0x41564156;
+    /// <summary>"AVLD"</summary>
+    const uint AV_LASER_DISC_METADATA = 0x41564C44;
 
-        const string REGEX_METADATA_HDD =
-            @"CYLS:(?<cylinders>\d+),HEADS:(?<heads>\d+),SECS:(?<sectors>\d+),BPS:(?<bps>\d+)";
-        const string REGEX_METADATA_CDROM =
-            @"TRACK:(?<track>\d+) TYPE:(?<track_type>\S+) SUBTYPE:(?<sub_type>\S+) FRAMES:(?<frames>\d+)";
-        const string REGEX_METADATA_CDROM2 =
-            @"TRACK:(?<track>\d+) TYPE:(?<track_type>\S+) SUBTYPE:(?<sub_type>\S+) FRAMES:(?<frames>\d+) PREGAP:(?<pregap>\d+) PGTYPE:(?<pgtype>\S+) PGSUB:(?<pgsub>\S+) POSTGAP:(?<postgap>\d+)";
-        const string REGEX_METADATA_GDROM =
-            @"TRACK:(?<track>\d+) TYPE:(?<track_type>\S+) SUBTYPE:(?<sub_type>\S+) FRAMES:(?<frames>\d+) PAD:(?<pad>\d+) PREGAP:(?<pregap>\d+) PGTYPE:(?<pgtype>\S+) PGSUB:(?<pgsub>\S+) POSTGAP:(?<postgap>\d+)";
+    const string REGEX_METADATA_HDD =
+        @"CYLS:(?<cylinders>\d+),HEADS:(?<heads>\d+),SECS:(?<sectors>\d+),BPS:(?<bps>\d+)";
+    const string REGEX_METADATA_CDROM =
+        @"TRACK:(?<track>\d+) TYPE:(?<track_type>\S+) SUBTYPE:(?<sub_type>\S+) FRAMES:(?<frames>\d+)";
+    const string REGEX_METADATA_CDROM2 =
+        @"TRACK:(?<track>\d+) TYPE:(?<track_type>\S+) SUBTYPE:(?<sub_type>\S+) FRAMES:(?<frames>\d+) PREGAP:(?<pregap>\d+) PGTYPE:(?<pgtype>\S+) PGSUB:(?<pgsub>\S+) POSTGAP:(?<postgap>\d+)";
+    const string REGEX_METADATA_GDROM =
+        @"TRACK:(?<track>\d+) TYPE:(?<track_type>\S+) SUBTYPE:(?<sub_type>\S+) FRAMES:(?<frames>\d+) PAD:(?<pad>\d+) PREGAP:(?<pregap>\d+) PGTYPE:(?<pgtype>\S+) PGSUB:(?<pgsub>\S+) POSTGAP:(?<postgap>\d+)";
 
-        const string TRACK_TYPE_MODE1        = "MODE1";
-        const string TRACK_TYPE_MODE1_2K     = "MODE1/2048";
-        const string TRACK_TYPE_MODE1_RAW    = "MODE1_RAW";
-        const string TRACK_TYPE_MODE1_RAW_2K = "MODE1/2352";
-        const string TRACK_TYPE_MODE2        = "MODE2";
-        const string TRACK_TYPE_MODE2_2K     = "MODE2/2336";
-        const string TRACK_TYPE_MODE2_F1     = "MODE2_FORM1";
-        const string TRACK_TYPE_MODE2_F1_2K  = "MODE2/2048";
-        const string TRACK_TYPE_MODE2_F2     = "MODE2_FORM2";
-        const string TRACK_TYPE_MODE2_F2_2K  = "MODE2/2324";
-        const string TRACK_TYPE_MODE2_FM     = "MODE2_FORM_MIX";
-        const string TRACK_TYPE_MODE2_RAW    = "MODE2_RAW";
-        const string TRACK_TYPE_MODE2_RAW_2K = "MODE2/2352";
-        const string TRACK_TYPE_AUDIO        = "AUDIO";
+    const string TRACK_TYPE_MODE1        = "MODE1";
+    const string TRACK_TYPE_MODE1_2K     = "MODE1/2048";
+    const string TRACK_TYPE_MODE1_RAW    = "MODE1_RAW";
+    const string TRACK_TYPE_MODE1_RAW_2K = "MODE1/2352";
+    const string TRACK_TYPE_MODE2        = "MODE2";
+    const string TRACK_TYPE_MODE2_2K     = "MODE2/2336";
+    const string TRACK_TYPE_MODE2_F1     = "MODE2_FORM1";
+    const string TRACK_TYPE_MODE2_F1_2K  = "MODE2/2048";
+    const string TRACK_TYPE_MODE2_F2     = "MODE2_FORM2";
+    const string TRACK_TYPE_MODE2_F2_2K  = "MODE2/2324";
+    const string TRACK_TYPE_MODE2_FM     = "MODE2_FORM_MIX";
+    const string TRACK_TYPE_MODE2_RAW    = "MODE2_RAW";
+    const string TRACK_TYPE_MODE2_RAW_2K = "MODE2/2352";
+    const string TRACK_TYPE_AUDIO        = "AUDIO";
 
-        const string SUB_TYPE_COOKED = "RW";
-        const string SUB_TYPE_RAW    = "RW_RAW";
-        const string SUB_TYPE_NONE   = "NONE";
+    const string SUB_TYPE_COOKED = "RW";
+    const string SUB_TYPE_RAW    = "RW_RAW";
+    const string SUB_TYPE_NONE   = "NONE";
 
-        const int MAX_CACHE_SIZE = 16777216;
-    }
+    const int MAX_CACHE_SIZE = 16777216;
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Enums.cs b/Aaru.Images/CHD/Enums.cs
index 3bdb1d426..f6c0d0824 100644
--- a/Aaru.Images/CHD/Enums.cs
+++ b/Aaru.Images/CHD/Enums.cs
@@ -32,50 +32,49 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Chd
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Chd
+    enum Compression : uint
     {
-        enum Compression : uint
-        {
-            None = 0, Zlib = 1, ZlibPlus = 2,
-            Av   = 3
-        }
+        None = 0, Zlib = 1, ZlibPlus = 2,
+        Av   = 3
+    }
 
-        enum Flags : uint
-        {
-            HasParent = 1, Writable = 2
-        }
+    enum Flags : uint
+    {
+        HasParent = 1, Writable = 2
+    }
 
-        enum EntryFlagsV3 : byte
-        {
-            /// <summary>Invalid</summary>
-            Invalid = 0,
-            /// <summary>Compressed with primary codec</summary>
-            Compressed = 1,
-            /// <summary>Uncompressed</summary>
-            Uncompressed = 2,
-            /// <summary>Use offset as data</summary>
-            Mini = 3,
-            /// <summary>Same as another hunk in file</summary>
-            SelfHunk = 4,
-            /// <summary>Same as another hunk in parent</summary>
-            ParentHunk = 5,
-            /// <summary>Compressed with secondary codec (FLAC)</summary>
-            SecondCompressed = 6
-        }
+    enum EntryFlagsV3 : byte
+    {
+        /// <summary>Invalid</summary>
+        Invalid = 0,
+        /// <summary>Compressed with primary codec</summary>
+        Compressed = 1,
+        /// <summary>Uncompressed</summary>
+        Uncompressed = 2,
+        /// <summary>Use offset as data</summary>
+        Mini = 3,
+        /// <summary>Same as another hunk in file</summary>
+        SelfHunk = 4,
+        /// <summary>Same as another hunk in parent</summary>
+        ParentHunk = 5,
+        /// <summary>Compressed with secondary codec (FLAC)</summary>
+        SecondCompressed = 6
+    }
 
-        enum TrackTypeOld : uint
-        {
-            Mode1 = 0, Mode1Raw, Mode2,
-            Mode2Form1, Mode2Form2, Mode2FormMix,
-            Mode2Raw, Audio
-        }
+    enum TrackTypeOld : uint
+    {
+        Mode1 = 0, Mode1Raw, Mode2,
+        Mode2Form1, Mode2Form2, Mode2FormMix,
+        Mode2Raw, Audio
+    }
 
-        enum SubTypeOld : uint
-        {
-            Cooked = 0, Raw, None
-        }
+    enum SubTypeOld : uint
+    {
+        Cooked = 0, Raw, None
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Helpers.cs b/Aaru.Images/CHD/Helpers.cs
index 2a8e4ce43..da57a9919 100644
--- a/Aaru.Images/CHD/Helpers.cs
+++ b/Aaru.Images/CHD/Helpers.cs
@@ -41,184 +41,183 @@ using Aaru.Helpers;
 using SharpCompress.Compressors;
 using SharpCompress.Compressors.Deflate;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Chd
 {
-    public sealed partial class Chd
+    Track GetTrack(ulong sector)
     {
-        Track GetTrack(ulong sector)
+        var track = new Track();
+
+        foreach(KeyValuePair<ulong, uint> kvp in _offsetmap.Where(kvp => sector >= kvp.Key))
+            _tracks.TryGetValue(kvp.Value, out track);
+
+        return track;
+    }
+
+    ulong GetAbsoluteSector(ulong relativeSector, uint track)
+    {
+        _tracks.TryGetValue(track, out Track aaruTrack);
+
+        return (aaruTrack?.StartSector ?? 0) + relativeSector;
+    }
+
+    ErrorNumber GetHunk(ulong hunkNo, out byte[] buffer)
+    {
+        if(_hunkCache.TryGetValue(hunkNo, out buffer))
+            return ErrorNumber.NoError;
+
+        switch(_mapVersion)
         {
-            var track = new Track();
+            case 1:
+                ulong offset = _hunkTable[hunkNo] & 0x00000FFFFFFFFFFF;
+                ulong length = _hunkTable[hunkNo] >> 44;
 
-            foreach(KeyValuePair<ulong, uint> kvp in _offsetmap.Where(kvp => sector >= kvp.Key))
-                _tracks.TryGetValue(kvp.Value, out track);
+                byte[] compHunk = new byte[length];
+                _imageStream.Seek((long)offset, SeekOrigin.Begin);
+                _imageStream.Read(compHunk, 0, compHunk.Length);
 
-            return track;
-        }
+                if(length == _sectorsPerHunk * _imageInfo.SectorSize)
+                    buffer = compHunk;
+                else if((Compression)_hdrCompression > Compression.Zlib)
+                {
+                    AaruConsole.ErrorWriteLine($"Unsupported compression {(Compression)_hdrCompression}");
 
-        ulong GetAbsoluteSector(ulong relativeSector, uint track)
-        {
-            _tracks.TryGetValue(track, out Track aaruTrack);
+                    return ErrorNumber.InvalidArgument;
+                }
+                else
+                {
+                    var zStream = new DeflateStream(new MemoryStream(compHunk), CompressionMode.Decompress);
+                    buffer = new byte[_sectorsPerHunk * _imageInfo.SectorSize];
+                    int read = zStream.Read(buffer, 0, (int)(_sectorsPerHunk * _imageInfo.SectorSize));
 
-            return (aaruTrack?.StartSector ?? 0) + relativeSector;
-        }
-
-        ErrorNumber GetHunk(ulong hunkNo, out byte[] buffer)
-        {
-            if(_hunkCache.TryGetValue(hunkNo, out buffer))
-                return ErrorNumber.NoError;
-
-            switch(_mapVersion)
-            {
-                case 1:
-                    ulong offset = _hunkTable[hunkNo] & 0x00000FFFFFFFFFFF;
-                    ulong length = _hunkTable[hunkNo] >> 44;
-
-                    byte[] compHunk = new byte[length];
-                    _imageStream.Seek((long)offset, SeekOrigin.Begin);
-                    _imageStream.Read(compHunk, 0, compHunk.Length);
-
-                    if(length == _sectorsPerHunk * _imageInfo.SectorSize)
-                        buffer = compHunk;
-                    else if((Compression)_hdrCompression > Compression.Zlib)
+                    if(read != _sectorsPerHunk * _imageInfo.SectorSize)
                     {
-                        AaruConsole.ErrorWriteLine($"Unsupported compression {(Compression)_hdrCompression}");
+                        AaruConsole.
+                            ErrorWriteLine($"Unable to decompress hunk correctly, got {read} bytes, expected {_sectorsPerHunk * _imageInfo.SectorSize}");
+
+                        return ErrorNumber.InOutError;
+                    }
+
+                    zStream.Close();
+                }
+
+                break;
+            case 3:
+                byte[] entryBytes = new byte[16];
+                Array.Copy(_hunkMap, (int)(hunkNo * 16), entryBytes, 0, 16);
+                MapEntryV3 entry = Marshal.ByteArrayToStructureBigEndian<MapEntryV3>(entryBytes);
+
+                switch((EntryFlagsV3)(entry.flags & 0x0F))
+                {
+                    case EntryFlagsV3.Invalid:
+                        AaruConsole.ErrorWriteLine("Invalid hunk found.");
 
                         return ErrorNumber.InvalidArgument;
-                    }
-                    else
-                    {
-                        var zStream = new DeflateStream(new MemoryStream(compHunk), CompressionMode.Decompress);
-                        buffer = new byte[_sectorsPerHunk * _imageInfo.SectorSize];
-                        int read = zStream.Read(buffer, 0, (int)(_sectorsPerHunk * _imageInfo.SectorSize));
-
-                        if(read != _sectorsPerHunk * _imageInfo.SectorSize)
+                    case EntryFlagsV3.Compressed:
+                        switch((Compression)_hdrCompression)
                         {
-                            AaruConsole.
-                                ErrorWriteLine($"Unable to decompress hunk correctly, got {read} bytes, expected {_sectorsPerHunk * _imageInfo.SectorSize}");
+                            case Compression.None: goto uncompressedV3;
+                            case Compression.Zlib:
+                            case Compression.ZlibPlus:
+                                if(_isHdd)
+                                {
+                                    byte[] zHunk = new byte[(entry.lengthLsb << 16) + entry.lengthLsb];
+                                    _imageStream.Seek((long)entry.offset, SeekOrigin.Begin);
+                                    _imageStream.Read(zHunk, 0, zHunk.Length);
 
-                            return ErrorNumber.InOutError;
-                        }
+                                    var zStream =
+                                        new DeflateStream(new MemoryStream(zHunk), CompressionMode.Decompress);
 
-                        zStream.Close();
-                    }
+                                    buffer = new byte[_bytesPerHunk];
+                                    int read = zStream.Read(buffer, 0, (int)_bytesPerHunk);
 
-                    break;
-                case 3:
-                    byte[] entryBytes = new byte[16];
-                    Array.Copy(_hunkMap, (int)(hunkNo * 16), entryBytes, 0, 16);
-                    MapEntryV3 entry = Marshal.ByteArrayToStructureBigEndian<MapEntryV3>(entryBytes);
-
-                    switch((EntryFlagsV3)(entry.flags & 0x0F))
-                    {
-                        case EntryFlagsV3.Invalid:
-                            AaruConsole.ErrorWriteLine("Invalid hunk found.");
-
-                            return ErrorNumber.InvalidArgument;
-                        case EntryFlagsV3.Compressed:
-                            switch((Compression)_hdrCompression)
-                            {
-                                case Compression.None: goto uncompressedV3;
-                                case Compression.Zlib:
-                                case Compression.ZlibPlus:
-                                    if(_isHdd)
+                                    if(read != _bytesPerHunk)
                                     {
-                                        byte[] zHunk = new byte[(entry.lengthLsb << 16) + entry.lengthLsb];
-                                        _imageStream.Seek((long)entry.offset, SeekOrigin.Begin);
-                                        _imageStream.Read(zHunk, 0, zHunk.Length);
+                                        AaruConsole.
+                                            ErrorWriteLine($"Unable to decompress hunk correctly, got {read} bytes, expected {_bytesPerHunk}");
 
-                                        var zStream =
-                                            new DeflateStream(new MemoryStream(zHunk), CompressionMode.Decompress);
-
-                                        buffer = new byte[_bytesPerHunk];
-                                        int read = zStream.Read(buffer, 0, (int)_bytesPerHunk);
-
-                                        if(read != _bytesPerHunk)
-                                        {
-                                            AaruConsole.
-                                                ErrorWriteLine($"Unable to decompress hunk correctly, got {read} bytes, expected {_bytesPerHunk}");
-
-                                            return ErrorNumber.InOutError;
-                                        }
-
-                                        zStream.Close();
+                                        return ErrorNumber.InOutError;
                                     }
 
-                                    // TODO: Guess wth is MAME doing with these hunks
-                                    else
-                                    {
-                                        AaruConsole.ErrorWriteLine("Compressed CD/GD-ROM hunks are not yet supported");
+                                    zStream.Close();
+                                }
 
-                                        return ErrorNumber.NotImplemented;
-                                    }
-
-                                    break;
-                                case Compression.Av:
-                                    AaruConsole.
-                                        ErrorWriteLine($"Unsupported compression {(Compression)_hdrCompression}");
+                                // TODO: Guess wth is MAME doing with these hunks
+                                else
+                                {
+                                    AaruConsole.ErrorWriteLine("Compressed CD/GD-ROM hunks are not yet supported");
 
                                     return ErrorNumber.NotImplemented;
-                            }
+                                }
 
-                            break;
-                        case EntryFlagsV3.Uncompressed:
-                            uncompressedV3:
-                            buffer = new byte[_bytesPerHunk];
-                            _imageStream.Seek((long)entry.offset, SeekOrigin.Begin);
-                            _imageStream.Read(buffer, 0, buffer.Length);
+                                break;
+                            case Compression.Av:
+                                AaruConsole.
+                                    ErrorWriteLine($"Unsupported compression {(Compression)_hdrCompression}");
 
-                            break;
-                        case EntryFlagsV3.Mini:
-                            buffer = new byte[_bytesPerHunk];
-                            byte[] mini;
-                            mini = BigEndianBitConverter.GetBytes(entry.offset);
+                                return ErrorNumber.NotImplemented;
+                        }
 
-                            for(int i = 0; i < _bytesPerHunk; i++)
-                                buffer[i] = mini[i % 8];
-
-                            break;
-                        case EntryFlagsV3.SelfHunk: return GetHunk(entry.offset, out buffer);
-                        case EntryFlagsV3.ParentHunk:
-                            AaruConsole.ErrorWriteLine("Parent images are not supported");
-
-                            return ErrorNumber.NotImplemented;
-                        case EntryFlagsV3.SecondCompressed:
-                            AaruConsole.ErrorWriteLine("FLAC is not supported");
-
-                            return ErrorNumber.NotImplemented;
-                        default:
-                            AaruConsole.ErrorWriteLine($"Hunk type {entry.flags & 0xF} is not supported");
-
-                            return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case 5:
-                    if(_hdrCompression == 0)
-                    {
+                        break;
+                    case EntryFlagsV3.Uncompressed:
+                        uncompressedV3:
                         buffer = new byte[_bytesPerHunk];
-                        _imageStream.Seek(_hunkTableSmall[hunkNo] * _bytesPerHunk, SeekOrigin.Begin);
+                        _imageStream.Seek((long)entry.offset, SeekOrigin.Begin);
                         _imageStream.Read(buffer, 0, buffer.Length);
-                    }
-                    else
-                    {
-                        AaruConsole.ErrorWriteLine("Compressed v5 hunks not yet supported");
+
+                        break;
+                    case EntryFlagsV3.Mini:
+                        buffer = new byte[_bytesPerHunk];
+                        byte[] mini;
+                        mini = BigEndianBitConverter.GetBytes(entry.offset);
+
+                        for(int i = 0; i < _bytesPerHunk; i++)
+                            buffer[i] = mini[i % 8];
+
+                        break;
+                    case EntryFlagsV3.SelfHunk: return GetHunk(entry.offset, out buffer);
+                    case EntryFlagsV3.ParentHunk:
+                        AaruConsole.ErrorWriteLine("Parent images are not supported");
+
+                        return ErrorNumber.NotImplemented;
+                    case EntryFlagsV3.SecondCompressed:
+                        AaruConsole.ErrorWriteLine("FLAC is not supported");
+
+                        return ErrorNumber.NotImplemented;
+                    default:
+                        AaruConsole.ErrorWriteLine($"Hunk type {entry.flags & 0xF} is not supported");
 
                         return ErrorNumber.NotSupported;
-                    }
+                }
 
-                    break;
-                default:
-                    AaruConsole.ErrorWriteLine($"Unsupported hunk map version {_mapVersion}");
+                break;
+            case 5:
+                if(_hdrCompression == 0)
+                {
+                    buffer = new byte[_bytesPerHunk];
+                    _imageStream.Seek(_hunkTableSmall[hunkNo] * _bytesPerHunk, SeekOrigin.Begin);
+                    _imageStream.Read(buffer, 0, buffer.Length);
+                }
+                else
+                {
+                    AaruConsole.ErrorWriteLine("Compressed v5 hunks not yet supported");
 
                     return ErrorNumber.NotSupported;
-            }
+                }
 
-            if(_hunkCache.Count >= _maxBlockCache)
-                _hunkCache.Clear();
+                break;
+            default:
+                AaruConsole.ErrorWriteLine($"Unsupported hunk map version {_mapVersion}");
 
-            _hunkCache.Add(hunkNo, buffer);
-
-            return ErrorNumber.NoError;
+                return ErrorNumber.NotSupported;
         }
+
+        if(_hunkCache.Count >= _maxBlockCache)
+            _hunkCache.Clear();
+
+        _hunkCache.Add(hunkNo, buffer);
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Identify.cs b/Aaru.Images/CHD/Identify.cs
index aa22c204c..0394ae628 100644
--- a/Aaru.Images/CHD/Identify.cs
+++ b/Aaru.Images/CHD/Identify.cs
@@ -34,19 +34,18 @@ using System.IO;
 using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Chd
-    {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
-            byte[] magic = new byte[8];
-            stream.Read(magic, 0, 8);
+namespace Aaru.DiscImages;
 
-            return _chdTag.SequenceEqual(magic);
-        }
+public sealed partial class Chd
+{
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
+    {
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+        byte[] magic = new byte[8];
+        stream.Read(magic, 0, 8);
+
+        return _chdTag.SequenceEqual(magic);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Properties.cs b/Aaru.Images/CHD/Properties.cs
index 312519014..100f3c59c 100644
--- a/Aaru.Images/CHD/Properties.cs
+++ b/Aaru.Images/CHD/Properties.cs
@@ -37,43 +37,42 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Chd
 {
-    public sealed partial class Chd
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "MAME Compressed Hunks of Data";
+    /// <inheritdoc />
+    public Guid Id => new("0D50233A-08BD-47D4-988B-27EAA0358597");
+    /// <inheritdoc />
+    public string Format => "Compressed Hunks of Data";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public List<Partition> Partitions => _isHdd ? null : _partitions;
+
+    /// <inheritdoc />
+    public List<Track> Tracks => _isHdd ? null : _tracks.Values.ToList();
+
+    /// <inheritdoc />
+    public List<Session> Sessions
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "MAME Compressed Hunks of Data";
-        /// <inheritdoc />
-        public Guid Id => new("0D50233A-08BD-47D4-988B-27EAA0358597");
-        /// <inheritdoc />
-        public string Format => "Compressed Hunks of Data";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public List<Partition> Partitions => _isHdd ? null : _partitions;
-
-        /// <inheritdoc />
-        public List<Track> Tracks => _isHdd ? null : _tracks.Values.ToList();
-
-        /// <inheritdoc />
-        public List<Session> Sessions
+        get
         {
-            get
-            {
-                if(_isHdd)
-                    return null;
-
-                // TODO: Implement
+            if(_isHdd)
                 return null;
-            }
-        }
 
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
+            // TODO: Implement
+            return null;
+        }
     }
+
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Read.cs b/Aaru.Images/CHD/Read.cs
index e995b0486..2c4e762cc 100644
--- a/Aaru.Images/CHD/Read.cs
+++ b/Aaru.Images/CHD/Read.cs
@@ -47,1371 +47,1547 @@ using Aaru.Decoders.CD;
 using Aaru.Helpers;
 using Session = Aaru.CommonTypes.Structs.Session;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Chd
 {
-    public sealed partial class Chd
+    /// <inheritdoc />
+    [SuppressMessage("ReSharper", "UnusedVariable")]
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        [SuppressMessage("ReSharper", "UnusedVariable")]
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+        byte[] magic = new byte[8];
+        stream.Read(magic, 0, 8);
+
+        if(!_chdTag.SequenceEqual(magic))
+            return ErrorNumber.InvalidArgument;
+
+        // Read length
+        byte[] buffer = new byte[4];
+        stream.Read(buffer, 0, 4);
+        uint length = BitConverter.ToUInt32(buffer.Reverse().ToArray(), 0);
+        buffer = new byte[4];
+        stream.Read(buffer, 0, 4);
+        uint version = BitConverter.ToUInt32(buffer.Reverse().ToArray(), 0);
+
+        buffer = new byte[length];
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, (int)length);
+
+        ulong nextMetaOff = 0;
+
+        switch(version)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
-            byte[] magic = new byte[8];
-            stream.Read(magic, 0, 8);
-
-            if(!_chdTag.SequenceEqual(magic))
-                return ErrorNumber.InvalidArgument;
-
-            // Read length
-            byte[] buffer = new byte[4];
-            stream.Read(buffer, 0, 4);
-            uint length = BitConverter.ToUInt32(buffer.Reverse().ToArray(), 0);
-            buffer = new byte[4];
-            stream.Read(buffer, 0, 4);
-            uint version = BitConverter.ToUInt32(buffer.Reverse().ToArray(), 0);
-
-            buffer = new byte[length];
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, (int)length);
-
-            ulong nextMetaOff = 0;
-
-            switch(version)
+            case 1:
             {
-                case 1:
+                HeaderV1 hdrV1 = Marshal.ByteArrayToStructureBigEndian<HeaderV1>(buffer);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.tag = \"{0}\"",
+                                           Encoding.ASCII.GetString(hdrV1.tag));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.length = {0} bytes", hdrV1.length);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.version = {0}", hdrV1.version);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.flags = {0}", (Flags)hdrV1.flags);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.compression = {0}", (Compression)hdrV1.compression);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.hunksize = {0}", hdrV1.hunksize);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.totalhunks = {0}", hdrV1.totalhunks);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.cylinders = {0}", hdrV1.cylinders);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.heads = {0}", hdrV1.heads);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.sectors = {0}", hdrV1.sectors);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV1.md5));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.parentmd5 = {0}",
+                                           ArrayHelpers.ArrayIsNullOrEmpty(hdrV1.parentmd5) ? "null"
+                                               : ArrayHelpers.ByteArrayToHex(hdrV1.parentmd5));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
+                DateTime start = DateTime.UtcNow;
+
+                _hunkTable = new ulong[hdrV1.totalhunks];
+
+                uint hunkSectorCount = (uint)Math.Ceiling((double)hdrV1.totalhunks * 8 / 512);
+
+                byte[] hunkSectorBytes = new byte[512];
+
+                for(int i = 0; i < hunkSectorCount; i++)
                 {
-                    HeaderV1 hdrV1 = Marshal.ByteArrayToStructureBigEndian<HeaderV1>(buffer);
+                    stream.Read(hunkSectorBytes, 0, 512);
 
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.tag = \"{0}\"",
-                                               Encoding.ASCII.GetString(hdrV1.tag));
+                    // This does the big-endian trick but reverses the order of elements also
+                    Array.Reverse(hunkSectorBytes);
+                    HunkSector hunkSector = Marshal.ByteArrayToStructureLittleEndian<HunkSector>(hunkSectorBytes);
 
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.length = {0} bytes", hdrV1.length);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.version = {0}", hdrV1.version);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.flags = {0}", (Flags)hdrV1.flags);
+                    // This restores the order of elements
+                    Array.Reverse(hunkSector.hunkEntry);
 
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.compression = {0}", (Compression)hdrV1.compression);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.hunksize = {0}", hdrV1.hunksize);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.totalhunks = {0}", hdrV1.totalhunks);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.cylinders = {0}", hdrV1.cylinders);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.heads = {0}", hdrV1.heads);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.sectors = {0}", hdrV1.sectors);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV1.md5));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV1.parentmd5 = {0}",
-                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV1.parentmd5) ? "null"
-                                                   : ArrayHelpers.ByteArrayToHex(hdrV1.parentmd5));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
-                    DateTime start = DateTime.UtcNow;
-
-                    _hunkTable = new ulong[hdrV1.totalhunks];
-
-                    uint hunkSectorCount = (uint)Math.Ceiling((double)hdrV1.totalhunks * 8 / 512);
-
-                    byte[] hunkSectorBytes = new byte[512];
-
-                    for(int i = 0; i < hunkSectorCount; i++)
-                    {
-                        stream.Read(hunkSectorBytes, 0, 512);
-
-                        // This does the big-endian trick but reverses the order of elements also
-                        Array.Reverse(hunkSectorBytes);
-                        HunkSector hunkSector = Marshal.ByteArrayToStructureLittleEndian<HunkSector>(hunkSectorBytes);
-
-                        // This restores the order of elements
-                        Array.Reverse(hunkSector.hunkEntry);
-
-                        if(_hunkTable.Length >= (i                                  * 512 / 8) + (512 / 8))
-                            Array.Copy(hunkSector.hunkEntry, 0, _hunkTable, i * 512 / 8, 512 / 8);
-                        else
-                            Array.Copy(hunkSector.hunkEntry, 0, _hunkTable, i * 512 / 8,
-                                       _hunkTable.Length - (i * 512 / 8));
-                    }
-
-                    DateTime end = DateTime.UtcNow;
-                    AaruConsole.DebugWriteLine("CHD plugin", "Took {0} seconds", (end - start).TotalSeconds);
-
-                    _imageInfo.MediaType    = MediaType.GENERIC_HDD;
-                    _imageInfo.Sectors      = hdrV1.hunksize * hdrV1.totalhunks;
-                    _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-                    _imageInfo.SectorSize   = 512;
-                    _imageInfo.Version      = "1";
-                    _imageInfo.ImageSize    = _imageInfo.SectorSize * hdrV1.hunksize * hdrV1.totalhunks;
-
-                    _totalHunks     = hdrV1.totalhunks;
-                    _sectorsPerHunk = hdrV1.hunksize;
-                    _hdrCompression = hdrV1.compression;
-                    _mapVersion     = 1;
-                    _isHdd          = true;
-
-                    _imageInfo.Cylinders       = hdrV1.cylinders;
-                    _imageInfo.Heads           = hdrV1.heads;
-                    _imageInfo.SectorsPerTrack = hdrV1.sectors;
-
-                    break;
-                }
-
-                case 2:
-                {
-                    HeaderV2 hdrV2 = Marshal.ByteArrayToStructureBigEndian<HeaderV2>(buffer);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.tag = \"{0}\"",
-                                               Encoding.ASCII.GetString(hdrV2.tag));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.length = {0} bytes", hdrV2.length);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.version = {0}", hdrV2.version);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.flags = {0}", (Flags)hdrV2.flags);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.compression = {0}", (Compression)hdrV2.compression);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.hunksize = {0}", hdrV2.hunksize);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.totalhunks = {0}", hdrV2.totalhunks);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.cylinders = {0}", hdrV2.cylinders);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.heads = {0}", hdrV2.heads);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.sectors = {0}", hdrV2.sectors);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV2.md5));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.parentmd5 = {0}",
-                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV2.parentmd5) ? "null"
-                                                   : ArrayHelpers.ByteArrayToHex(hdrV2.parentmd5));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.seclen = {0}", hdrV2.seclen);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
-                    DateTime start = DateTime.UtcNow;
-
-                    _hunkTable = new ulong[hdrV2.totalhunks];
-
-                    // How many sectors uses the BAT
-                    uint hunkSectorCount = (uint)Math.Ceiling((double)hdrV2.totalhunks * 8 / 512);
-
-                    byte[] hunkSectorBytes = new byte[512];
-
-                    for(int i = 0; i < hunkSectorCount; i++)
-                    {
-                        stream.Read(hunkSectorBytes, 0, 512);
-
-                        // This does the big-endian trick but reverses the order of elements also
-                        Array.Reverse(hunkSectorBytes);
-                        HunkSector hunkSector = Marshal.ByteArrayToStructureLittleEndian<HunkSector>(hunkSectorBytes);
-
-                        // This restores the order of elements
-                        Array.Reverse(hunkSector.hunkEntry);
-
-                        if(_hunkTable.Length >= (i                                  * 512 / 8) + (512 / 8))
-                            Array.Copy(hunkSector.hunkEntry, 0, _hunkTable, i * 512 / 8, 512 / 8);
-                        else
-                            Array.Copy(hunkSector.hunkEntry, 0, _hunkTable, i * 512 / 8,
-                                       _hunkTable.Length - (i * 512 / 8));
-                    }
-
-                    DateTime end = DateTime.UtcNow;
-                    AaruConsole.DebugWriteLine("CHD plugin", "Took {0} seconds", (end - start).TotalSeconds);
-
-                    _imageInfo.MediaType    = MediaType.GENERIC_HDD;
-                    _imageInfo.Sectors      = hdrV2.hunksize * hdrV2.totalhunks;
-                    _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-                    _imageInfo.SectorSize   = hdrV2.seclen;
-                    _imageInfo.Version      = "2";
-                    _imageInfo.ImageSize    = _imageInfo.SectorSize * hdrV2.hunksize * hdrV2.totalhunks;
-
-                    _totalHunks     = hdrV2.totalhunks;
-                    _sectorsPerHunk = hdrV2.hunksize;
-                    _hdrCompression = hdrV2.compression;
-                    _mapVersion     = 1;
-                    _isHdd          = true;
-
-                    _imageInfo.Cylinders       = hdrV2.cylinders;
-                    _imageInfo.Heads           = hdrV2.heads;
-                    _imageInfo.SectorsPerTrack = hdrV2.sectors;
-
-                    break;
-                }
-
-                case 3:
-                {
-                    HeaderV3 hdrV3 = Marshal.ByteArrayToStructureBigEndian<HeaderV3>(buffer);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.tag = \"{0}\"",
-                                               Encoding.ASCII.GetString(hdrV3.tag));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.length = {0} bytes", hdrV3.length);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.version = {0}", hdrV3.version);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.flags = {0}", (Flags)hdrV3.flags);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.compression = {0}", (Compression)hdrV3.compression);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.totalhunks = {0}", hdrV3.totalhunks);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.logicalbytes = {0}", hdrV3.logicalbytes);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.metaoffset = {0}", hdrV3.metaoffset);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV3.md5));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.parentmd5 = {0}",
-                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV3.parentmd5) ? "null"
-                                                   : ArrayHelpers.ByteArrayToHex(hdrV3.parentmd5));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.hunkbytes = {0}", hdrV3.hunkbytes);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.sha1 = {0}",
-                                               ArrayHelpers.ByteArrayToHex(hdrV3.sha1));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.parentsha1 = {0}",
-                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV3.parentsha1) ? "null"
-                                                   : ArrayHelpers.ByteArrayToHex(hdrV3.parentsha1));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
-                    DateTime start = DateTime.UtcNow;
-
-                    _hunkMap = new byte[hdrV3.totalhunks * 16];
-                    stream.Read(_hunkMap, 0, _hunkMap.Length);
-
-                    DateTime end = DateTime.UtcNow;
-                    AaruConsole.DebugWriteLine("CHD plugin", "Took {0} seconds", (end - start).TotalSeconds);
-
-                    nextMetaOff = hdrV3.metaoffset;
-
-                    _imageInfo.ImageSize = hdrV3.logicalbytes;
-                    _imageInfo.Version   = "3";
-
-                    _totalHunks     = hdrV3.totalhunks;
-                    _bytesPerHunk   = hdrV3.hunkbytes;
-                    _hdrCompression = hdrV3.compression;
-                    _mapVersion     = 3;
-
-                    break;
-                }
-
-                case 4:
-                {
-                    HeaderV4 hdrV4 = Marshal.ByteArrayToStructureBigEndian<HeaderV4>(buffer);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.tag = \"{0}\"",
-                                               Encoding.ASCII.GetString(hdrV4.tag));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.length = {0} bytes", hdrV4.length);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.version = {0}", hdrV4.version);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.flags = {0}", (Flags)hdrV4.flags);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.compression = {0}", (Compression)hdrV4.compression);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.totalhunks = {0}", hdrV4.totalhunks);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.logicalbytes = {0}", hdrV4.logicalbytes);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.metaoffset = {0}", hdrV4.metaoffset);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.hunkbytes = {0}", hdrV4.hunkbytes);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.sha1 = {0}",
-                                               ArrayHelpers.ByteArrayToHex(hdrV4.sha1));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.parentsha1 = {0}",
-                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV4.parentsha1) ? "null"
-                                                   : ArrayHelpers.ByteArrayToHex(hdrV4.parentsha1));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.rawsha1 = {0}",
-                                               ArrayHelpers.ByteArrayToHex(hdrV4.rawsha1));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
-                    DateTime start = DateTime.UtcNow;
-
-                    _hunkMap = new byte[hdrV4.totalhunks * 16];
-                    stream.Read(_hunkMap, 0, _hunkMap.Length);
-
-                    DateTime end = DateTime.UtcNow;
-                    AaruConsole.DebugWriteLine("CHD plugin", "Took {0} seconds", (end - start).TotalSeconds);
-
-                    nextMetaOff = hdrV4.metaoffset;
-
-                    _imageInfo.ImageSize = hdrV4.logicalbytes;
-                    _imageInfo.Version   = "4";
-
-                    _totalHunks     = hdrV4.totalhunks;
-                    _bytesPerHunk   = hdrV4.hunkbytes;
-                    _hdrCompression = hdrV4.compression;
-                    _mapVersion     = 3;
-
-                    break;
-                }
-
-                case 5:
-                {
-                    // TODO: Check why reading is misaligned
-                    AaruConsole.ErrorWriteLine("CHD version 5 is not yet supported.");
-
-                    return ErrorNumber.NotImplemented;
-
-                    HeaderV5 hdrV5 = Marshal.ByteArrayToStructureBigEndian<HeaderV5>(buffer);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.tag = \"{0}\"",
-                                               Encoding.ASCII.GetString(hdrV5.tag));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.length = {0} bytes", hdrV5.length);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.version = {0}", hdrV5.version);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor0 = \"{0}\"",
-                                               Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                            GetBytes(hdrV5.compressor0)));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor1 = \"{0}\"",
-                                               Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                            GetBytes(hdrV5.compressor1)));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor2 = \"{0}\"",
-                                               Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                            GetBytes(hdrV5.compressor2)));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor3 = \"{0}\"",
-                                               Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                            GetBytes(hdrV5.compressor3)));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.logicalbytes = {0}", hdrV5.logicalbytes);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.mapoffset = {0}", hdrV5.mapoffset);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.metaoffset = {0}", hdrV5.metaoffset);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.hunkbytes = {0}", hdrV5.hunkbytes);
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.unitbytes = {0}", hdrV5.unitbytes);
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.sha1 = {0}",
-                                               ArrayHelpers.ByteArrayToHex(hdrV5.sha1));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.parentsha1 = {0}",
-                                               ArrayHelpers.ArrayIsNullOrEmpty(hdrV5.parentsha1) ? "null"
-                                                   : ArrayHelpers.ByteArrayToHex(hdrV5.parentsha1));
-
-                    AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.rawsha1 = {0}",
-                                               ArrayHelpers.ByteArrayToHex(hdrV5.rawsha1));
-
-                    // TODO: Implement compressed CHD v5
-                    if(hdrV5.compressor0 == 0)
-                    {
-                        AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
-                        DateTime start = DateTime.UtcNow;
-
-                        _hunkTableSmall = new uint[hdrV5.logicalbytes / hdrV5.hunkbytes];
-
-                        uint hunkSectorCount = (uint)Math.Ceiling((double)_hunkTableSmall.Length * 4 / 512);
-
-                        byte[] hunkSectorBytes = new byte[512];
-
-                        stream.Seek((long)hdrV5.mapoffset, SeekOrigin.Begin);
-
-                        for(int i = 0; i < hunkSectorCount; i++)
-                        {
-                            stream.Read(hunkSectorBytes, 0, 512);
-
-                            // This does the big-endian trick but reverses the order of elements also
-                            Array.Reverse(hunkSectorBytes);
-
-                            HunkSectorSmall hunkSector =
-                                Marshal.ByteArrayToStructureLittleEndian<HunkSectorSmall>(hunkSectorBytes);
-
-                            // This restores the order of elements
-                            Array.Reverse(hunkSector.hunkEntry);
-
-                            if(_hunkTableSmall.Length >= (i                                  * 512 / 4) + (512 / 4))
-                                Array.Copy(hunkSector.hunkEntry, 0, _hunkTableSmall, i * 512 / 4, 512 / 4);
-                            else
-                                Array.Copy(hunkSector.hunkEntry, 0, _hunkTableSmall, i * 512 / 4,
-                                           _hunkTableSmall.Length - (i * 512 / 4));
-                        }
-
-                        DateTime end = DateTime.UtcNow;
-                        AaruConsole.DebugWriteLine("CHD plugin", "Took {0} seconds", (end - start).TotalSeconds);
-                    }
+                    if(_hunkTable.Length >= (i                                  * 512 / 8) + (512 / 8))
+                        Array.Copy(hunkSector.hunkEntry, 0, _hunkTable, i * 512 / 8, 512 / 8);
                     else
-                    {
-                        AaruConsole.ErrorWriteLine("Cannot read compressed CHD version 5");
-
-                        return ErrorNumber.NotSupported;
-                    }
-
-                    nextMetaOff = hdrV5.metaoffset;
-
-                    _imageInfo.ImageSize = hdrV5.logicalbytes;
-                    _imageInfo.Version   = "5";
-
-                    _totalHunks      = (uint)(hdrV5.logicalbytes / hdrV5.hunkbytes);
-                    _bytesPerHunk    = hdrV5.hunkbytes;
-                    _hdrCompression  = hdrV5.compressor0;
-                    _hdrCompression1 = hdrV5.compressor1;
-                    _hdrCompression2 = hdrV5.compressor2;
-                    _hdrCompression3 = hdrV5.compressor3;
-                    _mapVersion      = 5;
-
-                    break;
+                        Array.Copy(hunkSector.hunkEntry, 0, _hunkTable, i * 512 / 8,
+                                   _hunkTable.Length - (i * 512 / 8));
                 }
 
-                default:
-                    AaruConsole.ErrorWriteLine($"Unsupported CHD version {version}");
+                DateTime end = DateTime.UtcNow;
+                AaruConsole.DebugWriteLine("CHD plugin", "Took {0} seconds", (end - start).TotalSeconds);
 
-                    return ErrorNumber.NotSupported;
+                _imageInfo.MediaType    = MediaType.GENERIC_HDD;
+                _imageInfo.Sectors      = hdrV1.hunksize * hdrV1.totalhunks;
+                _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+                _imageInfo.SectorSize   = 512;
+                _imageInfo.Version      = "1";
+                _imageInfo.ImageSize    = _imageInfo.SectorSize * hdrV1.hunksize * hdrV1.totalhunks;
+
+                _totalHunks     = hdrV1.totalhunks;
+                _sectorsPerHunk = hdrV1.hunksize;
+                _hdrCompression = hdrV1.compression;
+                _mapVersion     = 1;
+                _isHdd          = true;
+
+                _imageInfo.Cylinders       = hdrV1.cylinders;
+                _imageInfo.Heads           = hdrV1.heads;
+                _imageInfo.SectorsPerTrack = hdrV1.sectors;
+
+                break;
             }
 
-            if(_mapVersion >= 3)
+            case 2:
             {
-                _isCdrom   = false;
-                _isHdd     = false;
-                _isGdrom   = false;
-                _swapAudio = false;
-                _tracks    = new Dictionary<uint, Track>();
+                HeaderV2 hdrV2 = Marshal.ByteArrayToStructureBigEndian<HeaderV2>(buffer);
 
-                AaruConsole.DebugWriteLine("CHD plugin", "Reading metadata.");
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.tag = \"{0}\"",
+                                           Encoding.ASCII.GetString(hdrV2.tag));
 
-                ulong currentSector = 0;
-                uint  currentTrack  = 1;
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.length = {0} bytes", hdrV2.length);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.version = {0}", hdrV2.version);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.flags = {0}", (Flags)hdrV2.flags);
 
-                while(nextMetaOff > 0)
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.compression = {0}", (Compression)hdrV2.compression);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.hunksize = {0}", hdrV2.hunksize);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.totalhunks = {0}", hdrV2.totalhunks);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.cylinders = {0}", hdrV2.cylinders);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.heads = {0}", hdrV2.heads);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.sectors = {0}", hdrV2.sectors);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV2.md5));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.parentmd5 = {0}",
+                                           ArrayHelpers.ArrayIsNullOrEmpty(hdrV2.parentmd5) ? "null"
+                                               : ArrayHelpers.ByteArrayToHex(hdrV2.parentmd5));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV2.seclen = {0}", hdrV2.seclen);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
+                DateTime start = DateTime.UtcNow;
+
+                _hunkTable = new ulong[hdrV2.totalhunks];
+
+                // How many sectors uses the BAT
+                uint hunkSectorCount = (uint)Math.Ceiling((double)hdrV2.totalhunks * 8 / 512);
+
+                byte[] hunkSectorBytes = new byte[512];
+
+                for(int i = 0; i < hunkSectorCount; i++)
                 {
-                    byte[] hdrBytes = new byte[16];
-                    stream.Seek((long)nextMetaOff, SeekOrigin.Begin);
-                    stream.Read(hdrBytes, 0, hdrBytes.Length);
-                    MetadataHeader header = Marshal.ByteArrayToStructureBigEndian<MetadataHeader>(hdrBytes);
-                    byte[]         meta   = new byte[header.flagsAndLength & 0xFFFFFF];
-                    stream.Read(meta, 0, meta.Length);
+                    stream.Read(hunkSectorBytes, 0, 512);
 
-                    AaruConsole.DebugWriteLine("CHD plugin", "Found metadata \"{0}\"",
-                                               Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(header.tag)));
+                    // This does the big-endian trick but reverses the order of elements also
+                    Array.Reverse(hunkSectorBytes);
+                    HunkSector hunkSector = Marshal.ByteArrayToStructureLittleEndian<HunkSector>(hunkSectorBytes);
 
-                    switch(header.tag)
+                    // This restores the order of elements
+                    Array.Reverse(hunkSector.hunkEntry);
+
+                    if(_hunkTable.Length >= (i                                  * 512 / 8) + (512 / 8))
+                        Array.Copy(hunkSector.hunkEntry, 0, _hunkTable, i * 512 / 8, 512 / 8);
+                    else
+                        Array.Copy(hunkSector.hunkEntry, 0, _hunkTable, i * 512 / 8,
+                                   _hunkTable.Length - (i * 512 / 8));
+                }
+
+                DateTime end = DateTime.UtcNow;
+                AaruConsole.DebugWriteLine("CHD plugin", "Took {0} seconds", (end - start).TotalSeconds);
+
+                _imageInfo.MediaType    = MediaType.GENERIC_HDD;
+                _imageInfo.Sectors      = hdrV2.hunksize * hdrV2.totalhunks;
+                _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+                _imageInfo.SectorSize   = hdrV2.seclen;
+                _imageInfo.Version      = "2";
+                _imageInfo.ImageSize    = _imageInfo.SectorSize * hdrV2.hunksize * hdrV2.totalhunks;
+
+                _totalHunks     = hdrV2.totalhunks;
+                _sectorsPerHunk = hdrV2.hunksize;
+                _hdrCompression = hdrV2.compression;
+                _mapVersion     = 1;
+                _isHdd          = true;
+
+                _imageInfo.Cylinders       = hdrV2.cylinders;
+                _imageInfo.Heads           = hdrV2.heads;
+                _imageInfo.SectorsPerTrack = hdrV2.sectors;
+
+                break;
+            }
+
+            case 3:
+            {
+                HeaderV3 hdrV3 = Marshal.ByteArrayToStructureBigEndian<HeaderV3>(buffer);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.tag = \"{0}\"",
+                                           Encoding.ASCII.GetString(hdrV3.tag));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.length = {0} bytes", hdrV3.length);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.version = {0}", hdrV3.version);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.flags = {0}", (Flags)hdrV3.flags);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.compression = {0}", (Compression)hdrV3.compression);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.totalhunks = {0}", hdrV3.totalhunks);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.logicalbytes = {0}", hdrV3.logicalbytes);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.metaoffset = {0}", hdrV3.metaoffset);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.md5 = {0}", ArrayHelpers.ByteArrayToHex(hdrV3.md5));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.parentmd5 = {0}",
+                                           ArrayHelpers.ArrayIsNullOrEmpty(hdrV3.parentmd5) ? "null"
+                                               : ArrayHelpers.ByteArrayToHex(hdrV3.parentmd5));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.hunkbytes = {0}", hdrV3.hunkbytes);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.sha1 = {0}",
+                                           ArrayHelpers.ByteArrayToHex(hdrV3.sha1));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV3.parentsha1 = {0}",
+                                           ArrayHelpers.ArrayIsNullOrEmpty(hdrV3.parentsha1) ? "null"
+                                               : ArrayHelpers.ByteArrayToHex(hdrV3.parentsha1));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
+                DateTime start = DateTime.UtcNow;
+
+                _hunkMap = new byte[hdrV3.totalhunks * 16];
+                stream.Read(_hunkMap, 0, _hunkMap.Length);
+
+                DateTime end = DateTime.UtcNow;
+                AaruConsole.DebugWriteLine("CHD plugin", "Took {0} seconds", (end - start).TotalSeconds);
+
+                nextMetaOff = hdrV3.metaoffset;
+
+                _imageInfo.ImageSize = hdrV3.logicalbytes;
+                _imageInfo.Version   = "3";
+
+                _totalHunks     = hdrV3.totalhunks;
+                _bytesPerHunk   = hdrV3.hunkbytes;
+                _hdrCompression = hdrV3.compression;
+                _mapVersion     = 3;
+
+                break;
+            }
+
+            case 4:
+            {
+                HeaderV4 hdrV4 = Marshal.ByteArrayToStructureBigEndian<HeaderV4>(buffer);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.tag = \"{0}\"",
+                                           Encoding.ASCII.GetString(hdrV4.tag));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.length = {0} bytes", hdrV4.length);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.version = {0}", hdrV4.version);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.flags = {0}", (Flags)hdrV4.flags);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.compression = {0}", (Compression)hdrV4.compression);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.totalhunks = {0}", hdrV4.totalhunks);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.logicalbytes = {0}", hdrV4.logicalbytes);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.metaoffset = {0}", hdrV4.metaoffset);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.hunkbytes = {0}", hdrV4.hunkbytes);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.sha1 = {0}",
+                                           ArrayHelpers.ByteArrayToHex(hdrV4.sha1));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.parentsha1 = {0}",
+                                           ArrayHelpers.ArrayIsNullOrEmpty(hdrV4.parentsha1) ? "null"
+                                               : ArrayHelpers.ByteArrayToHex(hdrV4.parentsha1));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV4.rawsha1 = {0}",
+                                           ArrayHelpers.ByteArrayToHex(hdrV4.rawsha1));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
+                DateTime start = DateTime.UtcNow;
+
+                _hunkMap = new byte[hdrV4.totalhunks * 16];
+                stream.Read(_hunkMap, 0, _hunkMap.Length);
+
+                DateTime end = DateTime.UtcNow;
+                AaruConsole.DebugWriteLine("CHD plugin", "Took {0} seconds", (end - start).TotalSeconds);
+
+                nextMetaOff = hdrV4.metaoffset;
+
+                _imageInfo.ImageSize = hdrV4.logicalbytes;
+                _imageInfo.Version   = "4";
+
+                _totalHunks     = hdrV4.totalhunks;
+                _bytesPerHunk   = hdrV4.hunkbytes;
+                _hdrCompression = hdrV4.compression;
+                _mapVersion     = 3;
+
+                break;
+            }
+
+            case 5:
+            {
+                // TODO: Check why reading is misaligned
+                AaruConsole.ErrorWriteLine("CHD version 5 is not yet supported.");
+
+                return ErrorNumber.NotImplemented;
+
+                HeaderV5 hdrV5 = Marshal.ByteArrayToStructureBigEndian<HeaderV5>(buffer);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.tag = \"{0}\"",
+                                           Encoding.ASCII.GetString(hdrV5.tag));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.length = {0} bytes", hdrV5.length);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.version = {0}", hdrV5.version);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor0 = \"{0}\"",
+                                           Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                        GetBytes(hdrV5.compressor0)));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor1 = \"{0}\"",
+                                           Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                        GetBytes(hdrV5.compressor1)));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor2 = \"{0}\"",
+                                           Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                        GetBytes(hdrV5.compressor2)));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.compressor3 = \"{0}\"",
+                                           Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                        GetBytes(hdrV5.compressor3)));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.logicalbytes = {0}", hdrV5.logicalbytes);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.mapoffset = {0}", hdrV5.mapoffset);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.metaoffset = {0}", hdrV5.metaoffset);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.hunkbytes = {0}", hdrV5.hunkbytes);
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.unitbytes = {0}", hdrV5.unitbytes);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.sha1 = {0}",
+                                           ArrayHelpers.ByteArrayToHex(hdrV5.sha1));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.parentsha1 = {0}",
+                                           ArrayHelpers.ArrayIsNullOrEmpty(hdrV5.parentsha1) ? "null"
+                                               : ArrayHelpers.ByteArrayToHex(hdrV5.parentsha1));
+
+                AaruConsole.DebugWriteLine("CHD plugin", "hdrV5.rawsha1 = {0}",
+                                           ArrayHelpers.ByteArrayToHex(hdrV5.rawsha1));
+
+                // TODO: Implement compressed CHD v5
+                if(hdrV5.compressor0 == 0)
+                {
+                    AaruConsole.DebugWriteLine("CHD plugin", "Reading Hunk map.");
+                    DateTime start = DateTime.UtcNow;
+
+                    _hunkTableSmall = new uint[hdrV5.logicalbytes / hdrV5.hunkbytes];
+
+                    uint hunkSectorCount = (uint)Math.Ceiling((double)_hunkTableSmall.Length * 4 / 512);
+
+                    byte[] hunkSectorBytes = new byte[512];
+
+                    stream.Seek((long)hdrV5.mapoffset, SeekOrigin.Begin);
+
+                    for(int i = 0; i < hunkSectorCount; i++)
                     {
-                        // "GDDD"
-                        case HARD_DISK_METADATA:
-                            if(_isCdrom || _isGdrom)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine("Image cannot be a hard disk and a C/GD-ROM at the same time, aborting.");
+                        stream.Read(hunkSectorBytes, 0, 512);
 
-                                return ErrorNumber.NotSupported;
-                            }
+                        // This does the big-endian trick but reverses the order of elements also
+                        Array.Reverse(hunkSectorBytes);
 
-                            string gddd      = StringHandlers.CToString(meta);
-                            var    gdddRegEx = new Regex(REGEX_METADATA_HDD);
-                            Match  gdddMatch = gdddRegEx.Match(gddd);
+                        HunkSectorSmall hunkSector =
+                            Marshal.ByteArrayToStructureLittleEndian<HunkSectorSmall>(hunkSectorBytes);
 
-                            if(gdddMatch.Success)
-                            {
-                                _isHdd                     = true;
-                                _imageInfo.SectorSize      = uint.Parse(gdddMatch.Groups["bps"].Value);
-                                _imageInfo.Cylinders       = uint.Parse(gdddMatch.Groups["cylinders"].Value);
-                                _imageInfo.Heads           = uint.Parse(gdddMatch.Groups["heads"].Value);
-                                _imageInfo.SectorsPerTrack = uint.Parse(gdddMatch.Groups["sectors"].Value);
-                            }
+                        // This restores the order of elements
+                        Array.Reverse(hunkSector.hunkEntry);
 
-                            break;
-
-                        // "CHCD"
-                        case CDROM_OLD_METADATA:
-                            if(_isHdd)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine("Image cannot be a hard disk and a CD-ROM at the same time, aborting.");
-
-                                return ErrorNumber.NotSupported;
-                            }
-
-                            if(_isGdrom)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine("Image cannot be a GD-ROM and a CD-ROM at the same time, aborting.");
-
-                                return ErrorNumber.NotSupported;
-                            }
-
-                            uint chdTracksNumber = BigEndianBitConverter.ToUInt32(meta, 0);
-
-                            // Byteswapped
-                            if(chdTracksNumber > 99)
-                                chdTracksNumber = BigEndianBitConverter.ToUInt32(meta, 0);
-
-                            currentSector = 0;
-
-                            for(uint i = 0; i < chdTracksNumber; i++)
-                            {
-                                var chdTrack = new TrackOld
-                                {
-                                    type        = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 0)),
-                                    subType     = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 4)),
-                                    dataSize    = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 8)),
-                                    subSize     = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 12)),
-                                    frames      = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 16)),
-                                    extraFrames = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 20))
-                                };
-
-                                var aaruTrack = new Track();
-
-                                switch((TrackTypeOld)chdTrack.type)
-                                {
-                                    case TrackTypeOld.Audio:
-                                        aaruTrack.BytesPerSector    = 2352;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.Audio;
-
-                                        break;
-                                    case TrackTypeOld.Mode1:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2048;
-                                        aaruTrack.Type              = TrackType.CdMode1;
-
-                                        break;
-                                    case TrackTypeOld.Mode1Raw:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.CdMode1;
-
-                                        break;
-                                    case TrackTypeOld.Mode2:
-                                    case TrackTypeOld.Mode2FormMix:
-                                        aaruTrack.BytesPerSector    = 2336;
-                                        aaruTrack.RawBytesPerSector = 2336;
-                                        aaruTrack.Type              = TrackType.CdMode2Formless;
-
-                                        break;
-                                    case TrackTypeOld.Mode2Form1:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2048;
-                                        aaruTrack.Type              = TrackType.CdMode2Form1;
-
-                                        break;
-                                    case TrackTypeOld.Mode2Form2:
-                                        aaruTrack.BytesPerSector    = 2324;
-                                        aaruTrack.RawBytesPerSector = 2324;
-                                        aaruTrack.Type              = TrackType.CdMode2Form2;
-
-                                        break;
-                                    case TrackTypeOld.Mode2Raw:
-                                        aaruTrack.BytesPerSector    = 2336;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.CdMode2Formless;
-
-                                        break;
-                                    default:
-                                    {
-                                        AaruConsole.ErrorWriteLine($"Unsupported track type {chdTrack.type}");
-
-                                        return ErrorNumber.NotSupported;
-                                    }
-                                }
-
-                                switch((SubTypeOld)chdTrack.subType)
-                                {
-                                    case SubTypeOld.Cooked:
-                                        aaruTrack.SubchannelFile   = imageFilter.Filename;
-                                        aaruTrack.SubchannelType   = TrackSubchannelType.PackedInterleaved;
-                                        aaruTrack.SubchannelFilter = imageFilter;
-
-                                        break;
-                                    case SubTypeOld.None:
-                                        aaruTrack.SubchannelType = TrackSubchannelType.None;
-
-                                        break;
-                                    case SubTypeOld.Raw:
-                                        aaruTrack.SubchannelFile   = imageFilter.Filename;
-                                        aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
-                                        aaruTrack.SubchannelFilter = imageFilter;
-
-                                        break;
-                                    default:
-                                    {
-                                        AaruConsole.ErrorWriteLine($"Unsupported subchannel type {chdTrack.type}");
-
-                                        return ErrorNumber.NotSupported;
-                                    }
-                                }
-
-                                aaruTrack.Description = $"Track {i + 1}";
-                                aaruTrack.EndSector   = currentSector + chdTrack.frames - 1;
-                                aaruTrack.File        = imageFilter.Filename;
-                                aaruTrack.FileType    = "BINARY";
-                                aaruTrack.Filter      = imageFilter;
-                                aaruTrack.StartSector = currentSector;
-                                aaruTrack.Sequence    = i + 1;
-                                aaruTrack.Session     = 1;
-
-                                if(aaruTrack.Sequence == 1)
-                                    aaruTrack.Indexes.Add(0, -150);
-
-                                aaruTrack.Indexes.Add(1, (int)currentSector);
-                                currentSector += chdTrack.frames + chdTrack.extraFrames;
-                                _tracks.Add(aaruTrack.Sequence, aaruTrack);
-                            }
-
-                            _isCdrom = true;
-
-                            break;
-
-                        // "CHTR"
-                        case CDROM_TRACK_METADATA:
-                            if(_isHdd)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine("Image cannot be a hard disk and a CD-ROM at the same time, aborting.");
-
-                                return ErrorNumber.NotSupported;
-                            }
-
-                            if(_isGdrom)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine("Image cannot be a GD-ROM and a CD-ROM at the same time, aborting.");
-
-                                return ErrorNumber.NotSupported;
-                            }
-
-                            string chtr      = StringHandlers.CToString(meta);
-                            var    chtrRegEx = new Regex(REGEX_METADATA_CDROM);
-                            Match  chtrMatch = chtrRegEx.Match(chtr);
-
-                            if(chtrMatch.Success)
-                            {
-                                _isCdrom = true;
-
-                                uint   trackNo   = uint.Parse(chtrMatch.Groups["track"].Value);
-                                uint   frames    = uint.Parse(chtrMatch.Groups["frames"].Value);
-                                string subtype   = chtrMatch.Groups["sub_type"].Value;
-                                string tracktype = chtrMatch.Groups["track_type"].Value;
-
-                                if(trackNo != currentTrack)
-                                {
-                                    AaruConsole.ErrorWriteLine("Unsorted tracks, cannot proceed.");
-
-                                    return ErrorNumber.NotSupported;
-                                }
-
-                                var aaruTrack = new Track();
-
-                                switch(tracktype)
-                                {
-                                    case TRACK_TYPE_AUDIO:
-                                        aaruTrack.BytesPerSector    = 2352;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.Audio;
-
-                                        break;
-                                    case TRACK_TYPE_MODE1:
-                                    case TRACK_TYPE_MODE1_2K:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2048;
-                                        aaruTrack.Type              = TrackType.CdMode1;
-
-                                        break;
-                                    case TRACK_TYPE_MODE1_RAW:
-                                    case TRACK_TYPE_MODE1_RAW_2K:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.CdMode1;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2:
-                                    case TRACK_TYPE_MODE2_2K:
-                                    case TRACK_TYPE_MODE2_FM:
-                                        aaruTrack.BytesPerSector    = 2336;
-                                        aaruTrack.RawBytesPerSector = 2336;
-                                        aaruTrack.Type              = TrackType.CdMode2Formless;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2_F1:
-                                    case TRACK_TYPE_MODE2_F1_2K:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2048;
-                                        aaruTrack.Type              = TrackType.CdMode2Form1;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2_F2:
-                                    case TRACK_TYPE_MODE2_F2_2K:
-                                        aaruTrack.BytesPerSector    = 2324;
-                                        aaruTrack.RawBytesPerSector = 2324;
-                                        aaruTrack.Type              = TrackType.CdMode2Form2;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2_RAW:
-                                    case TRACK_TYPE_MODE2_RAW_2K:
-                                        aaruTrack.BytesPerSector    = 2336;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.CdMode2Formless;
-
-                                        break;
-                                    default:
-                                    {
-                                        AaruConsole.ErrorWriteLine($"Unsupported track type {tracktype}");
-
-                                        return ErrorNumber.NotSupported;
-                                    }
-                                }
-
-                                switch(subtype)
-                                {
-                                    case SUB_TYPE_COOKED:
-                                        aaruTrack.SubchannelFile   = imageFilter.Filename;
-                                        aaruTrack.SubchannelType   = TrackSubchannelType.PackedInterleaved;
-                                        aaruTrack.SubchannelFilter = imageFilter;
-
-                                        break;
-                                    case SUB_TYPE_NONE:
-                                        aaruTrack.SubchannelType = TrackSubchannelType.None;
-
-                                        break;
-                                    case SUB_TYPE_RAW:
-                                        aaruTrack.SubchannelFile   = imageFilter.Filename;
-                                        aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
-                                        aaruTrack.SubchannelFilter = imageFilter;
-
-                                        break;
-                                    default:
-                                    {
-                                        AaruConsole.ErrorWriteLine($"Unsupported subchannel type {subtype}");
-
-                                        return ErrorNumber.NotSupported;
-                                    }
-                                }
-
-                                aaruTrack.Description = $"Track {trackNo}";
-                                aaruTrack.EndSector   = currentSector + frames - 1;
-                                aaruTrack.File        = imageFilter.Filename;
-                                aaruTrack.FileType    = "BINARY";
-                                aaruTrack.Filter      = imageFilter;
-                                aaruTrack.StartSector = currentSector;
-                                aaruTrack.Sequence    = trackNo;
-                                aaruTrack.Session     = 1;
-
-                                if(aaruTrack.Sequence == 1)
-                                    aaruTrack.Indexes.Add(0, -150);
-
-                                aaruTrack.Indexes.Add(1, (int)currentSector);
-                                currentSector += frames;
-                                currentTrack++;
-                                _tracks.Add(aaruTrack.Sequence, aaruTrack);
-                            }
-
-                            break;
-
-                        // "CHT2"
-                        case CDROM_TRACK_METADATA2:
-                            if(_isHdd)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine("Image cannot be a hard disk and a CD-ROM at the same time, aborting.");
-
-                                return ErrorNumber.NotSupported;
-                            }
-
-                            if(_isGdrom)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine("Image cannot be a GD-ROM and a CD-ROM at the same time, aborting.");
-
-                                return ErrorNumber.NotSupported;
-                            }
-
-                            string cht2      = StringHandlers.CToString(meta);
-                            var    cht2RegEx = new Regex(REGEX_METADATA_CDROM2);
-                            Match  cht2Match = cht2RegEx.Match(cht2);
-
-                            if(cht2Match.Success)
-                            {
-                                _isCdrom = true;
-
-                                uint   trackNo   = uint.Parse(cht2Match.Groups["track"].Value);
-                                uint   frames    = uint.Parse(cht2Match.Groups["frames"].Value);
-                                string subtype   = cht2Match.Groups["sub_type"].Value;
-                                string trackType = cht2Match.Groups["track_type"].Value;
-
-                                uint pregap = uint.Parse(cht2Match.Groups["pregap"].Value);
-
-                                // What is this, really? Same as track type?
-                                string pregapType = cht2Match.Groups["pgtype"].Value;
-
-                                // Read above, but for subchannel
-                                string pregapSubType = cht2Match.Groups["pgsub"].Value;
-
-                                // This is a recommendation (shall) of 150 sectors at the end of the last data track,
-                                // or of any data track followed by an audio track, according to Yellow Book.
-                                // It is indistinguishable from normal data.
-                                // TODO: Does CHD store it, or like CDRWin, ignores it?
-                                uint postgap = uint.Parse(cht2Match.Groups["postgap"].Value);
-
-                                if(trackNo != currentTrack)
-                                {
-                                    AaruConsole.ErrorWriteLine("Unsorted tracks, cannot proceed.");
-
-                                    return ErrorNumber.NotSupported;
-                                }
-
-                                var aaruTrack = new Track();
-
-                                switch(trackType)
-                                {
-                                    case TRACK_TYPE_AUDIO:
-                                        aaruTrack.BytesPerSector    = 2352;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.Audio;
-
-                                        break;
-                                    case TRACK_TYPE_MODE1:
-                                    case TRACK_TYPE_MODE1_2K:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2048;
-                                        aaruTrack.Type              = TrackType.CdMode1;
-
-                                        break;
-                                    case TRACK_TYPE_MODE1_RAW:
-                                    case TRACK_TYPE_MODE1_RAW_2K:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.CdMode1;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2:
-                                    case TRACK_TYPE_MODE2_2K:
-                                    case TRACK_TYPE_MODE2_FM:
-                                        aaruTrack.BytesPerSector    = 2336;
-                                        aaruTrack.RawBytesPerSector = 2336;
-                                        aaruTrack.Type              = TrackType.CdMode2Formless;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2_F1:
-                                    case TRACK_TYPE_MODE2_F1_2K:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2048;
-                                        aaruTrack.Type              = TrackType.CdMode2Form1;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2_F2:
-                                    case TRACK_TYPE_MODE2_F2_2K:
-                                        aaruTrack.BytesPerSector    = 2324;
-                                        aaruTrack.RawBytesPerSector = 2324;
-                                        aaruTrack.Type              = TrackType.CdMode2Form2;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2_RAW:
-                                    case TRACK_TYPE_MODE2_RAW_2K:
-                                        aaruTrack.BytesPerSector    = 2336;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.CdMode2Formless;
-
-                                        break;
-                                    default:
-                                    {
-                                        AaruConsole.ErrorWriteLine($"Unsupported track type {trackType}");
-
-                                        return ErrorNumber.NotSupported;
-                                    }
-                                }
-
-                                switch(subtype)
-                                {
-                                    case SUB_TYPE_COOKED:
-                                        aaruTrack.SubchannelFile   = imageFilter.Filename;
-                                        aaruTrack.SubchannelType   = TrackSubchannelType.PackedInterleaved;
-                                        aaruTrack.SubchannelFilter = imageFilter;
-
-                                        break;
-                                    case SUB_TYPE_NONE:
-                                        aaruTrack.SubchannelType = TrackSubchannelType.None;
-
-                                        break;
-                                    case SUB_TYPE_RAW:
-                                        aaruTrack.SubchannelFile   = imageFilter.Filename;
-                                        aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
-                                        aaruTrack.SubchannelFilter = imageFilter;
-
-                                        break;
-                                    default:
-                                    {
-                                        AaruConsole.ErrorWriteLine($"Unsupported subchannel type {subtype}");
-
-                                        return ErrorNumber.NotSupported;
-                                    }
-                                }
-
-                                aaruTrack.Description = $"Track {trackNo}";
-                                aaruTrack.EndSector   = currentSector + frames - 1;
-                                aaruTrack.File        = imageFilter.Filename;
-                                aaruTrack.FileType    = "BINARY";
-                                aaruTrack.Filter      = imageFilter;
-                                aaruTrack.StartSector = currentSector;
-                                aaruTrack.Sequence    = trackNo;
-                                aaruTrack.Session     = 1;
-
-                                if(aaruTrack.Sequence == 1)
-                                {
-                                    if(pregap <= 150)
-                                    {
-                                        aaruTrack.Indexes.Add(0, -150);
-                                        aaruTrack.Pregap = 150;
-                                    }
-                                    else
-                                    {
-                                        aaruTrack.Indexes.Add(0, -1 * (int)pregap);
-                                        aaruTrack.Pregap = pregap;
-                                    }
-
-                                    aaruTrack.Indexes.Add(1, (int)currentSector);
-                                }
-                                else if(pregap > 0)
-                                {
-                                    aaruTrack.Indexes.Add(0, (int)currentSector);
-                                    aaruTrack.Pregap = pregap;
-                                    aaruTrack.Indexes.Add(1, (int)(currentSector + pregap));
-                                }
-                                else
-                                    aaruTrack.Indexes.Add(1, (int)currentSector);
-
-                                currentSector += frames;
-                                currentTrack++;
-                                _tracks.Add(aaruTrack.Sequence, aaruTrack);
-                            }
-
-                            break;
-
-                        // "CHGT"
-                        case GDROM_OLD_METADATA:
-                            _swapAudio = true;
-                            goto case GDROM_METADATA;
-
-                        // "CHGD"
-                        case GDROM_METADATA:
-                            if(_isHdd)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine("Image cannot be a hard disk and a GD-ROM at the same time, aborting.");
-
-                                return ErrorNumber.NotSupported;
-                            }
-
-                            if(_isCdrom)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine("Image cannot be a CD-ROM and a GD-ROM at the same time, aborting.");
-
-                                return ErrorNumber.NotSupported;
-                            }
-
-                            string chgd      = StringHandlers.CToString(meta);
-                            var    chgdRegEx = new Regex(REGEX_METADATA_GDROM);
-                            Match  chgdMatch = chgdRegEx.Match(chgd);
-
-                            if(chgdMatch.Success)
-                            {
-                                _isGdrom = true;
-
-                                uint   trackNo   = uint.Parse(chgdMatch.Groups["track"].Value);
-                                uint   frames    = uint.Parse(chgdMatch.Groups["frames"].Value);
-                                string subtype   = chgdMatch.Groups["sub_type"].Value;
-                                string trackType = chgdMatch.Groups["track_type"].Value;
-
-                                // TODO: Check pregap, postgap and pad behaviour
-                                uint   pregap        = uint.Parse(chgdMatch.Groups["pregap"].Value);
-                                string pregapType    = chgdMatch.Groups["pgtype"].Value;
-                                string pregapSubType = chgdMatch.Groups["pgsub"].Value;
-                                uint   postgap       = uint.Parse(chgdMatch.Groups["postgap"].Value);
-                                uint   pad           = uint.Parse(chgdMatch.Groups["pad"].Value);
-
-                                if(trackNo != currentTrack)
-                                {
-                                    AaruConsole.ErrorWriteLine("Unsorted tracks, cannot proceed.");
-
-                                    return ErrorNumber.NotSupported;
-                                }
-
-                                var aaruTrack = new Track();
-
-                                switch(trackType)
-                                {
-                                    case TRACK_TYPE_AUDIO:
-                                        aaruTrack.BytesPerSector    = 2352;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.Audio;
-
-                                        break;
-                                    case TRACK_TYPE_MODE1:
-                                    case TRACK_TYPE_MODE1_2K:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2048;
-                                        aaruTrack.Type              = TrackType.CdMode1;
-
-                                        break;
-                                    case TRACK_TYPE_MODE1_RAW:
-                                    case TRACK_TYPE_MODE1_RAW_2K:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.CdMode1;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2:
-                                    case TRACK_TYPE_MODE2_2K:
-                                    case TRACK_TYPE_MODE2_FM:
-                                        aaruTrack.BytesPerSector    = 2336;
-                                        aaruTrack.RawBytesPerSector = 2336;
-                                        aaruTrack.Type              = TrackType.CdMode2Formless;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2_F1:
-                                    case TRACK_TYPE_MODE2_F1_2K:
-                                        aaruTrack.BytesPerSector    = 2048;
-                                        aaruTrack.RawBytesPerSector = 2048;
-                                        aaruTrack.Type              = TrackType.CdMode2Form1;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2_F2:
-                                    case TRACK_TYPE_MODE2_F2_2K:
-                                        aaruTrack.BytesPerSector    = 2324;
-                                        aaruTrack.RawBytesPerSector = 2324;
-                                        aaruTrack.Type              = TrackType.CdMode2Form2;
-
-                                        break;
-                                    case TRACK_TYPE_MODE2_RAW:
-                                    case TRACK_TYPE_MODE2_RAW_2K:
-                                        aaruTrack.BytesPerSector    = 2336;
-                                        aaruTrack.RawBytesPerSector = 2352;
-                                        aaruTrack.Type              = TrackType.CdMode2Formless;
-
-                                        break;
-                                    default:
-                                    {
-                                        AaruConsole.ErrorWriteLine($"Unsupported track type {trackType}");
-
-                                        return ErrorNumber.NotSupported;
-                                    }
-                                }
-
-                                switch(subtype)
-                                {
-                                    case SUB_TYPE_COOKED:
-                                        aaruTrack.SubchannelFile   = imageFilter.Filename;
-                                        aaruTrack.SubchannelType   = TrackSubchannelType.PackedInterleaved;
-                                        aaruTrack.SubchannelFilter = imageFilter;
-
-                                        break;
-                                    case SUB_TYPE_NONE:
-                                        aaruTrack.SubchannelType = TrackSubchannelType.None;
-
-                                        break;
-                                    case SUB_TYPE_RAW:
-                                        aaruTrack.SubchannelFile   = imageFilter.Filename;
-                                        aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
-                                        aaruTrack.SubchannelFilter = imageFilter;
-
-                                        break;
-                                    default:
-                                    {
-                                        AaruConsole.ErrorWriteLine($"Unsupported subchannel type {subtype}");
-
-                                        return ErrorNumber.NotSupported;
-                                    }
-                                }
-
-                                aaruTrack.Description = $"Track {trackNo}";
-                                aaruTrack.EndSector   = currentSector + frames - 1;
-                                aaruTrack.File        = imageFilter.Filename;
-                                aaruTrack.FileType    = "BINARY";
-                                aaruTrack.Filter      = imageFilter;
-                                aaruTrack.StartSector = currentSector;
-                                aaruTrack.Sequence    = trackNo;
-                                aaruTrack.Session     = (ushort)(trackNo > 2 ? 2 : 1);
-
-                                if(aaruTrack.Sequence == 1)
-                                {
-                                    if(pregap <= 150)
-                                    {
-                                        aaruTrack.Indexes.Add(0, -150);
-                                        aaruTrack.Pregap = 150;
-                                    }
-                                    else
-                                    {
-                                        aaruTrack.Indexes.Add(0, -1 * (int)pregap);
-                                        aaruTrack.Pregap = pregap;
-                                    }
-
-                                    aaruTrack.Indexes.Add(1, (int)currentSector);
-                                }
-                                else if(pregap > 0)
-                                {
-                                    aaruTrack.Indexes.Add(0, (int)currentSector);
-                                    aaruTrack.Pregap = pregap;
-                                    aaruTrack.Indexes.Add(1, (int)(currentSector + pregap));
-                                }
-                                else
-                                    aaruTrack.Indexes.Add(1, (int)currentSector);
-
-                                currentSector += frames;
-                                currentTrack++;
-                                _tracks.Add(aaruTrack.Sequence, aaruTrack);
-                            }
-
-                            break;
-
-                        // "IDNT"
-                        case HARD_DISK_IDENT_METADATA:
-                            Identify.IdentifyDevice? idnt = CommonTypes.Structs.Devices.ATA.Identify.Decode(meta);
-
-                            if(idnt.HasValue)
-                            {
-                                _imageInfo.MediaManufacturer     = idnt.Value.MediaManufacturer;
-                                _imageInfo.MediaSerialNumber     = idnt.Value.MediaSerial;
-                                _imageInfo.DriveModel            = idnt.Value.Model;
-                                _imageInfo.DriveSerialNumber     = idnt.Value.SerialNumber;
-                                _imageInfo.DriveFirmwareRevision = idnt.Value.FirmwareRevision;
-
-                                if(idnt.Value.CurrentCylinders       > 0 &&
-                                   idnt.Value.CurrentHeads           > 0 &&
-                                   idnt.Value.CurrentSectorsPerTrack > 0)
-                                {
-                                    _imageInfo.Cylinders       = idnt.Value.CurrentCylinders;
-                                    _imageInfo.Heads           = idnt.Value.CurrentHeads;
-                                    _imageInfo.SectorsPerTrack = idnt.Value.CurrentSectorsPerTrack;
-                                }
-                                else
-                                {
-                                    _imageInfo.Cylinders       = idnt.Value.Cylinders;
-                                    _imageInfo.Heads           = idnt.Value.Heads;
-                                    _imageInfo.SectorsPerTrack = idnt.Value.SectorsPerTrack;
-                                }
-                            }
-
-                            _identify = meta;
-
-                            if(!_imageInfo.ReadableMediaTags.Contains(MediaTagType.ATA_IDENTIFY))
-                                _imageInfo.ReadableMediaTags.Add(MediaTagType.ATA_IDENTIFY);
-
-                            break;
-                        case PCMCIA_CIS_METADATA:
-                            _cis = meta;
-
-                            if(!_imageInfo.ReadableMediaTags.Contains(MediaTagType.PCMCIA_CIS))
-                                _imageInfo.ReadableMediaTags.Add(MediaTagType.PCMCIA_CIS);
-
-                            break;
+                        if(_hunkTableSmall.Length >= (i                                  * 512 / 4) + (512 / 4))
+                            Array.Copy(hunkSector.hunkEntry, 0, _hunkTableSmall, i * 512 / 4, 512 / 4);
+                        else
+                            Array.Copy(hunkSector.hunkEntry, 0, _hunkTableSmall, i * 512 / 4,
+                                       _hunkTableSmall.Length - (i * 512 / 4));
                     }
 
-                    nextMetaOff = header.next;
-                }
-
-                if(_isHdd)
-                {
-                    _sectorsPerHunk         = _bytesPerHunk        / _imageInfo.SectorSize;
-                    _imageInfo.Sectors      = _imageInfo.ImageSize / _imageInfo.SectorSize;
-                    _imageInfo.MediaType    = MediaType.GENERIC_HDD;
-                    _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-                }
-                else if(_isCdrom)
-                {
-                    // Hardcoded on MAME for CD-ROM
-                    _sectorsPerHunk         = 8;
-                    _imageInfo.MediaType    = MediaType.CDROM;
-                    _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
-
-                    foreach(Track aaruTrack in _tracks.Values)
-                        _imageInfo.Sectors += aaruTrack.EndSector - aaruTrack.StartSector + 1;
-                }
-                else if(_isGdrom)
-                {
-                    // Hardcoded on MAME for GD-ROM
-                    _sectorsPerHunk         = 8;
-                    _imageInfo.MediaType    = MediaType.GDROM;
-                    _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
-
-                    foreach(Track aaruTrack in _tracks.Values)
-                        _imageInfo.Sectors += aaruTrack.EndSector - aaruTrack.StartSector + 1;
+                    DateTime end = DateTime.UtcNow;
+                    AaruConsole.DebugWriteLine("CHD plugin", "Took {0} seconds", (end - start).TotalSeconds);
                 }
                 else
                 {
-                    AaruConsole.ErrorWriteLine("Image does not represent a known media, aborting");
+                    AaruConsole.ErrorWriteLine("Cannot read compressed CHD version 5");
 
                     return ErrorNumber.NotSupported;
                 }
+
+                nextMetaOff = hdrV5.metaoffset;
+
+                _imageInfo.ImageSize = hdrV5.logicalbytes;
+                _imageInfo.Version   = "5";
+
+                _totalHunks      = (uint)(hdrV5.logicalbytes / hdrV5.hunkbytes);
+                _bytesPerHunk    = hdrV5.hunkbytes;
+                _hdrCompression  = hdrV5.compressor0;
+                _hdrCompression1 = hdrV5.compressor1;
+                _hdrCompression2 = hdrV5.compressor2;
+                _hdrCompression3 = hdrV5.compressor3;
+                _mapVersion      = 5;
+
+                break;
             }
 
-            if(_isCdrom || _isGdrom)
-            {
-                _offsetmap  = new Dictionary<ulong, uint>();
-                _partitions = new List<Partition>();
-                ulong partPos = 0;
+            default:
+                AaruConsole.ErrorWriteLine($"Unsupported CHD version {version}");
 
-                foreach(Track aaruTrack in _tracks.Values)
-                {
-                    var partition = new Partition
-                    {
-                        Description = aaruTrack.Description,
-                        Size = (aaruTrack.EndSector - (ulong)aaruTrack.Indexes[1] + 1) *
-                               (ulong)aaruTrack.RawBytesPerSector,
-                        Length   = aaruTrack.EndSector - (ulong)aaruTrack.Indexes[1] + 1,
-                        Sequence = aaruTrack.Sequence,
-                        Offset   = partPos,
-                        Start    = (ulong)aaruTrack.Indexes[1],
-                        Type     = aaruTrack.Type.ToString()
-                    };
-
-                    partPos += partition.Length;
-                    _offsetmap.Add(aaruTrack.StartSector, aaruTrack.Sequence);
-
-                    if(aaruTrack.SubchannelType != TrackSubchannelType.None)
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-
-                    switch(aaruTrack.Type)
-                    {
-                        case TrackType.CdMode1:
-                        case TrackType.CdMode2Form1:
-                            if(aaruTrack.RawBytesPerSector == 2352)
-                            {
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-                            }
-
-                            break;
-                        case TrackType.CdMode2Form2:
-                            if(aaruTrack.RawBytesPerSector == 2352)
-                            {
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-                            }
-
-                            break;
-                        case TrackType.CdMode2Formless:
-                            if(aaruTrack.RawBytesPerSector == 2352)
-                            {
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-                            }
-
-                            break;
-                    }
-
-                    if(aaruTrack.BytesPerSector > _imageInfo.SectorSize)
-                        _imageInfo.SectorSize = (uint)aaruTrack.BytesPerSector;
-
-                    _partitions.Add(partition);
-                }
-
-                _imageInfo.HasPartitions = true;
-                _imageInfo.HasSessions   = true;
-            }
-
-            _maxBlockCache  = (int)(MAX_CACHE_SIZE / (_imageInfo.SectorSize * _sectorsPerHunk));
-            _maxSectorCache = (int)(MAX_CACHE_SIZE / _imageInfo.SectorSize);
-
-            _imageStream = stream;
-
-            _sectorCache = new Dictionary<ulong, byte[]>();
-            _hunkCache   = new Dictionary<ulong, byte[]>();
-
-            // TODO: Detect CompactFlash
-            // TODO: Get manufacturer and drive name from CIS if applicable
-            if(_cis != null)
-                _imageInfo.MediaType = MediaType.PCCardTypeI;
-
-            _sectorBuilder = new SectorBuilder();
-
-            return ErrorNumber.NoError;
+                return ErrorNumber.NotSupported;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        if(_mapVersion >= 3)
         {
-            buffer = null;
+            _isCdrom   = false;
+            _isHdd     = false;
+            _isGdrom   = false;
+            _swapAudio = false;
+            _tracks    = new Dictionary<uint, Track>();
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            AaruConsole.DebugWriteLine("CHD plugin", "Reading metadata.");
 
-            var  track = new Track();
-            uint sectorSize;
+            ulong currentSector = 0;
+            uint  currentTrack  = 1;
 
-            if(!_sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+            while(nextMetaOff > 0)
             {
-                if(_isHdd)
-                    sectorSize = _imageInfo.SectorSize;
-                else
+                byte[] hdrBytes = new byte[16];
+                stream.Seek((long)nextMetaOff, SeekOrigin.Begin);
+                stream.Read(hdrBytes, 0, hdrBytes.Length);
+                MetadataHeader header = Marshal.ByteArrayToStructureBigEndian<MetadataHeader>(hdrBytes);
+                byte[]         meta   = new byte[header.flagsAndLength & 0xFFFFFF];
+                stream.Read(meta, 0, meta.Length);
+
+                AaruConsole.DebugWriteLine("CHD plugin", "Found metadata \"{0}\"",
+                                           Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(header.tag)));
+
+                switch(header.tag)
                 {
-                    track      = GetTrack(sectorAddress);
-                    sectorSize = (uint)track.RawBytesPerSector;
+                    // "GDDD"
+                    case HARD_DISK_METADATA:
+                        if(_isCdrom || _isGdrom)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine("Image cannot be a hard disk and a C/GD-ROM at the same time, aborting.");
+
+                            return ErrorNumber.NotSupported;
+                        }
+
+                        string gddd      = StringHandlers.CToString(meta);
+                        var    gdddRegEx = new Regex(REGEX_METADATA_HDD);
+                        Match  gdddMatch = gdddRegEx.Match(gddd);
+
+                        if(gdddMatch.Success)
+                        {
+                            _isHdd                     = true;
+                            _imageInfo.SectorSize      = uint.Parse(gdddMatch.Groups["bps"].Value);
+                            _imageInfo.Cylinders       = uint.Parse(gdddMatch.Groups["cylinders"].Value);
+                            _imageInfo.Heads           = uint.Parse(gdddMatch.Groups["heads"].Value);
+                            _imageInfo.SectorsPerTrack = uint.Parse(gdddMatch.Groups["sectors"].Value);
+                        }
+
+                        break;
+
+                    // "CHCD"
+                    case CDROM_OLD_METADATA:
+                        if(_isHdd)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine("Image cannot be a hard disk and a CD-ROM at the same time, aborting.");
+
+                            return ErrorNumber.NotSupported;
+                        }
+
+                        if(_isGdrom)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine("Image cannot be a GD-ROM and a CD-ROM at the same time, aborting.");
+
+                            return ErrorNumber.NotSupported;
+                        }
+
+                        uint chdTracksNumber = BigEndianBitConverter.ToUInt32(meta, 0);
+
+                        // Byteswapped
+                        if(chdTracksNumber > 99)
+                            chdTracksNumber = BigEndianBitConverter.ToUInt32(meta, 0);
+
+                        currentSector = 0;
+
+                        for(uint i = 0; i < chdTracksNumber; i++)
+                        {
+                            var chdTrack = new TrackOld
+                            {
+                                type        = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 0)),
+                                subType     = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 4)),
+                                dataSize    = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 8)),
+                                subSize     = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 12)),
+                                frames      = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 16)),
+                                extraFrames = BigEndianBitConverter.ToUInt32(meta, (int)(4 + (i * 24) + 20))
+                            };
+
+                            var aaruTrack = new Track();
+
+                            switch((TrackTypeOld)chdTrack.type)
+                            {
+                                case TrackTypeOld.Audio:
+                                    aaruTrack.BytesPerSector    = 2352;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.Audio;
+
+                                    break;
+                                case TrackTypeOld.Mode1:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2048;
+                                    aaruTrack.Type              = TrackType.CdMode1;
+
+                                    break;
+                                case TrackTypeOld.Mode1Raw:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.CdMode1;
+
+                                    break;
+                                case TrackTypeOld.Mode2:
+                                case TrackTypeOld.Mode2FormMix:
+                                    aaruTrack.BytesPerSector    = 2336;
+                                    aaruTrack.RawBytesPerSector = 2336;
+                                    aaruTrack.Type              = TrackType.CdMode2Formless;
+
+                                    break;
+                                case TrackTypeOld.Mode2Form1:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2048;
+                                    aaruTrack.Type              = TrackType.CdMode2Form1;
+
+                                    break;
+                                case TrackTypeOld.Mode2Form2:
+                                    aaruTrack.BytesPerSector    = 2324;
+                                    aaruTrack.RawBytesPerSector = 2324;
+                                    aaruTrack.Type              = TrackType.CdMode2Form2;
+
+                                    break;
+                                case TrackTypeOld.Mode2Raw:
+                                    aaruTrack.BytesPerSector    = 2336;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.CdMode2Formless;
+
+                                    break;
+                                default:
+                                {
+                                    AaruConsole.ErrorWriteLine($"Unsupported track type {chdTrack.type}");
+
+                                    return ErrorNumber.NotSupported;
+                                }
+                            }
+
+                            switch((SubTypeOld)chdTrack.subType)
+                            {
+                                case SubTypeOld.Cooked:
+                                    aaruTrack.SubchannelFile   = imageFilter.Filename;
+                                    aaruTrack.SubchannelType   = TrackSubchannelType.PackedInterleaved;
+                                    aaruTrack.SubchannelFilter = imageFilter;
+
+                                    break;
+                                case SubTypeOld.None:
+                                    aaruTrack.SubchannelType = TrackSubchannelType.None;
+
+                                    break;
+                                case SubTypeOld.Raw:
+                                    aaruTrack.SubchannelFile   = imageFilter.Filename;
+                                    aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
+                                    aaruTrack.SubchannelFilter = imageFilter;
+
+                                    break;
+                                default:
+                                {
+                                    AaruConsole.ErrorWriteLine($"Unsupported subchannel type {chdTrack.type}");
+
+                                    return ErrorNumber.NotSupported;
+                                }
+                            }
+
+                            aaruTrack.Description = $"Track {i + 1}";
+                            aaruTrack.EndSector   = currentSector + chdTrack.frames - 1;
+                            aaruTrack.File        = imageFilter.Filename;
+                            aaruTrack.FileType    = "BINARY";
+                            aaruTrack.Filter      = imageFilter;
+                            aaruTrack.StartSector = currentSector;
+                            aaruTrack.Sequence    = i + 1;
+                            aaruTrack.Session     = 1;
+
+                            if(aaruTrack.Sequence == 1)
+                                aaruTrack.Indexes.Add(0, -150);
+
+                            aaruTrack.Indexes.Add(1, (int)currentSector);
+                            currentSector += chdTrack.frames + chdTrack.extraFrames;
+                            _tracks.Add(aaruTrack.Sequence, aaruTrack);
+                        }
+
+                        _isCdrom = true;
+
+                        break;
+
+                    // "CHTR"
+                    case CDROM_TRACK_METADATA:
+                        if(_isHdd)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine("Image cannot be a hard disk and a CD-ROM at the same time, aborting.");
+
+                            return ErrorNumber.NotSupported;
+                        }
+
+                        if(_isGdrom)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine("Image cannot be a GD-ROM and a CD-ROM at the same time, aborting.");
+
+                            return ErrorNumber.NotSupported;
+                        }
+
+                        string chtr      = StringHandlers.CToString(meta);
+                        var    chtrRegEx = new Regex(REGEX_METADATA_CDROM);
+                        Match  chtrMatch = chtrRegEx.Match(chtr);
+
+                        if(chtrMatch.Success)
+                        {
+                            _isCdrom = true;
+
+                            uint   trackNo   = uint.Parse(chtrMatch.Groups["track"].Value);
+                            uint   frames    = uint.Parse(chtrMatch.Groups["frames"].Value);
+                            string subtype   = chtrMatch.Groups["sub_type"].Value;
+                            string tracktype = chtrMatch.Groups["track_type"].Value;
+
+                            if(trackNo != currentTrack)
+                            {
+                                AaruConsole.ErrorWriteLine("Unsorted tracks, cannot proceed.");
+
+                                return ErrorNumber.NotSupported;
+                            }
+
+                            var aaruTrack = new Track();
+
+                            switch(tracktype)
+                            {
+                                case TRACK_TYPE_AUDIO:
+                                    aaruTrack.BytesPerSector    = 2352;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.Audio;
+
+                                    break;
+                                case TRACK_TYPE_MODE1:
+                                case TRACK_TYPE_MODE1_2K:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2048;
+                                    aaruTrack.Type              = TrackType.CdMode1;
+
+                                    break;
+                                case TRACK_TYPE_MODE1_RAW:
+                                case TRACK_TYPE_MODE1_RAW_2K:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.CdMode1;
+
+                                    break;
+                                case TRACK_TYPE_MODE2:
+                                case TRACK_TYPE_MODE2_2K:
+                                case TRACK_TYPE_MODE2_FM:
+                                    aaruTrack.BytesPerSector    = 2336;
+                                    aaruTrack.RawBytesPerSector = 2336;
+                                    aaruTrack.Type              = TrackType.CdMode2Formless;
+
+                                    break;
+                                case TRACK_TYPE_MODE2_F1:
+                                case TRACK_TYPE_MODE2_F1_2K:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2048;
+                                    aaruTrack.Type              = TrackType.CdMode2Form1;
+
+                                    break;
+                                case TRACK_TYPE_MODE2_F2:
+                                case TRACK_TYPE_MODE2_F2_2K:
+                                    aaruTrack.BytesPerSector    = 2324;
+                                    aaruTrack.RawBytesPerSector = 2324;
+                                    aaruTrack.Type              = TrackType.CdMode2Form2;
+
+                                    break;
+                                case TRACK_TYPE_MODE2_RAW:
+                                case TRACK_TYPE_MODE2_RAW_2K:
+                                    aaruTrack.BytesPerSector    = 2336;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.CdMode2Formless;
+
+                                    break;
+                                default:
+                                {
+                                    AaruConsole.ErrorWriteLine($"Unsupported track type {tracktype}");
+
+                                    return ErrorNumber.NotSupported;
+                                }
+                            }
+
+                            switch(subtype)
+                            {
+                                case SUB_TYPE_COOKED:
+                                    aaruTrack.SubchannelFile   = imageFilter.Filename;
+                                    aaruTrack.SubchannelType   = TrackSubchannelType.PackedInterleaved;
+                                    aaruTrack.SubchannelFilter = imageFilter;
+
+                                    break;
+                                case SUB_TYPE_NONE:
+                                    aaruTrack.SubchannelType = TrackSubchannelType.None;
+
+                                    break;
+                                case SUB_TYPE_RAW:
+                                    aaruTrack.SubchannelFile   = imageFilter.Filename;
+                                    aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
+                                    aaruTrack.SubchannelFilter = imageFilter;
+
+                                    break;
+                                default:
+                                {
+                                    AaruConsole.ErrorWriteLine($"Unsupported subchannel type {subtype}");
+
+                                    return ErrorNumber.NotSupported;
+                                }
+                            }
+
+                            aaruTrack.Description = $"Track {trackNo}";
+                            aaruTrack.EndSector   = currentSector + frames - 1;
+                            aaruTrack.File        = imageFilter.Filename;
+                            aaruTrack.FileType    = "BINARY";
+                            aaruTrack.Filter      = imageFilter;
+                            aaruTrack.StartSector = currentSector;
+                            aaruTrack.Sequence    = trackNo;
+                            aaruTrack.Session     = 1;
+
+                            if(aaruTrack.Sequence == 1)
+                                aaruTrack.Indexes.Add(0, -150);
+
+                            aaruTrack.Indexes.Add(1, (int)currentSector);
+                            currentSector += frames;
+                            currentTrack++;
+                            _tracks.Add(aaruTrack.Sequence, aaruTrack);
+                        }
+
+                        break;
+
+                    // "CHT2"
+                    case CDROM_TRACK_METADATA2:
+                        if(_isHdd)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine("Image cannot be a hard disk and a CD-ROM at the same time, aborting.");
+
+                            return ErrorNumber.NotSupported;
+                        }
+
+                        if(_isGdrom)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine("Image cannot be a GD-ROM and a CD-ROM at the same time, aborting.");
+
+                            return ErrorNumber.NotSupported;
+                        }
+
+                        string cht2      = StringHandlers.CToString(meta);
+                        var    cht2RegEx = new Regex(REGEX_METADATA_CDROM2);
+                        Match  cht2Match = cht2RegEx.Match(cht2);
+
+                        if(cht2Match.Success)
+                        {
+                            _isCdrom = true;
+
+                            uint   trackNo   = uint.Parse(cht2Match.Groups["track"].Value);
+                            uint   frames    = uint.Parse(cht2Match.Groups["frames"].Value);
+                            string subtype   = cht2Match.Groups["sub_type"].Value;
+                            string trackType = cht2Match.Groups["track_type"].Value;
+
+                            uint pregap = uint.Parse(cht2Match.Groups["pregap"].Value);
+
+                            // What is this, really? Same as track type?
+                            string pregapType = cht2Match.Groups["pgtype"].Value;
+
+                            // Read above, but for subchannel
+                            string pregapSubType = cht2Match.Groups["pgsub"].Value;
+
+                            // This is a recommendation (shall) of 150 sectors at the end of the last data track,
+                            // or of any data track followed by an audio track, according to Yellow Book.
+                            // It is indistinguishable from normal data.
+                            // TODO: Does CHD store it, or like CDRWin, ignores it?
+                            uint postgap = uint.Parse(cht2Match.Groups["postgap"].Value);
+
+                            if(trackNo != currentTrack)
+                            {
+                                AaruConsole.ErrorWriteLine("Unsorted tracks, cannot proceed.");
+
+                                return ErrorNumber.NotSupported;
+                            }
+
+                            var aaruTrack = new Track();
+
+                            switch(trackType)
+                            {
+                                case TRACK_TYPE_AUDIO:
+                                    aaruTrack.BytesPerSector    = 2352;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.Audio;
+
+                                    break;
+                                case TRACK_TYPE_MODE1:
+                                case TRACK_TYPE_MODE1_2K:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2048;
+                                    aaruTrack.Type              = TrackType.CdMode1;
+
+                                    break;
+                                case TRACK_TYPE_MODE1_RAW:
+                                case TRACK_TYPE_MODE1_RAW_2K:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.CdMode1;
+
+                                    break;
+                                case TRACK_TYPE_MODE2:
+                                case TRACK_TYPE_MODE2_2K:
+                                case TRACK_TYPE_MODE2_FM:
+                                    aaruTrack.BytesPerSector    = 2336;
+                                    aaruTrack.RawBytesPerSector = 2336;
+                                    aaruTrack.Type              = TrackType.CdMode2Formless;
+
+                                    break;
+                                case TRACK_TYPE_MODE2_F1:
+                                case TRACK_TYPE_MODE2_F1_2K:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2048;
+                                    aaruTrack.Type              = TrackType.CdMode2Form1;
+
+                                    break;
+                                case TRACK_TYPE_MODE2_F2:
+                                case TRACK_TYPE_MODE2_F2_2K:
+                                    aaruTrack.BytesPerSector    = 2324;
+                                    aaruTrack.RawBytesPerSector = 2324;
+                                    aaruTrack.Type              = TrackType.CdMode2Form2;
+
+                                    break;
+                                case TRACK_TYPE_MODE2_RAW:
+                                case TRACK_TYPE_MODE2_RAW_2K:
+                                    aaruTrack.BytesPerSector    = 2336;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.CdMode2Formless;
+
+                                    break;
+                                default:
+                                {
+                                    AaruConsole.ErrorWriteLine($"Unsupported track type {trackType}");
+
+                                    return ErrorNumber.NotSupported;
+                                }
+                            }
+
+                            switch(subtype)
+                            {
+                                case SUB_TYPE_COOKED:
+                                    aaruTrack.SubchannelFile   = imageFilter.Filename;
+                                    aaruTrack.SubchannelType   = TrackSubchannelType.PackedInterleaved;
+                                    aaruTrack.SubchannelFilter = imageFilter;
+
+                                    break;
+                                case SUB_TYPE_NONE:
+                                    aaruTrack.SubchannelType = TrackSubchannelType.None;
+
+                                    break;
+                                case SUB_TYPE_RAW:
+                                    aaruTrack.SubchannelFile   = imageFilter.Filename;
+                                    aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
+                                    aaruTrack.SubchannelFilter = imageFilter;
+
+                                    break;
+                                default:
+                                {
+                                    AaruConsole.ErrorWriteLine($"Unsupported subchannel type {subtype}");
+
+                                    return ErrorNumber.NotSupported;
+                                }
+                            }
+
+                            aaruTrack.Description = $"Track {trackNo}";
+                            aaruTrack.EndSector   = currentSector + frames - 1;
+                            aaruTrack.File        = imageFilter.Filename;
+                            aaruTrack.FileType    = "BINARY";
+                            aaruTrack.Filter      = imageFilter;
+                            aaruTrack.StartSector = currentSector;
+                            aaruTrack.Sequence    = trackNo;
+                            aaruTrack.Session     = 1;
+
+                            if(aaruTrack.Sequence == 1)
+                            {
+                                if(pregap <= 150)
+                                {
+                                    aaruTrack.Indexes.Add(0, -150);
+                                    aaruTrack.Pregap = 150;
+                                }
+                                else
+                                {
+                                    aaruTrack.Indexes.Add(0, -1 * (int)pregap);
+                                    aaruTrack.Pregap = pregap;
+                                }
+
+                                aaruTrack.Indexes.Add(1, (int)currentSector);
+                            }
+                            else if(pregap > 0)
+                            {
+                                aaruTrack.Indexes.Add(0, (int)currentSector);
+                                aaruTrack.Pregap = pregap;
+                                aaruTrack.Indexes.Add(1, (int)(currentSector + pregap));
+                            }
+                            else
+                                aaruTrack.Indexes.Add(1, (int)currentSector);
+
+                            currentSector += frames;
+                            currentTrack++;
+                            _tracks.Add(aaruTrack.Sequence, aaruTrack);
+                        }
+
+                        break;
+
+                    // "CHGT"
+                    case GDROM_OLD_METADATA:
+                        _swapAudio = true;
+                        goto case GDROM_METADATA;
+
+                    // "CHGD"
+                    case GDROM_METADATA:
+                        if(_isHdd)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine("Image cannot be a hard disk and a GD-ROM at the same time, aborting.");
+
+                            return ErrorNumber.NotSupported;
+                        }
+
+                        if(_isCdrom)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine("Image cannot be a CD-ROM and a GD-ROM at the same time, aborting.");
+
+                            return ErrorNumber.NotSupported;
+                        }
+
+                        string chgd      = StringHandlers.CToString(meta);
+                        var    chgdRegEx = new Regex(REGEX_METADATA_GDROM);
+                        Match  chgdMatch = chgdRegEx.Match(chgd);
+
+                        if(chgdMatch.Success)
+                        {
+                            _isGdrom = true;
+
+                            uint   trackNo   = uint.Parse(chgdMatch.Groups["track"].Value);
+                            uint   frames    = uint.Parse(chgdMatch.Groups["frames"].Value);
+                            string subtype   = chgdMatch.Groups["sub_type"].Value;
+                            string trackType = chgdMatch.Groups["track_type"].Value;
+
+                            // TODO: Check pregap, postgap and pad behaviour
+                            uint   pregap        = uint.Parse(chgdMatch.Groups["pregap"].Value);
+                            string pregapType    = chgdMatch.Groups["pgtype"].Value;
+                            string pregapSubType = chgdMatch.Groups["pgsub"].Value;
+                            uint   postgap       = uint.Parse(chgdMatch.Groups["postgap"].Value);
+                            uint   pad           = uint.Parse(chgdMatch.Groups["pad"].Value);
+
+                            if(trackNo != currentTrack)
+                            {
+                                AaruConsole.ErrorWriteLine("Unsorted tracks, cannot proceed.");
+
+                                return ErrorNumber.NotSupported;
+                            }
+
+                            var aaruTrack = new Track();
+
+                            switch(trackType)
+                            {
+                                case TRACK_TYPE_AUDIO:
+                                    aaruTrack.BytesPerSector    = 2352;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.Audio;
+
+                                    break;
+                                case TRACK_TYPE_MODE1:
+                                case TRACK_TYPE_MODE1_2K:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2048;
+                                    aaruTrack.Type              = TrackType.CdMode1;
+
+                                    break;
+                                case TRACK_TYPE_MODE1_RAW:
+                                case TRACK_TYPE_MODE1_RAW_2K:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.CdMode1;
+
+                                    break;
+                                case TRACK_TYPE_MODE2:
+                                case TRACK_TYPE_MODE2_2K:
+                                case TRACK_TYPE_MODE2_FM:
+                                    aaruTrack.BytesPerSector    = 2336;
+                                    aaruTrack.RawBytesPerSector = 2336;
+                                    aaruTrack.Type              = TrackType.CdMode2Formless;
+
+                                    break;
+                                case TRACK_TYPE_MODE2_F1:
+                                case TRACK_TYPE_MODE2_F1_2K:
+                                    aaruTrack.BytesPerSector    = 2048;
+                                    aaruTrack.RawBytesPerSector = 2048;
+                                    aaruTrack.Type              = TrackType.CdMode2Form1;
+
+                                    break;
+                                case TRACK_TYPE_MODE2_F2:
+                                case TRACK_TYPE_MODE2_F2_2K:
+                                    aaruTrack.BytesPerSector    = 2324;
+                                    aaruTrack.RawBytesPerSector = 2324;
+                                    aaruTrack.Type              = TrackType.CdMode2Form2;
+
+                                    break;
+                                case TRACK_TYPE_MODE2_RAW:
+                                case TRACK_TYPE_MODE2_RAW_2K:
+                                    aaruTrack.BytesPerSector    = 2336;
+                                    aaruTrack.RawBytesPerSector = 2352;
+                                    aaruTrack.Type              = TrackType.CdMode2Formless;
+
+                                    break;
+                                default:
+                                {
+                                    AaruConsole.ErrorWriteLine($"Unsupported track type {trackType}");
+
+                                    return ErrorNumber.NotSupported;
+                                }
+                            }
+
+                            switch(subtype)
+                            {
+                                case SUB_TYPE_COOKED:
+                                    aaruTrack.SubchannelFile   = imageFilter.Filename;
+                                    aaruTrack.SubchannelType   = TrackSubchannelType.PackedInterleaved;
+                                    aaruTrack.SubchannelFilter = imageFilter;
+
+                                    break;
+                                case SUB_TYPE_NONE:
+                                    aaruTrack.SubchannelType = TrackSubchannelType.None;
+
+                                    break;
+                                case SUB_TYPE_RAW:
+                                    aaruTrack.SubchannelFile   = imageFilter.Filename;
+                                    aaruTrack.SubchannelType   = TrackSubchannelType.RawInterleaved;
+                                    aaruTrack.SubchannelFilter = imageFilter;
+
+                                    break;
+                                default:
+                                {
+                                    AaruConsole.ErrorWriteLine($"Unsupported subchannel type {subtype}");
+
+                                    return ErrorNumber.NotSupported;
+                                }
+                            }
+
+                            aaruTrack.Description = $"Track {trackNo}";
+                            aaruTrack.EndSector   = currentSector + frames - 1;
+                            aaruTrack.File        = imageFilter.Filename;
+                            aaruTrack.FileType    = "BINARY";
+                            aaruTrack.Filter      = imageFilter;
+                            aaruTrack.StartSector = currentSector;
+                            aaruTrack.Sequence    = trackNo;
+                            aaruTrack.Session     = (ushort)(trackNo > 2 ? 2 : 1);
+
+                            if(aaruTrack.Sequence == 1)
+                            {
+                                if(pregap <= 150)
+                                {
+                                    aaruTrack.Indexes.Add(0, -150);
+                                    aaruTrack.Pregap = 150;
+                                }
+                                else
+                                {
+                                    aaruTrack.Indexes.Add(0, -1 * (int)pregap);
+                                    aaruTrack.Pregap = pregap;
+                                }
+
+                                aaruTrack.Indexes.Add(1, (int)currentSector);
+                            }
+                            else if(pregap > 0)
+                            {
+                                aaruTrack.Indexes.Add(0, (int)currentSector);
+                                aaruTrack.Pregap = pregap;
+                                aaruTrack.Indexes.Add(1, (int)(currentSector + pregap));
+                            }
+                            else
+                                aaruTrack.Indexes.Add(1, (int)currentSector);
+
+                            currentSector += frames;
+                            currentTrack++;
+                            _tracks.Add(aaruTrack.Sequence, aaruTrack);
+                        }
+
+                        break;
+
+                    // "IDNT"
+                    case HARD_DISK_IDENT_METADATA:
+                        Identify.IdentifyDevice? idnt = CommonTypes.Structs.Devices.ATA.Identify.Decode(meta);
+
+                        if(idnt.HasValue)
+                        {
+                            _imageInfo.MediaManufacturer     = idnt.Value.MediaManufacturer;
+                            _imageInfo.MediaSerialNumber     = idnt.Value.MediaSerial;
+                            _imageInfo.DriveModel            = idnt.Value.Model;
+                            _imageInfo.DriveSerialNumber     = idnt.Value.SerialNumber;
+                            _imageInfo.DriveFirmwareRevision = idnt.Value.FirmwareRevision;
+
+                            if(idnt.Value.CurrentCylinders       > 0 &&
+                               idnt.Value.CurrentHeads           > 0 &&
+                               idnt.Value.CurrentSectorsPerTrack > 0)
+                            {
+                                _imageInfo.Cylinders       = idnt.Value.CurrentCylinders;
+                                _imageInfo.Heads           = idnt.Value.CurrentHeads;
+                                _imageInfo.SectorsPerTrack = idnt.Value.CurrentSectorsPerTrack;
+                            }
+                            else
+                            {
+                                _imageInfo.Cylinders       = idnt.Value.Cylinders;
+                                _imageInfo.Heads           = idnt.Value.Heads;
+                                _imageInfo.SectorsPerTrack = idnt.Value.SectorsPerTrack;
+                            }
+                        }
+
+                        _identify = meta;
+
+                        if(!_imageInfo.ReadableMediaTags.Contains(MediaTagType.ATA_IDENTIFY))
+                            _imageInfo.ReadableMediaTags.Add(MediaTagType.ATA_IDENTIFY);
+
+                        break;
+                    case PCMCIA_CIS_METADATA:
+                        _cis = meta;
+
+                        if(!_imageInfo.ReadableMediaTags.Contains(MediaTagType.PCMCIA_CIS))
+                            _imageInfo.ReadableMediaTags.Add(MediaTagType.PCMCIA_CIS);
+
+                        break;
                 }
 
-                ulong hunkNo = sectorAddress              / _sectorsPerHunk;
-                ulong secOff = sectorAddress * sectorSize % (_sectorsPerHunk * sectorSize);
-
-                ErrorNumber errno = GetHunk(hunkNo, out byte[] hunk);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                sector = new byte[_imageInfo.SectorSize];
-                Array.Copy(hunk, (int)secOff, sector, 0, sector.Length);
-
-                if(_sectorCache.Count >= _maxSectorCache)
-                    _sectorCache.Clear();
-
-                _sectorCache.Add(sectorAddress, sector);
+                nextMetaOff = header.next;
             }
 
             if(_isHdd)
             {
-                buffer = sector;
+                _sectorsPerHunk         = _bytesPerHunk        / _imageInfo.SectorSize;
+                _imageInfo.Sectors      = _imageInfo.ImageSize / _imageInfo.SectorSize;
+                _imageInfo.MediaType    = MediaType.GENERIC_HDD;
+                _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+            }
+            else if(_isCdrom)
+            {
+                // Hardcoded on MAME for CD-ROM
+                _sectorsPerHunk         = 8;
+                _imageInfo.MediaType    = MediaType.CDROM;
+                _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
 
-                return ErrorNumber.NoError;
+                foreach(Track aaruTrack in _tracks.Values)
+                    _imageInfo.Sectors += aaruTrack.EndSector - aaruTrack.StartSector + 1;
+            }
+            else if(_isGdrom)
+            {
+                // Hardcoded on MAME for GD-ROM
+                _sectorsPerHunk         = 8;
+                _imageInfo.MediaType    = MediaType.GDROM;
+                _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
+
+                foreach(Track aaruTrack in _tracks.Values)
+                    _imageInfo.Sectors += aaruTrack.EndSector - aaruTrack.StartSector + 1;
+            }
+            else
+            {
+                AaruConsole.ErrorWriteLine("Image does not represent a known media, aborting");
+
+                return ErrorNumber.NotSupported;
+            }
+        }
+
+        if(_isCdrom || _isGdrom)
+        {
+            _offsetmap  = new Dictionary<ulong, uint>();
+            _partitions = new List<Partition>();
+            ulong partPos = 0;
+
+            foreach(Track aaruTrack in _tracks.Values)
+            {
+                var partition = new Partition
+                {
+                    Description = aaruTrack.Description,
+                    Size = (aaruTrack.EndSector - (ulong)aaruTrack.Indexes[1] + 1) *
+                           (ulong)aaruTrack.RawBytesPerSector,
+                    Length   = aaruTrack.EndSector - (ulong)aaruTrack.Indexes[1] + 1,
+                    Sequence = aaruTrack.Sequence,
+                    Offset   = partPos,
+                    Start    = (ulong)aaruTrack.Indexes[1],
+                    Type     = aaruTrack.Type.ToString()
+                };
+
+                partPos += partition.Length;
+                _offsetmap.Add(aaruTrack.StartSector, aaruTrack.Sequence);
+
+                if(aaruTrack.SubchannelType != TrackSubchannelType.None)
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+
+                switch(aaruTrack.Type)
+                {
+                    case TrackType.CdMode1:
+                    case TrackType.CdMode2Form1:
+                        if(aaruTrack.RawBytesPerSector == 2352)
+                        {
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+                        }
+
+                        break;
+                    case TrackType.CdMode2Form2:
+                        if(aaruTrack.RawBytesPerSector == 2352)
+                        {
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+                        }
+
+                        break;
+                    case TrackType.CdMode2Formless:
+                        if(aaruTrack.RawBytesPerSector == 2352)
+                        {
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+                        }
+
+                        break;
+                }
+
+                if(aaruTrack.BytesPerSector > _imageInfo.SectorSize)
+                    _imageInfo.SectorSize = (uint)aaruTrack.BytesPerSector;
+
+                _partitions.Add(partition);
             }
 
-            uint sectorOffset;
-            bool mode2 = false;
+            _imageInfo.HasPartitions = true;
+            _imageInfo.HasSessions   = true;
+        }
 
+        _maxBlockCache  = (int)(MAX_CACHE_SIZE / (_imageInfo.SectorSize * _sectorsPerHunk));
+        _maxSectorCache = (int)(MAX_CACHE_SIZE / _imageInfo.SectorSize);
+
+        _imageStream = stream;
+
+        _sectorCache = new Dictionary<ulong, byte[]>();
+        _hunkCache   = new Dictionary<ulong, byte[]>();
+
+        // TODO: Detect CompactFlash
+        // TODO: Get manufacturer and drive name from CIS if applicable
+        if(_cis != null)
+            _imageInfo.MediaType = MediaType.PCCardTypeI;
+
+        _sectorBuilder = new SectorBuilder();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        var  track = new Track();
+        uint sectorSize;
+
+        if(!_sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+        {
+            if(_isHdd)
+                sectorSize = _imageInfo.SectorSize;
+            else
+            {
+                track      = GetTrack(sectorAddress);
+                sectorSize = (uint)track.RawBytesPerSector;
+            }
+
+            ulong hunkNo = sectorAddress              / _sectorsPerHunk;
+            ulong secOff = sectorAddress * sectorSize % (_sectorsPerHunk * sectorSize);
+
+            ErrorNumber errno = GetHunk(hunkNo, out byte[] hunk);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            sector = new byte[_imageInfo.SectorSize];
+            Array.Copy(hunk, (int)secOff, sector, 0, sector.Length);
+
+            if(_sectorCache.Count >= _maxSectorCache)
+                _sectorCache.Clear();
+
+            _sectorCache.Add(sectorAddress, sector);
+        }
+
+        if(_isHdd)
+        {
+            buffer = sector;
+
+            return ErrorNumber.NoError;
+        }
+
+        uint sectorOffset;
+        bool mode2 = false;
+
+        switch(track.Type)
+        {
+            case TrackType.CdMode1:
+            {
+                if(track.RawBytesPerSector == 2352)
+                {
+                    sectorOffset = 16;
+                    sectorSize   = 2048;
+                }
+                else
+                {
+                    sectorOffset = 0;
+                    sectorSize   = 2048;
+                }
+
+                break;
+            }
+            case TrackType.CdMode2Form1:
+            {
+                if(track.RawBytesPerSector == 2352)
+                {
+                    sectorOffset = 0;
+                    sectorSize   = 2352;
+                    mode2        = true;
+                }
+                else
+                {
+                    sectorOffset = 0;
+                    sectorSize   = 2048;
+                }
+
+                break;
+            }
+
+            case TrackType.CdMode2Form2:
+            {
+                if(track.RawBytesPerSector == 2352)
+                {
+                    sectorOffset = 0;
+                    sectorSize   = 2352;
+                    mode2        = true;
+                }
+                else
+                {
+                    sectorOffset = 0;
+                    sectorSize   = 2324;
+                }
+
+                break;
+            }
+
+            case TrackType.CdMode2Formless:
+            {
+                sectorOffset = 0;
+                sectorSize   = (uint)track.RawBytesPerSector;
+                mode2        = true;
+
+                break;
+            }
+
+            case TrackType.Audio:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+
+                break;
+            }
+
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize];
+
+        if(mode2)
+            buffer = Sector.GetUserDataFromMode2(sector);
+        else if(track.Type == TrackType.Audio && _swapAudio)
+            for(int i = 0; i < 2352; i += 2)
+            {
+                buffer[i + 1] = sector[i];
+                buffer[i]     = sector[i + 1];
+            }
+        else
+            Array.Copy(sector, sectorOffset, buffer, 0, sectorSize);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_isHdd)
+            return ErrorNumber.NotSupported;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        var track = new Track();
+
+        uint sectorSize;
+
+        if(!_sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+        {
+            track      = GetTrack(sectorAddress);
+            sectorSize = (uint)track.RawBytesPerSector;
+
+            ulong hunkNo = sectorAddress              / _sectorsPerHunk;
+            ulong secOff = sectorAddress * sectorSize % (_sectorsPerHunk * sectorSize);
+
+            ErrorNumber errno = GetHunk(hunkNo, out byte[] hunk);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            sector = new byte[_imageInfo.SectorSize];
+            Array.Copy(hunk, (int)secOff, sector, 0, sector.Length);
+
+            if(_sectorCache.Count >= _maxSectorCache)
+                _sectorCache.Clear();
+
+            _sectorCache.Add(sectorAddress, sector);
+        }
+
+        if(_isHdd)
+        {
+            buffer = sector;
+
+            return ErrorNumber.NoError;
+        }
+
+        uint sectorOffset;
+
+        if(tag == SectorTagType.CdSectorSubchannel)
+            switch(track.SubchannelType)
+            {
+                case TrackSubchannelType.None: return ErrorNumber.NoData;
+                case TrackSubchannelType.RawInterleaved:
+                    sectorOffset = (uint)track.RawBytesPerSector;
+                    sectorSize   = 96;
+
+                    break;
+                default: return ErrorNumber.NotSupported;
+            }
+        else
             switch(track.Type)
             {
                 case TrackType.CdMode1:
-                {
-                    if(track.RawBytesPerSector == 2352)
-                    {
-                        sectorOffset = 16;
-                        sectorSize   = 2048;
-                    }
-                    else
-                    {
-                        sectorOffset = 0;
-                        sectorSize   = 2048;
-                    }
-
-                    break;
-                }
                 case TrackType.CdMode2Form1:
                 {
                     if(track.RawBytesPerSector == 2352)
-                    {
-                        sectorOffset = 0;
-                        sectorSize   = 2352;
-                        mode2        = true;
-                    }
+                        switch(tag)
+                        {
+                            case SectorTagType.CdSectorSync:
+                            {
+                                sectorOffset = 0;
+                                sectorSize   = 12;
+
+                                break;
+                            }
+
+                            case SectorTagType.CdSectorHeader:
+                            {
+                                sectorOffset = 12;
+                                sectorSize   = 4;
+
+                                break;
+                            }
+
+                            case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                            case SectorTagType.CdSectorEcc:
+                            {
+                                sectorOffset = 2076;
+                                sectorSize   = 276;
+
+                                break;
+                            }
+
+                            case SectorTagType.CdSectorEccP:
+                            {
+                                sectorOffset = 2076;
+                                sectorSize   = 172;
+
+                                break;
+                            }
+
+                            case SectorTagType.CdSectorEccQ:
+                            {
+                                sectorOffset = 2248;
+                                sectorSize   = 104;
+
+                                break;
+                            }
+
+                            case SectorTagType.CdSectorEdc:
+                            {
+                                sectorOffset = 2064;
+                                sectorSize   = 4;
+
+                                break;
+                            }
+
+                            default: return ErrorNumber.NotSupported;
+                        }
                     else
-                    {
-                        sectorOffset = 0;
-                        sectorSize   = 2048;
-                    }
+                        return ErrorNumber.NoData;
 
                     break;
                 }
@@ -1419,574 +1595,397 @@ namespace Aaru.DiscImages
                 case TrackType.CdMode2Form2:
                 {
                     if(track.RawBytesPerSector == 2352)
-                    {
-                        sectorOffset = 0;
-                        sectorSize   = 2352;
-                        mode2        = true;
-                    }
+                        switch(tag)
+                        {
+                            case SectorTagType.CdSectorSync:
+                            {
+                                sectorOffset = 0;
+                                sectorSize   = 12;
+
+                                break;
+                            }
+
+                            case SectorTagType.CdSectorHeader:
+                            {
+                                sectorOffset = 12;
+                                sectorSize   = 4;
+
+                                break;
+                            }
+
+                            case SectorTagType.CdSectorSubHeader:
+                            {
+                                sectorOffset = 16;
+                                sectorSize   = 8;
+
+                                break;
+                            }
+
+                            case SectorTagType.CdSectorEdc:
+                            {
+                                sectorOffset = 2348;
+                                sectorSize   = 4;
+
+                                break;
+                            }
+
+                            default: return ErrorNumber.NotSupported;
+                        }
                     else
-                    {
-                        sectorOffset = 0;
-                        sectorSize   = 2324;
-                    }
+                        switch(tag)
+                        {
+                            case SectorTagType.CdSectorSync:
+                            case SectorTagType.CdSectorHeader:
+                            case SectorTagType.CdSectorSubchannel:
+                            case SectorTagType.CdSectorEcc:
+                            case SectorTagType.CdSectorEccP:
+                            case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
+                            case SectorTagType.CdSectorSubHeader:
+                            {
+                                sectorOffset = 0;
+                                sectorSize   = 8;
+
+                                break;
+                            }
+
+                            case SectorTagType.CdSectorEdc:
+                            {
+                                sectorOffset = 2332;
+                                sectorSize   = 4;
+
+                                break;
+                            }
+
+                            default: return ErrorNumber.NotSupported;
+                        }
 
                     break;
                 }
 
                 case TrackType.CdMode2Formless:
                 {
-                    sectorOffset = 0;
-                    sectorSize   = (uint)track.RawBytesPerSector;
-                    mode2        = true;
-
-                    break;
-                }
-
-                case TrackType.Audio:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-
-                    break;
-                }
-
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize];
-
-            if(mode2)
-                buffer = Sector.GetUserDataFromMode2(sector);
-            else if(track.Type == TrackType.Audio && _swapAudio)
-                for(int i = 0; i < 2352; i += 2)
-                {
-                    buffer[i + 1] = sector[i];
-                    buffer[i]     = sector[i + 1];
-                }
-            else
-                Array.Copy(sector, sectorOffset, buffer, 0, sectorSize);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_isHdd)
-                return ErrorNumber.NotSupported;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            var track = new Track();
-
-            uint sectorSize;
-
-            if(!_sectorCache.TryGetValue(sectorAddress, out byte[] sector))
-            {
-                track      = GetTrack(sectorAddress);
-                sectorSize = (uint)track.RawBytesPerSector;
-
-                ulong hunkNo = sectorAddress              / _sectorsPerHunk;
-                ulong secOff = sectorAddress * sectorSize % (_sectorsPerHunk * sectorSize);
-
-                ErrorNumber errno = GetHunk(hunkNo, out byte[] hunk);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                sector = new byte[_imageInfo.SectorSize];
-                Array.Copy(hunk, (int)secOff, sector, 0, sector.Length);
-
-                if(_sectorCache.Count >= _maxSectorCache)
-                    _sectorCache.Clear();
-
-                _sectorCache.Add(sectorAddress, sector);
-            }
-
-            if(_isHdd)
-            {
-                buffer = sector;
-
-                return ErrorNumber.NoError;
-            }
-
-            uint sectorOffset;
-
-            if(tag == SectorTagType.CdSectorSubchannel)
-                switch(track.SubchannelType)
-                {
-                    case TrackSubchannelType.None: return ErrorNumber.NoData;
-                    case TrackSubchannelType.RawInterleaved:
-                        sectorOffset = (uint)track.RawBytesPerSector;
-                        sectorSize   = 96;
-
-                        break;
-                    default: return ErrorNumber.NotSupported;
-                }
-            else
-                switch(track.Type)
-                {
-                    case TrackType.CdMode1:
-                    case TrackType.CdMode2Form1:
-                    {
-                        if(track.RawBytesPerSector == 2352)
-                            switch(tag)
+                    if(track.RawBytesPerSector == 2352)
+                        switch(tag)
+                        {
+                            case SectorTagType.CdSectorSync:
+                            case SectorTagType.CdSectorHeader:
+                            case SectorTagType.CdSectorEcc:
+                            case SectorTagType.CdSectorEccP:
+                            case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
+                            case SectorTagType.CdSectorSubHeader:
                             {
-                                case SectorTagType.CdSectorSync:
-                                {
-                                    sectorOffset = 0;
-                                    sectorSize   = 12;
+                                sectorOffset = 0;
+                                sectorSize   = 8;
 
-                                    break;
-                                }
-
-                                case SectorTagType.CdSectorHeader:
-                                {
-                                    sectorOffset = 12;
-                                    sectorSize   = 4;
-
-                                    break;
-                                }
-
-                                case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                                case SectorTagType.CdSectorEcc:
-                                {
-                                    sectorOffset = 2076;
-                                    sectorSize   = 276;
-
-                                    break;
-                                }
-
-                                case SectorTagType.CdSectorEccP:
-                                {
-                                    sectorOffset = 2076;
-                                    sectorSize   = 172;
-
-                                    break;
-                                }
-
-                                case SectorTagType.CdSectorEccQ:
-                                {
-                                    sectorOffset = 2248;
-                                    sectorSize   = 104;
-
-                                    break;
-                                }
-
-                                case SectorTagType.CdSectorEdc:
-                                {
-                                    sectorOffset = 2064;
-                                    sectorSize   = 4;
-
-                                    break;
-                                }
-
-                                default: return ErrorNumber.NotSupported;
-                            }
-                        else
-                            return ErrorNumber.NoData;
-
-                        break;
-                    }
-
-                    case TrackType.CdMode2Form2:
-                    {
-                        if(track.RawBytesPerSector == 2352)
-                            switch(tag)
-                            {
-                                case SectorTagType.CdSectorSync:
-                                {
-                                    sectorOffset = 0;
-                                    sectorSize   = 12;
-
-                                    break;
-                                }
-
-                                case SectorTagType.CdSectorHeader:
-                                {
-                                    sectorOffset = 12;
-                                    sectorSize   = 4;
-
-                                    break;
-                                }
-
-                                case SectorTagType.CdSectorSubHeader:
-                                {
-                                    sectorOffset = 16;
-                                    sectorSize   = 8;
-
-                                    break;
-                                }
-
-                                case SectorTagType.CdSectorEdc:
-                                {
-                                    sectorOffset = 2348;
-                                    sectorSize   = 4;
-
-                                    break;
-                                }
-
-                                default: return ErrorNumber.NotSupported;
-                            }
-                        else
-                            switch(tag)
-                            {
-                                case SectorTagType.CdSectorSync:
-                                case SectorTagType.CdSectorHeader:
-                                case SectorTagType.CdSectorSubchannel:
-                                case SectorTagType.CdSectorEcc:
-                                case SectorTagType.CdSectorEccP:
-                                case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
-                                case SectorTagType.CdSectorSubHeader:
-                                {
-                                    sectorOffset = 0;
-                                    sectorSize   = 8;
-
-                                    break;
-                                }
-
-                                case SectorTagType.CdSectorEdc:
-                                {
-                                    sectorOffset = 2332;
-                                    sectorSize   = 4;
-
-                                    break;
-                                }
-
-                                default: return ErrorNumber.NotSupported;
+                                break;
                             }
 
-                        break;
-                    }
-
-                    case TrackType.CdMode2Formless:
-                    {
-                        if(track.RawBytesPerSector == 2352)
-                            switch(tag)
+                            case SectorTagType.CdSectorEdc:
                             {
-                                case SectorTagType.CdSectorSync:
-                                case SectorTagType.CdSectorHeader:
-                                case SectorTagType.CdSectorEcc:
-                                case SectorTagType.CdSectorEccP:
-                                case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
-                                case SectorTagType.CdSectorSubHeader:
-                                {
-                                    sectorOffset = 0;
-                                    sectorSize   = 8;
+                                sectorOffset = 2332;
+                                sectorSize   = 4;
 
-                                    break;
-                                }
-
-                                case SectorTagType.CdSectorEdc:
-                                {
-                                    sectorOffset = 2332;
-                                    sectorSize   = 4;
-
-                                    break;
-                                }
-
-                                default: return ErrorNumber.NotSupported;
+                                break;
                             }
-                        else
-                            return ErrorNumber.NoData;
 
-                        break;
-                    }
-
-                    case TrackType.Audio: return ErrorNumber.NoData;
-                    default:              return ErrorNumber.NotImplemented;
-                }
-
-            buffer = new byte[sectorSize];
-
-            if(track.Type == TrackType.Audio && _swapAudio)
-                for(int i = 0; i < 2352; i += 2)
-                {
-                    buffer[i + 1] = sector[i];
-                    buffer[i]     = sector[i + 1];
-                }
-            else
-                Array.Copy(sector, sectorOffset, buffer, 0, sectorSize);
-
-            if(track.Type == TrackType.Audio && _swapAudio)
-                for(int i = 0; i < 2352; i += 2)
-                {
-                    buffer[i + 1] = sector[i];
-                    buffer[i]     = sector[i + 1];
-                }
-            else
-                Array.Copy(sector, sectorOffset, buffer, 0, sectorSize);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSectorTag(sectorAddress + i, tag, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_isHdd)
-                return ReadSector(sectorAddress, out buffer);
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            var track = new Track();
-
-            if(!_sectorCache.TryGetValue(sectorAddress, out byte[] sector))
-            {
-                track = GetTrack(sectorAddress);
-                uint sectorSize = (uint)track.RawBytesPerSector;
-
-                ulong hunkNo = sectorAddress              / _sectorsPerHunk;
-                ulong secOff = sectorAddress * sectorSize % (_sectorsPerHunk * sectorSize);
-
-                ErrorNumber errno = GetHunk(hunkNo, out byte[] hunk);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                sector = new byte[_imageInfo.SectorSize];
-                Array.Copy(hunk, (int)secOff, sector, 0, sector.Length);
-
-                if(_sectorCache.Count >= _maxSectorCache)
-                    _sectorCache.Clear();
-
-                _sectorCache.Add(sectorAddress, sector);
-            }
-
-            buffer = new byte[track.RawBytesPerSector];
-
-            if(track.Type == TrackType.Audio && _swapAudio)
-                for(int i = 0; i < 2352; i += 2)
-                {
-                    buffer[i + 1] = sector[i];
-                    buffer[i]     = sector[i + 1];
-                }
-            else
-                Array.Copy(sector, 0, buffer, 0, track.RawBytesPerSector);
-
-            switch(track.Type)
-            {
-                case TrackType.CdMode1 when track.RawBytesPerSector == 2048:
-                {
-                    byte[] fullSector = new byte[2352];
-
-                    Array.Copy(buffer, 0, fullSector, 16, 2048);
-                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)sectorAddress);
-                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
-
-                    buffer = fullSector;
+                            default: return ErrorNumber.NotSupported;
+                        }
+                    else
+                        return ErrorNumber.NoData;
 
                     break;
                 }
-                case TrackType.CdMode2Form1 when track.RawBytesPerSector == 2048:
-                {
-                    byte[] fullSector = new byte[2352];
 
-                    Array.Copy(buffer, 0, fullSector, 24, 2048);
-                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form1, (long)sectorAddress);
-                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form1);
-
-                    buffer = fullSector;
-
-                    break;
-                }
-                case TrackType.CdMode2Form1 when track.RawBytesPerSector == 2324:
-                {
-                    byte[] fullSector = new byte[2352];
-
-                    Array.Copy(buffer, 0, fullSector, 24, 2324);
-                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form2, (long)sectorAddress);
-                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form2);
-
-                    buffer = fullSector;
-
-                    break;
-                }
-                case TrackType.CdMode2Formless when track.RawBytesPerSector == 2336:
-                {
-                    byte[] fullSector = new byte[2352];
-
-                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Formless, (long)sectorAddress);
-                    Array.Copy(buffer, 0, fullSector, 16, 2336);
-
-                    buffer = fullSector;
-
-                    break;
-                }
+                case TrackType.Audio: return ErrorNumber.NoData;
+                default:              return ErrorNumber.NotImplemented;
             }
 
-            return ErrorNumber.NoError;
-        }
+        buffer = new byte[sectorSize];
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
+        if(track.Type == TrackType.Audio && _swapAudio)
+            for(int i = 0; i < 2352; i += 2)
             {
-                ErrorNumber errno = ReadSectorLong(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
+                buffer[i + 1] = sector[i];
+                buffer[i]     = sector[i + 1];
             }
+        else
+            Array.Copy(sector, sectorOffset, buffer, 0, sectorSize);
 
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            switch(tag)
+        if(track.Type == TrackType.Audio && _swapAudio)
+            for(int i = 0; i < 2352; i += 2)
             {
-                case MediaTagType.ATA_IDENTIFY:
-                    if(_imageInfo.ReadableMediaTags.Contains(MediaTagType.ATA_IDENTIFY))
-                        buffer = _identify?.Clone() as byte[];
+                buffer[i + 1] = sector[i];
+                buffer[i]     = sector[i + 1];
+            }
+        else
+            Array.Copy(sector, sectorOffset, buffer, 0, sectorSize);
 
-                    return buffer == null ? ErrorNumber.NoData : ErrorNumber.NoError;
-                case MediaTagType.PCMCIA_CIS:
-                    if(_imageInfo.ReadableMediaTags.Contains(MediaTagType.PCMCIA_CIS))
-                        buffer = _cis?.Clone() as byte[];
+        return ErrorNumber.NoError;
+    }
 
-                    return buffer == null ? ErrorNumber.NoData : ErrorNumber.NoError;
-                default: return ErrorNumber.NotSupported;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSectorTag(sectorAddress + i, tag, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_isHdd)
+            return ReadSector(sectorAddress, out buffer);
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        var track = new Track();
+
+        if(!_sectorCache.TryGetValue(sectorAddress, out byte[] sector))
+        {
+            track = GetTrack(sectorAddress);
+            uint sectorSize = (uint)track.RawBytesPerSector;
+
+            ulong hunkNo = sectorAddress              / _sectorsPerHunk;
+            ulong secOff = sectorAddress * sectorSize % (_sectorsPerHunk * sectorSize);
+
+            ErrorNumber errno = GetHunk(hunkNo, out byte[] hunk);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            sector = new byte[_imageInfo.SectorSize];
+            Array.Copy(hunk, (int)secOff, sector, 0, sector.Length);
+
+            if(_sectorCache.Count >= _maxSectorCache)
+                _sectorCache.Clear();
+
+            _sectorCache.Add(sectorAddress, sector);
+        }
+
+        buffer = new byte[track.RawBytesPerSector];
+
+        if(track.Type == TrackType.Audio && _swapAudio)
+            for(int i = 0; i < 2352; i += 2)
+            {
+                buffer[i + 1] = sector[i];
+                buffer[i]     = sector[i + 1];
+            }
+        else
+            Array.Copy(sector, 0, buffer, 0, track.RawBytesPerSector);
+
+        switch(track.Type)
+        {
+            case TrackType.CdMode1 when track.RawBytesPerSector == 2048:
+            {
+                byte[] fullSector = new byte[2352];
+
+                Array.Copy(buffer, 0, fullSector, 16, 2048);
+                _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)sectorAddress);
+                _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
+
+                buffer = fullSector;
+
+                break;
+            }
+            case TrackType.CdMode2Form1 when track.RawBytesPerSector == 2048:
+            {
+                byte[] fullSector = new byte[2352];
+
+                Array.Copy(buffer, 0, fullSector, 24, 2048);
+                _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form1, (long)sectorAddress);
+                _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form1);
+
+                buffer = fullSector;
+
+                break;
+            }
+            case TrackType.CdMode2Form1 when track.RawBytesPerSector == 2324:
+            {
+                byte[] fullSector = new byte[2352];
+
+                Array.Copy(buffer, 0, fullSector, 24, 2324);
+                _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form2, (long)sectorAddress);
+                _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form2);
+
+                buffer = fullSector;
+
+                break;
+            }
+            case TrackType.CdMode2Formless when track.RawBytesPerSector == 2336:
+            {
+                byte[] fullSector = new byte[2352];
+
+                _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Formless, (long)sectorAddress);
+                Array.Copy(buffer, 0, fullSector, 16, 2336);
+
+                buffer = fullSector;
+
+                break;
             }
         }
 
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(Session session) => _isHdd ? null : GetSessionTracks(session.Sequence);
+        return ErrorNumber.NoError;
+    }
 
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session) =>
-            _isHdd ? null : _tracks.Values.Where(track => track.Session == session).ToList();
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer)
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSectorLong(sectorAddress + i, out byte[] sector);
 
-            return _isHdd ? ErrorNumber.NotSupported : ReadSector(GetAbsoluteSector(sectorAddress, track), out buffer);
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer)
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        switch(tag)
         {
-            buffer = null;
+            case MediaTagType.ATA_IDENTIFY:
+                if(_imageInfo.ReadableMediaTags.Contains(MediaTagType.ATA_IDENTIFY))
+                    buffer = _identify?.Clone() as byte[];
 
-            return _isHdd ? ErrorNumber.NotSupported
-                       : ReadSectorTag(GetAbsoluteSector(sectorAddress, track), tag, out buffer);
-        }
+                return buffer == null ? ErrorNumber.NoData : ErrorNumber.NoError;
+            case MediaTagType.PCMCIA_CIS:
+                if(_imageInfo.ReadableMediaTags.Contains(MediaTagType.PCMCIA_CIS))
+                    buffer = _cis?.Clone() as byte[];
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            return _isHdd ? ErrorNumber.NotSupported
-                       : ReadSectors(GetAbsoluteSector(sectorAddress, track), length, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
-        {
-            buffer = null;
-
-            return _isHdd ? ErrorNumber.NotSupported
-                       : ReadSectorsTag(GetAbsoluteSector(sectorAddress, track), length, tag, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            return _isHdd ? ErrorNumber.NotSupported
-                       : ReadSectorLong(GetAbsoluteSector(sectorAddress, track), out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            return _isHdd ? ErrorNumber.NotSupported
-                       : ReadSectorLong(GetAbsoluteSector(sectorAddress, track), length, out buffer);
+                return buffer == null ? ErrorNumber.NoData : ErrorNumber.NoError;
+            default: return ErrorNumber.NotSupported;
         }
     }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(Session session) => _isHdd ? null : GetSessionTracks(session.Sequence);
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session) =>
+        _isHdd ? null : _tracks.Values.Where(track => track.Session == session).ToList();
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        return _isHdd ? ErrorNumber.NotSupported : ReadSector(GetAbsoluteSector(sectorAddress, track), out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        return _isHdd ? ErrorNumber.NotSupported
+                   : ReadSectorTag(GetAbsoluteSector(sectorAddress, track), tag, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        return _isHdd ? ErrorNumber.NotSupported
+                   : ReadSectors(GetAbsoluteSector(sectorAddress, track), length, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        return _isHdd ? ErrorNumber.NotSupported
+                   : ReadSectorsTag(GetAbsoluteSector(sectorAddress, track), length, tag, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        return _isHdd ? ErrorNumber.NotSupported
+                   : ReadSectorLong(GetAbsoluteSector(sectorAddress, track), out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        return _isHdd ? ErrorNumber.NotSupported
+                   : ReadSectorLong(GetAbsoluteSector(sectorAddress, track), length, out buffer);
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Structs.cs b/Aaru.Images/CHD/Structs.cs
index 1b96d3113..e5f1550c4 100644
--- a/Aaru.Images/CHD/Structs.cs
+++ b/Aaru.Images/CHD/Structs.cs
@@ -33,259 +33,258 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class Chd
 {
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class Chd
+    // Hunks are represented in a 64 bit integer with 44 bit as offset, 20 bits as length
+    // Sectors are fixed at 512 bytes/sector
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HeaderV1
     {
-        // Hunks are represented in a 64 bit integer with 44 bit as offset, 20 bits as length
-        // Sectors are fixed at 512 bytes/sector
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HeaderV1
-        {
-            /// <summary>Magic identifier, 'MComprHD'</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] tag;
-            /// <summary>Length of header</summary>
-            public readonly uint length;
-            /// <summary>Image format version</summary>
-            public readonly uint version;
-            /// <summary>Image flags, <see cref="Flags" /></summary>
-            public readonly uint flags;
-            /// <summary>Compression algorithm, <see cref="Compression" /></summary>
-            public readonly uint compression;
-            /// <summary>Sectors per hunk</summary>
-            public readonly uint hunksize;
-            /// <summary>Total # of hunk in image</summary>
-            public readonly uint totalhunks;
-            /// <summary>Cylinders on disk</summary>
-            public readonly uint cylinders;
-            /// <summary>Heads per cylinder</summary>
-            public readonly uint heads;
-            /// <summary>Sectors per track</summary>
-            public readonly uint sectors;
-            /// <summary>MD5 of raw data</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] md5;
-            /// <summary>MD5 of parent file</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] parentmd5;
-        }
+        /// <summary>Magic identifier, 'MComprHD'</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] tag;
+        /// <summary>Length of header</summary>
+        public readonly uint length;
+        /// <summary>Image format version</summary>
+        public readonly uint version;
+        /// <summary>Image flags, <see cref="Flags" /></summary>
+        public readonly uint flags;
+        /// <summary>Compression algorithm, <see cref="Compression" /></summary>
+        public readonly uint compression;
+        /// <summary>Sectors per hunk</summary>
+        public readonly uint hunksize;
+        /// <summary>Total # of hunk in image</summary>
+        public readonly uint totalhunks;
+        /// <summary>Cylinders on disk</summary>
+        public readonly uint cylinders;
+        /// <summary>Heads per cylinder</summary>
+        public readonly uint heads;
+        /// <summary>Sectors per track</summary>
+        public readonly uint sectors;
+        /// <summary>MD5 of raw data</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] md5;
+        /// <summary>MD5 of parent file</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] parentmd5;
+    }
 
-        // Hunks are represented in a 64 bit integer with 44 bit as offset, 20 bits as length
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HeaderV2
-        {
-            /// <summary>Magic identifier, 'MComprHD'</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] tag;
-            /// <summary>Length of header</summary>
-            public readonly uint length;
-            /// <summary>Image format version</summary>
-            public readonly uint version;
-            /// <summary>Image flags, <see cref="Flags" /></summary>
-            public readonly uint flags;
-            /// <summary>Compression algorithm, <see cref="Compression" /></summary>
-            public readonly uint compression;
-            /// <summary>Sectors per hunk</summary>
-            public readonly uint hunksize;
-            /// <summary>Total # of hunk in image</summary>
-            public readonly uint totalhunks;
-            /// <summary>Cylinders on disk</summary>
-            public readonly uint cylinders;
-            /// <summary>Heads per cylinder</summary>
-            public readonly uint heads;
-            /// <summary>Sectors per track</summary>
-            public readonly uint sectors;
-            /// <summary>MD5 of raw data</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] md5;
-            /// <summary>MD5 of parent file</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] parentmd5;
-            /// <summary>Bytes per sector</summary>
-            public readonly uint seclen;
-        }
+    // Hunks are represented in a 64 bit integer with 44 bit as offset, 20 bits as length
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HeaderV2
+    {
+        /// <summary>Magic identifier, 'MComprHD'</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] tag;
+        /// <summary>Length of header</summary>
+        public readonly uint length;
+        /// <summary>Image format version</summary>
+        public readonly uint version;
+        /// <summary>Image flags, <see cref="Flags" /></summary>
+        public readonly uint flags;
+        /// <summary>Compression algorithm, <see cref="Compression" /></summary>
+        public readonly uint compression;
+        /// <summary>Sectors per hunk</summary>
+        public readonly uint hunksize;
+        /// <summary>Total # of hunk in image</summary>
+        public readonly uint totalhunks;
+        /// <summary>Cylinders on disk</summary>
+        public readonly uint cylinders;
+        /// <summary>Heads per cylinder</summary>
+        public readonly uint heads;
+        /// <summary>Sectors per track</summary>
+        public readonly uint sectors;
+        /// <summary>MD5 of raw data</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] md5;
+        /// <summary>MD5 of parent file</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] parentmd5;
+        /// <summary>Bytes per sector</summary>
+        public readonly uint seclen;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HeaderV3
-        {
-            /// <summary>Magic identifier, 'MComprHD'</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] tag;
-            /// <summary>Length of header</summary>
-            public readonly uint length;
-            /// <summary>Image format version</summary>
-            public readonly uint version;
-            /// <summary>Image flags, <see cref="Flags" /></summary>
-            public readonly uint flags;
-            /// <summary>Compression algorithm, <see cref="Compression" /></summary>
-            public readonly uint compression;
-            /// <summary>Total # of hunk in image</summary>
-            public readonly uint totalhunks;
-            /// <summary>Total bytes in image</summary>
-            public readonly ulong logicalbytes;
-            /// <summary>Offset to first metadata blob</summary>
-            public readonly ulong metaoffset;
-            /// <summary>MD5 of raw data</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] md5;
-            /// <summary>MD5 of parent file</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] parentmd5;
-            /// <summary>Bytes per hunk</summary>
-            public readonly uint hunkbytes;
-            /// <summary>SHA1 of raw data</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] sha1;
-            /// <summary>SHA1 of parent file</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] parentsha1;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HeaderV3
+    {
+        /// <summary>Magic identifier, 'MComprHD'</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] tag;
+        /// <summary>Length of header</summary>
+        public readonly uint length;
+        /// <summary>Image format version</summary>
+        public readonly uint version;
+        /// <summary>Image flags, <see cref="Flags" /></summary>
+        public readonly uint flags;
+        /// <summary>Compression algorithm, <see cref="Compression" /></summary>
+        public readonly uint compression;
+        /// <summary>Total # of hunk in image</summary>
+        public readonly uint totalhunks;
+        /// <summary>Total bytes in image</summary>
+        public readonly ulong logicalbytes;
+        /// <summary>Offset to first metadata blob</summary>
+        public readonly ulong metaoffset;
+        /// <summary>MD5 of raw data</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] md5;
+        /// <summary>MD5 of parent file</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] parentmd5;
+        /// <summary>Bytes per hunk</summary>
+        public readonly uint hunkbytes;
+        /// <summary>SHA1 of raw data</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] sha1;
+        /// <summary>SHA1 of parent file</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] parentsha1;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MapEntryV3
-        {
-            /// <summary>Offset to hunk from start of image</summary>
-            public readonly ulong offset;
-            /// <summary>CRC32 of uncompressed hunk</summary>
-            public readonly uint crc;
-            /// <summary>Lower 16 bits of length</summary>
-            public readonly ushort lengthLsb;
-            /// <summary>Upper 8 bits of length</summary>
-            public readonly byte length;
-            /// <summary>Hunk flags</summary>
-            public readonly byte flags;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MapEntryV3
+    {
+        /// <summary>Offset to hunk from start of image</summary>
+        public readonly ulong offset;
+        /// <summary>CRC32 of uncompressed hunk</summary>
+        public readonly uint crc;
+        /// <summary>Lower 16 bits of length</summary>
+        public readonly ushort lengthLsb;
+        /// <summary>Upper 8 bits of length</summary>
+        public readonly byte length;
+        /// <summary>Hunk flags</summary>
+        public readonly byte flags;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct TrackOld
-        {
-            public uint type;
-            public uint subType;
-            public uint dataSize;
-            public uint subSize;
-            public uint frames;
-            public uint extraFrames;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct TrackOld
+    {
+        public uint type;
+        public uint subType;
+        public uint dataSize;
+        public uint subSize;
+        public uint frames;
+        public uint extraFrames;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HeaderV4
-        {
-            /// <summary>Magic identifier, 'MComprHD'</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] tag;
-            /// <summary>Length of header</summary>
-            public readonly uint length;
-            /// <summary>Image format version</summary>
-            public readonly uint version;
-            /// <summary>Image flags, <see cref="Flags" /></summary>
-            public readonly uint flags;
-            /// <summary>Compression algorithm, <see cref="Compression" /></summary>
-            public readonly uint compression;
-            /// <summary>Total # of hunk in image</summary>
-            public readonly uint totalhunks;
-            /// <summary>Total bytes in image</summary>
-            public readonly ulong logicalbytes;
-            /// <summary>Offset to first metadata blob</summary>
-            public readonly ulong metaoffset;
-            /// <summary>Bytes per hunk</summary>
-            public readonly uint hunkbytes;
-            /// <summary>SHA1 of raw+meta data</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] sha1;
-            /// <summary>SHA1 of parent file</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] parentsha1;
-            /// <summary>SHA1 of raw data</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] rawsha1;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HeaderV4
+    {
+        /// <summary>Magic identifier, 'MComprHD'</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] tag;
+        /// <summary>Length of header</summary>
+        public readonly uint length;
+        /// <summary>Image format version</summary>
+        public readonly uint version;
+        /// <summary>Image flags, <see cref="Flags" /></summary>
+        public readonly uint flags;
+        /// <summary>Compression algorithm, <see cref="Compression" /></summary>
+        public readonly uint compression;
+        /// <summary>Total # of hunk in image</summary>
+        public readonly uint totalhunks;
+        /// <summary>Total bytes in image</summary>
+        public readonly ulong logicalbytes;
+        /// <summary>Offset to first metadata blob</summary>
+        public readonly ulong metaoffset;
+        /// <summary>Bytes per hunk</summary>
+        public readonly uint hunkbytes;
+        /// <summary>SHA1 of raw+meta data</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] sha1;
+        /// <summary>SHA1 of parent file</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] parentsha1;
+        /// <summary>SHA1 of raw data</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] rawsha1;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HeaderV5
-        {
-            /// <summary>Magic identifier, 'MComprHD'</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] tag;
-            /// <summary>Length of header</summary>
-            public readonly uint length;
-            /// <summary>Image format version</summary>
-            public readonly uint version;
-            /// <summary>Compressor 0</summary>
-            public readonly uint compressor0;
-            /// <summary>Compressor 1</summary>
-            public readonly uint compressor1;
-            /// <summary>Compressor 2</summary>
-            public readonly uint compressor2;
-            /// <summary>Compressor 3</summary>
-            public readonly uint compressor3;
-            /// <summary>Total bytes in image</summary>
-            public readonly ulong logicalbytes;
-            /// <summary>Offset to hunk map</summary>
-            public readonly ulong mapoffset;
-            /// <summary>Offset to first metadata blob</summary>
-            public readonly ulong metaoffset;
-            /// <summary>Bytes per hunk</summary>
-            public readonly uint hunkbytes;
-            /// <summary>Bytes per unit within hunk</summary>
-            public readonly uint unitbytes;
-            /// <summary>SHA1 of raw data</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] rawsha1;
-            /// <summary>SHA1 of raw+meta data</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] sha1;
-            /// <summary>SHA1 of parent file</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
-            public readonly byte[] parentsha1;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HeaderV5
+    {
+        /// <summary>Magic identifier, 'MComprHD'</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] tag;
+        /// <summary>Length of header</summary>
+        public readonly uint length;
+        /// <summary>Image format version</summary>
+        public readonly uint version;
+        /// <summary>Compressor 0</summary>
+        public readonly uint compressor0;
+        /// <summary>Compressor 1</summary>
+        public readonly uint compressor1;
+        /// <summary>Compressor 2</summary>
+        public readonly uint compressor2;
+        /// <summary>Compressor 3</summary>
+        public readonly uint compressor3;
+        /// <summary>Total bytes in image</summary>
+        public readonly ulong logicalbytes;
+        /// <summary>Offset to hunk map</summary>
+        public readonly ulong mapoffset;
+        /// <summary>Offset to first metadata blob</summary>
+        public readonly ulong metaoffset;
+        /// <summary>Bytes per hunk</summary>
+        public readonly uint hunkbytes;
+        /// <summary>Bytes per unit within hunk</summary>
+        public readonly uint unitbytes;
+        /// <summary>SHA1 of raw data</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] rawsha1;
+        /// <summary>SHA1 of raw+meta data</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] sha1;
+        /// <summary>SHA1 of parent file</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20)]
+        public readonly byte[] parentsha1;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct CompressedMapHeaderV5
-        {
-            /// <summary>Length of compressed map</summary>
-            public readonly uint length;
-            /// <summary>Offset of first block (48 bits) and CRC16 of map (16 bits)</summary>
-            public readonly ulong startAndCrc;
-            /// <summary>Bits used to encode compressed length on map entry</summary>
-            public readonly byte bitsUsedToEncodeCompLength;
-            /// <summary>Bits used to encode self-refs</summary>
-            public readonly byte bitsUsedToEncodeSelfRefs;
-            /// <summary>Bits used to encode parent unit refs</summary>
-            public readonly byte bitsUsedToEncodeParentUnits;
-            public readonly byte reserved;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct CompressedMapHeaderV5
+    {
+        /// <summary>Length of compressed map</summary>
+        public readonly uint length;
+        /// <summary>Offset of first block (48 bits) and CRC16 of map (16 bits)</summary>
+        public readonly ulong startAndCrc;
+        /// <summary>Bits used to encode compressed length on map entry</summary>
+        public readonly byte bitsUsedToEncodeCompLength;
+        /// <summary>Bits used to encode self-refs</summary>
+        public readonly byte bitsUsedToEncodeSelfRefs;
+        /// <summary>Bits used to encode parent unit refs</summary>
+        public readonly byte bitsUsedToEncodeParentUnits;
+        public readonly byte reserved;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MapEntryV5
-        {
-            /// <summary>Compression (8 bits) and length (24 bits)</summary>
-            public readonly uint compAndLength;
-            /// <summary>Offset (48 bits) and CRC (16 bits)</summary>
-            public readonly ulong offsetAndCrc;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MapEntryV5
+    {
+        /// <summary>Compression (8 bits) and length (24 bits)</summary>
+        public readonly uint compAndLength;
+        /// <summary>Offset (48 bits) and CRC (16 bits)</summary>
+        public readonly ulong offsetAndCrc;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MetadataHeader
-        {
-            public readonly uint  tag;
-            public readonly uint  flagsAndLength;
-            public readonly ulong next;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MetadataHeader
+    {
+        public readonly uint  tag;
+        public readonly uint  flagsAndLength;
+        public readonly ulong next;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HunkSector
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly ulong[] hunkEntry;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HunkSector
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly ulong[] hunkEntry;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct HunkSectorSmall
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public readonly uint[] hunkEntry;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct HunkSectorSmall
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public readonly uint[] hunkEntry;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CHD/Verify.cs b/Aaru.Images/CHD/Verify.cs
index 1fabbe14c..ec0ed0594 100644
--- a/Aaru.Images/CHD/Verify.cs
+++ b/Aaru.Images/CHD/Verify.cs
@@ -36,144 +36,143 @@ using System.Linq;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Chd
 {
-    public sealed partial class Chd
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
     {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        if(_isHdd)
+            return null;
+
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        unknownLbas = new List<ulong>();
+        failingLbas = new List<ulong>();
+
+        if(_isHdd)
+            return null;
+
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            if(_isHdd)
-                return null;
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+            switch(sectorStatus)
+            {
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
+
+                    break;
+            }
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        unknownLbas = new List<ulong>();
+        failingLbas = new List<ulong>();
+
+        if(_isHdd)
+            return null;
+
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            unknownLbas = new List<ulong>();
-            failingLbas = new List<ulong>();
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            if(_isHdd)
-                return null;
-
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifyMediaImage()
+    {
+        byte[] calculated;
+
+        if(_mapVersion >= 3)
         {
-            unknownLbas = new List<ulong>();
-            failingLbas = new List<ulong>();
+            var sha1Ctx = new Sha1Context();
 
-            if(_isHdd)
-                return null;
-
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            for(uint i = 0; i < _totalHunks; i++)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                ErrorNumber errno = GetHunk(i, out byte[] buffer);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                if(errno != ErrorNumber.NoError)
+                    return null;
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                sha1Ctx.Update(buffer);
             }
 
-            if(unknownLbas.Count > 0)
-                return null;
+            calculated = sha1Ctx.Final();
+        }
+        else
+        {
+            var md5Ctx = new Md5Context();
 
-            return failingLbas.Count <= 0;
+            for(uint i = 0; i < _totalHunks; i++)
+            {
+                ErrorNumber errno = GetHunk(i, out byte[] buffer);
+
+                if(errno != ErrorNumber.NoError)
+                    return null;
+
+                md5Ctx.Update(buffer);
+            }
+
+            calculated = md5Ctx.Final();
         }
 
-        /// <inheritdoc />
-        public bool? VerifyMediaImage()
-        {
-            byte[] calculated;
-
-            if(_mapVersion >= 3)
-            {
-                var sha1Ctx = new Sha1Context();
-
-                for(uint i = 0; i < _totalHunks; i++)
-                {
-                    ErrorNumber errno = GetHunk(i, out byte[] buffer);
-
-                    if(errno != ErrorNumber.NoError)
-                        return null;
-
-                    sha1Ctx.Update(buffer);
-                }
-
-                calculated = sha1Ctx.Final();
-            }
-            else
-            {
-                var md5Ctx = new Md5Context();
-
-                for(uint i = 0; i < _totalHunks; i++)
-                {
-                    ErrorNumber errno = GetHunk(i, out byte[] buffer);
-
-                    if(errno != ErrorNumber.NoError)
-                        return null;
-
-                    md5Ctx.Update(buffer);
-                }
-
-                calculated = md5Ctx.Final();
-            }
-
-            return _expectedChecksum.SequenceEqual(calculated);
-        }
+        return _expectedChecksum.SequenceEqual(calculated);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CPCDSK/CPCDSK.cs b/Aaru.Images/CPCDSK/CPCDSK.cs
index b0b94c1d8..79c00d55b 100644
--- a/Aaru.Images/CPCDSK/CPCDSK.cs
+++ b/Aaru.Images/CPCDSK/CPCDSK.cs
@@ -35,39 +35,38 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading CPCDSK disk images</summary>
-    public sealed partial class Cpcdsk : IMediaImage
-    {
-        Dictionary<ulong, byte[]> _addressMarks;
-        bool                      _extended;
-        ImageInfo                 _imageInfo;
-        Dictionary<ulong, byte[]> _sectors;
+namespace Aaru.DiscImages;
 
-        public Cpcdsk() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading CPCDSK disk images</summary>
+public sealed partial class Cpcdsk : IMediaImage
+{
+    Dictionary<ulong, byte[]> _addressMarks;
+    bool                      _extended;
+    ImageInfo                 _imageInfo;
+    Dictionary<ulong, byte[]> _sectors;
+
+    public Cpcdsk() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/CPCDSK/Constants.cs b/Aaru.Images/CPCDSK/Constants.cs
index 467839c4c..92e0265fe 100644
--- a/Aaru.Images/CPCDSK/Constants.cs
+++ b/Aaru.Images/CPCDSK/Constants.cs
@@ -30,20 +30,19 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cpcdsk
 {
-    public sealed partial class Cpcdsk
-    {
-        /// <summary>Identifier for CPCEMU disk images, "MV - CPC" + usually : "EMU Disk-File\r\nDisk-Info\r\n" but not required</summary>
-        const string CPCDSK_ID = "MV - CPCEMU Disk-File";
+    /// <summary>Identifier for CPCEMU disk images, "MV - CPC" + usually : "EMU Disk-File\r\nDisk-Info\r\n" but not required</summary>
+    const string CPCDSK_ID = "MV - CPCEMU Disk-File";
 
-        /// <summary>Identifier for DU54 disk images, "MV - CPC format Disk Image (DU54)"</summary>
-        const string DU54_ID = "MV - CPC format Disk Image (DU54)";
+    /// <summary>Identifier for DU54 disk images, "MV - CPC format Disk Image (DU54)"</summary>
+    const string DU54_ID = "MV - CPC format Disk Image (DU54)";
 
-        /// <summary>Identifier for Extended CPCEMU disk images</summary>
-        const string EDSK_ID = "EXTENDED CPC DSK File";
+    /// <summary>Identifier for Extended CPCEMU disk images</summary>
+    const string EDSK_ID = "EXTENDED CPC DSK File";
 
-        /// <summary>Identifier for track information, </summary>
-        const string TRACK_ID = "Track-Info";
-    }
+    /// <summary>Identifier for track information, </summary>
+    const string TRACK_ID = "Track-Info";
 }
\ No newline at end of file
diff --git a/Aaru.Images/CPCDSK/Helpers.cs b/Aaru.Images/CPCDSK/Helpers.cs
index b5dc4b416..e218ce82a 100644
--- a/Aaru.Images/CPCDSK/Helpers.cs
+++ b/Aaru.Images/CPCDSK/Helpers.cs
@@ -32,24 +32,23 @@
 
 using Aaru.Decoders.Floppy;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cpcdsk
 {
-    public sealed partial class Cpcdsk
+    static int SizeCodeToBytes(IBMSectorSizeCode code)
     {
-        static int SizeCodeToBytes(IBMSectorSizeCode code)
+        switch(code)
         {
-            switch(code)
-            {
-                case IBMSectorSizeCode.EighthKilo:       return 128;
-                case IBMSectorSizeCode.QuarterKilo:      return 256;
-                case IBMSectorSizeCode.HalfKilo:         return 512;
-                case IBMSectorSizeCode.Kilo:             return 1024;
-                case IBMSectorSizeCode.TwiceKilo:        return 2048;
-                case IBMSectorSizeCode.FriceKilo:        return 4096;
-                case IBMSectorSizeCode.TwiceFriceKilo:   return 8192;
-                case IBMSectorSizeCode.FricelyFriceKilo: return 16384;
-                default:                                 return 0;
-            }
+            case IBMSectorSizeCode.EighthKilo:       return 128;
+            case IBMSectorSizeCode.QuarterKilo:      return 256;
+            case IBMSectorSizeCode.HalfKilo:         return 512;
+            case IBMSectorSizeCode.Kilo:             return 1024;
+            case IBMSectorSizeCode.TwiceKilo:        return 2048;
+            case IBMSectorSizeCode.FriceKilo:        return 4096;
+            case IBMSectorSizeCode.TwiceFriceKilo:   return 8192;
+            case IBMSectorSizeCode.FricelyFriceKilo: return 16384;
+            default:                                 return 0;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CPCDSK/Identify.cs b/Aaru.Images/CPCDSK/Identify.cs
index 87881455c..dc9c1df8a 100644
--- a/Aaru.Images/CPCDSK/Identify.cs
+++ b/Aaru.Images/CPCDSK/Identify.cs
@@ -36,41 +36,40 @@ using System.Text;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cpcdsk
 {
-    public sealed partial class Cpcdsk
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 512)
+            return false;
+
+        byte[] headerB = new byte[256];
+        stream.Read(headerB, 0, 256);
+
+        int pos;
+
+        for(pos = 0; pos < 254; pos++)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
-
-            if(stream.Length < 512)
-                return false;
-
-            byte[] headerB = new byte[256];
-            stream.Read(headerB, 0, 256);
-
-            int pos;
-
-            for(pos = 0; pos < 254; pos++)
-            {
-                if(headerB[pos]     == 0x0D &&
-                   headerB[pos + 1] == 0x0A)
-                    break;
-            }
-
-            if(pos >= 254)
-                return false;
-
-            string magic = Encoding.ASCII.GetString(headerB, 0, pos);
-
-            AaruConsole.DebugWriteLine("CPCDSK plugin", "magic = \"{0}\"", magic);
-
-            return string.Compare(CPCDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) == 0 ||
-                   string.Compare(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase)   == 0 ||
-                   string.Compare(DU54_ID, magic, StringComparison.InvariantCultureIgnoreCase)   == 0;
+            if(headerB[pos]     == 0x0D &&
+               headerB[pos + 1] == 0x0A)
+                break;
         }
+
+        if(pos >= 254)
+            return false;
+
+        string magic = Encoding.ASCII.GetString(headerB, 0, pos);
+
+        AaruConsole.DebugWriteLine("CPCDSK plugin", "magic = \"{0}\"", magic);
+
+        return string.Compare(CPCDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) == 0 ||
+               string.Compare(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase)   == 0 ||
+               string.Compare(DU54_ID, magic, StringComparison.InvariantCultureIgnoreCase)   == 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CPCDSK/Properties.cs b/Aaru.Images/CPCDSK/Properties.cs
index 43a644fa9..6ee901312 100644
--- a/Aaru.Images/CPCDSK/Properties.cs
+++ b/Aaru.Images/CPCDSK/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cpcdsk
 {
-    public sealed partial class Cpcdsk
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "CPCEMU Disk-File and Extended CPC Disk-File";
-        /// <inheritdoc />
-        public Guid Id => new Guid("724B16CC-ADB9-492E-BA07-CAEEC1012B16");
-        /// <inheritdoc />
-        public string Format => _extended ? "CPCEMU Extended disk image" : "CPCEMU disk image";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "CPCEMU Disk-File and Extended CPC Disk-File";
+    /// <inheritdoc />
+    public Guid Id => new Guid("724B16CC-ADB9-492E-BA07-CAEEC1012B16");
+    /// <inheritdoc />
+    public string Format => _extended ? "CPCEMU Extended disk image" : "CPCEMU disk image";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/CPCDSK/Read.cs b/Aaru.Images/CPCDSK/Read.cs
index 538d451fb..8ae6bf690 100644
--- a/Aaru.Images/CPCDSK/Read.cs
+++ b/Aaru.Images/CPCDSK/Read.cs
@@ -43,323 +43,322 @@ using Aaru.Console;
 using Aaru.Decoders.Floppy;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cpcdsk
 {
-    public sealed partial class Cpcdsk
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 512)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] headerB = new byte[256];
+        stream.Read(headerB, 0, 256);
+
+        int pos;
+
+        for(pos = 0; pos < 254; pos++)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            if(headerB[pos]     == 0x0D &&
+               headerB[pos + 1] == 0x0A)
+                break;
+        }
 
-            if(stream.Length < 512)
-                return ErrorNumber.InvalidArgument;
+        if(pos >= 254)
+            return ErrorNumber.InvalidArgument;
 
-            byte[] headerB = new byte[256];
-            stream.Read(headerB, 0, 256);
+        string magic = Encoding.ASCII.GetString(headerB, 0, pos);
 
-            int pos;
+        stream.Position = pos + 2;
+        stream.Read(headerB, 0, 256);
 
-            for(pos = 0; pos < 254; pos++)
-            {
-                if(headerB[pos]     == 0x0D &&
-                   headerB[pos + 1] == 0x0A)
-                    break;
-            }
+        DiskInfo header = Marshal.ByteArrayToStructureLittleEndian<DiskInfo>(headerB);
 
-            if(pos >= 254)
-                return ErrorNumber.InvalidArgument;
+        if(string.Compare(CPCDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) != 0 &&
+           string.Compare(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase)   != 0 &&
+           string.Compare(DU54_ID, magic, StringComparison.InvariantCultureIgnoreCase)   != 0)
+            return ErrorNumber.InvalidArgument;
 
-            string magic = Encoding.ASCII.GetString(headerB, 0, pos);
+        _extended = string.Compare(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) == 0;
+        AaruConsole.DebugWriteLine("CPCDSK plugin", "Extended = {0}", _extended);
 
-            stream.Position = pos + 2;
-            stream.Read(headerB, 0, 256);
+        AaruConsole.DebugWriteLine("CPCDSK plugin", "magic = \"{0}\"", magic);
 
-            DiskInfo header = Marshal.ByteArrayToStructureLittleEndian<DiskInfo>(headerB);
+        AaruConsole.DebugWriteLine("CPCDSK plugin", "header.magic = \"{0}\"",
+                                   StringHandlers.CToString(header.magic));
 
-            if(string.Compare(CPCDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) != 0 &&
-               string.Compare(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase)   != 0 &&
-               string.Compare(DU54_ID, magic, StringComparison.InvariantCultureIgnoreCase)   != 0)
-                return ErrorNumber.InvalidArgument;
+        AaruConsole.DebugWriteLine("CPCDSK plugin", "header.creator = \"{0}\"",
+                                   StringHandlers.CToString(header.creator));
 
-            _extended = string.Compare(EDSK_ID, magic, StringComparison.InvariantCultureIgnoreCase) == 0;
-            AaruConsole.DebugWriteLine("CPCDSK plugin", "Extended = {0}", _extended);
-
-            AaruConsole.DebugWriteLine("CPCDSK plugin", "magic = \"{0}\"", magic);
-
-            AaruConsole.DebugWriteLine("CPCDSK plugin", "header.magic = \"{0}\"",
-                                       StringHandlers.CToString(header.magic));
-
-            AaruConsole.DebugWriteLine("CPCDSK plugin", "header.creator = \"{0}\"",
-                                       StringHandlers.CToString(header.creator));
-
-            AaruConsole.DebugWriteLine("CPCDSK plugin", "header.tracks = {0}", header.tracks);
-            AaruConsole.DebugWriteLine("CPCDSK plugin", "header.sides = {0}", header.sides);
-
-            if(!_extended)
-                AaruConsole.DebugWriteLine("CPCDSK plugin", "header.tracksize = {0}", header.tracksize);
-            else
-                for(int i = 0; i < header.tracks; i++)
-                {
-                    for(int j = 0; j < header.sides; j++)
-                        AaruConsole.DebugWriteLine("CPCDSK plugin", "Track {0} Side {1} size = {2}", i, j,
-                                                   header.tracksizeTable[(i * header.sides) + j] * 256);
-                }
-
-            ulong currentSector = 0;
-            _sectors      = new Dictionary<ulong, byte[]>();
-            _addressMarks = new Dictionary<ulong, byte[]>();
-            ulong readtracks        = 0;
-            bool  allTracksSameSize = true;
-            ulong sectorsPerTrack   = 0;
-
-            // Seek to first track descriptor
-            stream.Seek(256, SeekOrigin.Begin);
+        AaruConsole.DebugWriteLine("CPCDSK plugin", "header.tracks = {0}", header.tracks);
+        AaruConsole.DebugWriteLine("CPCDSK plugin", "header.sides = {0}", header.sides);
 
+        if(!_extended)
+            AaruConsole.DebugWriteLine("CPCDSK plugin", "header.tracksize = {0}", header.tracksize);
+        else
             for(int i = 0; i < header.tracks; i++)
             {
                 for(int j = 0; j < header.sides; j++)
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "Track {0} Side {1} size = {2}", i, j,
+                                               header.tracksizeTable[(i * header.sides) + j] * 256);
+            }
+
+        ulong currentSector = 0;
+        _sectors      = new Dictionary<ulong, byte[]>();
+        _addressMarks = new Dictionary<ulong, byte[]>();
+        ulong readtracks        = 0;
+        bool  allTracksSameSize = true;
+        ulong sectorsPerTrack   = 0;
+
+        // Seek to first track descriptor
+        stream.Seek(256, SeekOrigin.Begin);
+
+        for(int i = 0; i < header.tracks; i++)
+        {
+            for(int j = 0; j < header.sides; j++)
+            {
+                // Track not stored in image
+                if(_extended && header.tracksizeTable[(i * header.sides) + j] == 0)
+                    continue;
+
+                long trackPos = stream.Position;
+
+                byte[] trackB = new byte[256];
+                stream.Read(trackB, 0, 256);
+                TrackInfo trackInfo = Marshal.ByteArrayToStructureLittleEndian<TrackInfo>(trackB);
+
+                if(string.Compare(TRACK_ID, Encoding.ASCII.GetString(trackInfo.magic),
+                                  StringComparison.InvariantCultureIgnoreCase) != 0)
                 {
-                    // Track not stored in image
-                    if(_extended && header.tracksizeTable[(i * header.sides) + j] == 0)
-                        continue;
+                    AaruConsole.ErrorWriteLine("Not the expected track info.");
 
-                    long trackPos = stream.Position;
-
-                    byte[] trackB = new byte[256];
-                    stream.Read(trackB, 0, 256);
-                    TrackInfo trackInfo = Marshal.ByteArrayToStructureLittleEndian<TrackInfo>(trackB);
-
-                    if(string.Compare(TRACK_ID, Encoding.ASCII.GetString(trackInfo.magic),
-                                      StringComparison.InvariantCultureIgnoreCase) != 0)
-                    {
-                        AaruConsole.ErrorWriteLine("Not the expected track info.");
-
-                        return ErrorNumber.InvalidArgument;
-                    }
-
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].magic = \"{0}\"",
-                                               StringHandlers.CToString(trackInfo.magic), i, j);
-
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].bps = {0}",
-                                               SizeCodeToBytes(trackInfo.bps), i, j);
-
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].dataRate = {0}", trackInfo.dataRate,
-                                               i, j);
-
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].filler = 0x{0:X2}",
-                                               trackInfo.filler, i, j);
-
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].gap3 = 0x{0:X2}", trackInfo.gap3, i,
-                                               j);
-
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].padding = {0}", trackInfo.padding,
-                                               i, j);
-
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].recordingMode = {0}",
-                                               trackInfo.recordingMode, i, j);
-
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sectors = {0}", trackInfo.sectors,
-                                               i, j);
-
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].side = {0}", trackInfo.side, i, j);
-
-                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].track = {0}", trackInfo.track, i,
-                                               j);
-
-                    if(trackInfo.sectors != sectorsPerTrack)
-                        if(sectorsPerTrack == 0)
-                            sectorsPerTrack = trackInfo.sectors;
-                        else
-                            allTracksSameSize = false;
-
-                    Dictionary<int, byte[]> thisTrackSectors      = new();
-                    Dictionary<int, byte[]> thisTrackAddressMarks = new();
-
-                    for(int k = 1; k <= trackInfo.sectors; k++)
-                    {
-                        AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].id = 0x{0:X2}",
-                                                   trackInfo.sectorsInfo[k - 1].id, i, j, k);
-
-                        AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].len = {0}",
-                                                   trackInfo.sectorsInfo[k - 1].len, i, j, k);
-
-                        AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].side = {0}",
-                                                   trackInfo.sectorsInfo[k - 1].side, i, j, k);
-
-                        AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].size = {0}",
-                                                   SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size), i, j, k);
-
-                        AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].st1 = 0x{0:X2}",
-                                                   trackInfo.sectorsInfo[k - 1].st1, i, j, k);
-
-                        AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].st2 = 0x{0:X2}",
-                                                   trackInfo.sectorsInfo[k - 1].st2, i, j, k);
-
-                        AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].track = {0}",
-                                                   trackInfo.sectorsInfo[k - 1].track, i, j, k);
-
-                        int sectLen = _extended ? trackInfo.sectorsInfo[k - 1].len
-                                          : SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size);
-
-                        byte[] sector = new byte[sectLen];
-                        stream.Read(sector, 0, sectLen);
-
-                        if(sectLen < SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size))
-                        {
-                            byte[] temp = new byte[SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size)];
-                            Array.Copy(sector, 0, temp, 0, sector.Length);
-                            sector = temp;
-                        }
-                        else if(sectLen > SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size))
-                        {
-                            byte[] temp = new byte[SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size)];
-                            Array.Copy(sector, 0, temp, 0, temp.Length);
-                            sector = temp;
-                        }
-
-                        thisTrackSectors[(trackInfo.sectorsInfo[k - 1].id & 0x3F) - 1] = sector;
-
-                        byte[] amForCrc = new byte[8];
-                        amForCrc[0] = 0xA1;
-                        amForCrc[1] = 0xA1;
-                        amForCrc[2] = 0xA1;
-                        amForCrc[3] = (byte)IBMIdType.AddressMark;
-                        amForCrc[4] = trackInfo.sectorsInfo[k - 1].track;
-                        amForCrc[5] = trackInfo.sectorsInfo[k - 1].side;
-                        amForCrc[6] = trackInfo.sectorsInfo[k - 1].id;
-                        amForCrc[7] = (byte)trackInfo.sectorsInfo[k - 1].size;
-
-                        CRC16IBMContext.Data(amForCrc, 8, out byte[] amCrc);
-
-                        byte[] addressMark = new byte[22];
-                        Array.Copy(amForCrc, 0, addressMark, 12, 8);
-                        Array.Copy(amCrc, 0, addressMark, 20, 2);
-
-                        thisTrackAddressMarks[(trackInfo.sectorsInfo[k - 1].id & 0x3F) - 1] = addressMark;
-                    }
-
-                    foreach(KeyValuePair<int, byte[]> s in thisTrackSectors.OrderBy(k => k.Key))
-                    {
-                        _sectors.Add(currentSector, s.Value);
-                        _addressMarks.Add(currentSector, s.Value);
-                        currentSector++;
-
-                        if(s.Value.Length > _imageInfo.SectorSize)
-                            _imageInfo.SectorSize = (uint)s.Value.Length;
-                    }
-
-                    stream.Seek(trackPos, SeekOrigin.Begin);
-
-                    if(_extended)
-                    {
-                        stream.Seek(header.tracksizeTable[(i * header.sides) + j] * 256, SeekOrigin.Current);
-                        _imageInfo.ImageSize += (ulong)(header.tracksizeTable[(i * header.sides) + j] * 256) - 256;
-                    }
-                    else
-                    {
-                        stream.Seek(header.tracksize, SeekOrigin.Current);
-                        _imageInfo.ImageSize += (ulong)header.tracksize - 256;
-                    }
-
-                    readtracks++;
+                    return ErrorNumber.InvalidArgument;
                 }
+
+                AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].magic = \"{0}\"",
+                                           StringHandlers.CToString(trackInfo.magic), i, j);
+
+                AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].bps = {0}",
+                                           SizeCodeToBytes(trackInfo.bps), i, j);
+
+                AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].dataRate = {0}", trackInfo.dataRate,
+                                           i, j);
+
+                AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].filler = 0x{0:X2}",
+                                           trackInfo.filler, i, j);
+
+                AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].gap3 = 0x{0:X2}", trackInfo.gap3, i,
+                                           j);
+
+                AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].padding = {0}", trackInfo.padding,
+                                           i, j);
+
+                AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].recordingMode = {0}",
+                                           trackInfo.recordingMode, i, j);
+
+                AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sectors = {0}", trackInfo.sectors,
+                                           i, j);
+
+                AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].side = {0}", trackInfo.side, i, j);
+
+                AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].track = {0}", trackInfo.track, i,
+                                           j);
+
+                if(trackInfo.sectors != sectorsPerTrack)
+                    if(sectorsPerTrack == 0)
+                        sectorsPerTrack = trackInfo.sectors;
+                    else
+                        allTracksSameSize = false;
+
+                Dictionary<int, byte[]> thisTrackSectors      = new();
+                Dictionary<int, byte[]> thisTrackAddressMarks = new();
+
+                for(int k = 1; k <= trackInfo.sectors; k++)
+                {
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].id = 0x{0:X2}",
+                                               trackInfo.sectorsInfo[k - 1].id, i, j, k);
+
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].len = {0}",
+                                               trackInfo.sectorsInfo[k - 1].len, i, j, k);
+
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].side = {0}",
+                                               trackInfo.sectorsInfo[k - 1].side, i, j, k);
+
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].size = {0}",
+                                               SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size), i, j, k);
+
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].st1 = 0x{0:X2}",
+                                               trackInfo.sectorsInfo[k - 1].st1, i, j, k);
+
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].st2 = 0x{0:X2}",
+                                               trackInfo.sectorsInfo[k - 1].st2, i, j, k);
+
+                    AaruConsole.DebugWriteLine("CPCDSK plugin", "trackInfo[{1}:{2}].sector[{3}].track = {0}",
+                                               trackInfo.sectorsInfo[k - 1].track, i, j, k);
+
+                    int sectLen = _extended ? trackInfo.sectorsInfo[k - 1].len
+                                      : SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size);
+
+                    byte[] sector = new byte[sectLen];
+                    stream.Read(sector, 0, sectLen);
+
+                    if(sectLen < SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size))
+                    {
+                        byte[] temp = new byte[SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size)];
+                        Array.Copy(sector, 0, temp, 0, sector.Length);
+                        sector = temp;
+                    }
+                    else if(sectLen > SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size))
+                    {
+                        byte[] temp = new byte[SizeCodeToBytes(trackInfo.sectorsInfo[k - 1].size)];
+                        Array.Copy(sector, 0, temp, 0, temp.Length);
+                        sector = temp;
+                    }
+
+                    thisTrackSectors[(trackInfo.sectorsInfo[k - 1].id & 0x3F) - 1] = sector;
+
+                    byte[] amForCrc = new byte[8];
+                    amForCrc[0] = 0xA1;
+                    amForCrc[1] = 0xA1;
+                    amForCrc[2] = 0xA1;
+                    amForCrc[3] = (byte)IBMIdType.AddressMark;
+                    amForCrc[4] = trackInfo.sectorsInfo[k - 1].track;
+                    amForCrc[5] = trackInfo.sectorsInfo[k - 1].side;
+                    amForCrc[6] = trackInfo.sectorsInfo[k - 1].id;
+                    amForCrc[7] = (byte)trackInfo.sectorsInfo[k - 1].size;
+
+                    CRC16IBMContext.Data(amForCrc, 8, out byte[] amCrc);
+
+                    byte[] addressMark = new byte[22];
+                    Array.Copy(amForCrc, 0, addressMark, 12, 8);
+                    Array.Copy(amCrc, 0, addressMark, 20, 2);
+
+                    thisTrackAddressMarks[(trackInfo.sectorsInfo[k - 1].id & 0x3F) - 1] = addressMark;
+                }
+
+                foreach(KeyValuePair<int, byte[]> s in thisTrackSectors.OrderBy(k => k.Key))
+                {
+                    _sectors.Add(currentSector, s.Value);
+                    _addressMarks.Add(currentSector, s.Value);
+                    currentSector++;
+
+                    if(s.Value.Length > _imageInfo.SectorSize)
+                        _imageInfo.SectorSize = (uint)s.Value.Length;
+                }
+
+                stream.Seek(trackPos, SeekOrigin.Begin);
+
+                if(_extended)
+                {
+                    stream.Seek(header.tracksizeTable[(i * header.sides) + j] * 256, SeekOrigin.Current);
+                    _imageInfo.ImageSize += (ulong)(header.tracksizeTable[(i * header.sides) + j] * 256) - 256;
+                }
+                else
+                {
+                    stream.Seek(header.tracksize, SeekOrigin.Current);
+                    _imageInfo.ImageSize += (ulong)header.tracksize - 256;
+                }
+
+                readtracks++;
             }
-
-            AaruConsole.DebugWriteLine("CPCDSK plugin", "Read {0} sectors", _sectors.Count);
-            AaruConsole.DebugWriteLine("CPCDSK plugin", "Read {0} tracks", readtracks);
-            AaruConsole.DebugWriteLine("CPCDSK plugin", "All tracks are same size? {0}", allTracksSameSize);
-
-            _imageInfo.Application          = StringHandlers.CToString(header.creator);
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = (ulong)_sectors.Count;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.MediaType            = MediaType.CompactFloppy;
-            _imageInfo.ReadableSectorTags.Add(SectorTagType.FloppyAddressMark);
-
-            _imageInfo.Cylinders       = header.tracks;
-            _imageInfo.Heads           = header.sides;
-            _imageInfo.SectorsPerTrack = (uint)(_imageInfo.Sectors / (_imageInfo.Cylinders * _imageInfo.Heads));
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            _sectors.TryGetValue(sectorAddress, out buffer) ? ErrorNumber.NoError : ErrorNumber.SectorNotFound;
+        AaruConsole.DebugWriteLine("CPCDSK plugin", "Read {0} sectors", _sectors.Count);
+        AaruConsole.DebugWriteLine("CPCDSK plugin", "Read {0} tracks", readtracks);
+        AaruConsole.DebugWriteLine("CPCDSK plugin", "All tracks are same size? {0}", allTracksSameSize);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        _imageInfo.Application          = StringHandlers.CToString(header.creator);
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = (ulong)_sectors.Count;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.MediaType            = MediaType.CompactFloppy;
+        _imageInfo.ReadableSectorTags.Add(SectorTagType.FloppyAddressMark);
+
+        _imageInfo.Cylinders       = header.tracks;
+        _imageInfo.Heads           = header.sides;
+        _imageInfo.SectorsPerTrack = (uint)(_imageInfo.Sectors / (_imageInfo.Cylinders * _imageInfo.Heads));
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        _sectors.TryGetValue(sectorAddress, out buffer) ? ErrorNumber.NoError : ErrorNumber.SectorNotFound;
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            ms.Write(sector, 0, sector.Length);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag != SectorTagType.FloppyAddressMark)
+            return ErrorNumber.NotSupported;
+
+        return _addressMarks.TryGetValue(sectorAddress, out buffer) ? ErrorNumber.NoError
+                   : ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag != SectorTagType.FloppyAddressMark)
+            return ErrorNumber.NotSupported;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] addressMark);
 
-            if(tag != SectorTagType.FloppyAddressMark)
-                return ErrorNumber.NotSupported;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            return _addressMarks.TryGetValue(sectorAddress, out buffer) ? ErrorNumber.NoError
-                       : ErrorNumber.SectorNotFound;
+            ms.Write(addressMark, 0, addressMark.Length);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = ms.ToArray();
 
-            if(tag != SectorTagType.FloppyAddressMark)
-                return ErrorNumber.NotSupported;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] addressMark);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(addressMark, 0, addressMark.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CPCDSK/Structs.cs b/Aaru.Images/CPCDSK/Structs.cs
index a90e3a468..26805f514 100644
--- a/Aaru.Images/CPCDSK/Structs.cs
+++ b/Aaru.Images/CPCDSK/Structs.cs
@@ -33,85 +33,84 @@
 using System.Runtime.InteropServices;
 using Aaru.Decoders.Floppy;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cpcdsk
 {
-    public sealed partial class Cpcdsk
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DiskInfo
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DiskInfo
-        {
-            /// <summary>Second part of magic, should be "Disk-Info\r\n" in all, but some emulators write spaces instead.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] magic;
-            /// <summary>Creator application (can be null)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public readonly byte[] creator;
-            /// <summary>Tracks</summary>
-            public readonly byte tracks;
-            /// <summary>Sides</summary>
-            public readonly byte sides;
-            /// <summary>
-            ///     Size of a track including the 256 bytes header. Unused by extended format, as this format includes a table in
-            ///     the next field
-            /// </summary>
-            public readonly ushort tracksize;
-            /// <summary>Size of each track in the extended format. 0 indicates track is not formatted and not present in image.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 204)]
-            public readonly byte[] tracksizeTable;
-        }
+        /// <summary>Second part of magic, should be "Disk-Info\r\n" in all, but some emulators write spaces instead.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] magic;
+        /// <summary>Creator application (can be null)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
+        public readonly byte[] creator;
+        /// <summary>Tracks</summary>
+        public readonly byte tracks;
+        /// <summary>Sides</summary>
+        public readonly byte sides;
+        /// <summary>
+        ///     Size of a track including the 256 bytes header. Unused by extended format, as this format includes a table in
+        ///     the next field
+        /// </summary>
+        public readonly ushort tracksize;
+        /// <summary>Size of each track in the extended format. 0 indicates track is not formatted and not present in image.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 204)]
+        public readonly byte[] tracksizeTable;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct TrackInfo
-        {
-            /// <summary>Magic number, "Track-Info\r\n"</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly byte[] magic;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly byte[] carriageReturn;
-            /// <summary>Padding</summary>
-            public readonly uint padding;
-            /// <summary>Track number</summary>
-            public readonly byte track;
-            /// <summary>Side number</summary>
-            public readonly byte side;
-            /// <summary>Controller data rate</summary>
-            public readonly byte dataRate;
-            /// <summary>Recording mode</summary>
-            public readonly byte recordingMode;
-            /// <summary>Bytes per sector</summary>
-            public readonly IBMSectorSizeCode bps;
-            /// <summary>How many sectors in this track</summary>
-            public readonly byte sectors;
-            /// <summary>GAP#3</summary>
-            public readonly byte gap3;
-            /// <summary>Filler</summary>
-            public readonly byte filler;
-            /// <summary>Information for up to 32 sectors</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly SectorInfo[] sectorsInfo;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct TrackInfo
+    {
+        /// <summary>Magic number, "Track-Info\r\n"</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly byte[] magic;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly byte[] carriageReturn;
+        /// <summary>Padding</summary>
+        public readonly uint padding;
+        /// <summary>Track number</summary>
+        public readonly byte track;
+        /// <summary>Side number</summary>
+        public readonly byte side;
+        /// <summary>Controller data rate</summary>
+        public readonly byte dataRate;
+        /// <summary>Recording mode</summary>
+        public readonly byte recordingMode;
+        /// <summary>Bytes per sector</summary>
+        public readonly IBMSectorSizeCode bps;
+        /// <summary>How many sectors in this track</summary>
+        public readonly byte sectors;
+        /// <summary>GAP#3</summary>
+        public readonly byte gap3;
+        /// <summary>Filler</summary>
+        public readonly byte filler;
+        /// <summary>Information for up to 32 sectors</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly SectorInfo[] sectorsInfo;
+    }
 
-        /// <summary>Sector information</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SectorInfo
-        {
-            /// <summary>Track number from address mark</summary>
-            public readonly byte track;
-            /// <summary>Side number from address mark</summary>
-            public readonly byte side;
-            /// <summary>Sector ID from address mark</summary>
-            public readonly byte id;
-            /// <summary>Sector size from address mark</summary>
-            public readonly IBMSectorSizeCode size;
-            /// <summary>ST1 register from controller</summary>
-            public readonly byte st1;
-            /// <summary>ST2 register from controller</summary>
-            public readonly byte st2;
-            /// <summary>
-            ///     Length in bytes of this sector size. If it is bigger than expected sector size, it's a weak sector read
-            ///     several times.
-            /// </summary>
-            public readonly ushort len;
-        }
+    /// <summary>Sector information</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SectorInfo
+    {
+        /// <summary>Track number from address mark</summary>
+        public readonly byte track;
+        /// <summary>Side number from address mark</summary>
+        public readonly byte side;
+        /// <summary>Sector ID from address mark</summary>
+        public readonly byte id;
+        /// <summary>Sector size from address mark</summary>
+        public readonly IBMSectorSizeCode size;
+        /// <summary>ST1 register from controller</summary>
+        public readonly byte st1;
+        /// <summary>ST2 register from controller</summary>
+        public readonly byte st2;
+        /// <summary>
+        ///     Length in bytes of this sector size. If it is bigger than expected sector size, it's a weak sector read
+        ///     several times.
+        /// </summary>
+        public readonly ushort len;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CPCDSK/Unsupported.cs b/Aaru.Images/CPCDSK/Unsupported.cs
index cc3449bc6..747981855 100644
--- a/Aaru.Images/CPCDSK/Unsupported.cs
+++ b/Aaru.Images/CPCDSK/Unsupported.cs
@@ -32,32 +32,31 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Cpcdsk
 {
-    public sealed partial class Cpcdsk
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/CisCopy.cs b/Aaru.Images/CisCopy/CisCopy.cs
index ddaf62b79..2c7154390 100644
--- a/Aaru.Images/CisCopy/CisCopy.cs
+++ b/Aaru.Images/CisCopy/CisCopy.cs
@@ -36,54 +36,53 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /* This is a very simple format created by a German application called CisCopy, aka CCOPY.EXE, with extension .DCF.
-     * First byte indicates the floppy type, limited to standard formats.
-     * Indeed if the floppy is not DOS formatted, user must choose from the list of supported formats manually.
-     * Next 80 bytes (for 5.25" DD disks) or 160 bytes (for 5.25" HD and 3.5" disks) indicate if a track has been copied
-     * or not.
-     * It offers three copy methods:
-     * a) All, copies all tracks
-     * b) FAT, copies all tracks which contain sectors marked as sued by FAT
-     * c) "Belelung" similarly to FAT. On some disk tests FAT cuts data, while belelung does not.
-     * Finally, next byte indicates compression:
-     * 0) No compression
-     * 1) Normal compression, algorithm unknown
-     * 2) High compression, algorithm unknown
-     * Then the data for whole tracks follow.
-     */
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing CisCopy disk images</summary>
-    public sealed partial class CisCopy : IWritableImage
-    {
-        byte[]     _decodedDisk;
-        ImageInfo  _imageInfo;
-        long       _writingOffset;
-        FileStream _writingStream;
+namespace Aaru.DiscImages;
 
-        public CisCopy() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/* This is a very simple format created by a German application called CisCopy, aka CCOPY.EXE, with extension .DCF.
+ * First byte indicates the floppy type, limited to standard formats.
+ * Indeed if the floppy is not DOS formatted, user must choose from the list of supported formats manually.
+ * Next 80 bytes (for 5.25" DD disks) or 160 bytes (for 5.25" HD and 3.5" disks) indicate if a track has been copied
+ * or not.
+ * It offers three copy methods:
+ * a) All, copies all tracks
+ * b) FAT, copies all tracks which contain sectors marked as sued by FAT
+ * c) "Belelung" similarly to FAT. On some disk tests FAT cuts data, while belelung does not.
+ * Finally, next byte indicates compression:
+ * 0) No compression
+ * 1) Normal compression, algorithm unknown
+ * 2) High compression, algorithm unknown
+ * Then the data for whole tracks follow.
+ */
+/// <inheritdoc />
+/// <summary>Implements reading and writing CisCopy disk images</summary>
+public sealed partial class CisCopy : IWritableImage
+{
+    byte[]     _decodedDisk;
+    ImageInfo  _imageInfo;
+    long       _writingOffset;
+    FileStream _writingStream;
+
+    public CisCopy() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/Enums.cs b/Aaru.Images/CisCopy/Enums.cs
index fe789ed15..deadcdfc4 100644
--- a/Aaru.Images/CisCopy/Enums.cs
+++ b/Aaru.Images/CisCopy/Enums.cs
@@ -32,26 +32,25 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CisCopy
 {
-    public sealed partial class CisCopy
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum DiskType : byte
     {
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum DiskType : byte
-        {
-            MD1DD8 = 1, MD1DD = 2, MD2DD8 = 3,
-            MD2DD  = 4, MF2DD = 5, MD2HD  = 6,
-            MF2HD  = 7
-        }
+        MD1DD8 = 1, MD1DD = 2, MD2DD8 = 3,
+        MD2DD  = 4, MF2DD = 5, MD2HD  = 6,
+        MF2HD  = 7
+    }
 
-        enum Compression : byte
-        {
-            None = 0, Normal = 1, High = 2
-        }
+    enum Compression : byte
+    {
+        None = 0, Normal = 1, High = 2
+    }
 
-        enum TrackType : byte
-        {
-            Copied = 0x4C, Omitted = 0xFA, OmittedAlternate = 0xFE
-        }
+    enum TrackType : byte
+    {
+        Copied = 0x4C, Omitted = 0xFA, OmittedAlternate = 0xFE
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/Identify.cs b/Aaru.Images/CisCopy/Identify.cs
index dc59ec618..16ef6b1d7 100644
--- a/Aaru.Images/CisCopy/Identify.cs
+++ b/Aaru.Images/CisCopy/Identify.cs
@@ -33,93 +33,92 @@
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CisCopy
 {
-    public sealed partial class CisCopy
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        var  type = (DiskType)stream.ReadByte();
+        byte tracks;
+
+        switch(type)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            case DiskType.MD1DD8:
+            case DiskType.MD1DD:
+            case DiskType.MD2DD8:
+            case DiskType.MD2DD:
+                tracks = 80;
 
-            var  type = (DiskType)stream.ReadByte();
-            byte tracks;
+                break;
+            case DiskType.MF2DD:
+            case DiskType.MD2HD:
+            case DiskType.MF2HD:
+                tracks = 160;
 
-            switch(type)
-            {
-                case DiskType.MD1DD8:
-                case DiskType.MD1DD:
-                case DiskType.MD2DD8:
-                case DiskType.MD2DD:
-                    tracks = 80;
+                break;
+            default: return false;
+        }
 
-                    break;
-                case DiskType.MF2DD:
-                case DiskType.MD2HD:
-                case DiskType.MF2HD:
-                    tracks = 160;
+        byte[] trackBytes = new byte[tracks];
+        stream.Read(trackBytes, 0, tracks);
 
-                    break;
-                default: return false;
-            }
-
-            byte[] trackBytes = new byte[tracks];
-            stream.Read(trackBytes, 0, tracks);
-
-            for(int i = 0; i < tracks; i++)
-                if(trackBytes[i] != (byte)TrackType.Copied  &&
-                   trackBytes[i] != (byte)TrackType.Omitted &&
-                   trackBytes[i] != (byte)TrackType.OmittedAlternate)
-                    return false;
-
-            var cmpr = (Compression)stream.ReadByte();
-
-            if(cmpr != Compression.None   &&
-               cmpr != Compression.Normal &&
-               cmpr != Compression.High)
+        for(int i = 0; i < tracks; i++)
+            if(trackBytes[i] != (byte)TrackType.Copied  &&
+               trackBytes[i] != (byte)TrackType.Omitted &&
+               trackBytes[i] != (byte)TrackType.OmittedAlternate)
                 return false;
 
-            switch(type)
-            {
-                case DiskType.MD1DD8:
-                    if(stream.Length > (40 * 1 * 8 * 512) + 82)
-                        return false;
+        var cmpr = (Compression)stream.ReadByte();
 
-                    break;
-                case DiskType.MD1DD:
-                    if(stream.Length > (40 * 1 * 9 * 512) + 82)
-                        return false;
+        if(cmpr != Compression.None   &&
+           cmpr != Compression.Normal &&
+           cmpr != Compression.High)
+            return false;
 
-                    break;
-                case DiskType.MD2DD8:
-                    if(stream.Length > (40 * 2 * 8 * 512) + 82)
-                        return false;
+        switch(type)
+        {
+            case DiskType.MD1DD8:
+                if(stream.Length > (40 * 1 * 8 * 512) + 82)
+                    return false;
 
-                    break;
-                case DiskType.MD2DD:
-                    if(stream.Length > (40 * 2 * 9 * 512) + 82)
-                        return false;
+                break;
+            case DiskType.MD1DD:
+                if(stream.Length > (40 * 1 * 9 * 512) + 82)
+                    return false;
 
-                    break;
-                case DiskType.MF2DD:
-                    if(stream.Length > (80 * 2 * 9 * 512) + 162)
-                        return false;
+                break;
+            case DiskType.MD2DD8:
+                if(stream.Length > (40 * 2 * 8 * 512) + 82)
+                    return false;
 
-                    break;
-                case DiskType.MD2HD:
-                    if(stream.Length > (80 * 2 * 15 * 512) + 162)
-                        return false;
+                break;
+            case DiskType.MD2DD:
+                if(stream.Length > (40 * 2 * 9 * 512) + 82)
+                    return false;
 
-                    break;
-                case DiskType.MF2HD:
-                    if(stream.Length > (80 * 2 * 18 * 512) + 162)
-                        return false;
+                break;
+            case DiskType.MF2DD:
+                if(stream.Length > (80 * 2 * 9 * 512) + 162)
+                    return false;
 
-                    break;
-            }
+                break;
+            case DiskType.MD2HD:
+                if(stream.Length > (80 * 2 * 15 * 512) + 162)
+                    return false;
 
-            return true;
+                break;
+            case DiskType.MF2HD:
+                if(stream.Length > (80 * 2 * 18 * 512) + 162)
+                    return false;
+
+                break;
         }
+
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/Properties.cs b/Aaru.Images/CisCopy/Properties.cs
index 2ac3d38a3..29277532e 100644
--- a/Aaru.Images/CisCopy/Properties.cs
+++ b/Aaru.Images/CisCopy/Properties.cs
@@ -37,50 +37,49 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class CisCopy
-    {
-        /// <inheritdoc />
-        public string Name => "CisCopy Disk Image (DC-File)";
-        /// <inheritdoc />
-        public Guid Id => new Guid("EDF20CC7-6012-49E2-9E92-663A53E42130");
-        /// <inheritdoc />
-        public string Format => "CisCopy";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
+namespace Aaru.DiscImages;
 
-        // TODO: Test with real hardware to see real supported media
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9,
-            MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".dcf"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+public sealed partial class CisCopy
+{
+    /// <inheritdoc />
+    public string Name => "CisCopy Disk Image (DC-File)";
+    /// <inheritdoc />
+    public Guid Id => new Guid("EDF20CC7-6012-49E2-9E92-663A53E42130");
+    /// <inheritdoc />
+    public string Format => "CisCopy";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+
+    // TODO: Test with real hardware to see real supported media
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9,
+        MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
+            {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".dcf"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/Read.cs b/Aaru.Images/CisCopy/Read.cs
index 2498e52b0..d27d25494 100644
--- a/Aaru.Images/CisCopy/Read.cs
+++ b/Aaru.Images/CisCopy/Read.cs
@@ -38,195 +38,194 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CisCopy
 {
-    public sealed partial class CisCopy
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        var  type = (DiskType)stream.ReadByte();
+        byte tracks;
+
+        switch(type)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            case DiskType.MD1DD8:
+            case DiskType.MD1DD:
+            case DiskType.MD2DD8:
+            case DiskType.MD2DD:
+                tracks = 80;
 
-            var  type = (DiskType)stream.ReadByte();
-            byte tracks;
+                break;
+            case DiskType.MF2DD:
+            case DiskType.MD2HD:
+            case DiskType.MF2HD:
+                tracks = 160;
 
-            switch(type)
-            {
-                case DiskType.MD1DD8:
-                case DiskType.MD1DD:
-                case DiskType.MD2DD8:
-                case DiskType.MD2DD:
-                    tracks = 80;
+                break;
+            default:
+                AaruConsole.ErrorWriteLine($"Incorrect disk type {(byte)type}");
 
-                    break;
-                case DiskType.MF2DD:
-                case DiskType.MD2HD:
-                case DiskType.MF2HD:
-                    tracks = 160;
-
-                    break;
-                default:
-                    AaruConsole.ErrorWriteLine($"Incorrect disk type {(byte)type}");
-
-                    return ErrorNumber.InvalidArgument;
-            }
-
-            byte[] trackBytes = new byte[tracks];
-            stream.Read(trackBytes, 0, tracks);
-
-            var cmpr = (Compression)stream.ReadByte();
-
-            if(cmpr != Compression.None)
-            {
-                AaruConsole.ErrorWriteLine("Compressed images are not supported.");
-
-                return ErrorNumber.NotImplemented;
-            }
-
-            int trackSize = 0;
-
-            switch(type)
-            {
-                case DiskType.MD1DD8:
-                case DiskType.MD2DD8:
-                    trackSize = 8 * 512;
-
-                    break;
-                case DiskType.MD1DD:
-                case DiskType.MD2DD:
-                case DiskType.MF2DD:
-                    trackSize = 9 * 512;
-
-                    break;
-                case DiskType.MD2HD:
-                    trackSize = 15 * 512;
-
-                    break;
-                case DiskType.MF2HD:
-                    trackSize = 18 * 512;
-
-                    break;
-            }
-
-            int headStep = 1;
-
-            if(type == DiskType.MD1DD ||
-               type == DiskType.MD1DD8)
-                headStep = 2;
-
-            var decodedImage = new MemoryStream();
-
-            for(int i = 0; i < tracks; i += headStep)
-            {
-                byte[] track = new byte[trackSize];
-
-                if((TrackType)trackBytes[i] == TrackType.Copied)
-                    stream.Read(track, 0, trackSize);
-                else
-                    ArrayHelpers.ArrayFill(track, (byte)0xF6);
-
-                decodedImage.Write(track, 0, trackSize);
-            }
-
-            _imageInfo.Application          = "CisCopy";
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = imageFilter.Filename;
-            _imageInfo.ImageSize            = (ulong)(stream.Length - 2 - trackBytes.Length);
-            _imageInfo.SectorSize           = 512;
-
-            switch(type)
-            {
-                case DiskType.MD1DD8:
-                    _imageInfo.MediaType       = MediaType.DOS_525_SS_DD_8;
-                    _imageInfo.Sectors         = 40 * 1 * 8;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case DiskType.MD2DD8:
-                    _imageInfo.MediaType       = MediaType.DOS_525_DS_DD_8;
-                    _imageInfo.Sectors         = 40 * 2 * 8;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case DiskType.MD1DD:
-                    _imageInfo.MediaType       = MediaType.DOS_525_SS_DD_9;
-                    _imageInfo.Sectors         = 40 * 1 * 9;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case DiskType.MD2DD:
-                    _imageInfo.MediaType       = MediaType.DOS_525_DS_DD_9;
-                    _imageInfo.Sectors         = 40 * 2 * 9;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case DiskType.MF2DD:
-                    _imageInfo.MediaType       = MediaType.DOS_35_DS_DD_9;
-                    _imageInfo.Sectors         = 80 * 2 * 9;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case DiskType.MD2HD:
-                    _imageInfo.MediaType       = MediaType.DOS_525_HD;
-                    _imageInfo.Sectors         = 80 * 2 * 15;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.SectorsPerTrack = 15;
-
-                    break;
-                case DiskType.MF2HD:
-                    _imageInfo.MediaType       = MediaType.DOS_35_HD;
-                    _imageInfo.Sectors         = 80 * 2 * 18;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.SectorsPerTrack = 18;
-
-                    break;
-            }
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-            _decodedDisk            = decodedImage.ToArray();
-
-            decodedImage.Close();
-
-            AaruConsole.VerboseWriteLine("CisCopy image contains a disk of type {0}", _imageInfo.MediaType);
-
-            return ErrorNumber.NoError;
+                return ErrorNumber.InvalidArgument;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        byte[] trackBytes = new byte[tracks];
+        stream.Read(trackBytes, 0, tracks);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        var cmpr = (Compression)stream.ReadByte();
+
+        if(cmpr != Compression.None)
         {
-            buffer = null;
+            AaruConsole.ErrorWriteLine("Compressed images are not supported.");
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            buffer = new byte[length * _imageInfo.SectorSize];
-
-            Array.Copy(_decodedDisk, (int)sectorAddress * _imageInfo.SectorSize, buffer, 0,
-                       length                           * _imageInfo.SectorSize);
-
-            return ErrorNumber.NoError;
+            return ErrorNumber.NotImplemented;
         }
+
+        int trackSize = 0;
+
+        switch(type)
+        {
+            case DiskType.MD1DD8:
+            case DiskType.MD2DD8:
+                trackSize = 8 * 512;
+
+                break;
+            case DiskType.MD1DD:
+            case DiskType.MD2DD:
+            case DiskType.MF2DD:
+                trackSize = 9 * 512;
+
+                break;
+            case DiskType.MD2HD:
+                trackSize = 15 * 512;
+
+                break;
+            case DiskType.MF2HD:
+                trackSize = 18 * 512;
+
+                break;
+        }
+
+        int headStep = 1;
+
+        if(type == DiskType.MD1DD ||
+           type == DiskType.MD1DD8)
+            headStep = 2;
+
+        var decodedImage = new MemoryStream();
+
+        for(int i = 0; i < tracks; i += headStep)
+        {
+            byte[] track = new byte[trackSize];
+
+            if((TrackType)trackBytes[i] == TrackType.Copied)
+                stream.Read(track, 0, trackSize);
+            else
+                ArrayHelpers.ArrayFill(track, (byte)0xF6);
+
+            decodedImage.Write(track, 0, trackSize);
+        }
+
+        _imageInfo.Application          = "CisCopy";
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = imageFilter.Filename;
+        _imageInfo.ImageSize            = (ulong)(stream.Length - 2 - trackBytes.Length);
+        _imageInfo.SectorSize           = 512;
+
+        switch(type)
+        {
+            case DiskType.MD1DD8:
+                _imageInfo.MediaType       = MediaType.DOS_525_SS_DD_8;
+                _imageInfo.Sectors         = 40 * 1 * 8;
+                _imageInfo.Heads           = 1;
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case DiskType.MD2DD8:
+                _imageInfo.MediaType       = MediaType.DOS_525_DS_DD_8;
+                _imageInfo.Sectors         = 40 * 2 * 8;
+                _imageInfo.Heads           = 2;
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case DiskType.MD1DD:
+                _imageInfo.MediaType       = MediaType.DOS_525_SS_DD_9;
+                _imageInfo.Sectors         = 40 * 1 * 9;
+                _imageInfo.Heads           = 1;
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case DiskType.MD2DD:
+                _imageInfo.MediaType       = MediaType.DOS_525_DS_DD_9;
+                _imageInfo.Sectors         = 40 * 2 * 9;
+                _imageInfo.Heads           = 2;
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case DiskType.MF2DD:
+                _imageInfo.MediaType       = MediaType.DOS_35_DS_DD_9;
+                _imageInfo.Sectors         = 80 * 2 * 9;
+                _imageInfo.Heads           = 2;
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case DiskType.MD2HD:
+                _imageInfo.MediaType       = MediaType.DOS_525_HD;
+                _imageInfo.Sectors         = 80 * 2 * 15;
+                _imageInfo.Heads           = 2;
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.SectorsPerTrack = 15;
+
+                break;
+            case DiskType.MF2HD:
+                _imageInfo.MediaType       = MediaType.DOS_35_HD;
+                _imageInfo.Sectors         = 80 * 2 * 18;
+                _imageInfo.Heads           = 2;
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.SectorsPerTrack = 18;
+
+                break;
+        }
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+        _decodedDisk            = decodedImage.ToArray();
+
+        decodedImage.Close();
+
+        AaruConsole.VerboseWriteLine("CisCopy image contains a disk of type {0}", _imageInfo.MediaType);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        Array.Copy(_decodedDisk, (int)sectorAddress * _imageInfo.SectorSize, buffer, 0,
+                   length                           * _imageInfo.SectorSize);
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/Unsupported.cs b/Aaru.Images/CisCopy/Unsupported.cs
index e90cb1a65..4fd2c6ddf 100644
--- a/Aaru.Images/CisCopy/Unsupported.cs
+++ b/Aaru.Images/CisCopy/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CisCopy
 {
-    public sealed partial class CisCopy
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CisCopy/Write.cs b/Aaru.Images/CisCopy/Write.cs
index d698e5281..9e7386dab 100644
--- a/Aaru.Images/CisCopy/Write.cs
+++ b/Aaru.Images/CisCopy/Write.cs
@@ -38,261 +38,260 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CisCopy
 {
-    public sealed partial class CisCopy
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
+            ErrorMessage = "Unsupported sector size";
 
-                return false;
-            }
+            return false;
+        }
 
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
+        if(!SupportedMediaTypes.Contains(mediaType))
+        {
+            ErrorMessage = $"Unsupported media format {mediaType}";
+
+            return false;
+        }
+
+        _imageInfo = new ImageInfo
+        {
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
+            return false;
+        }
+
+        DiskType diskType;
+
+        switch(mediaType)
+        {
+            case MediaType.DOS_35_DS_DD_9:
+                diskType = DiskType.MF2DD;
+
+                break;
+            case MediaType.DOS_35_HD:
+                diskType = DiskType.MF2HD;
+
+                break;
+            case MediaType.DOS_525_DS_DD_8:
+                diskType = DiskType.MD2DD8;
+
+                break;
+            case MediaType.DOS_525_DS_DD_9:
+                diskType = DiskType.MD2DD;
+
+                break;
+            case MediaType.DOS_525_HD:
+                diskType = DiskType.MD2HD;
+
+                break;
+            case MediaType.DOS_525_SS_DD_8:
+                diskType = DiskType.MD1DD8;
+
+                break;
+            case MediaType.DOS_525_SS_DD_9:
+                diskType = DiskType.MD1DD;
+
+                break;
+            default:
                 ErrorMessage = $"Unsupported media format {mediaType}";
 
                 return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            DiskType diskType;
-
-            switch(mediaType)
-            {
-                case MediaType.DOS_35_DS_DD_9:
-                    diskType = DiskType.MF2DD;
-
-                    break;
-                case MediaType.DOS_35_HD:
-                    diskType = DiskType.MF2HD;
-
-                    break;
-                case MediaType.DOS_525_DS_DD_8:
-                    diskType = DiskType.MD2DD8;
-
-                    break;
-                case MediaType.DOS_525_DS_DD_9:
-                    diskType = DiskType.MD2DD;
-
-                    break;
-                case MediaType.DOS_525_HD:
-                    diskType = DiskType.MD2HD;
-
-                    break;
-                case MediaType.DOS_525_SS_DD_8:
-                    diskType = DiskType.MD1DD8;
-
-                    break;
-                case MediaType.DOS_525_SS_DD_9:
-                    diskType = DiskType.MD1DD;
-
-                    break;
-                default:
-                    ErrorMessage = $"Unsupported media format {mediaType}";
-
-                    return false;
-            }
-
-            _writingStream.WriteByte((byte)diskType);
-
-            byte tracks = 0;
-
-            switch(diskType)
-            {
-                case DiskType.MD1DD8:
-                case DiskType.MD1DD:
-                case DiskType.MD2DD8:
-                case DiskType.MD2DD:
-                    tracks = 80;
-
-                    break;
-                case DiskType.MF2DD:
-                case DiskType.MD2HD:
-                case DiskType.MF2HD:
-                    tracks = 160;
-
-                    break;
-            }
-
-            int headStep = 1;
-
-            if(diskType == DiskType.MD1DD ||
-               diskType == DiskType.MD1DD8)
-                headStep = 2;
-
-            for(int i = 0; i < tracks; i += headStep)
-            {
-                _writingStream.WriteByte((byte)TrackType.Copied);
-
-                if(headStep == 2)
-                    _writingStream.WriteByte(0);
-            }
-
-            _writingStream.WriteByte((byte)Compression.None);
-            _writingOffset = _writingStream.Position;
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
         }
 
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
+        _writingStream.WriteByte((byte)diskType);
+
+        byte tracks = 0;
+
+        switch(diskType)
         {
-            ErrorMessage = "Writing media tags is not supported.";
+            case DiskType.MD1DD8:
+            case DiskType.MD1DD:
+            case DiskType.MD2DD8:
+            case DiskType.MD2DD:
+                tracks = 80;
 
-            return false;
+                break;
+            case DiskType.MF2DD:
+            case DiskType.MD2HD:
+            case DiskType.MF2HD:
+                tracks = 160;
+
+                break;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        int headStep = 1;
+
+        if(diskType == DiskType.MD1DD ||
+           diskType == DiskType.MD1DD8)
+            headStep = 2;
+
+        for(int i = 0; i < tracks; i += headStep)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+            _writingStream.WriteByte((byte)TrackType.Copied);
 
-                return false;
-            }
-
-            if(data.Length != 512)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek(_writingOffset + (long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
+            if(headStep == 2)
+                _writingStream.WriteByte(0);
         }
 
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+        _writingStream.WriteByte((byte)Compression.None);
+        _writingOffset = _writingStream.Position;
 
-                return false;
-            }
+        IsWriting    = true;
+        ErrorMessage = null;
 
-            if(data.Length % 512 != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek(_writingOffset + (long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != 512)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek(_writingOffset + (long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % 512 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek(_writingOffset + (long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/CloneCD.cs b/Aaru.Images/CloneCD/CloneCD.cs
index c25cc5079..3d499b4f8 100644
--- a/Aaru.Images/CloneCD/CloneCD.cs
+++ b/Aaru.Images/CloneCD/CloneCD.cs
@@ -36,48 +36,47 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    // TODO: CloneCD stores subchannel deinterleaved
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing CloneCD disc images</summary>
-    public sealed partial class CloneCd : IWritableOpticalImage
-    {
-        string                  _catalog; // TODO: Use it
-        IFilter                 _ccdFilter;
-        byte[]                  _cdtext;
-        StreamReader            _cueStream;
-        IFilter                 _dataFilter;
-        Stream                  _dataStream;
-        StreamWriter            _descriptorStream;
-        byte[]                  _fullToc;
-        ImageInfo               _imageInfo;
-        Dictionary<uint, ulong> _offsetMap;
-        bool                    _scrambled;
-        IFilter                 _subFilter;
-        Stream                  _subStream;
-        Dictionary<byte, byte>  _trackFlags;
-        string                  _writingBaseName;
+namespace Aaru.DiscImages;
 
-        public CloneCd() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = true,
-            HasSessions           = true,
-            Version               = null,
-            ApplicationVersion    = null,
-            MediaTitle            = null,
-            Creator               = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: CloneCD stores subchannel deinterleaved
+/// <inheritdoc />
+/// <summary>Implements reading and writing CloneCD disc images</summary>
+public sealed partial class CloneCd : IWritableOpticalImage
+{
+    string                  _catalog; // TODO: Use it
+    IFilter                 _ccdFilter;
+    byte[]                  _cdtext;
+    StreamReader            _cueStream;
+    IFilter                 _dataFilter;
+    Stream                  _dataStream;
+    StreamWriter            _descriptorStream;
+    byte[]                  _fullToc;
+    ImageInfo               _imageInfo;
+    Dictionary<uint, ulong> _offsetMap;
+    bool                    _scrambled;
+    IFilter                 _subFilter;
+    Stream                  _subStream;
+    Dictionary<byte, byte>  _trackFlags;
+    string                  _writingBaseName;
+
+    public CloneCd() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = true,
+        HasSessions           = true,
+        Version               = null,
+        ApplicationVersion    = null,
+        MediaTitle            = null,
+        Creator               = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/Constants.cs b/Aaru.Images/CloneCD/Constants.cs
index 493016aee..43615e2fa 100644
--- a/Aaru.Images/CloneCD/Constants.cs
+++ b/Aaru.Images/CloneCD/Constants.cs
@@ -30,41 +30,40 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CloneCd
 {
-    public sealed partial class CloneCd
-    {
-        const string CCD_IDENTIFIER     = @"^\s*\[CloneCD\]";
-        const string DISC_IDENTIFIER    = @"^\s*\[Disc\]";
-        const string SESSION_IDENTIFIER = @"^\s*\[Session\s*(?<number>\d+)\]";
-        const string ENTRY_IDENTIFIER   = @"^\s*\[Entry\s*(?<number>\d+)\]";
-        const string TRACK_IDENTIFIER   = @"^\s*\[TRACK\s*(?<number>\d+)\]";
-        const string CDTEXT_IDENTIFIER  = @"^\s*\[CDText\]";
-        const string CCD_VERSION        = @"^\s*Version\s*=\s*(?<value>\d+)";
-        const string DISC_ENTRIES       = @"^\s*TocEntries\s*=\s*(?<value>\d+)";
-        const string DISC_SESSIONS      = @"^\s*Sessions\s*=\s*(?<value>\d+)";
-        const string DISC_SCRAMBLED     = @"^\s*DataTracksScrambled\s*=\s*(?<value>\d+)";
-        const string CDTEXT_LENGTH      = @"^\s*CDTextLength\s*=\s*(?<value>\d+)";
-        const string DISC_CATALOG       = @"^\s*CATALOG\s*=\s*(?<value>[\x21-\x7F]{13})";
-        const string SESSION_PREGAP     = @"^\s*PreGapMode\s*=\s*(?<value>\d+)";
-        const string SESSION_SUBCHANNEL = @"^\s*PreGapSubC\s*=\s*(?<value>\d+)";
-        const string ENTRY_SESSION      = @"^\s*Session\s*=\s*(?<value>\d+)";
-        const string ENTRY_POINT        = @"^\s*Point\s*=\s*(?<value>[\w+]+)";
-        const string ENTRY_ADR          = @"^\s*ADR\s*=\s*(?<value>\w+)";
-        const string ENTRY_CONTROL      = @"^\s*Control\s*=\s*(?<value>\w+)";
-        const string ENTRY_TRACKNO      = @"^\s*TrackNo\s*=\s*(?<value>\d+)";
-        const string ENTRY_AMIN         = @"^\s*AMin\s*=\s*(?<value>\d+)";
-        const string ENTRY_ASEC         = @"^\s*ASec\s*=\s*(?<value>\d+)";
-        const string ENTRY_AFRAME       = @"^\s*AFrame\s*=\s*(?<value>\d+)";
-        const string ENTRY_ALBA         = @"^\s*ALBA\s*=\s*(?<value>-?\d+)";
-        const string ENTRY_ZERO         = @"^\s*Zero\s*=\s*(?<value>\d+)";
-        const string ENTRY_PMIN         = @"^\s*PMin\s*=\s*(?<value>\d+)";
-        const string ENTRY_PSEC         = @"^\s*PSec\s*=\s*(?<value>\d+)";
-        const string ENTRY_PFRAME       = @"^\s*PFrame\s*=\s*(?<value>\d+)";
-        const string ENTRY_PLBA         = @"^\s*PLBA\s*=\s*(?<value>\d+)";
-        const string CDTEXT_ENTRIES     = @"^\s*Entries\s*=\s*(?<value>\d+)";
-        const string CDTEXT_ENTRY       = @"^\s*Entry\s*(?<number>\d+)\s*=\s*(?<value>([0-9a-fA-F]+\s*)+)";
-        const string TRACK_MODE         = @"^\s*MODE\s*=\s*(?<value>\d+)";
-        const string TRACK_INDEX        = @"^\s*INDEX\s*(?<index>\d+)\s*=\s*(?<lba>\d+)";
-    }
+    const string CCD_IDENTIFIER     = @"^\s*\[CloneCD\]";
+    const string DISC_IDENTIFIER    = @"^\s*\[Disc\]";
+    const string SESSION_IDENTIFIER = @"^\s*\[Session\s*(?<number>\d+)\]";
+    const string ENTRY_IDENTIFIER   = @"^\s*\[Entry\s*(?<number>\d+)\]";
+    const string TRACK_IDENTIFIER   = @"^\s*\[TRACK\s*(?<number>\d+)\]";
+    const string CDTEXT_IDENTIFIER  = @"^\s*\[CDText\]";
+    const string CCD_VERSION        = @"^\s*Version\s*=\s*(?<value>\d+)";
+    const string DISC_ENTRIES       = @"^\s*TocEntries\s*=\s*(?<value>\d+)";
+    const string DISC_SESSIONS      = @"^\s*Sessions\s*=\s*(?<value>\d+)";
+    const string DISC_SCRAMBLED     = @"^\s*DataTracksScrambled\s*=\s*(?<value>\d+)";
+    const string CDTEXT_LENGTH      = @"^\s*CDTextLength\s*=\s*(?<value>\d+)";
+    const string DISC_CATALOG       = @"^\s*CATALOG\s*=\s*(?<value>[\x21-\x7F]{13})";
+    const string SESSION_PREGAP     = @"^\s*PreGapMode\s*=\s*(?<value>\d+)";
+    const string SESSION_SUBCHANNEL = @"^\s*PreGapSubC\s*=\s*(?<value>\d+)";
+    const string ENTRY_SESSION      = @"^\s*Session\s*=\s*(?<value>\d+)";
+    const string ENTRY_POINT        = @"^\s*Point\s*=\s*(?<value>[\w+]+)";
+    const string ENTRY_ADR          = @"^\s*ADR\s*=\s*(?<value>\w+)";
+    const string ENTRY_CONTROL      = @"^\s*Control\s*=\s*(?<value>\w+)";
+    const string ENTRY_TRACKNO      = @"^\s*TrackNo\s*=\s*(?<value>\d+)";
+    const string ENTRY_AMIN         = @"^\s*AMin\s*=\s*(?<value>\d+)";
+    const string ENTRY_ASEC         = @"^\s*ASec\s*=\s*(?<value>\d+)";
+    const string ENTRY_AFRAME       = @"^\s*AFrame\s*=\s*(?<value>\d+)";
+    const string ENTRY_ALBA         = @"^\s*ALBA\s*=\s*(?<value>-?\d+)";
+    const string ENTRY_ZERO         = @"^\s*Zero\s*=\s*(?<value>\d+)";
+    const string ENTRY_PMIN         = @"^\s*PMin\s*=\s*(?<value>\d+)";
+    const string ENTRY_PSEC         = @"^\s*PSec\s*=\s*(?<value>\d+)";
+    const string ENTRY_PFRAME       = @"^\s*PFrame\s*=\s*(?<value>\d+)";
+    const string ENTRY_PLBA         = @"^\s*PLBA\s*=\s*(?<value>\d+)";
+    const string CDTEXT_ENTRIES     = @"^\s*Entries\s*=\s*(?<value>\d+)";
+    const string CDTEXT_ENTRY       = @"^\s*Entry\s*(?<number>\d+)\s*=\s*(?<value>([0-9a-fA-F]+\s*)+)";
+    const string TRACK_MODE         = @"^\s*MODE\s*=\s*(?<value>\d+)";
+    const string TRACK_INDEX        = @"^\s*INDEX\s*(?<index>\d+)\s*=\s*(?<lba>\d+)";
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/Helpers.cs b/Aaru.Images/CloneCD/Helpers.cs
index 61238b252..6afed1573 100644
--- a/Aaru.Images/CloneCD/Helpers.cs
+++ b/Aaru.Images/CloneCD/Helpers.cs
@@ -30,14 +30,13 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class CloneCd
-    {
-        static ulong GetLba(int minute, int second, int frame) =>
-            (ulong)((minute * 60 * 75) + (second * 75) + frame - 150);
+namespace Aaru.DiscImages;
 
-        static long MsfToLba((byte minute, byte second, byte frame) msf) =>
-            (msf.minute * 60 * 75) + (msf.second * 75) + msf.frame - 150;
-    }
+public sealed partial class CloneCd
+{
+    static ulong GetLba(int minute, int second, int frame) =>
+        (ulong)((minute * 60 * 75) + (second * 75) + frame - 150);
+
+    static long MsfToLba((byte minute, byte second, byte frame) msf) =>
+        (msf.minute * 60 * 75) + (msf.second * 75) + msf.frame - 150;
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/Identify.cs b/Aaru.Images/CloneCD/Identify.cs
index a5f6d76f3..2052421ca 100644
--- a/Aaru.Images/CloneCD/Identify.cs
+++ b/Aaru.Images/CloneCD/Identify.cs
@@ -36,65 +36,64 @@ using System.Text.RegularExpressions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CloneCd
 {
-    public sealed partial class CloneCd
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        _ccdFilter = imageFilter;
+
+        try
         {
-            _ccdFilter = imageFilter;
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+            byte[] testArray = new byte[512];
+            imageFilter.GetDataForkStream().Read(testArray, 0, 512);
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
 
-            try
+            // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
+            bool twoConsecutiveNulls = false;
+
+            for(int i = 0; i < 512; i++)
             {
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
-                byte[] testArray = new byte[512];
-                imageFilter.GetDataForkStream().Read(testArray, 0, 512);
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+                if(i >= imageFilter.GetDataForkStream().Length)
+                    break;
 
-                // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
-                bool twoConsecutiveNulls = false;
-
-                for(int i = 0; i < 512; i++)
+                if(testArray[i] == 0)
                 {
-                    if(i >= imageFilter.GetDataForkStream().Length)
-                        break;
-
-                    if(testArray[i] == 0)
-                    {
-                        if(twoConsecutiveNulls)
-                            return false;
-
-                        twoConsecutiveNulls = true;
-                    }
-                    else
-                        twoConsecutiveNulls = false;
-
-                    if(testArray[i] < 0x20  &&
-                       testArray[i] != 0x0A &&
-                       testArray[i] != 0x0D &&
-                       testArray[i] != 0x00)
+                    if(twoConsecutiveNulls)
                         return false;
+
+                    twoConsecutiveNulls = true;
                 }
+                else
+                    twoConsecutiveNulls = false;
 
-                _cueStream = new StreamReader(_ccdFilter.GetDataForkStream());
-
-                string line = _cueStream.ReadLine();
-
-                var hdr = new Regex(CCD_IDENTIFIER);
-
-                Match hdm = hdr.Match(line ?? "");
-
-                return hdm.Success;
+                if(testArray[i] < 0x20  &&
+                   testArray[i] != 0x0A &&
+                   testArray[i] != 0x0D &&
+                   testArray[i] != 0x00)
+                    return false;
             }
-            catch(Exception ex)
-            {
-                AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", _ccdFilter);
-                AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
-                AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
 
-                return false;
-            }
+            _cueStream = new StreamReader(_ccdFilter.GetDataForkStream());
+
+            string line = _cueStream.ReadLine();
+
+            var hdr = new Regex(CCD_IDENTIFIER);
+
+            Match hdm = hdr.Match(line ?? "");
+
+            return hdm.Success;
+        }
+        catch(Exception ex)
+        {
+            AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", _ccdFilter);
+            AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
+            AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
+
+            return false;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/Properties.cs b/Aaru.Images/CloneCD/Properties.cs
index 983b75b14..f7ededa94 100644
--- a/Aaru.Images/CloneCD/Properties.cs
+++ b/Aaru.Images/CloneCD/Properties.cs
@@ -37,79 +37,78 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class CloneCd
-    {
-        /// <inheritdoc />
-        public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks  |
-                                                               OpticalImageCapabilities.CanStoreDataTracks   |
-                                                               OpticalImageCapabilities.CanStorePregaps      |
-                                                               OpticalImageCapabilities.CanStoreSubchannelRw |
+namespace Aaru.DiscImages;
 
-                                                               // TODO: Disabled until 6.0
-                                                               //OpticalImageCapabilities.CanStoreSessions     |
-                                                               OpticalImageCapabilities.CanStoreIsrc       |
-                                                               OpticalImageCapabilities.CanStoreCdText     |
-                                                               OpticalImageCapabilities.CanStoreMcn        |
-                                                               OpticalImageCapabilities.CanStoreRawData    |
-                                                               OpticalImageCapabilities.CanStoreCookedData |
-                                                               OpticalImageCapabilities.CanStoreMultipleTracks;
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "CloneCD";
-        /// <inheritdoc />
-        public Guid Id => new Guid("EE9C2975-2E79-427A-8EE9-F86F19165784");
-        /// <inheritdoc />
-        public string Format => "CloneCD";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<Partition> Partitions { get; private set; }
-        /// <inheritdoc />
-        public List<Track> Tracks { get; private set; }
-        /// <inheritdoc />
-        public List<Session> Sessions { get; private set; }
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new[]
-        {
-            MediaTagType.CD_MCN, MediaTagType.CD_FullTOC
-        };
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
-        {
-            SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
-            SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubHeader,
-            SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags, SectorTagType.CdSectorSubchannel
-        };
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI, MediaType.CDMIDI,
-            MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA, MediaType.CDRW,
-            MediaType.CDV, MediaType.DTSCD, MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD,
-            MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.VCD,
-            MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon,
-            MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
-            MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".ccd"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+public sealed partial class CloneCd
+{
+    /// <inheritdoc />
+    public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreAudioTracks  |
+                                                           OpticalImageCapabilities.CanStoreDataTracks   |
+                                                           OpticalImageCapabilities.CanStorePregaps      |
+                                                           OpticalImageCapabilities.CanStoreSubchannelRw |
+
+                                                           // TODO: Disabled until 6.0
+                                                           //OpticalImageCapabilities.CanStoreSessions     |
+                                                           OpticalImageCapabilities.CanStoreIsrc       |
+                                                           OpticalImageCapabilities.CanStoreCdText     |
+                                                           OpticalImageCapabilities.CanStoreMcn        |
+                                                           OpticalImageCapabilities.CanStoreRawData    |
+                                                           OpticalImageCapabilities.CanStoreCookedData |
+                                                           OpticalImageCapabilities.CanStoreMultipleTracks;
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "CloneCD";
+    /// <inheritdoc />
+    public Guid Id => new Guid("EE9C2975-2E79-427A-8EE9-F86F19165784");
+    /// <inheritdoc />
+    public string Format => "CloneCD";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<Partition> Partitions { get; private set; }
+    /// <inheritdoc />
+    public List<Track> Tracks { get; private set; }
+    /// <inheritdoc />
+    public List<Session> Sessions { get; private set; }
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new[]
+    {
+        MediaTagType.CD_MCN, MediaTagType.CD_FullTOC
+    };
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new[]
+    {
+        SectorTagType.CdSectorEcc, SectorTagType.CdSectorEccP, SectorTagType.CdSectorEccQ,
+        SectorTagType.CdSectorEdc, SectorTagType.CdSectorHeader, SectorTagType.CdSectorSubHeader,
+        SectorTagType.CdSectorSync, SectorTagType.CdTrackFlags, SectorTagType.CdSectorSubchannel
+    };
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.CD, MediaType.CDDA, MediaType.CDEG, MediaType.CDG, MediaType.CDI, MediaType.CDMIDI,
+        MediaType.CDMRW, MediaType.CDPLUS, MediaType.CDR, MediaType.CDROM, MediaType.CDROMXA, MediaType.CDRW,
+        MediaType.CDV, MediaType.DTSCD, MediaType.JaguarCD, MediaType.MEGACD, MediaType.PS1CD, MediaType.PS2CD,
+        MediaType.SuperCDROM2, MediaType.SVCD, MediaType.SATURNCD, MediaType.ThreeDO, MediaType.VCD,
+        MediaType.VCDHD, MediaType.NeoGeoCD, MediaType.PCFX, MediaType.CDTV, MediaType.CD32, MediaType.Nuon,
+        MediaType.Playdia, MediaType.Pippin, MediaType.FMTOWNS, MediaType.MilCD, MediaType.VideoNow,
+        MediaType.VideoNowColor, MediaType.VideoNowXp, MediaType.CVD, MediaType.PCD
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
+            {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".ccd"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/Read.cs b/Aaru.Images/CloneCD/Read.cs
index 940b47990..ce53a9673 100644
--- a/Aaru.Images/CloneCD/Read.cs
+++ b/Aaru.Images/CloneCD/Read.cs
@@ -43,619 +43,660 @@ using Aaru.Console;
 using Aaru.Decoders.CD;
 using Session = Aaru.CommonTypes.Structs.Session;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CloneCd
 {
-    public sealed partial class CloneCd
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        if(imageFilter == null)
+            return ErrorNumber.NoSuchFile;
+
+        _ccdFilter = imageFilter;
+
+        try
         {
-            if(imageFilter == null)
-                return ErrorNumber.NoSuchFile;
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+            _cueStream = new StreamReader(imageFilter.GetDataForkStream());
+            int lineNumber = 0;
 
-            _ccdFilter = imageFilter;
+            var ccdIdRegex     = new Regex(CCD_IDENTIFIER);
+            var discIdRegex    = new Regex(DISC_IDENTIFIER);
+            var sessIdRegex    = new Regex(SESSION_IDENTIFIER);
+            var entryIdRegex   = new Regex(ENTRY_IDENTIFIER);
+            var trackIdRegex   = new Regex(TRACK_IDENTIFIER);
+            var cdtIdRegex     = new Regex(CDTEXT_IDENTIFIER);
+            var ccdVerRegex    = new Regex(CCD_VERSION);
+            var discEntRegex   = new Regex(DISC_ENTRIES);
+            var discSessRegex  = new Regex(DISC_SESSIONS);
+            var discScrRegex   = new Regex(DISC_SCRAMBLED);
+            var cdtLenRegex    = new Regex(CDTEXT_LENGTH);
+            var discCatRegex   = new Regex(DISC_CATALOG);
+            var sessPregRegex  = new Regex(SESSION_PREGAP);
+            var sessSubcRegex  = new Regex(SESSION_SUBCHANNEL);
+            var entSessRegex   = new Regex(ENTRY_SESSION);
+            var entPointRegex  = new Regex(ENTRY_POINT);
+            var entAdrRegex    = new Regex(ENTRY_ADR);
+            var entCtrlRegex   = new Regex(ENTRY_CONTROL);
+            var entTnoRegex    = new Regex(ENTRY_TRACKNO);
+            var entAMinRegex   = new Regex(ENTRY_AMIN);
+            var entASecRegex   = new Regex(ENTRY_ASEC);
+            var entAFrameRegex = new Regex(ENTRY_AFRAME);
+            var entAlbaRegex   = new Regex(ENTRY_ALBA);
+            var entZeroRegex   = new Regex(ENTRY_ZERO);
+            var entPMinRegex   = new Regex(ENTRY_PMIN);
+            var entPSecRegex   = new Regex(ENTRY_PSEC);
+            var entPFrameRegex = new Regex(ENTRY_PFRAME);
+            var entPlbaRegex   = new Regex(ENTRY_PLBA);
+            var cdtEntsRegex   = new Regex(CDTEXT_ENTRIES);
+            var cdtEntRegex    = new Regex(CDTEXT_ENTRY);
+            var trkModeRegex   = new Regex(TRACK_MODE);
+            var trkIndexRegex  = new Regex(TRACK_INDEX);
 
-            try
+            bool                                    inCcd             = false;
+            bool                                    inDisk            = false;
+            bool                                    inSession         = false;
+            bool                                    inEntry           = false;
+            bool                                    inTrack           = false;
+            bool                                    inCdText          = false;
+            var                                     cdtMs             = new MemoryStream();
+            int                                     minSession        = int.MaxValue;
+            int                                     maxSession        = int.MinValue;
+            var                                     currentEntry      = new FullTOC.TrackDataDescriptor();
+            byte                                    currentTrackEntry = 0;
+            Dictionary<byte, int>                   trackModes        = new();
+            Dictionary<byte, Dictionary<byte, int>> trackIndexes      = new();
+            List<FullTOC.TrackDataDescriptor>       entries           = new();
+            _scrambled = false;
+            _catalog   = null;
+
+            while(_cueStream.Peek() >= 0)
             {
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
-                _cueStream = new StreamReader(imageFilter.GetDataForkStream());
-                int lineNumber = 0;
+                lineNumber++;
+                string line = _cueStream.ReadLine();
 
-                var ccdIdRegex     = new Regex(CCD_IDENTIFIER);
-                var discIdRegex    = new Regex(DISC_IDENTIFIER);
-                var sessIdRegex    = new Regex(SESSION_IDENTIFIER);
-                var entryIdRegex   = new Regex(ENTRY_IDENTIFIER);
-                var trackIdRegex   = new Regex(TRACK_IDENTIFIER);
-                var cdtIdRegex     = new Regex(CDTEXT_IDENTIFIER);
-                var ccdVerRegex    = new Regex(CCD_VERSION);
-                var discEntRegex   = new Regex(DISC_ENTRIES);
-                var discSessRegex  = new Regex(DISC_SESSIONS);
-                var discScrRegex   = new Regex(DISC_SCRAMBLED);
-                var cdtLenRegex    = new Regex(CDTEXT_LENGTH);
-                var discCatRegex   = new Regex(DISC_CATALOG);
-                var sessPregRegex  = new Regex(SESSION_PREGAP);
-                var sessSubcRegex  = new Regex(SESSION_SUBCHANNEL);
-                var entSessRegex   = new Regex(ENTRY_SESSION);
-                var entPointRegex  = new Regex(ENTRY_POINT);
-                var entAdrRegex    = new Regex(ENTRY_ADR);
-                var entCtrlRegex   = new Regex(ENTRY_CONTROL);
-                var entTnoRegex    = new Regex(ENTRY_TRACKNO);
-                var entAMinRegex   = new Regex(ENTRY_AMIN);
-                var entASecRegex   = new Regex(ENTRY_ASEC);
-                var entAFrameRegex = new Regex(ENTRY_AFRAME);
-                var entAlbaRegex   = new Regex(ENTRY_ALBA);
-                var entZeroRegex   = new Regex(ENTRY_ZERO);
-                var entPMinRegex   = new Regex(ENTRY_PMIN);
-                var entPSecRegex   = new Regex(ENTRY_PSEC);
-                var entPFrameRegex = new Regex(ENTRY_PFRAME);
-                var entPlbaRegex   = new Regex(ENTRY_PLBA);
-                var cdtEntsRegex   = new Regex(CDTEXT_ENTRIES);
-                var cdtEntRegex    = new Regex(CDTEXT_ENTRY);
-                var trkModeRegex   = new Regex(TRACK_MODE);
-                var trkIndexRegex  = new Regex(TRACK_INDEX);
+                Match ccdIdMatch   = ccdIdRegex.Match(line);
+                Match discIdMatch  = discIdRegex.Match(line);
+                Match sessIdMatch  = sessIdRegex.Match(line);
+                Match entryIdMatch = entryIdRegex.Match(line);
+                Match trackIdMatch = trackIdRegex.Match(line);
+                Match cdtIdMatch   = cdtIdRegex.Match(line);
 
-                bool                                    inCcd             = false;
-                bool                                    inDisk            = false;
-                bool                                    inSession         = false;
-                bool                                    inEntry           = false;
-                bool                                    inTrack           = false;
-                bool                                    inCdText          = false;
-                var                                     cdtMs             = new MemoryStream();
-                int                                     minSession        = int.MaxValue;
-                int                                     maxSession        = int.MinValue;
-                var                                     currentEntry      = new FullTOC.TrackDataDescriptor();
-                byte                                    currentTrackEntry = 0;
-                Dictionary<byte, int>                   trackModes        = new();
-                Dictionary<byte, Dictionary<byte, int>> trackIndexes      = new();
-                List<FullTOC.TrackDataDescriptor>       entries           = new();
-                _scrambled = false;
-                _catalog   = null;
-
-                while(_cueStream.Peek() >= 0)
+                // [CloneCD]
+                if(ccdIdMatch.Success)
                 {
-                    lineNumber++;
-                    string line = _cueStream.ReadLine();
-
-                    Match ccdIdMatch   = ccdIdRegex.Match(line);
-                    Match discIdMatch  = discIdRegex.Match(line);
-                    Match sessIdMatch  = sessIdRegex.Match(line);
-                    Match entryIdMatch = entryIdRegex.Match(line);
-                    Match trackIdMatch = trackIdRegex.Match(line);
-                    Match cdtIdMatch   = cdtIdRegex.Match(line);
-
-                    // [CloneCD]
-                    if(ccdIdMatch.Success)
+                    if(inDisk    ||
+                       inSession ||
+                       inEntry   ||
+                       inTrack   ||
+                       inCdText)
                     {
-                        if(inDisk    ||
-                           inSession ||
-                           inEntry   ||
-                           inTrack   ||
-                           inCdText)
-                        {
-                            AaruConsole.ErrorWriteLine($"Found [CloneCD] out of order in line {lineNumber}");
+                        AaruConsole.ErrorWriteLine($"Found [CloneCD] out of order in line {lineNumber}");
 
-                            return ErrorNumber.InvalidArgument;
-                        }
-
-                        inCcd     = true;
-                        inDisk    = false;
-                        inSession = false;
-                        inEntry   = false;
-                        inTrack   = false;
-                        inCdText  = false;
+                        return ErrorNumber.InvalidArgument;
                     }
-                    else if(discIdMatch.Success  ||
-                            sessIdMatch.Success  ||
-                            entryIdMatch.Success ||
-                            trackIdMatch.Success ||
-                            cdtIdMatch.Success)
+
+                    inCcd     = true;
+                    inDisk    = false;
+                    inSession = false;
+                    inEntry   = false;
+                    inTrack   = false;
+                    inCdText  = false;
+                }
+                else if(discIdMatch.Success  ||
+                        sessIdMatch.Success  ||
+                        entryIdMatch.Success ||
+                        trackIdMatch.Success ||
+                        cdtIdMatch.Success)
+                {
+                    if(inEntry)
                     {
-                        if(inEntry)
+                        entries.Add(currentEntry);
+                        currentEntry = new FullTOC.TrackDataDescriptor();
+                    }
+
+                    inCcd     = false;
+                    inDisk    = discIdMatch.Success;
+                    inSession = sessIdMatch.Success;
+                    inEntry   = entryIdMatch.Success;
+                    inTrack   = trackIdMatch.Success;
+                    inCdText  = cdtIdMatch.Success;
+
+                    if(inTrack)
+                        currentTrackEntry = Convert.ToByte(trackIdMatch.Groups["number"].Value, 10);
+                }
+                else
+                {
+                    if(inCcd)
+                    {
+                        Match ccdVerMatch = ccdVerRegex.Match(line);
+
+                        if(!ccdVerMatch.Success)
+                            continue;
+
+                        AaruConsole.DebugWriteLine("CloneCD plugin", "Found Version at line {0}", lineNumber);
+
+                        _imageInfo.Version = ccdVerMatch.Groups["value"].Value;
+
+                        if(_imageInfo.Version != "2" &&
+                           _imageInfo.Version != "3")
+                            AaruConsole.
+                                ErrorWriteLine("(CloneCD plugin): Warning! Unknown CCD image version {0}, may not work!",
+                                               _imageInfo.Version);
+                    }
+                    else if(inDisk)
+                    {
+                        Match discEntMatch  = discEntRegex.Match(line);
+                        Match discSessMatch = discSessRegex.Match(line);
+                        Match discScrMatch  = discScrRegex.Match(line);
+                        Match cdtLenMatch   = cdtLenRegex.Match(line);
+                        Match discCatMatch  = discCatRegex.Match(line);
+
+                        if(discEntMatch.Success)
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found TocEntries at line {0}",
+                                                       lineNumber);
+                        else if(discSessMatch.Success)
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found Sessions at line {0}", lineNumber);
+                        else if(discScrMatch.Success)
                         {
-                            entries.Add(currentEntry);
-                            currentEntry = new FullTOC.TrackDataDescriptor();
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found DataTracksScrambled at line {0}",
+                                                       lineNumber);
+
+                            _scrambled |= discScrMatch.Groups["value"].Value == "1";
+                        }
+                        else if(cdtLenMatch.Success)
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found CDTextLength at line {0}",
+                                                       lineNumber);
+                        else if(discCatMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found Catalog at line {0}", lineNumber);
+                            _catalog = discCatMatch.Groups["value"].Value;
+                        }
+                    }
+
+                    // TODO: Do not suppose here entries come sorted
+                    else if(inCdText)
+                    {
+                        Match cdtEntsMatch = cdtEntsRegex.Match(line);
+                        Match cdtEntMatch  = cdtEntRegex.Match(line);
+
+                        if(cdtEntsMatch.Success)
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found CD-Text Entries at line {0}",
+                                                       lineNumber);
+                        else if(cdtEntMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found CD-Text Entry at line {0}",
+                                                       lineNumber);
+
+                            string[] bytes = cdtEntMatch.Groups["value"].Value.Split(new[]
+                            {
+                                ' '
+                            }, StringSplitOptions.RemoveEmptyEntries);
+
+                            foreach(string byt in bytes)
+                                cdtMs.WriteByte(Convert.ToByte(byt, 16));
+                        }
+                    }
+
+                    // Is this useful?
+                    else if(inSession)
+                    {
+                        Match sessPregMatch = sessPregRegex.Match(line);
+                        Match sessSubcMatch = sessSubcRegex.Match(line);
+
+                        if(sessPregMatch.Success)
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found PreGapMode at line {0}",
+                                                       lineNumber);
+                        else if(sessSubcMatch.Success)
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found PreGapSubC at line {0}",
+                                                       lineNumber);
+                    }
+                    else if(inEntry)
+                    {
+                        Match entSessMatch   = entSessRegex.Match(line);
+                        Match entPointMatch  = entPointRegex.Match(line);
+                        Match entAdrMatch    = entAdrRegex.Match(line);
+                        Match entCtrlMatch   = entCtrlRegex.Match(line);
+                        Match entTnoMatch    = entTnoRegex.Match(line);
+                        Match entAMinMatch   = entAMinRegex.Match(line);
+                        Match entASecMatch   = entASecRegex.Match(line);
+                        Match entAFrameMatch = entAFrameRegex.Match(line);
+                        Match entAlbaMatch   = entAlbaRegex.Match(line);
+                        Match entZeroMatch   = entZeroRegex.Match(line);
+                        Match entPMinMatch   = entPMinRegex.Match(line);
+                        Match entPSecMatch   = entPSecRegex.Match(line);
+                        Match entPFrameMatch = entPFrameRegex.Match(line);
+                        Match entPlbaMatch   = entPlbaRegex.Match(line);
+
+                        if(entSessMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found Session at line {0}", lineNumber);
+                            currentEntry.SessionNumber = Convert.ToByte(entSessMatch.Groups["value"].Value, 10);
+
+                            if(currentEntry.SessionNumber < minSession)
+                                minSession = currentEntry.SessionNumber;
+
+                            if(currentEntry.SessionNumber > maxSession)
+                                maxSession = currentEntry.SessionNumber;
+                        }
+                        else if(entPointMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found Point at line {0}", lineNumber);
+                            currentEntry.POINT = Convert.ToByte(entPointMatch.Groups["value"].Value, 16);
+                        }
+                        else if(entAdrMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found ADR at line {0}", lineNumber);
+                            currentEntry.ADR = Convert.ToByte(entAdrMatch.Groups["value"].Value, 16);
+                        }
+                        else if(entCtrlMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found Control at line {0}", lineNumber);
+                            currentEntry.CONTROL = Convert.ToByte(entCtrlMatch.Groups["value"].Value, 16);
+                        }
+                        else if(entTnoMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found TrackNo at line {0}", lineNumber);
+                            currentEntry.TNO = Convert.ToByte(entTnoMatch.Groups["value"].Value, 10);
+                        }
+                        else if(entAMinMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found AMin at line {0}", lineNumber);
+                            currentEntry.Min = Convert.ToByte(entAMinMatch.Groups["value"].Value, 10);
+                        }
+                        else if(entASecMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found ASec at line {0}", lineNumber);
+                            currentEntry.Sec = Convert.ToByte(entASecMatch.Groups["value"].Value, 10);
+                        }
+                        else if(entAFrameMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found AFrame at line {0}", lineNumber);
+                            currentEntry.Frame = Convert.ToByte(entAFrameMatch.Groups["value"].Value, 10);
+                        }
+                        else if(entAlbaMatch.Success)
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found ALBA at line {0}", lineNumber);
+                        else if(entZeroMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found Zero at line {0}", lineNumber);
+                            currentEntry.Zero  = Convert.ToByte(entZeroMatch.Groups["value"].Value, 10);
+                            currentEntry.HOUR  = (byte)((currentEntry.Zero & 0xF0) >> 4);
+                            currentEntry.PHOUR = (byte)(currentEntry.Zero & 0x0F);
+                        }
+                        else if(entPMinMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found PMin at line {0}", lineNumber);
+                            currentEntry.PMIN = Convert.ToByte(entPMinMatch.Groups["value"].Value, 10);
+                        }
+                        else if(entPSecMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found PSec at line {0}", lineNumber);
+                            currentEntry.PSEC = Convert.ToByte(entPSecMatch.Groups["value"].Value, 10);
+                        }
+                        else if(entPFrameMatch.Success)
+                        {
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found PFrame at line {0}", lineNumber);
+                            currentEntry.PFRAME = Convert.ToByte(entPFrameMatch.Groups["value"].Value, 10);
+                        }
+                        else if(entPlbaMatch.Success)
+                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found PLBA at line {0}", lineNumber);
+                    }
+                    else if(inTrack)
+                    {
+                        Match trkModeMatch  = trkModeRegex.Match(line);
+                        Match trkIndexMatch = trkIndexRegex.Match(line);
+
+                        if(trkModeMatch.Success &&
+                           currentTrackEntry > 0)
+                            trackModes[currentTrackEntry] = Convert.ToByte(trkModeMatch.Groups["value"].Value, 10);
+                        else if(trkIndexMatch.Success &&
+                                currentTrackEntry > 0)
+                        {
+                            byte indexNo  = Convert.ToByte(trkIndexMatch.Groups["index"].Value, 10);
+                            int  indexLba = Convert.ToInt32(trkIndexMatch.Groups["lba"].Value, 10);
+
+                            if(!trackIndexes.TryGetValue(currentTrackEntry, out _))
+                                trackIndexes[currentTrackEntry] = new Dictionary<byte, int>();
+
+                            trackIndexes[currentTrackEntry][indexNo] = indexLba;
+                        }
+                    }
+                }
+            }
+
+            if(inEntry)
+                entries.Add(currentEntry);
+
+            if(entries.Count == 0)
+            {
+                AaruConsole.ErrorWriteLine("Did not find any track.");
+
+                return ErrorNumber.InvalidArgument;
+            }
+
+            FullTOC.CDFullTOC toc;
+            toc.TrackDescriptors     = entries.ToArray();
+            toc.LastCompleteSession  = (byte)maxSession;
+            toc.FirstCompleteSession = (byte)minSession;
+            toc.DataLength           = (ushort)((entries.Count * 11) + 2);
+            var tocMs = new MemoryStream();
+            tocMs.WriteByte(toc.FirstCompleteSession);
+            tocMs.WriteByte(toc.LastCompleteSession);
+
+            foreach(FullTOC.TrackDataDescriptor descriptor in toc.TrackDescriptors)
+            {
+                tocMs.WriteByte(descriptor.SessionNumber);
+                tocMs.WriteByte((byte)((descriptor.ADR << 4) + descriptor.CONTROL));
+                tocMs.WriteByte(descriptor.TNO);
+                tocMs.WriteByte(descriptor.POINT);
+                tocMs.WriteByte(descriptor.Min);
+                tocMs.WriteByte(descriptor.Sec);
+                tocMs.WriteByte(descriptor.Frame);
+                tocMs.WriteByte(descriptor.Zero);
+                tocMs.WriteByte(descriptor.PMIN);
+                tocMs.WriteByte(descriptor.PSEC);
+                tocMs.WriteByte(descriptor.PFRAME);
+            }
+
+            _fullToc = tocMs.ToArray();
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_FullTOC);
+
+            string dataFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".img";
+            string subFile  = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".sub";
+
+            var filtersList = new FiltersList();
+            _dataFilter = filtersList.GetFilter(dataFile);
+
+            if(_dataFilter == null)
+            {
+                AaruConsole.ErrorWriteLine("Cannot open data file");
+
+                return ErrorNumber.NoSuchFile;
+            }
+
+            filtersList = new FiltersList();
+            _subFilter  = filtersList.GetFilter(subFile);
+
+            int  curSessionNo        = 0;
+            var  currentTrack        = new Track();
+            bool firstTrackInSession = true;
+            Tracks = new List<Track>();
+            ulong leadOutStart = 0;
+
+            _dataStream = _dataFilter.GetDataForkStream();
+
+            if(_subFilter != null)
+                _subStream = _subFilter.GetDataForkStream();
+
+            _trackFlags = new Dictionary<byte, byte>();
+
+            foreach(FullTOC.TrackDataDescriptor descriptor in entries)
+            {
+                if(descriptor.SessionNumber > curSessionNo)
+                {
+                    curSessionNo = descriptor.SessionNumber;
+
+                    if(!firstTrackInSession)
+                    {
+                        currentTrack.EndSector = leadOutStart - 1;
+                        Tracks.Add(currentTrack);
+                    }
+
+                    firstTrackInSession = true;
+                }
+
+                switch(descriptor.ADR)
+                {
+                    case 1:
+                    case 4:
+                        switch(descriptor.POINT)
+                        {
+                            case 0xA0:
+                                byte discType = descriptor.PSEC;
+                                AaruConsole.DebugWriteLine("CloneCD plugin", "Disc Type: {0}", discType);
+
+                                break;
+                            case 0xA2:
+                                leadOutStart = GetLba(descriptor.PMIN, descriptor.PSEC, descriptor.PFRAME);
+
+                                break;
+                            default:
+                                if(descriptor.POINT >= 0x01 &&
+                                   descriptor.POINT <= 0x63)
+                                {
+                                    if(!firstTrackInSession)
+                                    {
+                                        currentTrack.EndSector =
+                                            GetLba(descriptor.PMIN, descriptor.PSEC, descriptor.PFRAME) - 1;
+
+                                        Tracks.Add(currentTrack);
+                                    }
+
+                                    currentTrack = new Track
+                                    {
+                                        BytesPerSector    = 2352,
+                                        File              = _dataFilter.Filename,
+                                        FileType          = _scrambled ? "SCRAMBLED" : "BINARY",
+                                        Filter            = _dataFilter,
+                                        RawBytesPerSector = 2352,
+                                        Sequence          = descriptor.POINT,
+                                        StartSector       = GetLba(descriptor.PMIN, descriptor.PSEC, descriptor.PFRAME),
+                                        Session           = descriptor.SessionNumber
+                                    };
+
+                                    if(descriptor.POINT == 1)
+                                    {
+                                        currentTrack.Pregap      = currentTrack.StartSector + 150;
+                                        currentTrack.Indexes[0]  = -150;
+                                        currentTrack.Indexes[1]  = (int)currentTrack.StartSector;
+                                        currentTrack.StartSector = 0;
+                                    }
+                                    else
+                                    {
+                                        if(firstTrackInSession)
+                                        {
+                                            currentTrack.Pregap = 150;
+
+                                            if(currentTrack.StartSector > 0)
+                                            {
+                                                currentTrack.Indexes[0] = (int)currentTrack.StartSector - 150;
+
+                                                if(currentTrack.Indexes[0] < 0)
+                                                    currentTrack.Indexes[0] = 0;
+                                            }
+
+                                            currentTrack.Indexes[1]  =  (int)currentTrack.StartSector;
+                                            currentTrack.StartSector -= 150;
+                                        }
+                                        else
+                                            currentTrack.Indexes[1] = (int)currentTrack.StartSector;
+                                    }
+
+                                    firstTrackInSession = false;
+
+                                    // Need to check exact data type later
+                                    if((TocControl)(descriptor.CONTROL & 0x0D) == TocControl.DataTrack ||
+                                       (TocControl)(descriptor.CONTROL & 0x0D) == TocControl.DataTrackIncremental)
+                                        currentTrack.Type = TrackType.Data;
+                                    else
+                                        currentTrack.Type = TrackType.Audio;
+
+                                    if(!_trackFlags.ContainsKey(descriptor.POINT))
+                                        _trackFlags.Add(descriptor.POINT, descriptor.CONTROL);
+
+                                    if(_subFilter != null)
+                                    {
+                                        currentTrack.SubchannelFile   = _subFilter.Filename;
+                                        currentTrack.SubchannelFilter = _subFilter;
+                                        currentTrack.SubchannelType   = TrackSubchannelType.Raw;
+                                    }
+                                    else
+                                        currentTrack.SubchannelType = TrackSubchannelType.None;
+                                }
+
+                                break;
                         }
 
-                        inCcd     = false;
-                        inDisk    = discIdMatch.Success;
-                        inSession = sessIdMatch.Success;
-                        inEntry   = entryIdMatch.Success;
-                        inTrack   = trackIdMatch.Success;
-                        inCdText  = cdtIdMatch.Success;
+                        break;
+                    case 5:
+                        switch(descriptor.POINT)
+                        {
+                            case 0xC0:
+                                if(descriptor.PMIN == 97)
+                                {
+                                    int type = descriptor.PFRAME % 10;
+                                    int frm  = descriptor.PFRAME - type;
 
-                        if(inTrack)
-                            currentTrackEntry = Convert.ToByte(trackIdMatch.Groups["number"].Value, 10);
+                                    _imageInfo.MediaManufacturer = ATIP.ManufacturerFromATIP(descriptor.PSEC, frm);
+
+                                    if(_imageInfo.MediaManufacturer != "")
+                                        AaruConsole.DebugWriteLine("CloneCD plugin", "Disc manufactured by: {0}",
+                                                                   _imageInfo.MediaManufacturer);
+                                }
+
+                                break;
+                        }
+
+                        break;
+                    case 6:
+                    {
+                        uint id = (uint)((descriptor.Min << 16) + (descriptor.Sec << 8) + descriptor.Frame);
+                        AaruConsole.DebugWriteLine("CloneCD plugin", "Disc ID: {0:X6}", id & 0x00FFFFFF);
+                        _imageInfo.MediaSerialNumber = $"{id                               & 0x00FFFFFF:X6}";
+
+                        break;
+                    }
+                }
+            }
+
+            if(!firstTrackInSession)
+            {
+                currentTrack.EndSector = leadOutStart - 1;
+                Tracks.Add(currentTrack);
+            }
+
+            Track[] tmpTracks = Tracks.OrderBy(t => t.Sequence).ToArray();
+
+            ulong currentDataOffset       = 0;
+            ulong currentSubchannelOffset = 0;
+
+            foreach(Track tmpTrack in tmpTracks)
+            {
+                tmpTrack.FileOffset = currentDataOffset;
+
+                currentDataOffset += 2352 * (tmpTrack.EndSector - (ulong)tmpTrack.Indexes[1] + 1);
+
+                if(_subFilter != null)
+                {
+                    tmpTrack.SubchannelOffset = currentSubchannelOffset;
+
+                    currentSubchannelOffset += 96 * (tmpTrack.EndSector - (ulong)tmpTrack.Indexes[1] + 1);
+                }
+
+                if(tmpTrack.Indexes.TryGetValue(0, out int idx0))
+                {
+                    if(idx0 < 0)
+                    {
+                        tmpTrack.FileOffset       = 0;
+                        tmpTrack.SubchannelOffset = 0;
                     }
                     else
                     {
-                        if(inCcd)
-                        {
-                            Match ccdVerMatch = ccdVerRegex.Match(line);
+                        int indexDifference = tmpTrack.Indexes[1] - idx0;
+                        tmpTrack.FileOffset -= (ulong)(2352 * indexDifference);
 
-                            if(!ccdVerMatch.Success)
-                                continue;
-
-                            AaruConsole.DebugWriteLine("CloneCD plugin", "Found Version at line {0}", lineNumber);
-
-                            _imageInfo.Version = ccdVerMatch.Groups["value"].Value;
-
-                            if(_imageInfo.Version != "2" &&
-                               _imageInfo.Version != "3")
-                                AaruConsole.
-                                    ErrorWriteLine("(CloneCD plugin): Warning! Unknown CCD image version {0}, may not work!",
-                                                   _imageInfo.Version);
-                        }
-                        else if(inDisk)
-                        {
-                            Match discEntMatch  = discEntRegex.Match(line);
-                            Match discSessMatch = discSessRegex.Match(line);
-                            Match discScrMatch  = discScrRegex.Match(line);
-                            Match cdtLenMatch   = cdtLenRegex.Match(line);
-                            Match discCatMatch  = discCatRegex.Match(line);
-
-                            if(discEntMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found TocEntries at line {0}",
-                                                           lineNumber);
-                            else if(discSessMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found Sessions at line {0}", lineNumber);
-                            else if(discScrMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found DataTracksScrambled at line {0}",
-                                                           lineNumber);
-
-                                _scrambled |= discScrMatch.Groups["value"].Value == "1";
-                            }
-                            else if(cdtLenMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found CDTextLength at line {0}",
-                                                           lineNumber);
-                            else if(discCatMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found Catalog at line {0}", lineNumber);
-                                _catalog = discCatMatch.Groups["value"].Value;
-                            }
-                        }
-
-                        // TODO: Do not suppose here entries come sorted
-                        else if(inCdText)
-                        {
-                            Match cdtEntsMatch = cdtEntsRegex.Match(line);
-                            Match cdtEntMatch  = cdtEntRegex.Match(line);
-
-                            if(cdtEntsMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found CD-Text Entries at line {0}",
-                                                           lineNumber);
-                            else if(cdtEntMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found CD-Text Entry at line {0}",
-                                                           lineNumber);
-
-                                string[] bytes = cdtEntMatch.Groups["value"].Value.Split(new[]
-                                {
-                                    ' '
-                                }, StringSplitOptions.RemoveEmptyEntries);
-
-                                foreach(string byt in bytes)
-                                    cdtMs.WriteByte(Convert.ToByte(byt, 16));
-                            }
-                        }
-
-                        // Is this useful?
-                        else if(inSession)
-                        {
-                            Match sessPregMatch = sessPregRegex.Match(line);
-                            Match sessSubcMatch = sessSubcRegex.Match(line);
-
-                            if(sessPregMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found PreGapMode at line {0}",
-                                                           lineNumber);
-                            else if(sessSubcMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found PreGapSubC at line {0}",
-                                                           lineNumber);
-                        }
-                        else if(inEntry)
-                        {
-                            Match entSessMatch   = entSessRegex.Match(line);
-                            Match entPointMatch  = entPointRegex.Match(line);
-                            Match entAdrMatch    = entAdrRegex.Match(line);
-                            Match entCtrlMatch   = entCtrlRegex.Match(line);
-                            Match entTnoMatch    = entTnoRegex.Match(line);
-                            Match entAMinMatch   = entAMinRegex.Match(line);
-                            Match entASecMatch   = entASecRegex.Match(line);
-                            Match entAFrameMatch = entAFrameRegex.Match(line);
-                            Match entAlbaMatch   = entAlbaRegex.Match(line);
-                            Match entZeroMatch   = entZeroRegex.Match(line);
-                            Match entPMinMatch   = entPMinRegex.Match(line);
-                            Match entPSecMatch   = entPSecRegex.Match(line);
-                            Match entPFrameMatch = entPFrameRegex.Match(line);
-                            Match entPlbaMatch   = entPlbaRegex.Match(line);
-
-                            if(entSessMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found Session at line {0}", lineNumber);
-                                currentEntry.SessionNumber = Convert.ToByte(entSessMatch.Groups["value"].Value, 10);
-
-                                if(currentEntry.SessionNumber < minSession)
-                                    minSession = currentEntry.SessionNumber;
-
-                                if(currentEntry.SessionNumber > maxSession)
-                                    maxSession = currentEntry.SessionNumber;
-                            }
-                            else if(entPointMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found Point at line {0}", lineNumber);
-                                currentEntry.POINT = Convert.ToByte(entPointMatch.Groups["value"].Value, 16);
-                            }
-                            else if(entAdrMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found ADR at line {0}", lineNumber);
-                                currentEntry.ADR = Convert.ToByte(entAdrMatch.Groups["value"].Value, 16);
-                            }
-                            else if(entCtrlMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found Control at line {0}", lineNumber);
-                                currentEntry.CONTROL = Convert.ToByte(entCtrlMatch.Groups["value"].Value, 16);
-                            }
-                            else if(entTnoMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found TrackNo at line {0}", lineNumber);
-                                currentEntry.TNO = Convert.ToByte(entTnoMatch.Groups["value"].Value, 10);
-                            }
-                            else if(entAMinMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found AMin at line {0}", lineNumber);
-                                currentEntry.Min = Convert.ToByte(entAMinMatch.Groups["value"].Value, 10);
-                            }
-                            else if(entASecMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found ASec at line {0}", lineNumber);
-                                currentEntry.Sec = Convert.ToByte(entASecMatch.Groups["value"].Value, 10);
-                            }
-                            else if(entAFrameMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found AFrame at line {0}", lineNumber);
-                                currentEntry.Frame = Convert.ToByte(entAFrameMatch.Groups["value"].Value, 10);
-                            }
-                            else if(entAlbaMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found ALBA at line {0}", lineNumber);
-                            else if(entZeroMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found Zero at line {0}", lineNumber);
-                                currentEntry.Zero  = Convert.ToByte(entZeroMatch.Groups["value"].Value, 10);
-                                currentEntry.HOUR  = (byte)((currentEntry.Zero & 0xF0) >> 4);
-                                currentEntry.PHOUR = (byte)(currentEntry.Zero & 0x0F);
-                            }
-                            else if(entPMinMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found PMin at line {0}", lineNumber);
-                                currentEntry.PMIN = Convert.ToByte(entPMinMatch.Groups["value"].Value, 10);
-                            }
-                            else if(entPSecMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found PSec at line {0}", lineNumber);
-                                currentEntry.PSEC = Convert.ToByte(entPSecMatch.Groups["value"].Value, 10);
-                            }
-                            else if(entPFrameMatch.Success)
-                            {
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found PFrame at line {0}", lineNumber);
-                                currentEntry.PFRAME = Convert.ToByte(entPFrameMatch.Groups["value"].Value, 10);
-                            }
-                            else if(entPlbaMatch.Success)
-                                AaruConsole.DebugWriteLine("CloneCD plugin", "Found PLBA at line {0}", lineNumber);
-                        }
-                        else if(inTrack)
-                        {
-                            Match trkModeMatch  = trkModeRegex.Match(line);
-                            Match trkIndexMatch = trkIndexRegex.Match(line);
-
-                            if(trkModeMatch.Success &&
-                               currentTrackEntry > 0)
-                                trackModes[currentTrackEntry] = Convert.ToByte(trkModeMatch.Groups["value"].Value, 10);
-                            else if(trkIndexMatch.Success &&
-                                    currentTrackEntry > 0)
-                            {
-                                byte indexNo  = Convert.ToByte(trkIndexMatch.Groups["index"].Value, 10);
-                                int  indexLba = Convert.ToInt32(trkIndexMatch.Groups["lba"].Value, 10);
-
-                                if(!trackIndexes.TryGetValue(currentTrackEntry, out _))
-                                    trackIndexes[currentTrackEntry] = new Dictionary<byte, int>();
-
-                                trackIndexes[currentTrackEntry][indexNo] = indexLba;
-                            }
-                        }
+                        if(_subFilter != null)
+                            tmpTrack.SubchannelOffset -= (ulong)(96 * indexDifference);
                     }
                 }
 
-                if(inEntry)
-                    entries.Add(currentEntry);
-
-                if(entries.Count == 0)
-                {
-                    AaruConsole.ErrorWriteLine("Did not find any track.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                FullTOC.CDFullTOC toc;
-                toc.TrackDescriptors     = entries.ToArray();
-                toc.LastCompleteSession  = (byte)maxSession;
-                toc.FirstCompleteSession = (byte)minSession;
-                toc.DataLength           = (ushort)((entries.Count * 11) + 2);
-                var tocMs = new MemoryStream();
-                tocMs.WriteByte(toc.FirstCompleteSession);
-                tocMs.WriteByte(toc.LastCompleteSession);
-
-                foreach(FullTOC.TrackDataDescriptor descriptor in toc.TrackDescriptors)
-                {
-                    tocMs.WriteByte(descriptor.SessionNumber);
-                    tocMs.WriteByte((byte)((descriptor.ADR << 4) + descriptor.CONTROL));
-                    tocMs.WriteByte(descriptor.TNO);
-                    tocMs.WriteByte(descriptor.POINT);
-                    tocMs.WriteByte(descriptor.Min);
-                    tocMs.WriteByte(descriptor.Sec);
-                    tocMs.WriteByte(descriptor.Frame);
-                    tocMs.WriteByte(descriptor.Zero);
-                    tocMs.WriteByte(descriptor.PMIN);
-                    tocMs.WriteByte(descriptor.PSEC);
-                    tocMs.WriteByte(descriptor.PFRAME);
-                }
-
-                _fullToc = tocMs.ToArray();
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_FullTOC);
-
-                string dataFile = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".img";
-                string subFile  = Path.GetFileNameWithoutExtension(imageFilter.BasePath) + ".sub";
-
-                var filtersList = new FiltersList();
-                _dataFilter = filtersList.GetFilter(dataFile);
-
-                if(_dataFilter == null)
-                {
-                    AaruConsole.ErrorWriteLine("Cannot open data file");
-
-                    return ErrorNumber.NoSuchFile;
-                }
-
-                filtersList = new FiltersList();
-                _subFilter  = filtersList.GetFilter(subFile);
-
-                int  curSessionNo        = 0;
-                var  currentTrack        = new Track();
-                bool firstTrackInSession = true;
-                Tracks = new List<Track>();
-                ulong leadOutStart = 0;
-
-                _dataStream = _dataFilter.GetDataForkStream();
-
-                if(_subFilter != null)
-                    _subStream = _subFilter.GetDataForkStream();
-
-                _trackFlags = new Dictionary<byte, byte>();
-
-                foreach(FullTOC.TrackDataDescriptor descriptor in entries)
-                {
-                    if(descriptor.SessionNumber > curSessionNo)
+                if(trackModes.TryGetValue((byte)tmpTrack.Sequence, out int trackMode))
+                    tmpTrack.Type = trackMode switch
                     {
-                        curSessionNo = descriptor.SessionNumber;
+                        0 => TrackType.Audio,
+                        1 => TrackType.CdMode1,
+                        2 => TrackType.CdMode2Formless,
+                        _ => TrackType.Data
+                    };
 
-                        if(!firstTrackInSession)
-                        {
-                            currentTrack.EndSector = leadOutStart - 1;
-                            Tracks.Add(currentTrack);
-                        }
+                if(trackIndexes.TryGetValue((byte)tmpTrack.Sequence, out Dictionary<byte, int> indexes))
+                {
+                    foreach((byte index, int value) in indexes.OrderBy(i => i.Key).
+                                                               Where(trackIndex => trackIndex.Key > 1))
 
-                        firstTrackInSession = true;
-                    }
+                        // Untested as of 20210711
+                        tmpTrack.Indexes[index] = value;
+                }
 
-                    switch(descriptor.ADR)
+                if(tmpTrack.Type == TrackType.Data)
+                {
+                    for(int s = 225; s < 750; s++)
                     {
-                        case 1:
-                        case 4:
-                            switch(descriptor.POINT)
-                            {
-                                case 0xA0:
-                                    byte discType = descriptor.PSEC;
-                                    AaruConsole.DebugWriteLine("CloneCD plugin", "Disc Type: {0}", discType);
+                        byte[] syncTest = new byte[12];
+                        byte[] sectTest = new byte[2352];
 
-                                    break;
-                                case 0xA2:
-                                    leadOutStart = GetLba(descriptor.PMIN, descriptor.PSEC, descriptor.PFRAME);
-
-                                    break;
-                                default:
-                                    if(descriptor.POINT >= 0x01 &&
-                                       descriptor.POINT <= 0x63)
-                                    {
-                                        if(!firstTrackInSession)
-                                        {
-                                            currentTrack.EndSector =
-                                                GetLba(descriptor.PMIN, descriptor.PSEC, descriptor.PFRAME) - 1;
-
-                                            Tracks.Add(currentTrack);
-                                        }
-
-                                        currentTrack = new Track
-                                        {
-                                            BytesPerSector = 2352,
-                                            File = _dataFilter.Filename,
-                                            FileType = _scrambled ? "SCRAMBLED" : "BINARY",
-                                            Filter = _dataFilter,
-                                            RawBytesPerSector = 2352,
-                                            Sequence = descriptor.POINT,
-                                            StartSector = GetLba(descriptor.PMIN, descriptor.PSEC, descriptor.PFRAME),
-                                            Session = descriptor.SessionNumber
-                                        };
-
-                                        if(descriptor.POINT == 1)
-                                        {
-                                            currentTrack.Pregap      = currentTrack.StartSector + 150;
-                                            currentTrack.Indexes[0]  = -150;
-                                            currentTrack.Indexes[1]  = (int)currentTrack.StartSector;
-                                            currentTrack.StartSector = 0;
-                                        }
-                                        else
-                                        {
-                                            if(firstTrackInSession)
-                                            {
-                                                currentTrack.Pregap = 150;
-
-                                                if(currentTrack.StartSector > 0)
-                                                {
-                                                    currentTrack.Indexes[0] = (int)currentTrack.StartSector - 150;
-
-                                                    if(currentTrack.Indexes[0] < 0)
-                                                        currentTrack.Indexes[0] = 0;
-                                                }
-
-                                                currentTrack.Indexes[1]  =  (int)currentTrack.StartSector;
-                                                currentTrack.StartSector -= 150;
-                                            }
-                                            else
-                                                currentTrack.Indexes[1] = (int)currentTrack.StartSector;
-                                        }
-
-                                        firstTrackInSession = false;
-
-                                        // Need to check exact data type later
-                                        if((TocControl)(descriptor.CONTROL & 0x0D) == TocControl.DataTrack ||
-                                           (TocControl)(descriptor.CONTROL & 0x0D) == TocControl.DataTrackIncremental)
-                                            currentTrack.Type = TrackType.Data;
-                                        else
-                                            currentTrack.Type = TrackType.Audio;
-
-                                        if(!_trackFlags.ContainsKey(descriptor.POINT))
-                                            _trackFlags.Add(descriptor.POINT, descriptor.CONTROL);
-
-                                        if(_subFilter != null)
-                                        {
-                                            currentTrack.SubchannelFile   = _subFilter.Filename;
-                                            currentTrack.SubchannelFilter = _subFilter;
-                                            currentTrack.SubchannelType   = TrackSubchannelType.Raw;
-                                        }
-                                        else
-                                            currentTrack.SubchannelType = TrackSubchannelType.None;
-                                    }
-
-                                    break;
-                            }
+                        long pos = (long)tmpTrack.FileOffset + (s * 2352);
 
+                        if(pos >= _dataStream.Length + 2352 ||
+                           s   >= (int)(tmpTrack.EndSector - tmpTrack.StartSector))
                             break;
-                        case 5:
-                            switch(descriptor.POINT)
-                            {
-                                case 0xC0:
-                                    if(descriptor.PMIN == 97)
-                                    {
-                                        int type = descriptor.PFRAME % 10;
-                                        int frm  = descriptor.PFRAME - type;
 
-                                        _imageInfo.MediaManufacturer = ATIP.ManufacturerFromATIP(descriptor.PSEC, frm);
+                        _dataStream.Seek(pos, SeekOrigin.Begin);
+                        _dataStream.Read(sectTest, 0, 2352);
+                        Array.Copy(sectTest, 0, syncTest, 0, 12);
 
-                                        if(_imageInfo.MediaManufacturer != "")
-                                            AaruConsole.DebugWriteLine("CloneCD plugin", "Disc manufactured by: {0}",
-                                                                       _imageInfo.MediaManufacturer);
-                                    }
+                        if(!Sector.SyncMark.SequenceEqual(syncTest))
+                            continue;
 
-                                    break;
-                            }
+                        if(_scrambled)
+                            sectTest = Sector.Scramble(sectTest);
 
-                            break;
-                        case 6:
+                        if(sectTest[15] == 1)
                         {
-                            uint id = (uint)((descriptor.Min << 16) + (descriptor.Sec << 8) + descriptor.Frame);
-                            AaruConsole.DebugWriteLine("CloneCD plugin", "Disc ID: {0:X6}", id & 0x00FFFFFF);
-                            _imageInfo.MediaSerialNumber = $"{id                               & 0x00FFFFFF:X6}";
+                            tmpTrack.BytesPerSector = 2048;
+                            tmpTrack.Type           = TrackType.CdMode1;
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                            if(_imageInfo.SectorSize < 2048)
+                                _imageInfo.SectorSize = 2048;
 
                             break;
                         }
-                    }
-                }
 
-                if(!firstTrackInSession)
-                {
-                    currentTrack.EndSector = leadOutStart - 1;
-                    Tracks.Add(currentTrack);
-                }
+                        if(sectTest[15] != 2)
+                            continue;
 
-                Track[] tmpTracks = Tracks.OrderBy(t => t.Sequence).ToArray();
+                        byte[] subHdr1 = new byte[4];
+                        byte[] subHdr2 = new byte[4];
+                        byte[] empHdr  = new byte[4];
 
-                ulong currentDataOffset       = 0;
-                ulong currentSubchannelOffset = 0;
+                        Array.Copy(sectTest, 16, subHdr1, 0, 4);
+                        Array.Copy(sectTest, 20, subHdr2, 0, 4);
 
-                foreach(Track tmpTrack in tmpTracks)
-                {
-                    tmpTrack.FileOffset = currentDataOffset;
-
-                    currentDataOffset += 2352 * (tmpTrack.EndSector - (ulong)tmpTrack.Indexes[1] + 1);
-
-                    if(_subFilter != null)
-                    {
-                        tmpTrack.SubchannelOffset = currentSubchannelOffset;
-
-                        currentSubchannelOffset += 96 * (tmpTrack.EndSector - (ulong)tmpTrack.Indexes[1] + 1);
-                    }
-
-                    if(tmpTrack.Indexes.TryGetValue(0, out int idx0))
-                    {
-                        if(idx0 < 0)
-                        {
-                            tmpTrack.FileOffset       = 0;
-                            tmpTrack.SubchannelOffset = 0;
-                        }
-                        else
-                        {
-                            int indexDifference = tmpTrack.Indexes[1] - idx0;
-                            tmpTrack.FileOffset -= (ulong)(2352 * indexDifference);
-
-                            if(_subFilter != null)
-                                tmpTrack.SubchannelOffset -= (ulong)(96 * indexDifference);
-                        }
-                    }
-
-                    if(trackModes.TryGetValue((byte)tmpTrack.Sequence, out int trackMode))
-                        tmpTrack.Type = trackMode switch
-                        {
-                            0 => TrackType.Audio,
-                            1 => TrackType.CdMode1,
-                            2 => TrackType.CdMode2Formless,
-                            _ => TrackType.Data
-                        };
-
-                    if(trackIndexes.TryGetValue((byte)tmpTrack.Sequence, out Dictionary<byte, int> indexes))
-                    {
-                        foreach((byte index, int value) in indexes.OrderBy(i => i.Key).
-                                                                   Where(trackIndex => trackIndex.Key > 1))
-
-                            // Untested as of 20210711
-                            tmpTrack.Indexes[index] = value;
-                    }
-
-                    if(tmpTrack.Type == TrackType.Data)
-                    {
-                        for(int s = 225; s < 750; s++)
-                        {
-                            byte[] syncTest = new byte[12];
-                            byte[] sectTest = new byte[2352];
-
-                            long pos = (long)tmpTrack.FileOffset + (s * 2352);
-
-                            if(pos >= _dataStream.Length + 2352 ||
-                               s   >= (int)(tmpTrack.EndSector - tmpTrack.StartSector))
-                                break;
-
-                            _dataStream.Seek(pos, SeekOrigin.Begin);
-                            _dataStream.Read(sectTest, 0, 2352);
-                            Array.Copy(sectTest, 0, syncTest, 0, 12);
-
-                            if(!Sector.SyncMark.SequenceEqual(syncTest))
-                                continue;
-
-                            if(_scrambled)
-                                sectTest = Sector.Scramble(sectTest);
-
-                            if(sectTest[15] == 1)
+                        if(subHdr1.SequenceEqual(subHdr2) &&
+                           !empHdr.SequenceEqual(subHdr1))
+                            if((subHdr1[2] & 0x20) == 0x20)
                             {
-                                tmpTrack.BytesPerSector = 2048;
-                                tmpTrack.Type           = TrackType.CdMode1;
+                                tmpTrack.BytesPerSector = 2324;
+                                tmpTrack.Type           = TrackType.CdMode2Form2;
 
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
@@ -663,6 +704,31 @@ namespace Aaru.DiscImages
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
 
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                                if(_imageInfo.SectorSize < 2324)
+                                    _imageInfo.SectorSize = 2324;
+
+                                break;
+                            }
+                            else
+                            {
+                                tmpTrack.BytesPerSector = 2048;
+                                tmpTrack.Type           = TrackType.CdMode2Form1;
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
                                 if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
                                     _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
 
@@ -681,713 +747,646 @@ namespace Aaru.DiscImages
                                 break;
                             }
 
-                            if(sectTest[15] != 2)
-                                continue;
+                        tmpTrack.BytesPerSector = 2336;
+                        tmpTrack.Type           = TrackType.CdMode2Formless;
 
-                            byte[] subHdr1 = new byte[4];
-                            byte[] subHdr2 = new byte[4];
-                            byte[] empHdr  = new byte[4];
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
 
-                            Array.Copy(sectTest, 16, subHdr1, 0, 4);
-                            Array.Copy(sectTest, 20, subHdr2, 0, 4);
+                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
 
-                            if(subHdr1.SequenceEqual(subHdr2) &&
-                               !empHdr.SequenceEqual(subHdr1))
-                                if((subHdr1[2] & 0x20) == 0x20)
-                                {
-                                    tmpTrack.BytesPerSector = 2324;
-                                    tmpTrack.Type           = TrackType.CdMode2Form2;
+                        if(_imageInfo.SectorSize < 2336)
+                            _imageInfo.SectorSize = 2336;
 
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                                    if(_imageInfo.SectorSize < 2324)
-                                        _imageInfo.SectorSize = 2324;
-
-                                    break;
-                                }
-                                else
-                                {
-                                    tmpTrack.BytesPerSector = 2048;
-                                    tmpTrack.Type           = TrackType.CdMode2Form1;
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                                    if(_imageInfo.SectorSize < 2048)
-                                        _imageInfo.SectorSize = 2048;
-
-                                    break;
-                                }
-
-                            tmpTrack.BytesPerSector = 2336;
-                            tmpTrack.Type           = TrackType.CdMode2Formless;
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                            if(_imageInfo.SectorSize < 2336)
-                                _imageInfo.SectorSize = 2336;
-
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        if(_imageInfo.SectorSize < 2352)
-                            _imageInfo.SectorSize = 2352;
+                        break;
                     }
                 }
-
-                Tracks = tmpTracks.ToList();
-
-                if(_subFilter != null &&
-                   !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-
-                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-
-                Sessions = new List<Session>();
-
-                var currentSession = new Session
+                else
                 {
-                    EndTrack   = uint.MinValue,
-                    StartTrack = uint.MaxValue,
-                    Sequence   = 1
+                    if(_imageInfo.SectorSize < 2352)
+                        _imageInfo.SectorSize = 2352;
+                }
+            }
+
+            Tracks = tmpTracks.ToList();
+
+            if(_subFilter != null &&
+               !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+
+            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+
+            Sessions = new List<Session>();
+
+            var currentSession = new Session
+            {
+                EndTrack   = uint.MinValue,
+                StartTrack = uint.MaxValue,
+                Sequence   = 1
+            };
+
+            Partitions = new List<Partition>();
+            _offsetMap = new Dictionary<uint, ulong>();
+
+            foreach(Track track in Tracks)
+            {
+                if(track.EndSector + 1 > _imageInfo.Sectors)
+                    _imageInfo.Sectors = track.EndSector + 1;
+
+                if(track.Session == currentSession.Sequence)
+                {
+                    if(track.Sequence > currentSession.EndTrack)
+                    {
+                        currentSession.EndSector = track.EndSector;
+                        currentSession.EndTrack  = track.Sequence;
+                    }
+
+                    if(track.Sequence < currentSession.StartTrack)
+                    {
+                        currentSession.StartSector = track.StartSector;
+                        currentSession.StartTrack  = track.Sequence;
+                    }
+                }
+                else
+                {
+                    Sessions.Add(currentSession);
+
+                    currentSession = new Session
+                    {
+                        EndTrack    = track.Sequence,
+                        StartTrack  = track.Sequence,
+                        StartSector = track.StartSector,
+                        EndSector   = track.EndSector,
+                        Sequence    = track.Session
+                    };
+                }
+
+                var partition = new Partition
+                {
+                    Description = track.Description,
+                    Size        = (track.EndSector - (ulong)track.Indexes[1] + 1) * (ulong)track.RawBytesPerSector,
+                    Length      = track.EndSector - (ulong)track.Indexes[1] + 1,
+                    Sequence    = track.Sequence,
+                    Offset      = track.FileOffset,
+                    Start       = (ulong)track.Indexes[1],
+                    Type        = track.Type.ToString()
                 };
 
-                Partitions = new List<Partition>();
-                _offsetMap = new Dictionary<uint, ulong>();
-
-                foreach(Track track in Tracks)
-                {
-                    if(track.EndSector + 1 > _imageInfo.Sectors)
-                        _imageInfo.Sectors = track.EndSector + 1;
-
-                    if(track.Session == currentSession.Sequence)
-                    {
-                        if(track.Sequence > currentSession.EndTrack)
-                        {
-                            currentSession.EndSector = track.EndSector;
-                            currentSession.EndTrack  = track.Sequence;
-                        }
-
-                        if(track.Sequence < currentSession.StartTrack)
-                        {
-                            currentSession.StartSector = track.StartSector;
-                            currentSession.StartTrack  = track.Sequence;
-                        }
-                    }
-                    else
-                    {
-                        Sessions.Add(currentSession);
-
-                        currentSession = new Session
-                        {
-                            EndTrack    = track.Sequence,
-                            StartTrack  = track.Sequence,
-                            StartSector = track.StartSector,
-                            EndSector   = track.EndSector,
-                            Sequence    = track.Session
-                        };
-                    }
-
-                    var partition = new Partition
-                    {
-                        Description = track.Description,
-                        Size        = (track.EndSector - (ulong)track.Indexes[1] + 1) * (ulong)track.RawBytesPerSector,
-                        Length      = track.EndSector - (ulong)track.Indexes[1] + 1,
-                        Sequence    = track.Sequence,
-                        Offset      = track.FileOffset,
-                        Start       = (ulong)track.Indexes[1],
-                        Type        = track.Type.ToString()
-                    };
-
-                    Partitions.Add(partition);
-                    _offsetMap.Add(track.Sequence, track.StartSector);
-                }
-
-                Sessions.Add(currentSession);
-
-                bool data       = false;
-                bool mode2      = false;
-                bool firstAudio = false;
-                bool firstData  = false;
-                bool audio      = false;
-
-                for(int i = 0; i < Tracks.Count; i++)
-                {
-                    // First track is audio
-                    firstAudio |= i == 0 && Tracks[i].Type == TrackType.Audio;
-
-                    // First track is data
-                    firstData |= i == 0 && Tracks[i].Type != TrackType.Audio;
-
-                    // Any non first track is data
-                    data |= i != 0 && Tracks[i].Type != TrackType.Audio;
-
-                    // Any non first track is audio
-                    audio |= i != 0 && Tracks[i].Type == TrackType.Audio;
-
-                    switch(Tracks[i].Type)
-                    {
-                        case TrackType.CdMode2Form1:
-                        case TrackType.CdMode2Form2:
-                        case TrackType.CdMode2Formless:
-                            mode2 = true;
-
-                            break;
-                    }
-                }
-
-                // TODO: Check format
-                _cdtext = cdtMs.ToArray();
-
-                if(!data &&
-                   !firstData)
-                    _imageInfo.MediaType = MediaType.CDDA;
-                else if(firstAudio         &&
-                        data               &&
-                        Sessions.Count > 1 &&
-                        mode2)
-                    _imageInfo.MediaType = MediaType.CDPLUS;
-                else if((firstData && audio) || mode2)
-                    _imageInfo.MediaType = MediaType.CDROMXA;
-                else if(!audio)
-                    _imageInfo.MediaType = MediaType.CDROM;
-                else
-                    _imageInfo.MediaType = MediaType.CD;
-
-                _imageInfo.Application          = "CloneCD";
-                _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
-                _imageInfo.CreationTime         = imageFilter.CreationTime;
-                _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-                _imageInfo.XmlMediaType         = XmlMediaType.OpticalDisc;
-
-                return ErrorNumber.NoError;
+                Partitions.Add(partition);
+                _offsetMap.Add(track.Sequence, track.StartSector);
             }
-            catch(Exception ex)
+
+            Sessions.Add(currentSession);
+
+            bool data       = false;
+            bool mode2      = false;
+            bool firstAudio = false;
+            bool firstData  = false;
+            bool audio      = false;
+
+            for(int i = 0; i < Tracks.Count; i++)
             {
-                AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.Filename);
-                AaruConsole.ErrorWriteLine("Exception: {0}", ex);
+                // First track is audio
+                firstAudio |= i == 0 && Tracks[i].Type == TrackType.Audio;
 
-                return ErrorNumber.UnexpectedException;
-            }
-        }
+                // First track is data
+                firstData |= i == 0 && Tracks[i].Type != TrackType.Audio;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+                // Any non first track is data
+                data |= i != 0 && Tracks[i].Type != TrackType.Audio;
 
-            switch(tag)
-            {
-                case MediaTagType.CD_FullTOC:
-                    buffer = _fullToc?.Clone() as byte[];
+                // Any non first track is audio
+                audio |= i != 0 && Tracks[i].Type == TrackType.Audio;
 
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-                case MediaTagType.CD_TEXT:
+                switch(Tracks[i].Type)
                 {
-                    if(_cdtext is { Length: > 0 })
-                        buffer = _cdtext?.Clone() as byte[];
+                    case TrackType.CdMode2Form1:
+                    case TrackType.CdMode2Form2:
+                    case TrackType.CdMode2Formless:
+                        mode2 = true;
 
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+                        break;
                 }
-                default: return ErrorNumber.NotSupported;
-            }
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-                return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in _offsetMap.Where(kvp => sectorAddress >= kvp.Value).
-                                                                SelectMany(kvp => Tracks, (kvp, track) => new
-                                                                {
-                                                                    kvp,
-                                                                    track
-                                                                }).Where(t => t.track.Sequence == t.kvp.Key).
-                                                                Where(t => sectorAddress - t.kvp.Value <
-                                                                           t.track.EndSector - t.track.StartSector + 1).
-                                                                Select(t => t.kvp))
-            {
-                return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
-
-                return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
             }
 
-            return ErrorNumber.SectorNotFound;
-        }
+            // TODO: Check format
+            _cdtext = cdtMs.ToArray();
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-            Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
-
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress - 1 > aaruTrack.EndSector)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-            bool mode2 = false;
-
-            switch(aaruTrack.Type)
-            {
-                case TrackType.Audio:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case TrackType.CdMode1:
-                {
-                    sectorOffset = 16;
-                    sectorSize   = 2048;
-                    sectorSkip   = 288;
-
-                    break;
-                }
-                case TrackType.CdMode2Formless:
-                case TrackType.CdMode2Form1:
-                case TrackType.CdMode2Form2:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            _dataStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * 2352)), SeekOrigin.Begin);
-
-            if(mode2)
-            {
-                var mode2Ms = new MemoryStream((int)(sectorSize * length));
-
-                _dataStream.Read(buffer, 0, buffer.Length);
-
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize);
-                    sector = Sector.GetUserDataFromMode2(sector);
-                    mode2Ms.Write(sector, 0, sector.Length);
-                }
-
-                buffer = mode2Ms.ToArray();
-            }
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-                _dataStream.Read(buffer, 0, buffer.Length);
+            if(!data &&
+               !firstData)
+                _imageInfo.MediaType = MediaType.CDDA;
+            else if(firstAudio         &&
+                    data               &&
+                    Sessions.Count > 1 &&
+                    mode2)
+                _imageInfo.MediaType = MediaType.CDPLUS;
+            else if((firstData && audio) || mode2)
+                _imageInfo.MediaType = MediaType.CDROMXA;
+            else if(!audio)
+                _imageInfo.MediaType = MediaType.CDROM;
             else
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    _dataStream.Seek(sectorOffset, SeekOrigin.Current);
-                    _dataStream.Read(sector, 0, sector.Length);
-                    _dataStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
+                _imageInfo.MediaType = MediaType.CD;
+
+            _imageInfo.Application          = "CloneCD";
+            _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
+            _imageInfo.CreationTime         = imageFilter.CreationTime;
+            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+            _imageInfo.XmlMediaType         = XmlMediaType.OpticalDisc;
 
             return ErrorNumber.NoError;
         }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
+        catch(Exception ex)
         {
-            buffer = null;
+            AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.Filename);
+            AaruConsole.ErrorWriteLine("Exception: {0}", ex);
 
-            if(tag == SectorTagType.CdTrackFlags)
-                track = (uint)sectorAddress;
+            return ErrorNumber.UnexpectedException;
+        }
+    }
 
-            Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
+        switch(tag)
+        {
+            case MediaTagType.CD_FullTOC:
+                buffer = _fullToc?.Clone() as byte[];
 
-            if(length + sectorAddress - 1 > aaruTrack.EndSector)
-                return ErrorNumber.OutOfRange;
-
-            if(aaruTrack.Type == TrackType.Data)
-                return ErrorNumber.NotSupported;
-
-            switch(tag)
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+            case MediaTagType.CD_TEXT:
             {
-                case SectorTagType.CdSectorEcc:
-                case SectorTagType.CdSectorEccP:
-                case SectorTagType.CdSectorEccQ:
-                case SectorTagType.CdSectorEdc:
-                case SectorTagType.CdSectorHeader:
-                case SectorTagType.CdSectorSubHeader:
-                case SectorTagType.CdSectorSync: break;
-                case SectorTagType.CdTrackFlags:
-                    if(!_trackFlags.TryGetValue((byte)aaruTrack.Sequence, out byte flags))
-                        return ErrorNumber.NoData;
+                if(_cdtext is { Length: > 0 })
+                    buffer = _cdtext?.Clone() as byte[];
 
-                    buffer = new[]
-                    {
-                        flags
-                    };
-
-                    return ErrorNumber.NoError;
-                case SectorTagType.CdSectorSubchannel:
-                    buffer = new byte[96 * length];
-                    _subStream.Seek((long)(aaruTrack.SubchannelOffset + (sectorAddress * 96)), SeekOrigin.Begin);
-                    _subStream.Read(buffer, 0, buffer.Length);
-
-                    buffer = Subchannel.Interleave(buffer);
-
-                    return ErrorNumber.NoError;
-                default: return ErrorNumber.NotSupported;
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
             }
+            default: return ErrorNumber.NotSupported;
+        }
+    }
 
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-            switch(aaruTrack.Type)
-            {
-                case TrackType.CdMode1:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, track, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+            return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2064;
-                            sectorSize   = 4;
-                            sectorSkip   = 284;
+        return ErrorNumber.SectorNotFound;
+    }
 
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-                    break;
-                case TrackType.CdMode2Formless:
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        case SectorTagType.CdSectorHeader:
-                        case SectorTagType.CdSectorEcc:
-                        case SectorTagType.CdSectorEccP:
-                        case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
+        foreach(KeyValuePair<uint, ulong> kvp in _offsetMap.Where(kvp => sectorAddress >= kvp.Value).
+                                                            SelectMany(kvp => Tracks, (kvp, track) => new
+                                                            {
+                                                                kvp,
+                                                                track
+                                                            }).Where(t => t.track.Sequence == t.kvp.Key).
+                                                            Where(t => sectorAddress - t.kvp.Value <
+                                                                       t.track.EndSector - t.track.StartSector + 1).
+                                                            Select(t => t.kvp))
+        {
+            return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
 
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2332;
-                            sectorSize   = 4;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-                case TrackType.CdMode2Form1:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 16;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2072;
-                            sectorSize   = 4;
-                            sectorSkip   = 276;
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case TrackType.CdMode2Form2:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 16;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2348;
-                            sectorSize   = 4;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case TrackType.Audio:
-                {
-                    return ErrorNumber.NotSupported;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            _dataStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * 2352)), SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                _dataStream.Read(buffer, 0, buffer.Length);
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    _dataStream.Seek(sectorOffset, SeekOrigin.Current);
-                    _dataStream.Read(sector, 0, sector.Length);
-                    _dataStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            return ErrorNumber.NoError;
+            return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
+        return ErrorNumber.SectorNotFound;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-                return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+        Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
 
+        if(aaruTrack is null)
             return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress - 1 > aaruTrack.EndSector)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+        bool mode2 = false;
+
+        switch(aaruTrack.Type)
+        {
+            case TrackType.Audio:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case TrackType.CdMode1:
+            {
+                sectorOffset = 16;
+                sectorSize   = 2048;
+                sectorSkip   = 288;
+
+                break;
+            }
+            case TrackType.CdMode2Formless:
+            case TrackType.CdMode2Form1:
+            case TrackType.CdMode2Form2:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+        buffer = new byte[sectorSize * length];
+
+        _dataStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * 2352)), SeekOrigin.Begin);
+
+        if(mode2)
         {
-            buffer = null;
-            Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
+            var mode2Ms = new MemoryStream((int)(sectorSize * length));
 
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress - 1 > aaruTrack.EndSector)
-                return ErrorNumber.OutOfMemory;
-
-            buffer = new byte[2352 * length];
-
-            _dataStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * 2352)), SeekOrigin.Begin);
             _dataStream.Read(buffer, 0, buffer.Length);
 
-            return ErrorNumber.NoError;
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                Array.Copy(buffer, sectorSize * i, sector, 0, sectorSize);
+                sector = Sector.GetUserDataFromMode2(sector);
+                mode2Ms.Write(sector, 0, sector.Length);
+            }
+
+            buffer = mode2Ms.ToArray();
         }
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+            _dataStream.Read(buffer, 0, buffer.Length);
+        else
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                _dataStream.Seek(sectorOffset, SeekOrigin.Current);
+                _dataStream.Read(sector, 0, sector.Length);
+                _dataStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
 
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(Session session)
-        {
-            if(Sessions.Contains(session))
-                return GetSessionTracks(session.Sequence);
-
-            return null;
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();
+        return ErrorNumber.NoError;
     }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag == SectorTagType.CdTrackFlags)
+            track = (uint)sectorAddress;
+
+        Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress - 1 > aaruTrack.EndSector)
+            return ErrorNumber.OutOfRange;
+
+        if(aaruTrack.Type == TrackType.Data)
+            return ErrorNumber.NotSupported;
+
+        switch(tag)
+        {
+            case SectorTagType.CdSectorEcc:
+            case SectorTagType.CdSectorEccP:
+            case SectorTagType.CdSectorEccQ:
+            case SectorTagType.CdSectorEdc:
+            case SectorTagType.CdSectorHeader:
+            case SectorTagType.CdSectorSubHeader:
+            case SectorTagType.CdSectorSync: break;
+            case SectorTagType.CdTrackFlags:
+                if(!_trackFlags.TryGetValue((byte)aaruTrack.Sequence, out byte flags))
+                    return ErrorNumber.NoData;
+
+                buffer = new[]
+                {
+                    flags
+                };
+
+                return ErrorNumber.NoError;
+            case SectorTagType.CdSectorSubchannel:
+                buffer = new byte[96 * length];
+                _subStream.Seek((long)(aaruTrack.SubchannelOffset + (sectorAddress * 96)), SeekOrigin.Begin);
+                _subStream.Read(buffer, 0, buffer.Length);
+
+                buffer = Subchannel.Interleave(buffer);
+
+                return ErrorNumber.NoError;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(aaruTrack.Type)
+        {
+            case TrackType.CdMode1:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2064;
+                        sectorSize   = 4;
+                        sectorSkip   = 284;
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            case TrackType.CdMode2Formless:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    case SectorTagType.CdSectorHeader:
+                    case SectorTagType.CdSectorEcc:
+                    case SectorTagType.CdSectorEccP:
+                    case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2332;
+                        sectorSize   = 4;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+            case TrackType.CdMode2Form1:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 16;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2072;
+                        sectorSize   = 4;
+                        sectorSkip   = 276;
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            case TrackType.CdMode2Form2:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 16;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2348;
+                        sectorSize   = 4;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            case TrackType.Audio:
+            {
+                return ErrorNumber.NotSupported;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        _dataStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * 2352)), SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            _dataStream.Read(buffer, 0, buffer.Length);
+        else
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                _dataStream.Seek(sectorOffset, SeekOrigin.Current);
+                _dataStream.Read(sector, 0, sector.Length);
+                _dataStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+            return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+        Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress - 1 > aaruTrack.EndSector)
+            return ErrorNumber.OutOfMemory;
+
+        buffer = new byte[2352 * length];
+
+        _dataStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * 2352)), SeekOrigin.Begin);
+        _dataStream.Read(buffer, 0, buffer.Length);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(Session session)
+    {
+        if(Sessions.Contains(session))
+            return GetSessionTracks(session.Sequence);
+
+        return null;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/Verify.cs b/Aaru.Images/CloneCD/Verify.cs
index 7f43b54ea..b50ef9440 100644
--- a/Aaru.Images/CloneCD/Verify.cs
+++ b/Aaru.Images/CloneCD/Verify.cs
@@ -35,92 +35,91 @@ using System.Collections.Generic;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CloneCd
 {
-    public sealed partial class CloneCd
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
     {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CloneCD/Write.cs b/Aaru.Images/CloneCD/Write.cs
index b9dd64844..7c0e4c5a4 100644
--- a/Aaru.Images/CloneCD/Write.cs
+++ b/Aaru.Images/CloneCD/Write.cs
@@ -43,534 +43,533 @@ using Aaru.Helpers;
 using Schemas;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CloneCd
 {
-    public sealed partial class CloneCd
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingBaseName =
-                    Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path));
-
-                _descriptorStream = new StreamWriter(path, false, Encoding.ASCII);
-
-                _dataStream = new FileStream(_writingBaseName + ".img", FileMode.OpenOrCreate, FileAccess.ReadWrite,
-                                             FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            _imageInfo.MediaType = mediaType;
-
-            _trackFlags = new Dictionary<byte, byte>();
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            switch(tag)
-            {
-                case MediaTagType.CD_MCN:
-                    _catalog = Encoding.ASCII.GetString(data);
-
-                    return true;
-                case MediaTagType.CD_FullTOC:
-                    _fullToc = data;
-
-                    return true;
-                default:
-                    ErrorMessage = $"Unsupported media tag {tag}";
-
-                    return false;
-            }
-        }
-
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            // TODO: Implement ECC generation
-            ErrorMessage = "This format requires sectors to be raw. Generating ECC is not yet implemented";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
+        try
+        {
+            _writingBaseName =
+                Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path));
 
-            // TODO: Implement ECC generation
-            ErrorMessage = "This format requires sectors to be raw. Generating ECC is not yet implemented";
+            _descriptorStream = new StreamWriter(path, false, Encoding.ASCII);
+
+            _dataStream = new FileStream(_writingBaseName + ".img", FileMode.OpenOrCreate, FileAccess.ReadWrite,
+                                         FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+        _imageInfo.MediaType = mediaType;
 
-                return false;
-            }
+        _trackFlags = new Dictionary<byte, byte>();
 
-            Track track =
-                Tracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector && sectorAddress <= trk.EndSector);
+        IsWriting    = true;
+        ErrorMessage = null;
 
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(data.Length != track.RawBytesPerSector)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            _dataStream.
-                Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
-                     SeekOrigin.Begin);
-
-            _dataStream.Write(data, 0, data.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                Tracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector && sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            if(sectorAddress + length > track.EndSector + 1)
-            {
-                ErrorMessage = "Can't cross tracks";
-
-                return false;
-            }
-
-            if(data.Length % track.RawBytesPerSector != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            _dataStream.
-                Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
-                     SeekOrigin.Begin);
-
-            _dataStream.Write(data, 0, data.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetTracks(List<Track> tracks)
-        {
-            ulong currentDataOffset       = 0;
-            ulong currentSubchannelOffset = 0;
-
-            Tracks = new List<Track>();
-
-            foreach(Track track in tracks.OrderBy(t => t.Sequence))
-            {
-                Track newTrack = track;
-
-                if(newTrack.Session > 1)
-                {
-                    Track firstSessionTrack = tracks.FirstOrDefault(t => t.Session == newTrack.Session);
-
-                    if(firstSessionTrack?.Sequence == newTrack.Sequence &&
-                       newTrack.Pregap             >= 150)
-                    {
-                        newTrack.Pregap      -= 150;
-                        newTrack.StartSector += 150;
-                    }
-                }
-
-                uint subchannelSize;
-
-                switch(newTrack.SubchannelType)
-                {
-                    case TrackSubchannelType.None:
-                        subchannelSize = 0;
-
-                        break;
-                    case TrackSubchannelType.Raw:
-                    case TrackSubchannelType.RawInterleaved:
-                        subchannelSize = 96;
-
-                        break;
-                    default:
-                        ErrorMessage = $"Unsupported subchannel type {newTrack.SubchannelType}";
-
-                        return false;
-                }
-
-                newTrack.FileOffset       = currentDataOffset;
-                newTrack.SubchannelOffset = currentSubchannelOffset;
-
-                currentDataOffset += (ulong)newTrack.RawBytesPerSector *
-                                     (newTrack.EndSector - newTrack.StartSector + 1);
-
-                currentSubchannelOffset += subchannelSize * (newTrack.EndSector - newTrack.StartSector + 1);
-
-                Tracks.Add(newTrack);
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            _dataStream.Flush();
-            _dataStream.Close();
-
-            _subStream?.Flush();
-            _subStream?.Close();
-
-            FullTOC.CDFullTOC? nullableToc = null;
-            FullTOC.CDFullTOC  toc;
-
-            // Easy, just decode the real toc
-            if(_fullToc != null)
-            {
-                byte[] tmp = new byte[_fullToc.Length + 2];
-                Array.Copy(BigEndianBitConverter.GetBytes((ushort)_fullToc.Length), 0, tmp, 0, 2);
-                Array.Copy(_fullToc, 0, tmp, 2, _fullToc.Length);
-                nullableToc = FullTOC.Decode(tmp);
-            }
-
-            // Not easy, create a toc from scratch
-            toc = nullableToc ?? FullTOC.Create(Tracks, _trackFlags, true);
-
-            _descriptorStream.WriteLine("[CloneCD]");
-            _descriptorStream.WriteLine("Version=2");
-            _descriptorStream.WriteLine("[Disc]");
-            _descriptorStream.WriteLine("TocEntries={0}", toc.TrackDescriptors.Length);
-            _descriptorStream.WriteLine("Sessions={0}", toc.LastCompleteSession);
-            _descriptorStream.WriteLine("DataTracksScrambled=0");
-            _descriptorStream.WriteLine("CDTextLength=0");
-
-            if(!string.IsNullOrEmpty(_catalog))
-                _descriptorStream.WriteLine("CATALOG={0}", _catalog);
-
-            for(int i = 1; i <= toc.LastCompleteSession; i++)
-            {
-                _descriptorStream.WriteLine("[Session {0}]", i);
-
-                Track firstSessionTrack = Tracks.FirstOrDefault(t => t.Session == i);
-
-                switch(firstSessionTrack?.Type)
-                {
-                    case TrackType.Audio:
-                        // CloneCD always writes this value for first track in disc, however the Rainbow Books
-                        // say the first track pregap is no different from other session pregaps, same mode as
-                        // the track they belong to.
-                        _descriptorStream.WriteLine("PreGapMode=0");
-
-                        break;
-                    case TrackType.Data:
-                    case TrackType.CdMode1:
-                        _descriptorStream.WriteLine("PreGapMode=1");
-
-                        break;
-                    case TrackType.CdMode2Formless:
-                    case TrackType.CdMode2Form1:
-                    case TrackType.CdMode2Form2:
-                        _descriptorStream.WriteLine("PreGapMode=2");
-
-                        break;
-                    default:
-                        ErrorMessage =
-                            $"Unexpected first session track type {firstSessionTrack?.Type.ToString() ?? "null"}";
-
-                        return false;
-                }
-
-                _descriptorStream.WriteLine("PreGapSubC=0");
-            }
-
-            for(int i = 0; i < toc.TrackDescriptors.Length; i++)
-            {
-                long alba = MsfToLba((toc.TrackDescriptors[i].Min, toc.TrackDescriptors[i].Sec,
-                                      toc.TrackDescriptors[i].Frame));
-
-                long plba = MsfToLba((toc.TrackDescriptors[i].PMIN, toc.TrackDescriptors[i].PSEC,
-                                      toc.TrackDescriptors[i].PFRAME));
-
-                if(alba > 405000)
-                    alba = (alba - 405000 + 300) * -1;
-
-                if(plba > 405000)
-                    plba = (plba - 405000 + 300) * -1;
-
-                _descriptorStream.WriteLine("[Entry {0}]", i);
-                _descriptorStream.WriteLine("Session={0}", toc.TrackDescriptors[i].SessionNumber);
-                _descriptorStream.WriteLine("Point=0x{0:x2}", toc.TrackDescriptors[i].POINT);
-                _descriptorStream.WriteLine("ADR=0x{0:x2}", toc.TrackDescriptors[i].ADR);
-                _descriptorStream.WriteLine("Control=0x{0:x2}", toc.TrackDescriptors[i].CONTROL);
-                _descriptorStream.WriteLine("TrackNo={0}", toc.TrackDescriptors[i].TNO);
-                _descriptorStream.WriteLine("AMin={0}", toc.TrackDescriptors[i].Min);
-                _descriptorStream.WriteLine("ASec={0}", toc.TrackDescriptors[i].Sec);
-                _descriptorStream.WriteLine("AFrame={0}", toc.TrackDescriptors[i].Frame);
-                _descriptorStream.WriteLine("ALBA={0}", alba);
-
-                _descriptorStream.WriteLine("Zero={0}",
-                                            ((toc.TrackDescriptors[i].HOUR & 0x0F) << 4) +
-                                            (toc.TrackDescriptors[i].PHOUR & 0x0F));
-
-                _descriptorStream.WriteLine("PMin={0}", toc.TrackDescriptors[i].PMIN);
-                _descriptorStream.WriteLine("PSec={0}", toc.TrackDescriptors[i].PSEC);
-                _descriptorStream.WriteLine("PFrame={0}", toc.TrackDescriptors[i].PFRAME);
-                _descriptorStream.WriteLine("PLBA={0}", plba);
-            }
-
-            _descriptorStream.Flush();
-            _descriptorStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                Tracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector && sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            switch(tag)
-            {
-                case SectorTagType.CdTrackFlags:
-                {
-                    if(data.Length != 1)
-                    {
-                        ErrorMessage = "Incorrect data size for track flags";
-
-                        return false;
-                    }
-
-                    _trackFlags[(byte)sectorAddress] = data[0];
-
-                    return true;
-                }
-                case SectorTagType.CdSectorSubchannel:
-                {
-                    if(track.SubchannelType == 0)
-                    {
-                        ErrorMessage =
-                            $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
-
-                        return false;
-                    }
-
-                    if(data.Length != 96)
-                    {
-                        ErrorMessage = "Incorrect data size for subchannel";
-
-                        return false;
-                    }
-
-                    if(_subStream == null)
-                        try
-                        {
-                            _subStream = new FileStream(_writingBaseName + ".sub", FileMode.OpenOrCreate,
-                                                        FileAccess.ReadWrite, FileShare.None);
-                        }
-                        catch(IOException e)
-                        {
-                            ErrorMessage = $"Could not create subchannel file, exception {e.Message}";
-
-                            return false;
-                        }
-
-                    _subStream.Seek((long)(track.SubchannelOffset + ((sectorAddress - track.StartSector) * 96)),
-                                    SeekOrigin.Begin);
-
-                    _subStream.Write(Subchannel.Deinterleave(data), 0, data.Length);
-
-                    return true;
-                }
-                default:
-                    ErrorMessage = $"Unsupported tag type {tag}";
-
-                    return false;
-            }
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            Track track =
-                Tracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector && sectorAddress <= trk.EndSector);
-
-            if(track is null)
-            {
-                ErrorMessage = $"Can't found track containing {sectorAddress}";
-
-                return false;
-            }
-
-            switch(tag)
-            {
-                case SectorTagType.CdTrackFlags:
-                case SectorTagType.CdTrackIsrc: return WriteSectorTag(data, sectorAddress, tag);
-                case SectorTagType.CdSectorSubchannel:
-                {
-                    if(track.SubchannelType == 0)
-                    {
-                        ErrorMessage =
-                            $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
-
-                        return false;
-                    }
-
-                    if(data.Length % 96 != 0)
-                    {
-                        ErrorMessage = "Incorrect data size for subchannel";
-
-                        return false;
-                    }
-
-                    if(_subStream == null)
-                        try
-                        {
-                            _subStream = new FileStream(_writingBaseName + ".sub", FileMode.OpenOrCreate,
-                                                        FileAccess.ReadWrite, FileShare.None);
-                        }
-                        catch(IOException e)
-                        {
-                            ErrorMessage = $"Could not create subchannel file, exception {e.Message}";
-
-                            return false;
-                        }
-
-                    _subStream.Seek((long)(track.SubchannelOffset + ((sectorAddress - track.StartSector) * 96)),
-                                    SeekOrigin.Begin);
-
-                    _subStream.Write(Subchannel.Deinterleave(data), 0, data.Length);
-
-                    return true;
-                }
-                default:
-                    ErrorMessage = $"Unsupported tag type {tag}";
-
-                    return false;
-            }
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        switch(tag)
+        {
+            case MediaTagType.CD_MCN:
+                _catalog = Encoding.ASCII.GetString(data);
+
+                return true;
+            case MediaTagType.CD_FullTOC:
+                _fullToc = data;
+
+                return true;
+            default:
+                ErrorMessage = $"Unsupported media tag {tag}";
+
+                return false;
+        }
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        // TODO: Implement ECC generation
+        ErrorMessage = "This format requires sectors to be raw. Generating ECC is not yet implemented";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        // TODO: Implement ECC generation
+        ErrorMessage = "This format requires sectors to be raw. Generating ECC is not yet implemented";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            Tracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector && sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(data.Length != track.RawBytesPerSector)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        _dataStream.
+            Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
+                 SeekOrigin.Begin);
+
+        _dataStream.Write(data, 0, data.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            Tracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector && sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        if(sectorAddress + length > track.EndSector + 1)
+        {
+            ErrorMessage = "Can't cross tracks";
+
+            return false;
+        }
+
+        if(data.Length % track.RawBytesPerSector != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        _dataStream.
+            Seek((long)(track.FileOffset + ((sectorAddress - track.StartSector) * (ulong)track.RawBytesPerSector)),
+                 SeekOrigin.Begin);
+
+        _dataStream.Write(data, 0, data.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetTracks(List<Track> tracks)
+    {
+        ulong currentDataOffset       = 0;
+        ulong currentSubchannelOffset = 0;
+
+        Tracks = new List<Track>();
+
+        foreach(Track track in tracks.OrderBy(t => t.Sequence))
+        {
+            Track newTrack = track;
+
+            if(newTrack.Session > 1)
+            {
+                Track firstSessionTrack = tracks.FirstOrDefault(t => t.Session == newTrack.Session);
+
+                if(firstSessionTrack?.Sequence == newTrack.Sequence &&
+                   newTrack.Pregap             >= 150)
+                {
+                    newTrack.Pregap      -= 150;
+                    newTrack.StartSector += 150;
+                }
+            }
+
+            uint subchannelSize;
+
+            switch(newTrack.SubchannelType)
+            {
+                case TrackSubchannelType.None:
+                    subchannelSize = 0;
+
+                    break;
+                case TrackSubchannelType.Raw:
+                case TrackSubchannelType.RawInterleaved:
+                    subchannelSize = 96;
+
+                    break;
+                default:
+                    ErrorMessage = $"Unsupported subchannel type {newTrack.SubchannelType}";
+
+                    return false;
+            }
+
+            newTrack.FileOffset       = currentDataOffset;
+            newTrack.SubchannelOffset = currentSubchannelOffset;
+
+            currentDataOffset += (ulong)newTrack.RawBytesPerSector *
+                                 (newTrack.EndSector - newTrack.StartSector + 1);
+
+            currentSubchannelOffset += subchannelSize * (newTrack.EndSector - newTrack.StartSector + 1);
+
+            Tracks.Add(newTrack);
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        _dataStream.Flush();
+        _dataStream.Close();
+
+        _subStream?.Flush();
+        _subStream?.Close();
+
+        FullTOC.CDFullTOC? nullableToc = null;
+        FullTOC.CDFullTOC  toc;
+
+        // Easy, just decode the real toc
+        if(_fullToc != null)
+        {
+            byte[] tmp = new byte[_fullToc.Length + 2];
+            Array.Copy(BigEndianBitConverter.GetBytes((ushort)_fullToc.Length), 0, tmp, 0, 2);
+            Array.Copy(_fullToc, 0, tmp, 2, _fullToc.Length);
+            nullableToc = FullTOC.Decode(tmp);
+        }
+
+        // Not easy, create a toc from scratch
+        toc = nullableToc ?? FullTOC.Create(Tracks, _trackFlags, true);
+
+        _descriptorStream.WriteLine("[CloneCD]");
+        _descriptorStream.WriteLine("Version=2");
+        _descriptorStream.WriteLine("[Disc]");
+        _descriptorStream.WriteLine("TocEntries={0}", toc.TrackDescriptors.Length);
+        _descriptorStream.WriteLine("Sessions={0}", toc.LastCompleteSession);
+        _descriptorStream.WriteLine("DataTracksScrambled=0");
+        _descriptorStream.WriteLine("CDTextLength=0");
+
+        if(!string.IsNullOrEmpty(_catalog))
+            _descriptorStream.WriteLine("CATALOG={0}", _catalog);
+
+        for(int i = 1; i <= toc.LastCompleteSession; i++)
+        {
+            _descriptorStream.WriteLine("[Session {0}]", i);
+
+            Track firstSessionTrack = Tracks.FirstOrDefault(t => t.Session == i);
+
+            switch(firstSessionTrack?.Type)
+            {
+                case TrackType.Audio:
+                    // CloneCD always writes this value for first track in disc, however the Rainbow Books
+                    // say the first track pregap is no different from other session pregaps, same mode as
+                    // the track they belong to.
+                    _descriptorStream.WriteLine("PreGapMode=0");
+
+                    break;
+                case TrackType.Data:
+                case TrackType.CdMode1:
+                    _descriptorStream.WriteLine("PreGapMode=1");
+
+                    break;
+                case TrackType.CdMode2Formless:
+                case TrackType.CdMode2Form1:
+                case TrackType.CdMode2Form2:
+                    _descriptorStream.WriteLine("PreGapMode=2");
+
+                    break;
+                default:
+                    ErrorMessage =
+                        $"Unexpected first session track type {firstSessionTrack?.Type.ToString() ?? "null"}";
+
+                    return false;
+            }
+
+            _descriptorStream.WriteLine("PreGapSubC=0");
+        }
+
+        for(int i = 0; i < toc.TrackDescriptors.Length; i++)
+        {
+            long alba = MsfToLba((toc.TrackDescriptors[i].Min, toc.TrackDescriptors[i].Sec,
+                                  toc.TrackDescriptors[i].Frame));
+
+            long plba = MsfToLba((toc.TrackDescriptors[i].PMIN, toc.TrackDescriptors[i].PSEC,
+                                  toc.TrackDescriptors[i].PFRAME));
+
+            if(alba > 405000)
+                alba = (alba - 405000 + 300) * -1;
+
+            if(plba > 405000)
+                plba = (plba - 405000 + 300) * -1;
+
+            _descriptorStream.WriteLine("[Entry {0}]", i);
+            _descriptorStream.WriteLine("Session={0}", toc.TrackDescriptors[i].SessionNumber);
+            _descriptorStream.WriteLine("Point=0x{0:x2}", toc.TrackDescriptors[i].POINT);
+            _descriptorStream.WriteLine("ADR=0x{0:x2}", toc.TrackDescriptors[i].ADR);
+            _descriptorStream.WriteLine("Control=0x{0:x2}", toc.TrackDescriptors[i].CONTROL);
+            _descriptorStream.WriteLine("TrackNo={0}", toc.TrackDescriptors[i].TNO);
+            _descriptorStream.WriteLine("AMin={0}", toc.TrackDescriptors[i].Min);
+            _descriptorStream.WriteLine("ASec={0}", toc.TrackDescriptors[i].Sec);
+            _descriptorStream.WriteLine("AFrame={0}", toc.TrackDescriptors[i].Frame);
+            _descriptorStream.WriteLine("ALBA={0}", alba);
+
+            _descriptorStream.WriteLine("Zero={0}",
+                                        ((toc.TrackDescriptors[i].HOUR & 0x0F) << 4) +
+                                        (toc.TrackDescriptors[i].PHOUR & 0x0F));
+
+            _descriptorStream.WriteLine("PMin={0}", toc.TrackDescriptors[i].PMIN);
+            _descriptorStream.WriteLine("PSec={0}", toc.TrackDescriptors[i].PSEC);
+            _descriptorStream.WriteLine("PFrame={0}", toc.TrackDescriptors[i].PFRAME);
+            _descriptorStream.WriteLine("PLBA={0}", plba);
+        }
+
+        _descriptorStream.Flush();
+        _descriptorStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            Tracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector && sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        switch(tag)
+        {
+            case SectorTagType.CdTrackFlags:
+            {
+                if(data.Length != 1)
+                {
+                    ErrorMessage = "Incorrect data size for track flags";
+
+                    return false;
+                }
+
+                _trackFlags[(byte)sectorAddress] = data[0];
+
+                return true;
+            }
+            case SectorTagType.CdSectorSubchannel:
+            {
+                if(track.SubchannelType == 0)
+                {
+                    ErrorMessage =
+                        $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
+
+                    return false;
+                }
+
+                if(data.Length != 96)
+                {
+                    ErrorMessage = "Incorrect data size for subchannel";
+
+                    return false;
+                }
+
+                if(_subStream == null)
+                    try
+                    {
+                        _subStream = new FileStream(_writingBaseName + ".sub", FileMode.OpenOrCreate,
+                                                    FileAccess.ReadWrite, FileShare.None);
+                    }
+                    catch(IOException e)
+                    {
+                        ErrorMessage = $"Could not create subchannel file, exception {e.Message}";
+
+                        return false;
+                    }
+
+                _subStream.Seek((long)(track.SubchannelOffset + ((sectorAddress - track.StartSector) * 96)),
+                                SeekOrigin.Begin);
+
+                _subStream.Write(Subchannel.Deinterleave(data), 0, data.Length);
+
+                return true;
+            }
+            default:
+                ErrorMessage = $"Unsupported tag type {tag}";
+
+                return false;
+        }
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        Track track =
+            Tracks.FirstOrDefault(trk => sectorAddress >= trk.StartSector && sectorAddress <= trk.EndSector);
+
+        if(track is null)
+        {
+            ErrorMessage = $"Can't found track containing {sectorAddress}";
+
+            return false;
+        }
+
+        switch(tag)
+        {
+            case SectorTagType.CdTrackFlags:
+            case SectorTagType.CdTrackIsrc: return WriteSectorTag(data, sectorAddress, tag);
+            case SectorTagType.CdSectorSubchannel:
+            {
+                if(track.SubchannelType == 0)
+                {
+                    ErrorMessage =
+                        $"Trying to write subchannel to track {track.Sequence}, that does not have subchannel";
+
+                    return false;
+                }
+
+                if(data.Length % 96 != 0)
+                {
+                    ErrorMessage = "Incorrect data size for subchannel";
+
+                    return false;
+                }
+
+                if(_subStream == null)
+                    try
+                    {
+                        _subStream = new FileStream(_writingBaseName + ".sub", FileMode.OpenOrCreate,
+                                                    FileAccess.ReadWrite, FileShare.None);
+                    }
+                    catch(IOException e)
+                    {
+                        ErrorMessage = $"Could not create subchannel file, exception {e.Message}";
+
+                        return false;
+                    }
+
+                _subStream.Seek((long)(track.SubchannelOffset + ((sectorAddress - track.StartSector) * 96)),
+                                SeekOrigin.Begin);
+
+                _subStream.Write(Subchannel.Deinterleave(data), 0, data.Length);
+
+                return true;
+            }
+            default:
+                ErrorMessage = $"Unsupported tag type {tag}";
+
+                return false;
+        }
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyQM/Constants.cs b/Aaru.Images/CopyQM/Constants.cs
index 6d70c74d7..60597ace0 100644
--- a/Aaru.Images/CopyQM/Constants.cs
+++ b/Aaru.Images/CopyQM/Constants.cs
@@ -32,53 +32,52 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
-{
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class CopyQm
-    {
-        const ushort COPYQM_MAGIC  = 0x5143;
-        const byte   COPYQM_MARK   = 0x14;
-        const byte   COPYQM_FAT    = 0;
-        const byte   COPYQM_BLIND  = 1;
-        const byte   COPYQM_HFS    = 2;
-        const byte   COPYQM_525_DD = 1;
-        const byte   COPYQM_525_HD = 2;
-        const byte   COPYQM_35_DD  = 3;
-        const byte   COPYQM_35_HD  = 4;
-        const byte   COPYQM_35_ED  = 6;
+namespace Aaru.DiscImages;
 
-        readonly uint[] _copyQmCrcTable =
-        {
-            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832,
-            0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
-            0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A,
-            0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
-            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3,
-            0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
-            0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB,
-            0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
-            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4,
-            0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
-            0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074,
-            0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
-            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525,
-            0x206F85B3, 0xB966D409, 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
-            0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615,
-            0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
-            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76,
-            0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
-            0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6,
-            0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
-            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7,
-            0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
-            0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7,
-            0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
-            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278,
-            0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
-            0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330,
-            0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
-            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
-        };
-    }
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class CopyQm
+{
+    const ushort COPYQM_MAGIC  = 0x5143;
+    const byte   COPYQM_MARK   = 0x14;
+    const byte   COPYQM_FAT    = 0;
+    const byte   COPYQM_BLIND  = 1;
+    const byte   COPYQM_HFS    = 2;
+    const byte   COPYQM_525_DD = 1;
+    const byte   COPYQM_525_HD = 2;
+    const byte   COPYQM_35_DD  = 3;
+    const byte   COPYQM_35_HD  = 4;
+    const byte   COPYQM_35_ED  = 6;
+
+    readonly uint[] _copyQmCrcTable =
+    {
+        0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832,
+        0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
+        0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A,
+        0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+        0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3,
+        0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
+        0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB,
+        0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+        0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4,
+        0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
+        0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074,
+        0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+        0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525,
+        0x206F85B3, 0xB966D409, 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
+        0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615,
+        0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+        0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76,
+        0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
+        0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6,
+        0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+        0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7,
+        0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
+        0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7,
+        0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+        0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278,
+        0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
+        0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330,
+        0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+        0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyQM/CopyQM.cs b/Aaru.Images/CopyQM/CopyQM.cs
index 8686493c5..83afea61a 100644
--- a/Aaru.Images/CopyQM/CopyQM.cs
+++ b/Aaru.Images/CopyQM/CopyQM.cs
@@ -36,40 +36,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <summary>Implements reading CopyQM disk images</summary>
-    public sealed partial class CopyQm : IMediaImage, IVerifiableImage
-    {
-        uint         _calculatedDataCrc;
-        byte[]       _decodedDisk;
-        MemoryStream _decodedImage;
-        Header       _header;
-        bool         _headerChecksumOk;
-        ImageInfo    _imageInfo;
+namespace Aaru.DiscImages;
 
-        public CopyQm() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <summary>Implements reading CopyQM disk images</summary>
+public sealed partial class CopyQm : IMediaImage, IVerifiableImage
+{
+    uint         _calculatedDataCrc;
+    byte[]       _decodedDisk;
+    MemoryStream _decodedImage;
+    Header       _header;
+    bool         _headerChecksumOk;
+    ImageInfo    _imageInfo;
+
+    public CopyQm() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyQM/Identify.cs b/Aaru.Images/CopyQM/Identify.cs
index 602490602..397032542 100644
--- a/Aaru.Images/CopyQM/Identify.cs
+++ b/Aaru.Images/CopyQM/Identify.cs
@@ -34,25 +34,24 @@ using System;
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyQm
 {
-    public sealed partial class CopyQm
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 133)
-                return false;
+        if(stream.Length < 133)
+            return false;
 
-            byte[] hdr = new byte[133];
-            stream.Read(hdr, 0, 133);
+        byte[] hdr = new byte[133];
+        stream.Read(hdr, 0, 133);
 
-            ushort magic = BitConverter.ToUInt16(hdr, 0);
+        ushort magic = BitConverter.ToUInt16(hdr, 0);
 
-            return magic == COPYQM_MAGIC && hdr[0x02] == COPYQM_MARK && 133 + hdr[0x6F] < stream.Length;
-        }
+        return magic == COPYQM_MAGIC && hdr[0x02] == COPYQM_MARK && 133 + hdr[0x6F] < stream.Length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyQM/Properties.cs b/Aaru.Images/CopyQM/Properties.cs
index 4ffd41d03..87ca5540b 100644
--- a/Aaru.Images/CopyQM/Properties.cs
+++ b/Aaru.Images/CopyQM/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyQm
 {
-    public sealed partial class CopyQm
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "Sydex CopyQM";
-        /// <inheritdoc />
-        public Guid Id => new Guid("147E927D-3A92-4E0C-82CD-142F5A4FA76D");
-        /// <inheritdoc />
-        public string Format => "Sydex CopyQM";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "Sydex CopyQM";
+    /// <inheritdoc />
+    public Guid Id => new Guid("147E927D-3A92-4E0C-82CD-142F5A4FA76D");
+    /// <inheritdoc />
+    public string Format => "Sydex CopyQM";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyQM/Read.cs b/Aaru.Images/CopyQM/Read.cs
index f47464c56..f20d347b6 100644
--- a/Aaru.Images/CopyQM/Read.cs
+++ b/Aaru.Images/CopyQM/Read.cs
@@ -38,187 +38,186 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyQm
 {
-    public sealed partial class CopyQm
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        byte[] hdr = new byte[133];
+
+        stream.Read(hdr, 0, 133);
+        _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
+
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.magic = 0x{0:X4}", _header.magic);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.mark = 0x{0:X2}", _header.mark);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorSize = {0}", _header.sectorSize);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorPerCluster = {0}", _header.sectorPerCluster);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.reservedSectors = {0}", _header.reservedSectors);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.fatCopy = {0}", _header.fatCopy);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.rootEntries = {0}", _header.rootEntries);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectors = {0}", _header.sectors);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.mediaType = 0x{0:X2}", _header.mediaType);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsPerFat = {0}", _header.sectorsPerFat);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsPerTrack = {0}", _header.sectorsPerTrack);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.heads = {0}", _header.heads);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.hidden = {0}", _header.hidden);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsBig = {0}", _header.sectorsBig);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.description = {0}", _header.description);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.blind = {0}", _header.blind);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.density = {0}", _header.density);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.imageCylinders = {0}", _header.imageCylinders);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.totalCylinders = {0}", _header.totalCylinders);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.crc = 0x{0:X8}", _header.crc);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.volumeLabel = {0}", _header.volumeLabel);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.time = 0x{0:X4}", _header.time);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.date = 0x{0:X4}", _header.date);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.commentLength = {0}", _header.commentLength);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.secbs = {0}", _header.secbs);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.unknown = 0x{0:X4}", _header.unknown);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.interleave = {0}", _header.interleave);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.skew = {0}", _header.skew);
+        AaruConsole.DebugWriteLine("CopyQM plugin", "header.drive = {0}", _header.drive);
+
+        byte[] cmt = new byte[_header.commentLength];
+        stream.Read(cmt, 0, _header.commentLength);
+        _imageInfo.Comments = StringHandlers.CToString(cmt);
+        _decodedImage       = new MemoryStream();
+
+        _calculatedDataCrc = 0;
+
+        while(stream.Position + 2 < stream.Length)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            byte[] runLengthBytes = new byte[2];
 
-            byte[] hdr = new byte[133];
+            if(stream.Read(runLengthBytes, 0, 2) != 2)
+                break;
 
-            stream.Read(hdr, 0, 133);
-            _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
+            short runLength = BitConverter.ToInt16(runLengthBytes, 0);
 
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.magic = 0x{0:X4}", _header.magic);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.mark = 0x{0:X2}", _header.mark);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorSize = {0}", _header.sectorSize);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorPerCluster = {0}", _header.sectorPerCluster);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.reservedSectors = {0}", _header.reservedSectors);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.fatCopy = {0}", _header.fatCopy);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.rootEntries = {0}", _header.rootEntries);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectors = {0}", _header.sectors);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.mediaType = 0x{0:X2}", _header.mediaType);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsPerFat = {0}", _header.sectorsPerFat);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsPerTrack = {0}", _header.sectorsPerTrack);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.heads = {0}", _header.heads);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.hidden = {0}", _header.hidden);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.sectorsBig = {0}", _header.sectorsBig);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.description = {0}", _header.description);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.blind = {0}", _header.blind);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.density = {0}", _header.density);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.imageCylinders = {0}", _header.imageCylinders);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.totalCylinders = {0}", _header.totalCylinders);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.crc = 0x{0:X8}", _header.crc);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.volumeLabel = {0}", _header.volumeLabel);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.time = 0x{0:X4}", _header.time);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.date = 0x{0:X4}", _header.date);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.commentLength = {0}", _header.commentLength);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.secbs = {0}", _header.secbs);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.unknown = 0x{0:X4}", _header.unknown);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.interleave = {0}", _header.interleave);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.skew = {0}", _header.skew);
-            AaruConsole.DebugWriteLine("CopyQM plugin", "header.drive = {0}", _header.drive);
-
-            byte[] cmt = new byte[_header.commentLength];
-            stream.Read(cmt, 0, _header.commentLength);
-            _imageInfo.Comments = StringHandlers.CToString(cmt);
-            _decodedImage       = new MemoryStream();
-
-            _calculatedDataCrc = 0;
-
-            while(stream.Position + 2 < stream.Length)
+            if(runLength < 0)
             {
-                byte[] runLengthBytes = new byte[2];
+                byte   repeatedByte  = (byte)stream.ReadByte();
+                byte[] repeatedArray = new byte[runLength * -1];
+                ArrayHelpers.ArrayFill(repeatedArray, repeatedByte);
 
-                if(stream.Read(runLengthBytes, 0, 2) != 2)
-                    break;
-
-                short runLength = BitConverter.ToInt16(runLengthBytes, 0);
-
-                if(runLength < 0)
+                for(int i = 0; i < runLength * -1; i++)
                 {
-                    byte   repeatedByte  = (byte)stream.ReadByte();
-                    byte[] repeatedArray = new byte[runLength * -1];
-                    ArrayHelpers.ArrayFill(repeatedArray, repeatedByte);
+                    _decodedImage.WriteByte(repeatedByte);
 
-                    for(int i = 0; i < runLength * -1; i++)
-                    {
-                        _decodedImage.WriteByte(repeatedByte);
-
-                        _calculatedDataCrc = _copyQmCrcTable[(repeatedByte ^ _calculatedDataCrc) & 0x3F] ^
-                                             (_calculatedDataCrc >> 8);
-                    }
-                }
-                else if(runLength > 0)
-                {
-                    byte[] nonRepeated = new byte[runLength];
-                    stream.Read(nonRepeated, 0, runLength);
-                    _decodedImage.Write(nonRepeated, 0, runLength);
-
-                    foreach(byte c in nonRepeated)
-                        _calculatedDataCrc =
-                            _copyQmCrcTable[(c ^ _calculatedDataCrc) & 0x3F] ^ (_calculatedDataCrc >> 8);
+                    _calculatedDataCrc = _copyQmCrcTable[(repeatedByte ^ _calculatedDataCrc) & 0x3F] ^
+                                         (_calculatedDataCrc >> 8);
                 }
             }
-
-            // In case there is omitted data
-            long sectors = _header.sectorsPerTrack * _header.heads * _header.totalCylinders;
-
-            long fillingLen = (sectors * _header.sectorSize) - _decodedImage.Length;
-
-            if(fillingLen > 0)
+            else if(runLength > 0)
             {
-                byte[] filling = new byte[fillingLen];
-                ArrayHelpers.ArrayFill(filling, (byte)0xF6);
-                _decodedImage.Write(filling, 0, filling.Length);
+                byte[] nonRepeated = new byte[runLength];
+                stream.Read(nonRepeated, 0, runLength);
+                _decodedImage.Write(nonRepeated, 0, runLength);
+
+                foreach(byte c in nonRepeated)
+                    _calculatedDataCrc =
+                        _copyQmCrcTable[(c ^ _calculatedDataCrc) & 0x3F] ^ (_calculatedDataCrc >> 8);
             }
-
-            int sum = 0;
-
-            for(int i = 0; i < hdr.Length - 1; i++)
-                sum += hdr[i];
-
-            _headerChecksumOk = ((-1 * sum) & 0xFF) == _header.headerChecksum;
-
-            AaruConsole.DebugWriteLine("CopyQM plugin", "Calculated header checksum = 0x{0:X2}, {1}", (-1 * sum) & 0xFF,
-                                       _headerChecksumOk);
-
-            AaruConsole.DebugWriteLine("CopyQM plugin", "Calculated data CRC = 0x{0:X8}, {1}", _calculatedDataCrc,
-                                       _calculatedDataCrc == _header.crc);
-
-            _imageInfo.Application          = "CopyQM";
-            _imageInfo.CreationTime         = DateHandlers.DosToDateTime(_header.date, _header.time);
-            _imageInfo.LastModificationTime = _imageInfo.CreationTime;
-            _imageInfo.MediaTitle           = _header.volumeLabel;
-            _imageInfo.ImageSize            = (ulong)(stream.Length - 133 - _header.commentLength);
-            _imageInfo.Sectors              = (ulong)sectors;
-            _imageInfo.SectorSize           = _header.sectorSize;
-
-            _imageInfo.MediaType = Geometry.GetMediaType((_header.totalCylinders, (byte)_header.heads,
-                                                          _header.sectorsPerTrack, _header.sectorSize,
-                                                          MediaEncoding.MFM, false));
-
-            switch(_imageInfo.MediaType)
-            {
-                case MediaType.NEC_525_HD when _header.drive == COPYQM_35_HD || _header.drive == COPYQM_35_ED:
-                    _imageInfo.MediaType = MediaType.NEC_35_HD_8;
-
-                    break;
-                case MediaType.DOS_525_HD when _header.drive == COPYQM_35_HD || _header.drive == COPYQM_35_ED:
-                    _imageInfo.MediaType = MediaType.NEC_35_HD_15;
-
-                    break;
-                case MediaType.RX50 when _header.drive == COPYQM_525_DD || _header.drive == COPYQM_525_HD:
-                    _imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
-
-                    break;
-            }
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-            _decodedDisk            = _decodedImage.ToArray();
-
-            _decodedImage.Close();
-
-            AaruConsole.VerboseWriteLine("CopyQM image contains a disk of type {0}", _imageInfo.MediaType);
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                AaruConsole.VerboseWriteLine("CopyQM comments: {0}", _imageInfo.Comments);
-
-            _imageInfo.Heads           = _header.heads;
-            _imageInfo.Cylinders       = _header.totalCylinders;
-            _imageInfo.SectorsPerTrack = _header.sectorsPerTrack;
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        // In case there is omitted data
+        long sectors = _header.sectorsPerTrack * _header.heads * _header.totalCylinders;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        long fillingLen = (sectors * _header.sectorSize) - _decodedImage.Length;
+
+        if(fillingLen > 0)
         {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            buffer = new byte[length * _imageInfo.SectorSize];
-
-            Array.Copy(_decodedDisk, (int)sectorAddress * _imageInfo.SectorSize, buffer, 0,
-                       length                           * _imageInfo.SectorSize);
-
-            return ErrorNumber.NoError;
+            byte[] filling = new byte[fillingLen];
+            ArrayHelpers.ArrayFill(filling, (byte)0xF6);
+            _decodedImage.Write(filling, 0, filling.Length);
         }
 
-        /// <inheritdoc />
-        public bool? VerifyMediaImage() => _calculatedDataCrc == _header.crc && _headerChecksumOk;
+        int sum = 0;
+
+        for(int i = 0; i < hdr.Length - 1; i++)
+            sum += hdr[i];
+
+        _headerChecksumOk = ((-1 * sum) & 0xFF) == _header.headerChecksum;
+
+        AaruConsole.DebugWriteLine("CopyQM plugin", "Calculated header checksum = 0x{0:X2}, {1}", (-1 * sum) & 0xFF,
+                                   _headerChecksumOk);
+
+        AaruConsole.DebugWriteLine("CopyQM plugin", "Calculated data CRC = 0x{0:X8}, {1}", _calculatedDataCrc,
+                                   _calculatedDataCrc == _header.crc);
+
+        _imageInfo.Application          = "CopyQM";
+        _imageInfo.CreationTime         = DateHandlers.DosToDateTime(_header.date, _header.time);
+        _imageInfo.LastModificationTime = _imageInfo.CreationTime;
+        _imageInfo.MediaTitle           = _header.volumeLabel;
+        _imageInfo.ImageSize            = (ulong)(stream.Length - 133 - _header.commentLength);
+        _imageInfo.Sectors              = (ulong)sectors;
+        _imageInfo.SectorSize           = _header.sectorSize;
+
+        _imageInfo.MediaType = Geometry.GetMediaType((_header.totalCylinders, (byte)_header.heads,
+                                                      _header.sectorsPerTrack, _header.sectorSize,
+                                                      MediaEncoding.MFM, false));
+
+        switch(_imageInfo.MediaType)
+        {
+            case MediaType.NEC_525_HD when _header.drive == COPYQM_35_HD || _header.drive == COPYQM_35_ED:
+                _imageInfo.MediaType = MediaType.NEC_35_HD_8;
+
+                break;
+            case MediaType.DOS_525_HD when _header.drive == COPYQM_35_HD || _header.drive == COPYQM_35_ED:
+                _imageInfo.MediaType = MediaType.NEC_35_HD_15;
+
+                break;
+            case MediaType.RX50 when _header.drive == COPYQM_525_DD || _header.drive == COPYQM_525_HD:
+                _imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
+
+                break;
+        }
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+        _decodedDisk            = _decodedImage.ToArray();
+
+        _decodedImage.Close();
+
+        AaruConsole.VerboseWriteLine("CopyQM image contains a disk of type {0}", _imageInfo.MediaType);
+
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+            AaruConsole.VerboseWriteLine("CopyQM comments: {0}", _imageInfo.Comments);
+
+        _imageInfo.Heads           = _header.heads;
+        _imageInfo.Cylinders       = _header.totalCylinders;
+        _imageInfo.SectorsPerTrack = _header.sectorsPerTrack;
+
+        return ErrorNumber.NoError;
     }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        Array.Copy(_decodedDisk, (int)sectorAddress * _imageInfo.SectorSize, buffer, 0,
+                   length                           * _imageInfo.SectorSize);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifyMediaImage() => _calculatedDataCrc == _header.crc && _headerChecksumOk;
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyQM/Structs.cs b/Aaru.Images/CopyQM/Structs.cs
index 77e3ec31d..00f098525 100644
--- a/Aaru.Images/CopyQM/Structs.cs
+++ b/Aaru.Images/CopyQM/Structs.cs
@@ -32,78 +32,77 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyQm
 {
-    public sealed partial class CopyQm
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Header
-        {
-            /// <summary>0x00 magic, "CQ"</summary>
-            public readonly ushort magic;
-            /// <summary>0x02 always 0x14</summary>
-            public readonly byte mark;
-            /// <summary>0x03 Bytes per sector (part of FAT's BPB)</summary>
-            public readonly ushort sectorSize;
-            /// <summary>0x05 Sectors per cluster (part of FAT's BPB)</summary>
-            public readonly byte sectorPerCluster;
-            /// <summary>0x06 Reserved sectors (part of FAT's BPB)</summary>
-            public readonly ushort reservedSectors;
-            /// <summary>0x08 Number of FAT copies (part of FAT's BPB)</summary>
-            public readonly byte fatCopy;
-            /// <summary>0x09 Maximum number of entries in root directory (part of FAT's BPB)</summary>
-            public readonly ushort rootEntries;
-            /// <summary>0x0B Sectors on disk (part of FAT's BPB)</summary>
-            public readonly ushort sectors;
-            /// <summary>0x0D Media descriptor (part of FAT's BPB)</summary>
-            public readonly byte mediaType;
-            /// <summary>0x0E Sectors per FAT (part of FAT's BPB)</summary>
-            public readonly ushort sectorsPerFat;
-            /// <summary>0x10 Sectors per track (part of FAT's BPB)</summary>
-            public readonly ushort sectorsPerTrack;
-            /// <summary>0x12 Heads (part of FAT's BPB)</summary>
-            public readonly ushort heads;
-            /// <summary>0x14 Hidden sectors (part of FAT's BPB)</summary>
-            public readonly uint hidden;
-            /// <summary>0x18 Sectors on disk (part of FAT's BPB)</summary>
-            public readonly uint sectorsBig;
-            /// <summary>0x1C Description</summary>
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 60)]
-            public readonly string description;
-            /// <summary>0x58 Blind mode. 0 = DOS, 1 = blind, 2 = HFS</summary>
-            public readonly byte blind;
-            /// <summary>0x59 Density. 0 = Double, 1 = High, 2 = Quad/Extra</summary>
-            public readonly byte density;
-            /// <summary>0x5A Cylinders in image</summary>
-            public readonly byte imageCylinders;
-            /// <summary>0x5B Cylinders on disk</summary>
-            public readonly byte totalCylinders;
-            /// <summary>0x5C CRC32 of data</summary>
-            public readonly uint crc;
-            /// <summary>0x60 DOS volume label</summary>
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 11)]
-            public readonly string volumeLabel;
-            /// <summary>0x6B Modification time</summary>
-            public readonly ushort time;
-            /// <summary>0x6D Modification date</summary>
-            public readonly ushort date;
-            /// <summary>0x6F Comment length</summary>
-            public readonly ushort commentLength;
-            /// <summary>0x71 Sector base (first sector - 1)</summary>
-            public readonly byte secbs;
-            /// <summary>0x72 Unknown</summary>
-            public readonly ushort unknown;
-            /// <summary>0x74 Interleave</summary>
-            public readonly byte interleave;
-            /// <summary>0x75 Skew</summary>
-            public readonly byte skew;
-            /// <summary>0x76 Source drive type. 1 = 5.25" DD, 2 = 5.25" HD, 3 = 3.5" DD, 4 = 3.5" HD, 6 = 3.5" ED</summary>
-            public readonly byte drive;
-            /// <summary>0x77 Filling bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public readonly byte[] fill;
-            /// <summary>0x84 Header checksum</summary>
-            public readonly byte headerChecksum;
-        }
+        /// <summary>0x00 magic, "CQ"</summary>
+        public readonly ushort magic;
+        /// <summary>0x02 always 0x14</summary>
+        public readonly byte mark;
+        /// <summary>0x03 Bytes per sector (part of FAT's BPB)</summary>
+        public readonly ushort sectorSize;
+        /// <summary>0x05 Sectors per cluster (part of FAT's BPB)</summary>
+        public readonly byte sectorPerCluster;
+        /// <summary>0x06 Reserved sectors (part of FAT's BPB)</summary>
+        public readonly ushort reservedSectors;
+        /// <summary>0x08 Number of FAT copies (part of FAT's BPB)</summary>
+        public readonly byte fatCopy;
+        /// <summary>0x09 Maximum number of entries in root directory (part of FAT's BPB)</summary>
+        public readonly ushort rootEntries;
+        /// <summary>0x0B Sectors on disk (part of FAT's BPB)</summary>
+        public readonly ushort sectors;
+        /// <summary>0x0D Media descriptor (part of FAT's BPB)</summary>
+        public readonly byte mediaType;
+        /// <summary>0x0E Sectors per FAT (part of FAT's BPB)</summary>
+        public readonly ushort sectorsPerFat;
+        /// <summary>0x10 Sectors per track (part of FAT's BPB)</summary>
+        public readonly ushort sectorsPerTrack;
+        /// <summary>0x12 Heads (part of FAT's BPB)</summary>
+        public readonly ushort heads;
+        /// <summary>0x14 Hidden sectors (part of FAT's BPB)</summary>
+        public readonly uint hidden;
+        /// <summary>0x18 Sectors on disk (part of FAT's BPB)</summary>
+        public readonly uint sectorsBig;
+        /// <summary>0x1C Description</summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 60)]
+        public readonly string description;
+        /// <summary>0x58 Blind mode. 0 = DOS, 1 = blind, 2 = HFS</summary>
+        public readonly byte blind;
+        /// <summary>0x59 Density. 0 = Double, 1 = High, 2 = Quad/Extra</summary>
+        public readonly byte density;
+        /// <summary>0x5A Cylinders in image</summary>
+        public readonly byte imageCylinders;
+        /// <summary>0x5B Cylinders on disk</summary>
+        public readonly byte totalCylinders;
+        /// <summary>0x5C CRC32 of data</summary>
+        public readonly uint crc;
+        /// <summary>0x60 DOS volume label</summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 11)]
+        public readonly string volumeLabel;
+        /// <summary>0x6B Modification time</summary>
+        public readonly ushort time;
+        /// <summary>0x6D Modification date</summary>
+        public readonly ushort date;
+        /// <summary>0x6F Comment length</summary>
+        public readonly ushort commentLength;
+        /// <summary>0x71 Sector base (first sector - 1)</summary>
+        public readonly byte secbs;
+        /// <summary>0x72 Unknown</summary>
+        public readonly ushort unknown;
+        /// <summary>0x74 Interleave</summary>
+        public readonly byte interleave;
+        /// <summary>0x75 Skew</summary>
+        public readonly byte skew;
+        /// <summary>0x76 Source drive type. 1 = 5.25" DD, 2 = 5.25" HD, 3 = 3.5" DD, 4 = 3.5" HD, 6 = 3.5" ED</summary>
+        public readonly byte drive;
+        /// <summary>0x77 Filling bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
+        public readonly byte[] fill;
+        /// <summary>0x84 Header checksum</summary>
+        public readonly byte headerChecksum;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyQM/Unsupported.cs b/Aaru.Images/CopyQM/Unsupported.cs
index ed70a8168..b62c7f41b 100644
--- a/Aaru.Images/CopyQM/Unsupported.cs
+++ b/Aaru.Images/CopyQM/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyQm
 {
-    public sealed partial class CopyQm
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyTape/Constants.cs b/Aaru.Images/CopyTape/Constants.cs
index 9125ddcb6..cfcfed2e2 100644
--- a/Aaru.Images/CopyTape/Constants.cs
+++ b/Aaru.Images/CopyTape/Constants.cs
@@ -30,13 +30,12 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyTape
 {
-    public sealed partial class CopyTape
-    {
-        const string BLOCK_REGEX         = @"^CPTP:BLK (?<blockSize>\d{6})\n$";
-        const string PARTIAL_BLOCK_REGEX = @"^CPTP:BLK $";
-        const string FILEMARK_REGEX      = @"^CPTP:MRK\n$";
-        const string END_OF_TAPE_REGEX   = @"^CPTP:EOT\n$";
-    }
+    const string BLOCK_REGEX         = @"^CPTP:BLK (?<blockSize>\d{6})\n$";
+    const string PARTIAL_BLOCK_REGEX = @"^CPTP:BLK $";
+    const string FILEMARK_REGEX      = @"^CPTP:MRK\n$";
+    const string END_OF_TAPE_REGEX   = @"^CPTP:EOT\n$";
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyTape/CopyTape.cs b/Aaru.Images/CopyTape/CopyTape.cs
index f78e4c4e1..20633ab21 100644
--- a/Aaru.Images/CopyTape/CopyTape.cs
+++ b/Aaru.Images/CopyTape/CopyTape.cs
@@ -4,35 +4,34 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing copytape tape images</summary>
-    public sealed partial class CopyTape : IWritableTapeImage
-    {
-        long[]    _blockPositionCache;
-        ImageInfo _imageInfo;
-        Stream    _imageStream;
+namespace Aaru.DiscImages;
 
-        public CopyTape() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = true,
-            HasSessions           = true,
-            Version               = null,
-            ApplicationVersion    = null,
-            MediaTitle            = null,
-            Creator               = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing copytape tape images</summary>
+public sealed partial class CopyTape : IWritableTapeImage
+{
+    long[]    _blockPositionCache;
+    ImageInfo _imageInfo;
+    Stream    _imageStream;
+
+    public CopyTape() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = true,
+        HasSessions           = true,
+        Version               = null,
+        ApplicationVersion    = null,
+        MediaTitle            = null,
+        Creator               = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyTape/Identify.cs b/Aaru.Images/CopyTape/Identify.cs
index 7d0868aea..72bd6db30 100644
--- a/Aaru.Images/CopyTape/Identify.cs
+++ b/Aaru.Images/CopyTape/Identify.cs
@@ -35,47 +35,46 @@ using System.Text;
 using System.Text.RegularExpressions;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyTape
 {
-    public sealed partial class CopyTape
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            if(imageFilter.DataForkLength <= 16)
-                return false;
+        if(imageFilter.DataForkLength <= 16)
+            return false;
 
-            byte[] header = new byte[16];
+        byte[] header = new byte[16];
 
-            Stream strm = imageFilter.GetDataForkStream();
-            strm.Position = 0;
-            strm.Read(header, 0, 16);
+        Stream strm = imageFilter.GetDataForkStream();
+        strm.Position = 0;
+        strm.Read(header, 0, 16);
 
-            string mark = Encoding.ASCII.GetString(header);
+        string mark = Encoding.ASCII.GetString(header);
 
-            var   blockRx = new Regex(BLOCK_REGEX);
-            Match blockMt = blockRx.Match(mark);
+        var   blockRx = new Regex(BLOCK_REGEX);
+        Match blockMt = blockRx.Match(mark);
 
-            if(!blockMt.Success)
-                return false;
+        if(!blockMt.Success)
+            return false;
 
-            string blkSize = blockMt.Groups["blockSize"].Value;
+        string blkSize = blockMt.Groups["blockSize"].Value;
 
-            if(string.IsNullOrWhiteSpace(blkSize))
-                return false;
+        if(string.IsNullOrWhiteSpace(blkSize))
+            return false;
 
-            if(!uint.TryParse(blkSize, out uint blockSize))
-                return false;
+        if(!uint.TryParse(blkSize, out uint blockSize))
+            return false;
 
-            if(blockSize      == 0 ||
-               blockSize + 17 >= imageFilter.DataForkLength)
-                return false;
+        if(blockSize      == 0 ||
+           blockSize + 17 >= imageFilter.DataForkLength)
+            return false;
 
-            strm.Position += blockSize;
+        strm.Position += blockSize;
 
-            int newLine = strm.ReadByte();
+        int newLine = strm.ReadByte();
 
-            return newLine == 0x0A;
-        }
+        return newLine == 0x0A;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyTape/Properties.cs b/Aaru.Images/CopyTape/Properties.cs
index 346aa4d2d..899bb5ec0 100644
--- a/Aaru.Images/CopyTape/Properties.cs
+++ b/Aaru.Images/CopyTape/Properties.cs
@@ -37,79 +37,78 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyTape
 {
-    public sealed partial class CopyTape
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "CopyTape";
+    /// <inheritdoc />
+    public Guid Id => new Guid("C537D41E-D6A7-4922-9AA9-8E8442D0E340");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "CopyTape";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public List<TapeFile> Files { get; private set; }
+    /// <inheritdoc />
+    public List<TapePartition> TapePartitions { get; private set; }
+    /// <inheritdoc />
+    public bool IsTape { get; set; }
+
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "CopyTape";
-        /// <inheritdoc />
-        public Guid Id => new Guid("C537D41E-D6A7-4922-9AA9-8E8442D0E340");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "CopyTape";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public List<TapeFile> Files { get; private set; }
-        /// <inheritdoc />
-        public List<TapePartition> TapePartitions { get; private set; }
-        /// <inheritdoc />
-        public bool IsTape { get; set; }
-
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        MediaType.UnknownTape, MediaType.ADR2120, MediaType.ADR260, MediaType.ADR30, MediaType.ADR50,
+        MediaType.AIT1, MediaType.AIT1Turbo, MediaType.AIT2, MediaType.AIT2Turbo, MediaType.AIT3, MediaType.AIT3Ex,
+        MediaType.AIT3Turbo, MediaType.AIT4, MediaType.AIT5, MediaType.AITETurbo, MediaType.SAIT1, MediaType.SAIT2,
+        MediaType.Ditto, MediaType.DittoMax, MediaType.DigitalAudioTape, MediaType.DAT160, MediaType.DAT320,
+        MediaType.DAT72, MediaType.DDS1, MediaType.DDS2, MediaType.DDS3, MediaType.DDS4, MediaType.CompactTapeI,
+        MediaType.CompactTapeII, MediaType.DECtapeII, MediaType.DLTtapeIII, MediaType.DLTtapeIIIxt,
+        MediaType.DLTtapeIV, MediaType.DLTtapeS4, MediaType.SDLT1, MediaType.SDLT2, MediaType.VStapeI,
+        MediaType.Exatape15m, MediaType.Exatape22m, MediaType.Exatape22mAME, MediaType.Exatape28m,
+        MediaType.Exatape40m, MediaType.Exatape45m, MediaType.Exatape54m, MediaType.Exatape75m,
+        MediaType.Exatape76m, MediaType.Exatape80m, MediaType.Exatape106m, MediaType.Exatape160mXL,
+        MediaType.Exatape112m, MediaType.Exatape125m, MediaType.Exatape150m, MediaType.Exatape170m,
+        MediaType.Exatape225m, MediaType.IBM3470, MediaType.IBM3480, MediaType.IBM3490, MediaType.IBM3490E,
+        MediaType.IBM3592, MediaType.LTO, MediaType.LTO2, MediaType.LTO3, MediaType.LTO3WORM, MediaType.LTO4,
+        MediaType.LTO4WORM, MediaType.LTO5, MediaType.LTO5WORM, MediaType.LTO6, MediaType.LTO6WORM, MediaType.LTO7,
+        MediaType.LTO7WORM, MediaType.MLR1, MediaType.MLR1SL, MediaType.MLR3, MediaType.SLR1, MediaType.SLR2,
+        MediaType.SLR3, MediaType.SLR32, MediaType.SLR32SL, MediaType.SLR4, MediaType.SLR5, MediaType.SLR5SL,
+        MediaType.SLR6, MediaType.SLRtape7, MediaType.SLRtape7SL, MediaType.SLRtape24, MediaType.SLRtape24SL,
+        MediaType.SLRtape40, MediaType.SLRtape50, MediaType.SLRtape60, MediaType.SLRtape75, MediaType.SLRtape100,
+        MediaType.SLRtape140, MediaType.QIC11, MediaType.QIC120, MediaType.QIC1350, MediaType.QIC150,
+        MediaType.QIC24, MediaType.QIC3010, MediaType.QIC3020, MediaType.QIC3080, MediaType.QIC3095,
+        MediaType.QIC320, MediaType.QIC40, MediaType.QIC525, MediaType.QIC80, MediaType.STK4480, MediaType.STK4490,
+        MediaType.STK9490, MediaType.T9840A, MediaType.T9840B, MediaType.T9840C, MediaType.T9840D, MediaType.T9940A,
+        MediaType.T9940B, MediaType.T10000A, MediaType.T10000B, MediaType.T10000C, MediaType.T10000D,
+        MediaType.Travan, MediaType.Travan1Ex, MediaType.Travan3, MediaType.Travan3Ex, MediaType.Travan4,
+        MediaType.Travan5, MediaType.Travan7, MediaType.VXA1, MediaType.VXA2, MediaType.VXA3
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.UnknownTape, MediaType.ADR2120, MediaType.ADR260, MediaType.ADR30, MediaType.ADR50,
-            MediaType.AIT1, MediaType.AIT1Turbo, MediaType.AIT2, MediaType.AIT2Turbo, MediaType.AIT3, MediaType.AIT3Ex,
-            MediaType.AIT3Turbo, MediaType.AIT4, MediaType.AIT5, MediaType.AITETurbo, MediaType.SAIT1, MediaType.SAIT2,
-            MediaType.Ditto, MediaType.DittoMax, MediaType.DigitalAudioTape, MediaType.DAT160, MediaType.DAT320,
-            MediaType.DAT72, MediaType.DDS1, MediaType.DDS2, MediaType.DDS3, MediaType.DDS4, MediaType.CompactTapeI,
-            MediaType.CompactTapeII, MediaType.DECtapeII, MediaType.DLTtapeIII, MediaType.DLTtapeIIIxt,
-            MediaType.DLTtapeIV, MediaType.DLTtapeS4, MediaType.SDLT1, MediaType.SDLT2, MediaType.VStapeI,
-            MediaType.Exatape15m, MediaType.Exatape22m, MediaType.Exatape22mAME, MediaType.Exatape28m,
-            MediaType.Exatape40m, MediaType.Exatape45m, MediaType.Exatape54m, MediaType.Exatape75m,
-            MediaType.Exatape76m, MediaType.Exatape80m, MediaType.Exatape106m, MediaType.Exatape160mXL,
-            MediaType.Exatape112m, MediaType.Exatape125m, MediaType.Exatape150m, MediaType.Exatape170m,
-            MediaType.Exatape225m, MediaType.IBM3470, MediaType.IBM3480, MediaType.IBM3490, MediaType.IBM3490E,
-            MediaType.IBM3592, MediaType.LTO, MediaType.LTO2, MediaType.LTO3, MediaType.LTO3WORM, MediaType.LTO4,
-            MediaType.LTO4WORM, MediaType.LTO5, MediaType.LTO5WORM, MediaType.LTO6, MediaType.LTO6WORM, MediaType.LTO7,
-            MediaType.LTO7WORM, MediaType.MLR1, MediaType.MLR1SL, MediaType.MLR3, MediaType.SLR1, MediaType.SLR2,
-            MediaType.SLR3, MediaType.SLR32, MediaType.SLR32SL, MediaType.SLR4, MediaType.SLR5, MediaType.SLR5SL,
-            MediaType.SLR6, MediaType.SLRtape7, MediaType.SLRtape7SL, MediaType.SLRtape24, MediaType.SLRtape24SL,
-            MediaType.SLRtape40, MediaType.SLRtape50, MediaType.SLRtape60, MediaType.SLRtape75, MediaType.SLRtape100,
-            MediaType.SLRtape140, MediaType.QIC11, MediaType.QIC120, MediaType.QIC1350, MediaType.QIC150,
-            MediaType.QIC24, MediaType.QIC3010, MediaType.QIC3020, MediaType.QIC3080, MediaType.QIC3095,
-            MediaType.QIC320, MediaType.QIC40, MediaType.QIC525, MediaType.QIC80, MediaType.STK4480, MediaType.STK4490,
-            MediaType.STK9490, MediaType.T9840A, MediaType.T9840B, MediaType.T9840C, MediaType.T9840D, MediaType.T9940A,
-            MediaType.T9940B, MediaType.T10000A, MediaType.T10000B, MediaType.T10000C, MediaType.T10000D,
-            MediaType.Travan, MediaType.Travan1Ex, MediaType.Travan3, MediaType.Travan3Ex, MediaType.Travan4,
-            MediaType.Travan5, MediaType.Travan7, MediaType.VXA1, MediaType.VXA2, MediaType.VXA3
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".cptp"
-        };
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".cptp"
+    };
 
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyTape/Read.cs b/Aaru.Images/CopyTape/Read.cs
index ead5899b8..25ea56996 100644
--- a/Aaru.Images/CopyTape/Read.cs
+++ b/Aaru.Images/CopyTape/Read.cs
@@ -40,213 +40,212 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyTape
 {
-    public sealed partial class CopyTape
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        List<long> blockPositions = new();
+        var        partialBlockRx = new Regex(PARTIAL_BLOCK_REGEX);
+        var        blockRx        = new Regex(BLOCK_REGEX);
+        var        filemarkRx     = new Regex(FILEMARK_REGEX);
+        var        eotRx          = new Regex(END_OF_TAPE_REGEX);
+
+        if(imageFilter.DataForkLength <= 16)
+            return ErrorNumber.InvalidArgument;
+
+        _imageStream          = imageFilter.GetDataForkStream();
+        _imageStream.Position = 0;
+
+        byte[] header           = new byte[9];
+        byte[] blockHeader      = new byte[16];
+        ulong  currentBlock     = 0;
+        uint   currentFile      = 0;
+        ulong  currentFileStart = 0;
+        bool   inFile           = false;
+
+        Files = new List<TapeFile>();
+
+        while(_imageStream.Position + 9 < _imageStream.Length)
         {
-            List<long> blockPositions = new();
-            var        partialBlockRx = new Regex(PARTIAL_BLOCK_REGEX);
-            var        blockRx        = new Regex(BLOCK_REGEX);
-            var        filemarkRx     = new Regex(FILEMARK_REGEX);
-            var        eotRx          = new Regex(END_OF_TAPE_REGEX);
+            _imageStream.Read(header, 0, 9);
+            string mark = Encoding.ASCII.GetString(header);
 
-            if(imageFilter.DataForkLength <= 16)
-                return ErrorNumber.InvalidArgument;
+            Match partialBlockMt = partialBlockRx.Match(mark);
+            Match filemarkMt     = filemarkRx.Match(mark);
+            Match eotMt          = eotRx.Match(mark);
 
-            _imageStream          = imageFilter.GetDataForkStream();
-            _imageStream.Position = 0;
+            if(eotMt.Success)
+                break;
 
-            byte[] header           = new byte[9];
-            byte[] blockHeader      = new byte[16];
-            ulong  currentBlock     = 0;
-            uint   currentFile      = 0;
-            ulong  currentFileStart = 0;
-            bool   inFile           = false;
-
-            Files = new List<TapeFile>();
-
-            while(_imageStream.Position + 9 < _imageStream.Length)
+            if(filemarkMt.Success)
             {
-                _imageStream.Read(header, 0, 9);
-                string mark = Encoding.ASCII.GetString(header);
-
-                Match partialBlockMt = partialBlockRx.Match(mark);
-                Match filemarkMt     = filemarkRx.Match(mark);
-                Match eotMt          = eotRx.Match(mark);
-
-                if(eotMt.Success)
-                    break;
-
-                if(filemarkMt.Success)
+                Files.Add(new TapeFile
                 {
-                    Files.Add(new TapeFile
-                    {
-                        File       = currentFile,
-                        FirstBlock = currentFileStart,
-                        LastBlock  = currentBlock - 1,
-                        Partition  = 0
-                    });
+                    File       = currentFile,
+                    FirstBlock = currentFileStart,
+                    LastBlock  = currentBlock - 1,
+                    Partition  = 0
+                });
 
-                    inFile = false;
-                    currentFile++;
+                inFile = false;
+                currentFile++;
 
-                    continue;
-                }
-
-                if(!partialBlockMt.Success)
-                {
-                    AaruConsole.ErrorWriteLine("Found unhandled header, cannot open.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                _imageStream.Position -= 9;
-
-                if(!inFile)
-                {
-                    currentFileStart = currentBlock;
-                    inFile           = true;
-                }
-
-                _imageStream.Read(blockHeader, 0, 16);
-                mark = Encoding.ASCII.GetString(blockHeader);
-                Match blockMt = blockRx.Match(mark);
-
-                if(!blockMt.Success)
-                {
-                    AaruConsole.ErrorWriteLine("Cannot decode block header, cannot open.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                string blkSize = blockMt.Groups["blockSize"].Value;
-
-                if(string.IsNullOrWhiteSpace(blkSize))
-                {
-                    AaruConsole.ErrorWriteLine("Cannot decode block header, cannot open.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                if(!uint.TryParse(blkSize, out uint blockSize))
-                {
-                    AaruConsole.ErrorWriteLine("Cannot decode block header, cannot open.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                if(blockSize      == 0 ||
-                   blockSize + 17 > imageFilter.DataForkLength)
-                {
-                    AaruConsole.ErrorWriteLine("Cannot decode block header, cannot open.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                _imageStream.Position += blockSize;
-
-                int newLine = _imageStream.ReadByte();
-
-                if(newLine != 0x0A)
-                {
-                    AaruConsole.ErrorWriteLine("Cannot decode block header, cannot open.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                blockPositions.Add(_imageStream.Position - blockSize - 17);
-                currentBlock++;
-                _imageInfo.ImageSize += blockSize;
-
-                if(_imageInfo.SectorSize < blockSize)
-                    _imageInfo.SectorSize = blockSize;
+                continue;
             }
 
-            _blockPositionCache = blockPositions.ToArray();
-
-            TapePartitions = new List<TapePartition>
+            if(!partialBlockMt.Success)
             {
-                new()
-                {
-                    FirstBlock = 0,
-                    LastBlock  = currentBlock - 1,
-                    Number     = 0
-                }
-            };
+                AaruConsole.ErrorWriteLine("Found unhandled header, cannot open.");
 
-            _imageInfo.Sectors              = (ulong)_blockPositionCache.LongLength;
-            _imageInfo.MediaType            = MediaType.UnknownTape;
-            _imageInfo.Application          = "CopyTape";
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            IsTape                          = true;
+                return ErrorNumber.InvalidArgument;
+            }
 
-            return ErrorNumber.NoError;
-        }
+            _imageStream.Position -= 9;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(sectorAddress >= (ulong)_blockPositionCache.LongLength)
-                return ErrorNumber.OutOfRange;
-
-            _imageStream.Position = _blockPositionCache[sectorAddress];
-
-            byte[] blockHeader = new byte[16];
-            var    blockRx     = new Regex(BLOCK_REGEX);
+            if(!inFile)
+            {
+                currentFileStart = currentBlock;
+                inFile           = true;
+            }
 
             _imageStream.Read(blockHeader, 0, 16);
-            string mark    = Encoding.ASCII.GetString(blockHeader);
-            Match  blockMt = blockRx.Match(mark);
+            mark = Encoding.ASCII.GetString(blockHeader);
+            Match blockMt = blockRx.Match(mark);
 
             if(!blockMt.Success)
+            {
+                AaruConsole.ErrorWriteLine("Cannot decode block header, cannot open.");
+
                 return ErrorNumber.InvalidArgument;
+            }
 
             string blkSize = blockMt.Groups["blockSize"].Value;
 
             if(string.IsNullOrWhiteSpace(blkSize))
-                return ErrorNumber.InvalidArgument;
-
-            if(!uint.TryParse(blkSize, out uint blockSize))
-                return ErrorNumber.InvalidArgument;
-
-            if(blockSize      == 0 ||
-               blockSize + 17 > _imageStream.Length)
-                return ErrorNumber.InvalidArgument;
-
-            buffer = new byte[blockSize];
-
-            _imageStream.Read(buffer, 0, (int)blockSize);
-
-            return _imageStream.ReadByte() != 0x0A ? ErrorNumber.InvalidArgument : ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
             {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+                AaruConsole.ErrorWriteLine("Cannot decode block header, cannot open.");
 
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
+                return ErrorNumber.InvalidArgument;
             }
 
-            buffer = ms.ToArray();
+            if(!uint.TryParse(blkSize, out uint blockSize))
+            {
+                AaruConsole.ErrorWriteLine("Cannot decode block header, cannot open.");
 
-            return ErrorNumber.NoError;
+                return ErrorNumber.InvalidArgument;
+            }
+
+            if(blockSize      == 0 ||
+               blockSize + 17 > imageFilter.DataForkLength)
+            {
+                AaruConsole.ErrorWriteLine("Cannot decode block header, cannot open.");
+
+                return ErrorNumber.InvalidArgument;
+            }
+
+            _imageStream.Position += blockSize;
+
+            int newLine = _imageStream.ReadByte();
+
+            if(newLine != 0x0A)
+            {
+                AaruConsole.ErrorWriteLine("Cannot decode block header, cannot open.");
+
+                return ErrorNumber.InvalidArgument;
+            }
+
+            blockPositions.Add(_imageStream.Position - blockSize - 17);
+            currentBlock++;
+            _imageInfo.ImageSize += blockSize;
+
+            if(_imageInfo.SectorSize < blockSize)
+                _imageInfo.SectorSize = blockSize;
         }
+
+        _blockPositionCache = blockPositions.ToArray();
+
+        TapePartitions = new List<TapePartition>
+        {
+            new()
+            {
+                FirstBlock = 0,
+                LastBlock  = currentBlock - 1,
+                Number     = 0
+            }
+        };
+
+        _imageInfo.Sectors              = (ulong)_blockPositionCache.LongLength;
+        _imageInfo.MediaType            = MediaType.UnknownTape;
+        _imageInfo.Application          = "CopyTape";
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        IsTape                          = true;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress >= (ulong)_blockPositionCache.LongLength)
+            return ErrorNumber.OutOfRange;
+
+        _imageStream.Position = _blockPositionCache[sectorAddress];
+
+        byte[] blockHeader = new byte[16];
+        var    blockRx     = new Regex(BLOCK_REGEX);
+
+        _imageStream.Read(blockHeader, 0, 16);
+        string mark    = Encoding.ASCII.GetString(blockHeader);
+        Match  blockMt = blockRx.Match(mark);
+
+        if(!blockMt.Success)
+            return ErrorNumber.InvalidArgument;
+
+        string blkSize = blockMt.Groups["blockSize"].Value;
+
+        if(string.IsNullOrWhiteSpace(blkSize))
+            return ErrorNumber.InvalidArgument;
+
+        if(!uint.TryParse(blkSize, out uint blockSize))
+            return ErrorNumber.InvalidArgument;
+
+        if(blockSize      == 0 ||
+           blockSize + 17 > _imageStream.Length)
+            return ErrorNumber.InvalidArgument;
+
+        buffer = new byte[blockSize];
+
+        _imageStream.Read(buffer, 0, (int)blockSize);
+
+        return _imageStream.ReadByte() != 0x0A ? ErrorNumber.InvalidArgument : ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyTape/Unsupported.cs b/Aaru.Images/CopyTape/Unsupported.cs
index 4e1f0f570..80376452d 100644
--- a/Aaru.Images/CopyTape/Unsupported.cs
+++ b/Aaru.Images/CopyTape/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyTape
 {
-    public sealed partial class CopyTape
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/CopyTape/Write.cs b/Aaru.Images/CopyTape/Write.cs
index 43295938a..952b46c82 100644
--- a/Aaru.Images/CopyTape/Write.cs
+++ b/Aaru.Images/CopyTape/Write.cs
@@ -39,220 +39,219 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class CopyTape
 {
-    public sealed partial class CopyTape
+    FileStream               _dataStream;
+    ulong                    _lastWrittenBlock;
+    Dictionary<ulong, ulong> _writtenBlockPositions;
+
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        FileStream               _dataStream;
-        ulong                    _lastWrittenBlock;
-        Dictionary<ulong, ulong> _writtenBlockPositions;
-
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!SupportedMediaTypes.Contains(mediaType))
+            ErrorMessage = $"Unsupported media format {mediaType}";
+
+            return false;
+        }
+
+        _imageInfo = new ImageInfo
+        {
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _dataStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
+            return false;
+        }
+
+        _imageInfo.MediaType = mediaType;
+
+        IsWriting              = true;
+        IsTape                 = false;
+        ErrorMessage           = null;
+        _lastWrittenBlock      = 0;
+        _writtenBlockPositions = new Dictionary<ulong, ulong>();
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!_writtenBlockPositions.TryGetValue(sectorAddress, out ulong position))
+        {
+            if(_dataStream.Length != 0 &&
+               _lastWrittenBlock  >= sectorAddress)
             {
-                ErrorMessage = $"Unsupported media format {mediaType}";
+                ErrorMessage = "Cannot write unwritten blocks";
 
                 return false;
             }
 
-            _imageInfo = new ImageInfo
+            if(_lastWrittenBlock + 1 != sectorAddress &&
+               sectorAddress         != 0             &&
+               _lastWrittenBlock     != 0)
             {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _dataStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
+                ErrorMessage = "Cannot skip blocks";
 
                 return false;
             }
-
-            _imageInfo.MediaType = mediaType;
-
-            IsWriting              = true;
-            IsTape                 = false;
-            ErrorMessage           = null;
-            _lastWrittenBlock      = 0;
-            _writtenBlockPositions = new Dictionary<ulong, ulong>();
-
-            return true;
         }
+        else
+            _dataStream.Position = (long)position;
 
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
+        byte[] header = Encoding.ASCII.GetBytes($"CPTP:BLK {data.Length:D6}\n");
+
+        _writtenBlockPositions[sectorAddress] = (ulong)_dataStream.Position;
+        _dataStream.Write(header, 0, header.Length);
+        _dataStream.Write(data, 0, data.Length);
+        _dataStream.WriteByte(0x0A);
+
+        if(sectorAddress > _lastWrittenBlock)
+            _lastWrittenBlock = sectorAddress;
+
+        _dataStream.Seek(0, SeekOrigin.End);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        for(uint i = 0; i < length; i++)
         {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
-        {
-            if(!_writtenBlockPositions.TryGetValue(sectorAddress, out ulong position))
-            {
-                if(_dataStream.Length != 0 &&
-                   _lastWrittenBlock  >= sectorAddress)
-                {
-                    ErrorMessage = "Cannot write unwritten blocks";
-
-                    return false;
-                }
-
-                if(_lastWrittenBlock + 1 != sectorAddress &&
-                   sectorAddress         != 0             &&
-                   _lastWrittenBlock     != 0)
-                {
-                    ErrorMessage = "Cannot skip blocks";
-
-                    return false;
-                }
-            }
-            else
-                _dataStream.Position = (long)position;
-
-            byte[] header = Encoding.ASCII.GetBytes($"CPTP:BLK {data.Length:D6}\n");
-
-            _writtenBlockPositions[sectorAddress] = (ulong)_dataStream.Position;
-            _dataStream.Write(header, 0, header.Length);
-            _dataStream.Write(data, 0, data.Length);
-            _dataStream.WriteByte(0x0A);
-
-            if(sectorAddress > _lastWrittenBlock)
-                _lastWrittenBlock = sectorAddress;
-
-            _dataStream.Seek(0, SeekOrigin.End);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            for(uint i = 0; i < length; i++)
-            {
-                bool ret = WriteSector(data, sectorAddress + i);
-
-                if(!ret)
-                    return false;
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+            bool ret = WriteSector(data, sectorAddress + i);
 
+            if(!ret)
                 return false;
-            }
+        }
 
-            byte[] footer = Encoding.ASCII.GetBytes("CPTP:EOT\n");
+        return true;
+    }
 
-            _dataStream.Write(footer, 0, footer.Length);
-            _dataStream.Flush();
-            _dataStream.Close();
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Unsupported feature";
 
-            IsWriting = false;
+        return false;
+    }
 
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        byte[] footer = Encoding.ASCII.GetBytes("CPTP:EOT\n");
+
+        _dataStream.Write(footer, 0, footer.Length);
+        _dataStream.Flush();
+        _dataStream.Close();
+
+        IsWriting = false;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+
+    /// <inheritdoc />
+    public bool AddFile(TapeFile file)
+    {
+        if(file.Partition != 0)
+        {
+            ErrorMessage = "Unsupported feature";
+
+            return false;
+        }
+
+        byte[] marker = Encoding.ASCII.GetBytes("CPTP:MRK\n");
+
+        _dataStream.Write(marker, 0, marker.Length);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool AddPartition(TapePartition partition)
+    {
+        if(partition.Number == 0)
             return true;
-        }
 
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
+        ErrorMessage = "Unsupported feature";
 
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
-        {
-            ErrorMessage = "Unsupported feature";
+        return false;
+    }
 
-            return false;
-        }
+    /// <inheritdoc />
+    public bool SetTape()
+    {
+        IsTape = true;
 
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
-
-        /// <inheritdoc />
-        public bool AddFile(TapeFile file)
-        {
-            if(file.Partition != 0)
-            {
-                ErrorMessage = "Unsupported feature";
-
-                return false;
-            }
-
-            byte[] marker = Encoding.ASCII.GetBytes("CPTP:MRK\n");
-
-            _dataStream.Write(marker, 0, marker.Length);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool AddPartition(TapePartition partition)
-        {
-            if(partition.Number == 0)
-                return true;
-
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetTape()
-        {
-            IsTape = true;
-
-            return true;
-        }
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/D88/Constants.cs b/Aaru.Images/D88/Constants.cs
index 1c59414b1..694e79745 100644
--- a/Aaru.Images/D88/Constants.cs
+++ b/Aaru.Images/D88/Constants.cs
@@ -32,15 +32,14 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class D88
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class D88
+    const byte READ_ONLY = 0x10;
+    readonly byte[] _reservedEmpty =
     {
-        const byte READ_ONLY = 0x10;
-        readonly byte[] _reservedEmpty =
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
-    }
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/D88/D88.cs b/Aaru.Images/D88/D88.cs
index b6ea230c1..693e77725 100644
--- a/Aaru.Images/D88/D88.cs
+++ b/Aaru.Images/D88/D88.cs
@@ -35,40 +35,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    // Information from Quasi88's FORMAT.TXT file
-    // Japanese comments copied from there
-    // TODO: Solve media types
-    /// <inheritdoc />
-    /// <summary>Implements reading Quasi88 disk images</summary>
-    public sealed partial class D88 : IMediaImage
-    {
-        ImageInfo    _imageInfo;
-        List<byte[]> _sectorsData;
+namespace Aaru.DiscImages;
 
-        public D88() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// Information from Quasi88's FORMAT.TXT file
+// Japanese comments copied from there
+// TODO: Solve media types
+/// <inheritdoc />
+/// <summary>Implements reading Quasi88 disk images</summary>
+public sealed partial class D88 : IMediaImage
+{
+    ImageInfo    _imageInfo;
+    List<byte[]> _sectorsData;
+
+    public D88() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/D88/Enums.cs b/Aaru.Images/D88/Enums.cs
index db8db3d18..25e295181 100644
--- a/Aaru.Images/D88/Enums.cs
+++ b/Aaru.Images/D88/Enums.cs
@@ -32,36 +32,35 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class D88
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class D88
+    enum DiskType : byte
     {
-        enum DiskType : byte
-        {
-            D2 = 0x00, Dd2 = 0x10, Hd2 = 0x20
-        }
+        D2 = 0x00, Dd2 = 0x10, Hd2 = 0x20
+    }
 
-        enum DensityType : byte
-        {
-            Mfm = 0x00, Fm = 0x40
-        }
+    enum DensityType : byte
+    {
+        Mfm = 0x00, Fm = 0x40
+    }
 
-        /// <summary>Status as returned by PC-98 BIOS ステータスは、PC-98x1 のBIOS が返してくるステータスで、</summary>
-        enum StatusType : byte
-        {
-            /// <summary>Normal 正常</summary>
-            Normal = 0x00,
-            /// <summary>Deleted 正常(DELETED DATA)</summary>
-            Deleted = 0x10,
-            /// <summary>CRC error in address fields ID CRC エラー</summary>
-            IdError = 0xA0,
-            /// <summary>CRC error in data block データ CRC エラー</summary>
-            DataError = 0xB0,
-            /// <summary>Address mark not found アドレスマークなし</summary>
-            AddressMarkNotFound = 0xE0,
-            /// <summary>Data mark not found データマークなし</summary>
-            DataMarkNotFound = 0xF0
-        }
+    /// <summary>Status as returned by PC-98 BIOS ステータスは、PC-98x1 のBIOS が返してくるステータスで、</summary>
+    enum StatusType : byte
+    {
+        /// <summary>Normal 正常</summary>
+        Normal = 0x00,
+        /// <summary>Deleted 正常(DELETED DATA)</summary>
+        Deleted = 0x10,
+        /// <summary>CRC error in address fields ID CRC エラー</summary>
+        IdError = 0xA0,
+        /// <summary>CRC error in data block データ CRC エラー</summary>
+        DataError = 0xB0,
+        /// <summary>Address mark not found アドレスマークなし</summary>
+        AddressMarkNotFound = 0xE0,
+        /// <summary>Data mark not found データマークなし</summary>
+        DataMarkNotFound = 0xF0
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/D88/Identify.cs b/Aaru.Images/D88/Identify.cs
index cefd0964e..ead26eb40 100644
--- a/Aaru.Images/D88/Identify.cs
+++ b/Aaru.Images/D88/Identify.cs
@@ -37,66 +37,65 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class D88
 {
-    public sealed partial class D88
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        // Even if disk name is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+        var shiftjis = Encoding.GetEncoding("shift_jis");
+
+        if(stream.Length < Marshal.SizeOf<Header>())
+            return false;
+
+        byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
+
+        Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
+
+        AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.name = \"{0}\"",
+                                   StringHandlers.CToString(hdr.name, shiftjis));
+
+        AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.reserved is empty? = {0}",
+                                   hdr.reserved.SequenceEqual(_reservedEmpty));
+
+        AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.write_protect = 0x{0:X2}", hdr.write_protect);
+
+        AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_type = {0} ({1})", hdr.disk_type,
+                                   (byte)hdr.disk_type);
+
+        AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_size = {0}", hdr.disk_size);
+
+        if(hdr.disk_size != stream.Length)
+            return false;
+
+        if(hdr.disk_type != DiskType.D2  &&
+           hdr.disk_type != DiskType.Dd2 &&
+           hdr.disk_type != DiskType.Hd2)
+            return false;
+
+        if(!hdr.reserved.SequenceEqual(_reservedEmpty))
+            return false;
+
+        int counter = 0;
+
+        foreach(int t in hdr.track_table)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            if(t > 0)
+                counter++;
 
-            // Even if disk name is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            var shiftjis = Encoding.GetEncoding("shift_jis");
-
-            if(stream.Length < Marshal.SizeOf<Header>())
+            if(t < 0 ||
+               t > stream.Length)
                 return false;
-
-            byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(hdrB, 0, hdrB.Length);
-
-            Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
-
-            AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.name = \"{0}\"",
-                                       StringHandlers.CToString(hdr.name, shiftjis));
-
-            AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.reserved is empty? = {0}",
-                                       hdr.reserved.SequenceEqual(_reservedEmpty));
-
-            AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.write_protect = 0x{0:X2}", hdr.write_protect);
-
-            AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_type = {0} ({1})", hdr.disk_type,
-                                       (byte)hdr.disk_type);
-
-            AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_size = {0}", hdr.disk_size);
-
-            if(hdr.disk_size != stream.Length)
-                return false;
-
-            if(hdr.disk_type != DiskType.D2  &&
-               hdr.disk_type != DiskType.Dd2 &&
-               hdr.disk_type != DiskType.Hd2)
-                return false;
-
-            if(!hdr.reserved.SequenceEqual(_reservedEmpty))
-                return false;
-
-            int counter = 0;
-
-            foreach(int t in hdr.track_table)
-            {
-                if(t > 0)
-                    counter++;
-
-                if(t < 0 ||
-                   t > stream.Length)
-                    return false;
-            }
-
-            AaruConsole.DebugWriteLine("D88 plugin", "{0} tracks", counter);
-
-            return counter > 0;
         }
+
+        AaruConsole.DebugWriteLine("D88 plugin", "{0} tracks", counter);
+
+        return counter > 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/D88/Properties.cs b/Aaru.Images/D88/Properties.cs
index f85d4dd17..94c24d71e 100644
--- a/Aaru.Images/D88/Properties.cs
+++ b/Aaru.Images/D88/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class D88
 {
-    public sealed partial class D88
-    {
-        /// <inheritdoc />
-        public string Name => "D88 Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("669EDC77-EC41-4720-A88C-49C38CFFBAA0");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Format => "D88 disk image";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public string Name => "D88 Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("669EDC77-EC41-4720-A88C-49C38CFFBAA0");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Format => "D88 disk image";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/D88/Read.cs b/Aaru.Images/D88/Read.cs
index 4cd8ce8b6..9553ccfa7 100644
--- a/Aaru.Images/D88/Read.cs
+++ b/Aaru.Images/D88/Read.cs
@@ -41,372 +41,371 @@ using Aaru.Console;
 using Aaru.Decoders.Floppy;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class D88
 {
-    public sealed partial class D88
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        // Even if disk name is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+        var shiftjis = Encoding.GetEncoding("shift_jis");
+
+        if(stream.Length < Marshal.SizeOf<Header>())
+            return ErrorNumber.InvalidArgument;
+
+        byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
+        Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
+
+        AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.name = \"{0}\"",
+                                   StringHandlers.CToString(hdr.name, shiftjis));
+
+        AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.reserved is empty? = {0}",
+                                   hdr.reserved.SequenceEqual(_reservedEmpty));
+
+        AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.write_protect = 0x{0:X2}", hdr.write_protect);
+
+        AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_type = {0} ({1})", hdr.disk_type,
+                                   (byte)hdr.disk_type);
+
+        AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_size = {0}", hdr.disk_size);
+
+        if(hdr.disk_size != stream.Length)
+            return ErrorNumber.InvalidArgument;
+
+        if(hdr.disk_type != DiskType.D2  &&
+           hdr.disk_type != DiskType.Dd2 &&
+           hdr.disk_type != DiskType.Hd2)
+            return ErrorNumber.InvalidArgument;
+
+        if(!hdr.reserved.SequenceEqual(_reservedEmpty))
+            return ErrorNumber.InvalidArgument;
+
+        int trkCounter = 0;
+
+        foreach(int t in hdr.track_table)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            if(t > 0)
+                trkCounter++;
 
-            // Even if disk name is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            var shiftjis = Encoding.GetEncoding("shift_jis");
-
-            if(stream.Length < Marshal.SizeOf<Header>())
+            if(t < 0 ||
+               t > stream.Length)
                 return ErrorNumber.InvalidArgument;
+        }
 
-            byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        AaruConsole.DebugWriteLine("D88 plugin", "{0} tracks", trkCounter);
+
+        if(trkCounter == 0)
+            return ErrorNumber.InvalidArgument;
+
+        hdrB = new byte[Marshal.SizeOf<SectorHeader>()];
+        stream.Seek(hdr.track_table[0], SeekOrigin.Begin);
+        stream.Read(hdrB, 0, hdrB.Length);
+
+        SectorHeader sechdr = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(hdrB);
+
+        AaruConsole.DebugWriteLine("D88 plugin", "sechdr.c = {0}", sechdr.c);
+        AaruConsole.DebugWriteLine("D88 plugin", "sechdr.h = {0}", sechdr.h);
+        AaruConsole.DebugWriteLine("D88 plugin", "sechdr.r = {0}", sechdr.r);
+        AaruConsole.DebugWriteLine("D88 plugin", "sechdr.n = {0}", sechdr.n);
+        AaruConsole.DebugWriteLine("D88 plugin", "sechdr.spt = {0}", sechdr.spt);
+        AaruConsole.DebugWriteLine("D88 plugin", "sechdr.density = {0}", sechdr.density);
+        AaruConsole.DebugWriteLine("D88 plugin", "sechdr.deleted_mark = {0}", sechdr.deleted_mark);
+        AaruConsole.DebugWriteLine("D88 plugin", "sechdr.status = {0}", sechdr.status);
+        AaruConsole.DebugWriteLine("D88 plugin", "sechdr.size_of_data = {0}", sechdr.size_of_data);
+
+        short             spt      = sechdr.spt;
+        IBMSectorSizeCode bps      = sechdr.n;
+        bool              allEqual = true;
+        _sectorsData = new List<byte[]>();
+
+        for(int i = 0; i < trkCounter; i++)
+        {
+            stream.Seek(hdr.track_table[i], SeekOrigin.Begin);
             stream.Read(hdrB, 0, hdrB.Length);
-            Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
+            SortedDictionary<byte, byte[]> sectors = new();
 
-            AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.name = \"{0}\"",
-                                       StringHandlers.CToString(hdr.name, shiftjis));
+            sechdr = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(hdrB);
 
-            AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.reserved is empty? = {0}",
-                                       hdr.reserved.SequenceEqual(_reservedEmpty));
-
-            AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.write_protect = 0x{0:X2}", hdr.write_protect);
-
-            AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_type = {0} ({1})", hdr.disk_type,
-                                       (byte)hdr.disk_type);
-
-            AaruConsole.DebugWriteLine("D88 plugin", "d88hdr.disk_size = {0}", hdr.disk_size);
-
-            if(hdr.disk_size != stream.Length)
-                return ErrorNumber.InvalidArgument;
-
-            if(hdr.disk_type != DiskType.D2  &&
-               hdr.disk_type != DiskType.Dd2 &&
-               hdr.disk_type != DiskType.Hd2)
-                return ErrorNumber.InvalidArgument;
-
-            if(!hdr.reserved.SequenceEqual(_reservedEmpty))
-                return ErrorNumber.InvalidArgument;
-
-            int trkCounter = 0;
-
-            foreach(int t in hdr.track_table)
+            if(sechdr.spt != spt ||
+               sechdr.n   != bps)
             {
-                if(t > 0)
-                    trkCounter++;
+                AaruConsole.DebugWriteLine("D88 plugin",
+                                           "Disk tracks are not same size. spt = {0} (expected {1}), bps = {2} (expected {3}) at track {4} sector {5}",
+                                           sechdr.spt, spt, sechdr.n, bps, i, 0);
 
-                if(t < 0 ||
-                   t > stream.Length)
-                    return ErrorNumber.InvalidArgument;
+                allEqual = false;
             }
 
-            AaruConsole.DebugWriteLine("D88 plugin", "{0} tracks", trkCounter);
+            short  maxJ = sechdr.spt;
+            byte[] secB;
 
-            if(trkCounter == 0)
-                return ErrorNumber.InvalidArgument;
-
-            hdrB = new byte[Marshal.SizeOf<SectorHeader>()];
-            stream.Seek(hdr.track_table[0], SeekOrigin.Begin);
-            stream.Read(hdrB, 0, hdrB.Length);
-
-            SectorHeader sechdr = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(hdrB);
-
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.c = {0}", sechdr.c);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.h = {0}", sechdr.h);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.r = {0}", sechdr.r);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.n = {0}", sechdr.n);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.spt = {0}", sechdr.spt);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.density = {0}", sechdr.density);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.deleted_mark = {0}", sechdr.deleted_mark);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.status = {0}", sechdr.status);
-            AaruConsole.DebugWriteLine("D88 plugin", "sechdr.size_of_data = {0}", sechdr.size_of_data);
-
-            short             spt      = sechdr.spt;
-            IBMSectorSizeCode bps      = sechdr.n;
-            bool              allEqual = true;
-            _sectorsData = new List<byte[]>();
-
-            for(int i = 0; i < trkCounter; i++)
+            for(short j = 1; j < maxJ; j++)
             {
-                stream.Seek(hdr.track_table[i], SeekOrigin.Begin);
-                stream.Read(hdrB, 0, hdrB.Length);
-                SortedDictionary<byte, byte[]> sectors = new();
-
-                sechdr = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(hdrB);
-
-                if(sechdr.spt != spt ||
-                   sechdr.n   != bps)
-                {
-                    AaruConsole.DebugWriteLine("D88 plugin",
-                                               "Disk tracks are not same size. spt = {0} (expected {1}), bps = {2} (expected {3}) at track {4} sector {5}",
-                                               sechdr.spt, spt, sechdr.n, bps, i, 0);
-
-                    allEqual = false;
-                }
-
-                short  maxJ = sechdr.spt;
-                byte[] secB;
-
-                for(short j = 1; j < maxJ; j++)
-                {
-                    secB = new byte[sechdr.size_of_data];
-                    stream.Read(secB, 0, secB.Length);
-                    sectors.Add(sechdr.r, secB);
-                    stream.Read(hdrB, 0, hdrB.Length);
-
-                    sechdr = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(hdrB);
-
-                    if(sechdr.spt == spt &&
-                       sechdr.n   == bps)
-                        continue;
-
-                    AaruConsole.DebugWriteLine("D88 plugin",
-                                               "Disk tracks are not same size. spt = {0} (expected {1}), bps = {2} (expected {3}) at track {4} sector {5}",
-                                               sechdr.spt, spt, sechdr.n, bps, i, j, sechdr.deleted_mark);
-
-                    allEqual = false;
-                }
-
                 secB = new byte[sechdr.size_of_data];
                 stream.Read(secB, 0, secB.Length);
                 sectors.Add(sechdr.r, secB);
+                stream.Read(hdrB, 0, hdrB.Length);
 
-                foreach(KeyValuePair<byte, byte[]> kvp in sectors)
-                    _sectorsData.Add(kvp.Value);
+                sechdr = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(hdrB);
+
+                if(sechdr.spt == spt &&
+                   sechdr.n   == bps)
+                    continue;
+
+                AaruConsole.DebugWriteLine("D88 plugin",
+                                           "Disk tracks are not same size. spt = {0} (expected {1}), bps = {2} (expected {3}) at track {4} sector {5}",
+                                           sechdr.spt, spt, sechdr.n, bps, i, j, sechdr.deleted_mark);
+
+                allEqual = false;
             }
 
-            AaruConsole.DebugWriteLine("D88 plugin", "{0} sectors", _sectorsData.Count);
+            secB = new byte[sechdr.size_of_data];
+            stream.Read(secB, 0, secB.Length);
+            sectors.Add(sechdr.r, secB);
 
-            _imageInfo.MediaType = MediaType.Unknown;
-
-            if(allEqual)
-                if(trkCounter == 154 &&
-                   spt        == 26  &&
-                   bps        == IBMSectorSizeCode.EighthKilo)
-                    _imageInfo.MediaType = MediaType.NEC_8_SD;
-                else if(bps == IBMSectorSizeCode.QuarterKilo)
-                    switch(trkCounter)
-                    {
-                        case 35 when spt == 16:
-                            _imageInfo.MediaType = MediaType.MetaFloppy_Mod_I;
-
-                            break;
-                        case 77 when spt == 16:
-                            _imageInfo.MediaType = MediaType.MetaFloppy_Mod_II;
-
-                            break;
-                        case 80 when spt == 16:
-                            _imageInfo.MediaType = MediaType.NEC_525_SS;
-
-                            break;
-                        case 154 when spt == 26:
-                            _imageInfo.MediaType = MediaType.NEC_8_DD;
-
-                            break;
-                        case 160 when spt == 16:
-                            _imageInfo.MediaType = MediaType.NEC_525_DS;
-
-                            break;
-                    }
-                else if(trkCounter == 154 &&
-                        spt        == 8   &&
-                        bps        == IBMSectorSizeCode.Kilo)
-                    _imageInfo.MediaType = MediaType.NEC_525_HD;
-                else if(bps == IBMSectorSizeCode.HalfKilo)
-                    switch(hdr.track_table.Length)
-                    {
-                        case 40:
-                        {
-                            switch(spt)
-                            {
-                                case 8:
-                                    _imageInfo.MediaType = MediaType.DOS_525_SS_DD_8;
-
-                                    break;
-                                case 9:
-                                    _imageInfo.MediaType = MediaType.DOS_525_SS_DD_9;
-
-                                    break;
-                            }
-                        }
-
-                            break;
-                        case 80:
-                        {
-                            switch(spt)
-                            {
-                                case 8:
-                                    _imageInfo.MediaType = MediaType.DOS_525_DS_DD_8;
-
-                                    break;
-                                case 9:
-                                    _imageInfo.MediaType = MediaType.DOS_525_DS_DD_9;
-
-                                    break;
-                            }
-                        }
-
-                            break;
-                        case 160:
-                        {
-                            switch(spt)
-                            {
-                                case 15:
-                                    _imageInfo.MediaType = MediaType.NEC_35_HD_15;
-
-                                    break;
-                                case 9:
-                                    _imageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
-
-                                    break;
-                                case 18:
-                                    _imageInfo.MediaType = MediaType.DOS_35_HD;
-
-                                    break;
-                                case 36:
-                                    _imageInfo.MediaType = MediaType.DOS_35_ED;
-
-                                    break;
-                            }
-                        }
-
-                            break;
-                        case 480:
-                            if(spt == 38)
-                                _imageInfo.MediaType = MediaType.NEC_35_TD;
-
-                            break;
-                    }
-
-            AaruConsole.DebugWriteLine("D88 plugin", "MediaType: {0}", _imageInfo.MediaType);
-
-            _imageInfo.ImageSize            = (ulong)hdr.disk_size;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = (ulong)_sectorsData.Count;
-            _imageInfo.Comments             = StringHandlers.CToString(hdr.name, shiftjis);
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.SectorSize           = (uint)(128 << (int)bps);
-
-            switch(_imageInfo.MediaType)
-            {
-                case MediaType.NEC_525_SS:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.NEC_8_SD:
-                case MediaType.NEC_8_DD:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 26;
-
-                    break;
-                case MediaType.NEC_525_DS:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.NEC_525_HD:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.DOS_525_SS_DD_8:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.DOS_525_SS_DD_9:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.DOS_525_DS_DD_8:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.DOS_525_DS_DD_9:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.NEC_35_HD_15:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 15;
-
-                    break;
-                case MediaType.DOS_35_DS_DD_9:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.DOS_35_HD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 18;
-
-                    break;
-                case MediaType.DOS_35_ED:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 36;
-
-                    break;
-                case MediaType.NEC_35_TD:
-                    _imageInfo.Cylinders       = 240;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 38;
-
-                    break;
-                case MediaType.MetaFloppy_Mod_I:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.MetaFloppy_Mod_II:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-            }
-
-            return ErrorNumber.NoError;
+            foreach(KeyValuePair<byte, byte[]> kvp in sectors)
+                _sectorsData.Add(kvp.Value);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        AaruConsole.DebugWriteLine("D88 plugin", "{0} sectors", _sectorsData.Count);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        _imageInfo.MediaType = MediaType.Unknown;
+
+        if(allEqual)
+            if(trkCounter == 154 &&
+               spt        == 26  &&
+               bps        == IBMSectorSizeCode.EighthKilo)
+                _imageInfo.MediaType = MediaType.NEC_8_SD;
+            else if(bps == IBMSectorSizeCode.QuarterKilo)
+                switch(trkCounter)
+                {
+                    case 35 when spt == 16:
+                        _imageInfo.MediaType = MediaType.MetaFloppy_Mod_I;
+
+                        break;
+                    case 77 when spt == 16:
+                        _imageInfo.MediaType = MediaType.MetaFloppy_Mod_II;
+
+                        break;
+                    case 80 when spt == 16:
+                        _imageInfo.MediaType = MediaType.NEC_525_SS;
+
+                        break;
+                    case 154 when spt == 26:
+                        _imageInfo.MediaType = MediaType.NEC_8_DD;
+
+                        break;
+                    case 160 when spt == 16:
+                        _imageInfo.MediaType = MediaType.NEC_525_DS;
+
+                        break;
+                }
+            else if(trkCounter == 154 &&
+                    spt        == 8   &&
+                    bps        == IBMSectorSizeCode.Kilo)
+                _imageInfo.MediaType = MediaType.NEC_525_HD;
+            else if(bps == IBMSectorSizeCode.HalfKilo)
+                switch(hdr.track_table.Length)
+                {
+                    case 40:
+                    {
+                        switch(spt)
+                        {
+                            case 8:
+                                _imageInfo.MediaType = MediaType.DOS_525_SS_DD_8;
+
+                                break;
+                            case 9:
+                                _imageInfo.MediaType = MediaType.DOS_525_SS_DD_9;
+
+                                break;
+                        }
+                    }
+
+                        break;
+                    case 80:
+                    {
+                        switch(spt)
+                        {
+                            case 8:
+                                _imageInfo.MediaType = MediaType.DOS_525_DS_DD_8;
+
+                                break;
+                            case 9:
+                                _imageInfo.MediaType = MediaType.DOS_525_DS_DD_9;
+
+                                break;
+                        }
+                    }
+
+                        break;
+                    case 160:
+                    {
+                        switch(spt)
+                        {
+                            case 15:
+                                _imageInfo.MediaType = MediaType.NEC_35_HD_15;
+
+                                break;
+                            case 9:
+                                _imageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
+
+                                break;
+                            case 18:
+                                _imageInfo.MediaType = MediaType.DOS_35_HD;
+
+                                break;
+                            case 36:
+                                _imageInfo.MediaType = MediaType.DOS_35_ED;
+
+                                break;
+                        }
+                    }
+
+                        break;
+                    case 480:
+                        if(spt == 38)
+                            _imageInfo.MediaType = MediaType.NEC_35_TD;
+
+                        break;
+                }
+
+        AaruConsole.DebugWriteLine("D88 plugin", "MediaType: {0}", _imageInfo.MediaType);
+
+        _imageInfo.ImageSize            = (ulong)hdr.disk_size;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = (ulong)_sectorsData.Count;
+        _imageInfo.Comments             = StringHandlers.CToString(hdr.name, shiftjis);
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.SectorSize           = (uint)(128 << (int)bps);
+
+        switch(_imageInfo.MediaType)
         {
-            buffer = null;
+            case MediaType.NEC_525_SS:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 16;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.NEC_8_SD:
+            case MediaType.NEC_8_DD:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 26;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.NEC_525_DS:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 16;
 
-            var ms = new MemoryStream();
+                break;
+            case MediaType.NEC_525_HD:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 8;
 
-            for(int i = 0; i < length; i++)
-                ms.Write(_sectorsData[(int)sectorAddress + i], 0, _sectorsData[(int)sectorAddress + i].Length);
+                break;
+            case MediaType.DOS_525_SS_DD_8:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 8;
 
-            buffer = ms.ToArray();
+                break;
+            case MediaType.DOS_525_SS_DD_9:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 9;
 
-            return ErrorNumber.NoError;
+                break;
+            case MediaType.DOS_525_DS_DD_8:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case MediaType.DOS_525_DS_DD_9:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case MediaType.NEC_35_HD_15:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 15;
+
+                break;
+            case MediaType.DOS_35_DS_DD_9:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case MediaType.DOS_35_HD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 18;
+
+                break;
+            case MediaType.DOS_35_ED:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 36;
+
+                break;
+            case MediaType.NEC_35_TD:
+                _imageInfo.Cylinders       = 240;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 38;
+
+                break;
+            case MediaType.MetaFloppy_Mod_I:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.MetaFloppy_Mod_II:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
         }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(int i = 0; i < length; i++)
+            ms.Write(_sectorsData[(int)sectorAddress + i], 0, _sectorsData[(int)sectorAddress + i].Length);
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/D88/Structs.cs b/Aaru.Images/D88/Structs.cs
index c24315404..bc57fd8a7 100644
--- a/Aaru.Images/D88/Structs.cs
+++ b/Aaru.Images/D88/Structs.cs
@@ -33,54 +33,53 @@
 using System.Runtime.InteropServices;
 using Aaru.Decoders.Floppy;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class D88
-    {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Header
-        {
-            /// <summary>Disk name, nul-terminated ASCII ディスクの名前(ASCII + '\0')</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
-            public readonly byte[] name;
-            /// <summary>Reserved ディスクの名前(ASCII + '\0')</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 9)]
-            public readonly byte[] reserved;
-            /// <summary>Write protect status ライトプロテクト： 0x00 なし、0x10 あり</summary>
-            public readonly byte write_protect;
-            /// <summary>Disk type ディスクの種類： 0x00 2D、 0x10 2DD、 0x20 2HD</summary>
-            public readonly DiskType disk_type;
-            /// <summary>Disk image size ディスクのサイズ</summary>
-            public readonly int disk_size;
-            /// <summary>Track pointers トラック部のオフセットテーブル 0 Track ～ 163 Track</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 164)]
-            public readonly int[] track_table;
-        }
+namespace Aaru.DiscImages;
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SectorHeader
-        {
-            /// <summary>Cylinder ID の C</summary>
-            public readonly byte c;
-            /// <summary>Head ID の H</summary>
-            public readonly byte h;
-            /// <summary>Sector number ID の R</summary>
-            public readonly byte r;
-            /// <summary>Sector size ID の N</summary>
-            public readonly IBMSectorSizeCode n;
-            /// <summary>Number of sectors in this track このトラック内に存在するセクタの数</summary>
-            public readonly short spt;
-            /// <summary>Density: 0x00 MFM, 0x40 FM 記録密度： 0x00 倍密度、0x40 単密度</summary>
-            public readonly DensityType density;
-            /// <summary>Deleted sector, 0x00 not deleted, 0x10 deleted DELETED MARK： 0x00 ノーマル、 0x10 DELETED</summary>
-            public readonly byte deleted_mark;
-            /// <summary>Sector status ステータス</summary>
-            public readonly byte status;
-            /// <summary>Reserved リザーブ</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly byte[] reserved;
-            /// <summary>Size of data following this field このセクタ部のデータサイズ</summary>
-            public readonly short size_of_data;
-        }
+public sealed partial class D88
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Header
+    {
+        /// <summary>Disk name, nul-terminated ASCII ディスクの名前(ASCII + '\0')</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 17)]
+        public readonly byte[] name;
+        /// <summary>Reserved ディスクの名前(ASCII + '\0')</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 9)]
+        public readonly byte[] reserved;
+        /// <summary>Write protect status ライトプロテクト： 0x00 なし、0x10 あり</summary>
+        public readonly byte write_protect;
+        /// <summary>Disk type ディスクの種類： 0x00 2D、 0x10 2DD、 0x20 2HD</summary>
+        public readonly DiskType disk_type;
+        /// <summary>Disk image size ディスクのサイズ</summary>
+        public readonly int disk_size;
+        /// <summary>Track pointers トラック部のオフセットテーブル 0 Track ～ 163 Track</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 164)]
+        public readonly int[] track_table;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SectorHeader
+    {
+        /// <summary>Cylinder ID の C</summary>
+        public readonly byte c;
+        /// <summary>Head ID の H</summary>
+        public readonly byte h;
+        /// <summary>Sector number ID の R</summary>
+        public readonly byte r;
+        /// <summary>Sector size ID の N</summary>
+        public readonly IBMSectorSizeCode n;
+        /// <summary>Number of sectors in this track このトラック内に存在するセクタの数</summary>
+        public readonly short spt;
+        /// <summary>Density: 0x00 MFM, 0x40 FM 記録密度： 0x00 倍密度、0x40 単密度</summary>
+        public readonly DensityType density;
+        /// <summary>Deleted sector, 0x00 not deleted, 0x10 deleted DELETED MARK： 0x00 ノーマル、 0x10 DELETED</summary>
+        public readonly byte deleted_mark;
+        /// <summary>Sector status ステータス</summary>
+        public readonly byte status;
+        /// <summary>Reserved リザーブ</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly byte[] reserved;
+        /// <summary>Size of data following this field このセクタ部のデータサイズ</summary>
+        public readonly short size_of_data;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/D88/Unsupported.cs b/Aaru.Images/D88/Unsupported.cs
index d4fb1fd10..f5e852bde 100644
--- a/Aaru.Images/D88/Unsupported.cs
+++ b/Aaru.Images/D88/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class D88
 {
-    public sealed partial class D88
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DART/Constants.cs b/Aaru.Images/DART/Constants.cs
index 9a373fab3..c2a1e640f 100644
--- a/Aaru.Images/DART/Constants.cs
+++ b/Aaru.Images/DART/Constants.cs
@@ -32,50 +32,49 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Dart
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Dart
-    {
-        // Disk types
-        const byte DISK_MAC    = 1;
-        const byte DISK_LISA   = 2;
-        const byte DISK_APPLE2 = 3;
-        const byte DISK_MAC_HD = 16;
-        const byte DISK_DOS    = 17;
-        const byte DISK_DOS_HD = 18;
+    // Disk types
+    const byte DISK_MAC    = 1;
+    const byte DISK_LISA   = 2;
+    const byte DISK_APPLE2 = 3;
+    const byte DISK_MAC_HD = 16;
+    const byte DISK_DOS    = 17;
+    const byte DISK_DOS_HD = 18;
 
-        // Compression types
-        // "fast"
-        const byte COMPRESS_RLE = 0;
+    // Compression types
+    // "fast"
+    const byte COMPRESS_RLE = 0;
 
-        // "best"
-        const byte COMPRESS_LZH = 1;
+    // "best"
+    const byte COMPRESS_LZH = 1;
 
-        // DART <= 1.4
-        const byte COMPRESS_NONE = 2;
+    // DART <= 1.4
+    const byte COMPRESS_NONE = 2;
 
-        // Valid sizes
-        const short SIZE_LISA   = 400;
-        const short SIZE_MAC_SS = 400;
-        const short SIZE_MAC    = 800;
-        const short SIZE_MAC_HD = 1440;
-        const short SIZE_APPLE2 = 800;
-        const short SIZE_DOS    = 720;
-        const short SIZE_DOS_HD = 1440;
+    // Valid sizes
+    const short SIZE_LISA   = 400;
+    const short SIZE_MAC_SS = 400;
+    const short SIZE_MAC    = 800;
+    const short SIZE_MAC_HD = 1440;
+    const short SIZE_APPLE2 = 800;
+    const short SIZE_DOS    = 720;
+    const short SIZE_DOS_HD = 1440;
 
-        // bLength array sizes
-        const int BLOCK_ARRAY_LEN_LOW  = 40;
-        const int BLOCK_ARRAY_LEN_HIGH = 72;
+    // bLength array sizes
+    const int BLOCK_ARRAY_LEN_LOW  = 40;
+    const int BLOCK_ARRAY_LEN_HIGH = 72;
 
-        const int SECTORS_PER_BLOCK = 40;
-        const int SECTOR_SIZE       = 512;
-        const int TAG_SECTOR_SIZE   = 12;
-        const int DATA_SIZE         = SECTORS_PER_BLOCK * SECTOR_SIZE;
-        const int TAG_SIZE          = SECTORS_PER_BLOCK * TAG_SECTOR_SIZE;
-        const int BUFFER_SIZE       = (SECTORS_PER_BLOCK * SECTOR_SIZE) + (SECTORS_PER_BLOCK * TAG_SECTOR_SIZE);
+    const int SECTORS_PER_BLOCK = 40;
+    const int SECTOR_SIZE       = 512;
+    const int TAG_SECTOR_SIZE   = 12;
+    const int DATA_SIZE         = SECTORS_PER_BLOCK * SECTOR_SIZE;
+    const int TAG_SIZE          = SECTORS_PER_BLOCK * TAG_SECTOR_SIZE;
+    const int BUFFER_SIZE       = (SECTORS_PER_BLOCK * SECTOR_SIZE) + (SECTORS_PER_BLOCK * TAG_SECTOR_SIZE);
 
-        const string DART_REGEX =
-            @"(?<version>\S+), tag checksum=\$(?<tagchk>[0123456789ABCDEF]{8}), data checksum=\$(?<datachk>[0123456789ABCDEF]{8})$";
-    }
+    const string DART_REGEX =
+        @"(?<version>\S+), tag checksum=\$(?<tagchk>[0123456789ABCDEF]{8}), data checksum=\$(?<datachk>[0123456789ABCDEF]{8})$";
 }
\ No newline at end of file
diff --git a/Aaru.Images/DART/DART.cs b/Aaru.Images/DART/DART.cs
index 37a37f014..515d30fa2 100644
--- a/Aaru.Images/DART/DART.cs
+++ b/Aaru.Images/DART/DART.cs
@@ -35,41 +35,40 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading Apple DART disk images</summary>
-    public sealed partial class Dart : IMediaImage
-    {
-        // DART images are at most 1474560 bytes, so let's cache the whole
-        byte[]    _dataCache;
-        uint      _dataChecksum;
-        ImageInfo _imageInfo;
-        byte[]    _tagCache;
-        uint      _tagChecksum;
+namespace Aaru.DiscImages;
 
-        public Dart() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading Apple DART disk images</summary>
+public sealed partial class Dart : IMediaImage
+{
+    // DART images are at most 1474560 bytes, so let's cache the whole
+    byte[]    _dataCache;
+    uint      _dataChecksum;
+    ImageInfo _imageInfo;
+    byte[]    _tagCache;
+    uint      _tagChecksum;
+
+    public Dart() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/DART/Identify.cs b/Aaru.Images/DART/Identify.cs
index b587c71de..87a273964 100644
--- a/Aaru.Images/DART/Identify.cs
+++ b/Aaru.Images/DART/Identify.cs
@@ -34,70 +34,69 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Dart
 {
-    public sealed partial class Dart
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+
+        if(stream.Length < 84)
+            return false;
+
+        stream.Seek(0, SeekOrigin.Begin);
+        byte[] headerB = new byte[Marshal.SizeOf<Header>()];
+
+        stream.Read(headerB, 0, Marshal.SizeOf<Header>());
+        Header header = Marshal.ByteArrayToStructureBigEndian<Header>(headerB);
+
+        if(header.srcCmp > COMPRESS_NONE)
+            return false;
+
+        int expectedMaxSize = 84 + (header.srcSize * 2 * 524);
+
+        switch(header.srcType)
         {
-            Stream stream = imageFilter.GetDataForkStream();
+            case DISK_MAC:
+                if(header.srcSize != SIZE_MAC_SS &&
+                   header.srcSize != SIZE_MAC)
+                    return false;
 
-            if(stream.Length < 84)
-                return false;
+                break;
+            case DISK_LISA:
+                if(header.srcSize != SIZE_LISA)
+                    return false;
 
-            stream.Seek(0, SeekOrigin.Begin);
-            byte[] headerB = new byte[Marshal.SizeOf<Header>()];
+                break;
+            case DISK_APPLE2:
+                if(header.srcSize != SIZE_APPLE2)
+                    return false;
 
-            stream.Read(headerB, 0, Marshal.SizeOf<Header>());
-            Header header = Marshal.ByteArrayToStructureBigEndian<Header>(headerB);
+                break;
+            case DISK_MAC_HD:
+                if(header.srcSize != SIZE_MAC_HD)
+                    return false;
 
-            if(header.srcCmp > COMPRESS_NONE)
-                return false;
+                expectedMaxSize += 64;
 
-            int expectedMaxSize = 84 + (header.srcSize * 2 * 524);
+                break;
+            case DISK_DOS:
+                if(header.srcSize != SIZE_DOS)
+                    return false;
 
-            switch(header.srcType)
-            {
-                case DISK_MAC:
-                    if(header.srcSize != SIZE_MAC_SS &&
-                       header.srcSize != SIZE_MAC)
-                        return false;
+                break;
+            case DISK_DOS_HD:
+                if(header.srcSize != SIZE_DOS_HD)
+                    return false;
 
-                    break;
-                case DISK_LISA:
-                    if(header.srcSize != SIZE_LISA)
-                        return false;
+                expectedMaxSize += 64;
 
-                    break;
-                case DISK_APPLE2:
-                    if(header.srcSize != SIZE_APPLE2)
-                        return false;
-
-                    break;
-                case DISK_MAC_HD:
-                    if(header.srcSize != SIZE_MAC_HD)
-                        return false;
-
-                    expectedMaxSize += 64;
-
-                    break;
-                case DISK_DOS:
-                    if(header.srcSize != SIZE_DOS)
-                        return false;
-
-                    break;
-                case DISK_DOS_HD:
-                    if(header.srcSize != SIZE_DOS_HD)
-                        return false;
-
-                    expectedMaxSize += 64;
-
-                    break;
-                default: return false;
-            }
-
-            return stream.Length <= expectedMaxSize;
+                break;
+            default: return false;
         }
+
+        return stream.Length <= expectedMaxSize;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DART/Properties.cs b/Aaru.Images/DART/Properties.cs
index be7b43870..4610fa6e5 100644
--- a/Aaru.Images/DART/Properties.cs
+++ b/Aaru.Images/DART/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Dart
 {
-    public sealed partial class Dart
-    {
-        /// <inheritdoc />
-        public string Name => "Apple Disk Archival/Retrieval Tool";
-        /// <inheritdoc />
-        public Guid Id => new Guid("B3E06BF8-F98D-4F9B-BBE2-342C373BAF3E");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Apple Disk Archival/Retrieval Tool";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public string Name => "Apple Disk Archival/Retrieval Tool";
+    /// <inheritdoc />
+    public Guid Id => new Guid("B3E06BF8-F98D-4F9B-BBE2-342C373BAF3E");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Apple Disk Archival/Retrieval Tool";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/DART/Read.cs b/Aaru.Images/DART/Read.cs
index 0bf8525f3..943ea403c 100644
--- a/Aaru.Images/DART/Read.cs
+++ b/Aaru.Images/DART/Read.cs
@@ -43,374 +43,373 @@ using Claunia.Encoding;
 using Claunia.RsrcFork;
 using Version = Resources.Version;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Dart
 {
-    public sealed partial class Dart
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+
+        if(stream.Length < 84)
+            return ErrorNumber.InvalidArgument;
+
+        stream.Seek(0, SeekOrigin.Begin);
+        byte[] headerB = new byte[Marshal.SizeOf<Header>()];
+
+        stream.Read(headerB, 0, Marshal.SizeOf<Header>());
+        Header header = Marshal.ByteArrayToStructureBigEndian<Header>(headerB);
+
+        if(header.srcCmp > COMPRESS_NONE)
+            return ErrorNumber.NotSupported;
+
+        int expectedMaxSize = 84 + (header.srcSize * 2 * 524);
+
+        switch(header.srcType)
         {
-            Stream stream = imageFilter.GetDataForkStream();
+            case DISK_MAC:
+                if(header.srcSize != SIZE_MAC_SS &&
+                   header.srcSize != SIZE_MAC)
+                    return ErrorNumber.InvalidArgument;
 
-            if(stream.Length < 84)
-                return ErrorNumber.InvalidArgument;
+                break;
+            case DISK_LISA:
+                if(header.srcSize != SIZE_LISA)
+                    return ErrorNumber.InvalidArgument;
 
-            stream.Seek(0, SeekOrigin.Begin);
-            byte[] headerB = new byte[Marshal.SizeOf<Header>()];
+                break;
+            case DISK_APPLE2:
+                if(header.srcSize != DISK_APPLE2)
+                    return ErrorNumber.InvalidArgument;
 
-            stream.Read(headerB, 0, Marshal.SizeOf<Header>());
-            Header header = Marshal.ByteArrayToStructureBigEndian<Header>(headerB);
+                break;
+            case DISK_MAC_HD:
+                if(header.srcSize != SIZE_MAC_HD)
+                    return ErrorNumber.InvalidArgument;
 
-            if(header.srcCmp > COMPRESS_NONE)
-                return ErrorNumber.NotSupported;
+                expectedMaxSize += 64;
 
-            int expectedMaxSize = 84 + (header.srcSize * 2 * 524);
+                break;
+            case DISK_DOS:
+                if(header.srcSize != SIZE_DOS)
+                    return ErrorNumber.InvalidArgument;
 
-            switch(header.srcType)
+                break;
+            case DISK_DOS_HD:
+                if(header.srcSize != SIZE_DOS_HD)
+                    return ErrorNumber.InvalidArgument;
+
+                expectedMaxSize += 64;
+
+                break;
+            default: return ErrorNumber.InvalidArgument;
+        }
+
+        if(stream.Length > expectedMaxSize)
+            return ErrorNumber.InvalidArgument;
+
+        short[] bLength;
+
+        if(header.srcType == DISK_MAC_HD ||
+           header.srcType == DISK_DOS_HD)
+            bLength = new short[BLOCK_ARRAY_LEN_HIGH];
+        else
+            bLength = new short[BLOCK_ARRAY_LEN_LOW];
+
+        for(int i = 0; i < bLength.Length; i++)
+        {
+            byte[] tmpShort = new byte[2];
+            stream.Read(tmpShort, 0, 2);
+            bLength[i] = BigEndianBitConverter.ToInt16(tmpShort, 0);
+        }
+
+        var dataMs = new MemoryStream();
+        var tagMs  = new MemoryStream();
+
+        foreach(short l in bLength)
+            if(l != 0)
             {
-                case DISK_MAC:
-                    if(header.srcSize != SIZE_MAC_SS &&
-                       header.srcSize != SIZE_MAC)
-                        return ErrorNumber.InvalidArgument;
+                byte[] buffer = new byte[BUFFER_SIZE];
 
-                    break;
-                case DISK_LISA:
-                    if(header.srcSize != SIZE_LISA)
-                        return ErrorNumber.InvalidArgument;
-
-                    break;
-                case DISK_APPLE2:
-                    if(header.srcSize != DISK_APPLE2)
-                        return ErrorNumber.InvalidArgument;
-
-                    break;
-                case DISK_MAC_HD:
-                    if(header.srcSize != SIZE_MAC_HD)
-                        return ErrorNumber.InvalidArgument;
-
-                    expectedMaxSize += 64;
-
-                    break;
-                case DISK_DOS:
-                    if(header.srcSize != SIZE_DOS)
-                        return ErrorNumber.InvalidArgument;
-
-                    break;
-                case DISK_DOS_HD:
-                    if(header.srcSize != SIZE_DOS_HD)
-                        return ErrorNumber.InvalidArgument;
-
-                    expectedMaxSize += 64;
-
-                    break;
-                default: return ErrorNumber.InvalidArgument;
-            }
-
-            if(stream.Length > expectedMaxSize)
-                return ErrorNumber.InvalidArgument;
-
-            short[] bLength;
-
-            if(header.srcType == DISK_MAC_HD ||
-               header.srcType == DISK_DOS_HD)
-                bLength = new short[BLOCK_ARRAY_LEN_HIGH];
-            else
-                bLength = new short[BLOCK_ARRAY_LEN_LOW];
-
-            for(int i = 0; i < bLength.Length; i++)
-            {
-                byte[] tmpShort = new byte[2];
-                stream.Read(tmpShort, 0, 2);
-                bLength[i] = BigEndianBitConverter.ToInt16(tmpShort, 0);
-            }
-
-            var dataMs = new MemoryStream();
-            var tagMs  = new MemoryStream();
-
-            foreach(short l in bLength)
-                if(l != 0)
+                if(l == -1)
                 {
-                    byte[] buffer = new byte[BUFFER_SIZE];
+                    stream.Read(buffer, 0, BUFFER_SIZE);
+                    dataMs.Write(buffer, 0, DATA_SIZE);
+                    tagMs.Write(buffer, DATA_SIZE, TAG_SIZE);
+                }
+                else
+                {
+                    byte[] temp;
 
-                    if(l == -1)
+                    if(header.srcCmp == COMPRESS_RLE)
                     {
-                        stream.Read(buffer, 0, BUFFER_SIZE);
+                        temp = new byte[l * 2];
+                        stream.Read(temp, 0, temp.Length);
+                        buffer = new byte[BUFFER_SIZE];
+
+                        AppleRle.DecodeBuffer(temp, buffer);
+
                         dataMs.Write(buffer, 0, DATA_SIZE);
                         tagMs.Write(buffer, DATA_SIZE, TAG_SIZE);
                     }
                     else
                     {
-                        byte[] temp;
+                        temp = new byte[l];
+                        stream.Read(temp, 0, temp.Length);
 
-                        if(header.srcCmp == COMPRESS_RLE)
-                        {
-                            temp = new byte[l * 2];
-                            stream.Read(temp, 0, temp.Length);
-                            buffer = new byte[BUFFER_SIZE];
+                        AaruConsole.ErrorWriteLine("LZH Compressed images not yet supported");
 
-                            AppleRle.DecodeBuffer(temp, buffer);
-
-                            dataMs.Write(buffer, 0, DATA_SIZE);
-                            tagMs.Write(buffer, DATA_SIZE, TAG_SIZE);
-                        }
-                        else
-                        {
-                            temp = new byte[l];
-                            stream.Read(temp, 0, temp.Length);
-
-                            AaruConsole.ErrorWriteLine("LZH Compressed images not yet supported");
-
-                            return ErrorNumber.NotImplemented;
-                        }
+                        return ErrorNumber.NotImplemented;
                     }
                 }
-
-            _dataCache = dataMs.ToArray();
-
-            if(header.srcType == DISK_LISA ||
-               header.srcType == DISK_MAC  ||
-               header.srcType == DISK_APPLE2)
-            {
-                _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
-                _tagCache = tagMs.ToArray();
             }
 
-            try
+        _dataCache = dataMs.ToArray();
+
+        if(header.srcType == DISK_LISA ||
+           header.srcType == DISK_MAC  ||
+           header.srcType == DISK_APPLE2)
+        {
+            _imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
+            _tagCache = tagMs.ToArray();
+        }
+
+        try
+        {
+            if(imageFilter.HasResourceFork)
             {
-                if(imageFilter.HasResourceFork)
+                var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+
+                // "vers"
+                if(rsrcFork.ContainsKey(0x76657273))
                 {
-                    var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+                    Resource versRsrc = rsrcFork.GetResource(0x76657273);
 
-                    // "vers"
-                    if(rsrcFork.ContainsKey(0x76657273))
+                    byte[] vers = versRsrc?.GetResource(versRsrc.GetIds()[0]);
+
+                    if(vers != null)
                     {
-                        Resource versRsrc = rsrcFork.GetResource(0x76657273);
+                        var version = new Version(vers);
 
-                        byte[] vers = versRsrc?.GetResource(versRsrc.GetIds()[0]);
+                        string release = null;
+                        string dev     = null;
+                        string pre     = null;
 
-                        if(vers != null)
+                        string major = $"{version.MajorVersion}";
+                        string minor = $".{version.MinorVersion / 10}";
+
+                        if(version.MinorVersion % 10 > 0)
+                            release = $".{version.MinorVersion % 10}";
+
+                        switch(version.DevStage)
                         {
-                            var version = new Version(vers);
+                            case Version.DevelopmentStage.Alpha:
+                                dev = "a";
 
-                            string release = null;
-                            string dev     = null;
-                            string pre     = null;
+                                break;
+                            case Version.DevelopmentStage.Beta:
+                                dev = "b";
 
-                            string major = $"{version.MajorVersion}";
-                            string minor = $".{version.MinorVersion / 10}";
+                                break;
+                            case Version.DevelopmentStage.PreAlpha:
+                                dev = "d";
 
-                            if(version.MinorVersion % 10 > 0)
-                                release = $".{version.MinorVersion % 10}";
-
-                            switch(version.DevStage)
-                            {
-                                case Version.DevelopmentStage.Alpha:
-                                    dev = "a";
-
-                                    break;
-                                case Version.DevelopmentStage.Beta:
-                                    dev = "b";
-
-                                    break;
-                                case Version.DevelopmentStage.PreAlpha:
-                                    dev = "d";
-
-                                    break;
-                            }
-
-                            if(dev                       == null &&
-                               version.PreReleaseVersion > 0)
-                                dev = "f";
-
-                            if(dev != null)
-                                pre = $"{version.PreReleaseVersion}";
-
-                            _imageInfo.ApplicationVersion = $"{major}{minor}{release}{dev}{pre}";
-                            _imageInfo.Application        = version.VersionString;
-                            _imageInfo.Comments           = version.VersionMessage;
+                                break;
                         }
+
+                        if(dev                       == null &&
+                           version.PreReleaseVersion > 0)
+                            dev = "f";
+
+                        if(dev != null)
+                            pre = $"{version.PreReleaseVersion}";
+
+                        _imageInfo.ApplicationVersion = $"{major}{minor}{release}{dev}{pre}";
+                        _imageInfo.Application        = version.VersionString;
+                        _imageInfo.Comments           = version.VersionMessage;
                     }
+                }
 
-                    // "dart"
-                    if(rsrcFork.ContainsKey(0x44415254))
+                // "dart"
+                if(rsrcFork.ContainsKey(0x44415254))
+                {
+                    Resource dartRsrc = rsrcFork.GetResource(0x44415254);
+
+                    if(dartRsrc != null)
                     {
-                        Resource dartRsrc = rsrcFork.GetResource(0x44415254);
+                        string dArt = StringHandlers.PascalToString(dartRsrc.GetResource(dartRsrc.GetIds()[0]),
+                                                                    Encoding.GetEncoding("macintosh"));
 
-                        if(dartRsrc != null)
+                        var   dArtEx    = new Regex(DART_REGEX);
+                        Match dArtMatch = dArtEx.Match(dArt);
+
+                        if(dArtMatch.Success)
                         {
-                            string dArt = StringHandlers.PascalToString(dartRsrc.GetResource(dartRsrc.GetIds()[0]),
-                                                                        Encoding.GetEncoding("macintosh"));
-
-                            var   dArtEx    = new Regex(DART_REGEX);
-                            Match dArtMatch = dArtEx.Match(dArt);
-
-                            if(dArtMatch.Success)
-                            {
-                                _imageInfo.Application        = "DART";
-                                _imageInfo.ApplicationVersion = dArtMatch.Groups["version"].Value;
-                                _dataChecksum                 = Convert.ToUInt32(dArtMatch.Groups["datachk"].Value, 16);
-                                _tagChecksum                  = Convert.ToUInt32(dArtMatch.Groups["tagchk"].Value, 16);
-                            }
-                        }
-                    }
-
-                    // "cksm"
-                    if(rsrcFork.ContainsKey(0x434B534D))
-                    {
-                        Resource cksmRsrc = rsrcFork.GetResource(0x434B534D);
-
-                        if(cksmRsrc?.ContainsId(1) == true)
-                        {
-                            byte[] tagChk = cksmRsrc.GetResource(1);
-                            _tagChecksum = BigEndianBitConverter.ToUInt32(tagChk, 0);
-                        }
-
-                        if(cksmRsrc?.ContainsId(2) == true)
-                        {
-                            byte[] dataChk = cksmRsrc.GetResource(1);
-                            _dataChecksum = BigEndianBitConverter.ToUInt32(dataChk, 0);
+                            _imageInfo.Application        = "DART";
+                            _imageInfo.ApplicationVersion = dArtMatch.Groups["version"].Value;
+                            _dataChecksum                 = Convert.ToUInt32(dArtMatch.Groups["datachk"].Value, 16);
+                            _tagChecksum                  = Convert.ToUInt32(dArtMatch.Groups["tagchk"].Value, 16);
                         }
                     }
                 }
+
+                // "cksm"
+                if(rsrcFork.ContainsKey(0x434B534D))
+                {
+                    Resource cksmRsrc = rsrcFork.GetResource(0x434B534D);
+
+                    if(cksmRsrc?.ContainsId(1) == true)
+                    {
+                        byte[] tagChk = cksmRsrc.GetResource(1);
+                        _tagChecksum = BigEndianBitConverter.ToUInt32(tagChk, 0);
+                    }
+
+                    if(cksmRsrc?.ContainsId(2) == true)
+                    {
+                        byte[] dataChk = cksmRsrc.GetResource(1);
+                        _dataChecksum = BigEndianBitConverter.ToUInt32(dataChk, 0);
+                    }
+                }
             }
-            catch(InvalidCastException) {}
-
-            AaruConsole.DebugWriteLine("DART plugin", "Image application = {0} version {1}", _imageInfo.Application,
-                                       _imageInfo.ApplicationVersion);
-
-            _imageInfo.Sectors              = (ulong)(header.srcSize * 2);
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.SectorSize           = SECTOR_SIZE;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.ImageSize            = _imageInfo.Sectors * SECTOR_SIZE;
-            _imageInfo.Version              = header.srcCmp == COMPRESS_NONE ? "1.4" : "1.5";
-
-            switch(header.srcSize)
-            {
-                case SIZE_MAC_SS:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 10;
-                    _imageInfo.MediaType       = MediaType.AppleSonySS;
-
-                    break;
-                case SIZE_MAC:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 10;
-                    _imageInfo.MediaType       = MediaType.AppleSonyDS;
-
-                    break;
-                case SIZE_DOS:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 9;
-                    _imageInfo.MediaType       = MediaType.DOS_35_DS_DD_9;
-
-                    break;
-                case SIZE_MAC_HD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 18;
-                    _imageInfo.MediaType       = MediaType.DOS_35_HD;
-
-                    break;
-            }
-
-            return ErrorNumber.NoError;
         }
+        catch(InvalidCastException) {}
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        AaruConsole.DebugWriteLine("DART plugin", "Image application = {0} version {1}", _imageInfo.Application,
+                                   _imageInfo.ApplicationVersion);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+        _imageInfo.Sectors              = (ulong)(header.srcSize * 2);
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.SectorSize           = SECTOR_SIZE;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.ImageSize            = _imageInfo.Sectors * SECTOR_SIZE;
+        _imageInfo.Version              = header.srcCmp == COMPRESS_NONE ? "1.4" : "1.5";
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        switch(header.srcSize)
         {
-            buffer = null;
+            case SIZE_MAC_SS:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 10;
+                _imageInfo.MediaType       = MediaType.AppleSonySS;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+                break;
+            case SIZE_MAC:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 10;
+                _imageInfo.MediaType       = MediaType.AppleSonyDS;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+                break;
+            case SIZE_DOS:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 9;
+                _imageInfo.MediaType       = MediaType.DOS_35_DS_DD_9;
 
-            buffer = new byte[length * _imageInfo.SectorSize];
+                break;
+            case SIZE_MAC_HD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 18;
+                _imageInfo.MediaType       = MediaType.DOS_35_HD;
 
-            Array.Copy(_dataCache, (int)sectorAddress * _imageInfo.SectorSize, buffer, 0,
-                       length                         * _imageInfo.SectorSize);
-
-            return ErrorNumber.NoError;
+                break;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        Array.Copy(_dataCache, (int)sectorAddress * _imageInfo.SectorSize, buffer, 0,
+                   length                         * _imageInfo.SectorSize);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag != SectorTagType.AppleSectorTag)
+            return ErrorNumber.NotSupported;
+
+        if(_tagCache        == null ||
+           _tagCache.Length == 0)
+            return ErrorNumber.NoData;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * TAG_SECTOR_SIZE];
+
+        Array.Copy(_tagCache, (int)sectorAddress * TAG_SECTOR_SIZE, buffer, 0, length * TAG_SECTOR_SIZE);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        ErrorNumber errno = ReadSectors(sectorAddress, length, out byte[] data);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        errno = ReadSectorsTag(sectorAddress, length, SectorTagType.AppleSectorTag, out byte[] tags);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        buffer = new byte[data.Length + tags.Length];
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            Array.Copy(data, i * _imageInfo.SectorSize, buffer, i * (_imageInfo.SectorSize + TAG_SECTOR_SIZE),
+                       _imageInfo.SectorSize);
 
-            if(tag != SectorTagType.AppleSectorTag)
-                return ErrorNumber.NotSupported;
-
-            if(_tagCache        == null ||
-               _tagCache.Length == 0)
-                return ErrorNumber.NoData;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            buffer = new byte[length * TAG_SECTOR_SIZE];
-
-            Array.Copy(_tagCache, (int)sectorAddress * TAG_SECTOR_SIZE, buffer, 0, length * TAG_SECTOR_SIZE);
-
-            return ErrorNumber.NoError;
+            Array.Copy(tags, i * TAG_SECTOR_SIZE, buffer,
+                       (i * (_imageInfo.SectorSize + TAG_SECTOR_SIZE)) + _imageInfo.SectorSize, TAG_SECTOR_SIZE);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            ErrorNumber errno = ReadSectors(sectorAddress, length, out byte[] data);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            errno = ReadSectorsTag(sectorAddress, length, SectorTagType.AppleSectorTag, out byte[] tags);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            buffer = new byte[data.Length + tags.Length];
-
-            for(uint i = 0; i < length; i++)
-            {
-                Array.Copy(data, i * _imageInfo.SectorSize, buffer, i * (_imageInfo.SectorSize + TAG_SECTOR_SIZE),
-                           _imageInfo.SectorSize);
-
-                Array.Copy(tags, i * TAG_SECTOR_SIZE, buffer,
-                           (i * (_imageInfo.SectorSize + TAG_SECTOR_SIZE)) + _imageInfo.SectorSize, TAG_SECTOR_SIZE);
-            }
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DART/Structs.cs b/Aaru.Images/DART/Structs.cs
index 109f863a9..11ff87456 100644
--- a/Aaru.Images/DART/Structs.cs
+++ b/Aaru.Images/DART/Structs.cs
@@ -32,16 +32,15 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Dart
 {
-    public sealed partial class Dart
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            public readonly byte  srcCmp;
-            public readonly byte  srcType;
-            public readonly short srcSize;
-        }
+        public readonly byte  srcCmp;
+        public readonly byte  srcType;
+        public readonly short srcSize;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DART/Unsupported.cs b/Aaru.Images/DART/Unsupported.cs
index a7f1472ce..05461cf2d 100644
--- a/Aaru.Images/DART/Unsupported.cs
+++ b/Aaru.Images/DART/Unsupported.cs
@@ -32,16 +32,15 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Dart
-    {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+namespace Aaru.DiscImages;
 
-            return ErrorNumber.NotSupported;
-        }
+public sealed partial class Dart
+{
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/Constants.cs b/Aaru.Images/DIM/Constants.cs
index feb0b6b37..f70b1500e 100644
--- a/Aaru.Images/DIM/Constants.cs
+++ b/Aaru.Images/DIM/Constants.cs
@@ -30,15 +30,14 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Dim
 {
-    public sealed partial class Dim
+    /// <summary>Start of data sectors in disk image, should be 0x100</summary>
+    const uint DATA_OFFSET = 0x100;
+    readonly byte[] _headerId =
     {
-        /// <summary>Start of data sectors in disk image, should be 0x100</summary>
-        const uint DATA_OFFSET = 0x100;
-        readonly byte[] _headerId =
-        {
-            0x44, 0x49, 0x46, 0x43, 0x20, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x20, 0x20
-        };
-    }
+        0x44, 0x49, 0x46, 0x43, 0x20, 0x48, 0x45, 0x41, 0x44, 0x45, 0x52, 0x20, 0x20
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/DIM.cs b/Aaru.Images/DIM/DIM.cs
index 4d633e26a..1beb612cb 100644
--- a/Aaru.Images/DIM/DIM.cs
+++ b/Aaru.Images/DIM/DIM.cs
@@ -35,41 +35,40 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    // TODO: What are the real supported floppies for this image format?
-    /// <inheritdoc />
-    /// <summary>Implements reading DIM disk images</summary>
-    public sealed partial class Dim : IMediaImage
-    {
-        byte[]    _comment;
-        IFilter   _dimImageFilter;
-        DiskType  _dskType;
-        byte[]    _hdrId;
-        ImageInfo _imageInfo;
+namespace Aaru.DiscImages;
 
-        public Dim() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: What are the real supported floppies for this image format?
+/// <inheritdoc />
+/// <summary>Implements reading DIM disk images</summary>
+public sealed partial class Dim : IMediaImage
+{
+    byte[]    _comment;
+    IFilter   _dimImageFilter;
+    DiskType  _dskType;
+    byte[]    _hdrId;
+    ImageInfo _imageInfo;
+
+    public Dim() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/Enums.cs b/Aaru.Images/DIM/Enums.cs
index 583fb1edb..430ce8db5 100644
--- a/Aaru.Images/DIM/Enums.cs
+++ b/Aaru.Images/DIM/Enums.cs
@@ -30,14 +30,13 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Dim
 {
-    public sealed partial class Dim
+    enum DiskType : byte
     {
-        enum DiskType : byte
-        {
-            Hd2  = 0, Hs2 = 1, Hc2 = 2,
-            Hde2 = 3, Hq2 = 9, N88 = 17
-        }
+        Hd2  = 0, Hs2 = 1, Hc2 = 2,
+        Hde2 = 3, Hq2 = 9, N88 = 17
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/Identify.cs b/Aaru.Images/DIM/Identify.cs
index 0b52c63c2..dc2d0b2a7 100644
--- a/Aaru.Images/DIM/Identify.cs
+++ b/Aaru.Images/DIM/Identify.cs
@@ -34,29 +34,28 @@ using System.IO;
 using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Dim
 {
-    public sealed partial class Dim
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < DATA_OFFSET)
-                return false;
+        if(stream.Length < DATA_OFFSET)
+            return false;
 
-            _comment = new byte[60];
-            _hdrId   = new byte[13];
-            stream.Seek(0, SeekOrigin.Begin);
-            _dskType = (DiskType)stream.ReadByte();
-            stream.Seek(0xAB, SeekOrigin.Begin);
-            stream.Read(_hdrId, 0, 13);
-            stream.Seek(0xC2, SeekOrigin.Begin);
-            stream.Read(_comment, 0, 60);
+        _comment = new byte[60];
+        _hdrId   = new byte[13];
+        stream.Seek(0, SeekOrigin.Begin);
+        _dskType = (DiskType)stream.ReadByte();
+        stream.Seek(0xAB, SeekOrigin.Begin);
+        stream.Read(_hdrId, 0, 13);
+        stream.Seek(0xC2, SeekOrigin.Begin);
+        stream.Read(_comment, 0, 60);
 
-            return _headerId.SequenceEqual(_hdrId);
-        }
+        return _headerId.SequenceEqual(_hdrId);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/Properties.cs b/Aaru.Images/DIM/Properties.cs
index a23803561..4f1b373cf 100644
--- a/Aaru.Images/DIM/Properties.cs
+++ b/Aaru.Images/DIM/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Dim
 {
-    public sealed partial class Dim
-    {
-        /// <inheritdoc />
-        public string Name => "DIM Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "DIM disk image";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public string Name => "DIM Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "DIM disk image";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/Read.cs b/Aaru.Images/DIM/Read.cs
index d6bdfbe37..ceb3b6ca1 100644
--- a/Aaru.Images/DIM/Read.cs
+++ b/Aaru.Images/DIM/Read.cs
@@ -39,231 +39,230 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Dim
 {
-    public sealed partial class Dim
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < DATA_OFFSET)
+            return ErrorNumber.InvalidArgument;
+
+        long diskSize = stream.Length - DATA_OFFSET;
+
+        _comment = new byte[60];
+        _hdrId   = new byte[13];
+        stream.Seek(0, SeekOrigin.Begin);
+        _dskType = (DiskType)stream.ReadByte();
+        stream.Seek(0xAB, SeekOrigin.Begin);
+        stream.Read(_hdrId, 0, 13);
+        stream.Seek(0xC2, SeekOrigin.Begin);
+        stream.Read(_comment, 0, 60);
+
+        if(!_headerId.SequenceEqual(_hdrId))
+            return ErrorNumber.InvalidArgument;
+
+        _imageInfo.MediaType = MediaType.Unknown;
+
+        switch(_dskType)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            // 8 spt, 1024 bps
+            case DiskType.Hd2:
+                if(diskSize % (2 * 8 * 1024) != 0)
+                {
+                    AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
+                                               diskSize / (2 * 8 * 1024));
 
-            if(stream.Length < DATA_OFFSET)
-                return ErrorNumber.InvalidArgument;
+                    return ErrorNumber.NotSupported;
+                }
 
-            long diskSize = stream.Length - DATA_OFFSET;
+                if(diskSize / (2 * 8 * 1024) == 77)
+                    _imageInfo.MediaType = MediaType.SHARP_525;
 
-            _comment = new byte[60];
-            _hdrId   = new byte[13];
-            stream.Seek(0, SeekOrigin.Begin);
-            _dskType = (DiskType)stream.ReadByte();
-            stream.Seek(0xAB, SeekOrigin.Begin);
-            stream.Read(_hdrId, 0, 13);
-            stream.Seek(0xC2, SeekOrigin.Begin);
-            stream.Read(_comment, 0, 60);
+                _imageInfo.SectorSize = 1024;
 
-            if(!_headerId.SequenceEqual(_hdrId))
-                return ErrorNumber.InvalidArgument;
+                break;
 
-            _imageInfo.MediaType = MediaType.Unknown;
+            // 9 spt, 1024 bps
+            case DiskType.Hs2:
+                if(diskSize % (2 * 9 * 512) != 0)
+                {
+                    AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks", diskSize / (2 * 9 * 512));
 
-            switch(_dskType)
-            {
-                // 8 spt, 1024 bps
-                case DiskType.Hd2:
-                    if(diskSize % (2 * 8 * 1024) != 0)
-                    {
-                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
-                                                   diskSize / (2 * 8 * 1024));
+                    return ErrorNumber.NotSupported;
+                }
 
-                        return ErrorNumber.NotSupported;
-                    }
+                if(diskSize / (2 * 9 * 512) == 80)
+                    _imageInfo.MediaType = MediaType.SHARP_525_9;
 
-                    if(diskSize / (2 * 8 * 1024) == 77)
-                        _imageInfo.MediaType = MediaType.SHARP_525;
+                _imageInfo.SectorSize = 512;
 
-                    _imageInfo.SectorSize = 1024;
+                break;
 
-                    break;
+            // 15 spt, 512 bps
+            case DiskType.Hc2:
+                if(diskSize % (2 * 15 * 512) != 0)
+                {
+                    AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
+                                               diskSize / (2 * 15 * 512));
 
-                // 9 spt, 1024 bps
-                case DiskType.Hs2:
-                    if(diskSize % (2 * 9 * 512) != 0)
-                    {
-                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks", diskSize / (2 * 9 * 512));
+                    return ErrorNumber.NotSupported;
+                }
 
-                        return ErrorNumber.NotSupported;
-                    }
+                if(diskSize / (2 * 15 * 512) == 80)
+                    _imageInfo.MediaType = MediaType.DOS_525_HD;
 
-                    if(diskSize / (2 * 9 * 512) == 80)
-                        _imageInfo.MediaType = MediaType.SHARP_525_9;
+                _imageInfo.SectorSize = 512;
 
-                    _imageInfo.SectorSize = 512;
+                break;
 
-                    break;
+            // 9 spt, 1024 bps
+            case DiskType.Hde2:
+                if(diskSize % (2 * 9 * 512) != 0)
+                {
+                    AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks", diskSize / (2 * 9 * 512));
 
-                // 15 spt, 512 bps
-                case DiskType.Hc2:
-                    if(diskSize % (2 * 15 * 512) != 0)
-                    {
-                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
-                                                   diskSize / (2 * 15 * 512));
+                    return ErrorNumber.NotSupported;
+                }
 
-                        return ErrorNumber.NotSupported;
-                    }
+                if(diskSize / (2 * 9 * 512) == 80)
+                    _imageInfo.MediaType = MediaType.SHARP_35_9;
 
-                    if(diskSize / (2 * 15 * 512) == 80)
-                        _imageInfo.MediaType = MediaType.DOS_525_HD;
+                _imageInfo.SectorSize = 512;
 
-                    _imageInfo.SectorSize = 512;
+                break;
 
-                    break;
+            // 18 spt, 512 bps
+            case DiskType.Hq2:
+                if(diskSize % (2 * 18 * 512) != 0)
+                {
+                    AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
+                                               diskSize / (2 * 18 * 512));
 
-                // 9 spt, 1024 bps
-                case DiskType.Hde2:
-                    if(diskSize % (2 * 9 * 512) != 0)
-                    {
-                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks", diskSize / (2 * 9 * 512));
+                    return ErrorNumber.NotSupported;
+                }
 
-                        return ErrorNumber.NotSupported;
-                    }
+                if(diskSize / (2 * 18 * 512) == 80)
+                    _imageInfo.MediaType = MediaType.DOS_35_HD;
 
-                    if(diskSize / (2 * 9 * 512) == 80)
-                        _imageInfo.MediaType = MediaType.SHARP_35_9;
+                _imageInfo.SectorSize = 512;
 
-                    _imageInfo.SectorSize = 512;
+                break;
 
-                    break;
+            // 26 spt, 256 bps
+            case DiskType.N88:
+                if(diskSize % (2 * 26 * 256) == 0)
+                {
+                    if(diskSize % (2 * 26 * 256) == 77)
+                        _imageInfo.MediaType = MediaType.NEC_8_DD;
 
-                // 18 spt, 512 bps
-                case DiskType.Hq2:
-                    if(diskSize % (2 * 18 * 512) != 0)
-                    {
-                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
-                                                   diskSize / (2 * 18 * 512));
+                    _imageInfo.SectorSize = 256;
+                }
+                else if(diskSize % (2 * 26 * 128) == 0)
+                {
+                    if(diskSize % (2 * 26 * 128) == 77)
+                        _imageInfo.MediaType = MediaType.NEC_8_SD;
 
-                        return ErrorNumber.NotSupported;
-                    }
+                    _imageInfo.SectorSize = 256;
+                }
+                else
+                {
+                    AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
+                                               diskSize / (2 * 26 * 256));
 
-                    if(diskSize / (2 * 18 * 512) == 80)
-                        _imageInfo.MediaType = MediaType.DOS_35_HD;
+                    return ErrorNumber.NotSupported;
+                }
 
-                    _imageInfo.SectorSize = 512;
-
-                    break;
-
-                // 26 spt, 256 bps
-                case DiskType.N88:
-                    if(diskSize % (2 * 26 * 256) == 0)
-                    {
-                        if(diskSize % (2 * 26 * 256) == 77)
-                            _imageInfo.MediaType = MediaType.NEC_8_DD;
-
-                        _imageInfo.SectorSize = 256;
-                    }
-                    else if(diskSize % (2 * 26 * 128) == 0)
-                    {
-                        if(diskSize % (2 * 26 * 128) == 77)
-                            _imageInfo.MediaType = MediaType.NEC_8_SD;
-
-                        _imageInfo.SectorSize = 256;
-                    }
-                    else
-                    {
-                        AaruConsole.ErrorWriteLine("DIM shows unknown image with {0} tracks",
-                                                   diskSize / (2 * 26 * 256));
-
-                        return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                default: return ErrorNumber.InvalidArgument;
-            }
-
-            AaruConsole.VerboseWriteLine("DIM image contains a disk of type {0}", _imageInfo.MediaType);
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                AaruConsole.VerboseWriteLine("DIM comments: {0}", _imageInfo.Comments);
-
-            _dimImageFilter = imageFilter;
-
-            _imageInfo.ImageSize            = (ulong)diskSize;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = _imageInfo.ImageSize / _imageInfo.SectorSize;
-            _imageInfo.Comments             = StringHandlers.CToString(_comment, Encoding.GetEncoding(932));
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-
-            switch(_imageInfo.MediaType)
-            {
-                case MediaType.SHARP_525:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.SHARP_525_9:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.DOS_525_HD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 15;
-
-                    break;
-                case MediaType.SHARP_35_9:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.DOS_35_HD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 18;
-
-                    break;
-                case MediaType.NEC_8_DD:
-                case MediaType.NEC_8_SD:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 26;
-
-                    break;
-            }
-
-            return ErrorNumber.NoError;
+                break;
+            default: return ErrorNumber.InvalidArgument;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        AaruConsole.VerboseWriteLine("DIM image contains a disk of type {0}", _imageInfo.MediaType);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+            AaruConsole.VerboseWriteLine("DIM comments: {0}", _imageInfo.Comments);
+
+        _dimImageFilter = imageFilter;
+
+        _imageInfo.ImageSize            = (ulong)diskSize;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = _imageInfo.ImageSize / _imageInfo.SectorSize;
+        _imageInfo.Comments             = StringHandlers.CToString(_comment, Encoding.GetEncoding(932));
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+
+        switch(_imageInfo.MediaType)
         {
-            buffer = null;
+            case MediaType.SHARP_525:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 8;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.SHARP_525_9:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 9;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.DOS_525_HD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 15;
 
-            buffer = new byte[length * _imageInfo.SectorSize];
+                break;
+            case MediaType.SHARP_35_9:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 9;
 
-            Stream stream = _dimImageFilter.GetDataForkStream();
+                break;
+            case MediaType.DOS_35_HD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 18;
 
-            stream.Seek((long)(DATA_OFFSET + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+                break;
+            case MediaType.NEC_8_DD:
+            case MediaType.NEC_8_SD:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 26;
 
-            stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
-
-            return ErrorNumber.NoError;
+                break;
         }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        Stream stream = _dimImageFilter.GetDataForkStream();
+
+        stream.Seek((long)(DATA_OFFSET + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+
+        stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DIM/Unsupported.cs b/Aaru.Images/DIM/Unsupported.cs
index 6fad01fc0..6d9654020 100644
--- a/Aaru.Images/DIM/Unsupported.cs
+++ b/Aaru.Images/DIM/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Dim
 {
-    public sealed partial class Dim
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscFerret/Constants.cs b/Aaru.Images/DiscFerret/Constants.cs
index b7d1fe518..58858d9e0 100644
--- a/Aaru.Images/DiscFerret/Constants.cs
+++ b/Aaru.Images/DiscFerret/Constants.cs
@@ -30,13 +30,12 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiscFerret
 {
-    public sealed partial class DiscFerret
-    {
-        /// <summary>"DFER"</summary>
-        const uint DFI_MAGIC = 0x52454644;
-        /// <summary>"DFE2"</summary>
-        const uint DFI_MAGIC2 = 0x32454644;
-    }
+    /// <summary>"DFER"</summary>
+    const uint DFI_MAGIC = 0x52454644;
+    /// <summary>"DFE2"</summary>
+    const uint DFI_MAGIC2 = 0x32454644;
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscFerret/DiscFerret.cs b/Aaru.Images/DiscFerret/DiscFerret.cs
index f8f4f1334..0649ae5ff 100644
--- a/Aaru.Images/DiscFerret/DiscFerret.cs
+++ b/Aaru.Images/DiscFerret/DiscFerret.cs
@@ -35,39 +35,38 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+/// <summary>Implements reading DiscFerret flux images</summary>
+public sealed partial class DiscFerret : IMediaImage, IVerifiableSectorsImage
 {
-    /// <summary>Implements reading DiscFerret flux images</summary>
-    public sealed partial class DiscFerret : IMediaImage, IVerifiableSectorsImage
+    ImageInfo _imageInfo;
+
+    // TODO: These variables have been made public so create-sidecar can access to this information until I define an API >4.0
+    public SortedDictionary<int, long> TrackLengths;
+    public SortedDictionary<int, long> TrackOffsets;
+
+    public DiscFerret() => _imageInfo = new ImageInfo
     {
-        ImageInfo _imageInfo;
-
-        // TODO: These variables have been made public so create-sidecar can access to this information until I define an API >4.0
-        public SortedDictionary<int, long> TrackLengths;
-        public SortedDictionary<int, long> TrackOffsets;
-
-        public DiscFerret() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscFerret/Identify.cs b/Aaru.Images/DiscFerret/Identify.cs
index 541a8d86d..b4d8a3388 100644
--- a/Aaru.Images/DiscFerret/Identify.cs
+++ b/Aaru.Images/DiscFerret/Identify.cs
@@ -34,19 +34,18 @@ using System;
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class DiscFerret
-    {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            byte[] magicB = new byte[4];
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Read(magicB, 0, 4);
-            uint magic = BitConverter.ToUInt32(magicB, 0);
+namespace Aaru.DiscImages;
 
-            return magic == DFI_MAGIC || magic == DFI_MAGIC2;
-        }
+public sealed partial class DiscFerret
+{
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
+    {
+        byte[] magicB = new byte[4];
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Read(magicB, 0, 4);
+        uint magic = BitConverter.ToUInt32(magicB, 0);
+
+        return magic == DFI_MAGIC || magic == DFI_MAGIC2;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscFerret/Properties.cs b/Aaru.Images/DiscFerret/Properties.cs
index 8530b1503..56a8f04c6 100644
--- a/Aaru.Images/DiscFerret/Properties.cs
+++ b/Aaru.Images/DiscFerret/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiscFerret
 {
-    public sealed partial class DiscFerret
-    {
-        /// <inheritdoc />
-        public string Name => "DiscFerret";
-        /// <inheritdoc />
-        public Guid Id => new Guid("70EA7B9B-5323-42EB-9B40-8DDA37C5EB4D");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Format => "DiscFerret";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public string Name => "DiscFerret";
+    /// <inheritdoc />
+    public Guid Id => new Guid("70EA7B9B-5323-42EB-9B40-8DDA37C5EB4D");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Format => "DiscFerret";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscFerret/Read.cs b/Aaru.Images/DiscFerret/Read.cs
index 8afa53f33..d92fb8d32 100644
--- a/Aaru.Images/DiscFerret/Read.cs
+++ b/Aaru.Images/DiscFerret/Read.cs
@@ -38,140 +38,139 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiscFerret
 {
-    public sealed partial class DiscFerret
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        byte[] magicB = new byte[4];
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Read(magicB, 0, 4);
+        uint magic = BitConverter.ToUInt32(magicB, 0);
+
+        if(magic != DFI_MAGIC &&
+           magic != DFI_MAGIC2)
+            return ErrorNumber.InvalidArgument;
+
+        TrackOffsets = new SortedDictionary<int, long>();
+        TrackLengths = new SortedDictionary<int, long>();
+        int    t            = -1;
+        ushort lastCylinder = 0, lastHead = 0;
+        long   offset       = 0;
+
+        while(stream.Position < stream.Length)
         {
-            byte[] magicB = new byte[4];
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Read(magicB, 0, 4);
-            uint magic = BitConverter.ToUInt32(magicB, 0);
+            long thisOffset = stream.Position;
 
-            if(magic != DFI_MAGIC &&
-               magic != DFI_MAGIC2)
-                return ErrorNumber.InvalidArgument;
+            byte[] blk = new byte[Marshal.SizeOf<BlockHeader>()];
+            stream.Read(blk, 0, Marshal.SizeOf<BlockHeader>());
+            BlockHeader blockHeader = Marshal.ByteArrayToStructureBigEndian<BlockHeader>(blk);
 
-            TrackOffsets = new SortedDictionary<int, long>();
-            TrackLengths = new SortedDictionary<int, long>();
-            int    t            = -1;
-            ushort lastCylinder = 0, lastHead = 0;
-            long   offset       = 0;
+            AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.cylinder = {1}", thisOffset,
+                                       blockHeader.cylinder);
 
-            while(stream.Position < stream.Length)
+            AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.head = {1}", thisOffset, blockHeader.head);
+
+            AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.sector = {1}", thisOffset,
+                                       blockHeader.sector);
+
+            AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.length = {1}", thisOffset,
+                                       blockHeader.length);
+
+            if(stream.Position + blockHeader.length > stream.Length)
             {
-                long thisOffset = stream.Position;
+                AaruConsole.DebugWriteLine("DiscFerret plugin", "Invalid track block found at {0}", thisOffset);
 
-                byte[] blk = new byte[Marshal.SizeOf<BlockHeader>()];
-                stream.Read(blk, 0, Marshal.SizeOf<BlockHeader>());
-                BlockHeader blockHeader = Marshal.ByteArrayToStructureBigEndian<BlockHeader>(blk);
-
-                AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.cylinder = {1}", thisOffset,
-                                           blockHeader.cylinder);
-
-                AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.head = {1}", thisOffset, blockHeader.head);
-
-                AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.sector = {1}", thisOffset,
-                                           blockHeader.sector);
-
-                AaruConsole.DebugWriteLine("DiscFerret plugin", "block@{0}.length = {1}", thisOffset,
-                                           blockHeader.length);
-
-                if(stream.Position + blockHeader.length > stream.Length)
-                {
-                    AaruConsole.DebugWriteLine("DiscFerret plugin", "Invalid track block found at {0}", thisOffset);
-
-                    break;
-                }
-
-                stream.Position += blockHeader.length;
-
-                if(blockHeader.cylinder > 0 &&
-                   blockHeader.cylinder > lastCylinder)
-                {
-                    lastCylinder = blockHeader.cylinder;
-                    lastHead     = 0;
-                    TrackOffsets.Add(t, offset);
-                    TrackLengths.Add(t, thisOffset - offset + 1);
-                    offset = thisOffset;
-                    t++;
-                }
-                else if(blockHeader.head > 0 &&
-                        blockHeader.head > lastHead)
-                {
-                    lastHead = blockHeader.head;
-                    TrackOffsets.Add(t, offset);
-                    TrackLengths.Add(t, thisOffset - offset + 1);
-                    offset = thisOffset;
-                    t++;
-                }
-
-                if(blockHeader.cylinder > _imageInfo.Cylinders)
-                    _imageInfo.Cylinders = blockHeader.cylinder;
-
-                if(blockHeader.head > _imageInfo.Heads)
-                    _imageInfo.Heads = blockHeader.head;
+                break;
             }
 
-            _imageInfo.Heads++;
-            _imageInfo.Cylinders++;
+            stream.Position += blockHeader.length;
 
-            _imageInfo.Application        = "DiscFerret";
-            _imageInfo.ApplicationVersion = magic == DFI_MAGIC2 ? "2.0" : "1.0";
+            if(blockHeader.cylinder > 0 &&
+               blockHeader.cylinder > lastCylinder)
+            {
+                lastCylinder = blockHeader.cylinder;
+                lastHead     = 0;
+                TrackOffsets.Add(t, offset);
+                TrackLengths.Add(t, thisOffset - offset + 1);
+                offset = thisOffset;
+                t++;
+            }
+            else if(blockHeader.head > 0 &&
+                    blockHeader.head > lastHead)
+            {
+                lastHead = blockHeader.head;
+                TrackOffsets.Add(t, offset);
+                TrackLengths.Add(t, thisOffset - offset + 1);
+                offset = thisOffset;
+                t++;
+            }
 
-            AaruConsole.ErrorWriteLine("Flux decoding is not yet implemented.");
+            if(blockHeader.cylinder > _imageInfo.Cylinders)
+                _imageInfo.Cylinders = blockHeader.cylinder;
 
-            return ErrorNumber.NotImplemented;
+            if(blockHeader.head > _imageInfo.Heads)
+                _imageInfo.Heads = blockHeader.head;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        _imageInfo.Heads++;
+        _imageInfo.Cylinders++;
 
-            return ErrorNumber.NotImplemented;
-        }
+        _imageInfo.Application        = "DiscFerret";
+        _imageInfo.ApplicationVersion = magic == DFI_MAGIC2 ? "2.0" : "1.0";
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        AaruConsole.ErrorWriteLine("Flux decoding is not yet implemented.");
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        return ErrorNumber.NotImplemented;
+    }
 
-            return ErrorNumber.NotImplemented;
-        }
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+        return ErrorNumber.NotImplemented;
+    }
 
-            return ErrorNumber.NotImplemented;
-        }
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotImplemented;
-        }
+        return ErrorNumber.NotImplemented;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+        return ErrorNumber.NotImplemented;
+    }
 
-            return ErrorNumber.NotImplemented;
-        }
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        return ErrorNumber.NotImplemented;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        return ErrorNumber.NotImplemented;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscFerret/Structs.cs b/Aaru.Images/DiscFerret/Structs.cs
index c86fcc128..ab322b4fd 100644
--- a/Aaru.Images/DiscFerret/Structs.cs
+++ b/Aaru.Images/DiscFerret/Structs.cs
@@ -32,17 +32,16 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiscFerret
 {
-    public sealed partial class DiscFerret
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BlockHeader
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BlockHeader
-        {
-            public readonly ushort cylinder;
-            public readonly ushort head;
-            public readonly ushort sector;
-            public readonly uint   length;
-        }
+        public readonly ushort cylinder;
+        public readonly ushort head;
+        public readonly ushort sector;
+        public readonly uint   length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscFerret/Verify.cs b/Aaru.Images/DiscFerret/Verify.cs
index c5884f8b5..7a16f0248 100644
--- a/Aaru.Images/DiscFerret/Verify.cs
+++ b/Aaru.Images/DiscFerret/Verify.cs
@@ -33,17 +33,16 @@
 using System;
 using System.Collections.Generic;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class DiscFerret
-    {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress) =>
-            throw new NotImplementedException("Flux decoding is not yet implemented.");
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas) =>
-            throw new NotImplementedException("Flux decoding is not yet implemented.");
-    }
+public sealed partial class DiscFerret
+{
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress) =>
+        throw new NotImplementedException("Flux decoding is not yet implemented.");
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas) =>
+        throw new NotImplementedException("Flux decoding is not yet implemented.");
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscJuggler/DiscJuggler.cs b/Aaru.Images/DiscJuggler/DiscJuggler.cs
index 7eb95d5fb..0919096e5 100644
--- a/Aaru.Images/DiscJuggler/DiscJuggler.cs
+++ b/Aaru.Images/DiscJuggler/DiscJuggler.cs
@@ -37,41 +37,40 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Decoders.CD;
 
-namespace Aaru.DiscImages
-{
-    // Support separate data files? Never seen a DiscJuggler image using them anyways...
-    // TODO: Too many unknowns to make this writable
-    /// <inheritdoc />
-    /// <summary>Implements reading DiscJuggler disc images</summary>
-    public sealed partial class DiscJuggler : IOpticalMediaImage
-    {
-        byte[]                  _cdtext;
-        ImageInfo               _imageInfo;
-        Stream                  _imageStream;
-        bool                    _isCd;
-        Dictionary<uint, ulong> _offsetMap;
-        SectorBuilder           _sectorBuilder;
-        Dictionary<uint, byte>  _trackFlags;
+namespace Aaru.DiscImages;
 
-        public DiscJuggler() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = true,
-            HasSessions           = true,
-            Version               = null,
-            ApplicationVersion    = null,
-            MediaTitle            = null,
-            Creator               = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// Support separate data files? Never seen a DiscJuggler image using them anyways...
+// TODO: Too many unknowns to make this writable
+/// <inheritdoc />
+/// <summary>Implements reading DiscJuggler disc images</summary>
+public sealed partial class DiscJuggler : IOpticalMediaImage
+{
+    byte[]                  _cdtext;
+    ImageInfo               _imageInfo;
+    Stream                  _imageStream;
+    bool                    _isCd;
+    Dictionary<uint, ulong> _offsetMap;
+    SectorBuilder           _sectorBuilder;
+    Dictionary<uint, byte>  _trackFlags;
+
+    public DiscJuggler() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = true,
+        HasSessions           = true,
+        Version               = null,
+        ApplicationVersion    = null,
+        MediaTitle            = null,
+        Creator               = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscJuggler/Helpers.cs b/Aaru.Images/DiscJuggler/Helpers.cs
index a7df6676b..1d01c66d6 100644
--- a/Aaru.Images/DiscJuggler/Helpers.cs
+++ b/Aaru.Images/DiscJuggler/Helpers.cs
@@ -32,18 +32,17 @@
 
 using Aaru.CommonTypes;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiscJuggler
 {
-    public sealed partial class DiscJuggler
+    static MediaType DecodeCdiMediumType(ushort type)
     {
-        static MediaType DecodeCdiMediumType(ushort type)
+        switch(type)
         {
-            switch(type)
-            {
-                case 56:  return MediaType.DVDROM;
-                case 152: return MediaType.CDROM;
-                default:  return MediaType.Unknown;
-            }
+            case 56:  return MediaType.DVDROM;
+            case 152: return MediaType.CDROM;
+            default:  return MediaType.Unknown;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscJuggler/Identify.cs b/Aaru.Images/DiscJuggler/Identify.cs
index 32d561048..a60cf7146 100644
--- a/Aaru.Images/DiscJuggler/Identify.cs
+++ b/Aaru.Images/DiscJuggler/Identify.cs
@@ -35,54 +35,53 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiscJuggler
 {
-    public sealed partial class DiscJuggler
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            _imageStream = imageFilter.GetDataForkStream();
+        _imageStream = imageFilter.GetDataForkStream();
 
-            _imageStream.Seek(-4, SeekOrigin.End);
-            byte[] dscLenB = new byte[4];
-            _imageStream.Read(dscLenB, 0, 4);
-            int dscLen = BitConverter.ToInt32(dscLenB, 0);
+        _imageStream.Seek(-4, SeekOrigin.End);
+        byte[] dscLenB = new byte[4];
+        _imageStream.Read(dscLenB, 0, 4);
+        int dscLen = BitConverter.ToInt32(dscLenB, 0);
 
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "dscLen = {0}", dscLen);
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "dscLen = {0}", dscLen);
 
-            if(dscLen >= _imageStream.Length)
-                return false;
+        if(dscLen >= _imageStream.Length)
+            return false;
 
-            byte[] descriptor = new byte[dscLen];
-            _imageStream.Seek(-dscLen, SeekOrigin.End);
-            _imageStream.Read(descriptor, 0, dscLen);
+        byte[] descriptor = new byte[dscLen];
+        _imageStream.Seek(-dscLen, SeekOrigin.End);
+        _imageStream.Read(descriptor, 0, dscLen);
 
-            // Sessions
-            if(descriptor.Length < 1  ||
-               descriptor[0]     > 99 ||
-               descriptor[0]     == 0)
-                return false;
+        // Sessions
+        if(descriptor.Length < 1  ||
+           descriptor[0]     > 99 ||
+           descriptor[0]     == 0)
+            return false;
 
-            // Seems all sessions start with this data
-            if(descriptor[1]  != 0x00 ||
-               descriptor[3]  != 0x00 ||
-               descriptor[4]  != 0x00 ||
-               descriptor[5]  != 0x00 ||
-               descriptor[6]  != 0x00 ||
-               descriptor[7]  != 0x00 ||
-               descriptor[8]  != 0x00 ||
-               descriptor[9]  != 0x00 ||
-               descriptor[10] != 0x01 ||
-               descriptor[11] != 0x00 ||
-               descriptor[12] != 0x00 ||
-               descriptor[13] != 0x00 ||
-               descriptor[14] != 0xFF ||
-               descriptor[15] != 0xFF)
-                return false;
+        // Seems all sessions start with this data
+        if(descriptor[1]  != 0x00 ||
+           descriptor[3]  != 0x00 ||
+           descriptor[4]  != 0x00 ||
+           descriptor[5]  != 0x00 ||
+           descriptor[6]  != 0x00 ||
+           descriptor[7]  != 0x00 ||
+           descriptor[8]  != 0x00 ||
+           descriptor[9]  != 0x00 ||
+           descriptor[10] != 0x01 ||
+           descriptor[11] != 0x00 ||
+           descriptor[12] != 0x00 ||
+           descriptor[13] != 0x00 ||
+           descriptor[14] != 0xFF ||
+           descriptor[15] != 0xFF)
+            return false;
 
-            // Too many tracks
-            return descriptor[2] <= 99;
-        }
+        // Too many tracks
+        return descriptor[2] <= 99;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscJuggler/Properties.cs b/Aaru.Images/DiscJuggler/Properties.cs
index 74b4276ee..0cf299c5a 100644
--- a/Aaru.Images/DiscJuggler/Properties.cs
+++ b/Aaru.Images/DiscJuggler/Properties.cs
@@ -36,29 +36,28 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiscJuggler
 {
-    public sealed partial class DiscJuggler
-    {
-        /// <inheritdoc />
-        public string Name => "DiscJuggler";
-        /// <inheritdoc />
-        public Guid Id => new Guid("2444DBC6-CD35-424C-A227-39B0C4DB01B2");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Format => "DiscJuggler";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<Partition> Partitions { get; private set; }
-        /// <inheritdoc />
-        public List<Track> Tracks { get; private set; }
-        /// <inheritdoc />
-        public List<Session> Sessions { get; private set; }
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public string Name => "DiscJuggler";
+    /// <inheritdoc />
+    public Guid Id => new Guid("2444DBC6-CD35-424C-A227-39B0C4DB01B2");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Format => "DiscJuggler";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<Partition> Partitions { get; private set; }
+    /// <inheritdoc />
+    public List<Track> Tracks { get; private set; }
+    /// <inheritdoc />
+    public List<Session> Sessions { get; private set; }
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscJuggler/Read.cs b/Aaru.Images/DiscJuggler/Read.cs
index 76e5f9324..bc0ceb15d 100644
--- a/Aaru.Images/DiscJuggler/Read.cs
+++ b/Aaru.Images/DiscJuggler/Read.cs
@@ -44,1319 +44,1318 @@ using Aaru.Decoders.CD;
 using Aaru.Helpers;
 using Session = Aaru.CommonTypes.Structs.Session;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiscJuggler
 {
-    public sealed partial class DiscJuggler
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        _imageStream = imageFilter.GetDataForkStream();
+
+        // Read size of image descriptor
+        _imageStream.Seek(-4, SeekOrigin.End);
+        byte[] dscLenB = new byte[4];
+        _imageStream.Read(dscLenB, 0, 4);
+        int dscLen = BitConverter.ToInt32(dscLenB, 0);
+
+        if(dscLen >= _imageStream.Length)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] descriptor = new byte[dscLen];
+        _imageStream.Seek(-dscLen, SeekOrigin.End);
+        _imageStream.Read(descriptor, 0, dscLen);
+
+        // Sessions
+        if(descriptor[0] > 99 ||
+           descriptor[0] == 0)
+            return ErrorNumber.InvalidArgument;
+
+        int position = 1;
+
+        ushort sessionSequence = 0;
+        Sessions    = new List<Session>();
+        Tracks      = new List<Track>();
+        Partitions  = new List<Partition>();
+        _offsetMap  = new Dictionary<uint, ulong>();
+        _trackFlags = new Dictionary<uint, byte>();
+        ushort mediumType;
+        byte   maxS = descriptor[0];
+
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "maxS = {0}", maxS);
+        uint  lastSessionTrack = 0;
+        ulong currentOffset    = 0;
+
+        // Read sessions
+        for(byte s = 0; s <= maxS; s++)
         {
-            _imageStream = imageFilter.GetDataForkStream();
+            AaruConsole.DebugWriteLine("DiscJuggler plugin", "s = {0}", s);
 
-            // Read size of image descriptor
-            _imageStream.Seek(-4, SeekOrigin.End);
-            byte[] dscLenB = new byte[4];
-            _imageStream.Read(dscLenB, 0, 4);
-            int dscLen = BitConverter.ToInt32(dscLenB, 0);
-
-            if(dscLen >= _imageStream.Length)
-                return ErrorNumber.InvalidArgument;
-
-            byte[] descriptor = new byte[dscLen];
-            _imageStream.Seek(-dscLen, SeekOrigin.End);
-            _imageStream.Read(descriptor, 0, dscLen);
-
-            // Sessions
-            if(descriptor[0] > 99 ||
-               descriptor[0] == 0)
-                return ErrorNumber.InvalidArgument;
-
-            int position = 1;
-
-            ushort sessionSequence = 0;
-            Sessions    = new List<Session>();
-            Tracks      = new List<Track>();
-            Partitions  = new List<Partition>();
-            _offsetMap  = new Dictionary<uint, ulong>();
-            _trackFlags = new Dictionary<uint, byte>();
-            ushort mediumType;
-            byte   maxS = descriptor[0];
-
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "maxS = {0}", maxS);
-            uint  lastSessionTrack = 0;
-            ulong currentOffset    = 0;
-
-            // Read sessions
-            for(byte s = 0; s <= maxS; s++)
+            // Seems all sessions start with this data
+            if(descriptor[position + 0]  != 0x00 ||
+               descriptor[position + 2]  != 0x00 ||
+               descriptor[position + 3]  != 0x00 ||
+               descriptor[position + 4]  != 0x00 ||
+               descriptor[position + 5]  != 0x00 ||
+               descriptor[position + 6]  != 0x00 ||
+               descriptor[position + 7]  != 0x00 ||
+               descriptor[position + 8]  != 0x00 ||
+               descriptor[position + 9]  != 0x01 ||
+               descriptor[position + 10] != 0x00 ||
+               descriptor[position + 11] != 0x00 ||
+               descriptor[position + 12] != 0x00 ||
+               descriptor[position + 13] != 0xFF ||
+               descriptor[position + 14] != 0xFF)
             {
-                AaruConsole.DebugWriteLine("DiscJuggler plugin", "s = {0}", s);
+                bool nextFound = false;
 
-                // Seems all sessions start with this data
-                if(descriptor[position + 0]  != 0x00 ||
-                   descriptor[position + 2]  != 0x00 ||
-                   descriptor[position + 3]  != 0x00 ||
-                   descriptor[position + 4]  != 0x00 ||
-                   descriptor[position + 5]  != 0x00 ||
-                   descriptor[position + 6]  != 0x00 ||
-                   descriptor[position + 7]  != 0x00 ||
-                   descriptor[position + 8]  != 0x00 ||
-                   descriptor[position + 9]  != 0x01 ||
-                   descriptor[position + 10] != 0x00 ||
-                   descriptor[position + 11] != 0x00 ||
-                   descriptor[position + 12] != 0x00 ||
-                   descriptor[position + 13] != 0xFF ||
-                   descriptor[position + 14] != 0xFF)
+                // But on generated (not dumped) image, it can have some data between last written session and
+                // next open one, so depend on if we already got a track
+                while(position + 16 < descriptor.Length)
                 {
-                    bool nextFound = false;
-
-                    // But on generated (not dumped) image, it can have some data between last written session and
-                    // next open one, so depend on if we already got a track
-                    while(position + 16 < descriptor.Length)
+                    if(descriptor[position + 0]  != 0x00 ||
+                       descriptor[position + 2]  != 0x00 ||
+                       descriptor[position + 3]  != 0x00 ||
+                       descriptor[position + 4]  != 0x00 ||
+                       descriptor[position + 5]  != 0x00 ||
+                       descriptor[position + 6]  != 0x00 ||
+                       descriptor[position + 7]  != 0x00 ||
+                       descriptor[position + 8]  != 0x00 ||
+                       descriptor[position + 9]  != 0x01 ||
+                       descriptor[position + 10] != 0x00 ||
+                       descriptor[position + 11] != 0x00 ||
+                       descriptor[position + 12] != 0x00 ||
+                       descriptor[position + 13] != 0xFF ||
+                       descriptor[position + 14] != 0xFF)
                     {
-                        if(descriptor[position + 0]  != 0x00 ||
-                           descriptor[position + 2]  != 0x00 ||
-                           descriptor[position + 3]  != 0x00 ||
-                           descriptor[position + 4]  != 0x00 ||
-                           descriptor[position + 5]  != 0x00 ||
-                           descriptor[position + 6]  != 0x00 ||
-                           descriptor[position + 7]  != 0x00 ||
-                           descriptor[position + 8]  != 0x00 ||
-                           descriptor[position + 9]  != 0x01 ||
-                           descriptor[position + 10] != 0x00 ||
-                           descriptor[position + 11] != 0x00 ||
-                           descriptor[position + 12] != 0x00 ||
-                           descriptor[position + 13] != 0xFF ||
-                           descriptor[position + 14] != 0xFF)
-                        {
-                            position++;
+                        position++;
 
+                        continue;
+                    }
+
+                    nextFound = true;
+
+                    break;
+                }
+
+                if(!nextFound)
+                    return Tracks.Count > 0 ? ErrorNumber.NoError : ErrorNumber.InvalidArgument;
+
+                position += 15;
+
+                break;
+            }
+
+            // Too many tracks
+            if(descriptor[position + 1] > 99)
+                return ErrorNumber.InvalidArgument;
+
+            byte maxT = descriptor[position + 1];
+            AaruConsole.DebugWriteLine("DiscJuggler plugin", "maxT = {0}", maxT);
+
+            sessionSequence++;
+
+            var session = new Session
+            {
+                Sequence   = sessionSequence,
+                EndTrack   = uint.MinValue,
+                StartTrack = uint.MaxValue
+            };
+
+            position += 15;
+            bool addedATrack = false;
+
+            // Read track
+            for(byte t = 0; t < maxT; t++)
+            {
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "t = {0}", t);
+                var track = new Track();
+
+                // Skip unknown
+                position += 16;
+
+                byte[] trackFilenameB = new byte[descriptor[position]];
+                position++;
+                Array.Copy(descriptor, position, trackFilenameB, 0, trackFilenameB.Length);
+                position   += trackFilenameB.Length;
+                track.File =  Path.GetFileName(Encoding.Default.GetString(trackFilenameB));
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tfilename = {0}", track.File);
+
+                // Skip unknown
+                position += 29;
+
+                mediumType =  BitConverter.ToUInt16(descriptor, position);
+                position   += 2;
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tmediumType = {0}", mediumType);
+
+                // Read indices
+                ushort maxI = BitConverter.ToUInt16(descriptor, position);
+                position += 2;
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tmaxI = {0}", maxI);
+
+                // This is not really the index position, but, the index length, go figure
+                for(ushort i = 0; i < maxI; i++)
+                {
+                    int index = BitConverter.ToInt32(descriptor, position);
+                    track.Indexes.Add(i, index);
+                    position += 4;
+                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tindex[{1}] = {0}", index, i);
+                }
+
+                // Read CD-Text
+                uint maxC = BitConverter.ToUInt32(descriptor, position);
+                position += 4;
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tmaxC = {0}", maxC);
+
+                for(uint c = 0; c < maxC; c++)
+                {
+                    for(int cb = 0; cb < 18; cb++)
+                    {
+                        int bLen = descriptor[position];
+                        position++;
+                        AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tc[{1}][{2}].Length = {0}", bLen, c, cb);
+
+                        if(bLen <= 0)
                             continue;
+
+                        byte[] textBlk = new byte[bLen];
+                        Array.Copy(descriptor, position, textBlk, 0, bLen);
+                        position += bLen;
+
+                        // Track title
+                        if(cb != 10)
+                            continue;
+
+                        track.Description = Encoding.Default.GetString(textBlk, 0, bLen);
+
+                        AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tTrack title = {0}", track.Description);
+                    }
+                }
+
+                position += 2;
+                uint trackMode = BitConverter.ToUInt32(descriptor, position);
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrackMode = {0}", trackMode);
+                position += 4;
+
+                // Skip unknown
+                position += 4;
+
+                session.Sequence = (ushort)(BitConverter.ToUInt32(descriptor, position) + 1);
+                track.Session    = session.Sequence;
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tsession = {0}", session.Sequence);
+                position       += 4;
+                track.Sequence =  BitConverter.ToUInt32(descriptor, position) + lastSessionTrack + 1;
+
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrack = {1} + {2} + 1 = {0}", track.Sequence,
+                                           BitConverter.ToUInt32(descriptor, position), lastSessionTrack);
+
+                // There's always an index 0 in the image
+                track.Pregap = (ulong)track.Indexes[0];
+
+                if(track.Sequence == 1)
+                    track.Indexes[0] = -150;
+
+                if(track.Indexes[0] == 0)
+                    track.Indexes.Remove(0);
+
+                position          += 4;
+                track.StartSector =  BitConverter.ToUInt32(descriptor, position);
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrackStart = {0}", track.StartSector);
+                position += 4;
+                uint trackLen = BitConverter.ToUInt32(descriptor, position);
+
+                // DiscJuggler counts the first track pregap start as 0 instead of -150, we need to adjust appropriately
+                if(track.StartSector == 0)
+                    trackLen -= 150;
+                else
+                    track.StartSector -= 150;
+
+                int leftLen = (int)trackLen;
+
+                // Convert index length to index position
+                foreach(KeyValuePair<ushort, int> idx in track.Indexes.Reverse())
+                {
+                    leftLen -= idx.Value;
+
+                    if(idx.Key        == 0 &&
+                       track.Sequence == 1)
+                        continue;
+
+                    track.Indexes[idx.Key] = (int)track.StartSector + leftLen;
+                }
+
+                track.EndSector = track.StartSector + trackLen - 1;
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrackEnd = {0}", track.EndSector);
+                position += 4;
+
+                if(track.Sequence > session.EndTrack)
+                {
+                    session.EndTrack  = track.Sequence;
+                    session.EndSector = track.EndSector;
+                }
+
+                if(track.Sequence < session.StartTrack)
+                {
+                    session.StartTrack  = track.Sequence;
+                    session.StartSector = track.StartSector;
+                }
+
+                // Skip unknown
+                position += 16;
+
+                uint readMode = BitConverter.ToUInt32(descriptor, position);
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\treadMode = {0}", readMode);
+                position += 4;
+                uint trackCtl = BitConverter.ToUInt32(descriptor, position);
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrackCtl = {0}", trackCtl);
+                position += 4;
+
+                // Skip unknown
+                position += 9;
+
+                byte[] isrc = new byte[12];
+                Array.Copy(descriptor, position, isrc, 0, 12);
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tisrc = {0}", StringHandlers.CToString(isrc));
+                position += 12;
+                uint isrcValid = BitConverter.ToUInt32(descriptor, position);
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tisrc_valid = {0}", isrcValid);
+                position += 4;
+
+                // Skip unknown
+                position += 87;
+
+                byte sessionType = descriptor[position];
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tsessionType = {0}", sessionType);
+                position++;
+
+                // Skip unknown
+                position += 5;
+
+                byte trackFollows = descriptor[position];
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrackFollows = {0}", trackFollows);
+                position += 2;
+
+                uint endAddress = BitConverter.ToUInt32(descriptor, position);
+                AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tendAddress = {0}", endAddress);
+                position += 4;
+
+                // As to skip the lead-in
+                bool firstTrack = currentOffset == 0;
+
+                track.SubchannelType = TrackSubchannelType.None;
+
+                switch(trackMode)
+                {
+                    // Audio
+                    case 0:
+                        if(_imageInfo.SectorSize < 2352)
+                            _imageInfo.SectorSize = 2352;
+
+                        track.Type              = TrackType.Audio;
+                        track.BytesPerSector    = 2352;
+                        track.RawBytesPerSector = 2352;
+
+                        switch(readMode)
+                        {
+                            case 2:
+                                if(firstTrack)
+                                    currentOffset += 150 * (ulong)track.RawBytesPerSector;
+
+                                track.FileOffset =  currentOffset;
+                                currentOffset    += trackLen * (ulong)track.RawBytesPerSector;
+
+                                break;
+                            case 3:
+                                if(firstTrack)
+                                    currentOffset += 150 * (ulong)(track.RawBytesPerSector + 16);
+
+                                track.FileOffset       = currentOffset;
+                                track.SubchannelFile   = track.File;
+                                track.SubchannelOffset = currentOffset;
+                                track.SubchannelType   = TrackSubchannelType.Q16Interleaved;
+
+                                currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 16);
+
+                                break;
+                            case 4:
+                                if(firstTrack)
+                                    currentOffset += 150 * (ulong)(track.RawBytesPerSector + 96);
+
+                                track.FileOffset       = currentOffset;
+                                track.SubchannelFile   = track.File;
+                                track.SubchannelOffset = currentOffset;
+                                track.SubchannelType   = TrackSubchannelType.RawInterleaved;
+
+                                currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 96);
+
+                                break;
+                            default:
+                                AaruConsole.ErrorWriteLine($"Unknown read mode {readMode}");
+
+                                return ErrorNumber.InvalidArgument;
                         }
 
-                        nextFound = true;
+                        break;
+
+                    // Mode 1 or DVD
+                    case 1:
+                        if(_imageInfo.SectorSize < 2048)
+                            _imageInfo.SectorSize = 2048;
+
+                        track.Type           = TrackType.CdMode1;
+                        track.BytesPerSector = 2048;
+
+                        switch(readMode)
+                        {
+                            case 0:
+                                track.RawBytesPerSector = 2048;
+
+                                if(firstTrack)
+                                    currentOffset += 150 * (ulong)track.RawBytesPerSector;
+
+                                track.FileOffset =  currentOffset;
+                                currentOffset    += trackLen * (ulong)track.RawBytesPerSector;
+
+                                break;
+                            case 1:
+                                AaruConsole.ErrorWriteLine($"Invalid read mode {readMode} for this track");
+
+                                return ErrorNumber.InvalidArgument;
+                            case 2:
+                                track.RawBytesPerSector =  2352;
+                                currentOffset           += trackLen * (ulong)track.RawBytesPerSector;
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                                break;
+                            case 3:
+                                track.RawBytesPerSector = 2352;
+
+                                if(firstTrack)
+                                    currentOffset += 150 * (ulong)(track.RawBytesPerSector + 16);
+
+                                track.FileOffset       = currentOffset;
+                                track.SubchannelFile   = track.File;
+                                track.SubchannelOffset = currentOffset;
+                                track.SubchannelType   = TrackSubchannelType.Q16Interleaved;
+
+                                currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 16);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                                break;
+                            case 4:
+                                track.RawBytesPerSector = 2352;
+
+                                if(firstTrack)
+                                    currentOffset += 150 * (ulong)(track.RawBytesPerSector + 96);
+
+                                track.FileOffset       = currentOffset;
+                                track.SubchannelFile   = track.File;
+                                track.SubchannelOffset = currentOffset;
+                                track.SubchannelType   = TrackSubchannelType.RawInterleaved;
+
+                                currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 96);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+
+                                break;
+                            default:
+                                AaruConsole.ErrorWriteLine($"Unknown read mode {readMode}");
+
+                                return ErrorNumber.InvalidArgument;
+                        }
+
+                        break;
+
+                    // Mode 2
+                    case 2:
+                        if(_imageInfo.SectorSize < 2336)
+                            _imageInfo.SectorSize = 2336;
+
+                        track.Type           = TrackType.CdMode2Formless;
+                        track.BytesPerSector = 2336;
+
+                        switch(readMode)
+                        {
+                            case 0:
+                                AaruConsole.ErrorWriteLine($"Invalid read mode {readMode} for this track");
+
+                                return ErrorNumber.InvalidArgument;
+                            case 1:
+                                track.RawBytesPerSector = 2336;
+
+                                if(firstTrack)
+                                    currentOffset += 150 * (ulong)track.RawBytesPerSector;
+
+                                track.FileOffset =  currentOffset;
+                                currentOffset    += trackLen * (ulong)track.RawBytesPerSector;
+
+                                break;
+                            case 2:
+                                track.RawBytesPerSector =  2352;
+                                currentOffset           += trackLen * (ulong)track.RawBytesPerSector;
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                                break;
+                            case 3:
+                                track.RawBytesPerSector = 2352;
+
+                                if(firstTrack)
+                                    currentOffset += 150 * (ulong)(track.RawBytesPerSector + 16);
+
+                                track.FileOffset       = currentOffset;
+                                track.SubchannelFile   = track.File;
+                                track.SubchannelOffset = currentOffset;
+                                track.SubchannelType   = TrackSubchannelType.Q16Interleaved;
+
+                                currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 16);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                                break;
+                            case 4:
+                                track.RawBytesPerSector = 2352;
+
+                                if(firstTrack)
+                                    currentOffset += 150 * (ulong)(track.RawBytesPerSector + 96);
+
+                                track.FileOffset       = currentOffset;
+                                track.SubchannelFile   = track.File;
+                                track.SubchannelOffset = currentOffset;
+                                track.SubchannelType   = TrackSubchannelType.RawInterleaved;
+
+                                currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 96);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                                break;
+                            default:
+                                AaruConsole.ErrorWriteLine($"Unknown read mode {readMode}");
+
+                                return ErrorNumber.InvalidArgument;
+                        }
+
+                        break;
+                    default:
+                        AaruConsole.ErrorWriteLine($"Unknown track mode {trackMode}");
+
+                        return ErrorNumber.InvalidArgument;
+                }
+
+                track.File   = imageFilter.Filename;
+                track.Filter = imageFilter;
+
+                if(track.SubchannelType != TrackSubchannelType.None)
+                {
+                    track.SubchannelFile   = imageFilter.Filename;
+                    track.SubchannelFilter = imageFilter;
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+                }
+
+                var partition = new Partition
+                {
+                    Description = track.Description,
+                    Length      = trackLen,
+                    Sequence    = track.Sequence,
+                    Offset      = track.FileOffset,
+                    Start       = track.StartSector,
+                    Type        = track.Type.ToString()
+                };
+
+                if(track.Sequence > 1 &&
+                   track.Pregap   > 0)
+                {
+                    partition.Start  += track.Pregap;
+                    partition.Length -= track.Pregap;
+                }
+
+                partition.Size = partition.Length * (ulong)track.BytesPerSector;
+
+                if(track.EndSector + 1 > _imageInfo.Sectors)
+                    _imageInfo.Sectors = track.EndSector + 1;
+
+                Partitions.Add(partition);
+                _offsetMap.Add(track.Sequence, track.StartSector);
+                Tracks.Add(track);
+                _trackFlags.Add(track.Sequence, (byte)(trackCtl & 0xFF));
+                addedATrack = true;
+            }
+
+            if(!addedATrack)
+                continue;
+
+            lastSessionTrack = session.EndTrack;
+            Sessions.Add(session);
+            AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.StartTrack = {0}", session.StartTrack);
+            AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.StartSector = {0}", session.StartSector);
+            AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.EndTrack = {0}", session.EndTrack);
+            AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.EndSector = {0}", session.EndSector);
+
+            AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.Sequence = {0}", session.Sequence);
+        }
+
+        // Skip unknown
+        position += 16;
+
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "Current position = {0}", position);
+        byte[] filenameB = new byte[descriptor[position]];
+        position++;
+        Array.Copy(descriptor, position, filenameB, 0, filenameB.Length);
+        position += filenameB.Length;
+        string filename = Path.GetFileName(Encoding.Default.GetString(filenameB));
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "filename = {0}", filename);
+
+        // Skip unknown
+        position += 29;
+
+        mediumType =  BitConverter.ToUInt16(descriptor, position);
+        position   += 2;
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "mediumType = {0}", mediumType);
+
+        uint discSize = BitConverter.ToUInt32(descriptor, position);
+        position += 4;
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "discSize = {0}", discSize);
+
+        byte[] volidB = new byte[descriptor[position]];
+        position++;
+        Array.Copy(descriptor, position, volidB, 0, volidB.Length);
+        position += volidB.Length;
+        string volid = Path.GetFileName(Encoding.Default.GetString(volidB));
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "volid = {0}", volid);
+
+        // Skip unknown
+        position += 9;
+
+        byte[] mcn = new byte[13];
+        Array.Copy(descriptor, position, mcn, 0, 13);
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "mcn = {0}", StringHandlers.CToString(mcn));
+        position += 13;
+        uint mcnValid = BitConverter.ToUInt32(descriptor, position);
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "mcn_valid = {0}", mcnValid);
+        position += 4;
+
+        uint cdtextLen = BitConverter.ToUInt32(descriptor, position);
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "cdtextLen = {0}", cdtextLen);
+        position += 4;
+
+        if(cdtextLen > 0)
+        {
+            _cdtext = new byte[cdtextLen];
+            Array.Copy(descriptor, position, _cdtext, 0, cdtextLen);
+            position += (int)cdtextLen;
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_TEXT);
+        }
+
+        // Skip unknown
+        position += 12;
+
+        AaruConsole.DebugWriteLine("DiscJuggler plugin", "End position = {0}", position);
+
+        _imageInfo.MediaType = DecodeCdiMediumType(mediumType);
+
+        if(_imageInfo.MediaType == MediaType.CDROM)
+        {
+            bool data       = false;
+            bool mode2      = false;
+            bool firstaudio = false;
+            bool firstdata  = false;
+            bool audio      = false;
+
+            for(int i = 0; i < Tracks.Count; i++)
+            {
+                // First track is audio
+                firstaudio |= i == 0 && Tracks[i].Type == TrackType.Audio;
+
+                // First track is data
+                firstdata |= i == 0 && Tracks[i].Type != TrackType.Audio;
+
+                // Any non first track is data
+                data |= i != 0 && Tracks[i].Type != TrackType.Audio;
+
+                // Any non first track is audio
+                audio |= i != 0 && Tracks[i].Type == TrackType.Audio;
+
+                switch(Tracks[i].Type)
+                {
+                    case TrackType.CdMode2Form1:
+                    case TrackType.CdMode2Form2:
+                    case TrackType.CdMode2Formless:
+                        mode2 = true;
+
+                        break;
+                }
+            }
+
+            if(!data &&
+               !firstdata)
+                _imageInfo.MediaType = MediaType.CDDA;
+            else if(firstaudio         &&
+                    data               &&
+                    Sessions.Count > 1 &&
+                    mode2)
+                _imageInfo.MediaType = MediaType.CDPLUS;
+            else if((firstdata && audio) || mode2)
+                _imageInfo.MediaType = MediaType.CDROMXA;
+            else if(!audio)
+                _imageInfo.MediaType = MediaType.CDROM;
+            else
+                _imageInfo.MediaType = MediaType.CD;
+        }
+
+        if(_trackFlags.Count > 0 &&
+           !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
+            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+
+        _imageInfo.Application          = "DiscJuggler";
+        _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.XmlMediaType         = XmlMediaType.OpticalDisc;
+
+        _sectorBuilder = new SectorBuilder();
+
+        _isCd = mediumType == 152;
+
+        if(_isCd)
+            return ErrorNumber.NoError;
+
+        foreach(Track track in Tracks)
+        {
+            track.Pregap = 0;
+            track.Indexes?.Clear();
+        }
+
+        _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorSync);
+        _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorHeader);
+        _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorSubHeader);
+        _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEcc);
+        _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEccP);
+        _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEccQ);
+        _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEdc);
+        _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackFlags);
+        _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackIsrc);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        switch(tag)
+        {
+            case MediaTagType.CD_TEXT:
+            {
+                if(_cdtext is { Length: > 0 })
+                    buffer = _cdtext?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+            return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+        {
+            return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
+
+            return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
+        }
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+        bool mode2 = false;
+
+        switch(aaruTrack.Type)
+        {
+            case TrackType.Audio:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case TrackType.CdMode1:
+                if(aaruTrack.RawBytesPerSector == 2352)
+                {
+                    sectorOffset = 16;
+                    sectorSize   = 2048;
+                    sectorSkip   = 288;
+                }
+                else
+                {
+                    sectorOffset = 0;
+                    sectorSize   = 2048;
+                    sectorSkip   = 0;
+                }
+
+                break;
+            case TrackType.CdMode2Formless:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = (uint)aaruTrack.RawBytesPerSector;
+                sectorSkip   = 0;
+            }
+
+                break;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        switch(aaruTrack.SubchannelType)
+        {
+            case TrackSubchannelType.None:
+                sectorSkip += 0;
+
+                break;
+            case TrackSubchannelType.Q16Interleaved:
+                sectorSkip += 16;
+
+                break;
+            case TrackSubchannelType.RawInterleaved:
+                sectorSkip += 96;
+
+                break;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * (sectorOffset + sectorSize + sectorSkip))),
+                          SeekOrigin.Begin);
+
+        if(mode2)
+        {
+            var mode2Ms = new MemoryStream((int)(sectorSize * length));
+
+            buffer = new byte[(aaruTrack.RawBytesPerSector + sectorSkip) * length];
+            _imageStream.Read(buffer, 0, buffer.Length);
+
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[aaruTrack.RawBytesPerSector];
+
+                Array.Copy(buffer, (aaruTrack.RawBytesPerSector + sectorSkip) * i, sector, 0,
+                           aaruTrack.RawBytesPerSector);
+
+                sector = Sector.GetUserDataFromMode2(sector);
+                mode2Ms.Write(sector, 0, sector.Length);
+            }
+
+            buffer = mode2Ms.ToArray();
+        }
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+            _imageStream.Read(buffer, 0, buffer.Length);
+        else
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                _imageStream.Seek(sectorOffset, SeekOrigin.Current);
+                _imageStream.Read(sector, 0, sector.Length);
+                _imageStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag == SectorTagType.CdTrackFlags)
+            track = (uint)sectorAddress;
+
+        Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
+            return ErrorNumber.OutOfRange;
+
+        if(aaruTrack.Type == TrackType.Data)
+            return ErrorNumber.NotSupported;
+
+        switch(tag)
+        {
+            case SectorTagType.CdSectorEcc:
+            case SectorTagType.CdSectorEccP:
+            case SectorTagType.CdSectorEccQ:
+            case SectorTagType.CdSectorEdc:
+            case SectorTagType.CdSectorHeader:
+            case SectorTagType.CdSectorSubchannel:
+            case SectorTagType.CdSectorSubHeader:
+            case SectorTagType.CdSectorSync: break;
+            case SectorTagType.CdTrackFlags:
+                if(!_trackFlags.TryGetValue(track, out byte flag))
+                    return ErrorNumber.NoData;
+
+                buffer = new[]
+                {
+                    flag
+                };
+
+                return ErrorNumber.NoError;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(aaruTrack.Type)
+        {
+            case TrackType.CdMode1:
+                if(aaruTrack.RawBytesPerSector != 2352)
+                    return ErrorNumber.NotSupported;
+
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
 
                         break;
                     }
-
-                    if(!nextFound)
-                        return Tracks.Count > 0 ? ErrorNumber.NoError : ErrorNumber.InvalidArgument;
-
-                    position += 15;
-
-                    break;
-                }
-
-                // Too many tracks
-                if(descriptor[position + 1] > 99)
-                    return ErrorNumber.InvalidArgument;
-
-                byte maxT = descriptor[position + 1];
-                AaruConsole.DebugWriteLine("DiscJuggler plugin", "maxT = {0}", maxT);
-
-                sessionSequence++;
-
-                var session = new Session
-                {
-                    Sequence   = sessionSequence,
-                    EndTrack   = uint.MinValue,
-                    StartTrack = uint.MaxValue
-                };
-
-                position += 15;
-                bool addedATrack = false;
-
-                // Read track
-                for(byte t = 0; t < maxT; t++)
-                {
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "t = {0}", t);
-                    var track = new Track();
-
-                    // Skip unknown
-                    position += 16;
-
-                    byte[] trackFilenameB = new byte[descriptor[position]];
-                    position++;
-                    Array.Copy(descriptor, position, trackFilenameB, 0, trackFilenameB.Length);
-                    position   += trackFilenameB.Length;
-                    track.File =  Path.GetFileName(Encoding.Default.GetString(trackFilenameB));
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tfilename = {0}", track.File);
-
-                    // Skip unknown
-                    position += 29;
-
-                    mediumType =  BitConverter.ToUInt16(descriptor, position);
-                    position   += 2;
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tmediumType = {0}", mediumType);
-
-                    // Read indices
-                    ushort maxI = BitConverter.ToUInt16(descriptor, position);
-                    position += 2;
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tmaxI = {0}", maxI);
-
-                    // This is not really the index position, but, the index length, go figure
-                    for(ushort i = 0; i < maxI; i++)
+                    case SectorTagType.CdSectorHeader:
                     {
-                        int index = BitConverter.ToInt32(descriptor, position);
-                        track.Indexes.Add(i, index);
-                        position += 4;
-                        AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tindex[{1}] = {0}", index, i);
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
                     }
-
-                    // Read CD-Text
-                    uint maxC = BitConverter.ToUInt32(descriptor, position);
-                    position += 4;
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tmaxC = {0}", maxC);
-
-                    for(uint c = 0; c < maxC; c++)
+                    case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorEcc:
                     {
-                        for(int cb = 0; cb < 18; cb++)
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2064;
+                        sectorSize   = 4;
+                        sectorSkip   = 284;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubchannel:
+                        switch(aaruTrack.SubchannelType)
                         {
-                            int bLen = descriptor[position];
-                            position++;
-                            AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tc[{1}][{2}].Length = {0}", bLen, c, cb);
+                            case TrackSubchannelType.None: return ErrorNumber.NoData;
+                            case TrackSubchannelType.Q16Interleaved:
 
-                            if(bLen <= 0)
-                                continue;
+                                sectorSize = 16;
 
-                            byte[] textBlk = new byte[bLen];
-                            Array.Copy(descriptor, position, textBlk, 0, bLen);
-                            position += bLen;
+                                break;
+                            default:
+                                sectorSize = 96;
 
-                            // Track title
-                            if(cb != 10)
-                                continue;
-
-                            track.Description = Encoding.Default.GetString(textBlk, 0, bLen);
-
-                            AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tTrack title = {0}", track.Description);
+                                break;
                         }
-                    }
 
-                    position += 2;
-                    uint trackMode = BitConverter.ToUInt32(descriptor, position);
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrackMode = {0}", trackMode);
-                    position += 4;
+                        sectorOffset = 2352;
+                        sectorSkip   = 0;
 
-                    // Skip unknown
-                    position += 4;
-
-                    session.Sequence = (ushort)(BitConverter.ToUInt32(descriptor, position) + 1);
-                    track.Session    = session.Sequence;
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tsession = {0}", session.Sequence);
-                    position       += 4;
-                    track.Sequence =  BitConverter.ToUInt32(descriptor, position) + lastSessionTrack + 1;
-
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrack = {1} + {2} + 1 = {0}", track.Sequence,
-                                               BitConverter.ToUInt32(descriptor, position), lastSessionTrack);
-
-                    // There's always an index 0 in the image
-                    track.Pregap = (ulong)track.Indexes[0];
-
-                    if(track.Sequence == 1)
-                        track.Indexes[0] = -150;
-
-                    if(track.Indexes[0] == 0)
-                        track.Indexes.Remove(0);
-
-                    position          += 4;
-                    track.StartSector =  BitConverter.ToUInt32(descriptor, position);
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrackStart = {0}", track.StartSector);
-                    position += 4;
-                    uint trackLen = BitConverter.ToUInt32(descriptor, position);
-
-                    // DiscJuggler counts the first track pregap start as 0 instead of -150, we need to adjust appropriately
-                    if(track.StartSector == 0)
-                        trackLen -= 150;
-                    else
-                        track.StartSector -= 150;
-
-                    int leftLen = (int)trackLen;
-
-                    // Convert index length to index position
-                    foreach(KeyValuePair<ushort, int> idx in track.Indexes.Reverse())
-                    {
-                        leftLen -= idx.Value;
-
-                        if(idx.Key        == 0 &&
-                           track.Sequence == 1)
-                            continue;
-
-                        track.Indexes[idx.Key] = (int)track.StartSector + leftLen;
-                    }
-
-                    track.EndSector = track.StartSector + trackLen - 1;
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrackEnd = {0}", track.EndSector);
-                    position += 4;
-
-                    if(track.Sequence > session.EndTrack)
-                    {
-                        session.EndTrack  = track.Sequence;
-                        session.EndSector = track.EndSector;
-                    }
-
-                    if(track.Sequence < session.StartTrack)
-                    {
-                        session.StartTrack  = track.Sequence;
-                        session.StartSector = track.StartSector;
-                    }
-
-                    // Skip unknown
-                    position += 16;
-
-                    uint readMode = BitConverter.ToUInt32(descriptor, position);
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\treadMode = {0}", readMode);
-                    position += 4;
-                    uint trackCtl = BitConverter.ToUInt32(descriptor, position);
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrackCtl = {0}", trackCtl);
-                    position += 4;
-
-                    // Skip unknown
-                    position += 9;
-
-                    byte[] isrc = new byte[12];
-                    Array.Copy(descriptor, position, isrc, 0, 12);
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tisrc = {0}", StringHandlers.CToString(isrc));
-                    position += 12;
-                    uint isrcValid = BitConverter.ToUInt32(descriptor, position);
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tisrc_valid = {0}", isrcValid);
-                    position += 4;
-
-                    // Skip unknown
-                    position += 87;
-
-                    byte sessionType = descriptor[position];
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tsessionType = {0}", sessionType);
-                    position++;
-
-                    // Skip unknown
-                    position += 5;
-
-                    byte trackFollows = descriptor[position];
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\ttrackFollows = {0}", trackFollows);
-                    position += 2;
-
-                    uint endAddress = BitConverter.ToUInt32(descriptor, position);
-                    AaruConsole.DebugWriteLine("DiscJuggler plugin", "\tendAddress = {0}", endAddress);
-                    position += 4;
-
-                    // As to skip the lead-in
-                    bool firstTrack = currentOffset == 0;
-
-                    track.SubchannelType = TrackSubchannelType.None;
-
-                    switch(trackMode)
-                    {
-                        // Audio
-                        case 0:
-                            if(_imageInfo.SectorSize < 2352)
-                                _imageInfo.SectorSize = 2352;
-
-                            track.Type              = TrackType.Audio;
-                            track.BytesPerSector    = 2352;
-                            track.RawBytesPerSector = 2352;
-
-                            switch(readMode)
-                            {
-                                case 2:
-                                    if(firstTrack)
-                                        currentOffset += 150 * (ulong)track.RawBytesPerSector;
-
-                                    track.FileOffset =  currentOffset;
-                                    currentOffset    += trackLen * (ulong)track.RawBytesPerSector;
-
-                                    break;
-                                case 3:
-                                    if(firstTrack)
-                                        currentOffset += 150 * (ulong)(track.RawBytesPerSector + 16);
-
-                                    track.FileOffset       = currentOffset;
-                                    track.SubchannelFile   = track.File;
-                                    track.SubchannelOffset = currentOffset;
-                                    track.SubchannelType   = TrackSubchannelType.Q16Interleaved;
-
-                                    currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 16);
-
-                                    break;
-                                case 4:
-                                    if(firstTrack)
-                                        currentOffset += 150 * (ulong)(track.RawBytesPerSector + 96);
-
-                                    track.FileOffset       = currentOffset;
-                                    track.SubchannelFile   = track.File;
-                                    track.SubchannelOffset = currentOffset;
-                                    track.SubchannelType   = TrackSubchannelType.RawInterleaved;
-
-                                    currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 96);
-
-                                    break;
-                                default:
-                                    AaruConsole.ErrorWriteLine($"Unknown read mode {readMode}");
-
-                                    return ErrorNumber.InvalidArgument;
-                            }
-
-                            break;
-
-                        // Mode 1 or DVD
-                        case 1:
-                            if(_imageInfo.SectorSize < 2048)
-                                _imageInfo.SectorSize = 2048;
-
-                            track.Type           = TrackType.CdMode1;
-                            track.BytesPerSector = 2048;
-
-                            switch(readMode)
-                            {
-                                case 0:
-                                    track.RawBytesPerSector = 2048;
-
-                                    if(firstTrack)
-                                        currentOffset += 150 * (ulong)track.RawBytesPerSector;
-
-                                    track.FileOffset =  currentOffset;
-                                    currentOffset    += trackLen * (ulong)track.RawBytesPerSector;
-
-                                    break;
-                                case 1:
-                                    AaruConsole.ErrorWriteLine($"Invalid read mode {readMode} for this track");
-
-                                    return ErrorNumber.InvalidArgument;
-                                case 2:
-                                    track.RawBytesPerSector =  2352;
-                                    currentOffset           += trackLen * (ulong)track.RawBytesPerSector;
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                                    break;
-                                case 3:
-                                    track.RawBytesPerSector = 2352;
-
-                                    if(firstTrack)
-                                        currentOffset += 150 * (ulong)(track.RawBytesPerSector + 16);
-
-                                    track.FileOffset       = currentOffset;
-                                    track.SubchannelFile   = track.File;
-                                    track.SubchannelOffset = currentOffset;
-                                    track.SubchannelType   = TrackSubchannelType.Q16Interleaved;
-
-                                    currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 16);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                                    break;
-                                case 4:
-                                    track.RawBytesPerSector = 2352;
-
-                                    if(firstTrack)
-                                        currentOffset += 150 * (ulong)(track.RawBytesPerSector + 96);
-
-                                    track.FileOffset       = currentOffset;
-                                    track.SubchannelFile   = track.File;
-                                    track.SubchannelOffset = currentOffset;
-                                    track.SubchannelType   = TrackSubchannelType.RawInterleaved;
-
-                                    currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 96);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-
-                                    break;
-                                default:
-                                    AaruConsole.ErrorWriteLine($"Unknown read mode {readMode}");
-
-                                    return ErrorNumber.InvalidArgument;
-                            }
-
-                            break;
-
-                        // Mode 2
-                        case 2:
-                            if(_imageInfo.SectorSize < 2336)
-                                _imageInfo.SectorSize = 2336;
-
-                            track.Type           = TrackType.CdMode2Formless;
-                            track.BytesPerSector = 2336;
-
-                            switch(readMode)
-                            {
-                                case 0:
-                                    AaruConsole.ErrorWriteLine($"Invalid read mode {readMode} for this track");
-
-                                    return ErrorNumber.InvalidArgument;
-                                case 1:
-                                    track.RawBytesPerSector = 2336;
-
-                                    if(firstTrack)
-                                        currentOffset += 150 * (ulong)track.RawBytesPerSector;
-
-                                    track.FileOffset =  currentOffset;
-                                    currentOffset    += trackLen * (ulong)track.RawBytesPerSector;
-
-                                    break;
-                                case 2:
-                                    track.RawBytesPerSector =  2352;
-                                    currentOffset           += trackLen * (ulong)track.RawBytesPerSector;
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                    break;
-                                case 3:
-                                    track.RawBytesPerSector = 2352;
-
-                                    if(firstTrack)
-                                        currentOffset += 150 * (ulong)(track.RawBytesPerSector + 16);
-
-                                    track.FileOffset       = currentOffset;
-                                    track.SubchannelFile   = track.File;
-                                    track.SubchannelOffset = currentOffset;
-                                    track.SubchannelType   = TrackSubchannelType.Q16Interleaved;
-
-                                    currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 16);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                    break;
-                                case 4:
-                                    track.RawBytesPerSector = 2352;
-
-                                    if(firstTrack)
-                                        currentOffset += 150 * (ulong)(track.RawBytesPerSector + 96);
-
-                                    track.FileOffset       = currentOffset;
-                                    track.SubchannelFile   = track.File;
-                                    track.SubchannelOffset = currentOffset;
-                                    track.SubchannelType   = TrackSubchannelType.RawInterleaved;
-
-                                    currentOffset += trackLen * (ulong)(track.RawBytesPerSector + 96);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                                    break;
-                                default:
-                                    AaruConsole.ErrorWriteLine($"Unknown read mode {readMode}");
-
-                                    return ErrorNumber.InvalidArgument;
-                            }
-
-                            break;
-                        default:
-                            AaruConsole.ErrorWriteLine($"Unknown track mode {trackMode}");
-
-                            return ErrorNumber.InvalidArgument;
-                    }
-
-                    track.File   = imageFilter.Filename;
-                    track.Filter = imageFilter;
-
-                    if(track.SubchannelType != TrackSubchannelType.None)
-                    {
-                        track.SubchannelFile   = imageFilter.Filename;
-                        track.SubchannelFilter = imageFilter;
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-                    }
-
-                    var partition = new Partition
-                    {
-                        Description = track.Description,
-                        Length      = trackLen,
-                        Sequence    = track.Sequence,
-                        Offset      = track.FileOffset,
-                        Start       = track.StartSector,
-                        Type        = track.Type.ToString()
-                    };
-
-                    if(track.Sequence > 1 &&
-                       track.Pregap   > 0)
-                    {
-                        partition.Start  += track.Pregap;
-                        partition.Length -= track.Pregap;
-                    }
-
-                    partition.Size = partition.Length * (ulong)track.BytesPerSector;
-
-                    if(track.EndSector + 1 > _imageInfo.Sectors)
-                        _imageInfo.Sectors = track.EndSector + 1;
-
-                    Partitions.Add(partition);
-                    _offsetMap.Add(track.Sequence, track.StartSector);
-                    Tracks.Add(track);
-                    _trackFlags.Add(track.Sequence, (byte)(trackCtl & 0xFF));
-                    addedATrack = true;
+                        break;
+                    default: return ErrorNumber.NotSupported;
                 }
 
-                if(!addedATrack)
-                    continue;
+                break;
+            case TrackType.CdMode2Formless:
+                if(aaruTrack.RawBytesPerSector != 2352)
+                    return ErrorNumber.NotSupported;
 
-                lastSessionTrack = session.EndTrack;
-                Sessions.Add(session);
-                AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.StartTrack = {0}", session.StartTrack);
-                AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.StartSector = {0}", session.StartSector);
-                AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.EndTrack = {0}", session.EndTrack);
-                AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.EndSector = {0}", session.EndSector);
-
-                AaruConsole.DebugWriteLine("DiscJuggler plugin", "session.Sequence = {0}", session.Sequence);
-            }
-
-            // Skip unknown
-            position += 16;
-
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "Current position = {0}", position);
-            byte[] filenameB = new byte[descriptor[position]];
-            position++;
-            Array.Copy(descriptor, position, filenameB, 0, filenameB.Length);
-            position += filenameB.Length;
-            string filename = Path.GetFileName(Encoding.Default.GetString(filenameB));
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "filename = {0}", filename);
-
-            // Skip unknown
-            position += 29;
-
-            mediumType =  BitConverter.ToUInt16(descriptor, position);
-            position   += 2;
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "mediumType = {0}", mediumType);
-
-            uint discSize = BitConverter.ToUInt32(descriptor, position);
-            position += 4;
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "discSize = {0}", discSize);
-
-            byte[] volidB = new byte[descriptor[position]];
-            position++;
-            Array.Copy(descriptor, position, volidB, 0, volidB.Length);
-            position += volidB.Length;
-            string volid = Path.GetFileName(Encoding.Default.GetString(volidB));
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "volid = {0}", volid);
-
-            // Skip unknown
-            position += 9;
-
-            byte[] mcn = new byte[13];
-            Array.Copy(descriptor, position, mcn, 0, 13);
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "mcn = {0}", StringHandlers.CToString(mcn));
-            position += 13;
-            uint mcnValid = BitConverter.ToUInt32(descriptor, position);
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "mcn_valid = {0}", mcnValid);
-            position += 4;
-
-            uint cdtextLen = BitConverter.ToUInt32(descriptor, position);
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "cdtextLen = {0}", cdtextLen);
-            position += 4;
-
-            if(cdtextLen > 0)
             {
-                _cdtext = new byte[cdtextLen];
-                Array.Copy(descriptor, position, _cdtext, 0, cdtextLen);
-                position += (int)cdtextLen;
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.CD_TEXT);
-            }
-
-            // Skip unknown
-            position += 12;
-
-            AaruConsole.DebugWriteLine("DiscJuggler plugin", "End position = {0}", position);
-
-            _imageInfo.MediaType = DecodeCdiMediumType(mediumType);
-
-            if(_imageInfo.MediaType == MediaType.CDROM)
-            {
-                bool data       = false;
-                bool mode2      = false;
-                bool firstaudio = false;
-                bool firstdata  = false;
-                bool audio      = false;
-
-                for(int i = 0; i < Tracks.Count; i++)
+                switch(tag)
                 {
-                    // First track is audio
-                    firstaudio |= i == 0 && Tracks[i].Type == TrackType.Audio;
-
-                    // First track is data
-                    firstdata |= i == 0 && Tracks[i].Type != TrackType.Audio;
-
-                    // Any non first track is data
-                    data |= i != 0 && Tracks[i].Type != TrackType.Audio;
-
-                    // Any non first track is audio
-                    audio |= i != 0 && Tracks[i].Type == TrackType.Audio;
-
-                    switch(Tracks[i].Type)
-                    {
-                        case TrackType.CdMode2Form1:
-                        case TrackType.CdMode2Form2:
-                        case TrackType.CdMode2Formless:
-                            mode2 = true;
-
-                            break;
-                    }
-                }
-
-                if(!data &&
-                   !firstdata)
-                    _imageInfo.MediaType = MediaType.CDDA;
-                else if(firstaudio         &&
-                        data               &&
-                        Sessions.Count > 1 &&
-                        mode2)
-                    _imageInfo.MediaType = MediaType.CDPLUS;
-                else if((firstdata && audio) || mode2)
-                    _imageInfo.MediaType = MediaType.CDROMXA;
-                else if(!audio)
-                    _imageInfo.MediaType = MediaType.CDROM;
-                else
-                    _imageInfo.MediaType = MediaType.CD;
-            }
-
-            if(_trackFlags.Count > 0 &&
-               !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
-                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-
-            _imageInfo.Application          = "DiscJuggler";
-            _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.XmlMediaType         = XmlMediaType.OpticalDisc;
-
-            _sectorBuilder = new SectorBuilder();
-
-            _isCd = mediumType == 152;
-
-            if(_isCd)
-                return ErrorNumber.NoError;
-
-            foreach(Track track in Tracks)
-            {
-                track.Pregap = 0;
-                track.Indexes?.Clear();
-            }
-
-            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorSync);
-            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorHeader);
-            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorSubHeader);
-            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEcc);
-            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEccP);
-            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEccQ);
-            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdSectorEdc);
-            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackFlags);
-            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackIsrc);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            switch(tag)
-            {
-                case MediaTagType.CD_TEXT:
-                {
-                    if(_cdtext is { Length: > 0 })
-                        buffer = _cdtext?.Clone() as byte[];
-
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-                return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-            {
-                return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
-
-                return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
-            }
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
-
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-            bool mode2 = false;
-
-            switch(aaruTrack.Type)
-            {
-                case TrackType.Audio:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case TrackType.CdMode1:
-                    if(aaruTrack.RawBytesPerSector == 2352)
-                    {
-                        sectorOffset = 16;
-                        sectorSize   = 2048;
-                        sectorSkip   = 288;
-                    }
-                    else
+                    case SectorTagType.CdSectorSync:
+                    case SectorTagType.CdSectorHeader:
+                    case SectorTagType.CdSectorEcc:
+                    case SectorTagType.CdSectorEccP:
+                    case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorSubHeader:
                     {
                         sectorOffset = 0;
-                        sectorSize   = 2048;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2332;
+                        sectorSize   = 4;
                         sectorSkip   = 0;
+
+                        break;
                     }
+                    case SectorTagType.CdSectorSubchannel:
+                        switch(aaruTrack.SubchannelType)
+                        {
+                            case TrackSubchannelType.None: return ErrorNumber.NoData;
+                            case TrackSubchannelType.Q16Interleaved:
+                                sectorSize = 16;
 
-                    break;
-                case TrackType.CdMode2Formless:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = (uint)aaruTrack.RawBytesPerSector;
-                    sectorSkip   = 0;
+                                break;
+                            default:
+                                sectorSize = 96;
+
+                                break;
+                        }
+
+                        sectorOffset = 2352;
+                        sectorSkip   = 0;
+
+                        break;
+                    default: return ErrorNumber.NotSupported;
                 }
 
-                    break;
-                default: return ErrorNumber.NotSupported;
+                break;
             }
-
-            switch(aaruTrack.SubchannelType)
+            case TrackType.Audio:
             {
-                case TrackSubchannelType.None:
-                    sectorSkip += 0;
-
-                    break;
-                case TrackSubchannelType.Q16Interleaved:
-                    sectorSkip += 16;
-
-                    break;
-                case TrackSubchannelType.RawInterleaved:
-                    sectorSkip += 96;
-
-                    break;
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            _imageStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * (sectorOffset + sectorSize + sectorSkip))),
-                              SeekOrigin.Begin);
-
-            if(mode2)
-            {
-                var mode2Ms = new MemoryStream((int)(sectorSize * length));
-
-                buffer = new byte[(aaruTrack.RawBytesPerSector + sectorSkip) * length];
-                _imageStream.Read(buffer, 0, buffer.Length);
-
-                for(int i = 0; i < length; i++)
+                switch(tag)
                 {
-                    byte[] sector = new byte[aaruTrack.RawBytesPerSector];
+                    case SectorTagType.CdSectorSubchannel:
+                        switch(aaruTrack.SubchannelType)
+                        {
+                            case TrackSubchannelType.None: return ErrorNumber.NoData;
+                            case TrackSubchannelType.Q16Interleaved:
+                                sectorSize = 16;
 
-                    Array.Copy(buffer, (aaruTrack.RawBytesPerSector + sectorSkip) * i, sector, 0,
-                               aaruTrack.RawBytesPerSector);
+                                break;
+                            default:
+                                sectorSize = 96;
 
-                    sector = Sector.GetUserDataFromMode2(sector);
-                    mode2Ms.Write(sector, 0, sector.Length);
+                                break;
+                        }
+
+                        sectorOffset = 2352;
+                        sectorSkip   = 0;
+
+                        break;
+                    default: return ErrorNumber.NotSupported;
                 }
 
-                buffer = mode2Ms.ToArray();
+                break;
             }
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-                _imageStream.Read(buffer, 0, buffer.Length);
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    _imageStream.Seek(sectorOffset, SeekOrigin.Current);
-                    _imageStream.Read(sector, 0, sector.Length);
-                    _imageStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            return ErrorNumber.NoError;
+            default: return ErrorNumber.NotSupported;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
+        switch(aaruTrack.SubchannelType)
         {
-            buffer = null;
+            case TrackSubchannelType.None:
+                sectorSkip += 0;
 
-            if(tag == SectorTagType.CdTrackFlags)
-                track = (uint)sectorAddress;
+                break;
+            case TrackSubchannelType.Q16Interleaved:
+                sectorSkip += 16;
 
-            Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
+                break;
+            case TrackSubchannelType.RawInterleaved:
+                sectorSkip += 96;
 
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
-                return ErrorNumber.OutOfRange;
-
-            if(aaruTrack.Type == TrackType.Data)
-                return ErrorNumber.NotSupported;
-
-            switch(tag)
-            {
-                case SectorTagType.CdSectorEcc:
-                case SectorTagType.CdSectorEccP:
-                case SectorTagType.CdSectorEccQ:
-                case SectorTagType.CdSectorEdc:
-                case SectorTagType.CdSectorHeader:
-                case SectorTagType.CdSectorSubchannel:
-                case SectorTagType.CdSectorSubHeader:
-                case SectorTagType.CdSectorSync: break;
-                case SectorTagType.CdTrackFlags:
-                    if(!_trackFlags.TryGetValue(track, out byte flag))
-                        return ErrorNumber.NoData;
-
-                    buffer = new[]
-                    {
-                        flag
-                    };
-
-                    return ErrorNumber.NoError;
-                default: return ErrorNumber.NotSupported;
-            }
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch(aaruTrack.Type)
-            {
-                case TrackType.CdMode1:
-                    if(aaruTrack.RawBytesPerSector != 2352)
-                        return ErrorNumber.NotSupported;
-
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2064;
-                            sectorSize   = 4;
-                            sectorSkip   = 284;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                            switch(aaruTrack.SubchannelType)
-                            {
-                                case TrackSubchannelType.None: return ErrorNumber.NoData;
-                                case TrackSubchannelType.Q16Interleaved:
-
-                                    sectorSize = 16;
-
-                                    break;
-                                default:
-                                    sectorSize = 96;
-
-                                    break;
-                            }
-
-                            sectorOffset = 2352;
-                            sectorSkip   = 0;
-
-                            break;
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case TrackType.CdMode2Formless:
-                    if(aaruTrack.RawBytesPerSector != 2352)
-                        return ErrorNumber.NotSupported;
-
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        case SectorTagType.CdSectorHeader:
-                        case SectorTagType.CdSectorEcc:
-                        case SectorTagType.CdSectorEccP:
-                        case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2332;
-                            sectorSize   = 4;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                            switch(aaruTrack.SubchannelType)
-                            {
-                                case TrackSubchannelType.None: return ErrorNumber.NoData;
-                                case TrackSubchannelType.Q16Interleaved:
-                                    sectorSize = 16;
-
-                                    break;
-                                default:
-                                    sectorSize = 96;
-
-                                    break;
-                            }
-
-                            sectorOffset = 2352;
-                            sectorSkip   = 0;
-
-                            break;
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-                case TrackType.Audio:
-                {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSubchannel:
-                            switch(aaruTrack.SubchannelType)
-                            {
-                                case TrackSubchannelType.None: return ErrorNumber.NoData;
-                                case TrackSubchannelType.Q16Interleaved:
-                                    sectorSize = 16;
-
-                                    break;
-                                default:
-                                    sectorSize = 96;
-
-                                    break;
-                            }
-
-                            sectorOffset = 2352;
-                            sectorSkip   = 0;
-
-                            break;
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-
-            switch(aaruTrack.SubchannelType)
-            {
-                case TrackSubchannelType.None:
-                    sectorSkip += 0;
-
-                    break;
-                case TrackSubchannelType.Q16Interleaved:
-                    sectorSkip += 16;
-
-                    break;
-                case TrackSubchannelType.RawInterleaved:
-                    sectorSkip += 96;
-
-                    break;
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            _imageStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * (sectorOffset + sectorSize + sectorSkip))),
-                              SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                _imageStream.Read(buffer, 0, buffer.Length);
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    _imageStream.Seek(sectorOffset, SeekOrigin.Current);
-                    _imageStream.Read(sector, 0, sector.Length);
-                    _imageStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            if(aaruTrack.SubchannelType == TrackSubchannelType.Q16Interleaved &&
-               tag                      == SectorTagType.CdSectorSubchannel)
-                buffer = Subchannel.ConvertQToRaw(buffer);
-
-            return ErrorNumber.NoError;
+                break;
+            default: return ErrorNumber.NotSupported;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
+        buffer = new byte[sectorSize * length];
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, track, out buffer);
+        _imageStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * (sectorOffset + sectorSize + sectorSkip))),
+                          SeekOrigin.Begin);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress                       - kvp.Value <
-                                                           track.EndSector - track.StartSector + 1 select kvp)
-                return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(!_isCd)
-                return ReadSectors(sectorAddress, length, track, out buffer);
-
-            Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
-
-            if(aaruTrack is null)
-                return ErrorNumber.SectorNotFound;
-
-            if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorSize = (uint)aaruTrack.RawBytesPerSector;
-            uint sectorSkip = 0;
-
-            switch(aaruTrack.SubchannelType)
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            _imageStream.Read(buffer, 0, buffer.Length);
+        else
+            for(int i = 0; i < length; i++)
             {
-                case TrackSubchannelType.None:
-                    sectorSkip += 0;
-
-                    break;
-                case TrackSubchannelType.Q16Interleaved:
-                    sectorSkip += 16;
-
-                    break;
-                case TrackSubchannelType.RawInterleaved:
-                    sectorSkip += 96;
-
-                    break;
-                default: return ErrorNumber.NotSupported;
+                byte[] sector = new byte[sectorSize];
+                _imageStream.Seek(sectorOffset, SeekOrigin.Current);
+                _imageStream.Read(sector, 0, sector.Length);
+                _imageStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
             }
 
-            buffer = new byte[sectorSize * length];
+        if(aaruTrack.SubchannelType == TrackSubchannelType.Q16Interleaved &&
+           tag                      == SectorTagType.CdSectorSubchannel)
+            buffer = Subchannel.ConvertQToRaw(buffer);
 
-            _imageStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * (sectorSize + sectorSkip))),
-                              SeekOrigin.Begin);
-
-            if(sectorSkip == 0)
-                _imageStream.Read(buffer, 0, buffer.Length);
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    _imageStream.Read(sector, 0, sector.Length);
-                    _imageStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            switch(aaruTrack.Type)
-            {
-                case TrackType.CdMode1 when aaruTrack.RawBytesPerSector == 2048:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        Array.Copy(buffer, i * 2048, fullSector, 16, 2048);
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)(sectorAddress + i));
-                        _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-                case TrackType.CdMode2Formless when aaruTrack.RawBytesPerSector == 2336:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Formless,
-                                                         (long)(sectorAddress + i));
-
-                        Array.Copy(buffer, i                    * 2336, fullSector, 16, 2336);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-            }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(Session session)
-        {
-            if(Sessions.Contains(session))
-                return GetSessionTracks(session.Sequence);
-
-            return null;
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();
+        return ErrorNumber.NoError;
     }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress                       - kvp.Value <
+                                                       track.EndSector - track.StartSector + 1 select kvp)
+            return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(!_isCd)
+            return ReadSectors(sectorAddress, length, track, out buffer);
+
+        Track? aaruTrack = Tracks.FirstOrDefault(linqTrack => linqTrack.Sequence == track);
+
+        if(aaruTrack is null)
+            return ErrorNumber.SectorNotFound;
+
+        if(length + sectorAddress > aaruTrack.EndSector - aaruTrack.StartSector + 1)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorSize = (uint)aaruTrack.RawBytesPerSector;
+        uint sectorSkip = 0;
+
+        switch(aaruTrack.SubchannelType)
+        {
+            case TrackSubchannelType.None:
+                sectorSkip += 0;
+
+                break;
+            case TrackSubchannelType.Q16Interleaved:
+                sectorSkip += 16;
+
+                break;
+            case TrackSubchannelType.RawInterleaved:
+                sectorSkip += 96;
+
+                break;
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream.Seek((long)(aaruTrack.FileOffset + (sectorAddress * (sectorSize + sectorSkip))),
+                          SeekOrigin.Begin);
+
+        if(sectorSkip == 0)
+            _imageStream.Read(buffer, 0, buffer.Length);
+        else
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                _imageStream.Read(sector, 0, sector.Length);
+                _imageStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        switch(aaruTrack.Type)
+        {
+            case TrackType.CdMode1 when aaruTrack.RawBytesPerSector == 2048:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
+                {
+                    Array.Copy(buffer, i * 2048, fullSector, 16, 2048);
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)(sectorAddress + i));
+                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
+                }
+
+                buffer = fullBuffer;
+
+                break;
+            }
+            case TrackType.CdMode2Formless when aaruTrack.RawBytesPerSector == 2336:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
+                {
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Formless,
+                                                     (long)(sectorAddress + i));
+
+                    Array.Copy(buffer, i                    * 2336, fullSector, 16, 2336);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
+                }
+
+                buffer = fullBuffer;
+
+                break;
+            }
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(Session session)
+    {
+        if(Sessions.Contains(session))
+            return GetSessionTracks(session.Sequence);
+
+        return null;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiscJuggler/Verify.cs b/Aaru.Images/DiscJuggler/Verify.cs
index 13c64088a..3f841268f 100644
--- a/Aaru.Images/DiscJuggler/Verify.cs
+++ b/Aaru.Images/DiscJuggler/Verify.cs
@@ -35,92 +35,91 @@ using System.Collections.Generic;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiscJuggler
 {
-    public sealed partial class DiscJuggler
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
     {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Constants.cs b/Aaru.Images/DiskCopy42/Constants.cs
index 2c670b9c2..287a196de 100644
--- a/Aaru.Images/DiskCopy42/Constants.cs
+++ b/Aaru.Images/DiskCopy42/Constants.cs
@@ -32,55 +32,54 @@
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskCopy42
 {
-    public sealed partial class DiskCopy42
-    {
-        // format byte
-        /// <summary>3.5", single side, double density, GCR</summary>
-        const byte kSonyFormat400K = 0x00;
-        /// <summary>3.5", double side, double density, GCR</summary>
-        const byte kSonyFormat800K = 0x01;
-        /// <summary>3.5", double side, double density, MFM</summary>
-        const byte kSonyFormat720K = 0x02;
-        /// <summary>3.5", double side, high density, MFM</summary>
-        const byte kSonyFormat1440K = 0x03;
-        /// <summary>3.5", double side, high density, MFM, 21 sectors/track (aka, Microsoft DMF)</summary>
+    // format byte
+    /// <summary>3.5", single side, double density, GCR</summary>
+    const byte kSonyFormat400K = 0x00;
+    /// <summary>3.5", double side, double density, GCR</summary>
+    const byte kSonyFormat800K = 0x01;
+    /// <summary>3.5", double side, double density, MFM</summary>
+    const byte kSonyFormat720K = 0x02;
+    /// <summary>3.5", double side, high density, MFM</summary>
+    const byte kSonyFormat1440K = 0x03;
+    /// <summary>3.5", double side, high density, MFM, 21 sectors/track (aka, Microsoft DMF)</summary>
 
-        // Unchecked value</summary>
-        const byte kSonyFormat1680K = 0x04;
-        /// <summary>Defined by Sigma Seven's BLU</summary>
-        const byte kSigmaFormatTwiggy = 0x54;
-        /// <summary>Defined by LisaEm</summary>
-        const byte kNotStandardFormat = 0x5D;
+    // Unchecked value</summary>
+    const byte kSonyFormat1680K = 0x04;
+    /// <summary>Defined by Sigma Seven's BLU</summary>
+    const byte kSigmaFormatTwiggy = 0x54;
+    /// <summary>Defined by LisaEm</summary>
+    const byte kNotStandardFormat = 0x5D;
 
-        // There should be a value for Apple HD20 hard disks, unknown...
-        // fmyByte byte
-        // Based on GCR nibble
-        // Always 0x02 for MFM disks
-        // Unknown for Apple HD20
-        /// <summary>Defined by Sigma Seven's BLU</summary>
-        const byte kSigmaFmtByteTwiggy = 0x01;
-        /// <summary>3.5" single side double density GCR and MFM all use same code</summary>
-        const byte kSonyFmtByte400K = 0x02;
-        const byte kSonyFmtByte720K  = kSonyFmtByte400K;
-        const byte kSonyFmtByte1440K = kSonyFmtByte400K;
-        const byte kSonyFmtByte1680K = kSonyFmtByte400K;
-        /// <summary>3.5" double side double density GCR, 512 bytes/sector, interleave 2:1</summary>
-        const byte kSonyFmtByte800K = 0x22;
-        /// <summary>
-        ///     3.5" double side double density GCR, 512 bytes/sector, interleave 2:1, incorrect value (but appears on
-        ///     official documentation)
-        /// </summary>
-        const byte kSonyFmtByte800KIncorrect = 0x12;
-        /// <summary>3.5" double side double density GCR, ProDOS format, interleave 4:1</summary>
-        const byte kSonyFmtByteProDos = 0x24;
-        /// <summary>Unformatted sectors</summary>
-        const byte kInvalidFmtByte = 0x96;
-        /// <summary>Defined by LisaEm</summary>
-        const byte kFmtNotStandard = 0x93;
-        /// <summary>Used incorrectly by Mac OS X with certaing disk images</summary>
-        const byte kMacOSXFmtByte = 0x00;
-        const string REGEX_DCPY = @"(?<application>\S+)\s(?<version>\S+)\rData checksum=\$(?<checksum>\S+)$";
-    }
+    // There should be a value for Apple HD20 hard disks, unknown...
+    // fmyByte byte
+    // Based on GCR nibble
+    // Always 0x02 for MFM disks
+    // Unknown for Apple HD20
+    /// <summary>Defined by Sigma Seven's BLU</summary>
+    const byte kSigmaFmtByteTwiggy = 0x01;
+    /// <summary>3.5" single side double density GCR and MFM all use same code</summary>
+    const byte kSonyFmtByte400K = 0x02;
+    const byte kSonyFmtByte720K  = kSonyFmtByte400K;
+    const byte kSonyFmtByte1440K = kSonyFmtByte400K;
+    const byte kSonyFmtByte1680K = kSonyFmtByte400K;
+    /// <summary>3.5" double side double density GCR, 512 bytes/sector, interleave 2:1</summary>
+    const byte kSonyFmtByte800K = 0x22;
+    /// <summary>
+    ///     3.5" double side double density GCR, 512 bytes/sector, interleave 2:1, incorrect value (but appears on
+    ///     official documentation)
+    /// </summary>
+    const byte kSonyFmtByte800KIncorrect = 0x12;
+    /// <summary>3.5" double side double density GCR, ProDOS format, interleave 4:1</summary>
+    const byte kSonyFmtByteProDos = 0x24;
+    /// <summary>Unformatted sectors</summary>
+    const byte kInvalidFmtByte = 0x96;
+    /// <summary>Defined by LisaEm</summary>
+    const byte kFmtNotStandard = 0x93;
+    /// <summary>Used incorrectly by Mac OS X with certaing disk images</summary>
+    const byte kMacOSXFmtByte = 0x00;
+    const string REGEX_DCPY = @"(?<application>\S+)\s(?<version>\S+)\rData checksum=\$(?<checksum>\S+)$";
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/DiskCopy42.cs b/Aaru.Images/DiskCopy42/DiskCopy42.cs
index 8648dfb74..771f2772a 100644
--- a/Aaru.Images/DiskCopy42/DiskCopy42.cs
+++ b/Aaru.Images/DiskCopy42/DiskCopy42.cs
@@ -37,53 +37,52 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+// Checked using several images and strings inside Apple's DiskImages.framework
+/// <summary>Implements reading and writing Apple DiskCopy 4.2 disk images</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed partial class DiskCopy42 : IWritableImage, IVerifiableImage
 {
-    // Checked using several images and strings inside Apple's DiskImages.framework
-    /// <summary>Implements reading and writing Apple DiskCopy 4.2 disk images</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed partial class DiskCopy42 : IWritableImage, IVerifiableImage
+    /// <summary>Bytes per tag, should be 12</summary>
+    uint bptag;
+    /// <summary>Start of data sectors in disk image, should be 0x58</summary>
+    uint dataOffset;
+    /// <summary>Disk image file</summary>
+    IFilter dc42ImageFilter;
+    /// <summary>Header of opened image</summary>
+    Header header;
+    ImageInfo imageInfo;
+    /// <summary>Start of tags in disk image, after data sectors</summary>
+    uint tagOffset;
+    bool       twiggy;
+    byte[]     twiggyCache;
+    byte[]     twiggyCacheTags;
+    FileStream writingStream;
+
+    public DiskCopy42() => imageInfo = new ImageInfo
     {
-        /// <summary>Bytes per tag, should be 12</summary>
-        uint bptag;
-        /// <summary>Start of data sectors in disk image, should be 0x58</summary>
-        uint dataOffset;
-        /// <summary>Disk image file</summary>
-        IFilter dc42ImageFilter;
-        /// <summary>Header of opened image</summary>
-        Header header;
-        ImageInfo imageInfo;
-        /// <summary>Start of tags in disk image, after data sectors</summary>
-        uint tagOffset;
-        bool       twiggy;
-        byte[]     twiggyCache;
-        byte[]     twiggyCacheTags;
-        FileStream writingStream;
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = "4.2",
+        Application           = "Apple DiskCopy",
+        ApplicationVersion    = "4.2",
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 
-        public DiskCopy42() => imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = "4.2",
-            Application           = "Apple DiskCopy",
-            ApplicationVersion    = "4.2",
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-
-        ~DiskCopy42() => Close();
-    }
+    ~DiskCopy42() => Close();
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Helpers.cs b/Aaru.Images/DiskCopy42/Helpers.cs
index 6b2511f71..11f9a300f 100644
--- a/Aaru.Images/DiskCopy42/Helpers.cs
+++ b/Aaru.Images/DiskCopy42/Helpers.cs
@@ -30,25 +30,24 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskCopy42
 {
-    public sealed partial class DiskCopy42
+    static uint CheckSum(byte[] buffer)
     {
-        static uint CheckSum(byte[] buffer)
+        uint dc42Chk = 0;
+
+        if((buffer.Length & 0x01) == 0x01)
+            return 0xFFFFFFFF;
+
+        for(uint i = 0; i < buffer.Length; i += 2)
         {
-            uint dc42Chk = 0;
-
-            if((buffer.Length & 0x01) == 0x01)
-                return 0xFFFFFFFF;
-
-            for(uint i = 0; i < buffer.Length; i += 2)
-            {
-                dc42Chk += (uint)(buffer[i] << 8);
-                dc42Chk += buffer[i + 1];
-                dc42Chk =  (dc42Chk >> 1) | (dc42Chk << 31);
-            }
-
-            return dc42Chk;
+            dc42Chk += (uint)(buffer[i] << 8);
+            dc42Chk += buffer[i + 1];
+            dc42Chk =  (dc42Chk >> 1) | (dc42Chk << 31);
         }
+
+        return dc42Chk;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Identify.cs b/Aaru.Images/DiskCopy42/Identify.cs
index 6100f2cb1..4269402a1 100644
--- a/Aaru.Images/DiskCopy42/Identify.cs
+++ b/Aaru.Images/DiskCopy42/Identify.cs
@@ -37,100 +37,99 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Claunia.Encoding;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskCopy42
 {
-    public sealed partial class DiskCopy42
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+        byte[] buffer  = new byte[0x58];
+        byte[] pString = new byte[64];
+        stream.Read(buffer, 0, 0x58);
+
+        // Incorrect pascal string length, not DC42
+        if(buffer[0] > 63)
+            return false;
+
+        var tmpHeader = new Header();
+
+        Array.Copy(buffer, 0, pString, 0, 64);
+
+        tmpHeader.DiskName     = StringHandlers.PascalToString(pString, Encoding.GetEncoding("macintosh"));
+        tmpHeader.DataSize     = BigEndianBitConverter.ToUInt32(buffer, 0x40);
+        tmpHeader.TagSize      = BigEndianBitConverter.ToUInt32(buffer, 0x44);
+        tmpHeader.DataChecksum = BigEndianBitConverter.ToUInt32(buffer, 0x48);
+        tmpHeader.TagChecksum  = BigEndianBitConverter.ToUInt32(buffer, 0x4C);
+        tmpHeader.Format       = buffer[0x50];
+        tmpHeader.FmtByte      = buffer[0x51];
+        tmpHeader.Valid        = buffer[0x52];
+        tmpHeader.Reserved     = buffer[0x53];
+
+        AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.diskName = \"{0}\"", tmpHeader.DiskName);
+        AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.dataSize = {0} bytes", tmpHeader.DataSize);
+        AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.tagSize = {0} bytes", tmpHeader.TagSize);
+        AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.dataChecksum = 0x{0:X8}", tmpHeader.DataChecksum);
+        AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.tagChecksum = 0x{0:X8}", tmpHeader.TagChecksum);
+        AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.format = 0x{0:X2}", tmpHeader.Format);
+        AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.fmtByte = 0x{0:X2}", tmpHeader.FmtByte);
+        AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.valid = {0}", tmpHeader.Valid);
+        AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.reserved = {0}", tmpHeader.Reserved);
+
+        if(tmpHeader.Valid    != 1 ||
+           tmpHeader.Reserved != 0)
+            return false;
+
+        // Some versions seem to incorrectly create little endian fields
+        if(tmpHeader.DataSize + tmpHeader.TagSize + 0x54 != imageFilter.DataForkLength &&
+           tmpHeader.Format                              != kSigmaFormatTwiggy)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
-            byte[] buffer  = new byte[0x58];
-            byte[] pString = new byte[64];
-            stream.Read(buffer, 0, 0x58);
+            tmpHeader.DataSize     = BitConverter.ToUInt32(buffer, 0x40);
+            tmpHeader.TagSize      = BitConverter.ToUInt32(buffer, 0x44);
+            tmpHeader.DataChecksum = BitConverter.ToUInt32(buffer, 0x48);
+            tmpHeader.TagChecksum  = BitConverter.ToUInt32(buffer, 0x4C);
 
-            // Incorrect pascal string length, not DC42
-            if(buffer[0] > 63)
-                return false;
-
-            var tmpHeader = new Header();
-
-            Array.Copy(buffer, 0, pString, 0, 64);
-
-            tmpHeader.DiskName     = StringHandlers.PascalToString(pString, Encoding.GetEncoding("macintosh"));
-            tmpHeader.DataSize     = BigEndianBitConverter.ToUInt32(buffer, 0x40);
-            tmpHeader.TagSize      = BigEndianBitConverter.ToUInt32(buffer, 0x44);
-            tmpHeader.DataChecksum = BigEndianBitConverter.ToUInt32(buffer, 0x48);
-            tmpHeader.TagChecksum  = BigEndianBitConverter.ToUInt32(buffer, 0x4C);
-            tmpHeader.Format       = buffer[0x50];
-            tmpHeader.FmtByte      = buffer[0x51];
-            tmpHeader.Valid        = buffer[0x52];
-            tmpHeader.Reserved     = buffer[0x53];
-
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.diskName = \"{0}\"", tmpHeader.DiskName);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.dataSize = {0} bytes", tmpHeader.DataSize);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.tagSize = {0} bytes", tmpHeader.TagSize);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.dataChecksum = 0x{0:X8}", tmpHeader.DataChecksum);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.tagChecksum = 0x{0:X8}", tmpHeader.TagChecksum);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.format = 0x{0:X2}", tmpHeader.Format);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.fmtByte = 0x{0:X2}", tmpHeader.FmtByte);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.valid = {0}", tmpHeader.Valid);
-            AaruConsole.DebugWriteLine("DC42 plugin", "tmp_header.reserved = {0}", tmpHeader.Reserved);
-
-            if(tmpHeader.Valid    != 1 ||
-               tmpHeader.Reserved != 0)
-                return false;
-
-            // Some versions seem to incorrectly create little endian fields
             if(tmpHeader.DataSize + tmpHeader.TagSize + 0x54 != imageFilter.DataForkLength &&
                tmpHeader.Format                              != kSigmaFormatTwiggy)
-            {
-                tmpHeader.DataSize     = BitConverter.ToUInt32(buffer, 0x40);
-                tmpHeader.TagSize      = BitConverter.ToUInt32(buffer, 0x44);
-                tmpHeader.DataChecksum = BitConverter.ToUInt32(buffer, 0x48);
-                tmpHeader.TagChecksum  = BitConverter.ToUInt32(buffer, 0x4C);
-
-                if(tmpHeader.DataSize + tmpHeader.TagSize + 0x54 != imageFilter.DataForkLength &&
-                   tmpHeader.Format                              != kSigmaFormatTwiggy)
-                    return false;
-            }
-
-            if(tmpHeader.Format != kSonyFormat400K    &&
-               tmpHeader.Format != kSonyFormat800K    &&
-               tmpHeader.Format != kSonyFormat720K    &&
-               tmpHeader.Format != kSonyFormat1440K   &&
-               tmpHeader.Format != kSonyFormat1680K   &&
-               tmpHeader.Format != kSigmaFormatTwiggy &&
-               tmpHeader.Format != kNotStandardFormat)
-            {
-                AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.format = 0x{0:X2} value",
-                                           tmpHeader.Format);
-
                 return false;
-            }
+        }
 
-            if(tmpHeader.FmtByte != kSonyFmtByte400K          &&
-               tmpHeader.FmtByte != kSonyFmtByte800K          &&
-               tmpHeader.FmtByte != kSonyFmtByte800KIncorrect &&
-               tmpHeader.FmtByte != kSonyFmtByteProDos        &&
-               tmpHeader.FmtByte != kInvalidFmtByte           &&
-               tmpHeader.FmtByte != kSigmaFmtByteTwiggy       &&
-               tmpHeader.FmtByte != kFmtNotStandard           &&
-               tmpHeader.FmtByte != kMacOSXFmtByte)
-            {
-                AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.fmtByte = 0x{0:X2} value",
-                                           tmpHeader.FmtByte);
-
-                return false;
-            }
-
-            if(tmpHeader.FmtByte != kInvalidFmtByte)
-                return true;
-
-            AaruConsole.DebugWriteLine("DC42 plugin", "Image says it's unformatted");
+        if(tmpHeader.Format != kSonyFormat400K    &&
+           tmpHeader.Format != kSonyFormat800K    &&
+           tmpHeader.Format != kSonyFormat720K    &&
+           tmpHeader.Format != kSonyFormat1440K   &&
+           tmpHeader.Format != kSonyFormat1680K   &&
+           tmpHeader.Format != kSigmaFormatTwiggy &&
+           tmpHeader.Format != kNotStandardFormat)
+        {
+            AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.format = 0x{0:X2} value",
+                                       tmpHeader.Format);
 
             return false;
         }
+
+        if(tmpHeader.FmtByte != kSonyFmtByte400K          &&
+           tmpHeader.FmtByte != kSonyFmtByte800K          &&
+           tmpHeader.FmtByte != kSonyFmtByte800KIncorrect &&
+           tmpHeader.FmtByte != kSonyFmtByteProDos        &&
+           tmpHeader.FmtByte != kInvalidFmtByte           &&
+           tmpHeader.FmtByte != kSigmaFmtByteTwiggy       &&
+           tmpHeader.FmtByte != kFmtNotStandard           &&
+           tmpHeader.FmtByte != kMacOSXFmtByte)
+        {
+            AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.fmtByte = 0x{0:X2} value",
+                                       tmpHeader.FmtByte);
+
+            return false;
+        }
+
+        if(tmpHeader.FmtByte != kInvalidFmtByte)
+            return true;
+
+        AaruConsole.DebugWriteLine("DC42 plugin", "Image says it's unformatted");
+
+        return false;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Properties.cs b/Aaru.Images/DiskCopy42/Properties.cs
index a889a6178..acad7d941 100644
--- a/Aaru.Images/DiskCopy42/Properties.cs
+++ b/Aaru.Images/DiskCopy42/Properties.cs
@@ -37,51 +37,50 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskCopy42
 {
-    public sealed partial class DiskCopy42
+    /// <inheritdoc />
+    public ImageInfo Info => imageInfo;
+    /// <inheritdoc />
+    public string Name => "Apple DiskCopy 4.2";
+    /// <inheritdoc />
+    public Guid Id => new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public string Format => "Apple DiskCopy 4.2";
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => imageInfo;
-        /// <inheritdoc />
-        public string Name => "Apple DiskCopy 4.2";
-        /// <inheritdoc />
-        public Guid Id => new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public string Format => "Apple DiskCopy 4.2";
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new[]
-        {
-            SectorTagType.AppleSectorTag
-        };
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.AppleFileWare, MediaType.AppleHD20, MediaType.AppleProfile, MediaType.AppleSonyDS,
-            MediaType.AppleSonySS, MediaType.AppleWidget, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, MediaType.DMF
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
-        {
-            ("macosx", typeof(bool), "Use Mac OS X format byte", (object)false)
-        };
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".dc42", ".diskcopy42", ".image"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+        SectorTagType.AppleSectorTag
+    };
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.AppleFileWare, MediaType.AppleHD20, MediaType.AppleProfile, MediaType.AppleSonyDS,
+        MediaType.AppleSonySS, MediaType.AppleWidget, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD, MediaType.DMF
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
+    {
+        ("macosx", typeof(bool), "Use Mac OS X format byte", (object)false)
+    };
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".dc42", ".diskcopy42", ".image"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Read.cs b/Aaru.Images/DiskCopy42/Read.cs
index deb449739..f65bdf411 100644
--- a/Aaru.Images/DiskCopy42/Read.cs
+++ b/Aaru.Images/DiskCopy42/Read.cs
@@ -42,531 +42,530 @@ using Claunia.Encoding;
 using Claunia.RsrcFork;
 using Version = Resources.Version;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskCopy42
 {
-    public sealed partial class DiskCopy42
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+        byte[] buffer  = new byte[0x58];
+        byte[] pString = new byte[64];
+        stream.Read(buffer, 0, 0x58);
+        IsWriting = false;
+
+        // Incorrect pascal string length, not DC42
+        if(buffer[0] > 63)
+            return ErrorNumber.InvalidArgument;
+
+        header = new Header();
+
+        Array.Copy(buffer, 0, pString, 0, 64);
+        header.DiskName     = StringHandlers.PascalToString(pString, Encoding.GetEncoding("macintosh"));
+        header.DataSize     = BigEndianBitConverter.ToUInt32(buffer, 0x40);
+        header.TagSize      = BigEndianBitConverter.ToUInt32(buffer, 0x44);
+        header.DataChecksum = BigEndianBitConverter.ToUInt32(buffer, 0x48);
+        header.TagChecksum  = BigEndianBitConverter.ToUInt32(buffer, 0x4C);
+        header.Format       = buffer[0x50];
+        header.FmtByte      = buffer[0x51];
+        header.Valid        = buffer[0x52];
+        header.Reserved     = buffer[0x53];
+
+        AaruConsole.DebugWriteLine("DC42 plugin", "header.diskName = \"{0}\"", header.DiskName);
+        AaruConsole.DebugWriteLine("DC42 plugin", "header.dataSize = {0} bytes", header.DataSize);
+        AaruConsole.DebugWriteLine("DC42 plugin", "header.tagSize = {0} bytes", header.TagSize);
+        AaruConsole.DebugWriteLine("DC42 plugin", "header.dataChecksum = 0x{0:X8}", header.DataChecksum);
+        AaruConsole.DebugWriteLine("DC42 plugin", "header.tagChecksum = 0x{0:X8}", header.TagChecksum);
+        AaruConsole.DebugWriteLine("DC42 plugin", "header.format = 0x{0:X2}", header.Format);
+        AaruConsole.DebugWriteLine("DC42 plugin", "header.fmtByte = 0x{0:X2}", header.FmtByte);
+        AaruConsole.DebugWriteLine("DC42 plugin", "header.valid = {0}", header.Valid);
+        AaruConsole.DebugWriteLine("DC42 plugin", "header.reserved = {0}", header.Reserved);
+
+        if(header.Valid    != 1 ||
+           header.Reserved != 0)
+            return ErrorNumber.InvalidArgument;
+
+        // Some versions seem to incorrectly create little endian fields
+        if(header.DataSize + header.TagSize + 0x54 != imageFilter.DataForkLength &&
+           header.Format                           != kSigmaFormatTwiggy)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
-            byte[] buffer  = new byte[0x58];
-            byte[] pString = new byte[64];
-            stream.Read(buffer, 0, 0x58);
-            IsWriting = false;
+            header.DataSize     = BitConverter.ToUInt32(buffer, 0x40);
+            header.TagSize      = BitConverter.ToUInt32(buffer, 0x44);
+            header.DataChecksum = BitConverter.ToUInt32(buffer, 0x48);
+            header.TagChecksum  = BitConverter.ToUInt32(buffer, 0x4C);
 
-            // Incorrect pascal string length, not DC42
-            if(buffer[0] > 63)
-                return ErrorNumber.InvalidArgument;
-
-            header = new Header();
-
-            Array.Copy(buffer, 0, pString, 0, 64);
-            header.DiskName     = StringHandlers.PascalToString(pString, Encoding.GetEncoding("macintosh"));
-            header.DataSize     = BigEndianBitConverter.ToUInt32(buffer, 0x40);
-            header.TagSize      = BigEndianBitConverter.ToUInt32(buffer, 0x44);
-            header.DataChecksum = BigEndianBitConverter.ToUInt32(buffer, 0x48);
-            header.TagChecksum  = BigEndianBitConverter.ToUInt32(buffer, 0x4C);
-            header.Format       = buffer[0x50];
-            header.FmtByte      = buffer[0x51];
-            header.Valid        = buffer[0x52];
-            header.Reserved     = buffer[0x53];
-
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.diskName = \"{0}\"", header.DiskName);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.dataSize = {0} bytes", header.DataSize);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.tagSize = {0} bytes", header.TagSize);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.dataChecksum = 0x{0:X8}", header.DataChecksum);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.tagChecksum = 0x{0:X8}", header.TagChecksum);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.format = 0x{0:X2}", header.Format);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.fmtByte = 0x{0:X2}", header.FmtByte);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.valid = {0}", header.Valid);
-            AaruConsole.DebugWriteLine("DC42 plugin", "header.reserved = {0}", header.Reserved);
-
-            if(header.Valid    != 1 ||
-               header.Reserved != 0)
-                return ErrorNumber.InvalidArgument;
-
-            // Some versions seem to incorrectly create little endian fields
             if(header.DataSize + header.TagSize + 0x54 != imageFilter.DataForkLength &&
                header.Format                           != kSigmaFormatTwiggy)
-            {
-                header.DataSize     = BitConverter.ToUInt32(buffer, 0x40);
-                header.TagSize      = BitConverter.ToUInt32(buffer, 0x44);
-                header.DataChecksum = BitConverter.ToUInt32(buffer, 0x48);
-                header.TagChecksum  = BitConverter.ToUInt32(buffer, 0x4C);
-
-                if(header.DataSize + header.TagSize + 0x54 != imageFilter.DataForkLength &&
-                   header.Format                           != kSigmaFormatTwiggy)
-                    return ErrorNumber.InvalidArgument;
-            }
-
-            if(header.Format != kSonyFormat400K    &&
-               header.Format != kSonyFormat800K    &&
-               header.Format != kSonyFormat720K    &&
-               header.Format != kSonyFormat1440K   &&
-               header.Format != kSonyFormat1680K   &&
-               header.Format != kSigmaFormatTwiggy &&
-               header.Format != kNotStandardFormat)
-            {
-                AaruConsole.DebugWriteLine("DC42 plugin", "Unknown header.format = 0x{0:X2} value", header.Format);
-
-                return ErrorNumber.NotSupported;
-            }
-
-            if(header.FmtByte != kSonyFmtByte400K          &&
-               header.FmtByte != kSonyFmtByte800K          &&
-               header.FmtByte != kSonyFmtByte800KIncorrect &&
-               header.FmtByte != kSonyFmtByteProDos        &&
-               header.FmtByte != kInvalidFmtByte           &&
-               header.FmtByte != kSigmaFmtByteTwiggy       &&
-               header.FmtByte != kFmtNotStandard           &&
-               header.FmtByte != kMacOSXFmtByte)
-            {
-                AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.fmtByte = 0x{0:X2} value",
-                                           header.FmtByte);
-
-                return ErrorNumber.NotSupported;
-            }
-
-            if(header.FmtByte == kInvalidFmtByte)
-            {
-                AaruConsole.DebugWriteLine("DC42 plugin", "Image says it's unformatted");
-
                 return ErrorNumber.InvalidArgument;
-            }
-
-            dataOffset           = 0x54;
-            tagOffset            = header.TagSize != 0 ? 0x54 + header.DataSize : 0;
-            imageInfo.SectorSize = 512;
-            bptag                = (uint)(header.TagSize != 0 ? 12 : 0);
-            dc42ImageFilter      = imageFilter;
-
-            imageInfo.Sectors = header.DataSize / 512;
-
-            if(header.TagSize != 0)
-            {
-                bptag = (uint)(header.TagSize / imageInfo.Sectors);
-                AaruConsole.DebugWriteLine("DC42 plugin", "bptag = {0} bytes", bptag);
-
-                if(bptag != 12 &&
-                   bptag != 20 &&
-                   bptag != 24)
-                {
-                    AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tag size");
-
-                    return ErrorNumber.NotSupported;
-                }
-
-                imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
-            }
-
-            imageInfo.ImageSize            = (imageInfo.Sectors * imageInfo.SectorSize) + (imageInfo.Sectors * bptag);
-            imageInfo.CreationTime         = imageFilter.CreationTime;
-            imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            imageInfo.MediaTitle           = header.DiskName;
-
-            switch(header.Format)
-            {
-                case kSonyFormat400K:
-                    imageInfo.MediaType = imageInfo.Sectors == 1600 ? MediaType.AppleSonyDS : MediaType.AppleSonySS;
-
-                    break;
-                case kSonyFormat800K:
-                    imageInfo.MediaType = MediaType.AppleSonyDS;
-
-                    break;
-                case kSonyFormat720K:
-                    imageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
-
-                    break;
-                case kSonyFormat1440K:
-                    imageInfo.MediaType = MediaType.DOS_35_HD;
-
-                    break;
-                case kSonyFormat1680K:
-                    imageInfo.MediaType = MediaType.DMF;
-
-                    break;
-                case kSigmaFormatTwiggy:
-                    imageInfo.MediaType = MediaType.AppleFileWare;
-
-                    break;
-                case kNotStandardFormat:
-                    switch(imageInfo.Sectors)
-                    {
-                        case 9728:
-                            imageInfo.MediaType = MediaType.AppleProfile;
-
-                            break;
-                        case 19456:
-                            imageInfo.MediaType = MediaType.AppleProfile;
-
-                            break;
-                        case 38912:
-                            imageInfo.MediaType = MediaType.AppleWidget;
-
-                            break;
-                        case 39040:
-                            imageInfo.MediaType = MediaType.AppleHD20;
-
-                            break;
-                        default:
-                            imageInfo.MediaType = MediaType.Unknown;
-
-                            break;
-                    }
-
-                    break;
-                default:
-                    imageInfo.MediaType = MediaType.Unknown;
-
-                    break;
-            }
-
-            if(imageInfo.MediaType == MediaType.AppleFileWare)
-            {
-                byte[] data = new byte[header.DataSize];
-                byte[] tags = new byte[header.TagSize];
-
-                twiggyCache     = new byte[header.DataSize];
-                twiggyCacheTags = new byte[header.TagSize];
-                twiggy          = true;
-
-                Stream dataStream = imageFilter.GetDataForkStream();
-                dataStream.Seek(dataOffset, SeekOrigin.Begin);
-                dataStream.Read(data, 0, (int)header.DataSize);
-
-                Stream tagStream = imageFilter.GetDataForkStream();
-                tagStream.Seek(tagOffset, SeekOrigin.Begin);
-                tagStream.Read(tags, 0, (int)header.TagSize);
-
-                ushort mfsMagic     = BigEndianBitConverter.ToUInt16(data, (data.Length / 2) + 0x400);
-                ushort mfsAllBlocks = BigEndianBitConverter.ToUInt16(data, (data.Length / 2) + 0x412);
-
-                // Detect a Macintosh Twiggy
-                if(mfsMagic     == 0xD2D7 &&
-                   mfsAllBlocks == 422)
-                {
-                    AaruConsole.DebugWriteLine("DC42 plugin", "Macintosh Twiggy detected, reversing disk sides");
-                    Array.Copy(data, header.DataSize                    / 2, twiggyCache, 0, header.DataSize    / 2);
-                    Array.Copy(tags, header.TagSize                     / 2, twiggyCacheTags, 0, header.TagSize / 2);
-                    Array.Copy(data, 0, twiggyCache, header.DataSize    / 2, header.DataSize                    / 2);
-                    Array.Copy(tags, 0, twiggyCacheTags, header.TagSize / 2, header.TagSize                     / 2);
-                }
-                else
-                {
-                    AaruConsole.DebugWriteLine("DC42 plugin", "Lisa Twiggy detected, reversing second half of disk");
-                    Array.Copy(data, 0, twiggyCache, 0, header.DataSize    / 2);
-                    Array.Copy(tags, 0, twiggyCacheTags, 0, header.TagSize / 2);
-
-                    int copiedSectors = 0;
-                    int sectorsToCopy = 0;
-
-                    for(int i = 0; i < 46; i++)
-                    {
-                        if(i >= 0 &&
-                           i <= 3)
-                            sectorsToCopy = 22;
-
-                        if(i >= 4 &&
-                           i <= 10)
-                            sectorsToCopy = 21;
-
-                        if(i >= 11 &&
-                           i <= 16)
-                            sectorsToCopy = 20;
-
-                        if(i >= 17 &&
-                           i <= 22)
-                            sectorsToCopy = 19;
-
-                        if(i >= 23 &&
-                           i <= 28)
-                            sectorsToCopy = 18;
-
-                        if(i >= 29 &&
-                           i <= 34)
-                            sectorsToCopy = 17;
-
-                        if(i >= 35 &&
-                           i <= 41)
-                            sectorsToCopy = 16;
-
-                        if(i >= 42 &&
-                           i <= 45)
-                            sectorsToCopy = 15;
-
-                        Array.Copy(data, (header.DataSize / 2) + (copiedSectors * 512), twiggyCache,
-                                   twiggyCache.Length          - (copiedSectors * 512) - (sectorsToCopy * 512),
-                                   sectorsToCopy * 512);
-
-                        Array.Copy(tags, (header.TagSize / 2) + (copiedSectors * bptag), twiggyCacheTags,
-                                   twiggyCacheTags.Length     - (copiedSectors * bptag) - (sectorsToCopy * bptag),
-                                   sectorsToCopy * bptag);
-
-                        copiedSectors += sectorsToCopy;
-                    }
-                }
-            }
-
-            try
-            {
-                if(imageFilter.HasResourceFork)
-                {
-                    var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
-
-                    if(rsrcFork.ContainsKey(0x76657273))
-                    {
-                        Resource versRsrc = rsrcFork.GetResource(0x76657273);
-
-                        byte[] vers = versRsrc?.GetResource(versRsrc.GetIds()[0]);
-
-                        if(vers != null)
-                        {
-                            var version = new Version(vers);
-
-                            string release = null;
-                            string dev     = null;
-                            string pre     = null;
-
-                            string major = $"{version.MajorVersion}";
-                            string minor = $".{version.MinorVersion / 10}";
-
-                            if(version.MinorVersion % 10 > 0)
-                                release = $".{version.MinorVersion % 10}";
-
-                            switch(version.DevStage)
-                            {
-                                case Version.DevelopmentStage.Alpha:
-                                    dev = "a";
-
-                                    break;
-                                case Version.DevelopmentStage.Beta:
-                                    dev = "b";
-
-                                    break;
-                                case Version.DevelopmentStage.PreAlpha:
-                                    dev = "d";
-
-                                    break;
-                            }
-
-                            if(dev                       == null &&
-                               version.PreReleaseVersion > 0)
-                                dev = "f";
-
-                            if(dev != null)
-                                pre = $"{version.PreReleaseVersion}";
-
-                            imageInfo.ApplicationVersion = $"{major}{minor}{release}{dev}{pre}";
-                            imageInfo.Application        = version.VersionString;
-                            imageInfo.Comments           = version.VersionMessage;
-                        }
-                    }
-
-                    if(rsrcFork.ContainsKey(0x64437079))
-                    {
-                        Resource dCpyRsrc = rsrcFork.GetResource(0x64437079);
-
-                        if(dCpyRsrc != null)
-                        {
-                            string dCpy = StringHandlers.PascalToString(dCpyRsrc.GetResource(dCpyRsrc.GetIds()[0]),
-                                                                        Encoding.GetEncoding("macintosh"));
-
-                            var   dCpyEx    = new Regex(REGEX_DCPY);
-                            Match dCpyMatch = dCpyEx.Match(dCpy);
-
-                            if(dCpyMatch.Success)
-                            {
-                                imageInfo.Application        = dCpyMatch.Groups["application"].Value;
-                                imageInfo.ApplicationVersion = dCpyMatch.Groups["version"].Value;
-                            }
-                        }
-                    }
-                }
-            }
-            catch(InvalidCastException) {}
-
-            AaruConsole.DebugWriteLine("DC42 plugin", "Image application = {0} version {1}", imageInfo.Application,
-                                       imageInfo.ApplicationVersion);
-
-            imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-            AaruConsole.VerboseWriteLine("DiskCopy 4.2 image contains a disk of type {0}", imageInfo.MediaType);
-
-            switch(imageInfo.MediaType)
-            {
-                case MediaType.AppleSonySS:
-                    imageInfo.Cylinders       = 80;
-                    imageInfo.Heads           = 1;
-                    imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.AppleSonyDS:
-                    imageInfo.Cylinders       = 80;
-                    imageInfo.Heads           = 2;
-                    imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.DOS_35_DS_DD_9:
-                    imageInfo.Cylinders       = 80;
-                    imageInfo.Heads           = 2;
-                    imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.DOS_35_HD:
-                    imageInfo.Cylinders       = 80;
-                    imageInfo.Heads           = 2;
-                    imageInfo.SectorsPerTrack = 18;
-
-                    break;
-                case MediaType.DMF:
-                    imageInfo.Cylinders       = 80;
-                    imageInfo.Heads           = 2;
-                    imageInfo.SectorsPerTrack = 21;
-
-                    break;
-                case MediaType.AppleProfile:
-                    switch(imageInfo.Sectors)
-                    {
-                        case 9728:
-                            imageInfo.Cylinders = 152;
-
-                            break;
-                        case 19456:
-                            imageInfo.Cylinders = 304;
-
-                            break;
-                    }
-
-                    imageInfo.Heads           = 4;
-                    imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.AppleWidget:
-                    imageInfo.Cylinders       = 608;
-                    imageInfo.Heads           = 2;
-                    imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.AppleHD20:
-                    imageInfo.Cylinders       = 610;
-                    imageInfo.Heads           = 2;
-                    imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                default:
-                    imageInfo.Cylinders       = (uint)(imageInfo.Sectors / 16 / 63);
-                    imageInfo.Heads           = 16;
-                    imageInfo.SectorsPerTrack = 63;
-
-                    break;
-            }
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        if(header.Format != kSonyFormat400K    &&
+           header.Format != kSonyFormat800K    &&
+           header.Format != kSonyFormat720K    &&
+           header.Format != kSonyFormat1440K   &&
+           header.Format != kSonyFormat1680K   &&
+           header.Format != kSigmaFormatTwiggy &&
+           header.Format != kNotStandardFormat)
         {
-            buffer = null;
+            AaruConsole.DebugWriteLine("DC42 plugin", "Unknown header.format = 0x{0:X2} value", header.Format);
 
-            if(sectorAddress > imageInfo.Sectors - 1)
-                return ErrorNumber.SectorNotFound;
-
-            if(sectorAddress + length > imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            buffer = new byte[length * imageInfo.SectorSize];
-
-            if(twiggy)
-                Array.Copy(twiggyCache, (int)sectorAddress * imageInfo.SectorSize, buffer, 0,
-                           length                          * imageInfo.SectorSize);
-            else
-            {
-                Stream stream = dc42ImageFilter.GetDataForkStream();
-                stream.Seek((long)(dataOffset + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
-                stream.Read(buffer, 0, (int)(length * imageInfo.SectorSize));
-            }
-
-            return ErrorNumber.NoError;
+            return ErrorNumber.NotSupported;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+        if(header.FmtByte != kSonyFmtByte400K          &&
+           header.FmtByte != kSonyFmtByte800K          &&
+           header.FmtByte != kSonyFmtByte800KIncorrect &&
+           header.FmtByte != kSonyFmtByteProDos        &&
+           header.FmtByte != kInvalidFmtByte           &&
+           header.FmtByte != kSigmaFmtByteTwiggy       &&
+           header.FmtByte != kFmtNotStandard           &&
+           header.FmtByte != kMacOSXFmtByte)
         {
-            buffer = null;
+            AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tmp_header.fmtByte = 0x{0:X2} value",
+                                       header.FmtByte);
+
+            return ErrorNumber.NotSupported;
+        }
+
+        if(header.FmtByte == kInvalidFmtByte)
+        {
+            AaruConsole.DebugWriteLine("DC42 plugin", "Image says it's unformatted");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        dataOffset           = 0x54;
+        tagOffset            = header.TagSize != 0 ? 0x54 + header.DataSize : 0;
+        imageInfo.SectorSize = 512;
+        bptag                = (uint)(header.TagSize != 0 ? 12 : 0);
+        dc42ImageFilter      = imageFilter;
+
+        imageInfo.Sectors = header.DataSize / 512;
+
+        if(header.TagSize != 0)
+        {
+            bptag = (uint)(header.TagSize / imageInfo.Sectors);
+            AaruConsole.DebugWriteLine("DC42 plugin", "bptag = {0} bytes", bptag);
+
+            if(bptag != 12 &&
+               bptag != 20 &&
+               bptag != 24)
+            {
+                AaruConsole.DebugWriteLine("DC42 plugin", "Unknown tag size");
 
-            if(tag != SectorTagType.AppleSectorTag)
                 return ErrorNumber.NotSupported;
+            }
 
-            if(header.TagSize == 0)
-                return ErrorNumber.NoData;
+            imageInfo.ReadableSectorTags.Add(SectorTagType.AppleSectorTag);
+        }
 
-            if(sectorAddress > imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+        imageInfo.ImageSize            = (imageInfo.Sectors * imageInfo.SectorSize) + (imageInfo.Sectors * bptag);
+        imageInfo.CreationTime         = imageFilter.CreationTime;
+        imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        imageInfo.MediaTitle           = header.DiskName;
 
-            if(sectorAddress + length > imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+        switch(header.Format)
+        {
+            case kSonyFormat400K:
+                imageInfo.MediaType = imageInfo.Sectors == 1600 ? MediaType.AppleSonyDS : MediaType.AppleSonySS;
 
-            buffer = new byte[length * bptag];
+                break;
+            case kSonyFormat800K:
+                imageInfo.MediaType = MediaType.AppleSonyDS;
 
-            if(twiggy)
-                Array.Copy(twiggyCacheTags, (int)sectorAddress * bptag, buffer, 0, length * bptag);
+                break;
+            case kSonyFormat720K:
+                imageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
+
+                break;
+            case kSonyFormat1440K:
+                imageInfo.MediaType = MediaType.DOS_35_HD;
+
+                break;
+            case kSonyFormat1680K:
+                imageInfo.MediaType = MediaType.DMF;
+
+                break;
+            case kSigmaFormatTwiggy:
+                imageInfo.MediaType = MediaType.AppleFileWare;
+
+                break;
+            case kNotStandardFormat:
+                switch(imageInfo.Sectors)
+                {
+                    case 9728:
+                        imageInfo.MediaType = MediaType.AppleProfile;
+
+                        break;
+                    case 19456:
+                        imageInfo.MediaType = MediaType.AppleProfile;
+
+                        break;
+                    case 38912:
+                        imageInfo.MediaType = MediaType.AppleWidget;
+
+                        break;
+                    case 39040:
+                        imageInfo.MediaType = MediaType.AppleHD20;
+
+                        break;
+                    default:
+                        imageInfo.MediaType = MediaType.Unknown;
+
+                        break;
+                }
+
+                break;
+            default:
+                imageInfo.MediaType = MediaType.Unknown;
+
+                break;
+        }
+
+        if(imageInfo.MediaType == MediaType.AppleFileWare)
+        {
+            byte[] data = new byte[header.DataSize];
+            byte[] tags = new byte[header.TagSize];
+
+            twiggyCache     = new byte[header.DataSize];
+            twiggyCacheTags = new byte[header.TagSize];
+            twiggy          = true;
+
+            Stream dataStream = imageFilter.GetDataForkStream();
+            dataStream.Seek(dataOffset, SeekOrigin.Begin);
+            dataStream.Read(data, 0, (int)header.DataSize);
+
+            Stream tagStream = imageFilter.GetDataForkStream();
+            tagStream.Seek(tagOffset, SeekOrigin.Begin);
+            tagStream.Read(tags, 0, (int)header.TagSize);
+
+            ushort mfsMagic     = BigEndianBitConverter.ToUInt16(data, (data.Length / 2) + 0x400);
+            ushort mfsAllBlocks = BigEndianBitConverter.ToUInt16(data, (data.Length / 2) + 0x412);
+
+            // Detect a Macintosh Twiggy
+            if(mfsMagic     == 0xD2D7 &&
+               mfsAllBlocks == 422)
+            {
+                AaruConsole.DebugWriteLine("DC42 plugin", "Macintosh Twiggy detected, reversing disk sides");
+                Array.Copy(data, header.DataSize                    / 2, twiggyCache, 0, header.DataSize    / 2);
+                Array.Copy(tags, header.TagSize                     / 2, twiggyCacheTags, 0, header.TagSize / 2);
+                Array.Copy(data, 0, twiggyCache, header.DataSize    / 2, header.DataSize                    / 2);
+                Array.Copy(tags, 0, twiggyCacheTags, header.TagSize / 2, header.TagSize                     / 2);
+            }
             else
             {
-                Stream stream = dc42ImageFilter.GetDataForkStream();
-                stream.Seek((long)(tagOffset + (sectorAddress * bptag)), SeekOrigin.Begin);
-                stream.Read(buffer, 0, (int)(length * bptag));
-            }
+                AaruConsole.DebugWriteLine("DC42 plugin", "Lisa Twiggy detected, reversing second half of disk");
+                Array.Copy(data, 0, twiggyCache, 0, header.DataSize    / 2);
+                Array.Copy(tags, 0, twiggyCacheTags, 0, header.TagSize / 2);
 
-            return ErrorNumber.NoError;
+                int copiedSectors = 0;
+                int sectorsToCopy = 0;
+
+                for(int i = 0; i < 46; i++)
+                {
+                    if(i >= 0 &&
+                       i <= 3)
+                        sectorsToCopy = 22;
+
+                    if(i >= 4 &&
+                       i <= 10)
+                        sectorsToCopy = 21;
+
+                    if(i >= 11 &&
+                       i <= 16)
+                        sectorsToCopy = 20;
+
+                    if(i >= 17 &&
+                       i <= 22)
+                        sectorsToCopy = 19;
+
+                    if(i >= 23 &&
+                       i <= 28)
+                        sectorsToCopy = 18;
+
+                    if(i >= 29 &&
+                       i <= 34)
+                        sectorsToCopy = 17;
+
+                    if(i >= 35 &&
+                       i <= 41)
+                        sectorsToCopy = 16;
+
+                    if(i >= 42 &&
+                       i <= 45)
+                        sectorsToCopy = 15;
+
+                    Array.Copy(data, (header.DataSize / 2) + (copiedSectors * 512), twiggyCache,
+                               twiggyCache.Length          - (copiedSectors * 512) - (sectorsToCopy * 512),
+                               sectorsToCopy * 512);
+
+                    Array.Copy(tags, (header.TagSize / 2) + (copiedSectors * bptag), twiggyCacheTags,
+                               twiggyCacheTags.Length     - (copiedSectors * bptag) - (sectorsToCopy * bptag),
+                               sectorsToCopy * bptag);
+
+                    copiedSectors += sectorsToCopy;
+                }
+            }
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+        try
         {
-            buffer = null;
-
-            if(sectorAddress > imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            ErrorNumber errno = ReadSectors(sectorAddress, length, out byte[] data);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            errno = ReadSectorsTag(sectorAddress, length, SectorTagType.AppleSectorTag, out byte[] tags);
-
-            if(errno != ErrorNumber.NoError)
-                return errno;
-
-            buffer = new byte[data.Length + tags.Length];
-
-            for(uint i = 0; i < length; i++)
+            if(imageFilter.HasResourceFork)
             {
-                Array.Copy(data, i * imageInfo.SectorSize, buffer, i * (imageInfo.SectorSize + bptag),
-                           imageInfo.SectorSize);
+                var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
 
-                Array.Copy(tags, i * bptag, buffer, (i * (imageInfo.SectorSize + bptag)) + imageInfo.SectorSize, bptag);
+                if(rsrcFork.ContainsKey(0x76657273))
+                {
+                    Resource versRsrc = rsrcFork.GetResource(0x76657273);
+
+                    byte[] vers = versRsrc?.GetResource(versRsrc.GetIds()[0]);
+
+                    if(vers != null)
+                    {
+                        var version = new Version(vers);
+
+                        string release = null;
+                        string dev     = null;
+                        string pre     = null;
+
+                        string major = $"{version.MajorVersion}";
+                        string minor = $".{version.MinorVersion / 10}";
+
+                        if(version.MinorVersion % 10 > 0)
+                            release = $".{version.MinorVersion % 10}";
+
+                        switch(version.DevStage)
+                        {
+                            case Version.DevelopmentStage.Alpha:
+                                dev = "a";
+
+                                break;
+                            case Version.DevelopmentStage.Beta:
+                                dev = "b";
+
+                                break;
+                            case Version.DevelopmentStage.PreAlpha:
+                                dev = "d";
+
+                                break;
+                        }
+
+                        if(dev                       == null &&
+                           version.PreReleaseVersion > 0)
+                            dev = "f";
+
+                        if(dev != null)
+                            pre = $"{version.PreReleaseVersion}";
+
+                        imageInfo.ApplicationVersion = $"{major}{minor}{release}{dev}{pre}";
+                        imageInfo.Application        = version.VersionString;
+                        imageInfo.Comments           = version.VersionMessage;
+                    }
+                }
+
+                if(rsrcFork.ContainsKey(0x64437079))
+                {
+                    Resource dCpyRsrc = rsrcFork.GetResource(0x64437079);
+
+                    if(dCpyRsrc != null)
+                    {
+                        string dCpy = StringHandlers.PascalToString(dCpyRsrc.GetResource(dCpyRsrc.GetIds()[0]),
+                                                                    Encoding.GetEncoding("macintosh"));
+
+                        var   dCpyEx    = new Regex(REGEX_DCPY);
+                        Match dCpyMatch = dCpyEx.Match(dCpy);
+
+                        if(dCpyMatch.Success)
+                        {
+                            imageInfo.Application        = dCpyMatch.Groups["application"].Value;
+                            imageInfo.ApplicationVersion = dCpyMatch.Groups["version"].Value;
+                        }
+                    }
+                }
             }
-
-            return ErrorNumber.NoError;
         }
+        catch(InvalidCastException) {}
+
+        AaruConsole.DebugWriteLine("DC42 plugin", "Image application = {0} version {1}", imageInfo.Application,
+                                   imageInfo.ApplicationVersion);
+
+        imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+        AaruConsole.VerboseWriteLine("DiskCopy 4.2 image contains a disk of type {0}", imageInfo.MediaType);
+
+        switch(imageInfo.MediaType)
+        {
+            case MediaType.AppleSonySS:
+                imageInfo.Cylinders       = 80;
+                imageInfo.Heads           = 1;
+                imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.AppleSonyDS:
+                imageInfo.Cylinders       = 80;
+                imageInfo.Heads           = 2;
+                imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.DOS_35_DS_DD_9:
+                imageInfo.Cylinders       = 80;
+                imageInfo.Heads           = 2;
+                imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case MediaType.DOS_35_HD:
+                imageInfo.Cylinders       = 80;
+                imageInfo.Heads           = 2;
+                imageInfo.SectorsPerTrack = 18;
+
+                break;
+            case MediaType.DMF:
+                imageInfo.Cylinders       = 80;
+                imageInfo.Heads           = 2;
+                imageInfo.SectorsPerTrack = 21;
+
+                break;
+            case MediaType.AppleProfile:
+                switch(imageInfo.Sectors)
+                {
+                    case 9728:
+                        imageInfo.Cylinders = 152;
+
+                        break;
+                    case 19456:
+                        imageInfo.Cylinders = 304;
+
+                        break;
+                }
+
+                imageInfo.Heads           = 4;
+                imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.AppleWidget:
+                imageInfo.Cylinders       = 608;
+                imageInfo.Heads           = 2;
+                imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.AppleHD20:
+                imageInfo.Cylinders       = 610;
+                imageInfo.Heads           = 2;
+                imageInfo.SectorsPerTrack = 16;
+
+                break;
+            default:
+                imageInfo.Cylinders       = (uint)(imageInfo.Sectors / 16 / 63);
+                imageInfo.Heads           = 16;
+                imageInfo.SectorsPerTrack = 63;
+
+                break;
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > imageInfo.Sectors - 1)
+            return ErrorNumber.SectorNotFound;
+
+        if(sectorAddress + length > imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * imageInfo.SectorSize];
+
+        if(twiggy)
+            Array.Copy(twiggyCache, (int)sectorAddress * imageInfo.SectorSize, buffer, 0,
+                       length                          * imageInfo.SectorSize);
+        else
+        {
+            Stream stream = dc42ImageFilter.GetDataForkStream();
+            stream.Seek((long)(dataOffset + (sectorAddress * imageInfo.SectorSize)), SeekOrigin.Begin);
+            stream.Read(buffer, 0, (int)(length * imageInfo.SectorSize));
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag != SectorTagType.AppleSectorTag)
+            return ErrorNumber.NotSupported;
+
+        if(header.TagSize == 0)
+            return ErrorNumber.NoData;
+
+        if(sectorAddress > imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * bptag];
+
+        if(twiggy)
+            Array.Copy(twiggyCacheTags, (int)sectorAddress * bptag, buffer, 0, length * bptag);
+        else
+        {
+            Stream stream = dc42ImageFilter.GetDataForkStream();
+            stream.Seek((long)(tagOffset + (sectorAddress * bptag)), SeekOrigin.Begin);
+            stream.Read(buffer, 0, (int)(length * bptag));
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        ErrorNumber errno = ReadSectors(sectorAddress, length, out byte[] data);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        errno = ReadSectorsTag(sectorAddress, length, SectorTagType.AppleSectorTag, out byte[] tags);
+
+        if(errno != ErrorNumber.NoError)
+            return errno;
+
+        buffer = new byte[data.Length + tags.Length];
+
+        for(uint i = 0; i < length; i++)
+        {
+            Array.Copy(data, i * imageInfo.SectorSize, buffer, i * (imageInfo.SectorSize + bptag),
+                       imageInfo.SectorSize);
+
+            Array.Copy(tags, i * bptag, buffer, (i * (imageInfo.SectorSize + bptag)) + imageInfo.SectorSize, bptag);
+        }
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Structs.cs b/Aaru.Images/DiskCopy42/Structs.cs
index 4da12bcf1..178929ba6 100644
--- a/Aaru.Images/DiskCopy42/Structs.cs
+++ b/Aaru.Images/DiskCopy42/Structs.cs
@@ -30,31 +30,30 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskCopy42
 {
-    public sealed partial class DiskCopy42
+    // DiskCopy 4.2 header, big-endian, data-fork, start of file, 84 bytes
+    struct Header
     {
-        // DiskCopy 4.2 header, big-endian, data-fork, start of file, 84 bytes
-        struct Header
-        {
-            /// <summary>0x00, 64 bytes, pascal string, disk name or "-not a Macintosh disk-", filled with garbage</summary>
-            public string DiskName;
-            /// <summary>0x40, size of data in bytes (usually sectors*512)</summary>
-            public uint DataSize;
-            /// <summary>0x44, size of tags in bytes (usually sectors*12)</summary>
-            public uint TagSize;
-            /// <summary>0x48, checksum of data bytes</summary>
-            public uint DataChecksum;
-            /// <summary>0x4C, checksum of tag bytes</summary>
-            public uint TagChecksum;
-            /// <summary>0x50, format of disk, see constants</summary>
-            public byte Format;
-            /// <summary>0x51, format of sectors, see constants</summary>
-            public byte FmtByte;
-            /// <summary>0x52, is disk image valid? always 0x01</summary>
-            public byte Valid;
-            /// <summary>0x53, reserved, always 0x00</summary>
-            public byte Reserved;
-        }
+        /// <summary>0x00, 64 bytes, pascal string, disk name or "-not a Macintosh disk-", filled with garbage</summary>
+        public string DiskName;
+        /// <summary>0x40, size of data in bytes (usually sectors*512)</summary>
+        public uint DataSize;
+        /// <summary>0x44, size of tags in bytes (usually sectors*12)</summary>
+        public uint TagSize;
+        /// <summary>0x48, checksum of data bytes</summary>
+        public uint DataChecksum;
+        /// <summary>0x4C, checksum of tag bytes</summary>
+        public uint TagChecksum;
+        /// <summary>0x50, format of disk, see constants</summary>
+        public byte Format;
+        /// <summary>0x51, format of sectors, see constants</summary>
+        public byte FmtByte;
+        /// <summary>0x52, is disk image valid? always 0x01</summary>
+        public byte Valid;
+        /// <summary>0x53, reserved, always 0x00</summary>
+        public byte Reserved;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Unsupported.cs b/Aaru.Images/DiskCopy42/Unsupported.cs
index a4f2af7af..ba3364547 100644
--- a/Aaru.Images/DiskCopy42/Unsupported.cs
+++ b/Aaru.Images/DiskCopy42/Unsupported.cs
@@ -32,16 +32,15 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class DiskCopy42
-    {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+namespace Aaru.DiscImages;
 
-            return ErrorNumber.NotSupported;
-        }
+public sealed partial class DiskCopy42
+{
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Verify.cs b/Aaru.Images/DiskCopy42/Verify.cs
index 0b2251fe2..6a6ecf465 100644
--- a/Aaru.Images/DiskCopy42/Verify.cs
+++ b/Aaru.Images/DiskCopy42/Verify.cs
@@ -33,41 +33,40 @@
 using System.IO;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskCopy42
 {
-    public sealed partial class DiskCopy42
+    /// <inheritdoc />
+    public bool? VerifyMediaImage()
     {
-        /// <inheritdoc />
-        public bool? VerifyMediaImage()
-        {
-            byte[] data    = new byte[header.DataSize];
-            byte[] tags    = new byte[header.TagSize];
-            uint   tagsChk = 0;
+        byte[] data    = new byte[header.DataSize];
+        byte[] tags    = new byte[header.TagSize];
+        uint   tagsChk = 0;
 
-            AaruConsole.DebugWriteLine("DC42 plugin", "Reading data");
-            Stream dataStream = dc42ImageFilter.GetDataForkStream();
-            dataStream.Seek(dataOffset, SeekOrigin.Begin);
-            dataStream.Read(data, 0, (int)header.DataSize);
+        AaruConsole.DebugWriteLine("DC42 plugin", "Reading data");
+        Stream dataStream = dc42ImageFilter.GetDataForkStream();
+        dataStream.Seek(dataOffset, SeekOrigin.Begin);
+        dataStream.Read(data, 0, (int)header.DataSize);
 
-            AaruConsole.DebugWriteLine("DC42 plugin", "Calculating data checksum");
-            uint dataChk = CheckSum(data);
-            AaruConsole.DebugWriteLine("DC42 plugin", "Calculated data checksum = 0x{0:X8}", dataChk);
-            AaruConsole.DebugWriteLine("DC42 plugin", "Stored data checksum = 0x{0:X8}", header.DataChecksum);
-
-            if(header.TagSize <= 0)
-                return dataChk == header.DataChecksum && tagsChk == header.TagChecksum;
-
-            AaruConsole.DebugWriteLine("DC42 plugin", "Reading tags");
-            Stream tagStream = dc42ImageFilter.GetDataForkStream();
-            tagStream.Seek(tagOffset, SeekOrigin.Begin);
-            tagStream.Read(tags, 0, (int)header.TagSize);
-
-            AaruConsole.DebugWriteLine("DC42 plugin", "Calculating tag checksum");
-            tagsChk = CheckSum(tags);
-            AaruConsole.DebugWriteLine("DC42 plugin", "Calculated tag checksum = 0x{0:X8}", tagsChk);
-            AaruConsole.DebugWriteLine("DC42 plugin", "Stored tag checksum = 0x{0:X8}", header.TagChecksum);
+        AaruConsole.DebugWriteLine("DC42 plugin", "Calculating data checksum");
+        uint dataChk = CheckSum(data);
+        AaruConsole.DebugWriteLine("DC42 plugin", "Calculated data checksum = 0x{0:X8}", dataChk);
+        AaruConsole.DebugWriteLine("DC42 plugin", "Stored data checksum = 0x{0:X8}", header.DataChecksum);
 
+        if(header.TagSize <= 0)
             return dataChk == header.DataChecksum && tagsChk == header.TagChecksum;
-        }
+
+        AaruConsole.DebugWriteLine("DC42 plugin", "Reading tags");
+        Stream tagStream = dc42ImageFilter.GetDataForkStream();
+        tagStream.Seek(tagOffset, SeekOrigin.Begin);
+        tagStream.Read(tags, 0, (int)header.TagSize);
+
+        AaruConsole.DebugWriteLine("DC42 plugin", "Calculating tag checksum");
+        tagsChk = CheckSum(tags);
+        AaruConsole.DebugWriteLine("DC42 plugin", "Calculated tag checksum = 0x{0:X8}", tagsChk);
+        AaruConsole.DebugWriteLine("DC42 plugin", "Stored tag checksum = 0x{0:X8}", header.TagChecksum);
+
+        return dataChk == header.DataChecksum && tagsChk == header.TagChecksum;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskCopy42/Write.cs b/Aaru.Images/DiskCopy42/Write.cs
index 46c6560cf..bf4480928 100644
--- a/Aaru.Images/DiskCopy42/Write.cs
+++ b/Aaru.Images/DiskCopy42/Write.cs
@@ -39,422 +39,421 @@ using Aaru.Helpers;
 using Claunia.Encoding;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskCopy42
 {
-    public sealed partial class DiskCopy42
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        header = new Header();
+        bool tags   = false;
+        bool macosx = false;
+
+        if(options != null &&
+           options.TryGetValue("macosx", out string tmpOption))
+            bool.TryParse(tmpOption, out macosx);
+
+        if(sectorSize != 512)
         {
-            header = new Header();
-            bool tags   = false;
-            bool macosx = false;
+            ErrorMessage = "Unsupported sector size";
 
-            if(options != null &&
-               options.TryGetValue("macosx", out string tmpOption))
-                bool.TryParse(tmpOption, out macosx);
+            return false;
+        }
 
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
+        switch(mediaType)
+        {
+            case MediaType.AppleFileWare:
+                header.FmtByte = kSigmaFmtByteTwiggy;
+                header.Format  = kSigmaFormatTwiggy;
+                twiggy         = true;
+
+                // TODO
+                ErrorMessage = "Twiggy write support not yet implemented";
 
                 return false;
-            }
-
-            switch(mediaType)
-            {
-                case MediaType.AppleFileWare:
-                    header.FmtByte = kSigmaFmtByteTwiggy;
-                    header.Format  = kSigmaFormatTwiggy;
-                    twiggy         = true;
-
-                    // TODO
-                    ErrorMessage = "Twiggy write support not yet implemented";
+            case MediaType.AppleHD20:
+                if(sectors != 39040)
+                {
+                    ErrorMessage = "Incorrect number of sectors for Apple HD20 image";
 
                     return false;
-                case MediaType.AppleHD20:
-                    if(sectors != 39040)
-                    {
-                        ErrorMessage = "Incorrect number of sectors for Apple HD20 image";
+                }
 
-                        return false;
-                    }
+                header.FmtByte = kFmtNotStandard;
+                header.Format  = kNotStandardFormat;
+                tags           = true;
 
-                    header.FmtByte = kFmtNotStandard;
-                    header.Format  = kNotStandardFormat;
-                    tags           = true;
-
-                    break;
-                case MediaType.AppleProfile:
-                    if(sectors != 9728 &&
-                       sectors != 19456)
-                    {
-                        ErrorMessage = "Incorrect number of sectors for Apple Profile image";
-
-                        return false;
-                    }
-
-                    header.FmtByte = kFmtNotStandard;
-                    header.Format  = kNotStandardFormat;
-                    tags           = true;
-
-                    break;
-                case MediaType.AppleSonyDS:
-                    if(sectors != 1600)
-                    {
-                        ErrorMessage = "Incorrect number of sectors for Apple MF2DD image";
-
-                        return false;
-                    }
-
-                    header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte800K;
-                    header.Format  = kSonyFormat800K;
-                    tags           = true;
-
-                    break;
-                case MediaType.AppleSonySS:
-                    if(sectors != 800)
-                    {
-                        ErrorMessage = "Incorrect number of sectors for Apple MF1DD image";
-
-                        return false;
-                    }
-
-                    header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte400K;
-                    header.Format  = kSonyFormat400K;
-                    tags           = true;
-
-                    break;
-                case MediaType.AppleWidget:
-                    if(sectors != 39040)
-                    {
-                        ErrorMessage = "Incorrect number of sectors for Apple Widget image";
-
-                        return false;
-                    }
-
-                    header.FmtByte = kFmtNotStandard;
-                    header.Format  = kNotStandardFormat;
-                    tags           = true;
-
-                    break;
-                case MediaType.DOS_35_DS_DD_9:
-                    if(sectors != 1440)
-                    {
-                        ErrorMessage = "Incorrect number of sectors for MF2DD image";
-
-                        return false;
-                    }
-
-                    header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte720K;
-                    header.Format  = kSonyFormat720K;
-
-                    break;
-                case MediaType.DOS_35_HD:
-                    if(sectors != 2880)
-                    {
-                        ErrorMessage = "Incorrect number of sectors for MF2HD image";
-
-                        return false;
-                    }
-
-                    header.Format  = kSonyFmtByte1440K;
-                    header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte1440K;
-
-                    break;
-                case MediaType.DMF:
-                    if(sectors != 3360)
-                    {
-                        ErrorMessage = "Incorrect number of sectors for DMF image";
-
-                        return false;
-                    }
-
-                    header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte1680K;
-                    header.Format  = kSonyFormat1680K;
-
-                    break;
-                default:
-                    ErrorMessage = $"Unsupported media format {mediaType}";
+                break;
+            case MediaType.AppleProfile:
+                if(sectors != 9728 &&
+                   sectors != 19456)
+                {
+                    ErrorMessage = "Incorrect number of sectors for Apple Profile image";
 
                     return false;
-            }
+                }
 
-            dataOffset      = 0x54;
-            tagOffset       = header.TagSize != 0 ? 0x54 + header.DataSize : 0;
-            header.DiskName = "-Aaru converted image-";
-            header.Valid    = 1;
-            header.DataSize = (uint)(sectors * 512);
+                header.FmtByte = kFmtNotStandard;
+                header.Format  = kNotStandardFormat;
+                tags           = true;
 
-            if(tags)
-                header.TagSize = (uint)(sectors * 12);
+                break;
+            case MediaType.AppleSonyDS:
+                if(sectors != 1600)
+                {
+                    ErrorMessage = "Incorrect number of sectors for Apple MF2DD image";
 
-            imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
+                    return false;
+                }
 
-            try
-            {
-                writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
+                header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte800K;
+                header.Format  = kSonyFormat800K;
+                tags           = true;
+
+                break;
+            case MediaType.AppleSonySS:
+                if(sectors != 800)
+                {
+                    ErrorMessage = "Incorrect number of sectors for Apple MF1DD image";
+
+                    return false;
+                }
+
+                header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte400K;
+                header.Format  = kSonyFormat400K;
+                tags           = true;
+
+                break;
+            case MediaType.AppleWidget:
+                if(sectors != 39040)
+                {
+                    ErrorMessage = "Incorrect number of sectors for Apple Widget image";
+
+                    return false;
+                }
+
+                header.FmtByte = kFmtNotStandard;
+                header.Format  = kNotStandardFormat;
+                tags           = true;
+
+                break;
+            case MediaType.DOS_35_DS_DD_9:
+                if(sectors != 1440)
+                {
+                    ErrorMessage = "Incorrect number of sectors for MF2DD image";
+
+                    return false;
+                }
+
+                header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte720K;
+                header.Format  = kSonyFormat720K;
+
+                break;
+            case MediaType.DOS_35_HD:
+                if(sectors != 2880)
+                {
+                    ErrorMessage = "Incorrect number of sectors for MF2HD image";
+
+                    return false;
+                }
+
+                header.Format  = kSonyFmtByte1440K;
+                header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte1440K;
+
+                break;
+            case MediaType.DMF:
+                if(sectors != 3360)
+                {
+                    ErrorMessage = "Incorrect number of sectors for DMF image";
+
+                    return false;
+                }
+
+                header.FmtByte = macosx ? kMacOSXFmtByte : kSonyFmtByte1680K;
+                header.Format  = kSonyFormat1680K;
+
+                break;
+            default:
+                ErrorMessage = $"Unsupported media format {mediaType}";
 
                 return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
         }
 
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
+        dataOffset      = 0x54;
+        tagOffset       = header.TagSize != 0 ? 0x54 + header.DataSize : 0;
+        header.DiskName = "-Aaru converted image-";
+        header.Valid    = 1;
+        header.DataSize = (uint)(sectors * 512);
+
+        if(tags)
+            header.TagSize = (uint)(sectors * 12);
+
+        imageInfo = new ImageInfo
         {
-            ErrorMessage = "Unsupported feature";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+        IsWriting    = true;
+        ErrorMessage = null;
 
-                return false;
-            }
-
-            if(data.Length != 512)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            writingStream.Seek((long)(dataOffset + (sectorAddress * 512)), SeekOrigin.Begin);
-            writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % 512 != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            writingStream.Seek((long)(dataOffset + (sectorAddress * 512)), SeekOrigin.Begin);
-            writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(header.TagSize == 0)
-            {
-                ErrorMessage = "Image does not support tags";
-
-                return false;
-            }
-
-            if(data.Length != 524)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            writingStream.Seek((long)(dataOffset + (sectorAddress * 512)), SeekOrigin.Begin);
-            writingStream.Write(data, 0, 512);
-            writingStream.Seek((long)(tagOffset + (sectorAddress * 12)), SeekOrigin.Begin);
-            writingStream.Write(data, 512, 12);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(header.TagSize == 0)
-            {
-                ErrorMessage = "Image does not support tags";
-
-                return false;
-            }
-
-            if(data.Length % 524 != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            for(uint i = 0; i < length; i++)
-            {
-                writingStream.Seek((long)(dataOffset + ((sectorAddress + i) * 512)), SeekOrigin.Begin);
-                writingStream.Write(data, (int)((i                          * 524) + 0), 512);
-
-                writingStream.Seek((long)(tagOffset + ((sectorAddress + i) * 12)), SeekOrigin.Begin);
-
-                writingStream.Write(data, (int)((i * 524) + 512), 12);
-            }
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            // No tags where written
-            if(writingStream.Length == 0x54 + header.DataSize)
-                header.TagSize = 0;
-
-            writingStream.Seek(0x54, SeekOrigin.Begin);
-            byte[] data = new byte[header.DataSize];
-            writingStream.Read(data, 0, (int)header.DataSize);
-            header.DataChecksum = CheckSum(data);
-            writingStream.Seek(0x54 + header.DataSize, SeekOrigin.Begin);
-            data = new byte[header.TagSize];
-            writingStream.Read(data, 0, (int)header.TagSize);
-            header.TagChecksum = CheckSum(data);
-
-            writingStream.Seek(0, SeekOrigin.Begin);
-
-            if(header.DiskName.Length > 63)
-                header.DiskName = header.DiskName.Substring(0, 63);
-
-            writingStream.WriteByte((byte)header.DiskName.Length);
-            Encoding macRoman = new MacRoman();
-            writingStream.Write(macRoman.GetBytes(header.DiskName), 0, header.DiskName.Length);
-
-            writingStream.Seek(64, SeekOrigin.Begin);
-            writingStream.Write(BigEndianBitConverter.GetBytes(header.DataSize), 0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(header.TagSize), 0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(header.DataChecksum), 0, 4);
-            writingStream.Write(BigEndianBitConverter.GetBytes(header.TagChecksum), 0, 4);
-            writingStream.WriteByte(header.Format);
-            writingStream.WriteByte(header.FmtByte);
-            writingStream.WriteByte(1);
-            writingStream.WriteByte(0);
-
-            writingStream.Flush();
-            writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata)
-        {
-            header.DiskName = metadata.MediaTitle ?? "-Aaru converted image-";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != 512)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        writingStream.Seek((long)(dataOffset + (sectorAddress * 512)), SeekOrigin.Begin);
+        writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % 512 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        writingStream.Seek((long)(dataOffset + (sectorAddress * 512)), SeekOrigin.Begin);
+        writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(header.TagSize == 0)
+        {
+            ErrorMessage = "Image does not support tags";
+
+            return false;
+        }
+
+        if(data.Length != 524)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        writingStream.Seek((long)(dataOffset + (sectorAddress * 512)), SeekOrigin.Begin);
+        writingStream.Write(data, 0, 512);
+        writingStream.Seek((long)(tagOffset + (sectorAddress * 12)), SeekOrigin.Begin);
+        writingStream.Write(data, 512, 12);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(header.TagSize == 0)
+        {
+            ErrorMessage = "Image does not support tags";
+
+            return false;
+        }
+
+        if(data.Length % 524 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        for(uint i = 0; i < length; i++)
+        {
+            writingStream.Seek((long)(dataOffset + ((sectorAddress + i) * 512)), SeekOrigin.Begin);
+            writingStream.Write(data, (int)((i                          * 524) + 0), 512);
+
+            writingStream.Seek((long)(tagOffset + ((sectorAddress + i) * 12)), SeekOrigin.Begin);
+
+            writingStream.Write(data, (int)((i * 524) + 512), 12);
+        }
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        // No tags where written
+        if(writingStream.Length == 0x54 + header.DataSize)
+            header.TagSize = 0;
+
+        writingStream.Seek(0x54, SeekOrigin.Begin);
+        byte[] data = new byte[header.DataSize];
+        writingStream.Read(data, 0, (int)header.DataSize);
+        header.DataChecksum = CheckSum(data);
+        writingStream.Seek(0x54 + header.DataSize, SeekOrigin.Begin);
+        data = new byte[header.TagSize];
+        writingStream.Read(data, 0, (int)header.TagSize);
+        header.TagChecksum = CheckSum(data);
+
+        writingStream.Seek(0, SeekOrigin.Begin);
+
+        if(header.DiskName.Length > 63)
+            header.DiskName = header.DiskName.Substring(0, 63);
+
+        writingStream.WriteByte((byte)header.DiskName.Length);
+        Encoding macRoman = new MacRoman();
+        writingStream.Write(macRoman.GetBytes(header.DiskName), 0, header.DiskName.Length);
+
+        writingStream.Seek(64, SeekOrigin.Begin);
+        writingStream.Write(BigEndianBitConverter.GetBytes(header.DataSize), 0, 4);
+        writingStream.Write(BigEndianBitConverter.GetBytes(header.TagSize), 0, 4);
+        writingStream.Write(BigEndianBitConverter.GetBytes(header.DataChecksum), 0, 4);
+        writingStream.Write(BigEndianBitConverter.GetBytes(header.TagChecksum), 0, 4);
+        writingStream.WriteByte(header.Format);
+        writingStream.WriteByte(header.FmtByte);
+        writingStream.WriteByte(1);
+        writingStream.WriteByte(0);
+
+        writingStream.Flush();
+        writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata)
+    {
+        header.DiskName = metadata.MediaTitle ?? "-Aaru converted image-";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskDupe/Constants.cs b/Aaru.Images/DiskDupe/Constants.cs
index 62d6123ba..45e88015e 100644
--- a/Aaru.Images/DiskDupe/Constants.cs
+++ b/Aaru.Images/DiskDupe/Constants.cs
@@ -31,17 +31,16 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class DiskDupe
-    {
-        /// <summary>Start of data sectors in disk image, should be 0x100</summary>
-        const uint TRACKMAP_OFFSET = 100;
+namespace Aaru.DiscImages;
 
-        /// <summary>The header identification string</summary>
-        readonly byte[] _headerMagic =
-        {
-            0x49, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
-    }
+public sealed partial class DiskDupe
+{
+    /// <summary>Start of data sectors in disk image, should be 0x100</summary>
+    const uint TRACKMAP_OFFSET = 100;
+
+    /// <summary>The header identification string</summary>
+    readonly byte[] _headerMagic =
+    {
+        0x49, 0x4d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskDupe/DiskDupe.cs b/Aaru.Images/DiskDupe/DiskDupe.cs
index 744cc8b72..dbc49bbb5 100644
--- a/Aaru.Images/DiskDupe/DiskDupe.cs
+++ b/Aaru.Images/DiskDupe/DiskDupe.cs
@@ -62,47 +62,46 @@ using Aaru.CommonTypes.Structs;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+/// <inheritdoc />
+/// <summary>Implements reading DiskDupe disk images</summary>
+public sealed partial class DiskDupe : IMediaImage
 {
-    /// <inheritdoc />
-    /// <summary>Implements reading DiskDupe disk images</summary>
-    public sealed partial class DiskDupe : IMediaImage
+    /// <summary>The DDI file header after the image has been opened</summary>
+    FileHeader _fileHeader;
+
+    /// <summary>The track map for the image after it has been opened</summary>
+    TrackInfo[] _trackMap;
+
+    /// <summary>The track offsets in the image after the file has been opened</summary>
+    long[] _trackOffsets;
+
+    /// <summary>The ImageFilter we're reading from, after the file has been opened</summary>
+    IFilter _ddiImageFilter;
+    ImageInfo _imageInfo;
+
+    public DiskDupe() => _imageInfo = new ImageInfo
     {
-        /// <summary>The DDI file header after the image has been opened</summary>
-        FileHeader _fileHeader;
-
-        /// <summary>The track map for the image after it has been opened</summary>
-        TrackInfo[] _trackMap;
-
-        /// <summary>The track offsets in the image after the file has been opened</summary>
-        long[] _trackOffsets;
-
-        /// <summary>The ImageFilter we're reading from, after the file has been opened</summary>
-        IFilter _ddiImageFilter;
-        ImageInfo _imageInfo;
-
-        public DiskDupe() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskDupe/Helpers.cs b/Aaru.Images/DiskDupe/Helpers.cs
index d2c30ecbb..fc65c5893 100644
--- a/Aaru.Images/DiskDupe/Helpers.cs
+++ b/Aaru.Images/DiskDupe/Helpers.cs
@@ -36,62 +36,61 @@ using System.Linq;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskDupe
 {
-    public sealed partial class DiskDupe
+    bool TryReadHeader(Stream stream, ref FileHeader fhdr, ref TrackInfo[] tmap, ref long[] toffsets)
     {
-        bool TryReadHeader(Stream stream, ref FileHeader fhdr, ref TrackInfo[] tmap, ref long[] toffsets)
+        int         numTracks;
+        int         trackLen; // the length of a single track, in bytes
+        TrackInfo[] trackMap;
+        byte[]      buffer = new byte[6];
+        FileHeader  fHeader;
+        long[]      trackOffsets;
+
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 256)
+            return false;
+
+        // read and check signature
+        fHeader.signature = new byte[10];
+        stream.Read(fHeader.signature, 0, 10);
+
+        if(!fHeader.signature.SequenceEqual(_headerMagic))
+            return false;
+
+        // read and check disk type byte
+        fHeader.diskType = (byte)stream.ReadByte();
+
+        if(fHeader.diskType < 1 ||
+           fHeader.diskType > 4)
+            return false;
+
+        // seek to start of the trackmap
+        stream.Seek(TRACKMAP_OFFSET, SeekOrigin.Begin);
+        numTracks    = _diskTypes[fHeader.diskType].cyl * _diskTypes[fHeader.diskType].hd;
+        trackLen     = 512                              * _diskTypes[fHeader.diskType].spt;
+        trackMap     = new TrackInfo[numTracks];
+        trackOffsets = new long[numTracks];
+
+        AaruConsole.DebugWriteLine("DiskDupe plugin", "Identified image with C/H/S = {0}/{1}/{2}",
+                                   _diskTypes[fHeader.diskType].cyl, _diskTypes[fHeader.diskType].hd,
+                                   _diskTypes[fHeader.diskType].spt);
+
+        // read the trackmap and store the track offsets
+        for(int i = 0; i < numTracks; i++)
         {
-            int         numTracks;
-            int         trackLen; // the length of a single track, in bytes
-            TrackInfo[] trackMap;
-            byte[]      buffer = new byte[6];
-            FileHeader  fHeader;
-            long[]      trackOffsets;
-
-            stream.Seek(0, SeekOrigin.Begin);
-
-            if(stream.Length < 256)
-                return false;
-
-            // read and check signature
-            fHeader.signature = new byte[10];
-            stream.Read(fHeader.signature, 0, 10);
-
-            if(!fHeader.signature.SequenceEqual(_headerMagic))
-                return false;
-
-            // read and check disk type byte
-            fHeader.diskType = (byte)stream.ReadByte();
-
-            if(fHeader.diskType < 1 ||
-               fHeader.diskType > 4)
-                return false;
-
-            // seek to start of the trackmap
-            stream.Seek(TRACKMAP_OFFSET, SeekOrigin.Begin);
-            numTracks    = _diskTypes[fHeader.diskType].cyl * _diskTypes[fHeader.diskType].hd;
-            trackLen     = 512                              * _diskTypes[fHeader.diskType].spt;
-            trackMap     = new TrackInfo[numTracks];
-            trackOffsets = new long[numTracks];
-
-            AaruConsole.DebugWriteLine("DiskDupe plugin", "Identified image with C/H/S = {0}/{1}/{2}",
-                                       _diskTypes[fHeader.diskType].cyl, _diskTypes[fHeader.diskType].hd,
-                                       _diskTypes[fHeader.diskType].spt);
-
-            // read the trackmap and store the track offsets
-            for(int i = 0; i < numTracks; i++)
-            {
-                stream.Read(buffer, 0, 6);
-                trackMap[i]     = Marshal.ByteArrayToStructureBigEndian<TrackInfo>(buffer);
-                trackOffsets[i] = trackLen * trackMap[i].trackNumber;
-            }
-
-            fhdr     = fHeader;
-            tmap     = trackMap;
-            toffsets = trackOffsets;
-
-            return true;
+            stream.Read(buffer, 0, 6);
+            trackMap[i]     = Marshal.ByteArrayToStructureBigEndian<TrackInfo>(buffer);
+            trackOffsets[i] = trackLen * trackMap[i].trackNumber;
         }
+
+        fhdr     = fHeader;
+        tmap     = trackMap;
+        toffsets = trackOffsets;
+
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskDupe/Identify.cs b/Aaru.Images/DiskDupe/Identify.cs
index d62b188a7..46417f5cf 100644
--- a/Aaru.Images/DiskDupe/Identify.cs
+++ b/Aaru.Images/DiskDupe/Identify.cs
@@ -34,21 +34,20 @@
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class DiskDupe
-    {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream      stream       = imageFilter.GetDataForkStream();
-            var         fHeader      = new FileHeader();
-            TrackInfo[] trackMap     = null;
-            long[]      trackOffsets = null;
+namespace Aaru.DiscImages;
 
-            // TODO: validate the tracks
-            // For now, having a valid header should be sufficient.
-            return TryReadHeader(stream, ref fHeader, ref trackMap, ref trackOffsets);
-        }
+public sealed partial class DiskDupe
+{
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
+    {
+        Stream      stream       = imageFilter.GetDataForkStream();
+        var         fHeader      = new FileHeader();
+        TrackInfo[] trackMap     = null;
+        long[]      trackOffsets = null;
+
+        // TODO: validate the tracks
+        // For now, having a valid header should be sufficient.
+        return TryReadHeader(stream, ref fHeader, ref trackMap, ref trackOffsets);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskDupe/Properties.cs b/Aaru.Images/DiskDupe/Properties.cs
index 9ef19cefa..9a65da65e 100644
--- a/Aaru.Images/DiskDupe/Properties.cs
+++ b/Aaru.Images/DiskDupe/Properties.cs
@@ -36,23 +36,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskDupe
 {
-    public sealed partial class DiskDupe
-    {
-        /// <inheritdoc />
-        public string Name => "DiskDupe DDI Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("5439B4A2-5F38-33A7-B8DC-3910D296B3DD");
-        /// <inheritdoc />
-        public string Author => "Michael Drüing";
-        /// <inheritdoc />
-        public string Format => "DDI disk image";
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public string Name => "DiskDupe DDI Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("5439B4A2-5F38-33A7-B8DC-3910D296B3DD");
+    /// <inheritdoc />
+    public string Author => "Michael Drüing";
+    /// <inheritdoc />
+    public string Format => "DDI disk image";
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskDupe/Read.cs b/Aaru.Images/DiskDupe/Read.cs
index 8a72d61e6..e147153e2 100644
--- a/Aaru.Images/DiskDupe/Read.cs
+++ b/Aaru.Images/DiskDupe/Read.cs
@@ -38,104 +38,103 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskDupe
 {
-    public sealed partial class DiskDupe
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+
+        var         fHeader      = new FileHeader();
+        TrackInfo[] trackMap     = null;
+        long[]      trackOffsets = null;
+
+        if(!TryReadHeader(stream, ref fHeader, ref trackMap, ref trackOffsets))
+            return ErrorNumber.InvalidArgument;
+
+        AaruConsole.DebugWriteLine("DiskDupe Plugin",
+                                   "Detected DiskDupe DDI image with {0} tracks and {1} sectors per track.",
+                                   _diskTypes[fHeader.diskType].cyl, _diskTypes[fHeader.diskType].spt);
+
+        _imageInfo.Cylinders       = _diskTypes[fHeader.diskType].cyl;
+        _imageInfo.Heads           = _diskTypes[fHeader.diskType].hd;
+        _imageInfo.SectorsPerTrack = _diskTypes[fHeader.diskType].spt;
+        _imageInfo.SectorSize      = 512; // only 512 bytes per sector supported
+        _imageInfo.Sectors         = _imageInfo.Heads   * _imageInfo.Cylinders * _imageInfo.SectorsPerTrack;
+        _imageInfo.ImageSize       = _imageInfo.Sectors * _imageInfo.SectorSize;
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+
+        _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
+                                                      (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
+                                                      false));
+
+        // save some variables for later use
+        _fileHeader     = fHeader;
+        _ddiImageFilter = imageFilter;
+        _trackMap       = trackMap;
+        _trackOffsets   = trackOffsets;
+
+        return ErrorNumber.NoError;
+    }
+
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+        int trackNum     = (int)(sectorAddress / _imageInfo.SectorsPerTrack);
+        int sectorOffset = (int)(sectorAddress % _imageInfo.SectorsPerTrack);
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(trackNum > 2 * _imageInfo.Cylinders)
+            return ErrorNumber.SectorNotFound;
+
+        buffer = new byte[_imageInfo.SectorSize];
+
+        if(_trackMap[trackNum].present != 1)
+            Array.Clear(buffer, 0, (int)_imageInfo.SectorSize);
+        else
         {
-            Stream stream = imageFilter.GetDataForkStream();
+            Stream strm = _ddiImageFilter.GetDataForkStream();
 
-            var         fHeader      = new FileHeader();
-            TrackInfo[] trackMap     = null;
-            long[]      trackOffsets = null;
+            strm.Seek(_trackOffsets[trackNum] + (sectorOffset * _imageInfo.SectorSize), SeekOrigin.Begin);
 
-            if(!TryReadHeader(stream, ref fHeader, ref trackMap, ref trackOffsets))
-                return ErrorNumber.InvalidArgument;
-
-            AaruConsole.DebugWriteLine("DiskDupe Plugin",
-                                       "Detected DiskDupe DDI image with {0} tracks and {1} sectors per track.",
-                                       _diskTypes[fHeader.diskType].cyl, _diskTypes[fHeader.diskType].spt);
-
-            _imageInfo.Cylinders       = _diskTypes[fHeader.diskType].cyl;
-            _imageInfo.Heads           = _diskTypes[fHeader.diskType].hd;
-            _imageInfo.SectorsPerTrack = _diskTypes[fHeader.diskType].spt;
-            _imageInfo.SectorSize      = 512; // only 512 bytes per sector supported
-            _imageInfo.Sectors         = _imageInfo.Heads   * _imageInfo.Cylinders * _imageInfo.SectorsPerTrack;
-            _imageInfo.ImageSize       = _imageInfo.Sectors * _imageInfo.SectorSize;
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-
-            _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
-                                                          (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
-                                                          false));
-
-            // save some variables for later use
-            _fileHeader     = fHeader;
-            _ddiImageFilter = imageFilter;
-            _trackMap       = trackMap;
-            _trackOffsets   = trackOffsets;
-
-            return ErrorNumber.NoError;
+            strm.Read(buffer, 0, (int)_imageInfo.SectorSize);
         }
 
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        return ErrorNumber.NoError;
+    }
+
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
-            int trackNum     = (int)(sectorAddress / _imageInfo.SectorsPerTrack);
-            int sectorOffset = (int)(sectorAddress % _imageInfo.SectorsPerTrack);
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(trackNum > 2 * _imageInfo.Cylinders)
-                return ErrorNumber.SectorNotFound;
-
-            buffer = new byte[_imageInfo.SectorSize];
-
-            if(_trackMap[trackNum].present != 1)
-                Array.Clear(buffer, 0, (int)_imageInfo.SectorSize);
-            else
-            {
-                Stream strm = _ddiImageFilter.GetDataForkStream();
-
-                strm.Seek(_trackOffsets[trackNum] + (sectorOffset * _imageInfo.SectorSize), SeekOrigin.Begin);
-
-                strm.Read(buffer, 0, (int)_imageInfo.SectorSize);
-            }
-
-            return ErrorNumber.NoError;
+            ms.Write(sector, 0, sector.Length);
         }
 
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = ms.ToArray();
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskDupe/Structs.cs b/Aaru.Images/DiskDupe/Structs.cs
index 47f8e2446..36d34e5cd 100644
--- a/Aaru.Images/DiskDupe/Structs.cs
+++ b/Aaru.Images/DiskDupe/Structs.cs
@@ -34,74 +34,73 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class DiskDupe
 {
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class DiskDupe
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    struct DiskType
     {
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        struct DiskType
-        {
-            public byte cyl;
-            public byte hd;
-            public byte spt;
-        }
+        public byte cyl;
+        public byte hd;
+        public byte spt;
+    }
 
-        readonly DiskType[] _diskTypes =
+    readonly DiskType[] _diskTypes =
+    {
+        new DiskType
         {
-            new DiskType
-            {
-                cyl = 0,
-                hd  = 0,
-                spt = 0
-            }, // Type 0 - invalid
-            new DiskType
-            {
-                cyl = 40,
-                hd  = 2,
-                spt = 9
-            }, // Type 1 - 360k
-            new DiskType
-            {
-                cyl = 80,
-                hd  = 2,
-                spt = 15
-            }, // Type 2 - 1.2m
-            new DiskType
-            {
-                cyl = 80,
-                hd  = 2,
-                spt = 9
-            }, // Type 3 - 720k
-            new DiskType
-            {
-                cyl = 80,
-                hd  = 2,
-                spt = 18
-            } // Type 4 - 1.44m
-        };
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct TrackInfo
+            cyl = 0,
+            hd  = 0,
+            spt = 0
+        }, // Type 0 - invalid
+        new DiskType
         {
-            public readonly byte present; // 1 = present, 0 = absent
-            public readonly byte trackNumber;
-            public readonly byte zero1;
-            public readonly byte zero2;
-            public readonly byte zero3;
-            public readonly byte unknown; // always 1?
-        }
-
-        /// <summary>The global header of a DDI image file</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct FileHeader
+            cyl = 40,
+            hd  = 2,
+            spt = 9
+        }, // Type 1 - 360k
+        new DiskType
         {
-            /// <summary>The file signature</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public byte[] signature;
+            cyl = 80,
+            hd  = 2,
+            spt = 15
+        }, // Type 2 - 1.2m
+        new DiskType
+        {
+            cyl = 80,
+            hd  = 2,
+            spt = 9
+        }, // Type 3 - 720k
+        new DiskType
+        {
+            cyl = 80,
+            hd  = 2,
+            spt = 18
+        } // Type 4 - 1.44m
+    };
 
-            /// <summary>Disk type</summary>
-            public byte diskType;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct TrackInfo
+    {
+        public readonly byte present; // 1 = present, 0 = absent
+        public readonly byte trackNumber;
+        public readonly byte zero1;
+        public readonly byte zero2;
+        public readonly byte zero3;
+        public readonly byte unknown; // always 1?
+    }
+
+    /// <summary>The global header of a DDI image file</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct FileHeader
+    {
+        /// <summary>The file signature</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public byte[] signature;
+
+        /// <summary>Disk type</summary>
+        public byte diskType;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DiskDupe/Unsupported.cs b/Aaru.Images/DiskDupe/Unsupported.cs
index ac24f73af..e90462587 100644
--- a/Aaru.Images/DiskDupe/Unsupported.cs
+++ b/Aaru.Images/DiskDupe/Unsupported.cs
@@ -33,48 +33,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DiskDupe
 {
-    public sealed partial class DiskDupe
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Constants.cs b/Aaru.Images/DriDiskCopy/Constants.cs
index a6036717d..0287aa193 100644
--- a/Aaru.Images/DriDiskCopy/Constants.cs
+++ b/Aaru.Images/DriDiskCopy/Constants.cs
@@ -30,10 +30,9 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DriDiskCopy
 {
-    public sealed partial class DriDiskCopy
-    {
-        const string REGEX_DRI = @"DiskImage\s(?<version>\d+.\d+)\s\(C\)\s\d+\,*\d*\s+Digital Research Inc";
-    }
+    const string REGEX_DRI = @"DiskImage\s(?<version>\d+.\d+)\s\(C\)\s\d+\,*\d*\s+Digital Research Inc";
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/DriDiskCopy.cs b/Aaru.Images/DriDiskCopy/DriDiskCopy.cs
index 7de55b027..d3f4be529 100644
--- a/Aaru.Images/DriDiskCopy/DriDiskCopy.cs
+++ b/Aaru.Images/DriDiskCopy/DriDiskCopy.cs
@@ -36,40 +36,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+/// <inheritdoc />
+/// <summary>Implements reading and writing DR-DOS' DISKCOPY disk images</summary>
+public sealed partial class DriDiskCopy : IWritableImage
 {
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing DR-DOS' DISKCOPY disk images</summary>
-    public sealed partial class DriDiskCopy : IWritableImage
+    /// <summary>Disk image file</summary>
+    IFilter _driImageFilter;
+
+    /// <summary>Footer of opened image</summary>
+    Footer _footer;
+    ImageInfo  _imageInfo;
+    FileStream _writingStream;
+
+    public DriDiskCopy() => _imageInfo = new ImageInfo
     {
-        /// <summary>Disk image file</summary>
-        IFilter _driImageFilter;
-
-        /// <summary>Footer of opened image</summary>
-        Footer _footer;
-        ImageInfo  _imageInfo;
-        FileStream _writingStream;
-
-        public DriDiskCopy() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Application           = "DiskCopy",
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Application           = "DiskCopy",
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Enums.cs b/Aaru.Images/DriDiskCopy/Enums.cs
index 8d282d10a..43435d4aa 100644
--- a/Aaru.Images/DriDiskCopy/Enums.cs
+++ b/Aaru.Images/DriDiskCopy/Enums.cs
@@ -32,25 +32,24 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class DriDiskCopy
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class DriDiskCopy
+    /// <summary>Drive codes change according to CMOS stored valued</summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum DriveCode : byte
     {
-        /// <summary>Drive codes change according to CMOS stored valued</summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum DriveCode : byte
-        {
-            /// <summary>5.25" 360k</summary>
-            md2dd = 0,
-            /// <summary>5.25" 1.2M</summary>
-            md2hd = 1,
-            /// <summary>3.5" 720k</summary>
-            mf2dd = 2,
-            /// <summary>3.5" 1.44M</summary>
-            mf2hd = 7,
-            /// <summary>3.5" 2.88M</summary>
-            mf2ed = 9
-        }
+        /// <summary>5.25" 360k</summary>
+        md2dd = 0,
+        /// <summary>5.25" 1.2M</summary>
+        md2hd = 1,
+        /// <summary>3.5" 720k</summary>
+        mf2dd = 2,
+        /// <summary>3.5" 1.44M</summary>
+        mf2hd = 7,
+        /// <summary>3.5" 2.88M</summary>
+        mf2ed = 9
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Identify.cs b/Aaru.Images/DriDiskCopy/Identify.cs
index c462c03a5..76614da83 100644
--- a/Aaru.Images/DriDiskCopy/Identify.cs
+++ b/Aaru.Images/DriDiskCopy/Identify.cs
@@ -36,72 +36,71 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DriDiskCopy
 {
-    public sealed partial class DriDiskCopy
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
+        Stream stream = imageFilter.GetDataForkStream();
 
-            if((stream.Length - Marshal.SizeOf<Footer>()) % 512 != 0)
-                return false;
+        if((stream.Length - Marshal.SizeOf<Footer>()) % 512 != 0)
+            return false;
 
-            byte[] buffer = new byte[Marshal.SizeOf<Footer>()];
-            stream.Seek(-buffer.Length, SeekOrigin.End);
-            stream.Read(buffer, 0, buffer.Length);
+        byte[] buffer = new byte[Marshal.SizeOf<Footer>()];
+        stream.Seek(-buffer.Length, SeekOrigin.End);
+        stream.Read(buffer, 0, buffer.Length);
 
-            Footer tmpFooter = Marshal.ByteArrayToStructureLittleEndian<Footer>(buffer);
+        Footer tmpFooter = Marshal.ByteArrayToStructureLittleEndian<Footer>(buffer);
 
-            string sig = StringHandlers.CToString(tmpFooter.signature);
+        string sig = StringHandlers.CToString(tmpFooter.signature);
 
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.signature = \"{0}\"", sig);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.five = {0}", tmpFooter.bpb.five);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.signature = \"{0}\"", sig);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.five = {0}", tmpFooter.bpb.five);
 
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb._driveCode = {0}",
-                                       tmpFooter.bpb._driveCode);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb._driveCode = {0}",
+                                   tmpFooter.bpb._driveCode);
 
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown = {0}", tmpFooter.bpb.unknown);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown = {0}", tmpFooter.bpb.unknown);
 
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.cylinders = {0}",
-                                       tmpFooter.bpb.cylinders);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.cylinders = {0}",
+                                   tmpFooter.bpb.cylinders);
 
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown2 = {0}", tmpFooter.bpb.unknown2);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.bps = {0}", tmpFooter.bpb.bps);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.spc = {0}", tmpFooter.bpb.spc);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.rsectors = {0}", tmpFooter.bpb.rsectors);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.fats_no = {0}", tmpFooter.bpb.fats_no);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sectors = {0}", tmpFooter.bpb.sectors);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown2 = {0}", tmpFooter.bpb.unknown2);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.bps = {0}", tmpFooter.bpb.bps);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.spc = {0}", tmpFooter.bpb.spc);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.rsectors = {0}", tmpFooter.bpb.rsectors);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.fats_no = {0}", tmpFooter.bpb.fats_no);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sectors = {0}", tmpFooter.bpb.sectors);
 
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.media_descriptor = {0}",
-                                       tmpFooter.bpb.media_descriptor);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.media_descriptor = {0}",
+                                   tmpFooter.bpb.media_descriptor);
 
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.spfat = {0}", tmpFooter.bpb.spfat);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sptrack = {0}", tmpFooter.bpb.sptrack);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.heads = {0}", tmpFooter.bpb.heads);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.hsectors = {0}", tmpFooter.bpb.hsectors);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.drive_no = {0}", tmpFooter.bpb.drive_no);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown3 = {0}", tmpFooter.bpb.unknown3);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown4 = {0}", tmpFooter.bpb.unknown4);
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sptrack2 = {0}", tmpFooter.bpb.sptrack2);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.spfat = {0}", tmpFooter.bpb.spfat);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sptrack = {0}", tmpFooter.bpb.sptrack);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.heads = {0}", tmpFooter.bpb.heads);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.hsectors = {0}", tmpFooter.bpb.hsectors);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.drive_no = {0}", tmpFooter.bpb.drive_no);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown3 = {0}", tmpFooter.bpb.unknown3);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.unknown4 = {0}", tmpFooter.bpb.unknown4);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "tmp_footer.bpb.sptrack2 = {0}", tmpFooter.bpb.sptrack2);
 
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin",
-                                       "ArrayHelpers.ArrayIsNullOrEmpty(tmp_footer.bpb.unknown5) = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(tmpFooter.bpb.unknown5));
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin",
+                                   "ArrayHelpers.ArrayIsNullOrEmpty(tmp_footer.bpb.unknown5) = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(tmpFooter.bpb.unknown5));
 
-            var   regexSignature = new Regex(REGEX_DRI);
-            Match matchSignature = regexSignature.Match(sig);
+        var   regexSignature = new Regex(REGEX_DRI);
+        Match matchSignature = regexSignature.Match(sig);
 
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "MatchSignature.Success? = {0}", matchSignature.Success);
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "MatchSignature.Success? = {0}", matchSignature.Success);
 
-            if(!matchSignature.Success)
-                return false;
+        if(!matchSignature.Success)
+            return false;
 
-            if(tmpFooter.bpb.sptrack * tmpFooter.bpb.cylinders * tmpFooter.bpb.heads != tmpFooter.bpb.sectors)
-                return false;
+        if(tmpFooter.bpb.sptrack * tmpFooter.bpb.cylinders * tmpFooter.bpb.heads != tmpFooter.bpb.sectors)
+            return false;
 
-            return (tmpFooter.bpb.sectors * tmpFooter.bpb.bps) + Marshal.SizeOf<Footer>() == stream.Length;
-        }
+        return (tmpFooter.bpb.sectors * tmpFooter.bpb.bps) + Marshal.SizeOf<Footer>() == stream.Length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Properties.cs b/Aaru.Images/DriDiskCopy/Properties.cs
index 9b50b3aca..780d7a7c1 100644
--- a/Aaru.Images/DriDiskCopy/Properties.cs
+++ b/Aaru.Images/DriDiskCopy/Properties.cs
@@ -37,56 +37,55 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DriDiskCopy
 {
-    public sealed partial class DriDiskCopy
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "Digital Research DiskCopy";
+    /// <inheritdoc />
+    public Guid Id => new Guid("9F0BE551-8BAB-4038-8B5A-691F1BF5FFF3");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Digital Research DiskCopy";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+
+    // TODO: Test with real hardware to see real supported media
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-
-        /// <inheritdoc />
-        public string Name => "Digital Research DiskCopy";
-        /// <inheritdoc />
-        public Guid Id => new Guid("9F0BE551-8BAB-4038-8B5A-691F1BF5FFF3");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Digital Research DiskCopy";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
+        MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
+        MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
+        MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
+        MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+        MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
+        MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525, MediaType.MetaFloppy_Mod_I, MediaType.MetaFloppy_Mod_II
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-
-        // TODO: Test with real hardware to see real supported media
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
-            MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
-            MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
-            MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
-            MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
-            MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
-            MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525, MediaType.MetaFloppy_Mod_I, MediaType.MetaFloppy_Mod_II
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".dsk"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".dsk"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Read.cs b/Aaru.Images/DriDiskCopy/Read.cs
index 63c427a6e..eddbbae90 100644
--- a/Aaru.Images/DriDiskCopy/Read.cs
+++ b/Aaru.Images/DriDiskCopy/Read.cs
@@ -38,118 +38,117 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DriDiskCopy
 {
-    public sealed partial class DriDiskCopy
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+
+        if((stream.Length - Marshal.SizeOf<Footer>()) % 512 != 0)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] buffer = new byte[Marshal.SizeOf<Footer>()];
+        stream.Seek(-buffer.Length, SeekOrigin.End);
+        stream.Read(buffer, 0, buffer.Length);
+
+        _footer = Marshal.ByteArrayToStructureLittleEndian<Footer>(buffer);
+
+        string sig = StringHandlers.CToString(_footer.signature);
+
+        var   regexSignature = new Regex(REGEX_DRI);
+        Match matchSignature = regexSignature.Match(sig);
+
+        if(!matchSignature.Success)
+            return ErrorNumber.InvalidArgument;
+
+        if(_footer.bpb.sptrack * _footer.bpb.cylinders * _footer.bpb.heads != _footer.bpb.sectors)
+            return ErrorNumber.InvalidArgument;
+
+        if((_footer.bpb.sectors * _footer.bpb.bps) + Marshal.SizeOf<Footer>() != stream.Length)
+            return ErrorNumber.InvalidArgument;
+
+        _imageInfo.Cylinders          = _footer.bpb.cylinders;
+        _imageInfo.Heads              = _footer.bpb.heads;
+        _imageInfo.SectorsPerTrack    = _footer.bpb.sptrack;
+        _imageInfo.Sectors            = _footer.bpb.sectors;
+        _imageInfo.SectorSize         = _footer.bpb.bps;
+        _imageInfo.ApplicationVersion = matchSignature.Groups["version"].Value;
+
+        _driImageFilter = imageFilter;
+
+        _imageInfo.ImageSize            = (ulong)(stream.Length - Marshal.SizeOf<Footer>());
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+
+        AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "Image application = {0} version {1}",
+                                   _imageInfo.Application, _imageInfo.ApplicationVersion);
+
+        // Correct some incorrect data in images of NEC 2HD disks
+        if(_imageInfo.Cylinders       == 77  &&
+           _imageInfo.Heads           == 2   &&
+           _imageInfo.SectorsPerTrack == 16  &&
+           _imageInfo.SectorSize      == 512 &&
+           (_footer.bpb._driveCode == DriveCode.md2hd || _footer.bpb._driveCode == DriveCode.mf2hd))
         {
-            Stream stream = imageFilter.GetDataForkStream();
-
-            if((stream.Length - Marshal.SizeOf<Footer>()) % 512 != 0)
-                return ErrorNumber.InvalidArgument;
-
-            byte[] buffer = new byte[Marshal.SizeOf<Footer>()];
-            stream.Seek(-buffer.Length, SeekOrigin.End);
-            stream.Read(buffer, 0, buffer.Length);
-
-            _footer = Marshal.ByteArrayToStructureLittleEndian<Footer>(buffer);
-
-            string sig = StringHandlers.CToString(_footer.signature);
-
-            var   regexSignature = new Regex(REGEX_DRI);
-            Match matchSignature = regexSignature.Match(sig);
-
-            if(!matchSignature.Success)
-                return ErrorNumber.InvalidArgument;
-
-            if(_footer.bpb.sptrack * _footer.bpb.cylinders * _footer.bpb.heads != _footer.bpb.sectors)
-                return ErrorNumber.InvalidArgument;
-
-            if((_footer.bpb.sectors * _footer.bpb.bps) + Marshal.SizeOf<Footer>() != stream.Length)
-                return ErrorNumber.InvalidArgument;
-
-            _imageInfo.Cylinders          = _footer.bpb.cylinders;
-            _imageInfo.Heads              = _footer.bpb.heads;
-            _imageInfo.SectorsPerTrack    = _footer.bpb.sptrack;
-            _imageInfo.Sectors            = _footer.bpb.sectors;
-            _imageInfo.SectorSize         = _footer.bpb.bps;
-            _imageInfo.ApplicationVersion = matchSignature.Groups["version"].Value;
-
-            _driImageFilter = imageFilter;
-
-            _imageInfo.ImageSize            = (ulong)(stream.Length - Marshal.SizeOf<Footer>());
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-
-            AaruConsole.DebugWriteLine("DRI DiskCopy plugin", "Image application = {0} version {1}",
-                                       _imageInfo.Application, _imageInfo.ApplicationVersion);
-
-            // Correct some incorrect data in images of NEC 2HD disks
-            if(_imageInfo.Cylinders       == 77  &&
-               _imageInfo.Heads           == 2   &&
-               _imageInfo.SectorsPerTrack == 16  &&
-               _imageInfo.SectorSize      == 512 &&
-               (_footer.bpb._driveCode == DriveCode.md2hd || _footer.bpb._driveCode == DriveCode.mf2hd))
-            {
-                _imageInfo.SectorsPerTrack = 8;
-                _imageInfo.SectorSize      = 1024;
-            }
-
-            _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
-                                                          (ushort)_imageInfo.SectorsPerTrack, _imageInfo.SectorSize,
-                                                          MediaEncoding.MFM, false));
-
-            switch(_imageInfo.MediaType)
-            {
-                case MediaType.NEC_525_HD when _footer.bpb._driveCode == DriveCode.mf2hd ||
-                                               _footer.bpb._driveCode == DriveCode.mf2ed:
-                    _imageInfo.MediaType = MediaType.NEC_35_HD_8;
-
-                    break;
-                case MediaType.DOS_525_HD when _footer.bpb._driveCode == DriveCode.mf2hd ||
-                                               _footer.bpb._driveCode == DriveCode.mf2ed:
-                    _imageInfo.MediaType = MediaType.NEC_35_HD_15;
-
-                    break;
-                case MediaType.RX50 when _footer.bpb._driveCode == DriveCode.md2dd ||
-                                         _footer.bpb._driveCode == DriveCode.md2hd:
-                    _imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
-
-                    break;
-            }
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-            AaruConsole.VerboseWriteLine("Digital Research DiskCopy image contains a disk of type {0}",
-                                         _imageInfo.MediaType);
-
-            return ErrorNumber.NoError;
+            _imageInfo.SectorsPerTrack = 8;
+            _imageInfo.SectorSize      = 1024;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
+                                                      (ushort)_imageInfo.SectorsPerTrack, _imageInfo.SectorSize,
+                                                      MediaEncoding.MFM, false));
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        switch(_imageInfo.MediaType)
         {
-            buffer = null;
+            case MediaType.NEC_525_HD when _footer.bpb._driveCode == DriveCode.mf2hd ||
+                                           _footer.bpb._driveCode == DriveCode.mf2ed:
+                _imageInfo.MediaType = MediaType.NEC_35_HD_8;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.DOS_525_HD when _footer.bpb._driveCode == DriveCode.mf2hd ||
+                                           _footer.bpb._driveCode == DriveCode.mf2ed:
+                _imageInfo.MediaType = MediaType.NEC_35_HD_15;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.RX50 when _footer.bpb._driveCode == DriveCode.md2dd ||
+                                     _footer.bpb._driveCode == DriveCode.md2hd:
+                _imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
 
-            buffer = new byte[length * _imageInfo.SectorSize];
-
-            Stream stream = _driImageFilter.GetDataForkStream();
-            stream.Seek((long)(sectorAddress    * _imageInfo.SectorSize), SeekOrigin.Begin);
-            stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
-
-            return ErrorNumber.NoError;
+                break;
         }
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
+        AaruConsole.VerboseWriteLine("Digital Research DiskCopy image contains a disk of type {0}",
+                                     _imageInfo.MediaType);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        Stream stream = _driImageFilter.GetDataForkStream();
+        stream.Seek((long)(sectorAddress    * _imageInfo.SectorSize), SeekOrigin.Begin);
+        stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Structs.cs b/Aaru.Images/DriDiskCopy/Structs.cs
index c61c731a5..57f8517f4 100644
--- a/Aaru.Images/DriDiskCopy/Structs.cs
+++ b/Aaru.Images/DriDiskCopy/Structs.cs
@@ -32,68 +32,67 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class DriDiskCopy
-    {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Footer
-        {
-            /// <summary>Signature: "DiskImage 2.01 (C) 1990,1991 Digital Research Inc\0"</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 51)]
-            public byte[] signature;
-            /// <summary>Information about the disk image, mostly imitates FAT BPB</summary>
-            public Bpb bpb;
-            /// <summary>Information about the disk image, mostly imitates FAT BPB, copy</summary>
-            public Bpb bpbcopy;
-        }
+namespace Aaru.DiscImages;
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Bpb
-        {
-            /// <summary>Seems to be always 0x05</summary>
-            public byte five;
-            /// <summary>A drive code that corresponds (but it not equal to) CMOS drive types</summary>
-            public DriveCode _driveCode;
-            /// <summary>Unknown seems to be always 2</summary>
-            public readonly ushort unknown;
-            /// <summary>Cylinders</summary>
-            public ushort cylinders;
-            /// <summary>Seems to always be 0</summary>
-            public readonly byte unknown2;
-            /// <summary>Bytes per sector</summary>
-            public ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Sectors between BPB and FAT</summary>
-            public readonly ushort rsectors;
-            /// <summary>How many FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Entries in root directory</summary>
-            public readonly ushort root_entries;
-            /// <summary>Total sectors</summary>
-            public ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media_descriptor;
-            /// <summary>Sectors per FAT</summary>
-            public readonly ushort spfat;
-            /// <summary>Sectors per track</summary>
-            public ushort sptrack;
-            /// <summary>Heads</summary>
-            public ushort heads;
-            /// <summary>Hidden sectors before BPB</summary>
-            public readonly uint hsectors;
-            /// <summary>Drive number</summary>
-            public readonly byte drive_no;
-            /// <summary>Seems to be 0</summary>
-            public readonly ulong unknown3;
-            /// <summary>Seems to be 0</summary>
-            public readonly byte unknown4;
-            /// <summary>Sectors per track (again?)</summary>
-            public ushort sptrack2;
-            /// <summary>Seems to be 0</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 144)]
-            public byte[] unknown5;
-        }
+public sealed partial class DriDiskCopy
+{
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Footer
+    {
+        /// <summary>Signature: "DiskImage 2.01 (C) 1990,1991 Digital Research Inc\0"</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 51)]
+        public byte[] signature;
+        /// <summary>Information about the disk image, mostly imitates FAT BPB</summary>
+        public Bpb bpb;
+        /// <summary>Information about the disk image, mostly imitates FAT BPB, copy</summary>
+        public Bpb bpbcopy;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Bpb
+    {
+        /// <summary>Seems to be always 0x05</summary>
+        public byte five;
+        /// <summary>A drive code that corresponds (but it not equal to) CMOS drive types</summary>
+        public DriveCode _driveCode;
+        /// <summary>Unknown seems to be always 2</summary>
+        public readonly ushort unknown;
+        /// <summary>Cylinders</summary>
+        public ushort cylinders;
+        /// <summary>Seems to always be 0</summary>
+        public readonly byte unknown2;
+        /// <summary>Bytes per sector</summary>
+        public ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Sectors between BPB and FAT</summary>
+        public readonly ushort rsectors;
+        /// <summary>How many FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Entries in root directory</summary>
+        public readonly ushort root_entries;
+        /// <summary>Total sectors</summary>
+        public ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media_descriptor;
+        /// <summary>Sectors per FAT</summary>
+        public readonly ushort spfat;
+        /// <summary>Sectors per track</summary>
+        public ushort sptrack;
+        /// <summary>Heads</summary>
+        public ushort heads;
+        /// <summary>Hidden sectors before BPB</summary>
+        public readonly uint hsectors;
+        /// <summary>Drive number</summary>
+        public readonly byte drive_no;
+        /// <summary>Seems to be 0</summary>
+        public readonly ulong unknown3;
+        /// <summary>Seems to be 0</summary>
+        public readonly byte unknown4;
+        /// <summary>Sectors per track (again?)</summary>
+        public ushort sptrack2;
+        /// <summary>Seems to be 0</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 144)]
+        public byte[] unknown5;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Unsupported.cs b/Aaru.Images/DriDiskCopy/Unsupported.cs
index 47f9968c8..ec878ffe8 100644
--- a/Aaru.Images/DriDiskCopy/Unsupported.cs
+++ b/Aaru.Images/DriDiskCopy/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DriDiskCopy
 {
-    public sealed partial class DriDiskCopy
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/DriDiskCopy/Write.cs b/Aaru.Images/DriDiskCopy/Write.cs
index a86273e69..7caf5ccef 100644
--- a/Aaru.Images/DriDiskCopy/Write.cs
+++ b/Aaru.Images/DriDiskCopy/Write.cs
@@ -41,227 +41,226 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class DriDiskCopy
 {
-    public sealed partial class DriDiskCopy
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize == 0)
         {
-            if(sectorSize == 0)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(sectors > ushort.MaxValue)
-            {
-                ErrorMessage = "Too many sectors";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            // TODO: Check this
-            (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
-                variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
-
-            _footer = new Footer
-            {
-                signature = new byte[51],
-                bpb = new Bpb
-                {
-                    five       = 5,
-                    _driveCode = DriveCode.mf2ed,
-                    cylinders  = geometry.cylinders,
-                    bps        = (ushort)_imageInfo.SectorSize,
-                    sectors    = (ushort)_imageInfo.Sectors,
-                    sptrack    = (ushort)_imageInfo.SectorsPerTrack,
-                    heads      = (ushort)_imageInfo.Heads,
-                    sptrack2   = (ushort)_imageInfo.SectorsPerTrack,
-                    unknown5   = new byte[144]
-                }
-            };
-
-            Array.Copy(Encoding.ASCII.GetBytes("DiskImage 2.01 (C) 1990,1991 Digital Research Inc"), 0,
-                       _footer.signature, 0, 49);
-
-            _footer.bpbcopy = _footer.bpb;
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(sectors > ushort.MaxValue)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
+            return false;
+        }
+
+        // TODO: Check this
+        (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
+            variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
+
+        _footer = new Footer
+        {
+            signature = new byte[51],
+            bpb = new Bpb
             {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
+                five       = 5,
+                _driveCode = DriveCode.mf2ed,
+                cylinders  = geometry.cylinders,
+                bps        = (ushort)_imageInfo.SectorSize,
+                sectors    = (ushort)_imageInfo.Sectors,
+                sptrack    = (ushort)_imageInfo.SectorsPerTrack,
+                heads      = (ushort)_imageInfo.Heads,
+                sptrack2   = (ushort)_imageInfo.SectorsPerTrack,
+                unknown5   = new byte[144]
             }
+        };
 
-            byte[] hdr    = new byte[Marshal.SizeOf<Footer>()];
-            IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Footer>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(_footer, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+        Array.Copy(Encoding.ASCII.GetBytes("DiskImage 2.01 (C) 1990,1991 Digital Research Inc"), 0,
+                   _footer.signature, 0, 49);
 
-            _writingStream.Seek(0, SeekOrigin.End);
-            _writingStream.Write(hdr, 0, hdr.Length);
+        _footer.bpbcopy = _footer.bpb;
 
-            _writingStream.Flush();
-            _writingStream.Close();
+        IsWriting    = true;
+        ErrorMessage = null;
 
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        byte[] hdr    = new byte[Marshal.SizeOf<Footer>()];
+        IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Footer>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(_footer, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.End);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/GDI/Constants.cs b/Aaru.Images/GDI/Constants.cs
index 40c37e381..1e49fec4b 100644
--- a/Aaru.Images/GDI/Constants.cs
+++ b/Aaru.Images/GDI/Constants.cs
@@ -30,11 +30,10 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Gdi
 {
-    public sealed partial class Gdi
-    {
-        const string REGEX_TRACK =
-            @"\s?(?<track>\d+)\s+(?<start>\d+)\s(?<flags>\d)\s(?<type>2352|2048)\s(?<filename>.+)\s(?<offset>\d+)$";
-    }
+    const string REGEX_TRACK =
+        @"\s?(?<track>\d+)\s+(?<start>\d+)\s(?<flags>\d)\s(?<type>2352|2048)\s(?<filename>.+)\s(?<offset>\d+)$";
 }
\ No newline at end of file
diff --git a/Aaru.Images/GDI/GDI.cs b/Aaru.Images/GDI/GDI.cs
index 91562572b..eff52d410 100644
--- a/Aaru.Images/GDI/GDI.cs
+++ b/Aaru.Images/GDI/GDI.cs
@@ -37,42 +37,41 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using Aaru.Decoders.CD;
 
-namespace Aaru.DiscImages
-{
-    // TODO: There seems no be no clear definition on how to treat pregaps that are not included in the file, so this is just appending it to start of track
-    // TODO: This format doesn't support to specify pregaps that are included in the file (like Redump ones)
-    /// <inheritdoc />
-    /// <summary>Implements reading Dreamcast GDI disc images</summary>
-    public sealed partial class Gdi : IOpticalMediaImage
-    {
-        ulong        _densitySeparationSectors;
-        GdiDisc      _discImage;
-        StreamReader _gdiStream;
-        ImageInfo    _imageInfo;
-        Stream       _imageStream;
-        /// <summary>Dictionary, index is track #, value is track number, or 0 if a TOC</summary>
-        Dictionary<uint, ulong> _offsetMap;
-        SectorBuilder _sectorBuilder;
+namespace Aaru.DiscImages;
 
-        public Gdi() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = true,
-            HasSessions           = true,
-            Version               = null,
-            ApplicationVersion    = null,
-            MediaTitle            = null,
-            Creator               = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: There seems no be no clear definition on how to treat pregaps that are not included in the file, so this is just appending it to start of track
+// TODO: This format doesn't support to specify pregaps that are included in the file (like Redump ones)
+/// <inheritdoc />
+/// <summary>Implements reading Dreamcast GDI disc images</summary>
+public sealed partial class Gdi : IOpticalMediaImage
+{
+    ulong        _densitySeparationSectors;
+    GdiDisc      _discImage;
+    StreamReader _gdiStream;
+    ImageInfo    _imageInfo;
+    Stream       _imageStream;
+    /// <summary>Dictionary, index is track #, value is track number, or 0 if a TOC</summary>
+    Dictionary<uint, ulong> _offsetMap;
+    SectorBuilder _sectorBuilder;
+
+    public Gdi() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = true,
+        HasSessions           = true,
+        Version               = null,
+        ApplicationVersion    = null,
+        MediaTitle            = null,
+        Creator               = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/GDI/Identify.cs b/Aaru.Images/GDI/Identify.cs
index 699879af1..e8911a293 100644
--- a/Aaru.Images/GDI/Identify.cs
+++ b/Aaru.Images/GDI/Identify.cs
@@ -36,87 +36,86 @@ using System.Text.RegularExpressions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Gdi
 {
-    public sealed partial class Gdi
+    // Due to .gdi format, this method must parse whole file, ignoring errors (those will be returned by OpenImage()).
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        // Due to .gdi format, this method must parse whole file, ignoring errors (those will be returned by OpenImage()).
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        try
         {
-            try
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+            byte[] testArray = new byte[512];
+            imageFilter.GetDataForkStream().Read(testArray, 0, 512);
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+
+            // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
+            bool twoConsecutiveNulls = false;
+
+            for(int i = 0; i < 512; i++)
             {
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
-                byte[] testArray = new byte[512];
-                imageFilter.GetDataForkStream().Read(testArray, 0, 512);
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+                if(i >= imageFilter.GetDataForkStream().Length)
+                    break;
 
-                // Check for unexpected control characters that shouldn't be present in a text file and can crash this plugin
-                bool twoConsecutiveNulls = false;
-
-                for(int i = 0; i < 512; i++)
+                if(testArray[i] == 0)
                 {
-                    if(i >= imageFilter.GetDataForkStream().Length)
-                        break;
+                    if(twoConsecutiveNulls)
+                        return false;
 
-                    if(testArray[i] == 0)
-                    {
-                        if(twoConsecutiveNulls)
-                            return false;
+                    twoConsecutiveNulls = true;
+                }
+                else
+                    twoConsecutiveNulls = false;
 
-                        twoConsecutiveNulls = true;
-                    }
-                    else
-                        twoConsecutiveNulls = false;
+                if(testArray[i] < 0x20  &&
+                   testArray[i] != 0x0A &&
+                   testArray[i] != 0x0D &&
+                   testArray[i] != 0x00)
+                    return false;
+            }
 
-                    if(testArray[i] < 0x20  &&
-                       testArray[i] != 0x0A &&
-                       testArray[i] != 0x0D &&
-                       testArray[i] != 0x00)
+            _gdiStream = new StreamReader(imageFilter.GetDataForkStream());
+            int lineNumber  = 0;
+            int tracksFound = 0;
+            int tracks      = 0;
+
+            while(_gdiStream.Peek() >= 0)
+            {
+                lineNumber++;
+                string line = _gdiStream.ReadLine();
+
+                if(lineNumber == 1)
+                {
+                    if(!int.TryParse(line, out tracks))
                         return false;
                 }
-
-                _gdiStream = new StreamReader(imageFilter.GetDataForkStream());
-                int lineNumber  = 0;
-                int tracksFound = 0;
-                int tracks      = 0;
-
-                while(_gdiStream.Peek() >= 0)
+                else
                 {
-                    lineNumber++;
-                    string line = _gdiStream.ReadLine();
+                    var regexTrack = new Regex(REGEX_TRACK);
 
-                    if(lineNumber == 1)
-                    {
-                        if(!int.TryParse(line, out tracks))
-                            return false;
-                    }
-                    else
-                    {
-                        var regexTrack = new Regex(REGEX_TRACK);
+                    Match trackMatch = regexTrack.Match(line ?? "");
 
-                        Match trackMatch = regexTrack.Match(line ?? "");
+                    if(!trackMatch.Success)
+                        return false;
 
-                        if(!trackMatch.Success)
-                            return false;
-
-                        tracksFound++;
-                    }
+                    tracksFound++;
                 }
-
-                if(tracks == 0)
-                    return false;
-
-                return tracks == tracksFound;
             }
-            catch(Exception ex)
-            {
-                AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.BasePath);
-                AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
-                AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
 
+            if(tracks == 0)
                 return false;
-            }
+
+            return tracks == tracksFound;
+        }
+        catch(Exception ex)
+        {
+            AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.BasePath);
+            AaruConsole.ErrorWriteLine("Exception: {0}", ex.Message);
+            AaruConsole.ErrorWriteLine("Stack trace: {0}", ex.StackTrace);
+
+            return false;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/GDI/Properties.cs b/Aaru.Images/GDI/Properties.cs
index 1f2cacafd..85732409a 100644
--- a/Aaru.Images/GDI/Properties.cs
+++ b/Aaru.Images/GDI/Properties.cs
@@ -38,64 +38,63 @@ using Aaru.CommonTypes.Structs;
 using Schemas;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Gdi
 {
-    public sealed partial class Gdi
+    /// <inheritdoc />
+    public string Name => "Dreamcast GDI image";
+    /// <inheritdoc />
+    public Guid Id => new("281ECBF2-D2A7-414C-8497-1A33F6DCB2DD");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Dreamcast GDI image";
+
+    /// <inheritdoc />
+    public List<Partition> Partitions { get; private set; }
+
+    /// <inheritdoc />
+    public List<Track> Tracks
     {
-        /// <inheritdoc />
-        public string Name => "Dreamcast GDI image";
-        /// <inheritdoc />
-        public Guid Id => new("281ECBF2-D2A7-414C-8497-1A33F6DCB2DD");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Dreamcast GDI image";
-
-        /// <inheritdoc />
-        public List<Partition> Partitions { get; private set; }
-
-        /// <inheritdoc />
-        public List<Track> Tracks
+        get
         {
-            get
+            List<Track> tracks = new();
+
+            foreach(GdiTrack gdiTrack in _discImage.Tracks)
             {
-                List<Track> tracks = new();
-
-                foreach(GdiTrack gdiTrack in _discImage.Tracks)
+                var track = new Track
                 {
-                    var track = new Track
-                    {
-                        Description       = null,
-                        StartSector       = gdiTrack.StartSector,
-                        Pregap            = gdiTrack.Pregap,
-                        Session           = (ushort)(gdiTrack.HighDensity ? 2 : 1),
-                        Sequence          = gdiTrack.Sequence,
-                        Type              = gdiTrack.TrackType,
-                        Filter            = gdiTrack.TrackFilter,
-                        File              = gdiTrack.TrackFile,
-                        FileOffset        = (ulong)gdiTrack.Offset,
-                        FileType          = "BINARY",
-                        RawBytesPerSector = gdiTrack.Bps,
-                        BytesPerSector    = gdiTrack.TrackType == TrackType.Data ? 2048 : 2352,
-                        SubchannelType    = TrackSubchannelType.None
-                    };
+                    Description       = null,
+                    StartSector       = gdiTrack.StartSector,
+                    Pregap            = gdiTrack.Pregap,
+                    Session           = (ushort)(gdiTrack.HighDensity ? 2 : 1),
+                    Sequence          = gdiTrack.Sequence,
+                    Type              = gdiTrack.TrackType,
+                    Filter            = gdiTrack.TrackFilter,
+                    File              = gdiTrack.TrackFile,
+                    FileOffset        = (ulong)gdiTrack.Offset,
+                    FileType          = "BINARY",
+                    RawBytesPerSector = gdiTrack.Bps,
+                    BytesPerSector    = gdiTrack.TrackType == TrackType.Data ? 2048 : 2352,
+                    SubchannelType    = TrackSubchannelType.None
+                };
 
-                    track.EndSector = track.StartSector + gdiTrack.Sectors - 1;
+                track.EndSector = track.StartSector + gdiTrack.Sectors - 1;
 
-                    tracks.Add(track);
-                }
-
-                return tracks;
+                tracks.Add(track);
             }
-        }
 
-        /// <inheritdoc />
-        public List<Session> Sessions => _discImage.Sessions;
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
+            return tracks;
+        }
     }
+
+    /// <inheritdoc />
+    public List<Session> Sessions => _discImage.Sessions;
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/GDI/Read.cs b/Aaru.Images/GDI/Read.cs
index 016337a15..573106fdd 100644
--- a/Aaru.Images/GDI/Read.cs
+++ b/Aaru.Images/GDI/Read.cs
@@ -43,882 +43,881 @@ using Aaru.Console;
 using Aaru.Decoders.CD;
 using Session = Aaru.CommonTypes.Structs.Session;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Gdi
 {
-    public sealed partial class Gdi
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        if(imageFilter == null)
+            return ErrorNumber.NoSuchFile;
+
+        try
         {
-            if(imageFilter == null)
-                return ErrorNumber.NoSuchFile;
+            imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
+            _gdiStream = new StreamReader(imageFilter.GetDataForkStream());
+            int  lineNumber  = 0;
+            bool highDensity = false;
 
-            try
+            // Initialize all RegExs
+            var regexTrack = new Regex(REGEX_TRACK);
+
+            // Initialize all RegEx matches
+
+            // Initialize disc
+            _discImage = new GdiDisc
             {
-                imageFilter.GetDataForkStream().Seek(0, SeekOrigin.Begin);
-                _gdiStream = new StreamReader(imageFilter.GetDataForkStream());
-                int  lineNumber  = 0;
-                bool highDensity = false;
+                Sessions = new List<Session>(),
+                Tracks   = new List<GdiTrack>()
+            };
 
-                // Initialize all RegExs
-                var regexTrack = new Regex(REGEX_TRACK);
+            ulong currentStart = 0;
+            _offsetMap                = new Dictionary<uint, ulong>();
+            _densitySeparationSectors = 0;
 
-                // Initialize all RegEx matches
+            while(_gdiStream.Peek() >= 0)
+            {
+                lineNumber++;
+                string line = _gdiStream.ReadLine();
 
-                // Initialize disc
-                _discImage = new GdiDisc
+                if(lineNumber == 1)
                 {
-                    Sessions = new List<Session>(),
-                    Tracks   = new List<GdiTrack>()
-                };
-
-                ulong currentStart = 0;
-                _offsetMap                = new Dictionary<uint, ulong>();
-                _densitySeparationSectors = 0;
-
-                while(_gdiStream.Peek() >= 0)
-                {
-                    lineNumber++;
-                    string line = _gdiStream.ReadLine();
-
-                    if(lineNumber == 1)
+                    if(!int.TryParse(line, out _))
                     {
-                        if(!int.TryParse(line, out _))
-                        {
-                            AaruConsole.ErrorWriteLine("Not a correct Dreamcast GDI image");
+                        AaruConsole.ErrorWriteLine("Not a correct Dreamcast GDI image");
 
-                            return ErrorNumber.InvalidArgument;
-                        }
-                    }
-                    else
-                    {
-                        Match trackMatch = regexTrack.Match(line ?? "");
-
-                        if(!trackMatch.Success)
-                        {
-                            AaruConsole.ErrorWriteLine($"Unknown line \"{line}\" at line {lineNumber}");
-
-                            return ErrorNumber.InvalidArgument;
-                        }
-
-                        AaruConsole.DebugWriteLine("GDI plugin",
-                                                   "Found track {0} starts at {1} flags {2} type {3} file {4} offset {5} at line {6}",
-                                                   trackMatch.Groups["track"].Value, trackMatch.Groups["start"].Value,
-                                                   trackMatch.Groups["flags"].Value, trackMatch.Groups["type"].Value,
-                                                   trackMatch.Groups["filename"].Value,
-                                                   trackMatch.Groups["offset"].Value, lineNumber);
-
-                        var filtersList = new FiltersList();
-
-                        var currentTrack = new GdiTrack
-                        {
-                            Bps         = ushort.Parse(trackMatch.Groups["type"].Value),
-                            Flags       = byte.Parse(trackMatch.Groups["flags"].Value),
-                            Offset      = long.Parse(trackMatch.Groups["offset"].Value),
-                            Sequence    = uint.Parse(trackMatch.Groups["track"].Value),
-                            StartSector = ulong.Parse(trackMatch.Groups["start"].Value),
-                            TrackFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
-                                                                             trackMatch.Groups["filename"].Value.
-                                                                                 Replace("\\\"", "\"").Trim('"')))
-                        };
-
-                        currentTrack.TrackFile = currentTrack.TrackFilter.Filename;
-
-                        if(currentTrack.StartSector - currentStart > 0)
-                            if(currentTrack.StartSector == 45000)
-                            {
-                                highDensity = true;
-                                _offsetMap.Add(0, currentStart);
-                                _densitySeparationSectors = currentTrack.StartSector - currentStart;
-                                currentStart              = currentTrack.StartSector;
-                            }
-                            else
-                            {
-                                currentTrack.Pregap      =  currentTrack.StartSector - currentStart;
-                                currentTrack.StartSector -= currentTrack.StartSector - currentStart;
-                            }
-
-                        if((currentTrack.TrackFilter.DataForkLength - currentTrack.Offset) % currentTrack.Bps != 0)
-                        {
-                            AaruConsole.ErrorWriteLine("Track size not a multiple of sector size");
-
-                            return ErrorNumber.InvalidArgument;
-                        }
-
-                        currentTrack.Sectors = (ulong)((currentTrack.TrackFilter.DataForkLength - currentTrack.Offset) /
-                                                       currentTrack.Bps);
-
-                        currentTrack.Sectors     += currentTrack.Pregap;
-                        currentStart             += currentTrack.Sectors;
-                        currentTrack.HighDensity =  highDensity;
-
-                        currentTrack.TrackType =
-                            (currentTrack.Flags & 0x4) == 0x4 ? TrackType.CdMode1 : TrackType.Audio;
-
-                        _discImage.Tracks.Add(currentTrack);
+                        return ErrorNumber.InvalidArgument;
                     }
                 }
-
-                Session[] sessions = new Session[2];
-
-                for(int s = 0; s < sessions.Length; s++)
-                    if(s == 0)
-                    {
-                        sessions[s].Sequence = 1;
-
-                        foreach(GdiTrack trk in _discImage.Tracks.Where(trk => !trk.HighDensity))
-                        {
-                            if(sessions[s].StartTrack == 0)
-                                sessions[s].StartTrack = trk.Sequence;
-                            else if(sessions[s].StartTrack > trk.Sequence)
-                                sessions[s].StartTrack = trk.Sequence;
-
-                            if(sessions[s].EndTrack < trk.Sequence)
-                                sessions[s].EndTrack = trk.Sequence;
-
-                            if(sessions[s].StartSector > trk.StartSector)
-                                sessions[s].StartSector = trk.StartSector;
-
-                            if(sessions[s].EndSector < trk.Sectors                    + trk.StartSector - 1)
-                                sessions[s].EndSector = trk.Sectors + trk.StartSector - 1;
-                        }
-                    }
-                    else
-                    {
-                        sessions[s].Sequence = 2;
-
-                        foreach(GdiTrack trk in _discImage.Tracks.Where(trk => trk.HighDensity))
-                        {
-                            if(sessions[s].StartTrack == 0)
-                                sessions[s].StartTrack = trk.Sequence;
-                            else if(sessions[s].StartTrack > trk.Sequence)
-                                sessions[s].StartTrack = trk.Sequence;
-
-                            if(sessions[s].EndTrack < trk.Sequence)
-                                sessions[s].EndTrack = trk.Sequence;
-
-                            if(sessions[s].StartSector > trk.StartSector)
-                                sessions[s].StartSector = trk.StartSector;
-
-                            if(sessions[s].EndSector < trk.Sectors                    + trk.StartSector - 1)
-                                sessions[s].EndSector = trk.Sectors + trk.StartSector - 1;
-                        }
-                    }
-
-                _discImage.Sessions.Add(sessions[0]);
-                _discImage.Sessions.Add(sessions[1]);
-
-                _discImage.Disktype = MediaType.GDROM;
-
-                // DEBUG information
-                AaruConsole.DebugWriteLine("GDI plugin", "Disc image parsing results");
-
-                AaruConsole.DebugWriteLine("GDI plugin", "Session information:");
-                AaruConsole.DebugWriteLine("GDI plugin", "\tDisc contains {0} sessions", _discImage.Sessions.Count);
-
-                for(int i = 0; i < _discImage.Sessions.Count; i++)
+                else
                 {
-                    AaruConsole.DebugWriteLine("GDI plugin", "\tSession {0} information:", i + 1);
+                    Match trackMatch = regexTrack.Match(line ?? "");
 
-                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tStarting track: {0}",
-                                               _discImage.Sessions[i].StartTrack);
-
-                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tStarting sector: {0}",
-                                               _discImage.Sessions[i].StartSector);
-
-                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tEnding track: {0}", _discImage.Sessions[i].EndTrack);
-
-                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tEnding sector: {0}",
-                                               _discImage.Sessions[i].EndSector);
-                }
-
-                AaruConsole.DebugWriteLine("GDI plugin", "Track information:");
-                AaruConsole.DebugWriteLine("GDI plugin", "\tDisc contains {0} tracks", _discImage.Tracks.Count);
-
-                for(int i = 0; i < _discImage.Tracks.Count; i++)
-                {
-                    AaruConsole.DebugWriteLine("GDI plugin", "\tTrack {0} information:", _discImage.Tracks[i].Sequence);
-                    AaruConsole.DebugWriteLine("GDI plugin", "\t\t{0} bytes per sector", _discImage.Tracks[i].Bps);
-                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tPregap: {0} sectors", _discImage.Tracks[i].Pregap);
-
-                    if((_discImage.Tracks[i].Flags & 0x8) == 0x8)
-                        AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack is flagged as quadraphonic");
-
-                    if((_discImage.Tracks[i].Flags & 0x4) == 0x4)
-                        AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack is data");
-
-                    if((_discImage.Tracks[i].Flags & 0x2) == 0x2)
-                        AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack allows digital copy");
-
-                    if((_discImage.Tracks[i].Flags & 0x1) == 0x1)
-                        AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack has pre-emphasis applied");
-
-                    AaruConsole.DebugWriteLine("GDI plugin",
-                                               "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
-                                               _discImage.Tracks[i].TrackFilter, _discImage.Tracks[i].TrackType,
-                                               _discImage.Tracks[i].Offset);
-                }
-
-                AaruConsole.DebugWriteLine("GDI plugin", "Building offset map");
-
-                Partitions = new List<Partition>();
-                ulong byteOffset = 0;
-
-                for(int i = 0; i < _discImage.Tracks.Count; i++)
-                {
-                    if(_discImage.Tracks[i].Sequence == 1 &&
-                       i                             != 0)
+                    if(!trackMatch.Success)
                     {
-                        AaruConsole.ErrorWriteLine("Unordered tracks");
+                        AaruConsole.ErrorWriteLine($"Unknown line \"{line}\" at line {lineNumber}");
 
                         return ErrorNumber.InvalidArgument;
                     }
 
-                    // Index 01
-                    var partition = new Partition
+                    AaruConsole.DebugWriteLine("GDI plugin",
+                                               "Found track {0} starts at {1} flags {2} type {3} file {4} offset {5} at line {6}",
+                                               trackMatch.Groups["track"].Value, trackMatch.Groups["start"].Value,
+                                               trackMatch.Groups["flags"].Value, trackMatch.Groups["type"].Value,
+                                               trackMatch.Groups["filename"].Value,
+                                               trackMatch.Groups["offset"].Value, lineNumber);
+
+                    var filtersList = new FiltersList();
+
+                    var currentTrack = new GdiTrack
                     {
-                        Description = $"Track {_discImage.Tracks[i].Sequence}.",
-                        Name        = null,
-                        Start       = _discImage.Tracks[i].StartSector,
-                        Size        = _discImage.Tracks[i].Sectors * _discImage.Tracks[i].Bps,
-                        Length      = _discImage.Tracks[i].Sectors,
-                        Sequence    = _discImage.Tracks[i].Sequence,
-                        Offset      = byteOffset,
-                        Type        = _discImage.Tracks[i].TrackType.ToString()
+                        Bps         = ushort.Parse(trackMatch.Groups["type"].Value),
+                        Flags       = byte.Parse(trackMatch.Groups["flags"].Value),
+                        Offset      = long.Parse(trackMatch.Groups["offset"].Value),
+                        Sequence    = uint.Parse(trackMatch.Groups["track"].Value),
+                        StartSector = ulong.Parse(trackMatch.Groups["start"].Value),
+                        TrackFilter = filtersList.GetFilter(Path.Combine(imageFilter.ParentFolder,
+                                                                         trackMatch.Groups["filename"].Value.
+                                                                             Replace("\\\"", "\"").Trim('"')))
                     };
 
-                    byteOffset += partition.Size;
-                    _offsetMap.Add(_discImage.Tracks[i].Sequence, partition.Start);
-                    Partitions.Add(partition);
-                }
+                    currentTrack.TrackFile = currentTrack.TrackFilter.Filename;
 
-                foreach(GdiTrack track in _discImage.Tracks)
-                    _imageInfo.ImageSize += track.Bps * track.Sectors;
+                    if(currentTrack.StartSector - currentStart > 0)
+                        if(currentTrack.StartSector == 45000)
+                        {
+                            highDensity = true;
+                            _offsetMap.Add(0, currentStart);
+                            _densitySeparationSectors = currentTrack.StartSector - currentStart;
+                            currentStart              = currentTrack.StartSector;
+                        }
+                        else
+                        {
+                            currentTrack.Pregap      =  currentTrack.StartSector - currentStart;
+                            currentTrack.StartSector -= currentTrack.StartSector - currentStart;
+                        }
 
-                foreach(GdiTrack track in _discImage.Tracks)
-                    _imageInfo.Sectors += track.Sectors;
-
-                _imageInfo.Sectors += _densitySeparationSectors;
-
-                _imageInfo.SectorSize = 2352; // All others
-
-                foreach(GdiTrack unused in _discImage.Tracks.Where(track => (track.Flags & 0x4) == 0x4 &&
-                                                                            track.Bps           == 2352))
-                {
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-                }
-
-                _imageInfo.CreationTime         = imageFilter.CreationTime;
-                _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-
-                _imageInfo.MediaType = _discImage.Disktype;
-
-                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-
-                _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
-
-                AaruConsole.VerboseWriteLine("GDI image describes a disc of type {0}", _imageInfo.MediaType);
-
-                _sectorBuilder = new SectorBuilder();
-
-                return ErrorNumber.NoError;
-            }
-            catch(Exception ex)
-            {
-                AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.BasePath);
-                AaruConsole.ErrorWriteLine("Exception: {0}", ex);
-
-                return ErrorNumber.UnexpectedException;
-            }
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from gdiTrack in _discImage.Tracks
-                                                     where gdiTrack.Sequence         == kvp.Key
-                                                     where sectorAddress - kvp.Value < gdiTrack.Sectors select kvp)
-                return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            _offsetMap.TryGetValue(0, out ulong transitionStart);
-
-            if(sectorAddress < transitionStart ||
-               sectorAddress >= _densitySeparationSectors + transitionStart)
-                return ErrorNumber.SectorNotFound;
-
-            return ReadSectors(sectorAddress - transitionStart, length, 0, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from gdiTrack in _discImage.Tracks
-                                                     where gdiTrack.Sequence         == kvp.Key
-                                                     where sectorAddress - kvp.Value < gdiTrack.Sectors select kvp)
-                return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
-
-            _offsetMap.TryGetValue(0, out ulong transitionStart);
-
-            if(sectorAddress < transitionStart ||
-               sectorAddress >= _densitySeparationSectors + transitionStart)
-                return ErrorNumber.SectorNotFound;
-
-            return ReadSectorsTag(sectorAddress - transitionStart, length, 0, tag, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(track == 0)
-            {
-                if(sectorAddress + length > _densitySeparationSectors)
-                    return ErrorNumber.OutOfRange;
-
-                buffer = new byte[length * 2352];
-
-                return ErrorNumber.NoError;
-            }
-
-            var aaruTrack = new GdiTrack
-            {
-                Sequence = 0
-            };
-
-            foreach(GdiTrack gdiTrack in _discImage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track))
-            {
-                aaruTrack = gdiTrack;
-
-                break;
-            }
-
-            if(aaruTrack.Sequence == 0)
-                return ErrorNumber.SectorNotFound;
-
-            if(sectorAddress + length > aaruTrack.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch(aaruTrack.TrackType)
-            {
-                case TrackType.Audio:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-                case TrackType.CdMode1:
-                {
-                    if(aaruTrack.Bps == 2352)
+                    if((currentTrack.TrackFilter.DataForkLength - currentTrack.Offset) % currentTrack.Bps != 0)
                     {
-                        sectorOffset = 16;
-                        sectorSize   = 2048;
-                        sectorSkip   = 288;
-                    }
-                    else
-                    {
-                        sectorOffset = 0;
-                        sectorSize   = 2048;
-                        sectorSkip   = 0;
+                        AaruConsole.ErrorWriteLine("Track size not a multiple of sector size");
+
+                        return ErrorNumber.InvalidArgument;
                     }
 
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
+                    currentTrack.Sectors = (ulong)((currentTrack.TrackFilter.DataForkLength - currentTrack.Offset) /
+                                                   currentTrack.Bps);
 
-            buffer = new byte[sectorSize * length];
+                    currentTrack.Sectors     += currentTrack.Pregap;
+                    currentStart             += currentTrack.Sectors;
+                    currentTrack.HighDensity =  highDensity;
 
-            ulong remainingSectors = length;
+                    currentTrack.TrackType =
+                        (currentTrack.Flags & 0x4) == 0x4 ? TrackType.CdMode1 : TrackType.Audio;
 
-            if(aaruTrack.Pregap > 0 &&
-               sectorAddress    < aaruTrack.Pregap)
-            {
-                ulong remainingPregap = aaruTrack.Pregap - sectorAddress;
-
-                remainingSectors -= length > remainingPregap ? remainingPregap : length;
-            }
-
-            if(remainingSectors == 0)
-                return ErrorNumber.NoError;
-
-            _imageStream = aaruTrack.TrackFilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            long pos = aaruTrack.Offset + (long)((sectorAddress    * (sectorOffset + sectorSize + sectorSkip)) -
-                                                 (aaruTrack.Pregap * aaruTrack.Bps));
-
-            if(pos < 0)
-                pos = 0;
-
-            br.BaseStream.Seek(pos, SeekOrigin.Begin);
-
-            if(sectorOffset     == 0 &&
-               sectorSkip       == 0 &&
-               remainingSectors == length)
-                buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-            {
-                byte[] tmp = br.ReadBytes((int)(sectorSize * remainingSectors));
-                Array.Copy(tmp, 0, buffer, (int)((length - remainingSectors) * sectorSize), tmp.Length);
-            }
-            else
-            {
-                int bufferPos = (int)((length - remainingSectors) * sectorSize);
-
-                for(ulong i = 0; i < remainingSectors; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, bufferPos, sectorSize);
-                    bufferPos += (int)sectorSize;
+                    _discImage.Tracks.Add(currentTrack);
                 }
             }
 
-            return ErrorNumber.NoError;
-        }
+            Session[] sessions = new Session[2];
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
-        {
-            buffer = null;
-
-            if(tag == SectorTagType.CdTrackFlags)
-                track = (uint)sectorAddress;
-
-            if(track == 0)
-            {
-                if(sectorAddress + length > _densitySeparationSectors)
-                    return ErrorNumber.OutOfRange;
-
-                if(tag != SectorTagType.CdTrackFlags)
-                    return ErrorNumber.NotSupported;
-
-                buffer = new byte[]
+            for(int s = 0; s < sessions.Length; s++)
+                if(s == 0)
                 {
-                    0x00
+                    sessions[s].Sequence = 1;
+
+                    foreach(GdiTrack trk in _discImage.Tracks.Where(trk => !trk.HighDensity))
+                    {
+                        if(sessions[s].StartTrack == 0)
+                            sessions[s].StartTrack = trk.Sequence;
+                        else if(sessions[s].StartTrack > trk.Sequence)
+                            sessions[s].StartTrack = trk.Sequence;
+
+                        if(sessions[s].EndTrack < trk.Sequence)
+                            sessions[s].EndTrack = trk.Sequence;
+
+                        if(sessions[s].StartSector > trk.StartSector)
+                            sessions[s].StartSector = trk.StartSector;
+
+                        if(sessions[s].EndSector < trk.Sectors                    + trk.StartSector - 1)
+                            sessions[s].EndSector = trk.Sectors + trk.StartSector - 1;
+                    }
+                }
+                else
+                {
+                    sessions[s].Sequence = 2;
+
+                    foreach(GdiTrack trk in _discImage.Tracks.Where(trk => trk.HighDensity))
+                    {
+                        if(sessions[s].StartTrack == 0)
+                            sessions[s].StartTrack = trk.Sequence;
+                        else if(sessions[s].StartTrack > trk.Sequence)
+                            sessions[s].StartTrack = trk.Sequence;
+
+                        if(sessions[s].EndTrack < trk.Sequence)
+                            sessions[s].EndTrack = trk.Sequence;
+
+                        if(sessions[s].StartSector > trk.StartSector)
+                            sessions[s].StartSector = trk.StartSector;
+
+                        if(sessions[s].EndSector < trk.Sectors                    + trk.StartSector - 1)
+                            sessions[s].EndSector = trk.Sectors + trk.StartSector - 1;
+                    }
+                }
+
+            _discImage.Sessions.Add(sessions[0]);
+            _discImage.Sessions.Add(sessions[1]);
+
+            _discImage.Disktype = MediaType.GDROM;
+
+            // DEBUG information
+            AaruConsole.DebugWriteLine("GDI plugin", "Disc image parsing results");
+
+            AaruConsole.DebugWriteLine("GDI plugin", "Session information:");
+            AaruConsole.DebugWriteLine("GDI plugin", "\tDisc contains {0} sessions", _discImage.Sessions.Count);
+
+            for(int i = 0; i < _discImage.Sessions.Count; i++)
+            {
+                AaruConsole.DebugWriteLine("GDI plugin", "\tSession {0} information:", i + 1);
+
+                AaruConsole.DebugWriteLine("GDI plugin", "\t\tStarting track: {0}",
+                                           _discImage.Sessions[i].StartTrack);
+
+                AaruConsole.DebugWriteLine("GDI plugin", "\t\tStarting sector: {0}",
+                                           _discImage.Sessions[i].StartSector);
+
+                AaruConsole.DebugWriteLine("GDI plugin", "\t\tEnding track: {0}", _discImage.Sessions[i].EndTrack);
+
+                AaruConsole.DebugWriteLine("GDI plugin", "\t\tEnding sector: {0}",
+                                           _discImage.Sessions[i].EndSector);
+            }
+
+            AaruConsole.DebugWriteLine("GDI plugin", "Track information:");
+            AaruConsole.DebugWriteLine("GDI plugin", "\tDisc contains {0} tracks", _discImage.Tracks.Count);
+
+            for(int i = 0; i < _discImage.Tracks.Count; i++)
+            {
+                AaruConsole.DebugWriteLine("GDI plugin", "\tTrack {0} information:", _discImage.Tracks[i].Sequence);
+                AaruConsole.DebugWriteLine("GDI plugin", "\t\t{0} bytes per sector", _discImage.Tracks[i].Bps);
+                AaruConsole.DebugWriteLine("GDI plugin", "\t\tPregap: {0} sectors", _discImage.Tracks[i].Pregap);
+
+                if((_discImage.Tracks[i].Flags & 0x8) == 0x8)
+                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack is flagged as quadraphonic");
+
+                if((_discImage.Tracks[i].Flags & 0x4) == 0x4)
+                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack is data");
+
+                if((_discImage.Tracks[i].Flags & 0x2) == 0x2)
+                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack allows digital copy");
+
+                if((_discImage.Tracks[i].Flags & 0x1) == 0x1)
+                    AaruConsole.DebugWriteLine("GDI plugin", "\t\tTrack has pre-emphasis applied");
+
+                AaruConsole.DebugWriteLine("GDI plugin",
+                                           "\t\tTrack resides in file {0}, type defined as {1}, starting at byte {2}",
+                                           _discImage.Tracks[i].TrackFilter, _discImage.Tracks[i].TrackType,
+                                           _discImage.Tracks[i].Offset);
+            }
+
+            AaruConsole.DebugWriteLine("GDI plugin", "Building offset map");
+
+            Partitions = new List<Partition>();
+            ulong byteOffset = 0;
+
+            for(int i = 0; i < _discImage.Tracks.Count; i++)
+            {
+                if(_discImage.Tracks[i].Sequence == 1 &&
+                   i                             != 0)
+                {
+                    AaruConsole.ErrorWriteLine("Unordered tracks");
+
+                    return ErrorNumber.InvalidArgument;
+                }
+
+                // Index 01
+                var partition = new Partition
+                {
+                    Description = $"Track {_discImage.Tracks[i].Sequence}.",
+                    Name        = null,
+                    Start       = _discImage.Tracks[i].StartSector,
+                    Size        = _discImage.Tracks[i].Sectors * _discImage.Tracks[i].Bps,
+                    Length      = _discImage.Tracks[i].Sectors,
+                    Sequence    = _discImage.Tracks[i].Sequence,
+                    Offset      = byteOffset,
+                    Type        = _discImage.Tracks[i].TrackType.ToString()
                 };
 
-                return ErrorNumber.NoError;
+                byteOffset += partition.Size;
+                _offsetMap.Add(_discImage.Tracks[i].Sequence, partition.Start);
+                Partitions.Add(partition);
             }
 
-            var aaruTrack = new GdiTrack
-            {
-                Sequence = 0
-            };
+            foreach(GdiTrack track in _discImage.Tracks)
+                _imageInfo.ImageSize += track.Bps * track.Sectors;
 
-            foreach(GdiTrack gdiTrack in _discImage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track))
-            {
-                aaruTrack = gdiTrack;
+            foreach(GdiTrack track in _discImage.Tracks)
+                _imageInfo.Sectors += track.Sectors;
 
-                break;
+            _imageInfo.Sectors += _densitySeparationSectors;
+
+            _imageInfo.SectorSize = 2352; // All others
+
+            foreach(GdiTrack unused in _discImage.Tracks.Where(track => (track.Flags & 0x4) == 0x4 &&
+                                                                        track.Bps           == 2352))
+            {
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
             }
 
-            if(aaruTrack.Sequence == 0)
-                return ErrorNumber.SectorNotFound;
+            _imageInfo.CreationTime         = imageFilter.CreationTime;
+            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
 
-            if(length > aaruTrack.Sectors)
+            _imageInfo.MediaType = _discImage.Disktype;
+
+            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+
+            _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
+
+            AaruConsole.VerboseWriteLine("GDI image describes a disc of type {0}", _imageInfo.MediaType);
+
+            _sectorBuilder = new SectorBuilder();
+
+            return ErrorNumber.NoError;
+        }
+        catch(Exception ex)
+        {
+            AaruConsole.ErrorWriteLine("Exception trying to identify image file {0}", imageFilter.BasePath);
+            AaruConsole.ErrorWriteLine("Exception: {0}", ex);
+
+            return ErrorNumber.UnexpectedException;
+        }
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from gdiTrack in _discImage.Tracks
+                                                 where gdiTrack.Sequence         == kvp.Key
+                                                 where sectorAddress - kvp.Value < gdiTrack.Sectors select kvp)
+            return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        _offsetMap.TryGetValue(0, out ulong transitionStart);
+
+        if(sectorAddress < transitionStart ||
+           sectorAddress >= _densitySeparationSectors + transitionStart)
+            return ErrorNumber.SectorNotFound;
+
+        return ReadSectors(sectorAddress - transitionStart, length, 0, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from gdiTrack in _discImage.Tracks
+                                                 where gdiTrack.Sequence         == kvp.Key
+                                                 where sectorAddress - kvp.Value < gdiTrack.Sectors select kvp)
+            return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
+
+        _offsetMap.TryGetValue(0, out ulong transitionStart);
+
+        if(sectorAddress < transitionStart ||
+           sectorAddress >= _densitySeparationSectors + transitionStart)
+            return ErrorNumber.SectorNotFound;
+
+        return ReadSectorsTag(sectorAddress - transitionStart, length, 0, tag, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(track == 0)
+        {
+            if(sectorAddress + length > _densitySeparationSectors)
                 return ErrorNumber.OutOfRange;
 
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch(tag)
-            {
-                case SectorTagType.CdSectorEcc:
-                case SectorTagType.CdSectorEccP:
-                case SectorTagType.CdSectorEccQ:
-                case SectorTagType.CdSectorEdc:
-                case SectorTagType.CdSectorHeader:
-                case SectorTagType.CdSectorSync: break;
-                case SectorTagType.CdTrackFlags:
-                {
-                    buffer = new byte[1];
-
-                    buffer[0] += aaruTrack.Flags;
-
-                    return ErrorNumber.NoError;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-
-            switch(aaruTrack.TrackType)
-            {
-                case TrackType.Audio: return ErrorNumber.NoData;
-                case TrackType.CdMode1:
-                {
-                    // TODO: Build
-                    if(aaruTrack.Bps != 2352)
-                        return ErrorNumber.NoData;
-
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorSubchannel:
-                        case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2064;
-                            sectorSize   = 4;
-                            sectorSkip   = 284;
-
-                            break;
-                        }
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                }
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            ulong remainingSectors = length;
-
-            if(aaruTrack.Pregap > 0 &&
-               sectorAddress    < aaruTrack.Pregap)
-            {
-                ulong remainingPregap = aaruTrack.Pregap - sectorAddress;
-
-                remainingSectors -= length > remainingPregap ? remainingPregap : length;
-            }
-
-            if(remainingSectors == 0)
-                return ErrorNumber.NoError;
-
-            _imageStream = aaruTrack.TrackFilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            long pos = aaruTrack.Offset + (long)((sectorAddress    * (sectorOffset + sectorSize + sectorSkip)) -
-                                                 (aaruTrack.Pregap * aaruTrack.Bps));
-
-            if(pos < 0)
-                pos = 0;
-
-            br.BaseStream.Seek(pos, SeekOrigin.Begin);
-
-            if(sectorOffset     == 0 &&
-               sectorSkip       == 0 &&
-               remainingSectors == length)
-                buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-            {
-                byte[] tmp = br.ReadBytes((int)(sectorSize * remainingSectors));
-                Array.Copy(tmp, 0, buffer, (int)((length - remainingSectors) * sectorSize), tmp.Length);
-            }
-            else
-            {
-                int bufferPos = (int)((length - remainingSectors) * sectorSize);
-
-                for(ulong i = 0; i < remainingSectors; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, bufferPos, sectorSize);
-                    bufferPos += (int)sectorSize;
-                }
-            }
+            buffer = new byte[length * 2352];
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+        var aaruTrack = new GdiTrack
         {
-            buffer = null;
+            Sequence = 0
+        };
 
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
-                                                     from gdiTrack in _discImage.Tracks
-                                                     where gdiTrack.Sequence         == kvp.Key
-                                                     where sectorAddress - kvp.Value < gdiTrack.Sectors select kvp)
-                return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+        foreach(GdiTrack gdiTrack in _discImage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track))
+        {
+            aaruTrack = gdiTrack;
 
-            return ErrorNumber.SectorNotFound;
+            break;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+        if(aaruTrack.Sequence == 0)
+            return ErrorNumber.SectorNotFound;
+
+        if(sectorAddress + length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(aaruTrack.TrackType)
         {
-            buffer = null;
-
-            if(track == 0)
+            case TrackType.Audio:
             {
-                if(sectorAddress + length > _densitySeparationSectors)
-                    return ErrorNumber.OutOfRange;
-
-                buffer = new byte[length * 2352];
-
-                return ErrorNumber.NoError;
-            }
-
-            var aaruTrack = new GdiTrack
-            {
-                Sequence = 0
-            };
-
-            foreach(GdiTrack gdiTrack in _discImage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track))
-            {
-                aaruTrack = gdiTrack;
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
 
                 break;
             }
+            case TrackType.CdMode1:
+            {
+                if(aaruTrack.Bps == 2352)
+                {
+                    sectorOffset = 16;
+                    sectorSize   = 2048;
+                    sectorSkip   = 288;
+                }
+                else
+                {
+                    sectorOffset = 0;
+                    sectorSize   = 2048;
+                    sectorSkip   = 0;
+                }
 
-            if(aaruTrack.Sequence == 0)
-                return ErrorNumber.SectorNotFound;
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
 
-            if(sectorAddress + length > aaruTrack.Sectors)
+        buffer = new byte[sectorSize * length];
+
+        ulong remainingSectors = length;
+
+        if(aaruTrack.Pregap > 0 &&
+           sectorAddress    < aaruTrack.Pregap)
+        {
+            ulong remainingPregap = aaruTrack.Pregap - sectorAddress;
+
+            remainingSectors -= length > remainingPregap ? remainingPregap : length;
+        }
+
+        if(remainingSectors == 0)
+            return ErrorNumber.NoError;
+
+        _imageStream = aaruTrack.TrackFilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        long pos = aaruTrack.Offset + (long)((sectorAddress    * (sectorOffset + sectorSize + sectorSkip)) -
+                                             (aaruTrack.Pregap * aaruTrack.Bps));
+
+        if(pos < 0)
+            pos = 0;
+
+        br.BaseStream.Seek(pos, SeekOrigin.Begin);
+
+        if(sectorOffset     == 0 &&
+           sectorSkip       == 0 &&
+           remainingSectors == length)
+            buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+        {
+            byte[] tmp = br.ReadBytes((int)(sectorSize * remainingSectors));
+            Array.Copy(tmp, 0, buffer, (int)((length - remainingSectors) * sectorSize), tmp.Length);
+        }
+        else
+        {
+            int bufferPos = (int)((length - remainingSectors) * sectorSize);
+
+            for(ulong i = 0; i < remainingSectors; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, bufferPos, sectorSize);
+                bufferPos += (int)sectorSize;
+            }
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag == SectorTagType.CdTrackFlags)
+            track = (uint)sectorAddress;
+
+        if(track == 0)
+        {
+            if(sectorAddress + length > _densitySeparationSectors)
                 return ErrorNumber.OutOfRange;
 
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
+            if(tag != SectorTagType.CdTrackFlags)
+                return ErrorNumber.NotSupported;
 
-            switch(aaruTrack.TrackType)
+            buffer = new byte[]
             {
-                case TrackType.Audio:
+                0x00
+            };
+
+            return ErrorNumber.NoError;
+        }
+
+        var aaruTrack = new GdiTrack
+        {
+            Sequence = 0
+        };
+
+        foreach(GdiTrack gdiTrack in _discImage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track))
+        {
+            aaruTrack = gdiTrack;
+
+            break;
+        }
+
+        if(aaruTrack.Sequence == 0)
+            return ErrorNumber.SectorNotFound;
+
+        if(length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(tag)
+        {
+            case SectorTagType.CdSectorEcc:
+            case SectorTagType.CdSectorEccP:
+            case SectorTagType.CdSectorEccQ:
+            case SectorTagType.CdSectorEdc:
+            case SectorTagType.CdSectorHeader:
+            case SectorTagType.CdSectorSync: break;
+            case SectorTagType.CdTrackFlags:
+            {
+                buffer = new byte[1];
+
+                buffer[0] += aaruTrack.Flags;
+
+                return ErrorNumber.NoError;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        switch(aaruTrack.TrackType)
+        {
+            case TrackType.Audio: return ErrorNumber.NoData;
+            case TrackType.CdMode1:
+            {
+                // TODO: Build
+                if(aaruTrack.Bps != 2352)
+                    return ErrorNumber.NoData;
+
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorSubchannel:
+                    case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2064;
+                        sectorSize   = 4;
+                        sectorSkip   = 284;
+
+                        break;
+                    }
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        ulong remainingSectors = length;
+
+        if(aaruTrack.Pregap > 0 &&
+           sectorAddress    < aaruTrack.Pregap)
+        {
+            ulong remainingPregap = aaruTrack.Pregap - sectorAddress;
+
+            remainingSectors -= length > remainingPregap ? remainingPregap : length;
+        }
+
+        if(remainingSectors == 0)
+            return ErrorNumber.NoError;
+
+        _imageStream = aaruTrack.TrackFilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        long pos = aaruTrack.Offset + (long)((sectorAddress    * (sectorOffset + sectorSize + sectorSkip)) -
+                                             (aaruTrack.Pregap * aaruTrack.Bps));
+
+        if(pos < 0)
+            pos = 0;
+
+        br.BaseStream.Seek(pos, SeekOrigin.Begin);
+
+        if(sectorOffset     == 0 &&
+           sectorSkip       == 0 &&
+           remainingSectors == length)
+            buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+        {
+            byte[] tmp = br.ReadBytes((int)(sectorSize * remainingSectors));
+            Array.Copy(tmp, 0, buffer, (int)((length - remainingSectors) * sectorSize), tmp.Length);
+        }
+        else
+        {
+            int bufferPos = (int)((length - remainingSectors) * sectorSize);
+
+            for(ulong i = 0; i < remainingSectors; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, bufferPos, sectorSize);
+                bufferPos += (int)sectorSize;
+            }
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetMap where sectorAddress >= kvp.Value
+                                                 from gdiTrack in _discImage.Tracks
+                                                 where gdiTrack.Sequence         == kvp.Key
+                                                 where sectorAddress - kvp.Value < gdiTrack.Sectors select kvp)
+            return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(track == 0)
+        {
+            if(sectorAddress + length > _densitySeparationSectors)
+                return ErrorNumber.OutOfRange;
+
+            buffer = new byte[length * 2352];
+
+            return ErrorNumber.NoError;
+        }
+
+        var aaruTrack = new GdiTrack
+        {
+            Sequence = 0
+        };
+
+        foreach(GdiTrack gdiTrack in _discImage.Tracks.Where(gdiTrack => gdiTrack.Sequence == track))
+        {
+            aaruTrack = gdiTrack;
+
+            break;
+        }
+
+        if(aaruTrack.Sequence == 0)
+            return ErrorNumber.SectorNotFound;
+
+        if(sectorAddress + length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(aaruTrack.TrackType)
+        {
+            case TrackType.Audio:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+            case TrackType.CdMode1:
+            {
+                if(aaruTrack.Bps == 2352)
                 {
                     sectorOffset = 0;
                     sectorSize   = 2352;
                     sectorSkip   = 0;
-
-                    break;
                 }
-                case TrackType.CdMode1:
+                else
                 {
-                    if(aaruTrack.Bps == 2352)
-                    {
-                        sectorOffset = 0;
-                        sectorSize   = 2352;
-                        sectorSkip   = 0;
-                    }
-                    else
-                    {
-                        sectorOffset = 0;
-                        sectorSize   = 2048;
-                        sectorSkip   = 0;
-                    }
-
-                    break;
+                    sectorOffset = 0;
+                    sectorSize   = 2048;
+                    sectorSkip   = 0;
                 }
-                default: return ErrorNumber.NotSupported;
+
+                break;
             }
+            default: return ErrorNumber.NotSupported;
+        }
 
-            buffer = new byte[sectorSize * length];
+        buffer = new byte[sectorSize * length];
 
-            ulong remainingSectors = length;
+        ulong remainingSectors = length;
 
-            if(aaruTrack.Pregap > 0 &&
-               sectorAddress    < aaruTrack.Pregap)
-            {
-                ulong remainingPregap = aaruTrack.Pregap - sectorAddress;
+        if(aaruTrack.Pregap > 0 &&
+           sectorAddress    < aaruTrack.Pregap)
+        {
+            ulong remainingPregap = aaruTrack.Pregap - sectorAddress;
 
-                remainingSectors -= length > remainingPregap ? remainingPregap : length;
-            }
-
-            if(remainingSectors == 0)
-                return ErrorNumber.NoError;
-
-            _imageStream = aaruTrack.TrackFilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            long pos = aaruTrack.Offset + (long)((sectorAddress    * (sectorOffset + sectorSize + sectorSkip)) -
-                                                 (aaruTrack.Pregap * aaruTrack.Bps));
-
-            if(pos < 0)
-                pos = 0;
-
-            br.BaseStream.Seek(pos, SeekOrigin.Begin);
-
-            if(sectorOffset     == 0 &&
-               sectorSkip       == 0 &&
-               remainingSectors == length)
-                buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-            {
-                byte[] tmp = br.ReadBytes((int)(sectorSize * remainingSectors));
-                Array.Copy(tmp, 0, buffer, (int)((length - remainingSectors) * sectorSize), tmp.Length);
-            }
-            else
-            {
-                int bufferPos = (int)((length - remainingSectors) * sectorSize);
-
-                for(ulong i = 0; i < remainingSectors; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, bufferPos, sectorSize);
-                    bufferPos += (int)sectorSize;
-                }
-            }
-
-            switch(aaruTrack.TrackType)
-            {
-                case TrackType.CdMode1 when aaruTrack.Bps == 2048:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        Array.Copy(buffer, i * 2048, fullSector, 16, 2048);
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)(sectorAddress + i));
-                        _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-            }
+            remainingSectors -= length > remainingPregap ? remainingPregap : length;
+        }
 
+        if(remainingSectors == 0)
             return ErrorNumber.NoError;
-        }
 
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(Session session)
+        _imageStream = aaruTrack.TrackFilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        long pos = aaruTrack.Offset + (long)((sectorAddress    * (sectorOffset + sectorSize + sectorSkip)) -
+                                             (aaruTrack.Pregap * aaruTrack.Bps));
+
+        if(pos < 0)
+            pos = 0;
+
+        br.BaseStream.Seek(pos, SeekOrigin.Begin);
+
+        if(sectorOffset     == 0 &&
+           sectorSkip       == 0 &&
+           remainingSectors == length)
+            buffer = br.ReadBytes((int)(sectorSize * remainingSectors));
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
         {
-            if(_discImage.Sessions.Contains(session))
-                return GetSessionTracks(session.Sequence);
-
-            return null;
+            byte[] tmp = br.ReadBytes((int)(sectorSize * remainingSectors));
+            Array.Copy(tmp, 0, buffer, (int)((length - remainingSectors) * sectorSize), tmp.Length);
         }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session)
+        else
         {
-            List<Track> tracks = new();
-            bool        expectedDensity;
+            int bufferPos = (int)((length - remainingSectors) * sectorSize);
 
-            switch(session)
+            for(ulong i = 0; i < remainingSectors; i++)
             {
-                case 1:
-                    expectedDensity = false;
-
-                    break;
-                case 2:
-                    expectedDensity = true;
-
-                    break;
-                default: return null;
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, bufferPos, sectorSize);
+                bufferPos += (int)sectorSize;
             }
+        }
 
-            foreach(GdiTrack gdiTrack in _discImage.Tracks)
-                if(gdiTrack.HighDensity == expectedDensity)
+        switch(aaruTrack.TrackType)
+        {
+            case TrackType.CdMode1 when aaruTrack.Bps == 2048:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
                 {
-                    var track = new Track
-                    {
-                        Description       = null,
-                        StartSector       = gdiTrack.StartSector,
-                        Pregap            = gdiTrack.Pregap,
-                        Session           = (ushort)(gdiTrack.HighDensity ? 2 : 1),
-                        Sequence          = gdiTrack.Sequence,
-                        Type              = gdiTrack.TrackType,
-                        Filter            = gdiTrack.TrackFilter,
-                        File              = gdiTrack.TrackFile,
-                        FileOffset        = (ulong)gdiTrack.Offset,
-                        FileType          = "BINARY",
-                        RawBytesPerSector = gdiTrack.Bps,
-                        BytesPerSector    = gdiTrack.TrackType == TrackType.Data ? 2048 : 2352,
-                        SubchannelType    = TrackSubchannelType.None
-                    };
-
-                    track.EndSector = track.StartSector + gdiTrack.Sectors - 1;
-
-                    tracks.Add(track);
+                    Array.Copy(buffer, i * 2048, fullSector, 16, 2048);
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)(sectorAddress + i));
+                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
                 }
 
-            return tracks;
+                buffer = fullBuffer;
+
+                break;
+            }
         }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(Session session)
+    {
+        if(_discImage.Sessions.Contains(session))
+            return GetSessionTracks(session.Sequence);
+
+        return null;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session)
+    {
+        List<Track> tracks = new();
+        bool        expectedDensity;
+
+        switch(session)
+        {
+            case 1:
+                expectedDensity = false;
+
+                break;
+            case 2:
+                expectedDensity = true;
+
+                break;
+            default: return null;
+        }
+
+        foreach(GdiTrack gdiTrack in _discImage.Tracks)
+            if(gdiTrack.HighDensity == expectedDensity)
+            {
+                var track = new Track
+                {
+                    Description       = null,
+                    StartSector       = gdiTrack.StartSector,
+                    Pregap            = gdiTrack.Pregap,
+                    Session           = (ushort)(gdiTrack.HighDensity ? 2 : 1),
+                    Sequence          = gdiTrack.Sequence,
+                    Type              = gdiTrack.TrackType,
+                    Filter            = gdiTrack.TrackFilter,
+                    File              = gdiTrack.TrackFile,
+                    FileOffset        = (ulong)gdiTrack.Offset,
+                    FileType          = "BINARY",
+                    RawBytesPerSector = gdiTrack.Bps,
+                    BytesPerSector    = gdiTrack.TrackType == TrackType.Data ? 2048 : 2352,
+                    SubchannelType    = TrackSubchannelType.None
+                };
+
+                track.EndSector = track.StartSector + gdiTrack.Sectors - 1;
+
+                tracks.Add(track);
+            }
+
+        return tracks;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/GDI/Structs.cs b/Aaru.Images/GDI/Structs.cs
index abd235dae..0a8e5bf39 100644
--- a/Aaru.Images/GDI/Structs.cs
+++ b/Aaru.Images/GDI/Structs.cs
@@ -36,44 +36,43 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Gdi
-    {
-        struct GdiTrack
-        {
-            /// <summary>Track #</summary>
-            public uint Sequence;
-            /// <summary>Track filter</summary>
-            public IFilter TrackFilter;
-            /// <summary>Track file</summary>
-            public string TrackFile;
-            /// <summary>Track byte offset in file</summary>
-            public long Offset;
-            /// <summary>Track flags</summary>
-            public byte Flags;
-            /// <summary>Track starting sector</summary>
-            public ulong StartSector;
-            /// <summary>Bytes per sector</summary>
-            public ushort Bps;
-            /// <summary>Sectors in track</summary>
-            public ulong Sectors;
-            /// <summary>Track type</summary>
-            public TrackType TrackType;
-            /// <summary>Track session</summary>
-            public bool HighDensity;
-            /// <summary>Pregap sectors not stored in track file</summary>
-            public ulong Pregap;
-        }
+namespace Aaru.DiscImages;
 
-        struct GdiDisc
-        {
-            /// <summary>Sessions</summary>
-            public List<Session> Sessions;
-            /// <summary>Tracks</summary>
-            public List<GdiTrack> Tracks;
-            /// <summary>Disk type</summary>
-            public MediaType Disktype;
-        }
+public sealed partial class Gdi
+{
+    struct GdiTrack
+    {
+        /// <summary>Track #</summary>
+        public uint Sequence;
+        /// <summary>Track filter</summary>
+        public IFilter TrackFilter;
+        /// <summary>Track file</summary>
+        public string TrackFile;
+        /// <summary>Track byte offset in file</summary>
+        public long Offset;
+        /// <summary>Track flags</summary>
+        public byte Flags;
+        /// <summary>Track starting sector</summary>
+        public ulong StartSector;
+        /// <summary>Bytes per sector</summary>
+        public ushort Bps;
+        /// <summary>Sectors in track</summary>
+        public ulong Sectors;
+        /// <summary>Track type</summary>
+        public TrackType TrackType;
+        /// <summary>Track session</summary>
+        public bool HighDensity;
+        /// <summary>Pregap sectors not stored in track file</summary>
+        public ulong Pregap;
+    }
+
+    struct GdiDisc
+    {
+        /// <summary>Sessions</summary>
+        public List<Session> Sessions;
+        /// <summary>Tracks</summary>
+        public List<GdiTrack> Tracks;
+        /// <summary>Disk type</summary>
+        public MediaType Disktype;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/GDI/Unsupported.cs b/Aaru.Images/GDI/Unsupported.cs
index 225f162e2..9d9319635 100644
--- a/Aaru.Images/GDI/Unsupported.cs
+++ b/Aaru.Images/GDI/Unsupported.cs
@@ -32,16 +32,15 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Gdi
-    {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+namespace Aaru.DiscImages;
 
-            return ErrorNumber.NoData;
-        }
+public sealed partial class Gdi
+{
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        return ErrorNumber.NoData;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/GDI/Verify.cs b/Aaru.Images/GDI/Verify.cs
index 02a99b982..5ca1c8500 100644
--- a/Aaru.Images/GDI/Verify.cs
+++ b/Aaru.Images/GDI/Verify.cs
@@ -35,92 +35,91 @@ using System.Collections.Generic;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Gdi
 {
-    public sealed partial class Gdi
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
     {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/HDCopy/HDCopy.cs b/Aaru.Images/HDCopy/HDCopy.cs
index dddb63bd7..32251b822 100644
--- a/Aaru.Images/HDCopy/HDCopy.cs
+++ b/Aaru.Images/HDCopy/HDCopy.cs
@@ -70,46 +70,45 @@ using Aaru.CommonTypes.Structs;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+/// <inheritdoc />
+/// <summary>Implements reading HD-Copy disk images</summary>
+public sealed partial class HdCopy : IMediaImage
 {
-    /// <inheritdoc />
-    /// <summary>Implements reading HD-Copy disk images</summary>
-    public sealed partial class HdCopy : IMediaImage
+    /// <summary>Every track that has been read is cached here</summary>
+    readonly Dictionary<int, byte[]> _trackCache = new Dictionary<int, byte[]>();
+
+    /// <summary>The offset in the file where each track starts, or -1 if the track is not present</summary>
+    readonly Dictionary<int, long> _trackOffset = new Dictionary<int, long>();
+    /// <summary>The HDCP file header after the image has been opened</summary>
+    FileHeader _fileHeader;
+
+    /// <summary>The ImageFilter we're reading from, after the file has been opened</summary>
+    IFilter _hdcpImageFilter;
+    ImageInfo _imageInfo;
+
+    public HdCopy() => _imageInfo = new ImageInfo
     {
-        /// <summary>Every track that has been read is cached here</summary>
-        readonly Dictionary<int, byte[]> _trackCache = new Dictionary<int, byte[]>();
-
-        /// <summary>The offset in the file where each track starts, or -1 if the track is not present</summary>
-        readonly Dictionary<int, long> _trackOffset = new Dictionary<int, long>();
-        /// <summary>The HDCP file header after the image has been opened</summary>
-        FileHeader _fileHeader;
-
-        /// <summary>The ImageFilter we're reading from, after the file has been opened</summary>
-        IFilter _hdcpImageFilter;
-        ImageInfo _imageInfo;
-
-        public HdCopy() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/HDCopy/Helpers.cs b/Aaru.Images/HDCopy/Helpers.cs
index b0c83c620..070084266 100644
--- a/Aaru.Images/HDCopy/Helpers.cs
+++ b/Aaru.Images/HDCopy/Helpers.cs
@@ -36,121 +36,120 @@ using System.IO;
 using Aaru.CommonTypes.Enums;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class HdCopy
 {
-    public sealed partial class HdCopy
+    bool TryReadHeader(Stream stream, ref FileHeader fhdr, ref long dataStartOffset)
     {
-        bool TryReadHeader(Stream stream, ref FileHeader fhdr, ref long dataStartOffset)
+        int numTracks = 82;
+
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 16 + (2 * 82))
+            return false;
+
+        FileHeader fheader;
+
+        /* assume it's a regular HD-Copy file without the disk name */
+        dataStartOffset         = 2 + (2 * numTracks);
+        fheader.lastCylinder    = (byte)stream.ReadByte();
+        fheader.sectorsPerTrack = (byte)stream.ReadByte();
+
+        if(fheader.lastCylinder    == 0xff &&
+           fheader.sectorsPerTrack == 0x18)
         {
-            int numTracks = 82;
-
-            stream.Seek(0, SeekOrigin.Begin);
-
-            if(stream.Length < 16 + (2 * 82))
-                return false;
-
-            FileHeader fheader;
-
-            /* assume it's a regular HD-Copy file without the disk name */
-            dataStartOffset         = 2 + (2 * numTracks);
+            /* This is an "extended" HD-Copy file with filename information and 84 tracks */
+            stream.Seek(0x0e, SeekOrigin.Begin);
             fheader.lastCylinder    = (byte)stream.ReadByte();
             fheader.sectorsPerTrack = (byte)stream.ReadByte();
-
-            if(fheader.lastCylinder    == 0xff &&
-               fheader.sectorsPerTrack == 0x18)
-            {
-                /* This is an "extended" HD-Copy file with filename information and 84 tracks */
-                stream.Seek(0x0e, SeekOrigin.Begin);
-                fheader.lastCylinder    = (byte)stream.ReadByte();
-                fheader.sectorsPerTrack = (byte)stream.ReadByte();
-                numTracks               = 84;
-                dataStartOffset         = 16 + (2 * numTracks);
-            }
-
-            fheader.trackMap = new byte[2 * numTracks];
-            stream.Read(fheader.trackMap, 0, 2 * numTracks);
-
-            /* Some sanity checks on the values we just read.
-             * We know the image is from a DOS floppy disk, so assume
-             * some sane cylinder and sectors-per-track count.
-             */
-            if(fheader.sectorsPerTrack < 8 ||
-               fheader.sectorsPerTrack > 40)
-                return false;
-
-            if(fheader.lastCylinder < 37 ||
-               fheader.lastCylinder >= 84)
-                return false;
-
-            // Validate the trackmap. First two tracks need to be present
-            if(fheader.trackMap[0] != 1 ||
-               fheader.trackMap[1] != 1)
-                return false;
-
-            // all other tracks must be either present (=1) or absent (=0)
-            for(int i = 0; i < 2 * numTracks; i++)
-                if(fheader.trackMap[i] > 1)
-                    return false;
-
-            /* return success */
-            fhdr = fheader;
-
-            return true;
+            numTracks               = 84;
+            dataStartOffset         = 16 + (2 * numTracks);
         }
 
-        ErrorNumber ReadTrackIntoCache(Stream stream, int trackNum)
+        fheader.trackMap = new byte[2 * numTracks];
+        stream.Read(fheader.trackMap, 0, 2 * numTracks);
+
+        /* Some sanity checks on the values we just read.
+         * We know the image is from a DOS floppy disk, so assume
+         * some sane cylinder and sectors-per-track count.
+         */
+        if(fheader.sectorsPerTrack < 8 ||
+           fheader.sectorsPerTrack > 40)
+            return false;
+
+        if(fheader.lastCylinder < 37 ||
+           fheader.lastCylinder >= 84)
+            return false;
+
+        // Validate the trackmap. First two tracks need to be present
+        if(fheader.trackMap[0] != 1 ||
+           fheader.trackMap[1] != 1)
+            return false;
+
+        // all other tracks must be either present (=1) or absent (=0)
+        for(int i = 0; i < 2 * numTracks; i++)
+            if(fheader.trackMap[i] > 1)
+                return false;
+
+        /* return success */
+        fhdr = fheader;
+
+        return true;
+    }
+
+    ErrorNumber ReadTrackIntoCache(Stream stream, int trackNum)
+    {
+        byte[] trackData = new byte[_imageInfo.SectorSize * _imageInfo.SectorsPerTrack];
+        byte[] blkHeader = new byte[3];
+
+        // check that track is present
+        if(_trackOffset[trackNum] == -1)
         {
-            byte[] trackData = new byte[_imageInfo.SectorSize * _imageInfo.SectorsPerTrack];
-            byte[] blkHeader = new byte[3];
+            AaruConsole.ErrorWriteLine("Tried reading a track that is not present in image");
 
-            // check that track is present
-            if(_trackOffset[trackNum] == -1)
-            {
-                AaruConsole.ErrorWriteLine("Tried reading a track that is not present in image");
-
-                return ErrorNumber.SectorNotFound;
-            }
-
-            stream.Seek(_trackOffset[trackNum], SeekOrigin.Begin);
-
-            // read the compressed track data
-            stream.Read(blkHeader, 0, 3);
-            short compressedLength = (short)(BitConverter.ToInt16(blkHeader, 0) - 1);
-            byte  escapeByte       = blkHeader[2];
-
-            byte[] cBuffer = new byte[compressedLength];
-            stream.Read(cBuffer, 0, compressedLength);
-
-            // decompress the data
-            int sIndex = 0; // source buffer position
-            int dIndex = 0; // destination buffer position
-
-            while(sIndex < compressedLength)
-                if(cBuffer[sIndex] == escapeByte)
-                {
-                    sIndex++; // skip over escape byte
-                    byte fillByte  = cBuffer[sIndex++];
-                    byte fillCount = cBuffer[sIndex++];
-
-                    // fill destination buffer
-                    for(int i = 0; i < fillCount; i++)
-                        trackData[dIndex++] = fillByte;
-                }
-                else
-                    trackData[dIndex++] = cBuffer[sIndex++];
-
-            // check that the number of bytes decompressed matches a whole track
-            if(dIndex != _imageInfo.SectorSize * _imageInfo.SectorsPerTrack)
-            {
-                AaruConsole.ErrorWriteLine("Track decompression yielded incomplete data");
-
-                return ErrorNumber.InOutError;
-            }
-
-            // store track in cache
-            _trackCache[trackNum] = trackData;
-
-            return ErrorNumber.NoError;
+            return ErrorNumber.SectorNotFound;
         }
+
+        stream.Seek(_trackOffset[trackNum], SeekOrigin.Begin);
+
+        // read the compressed track data
+        stream.Read(blkHeader, 0, 3);
+        short compressedLength = (short)(BitConverter.ToInt16(blkHeader, 0) - 1);
+        byte  escapeByte       = blkHeader[2];
+
+        byte[] cBuffer = new byte[compressedLength];
+        stream.Read(cBuffer, 0, compressedLength);
+
+        // decompress the data
+        int sIndex = 0; // source buffer position
+        int dIndex = 0; // destination buffer position
+
+        while(sIndex < compressedLength)
+            if(cBuffer[sIndex] == escapeByte)
+            {
+                sIndex++; // skip over escape byte
+                byte fillByte  = cBuffer[sIndex++];
+                byte fillCount = cBuffer[sIndex++];
+
+                // fill destination buffer
+                for(int i = 0; i < fillCount; i++)
+                    trackData[dIndex++] = fillByte;
+            }
+            else
+                trackData[dIndex++] = cBuffer[sIndex++];
+
+        // check that the number of bytes decompressed matches a whole track
+        if(dIndex != _imageInfo.SectorSize * _imageInfo.SectorsPerTrack)
+        {
+            AaruConsole.ErrorWriteLine("Track decompression yielded incomplete data");
+
+            return ErrorNumber.InOutError;
+        }
+
+        // store track in cache
+        _trackCache[trackNum] = trackData;
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/HDCopy/Identify.cs b/Aaru.Images/HDCopy/Identify.cs
index 001813943..f280de120 100644
--- a/Aaru.Images/HDCopy/Identify.cs
+++ b/Aaru.Images/HDCopy/Identify.cs
@@ -34,20 +34,19 @@
 using System.IO;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class HdCopy
-    {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream          = imageFilter.GetDataForkStream();
-            var    fHeader         = new FileHeader();
-            long   dataStartOffset = 0;
+namespace Aaru.DiscImages;
 
-            // TODO: validate the tracks
-            // For now, having a valid header should be sufficient.
-            return TryReadHeader(stream, ref fHeader, ref dataStartOffset);
-        }
+public sealed partial class HdCopy
+{
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
+    {
+        Stream stream          = imageFilter.GetDataForkStream();
+        var    fHeader         = new FileHeader();
+        long   dataStartOffset = 0;
+
+        // TODO: validate the tracks
+        // For now, having a valid header should be sufficient.
+        return TryReadHeader(stream, ref fHeader, ref dataStartOffset);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/HDCopy/Properties.cs b/Aaru.Images/HDCopy/Properties.cs
index e70293828..8fe351750 100644
--- a/Aaru.Images/HDCopy/Properties.cs
+++ b/Aaru.Images/HDCopy/Properties.cs
@@ -36,24 +36,23 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class HdCopy
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public string Name => "HD-Copy disk image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("8D57483F-71A5-42EC-9B87-66AEC439C792");
-        /// <inheritdoc />
-        public string Author => "Michael Drüing";
-        /// <inheritdoc />
-        public string Format => "HD-Copy image";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+public sealed partial class HdCopy
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "HD-Copy disk image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("8D57483F-71A5-42EC-9B87-66AEC439C792");
+    /// <inheritdoc />
+    public string Author => "Michael Drüing";
+    /// <inheritdoc />
+    public string Format => "HD-Copy image";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/HDCopy/Read.cs b/Aaru.Images/HDCopy/Read.cs
index fa2cad5c7..0bd2bb3e7 100644
--- a/Aaru.Images/HDCopy/Read.cs
+++ b/Aaru.Images/HDCopy/Read.cs
@@ -38,145 +38,144 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class HdCopy
 {
-    public sealed partial class HdCopy
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
+        Stream stream = imageFilter.GetDataForkStream();
 
-            var fheader = new FileHeader();
+        var fheader = new FileHeader();
 
-            // the start offset of the track data
-            long currentOffset = 0;
+        // the start offset of the track data
+        long currentOffset = 0;
 
-            if(!TryReadHeader(stream, ref fheader, ref currentOffset))
-                return ErrorNumber.InvalidArgument;
+        if(!TryReadHeader(stream, ref fheader, ref currentOffset))
+            return ErrorNumber.InvalidArgument;
 
-            AaruConsole.DebugWriteLine("HDCP plugin",
-                                       "Detected HD-Copy image with {0} tracks and {1} sectors per track.",
-                                       fheader.lastCylinder + 1, fheader.sectorsPerTrack);
+        AaruConsole.DebugWriteLine("HDCP plugin",
+                                   "Detected HD-Copy image with {0} tracks and {1} sectors per track.",
+                                   fheader.lastCylinder + 1, fheader.sectorsPerTrack);
 
-            _imageInfo.Cylinders       = (uint)fheader.lastCylinder + 1;
-            _imageInfo.SectorsPerTrack = fheader.sectorsPerTrack;
-            _imageInfo.SectorSize      = 512; // only 512 bytes per sector supported
-            _imageInfo.Heads           = 2;   // only 2-sided floppies are supported
-            _imageInfo.Sectors         = 2                  * _imageInfo.Cylinders * _imageInfo.SectorsPerTrack;
-            _imageInfo.ImageSize       = _imageInfo.Sectors * _imageInfo.SectorSize;
+        _imageInfo.Cylinders       = (uint)fheader.lastCylinder + 1;
+        _imageInfo.SectorsPerTrack = fheader.sectorsPerTrack;
+        _imageInfo.SectorSize      = 512; // only 512 bytes per sector supported
+        _imageInfo.Heads           = 2;   // only 2-sided floppies are supported
+        _imageInfo.Sectors         = 2                  * _imageInfo.Cylinders * _imageInfo.SectorsPerTrack;
+        _imageInfo.ImageSize       = _imageInfo.Sectors * _imageInfo.SectorSize;
 
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
 
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
 
-            _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, 2,
-                                                          (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
-                                                          false));
+        _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, 2,
+                                                      (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
+                                                      false));
 
-            // build table of track offsets
-            for(int i = 0; i < _imageInfo.Cylinders * 2; i++)
-                if(fheader.trackMap[i] == 0)
-                    _trackOffset[i] = -1;
-                else
-                {
-                    // track is present, read the block header
-                    if(currentOffset + 3 >= stream.Length)
-                        return ErrorNumber.InvalidArgument;
-
-                    byte[] blkHeader = new byte[2];
-                    stream.Read(blkHeader, 0, 2);
-                    short blkLength = BitConverter.ToInt16(blkHeader, 0);
-
-                    // assume block sizes are positive
-                    if(blkLength < 0)
-                        return ErrorNumber.InvalidArgument;
-
-                    AaruConsole.DebugWriteLine("HDCP plugin", "Track {0} offset 0x{1:x8}, size={2:x4}", i,
-                                               currentOffset, blkLength);
-
-                    _trackOffset[i] = currentOffset;
-
-                    currentOffset += 2 + blkLength;
-
-                    // skip the block data
-                    stream.Seek(blkLength, SeekOrigin.Current);
-                }
-
-            // ensure that the last track is present completely
-            if(currentOffset > stream.Length)
-                return ErrorNumber.InvalidArgument;
-
-            // save some variables for later use
-            _fileHeader      = fheader;
-            _hdcpImageFilter = imageFilter;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
-            int trackNum     = (int)(sectorAddress / _imageInfo.SectorsPerTrack);
-            int sectorOffset = (int)(sectorAddress % _imageInfo.SectorsPerTrack);
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(trackNum > 2 * _imageInfo.Cylinders)
-                return ErrorNumber.SectorNotFound;
-
-            buffer = new byte[_imageInfo.SectorSize];
-
-            if(_trackOffset[trackNum] == -1)
-                Array.Clear(buffer, 0, (int)_imageInfo.SectorSize);
+        // build table of track offsets
+        for(int i = 0; i < _imageInfo.Cylinders * 2; i++)
+            if(fheader.trackMap[i] == 0)
+                _trackOffset[i] = -1;
             else
             {
-                // track is present in file, make sure it has been loaded
-                if(!_trackCache.ContainsKey(trackNum))
-                {
-                    ErrorNumber errno = ReadTrackIntoCache(_hdcpImageFilter.GetDataForkStream(), trackNum);
+                // track is present, read the block header
+                if(currentOffset + 3 >= stream.Length)
+                    return ErrorNumber.InvalidArgument;
 
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-                }
+                byte[] blkHeader = new byte[2];
+                stream.Read(blkHeader, 0, 2);
+                short blkLength = BitConverter.ToInt16(blkHeader, 0);
 
-                Array.Copy(_trackCache[trackNum], sectorOffset * _imageInfo.SectorSize, buffer, 0,
-                           _imageInfo.SectorSize);
+                // assume block sizes are positive
+                if(blkLength < 0)
+                    return ErrorNumber.InvalidArgument;
+
+                AaruConsole.DebugWriteLine("HDCP plugin", "Track {0} offset 0x{1:x8}, size={2:x4}", i,
+                                           currentOffset, blkLength);
+
+                _trackOffset[i] = currentOffset;
+
+                currentOffset += 2 + blkLength;
+
+                // skip the block data
+                stream.Seek(blkLength, SeekOrigin.Current);
             }
 
-            return ErrorNumber.NoError;
-        }
+        // ensure that the last track is present completely
+        if(currentOffset > stream.Length)
+            return ErrorNumber.InvalidArgument;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        // save some variables for later use
+        _fileHeader      = fheader;
+        _hdcpImageFilter = imageFilter;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+        int trackNum     = (int)(sectorAddress / _imageInfo.SectorsPerTrack);
+        int sectorOffset = (int)(sectorAddress % _imageInfo.SectorsPerTrack);
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(trackNum > 2 * _imageInfo.Cylinders)
+            return ErrorNumber.SectorNotFound;
+
+        buffer = new byte[_imageInfo.SectorSize];
+
+        if(_trackOffset[trackNum] == -1)
+            Array.Clear(buffer, 0, (int)_imageInfo.SectorSize);
+        else
         {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
+            // track is present in file, make sure it has been loaded
+            if(!_trackCache.ContainsKey(trackNum))
             {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+                ErrorNumber errno = ReadTrackIntoCache(_hdcpImageFilter.GetDataForkStream(), trackNum);
 
                 if(errno != ErrorNumber.NoError)
                     return errno;
-
-                ms.Write(sector, 0, sector.Length);
             }
 
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            Array.Copy(_trackCache[trackNum], sectorOffset * _imageInfo.SectorSize, buffer, 0,
+                       _imageInfo.SectorSize);
         }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/HDCopy/Structs.cs b/Aaru.Images/HDCopy/Structs.cs
index 226c63a38..f784108ee 100644
--- a/Aaru.Images/HDCopy/Structs.cs
+++ b/Aaru.Images/HDCopy/Structs.cs
@@ -34,38 +34,37 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class HdCopy
 {
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class HdCopy
+    /// <summary>The global header of a HDCP image file</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct FileHeader
     {
-        /// <summary>The global header of a HDCP image file</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct FileHeader
-        {
-            /// <summary>Last cylinder (zero-based)</summary>
-            public byte lastCylinder;
+        /// <summary>Last cylinder (zero-based)</summary>
+        public byte lastCylinder;
 
-            /// <summary>Sectors per track</summary>
-            public byte sectorsPerTrack;
+        /// <summary>Sectors per track</summary>
+        public byte sectorsPerTrack;
 
-            /// <summary>
-            ///     The track map. It contains one byte for each track. Up to 82 tracks (41 tracks * 2 sides) are supported. 0
-            ///     means track is not present, 1 means it is present. The first 2 tracks are always present.
-            /// </summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2 * 82)]
-            public byte[] trackMap;
-        }
+        /// <summary>
+        ///     The track map. It contains one byte for each track. Up to 82 tracks (41 tracks * 2 sides) are supported. 0
+        ///     means track is not present, 1 means it is present. The first 2 tracks are always present.
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2 * 82)]
+        public byte[] trackMap;
+    }
 
-        /// <summary>The header for a RLE-compressed block</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct BlockHeader
-        {
-            /// <summary>The length of the compressed block, in bytes. Little-endian.</summary>
-            public readonly ushort length;
+    /// <summary>The header for a RLE-compressed block</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct BlockHeader
+    {
+        /// <summary>The length of the compressed block, in bytes. Little-endian.</summary>
+        public readonly ushort length;
 
-            /// <summary>The byte value used as RLE escape sequence</summary>
-            public readonly byte escape;
-        }
+        /// <summary>The byte value used as RLE escape sequence</summary>
+        public readonly byte escape;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/HDCopy/Unsupported.cs b/Aaru.Images/HDCopy/Unsupported.cs
index 8b0af9b9c..9ef0e4424 100644
--- a/Aaru.Images/HDCopy/Unsupported.cs
+++ b/Aaru.Images/HDCopy/Unsupported.cs
@@ -33,48 +33,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class HdCopy
 {
-    public sealed partial class HdCopy
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/IMD/Constants.cs b/Aaru.Images/IMD/Constants.cs
index e575aba7b..4da544fb6 100644
--- a/Aaru.Images/IMD/Constants.cs
+++ b/Aaru.Images/IMD/Constants.cs
@@ -32,19 +32,18 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Imd
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Imd
-    {
-        const byte SECTOR_CYLINDER_MAP_MASK = 0x80;
-        const byte SECTOR_HEAD_MAP_MASK     = 0x40;
-        const byte COMMENT_END              = 0x1A;
-        const string REGEX_HEADER =
-            @"IMD (?<version>\d.\d+):\s+(?<day>\d+)\/\s*(?<month>\d+)\/(?<year>\d+)\s+(?<hour>\d+):(?<minute>\d+):(?<second>\d+)\r\n";
-        const string REGEX_SAMDISK =
-            @"IMD SAMdisk(?<version>\d.\d+),\s+(?<day>\d+)\/\s*(?<month>\d+)\/(?<year>\d+)\s+(?<hour>\d+):\s*(?<minute>\d+):(?<second>\d+)";
-        const string REGEX_Z88DK =
-            @"IMD z88dk:\s+(?<day>\d+)\/\s*(?<month>\d+)\/(?<year>\d+)\s+(?<hour>\d+):\s*(?<minute>\d+):(?<second>\d+)\r\n";
-    }
+    const byte SECTOR_CYLINDER_MAP_MASK = 0x80;
+    const byte SECTOR_HEAD_MAP_MASK     = 0x40;
+    const byte COMMENT_END              = 0x1A;
+    const string REGEX_HEADER =
+        @"IMD (?<version>\d.\d+):\s+(?<day>\d+)\/\s*(?<month>\d+)\/(?<year>\d+)\s+(?<hour>\d+):(?<minute>\d+):(?<second>\d+)\r\n";
+    const string REGEX_SAMDISK =
+        @"IMD SAMdisk(?<version>\d.\d+),\s+(?<day>\d+)\/\s*(?<month>\d+)\/(?<year>\d+)\s+(?<hour>\d+):\s*(?<minute>\d+):(?<second>\d+)";
+    const string REGEX_Z88DK =
+        @"IMD z88dk:\s+(?<day>\d+)\/\s*(?<month>\d+)\/(?<year>\d+)\s+(?<hour>\d+):\s*(?<minute>\d+):(?<second>\d+)\r\n";
 }
\ No newline at end of file
diff --git a/Aaru.Images/IMD/Enums.cs b/Aaru.Images/IMD/Enums.cs
index 5ebf3756e..893e5b28d 100644
--- a/Aaru.Images/IMD/Enums.cs
+++ b/Aaru.Images/IMD/Enums.cs
@@ -30,31 +30,30 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Imd
-    {
-        enum TransferRate : byte
-        {
-            /// <summary>500 kbps in FM mode</summary>
-            FiveHundred = 0,
-            /// <summary>300 kbps in FM mode</summary>
-            ThreeHundred = 1,
-            /// <summary>250 kbps in FM mode</summary>
-            TwoHundred = 2,
-            /// <summary>500 kbps in MFM mode</summary>
-            FiveHundredMfm = 3,
-            /// <summary>300 kbps in MFM mode</summary>
-            ThreeHundredMfm = 4,
-            /// <summary>250 kbps in MFM mode</summary>
-            TwoHundredMfm = 5
-        }
+namespace Aaru.DiscImages;
 
-        enum SectorType : byte
-        {
-            Unavailable     = 0, Normal            = 1, Compressed             = 2,
-            Deleted         = 3, CompressedDeleted = 4, Error                  = 5,
-            CompressedError = 6, DeletedError      = 7, CompressedDeletedError = 8
-        }
+public sealed partial class Imd
+{
+    enum TransferRate : byte
+    {
+        /// <summary>500 kbps in FM mode</summary>
+        FiveHundred = 0,
+        /// <summary>300 kbps in FM mode</summary>
+        ThreeHundred = 1,
+        /// <summary>250 kbps in FM mode</summary>
+        TwoHundred = 2,
+        /// <summary>500 kbps in MFM mode</summary>
+        FiveHundredMfm = 3,
+        /// <summary>300 kbps in MFM mode</summary>
+        ThreeHundredMfm = 4,
+        /// <summary>250 kbps in MFM mode</summary>
+        TwoHundredMfm = 5
+    }
+
+    enum SectorType : byte
+    {
+        Unavailable     = 0, Normal            = 1, Compressed             = 2,
+        Deleted         = 3, CompressedDeleted = 4, Error                  = 5,
+        CompressedError = 6, DeletedError      = 7, CompressedDeletedError = 8
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/IMD/IMD.cs b/Aaru.Images/IMD/IMD.cs
index b0940dcb6..1b4f98e24 100644
--- a/Aaru.Images/IMD/IMD.cs
+++ b/Aaru.Images/IMD/IMD.cs
@@ -35,37 +35,36 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading IMageDisk disk images</summary>
-    public sealed partial class Imd : IMediaImage
-    {
-        ImageInfo    _imageInfo;
-        List<byte[]> _sectorsData;
+namespace Aaru.DiscImages;
 
-        public Imd() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading IMageDisk disk images</summary>
+public sealed partial class Imd : IMediaImage
+{
+    ImageInfo    _imageInfo;
+    List<byte[]> _sectorsData;
+
+    public Imd() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/IMD/Identify.cs b/Aaru.Images/IMD/Identify.cs
index 153abb3a9..67bad2e03 100644
--- a/Aaru.Images/IMD/Identify.cs
+++ b/Aaru.Images/IMD/Identify.cs
@@ -36,34 +36,33 @@ using System.Text.RegularExpressions;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Imd
 {
-    public sealed partial class Imd
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 4)
-                return false;
+        if(stream.Length < 4)
+            return false;
 
-            byte[] hdr = new byte[stream.Length < 256 ? stream.Length : 256];
-            stream.Read(hdr, 0, hdr.Length);
+        byte[] hdr = new byte[stream.Length < 256 ? stream.Length : 256];
+        stream.Read(hdr, 0, hdr.Length);
 
-            string hdrStr = StringHandlers.CToString(hdr, Encoding.ASCII);
+        string hdrStr = StringHandlers.CToString(hdr, Encoding.ASCII);
 
-            // IMD for DOS
-            Match imd = new Regex(REGEX_HEADER).Match(hdrStr);
+        // IMD for DOS
+        Match imd = new Regex(REGEX_HEADER).Match(hdrStr);
 
-            // SAMdisk
-            Match sam = new Regex(REGEX_SAMDISK).Match(hdrStr);
+        // SAMdisk
+        Match sam = new Regex(REGEX_SAMDISK).Match(hdrStr);
 
-            // z88dk
-            Match z88dk = new Regex(REGEX_Z88DK).Match(hdrStr);
+        // z88dk
+        Match z88dk = new Regex(REGEX_Z88DK).Match(hdrStr);
 
-            return imd.Success || sam.Success || z88dk.Success;
-        }
+        return imd.Success || sam.Success || z88dk.Success;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/IMD/Properties.cs b/Aaru.Images/IMD/Properties.cs
index b25600bfb..9bb57abbe 100644
--- a/Aaru.Images/IMD/Properties.cs
+++ b/Aaru.Images/IMD/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Imd
 {
-    public sealed partial class Imd
-    {
-        /// <inheritdoc />
-        public string Name => "Dunfield's IMD";
-        /// <inheritdoc />
-        public Guid Id => new Guid("0D67162E-38A3-407D-9B1A-CF40080A48CB");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "IMageDisk";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public string Name => "Dunfield's IMD";
+    /// <inheritdoc />
+    public Guid Id => new Guid("0D67162E-38A3-407D-9B1A-CF40080A48CB");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "IMageDisk";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/IMD/Read.cs b/Aaru.Images/IMD/Read.cs
index 1a6815d0d..39f6c0789 100644
--- a/Aaru.Images/IMD/Read.cs
+++ b/Aaru.Images/IMD/Read.cs
@@ -39,208 +39,207 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Imd
 {
-    public sealed partial class Imd
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        var cmt = new MemoryStream();
+        stream.Seek(0x1F, SeekOrigin.Begin);
+
+        for(uint i = 0; i < stream.Length; i++)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            byte b = (byte)stream.ReadByte();
 
-            var cmt = new MemoryStream();
-            stream.Seek(0x1F, SeekOrigin.Begin);
+            if(b == 0x1A)
+                break;
 
-            for(uint i = 0; i < stream.Length; i++)
+            cmt.WriteByte(b);
+        }
+
+        _imageInfo.Comments = StringHandlers.CToString(cmt.ToArray());
+        _sectorsData        = new List<byte[]>();
+
+        byte currentCylinder = 0;
+        _imageInfo.Cylinders = 1;
+        _imageInfo.Heads     = 1;
+        ulong currentLba = 0;
+
+        TransferRate mode = TransferRate.TwoHundred;
+
+        while(stream.Position + 5 < stream.Length)
+        {
+            mode = (TransferRate)stream.ReadByte();
+            byte     cylinder = (byte)stream.ReadByte();
+            byte     head     = (byte)stream.ReadByte();
+            byte     spt      = (byte)stream.ReadByte();
+            byte     n        = (byte)stream.ReadByte();
+            byte[]   idmap    = new byte[spt];
+            byte[]   cylmap   = new byte[spt];
+            byte[]   headmap  = new byte[spt];
+            ushort[] bps      = new ushort[spt];
+
+            if(cylinder != currentCylinder)
             {
-                byte b = (byte)stream.ReadByte();
-
-                if(b == 0x1A)
-                    break;
-
-                cmt.WriteByte(b);
+                currentCylinder = cylinder;
+                _imageInfo.Cylinders++;
             }
 
-            _imageInfo.Comments = StringHandlers.CToString(cmt.ToArray());
-            _sectorsData        = new List<byte[]>();
+            if((head & 1) == 1)
+                _imageInfo.Heads = 2;
 
-            byte currentCylinder = 0;
-            _imageInfo.Cylinders = 1;
-            _imageInfo.Heads     = 1;
-            ulong currentLba = 0;
+            stream.Read(idmap, 0, idmap.Length);
 
-            TransferRate mode = TransferRate.TwoHundred;
+            if((head & SECTOR_CYLINDER_MAP_MASK) == SECTOR_CYLINDER_MAP_MASK)
+                stream.Read(cylmap, 0, cylmap.Length);
 
-            while(stream.Position + 5 < stream.Length)
+            if((head & SECTOR_HEAD_MAP_MASK) == SECTOR_HEAD_MAP_MASK)
+                stream.Read(headmap, 0, headmap.Length);
+
+            if(n == 0xFF)
             {
-                mode = (TransferRate)stream.ReadByte();
-                byte     cylinder = (byte)stream.ReadByte();
-                byte     head     = (byte)stream.ReadByte();
-                byte     spt      = (byte)stream.ReadByte();
-                byte     n        = (byte)stream.ReadByte();
-                byte[]   idmap    = new byte[spt];
-                byte[]   cylmap   = new byte[spt];
-                byte[]   headmap  = new byte[spt];
-                ushort[] bps      = new ushort[spt];
-
-                if(cylinder != currentCylinder)
-                {
-                    currentCylinder = cylinder;
-                    _imageInfo.Cylinders++;
-                }
-
-                if((head & 1) == 1)
-                    _imageInfo.Heads = 2;
-
-                stream.Read(idmap, 0, idmap.Length);
-
-                if((head & SECTOR_CYLINDER_MAP_MASK) == SECTOR_CYLINDER_MAP_MASK)
-                    stream.Read(cylmap, 0, cylmap.Length);
-
-                if((head & SECTOR_HEAD_MAP_MASK) == SECTOR_HEAD_MAP_MASK)
-                    stream.Read(headmap, 0, headmap.Length);
-
-                if(n == 0xFF)
-                {
-                    byte[] bpsbytes = new byte[spt * 2];
-                    stream.Read(bpsbytes, 0, bpsbytes.Length);
-
-                    for(int i = 0; i < spt; i++)
-                        bps[i] = BitConverter.ToUInt16(bpsbytes, i * 2);
-                }
-                else
-                    for(int i = 0; i < spt; i++)
-                        bps[i] = (ushort)(128 << n);
-
-                if(spt > _imageInfo.SectorsPerTrack)
-                    _imageInfo.SectorsPerTrack = spt;
-
-                SortedDictionary<byte, byte[]> track = new();
+                byte[] bpsbytes = new byte[spt * 2];
+                stream.Read(bpsbytes, 0, bpsbytes.Length);
 
                 for(int i = 0; i < spt; i++)
-                {
-                    var    type = (SectorType)stream.ReadByte();
-                    byte[] data = new byte[bps[i]];
-
-                    // TODO; Handle disks with different bps in track 0
-                    if(bps[i] > _imageInfo.SectorSize)
-                        _imageInfo.SectorSize = bps[i];
-
-                    switch(type)
-                    {
-                        case SectorType.Unavailable:
-                            if(!track.ContainsKey(idmap[i]))
-                                track.Add(idmap[i], data);
-
-                            break;
-                        case SectorType.Normal:
-                        case SectorType.Deleted:
-                        case SectorType.Error:
-                        case SectorType.DeletedError:
-                            stream.Read(data, 0, data.Length);
-
-                            if(!track.ContainsKey(idmap[i]))
-                                track.Add(idmap[i], data);
-
-                            _imageInfo.ImageSize += (ulong)data.Length;
-
-                            break;
-                        case SectorType.Compressed:
-                        case SectorType.CompressedDeleted:
-                        case SectorType.CompressedError:
-                        case SectorType.CompressedDeletedError:
-                            byte filling = (byte)stream.ReadByte();
-                            ArrayHelpers.ArrayFill(data, filling);
-
-                            if(!track.ContainsKey(idmap[i]))
-                                track.Add(idmap[i], data);
-
-                            break;
-                        default:
-                            AaruConsole.ErrorWriteLine($"Invalid sector type {(byte)type}");
-
-                            return ErrorNumber.InvalidArgument;
-                    }
-                }
-
-                foreach(KeyValuePair<byte, byte[]> kvp in track)
-                {
-                    _sectorsData.Add(kvp.Value);
-                    currentLba++;
-                }
+                    bps[i] = BitConverter.ToUInt16(bpsbytes, i * 2);
             }
+            else
+                for(int i = 0; i < spt; i++)
+                    bps[i] = (ushort)(128 << n);
 
-            _imageInfo.Application = "IMD";
+            if(spt > _imageInfo.SectorsPerTrack)
+                _imageInfo.SectorsPerTrack = spt;
 
-            // TODO: The header is the date of dump or the date of the application compilation?
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Comments             = StringHandlers.CToString(cmt.ToArray());
-            _imageInfo.Sectors              = currentLba;
-            _imageInfo.MediaType            = MediaType.Unknown;
+            SortedDictionary<byte, byte[]> track = new();
 
-            MediaEncoding mediaEncoding = MediaEncoding.MFM;
-
-            if(mode == TransferRate.TwoHundred   ||
-               mode == TransferRate.ThreeHundred ||
-               mode == TransferRate.FiveHundred)
-                mediaEncoding = MediaEncoding.FM;
-
-            _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
-                                                          (ushort)_imageInfo.SectorsPerTrack, _imageInfo.SectorSize,
-                                                          mediaEncoding, false));
-
-            switch(_imageInfo.MediaType)
+            for(int i = 0; i < spt; i++)
             {
-                case MediaType.NEC_525_HD when mode == TransferRate.FiveHundredMfm:
-                    _imageInfo.MediaType = MediaType.NEC_35_HD_8;
+                var    type = (SectorType)stream.ReadByte();
+                byte[] data = new byte[bps[i]];
 
-                    break;
-                case MediaType.DOS_525_HD when mode == TransferRate.FiveHundredMfm:
-                    _imageInfo.MediaType = MediaType.NEC_35_HD_15;
+                // TODO; Handle disks with different bps in track 0
+                if(bps[i] > _imageInfo.SectorSize)
+                    _imageInfo.SectorSize = bps[i];
 
-                    break;
-                case MediaType.RX50 when mode == TransferRate.FiveHundredMfm:
-                    _imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
+                switch(type)
+                {
+                    case SectorType.Unavailable:
+                        if(!track.ContainsKey(idmap[i]))
+                            track.Add(idmap[i], data);
 
-                    break;
+                        break;
+                    case SectorType.Normal:
+                    case SectorType.Deleted:
+                    case SectorType.Error:
+                    case SectorType.DeletedError:
+                        stream.Read(data, 0, data.Length);
+
+                        if(!track.ContainsKey(idmap[i]))
+                            track.Add(idmap[i], data);
+
+                        _imageInfo.ImageSize += (ulong)data.Length;
+
+                        break;
+                    case SectorType.Compressed:
+                    case SectorType.CompressedDeleted:
+                    case SectorType.CompressedError:
+                    case SectorType.CompressedDeletedError:
+                        byte filling = (byte)stream.ReadByte();
+                        ArrayHelpers.ArrayFill(data, filling);
+
+                        if(!track.ContainsKey(idmap[i]))
+                            track.Add(idmap[i], data);
+
+                        break;
+                    default:
+                        AaruConsole.ErrorWriteLine($"Invalid sector type {(byte)type}");
+
+                        return ErrorNumber.InvalidArgument;
+                }
             }
 
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-            AaruConsole.VerboseWriteLine("IMD image contains a disk of type {0}", _imageInfo.MediaType);
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                AaruConsole.VerboseWriteLine("IMD comments: {0}", _imageInfo.Comments);
-
-            return ErrorNumber.NoError;
+            foreach(KeyValuePair<byte, byte[]> kvp in track)
+            {
+                _sectorsData.Add(kvp.Value);
+                currentLba++;
+            }
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        _imageInfo.Application = "IMD";
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        // TODO: The header is the date of dump or the date of the application compilation?
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Comments             = StringHandlers.CToString(cmt.ToArray());
+        _imageInfo.Sectors              = currentLba;
+        _imageInfo.MediaType            = MediaType.Unknown;
+
+        MediaEncoding mediaEncoding = MediaEncoding.MFM;
+
+        if(mode == TransferRate.TwoHundred   ||
+           mode == TransferRate.ThreeHundred ||
+           mode == TransferRate.FiveHundred)
+            mediaEncoding = MediaEncoding.FM;
+
+        _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
+                                                      (ushort)_imageInfo.SectorsPerTrack, _imageInfo.SectorSize,
+                                                      mediaEncoding, false));
+
+        switch(_imageInfo.MediaType)
         {
-            buffer = null;
+            case MediaType.NEC_525_HD when mode == TransferRate.FiveHundredMfm:
+                _imageInfo.MediaType = MediaType.NEC_35_HD_8;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.DOS_525_HD when mode == TransferRate.FiveHundredMfm:
+                _imageInfo.MediaType = MediaType.NEC_35_HD_15;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.RX50 when mode == TransferRate.FiveHundredMfm:
+                _imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
 
-            var ms = new MemoryStream();
-
-            for(int i = 0; i < length; i++)
-                ms.Write(_sectorsData[(int)sectorAddress + i], 0, _sectorsData[(int)sectorAddress + i].Length);
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+                break;
         }
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
+        AaruConsole.VerboseWriteLine("IMD image contains a disk of type {0}", _imageInfo.MediaType);
+
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+            AaruConsole.VerboseWriteLine("IMD comments: {0}", _imageInfo.Comments);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(int i = 0; i < length; i++)
+            ms.Write(_sectorsData[(int)sectorAddress + i], 0, _sectorsData[(int)sectorAddress + i].Length);
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/IMD/Unsupported.cs b/Aaru.Images/IMD/Unsupported.cs
index 1bde0f54d..3b2e1e436 100644
--- a/Aaru.Images/IMD/Unsupported.cs
+++ b/Aaru.Images/IMD/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Imd
 {
-    public sealed partial class Imd
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/Constants.cs b/Aaru.Images/KryoFlux/Constants.cs
index ab59ffde1..e0fbbee95 100644
--- a/Aaru.Images/KryoFlux/Constants.cs
+++ b/Aaru.Images/KryoFlux/Constants.cs
@@ -32,20 +32,19 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class KryoFlux
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class KryoFlux
-    {
-        const string HOST_DATE  = "host_date";
-        const string HOST_TIME  = "host_time";
-        const string KF_NAME    = "name";
-        const string KF_VERSION = "version";
-        const string KF_DATE    = "date";
-        const string KF_TIME    = "time";
-        const string KF_HW_ID   = "hwid";
-        const string KF_HW_RV   = "hwrv";
-        const string KF_SCK     = "sck";
-        const string KF_ICK     = "ick";
-    }
+    const string HOST_DATE  = "host_date";
+    const string HOST_TIME  = "host_time";
+    const string KF_NAME    = "name";
+    const string KF_VERSION = "version";
+    const string KF_DATE    = "date";
+    const string KF_TIME    = "time";
+    const string KF_HW_ID   = "hwid";
+    const string KF_HW_RV   = "hwrv";
+    const string KF_SCK     = "sck";
+    const string KF_ICK     = "ick";
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/Enums.cs b/Aaru.Images/KryoFlux/Enums.cs
index 8f0d5c741..f2cfdb893 100644
--- a/Aaru.Images/KryoFlux/Enums.cs
+++ b/Aaru.Images/KryoFlux/Enums.cs
@@ -32,25 +32,24 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
-{
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class KryoFlux
-    {
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum BlockIds : byte
-        {
-            Flux2   = 0x00, Flux2_1 = 0x01, Flux2_2 = 0x02,
-            Flux2_3 = 0x03, Flux2_4 = 0x04, Flux2_5 = 0x05,
-            Flux2_6 = 0x06, Flux2_7 = 0x07, Nop1    = 0x08,
-            Nop2    = 0x09, Nop3    = 0x0A, Ovl16   = 0x0B,
-            Flux3   = 0x0C, Oob     = 0x0D
-        }
+namespace Aaru.DiscImages;
 
-        enum OobTypes : byte
-        {
-            Invalid   = 0x00, StreamInfo = 0x01, Index = 0x02,
-            StreamEnd = 0x03, KFInfo     = 0x04, EOF   = 0x0D
-        }
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class KryoFlux
+{
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum BlockIds : byte
+    {
+        Flux2   = 0x00, Flux2_1 = 0x01, Flux2_2 = 0x02,
+        Flux2_3 = 0x03, Flux2_4 = 0x04, Flux2_5 = 0x05,
+        Flux2_6 = 0x06, Flux2_7 = 0x07, Nop1    = 0x08,
+        Nop2    = 0x09, Nop3    = 0x0A, Ovl16   = 0x0B,
+        Flux3   = 0x0C, Oob     = 0x0D
+    }
+
+    enum OobTypes : byte
+    {
+        Invalid   = 0x00, StreamInfo = 0x01, Index = 0x02,
+        StreamEnd = 0x03, KFInfo     = 0x04, EOF   = 0x0D
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/Identify.cs b/Aaru.Images/KryoFlux/Identify.cs
index 789bd1241..29043b3af 100644
--- a/Aaru.Images/KryoFlux/Identify.cs
+++ b/Aaru.Images/KryoFlux/Identify.cs
@@ -34,33 +34,32 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class KryoFlux
 {
-    public sealed partial class KryoFlux
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < Marshal.SizeOf<OobBlock>())
-                return false;
+        if(stream.Length < Marshal.SizeOf<OobBlock>())
+            return false;
 
-            byte[] hdr = new byte[Marshal.SizeOf<OobBlock>()];
-            stream.Read(hdr, 0, Marshal.SizeOf<OobBlock>());
+        byte[] hdr = new byte[Marshal.SizeOf<OobBlock>()];
+        stream.Read(hdr, 0, Marshal.SizeOf<OobBlock>());
 
-            OobBlock header = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(hdr);
+        OobBlock header = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(hdr);
 
-            stream.Seek(-Marshal.SizeOf<OobBlock>(), SeekOrigin.End);
+        stream.Seek(-Marshal.SizeOf<OobBlock>(), SeekOrigin.End);
 
-            hdr = new byte[Marshal.SizeOf<OobBlock>()];
-            stream.Read(hdr, 0, Marshal.SizeOf<OobBlock>());
+        hdr = new byte[Marshal.SizeOf<OobBlock>()];
+        stream.Read(hdr, 0, Marshal.SizeOf<OobBlock>());
 
-            OobBlock footer = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(hdr);
+        OobBlock footer = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(hdr);
 
-            return header.blockId == BlockIds.Oob && header.blockType == OobTypes.KFInfo &&
-                   footer.blockId == BlockIds.Oob && footer.blockType == OobTypes.EOF    && footer.length == 0x0D0D;
-        }
+        return header.blockId == BlockIds.Oob && header.blockType == OobTypes.KFInfo &&
+               footer.blockId == BlockIds.Oob && footer.blockType == OobTypes.EOF    && footer.length == 0x0D0D;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/KryoFlux.cs b/Aaru.Images/KryoFlux/KryoFlux.cs
index 764d18188..408f67868 100644
--- a/Aaru.Images/KryoFlux/KryoFlux.cs
+++ b/Aaru.Images/KryoFlux/KryoFlux.cs
@@ -36,37 +36,36 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <summary>Implements reading KryoFlux flux images</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed partial class KryoFlux : IMediaImage, IVerifiableSectorsImage
-    {
-        // TODO: These variables have been made public so create-sidecar can access to this information until I define an API >4.0
-        public SortedDictionary<byte, IFilter> tracks;
+namespace Aaru.DiscImages;
 
-        public KryoFlux() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <summary>Implements reading KryoFlux flux images</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed partial class KryoFlux : IMediaImage, IVerifiableSectorsImage
+{
+    // TODO: These variables have been made public so create-sidecar can access to this information until I define an API >4.0
+    public SortedDictionary<byte, IFilter> tracks;
+
+    public KryoFlux() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/Properties.cs b/Aaru.Images/KryoFlux/Properties.cs
index 977afcd31..dce4967ed 100644
--- a/Aaru.Images/KryoFlux/Properties.cs
+++ b/Aaru.Images/KryoFlux/Properties.cs
@@ -35,24 +35,23 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class KryoFlux
 {
-    public sealed partial class KryoFlux
-    {
-        ImageInfo _imageInfo;
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Name => "KryoFlux STREAM";
-        /// <inheritdoc />
-        public Guid Id => new Guid("4DBC95E4-93EE-4F7A-9492-919887E60EFE");
-        /// <inheritdoc />
-        public string Format => "KryoFlux STREAM";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    ImageInfo _imageInfo;
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Name => "KryoFlux STREAM";
+    /// <inheritdoc />
+    public Guid Id => new Guid("4DBC95E4-93EE-4F7A-9492-919887E60EFE");
+    /// <inheritdoc />
+    public string Format => "KryoFlux STREAM";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/Read.cs b/Aaru.Images/KryoFlux/Read.cs
index addbb5609..c2791b3c3 100644
--- a/Aaru.Images/KryoFlux/Read.cs
+++ b/Aaru.Images/KryoFlux/Read.cs
@@ -41,263 +41,262 @@ using Aaru.Console;
 using Aaru.Filters;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class KryoFlux
 {
-    public sealed partial class KryoFlux
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < Marshal.SizeOf<OobBlock>())
+            return ErrorNumber.InvalidArgument;
+
+        byte[] hdr = new byte[Marshal.SizeOf<OobBlock>()];
+        stream.Read(hdr, 0, Marshal.SizeOf<OobBlock>());
+
+        OobBlock header = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(hdr);
+
+        stream.Seek(-Marshal.SizeOf<OobBlock>(), SeekOrigin.End);
+
+        hdr = new byte[Marshal.SizeOf<OobBlock>()];
+        stream.Read(hdr, 0, Marshal.SizeOf<OobBlock>());
+
+        OobBlock footer = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(hdr);
+
+        if(header.blockId   != BlockIds.Oob    ||
+           header.blockType != OobTypes.KFInfo ||
+           footer.blockId   != BlockIds.Oob    ||
+           footer.blockType != OobTypes.EOF    ||
+           footer.length    != 0x0D0D)
+            return ErrorNumber.InvalidArgument;
+
+        // TODO: This is supposing NoFilter, shouldn't
+        tracks = new SortedDictionary<byte, IFilter>();
+        byte step    = 1;
+        byte heads   = 2;
+        bool topHead = false;
+
+        string basename = Path.Combine(imageFilter.ParentFolder,
+                                       imageFilter.Filename.Substring(0, imageFilter.Filename.Length - 8));
+
+        for(byte t = 0; t < 166; t += step)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            int cylinder = t / heads;
+            int head     = topHead ? 1 : t % heads;
 
-            if(stream.Length < Marshal.SizeOf<OobBlock>())
-                return ErrorNumber.InvalidArgument;
+            string trackfile = Directory.Exists(basename) ? Path.Combine(basename, $"{cylinder:D2}.{head:D1}.raw")
+                                   : $"{basename}{cylinder:D2}.{head:D1}.raw";
 
-            byte[] hdr = new byte[Marshal.SizeOf<OobBlock>()];
-            stream.Read(hdr, 0, Marshal.SizeOf<OobBlock>());
-
-            OobBlock header = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(hdr);
-
-            stream.Seek(-Marshal.SizeOf<OobBlock>(), SeekOrigin.End);
-
-            hdr = new byte[Marshal.SizeOf<OobBlock>()];
-            stream.Read(hdr, 0, Marshal.SizeOf<OobBlock>());
-
-            OobBlock footer = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(hdr);
-
-            if(header.blockId   != BlockIds.Oob    ||
-               header.blockType != OobTypes.KFInfo ||
-               footer.blockId   != BlockIds.Oob    ||
-               footer.blockType != OobTypes.EOF    ||
-               footer.length    != 0x0D0D)
-                return ErrorNumber.InvalidArgument;
-
-            // TODO: This is supposing NoFilter, shouldn't
-            tracks = new SortedDictionary<byte, IFilter>();
-            byte step    = 1;
-            byte heads   = 2;
-            bool topHead = false;
-
-            string basename = Path.Combine(imageFilter.ParentFolder,
-                                           imageFilter.Filename.Substring(0, imageFilter.Filename.Length - 8));
-
-            for(byte t = 0; t < 166; t += step)
-            {
-                int cylinder = t / heads;
-                int head     = topHead ? 1 : t % heads;
-
-                string trackfile = Directory.Exists(basename) ? Path.Combine(basename, $"{cylinder:D2}.{head:D1}.raw")
-                                       : $"{basename}{cylinder:D2}.{head:D1}.raw";
-
-                if(!File.Exists(trackfile))
-                    if(cylinder == 0)
-                    {
-                        if(head == 0)
-                        {
-                            AaruConsole.DebugWriteLine("KryoFlux plugin",
-                                                       "Cannot find cyl 0 hd 0, supposing only top head was dumped");
-
-                            topHead = true;
-                            heads   = 1;
-
-                            continue;
-                        }
-
-                        AaruConsole.DebugWriteLine("KryoFlux plugin",
-                                                   "Cannot find cyl 0 hd 1, supposing only bottom head was dumped");
-
-                        heads = 1;
-
-                        continue;
-                    }
-                    else if(cylinder == 1)
-                    {
-                        AaruConsole.DebugWriteLine("KryoFlux plugin", "Cannot find cyl 1, supposing double stepping");
-                        step = 2;
-
-                        continue;
-                    }
-                    else
-                    {
-                        AaruConsole.DebugWriteLine("KryoFlux plugin", "Arrived end of disk at cylinder {0}", cylinder);
-
-                        break;
-                    }
-
-                var         trackFilter = new ZZZNoFilter();
-                ErrorNumber errno       = trackFilter.Open(trackfile);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                _imageInfo.CreationTime         = DateTime.MaxValue;
-                _imageInfo.LastModificationTime = DateTime.MinValue;
-
-                Stream trackStream = trackFilter.GetDataForkStream();
-
-                while(trackStream.Position < trackStream.Length)
+            if(!File.Exists(trackfile))
+                if(cylinder == 0)
                 {
-                    byte blockId = (byte)trackStream.ReadByte();
-
-                    switch(blockId)
+                    if(head == 0)
                     {
-                        case (byte)BlockIds.Oob:
+                        AaruConsole.DebugWriteLine("KryoFlux plugin",
+                                                   "Cannot find cyl 0 hd 0, supposing only top head was dumped");
+
+                        topHead = true;
+                        heads   = 1;
+
+                        continue;
+                    }
+
+                    AaruConsole.DebugWriteLine("KryoFlux plugin",
+                                               "Cannot find cyl 0 hd 1, supposing only bottom head was dumped");
+
+                    heads = 1;
+
+                    continue;
+                }
+                else if(cylinder == 1)
+                {
+                    AaruConsole.DebugWriteLine("KryoFlux plugin", "Cannot find cyl 1, supposing double stepping");
+                    step = 2;
+
+                    continue;
+                }
+                else
+                {
+                    AaruConsole.DebugWriteLine("KryoFlux plugin", "Arrived end of disk at cylinder {0}", cylinder);
+
+                    break;
+                }
+
+            var         trackFilter = new ZZZNoFilter();
+            ErrorNumber errno       = trackFilter.Open(trackfile);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            _imageInfo.CreationTime         = DateTime.MaxValue;
+            _imageInfo.LastModificationTime = DateTime.MinValue;
+
+            Stream trackStream = trackFilter.GetDataForkStream();
+
+            while(trackStream.Position < trackStream.Length)
+            {
+                byte blockId = (byte)trackStream.ReadByte();
+
+                switch(blockId)
+                {
+                    case (byte)BlockIds.Oob:
+                    {
+                        trackStream.Position--;
+
+                        byte[] oob = new byte[Marshal.SizeOf<OobBlock>()];
+                        trackStream.Read(oob, 0, Marshal.SizeOf<OobBlock>());
+
+                        OobBlock oobBlk = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(oob);
+
+                        if(oobBlk.blockType == OobTypes.EOF)
                         {
-                            trackStream.Position--;
-
-                            byte[] oob = new byte[Marshal.SizeOf<OobBlock>()];
-                            trackStream.Read(oob, 0, Marshal.SizeOf<OobBlock>());
-
-                            OobBlock oobBlk = Marshal.ByteArrayToStructureLittleEndian<OobBlock>(oob);
-
-                            if(oobBlk.blockType == OobTypes.EOF)
-                            {
-                                trackStream.Position = trackStream.Length;
-
-                                break;
-                            }
-
-                            if(oobBlk.blockType != OobTypes.KFInfo)
-                            {
-                                trackStream.Position += oobBlk.length;
-
-                                break;
-                            }
-
-                            byte[] kfinfo = new byte[oobBlk.length];
-                            trackStream.Read(kfinfo, 0, oobBlk.length);
-                            string kfinfoStr = StringHandlers.CToString(kfinfo);
-
-                            string[] lines = kfinfoStr.Split(new[]
-                            {
-                                ','
-                            }, StringSplitOptions.RemoveEmptyEntries);
-
-                            DateTime blockDate = DateTime.Now;
-                            DateTime blockTime = DateTime.Now;
-                            bool     foundDate = false;
-
-                            foreach(string[] kvp in lines.Select(line => line.Split('=')).Where(kvp => kvp.Length == 2))
-                            {
-                                kvp[0] = kvp[0].Trim();
-                                kvp[1] = kvp[1].Trim();
-                                AaruConsole.DebugWriteLine("KryoFlux plugin", "\"{0}\" = \"{1}\"", kvp[0], kvp[1]);
-
-                                switch(kvp[0])
-                                {
-                                    case HOST_DATE:
-                                        if(DateTime.TryParseExact(kvp[1], "yyyy.MM.dd", CultureInfo.InvariantCulture,
-                                                                  DateTimeStyles.AssumeLocal, out blockDate))
-                                            foundDate = true;
-
-                                        break;
-                                    case HOST_TIME:
-                                        DateTime.TryParseExact(kvp[1], "HH:mm:ss", CultureInfo.InvariantCulture,
-                                                               DateTimeStyles.AssumeLocal, out blockTime);
-
-                                        break;
-                                    case KF_NAME:
-                                        _imageInfo.Application = kvp[1];
-
-                                        break;
-                                    case KF_VERSION:
-                                        _imageInfo.ApplicationVersion = kvp[1];
-
-                                        break;
-                                }
-                            }
-
-                            if(foundDate)
-                            {
-                                var blockTimestamp = new DateTime(blockDate.Year, blockDate.Month, blockDate.Day,
-                                                                  blockTime.Hour, blockTime.Minute, blockTime.Second);
-
-                                AaruConsole.DebugWriteLine("KryoFlux plugin", "Found timestamp: {0}", blockTimestamp);
-
-                                if(blockTimestamp < Info.CreationTime)
-                                    _imageInfo.CreationTime = blockTimestamp;
-
-                                if(blockTimestamp > Info.LastModificationTime)
-                                    _imageInfo.LastModificationTime = blockTimestamp;
-                            }
+                            trackStream.Position = trackStream.Length;
 
                             break;
                         }
-                        case (byte)BlockIds.Flux2:
-                        case (byte)BlockIds.Flux2_1:
-                        case (byte)BlockIds.Flux2_2:
-                        case (byte)BlockIds.Flux2_3:
-                        case (byte)BlockIds.Flux2_4:
-                        case (byte)BlockIds.Flux2_5:
-                        case (byte)BlockIds.Flux2_6:
-                        case (byte)BlockIds.Flux2_7:
-                        case (byte)BlockIds.Nop2:
-                            trackStream.Position++;
 
-                            continue;
-                        case (byte)BlockIds.Nop3:
-                        case (byte)BlockIds.Flux3:
-                            trackStream.Position += 2;
+                        if(oobBlk.blockType != OobTypes.KFInfo)
+                        {
+                            trackStream.Position += oobBlk.length;
 
-                            continue;
-                        default: continue;
+                            break;
+                        }
+
+                        byte[] kfinfo = new byte[oobBlk.length];
+                        trackStream.Read(kfinfo, 0, oobBlk.length);
+                        string kfinfoStr = StringHandlers.CToString(kfinfo);
+
+                        string[] lines = kfinfoStr.Split(new[]
+                        {
+                            ','
+                        }, StringSplitOptions.RemoveEmptyEntries);
+
+                        DateTime blockDate = DateTime.Now;
+                        DateTime blockTime = DateTime.Now;
+                        bool     foundDate = false;
+
+                        foreach(string[] kvp in lines.Select(line => line.Split('=')).Where(kvp => kvp.Length == 2))
+                        {
+                            kvp[0] = kvp[0].Trim();
+                            kvp[1] = kvp[1].Trim();
+                            AaruConsole.DebugWriteLine("KryoFlux plugin", "\"{0}\" = \"{1}\"", kvp[0], kvp[1]);
+
+                            switch(kvp[0])
+                            {
+                                case HOST_DATE:
+                                    if(DateTime.TryParseExact(kvp[1], "yyyy.MM.dd", CultureInfo.InvariantCulture,
+                                                              DateTimeStyles.AssumeLocal, out blockDate))
+                                        foundDate = true;
+
+                                    break;
+                                case HOST_TIME:
+                                    DateTime.TryParseExact(kvp[1], "HH:mm:ss", CultureInfo.InvariantCulture,
+                                                           DateTimeStyles.AssumeLocal, out blockTime);
+
+                                    break;
+                                case KF_NAME:
+                                    _imageInfo.Application = kvp[1];
+
+                                    break;
+                                case KF_VERSION:
+                                    _imageInfo.ApplicationVersion = kvp[1];
+
+                                    break;
+                            }
+                        }
+
+                        if(foundDate)
+                        {
+                            var blockTimestamp = new DateTime(blockDate.Year, blockDate.Month, blockDate.Day,
+                                                              blockTime.Hour, blockTime.Minute, blockTime.Second);
+
+                            AaruConsole.DebugWriteLine("KryoFlux plugin", "Found timestamp: {0}", blockTimestamp);
+
+                            if(blockTimestamp < Info.CreationTime)
+                                _imageInfo.CreationTime = blockTimestamp;
+
+                            if(blockTimestamp > Info.LastModificationTime)
+                                _imageInfo.LastModificationTime = blockTimestamp;
+                        }
+
+                        break;
                     }
-                }
+                    case (byte)BlockIds.Flux2:
+                    case (byte)BlockIds.Flux2_1:
+                    case (byte)BlockIds.Flux2_2:
+                    case (byte)BlockIds.Flux2_3:
+                    case (byte)BlockIds.Flux2_4:
+                    case (byte)BlockIds.Flux2_5:
+                    case (byte)BlockIds.Flux2_6:
+                    case (byte)BlockIds.Flux2_7:
+                    case (byte)BlockIds.Nop2:
+                        trackStream.Position++;
 
-                tracks.Add(t, trackFilter);
+                        continue;
+                    case (byte)BlockIds.Nop3:
+                    case (byte)BlockIds.Flux3:
+                        trackStream.Position += 2;
+
+                        continue;
+                    default: continue;
+                }
             }
 
-            _imageInfo.Heads     = heads;
-            _imageInfo.Cylinders = (uint)(tracks.Count / heads);
-
-            AaruConsole.ErrorWriteLine("Flux decoding is not yet implemented.");
-
-            return ErrorNumber.NotImplemented;
+            tracks.Add(t, trackFilter);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        _imageInfo.Heads     = heads;
+        _imageInfo.Cylinders = (uint)(tracks.Count / heads);
 
-            return ErrorNumber.NotImplemented;
-        }
+        AaruConsole.ErrorWriteLine("Flux decoding is not yet implemented.");
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        return ErrorNumber.NotImplemented;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+        return ErrorNumber.NotImplemented;
+    }
 
-            return ErrorNumber.NotImplemented;
-        }
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
 
-            return ErrorNumber.NotImplemented;
-        }
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
+        return ErrorNumber.NotImplemented;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotImplemented;
-        }
+        return ErrorNumber.NotImplemented;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        return ErrorNumber.NotImplemented;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/Structs.cs b/Aaru.Images/KryoFlux/Structs.cs
index 72cb200bb..43c014bcf 100644
--- a/Aaru.Images/KryoFlux/Structs.cs
+++ b/Aaru.Images/KryoFlux/Structs.cs
@@ -32,16 +32,15 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class KryoFlux
 {
-    public sealed partial class KryoFlux
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct OobBlock
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct OobBlock
-        {
-            public readonly BlockIds blockId;
-            public readonly OobTypes blockType;
-            public readonly ushort   length;
-        }
+        public readonly BlockIds blockId;
+        public readonly OobTypes blockType;
+        public readonly ushort   length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/KryoFlux/Verify.cs b/Aaru.Images/KryoFlux/Verify.cs
index 4af651eb6..0385d1acf 100644
--- a/Aaru.Images/KryoFlux/Verify.cs
+++ b/Aaru.Images/KryoFlux/Verify.cs
@@ -33,17 +33,16 @@
 using System;
 using System.Collections.Generic;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class KryoFlux
-    {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress) =>
-            throw new NotImplementedException("Flux decoding is not yet implemented.");
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas) =>
-            throw new NotImplementedException("Flux decoding is not yet implemented.");
-    }
+public sealed partial class KryoFlux
+{
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress) =>
+        throw new NotImplementedException("Flux decoding is not yet implemented.");
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas) =>
+        throw new NotImplementedException("Flux decoding is not yet implemented.");
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Enums.cs b/Aaru.Images/MaxiDisk/Enums.cs
index e60cefbe7..7d75d6569 100644
--- a/Aaru.Images/MaxiDisk/Enums.cs
+++ b/Aaru.Images/MaxiDisk/Enums.cs
@@ -32,17 +32,16 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class MaxiDisk
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class MaxiDisk
+    enum HdkDiskTypes : byte
     {
-        enum HdkDiskTypes : byte
-        {
-            Dos360  = 0, Maxi420 = 1, Dos720    = 2,
-            Maxi800 = 3, Dos1200 = 4, Maxi1400  = 5,
-            Dos1440 = 6, Mac1440 = 7, Maxi1600  = 8,
-            Dmf     = 9, Dos2880 = 10, Maxi3200 = 11
-        }
+        Dos360  = 0, Maxi420 = 1, Dos720    = 2,
+        Maxi800 = 3, Dos1200 = 4, Maxi1400  = 5,
+        Dos1440 = 6, Mac1440 = 7, Maxi1600  = 8,
+        Dmf     = 9, Dos2880 = 10, Maxi3200 = 11
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Identify.cs b/Aaru.Images/MaxiDisk/Identify.cs
index 20cf2cfd6..1235bc0d9 100644
--- a/Aaru.Images/MaxiDisk/Identify.cs
+++ b/Aaru.Images/MaxiDisk/Identify.cs
@@ -35,58 +35,57 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class MaxiDisk
 {
-    public sealed partial class MaxiDisk
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
+        Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < 8)
-                return false;
+        if(stream.Length < 8)
+            return false;
 
-            byte[] buffer = new byte[8];
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, buffer.Length);
+        byte[] buffer = new byte[8];
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, buffer.Length);
 
-            Header tmpHeader = Marshal.ByteArrayToStructureLittleEndian<Header>(buffer);
+        Header tmpHeader = Marshal.ByteArrayToStructureLittleEndian<Header>(buffer);
 
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.unknown = {0}", tmpHeader.unknown);
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.diskType = {0}", tmpHeader.diskType);
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.heads = {0}", tmpHeader.heads);
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.cylinders = {0}", tmpHeader.cylinders);
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.bytesPerSector = {0}", tmpHeader.bytesPerSector);
+        AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.unknown = {0}", tmpHeader.unknown);
+        AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.diskType = {0}", tmpHeader.diskType);
+        AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.heads = {0}", tmpHeader.heads);
+        AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.cylinders = {0}", tmpHeader.cylinders);
+        AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.bytesPerSector = {0}", tmpHeader.bytesPerSector);
 
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.sectorsPerTrack = {0}",
-                                       tmpHeader.sectorsPerTrack);
+        AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.sectorsPerTrack = {0}",
+                                   tmpHeader.sectorsPerTrack);
 
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.unknown2 = {0}", tmpHeader.unknown2);
-            AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.unknown3 = {0}", tmpHeader.unknown3);
+        AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.unknown2 = {0}", tmpHeader.unknown2);
+        AaruConsole.DebugWriteLine("MAXI Disk plugin", "tmp_header.unknown3 = {0}", tmpHeader.unknown3);
 
-            // This is hardcoded
-            // But its possible values are unknown...
-            //if(tmp_header.diskType > 11)
-            //    return false;
+        // This is hardcoded
+        // But its possible values are unknown...
+        //if(tmp_header.diskType > 11)
+        //    return false;
 
-            // Only floppies supported
-            if(tmpHeader.heads == 0 ||
-               tmpHeader.heads > 2)
-                return false;
+        // Only floppies supported
+        if(tmpHeader.heads == 0 ||
+           tmpHeader.heads > 2)
+            return false;
 
-            // No floppies with more than this?
-            if(tmpHeader.cylinders > 90)
-                return false;
+        // No floppies with more than this?
+        if(tmpHeader.cylinders > 90)
+            return false;
 
-            // Maximum supported bps is 16384
-            if(tmpHeader.bytesPerSector > 7)
-                return false;
+        // Maximum supported bps is 16384
+        if(tmpHeader.bytesPerSector > 7)
+            return false;
 
-            int expectedFileSize = (tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack *
-                                    (128 << tmpHeader.bytesPerSector)) + 8;
+        int expectedFileSize = (tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack *
+                                (128 << tmpHeader.bytesPerSector)) + 8;
 
-            return expectedFileSize == stream.Length;
-        }
+        return expectedFileSize == stream.Length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/MaxiDisk.cs b/Aaru.Images/MaxiDisk/MaxiDisk.cs
index 4d99d72ef..67041e751 100644
--- a/Aaru.Images/MaxiDisk/MaxiDisk.cs
+++ b/Aaru.Images/MaxiDisk/MaxiDisk.cs
@@ -36,37 +36,36 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing MaxiDisk disk images</summary>
-    public sealed partial class MaxiDisk : IWritableImage
-    {
-        /// <summary>Disk image file</summary>
-        IFilter _hdkImageFilter;
-        ImageInfo  _imageInfo;
-        FileStream _writingStream;
+namespace Aaru.DiscImages;
 
-        public MaxiDisk() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Application           = "MAXI Disk",
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing MaxiDisk disk images</summary>
+public sealed partial class MaxiDisk : IWritableImage
+{
+    /// <summary>Disk image file</summary>
+    IFilter _hdkImageFilter;
+    ImageInfo  _imageInfo;
+    FileStream _writingStream;
+
+    public MaxiDisk() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Application           = "MAXI Disk",
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Properties.cs b/Aaru.Images/MaxiDisk/Properties.cs
index fb062be88..1a9ecd005 100644
--- a/Aaru.Images/MaxiDisk/Properties.cs
+++ b/Aaru.Images/MaxiDisk/Properties.cs
@@ -37,55 +37,54 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class MaxiDisk
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Name => "MAXI Disk image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("D27D924A-7034-466E-ADE1-B81EF37E469E");
-        /// <inheritdoc />
-        public string Format => "MAXI Disk";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
+namespace Aaru.DiscImages;
 
-        // TODO: Test with real hardware to see real supported media
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.Apricot_35, MediaType.ATARI_35_DS_DD, MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD,
-            MediaType.ATARI_35_SS_DD_11, MediaType.DMF, MediaType.DMF_82, MediaType.DOS_35_DS_DD_8,
-            MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8,
-            MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD,
-            MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
-            MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525,
-            MediaType.MetaFloppy_Mod_I, MediaType.MetaFloppy_Mod_II
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".hdk"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+public sealed partial class MaxiDisk
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Name => "MAXI Disk image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("D27D924A-7034-466E-ADE1-B81EF37E469E");
+    /// <inheritdoc />
+    public string Format => "MAXI Disk";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+
+    // TODO: Test with real hardware to see real supported media
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.Apricot_35, MediaType.ATARI_35_DS_DD, MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD,
+        MediaType.ATARI_35_SS_DD_11, MediaType.DMF, MediaType.DMF_82, MediaType.DOS_35_DS_DD_8,
+        MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8,
+        MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD,
+        MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
+        MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525,
+        MediaType.MetaFloppy_Mod_I, MediaType.MetaFloppy_Mod_II
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
+            {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".hdk"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Read.cs b/Aaru.Images/MaxiDisk/Read.cs
index 86d0c3cce..4d0a46383 100644
--- a/Aaru.Images/MaxiDisk/Read.cs
+++ b/Aaru.Images/MaxiDisk/Read.cs
@@ -36,91 +36,90 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class MaxiDisk
 {
-    public sealed partial class MaxiDisk
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
+        Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < 8)
-                return ErrorNumber.InvalidArgument;
+        if(stream.Length < 8)
+            return ErrorNumber.InvalidArgument;
 
-            byte[] buffer = new byte[8];
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, buffer.Length);
+        byte[] buffer = new byte[8];
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, buffer.Length);
 
-            Header tmpHeader = Marshal.ByteArrayToStructureLittleEndian<Header>(buffer);
+        Header tmpHeader = Marshal.ByteArrayToStructureLittleEndian<Header>(buffer);
 
-            // This is hardcoded
-            // But its possible values are unknown...
-            //if(tmp_header.diskType > 11)
-            //    return false;
+        // This is hardcoded
+        // But its possible values are unknown...
+        //if(tmp_header.diskType > 11)
+        //    return false;
 
-            // Only floppies supported
-            if(tmpHeader.heads == 0 ||
-               tmpHeader.heads > 2)
-                return ErrorNumber.InvalidArgument;
+        // Only floppies supported
+        if(tmpHeader.heads == 0 ||
+           tmpHeader.heads > 2)
+            return ErrorNumber.InvalidArgument;
 
-            // No floppies with more than this?
-            if(tmpHeader.cylinders > 90)
-                return ErrorNumber.InvalidArgument;
+        // No floppies with more than this?
+        if(tmpHeader.cylinders > 90)
+            return ErrorNumber.InvalidArgument;
 
-            // Maximum supported bps is 16384
-            if(tmpHeader.bytesPerSector > 7)
-                return ErrorNumber.InvalidArgument;
+        // Maximum supported bps is 16384
+        if(tmpHeader.bytesPerSector > 7)
+            return ErrorNumber.InvalidArgument;
 
-            int expectedFileSize = (tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack *
-                                    (128 << tmpHeader.bytesPerSector)) + 8;
+        int expectedFileSize = (tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack *
+                                (128 << tmpHeader.bytesPerSector)) + 8;
 
-            if(expectedFileSize != stream.Length)
-                return ErrorNumber.InvalidArgument;
+        if(expectedFileSize != stream.Length)
+            return ErrorNumber.InvalidArgument;
 
-            _imageInfo.Cylinders       = tmpHeader.cylinders;
-            _imageInfo.Heads           = tmpHeader.heads;
-            _imageInfo.SectorsPerTrack = tmpHeader.sectorsPerTrack;
-            _imageInfo.Sectors         = (ulong)(tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack);
-            _imageInfo.SectorSize      = (uint)(128 << tmpHeader.bytesPerSector);
+        _imageInfo.Cylinders       = tmpHeader.cylinders;
+        _imageInfo.Heads           = tmpHeader.heads;
+        _imageInfo.SectorsPerTrack = tmpHeader.sectorsPerTrack;
+        _imageInfo.Sectors         = (ulong)(tmpHeader.heads * tmpHeader.cylinders * tmpHeader.sectorsPerTrack);
+        _imageInfo.SectorSize      = (uint)(128 << tmpHeader.bytesPerSector);
 
-            _hdkImageFilter = imageFilter;
+        _hdkImageFilter = imageFilter;
 
-            _imageInfo.ImageSize            = (ulong)(stream.Length - 8);
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.ImageSize            = (ulong)(stream.Length - 8);
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
 
-            _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
-                                                          (ushort)_imageInfo.SectorsPerTrack, _imageInfo.SectorSize,
-                                                          MediaEncoding.MFM, false));
+        _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
+                                                      (ushort)_imageInfo.SectorsPerTrack, _imageInfo.SectorSize,
+                                                      MediaEncoding.MFM, false));
 
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
 
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
 
-            buffer = new byte[length * _imageInfo.SectorSize];
+        buffer = new byte[length * _imageInfo.SectorSize];
 
-            Stream stream = _hdkImageFilter.GetDataForkStream();
-            stream.Seek((long)(8 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
-            stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
+        Stream stream = _hdkImageFilter.GetDataForkStream();
+        stream.Seek((long)(8 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+        stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
 
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Structs.cs b/Aaru.Images/MaxiDisk/Structs.cs
index f040549fd..f8d40a4f6 100644
--- a/Aaru.Images/MaxiDisk/Structs.cs
+++ b/Aaru.Images/MaxiDisk/Structs.cs
@@ -32,21 +32,20 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class MaxiDisk
 {
-    public sealed partial class MaxiDisk
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            public readonly byte unknown;
-            public          byte diskType;
-            public          byte heads;
-            public          byte cylinders;
-            public          byte bytesPerSector;
-            public          byte sectorsPerTrack;
-            public readonly byte unknown2;
-            public readonly byte unknown3;
-        }
+        public readonly byte unknown;
+        public          byte diskType;
+        public          byte heads;
+        public          byte cylinders;
+        public          byte bytesPerSector;
+        public          byte sectorsPerTrack;
+        public readonly byte unknown2;
+        public readonly byte unknown3;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Unsupported.cs b/Aaru.Images/MaxiDisk/Unsupported.cs
index 1756a1415..497c0e06c 100644
--- a/Aaru.Images/MaxiDisk/Unsupported.cs
+++ b/Aaru.Images/MaxiDisk/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class MaxiDisk
 {
-    public sealed partial class MaxiDisk
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/MaxiDisk/Write.cs b/Aaru.Images/MaxiDisk/Write.cs
index ecb12751e..15fd668c2 100644
--- a/Aaru.Images/MaxiDisk/Write.cs
+++ b/Aaru.Images/MaxiDisk/Write.cs
@@ -40,268 +40,267 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class MaxiDisk
 {
-    public sealed partial class MaxiDisk
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(CountBits.Count(sectorSize) != 1 ||
+           sectorSize                  > 16384)
         {
-            if(CountBits.Count(sectorSize) != 1 ||
-               sectorSize                  > 16384)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(sectors > 90 * 2 * 255)
-            {
-                ErrorMessage = "Too many sectors";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
-                variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType       = mediaType,
-                SectorSize      = sectorSize,
-                Sectors         = sectors,
-                Cylinders       = geometry.cylinders,
-                Heads           = geometry.heads,
-                SectorsPerTrack = geometry.sectorsPerTrack
-            };
-
-            if(_imageInfo.Cylinders > 90)
-            {
-                ErrorMessage = "Too many cylinders";
-
-                return false;
-            }
-
-            if(_imageInfo.Heads > 2)
-            {
-                ErrorMessage = "Too many heads";
-
-                return false;
-            }
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(sectors > 90 * 2 * 255)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != 512)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
-                                SeekOrigin.Begin);
-
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % 512 != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
-                                SeekOrigin.Begin);
-
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
+            variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
+
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+            MediaType       = mediaType,
+            SectorSize      = sectorSize,
+            Sectors         = sectors,
+            Cylinders       = geometry.cylinders,
+            Heads           = geometry.heads,
+            SectorsPerTrack = geometry.sectorsPerTrack
+        };
 
-                return false;
-            }
-
-            var header = new Header
-            {
-                diskType        = (byte)HdkDiskTypes.Dos2880,
-                cylinders       = (byte)_imageInfo.Cylinders,
-                heads           = (byte)_imageInfo.Heads,
-                sectorsPerTrack = (byte)_imageInfo.SectorsPerTrack
-            };
-
-            for(uint i = _imageInfo.SectorSize / 128; i > 1;)
-            {
-                header.bytesPerSector++;
-                i >>= 1;
-            }
-
-            byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
-            IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(header, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+        if(_imageInfo.Cylinders > 90)
         {
-            if(cylinders > 90)
-            {
-                ErrorMessage = "Too many cylinders.";
-
-                return false;
-            }
-
-            if(heads > 2)
-            {
-                ErrorMessage = "Too many heads.";
-
-                return false;
-            }
-
-            if(sectorsPerTrack > byte.MaxValue)
-            {
-                ErrorMessage = "Too many sectors per track.";
-
-                return false;
-            }
-
-            _imageInfo.SectorsPerTrack = sectorsPerTrack;
-            _imageInfo.Heads           = heads;
-            _imageInfo.Cylinders       = cylinders;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = "Too many cylinders";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+        if(_imageInfo.Heads > 2)
         {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = "Too many heads";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+            return false;
+        }
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != 512)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
+                            SeekOrigin.Begin);
+
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % 512 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
+                            SeekOrigin.Begin);
+
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        var header = new Header
+        {
+            diskType        = (byte)HdkDiskTypes.Dos2880,
+            cylinders       = (byte)_imageInfo.Cylinders,
+            heads           = (byte)_imageInfo.Heads,
+            sectorsPerTrack = (byte)_imageInfo.SectorsPerTrack
+        };
+
+        for(uint i = _imageInfo.SectorSize / 128; i > 1;)
+        {
+            header.bytesPerSector++;
+            i >>= 1;
+        }
+
+        byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
+        IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(header, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        if(cylinders > 90)
+        {
+            ErrorMessage = "Too many cylinders.";
+
+            return false;
+        }
+
+        if(heads > 2)
+        {
+            ErrorMessage = "Too many heads.";
+
+            return false;
+        }
+
+        if(sectorsPerTrack > byte.MaxValue)
+        {
+            ErrorMessage = "Too many sectors per track.";
+
+            return false;
+        }
+
+        _imageInfo.SectorsPerTrack = sectorsPerTrack;
+        _imageInfo.Heads           = heads;
+        _imageInfo.Cylinders       = cylinders;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/NDIF/Constants.cs b/Aaru.Images/NDIF/Constants.cs
index cc21e08fe..85f3a1fb8 100644
--- a/Aaru.Images/NDIF/Constants.cs
+++ b/Aaru.Images/NDIF/Constants.cs
@@ -32,33 +32,32 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Ndif
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Ndif
-    {
-        /// <summary>Resource OSType for NDIF is "bcem"</summary>
-        const uint NDIF_RESOURCE = 0x6263656D;
-        /// <summary>Resource ID is always 128? Never found another</summary>
-        const short NDIF_RESOURCEID = 128;
+    /// <summary>Resource OSType for NDIF is "bcem"</summary>
+    const uint NDIF_RESOURCE = 0x6263656D;
+    /// <summary>Resource ID is always 128? Never found another</summary>
+    const short NDIF_RESOURCEID = 128;
 
-        const byte CHUNK_TYPE_NOCOPY  = 0;
-        const byte CHUNK_TYPE_COPY    = 2;
-        const byte CHUNK_TYPE_KENCODE = 0x80;
-        const byte CHUNK_TYPE_RLE     = 0x81;
-        const byte CHUNK_TYPE_LZH     = 0x82;
-        const byte CHUNK_TYPE_ADC     = 0x83;
-        /// <summary>Created by ShrinkWrap 3.5, dunno which version of the StuffIt algorithm it is using</summary>
-        const byte CHUNK_TYPE_STUFFIT = 0xF0;
-        const byte CHUNK_TYPE_END             = 0xFF;
-        const byte CHUNK_TYPE_COMPRESSED_MASK = 0x80;
+    const byte CHUNK_TYPE_NOCOPY  = 0;
+    const byte CHUNK_TYPE_COPY    = 2;
+    const byte CHUNK_TYPE_KENCODE = 0x80;
+    const byte CHUNK_TYPE_RLE     = 0x81;
+    const byte CHUNK_TYPE_LZH     = 0x82;
+    const byte CHUNK_TYPE_ADC     = 0x83;
+    /// <summary>Created by ShrinkWrap 3.5, dunno which version of the StuffIt algorithm it is using</summary>
+    const byte CHUNK_TYPE_STUFFIT = 0xF0;
+    const byte CHUNK_TYPE_END             = 0xFF;
+    const byte CHUNK_TYPE_COMPRESSED_MASK = 0x80;
 
-        const short DRIVER_OSX         = -1;
-        const short DRIVER_HFS         = 0;
-        const short DRIVER_PRODOS      = 256;
-        const short DRIVER_DOS         = 18771;
-        const uint  MAX_CACHE_SIZE     = 16777216;
-        const uint  SECTOR_SIZE        = 512;
-        const uint  MAX_CACHED_SECTORS = MAX_CACHE_SIZE / SECTOR_SIZE;
-    }
+    const short DRIVER_OSX         = -1;
+    const short DRIVER_HFS         = 0;
+    const short DRIVER_PRODOS      = 256;
+    const short DRIVER_DOS         = 18771;
+    const uint  MAX_CACHE_SIZE     = 16777216;
+    const uint  SECTOR_SIZE        = 512;
+    const uint  MAX_CACHED_SECTORS = MAX_CACHE_SIZE / SECTOR_SIZE;
 }
\ No newline at end of file
diff --git a/Aaru.Images/NDIF/Identify.cs b/Aaru.Images/NDIF/Identify.cs
index b1c7d7e08..c2a152376 100644
--- a/Aaru.Images/NDIF/Identify.cs
+++ b/Aaru.Images/NDIF/Identify.cs
@@ -35,42 +35,41 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Claunia.RsrcFork;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Ndif
 {
-    public sealed partial class Ndif
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        if(!imageFilter.HasResourceFork ||
+           imageFilter.ResourceForkLength == 0)
+            return false;
+
+        try
         {
-            if(!imageFilter.HasResourceFork ||
-               imageFilter.ResourceForkLength == 0)
+            var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+
+            if(!rsrcFork.ContainsKey(NDIF_RESOURCE))
                 return false;
 
-            try
-            {
-                var rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+            Resource rsrc = rsrcFork.GetResource(NDIF_RESOURCE);
 
-                if(!rsrcFork.ContainsKey(NDIF_RESOURCE))
-                    return false;
+            Stream dataFork  = imageFilter.GetDataForkStream();
+            byte[] udifMagic = new byte[4];
+            dataFork.Read(udifMagic, 0, 4);
 
-                Resource rsrc = rsrcFork.GetResource(NDIF_RESOURCE);
-
-                Stream dataFork  = imageFilter.GetDataForkStream();
-                byte[] udifMagic = new byte[4];
-                dataFork.Read(udifMagic, 0, 4);
-
-                if(BitConverter.ToUInt32(udifMagic, 0) == 0x796C6F6B)
-                    return false;
-
-                if(rsrc.ContainsId(NDIF_RESOURCEID))
-                    return true;
-            }
-            catch(InvalidCastException)
-            {
+            if(BitConverter.ToUInt32(udifMagic, 0) == 0x796C6F6B)
                 return false;
-            }
 
+            if(rsrc.ContainsId(NDIF_RESOURCEID))
+                return true;
+        }
+        catch(InvalidCastException)
+        {
             return false;
         }
+
+        return false;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NDIF/NDIF.cs b/Aaru.Images/NDIF/NDIF.cs
index 91707d959..734575ebc 100644
--- a/Aaru.Images/NDIF/NDIF.cs
+++ b/Aaru.Images/NDIF/NDIF.cs
@@ -36,47 +36,46 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    // TODO: Detect OS X encrypted images
-    // TODO: Check checksum
-    // TODO: Implement segments
-    // TODO: Implement compression
-    /// <inheritdoc />
-    /// <summary>Implements reading Apple New Disk Image Format disk images</summary>
-    public sealed partial class Ndif : IMediaImage
-    {
-        uint                          _bufferSize;
-        Dictionary<ulong, byte[]>     _chunkCache;
-        Dictionary<ulong, BlockChunk> _chunks;
-        uint                          _currentChunkCacheSize;
-        ChunkHeader                   _header;
-        ImageInfo                     _imageInfo;
-        Stream                        _imageStream;
-        Dictionary<ulong, byte[]>     _sectorCache;
+namespace Aaru.DiscImages;
 
-        public Ndif() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: Detect OS X encrypted images
+// TODO: Check checksum
+// TODO: Implement segments
+// TODO: Implement compression
+/// <inheritdoc />
+/// <summary>Implements reading Apple New Disk Image Format disk images</summary>
+public sealed partial class Ndif : IMediaImage
+{
+    uint                          _bufferSize;
+    Dictionary<ulong, byte[]>     _chunkCache;
+    Dictionary<ulong, BlockChunk> _chunks;
+    uint                          _currentChunkCacheSize;
+    ChunkHeader                   _header;
+    ImageInfo                     _imageInfo;
+    Stream                        _imageStream;
+    Dictionary<ulong, byte[]>     _sectorCache;
+
+    public Ndif() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/NDIF/Properties.cs b/Aaru.Images/NDIF/Properties.cs
index 6bfec66bb..725f2dae2 100644
--- a/Aaru.Images/NDIF/Properties.cs
+++ b/Aaru.Images/NDIF/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Ndif
 {
-    public sealed partial class Ndif
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "Apple New Disk Image Format";
-        /// <inheritdoc />
-        public Guid Id => new Guid("5A7FF7D8-491E-458D-8674-5B5EADBECC24");
-        /// <inheritdoc />
-        public string Format => "Apple New Disk Image Format";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "Apple New Disk Image Format";
+    /// <inheritdoc />
+    public Guid Id => new Guid("5A7FF7D8-491E-458D-8674-5B5EADBECC24");
+    /// <inheritdoc />
+    public string Format => "Apple New Disk Image Format";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/NDIF/Read.cs b/Aaru.Images/NDIF/Read.cs
index 2b62a3d92..2ff270198 100644
--- a/Aaru.Images/NDIF/Read.cs
+++ b/Aaru.Images/NDIF/Read.cs
@@ -44,366 +44,379 @@ using Claunia.Encoding;
 using Claunia.RsrcFork;
 using Version = Resources.Version;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Ndif
 {
-    public sealed partial class Ndif
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        if(!imageFilter.HasResourceFork ||
+           imageFilter.ResourceForkLength == 0)
+            return ErrorNumber.InvalidArgument;
+
+        ResourceFork rsrcFork;
+        Resource     rsrc;
+        short[]      bcems;
+
+        try
         {
-            if(!imageFilter.HasResourceFork ||
-               imageFilter.ResourceForkLength == 0)
+            rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+
+            if(!rsrcFork.ContainsKey(NDIF_RESOURCE))
                 return ErrorNumber.InvalidArgument;
 
-            ResourceFork rsrcFork;
-            Resource     rsrc;
-            short[]      bcems;
+            rsrc = rsrcFork.GetResource(NDIF_RESOURCE);
 
-            try
+            bcems = rsrc.GetIds();
+
+            if(bcems        == null ||
+               bcems.Length == 0)
+                return ErrorNumber.InvalidArgument;
+        }
+        catch(InvalidCastException ex)
+        {
+            AaruConsole.ErrorWriteLine("Exception trying to open image file {0}", imageFilter.BasePath);
+            AaruConsole.ErrorWriteLine("Exception: {0}", ex);
+
+            return ErrorNumber.UnexpectedException;
+        }
+
+        _imageInfo.Sectors = 0;
+
+        foreach(byte[] bcem in bcems.Select(id => rsrc.GetResource(NDIF_RESOURCEID)))
+        {
+            if(bcem.Length < 128)
+                return ErrorNumber.InvalidArgument;
+
+            _header = Marshal.ByteArrayToStructureBigEndian<ChunkHeader>(bcem);
+
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.type = {0}", _header.version);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.driver = {0}", _header.driver);
+
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.name = {0}",
+                                       StringHandlers.PascalToString(_header.name,
+                                                                     Encoding.GetEncoding("macintosh")));
+
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.sectors = {0}", _header.sectors);
+
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.maxSectorsPerChunk = {0}",
+                                       _header.maxSectorsPerChunk);
+
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.dataOffset = {0}", _header.dataOffset);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.crc = 0x{0:X7}", _header.crc);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.segmented = {0}", _header.segmented);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.p1 = 0x{0:X8}", _header.p1);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.p2 = 0x{0:X8}", _header.p2);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[0] = 0x{0:X8}", _header.unknown[0]);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[1] = 0x{0:X8}", _header.unknown[1]);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[2] = 0x{0:X8}", _header.unknown[2]);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[3] = 0x{0:X8}", _header.unknown[3]);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[4] = 0x{0:X8}", _header.unknown[4]);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.encrypted = {0}", _header.encrypted);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.hash = 0x{0:X8}", _header.hash);
+            AaruConsole.DebugWriteLine("NDIF plugin", "footer.chunks = {0}", _header.chunks);
+
+            // Block chunks and headers
+            _chunks = new Dictionary<ulong, BlockChunk>();
+
+            for(int i = 0; i < _header.chunks; i++)
             {
-                rsrcFork = new ResourceFork(imageFilter.GetResourceForkStream());
+                // Obsolete read-only NDIF only prepended the header and then put the image without any kind of block references.
+                // So let's falsify a block chunk
+                var    bChnk  = new BlockChunk();
+                byte[] sector = new byte[4];
+                Array.Copy(bcem, 128 + 0 + (i * 12), sector, 1, 3);
+                bChnk.sector = BigEndianBitConverter.ToUInt32(sector, 0);
+                bChnk.type   = bcem[128                                 + 3 + (i * 12)];
+                bChnk.offset = BigEndianBitConverter.ToUInt32(bcem, 128 + 4 + (i * 12));
+                bChnk.length = BigEndianBitConverter.ToUInt32(bcem, 128 + 8 + (i * 12));
 
-                if(!rsrcFork.ContainsKey(NDIF_RESOURCE))
-                    return ErrorNumber.InvalidArgument;
+                AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].type = 0x{1:X2}", i, bChnk.type);
+                AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].sector = {1}", i, bChnk.sector);
+                AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].offset = {1}", i, bChnk.offset);
+                AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].length = {1}", i, bChnk.length);
 
-                rsrc = rsrcFork.GetResource(NDIF_RESOURCE);
+                if(bChnk.type == CHUNK_TYPE_END)
+                    break;
 
-                bcems = rsrc.GetIds();
+                bChnk.offset += _header.dataOffset;
+                bChnk.sector += (uint)_imageInfo.Sectors;
 
-                if(bcems        == null ||
-                   bcems.Length == 0)
-                    return ErrorNumber.InvalidArgument;
-            }
-            catch(InvalidCastException ex)
-            {
-                AaruConsole.ErrorWriteLine("Exception trying to open image file {0}", imageFilter.BasePath);
-                AaruConsole.ErrorWriteLine("Exception: {0}", ex);
-
-                return ErrorNumber.UnexpectedException;
-            }
-
-            _imageInfo.Sectors = 0;
-
-            foreach(byte[] bcem in bcems.Select(id => rsrc.GetResource(NDIF_RESOURCEID)))
-            {
-                if(bcem.Length < 128)
-                    return ErrorNumber.InvalidArgument;
-
-                _header = Marshal.ByteArrayToStructureBigEndian<ChunkHeader>(bcem);
-
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.type = {0}", _header.version);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.driver = {0}", _header.driver);
-
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.name = {0}",
-                                           StringHandlers.PascalToString(_header.name,
-                                                                         Encoding.GetEncoding("macintosh")));
-
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.sectors = {0}", _header.sectors);
-
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.maxSectorsPerChunk = {0}",
-                                           _header.maxSectorsPerChunk);
-
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.dataOffset = {0}", _header.dataOffset);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.crc = 0x{0:X7}", _header.crc);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.segmented = {0}", _header.segmented);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.p1 = 0x{0:X8}", _header.p1);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.p2 = 0x{0:X8}", _header.p2);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[0] = 0x{0:X8}", _header.unknown[0]);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[1] = 0x{0:X8}", _header.unknown[1]);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[2] = 0x{0:X8}", _header.unknown[2]);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[3] = 0x{0:X8}", _header.unknown[3]);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.unknown[4] = 0x{0:X8}", _header.unknown[4]);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.encrypted = {0}", _header.encrypted);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.hash = 0x{0:X8}", _header.hash);
-                AaruConsole.DebugWriteLine("NDIF plugin", "footer.chunks = {0}", _header.chunks);
-
-                // Block chunks and headers
-                _chunks = new Dictionary<ulong, BlockChunk>();
-
-                for(int i = 0; i < _header.chunks; i++)
+                // TODO: Handle compressed chunks
+                switch(bChnk.type)
                 {
-                    // Obsolete read-only NDIF only prepended the header and then put the image without any kind of block references.
-                    // So let's falsify a block chunk
-                    var    bChnk  = new BlockChunk();
-                    byte[] sector = new byte[4];
-                    Array.Copy(bcem, 128 + 0 + (i * 12), sector, 1, 3);
-                    bChnk.sector = BigEndianBitConverter.ToUInt32(sector, 0);
-                    bChnk.type   = bcem[128                                 + 3 + (i * 12)];
-                    bChnk.offset = BigEndianBitConverter.ToUInt32(bcem, 128 + 4 + (i * 12));
-                    bChnk.length = BigEndianBitConverter.ToUInt32(bcem, 128 + 8 + (i * 12));
+                    case CHUNK_TYPE_KENCODE:
+                        AaruConsole.ErrorWriteLine("Chunks compressed with KenCode are not yet supported.");
 
-                    AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].type = 0x{1:X2}", i, bChnk.type);
-                    AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].sector = {1}", i, bChnk.sector);
-                    AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].offset = {1}", i, bChnk.offset);
-                    AaruConsole.DebugWriteLine("NDIF plugin", "bHdr.chunk[{0}].length = {1}", i, bChnk.length);
+                        return ErrorNumber.NotImplemented;
+                    case CHUNK_TYPE_LZH:
+                        AaruConsole.ErrorWriteLine("Chunks compressed with LZH are not yet supported.");
+
+                        return ErrorNumber.NotImplemented;
+                    case CHUNK_TYPE_STUFFIT:
+                        AaruConsole.ErrorWriteLine("Chunks compressed with StuffIt! are not yet supported.");
+
+                        return ErrorNumber.NotImplemented;
+                }
+
+                // TODO: Handle compressed chunks
+                if((bChnk.type > CHUNK_TYPE_COPY    && bChnk.type < CHUNK_TYPE_KENCODE) ||
+                   (bChnk.type > CHUNK_TYPE_ADC     && bChnk.type < CHUNK_TYPE_STUFFIT) ||
+                   (bChnk.type > CHUNK_TYPE_STUFFIT && bChnk.type < CHUNK_TYPE_END)     ||
+                   bChnk.type == 1)
+                {
+                    AaruConsole.ErrorWriteLine($"Unsupported chunk type 0x{bChnk.type:X8} found");
+
+                    return ErrorNumber.InvalidArgument;
+                }
+
+                _chunks.Add(bChnk.sector, bChnk);
+            }
+
+            _imageInfo.Sectors += _header.sectors;
+        }
+
+        if(_header.segmented > 0)
+        {
+            AaruConsole.ErrorWriteLine("Segmented images are not yet supported.");
+
+            return ErrorNumber.NotImplemented;
+        }
+
+        if(_header.encrypted > 0)
+        {
+            AaruConsole.ErrorWriteLine("Encrypted images are not yet supported.");
+
+            return ErrorNumber.NotImplemented;
+        }
+
+        switch(_imageInfo.Sectors)
+        {
+            case 1440:
+                _imageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
+
+                break;
+            case 1600:
+                _imageInfo.MediaType = MediaType.AppleSonyDS;
+
+                break;
+            case 2880:
+                _imageInfo.MediaType = MediaType.DOS_35_HD;
+
+                break;
+            case 3360:
+                _imageInfo.MediaType = MediaType.DMF;
+
+                break;
+            default:
+                _imageInfo.MediaType = MediaType.GENERIC_HDD;
+
+                break;
+        }
+
+        if(rsrcFork.ContainsKey(0x76657273))
+        {
+            Resource versRsrc = rsrcFork.GetResource(0x76657273);
+
+            if(versRsrc != null)
+            {
+                byte[] vers = versRsrc.GetResource(versRsrc.GetIds()[0]);
+
+                var version = new Version(vers);
+
+                string release = null;
+                string dev     = null;
+                string pre     = null;
+
+                string major = $"{version.MajorVersion}";
+                string minor = $".{version.MinorVersion / 10}";
+
+                if(version.MinorVersion % 10 > 0)
+                    release = $".{version.MinorVersion % 10}";
+
+                switch(version.DevStage)
+                {
+                    case Version.DevelopmentStage.Alpha:
+                        dev = "a";
 
-                    if(bChnk.type == CHUNK_TYPE_END)
                         break;
+                    case Version.DevelopmentStage.Beta:
+                        dev = "b";
 
-                    bChnk.offset += _header.dataOffset;
-                    bChnk.sector += (uint)_imageInfo.Sectors;
+                        break;
+                    case Version.DevelopmentStage.PreAlpha:
+                        dev = "d";
 
-                    // TODO: Handle compressed chunks
-                    switch(bChnk.type)
-                    {
-                        case CHUNK_TYPE_KENCODE:
-                            AaruConsole.ErrorWriteLine("Chunks compressed with KenCode are not yet supported.");
-
-                            return ErrorNumber.NotImplemented;
-                        case CHUNK_TYPE_LZH:
-                            AaruConsole.ErrorWriteLine("Chunks compressed with LZH are not yet supported.");
-
-                            return ErrorNumber.NotImplemented;
-                        case CHUNK_TYPE_STUFFIT:
-                            AaruConsole.ErrorWriteLine("Chunks compressed with StuffIt! are not yet supported.");
-
-                            return ErrorNumber.NotImplemented;
-                    }
-
-                    // TODO: Handle compressed chunks
-                    if((bChnk.type > CHUNK_TYPE_COPY    && bChnk.type < CHUNK_TYPE_KENCODE) ||
-                       (bChnk.type > CHUNK_TYPE_ADC     && bChnk.type < CHUNK_TYPE_STUFFIT) ||
-                       (bChnk.type > CHUNK_TYPE_STUFFIT && bChnk.type < CHUNK_TYPE_END)     ||
-                       bChnk.type == 1)
-                    {
-                        AaruConsole.ErrorWriteLine($"Unsupported chunk type 0x{bChnk.type:X8} found");
-
-                        return ErrorNumber.InvalidArgument;
-                    }
-
-                    _chunks.Add(bChnk.sector, bChnk);
+                        break;
                 }
 
-                _imageInfo.Sectors += _header.sectors;
+                if(dev                       == null &&
+                   version.PreReleaseVersion > 0)
+                    dev = "f";
+
+                if(dev != null)
+                    pre = $"{version.PreReleaseVersion}";
+
+                _imageInfo.ApplicationVersion = $"{major}{minor}{release}{dev}{pre}";
+                _imageInfo.Application        = version.VersionString;
+                _imageInfo.Comments           = version.VersionMessage;
+
+                if(version.MajorVersion == 3)
+                    _imageInfo.Application = "ShrinkWrap™";
+                else if(version.MajorVersion == 6)
+                    _imageInfo.Application = "DiskCopy";
             }
+        }
 
-            if(_header.segmented > 0)
+        AaruConsole.DebugWriteLine("NDIF plugin", "Image application = {0} version {1}", _imageInfo.Application,
+                                   _imageInfo.ApplicationVersion);
+
+        _sectorCache           = new Dictionary<ulong, byte[]>();
+        _chunkCache            = new Dictionary<ulong, byte[]>();
+        _currentChunkCacheSize = 0;
+        _imageStream           = imageFilter.GetDataForkStream();
+        _bufferSize            = _header.maxSectorsPerChunk * SECTOR_SIZE;
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+
+        _imageInfo.MediaTitle = StringHandlers.PascalToString(_header.name, Encoding.GetEncoding("macintosh"));
+
+        _imageInfo.SectorSize         = SECTOR_SIZE;
+        _imageInfo.XmlMediaType       = XmlMediaType.BlockMedia;
+        _imageInfo.ImageSize          = _imageInfo.Sectors * SECTOR_SIZE;
+        _imageInfo.ApplicationVersion = "6";
+        _imageInfo.Application        = "Apple DiskCopy";
+
+        switch(_imageInfo.MediaType)
+        {
+            case MediaType.AppleSonyDS:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.DOS_35_DS_DD_9:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case MediaType.DOS_35_HD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 18;
+
+                break;
+            case MediaType.DMF:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 21;
+
+                break;
+            default:
+                _imageInfo.MediaType       = MediaType.GENERIC_HDD;
+                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+                _imageInfo.Heads           = 16;
+                _imageInfo.SectorsPerTrack = 63;
+
+                break;
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(_sectorCache.TryGetValue(sectorAddress, out buffer))
+            return ErrorNumber.NoError;
+
+        var   currentChunk     = new BlockChunk();
+        bool  chunkFound       = false;
+        ulong chunkStartSector = 0;
+
+        foreach(KeyValuePair<ulong, BlockChunk> kvp in _chunks.Where(kvp => sectorAddress >= kvp.Key))
+        {
+            currentChunk     = kvp.Value;
+            chunkFound       = true;
+            chunkStartSector = kvp.Key;
+        }
+
+        long relOff = ((long)sectorAddress - (long)chunkStartSector) * SECTOR_SIZE;
+
+        if(relOff < 0)
+            return ErrorNumber.InvalidArgument;
+
+        if(!chunkFound)
+            return ErrorNumber.SectorNotFound;
+
+        if((currentChunk.type & CHUNK_TYPE_COMPRESSED_MASK) == CHUNK_TYPE_COMPRESSED_MASK)
+        {
+            if(!_chunkCache.TryGetValue(chunkStartSector, out byte[] data))
             {
-                AaruConsole.ErrorWriteLine("Segmented images are not yet supported.");
+                byte[] cmpBuffer = new byte[currentChunk.length];
+                _imageStream.Seek(currentChunk.offset, SeekOrigin.Begin);
+                _imageStream.Read(cmpBuffer, 0, cmpBuffer.Length);
+                var cmpMs = new MemoryStream(cmpBuffer);
+                int realSize;
 
-                return ErrorNumber.NotImplemented;
-            }
-
-            if(_header.encrypted > 0)
-            {
-                AaruConsole.ErrorWriteLine("Encrypted images are not yet supported.");
-
-                return ErrorNumber.NotImplemented;
-            }
-
-            switch(_imageInfo.Sectors)
-            {
-                case 1440:
-                    _imageInfo.MediaType = MediaType.DOS_35_DS_DD_9;
-
-                    break;
-                case 1600:
-                    _imageInfo.MediaType = MediaType.AppleSonyDS;
-
-                    break;
-                case 2880:
-                    _imageInfo.MediaType = MediaType.DOS_35_HD;
-
-                    break;
-                case 3360:
-                    _imageInfo.MediaType = MediaType.DMF;
-
-                    break;
-                default:
-                    _imageInfo.MediaType = MediaType.GENERIC_HDD;
-
-                    break;
-            }
-
-            if(rsrcFork.ContainsKey(0x76657273))
-            {
-                Resource versRsrc = rsrcFork.GetResource(0x76657273);
-
-                if(versRsrc != null)
+                switch(currentChunk.type)
                 {
-                    byte[] vers = versRsrc.GetResource(versRsrc.GetIds()[0]);
-
-                    var version = new Version(vers);
-
-                    string release = null;
-                    string dev     = null;
-                    string pre     = null;
-
-                    string major = $"{version.MajorVersion}";
-                    string minor = $".{version.MinorVersion / 10}";
-
-                    if(version.MinorVersion % 10 > 0)
-                        release = $".{version.MinorVersion % 10}";
-
-                    switch(version.DevStage)
+                    case CHUNK_TYPE_ADC:
                     {
-                        case Version.DevelopmentStage.Alpha:
-                            dev = "a";
+                        byte[] tmpBuffer = new byte[_bufferSize];
+                        realSize = ADC.DecodeBuffer(cmpBuffer, tmpBuffer);
+                        data     = new byte[realSize];
+                        Array.Copy(tmpBuffer, 0, data, 0, realSize);
 
-                            break;
-                        case Version.DevelopmentStage.Beta:
-                            dev = "b";
-
-                            break;
-                        case Version.DevelopmentStage.PreAlpha:
-                            dev = "d";
-
-                            break;
+                        break;
                     }
 
-                    if(dev                       == null &&
-                       version.PreReleaseVersion > 0)
-                        dev = "f";
+                    case CHUNK_TYPE_RLE:
+                    {
+                        byte[] tmpBuffer = new byte[_bufferSize];
+                        realSize = AppleRle.DecodeBuffer(cmpBuffer, tmpBuffer);
+                        data     = new byte[realSize];
+                        Array.Copy(tmpBuffer, 0, data, 0, realSize);
 
-                    if(dev != null)
-                        pre = $"{version.PreReleaseVersion}";
+                        break;
+                    }
 
-                    _imageInfo.ApplicationVersion = $"{major}{minor}{release}{dev}{pre}";
-                    _imageInfo.Application        = version.VersionString;
-                    _imageInfo.Comments           = version.VersionMessage;
-
-                    if(version.MajorVersion == 3)
-                        _imageInfo.Application = "ShrinkWrap™";
-                    else if(version.MajorVersion == 6)
-                        _imageInfo.Application = "DiskCopy";
+                    default: return ErrorNumber.NotSupported;
                 }
+
+                if(_currentChunkCacheSize + realSize > MAX_CACHE_SIZE)
+                {
+                    _chunkCache.Clear();
+                    _currentChunkCacheSize = 0;
+                }
+
+                _chunkCache.Add(chunkStartSector, data);
+                _currentChunkCacheSize += (uint)realSize;
             }
 
-            AaruConsole.DebugWriteLine("NDIF plugin", "Image application = {0} version {1}", _imageInfo.Application,
-                                       _imageInfo.ApplicationVersion);
+            buffer = new byte[SECTOR_SIZE];
+            Array.Copy(data, relOff, buffer, 0, SECTOR_SIZE);
 
-            _sectorCache           = new Dictionary<ulong, byte[]>();
-            _chunkCache            = new Dictionary<ulong, byte[]>();
-            _currentChunkCacheSize = 0;
-            _imageStream           = imageFilter.GetDataForkStream();
-            _bufferSize            = _header.maxSectorsPerChunk * SECTOR_SIZE;
+            if(_sectorCache.Count >= MAX_CACHED_SECTORS)
+                _sectorCache.Clear();
 
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-
-            _imageInfo.MediaTitle = StringHandlers.PascalToString(_header.name, Encoding.GetEncoding("macintosh"));
-
-            _imageInfo.SectorSize         = SECTOR_SIZE;
-            _imageInfo.XmlMediaType       = XmlMediaType.BlockMedia;
-            _imageInfo.ImageSize          = _imageInfo.Sectors * SECTOR_SIZE;
-            _imageInfo.ApplicationVersion = "6";
-            _imageInfo.Application        = "Apple DiskCopy";
-
-            switch(_imageInfo.MediaType)
-            {
-                case MediaType.AppleSonyDS:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.DOS_35_DS_DD_9:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.DOS_35_HD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 18;
-
-                    break;
-                case MediaType.DMF:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 21;
-
-                    break;
-                default:
-                    _imageInfo.MediaType       = MediaType.GENERIC_HDD;
-                    _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-                    _imageInfo.Heads           = 16;
-                    _imageInfo.SectorsPerTrack = 63;
-
-                    break;
-            }
+            _sectorCache.Add(sectorAddress, buffer);
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        switch(currentChunk.type)
         {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(_sectorCache.TryGetValue(sectorAddress, out buffer))
-                return ErrorNumber.NoError;
-
-            var   currentChunk     = new BlockChunk();
-            bool  chunkFound       = false;
-            ulong chunkStartSector = 0;
-
-            foreach(KeyValuePair<ulong, BlockChunk> kvp in _chunks.Where(kvp => sectorAddress >= kvp.Key))
-            {
-                currentChunk     = kvp.Value;
-                chunkFound       = true;
-                chunkStartSector = kvp.Key;
-            }
-
-            long relOff = ((long)sectorAddress - (long)chunkStartSector) * SECTOR_SIZE;
-
-            if(relOff < 0)
-                return ErrorNumber.InvalidArgument;
-
-            if(!chunkFound)
-                return ErrorNumber.SectorNotFound;
-
-            if((currentChunk.type & CHUNK_TYPE_COMPRESSED_MASK) == CHUNK_TYPE_COMPRESSED_MASK)
-            {
-                if(!_chunkCache.TryGetValue(chunkStartSector, out byte[] data))
-                {
-                    byte[] cmpBuffer = new byte[currentChunk.length];
-                    _imageStream.Seek(currentChunk.offset, SeekOrigin.Begin);
-                    _imageStream.Read(cmpBuffer, 0, cmpBuffer.Length);
-                    var cmpMs = new MemoryStream(cmpBuffer);
-                    int realSize;
-
-                    switch(currentChunk.type)
-                    {
-                        case CHUNK_TYPE_ADC:
-                        {
-                            byte[] tmpBuffer = new byte[_bufferSize];
-                            realSize = ADC.DecodeBuffer(cmpBuffer, tmpBuffer);
-                            data     = new byte[realSize];
-                            Array.Copy(tmpBuffer, 0, data, 0, realSize);
-
-                            break;
-                        }
-
-                        case CHUNK_TYPE_RLE:
-                        {
-                            byte[] tmpBuffer = new byte[_bufferSize];
-                            realSize = AppleRle.DecodeBuffer(cmpBuffer, tmpBuffer);
-                            data     = new byte[realSize];
-                            Array.Copy(tmpBuffer, 0, data, 0, realSize);
-
-                            break;
-                        }
-
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    if(_currentChunkCacheSize + realSize > MAX_CACHE_SIZE)
-                    {
-                        _chunkCache.Clear();
-                        _currentChunkCacheSize = 0;
-                    }
-
-                    _chunkCache.Add(chunkStartSector, data);
-                    _currentChunkCacheSize += (uint)realSize;
-                }
-
+            case CHUNK_TYPE_NOCOPY:
                 buffer = new byte[SECTOR_SIZE];
-                Array.Copy(data, relOff, buffer, 0, SECTOR_SIZE);
 
                 if(_sectorCache.Count >= MAX_CACHED_SECTORS)
                     _sectorCache.Clear();
@@ -411,61 +424,47 @@ namespace Aaru.DiscImages
                 _sectorCache.Add(sectorAddress, buffer);
 
                 return ErrorNumber.NoError;
-            }
+            case CHUNK_TYPE_COPY:
+                _imageStream.Seek(currentChunk.offset + relOff, SeekOrigin.Begin);
+                buffer = new byte[SECTOR_SIZE];
+                _imageStream.Read(buffer, 0, buffer.Length);
 
-            switch(currentChunk.type)
-            {
-                case CHUNK_TYPE_NOCOPY:
-                    buffer = new byte[SECTOR_SIZE];
+                if(_sectorCache.Count >= MAX_CACHED_SECTORS)
+                    _sectorCache.Clear();
 
-                    if(_sectorCache.Count >= MAX_CACHED_SECTORS)
-                        _sectorCache.Clear();
+                _sectorCache.Add(sectorAddress, buffer);
 
-                    _sectorCache.Add(sectorAddress, buffer);
-
-                    return ErrorNumber.NoError;
-                case CHUNK_TYPE_COPY:
-                    _imageStream.Seek(currentChunk.offset + relOff, SeekOrigin.Begin);
-                    buffer = new byte[SECTOR_SIZE];
-                    _imageStream.Read(buffer, 0, buffer.Length);
-
-                    if(_sectorCache.Count >= MAX_CACHED_SECTORS)
-                        _sectorCache.Clear();
-
-                    _sectorCache.Add(sectorAddress, buffer);
-
-                    return ErrorNumber.NoError;
-            }
-
-            return ErrorNumber.NotSupported;
+                return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        return ErrorNumber.NotSupported;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            ms.Write(sector, 0, sector.Length);
         }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NDIF/Structs.cs b/Aaru.Images/NDIF/Structs.cs
index 10e088c89..ed0ba53f9 100644
--- a/Aaru.Images/NDIF/Structs.cs
+++ b/Aaru.Images/NDIF/Structs.cs
@@ -34,70 +34,69 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class Ndif
 {
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class Ndif
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ChunkHeader
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ChunkHeader
-        {
-            /// <summary>Version</summary>
-            public readonly short version;
-            /// <summary>Filesystem ID</summary>
-            public readonly short driver;
-            /// <summary>Disk image name, Str63 (Pascal string)</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] name;
-            /// <summary>Sectors in image</summary>
-            public readonly uint sectors;
-            /// <summary>Maximum number of sectors per chunk</summary>
-            public readonly uint maxSectorsPerChunk;
-            /// <summary>Offset to add to every chunk offset</summary>
-            public readonly uint dataOffset;
-            /// <summary>CRC28 of whole image</summary>
-            public readonly uint crc;
-            /// <summary>Set to 1 if segmented</summary>
-            public readonly uint segmented;
-            /// <summary>Unknown</summary>
-            public readonly uint p1;
-            /// <summary>Unknown</summary>
-            public readonly uint p2;
-            /// <summary>Unknown, spare?</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly uint[] unknown;
-            /// <summary>Set to 1 by ShrinkWrap if image is encrypted</summary>
-            public readonly uint encrypted;
-            /// <summary>Set by ShrinkWrap if image is encrypted, value is the same for same password</summary>
-            public readonly uint hash;
-            /// <summary>How many chunks follow the header</summary>
-            public readonly uint chunks;
-        }
+        /// <summary>Version</summary>
+        public readonly short version;
+        /// <summary>Filesystem ID</summary>
+        public readonly short driver;
+        /// <summary>Disk image name, Str63 (Pascal string)</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] name;
+        /// <summary>Sectors in image</summary>
+        public readonly uint sectors;
+        /// <summary>Maximum number of sectors per chunk</summary>
+        public readonly uint maxSectorsPerChunk;
+        /// <summary>Offset to add to every chunk offset</summary>
+        public readonly uint dataOffset;
+        /// <summary>CRC28 of whole image</summary>
+        public readonly uint crc;
+        /// <summary>Set to 1 if segmented</summary>
+        public readonly uint segmented;
+        /// <summary>Unknown</summary>
+        public readonly uint p1;
+        /// <summary>Unknown</summary>
+        public readonly uint p2;
+        /// <summary>Unknown, spare?</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly uint[] unknown;
+        /// <summary>Set to 1 by ShrinkWrap if image is encrypted</summary>
+        public readonly uint encrypted;
+        /// <summary>Set by ShrinkWrap if image is encrypted, value is the same for same password</summary>
+        public readonly uint hash;
+        /// <summary>How many chunks follow the header</summary>
+        public readonly uint chunks;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BlockChunk
-        {
-            /// <summary>Starting sector, 3 bytes</summary>
-            public uint sector;
-            /// <summary>Chunk type</summary>
-            public byte type;
-            /// <summary>Offset in start of chunk</summary>
-            public uint offset;
-            /// <summary>Length in bytes of chunk</summary>
-            public uint length;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BlockChunk
+    {
+        /// <summary>Starting sector, 3 bytes</summary>
+        public uint sector;
+        /// <summary>Chunk type</summary>
+        public byte type;
+        /// <summary>Offset in start of chunk</summary>
+        public uint offset;
+        /// <summary>Length in bytes of chunk</summary>
+        public uint length;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SegmentHeader
-        {
-            /// <summary>Segment #</summary>
-            public readonly ushort segment;
-            /// <summary>How many segments</summary>
-            public readonly ushort segments;
-            /// <summary>Seems to be a Guid, changes with different images, same for all segments of same image</summary>
-            public readonly Guid segmentId;
-            /// <summary>Seems to be a CRC28 of this segment, unchecked</summary>
-            public readonly uint crc;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SegmentHeader
+    {
+        /// <summary>Segment #</summary>
+        public readonly ushort segment;
+        /// <summary>How many segments</summary>
+        public readonly ushort segments;
+        /// <summary>Seems to be a Guid, changes with different images, same for all segments of same image</summary>
+        public readonly Guid segmentId;
+        /// <summary>Seems to be a CRC28 of this segment, unchecked</summary>
+        public readonly uint crc;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NDIF/Unsupported.cs b/Aaru.Images/NDIF/Unsupported.cs
index a53171022..8ad9f711d 100644
--- a/Aaru.Images/NDIF/Unsupported.cs
+++ b/Aaru.Images/NDIF/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Ndif
 {
-    public sealed partial class Ndif
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/Constants.cs b/Aaru.Images/NHDr0/Constants.cs
index 2ee6bbd30..796073442 100644
--- a/Aaru.Images/NHDr0/Constants.cs
+++ b/Aaru.Images/NHDr0/Constants.cs
@@ -30,13 +30,12 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nhdr0
 {
-    public sealed partial class Nhdr0
+    readonly byte[] _signature =
     {
-        readonly byte[] _signature =
-        {
-            0x54, 0x39, 0x38, 0x48, 0x44, 0x44, 0x49, 0x4D, 0x41, 0x47, 0x45, 0x2E, 0x52, 0x30, 0x00
-        };
-    }
+        0x54, 0x39, 0x38, 0x48, 0x44, 0x44, 0x49, 0x4D, 0x41, 0x47, 0x45, 0x2E, 0x52, 0x30, 0x00
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/Identify.cs b/Aaru.Images/NHDr0/Identify.cs
index bed5d1685..348324888 100644
--- a/Aaru.Images/NHDr0/Identify.cs
+++ b/Aaru.Images/NHDr0/Identify.cs
@@ -37,45 +37,44 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nhdr0
 {
-    public sealed partial class Nhdr0
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            var shiftjis = Encoding.GetEncoding("shift_jis");
+        // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+        var shiftjis = Encoding.GetEncoding("shift_jis");
 
-            if(stream.Length < Marshal.SizeOf<Header>())
-                return false;
+        if(stream.Length < Marshal.SizeOf<Header>())
+            return false;
 
-            byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(hdrB, 0, hdrB.Length);
+        byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
 
-            _nhdhdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
+        _nhdhdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
 
-            if(!_nhdhdr.szFileID.SequenceEqual(_signature))
-                return false;
+        if(!_nhdhdr.szFileID.SequenceEqual(_signature))
+            return false;
 
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.szFileID = \"{0}\"",
-                                       StringHandlers.CToString(_nhdhdr.szFileID, shiftjis));
+        AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.szFileID = \"{0}\"",
+                                   StringHandlers.CToString(_nhdhdr.szFileID, shiftjis));
 
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.reserved1 = {0}", _nhdhdr.reserved1);
+        AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.reserved1 = {0}", _nhdhdr.reserved1);
 
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.szComment = \"{0}\"",
-                                       StringHandlers.CToString(_nhdhdr.szComment, shiftjis));
+        AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.szComment = \"{0}\"",
+                                   StringHandlers.CToString(_nhdhdr.szComment, shiftjis));
 
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.dwHeadSize = {0}", _nhdhdr.dwHeadSize);
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.dwCylinder = {0}", _nhdhdr.dwCylinder);
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wHead = {0}", _nhdhdr.wHead);
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wSect = {0}", _nhdhdr.wSect);
-            AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wSectLen = {0}", _nhdhdr.wSectLen);
+        AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.dwHeadSize = {0}", _nhdhdr.dwHeadSize);
+        AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.dwCylinder = {0}", _nhdhdr.dwCylinder);
+        AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wHead = {0}", _nhdhdr.wHead);
+        AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wSect = {0}", _nhdhdr.wSect);
+        AaruConsole.DebugWriteLine("NHDr0 plugin", "nhdhdr.wSectLen = {0}", _nhdhdr.wSectLen);
 
-            return true;
-        }
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/NHDr0.cs b/Aaru.Images/NHDr0/NHDr0.cs
index 155f0535c..48fd7510c 100644
--- a/Aaru.Images/NHDr0/NHDr0.cs
+++ b/Aaru.Images/NHDr0/NHDr0.cs
@@ -36,40 +36,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    // Info from http://www.geocities.jp/t98next/nhdr0.txt
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing T98-Next disk images</summary>
-    public sealed partial class Nhdr0 : IWritableImage
-    {
-        ImageInfo  _imageInfo;
-        Header     _nhdhdr;
-        IFilter    _nhdImageFilter;
-        FileStream _writingStream;
+namespace Aaru.DiscImages;
 
-        public Nhdr0() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// Info from http://www.geocities.jp/t98next/nhdr0.txt
+/// <inheritdoc />
+/// <summary>Implements reading and writing T98-Next disk images</summary>
+public sealed partial class Nhdr0 : IWritableImage
+{
+    ImageInfo  _imageInfo;
+    Header     _nhdhdr;
+    IFilter    _nhdImageFilter;
+    FileStream _writingStream;
+
+    public Nhdr0() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/Properties.cs b/Aaru.Images/NHDr0/Properties.cs
index 7fdfac78b..357f9016d 100644
--- a/Aaru.Images/NHDr0/Properties.cs
+++ b/Aaru.Images/NHDr0/Properties.cs
@@ -37,49 +37,48 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Nhdr0
-    {
-        /// <inheritdoc />
-        public string Name => "T98-Next NHD r0 Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("6ECACD0A-8F4D-4465-8815-AEA000D370E3");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "NHDr0 disk image";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.GENERIC_HDD, MediaType.Unknown
-        };
+namespace Aaru.DiscImages;
 
-        // TODO: Support dynamic images
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".nhd"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+public sealed partial class Nhdr0
+{
+    /// <inheritdoc />
+    public string Name => "T98-Next NHD r0 Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("6ECACD0A-8F4D-4465-8815-AEA000D370E3");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "NHDr0 disk image";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.GENERIC_HDD, MediaType.Unknown
+    };
+
+    // TODO: Support dynamic images
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
+            {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".nhd"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/Read.cs b/Aaru.Images/NHDr0/Read.cs
index 62a2e3af3..051186620 100644
--- a/Aaru.Images/NHDr0/Read.cs
+++ b/Aaru.Images/NHDr0/Read.cs
@@ -37,70 +37,69 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nhdr0
 {
-    public sealed partial class Nhdr0
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            var shiftjis = Encoding.GetEncoding("shift_jis");
+        // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+        var shiftjis = Encoding.GetEncoding("shift_jis");
 
-            if(stream.Length < Marshal.SizeOf<Header>())
-                return ErrorNumber.InvalidArgument;
+        if(stream.Length < Marshal.SizeOf<Header>())
+            return ErrorNumber.InvalidArgument;
 
-            byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(hdrB, 0, hdrB.Length);
+        byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
 
-            _nhdhdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
+        _nhdhdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
 
-            _imageInfo.MediaType = MediaType.GENERIC_HDD;
+        _imageInfo.MediaType = MediaType.GENERIC_HDD;
 
-            _imageInfo.ImageSize            = (ulong)(stream.Length - _nhdhdr.dwHeadSize);
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = (ulong)(_nhdhdr.dwCylinder * _nhdhdr.wHead * _nhdhdr.wSect);
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.SectorSize           = (uint)_nhdhdr.wSectLen;
-            _imageInfo.Cylinders            = (uint)_nhdhdr.dwCylinder;
-            _imageInfo.Heads                = (uint)_nhdhdr.wHead;
-            _imageInfo.SectorsPerTrack      = (uint)_nhdhdr.wSect;
-            _imageInfo.Comments             = StringHandlers.CToString(_nhdhdr.szComment, shiftjis);
+        _imageInfo.ImageSize            = (ulong)(stream.Length - _nhdhdr.dwHeadSize);
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = (ulong)(_nhdhdr.dwCylinder * _nhdhdr.wHead * _nhdhdr.wSect);
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.SectorSize           = (uint)_nhdhdr.wSectLen;
+        _imageInfo.Cylinders            = (uint)_nhdhdr.dwCylinder;
+        _imageInfo.Heads                = (uint)_nhdhdr.wHead;
+        _imageInfo.SectorsPerTrack      = (uint)_nhdhdr.wSect;
+        _imageInfo.Comments             = StringHandlers.CToString(_nhdhdr.szComment, shiftjis);
 
-            _nhdImageFilter = imageFilter;
+        _nhdImageFilter = imageFilter;
 
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
 
-            buffer = new byte[length * _imageInfo.SectorSize];
+        buffer = new byte[length * _imageInfo.SectorSize];
 
-            Stream stream = _nhdImageFilter.GetDataForkStream();
+        Stream stream = _nhdImageFilter.GetDataForkStream();
 
-            stream.Seek((long)((ulong)_nhdhdr.dwHeadSize + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+        stream.Seek((long)((ulong)_nhdhdr.dwHeadSize + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
 
-            stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
+        stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
 
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/Structs.cs b/Aaru.Images/NHDr0/Structs.cs
index e863453ec..db61fe078 100644
--- a/Aaru.Images/NHDr0/Structs.cs
+++ b/Aaru.Images/NHDr0/Structs.cs
@@ -32,27 +32,26 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nhdr0
 {
-    public sealed partial class Nhdr0
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
-            public byte[] szFileID;
-            public readonly byte reserved1;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x100)]
-            public byte[] szComment;
-            public int   dwHeadSize;
-            public int   dwCylinder;
-            public short wHead;
-            public short wSect;
-            public short wSectLen;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public byte[] reserved2;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0xE0)]
-            public byte[] reserved3;
-        }
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
+        public byte[] szFileID;
+        public readonly byte reserved1;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x100)]
+        public byte[] szComment;
+        public int   dwHeadSize;
+        public int   dwCylinder;
+        public short wHead;
+        public short wSect;
+        public short wSectLen;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public byte[] reserved2;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0xE0)]
+        public byte[] reserved3;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/Unsupported.cs b/Aaru.Images/NHDr0/Unsupported.cs
index 1c6de1a64..0b3b5fc14 100644
--- a/Aaru.Images/NHDr0/Unsupported.cs
+++ b/Aaru.Images/NHDr0/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nhdr0
 {
-    public sealed partial class Nhdr0
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/NHDr0/Write.cs b/Aaru.Images/NHDr0/Write.cs
index d28967e9d..018f511c2 100644
--- a/Aaru.Images/NHDr0/Write.cs
+++ b/Aaru.Images/NHDr0/Write.cs
@@ -41,275 +41,274 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nhdr0
 {
-    public sealed partial class Nhdr0
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 0)
         {
-            if(sectorSize != 0)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
-                                SeekOrigin.Begin);
-
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % 512 != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
-                                SeekOrigin.Begin);
-
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        _imageInfo = new ImageInfo
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+        IsWriting    = true;
+        ErrorMessage = null;
 
-                return false;
-            }
-
-            if(_imageInfo.Cylinders == 0)
-            {
-                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 8 / 17);
-                _imageInfo.Heads           = 8;
-                _imageInfo.SectorsPerTrack = 17;
-
-                while(_imageInfo.Cylinders == 0)
-                {
-                    _imageInfo.Heads--;
-
-                    if(_imageInfo.Heads == 0)
-                    {
-                        _imageInfo.SectorsPerTrack--;
-                        _imageInfo.Heads = 16;
-                    }
-
-                    _imageInfo.Cylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
-
-                    if(_imageInfo.Cylinders       == 0 &&
-                       _imageInfo.Heads           == 0 &&
-                       _imageInfo.SectorsPerTrack == 0)
-                        break;
-                }
-            }
-
-            var header = new Header
-            {
-                szFileID   = _signature,
-                szComment  = new byte[0x100],
-                dwHeadSize = Marshal.SizeOf<Header>(),
-                dwCylinder = (byte)_imageInfo.Cylinders,
-                wHead      = (byte)_imageInfo.Heads,
-                wSect      = (byte)_imageInfo.SectorsPerTrack,
-                wSectLen   = (byte)_imageInfo.SectorSize,
-                reserved2  = new byte[2],
-                reserved3  = new byte[0xE0]
-            };
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-            {
-                byte[] commentBytes = Encoding.GetEncoding("shift_jis").GetBytes(_imageInfo.Comments);
-
-                Array.Copy(commentBytes, 0, header.szComment, 0,
-                           commentBytes.Length >= 0x100 ? 0x100 : commentBytes.Length);
-            }
-
-            byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
-            IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(header, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-            IsWriting = false;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata)
-        {
-            _imageInfo.Comments = metadata.Comments;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
-        {
-            if(cylinders > int.MaxValue)
-            {
-                ErrorMessage = "Too many cylinders.";
-
-                return false;
-            }
-
-            if(heads > short.MaxValue)
-            {
-                ErrorMessage = "Too many heads.";
-
-                return false;
-            }
-
-            if(sectorsPerTrack > short.MaxValue)
-            {
-                ErrorMessage = "Too many sectors per track.";
-
-                return false;
-            }
-
-            _imageInfo.SectorsPerTrack = sectorsPerTrack;
-            _imageInfo.Heads           = heads;
-            _imageInfo.Cylinders       = cylinders;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
+                            SeekOrigin.Begin);
+
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % 512 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
+                            SeekOrigin.Begin);
+
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        if(_imageInfo.Cylinders == 0)
+        {
+            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 8 / 17);
+            _imageInfo.Heads           = 8;
+            _imageInfo.SectorsPerTrack = 17;
+
+            while(_imageInfo.Cylinders == 0)
+            {
+                _imageInfo.Heads--;
+
+                if(_imageInfo.Heads == 0)
+                {
+                    _imageInfo.SectorsPerTrack--;
+                    _imageInfo.Heads = 16;
+                }
+
+                _imageInfo.Cylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
+
+                if(_imageInfo.Cylinders       == 0 &&
+                   _imageInfo.Heads           == 0 &&
+                   _imageInfo.SectorsPerTrack == 0)
+                    break;
+            }
+        }
+
+        var header = new Header
+        {
+            szFileID   = _signature,
+            szComment  = new byte[0x100],
+            dwHeadSize = Marshal.SizeOf<Header>(),
+            dwCylinder = (byte)_imageInfo.Cylinders,
+            wHead      = (byte)_imageInfo.Heads,
+            wSect      = (byte)_imageInfo.SectorsPerTrack,
+            wSectLen   = (byte)_imageInfo.SectorSize,
+            reserved2  = new byte[2],
+            reserved3  = new byte[0xE0]
+        };
+
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+        {
+            byte[] commentBytes = Encoding.GetEncoding("shift_jis").GetBytes(_imageInfo.Comments);
+
+            Array.Copy(commentBytes, 0, header.szComment, 0,
+                       commentBytes.Length >= 0x100 ? 0x100 : commentBytes.Length);
+        }
+
+        byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
+        IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(header, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+        IsWriting = false;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata)
+    {
+        _imageInfo.Comments = metadata.Comments;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        if(cylinders > int.MaxValue)
+        {
+            ErrorMessage = "Too many cylinders.";
+
+            return false;
+        }
+
+        if(heads > short.MaxValue)
+        {
+            ErrorMessage = "Too many heads.";
+
+            return false;
+        }
+
+        if(sectorsPerTrack > short.MaxValue)
+        {
+            ErrorMessage = "Too many sectors per track.";
+
+            return false;
+        }
+
+        _imageInfo.SectorsPerTrack = sectorsPerTrack;
+        _imageInfo.Heads           = heads;
+        _imageInfo.Cylinders       = cylinders;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/Nero/Constants.cs b/Aaru.Images/Nero/Constants.cs
index fae5693d4..504ff1d30 100644
--- a/Aaru.Images/Nero/Constants.cs
+++ b/Aaru.Images/Nero/Constants.cs
@@ -30,25 +30,24 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nero
 {
-    public sealed partial class Nero
-    {
-        const uint NERO_FOOTER_V1  = 0x4E45524F; // "NERO"
-        const uint NERO_FOOTER_V2  = 0x4E455235; // "NER5"
-        const uint NERO_CUE_V1     = 0x43554553; // "CUES"
-        const uint NERO_CUE_V2     = 0x43554558; // "CUEX"
-        const uint NERO_TAO_V0     = 0x54494E46; // "TINF"
-        const uint NERO_TAO_V1     = 0x45544E46; // "ETNF"
-        const uint NERO_TAO_V2     = 0x45544E32; // "ETN2"
-        const uint NERO_DAO_V1     = 0x44414F49; // "DAOI"
-        const uint NERO_DAO_V2     = 0x44414F58; // "DAOX"
-        const uint NERO_CDTEXT     = 0x43445458; // "CDTX"
-        const uint NERO_SESSION    = 0x53494E46; // "SINF"
-        const uint NERO_DISC_TYPE  = 0x4D545950; // "MTYP"
-        const uint NERO_DISC_INFO  = 0x44494E46; // "DINF"
-        const uint NERO_TOC        = 0x544F4354; // "TOCT"
-        const uint NERO_RELOCATION = 0x52454C4F; // "RELO"
-        const uint NERO_END        = 0x454E4421; // "END!"
-    }
+    const uint NERO_FOOTER_V1  = 0x4E45524F; // "NERO"
+    const uint NERO_FOOTER_V2  = 0x4E455235; // "NER5"
+    const uint NERO_CUE_V1     = 0x43554553; // "CUES"
+    const uint NERO_CUE_V2     = 0x43554558; // "CUEX"
+    const uint NERO_TAO_V0     = 0x54494E46; // "TINF"
+    const uint NERO_TAO_V1     = 0x45544E46; // "ETNF"
+    const uint NERO_TAO_V2     = 0x45544E32; // "ETN2"
+    const uint NERO_DAO_V1     = 0x44414F49; // "DAOI"
+    const uint NERO_DAO_V2     = 0x44414F58; // "DAOX"
+    const uint NERO_CDTEXT     = 0x43445458; // "CDTX"
+    const uint NERO_SESSION    = 0x53494E46; // "SINF"
+    const uint NERO_DISC_TYPE  = 0x4D545950; // "MTYP"
+    const uint NERO_DISC_INFO  = 0x44494E46; // "DINF"
+    const uint NERO_TOC        = 0x544F4354; // "TOCT"
+    const uint NERO_RELOCATION = 0x52454C4F; // "RELO"
+    const uint NERO_END        = 0x454E4421; // "END!"
 }
\ No newline at end of file
diff --git a/Aaru.Images/Nero/Enums.cs b/Aaru.Images/Nero/Enums.cs
index 42059407b..f47ba0982 100644
--- a/Aaru.Images/Nero/Enums.cs
+++ b/Aaru.Images/Nero/Enums.cs
@@ -33,104 +33,103 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
-{
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Nero
-    {
-        enum DaoMode : ushort
-        {
-            Data         = 0x0000, DataM2F1   = 0x0002, DataM2F2 = 0x0003,
-            DataRaw      = 0x0005, DataM2Raw  = 0x0006, Audio    = 0x0007,
-            AudioAlt     = 0x0008, DataRawSub = 0x000F, AudioSub = 0x0010,
-            DataM2RawSub = 0x0011
-        }
+namespace Aaru.DiscImages;
 
-        [Flags, SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum NeroMediaTypes : uint
-        {
-            /// <summary>No media</summary>
-            NeroMtypNone = 0x00000,
-            /// <summary>CD-R/RW</summary>
-            NeroMtypCd = 0x00001,
-            /// <summary>DDCD-R/RW</summary>
-            NeroMtypDdcd = 0x00002,
-            /// <summary>DVD-R/RW</summary>
-            NeroMtypDvdM = 0x00004,
-            /// <summary>DVD+RW</summary>
-            NeroMtypDvdP = 0x00008,
-            /// <summary>DVD-RAM</summary>
-            NeroMtypDvdRam = 0x00010,
-            /// <summary>Multi-level disc</summary>
-            NeroMtypMl = 0x00020,
-            /// <summary>Mount Rainier</summary>
-            NeroMtypMrw = 0x00040,
-            /// <summary>Exclude CD-R</summary>
-            NeroMtypNoCdr = 0x00080,
-            /// <summary>Exclude CD-RW</summary>
-            NeroMtypNoCdrw = 0x00100,
-            /// <summary>CD-RW</summary>
-            NeroMtypCdrw = NeroMtypCd | NeroMtypNoCdr,
-            /// <summary>CD-R</summary>
-            NeroMtypCdr = NeroMtypCd | NeroMtypNoCdrw,
-            /// <summary>DVD-ROM</summary>
-            NeroMtypDvdRom = 0x00200,
-            /// <summary>CD-ROM</summary>
-            NeroMtypCdrom = 0x00400,
-            /// <summary>Exclude DVD-RW</summary>
-            NeroMtypNoDvdMRw = 0x00800,
-            /// <summary>Exclude DVD-R</summary>
-            NeroMtypNoDvdMR = 0x01000,
-            /// <summary>Exclude DVD+RW</summary>
-            NeroMtypNoDvdPRw = 0x02000,
-            /// <summary>Exclude DVD+R</summary>
-            NeroMtypNoDvdPR = 0x04000,
-            /// <summary>DVD-R</summary>
-            NeroMtypDvdMR = NeroMtypDvdM | NeroMtypNoDvdMRw,
-            /// <summary>DVD-RW</summary>
-            NeroMtypDvdMRw = NeroMtypDvdM | NeroMtypNoDvdMR,
-            /// <summary>DVD+R</summary>
-            NeroMtypDvdPR = NeroMtypDvdP | NeroMtypNoDvdPRw,
-            /// <summary>DVD+RW</summary>
-            NeroMtypDvdPRw = NeroMtypDvdP | NeroMtypNoDvdPR,
-            /// <summary>Packet-writing (fixed)</summary>
-            NeroMtypFpacket = 0x08000,
-            /// <summary>Packet-writing (variable)</summary>
-            NeroMtypVpacket = 0x10000,
-            /// <summary>Packet-writing (any)</summary>
-            NeroMtypPacketw = NeroMtypMrw | NeroMtypFpacket | NeroMtypVpacket,
-            /// <summary>HD-Burn</summary>
-            NeroMtypHdb = 0x20000,
-            /// <summary>DVD+R DL</summary>
-            NeroMtypDvdPR9 = 0x40000,
-            /// <summary>DVD-R DL</summary>
-            NeroMtypDvdMR9 = 0x80000,
-            /// <summary>Any DVD double-layer</summary>
-            NeroMtypDvdAnyR9 = NeroMtypDvdPR9 | NeroMtypDvdMR9,
-            /// <summary>Any DVD</summary>
-            NeroMtypDvdAny = NeroMtypDvdM | NeroMtypDvdP | NeroMtypDvdRam | NeroMtypDvdAnyR9,
-            /// <summary>BD-ROM</summary>
-            NeroMtypBdRom = 0x100000,
-            /// <summary>BD-R</summary>
-            NeroMtypBdR = 0x200000,
-            /// <summary>BD-RE</summary>
-            NeroMtypBdRe = 0x400000,
-            /// <summary>BD-R/RE</summary>
-            NeroMtypBd = NeroMtypBdR | NeroMtypBdRe,
-            /// <summary>Any BD</summary>
-            NeroMtypBdAny = NeroMtypBd | NeroMtypBdRom,
-            /// <summary>HD DVD-ROM</summary>
-            NeroMtypHdDvdRom = 0x0800000,
-            /// <summary>HD DVD-R</summary>
-            NeroMtypHdDvdR = 0x1000000,
-            /// <summary>HD DVD-RW</summary>
-            NeroMtypHdDvdRw = 0x2000000,
-            /// <summary>HD DVD-R/RW</summary>
-            NeroMtypHdDvd = NeroMtypHdDvdR | NeroMtypHdDvdRw,
-            /// <summary>Any HD DVD</summary>
-            NeroMtypHdDvdAny = NeroMtypHdDvd | NeroMtypHdDvdRom,
-            /// <summary>Any DVD, old</summary>
-            NeroMtypDvdAnyOld = NeroMtypDvdM | NeroMtypDvdP | NeroMtypDvdRam
-        }
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Nero
+{
+    enum DaoMode : ushort
+    {
+        Data         = 0x0000, DataM2F1   = 0x0002, DataM2F2 = 0x0003,
+        DataRaw      = 0x0005, DataM2Raw  = 0x0006, Audio    = 0x0007,
+        AudioAlt     = 0x0008, DataRawSub = 0x000F, AudioSub = 0x0010,
+        DataM2RawSub = 0x0011
+    }
+
+    [Flags, SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum NeroMediaTypes : uint
+    {
+        /// <summary>No media</summary>
+        NeroMtypNone = 0x00000,
+        /// <summary>CD-R/RW</summary>
+        NeroMtypCd = 0x00001,
+        /// <summary>DDCD-R/RW</summary>
+        NeroMtypDdcd = 0x00002,
+        /// <summary>DVD-R/RW</summary>
+        NeroMtypDvdM = 0x00004,
+        /// <summary>DVD+RW</summary>
+        NeroMtypDvdP = 0x00008,
+        /// <summary>DVD-RAM</summary>
+        NeroMtypDvdRam = 0x00010,
+        /// <summary>Multi-level disc</summary>
+        NeroMtypMl = 0x00020,
+        /// <summary>Mount Rainier</summary>
+        NeroMtypMrw = 0x00040,
+        /// <summary>Exclude CD-R</summary>
+        NeroMtypNoCdr = 0x00080,
+        /// <summary>Exclude CD-RW</summary>
+        NeroMtypNoCdrw = 0x00100,
+        /// <summary>CD-RW</summary>
+        NeroMtypCdrw = NeroMtypCd | NeroMtypNoCdr,
+        /// <summary>CD-R</summary>
+        NeroMtypCdr = NeroMtypCd | NeroMtypNoCdrw,
+        /// <summary>DVD-ROM</summary>
+        NeroMtypDvdRom = 0x00200,
+        /// <summary>CD-ROM</summary>
+        NeroMtypCdrom = 0x00400,
+        /// <summary>Exclude DVD-RW</summary>
+        NeroMtypNoDvdMRw = 0x00800,
+        /// <summary>Exclude DVD-R</summary>
+        NeroMtypNoDvdMR = 0x01000,
+        /// <summary>Exclude DVD+RW</summary>
+        NeroMtypNoDvdPRw = 0x02000,
+        /// <summary>Exclude DVD+R</summary>
+        NeroMtypNoDvdPR = 0x04000,
+        /// <summary>DVD-R</summary>
+        NeroMtypDvdMR = NeroMtypDvdM | NeroMtypNoDvdMRw,
+        /// <summary>DVD-RW</summary>
+        NeroMtypDvdMRw = NeroMtypDvdM | NeroMtypNoDvdMR,
+        /// <summary>DVD+R</summary>
+        NeroMtypDvdPR = NeroMtypDvdP | NeroMtypNoDvdPRw,
+        /// <summary>DVD+RW</summary>
+        NeroMtypDvdPRw = NeroMtypDvdP | NeroMtypNoDvdPR,
+        /// <summary>Packet-writing (fixed)</summary>
+        NeroMtypFpacket = 0x08000,
+        /// <summary>Packet-writing (variable)</summary>
+        NeroMtypVpacket = 0x10000,
+        /// <summary>Packet-writing (any)</summary>
+        NeroMtypPacketw = NeroMtypMrw | NeroMtypFpacket | NeroMtypVpacket,
+        /// <summary>HD-Burn</summary>
+        NeroMtypHdb = 0x20000,
+        /// <summary>DVD+R DL</summary>
+        NeroMtypDvdPR9 = 0x40000,
+        /// <summary>DVD-R DL</summary>
+        NeroMtypDvdMR9 = 0x80000,
+        /// <summary>Any DVD double-layer</summary>
+        NeroMtypDvdAnyR9 = NeroMtypDvdPR9 | NeroMtypDvdMR9,
+        /// <summary>Any DVD</summary>
+        NeroMtypDvdAny = NeroMtypDvdM | NeroMtypDvdP | NeroMtypDvdRam | NeroMtypDvdAnyR9,
+        /// <summary>BD-ROM</summary>
+        NeroMtypBdRom = 0x100000,
+        /// <summary>BD-R</summary>
+        NeroMtypBdR = 0x200000,
+        /// <summary>BD-RE</summary>
+        NeroMtypBdRe = 0x400000,
+        /// <summary>BD-R/RE</summary>
+        NeroMtypBd = NeroMtypBdR | NeroMtypBdRe,
+        /// <summary>Any BD</summary>
+        NeroMtypBdAny = NeroMtypBd | NeroMtypBdRom,
+        /// <summary>HD DVD-ROM</summary>
+        NeroMtypHdDvdRom = 0x0800000,
+        /// <summary>HD DVD-R</summary>
+        NeroMtypHdDvdR = 0x1000000,
+        /// <summary>HD DVD-RW</summary>
+        NeroMtypHdDvdRw = 0x2000000,
+        /// <summary>HD DVD-R/RW</summary>
+        NeroMtypHdDvd = NeroMtypHdDvdR | NeroMtypHdDvdRw,
+        /// <summary>Any HD DVD</summary>
+        NeroMtypHdDvdAny = NeroMtypHdDvd | NeroMtypHdDvdRom,
+        /// <summary>Any DVD, old</summary>
+        NeroMtypDvdAnyOld = NeroMtypDvdM | NeroMtypDvdP | NeroMtypDvdRam
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Nero/Helpers.cs b/Aaru.Images/Nero/Helpers.cs
index b0697bf3a..bc36c02b5 100644
--- a/Aaru.Images/Nero/Helpers.cs
+++ b/Aaru.Images/Nero/Helpers.cs
@@ -32,81 +32,80 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nero
 {
-    public sealed partial class Nero
+    static CommonTypes.MediaType NeroMediaTypeToMediaType(NeroMediaTypes type)
     {
-        static CommonTypes.MediaType NeroMediaTypeToMediaType(NeroMediaTypes type)
+        switch(type)
         {
-            switch(type)
-            {
-                case NeroMediaTypes.NeroMtypDdcd: return CommonTypes.MediaType.DDCD;
-                case NeroMediaTypes.NeroMtypDvdM:
-                case NeroMediaTypes.NeroMtypDvdMR: return CommonTypes.MediaType.DVDR;
-                case NeroMediaTypes.NeroMtypDvdP:
-                case NeroMediaTypes.NeroMtypDvdPR: return CommonTypes.MediaType.DVDPR;
-                case NeroMediaTypes.NeroMtypDvdRam: return CommonTypes.MediaType.DVDRAM;
-                case NeroMediaTypes.NeroMtypMl:
-                case NeroMediaTypes.NeroMtypMrw:
-                case NeroMediaTypes.NeroMtypCdrw: return CommonTypes.MediaType.CDRW;
-                case NeroMediaTypes.NeroMtypCdr: return CommonTypes.MediaType.CDR;
-                case NeroMediaTypes.NeroMtypDvdRom:
-                case NeroMediaTypes.NeroMtypDvdAny:
-                case NeroMediaTypes.NeroMtypDvdAnyR9:
-                case NeroMediaTypes.NeroMtypDvdAnyOld: return CommonTypes.MediaType.DVDROM;
-                case NeroMediaTypes.NeroMtypCdrom:  return CommonTypes.MediaType.CDROM;
-                case NeroMediaTypes.NeroMtypDvdMRw: return CommonTypes.MediaType.DVDRW;
-                case NeroMediaTypes.NeroMtypDvdPRw: return CommonTypes.MediaType.DVDPRW;
-                case NeroMediaTypes.NeroMtypDvdPR9: return CommonTypes.MediaType.DVDPRDL;
-                case NeroMediaTypes.NeroMtypDvdMR9: return CommonTypes.MediaType.DVDRDL;
-                case NeroMediaTypes.NeroMtypBd:
-                case NeroMediaTypes.NeroMtypBdAny:
-                case NeroMediaTypes.NeroMtypBdRom: return CommonTypes.MediaType.BDROM;
-                case NeroMediaTypes.NeroMtypBdR:  return CommonTypes.MediaType.BDR;
-                case NeroMediaTypes.NeroMtypBdRe: return CommonTypes.MediaType.BDRE;
-                case NeroMediaTypes.NeroMtypHdDvd:
-                case NeroMediaTypes.NeroMtypHdDvdAny:
-                case NeroMediaTypes.NeroMtypHdDvdRom: return CommonTypes.MediaType.HDDVDROM;
-                case NeroMediaTypes.NeroMtypHdDvdR:  return CommonTypes.MediaType.HDDVDR;
-                case NeroMediaTypes.NeroMtypHdDvdRw: return CommonTypes.MediaType.HDDVDRW;
-                default:                             return CommonTypes.MediaType.CD;
-            }
+            case NeroMediaTypes.NeroMtypDdcd: return CommonTypes.MediaType.DDCD;
+            case NeroMediaTypes.NeroMtypDvdM:
+            case NeroMediaTypes.NeroMtypDvdMR: return CommonTypes.MediaType.DVDR;
+            case NeroMediaTypes.NeroMtypDvdP:
+            case NeroMediaTypes.NeroMtypDvdPR: return CommonTypes.MediaType.DVDPR;
+            case NeroMediaTypes.NeroMtypDvdRam: return CommonTypes.MediaType.DVDRAM;
+            case NeroMediaTypes.NeroMtypMl:
+            case NeroMediaTypes.NeroMtypMrw:
+            case NeroMediaTypes.NeroMtypCdrw: return CommonTypes.MediaType.CDRW;
+            case NeroMediaTypes.NeroMtypCdr: return CommonTypes.MediaType.CDR;
+            case NeroMediaTypes.NeroMtypDvdRom:
+            case NeroMediaTypes.NeroMtypDvdAny:
+            case NeroMediaTypes.NeroMtypDvdAnyR9:
+            case NeroMediaTypes.NeroMtypDvdAnyOld: return CommonTypes.MediaType.DVDROM;
+            case NeroMediaTypes.NeroMtypCdrom:  return CommonTypes.MediaType.CDROM;
+            case NeroMediaTypes.NeroMtypDvdMRw: return CommonTypes.MediaType.DVDRW;
+            case NeroMediaTypes.NeroMtypDvdPRw: return CommonTypes.MediaType.DVDPRW;
+            case NeroMediaTypes.NeroMtypDvdPR9: return CommonTypes.MediaType.DVDPRDL;
+            case NeroMediaTypes.NeroMtypDvdMR9: return CommonTypes.MediaType.DVDRDL;
+            case NeroMediaTypes.NeroMtypBd:
+            case NeroMediaTypes.NeroMtypBdAny:
+            case NeroMediaTypes.NeroMtypBdRom: return CommonTypes.MediaType.BDROM;
+            case NeroMediaTypes.NeroMtypBdR:  return CommonTypes.MediaType.BDR;
+            case NeroMediaTypes.NeroMtypBdRe: return CommonTypes.MediaType.BDRE;
+            case NeroMediaTypes.NeroMtypHdDvd:
+            case NeroMediaTypes.NeroMtypHdDvdAny:
+            case NeroMediaTypes.NeroMtypHdDvdRom: return CommonTypes.MediaType.HDDVDROM;
+            case NeroMediaTypes.NeroMtypHdDvdR:  return CommonTypes.MediaType.HDDVDR;
+            case NeroMediaTypes.NeroMtypHdDvdRw: return CommonTypes.MediaType.HDDVDRW;
+            default:                             return CommonTypes.MediaType.CD;
         }
+    }
 
-        static TrackType NeroTrackModeToTrackType(DaoMode mode)
+    static TrackType NeroTrackModeToTrackType(DaoMode mode)
+    {
+        switch(mode)
         {
-            switch(mode)
-            {
-                case DaoMode.Data:
-                case DaoMode.DataRaw:
-                case DaoMode.DataRawSub: return TrackType.CdMode1;
-                case DaoMode.DataM2F1: return TrackType.CdMode2Form1;
-                case DaoMode.DataM2F2: return TrackType.CdMode2Form2;
-                case DaoMode.DataM2RawSub:
-                case DaoMode.DataM2Raw: return TrackType.CdMode2Formless;
-                case DaoMode.Audio:
-                case DaoMode.AudioAlt:
-                case DaoMode.AudioSub: return TrackType.Audio;
-                default: return TrackType.Data;
-            }
+            case DaoMode.Data:
+            case DaoMode.DataRaw:
+            case DaoMode.DataRawSub: return TrackType.CdMode1;
+            case DaoMode.DataM2F1: return TrackType.CdMode2Form1;
+            case DaoMode.DataM2F2: return TrackType.CdMode2Form2;
+            case DaoMode.DataM2RawSub:
+            case DaoMode.DataM2Raw: return TrackType.CdMode2Formless;
+            case DaoMode.Audio:
+            case DaoMode.AudioAlt:
+            case DaoMode.AudioSub: return TrackType.Audio;
+            default: return TrackType.Data;
         }
+    }
 
-        static ushort NeroTrackModeToBytesPerSector(DaoMode mode)
+    static ushort NeroTrackModeToBytesPerSector(DaoMode mode)
+    {
+        switch(mode)
         {
-            switch(mode)
-            {
-                case DaoMode.Data:
-                case DaoMode.DataM2F1: return 2048;
-                case DaoMode.DataM2F2: return 2336;
-                case DaoMode.DataRaw:
-                case DaoMode.DataM2Raw:
-                case DaoMode.AudioAlt:
-                case DaoMode.Audio: return 2352;
-                case DaoMode.DataM2RawSub:
-                case DaoMode.DataRawSub:
-                case DaoMode.AudioSub: return 2448;
-                default: return 2352;
-            }
+            case DaoMode.Data:
+            case DaoMode.DataM2F1: return 2048;
+            case DaoMode.DataM2F2: return 2336;
+            case DaoMode.DataRaw:
+            case DaoMode.DataM2Raw:
+            case DaoMode.AudioAlt:
+            case DaoMode.Audio: return 2352;
+            case DaoMode.DataM2RawSub:
+            case DaoMode.DataRawSub:
+            case DaoMode.AudioSub: return 2448;
+            default: return 2352;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Nero/Identify.cs b/Aaru.Images/Nero/Identify.cs
index eee5a4f39..af194f593 100644
--- a/Aaru.Images/Nero/Identify.cs
+++ b/Aaru.Images/Nero/Identify.cs
@@ -35,40 +35,39 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nero
 {
-    public sealed partial class Nero
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            _imageStream = imageFilter.GetDataForkStream();
-            var footerV1 = new FooterV1();
-            var footerV2 = new FooterV2();
+        _imageStream = imageFilter.GetDataForkStream();
+        var footerV1 = new FooterV1();
+        var footerV2 = new FooterV2();
 
-            _imageStream.Seek(-8, SeekOrigin.End);
-            byte[] buffer = new byte[8];
-            _imageStream.Read(buffer, 0, 8);
-            footerV1.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
-            footerV1.FirstChunkOffset = BigEndianBitConverter.ToUInt32(buffer, 4);
+        _imageStream.Seek(-8, SeekOrigin.End);
+        byte[] buffer = new byte[8];
+        _imageStream.Read(buffer, 0, 8);
+        footerV1.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
+        footerV1.FirstChunkOffset = BigEndianBitConverter.ToUInt32(buffer, 4);
 
-            _imageStream.Seek(-12, SeekOrigin.End);
-            buffer = new byte[12];
-            _imageStream.Read(buffer, 0, 12);
-            footerV2.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
-            footerV2.FirstChunkOffset = BigEndianBitConverter.ToUInt64(buffer, 4);
+        _imageStream.Seek(-12, SeekOrigin.End);
+        buffer = new byte[12];
+        _imageStream.Read(buffer, 0, 12);
+        footerV2.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
+        footerV2.FirstChunkOffset = BigEndianBitConverter.ToUInt64(buffer, 4);
 
-            AaruConsole.DebugWriteLine("Nero plugin", "imageStream.Length = {0}", _imageStream.Length);
-            AaruConsole.DebugWriteLine("Nero plugin", "footerV1.ChunkID = 0x{0:X8}", footerV1.ChunkId);
-            AaruConsole.DebugWriteLine("Nero plugin", "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
-            AaruConsole.DebugWriteLine("Nero plugin", "footerV2.ChunkID = 0x{0:X8}", footerV2.ChunkId);
-            AaruConsole.DebugWriteLine("Nero plugin", "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
+        AaruConsole.DebugWriteLine("Nero plugin", "imageStream.Length = {0}", _imageStream.Length);
+        AaruConsole.DebugWriteLine("Nero plugin", "footerV1.ChunkID = 0x{0:X8}", footerV1.ChunkId);
+        AaruConsole.DebugWriteLine("Nero plugin", "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
+        AaruConsole.DebugWriteLine("Nero plugin", "footerV2.ChunkID = 0x{0:X8}", footerV2.ChunkId);
+        AaruConsole.DebugWriteLine("Nero plugin", "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
 
-            if(footerV2.ChunkId          == NERO_FOOTER_V2 &&
-               footerV2.FirstChunkOffset < (ulong)_imageStream.Length)
-                return true;
+        if(footerV2.ChunkId          == NERO_FOOTER_V2 &&
+           footerV2.FirstChunkOffset < (ulong)_imageStream.Length)
+            return true;
 
-            return footerV1.ChunkId == NERO_FOOTER_V1 && footerV1.FirstChunkOffset < (ulong)_imageStream.Length;
-        }
+        return footerV1.ChunkId == NERO_FOOTER_V1 && footerV1.FirstChunkOffset < (ulong)_imageStream.Length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Nero/Nero.cs b/Aaru.Images/Nero/Nero.cs
index 42babc3ae..b793840bd 100644
--- a/Aaru.Images/Nero/Nero.cs
+++ b/Aaru.Images/Nero/Nero.cs
@@ -42,54 +42,53 @@ using Aaru.Decoders.CD;
 #pragma warning disable 414
 #pragma warning disable 169
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+/// <inheritdoc />
+/// <summary>Implements reading Nero Burning ROM disc images</summary>
+[SuppressMessage("ReSharper", "NotAccessedField.Local"),
+ SuppressMessage("ReSharper", "CollectionNeverQueried.Local")]
+public sealed partial class Nero : IOpticalMediaImage
 {
-    /// <inheritdoc />
-    /// <summary>Implements reading Nero Burning ROM disc images</summary>
-    [SuppressMessage("ReSharper", "NotAccessedField.Local"),
-     SuppressMessage("ReSharper", "CollectionNeverQueried.Local")]
-    public sealed partial class Nero : IOpticalMediaImage
+    bool                                 _imageNewFormat;
+    Stream                               _imageStream;
+    ImageInfo                            _imageInfo;
+    CdText                               _cdtxt;
+    CuesheetV1                           _cuesheetV1;
+    CuesheetV2                           _cuesheetV2;
+    DaoV1                                _neroDaov1;
+    DaoV2                                _neroDaov2;
+    DiscInformation                      _discInfo;
+    IFilter                              _neroFilter;
+    MediaType                            _mediaType;
+    ReloChunk                            _relo;
+    readonly Dictionary<ushort, uint>    _neroSessions;
+    TaoV0                                _taoV0;
+    TaoV1                                _taoV1;
+    TaoV2                                _taoV2;
+    TocChunk                             _toc;
+    readonly Dictionary<uint, NeroTrack> _neroTracks;
+    readonly Dictionary<uint, ulong>     _offsetmap;
+    Dictionary<uint, byte[]>             _trackIsrCs;
+    byte[]                               _upc;
+    SectorBuilder                        _sectorBuilder;
+    Dictionary<uint, byte>               _trackFlags;
+    bool                                 _isCd;
+
+    public Nero()
     {
-        bool                                 _imageNewFormat;
-        Stream                               _imageStream;
-        ImageInfo                            _imageInfo;
-        CdText                               _cdtxt;
-        CuesheetV1                           _cuesheetV1;
-        CuesheetV2                           _cuesheetV2;
-        DaoV1                                _neroDaov1;
-        DaoV2                                _neroDaov2;
-        DiscInformation                      _discInfo;
-        IFilter                              _neroFilter;
-        MediaType                            _mediaType;
-        ReloChunk                            _relo;
-        readonly Dictionary<ushort, uint>    _neroSessions;
-        TaoV0                                _taoV0;
-        TaoV1                                _taoV1;
-        TaoV2                                _taoV2;
-        TocChunk                             _toc;
-        readonly Dictionary<uint, NeroTrack> _neroTracks;
-        readonly Dictionary<uint, ulong>     _offsetmap;
-        Dictionary<uint, byte[]>             _trackIsrCs;
-        byte[]                               _upc;
-        SectorBuilder                        _sectorBuilder;
-        Dictionary<uint, byte>               _trackFlags;
-        bool                                 _isCd;
+        _imageNewFormat = false;
 
-        public Nero()
+        _imageInfo = new ImageInfo
         {
-            _imageNewFormat = false;
+            ReadableSectorTags = new List<SectorTagType>(),
+            ReadableMediaTags  = new List<MediaTagType>()
+        };
 
-            _imageInfo = new ImageInfo
-            {
-                ReadableSectorTags = new List<SectorTagType>(),
-                ReadableMediaTags  = new List<MediaTagType>()
-            };
-
-            _neroSessions = new Dictionary<ushort, uint>();
-            _neroTracks   = new Dictionary<uint, NeroTrack>();
-            _offsetmap    = new Dictionary<uint, ulong>();
-            Sessions      = new List<CommonTypes.Structs.Session>();
-            Partitions    = new List<Partition>();
-        }
+        _neroSessions = new Dictionary<ushort, uint>();
+        _neroTracks   = new Dictionary<uint, NeroTrack>();
+        _offsetmap    = new Dictionary<uint, ulong>();
+        Sessions      = new List<CommonTypes.Structs.Session>();
+        Partitions    = new List<Partition>();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Nero/Properties.cs b/Aaru.Images/Nero/Properties.cs
index 24e44c2a5..3e17995a6 100644
--- a/Aaru.Images/Nero/Properties.cs
+++ b/Aaru.Images/Nero/Properties.cs
@@ -36,29 +36,28 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nero
 {
-    public sealed partial class Nero
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "Nero Burning ROM image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("D160F9FF-5941-43FC-B037-AD81DD141F05");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Nero Burning ROM";
-        /// <inheritdoc />
-        public List<Partition> Partitions { get; }
-        /// <inheritdoc />
-        public List<Track> Tracks { get; private set; }
-        /// <inheritdoc />
-        public List<CommonTypes.Structs.Session> Sessions { get; }
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "Nero Burning ROM image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("D160F9FF-5941-43FC-B037-AD81DD141F05");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Nero Burning ROM";
+    /// <inheritdoc />
+    public List<Partition> Partitions { get; }
+    /// <inheritdoc />
+    public List<Track> Tracks { get; private set; }
+    /// <inheritdoc />
+    public List<CommonTypes.Structs.Session> Sessions { get; }
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/Nero/Read.cs b/Aaru.Images/Nero/Read.cs
index 993cc3064..01861179d 100644
--- a/Aaru.Images/Nero/Read.cs
+++ b/Aaru.Images/Nero/Read.cs
@@ -43,2226 +43,2225 @@ using Aaru.Console;
 using Aaru.Decoders.CD;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nero
 {
-    public sealed partial class Nero
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        try
         {
-            try
+            // Look for the footer
+            _imageStream = imageFilter.GetDataForkStream();
+            var footerV1 = new FooterV1();
+            var footerV2 = new FooterV2();
+
+            _imageStream.Seek(-8, SeekOrigin.End);
+            byte[] buffer = new byte[8];
+            _imageStream.Read(buffer, 0, 8);
+            footerV1.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
+            footerV1.FirstChunkOffset = BigEndianBitConverter.ToUInt32(buffer, 4);
+
+            _imageStream.Seek(-12, SeekOrigin.End);
+            buffer = new byte[12];
+            _imageStream.Read(buffer, 0, 12);
+            footerV2.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
+            footerV2.FirstChunkOffset = BigEndianBitConverter.ToUInt64(buffer, 4);
+
+            AaruConsole.DebugWriteLine("Nero plugin", "imageStream.Length = {0}", _imageStream.Length);
+
+            AaruConsole.DebugWriteLine("Nero plugin", "footerV1.ChunkID = 0x{0:X8} (\"{1}\")", footerV1.ChunkId,
+                                       Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(footerV1.ChunkId)));
+
+            AaruConsole.DebugWriteLine("Nero plugin", "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
+
+            AaruConsole.DebugWriteLine("Nero plugin", "footerV2.ChunkID = 0x{0:X8} (\"{1}\")", footerV2.ChunkId,
+                                       Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(footerV2.ChunkId)));
+
+            AaruConsole.DebugWriteLine("Nero plugin", "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
+
+            // Check footer version
+            if(footerV1.ChunkId          == NERO_FOOTER_V1 &&
+               footerV1.FirstChunkOffset < (ulong)_imageStream.Length)
+                _imageNewFormat = false;
+            else if(footerV2.ChunkId          == NERO_FOOTER_V2 &&
+                    footerV2.FirstChunkOffset < (ulong)_imageStream.Length)
+                _imageNewFormat = true;
+            else
             {
-                // Look for the footer
-                _imageStream = imageFilter.GetDataForkStream();
-                var footerV1 = new FooterV1();
-                var footerV2 = new FooterV2();
+                AaruConsole.DebugWrite("Nero plugin", "Nero version not recognized.");
 
-                _imageStream.Seek(-8, SeekOrigin.End);
-                byte[] buffer = new byte[8];
-                _imageStream.Read(buffer, 0, 8);
-                footerV1.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
-                footerV1.FirstChunkOffset = BigEndianBitConverter.ToUInt32(buffer, 4);
+                return ErrorNumber.NotSupported;
+            }
 
-                _imageStream.Seek(-12, SeekOrigin.End);
-                buffer = new byte[12];
-                _imageStream.Read(buffer, 0, 12);
-                footerV2.ChunkId          = BigEndianBitConverter.ToUInt32(buffer, 0);
-                footerV2.FirstChunkOffset = BigEndianBitConverter.ToUInt64(buffer, 4);
+            // Seek to first chunk
+            if(_imageNewFormat)
+                _imageStream.Seek((long)footerV2.FirstChunkOffset, SeekOrigin.Begin);
+            else
+                _imageStream.Seek(footerV1.FirstChunkOffset, SeekOrigin.Begin);
 
-                AaruConsole.DebugWriteLine("Nero plugin", "imageStream.Length = {0}", _imageStream.Length);
+            bool   parsing        = true;
+            ushort currentSession = 1;
+            uint   currentTrack   = 1;
 
-                AaruConsole.DebugWriteLine("Nero plugin", "footerV1.ChunkID = 0x{0:X8} (\"{1}\")", footerV1.ChunkId,
-                                           Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(footerV1.ChunkId)));
+            Tracks      = new List<Track>();
+            _trackIsrCs = new Dictionary<uint, byte[]>();
 
-                AaruConsole.DebugWriteLine("Nero plugin", "footerV1.FirstChunkOffset = {0}", footerV1.FirstChunkOffset);
+            _imageInfo.MediaType  = CommonTypes.MediaType.CD;
+            _imageInfo.Sectors    = 0;
+            _imageInfo.SectorSize = 0;
+            bool oldFormat          = false;
+            int  currentLba         = -150;
+            bool corruptedTrackMode = false;
 
-                AaruConsole.DebugWriteLine("Nero plugin", "footerV2.ChunkID = 0x{0:X8} (\"{1}\")", footerV2.ChunkId,
-                                           Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(footerV2.ChunkId)));
+            // Parse chunks
+            while(parsing)
+            {
+                byte[] chunkHeaderBuffer = new byte[8];
 
-                AaruConsole.DebugWriteLine("Nero plugin", "footerV2.FirstChunkOffset = {0}", footerV2.FirstChunkOffset);
+                _imageStream.Read(chunkHeaderBuffer, 0, 8);
+                uint chunkId     = BigEndianBitConverter.ToUInt32(chunkHeaderBuffer, 0);
+                uint chunkLength = BigEndianBitConverter.ToUInt32(chunkHeaderBuffer, 4);
 
-                // Check footer version
-                if(footerV1.ChunkId          == NERO_FOOTER_V1 &&
-                   footerV1.FirstChunkOffset < (ulong)_imageStream.Length)
-                    _imageNewFormat = false;
-                else if(footerV2.ChunkId          == NERO_FOOTER_V2 &&
-                        footerV2.FirstChunkOffset < (ulong)_imageStream.Length)
-                    _imageNewFormat = true;
-                else
+                AaruConsole.DebugWriteLine("Nero plugin", "ChunkID = 0x{0:X8} (\"{1}\")", chunkId,
+                                           Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(chunkId)));
+
+                AaruConsole.DebugWriteLine("Nero plugin", "ChunkLength = {0}", chunkLength);
+
+                switch(chunkId)
                 {
-                    AaruConsole.DebugWrite("Nero plugin", "Nero version not recognized.");
-
-                    return ErrorNumber.NotSupported;
-                }
-
-                // Seek to first chunk
-                if(_imageNewFormat)
-                    _imageStream.Seek((long)footerV2.FirstChunkOffset, SeekOrigin.Begin);
-                else
-                    _imageStream.Seek(footerV1.FirstChunkOffset, SeekOrigin.Begin);
-
-                bool   parsing        = true;
-                ushort currentSession = 1;
-                uint   currentTrack   = 1;
-
-                Tracks      = new List<Track>();
-                _trackIsrCs = new Dictionary<uint, byte[]>();
-
-                _imageInfo.MediaType  = CommonTypes.MediaType.CD;
-                _imageInfo.Sectors    = 0;
-                _imageInfo.SectorSize = 0;
-                bool oldFormat          = false;
-                int  currentLba         = -150;
-                bool corruptedTrackMode = false;
-
-                // Parse chunks
-                while(parsing)
-                {
-                    byte[] chunkHeaderBuffer = new byte[8];
-
-                    _imageStream.Read(chunkHeaderBuffer, 0, 8);
-                    uint chunkId     = BigEndianBitConverter.ToUInt32(chunkHeaderBuffer, 0);
-                    uint chunkLength = BigEndianBitConverter.ToUInt32(chunkHeaderBuffer, 4);
-
-                    AaruConsole.DebugWriteLine("Nero plugin", "ChunkID = 0x{0:X8} (\"{1}\")", chunkId,
-                                               Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(chunkId)));
-
-                    AaruConsole.DebugWriteLine("Nero plugin", "ChunkLength = {0}", chunkLength);
-
-                    switch(chunkId)
+                    case NERO_CUE_V1:
                     {
-                        case NERO_CUE_V1:
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"CUES\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        var newCuesheetV1 = new CuesheetV1
                         {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"CUES\" chunk, parsing {0} bytes",
-                                                       chunkLength);
+                            ChunkId   = chunkId,
+                            ChunkSize = chunkLength,
+                            Entries   = new List<CueEntryV1>()
+                        };
 
-                            var newCuesheetV1 = new CuesheetV1
-                            {
-                                ChunkId   = chunkId,
-                                ChunkSize = chunkLength,
-                                Entries   = new List<CueEntryV1>()
-                            };
+                        byte[] tmpBuffer = new byte[8];
 
-                            byte[] tmpBuffer = new byte[8];
+                        for(int i = 0; i < newCuesheetV1.ChunkSize; i += 8)
+                        {
+                            var entry = new CueEntryV1();
+                            _imageStream.Read(tmpBuffer, 0, 8);
+                            entry.Mode = tmpBuffer[0];
 
-                            for(int i = 0; i < newCuesheetV1.ChunkSize; i += 8)
-                            {
-                                var entry = new CueEntryV1();
-                                _imageStream.Read(tmpBuffer, 0, 8);
-                                entry.Mode = tmpBuffer[0];
+                            entry.TrackNumber = (byte)((((tmpBuffer[1] & 0xF0) >> 4) * 10) + (tmpBuffer[1] & 0xF));
+                            entry.IndexNumber = (byte)((((tmpBuffer[2] & 0xF0) >> 4) * 10) + (tmpBuffer[2] & 0xF));
+                            entry.Dummy       = BigEndianBitConverter.ToUInt16(tmpBuffer, 3);
+                            entry.Minute      = (byte)((((tmpBuffer[5] & 0xF0) >> 4) * 10) + (tmpBuffer[5] & 0xF));
+                            entry.Second      = (byte)((((tmpBuffer[6] & 0xF0) >> 4) * 10) + (tmpBuffer[6] & 0xF));
+                            entry.Frame       = (byte)((((tmpBuffer[7] & 0xF0) >> 4) * 10) + (tmpBuffer[7] & 0xF));
 
-                                entry.TrackNumber = (byte)((((tmpBuffer[1] & 0xF0) >> 4) * 10) + (tmpBuffer[1] & 0xF));
-                                entry.IndexNumber = (byte)((((tmpBuffer[2] & 0xF0) >> 4) * 10) + (tmpBuffer[2] & 0xF));
-                                entry.Dummy       = BigEndianBitConverter.ToUInt16(tmpBuffer, 3);
-                                entry.Minute      = (byte)((((tmpBuffer[5] & 0xF0) >> 4) * 10) + (tmpBuffer[5] & 0xF));
-                                entry.Second      = (byte)((((tmpBuffer[6] & 0xF0) >> 4) * 10) + (tmpBuffer[6] & 0xF));
-                                entry.Frame       = (byte)((((tmpBuffer[7] & 0xF0) >> 4) * 10) + (tmpBuffer[7] & 0xF));
+                            AaruConsole.DebugWriteLine("Nero plugin", "Cuesheet entry {0}", (i / 8) + 1);
 
-                                AaruConsole.DebugWriteLine("Nero plugin", "Cuesheet entry {0}", (i / 8) + 1);
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1:X2}", (i / 8) + 1,
+                                                       entry.Mode);
 
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1:X2}", (i / 8) + 1,
-                                                           entry.Mode);
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].TrackNumber = {1:X2}",
+                                                       (i / 8) + 1, entry.TrackNumber);
 
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].TrackNumber = {1:X2}",
-                                                           (i / 8) + 1, entry.TrackNumber);
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].IndexNumber = {1:X2}",
+                                                       (i / 8) + 1, entry.IndexNumber);
 
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].IndexNumber = {1:X2}",
-                                                           (i / 8) + 1, entry.IndexNumber);
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Dummy = {1:X4}", (i / 8) + 1,
+                                                       entry.Dummy);
 
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Dummy = {1:X4}", (i / 8) + 1,
-                                                           entry.Dummy);
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Minute = {1:X2}", (i / 8) + 1,
+                                                       entry.Minute);
 
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Minute = {1:X2}", (i / 8) + 1,
-                                                           entry.Minute);
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Second = {1:X2}", (i / 8) + 1,
+                                                       entry.Second);
 
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Second = {1:X2}", (i / 8) + 1,
-                                                           entry.Second);
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Frame = {1:X2}", (i / 8) + 1,
+                                                       entry.Frame);
 
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Frame = {1:X2}", (i / 8) + 1,
-                                                           entry.Frame);
-
-                                newCuesheetV1.Entries.Add(entry);
-                            }
-
-                            if(_cuesheetV1 is null)
-                                _cuesheetV1 = newCuesheetV1;
-                            else
-                                _cuesheetV1.Entries.AddRange(newCuesheetV1.Entries);
-
-                            break;
+                            newCuesheetV1.Entries.Add(entry);
                         }
 
-                        case NERO_CUE_V2:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"CUEX\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            var newCuesheetV2 = new CuesheetV2
-                            {
-                                ChunkId   = chunkId,
-                                ChunkSize = chunkLength,
-                                Entries   = new List<CueEntryV2>()
-                            };
-
-                            byte[] tmpBuffer = new byte[8];
-
-                            for(int i = 0; i < newCuesheetV2.ChunkSize; i += 8)
-                            {
-                                var entry = new CueEntryV2();
-                                _imageStream.Read(tmpBuffer, 0, 8);
-                                entry.Mode        = tmpBuffer[0];
-                                entry.TrackNumber = (byte)((((tmpBuffer[1] & 0xF0) >> 4) * 10) + (tmpBuffer[1] & 0xF));
-                                entry.IndexNumber = (byte)((((tmpBuffer[2] & 0xF0) >> 4) * 10) + (tmpBuffer[2] & 0xF));
-                                entry.Dummy       = tmpBuffer[3];
-                                entry.LbaStart    = BigEndianBitConverter.ToInt32(tmpBuffer, 4);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "Cuesheet entry {0}", (i / 8) + 1);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = 0x{1:X2}", (i / 8) + 1,
-                                                           entry.Mode);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].TrackNumber = {1:X2}",
-                                                           (i / 8) + 1, entry.TrackNumber);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].IndexNumber = {1:X2}",
-                                                           (i / 8) + 1, entry.IndexNumber);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Dummy = {1:X2}", (i / 8) + 1,
-                                                           entry.Dummy);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].LBAStart = {1}", (i / 8) + 1,
-                                                           entry.LbaStart);
-
-                                newCuesheetV2.Entries.Add(entry);
-                            }
-
-                            if(_cuesheetV2 is null)
-                                _cuesheetV2 = newCuesheetV2;
-                            else
-                                _cuesheetV2.Entries.AddRange(newCuesheetV2.Entries);
-
-                            break;
-                        }
-
-                        case NERO_DAO_V1:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"DAOI\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            _neroDaov1 = new DaoV1
-                            {
-                                ChunkId     = chunkId,
-                                ChunkSizeBe = chunkLength
-                            };
-
-                            byte[] tmpBuffer = new byte[22];
-                            _imageStream.Read(tmpBuffer, 0, 22);
-                            _neroDaov1.ChunkSizeLe = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
-                            _neroDaov1.Upc         = new byte[14];
-                            Array.Copy(tmpBuffer, 4, _neroDaov1.Upc, 0, 14);
-                            _neroDaov1.TocType    = BigEndianBitConverter.ToUInt16(tmpBuffer, 18);
-                            _neroDaov1.FirstTrack = tmpBuffer[20];
-                            _neroDaov1.LastTrack  = tmpBuffer[21];
-                            _neroDaov1.Tracks     = new List<DaoEntryV1>();
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.ChunkSizeLe = {0} bytes",
-                                                       _neroDaov1.ChunkSizeLe);
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.UPC = \"{0}\"",
-                                                       StringHandlers.CToString(_neroDaov1.Upc));
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.TocType = 0x{0:X4}",
-                                                       _neroDaov1.TocType);
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.FirstTrack = {0}",
-                                                       _neroDaov1.FirstTrack);
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.LastTrack = {0}",
-                                                       _neroDaov1.LastTrack);
-
-                            _upc = _neroDaov1.Upc;
-
-                            tmpBuffer = new byte[30];
-
-                            for(int i = 0; i < _neroDaov1.ChunkSizeBe - 22; i += 30)
-                            {
-                                var entry = new DaoEntryV1();
-                                _imageStream.Read(tmpBuffer, 0, 30);
-                                entry.Isrc = new byte[12];
-                                Array.Copy(tmpBuffer, 4, entry.Isrc, 0, 12);
-                                entry.SectorSize = BigEndianBitConverter.ToUInt16(tmpBuffer, 12);
-                                entry.Mode       = BitConverter.ToUInt16(tmpBuffer, 14);
-                                entry.Unknown    = BigEndianBitConverter.ToUInt16(tmpBuffer, 16);
-                                entry.Index0     = BigEndianBitConverter.ToUInt32(tmpBuffer, 18);
-                                entry.Index1     = BigEndianBitConverter.ToUInt32(tmpBuffer, 22);
-                                entry.EndOfTrack = BigEndianBitConverter.ToUInt32(tmpBuffer, 26);
-
-                                // MagicISO
-                                if(entry.SectorSize == 2352)
-                                {
-                                    if(entry.Mode == 0x0000)
-                                    {
-                                        corruptedTrackMode = true;
-                                        entry.Mode         = 0x0005;
-                                    }
-                                    else if(entry.Mode == 0x0002 ||
-                                            entry.Mode == 0x0003)
-                                    {
-                                        corruptedTrackMode = true;
-                                        entry.Mode         = 0x0006;
-                                    }
-                                }
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "Disc-At-Once entry {0}", (i / 32) + 1);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].ISRC = \"{1}\"", (i / 32) + 1,
-                                                           StringHandlers.CToString(entry.Isrc));
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].SectorSize = {1}",
-                                                           (i / 32) + 1, entry.SectorSize);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
-                                                           (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = 0x{1:X4}",
-                                                           (i / 32) + 1, entry.Unknown);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index0 = {1}", (i / 32) + 1,
-                                                           entry.Index0);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index1 = {1}", (i / 32) + 1,
-                                                           entry.Index1);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].EndOfTrack = {1}",
-                                                           (i / 32) + 1, entry.EndOfTrack);
-
-                                _neroDaov1.Tracks.Add(entry);
-
-                                if(entry.SectorSize > _imageInfo.SectorSize)
-                                    _imageInfo.SectorSize = entry.SectorSize;
-
-                                _trackIsrCs.Add(currentTrack, entry.Isrc);
-
-                                var neroTrack = new NeroTrack
-                                {
-                                    EndOfTrack = entry.EndOfTrack,
-                                    Isrc       = entry.Isrc,
-                                    Length     = entry.EndOfTrack - entry.Index0,
-                                    Mode       = entry.Mode,
-                                    Offset     = entry.Index0,
-                                    SectorSize = entry.SectorSize,
-                                    Index0     = entry.Index0,
-                                    Index1     = entry.Index1,
-                                    Sequence   = currentTrack
-                                };
-
-                                _neroTracks.Add(currentTrack, neroTrack);
-                                currentTrack++;
-                            }
-
-                            break;
-                        }
-
-                        case NERO_DAO_V2:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"DAOX\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            _neroDaov2 = new DaoV2
-                            {
-                                ChunkId     = chunkId,
-                                ChunkSizeBe = chunkLength
-                            };
-
-                            byte[] tmpBuffer = new byte[22];
-                            _imageStream.Read(tmpBuffer, 0, 22);
-                            _neroDaov2.ChunkSizeLe = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
-                            _neroDaov2.Upc         = new byte[14];
-                            Array.Copy(tmpBuffer, 4, _neroDaov2.Upc, 0, 14);
-                            _neroDaov2.TocType    = BigEndianBitConverter.ToUInt16(tmpBuffer, 18);
-                            _neroDaov2.FirstTrack = tmpBuffer[20];
-                            _neroDaov2.LastTrack  = tmpBuffer[21];
-                            _neroDaov2.Tracks     = new List<DaoEntryV2>();
-
-                            _upc = _neroDaov2.Upc;
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.ChunkSizeLe = {0} bytes",
-                                                       _neroDaov2.ChunkSizeLe);
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.UPC = \"{0}\"",
-                                                       StringHandlers.CToString(_neroDaov2.Upc));
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.TocType = 0x{0:X4}",
-                                                       _neroDaov2.TocType);
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.FirstTrack = {0}",
-                                                       _neroDaov2.FirstTrack);
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.LastTrack = {0}",
-                                                       _neroDaov2.LastTrack);
-
-                            tmpBuffer = new byte[42];
-
-                            for(int i = 0; i < _neroDaov2.ChunkSizeBe - 22; i += 42)
-                            {
-                                var entry = new DaoEntryV2();
-                                _imageStream.Read(tmpBuffer, 0, 42);
-                                entry.Isrc = new byte[12];
-                                Array.Copy(tmpBuffer, 4, entry.Isrc, 0, 12);
-                                entry.SectorSize = BigEndianBitConverter.ToUInt16(tmpBuffer, 12);
-                                entry.Mode       = BitConverter.ToUInt16(tmpBuffer, 14);
-                                entry.Unknown    = BigEndianBitConverter.ToUInt16(tmpBuffer, 16);
-                                entry.Index0     = BigEndianBitConverter.ToUInt64(tmpBuffer, 18);
-                                entry.Index1     = BigEndianBitConverter.ToUInt64(tmpBuffer, 26);
-                                entry.EndOfTrack = BigEndianBitConverter.ToUInt64(tmpBuffer, 34);
-
-                                // MagicISO
-                                if(entry.SectorSize == 2352)
-                                {
-                                    if(entry.Mode == 0x0000)
-                                    {
-                                        corruptedTrackMode = true;
-                                        entry.Mode         = 0x0005;
-                                    }
-                                    else if(entry.Mode == 0x0002 ||
-                                            entry.Mode == 0x0003)
-                                    {
-                                        corruptedTrackMode = true;
-                                        entry.Mode         = 0x0006;
-                                    }
-                                }
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "Disc-At-Once entry {0}", (i / 32) + 1);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].ISRC = \"{1}\"", (i / 32) + 1,
-                                                           StringHandlers.CToString(entry.Isrc));
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].SectorSize = {1}",
-                                                           (i / 32) + 1, entry.SectorSize);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
-                                                           (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = {1:X2}",
-                                                           (i / 32) + 1, entry.Unknown);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index0 = {1}", (i / 32) + 1,
-                                                           entry.Index0);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index1 = {1}", (i / 32) + 1,
-                                                           entry.Index1);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].EndOfTrack = {1}",
-                                                           (i / 32) + 1, entry.EndOfTrack);
-
-                                _neroDaov2.Tracks.Add(entry);
-
-                                if(entry.SectorSize > _imageInfo.SectorSize)
-                                    _imageInfo.SectorSize = entry.SectorSize;
-
-                                _trackIsrCs.Add(currentTrack, entry.Isrc);
-
-                                var neroTrack = new NeroTrack
-                                {
-                                    EndOfTrack = entry.EndOfTrack,
-                                    Isrc       = entry.Isrc,
-                                    Length     = entry.EndOfTrack - entry.Index0,
-                                    Mode       = entry.Mode,
-                                    Offset     = entry.Index0,
-                                    SectorSize = entry.SectorSize,
-                                    Index0     = entry.Index0,
-                                    Index1     = entry.Index1,
-                                    Sequence   = currentTrack
-                                };
-
-                                _neroTracks.Add(currentTrack, neroTrack);
-
-                                currentTrack++;
-                            }
-
-                            break;
-                        }
-
-                        case NERO_CDTEXT:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"CDTX\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            _cdtxt = new CdText
-                            {
-                                ChunkId   = chunkId,
-                                ChunkSize = chunkLength,
-                                Packs     = new List<CdTextPack>()
-                            };
-
-                            byte[] tmpBuffer = new byte[18];
-
-                            for(int i = 0; i < _cdtxt.ChunkSize; i += 18)
-                            {
-                                var entry = new CdTextPack();
-                                _imageStream.Read(tmpBuffer, 0, 18);
-
-                                entry.PackType    = tmpBuffer[0];
-                                entry.TrackNumber = tmpBuffer[1];
-                                entry.PackNumber  = tmpBuffer[2];
-                                entry.BlockNumber = tmpBuffer[3];
-                                entry.Text        = new byte[12];
-                                Array.Copy(tmpBuffer, 4, entry.Text, 0, 12);
-                                entry.Crc = BigEndianBitConverter.ToUInt16(tmpBuffer, 16);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "CD-TEXT entry {0}", (i / 18) + 1);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].PackType = 0x{1:X2}",
-                                                           (i / 18) + 1, entry.PackType);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].TrackNumber = 0x{1:X2}",
-                                                           (i / 18) + 1, entry.TrackNumber);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].PackNumber = 0x{1:X2}",
-                                                           (i / 18) + 1, entry.PackNumber);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].BlockNumber = 0x{1:X2}",
-                                                           (i / 18) + 1, entry.BlockNumber);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Text = \"{1}\"", (i / 18) + 1,
-                                                           StringHandlers.CToString(entry.Text));
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].CRC = 0x{1:X4}", (i / 18) + 1,
-                                                           entry.Crc);
-
-                                _cdtxt.Packs.Add(entry);
-                            }
-
-                            break;
-                        }
-
-                        case NERO_TAO_V0:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"TINF\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            oldFormat = true;
-
-                            _taoV0 = new TaoV0
-                            {
-                                ChunkId   = chunkId,
-                                ChunkSize = chunkLength,
-                                Tracks    = new List<TaoEntryV0>()
-                            };
-
-                            byte[] tmpBuffer = new byte[12];
-
-                            for(int i = 0; i < _taoV0.ChunkSize; i += 12)
-                            {
-                                var entry = new TaoEntryV0();
-                                _imageStream.Read(tmpBuffer, 0, 12);
-
-                                entry.Offset = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
-                                entry.Length = BigEndianBitConverter.ToUInt32(tmpBuffer, 4);
-                                entry.Mode   = BigEndianBitConverter.ToUInt32(tmpBuffer, 8);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "Track-at-Once entry {0}", (i / 20) + 1);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Offset = {1}", (i / 20) + 1,
-                                                           entry.Offset);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Length = {1} bytes",
-                                                           (i / 20) + 1, entry.Length);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
-                                                           (i / 20) + 1, (DaoMode)entry.Mode, entry.Mode);
-
-                                _taoV0.Tracks.Add(entry);
-
-                                if(NeroTrackModeToBytesPerSector((DaoMode)entry.Mode) > _imageInfo.SectorSize)
-                                    _imageInfo.SectorSize = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode);
-
-                                // StartLba points to INDEX 0 and Nero always introduces a pregap of 150 sectors,
-
-                                var neroTrack = new NeroTrack
-                                {
-                                    EndOfTrack     = entry.Offset + entry.Length,
-                                    Isrc           = new byte[12],
-                                    Length         = entry.Length,
-                                    Mode           = entry.Mode,
-                                    Offset         = entry.Offset,
-                                    SectorSize     = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode),
-                                    UseLbaForIndex = true,
-                                    Sequence       = currentTrack,
-                                    StartLba       = currentLba > 0 ? (ulong)currentLba : 0
-                                };
-
-                                _neroTracks.Add(currentTrack, neroTrack);
-
-                                currentTrack++;
-                                currentLba += (int)(neroTrack.Length / neroTrack.SectorSize);
-                            }
-
-                            break;
-                        }
-
-                        case NERO_TAO_V1:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"ETNF\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            _taoV1 = new TaoV1
-                            {
-                                ChunkId   = chunkId,
-                                ChunkSize = chunkLength,
-                                Tracks    = new List<TaoEntryV1>()
-                            };
-
-                            byte[] tmpBuffer = new byte[20];
-
-                            for(int i = 0; i < _taoV1.ChunkSize; i += 20)
-                            {
-                                var entry = new TaoEntryV1();
-                                _imageStream.Read(tmpBuffer, 0, 20);
-
-                                entry.Offset   = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
-                                entry.Length   = BigEndianBitConverter.ToUInt32(tmpBuffer, 4);
-                                entry.Mode     = BigEndianBitConverter.ToUInt32(tmpBuffer, 8);
-                                entry.StartLba = BigEndianBitConverter.ToUInt32(tmpBuffer, 12);
-                                entry.Unknown  = BigEndianBitConverter.ToUInt32(tmpBuffer, 16);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "Track-at-Once entry {0}", (i / 20) + 1);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Offset = {1}", (i / 20) + 1,
-                                                           entry.Offset);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Length = {1} bytes",
-                                                           (i / 20) + 1, entry.Length);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
-                                                           (i / 20) + 1, (DaoMode)entry.Mode, entry.Mode);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].StartLBA = {1}", (i / 20) + 1,
-                                                           entry.StartLba);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = 0x{1:X4}",
-                                                           (i / 20) + 1, entry.Unknown);
-
-                                _taoV1.Tracks.Add(entry);
-
-                                if(NeroTrackModeToBytesPerSector((DaoMode)entry.Mode) > _imageInfo.SectorSize)
-                                    _imageInfo.SectorSize = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode);
-
-                                // StartLba points to INDEX 0 and Nero always introduces a pregap of 150 sectors,
-
-                                var neroTrack = new NeroTrack
-                                {
-                                    EndOfTrack     = entry.Offset + entry.Length,
-                                    Isrc           = new byte[12],
-                                    Length         = entry.Length,
-                                    Mode           = entry.Mode,
-                                    Offset         = entry.Offset,
-                                    SectorSize     = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode),
-                                    UseLbaForIndex = true,
-                                    Sequence       = currentTrack,
-                                    StartLba       = entry.StartLba
-                                };
-
-                                _neroTracks.Add(currentTrack, neroTrack);
-
-                                currentTrack++;
-                            }
-
-                            break;
-                        }
-
-                        case NERO_TAO_V2:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"ETN2\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            _taoV2 = new TaoV2
-                            {
-                                ChunkId   = chunkId,
-                                ChunkSize = chunkLength,
-                                Tracks    = new List<TaoEntryV2>()
-                            };
-
-                            byte[] tmpBuffer = new byte[32];
-
-                            for(int i = 0; i < _taoV2.ChunkSize; i += 32)
-                            {
-                                var entry = new TaoEntryV2();
-                                _imageStream.Read(tmpBuffer, 0, 32);
-
-                                entry.Offset   = BigEndianBitConverter.ToUInt64(tmpBuffer, 0);
-                                entry.Length   = BigEndianBitConverter.ToUInt64(tmpBuffer, 8);
-                                entry.Mode     = BigEndianBitConverter.ToUInt32(tmpBuffer, 16);
-                                entry.StartLba = BigEndianBitConverter.ToUInt32(tmpBuffer, 20);
-                                entry.Unknown  = BigEndianBitConverter.ToUInt32(tmpBuffer, 24);
-                                entry.Sectors  = BigEndianBitConverter.ToUInt32(tmpBuffer, 28);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "Track-at-Once entry {0}", (i / 32) + 1);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Offset = {1}", (i / 32) + 1,
-                                                           entry.Offset);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Length = {1} bytes",
-                                                           (i / 32) + 1, entry.Length);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
-                                                           (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].StartLBA = {1}", (i / 32) + 1,
-                                                           entry.StartLba);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = 0x{1:X4}",
-                                                           (i / 32) + 1, entry.Unknown);
-
-                                AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Sectors = {1}", (i / 32) + 1,
-                                                           entry.Sectors);
-
-                                _taoV2.Tracks.Add(entry);
-
-                                ushort v2Bps = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode);
-
-                                if(NeroTrackModeToBytesPerSector((DaoMode)entry.Mode) > _imageInfo.SectorSize)
-                                    _imageInfo.SectorSize = v2Bps;
-
-                                // StartLba points to INDEX 1 and Nero always introduces a pregap of 150 sectors,
-                                // so let's move it to INDEX 0 and fix the pointers
-                                if(entry.StartLba >= 150)
-                                {
-                                    entry.StartLba -= 150;
-                                    entry.Offset   -= (ulong)(150 * v2Bps);
-                                    entry.Length   += (ulong)(150 * v2Bps);
-                                }
-
-                                var neroTrack = new NeroTrack
-                                {
-                                    EndOfTrack     = entry.Offset + entry.Length,
-                                    Isrc           = new byte[12],
-                                    Length         = entry.Length,
-                                    Mode           = entry.Mode,
-                                    Offset         = entry.Offset,
-                                    StartLba       = entry.StartLba,
-                                    UseLbaForIndex = true,
-                                    SectorSize     = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode),
-                                    Sequence       = currentTrack
-                                };
-
-                                _neroTracks.Add(currentTrack, neroTrack);
-
-                                currentTrack++;
-                            }
-
-                            break;
-                        }
-
-                        case NERO_SESSION:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"SINF\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            byte[] tmpBuffer = new byte[4];
-                            _imageStream.Read(tmpBuffer, 0, 4);
-                            uint sessionTracks = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
-                            _neroSessions.Add(currentSession, sessionTracks);
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "\tSession {0} has {1} tracks", currentSession,
-                                                       sessionTracks);
-
-                            currentSession++;
-
-                            break;
-                        }
-
-                        case NERO_DISC_TYPE:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"MTYP\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            _mediaType = new MediaType
-                            {
-                                ChunkId   = chunkId,
-                                ChunkSize = chunkLength
-                            };
-
-                            byte[] tmpBuffer = new byte[4];
-                            _imageStream.Read(tmpBuffer, 0, 4);
-                            _mediaType.Type = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "\tMedia type is {0} ({1})",
-                                                       (NeroMediaTypes)_mediaType.Type, _mediaType.Type);
-
-                            _imageInfo.MediaType = NeroMediaTypeToMediaType((NeroMediaTypes)_mediaType.Type);
-
-                            break;
-                        }
-
-                        case NERO_DISC_INFO:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"DINF\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            _discInfo = new DiscInformation
-                            {
-                                ChunkId   = chunkId,
-                                ChunkSize = chunkLength
-                            };
-
-                            byte[] tmpBuffer = new byte[4];
-                            _imageStream.Read(tmpBuffer, 0, 4);
-                            _discInfo.Unknown = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "\tneroDiscInfo.Unknown = 0x{0:X4} ({0})",
-                                                       _discInfo.Unknown);
-
-                            break;
-                        }
-
-                        case NERO_RELOCATION:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"RELO\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            _relo = new ReloChunk
-                            {
-                                ChunkId   = chunkId,
-                                ChunkSize = chunkLength
-                            };
-
-                            byte[] tmpBuffer = new byte[4];
-                            _imageStream.Read(tmpBuffer, 0, 4);
-                            _relo.Unknown = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "\tneroRELO.Unknown = 0x{0:X4} ({0})",
-                                                       _relo.Unknown);
-
-                            break;
-                        }
-
-                        case NERO_TOC:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"TOCT\" chunk, parsing {0} bytes",
-                                                       chunkLength);
-
-                            _toc = new TocChunk
-                            {
-                                ChunkId   = chunkId,
-                                ChunkSize = chunkLength
-                            };
-
-                            byte[] tmpBuffer = new byte[2];
-                            _imageStream.Read(tmpBuffer, 0, 2);
-                            _toc.Unknown = BigEndianBitConverter.ToUInt16(tmpBuffer, 0);
-
-                            switch(tmpBuffer[0])
-                            {
-                                case 0:
-                                    _imageInfo.MediaType = CommonTypes.MediaType.CDROM;
-
-                                    break;
-                                case 0x10:
-                                    _imageInfo.MediaType = CommonTypes.MediaType.CDI;
-
-                                    break;
-                                case 0x20:
-                                    _imageInfo.MediaType = CommonTypes.MediaType.CDROMXA;
-
-                                    break;
-                            }
-
-                            AaruConsole.DebugWriteLine("Nero plugin", "\tneroTOC.Unknown = 0x{0:X4} ({0})",
-                                                       _toc.Unknown);
-
-                            break;
-                        }
-
-                        case NERO_END:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Found \"END!\" chunk, finishing parse");
-                            parsing = false;
-
-                            break;
-                        }
-
-                        default:
-                        {
-                            AaruConsole.DebugWriteLine("Nero plugin", "Unknown chunk ID \"{0}\", skipping...",
-                                                       Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                                    GetBytes(chunkId)));
-
-                            _imageStream.Seek(chunkLength, SeekOrigin.Current);
-
-                            break;
-                        }
-                    }
-                }
-
-                if(corruptedTrackMode)
-                    AaruConsole.
-                        ErrorWriteLine("Inconsistent track mode and track sector size found. A best try to fix has been done. It is recommended this disc is dumped with another software.");
-
-                _imageInfo.HasPartitions         = true;
-                _imageInfo.HasSessions           = true;
-                _imageInfo.Creator               = null;
-                _imageInfo.CreationTime          = imageFilter.CreationTime;
-                _imageInfo.LastModificationTime  = imageFilter.LastWriteTime;
-                _imageInfo.MediaTitle            = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-                _imageInfo.Comments              = null;
-                _imageInfo.MediaManufacturer     = null;
-                _imageInfo.MediaModel            = null;
-                _imageInfo.MediaSerialNumber     = null;
-                _imageInfo.MediaBarcode          = null;
-                _imageInfo.MediaPartNumber       = null;
-                _imageInfo.DriveManufacturer     = null;
-                _imageInfo.DriveModel            = null;
-                _imageInfo.DriveSerialNumber     = null;
-                _imageInfo.DriveFirmwareRevision = null;
-                _imageInfo.MediaSequence         = 0;
-                _imageInfo.LastMediaSequence     = 0;
-
-                _imageInfo.Application = "Nero Burning ROM";
-
-                if(_imageNewFormat)
-                {
-                    _imageInfo.ImageSize          = footerV2.FirstChunkOffset;
-                    _imageInfo.Version            = "Nero Burning ROM >= 5.5";
-                    _imageInfo.ApplicationVersion = ">= 5.5";
-                }
-                else if(oldFormat)
-                {
-                    _imageInfo.ImageSize          = footerV1.FirstChunkOffset;
-                    _imageInfo.Version            = "Nero Burning ROM 4";
-                    _imageInfo.ApplicationVersion = "4";
-                }
-                else
-                {
-                    _imageInfo.ImageSize          = footerV1.FirstChunkOffset;
-                    _imageInfo.Version            = "Nero Burning ROM <= 5.0";
-                    _imageInfo.ApplicationVersion = "<= 5.0";
-                }
-
-                if(_neroSessions.Count == 0)
-                    _neroSessions.Add(1, currentTrack);
-
-                AaruConsole.DebugWriteLine("Nero plugin", "Building offset, track and session maps");
-
-                bool onlyOneSession = currentSession == 1 || currentSession == 2;
-                currentSession = 1;
-                _neroSessions.TryGetValue(1, out uint currentSessionMaxTrack);
-                uint  currentSessionCurrentTrack = 1;
-                var   currentSessionStruct       = new CommonTypes.Structs.Session();
-                ulong partitionSequence          = 0;
-                ulong partitionStartByte         = 0;
-                int   trackCounter               = 1;
-                _trackFlags = new Dictionary<uint, byte>();
-
-                if(currentSessionMaxTrack == 0)
-                    currentSessionMaxTrack = 1;
-
-                bool moreTracksThanSessionTracks = currentSessionMaxTrack < _neroTracks.Count;
-
-                // Process tracks
-                foreach(NeroTrack neroTrack in _neroTracks.Values)
-                {
-                    if(neroTrack.Offset >= (_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset))
-                    {
-                        AaruConsole.
-                            ErrorWriteLine("This image contains a track that is set to start outside the file.");
-
-                        AaruConsole.ErrorWriteLine("Breaking track processing and trying recovery of information.");
+                        if(_cuesheetV1 is null)
+                            _cuesheetV1 = newCuesheetV1;
+                        else
+                            _cuesheetV1.Entries.AddRange(newCuesheetV1.Entries);
 
                         break;
                     }
 
-                    AaruConsole.DebugWriteLine("Nero plugin", "\tcurrentSession = {0}", currentSession);
-                    AaruConsole.DebugWriteLine("Nero plugin", "\tcurrentSessionMaxTrack = {0}", currentSessionMaxTrack);
+                    case NERO_CUE_V2:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"CUEX\" chunk, parsing {0} bytes",
+                                                   chunkLength);
 
-                    AaruConsole.DebugWriteLine("Nero plugin", "\tcurrentSessionCurrentTrack = {0}",
-                                               currentSessionCurrentTrack);
-
-                    var track = new Track();
-
-                    // Process indexes
-                    if(_cuesheetV1?.Entries?.Count > 0)
-                        foreach(CueEntryV1 entry in _cuesheetV1.Entries.Where(e => e.TrackNumber == neroTrack.Sequence).
-                                                                OrderBy(e => e.IndexNumber))
+                        var newCuesheetV2 = new CuesheetV2
                         {
-                            track.Indexes[entry.IndexNumber] =
-                                (entry.Minute * 60 * 75) + (entry.Second * 75) + entry.Frame - 150;
-
-                            _trackFlags[entry.TrackNumber] = (byte)((entry.Mode & 0xF0) >> 4);
-                        }
-                    else if(_cuesheetV2?.Entries?.Count > 0)
-                        foreach(CueEntryV2 entry in _cuesheetV2.Entries.Where(e => e.TrackNumber == neroTrack.Sequence).
-                                                                OrderBy(e => e.IndexNumber))
-                        {
-                            track.Indexes[entry.IndexNumber] = entry.LbaStart;
-                            _trackFlags[entry.TrackNumber]   = (byte)((entry.Mode & 0xF0) >> 4);
-                        }
-
-                    // Act if there are no indexes
-                    if(track.Indexes.Count == 0)
-                    {
-                        if(!neroTrack.UseLbaForIndex)
-                            continue; // This track start is unknown, continue and pray the goddess
-
-                        // This always happens in TAO discs and Nero uses 150 sectors of pregap for them
-                        // but we need to move the offsets if it's the first track of a session
-                        if(currentSessionCurrentTrack == 1)
-                        {
-                            track.Indexes[1] =  (int)neroTrack.StartLba;
-                            track.Indexes[0] =  track.Indexes[1] - 150;
-                            neroTrack.Offset -= (ulong)(150 * neroTrack.SectorSize);
-                            neroTrack.Length += (ulong)(150 * neroTrack.SectorSize);
-                        }
-                        else
-                        {
-                            track.Indexes[0] = (int)neroTrack.StartLba;
-                            track.Indexes[1] = track.Indexes[0] + 150;
-                        }
-                    }
-
-                    // Prevent duplicate index 0
-                    if(track.Indexes.ContainsKey(0) &&
-                       track.Indexes[0] == track.Indexes[1])
-                        track.Indexes.Remove(0);
-
-                    // There's a pregap
-                    if(track.Indexes.ContainsKey(0))
-                    {
-                        track.Pregap = (ulong)(track.Indexes[1] - track.Indexes[0]);
-
-                        // Negative pregap, skip it
-                        if(track.Indexes[0] < 0)
-                        {
-                            neroTrack.Length  -= track.Pregap * neroTrack.SectorSize;
-                            neroTrack.Offset  += track.Pregap * neroTrack.SectorSize;
-                            track.StartSector =  (ulong)track.Indexes[1];
-                        }
-                        else
-                            track.StartSector = (ulong)track.Indexes[0];
-                    }
-                    else
-                        track.StartSector = (ulong)track.Indexes[1];
-
-                    // Handle hidden tracks
-                    if(neroTrack.Sequence == 1 &&
-                       track.StartSector  > 0)
-                    {
-                        neroTrack.Length  += track.StartSector * neroTrack.SectorSize;
-                        neroTrack.Offset  -= track.StartSector * neroTrack.SectorSize;
-                        track.StartSector =  0;
-                    }
-
-                    // Common track data
-                    track.Description    = StringHandlers.CToString(neroTrack.Isrc);
-                    track.EndSector      = (neroTrack.Length / neroTrack.SectorSize) + track.StartSector - 1;
-                    track.Sequence       = neroTrack.Sequence;
-                    track.Session        = currentSession;
-                    track.Type           = NeroTrackModeToTrackType((DaoMode)neroTrack.Mode);
-                    track.File           = imageFilter.Filename;
-                    track.Filter         = imageFilter;
-                    track.FileOffset     = neroTrack.Offset;
-                    track.FileType       = "BINARY";
-                    track.SubchannelType = TrackSubchannelType.None;
-                    neroTrack.Sectors    = neroTrack.Length / neroTrack.SectorSize;
-
-                    // Flags not set for this track
-                    if(!_trackFlags.ContainsKey(track.Sequence))
-                    {
-                        switch(track.Type)
-                        {
-                            case TrackType.Audio:
-                                _trackFlags[track.Sequence] = 0;
-
-                                break;
-                            case TrackType.Data:
-                            case TrackType.CdMode1:
-                            case TrackType.CdMode2Formless:
-                            case TrackType.CdMode2Form1:
-                            case TrackType.CdMode2Form2:
-                                _trackFlags[track.Sequence] = 4;
-
-                                break;
-                        }
-                    }
-
-                    // If ISRC is not empty
-                    if(!string.IsNullOrWhiteSpace(track.Description))
-                    {
-                        _trackIsrCs[neroTrack.Sequence] = neroTrack.Isrc;
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
-                    }
-
-                    bool rawMode1 = false;
-                    bool rawMode2 = false;
-
-                    switch((DaoMode)neroTrack.Mode)
-                    {
-                        case DaoMode.AudioAlt:
-                        case DaoMode.Audio:
-                            track.BytesPerSector    = 2352;
-                            track.RawBytesPerSector = 2352;
-
-                            break;
-                        case DaoMode.AudioSub:
-                            track.BytesPerSector    = 2352;
-                            track.RawBytesPerSector = 2352;
-                            track.SubchannelType    = TrackSubchannelType.RawInterleaved;
-
-                            break;
-                        case DaoMode.Data:
-                        case DaoMode.DataM2F1:
-                            track.BytesPerSector    = 2048;
-                            track.RawBytesPerSector = 2048;
-
-                            break;
-                        case DaoMode.DataM2F2:
-                            track.BytesPerSector    = 2336;
-                            track.RawBytesPerSector = 2336;
-
-                            break;
-                        case DaoMode.DataM2Raw:
-                            track.BytesPerSector    = 2352;
-                            track.RawBytesPerSector = 2352;
-                            rawMode2                = true;
-
-                            break;
-                        case DaoMode.DataM2RawSub:
-                            track.BytesPerSector    = 2352;
-                            track.RawBytesPerSector = 2352;
-                            track.SubchannelType    = TrackSubchannelType.RawInterleaved;
-                            rawMode2                = true;
-
-                            break;
-                        case DaoMode.DataRaw:
-                            track.BytesPerSector    = 2048;
-                            track.RawBytesPerSector = 2352;
-                            rawMode1                = true;
-
-                            break;
-                        case DaoMode.DataRawSub:
-                            track.BytesPerSector    = 2048;
-                            track.RawBytesPerSector = 2352;
-                            track.SubchannelType    = TrackSubchannelType.RawInterleaved;
-                            rawMode1                = true;
-
-                            break;
-                    }
-
-                    AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.Description = {0}", track.Description);
-
-                    AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.EndSector = {0}", track.EndSector);
-                    AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.Pregap = {0}", track.Pregap);
-                    AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.Sequence = {0}", track.Sequence);
-                    AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.Session = {0}", track.Session);
-
-                    AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.StartSector = {0}", track.StartSector);
-
-                    AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.Type = {0}", track.Type);
-
-                    // Check readability of sector tags
-                    if(rawMode1 || rawMode2)
-                    {
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader) && rawMode2)
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-                    }
-
-                    if(track.SubchannelType == TrackSubchannelType.RawInterleaved)
-                    {
-                        track.SubchannelFilter = imageFilter;
-                        track.SubchannelFile   = imageFilter.Filename;
-                        track.SubchannelOffset = neroTrack.Offset;
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-                    }
-
-                    Tracks.Add(track);
-
-                    // Build session
-                    if(currentSessionCurrentTrack == 1)
-                        currentSessionStruct = new CommonTypes.Structs.Session
-                        {
-                            Sequence    = currentSession,
-                            StartSector = track.StartSector,
-                            StartTrack  = track.Sequence
+                            ChunkId   = chunkId,
+                            ChunkSize = chunkLength,
+                            Entries   = new List<CueEntryV2>()
                         };
 
-                    currentSessionCurrentTrack++;
+                        byte[] tmpBuffer = new byte[8];
 
-                    if(currentSessionCurrentTrack > currentSessionMaxTrack)
-                    {
-                        currentSession++;
-                        _neroSessions.TryGetValue(currentSession, out currentSessionMaxTrack);
-                        currentSessionCurrentTrack     = 1;
-                        currentSessionStruct.EndTrack  = track.Sequence;
-                        currentSessionStruct.EndSector = track.EndSector;
-                        Sessions.Add(currentSessionStruct);
-                    }
-                    else if(trackCounter == _neroTracks.Count)
-                    {
-                        _neroSessions.TryGetValue(currentSession, out currentSessionMaxTrack);
-                        currentSessionCurrentTrack     = 1;
-                        currentSessionStruct.EndTrack  = track.Sequence;
-                        currentSessionStruct.EndSector = track.EndSector;
-                        Sessions.Add(currentSessionStruct);
-                    }
-
-                    // Add to offset map
-                    _offsetmap.Add(track.Sequence, track.StartSector);
-
-                    AaruConsole.DebugWriteLine("Nero plugin", "\t\t Offset[{0}]: {1}", track.Sequence,
-                                               track.StartSector);
-
-                    // Create partition
-                    var partition = new Partition
-                    {
-                        Description = $"Track {track.Sequence}",
-                        Size        = neroTrack.EndOfTrack - neroTrack.Index1,
-                        Name        = StringHandlers.CToString(neroTrack.Isrc),
-                        Sequence    = partitionSequence,
-                        Offset      = partitionStartByte,
-                        Start       = (ulong)track.Indexes[1],
-                        Type        = NeroTrackModeToTrackType((DaoMode)neroTrack.Mode).ToString()
-                    };
-
-                    partition.Length = partition.Size / neroTrack.SectorSize;
-                    Partitions.Add(partition);
-                    partitionSequence++;
-                    partitionStartByte += partition.Size;
-
-                    if(track.EndSector + 1 > _imageInfo.Sectors)
-                        _imageInfo.Sectors = track.EndSector + 1;
-
-                    trackCounter++;
-                }
-
-                if(Tracks.Count == 0)
-                {
-                    if(_neroTracks.Count != 1      ||
-                       !_neroTracks.ContainsKey(1) ||
-                       (_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset) %
-                       _neroTracks[1].SectorSize != 0)
-                    {
-                        AaruConsole.ErrorWriteLine("Image corrupted beyond recovery, cannot open.");
-
-                        return ErrorNumber.InvalidArgument;
-                    }
-
-                    var track = new Track();
-
-                    // Common track data
-                    track.Description = StringHandlers.CToString(_neroTracks[1].Isrc);
-
-                    track.EndSector = ((_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset) /
-                                       _neroTracks[1].SectorSize) - 150;
-
-                    track.Sequence       = _neroTracks[1].Sequence;
-                    track.Session        = currentSession;
-                    track.Type           = NeroTrackModeToTrackType((DaoMode)_neroTracks[1].Mode);
-                    track.File           = imageFilter.Filename;
-                    track.Filter         = imageFilter;
-                    track.FileType       = "BINARY";
-                    track.SubchannelType = TrackSubchannelType.None;
-                    track.Indexes[1]     = 0;
-
-                    bool rawMode1 = false;
-                    bool rawMode2 = false;
-                    int  subSize  = 0;
-
-                    switch((DaoMode)_neroTracks[1].Mode)
-                    {
-                        case DaoMode.AudioAlt:
-                        case DaoMode.Audio:
-                            track.BytesPerSector    = 2352;
-                            track.RawBytesPerSector = 2352;
-
-                            break;
-                        case DaoMode.AudioSub:
-                            track.BytesPerSector    = 2352;
-                            track.RawBytesPerSector = 2352;
-                            track.SubchannelType    = TrackSubchannelType.RawInterleaved;
-                            subSize                 = 96;
-
-                            break;
-                        case DaoMode.Data:
-                        case DaoMode.DataM2F1:
-                            track.BytesPerSector    = 2048;
-                            track.RawBytesPerSector = 2048;
-
-                            break;
-                        case DaoMode.DataM2F2:
-                            track.BytesPerSector    = 2336;
-                            track.RawBytesPerSector = 2336;
-
-                            break;
-                        case DaoMode.DataM2Raw:
-                            track.BytesPerSector    = 2352;
-                            track.RawBytesPerSector = 2352;
-                            rawMode2                = true;
-
-                            break;
-                        case DaoMode.DataM2RawSub:
-                            track.BytesPerSector    = 2352;
-                            track.RawBytesPerSector = 2352;
-                            track.SubchannelType    = TrackSubchannelType.RawInterleaved;
-                            rawMode2                = true;
-                            subSize                 = 96;
-
-                            break;
-                        case DaoMode.DataRaw:
-                            track.BytesPerSector    = 2048;
-                            track.RawBytesPerSector = 2352;
-                            rawMode1                = true;
-
-                            break;
-                        case DaoMode.DataRawSub:
-                            track.BytesPerSector    = 2048;
-                            track.RawBytesPerSector = 2352;
-                            track.SubchannelType    = TrackSubchannelType.RawInterleaved;
-                            rawMode1                = true;
-                            subSize                 = 96;
-
-                            break;
-                    }
-
-                    // Check readability of sector tags
-                    if(rawMode1 || rawMode2)
-                    {
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader) && rawMode2)
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-                    }
-
-                    if(track.SubchannelType == TrackSubchannelType.RawInterleaved)
-                    {
-                        track.SubchannelFilter = imageFilter;
-                        track.SubchannelFile   = imageFilter.Filename;
-                        track.SubchannelOffset = (ulong)(150 * (track.RawBytesPerSector + subSize));
-
-                        if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                            _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-                    }
-
-                    track.FileOffset       = (ulong)(150 * (track.RawBytesPerSector + subSize));
-                    _neroTracks[1].Offset  = track.FileOffset;
-                    _neroTracks[1].Sectors = track.EndSector - track.StartSector + 1;
-
-                    // Add to offset map
-                    _offsetmap.Add(track.Sequence, track.StartSector);
-
-                    // This is basically what MagicISO does with DVD images
-                    if(track.RawBytesPerSector == 2048)
-                    {
-                        _imageInfo.MediaType = CommonTypes.MediaType.DVDROM;
-                        track.Type           = TrackType.Data;
-                    }
-
-                    _imageInfo.Sectors = track.EndSector + 1;
-
-                    Tracks.Add(track);
-
-                    // Create partition
-                    var partition = new Partition
-                    {
-                        Description = $"Track {track.Sequence}",
-                        Length      = track.EndSector - track.StartSector + 1,
-                        Name        = StringHandlers.CToString(_neroTracks[1].Isrc),
-                        Sequence    = 1,
-                        Offset      = 0,
-                        Start       = (ulong)track.Indexes[1],
-                        Type        = track.Type.ToString()
-                    };
-
-                    partition.Size = partition.Length * _neroTracks[1].SectorSize;
-                    Partitions.Add(partition);
-
-                    Sessions.Add(new CommonTypes.Structs.Session
-                    {
-                        Sequence    = 1,
-                        StartSector = 0,
-                        StartTrack  = 1,
-                        EndTrack    = 1,
-                        EndSector   = track.EndSector
-                    });
-
-                    AaruConsole.ErrorWriteLine("Warning! This image is missing the last 150 sectors.");
-                }
-
-                // MagicISO meets these conditions when disc contains more than 15 tracks and a single session
-                if(_imageNewFormat             &&
-                   Tracks.Count > 0xF          &&
-                   moreTracksThanSessionTracks &&
-                   onlyOneSession              &&
-                   Tracks.Any(t => t.Session > 0))
-                {
-                    foreach(Track track in Tracks)
-                        track.Session = 1;
-
-                    Sessions.Clear();
-
-                    Track firstTrack = Tracks.First();
-                    Track lastTrack  = Tracks.Last();
-
-                    Sessions.Add(new CommonTypes.Structs.Session
-                    {
-                        EndSector   = lastTrack.EndSector,
-                        StartSector = firstTrack.StartSector,
-                        Sequence    = 1,
-                        EndTrack    = lastTrack.Sequence,
-                        StartTrack  = firstTrack.Sequence
-                    });
-                }
-
-                if(_trackFlags.Count > 0 &&
-                   !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-
-                _neroFilter = imageFilter;
-
-                if(_imageInfo.MediaType == CommonTypes.MediaType.Unknown ||
-                   _imageInfo.MediaType == CommonTypes.MediaType.CD)
-                {
-                    bool data       = false;
-                    bool mode2      = false;
-                    bool firstAudio = false;
-                    bool firstData  = false;
-                    bool audio      = false;
-
-                    for(int i = 0; i < _neroTracks.Count; i++)
-                    {
-                        // First track is audio
-                        firstAudio |= i == 0 && ((DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.Audio    ||
-                                                 (DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.AudioAlt ||
-                                                 (DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.AudioSub);
-
-                        // First track is data
-                        firstData |= i == 0 && (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.Audio &&
-                                     (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.AudioAlt &&
-                                     (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.AudioSub;
-
-                        // Any non first track is data
-                        data |= i != 0 && (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.Audio &&
-                                (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.AudioAlt &&
-                                (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.AudioSub;
-
-                        // Any non first track is audio
-                        audio |= i != 0 && ((DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.Audio    ||
-                                            (DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.AudioAlt ||
-                                            (DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.AudioSub);
-
-                        switch((DaoMode)_neroTracks.ElementAt(i).Value.Mode)
+                        for(int i = 0; i < newCuesheetV2.ChunkSize; i += 8)
                         {
-                            case DaoMode.DataM2F1:
-                            case DaoMode.DataM2F2:
-                            case DaoMode.DataM2Raw:
-                            case DaoMode.DataM2RawSub:
-                                mode2 = true;
+                            var entry = new CueEntryV2();
+                            _imageStream.Read(tmpBuffer, 0, 8);
+                            entry.Mode        = tmpBuffer[0];
+                            entry.TrackNumber = (byte)((((tmpBuffer[1] & 0xF0) >> 4) * 10) + (tmpBuffer[1] & 0xF));
+                            entry.IndexNumber = (byte)((((tmpBuffer[2] & 0xF0) >> 4) * 10) + (tmpBuffer[2] & 0xF));
+                            entry.Dummy       = tmpBuffer[3];
+                            entry.LbaStart    = BigEndianBitConverter.ToInt32(tmpBuffer, 4);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "Cuesheet entry {0}", (i / 8) + 1);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = 0x{1:X2}", (i / 8) + 1,
+                                                       entry.Mode);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].TrackNumber = {1:X2}",
+                                                       (i / 8) + 1, entry.TrackNumber);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].IndexNumber = {1:X2}",
+                                                       (i / 8) + 1, entry.IndexNumber);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Dummy = {1:X2}", (i / 8) + 1,
+                                                       entry.Dummy);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].LBAStart = {1}", (i / 8) + 1,
+                                                       entry.LbaStart);
+
+                            newCuesheetV2.Entries.Add(entry);
+                        }
+
+                        if(_cuesheetV2 is null)
+                            _cuesheetV2 = newCuesheetV2;
+                        else
+                            _cuesheetV2.Entries.AddRange(newCuesheetV2.Entries);
+
+                        break;
+                    }
+
+                    case NERO_DAO_V1:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"DAOI\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        _neroDaov1 = new DaoV1
+                        {
+                            ChunkId     = chunkId,
+                            ChunkSizeBe = chunkLength
+                        };
+
+                        byte[] tmpBuffer = new byte[22];
+                        _imageStream.Read(tmpBuffer, 0, 22);
+                        _neroDaov1.ChunkSizeLe = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
+                        _neroDaov1.Upc         = new byte[14];
+                        Array.Copy(tmpBuffer, 4, _neroDaov1.Upc, 0, 14);
+                        _neroDaov1.TocType    = BigEndianBitConverter.ToUInt16(tmpBuffer, 18);
+                        _neroDaov1.FirstTrack = tmpBuffer[20];
+                        _neroDaov1.LastTrack  = tmpBuffer[21];
+                        _neroDaov1.Tracks     = new List<DaoEntryV1>();
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.ChunkSizeLe = {0} bytes",
+                                                   _neroDaov1.ChunkSizeLe);
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.UPC = \"{0}\"",
+                                                   StringHandlers.CToString(_neroDaov1.Upc));
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.TocType = 0x{0:X4}",
+                                                   _neroDaov1.TocType);
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.FirstTrack = {0}",
+                                                   _neroDaov1.FirstTrack);
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV1.LastTrack = {0}",
+                                                   _neroDaov1.LastTrack);
+
+                        _upc = _neroDaov1.Upc;
+
+                        tmpBuffer = new byte[30];
+
+                        for(int i = 0; i < _neroDaov1.ChunkSizeBe - 22; i += 30)
+                        {
+                            var entry = new DaoEntryV1();
+                            _imageStream.Read(tmpBuffer, 0, 30);
+                            entry.Isrc = new byte[12];
+                            Array.Copy(tmpBuffer, 4, entry.Isrc, 0, 12);
+                            entry.SectorSize = BigEndianBitConverter.ToUInt16(tmpBuffer, 12);
+                            entry.Mode       = BitConverter.ToUInt16(tmpBuffer, 14);
+                            entry.Unknown    = BigEndianBitConverter.ToUInt16(tmpBuffer, 16);
+                            entry.Index0     = BigEndianBitConverter.ToUInt32(tmpBuffer, 18);
+                            entry.Index1     = BigEndianBitConverter.ToUInt32(tmpBuffer, 22);
+                            entry.EndOfTrack = BigEndianBitConverter.ToUInt32(tmpBuffer, 26);
+
+                            // MagicISO
+                            if(entry.SectorSize == 2352)
+                            {
+                                if(entry.Mode == 0x0000)
+                                {
+                                    corruptedTrackMode = true;
+                                    entry.Mode         = 0x0005;
+                                }
+                                else if(entry.Mode == 0x0002 ||
+                                        entry.Mode == 0x0003)
+                                {
+                                    corruptedTrackMode = true;
+                                    entry.Mode         = 0x0006;
+                                }
+                            }
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "Disc-At-Once entry {0}", (i / 32) + 1);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].ISRC = \"{1}\"", (i / 32) + 1,
+                                                       StringHandlers.CToString(entry.Isrc));
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].SectorSize = {1}",
+                                                       (i / 32) + 1, entry.SectorSize);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
+                                                       (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = 0x{1:X4}",
+                                                       (i / 32) + 1, entry.Unknown);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index0 = {1}", (i / 32) + 1,
+                                                       entry.Index0);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index1 = {1}", (i / 32) + 1,
+                                                       entry.Index1);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].EndOfTrack = {1}",
+                                                       (i / 32) + 1, entry.EndOfTrack);
+
+                            _neroDaov1.Tracks.Add(entry);
+
+                            if(entry.SectorSize > _imageInfo.SectorSize)
+                                _imageInfo.SectorSize = entry.SectorSize;
+
+                            _trackIsrCs.Add(currentTrack, entry.Isrc);
+
+                            var neroTrack = new NeroTrack
+                            {
+                                EndOfTrack = entry.EndOfTrack,
+                                Isrc       = entry.Isrc,
+                                Length     = entry.EndOfTrack - entry.Index0,
+                                Mode       = entry.Mode,
+                                Offset     = entry.Index0,
+                                SectorSize = entry.SectorSize,
+                                Index0     = entry.Index0,
+                                Index1     = entry.Index1,
+                                Sequence   = currentTrack
+                            };
+
+                            _neroTracks.Add(currentTrack, neroTrack);
+                            currentTrack++;
+                        }
+
+                        break;
+                    }
+
+                    case NERO_DAO_V2:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"DAOX\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        _neroDaov2 = new DaoV2
+                        {
+                            ChunkId     = chunkId,
+                            ChunkSizeBe = chunkLength
+                        };
+
+                        byte[] tmpBuffer = new byte[22];
+                        _imageStream.Read(tmpBuffer, 0, 22);
+                        _neroDaov2.ChunkSizeLe = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
+                        _neroDaov2.Upc         = new byte[14];
+                        Array.Copy(tmpBuffer, 4, _neroDaov2.Upc, 0, 14);
+                        _neroDaov2.TocType    = BigEndianBitConverter.ToUInt16(tmpBuffer, 18);
+                        _neroDaov2.FirstTrack = tmpBuffer[20];
+                        _neroDaov2.LastTrack  = tmpBuffer[21];
+                        _neroDaov2.Tracks     = new List<DaoEntryV2>();
+
+                        _upc = _neroDaov2.Upc;
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.ChunkSizeLe = {0} bytes",
+                                                   _neroDaov2.ChunkSizeLe);
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.UPC = \"{0}\"",
+                                                   StringHandlers.CToString(_neroDaov2.Upc));
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.TocType = 0x{0:X4}",
+                                                   _neroDaov2.TocType);
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.FirstTrack = {0}",
+                                                   _neroDaov2.FirstTrack);
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "neroDAOV2.LastTrack = {0}",
+                                                   _neroDaov2.LastTrack);
+
+                        tmpBuffer = new byte[42];
+
+                        for(int i = 0; i < _neroDaov2.ChunkSizeBe - 22; i += 42)
+                        {
+                            var entry = new DaoEntryV2();
+                            _imageStream.Read(tmpBuffer, 0, 42);
+                            entry.Isrc = new byte[12];
+                            Array.Copy(tmpBuffer, 4, entry.Isrc, 0, 12);
+                            entry.SectorSize = BigEndianBitConverter.ToUInt16(tmpBuffer, 12);
+                            entry.Mode       = BitConverter.ToUInt16(tmpBuffer, 14);
+                            entry.Unknown    = BigEndianBitConverter.ToUInt16(tmpBuffer, 16);
+                            entry.Index0     = BigEndianBitConverter.ToUInt64(tmpBuffer, 18);
+                            entry.Index1     = BigEndianBitConverter.ToUInt64(tmpBuffer, 26);
+                            entry.EndOfTrack = BigEndianBitConverter.ToUInt64(tmpBuffer, 34);
+
+                            // MagicISO
+                            if(entry.SectorSize == 2352)
+                            {
+                                if(entry.Mode == 0x0000)
+                                {
+                                    corruptedTrackMode = true;
+                                    entry.Mode         = 0x0005;
+                                }
+                                else if(entry.Mode == 0x0002 ||
+                                        entry.Mode == 0x0003)
+                                {
+                                    corruptedTrackMode = true;
+                                    entry.Mode         = 0x0006;
+                                }
+                            }
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "Disc-At-Once entry {0}", (i / 32) + 1);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].ISRC = \"{1}\"", (i / 32) + 1,
+                                                       StringHandlers.CToString(entry.Isrc));
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].SectorSize = {1}",
+                                                       (i / 32) + 1, entry.SectorSize);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
+                                                       (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = {1:X2}",
+                                                       (i / 32) + 1, entry.Unknown);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index0 = {1}", (i / 32) + 1,
+                                                       entry.Index0);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Index1 = {1}", (i / 32) + 1,
+                                                       entry.Index1);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].EndOfTrack = {1}",
+                                                       (i / 32) + 1, entry.EndOfTrack);
+
+                            _neroDaov2.Tracks.Add(entry);
+
+                            if(entry.SectorSize > _imageInfo.SectorSize)
+                                _imageInfo.SectorSize = entry.SectorSize;
+
+                            _trackIsrCs.Add(currentTrack, entry.Isrc);
+
+                            var neroTrack = new NeroTrack
+                            {
+                                EndOfTrack = entry.EndOfTrack,
+                                Isrc       = entry.Isrc,
+                                Length     = entry.EndOfTrack - entry.Index0,
+                                Mode       = entry.Mode,
+                                Offset     = entry.Index0,
+                                SectorSize = entry.SectorSize,
+                                Index0     = entry.Index0,
+                                Index1     = entry.Index1,
+                                Sequence   = currentTrack
+                            };
+
+                            _neroTracks.Add(currentTrack, neroTrack);
+
+                            currentTrack++;
+                        }
+
+                        break;
+                    }
+
+                    case NERO_CDTEXT:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"CDTX\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        _cdtxt = new CdText
+                        {
+                            ChunkId   = chunkId,
+                            ChunkSize = chunkLength,
+                            Packs     = new List<CdTextPack>()
+                        };
+
+                        byte[] tmpBuffer = new byte[18];
+
+                        for(int i = 0; i < _cdtxt.ChunkSize; i += 18)
+                        {
+                            var entry = new CdTextPack();
+                            _imageStream.Read(tmpBuffer, 0, 18);
+
+                            entry.PackType    = tmpBuffer[0];
+                            entry.TrackNumber = tmpBuffer[1];
+                            entry.PackNumber  = tmpBuffer[2];
+                            entry.BlockNumber = tmpBuffer[3];
+                            entry.Text        = new byte[12];
+                            Array.Copy(tmpBuffer, 4, entry.Text, 0, 12);
+                            entry.Crc = BigEndianBitConverter.ToUInt16(tmpBuffer, 16);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "CD-TEXT entry {0}", (i / 18) + 1);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].PackType = 0x{1:X2}",
+                                                       (i / 18) + 1, entry.PackType);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].TrackNumber = 0x{1:X2}",
+                                                       (i / 18) + 1, entry.TrackNumber);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].PackNumber = 0x{1:X2}",
+                                                       (i / 18) + 1, entry.PackNumber);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].BlockNumber = 0x{1:X2}",
+                                                       (i / 18) + 1, entry.BlockNumber);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Text = \"{1}\"", (i / 18) + 1,
+                                                       StringHandlers.CToString(entry.Text));
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].CRC = 0x{1:X4}", (i / 18) + 1,
+                                                       entry.Crc);
+
+                            _cdtxt.Packs.Add(entry);
+                        }
+
+                        break;
+                    }
+
+                    case NERO_TAO_V0:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"TINF\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        oldFormat = true;
+
+                        _taoV0 = new TaoV0
+                        {
+                            ChunkId   = chunkId,
+                            ChunkSize = chunkLength,
+                            Tracks    = new List<TaoEntryV0>()
+                        };
+
+                        byte[] tmpBuffer = new byte[12];
+
+                        for(int i = 0; i < _taoV0.ChunkSize; i += 12)
+                        {
+                            var entry = new TaoEntryV0();
+                            _imageStream.Read(tmpBuffer, 0, 12);
+
+                            entry.Offset = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
+                            entry.Length = BigEndianBitConverter.ToUInt32(tmpBuffer, 4);
+                            entry.Mode   = BigEndianBitConverter.ToUInt32(tmpBuffer, 8);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "Track-at-Once entry {0}", (i / 20) + 1);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Offset = {1}", (i / 20) + 1,
+                                                       entry.Offset);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Length = {1} bytes",
+                                                       (i / 20) + 1, entry.Length);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
+                                                       (i / 20) + 1, (DaoMode)entry.Mode, entry.Mode);
+
+                            _taoV0.Tracks.Add(entry);
+
+                            if(NeroTrackModeToBytesPerSector((DaoMode)entry.Mode) > _imageInfo.SectorSize)
+                                _imageInfo.SectorSize = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode);
+
+                            // StartLba points to INDEX 0 and Nero always introduces a pregap of 150 sectors,
+
+                            var neroTrack = new NeroTrack
+                            {
+                                EndOfTrack     = entry.Offset + entry.Length,
+                                Isrc           = new byte[12],
+                                Length         = entry.Length,
+                                Mode           = entry.Mode,
+                                Offset         = entry.Offset,
+                                SectorSize     = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode),
+                                UseLbaForIndex = true,
+                                Sequence       = currentTrack,
+                                StartLba       = currentLba > 0 ? (ulong)currentLba : 0
+                            };
+
+                            _neroTracks.Add(currentTrack, neroTrack);
+
+                            currentTrack++;
+                            currentLba += (int)(neroTrack.Length / neroTrack.SectorSize);
+                        }
+
+                        break;
+                    }
+
+                    case NERO_TAO_V1:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"ETNF\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        _taoV1 = new TaoV1
+                        {
+                            ChunkId   = chunkId,
+                            ChunkSize = chunkLength,
+                            Tracks    = new List<TaoEntryV1>()
+                        };
+
+                        byte[] tmpBuffer = new byte[20];
+
+                        for(int i = 0; i < _taoV1.ChunkSize; i += 20)
+                        {
+                            var entry = new TaoEntryV1();
+                            _imageStream.Read(tmpBuffer, 0, 20);
+
+                            entry.Offset   = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
+                            entry.Length   = BigEndianBitConverter.ToUInt32(tmpBuffer, 4);
+                            entry.Mode     = BigEndianBitConverter.ToUInt32(tmpBuffer, 8);
+                            entry.StartLba = BigEndianBitConverter.ToUInt32(tmpBuffer, 12);
+                            entry.Unknown  = BigEndianBitConverter.ToUInt32(tmpBuffer, 16);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "Track-at-Once entry {0}", (i / 20) + 1);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Offset = {1}", (i / 20) + 1,
+                                                       entry.Offset);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Length = {1} bytes",
+                                                       (i / 20) + 1, entry.Length);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
+                                                       (i / 20) + 1, (DaoMode)entry.Mode, entry.Mode);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].StartLBA = {1}", (i / 20) + 1,
+                                                       entry.StartLba);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = 0x{1:X4}",
+                                                       (i / 20) + 1, entry.Unknown);
+
+                            _taoV1.Tracks.Add(entry);
+
+                            if(NeroTrackModeToBytesPerSector((DaoMode)entry.Mode) > _imageInfo.SectorSize)
+                                _imageInfo.SectorSize = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode);
+
+                            // StartLba points to INDEX 0 and Nero always introduces a pregap of 150 sectors,
+
+                            var neroTrack = new NeroTrack
+                            {
+                                EndOfTrack     = entry.Offset + entry.Length,
+                                Isrc           = new byte[12],
+                                Length         = entry.Length,
+                                Mode           = entry.Mode,
+                                Offset         = entry.Offset,
+                                SectorSize     = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode),
+                                UseLbaForIndex = true,
+                                Sequence       = currentTrack,
+                                StartLba       = entry.StartLba
+                            };
+
+                            _neroTracks.Add(currentTrack, neroTrack);
+
+                            currentTrack++;
+                        }
+
+                        break;
+                    }
+
+                    case NERO_TAO_V2:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"ETN2\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        _taoV2 = new TaoV2
+                        {
+                            ChunkId   = chunkId,
+                            ChunkSize = chunkLength,
+                            Tracks    = new List<TaoEntryV2>()
+                        };
+
+                        byte[] tmpBuffer = new byte[32];
+
+                        for(int i = 0; i < _taoV2.ChunkSize; i += 32)
+                        {
+                            var entry = new TaoEntryV2();
+                            _imageStream.Read(tmpBuffer, 0, 32);
+
+                            entry.Offset   = BigEndianBitConverter.ToUInt64(tmpBuffer, 0);
+                            entry.Length   = BigEndianBitConverter.ToUInt64(tmpBuffer, 8);
+                            entry.Mode     = BigEndianBitConverter.ToUInt32(tmpBuffer, 16);
+                            entry.StartLba = BigEndianBitConverter.ToUInt32(tmpBuffer, 20);
+                            entry.Unknown  = BigEndianBitConverter.ToUInt32(tmpBuffer, 24);
+                            entry.Sectors  = BigEndianBitConverter.ToUInt32(tmpBuffer, 28);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "Track-at-Once entry {0}", (i / 32) + 1);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Offset = {1}", (i / 32) + 1,
+                                                       entry.Offset);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Length = {1} bytes",
+                                                       (i / 32) + 1, entry.Length);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Mode = {1} (0x{2:X4})",
+                                                       (i / 32) + 1, (DaoMode)entry.Mode, entry.Mode);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].StartLBA = {1}", (i / 32) + 1,
+                                                       entry.StartLba);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Unknown = 0x{1:X4}",
+                                                       (i / 32) + 1, entry.Unknown);
+
+                            AaruConsole.DebugWriteLine("Nero plugin", "\t _entry[{0}].Sectors = {1}", (i / 32) + 1,
+                                                       entry.Sectors);
+
+                            _taoV2.Tracks.Add(entry);
+
+                            ushort v2Bps = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode);
+
+                            if(NeroTrackModeToBytesPerSector((DaoMode)entry.Mode) > _imageInfo.SectorSize)
+                                _imageInfo.SectorSize = v2Bps;
+
+                            // StartLba points to INDEX 1 and Nero always introduces a pregap of 150 sectors,
+                            // so let's move it to INDEX 0 and fix the pointers
+                            if(entry.StartLba >= 150)
+                            {
+                                entry.StartLba -= 150;
+                                entry.Offset   -= (ulong)(150 * v2Bps);
+                                entry.Length   += (ulong)(150 * v2Bps);
+                            }
+
+                            var neroTrack = new NeroTrack
+                            {
+                                EndOfTrack     = entry.Offset + entry.Length,
+                                Isrc           = new byte[12],
+                                Length         = entry.Length,
+                                Mode           = entry.Mode,
+                                Offset         = entry.Offset,
+                                StartLba       = entry.StartLba,
+                                UseLbaForIndex = true,
+                                SectorSize     = NeroTrackModeToBytesPerSector((DaoMode)entry.Mode),
+                                Sequence       = currentTrack
+                            };
+
+                            _neroTracks.Add(currentTrack, neroTrack);
+
+                            currentTrack++;
+                        }
+
+                        break;
+                    }
+
+                    case NERO_SESSION:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"SINF\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        byte[] tmpBuffer = new byte[4];
+                        _imageStream.Read(tmpBuffer, 0, 4);
+                        uint sessionTracks = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
+                        _neroSessions.Add(currentSession, sessionTracks);
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "\tSession {0} has {1} tracks", currentSession,
+                                                   sessionTracks);
+
+                        currentSession++;
+
+                        break;
+                    }
+
+                    case NERO_DISC_TYPE:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"MTYP\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        _mediaType = new MediaType
+                        {
+                            ChunkId   = chunkId,
+                            ChunkSize = chunkLength
+                        };
+
+                        byte[] tmpBuffer = new byte[4];
+                        _imageStream.Read(tmpBuffer, 0, 4);
+                        _mediaType.Type = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "\tMedia type is {0} ({1})",
+                                                   (NeroMediaTypes)_mediaType.Type, _mediaType.Type);
+
+                        _imageInfo.MediaType = NeroMediaTypeToMediaType((NeroMediaTypes)_mediaType.Type);
+
+                        break;
+                    }
+
+                    case NERO_DISC_INFO:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"DINF\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        _discInfo = new DiscInformation
+                        {
+                            ChunkId   = chunkId,
+                            ChunkSize = chunkLength
+                        };
+
+                        byte[] tmpBuffer = new byte[4];
+                        _imageStream.Read(tmpBuffer, 0, 4);
+                        _discInfo.Unknown = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "\tneroDiscInfo.Unknown = 0x{0:X4} ({0})",
+                                                   _discInfo.Unknown);
+
+                        break;
+                    }
+
+                    case NERO_RELOCATION:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"RELO\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        _relo = new ReloChunk
+                        {
+                            ChunkId   = chunkId,
+                            ChunkSize = chunkLength
+                        };
+
+                        byte[] tmpBuffer = new byte[4];
+                        _imageStream.Read(tmpBuffer, 0, 4);
+                        _relo.Unknown = BigEndianBitConverter.ToUInt32(tmpBuffer, 0);
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "\tneroRELO.Unknown = 0x{0:X4} ({0})",
+                                                   _relo.Unknown);
+
+                        break;
+                    }
+
+                    case NERO_TOC:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"TOCT\" chunk, parsing {0} bytes",
+                                                   chunkLength);
+
+                        _toc = new TocChunk
+                        {
+                            ChunkId   = chunkId,
+                            ChunkSize = chunkLength
+                        };
+
+                        byte[] tmpBuffer = new byte[2];
+                        _imageStream.Read(tmpBuffer, 0, 2);
+                        _toc.Unknown = BigEndianBitConverter.ToUInt16(tmpBuffer, 0);
+
+                        switch(tmpBuffer[0])
+                        {
+                            case 0:
+                                _imageInfo.MediaType = CommonTypes.MediaType.CDROM;
+
+                                break;
+                            case 0x10:
+                                _imageInfo.MediaType = CommonTypes.MediaType.CDI;
+
+                                break;
+                            case 0x20:
+                                _imageInfo.MediaType = CommonTypes.MediaType.CDROMXA;
 
                                 break;
                         }
+
+                        AaruConsole.DebugWriteLine("Nero plugin", "\tneroTOC.Unknown = 0x{0:X4} ({0})",
+                                                   _toc.Unknown);
+
+                        break;
                     }
 
-                    if(!data &&
-                       !firstData)
-                        _imageInfo.MediaType = CommonTypes.MediaType.CDDA;
-                    else if(firstAudio         &&
-                            data               &&
-                            Sessions.Count > 1 &&
-                            mode2)
-                        _imageInfo.MediaType = CommonTypes.MediaType.CDPLUS;
-                    else if((firstData && audio) || mode2)
-                        _imageInfo.MediaType = CommonTypes.MediaType.CDROMXA;
-                    else if(!audio)
-                        _imageInfo.MediaType = CommonTypes.MediaType.CDROM;
-                    else
-                        _imageInfo.MediaType = CommonTypes.MediaType.CD;
-                }
-
-                _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
-                AaruConsole.VerboseWriteLine("Nero image contains a disc of type {0}", _imageInfo.MediaType);
-
-                _sectorBuilder = new SectorBuilder();
-
-                _isCd = _imageInfo.MediaType == CommonTypes.MediaType.CD            ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDDA          ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDG           ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDEG          ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDI           ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDROM         ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDROMXA       ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDPLUS        ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDMO          ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDR           ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDRW          ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDMRW         ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.VCD           ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.SVCD          ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.PCD           ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.DTSCD         ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDMIDI        ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDV           ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDIREADY      ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.FMTOWNS       ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.PS1CD         ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.PS2CD         ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.MEGACD        ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.SATURNCD      ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.GDROM         ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.GDR           ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.MilCD         ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.SuperCDROM2   ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.JaguarCD      ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.ThreeDO       ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.PCFX          ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.NeoGeoCD      ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CDTV          ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CD32          ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.Playdia       ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.Pippin        ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.VideoNow      ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.VideoNowColor ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.VideoNowXp    ||
-                        _imageInfo.MediaType == CommonTypes.MediaType.CVD;
-
-                if(_isCd)
-                    return ErrorNumber.NoError;
-
-                foreach(Track track in Tracks)
-                {
-                    track.Pregap = 0;
-                    track.Indexes?.Clear();
-                }
-
-                _imageInfo.ReadableMediaTags.Remove(MediaTagType.CD_MCN);
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackIsrc);
-                _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackFlags);
-
-                return ErrorNumber.NoError;
-            }
-            catch
-            {
-                AaruConsole.DebugWrite("Nero plugin", "Exception occurred opening file.");
-
-                return ErrorNumber.UnexpectedException;
-            }
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            switch(tag)
-            {
-                case MediaTagType.CD_MCN:
-                    buffer = _upc?.Clone() as byte[];
-
-                    return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-
-                case MediaTagType.CD_TEXT: return ErrorNumber.NotImplemented;
-                default:                   return ErrorNumber.NotSupported;
-            }
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress   - kvp.Value <=
-                                                           track.EndSector - track.StartSector select kvp)
-                return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress   - kvp.Value <=
-                                                           track.EndSector - track.StartSector select kvp)
-            {
-                return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
-
-                return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
-            }
-
-            return ErrorNumber.SectorNotFound;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(!_neroTracks.TryGetValue(track, out NeroTrack aaruTrack))
-                return ErrorNumber.SectorNotFound;
-
-            if(length > aaruTrack.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-            bool mode2 = false;
-
-            switch((DaoMode)aaruTrack.Mode)
-            {
-                case DaoMode.Data:
-                case DaoMode.DataM2F1:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2048;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                case DaoMode.DataM2F2:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2336;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                case DaoMode.Audio:
-                case DaoMode.AudioAlt:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                case DaoMode.DataRaw:
-                {
-                    sectorOffset = 16;
-                    sectorSize   = 2048;
-                    sectorSkip   = 288;
-
-                    break;
-                }
-
-                case DaoMode.DataM2Raw:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                case DaoMode.DataRawSub:
-                {
-                    sectorOffset = 16;
-                    sectorSize   = 2048;
-                    sectorSkip   = 288 + 96;
-
-                    break;
-                }
-
-                case DaoMode.DataM2RawSub:
-                {
-                    mode2        = true;
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 96;
-
-                    break;
-                }
-
-                case DaoMode.AudioSub:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 96;
-
-                    break;
-                }
-
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            _imageStream = _neroFilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(mode2)
-            {
-                var mode2Ms = new MemoryStream((int)(sectorSize * length));
-
-                buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length));
-
-                for(int i = 0; i < length; i++)
-                {
-                    byte[] sector = new byte[sectorSize];
-                    Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize);
-                    sector = Sector.GetUserData(sector);
-                    mode2Ms.Write(sector, 0, sector.Length);
-                }
-
-                buffer = mode2Ms.ToArray();
-            }
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
-        {
-            buffer = null;
-
-            if(tag == SectorTagType.CdTrackFlags ||
-               tag == SectorTagType.CdTrackIsrc)
-                track = (uint)sectorAddress;
-
-            if(!_neroTracks.TryGetValue(track, out NeroTrack aaruTrack))
-                return ErrorNumber.SectorNotFound;
-
-            if(length > aaruTrack.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch(tag)
-            {
-                case SectorTagType.CdSectorEcc:
-                case SectorTagType.CdSectorEccP:
-                case SectorTagType.CdSectorEccQ:
-                case SectorTagType.CdSectorEdc:
-                case SectorTagType.CdSectorHeader:
-                case SectorTagType.CdSectorSubchannel:
-                case SectorTagType.CdSectorSubHeader:
-                case SectorTagType.CdSectorSync: break;
-                case SectorTagType.CdTrackFlags:
-                    if(!_trackFlags.TryGetValue(track, out byte flag))
-                        return ErrorNumber.NoData;
-
-                    buffer = new[]
+                    case NERO_END:
                     {
-                        flag
+                        AaruConsole.DebugWriteLine("Nero plugin", "Found \"END!\" chunk, finishing parse");
+                        parsing = false;
+
+                        break;
+                    }
+
+                    default:
+                    {
+                        AaruConsole.DebugWriteLine("Nero plugin", "Unknown chunk ID \"{0}\", skipping...",
+                                                   Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                                GetBytes(chunkId)));
+
+                        _imageStream.Seek(chunkLength, SeekOrigin.Current);
+
+                        break;
+                    }
+                }
+            }
+
+            if(corruptedTrackMode)
+                AaruConsole.
+                    ErrorWriteLine("Inconsistent track mode and track sector size found. A best try to fix has been done. It is recommended this disc is dumped with another software.");
+
+            _imageInfo.HasPartitions         = true;
+            _imageInfo.HasSessions           = true;
+            _imageInfo.Creator               = null;
+            _imageInfo.CreationTime          = imageFilter.CreationTime;
+            _imageInfo.LastModificationTime  = imageFilter.LastWriteTime;
+            _imageInfo.MediaTitle            = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+            _imageInfo.Comments              = null;
+            _imageInfo.MediaManufacturer     = null;
+            _imageInfo.MediaModel            = null;
+            _imageInfo.MediaSerialNumber     = null;
+            _imageInfo.MediaBarcode          = null;
+            _imageInfo.MediaPartNumber       = null;
+            _imageInfo.DriveManufacturer     = null;
+            _imageInfo.DriveModel            = null;
+            _imageInfo.DriveSerialNumber     = null;
+            _imageInfo.DriveFirmwareRevision = null;
+            _imageInfo.MediaSequence         = 0;
+            _imageInfo.LastMediaSequence     = 0;
+
+            _imageInfo.Application = "Nero Burning ROM";
+
+            if(_imageNewFormat)
+            {
+                _imageInfo.ImageSize          = footerV2.FirstChunkOffset;
+                _imageInfo.Version            = "Nero Burning ROM >= 5.5";
+                _imageInfo.ApplicationVersion = ">= 5.5";
+            }
+            else if(oldFormat)
+            {
+                _imageInfo.ImageSize          = footerV1.FirstChunkOffset;
+                _imageInfo.Version            = "Nero Burning ROM 4";
+                _imageInfo.ApplicationVersion = "4";
+            }
+            else
+            {
+                _imageInfo.ImageSize          = footerV1.FirstChunkOffset;
+                _imageInfo.Version            = "Nero Burning ROM <= 5.0";
+                _imageInfo.ApplicationVersion = "<= 5.0";
+            }
+
+            if(_neroSessions.Count == 0)
+                _neroSessions.Add(1, currentTrack);
+
+            AaruConsole.DebugWriteLine("Nero plugin", "Building offset, track and session maps");
+
+            bool onlyOneSession = currentSession == 1 || currentSession == 2;
+            currentSession = 1;
+            _neroSessions.TryGetValue(1, out uint currentSessionMaxTrack);
+            uint  currentSessionCurrentTrack = 1;
+            var   currentSessionStruct       = new CommonTypes.Structs.Session();
+            ulong partitionSequence          = 0;
+            ulong partitionStartByte         = 0;
+            int   trackCounter               = 1;
+            _trackFlags = new Dictionary<uint, byte>();
+
+            if(currentSessionMaxTrack == 0)
+                currentSessionMaxTrack = 1;
+
+            bool moreTracksThanSessionTracks = currentSessionMaxTrack < _neroTracks.Count;
+
+            // Process tracks
+            foreach(NeroTrack neroTrack in _neroTracks.Values)
+            {
+                if(neroTrack.Offset >= (_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset))
+                {
+                    AaruConsole.
+                        ErrorWriteLine("This image contains a track that is set to start outside the file.");
+
+                    AaruConsole.ErrorWriteLine("Breaking track processing and trying recovery of information.");
+
+                    break;
+                }
+
+                AaruConsole.DebugWriteLine("Nero plugin", "\tcurrentSession = {0}", currentSession);
+                AaruConsole.DebugWriteLine("Nero plugin", "\tcurrentSessionMaxTrack = {0}", currentSessionMaxTrack);
+
+                AaruConsole.DebugWriteLine("Nero plugin", "\tcurrentSessionCurrentTrack = {0}",
+                                           currentSessionCurrentTrack);
+
+                var track = new Track();
+
+                // Process indexes
+                if(_cuesheetV1?.Entries?.Count > 0)
+                    foreach(CueEntryV1 entry in _cuesheetV1.Entries.Where(e => e.TrackNumber == neroTrack.Sequence).
+                                                            OrderBy(e => e.IndexNumber))
+                    {
+                        track.Indexes[entry.IndexNumber] =
+                            (entry.Minute * 60 * 75) + (entry.Second * 75) + entry.Frame - 150;
+
+                        _trackFlags[entry.TrackNumber] = (byte)((entry.Mode & 0xF0) >> 4);
+                    }
+                else if(_cuesheetV2?.Entries?.Count > 0)
+                    foreach(CueEntryV2 entry in _cuesheetV2.Entries.Where(e => e.TrackNumber == neroTrack.Sequence).
+                                                            OrderBy(e => e.IndexNumber))
+                    {
+                        track.Indexes[entry.IndexNumber] = entry.LbaStart;
+                        _trackFlags[entry.TrackNumber]   = (byte)((entry.Mode & 0xF0) >> 4);
+                    }
+
+                // Act if there are no indexes
+                if(track.Indexes.Count == 0)
+                {
+                    if(!neroTrack.UseLbaForIndex)
+                        continue; // This track start is unknown, continue and pray the goddess
+
+                    // This always happens in TAO discs and Nero uses 150 sectors of pregap for them
+                    // but we need to move the offsets if it's the first track of a session
+                    if(currentSessionCurrentTrack == 1)
+                    {
+                        track.Indexes[1] =  (int)neroTrack.StartLba;
+                        track.Indexes[0] =  track.Indexes[1] - 150;
+                        neroTrack.Offset -= (ulong)(150 * neroTrack.SectorSize);
+                        neroTrack.Length += (ulong)(150 * neroTrack.SectorSize);
+                    }
+                    else
+                    {
+                        track.Indexes[0] = (int)neroTrack.StartLba;
+                        track.Indexes[1] = track.Indexes[0] + 150;
+                    }
+                }
+
+                // Prevent duplicate index 0
+                if(track.Indexes.ContainsKey(0) &&
+                   track.Indexes[0] == track.Indexes[1])
+                    track.Indexes.Remove(0);
+
+                // There's a pregap
+                if(track.Indexes.ContainsKey(0))
+                {
+                    track.Pregap = (ulong)(track.Indexes[1] - track.Indexes[0]);
+
+                    // Negative pregap, skip it
+                    if(track.Indexes[0] < 0)
+                    {
+                        neroTrack.Length  -= track.Pregap * neroTrack.SectorSize;
+                        neroTrack.Offset  += track.Pregap * neroTrack.SectorSize;
+                        track.StartSector =  (ulong)track.Indexes[1];
+                    }
+                    else
+                        track.StartSector = (ulong)track.Indexes[0];
+                }
+                else
+                    track.StartSector = (ulong)track.Indexes[1];
+
+                // Handle hidden tracks
+                if(neroTrack.Sequence == 1 &&
+                   track.StartSector  > 0)
+                {
+                    neroTrack.Length  += track.StartSector * neroTrack.SectorSize;
+                    neroTrack.Offset  -= track.StartSector * neroTrack.SectorSize;
+                    track.StartSector =  0;
+                }
+
+                // Common track data
+                track.Description    = StringHandlers.CToString(neroTrack.Isrc);
+                track.EndSector      = (neroTrack.Length / neroTrack.SectorSize) + track.StartSector - 1;
+                track.Sequence       = neroTrack.Sequence;
+                track.Session        = currentSession;
+                track.Type           = NeroTrackModeToTrackType((DaoMode)neroTrack.Mode);
+                track.File           = imageFilter.Filename;
+                track.Filter         = imageFilter;
+                track.FileOffset     = neroTrack.Offset;
+                track.FileType       = "BINARY";
+                track.SubchannelType = TrackSubchannelType.None;
+                neroTrack.Sectors    = neroTrack.Length / neroTrack.SectorSize;
+
+                // Flags not set for this track
+                if(!_trackFlags.ContainsKey(track.Sequence))
+                {
+                    switch(track.Type)
+                    {
+                        case TrackType.Audio:
+                            _trackFlags[track.Sequence] = 0;
+
+                            break;
+                        case TrackType.Data:
+                        case TrackType.CdMode1:
+                        case TrackType.CdMode2Formless:
+                        case TrackType.CdMode2Form1:
+                        case TrackType.CdMode2Form2:
+                            _trackFlags[track.Sequence] = 4;
+
+                            break;
+                    }
+                }
+
+                // If ISRC is not empty
+                if(!string.IsNullOrWhiteSpace(track.Description))
+                {
+                    _trackIsrCs[neroTrack.Sequence] = neroTrack.Isrc;
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackIsrc))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackIsrc);
+                }
+
+                bool rawMode1 = false;
+                bool rawMode2 = false;
+
+                switch((DaoMode)neroTrack.Mode)
+                {
+                    case DaoMode.AudioAlt:
+                    case DaoMode.Audio:
+                        track.BytesPerSector    = 2352;
+                        track.RawBytesPerSector = 2352;
+
+                        break;
+                    case DaoMode.AudioSub:
+                        track.BytesPerSector    = 2352;
+                        track.RawBytesPerSector = 2352;
+                        track.SubchannelType    = TrackSubchannelType.RawInterleaved;
+
+                        break;
+                    case DaoMode.Data:
+                    case DaoMode.DataM2F1:
+                        track.BytesPerSector    = 2048;
+                        track.RawBytesPerSector = 2048;
+
+                        break;
+                    case DaoMode.DataM2F2:
+                        track.BytesPerSector    = 2336;
+                        track.RawBytesPerSector = 2336;
+
+                        break;
+                    case DaoMode.DataM2Raw:
+                        track.BytesPerSector    = 2352;
+                        track.RawBytesPerSector = 2352;
+                        rawMode2                = true;
+
+                        break;
+                    case DaoMode.DataM2RawSub:
+                        track.BytesPerSector    = 2352;
+                        track.RawBytesPerSector = 2352;
+                        track.SubchannelType    = TrackSubchannelType.RawInterleaved;
+                        rawMode2                = true;
+
+                        break;
+                    case DaoMode.DataRaw:
+                        track.BytesPerSector    = 2048;
+                        track.RawBytesPerSector = 2352;
+                        rawMode1                = true;
+
+                        break;
+                    case DaoMode.DataRawSub:
+                        track.BytesPerSector    = 2048;
+                        track.RawBytesPerSector = 2352;
+                        track.SubchannelType    = TrackSubchannelType.RawInterleaved;
+                        rawMode1                = true;
+
+                        break;
+                }
+
+                AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.Description = {0}", track.Description);
+
+                AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.EndSector = {0}", track.EndSector);
+                AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.Pregap = {0}", track.Pregap);
+                AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.Sequence = {0}", track.Sequence);
+                AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.Session = {0}", track.Session);
+
+                AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.StartSector = {0}", track.StartSector);
+
+                AaruConsole.DebugWriteLine("Nero plugin", "\t\t _track.Type = {0}", track.Type);
+
+                // Check readability of sector tags
+                if(rawMode1 || rawMode2)
+                {
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader) && rawMode2)
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+                }
+
+                if(track.SubchannelType == TrackSubchannelType.RawInterleaved)
+                {
+                    track.SubchannelFilter = imageFilter;
+                    track.SubchannelFile   = imageFilter.Filename;
+                    track.SubchannelOffset = neroTrack.Offset;
+
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+                }
+
+                Tracks.Add(track);
+
+                // Build session
+                if(currentSessionCurrentTrack == 1)
+                    currentSessionStruct = new CommonTypes.Structs.Session
+                    {
+                        Sequence    = currentSession,
+                        StartSector = track.StartSector,
+                        StartTrack  = track.Sequence
                     };
 
-                    return ErrorNumber.NoError;
-                case SectorTagType.CdTrackIsrc:
-                    buffer = aaruTrack.Isrc;
+                currentSessionCurrentTrack++;
 
-                    return ErrorNumber.NoError;
-                case SectorTagType.CdTrackText: return ErrorNumber.NotImplemented;
-                default:                        return ErrorNumber.NotSupported;
+                if(currentSessionCurrentTrack > currentSessionMaxTrack)
+                {
+                    currentSession++;
+                    _neroSessions.TryGetValue(currentSession, out currentSessionMaxTrack);
+                    currentSessionCurrentTrack     = 1;
+                    currentSessionStruct.EndTrack  = track.Sequence;
+                    currentSessionStruct.EndSector = track.EndSector;
+                    Sessions.Add(currentSessionStruct);
+                }
+                else if(trackCounter == _neroTracks.Count)
+                {
+                    _neroSessions.TryGetValue(currentSession, out currentSessionMaxTrack);
+                    currentSessionCurrentTrack     = 1;
+                    currentSessionStruct.EndTrack  = track.Sequence;
+                    currentSessionStruct.EndSector = track.EndSector;
+                    Sessions.Add(currentSessionStruct);
+                }
+
+                // Add to offset map
+                _offsetmap.Add(track.Sequence, track.StartSector);
+
+                AaruConsole.DebugWriteLine("Nero plugin", "\t\t Offset[{0}]: {1}", track.Sequence,
+                                           track.StartSector);
+
+                // Create partition
+                var partition = new Partition
+                {
+                    Description = $"Track {track.Sequence}",
+                    Size        = neroTrack.EndOfTrack - neroTrack.Index1,
+                    Name        = StringHandlers.CToString(neroTrack.Isrc),
+                    Sequence    = partitionSequence,
+                    Offset      = partitionStartByte,
+                    Start       = (ulong)track.Indexes[1],
+                    Type        = NeroTrackModeToTrackType((DaoMode)neroTrack.Mode).ToString()
+                };
+
+                partition.Length = partition.Size / neroTrack.SectorSize;
+                Partitions.Add(partition);
+                partitionSequence++;
+                partitionStartByte += partition.Size;
+
+                if(track.EndSector + 1 > _imageInfo.Sectors)
+                    _imageInfo.Sectors = track.EndSector + 1;
+
+                trackCounter++;
             }
 
-            switch((DaoMode)aaruTrack.Mode)
+            if(Tracks.Count == 0)
             {
-                case DaoMode.Data:
-                case DaoMode.DataM2F1: return ErrorNumber.NoData;
-                case DaoMode.DataM2F2:
+                if(_neroTracks.Count != 1      ||
+                   !_neroTracks.ContainsKey(1) ||
+                   (_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset) %
+                   _neroTracks[1].SectorSize != 0)
                 {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        case SectorTagType.CdSectorHeader:
-                        case SectorTagType.CdSectorSubchannel:
-                        case SectorTagType.CdSectorEcc:
-                        case SectorTagType.CdSectorEccP:
-                        case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328;
+                    AaruConsole.ErrorWriteLine("Image corrupted beyond recovery, cannot open.");
 
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2332;
-                            sectorSize   = 4;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
+                    return ErrorNumber.InvalidArgument;
                 }
 
-                case DaoMode.Audio:
-                case DaoMode.AudioAlt: return ErrorNumber.NoData;
-                case DaoMode.DataRaw:
+                var track = new Track();
+
+                // Common track data
+                track.Description = StringHandlers.CToString(_neroTracks[1].Isrc);
+
+                track.EndSector = ((_imageNewFormat ? footerV2.FirstChunkOffset : footerV1.FirstChunkOffset) /
+                                   _neroTracks[1].SectorSize) - 150;
+
+                track.Sequence       = _neroTracks[1].Sequence;
+                track.Session        = currentSession;
+                track.Type           = NeroTrackModeToTrackType((DaoMode)_neroTracks[1].Mode);
+                track.File           = imageFilter.Filename;
+                track.Filter         = imageFilter;
+                track.FileType       = "BINARY";
+                track.SubchannelType = TrackSubchannelType.None;
+                track.Indexes[1]     = 0;
+
+                bool rawMode1 = false;
+                bool rawMode2 = false;
+                int  subSize  = 0;
+
+                switch((DaoMode)_neroTracks[1].Mode)
                 {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340;
+                    case DaoMode.AudioAlt:
+                    case DaoMode.Audio:
+                        track.BytesPerSector    = 2352;
+                        track.RawBytesPerSector = 2352;
 
-                            break;
-                        }
+                        break;
+                    case DaoMode.AudioSub:
+                        track.BytesPerSector    = 2352;
+                        track.RawBytesPerSector = 2352;
+                        track.SubchannelType    = TrackSubchannelType.RawInterleaved;
+                        subSize                 = 96;
 
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336;
+                        break;
+                    case DaoMode.Data:
+                    case DaoMode.DataM2F1:
+                        track.BytesPerSector    = 2048;
+                        track.RawBytesPerSector = 2048;
 
-                            break;
-                        }
+                        break;
+                    case DaoMode.DataM2F2:
+                        track.BytesPerSector    = 2336;
+                        track.RawBytesPerSector = 2336;
 
-                        case SectorTagType.CdSectorSubchannel:
-                        case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0;
+                        break;
+                    case DaoMode.DataM2Raw:
+                        track.BytesPerSector    = 2352;
+                        track.RawBytesPerSector = 2352;
+                        rawMode2                = true;
 
-                            break;
-                        }
+                        break;
+                    case DaoMode.DataM2RawSub:
+                        track.BytesPerSector    = 2352;
+                        track.RawBytesPerSector = 2352;
+                        track.SubchannelType    = TrackSubchannelType.RawInterleaved;
+                        rawMode2                = true;
+                        subSize                 = 96;
 
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104;
+                        break;
+                    case DaoMode.DataRaw:
+                        track.BytesPerSector    = 2048;
+                        track.RawBytesPerSector = 2352;
+                        rawMode1                = true;
 
-                            break;
-                        }
+                        break;
+                    case DaoMode.DataRawSub:
+                        track.BytesPerSector    = 2048;
+                        track.RawBytesPerSector = 2352;
+                        track.SubchannelType    = TrackSubchannelType.RawInterleaved;
+                        rawMode1                = true;
+                        subSize                 = 96;
 
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2064;
-                            sectorSize   = 4;
-                            sectorSkip   = 284;
-
-                            break;
-                        }
-
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
+                        break;
                 }
 
-                case DaoMode.DataM2RawSub:
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340 + 96;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336 + 96;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubHeader:
-                        {
-                            sectorOffset = 16;
-                            sectorSize   = 8;
-                            sectorSkip   = 2328 + 96;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2348;
-                            sectorSize   = 4;
-                            sectorSkip   = 0 + 96;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            sectorOffset = 2352;
-                            sectorSize   = 96;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
-                case DaoMode.DataRawSub:
+                // Check readability of sector tags
+                if(rawMode1 || rawMode2)
                 {
-                    switch(tag)
-                    {
-                        case SectorTagType.CdSectorSync:
-                        {
-                            sectorOffset = 0;
-                            sectorSize   = 12;
-                            sectorSkip   = 2340 + 96;
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
 
-                            break;
-                        }
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
 
-                        case SectorTagType.CdSectorHeader:
-                        {
-                            sectorOffset = 12;
-                            sectorSize   = 4;
-                            sectorSkip   = 2336 + 96;
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader) && rawMode2)
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
 
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubchannel:
-                        {
-                            sectorOffset = 2352;
-                            sectorSize   = 96;
-                            sectorSkip   = 0;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                        case SectorTagType.CdSectorEcc:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 276;
-                            sectorSkip   = 0 + 96;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEccP:
-                        {
-                            sectorOffset = 2076;
-                            sectorSize   = 172;
-                            sectorSkip   = 104 + 96;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEccQ:
-                        {
-                            sectorOffset = 2248;
-                            sectorSize   = 104;
-                            sectorSkip   = 0 + 96;
-
-                            break;
-                        }
-
-                        case SectorTagType.CdSectorEdc:
-                        {
-                            sectorOffset = 2064;
-                            sectorSize   = 4;
-                            sectorSkip   = 284 + 96;
-
-                            break;
-                        }
-
-                        default: return ErrorNumber.NotSupported;
-                    }
-
-                    break;
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
                 }
 
-                case DaoMode.AudioSub:
+                if(track.SubchannelType == TrackSubchannelType.RawInterleaved)
                 {
-                    if(tag != SectorTagType.CdSectorSubchannel)
-                        return ErrorNumber.NotSupported;
+                    track.SubchannelFilter = imageFilter;
+                    track.SubchannelFile   = imageFilter.Filename;
+                    track.SubchannelOffset = (ulong)(150 * (track.RawBytesPerSector + subSize));
 
-                    sectorOffset = 2352;
-                    sectorSize   = 96;
-                    sectorSkip   = 0;
-
-                    break;
+                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
                 }
 
-                default: return ErrorNumber.NotSupported;
+                track.FileOffset       = (ulong)(150 * (track.RawBytesPerSector + subSize));
+                _neroTracks[1].Offset  = track.FileOffset;
+                _neroTracks[1].Sectors = track.EndSector - track.StartSector + 1;
+
+                // Add to offset map
+                _offsetmap.Add(track.Sequence, track.StartSector);
+
+                // This is basically what MagicISO does with DVD images
+                if(track.RawBytesPerSector == 2048)
+                {
+                    _imageInfo.MediaType = CommonTypes.MediaType.DVDROM;
+                    track.Type           = TrackType.Data;
+                }
+
+                _imageInfo.Sectors = track.EndSector + 1;
+
+                Tracks.Add(track);
+
+                // Create partition
+                var partition = new Partition
+                {
+                    Description = $"Track {track.Sequence}",
+                    Length      = track.EndSector - track.StartSector + 1,
+                    Name        = StringHandlers.CToString(_neroTracks[1].Isrc),
+                    Sequence    = 1,
+                    Offset      = 0,
+                    Start       = (ulong)track.Indexes[1],
+                    Type        = track.Type.ToString()
+                };
+
+                partition.Size = partition.Length * _neroTracks[1].SectorSize;
+                Partitions.Add(partition);
+
+                Sessions.Add(new CommonTypes.Structs.Session
+                {
+                    Sequence    = 1,
+                    StartSector = 0,
+                    StartTrack  = 1,
+                    EndTrack    = 1,
+                    EndSector   = track.EndSector
+                });
+
+                AaruConsole.ErrorWriteLine("Warning! This image is missing the last 150 sectors.");
             }
 
-            buffer = new byte[sectorSize * length];
+            // MagicISO meets these conditions when disc contains more than 15 tracks and a single session
+            if(_imageNewFormat             &&
+               Tracks.Count > 0xF          &&
+               moreTracksThanSessionTracks &&
+               onlyOneSession              &&
+               Tracks.Any(t => t.Session > 0))
+            {
+                foreach(Track track in Tracks)
+                    track.Session = 1;
 
-            _imageStream = _neroFilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
+                Sessions.Clear();
 
-            br.BaseStream.
-               Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
+                Track firstTrack = Tracks.First();
+                Track lastTrack  = Tracks.Last();
 
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
+                Sessions.Add(new CommonTypes.Structs.Session
                 {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+                    EndSector   = lastTrack.EndSector,
+                    StartSector = firstTrack.StartSector,
+                    Sequence    = 1,
+                    EndTrack    = lastTrack.Sequence,
+                    StartTrack  = firstTrack.Sequence
+                });
+            }
+
+            if(_trackFlags.Count > 0 &&
+               !_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+
+            _neroFilter = imageFilter;
+
+            if(_imageInfo.MediaType == CommonTypes.MediaType.Unknown ||
+               _imageInfo.MediaType == CommonTypes.MediaType.CD)
+            {
+                bool data       = false;
+                bool mode2      = false;
+                bool firstAudio = false;
+                bool firstData  = false;
+                bool audio      = false;
+
+                for(int i = 0; i < _neroTracks.Count; i++)
+                {
+                    // First track is audio
+                    firstAudio |= i == 0 && ((DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.Audio    ||
+                                             (DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.AudioAlt ||
+                                             (DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.AudioSub);
+
+                    // First track is data
+                    firstData |= i == 0 && (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.Audio &&
+                                 (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.AudioAlt &&
+                                 (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.AudioSub;
+
+                    // Any non first track is data
+                    data |= i != 0 && (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.Audio &&
+                            (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.AudioAlt &&
+                            (DaoMode)_neroTracks.ElementAt(i).Value.Mode != DaoMode.AudioSub;
+
+                    // Any non first track is audio
+                    audio |= i != 0 && ((DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.Audio    ||
+                                        (DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.AudioAlt ||
+                                        (DaoMode)_neroTracks.ElementAt(i).Value.Mode == DaoMode.AudioSub);
+
+                    switch((DaoMode)_neroTracks.ElementAt(i).Value.Mode)
+                    {
+                        case DaoMode.DataM2F1:
+                        case DaoMode.DataM2F2:
+                        case DaoMode.DataM2Raw:
+                        case DaoMode.DataM2RawSub:
+                            mode2 = true;
+
+                            break;
+                    }
                 }
 
+                if(!data &&
+                   !firstData)
+                    _imageInfo.MediaType = CommonTypes.MediaType.CDDA;
+                else if(firstAudio         &&
+                        data               &&
+                        Sessions.Count > 1 &&
+                        mode2)
+                    _imageInfo.MediaType = CommonTypes.MediaType.CDPLUS;
+                else if((firstData && audio) || mode2)
+                    _imageInfo.MediaType = CommonTypes.MediaType.CDROMXA;
+                else if(!audio)
+                    _imageInfo.MediaType = CommonTypes.MediaType.CDROM;
+                else
+                    _imageInfo.MediaType = CommonTypes.MediaType.CD;
+            }
+
+            _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
+            AaruConsole.VerboseWriteLine("Nero image contains a disc of type {0}", _imageInfo.MediaType);
+
+            _sectorBuilder = new SectorBuilder();
+
+            _isCd = _imageInfo.MediaType == CommonTypes.MediaType.CD            ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDDA          ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDG           ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDEG          ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDI           ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDROM         ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDROMXA       ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDPLUS        ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDMO          ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDR           ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDRW          ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDMRW         ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.VCD           ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.SVCD          ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.PCD           ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.DTSCD         ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDMIDI        ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDV           ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDIREADY      ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.FMTOWNS       ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.PS1CD         ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.PS2CD         ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.MEGACD        ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.SATURNCD      ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.GDROM         ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.GDR           ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.MilCD         ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.SuperCDROM2   ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.JaguarCD      ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.ThreeDO       ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.PCFX          ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.NeoGeoCD      ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CDTV          ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CD32          ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.Playdia       ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.Pippin        ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.VideoNow      ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.VideoNowColor ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.VideoNowXp    ||
+                    _imageInfo.MediaType == CommonTypes.MediaType.CVD;
+
+            if(_isCd)
+                return ErrorNumber.NoError;
+
+            foreach(Track track in Tracks)
+            {
+                track.Pregap = 0;
+                track.Indexes?.Clear();
+            }
+
+            _imageInfo.ReadableMediaTags.Remove(MediaTagType.CD_MCN);
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackIsrc);
+            _imageInfo.ReadableSectorTags.Remove(SectorTagType.CdTrackFlags);
+
             return ErrorNumber.NoError;
         }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, track, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+        catch
         {
-            buffer = null;
+            AaruConsole.DebugWrite("Nero plugin", "Exception occurred opening file.");
 
-            foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
-                                                     from track in Tracks where track.Sequence  == kvp.Key
-                                                     where sectorAddress   - kvp.Value <=
-                                                           track.EndSector - track.StartSector select kvp)
-                return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
-
-            return ErrorNumber.SectorNotFound;
+            return ErrorNumber.UnexpectedException;
         }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(!_isCd)
-                return ReadSectors(sectorAddress, length, track, out buffer);
-
-            if(!_neroTracks.TryGetValue(track, out NeroTrack aaruTrack))
-                return ErrorNumber.SectorNotFound;
-
-            if(length > aaruTrack.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip;
-
-            switch((DaoMode)aaruTrack.Mode)
-            {
-                case DaoMode.Data:
-                case DaoMode.DataM2F1:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2048;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                case DaoMode.DataM2F2:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2336;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                case DaoMode.DataRaw:
-                case DaoMode.DataM2Raw:
-                case DaoMode.Audio:
-                case DaoMode.AudioAlt:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 0;
-
-                    break;
-                }
-
-                case DaoMode.DataRawSub:
-                case DaoMode.DataM2RawSub:
-                case DaoMode.AudioSub:
-                {
-                    sectorOffset = 0;
-                    sectorSize   = 2352;
-                    sectorSkip   = 96;
-
-                    break;
-                }
-
-                default: return ErrorNumber.NotSupported;
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            _imageStream = _neroFilter.GetDataForkStream();
-            var br = new BinaryReader(_imageStream);
-
-            br.BaseStream.
-               Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
-                    SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
-                }
-
-            switch((DaoMode)aaruTrack.Mode)
-            {
-                case DaoMode.Data:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        Array.Copy(buffer, i * 2048, fullSector, 16, 2048);
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)(sectorAddress + i));
-                        _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-                case DaoMode.DataM2F1:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        Array.Copy(buffer, i * 2048, fullSector, 24, 2048);
-
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form1,
-                                                         (long)(sectorAddress + i));
-
-                        _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form1);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-                case DaoMode.DataM2F2:
-                {
-                    byte[] fullSector = new byte[2352];
-                    byte[] fullBuffer = new byte[2352 * length];
-
-                    for(uint i = 0; i < length; i++)
-                    {
-                        _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Formless,
-                                                         (long)(sectorAddress + i));
-
-                        Array.Copy(buffer, i                    * 2336, fullSector, 16, 2336);
-                        Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
-                    }
-
-                    buffer = fullBuffer;
-
-                    break;
-                }
-            }
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(CommonTypes.Structs.Session session) => GetSessionTracks(session.Sequence);
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();
     }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        switch(tag)
+        {
+            case MediaTagType.CD_MCN:
+                buffer = _upc?.Clone() as byte[];
+
+                return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
+
+            case MediaTagType.CD_TEXT: return ErrorNumber.NotImplemented;
+            default:                   return ErrorNumber.NotSupported;
+        }
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress   - kvp.Value <=
+                                                       track.EndSector - track.StartSector select kvp)
+            return ReadSectors(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress   - kvp.Value <=
+                                                       track.EndSector - track.StartSector select kvp)
+        {
+            return ReadSectorsTag(sectorAddress - kvp.Value, length, kvp.Key, tag, out buffer);
+
+            return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
+        }
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(!_neroTracks.TryGetValue(track, out NeroTrack aaruTrack))
+            return ErrorNumber.SectorNotFound;
+
+        if(length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+        bool mode2 = false;
+
+        switch((DaoMode)aaruTrack.Mode)
+        {
+            case DaoMode.Data:
+            case DaoMode.DataM2F1:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2048;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            case DaoMode.DataM2F2:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2336;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            case DaoMode.Audio:
+            case DaoMode.AudioAlt:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            case DaoMode.DataRaw:
+            {
+                sectorOffset = 16;
+                sectorSize   = 2048;
+                sectorSkip   = 288;
+
+                break;
+            }
+
+            case DaoMode.DataM2Raw:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            case DaoMode.DataRawSub:
+            {
+                sectorOffset = 16;
+                sectorSize   = 2048;
+                sectorSkip   = 288 + 96;
+
+                break;
+            }
+
+            case DaoMode.DataM2RawSub:
+            {
+                mode2        = true;
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 96;
+
+                break;
+            }
+
+            case DaoMode.AudioSub:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 96;
+
+                break;
+            }
+
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream = _neroFilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(mode2)
+        {
+            var mode2Ms = new MemoryStream((int)(sectorSize * length));
+
+            buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length));
+
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = new byte[sectorSize];
+                Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize);
+                sector = Sector.GetUserData(sector);
+                mode2Ms.Write(sector, 0, sector.Length);
+            }
+
+            buffer = mode2Ms.ToArray();
+        }
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        if(tag == SectorTagType.CdTrackFlags ||
+           tag == SectorTagType.CdTrackIsrc)
+            track = (uint)sectorAddress;
+
+        if(!_neroTracks.TryGetValue(track, out NeroTrack aaruTrack))
+            return ErrorNumber.SectorNotFound;
+
+        if(length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch(tag)
+        {
+            case SectorTagType.CdSectorEcc:
+            case SectorTagType.CdSectorEccP:
+            case SectorTagType.CdSectorEccQ:
+            case SectorTagType.CdSectorEdc:
+            case SectorTagType.CdSectorHeader:
+            case SectorTagType.CdSectorSubchannel:
+            case SectorTagType.CdSectorSubHeader:
+            case SectorTagType.CdSectorSync: break;
+            case SectorTagType.CdTrackFlags:
+                if(!_trackFlags.TryGetValue(track, out byte flag))
+                    return ErrorNumber.NoData;
+
+                buffer = new[]
+                {
+                    flag
+                };
+
+                return ErrorNumber.NoError;
+            case SectorTagType.CdTrackIsrc:
+                buffer = aaruTrack.Isrc;
+
+                return ErrorNumber.NoError;
+            case SectorTagType.CdTrackText: return ErrorNumber.NotImplemented;
+            default:                        return ErrorNumber.NotSupported;
+        }
+
+        switch((DaoMode)aaruTrack.Mode)
+        {
+            case DaoMode.Data:
+            case DaoMode.DataM2F1: return ErrorNumber.NoData;
+            case DaoMode.DataM2F2:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    case SectorTagType.CdSectorHeader:
+                    case SectorTagType.CdSectorSubchannel:
+                    case SectorTagType.CdSectorEcc:
+                    case SectorTagType.CdSectorEccP:
+                    case SectorTagType.CdSectorEccQ: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2332;
+                        sectorSize   = 4;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+
+            case DaoMode.Audio:
+            case DaoMode.AudioAlt: return ErrorNumber.NoData;
+            case DaoMode.DataRaw:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubchannel:
+                    case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2064;
+                        sectorSize   = 4;
+                        sectorSkip   = 284;
+
+                        break;
+                    }
+
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+
+            case DaoMode.DataM2RawSub:
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340 + 96;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336 + 96;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubHeader:
+                    {
+                        sectorOffset = 16;
+                        sectorSize   = 8;
+                        sectorSkip   = 2328 + 96;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2348;
+                        sectorSize   = 4;
+                        sectorSkip   = 0 + 96;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        sectorOffset = 2352;
+                        sectorSize   = 96;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            case DaoMode.DataRawSub:
+            {
+                switch(tag)
+                {
+                    case SectorTagType.CdSectorSync:
+                    {
+                        sectorOffset = 0;
+                        sectorSize   = 12;
+                        sectorSkip   = 2340 + 96;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorHeader:
+                    {
+                        sectorOffset = 12;
+                        sectorSize   = 4;
+                        sectorSkip   = 2336 + 96;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubchannel:
+                    {
+                        sectorOffset = 2352;
+                        sectorSize   = 96;
+                        sectorSkip   = 0;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                    case SectorTagType.CdSectorEcc:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 276;
+                        sectorSkip   = 0 + 96;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEccP:
+                    {
+                        sectorOffset = 2076;
+                        sectorSize   = 172;
+                        sectorSkip   = 104 + 96;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEccQ:
+                    {
+                        sectorOffset = 2248;
+                        sectorSize   = 104;
+                        sectorSkip   = 0 + 96;
+
+                        break;
+                    }
+
+                    case SectorTagType.CdSectorEdc:
+                    {
+                        sectorOffset = 2064;
+                        sectorSize   = 4;
+                        sectorSkip   = 284 + 96;
+
+                        break;
+                    }
+
+                    default: return ErrorNumber.NotSupported;
+                }
+
+                break;
+            }
+
+            case DaoMode.AudioSub:
+            {
+                if(tag != SectorTagType.CdSectorSubchannel)
+                    return ErrorNumber.NotSupported;
+
+                sectorOffset = 2352;
+                sectorSize   = 96;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream = _neroFilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, track, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        foreach(KeyValuePair<uint, ulong> kvp in from kvp in _offsetmap where sectorAddress >= kvp.Value
+                                                 from track in Tracks where track.Sequence  == kvp.Key
+                                                 where sectorAddress   - kvp.Value <=
+                                                       track.EndSector - track.StartSector select kvp)
+            return ReadSectorsLong(sectorAddress - kvp.Value, length, kvp.Key, out buffer);
+
+        return ErrorNumber.SectorNotFound;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(!_isCd)
+            return ReadSectors(sectorAddress, length, track, out buffer);
+
+        if(!_neroTracks.TryGetValue(track, out NeroTrack aaruTrack))
+            return ErrorNumber.SectorNotFound;
+
+        if(length > aaruTrack.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip;
+
+        switch((DaoMode)aaruTrack.Mode)
+        {
+            case DaoMode.Data:
+            case DaoMode.DataM2F1:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2048;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            case DaoMode.DataM2F2:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2336;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            case DaoMode.DataRaw:
+            case DaoMode.DataM2Raw:
+            case DaoMode.Audio:
+            case DaoMode.AudioAlt:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 0;
+
+                break;
+            }
+
+            case DaoMode.DataRawSub:
+            case DaoMode.DataM2RawSub:
+            case DaoMode.AudioSub:
+            {
+                sectorOffset = 0;
+                sectorSize   = 2352;
+                sectorSkip   = 96;
+
+                break;
+            }
+
+            default: return ErrorNumber.NotSupported;
+        }
+
+        buffer = new byte[sectorSize * length];
+
+        _imageStream = _neroFilter.GetDataForkStream();
+        var br = new BinaryReader(_imageStream);
+
+        br.BaseStream.
+           Seek((long)aaruTrack.Offset + (long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)),
+                SeekOrigin.Begin);
+
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        switch((DaoMode)aaruTrack.Mode)
+        {
+            case DaoMode.Data:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
+                {
+                    Array.Copy(buffer, i * 2048, fullSector, 16, 2048);
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode1, (long)(sectorAddress + i));
+                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode1);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
+                }
+
+                buffer = fullBuffer;
+
+                break;
+            }
+            case DaoMode.DataM2F1:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
+                {
+                    Array.Copy(buffer, i * 2048, fullSector, 24, 2048);
+
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Form1,
+                                                     (long)(sectorAddress + i));
+
+                    _sectorBuilder.ReconstructEcc(ref fullSector, TrackType.CdMode2Form1);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
+                }
+
+                buffer = fullBuffer;
+
+                break;
+            }
+            case DaoMode.DataM2F2:
+            {
+                byte[] fullSector = new byte[2352];
+                byte[] fullBuffer = new byte[2352 * length];
+
+                for(uint i = 0; i < length; i++)
+                {
+                    _sectorBuilder.ReconstructPrefix(ref fullSector, TrackType.CdMode2Formless,
+                                                     (long)(sectorAddress + i));
+
+                    Array.Copy(buffer, i                    * 2336, fullSector, 16, 2336);
+                    Array.Copy(fullSector, 0, fullBuffer, i * 2352, 2352);
+                }
+
+                buffer = fullBuffer;
+
+                break;
+            }
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(CommonTypes.Structs.Session session) => GetSessionTracks(session.Sequence);
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session) => Tracks.Where(track => track.Session == session).ToList();
 }
\ No newline at end of file
diff --git a/Aaru.Images/Nero/Structs.cs b/Aaru.Images/Nero/Structs.cs
index 2aab3e2c3..b18beb9db 100644
--- a/Aaru.Images/Nero/Structs.cs
+++ b/Aaru.Images/Nero/Structs.cs
@@ -35,401 +35,400 @@ using System.Diagnostics.CodeAnalysis;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class Nero
 {
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class Nero
+    struct FooterV1
     {
-        struct FooterV1
-        {
-            /// <summary>"NERO"</summary>
-            public uint ChunkId;
+        /// <summary>"NERO"</summary>
+        public uint ChunkId;
 
-            /// <summary>Offset of first chunk in file</summary>
-            public uint FirstChunkOffset;
-        }
+        /// <summary>Offset of first chunk in file</summary>
+        public uint FirstChunkOffset;
+    }
 
-        struct FooterV2
-        {
-            /// <summary>"NER5"</summary>
-            public uint ChunkId;
+    struct FooterV2
+    {
+        /// <summary>"NER5"</summary>
+        public uint ChunkId;
 
-            /// <summary>Offset of first chunk in file</summary>
-            public ulong FirstChunkOffset;
-        }
+        /// <summary>Offset of first chunk in file</summary>
+        public ulong FirstChunkOffset;
+    }
 
-        struct CueEntryV2
-        {
-            /// <summary>Track mode. 0x01 for audio, 0x21 for copy-protected audio, 0x41 for data</summary>
-            public byte Mode;
+    struct CueEntryV2
+    {
+        /// <summary>Track mode. 0x01 for audio, 0x21 for copy-protected audio, 0x41 for data</summary>
+        public byte Mode;
 
-            /// <summary>Track number in BCD</summary>
-            public byte TrackNumber;
+        /// <summary>Track number in BCD</summary>
+        public byte TrackNumber;
 
-            /// <summary>Index number in BCD</summary>
-            public byte IndexNumber;
+        /// <summary>Index number in BCD</summary>
+        public byte IndexNumber;
 
-            /// <summary>Always zero</summary>
-            public byte Dummy;
+        /// <summary>Always zero</summary>
+        public byte Dummy;
 
-            /// <summary>LBA sector start for this entry</summary>
-            public int LbaStart;
-        }
+        /// <summary>LBA sector start for this entry</summary>
+        public int LbaStart;
+    }
 
-        class CuesheetV2
-        {
-            /// <summary>"CUEX"</summary>
-            public uint ChunkId;
+    class CuesheetV2
+    {
+        /// <summary>"CUEX"</summary>
+        public uint ChunkId;
 
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
 
-            /// <summary>Cuesheet entries</summary>
-            public List<CueEntryV2> Entries;
-        }
+        /// <summary>Cuesheet entries</summary>
+        public List<CueEntryV2> Entries;
+    }
 
-        struct CueEntryV1
-        {
-            /// <summary>Track mode. 0x01 for audio, 0x21 for copy-protected audio, 0x41 for data</summary>
-            public byte Mode;
+    struct CueEntryV1
+    {
+        /// <summary>Track mode. 0x01 for audio, 0x21 for copy-protected audio, 0x41 for data</summary>
+        public byte Mode;
 
-            /// <summary>Track number in BCD</summary>
-            public byte TrackNumber;
+        /// <summary>Track number in BCD</summary>
+        public byte TrackNumber;
 
-            /// <summary>Index number in BCD</summary>
-            public byte IndexNumber;
+        /// <summary>Index number in BCD</summary>
+        public byte IndexNumber;
 
-            /// <summary>Always zero</summary>
-            public ushort Dummy;
+        /// <summary>Always zero</summary>
+        public ushort Dummy;
 
-            /// <summary>MSF start sector's minute for this entry</summary>
-            public byte Minute;
+        /// <summary>MSF start sector's minute for this entry</summary>
+        public byte Minute;
 
-            /// <summary>MSF start sector's second for this entry</summary>
-            public byte Second;
+        /// <summary>MSF start sector's second for this entry</summary>
+        public byte Second;
 
-            /// <summary>MSF start sector's frame for this entry</summary>
-            public byte Frame;
-        }
+        /// <summary>MSF start sector's frame for this entry</summary>
+        public byte Frame;
+    }
 
-        class CuesheetV1
-        {
-            /// <summary>"CUES"</summary>
-            public uint ChunkId;
+    class CuesheetV1
+    {
+        /// <summary>"CUES"</summary>
+        public uint ChunkId;
 
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
 
-            /// <summary>Cuesheet entries</summary>
-            public List<CueEntryV1> Entries;
-        }
+        /// <summary>Cuesheet entries</summary>
+        public List<CueEntryV1> Entries;
+    }
 
-        struct DaoEntryV1
-        {
-            /// <summary>ISRC (12 bytes)</summary>
-            public byte[] Isrc;
+    struct DaoEntryV1
+    {
+        /// <summary>ISRC (12 bytes)</summary>
+        public byte[] Isrc;
 
-            /// <summary>Size of sector inside image (in bytes)</summary>
-            public ushort SectorSize;
+        /// <summary>Size of sector inside image (in bytes)</summary>
+        public ushort SectorSize;
 
-            /// <summary>Sector mode in image</summary>
-            public ushort Mode;
+        /// <summary>Sector mode in image</summary>
+        public ushort Mode;
 
-            /// <summary>Unknown</summary>
-            public ushort Unknown;
+        /// <summary>Unknown</summary>
+        public ushort Unknown;
 
-            /// <summary>Index 0 start</summary>
-            public uint Index0;
+        /// <summary>Index 0 start</summary>
+        public uint Index0;
 
-            /// <summary>Index 1 start</summary>
-            public uint Index1;
+        /// <summary>Index 1 start</summary>
+        public uint Index1;
 
-            /// <summary>End of track + 1</summary>
-            public uint EndOfTrack;
-        }
+        /// <summary>End of track + 1</summary>
+        public uint EndOfTrack;
+    }
 
-        struct DaoV1
-        {
-            /// <summary>"DAOI"</summary>
-            public uint ChunkId;
+    struct DaoV1
+    {
+        /// <summary>"DAOI"</summary>
+        public uint ChunkId;
 
-            /// <summary>Chunk size (big endian)</summary>
-            public uint ChunkSizeBe;
+        /// <summary>Chunk size (big endian)</summary>
+        public uint ChunkSizeBe;
 
-            /// <summary>Chunk size (little endian)</summary>
-            public uint ChunkSizeLe;
+        /// <summary>Chunk size (little endian)</summary>
+        public uint ChunkSizeLe;
 
-            /// <summary>UPC (14 bytes, null-padded)</summary>
-            public byte[] Upc;
+        /// <summary>UPC (14 bytes, null-padded)</summary>
+        public byte[] Upc;
 
-            /// <summary>TOC type</summary>
-            public ushort TocType;
+        /// <summary>TOC type</summary>
+        public ushort TocType;
 
-            /// <summary>First track</summary>
-            public byte FirstTrack;
+        /// <summary>First track</summary>
+        public byte FirstTrack;
 
-            /// <summary>Last track</summary>
-            public byte LastTrack;
+        /// <summary>Last track</summary>
+        public byte LastTrack;
 
-            /// <summary>Tracks</summary>
-            public List<DaoEntryV1> Tracks;
-        }
+        /// <summary>Tracks</summary>
+        public List<DaoEntryV1> Tracks;
+    }
 
-        struct DaoEntryV2
-        {
-            /// <summary>ISRC (12 bytes)</summary>
-            public byte[] Isrc;
+    struct DaoEntryV2
+    {
+        /// <summary>ISRC (12 bytes)</summary>
+        public byte[] Isrc;
 
-            /// <summary>Size of sector inside image (in bytes)</summary>
-            public ushort SectorSize;
+        /// <summary>Size of sector inside image (in bytes)</summary>
+        public ushort SectorSize;
 
-            /// <summary>Sector mode in image</summary>
-            public ushort Mode;
+        /// <summary>Sector mode in image</summary>
+        public ushort Mode;
 
-            /// <summary>Seems to be always 0.</summary>
-            public ushort Unknown;
+        /// <summary>Seems to be always 0.</summary>
+        public ushort Unknown;
 
-            /// <summary>Index 0 start</summary>
-            public ulong Index0;
+        /// <summary>Index 0 start</summary>
+        public ulong Index0;
 
-            /// <summary>Index 1 start</summary>
-            public ulong Index1;
+        /// <summary>Index 1 start</summary>
+        public ulong Index1;
 
-            /// <summary>End of track + 1</summary>
-            public ulong EndOfTrack;
-        }
+        /// <summary>End of track + 1</summary>
+        public ulong EndOfTrack;
+    }
 
-        struct DaoV2
-        {
-            /// <summary>"DAOX"</summary>
-            public uint ChunkId;
+    struct DaoV2
+    {
+        /// <summary>"DAOX"</summary>
+        public uint ChunkId;
 
-            /// <summary>Chunk size (big endian)</summary>
-            public uint ChunkSizeBe;
+        /// <summary>Chunk size (big endian)</summary>
+        public uint ChunkSizeBe;
 
-            /// <summary>Chunk size (little endian)</summary>
-            public uint ChunkSizeLe;
+        /// <summary>Chunk size (little endian)</summary>
+        public uint ChunkSizeLe;
 
-            /// <summary>UPC (14 bytes, null-padded)</summary>
-            public byte[] Upc;
+        /// <summary>UPC (14 bytes, null-padded)</summary>
+        public byte[] Upc;
 
-            /// <summary>TOC type</summary>
-            public ushort TocType;
+        /// <summary>TOC type</summary>
+        public ushort TocType;
 
-            /// <summary>First track</summary>
-            public byte FirstTrack;
+        /// <summary>First track</summary>
+        public byte FirstTrack;
 
-            /// <summary>Last track</summary>
-            public byte LastTrack;
+        /// <summary>Last track</summary>
+        public byte LastTrack;
 
-            /// <summary>Tracks</summary>
-            public List<DaoEntryV2> Tracks;
-        }
+        /// <summary>Tracks</summary>
+        public List<DaoEntryV2> Tracks;
+    }
 
-        struct CdTextPack
-        {
-            /// <summary>Pack type</summary>
-            public byte PackType;
+    struct CdTextPack
+    {
+        /// <summary>Pack type</summary>
+        public byte PackType;
 
-            /// <summary>Track number</summary>
-            public byte TrackNumber;
+        /// <summary>Track number</summary>
+        public byte TrackNumber;
 
-            /// <summary>Pack number in block</summary>
-            public byte PackNumber;
+        /// <summary>Pack number in block</summary>
+        public byte PackNumber;
 
-            /// <summary>Block number</summary>
-            public byte BlockNumber;
+        /// <summary>Block number</summary>
+        public byte BlockNumber;
 
-            /// <summary>12 bytes of data</summary>
-            public byte[] Text;
+        /// <summary>12 bytes of data</summary>
+        public byte[] Text;
 
-            /// <summary>CRC</summary>
-            public ushort Crc;
-        }
+        /// <summary>CRC</summary>
+        public ushort Crc;
+    }
 
-        struct CdText
-        {
-            /// <summary>"CDTX"</summary>
-            public uint ChunkId;
+    struct CdText
+    {
+        /// <summary>"CDTX"</summary>
+        public uint ChunkId;
 
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
 
-            /// <summary>CD-TEXT packs</summary>
-            public List<CdTextPack> Packs;
-        }
+        /// <summary>CD-TEXT packs</summary>
+        public List<CdTextPack> Packs;
+    }
 
-        struct TaoEntryV0
-        {
-            /// <summary>Offset of track on image</summary>
-            public uint Offset;
+    struct TaoEntryV0
+    {
+        /// <summary>Offset of track on image</summary>
+        public uint Offset;
 
-            /// <summary>Length of track in bytes</summary>
-            public uint Length;
+        /// <summary>Length of track in bytes</summary>
+        public uint Length;
 
-            /// <summary>Track mode</summary>
-            public uint Mode;
-        }
+        /// <summary>Track mode</summary>
+        public uint Mode;
+    }
 
-        struct TaoV0
-        {
-            /// <summary>"TINF"</summary>
-            public uint ChunkId;
+    struct TaoV0
+    {
+        /// <summary>"TINF"</summary>
+        public uint ChunkId;
 
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
 
-            /// <summary>CD-TEXT packs</summary>
-            public List<TaoEntryV0> Tracks;
-        }
+        /// <summary>CD-TEXT packs</summary>
+        public List<TaoEntryV0> Tracks;
+    }
 
-        struct TaoEntryV1
-        {
-            /// <summary>Offset of track on image</summary>
-            public uint Offset;
+    struct TaoEntryV1
+    {
+        /// <summary>Offset of track on image</summary>
+        public uint Offset;
 
-            /// <summary>Length of track in bytes</summary>
-            public uint Length;
+        /// <summary>Length of track in bytes</summary>
+        public uint Length;
 
-            /// <summary>Track mode</summary>
-            public uint Mode;
+        /// <summary>Track mode</summary>
+        public uint Mode;
 
-            /// <summary>LBA track start (plus 150 lead in sectors)</summary>
-            public uint StartLba;
+        /// <summary>LBA track start (plus 150 lead in sectors)</summary>
+        public uint StartLba;
 
-            /// <summary>Unknown</summary>
-            public uint Unknown;
-        }
+        /// <summary>Unknown</summary>
+        public uint Unknown;
+    }
 
-        struct TaoV1
-        {
-            /// <summary>"ETNF"</summary>
-            public uint ChunkId;
+    struct TaoV1
+    {
+        /// <summary>"ETNF"</summary>
+        public uint ChunkId;
 
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
 
-            /// <summary>CD-TEXT packs</summary>
-            public List<TaoEntryV1> Tracks;
-        }
+        /// <summary>CD-TEXT packs</summary>
+        public List<TaoEntryV1> Tracks;
+    }
 
-        struct TaoEntryV2
-        {
-            /// <summary>Offset of track on image</summary>
-            public ulong Offset;
+    struct TaoEntryV2
+    {
+        /// <summary>Offset of track on image</summary>
+        public ulong Offset;
 
-            /// <summary>Length of track in bytes</summary>
-            public ulong Length;
+        /// <summary>Length of track in bytes</summary>
+        public ulong Length;
 
-            /// <summary>Track mode</summary>
-            public uint Mode;
+        /// <summary>Track mode</summary>
+        public uint Mode;
 
-            /// <summary>LBA track start (plus 150 lead in sectors)</summary>
-            public uint StartLba;
-
-            /// <summary>Unknown</summary>
-            public uint Unknown;
-
-            /// <summary>Track length in sectors</summary>
-            public uint Sectors;
-        }
-
-        struct TaoV2
-        {
-            /// <summary>"ETN2"</summary>
-            public uint ChunkId;
-
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
-
-            /// <summary>CD-TEXT packs</summary>
-            public List<TaoEntryV2> Tracks;
-        }
-
-        struct Session
-        {
-            /// <summary>"SINF"</summary>
-            public uint ChunkId;
-
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
-
-            /// <summary>Tracks in session</summary>
-            public uint Tracks;
-        }
-
-        struct MediaType
-        {
-            /// <summary>"MTYP"</summary>
-            public uint ChunkId;
-
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
-
-            /// <summary>Media type</summary>
-            public uint Type;
-        }
-
-        struct DiscInformation
-        {
-            /// <summary>"DINF"</summary>
-            public uint ChunkId;
-
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
-
-            /// <summary>Unknown</summary>
-            public uint Unknown;
-        }
-
-        struct TocChunk
-        {
-            /// <summary>"TOCT"</summary>
-            public uint ChunkId;
-
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
-
-            /// <summary>Unknown</summary>
-            public ushort Unknown;
-        }
-
-        struct ReloChunk
-        {
-            /// <summary>"RELO"</summary>
-            public uint ChunkId;
-
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
-
-            /// <summary>Unknown</summary>
-            public uint Unknown;
-        }
-
-        struct EndOfChunkChain
-        {
-            /// <summary>"END!"</summary>
-            public uint ChunkId;
-
-            /// <summary>Chunk size</summary>
-            public uint ChunkSize;
-        }
-
-        // Internal use only
-        class NeroTrack
-        {
-            public ulong  EndOfTrack;
-            public ulong  Index0;
-            public ulong  Index1;
-            public byte[] Isrc;
-            public ulong  Length;
-            public uint   Mode;
-            public ulong  Offset;
-            public ulong  Sectors;
-            public ushort SectorSize;
-            public uint   Sequence;
-            public ulong  StartLba;
-            public bool   UseLbaForIndex;
-        }
+        /// <summary>LBA track start (plus 150 lead in sectors)</summary>
+        public uint StartLba;
+
+        /// <summary>Unknown</summary>
+        public uint Unknown;
+
+        /// <summary>Track length in sectors</summary>
+        public uint Sectors;
+    }
+
+    struct TaoV2
+    {
+        /// <summary>"ETN2"</summary>
+        public uint ChunkId;
+
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
+
+        /// <summary>CD-TEXT packs</summary>
+        public List<TaoEntryV2> Tracks;
+    }
+
+    struct Session
+    {
+        /// <summary>"SINF"</summary>
+        public uint ChunkId;
+
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
+
+        /// <summary>Tracks in session</summary>
+        public uint Tracks;
+    }
+
+    struct MediaType
+    {
+        /// <summary>"MTYP"</summary>
+        public uint ChunkId;
+
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
+
+        /// <summary>Media type</summary>
+        public uint Type;
+    }
+
+    struct DiscInformation
+    {
+        /// <summary>"DINF"</summary>
+        public uint ChunkId;
+
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
+
+        /// <summary>Unknown</summary>
+        public uint Unknown;
+    }
+
+    struct TocChunk
+    {
+        /// <summary>"TOCT"</summary>
+        public uint ChunkId;
+
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
+
+        /// <summary>Unknown</summary>
+        public ushort Unknown;
+    }
+
+    struct ReloChunk
+    {
+        /// <summary>"RELO"</summary>
+        public uint ChunkId;
+
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
+
+        /// <summary>Unknown</summary>
+        public uint Unknown;
+    }
+
+    struct EndOfChunkChain
+    {
+        /// <summary>"END!"</summary>
+        public uint ChunkId;
+
+        /// <summary>Chunk size</summary>
+        public uint ChunkSize;
+    }
+
+    // Internal use only
+    class NeroTrack
+    {
+        public ulong  EndOfTrack;
+        public ulong  Index0;
+        public ulong  Index1;
+        public byte[] Isrc;
+        public ulong  Length;
+        public uint   Mode;
+        public ulong  Offset;
+        public ulong  Sectors;
+        public ushort SectorSize;
+        public uint   Sequence;
+        public ulong  StartLba;
+        public bool   UseLbaForIndex;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Nero/Verify.cs b/Aaru.Images/Nero/Verify.cs
index 5b06cfaff..31fd5d7c8 100644
--- a/Aaru.Images/Nero/Verify.cs
+++ b/Aaru.Images/Nero/Verify.cs
@@ -35,92 +35,91 @@ using System.Collections.Generic;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Nero
 {
-    public sealed partial class Nero
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
     {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
-
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
 
-            if(errno != ErrorNumber.NoError)
-                return null;
-
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
+            switch(sectorStatus)
             {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
+                    break;
             }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
         }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Constants.cs b/Aaru.Images/Parallels/Constants.cs
index a4cdeba8c..1c81b5b8c 100644
--- a/Aaru.Images/Parallels/Constants.cs
+++ b/Aaru.Images/Parallels/Constants.cs
@@ -32,25 +32,24 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Parallels
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Parallels
+    const uint PARALLELS_VERSION    = 2;
+    const uint PARALLELS_INUSE      = 0x746F6E59;
+    const uint PARALLELS_CLOSED     = 0x312E3276;
+    const uint PARALLELS_EMPTY      = 0x00000001;
+    const uint MAX_CACHE_SIZE       = 16777216;
+    const uint MAX_CACHED_SECTORS   = MAX_CACHE_SIZE / 512;
+    const uint DEFAULT_CLUSTER_SIZE = 1048576;
+    readonly byte[] _extMagic =
     {
-        const uint PARALLELS_VERSION    = 2;
-        const uint PARALLELS_INUSE      = 0x746F6E59;
-        const uint PARALLELS_CLOSED     = 0x312E3276;
-        const uint PARALLELS_EMPTY      = 0x00000001;
-        const uint MAX_CACHE_SIZE       = 16777216;
-        const uint MAX_CACHED_SECTORS   = MAX_CACHE_SIZE / 512;
-        const uint DEFAULT_CLUSTER_SIZE = 1048576;
-        readonly byte[] _extMagic =
-        {
-            0x57, 0x69, 0x74, 0x68, 0x6F, 0x75, 0x46, 0x72, 0x65, 0x53, 0x70, 0x61, 0x63, 0x45, 0x78, 0x74
-        };
-        readonly byte[] _magic =
-        {
-            0x57, 0x69, 0x74, 0x68, 0x6F, 0x75, 0x74, 0x46, 0x72, 0x65, 0x65, 0x53, 0x70, 0x61, 0x63, 0x65
-        };
-    }
+        0x57, 0x69, 0x74, 0x68, 0x6F, 0x75, 0x46, 0x72, 0x65, 0x53, 0x70, 0x61, 0x63, 0x45, 0x78, 0x74
+    };
+    readonly byte[] _magic =
+    {
+        0x57, 0x69, 0x74, 0x68, 0x6F, 0x75, 0x74, 0x46, 0x72, 0x65, 0x65, 0x53, 0x70, 0x61, 0x63, 0x65
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Identify.cs b/Aaru.Images/Parallels/Identify.cs
index fd596f659..56b3379a9 100644
--- a/Aaru.Images/Parallels/Identify.cs
+++ b/Aaru.Images/Parallels/Identify.cs
@@ -35,24 +35,23 @@ using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Parallels
 {
-    public sealed partial class Parallels
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512)
-                return false;
+        if(stream.Length < 512)
+            return false;
 
-            byte[] pHdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(pHdrB, 0, Marshal.SizeOf<Header>());
-            _pHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
+        byte[] pHdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(pHdrB, 0, Marshal.SizeOf<Header>());
+        _pHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
 
-            return _magic.SequenceEqual(_pHdr.magic) || _extMagic.SequenceEqual(_pHdr.magic);
-        }
+        return _magic.SequenceEqual(_pHdr.magic) || _extMagic.SequenceEqual(_pHdr.magic);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Parallels.cs b/Aaru.Images/Parallels/Parallels.cs
index 100cc99ce..db0d022dc 100644
--- a/Aaru.Images/Parallels/Parallels.cs
+++ b/Aaru.Images/Parallels/Parallels.cs
@@ -38,46 +38,45 @@ using Aaru.CommonTypes.Structs;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing Parallels' disk images</summary>
-    public sealed partial class Parallels : IWritableImage
-    {
-        uint[]                    _bat;
-        uint                      _clusterBytes;
-        long                      _currentWritingPosition;
-        long                      _dataOffset;
-        bool                      _empty;
-        bool                      _extended;
-        ImageInfo                 _imageInfo;
-        Stream                    _imageStream;
-        Header                    _pHdr;
-        Dictionary<ulong, byte[]> _sectorCache;
-        FileStream                _writingStream;
+namespace Aaru.DiscImages;
 
-        public Parallels() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = "2",
-            Application           = "Parallels",
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing Parallels' disk images</summary>
+public sealed partial class Parallels : IWritableImage
+{
+    uint[]                    _bat;
+    uint                      _clusterBytes;
+    long                      _currentWritingPosition;
+    long                      _dataOffset;
+    bool                      _empty;
+    bool                      _extended;
+    ImageInfo                 _imageInfo;
+    Stream                    _imageStream;
+    Header                    _pHdr;
+    Dictionary<ulong, byte[]> _sectorCache;
+    FileStream                _writingStream;
+
+    public Parallels() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = "2",
+        Application           = "Parallels",
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Properties.cs b/Aaru.Images/Parallels/Properties.cs
index 5976f87c0..92706840f 100644
--- a/Aaru.Images/Parallels/Properties.cs
+++ b/Aaru.Images/Parallels/Properties.cs
@@ -37,51 +37,50 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Parallels
-    {
-        /// <inheritdoc />
-        public string Name => "Parallels disk image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Parallels";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
+namespace Aaru.DiscImages;
 
-        // TODO: Add cluster size option
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".hdd"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+public sealed partial class Parallels
+{
+    /// <inheritdoc />
+    public string Name => "Parallels disk image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Parallels";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
+
+    // TODO: Add cluster size option
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
+            {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".hdd"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Read.cs b/Aaru.Images/Parallels/Read.cs
index 81469d1a9..271bca7d1 100644
--- a/Aaru.Images/Parallels/Read.cs
+++ b/Aaru.Images/Parallels/Read.cs
@@ -40,149 +40,148 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Parallels
 {
-    public sealed partial class Parallels
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 512)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] pHdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(pHdrB, 0, Marshal.SizeOf<Header>());
+        _pHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
+
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.magic = {0}", StringHandlers.CToString(_pHdr.magic));
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.version = {0}", _pHdr.version);
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.heads = {0}", _pHdr.heads);
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.cylinders = {0}", _pHdr.cylinders);
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.cluster_size = {0}", _pHdr.cluster_size);
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.bat_entries = {0}", _pHdr.bat_entries);
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.sectors = {0}", _pHdr.sectors);
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.in_use = 0x{0:X8}", _pHdr.in_use);
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.data_off = {0}", _pHdr.data_off);
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.flags = {0}", _pHdr.flags);
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.ext_off = {0}", _pHdr.ext_off);
+
+        _extended = _extMagic.SequenceEqual(_pHdr.magic);
+        AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.extended = {0}", _extended);
+
+        AaruConsole.DebugWriteLine("Parallels plugin", "Reading BAT");
+        _bat = new uint[_pHdr.bat_entries];
+        byte[] batB = new byte[_pHdr.bat_entries * 4];
+        stream.Read(batB, 0, batB.Length);
+
+        for(int i = 0; i < _bat.Length; i++)
+            _bat[i] = BitConverter.ToUInt32(batB, i * 4);
+
+        _clusterBytes = _pHdr.cluster_size * 512;
+
+        if(_pHdr.data_off > 0)
+            _dataOffset = _pHdr.data_off * 512;
+        else
+            _dataOffset = ((stream.Position / _clusterBytes) + (stream.Position % _clusterBytes)) * _clusterBytes;
+
+        _sectorCache = new Dictionary<ulong, byte[]>();
+
+        _empty = (_pHdr.flags & PARALLELS_EMPTY) == PARALLELS_EMPTY;
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = _pHdr.sectors;
+        _imageInfo.SectorSize           = 512;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.MediaType            = MediaType.GENERIC_HDD;
+        _imageInfo.ImageSize            = _pHdr.sectors * 512;
+        _imageInfo.Cylinders            = _pHdr.cylinders;
+        _imageInfo.Heads                = _pHdr.heads;
+        _imageInfo.SectorsPerTrack      = (uint)(_imageInfo.Sectors / _imageInfo.Cylinders / _imageInfo.Heads);
+        _imageStream                    = stream;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(_empty)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
-
-            if(stream.Length < 512)
-                return ErrorNumber.InvalidArgument;
-
-            byte[] pHdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(pHdrB, 0, Marshal.SizeOf<Header>());
-            _pHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
-
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.magic = {0}", StringHandlers.CToString(_pHdr.magic));
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.version = {0}", _pHdr.version);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.heads = {0}", _pHdr.heads);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.cylinders = {0}", _pHdr.cylinders);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.cluster_size = {0}", _pHdr.cluster_size);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.bat_entries = {0}", _pHdr.bat_entries);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.sectors = {0}", _pHdr.sectors);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.in_use = 0x{0:X8}", _pHdr.in_use);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.data_off = {0}", _pHdr.data_off);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.flags = {0}", _pHdr.flags);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.ext_off = {0}", _pHdr.ext_off);
-
-            _extended = _extMagic.SequenceEqual(_pHdr.magic);
-            AaruConsole.DebugWriteLine("Parallels plugin", "pHdr.extended = {0}", _extended);
-
-            AaruConsole.DebugWriteLine("Parallels plugin", "Reading BAT");
-            _bat = new uint[_pHdr.bat_entries];
-            byte[] batB = new byte[_pHdr.bat_entries * 4];
-            stream.Read(batB, 0, batB.Length);
-
-            for(int i = 0; i < _bat.Length; i++)
-                _bat[i] = BitConverter.ToUInt32(batB, i * 4);
-
-            _clusterBytes = _pHdr.cluster_size * 512;
-
-            if(_pHdr.data_off > 0)
-                _dataOffset = _pHdr.data_off * 512;
-            else
-                _dataOffset = ((stream.Position / _clusterBytes) + (stream.Position % _clusterBytes)) * _clusterBytes;
-
-            _sectorCache = new Dictionary<ulong, byte[]>();
-
-            _empty = (_pHdr.flags & PARALLELS_EMPTY) == PARALLELS_EMPTY;
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = _pHdr.sectors;
-            _imageInfo.SectorSize           = 512;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.MediaType            = MediaType.GENERIC_HDD;
-            _imageInfo.ImageSize            = _pHdr.sectors * 512;
-            _imageInfo.Cylinders            = _pHdr.cylinders;
-            _imageInfo.Heads                = _pHdr.heads;
-            _imageInfo.SectorsPerTrack      = (uint)(_imageInfo.Sectors / _imageInfo.Cylinders / _imageInfo.Heads);
-            _imageStream                    = stream;
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(_empty)
-            {
-                buffer = new byte[512];
-
-                return ErrorNumber.NoError;
-            }
-
-            if(_sectorCache.TryGetValue(sectorAddress, out buffer))
-                return ErrorNumber.NoError;
-
-            ulong index  = sectorAddress / _pHdr.cluster_size;
-            ulong secOff = sectorAddress % _pHdr.cluster_size;
-
-            uint  batOff = _bat[index];
-            ulong imageOff;
-
-            if(batOff == 0)
-            {
-                buffer = new byte[512];
-
-                return ErrorNumber.NoError;
-            }
-
-            if(_extended)
-                imageOff = (ulong)batOff * _clusterBytes;
-            else
-                imageOff = batOff * 512UL;
-
-            byte[] cluster = new byte[_clusterBytes];
-            _imageStream.Seek((long)imageOff, SeekOrigin.Begin);
-            _imageStream.Read(cluster, 0, (int)_clusterBytes);
             buffer = new byte[512];
-            Array.Copy(cluster, (int)(secOff * 512), buffer, 0, 512);
-
-            if(_sectorCache.Count > MAX_CACHED_SECTORS)
-                _sectorCache.Clear();
-
-            _sectorCache.Add(sectorAddress, buffer);
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        if(_sectorCache.TryGetValue(sectorAddress, out buffer))
+            return ErrorNumber.NoError;
+
+        ulong index  = sectorAddress / _pHdr.cluster_size;
+        ulong secOff = sectorAddress % _pHdr.cluster_size;
+
+        uint  batOff = _bat[index];
+        ulong imageOff;
+
+        if(batOff == 0)
         {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
+            buffer = new byte[512];
 
             return ErrorNumber.NoError;
         }
+
+        if(_extended)
+            imageOff = (ulong)batOff * _clusterBytes;
+        else
+            imageOff = batOff * 512UL;
+
+        byte[] cluster = new byte[_clusterBytes];
+        _imageStream.Seek((long)imageOff, SeekOrigin.Begin);
+        _imageStream.Read(cluster, 0, (int)_clusterBytes);
+        buffer = new byte[512];
+        Array.Copy(cluster, (int)(secOff * 512), buffer, 0, 512);
+
+        if(_sectorCache.Count > MAX_CACHED_SECTORS)
+            _sectorCache.Clear();
+
+        _sectorCache.Add(sectorAddress, buffer);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Structs.cs b/Aaru.Images/Parallels/Structs.cs
index 1529aee20..f43b45b51 100644
--- a/Aaru.Images/Parallels/Structs.cs
+++ b/Aaru.Images/Parallels/Structs.cs
@@ -32,40 +32,39 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Parallels
 {
-    public sealed partial class Parallels
+    /// <summary>Parallels disk image header, little-endian</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        /// <summary>Parallels disk image header, little-endian</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            /// <summary>Magic, <see cref="Parallels._magic" /> or <see cref="Parallels._extMagic" /></summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public byte[] magic;
-            /// <summary>Version</summary>
-            public uint version;
-            /// <summary>Disk geometry parameter</summary>
-            public uint heads;
-            /// <summary>Disk geometry parameter</summary>
-            public uint cylinders;
-            /// <summary>Cluster size in sectors</summary>
-            public uint cluster_size;
-            /// <summary>Entries in BAT (clusters in image)</summary>
-            public uint bat_entries;
-            /// <summary>Disk size in sectors</summary>
-            public ulong sectors;
-            /// <summary>
-            ///     Set to <see cref="Parallels.PARALLELS_INUSE" /> if image is opened by any software,
-            ///     <see cref="Parallels.PARALLELS_CLOSED" /> if not, and 0 if old version
-            /// </summary>
-            public uint in_use;
-            /// <summary>Offset in sectors to start of data</summary>
-            public uint data_off;
-            /// <summary>Flags</summary>
-            public readonly uint flags;
-            /// <summary>Offset in sectors to format extension</summary>
-            public readonly ulong ext_off;
-        }
+        /// <summary>Magic, <see cref="Parallels._magic" /> or <see cref="Parallels._extMagic" /></summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public byte[] magic;
+        /// <summary>Version</summary>
+        public uint version;
+        /// <summary>Disk geometry parameter</summary>
+        public uint heads;
+        /// <summary>Disk geometry parameter</summary>
+        public uint cylinders;
+        /// <summary>Cluster size in sectors</summary>
+        public uint cluster_size;
+        /// <summary>Entries in BAT (clusters in image)</summary>
+        public uint bat_entries;
+        /// <summary>Disk size in sectors</summary>
+        public ulong sectors;
+        /// <summary>
+        ///     Set to <see cref="Parallels.PARALLELS_INUSE" /> if image is opened by any software,
+        ///     <see cref="Parallels.PARALLELS_CLOSED" /> if not, and 0 if old version
+        /// </summary>
+        public uint in_use;
+        /// <summary>Offset in sectors to start of data</summary>
+        public uint data_off;
+        /// <summary>Flags</summary>
+        public readonly uint flags;
+        /// <summary>Offset in sectors to format extension</summary>
+        public readonly ulong ext_off;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Unsupported.cs b/Aaru.Images/Parallels/Unsupported.cs
index 1178a6c08..49e05a183 100644
--- a/Aaru.Images/Parallels/Unsupported.cs
+++ b/Aaru.Images/Parallels/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Parallels
 {
-    public sealed partial class Parallels
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Parallels/Write.cs b/Aaru.Images/Parallels/Write.cs
index ca9293e5c..575a3caa7 100644
--- a/Aaru.Images/Parallels/Write.cs
+++ b/Aaru.Images/Parallels/Write.cs
@@ -40,290 +40,289 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Parallels
 {
-    public sealed partial class Parallels
+    // TODO: Support extended
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        // TODO: Support extended
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            if(sectors * sectorSize / DEFAULT_CLUSTER_SIZE > uint.MaxValue)
-            {
-                ErrorMessage = "Too many sectors for selected cluster size";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            uint batEntries = (uint)(sectors * sectorSize / DEFAULT_CLUSTER_SIZE);
-
-            if(sectors * sectorSize % DEFAULT_CLUSTER_SIZE > 0)
-                batEntries++;
-
-            uint headerSectors = (uint)Marshal.SizeOf<Header>() + (batEntries * 4);
-
-            if((uint)Marshal.SizeOf<Header>() + (batEntries % 4) > 0)
-                headerSectors++;
-
-            _pHdr = new Header
-            {
-                magic        = _magic,
-                version      = PARALLELS_VERSION,
-                sectors      = sectors,
-                in_use       = PARALLELS_CLOSED,
-                bat_entries  = batEntries,
-                data_off     = headerSectors,
-                cluster_size = DEFAULT_CLUSTER_SIZE / 512
-            };
-
-            _bat                    = new uint[batEntries];
-            _currentWritingPosition = headerSectors * 512;
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != 512)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-                return true;
-
-            ulong index  = sectorAddress / _pHdr.cluster_size;
-            ulong secOff = sectorAddress % _pHdr.cluster_size;
-
-            uint batOff = _bat[index];
-
-            if(batOff == 0)
-            {
-                batOff                  =  (uint)(_currentWritingPosition / 512);
-                _bat[index]             =  batOff;
-                _currentWritingPosition += _pHdr.cluster_size * 512L;
-            }
-
-            ulong imageOff = batOff * 512UL;
-
-            _writingStream.Seek((long)imageOff, SeekOrigin.Begin);
-            _writingStream.Seek((long)secOff * 512, SeekOrigin.Current);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        // TODO: This can be optimized
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % 512 != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-                return true;
-
-            for(uint i = 0; i < length; i++)
-            {
-                byte[] tmp = new byte[512];
-                Array.Copy(data, i * 512, tmp, 0, 512);
-
-                if(!WriteSector(tmp, sectorAddress + i))
-                    return false;
-            }
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        if(sectors * sectorSize / DEFAULT_CLUSTER_SIZE > uint.MaxValue)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors for selected cluster size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
-
-            if(_pHdr.cylinders == 0)
-            {
-                _pHdr.cylinders            = (uint)(_imageInfo.Sectors / 16 / 63);
-                _pHdr.heads                = 16;
-                _imageInfo.SectorsPerTrack = 63;
-
-                while(_pHdr.cylinders == 0)
-                {
-                    _pHdr.heads--;
-
-                    if(_pHdr.heads == 0)
-                    {
-                        _imageInfo.SectorsPerTrack--;
-                        _pHdr.heads = 16;
-                    }
-
-                    _pHdr.cylinders = (uint)(_imageInfo.Sectors / _pHdr.heads / _imageInfo.SectorsPerTrack);
-
-                    if(_pHdr.cylinders            == 0 &&
-                       _pHdr.heads                == 0 &&
-                       _imageInfo.SectorsPerTrack == 0)
-                        break;
-                }
-            }
-
-            byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
-            IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(_pHdr, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            for(long i = 0; i < _bat.LongLength; i++)
-                _writingStream.Write(BitConverter.GetBytes(_bat[i]), 0, 4);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
         }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+        catch(IOException e)
         {
-            _pHdr.cylinders = cylinders;
-            _pHdr.heads     = heads;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+        uint batEntries = (uint)(sectors * sectorSize / DEFAULT_CLUSTER_SIZE);
+
+        if(sectors * sectorSize % DEFAULT_CLUSTER_SIZE > 0)
+            batEntries++;
+
+        uint headerSectors = (uint)Marshal.SizeOf<Header>() + (batEntries * 4);
+
+        if((uint)Marshal.SizeOf<Header>() + (batEntries % 4) > 0)
+            headerSectors++;
+
+        _pHdr = new Header
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            magic        = _magic,
+            version      = PARALLELS_VERSION,
+            sectors      = sectors,
+            in_use       = PARALLELS_CLOSED,
+            bat_entries  = batEntries,
+            data_off     = headerSectors,
+            cluster_size = DEFAULT_CLUSTER_SIZE / 512
+        };
 
-            return false;
-        }
+        _bat                    = new uint[batEntries];
+        _currentWritingPosition = headerSectors * 512;
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+        IsWriting    = true;
+        ErrorMessage = null;
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != 512)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+            return true;
+
+        ulong index  = sectorAddress / _pHdr.cluster_size;
+        ulong secOff = sectorAddress % _pHdr.cluster_size;
+
+        uint batOff = _bat[index];
+
+        if(batOff == 0)
+        {
+            batOff                  =  (uint)(_currentWritingPosition / 512);
+            _bat[index]             =  batOff;
+            _currentWritingPosition += _pHdr.cluster_size * 512L;
+        }
+
+        ulong imageOff = batOff * 512UL;
+
+        _writingStream.Seek((long)imageOff, SeekOrigin.Begin);
+        _writingStream.Seek((long)secOff * 512, SeekOrigin.Current);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    // TODO: This can be optimized
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % 512 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+            return true;
+
+        for(uint i = 0; i < length; i++)
+        {
+            byte[] tmp = new byte[512];
+            Array.Copy(data, i * 512, tmp, 0, 512);
+
+            if(!WriteSector(tmp, sectorAddress + i))
+                return false;
+        }
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        if(_pHdr.cylinders == 0)
+        {
+            _pHdr.cylinders            = (uint)(_imageInfo.Sectors / 16 / 63);
+            _pHdr.heads                = 16;
+            _imageInfo.SectorsPerTrack = 63;
+
+            while(_pHdr.cylinders == 0)
+            {
+                _pHdr.heads--;
+
+                if(_pHdr.heads == 0)
+                {
+                    _imageInfo.SectorsPerTrack--;
+                    _pHdr.heads = 16;
+                }
+
+                _pHdr.cylinders = (uint)(_imageInfo.Sectors / _pHdr.heads / _imageInfo.SectorsPerTrack);
+
+                if(_pHdr.cylinders            == 0 &&
+                   _pHdr.heads                == 0 &&
+                   _imageInfo.SectorsPerTrack == 0)
+                    break;
+            }
+        }
+
+        byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
+        IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(_pHdr, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        for(long i = 0; i < _bat.LongLength; i++)
+            _writingStream.Write(BitConverter.GetBytes(_bat[i]), 0, 4);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        _pHdr.cylinders = cylinders;
+        _pHdr.heads     = heads;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/PartClone/Constants.cs b/Aaru.Images/PartClone/Constants.cs
index 8cbaf1c7f..e806ecb43 100644
--- a/Aaru.Images/PartClone/Constants.cs
+++ b/Aaru.Images/PartClone/Constants.cs
@@ -30,20 +30,19 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class PartClone
 {
-    public sealed partial class PartClone
+    const int  CRC_SIZE           = 4;
+    const uint MAX_CACHE_SIZE     = 16777216;
+    const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
+    readonly byte[] _biTmAgIc =
     {
-        const int  CRC_SIZE           = 4;
-        const uint MAX_CACHE_SIZE     = 16777216;
-        const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
-        readonly byte[] _biTmAgIc =
-        {
-            0x42, 0x69, 0x54, 0x6D, 0x41, 0x67, 0x49, 0x63
-        };
-        readonly byte[] _partCloneMagic =
-        {
-            0x70, 0x61, 0x72, 0x74, 0x63, 0x6C, 0x6F, 0x6E, 0x65, 0x2D, 0x69, 0x6D, 0x61, 0x67, 0x65
-        };
-    }
+        0x42, 0x69, 0x54, 0x6D, 0x41, 0x67, 0x49, 0x63
+    };
+    readonly byte[] _partCloneMagic =
+    {
+        0x70, 0x61, 0x72, 0x74, 0x63, 0x6C, 0x6F, 0x6E, 0x65, 0x2D, 0x69, 0x6D, 0x61, 0x67, 0x65
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/PartClone/Helpers.cs b/Aaru.Images/PartClone/Helpers.cs
index 0e4c5f5a0..f9b07982d 100644
--- a/Aaru.Images/PartClone/Helpers.cs
+++ b/Aaru.Images/PartClone/Helpers.cs
@@ -30,16 +30,15 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class PartClone
-    {
-        ulong BlockOffset(ulong sectorAddress)
-        {
-            _extents.GetStart(sectorAddress, out ulong extentStart);
-            _extentsOff.TryGetValue(extentStart, out ulong extentStartingOffset);
+namespace Aaru.DiscImages;
 
-            return extentStartingOffset + (sectorAddress - extentStart);
-        }
+public sealed partial class PartClone
+{
+    ulong BlockOffset(ulong sectorAddress)
+    {
+        _extents.GetStart(sectorAddress, out ulong extentStart);
+        _extentsOff.TryGetValue(extentStart, out ulong extentStartingOffset);
+
+        return extentStartingOffset + (sectorAddress - extentStart);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/PartClone/Identify.cs b/Aaru.Images/PartClone/Identify.cs
index ee645d35e..8e4e6dc26 100644
--- a/Aaru.Images/PartClone/Identify.cs
+++ b/Aaru.Images/PartClone/Identify.cs
@@ -35,32 +35,31 @@ using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class PartClone
 {
-    public sealed partial class PartClone
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512)
-                return false;
+        if(stream.Length < 512)
+            return false;
 
-            byte[] pHdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(pHdrB, 0, Marshal.SizeOf<Header>());
-            _pHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
+        byte[] pHdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(pHdrB, 0, Marshal.SizeOf<Header>());
+        _pHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
 
-            if(stream.Position + (long)_pHdr.totalBlocks > stream.Length)
-                return false;
+        if(stream.Position + (long)_pHdr.totalBlocks > stream.Length)
+            return false;
 
-            stream.Seek((long)_pHdr.totalBlocks, SeekOrigin.Current);
+        stream.Seek((long)_pHdr.totalBlocks, SeekOrigin.Current);
 
-            byte[] bitmagic = new byte[8];
-            stream.Read(bitmagic, 0, 8);
+        byte[] bitmagic = new byte[8];
+        stream.Read(bitmagic, 0, 8);
 
-            return _partCloneMagic.SequenceEqual(_pHdr.magic) && _biTmAgIc.SequenceEqual(bitmagic);
-        }
+        return _partCloneMagic.SequenceEqual(_pHdr.magic) && _biTmAgIc.SequenceEqual(bitmagic);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/PartClone/PartClone.cs b/Aaru.Images/PartClone/PartClone.cs
index f92eefc8d..7865fcf63 100644
--- a/Aaru.Images/PartClone/PartClone.cs
+++ b/Aaru.Images/PartClone/PartClone.cs
@@ -37,43 +37,42 @@ using Aaru.CommonTypes.Extents;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <summary>Implements reading partclone disk images</summary>
-    public sealed partial class PartClone : IMediaImage, IVerifiableImage
-    {
-        // The used block "bitmap" uses one byte per block
-        // TODO: Convert on-image bytemap to on-memory bitmap
-        byte[]                    _byteMap;
-        long                      _dataOff;
-        ExtentsULong              _extents;
-        Dictionary<ulong, ulong>  _extentsOff;
-        ImageInfo                 _imageInfo;
-        Stream                    _imageStream;
-        Header                    _pHdr;
-        Dictionary<ulong, byte[]> _sectorCache;
+namespace Aaru.DiscImages;
 
-        public PartClone() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Application           = "PartClone",
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <summary>Implements reading partclone disk images</summary>
+public sealed partial class PartClone : IMediaImage, IVerifiableImage
+{
+    // The used block "bitmap" uses one byte per block
+    // TODO: Convert on-image bytemap to on-memory bitmap
+    byte[]                    _byteMap;
+    long                      _dataOff;
+    ExtentsULong              _extents;
+    Dictionary<ulong, ulong>  _extentsOff;
+    ImageInfo                 _imageInfo;
+    Stream                    _imageStream;
+    Header                    _pHdr;
+    Dictionary<ulong, byte[]> _sectorCache;
+
+    public PartClone() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Application           = "PartClone",
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/PartClone/Properties.cs b/Aaru.Images/PartClone/Properties.cs
index 0b3b2af1d..deae37b14 100644
--- a/Aaru.Images/PartClone/Properties.cs
+++ b/Aaru.Images/PartClone/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class PartClone
 {
-    public sealed partial class PartClone
-    {
-        /// <inheritdoc />
-        public string Name => "PartClone disk image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("AB1D7518-B548-4099-A4E2-C29C53DDE0C3");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "PartClone";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public string Name => "PartClone disk image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("AB1D7518-B548-4099-A4E2-C29C53DDE0C3");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "PartClone";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/PartClone/Read.cs b/Aaru.Images/PartClone/Read.cs
index 4dfd92706..5b3a7a502 100644
--- a/Aaru.Images/PartClone/Read.cs
+++ b/Aaru.Images/PartClone/Read.cs
@@ -41,181 +41,180 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class PartClone
 {
-    public sealed partial class PartClone
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 512)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] pHdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(pHdrB, 0, Marshal.SizeOf<Header>());
+        _pHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
+
+        AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.magic = {0}", StringHandlers.CToString(_pHdr.magic));
+
+        AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.filesystem = {0}",
+                                   StringHandlers.CToString(_pHdr.filesystem));
+
+        AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.version = {0}",
+                                   StringHandlers.CToString(_pHdr.version));
+
+        AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.blockSize = {0}", _pHdr.blockSize);
+        AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.deviceSize = {0}", _pHdr.deviceSize);
+        AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.totalBlocks = {0}", _pHdr.totalBlocks);
+        AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.usedBlocks = {0}", _pHdr.usedBlocks);
+
+        _byteMap = new byte[_pHdr.totalBlocks];
+        AaruConsole.DebugWriteLine("PartClone plugin", "Reading bytemap {0} bytes", _byteMap.Length);
+        stream.Read(_byteMap, 0, _byteMap.Length);
+
+        byte[] bitmagic = new byte[8];
+        stream.Read(bitmagic, 0, 8);
+
+        AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.bitmagic = {0}", StringHandlers.CToString(bitmagic));
+
+        if(!_biTmAgIc.SequenceEqual(bitmagic))
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            AaruConsole.ErrorWriteLine("Could not find partclone BiTmAgIc, not continuing...");
 
-            if(stream.Length < 512)
-                return ErrorNumber.InvalidArgument;
-
-            byte[] pHdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(pHdrB, 0, Marshal.SizeOf<Header>());
-            _pHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
-
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.magic = {0}", StringHandlers.CToString(_pHdr.magic));
-
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.filesystem = {0}",
-                                       StringHandlers.CToString(_pHdr.filesystem));
-
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.version = {0}",
-                                       StringHandlers.CToString(_pHdr.version));
-
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.blockSize = {0}", _pHdr.blockSize);
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.deviceSize = {0}", _pHdr.deviceSize);
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.totalBlocks = {0}", _pHdr.totalBlocks);
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.usedBlocks = {0}", _pHdr.usedBlocks);
-
-            _byteMap = new byte[_pHdr.totalBlocks];
-            AaruConsole.DebugWriteLine("PartClone plugin", "Reading bytemap {0} bytes", _byteMap.Length);
-            stream.Read(_byteMap, 0, _byteMap.Length);
-
-            byte[] bitmagic = new byte[8];
-            stream.Read(bitmagic, 0, 8);
-
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.bitmagic = {0}", StringHandlers.CToString(bitmagic));
-
-            if(!_biTmAgIc.SequenceEqual(bitmagic))
-            {
-                AaruConsole.ErrorWriteLine("Could not find partclone BiTmAgIc, not continuing...");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            _dataOff = stream.Position;
-            AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.dataOff = {0}", _dataOff);
-
-            AaruConsole.DebugWriteLine("PartClone plugin", "Filling extents");
-            DateTime start = DateTime.Now;
-            _extents    = new ExtentsULong();
-            _extentsOff = new Dictionary<ulong, ulong>();
-            bool  current     = _byteMap[0] > 0;
-            ulong blockOff    = 0;
-            ulong extentStart = 0;
-
-            for(ulong i = 1; i < _pHdr.totalBlocks; i++)
-            {
-                bool next = _byteMap[i] > 0;
-
-                // Flux
-                if(next != current)
-                    if(next)
-                    {
-                        extentStart = i;
-                        _extentsOff.Add(i, ++blockOff);
-                    }
-                    else
-                    {
-                        _extents.Add(extentStart, i);
-                        _extentsOff.TryGetValue(extentStart, out _);
-                    }
-
-                if(next && current)
-                    blockOff++;
-
-                current = next;
-            }
-
-            DateTime end = DateTime.Now;
-
-            AaruConsole.DebugWriteLine("PartClone plugin", "Took {0} seconds to fill extents",
-                                       (end - start).TotalSeconds);
-
-            _sectorCache = new Dictionary<ulong, byte[]>();
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = _pHdr.totalBlocks;
-            _imageInfo.SectorSize           = _pHdr.blockSize;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.MediaType            = MediaType.GENERIC_HDD;
-            _imageInfo.ImageSize            = (ulong)(stream.Length - (4096 + 0x40 + (long)_pHdr.totalBlocks));
-            _imageStream                    = stream;
-
-            return ErrorNumber.NoError;
+            return ErrorNumber.InvalidArgument;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        _dataOff = stream.Position;
+        AaruConsole.DebugWriteLine("PartClone plugin", "pHdr.dataOff = {0}", _dataOff);
+
+        AaruConsole.DebugWriteLine("PartClone plugin", "Filling extents");
+        DateTime start = DateTime.Now;
+        _extents    = new ExtentsULong();
+        _extentsOff = new Dictionary<ulong, ulong>();
+        bool  current     = _byteMap[0] > 0;
+        ulong blockOff    = 0;
+        ulong extentStart = 0;
+
+        for(ulong i = 1; i < _pHdr.totalBlocks; i++)
         {
-            buffer = null;
+            bool next = _byteMap[i] > 0;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(_byteMap[sectorAddress] == 0)
-            {
-                buffer = new byte[_pHdr.blockSize];
-
-                return ErrorNumber.NoError;
-            }
-
-            if(_sectorCache.TryGetValue(sectorAddress, out buffer))
-                return ErrorNumber.NoError;
-
-            long imageOff = _dataOff + (long)(BlockOffset(sectorAddress) * (_pHdr.blockSize + CRC_SIZE));
-
-            buffer = new byte[_pHdr.blockSize];
-            _imageStream.Seek(imageOff, SeekOrigin.Begin);
-            _imageStream.Read(buffer, 0, (int)_pHdr.blockSize);
-
-            if(_sectorCache.Count > MAX_CACHED_SECTORS)
-                _sectorCache.Clear();
-
-            _sectorCache.Add(sectorAddress, buffer);
-
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            bool allEmpty = true;
-
-            for(uint i = 0; i < length; i++)
-                if(_byteMap[sectorAddress + i] != 0)
+            // Flux
+            if(next != current)
+                if(next)
                 {
-                    allEmpty = false;
-
-                    break;
+                    extentStart = i;
+                    _extentsOff.Add(i, ++blockOff);
+                }
+                else
+                {
+                    _extents.Add(extentStart, i);
+                    _extentsOff.TryGetValue(extentStart, out _);
                 }
 
-            if(allEmpty)
-            {
-                buffer = new byte[_pHdr.blockSize * length];
+            if(next && current)
+                blockOff++;
 
-                return ErrorNumber.NoError;
-            }
+            current = next;
+        }
 
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+        DateTime end = DateTime.Now;
 
-                if(errno != ErrorNumber.NoError)
-                    return errno;
+        AaruConsole.DebugWriteLine("PartClone plugin", "Took {0} seconds to fill extents",
+                                   (end - start).TotalSeconds);
 
-                ms.Write(sector, 0, sector.Length);
-            }
+        _sectorCache = new Dictionary<ulong, byte[]>();
 
-            buffer = ms.ToArray();
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = _pHdr.totalBlocks;
+        _imageInfo.SectorSize           = _pHdr.blockSize;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.MediaType            = MediaType.GENERIC_HDD;
+        _imageInfo.ImageSize            = (ulong)(stream.Length - (4096 + 0x40 + (long)_pHdr.totalBlocks));
+        _imageStream                    = stream;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(_byteMap[sectorAddress] == 0)
+        {
+            buffer = new byte[_pHdr.blockSize];
 
             return ErrorNumber.NoError;
         }
+
+        if(_sectorCache.TryGetValue(sectorAddress, out buffer))
+            return ErrorNumber.NoError;
+
+        long imageOff = _dataOff + (long)(BlockOffset(sectorAddress) * (_pHdr.blockSize + CRC_SIZE));
+
+        buffer = new byte[_pHdr.blockSize];
+        _imageStream.Seek(imageOff, SeekOrigin.Begin);
+        _imageStream.Read(buffer, 0, (int)_pHdr.blockSize);
+
+        if(_sectorCache.Count > MAX_CACHED_SECTORS)
+            _sectorCache.Clear();
+
+        _sectorCache.Add(sectorAddress, buffer);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        bool allEmpty = true;
+
+        for(uint i = 0; i < length; i++)
+            if(_byteMap[sectorAddress + i] != 0)
+            {
+                allEmpty = false;
+
+                break;
+            }
+
+        if(allEmpty)
+        {
+            buffer = new byte[_pHdr.blockSize * length];
+
+            return ErrorNumber.NoError;
+        }
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/PartClone/Structs.cs b/Aaru.Images/PartClone/Structs.cs
index 712c74bd2..362b03f68 100644
--- a/Aaru.Images/PartClone/Structs.cs
+++ b/Aaru.Images/PartClone/Structs.cs
@@ -32,36 +32,35 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class PartClone
 {
-    public sealed partial class PartClone
+    /// <summary>PartClone disk image header, little-endian</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        /// <summary>PartClone disk image header, little-endian</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            /// <summary>Magic, <see cref="PartClone._partCloneMagic" /></summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
-            public readonly byte[] magic;
-            /// <summary>Source filesystem</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
-            public readonly byte[] filesystem;
-            /// <summary>Version</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] version;
-            /// <summary>Padding</summary>
-            public readonly ushort padding;
-            /// <summary>Block (sector) size</summary>
-            public readonly uint blockSize;
-            /// <summary>Size of device containing the cloned partition</summary>
-            public readonly ulong deviceSize;
-            /// <summary>Total blocks in cloned partition</summary>
-            public readonly ulong totalBlocks;
-            /// <summary>Used blocks in cloned partition</summary>
-            public readonly ulong usedBlocks;
-            /// <summary>Empty space</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4096)]
-            public readonly byte[] buffer;
-        }
+        /// <summary>Magic, <see cref="PartClone._partCloneMagic" /></summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
+        public readonly byte[] magic;
+        /// <summary>Source filesystem</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
+        public readonly byte[] filesystem;
+        /// <summary>Version</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] version;
+        /// <summary>Padding</summary>
+        public readonly ushort padding;
+        /// <summary>Block (sector) size</summary>
+        public readonly uint blockSize;
+        /// <summary>Size of device containing the cloned partition</summary>
+        public readonly ulong deviceSize;
+        /// <summary>Total blocks in cloned partition</summary>
+        public readonly ulong totalBlocks;
+        /// <summary>Used blocks in cloned partition</summary>
+        public readonly ulong usedBlocks;
+        /// <summary>Empty space</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4096)]
+        public readonly byte[] buffer;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/PartClone/Unsupported.cs b/Aaru.Images/PartClone/Unsupported.cs
index 0a8958e0f..d6ee9f889 100644
--- a/Aaru.Images/PartClone/Unsupported.cs
+++ b/Aaru.Images/PartClone/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class PartClone
 {
-    public sealed partial class PartClone
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/PartClone/Verify.cs b/Aaru.Images/PartClone/Verify.cs
index 5b1d50def..a5859ad14 100644
--- a/Aaru.Images/PartClone/Verify.cs
+++ b/Aaru.Images/PartClone/Verify.cs
@@ -30,12 +30,11 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class PartClone
 {
-    public sealed partial class PartClone
-    {
-        // TODO: All blocks contain a CRC32 that's incompatible with current implementation. Need to check for compatibility.
-        /// <inheritdoc />
-        public bool? VerifyMediaImage() => null;
-    }
+    // TODO: All blocks contain a CRC32 that's incompatible with current implementation. Need to check for compatibility.
+    /// <inheritdoc />
+    public bool? VerifyMediaImage() => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Constants.cs b/Aaru.Images/Partimage/Constants.cs
index fb7108511..51b2f5215 100644
--- a/Aaru.Images/Partimage/Constants.cs
+++ b/Aaru.Images/Partimage/Constants.cs
@@ -32,43 +32,42 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Partimage
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Partimage
+    const int    MAX_DESCRIPTION         = 4096;
+    const int    MAX_HOSTNAMESIZE        = 128;
+    const int    MAX_DEVICENAMELEN       = 512;
+    const int    MAX_UNAMEINFOLEN        = 65; //SYS_NMLN
+    const int    MBR_SIZE_WHOLE          = 512;
+    const int    MAX_DESC_MODEL          = 128;
+    const int    MAX_DESC_GEOMETRY       = 1024;
+    const int    MAX_DESC_IDENTIFY       = 4096;
+    const int    CHECK_FREQUENCY         = 65536;
+    const string MAGIC_BEGIN_LOCALHEADER = "MAGIC-BEGIN-LOCALHEADER";
+    const string MAGIC_BEGIN_DATABLOCKS  = "MAGIC-BEGIN-DATABLOCKS";
+    const string MAGIC_BEGIN_BITMAP      = "MAGIC-BEGIN-BITMAP";
+    const string MAGIC_BEGIN_MBRBACKUP   = "MAGIC-BEGIN-MBRBACKUP";
+    const string MAGIC_BEGIN_TAIL        = "MAGIC-BEGIN-TAIL";
+    const string MAGIC_BEGIN_INFO        = "MAGIC-BEGIN-INFO";
+    const string MAGIC_BEGIN_EXT000      = "MAGIC-BEGIN-EXT000"; // reserved for future use
+    const string MAGIC_BEGIN_EXT001      = "MAGIC-BEGIN-EXT001"; // reserved for future use
+    const string MAGIC_BEGIN_EXT002      = "MAGIC-BEGIN-EXT002"; // reserved for future use
+    const string MAGIC_BEGIN_EXT003      = "MAGIC-BEGIN-EXT003"; // reserved for future use
+    const string MAGIC_BEGIN_EXT004      = "MAGIC-BEGIN-EXT004"; // reserved for future use
+    const string MAGIC_BEGIN_EXT005      = "MAGIC-BEGIN-EXT005"; // reserved for future use
+    const string MAGIC_BEGIN_EXT006      = "MAGIC-BEGIN-EXT006"; // reserved for future use
+    const string MAGIC_BEGIN_EXT007      = "MAGIC-BEGIN-EXT007"; // reserved for future use
+    const string MAGIC_BEGIN_EXT008      = "MAGIC-BEGIN-EXT008"; // reserved for future use
+    const string MAGIC_BEGIN_EXT009      = "MAGIC-BEGIN-EXT009"; // reserved for future use
+    const string MAGIC_BEGIN_VOLUME      = "PaRtImAgE-VoLuMe";
+    const uint   MAX_CACHE_SIZE          = 16777216;
+    const uint   MAX_CACHED_SECTORS      = MAX_CACHE_SIZE / 512;
+    readonly byte[] _partimageMagic =
     {
-        const int    MAX_DESCRIPTION         = 4096;
-        const int    MAX_HOSTNAMESIZE        = 128;
-        const int    MAX_DEVICENAMELEN       = 512;
-        const int    MAX_UNAMEINFOLEN        = 65; //SYS_NMLN
-        const int    MBR_SIZE_WHOLE          = 512;
-        const int    MAX_DESC_MODEL          = 128;
-        const int    MAX_DESC_GEOMETRY       = 1024;
-        const int    MAX_DESC_IDENTIFY       = 4096;
-        const int    CHECK_FREQUENCY         = 65536;
-        const string MAGIC_BEGIN_LOCALHEADER = "MAGIC-BEGIN-LOCALHEADER";
-        const string MAGIC_BEGIN_DATABLOCKS  = "MAGIC-BEGIN-DATABLOCKS";
-        const string MAGIC_BEGIN_BITMAP      = "MAGIC-BEGIN-BITMAP";
-        const string MAGIC_BEGIN_MBRBACKUP   = "MAGIC-BEGIN-MBRBACKUP";
-        const string MAGIC_BEGIN_TAIL        = "MAGIC-BEGIN-TAIL";
-        const string MAGIC_BEGIN_INFO        = "MAGIC-BEGIN-INFO";
-        const string MAGIC_BEGIN_EXT000      = "MAGIC-BEGIN-EXT000"; // reserved for future use
-        const string MAGIC_BEGIN_EXT001      = "MAGIC-BEGIN-EXT001"; // reserved for future use
-        const string MAGIC_BEGIN_EXT002      = "MAGIC-BEGIN-EXT002"; // reserved for future use
-        const string MAGIC_BEGIN_EXT003      = "MAGIC-BEGIN-EXT003"; // reserved for future use
-        const string MAGIC_BEGIN_EXT004      = "MAGIC-BEGIN-EXT004"; // reserved for future use
-        const string MAGIC_BEGIN_EXT005      = "MAGIC-BEGIN-EXT005"; // reserved for future use
-        const string MAGIC_BEGIN_EXT006      = "MAGIC-BEGIN-EXT006"; // reserved for future use
-        const string MAGIC_BEGIN_EXT007      = "MAGIC-BEGIN-EXT007"; // reserved for future use
-        const string MAGIC_BEGIN_EXT008      = "MAGIC-BEGIN-EXT008"; // reserved for future use
-        const string MAGIC_BEGIN_EXT009      = "MAGIC-BEGIN-EXT009"; // reserved for future use
-        const string MAGIC_BEGIN_VOLUME      = "PaRtImAgE-VoLuMe";
-        const uint   MAX_CACHE_SIZE          = 16777216;
-        const uint   MAX_CACHED_SECTORS      = MAX_CACHE_SIZE / 512;
-        readonly byte[] _partimageMagic =
-        {
-            0x50, 0x61, 0x52, 0x74, 0x49, 0x6D, 0x41, 0x67, 0x45, 0x2D, 0x56, 0x6F, 0x4C, 0x75, 0x4D, 0x65, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
-    }
+        0x50, 0x61, 0x52, 0x74, 0x49, 0x6D, 0x41, 0x67, 0x45, 0x2D, 0x56, 0x6F, 0x4C, 0x75, 0x4D, 0x65, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Enums.cs b/Aaru.Images/Partimage/Enums.cs
index 6311a244b..f5d0abe9e 100644
--- a/Aaru.Images/Partimage/Enums.cs
+++ b/Aaru.Images/Partimage/Enums.cs
@@ -32,20 +32,19 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
-{
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Partimage
-    {
-        enum PCompression : uint
-        {
-            None = 0, Gzip = 1, Bzip2 = 2,
-            Lzo  = 3
-        }
+namespace Aaru.DiscImages;
 
-        enum PEncryption : uint
-        {
-            None = 0
-        }
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Partimage
+{
+    enum PCompression : uint
+    {
+        None = 0, Gzip = 1, Bzip2 = 2,
+        Lzo  = 3
+    }
+
+    enum PEncryption : uint
+    {
+        None = 0
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Helpers.cs b/Aaru.Images/Partimage/Helpers.cs
index ad5500315..4633a16d9 100644
--- a/Aaru.Images/Partimage/Helpers.cs
+++ b/Aaru.Images/Partimage/Helpers.cs
@@ -30,16 +30,15 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Partimage
-    {
-        ulong BlockOffset(ulong sectorAddress)
-        {
-            _extents.GetStart(sectorAddress, out ulong extentStart);
-            _extentsOff.TryGetValue(extentStart, out ulong extentStartingOffset);
+namespace Aaru.DiscImages;
 
-            return extentStartingOffset + (sectorAddress - extentStart);
-        }
+public sealed partial class Partimage
+{
+    ulong BlockOffset(ulong sectorAddress)
+    {
+        _extents.GetStart(sectorAddress, out ulong extentStart);
+        _extentsOff.TryGetValue(extentStart, out ulong extentStartingOffset);
+
+        return extentStartingOffset + (sectorAddress - extentStart);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Identify.cs b/Aaru.Images/Partimage/Identify.cs
index 20db188a3..b917471cf 100644
--- a/Aaru.Images/Partimage/Identify.cs
+++ b/Aaru.Images/Partimage/Identify.cs
@@ -35,24 +35,23 @@ using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Partimage
 {
-    public sealed partial class Partimage
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512)
-                return false;
+        if(stream.Length < 512)
+            return false;
 
-            byte[] pHdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(pHdrB, 0, Marshal.SizeOf<Header>());
-            _cVolumeHeader = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
+        byte[] pHdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(pHdrB, 0, Marshal.SizeOf<Header>());
+        _cVolumeHeader = Marshal.ByteArrayToStructureLittleEndian<Header>(pHdrB);
 
-            return _partimageMagic.SequenceEqual(_cVolumeHeader.magic);
-        }
+        return _partimageMagic.SequenceEqual(_cVolumeHeader.magic);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Partimage.cs b/Aaru.Images/Partimage/Partimage.cs
index c8d0a724a..d753025df 100644
--- a/Aaru.Images/Partimage/Partimage.cs
+++ b/Aaru.Images/Partimage/Partimage.cs
@@ -39,42 +39,41 @@ using Aaru.CommonTypes.Structs;
 
 #pragma warning disable 649
 
-namespace Aaru.DiscImages
-{
-    /// <summary>Implements reading partimage disk images</summary>
-    public sealed partial class Partimage : IMediaImage, IVerifiableImage
-    {
-        byte[]                    _bitmap;
-        MainHeader                _cMainHeader;
-        Header                    _cVolumeHeader;
-        long                      _dataOff;
-        ExtentsULong              _extents;
-        Dictionary<ulong, ulong>  _extentsOff;
-        ImageInfo                 _imageInfo;
-        Stream                    _imageStream;
-        Dictionary<ulong, byte[]> _sectorCache;
+namespace Aaru.DiscImages;
 
-        public Partimage() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Application           = "Partimage",
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <summary>Implements reading partimage disk images</summary>
+public sealed partial class Partimage : IMediaImage, IVerifiableImage
+{
+    byte[]                    _bitmap;
+    MainHeader                _cMainHeader;
+    Header                    _cVolumeHeader;
+    long                      _dataOff;
+    ExtentsULong              _extents;
+    Dictionary<ulong, ulong>  _extentsOff;
+    ImageInfo                 _imageInfo;
+    Stream                    _imageStream;
+    Dictionary<ulong, byte[]> _sectorCache;
+
+    public Partimage() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Application           = "Partimage",
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Properties.cs b/Aaru.Images/Partimage/Properties.cs
index 2c7fcc8c9..30e956628 100644
--- a/Aaru.Images/Partimage/Properties.cs
+++ b/Aaru.Images/Partimage/Properties.cs
@@ -35,24 +35,23 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Partimage
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public string Name => "Partimage disk image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("AAFDB99D-2B77-49EA-831C-C9BB58C68C95");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Partimage";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+public sealed partial class Partimage
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "Partimage disk image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("AAFDB99D-2B77-49EA-831C-C9BB58C68C95");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Partimage";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Read.cs b/Aaru.Images/Partimage/Read.cs
index 637eea89b..308a99846 100644
--- a/Aaru.Images/Partimage/Read.cs
+++ b/Aaru.Images/Partimage/Read.cs
@@ -40,433 +40,432 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Partimage
 {
-    public sealed partial class Partimage
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 512)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(hdrB, 0, Marshal.SizeOf<Header>());
+        _cVolumeHeader = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.magic = {0}",
+                                   StringHandlers.CToString(_cVolumeHeader.magic));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.version = {0}",
+                                   StringHandlers.CToString(_cVolumeHeader.version));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.volumeNumber = {0}",
+                                   _cVolumeHeader.volumeNumber);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.identificator = {0:X16}",
+                                   _cVolumeHeader.identificator);
+
+        // TODO: Support multifile volumes
+        if(_cVolumeHeader.volumeNumber > 0)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            AaruConsole.ErrorWriteLine("Support for multiple volumes not supported");
 
-            if(stream.Length < 512)
-                return ErrorNumber.InvalidArgument;
-
-            byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(hdrB, 0, Marshal.SizeOf<Header>());
-            _cVolumeHeader = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.magic = {0}",
-                                       StringHandlers.CToString(_cVolumeHeader.magic));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.version = {0}",
-                                       StringHandlers.CToString(_cVolumeHeader.version));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.volumeNumber = {0}",
-                                       _cVolumeHeader.volumeNumber);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CVolumeHeader.identificator = {0:X16}",
-                                       _cVolumeHeader.identificator);
-
-            // TODO: Support multifile volumes
-            if(_cVolumeHeader.volumeNumber > 0)
-            {
-                AaruConsole.ErrorWriteLine("Support for multiple volumes not supported");
-
-                return ErrorNumber.NotImplemented;
-            }
-
-            hdrB = new byte[Marshal.SizeOf<MainHeader>()];
-            stream.Read(hdrB, 0, Marshal.SizeOf<MainHeader>());
-            _cMainHeader = Marshal.ByteArrayToStructureLittleEndian<MainHeader>(hdrB);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szFileSystem = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szFileSystem));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szPartDescription = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szPartDescription));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szOriginalDevice = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szOriginalDevice));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szFirstImageFilepath = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szFirstImageFilepath));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameSysname = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szUnameSysname));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameNodename = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szUnameNodename));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameRelease = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szUnameRelease));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameVersion = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szUnameVersion));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameMachine = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szUnameMachine));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwCompression = {0} ({1})",
-                                       _cMainHeader.dwCompression, (uint)_cMainHeader.dwCompression);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMainFlags = {0}", _cMainHeader.dwMainFlags);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_sec = {0}",
-                                       _cMainHeader.dateCreate.Second);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_min = {0}",
-                                       _cMainHeader.dateCreate.Minute);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_hour = {0}",
-                                       _cMainHeader.dateCreate.Hour);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_mday = {0}",
-                                       _cMainHeader.dateCreate.DayOfMonth);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_mon = {0}",
-                                       _cMainHeader.dateCreate.Month);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_year = {0}",
-                                       _cMainHeader.dateCreate.Year);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_wday = {0}",
-                                       _cMainHeader.dateCreate.DayOfWeek);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_yday = {0}",
-                                       _cMainHeader.dateCreate.DayOfYear);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_isdst = {0}",
-                                       _cMainHeader.dateCreate.IsDst);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_gmtoffsec = {0}",
-                                       _cMainHeader.dateCreate.GmtOff);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_zone = {0}",
-                                       _cMainHeader.dateCreate.Timezone);
-
-            var dateCreate = new DateTime(1900                               + (int)_cMainHeader.dateCreate.Year,
-                                          (int)_cMainHeader.dateCreate.Month + 1,
-                                          (int)_cMainHeader.dateCreate.DayOfMonth, (int)_cMainHeader.dateCreate.Hour,
-                                          (int)_cMainHeader.dateCreate.Minute, (int)_cMainHeader.dateCreate.Second);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate = {0}", dateCreate);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.qwPartSize = {0}", _cMainHeader.qwPartSize);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szHostname = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szHostname));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szVersion = {0}",
-                                       StringHandlers.CToString(_cMainHeader.szVersion));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMbrCount = {0}", _cMainHeader.dwMbrCount);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMbrSize = {0}", _cMainHeader.dwMbrSize);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwEncryptAlgo = {0} ({1})",
-                                       _cMainHeader.dwEncryptAlgo, (uint)_cMainHeader.dwEncryptAlgo);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "ArrayIsNullOrEmpty(CMainHeader.cHashTestKey) = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(_cMainHeader.cHashTestKey));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture000 = {0}",
-                                       _cMainHeader.dwReservedFuture000);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture001 = {0}",
-                                       _cMainHeader.dwReservedFuture001);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture002 = {0}",
-                                       _cMainHeader.dwReservedFuture002);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture003 = {0}",
-                                       _cMainHeader.dwReservedFuture003);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture004 = {0}",
-                                       _cMainHeader.dwReservedFuture004);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture005 = {0}",
-                                       _cMainHeader.dwReservedFuture005);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture006 = {0}",
-                                       _cMainHeader.dwReservedFuture006);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture007 = {0}",
-                                       _cMainHeader.dwReservedFuture007);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture008 = {0}",
-                                       _cMainHeader.dwReservedFuture008);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture009 = {0}",
-                                       _cMainHeader.dwReservedFuture009);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "ArrayIsNullOrEmpty(CMainHeader.cReserved) = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(_cMainHeader.cReserved));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.crc = 0x{0:X8}", _cMainHeader.crc);
-
-            // partimage 0.6.1 does not support them either
-            if(_cMainHeader.dwEncryptAlgo != PEncryption.None)
-            {
-                AaruConsole.ErrorWriteLine("Encrypted images are currently not supported.");
-
-                return ErrorNumber.NotImplemented;
-            }
-
-            string magic;
-
-            // Skip MBRs
-            if(_cMainHeader.dwMbrCount > 0)
-            {
-                hdrB = new byte[MAGIC_BEGIN_MBRBACKUP.Length];
-                stream.Read(hdrB, 0, MAGIC_BEGIN_MBRBACKUP.Length);
-                magic = StringHandlers.CToString(hdrB);
-
-                if(!magic.Equals(MAGIC_BEGIN_MBRBACKUP))
-                {
-                    AaruConsole.ErrorWriteLine("Cannot find MBRs");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                stream.Seek(_cMainHeader.dwMbrSize * _cMainHeader.dwMbrCount, SeekOrigin.Current);
-            }
-
-            // Skip extended headers and their CRC fields
-            stream.Seek((MAGIC_BEGIN_EXT000.Length + 4) * 10, SeekOrigin.Current);
-
-            hdrB = new byte[MAGIC_BEGIN_LOCALHEADER.Length];
-            stream.Read(hdrB, 0, MAGIC_BEGIN_LOCALHEADER.Length);
-            magic = StringHandlers.CToString(hdrB);
-
-            if(!magic.Equals(MAGIC_BEGIN_LOCALHEADER))
-            {
-                AaruConsole.ErrorWriteLine("Cannot find local header");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            hdrB = new byte[Marshal.SizeOf<CLocalHeader>()];
-            stream.Read(hdrB, 0, Marshal.SizeOf<CLocalHeader>());
-            CLocalHeader localHeader = Marshal.ByteArrayToStructureLittleEndian<CLocalHeader>(hdrB);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBlockSize = {0}", localHeader.qwBlockSize);
-            AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwUsedBlocks = {0}", localHeader.qwUsedBlocks);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBlocksCount = {0}",
-                                       localHeader.qwBlocksCount);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBitmapSize = {0}", localHeader.qwBitmapSize);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBadBlocksCount = {0}",
-                                       localHeader.qwBadBlocksCount);
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.szLabel = {0}",
-                                       StringHandlers.CToString(localHeader.szLabel));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "ArrayIsNullOrEmpty(CLocalHeader.cReserved) = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(localHeader.cReserved));
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.crc = 0x{0:X8}", localHeader.crc);
-
-            hdrB = new byte[MAGIC_BEGIN_BITMAP.Length];
-            stream.Read(hdrB, 0, MAGIC_BEGIN_BITMAP.Length);
-            magic = StringHandlers.CToString(hdrB);
-
-            if(!magic.Equals(MAGIC_BEGIN_BITMAP))
-            {
-                AaruConsole.ErrorWriteLine("Cannot find bitmap");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            _bitmap = new byte[localHeader.qwBitmapSize];
-            stream.Read(_bitmap, 0, (int)localHeader.qwBitmapSize);
-
-            hdrB = new byte[MAGIC_BEGIN_INFO.Length];
-            stream.Read(hdrB, 0, MAGIC_BEGIN_INFO.Length);
-            magic = StringHandlers.CToString(hdrB);
-
-            if(!magic.Equals(MAGIC_BEGIN_INFO))
-            {
-                AaruConsole.ErrorWriteLine("Cannot find info block");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            // Skip info block and its checksum
-            stream.Seek(16384 + 4, SeekOrigin.Current);
-
-            hdrB = new byte[MAGIC_BEGIN_DATABLOCKS.Length];
-            stream.Read(hdrB, 0, MAGIC_BEGIN_DATABLOCKS.Length);
-            magic = StringHandlers.CToString(hdrB);
-
-            if(!magic.Equals(MAGIC_BEGIN_DATABLOCKS))
-            {
-                AaruConsole.ErrorWriteLine("Cannot find data blocks");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            _dataOff = stream.Position;
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "dataOff = {0}", _dataOff);
-
-            // Seek to tail
-            stream.Seek(-(Marshal.SizeOf<CMainTail>() + MAGIC_BEGIN_TAIL.Length), SeekOrigin.End);
-
-            hdrB = new byte[MAGIC_BEGIN_TAIL.Length];
-            stream.Read(hdrB, 0, MAGIC_BEGIN_TAIL.Length);
-            magic = StringHandlers.CToString(hdrB);
-
-            if(!magic.Equals(MAGIC_BEGIN_TAIL))
-            {
-                AaruConsole.ErrorWriteLine("Cannot find tail. Multiple volumes are not supported or image is corrupt.");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "Filling extents");
-            DateTime start = DateTime.Now;
-            _extents    = new ExtentsULong();
-            _extentsOff = new Dictionary<ulong, ulong>();
-            bool  current     = (_bitmap[0] & (1 << (0 % 8))) != 0;
-            ulong blockOff    = 0;
-            ulong extentStart = 0;
-
-            for(ulong i = 1; i <= localHeader.qwBlocksCount; i++)
-            {
-                bool next = (_bitmap[i / 8] & (1 << (int)(i % 8))) != 0;
-
-                // Flux
-                if(next != current)
-                    if(next)
-                    {
-                        extentStart = i;
-                        _extentsOff.Add(i, ++blockOff);
-                    }
-                    else
-                    {
-                        _extents.Add(extentStart, i);
-                        _extentsOff.TryGetValue(extentStart, out ulong _);
-                    }
-
-                if(next && current)
-                    blockOff++;
-
-                current = next;
-            }
-
-            DateTime end = DateTime.Now;
-
-            AaruConsole.DebugWriteLine("Partimage plugin", "Took {0} seconds to fill extents",
-                                       (end - start).TotalSeconds);
-
-            _sectorCache = new Dictionary<ulong, byte[]>();
-
-            _imageInfo.CreationTime         = dateCreate;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = localHeader.qwBlocksCount + 1;
-            _imageInfo.SectorSize           = (uint)localHeader.qwBlockSize;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.MediaType            = MediaType.GENERIC_HDD;
-            _imageInfo.Version              = StringHandlers.CToString(_cMainHeader.szVersion);
-            _imageInfo.Comments             = StringHandlers.CToString(_cMainHeader.szPartDescription);
-
-            _imageInfo.ImageSize =
-                (ulong)(stream.Length - (_dataOff + Marshal.SizeOf<CMainTail>() + MAGIC_BEGIN_TAIL.Length));
-
-            _imageStream = stream;
-
-            return ErrorNumber.NoError;
+            return ErrorNumber.NotImplemented;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        hdrB = new byte[Marshal.SizeOf<MainHeader>()];
+        stream.Read(hdrB, 0, Marshal.SizeOf<MainHeader>());
+        _cMainHeader = Marshal.ByteArrayToStructureLittleEndian<MainHeader>(hdrB);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szFileSystem = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szFileSystem));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szPartDescription = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szPartDescription));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szOriginalDevice = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szOriginalDevice));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szFirstImageFilepath = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szFirstImageFilepath));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameSysname = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szUnameSysname));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameNodename = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szUnameNodename));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameRelease = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szUnameRelease));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameVersion = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szUnameVersion));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szUnameMachine = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szUnameMachine));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwCompression = {0} ({1})",
+                                   _cMainHeader.dwCompression, (uint)_cMainHeader.dwCompression);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMainFlags = {0}", _cMainHeader.dwMainFlags);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_sec = {0}",
+                                   _cMainHeader.dateCreate.Second);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_min = {0}",
+                                   _cMainHeader.dateCreate.Minute);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_hour = {0}",
+                                   _cMainHeader.dateCreate.Hour);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_mday = {0}",
+                                   _cMainHeader.dateCreate.DayOfMonth);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_mon = {0}",
+                                   _cMainHeader.dateCreate.Month);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_year = {0}",
+                                   _cMainHeader.dateCreate.Year);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_wday = {0}",
+                                   _cMainHeader.dateCreate.DayOfWeek);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_yday = {0}",
+                                   _cMainHeader.dateCreate.DayOfYear);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_isdst = {0}",
+                                   _cMainHeader.dateCreate.IsDst);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_gmtoffsec = {0}",
+                                   _cMainHeader.dateCreate.GmtOff);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate.tm_zone = {0}",
+                                   _cMainHeader.dateCreate.Timezone);
+
+        var dateCreate = new DateTime(1900                               + (int)_cMainHeader.dateCreate.Year,
+                                      (int)_cMainHeader.dateCreate.Month + 1,
+                                      (int)_cMainHeader.dateCreate.DayOfMonth, (int)_cMainHeader.dateCreate.Hour,
+                                      (int)_cMainHeader.dateCreate.Minute, (int)_cMainHeader.dateCreate.Second);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dateCreate = {0}", dateCreate);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.qwPartSize = {0}", _cMainHeader.qwPartSize);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szHostname = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szHostname));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.szVersion = {0}",
+                                   StringHandlers.CToString(_cMainHeader.szVersion));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMbrCount = {0}", _cMainHeader.dwMbrCount);
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwMbrSize = {0}", _cMainHeader.dwMbrSize);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwEncryptAlgo = {0} ({1})",
+                                   _cMainHeader.dwEncryptAlgo, (uint)_cMainHeader.dwEncryptAlgo);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "ArrayIsNullOrEmpty(CMainHeader.cHashTestKey) = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(_cMainHeader.cHashTestKey));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture000 = {0}",
+                                   _cMainHeader.dwReservedFuture000);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture001 = {0}",
+                                   _cMainHeader.dwReservedFuture001);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture002 = {0}",
+                                   _cMainHeader.dwReservedFuture002);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture003 = {0}",
+                                   _cMainHeader.dwReservedFuture003);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture004 = {0}",
+                                   _cMainHeader.dwReservedFuture004);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture005 = {0}",
+                                   _cMainHeader.dwReservedFuture005);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture006 = {0}",
+                                   _cMainHeader.dwReservedFuture006);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture007 = {0}",
+                                   _cMainHeader.dwReservedFuture007);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture008 = {0}",
+                                   _cMainHeader.dwReservedFuture008);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.dwReservedFuture009 = {0}",
+                                   _cMainHeader.dwReservedFuture009);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "ArrayIsNullOrEmpty(CMainHeader.cReserved) = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(_cMainHeader.cReserved));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CMainHeader.crc = 0x{0:X8}", _cMainHeader.crc);
+
+        // partimage 0.6.1 does not support them either
+        if(_cMainHeader.dwEncryptAlgo != PEncryption.None)
         {
-            buffer = null;
+            AaruConsole.ErrorWriteLine("Encrypted images are currently not supported.");
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            return ErrorNumber.NotImplemented;
+        }
 
-            if((_bitmap[sectorAddress / 8] & (1 << (int)(sectorAddress % 8))) == 0)
+        string magic;
+
+        // Skip MBRs
+        if(_cMainHeader.dwMbrCount > 0)
+        {
+            hdrB = new byte[MAGIC_BEGIN_MBRBACKUP.Length];
+            stream.Read(hdrB, 0, MAGIC_BEGIN_MBRBACKUP.Length);
+            magic = StringHandlers.CToString(hdrB);
+
+            if(!magic.Equals(MAGIC_BEGIN_MBRBACKUP))
             {
-                buffer = new byte[_imageInfo.SectorSize];
+                AaruConsole.ErrorWriteLine("Cannot find MBRs");
 
-                return ErrorNumber.NoError;
+                return ErrorNumber.InvalidArgument;
             }
 
-            if(_sectorCache.TryGetValue(sectorAddress, out buffer))
-                return ErrorNumber.NoError;
+            stream.Seek(_cMainHeader.dwMbrSize * _cMainHeader.dwMbrCount, SeekOrigin.Current);
+        }
 
-            ulong blockOff = BlockOffset(sectorAddress);
+        // Skip extended headers and their CRC fields
+        stream.Seek((MAGIC_BEGIN_EXT000.Length + 4) * 10, SeekOrigin.Current);
 
-            // Offset of requested sector is:
-            // Start of data +
-            long imageOff = _dataOff +
+        hdrB = new byte[MAGIC_BEGIN_LOCALHEADER.Length];
+        stream.Read(hdrB, 0, MAGIC_BEGIN_LOCALHEADER.Length);
+        magic = StringHandlers.CToString(hdrB);
 
-                            // How many stored bytes to skip
-                            (long)(blockOff * _imageInfo.SectorSize) +
+        if(!magic.Equals(MAGIC_BEGIN_LOCALHEADER))
+        {
+            AaruConsole.ErrorWriteLine("Cannot find local header");
 
-                            // How many bytes of CRC blocks to skip
-                            ((long)(blockOff / (CHECK_FREQUENCY / _imageInfo.SectorSize)) * Marshal.SizeOf<CCheck>());
+            return ErrorNumber.InvalidArgument;
+        }
 
+        hdrB = new byte[Marshal.SizeOf<CLocalHeader>()];
+        stream.Read(hdrB, 0, Marshal.SizeOf<CLocalHeader>());
+        CLocalHeader localHeader = Marshal.ByteArrayToStructureLittleEndian<CLocalHeader>(hdrB);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBlockSize = {0}", localHeader.qwBlockSize);
+        AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwUsedBlocks = {0}", localHeader.qwUsedBlocks);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBlocksCount = {0}",
+                                   localHeader.qwBlocksCount);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBitmapSize = {0}", localHeader.qwBitmapSize);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.qwBadBlocksCount = {0}",
+                                   localHeader.qwBadBlocksCount);
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.szLabel = {0}",
+                                   StringHandlers.CToString(localHeader.szLabel));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "ArrayIsNullOrEmpty(CLocalHeader.cReserved) = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(localHeader.cReserved));
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "CLocalHeader.crc = 0x{0:X8}", localHeader.crc);
+
+        hdrB = new byte[MAGIC_BEGIN_BITMAP.Length];
+        stream.Read(hdrB, 0, MAGIC_BEGIN_BITMAP.Length);
+        magic = StringHandlers.CToString(hdrB);
+
+        if(!magic.Equals(MAGIC_BEGIN_BITMAP))
+        {
+            AaruConsole.ErrorWriteLine("Cannot find bitmap");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        _bitmap = new byte[localHeader.qwBitmapSize];
+        stream.Read(_bitmap, 0, (int)localHeader.qwBitmapSize);
+
+        hdrB = new byte[MAGIC_BEGIN_INFO.Length];
+        stream.Read(hdrB, 0, MAGIC_BEGIN_INFO.Length);
+        magic = StringHandlers.CToString(hdrB);
+
+        if(!magic.Equals(MAGIC_BEGIN_INFO))
+        {
+            AaruConsole.ErrorWriteLine("Cannot find info block");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        // Skip info block and its checksum
+        stream.Seek(16384 + 4, SeekOrigin.Current);
+
+        hdrB = new byte[MAGIC_BEGIN_DATABLOCKS.Length];
+        stream.Read(hdrB, 0, MAGIC_BEGIN_DATABLOCKS.Length);
+        magic = StringHandlers.CToString(hdrB);
+
+        if(!magic.Equals(MAGIC_BEGIN_DATABLOCKS))
+        {
+            AaruConsole.ErrorWriteLine("Cannot find data blocks");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        _dataOff = stream.Position;
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "dataOff = {0}", _dataOff);
+
+        // Seek to tail
+        stream.Seek(-(Marshal.SizeOf<CMainTail>() + MAGIC_BEGIN_TAIL.Length), SeekOrigin.End);
+
+        hdrB = new byte[MAGIC_BEGIN_TAIL.Length];
+        stream.Read(hdrB, 0, MAGIC_BEGIN_TAIL.Length);
+        magic = StringHandlers.CToString(hdrB);
+
+        if(!magic.Equals(MAGIC_BEGIN_TAIL))
+        {
+            AaruConsole.ErrorWriteLine("Cannot find tail. Multiple volumes are not supported or image is corrupt.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "Filling extents");
+        DateTime start = DateTime.Now;
+        _extents    = new ExtentsULong();
+        _extentsOff = new Dictionary<ulong, ulong>();
+        bool  current     = (_bitmap[0] & (1 << (0 % 8))) != 0;
+        ulong blockOff    = 0;
+        ulong extentStart = 0;
+
+        for(ulong i = 1; i <= localHeader.qwBlocksCount; i++)
+        {
+            bool next = (_bitmap[i / 8] & (1 << (int)(i % 8))) != 0;
+
+            // Flux
+            if(next != current)
+                if(next)
+                {
+                    extentStart = i;
+                    _extentsOff.Add(i, ++blockOff);
+                }
+                else
+                {
+                    _extents.Add(extentStart, i);
+                    _extentsOff.TryGetValue(extentStart, out ulong _);
+                }
+
+            if(next && current)
+                blockOff++;
+
+            current = next;
+        }
+
+        DateTime end = DateTime.Now;
+
+        AaruConsole.DebugWriteLine("Partimage plugin", "Took {0} seconds to fill extents",
+                                   (end - start).TotalSeconds);
+
+        _sectorCache = new Dictionary<ulong, byte[]>();
+
+        _imageInfo.CreationTime         = dateCreate;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = localHeader.qwBlocksCount + 1;
+        _imageInfo.SectorSize           = (uint)localHeader.qwBlockSize;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.MediaType            = MediaType.GENERIC_HDD;
+        _imageInfo.Version              = StringHandlers.CToString(_cMainHeader.szVersion);
+        _imageInfo.Comments             = StringHandlers.CToString(_cMainHeader.szPartDescription);
+
+        _imageInfo.ImageSize =
+            (ulong)(stream.Length - (_dataOff + Marshal.SizeOf<CMainTail>() + MAGIC_BEGIN_TAIL.Length));
+
+        _imageStream = stream;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if((_bitmap[sectorAddress / 8] & (1 << (int)(sectorAddress % 8))) == 0)
+        {
             buffer = new byte[_imageInfo.SectorSize];
-            _imageStream.Seek(imageOff, SeekOrigin.Begin);
-            _imageStream.Read(buffer, 0, (int)_imageInfo.SectorSize);
-
-            if(_sectorCache.Count > MAX_CACHED_SECTORS)
-                _sectorCache.Clear();
-
-            _sectorCache.Add(sectorAddress, buffer);
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        if(_sectorCache.TryGetValue(sectorAddress, out buffer))
+            return ErrorNumber.NoError;
+
+        ulong blockOff = BlockOffset(sectorAddress);
+
+        // Offset of requested sector is:
+        // Start of data +
+        long imageOff = _dataOff +
+
+                        // How many stored bytes to skip
+                        (long)(blockOff * _imageInfo.SectorSize) +
+
+                        // How many bytes of CRC blocks to skip
+                        ((long)(blockOff / (CHECK_FREQUENCY / _imageInfo.SectorSize)) * Marshal.SizeOf<CCheck>());
+
+        buffer = new byte[_imageInfo.SectorSize];
+        _imageStream.Seek(imageOff, SeekOrigin.Begin);
+        _imageStream.Read(buffer, 0, (int)_imageInfo.SectorSize);
+
+        if(_sectorCache.Count > MAX_CACHED_SECTORS)
+            _sectorCache.Clear();
+
+        _sectorCache.Add(sectorAddress, buffer);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        bool allEmpty = true;
+
+        for(uint i = 0; i < length; i++)
+            if((_bitmap[sectorAddress / 8] & (1 << (int)(sectorAddress % 8))) != 0)
+            {
+                allEmpty = false;
+
+                break;
+            }
+
+        if(allEmpty)
         {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            bool allEmpty = true;
-
-            for(uint i = 0; i < length; i++)
-                if((_bitmap[sectorAddress / 8] & (1 << (int)(sectorAddress % 8))) != 0)
-                {
-                    allEmpty = false;
-
-                    break;
-                }
-
-            if(allEmpty)
-            {
-                buffer = new byte[_imageInfo.SectorSize * length];
-
-                return ErrorNumber.NoError;
-            }
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
+            buffer = new byte[_imageInfo.SectorSize * length];
 
             return ErrorNumber.NoError;
         }
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Structs.cs b/Aaru.Images/Partimage/Structs.cs
index 836645245..b8c767641 100644
--- a/Aaru.Images/Partimage/Structs.cs
+++ b/Aaru.Images/Partimage/Structs.cs
@@ -33,162 +33,161 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed partial class Partimage
 {
-    [SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed partial class Partimage
+    /// <summary>Partimage disk image header, little-endian</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        /// <summary>Partimage disk image header, little-endian</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            /// <summary>Magic, <see cref="Partimage._partimageMagic" /></summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] magic;
-            /// <summary>Source filesystem</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] version;
-            /// <summary>Volume number</summary>
-            public readonly uint volumeNumber;
-            /// <summary>Image identifier</summary>
-            public readonly ulong identificator;
-            /// <summary>Empty space</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 404)]
-            public readonly byte[] reserved;
-        }
+        /// <summary>Magic, <see cref="Partimage._partimageMagic" /></summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] magic;
+        /// <summary>Source filesystem</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] version;
+        /// <summary>Volume number</summary>
+        public readonly uint volumeNumber;
+        /// <summary>Image identifier</summary>
+        public readonly ulong identificator;
+        /// <summary>Empty space</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 404)]
+        public readonly byte[] reserved;
+    }
 
-        struct PortableTm
-        {
-            public uint Second;
-            public uint Minute;
-            public uint Hour;
-            public uint DayOfMonth;
-            public uint Month;
-            public uint Year;
-            public uint DayOfWeek;
-            public uint DayOfYear;
-            public uint IsDst;
+    struct PortableTm
+    {
+        public uint Second;
+        public uint Minute;
+        public uint Hour;
+        public uint DayOfMonth;
+        public uint Month;
+        public uint Year;
+        public uint DayOfWeek;
+        public uint DayOfYear;
+        public uint IsDst;
 
-            public uint GmtOff;
-            public uint Timezone;
-        }
+        public uint GmtOff;
+        public uint Timezone;
+    }
 
-        /// <summary>Partimage CMainHeader</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct MainHeader
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public readonly byte[] szFileSystem; // ext2fs, ntfs, reiserfs, ...
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DESCRIPTION)]
-            public readonly byte[] szPartDescription; // user description of the partition
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DEVICENAMELEN)]
-            public readonly byte[] szOriginalDevice; // original partition name
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4095)]
-            public readonly byte[] szFirstImageFilepath; //MAXPATHLEN]; // for splitted image files
+    /// <summary>Partimage CMainHeader</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct MainHeader
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
+        public readonly byte[] szFileSystem; // ext2fs, ntfs, reiserfs, ...
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DESCRIPTION)]
+        public readonly byte[] szPartDescription; // user description of the partition
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DEVICENAMELEN)]
+        public readonly byte[] szOriginalDevice; // original partition name
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4095)]
+        public readonly byte[] szFirstImageFilepath; //MAXPATHLEN]; // for splitted image files
 
-            // system and hardware infos
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
-            public readonly byte[] szUnameSysname;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
-            public readonly byte[] szUnameNodename;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
-            public readonly byte[] szUnameRelease;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
-            public readonly byte[] szUnameVersion;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
-            public readonly byte[] szUnameMachine;
+        // system and hardware infos
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
+        public readonly byte[] szUnameSysname;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
+        public readonly byte[] szUnameNodename;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
+        public readonly byte[] szUnameRelease;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
+        public readonly byte[] szUnameVersion;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_UNAMEINFOLEN)]
+        public readonly byte[] szUnameMachine;
 
-            public readonly PCompression dwCompression; // COMPRESS_XXXXXX
-            public readonly uint         dwMainFlags;
-            public readonly PortableTm   dateCreate; // date of image creation
-            public readonly ulong        qwPartSize; // size of the partition in bytes
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_HOSTNAMESIZE)]
-            public readonly byte[] szHostname;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] szVersion; // version of the image file
+        public readonly PCompression dwCompression; // COMPRESS_XXXXXX
+        public readonly uint         dwMainFlags;
+        public readonly PortableTm   dateCreate; // date of image creation
+        public readonly ulong        qwPartSize; // size of the partition in bytes
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_HOSTNAMESIZE)]
+        public readonly byte[] szHostname;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] szVersion; // version of the image file
 
-            // MBR backup
-            public readonly uint dwMbrCount; // how many MBR are saved in the image file
-            public readonly uint dwMbrSize;  // size of a MBR record (allow to change the size in the next versions)
+        // MBR backup
+        public readonly uint dwMbrCount; // how many MBR are saved in the image file
+        public readonly uint dwMbrSize;  // size of a MBR record (allow to change the size in the next versions)
 
-            // future encryption support
-            public readonly PEncryption dwEncryptAlgo; // algo used to encrypt data
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] cHashTestKey; // used to test the password without giving it
+        // future encryption support
+        public readonly PEncryption dwEncryptAlgo; // algo used to encrypt data
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] cHashTestKey; // used to test the password without giving it
 
-            // reserved for future use (save DiskLabel, Extended partitions, ...)
-            public readonly uint dwReservedFuture000;
-            public readonly uint dwReservedFuture001;
-            public readonly uint dwReservedFuture002;
-            public readonly uint dwReservedFuture003;
-            public readonly uint dwReservedFuture004;
-            public readonly uint dwReservedFuture005;
-            public readonly uint dwReservedFuture006;
-            public readonly uint dwReservedFuture007;
-            public readonly uint dwReservedFuture008;
-            public readonly uint dwReservedFuture009;
+        // reserved for future use (save DiskLabel, Extended partitions, ...)
+        public readonly uint dwReservedFuture000;
+        public readonly uint dwReservedFuture001;
+        public readonly uint dwReservedFuture002;
+        public readonly uint dwReservedFuture003;
+        public readonly uint dwReservedFuture004;
+        public readonly uint dwReservedFuture005;
+        public readonly uint dwReservedFuture006;
+        public readonly uint dwReservedFuture007;
+        public readonly uint dwReservedFuture008;
+        public readonly uint dwReservedFuture009;
 
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6524)]
-            public readonly byte[] cReserved; // Adjust to fit with total header size
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 6524)]
+        public readonly byte[] cReserved; // Adjust to fit with total header size
 
-            public readonly uint crc;
-        }
+        public readonly uint crc;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct CMbr // must be 1024
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MBR_SIZE_WHOLE)]
-            public readonly byte[] cData;
-            public readonly uint dwDataCRC;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DEVICENAMELEN)]
-            public readonly byte[] szDevice; // ex: "hda"
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct CMbr // must be 1024
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MBR_SIZE_WHOLE)]
+        public readonly byte[] cData;
+        public readonly uint dwDataCRC;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DEVICENAMELEN)]
+        public readonly byte[] szDevice; // ex: "hda"
 
-            // disk identificators
-            readonly ulong qwBlocksCount;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DESC_MODEL)]
-            public readonly byte[] szDescModel;
+        // disk identificators
+        readonly ulong qwBlocksCount;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAX_DESC_MODEL)]
+        public readonly byte[] szDescModel;
 
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 884)]
-            public readonly byte[] cReserved; // for future use
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 884)]
+        public readonly byte[] cReserved; // for future use
 
-            //public byte[] szDescGeometry[MAX_DESC_GEOMETRY];
-            //public byte[] szDescIdentify[MAX_DESC_IDENTIFY];
-        }
+        //public byte[] szDescGeometry[MAX_DESC_GEOMETRY];
+        //public byte[] szDescIdentify[MAX_DESC_IDENTIFY];
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct CCheck
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            readonly byte[] cMagic;      // must be 'C','H','K'
-            public readonly uint  dwCRC; // CRC of the CHECK_FREQUENCY blocks
-            public readonly ulong qwPos; // number of the last block written
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct CCheck
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        readonly byte[] cMagic;      // must be 'C','H','K'
+        public readonly uint  dwCRC; // CRC of the CHECK_FREQUENCY blocks
+        public readonly ulong qwPos; // number of the last block written
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct CLocalHeader // size must be 16384 (adjust the reserved data)
-        {
-            public readonly ulong qwBlockSize;
-            public readonly ulong qwUsedBlocks;
-            public readonly ulong qwBlocksCount;
-            public readonly ulong qwBitmapSize; // bytes in the bitmap
-            public readonly ulong qwBadBlocksCount;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] szLabel;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct CLocalHeader // size must be 16384 (adjust the reserved data)
+    {
+        public readonly ulong qwBlockSize;
+        public readonly ulong qwUsedBlocks;
+        public readonly ulong qwBlocksCount;
+        public readonly ulong qwBitmapSize; // bytes in the bitmap
+        public readonly ulong qwBadBlocksCount;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] szLabel;
 
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16280)]
-            public readonly byte[] cReserved; // Adjust to fit with total header size
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16280)]
+        public readonly byte[] cReserved; // Adjust to fit with total header size
 
-            public readonly uint crc;
-        }
+        public readonly uint crc;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct CMainTail // size must be 16384 (adjust the reserved data)
-        {
-            public readonly ulong qwCRC;
-            public readonly uint  dwVolumeNumber;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct CMainTail // size must be 16384 (adjust the reserved data)
+    {
+        public readonly ulong qwCRC;
+        public readonly uint  dwVolumeNumber;
 
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16372)]
-            public readonly byte[] cReserved; // Adjust to fit with total header size
-        }
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16372)]
+        public readonly byte[] cReserved; // Adjust to fit with total header size
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Unsupported.cs b/Aaru.Images/Partimage/Unsupported.cs
index f83c312c6..21a74544b 100644
--- a/Aaru.Images/Partimage/Unsupported.cs
+++ b/Aaru.Images/Partimage/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Partimage
 {
-    public sealed partial class Partimage
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Partimage/Verify.cs b/Aaru.Images/Partimage/Verify.cs
index 3edf6d51d..d0ecfd925 100644
--- a/Aaru.Images/Partimage/Verify.cs
+++ b/Aaru.Images/Partimage/Verify.cs
@@ -30,12 +30,11 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Partimage
 {
-    public sealed partial class Partimage
-    {
-        // TODO: All blocks contain a CRC32 that's incompatible with current implementation. Need to check for compatibility.
-        /// <inheritdoc />
-        public bool? VerifyMediaImage() => null;
-    }
+    // TODO: All blocks contain a CRC32 that's incompatible with current implementation. Need to check for compatibility.
+    /// <inheritdoc />
+    public bool? VerifyMediaImage() => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/Constants.cs b/Aaru.Images/QCOW/Constants.cs
index 172fd9423..9dd2652ff 100644
--- a/Aaru.Images/QCOW/Constants.cs
+++ b/Aaru.Images/QCOW/Constants.cs
@@ -30,18 +30,17 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Qcow
-    {
-        /// <summary>Magic number: 'Q', 'F', 'I', 0xFB</summary>
-        const uint QCOW_MAGIC = 0x514649FB;
-        const uint  QCOW_VERSION         = 1;
-        const uint  QCOW_ENCRYPTION_NONE = 0;
-        const uint  QCOW_ENCRYPTION_AES  = 1;
-        const ulong QCOW_COMPRESSED      = 0x8000000000000000;
+namespace Aaru.DiscImages;
 
-        const int MAX_CACHE_SIZE     = 16777216;
-        const int MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
-    }
+public sealed partial class Qcow
+{
+    /// <summary>Magic number: 'Q', 'F', 'I', 0xFB</summary>
+    const uint QCOW_MAGIC = 0x514649FB;
+    const uint  QCOW_VERSION         = 1;
+    const uint  QCOW_ENCRYPTION_NONE = 0;
+    const uint  QCOW_ENCRYPTION_AES  = 1;
+    const ulong QCOW_COMPRESSED      = 0x8000000000000000;
+
+    const int MAX_CACHE_SIZE     = 16777216;
+    const int MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/Identify.cs b/Aaru.Images/QCOW/Identify.cs
index dc3f842be..ba07261c2 100644
--- a/Aaru.Images/QCOW/Identify.cs
+++ b/Aaru.Images/QCOW/Identify.cs
@@ -34,24 +34,23 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qcow
 {
-    public sealed partial class Qcow
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512)
-                return false;
+        if(stream.Length < 512)
+            return false;
 
-            byte[] qHdrB = new byte[48];
-            stream.Read(qHdrB, 0, 48);
-            _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
+        byte[] qHdrB = new byte[48];
+        stream.Read(qHdrB, 0, 48);
+        _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
 
-            return _qHdr.magic == QCOW_MAGIC && _qHdr.version == QCOW_VERSION;
-        }
+        return _qHdr.magic == QCOW_MAGIC && _qHdr.version == QCOW_VERSION;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/Properties.cs b/Aaru.Images/QCOW/Properties.cs
index 6c8d1ab9e..68e2e8222 100644
--- a/Aaru.Images/QCOW/Properties.cs
+++ b/Aaru.Images/QCOW/Properties.cs
@@ -37,50 +37,49 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Qcow
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public string Name => "QEMU Copy-On-Write disk image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("A5C35765-9FE2-469D-BBBF-ACDEBDB7B954");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "QEMU Copy-On-Write";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+public sealed partial class Qcow
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "QEMU Copy-On-Write disk image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("A5C35765-9FE2-469D-BBBF-ACDEBDB7B954");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "QEMU Copy-On-Write";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".qcow", ".qc"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".qcow", ".qc"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/QCOW.cs b/Aaru.Images/QCOW/QCOW.cs
index e6a8d7c96..a6235605d 100644
--- a/Aaru.Images/QCOW/QCOW.cs
+++ b/Aaru.Images/QCOW/QCOW.cs
@@ -36,53 +36,52 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing QEMU's Copy On Write disk images</summary>
-    public sealed partial class Qcow : IWritableImage
-    {
-        Dictionary<ulong, byte[]>  _clusterCache;
-        int                        _clusterSectors;
-        int                        _clusterSize;
-        ImageInfo                  _imageInfo;
-        Stream                     _imageStream;
-        ulong                      _l1Mask;
-        int                        _l1Shift;
-        uint                       _l1Size;
-        ulong[]                    _l1Table;
-        ulong                      _l2Mask;
-        int                        _l2Size;
-        Dictionary<ulong, ulong[]> _l2TableCache;
-        int                        _maxClusterCache;
-        int                        _maxL2TableCache;
-        Header                     _qHdr;
-        Dictionary<ulong, byte[]>  _sectorCache;
-        ulong                      _sectorMask;
-        FileStream                 _writingStream;
+namespace Aaru.DiscImages;
 
-        public Qcow() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = "1",
-            Application           = "QEMU",
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing QEMU's Copy On Write disk images</summary>
+public sealed partial class Qcow : IWritableImage
+{
+    Dictionary<ulong, byte[]>  _clusterCache;
+    int                        _clusterSectors;
+    int                        _clusterSize;
+    ImageInfo                  _imageInfo;
+    Stream                     _imageStream;
+    ulong                      _l1Mask;
+    int                        _l1Shift;
+    uint                       _l1Size;
+    ulong[]                    _l1Table;
+    ulong                      _l2Mask;
+    int                        _l2Size;
+    Dictionary<ulong, ulong[]> _l2TableCache;
+    int                        _maxClusterCache;
+    int                        _maxL2TableCache;
+    Header                     _qHdr;
+    Dictionary<ulong, byte[]>  _sectorCache;
+    ulong                      _sectorMask;
+    FileStream                 _writingStream;
+
+    public Qcow() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = "1",
+        Application           = "QEMU",
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/Read.cs b/Aaru.Images/QCOW/Read.cs
index a9f17619a..5a01ac1a4 100644
--- a/Aaru.Images/QCOW/Read.cs
+++ b/Aaru.Images/QCOW/Read.cs
@@ -43,297 +43,296 @@ using SharpCompress.Compressors;
 using SharpCompress.Compressors.Deflate;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qcow
 {
-    public sealed partial class Qcow
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 512)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] qHdrB = new byte[48];
+        stream.Read(qHdrB, 0, 48);
+        _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
+
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}", _qHdr.magic);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}", _qHdr.version);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_offset = {0}", _qHdr.backing_file_offset);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_size = {0}", _qHdr.backing_file_size);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.mtime = {0}", _qHdr.mtime);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.size = {0}", _qHdr.size);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.cluster_bits = {0}", _qHdr.cluster_bits);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2_bits = {0}", _qHdr.l2_bits);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.padding = {0}", _qHdr.padding);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.crypt_method = {0}", _qHdr.crypt_method);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_table_offset = {0}", _qHdr.l1_table_offset);
+
+        if(_qHdr.size <= 1)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            AaruConsole.ErrorWriteLine("Image size is too small");
 
-            if(stream.Length < 512)
-                return ErrorNumber.InvalidArgument;
-
-            byte[] qHdrB = new byte[48];
-            stream.Read(qHdrB, 0, 48);
-            _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
-
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}", _qHdr.magic);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}", _qHdr.version);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_offset = {0}", _qHdr.backing_file_offset);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_size = {0}", _qHdr.backing_file_size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.mtime = {0}", _qHdr.mtime);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.size = {0}", _qHdr.size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.cluster_bits = {0}", _qHdr.cluster_bits);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2_bits = {0}", _qHdr.l2_bits);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.padding = {0}", _qHdr.padding);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.crypt_method = {0}", _qHdr.crypt_method);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_table_offset = {0}", _qHdr.l1_table_offset);
-
-            if(_qHdr.size <= 1)
-            {
-                AaruConsole.ErrorWriteLine("Image size is too small");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(_qHdr.cluster_bits < 9 ||
-               _qHdr.cluster_bits > 16)
-            {
-                AaruConsole.ErrorWriteLine("Cluster size must be between 512 bytes and 64 Kbytes");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(_qHdr.l2_bits < 9  - 3 ||
-               _qHdr.l2_bits > 16 - 3)
-            {
-                AaruConsole.ErrorWriteLine("L2 size must be between 512 bytes and 64 Kbytes");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(_qHdr.crypt_method > QCOW_ENCRYPTION_AES)
-            {
-                AaruConsole.ErrorWriteLine("Invalid encryption method");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(_qHdr.crypt_method > QCOW_ENCRYPTION_NONE)
-            {
-                AaruConsole.ErrorWriteLine("AES encrypted images not yet supported");
-
-                return ErrorNumber.NotImplemented;
-            }
-
-            if(_qHdr.backing_file_offset != 0)
-            {
-                AaruConsole.ErrorWriteLine("Differencing images not yet supported");
-
-                return ErrorNumber.NotImplemented;
-            }
-
-            int shift = _qHdr.cluster_bits + _qHdr.l2_bits;
-
-            if(_qHdr.size > ulong.MaxValue - (ulong)(1 << shift))
-            {
-                AaruConsole.ErrorWriteLine("Image is too large");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            _clusterSize    = 1 << _qHdr.cluster_bits;
-            _clusterSectors = 1 << (_qHdr.cluster_bits - 9);
-            _l1Size         = (uint)((_qHdr.size + (ulong)(1 << shift) - 1) >> shift);
-            _l2Size         = 1 << _qHdr.l2_bits;
-
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSize = {0}", _clusterSize);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSectors = {0}", _clusterSectors);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Size = {0}", _l1Size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Size = {0}", _l2Size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectors = {0}", _imageInfo.Sectors);
-
-            byte[] l1TableB = new byte[_l1Size * 8];
-            stream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
-            stream.Read(l1TableB, 0, (int)_l1Size * 8);
-            _l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
-            AaruConsole.DebugWriteLine("QCOW plugin", "Reading L1 table");
-
-            for(long i = 0; i < _l1Table.LongLength; i++)
-                _l1Table[i] = Swapping.Swap(_l1Table[i]);
-
-            _l1Mask = 0;
-            int c = 0;
-            _l1Shift = _qHdr.l2_bits + _qHdr.cluster_bits;
-
-            for(int i = 0; i < 64; i++)
-            {
-                _l1Mask <<= 1;
-
-                if(c >= 64 - _l1Shift)
-                    continue;
-
-                _l1Mask += 1;
-                c++;
-            }
-
-            _l2Mask = 0;
-
-            for(int i = 0; i < _qHdr.l2_bits; i++)
-                _l2Mask = (_l2Mask << 1) + 1;
-
-            _l2Mask <<= _qHdr.cluster_bits;
-
-            _sectorMask = 0;
-
-            for(int i = 0; i < _qHdr.cluster_bits; i++)
-                _sectorMask = (_sectorMask << 1) + 1;
-
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Mask = {0:X}", _l1Mask);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Shift = {0}", _l1Shift);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Mask = {0:X}", _l2Mask);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectorMask = {0:X}", _sectorMask);
-
-            _maxL2TableCache = MAX_CACHE_SIZE / (_l2Size * 8);
-            _maxClusterCache = MAX_CACHE_SIZE / _clusterSize;
-
-            _imageStream = stream;
-
-            _sectorCache  = new Dictionary<ulong, byte[]>();
-            _l2TableCache = new Dictionary<ulong, ulong[]>();
-            _clusterCache = new Dictionary<ulong, byte[]>();
-
-            _imageInfo.CreationTime = imageFilter.CreationTime;
-
-            _imageInfo.LastModificationTime = _qHdr.mtime > 0 ? DateHandlers.UnixUnsignedToDateTime(_qHdr.mtime)
-                                                  : imageFilter.LastWriteTime;
-
-            _imageInfo.MediaTitle   = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors      = _qHdr.size / 512;
-            _imageInfo.SectorSize   = 512;
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-            _imageInfo.MediaType    = MediaType.GENERIC_HDD;
-            _imageInfo.ImageSize    = _qHdr.size;
-
-            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-            _imageInfo.Heads           = 16;
-            _imageInfo.SectorsPerTrack = 63;
-
-            return ErrorNumber.NoError;
+            return ErrorNumber.InvalidArgument;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        if(_qHdr.cluster_bits < 9 ||
+           _qHdr.cluster_bits > 16)
         {
-            buffer = null;
+            AaruConsole.ErrorWriteLine("Cluster size must be between 512 bytes and 64 Kbytes");
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            return ErrorNumber.InvalidArgument;
+        }
 
-            // Check cache
-            if(_sectorCache.TryGetValue(sectorAddress, out buffer))
-                return ErrorNumber.NoError;
+        if(_qHdr.l2_bits < 9  - 3 ||
+           _qHdr.l2_bits > 16 - 3)
+        {
+            AaruConsole.ErrorWriteLine("L2 size must be between 512 bytes and 64 Kbytes");
 
-            ulong byteAddress = sectorAddress * 512;
+            return ErrorNumber.InvalidArgument;
+        }
 
-            ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
+        if(_qHdr.crypt_method > QCOW_ENCRYPTION_AES)
+        {
+            AaruConsole.ErrorWriteLine("Invalid encryption method");
 
-            if((long)l1Off >= _l1Table.LongLength)
-            {
-                AaruConsole.DebugWriteLine("QCOW plugin",
-                                           $"Trying to read past L1 table, position {l1Off} of a max {_l1Table.LongLength}");
+            return ErrorNumber.InvalidArgument;
+        }
 
-                return ErrorNumber.InvalidArgument;
-            }
+        if(_qHdr.crypt_method > QCOW_ENCRYPTION_NONE)
+        {
+            AaruConsole.ErrorWriteLine("AES encrypted images not yet supported");
 
-            // TODO: Implement differential images
-            if(_l1Table[l1Off] == 0)
-            {
-                buffer = new byte[512];
+            return ErrorNumber.NotImplemented;
+        }
 
-                return ErrorNumber.NoError;
-            }
+        if(_qHdr.backing_file_offset != 0)
+        {
+            AaruConsole.ErrorWriteLine("Differencing images not yet supported");
 
-            if(!_l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
-            {
-                _imageStream.Seek((long)_l1Table[l1Off], SeekOrigin.Begin);
-                byte[] l2TableB = new byte[_l2Size * 8];
-                _imageStream.Read(l2TableB, 0, _l2Size * 8);
-                AaruConsole.DebugWriteLine("QCOW plugin", "Reading L2 table #{0}", l1Off);
-                l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
+            return ErrorNumber.NotImplemented;
+        }
 
-                for(long i = 0; i < l2Table.LongLength; i++)
-                    l2Table[i] = Swapping.Swap(l2Table[i]);
+        int shift = _qHdr.cluster_bits + _qHdr.l2_bits;
 
-                if(_l2TableCache.Count >= _maxL2TableCache)
-                    _l2TableCache.Clear();
+        if(_qHdr.size > ulong.MaxValue - (ulong)(1 << shift))
+        {
+            AaruConsole.ErrorWriteLine("Image is too large");
 
-                _l2TableCache.Add(l1Off, l2Table);
-            }
+            return ErrorNumber.InvalidArgument;
+        }
 
-            ulong l2Off = (byteAddress & _l2Mask) >> _qHdr.cluster_bits;
+        _clusterSize    = 1 << _qHdr.cluster_bits;
+        _clusterSectors = 1 << (_qHdr.cluster_bits - 9);
+        _l1Size         = (uint)((_qHdr.size + (ulong)(1 << shift) - 1) >> shift);
+        _l2Size         = 1 << _qHdr.l2_bits;
 
-            ulong offset = l2Table[l2Off];
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSize = {0}", _clusterSize);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSectors = {0}", _clusterSectors);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Size = {0}", _l1Size);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Size = {0}", _l2Size);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectors = {0}", _imageInfo.Sectors);
 
+        byte[] l1TableB = new byte[_l1Size * 8];
+        stream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
+        stream.Read(l1TableB, 0, (int)_l1Size * 8);
+        _l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
+        AaruConsole.DebugWriteLine("QCOW plugin", "Reading L1 table");
+
+        for(long i = 0; i < _l1Table.LongLength; i++)
+            _l1Table[i] = Swapping.Swap(_l1Table[i]);
+
+        _l1Mask = 0;
+        int c = 0;
+        _l1Shift = _qHdr.l2_bits + _qHdr.cluster_bits;
+
+        for(int i = 0; i < 64; i++)
+        {
+            _l1Mask <<= 1;
+
+            if(c >= 64 - _l1Shift)
+                continue;
+
+            _l1Mask += 1;
+            c++;
+        }
+
+        _l2Mask = 0;
+
+        for(int i = 0; i < _qHdr.l2_bits; i++)
+            _l2Mask = (_l2Mask << 1) + 1;
+
+        _l2Mask <<= _qHdr.cluster_bits;
+
+        _sectorMask = 0;
+
+        for(int i = 0; i < _qHdr.cluster_bits; i++)
+            _sectorMask = (_sectorMask << 1) + 1;
+
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Mask = {0:X}", _l1Mask);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Shift = {0}", _l1Shift);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Mask = {0:X}", _l2Mask);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectorMask = {0:X}", _sectorMask);
+
+        _maxL2TableCache = MAX_CACHE_SIZE / (_l2Size * 8);
+        _maxClusterCache = MAX_CACHE_SIZE / _clusterSize;
+
+        _imageStream = stream;
+
+        _sectorCache  = new Dictionary<ulong, byte[]>();
+        _l2TableCache = new Dictionary<ulong, ulong[]>();
+        _clusterCache = new Dictionary<ulong, byte[]>();
+
+        _imageInfo.CreationTime = imageFilter.CreationTime;
+
+        _imageInfo.LastModificationTime = _qHdr.mtime > 0 ? DateHandlers.UnixUnsignedToDateTime(_qHdr.mtime)
+                                              : imageFilter.LastWriteTime;
+
+        _imageInfo.MediaTitle   = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors      = _qHdr.size / 512;
+        _imageInfo.SectorSize   = 512;
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+        _imageInfo.MediaType    = MediaType.GENERIC_HDD;
+        _imageInfo.ImageSize    = _qHdr.size;
+
+        _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+        _imageInfo.Heads           = 16;
+        _imageInfo.SectorsPerTrack = 63;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        // Check cache
+        if(_sectorCache.TryGetValue(sectorAddress, out buffer))
+            return ErrorNumber.NoError;
+
+        ulong byteAddress = sectorAddress * 512;
+
+        ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
+
+        if((long)l1Off >= _l1Table.LongLength)
+        {
+            AaruConsole.DebugWriteLine("QCOW plugin",
+                                       $"Trying to read past L1 table, position {l1Off} of a max {_l1Table.LongLength}");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        // TODO: Implement differential images
+        if(_l1Table[l1Off] == 0)
+        {
             buffer = new byte[512];
 
-            if(offset != 0)
+            return ErrorNumber.NoError;
+        }
+
+        if(!_l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
+        {
+            _imageStream.Seek((long)_l1Table[l1Off], SeekOrigin.Begin);
+            byte[] l2TableB = new byte[_l2Size * 8];
+            _imageStream.Read(l2TableB, 0, _l2Size * 8);
+            AaruConsole.DebugWriteLine("QCOW plugin", "Reading L2 table #{0}", l1Off);
+            l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
+
+            for(long i = 0; i < l2Table.LongLength; i++)
+                l2Table[i] = Swapping.Swap(l2Table[i]);
+
+            if(_l2TableCache.Count >= _maxL2TableCache)
+                _l2TableCache.Clear();
+
+            _l2TableCache.Add(l1Off, l2Table);
+        }
+
+        ulong l2Off = (byteAddress & _l2Mask) >> _qHdr.cluster_bits;
+
+        ulong offset = l2Table[l2Off];
+
+        buffer = new byte[512];
+
+        if(offset != 0)
+        {
+            if(!_clusterCache.TryGetValue(offset, out byte[] cluster))
             {
-                if(!_clusterCache.TryGetValue(offset, out byte[] cluster))
+                if((offset & QCOW_COMPRESSED) == QCOW_COMPRESSED)
                 {
-                    if((offset & QCOW_COMPRESSED) == QCOW_COMPRESSED)
-                    {
-                        ulong compSizeMask = (ulong)(1 << _qHdr.cluster_bits) - 1;
-                        compSizeMask <<= 63 - _qHdr.cluster_bits;
-                        ulong offMask = ~compSizeMask ^ QCOW_COMPRESSED;
+                    ulong compSizeMask = (ulong)(1 << _qHdr.cluster_bits) - 1;
+                    compSizeMask <<= 63 - _qHdr.cluster_bits;
+                    ulong offMask = ~compSizeMask ^ QCOW_COMPRESSED;
 
-                        ulong realOff  = offset & offMask;
-                        ulong compSize = (offset & compSizeMask) >> (63 - _qHdr.cluster_bits);
+                    ulong realOff  = offset & offMask;
+                    ulong compSize = (offset & compSizeMask) >> (63 - _qHdr.cluster_bits);
 
-                        byte[] zCluster = new byte[compSize];
-                        _imageStream.Seek((long)realOff, SeekOrigin.Begin);
-                        _imageStream.Read(zCluster, 0, (int)compSize);
+                    byte[] zCluster = new byte[compSize];
+                    _imageStream.Seek((long)realOff, SeekOrigin.Begin);
+                    _imageStream.Read(zCluster, 0, (int)compSize);
 
-                        var zStream = new DeflateStream(new MemoryStream(zCluster), CompressionMode.Decompress);
-                        cluster = new byte[_clusterSize];
-                        int read = zStream.Read(cluster, 0, _clusterSize);
+                    var zStream = new DeflateStream(new MemoryStream(zCluster), CompressionMode.Decompress);
+                    cluster = new byte[_clusterSize];
+                    int read = zStream.Read(cluster, 0, _clusterSize);
 
-                        if(read != _clusterSize)
-                            return ErrorNumber.InOutError;
-                    }
-                    else
-                    {
-                        cluster = new byte[_clusterSize];
-                        _imageStream.Seek((long)offset, SeekOrigin.Begin);
-                        _imageStream.Read(cluster, 0, _clusterSize);
-                    }
-
-                    if(_clusterCache.Count >= _maxClusterCache)
-                        _clusterCache.Clear();
-
-                    _clusterCache.Add(offset, cluster);
+                    if(read != _clusterSize)
+                        return ErrorNumber.InOutError;
+                }
+                else
+                {
+                    cluster = new byte[_clusterSize];
+                    _imageStream.Seek((long)offset, SeekOrigin.Begin);
+                    _imageStream.Read(cluster, 0, _clusterSize);
                 }
 
-                Array.Copy(cluster, (int)(byteAddress & _sectorMask), buffer, 0, 512);
+                if(_clusterCache.Count >= _maxClusterCache)
+                    _clusterCache.Clear();
+
+                _clusterCache.Add(offset, cluster);
             }
 
-            if(_sectorCache.Count >= MAX_CACHED_SECTORS)
-                _sectorCache.Clear();
-
-            _sectorCache.Add(sectorAddress, buffer);
-
-            return ErrorNumber.NoError;
+            Array.Copy(cluster, (int)(byteAddress & _sectorMask), buffer, 0, 512);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        if(_sectorCache.Count >= MAX_CACHED_SECTORS)
+            _sectorCache.Clear();
+
+        _sectorCache.Add(sectorAddress, buffer);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            ms.Write(sector, 0, sector.Length);
         }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/Structs.cs b/Aaru.Images/QCOW/Structs.cs
index ecd13ef56..d2bee2a0a 100644
--- a/Aaru.Images/QCOW/Structs.cs
+++ b/Aaru.Images/QCOW/Structs.cs
@@ -32,38 +32,37 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qcow
 {
-    public sealed partial class Qcow
+    /// <summary>QCOW header, big-endian</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        /// <summary>QCOW header, big-endian</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            /// <summary>
-            ///     <see cref="Qcow.QCOW_MAGIC" />
-            /// </summary>
-            public uint magic;
-            /// <summary>Must be 1</summary>
-            public uint version;
-            /// <summary>Offset inside file to string containing backing file</summary>
-            public readonly ulong backing_file_offset;
-            /// <summary>Size of <see cref="backing_file_offset" /></summary>
-            public readonly uint backing_file_size;
-            /// <summary>Modification time</summary>
-            public uint mtime;
-            /// <summary>Size in bytes</summary>
-            public ulong size;
-            /// <summary>Cluster bits</summary>
-            public byte cluster_bits;
-            /// <summary>L2 table bits</summary>
-            public byte l2_bits;
-            /// <summary>Padding</summary>
-            public readonly ushort padding;
-            /// <summary>Encryption method</summary>
-            public readonly uint crypt_method;
-            /// <summary>Offset to L1 table</summary>
-            public ulong l1_table_offset;
-        }
+        /// <summary>
+        ///     <see cref="Qcow.QCOW_MAGIC" />
+        /// </summary>
+        public uint magic;
+        /// <summary>Must be 1</summary>
+        public uint version;
+        /// <summary>Offset inside file to string containing backing file</summary>
+        public readonly ulong backing_file_offset;
+        /// <summary>Size of <see cref="backing_file_offset" /></summary>
+        public readonly uint backing_file_size;
+        /// <summary>Modification time</summary>
+        public uint mtime;
+        /// <summary>Size in bytes</summary>
+        public ulong size;
+        /// <summary>Cluster bits</summary>
+        public byte cluster_bits;
+        /// <summary>L2 table bits</summary>
+        public byte l2_bits;
+        /// <summary>Padding</summary>
+        public readonly ushort padding;
+        /// <summary>Encryption method</summary>
+        public readonly uint crypt_method;
+        /// <summary>Offset to L1 table</summary>
+        public ulong l1_table_offset;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/Unsupported.cs b/Aaru.Images/QCOW/Unsupported.cs
index 12dbdedbc..c2453723c 100644
--- a/Aaru.Images/QCOW/Unsupported.cs
+++ b/Aaru.Images/QCOW/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qcow
 {
-    public sealed partial class Qcow
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW/Write.cs b/Aaru.Images/QCOW/Write.cs
index 4382c02de..e2e87212d 100644
--- a/Aaru.Images/QCOW/Write.cs
+++ b/Aaru.Images/QCOW/Write.cs
@@ -42,320 +42,319 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qcow
 {
-    public sealed partial class Qcow
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            // TODO: Correct this calculation
-            if(sectors * sectorSize / 65536 > uint.MaxValue)
-            {
-                ErrorMessage = "Too many sectors for selected cluster size";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            _qHdr = new Header
-            {
-                magic           = QCOW_MAGIC,
-                version         = QCOW_VERSION,
-                size            = sectors * sectorSize,
-                cluster_bits    = 12,
-                l2_bits         = 9,
-                l1_table_offset = (ulong)((Marshal.SizeOf<Header>() + 7) & ~7)
-            };
-
-            int shift = _qHdr.cluster_bits + _qHdr.l2_bits;
-            _clusterSize    = 1 << _qHdr.cluster_bits;
-            _clusterSectors = 1 << (_qHdr.cluster_bits - 9);
-            _l1Size         = (uint)((_qHdr.size + (ulong)(1 << shift) - 1) >> shift);
-            _l2Size         = 1 << _qHdr.l2_bits;
-
-            _l1Table = new ulong[_l1Size];
-
-            _l1Mask = 0;
-            int c = 0;
-            _l1Shift = _qHdr.l2_bits + _qHdr.cluster_bits;
-
-            for(int i = 0; i < 64; i++)
-            {
-                _l1Mask <<= 1;
-
-                if(c >= 64 - _l1Shift)
-                    continue;
-
-                _l1Mask += 1;
-                c++;
-            }
-
-            _l2Mask = 0;
-
-            for(int i = 0; i < _qHdr.l2_bits; i++)
-                _l2Mask = (_l2Mask << 1) + 1;
-
-            _l2Mask <<= _qHdr.cluster_bits;
-
-            _sectorMask = 0;
-
-            for(int i = 0; i < _qHdr.cluster_bits; i++)
-                _sectorMask = (_sectorMask << 1) + 1;
-
-            byte[] empty = new byte[_qHdr.l1_table_offset + (_l1Size * 8)];
-            _writingStream.Write(empty, 0, empty.Length);
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-                return true;
-
-            ulong byteAddress = sectorAddress * 512;
-
-            ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
-
-            if((long)l1Off >= _l1Table.LongLength)
-            {
-                ErrorMessage = $"Trying to write past L1 table, position {l1Off} of a max {_l1Table.LongLength}";
-
-                return false;
-            }
-
-            if(_l1Table[l1Off] == 0)
-            {
-                _writingStream.Seek(0, SeekOrigin.End);
-                _l1Table[l1Off] = (ulong)((_writingStream.Length + _clusterSize - 1) / _clusterSize * _clusterSize);
-                byte[] l2TableB = new byte[_l2Size                                   * 8];
-                _writingStream.Position = (long)_l1Table[l1Off];
-                _writingStream.Write(l2TableB, 0, l2TableB.Length);
-            }
-
-            _writingStream.Position = (long)_l1Table[l1Off];
-
-            ulong l2Off = (byteAddress & _l2Mask) >> _qHdr.cluster_bits;
-
-            _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
-
-            byte[] entry = new byte[8];
-            _writingStream.Read(entry, 0, 8);
-            ulong offset = BigEndianBitConverter.ToUInt64(entry, 0);
-
-            if(offset == 0)
-            {
-                offset = (ulong)_writingStream.Length;
-                byte[] cluster = new byte[_clusterSize];
-                entry = BigEndianBitConverter.GetBytes(offset);
-                _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
-                _writingStream.Write(entry, 0, 8);
-                _writingStream.Seek(0, SeekOrigin.End);
-                _writingStream.Write(cluster, 0, cluster.Length);
-            }
-
-            _writingStream.Seek((long)(offset + (byteAddress & _sectorMask)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        // TODO: This can be optimized
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-                return true;
-
-            for(uint i = 0; i < length; i++)
-            {
-                byte[] tmp = new byte[_imageInfo.SectorSize];
-                Array.Copy(data, i * _imageInfo.SectorSize, tmp, 0, _imageInfo.SectorSize);
-
-                if(!WriteSector(tmp, sectorAddress + i))
-                    return false;
-            }
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        // TODO: Correct this calculation
+        if(sectors * sectorSize / 65536 > uint.MaxValue)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors for selected cluster size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
-
-            _qHdr.mtime = (uint)(DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0)).TotalSeconds;
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.magic), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.version), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.backing_file_offset), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.backing_file_size), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.mtime), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.size), 0, 8);
-            _writingStream.WriteByte(_qHdr.cluster_bits);
-            _writingStream.WriteByte(_qHdr.l2_bits);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.padding), 0, 2);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.crypt_method), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.l1_table_offset), 0, 8);
-
-            _writingStream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
-
-            for(long i = 0; i < _l1Table.LongLength; i++)
-                _l1Table[i] = Swapping.Swap(_l1Table[i]);
-
-            byte[] l1TableB = MemoryMarshal.Cast<ulong, byte>(_l1Table).ToArray();
-            _writingStream.Write(l1TableB, 0, l1TableB.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
         }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+        catch(IOException e)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+        _qHdr = new Header
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            magic           = QCOW_MAGIC,
+            version         = QCOW_VERSION,
+            size            = sectors * sectorSize,
+            cluster_bits    = 12,
+            l2_bits         = 9,
+            l1_table_offset = (ulong)((Marshal.SizeOf<Header>() + 7) & ~7)
+        };
 
-            return false;
+        int shift = _qHdr.cluster_bits + _qHdr.l2_bits;
+        _clusterSize    = 1 << _qHdr.cluster_bits;
+        _clusterSectors = 1 << (_qHdr.cluster_bits - 9);
+        _l1Size         = (uint)((_qHdr.size + (ulong)(1 << shift) - 1) >> shift);
+        _l2Size         = 1 << _qHdr.l2_bits;
+
+        _l1Table = new ulong[_l1Size];
+
+        _l1Mask = 0;
+        int c = 0;
+        _l1Shift = _qHdr.l2_bits + _qHdr.cluster_bits;
+
+        for(int i = 0; i < 64; i++)
+        {
+            _l1Mask <<= 1;
+
+            if(c >= 64 - _l1Shift)
+                continue;
+
+            _l1Mask += 1;
+            c++;
         }
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+        _l2Mask = 0;
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        for(int i = 0; i < _qHdr.l2_bits; i++)
+            _l2Mask = (_l2Mask << 1) + 1;
+
+        _l2Mask <<= _qHdr.cluster_bits;
+
+        _sectorMask = 0;
+
+        for(int i = 0; i < _qHdr.cluster_bits; i++)
+            _sectorMask = (_sectorMask << 1) + 1;
+
+        byte[] empty = new byte[_qHdr.l1_table_offset + (_l1Size * 8)];
+        _writingStream.Write(empty, 0, empty.Length);
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+            return true;
+
+        ulong byteAddress = sectorAddress * 512;
+
+        ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
+
+        if((long)l1Off >= _l1Table.LongLength)
+        {
+            ErrorMessage = $"Trying to write past L1 table, position {l1Off} of a max {_l1Table.LongLength}";
+
+            return false;
+        }
+
+        if(_l1Table[l1Off] == 0)
+        {
+            _writingStream.Seek(0, SeekOrigin.End);
+            _l1Table[l1Off] = (ulong)((_writingStream.Length + _clusterSize - 1) / _clusterSize * _clusterSize);
+            byte[] l2TableB = new byte[_l2Size                                   * 8];
+            _writingStream.Position = (long)_l1Table[l1Off];
+            _writingStream.Write(l2TableB, 0, l2TableB.Length);
+        }
+
+        _writingStream.Position = (long)_l1Table[l1Off];
+
+        ulong l2Off = (byteAddress & _l2Mask) >> _qHdr.cluster_bits;
+
+        _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
+
+        byte[] entry = new byte[8];
+        _writingStream.Read(entry, 0, 8);
+        ulong offset = BigEndianBitConverter.ToUInt64(entry, 0);
+
+        if(offset == 0)
+        {
+            offset = (ulong)_writingStream.Length;
+            byte[] cluster = new byte[_clusterSize];
+            entry = BigEndianBitConverter.GetBytes(offset);
+            _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
+            _writingStream.Write(entry, 0, 8);
+            _writingStream.Seek(0, SeekOrigin.End);
+            _writingStream.Write(cluster, 0, cluster.Length);
+        }
+
+        _writingStream.Seek((long)(offset + (byteAddress & _sectorMask)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    // TODO: This can be optimized
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+            return true;
+
+        for(uint i = 0; i < length; i++)
+        {
+            byte[] tmp = new byte[_imageInfo.SectorSize];
+            Array.Copy(data, i * _imageInfo.SectorSize, tmp, 0, _imageInfo.SectorSize);
+
+            if(!WriteSector(tmp, sectorAddress + i))
+                return false;
+        }
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        _qHdr.mtime = (uint)(DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0)).TotalSeconds;
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.magic), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.version), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.backing_file_offset), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.backing_file_size), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.mtime), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.size), 0, 8);
+        _writingStream.WriteByte(_qHdr.cluster_bits);
+        _writingStream.WriteByte(_qHdr.l2_bits);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.padding), 0, 2);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.crypt_method), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.l1_table_offset), 0, 8);
+
+        _writingStream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
+
+        for(long i = 0; i < _l1Table.LongLength; i++)
+            _l1Table[i] = Swapping.Swap(_l1Table[i]);
+
+        byte[] l1TableB = MemoryMarshal.Cast<ulong, byte>(_l1Table).ToArray();
+        _writingStream.Write(l1TableB, 0, l1TableB.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/Constants.cs b/Aaru.Images/QCOW2/Constants.cs
index c898e784a..89fac536f 100644
--- a/Aaru.Images/QCOW2/Constants.cs
+++ b/Aaru.Images/QCOW2/Constants.cs
@@ -32,34 +32,33 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Qcow2
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Qcow2
-    {
-        /// <summary>Magic number: 'Q', 'F', 'I', 0xFB</summary>
-        const uint QCOW_MAGIC = 0x514649FB;
-        const uint QCOW_VERSION2        = 2;
-        const uint QCOW_VERSION3        = 3;
-        const uint QCOW_ENCRYPTION_NONE = 0;
-        const uint QCOW_ENCRYPTION_AES  = 1;
+    /// <summary>Magic number: 'Q', 'F', 'I', 0xFB</summary>
+    const uint QCOW_MAGIC = 0x514649FB;
+    const uint QCOW_VERSION2        = 2;
+    const uint QCOW_VERSION3        = 3;
+    const uint QCOW_ENCRYPTION_NONE = 0;
+    const uint QCOW_ENCRYPTION_AES  = 1;
 
-        const ulong QCOW_FEATURE_DIRTY   = 0x01;
-        const ulong QCOW_FEATURE_CORRUPT = 0x02;
-        const ulong QCOW_FEATURE_MASK    = 0xFFFFFFFFFFFFFFFC;
+    const ulong QCOW_FEATURE_DIRTY   = 0x01;
+    const ulong QCOW_FEATURE_CORRUPT = 0x02;
+    const ulong QCOW_FEATURE_MASK    = 0xFFFFFFFFFFFFFFFC;
 
-        const ulong QCOW_COMPAT_FEATURE_LAZY_REFCOUNTS = 0x01;
-        const ulong QCOW_AUTO_CLEAR_FEATURE_BITMAP     = 0x01;
+    const ulong QCOW_COMPAT_FEATURE_LAZY_REFCOUNTS = 0x01;
+    const ulong QCOW_AUTO_CLEAR_FEATURE_BITMAP     = 0x01;
 
-        const ulong QCOW_FLAGS_MASK = 0x3FFFFFFFFFFFFFFF;
-        const ulong QCOW_COPIED     = 0x8000000000000000;
-        const ulong QCOW_COMPRESSED = 0x4000000000000000;
+    const ulong QCOW_FLAGS_MASK = 0x3FFFFFFFFFFFFFFF;
+    const ulong QCOW_COPIED     = 0x8000000000000000;
+    const ulong QCOW_COMPRESSED = 0x4000000000000000;
 
-        const ulong QCOW_HEADER_EXTENSION_BACKING_FILE  = 0xE2792ACA;
-        const ulong QCOW_HEADER_EXTENSION_FEATURE_TABLE = 0x6803F857;
-        const ulong QCOW_HEADER_EXTENSION_BITMAPS       = 0x23852875;
+    const ulong QCOW_HEADER_EXTENSION_BACKING_FILE  = 0xE2792ACA;
+    const ulong QCOW_HEADER_EXTENSION_FEATURE_TABLE = 0x6803F857;
+    const ulong QCOW_HEADER_EXTENSION_BITMAPS       = 0x23852875;
 
-        const int MAX_CACHE_SIZE     = 16777216;
-        const int MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
-    }
+    const int MAX_CACHE_SIZE     = 16777216;
+    const int MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/Identify.cs b/Aaru.Images/QCOW2/Identify.cs
index e12fce2f1..4aad7333e 100644
--- a/Aaru.Images/QCOW2/Identify.cs
+++ b/Aaru.Images/QCOW2/Identify.cs
@@ -35,27 +35,26 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qcow2
 {
-    public sealed partial class Qcow2
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512)
-                return false;
+        if(stream.Length < 512)
+            return false;
 
-            byte[] qHdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(qHdrB, 0, Marshal.SizeOf<Header>());
-            _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
+        byte[] qHdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(qHdrB, 0, Marshal.SizeOf<Header>());
+        _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
 
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}", _qHdr.magic);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}", _qHdr.version);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}", _qHdr.magic);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}", _qHdr.version);
 
-            return _qHdr.magic == QCOW_MAGIC && (_qHdr.version == QCOW_VERSION2 || _qHdr.version == QCOW_VERSION3);
-        }
+        return _qHdr.magic == QCOW_MAGIC && (_qHdr.version == QCOW_VERSION2 || _qHdr.version == QCOW_VERSION3);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/Properties.cs b/Aaru.Images/QCOW2/Properties.cs
index 2a167b5b3..961058220 100644
--- a/Aaru.Images/QCOW2/Properties.cs
+++ b/Aaru.Images/QCOW2/Properties.cs
@@ -37,50 +37,49 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Qcow2
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public string Name => "QEMU Copy-On-Write disk image v2";
-        /// <inheritdoc />
-        public Guid Id => new Guid("F20107CB-95B3-4398-894B-975261F1E8C5");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "QEMU Copy-On-Write";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+public sealed partial class Qcow2
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "QEMU Copy-On-Write disk image v2";
+    /// <inheritdoc />
+    public Guid Id => new Guid("F20107CB-95B3-4398-894B-975261F1E8C5");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "QEMU Copy-On-Write";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".qcow2", ".qc2", ".qcow3", ".qc3"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".qcow2", ".qc2", ".qcow3", ".qc3"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/QCOW2.cs b/Aaru.Images/QCOW2/QCOW2.cs
index c4d0c4188..6ec0c69a0 100644
--- a/Aaru.Images/QCOW2/QCOW2.cs
+++ b/Aaru.Images/QCOW2/QCOW2.cs
@@ -36,54 +36,53 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing QEMU's Copy On Write v2 and v3 disk images</summary>
-    public sealed partial class Qcow2 : IWritableImage
-    {
-        Dictionary<ulong, byte[]>  _clusterCache;
-        int                        _clusterSectors;
-        int                        _clusterSize;
-        ImageInfo                  _imageInfo;
-        Stream                     _imageStream;
-        ulong                      _l1Mask;
-        int                        _l1Shift;
-        ulong[]                    _l1Table;
-        int                        _l2Bits;
-        ulong                      _l2Mask;
-        int                        _l2Size;
-        Dictionary<ulong, ulong[]> _l2TableCache;
-        int                        _maxClusterCache;
-        int                        _maxL2TableCache;
-        Header                     _qHdr;
-        ulong[]                    _refCountTable;
-        Dictionary<ulong, byte[]>  _sectorCache;
-        ulong                      _sectorMask;
-        FileStream                 _writingStream;
+namespace Aaru.DiscImages;
 
-        public Qcow2() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = "QEMU",
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing QEMU's Copy On Write v2 and v3 disk images</summary>
+public sealed partial class Qcow2 : IWritableImage
+{
+    Dictionary<ulong, byte[]>  _clusterCache;
+    int                        _clusterSectors;
+    int                        _clusterSize;
+    ImageInfo                  _imageInfo;
+    Stream                     _imageStream;
+    ulong                      _l1Mask;
+    int                        _l1Shift;
+    ulong[]                    _l1Table;
+    int                        _l2Bits;
+    ulong                      _l2Mask;
+    int                        _l2Size;
+    Dictionary<ulong, ulong[]> _l2TableCache;
+    int                        _maxClusterCache;
+    int                        _maxL2TableCache;
+    Header                     _qHdr;
+    ulong[]                    _refCountTable;
+    Dictionary<ulong, byte[]>  _sectorCache;
+    ulong                      _sectorMask;
+    FileStream                 _writingStream;
+
+    public Qcow2() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = "QEMU",
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/Read.cs b/Aaru.Images/QCOW2/Read.cs
index ac39af1ce..a1861e8fb 100644
--- a/Aaru.Images/QCOW2/Read.cs
+++ b/Aaru.Images/QCOW2/Read.cs
@@ -43,301 +43,300 @@ using SharpCompress.Compressors;
 using SharpCompress.Compressors.Deflate;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qcow2
 {
-    public sealed partial class Qcow2
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 512)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] qHdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(qHdrB, 0, Marshal.SizeOf<Header>());
+        _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
+
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}", _qHdr.magic);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}", _qHdr.version);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_offset = {0}", _qHdr.backing_file_offset);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_size = {0}", _qHdr.backing_file_size);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.cluster_bits = {0}", _qHdr.cluster_bits);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.size = {0}", _qHdr.size);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.crypt_method = {0}", _qHdr.crypt_method);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_size = {0}", _qHdr.l1_size);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_table_offset = {0}", _qHdr.l1_table_offset);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.refcount_table_offset = {0}", _qHdr.refcount_table_offset);
+
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.refcount_table_clusters = {0}",
+                                   _qHdr.refcount_table_clusters);
+
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.nb_snapshots = {0}", _qHdr.nb_snapshots);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.snapshots_offset = {0}", _qHdr.snapshots_offset);
+
+        if(_qHdr.version >= QCOW_VERSION3)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.features = {0:X}", _qHdr.features);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.compat_features = {0:X}", _qHdr.compat_features);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.autoclear_features = {0:X}", _qHdr.autoclear_features);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.refcount_order = {0}", _qHdr.refcount_order);
+            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.header_length = {0}", _qHdr.header_length);
 
-            if(stream.Length < 512)
-                return ErrorNumber.InvalidArgument;
-
-            byte[] qHdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(qHdrB, 0, Marshal.SizeOf<Header>());
-            _qHdr = Marshal.SpanToStructureBigEndian<Header>(qHdrB);
-
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.magic = 0x{0:X8}", _qHdr.magic);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.version = {0}", _qHdr.version);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_offset = {0}", _qHdr.backing_file_offset);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.backing_file_size = {0}", _qHdr.backing_file_size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.cluster_bits = {0}", _qHdr.cluster_bits);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.size = {0}", _qHdr.size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.crypt_method = {0}", _qHdr.crypt_method);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_size = {0}", _qHdr.l1_size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1_table_offset = {0}", _qHdr.l1_table_offset);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.refcount_table_offset = {0}", _qHdr.refcount_table_offset);
-
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.refcount_table_clusters = {0}",
-                                       _qHdr.refcount_table_clusters);
-
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.nb_snapshots = {0}", _qHdr.nb_snapshots);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.snapshots_offset = {0}", _qHdr.snapshots_offset);
-
-            if(_qHdr.version >= QCOW_VERSION3)
+            if((_qHdr.features & QCOW_FEATURE_MASK) != 0)
             {
-                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.features = {0:X}", _qHdr.features);
-                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.compat_features = {0:X}", _qHdr.compat_features);
-                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.autoclear_features = {0:X}", _qHdr.autoclear_features);
-                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.refcount_order = {0}", _qHdr.refcount_order);
-                AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.header_length = {0}", _qHdr.header_length);
-
-                if((_qHdr.features & QCOW_FEATURE_MASK) != 0)
-                {
-                    AaruConsole.
-                        ErrorWriteLine($"Unknown incompatible features {_qHdr.features & QCOW_FEATURE_MASK:X} enabled, not proceeding.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-            }
-
-            if(_qHdr.size <= 1)
-            {
-                AaruConsole.ErrorWriteLine("Image size is too small");
+                AaruConsole.
+                    ErrorWriteLine($"Unknown incompatible features {_qHdr.features & QCOW_FEATURE_MASK:X} enabled, not proceeding.");
 
                 return ErrorNumber.InvalidArgument;
             }
-
-            if(_qHdr.cluster_bits < 9 ||
-               _qHdr.cluster_bits > 16)
-            {
-                AaruConsole.ErrorWriteLine("Cluster size must be between 512 bytes and 64 Kbytes");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(_qHdr.crypt_method > QCOW_ENCRYPTION_AES)
-            {
-                AaruConsole.ErrorWriteLine("Invalid encryption method");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(_qHdr.crypt_method > QCOW_ENCRYPTION_NONE)
-            {
-                AaruConsole.ErrorWriteLine("AES encrypted images not yet supported");
-
-                return ErrorNumber.NotImplemented;
-            }
-
-            if(_qHdr.backing_file_offset != 0)
-            {
-                AaruConsole.ErrorWriteLine("Differencing images not yet supported");
-
-                return ErrorNumber.NotImplemented;
-            }
-
-            _clusterSize    = 1 << (int)_qHdr.cluster_bits;
-            _clusterSectors = 1 << ((int)_qHdr.cluster_bits - 9);
-            _l2Bits         = (int)(_qHdr.cluster_bits      - 3);
-            _l2Size         = 1 << _l2Bits;
-
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSize = {0}", _clusterSize);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSectors = {0}", _clusterSectors);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.qHdr.l1_size = {0}", _qHdr.l1_size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Size = {0}", _l2Size);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectors = {0}", _imageInfo.Sectors);
-
-            byte[] l1TableB = new byte[_qHdr.l1_size * 8];
-            stream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
-            stream.Read(l1TableB, 0, (int)_qHdr.l1_size * 8);
-            _l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
-            AaruConsole.DebugWriteLine("QCOW plugin", "Reading L1 table");
-
-            for(long i = 0; i < _l1Table.LongLength; i++)
-                _l1Table[i] = Swapping.Swap(_l1Table[i]);
-
-            _l1Mask = 0;
-            int c = 0;
-            _l1Shift = (int)(_l2Bits + _qHdr.cluster_bits);
-
-            for(int i = 0; i < 64; i++)
-            {
-                _l1Mask <<= 1;
-
-                if(c >= 64 - _l1Shift)
-                    continue;
-
-                _l1Mask += 1;
-                c++;
-            }
-
-            _l2Mask = 0;
-
-            for(int i = 0; i < _l2Bits; i++)
-                _l2Mask = (_l2Mask << 1) + 1;
-
-            _l2Mask <<= (int)_qHdr.cluster_bits;
-
-            _sectorMask = 0;
-
-            for(int i = 0; i < _qHdr.cluster_bits; i++)
-                _sectorMask = (_sectorMask << 1) + 1;
-
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Mask = {0:X}", _l1Mask);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Shift = {0}", _l1Shift);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Mask = {0:X}", _l2Mask);
-            AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectorMask = {0:X}", _sectorMask);
-
-            _maxL2TableCache = MAX_CACHE_SIZE / (_l2Size * 8);
-            _maxClusterCache = MAX_CACHE_SIZE / _clusterSize;
-
-            _imageStream = stream;
-
-            _sectorCache  = new Dictionary<ulong, byte[]>();
-            _l2TableCache = new Dictionary<ulong, ulong[]>();
-            _clusterCache = new Dictionary<ulong, byte[]>();
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = _qHdr.size / 512;
-            _imageInfo.SectorSize           = 512;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.MediaType            = MediaType.GENERIC_HDD;
-            _imageInfo.ImageSize            = _qHdr.size;
-            _imageInfo.Version              = $"{_qHdr.version}";
-
-            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-            _imageInfo.Heads           = 16;
-            _imageInfo.SectorsPerTrack = 63;
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        if(_qHdr.size <= 1)
         {
-            buffer = null;
+            AaruConsole.ErrorWriteLine("Image size is too small");
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            return ErrorNumber.InvalidArgument;
+        }
 
-            // Check cache
-            if(_sectorCache.TryGetValue(sectorAddress, out buffer))
-                return ErrorNumber.NoError;
+        if(_qHdr.cluster_bits < 9 ||
+           _qHdr.cluster_bits > 16)
+        {
+            AaruConsole.ErrorWriteLine("Cluster size must be between 512 bytes and 64 Kbytes");
 
-            ulong byteAddress = sectorAddress * 512;
+            return ErrorNumber.InvalidArgument;
+        }
 
-            ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
+        if(_qHdr.crypt_method > QCOW_ENCRYPTION_AES)
+        {
+            AaruConsole.ErrorWriteLine("Invalid encryption method");
 
-            if((long)l1Off >= _l1Table.LongLength)
-            {
-                AaruConsole.DebugWriteLine("QCOW2 plugin",
-                                           $"Trying to read past L1 table, position {l1Off} of a max {_l1Table.LongLength}");
+            return ErrorNumber.InvalidArgument;
+        }
 
-                return ErrorNumber.InvalidArgument;
-            }
+        if(_qHdr.crypt_method > QCOW_ENCRYPTION_NONE)
+        {
+            AaruConsole.ErrorWriteLine("AES encrypted images not yet supported");
 
-            // TODO: Implement differential images
-            if(_l1Table[l1Off] == 0)
-            {
-                buffer = new byte[512];
+            return ErrorNumber.NotImplemented;
+        }
 
-                return ErrorNumber.NoError;
-            }
+        if(_qHdr.backing_file_offset != 0)
+        {
+            AaruConsole.ErrorWriteLine("Differencing images not yet supported");
 
-            if(!_l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
-            {
-                _imageStream.Seek((long)(_l1Table[l1Off] & QCOW_FLAGS_MASK), SeekOrigin.Begin);
-                byte[] l2TableB = new byte[_l2Size * 8];
-                _imageStream.Read(l2TableB, 0, _l2Size * 8);
-                AaruConsole.DebugWriteLine("QCOW plugin", "Reading L2 table #{0}", l1Off);
-                l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
+            return ErrorNumber.NotImplemented;
+        }
 
-                for(long i = 0; i < l2Table.LongLength; i++)
-                    l2Table[i] = Swapping.Swap(l2Table[i]);
+        _clusterSize    = 1 << (int)_qHdr.cluster_bits;
+        _clusterSectors = 1 << ((int)_qHdr.cluster_bits - 9);
+        _l2Bits         = (int)(_qHdr.cluster_bits      - 3);
+        _l2Size         = 1 << _l2Bits;
 
-                if(_l2TableCache.Count >= _maxL2TableCache)
-                    _l2TableCache.Clear();
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSize = {0}", _clusterSize);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.clusterSectors = {0}", _clusterSectors);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.qHdr.l1_size = {0}", _qHdr.l1_size);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Size = {0}", _l2Size);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectors = {0}", _imageInfo.Sectors);
 
-                _l2TableCache.Add(l1Off, l2Table);
-            }
+        byte[] l1TableB = new byte[_qHdr.l1_size * 8];
+        stream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
+        stream.Read(l1TableB, 0, (int)_qHdr.l1_size * 8);
+        _l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
+        AaruConsole.DebugWriteLine("QCOW plugin", "Reading L1 table");
 
-            ulong l2Off = (byteAddress & _l2Mask) >> (int)_qHdr.cluster_bits;
+        for(long i = 0; i < _l1Table.LongLength; i++)
+            _l1Table[i] = Swapping.Swap(_l1Table[i]);
 
-            ulong offset = l2Table[l2Off];
+        _l1Mask = 0;
+        int c = 0;
+        _l1Shift = (int)(_l2Bits + _qHdr.cluster_bits);
 
+        for(int i = 0; i < 64; i++)
+        {
+            _l1Mask <<= 1;
+
+            if(c >= 64 - _l1Shift)
+                continue;
+
+            _l1Mask += 1;
+            c++;
+        }
+
+        _l2Mask = 0;
+
+        for(int i = 0; i < _l2Bits; i++)
+            _l2Mask = (_l2Mask << 1) + 1;
+
+        _l2Mask <<= (int)_qHdr.cluster_bits;
+
+        _sectorMask = 0;
+
+        for(int i = 0; i < _qHdr.cluster_bits; i++)
+            _sectorMask = (_sectorMask << 1) + 1;
+
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Mask = {0:X}", _l1Mask);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l1Shift = {0}", _l1Shift);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.l2Mask = {0:X}", _l2Mask);
+        AaruConsole.DebugWriteLine("QCOW plugin", "qHdr.sectorMask = {0:X}", _sectorMask);
+
+        _maxL2TableCache = MAX_CACHE_SIZE / (_l2Size * 8);
+        _maxClusterCache = MAX_CACHE_SIZE / _clusterSize;
+
+        _imageStream = stream;
+
+        _sectorCache  = new Dictionary<ulong, byte[]>();
+        _l2TableCache = new Dictionary<ulong, ulong[]>();
+        _clusterCache = new Dictionary<ulong, byte[]>();
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = _qHdr.size / 512;
+        _imageInfo.SectorSize           = 512;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.MediaType            = MediaType.GENERIC_HDD;
+        _imageInfo.ImageSize            = _qHdr.size;
+        _imageInfo.Version              = $"{_qHdr.version}";
+
+        _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+        _imageInfo.Heads           = 16;
+        _imageInfo.SectorsPerTrack = 63;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        // Check cache
+        if(_sectorCache.TryGetValue(sectorAddress, out buffer))
+            return ErrorNumber.NoError;
+
+        ulong byteAddress = sectorAddress * 512;
+
+        ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
+
+        if((long)l1Off >= _l1Table.LongLength)
+        {
+            AaruConsole.DebugWriteLine("QCOW2 plugin",
+                                       $"Trying to read past L1 table, position {l1Off} of a max {_l1Table.LongLength}");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        // TODO: Implement differential images
+        if(_l1Table[l1Off] == 0)
+        {
             buffer = new byte[512];
 
-            if((offset & QCOW_FLAGS_MASK) != 0)
+            return ErrorNumber.NoError;
+        }
+
+        if(!_l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
+        {
+            _imageStream.Seek((long)(_l1Table[l1Off] & QCOW_FLAGS_MASK), SeekOrigin.Begin);
+            byte[] l2TableB = new byte[_l2Size * 8];
+            _imageStream.Read(l2TableB, 0, _l2Size * 8);
+            AaruConsole.DebugWriteLine("QCOW plugin", "Reading L2 table #{0}", l1Off);
+            l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
+
+            for(long i = 0; i < l2Table.LongLength; i++)
+                l2Table[i] = Swapping.Swap(l2Table[i]);
+
+            if(_l2TableCache.Count >= _maxL2TableCache)
+                _l2TableCache.Clear();
+
+            _l2TableCache.Add(l1Off, l2Table);
+        }
+
+        ulong l2Off = (byteAddress & _l2Mask) >> (int)_qHdr.cluster_bits;
+
+        ulong offset = l2Table[l2Off];
+
+        buffer = new byte[512];
+
+        if((offset & QCOW_FLAGS_MASK) != 0)
+        {
+            if(!_clusterCache.TryGetValue(offset, out byte[] cluster))
             {
-                if(!_clusterCache.TryGetValue(offset, out byte[] cluster))
+                if((offset & QCOW_COMPRESSED) == QCOW_COMPRESSED)
                 {
-                    if((offset & QCOW_COMPRESSED) == QCOW_COMPRESSED)
-                    {
-                        ulong compSizeMask = (ulong)(1 << (int)(_qHdr.cluster_bits - 8)) - 1;
-                        byte  countbits    = (byte)(_qHdr.cluster_bits - 8);
-                        compSizeMask <<= 62 - countbits;
-                        ulong offMask = ~compSizeMask & QCOW_FLAGS_MASK;
+                    ulong compSizeMask = (ulong)(1 << (int)(_qHdr.cluster_bits - 8)) - 1;
+                    byte  countbits    = (byte)(_qHdr.cluster_bits - 8);
+                    compSizeMask <<= 62 - countbits;
+                    ulong offMask = ~compSizeMask & QCOW_FLAGS_MASK;
 
-                        ulong realOff  = offset & offMask;
-                        ulong compSize = (((offset & compSizeMask) >> (62 - countbits)) + 1) * 512;
+                    ulong realOff  = offset & offMask;
+                    ulong compSize = (((offset & compSizeMask) >> (62 - countbits)) + 1) * 512;
 
-                        byte[] zCluster = new byte[compSize];
-                        _imageStream.Seek((long)realOff, SeekOrigin.Begin);
-                        _imageStream.Read(zCluster, 0, (int)compSize);
+                    byte[] zCluster = new byte[compSize];
+                    _imageStream.Seek((long)realOff, SeekOrigin.Begin);
+                    _imageStream.Read(zCluster, 0, (int)compSize);
 
-                        var zStream = new DeflateStream(new MemoryStream(zCluster), CompressionMode.Decompress);
-                        cluster = new byte[_clusterSize];
-                        int read = zStream.Read(cluster, 0, _clusterSize);
+                    var zStream = new DeflateStream(new MemoryStream(zCluster), CompressionMode.Decompress);
+                    cluster = new byte[_clusterSize];
+                    int read = zStream.Read(cluster, 0, _clusterSize);
 
-                        if(read != _clusterSize)
-                            return ErrorNumber.InOutError;
-                    }
-                    else
-                    {
-                        cluster = new byte[_clusterSize];
-                        _imageStream.Seek((long)(offset & QCOW_FLAGS_MASK), SeekOrigin.Begin);
-                        _imageStream.Read(cluster, 0, _clusterSize);
-                    }
-
-                    if(_clusterCache.Count >= _maxClusterCache)
-                        _clusterCache.Clear();
-
-                    _clusterCache.Add(offset, cluster);
+                    if(read != _clusterSize)
+                        return ErrorNumber.InOutError;
+                }
+                else
+                {
+                    cluster = new byte[_clusterSize];
+                    _imageStream.Seek((long)(offset & QCOW_FLAGS_MASK), SeekOrigin.Begin);
+                    _imageStream.Read(cluster, 0, _clusterSize);
                 }
 
-                Array.Copy(cluster, (int)(byteAddress & _sectorMask), buffer, 0, 512);
+                if(_clusterCache.Count >= _maxClusterCache)
+                    _clusterCache.Clear();
+
+                _clusterCache.Add(offset, cluster);
             }
 
-            if(_sectorCache.Count >= MAX_CACHED_SECTORS)
-                _sectorCache.Clear();
-
-            _sectorCache.Add(sectorAddress, buffer);
-
-            return ErrorNumber.NoError;
+            Array.Copy(cluster, (int)(byteAddress & _sectorMask), buffer, 0, 512);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        if(_sectorCache.Count >= MAX_CACHED_SECTORS)
+            _sectorCache.Clear();
+
+        _sectorCache.Add(sectorAddress, buffer);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            ms.Write(sector, 0, sector.Length);
         }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/Structs.cs b/Aaru.Images/QCOW2/Structs.cs
index ad3f18a08..4980d1551 100644
--- a/Aaru.Images/QCOW2/Structs.cs
+++ b/Aaru.Images/QCOW2/Structs.cs
@@ -32,49 +32,48 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Qcow2
-    {
-        /// <summary>QCOW header, big-endian</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            /// <summary>
-            ///     <see cref="Qcow2.QCOW_MAGIC" />
-            /// </summary>
-            public uint magic;
-            /// <summary>Must be 1</summary>
-            public uint version;
-            /// <summary>Offset inside file to string containing backing file</summary>
-            public readonly ulong backing_file_offset;
-            /// <summary>Size of <see cref="backing_file_offset" /></summary>
-            public readonly uint backing_file_size;
-            /// <summary>Cluster bits</summary>
-            public uint cluster_bits;
-            /// <summary>Size in bytes</summary>
-            public ulong size;
-            /// <summary>Encryption method</summary>
-            public readonly uint crypt_method;
-            /// <summary>Size of L1 table</summary>
-            public uint l1_size;
-            /// <summary>Offset to L1 table</summary>
-            public ulong l1_table_offset;
-            /// <summary>Offset to reference count table</summary>
-            public ulong refcount_table_offset;
-            /// <summary>How many clusters does the refcount table span</summary>
-            public uint refcount_table_clusters;
-            /// <summary>Number of snapshots</summary>
-            public readonly uint nb_snapshots;
-            /// <summary>Offset to QCowSnapshotHeader</summary>
-            public readonly ulong snapshots_offset;
+namespace Aaru.DiscImages;
 
-            // Added in version 3
-            public readonly ulong features;
-            public readonly ulong compat_features;
-            public readonly ulong autoclear_features;
-            public readonly uint  refcount_order;
-            public          uint  header_length;
-        }
+public sealed partial class Qcow2
+{
+    /// <summary>QCOW header, big-endian</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
+    {
+        /// <summary>
+        ///     <see cref="Qcow2.QCOW_MAGIC" />
+        /// </summary>
+        public uint magic;
+        /// <summary>Must be 1</summary>
+        public uint version;
+        /// <summary>Offset inside file to string containing backing file</summary>
+        public readonly ulong backing_file_offset;
+        /// <summary>Size of <see cref="backing_file_offset" /></summary>
+        public readonly uint backing_file_size;
+        /// <summary>Cluster bits</summary>
+        public uint cluster_bits;
+        /// <summary>Size in bytes</summary>
+        public ulong size;
+        /// <summary>Encryption method</summary>
+        public readonly uint crypt_method;
+        /// <summary>Size of L1 table</summary>
+        public uint l1_size;
+        /// <summary>Offset to L1 table</summary>
+        public ulong l1_table_offset;
+        /// <summary>Offset to reference count table</summary>
+        public ulong refcount_table_offset;
+        /// <summary>How many clusters does the refcount table span</summary>
+        public uint refcount_table_clusters;
+        /// <summary>Number of snapshots</summary>
+        public readonly uint nb_snapshots;
+        /// <summary>Offset to QCowSnapshotHeader</summary>
+        public readonly ulong snapshots_offset;
+
+        // Added in version 3
+        public readonly ulong features;
+        public readonly ulong compat_features;
+        public readonly ulong autoclear_features;
+        public readonly uint  refcount_order;
+        public          uint  header_length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/Unsupported.cs b/Aaru.Images/QCOW2/Unsupported.cs
index a981b75a6..23b9a588d 100644
--- a/Aaru.Images/QCOW2/Unsupported.cs
+++ b/Aaru.Images/QCOW2/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qcow2
 {
-    public sealed partial class Qcow2
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QCOW2/Write.cs b/Aaru.Images/QCOW2/Write.cs
index d6777004b..e1a1943a1 100644
--- a/Aaru.Images/QCOW2/Write.cs
+++ b/Aaru.Images/QCOW2/Write.cs
@@ -42,384 +42,383 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qcow2
 {
-    public sealed partial class Qcow2
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            // TODO: Correct this calculation
-            if(sectors * sectorSize / 65536 > uint.MaxValue)
-            {
-                ErrorMessage = "Too many sectors for selected cluster size";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            string extension = Path.GetExtension(path);
-            bool   version3  = extension == ".qcow3" || extension == ".qc3";
-
-            _qHdr = new Header
-            {
-                magic         = QCOW_MAGIC,
-                version       = version3 ? QCOW_VERSION3 : QCOW_VERSION2,
-                size          = sectors * sectorSize,
-                cluster_bits  = 16,
-                header_length = (uint)Marshal.SizeOf<Header>()
-            };
-
-            _clusterSize    = 1 << (int)_qHdr.cluster_bits;
-            _clusterSectors = 1 << ((int)_qHdr.cluster_bits - 9);
-            _l2Bits         = (int)(_qHdr.cluster_bits      - 3);
-            _l2Size         = 1 << _l2Bits;
-
-            _l1Mask = 0;
-            int c = 0;
-            _l1Shift = (int)(_l2Bits + _qHdr.cluster_bits);
-
-            for(int i = 0; i < 64; i++)
-            {
-                _l1Mask <<= 1;
-
-                if(c >= 64 - _l1Shift)
-                    continue;
-
-                _l1Mask += 1;
-                c++;
-            }
-
-            _l2Mask = 0;
-
-            for(int i = 0; i < _l2Bits; i++)
-                _l2Mask = (_l2Mask << 1) + 1;
-
-            _l2Mask <<= (int)_qHdr.cluster_bits;
-
-            _sectorMask = 0;
-
-            for(int i = 0; i < _qHdr.cluster_bits; i++)
-                _sectorMask = (_sectorMask << 1) + 1;
-
-            _qHdr.l1_size = (uint)(((long)_qHdr.size + (1 << _l1Shift) - 1) >> _l1Shift);
-
-            if(_qHdr.l1_size == 0)
-                _qHdr.l1_size = 1;
-
-            _l1Table = new ulong[_qHdr.l1_size];
-
-            ulong clusters       = _qHdr.size   / (ulong)_clusterSize;
-            ulong refCountBlocks = clusters * 2 / (ulong)_clusterSize;
-
-            if(clusters * 2 % (ulong)_clusterSize > 0)
-                refCountBlocks++;
-
-            if(refCountBlocks == 0)
-                refCountBlocks = 1;
-
-            _qHdr.refcount_table_offset   = (ulong)_clusterSize;
-            _qHdr.refcount_table_clusters = (uint)(refCountBlocks * 8 / (ulong)_clusterSize);
-
-            if(_qHdr.refcount_table_clusters == 0)
-                _qHdr.refcount_table_clusters = 1;
-
-            _refCountTable        = new ulong[refCountBlocks];
-            _qHdr.l1_table_offset = _qHdr.refcount_table_offset + (ulong)(_qHdr.refcount_table_clusters * _clusterSize);
-            ulong l1TableClusters = _qHdr.l1_size * 8 / (ulong)_clusterSize;
-
-            if(l1TableClusters == 0)
-                l1TableClusters = 1;
-
-            byte[] empty = new byte[_qHdr.l1_table_offset + (l1TableClusters * (ulong)_clusterSize)];
-            _writingStream.Write(empty, 0, empty.Length);
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-                return true;
-
-            ulong byteAddress = sectorAddress * 512;
-
-            ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
-
-            if((long)l1Off >= _l1Table.LongLength)
-            {
-                ErrorMessage = $"Trying to write past L1 table, position {l1Off} of a max {_l1Table.LongLength}";
-
-                return false;
-            }
-
-            if(_l1Table[l1Off] == 0)
-            {
-                _writingStream.Seek(0, SeekOrigin.End);
-                _l1Table[l1Off] = (ulong)_writingStream.Position;
-                byte[] l2TableB = new byte[_l2Size * 8];
-                _writingStream.Seek(0, SeekOrigin.End);
-                _writingStream.Write(l2TableB, 0, l2TableB.Length);
-            }
-
-            _writingStream.Position = (long)_l1Table[l1Off];
-
-            ulong l2Off = (byteAddress & _l2Mask) >> (int)_qHdr.cluster_bits;
-
-            _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
-
-            byte[] entry = new byte[8];
-            _writingStream.Read(entry, 0, 8);
-            ulong offset = BigEndianBitConverter.ToUInt64(entry, 0);
-
-            if(offset == 0)
-            {
-                offset = (ulong)_writingStream.Length;
-                byte[] cluster = new byte[_clusterSize];
-                entry = BigEndianBitConverter.GetBytes(offset);
-                _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
-                _writingStream.Write(entry, 0, 8);
-                _writingStream.Seek(0, SeekOrigin.End);
-                _writingStream.Write(cluster, 0, cluster.Length);
-            }
-
-            _writingStream.Seek((long)(offset + (byteAddress & _sectorMask)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            int   refCountBlockEntries = _clusterSize * 8 / 16;
-            ulong refCountBlockIndex   = offset       / (ulong)_clusterSize % (ulong)refCountBlockEntries;
-            ulong refCountTableIndex   = offset / (ulong)_clusterSize / (ulong)refCountBlockEntries;
-
-            ulong refBlockOffset = _refCountTable[refCountTableIndex];
-
-            if(refBlockOffset == 0)
-            {
-                refBlockOffset                     = (ulong)_writingStream.Length;
-                _refCountTable[refCountTableIndex] = refBlockOffset;
-                byte[] cluster = new byte[_clusterSize];
-                _writingStream.Seek(0, SeekOrigin.End);
-                _writingStream.Write(cluster, 0, cluster.Length);
-            }
-
-            _writingStream.Seek((long)(refBlockOffset + refCountBlockIndex), SeekOrigin.Begin);
-
-            _writingStream.Write(new byte[]
-            {
-                0, 1
-            }, 0, 2);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        // TODO: This can be optimized
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-                return true;
-
-            for(uint i = 0; i < length; i++)
-            {
-                byte[] tmp = new byte[_imageInfo.SectorSize];
-                Array.Copy(data, i * _imageInfo.SectorSize, tmp, 0, _imageInfo.SectorSize);
-
-                if(!WriteSector(tmp, sectorAddress + i))
-                    return false;
-            }
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        // TODO: Correct this calculation
+        if(sectors * sectorSize / 65536 > uint.MaxValue)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors for selected cluster size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.magic), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.version), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.backing_file_offset), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.backing_file_size), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.cluster_bits), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.size), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.crypt_method), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.l1_size), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.l1_table_offset), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.refcount_table_offset), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.refcount_table_clusters), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.nb_snapshots), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.snapshots_offset), 0, 8);
-
-            if(_qHdr.version == QCOW_VERSION3)
-            {
-                _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.features), 0, 8);
-                _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.compat_features), 0, 8);
-                _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.autoclear_features), 0, 8);
-                _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.refcount_order), 0, 4);
-                _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.header_length), 0, 4);
-            }
-
-            _writingStream.Seek((long)_qHdr.refcount_table_offset, SeekOrigin.Begin);
-
-            for(long i = 0; i < _refCountTable.LongLength; i++)
-                _writingStream.Write(BigEndianBitConverter.GetBytes(_refCountTable[i]), 0, 8);
-
-            _writingStream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
-
-            for(long i = 0; i < _l1Table.LongLength; i++)
-                _l1Table[i] = Swapping.Swap(_l1Table[i]);
-
-            byte[] l1TableB = MemoryMarshal.Cast<ulong, byte>(_l1Table).ToArray();
-            _writingStream.Write(l1TableB, 0, l1TableB.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
         }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+        catch(IOException e)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+        string extension = Path.GetExtension(path);
+        bool   version3  = extension == ".qcow3" || extension == ".qc3";
 
-            return false;
+        _qHdr = new Header
+        {
+            magic         = QCOW_MAGIC,
+            version       = version3 ? QCOW_VERSION3 : QCOW_VERSION2,
+            size          = sectors * sectorSize,
+            cluster_bits  = 16,
+            header_length = (uint)Marshal.SizeOf<Header>()
+        };
+
+        _clusterSize    = 1 << (int)_qHdr.cluster_bits;
+        _clusterSectors = 1 << ((int)_qHdr.cluster_bits - 9);
+        _l2Bits         = (int)(_qHdr.cluster_bits      - 3);
+        _l2Size         = 1 << _l2Bits;
+
+        _l1Mask = 0;
+        int c = 0;
+        _l1Shift = (int)(_l2Bits + _qHdr.cluster_bits);
+
+        for(int i = 0; i < 64; i++)
+        {
+            _l1Mask <<= 1;
+
+            if(c >= 64 - _l1Shift)
+                continue;
+
+            _l1Mask += 1;
+            c++;
         }
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+        _l2Mask = 0;
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        for(int i = 0; i < _l2Bits; i++)
+            _l2Mask = (_l2Mask << 1) + 1;
+
+        _l2Mask <<= (int)_qHdr.cluster_bits;
+
+        _sectorMask = 0;
+
+        for(int i = 0; i < _qHdr.cluster_bits; i++)
+            _sectorMask = (_sectorMask << 1) + 1;
+
+        _qHdr.l1_size = (uint)(((long)_qHdr.size + (1 << _l1Shift) - 1) >> _l1Shift);
+
+        if(_qHdr.l1_size == 0)
+            _qHdr.l1_size = 1;
+
+        _l1Table = new ulong[_qHdr.l1_size];
+
+        ulong clusters       = _qHdr.size   / (ulong)_clusterSize;
+        ulong refCountBlocks = clusters * 2 / (ulong)_clusterSize;
+
+        if(clusters * 2 % (ulong)_clusterSize > 0)
+            refCountBlocks++;
+
+        if(refCountBlocks == 0)
+            refCountBlocks = 1;
+
+        _qHdr.refcount_table_offset   = (ulong)_clusterSize;
+        _qHdr.refcount_table_clusters = (uint)(refCountBlocks * 8 / (ulong)_clusterSize);
+
+        if(_qHdr.refcount_table_clusters == 0)
+            _qHdr.refcount_table_clusters = 1;
+
+        _refCountTable        = new ulong[refCountBlocks];
+        _qHdr.l1_table_offset = _qHdr.refcount_table_offset + (ulong)(_qHdr.refcount_table_clusters * _clusterSize);
+        ulong l1TableClusters = _qHdr.l1_size * 8 / (ulong)_clusterSize;
+
+        if(l1TableClusters == 0)
+            l1TableClusters = 1;
+
+        byte[] empty = new byte[_qHdr.l1_table_offset + (l1TableClusters * (ulong)_clusterSize)];
+        _writingStream.Write(empty, 0, empty.Length);
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+            return true;
+
+        ulong byteAddress = sectorAddress * 512;
+
+        ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
+
+        if((long)l1Off >= _l1Table.LongLength)
+        {
+            ErrorMessage = $"Trying to write past L1 table, position {l1Off} of a max {_l1Table.LongLength}";
+
+            return false;
+        }
+
+        if(_l1Table[l1Off] == 0)
+        {
+            _writingStream.Seek(0, SeekOrigin.End);
+            _l1Table[l1Off] = (ulong)_writingStream.Position;
+            byte[] l2TableB = new byte[_l2Size * 8];
+            _writingStream.Seek(0, SeekOrigin.End);
+            _writingStream.Write(l2TableB, 0, l2TableB.Length);
+        }
+
+        _writingStream.Position = (long)_l1Table[l1Off];
+
+        ulong l2Off = (byteAddress & _l2Mask) >> (int)_qHdr.cluster_bits;
+
+        _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
+
+        byte[] entry = new byte[8];
+        _writingStream.Read(entry, 0, 8);
+        ulong offset = BigEndianBitConverter.ToUInt64(entry, 0);
+
+        if(offset == 0)
+        {
+            offset = (ulong)_writingStream.Length;
+            byte[] cluster = new byte[_clusterSize];
+            entry = BigEndianBitConverter.GetBytes(offset);
+            _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
+            _writingStream.Write(entry, 0, 8);
+            _writingStream.Seek(0, SeekOrigin.End);
+            _writingStream.Write(cluster, 0, cluster.Length);
+        }
+
+        _writingStream.Seek((long)(offset + (byteAddress & _sectorMask)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        int   refCountBlockEntries = _clusterSize * 8 / 16;
+        ulong refCountBlockIndex   = offset       / (ulong)_clusterSize % (ulong)refCountBlockEntries;
+        ulong refCountTableIndex   = offset / (ulong)_clusterSize / (ulong)refCountBlockEntries;
+
+        ulong refBlockOffset = _refCountTable[refCountTableIndex];
+
+        if(refBlockOffset == 0)
+        {
+            refBlockOffset                     = (ulong)_writingStream.Length;
+            _refCountTable[refCountTableIndex] = refBlockOffset;
+            byte[] cluster = new byte[_clusterSize];
+            _writingStream.Seek(0, SeekOrigin.End);
+            _writingStream.Write(cluster, 0, cluster.Length);
+        }
+
+        _writingStream.Seek((long)(refBlockOffset + refCountBlockIndex), SeekOrigin.Begin);
+
+        _writingStream.Write(new byte[]
+        {
+            0, 1
+        }, 0, 2);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    // TODO: This can be optimized
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+            return true;
+
+        for(uint i = 0; i < length; i++)
+        {
+            byte[] tmp = new byte[_imageInfo.SectorSize];
+            Array.Copy(data, i * _imageInfo.SectorSize, tmp, 0, _imageInfo.SectorSize);
+
+            if(!WriteSector(tmp, sectorAddress + i))
+                return false;
+        }
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.magic), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.version), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.backing_file_offset), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.backing_file_size), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.cluster_bits), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.size), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.crypt_method), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.l1_size), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.l1_table_offset), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.refcount_table_offset), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.refcount_table_clusters), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.nb_snapshots), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.snapshots_offset), 0, 8);
+
+        if(_qHdr.version == QCOW_VERSION3)
+        {
+            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.features), 0, 8);
+            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.compat_features), 0, 8);
+            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.autoclear_features), 0, 8);
+            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.refcount_order), 0, 4);
+            _writingStream.Write(BigEndianBitConverter.GetBytes(_qHdr.header_length), 0, 4);
+        }
+
+        _writingStream.Seek((long)_qHdr.refcount_table_offset, SeekOrigin.Begin);
+
+        for(long i = 0; i < _refCountTable.LongLength; i++)
+            _writingStream.Write(BigEndianBitConverter.GetBytes(_refCountTable[i]), 0, 8);
+
+        _writingStream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
+
+        for(long i = 0; i < _l1Table.LongLength; i++)
+            _l1Table[i] = Swapping.Swap(_l1Table[i]);
+
+        byte[] l1TableB = MemoryMarshal.Cast<ulong, byte>(_l1Table).ToArray();
+        _writingStream.Write(l1TableB, 0, l1TableB.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/Constants.cs b/Aaru.Images/QED/Constants.cs
index d57e4195e..6881a384b 100644
--- a/Aaru.Images/QED/Constants.cs
+++ b/Aaru.Images/QED/Constants.cs
@@ -32,27 +32,26 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Qed
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Qed
-    {
-        /// <summary>Magic number: 'Q', 'E', 'D', 0x00</summary>
-        const uint QED_MAGIC = 0x00444551;
+    /// <summary>Magic number: 'Q', 'E', 'D', 0x00</summary>
+    const uint QED_MAGIC = 0x00444551;
 
-        /// <summary>Mask of unsupported incompatible features</summary>
-        const ulong QED_FEATURE_MASK = 0xFFFFFFFFFFFFFFF8;
+    /// <summary>Mask of unsupported incompatible features</summary>
+    const ulong QED_FEATURE_MASK = 0xFFFFFFFFFFFFFFF8;
 
-        /// <summary>File is differential (has a backing file)</summary>
-        const ulong QED_FEATURE_BACKING_FILE = 0x01;
-        /// <summary>Image needs a consistency check before writing</summary>
-        const ulong QED_FEATURE_NEEDS_CHECK = 0x02;
-        /// <summary>Backing file is a raw disk image</summary>
-        const ulong QED_FEATURE_RAW_BACKING = 0x04;
+    /// <summary>File is differential (has a backing file)</summary>
+    const ulong QED_FEATURE_BACKING_FILE = 0x01;
+    /// <summary>Image needs a consistency check before writing</summary>
+    const ulong QED_FEATURE_NEEDS_CHECK = 0x02;
+    /// <summary>Backing file is a raw disk image</summary>
+    const ulong QED_FEATURE_RAW_BACKING = 0x04;
 
-        const int  MAX_CACHE_SIZE       = 16777216;
-        const uint MAX_CACHED_SECTORS   = MAX_CACHE_SIZE / 512;
-        const uint DEFAULT_CLUSTER_SIZE = 65536;
-        const uint DEFAULT_TABLE_SIZE   = 4;
-    }
+    const int  MAX_CACHE_SIZE       = 16777216;
+    const uint MAX_CACHED_SECTORS   = MAX_CACHE_SIZE / 512;
+    const uint DEFAULT_CLUSTER_SIZE = 65536;
+    const uint DEFAULT_TABLE_SIZE   = 4;
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/Helpers.cs b/Aaru.Images/QED/Helpers.cs
index 010582a85..220eb4b05 100644
--- a/Aaru.Images/QED/Helpers.cs
+++ b/Aaru.Images/QED/Helpers.cs
@@ -30,57 +30,56 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qed
 {
-    public sealed partial class Qed
+    static bool IsPowerOfTwo(uint x)
     {
-        static bool IsPowerOfTwo(uint x)
-        {
-            while((x & 1) == 0 &&
-                  x       > 1)
-                x >>= 1;
+        while((x & 1) == 0 &&
+              x       > 1)
+            x >>= 1;
 
-            return x == 1;
+        return x == 1;
+    }
+
+    static int Ctz32(uint val)
+    {
+        int cnt = 0;
+
+        if((val & 0xFFFF) == 0)
+        {
+            cnt +=  16;
+            val >>= 16;
         }
 
-        static int Ctz32(uint val)
+        if((val & 0xFF) == 0)
         {
-            int cnt = 0;
-
-            if((val & 0xFFFF) == 0)
-            {
-                cnt +=  16;
-                val >>= 16;
-            }
-
-            if((val & 0xFF) == 0)
-            {
-                cnt +=  8;
-                val >>= 8;
-            }
-
-            if((val & 0xF) == 0)
-            {
-                cnt +=  4;
-                val >>= 4;
-            }
-
-            if((val & 0x3) == 0)
-            {
-                cnt +=  2;
-                val >>= 2;
-            }
-
-            if((val & 0x1) == 0)
-            {
-                cnt++;
-                val >>= 1;
-            }
-
-            if((val & 0x1) == 0)
-                cnt++;
-
-            return cnt;
+            cnt +=  8;
+            val >>= 8;
         }
+
+        if((val & 0xF) == 0)
+        {
+            cnt +=  4;
+            val >>= 4;
+        }
+
+        if((val & 0x3) == 0)
+        {
+            cnt +=  2;
+            val >>= 2;
+        }
+
+        if((val & 0x1) == 0)
+        {
+            cnt++;
+            val >>= 1;
+        }
+
+        if((val & 0x1) == 0)
+            cnt++;
+
+        return cnt;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/Identify.cs b/Aaru.Images/QED/Identify.cs
index c4338b8d0..a7e6e4f3f 100644
--- a/Aaru.Images/QED/Identify.cs
+++ b/Aaru.Images/QED/Identify.cs
@@ -34,24 +34,23 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qed
 {
-    public sealed partial class Qed
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512)
-                return false;
+        if(stream.Length < 512)
+            return false;
 
-            byte[] qHdrB = new byte[68];
-            stream.Read(qHdrB, 0, 68);
-            _qHdr = Marshal.SpanToStructureLittleEndian<QedHeader>(qHdrB);
+        byte[] qHdrB = new byte[68];
+        stream.Read(qHdrB, 0, 68);
+        _qHdr = Marshal.SpanToStructureLittleEndian<QedHeader>(qHdrB);
 
-            return _qHdr.magic == QED_MAGIC;
-        }
+        return _qHdr.magic == QED_MAGIC;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/Properties.cs b/Aaru.Images/QED/Properties.cs
index d57a8f166..f2c840877 100644
--- a/Aaru.Images/QED/Properties.cs
+++ b/Aaru.Images/QED/Properties.cs
@@ -37,53 +37,52 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qed
 {
-    public sealed partial class Qed
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "QEMU Enhanced Disk image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("B9DBB155-A69A-4C10-BF91-96BF431B9BB6");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "QEMU Enhanced Disk";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+        MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
 
-        /// <inheritdoc />
-        public string Name => "QEMU Enhanced Disk image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("B9DBB155-A69A-4C10-BF91-96BF431B9BB6");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "QEMU Enhanced Disk";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+    // TODO: Add cluster size option
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-
-        // TODO: Add cluster size option
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".qed"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".qed"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/QED.cs b/Aaru.Images/QED/QED.cs
index 8c90d9102..4c32d824d 100644
--- a/Aaru.Images/QED/QED.cs
+++ b/Aaru.Images/QED/QED.cs
@@ -36,52 +36,51 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing QEMU Enhanced Disk images</summary>
-    public sealed partial class Qed : IWritableImage
-    {
-        int                        _clusterBits;
-        Dictionary<ulong, byte[]>  _clusterCache;
-        uint                       _clusterSectors;
-        ImageInfo                  _imageInfo;
-        Stream                     _imageStream;
-        ulong                      _l1Mask;
-        int                        _l1Shift;
-        ulong[]                    _l1Table;
-        ulong                      _l2Mask;
-        Dictionary<ulong, ulong[]> _l2TableCache;
-        uint                       _maxClusterCache;
-        uint                       _maxL2TableCache;
-        QedHeader                  _qHdr;
-        Dictionary<ulong, byte[]>  _sectorCache;
-        ulong                      _sectorMask;
-        uint                       _tableSize;
-        FileStream                 _writingStream;
+namespace Aaru.DiscImages;
 
-        public Qed() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = "1",
-            Application           = "QEMU",
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing QEMU Enhanced Disk images</summary>
+public sealed partial class Qed : IWritableImage
+{
+    int                        _clusterBits;
+    Dictionary<ulong, byte[]>  _clusterCache;
+    uint                       _clusterSectors;
+    ImageInfo                  _imageInfo;
+    Stream                     _imageStream;
+    ulong                      _l1Mask;
+    int                        _l1Shift;
+    ulong[]                    _l1Table;
+    ulong                      _l2Mask;
+    Dictionary<ulong, ulong[]> _l2TableCache;
+    uint                       _maxClusterCache;
+    uint                       _maxL2TableCache;
+    QedHeader                  _qHdr;
+    Dictionary<ulong, byte[]>  _sectorCache;
+    ulong                      _sectorMask;
+    uint                       _tableSize;
+    FileStream                 _writingStream;
+
+    public Qed() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = "1",
+        Application           = "QEMU",
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/Read.cs b/Aaru.Images/QED/Read.cs
index 5bfe1f298..94aa3bdc2 100644
--- a/Aaru.Images/QED/Read.cs
+++ b/Aaru.Images/QED/Read.cs
@@ -40,245 +40,244 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qed
 {
-    public sealed partial class Qed
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 512)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] qHdrB = new byte[68];
+        stream.Read(qHdrB, 0, 68);
+        _qHdr = Marshal.SpanToStructureLittleEndian<QedHeader>(qHdrB);
+
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.magic = 0x{0:X8}", _qHdr.magic);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.cluster_size = {0}", _qHdr.cluster_size);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.table_size = {0}", _qHdr.table_size);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.header_size = {0}", _qHdr.header_size);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.features = {0}", _qHdr.features);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.compat_features = {0}", _qHdr.compat_features);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.autoclear_features = {0}", _qHdr.autoclear_features);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1_table_offset = {0}", _qHdr.l1_table_offset);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.image_size = {0}", _qHdr.image_size);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.backing_file_offset = {0}", _qHdr.backing_file_offset);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.backing_file_size = {0}", _qHdr.backing_file_size);
+
+        if(_qHdr.image_size <= 1)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            AaruConsole.ErrorWriteLine("Image size is too small");
+            return ErrorNumber.InvalidArgument;
+        }
+        if(!IsPowerOfTwo(_qHdr.cluster_size))
+        {
+            AaruConsole.ErrorWriteLine("Cluster size must be a power of 2");
+            return ErrorNumber.InvalidArgument;
+        }
+        if(_qHdr.cluster_size < 4096 ||
+           _qHdr.cluster_size > 67108864)
+        {
+            AaruConsole.ErrorWriteLine("Cluster size must be between 4 Kbytes and 64 Mbytes");
+            return ErrorNumber.InvalidArgument;
+        }
+        if(!IsPowerOfTwo(_qHdr.table_size))
+        {
+            AaruConsole.ErrorWriteLine("Table size must be a power of 2");
+            return ErrorNumber.InvalidArgument;
+        }
+        if(_qHdr.table_size < 1 ||
+           _qHdr.table_size > 16)
+        {
+            AaruConsole.ErrorWriteLine(
+                                       "Table size must be between 1 and 16 clusters");
+            return ErrorNumber.InvalidArgument;
+        }
+        if((_qHdr.features & QED_FEATURE_MASK) > 0)
+        {
+            AaruConsole.ErrorWriteLine(
+                                       $"Image uses unknown incompatible features {_qHdr.features & QED_FEATURE_MASK:X}");
 
-            if(stream.Length < 512)
-                return ErrorNumber.InvalidArgument;
+            return ErrorNumber.InvalidArgument;
+        }
+        if((_qHdr.features & QED_FEATURE_BACKING_FILE) == QED_FEATURE_BACKING_FILE)
+        {
+            AaruConsole.ErrorWriteLine("Differencing images not yet supported");
 
-            byte[] qHdrB = new byte[68];
-            stream.Read(qHdrB, 0, 68);
-            _qHdr = Marshal.SpanToStructureLittleEndian<QedHeader>(qHdrB);
+            return ErrorNumber.NotImplemented;
+        }
+        _clusterSectors = _qHdr.cluster_size                    / 512;
+        _tableSize      = _qHdr.cluster_size * _qHdr.table_size / 8;
 
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.magic = 0x{0:X8}", _qHdr.magic);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.cluster_size = {0}", _qHdr.cluster_size);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.table_size = {0}", _qHdr.table_size);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.header_size = {0}", _qHdr.header_size);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.features = {0}", _qHdr.features);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.compat_features = {0}", _qHdr.compat_features);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.autoclear_features = {0}", _qHdr.autoclear_features);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1_table_offset = {0}", _qHdr.l1_table_offset);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.image_size = {0}", _qHdr.image_size);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.backing_file_offset = {0}", _qHdr.backing_file_offset);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.backing_file_size = {0}", _qHdr.backing_file_size);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.clusterSectors = {0}", _clusterSectors);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.tableSize = {0}", _tableSize);
 
-            if(_qHdr.image_size <= 1)
-            {
-                AaruConsole.ErrorWriteLine("Image size is too small");
-                return ErrorNumber.InvalidArgument;
-            }
-            if(!IsPowerOfTwo(_qHdr.cluster_size))
-            {
-                AaruConsole.ErrorWriteLine("Cluster size must be a power of 2");
-                return ErrorNumber.InvalidArgument;
-            }
-            if(_qHdr.cluster_size < 4096 ||
-               _qHdr.cluster_size > 67108864)
-            {
-                AaruConsole.ErrorWriteLine("Cluster size must be between 4 Kbytes and 64 Mbytes");
-                return ErrorNumber.InvalidArgument;
-            }
-            if(!IsPowerOfTwo(_qHdr.table_size))
-            {
-                AaruConsole.ErrorWriteLine("Table size must be a power of 2");
-                return ErrorNumber.InvalidArgument;
-            }
-            if(_qHdr.table_size < 1 ||
-               _qHdr.table_size > 16)
-            {
-                AaruConsole.ErrorWriteLine(
-                                                      "Table size must be between 1 and 16 clusters");
-                return ErrorNumber.InvalidArgument;
-            }
-            if((_qHdr.features & QED_FEATURE_MASK) > 0)
-            {
-                AaruConsole.ErrorWriteLine(
-                                                      $"Image uses unknown incompatible features {_qHdr.features & QED_FEATURE_MASK:X}");
+        byte[] l1TableB = new byte[_tableSize * 8];
+        stream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
+        stream.Read(l1TableB, 0, (int)_tableSize * 8);
+        AaruConsole.DebugWriteLine("QED plugin", "Reading L1 table");
+        _l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
 
-                return ErrorNumber.InvalidArgument;
-            }
-            if((_qHdr.features & QED_FEATURE_BACKING_FILE) == QED_FEATURE_BACKING_FILE)
-            {
-                AaruConsole.ErrorWriteLine("Differencing images not yet supported");
+        _l1Mask = 0;
+        int c = 0;
+        _clusterBits = Ctz32(_qHdr.cluster_size);
+        _l2Mask      = (_tableSize - 1) << _clusterBits;
+        _l1Shift     = _clusterBits + Ctz32(_tableSize);
 
-                return ErrorNumber.NotImplemented;
-            }
-            _clusterSectors = _qHdr.cluster_size                    / 512;
-            _tableSize      = _qHdr.cluster_size * _qHdr.table_size / 8;
+        for(int i = 0; i < 64; i++)
+        {
+            _l1Mask <<= 1;
 
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.clusterSectors = {0}", _clusterSectors);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.tableSize = {0}", _tableSize);
+            if(c >= 64 - _l1Shift)
+                continue;
 
-            byte[] l1TableB = new byte[_tableSize * 8];
-            stream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
-            stream.Read(l1TableB, 0, (int)_tableSize * 8);
-            AaruConsole.DebugWriteLine("QED plugin", "Reading L1 table");
-            _l1Table = MemoryMarshal.Cast<byte, ulong>(l1TableB).ToArray();
-
-            _l1Mask = 0;
-            int c = 0;
-            _clusterBits = Ctz32(_qHdr.cluster_size);
-            _l2Mask      = (_tableSize - 1) << _clusterBits;
-            _l1Shift     = _clusterBits + Ctz32(_tableSize);
-
-            for(int i = 0; i < 64; i++)
-            {
-                _l1Mask <<= 1;
-
-                if(c >= 64 - _l1Shift)
-                    continue;
-
-                _l1Mask += 1;
-                c++;
-            }
-
-            _sectorMask = 0;
-
-            for(int i = 0; i < _clusterBits; i++)
-                _sectorMask = (_sectorMask << 1) + 1;
-
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.clusterBits = {0}", _clusterBits);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1Mask = {0:X}", _l1Mask);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1Shift = {0}", _l1Shift);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.l2Mask = {0:X}", _l2Mask);
-            AaruConsole.DebugWriteLine("QED plugin", "qHdr.sectorMask = {0:X}", _sectorMask);
-
-            _maxL2TableCache = MAX_CACHE_SIZE / _tableSize;
-            _maxClusterCache = MAX_CACHE_SIZE / _qHdr.cluster_size;
-
-            _imageStream = stream;
-
-            _sectorCache  = new Dictionary<ulong, byte[]>();
-            _l2TableCache = new Dictionary<ulong, ulong[]>();
-            _clusterCache = new Dictionary<ulong, byte[]>();
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = _qHdr.image_size / 512;
-            _imageInfo.SectorSize           = 512;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.MediaType            = MediaType.GENERIC_HDD;
-            _imageInfo.ImageSize            = _qHdr.image_size;
-
-            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-            _imageInfo.Heads           = 16;
-            _imageInfo.SectorsPerTrack = 63;
-
-            return ErrorNumber.NoError;
+            _l1Mask += 1;
+            c++;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        _sectorMask = 0;
+
+        for(int i = 0; i < _clusterBits; i++)
+            _sectorMask = (_sectorMask << 1) + 1;
+
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.clusterBits = {0}", _clusterBits);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1Mask = {0:X}", _l1Mask);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.l1Shift = {0}", _l1Shift);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.l2Mask = {0:X}", _l2Mask);
+        AaruConsole.DebugWriteLine("QED plugin", "qHdr.sectorMask = {0:X}", _sectorMask);
+
+        _maxL2TableCache = MAX_CACHE_SIZE / _tableSize;
+        _maxClusterCache = MAX_CACHE_SIZE / _qHdr.cluster_size;
+
+        _imageStream = stream;
+
+        _sectorCache  = new Dictionary<ulong, byte[]>();
+        _l2TableCache = new Dictionary<ulong, ulong[]>();
+        _clusterCache = new Dictionary<ulong, byte[]>();
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = _qHdr.image_size / 512;
+        _imageInfo.SectorSize           = 512;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.MediaType            = MediaType.GENERIC_HDD;
+        _imageInfo.ImageSize            = _qHdr.image_size;
+
+        _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+        _imageInfo.Heads           = 16;
+        _imageInfo.SectorsPerTrack = 63;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        // Check cache
+        if(_sectorCache.TryGetValue(sectorAddress, out buffer))
+            return ErrorNumber.NoError;
+
+        ulong byteAddress = sectorAddress * 512;
+
+        ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
+
+        if((long)l1Off >= _l1Table.LongLength)
         {
-            buffer = null;
+            AaruConsole.DebugWriteLine("QED plugin",
+                                       $"Trying to read past L1 table, position {l1Off} of a max {_l1Table.LongLength}");
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            // Check cache
-            if(_sectorCache.TryGetValue(sectorAddress, out buffer))
-                return ErrorNumber.NoError;
-
-            ulong byteAddress = sectorAddress * 512;
-
-            ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
-
-            if((long)l1Off >= _l1Table.LongLength)
-            {
-                AaruConsole.DebugWriteLine("QED plugin",
-                                           $"Trying to read past L1 table, position {l1Off} of a max {_l1Table.LongLength}");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            // TODO: Implement differential images
-            if(_l1Table[l1Off] == 0)
-            {
-                buffer = new byte[512];
-
-                return ErrorNumber.NoError;
-            }
-
-            if(!_l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
-            {
-                _imageStream.Seek((long)_l1Table[l1Off], SeekOrigin.Begin);
-                byte[] l2TableB = new byte[_tableSize * 8];
-                _imageStream.Read(l2TableB, 0, (int)_tableSize * 8);
-                AaruConsole.DebugWriteLine("QED plugin", "Reading L2 table #{0}", l1Off);
-                l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
-
-                if(_l2TableCache.Count >= _maxL2TableCache)
-                    _l2TableCache.Clear();
-
-                _l2TableCache.Add(l1Off, l2Table);
-            }
-
-            ulong l2Off = (byteAddress & _l2Mask) >> _clusterBits;
-
-            ulong offset = l2Table[l2Off];
+            return ErrorNumber.InvalidArgument;
+        }
 
+        // TODO: Implement differential images
+        if(_l1Table[l1Off] == 0)
+        {
             buffer = new byte[512];
 
-            if(offset != 0 &&
-               offset != 1)
-            {
-                if(!_clusterCache.TryGetValue(offset, out byte[] cluster))
-                {
-                    cluster = new byte[_qHdr.cluster_size];
-                    _imageStream.Seek((long)offset, SeekOrigin.Begin);
-                    _imageStream.Read(cluster, 0, (int)_qHdr.cluster_size);
-
-                    if(_clusterCache.Count >= _maxClusterCache)
-                        _clusterCache.Clear();
-
-                    _clusterCache.Add(offset, cluster);
-                }
-
-                Array.Copy(cluster, (int)(byteAddress & _sectorMask), buffer, 0, 512);
-            }
-
-            if(_sectorCache.Count >= MAX_CACHED_SECTORS)
-                _sectorCache.Clear();
-
-            _sectorCache.Add(sectorAddress, buffer);
-
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        if(!_l2TableCache.TryGetValue(l1Off, out ulong[] l2Table))
         {
-            buffer = null;
+            _imageStream.Seek((long)_l1Table[l1Off], SeekOrigin.Begin);
+            byte[] l2TableB = new byte[_tableSize * 8];
+            _imageStream.Read(l2TableB, 0, (int)_tableSize * 8);
+            AaruConsole.DebugWriteLine("QED plugin", "Reading L2 table #{0}", l1Off);
+            l2Table = MemoryMarshal.Cast<byte, ulong>(l2TableB).ToArray();
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(_l2TableCache.Count >= _maxL2TableCache)
+                _l2TableCache.Clear();
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+            _l2TableCache.Add(l1Off, l2Table);
+        }
 
-            var ms = new MemoryStream();
+        ulong l2Off = (byteAddress & _l2Mask) >> _clusterBits;
 
-            for(uint i = 0; i < length; i++)
+        ulong offset = l2Table[l2Off];
+
+        buffer = new byte[512];
+
+        if(offset != 0 &&
+           offset != 1)
+        {
+            if(!_clusterCache.TryGetValue(offset, out byte[] cluster))
             {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+                cluster = new byte[_qHdr.cluster_size];
+                _imageStream.Seek((long)offset, SeekOrigin.Begin);
+                _imageStream.Read(cluster, 0, (int)_qHdr.cluster_size);
 
-                if(errno != ErrorNumber.NoError)
-                    return errno;
+                if(_clusterCache.Count >= _maxClusterCache)
+                    _clusterCache.Clear();
 
-                ms.Write(sector, 0, sector.Length);
+                _clusterCache.Add(offset, cluster);
             }
 
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            Array.Copy(cluster, (int)(byteAddress & _sectorMask), buffer, 0, 512);
         }
+
+        if(_sectorCache.Count >= MAX_CACHED_SECTORS)
+            _sectorCache.Clear();
+
+        _sectorCache.Add(sectorAddress, buffer);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/Structs.cs b/Aaru.Images/QED/Structs.cs
index 5e716a078..0d40a9b6e 100644
--- a/Aaru.Images/QED/Structs.cs
+++ b/Aaru.Images/QED/Structs.cs
@@ -32,38 +32,37 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qed
 {
-    public sealed partial class Qed
+    /// <summary>QED header, big-endian</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct QedHeader
     {
-        /// <summary>QED header, big-endian</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct QedHeader
-        {
-            /// <summary>
-            ///     <see cref="Qed.QED_MAGIC" />
-            /// </summary>
-            public uint magic;
-            /// <summary>Cluster size in bytes</summary>
-            public uint cluster_size;
-            /// <summary>L1 and L2 table size in cluster</summary>
-            public uint table_size;
-            /// <summary>Header size in clusters</summary>
-            public uint header_size;
-            /// <summary>Incompatible features</summary>
-            public readonly ulong features;
-            /// <summary>Compatible features</summary>
-            public readonly ulong compat_features;
-            /// <summary>Self-resetting features</summary>
-            public readonly ulong autoclear_features;
-            /// <summary>Offset to L1 table</summary>
-            public ulong l1_table_offset;
-            /// <summary>Image size</summary>
-            public ulong image_size;
-            /// <summary>Offset inside file to string containing backing file</summary>
-            public readonly ulong backing_file_offset;
-            /// <summary>Size of <see cref="backing_file_offset" /></summary>
-            public readonly uint backing_file_size;
-        }
+        /// <summary>
+        ///     <see cref="Qed.QED_MAGIC" />
+        /// </summary>
+        public uint magic;
+        /// <summary>Cluster size in bytes</summary>
+        public uint cluster_size;
+        /// <summary>L1 and L2 table size in cluster</summary>
+        public uint table_size;
+        /// <summary>Header size in clusters</summary>
+        public uint header_size;
+        /// <summary>Incompatible features</summary>
+        public readonly ulong features;
+        /// <summary>Compatible features</summary>
+        public readonly ulong compat_features;
+        /// <summary>Self-resetting features</summary>
+        public readonly ulong autoclear_features;
+        /// <summary>Offset to L1 table</summary>
+        public ulong l1_table_offset;
+        /// <summary>Image size</summary>
+        public ulong image_size;
+        /// <summary>Offset inside file to string containing backing file</summary>
+        public readonly ulong backing_file_offset;
+        /// <summary>Size of <see cref="backing_file_offset" /></summary>
+        public readonly uint backing_file_size;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/Unsupported.cs b/Aaru.Images/QED/Unsupported.cs
index 2651c94ac..2cbce8ce6 100644
--- a/Aaru.Images/QED/Unsupported.cs
+++ b/Aaru.Images/QED/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qed
 {
-    public sealed partial class Qed
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/QED/Write.cs b/Aaru.Images/QED/Write.cs
index e1e7ace9b..64725f1bf 100644
--- a/Aaru.Images/QED/Write.cs
+++ b/Aaru.Images/QED/Write.cs
@@ -42,298 +42,297 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Qed
 {
-    public sealed partial class Qed
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            // TODO: Correct this calculation
-            if(sectors * sectorSize / DEFAULT_CLUSTER_SIZE > uint.MaxValue)
-            {
-                ErrorMessage = "Too many sectors for selected cluster size";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            _qHdr = new QedHeader
-            {
-                magic           = QED_MAGIC,
-                cluster_size    = DEFAULT_CLUSTER_SIZE,
-                table_size      = DEFAULT_TABLE_SIZE,
-                header_size     = 1,
-                l1_table_offset = DEFAULT_CLUSTER_SIZE,
-                image_size      = sectors * sectorSize
-            };
-
-            _clusterSectors = _qHdr.cluster_size                    / 512;
-            _tableSize      = _qHdr.cluster_size * _qHdr.table_size / 8;
-
-            _l1Table = new ulong[_tableSize];
-            _l1Mask  = 0;
-            int c = 0;
-            _clusterBits = Ctz32(_qHdr.cluster_size);
-            _l2Mask      = (_tableSize - 1) << _clusterBits;
-            _l1Shift     = _clusterBits + Ctz32(_tableSize);
-
-            for(int i = 0; i < 64; i++)
-            {
-                _l1Mask <<= 1;
-
-                if(c >= 64 - _l1Shift)
-                    continue;
-
-                _l1Mask += 1;
-                c++;
-            }
-
-            _sectorMask = 0;
-
-            for(int i = 0; i < _clusterBits; i++)
-                _sectorMask = (_sectorMask << 1) + 1;
-
-            byte[] empty = new byte[_qHdr.l1_table_offset + (_tableSize * 8)];
-            _writingStream.Write(empty, 0, empty.Length);
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-                return true;
-
-            ulong byteAddress = sectorAddress * 512;
-
-            ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
-
-            if((long)l1Off >= _l1Table.LongLength)
-            {
-                ErrorMessage = $"Trying to write past L1 table, position {l1Off} of a max {_l1Table.LongLength}";
-
-                return false;
-            }
-
-            if(_l1Table[l1Off] == 0)
-            {
-                _writingStream.Seek(0, SeekOrigin.End);
-                _l1Table[l1Off] = (ulong)_writingStream.Position;
-                byte[] l2TableB = new byte[_tableSize * 8];
-                _writingStream.Seek(0, SeekOrigin.End);
-                _writingStream.Write(l2TableB, 0, l2TableB.Length);
-            }
-
-            _writingStream.Position = (long)_l1Table[l1Off];
-
-            ulong l2Off = (byteAddress & _l2Mask) >> _clusterBits;
-
-            _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
-
-            byte[] entry = new byte[8];
-            _writingStream.Read(entry, 0, 8);
-            ulong offset = BitConverter.ToUInt64(entry, 0);
-
-            if(offset == 0)
-            {
-                offset = (ulong)_writingStream.Length;
-                byte[] cluster = new byte[_qHdr.cluster_size];
-                entry = BitConverter.GetBytes(offset);
-                _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
-                _writingStream.Write(entry, 0, 8);
-                _writingStream.Seek(0, SeekOrigin.End);
-                _writingStream.Write(cluster, 0, cluster.Length);
-            }
-
-            _writingStream.Seek((long)(offset + (byteAddress & _sectorMask)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        // TODO: This can be optimized
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-                return true;
-
-            for(uint i = 0; i < length; i++)
-            {
-                byte[] tmp = new byte[_imageInfo.SectorSize];
-                Array.Copy(data, i * _imageInfo.SectorSize, tmp, 0, _imageInfo.SectorSize);
-
-                if(!WriteSector(tmp, sectorAddress + i))
-                    return false;
-            }
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        // TODO: Correct this calculation
+        if(sectors * sectorSize / DEFAULT_CLUSTER_SIZE > uint.MaxValue)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors for selected cluster size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
-
-            byte[] hdr = new byte[Marshal.SizeOf<QedHeader>()];
-            MemoryMarshal.Write(hdr, ref _qHdr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _writingStream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
-            byte[] l1TableB = MemoryMarshal.Cast<ulong, byte>(_l1Table).ToArray();
-            _writingStream.Write(l1TableB, 0, l1TableB.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
         }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+        catch(IOException e)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+        _qHdr = new QedHeader
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            magic           = QED_MAGIC,
+            cluster_size    = DEFAULT_CLUSTER_SIZE,
+            table_size      = DEFAULT_TABLE_SIZE,
+            header_size     = 1,
+            l1_table_offset = DEFAULT_CLUSTER_SIZE,
+            image_size      = sectors * sectorSize
+        };
 
-            return false;
+        _clusterSectors = _qHdr.cluster_size                    / 512;
+        _tableSize      = _qHdr.cluster_size * _qHdr.table_size / 8;
+
+        _l1Table = new ulong[_tableSize];
+        _l1Mask  = 0;
+        int c = 0;
+        _clusterBits = Ctz32(_qHdr.cluster_size);
+        _l2Mask      = (_tableSize - 1) << _clusterBits;
+        _l1Shift     = _clusterBits + Ctz32(_tableSize);
+
+        for(int i = 0; i < 64; i++)
+        {
+            _l1Mask <<= 1;
+
+            if(c >= 64 - _l1Shift)
+                continue;
+
+            _l1Mask += 1;
+            c++;
         }
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+        _sectorMask = 0;
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        for(int i = 0; i < _clusterBits; i++)
+            _sectorMask = (_sectorMask << 1) + 1;
+
+        byte[] empty = new byte[_qHdr.l1_table_offset + (_tableSize * 8)];
+        _writingStream.Write(empty, 0, empty.Length);
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+            return true;
+
+        ulong byteAddress = sectorAddress * 512;
+
+        ulong l1Off = (byteAddress & _l1Mask) >> _l1Shift;
+
+        if((long)l1Off >= _l1Table.LongLength)
+        {
+            ErrorMessage = $"Trying to write past L1 table, position {l1Off} of a max {_l1Table.LongLength}";
+
+            return false;
+        }
+
+        if(_l1Table[l1Off] == 0)
+        {
+            _writingStream.Seek(0, SeekOrigin.End);
+            _l1Table[l1Off] = (ulong)_writingStream.Position;
+            byte[] l2TableB = new byte[_tableSize * 8];
+            _writingStream.Seek(0, SeekOrigin.End);
+            _writingStream.Write(l2TableB, 0, l2TableB.Length);
+        }
+
+        _writingStream.Position = (long)_l1Table[l1Off];
+
+        ulong l2Off = (byteAddress & _l2Mask) >> _clusterBits;
+
+        _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
+
+        byte[] entry = new byte[8];
+        _writingStream.Read(entry, 0, 8);
+        ulong offset = BitConverter.ToUInt64(entry, 0);
+
+        if(offset == 0)
+        {
+            offset = (ulong)_writingStream.Length;
+            byte[] cluster = new byte[_qHdr.cluster_size];
+            entry = BitConverter.GetBytes(offset);
+            _writingStream.Seek((long)(_l1Table[l1Off] + (l2Off * 8)), SeekOrigin.Begin);
+            _writingStream.Write(entry, 0, 8);
+            _writingStream.Seek(0, SeekOrigin.End);
+            _writingStream.Write(cluster, 0, cluster.Length);
+        }
+
+        _writingStream.Seek((long)(offset + (byteAddress & _sectorMask)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    // TODO: This can be optimized
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+            return true;
+
+        for(uint i = 0; i < length; i++)
+        {
+            byte[] tmp = new byte[_imageInfo.SectorSize];
+            Array.Copy(data, i * _imageInfo.SectorSize, tmp, 0, _imageInfo.SectorSize);
+
+            if(!WriteSector(tmp, sectorAddress + i))
+                return false;
+        }
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        byte[] hdr = new byte[Marshal.SizeOf<QedHeader>()];
+        MemoryMarshal.Write(hdr, ref _qHdr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Seek((long)_qHdr.l1_table_offset, SeekOrigin.Begin);
+        byte[] l1TableB = MemoryMarshal.Cast<ulong, byte>(_l1Table).ToArray();
+        _writingStream.Write(l1TableB, 0, l1TableB.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/Constants.cs b/Aaru.Images/RayDIM/Constants.cs
index 55c7074f5..78c85a880 100644
--- a/Aaru.Images/RayDIM/Constants.cs
+++ b/Aaru.Images/RayDIM/Constants.cs
@@ -30,11 +30,10 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RayDim
 {
-    public sealed partial class RayDim
-    {
-        const string REGEX_SIGNATURE =
-            @"Disk IMage VER (?<major>\d).(?<minor>\d) Copyright \(C\) (?<year>\d{4}) Ray Arachelian, All Rights Reserved\.";
-    }
+    const string REGEX_SIGNATURE =
+        @"Disk IMage VER (?<major>\d).(?<minor>\d) Copyright \(C\) (?<year>\d{4}) Ray Arachelian, All Rights Reserved\.";
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/Enums.cs b/Aaru.Images/RayDIM/Enums.cs
index 2595aede2..85f00f34f 100644
--- a/Aaru.Images/RayDIM/Enums.cs
+++ b/Aaru.Images/RayDIM/Enums.cs
@@ -32,16 +32,15 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class RayDim
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class RayDim
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum RayDiskTypes : byte
     {
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum RayDiskTypes : byte
-        {
-            Md2dd = 1, Md2hd = 2, Mf2dd = 3,
-            Mf2hd = 4, Mf2ed = 5
-        }
+        Md2dd = 1, Md2hd = 2, Mf2dd = 3,
+        Mf2hd = 4, Mf2ed = 5
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/Identify.cs b/Aaru.Images/RayDIM/Identify.cs
index 4a3a70354..e9071ff4f 100644
--- a/Aaru.Images/RayDIM/Identify.cs
+++ b/Aaru.Images/RayDIM/Identify.cs
@@ -36,43 +36,42 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RayDim
 {
-    public sealed partial class RayDim
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
+        Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < Marshal.SizeOf<Header>())
-                return false;
+        if(stream.Length < Marshal.SizeOf<Header>())
+            return false;
 
-            byte[] buffer = new byte[Marshal.SizeOf<Header>()];
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, buffer.Length);
+        byte[] buffer = new byte[Marshal.SizeOf<Header>()];
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, buffer.Length);
 
-            Header header = Marshal.ByteArrayToStructureLittleEndian<Header>(buffer);
+        Header header = Marshal.ByteArrayToStructureLittleEndian<Header>(buffer);
 
-            string signature = StringHandlers.CToString(header.signature);
+        string signature = StringHandlers.CToString(header.signature);
 
-            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.signature = {0}", signature);
-            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.diskType = {0}", header.diskType);
-            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.heads = {0}", header.heads);
+        AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.signature = {0}", signature);
+        AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.diskType = {0}", header.diskType);
+        AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.heads = {0}", header.heads);
 
-            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.cylinders = {0}",
-                                       header.cylinders);
+        AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.cylinders = {0}",
+                                   header.cylinders);
 
-            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.sectorsPerTrack = {0}",
-                                       header.sectorsPerTrack);
+        AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.sectorsPerTrack = {0}",
+                                   header.sectorsPerTrack);
 
-            var   sx = new Regex(REGEX_SIGNATURE);
-            Match sm = sx.Match(signature);
+        var   sx = new Regex(REGEX_SIGNATURE);
+        Match sm = sx.Match(signature);
 
-            AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.signature matches? = {0}",
-                                       sm.Success);
+        AaruConsole.DebugWriteLine("Ray Arachelian's Disk IMage plugin", "header.signature matches? = {0}",
+                                   sm.Success);
 
-            return sm.Success;
-        }
+        return sm.Success;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/Properties.cs b/Aaru.Images/RayDIM/Properties.cs
index 41efa4c36..c07f16fe0 100644
--- a/Aaru.Images/RayDIM/Properties.cs
+++ b/Aaru.Images/RayDIM/Properties.cs
@@ -37,55 +37,54 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class RayDim
-    {
-        /// <inheritdoc />
-        public string Name => "Ray Arachelian's Disk IMage";
-        /// <inheritdoc />
-        public Guid Id => new Guid("F541F4E7-C1E3-4A2D-B07F-D863E87AB961");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Ray Arachelian's Disk IMage";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
+namespace Aaru.DiscImages;
 
-        // TODO: Test with real hardware to see real supported media
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.Apricot_35, MediaType.ATARI_35_DS_DD, MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD,
-            MediaType.ATARI_35_SS_DD_11, MediaType.DMF, MediaType.DMF_82, MediaType.DOS_35_DS_DD_8,
-            MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8,
-            MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD,
-            MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
-            MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525,
-            MediaType.MetaFloppy_Mod_I, MediaType.MetaFloppy_Mod_II
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".dim"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+public sealed partial class RayDim
+{
+    /// <inheritdoc />
+    public string Name => "Ray Arachelian's Disk IMage";
+    /// <inheritdoc />
+    public Guid Id => new Guid("F541F4E7-C1E3-4A2D-B07F-D863E87AB961");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Ray Arachelian's Disk IMage";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+
+    // TODO: Test with real hardware to see real supported media
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.Apricot_35, MediaType.ATARI_35_DS_DD, MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD,
+        MediaType.ATARI_35_SS_DD_11, MediaType.DMF, MediaType.DMF_82, MediaType.DOS_35_DS_DD_8,
+        MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED, MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8,
+        MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8, MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD,
+        MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9, MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD,
+        MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD, MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525,
+        MediaType.MetaFloppy_Mod_I, MediaType.MetaFloppy_Mod_II
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
+            {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".dim"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/RayDIM.cs b/Aaru.Images/RayDIM/RayDIM.cs
index dabfbf9ec..998887394 100644
--- a/Aaru.Images/RayDIM/RayDIM.cs
+++ b/Aaru.Images/RayDIM/RayDIM.cs
@@ -36,36 +36,35 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing Ray Arachellian's DIM disk images</summary>
-    public sealed partial class RayDim : IWritableImage
-    {
-        MemoryStream _disk;
-        ImageInfo    _imageInfo;
-        FileStream   _writingStream;
+namespace Aaru.DiscImages;
 
-        public RayDim() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Application           = "Ray Arachelian's Disk IMage",
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing Ray Arachellian's DIM disk images</summary>
+public sealed partial class RayDim : IWritableImage
+{
+    MemoryStream _disk;
+    ImageInfo    _imageInfo;
+    FileStream   _writingStream;
+
+    public RayDim() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Application           = "Ray Arachelian's Disk IMage",
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/Read.cs b/Aaru.Images/RayDIM/Read.cs
index 0e3e187c3..c4b3db247 100644
--- a/Aaru.Images/RayDIM/Read.cs
+++ b/Aaru.Images/RayDIM/Read.cs
@@ -37,98 +37,97 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RayDim
 {
-    public sealed partial class RayDim
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+
+        if(stream.Length < Marshal.SizeOf<Header>())
+            return ErrorNumber.InvalidArgument;
+
+        byte[] buffer = new byte[Marshal.SizeOf<Header>()];
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(buffer, 0, buffer.Length);
+
+        Header header = Marshal.ByteArrayToStructureLittleEndian<Header>(buffer);
+
+        string signature = StringHandlers.CToString(header.signature);
+
+        var   sx = new Regex(REGEX_SIGNATURE);
+        Match sm = sx.Match(signature);
+
+        if(!sm.Success)
+            return ErrorNumber.InvalidArgument;
+
+        _imageInfo.ApplicationVersion = $"{sm.Groups["major"].Value}.{sm.Groups["minor"].Value}";
+
+        _imageInfo.Cylinders       = (uint)(header.cylinders + 1);
+        _imageInfo.Heads           = (uint)(header.heads     + 1);
+        _imageInfo.SectorsPerTrack = header.sectorsPerTrack;
+        _imageInfo.Sectors         = _imageInfo.Cylinders * _imageInfo.Heads * _imageInfo.SectorsPerTrack;
+        _imageInfo.SectorSize      = 512;
+
+        byte[] sectors = new byte[_imageInfo.SectorsPerTrack * _imageInfo.SectorSize];
+        _disk = new MemoryStream();
+
+        for(int i = 0; i < _imageInfo.SectorsPerTrack * _imageInfo.SectorSize; i++)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-
-            if(stream.Length < Marshal.SizeOf<Header>())
-                return ErrorNumber.InvalidArgument;
-
-            byte[] buffer = new byte[Marshal.SizeOf<Header>()];
-            stream.Seek(0, SeekOrigin.Begin);
-            stream.Read(buffer, 0, buffer.Length);
-
-            Header header = Marshal.ByteArrayToStructureLittleEndian<Header>(buffer);
-
-            string signature = StringHandlers.CToString(header.signature);
-
-            var   sx = new Regex(REGEX_SIGNATURE);
-            Match sm = sx.Match(signature);
-
-            if(!sm.Success)
-                return ErrorNumber.InvalidArgument;
-
-            _imageInfo.ApplicationVersion = $"{sm.Groups["major"].Value}.{sm.Groups["minor"].Value}";
-
-            _imageInfo.Cylinders       = (uint)(header.cylinders + 1);
-            _imageInfo.Heads           = (uint)(header.heads     + 1);
-            _imageInfo.SectorsPerTrack = header.sectorsPerTrack;
-            _imageInfo.Sectors         = _imageInfo.Cylinders * _imageInfo.Heads * _imageInfo.SectorsPerTrack;
-            _imageInfo.SectorSize      = 512;
-
-            byte[] sectors = new byte[_imageInfo.SectorsPerTrack * _imageInfo.SectorSize];
-            _disk = new MemoryStream();
-
-            for(int i = 0; i < _imageInfo.SectorsPerTrack * _imageInfo.SectorSize; i++)
-            {
-                stream.Read(sectors, 0, sectors.Length);
-                stream.Seek(_imageInfo.SectorsPerTrack, SeekOrigin.Current);
-                _disk.Write(sectors, 0, sectors.Length);
-            }
-
-            _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
-                                                          (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
-                                                          false));
-
-            switch(_imageInfo.MediaType)
-            {
-                case MediaType.NEC_525_HD
-                    when header.diskType == RayDiskTypes.Mf2hd || header.diskType == RayDiskTypes.Mf2ed:
-                    _imageInfo.MediaType = MediaType.NEC_35_HD_8;
-
-                    break;
-                case MediaType.DOS_525_HD
-                    when header.diskType == RayDiskTypes.Mf2hd || header.diskType == RayDiskTypes.Mf2ed:
-                    _imageInfo.MediaType = MediaType.NEC_35_HD_15;
-
-                    break;
-                case MediaType.RX50 when header.diskType == RayDiskTypes.Md2dd || header.diskType == RayDiskTypes.Md2hd:
-                    _imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
-
-                    break;
-            }
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-            return ErrorNumber.NoError;
+            stream.Read(sectors, 0, sectors.Length);
+            stream.Seek(_imageInfo.SectorsPerTrack, SeekOrigin.Current);
+            _disk.Write(sectors, 0, sectors.Length);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
+                                                      (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
+                                                      false));
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        switch(_imageInfo.MediaType)
         {
-            buffer = null;
+            case MediaType.NEC_525_HD
+                when header.diskType == RayDiskTypes.Mf2hd || header.diskType == RayDiskTypes.Mf2ed:
+                _imageInfo.MediaType = MediaType.NEC_35_HD_8;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.DOS_525_HD
+                when header.diskType == RayDiskTypes.Mf2hd || header.diskType == RayDiskTypes.Mf2ed:
+                _imageInfo.MediaType = MediaType.NEC_35_HD_15;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+                break;
+            case MediaType.RX50 when header.diskType == RayDiskTypes.Md2dd || header.diskType == RayDiskTypes.Md2hd:
+                _imageInfo.MediaType = MediaType.ATARI_35_SS_DD;
 
-            buffer = new byte[length * _imageInfo.SectorSize];
-
-            _disk.Seek((long)(sectorAddress    * _imageInfo.SectorSize), SeekOrigin.Begin);
-            _disk.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
-
-            return ErrorNumber.NoError;
+                break;
         }
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        _disk.Seek((long)(sectorAddress    * _imageInfo.SectorSize), SeekOrigin.Begin);
+        _disk.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/Structs.cs b/Aaru.Images/RayDIM/Structs.cs
index 9fc343e63..5c8f20ca1 100644
--- a/Aaru.Images/RayDIM/Structs.cs
+++ b/Aaru.Images/RayDIM/Structs.cs
@@ -32,19 +32,18 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RayDim
 {
-    public sealed partial class RayDim
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 80)]
-            public byte[] signature;
-            public RayDiskTypes diskType;
-            public byte         cylinders;
-            public byte         sectorsPerTrack;
-            public byte         heads;
-        }
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 80)]
+        public byte[] signature;
+        public RayDiskTypes diskType;
+        public byte         cylinders;
+        public byte         sectorsPerTrack;
+        public byte         heads;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/Unsupported.cs b/Aaru.Images/RayDIM/Unsupported.cs
index ba5442a46..514143911 100644
--- a/Aaru.Images/RayDIM/Unsupported.cs
+++ b/Aaru.Images/RayDIM/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RayDim
 {
-    public sealed partial class RayDim
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RayDIM/Write.cs b/Aaru.Images/RayDIM/Write.cs
index 0c376e5fe..1bc557ef6 100644
--- a/Aaru.Images/RayDIM/Write.cs
+++ b/Aaru.Images/RayDIM/Write.cs
@@ -41,225 +41,224 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RayDim
 {
-    public sealed partial class RayDim
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(sectors > 255 * 255 * 255)
-            {
-                ErrorMessage = "Too many sectors";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
-                variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType       = mediaType,
-                SectorSize      = sectorSize,
-                Sectors         = sectors,
-                Cylinders       = geometry.cylinders,
-                Heads           = geometry.heads,
-                SectorsPerTrack = geometry.sectorsPerTrack
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(sectors > 255 * 255 * 255)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != 512)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
-                                SeekOrigin.Begin);
-
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % 512 != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
-                                SeekOrigin.Begin);
-
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+        (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
+            variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
 
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+        _imageInfo = new ImageInfo
         {
-            ErrorMessage = "Unsupported feature";
+            MediaType       = mediaType,
+            SectorSize      = sectorSize,
+            Sectors         = sectors,
+            Cylinders       = geometry.cylinders,
+            Heads           = geometry.heads,
+            SectorsPerTrack = geometry.sectorsPerTrack
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
+        IsWriting    = true;
+        ErrorMessage = null;
 
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
-
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            string headerSignature =
-                $"Disk IMage VER 1.0 Copyright (C) {DateTime.Now.Year:D4} Ray Arachelian, All Rights Reserved. Aaru ";
-
-            var header = new Header
-            {
-                signature       = Encoding.ASCII.GetBytes(headerSignature),
-                cylinders       = (byte)_imageInfo.Cylinders,
-                diskType        = RayDiskTypes.Mf2ed,
-                heads           = (byte)_imageInfo.Heads,
-                sectorsPerTrack = (byte)_imageInfo.SectorsPerTrack
-            };
-
-            header.signature[0x4A] = 0x00;
-
-            byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
-            IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(header, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != 512)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
+                            SeekOrigin.Begin);
+
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % 512 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
+                            SeekOrigin.Begin);
+
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        string headerSignature =
+            $"Disk IMage VER 1.0 Copyright (C) {DateTime.Now.Year:D4} Ray Arachelian, All Rights Reserved. Aaru ";
+
+        var header = new Header
+        {
+            signature       = Encoding.ASCII.GetBytes(headerSignature),
+            cylinders       = (byte)_imageInfo.Cylinders,
+            diskType        = RayDiskTypes.Mf2ed,
+            heads           = (byte)_imageInfo.Heads,
+            sectorsPerTrack = (byte)_imageInfo.SectorsPerTrack
+        };
+
+        header.signature[0x4A] = 0x00;
+
+        byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
+        IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(header, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Constants.cs b/Aaru.Images/RsIde/Constants.cs
index 2f66261e3..1b73fe419 100644
--- a/Aaru.Images/RsIde/Constants.cs
+++ b/Aaru.Images/RsIde/Constants.cs
@@ -30,13 +30,12 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RsIde
 {
-    public sealed partial class RsIde
+    readonly byte[] _signature =
     {
-        readonly byte[] _signature =
-        {
-            0x52, 0x53, 0x2D, 0x49, 0x44, 0x45, 0x1A
-        };
-    }
+        0x52, 0x53, 0x2D, 0x49, 0x44, 0x45, 0x1A
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Enums.cs b/Aaru.Images/RsIde/Enums.cs
index b8571ca61..4484d9e4e 100644
--- a/Aaru.Images/RsIde/Enums.cs
+++ b/Aaru.Images/RsIde/Enums.cs
@@ -32,14 +32,13 @@
 
 using System;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RsIde
 {
-    public sealed partial class RsIde
+    [Flags]
+    enum RsIdeFlags : byte
     {
-        [Flags]
-        enum RsIdeFlags : byte
-        {
-            HalfSectors = 1
-        }
+        HalfSectors = 1
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Helpers.cs b/Aaru.Images/RsIde/Helpers.cs
index 13657f7e2..686eafb82 100644
--- a/Aaru.Images/RsIde/Helpers.cs
+++ b/Aaru.Images/RsIde/Helpers.cs
@@ -33,38 +33,37 @@
 using System;
 using System.Text;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RsIde
 {
-    public sealed partial class RsIde
+    static byte[] ScrambleAtaString(string text, int length)
     {
-        static byte[] ScrambleAtaString(string text, int length)
+        byte[] inbuf = Encoding.ASCII.GetBytes(text);
+
+        if(inbuf.Length % 2 != 0)
         {
-            byte[] inbuf = Encoding.ASCII.GetBytes(text);
-
-            if(inbuf.Length % 2 != 0)
-            {
-                byte[] tmpbuf = new byte[inbuf.Length + 1];
-                Array.Copy(inbuf, 0, tmpbuf, 0, inbuf.Length);
-                tmpbuf[^1] = 0x20;
-                inbuf      = tmpbuf;
-            }
-
-            byte[] outbuf = new byte[inbuf.Length];
-
-            for(int i = 0; i < length; i += 2)
-            {
-                outbuf[i] = inbuf[i + 1];
-                outbuf[i            + 1] = inbuf[i];
-            }
-
-            byte[] retBuf = new byte[length];
-
-            for(int i = 0; i < length; i++)
-                retBuf[i] = 0x20;
-
-            Array.Copy(outbuf, 0, retBuf, 0, outbuf.Length >= length ? length : outbuf.Length);
-
-            return retBuf;
+            byte[] tmpbuf = new byte[inbuf.Length + 1];
+            Array.Copy(inbuf, 0, tmpbuf, 0, inbuf.Length);
+            tmpbuf[^1] = 0x20;
+            inbuf      = tmpbuf;
         }
+
+        byte[] outbuf = new byte[inbuf.Length];
+
+        for(int i = 0; i < length; i += 2)
+        {
+            outbuf[i] = inbuf[i + 1];
+            outbuf[i            + 1] = inbuf[i];
+        }
+
+        byte[] retBuf = new byte[length];
+
+        for(int i = 0; i < length; i++)
+            retBuf[i] = 0x20;
+
+        Array.Copy(outbuf, 0, retBuf, 0, outbuf.Length >= length ? length : outbuf.Length);
+
+        return retBuf;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Identify.cs b/Aaru.Images/RsIde/Identify.cs
index f8dbde571..d58c1c19c 100644
--- a/Aaru.Images/RsIde/Identify.cs
+++ b/Aaru.Images/RsIde/Identify.cs
@@ -34,20 +34,19 @@ using System.IO;
 using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RsIde
 {
-    public sealed partial class RsIde
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            byte[] magic = new byte[7];
-            stream.Read(magic, 0, magic.Length);
+        byte[] magic = new byte[7];
+        stream.Read(magic, 0, magic.Length);
 
-            return magic.SequenceEqual(_signature);
-        }
+        return magic.SequenceEqual(_signature);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Properties.cs b/Aaru.Images/RsIde/Properties.cs
index d63ec46da..501597025 100644
--- a/Aaru.Images/RsIde/Properties.cs
+++ b/Aaru.Images/RsIde/Properties.cs
@@ -37,51 +37,50 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RsIde
 {
-    public sealed partial class RsIde
+    /// <inheritdoc />
+    public string Name => "RS-IDE Hard Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("47C3E78D-2BE2-4BA5-AA6B-FEE27C86FC65");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "RS-IDE disk image";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new[]
     {
-        /// <inheritdoc />
-        public string Name => "RS-IDE Hard Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("47C3E78D-2BE2-4BA5-AA6B-FEE27C86FC65");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "RS-IDE disk image";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new[]
-        {
-            MediaTagType.ATA_IDENTIFY
-        };
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        MediaTagType.ATA_IDENTIFY
+    };
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".ide"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".ide"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Read.cs b/Aaru.Images/RsIde/Read.cs
index fead78666..7ecabdad5 100644
--- a/Aaru.Images/RsIde/Read.cs
+++ b/Aaru.Images/RsIde/Read.cs
@@ -39,108 +39,107 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs.Devices.ATA;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RsIde
 {
-    public sealed partial class RsIde
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
+
+        Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
+
+        if(!hdr.magic.SequenceEqual(_signature))
+            return ErrorNumber.InvalidArgument;
+
+        _dataOff = hdr.dataOff;
+
+        _imageInfo.MediaType            = MediaType.GENERIC_HDD;
+        _imageInfo.SectorSize           = (uint)(hdr.flags.HasFlag(RsIdeFlags.HalfSectors) ? 256 : 512);
+        _imageInfo.ImageSize            = (ulong)(stream.Length - _dataOff);
+        _imageInfo.Sectors              = _imageInfo.ImageSize / _imageInfo.SectorSize;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.Version              = $"{hdr.revision >> 8}.{hdr.revision & 0x0F}";
+
+        if(!ArrayHelpers.ArrayIsNullOrEmpty(hdr.identify))
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            _identify = new byte[512];
+            Array.Copy(hdr.identify, 0, _identify, 0, hdr.identify.Length);
+            Identify.IdentifyDevice? ataId = CommonTypes.Structs.Devices.ATA.Identify.Decode(_identify);
 
-            byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(hdrB, 0, hdrB.Length);
-
-            Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
-
-            if(!hdr.magic.SequenceEqual(_signature))
-                return ErrorNumber.InvalidArgument;
-
-            _dataOff = hdr.dataOff;
-
-            _imageInfo.MediaType            = MediaType.GENERIC_HDD;
-            _imageInfo.SectorSize           = (uint)(hdr.flags.HasFlag(RsIdeFlags.HalfSectors) ? 256 : 512);
-            _imageInfo.ImageSize            = (ulong)(stream.Length - _dataOff);
-            _imageInfo.Sectors              = _imageInfo.ImageSize / _imageInfo.SectorSize;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.Version              = $"{hdr.revision >> 8}.{hdr.revision & 0x0F}";
-
-            if(!ArrayHelpers.ArrayIsNullOrEmpty(hdr.identify))
+            if(ataId.HasValue)
             {
-                _identify = new byte[512];
-                Array.Copy(hdr.identify, 0, _identify, 0, hdr.identify.Length);
-                Identify.IdentifyDevice? ataId = CommonTypes.Structs.Devices.ATA.Identify.Decode(_identify);
-
-                if(ataId.HasValue)
-                {
-                    _imageInfo.ReadableMediaTags.Add(MediaTagType.ATA_IDENTIFY);
-                    _imageInfo.Cylinders             = ataId.Value.Cylinders;
-                    _imageInfo.Heads                 = ataId.Value.Heads;
-                    _imageInfo.SectorsPerTrack       = ataId.Value.SectorsPerCard;
-                    _imageInfo.DriveFirmwareRevision = ataId.Value.FirmwareRevision;
-                    _imageInfo.DriveModel            = ataId.Value.Model;
-                    _imageInfo.DriveSerialNumber     = ataId.Value.SerialNumber;
-                    _imageInfo.MediaSerialNumber     = ataId.Value.MediaSerial;
-                    _imageInfo.MediaManufacturer     = ataId.Value.MediaManufacturer;
-                }
+                _imageInfo.ReadableMediaTags.Add(MediaTagType.ATA_IDENTIFY);
+                _imageInfo.Cylinders             = ataId.Value.Cylinders;
+                _imageInfo.Heads                 = ataId.Value.Heads;
+                _imageInfo.SectorsPerTrack       = ataId.Value.SectorsPerCard;
+                _imageInfo.DriveFirmwareRevision = ataId.Value.FirmwareRevision;
+                _imageInfo.DriveModel            = ataId.Value.Model;
+                _imageInfo.DriveSerialNumber     = ataId.Value.SerialNumber;
+                _imageInfo.MediaSerialNumber     = ataId.Value.MediaSerial;
+                _imageInfo.MediaManufacturer     = ataId.Value.MediaManufacturer;
             }
-
-            if(_imageInfo.Cylinders       == 0 ||
-               _imageInfo.Heads           == 0 ||
-               _imageInfo.SectorsPerTrack == 0)
-            {
-                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-                _imageInfo.Heads           = 16;
-                _imageInfo.SectorsPerTrack = 63;
-            }
-
-            _rsIdeImageFilter = imageFilter;
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        if(_imageInfo.Cylinders       == 0 ||
+           _imageInfo.Heads           == 0 ||
+           _imageInfo.SectorsPerTrack == 0)
         {
-            buffer = null;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            buffer = new byte[length * _imageInfo.SectorSize];
-
-            Stream stream = _rsIdeImageFilter.GetDataForkStream();
-
-            stream.Seek((long)(_dataOff + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
-
-            stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
-
-            return ErrorNumber.NoError;
+            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+            _imageInfo.Heads           = 16;
+            _imageInfo.SectorsPerTrack = 63;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        _rsIdeImageFilter = imageFilter;
 
-            if(!_imageInfo.ReadableMediaTags.Contains(tag) ||
-               tag != MediaTagType.ATA_IDENTIFY)
-                return ErrorNumber.NotSupported;
+        return ErrorNumber.NoError;
+    }
 
-            buffer = _identify?.Clone() as byte[];
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-            return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
-        }
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        Stream stream = _rsIdeImageFilter.GetDataForkStream();
+
+        stream.Seek((long)(_dataOff + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+
+        stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(!_imageInfo.ReadableMediaTags.Contains(tag) ||
+           tag != MediaTagType.ATA_IDENTIFY)
+            return ErrorNumber.NotSupported;
+
+        buffer = _identify?.Clone() as byte[];
+
+        return buffer is null ? ErrorNumber.NoData : ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/RsIde.cs b/Aaru.Images/RsIde/RsIde.cs
index c267118d3..489770a7e 100644
--- a/Aaru.Images/RsIde/RsIde.cs
+++ b/Aaru.Images/RsIde/RsIde.cs
@@ -36,40 +36,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing RS-IDE disk images</summary>
-    public sealed partial class RsIde : IWritableImage
-    {
-        ushort     _dataOff;
-        byte[]     _identify;
-        ImageInfo  _imageInfo;
-        IFilter    _rsIdeImageFilter;
-        FileStream _writingStream;
+namespace Aaru.DiscImages;
 
-        public RsIde() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing RS-IDE disk images</summary>
+public sealed partial class RsIde : IWritableImage
+{
+    ushort     _dataOff;
+    byte[]     _identify;
+    ImageInfo  _imageInfo;
+    IFilter    _rsIdeImageFilter;
+    FileStream _writingStream;
+
+    public RsIde() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Structs.cs b/Aaru.Images/RsIde/Structs.cs
index 2e3228613..256dfc1a2 100644
--- a/Aaru.Images/RsIde/Structs.cs
+++ b/Aaru.Images/RsIde/Structs.cs
@@ -32,22 +32,21 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RsIde
 {
-    public sealed partial class RsIde
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)]
-            public byte[] magic;
-            public byte       revision;
-            public RsIdeFlags flags;
-            public ushort     dataOff;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public byte[] reserved;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 106)]
-            public byte[] identify;
-        }
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)]
+        public byte[] magic;
+        public byte       revision;
+        public RsIdeFlags flags;
+        public ushort     dataOff;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public byte[] reserved;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 106)]
+        public byte[] identify;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Unsupported.cs b/Aaru.Images/RsIde/Unsupported.cs
index 684e6ecc4..55a8fb7b5 100644
--- a/Aaru.Images/RsIde/Unsupported.cs
+++ b/Aaru.Images/RsIde/Unsupported.cs
@@ -32,40 +32,39 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RsIde
 {
-    public sealed partial class RsIde
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/RsIde/Write.cs b/Aaru.Images/RsIde/Write.cs
index 321c1c05f..f83d4497f 100644
--- a/Aaru.Images/RsIde/Write.cs
+++ b/Aaru.Images/RsIde/Write.cs
@@ -42,351 +42,350 @@ using Aaru.Helpers;
 using Schemas;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class RsIde
 {
-    public sealed partial class RsIde
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 256 &&
+           sectorSize != 512)
         {
-            if(sectorSize != 256 &&
-               sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(sectors > 63 * 16 * 1024)
-            {
-                ErrorMessage = "Too many sectors";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            if(tag != MediaTagType.ATA_IDENTIFY)
-            {
-                ErrorMessage = $"Unsupported media tag {tag}.";
-
-                return false;
-            }
-
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            _identify = new byte[106];
-            Array.Copy(data, 0, _identify, 0, 106);
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
-                                SeekOrigin.Begin);
-
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
-                                SeekOrigin.Begin);
-
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        if(sectors > 63 * 16 * 1024)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            if(_imageInfo.Cylinders == 0)
-            {
-                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-                _imageInfo.Heads           = 16;
-                _imageInfo.SectorsPerTrack = 63;
-
-                while(_imageInfo.Cylinders == 0)
-                {
-                    _imageInfo.Heads--;
-
-                    if(_imageInfo.Heads == 0)
-                    {
-                        _imageInfo.SectorsPerTrack--;
-                        _imageInfo.Heads = 16;
-                    }
-
-                    _imageInfo.Cylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
-
-                    if(_imageInfo.Cylinders       == 0 &&
-                       _imageInfo.Heads           == 0 &&
-                       _imageInfo.SectorsPerTrack == 0)
-                        break;
-                }
-            }
-
-            var header = new Header
-            {
-                magic    = _signature,
-                identify = new byte[106],
-                dataOff  = (ushort)Marshal.SizeOf<Header>(),
-                revision = 1,
-                reserved = new byte[11]
-            };
-
-            if(_imageInfo.SectorSize == 256)
-                header.flags = RsIdeFlags.HalfSectors;
-
-            if(_identify == null)
-            {
-                var ataId = new Identify.IdentifyDevice
-                {
-                    GeneralConfiguration =
-                        CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.UltraFastIDE |
-                        CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.Fixed |
-                        CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.NotMFM | CommonTypes.Structs.
-                            Devices.ATA.Identify.GeneralConfigurationBit.SoftSector,
-                    Cylinders = (ushort)_imageInfo.Cylinders,
-                    Heads = (ushort)_imageInfo.Heads,
-                    SectorsPerTrack = (ushort)_imageInfo.SectorsPerTrack,
-                    VendorWord47 = 0x80,
-                    Capabilities = CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.DMASupport |
-                                   CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.IORDY | CommonTypes.Structs.
-                                       Devices.ATA.Identify.CapabilitiesBit.LBASupport,
-                    ExtendedIdentify = CommonTypes.Structs.Devices.ATA.Identify.ExtendedIdentifyBit.Words54to58Valid,
-                    CurrentCylinders = (ushort)_imageInfo.Cylinders,
-                    CurrentHeads = (ushort)_imageInfo.Heads,
-                    CurrentSectorsPerTrack = (ushort)_imageInfo.SectorsPerTrack,
-                    CurrentSectors = (uint)_imageInfo.Sectors,
-                    LBASectors = (uint)_imageInfo.Sectors,
-                    DMASupported = CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0,
-                    DMAActive = CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0
-                };
-
-                if(string.IsNullOrEmpty(_imageInfo.DriveManufacturer))
-                    _imageInfo.DriveManufacturer = "Aaru";
-
-                if(string.IsNullOrEmpty(_imageInfo.DriveModel))
-                    _imageInfo.DriveModel = "";
-
-                if(string.IsNullOrEmpty(_imageInfo.DriveFirmwareRevision))
-                    Version.GetVersion();
-
-                if(string.IsNullOrEmpty(_imageInfo.DriveSerialNumber))
-                    _imageInfo.DriveSerialNumber = $"{new Random().NextDouble():16X}";
-
-                byte[] ataIdBytes = new byte[Marshal.SizeOf<Identify.IdentifyDevice>()];
-                IntPtr ptr        = System.Runtime.InteropServices.Marshal.AllocHGlobal(512);
-                System.Runtime.InteropServices.Marshal.StructureToPtr(ataId, ptr, true);
-
-                System.Runtime.InteropServices.Marshal.Copy(ptr, ataIdBytes, 0,
-                                                            Marshal.SizeOf<Identify.IdentifyDevice>());
-
-                System.Runtime.InteropServices.Marshal.FreeHGlobal(ptr);
-
-                Array.Copy(ScrambleAtaString(_imageInfo.DriveManufacturer + " " + _imageInfo.DriveModel, 40), 0,
-                           ataIdBytes, 27 * 2, 40);
-
-                Array.Copy(ScrambleAtaString(_imageInfo.DriveFirmwareRevision, 8), 0, ataIdBytes, 23 * 2, 8);
-                Array.Copy(ScrambleAtaString(_imageInfo.DriveSerialNumber, 20), 0, ataIdBytes, 10    * 2, 20);
-                Array.Copy(ataIdBytes, 0, header.identify, 0, 106);
-            }
-            else
-                Array.Copy(_identify, 0, header.identify, 0, 106);
-
-            byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
-            IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(header, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata)
-        {
-            _imageInfo.DriveManufacturer     = metadata.DriveManufacturer;
-            _imageInfo.DriveModel            = metadata.DriveModel;
-            _imageInfo.DriveFirmwareRevision = metadata.DriveFirmwareRevision;
-            _imageInfo.DriveSerialNumber     = metadata.DriveSerialNumber;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
-        {
-            if(cylinders > ushort.MaxValue)
-            {
-                ErrorMessage = "Too many cylinders.";
-
-                return false;
-            }
-
-            if(heads > ushort.MaxValue)
-            {
-                ErrorMessage = "Too many heads.";
-
-                return false;
-            }
-
-            if(sectorsPerTrack > ushort.MaxValue)
-            {
-                ErrorMessage = "Too many sectors per track.";
-
-                return false;
-            }
-
-            _imageInfo.SectorsPerTrack = sectorsPerTrack;
-            _imageInfo.Heads           = heads;
-            _imageInfo.Cylinders       = cylinders;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+        _imageInfo = new ImageInfo
         {
-            ErrorMessage = "Unsupported feature";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+        IsWriting    = true;
+        ErrorMessage = null;
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        if(tag != MediaTagType.ATA_IDENTIFY)
+        {
+            ErrorMessage = $"Unsupported media tag {tag}.";
+
+            return false;
+        }
+
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        _identify = new byte[106];
+        Array.Copy(data, 0, _identify, 0, 106);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
+                            SeekOrigin.Begin);
+
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)((ulong)Marshal.SizeOf<Header>() + (sectorAddress * _imageInfo.SectorSize)),
+                            SeekOrigin.Begin);
+
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        if(_imageInfo.Cylinders == 0)
+        {
+            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+            _imageInfo.Heads           = 16;
+            _imageInfo.SectorsPerTrack = 63;
+
+            while(_imageInfo.Cylinders == 0)
+            {
+                _imageInfo.Heads--;
+
+                if(_imageInfo.Heads == 0)
+                {
+                    _imageInfo.SectorsPerTrack--;
+                    _imageInfo.Heads = 16;
+                }
+
+                _imageInfo.Cylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
+
+                if(_imageInfo.Cylinders       == 0 &&
+                   _imageInfo.Heads           == 0 &&
+                   _imageInfo.SectorsPerTrack == 0)
+                    break;
+            }
+        }
+
+        var header = new Header
+        {
+            magic    = _signature,
+            identify = new byte[106],
+            dataOff  = (ushort)Marshal.SizeOf<Header>(),
+            revision = 1,
+            reserved = new byte[11]
+        };
+
+        if(_imageInfo.SectorSize == 256)
+            header.flags = RsIdeFlags.HalfSectors;
+
+        if(_identify == null)
+        {
+            var ataId = new Identify.IdentifyDevice
+            {
+                GeneralConfiguration =
+                    CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.UltraFastIDE |
+                    CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.Fixed        |
+                    CommonTypes.Structs.Devices.ATA.Identify.GeneralConfigurationBit.NotMFM       | CommonTypes.Structs.
+                        Devices.ATA.Identify.GeneralConfigurationBit.SoftSector,
+                Cylinders = (ushort)_imageInfo.Cylinders,
+                Heads = (ushort)_imageInfo.Heads,
+                SectorsPerTrack = (ushort)_imageInfo.SectorsPerTrack,
+                VendorWord47 = 0x80,
+                Capabilities = CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.DMASupport |
+                               CommonTypes.Structs.Devices.ATA.Identify.CapabilitiesBit.IORDY | CommonTypes.Structs.
+                                   Devices.ATA.Identify.CapabilitiesBit.LBASupport,
+                ExtendedIdentify       = CommonTypes.Structs.Devices.ATA.Identify.ExtendedIdentifyBit.Words54to58Valid,
+                CurrentCylinders       = (ushort)_imageInfo.Cylinders,
+                CurrentHeads           = (ushort)_imageInfo.Heads,
+                CurrentSectorsPerTrack = (ushort)_imageInfo.SectorsPerTrack,
+                CurrentSectors         = (uint)_imageInfo.Sectors,
+                LBASectors             = (uint)_imageInfo.Sectors,
+                DMASupported           = CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0,
+                DMAActive              = CommonTypes.Structs.Devices.ATA.Identify.TransferMode.Mode0
+            };
+
+            if(string.IsNullOrEmpty(_imageInfo.DriveManufacturer))
+                _imageInfo.DriveManufacturer = "Aaru";
+
+            if(string.IsNullOrEmpty(_imageInfo.DriveModel))
+                _imageInfo.DriveModel = "";
+
+            if(string.IsNullOrEmpty(_imageInfo.DriveFirmwareRevision))
+                Version.GetVersion();
+
+            if(string.IsNullOrEmpty(_imageInfo.DriveSerialNumber))
+                _imageInfo.DriveSerialNumber = $"{new Random().NextDouble():16X}";
+
+            byte[] ataIdBytes = new byte[Marshal.SizeOf<Identify.IdentifyDevice>()];
+            IntPtr ptr        = System.Runtime.InteropServices.Marshal.AllocHGlobal(512);
+            System.Runtime.InteropServices.Marshal.StructureToPtr(ataId, ptr, true);
+
+            System.Runtime.InteropServices.Marshal.Copy(ptr, ataIdBytes, 0,
+                                                        Marshal.SizeOf<Identify.IdentifyDevice>());
+
+            System.Runtime.InteropServices.Marshal.FreeHGlobal(ptr);
+
+            Array.Copy(ScrambleAtaString(_imageInfo.DriveManufacturer + " " + _imageInfo.DriveModel, 40), 0,
+                       ataIdBytes, 27 * 2, 40);
+
+            Array.Copy(ScrambleAtaString(_imageInfo.DriveFirmwareRevision, 8), 0, ataIdBytes, 23 * 2, 8);
+            Array.Copy(ScrambleAtaString(_imageInfo.DriveSerialNumber, 20), 0, ataIdBytes, 10    * 2, 20);
+            Array.Copy(ataIdBytes, 0, header.identify, 0, 106);
+        }
+        else
+            Array.Copy(_identify, 0, header.identify, 0, 106);
+
+        byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
+        IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(header, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata)
+    {
+        _imageInfo.DriveManufacturer     = metadata.DriveManufacturer;
+        _imageInfo.DriveModel            = metadata.DriveModel;
+        _imageInfo.DriveFirmwareRevision = metadata.DriveFirmwareRevision;
+        _imageInfo.DriveSerialNumber     = metadata.DriveSerialNumber;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        if(cylinders > ushort.MaxValue)
+        {
+            ErrorMessage = "Too many cylinders.";
+
+            return false;
+        }
+
+        if(heads > ushort.MaxValue)
+        {
+            ErrorMessage = "Too many heads.";
+
+            return false;
+        }
+
+        if(sectorsPerTrack > ushort.MaxValue)
+        {
+            ErrorMessage = "Too many sectors per track.";
+
+            return false;
+        }
+
+        _imageInfo.SectorsPerTrack = sectorsPerTrack;
+        _imageInfo.Heads           = heads;
+        _imageInfo.Cylinders       = cylinders;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/SaveDskF/Constants.cs b/Aaru.Images/SaveDskF/Constants.cs
index f84a451f5..b8eb8e12d 100644
--- a/Aaru.Images/SaveDskF/Constants.cs
+++ b/Aaru.Images/SaveDskF/Constants.cs
@@ -30,12 +30,11 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SaveDskF
 {
-    public sealed partial class SaveDskF
-    {
-        const ushort SDF_MAGIC_OLD        = 0x58AA;
-        const ushort SDF_MAGIC            = 0x59AA;
-        const ushort SDF_MAGIC_COMPRESSED = 0x5AAA;
-    }
+    const ushort SDF_MAGIC_OLD        = 0x58AA;
+    const ushort SDF_MAGIC            = 0x59AA;
+    const ushort SDF_MAGIC_COMPRESSED = 0x5AAA;
 }
\ No newline at end of file
diff --git a/Aaru.Images/SaveDskF/Identify.cs b/Aaru.Images/SaveDskF/Identify.cs
index c4fc841d7..a049b9700 100644
--- a/Aaru.Images/SaveDskF/Identify.cs
+++ b/Aaru.Images/SaveDskF/Identify.cs
@@ -34,27 +34,26 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SaveDskF
 {
-    public sealed partial class SaveDskF
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 41)
-                return false;
+        if(stream.Length < 41)
+            return false;
 
-            byte[] hdr = new byte[40];
-            stream.Read(hdr, 0, 40);
+        byte[] hdr = new byte[40];
+        stream.Read(hdr, 0, 40);
 
-            _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
+        _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
 
-            return (_header.magic == SDF_MAGIC || _header.magic == SDF_MAGIC_COMPRESSED ||
-                    _header.magic == SDF_MAGIC_OLD) && _header.fatCopies <= 2 && _header.padding == 0 &&
-                   _header.commentOffset < stream.Length && _header.dataOffset < stream.Length;
-        }
+        return (_header.magic == SDF_MAGIC || _header.magic == SDF_MAGIC_COMPRESSED ||
+                _header.magic == SDF_MAGIC_OLD) && _header.fatCopies <= 2 && _header.padding == 0 &&
+               _header.commentOffset < stream.Length && _header.dataOffset < stream.Length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SaveDskF/Properties.cs b/Aaru.Images/SaveDskF/Properties.cs
index eaf5ef484..cb7ebc513 100644
--- a/Aaru.Images/SaveDskF/Properties.cs
+++ b/Aaru.Images/SaveDskF/Properties.cs
@@ -37,56 +37,55 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SaveDskF
 {
-    public sealed partial class SaveDskF
+    /// <inheritdoc />
+    public string Name => "IBM SaveDskF";
+    /// <inheritdoc />
+    public Guid Id => new Guid("288CE058-1A51-4034-8C45-5A256CAE1461");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "IBM SaveDskF";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+
+    // TODO: Test with real hardware to see real supported media
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public string Name => "IBM SaveDskF";
-        /// <inheritdoc />
-        public Guid Id => new Guid("288CE058-1A51-4034-8C45-5A256CAE1461");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "IBM SaveDskF";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
+        MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
+        MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
+        MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
+        MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
+        MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
+        MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525, MediaType.MetaFloppy_Mod_I, MediaType.MetaFloppy_Mod_II
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".dsk"
+    };
 
-        // TODO: Test with real hardware to see real supported media
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.ACORN_35_DS_DD, MediaType.ACORN_35_DS_HD, MediaType.Apricot_35, MediaType.ATARI_35_DS_DD,
-            MediaType.ATARI_35_DS_DD_11, MediaType.ATARI_35_SS_DD, MediaType.ATARI_35_SS_DD_11, MediaType.DMF,
-            MediaType.DMF_82, MediaType.DOS_35_DS_DD_8, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_ED,
-            MediaType.DOS_35_HD, MediaType.DOS_35_SS_DD_8, MediaType.DOS_35_SS_DD_9, MediaType.DOS_525_DS_DD_8,
-            MediaType.DOS_525_DS_DD_9, MediaType.DOS_525_HD, MediaType.DOS_525_SS_DD_8, MediaType.DOS_525_SS_DD_9,
-            MediaType.FDFORMAT_35_DD, MediaType.FDFORMAT_35_HD, MediaType.FDFORMAT_525_DD, MediaType.FDFORMAT_525_HD,
-            MediaType.RX50, MediaType.XDF_35, MediaType.XDF_525, MediaType.MetaFloppy_Mod_I, MediaType.MetaFloppy_Mod_II
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".dsk"
-        };
-
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SaveDskF/Read.cs b/Aaru.Images/SaveDskF/Read.cs
index 7c61381a7..f2fdf6d6e 100644
--- a/Aaru.Images/SaveDskF/Read.cs
+++ b/Aaru.Images/SaveDskF/Read.cs
@@ -39,128 +39,127 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SaveDskF
 {
-    public sealed partial class SaveDskF
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        byte[] hdr = new byte[40];
+
+        stream.Read(hdr, 0, 40);
+        _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
+
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.magic = 0x{0:X4}", _header.magic);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.mediaType = 0x{0:X2}", _header.mediaType);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorSize = {0}", _header.sectorSize);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clusterMask = {0}", _header.clusterMask);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clusterShift = {0}", _header.clusterShift);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.reservedSectors = {0}", _header.reservedSectors);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.fatCopies = {0}", _header.fatCopies);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.rootEntries = {0}", _header.rootEntries);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.firstCluster = {0}", _header.firstCluster);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clustersCopied = {0}", _header.clustersCopied);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsPerFat = {0}", _header.sectorsPerFat);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.checksum = 0x{0:X8}", _header.checksum);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.cylinders = {0}", _header.cylinders);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.heads = {0}", _header.heads);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsPerTrack = {0}", _header.sectorsPerTrack);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.padding = {0}", _header.padding);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsCopied = {0}", _header.sectorsCopied);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.commentOffset = {0}", _header.commentOffset);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "header.dataOffset = {0}", _header.dataOffset);
+
+        if(_header.dataOffset == 0 &&
+           _header.magic      == SDF_MAGIC_OLD)
+            _header.dataOffset = 512;
+
+        byte[] cmt = new byte[_header.dataOffset - _header.commentOffset];
+        stream.Seek(_header.commentOffset, SeekOrigin.Begin);
+        stream.Read(cmt, 0, cmt.Length);
+
+        if(cmt.Length > 1)
+            _imageInfo.Comments = StringHandlers.CToString(cmt, Encoding.GetEncoding("ibm437"));
+
+        _calculatedChk = 0;
+        stream.Seek(0, SeekOrigin.Begin);
+
+        int b;
+
+        do
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            b = stream.ReadByte();
 
-            byte[] hdr = new byte[40];
+            if(b >= 0)
+                _calculatedChk += (uint)b;
+        } while(b >= 0);
 
-            stream.Read(hdr, 0, 40);
-            _header = Marshal.ByteArrayToStructureLittleEndian<Header>(hdr);
+        AaruConsole.DebugWriteLine("SaveDskF plugin", "Calculated checksum = 0x{0:X8}, {1}", _calculatedChk,
+                                   _calculatedChk == _header.checksum);
 
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.magic = 0x{0:X4}", _header.magic);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.mediaType = 0x{0:X2}", _header.mediaType);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorSize = {0}", _header.sectorSize);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clusterMask = {0}", _header.clusterMask);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clusterShift = {0}", _header.clusterShift);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.reservedSectors = {0}", _header.reservedSectors);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.fatCopies = {0}", _header.fatCopies);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.rootEntries = {0}", _header.rootEntries);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.firstCluster = {0}", _header.firstCluster);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.clustersCopied = {0}", _header.clustersCopied);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsPerFat = {0}", _header.sectorsPerFat);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.checksum = 0x{0:X8}", _header.checksum);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.cylinders = {0}", _header.cylinders);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.heads = {0}", _header.heads);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsPerTrack = {0}", _header.sectorsPerTrack);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.padding = {0}", _header.padding);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.sectorsCopied = {0}", _header.sectorsCopied);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.commentOffset = {0}", _header.commentOffset);
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "header.dataOffset = {0}", _header.dataOffset);
+        _imageInfo.Application          = "SaveDskF";
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = imageFilter.Filename;
+        _imageInfo.ImageSize            = (ulong)(stream.Length - _header.dataOffset);
+        _imageInfo.Sectors              = (ulong)(_header.sectorsPerTrack * _header.heads * _header.cylinders);
+        _imageInfo.SectorSize           = _header.sectorSize;
 
-            if(_header.dataOffset == 0 &&
-               _header.magic      == SDF_MAGIC_OLD)
-                _header.dataOffset = 512;
+        _imageInfo.MediaType = Geometry.GetMediaType((_header.cylinders, (byte)_header.heads,
+                                                      _header.sectorsPerTrack, _header.sectorSize,
+                                                      MediaEncoding.MFM, false));
 
-            byte[] cmt = new byte[_header.dataOffset - _header.commentOffset];
-            stream.Seek(_header.commentOffset, SeekOrigin.Begin);
-            stream.Read(cmt, 0, cmt.Length);
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
 
-            if(cmt.Length > 1)
-                _imageInfo.Comments = StringHandlers.CToString(cmt, Encoding.GetEncoding("ibm437"));
+        AaruConsole.VerboseWriteLine("SaveDskF image contains a disk of type {0}", _imageInfo.MediaType);
 
-            _calculatedChk = 0;
-            stream.Seek(0, SeekOrigin.Begin);
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+            AaruConsole.VerboseWriteLine("SaveDskF comments: {0}", _imageInfo.Comments);
 
-            int b;
+        // TODO: Support compressed images
+        if(_header.magic == SDF_MAGIC_COMPRESSED)
+        {
+            AaruConsole.ErrorWriteLine("Compressed SaveDskF images are not supported.");
 
-            do
-            {
-                b = stream.ReadByte();
-
-                if(b >= 0)
-                    _calculatedChk += (uint)b;
-            } while(b >= 0);
-
-            AaruConsole.DebugWriteLine("SaveDskF plugin", "Calculated checksum = 0x{0:X8}, {1}", _calculatedChk,
-                                       _calculatedChk == _header.checksum);
-
-            _imageInfo.Application          = "SaveDskF";
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = imageFilter.Filename;
-            _imageInfo.ImageSize            = (ulong)(stream.Length - _header.dataOffset);
-            _imageInfo.Sectors              = (ulong)(_header.sectorsPerTrack * _header.heads * _header.cylinders);
-            _imageInfo.SectorSize           = _header.sectorSize;
-
-            _imageInfo.MediaType = Geometry.GetMediaType((_header.cylinders, (byte)_header.heads,
-                                                          _header.sectorsPerTrack, _header.sectorSize,
-                                                          MediaEncoding.MFM, false));
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-            AaruConsole.VerboseWriteLine("SaveDskF image contains a disk of type {0}", _imageInfo.MediaType);
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                AaruConsole.VerboseWriteLine("SaveDskF comments: {0}", _imageInfo.Comments);
-
-            // TODO: Support compressed images
-            if(_header.magic == SDF_MAGIC_COMPRESSED)
-            {
-                AaruConsole.ErrorWriteLine("Compressed SaveDskF images are not supported.");
-
-                return ErrorNumber.NotSupported;
-            }
-
-            // SaveDskF only omits ending clusters, leaving no gaps behind, so reading all data we have...
-            stream.Seek(_header.dataOffset, SeekOrigin.Begin);
-            _decodedDisk = new byte[_imageInfo.Sectors * _imageInfo.SectorSize];
-            stream.Read(_decodedDisk, 0, (int)(stream.Length - _header.dataOffset));
-
-            _imageInfo.Cylinders       = _header.cylinders;
-            _imageInfo.Heads           = _header.heads;
-            _imageInfo.SectorsPerTrack = _header.sectorsPerTrack;
-
-            return ErrorNumber.NoError;
+            return ErrorNumber.NotSupported;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        // SaveDskF only omits ending clusters, leaving no gaps behind, so reading all data we have...
+        stream.Seek(_header.dataOffset, SeekOrigin.Begin);
+        _decodedDisk = new byte[_imageInfo.Sectors * _imageInfo.SectorSize];
+        stream.Read(_decodedDisk, 0, (int)(stream.Length - _header.dataOffset));
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+        _imageInfo.Cylinders       = _header.cylinders;
+        _imageInfo.Heads           = _header.heads;
+        _imageInfo.SectorsPerTrack = _header.sectorsPerTrack;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+        return ErrorNumber.NoError;
+    }
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-            buffer = new byte[length * _imageInfo.SectorSize];
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            Array.Copy(_decodedDisk, (int)sectorAddress * _imageInfo.SectorSize, buffer, 0,
-                       length                           * _imageInfo.SectorSize);
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
 
-            return ErrorNumber.NoError;
-        }
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        Array.Copy(_decodedDisk, (int)sectorAddress * _imageInfo.SectorSize, buffer, 0,
+                   length                           * _imageInfo.SectorSize);
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SaveDskF/SaveDskF.cs b/Aaru.Images/SaveDskF/SaveDskF.cs
index 8b02f5a26..ef4e4cf69 100644
--- a/Aaru.Images/SaveDskF/SaveDskF.cs
+++ b/Aaru.Images/SaveDskF/SaveDskF.cs
@@ -36,39 +36,38 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <summary>Implements reading and writing IBM's SaveDskF disk images</summary>
-    public sealed partial class SaveDskF : IWritableImage, IVerifiableImage
-    {
-        uint       _calculatedChk;
-        byte[]     _decodedDisk;
-        Header     _header;
-        ImageInfo  _imageInfo;
-        FileStream _writingStream;
+namespace Aaru.DiscImages;
 
-        public SaveDskF() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <summary>Implements reading and writing IBM's SaveDskF disk images</summary>
+public sealed partial class SaveDskF : IWritableImage, IVerifiableImage
+{
+    uint       _calculatedChk;
+    byte[]     _decodedDisk;
+    Header     _header;
+    ImageInfo  _imageInfo;
+    FileStream _writingStream;
+
+    public SaveDskF() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/SaveDskF/Structs.cs b/Aaru.Images/SaveDskF/Structs.cs
index b3d529098..782a9de87 100644
--- a/Aaru.Images/SaveDskF/Structs.cs
+++ b/Aaru.Images/SaveDskF/Structs.cs
@@ -32,53 +32,52 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SaveDskF
 {
-    public sealed partial class SaveDskF
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            /// <summary>0x00 magic number</summary>
-            public ushort magic;
-            /// <summary>0x02 media type from FAT</summary>
-            public readonly ushort mediaType;
-            /// <summary>0x04 bytes per sector</summary>
-            public ushort sectorSize;
-            /// <summary>0x06 sectors per cluster - 1</summary>
-            public readonly byte clusterMask;
-            /// <summary>0x07 log2(cluster / sector)</summary>
-            public readonly byte clusterShift;
-            /// <summary>0x08 reserved sectors</summary>
-            public readonly ushort reservedSectors;
-            /// <summary>0x0A copies of FAT</summary>
-            public readonly byte fatCopies;
-            /// <summary>0x0B entries in root directory</summary>
-            public readonly ushort rootEntries;
-            /// <summary>0x0D first cluster</summary>
-            public readonly ushort firstCluster;
-            /// <summary>0x0F clusters present in image</summary>
-            public readonly ushort clustersCopied;
-            /// <summary>0x11 sectors per FAT</summary>
-            public readonly byte sectorsPerFat;
-            /// <summary>0x12 sector number of root directory</summary>
-            public readonly ushort rootDirectorySector;
-            /// <summary>0x14 sum of all image bytes</summary>
-            public uint checksum;
-            /// <summary>0x18 cylinders</summary>
-            public ushort cylinders;
-            /// <summary>0x1A heads</summary>
-            public ushort heads;
-            /// <summary>0x1C sectors per track</summary>
-            public ushort sectorsPerTrack;
-            /// <summary>0x1E always zero</summary>
-            public readonly uint padding;
-            /// <summary>0x22 sectors present in image</summary>
-            public ushort sectorsCopied;
-            /// <summary>0x24 offset to comment</summary>
-            public ushort commentOffset;
-            /// <summary>0x26 offset to data</summary>
-            public ushort dataOffset;
-        }
+        /// <summary>0x00 magic number</summary>
+        public ushort magic;
+        /// <summary>0x02 media type from FAT</summary>
+        public readonly ushort mediaType;
+        /// <summary>0x04 bytes per sector</summary>
+        public ushort sectorSize;
+        /// <summary>0x06 sectors per cluster - 1</summary>
+        public readonly byte clusterMask;
+        /// <summary>0x07 log2(cluster / sector)</summary>
+        public readonly byte clusterShift;
+        /// <summary>0x08 reserved sectors</summary>
+        public readonly ushort reservedSectors;
+        /// <summary>0x0A copies of FAT</summary>
+        public readonly byte fatCopies;
+        /// <summary>0x0B entries in root directory</summary>
+        public readonly ushort rootEntries;
+        /// <summary>0x0D first cluster</summary>
+        public readonly ushort firstCluster;
+        /// <summary>0x0F clusters present in image</summary>
+        public readonly ushort clustersCopied;
+        /// <summary>0x11 sectors per FAT</summary>
+        public readonly byte sectorsPerFat;
+        /// <summary>0x12 sector number of root directory</summary>
+        public readonly ushort rootDirectorySector;
+        /// <summary>0x14 sum of all image bytes</summary>
+        public uint checksum;
+        /// <summary>0x18 cylinders</summary>
+        public ushort cylinders;
+        /// <summary>0x1A heads</summary>
+        public ushort heads;
+        /// <summary>0x1C sectors per track</summary>
+        public ushort sectorsPerTrack;
+        /// <summary>0x1E always zero</summary>
+        public readonly uint padding;
+        /// <summary>0x22 sectors present in image</summary>
+        public ushort sectorsCopied;
+        /// <summary>0x24 offset to comment</summary>
+        public ushort commentOffset;
+        /// <summary>0x26 offset to data</summary>
+        public ushort dataOffset;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SaveDskF/Unsupported.cs b/Aaru.Images/SaveDskF/Unsupported.cs
index c3e03c12d..ff13756d8 100644
--- a/Aaru.Images/SaveDskF/Unsupported.cs
+++ b/Aaru.Images/SaveDskF/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SaveDskF
 {
-    public sealed partial class SaveDskF
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SaveDskF/Verify.cs b/Aaru.Images/SaveDskF/Verify.cs
index cc8dfe724..86031af50 100644
--- a/Aaru.Images/SaveDskF/Verify.cs
+++ b/Aaru.Images/SaveDskF/Verify.cs
@@ -30,11 +30,10 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SaveDskF
 {
-    public sealed partial class SaveDskF
-    {
-        /// <inheritdoc />
-        public bool? VerifyMediaImage() => _calculatedChk == _header.checksum;
-    }
+    /// <inheritdoc />
+    public bool? VerifyMediaImage() => _calculatedChk == _header.checksum;
 }
\ No newline at end of file
diff --git a/Aaru.Images/SaveDskF/Write.cs b/Aaru.Images/SaveDskF/Write.cs
index 43c1a4ec6..b90ec5a6d 100644
--- a/Aaru.Images/SaveDskF/Write.cs
+++ b/Aaru.Images/SaveDskF/Write.cs
@@ -41,253 +41,252 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SaveDskF
 {
-    public sealed partial class SaveDskF
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
     {
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+        ErrorMessage = "Writing media tags is not supported.";
 
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(512 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(512 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            if(!string.IsNullOrWhiteSpace(_imageInfo.Comments))
-            {
-                byte[] commentsBytes = Encoding.GetEncoding("ibm437").GetBytes(_imageInfo.Comments);
-                _header.commentOffset = (ushort)Marshal.SizeOf<Header>();
-                _writingStream.Seek(_header.commentOffset, SeekOrigin.Begin);
-
-                _writingStream.Write(commentsBytes, 0,
-                                     commentsBytes.Length >= 512 - _header.commentOffset ? 512 - _header.commentOffset
-                                         : commentsBytes.Length);
-            }
-
-            byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
-            IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(_header, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _header.checksum = 0;
-            _writingStream.Seek(0, SeekOrigin.Begin);
-
-            int b;
-
-            do
-            {
-                b = _writingStream.ReadByte();
-
-                if(b >= 0)
-                    _header.checksum += (uint)b;
-            } while(b >= 0);
-
-            hdr    = new byte[Marshal.SizeOf<Header>()];
-            hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(_header, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata)
-        {
-            _imageInfo.Comments = metadata.Comments;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
-        {
-            if(sectorSize == 0)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(sectors > ushort.MaxValue)
-            {
-                ErrorMessage = "Too many sectors";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
-                variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
-
-            _header = new Header
-            {
-                cylinders       = geometry.cylinders,
-                dataOffset      = 512,
-                heads           = geometry.heads,
-                magic           = SDF_MAGIC,
-                sectorsCopied   = (ushort)sectors,
-                sectorsPerTrack = geometry.sectorsPerTrack,
-                sectorSize      = (ushort)sectorSize
-            };
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return false;
     }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(512 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(512 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        if(!string.IsNullOrWhiteSpace(_imageInfo.Comments))
+        {
+            byte[] commentsBytes = Encoding.GetEncoding("ibm437").GetBytes(_imageInfo.Comments);
+            _header.commentOffset = (ushort)Marshal.SizeOf<Header>();
+            _writingStream.Seek(_header.commentOffset, SeekOrigin.Begin);
+
+            _writingStream.Write(commentsBytes, 0,
+                                 commentsBytes.Length >= 512 - _header.commentOffset ? 512 - _header.commentOffset
+                                     : commentsBytes.Length);
+        }
+
+        byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
+        IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(_header, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _header.checksum = 0;
+        _writingStream.Seek(0, SeekOrigin.Begin);
+
+        int b;
+
+        do
+        {
+            b = _writingStream.ReadByte();
+
+            if(b >= 0)
+                _header.checksum += (uint)b;
+        } while(b >= 0);
+
+        hdr    = new byte[Marshal.SizeOf<Header>()];
+        hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(_header, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata)
+    {
+        _imageInfo.Comments = metadata.Comments;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
+    {
+        if(sectorSize == 0)
+        {
+            ErrorMessage = "Unsupported sector size";
+
+            return false;
+        }
+
+        if(sectors > ushort.MaxValue)
+        {
+            ErrorMessage = "Too many sectors";
+
+            return false;
+        }
+
+        if(!SupportedMediaTypes.Contains(mediaType))
+        {
+            ErrorMessage = $"Unsupported media format {mediaType}";
+
+            return false;
+        }
+
+        _imageInfo = new ImageInfo
+        {
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
+            return false;
+        }
+
+        (ushort cylinders, byte heads, ushort sectorsPerTrack, uint bytesPerSector, MediaEncoding encoding, bool
+            variableSectorsPerTrack, MediaType type) geometry = Geometry.GetGeometry(mediaType);
+
+        _header = new Header
+        {
+            cylinders       = geometry.cylinders,
+            dataOffset      = 512,
+            heads           = geometry.heads,
+            magic           = SDF_MAGIC,
+            sectorsCopied   = (ushort)sectors,
+            sectorsPerTrack = geometry.sectorsPerTrack,
+            sectorSize      = (ushort)sectorSize
+        };
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/Constants.cs b/Aaru.Images/SuperCardPro/Constants.cs
index e4ad3c493..a7b1fe933 100644
--- a/Aaru.Images/SuperCardPro/Constants.cs
+++ b/Aaru.Images/SuperCardPro/Constants.cs
@@ -30,21 +30,20 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SuperCardPro
 {
-    public sealed partial class SuperCardPro
+    /// <summary>SuperCardPro footer signature: "FPCS"</summary>
+    const uint FOOTER_SIGNATURE = 0x53435046;
+    /// <summary>SuperCardPro header signature: "SCP"</summary>
+    readonly byte[] _scpSignature =
     {
-        /// <summary>SuperCardPro footer signature: "FPCS"</summary>
-        const uint FOOTER_SIGNATURE = 0x53435046;
-        /// <summary>SuperCardPro header signature: "SCP"</summary>
-        readonly byte[] _scpSignature =
-        {
-            0x53, 0x43, 0x50
-        };
-        /// <summary>SuperCardPro track header signature: "TRK"</summary>
-        readonly byte[] _trkSignature =
-        {
-            0x54, 0x52, 0x4B
-        };
-    }
+        0x53, 0x43, 0x50
+    };
+    /// <summary>SuperCardPro track header signature: "TRK"</summary>
+    readonly byte[] _trkSignature =
+    {
+        0x54, 0x52, 0x4B
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/Enums.cs b/Aaru.Images/SuperCardPro/Enums.cs
index 94a845585..b324d0c5a 100644
--- a/Aaru.Images/SuperCardPro/Enums.cs
+++ b/Aaru.Images/SuperCardPro/Enums.cs
@@ -32,37 +32,36 @@
 
 using System;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class SuperCardPro
-    {
-        public enum ScpDiskType : byte
-        {
-            Commodore64 = 0x00, CommodoreAmiga = 0x04, AtariFMSS  = 0x10,
-            AtariFMDS   = 0x11, AtariFSEx      = 0x12, AtariSTSS  = 0x14,
-            AtariSTDS   = 0x15, AppleII        = 0x20, AppleIIPro = 0x21,
-            Apple400K   = 0x24, Apple800K      = 0x25, Apple144   = 0x26,
-            PC360K      = 0x30, PC720K         = 0x31, PC12M      = 0x32,
-            PC144M      = 0x33, TandySSSD      = 0x40, TandySSDD  = 0x41,
-            TandyDSSD   = 0x42, TandyDSDD      = 0x43, Ti994A     = 0x50,
-            RolandD20   = 0x60
-        }
+namespace Aaru.DiscImages;
 
-        [Flags]
-        public enum ScpFlags : byte
-        {
-            /// <summary>If set flux starts at index pulse</summary>
-            Index = 0x00,
-            /// <summary>If set drive is 96tpi</summary>
-            Tpi = 0x02,
-            /// <summary>If set drive is 360rpm</summary>
-            Rpm = 0x04,
-            /// <summary>If set image contains normalized data</summary>
-            Normalized = 0x08,
-            /// <summary>If set image is read/write capable</summary>
-            Writable = 0x10,
-            /// <summary>If set, image has footer</summary>
-            HasFooter = 0x20
-        }
+public sealed partial class SuperCardPro
+{
+    public enum ScpDiskType : byte
+    {
+        Commodore64 = 0x00, CommodoreAmiga = 0x04, AtariFMSS  = 0x10,
+        AtariFMDS   = 0x11, AtariFSEx      = 0x12, AtariSTSS  = 0x14,
+        AtariSTDS   = 0x15, AppleII        = 0x20, AppleIIPro = 0x21,
+        Apple400K   = 0x24, Apple800K      = 0x25, Apple144   = 0x26,
+        PC360K      = 0x30, PC720K         = 0x31, PC12M      = 0x32,
+        PC144M      = 0x33, TandySSSD      = 0x40, TandySSDD  = 0x41,
+        TandyDSSD   = 0x42, TandyDSDD      = 0x43, Ti994A     = 0x50,
+        RolandD20   = 0x60
+    }
+
+    [Flags]
+    public enum ScpFlags : byte
+    {
+        /// <summary>If set flux starts at index pulse</summary>
+        Index = 0x00,
+        /// <summary>If set drive is 96tpi</summary>
+        Tpi = 0x02,
+        /// <summary>If set drive is 360rpm</summary>
+        Rpm = 0x04,
+        /// <summary>If set image contains normalized data</summary>
+        Normalized = 0x08,
+        /// <summary>If set image is read/write capable</summary>
+        Writable = 0x10,
+        /// <summary>If set, image has footer</summary>
+        HasFooter = 0x20
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/Helpers.cs b/Aaru.Images/SuperCardPro/Helpers.cs
index 43273f7e6..1e210a6f7 100644
--- a/Aaru.Images/SuperCardPro/Helpers.cs
+++ b/Aaru.Images/SuperCardPro/Helpers.cs
@@ -34,28 +34,27 @@ using System;
 using System.IO;
 using System.Text;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SuperCardPro
 {
-    public sealed partial class SuperCardPro
+    static string ReadPStringUtf8(Stream stream, uint position)
     {
-        static string ReadPStringUtf8(Stream stream, uint position)
-        {
-            if(position == 0)
-                return null;
+        if(position == 0)
+            return null;
 
-            stream.Position = position;
-            byte[] lenB = new byte[2];
-            stream.Read(lenB, 0, 2);
-            ushort len = BitConverter.ToUInt16(lenB, 0);
+        stream.Position = position;
+        byte[] lenB = new byte[2];
+        stream.Read(lenB, 0, 2);
+        ushort len = BitConverter.ToUInt16(lenB, 0);
 
-            if(len                   == 0 ||
-               len + stream.Position >= stream.Length)
-                return null;
+        if(len                   == 0 ||
+           len + stream.Position >= stream.Length)
+            return null;
 
-            byte[] str = new byte[len];
-            stream.Read(str, 0, len);
+        byte[] str = new byte[len];
+        stream.Read(str, 0, len);
 
-            return Encoding.UTF8.GetString(str);
-        }
+        return Encoding.UTF8.GetString(str);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/Identify.cs b/Aaru.Images/SuperCardPro/Identify.cs
index 5b78c2118..9d0d41f44 100644
--- a/Aaru.Images/SuperCardPro/Identify.cs
+++ b/Aaru.Images/SuperCardPro/Identify.cs
@@ -35,26 +35,25 @@ using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SuperCardPro
 {
-    public sealed partial class SuperCardPro
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Header = new ScpHeader();
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Header = new ScpHeader();
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < Marshal.SizeOf<ScpHeader>())
-                return false;
+        if(stream.Length < Marshal.SizeOf<ScpHeader>())
+            return false;
 
-            byte[] hdr = new byte[Marshal.SizeOf<ScpHeader>()];
-            stream.Read(hdr, 0, Marshal.SizeOf<ScpHeader>());
+        byte[] hdr = new byte[Marshal.SizeOf<ScpHeader>()];
+        stream.Read(hdr, 0, Marshal.SizeOf<ScpHeader>());
 
-            Header = Marshal.ByteArrayToStructureLittleEndian<ScpHeader>(hdr);
+        Header = Marshal.ByteArrayToStructureLittleEndian<ScpHeader>(hdr);
 
-            return _scpSignature.SequenceEqual(Header.signature);
-        }
+        return _scpSignature.SequenceEqual(Header.signature);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/Properties.cs b/Aaru.Images/SuperCardPro/Properties.cs
index 99df51cdd..942efbf76 100644
--- a/Aaru.Images/SuperCardPro/Properties.cs
+++ b/Aaru.Images/SuperCardPro/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SuperCardPro
 {
-    public sealed partial class SuperCardPro
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "SuperCardPro";
-        /// <inheritdoc />
-        public Guid Id => new Guid("C5D3182E-1D45-4767-A205-E6E5C83444DC");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "SuperCardPro";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "SuperCardPro";
+    /// <inheritdoc />
+    public Guid Id => new Guid("C5D3182E-1D45-4767-A205-E6E5C83444DC");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "SuperCardPro";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/Read.cs b/Aaru.Images/SuperCardPro/Read.cs
index 491ec1df2..96a1208b6 100644
--- a/Aaru.Images/SuperCardPro/Read.cs
+++ b/Aaru.Images/SuperCardPro/Read.cs
@@ -39,265 +39,264 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SuperCardPro
 {
-    public sealed partial class SuperCardPro
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Header     = new ScpHeader();
+        _scpStream = imageFilter.GetDataForkStream();
+        _scpStream.Seek(0, SeekOrigin.Begin);
+
+        if(_scpStream.Length < Marshal.SizeOf<ScpHeader>())
+            return ErrorNumber.InvalidArgument;
+
+        byte[] hdr = new byte[Marshal.SizeOf<ScpHeader>()];
+        _scpStream.Read(hdr, 0, Marshal.SizeOf<ScpHeader>());
+
+        Header = Marshal.ByteArrayToStructureLittleEndian<ScpHeader>(hdr);
+
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.signature = \"{0}\"",
+                                   StringHandlers.CToString(Header.signature));
+
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.version = {0}.{1}", (Header.version & 0xF0) >> 4,
+                                   Header.version & 0xF);
+
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.type = {0}", Header.type);
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.revolutions = {0}", Header.revolutions);
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.start = {0}", Header.start);
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.end = {0}", Header.end);
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.flags = {0}", Header.flags);
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.bitCellEncoding = {0}", Header.bitCellEncoding);
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.heads = {0}", Header.heads);
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.reserved = {0}", Header.reserved);
+        AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.checksum = 0x{0:X8}", Header.checksum);
+
+        if(!_scpSignature.SequenceEqual(Header.signature))
+            return ErrorNumber.InvalidArgument;
+
+        ScpTracks = new Dictionary<byte, TrackHeader>();
+
+        for(byte t = Header.start; t <= Header.end; t++)
         {
-            Header     = new ScpHeader();
-            _scpStream = imageFilter.GetDataForkStream();
-            _scpStream.Seek(0, SeekOrigin.Begin);
+            if(t >= Header.offsets.Length)
+                break;
 
-            if(_scpStream.Length < Marshal.SizeOf<ScpHeader>())
-                return ErrorNumber.InvalidArgument;
+            _scpStream.Position = Header.offsets[t];
 
-            byte[] hdr = new byte[Marshal.SizeOf<ScpHeader>()];
-            _scpStream.Read(hdr, 0, Marshal.SizeOf<ScpHeader>());
-
-            Header = Marshal.ByteArrayToStructureLittleEndian<ScpHeader>(hdr);
-
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.signature = \"{0}\"",
-                                       StringHandlers.CToString(Header.signature));
-
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.version = {0}.{1}", (Header.version & 0xF0) >> 4,
-                                       Header.version & 0xF);
-
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.type = {0}", Header.type);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.revolutions = {0}", Header.revolutions);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.start = {0}", Header.start);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.end = {0}", Header.end);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.flags = {0}", Header.flags);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.bitCellEncoding = {0}", Header.bitCellEncoding);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.heads = {0}", Header.heads);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.reserved = {0}", Header.reserved);
-            AaruConsole.DebugWriteLine("SuperCardPro plugin", "header.checksum = 0x{0:X8}", Header.checksum);
-
-            if(!_scpSignature.SequenceEqual(Header.signature))
-                return ErrorNumber.InvalidArgument;
-
-            ScpTracks = new Dictionary<byte, TrackHeader>();
-
-            for(byte t = Header.start; t <= Header.end; t++)
+            var trk = new TrackHeader
             {
-                if(t >= Header.offsets.Length)
+                Signature = new byte[3],
+                Entries   = new TrackEntry[Header.revolutions]
+            };
+
+            _scpStream.Read(trk.Signature, 0, trk.Signature.Length);
+            trk.TrackNumber = (byte)_scpStream.ReadByte();
+
+            if(!trk.Signature.SequenceEqual(_trkSignature))
+            {
+                AaruConsole.DebugWriteLine("SuperCardPro plugin",
+                                           "Track header at {0} contains incorrect signature.", Header.offsets[t]);
+
+                continue;
+            }
+
+            if(trk.TrackNumber != t)
+            {
+                AaruConsole.DebugWriteLine("SuperCardPro plugin", "Track number at {0} should be {1} but is {2}.",
+                                           Header.offsets[t], t, trk.TrackNumber);
+
+                continue;
+            }
+
+            AaruConsole.DebugWriteLine("SuperCardPro plugin", "Found track {0} at {1}.", t, Header.offsets[t]);
+
+            for(byte r = 0; r < Header.revolutions; r++)
+            {
+                byte[] rev = new byte[Marshal.SizeOf<TrackEntry>()];
+                _scpStream.Read(rev, 0, Marshal.SizeOf<TrackEntry>());
+
+                trk.Entries[r] = Marshal.ByteArrayToStructureLittleEndian<TrackEntry>(rev);
+
+                // De-relative offsets
+                trk.Entries[r].dataOffset += Header.offsets[t];
+            }
+
+            ScpTracks.Add(t, trk);
+        }
+
+        if(Header.flags.HasFlag(ScpFlags.HasFooter))
+        {
+            long position = _scpStream.Position;
+            _scpStream.Seek(-4, SeekOrigin.End);
+
+            while(_scpStream.Position >= position)
+            {
+                byte[] footerSig = new byte[4];
+                _scpStream.Read(footerSig, 0, 4);
+                uint footerMagic = BitConverter.ToUInt32(footerSig, 0);
+
+                if(footerMagic == FOOTER_SIGNATURE)
+                {
+                    _scpStream.Seek(-Marshal.SizeOf<Footer>(), SeekOrigin.Current);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "Found footer at {0}", _scpStream.Position);
+
+                    byte[] ftr = new byte[Marshal.SizeOf<Footer>()];
+                    _scpStream.Read(ftr, 0, Marshal.SizeOf<Footer>());
+
+                    Footer footer = Marshal.ByteArrayToStructureLittleEndian<Footer>(ftr);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.manufacturerOffset = 0x{0:X8}",
+                                               footer.manufacturerOffset);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.modelOffset = 0x{0:X8}",
+                                               footer.modelOffset);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.serialOffset = 0x{0:X8}",
+                                               footer.serialOffset);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.creatorOffset = 0x{0:X8}",
+                                               footer.creatorOffset);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.applicationOffset = 0x{0:X8}",
+                                               footer.applicationOffset);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.commentsOffset = 0x{0:X8}",
+                                               footer.commentsOffset);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.creationTime = {0}",
+                                               footer.creationTime);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.modificationTime = {0}",
+                                               footer.modificationTime);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.applicationVersion = {0}.{1}",
+                                               (footer.applicationVersion & 0xF0) >> 4,
+                                               footer.applicationVersion & 0xF);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.hardwareVersion = {0}.{1}",
+                                               (footer.hardwareVersion & 0xF0) >> 4, footer.hardwareVersion & 0xF);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.firmwareVersion = {0}.{1}",
+                                               (footer.firmwareVersion & 0xF0) >> 4, footer.firmwareVersion & 0xF);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.imageVersion = {0}.{1}",
+                                               (footer.imageVersion & 0xF0) >> 4, footer.imageVersion & 0xF);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.signature = \"{0}\"",
+                                               StringHandlers.CToString(BitConverter.GetBytes(footer.signature)));
+
+                    _imageInfo.DriveManufacturer = ReadPStringUtf8(_scpStream, footer.manufacturerOffset);
+                    _imageInfo.DriveModel        = ReadPStringUtf8(_scpStream, footer.modelOffset);
+                    _imageInfo.DriveSerialNumber = ReadPStringUtf8(_scpStream, footer.serialOffset);
+                    _imageInfo.Creator           = ReadPStringUtf8(_scpStream, footer.creatorOffset);
+                    _imageInfo.Application       = ReadPStringUtf8(_scpStream, footer.applicationOffset);
+                    _imageInfo.Comments          = ReadPStringUtf8(_scpStream, footer.commentsOffset);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.driveManufacturer = \"{0}\"",
+                                               _imageInfo.DriveManufacturer);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.driveModel = \"{0}\"",
+                                               _imageInfo.DriveModel);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.driveSerialNumber = \"{0}\"",
+                                               _imageInfo.DriveSerialNumber);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageCreator = \"{0}\"",
+                                               _imageInfo.Creator);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageApplication = \"{0}\"",
+                                               _imageInfo.Application);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageComments = \"{0}\"",
+                                               _imageInfo.Comments);
+
+                    _imageInfo.CreationTime = footer.creationTime != 0
+                                                  ? DateHandlers.UnixToDateTime(footer.creationTime)
+                                                  : imageFilter.CreationTime;
+
+                    _imageInfo.LastModificationTime = footer.modificationTime != 0
+                                                          ? DateHandlers.UnixToDateTime(footer.modificationTime)
+                                                          : imageFilter.LastWriteTime;
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageCreationTime = {0}",
+                                               _imageInfo.CreationTime);
+
+                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageLastModificationTime = {0}",
+                                               _imageInfo.LastModificationTime);
+
+                    _imageInfo.ApplicationVersion =
+                        $"{(footer.applicationVersion & 0xF0) >> 4}.{footer.applicationVersion & 0xF}";
+
+                    _imageInfo.DriveFirmwareRevision =
+                        $"{(footer.firmwareVersion & 0xF0) >> 4}.{footer.firmwareVersion & 0xF}";
+
+                    _imageInfo.Version = $"{(footer.imageVersion & 0xF0) >> 4}.{footer.imageVersion & 0xF}";
+
                     break;
-
-                _scpStream.Position = Header.offsets[t];
-
-                var trk = new TrackHeader
-                {
-                    Signature = new byte[3],
-                    Entries   = new TrackEntry[Header.revolutions]
-                };
-
-                _scpStream.Read(trk.Signature, 0, trk.Signature.Length);
-                trk.TrackNumber = (byte)_scpStream.ReadByte();
-
-                if(!trk.Signature.SequenceEqual(_trkSignature))
-                {
-                    AaruConsole.DebugWriteLine("SuperCardPro plugin",
-                                               "Track header at {0} contains incorrect signature.", Header.offsets[t]);
-
-                    continue;
                 }
 
-                if(trk.TrackNumber != t)
-                {
-                    AaruConsole.DebugWriteLine("SuperCardPro plugin", "Track number at {0} should be {1} but is {2}.",
-                                               Header.offsets[t], t, trk.TrackNumber);
-
-                    continue;
-                }
-
-                AaruConsole.DebugWriteLine("SuperCardPro plugin", "Found track {0} at {1}.", t, Header.offsets[t]);
-
-                for(byte r = 0; r < Header.revolutions; r++)
-                {
-                    byte[] rev = new byte[Marshal.SizeOf<TrackEntry>()];
-                    _scpStream.Read(rev, 0, Marshal.SizeOf<TrackEntry>());
-
-                    trk.Entries[r] = Marshal.ByteArrayToStructureLittleEndian<TrackEntry>(rev);
-
-                    // De-relative offsets
-                    trk.Entries[r].dataOffset += Header.offsets[t];
-                }
-
-                ScpTracks.Add(t, trk);
+                _scpStream.Seek(-8, SeekOrigin.Current);
             }
-
-            if(Header.flags.HasFlag(ScpFlags.HasFooter))
-            {
-                long position = _scpStream.Position;
-                _scpStream.Seek(-4, SeekOrigin.End);
-
-                while(_scpStream.Position >= position)
-                {
-                    byte[] footerSig = new byte[4];
-                    _scpStream.Read(footerSig, 0, 4);
-                    uint footerMagic = BitConverter.ToUInt32(footerSig, 0);
-
-                    if(footerMagic == FOOTER_SIGNATURE)
-                    {
-                        _scpStream.Seek(-Marshal.SizeOf<Footer>(), SeekOrigin.Current);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "Found footer at {0}", _scpStream.Position);
-
-                        byte[] ftr = new byte[Marshal.SizeOf<Footer>()];
-                        _scpStream.Read(ftr, 0, Marshal.SizeOf<Footer>());
-
-                        Footer footer = Marshal.ByteArrayToStructureLittleEndian<Footer>(ftr);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.manufacturerOffset = 0x{0:X8}",
-                                                   footer.manufacturerOffset);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.modelOffset = 0x{0:X8}",
-                                                   footer.modelOffset);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.serialOffset = 0x{0:X8}",
-                                                   footer.serialOffset);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.creatorOffset = 0x{0:X8}",
-                                                   footer.creatorOffset);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.applicationOffset = 0x{0:X8}",
-                                                   footer.applicationOffset);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.commentsOffset = 0x{0:X8}",
-                                                   footer.commentsOffset);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.creationTime = {0}",
-                                                   footer.creationTime);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.modificationTime = {0}",
-                                                   footer.modificationTime);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.applicationVersion = {0}.{1}",
-                                                   (footer.applicationVersion & 0xF0) >> 4,
-                                                   footer.applicationVersion & 0xF);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.hardwareVersion = {0}.{1}",
-                                                   (footer.hardwareVersion & 0xF0) >> 4, footer.hardwareVersion & 0xF);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.firmwareVersion = {0}.{1}",
-                                                   (footer.firmwareVersion & 0xF0) >> 4, footer.firmwareVersion & 0xF);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.imageVersion = {0}.{1}",
-                                                   (footer.imageVersion & 0xF0) >> 4, footer.imageVersion & 0xF);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "footer.signature = \"{0}\"",
-                                                   StringHandlers.CToString(BitConverter.GetBytes(footer.signature)));
-
-                        _imageInfo.DriveManufacturer = ReadPStringUtf8(_scpStream, footer.manufacturerOffset);
-                        _imageInfo.DriveModel        = ReadPStringUtf8(_scpStream, footer.modelOffset);
-                        _imageInfo.DriveSerialNumber = ReadPStringUtf8(_scpStream, footer.serialOffset);
-                        _imageInfo.Creator           = ReadPStringUtf8(_scpStream, footer.creatorOffset);
-                        _imageInfo.Application       = ReadPStringUtf8(_scpStream, footer.applicationOffset);
-                        _imageInfo.Comments          = ReadPStringUtf8(_scpStream, footer.commentsOffset);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.driveManufacturer = \"{0}\"",
-                                                   _imageInfo.DriveManufacturer);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.driveModel = \"{0}\"",
-                                                   _imageInfo.DriveModel);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.driveSerialNumber = \"{0}\"",
-                                                   _imageInfo.DriveSerialNumber);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageCreator = \"{0}\"",
-                                                   _imageInfo.Creator);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageApplication = \"{0}\"",
-                                                   _imageInfo.Application);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageComments = \"{0}\"",
-                                                   _imageInfo.Comments);
-
-                        _imageInfo.CreationTime = footer.creationTime != 0
-                                                      ? DateHandlers.UnixToDateTime(footer.creationTime)
-                                                      : imageFilter.CreationTime;
-
-                        _imageInfo.LastModificationTime = footer.modificationTime != 0
-                                                              ? DateHandlers.UnixToDateTime(footer.modificationTime)
-                                                              : imageFilter.LastWriteTime;
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageCreationTime = {0}",
-                                                   _imageInfo.CreationTime);
-
-                        AaruConsole.DebugWriteLine("SuperCardPro plugin", "ImageInfo.imageLastModificationTime = {0}",
-                                                   _imageInfo.LastModificationTime);
-
-                        _imageInfo.ApplicationVersion =
-                            $"{(footer.applicationVersion & 0xF0) >> 4}.{footer.applicationVersion & 0xF}";
-
-                        _imageInfo.DriveFirmwareRevision =
-                            $"{(footer.firmwareVersion & 0xF0) >> 4}.{footer.firmwareVersion & 0xF}";
-
-                        _imageInfo.Version = $"{(footer.imageVersion & 0xF0) >> 4}.{footer.imageVersion & 0xF}";
-
-                        break;
-                    }
-
-                    _scpStream.Seek(-8, SeekOrigin.Current);
-                }
-            }
-            else
-            {
-                _imageInfo.Application          = "SuperCardPro";
-                _imageInfo.ApplicationVersion   = $"{(Header.version & 0xF0) >> 4}.{Header.version & 0xF}";
-                _imageInfo.CreationTime         = imageFilter.CreationTime;
-                _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-                _imageInfo.Version              = "1.5";
-            }
-
-            AaruConsole.ErrorWriteLine("Flux decoding is not yet implemented.");
-
-            return ErrorNumber.NotImplemented;
         }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+        else
         {
-            buffer = null;
-
-            return ErrorNumber.NotImplemented;
+            _imageInfo.Application          = "SuperCardPro";
+            _imageInfo.ApplicationVersion   = $"{(Header.version & 0xF0) >> 4}.{Header.version & 0xF}";
+            _imageInfo.CreationTime         = imageFilter.CreationTime;
+            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+            _imageInfo.Version              = "1.5";
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        AaruConsole.ErrorWriteLine("Flux decoding is not yet implemented.");
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
-            ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+        return ErrorNumber.NotImplemented;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotImplemented;
-        }
+        return ErrorNumber.NotImplemented;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-            return ErrorNumber.NotImplemented;
-        }
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer) =>
+        ReadSectorsTag(sectorAddress, 1, tag, out buffer);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+        return ErrorNumber.NotImplemented;
+    }
 
-            return ErrorNumber.NotSupported;
-        }
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        return ErrorNumber.NotImplemented;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/Structs.cs b/Aaru.Images/SuperCardPro/Structs.cs
index e2a67d5a2..ec17e337d 100644
--- a/Aaru.Images/SuperCardPro/Structs.cs
+++ b/Aaru.Images/SuperCardPro/Structs.cs
@@ -32,61 +32,60 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SuperCardPro
 {
-    public sealed partial class SuperCardPro
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct ScpHeader
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public struct ScpHeader
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] signature;
-            public byte        version;
-            public ScpDiskType type;
-            public byte        revolutions;
-            public byte        start;
-            public byte        end;
-            public ScpFlags    flags;
-            public byte        bitCellEncoding;
-            public byte        heads;
-            public byte        reserved;
-            public uint        checksum;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 168)]
-            public uint[] offsets;
-        }
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public byte[] signature;
+        public byte        version;
+        public ScpDiskType type;
+        public byte        revolutions;
+        public byte        start;
+        public byte        end;
+        public ScpFlags    flags;
+        public byte        bitCellEncoding;
+        public byte        heads;
+        public byte        reserved;
+        public uint        checksum;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 168)]
+        public uint[] offsets;
+    }
 
-        public struct TrackHeader
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public byte[] Signature;
-            public byte         TrackNumber;
-            public TrackEntry[] Entries;
-        }
+    public struct TrackHeader
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public byte[] Signature;
+        public byte         TrackNumber;
+        public TrackEntry[] Entries;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        public struct TrackEntry
-        {
-            public uint indexTime;
-            public uint trackLength;
-            public uint dataOffset;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    public struct TrackEntry
+    {
+        public uint indexTime;
+        public uint trackLength;
+        public uint dataOffset;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Footer
-        {
-            public readonly uint manufacturerOffset;
-            public readonly uint modelOffset;
-            public readonly uint serialOffset;
-            public readonly uint creatorOffset;
-            public readonly uint applicationOffset;
-            public readonly uint commentsOffset;
-            public readonly long creationTime;
-            public readonly long modificationTime;
-            public readonly byte applicationVersion;
-            public readonly byte hardwareVersion;
-            public readonly byte firmwareVersion;
-            public readonly byte imageVersion;
-            public readonly uint signature;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Footer
+    {
+        public readonly uint manufacturerOffset;
+        public readonly uint modelOffset;
+        public readonly uint serialOffset;
+        public readonly uint creatorOffset;
+        public readonly uint applicationOffset;
+        public readonly uint commentsOffset;
+        public readonly long creationTime;
+        public readonly long modificationTime;
+        public readonly byte applicationVersion;
+        public readonly byte hardwareVersion;
+        public readonly byte firmwareVersion;
+        public readonly byte imageVersion;
+        public readonly uint signature;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/SuperCardPro.cs b/Aaru.Images/SuperCardPro/SuperCardPro.cs
index 30257168e..3a0839c7d 100644
--- a/Aaru.Images/SuperCardPro/SuperCardPro.cs
+++ b/Aaru.Images/SuperCardPro/SuperCardPro.cs
@@ -36,40 +36,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+/// <summary>Implements reading SuperCardPro flux images</summary>
+public sealed partial class SuperCardPro : IMediaImage, IVerifiableImage, IVerifiableSectorsImage
 {
-    /// <summary>Implements reading SuperCardPro flux images</summary>
-    public sealed partial class SuperCardPro : IMediaImage, IVerifiableImage, IVerifiableSectorsImage
+    ImageInfo _imageInfo;
+    Stream    _scpStream;
+
+    // TODO: These variables have been made public so create-sidecar can access to this information until I define an API >4.0
+    public ScpHeader                     Header;
+    public Dictionary<byte, TrackHeader> ScpTracks;
+
+    public SuperCardPro() => _imageInfo = new ImageInfo
     {
-        ImageInfo _imageInfo;
-        Stream    _scpStream;
-
-        // TODO: These variables have been made public so create-sidecar can access to this information until I define an API >4.0
-        public ScpHeader                     Header;
-        public Dictionary<byte, TrackHeader> ScpTracks;
-
-        public SuperCardPro() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/SuperCardPro/Verify.cs b/Aaru.Images/SuperCardPro/Verify.cs
index d291cca81..ff819df0a 100644
--- a/Aaru.Images/SuperCardPro/Verify.cs
+++ b/Aaru.Images/SuperCardPro/Verify.cs
@@ -33,35 +33,34 @@
 using System;
 using System.Collections.Generic;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class SuperCardPro
 {
-    public sealed partial class SuperCardPro
+    /// <inheritdoc />
+    public bool? VerifyMediaImage()
     {
-        /// <inheritdoc />
-        public bool? VerifyMediaImage()
-        {
-            if(Header.flags.HasFlag(ScpFlags.Writable))
-                return null;
+        if(Header.flags.HasFlag(ScpFlags.Writable))
+            return null;
 
-            byte[] wholeFile = new byte[_scpStream.Length];
-            uint   sum       = 0;
+        byte[] wholeFile = new byte[_scpStream.Length];
+        uint   sum       = 0;
 
-            _scpStream.Position = 0;
-            _scpStream.Read(wholeFile, 0, wholeFile.Length);
+        _scpStream.Position = 0;
+        _scpStream.Read(wholeFile, 0, wholeFile.Length);
 
-            for(int i = 0x10; i < wholeFile.Length; i++)
-                sum += wholeFile[i];
+        for(int i = 0x10; i < wholeFile.Length; i++)
+            sum += wholeFile[i];
 
-            return Header.checksum == sum;
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress) =>
-            throw new NotImplementedException("Flux decoding is not yet implemented.");
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas) =>
-            throw new NotImplementedException("Flux decoding is not yet implemented.");
+        return Header.checksum == sum;
     }
+
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress) =>
+        throw new NotImplementedException("Flux decoding is not yet implemented.");
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas) =>
+        throw new NotImplementedException("Flux decoding is not yet implemented.");
 }
\ No newline at end of file
diff --git a/Aaru.Images/T98/Identify.cs b/Aaru.Images/T98/Identify.cs
index 29cb190e7..b27b37729 100644
--- a/Aaru.Images/T98/Identify.cs
+++ b/Aaru.Images/T98/Identify.cs
@@ -35,33 +35,32 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class T98
-    {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+namespace Aaru.DiscImages;
 
-            if(stream.Length % 256 != 0)
+public sealed partial class T98
+{
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
+    {
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length % 256 != 0)
+            return false;
+
+        byte[] hdrB = new byte[256];
+        stream.Read(hdrB, 0, hdrB.Length);
+
+        for(int i = 4; i < 256; i++)
+            if(hdrB[i] != 0)
                 return false;
 
-            byte[] hdrB = new byte[256];
-            stream.Read(hdrB, 0, hdrB.Length);
+        int cylinders = BitConverter.ToInt32(hdrB, 0);
 
-            for(int i = 4; i < 256; i++)
-                if(hdrB[i] != 0)
-                    return false;
+        AaruConsole.DebugWriteLine("T98 plugin", "cylinders = {0}", cylinders);
 
-            int cylinders = BitConverter.ToInt32(hdrB, 0);
-
-            AaruConsole.DebugWriteLine("T98 plugin", "cylinders = {0}", cylinders);
-
-            // This format is expanding, so length can be smaller
-            // Just grow it, I won't risk false positives...
-            return stream.Length == (cylinders * 8 * 33 * 256) + 256;
-        }
+        // This format is expanding, so length can be smaller
+        // Just grow it, I won't risk false positives...
+        return stream.Length == (cylinders * 8 * 33 * 256) + 256;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/T98/Properties.cs b/Aaru.Images/T98/Properties.cs
index 28ca344fd..fe5f54423 100644
--- a/Aaru.Images/T98/Properties.cs
+++ b/Aaru.Images/T98/Properties.cs
@@ -37,49 +37,48 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class T98
 {
-    public sealed partial class T98
+    /// <inheritdoc />
+    public string Name => "T98 Hard Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("0410003E-6E7B-40E6-9328-BA5651ADF6B7");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "T98 disk image";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public string Name => "T98 Hard Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("0410003E-6E7B-40E6-9328-BA5651ADF6B7");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "T98 disk image";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".t98"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".t98"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/T98/Read.cs b/Aaru.Images/T98/Read.cs
index 8e60a274d..d7dadb151 100644
--- a/Aaru.Images/T98/Read.cs
+++ b/Aaru.Images/T98/Read.cs
@@ -36,70 +36,69 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class T98
-    {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+namespace Aaru.DiscImages;
 
-            if(stream.Length % 256 != 0)
+public sealed partial class T98
+{
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
+    {
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length % 256 != 0)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] hdrB = new byte[256];
+        stream.Read(hdrB, 0, hdrB.Length);
+
+        for(int i = 4; i < 256; i++)
+            if(hdrB[i] != 0)
                 return ErrorNumber.InvalidArgument;
 
-            byte[] hdrB = new byte[256];
-            stream.Read(hdrB, 0, hdrB.Length);
+        int cylinders = BitConverter.ToInt32(hdrB, 0);
 
-            for(int i = 4; i < 256; i++)
-                if(hdrB[i] != 0)
-                    return ErrorNumber.InvalidArgument;
+        _imageInfo.MediaType = MediaType.GENERIC_HDD;
 
-            int cylinders = BitConverter.ToInt32(hdrB, 0);
+        _imageInfo.ImageSize            = (ulong)(stream.Length - 256);
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = (ulong)((stream.Length / 256) - 1);
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.SectorSize           = 256;
+        _imageInfo.Cylinders            = (uint)cylinders;
+        _imageInfo.Heads                = 8;
+        _imageInfo.SectorsPerTrack      = 33;
 
-            _imageInfo.MediaType = MediaType.GENERIC_HDD;
+        _t98ImageFilter = imageFilter;
 
-            _imageInfo.ImageSize            = (ulong)(stream.Length - 256);
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = (ulong)((stream.Length / 256) - 1);
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.SectorSize           = 256;
-            _imageInfo.Cylinders            = (uint)cylinders;
-            _imageInfo.Heads                = 8;
-            _imageInfo.SectorsPerTrack      = 33;
+        return ErrorNumber.NoError;
+    }
 
-            _t98ImageFilter = imageFilter;
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-            return ErrorNumber.NoError;
-        }
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+        buffer = new byte[length * _imageInfo.SectorSize];
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+        Stream stream = _t98ImageFilter.GetDataForkStream();
 
-            buffer = new byte[length * _imageInfo.SectorSize];
+        stream.Seek((long)(256 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
 
-            Stream stream = _t98ImageFilter.GetDataForkStream();
+        stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
 
-            stream.Seek((long)(256 + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
-
-            stream.Read(buffer, 0, (int)(length * _imageInfo.SectorSize));
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/T98/T98.cs b/Aaru.Images/T98/T98.cs
index 00401c06d..f6e5819dc 100644
--- a/Aaru.Images/T98/T98.cs
+++ b/Aaru.Images/T98/T98.cs
@@ -36,38 +36,37 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing T98 disk images</summary>
-    public sealed partial class T98 : IWritableImage
-    {
-        ImageInfo  _imageInfo;
-        IFilter    _t98ImageFilter;
-        FileStream _writingStream;
+namespace Aaru.DiscImages;
 
-        public T98() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing T98 disk images</summary>
+public sealed partial class T98 : IWritableImage
+{
+    ImageInfo  _imageInfo;
+    IFilter    _t98ImageFilter;
+    FileStream _writingStream;
+
+    public T98() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/T98/Unsupported.cs b/Aaru.Images/T98/Unsupported.cs
index 608b91900..25e40f6e9 100644
--- a/Aaru.Images/T98/Unsupported.cs
+++ b/Aaru.Images/T98/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class T98
 {
-    public sealed partial class T98
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/T98/Write.cs b/Aaru.Images/T98/Write.cs
index 3aeb04141..91c957cc2 100644
--- a/Aaru.Images/T98/Write.cs
+++ b/Aaru.Images/T98/Write.cs
@@ -39,189 +39,188 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class T98
 {
-    public sealed partial class T98
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 256)
         {
-            if(sectorSize != 256)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(256 + (sectorAddress * 256)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(256 + (sectorAddress * 256)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        _imageInfo = new ImageInfo
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+        IsWriting    = true;
+        ErrorMessage = null;
 
-                return false;
-            }
-
-            int cylinders = (int)(_imageInfo.Sectors / 33 / 8);
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(BitConverter.GetBytes(cylinders), 0, 4);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(256 + (sectorAddress * 256)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(256 + (sectorAddress * 256)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        int cylinders = (int)(_imageInfo.Sectors / 33 / 8);
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(BitConverter.GetBytes(cylinders), 0, 4);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
 }
\ No newline at end of file
diff --git a/Aaru.Images/TeleDisk/Constants.cs b/Aaru.Images/TeleDisk/Constants.cs
index 3a472319c..656d4a6dc 100644
--- a/Aaru.Images/TeleDisk/Constants.cs
+++ b/Aaru.Images/TeleDisk/Constants.cs
@@ -32,84 +32,83 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class TeleDisk
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class TeleDisk
-    {
-        // "TD" as little endian uint.
-        const ushort TD_MAGIC = 0x4454;
+    // "TD" as little endian uint.
+    const ushort TD_MAGIC = 0x4454;
 
-        // "td" as little endian uint. Means whole file is compressed (aka Advanced Compression)
-        const ushort TD_ADV_COMP_MAGIC = 0x6474;
+    // "td" as little endian uint. Means whole file is compressed (aka Advanced Compression)
+    const ushort TD_ADV_COMP_MAGIC = 0x6474;
 
-        // DataRates
-        const byte DATA_RATE_250_KBPS = 0x00;
-        const byte DATA_RATE_300_KBPS = 0x01;
-        const byte DATA_RATE_500_KBPS = 0x02;
+    // DataRates
+    const byte DATA_RATE_250_KBPS = 0x00;
+    const byte DATA_RATE_300_KBPS = 0x01;
+    const byte DATA_RATE_500_KBPS = 0x02;
 
-        // TeleDisk drive types
-        const byte DRIVE_TYPE_525_HD_DD_DISK = 0x00;
-        const byte DRIVE_TYPE_525_HD         = 0x01;
-        const byte DRIVE_TYPE_525_DD         = 0x02;
-        const byte DRIVE_TYPE_35_DD          = 0x03;
-        const byte DRIVE_TYPE_35_HD          = 0x04;
-        const byte DRIVE_TYPE_8_INCH         = 0x05;
-        const byte DRIVE_TYPE_35_ED          = 0x06;
+    // TeleDisk drive types
+    const byte DRIVE_TYPE_525_HD_DD_DISK = 0x00;
+    const byte DRIVE_TYPE_525_HD         = 0x01;
+    const byte DRIVE_TYPE_525_DD         = 0x02;
+    const byte DRIVE_TYPE_35_DD          = 0x03;
+    const byte DRIVE_TYPE_35_HD          = 0x04;
+    const byte DRIVE_TYPE_8_INCH         = 0x05;
+    const byte DRIVE_TYPE_35_ED          = 0x06;
 
-        // Stepping
-        const byte STEPPING_SINGLE    = 0x00;
-        const byte STEPPING_DOUBLE    = 0x01;
-        const byte STEPPING_EVEN_ONLY = 0x02;
+    // Stepping
+    const byte STEPPING_SINGLE    = 0x00;
+    const byte STEPPING_DOUBLE    = 0x01;
+    const byte STEPPING_EVEN_ONLY = 0x02;
 
-        // If this bit is set, there is a comment block
-        const byte COMMENT_BLOCK_PRESENT = 0x80;
+    // If this bit is set, there is a comment block
+    const byte COMMENT_BLOCK_PRESENT = 0x80;
 
-        // CRC polynomial
-        const ushort TELE_DISK_CRC_POLY = 0xA097;
+    // CRC polynomial
+    const ushort TELE_DISK_CRC_POLY = 0xA097;
 
-        // Sector sizes table
-        const byte SECTOR_SIZE_128 = 0x00;
-        const byte SECTOR_SIZE_256 = 0x01;
-        const byte SECTOR_SIZE_512 = 0x02;
+    // Sector sizes table
+    const byte SECTOR_SIZE_128 = 0x00;
+    const byte SECTOR_SIZE_256 = 0x01;
+    const byte SECTOR_SIZE_512 = 0x02;
 
-        // ReSharper disable InconsistentNaming
-        const byte SECTOR_SIZE_1K = 0x03;
-        const byte SECTOR_SIZE_2K = 0x04;
-        const byte SECTOR_SIZE_4K = 0x05;
-        const byte SECTOR_SIZE_8K = 0x06;
+    // ReSharper disable InconsistentNaming
+    const byte SECTOR_SIZE_1K = 0x03;
+    const byte SECTOR_SIZE_2K = 0x04;
+    const byte SECTOR_SIZE_4K = 0x05;
+    const byte SECTOR_SIZE_8K = 0x06;
 
-        // ReSharper restore InconsistentNaming
+    // ReSharper restore InconsistentNaming
 
-        // Flags
-        // Address mark repeats inside same track
-        const byte FLAGS_SECTOR_DUPLICATE = 0x01;
+    // Flags
+    // Address mark repeats inside same track
+    const byte FLAGS_SECTOR_DUPLICATE = 0x01;
 
-        // Sector gave CRC error on reading
-        const byte FLAGS_SECTOR_CRC_ERROR = 0x02;
+    // Sector gave CRC error on reading
+    const byte FLAGS_SECTOR_CRC_ERROR = 0x02;
 
-        // Address mark indicates deleted sector
-        const byte FLAGS_SECTOR_DELETED = 0x04;
+    // Address mark indicates deleted sector
+    const byte FLAGS_SECTOR_DELETED = 0x04;
 
-        // Sector skipped as FAT said it's unused
-        const byte FLAGS_SECTOR_SKIPPED = 0x10;
+    // Sector skipped as FAT said it's unused
+    const byte FLAGS_SECTOR_SKIPPED = 0x10;
 
-        // There was an address mark, but no data following
-        const byte FLAGS_SECTOR_DATALESS = 0x20;
+    // There was an address mark, but no data following
+    const byte FLAGS_SECTOR_DATALESS = 0x20;
 
-        // There was data without address mark
-        const byte FLAGS_SECTOR_NO_ID = 0x40;
+    // There was data without address mark
+    const byte FLAGS_SECTOR_NO_ID = 0x40;
 
-        // Data block encodings
-        // Data is copied as is
-        const byte DATA_BLOCK_COPY = 0x00;
+    // Data block encodings
+    // Data is copied as is
+    const byte DATA_BLOCK_COPY = 0x00;
 
-        // Data is encoded as a pair of len.value uint16s
-        const byte DATA_BLOCK_PATTERN = 0x01;
+    // Data is encoded as a pair of len.value uint16s
+    const byte DATA_BLOCK_PATTERN = 0x01;
 
-        // Data is encoded as RLE
-        const byte DATA_BLOCK_RLE = 0x02;
+    // Data is encoded as RLE
+    const byte DATA_BLOCK_RLE = 0x02;
 
-        const int BUFSZ = 512;
-    }
+    const int BUFSZ = 512;
 }
\ No newline at end of file
diff --git a/Aaru.Images/TeleDisk/Helpers.cs b/Aaru.Images/TeleDisk/Helpers.cs
index 6970117b9..65ba6770d 100644
--- a/Aaru.Images/TeleDisk/Helpers.cs
+++ b/Aaru.Images/TeleDisk/Helpers.cs
@@ -36,311 +36,310 @@ using Aaru.CommonTypes.Enums;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class TeleDisk
 {
-    public sealed partial class TeleDisk
+    (ushort cylinder, byte head, byte sector) LbaToChs(ulong lba)
     {
-        (ushort cylinder, byte head, byte sector) LbaToChs(ulong lba)
-        {
-            ushort cylinder = (ushort)(lba / (_imageInfo.Heads * _imageInfo.SectorsPerTrack));
-            byte   head     = (byte)(lba / _imageInfo.SectorsPerTrack % _imageInfo.Heads);
-            byte   sector   = (byte)((lba % _imageInfo.SectorsPerTrack) + 1);
+        ushort cylinder = (ushort)(lba                            / (_imageInfo.Heads * _imageInfo.SectorsPerTrack));
+        byte   head     = (byte)(lba / _imageInfo.SectorsPerTrack % _imageInfo.Heads);
+        byte   sector   = (byte)((lba % _imageInfo.SectorsPerTrack) + 1);
 
-            return (cylinder, head, sector);
+        return (cylinder, head, sector);
+    }
+
+    static ushort TeleDiskCrc(ushort crc, byte[] buffer)
+    {
+        int counter = 0;
+
+        while(counter < buffer.Length)
+        {
+            crc ^= (ushort)((buffer[counter] & 0xFF) << 8);
+
+            for(int i = 0; i < 8; i++)
+                if((crc & 0x8000) > 0)
+                    crc = (ushort)((crc << 1) ^ TELE_DISK_CRC_POLY);
+                else
+                    crc = (ushort)(crc << 1);
+
+            counter++;
         }
 
-        static ushort TeleDiskCrc(ushort crc, byte[] buffer)
+        return crc;
+    }
+
+    static ErrorNumber DecodeTeleDiskData(byte sectorSize, byte encodingType, byte[] encodedData,
+                                          out byte[] decodedData)
+    {
+        decodedData = null;
+
+        switch(sectorSize)
         {
-            int counter = 0;
+            case SECTOR_SIZE_128:
+                decodedData = new byte[128];
 
-            while(counter < buffer.Length)
+                break;
+            case SECTOR_SIZE_256:
+                decodedData = new byte[256];
+
+                break;
+            case SECTOR_SIZE_512:
+                decodedData = new byte[512];
+
+                break;
+            case SECTOR_SIZE_1K:
+                decodedData = new byte[1024];
+
+                break;
+            case SECTOR_SIZE_2K:
+                decodedData = new byte[2048];
+
+                break;
+            case SECTOR_SIZE_4K:
+                decodedData = new byte[4096];
+
+                break;
+            case SECTOR_SIZE_8K:
+                decodedData = new byte[8192];
+
+                break;
+            default:
+                AaruConsole.ErrorWriteLine($"Sector size {sectorSize} is incorrect.");
+
+                return ErrorNumber.InvalidArgument;
+        }
+
+        switch(encodingType)
+        {
+            case DATA_BLOCK_COPY:
+                Array.Copy(encodedData, decodedData, decodedData.Length);
+
+                break;
+            case DATA_BLOCK_PATTERN:
             {
-                crc ^= (ushort)((buffer[counter] & 0xFF) << 8);
+                int ins  = 0;
+                int outs = 0;
 
-                for(int i = 0; i < 8; i++)
-                    if((crc & 0x8000) > 0)
-                        crc = (ushort)((crc << 1) ^ TELE_DISK_CRC_POLY);
+                while(ins < encodedData.Length)
+                {
+                    byte[] repeatValue = new byte[2];
+
+                    ushort repeatNumber = BitConverter.ToUInt16(encodedData, ins);
+                    Array.Copy(encodedData, ins + 2, repeatValue, 0, 2);
+                    byte[] decodedPiece = new byte[repeatNumber * 2];
+                    ArrayHelpers.ArrayFill(decodedPiece, repeatValue);
+                    Array.Copy(decodedPiece, 0, decodedData, outs, decodedPiece.Length);
+                    ins  += 4;
+                    outs += decodedPiece.Length;
+                }
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "(Block pattern decoder): Input data size: {0} bytes",
+                                           encodedData.Length);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "(Block pattern decoder): Processed input: {0} bytes",
+                                           ins);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin",
+                                           "(Block pattern decoder): Output data size: {0} bytes",
+                                           decodedData.Length);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin",
+                                           "(Block pattern decoder): Processed Output: {0} bytes", outs);
+
+                break;
+            }
+            case DATA_BLOCK_RLE:
+            {
+                int ins  = 0;
+                int outs = 0;
+
+                while(ins < encodedData.Length)
+                {
+                    byte length;
+
+                    byte encoding = encodedData[ins];
+
+                    if(encoding == 0x00)
+                    {
+                        length = encodedData[ins + 1];
+                        Array.Copy(encodedData, ins + 2, decodedData, outs, length);
+                        ins  += 2 + length;
+                        outs += length;
+                    }
                     else
-                        crc = (ushort)(crc << 1);
+                    {
+                        length = (byte)(encoding * 2);
+                        byte   run  = encodedData[ins + 1];
+                        byte[] part = new byte[length];
+                        Array.Copy(encodedData, ins + 2, part, 0, length);
+                        byte[] piece = new byte[length * run];
+                        ArrayHelpers.ArrayFill(piece, part);
+                        Array.Copy(piece, 0, decodedData, outs, piece.Length);
+                        ins  += 2 + length;
+                        outs += piece.Length;
+                    }
+                }
 
-                counter++;
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Input data size: {0} bytes",
+                                           encodedData.Length);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Processed input: {0} bytes", ins);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Output data size: {0} bytes",
+                                           decodedData.Length);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Processed Output: {0} bytes", outs);
+
+                break;
             }
+            default:
+                AaruConsole.ErrorWriteLine($"Data encoding {encodingType} is incorrect.");
 
-            return crc;
+                return ErrorNumber.InvalidArgument;
         }
 
-        static ErrorNumber DecodeTeleDiskData(byte sectorSize, byte encodingType, byte[] encodedData,
-                                              out byte[] decodedData)
+        return ErrorNumber.NoError;
+    }
+
+    MediaType DecodeTeleDiskDiskType()
+    {
+        switch(_header.DriveType)
         {
-            decodedData = null;
-
-            switch(sectorSize)
+            case DRIVE_TYPE_525_DD:
+            case DRIVE_TYPE_525_HD_DD_DISK:
+            case DRIVE_TYPE_525_HD:
             {
-                case SECTOR_SIZE_128:
-                    decodedData = new byte[128];
+                switch(_totalDiskSize)
+                {
+                    case 143360:
+                        return _imageInfo.SectorSize == 256 ? MediaType.MetaFloppy_Mod_I : MediaType.Unknown;
+                    case 163840:
+                    {
+                        // Acorn disk uses 256 bytes/sector
+                        return _imageInfo.SectorSize == 256 ? MediaType.ACORN_525_SS_DD_40
+                                   : MediaType.DOS_525_SS_DD_8;
 
-                    break;
-                case SECTOR_SIZE_256:
-                    decodedData = new byte[256];
+                        // DOS disks use 512 bytes/sector
+                    }
+                    case 184320:
+                    {
+                        // Atari disk uses 256 bytes/sector
+                        return _imageInfo.SectorSize == 256 ? MediaType.ATARI_525_DD : MediaType.DOS_525_SS_DD_9;
 
-                    break;
-                case SECTOR_SIZE_512:
-                    decodedData = new byte[512];
+                        // DOS disks use 512 bytes/sector
+                    }
+                    case 315392:
+                        return _imageInfo.SectorSize == 256 ? MediaType.MetaFloppy_Mod_II : MediaType.Unknown;
+                    case 327680:
+                    {
+                        // Acorn disk uses 256 bytes/sector
+                        return _imageInfo.SectorSize == 256 ? MediaType.ACORN_525_SS_DD_80
+                                   : MediaType.DOS_525_DS_DD_8;
 
-                    break;
-                case SECTOR_SIZE_1K:
-                    decodedData = new byte[1024];
+                        // DOS disks use 512 bytes/sector
+                    }
+                    case 368640:  return MediaType.DOS_525_DS_DD_9;
+                    case 1228800: return MediaType.DOS_525_HD;
+                    case 102400:  return MediaType.ACORN_525_SS_SD_40;
+                    case 204800:  return MediaType.ACORN_525_SS_SD_80;
+                    case 655360:  return MediaType.ACORN_525_DS_DD;
+                    case 92160:   return MediaType.ATARI_525_SD;
+                    case 133120:  return MediaType.ATARI_525_ED;
+                    case 1310720: return MediaType.NEC_525_HD;
+                    case 1261568: return MediaType.SHARP_525;
+                    case 839680:  return MediaType.FDFORMAT_525_DD;
+                    case 1304320: return MediaType.ECMA_99_8;
+                    case 1223424: return MediaType.ECMA_99_15;
+                    case 1061632: return MediaType.ECMA_99_26;
+                    case 80384:   return MediaType.ECMA_66;
+                    case 325632:  return MediaType.ECMA_70;
+                    case 653312:  return MediaType.ECMA_78;
+                    case 737280:  return MediaType.ECMA_78_2;
+                    default:
+                    {
+                        AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown 5,25\" disk with {0} bytes",
+                                                   _totalDiskSize);
 
-                    break;
-                case SECTOR_SIZE_2K:
-                    decodedData = new byte[2048];
-
-                    break;
-                case SECTOR_SIZE_4K:
-                    decodedData = new byte[4096];
-
-                    break;
-                case SECTOR_SIZE_8K:
-                    decodedData = new byte[8192];
-
-                    break;
-                default:
-                    AaruConsole.ErrorWriteLine($"Sector size {sectorSize} is incorrect.");
-
-                    return ErrorNumber.InvalidArgument;
+                        return MediaType.Unknown;
+                    }
+                }
             }
-
-            switch(encodingType)
+            case DRIVE_TYPE_35_DD:
+            case DRIVE_TYPE_35_ED:
+            case DRIVE_TYPE_35_HD:
             {
-                case DATA_BLOCK_COPY:
-                    Array.Copy(encodedData, decodedData, decodedData.Length);
-
-                    break;
-                case DATA_BLOCK_PATTERN:
+                switch(_totalDiskSize)
                 {
-                    int ins  = 0;
-                    int outs = 0;
-
-                    while(ins < encodedData.Length)
+                    case 322560:  return MediaType.Apricot_35;
+                    case 327680:  return MediaType.DOS_35_SS_DD_8;
+                    case 368640:  return MediaType.DOS_35_SS_DD_9;
+                    case 655360:  return MediaType.DOS_35_DS_DD_8;
+                    case 737280:  return MediaType.DOS_35_DS_DD_9;
+                    case 1474560: return MediaType.DOS_35_HD;
+                    case 2949120: return MediaType.DOS_35_ED;
+                    case 1720320: return MediaType.DMF;
+                    case 1763328: return MediaType.DMF_82;
+                    case 1884160: // Irreal size, seen as BIOS with TSR, 23 sectors/track
+                    case 1860608: // Real data size, sum of all sectors
+                        return MediaType.XDF_35;
+                    case 819200:  return MediaType.CBM_35_DD;
+                    case 901120:  return MediaType.CBM_AMIGA_35_DD;
+                    case 1802240: return MediaType.CBM_AMIGA_35_HD;
+                    case 1310720: return MediaType.NEC_35_HD_8;
+                    case 1228800: return MediaType.NEC_35_HD_15;
+                    case 1261568: return MediaType.SHARP_35;
+                    default:
                     {
-                        byte[] repeatValue = new byte[2];
+                        AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown 3,5\" disk with {0} bytes",
+                                                   _totalDiskSize);
 
-                        ushort repeatNumber = BitConverter.ToUInt16(encodedData, ins);
-                        Array.Copy(encodedData, ins + 2, repeatValue, 0, 2);
-                        byte[] decodedPiece = new byte[repeatNumber * 2];
-                        ArrayHelpers.ArrayFill(decodedPiece, repeatValue);
-                        Array.Copy(decodedPiece, 0, decodedData, outs, decodedPiece.Length);
-                        ins  += 4;
-                        outs += decodedPiece.Length;
+                        return MediaType.Unknown;
                     }
-
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "(Block pattern decoder): Input data size: {0} bytes",
-                                               encodedData.Length);
-
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "(Block pattern decoder): Processed input: {0} bytes",
-                                               ins);
-
-                    AaruConsole.DebugWriteLine("TeleDisk plugin",
-                                               "(Block pattern decoder): Output data size: {0} bytes",
-                                               decodedData.Length);
-
-                    AaruConsole.DebugWriteLine("TeleDisk plugin",
-                                               "(Block pattern decoder): Processed Output: {0} bytes", outs);
-
-                    break;
                 }
-                case DATA_BLOCK_RLE:
-                {
-                    int ins  = 0;
-                    int outs = 0;
-
-                    while(ins < encodedData.Length)
-                    {
-                        byte length;
-
-                        byte encoding = encodedData[ins];
-
-                        if(encoding == 0x00)
-                        {
-                            length = encodedData[ins + 1];
-                            Array.Copy(encodedData, ins + 2, decodedData, outs, length);
-                            ins  += 2 + length;
-                            outs += length;
-                        }
-                        else
-                        {
-                            length = (byte)(encoding * 2);
-                            byte   run  = encodedData[ins + 1];
-                            byte[] part = new byte[length];
-                            Array.Copy(encodedData, ins + 2, part, 0, length);
-                            byte[] piece = new byte[length * run];
-                            ArrayHelpers.ArrayFill(piece, part);
-                            Array.Copy(piece, 0, decodedData, outs, piece.Length);
-                            ins  += 2 + length;
-                            outs += piece.Length;
-                        }
-                    }
-
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Input data size: {0} bytes",
-                                               encodedData.Length);
-
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Processed input: {0} bytes", ins);
-
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Output data size: {0} bytes",
-                                               decodedData.Length);
-
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "(RLE decoder): Processed Output: {0} bytes", outs);
-
-                    break;
-                }
-                default:
-                    AaruConsole.ErrorWriteLine($"Data encoding {encodingType} is incorrect.");
-
-                    return ErrorNumber.InvalidArgument;
             }
-
-            return ErrorNumber.NoError;
-        }
-
-        MediaType DecodeTeleDiskDiskType()
-        {
-            switch(_header.DriveType)
+            case DRIVE_TYPE_8_INCH:
             {
-                case DRIVE_TYPE_525_DD:
-                case DRIVE_TYPE_525_HD_DD_DISK:
-                case DRIVE_TYPE_525_HD:
+                switch(_totalDiskSize)
                 {
-                    switch(_totalDiskSize)
+                    case 81664:   return MediaType.IBM23FD;
+                    case 242944:  return MediaType.IBM33FD_128;
+                    case 287488:  return MediaType.IBM33FD_256;
+                    case 306432:  return MediaType.IBM33FD_512;
+                    case 499200:  return MediaType.IBM43FD_128;
+                    case 574976:  return MediaType.IBM43FD_256;
+                    case 995072:  return MediaType.IBM53FD_256;
+                    case 1146624: return MediaType.IBM53FD_512;
+                    case 1222400: return MediaType.IBM53FD_1024;
+                    case 256256:
+                        // Same size, with same disk geometry, for DEC RX01, NEC and ECMA, return ECMA
+                        return MediaType.ECMA_54;
+                    case 512512:
                     {
-                        case 143360:
-                            return _imageInfo.SectorSize == 256 ? MediaType.MetaFloppy_Mod_I : MediaType.Unknown;
-                        case 163840:
-                        {
-                            // Acorn disk uses 256 bytes/sector
-                            return _imageInfo.SectorSize == 256 ? MediaType.ACORN_525_SS_DD_40
-                                       : MediaType.DOS_525_SS_DD_8;
+                        // DEC disk uses 256 bytes/sector
+                        return _imageInfo.SectorSize == 256 ? MediaType.RX02 : MediaType.ECMA_59;
 
-                            // DOS disks use 512 bytes/sector
-                        }
-                        case 184320:
-                        {
-                            // Atari disk uses 256 bytes/sector
-                            return _imageInfo.SectorSize == 256 ? MediaType.ATARI_525_DD : MediaType.DOS_525_SS_DD_9;
+                        // ECMA disks use 128 bytes/sector
+                    }
+                    case 1261568: return MediaType.NEC_8_DD;
+                    case 1255168: return MediaType.ECMA_69_8;
+                    case 1177344: return MediaType.ECMA_69_15;
+                    case 1021696: return MediaType.ECMA_69_26;
+                    default:
+                    {
+                        AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown 8\" disk with {0} bytes",
+                                                   _totalDiskSize);
 
-                            // DOS disks use 512 bytes/sector
-                        }
-                        case 315392:
-                            return _imageInfo.SectorSize == 256 ? MediaType.MetaFloppy_Mod_II : MediaType.Unknown;
-                        case 327680:
-                        {
-                            // Acorn disk uses 256 bytes/sector
-                            return _imageInfo.SectorSize == 256 ? MediaType.ACORN_525_SS_DD_80
-                                       : MediaType.DOS_525_DS_DD_8;
-
-                            // DOS disks use 512 bytes/sector
-                        }
-                        case 368640:  return MediaType.DOS_525_DS_DD_9;
-                        case 1228800: return MediaType.DOS_525_HD;
-                        case 102400:  return MediaType.ACORN_525_SS_SD_40;
-                        case 204800:  return MediaType.ACORN_525_SS_SD_80;
-                        case 655360:  return MediaType.ACORN_525_DS_DD;
-                        case 92160:   return MediaType.ATARI_525_SD;
-                        case 133120:  return MediaType.ATARI_525_ED;
-                        case 1310720: return MediaType.NEC_525_HD;
-                        case 1261568: return MediaType.SHARP_525;
-                        case 839680:  return MediaType.FDFORMAT_525_DD;
-                        case 1304320: return MediaType.ECMA_99_8;
-                        case 1223424: return MediaType.ECMA_99_15;
-                        case 1061632: return MediaType.ECMA_99_26;
-                        case 80384:   return MediaType.ECMA_66;
-                        case 325632:  return MediaType.ECMA_70;
-                        case 653312:  return MediaType.ECMA_78;
-                        case 737280:  return MediaType.ECMA_78_2;
-                        default:
-                        {
-                            AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown 5,25\" disk with {0} bytes",
-                                                       _totalDiskSize);
-
-                            return MediaType.Unknown;
-                        }
+                        return MediaType.Unknown;
                     }
                 }
-                case DRIVE_TYPE_35_DD:
-                case DRIVE_TYPE_35_ED:
-                case DRIVE_TYPE_35_HD:
-                {
-                    switch(_totalDiskSize)
-                    {
-                        case 322560:  return MediaType.Apricot_35;
-                        case 327680:  return MediaType.DOS_35_SS_DD_8;
-                        case 368640:  return MediaType.DOS_35_SS_DD_9;
-                        case 655360:  return MediaType.DOS_35_DS_DD_8;
-                        case 737280:  return MediaType.DOS_35_DS_DD_9;
-                        case 1474560: return MediaType.DOS_35_HD;
-                        case 2949120: return MediaType.DOS_35_ED;
-                        case 1720320: return MediaType.DMF;
-                        case 1763328: return MediaType.DMF_82;
-                        case 1884160: // Irreal size, seen as BIOS with TSR, 23 sectors/track
-                        case 1860608: // Real data size, sum of all sectors
-                            return MediaType.XDF_35;
-                        case 819200:  return MediaType.CBM_35_DD;
-                        case 901120:  return MediaType.CBM_AMIGA_35_DD;
-                        case 1802240: return MediaType.CBM_AMIGA_35_HD;
-                        case 1310720: return MediaType.NEC_35_HD_8;
-                        case 1228800: return MediaType.NEC_35_HD_15;
-                        case 1261568: return MediaType.SHARP_35;
-                        default:
-                        {
-                            AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown 3,5\" disk with {0} bytes",
-                                                       _totalDiskSize);
+            }
+            default:
+            {
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown drive type {1} with {0} bytes",
+                                           _totalDiskSize, _header.DriveType);
 
-                            return MediaType.Unknown;
-                        }
-                    }
-                }
-                case DRIVE_TYPE_8_INCH:
-                {
-                    switch(_totalDiskSize)
-                    {
-                        case 81664:   return MediaType.IBM23FD;
-                        case 242944:  return MediaType.IBM33FD_128;
-                        case 287488:  return MediaType.IBM33FD_256;
-                        case 306432:  return MediaType.IBM33FD_512;
-                        case 499200:  return MediaType.IBM43FD_128;
-                        case 574976:  return MediaType.IBM43FD_256;
-                        case 995072:  return MediaType.IBM53FD_256;
-                        case 1146624: return MediaType.IBM53FD_512;
-                        case 1222400: return MediaType.IBM53FD_1024;
-                        case 256256:
-                            // Same size, with same disk geometry, for DEC RX01, NEC and ECMA, return ECMA
-                            return MediaType.ECMA_54;
-                        case 512512:
-                        {
-                            // DEC disk uses 256 bytes/sector
-                            return _imageInfo.SectorSize == 256 ? MediaType.RX02 : MediaType.ECMA_59;
-
-                            // ECMA disks use 128 bytes/sector
-                        }
-                        case 1261568: return MediaType.NEC_8_DD;
-                        case 1255168: return MediaType.ECMA_69_8;
-                        case 1177344: return MediaType.ECMA_69_15;
-                        case 1021696: return MediaType.ECMA_69_26;
-                        default:
-                        {
-                            AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown 8\" disk with {0} bytes",
-                                                       _totalDiskSize);
-
-                            return MediaType.Unknown;
-                        }
-                    }
-                }
-                default:
-                {
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "Unknown drive type {1} with {0} bytes",
-                                               _totalDiskSize, _header.DriveType);
-
-                    return MediaType.Unknown;
-                }
+                return MediaType.Unknown;
             }
         }
     }
diff --git a/Aaru.Images/TeleDisk/Identify.cs b/Aaru.Images/TeleDisk/Identify.cs
index 1717153ae..d06e9400e 100644
--- a/Aaru.Images/TeleDisk/Identify.cs
+++ b/Aaru.Images/TeleDisk/Identify.cs
@@ -35,71 +35,70 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class TeleDisk
 {
-    public sealed partial class TeleDisk
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            _header = new Header();
-            byte[] headerBytes = new byte[12];
-            Stream stream      = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        _header = new Header();
+        byte[] headerBytes = new byte[12];
+        Stream stream      = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            stream.Read(headerBytes, 0, 12);
+        stream.Read(headerBytes, 0, 12);
 
-            _header.Signature = BitConverter.ToUInt16(headerBytes, 0);
+        _header.Signature = BitConverter.ToUInt16(headerBytes, 0);
 
-            if(_header.Signature != TD_MAGIC &&
-               _header.Signature != TD_ADV_COMP_MAGIC)
-                return false;
+        if(_header.Signature != TD_MAGIC &&
+           _header.Signature != TD_ADV_COMP_MAGIC)
+            return false;
 
-            _header.Sequence      = headerBytes[2];
-            _header.DiskSet       = headerBytes[3];
-            _header.Version       = headerBytes[4];
-            _header.DataRate      = headerBytes[5];
-            _header.DriveType     = headerBytes[6];
-            _header.Stepping      = headerBytes[7];
-            _header.DosAllocation = headerBytes[8];
-            _header.Sides         = headerBytes[9];
-            _header.Crc           = BitConverter.ToUInt16(headerBytes, 10);
+        _header.Sequence      = headerBytes[2];
+        _header.DiskSet       = headerBytes[3];
+        _header.Version       = headerBytes[4];
+        _header.DataRate      = headerBytes[5];
+        _header.DriveType     = headerBytes[6];
+        _header.Stepping      = headerBytes[7];
+        _header.DosAllocation = headerBytes[8];
+        _header.Sides         = headerBytes[9];
+        _header.Crc           = BitConverter.ToUInt16(headerBytes, 10);
 
-            byte[] headerBytesForCrc = new byte[10];
-            Array.Copy(headerBytes, headerBytesForCrc, 10);
-            ushort calculatedHeaderCrc = TeleDiskCrc(0x0000, headerBytesForCrc);
+        byte[] headerBytesForCrc = new byte[10];
+        Array.Copy(headerBytes, headerBytesForCrc, 10);
+        ushort calculatedHeaderCrc = TeleDiskCrc(0x0000, headerBytesForCrc);
 
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.signature = 0x{0:X4}", _header.Signature);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sequence = 0x{0:X2}", _header.Sequence);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.diskSet = 0x{0:X2}", _header.DiskSet);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.version = 0x{0:X2}", _header.Version);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dataRate = 0x{0:X2}", _header.DataRate);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.driveType = 0x{0:X2}", _header.DriveType);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.stepping = 0x{0:X2}", _header.Stepping);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dosAllocation = 0x{0:X2}", _header.DosAllocation);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sides = 0x{0:X2}", _header.Sides);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.crc = 0x{0:X4}", _header.Crc);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "calculated header crc = 0x{0:X4}", calculatedHeaderCrc);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.signature = 0x{0:X4}", _header.Signature);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sequence = 0x{0:X2}", _header.Sequence);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.diskSet = 0x{0:X2}", _header.DiskSet);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.version = 0x{0:X2}", _header.Version);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dataRate = 0x{0:X2}", _header.DataRate);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.driveType = 0x{0:X2}", _header.DriveType);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.stepping = 0x{0:X2}", _header.Stepping);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dosAllocation = 0x{0:X2}", _header.DosAllocation);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sides = 0x{0:X2}", _header.Sides);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.crc = 0x{0:X4}", _header.Crc);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "calculated header crc = 0x{0:X4}", calculatedHeaderCrc);
 
-            // We need more checks as the magic is too simply.
-            // This may deny legal images
+        // We need more checks as the magic is too simply.
+        // This may deny legal images
 
-            // That would be much of a coincidence
-            if(_header.Crc == calculatedHeaderCrc)
-                return true;
+        // That would be much of a coincidence
+        if(_header.Crc == calculatedHeaderCrc)
+            return true;
 
-            if(_header.Sequence != 0x00)
-                return false;
+        if(_header.Sequence != 0x00)
+            return false;
 
-            if(_header.DataRate != DATA_RATE_250_KBPS &&
-               _header.DataRate != DATA_RATE_300_KBPS &&
-               _header.DataRate != DATA_RATE_500_KBPS)
-                return false;
+        if(_header.DataRate != DATA_RATE_250_KBPS &&
+           _header.DataRate != DATA_RATE_300_KBPS &&
+           _header.DataRate != DATA_RATE_500_KBPS)
+            return false;
 
-            return _header.DriveType == DRIVE_TYPE_35_DD  || _header.DriveType == DRIVE_TYPE_35_ED          ||
-                   _header.DriveType == DRIVE_TYPE_35_HD  || _header.DriveType == DRIVE_TYPE_525_DD         ||
-                   _header.DriveType == DRIVE_TYPE_525_HD || _header.DriveType == DRIVE_TYPE_525_HD_DD_DISK ||
-                   _header.DriveType == DRIVE_TYPE_8_INCH;
-        }
+        return _header.DriveType == DRIVE_TYPE_35_DD  || _header.DriveType == DRIVE_TYPE_35_ED          ||
+               _header.DriveType == DRIVE_TYPE_35_HD  || _header.DriveType == DRIVE_TYPE_525_DD         ||
+               _header.DriveType == DRIVE_TYPE_525_HD || _header.DriveType == DRIVE_TYPE_525_HD_DD_DISK ||
+               _header.DriveType == DRIVE_TYPE_8_INCH;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/TeleDisk/Properties.cs b/Aaru.Images/TeleDisk/Properties.cs
index 29f6339ef..a7fbebf9a 100644
--- a/Aaru.Images/TeleDisk/Properties.cs
+++ b/Aaru.Images/TeleDisk/Properties.cs
@@ -35,24 +35,23 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class TeleDisk
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public string Name => "Sydex TeleDisk";
-        /// <inheritdoc />
-        public Guid Id => new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Sydex TeleDisk";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+public sealed partial class TeleDisk
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "Sydex TeleDisk";
+    /// <inheritdoc />
+    public Guid Id => new Guid("0240B7B1-E959-4CDC-B0BD-386D6E467B88");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Sydex TeleDisk";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/TeleDisk/Read.cs b/Aaru.Images/TeleDisk/Read.cs
index ea8134f56..18a63a9df 100644
--- a/Aaru.Images/TeleDisk/Read.cs
+++ b/Aaru.Images/TeleDisk/Read.cs
@@ -38,304 +38,228 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Compression;
 using Aaru.Console;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class TeleDisk
 {
-    public sealed partial class TeleDisk
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        _header = new Header();
+        byte[] headerBytes = new byte[12];
+        _inStream = imageFilter.GetDataForkStream();
+        var stream = new MemoryStream();
+        _inStream.Seek(0, SeekOrigin.Begin);
+
+        _inStream.Read(headerBytes, 0, 12);
+        stream.Write(headerBytes, 0, 12);
+
+        _header.Signature = BitConverter.ToUInt16(headerBytes, 0);
+
+        if(_header.Signature != TD_MAGIC &&
+           _header.Signature != TD_ADV_COMP_MAGIC)
+            return ErrorNumber.InvalidArgument;
+
+        _header.Sequence      = headerBytes[2];
+        _header.DiskSet       = headerBytes[3];
+        _header.Version       = headerBytes[4];
+        _header.DataRate      = headerBytes[5];
+        _header.DriveType     = headerBytes[6];
+        _header.Stepping      = headerBytes[7];
+        _header.DosAllocation = headerBytes[8];
+        _header.Sides         = headerBytes[9];
+        _header.Crc           = BitConverter.ToUInt16(headerBytes, 10);
+
+        _imageInfo.MediaTitle  = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Version     = $"{(_header.Version & 0xF0) >> 4}.{_header.Version & 0x0F}";
+        _imageInfo.Application = _imageInfo.Version;
+
+        byte[] headerBytesForCrc = new byte[10];
+        Array.Copy(headerBytes, headerBytesForCrc, 10);
+        ushort calculatedHeaderCrc = TeleDiskCrc(0x0000, headerBytesForCrc);
+
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.signature = 0x{0:X4}", _header.Signature);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sequence = 0x{0:X2}", _header.Sequence);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.diskSet = 0x{0:X2}", _header.DiskSet);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.version = 0x{0:X2}", _header.Version);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dataRate = 0x{0:X2}", _header.DataRate);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.driveType = 0x{0:X2}", _header.DriveType);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.stepping = 0x{0:X2}", _header.Stepping);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dosAllocation = 0x{0:X2}", _header.DosAllocation);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sides = 0x{0:X2}", _header.Sides);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "header.crc = 0x{0:X4}", _header.Crc);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "calculated header crc = 0x{0:X4}", calculatedHeaderCrc);
+
+        // We need more checks as the magic is too simply.
+        // This may deny legal images
+
+        // That would be much of a coincidence
+        if(_header.Crc != calculatedHeaderCrc)
         {
-            _header = new Header();
-            byte[] headerBytes = new byte[12];
-            _inStream = imageFilter.GetDataForkStream();
-            var stream = new MemoryStream();
-            _inStream.Seek(0, SeekOrigin.Begin);
+            _aDiskCrcHasFailed = true;
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "Calculated CRC does not coincide with stored one.");
+        }
 
-            _inStream.Read(headerBytes, 0, 12);
-            stream.Write(headerBytes, 0, 12);
+        if(_header.Sequence != 0x00)
+            return ErrorNumber.InvalidArgument;
 
-            _header.Signature = BitConverter.ToUInt16(headerBytes, 0);
+        if(_header.DataRate != DATA_RATE_250_KBPS &&
+           _header.DataRate != DATA_RATE_300_KBPS &&
+           _header.DataRate != DATA_RATE_500_KBPS)
+            return ErrorNumber.NotSupported;
 
-            if(_header.Signature != TD_MAGIC &&
-               _header.Signature != TD_ADV_COMP_MAGIC)
-                return ErrorNumber.InvalidArgument;
-
-            _header.Sequence      = headerBytes[2];
-            _header.DiskSet       = headerBytes[3];
-            _header.Version       = headerBytes[4];
-            _header.DataRate      = headerBytes[5];
-            _header.DriveType     = headerBytes[6];
-            _header.Stepping      = headerBytes[7];
-            _header.DosAllocation = headerBytes[8];
-            _header.Sides         = headerBytes[9];
-            _header.Crc           = BitConverter.ToUInt16(headerBytes, 10);
-
-            _imageInfo.MediaTitle  = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Version     = $"{(_header.Version & 0xF0) >> 4}.{_header.Version & 0x0F}";
-            _imageInfo.Application = _imageInfo.Version;
-
-            byte[] headerBytesForCrc = new byte[10];
-            Array.Copy(headerBytes, headerBytesForCrc, 10);
-            ushort calculatedHeaderCrc = TeleDiskCrc(0x0000, headerBytesForCrc);
-
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.signature = 0x{0:X4}", _header.Signature);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sequence = 0x{0:X2}", _header.Sequence);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.diskSet = 0x{0:X2}", _header.DiskSet);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.version = 0x{0:X2}", _header.Version);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dataRate = 0x{0:X2}", _header.DataRate);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.driveType = 0x{0:X2}", _header.DriveType);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.stepping = 0x{0:X2}", _header.Stepping);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.dosAllocation = 0x{0:X2}", _header.DosAllocation);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.sides = 0x{0:X2}", _header.Sides);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "header.crc = 0x{0:X4}", _header.Crc);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "calculated header crc = 0x{0:X4}", calculatedHeaderCrc);
-
-            // We need more checks as the magic is too simply.
-            // This may deny legal images
-
-            // That would be much of a coincidence
-            if(_header.Crc != calculatedHeaderCrc)
-            {
-                _aDiskCrcHasFailed = true;
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "Calculated CRC does not coincide with stored one.");
-            }
-
-            if(_header.Sequence != 0x00)
-                return ErrorNumber.InvalidArgument;
-
-            if(_header.DataRate != DATA_RATE_250_KBPS &&
-               _header.DataRate != DATA_RATE_300_KBPS &&
-               _header.DataRate != DATA_RATE_500_KBPS)
-                return ErrorNumber.NotSupported;
-
-            if(_header.DriveType != DRIVE_TYPE_35_DD          &&
-               _header.DriveType != DRIVE_TYPE_35_ED          &&
-               _header.DriveType != DRIVE_TYPE_35_HD          &&
-               _header.DriveType != DRIVE_TYPE_525_DD         &&
-               _header.DriveType != DRIVE_TYPE_525_HD         &&
-               _header.DriveType != DRIVE_TYPE_525_HD_DD_DISK &&
-               _header.DriveType != DRIVE_TYPE_8_INCH)
-                return ErrorNumber.NotSupported;
-
-            if(_header.Signature == TD_ADV_COMP_MAGIC)
-            {
-                int rd;
-                _inStream.Seek(12, SeekOrigin.Begin);
-                stream.Seek(12, SeekOrigin.Begin);
-                var lzh = new TeleDiskLzh(_inStream);
-
-                do
-                    if((rd = lzh.Decode(out byte[] obuf, BUFSZ)) > 0)
-                        stream.Write(obuf, 0, rd);
-                while(rd == BUFSZ);
-            }
-            else
-            {
-                // Not using Stream.CopyTo() because it's failing with LZIP
-                byte[] copybuf = new byte[_inStream.Length];
-                _inStream.Seek(0, SeekOrigin.Begin);
-                _inStream.Read(copybuf, 0, copybuf.Length);
-                stream.Seek(0, SeekOrigin.Begin);
-                stream.Write(copybuf, 0, copybuf.Length);
-            }
+        if(_header.DriveType != DRIVE_TYPE_35_DD          &&
+           _header.DriveType != DRIVE_TYPE_35_ED          &&
+           _header.DriveType != DRIVE_TYPE_35_HD          &&
+           _header.DriveType != DRIVE_TYPE_525_DD         &&
+           _header.DriveType != DRIVE_TYPE_525_HD         &&
+           _header.DriveType != DRIVE_TYPE_525_HD_DD_DISK &&
+           _header.DriveType != DRIVE_TYPE_8_INCH)
+            return ErrorNumber.NotSupported;
 
+        if(_header.Signature == TD_ADV_COMP_MAGIC)
+        {
+            int rd;
+            _inStream.Seek(12, SeekOrigin.Begin);
             stream.Seek(12, SeekOrigin.Begin);
+            var lzh = new TeleDiskLzh(_inStream);
 
-            _imageInfo.CreationTime = DateTime.MinValue;
+            do
+                if((rd = lzh.Decode(out byte[] obuf, BUFSZ)) > 0)
+                    stream.Write(obuf, 0, rd);
+            while(rd == BUFSZ);
+        }
+        else
+        {
+            // Not using Stream.CopyTo() because it's failing with LZIP
+            byte[] copybuf = new byte[_inStream.Length];
+            _inStream.Seek(0, SeekOrigin.Begin);
+            _inStream.Read(copybuf, 0, copybuf.Length);
+            stream.Seek(0, SeekOrigin.Begin);
+            stream.Write(copybuf, 0, copybuf.Length);
+        }
 
-            if((_header.Stepping & COMMENT_BLOCK_PRESENT) == COMMENT_BLOCK_PRESENT)
+        stream.Seek(12, SeekOrigin.Begin);
+
+        _imageInfo.CreationTime = DateTime.MinValue;
+
+        if((_header.Stepping & COMMENT_BLOCK_PRESENT) == COMMENT_BLOCK_PRESENT)
+        {
+            _commentHeader = new CommentBlockHeader();
+
+            byte[] commentHeaderBytes = new byte[10];
+
+            stream.Read(commentHeaderBytes, 0, 10);
+            _commentHeader.Crc    = BitConverter.ToUInt16(commentHeaderBytes, 0);
+            _commentHeader.Length = BitConverter.ToUInt16(commentHeaderBytes, 2);
+            _commentHeader.Year   = commentHeaderBytes[4];
+            _commentHeader.Month  = commentHeaderBytes[5];
+            _commentHeader.Day    = commentHeaderBytes[6];
+            _commentHeader.Hour   = commentHeaderBytes[7];
+            _commentHeader.Minute = commentHeaderBytes[8];
+            _commentHeader.Second = commentHeaderBytes[9];
+
+            _commentBlock = new byte[_commentHeader.Length];
+            stream.Read(_commentBlock, 0, _commentHeader.Length);
+
+            byte[] commentBlockForCrc = new byte[_commentHeader.Length + 8];
+            Array.Copy(commentHeaderBytes, 2, commentBlockForCrc, 0, 8);
+            Array.Copy(_commentBlock, 0, commentBlockForCrc, 8, _commentHeader.Length);
+
+            ushort cmtcrc = TeleDiskCrc(0, commentBlockForCrc);
+
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "Comment header");
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.crc = 0x{0:X4}", _commentHeader.Crc);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tCalculated CRC = 0x{0:X4}", cmtcrc);
+
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.length = {0} bytes",
+                                       _commentHeader.Length);
+
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.year = {0}", _commentHeader.Year);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.month = {0}", _commentHeader.Month);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.day = {0}", _commentHeader.Day);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.hour = {0}", _commentHeader.Hour);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.minute = {0}", _commentHeader.Minute);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.second = {0}", _commentHeader.Second);
+
+            _aDiskCrcHasFailed |= cmtcrc != _commentHeader.Crc;
+
+            for(int i = 0; i < _commentBlock.Length; i++)
+
+                // Replace NULLs, used by TeleDisk as newline markers, with UNIX newline marker
+                if(_commentBlock[i] == 0x00)
+                    _commentBlock[i] = 0x0A;
+
+            _imageInfo.Comments = Encoding.ASCII.GetString(_commentBlock);
+
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "Comment");
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "{0}", _imageInfo.Comments);
+
+            _imageInfo.CreationTime = new DateTime(_commentHeader.Year + 1900, _commentHeader.Month + 1,
+                                                   _commentHeader.Day, _commentHeader.Hour, _commentHeader.Minute,
+                                                   _commentHeader.Second, DateTimeKind.Unspecified);
+        }
+
+        if(_imageInfo.CreationTime == DateTime.MinValue)
+            _imageInfo.CreationTime = imageFilter.CreationTime;
+
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "Image created on {0}", _imageInfo.CreationTime);
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "Image modified on {0}", _imageInfo.LastModificationTime);
+
+        AaruConsole.DebugWriteLine("TeleDisk plugin", "Parsing image");
+
+        _totalDiskSize       = 0;
+        _imageInfo.ImageSize = 0;
+
+        int  totalCylinders = -1;
+        int  totalHeads     = -1;
+        int  maxSector      = -1;
+        int  totalSectors   = 0;
+        long currentPos     = stream.Position;
+        _imageInfo.SectorSize      = uint.MaxValue;
+        _imageInfo.SectorsPerTrack = uint.MaxValue;
+
+        // Count cylinders
+        while(true)
+        {
+            var teleDiskTrack = new TrackHeader
             {
-                _commentHeader = new CommentBlockHeader();
+                Sectors  = (byte)stream.ReadByte(),
+                Cylinder = (byte)stream.ReadByte(),
+                Head     = (byte)stream.ReadByte(),
+                Crc      = (byte)stream.ReadByte()
+            };
 
-                byte[] commentHeaderBytes = new byte[10];
+            if(teleDiskTrack.Cylinder > totalCylinders)
+                totalCylinders = teleDiskTrack.Cylinder;
 
-                stream.Read(commentHeaderBytes, 0, 10);
-                _commentHeader.Crc    = BitConverter.ToUInt16(commentHeaderBytes, 0);
-                _commentHeader.Length = BitConverter.ToUInt16(commentHeaderBytes, 2);
-                _commentHeader.Year   = commentHeaderBytes[4];
-                _commentHeader.Month  = commentHeaderBytes[5];
-                _commentHeader.Day    = commentHeaderBytes[6];
-                _commentHeader.Hour   = commentHeaderBytes[7];
-                _commentHeader.Minute = commentHeaderBytes[8];
-                _commentHeader.Second = commentHeaderBytes[9];
+            if(teleDiskTrack.Head > totalHeads)
+                totalHeads = teleDiskTrack.Head;
 
-                _commentBlock = new byte[_commentHeader.Length];
-                stream.Read(_commentBlock, 0, _commentHeader.Length);
+            if(teleDiskTrack.Sectors == 0xFF) // End of disk image
+                break;
 
-                byte[] commentBlockForCrc = new byte[_commentHeader.Length + 8];
-                Array.Copy(commentHeaderBytes, 2, commentBlockForCrc, 0, 8);
-                Array.Copy(_commentBlock, 0, commentBlockForCrc, 8, _commentHeader.Length);
-
-                ushort cmtcrc = TeleDiskCrc(0, commentBlockForCrc);
-
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "Comment header");
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.crc = 0x{0:X4}", _commentHeader.Crc);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tCalculated CRC = 0x{0:X4}", cmtcrc);
-
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.length = {0} bytes",
-                                           _commentHeader.Length);
-
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.year = {0}", _commentHeader.Year);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.month = {0}", _commentHeader.Month);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.day = {0}", _commentHeader.Day);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.hour = {0}", _commentHeader.Hour);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.minute = {0}", _commentHeader.Minute);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tcommentheader.second = {0}", _commentHeader.Second);
-
-                _aDiskCrcHasFailed |= cmtcrc != _commentHeader.Crc;
-
-                for(int i = 0; i < _commentBlock.Length; i++)
-
-                    // Replace NULLs, used by TeleDisk as newline markers, with UNIX newline marker
-                    if(_commentBlock[i] == 0x00)
-                        _commentBlock[i] = 0x0A;
-
-                _imageInfo.Comments = Encoding.ASCII.GetString(_commentBlock);
-
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "Comment");
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "{0}", _imageInfo.Comments);
-
-                _imageInfo.CreationTime = new DateTime(_commentHeader.Year + 1900, _commentHeader.Month + 1,
-                                                       _commentHeader.Day, _commentHeader.Hour, _commentHeader.Minute,
-                                                       _commentHeader.Second, DateTimeKind.Unspecified);
-            }
-
-            if(_imageInfo.CreationTime == DateTime.MinValue)
-                _imageInfo.CreationTime = imageFilter.CreationTime;
-
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "Image created on {0}", _imageInfo.CreationTime);
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "Image modified on {0}", _imageInfo.LastModificationTime);
-
-            AaruConsole.DebugWriteLine("TeleDisk plugin", "Parsing image");
-
-            _totalDiskSize       = 0;
-            _imageInfo.ImageSize = 0;
-
-            int  totalCylinders = -1;
-            int  totalHeads     = -1;
-            int  maxSector      = -1;
-            int  totalSectors   = 0;
-            long currentPos     = stream.Position;
-            _imageInfo.SectorSize      = uint.MaxValue;
-            _imageInfo.SectorsPerTrack = uint.MaxValue;
-
-            // Count cylinders
-            while(true)
+            for(byte processedSectors = 0; processedSectors < teleDiskTrack.Sectors; processedSectors++)
             {
-                var teleDiskTrack = new TrackHeader
+                var    teleDiskSector = new SectorHeader();
+                var    teleDiskData   = new DataHeader();
+                byte[] dataSizeBytes  = new byte[2];
+
+                teleDiskSector.Cylinder     = (byte)stream.ReadByte();
+                teleDiskSector.Head         = (byte)stream.ReadByte();
+                teleDiskSector.SectorNumber = (byte)stream.ReadByte();
+                teleDiskSector.SectorSize   = (byte)stream.ReadByte();
+                teleDiskSector.Flags        = (byte)stream.ReadByte();
+                teleDiskSector.Crc          = (byte)stream.ReadByte();
+
+                if(teleDiskSector.SectorNumber > maxSector)
+                    maxSector = teleDiskSector.SectorNumber;
+
+                if((teleDiskSector.Flags & FLAGS_SECTOR_DATALESS) != FLAGS_SECTOR_DATALESS &&
+                   (teleDiskSector.Flags & FLAGS_SECTOR_SKIPPED)  != FLAGS_SECTOR_SKIPPED)
                 {
-                    Sectors  = (byte)stream.ReadByte(),
-                    Cylinder = (byte)stream.ReadByte(),
-                    Head     = (byte)stream.ReadByte(),
-                    Crc      = (byte)stream.ReadByte()
-                };
-
-                if(teleDiskTrack.Cylinder > totalCylinders)
-                    totalCylinders = teleDiskTrack.Cylinder;
-
-                if(teleDiskTrack.Head > totalHeads)
-                    totalHeads = teleDiskTrack.Head;
-
-                if(teleDiskTrack.Sectors == 0xFF) // End of disk image
-                    break;
-
-                for(byte processedSectors = 0; processedSectors < teleDiskTrack.Sectors; processedSectors++)
-                {
-                    var    teleDiskSector = new SectorHeader();
-                    var    teleDiskData   = new DataHeader();
-                    byte[] dataSizeBytes  = new byte[2];
-
-                    teleDiskSector.Cylinder     = (byte)stream.ReadByte();
-                    teleDiskSector.Head         = (byte)stream.ReadByte();
-                    teleDiskSector.SectorNumber = (byte)stream.ReadByte();
-                    teleDiskSector.SectorSize   = (byte)stream.ReadByte();
-                    teleDiskSector.Flags        = (byte)stream.ReadByte();
-                    teleDiskSector.Crc          = (byte)stream.ReadByte();
-
-                    if(teleDiskSector.SectorNumber > maxSector)
-                        maxSector = teleDiskSector.SectorNumber;
-
-                    if((teleDiskSector.Flags & FLAGS_SECTOR_DATALESS) != FLAGS_SECTOR_DATALESS &&
-                       (teleDiskSector.Flags & FLAGS_SECTOR_SKIPPED)  != FLAGS_SECTOR_SKIPPED)
-                    {
-                        stream.Read(dataSizeBytes, 0, 2);
-                        teleDiskData.DataSize = BitConverter.ToUInt16(dataSizeBytes, 0);
-                        teleDiskData.DataSize--; // Sydex decided to including dataEncoding byte as part of it
-                        teleDiskData.DataEncoding = (byte)stream.ReadByte();
-                        byte[] data = new byte[teleDiskData.DataSize];
-                        stream.Read(data, 0, teleDiskData.DataSize);
-                    }
-
-                    if(128 << teleDiskSector.SectorSize < _imageInfo.SectorSize)
-                        _imageInfo.SectorSize = (uint)(128 << teleDiskSector.SectorSize);
-
-                    totalSectors++;
-                }
-            }
-
-            totalCylinders++;
-            totalHeads++;
-
-            if(totalCylinders <= 0 ||
-               totalHeads     <= 0)
-            {
-                AaruConsole.ErrorWriteLine("No cylinders or heads found");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            bool hasLeadOutOnHead0 = false;
-            bool hasLeadOutOnHead1 = false;
-            _imageInfo.Cylinders = (ushort)totalCylinders;
-            _imageInfo.Heads     = (byte)totalHeads;
-
-            // Count sectors per track
-            stream.Seek(currentPos, SeekOrigin.Begin);
-
-            while(true)
-            {
-                var teleDiskTrack = new TrackHeader
-                {
-                    Sectors  = (byte)stream.ReadByte(),
-                    Cylinder = (byte)stream.ReadByte(),
-                    Head     = (byte)stream.ReadByte(),
-                    Crc      = (byte)stream.ReadByte()
-                };
-
-                if(teleDiskTrack.Sectors == 0xFF) // End of disk image
-                    break;
-
-                if(teleDiskTrack.Sectors < _imageInfo.SectorsPerTrack)
-                    if(teleDiskTrack.Cylinder + 1 == totalCylinders)
-                    {
-                        hasLeadOutOnHead0 |= teleDiskTrack.Head == 0;
-                        hasLeadOutOnHead1 |= teleDiskTrack.Head == 1;
-
-                        if(_imageInfo.Cylinders == totalCylinders)
-                            _imageInfo.Cylinders--;
-                    }
-                    else
-                        _imageInfo.SectorsPerTrack = teleDiskTrack.Sectors;
-
-                for(byte processedSectors = 0; processedSectors < teleDiskTrack.Sectors; processedSectors++)
-                {
-                    var    teleDiskSector = new SectorHeader();
-                    var    teleDiskData   = new DataHeader();
-                    byte[] dataSizeBytes  = new byte[2];
-
-                    teleDiskSector.Cylinder     = (byte)stream.ReadByte();
-                    teleDiskSector.Head         = (byte)stream.ReadByte();
-                    teleDiskSector.SectorNumber = (byte)stream.ReadByte();
-                    teleDiskSector.SectorSize   = (byte)stream.ReadByte();
-                    teleDiskSector.Flags        = (byte)stream.ReadByte();
-                    teleDiskSector.Crc          = (byte)stream.ReadByte();
-
-                    if((teleDiskSector.Flags & FLAGS_SECTOR_DATALESS) == FLAGS_SECTOR_DATALESS ||
-                       (teleDiskSector.Flags & FLAGS_SECTOR_SKIPPED)  == FLAGS_SECTOR_SKIPPED)
-                        continue;
-
                     stream.Read(dataSizeBytes, 0, 2);
                     teleDiskData.DataSize = BitConverter.ToUInt16(dataSizeBytes, 0);
                     teleDiskData.DataSize--; // Sydex decided to including dataEncoding byte as part of it
@@ -343,266 +267,341 @@ namespace Aaru.DiscImages
                     byte[] data = new byte[teleDiskData.DataSize];
                     stream.Read(data, 0, teleDiskData.DataSize);
                 }
+
+                if(128 << teleDiskSector.SectorSize < _imageInfo.SectorSize)
+                    _imageInfo.SectorSize = (uint)(128 << teleDiskSector.SectorSize);
+
+                totalSectors++;
             }
+        }
 
-            _sectorsData = new byte[totalCylinders][][][];
+        totalCylinders++;
+        totalHeads++;
 
-            // Total sectors per track
-            uint[][] spts = new uint[totalCylinders][];
+        if(totalCylinders <= 0 ||
+           totalHeads     <= 0)
+        {
+            AaruConsole.ErrorWriteLine("No cylinders or heads found");
 
-            AaruConsole.DebugWriteLine("TeleDisk plugin",
-                                       "Found {0} cylinders and {1} heads with a maximum sector number of {2}",
-                                       totalCylinders, totalHeads, maxSector);
+            return ErrorNumber.InvalidArgument;
+        }
 
-            // Create heads
-            for(int i = 0; i < totalCylinders; i++)
+        bool hasLeadOutOnHead0 = false;
+        bool hasLeadOutOnHead1 = false;
+        _imageInfo.Cylinders = (ushort)totalCylinders;
+        _imageInfo.Heads     = (byte)totalHeads;
+
+        // Count sectors per track
+        stream.Seek(currentPos, SeekOrigin.Begin);
+
+        while(true)
+        {
+            var teleDiskTrack = new TrackHeader
             {
-                _sectorsData[i] = new byte[totalHeads][][];
-                spts[i]         = new uint[totalHeads];
+                Sectors  = (byte)stream.ReadByte(),
+                Cylinder = (byte)stream.ReadByte(),
+                Head     = (byte)stream.ReadByte(),
+                Crc      = (byte)stream.ReadByte()
+            };
 
-                for(int j = 0; j < totalHeads; j++)
-                    _sectorsData[i][j] = new byte[maxSector + 1][];
-            }
+            if(teleDiskTrack.Sectors == 0xFF) // End of disk image
+                break;
 
-            // Decode the image
-            stream.Seek(currentPos, SeekOrigin.Begin);
-
-            while(true)
-            {
-                var    teleDiskTrack = new TrackHeader();
-                byte[] tdTrackForCrc = new byte[3];
-
-                teleDiskTrack.Sectors  = (byte)stream.ReadByte();
-                teleDiskTrack.Cylinder = (byte)stream.ReadByte();
-                teleDiskTrack.Head     = (byte)stream.ReadByte();
-                teleDiskTrack.Crc      = (byte)stream.ReadByte();
-
-                tdTrackForCrc[0] = teleDiskTrack.Sectors;
-                tdTrackForCrc[1] = teleDiskTrack.Cylinder;
-                tdTrackForCrc[2] = teleDiskTrack.Head;
-
-                byte tdTrackCalculatedCrc = (byte)(TeleDiskCrc(0, tdTrackForCrc) & 0xFF);
-
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "Track follows");
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack cylinder: {0}\t", teleDiskTrack.Cylinder);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack head: {0}\t", teleDiskTrack.Head);
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tSectors in track: {0}\t", teleDiskTrack.Sectors);
-
-                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack header CRC: 0x{0:X2} (calculated 0x{1:X2})\t",
-                                           teleDiskTrack.Crc, tdTrackCalculatedCrc);
-
-                _aDiskCrcHasFailed |= tdTrackCalculatedCrc != teleDiskTrack.Crc;
-
-                if(teleDiskTrack.Sectors == 0xFF) // End of disk image
+            if(teleDiskTrack.Sectors < _imageInfo.SectorsPerTrack)
+                if(teleDiskTrack.Cylinder + 1 == totalCylinders)
                 {
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "End of disk image arrived");
+                    hasLeadOutOnHead0 |= teleDiskTrack.Head == 0;
+                    hasLeadOutOnHead1 |= teleDiskTrack.Head == 1;
 
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "Total of {0} data sectors, for {1} bytes",
-                                               totalSectors, _totalDiskSize);
-
-                    break;
+                    if(_imageInfo.Cylinders == totalCylinders)
+                        _imageInfo.Cylinders--;
                 }
+                else
+                    _imageInfo.SectorsPerTrack = teleDiskTrack.Sectors;
 
-                for(byte processedSectors = 0; processedSectors < teleDiskTrack.Sectors; processedSectors++)
+            for(byte processedSectors = 0; processedSectors < teleDiskTrack.Sectors; processedSectors++)
+            {
+                var    teleDiskSector = new SectorHeader();
+                var    teleDiskData   = new DataHeader();
+                byte[] dataSizeBytes  = new byte[2];
+
+                teleDiskSector.Cylinder     = (byte)stream.ReadByte();
+                teleDiskSector.Head         = (byte)stream.ReadByte();
+                teleDiskSector.SectorNumber = (byte)stream.ReadByte();
+                teleDiskSector.SectorSize   = (byte)stream.ReadByte();
+                teleDiskSector.Flags        = (byte)stream.ReadByte();
+                teleDiskSector.Crc          = (byte)stream.ReadByte();
+
+                if((teleDiskSector.Flags & FLAGS_SECTOR_DATALESS) == FLAGS_SECTOR_DATALESS ||
+                   (teleDiskSector.Flags & FLAGS_SECTOR_SKIPPED)  == FLAGS_SECTOR_SKIPPED)
+                    continue;
+
+                stream.Read(dataSizeBytes, 0, 2);
+                teleDiskData.DataSize = BitConverter.ToUInt16(dataSizeBytes, 0);
+                teleDiskData.DataSize--; // Sydex decided to including dataEncoding byte as part of it
+                teleDiskData.DataEncoding = (byte)stream.ReadByte();
+                byte[] data = new byte[teleDiskData.DataSize];
+                stream.Read(data, 0, teleDiskData.DataSize);
+            }
+        }
+
+        _sectorsData = new byte[totalCylinders][][][];
+
+        // Total sectors per track
+        uint[][] spts = new uint[totalCylinders][];
+
+        AaruConsole.DebugWriteLine("TeleDisk plugin",
+                                   "Found {0} cylinders and {1} heads with a maximum sector number of {2}",
+                                   totalCylinders, totalHeads, maxSector);
+
+        // Create heads
+        for(int i = 0; i < totalCylinders; i++)
+        {
+            _sectorsData[i] = new byte[totalHeads][][];
+            spts[i]         = new uint[totalHeads];
+
+            for(int j = 0; j < totalHeads; j++)
+                _sectorsData[i][j] = new byte[maxSector + 1][];
+        }
+
+        // Decode the image
+        stream.Seek(currentPos, SeekOrigin.Begin);
+
+        while(true)
+        {
+            var    teleDiskTrack = new TrackHeader();
+            byte[] tdTrackForCrc = new byte[3];
+
+            teleDiskTrack.Sectors  = (byte)stream.ReadByte();
+            teleDiskTrack.Cylinder = (byte)stream.ReadByte();
+            teleDiskTrack.Head     = (byte)stream.ReadByte();
+            teleDiskTrack.Crc      = (byte)stream.ReadByte();
+
+            tdTrackForCrc[0] = teleDiskTrack.Sectors;
+            tdTrackForCrc[1] = teleDiskTrack.Cylinder;
+            tdTrackForCrc[2] = teleDiskTrack.Head;
+
+            byte tdTrackCalculatedCrc = (byte)(TeleDiskCrc(0, tdTrackForCrc) & 0xFF);
+
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "Track follows");
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack cylinder: {0}\t", teleDiskTrack.Cylinder);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack head: {0}\t", teleDiskTrack.Head);
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tSectors in track: {0}\t", teleDiskTrack.Sectors);
+
+            AaruConsole.DebugWriteLine("TeleDisk plugin", "\tTrack header CRC: 0x{0:X2} (calculated 0x{1:X2})\t",
+                                       teleDiskTrack.Crc, tdTrackCalculatedCrc);
+
+            _aDiskCrcHasFailed |= tdTrackCalculatedCrc != teleDiskTrack.Crc;
+
+            if(teleDiskTrack.Sectors == 0xFF) // End of disk image
+            {
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "End of disk image arrived");
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "Total of {0} data sectors, for {1} bytes",
+                                           totalSectors, _totalDiskSize);
+
+                break;
+            }
+
+            for(byte processedSectors = 0; processedSectors < teleDiskTrack.Sectors; processedSectors++)
+            {
+                var    teleDiskSector = new SectorHeader();
+                var    teleDiskData   = new DataHeader();
+                byte[] dataSizeBytes  = new byte[2];
+                byte[] decodedData;
+
+                teleDiskSector.Cylinder     = (byte)stream.ReadByte();
+                teleDiskSector.Head         = (byte)stream.ReadByte();
+                teleDiskSector.SectorNumber = (byte)stream.ReadByte();
+                teleDiskSector.SectorSize   = (byte)stream.ReadByte();
+                teleDiskSector.Flags        = (byte)stream.ReadByte();
+                teleDiskSector.Crc          = (byte)stream.ReadByte();
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\tSector follows");
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark cylinder: {0}",
+                                           teleDiskSector.Cylinder);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark head: {0}", teleDiskSector.Head);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark sector number: {0}",
+                                           teleDiskSector.SectorNumber);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector size: {0}", teleDiskSector.SectorSize);
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector flags: 0x{0:X2}", teleDiskSector.Flags);
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector CRC (plus headers): 0x{0:X2}",
+                                           teleDiskSector.Crc);
+
+                uint lba = (uint)((teleDiskSector.Cylinder * _header.Sides * _imageInfo.SectorsPerTrack) +
+                                  (teleDiskSector.Head     * _imageInfo.SectorsPerTrack)                 +
+                                  (teleDiskSector.SectorNumber - 1));
+
+                if((teleDiskSector.Flags & FLAGS_SECTOR_DATALESS) != FLAGS_SECTOR_DATALESS &&
+                   (teleDiskSector.Flags & FLAGS_SECTOR_SKIPPED)  != FLAGS_SECTOR_SKIPPED)
                 {
-                    var    teleDiskSector = new SectorHeader();
-                    var    teleDiskData   = new DataHeader();
-                    byte[] dataSizeBytes  = new byte[2];
-                    byte[] decodedData;
+                    stream.Read(dataSizeBytes, 0, 2);
+                    teleDiskData.DataSize = BitConverter.ToUInt16(dataSizeBytes, 0);
+                    teleDiskData.DataSize--; // Sydex decided to including dataEncoding byte as part of it
+                    _imageInfo.ImageSize      += teleDiskData.DataSize;
+                    teleDiskData.DataEncoding =  (byte)stream.ReadByte();
+                    byte[] data = new byte[teleDiskData.DataSize];
+                    stream.Read(data, 0, teleDiskData.DataSize);
 
-                    teleDiskSector.Cylinder     = (byte)stream.ReadByte();
-                    teleDiskSector.Head         = (byte)stream.ReadByte();
-                    teleDiskSector.SectorNumber = (byte)stream.ReadByte();
-                    teleDiskSector.SectorSize   = (byte)stream.ReadByte();
-                    teleDiskSector.Flags        = (byte)stream.ReadByte();
-                    teleDiskSector.Crc          = (byte)stream.ReadByte();
+                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tData size (in-image): {0}",
+                                               teleDiskData.DataSize);
 
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\tSector follows");
+                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tData encoding: 0x{0:X2}",
+                                               teleDiskData.DataEncoding);
 
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark cylinder: {0}",
-                                               teleDiskSector.Cylinder);
+                    ErrorNumber errno = DecodeTeleDiskData(teleDiskSector.SectorSize, teleDiskData.DataEncoding,
+                                                           data, out decodedData);
 
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark head: {0}", teleDiskSector.Head);
+                    if(errno != ErrorNumber.NoError)
+                        return errno;
 
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tAddressMark sector number: {0}",
-                                               teleDiskSector.SectorNumber);
+                    byte tdSectorCalculatedCrc = (byte)(TeleDiskCrc(0, decodedData) & 0xFF);
 
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector size: {0}", teleDiskSector.SectorSize);
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector flags: 0x{0:X2}", teleDiskSector.Flags);
-
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tSector CRC (plus headers): 0x{0:X2}",
-                                               teleDiskSector.Crc);
-
-                    uint lba = (uint)((teleDiskSector.Cylinder * _header.Sides * _imageInfo.SectorsPerTrack) +
-                                      (teleDiskSector.Head     * _imageInfo.SectorsPerTrack)                 +
-                                      (teleDiskSector.SectorNumber - 1));
-
-                    if((teleDiskSector.Flags & FLAGS_SECTOR_DATALESS) != FLAGS_SECTOR_DATALESS &&
-                       (teleDiskSector.Flags & FLAGS_SECTOR_SKIPPED)  != FLAGS_SECTOR_SKIPPED)
+                    if(tdSectorCalculatedCrc != teleDiskSector.Crc)
                     {
-                        stream.Read(dataSizeBytes, 0, 2);
-                        teleDiskData.DataSize = BitConverter.ToUInt16(dataSizeBytes, 0);
-                        teleDiskData.DataSize--; // Sydex decided to including dataEncoding byte as part of it
-                        _imageInfo.ImageSize      += teleDiskData.DataSize;
-                        teleDiskData.DataEncoding =  (byte)stream.ReadByte();
-                        byte[] data = new byte[teleDiskData.DataSize];
-                        stream.Read(data, 0, teleDiskData.DataSize);
-
-                        AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tData size (in-image): {0}",
-                                                   teleDiskData.DataSize);
-
-                        AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tData encoding: 0x{0:X2}",
-                                                   teleDiskData.DataEncoding);
-
-                        ErrorNumber errno = DecodeTeleDiskData(teleDiskSector.SectorSize, teleDiskData.DataEncoding,
-                                                               data, out decodedData);
-
-                        if(errno != ErrorNumber.NoError)
-                            return errno;
-
-                        byte tdSectorCalculatedCrc = (byte)(TeleDiskCrc(0, decodedData) & 0xFF);
-
-                        if(tdSectorCalculatedCrc != teleDiskSector.Crc)
-                        {
-                            AaruConsole.DebugWriteLine("TeleDisk plugin",
-                                                       "Sector {0}:{3}:{4} calculated CRC 0x{1:X2} differs from stored CRC 0x{2:X2}",
-                                                       teleDiskTrack.Cylinder, tdSectorCalculatedCrc,
-                                                       teleDiskSector.Crc, teleDiskTrack.Cylinder,
-                                                       teleDiskSector.SectorNumber);
-
-                            if((teleDiskSector.Flags & FLAGS_SECTOR_NO_ID) != FLAGS_SECTOR_NO_ID)
-                                _sectorsWhereCrcHasFailed.Add(lba);
-                        }
-                    }
-                    else
-                        decodedData = new byte[128 << teleDiskSector.SectorSize];
-
-                    AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tLBA: {0}", lba);
-
-                    if((teleDiskSector.Flags & FLAGS_SECTOR_NO_ID) == FLAGS_SECTOR_NO_ID)
-                        continue;
-
-                    if(_sectorsData[teleDiskTrack.Cylinder][teleDiskTrack.Head][teleDiskSector.SectorNumber] != null)
                         AaruConsole.DebugWriteLine("TeleDisk plugin",
-                                                   (teleDiskSector.Flags & FLAGS_SECTOR_DUPLICATE) ==
-                                                   FLAGS_SECTOR_DUPLICATE
-                                                       ? "\t\tSector {0} on cylinder {1} head {2} is duplicate, and marked so"
-                                                       : "\t\tSector {0} on cylinder {1} head {2} is duplicate, but is not marked so",
-                                                   teleDiskSector.SectorNumber, teleDiskSector.Cylinder,
-                                                   teleDiskSector.Head);
-                    else
-                    {
-                        _sectorsData[teleDiskTrack.Cylinder][teleDiskTrack.Head][teleDiskSector.SectorNumber] =
-                            decodedData;
+                                                   "Sector {0}:{3}:{4} calculated CRC 0x{1:X2} differs from stored CRC 0x{2:X2}",
+                                                   teleDiskTrack.Cylinder, tdSectorCalculatedCrc,
+                                                   teleDiskSector.Crc, teleDiskTrack.Cylinder,
+                                                   teleDiskSector.SectorNumber);
 
-                        _totalDiskSize += (uint)decodedData.Length;
+                        if((teleDiskSector.Flags & FLAGS_SECTOR_NO_ID) != FLAGS_SECTOR_NO_ID)
+                            _sectorsWhereCrcHasFailed.Add(lba);
                     }
                 }
+                else
+                    decodedData = new byte[128 << teleDiskSector.SectorSize];
+
+                AaruConsole.DebugWriteLine("TeleDisk plugin", "\t\tLBA: {0}", lba);
+
+                if((teleDiskSector.Flags & FLAGS_SECTOR_NO_ID) == FLAGS_SECTOR_NO_ID)
+                    continue;
+
+                if(_sectorsData[teleDiskTrack.Cylinder][teleDiskTrack.Head][teleDiskSector.SectorNumber] != null)
+                    AaruConsole.DebugWriteLine("TeleDisk plugin",
+                                               (teleDiskSector.Flags & FLAGS_SECTOR_DUPLICATE) ==
+                                               FLAGS_SECTOR_DUPLICATE
+                                                   ? "\t\tSector {0} on cylinder {1} head {2} is duplicate, and marked so"
+                                                   : "\t\tSector {0} on cylinder {1} head {2} is duplicate, but is not marked so",
+                                               teleDiskSector.SectorNumber, teleDiskSector.Cylinder,
+                                               teleDiskSector.Head);
+                else
+                {
+                    _sectorsData[teleDiskTrack.Cylinder][teleDiskTrack.Head][teleDiskSector.SectorNumber] =
+                        decodedData;
+
+                    _totalDiskSize += (uint)decodedData.Length;
+                }
             }
-
-            var leadOutMs = new MemoryStream();
-
-            if(hasLeadOutOnHead0)
-                for(int i = 0; i < _sectorsData[totalCylinders - 1][0].Length; i++)
-                    if(_sectorsData[totalCylinders - 1][0][i] != null)
-                        leadOutMs.Write(_sectorsData[totalCylinders - 1][0][i], 0,
-                                        _sectorsData[totalCylinders - 1][0][i].Length);
-
-            if(hasLeadOutOnHead1)
-                for(int i = 0; i < _sectorsData[totalCylinders - 1][1].Length; i++)
-                    if(_sectorsData[totalCylinders - 1][1][i] != null)
-                        leadOutMs.Write(_sectorsData[totalCylinders - 1][1][i], 0,
-                                        _sectorsData[totalCylinders - 1][1][i].Length);
-
-            if(leadOutMs.Length != 0)
-            {
-                _leadOut = leadOutMs.ToArray();
-                _imageInfo.ReadableMediaTags.Add(MediaTagType.Floppy_LeadOut);
-            }
-
-            _imageInfo.Sectors   = _imageInfo.Cylinders * _imageInfo.Heads * _imageInfo.SectorsPerTrack;
-            _imageInfo.MediaType = DecodeTeleDiskDiskType();
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-            AaruConsole.VerboseWriteLine("TeleDisk image contains a disk of type {0}", _imageInfo.MediaType);
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                AaruConsole.VerboseWriteLine("TeleDisk comments: {0}", _imageInfo.Comments);
-
-            _inStream.Dispose();
-            stream.Dispose();
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        var leadOutMs = new MemoryStream();
+
+        if(hasLeadOutOnHead0)
+            for(int i = 0; i < _sectorsData[totalCylinders - 1][0].Length; i++)
+                if(_sectorsData[totalCylinders - 1][0][i] != null)
+                    leadOutMs.Write(_sectorsData[totalCylinders - 1][0][i], 0,
+                                    _sectorsData[totalCylinders - 1][0][i].Length);
+
+        if(hasLeadOutOnHead1)
+            for(int i = 0; i < _sectorsData[totalCylinders - 1][1].Length; i++)
+                if(_sectorsData[totalCylinders - 1][1][i] != null)
+                    leadOutMs.Write(_sectorsData[totalCylinders - 1][1][i], 0,
+                                    _sectorsData[totalCylinders - 1][1][i].Length);
+
+        if(leadOutMs.Length != 0)
         {
-            buffer                                    = null;
-            (ushort cylinder, byte head, byte sector) = LbaToChs(sectorAddress);
-
-            if(cylinder >= _sectorsData.Length)
-                return ErrorNumber.SectorNotFound;
-
-            if(head >= _sectorsData[cylinder].Length)
-                return ErrorNumber.SectorNotFound;
-
-            if(sector > _sectorsData[cylinder][head].Length)
-                return ErrorNumber.SectorNotFound;
-
-            buffer = _sectorsData[cylinder][head][sector];
-
-            return ErrorNumber.NoError;
+            _leadOut = leadOutMs.ToArray();
+            _imageInfo.ReadableMediaTags.Add(MediaTagType.Floppy_LeadOut);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        _imageInfo.Sectors   = _imageInfo.Cylinders * _imageInfo.Heads * _imageInfo.SectorsPerTrack;
+        _imageInfo.MediaType = DecodeTeleDiskDiskType();
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
+        AaruConsole.VerboseWriteLine("TeleDisk image contains a disk of type {0}", _imageInfo.MediaType);
+
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+            AaruConsole.VerboseWriteLine("TeleDisk comments: {0}", _imageInfo.Comments);
+
+        _inStream.Dispose();
+        stream.Dispose();
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer                                    = null;
+        (ushort cylinder, byte head, byte sector) = LbaToChs(sectorAddress);
+
+        if(cylinder >= _sectorsData.Length)
+            return ErrorNumber.SectorNotFound;
+
+        if(head >= _sectorsData[cylinder].Length)
+            return ErrorNumber.SectorNotFound;
+
+        if(sector > _sectorsData[cylinder][head].Length)
+            return ErrorNumber.SectorNotFound;
+
+        buffer = _sectorsData[cylinder][head][sector];
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            ms.Write(sector, 0, sector.Length);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        buffer = ms.ToArray();
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        return ErrorNumber.NoError;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-            if(tag != MediaTagType.Floppy_LeadOut)
-                return ErrorNumber.NotSupported;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
 
-            buffer = _leadOut?.Clone() as byte[];
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
-        }
+        if(tag != MediaTagType.Floppy_LeadOut)
+            return ErrorNumber.NotSupported;
+
+        buffer = _leadOut?.Clone() as byte[];
+
+        return buffer != null ? ErrorNumber.NoError : ErrorNumber.NoData;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/TeleDisk/Structs.cs b/Aaru.Images/TeleDisk/Structs.cs
index 9456e95d9..2e01e0278 100644
--- a/Aaru.Images/TeleDisk/Structs.cs
+++ b/Aaru.Images/TeleDisk/Structs.cs
@@ -30,82 +30,81 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class TeleDisk
 {
-    public sealed partial class TeleDisk
+    struct Header
     {
-        struct Header
-        {
-            /// <summary>"TD" or "td" depending on compression</summary>
-            public ushort Signature;
-            /// <summary>Sequence, but TeleDisk seems to complaing if != 0</summary>
-            public byte Sequence;
-            /// <summary>Random, same byte for all disks in the same set</summary>
-            public byte DiskSet;
-            /// <summary>TeleDisk version, major in high nibble, minor in low nibble</summary>
-            public byte Version;
-            /// <summary>Data rate</summary>
-            public byte DataRate;
-            /// <summary>BIOS drive type</summary>
-            public byte DriveType;
-            /// <summary>Stepping used</summary>
-            public byte Stepping;
-            /// <summary>If set means image only allocates sectors marked in-use by FAT12</summary>
-            public byte DosAllocation;
-            /// <summary>Sides of disk</summary>
-            public byte Sides;
-            /// <summary>CRC of all the previous</summary>
-            public ushort Crc;
-        }
+        /// <summary>"TD" or "td" depending on compression</summary>
+        public ushort Signature;
+        /// <summary>Sequence, but TeleDisk seems to complaing if != 0</summary>
+        public byte Sequence;
+        /// <summary>Random, same byte for all disks in the same set</summary>
+        public byte DiskSet;
+        /// <summary>TeleDisk version, major in high nibble, minor in low nibble</summary>
+        public byte Version;
+        /// <summary>Data rate</summary>
+        public byte DataRate;
+        /// <summary>BIOS drive type</summary>
+        public byte DriveType;
+        /// <summary>Stepping used</summary>
+        public byte Stepping;
+        /// <summary>If set means image only allocates sectors marked in-use by FAT12</summary>
+        public byte DosAllocation;
+        /// <summary>Sides of disk</summary>
+        public byte Sides;
+        /// <summary>CRC of all the previous</summary>
+        public ushort Crc;
+    }
 
-        struct CommentBlockHeader
-        {
-            /// <summary>CRC of comment block after crc field</summary>
-            public ushort Crc;
-            /// <summary>Length of comment</summary>
-            public ushort Length;
-            public byte Year;
-            public byte Month;
-            public byte Day;
-            public byte Hour;
-            public byte Minute;
-            public byte Second;
-        }
+    struct CommentBlockHeader
+    {
+        /// <summary>CRC of comment block after crc field</summary>
+        public ushort Crc;
+        /// <summary>Length of comment</summary>
+        public ushort Length;
+        public byte Year;
+        public byte Month;
+        public byte Day;
+        public byte Hour;
+        public byte Minute;
+        public byte Second;
+    }
 
-        struct TrackHeader
-        {
-            /// <summary>Sectors in the track, 0xFF if end of disk image (there is no spoon)</summary>
-            public byte Sectors;
-            /// <summary>Cylinder the head was on</summary>
-            public byte Cylinder;
-            /// <summary>Head/side used</summary>
-            public byte Head;
-            /// <summary>Lower byte of CRC of previous fields</summary>
-            public byte Crc;
-        }
+    struct TrackHeader
+    {
+        /// <summary>Sectors in the track, 0xFF if end of disk image (there is no spoon)</summary>
+        public byte Sectors;
+        /// <summary>Cylinder the head was on</summary>
+        public byte Cylinder;
+        /// <summary>Head/side used</summary>
+        public byte Head;
+        /// <summary>Lower byte of CRC of previous fields</summary>
+        public byte Crc;
+    }
 
-        struct SectorHeader
-        {
-            /// <summary>Cylinder as stored on sector address mark</summary>
-            public byte Cylinder;
-            /// <summary>Head as stored on sector address mark</summary>
-            public byte Head;
-            /// <summary>Sector number as stored on sector address mark</summary>
-            public byte SectorNumber;
-            /// <summary>Sector size</summary>
-            public byte SectorSize;
-            /// <summary>Sector flags</summary>
-            public byte Flags;
-            /// <summary>Lower byte of TeleDisk CRC of sector header, data header and data block</summary>
-            public byte Crc;
-        }
+    struct SectorHeader
+    {
+        /// <summary>Cylinder as stored on sector address mark</summary>
+        public byte Cylinder;
+        /// <summary>Head as stored on sector address mark</summary>
+        public byte Head;
+        /// <summary>Sector number as stored on sector address mark</summary>
+        public byte SectorNumber;
+        /// <summary>Sector size</summary>
+        public byte SectorSize;
+        /// <summary>Sector flags</summary>
+        public byte Flags;
+        /// <summary>Lower byte of TeleDisk CRC of sector header, data header and data block</summary>
+        public byte Crc;
+    }
 
-        struct DataHeader
-        {
-            /// <summary>Size of all data (encoded) + next field (1)</summary>
-            public ushort DataSize;
-            /// <summary>Encoding used for data block</summary>
-            public byte DataEncoding;
-        }
+    struct DataHeader
+    {
+        /// <summary>Size of all data (encoded) + next field (1)</summary>
+        public ushort DataSize;
+        /// <summary>Encoding used for data block</summary>
+        public byte DataEncoding;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/TeleDisk/TeleDisk.cs b/Aaru.Images/TeleDisk/TeleDisk.cs
index 57698da71..1a77a873d 100644
--- a/Aaru.Images/TeleDisk/TeleDisk.cs
+++ b/Aaru.Images/TeleDisk/TeleDisk.cs
@@ -36,54 +36,53 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+// Created following notes from Dave Dunfield
+// http://www.classiccmp.org/dunfield/img54306/td0notes.txt
+/// <summary>Implements reading of Sydex TeleDisk disk images</summary>
+public sealed partial class TeleDisk : IMediaImage, IVerifiableImage, IVerifiableSectorsImage
 {
-    // Created following notes from Dave Dunfield
-    // http://www.classiccmp.org/dunfield/img54306/td0notes.txt
-    /// <summary>Implements reading of Sydex TeleDisk disk images</summary>
-    public sealed partial class TeleDisk : IMediaImage, IVerifiableImage, IVerifiableSectorsImage
+    readonly List<ulong> _sectorsWhereCrcHasFailed;
+    bool                 _aDiskCrcHasFailed;
+    byte[]               _commentBlock;
+    CommentBlockHeader   _commentHeader;
+    Header               _header;
+    ImageInfo            _imageInfo;
+    Stream               _inStream;
+    byte[]               _leadOut;
+
+    // Cylinder by head, sector data matrix
+    byte[][][][] _sectorsData;
+
+    // LBA, data
+    uint _totalDiskSize;
+
+    public TeleDisk()
     {
-        readonly List<ulong> _sectorsWhereCrcHasFailed;
-        bool                 _aDiskCrcHasFailed;
-        byte[]               _commentBlock;
-        CommentBlockHeader   _commentHeader;
-        Header               _header;
-        ImageInfo            _imageInfo;
-        Stream               _inStream;
-        byte[]               _leadOut;
-
-        // Cylinder by head, sector data matrix
-        byte[][][][] _sectorsData;
-
-        // LBA, data
-        uint _totalDiskSize;
-
-        public TeleDisk()
+        _imageInfo = new ImageInfo
         {
-            _imageInfo = new ImageInfo
-            {
-                ReadableSectorTags    = new List<SectorTagType>(),
-                ReadableMediaTags     = new List<MediaTagType>(),
-                HasPartitions         = false,
-                HasSessions           = false,
-                Application           = "Sydex TeleDisk",
-                Comments              = null,
-                Creator               = null,
-                MediaManufacturer     = null,
-                MediaModel            = null,
-                MediaSerialNumber     = null,
-                MediaBarcode          = null,
-                MediaPartNumber       = null,
-                MediaSequence         = 0,
-                LastMediaSequence     = 0,
-                DriveManufacturer     = null,
-                DriveModel            = null,
-                DriveSerialNumber     = null,
-                DriveFirmwareRevision = null
-            };
+            ReadableSectorTags    = new List<SectorTagType>(),
+            ReadableMediaTags     = new List<MediaTagType>(),
+            HasPartitions         = false,
+            HasSessions           = false,
+            Application           = "Sydex TeleDisk",
+            Comments              = null,
+            Creator               = null,
+            MediaManufacturer     = null,
+            MediaModel            = null,
+            MediaSerialNumber     = null,
+            MediaBarcode          = null,
+            MediaPartNumber       = null,
+            MediaSequence         = 0,
+            LastMediaSequence     = 0,
+            DriveManufacturer     = null,
+            DriveModel            = null,
+            DriveSerialNumber     = null,
+            DriveFirmwareRevision = null
+        };
 
-            _aDiskCrcHasFailed        = false;
-            _sectorsWhereCrcHasFailed = new List<ulong>();
-        }
+        _aDiskCrcHasFailed        = false;
+        _sectorsWhereCrcHasFailed = new List<ulong>();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/TeleDisk/Unsupported.cs b/Aaru.Images/TeleDisk/Unsupported.cs
index b56e68187..2745c8ef1 100644
--- a/Aaru.Images/TeleDisk/Unsupported.cs
+++ b/Aaru.Images/TeleDisk/Unsupported.cs
@@ -32,24 +32,23 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class TeleDisk
 {
-    public sealed partial class TeleDisk
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/TeleDisk/Verify.cs b/Aaru.Images/TeleDisk/Verify.cs
index 98fb337d1..f7a3a051f 100644
--- a/Aaru.Images/TeleDisk/Verify.cs
+++ b/Aaru.Images/TeleDisk/Verify.cs
@@ -32,28 +32,27 @@
 
 using System.Collections.Generic;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class TeleDisk
 {
-    public sealed partial class TeleDisk
+    /// <inheritdoc />
+    public bool? VerifyMediaImage() => _aDiskCrcHasFailed;
+
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress) => !_sectorsWhereCrcHasFailed.Contains(sectorAddress);
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
     {
-        /// <inheritdoc />
-        public bool? VerifyMediaImage() => _aDiskCrcHasFailed;
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
 
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress) => !_sectorsWhereCrcHasFailed.Contains(sectorAddress);
+        for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+            if(_sectorsWhereCrcHasFailed.Contains(sectorAddress))
+                failingLbas.Add(sectorAddress);
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            failingLbas = new List<ulong>();
-            unknownLbas = new List<ulong>();
-
-            for(ulong i = sectorAddress; i < sectorAddress + length; i++)
-                if(_sectorsWhereCrcHasFailed.Contains(sectorAddress))
-                    failingLbas.Add(sectorAddress);
-
-            return failingLbas.Count <= 0;
-        }
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UDIF/Constants.cs b/Aaru.Images/UDIF/Constants.cs
index 7b6a762bc..2d03faa6a 100644
--- a/Aaru.Images/UDIF/Constants.cs
+++ b/Aaru.Images/UDIF/Constants.cs
@@ -32,47 +32,46 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Udif
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Udif
-    {
-        const uint UDIF_SIGNATURE  = 0x6B6F6C79;
-        const uint CHUNK_SIGNATURE = 0x6D697368;
+    const uint UDIF_SIGNATURE  = 0x6B6F6C79;
+    const uint CHUNK_SIGNATURE = 0x6D697368;
 
-        // All chunk types with this mask are compressed
-        const uint CHUNK_TYPE_COMPRESSED_MASK = 0x80000000;
+    // All chunk types with this mask are compressed
+    const uint CHUNK_TYPE_COMPRESSED_MASK = 0x80000000;
 
-        const uint CHUNK_TYPE_ZERO    = 0x00000000;
-        const uint CHUNK_TYPE_COPY    = 0x00000001;
-        const uint CHUNK_TYPE_NOCOPY  = 0x00000002;
-        const uint CHUNK_TYPE_KENCODE = 0x80000001;
-        const uint CHUNK_TYPE_RLE     = 0x80000002;
-        const uint CHUNK_TYPE_LZH     = 0x80000003;
-        const uint CHUNK_TYPE_ADC     = 0x80000004;
-        const uint CHUNK_TYPE_ZLIB    = 0x80000005;
-        const uint CHUNK_TYPE_BZIP    = 0x80000006;
-        const uint CHUNK_TYPE_LZFSE   = 0x80000007;
-        const uint CHUNK_TYPE_LZMA    = 0x80000008;
-        const uint CHUNK_TYPE_COMMNT  = 0x7FFFFFFE;
-        const uint CHUNK_TYPE_END     = 0xFFFFFFFF;
+    const uint CHUNK_TYPE_ZERO    = 0x00000000;
+    const uint CHUNK_TYPE_COPY    = 0x00000001;
+    const uint CHUNK_TYPE_NOCOPY  = 0x00000002;
+    const uint CHUNK_TYPE_KENCODE = 0x80000001;
+    const uint CHUNK_TYPE_RLE     = 0x80000002;
+    const uint CHUNK_TYPE_LZH     = 0x80000003;
+    const uint CHUNK_TYPE_ADC     = 0x80000004;
+    const uint CHUNK_TYPE_ZLIB    = 0x80000005;
+    const uint CHUNK_TYPE_BZIP    = 0x80000006;
+    const uint CHUNK_TYPE_LZFSE   = 0x80000007;
+    const uint CHUNK_TYPE_LZMA    = 0x80000008;
+    const uint CHUNK_TYPE_COMMNT  = 0x7FFFFFFE;
+    const uint CHUNK_TYPE_END     = 0xFFFFFFFF;
 
-        const uint UDIF_CHECKSUM_TYPE_NONE   = 0;
-        const uint UDIF_CHECKSUM_TYPE_CRC28  = 1;
-        const uint UDIF_CHECKSUM_TYPE_CRC32  = 2;
-        const uint UDIF_CHECKSUM_TYPE_DC42   = 3;
-        const uint UDIF_CHECKSUM_TYPE_MD5    = 4;
-        const uint UDIF_CHECKSUM_TYPE_SHA    = 5;
-        const uint UDIF_CHECKSUM_TYPE_SHA1   = 6;
-        const uint UDIF_CHECKSUM_TYPE_SHA256 = 7;
-        const uint UDIF_CHECKSUM_TYPE_SHA384 = 8;
-        const uint UDIF_CHECKSUM_TYPE_SHA512 = 9;
+    const uint UDIF_CHECKSUM_TYPE_NONE   = 0;
+    const uint UDIF_CHECKSUM_TYPE_CRC28  = 1;
+    const uint UDIF_CHECKSUM_TYPE_CRC32  = 2;
+    const uint UDIF_CHECKSUM_TYPE_DC42   = 3;
+    const uint UDIF_CHECKSUM_TYPE_MD5    = 4;
+    const uint UDIF_CHECKSUM_TYPE_SHA    = 5;
+    const uint UDIF_CHECKSUM_TYPE_SHA1   = 6;
+    const uint UDIF_CHECKSUM_TYPE_SHA256 = 7;
+    const uint UDIF_CHECKSUM_TYPE_SHA384 = 8;
+    const uint UDIF_CHECKSUM_TYPE_SHA512 = 9;
 
-        const string RESOURCE_FORK_KEY  = "resource-fork";
-        const string BLOCK_KEY          = "blkx";
-        const uint   BLOCK_OS_TYPE      = 0x626C6B78;
-        const uint   MAX_CACHE_SIZE     = 16777216;
-        const uint   SECTOR_SIZE        = 512;
-        const uint   MAX_CACHED_SECTORS = MAX_CACHE_SIZE / SECTOR_SIZE;
-    }
+    const string RESOURCE_FORK_KEY  = "resource-fork";
+    const string BLOCK_KEY          = "blkx";
+    const uint   BLOCK_OS_TYPE      = 0x626C6B78;
+    const uint   MAX_CACHE_SIZE     = 16777216;
+    const uint   SECTOR_SIZE        = 512;
+    const uint   MAX_CACHED_SECTORS = MAX_CACHE_SIZE / SECTOR_SIZE;
 }
\ No newline at end of file
diff --git a/Aaru.Images/UDIF/Identify.cs b/Aaru.Images/UDIF/Identify.cs
index 25eb4988d..a5d262762 100644
--- a/Aaru.Images/UDIF/Identify.cs
+++ b/Aaru.Images/UDIF/Identify.cs
@@ -34,35 +34,34 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Udif
 {
-    public sealed partial class Udif
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
+        Stream stream = imageFilter.GetDataForkStream();
 
-            if(stream.Length < 512)
-                return false;
+        if(stream.Length < 512)
+            return false;
 
-            stream.Seek(-Marshal.SizeOf<Footer>(), SeekOrigin.End);
-            byte[] footerB = new byte[Marshal.SizeOf<Footer>()];
+        stream.Seek(-Marshal.SizeOf<Footer>(), SeekOrigin.End);
+        byte[] footerB = new byte[Marshal.SizeOf<Footer>()];
 
-            stream.Read(footerB, 0, Marshal.SizeOf<Footer>());
-            _footer = Marshal.ByteArrayToStructureBigEndian<Footer>(footerB);
+        stream.Read(footerB, 0, Marshal.SizeOf<Footer>());
+        _footer = Marshal.ByteArrayToStructureBigEndian<Footer>(footerB);
 
-            if(_footer.signature == UDIF_SIGNATURE)
-                return true;
+        if(_footer.signature == UDIF_SIGNATURE)
+            return true;
 
-            // Old UDIF as created by DiskCopy 6.5 using "OBSOLETE" format. (DiskCopy 5 rumored format?)
-            stream.Seek(0, SeekOrigin.Begin);
-            byte[] headerB = new byte[Marshal.SizeOf<Footer>()];
+        // Old UDIF as created by DiskCopy 6.5 using "OBSOLETE" format. (DiskCopy 5 rumored format?)
+        stream.Seek(0, SeekOrigin.Begin);
+        byte[] headerB = new byte[Marshal.SizeOf<Footer>()];
 
-            stream.Read(headerB, 0, Marshal.SizeOf<Footer>());
-            _footer = Marshal.ByteArrayToStructureBigEndian<Footer>(headerB);
+        stream.Read(headerB, 0, Marshal.SizeOf<Footer>());
+        _footer = Marshal.ByteArrayToStructureBigEndian<Footer>(headerB);
 
-            return _footer.signature == UDIF_SIGNATURE;
-        }
+        return _footer.signature == UDIF_SIGNATURE;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UDIF/Properties.cs b/Aaru.Images/UDIF/Properties.cs
index c18949f21..72ccc6eb2 100644
--- a/Aaru.Images/UDIF/Properties.cs
+++ b/Aaru.Images/UDIF/Properties.cs
@@ -37,50 +37,49 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Udif
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public string Name => "Apple Universal Disk Image Format";
-        /// <inheritdoc />
-        public Guid Id => new Guid("5BEB9002-CF3D-429C-8E06-9A96F49203FF");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Apple Universal Disk Image Format";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+public sealed partial class Udif
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "Apple Universal Disk Image Format";
+    /// <inheritdoc />
+    public Guid Id => new Guid("5BEB9002-CF3D-429C-8E06-9A96F49203FF");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Apple Universal Disk Image Format";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".dmg"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".dmg"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UDIF/Structs.cs b/Aaru.Images/UDIF/Structs.cs
index 96669128a..dec322e66 100644
--- a/Aaru.Images/UDIF/Structs.cs
+++ b/Aaru.Images/UDIF/Structs.cs
@@ -33,78 +33,77 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Udif
 {
-    public sealed partial class Udif
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Footer
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Footer
-        {
-            public          uint  signature;
-            public          uint  version;
-            public          uint  headerSize;
-            public          uint  flags;
-            public readonly ulong runningDataForkOff;
-            public readonly ulong dataForkOff;
-            public          ulong dataForkLen;
-            public readonly ulong rsrcForkOff;
-            public readonly ulong rsrcForkLen;
-            public          uint  segmentNumber;
-            public          uint  segmentCount;
-            public          Guid  segmentId;
-            public          uint  dataForkChkType;
-            public          uint  dataForkChkLen;
-            public          uint  dataForkChk;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 124)]
-            public readonly byte[] reserved1;
-            public ulong plistOff;
-            public ulong plistLen;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 120)]
-            public readonly byte[] reserved2;
-            public readonly uint masterChkType;
-            public readonly uint masterChkLen;
-            public readonly uint masterChk;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 124)]
-            public readonly byte[] reserved3;
-            public uint  imageVariant;
-            public ulong sectorCount;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] reserved4;
-        }
+        public          uint  signature;
+        public          uint  version;
+        public          uint  headerSize;
+        public          uint  flags;
+        public readonly ulong runningDataForkOff;
+        public readonly ulong dataForkOff;
+        public          ulong dataForkLen;
+        public readonly ulong rsrcForkOff;
+        public readonly ulong rsrcForkLen;
+        public          uint  segmentNumber;
+        public          uint  segmentCount;
+        public          Guid  segmentId;
+        public          uint  dataForkChkType;
+        public          uint  dataForkChkLen;
+        public          uint  dataForkChk;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 124)]
+        public readonly byte[] reserved1;
+        public ulong plistOff;
+        public ulong plistLen;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 120)]
+        public readonly byte[] reserved2;
+        public readonly uint masterChkType;
+        public readonly uint masterChkLen;
+        public readonly uint masterChk;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 124)]
+        public readonly byte[] reserved3;
+        public uint  imageVariant;
+        public ulong sectorCount;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] reserved4;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BlockHeader
-        {
-            public          uint  signature;
-            public          uint  version;
-            public readonly ulong sectorStart;
-            public          ulong sectorCount;
-            public readonly ulong dataOffset;
-            public readonly uint  buffers;
-            public readonly uint  descriptor;
-            public readonly uint  reserved1;
-            public readonly uint  reserved2;
-            public readonly uint  reserved3;
-            public readonly uint  reserved4;
-            public readonly uint  reserved5;
-            public readonly uint  reserved6;
-            public          uint  checksumType;
-            public          uint  checksumLen;
-            public          uint  checksum;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 124)]
-            public readonly byte[] reservedChk;
-            public uint chunks;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BlockHeader
+    {
+        public          uint  signature;
+        public          uint  version;
+        public readonly ulong sectorStart;
+        public          ulong sectorCount;
+        public readonly ulong dataOffset;
+        public readonly uint  buffers;
+        public readonly uint  descriptor;
+        public readonly uint  reserved1;
+        public readonly uint  reserved2;
+        public readonly uint  reserved3;
+        public readonly uint  reserved4;
+        public readonly uint  reserved5;
+        public readonly uint  reserved6;
+        public          uint  checksumType;
+        public          uint  checksumLen;
+        public          uint  checksum;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 124)]
+        public readonly byte[] reservedChk;
+        public uint chunks;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BlockChunk
-        {
-            public          uint  type;
-            public readonly uint  comment;
-            public          ulong sector;
-            public          ulong sectors;
-            public          ulong offset;
-            public          ulong length;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BlockChunk
+    {
+        public          uint  type;
+        public readonly uint  comment;
+        public          ulong sector;
+        public          ulong sectors;
+        public          ulong offset;
+        public          ulong length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UDIF/UDIF.cs b/Aaru.Images/UDIF/UDIF.cs
index 4f0af058b..9954648e8 100644
--- a/Aaru.Images/UDIF/UDIF.cs
+++ b/Aaru.Images/UDIF/UDIF.cs
@@ -39,48 +39,47 @@ using Aaru.CommonTypes.Structs;
 
 #pragma warning disable 612
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing Apple's Universal Disk Image Format disk images</summary>
-    public sealed partial class Udif : IWritableImage
-    {
-        uint                          _buffersize;
-        Dictionary<ulong, byte[]>     _chunkCache;
-        Dictionary<ulong, BlockChunk> _chunks;
-        BlockChunk                    _currentChunk;
-        uint                          _currentChunkCacheSize;
-        ulong                         _currentSector;
-        Crc32Context                  _dataForkChecksum;
-        Footer                        _footer;
-        ImageInfo                     _imageInfo;
-        Stream                        _imageStream;
-        Crc32Context                  _masterChecksum;
-        Dictionary<ulong, byte[]>     _sectorCache;
-        FileStream                    _writingStream;
+namespace Aaru.DiscImages;
 
-        public Udif() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing Apple's Universal Disk Image Format disk images</summary>
+public sealed partial class Udif : IWritableImage
+{
+    uint                          _buffersize;
+    Dictionary<ulong, byte[]>     _chunkCache;
+    Dictionary<ulong, BlockChunk> _chunks;
+    BlockChunk                    _currentChunk;
+    uint                          _currentChunkCacheSize;
+    ulong                         _currentSector;
+    Crc32Context                  _dataForkChecksum;
+    Footer                        _footer;
+    ImageInfo                     _imageInfo;
+    Stream                        _imageStream;
+    Crc32Context                  _masterChecksum;
+    Dictionary<ulong, byte[]>     _sectorCache;
+    FileStream                    _writingStream;
+
+    public Udif() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/UDIF/Unsupported.cs b/Aaru.Images/UDIF/Unsupported.cs
index bb2c1d173..e43aaaaa8 100644
--- a/Aaru.Images/UDIF/Unsupported.cs
+++ b/Aaru.Images/UDIF/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Udif
 {
-    public sealed partial class Udif
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UDIF/Write.cs b/Aaru.Images/UDIF/Write.cs
index 7cda05123..b3e5c66be 100644
--- a/Aaru.Images/UDIF/Write.cs
+++ b/Aaru.Images/UDIF/Write.cs
@@ -43,397 +43,396 @@ using Aaru.Helpers;
 using Claunia.PropertyList;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Udif
 {
-    public sealed partial class Udif
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            _chunks           = new Dictionary<ulong, BlockChunk>();
-            _currentChunk     = new BlockChunk();
-            _currentSector    = 0;
-            _dataForkChecksum = new Crc32Context();
-            _masterChecksum   = new Crc32Context();
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            if(sectorAddress < _currentSector)
-            {
-                ErrorMessage = "Tried to rewind, this format rewinded on writing";
-
-                return false;
+            return false;
+        }
+
+        _imageInfo = new ImageInfo
+        {
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
+            return false;
+        }
+
+        _chunks           = new Dictionary<ulong, BlockChunk>();
+        _currentChunk     = new BlockChunk();
+        _currentSector    = 0;
+        _dataForkChecksum = new Crc32Context();
+        _masterChecksum   = new Crc32Context();
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        if(sectorAddress < _currentSector)
+        {
+            ErrorMessage = "Tried to rewind, this format rewinded on writing";
+
+            return false;
+        }
+
+        _masterChecksum.Update(data);
+
+        bool isEmpty = ArrayHelpers.ArrayIsNullOrEmpty(data);
+
+        switch(_currentChunk.type)
+        {
+            case CHUNK_TYPE_ZERO:
+                _currentChunk.type = isEmpty ? CHUNK_TYPE_NOCOPY : CHUNK_TYPE_COPY;
+
+                break;
+            case CHUNK_TYPE_NOCOPY when !isEmpty:
+            case CHUNK_TYPE_COPY when isEmpty:
+                _chunks.Add(_currentChunk.sector, _currentChunk);
+
+                _currentChunk = new BlockChunk
+                {
+                    type   = isEmpty ? CHUNK_TYPE_NOCOPY : CHUNK_TYPE_COPY,
+                    sector = _currentSector,
+                    offset = (ulong)(isEmpty ? 0 : _writingStream.Position)
+                };
+
+                break;
+        }
+
+        _currentChunk.sectors++;
+        _currentChunk.length += (ulong)(isEmpty ? 0 : 512);
+        _currentSector++;
+
+        if(!isEmpty)
+        {
+            _dataForkChecksum.Update(data);
+            _writingStream.Write(data, 0, data.Length);
+        }
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    // TODO: This can be optimized
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+        {
+            if(_currentChunk.type == CHUNK_TYPE_COPY)
+            {
+                _chunks.Add(_currentChunk.sector, _currentChunk);
+
+                _currentChunk = new BlockChunk
+                {
+                    type   = CHUNK_TYPE_NOCOPY,
+                    sector = _currentSector
+                };
             }
 
+            _currentChunk.sectors += (ulong)(data.Length / _imageInfo.SectorSize);
+            _currentSector        += (ulong)(data.Length / _imageInfo.SectorSize);
             _masterChecksum.Update(data);
 
-            bool isEmpty = ArrayHelpers.ArrayIsNullOrEmpty(data);
-
-            switch(_currentChunk.type)
-            {
-                case CHUNK_TYPE_ZERO:
-                    _currentChunk.type = isEmpty ? CHUNK_TYPE_NOCOPY : CHUNK_TYPE_COPY;
-
-                    break;
-                case CHUNK_TYPE_NOCOPY when !isEmpty:
-                case CHUNK_TYPE_COPY when isEmpty:
-                    _chunks.Add(_currentChunk.sector, _currentChunk);
-
-                    _currentChunk = new BlockChunk
-                    {
-                        type   = isEmpty ? CHUNK_TYPE_NOCOPY : CHUNK_TYPE_COPY,
-                        sector = _currentSector,
-                        offset = (ulong)(isEmpty ? 0 : _writingStream.Position)
-                    };
-
-                    break;
-            }
-
-            _currentChunk.sectors++;
-            _currentChunk.length += (ulong)(isEmpty ? 0 : 512);
-            _currentSector++;
-
-            if(!isEmpty)
-            {
-                _dataForkChecksum.Update(data);
-                _writingStream.Write(data, 0, data.Length);
-            }
-
             ErrorMessage = "";
 
             return true;
         }
 
-        // TODO: This can be optimized
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+        for(uint i = 0; i < length; i++)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
+            byte[] tmp = new byte[_imageInfo.SectorSize];
+            Array.Copy(data, i * _imageInfo.SectorSize, tmp, 0, _imageInfo.SectorSize);
 
+            if(!WriteSector(tmp, sectorAddress + i))
                 return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-            {
-                if(_currentChunk.type == CHUNK_TYPE_COPY)
-                {
-                    _chunks.Add(_currentChunk.sector, _currentChunk);
-
-                    _currentChunk = new BlockChunk
-                    {
-                        type   = CHUNK_TYPE_NOCOPY,
-                        sector = _currentSector
-                    };
-                }
-
-                _currentChunk.sectors += (ulong)(data.Length / _imageInfo.SectorSize);
-                _currentSector        += (ulong)(data.Length / _imageInfo.SectorSize);
-                _masterChecksum.Update(data);
-
-                ErrorMessage = "";
-
-                return true;
-            }
-
-            for(uint i = 0; i < length; i++)
-            {
-                byte[] tmp = new byte[_imageInfo.SectorSize];
-                Array.Copy(data, i * _imageInfo.SectorSize, tmp, 0, _imageInfo.SectorSize);
-
-                if(!WriteSector(tmp, sectorAddress + i))
-                    return false;
-            }
-
-            ErrorMessage = "";
-
-            return true;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Image is not opened for writing";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+        if(_currentChunk.type != CHUNK_TYPE_NOCOPY)
+            _currentChunk.length = _currentChunk.sectors * 512;
 
-            return false;
+        _chunks.Add(_currentChunk.sector, _currentChunk);
+
+        _chunks.Add(_imageInfo.Sectors, new BlockChunk
+        {
+            type   = CHUNK_TYPE_END,
+            sector = _imageInfo.Sectors
+        });
+
+        var bHdr = new BlockHeader
+        {
+            signature    = CHUNK_SIGNATURE,
+            version      = 1,
+            sectorCount  = _imageInfo.Sectors,
+            checksumType = UDIF_CHECKSUM_TYPE_CRC32,
+            checksumLen  = 32,
+            checksum     = BitConverter.ToUInt32(_dataForkChecksum.Final().Reverse().ToArray(), 0),
+            chunks       = (uint)_chunks.Count
+        };
+
+        var chunkMs = new MemoryStream();
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.signature), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.version), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.sectorStart), 0, 8);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.sectorCount), 0, 8);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.dataOffset), 0, 8);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.buffers), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.descriptor), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved1), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved2), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved3), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved4), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved5), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved6), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksumType), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksumLen), 0, 4);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksum), 0, 4);
+        chunkMs.Write(new byte[124], 0, 124);
+        chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.chunks), 0, 4);
+
+        foreach(BlockChunk chunk in _chunks.Values)
+        {
+            chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.type), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.comment), 0, 4);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.sector), 0, 8);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.sectors), 0, 8);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.offset), 0, 8);
+            chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.length), 0, 8);
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        byte[] plist = Encoding.UTF8.GetBytes(new NSDictionary
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            if(_currentChunk.type != CHUNK_TYPE_NOCOPY)
-                _currentChunk.length = _currentChunk.sectors * 512;
-
-            _chunks.Add(_currentChunk.sector, _currentChunk);
-
-            _chunks.Add(_imageInfo.Sectors, new BlockChunk
-            {
-                type   = CHUNK_TYPE_END,
-                sector = _imageInfo.Sectors
-            });
-
-            var bHdr = new BlockHeader
-            {
-                signature    = CHUNK_SIGNATURE,
-                version      = 1,
-                sectorCount  = _imageInfo.Sectors,
-                checksumType = UDIF_CHECKSUM_TYPE_CRC32,
-                checksumLen  = 32,
-                checksum     = BitConverter.ToUInt32(_dataForkChecksum.Final().Reverse().ToArray(), 0),
-                chunks       = (uint)_chunks.Count
-            };
-
-            var chunkMs = new MemoryStream();
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.signature), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.version), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.sectorStart), 0, 8);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.sectorCount), 0, 8);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.dataOffset), 0, 8);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.buffers), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.descriptor), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved1), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved2), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved3), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved4), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved5), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.reserved6), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksumType), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksumLen), 0, 4);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.checksum), 0, 4);
-            chunkMs.Write(new byte[124], 0, 124);
-            chunkMs.Write(BigEndianBitConverter.GetBytes(bHdr.chunks), 0, 4);
-
-            foreach(BlockChunk chunk in _chunks.Values)
-            {
-                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.type), 0, 4);
-                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.comment), 0, 4);
-                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.sector), 0, 8);
-                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.sectors), 0, 8);
-                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.offset), 0, 8);
-                chunkMs.Write(BigEndianBitConverter.GetBytes(chunk.length), 0, 8);
-            }
-
-            byte[] plist = Encoding.UTF8.GetBytes(new NSDictionary
             {
+                "resource-fork", new NSDictionary
                 {
-                    "resource-fork", new NSDictionary
                     {
+                        "blkx", new NSArray
                         {
-                            "blkx", new NSArray
+                            new NSDictionary
                             {
-                                new NSDictionary
                                 {
-                                    {
-                                        "Attributes", "0x0050"
-                                    },
-                                    {
-                                        "CFName", "whole disk (Aaru : 0)"
-                                    },
-                                    {
-                                        "Data", chunkMs.ToArray()
-                                    },
-                                    {
-                                        "ID", "0"
-                                    },
-                                    {
-                                        "Name", "whole disk (Aaru : 0)"
-                                    }
+                                    "Attributes", "0x0050"
+                                },
+                                {
+                                    "CFName", "whole disk (Aaru : 0)"
+                                },
+                                {
+                                    "Data", chunkMs.ToArray()
+                                },
+                                {
+                                    "ID", "0"
+                                },
+                                {
+                                    "Name", "whole disk (Aaru : 0)"
                                 }
                             }
                         }
                     }
                 }
-            }.ToXmlPropertyList());
+            }
+        }.ToXmlPropertyList());
 
-            _footer = new Footer
-            {
-                signature       = UDIF_SIGNATURE,
-                version         = 4,
-                headerSize      = 512,
-                flags           = 1,
-                dataForkLen     = (ulong)_writingStream.Length,
-                segmentNumber   = 1,
-                segmentCount    = 1,
-                segmentId       = Guid.NewGuid(),
-                dataForkChkType = UDIF_CHECKSUM_TYPE_CRC32,
-                dataForkChkLen  = 32,
-                dataForkChk     = BitConverter.ToUInt32(_dataForkChecksum.Final().Reverse().ToArray(), 0),
-                plistOff        = (ulong)_writingStream.Length,
-                plistLen        = (ulong)plist.Length,
-
-                // TODO: Find how is this calculated
-                /*masterChkType   = 2,
-                masterChkLen    = 32,
-                masterChk       = BitConverter.ToUInt32(masterChecksum.Final().Reverse().ToArray(), 0),*/
-                imageVariant = 2,
-                sectorCount  = _imageInfo.Sectors
-            };
-
-            _writingStream.Seek(0, SeekOrigin.End);
-            _writingStream.Write(plist, 0, plist.Length);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.signature), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.version), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.headerSize), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.flags), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.runningDataForkOff), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.dataForkOff), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.dataForkLen), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.rsrcForkOff), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.rsrcForkLen), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.segmentNumber), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.segmentCount), 0, 4);
-            _writingStream.Write(_footer.segmentId.ToByteArray(), 0, 16);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.dataForkChkType), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.dataForkChkLen), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.dataForkChk), 0, 4);
-            _writingStream.Write(new byte[124], 0, 124);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.plistOff), 0, 8);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.plistLen), 0, 8);
-            _writingStream.Write(new byte[120], 0, 120);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.masterChkType), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.masterChkLen), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.masterChk), 0, 4);
-            _writingStream.Write(new byte[124], 0, 124);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.imageVariant), 0, 4);
-            _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.sectorCount), 0, 8);
-            _writingStream.Write(new byte[12], 0, 12);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        // TODO: Comments
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+        _footer = new Footer
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            signature       = UDIF_SIGNATURE,
+            version         = 4,
+            headerSize      = 512,
+            flags           = 1,
+            dataForkLen     = (ulong)_writingStream.Length,
+            segmentNumber   = 1,
+            segmentCount    = 1,
+            segmentId       = Guid.NewGuid(),
+            dataForkChkType = UDIF_CHECKSUM_TYPE_CRC32,
+            dataForkChkLen  = 32,
+            dataForkChk     = BitConverter.ToUInt32(_dataForkChecksum.Final().Reverse().ToArray(), 0),
+            plistOff        = (ulong)_writingStream.Length,
+            plistLen        = (ulong)plist.Length,
 
-            return false;
-        }
+            // TODO: Find how is this calculated
+            /*masterChkType   = 2,
+            masterChkLen    = 32,
+            masterChk       = BitConverter.ToUInt32(masterChecksum.Final().Reverse().ToArray(), 0),*/
+            imageVariant = 2,
+            sectorCount  = _imageInfo.Sectors
+        };
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+        _writingStream.Seek(0, SeekOrigin.End);
+        _writingStream.Write(plist, 0, plist.Length);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.signature), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.version), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.headerSize), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.flags), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.runningDataForkOff), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.dataForkOff), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.dataForkLen), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.rsrcForkOff), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.rsrcForkLen), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.segmentNumber), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.segmentCount), 0, 4);
+        _writingStream.Write(_footer.segmentId.ToByteArray(), 0, 16);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.dataForkChkType), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.dataForkChkLen), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.dataForkChk), 0, 4);
+        _writingStream.Write(new byte[124], 0, 124);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.plistOff), 0, 8);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.plistLen), 0, 8);
+        _writingStream.Write(new byte[120], 0, 120);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.masterChkType), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.masterChkLen), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.masterChk), 0, 4);
+        _writingStream.Write(new byte[124], 0, 124);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.imageVariant), 0, 4);
+        _writingStream.Write(BigEndianBitConverter.GetBytes(_footer.sectorCount), 0, 8);
+        _writingStream.Write(new byte[12], 0, 12);
 
-            return false;
-        }
+        _writingStream.Flush();
+        _writingStream.Close();
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+        IsWriting    = false;
+        ErrorMessage = "";
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    // TODO: Comments
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/Constants.cs b/Aaru.Images/UkvFdi/Constants.cs
index b88b6b3da..f80160ffa 100644
--- a/Aaru.Images/UkvFdi/Constants.cs
+++ b/Aaru.Images/UkvFdi/Constants.cs
@@ -30,13 +30,12 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class UkvFdi
 {
-    public sealed partial class UkvFdi
+    readonly byte[] _signature =
     {
-        readonly byte[] _signature =
-        {
-            0x46, 0x44, 0x49
-        };
-    }
+        0x46, 0x44, 0x49
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/Enums.cs b/Aaru.Images/UkvFdi/Enums.cs
index a45f955fc..a021603b6 100644
--- a/Aaru.Images/UkvFdi/Enums.cs
+++ b/Aaru.Images/UkvFdi/Enums.cs
@@ -33,23 +33,22 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
-{
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class UkvFdi
-    {
-        [Flags]
-        enum DiskFlags : byte
-        {
-            WriteProtected = 1
-        }
+namespace Aaru.DiscImages;
 
-        [Flags]
-        enum SectorFlags : byte
-        {
-            CrcOk128  = 0x01, CrcOk256  = 0x02, CrcOk512  = 0x04,
-            CrcOk1024 = 0x08, CrcOk2048 = 0x10, CrcOk4096 = 0x20,
-            Deleted   = 0x80
-        }
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class UkvFdi
+{
+    [Flags]
+    enum DiskFlags : byte
+    {
+        WriteProtected = 1
+    }
+
+    [Flags]
+    enum SectorFlags : byte
+    {
+        CrcOk128  = 0x01, CrcOk256  = 0x02, CrcOk512  = 0x04,
+        CrcOk1024 = 0x08, CrcOk2048 = 0x10, CrcOk4096 = 0x20,
+        Deleted   = 0x80
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/Helpers.cs b/Aaru.Images/UkvFdi/Helpers.cs
index 8c53e7c8d..0bbb84cf3 100644
--- a/Aaru.Images/UkvFdi/Helpers.cs
+++ b/Aaru.Images/UkvFdi/Helpers.cs
@@ -30,17 +30,16 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class UkvFdi
-    {
-        (ushort cylinder, byte head, byte sector) LbaToChs(ulong lba)
-        {
-            ushort cylinder = (ushort)(lba / (_imageInfo.Heads * _imageInfo.SectorsPerTrack));
-            byte   head     = (byte)(lba / _imageInfo.SectorsPerTrack % _imageInfo.Heads);
-            byte   sector   = (byte)((lba % _imageInfo.SectorsPerTrack) + 1);
+namespace Aaru.DiscImages;
 
-            return (cylinder, head, sector);
-        }
+public sealed partial class UkvFdi
+{
+    (ushort cylinder, byte head, byte sector) LbaToChs(ulong lba)
+    {
+        ushort cylinder = (ushort)(lba                            / (_imageInfo.Heads * _imageInfo.SectorsPerTrack));
+        byte   head     = (byte)(lba / _imageInfo.SectorsPerTrack % _imageInfo.Heads);
+        byte   sector   = (byte)((lba % _imageInfo.SectorsPerTrack) + 1);
+
+        return (cylinder, head, sector);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/Identify.cs b/Aaru.Images/UkvFdi/Identify.cs
index fe1ea2933..17caf7d80 100644
--- a/Aaru.Images/UkvFdi/Identify.cs
+++ b/Aaru.Images/UkvFdi/Identify.cs
@@ -35,24 +35,23 @@ using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class UkvFdi
 {
-    public sealed partial class UkvFdi
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < Marshal.SizeOf<Header>())
-                return false;
+        if(stream.Length < Marshal.SizeOf<Header>())
+            return false;
 
-            byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(hdrB, 0, hdrB.Length);
-            Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
+        byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
+        Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
 
-            return hdr.magic.SequenceEqual(_signature);
-        }
+        return hdr.magic.SequenceEqual(_signature);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/Properties.cs b/Aaru.Images/UkvFdi/Properties.cs
index 1752b9893..588b6cd27 100644
--- a/Aaru.Images/UkvFdi/Properties.cs
+++ b/Aaru.Images/UkvFdi/Properties.cs
@@ -35,23 +35,22 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class UkvFdi
 {
-    public sealed partial class UkvFdi
-    {
-        /// <inheritdoc />
-        public string Name => "Spectrum Floppy Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("DADFC9B2-67C1-42A3-B124-825528163FC0");
-        /// <inheritdoc />
-        public string Format => "Spectrum floppy disk image";
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+    /// <inheritdoc />
+    public string Name => "Spectrum Floppy Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("DADFC9B2-67C1-42A3-B124-825528163FC0");
+    /// <inheritdoc />
+    public string Format => "Spectrum floppy disk image";
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/Read.cs b/Aaru.Images/UkvFdi/Read.cs
index 882ae588c..81c1e5620 100644
--- a/Aaru.Images/UkvFdi/Read.cs
+++ b/Aaru.Images/UkvFdi/Read.cs
@@ -38,199 +38,198 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class UkvFdi
 {
-    public sealed partial class UkvFdi
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < Marshal.SizeOf<Header>())
+            return ErrorNumber.InvalidArgument;
+
+        byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
+
+        Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
+
+        AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.addInfoLen = {0}", hdr.addInfoLen);
+        AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.cylinders = {0}", hdr.cylinders);
+        AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.dataOff = {0}", hdr.dataOff);
+        AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.descOff = {0}", hdr.descOff);
+        AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.flags = {0}", hdr.flags);
+        AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.heads = {0}", hdr.heads);
+
+        stream.Seek(hdr.descOff, SeekOrigin.Begin);
+        byte[] description = new byte[hdr.dataOff - hdr.descOff];
+        stream.Read(description, 0, description.Length);
+        _imageInfo.Comments = StringHandlers.CToString(description);
+
+        AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.description = \"{0}\"", _imageInfo.Comments);
+
+        stream.Seek(0xE + hdr.addInfoLen, SeekOrigin.Begin);
+
+        long       spt        = long.MaxValue;
+        uint[][][] sectorsOff = new uint[hdr.cylinders][][];
+        _sectorsData = new byte[hdr.cylinders][][][];
+
+        _imageInfo.Cylinders = hdr.cylinders;
+        _imageInfo.Heads     = hdr.heads;
+
+        // Read track descriptors
+        for(ushort cyl = 0; cyl < hdr.cylinders; cyl++)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            sectorsOff[cyl]   = new uint[hdr.heads][];
+            _sectorsData[cyl] = new byte[hdr.heads][][];
 
-            if(stream.Length < Marshal.SizeOf<Header>())
-                return ErrorNumber.InvalidArgument;
-
-            byte[] hdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(hdrB, 0, hdrB.Length);
-
-            Header hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrB);
-
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.addInfoLen = {0}", hdr.addInfoLen);
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.cylinders = {0}", hdr.cylinders);
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.dataOff = {0}", hdr.dataOff);
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.descOff = {0}", hdr.descOff);
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.flags = {0}", hdr.flags);
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.heads = {0}", hdr.heads);
-
-            stream.Seek(hdr.descOff, SeekOrigin.Begin);
-            byte[] description = new byte[hdr.dataOff - hdr.descOff];
-            stream.Read(description, 0, description.Length);
-            _imageInfo.Comments = StringHandlers.CToString(description);
-
-            AaruConsole.DebugWriteLine("UkvFdi plugin", "hdr.description = \"{0}\"", _imageInfo.Comments);
-
-            stream.Seek(0xE + hdr.addInfoLen, SeekOrigin.Begin);
-
-            long       spt        = long.MaxValue;
-            uint[][][] sectorsOff = new uint[hdr.cylinders][][];
-            _sectorsData = new byte[hdr.cylinders][][][];
-
-            _imageInfo.Cylinders = hdr.cylinders;
-            _imageInfo.Heads     = hdr.heads;
-
-            // Read track descriptors
-            for(ushort cyl = 0; cyl < hdr.cylinders; cyl++)
+            for(ushort head = 0; head < hdr.heads; head++)
             {
-                sectorsOff[cyl]   = new uint[hdr.heads][];
-                _sectorsData[cyl] = new byte[hdr.heads][][];
+                byte[] sctB = new byte[4];
+                stream.Read(sctB, 0, 4);
+                stream.Seek(2, SeekOrigin.Current);
+                byte sectors = (byte)stream.ReadByte();
+                uint trkOff  = BitConverter.ToUInt32(sctB, 0);
 
-                for(ushort head = 0; head < hdr.heads; head++)
+                AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.c = {0}", cyl);
+                AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.h = {0}", head);
+                AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.sectors = {0}", sectors);
+                AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.off = {0}", trkOff);
+
+                sectorsOff[cyl][head]   = new uint[sectors];
+                _sectorsData[cyl][head] = new byte[sectors][];
+
+                if(sectors < spt &&
+                   sectors > 0)
+                    spt = sectors;
+
+                for(ushort sec = 0; sec < sectors; sec++)
                 {
-                    byte[] sctB = new byte[4];
-                    stream.Read(sctB, 0, 4);
-                    stream.Seek(2, SeekOrigin.Current);
-                    byte sectors = (byte)stream.ReadByte();
-                    uint trkOff  = BitConverter.ToUInt32(sctB, 0);
+                    byte   c    = (byte)stream.ReadByte();
+                    byte   h    = (byte)stream.ReadByte();
+                    byte   r    = (byte)stream.ReadByte();
+                    byte   n    = (byte)stream.ReadByte();
+                    var    f    = (SectorFlags)stream.ReadByte();
+                    byte[] offB = new byte[2];
+                    stream.Read(offB, 0, 2);
+                    ushort secOff = BitConverter.ToUInt16(offB, 0);
 
-                    AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.c = {0}", cyl);
-                    AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.h = {0}", head);
-                    AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.sectors = {0}", sectors);
-                    AaruConsole.DebugWriteLine("UkvFdi plugin", "trkhdr.off = {0}", trkOff);
+                    AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.c = {0}", c);
+                    AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.h = {0}", h);
+                    AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.r = {0}", r);
+                    AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.n = {0} ({1})", n, 128 << n);
+                    AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.f = {0}", f);
 
-                    sectorsOff[cyl][head]   = new uint[sectors];
-                    _sectorsData[cyl][head] = new byte[sectors][];
+                    AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.off = {0} ({1})", secOff,
+                                               secOff + trkOff + hdr.dataOff);
 
-                    if(sectors < spt &&
-                       sectors > 0)
-                        spt = sectors;
+                    // TODO: This assumes sequential sectors.
+                    sectorsOff[cyl][head][sec]   = secOff + trkOff + hdr.dataOff;
+                    _sectorsData[cyl][head][sec] = new byte[128 << n];
 
-                    for(ushort sec = 0; sec < sectors; sec++)
-                    {
-                        byte   c    = (byte)stream.ReadByte();
-                        byte   h    = (byte)stream.ReadByte();
-                        byte   r    = (byte)stream.ReadByte();
-                        byte   n    = (byte)stream.ReadByte();
-                        var    f    = (SectorFlags)stream.ReadByte();
-                        byte[] offB = new byte[2];
-                        stream.Read(offB, 0, 2);
-                        ushort secOff = BitConverter.ToUInt16(offB, 0);
+                    if(128 << n > _imageInfo.SectorSize)
+                        _imageInfo.SectorSize = (uint)(128 << n);
+                }
+            }
+        }
 
-                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.c = {0}", c);
-                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.h = {0}", h);
-                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.r = {0}", r);
-                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.n = {0} ({1})", n, 128 << n);
-                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.f = {0}", f);
+        // Read sectors
+        for(ushort cyl = 0; cyl < hdr.cylinders; cyl++)
+        {
+            bool emptyCyl = false;
 
-                        AaruConsole.DebugWriteLine("UkvFdi plugin", "sechdr.off = {0} ({1})", secOff,
-                                                   secOff + trkOff + hdr.dataOff);
+            for(ushort head = 0; head < hdr.heads; head++)
+            {
+                for(ushort sec = 0; sec < sectorsOff[cyl][head].Length; sec++)
+                {
+                    stream.Seek(sectorsOff[cyl][head][sec], SeekOrigin.Begin);
+                    stream.Read(_sectorsData[cyl][head][sec], 0, _sectorsData[cyl][head][sec].Length);
+                }
 
-                        // TODO: This assumes sequential sectors.
-                        sectorsOff[cyl][head][sec]   = secOff + trkOff + hdr.dataOff;
-                        _sectorsData[cyl][head][sec] = new byte[128 << n];
+                // For empty cylinders
+                if(sectorsOff[cyl][head].Length != 0)
+                    continue;
 
-                        if(128 << n > _imageInfo.SectorSize)
-                            _imageInfo.SectorSize = (uint)(128 << n);
-                    }
+                if(cyl + 1 == hdr.cylinders ||
+
+                   // Next cylinder is also empty
+                   sectorsOff[cyl + 1][head].Length == 0)
+                    emptyCyl = true;
+
+                // Create empty sectors
+                else
+                {
+                    _sectorsData[cyl][head] = new byte[spt][];
+
+                    for(int i = 0; i < spt; i++)
+                        _sectorsData[cyl][head][i] = new byte[_imageInfo.SectorSize];
                 }
             }
 
-            // Read sectors
-            for(ushort cyl = 0; cyl < hdr.cylinders; cyl++)
-            {
-                bool emptyCyl = false;
-
-                for(ushort head = 0; head < hdr.heads; head++)
-                {
-                    for(ushort sec = 0; sec < sectorsOff[cyl][head].Length; sec++)
-                    {
-                        stream.Seek(sectorsOff[cyl][head][sec], SeekOrigin.Begin);
-                        stream.Read(_sectorsData[cyl][head][sec], 0, _sectorsData[cyl][head][sec].Length);
-                    }
-
-                    // For empty cylinders
-                    if(sectorsOff[cyl][head].Length != 0)
-                        continue;
-
-                    if(cyl + 1 == hdr.cylinders ||
-
-                       // Next cylinder is also empty
-                       sectorsOff[cyl + 1][head].Length == 0)
-                        emptyCyl = true;
-
-                    // Create empty sectors
-                    else
-                    {
-                        _sectorsData[cyl][head] = new byte[spt][];
-
-                        for(int i = 0; i < spt; i++)
-                            _sectorsData[cyl][head][i] = new byte[_imageInfo.SectorSize];
-                    }
-                }
-
-                if(emptyCyl)
-                    _imageInfo.Cylinders--;
-            }
-
-            // TODO: What about double sided, half track pitch compact floppies?
-            _imageInfo.MediaType            = MediaType.CompactFloppy;
-            _imageInfo.ImageSize            = (ulong)stream.Length - hdr.dataOff;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.SectorsPerTrack      = (uint)spt;
-            _imageInfo.Sectors              = _imageInfo.Cylinders * _imageInfo.Heads * _imageInfo.SectorsPerTrack;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-
-            return ErrorNumber.NoError;
+            if(emptyCyl)
+                _imageInfo.Cylinders--;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        // TODO: What about double sided, half track pitch compact floppies?
+        _imageInfo.MediaType            = MediaType.CompactFloppy;
+        _imageInfo.ImageSize            = (ulong)stream.Length - hdr.dataOff;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.SectorsPerTrack      = (uint)spt;
+        _imageInfo.Sectors              = _imageInfo.Cylinders * _imageInfo.Heads * _imageInfo.SectorsPerTrack;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer                                    = null;
+        (ushort cylinder, byte head, byte sector) = LbaToChs(sectorAddress);
+
+        if(cylinder >= _sectorsData.Length)
+            return ErrorNumber.SectorNotFound;
+
+        if(head >= _sectorsData[cylinder].Length)
+            return ErrorNumber.SectorNotFound;
+
+        if(sector > _sectorsData[cylinder][head].Length)
+            return ErrorNumber.SectorNotFound;
+
+        buffer = _sectorsData[cylinder][head][sector - 1];
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer                                    = null;
-            (ushort cylinder, byte head, byte sector) = LbaToChs(sectorAddress);
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(cylinder >= _sectorsData.Length)
-                return ErrorNumber.SectorNotFound;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(head >= _sectorsData[cylinder].Length)
-                return ErrorNumber.SectorNotFound;
-
-            if(sector > _sectorsData[cylinder][head].Length)
-                return ErrorNumber.SectorNotFound;
-
-            buffer = _sectorsData[cylinder][head][sector - 1];
-
-            return ErrorNumber.NoError;
+            ms.Write(sector, 0, sector.Length);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = ms.ToArray();
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/Structs.cs b/Aaru.Images/UkvFdi/Structs.cs
index d6ae5a149..8a8f836d0 100644
--- a/Aaru.Images/UkvFdi/Structs.cs
+++ b/Aaru.Images/UkvFdi/Structs.cs
@@ -32,21 +32,20 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class UkvFdi
 {
-    public sealed partial class UkvFdi
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Header
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] magic;
-            public readonly DiskFlags flags;
-            public readonly ushort    cylinders;
-            public readonly ushort    heads;
-            public readonly ushort    descOff;
-            public readonly ushort    dataOff;
-            public readonly ushort    addInfoLen;
-        }
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] magic;
+        public readonly DiskFlags flags;
+        public readonly ushort    cylinders;
+        public readonly ushort    heads;
+        public readonly ushort    descOff;
+        public readonly ushort    dataOff;
+        public readonly ushort    addInfoLen;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/UkvFdi.cs b/Aaru.Images/UkvFdi/UkvFdi.cs
index dbb220349..90471181e 100644
--- a/Aaru.Images/UkvFdi/UkvFdi.cs
+++ b/Aaru.Images/UkvFdi/UkvFdi.cs
@@ -35,39 +35,38 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+/// <inheritdoc />
+/// <summary>Implements reading UKV FDI disk images</summary>
+public sealed partial class UkvFdi : IMediaImage
 {
-    /// <inheritdoc />
-    /// <summary>Implements reading UKV FDI disk images</summary>
-    public sealed partial class UkvFdi : IMediaImage
+    ImageInfo _imageInfo;
+
+    // Cylinder by head, sector data matrix
+    byte[][][][] _sectorsData;
+
+    public UkvFdi() => _imageInfo = new ImageInfo
     {
-        ImageInfo _imageInfo;
-
-        // Cylinder by head, sector data matrix
-        byte[][][][] _sectorsData;
-
-        public UkvFdi() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/UkvFdi/Unsupported.cs b/Aaru.Images/UkvFdi/Unsupported.cs
index 4bd925479..c546e9f12 100644
--- a/Aaru.Images/UkvFdi/Unsupported.cs
+++ b/Aaru.Images/UkvFdi/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class UkvFdi
 {
-    public sealed partial class UkvFdi
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Constants.cs b/Aaru.Images/VDI/Constants.cs
index 521381517..83d3132f2 100644
--- a/Aaru.Images/VDI/Constants.cs
+++ b/Aaru.Images/VDI/Constants.cs
@@ -30,24 +30,23 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vdi
 {
-    public sealed partial class Vdi
-    {
-        const uint VDI_MAGIC = 0xBEDA107F;
-        const uint VDI_EMPTY = 0xFFFFFFFF;
+    const uint VDI_MAGIC = 0xBEDA107F;
+    const uint VDI_EMPTY = 0xFFFFFFFF;
 
-        const string ORACLE_VDI      = "<<< Oracle VM VirtualBox Disk Image >>>\n";
-        const string QEMUVDI         = "<<< QEMU VM Virtual Disk Image >>>\n";
-        const string SUN_OLD_VDI     = "<<< Sun xVM VirtualBox Disk Image >>>\n";
-        const string SUN_VDI         = "<<< Sun VirtualBox Disk Image >>>\n";
-        const string INNOTEK_VDI     = "<<< innotek VirtualBox Disk Image >>>\n";
-        const string INNOTEK_OLD_VDI = "<<< InnoTek VirtualBox Disk Image >>>\n";
-        const string DIC_VDI         = "<<< DiscImageChef VirtualBox Disk Image >>>\n";
-        const string DIC_AARU        = "<<< Aaru VirtualBox Disk Image >>>\n";
+    const string ORACLE_VDI      = "<<< Oracle VM VirtualBox Disk Image >>>\n";
+    const string QEMUVDI         = "<<< QEMU VM Virtual Disk Image >>>\n";
+    const string SUN_OLD_VDI     = "<<< Sun xVM VirtualBox Disk Image >>>\n";
+    const string SUN_VDI         = "<<< Sun VirtualBox Disk Image >>>\n";
+    const string INNOTEK_VDI     = "<<< innotek VirtualBox Disk Image >>>\n";
+    const string INNOTEK_OLD_VDI = "<<< InnoTek VirtualBox Disk Image >>>\n";
+    const string DIC_VDI         = "<<< DiscImageChef VirtualBox Disk Image >>>\n";
+    const string DIC_AARU        = "<<< Aaru VirtualBox Disk Image >>>\n";
 
-        const uint MAX_CACHE_SIZE     = 16777216;
-        const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
-        const uint DEFAULT_BLOCK_SIZE = 1048576;
-    }
+    const uint MAX_CACHE_SIZE     = 16777216;
+    const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / 512;
+    const uint DEFAULT_BLOCK_SIZE = 1048576;
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Enums.cs b/Aaru.Images/VDI/Enums.cs
index 3925573ff..559a3ca48 100644
--- a/Aaru.Images/VDI/Enums.cs
+++ b/Aaru.Images/VDI/Enums.cs
@@ -32,35 +32,34 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Vdi
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Vdi
+    enum VdiImageType : uint
     {
-        enum VdiImageType : uint
-        {
-            /// <summary> Normal dynamically growing base image file.</summary>
-            Normal = 1,
-            /// <summary>Preallocated base image file of a fixed size.</summary>
-            Fixed,
-            /// <summary>Dynamically growing image file for undo/commit changes support.</summary>
-            Undo,
-            /// <summary>Dynamically growing image file for differencing support.</summary>
-            Differential,
+        /// <summary> Normal dynamically growing base image file.</summary>
+        Normal = 1,
+        /// <summary>Preallocated base image file of a fixed size.</summary>
+        Fixed,
+        /// <summary>Dynamically growing image file for undo/commit changes support.</summary>
+        Undo,
+        /// <summary>Dynamically growing image file for differencing support.</summary>
+        Differential,
 
-            /// <summary>First valid image type value.</summary>
-            First = Normal,
-            /// <summary>Last valid image type value.</summary>
-            Last = Differential
-        }
+        /// <summary>First valid image type value.</summary>
+        First = Normal,
+        /// <summary>Last valid image type value.</summary>
+        Last = Differential
+    }
 
-        enum VdiImageFlags : uint
-        {
-            /// <summary>
-            ///     Fill new blocks with zeroes while expanding image file. Only valid for newly created images, never set for
-            ///     opened existing images.
-            /// </summary>
-            ZeroExpand = 0x100
-        }
+    enum VdiImageFlags : uint
+    {
+        /// <summary>
+        ///     Fill new blocks with zeroes while expanding image file. Only valid for newly created images, never set for
+        ///     opened existing images.
+        /// </summary>
+        ZeroExpand = 0x100
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Identify.cs b/Aaru.Images/VDI/Identify.cs
index bb23f5857..f274f7df1 100644
--- a/Aaru.Images/VDI/Identify.cs
+++ b/Aaru.Images/VDI/Identify.cs
@@ -34,24 +34,23 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vdi
 {
-    public sealed partial class Vdi
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512)
-                return false;
+        if(stream.Length < 512)
+            return false;
 
-            byte[] vHdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(vHdrB, 0, Marshal.SizeOf<Header>());
-            _vHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(vHdrB);
+        byte[] vHdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(vHdrB, 0, Marshal.SizeOf<Header>());
+        _vHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(vHdrB);
 
-            return _vHdr.magic == VDI_MAGIC;
-        }
+        return _vHdr.magic == VDI_MAGIC;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Properties.cs b/Aaru.Images/VDI/Properties.cs
index d9057266b..69a4ac532 100644
--- a/Aaru.Images/VDI/Properties.cs
+++ b/Aaru.Images/VDI/Properties.cs
@@ -37,52 +37,51 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vdi
 {
-    public sealed partial class Vdi
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "VirtualBox Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "VDI";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+        MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
 
-        /// <inheritdoc />
-        public string Name => "VirtualBox Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "VDI";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+    // TODO: Add cluster size option
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.Unknown, MediaType.GENERIC_HDD, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-
-        // TODO: Add cluster size option
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".vdi"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".vdi"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Read.cs b/Aaru.Images/VDI/Read.cs
index 744b3bb5a..0e0bc9754 100644
--- a/Aaru.Images/VDI/Read.cs
+++ b/Aaru.Images/VDI/Read.cs
@@ -40,226 +40,225 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vdi
 {
-    public sealed partial class Vdi
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 512)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] vHdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(vHdrB, 0, Marshal.SizeOf<Header>());
+        _vHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(vHdrB);
+
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.creator = {0}", _vHdr.creator);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.magic = {0}", _vHdr.magic);
+
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.version = {0}.{1}", _vHdr.majorVersion,
+                                   _vHdr.minorVersion);
+
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.headerSize = {0}", _vHdr.headerSize);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.imageType = {0}", _vHdr.imageType);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.imageFlags = {0}", _vHdr.imageFlags);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.description = {0}", _vHdr.comments);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.offsetBlocks = {0}", _vHdr.offsetBlocks);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.offsetData = {0}", _vHdr.offsetData);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.cylinders = {0}", _vHdr.cylinders);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.heads = {0}", _vHdr.heads);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.spt = {0}", _vHdr.spt);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.sectorSize = {0}", _vHdr.sectorSize);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.size = {0}", _vHdr.size);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blockSize = {0}", _vHdr.blockSize);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blockExtraData = {0}", _vHdr.blockExtraData);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blocks = {0}", _vHdr.blocks);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.allocatedBlocks = {0}", _vHdr.allocatedBlocks);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.uuid = {0}", _vHdr.uuid);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.snapshotUuid = {0}", _vHdr.snapshotUuid);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.linkUuid = {0}", _vHdr.linkUuid);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.parentUuid = {0}", _vHdr.parentUuid);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.logicalCylinders = {0}", _vHdr.logicalCylinders);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.logicalHeads = {0}", _vHdr.logicalHeads);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.logicalSpt = {0}", _vHdr.logicalSpt);
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.logicalSectorSize = {0}", _vHdr.logicalSectorSize);
+
+        if(_vHdr.imageType != VdiImageType.Normal)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            AaruConsole.ErrorWriteLine($"Support for image type {_vHdr.imageType} not yet implemented");
 
-            if(stream.Length < 512)
-                return ErrorNumber.InvalidArgument;
-
-            byte[] vHdrB = new byte[Marshal.SizeOf<Header>()];
-            stream.Read(vHdrB, 0, Marshal.SizeOf<Header>());
-            _vHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(vHdrB);
-
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.creator = {0}", _vHdr.creator);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.magic = {0}", _vHdr.magic);
-
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.version = {0}.{1}", _vHdr.majorVersion,
-                                       _vHdr.minorVersion);
-
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.headerSize = {0}", _vHdr.headerSize);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.imageType = {0}", _vHdr.imageType);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.imageFlags = {0}", _vHdr.imageFlags);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.description = {0}", _vHdr.comments);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.offsetBlocks = {0}", _vHdr.offsetBlocks);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.offsetData = {0}", _vHdr.offsetData);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.cylinders = {0}", _vHdr.cylinders);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.heads = {0}", _vHdr.heads);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.spt = {0}", _vHdr.spt);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.sectorSize = {0}", _vHdr.sectorSize);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.size = {0}", _vHdr.size);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blockSize = {0}", _vHdr.blockSize);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blockExtraData = {0}", _vHdr.blockExtraData);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.blocks = {0}", _vHdr.blocks);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.allocatedBlocks = {0}", _vHdr.allocatedBlocks);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.uuid = {0}", _vHdr.uuid);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.snapshotUuid = {0}", _vHdr.snapshotUuid);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.linkUuid = {0}", _vHdr.linkUuid);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.parentUuid = {0}", _vHdr.parentUuid);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.logicalCylinders = {0}", _vHdr.logicalCylinders);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.logicalHeads = {0}", _vHdr.logicalHeads);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.logicalSpt = {0}", _vHdr.logicalSpt);
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "vHdr.logicalSectorSize = {0}", _vHdr.logicalSectorSize);
-
-            if(_vHdr.imageType != VdiImageType.Normal)
-            {
-                AaruConsole.ErrorWriteLine($"Support for image type {_vHdr.imageType} not yet implemented");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            DateTime start = DateTime.UtcNow;
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "Reading Image Block Map");
-            stream.Seek(_vHdr.offsetBlocks, SeekOrigin.Begin);
-            byte[] ibmB = new byte[_vHdr.blocks * 4];
-            stream.Read(ibmB, 0, ibmB.Length);
-            _ibm = MemoryMarshal.Cast<byte, uint>(ibmB).ToArray();
-            DateTime end = DateTime.UtcNow;
-
-            AaruConsole.DebugWriteLine("VirtualBox plugin", "Reading Image Block Map took {0} ms",
-                                       (end - start).TotalMilliseconds);
-
-            _sectorCache = new Dictionary<ulong, byte[]>();
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = _vHdr.size / _vHdr.sectorSize;
-            _imageInfo.ImageSize            = _vHdr.size;
-            _imageInfo.SectorSize           = _vHdr.sectorSize;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.MediaType            = MediaType.GENERIC_HDD;
-            _imageInfo.Comments             = _vHdr.comments;
-            _imageInfo.Version              = $"{_vHdr.majorVersion}.{_vHdr.minorVersion}";
-
-            switch(_vHdr.creator)
-            {
-                case SUN_VDI:
-                    _imageInfo.Application = "Sun VirtualBox";
-
-                    break;
-                case SUN_OLD_VDI:
-                    _imageInfo.Application = "Sun xVM";
-
-                    break;
-                case ORACLE_VDI:
-                    _imageInfo.Application = "Oracle VirtualBox";
-
-                    break;
-                case QEMUVDI:
-                    _imageInfo.Application = "QEMU";
-
-                    break;
-                case INNOTEK_VDI:
-                case INNOTEK_OLD_VDI:
-                    _imageInfo.Application = "innotek VirtualBox";
-
-                    break;
-                case DIC_VDI:
-                    _imageInfo.Application = "DiscImageChef";
-
-                    break;
-                case DIC_AARU:
-                    _imageInfo.Application = "Aaru";
-
-                    break;
-            }
-
-            _imageStream = stream;
-
-            if(_vHdr.headerSize >= 400)
-            {
-                _imageInfo.Cylinders       = _vHdr.logicalCylinders;
-                _imageInfo.Heads           = _vHdr.logicalHeads;
-                _imageInfo.SectorsPerTrack = _vHdr.logicalSpt;
-            }
-            else
-            {
-                _imageInfo.Cylinders       = _vHdr.cylinders;
-                _imageInfo.Heads           = _vHdr.heads;
-                _imageInfo.SectorsPerTrack = _vHdr.spt;
-            }
-
-            if(_imageInfo.Cylinders != 0)
-                return ErrorNumber.InvalidArgument;
-
-            // Same calculation as done by VirtualBox
-            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-            _imageInfo.Heads           = 16;
-            _imageInfo.SectorsPerTrack = 63;
-
-            while(_imageInfo.Cylinders == 0)
-            {
-                _imageInfo.Heads--;
-
-                if(_imageInfo.Heads == 0)
-                {
-                    _imageInfo.SectorsPerTrack--;
-                    _imageInfo.Heads = 16;
-                }
-
-                _vHdr.logicalCylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
-
-                if(_imageInfo.Cylinders       == 0 &&
-                   _imageInfo.Heads           == 0 &&
-                   _imageInfo.SectorsPerTrack == 0)
-                    break;
-            }
-
-            return ErrorNumber.NoError;
+            return ErrorNumber.InvalidArgument;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        DateTime start = DateTime.UtcNow;
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "Reading Image Block Map");
+        stream.Seek(_vHdr.offsetBlocks, SeekOrigin.Begin);
+        byte[] ibmB = new byte[_vHdr.blocks * 4];
+        stream.Read(ibmB, 0, ibmB.Length);
+        _ibm = MemoryMarshal.Cast<byte, uint>(ibmB).ToArray();
+        DateTime end = DateTime.UtcNow;
+
+        AaruConsole.DebugWriteLine("VirtualBox plugin", "Reading Image Block Map took {0} ms",
+                                   (end - start).TotalMilliseconds);
+
+        _sectorCache = new Dictionary<ulong, byte[]>();
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = _vHdr.size / _vHdr.sectorSize;
+        _imageInfo.ImageSize            = _vHdr.size;
+        _imageInfo.SectorSize           = _vHdr.sectorSize;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.MediaType            = MediaType.GENERIC_HDD;
+        _imageInfo.Comments             = _vHdr.comments;
+        _imageInfo.Version              = $"{_vHdr.majorVersion}.{_vHdr.minorVersion}";
+
+        switch(_vHdr.creator)
         {
-            buffer = null;
+            case SUN_VDI:
+                _imageInfo.Application = "Sun VirtualBox";
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+                break;
+            case SUN_OLD_VDI:
+                _imageInfo.Application = "Sun xVM";
 
-            if(_sectorCache.TryGetValue(sectorAddress, out buffer))
-                return ErrorNumber.NoError;
+                break;
+            case ORACLE_VDI:
+                _imageInfo.Application = "Oracle VirtualBox";
 
-            ulong index  = sectorAddress * _vHdr.sectorSize / _vHdr.blockSize;
-            ulong secOff = sectorAddress * _vHdr.sectorSize % _vHdr.blockSize;
+                break;
+            case QEMUVDI:
+                _imageInfo.Application = "QEMU";
 
-            uint ibmOff = _ibm[(int)index];
+                break;
+            case INNOTEK_VDI:
+            case INNOTEK_OLD_VDI:
+                _imageInfo.Application = "innotek VirtualBox";
 
-            if(ibmOff == VDI_EMPTY)
+                break;
+            case DIC_VDI:
+                _imageInfo.Application = "DiscImageChef";
+
+                break;
+            case DIC_AARU:
+                _imageInfo.Application = "Aaru";
+
+                break;
+        }
+
+        _imageStream = stream;
+
+        if(_vHdr.headerSize >= 400)
+        {
+            _imageInfo.Cylinders       = _vHdr.logicalCylinders;
+            _imageInfo.Heads           = _vHdr.logicalHeads;
+            _imageInfo.SectorsPerTrack = _vHdr.logicalSpt;
+        }
+        else
+        {
+            _imageInfo.Cylinders       = _vHdr.cylinders;
+            _imageInfo.Heads           = _vHdr.heads;
+            _imageInfo.SectorsPerTrack = _vHdr.spt;
+        }
+
+        if(_imageInfo.Cylinders != 0)
+            return ErrorNumber.InvalidArgument;
+
+        // Same calculation as done by VirtualBox
+        _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+        _imageInfo.Heads           = 16;
+        _imageInfo.SectorsPerTrack = 63;
+
+        while(_imageInfo.Cylinders == 0)
+        {
+            _imageInfo.Heads--;
+
+            if(_imageInfo.Heads == 0)
             {
-                buffer = new byte[_vHdr.sectorSize];
-
-                return ErrorNumber.NoError;
+                _imageInfo.SectorsPerTrack--;
+                _imageInfo.Heads = 16;
             }
 
-            ulong imageOff = _vHdr.offsetData + ((ulong)ibmOff * _vHdr.blockSize);
+            _vHdr.logicalCylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
 
-            byte[] cluster = new byte[_vHdr.blockSize];
-            _imageStream.Seek((long)imageOff, SeekOrigin.Begin);
-            _imageStream.Read(cluster, 0, (int)_vHdr.blockSize);
+            if(_imageInfo.Cylinders       == 0 &&
+               _imageInfo.Heads           == 0 &&
+               _imageInfo.SectorsPerTrack == 0)
+                break;
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(_sectorCache.TryGetValue(sectorAddress, out buffer))
+            return ErrorNumber.NoError;
+
+        ulong index  = sectorAddress * _vHdr.sectorSize / _vHdr.blockSize;
+        ulong secOff = sectorAddress * _vHdr.sectorSize % _vHdr.blockSize;
+
+        uint ibmOff = _ibm[(int)index];
+
+        if(ibmOff == VDI_EMPTY)
+        {
             buffer = new byte[_vHdr.sectorSize];
-            Array.Copy(cluster, (int)secOff, buffer, 0, _vHdr.sectorSize);
-
-            if(_sectorCache.Count > MAX_CACHED_SECTORS)
-                _sectorCache.Clear();
-
-            _sectorCache.Add(sectorAddress, buffer);
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        ulong imageOff = _vHdr.offsetData + ((ulong)ibmOff * _vHdr.blockSize);
+
+        byte[] cluster = new byte[_vHdr.blockSize];
+        _imageStream.Seek((long)imageOff, SeekOrigin.Begin);
+        _imageStream.Read(cluster, 0, (int)_vHdr.blockSize);
+        buffer = new byte[_vHdr.sectorSize];
+        Array.Copy(cluster, (int)secOff, buffer, 0, _vHdr.sectorSize);
+
+        if(_sectorCache.Count > MAX_CACHED_SECTORS)
+            _sectorCache.Clear();
+
+        _sectorCache.Add(sectorAddress, buffer);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            ms.Write(sector, 0, sector.Length);
         }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Structs.cs b/Aaru.Images/VDI/Structs.cs
index 8bbf9fdb6..2483ad73b 100644
--- a/Aaru.Images/VDI/Structs.cs
+++ b/Aaru.Images/VDI/Structs.cs
@@ -33,46 +33,45 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vdi
 {
-    public sealed partial class Vdi
+    /// <summary>VDI disk image header, little-endian</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Header
     {
-        /// <summary>VDI disk image header, little-endian</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Header
-        {
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
-            public string creator;
-            /// <summary>Magic, <see cref="Vdi.VDI_MAGIC" /></summary>
-            public uint magic;
-            /// <summary>Version</summary>
-            public ushort majorVersion;
-            public          ushort        minorVersion;
-            public          int           headerSize;
-            public          VdiImageType  imageType;
-            public readonly VdiImageFlags imageFlags;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
-            public string comments;
-            public          uint  offsetBlocks;
-            public          uint  offsetData;
-            public          uint  cylinders;
-            public          uint  heads;
-            public          uint  spt;
-            public          uint  sectorSize;
-            public readonly uint  unused;
-            public          ulong size;
-            public          uint  blockSize;
-            public readonly uint  blockExtraData;
-            public          uint  blocks;
-            public          uint  allocatedBlocks;
-            public          Guid  uuid;
-            public          Guid  snapshotUuid;
-            public readonly Guid  linkUuid;
-            public readonly Guid  parentUuid;
-            public          uint  logicalCylinders;
-            public          uint  logicalHeads;
-            public          uint  logicalSpt;
-            public readonly uint  logicalSectorSize;
-        }
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 64)]
+        public string creator;
+        /// <summary>Magic, <see cref="Vdi.VDI_MAGIC" /></summary>
+        public uint magic;
+        /// <summary>Version</summary>
+        public ushort majorVersion;
+        public          ushort        minorVersion;
+        public          int           headerSize;
+        public          VdiImageType  imageType;
+        public readonly VdiImageFlags imageFlags;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 256)]
+        public string comments;
+        public          uint  offsetBlocks;
+        public          uint  offsetData;
+        public          uint  cylinders;
+        public          uint  heads;
+        public          uint  spt;
+        public          uint  sectorSize;
+        public readonly uint  unused;
+        public          ulong size;
+        public          uint  blockSize;
+        public readonly uint  blockExtraData;
+        public          uint  blocks;
+        public          uint  allocatedBlocks;
+        public          Guid  uuid;
+        public          Guid  snapshotUuid;
+        public readonly Guid  linkUuid;
+        public readonly Guid  parentUuid;
+        public          uint  logicalCylinders;
+        public          uint  logicalHeads;
+        public          uint  logicalSpt;
+        public readonly uint  logicalSectorSize;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Unsupported.cs b/Aaru.Images/VDI/Unsupported.cs
index 59de0aec8..cc2171416 100644
--- a/Aaru.Images/VDI/Unsupported.cs
+++ b/Aaru.Images/VDI/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vdi
 {
-    public sealed partial class Vdi
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/VDI.cs b/Aaru.Images/VDI/VDI.cs
index d15e84d8c..0cc4b4e9d 100644
--- a/Aaru.Images/VDI/VDI.cs
+++ b/Aaru.Images/VDI/VDI.cs
@@ -36,44 +36,43 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    // TODO: Support version 0
-    // TODO: Support fixed images
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing VirtualBox disk images</summary>
-    public sealed partial class Vdi : IWritableImage
-    {
-        ulong                     _currentWritingPosition;
-        uint[]                    _ibm;
-        ImageInfo                 _imageInfo;
-        Stream                    _imageStream;
-        Dictionary<ulong, byte[]> _sectorCache;
-        Header                    _vHdr;
-        FileStream                _writingStream;
+namespace Aaru.DiscImages;
 
-        public Vdi() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// TODO: Support version 0
+// TODO: Support fixed images
+/// <inheritdoc />
+/// <summary>Implements reading and writing VirtualBox disk images</summary>
+public sealed partial class Vdi : IWritableImage
+{
+    ulong                     _currentWritingPosition;
+    uint[]                    _ibm;
+    ImageInfo                 _imageInfo;
+    Stream                    _imageStream;
+    Dictionary<ulong, byte[]> _sectorCache;
+    Header                    _vHdr;
+    FileStream                _writingStream;
+
+    public Vdi() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/VDI/Write.cs b/Aaru.Images/VDI/Write.cs
index 491302c40..e83c7e223 100644
--- a/Aaru.Images/VDI/Write.cs
+++ b/Aaru.Images/VDI/Write.cs
@@ -42,310 +42,309 @@ using Aaru.Helpers;
 using Schemas;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vdi
 {
-    public sealed partial class Vdi
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            if(sectors * sectorSize / DEFAULT_BLOCK_SIZE > uint.MaxValue)
-            {
-                ErrorMessage = "Too many sectors for selected cluster size";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            uint ibmEntries = (uint)(sectors * sectorSize / DEFAULT_BLOCK_SIZE);
-
-            if(sectors * sectorSize % DEFAULT_BLOCK_SIZE > 0)
-                ibmEntries++;
-
-            uint headerSectors = 1 + (ibmEntries * 4 / sectorSize);
-
-            if(ibmEntries * 4 % sectorSize != 0)
-                headerSectors++;
-
-            _ibm                    = new uint[ibmEntries];
-            _currentWritingPosition = headerSectors * sectorSize;
-
-            _vHdr = new Header
-            {
-                creator      = DIC_AARU,
-                magic        = VDI_MAGIC,
-                majorVersion = 1,
-                minorVersion = 1,
-                headerSize   = Marshal.SizeOf<Header>() - 72,
-                imageType    = VdiImageType.Normal,
-                offsetBlocks = sectorSize,
-                offsetData   = (uint)_currentWritingPosition,
-                sectorSize   = sectorSize,
-                size         = sectors * sectorSize,
-                blockSize    = DEFAULT_BLOCK_SIZE,
-                blocks       = ibmEntries,
-                uuid         = Guid.NewGuid(),
-                snapshotUuid = Guid.NewGuid()
-            };
-
-            for(uint i = 0; i < ibmEntries; i++)
-                _ibm[i] = VDI_EMPTY;
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-                return true;
-
-            ulong index  = sectorAddress * _vHdr.sectorSize / _vHdr.blockSize;
-            ulong secOff = sectorAddress * _vHdr.sectorSize % _vHdr.blockSize;
-
-            uint ibmOff = _ibm[index];
-
-            if(ibmOff == VDI_EMPTY)
-            {
-                ibmOff                  =  (uint)((_currentWritingPosition - _vHdr.offsetData) / _vHdr.blockSize);
-                _ibm[index]             =  ibmOff;
-                _currentWritingPosition += _vHdr.blockSize;
-                _vHdr.allocatedBlocks++;
-            }
-
-            ulong imageOff = _vHdr.offsetData + ((ulong)ibmOff * _vHdr.blockSize);
-
-            _writingStream.Seek((long)imageOff, SeekOrigin.Begin);
-            _writingStream.Seek((long)secOff, SeekOrigin.Current);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        // TODO: This can be optimized
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            // Ignore empty sectors
-            if(ArrayHelpers.ArrayIsNullOrEmpty(data))
-                return true;
-
-            for(uint i = 0; i < length; i++)
-            {
-                byte[] tmp = new byte[_imageInfo.SectorSize];
-                Array.Copy(data, i * _imageInfo.SectorSize, tmp, 0, _imageInfo.SectorSize);
-
-                if(!WriteSector(tmp, sectorAddress + i))
-                    return false;
-            }
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        if(sectors * sectorSize / DEFAULT_BLOCK_SIZE > uint.MaxValue)
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors for selected cluster size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                _vHdr.comments = _imageInfo.Comments.Length > 255 ? _imageInfo.Comments.Substring(0, 255)
-                                     : _imageInfo.Comments;
-
-            if(_vHdr.logicalCylinders == 0)
-            {
-                _vHdr.logicalCylinders = (uint)(_imageInfo.Sectors / 16 / 63);
-                _vHdr.logicalHeads     = 16;
-                _vHdr.logicalSpt       = 63;
-
-                while(_vHdr.logicalCylinders == 0)
-                {
-                    _vHdr.logicalHeads--;
-
-                    if(_vHdr.logicalHeads == 0)
-                    {
-                        _vHdr.logicalSpt--;
-                        _vHdr.logicalHeads = 16;
-                    }
-
-                    _vHdr.logicalCylinders = (uint)(_imageInfo.Sectors / _vHdr.logicalHeads / _vHdr.logicalSpt);
-
-                    if(_vHdr.logicalCylinders == 0 &&
-                       _vHdr.logicalHeads     == 0 &&
-                       _vHdr.logicalSpt       == 0)
-                        break;
-                }
-            }
-
-            byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
-            IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(_vHdr, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _writingStream.Seek(_vHdr.offsetBlocks, SeekOrigin.Begin);
-            _writingStream.Write(MemoryMarshal.Cast<uint, byte>(_ibm).ToArray(), 0, 4 * _ibm.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
         }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata)
+        catch(IOException e)
         {
-            _imageInfo.Comments = metadata.Comments;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
-        {
-            _vHdr.cylinders = cylinders;
-            _vHdr.heads     = heads;
-            _vHdr.spt       = sectorsPerTrack;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+        uint ibmEntries = (uint)(sectors * sectorSize / DEFAULT_BLOCK_SIZE);
+
+        if(sectors * sectorSize % DEFAULT_BLOCK_SIZE > 0)
+            ibmEntries++;
+
+        uint headerSectors = 1 + (ibmEntries * 4 / sectorSize);
+
+        if(ibmEntries * 4 % sectorSize != 0)
+            headerSectors++;
+
+        _ibm                    = new uint[ibmEntries];
+        _currentWritingPosition = headerSectors * sectorSize;
+
+        _vHdr = new Header
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            creator      = DIC_AARU,
+            magic        = VDI_MAGIC,
+            majorVersion = 1,
+            minorVersion = 1,
+            headerSize   = Marshal.SizeOf<Header>() - 72,
+            imageType    = VdiImageType.Normal,
+            offsetBlocks = sectorSize,
+            offsetData   = (uint)_currentWritingPosition,
+            sectorSize   = sectorSize,
+            size         = sectors * sectorSize,
+            blockSize    = DEFAULT_BLOCK_SIZE,
+            blocks       = ibmEntries,
+            uuid         = Guid.NewGuid(),
+            snapshotUuid = Guid.NewGuid()
+        };
 
-            return false;
-        }
+        for(uint i = 0; i < ibmEntries; i++)
+            _ibm[i] = VDI_EMPTY;
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+        IsWriting    = true;
+        ErrorMessage = null;
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+            return true;
+
+        ulong index  = sectorAddress * _vHdr.sectorSize / _vHdr.blockSize;
+        ulong secOff = sectorAddress * _vHdr.sectorSize % _vHdr.blockSize;
+
+        uint ibmOff = _ibm[index];
+
+        if(ibmOff == VDI_EMPTY)
+        {
+            ibmOff                  =  (uint)((_currentWritingPosition - _vHdr.offsetData) / _vHdr.blockSize);
+            _ibm[index]             =  ibmOff;
+            _currentWritingPosition += _vHdr.blockSize;
+            _vHdr.allocatedBlocks++;
+        }
+
+        ulong imageOff = _vHdr.offsetData + ((ulong)ibmOff * _vHdr.blockSize);
+
+        _writingStream.Seek((long)imageOff, SeekOrigin.Begin);
+        _writingStream.Seek((long)secOff, SeekOrigin.Current);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    // TODO: This can be optimized
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        // Ignore empty sectors
+        if(ArrayHelpers.ArrayIsNullOrEmpty(data))
+            return true;
+
+        for(uint i = 0; i < length; i++)
+        {
+            byte[] tmp = new byte[_imageInfo.SectorSize];
+            Array.Copy(data, i * _imageInfo.SectorSize, tmp, 0, _imageInfo.SectorSize);
+
+            if(!WriteSector(tmp, sectorAddress + i))
+                return false;
+        }
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+            _vHdr.comments = _imageInfo.Comments.Length > 255 ? _imageInfo.Comments.Substring(0, 255)
+                                 : _imageInfo.Comments;
+
+        if(_vHdr.logicalCylinders == 0)
+        {
+            _vHdr.logicalCylinders = (uint)(_imageInfo.Sectors / 16 / 63);
+            _vHdr.logicalHeads     = 16;
+            _vHdr.logicalSpt       = 63;
+
+            while(_vHdr.logicalCylinders == 0)
+            {
+                _vHdr.logicalHeads--;
+
+                if(_vHdr.logicalHeads == 0)
+                {
+                    _vHdr.logicalSpt--;
+                    _vHdr.logicalHeads = 16;
+                }
+
+                _vHdr.logicalCylinders = (uint)(_imageInfo.Sectors / _vHdr.logicalHeads / _vHdr.logicalSpt);
+
+                if(_vHdr.logicalCylinders == 0 &&
+                   _vHdr.logicalHeads     == 0 &&
+                   _vHdr.logicalSpt       == 0)
+                    break;
+            }
+        }
+
+        byte[] hdr    = new byte[Marshal.SizeOf<Header>()];
+        IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(_vHdr, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Seek(_vHdr.offsetBlocks, SeekOrigin.Begin);
+        _writingStream.Write(MemoryMarshal.Cast<uint, byte>(_ibm).ToArray(), 0, 4 * _ibm.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata)
+    {
+        _imageInfo.Comments = metadata.Comments;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        _vHdr.cylinders = cylinders;
+        _vHdr.heads     = heads;
+        _vHdr.spt       = sectorsPerTrack;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Constants.cs b/Aaru.Images/VHD/Constants.cs
index e036fb90f..1d4984ebf 100644
--- a/Aaru.Images/VHD/Constants.cs
+++ b/Aaru.Images/VHD/Constants.cs
@@ -32,82 +32,81 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Vhd
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Vhd
-    {
-        /// <summary>File magic number, "conectix"</summary>
-        const ulong IMAGE_COOKIE = 0x636F6E6563746978;
-        /// <summary>Dynamic disk header magic, "cxsparse"</summary>
-        const ulong DYNAMIC_COOKIE = 0x6378737061727365;
+    /// <summary>File magic number, "conectix"</summary>
+    const ulong IMAGE_COOKIE = 0x636F6E6563746978;
+    /// <summary>Dynamic disk header magic, "cxsparse"</summary>
+    const ulong DYNAMIC_COOKIE = 0x6378737061727365;
 
-        /// <summary>Disk image is candidate for deletion on shutdown</summary>
-        const uint FEATURES_TEMPORARY = 0x00000001;
-        /// <summary>Unknown, set from Virtual PC for Mac 7 onwards</summary>
-        const uint FEATURES_RESERVED = 0x00000002;
-        /// <summary>Unknown</summary>
-        const uint FEATURES_UNKNOWN = 0x00000100;
+    /// <summary>Disk image is candidate for deletion on shutdown</summary>
+    const uint FEATURES_TEMPORARY = 0x00000001;
+    /// <summary>Unknown, set from Virtual PC for Mac 7 onwards</summary>
+    const uint FEATURES_RESERVED = 0x00000002;
+    /// <summary>Unknown</summary>
+    const uint FEATURES_UNKNOWN = 0x00000100;
 
-        /// <summary>Only known version</summary>
-        const uint VERSION1 = 0x00010000;
+    /// <summary>Only known version</summary>
+    const uint VERSION1 = 0x00010000;
 
-        /// <summary>Created by Virtual PC, "vpc "</summary>
-        const uint CREATOR_VIRTUAL_PC = 0x76706320;
-        /// <summary>Created by Virtual Server, "vs  "</summary>
-        const uint CREATOR_VIRTUAL_SERVER = 0x76732020;
-        /// <summary>Created by QEMU, "qemu"</summary>
-        const uint CREATOR_QEMU = 0x71656D75;
-        /// <summary>Created by VirtualBox, "vbox"</summary>
-        const uint CREATOR_VIRTUAL_BOX = 0x76626F78;
-        /// <summary>Created by DiscImageChef, "dic "</summary>
-        const uint CREATOR_DISCIMAGECHEF = 0x64696320;
-        /// <summary>Created by Aaru, "aaru"</summary>
-        const uint CREATOR_AARU = 0x61617275;
-        /// <summary>Disk image created by Virtual Server 2004</summary>
-        const uint VERSION_VIRTUAL_SERVER2004 = 0x00010000;
-        /// <summary>Disk image created by Virtual PC 2004</summary>
-        const uint VERSION_VIRTUAL_PC2004 = 0x00050000;
-        /// <summary>Disk image created by Virtual PC 2007</summary>
-        const uint VERSION_VIRTUAL_PC2007 = 0x00050003;
-        /// <summary>Disk image created by Virtual PC for Mac 5, 6 or 7</summary>
-        const uint VERSION_VIRTUAL_PC_MAC = 0x00040000;
+    /// <summary>Created by Virtual PC, "vpc "</summary>
+    const uint CREATOR_VIRTUAL_PC = 0x76706320;
+    /// <summary>Created by Virtual Server, "vs  "</summary>
+    const uint CREATOR_VIRTUAL_SERVER = 0x76732020;
+    /// <summary>Created by QEMU, "qemu"</summary>
+    const uint CREATOR_QEMU = 0x71656D75;
+    /// <summary>Created by VirtualBox, "vbox"</summary>
+    const uint CREATOR_VIRTUAL_BOX = 0x76626F78;
+    /// <summary>Created by DiscImageChef, "dic "</summary>
+    const uint CREATOR_DISCIMAGECHEF = 0x64696320;
+    /// <summary>Created by Aaru, "aaru"</summary>
+    const uint CREATOR_AARU = 0x61617275;
+    /// <summary>Disk image created by Virtual Server 2004</summary>
+    const uint VERSION_VIRTUAL_SERVER2004 = 0x00010000;
+    /// <summary>Disk image created by Virtual PC 2004</summary>
+    const uint VERSION_VIRTUAL_PC2004 = 0x00050000;
+    /// <summary>Disk image created by Virtual PC 2007</summary>
+    const uint VERSION_VIRTUAL_PC2007 = 0x00050003;
+    /// <summary>Disk image created by Virtual PC for Mac 5, 6 or 7</summary>
+    const uint VERSION_VIRTUAL_PC_MAC = 0x00040000;
 
-        /// <summary>Disk image created in Windows, "Wi2k"</summary>
-        const uint CREATOR_WINDOWS = 0x5769326B;
-        /// <summary>Disk image created in Macintosh, "Mac "</summary>
-        const uint CREATOR_MACINTOSH = 0x4D616320;
-        /// <summary>Seen in Virtual PC for Mac for dynamic and fixed images</summary>
-        const uint CREATOR_MACINTOSH_OLD = 0x00000000;
+    /// <summary>Disk image created in Windows, "Wi2k"</summary>
+    const uint CREATOR_WINDOWS = 0x5769326B;
+    /// <summary>Disk image created in Macintosh, "Mac "</summary>
+    const uint CREATOR_MACINTOSH = 0x4D616320;
+    /// <summary>Seen in Virtual PC for Mac for dynamic and fixed images</summary>
+    const uint CREATOR_MACINTOSH_OLD = 0x00000000;
 
-        /// <summary>Disk image type is none, useless?</summary>
-        const uint TYPE_NONE = 0;
-        /// <summary>Deprecated disk image type</summary>
-        const uint TYPE_DEPRECATED1 = 1;
-        /// <summary>Fixed disk image type</summary>
-        const uint TYPE_FIXED = 2;
-        /// <summary>Dynamic disk image type</summary>
-        const uint TYPE_DYNAMIC = 3;
-        /// <summary>Differencing disk image type</summary>
-        const uint TYPE_DIFFERENCING = 4;
-        /// <summary>Deprecated disk image type</summary>
-        const uint TYPE_DEPRECATED2 = 5;
-        /// <summary>Deprecated disk image type</summary>
-        const uint TYPE_DEPRECATED3 = 6;
+    /// <summary>Disk image type is none, useless?</summary>
+    const uint TYPE_NONE = 0;
+    /// <summary>Deprecated disk image type</summary>
+    const uint TYPE_DEPRECATED1 = 1;
+    /// <summary>Fixed disk image type</summary>
+    const uint TYPE_FIXED = 2;
+    /// <summary>Dynamic disk image type</summary>
+    const uint TYPE_DYNAMIC = 3;
+    /// <summary>Differencing disk image type</summary>
+    const uint TYPE_DIFFERENCING = 4;
+    /// <summary>Deprecated disk image type</summary>
+    const uint TYPE_DEPRECATED2 = 5;
+    /// <summary>Deprecated disk image type</summary>
+    const uint TYPE_DEPRECATED3 = 6;
 
-        /// <summary>Means platform locator is unused</summary>
-        const uint PLATFORM_CODE_UNUSED = 0x00000000;
-        /// <summary>Stores a relative path string for Windows, unknown locale used, deprecated, "Wi2r"</summary>
-        const uint PLATFORM_CODE_WINDOWS_RELATIVE = 0x57693272;
-        /// <summary>Stores an absolute path string for Windows, unknown locale used, deprecated, "Wi2k"</summary>
-        const uint PLATFORM_CODE_WINDOWS_ABSOLUTE = 0x5769326B;
-        /// <summary>Stores a relative path string for Windows in UTF-16, "W2ru"</summary>
-        const uint PLATFORM_CODE_WINDOWS_RELATIVE_U = 0x57327275;
-        /// <summary>Stores an absolute path string for Windows in UTF-16, "W2ku"</summary>
-        const uint PLATFORM_CODE_WINDOWS_ABSOLUTE_U = 0x57326B75;
-        /// <summary>Stores a Mac OS alias as a blob, "Mac "</summary>
-        const uint PLATFORM_CODE_MACINTOSH_ALIAS = 0x4D616320;
-        /// <summary>Stores a Mac OS X URI (RFC-2396) absolute path in UTF-8, "MacX"</summary>
-        const uint PLATFORM_CODE_MACINTOSH_URI = 0x4D616358;
-    }
+    /// <summary>Means platform locator is unused</summary>
+    const uint PLATFORM_CODE_UNUSED = 0x00000000;
+    /// <summary>Stores a relative path string for Windows, unknown locale used, deprecated, "Wi2r"</summary>
+    const uint PLATFORM_CODE_WINDOWS_RELATIVE = 0x57693272;
+    /// <summary>Stores an absolute path string for Windows, unknown locale used, deprecated, "Wi2k"</summary>
+    const uint PLATFORM_CODE_WINDOWS_ABSOLUTE = 0x5769326B;
+    /// <summary>Stores a relative path string for Windows in UTF-16, "W2ru"</summary>
+    const uint PLATFORM_CODE_WINDOWS_RELATIVE_U = 0x57327275;
+    /// <summary>Stores an absolute path string for Windows in UTF-16, "W2ku"</summary>
+    const uint PLATFORM_CODE_WINDOWS_ABSOLUTE_U = 0x57326B75;
+    /// <summary>Stores a Mac OS alias as a blob, "Mac "</summary>
+    const uint PLATFORM_CODE_MACINTOSH_ALIAS = 0x4D616320;
+    /// <summary>Stores a Mac OS X URI (RFC-2396) absolute path in UTF-8, "MacX"</summary>
+    const uint PLATFORM_CODE_MACINTOSH_URI = 0x4D616358;
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Helpers.cs b/Aaru.Images/VHD/Helpers.cs
index dd7e57604..70a64a6e2 100644
--- a/Aaru.Images/VHD/Helpers.cs
+++ b/Aaru.Images/VHD/Helpers.cs
@@ -33,15 +33,14 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Vhd
-    {
-        static uint VhdChecksum(IEnumerable<byte> data)
-        {
-            uint checksum = data.Aggregate<byte, uint>(0, (current, b) => current + b);
+namespace Aaru.DiscImages;
 
-            return ~checksum;
-        }
+public sealed partial class Vhd
+{
+    static uint VhdChecksum(IEnumerable<byte> data)
+    {
+        uint checksum = data.Aggregate<byte, uint>(0, (current, b) => current + b);
+
+        return ~checksum;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Identify.cs b/Aaru.Images/VHD/Identify.cs
index 8a4221f63..e2c16b0aa 100644
--- a/Aaru.Images/VHD/Identify.cs
+++ b/Aaru.Images/VHD/Identify.cs
@@ -34,31 +34,30 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhd
 {
-    public sealed partial class Vhd
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream imageStream = imageFilter.GetDataForkStream();
+        Stream imageStream = imageFilter.GetDataForkStream();
 
-            byte[] headerCookieBytes = new byte[8];
-            byte[] footerCookieBytes = new byte[8];
+        byte[] headerCookieBytes = new byte[8];
+        byte[] footerCookieBytes = new byte[8];
 
-            if(imageStream.Length % 2 == 0)
-                imageStream.Seek(-512, SeekOrigin.End);
-            else
-                imageStream.Seek(-511, SeekOrigin.End);
+        if(imageStream.Length % 2 == 0)
+            imageStream.Seek(-512, SeekOrigin.End);
+        else
+            imageStream.Seek(-511, SeekOrigin.End);
 
-            imageStream.Read(footerCookieBytes, 0, 8);
-            imageStream.Seek(0, SeekOrigin.Begin);
-            imageStream.Read(headerCookieBytes, 0, 8);
+        imageStream.Read(footerCookieBytes, 0, 8);
+        imageStream.Seek(0, SeekOrigin.Begin);
+        imageStream.Read(headerCookieBytes, 0, 8);
 
-            ulong headerCookie = BigEndianBitConverter.ToUInt64(headerCookieBytes, 0);
-            ulong footerCookie = BigEndianBitConverter.ToUInt64(footerCookieBytes, 0);
+        ulong headerCookie = BigEndianBitConverter.ToUInt64(headerCookieBytes, 0);
+        ulong footerCookie = BigEndianBitConverter.ToUInt64(footerCookieBytes, 0);
 
-            return headerCookie == IMAGE_COOKIE || footerCookie == IMAGE_COOKIE;
-        }
+        return headerCookie == IMAGE_COOKIE || footerCookie == IMAGE_COOKIE;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Properties.cs b/Aaru.Images/VHD/Properties.cs
index a7312fdac..abf0fa66d 100644
--- a/Aaru.Images/VHD/Properties.cs
+++ b/Aaru.Images/VHD/Properties.cs
@@ -37,66 +37,65 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhd
 {
-    public sealed partial class Vhd
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "VirtualPC";
+    /// <inheritdoc />
+    public Guid Id => new Guid("8014d88f-64cd-4484-9441-7635c632958a");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public string Format
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-
-        /// <inheritdoc />
-        public string Name => "VirtualPC";
-        /// <inheritdoc />
-        public Guid Id => new Guid("8014d88f-64cd-4484-9441-7635c632958a");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public string Format
+        get
         {
-            get
+            switch(_thisFooter.DiskType)
             {
-                switch(_thisFooter.DiskType)
-                {
-                    case TYPE_FIXED:        return "Virtual PC fixed size disk image";
-                    case TYPE_DYNAMIC:      return "Virtual PC dynamic size disk image";
-                    case TYPE_DIFFERENCING: return "Virtual PC differencing disk image";
-                    default:                return "Virtual PC disk image";
-                }
+                case TYPE_FIXED:        return "Virtual PC fixed size disk image";
+                case TYPE_DYNAMIC:      return "Virtual PC dynamic size disk image";
+                case TYPE_DIFFERENCING: return "Virtual PC differencing disk image";
+                default:                return "Virtual PC disk image";
             }
         }
-
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-
-        // TODO: Support dynamic images
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".vhd"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
     }
+
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
+
+    // TODO: Support dynamic images
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
+            {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".vhd"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Read.cs b/Aaru.Images/VHD/Read.cs
index 19e44ad02..57ab5cd2f 100644
--- a/Aaru.Images/VHD/Read.cs
+++ b/Aaru.Images/VHD/Read.cs
@@ -41,72 +41,332 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhd
 {
-    public sealed partial class Vhd
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream imageStream = imageFilter.GetDataForkStream();
+        byte[] header      = new byte[512];
+        byte[] footer;
+
+        imageStream.Seek(0, SeekOrigin.Begin);
+        imageStream.Read(header, 0, 512);
+
+        if(imageStream.Length % 2 == 0)
         {
-            Stream imageStream = imageFilter.GetDataForkStream();
-            byte[] header      = new byte[512];
-            byte[] footer;
+            footer = new byte[512];
+            imageStream.Seek(-512, SeekOrigin.End);
+            imageStream.Read(footer, 0, 512);
+        }
+        else
+        {
+            footer = new byte[511];
+            imageStream.Seek(-511, SeekOrigin.End);
+            imageStream.Read(footer, 0, 511);
+        }
 
-            imageStream.Seek(0, SeekOrigin.Begin);
-            imageStream.Read(header, 0, 512);
+        uint  headerChecksum = BigEndianBitConverter.ToUInt32(header, 0x40);
+        uint  footerChecksum = BigEndianBitConverter.ToUInt32(footer, 0x40);
+        ulong headerCookie   = BigEndianBitConverter.ToUInt64(header, 0);
+        ulong footerCookie   = BigEndianBitConverter.ToUInt64(footer, 0);
 
-            if(imageStream.Length % 2 == 0)
+        header[0x40] = 0;
+        header[0x41] = 0;
+        header[0x42] = 0;
+        header[0x43] = 0;
+        footer[0x40] = 0;
+        footer[0x41] = 0;
+        footer[0x42] = 0;
+        footer[0x43] = 0;
+
+        uint headerCalculatedChecksum = VhdChecksum(header);
+        uint footerCalculatedChecksum = VhdChecksum(footer);
+
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "Header checksum = 0x{0:X8}, calculated = 0x{1:X8}",
+                                   headerChecksum, headerCalculatedChecksum);
+
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "Header checksum = 0x{0:X8}, calculated = 0x{1:X8}",
+                                   footerChecksum, footerCalculatedChecksum);
+
+        byte[] usableHeader;
+        uint   usableChecksum;
+
+        if(headerCookie   == IMAGE_COOKIE &&
+           headerChecksum == headerCalculatedChecksum)
+        {
+            usableHeader   = header;
+            usableChecksum = headerChecksum;
+        }
+        else if(footerCookie   == IMAGE_COOKIE &&
+                footerChecksum == footerCalculatedChecksum)
+        {
+            usableHeader   = footer;
+            usableChecksum = footerChecksum;
+        }
+        else
+        {
+            AaruConsole.
+                ErrorWriteLine("(VirtualPC plugin): Both header and footer are corrupt, image cannot be opened.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        _thisFooter = new HardDiskFooter
+        {
+            Cookie             = BigEndianBitConverter.ToUInt64(usableHeader, 0x00),
+            Features           = BigEndianBitConverter.ToUInt32(usableHeader, 0x08),
+            Version            = BigEndianBitConverter.ToUInt32(usableHeader, 0x0C),
+            Offset             = BigEndianBitConverter.ToUInt64(usableHeader, 0x10),
+            Timestamp          = BigEndianBitConverter.ToUInt32(usableHeader, 0x18),
+            CreatorApplication = BigEndianBitConverter.ToUInt32(usableHeader, 0x1C),
+            CreatorVersion     = BigEndianBitConverter.ToUInt32(usableHeader, 0x20),
+            CreatorHostOs      = BigEndianBitConverter.ToUInt32(usableHeader, 0x24),
+            OriginalSize       = BigEndianBitConverter.ToUInt64(usableHeader, 0x28),
+            CurrentSize        = BigEndianBitConverter.ToUInt64(usableHeader, 0x30),
+            DiskGeometry       = BigEndianBitConverter.ToUInt32(usableHeader, 0x38),
+            DiskType           = BigEndianBitConverter.ToUInt32(usableHeader, 0x3C),
+            Checksum           = usableChecksum,
+            UniqueId           = BigEndianBitConverter.ToGuid(usableHeader, 0x44),
+            SavedState         = usableHeader[0x54],
+            Reserved           = new byte[usableHeader.Length - 0x55]
+        };
+
+        Array.Copy(usableHeader, 0x55, _thisFooter.Reserved, 0, usableHeader.Length - 0x55);
+
+        _thisDateTime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+        _thisDateTime = _thisDateTime.AddSeconds(_thisFooter.Timestamp);
+
+        var sha1Ctx = new Sha1Context();
+        sha1Ctx.Update(_thisFooter.Reserved);
+
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.cookie = 0x{0:X8}", _thisFooter.Cookie);
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.features = 0x{0:X8}", _thisFooter.Features);
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.version = 0x{0:X8}", _thisFooter.Version);
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.offset = {0}", _thisFooter.Offset);
+
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.timestamp = 0x{0:X8} ({1})", _thisFooter.Timestamp,
+                                   _thisDateTime);
+
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.creatorApplication = 0x{0:X8} (\"{1}\")",
+                                   _thisFooter.CreatorApplication,
+                                   Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisFooter.
+                                                                CreatorApplication)));
+
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.creatorVersion = 0x{0:X8}",
+                                   _thisFooter.CreatorVersion);
+
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.creatorHostOS = 0x{0:X8} (\"{1}\")",
+                                   _thisFooter.CreatorHostOs,
+                                   Encoding.ASCII.GetString(BigEndianBitConverter.
+                                                                GetBytes(_thisFooter.CreatorHostOs)));
+
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.originalSize = {0}", _thisFooter.OriginalSize);
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.currentSize = {0}", _thisFooter.CurrentSize);
+
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.diskGeometry = 0x{0:X8} (C/H/S: {1}/{2}/{3})",
+                                   _thisFooter.DiskGeometry, (_thisFooter.DiskGeometry & 0xFFFF0000) >> 16,
+                                   (_thisFooter.DiskGeometry & 0xFF00) >> 8, _thisFooter.DiskGeometry & 0xFF);
+
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.diskType = 0x{0:X8}", _thisFooter.DiskType);
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.checksum = 0x{0:X8}", _thisFooter.Checksum);
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.uniqueId = {0}", _thisFooter.UniqueId);
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.savedState = 0x{0:X2}", _thisFooter.SavedState);
+        AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.reserved's SHA1 = 0x{0}", sha1Ctx.End());
+
+        if(_thisFooter.Version == VERSION1)
+            _imageInfo.Version = "1.0";
+        else
+        {
+            AaruConsole.
+                ErrorWriteLine($"(VirtualPC plugin): Unknown image type {_thisFooter.DiskType} found. Please submit a bug with an example image.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        switch(_thisFooter.CreatorApplication)
+        {
+            case CREATOR_QEMU:
             {
-                footer = new byte[512];
-                imageStream.Seek(-512, SeekOrigin.End);
-                imageStream.Read(footer, 0, 512);
-            }
-            else
-            {
-                footer = new byte[511];
-                imageStream.Seek(-511, SeekOrigin.End);
-                imageStream.Read(footer, 0, 511);
+                _imageInfo.Application = "QEMU";
+
+                // QEMU always set same version
+                _imageInfo.ApplicationVersion = "Unknown";
+
+                break;
             }
 
-            uint  headerChecksum = BigEndianBitConverter.ToUInt32(header, 0x40);
-            uint  footerChecksum = BigEndianBitConverter.ToUInt32(footer, 0x40);
-            ulong headerCookie   = BigEndianBitConverter.ToUInt64(header, 0);
-            ulong footerCookie   = BigEndianBitConverter.ToUInt64(footer, 0);
-
-            header[0x40] = 0;
-            header[0x41] = 0;
-            header[0x42] = 0;
-            header[0x43] = 0;
-            footer[0x40] = 0;
-            footer[0x41] = 0;
-            footer[0x42] = 0;
-            footer[0x43] = 0;
-
-            uint headerCalculatedChecksum = VhdChecksum(header);
-            uint footerCalculatedChecksum = VhdChecksum(footer);
-
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "Header checksum = 0x{0:X8}, calculated = 0x{1:X8}",
-                                       headerChecksum, headerCalculatedChecksum);
-
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "Header checksum = 0x{0:X8}, calculated = 0x{1:X8}",
-                                       footerChecksum, footerCalculatedChecksum);
-
-            byte[] usableHeader;
-            uint   usableChecksum;
-
-            if(headerCookie   == IMAGE_COOKIE &&
-               headerChecksum == headerCalculatedChecksum)
+            case CREATOR_VIRTUAL_BOX:
             {
-                usableHeader   = header;
-                usableChecksum = headerChecksum;
+                _imageInfo.ApplicationVersion =
+                    $"{(_thisFooter.CreatorVersion & 0xFFFF0000) >> 16}.{_thisFooter.CreatorVersion & 0x0000FFFF:D2}";
+
+                switch(_thisFooter.CreatorHostOs)
+                {
+                    case CREATOR_MACINTOSH:
+                    case CREATOR_MACINTOSH_OLD:
+                        _imageInfo.Application = "VirtualBox for Mac";
+
+                        break;
+                    case CREATOR_WINDOWS:
+                        // VirtualBox uses Windows creator for any other OS
+                        _imageInfo.Application = "VirtualBox";
+
+                        break;
+                    default:
+                        _imageInfo.Application =
+                            $"VirtualBox for unknown OS \"{Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisFooter.CreatorHostOs))}\"";
+
+                        break;
+                }
+
+                break;
             }
-            else if(footerCookie   == IMAGE_COOKIE &&
-                    footerChecksum == footerCalculatedChecksum)
+
+            case CREATOR_VIRTUAL_SERVER:
             {
-                usableHeader   = footer;
-                usableChecksum = footerChecksum;
+                _imageInfo.Application = "Microsoft Virtual Server";
+
+                switch(_thisFooter.CreatorVersion)
+                {
+                    case VERSION_VIRTUAL_SERVER2004:
+                        _imageInfo.ApplicationVersion = "2004";
+
+                        break;
+                    default:
+                        _imageInfo.ApplicationVersion = $"Unknown version 0x{_thisFooter.CreatorVersion:X8}";
+
+                        break;
+                }
+
+                break;
             }
-            else
+
+            case CREATOR_VIRTUAL_PC:
+            {
+                switch(_thisFooter.CreatorHostOs)
+                {
+                    case CREATOR_MACINTOSH:
+                    case CREATOR_MACINTOSH_OLD:
+                        switch(_thisFooter.CreatorVersion)
+                        {
+                            case VERSION_VIRTUAL_PC_MAC:
+                                _imageInfo.Application        = "Connectix Virtual PC";
+                                _imageInfo.ApplicationVersion = "5, 6 or 7";
+
+                                break;
+                            default:
+                                _imageInfo.ApplicationVersion =
+                                    $"Unknown version 0x{_thisFooter.CreatorVersion:X8}";
+
+                                break;
+                        }
+
+                        break;
+                    case CREATOR_WINDOWS:
+                        switch(_thisFooter.CreatorVersion)
+                        {
+                            case VERSION_VIRTUAL_PC_MAC:
+                                _imageInfo.Application        = "Connectix Virtual PC";
+                                _imageInfo.ApplicationVersion = "5, 6 or 7";
+
+                                break;
+                            case VERSION_VIRTUAL_PC2004:
+                                _imageInfo.Application        = "Microsoft Virtual PC";
+                                _imageInfo.ApplicationVersion = "2004";
+
+                                break;
+                            case VERSION_VIRTUAL_PC2007:
+                                _imageInfo.Application        = "Microsoft Virtual PC";
+                                _imageInfo.ApplicationVersion = "2007";
+
+                                break;
+                            default:
+                                _imageInfo.ApplicationVersion =
+                                    $"Unknown version 0x{_thisFooter.CreatorVersion:X8}";
+
+                                break;
+                        }
+
+                        break;
+                    default:
+                        _imageInfo.Application =
+                            $"Virtual PC for unknown OS \"{Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisFooter.CreatorHostOs))}\"";
+
+                        _imageInfo.ApplicationVersion = $"Unknown version 0x{_thisFooter.CreatorVersion:X8}";
+
+                        break;
+                }
+
+                break;
+            }
+
+            case CREATOR_DISCIMAGECHEF:
+            {
+                _imageInfo.Application = "DiscImageChef";
+
+                _imageInfo.ApplicationVersion =
+                    $"{(_thisFooter.CreatorVersion & 0xFF000000) >> 24}.{(_thisFooter.CreatorVersion & 0xFF0000) >> 16}.{(_thisFooter.CreatorVersion & 0xFF00) >> 8}.{_thisFooter.CreatorVersion & 0xFF}";
+            }
+
+                break;
+
+            case CREATOR_AARU:
+            {
+                _imageInfo.Application = "Aaru";
+
+                _imageInfo.ApplicationVersion =
+                    $"{(_thisFooter.CreatorVersion & 0xFF000000) >> 24}.{(_thisFooter.CreatorVersion & 0xFF0000) >> 16}.{(_thisFooter.CreatorVersion & 0xFF00) >> 8}.{_thisFooter.CreatorVersion & 0xFF}";
+            }
+
+                break;
+            default:
+            {
+                _imageInfo.Application =
+                    $"Unknown application \"{Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisFooter.CreatorHostOs))}\"";
+
+                _imageInfo.ApplicationVersion = $"Unknown version 0x{_thisFooter.CreatorVersion:X8}";
+
+                break;
+            }
+        }
+
+        _thisFilter           = imageFilter;
+        _imageInfo.ImageSize  = _thisFooter.CurrentSize;
+        _imageInfo.Sectors    = _thisFooter.CurrentSize / 512;
+        _imageInfo.SectorSize = 512;
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = _thisDateTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+
+        _imageInfo.Cylinders       = (_thisFooter.DiskGeometry & 0xFFFF0000) >> 16;
+        _imageInfo.Heads           = (_thisFooter.DiskGeometry & 0xFF00)     >> 8;
+        _imageInfo.SectorsPerTrack = _thisFooter.DiskGeometry & 0xFF;
+
+        if(_thisFooter.DiskType == TYPE_DYNAMIC ||
+           _thisFooter.DiskType == TYPE_DIFFERENCING)
+        {
+            imageStream.Seek((long)_thisFooter.Offset, SeekOrigin.Begin);
+            byte[] dynamicBytes = new byte[1024];
+            imageStream.Read(dynamicBytes, 0, 1024);
+
+            uint dynamicChecksum = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x24);
+
+            dynamicBytes[0x24] = 0;
+            dynamicBytes[0x25] = 0;
+            dynamicBytes[0x26] = 0;
+            dynamicBytes[0x27] = 0;
+
+            uint dynamicChecksumCalculated = VhdChecksum(dynamicBytes);
+
+            AaruConsole.DebugWriteLine("VirtualPC plugin",
+                                       "Dynamic header checksum = 0x{0:X8}, calculated = 0x{1:X8}", dynamicChecksum,
+                                       dynamicChecksumCalculated);
+
+            if(dynamicChecksum != dynamicChecksumCalculated)
             {
                 AaruConsole.
                     ErrorWriteLine("(VirtualPC plugin): Both header and footer are corrupt, image cannot be opened.");
@@ -114,71 +374,100 @@ namespace Aaru.DiscImages
                 return ErrorNumber.InvalidArgument;
             }
 
-            _thisFooter = new HardDiskFooter
+            _thisDynamic = new DynamicDiskHeader
             {
-                Cookie             = BigEndianBitConverter.ToUInt64(usableHeader, 0x00),
-                Features           = BigEndianBitConverter.ToUInt32(usableHeader, 0x08),
-                Version            = BigEndianBitConverter.ToUInt32(usableHeader, 0x0C),
-                Offset             = BigEndianBitConverter.ToUInt64(usableHeader, 0x10),
-                Timestamp          = BigEndianBitConverter.ToUInt32(usableHeader, 0x18),
-                CreatorApplication = BigEndianBitConverter.ToUInt32(usableHeader, 0x1C),
-                CreatorVersion     = BigEndianBitConverter.ToUInt32(usableHeader, 0x20),
-                CreatorHostOs      = BigEndianBitConverter.ToUInt32(usableHeader, 0x24),
-                OriginalSize       = BigEndianBitConverter.ToUInt64(usableHeader, 0x28),
-                CurrentSize        = BigEndianBitConverter.ToUInt64(usableHeader, 0x30),
-                DiskGeometry       = BigEndianBitConverter.ToUInt32(usableHeader, 0x38),
-                DiskType           = BigEndianBitConverter.ToUInt32(usableHeader, 0x3C),
-                Checksum           = usableChecksum,
-                UniqueId           = BigEndianBitConverter.ToGuid(usableHeader, 0x44),
-                SavedState         = usableHeader[0x54],
-                Reserved           = new byte[usableHeader.Length - 0x55]
+                LocatorEntries = new ParentLocatorEntry[8],
+                Reserved2      = new byte[256]
             };
 
-            Array.Copy(usableHeader, 0x55, _thisFooter.Reserved, 0, usableHeader.Length - 0x55);
+            for(int i = 0; i < 8; i++)
+                _thisDynamic.LocatorEntries[i] = new ParentLocatorEntry();
 
-            _thisDateTime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-            _thisDateTime = _thisDateTime.AddSeconds(_thisFooter.Timestamp);
+            _thisDynamic.Cookie          = BigEndianBitConverter.ToUInt64(dynamicBytes, 0x00);
+            _thisDynamic.DataOffset      = BigEndianBitConverter.ToUInt64(dynamicBytes, 0x08);
+            _thisDynamic.TableOffset     = BigEndianBitConverter.ToUInt64(dynamicBytes, 0x10);
+            _thisDynamic.HeaderVersion   = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x18);
+            _thisDynamic.MaxTableEntries = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x1C);
+            _thisDynamic.BlockSize       = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x20);
+            _thisDynamic.Checksum        = dynamicChecksum;
+            _thisDynamic.ParentId        = BigEndianBitConverter.ToGuid(dynamicBytes, 0x28);
+            _thisDynamic.ParentTimestamp = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x38);
+            _thisDynamic.Reserved        = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x3C);
+            _thisDynamic.ParentName      = Encoding.BigEndianUnicode.GetString(dynamicBytes, 0x40, 512);
 
-            var sha1Ctx = new Sha1Context();
-            sha1Ctx.Update(_thisFooter.Reserved);
+            for(int i = 0; i < 8; i++)
+            {
+                _thisDynamic.LocatorEntries[i].PlatformCode =
+                    BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x00 + (24 * i));
 
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.cookie = 0x{0:X8}", _thisFooter.Cookie);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.features = 0x{0:X8}", _thisFooter.Features);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.version = 0x{0:X8}", _thisFooter.Version);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.offset = {0}", _thisFooter.Offset);
+                _thisDynamic.LocatorEntries[i].PlatformDataSpace =
+                    BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x04 + (24 * i));
 
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.timestamp = 0x{0:X8} ({1})", _thisFooter.Timestamp,
-                                       _thisDateTime);
+                _thisDynamic.LocatorEntries[i].PlatformDataLength =
+                    BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x08 + (24 * i));
 
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.creatorApplication = 0x{0:X8} (\"{1}\")",
-                                       _thisFooter.CreatorApplication,
-                                       Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisFooter.
-                                                                    CreatorApplication)));
+                _thisDynamic.LocatorEntries[i].Reserved =
+                    BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x0C + (24 * i));
 
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.creatorVersion = 0x{0:X8}",
-                                       _thisFooter.CreatorVersion);
+                _thisDynamic.LocatorEntries[i].PlatformDataOffset =
+                    BigEndianBitConverter.ToUInt64(dynamicBytes, 0x240 + 0x10 + (24 * i));
+            }
 
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.creatorHostOS = 0x{0:X8} (\"{1}\")",
-                                       _thisFooter.CreatorHostOs,
-                                       Encoding.ASCII.GetString(BigEndianBitConverter.
-                                                                    GetBytes(_thisFooter.CreatorHostOs)));
+            Array.Copy(dynamicBytes, 0x300, _thisDynamic.Reserved2, 0, 256);
 
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.originalSize = {0}", _thisFooter.OriginalSize);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.currentSize = {0}", _thisFooter.CurrentSize);
+            _parentDateTime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+            _parentDateTime = _parentDateTime.AddSeconds(_thisDynamic.ParentTimestamp);
 
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.diskGeometry = 0x{0:X8} (C/H/S: {1}/{2}/{3})",
-                                       _thisFooter.DiskGeometry, (_thisFooter.DiskGeometry & 0xFFFF0000) >> 16,
-                                       (_thisFooter.DiskGeometry & 0xFF00) >> 8, _thisFooter.DiskGeometry & 0xFF);
+            sha1Ctx = new Sha1Context();
+            sha1Ctx.Update(_thisDynamic.Reserved2);
 
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.diskType = 0x{0:X8}", _thisFooter.DiskType);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.checksum = 0x{0:X8}", _thisFooter.Checksum);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.uniqueId = {0}", _thisFooter.UniqueId);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.savedState = 0x{0:X2}", _thisFooter.SavedState);
-            AaruConsole.DebugWriteLine("VirtualPC plugin", "footer.reserved's SHA1 = 0x{0}", sha1Ctx.End());
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.cookie = 0x{0:X8}", _thisDynamic.Cookie);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.dataOffset = {0}", _thisDynamic.DataOffset);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.tableOffset = {0}", _thisDynamic.TableOffset);
 
-            if(_thisFooter.Version == VERSION1)
-                _imageInfo.Version = "1.0";
-            else
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.headerVersion = 0x{0:X8}",
+                                       _thisDynamic.HeaderVersion);
+
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.maxTableEntries = {0}",
+                                       _thisDynamic.MaxTableEntries);
+
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.blockSize = {0}", _thisDynamic.BlockSize);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.checksum = 0x{0:X8}", _thisDynamic.Checksum);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentID = {0}", _thisDynamic.ParentId);
+
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentTimestamp = 0x{0:X8} ({1})",
+                                       _thisDynamic.ParentTimestamp, _parentDateTime);
+
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.reserved = 0x{0:X8}", _thisDynamic.Reserved);
+
+            for(int i = 0; i < 8; i++)
+            {
+                AaruConsole.DebugWriteLine("VirtualPC plugin",
+                                           "dynamic.locatorEntries[{0}].platformCode = 0x{1:X8} (\"{2}\")", i,
+                                           _thisDynamic.LocatorEntries[i].PlatformCode,
+                                           Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisDynamic.
+                                                                        LocatorEntries[i].PlatformCode)));
+
+                AaruConsole.DebugWriteLine("VirtualPC plugin",
+                                           "dynamic.locatorEntries[{0}].platformDataSpace = {1}", i,
+                                           _thisDynamic.LocatorEntries[i].PlatformDataSpace);
+
+                AaruConsole.DebugWriteLine("VirtualPC plugin",
+                                           "dynamic.locatorEntries[{0}].platformDataLength = {1}", i,
+                                           _thisDynamic.LocatorEntries[i].PlatformDataLength);
+
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.locatorEntries[{0}].reserved = 0x{1:X8}", i,
+                                           _thisDynamic.LocatorEntries[i].Reserved);
+
+                AaruConsole.DebugWriteLine("VirtualPC plugin",
+                                           "dynamic.locatorEntries[{0}].platformDataOffset = {1}", i,
+                                           _thisDynamic.LocatorEntries[i].PlatformDataOffset);
+            }
+
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentName = \"{0}\"", _thisDynamic.ParentName);
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.reserved2's SHA1 = 0x{0}", sha1Ctx.End());
+
+            if(_thisDynamic.HeaderVersion != VERSION1)
             {
                 AaruConsole.
                     ErrorWriteLine($"(VirtualPC plugin): Unknown image type {_thisFooter.DiskType} found. Please submit a bug with an example image.");
@@ -186,710 +475,420 @@ namespace Aaru.DiscImages
                 return ErrorNumber.InvalidArgument;
             }
 
-            switch(_thisFooter.CreatorApplication)
+            DateTime startTime = DateTime.UtcNow;
+
+            _blockAllocationTable = new uint[_thisDynamic.MaxTableEntries];
+
+            byte[] bat = new byte[_thisDynamic.MaxTableEntries * 4];
+            imageStream.Seek((long)_thisDynamic.TableOffset, SeekOrigin.Begin);
+            imageStream.Read(bat, 0, bat.Length);
+
+            ReadOnlySpan<byte> span = bat;
+
+            _blockAllocationTable = MemoryMarshal.Cast<byte, uint>(span).
+                                                  Slice(0, (int)_thisDynamic.MaxTableEntries).ToArray();
+
+            for(int i = 0; i < _blockAllocationTable.Length; i++)
+                _blockAllocationTable[i] = Swapping.Swap(_blockAllocationTable[i]);
+
+            DateTime endTime = DateTime.UtcNow;
+
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "Filling the BAT took {0} seconds",
+                                       (endTime - startTime).TotalSeconds);
+
+            _bitmapSize = (uint)Math.Ceiling((double)_thisDynamic.BlockSize / 512
+
+                                                                              // 1 bit per sector on the bitmap
+                                                                            / 8
+
+                                                                              // and aligned to 512 byte boundary
+                                                                            / 512);
+
+            AaruConsole.DebugWriteLine("VirtualPC plugin", "Bitmap is {0} sectors", _bitmapSize);
+        }
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
+        switch(_thisFooter.DiskType)
+        {
+            case TYPE_FIXED:
+            case TYPE_DYNAMIC:
             {
-                case CREATOR_QEMU:
-                {
-                    _imageInfo.Application = "QEMU";
-
-                    // QEMU always set same version
-                    _imageInfo.ApplicationVersion = "Unknown";
-
-                    break;
-                }
-
-                case CREATOR_VIRTUAL_BOX:
-                {
-                    _imageInfo.ApplicationVersion =
-                        $"{(_thisFooter.CreatorVersion & 0xFFFF0000) >> 16}.{_thisFooter.CreatorVersion & 0x0000FFFF:D2}";
-
-                    switch(_thisFooter.CreatorHostOs)
-                    {
-                        case CREATOR_MACINTOSH:
-                        case CREATOR_MACINTOSH_OLD:
-                            _imageInfo.Application = "VirtualBox for Mac";
-
-                            break;
-                        case CREATOR_WINDOWS:
-                            // VirtualBox uses Windows creator for any other OS
-                            _imageInfo.Application = "VirtualBox";
-
-                            break;
-                        default:
-                            _imageInfo.Application =
-                                $"VirtualBox for unknown OS \"{Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisFooter.CreatorHostOs))}\"";
-
-                            break;
-                    }
-
-                    break;
-                }
-
-                case CREATOR_VIRTUAL_SERVER:
-                {
-                    _imageInfo.Application = "Microsoft Virtual Server";
-
-                    switch(_thisFooter.CreatorVersion)
-                    {
-                        case VERSION_VIRTUAL_SERVER2004:
-                            _imageInfo.ApplicationVersion = "2004";
-
-                            break;
-                        default:
-                            _imageInfo.ApplicationVersion = $"Unknown version 0x{_thisFooter.CreatorVersion:X8}";
-
-                            break;
-                    }
-
-                    break;
-                }
-
-                case CREATOR_VIRTUAL_PC:
-                {
-                    switch(_thisFooter.CreatorHostOs)
-                    {
-                        case CREATOR_MACINTOSH:
-                        case CREATOR_MACINTOSH_OLD:
-                            switch(_thisFooter.CreatorVersion)
-                            {
-                                case VERSION_VIRTUAL_PC_MAC:
-                                    _imageInfo.Application        = "Connectix Virtual PC";
-                                    _imageInfo.ApplicationVersion = "5, 6 or 7";
-
-                                    break;
-                                default:
-                                    _imageInfo.ApplicationVersion =
-                                        $"Unknown version 0x{_thisFooter.CreatorVersion:X8}";
-
-                                    break;
-                            }
-
-                            break;
-                        case CREATOR_WINDOWS:
-                            switch(_thisFooter.CreatorVersion)
-                            {
-                                case VERSION_VIRTUAL_PC_MAC:
-                                    _imageInfo.Application        = "Connectix Virtual PC";
-                                    _imageInfo.ApplicationVersion = "5, 6 or 7";
-
-                                    break;
-                                case VERSION_VIRTUAL_PC2004:
-                                    _imageInfo.Application        = "Microsoft Virtual PC";
-                                    _imageInfo.ApplicationVersion = "2004";
-
-                                    break;
-                                case VERSION_VIRTUAL_PC2007:
-                                    _imageInfo.Application        = "Microsoft Virtual PC";
-                                    _imageInfo.ApplicationVersion = "2007";
-
-                                    break;
-                                default:
-                                    _imageInfo.ApplicationVersion =
-                                        $"Unknown version 0x{_thisFooter.CreatorVersion:X8}";
-
-                                    break;
-                            }
-
-                            break;
-                        default:
-                            _imageInfo.Application =
-                                $"Virtual PC for unknown OS \"{Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisFooter.CreatorHostOs))}\"";
-
-                            _imageInfo.ApplicationVersion = $"Unknown version 0x{_thisFooter.CreatorVersion:X8}";
-
-                            break;
-                    }
-
-                    break;
-                }
-
-                case CREATOR_DISCIMAGECHEF:
-                {
-                    _imageInfo.Application = "DiscImageChef";
-
-                    _imageInfo.ApplicationVersion =
-                        $"{(_thisFooter.CreatorVersion & 0xFF000000) >> 24}.{(_thisFooter.CreatorVersion & 0xFF0000) >> 16}.{(_thisFooter.CreatorVersion & 0xFF00) >> 8}.{_thisFooter.CreatorVersion & 0xFF}";
-                }
-
-                    break;
-
-                case CREATOR_AARU:
-                {
-                    _imageInfo.Application = "Aaru";
-
-                    _imageInfo.ApplicationVersion =
-                        $"{(_thisFooter.CreatorVersion & 0xFF000000) >> 24}.{(_thisFooter.CreatorVersion & 0xFF0000) >> 16}.{(_thisFooter.CreatorVersion & 0xFF00) >> 8}.{_thisFooter.CreatorVersion & 0xFF}";
-                }
-
-                    break;
-                default:
-                {
-                    _imageInfo.Application =
-                        $"Unknown application \"{Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisFooter.CreatorHostOs))}\"";
-
-                    _imageInfo.ApplicationVersion = $"Unknown version 0x{_thisFooter.CreatorVersion:X8}";
-
-                    break;
-                }
+                // Nothing to do here, really.
+                return ErrorNumber.NoError;
             }
 
-            _thisFilter           = imageFilter;
-            _imageInfo.ImageSize  = _thisFooter.CurrentSize;
-            _imageInfo.Sectors    = _thisFooter.CurrentSize / 512;
-            _imageInfo.SectorSize = 512;
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = _thisDateTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-
-            _imageInfo.Cylinders       = (_thisFooter.DiskGeometry & 0xFFFF0000) >> 16;
-            _imageInfo.Heads           = (_thisFooter.DiskGeometry & 0xFF00)     >> 8;
-            _imageInfo.SectorsPerTrack = _thisFooter.DiskGeometry & 0xFF;
-
-            if(_thisFooter.DiskType == TYPE_DYNAMIC ||
-               _thisFooter.DiskType == TYPE_DIFFERENCING)
+            case TYPE_DIFFERENCING:
             {
-                imageStream.Seek((long)_thisFooter.Offset, SeekOrigin.Begin);
-                byte[] dynamicBytes = new byte[1024];
-                imageStream.Read(dynamicBytes, 0, 1024);
-
-                uint dynamicChecksum = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x24);
-
-                dynamicBytes[0x24] = 0;
-                dynamicBytes[0x25] = 0;
-                dynamicBytes[0x26] = 0;
-                dynamicBytes[0x27] = 0;
-
-                uint dynamicChecksumCalculated = VhdChecksum(dynamicBytes);
-
-                AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                           "Dynamic header checksum = 0x{0:X8}, calculated = 0x{1:X8}", dynamicChecksum,
-                                           dynamicChecksumCalculated);
-
-                if(dynamicChecksum != dynamicChecksumCalculated)
-                {
-                    AaruConsole.
-                        ErrorWriteLine("(VirtualPC plugin): Both header and footer are corrupt, image cannot be opened.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                _thisDynamic = new DynamicDiskHeader
-                {
-                    LocatorEntries = new ParentLocatorEntry[8],
-                    Reserved2      = new byte[256]
-                };
+                _locatorEntriesData = new byte[8][];
 
                 for(int i = 0; i < 8; i++)
-                    _thisDynamic.LocatorEntries[i] = new ParentLocatorEntry();
-
-                _thisDynamic.Cookie          = BigEndianBitConverter.ToUInt64(dynamicBytes, 0x00);
-                _thisDynamic.DataOffset      = BigEndianBitConverter.ToUInt64(dynamicBytes, 0x08);
-                _thisDynamic.TableOffset     = BigEndianBitConverter.ToUInt64(dynamicBytes, 0x10);
-                _thisDynamic.HeaderVersion   = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x18);
-                _thisDynamic.MaxTableEntries = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x1C);
-                _thisDynamic.BlockSize       = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x20);
-                _thisDynamic.Checksum        = dynamicChecksum;
-                _thisDynamic.ParentId        = BigEndianBitConverter.ToGuid(dynamicBytes, 0x28);
-                _thisDynamic.ParentTimestamp = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x38);
-                _thisDynamic.Reserved        = BigEndianBitConverter.ToUInt32(dynamicBytes, 0x3C);
-                _thisDynamic.ParentName      = Encoding.BigEndianUnicode.GetString(dynamicBytes, 0x40, 512);
-
-                for(int i = 0; i < 8; i++)
-                {
-                    _thisDynamic.LocatorEntries[i].PlatformCode =
-                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x00 + (24 * i));
-
-                    _thisDynamic.LocatorEntries[i].PlatformDataSpace =
-                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x04 + (24 * i));
-
-                    _thisDynamic.LocatorEntries[i].PlatformDataLength =
-                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x08 + (24 * i));
-
-                    _thisDynamic.LocatorEntries[i].Reserved =
-                        BigEndianBitConverter.ToUInt32(dynamicBytes, 0x240 + 0x0C + (24 * i));
-
-                    _thisDynamic.LocatorEntries[i].PlatformDataOffset =
-                        BigEndianBitConverter.ToUInt64(dynamicBytes, 0x240 + 0x10 + (24 * i));
-                }
-
-                Array.Copy(dynamicBytes, 0x300, _thisDynamic.Reserved2, 0, 256);
-
-                _parentDateTime = new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc);
-                _parentDateTime = _parentDateTime.AddSeconds(_thisDynamic.ParentTimestamp);
-
-                sha1Ctx = new Sha1Context();
-                sha1Ctx.Update(_thisDynamic.Reserved2);
-
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.cookie = 0x{0:X8}", _thisDynamic.Cookie);
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.dataOffset = {0}", _thisDynamic.DataOffset);
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.tableOffset = {0}", _thisDynamic.TableOffset);
-
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.headerVersion = 0x{0:X8}",
-                                           _thisDynamic.HeaderVersion);
-
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.maxTableEntries = {0}",
-                                           _thisDynamic.MaxTableEntries);
-
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.blockSize = {0}", _thisDynamic.BlockSize);
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.checksum = 0x{0:X8}", _thisDynamic.Checksum);
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentID = {0}", _thisDynamic.ParentId);
-
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentTimestamp = 0x{0:X8} ({1})",
-                                           _thisDynamic.ParentTimestamp, _parentDateTime);
-
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.reserved = 0x{0:X8}", _thisDynamic.Reserved);
-
-                for(int i = 0; i < 8; i++)
-                {
-                    AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                               "dynamic.locatorEntries[{0}].platformCode = 0x{1:X8} (\"{2}\")", i,
-                                               _thisDynamic.LocatorEntries[i].PlatformCode,
-                                               Encoding.ASCII.GetString(BigEndianBitConverter.GetBytes(_thisDynamic.
-                                                                            LocatorEntries[i].PlatformCode)));
-
-                    AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                               "dynamic.locatorEntries[{0}].platformDataSpace = {1}", i,
-                                               _thisDynamic.LocatorEntries[i].PlatformDataSpace);
-
-                    AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                               "dynamic.locatorEntries[{0}].platformDataLength = {1}", i,
-                                               _thisDynamic.LocatorEntries[i].PlatformDataLength);
-
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.locatorEntries[{0}].reserved = 0x{1:X8}", i,
-                                               _thisDynamic.LocatorEntries[i].Reserved);
-
-                    AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                               "dynamic.locatorEntries[{0}].platformDataOffset = {1}", i,
-                                               _thisDynamic.LocatorEntries[i].PlatformDataOffset);
-                }
-
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.parentName = \"{0}\"", _thisDynamic.ParentName);
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.reserved2's SHA1 = 0x{0}", sha1Ctx.End());
-
-                if(_thisDynamic.HeaderVersion != VERSION1)
-                {
-                    AaruConsole.
-                        ErrorWriteLine($"(VirtualPC plugin): Unknown image type {_thisFooter.DiskType} found. Please submit a bug with an example image.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                DateTime startTime = DateTime.UtcNow;
-
-                _blockAllocationTable = new uint[_thisDynamic.MaxTableEntries];
-
-                byte[] bat = new byte[_thisDynamic.MaxTableEntries * 4];
-                imageStream.Seek((long)_thisDynamic.TableOffset, SeekOrigin.Begin);
-                imageStream.Read(bat, 0, bat.Length);
-
-                ReadOnlySpan<byte> span = bat;
-
-                _blockAllocationTable = MemoryMarshal.Cast<byte, uint>(span).
-                                                      Slice(0, (int)_thisDynamic.MaxTableEntries).ToArray();
-
-                for(int i = 0; i < _blockAllocationTable.Length; i++)
-                    _blockAllocationTable[i] = Swapping.Swap(_blockAllocationTable[i]);
-
-                DateTime endTime = DateTime.UtcNow;
-
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "Filling the BAT took {0} seconds",
-                                           (endTime - startTime).TotalSeconds);
-
-                _bitmapSize = (uint)Math.Ceiling((double)_thisDynamic.BlockSize / 512
-
-                                                 // 1 bit per sector on the bitmap
-                                               / 8
-
-                                                 // and aligned to 512 byte boundary
-                                               / 512);
-
-                AaruConsole.DebugWriteLine("VirtualPC plugin", "Bitmap is {0} sectors", _bitmapSize);
-            }
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-            switch(_thisFooter.DiskType)
-            {
-                case TYPE_FIXED:
-                case TYPE_DYNAMIC:
-                {
-                    // Nothing to do here, really.
-                    return ErrorNumber.NoError;
-                }
-
-                case TYPE_DIFFERENCING:
-                {
-                    _locatorEntriesData = new byte[8][];
-
-                    for(int i = 0; i < 8; i++)
-                        if(_thisDynamic.LocatorEntries[i].PlatformCode != 0x00000000)
-                        {
-                            _locatorEntriesData[i] = new byte[_thisDynamic.LocatorEntries[i].PlatformDataLength];
-                            imageStream.Seek((long)_thisDynamic.LocatorEntries[i].PlatformDataOffset, SeekOrigin.Begin);
-
-                            imageStream.Read(_locatorEntriesData[i], 0,
-                                             (int)_thisDynamic.LocatorEntries[i].PlatformDataLength);
-
-                            switch(_thisDynamic.LocatorEntries[i].PlatformCode)
-                            {
-                                case PLATFORM_CODE_WINDOWS_ABSOLUTE:
-                                case PLATFORM_CODE_WINDOWS_RELATIVE:
-                                    AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                                               "dynamic.locatorEntries[{0}] = \"{1}\"", i,
-                                                               Encoding.ASCII.GetString(_locatorEntriesData[i]));
-
-                                    break;
-                                case PLATFORM_CODE_WINDOWS_ABSOLUTE_U:
-                                case PLATFORM_CODE_WINDOWS_RELATIVE_U:
-                                    AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                                               "dynamic.locatorEntries[{0}] = \"{1}\"", i,
-                                                               Encoding.BigEndianUnicode.
-                                                                        GetString(_locatorEntriesData[i]));
-
-                                    break;
-                                case PLATFORM_CODE_MACINTOSH_URI:
-                                    AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                                               "dynamic.locatorEntries[{0}] = \"{1}\"", i,
-                                                               Encoding.UTF8.GetString(_locatorEntriesData[i]));
-
-                                    break;
-                                default:
-                                    AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.locatorEntries[{0}] =", i);
-                                    PrintHex.PrintHexArray(_locatorEntriesData[i], 64);
-
-                                    break;
-                            }
-                        }
-
-                    int    currentLocator = 0;
-                    bool   locatorFound   = false;
-                    string parentPath     = null;
-
-                    while(!locatorFound &&
-                          currentLocator < 8)
+                    if(_thisDynamic.LocatorEntries[i].PlatformCode != 0x00000000)
                     {
-                        switch(_thisDynamic.LocatorEntries[currentLocator].PlatformCode)
+                        _locatorEntriesData[i] = new byte[_thisDynamic.LocatorEntries[i].PlatformDataLength];
+                        imageStream.Seek((long)_thisDynamic.LocatorEntries[i].PlatformDataOffset, SeekOrigin.Begin);
+
+                        imageStream.Read(_locatorEntriesData[i], 0,
+                                         (int)_thisDynamic.LocatorEntries[i].PlatformDataLength);
+
+                        switch(_thisDynamic.LocatorEntries[i].PlatformCode)
                         {
                             case PLATFORM_CODE_WINDOWS_ABSOLUTE:
                             case PLATFORM_CODE_WINDOWS_RELATIVE:
-                                parentPath = Encoding.ASCII.GetString(_locatorEntriesData[currentLocator]);
+                                AaruConsole.DebugWriteLine("VirtualPC plugin",
+                                                           "dynamic.locatorEntries[{0}] = \"{1}\"", i,
+                                                           Encoding.ASCII.GetString(_locatorEntriesData[i]));
 
                                 break;
                             case PLATFORM_CODE_WINDOWS_ABSOLUTE_U:
                             case PLATFORM_CODE_WINDOWS_RELATIVE_U:
-                                parentPath = Encoding.BigEndianUnicode.GetString(_locatorEntriesData[currentLocator]);
+                                AaruConsole.DebugWriteLine("VirtualPC plugin",
+                                                           "dynamic.locatorEntries[{0}] = \"{1}\"", i,
+                                                           Encoding.BigEndianUnicode.
+                                                                    GetString(_locatorEntriesData[i]));
 
                                 break;
                             case PLATFORM_CODE_MACINTOSH_URI:
-                                parentPath =
-                                    Uri.UnescapeDataString(Encoding.UTF8.
-                                                                    GetString(_locatorEntriesData[currentLocator]));
+                                AaruConsole.DebugWriteLine("VirtualPC plugin",
+                                                           "dynamic.locatorEntries[{0}] = \"{1}\"", i,
+                                                           Encoding.UTF8.GetString(_locatorEntriesData[i]));
 
-                                if(parentPath.StartsWith("file://localhost", StringComparison.InvariantCulture))
-                                    parentPath = parentPath.Remove(0, 16);
-                                else
-                                {
-                                    AaruConsole.DebugWriteLine("VirtualPC plugin",
-                                                               "Unsupported protocol classified found in URI parent path: \"{0}\"",
-                                                               parentPath);
-
-                                    parentPath = null;
-                                }
+                                break;
+                            default:
+                                AaruConsole.DebugWriteLine("VirtualPC plugin", "dynamic.locatorEntries[{0}] =", i);
+                                PrintHex.PrintHexArray(_locatorEntriesData[i], 64);
 
                                 break;
                         }
+                    }
 
-                        if(parentPath != null)
-                        {
-                            AaruConsole.DebugWriteLine("VirtualPC plugin", "Possible parent path: \"{0}\"", parentPath);
+                int    currentLocator = 0;
+                bool   locatorFound   = false;
+                string parentPath     = null;
 
-                            IFilter parentFilter =
-                                new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, parentPath));
+                while(!locatorFound &&
+                      currentLocator < 8)
+                {
+                    switch(_thisDynamic.LocatorEntries[currentLocator].PlatformCode)
+                    {
+                        case PLATFORM_CODE_WINDOWS_ABSOLUTE:
+                        case PLATFORM_CODE_WINDOWS_RELATIVE:
+                            parentPath = Encoding.ASCII.GetString(_locatorEntriesData[currentLocator]);
 
-                            if(parentFilter != null)
-                                locatorFound = true;
+                            break;
+                        case PLATFORM_CODE_WINDOWS_ABSOLUTE_U:
+                        case PLATFORM_CODE_WINDOWS_RELATIVE_U:
+                            parentPath = Encoding.BigEndianUnicode.GetString(_locatorEntriesData[currentLocator]);
+
+                            break;
+                        case PLATFORM_CODE_MACINTOSH_URI:
+                            parentPath =
+                                Uri.UnescapeDataString(Encoding.UTF8.
+                                                                GetString(_locatorEntriesData[currentLocator]));
+
+                            if(parentPath.StartsWith("file://localhost", StringComparison.InvariantCulture))
+                                parentPath = parentPath.Remove(0, 16);
+                            else
+                            {
+                                AaruConsole.DebugWriteLine("VirtualPC plugin",
+                                                           "Unsupported protocol classified found in URI parent path: \"{0}\"",
+                                                           parentPath);
 
-                            if(!locatorFound)
                                 parentPath = null;
-                        }
+                            }
 
-                        currentLocator++;
+                            break;
                     }
 
-                    if(!locatorFound)
+                    if(parentPath != null)
                     {
-                        AaruConsole.
-                            ErrorWriteLine("(VirtualPC plugin): Cannot find parent file for differencing disk image");
-
-                        return ErrorNumber.NoSuchFile;
-                    }
-
-                    {
-                        _parentImage = new Vhd();
+                        AaruConsole.DebugWriteLine("VirtualPC plugin", "Possible parent path: \"{0}\"", parentPath);
 
                         IFilter parentFilter =
                             new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, parentPath));
 
-                        if(parentFilter == null)
-                        {
-                            AaruConsole.ErrorWriteLine("(VirtualPC plugin): Cannot find parent image filter");
+                        if(parentFilter != null)
+                            locatorFound = true;
 
-                            return ErrorNumber.NoSuchFile;
-                        }
-                        /*                            PluginBase plugins = new PluginBase();
-                                                    plugins.RegisterAllPlugins();
-                                                    if (!plugins.ImagePluginsList.TryGetValue(Name.ToLower(), out parentImage))
-                                                    {
-                                                        AaruConsole.ErrorWriteLine("(VirtualPC plugin): Unable to open myself");
-                                                        return ErrorNumber.InvalidArgument;
-                                                    }*/
+                        if(!locatorFound)
+                            parentPath = null;
+                    }
 
-                        if(!_parentImage.Identify(parentFilter))
-                        {
-                            AaruConsole.
-                                ErrorWriteLine("(VirtualPC plugin): Parent image is not a Virtual PC disk image");
+                    currentLocator++;
+                }
 
-                            return ErrorNumber.InvalidArgument;
-                        }
+                if(!locatorFound)
+                {
+                    AaruConsole.
+                        ErrorWriteLine("(VirtualPC plugin): Cannot find parent file for differencing disk image");
 
-                        ErrorNumber parentError = _parentImage.Open(parentFilter);
+                    return ErrorNumber.NoSuchFile;
+                }
 
-                        if(parentError != ErrorNumber.NoError)
-                        {
-                            AaruConsole.
-                                ErrorWriteLine($"(VirtualPC plugin): Error {parentError} opening parent disk image");
+                {
+                    _parentImage = new Vhd();
 
-                            return parentError;
-                        }
+                    IFilter parentFilter =
+                        new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, parentPath));
 
-                        // While specification says that parent and child disk images should contain UUID relationship
-                        // in reality it seems that old differencing disk images stored a parent UUID that, nonetheless
-                        // the parent never stored itself. So the only real way to know that images are related is
-                        // because the parent IS found and SAME SIZE. Ugly...
-                        // More funny even, tested parent images show an empty host OS, and child images a correct one.
-                        if(_parentImage.Info.Sectors == _imageInfo.Sectors)
-                            return ErrorNumber.NoError;
+                    if(parentFilter == null)
+                    {
+                        AaruConsole.ErrorWriteLine("(VirtualPC plugin): Cannot find parent image filter");
 
-                        AaruConsole.ErrorWriteLine("(VirtualPC plugin): Parent image is of different size");
+                        return ErrorNumber.NoSuchFile;
+                    }
+                    /*                            PluginBase plugins = new PluginBase();
+                                                plugins.RegisterAllPlugins();
+                                                if (!plugins.ImagePluginsList.TryGetValue(Name.ToLower(), out parentImage))
+                                                {
+                                                    AaruConsole.ErrorWriteLine("(VirtualPC plugin): Unable to open myself");
+                                                    return ErrorNumber.InvalidArgument;
+                                                }*/
+
+                    if(!_parentImage.Identify(parentFilter))
+                    {
+                        AaruConsole.
+                            ErrorWriteLine("(VirtualPC plugin): Parent image is not a Virtual PC disk image");
 
                         return ErrorNumber.InvalidArgument;
                     }
 
-                    return ErrorNumber.NoError;
-                }
+                    ErrorNumber parentError = _parentImage.Open(parentFilter);
 
-                case TYPE_DEPRECATED1:
-                case TYPE_DEPRECATED2:
-                case TYPE_DEPRECATED3:
-                    AaruConsole.
-                        ErrorWriteLine("(VirtualPC plugin): Deprecated image type found. Please submit a bug with an example image.");
-
-                    return ErrorNumber.NotImplemented;
-
-                default:
-                    AaruConsole.
-                        ErrorWriteLine($"(VirtualPC plugin): Unknown image type {_thisFooter.DiskType} found. Please submit a bug with an example image.");
-
-                    return ErrorNumber.InvalidArgument;
-            }
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
-        {
-            switch(_thisFooter.DiskType)
-            {
-                case TYPE_DIFFERENCING:
-                {
-                    // Block number for BAT searching
-                    uint blockNumber = (uint)Math.Floor(sectorAddress / (_thisDynamic.BlockSize / 512.0));
-
-                    // Sector number inside of block
-                    uint sectorInBlock = (uint)(sectorAddress % (_thisDynamic.BlockSize / 512));
-
-                    if(_blockAllocationTable[blockNumber] == 0xFFFFFFFF)
+                    if(parentError != ErrorNumber.NoError)
                     {
-                        buffer = new byte[512];
+                        AaruConsole.
+                            ErrorWriteLine($"(VirtualPC plugin): Error {parentError} opening parent disk image");
 
-                        return ErrorNumber.NoError;
+                        return parentError;
                     }
 
-                    byte[] bitmap = new byte[_bitmapSize * 512];
+                    // While specification says that parent and child disk images should contain UUID relationship
+                    // in reality it seems that old differencing disk images stored a parent UUID that, nonetheless
+                    // the parent never stored itself. So the only real way to know that images are related is
+                    // because the parent IS found and SAME SIZE. Ugly...
+                    // More funny even, tested parent images show an empty host OS, and child images a correct one.
+                    if(_parentImage.Info.Sectors == _imageInfo.Sectors)
+                        return ErrorNumber.NoError;
 
-                    // Offset of block in file
-                    long blockOffset = _blockAllocationTable[blockNumber] * 512L;
+                    AaruConsole.ErrorWriteLine("(VirtualPC plugin): Parent image is of different size");
 
-                    int bitmapByte = (int)Math.Floor((double)sectorInBlock / 8);
-                    int bitmapBit  = (int)(sectorInBlock % 8);
+                    return ErrorNumber.InvalidArgument;
+                }
 
-                    Stream thisStream = _thisFilter.GetDataForkStream();
+                return ErrorNumber.NoError;
+            }
 
-                    thisStream.Seek(blockOffset, SeekOrigin.Begin);
-                    thisStream.Read(bitmap, 0, (int)_bitmapSize * 512);
+            case TYPE_DEPRECATED1:
+            case TYPE_DEPRECATED2:
+            case TYPE_DEPRECATED3:
+                AaruConsole.
+                    ErrorWriteLine("(VirtualPC plugin): Deprecated image type found. Please submit a bug with an example image.");
 
-                    byte mask  = (byte)(1 << (7 - bitmapBit));
-                    bool dirty = (bitmap[bitmapByte] & mask) == mask;
+                return ErrorNumber.NotImplemented;
 
-                    /*
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "bitmapSize = {0}", bitmapSize);
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "blockNumber = {0}", blockNumber);
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "sectorInBlock = {0}", sectorInBlock);
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "blockOffset = {0}", blockOffset);
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "bitmapByte = {0}", bitmapByte);
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "bitmapBit = {0}", bitmapBit);
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "mask = 0x{0:X2}", mask);
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "dirty = 0x{0}", dirty);
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "bitmap = ");
-                    PrintHex.PrintHexArray(bitmap, 64);
-                    */
+            default:
+                AaruConsole.
+                    ErrorWriteLine($"(VirtualPC plugin): Unknown image type {_thisFooter.DiskType} found. Please submit a bug with an example image.");
 
-                    // Sector has been written, read from child image
-                    if(!dirty)
-                        return _parentImage.ReadSector(sectorAddress, out buffer);
-                    /* Too noisy
-                        AaruConsole.DebugWriteLine("VirtualPC plugin", "Sector {0} is dirty", sectorAddress);
-                        */
+                return ErrorNumber.InvalidArgument;
+        }
+    }
 
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        switch(_thisFooter.DiskType)
+        {
+            case TYPE_DIFFERENCING:
+            {
+                // Block number for BAT searching
+                uint blockNumber = (uint)Math.Floor(sectorAddress / (_thisDynamic.BlockSize / 512.0));
+
+                // Sector number inside of block
+                uint sectorInBlock = (uint)(sectorAddress % (_thisDynamic.BlockSize / 512));
+
+                if(_blockAllocationTable[blockNumber] == 0xFFFFFFFF)
+                {
                     buffer = new byte[512];
-                    uint sectorOffset = _blockAllocationTable[blockNumber] + _bitmapSize + sectorInBlock;
-                    thisStream = _thisFilter.GetDataForkStream();
-
-                    thisStream.Seek(sectorOffset * 512, SeekOrigin.Begin);
-                    thisStream.Read(buffer, 0, 512);
 
                     return ErrorNumber.NoError;
+                }
 
-                    /* Too noisy
-                    AaruConsole.DebugWriteLine("VirtualPC plugin", "Sector {0} is clean", sectorAddress);
+                byte[] bitmap = new byte[_bitmapSize * 512];
+
+                // Offset of block in file
+                long blockOffset = _blockAllocationTable[blockNumber] * 512L;
+
+                int bitmapByte = (int)Math.Floor((double)sectorInBlock / 8);
+                int bitmapBit  = (int)(sectorInBlock % 8);
+
+                Stream thisStream = _thisFilter.GetDataForkStream();
+
+                thisStream.Seek(blockOffset, SeekOrigin.Begin);
+                thisStream.Read(bitmap, 0, (int)_bitmapSize * 512);
+
+                byte mask  = (byte)(1 << (7 - bitmapBit));
+                bool dirty = (bitmap[bitmapByte] & mask) == mask;
+
+                /*
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "bitmapSize = {0}", bitmapSize);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "blockNumber = {0}", blockNumber);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "sectorInBlock = {0}", sectorInBlock);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "blockOffset = {0}", blockOffset);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "bitmapByte = {0}", bitmapByte);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "bitmapBit = {0}", bitmapBit);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "mask = 0x{0:X2}", mask);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "dirty = 0x{0}", dirty);
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "bitmap = ");
+                PrintHex.PrintHexArray(bitmap, 64);
+                */
+
+                // Sector has been written, read from child image
+                if(!dirty)
+                    return _parentImage.ReadSector(sectorAddress, out buffer);
+                /* Too noisy
+                    AaruConsole.DebugWriteLine("VirtualPC plugin", "Sector {0} is dirty", sectorAddress);
                     */
 
-                    // Read sector from parent image
-                }
+                buffer = new byte[512];
+                uint sectorOffset = _blockAllocationTable[blockNumber] + _bitmapSize + sectorInBlock;
+                thisStream = _thisFilter.GetDataForkStream();
 
-                default: return ReadSectors(sectorAddress, 1, out buffer);
+                thisStream.Seek(sectorOffset * 512, SeekOrigin.Begin);
+                thisStream.Read(buffer, 0, 512);
+
+                return ErrorNumber.NoError;
+
+                /* Too noisy
+                AaruConsole.DebugWriteLine("VirtualPC plugin", "Sector {0} is clean", sectorAddress);
+                */
+
+                // Read sector from parent image
             }
+
+            default: return ReadSectors(sectorAddress, 1, out buffer);
         }
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        switch(_thisFooter.DiskType)
         {
-            buffer = null;
-
-            switch(_thisFooter.DiskType)
+            case TYPE_FIXED:
             {
-                case TYPE_FIXED:
-                {
-                    buffer = new byte[512 * length];
-                    Stream thisStream = _thisFilter.GetDataForkStream();
+                buffer = new byte[512 * length];
+                Stream thisStream = _thisFilter.GetDataForkStream();
 
-                    thisStream.Seek((long)(sectorAddress * 512), SeekOrigin.Begin);
-                    thisStream.Read(buffer, 0, (int)(512 * length));
+                thisStream.Seek((long)(sectorAddress * 512), SeekOrigin.Begin);
+                thisStream.Read(buffer, 0, (int)(512 * length));
 
-                    return ErrorNumber.NoError;
-                }
-
-                // Contrary to Microsoft's specifications that tell us to check the bitmap
-                // and in case of unused sector just return zeros, as blocks are allocated
-                // as a whole, this would waste time and miss cache, so we read any sector
-                // as long as it is in the block.
-                case TYPE_DYNAMIC:
-                {
-                    // Block number for BAT searching
-                    uint blockNumber = (uint)Math.Floor(sectorAddress / (_thisDynamic.BlockSize / 512.0));
-
-                    // Sector number inside of block
-                    uint sectorInBlock = (uint)(sectorAddress % (_thisDynamic.BlockSize / 512));
-
-                    // How many sectors before reaching end of block
-                    uint remainingInBlock = (_thisDynamic.BlockSize / 512) - sectorInBlock;
-
-                    // Data that needs to be read from another block
-                    byte[] suffix = null;
-
-                    // How many sectors to read from this block
-                    uint sectorsToReadHere;
-
-                    // Asked to read more sectors than are remaining in block
-                    if(length > remainingInBlock)
-                    {
-                        ErrorNumber errno = ReadSectors(sectorAddress + remainingInBlock, length - remainingInBlock,
-                                                        out suffix);
-
-                        if(errno != ErrorNumber.NoError)
-                            return errno;
-
-                        sectorsToReadHere = remainingInBlock;
-                    }
-                    else
-                        sectorsToReadHere = length;
-
-                    // Offset of sector in file
-                    uint sectorOffset = _blockAllocationTable[blockNumber] + _bitmapSize + sectorInBlock;
-
-                    // Data that can be read in this block
-                    byte[] prefix = new byte[sectorsToReadHere * 512];
-
-                    // 0xFFFFFFFF means unallocated
-                    if(_blockAllocationTable[blockNumber] != 0xFFFFFFFF)
-                    {
-                        Stream thisStream = _thisFilter.GetDataForkStream();
-                        thisStream.Seek(sectorOffset * 512, SeekOrigin.Begin);
-                        thisStream.Read(prefix, 0, (int)(512 * sectorsToReadHere));
-                    }
-
-                    // If it is unallocated, just fill with zeroes
-                    else
-                        Array.Clear(prefix, 0, prefix.Length);
-
-                    // If we needed to read from another block, join all the data
-                    if(suffix == null)
-                    {
-                        buffer = prefix;
-
-                        return ErrorNumber.NoError;
-                    }
-
-                    buffer = new byte[512 * length];
-                    Array.Copy(prefix, 0, buffer, 0, prefix.Length);
-                    Array.Copy(suffix, 0, buffer, prefix.Length, suffix.Length);
-
-                    return ErrorNumber.NoError;
-                }
-
-                case TYPE_DIFFERENCING:
-                {
-                    // As on differencing images, each independent sector can be read from child or parent
-                    // image, we must read sector one by one
-                    buffer = new byte[512 * length];
-
-                    for(ulong i = 0; i < length; i++)
-                    {
-                        ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] oneSector);
-
-                        if(errno != ErrorNumber.NoError)
-                            return errno;
-
-                        Array.Copy(oneSector, 0, buffer, (int)(i * 512), 512);
-                    }
-
-                    return ErrorNumber.NoError;
-                }
-
-                case TYPE_DEPRECATED1:
-                case TYPE_DEPRECATED2:
-                case TYPE_DEPRECATED3:
-                    AaruConsole.
-                        ErrorWriteLine("(VirtualPC plugin): Deprecated image type found. Please submit a bug with an example image.");
-
-                    return ErrorNumber.NotImplemented;
-
-                default:
-                    AaruConsole.
-                        ErrorWriteLine($"(VirtualPC plugin): Unknown image type {_thisFooter.DiskType} found. Please submit a bug with an example image.");
-
-                    return ErrorNumber.InvalidArgument;
+                return ErrorNumber.NoError;
             }
+
+            // Contrary to Microsoft's specifications that tell us to check the bitmap
+            // and in case of unused sector just return zeros, as blocks are allocated
+            // as a whole, this would waste time and miss cache, so we read any sector
+            // as long as it is in the block.
+            case TYPE_DYNAMIC:
+            {
+                // Block number for BAT searching
+                uint blockNumber = (uint)Math.Floor(sectorAddress / (_thisDynamic.BlockSize / 512.0));
+
+                // Sector number inside of block
+                uint sectorInBlock = (uint)(sectorAddress % (_thisDynamic.BlockSize / 512));
+
+                // How many sectors before reaching end of block
+                uint remainingInBlock = (_thisDynamic.BlockSize / 512) - sectorInBlock;
+
+                // Data that needs to be read from another block
+                byte[] suffix = null;
+
+                // How many sectors to read from this block
+                uint sectorsToReadHere;
+
+                // Asked to read more sectors than are remaining in block
+                if(length > remainingInBlock)
+                {
+                    ErrorNumber errno = ReadSectors(sectorAddress + remainingInBlock, length - remainingInBlock,
+                                                    out suffix);
+
+                    if(errno != ErrorNumber.NoError)
+                        return errno;
+
+                    sectorsToReadHere = remainingInBlock;
+                }
+                else
+                    sectorsToReadHere = length;
+
+                // Offset of sector in file
+                uint sectorOffset = _blockAllocationTable[blockNumber] + _bitmapSize + sectorInBlock;
+
+                // Data that can be read in this block
+                byte[] prefix = new byte[sectorsToReadHere * 512];
+
+                // 0xFFFFFFFF means unallocated
+                if(_blockAllocationTable[blockNumber] != 0xFFFFFFFF)
+                {
+                    Stream thisStream = _thisFilter.GetDataForkStream();
+                    thisStream.Seek(sectorOffset * 512, SeekOrigin.Begin);
+                    thisStream.Read(prefix, 0, (int)(512 * sectorsToReadHere));
+                }
+
+                // If it is unallocated, just fill with zeroes
+                else
+                    Array.Clear(prefix, 0, prefix.Length);
+
+                // If we needed to read from another block, join all the data
+                if(suffix == null)
+                {
+                    buffer = prefix;
+
+                    return ErrorNumber.NoError;
+                }
+
+                buffer = new byte[512 * length];
+                Array.Copy(prefix, 0, buffer, 0, prefix.Length);
+                Array.Copy(suffix, 0, buffer, prefix.Length, suffix.Length);
+
+                return ErrorNumber.NoError;
+            }
+
+            case TYPE_DIFFERENCING:
+            {
+                // As on differencing images, each independent sector can be read from child or parent
+                // image, we must read sector one by one
+                buffer = new byte[512 * length];
+
+                for(ulong i = 0; i < length; i++)
+                {
+                    ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] oneSector);
+
+                    if(errno != ErrorNumber.NoError)
+                        return errno;
+
+                    Array.Copy(oneSector, 0, buffer, (int)(i * 512), 512);
+                }
+
+                return ErrorNumber.NoError;
+            }
+
+            case TYPE_DEPRECATED1:
+            case TYPE_DEPRECATED2:
+            case TYPE_DEPRECATED3:
+                AaruConsole.
+                    ErrorWriteLine("(VirtualPC plugin): Deprecated image type found. Please submit a bug with an example image.");
+
+                return ErrorNumber.NotImplemented;
+
+            default:
+                AaruConsole.
+                    ErrorWriteLine($"(VirtualPC plugin): Unknown image type {_thisFooter.DiskType} found. Please submit a bug with an example image.");
+
+                return ErrorNumber.InvalidArgument;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Structs.cs b/Aaru.Images/VHD/Structs.cs
index 6814a6c5c..7c004a863 100644
--- a/Aaru.Images/VHD/Structs.cs
+++ b/Aaru.Images/VHD/Structs.cs
@@ -32,88 +32,87 @@
 
 using System;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhd
 {
-    public sealed partial class Vhd
+    struct HardDiskFooter
     {
-        struct HardDiskFooter
-        {
-            /// <summary>Offset 0x00, File magic number, <see cref="Vhd.IMAGE_COOKIE" /></summary>
-            public ulong Cookie;
-            /// <summary>Offset 0x08, Specific feature support</summary>
-            public uint Features;
-            /// <summary>Offset 0x0C, File format version</summary>
-            public uint Version;
-            /// <summary>Offset 0x10, Offset from beginning of file to next structure</summary>
-            public ulong Offset;
-            /// <summary>Offset 0x18, Creation date seconds since 2000/01/01 00:00:00 UTC</summary>
-            public uint Timestamp;
-            /// <summary>Offset 0x1C, Application that created this disk image</summary>
-            public uint CreatorApplication;
-            /// <summary>Offset 0x20, Version of the application that created this disk image</summary>
-            public uint CreatorVersion;
-            /// <summary>Offset 0x24, Host operating system of the application that created this disk image</summary>
-            public uint CreatorHostOs;
-            /// <summary>Offset 0x28, Original hard disk size, in bytes</summary>
-            public ulong OriginalSize;
-            /// <summary>Offset 0x30, Current hard disk size, in bytes</summary>
-            public ulong CurrentSize;
-            /// <summary>Offset 0x38, CHS geometry Cylinder mask = 0xFFFF0000 Heads mask = 0x0000FF00 Sectors mask = 0x000000FF</summary>
-            public uint DiskGeometry;
-            /// <summary>Offset 0x3C, Disk image type</summary>
-            public uint DiskType;
-            /// <summary>Offset 0x40, Checksum for this structure</summary>
-            public uint Checksum;
-            /// <summary>Offset 0x44, UUID, used to associate parent with differencing disk images</summary>
-            public Guid UniqueId;
-            /// <summary>Offset 0x54, If set, system is saved, so compaction and expansion cannot be performed</summary>
-            public byte SavedState;
-            /// <summary>Offset 0x55, 427 bytes reserved, should contain zeros.</summary>
-            public byte[] Reserved;
-        }
+        /// <summary>Offset 0x00, File magic number, <see cref="Vhd.IMAGE_COOKIE" /></summary>
+        public ulong Cookie;
+        /// <summary>Offset 0x08, Specific feature support</summary>
+        public uint Features;
+        /// <summary>Offset 0x0C, File format version</summary>
+        public uint Version;
+        /// <summary>Offset 0x10, Offset from beginning of file to next structure</summary>
+        public ulong Offset;
+        /// <summary>Offset 0x18, Creation date seconds since 2000/01/01 00:00:00 UTC</summary>
+        public uint Timestamp;
+        /// <summary>Offset 0x1C, Application that created this disk image</summary>
+        public uint CreatorApplication;
+        /// <summary>Offset 0x20, Version of the application that created this disk image</summary>
+        public uint CreatorVersion;
+        /// <summary>Offset 0x24, Host operating system of the application that created this disk image</summary>
+        public uint CreatorHostOs;
+        /// <summary>Offset 0x28, Original hard disk size, in bytes</summary>
+        public ulong OriginalSize;
+        /// <summary>Offset 0x30, Current hard disk size, in bytes</summary>
+        public ulong CurrentSize;
+        /// <summary>Offset 0x38, CHS geometry Cylinder mask = 0xFFFF0000 Heads mask = 0x0000FF00 Sectors mask = 0x000000FF</summary>
+        public uint DiskGeometry;
+        /// <summary>Offset 0x3C, Disk image type</summary>
+        public uint DiskType;
+        /// <summary>Offset 0x40, Checksum for this structure</summary>
+        public uint Checksum;
+        /// <summary>Offset 0x44, UUID, used to associate parent with differencing disk images</summary>
+        public Guid UniqueId;
+        /// <summary>Offset 0x54, If set, system is saved, so compaction and expansion cannot be performed</summary>
+        public byte SavedState;
+        /// <summary>Offset 0x55, 427 bytes reserved, should contain zeros.</summary>
+        public byte[] Reserved;
+    }
 
-        struct ParentLocatorEntry
-        {
-            /// <summary>Offset 0x00, Describes the platform specific type this entry belongs to</summary>
-            public uint PlatformCode;
-            /// <summary>Offset 0x04, Describes the number of 512 bytes sectors used by this entry</summary>
-            public uint PlatformDataSpace;
-            /// <summary>Offset 0x08, Describes this entry's size in bytes</summary>
-            public uint PlatformDataLength;
-            /// <summary>Offset 0x0c, Reserved</summary>
-            public uint Reserved;
-            /// <summary>Offset 0x10, Offset on disk image this entry resides on</summary>
-            public ulong PlatformDataOffset;
-        }
+    struct ParentLocatorEntry
+    {
+        /// <summary>Offset 0x00, Describes the platform specific type this entry belongs to</summary>
+        public uint PlatformCode;
+        /// <summary>Offset 0x04, Describes the number of 512 bytes sectors used by this entry</summary>
+        public uint PlatformDataSpace;
+        /// <summary>Offset 0x08, Describes this entry's size in bytes</summary>
+        public uint PlatformDataLength;
+        /// <summary>Offset 0x0c, Reserved</summary>
+        public uint Reserved;
+        /// <summary>Offset 0x10, Offset on disk image this entry resides on</summary>
+        public ulong PlatformDataOffset;
+    }
 
-        struct DynamicDiskHeader
-        {
-            /// <summary>Offset 0x00, Header magic, <see cref="Vhd.DYNAMIC_COOKIE" /></summary>
-            public ulong Cookie;
-            /// <summary>Offset 0x08, Offset to next structure on disk image. Currently unused, 0xFFFFFFFF</summary>
-            public ulong DataOffset;
-            /// <summary>Offset 0x10, Offset of the Block Allocation Table (BAT)</summary>
-            public ulong TableOffset;
-            /// <summary>Offset 0x18, Version of this header</summary>
-            public uint HeaderVersion;
-            /// <summary>Offset 0x1C, Maximum entries present in the BAT</summary>
-            public uint MaxTableEntries;
-            /// <summary>Offset 0x20, Size of a block in bytes Should always be a power of two of 512</summary>
-            public uint BlockSize;
-            /// <summary>Offset 0x24, Checksum of this header</summary>
-            public uint Checksum;
-            /// <summary>Offset 0x28, UUID of parent disk image for differencing type</summary>
-            public Guid ParentId;
-            /// <summary>Offset 0x38, Timestamp of parent disk image</summary>
-            public uint ParentTimestamp;
-            /// <summary>Offset 0x3C, Reserved</summary>
-            public uint Reserved;
-            /// <summary>Offset 0x40, 512 bytes UTF-16 of parent disk image filename</summary>
-            public string ParentName;
-            /// <summary>Offset 0x240, Parent disk image locator entry, <see cref="ParentLocatorEntry" /></summary>
-            public ParentLocatorEntry[] LocatorEntries;
-            /// <summary>Offset 0x300, 256 reserved bytes</summary>
-            public byte[] Reserved2;
-        }
+    struct DynamicDiskHeader
+    {
+        /// <summary>Offset 0x00, Header magic, <see cref="Vhd.DYNAMIC_COOKIE" /></summary>
+        public ulong Cookie;
+        /// <summary>Offset 0x08, Offset to next structure on disk image. Currently unused, 0xFFFFFFFF</summary>
+        public ulong DataOffset;
+        /// <summary>Offset 0x10, Offset of the Block Allocation Table (BAT)</summary>
+        public ulong TableOffset;
+        /// <summary>Offset 0x18, Version of this header</summary>
+        public uint HeaderVersion;
+        /// <summary>Offset 0x1C, Maximum entries present in the BAT</summary>
+        public uint MaxTableEntries;
+        /// <summary>Offset 0x20, Size of a block in bytes Should always be a power of two of 512</summary>
+        public uint BlockSize;
+        /// <summary>Offset 0x24, Checksum of this header</summary>
+        public uint Checksum;
+        /// <summary>Offset 0x28, UUID of parent disk image for differencing type</summary>
+        public Guid ParentId;
+        /// <summary>Offset 0x38, Timestamp of parent disk image</summary>
+        public uint ParentTimestamp;
+        /// <summary>Offset 0x3C, Reserved</summary>
+        public uint Reserved;
+        /// <summary>Offset 0x40, 512 bytes UTF-16 of parent disk image filename</summary>
+        public string ParentName;
+        /// <summary>Offset 0x240, Parent disk image locator entry, <see cref="ParentLocatorEntry" /></summary>
+        public ParentLocatorEntry[] LocatorEntries;
+        /// <summary>Offset 0x300, 256 reserved bytes</summary>
+        public byte[] Reserved2;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Unsupported.cs b/Aaru.Images/VHD/Unsupported.cs
index 2cfaa8061..5f8ebc477 100644
--- a/Aaru.Images/VHD/Unsupported.cs
+++ b/Aaru.Images/VHD/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhd
 {
-    public sealed partial class Vhd
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/VHD.cs b/Aaru.Images/VHD/VHD.cs
index 3705557e4..c27d33b2b 100644
--- a/Aaru.Images/VHD/VHD.cs
+++ b/Aaru.Images/VHD/VHD.cs
@@ -37,50 +37,49 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>
-    ///     Supports Connectix/Microsoft Virtual PC hard disk image format. Until Virtual PC 5 there existed no format,
-    ///     and the hard disk image was merely a sector by sector (RAW) image with a resource fork giving information to
-    ///     Virtual PC itself.
-    /// </summary>
-    public sealed partial class Vhd : IWritableImage
-    {
-        uint              _bitmapSize;
-        uint[]            _blockAllocationTable;
-        ImageInfo         _imageInfo;
-        byte[][]          _locatorEntriesData;
-        DateTime          _parentDateTime;
-        IMediaImage       _parentImage;
-        DateTime          _thisDateTime;
-        DynamicDiskHeader _thisDynamic;
-        IFilter           _thisFilter;
-        HardDiskFooter    _thisFooter;
-        FileStream        _writingStream;
+namespace Aaru.DiscImages;
 
-        public Vhd() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>
+///     Supports Connectix/Microsoft Virtual PC hard disk image format. Until Virtual PC 5 there existed no format,
+///     and the hard disk image was merely a sector by sector (RAW) image with a resource fork giving information to
+///     Virtual PC itself.
+/// </summary>
+public sealed partial class Vhd : IWritableImage
+{
+    uint              _bitmapSize;
+    uint[]            _blockAllocationTable;
+    ImageInfo         _imageInfo;
+    byte[][]          _locatorEntriesData;
+    DateTime          _parentDateTime;
+    IMediaImage       _parentImage;
+    DateTime          _thisDateTime;
+    DynamicDiskHeader _thisDynamic;
+    IFilter           _thisFilter;
+    HardDiskFooter    _thisFooter;
+    FileStream        _writingStream;
+
+    public Vhd() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHD/Write.cs b/Aaru.Images/VHD/Write.cs
index 053663e7f..af5004a15 100644
--- a/Aaru.Images/VHD/Write.cs
+++ b/Aaru.Images/VHD/Write.cs
@@ -43,282 +43,281 @@ using Schemas;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 using Version = System.Version;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhd
 {
-    public sealed partial class Vhd
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != 512)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(0 + (sectorAddress * 512)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        // TODO: Implement dynamic
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % 512 != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(0 + (sectorAddress * 512)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        _imageInfo = new ImageInfo
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
+
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+        IsWriting    = true;
+        ErrorMessage = null;
 
-                return false;
-            }
-
-            Version thisVersion = GetType().Assembly.GetName().Version ?? new Version();
-
-            if(_imageInfo.Cylinders == 0)
-            {
-                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-                _imageInfo.Heads           = 16;
-                _imageInfo.SectorsPerTrack = 63;
-
-                while(_imageInfo.Cylinders == 0)
-                {
-                    _imageInfo.Heads--;
-
-                    if(_imageInfo.Heads == 0)
-                    {
-                        _imageInfo.SectorsPerTrack--;
-                        _imageInfo.Heads = 16;
-                    }
-
-                    _imageInfo.Cylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
-
-                    if(_imageInfo.Cylinders       == 0 &&
-                       _imageInfo.Heads           == 0 &&
-                       _imageInfo.SectorsPerTrack == 0)
-                        break;
-                }
-            }
-
-            var footer = new HardDiskFooter
-            {
-                Cookie = IMAGE_COOKIE,
-                Features = FEATURES_RESERVED,
-                Version = VERSION1,
-                Timestamp = (uint)(DateTime.Now - new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds,
-                CreatorApplication = CREATOR_AARU,
-                CreatorVersion = (uint)(((thisVersion.Major & 0xFF) << 24) + ((thisVersion.Minor & 0xFF) << 16) +
-                                        ((thisVersion.Build & 0xFF) << 8)  + (thisVersion.Revision & 0xFF)),
-                CreatorHostOs = DetectOS.GetRealPlatformID() == PlatformID.MacOSX ? CREATOR_MACINTOSH : CREATOR_WINDOWS,
-                DiskType      = TYPE_FIXED,
-                UniqueId      = Guid.NewGuid(),
-                DiskGeometry = ((_imageInfo.Cylinders & 0xFFFF) << 16) + ((_imageInfo.Heads & 0xFF) << 8) +
-                               (_imageInfo.SectorsPerTrack & 0xFF),
-                OriginalSize = _imageInfo.Sectors * 512,
-                CurrentSize  = _imageInfo.Sectors * 512
-            };
-
-            footer.Offset = footer.DiskType == TYPE_FIXED ? ulong.MaxValue : 512;
-
-            byte[] footerBytes = new byte[512];
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Cookie), 0, footerBytes, 0x00, 8);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Features), 0, footerBytes, 0x08, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Version), 0, footerBytes, 0x0C, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Offset), 0, footerBytes, 0x10, 8);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Timestamp), 0, footerBytes, 0x18, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorApplication), 0, footerBytes, 0x1C, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorVersion), 0, footerBytes, 0x20, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorHostOs), 0, footerBytes, 0x24, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.OriginalSize), 0, footerBytes, 0x28, 8);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.CurrentSize), 0, footerBytes, 0x30, 8);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.DiskGeometry), 0, footerBytes, 0x38, 4);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.DiskType), 0, footerBytes, 0x3C, 4);
-            Array.Copy(footer.UniqueId.ToByteArray(), 0, footerBytes, 0x44, 4);
-
-            footer.Checksum = VhdChecksum(footerBytes);
-            Array.Copy(BigEndianBitConverter.GetBytes(footer.Checksum), 0, footerBytes, 0x40, 4);
-
-            _writingStream.Seek((long)(footer.DiskType == TYPE_FIXED ? footer.OriginalSize : 0), SeekOrigin.Begin);
-            _writingStream.Write(footerBytes, 0, 512);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
-        {
-            if(cylinders > 0xFFFF)
-            {
-                ErrorMessage = "Too many cylinders.";
-
-                return false;
-            }
-
-            if(heads > 0xFF)
-            {
-                ErrorMessage = "Too many heads.";
-
-                return false;
-            }
-
-            if(sectorsPerTrack > 0xFF)
-            {
-                ErrorMessage = "Too many sectors per track.";
-
-                return false;
-            }
-
-            _imageInfo.SectorsPerTrack = sectorsPerTrack;
-            _imageInfo.Heads           = heads;
-            _imageInfo.Cylinders       = cylinders;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != 512)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(0 + (sectorAddress * 512)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    // TODO: Implement dynamic
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % 512 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(0 + (sectorAddress * 512)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        Version thisVersion = GetType().Assembly.GetName().Version ?? new Version();
+
+        if(_imageInfo.Cylinders == 0)
+        {
+            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+            _imageInfo.Heads           = 16;
+            _imageInfo.SectorsPerTrack = 63;
+
+            while(_imageInfo.Cylinders == 0)
+            {
+                _imageInfo.Heads--;
+
+                if(_imageInfo.Heads == 0)
+                {
+                    _imageInfo.SectorsPerTrack--;
+                    _imageInfo.Heads = 16;
+                }
+
+                _imageInfo.Cylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
+
+                if(_imageInfo.Cylinders       == 0 &&
+                   _imageInfo.Heads           == 0 &&
+                   _imageInfo.SectorsPerTrack == 0)
+                    break;
+            }
+        }
+
+        var footer = new HardDiskFooter
+        {
+            Cookie = IMAGE_COOKIE,
+            Features = FEATURES_RESERVED,
+            Version = VERSION1,
+            Timestamp = (uint)(DateTime.Now - new DateTime(2000, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalSeconds,
+            CreatorApplication = CREATOR_AARU,
+            CreatorVersion = (uint)(((thisVersion.Major & 0xFF) << 24) + ((thisVersion.Minor & 0xFF) << 16) +
+                                    ((thisVersion.Build & 0xFF) << 8)  + (thisVersion.Revision & 0xFF)),
+            CreatorHostOs = DetectOS.GetRealPlatformID() == PlatformID.MacOSX ? CREATOR_MACINTOSH : CREATOR_WINDOWS,
+            DiskType      = TYPE_FIXED,
+            UniqueId      = Guid.NewGuid(),
+            DiskGeometry = ((_imageInfo.Cylinders & 0xFFFF) << 16) + ((_imageInfo.Heads & 0xFF) << 8) +
+                           (_imageInfo.SectorsPerTrack & 0xFF),
+            OriginalSize = _imageInfo.Sectors * 512,
+            CurrentSize  = _imageInfo.Sectors * 512
+        };
+
+        footer.Offset = footer.DiskType == TYPE_FIXED ? ulong.MaxValue : 512;
+
+        byte[] footerBytes = new byte[512];
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.Cookie), 0, footerBytes, 0x00, 8);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.Features), 0, footerBytes, 0x08, 4);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.Version), 0, footerBytes, 0x0C, 4);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.Offset), 0, footerBytes, 0x10, 8);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.Timestamp), 0, footerBytes, 0x18, 4);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorApplication), 0, footerBytes, 0x1C, 4);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorVersion), 0, footerBytes, 0x20, 4);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.CreatorHostOs), 0, footerBytes, 0x24, 4);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.OriginalSize), 0, footerBytes, 0x28, 8);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.CurrentSize), 0, footerBytes, 0x30, 8);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.DiskGeometry), 0, footerBytes, 0x38, 4);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.DiskType), 0, footerBytes, 0x3C, 4);
+        Array.Copy(footer.UniqueId.ToByteArray(), 0, footerBytes, 0x44, 4);
+
+        footer.Checksum = VhdChecksum(footerBytes);
+        Array.Copy(BigEndianBitConverter.GetBytes(footer.Checksum), 0, footerBytes, 0x40, 4);
+
+        _writingStream.Seek((long)(footer.DiskType == TYPE_FIXED ? footer.OriginalSize : 0), SeekOrigin.Begin);
+        _writingStream.Write(footerBytes, 0, 512);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        if(cylinders > 0xFFFF)
+        {
+            ErrorMessage = "Too many cylinders.";
+
+            return false;
+        }
+
+        if(heads > 0xFF)
+        {
+            ErrorMessage = "Too many heads.";
+
+            return false;
+        }
+
+        if(sectorsPerTrack > 0xFF)
+        {
+            ErrorMessage = "Too many sectors per track.";
+
+            return false;
+        }
+
+        _imageInfo.SectorsPerTrack = sectorsPerTrack;
+        _imageInfo.Heads           = heads;
+        _imageInfo.Cylinders       = cylinders;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHDX/Constants.cs b/Aaru.Images/VHDX/Constants.cs
index e4c89becb..b7b0afb68 100644
--- a/Aaru.Images/VHDX/Constants.cs
+++ b/Aaru.Images/VHDX/Constants.cs
@@ -33,60 +33,59 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class Vhdx
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class Vhdx
-    {
-        const ulong VHDX_SIGNATURE    = 0x656C696678646876;
-        const uint  VHDX_HEADER_SIG   = 0x64616568;
-        const uint  VHDX_REGION_SIG   = 0x69676572;
-        const ulong VHDX_METADATA_SIG = 0x617461646174656D;
+    const ulong VHDX_SIGNATURE    = 0x656C696678646876;
+    const uint  VHDX_HEADER_SIG   = 0x64616568;
+    const uint  VHDX_REGION_SIG   = 0x69676572;
+    const ulong VHDX_METADATA_SIG = 0x617461646174656D;
 
-        const string PARENT_LINKAGE_KEY      = "parent_linkage";
-        const string PARENT_LINKAGE2_KEY     = "parent_linkage2";
-        const string RELATIVE_PATH_KEY       = "relative_path";
-        const string VOLUME_PATH_KEY         = "volume_path";
-        const string ABSOLUTE_WIN32_PATH_KEY = "absolute_win32_path";
+    const string PARENT_LINKAGE_KEY      = "parent_linkage";
+    const string PARENT_LINKAGE2_KEY     = "parent_linkage2";
+    const string RELATIVE_PATH_KEY       = "relative_path";
+    const string VOLUME_PATH_KEY         = "volume_path";
+    const string ABSOLUTE_WIN32_PATH_KEY = "absolute_win32_path";
 
-        const uint REGION_FLAGS_REQUIRED = 0x01;
+    const uint REGION_FLAGS_REQUIRED = 0x01;
 
-        const uint METADATA_FLAGS_USER     = 0x01;
-        const uint METADATA_FLAGS_VIRTUAL  = 0x02;
-        const uint METADATA_FLAGS_REQUIRED = 0x04;
+    const uint METADATA_FLAGS_USER     = 0x01;
+    const uint METADATA_FLAGS_VIRTUAL  = 0x02;
+    const uint METADATA_FLAGS_REQUIRED = 0x04;
 
-        const uint FILE_FLAGS_LEAVE_ALLOCATED = 0x01;
-        const uint FILE_FLAGS_HAS_PARENT      = 0x02;
+    const uint FILE_FLAGS_LEAVE_ALLOCATED = 0x01;
+    const uint FILE_FLAGS_HAS_PARENT      = 0x02;
 
-        /// <summary>Block has never been stored on this image, check parent</summary>
-        const ulong PAYLOAD_BLOCK_NOT_PRESENT = 0x00;
-        /// <summary>Block was stored on this image and is removed, return whatever data you wish</summary>
-        const ulong PAYLOAD_BLOCK_UNDEFINED = 0x01;
-        /// <summary>Block is filled with zeroes</summary>
-        const ulong PAYLOAD_BLOCK_ZERO = 0x02;
-        /// <summary>All sectors in this block were UNMAPed/TRIMed, return zeroes</summary>
-        const ulong PAYLOAD_BLOCK_UNMAPPER = 0x03;
-        /// <summary>Block is present on this image</summary>
-        const ulong PAYLOAD_BLOCK_FULLY_PRESENT = 0x06;
-        /// <summary>Block is present on image but there may be sectors present on parent image</summary>
-        const ulong PAYLOAD_BLOCK_PARTIALLY_PRESENT = 0x07;
+    /// <summary>Block has never been stored on this image, check parent</summary>
+    const ulong PAYLOAD_BLOCK_NOT_PRESENT = 0x00;
+    /// <summary>Block was stored on this image and is removed, return whatever data you wish</summary>
+    const ulong PAYLOAD_BLOCK_UNDEFINED = 0x01;
+    /// <summary>Block is filled with zeroes</summary>
+    const ulong PAYLOAD_BLOCK_ZERO = 0x02;
+    /// <summary>All sectors in this block were UNMAPed/TRIMed, return zeroes</summary>
+    const ulong PAYLOAD_BLOCK_UNMAPPER = 0x03;
+    /// <summary>Block is present on this image</summary>
+    const ulong PAYLOAD_BLOCK_FULLY_PRESENT = 0x06;
+    /// <summary>Block is present on image but there may be sectors present on parent image</summary>
+    const ulong PAYLOAD_BLOCK_PARTIALLY_PRESENT = 0x07;
 
-        const ulong SECTOR_BITMAP_NOT_PRESENT = 0x00;
-        const ulong SECTOR_BITMAP_PRESENT     = 0x06;
+    const ulong SECTOR_BITMAP_NOT_PRESENT = 0x00;
+    const ulong SECTOR_BITMAP_PRESENT     = 0x06;
 
-        const ulong BAT_FILE_OFFSET_MASK = 0xFFFFFFFFFFFC0000;
-        const ulong BAT_FLAGS_MASK       = 0x7;
-        const ulong BAT_RESERVED_MASK    = 0x3FFF8;
+    const ulong BAT_FILE_OFFSET_MASK = 0xFFFFFFFFFFFC0000;
+    const ulong BAT_FLAGS_MASK       = 0x7;
+    const ulong BAT_RESERVED_MASK    = 0x3FFF8;
 
-        const    int  MAX_CACHE_SIZE          = 16777216;
-        readonly Guid _batGuid                = new Guid("2DC27766-F623-4200-9D64-115E9BFD4A08");
-        readonly Guid _fileParametersGuid     = new Guid("CAA16737-FA36-4D43-B3B6-33F0AA44E76B");
-        readonly Guid _logicalSectorSizeGuid  = new Guid("8141BF1D-A96F-4709-BA47-F233A8FAAB5F");
-        readonly Guid _metadataGuid           = new Guid("8B7CA206-4790-4B9A-B8FE-575F050F886E");
-        readonly Guid _page83DataGuid         = new Guid("BECA12AB-B2E6-4523-93EF-C309E000C746");
-        readonly Guid _parentLocatorGuid      = new Guid("A8D35F2D-B30B-454D-ABF7-D3D84834AB0C");
-        readonly Guid _parentTypeVhdxGuid     = new Guid("B04AEFB7-D19E-4A81-B789-25B8E9445913");
-        readonly Guid _physicalSectorSizeGuid = new Guid("CDA348C7-445D-4471-9CC9-E9885251C556");
-        readonly Guid _virtualDiskSizeGuid    = new Guid("2FA54224-CD1B-4876-B211-5DBED83BF4B8");
-    }
+    const    int  MAX_CACHE_SIZE          = 16777216;
+    readonly Guid _batGuid                = new Guid("2DC27766-F623-4200-9D64-115E9BFD4A08");
+    readonly Guid _fileParametersGuid     = new Guid("CAA16737-FA36-4D43-B3B6-33F0AA44E76B");
+    readonly Guid _logicalSectorSizeGuid  = new Guid("8141BF1D-A96F-4709-BA47-F233A8FAAB5F");
+    readonly Guid _metadataGuid           = new Guid("8B7CA206-4790-4B9A-B8FE-575F050F886E");
+    readonly Guid _page83DataGuid         = new Guid("BECA12AB-B2E6-4523-93EF-C309E000C746");
+    readonly Guid _parentLocatorGuid      = new Guid("A8D35F2D-B30B-454D-ABF7-D3D84834AB0C");
+    readonly Guid _parentTypeVhdxGuid     = new Guid("B04AEFB7-D19E-4A81-B789-25B8E9445913");
+    readonly Guid _physicalSectorSizeGuid = new Guid("CDA348C7-445D-4471-9CC9-E9885251C556");
+    readonly Guid _virtualDiskSizeGuid    = new Guid("2FA54224-CD1B-4876-B211-5DBED83BF4B8");
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHDX/Helpers.cs b/Aaru.Images/VHDX/Helpers.cs
index 430797352..14aa276e6 100644
--- a/Aaru.Images/VHDX/Helpers.cs
+++ b/Aaru.Images/VHDX/Helpers.cs
@@ -30,20 +30,19 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhdx
 {
-    public sealed partial class Vhdx
+    bool CheckBitmap(ulong sectorAddress)
     {
-        bool CheckBitmap(ulong sectorAddress)
-        {
-            long index = (long)(sectorAddress / 8);
-            int  shift = (int)(sectorAddress  % 8);
-            byte val   = (byte)(1 << shift);
+        long index = (long)(sectorAddress / 8);
+        int  shift = (int)(sectorAddress  % 8);
+        byte val   = (byte)(1 << shift);
 
-            if(index > _sectorBitmap.LongLength)
-                return false;
+        if(index > _sectorBitmap.LongLength)
+            return false;
 
-            return (_sectorBitmap[index] & val) == val;
-        }
+        return (_sectorBitmap[index] & val) == val;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHDX/Identify.cs b/Aaru.Images/VHDX/Identify.cs
index b3b87253e..e4ab70c01 100644
--- a/Aaru.Images/VHDX/Identify.cs
+++ b/Aaru.Images/VHDX/Identify.cs
@@ -34,24 +34,23 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhdx
 {
-    public sealed partial class Vhdx
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 512)
-                return false;
+        if(stream.Length < 512)
+            return false;
 
-            byte[] vhdxIdB = new byte[Marshal.SizeOf<Identifier>()];
-            stream.Read(vhdxIdB, 0, Marshal.SizeOf<Identifier>());
-            _id = Marshal.ByteArrayToStructureLittleEndian<Identifier>(vhdxIdB);
+        byte[] vhdxIdB = new byte[Marshal.SizeOf<Identifier>()];
+        stream.Read(vhdxIdB, 0, Marshal.SizeOf<Identifier>());
+        _id = Marshal.ByteArrayToStructureLittleEndian<Identifier>(vhdxIdB);
 
-            return _id.signature == VHDX_SIGNATURE;
-        }
+        return _id.signature == VHDX_SIGNATURE;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHDX/Properties.cs b/Aaru.Images/VHDX/Properties.cs
index 65db77adf..b87886b2c 100644
--- a/Aaru.Images/VHDX/Properties.cs
+++ b/Aaru.Images/VHDX/Properties.cs
@@ -35,24 +35,23 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class Vhdx
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public string Name => "Microsoft VHDX";
-        /// <inheritdoc />
-        public Guid Id => new Guid("536B141B-D09C-4799-AB70-34631286EB9D");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "VHDX";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+public sealed partial class Vhdx
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "Microsoft VHDX";
+    /// <inheritdoc />
+    public Guid Id => new Guid("536B141B-D09C-4799-AB70-34631286EB9D");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "VHDX";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHDX/Read.cs b/Aaru.Images/VHDX/Read.cs
index 5ece4d8ab..3f12101fd 100644
--- a/Aaru.Images/VHDX/Read.cs
+++ b/Aaru.Images/VHDX/Read.cs
@@ -40,548 +40,547 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhdx
 {
-    public sealed partial class Vhdx
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        if(stream.Length < 512)
+            return ErrorNumber.InvalidArgument;
+
+        byte[] vhdxIdB = new byte[Marshal.SizeOf<Identifier>()];
+        stream.Read(vhdxIdB, 0, Marshal.SizeOf<Identifier>());
+        _id = Marshal.ByteArrayToStructureLittleEndian<Identifier>(vhdxIdB);
+
+        if(_id.signature != VHDX_SIGNATURE)
+            return ErrorNumber.InvalidArgument;
+
+        _imageInfo.Application = Encoding.Unicode.GetString(_id.creator);
+
+        stream.Seek(64 * 1024, SeekOrigin.Begin);
+        byte[] vHdrB = new byte[Marshal.SizeOf<Header>()];
+        stream.Read(vHdrB, 0, Marshal.SizeOf<Header>());
+        _vHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(vHdrB);
+
+        if(_vHdr.Signature != VHDX_HEADER_SIG)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
-
-            if(stream.Length < 512)
-                return ErrorNumber.InvalidArgument;
-
-            byte[] vhdxIdB = new byte[Marshal.SizeOf<Identifier>()];
-            stream.Read(vhdxIdB, 0, Marshal.SizeOf<Identifier>());
-            _id = Marshal.ByteArrayToStructureLittleEndian<Identifier>(vhdxIdB);
-
-            if(_id.signature != VHDX_SIGNATURE)
-                return ErrorNumber.InvalidArgument;
-
-            _imageInfo.Application = Encoding.Unicode.GetString(_id.creator);
-
-            stream.Seek(64 * 1024, SeekOrigin.Begin);
-            byte[] vHdrB = new byte[Marshal.SizeOf<Header>()];
+            stream.Seek(128 * 1024, SeekOrigin.Begin);
+            vHdrB = new byte[Marshal.SizeOf<Header>()];
             stream.Read(vHdrB, 0, Marshal.SizeOf<Header>());
             _vHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(vHdrB);
 
             if(_vHdr.Signature != VHDX_HEADER_SIG)
             {
-                stream.Seek(128 * 1024, SeekOrigin.Begin);
-                vHdrB = new byte[Marshal.SizeOf<Header>()];
-                stream.Read(vHdrB, 0, Marshal.SizeOf<Header>());
-                _vHdr = Marshal.ByteArrayToStructureLittleEndian<Header>(vHdrB);
+                AaruConsole.ErrorWriteLine("VHDX header not found");
 
-                if(_vHdr.Signature != VHDX_HEADER_SIG)
-                {
-                    AaruConsole.ErrorWriteLine("VHDX header not found");
-
-                    return ErrorNumber.InvalidArgument;
-                }
+                return ErrorNumber.InvalidArgument;
             }
+        }
 
-            stream.Seek(192 * 1024, SeekOrigin.Begin);
-            byte[] vRegTableB = new byte[Marshal.SizeOf<RegionTableHeader>()];
+        stream.Seek(192 * 1024, SeekOrigin.Begin);
+        byte[] vRegTableB = new byte[Marshal.SizeOf<RegionTableHeader>()];
+        stream.Read(vRegTableB, 0, Marshal.SizeOf<RegionTableHeader>());
+        _vRegHdr = Marshal.ByteArrayToStructureLittleEndian<RegionTableHeader>(vRegTableB);
+
+        if(_vRegHdr.signature != VHDX_REGION_SIG)
+        {
+            stream.Seek(256 * 1024, SeekOrigin.Begin);
+            vRegTableB = new byte[Marshal.SizeOf<RegionTableHeader>()];
             stream.Read(vRegTableB, 0, Marshal.SizeOf<RegionTableHeader>());
             _vRegHdr = Marshal.ByteArrayToStructureLittleEndian<RegionTableHeader>(vRegTableB);
 
             if(_vRegHdr.signature != VHDX_REGION_SIG)
             {
-                stream.Seek(256 * 1024, SeekOrigin.Begin);
-                vRegTableB = new byte[Marshal.SizeOf<RegionTableHeader>()];
-                stream.Read(vRegTableB, 0, Marshal.SizeOf<RegionTableHeader>());
-                _vRegHdr = Marshal.ByteArrayToStructureLittleEndian<RegionTableHeader>(vRegTableB);
-
-                if(_vRegHdr.signature != VHDX_REGION_SIG)
-                {
-                    AaruConsole.ErrorWriteLine("VHDX region table not found");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-            }
-
-            _vRegs = new RegionTableEntry[_vRegHdr.entries];
-
-            for(int i = 0; i < _vRegs.Length; i++)
-            {
-                byte[] vRegB = new byte[System.Runtime.InteropServices.Marshal.SizeOf(_vRegs[i])];
-                stream.Read(vRegB, 0, System.Runtime.InteropServices.Marshal.SizeOf(_vRegs[i]));
-                _vRegs[i] = Marshal.ByteArrayToStructureLittleEndian<RegionTableEntry>(vRegB);
-
-                if(_vRegs[i].guid == _batGuid)
-                    _batOffset = (long)_vRegs[i].offset;
-                else if(_vRegs[i].guid == _metadataGuid)
-                    _metadataOffset = (long)_vRegs[i].offset;
-                else if((_vRegs[i].flags & REGION_FLAGS_REQUIRED) == REGION_FLAGS_REQUIRED)
-                {
-                    AaruConsole.
-                        ErrorWriteLine($"Found unsupported and required region Guid {_vRegs[i].guid}, not proceeding with image.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-            }
-
-            if(_batOffset == 0)
-            {
-                AaruConsole.ErrorWriteLine("BAT not found, cannot continue.");
+                AaruConsole.ErrorWriteLine("VHDX region table not found");
 
                 return ErrorNumber.InvalidArgument;
             }
-
-            if(_metadataOffset == 0)
-            {
-                AaruConsole.ErrorWriteLine("Metadata not found, cannot continue.");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            uint fileParamsOff = 0, vdSizeOff = 0, p83Off = 0, logOff = 0, physOff = 0, parentOff = 0;
-
-            stream.Seek(_metadataOffset, SeekOrigin.Begin);
-            byte[] metTableB = new byte[Marshal.SizeOf<MetadataTableHeader>()];
-            stream.Read(metTableB, 0, Marshal.SizeOf<MetadataTableHeader>());
-            _vMetHdr = Marshal.ByteArrayToStructureLittleEndian<MetadataTableHeader>(metTableB);
-
-            _vMets = new MetadataTableEntry[_vMetHdr.entries];
-
-            for(int i = 0; i < _vMets.Length; i++)
-            {
-                byte[] vMetB = new byte[System.Runtime.InteropServices.Marshal.SizeOf(_vMets[i])];
-                stream.Read(vMetB, 0, System.Runtime.InteropServices.Marshal.SizeOf(_vMets[i]));
-                _vMets[i] = Marshal.ByteArrayToStructureLittleEndian<MetadataTableEntry>(vMetB);
-
-                if(_vMets[i].itemId == _fileParametersGuid)
-                    fileParamsOff = _vMets[i].offset;
-                else if(_vMets[i].itemId == _virtualDiskSizeGuid)
-                    vdSizeOff = _vMets[i].offset;
-                else if(_vMets[i].itemId == _page83DataGuid)
-                    p83Off = _vMets[i].offset;
-                else if(_vMets[i].itemId == _logicalSectorSizeGuid)
-                    logOff = _vMets[i].offset;
-                else if(_vMets[i].itemId == _physicalSectorSizeGuid)
-                    physOff = _vMets[i].offset;
-                else if(_vMets[i].itemId == _parentLocatorGuid)
-                    parentOff = _vMets[i].offset;
-                else if((_vMets[i].flags & METADATA_FLAGS_REQUIRED) == METADATA_FLAGS_REQUIRED)
-                {
-                    AaruConsole.
-                        ErrorWriteLine($"Found unsupported and required metadata Guid {_vMets[i].itemId}, not proceeding with image.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-            }
-
-            byte[] tmp;
-
-            if(fileParamsOff != 0)
-            {
-                stream.Seek(fileParamsOff + _metadataOffset, SeekOrigin.Begin);
-                tmp = new byte[8];
-                stream.Read(tmp, 0, 8);
-
-                _vFileParms = new FileParameters
-                {
-                    blockSize = BitConverter.ToUInt32(tmp, 0),
-                    flags     = BitConverter.ToUInt32(tmp, 4)
-                };
-            }
-            else
-            {
-                AaruConsole.ErrorWriteLine("File parameters not found.");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(vdSizeOff != 0)
-            {
-                stream.Seek(vdSizeOff + _metadataOffset, SeekOrigin.Begin);
-                tmp = new byte[8];
-                stream.Read(tmp, 0, 8);
-                _virtualDiskSize = BitConverter.ToUInt64(tmp, 0);
-            }
-            else
-            {
-                AaruConsole.ErrorWriteLine("Virtual disk size not found.");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(p83Off != 0)
-            {
-                stream.Seek(p83Off + _metadataOffset, SeekOrigin.Begin);
-                tmp = new byte[16];
-                stream.Read(tmp, 0, 16);
-                _page83Data = new Guid(tmp);
-            }
-
-            if(logOff != 0)
-            {
-                stream.Seek(logOff + _metadataOffset, SeekOrigin.Begin);
-                tmp = new byte[4];
-                stream.Read(tmp, 0, 4);
-                _logicalSectorSize = BitConverter.ToUInt32(tmp, 0);
-            }
-            else
-            {
-                AaruConsole.ErrorWriteLine("Logical sector size not found.");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(physOff != 0)
-            {
-                stream.Seek(physOff + _metadataOffset, SeekOrigin.Begin);
-                tmp = new byte[4];
-                stream.Read(tmp, 0, 4);
-                _physicalSectorSize = BitConverter.ToUInt32(tmp, 0);
-            }
-            else
-            {
-                AaruConsole.ErrorWriteLine("Physical sector size not found.");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            if(parentOff                                   != 0 &&
-               (_vFileParms.flags & FILE_FLAGS_HAS_PARENT) == FILE_FLAGS_HAS_PARENT)
-            {
-                stream.Seek(parentOff + _metadataOffset, SeekOrigin.Begin);
-                byte[] vParHdrB = new byte[Marshal.SizeOf<ParentLocatorHeader>()];
-                stream.Read(vParHdrB, 0, Marshal.SizeOf<ParentLocatorHeader>());
-                _vParHdr = Marshal.ByteArrayToStructureLittleEndian<ParentLocatorHeader>(vParHdrB);
-
-                if(_vParHdr.locatorType != _parentTypeVhdxGuid)
-                {
-                    AaruConsole.
-                        ErrorWriteLine($"Found unsupported and required parent locator type {_vParHdr.locatorType}, not proceeding with image.");
-
-                    return ErrorNumber.NotSupported;
-                }
-
-                _vPars = new ParentLocatorEntry[_vParHdr.keyValueCount];
-
-                for(int i = 0; i < _vPars.Length; i++)
-                {
-                    byte[] vParB = new byte[System.Runtime.InteropServices.Marshal.SizeOf(_vPars[i])];
-                    stream.Read(vParB, 0, System.Runtime.InteropServices.Marshal.SizeOf(_vPars[i]));
-                    _vPars[i] = Marshal.ByteArrayToStructureLittleEndian<ParentLocatorEntry>(vParB);
-                }
-            }
-            else if((_vFileParms.flags & FILE_FLAGS_HAS_PARENT) == FILE_FLAGS_HAS_PARENT)
-            {
-                AaruConsole.ErrorWriteLine("Parent locator not found.");
-
-                return ErrorNumber.NoSuchFile;
-            }
-
-            if((_vFileParms.flags & FILE_FLAGS_HAS_PARENT) == FILE_FLAGS_HAS_PARENT &&
-               _vParHdr.locatorType                        == _parentTypeVhdxGuid)
-            {
-                _parentImage = new Vhdx();
-                bool parentWorks = false;
-
-                foreach(ParentLocatorEntry parentEntry in _vPars)
-                {
-                    stream.Seek(parentEntry.keyOffset + _metadataOffset, SeekOrigin.Begin);
-                    byte[] tmpKey = new byte[parentEntry.keyLength];
-                    stream.Read(tmpKey, 0, tmpKey.Length);
-                    string entryType = Encoding.Unicode.GetString(tmpKey);
-
-                    IFilter parentFilter;
-
-                    if(string.Compare(entryType, RELATIVE_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0)
-                    {
-                        stream.Seek(parentEntry.valueOffset + _metadataOffset, SeekOrigin.Begin);
-                        byte[] tmpVal = new byte[parentEntry.valueLength];
-                        stream.Read(tmpVal, 0, tmpVal.Length);
-                        string entryValue = Encoding.Unicode.GetString(tmpVal);
-
-                        try
-                        {
-                            parentFilter =
-                                new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, entryValue));
-
-                            if(parentFilter                    != null &&
-                               _parentImage.Open(parentFilter) == ErrorNumber.NoError)
-                            {
-                                parentWorks = true;
-
-                                break;
-                            }
-                        }
-                        catch
-                        {
-                            parentWorks = false;
-                        }
-
-                        string relEntry = Path.Combine(Path.GetDirectoryName(imageFilter.Path), entryValue);
-
-                        try
-                        {
-                            parentFilter =
-                                new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, relEntry));
-
-                            if(parentFilter                    == null ||
-                               _parentImage.Open(parentFilter) != ErrorNumber.NoError)
-                                continue;
-
-                            parentWorks = true;
-
-                            break;
-                        }
-                        catch
-                        {
-                            // ignored
-                        }
-                    }
-                    else if(string.Compare(entryType, VOLUME_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0 ||
-                            string.Compare(entryType, ABSOLUTE_WIN32_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0)
-                    {
-                        stream.Seek(parentEntry.valueOffset + _metadataOffset, SeekOrigin.Begin);
-                        byte[] tmpVal = new byte[parentEntry.valueLength];
-                        stream.Read(tmpVal, 0, tmpVal.Length);
-                        string entryValue = Encoding.Unicode.GetString(tmpVal);
-
-                        try
-                        {
-                            parentFilter =
-                                new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, entryValue));
-
-                            if(parentFilter                    == null ||
-                               _parentImage.Open(parentFilter) != ErrorNumber.NoError)
-                                continue;
-
-                            parentWorks = true;
-
-                            break;
-                        }
-                        catch
-                        {
-                            // ignored
-                        }
-                    }
-                }
-
-                if(!parentWorks)
-                {
-                    AaruConsole.ErrorWriteLine("Image is differential but parent cannot be opened.");
-
-                    return ErrorNumber.InOutError;
-                }
-
-                _hasParent = true;
-            }
-
-            _chunkRatio = (long)(Math.Pow(2, 23) * _logicalSectorSize / _vFileParms.blockSize);
-            _dataBlocks = _virtualDiskSize / _vFileParms.blockSize;
-
-            if(_virtualDiskSize % _vFileParms.blockSize > 0)
-                _dataBlocks++;
-
-            long batEntries;
-
-            if(_hasParent)
-            {
-                long sectorBitmapBlocks = (long)_dataBlocks / _chunkRatio;
-
-                if(_dataBlocks % (ulong)_chunkRatio > 0)
-                    sectorBitmapBlocks++;
-
-                _sectorBitmapPointers = new ulong[sectorBitmapBlocks];
-
-                batEntries = sectorBitmapBlocks * (_chunkRatio - 1);
-            }
-            else
-                batEntries = (long)(_dataBlocks + ((_dataBlocks - 1) / (ulong)_chunkRatio));
-
-            AaruConsole.DebugWriteLine("VHDX plugin", "Reading BAT");
-
-            long readChunks = 0;
-            _blockAllocationTable = new ulong[_dataBlocks];
-            byte[] batB = new byte[batEntries * 8];
-            stream.Seek(_batOffset, SeekOrigin.Begin);
-            stream.Read(batB, 0, batB.Length);
-
-            ulong skipSize = 0;
-
-            for(ulong i = 0; i < _dataBlocks; i++)
-                if(readChunks == _chunkRatio)
-                {
-                    if(_hasParent)
-                        _sectorBitmapPointers[skipSize / 8] = BitConverter.ToUInt64(batB, (int)((i * 8) + skipSize));
-
-                    readChunks =  0;
-                    skipSize   += 8;
-                }
-                else
-                {
-                    _blockAllocationTable[i] = BitConverter.ToUInt64(batB, (int)((i * 8) + skipSize));
-                    readChunks++;
-                }
-
-            if(_hasParent)
-            {
-                AaruConsole.DebugWriteLine("VHDX plugin", "Reading Sector Bitmap");
-
-                var sectorBmpMs = new MemoryStream();
-
-                foreach(ulong pt in _sectorBitmapPointers)
-                    switch(pt & BAT_FLAGS_MASK)
-                    {
-                        case SECTOR_BITMAP_NOT_PRESENT:
-                            sectorBmpMs.Write(new byte[1048576], 0, 1048576);
-
-                            break;
-                        case SECTOR_BITMAP_PRESENT:
-                            stream.Seek((long)((pt & BAT_FILE_OFFSET_MASK) * 1048576), SeekOrigin.Begin);
-                            byte[] bmp = new byte[1048576];
-                            stream.Read(bmp, 0, bmp.Length);
-                            sectorBmpMs.Write(bmp, 0, bmp.Length);
-
-                            break;
-                        default:
-                            if((pt & BAT_FLAGS_MASK) != 0)
-                            {
-                                AaruConsole.
-                                    ErrorWriteLine($"Unsupported sector bitmap block flags (0x{pt & BAT_FLAGS_MASK:X16}) found, not proceeding.");
-
-                                return ErrorNumber.InvalidArgument;
-                            }
-
-                            break;
-                    }
-
-                _sectorBitmap = sectorBmpMs.ToArray();
-                sectorBmpMs.Close();
-            }
-
-            _maxBlockCache  = (int)(MAX_CACHE_SIZE / _vFileParms.blockSize);
-            _maxSectorCache = (int)(MAX_CACHE_SIZE / _logicalSectorSize);
-
-            _imageStream = stream;
-
-            _sectorCache = new Dictionary<ulong, byte[]>();
-            _blockCache  = new Dictionary<ulong, byte[]>();
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.SectorSize           = _logicalSectorSize;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.MediaType            = MediaType.GENERIC_HDD;
-            _imageInfo.ImageSize            = _virtualDiskSize;
-            _imageInfo.Sectors              = _imageInfo.ImageSize / _imageInfo.SectorSize;
-            _imageInfo.DriveSerialNumber    = _page83Data.ToString();
-
-            // TODO: Separate image application from version, need several samples.
-
-            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-            _imageInfo.Heads           = 16;
-            _imageInfo.SectorsPerTrack = 63;
-
-            return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        _vRegs = new RegionTableEntry[_vRegHdr.entries];
+
+        for(int i = 0; i < _vRegs.Length; i++)
         {
-            buffer = null;
+            byte[] vRegB = new byte[System.Runtime.InteropServices.Marshal.SizeOf(_vRegs[i])];
+            stream.Read(vRegB, 0, System.Runtime.InteropServices.Marshal.SizeOf(_vRegs[i]));
+            _vRegs[i] = Marshal.ByteArrayToStructureLittleEndian<RegionTableEntry>(vRegB);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(_vRegs[i].guid == _batGuid)
+                _batOffset = (long)_vRegs[i].offset;
+            else if(_vRegs[i].guid == _metadataGuid)
+                _metadataOffset = (long)_vRegs[i].offset;
+            else if((_vRegs[i].flags & REGION_FLAGS_REQUIRED) == REGION_FLAGS_REQUIRED)
+            {
+                AaruConsole.
+                    ErrorWriteLine($"Found unsupported and required region Guid {_vRegs[i].guid}, not proceeding with image.");
+
+                return ErrorNumber.InvalidArgument;
+            }
+        }
+
+        if(_batOffset == 0)
+        {
+            AaruConsole.ErrorWriteLine("BAT not found, cannot continue.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        if(_metadataOffset == 0)
+        {
+            AaruConsole.ErrorWriteLine("Metadata not found, cannot continue.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        uint fileParamsOff = 0, vdSizeOff = 0, p83Off = 0, logOff = 0, physOff = 0, parentOff = 0;
+
+        stream.Seek(_metadataOffset, SeekOrigin.Begin);
+        byte[] metTableB = new byte[Marshal.SizeOf<MetadataTableHeader>()];
+        stream.Read(metTableB, 0, Marshal.SizeOf<MetadataTableHeader>());
+        _vMetHdr = Marshal.ByteArrayToStructureLittleEndian<MetadataTableHeader>(metTableB);
+
+        _vMets = new MetadataTableEntry[_vMetHdr.entries];
+
+        for(int i = 0; i < _vMets.Length; i++)
+        {
+            byte[] vMetB = new byte[System.Runtime.InteropServices.Marshal.SizeOf(_vMets[i])];
+            stream.Read(vMetB, 0, System.Runtime.InteropServices.Marshal.SizeOf(_vMets[i]));
+            _vMets[i] = Marshal.ByteArrayToStructureLittleEndian<MetadataTableEntry>(vMetB);
+
+            if(_vMets[i].itemId == _fileParametersGuid)
+                fileParamsOff = _vMets[i].offset;
+            else if(_vMets[i].itemId == _virtualDiskSizeGuid)
+                vdSizeOff = _vMets[i].offset;
+            else if(_vMets[i].itemId == _page83DataGuid)
+                p83Off = _vMets[i].offset;
+            else if(_vMets[i].itemId == _logicalSectorSizeGuid)
+                logOff = _vMets[i].offset;
+            else if(_vMets[i].itemId == _physicalSectorSizeGuid)
+                physOff = _vMets[i].offset;
+            else if(_vMets[i].itemId == _parentLocatorGuid)
+                parentOff = _vMets[i].offset;
+            else if((_vMets[i].flags & METADATA_FLAGS_REQUIRED) == METADATA_FLAGS_REQUIRED)
+            {
+                AaruConsole.
+                    ErrorWriteLine($"Found unsupported and required metadata Guid {_vMets[i].itemId}, not proceeding with image.");
+
+                return ErrorNumber.InvalidArgument;
+            }
+        }
+
+        byte[] tmp;
+
+        if(fileParamsOff != 0)
+        {
+            stream.Seek(fileParamsOff + _metadataOffset, SeekOrigin.Begin);
+            tmp = new byte[8];
+            stream.Read(tmp, 0, 8);
+
+            _vFileParms = new FileParameters
+            {
+                blockSize = BitConverter.ToUInt32(tmp, 0),
+                flags     = BitConverter.ToUInt32(tmp, 4)
+            };
+        }
+        else
+        {
+            AaruConsole.ErrorWriteLine("File parameters not found.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        if(vdSizeOff != 0)
+        {
+            stream.Seek(vdSizeOff + _metadataOffset, SeekOrigin.Begin);
+            tmp = new byte[8];
+            stream.Read(tmp, 0, 8);
+            _virtualDiskSize = BitConverter.ToUInt64(tmp, 0);
+        }
+        else
+        {
+            AaruConsole.ErrorWriteLine("Virtual disk size not found.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        if(p83Off != 0)
+        {
+            stream.Seek(p83Off + _metadataOffset, SeekOrigin.Begin);
+            tmp = new byte[16];
+            stream.Read(tmp, 0, 16);
+            _page83Data = new Guid(tmp);
+        }
+
+        if(logOff != 0)
+        {
+            stream.Seek(logOff + _metadataOffset, SeekOrigin.Begin);
+            tmp = new byte[4];
+            stream.Read(tmp, 0, 4);
+            _logicalSectorSize = BitConverter.ToUInt32(tmp, 0);
+        }
+        else
+        {
+            AaruConsole.ErrorWriteLine("Logical sector size not found.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        if(physOff != 0)
+        {
+            stream.Seek(physOff + _metadataOffset, SeekOrigin.Begin);
+            tmp = new byte[4];
+            stream.Read(tmp, 0, 4);
+            _physicalSectorSize = BitConverter.ToUInt32(tmp, 0);
+        }
+        else
+        {
+            AaruConsole.ErrorWriteLine("Physical sector size not found.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        if(parentOff                                   != 0 &&
+           (_vFileParms.flags & FILE_FLAGS_HAS_PARENT) == FILE_FLAGS_HAS_PARENT)
+        {
+            stream.Seek(parentOff + _metadataOffset, SeekOrigin.Begin);
+            byte[] vParHdrB = new byte[Marshal.SizeOf<ParentLocatorHeader>()];
+            stream.Read(vParHdrB, 0, Marshal.SizeOf<ParentLocatorHeader>());
+            _vParHdr = Marshal.ByteArrayToStructureLittleEndian<ParentLocatorHeader>(vParHdrB);
+
+            if(_vParHdr.locatorType != _parentTypeVhdxGuid)
+            {
+                AaruConsole.
+                    ErrorWriteLine($"Found unsupported and required parent locator type {_vParHdr.locatorType}, not proceeding with image.");
+
+                return ErrorNumber.NotSupported;
+            }
+
+            _vPars = new ParentLocatorEntry[_vParHdr.keyValueCount];
+
+            for(int i = 0; i < _vPars.Length; i++)
+            {
+                byte[] vParB = new byte[System.Runtime.InteropServices.Marshal.SizeOf(_vPars[i])];
+                stream.Read(vParB, 0, System.Runtime.InteropServices.Marshal.SizeOf(_vPars[i]));
+                _vPars[i] = Marshal.ByteArrayToStructureLittleEndian<ParentLocatorEntry>(vParB);
+            }
+        }
+        else if((_vFileParms.flags & FILE_FLAGS_HAS_PARENT) == FILE_FLAGS_HAS_PARENT)
+        {
+            AaruConsole.ErrorWriteLine("Parent locator not found.");
+
+            return ErrorNumber.NoSuchFile;
+        }
+
+        if((_vFileParms.flags & FILE_FLAGS_HAS_PARENT) == FILE_FLAGS_HAS_PARENT &&
+           _vParHdr.locatorType                        == _parentTypeVhdxGuid)
+        {
+            _parentImage = new Vhdx();
+            bool parentWorks = false;
+
+            foreach(ParentLocatorEntry parentEntry in _vPars)
+            {
+                stream.Seek(parentEntry.keyOffset + _metadataOffset, SeekOrigin.Begin);
+                byte[] tmpKey = new byte[parentEntry.keyLength];
+                stream.Read(tmpKey, 0, tmpKey.Length);
+                string entryType = Encoding.Unicode.GetString(tmpKey);
+
+                IFilter parentFilter;
+
+                if(string.Compare(entryType, RELATIVE_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    stream.Seek(parentEntry.valueOffset + _metadataOffset, SeekOrigin.Begin);
+                    byte[] tmpVal = new byte[parentEntry.valueLength];
+                    stream.Read(tmpVal, 0, tmpVal.Length);
+                    string entryValue = Encoding.Unicode.GetString(tmpVal);
+
+                    try
+                    {
+                        parentFilter =
+                            new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, entryValue));
+
+                        if(parentFilter                    != null &&
+                           _parentImage.Open(parentFilter) == ErrorNumber.NoError)
+                        {
+                            parentWorks = true;
+
+                            break;
+                        }
+                    }
+                    catch
+                    {
+                        parentWorks = false;
+                    }
+
+                    string relEntry = Path.Combine(Path.GetDirectoryName(imageFilter.Path), entryValue);
+
+                    try
+                    {
+                        parentFilter =
+                            new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, relEntry));
+
+                        if(parentFilter                    == null ||
+                           _parentImage.Open(parentFilter) != ErrorNumber.NoError)
+                            continue;
+
+                        parentWorks = true;
+
+                        break;
+                    }
+                    catch
+                    {
+                        // ignored
+                    }
+                }
+                else if(string.Compare(entryType, VOLUME_PATH_KEY, StringComparison.OrdinalIgnoreCase)         == 0 ||
+                        string.Compare(entryType, ABSOLUTE_WIN32_PATH_KEY, StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    stream.Seek(parentEntry.valueOffset + _metadataOffset, SeekOrigin.Begin);
+                    byte[] tmpVal = new byte[parentEntry.valueLength];
+                    stream.Read(tmpVal, 0, tmpVal.Length);
+                    string entryValue = Encoding.Unicode.GetString(tmpVal);
+
+                    try
+                    {
+                        parentFilter =
+                            new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, entryValue));
+
+                        if(parentFilter                    == null ||
+                           _parentImage.Open(parentFilter) != ErrorNumber.NoError)
+                            continue;
+
+                        parentWorks = true;
+
+                        break;
+                    }
+                    catch
+                    {
+                        // ignored
+                    }
+                }
+            }
+
+            if(!parentWorks)
+            {
+                AaruConsole.ErrorWriteLine("Image is differential but parent cannot be opened.");
+
+                return ErrorNumber.InOutError;
+            }
+
+            _hasParent = true;
+        }
+
+        _chunkRatio = (long)(Math.Pow(2, 23) * _logicalSectorSize / _vFileParms.blockSize);
+        _dataBlocks = _virtualDiskSize / _vFileParms.blockSize;
+
+        if(_virtualDiskSize % _vFileParms.blockSize > 0)
+            _dataBlocks++;
+
+        long batEntries;
+
+        if(_hasParent)
+        {
+            long sectorBitmapBlocks = (long)_dataBlocks / _chunkRatio;
+
+            if(_dataBlocks % (ulong)_chunkRatio > 0)
+                sectorBitmapBlocks++;
+
+            _sectorBitmapPointers = new ulong[sectorBitmapBlocks];
+
+            batEntries = sectorBitmapBlocks * (_chunkRatio - 1);
+        }
+        else
+            batEntries = (long)(_dataBlocks + ((_dataBlocks - 1) / (ulong)_chunkRatio));
+
+        AaruConsole.DebugWriteLine("VHDX plugin", "Reading BAT");
+
+        long readChunks = 0;
+        _blockAllocationTable = new ulong[_dataBlocks];
+        byte[] batB = new byte[batEntries * 8];
+        stream.Seek(_batOffset, SeekOrigin.Begin);
+        stream.Read(batB, 0, batB.Length);
+
+        ulong skipSize = 0;
+
+        for(ulong i = 0; i < _dataBlocks; i++)
+            if(readChunks == _chunkRatio)
+            {
+                if(_hasParent)
+                    _sectorBitmapPointers[skipSize / 8] = BitConverter.ToUInt64(batB, (int)((i * 8) + skipSize));
+
+                readChunks =  0;
+                skipSize   += 8;
+            }
+            else
+            {
+                _blockAllocationTable[i] = BitConverter.ToUInt64(batB, (int)((i * 8) + skipSize));
+                readChunks++;
+            }
+
+        if(_hasParent)
+        {
+            AaruConsole.DebugWriteLine("VHDX plugin", "Reading Sector Bitmap");
+
+            var sectorBmpMs = new MemoryStream();
+
+            foreach(ulong pt in _sectorBitmapPointers)
+                switch(pt & BAT_FLAGS_MASK)
+                {
+                    case SECTOR_BITMAP_NOT_PRESENT:
+                        sectorBmpMs.Write(new byte[1048576], 0, 1048576);
+
+                        break;
+                    case SECTOR_BITMAP_PRESENT:
+                        stream.Seek((long)((pt & BAT_FILE_OFFSET_MASK) * 1048576), SeekOrigin.Begin);
+                        byte[] bmp = new byte[1048576];
+                        stream.Read(bmp, 0, bmp.Length);
+                        sectorBmpMs.Write(bmp, 0, bmp.Length);
+
+                        break;
+                    default:
+                        if((pt & BAT_FLAGS_MASK) != 0)
+                        {
+                            AaruConsole.
+                                ErrorWriteLine($"Unsupported sector bitmap block flags (0x{pt & BAT_FLAGS_MASK:X16}) found, not proceeding.");
+
+                            return ErrorNumber.InvalidArgument;
+                        }
+
+                        break;
+                }
+
+            _sectorBitmap = sectorBmpMs.ToArray();
+            sectorBmpMs.Close();
+        }
+
+        _maxBlockCache  = (int)(MAX_CACHE_SIZE / _vFileParms.blockSize);
+        _maxSectorCache = (int)(MAX_CACHE_SIZE / _logicalSectorSize);
+
+        _imageStream = stream;
+
+        _sectorCache = new Dictionary<ulong, byte[]>();
+        _blockCache  = new Dictionary<ulong, byte[]>();
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.SectorSize           = _logicalSectorSize;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.MediaType            = MediaType.GENERIC_HDD;
+        _imageInfo.ImageSize            = _virtualDiskSize;
+        _imageInfo.Sectors              = _imageInfo.ImageSize / _imageInfo.SectorSize;
+        _imageInfo.DriveSerialNumber    = _page83Data.ToString();
+
+        // TODO: Separate image application from version, need several samples.
+
+        _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+        _imageInfo.Heads           = 16;
+        _imageInfo.SectorsPerTrack = 63;
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(_sectorCache.TryGetValue(sectorAddress, out buffer))
+            return ErrorNumber.NoError;
+
+        ulong index  = sectorAddress * _logicalSectorSize / _vFileParms.blockSize;
+        ulong secOff = sectorAddress * _logicalSectorSize % _vFileParms.blockSize;
+
+        ulong blkPtr   = _blockAllocationTable[index];
+        ulong blkFlags = blkPtr & BAT_FLAGS_MASK;
+
+        if((blkPtr & BAT_RESERVED_MASK) != 0)
+        {
+            AaruConsole.ErrorWriteLine($"Unknown flags (0x{blkPtr & BAT_RESERVED_MASK:X16}) set in block pointer");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        switch(blkFlags & BAT_FLAGS_MASK)
+        {
+            case PAYLOAD_BLOCK_NOT_PRESENT:
+                if(_hasParent)
+                    return _parentImage.ReadSector(sectorAddress, out buffer);
+
+                buffer = new byte[_logicalSectorSize];
 
-            if(_sectorCache.TryGetValue(sectorAddress, out buffer))
                 return ErrorNumber.NoError;
+            case PAYLOAD_BLOCK_UNDEFINED:
+            case PAYLOAD_BLOCK_ZERO:
+            case PAYLOAD_BLOCK_UNMAPPER:
+                buffer = new byte[_logicalSectorSize];
 
-            ulong index  = sectorAddress * _logicalSectorSize / _vFileParms.blockSize;
-            ulong secOff = sectorAddress * _logicalSectorSize % _vFileParms.blockSize;
-
-            ulong blkPtr   = _blockAllocationTable[index];
-            ulong blkFlags = blkPtr & BAT_FLAGS_MASK;
-
-            if((blkPtr & BAT_RESERVED_MASK) != 0)
-            {
-                AaruConsole.ErrorWriteLine($"Unknown flags (0x{blkPtr & BAT_RESERVED_MASK:X16}) set in block pointer");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            switch(blkFlags & BAT_FLAGS_MASK)
-            {
-                case PAYLOAD_BLOCK_NOT_PRESENT:
-                    if(_hasParent)
-                        return _parentImage.ReadSector(sectorAddress, out buffer);
-
-                    buffer = new byte[_logicalSectorSize];
-
-                    return ErrorNumber.NoError;
-                case PAYLOAD_BLOCK_UNDEFINED:
-                case PAYLOAD_BLOCK_ZERO:
-                case PAYLOAD_BLOCK_UNMAPPER:
-                    buffer = new byte[_logicalSectorSize];
-
-                    return ErrorNumber.NoError;
-            }
-
-            bool partialBlock;
-            partialBlock = (blkFlags & BAT_FLAGS_MASK) == PAYLOAD_BLOCK_PARTIALLY_PRESENT;
-
-            if(partialBlock &&
-               _hasParent   &&
-               !CheckBitmap(sectorAddress))
-                return _parentImage.ReadSector(sectorAddress, out buffer);
-
-            if(!_blockCache.TryGetValue(blkPtr & BAT_FILE_OFFSET_MASK, out byte[] block))
-            {
-                block = new byte[_vFileParms.blockSize];
-                _imageStream.Seek((long)(blkPtr & BAT_FILE_OFFSET_MASK), SeekOrigin.Begin);
-                _imageStream.Read(block, 0, block.Length);
-
-                if(_blockCache.Count >= _maxBlockCache)
-                    _blockCache.Clear();
-
-                _blockCache.Add(blkPtr & BAT_FILE_OFFSET_MASK, block);
-            }
-
-            buffer = new byte[_logicalSectorSize];
-            Array.Copy(block, (int)secOff, buffer, 0, buffer.Length);
-
-            if(_sectorCache.Count >= _maxSectorCache)
-                _sectorCache.Clear();
-
-            _sectorCache.Add(sectorAddress, buffer);
-
-            return ErrorNumber.NoError;
+                return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        bool partialBlock;
+        partialBlock = (blkFlags & BAT_FLAGS_MASK) == PAYLOAD_BLOCK_PARTIALLY_PRESENT;
+
+        if(partialBlock &&
+           _hasParent   &&
+           !CheckBitmap(sectorAddress))
+            return _parentImage.ReadSector(sectorAddress, out buffer);
+
+        if(!_blockCache.TryGetValue(blkPtr & BAT_FILE_OFFSET_MASK, out byte[] block))
         {
-            buffer = null;
+            block = new byte[_vFileParms.blockSize];
+            _imageStream.Seek((long)(blkPtr & BAT_FILE_OFFSET_MASK), SeekOrigin.Begin);
+            _imageStream.Read(block, 0, block.Length);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(_blockCache.Count >= _maxBlockCache)
+                _blockCache.Clear();
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            _blockCache.Add(blkPtr & BAT_FILE_OFFSET_MASK, block);
         }
+
+        buffer = new byte[_logicalSectorSize];
+        Array.Copy(block, (int)secOff, buffer, 0, buffer.Length);
+
+        if(_sectorCache.Count >= _maxSectorCache)
+            _sectorCache.Clear();
+
+        _sectorCache.Add(sectorAddress, buffer);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHDX/Structs.cs b/Aaru.Images/VHDX/Structs.cs
index 3eaeaa610..9abc16d1e 100644
--- a/Aaru.Images/VHDX/Structs.cs
+++ b/Aaru.Images/VHDX/Structs.cs
@@ -33,135 +33,134 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhdx
 {
-    public sealed partial class Vhdx
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Identifier
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Identifier
-        {
-            /// <summary>Signature, <see cref="Vhdx.VHDX_SIGNATURE" /></summary>
-            public readonly ulong signature;
-            /// <summary>UTF-16 string containing creator</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public readonly byte[] creator;
-        }
+        /// <summary>Signature, <see cref="Vhdx.VHDX_SIGNATURE" /></summary>
+        public readonly ulong signature;
+        /// <summary>UTF-16 string containing creator</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
+        public readonly byte[] creator;
+    }
 
-        #pragma warning disable 649
-        #pragma warning disable 169
-        struct Header
-        {
-            /// <summary>Signature, <see cref="Vhdx.VHDX_HEADER_SIG" /></summary>
-            public uint Signature;
-            /// <summary>CRC-32C of whole 4096 bytes header with this field set to 0</summary>
-            public uint Checksum;
-            /// <summary>Sequence number</summary>
-            public ulong Sequence;
-            /// <summary>Unique identifier for file contents, must be changed on first write to metadata</summary>
-            public Guid FileWriteGuid;
-            /// <summary>Unique identifier for disk contents, must be changed on first write to metadata or data</summary>
-            public Guid DataWriteGuid;
-            /// <summary>Unique identifier for log entries</summary>
-            public Guid LogGuid;
-            /// <summary>Version of log format</summary>
-            public ushort LogVersion;
-            /// <summary>Version of VHDX format</summary>
-            public ushort Version;
-            /// <summary>Length in bytes of the log</summary>
-            public uint LogLength;
-            /// <summary>Offset from image start to the log</summary>
-            public ulong LogOffset;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4016)]
-            public byte[] Reserved;
-        }
-        #pragma warning restore 649
-        #pragma warning restore 169
+    #pragma warning disable 649
+    #pragma warning disable 169
+    struct Header
+    {
+        /// <summary>Signature, <see cref="Vhdx.VHDX_HEADER_SIG" /></summary>
+        public uint Signature;
+        /// <summary>CRC-32C of whole 4096 bytes header with this field set to 0</summary>
+        public uint Checksum;
+        /// <summary>Sequence number</summary>
+        public ulong Sequence;
+        /// <summary>Unique identifier for file contents, must be changed on first write to metadata</summary>
+        public Guid FileWriteGuid;
+        /// <summary>Unique identifier for disk contents, must be changed on first write to metadata or data</summary>
+        public Guid DataWriteGuid;
+        /// <summary>Unique identifier for log entries</summary>
+        public Guid LogGuid;
+        /// <summary>Version of log format</summary>
+        public ushort LogVersion;
+        /// <summary>Version of VHDX format</summary>
+        public ushort Version;
+        /// <summary>Length in bytes of the log</summary>
+        public uint LogLength;
+        /// <summary>Offset from image start to the log</summary>
+        public ulong LogOffset;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4016)]
+        public byte[] Reserved;
+    }
+    #pragma warning restore 649
+    #pragma warning restore 169
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct RegionTableHeader
-        {
-            /// <summary>Signature, <see cref="Vhdx.VHDX_REGION_SIG" /></summary>
-            public readonly uint signature;
-            /// <summary>CRC-32C of whole 64Kb table with this field set to 0</summary>
-            public readonly uint checksum;
-            /// <summary>How many entries follow this table</summary>
-            public readonly uint entries;
-            /// <summary>Reserved</summary>
-            public readonly uint reserved;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct RegionTableHeader
+    {
+        /// <summary>Signature, <see cref="Vhdx.VHDX_REGION_SIG" /></summary>
+        public readonly uint signature;
+        /// <summary>CRC-32C of whole 64Kb table with this field set to 0</summary>
+        public readonly uint checksum;
+        /// <summary>How many entries follow this table</summary>
+        public readonly uint entries;
+        /// <summary>Reserved</summary>
+        public readonly uint reserved;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct RegionTableEntry
-        {
-            /// <summary>Object identifier</summary>
-            public readonly Guid guid;
-            /// <summary>Offset in image of the object</summary>
-            public readonly ulong offset;
-            /// <summary>Length in bytes of the object</summary>
-            public readonly uint length;
-            /// <summary>Flags</summary>
-            public readonly uint flags;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct RegionTableEntry
+    {
+        /// <summary>Object identifier</summary>
+        public readonly Guid guid;
+        /// <summary>Offset in image of the object</summary>
+        public readonly ulong offset;
+        /// <summary>Length in bytes of the object</summary>
+        public readonly uint length;
+        /// <summary>Flags</summary>
+        public readonly uint flags;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MetadataTableHeader
-        {
-            /// <summary>Signature</summary>
-            public readonly ulong signature;
-            /// <summary>Reserved</summary>
-            public readonly ushort reserved;
-            /// <summary>How many entries are in the table</summary>
-            public readonly ushort entries;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly uint[] reserved2;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MetadataTableHeader
+    {
+        /// <summary>Signature</summary>
+        public readonly ulong signature;
+        /// <summary>Reserved</summary>
+        public readonly ushort reserved;
+        /// <summary>How many entries are in the table</summary>
+        public readonly ushort entries;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly uint[] reserved2;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MetadataTableEntry
-        {
-            /// <summary>Metadata ID</summary>
-            public readonly Guid itemId;
-            /// <summary>Offset relative to start of metadata region</summary>
-            public readonly uint offset;
-            /// <summary>Length in bytes</summary>
-            public readonly uint length;
-            /// <summary>Flags</summary>
-            public readonly uint flags;
-            /// <summary>Reserved</summary>
-            public readonly uint reserved;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MetadataTableEntry
+    {
+        /// <summary>Metadata ID</summary>
+        public readonly Guid itemId;
+        /// <summary>Offset relative to start of metadata region</summary>
+        public readonly uint offset;
+        /// <summary>Length in bytes</summary>
+        public readonly uint length;
+        /// <summary>Flags</summary>
+        public readonly uint flags;
+        /// <summary>Reserved</summary>
+        public readonly uint reserved;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct FileParameters
-        {
-            /// <summary>Block size in bytes</summary>
-            public uint blockSize;
-            /// <summary>Flags</summary>
-            public uint flags;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct FileParameters
+    {
+        /// <summary>Block size in bytes</summary>
+        public uint blockSize;
+        /// <summary>Flags</summary>
+        public uint flags;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ParentLocatorHeader
-        {
-            /// <summary>Type of parent virtual disk</summary>
-            public readonly Guid locatorType;
-            public readonly ushort reserved;
-            /// <summary>How many KVPs are in this parent locator</summary>
-            public readonly ushort keyValueCount;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ParentLocatorHeader
+    {
+        /// <summary>Type of parent virtual disk</summary>
+        public readonly Guid locatorType;
+        public readonly ushort reserved;
+        /// <summary>How many KVPs are in this parent locator</summary>
+        public readonly ushort keyValueCount;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ParentLocatorEntry
-        {
-            /// <summary>Offset from metadata to key</summary>
-            public readonly uint keyOffset;
-            /// <summary>Offset from metadata to value</summary>
-            public readonly uint valueOffset;
-            /// <summary>Size of key</summary>
-            public readonly ushort keyLength;
-            /// <summary>Size of value</summary>
-            public readonly ushort valueLength;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ParentLocatorEntry
+    {
+        /// <summary>Offset from metadata to key</summary>
+        public readonly uint keyOffset;
+        /// <summary>Offset from metadata to value</summary>
+        public readonly uint valueOffset;
+        /// <summary>Size of key</summary>
+        public readonly ushort keyLength;
+        /// <summary>Size of value</summary>
+        public readonly ushort valueLength;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHDX/Unsupported.cs b/Aaru.Images/VHDX/Unsupported.cs
index bb97525ef..3b6dcf86a 100644
--- a/Aaru.Images/VHDX/Unsupported.cs
+++ b/Aaru.Images/VHDX/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Vhdx
 {
-    public sealed partial class Vhdx
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VHDX/VHDX.cs b/Aaru.Images/VHDX/VHDX.cs
index f9a5a5d71..17cdea8dc 100644
--- a/Aaru.Images/VHDX/VHDX.cs
+++ b/Aaru.Images/VHDX/VHDX.cs
@@ -39,63 +39,62 @@ using Aaru.CommonTypes.Structs;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading Hyper-V disk images</summary>
-    public sealed partial class Vhdx : IMediaImage
-    {
-        long                      _batOffset;
-        ulong[]                   _blockAllocationTable;
-        Dictionary<ulong, byte[]> _blockCache;
-        long                      _chunkRatio;
-        ulong                     _dataBlocks;
-        bool                      _hasParent;
-        ImageInfo                 _imageInfo;
-        Stream                    _imageStream;
-        uint                      _logicalSectorSize;
-        int                       _maxBlockCache;
-        int                       _maxSectorCache;
-        long                      _metadataOffset;
-        Guid                      _page83Data;
-        IMediaImage               _parentImage;
-        uint                      _physicalSectorSize;
-        byte[]                    _sectorBitmap;
-        ulong[]                   _sectorBitmapPointers;
-        Dictionary<ulong, byte[]> _sectorCache;
-        FileParameters            _vFileParms;
-        Header                    _vHdr;
-        Identifier                _id;
-        ulong                     _virtualDiskSize;
-        MetadataTableHeader       _vMetHdr;
-        MetadataTableEntry[]      _vMets;
-        ParentLocatorHeader       _vParHdr;
-        ParentLocatorEntry[]      _vPars;
-        RegionTableHeader         _vRegHdr;
-        RegionTableEntry[]        _vRegs;
+namespace Aaru.DiscImages;
 
-        public Vhdx() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading Hyper-V disk images</summary>
+public sealed partial class Vhdx : IMediaImage
+{
+    long                      _batOffset;
+    ulong[]                   _blockAllocationTable;
+    Dictionary<ulong, byte[]> _blockCache;
+    long                      _chunkRatio;
+    ulong                     _dataBlocks;
+    bool                      _hasParent;
+    ImageInfo                 _imageInfo;
+    Stream                    _imageStream;
+    uint                      _logicalSectorSize;
+    int                       _maxBlockCache;
+    int                       _maxSectorCache;
+    long                      _metadataOffset;
+    Guid                      _page83Data;
+    IMediaImage               _parentImage;
+    uint                      _physicalSectorSize;
+    byte[]                    _sectorBitmap;
+    ulong[]                   _sectorBitmapPointers;
+    Dictionary<ulong, byte[]> _sectorCache;
+    FileParameters            _vFileParms;
+    Header                    _vHdr;
+    Identifier                _id;
+    ulong                     _virtualDiskSize;
+    MetadataTableHeader       _vMetHdr;
+    MetadataTableEntry[]      _vMets;
+    ParentLocatorHeader       _vParHdr;
+    ParentLocatorEntry[]      _vPars;
+    RegionTableHeader         _vRegHdr;
+    RegionTableEntry[]        _vRegs;
+
+    public Vhdx() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Constants.cs b/Aaru.Images/VMware/Constants.cs
index 0a309b881..0418550d7 100644
--- a/Aaru.Images/VMware/Constants.cs
+++ b/Aaru.Images/VMware/Constants.cs
@@ -32,64 +32,63 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed partial class VMware
 {
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed partial class VMware
+    const uint VMWARE_EXTENT_MAGIC = 0x564D444B;
+    const uint VMWARE_COW_MAGIC    = 0x44574F43;
+
+    const string VM_TYPE_CUSTOM       = "custom";
+    const string VM_TYPE_MONO_SPARSE  = "monolithicSparse";
+    const string VM_TYPE_MONO_FLAT    = "monolithicFlat";
+    const string VM_TYPE_SPLIT_SPARSE = "twoGbMaxExtentSparse";
+    const string VM_TYPE_SPLIT_FLAT   = "twoGbMaxExtentFlat";
+    const string VM_TYPE_FULL_DEVICE  = "fullDevice";
+    const string VM_TYPE_PART_DEVICE  = "partitionedDevice";
+    const string VMFS_TYPE_FLAT       = "vmfsPreallocated";
+    const string VMFS_TYPE_ZERO       = "vmfsEagerZeroedThick";
+    const string VMFS_TYPE_THIN       = "vmfsThin";
+    const string VMFS_TYPE_SPARSE     = "vmfsSparse";
+    const string VMFS_TYPE_RDM        = "vmfsRDM";
+    const string VMFS_TYPE_RDM_OLD    = "vmfsRawDeviceMap";
+    const string VMFS_TYPE_RDMP       = "vmfsRDMP";
+    const string VMFS_TYPE_RDMP_OLD   = "vmfsPassthroughRawDeviceMap";
+    const string VMFS_TYPE_RAW        = "vmfsRaw";
+    const string VMFS_TYPE            = "vmfs";
+    const string VM_TYPE_STREAM       = "streamOptimized";
+
+    const string DDF_MAGIC = "# Disk DescriptorFile";
+
+    const string REGEX_VERSION    = @"^\s*version\s*=\s*(?<version>\d+)$";
+    const string REGEX_CID        = @"^\s*CID\s*=\s*(?<cid>[0123456789abcdef]{8})$";
+    const string REGEX_CID_PARENT = @"^\s*parentCID\s*=\s*(?<cid>[0123456789abcdef]{8})$";
+    const string REGEX_TYPE =
+        @"^\s*createType\s*=\s*\""(?<type>custom|monolithicSparse|monolithicFlat|twoGbMaxExtentSparse|twoGbMaxExtentFlat|fullDevice|partitionedDevice|vmfs|vmfsPreallocated|vmfsEagerZeroedThick|vmfsThin|vmfsSparse|vmfsRDM|vmfsRawDeviceMap|vmfsRDMP|vmfsPassthroughRawDeviceMap|vmfsRaw|streamOptimized)\""$";
+    const string REGEX_EXTENT =
+        @"^\s*(?<access>(RW|RDONLY|NOACCESS))\s+(?<sectors>\d+)\s+(?<type>(FLAT|SPARSE|ZERO|VMFS|VMFSSPARSE|VMFSRDM|VMFSRAW))\s+\""(?<filename>.+)\""(\s*(?<offset>\d+))?$";
+    const string REGEX_DDB_TYPE      = @"^\s*ddb\.adapterType\s*=\s*\""(?<type>ide|buslogic|lsilogic|legacyESX)\""$";
+    const string REGEX_DDB_SECTORS   = @"^\s*ddb\.geometry\.sectors\s*=\s*\""(?<sectors>\d+)\""$";
+    const string REGEX_DDB_HEADS     = @"^\s*ddb\.geometry\.heads\s*=\s*\""(?<heads>\d+)\""$";
+    const string REGEX_DDB_CYLINDERS = @"^\s*ddb\.geometry\.cylinders\s*=\s*\""(?<cylinders>\d+)\""$";
+    const string PARENT_REGEX        = @"^\s*parentFileNameHint\s*=\s*\""(?<filename>.+)\""$";
+
+    const uint FLAGS_VALID_NEW_LINE      = 0x01;
+    const uint FLAGS_USE_REDUNDANT_TABLE = 0x02;
+    const uint FLAGS_ZERO_GRAIN_GTE      = 0x04;
+    const uint FLAGS_COMPRESSION         = 0x10000;
+    const uint FLAGS_MARKERS             = 0x20000;
+
+    const ushort COMPRESSION_NONE    = 0;
+    const ushort COMPRESSION_DEFLATE = 1;
+
+    const uint MAX_CACHE_SIZE     = 16777216;
+    const uint SECTOR_SIZE        = 512;
+    const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / SECTOR_SIZE;
+    readonly byte[] _ddfMagicBytes =
     {
-        const uint VMWARE_EXTENT_MAGIC = 0x564D444B;
-        const uint VMWARE_COW_MAGIC    = 0x44574F43;
-
-        const string VM_TYPE_CUSTOM       = "custom";
-        const string VM_TYPE_MONO_SPARSE  = "monolithicSparse";
-        const string VM_TYPE_MONO_FLAT    = "monolithicFlat";
-        const string VM_TYPE_SPLIT_SPARSE = "twoGbMaxExtentSparse";
-        const string VM_TYPE_SPLIT_FLAT   = "twoGbMaxExtentFlat";
-        const string VM_TYPE_FULL_DEVICE  = "fullDevice";
-        const string VM_TYPE_PART_DEVICE  = "partitionedDevice";
-        const string VMFS_TYPE_FLAT       = "vmfsPreallocated";
-        const string VMFS_TYPE_ZERO       = "vmfsEagerZeroedThick";
-        const string VMFS_TYPE_THIN       = "vmfsThin";
-        const string VMFS_TYPE_SPARSE     = "vmfsSparse";
-        const string VMFS_TYPE_RDM        = "vmfsRDM";
-        const string VMFS_TYPE_RDM_OLD    = "vmfsRawDeviceMap";
-        const string VMFS_TYPE_RDMP       = "vmfsRDMP";
-        const string VMFS_TYPE_RDMP_OLD   = "vmfsPassthroughRawDeviceMap";
-        const string VMFS_TYPE_RAW        = "vmfsRaw";
-        const string VMFS_TYPE            = "vmfs";
-        const string VM_TYPE_STREAM       = "streamOptimized";
-
-        const string DDF_MAGIC = "# Disk DescriptorFile";
-
-        const string REGEX_VERSION    = @"^\s*version\s*=\s*(?<version>\d+)$";
-        const string REGEX_CID        = @"^\s*CID\s*=\s*(?<cid>[0123456789abcdef]{8})$";
-        const string REGEX_CID_PARENT = @"^\s*parentCID\s*=\s*(?<cid>[0123456789abcdef]{8})$";
-        const string REGEX_TYPE =
-            @"^\s*createType\s*=\s*\""(?<type>custom|monolithicSparse|monolithicFlat|twoGbMaxExtentSparse|twoGbMaxExtentFlat|fullDevice|partitionedDevice|vmfs|vmfsPreallocated|vmfsEagerZeroedThick|vmfsThin|vmfsSparse|vmfsRDM|vmfsRawDeviceMap|vmfsRDMP|vmfsPassthroughRawDeviceMap|vmfsRaw|streamOptimized)\""$";
-        const string REGEX_EXTENT =
-            @"^\s*(?<access>(RW|RDONLY|NOACCESS))\s+(?<sectors>\d+)\s+(?<type>(FLAT|SPARSE|ZERO|VMFS|VMFSSPARSE|VMFSRDM|VMFSRAW))\s+\""(?<filename>.+)\""(\s*(?<offset>\d+))?$";
-        const string REGEX_DDB_TYPE = @"^\s*ddb\.adapterType\s*=\s*\""(?<type>ide|buslogic|lsilogic|legacyESX)\""$";
-        const string REGEX_DDB_SECTORS = @"^\s*ddb\.geometry\.sectors\s*=\s*\""(?<sectors>\d+)\""$";
-        const string REGEX_DDB_HEADS = @"^\s*ddb\.geometry\.heads\s*=\s*\""(?<heads>\d+)\""$";
-        const string REGEX_DDB_CYLINDERS = @"^\s*ddb\.geometry\.cylinders\s*=\s*\""(?<cylinders>\d+)\""$";
-        const string PARENT_REGEX = @"^\s*parentFileNameHint\s*=\s*\""(?<filename>.+)\""$";
-
-        const uint FLAGS_VALID_NEW_LINE      = 0x01;
-        const uint FLAGS_USE_REDUNDANT_TABLE = 0x02;
-        const uint FLAGS_ZERO_GRAIN_GTE      = 0x04;
-        const uint FLAGS_COMPRESSION         = 0x10000;
-        const uint FLAGS_MARKERS             = 0x20000;
-
-        const ushort COMPRESSION_NONE    = 0;
-        const ushort COMPRESSION_DEFLATE = 1;
-
-        const uint MAX_CACHE_SIZE     = 16777216;
-        const uint SECTOR_SIZE        = 512;
-        const uint MAX_CACHED_SECTORS = MAX_CACHE_SIZE / SECTOR_SIZE;
-        readonly byte[] _ddfMagicBytes =
-        {
-            0x23, 0x20, 0x44, 0x69, 0x73, 0x6B, 0x20, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6F, 0x72, 0x46,
-            0x69, 0x6C, 0x65
-        };
-    }
+        0x23, 0x20, 0x44, 0x69, 0x73, 0x6B, 0x20, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6F, 0x72, 0x46,
+        0x69, 0x6C, 0x65
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Identify.cs b/Aaru.Images/VMware/Identify.cs
index bca2417dc..e74be30cd 100644
--- a/Aaru.Images/VMware/Identify.cs
+++ b/Aaru.Images/VMware/Identify.cs
@@ -35,46 +35,45 @@ using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class VMware
 {
-    public sealed partial class VMware
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+
+        byte[] ddfMagic = new byte[0x15];
+
+        if(stream.Length > Marshal.SizeOf<ExtentHeader>())
         {
-            Stream stream = imageFilter.GetDataForkStream();
-
-            byte[] ddfMagic = new byte[0x15];
-
-            if(stream.Length > Marshal.SizeOf<ExtentHeader>())
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-                byte[] vmEHdrB = new byte[Marshal.SizeOf<ExtentHeader>()];
-                stream.Read(vmEHdrB, 0, Marshal.SizeOf<ExtentHeader>());
-                _vmEHdr = Marshal.ByteArrayToStructureLittleEndian<ExtentHeader>(vmEHdrB);
-
-                stream.Seek(0, SeekOrigin.Begin);
-                stream.Read(ddfMagic, 0, 0x15);
-
-                _vmCHdr = new CowHeader();
-
-                if(stream.Length <= Marshal.SizeOf<CowHeader>())
-                    return _ddfMagicBytes.SequenceEqual(ddfMagic) || _vmEHdr.magic == VMWARE_EXTENT_MAGIC ||
-                           _vmCHdr.magic                                           == VMWARE_COW_MAGIC;
-
-                stream.Seek(0, SeekOrigin.Begin);
-                byte[] vmCHdrB = new byte[Marshal.SizeOf<CowHeader>()];
-                stream.Read(vmCHdrB, 0, Marshal.SizeOf<CowHeader>());
-                _vmCHdr = Marshal.ByteArrayToStructureLittleEndian<CowHeader>(vmCHdrB);
-
-                return _ddfMagicBytes.SequenceEqual(ddfMagic) || _vmEHdr.magic == VMWARE_EXTENT_MAGIC ||
-                       _vmCHdr.magic                                           == VMWARE_COW_MAGIC;
-            }
+            stream.Seek(0, SeekOrigin.Begin);
+            byte[] vmEHdrB = new byte[Marshal.SizeOf<ExtentHeader>()];
+            stream.Read(vmEHdrB, 0, Marshal.SizeOf<ExtentHeader>());
+            _vmEHdr = Marshal.ByteArrayToStructureLittleEndian<ExtentHeader>(vmEHdrB);
 
             stream.Seek(0, SeekOrigin.Begin);
             stream.Read(ddfMagic, 0, 0x15);
 
-            return _ddfMagicBytes.SequenceEqual(ddfMagic);
+            _vmCHdr = new CowHeader();
+
+            if(stream.Length <= Marshal.SizeOf<CowHeader>())
+                return _ddfMagicBytes.SequenceEqual(ddfMagic) || _vmEHdr.magic == VMWARE_EXTENT_MAGIC ||
+                       _vmCHdr.magic                                           == VMWARE_COW_MAGIC;
+
+            stream.Seek(0, SeekOrigin.Begin);
+            byte[] vmCHdrB = new byte[Marshal.SizeOf<CowHeader>()];
+            stream.Read(vmCHdrB, 0, Marshal.SizeOf<CowHeader>());
+            _vmCHdr = Marshal.ByteArrayToStructureLittleEndian<CowHeader>(vmCHdrB);
+
+            return _ddfMagicBytes.SequenceEqual(ddfMagic) || _vmEHdr.magic == VMWARE_EXTENT_MAGIC ||
+                   _vmCHdr.magic                                           == VMWARE_COW_MAGIC;
         }
+
+        stream.Seek(0, SeekOrigin.Begin);
+        stream.Read(ddfMagic, 0, 0x15);
+
+        return _ddfMagicBytes.SequenceEqual(ddfMagic);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Properties.cs b/Aaru.Images/VMware/Properties.cs
index 75f5fa3cd..c910aa8d6 100644
--- a/Aaru.Images/VMware/Properties.cs
+++ b/Aaru.Images/VMware/Properties.cs
@@ -37,55 +37,54 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class VMware
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public string Name => "VMware disk image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "VMware";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
-        {
-            ("adapter_type", typeof(string),
-             "Type of adapter type. Possible values: ide, lsilogic, buslogic, legacyESX.", "ide"),
-            ("hwversion", typeof(uint), "VDMK hardware version.", 4),
-            ("sparse", typeof(bool), "Use sparse extents.", false),
-            ("split", typeof(bool), "Split data file at 2GiB.", (object)false)
-        };
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".vmdk"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+public sealed partial class VMware
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "VMware disk image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("E314DE35-C103-48A3-AD36-990F68523C46");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "VMware";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
+    {
+        MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions => new[]
+    {
+        ("adapter_type", typeof(string),
+         "Type of adapter type. Possible values: ide, lsilogic, buslogic, legacyESX.", "ide"),
+        ("hwversion", typeof(uint), "VDMK hardware version.", 4),
+        ("sparse", typeof(bool), "Use sparse extents.", false),
+        ("split", typeof(bool), "Split data file at 2GiB.", (object)false)
+    };
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".vmdk"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Read.cs b/Aaru.Images/VMware/Read.cs
index 10ba4846f..f7a55dc31 100644
--- a/Aaru.Images/VMware/Read.cs
+++ b/Aaru.Images/VMware/Read.cs
@@ -43,611 +43,574 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class VMware
 {
-    public sealed partial class VMware
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+
+        _vmEHdr = new ExtentHeader();
+        _vmCHdr = new CowHeader();
+        bool embedded = false;
+
+        if(stream.Length > Marshal.SizeOf<ExtentHeader>())
         {
-            Stream stream = imageFilter.GetDataForkStream();
-
-            _vmEHdr = new ExtentHeader();
-            _vmCHdr = new CowHeader();
-            bool embedded = false;
-
-            if(stream.Length > Marshal.SizeOf<ExtentHeader>())
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-                byte[] vmEHdrB = new byte[Marshal.SizeOf<ExtentHeader>()];
-                stream.Read(vmEHdrB, 0, Marshal.SizeOf<ExtentHeader>());
-                _vmEHdr = Marshal.ByteArrayToStructureLittleEndian<ExtentHeader>(vmEHdrB);
-            }
-
-            if(stream.Length > Marshal.SizeOf<CowHeader>())
-            {
-                stream.Seek(0, SeekOrigin.Begin);
-                byte[] vmCHdrB = new byte[Marshal.SizeOf<CowHeader>()];
-                stream.Read(vmCHdrB, 0, Marshal.SizeOf<CowHeader>());
-                _vmCHdr = Marshal.ByteArrayToStructureLittleEndian<CowHeader>(vmCHdrB);
-            }
-
-            var  ddfStream = new MemoryStream();
-            bool vmEHdrSet = false;
-            bool cowD      = false;
-
-            if(_vmEHdr.magic == VMWARE_EXTENT_MAGIC)
-            {
-                vmEHdrSet = true;
-                _gdFilter = imageFilter;
-
-                if(_vmEHdr.descriptorOffset == 0 ||
-                   _vmEHdr.descriptorSize   == 0)
-                {
-                    AaruConsole.ErrorWriteLine("Please open VMDK descriptor.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                byte[] ddfEmbed = new byte[_vmEHdr.descriptorSize * SECTOR_SIZE];
-
-                stream.Seek((long)(_vmEHdr.descriptorOffset * SECTOR_SIZE), SeekOrigin.Begin);
-                stream.Read(ddfEmbed, 0, ddfEmbed.Length);
-                ddfStream.Write(ddfEmbed, 0, ddfEmbed.Length);
-
-                embedded = true;
-            }
-            else if(_vmCHdr.magic == VMWARE_COW_MAGIC)
-            {
-                _gdFilter = imageFilter;
-                cowD      = true;
-            }
-            else
-            {
-                byte[] ddfMagic = new byte[0x15];
-                stream.Seek(0, SeekOrigin.Begin);
-                stream.Read(ddfMagic, 0, 0x15);
-
-                if(!_ddfMagicBytes.SequenceEqual(ddfMagic))
-                {
-                    AaruConsole.ErrorWriteLine("Not a descriptor.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                stream.Seek(0, SeekOrigin.Begin);
-                byte[] ddfExternal = new byte[imageFilter.DataForkLength];
-                stream.Read(ddfExternal, 0, ddfExternal.Length);
-                ddfStream.Write(ddfExternal, 0, ddfExternal.Length);
-            }
-
-            _extents = new Dictionary<ulong, Extent>();
-            ulong currentSector = 0;
-
-            bool matchedCyls = false, matchedHds = false, matchedSpt = false;
-
-            if(cowD)
-            {
-                int    cowCount = 1;
-                string basePath = Path.GetFileNameWithoutExtension(imageFilter.BasePath);
-
-                while(true)
-                {
-                    string curPath;
-
-                    if(cowCount == 1)
-                        curPath = basePath + ".vmdk";
-                    else
-                        curPath = $"{basePath}-{cowCount:D2}.vmdk";
-
-                    if(!File.Exists(curPath))
-                        break;
-
-                    IFilter extentFilter = new FiltersList().GetFilter(curPath);
-                    Stream  extentStream = extentFilter.GetDataForkStream();
-
-                    if(stream.Length > Marshal.SizeOf<CowHeader>())
-                    {
-                        extentStream.Seek(0, SeekOrigin.Begin);
-                        byte[] vmCHdrB = new byte[Marshal.SizeOf<CowHeader>()];
-                        extentStream.Read(vmCHdrB, 0, Marshal.SizeOf<CowHeader>());
-                        CowHeader extHdrCow = Marshal.ByteArrayToStructureLittleEndian<CowHeader>(vmCHdrB);
-
-                        if(extHdrCow.magic != VMWARE_COW_MAGIC)
-                            break;
-
-                        var newExtent = new Extent
-                        {
-                            Access   = "RW",
-                            Filter   = extentFilter,
-                            Filename = extentFilter.Filename,
-                            Offset   = 0,
-                            Sectors  = extHdrCow.sectors,
-                            Type     = "SPARSE"
-                        };
-
-                        AaruConsole.DebugWriteLine("VMware plugin", "{0} {1} {2} \"{3}\" {4}", newExtent.Access,
-                                                   newExtent.Sectors, newExtent.Type, newExtent.Filename,
-                                                   newExtent.Offset);
-
-                        _extents.Add(currentSector, newExtent);
-                        currentSector += newExtent.Sectors;
-                    }
-                    else
-                        break;
-
-                    cowCount++;
-                }
-
-                _imageType = VM_TYPE_SPLIT_SPARSE;
-            }
-            else
-            {
-                ddfStream.Seek(0, SeekOrigin.Begin);
-
-                var regexVersion   = new Regex(REGEX_VERSION);
-                var regexCid       = new Regex(REGEX_CID);
-                var regexParentCid = new Regex(REGEX_CID_PARENT);
-                var regexType      = new Regex(REGEX_TYPE);
-                var regexExtent    = new Regex(REGEX_EXTENT);
-                var regexParent    = new Regex(PARENT_REGEX);
-                var regexCylinders = new Regex(REGEX_DDB_CYLINDERS);
-                var regexHeads     = new Regex(REGEX_DDB_HEADS);
-                var regexSectors   = new Regex(REGEX_DDB_SECTORS);
-
-                var ddfStreamRdr = new StreamReader(ddfStream);
-
-                while(ddfStreamRdr.Peek() >= 0)
-                {
-                    string line = ddfStreamRdr.ReadLine();
-
-                    Match matchVersion   = regexVersion.Match(line);
-                    Match matchCid       = regexCid.Match(line);
-                    Match matchParentCid = regexParentCid.Match(line);
-                    Match matchType      = regexType.Match(line);
-                    Match matchExtent    = regexExtent.Match(line);
-                    Match matchParent    = regexParent.Match(line);
-                    Match matchCylinders = regexCylinders.Match(line);
-                    Match matchHeads     = regexHeads.Match(line);
-                    Match matchSectors   = regexSectors.Match(line);
-
-                    if(matchVersion.Success)
-                    {
-                        uint.TryParse(matchVersion.Groups["version"].Value, out _version);
-                        AaruConsole.DebugWriteLine("VMware plugin", "version = {0}", _version);
-                    }
-                    else if(matchCid.Success)
-                    {
-                        _cid = Convert.ToUInt32(matchCid.Groups["cid"].Value, 16);
-                        AaruConsole.DebugWriteLine("VMware plugin", "cid = {0:x8}", _cid);
-                    }
-                    else if(matchParentCid.Success)
-                    {
-                        _parentCid = Convert.ToUInt32(matchParentCid.Groups["cid"].Value, 16);
-                        AaruConsole.DebugWriteLine("VMware plugin", "parentCID = {0:x8}", _parentCid);
-                    }
-                    else if(matchType.Success)
-                    {
-                        _imageType = matchType.Groups["type"].Value;
-                        AaruConsole.DebugWriteLine("VMware plugin", "createType = \"{0}\"", _imageType);
-                    }
-                    else if(matchExtent.Success)
-                    {
-                        var newExtent = new Extent
-                        {
-                            Access = matchExtent.Groups["access"].Value
-                        };
-
-                        if(!embedded)
-                            newExtent.Filter =
-                                new FiltersList().GetFilter(Path.Combine(Path.GetDirectoryName(imageFilter.BasePath),
-                                                                         matchExtent.Groups["filename"].Value));
-                        else
-                            newExtent.Filter = imageFilter;
-
-                        uint.TryParse(matchExtent.Groups["offset"].Value, out newExtent.Offset);
-                        uint.TryParse(matchExtent.Groups["sectors"].Value, out newExtent.Sectors);
-                        newExtent.Type = matchExtent.Groups["type"].Value;
-
-                        AaruConsole.DebugWriteLine("VMware plugin", "{0} {1} {2} \"{3}\" {4}", newExtent.Access,
-                                                   newExtent.Sectors, newExtent.Type, newExtent.Filename,
-                                                   newExtent.Offset);
-
-                        _extents.Add(currentSector, newExtent);
-                        currentSector += newExtent.Sectors;
-                    }
-                    else if(matchParent.Success)
-                    {
-                        _parentName = matchParent.Groups["filename"].Value;
-                        AaruConsole.DebugWriteLine("VMware plugin", "parentFileNameHint = \"{0}\"", _parentName);
-                        _hasParent = true;
-                    }
-                    else if(matchCylinders.Success)
-                    {
-                        uint.TryParse(matchCylinders.Groups["cylinders"].Value, out _imageInfo.Cylinders);
-                        matchedCyls = true;
-                    }
-                    else if(matchHeads.Success)
-                    {
-                        uint.TryParse(matchHeads.Groups["heads"].Value, out _imageInfo.Heads);
-                        matchedHds = true;
-                    }
-                    else if(matchSectors.Success)
-                    {
-                        uint.TryParse(matchSectors.Groups["sectors"].Value, out _imageInfo.SectorsPerTrack);
-                        matchedSpt = true;
-                    }
-                }
-            }
-
-            if(_extents.Count == 0)
-            {
-                AaruConsole.ErrorWriteLine("Did not find any extent");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            switch(_imageType)
-            {
-                case VM_TYPE_MONO_SPARSE:  //"monolithicSparse";
-                case VM_TYPE_MONO_FLAT:    //"monolithicFlat";
-                case VM_TYPE_SPLIT_SPARSE: //"twoGbMaxExtentSparse";
-                case VM_TYPE_SPLIT_FLAT:   //"twoGbMaxExtentFlat";
-                case VMFS_TYPE_FLAT:       //"vmfsPreallocated";
-                case VMFS_TYPE_ZERO:       //"vmfsEagerZeroedThick";
-                case VMFS_TYPE_THIN:       //"vmfsThin";
-                case VMFS_TYPE_SPARSE:     //"vmfsSparse";
-                case VMFS_TYPE:            //"vmfs";
-                case VM_TYPE_STREAM:       //"streamOptimized";
-                    break;
-                case VM_TYPE_FULL_DEVICE: //"fullDevice";
-                case VM_TYPE_PART_DEVICE: //"partitionedDevice";
-                case VMFS_TYPE_RDM:       //"vmfsRDM";
-                case VMFS_TYPE_RDM_OLD:   //"vmfsRawDeviceMap";
-                case VMFS_TYPE_RDMP:      //"vmfsRDMP";
-                case VMFS_TYPE_RDMP_OLD:  //"vmfsPassthroughRawDeviceMap";
-                case VMFS_TYPE_RAW:       //"vmfsRaw";
-                    AaruConsole.
-                        ErrorWriteLine("Raw device image files are not supported, try accessing the device directly.");
-
-                    return ErrorNumber.NotSupported;
-                default:
-                    AaruConsole.ErrorWriteLine($"Dunno how to handle \"{_imageType}\" extents.");
-
-                    return ErrorNumber.InvalidArgument;
-            }
-
-            bool oneNoFlat = cowD;
-
-            foreach(Extent extent in _extents.Values)
-            {
-                if(extent.Filter == null)
-                {
-                    AaruConsole.ErrorWriteLine($"Extent file {extent.Filename} not found.");
-
-                    return ErrorNumber.NoSuchFile;
-                }
-
-                if(extent.Access == "NOACCESS")
-                {
-                    AaruConsole.ErrorWriteLine("Cannot access NOACCESS extents ;).");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                if(extent.Type == "FLAT" ||
-                   extent.Type == "ZERO" ||
-                   extent.Type == "VMFS" ||
-                   cowD)
-                    continue;
-
-                Stream extentStream = extent.Filter.GetDataForkStream();
-                extentStream.Seek(0, SeekOrigin.Begin);
-
-                if(extentStream.Length < SECTOR_SIZE)
-                {
-                    AaruConsole.ErrorWriteLine($"Extent {extent.Filename} is too small.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                byte[] extentHdrB = new byte[Marshal.SizeOf<ExtentHeader>()];
-                extentStream.Read(extentHdrB, 0, Marshal.SizeOf<ExtentHeader>());
-                ExtentHeader extentHdr = Marshal.ByteArrayToStructureLittleEndian<ExtentHeader>(extentHdrB);
-
-                if(extentHdr.magic != VMWARE_EXTENT_MAGIC)
-                {
-                    AaruConsole.ErrorWriteLine($"{extent.Filter} is not an VMware extent.");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                if(extentHdr.capacity < extent.Sectors)
-                {
-                    AaruConsole.
-                        ErrorWriteLine($"Extent contains incorrect number of sectors, {extentHdr.capacity}. {extent.Sectors} were expected");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                // TODO: Support compressed extents
-                if(extentHdr.compression != COMPRESSION_NONE)
-                {
-                    AaruConsole.ErrorWriteLine("Compressed extents are not yet supported.");
-
-                    return ErrorNumber.NotImplemented;
-                }
-
-                if(!vmEHdrSet)
-                {
-                    _vmEHdr   = extentHdr;
-                    _gdFilter = extent.Filter;
-                    vmEHdrSet = true;
-                }
-
-                oneNoFlat = true;
-            }
-
-            if(oneNoFlat  &&
-               !vmEHdrSet &&
-               !cowD)
-            {
-                AaruConsole.
-                    ErrorWriteLine("There are sparse extents but there is no header to find the grain tables, cannot proceed.");
-
-                return ErrorNumber.InvalidArgument;
-            }
-
-            _imageInfo.Sectors = currentSector;
-
-            uint grains    = 0;
-            uint gdEntries = 0;
-            long gdOffset  = 0;
-            uint gtEsPerGt = 0;
-
-            if(oneNoFlat && !cowD)
-            {
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.magic = 0x{0:X8}", _vmEHdr.magic);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.version = {0}", _vmEHdr.version);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.flags = 0x{0:X8}", _vmEHdr.flags);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.capacity = {0}", _vmEHdr.capacity);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.grainSize = {0}", _vmEHdr.grainSize);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.descriptorOffset = {0}", _vmEHdr.descriptorOffset);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.descriptorSize = {0}", _vmEHdr.descriptorSize);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.GTEsPerGT = {0}", _vmEHdr.GTEsPerGT);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.rgdOffset = {0}", _vmEHdr.rgdOffset);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.gdOffset = {0}", _vmEHdr.gdOffset);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.overhead = {0}", _vmEHdr.overhead);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.uncleanShutdown = {0}", _vmEHdr.uncleanShutdown);
-
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.singleEndLineChar = 0x{0:X2}",
-                                           _vmEHdr.singleEndLineChar);
-
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.nonEndLineChar = 0x{0:X2}", _vmEHdr.nonEndLineChar);
-
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.doubleEndLineChar1 = 0x{0:X2}",
-                                           _vmEHdr.doubleEndLineChar1);
-
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.doubleEndLineChar2 = 0x{0:X2}",
-                                           _vmEHdr.doubleEndLineChar2);
-
-                AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.compression = 0x{0:X4}", _vmEHdr.compression);
-
-                _grainSize = _vmEHdr.grainSize;
-                grains     = (uint)(_imageInfo.Sectors / _vmEHdr.grainSize) + 1;
-                gdEntries  = grains / _vmEHdr.GTEsPerGT;
-                gtEsPerGt  = _vmEHdr.GTEsPerGT;
-
-                if((_vmEHdr.flags & FLAGS_USE_REDUNDANT_TABLE) == FLAGS_USE_REDUNDANT_TABLE)
-                    gdOffset = (long)_vmEHdr.rgdOffset;
-                else
-                    gdOffset = (long)_vmEHdr.gdOffset;
-            }
-            else if(oneNoFlat && cowD)
-            {
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.magic = 0x{0:X8}", _vmCHdr.magic);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.version = {0}", _vmCHdr.version);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.flags = 0x{0:X8}", _vmCHdr.flags);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.sectors = {0}", _vmCHdr.sectors);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.grainSize = {0}", _vmCHdr.grainSize);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.gdOffset = {0}", _vmCHdr.gdOffset);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.numGDEntries = {0}", _vmCHdr.numGDEntries);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.freeSector = {0}", _vmCHdr.freeSector);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.cylinders = {0}", _vmCHdr.cylinders);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.heads = {0}", _vmCHdr.heads);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.spt = {0}", _vmCHdr.spt);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.generation = {0}", _vmCHdr.generation);
-
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.name = {0}",
-                                           StringHandlers.CToString(_vmCHdr.name));
-
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.description = {0}",
-                                           StringHandlers.CToString(_vmCHdr.description));
-
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.savedGeneration = {0}", _vmCHdr.savedGeneration);
-                AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.uncleanShutdown = {0}", _vmCHdr.uncleanShutdown);
-
-                _grainSize            = _vmCHdr.grainSize;
-                grains                = (uint)(_imageInfo.Sectors / _vmCHdr.grainSize) + 1;
-                gdEntries             = _vmCHdr.numGDEntries;
-                gdOffset              = _vmCHdr.gdOffset;
-                gtEsPerGt             = grains / gdEntries;
-                _imageInfo.MediaTitle = StringHandlers.CToString(_vmCHdr.name);
-                _imageInfo.Comments   = StringHandlers.CToString(_vmCHdr.description);
-                _version              = _vmCHdr.version;
-            }
-
-            if(oneNoFlat)
-            {
-                if(grains    == 0 ||
-                   gdEntries == 0)
-                {
-                    AaruConsole.ErrorWriteLine("Some error occurred setting GD sizes");
-
-                    return ErrorNumber.InOutError;
-                }
-
-                AaruConsole.DebugWriteLine("VMware plugin", "{0} sectors in {1} grains in {2} tables",
-                                           _imageInfo.Sectors, grains, gdEntries);
-
-                Stream gdStream = _gdFilter.GetDataForkStream();
-
-                gdStream.Seek(gdOffset * SECTOR_SIZE, SeekOrigin.Begin);
-
-                AaruConsole.DebugWriteLine("VMware plugin", "Reading grain directory");
-                byte[] gdBytes = new byte[gdEntries * 4];
-                gdStream.Read(gdBytes, 0, gdBytes.Length);
-                Span<uint> gd = MemoryMarshal.Cast<byte, uint>(gdBytes);
-
-                AaruConsole.DebugWriteLine("VMware plugin", "Reading grain tables");
-                uint currentGrain = 0;
-                _gTable = new uint[grains];
-
-                foreach(uint gtOff in gd)
-                {
-                    byte[] gtBytes = new byte[gtEsPerGt * 4];
-                    gdStream.Seek(gtOff * SECTOR_SIZE, SeekOrigin.Begin);
-                    gdStream.Read(gtBytes, 0, gtBytes.Length);
-
-                    uint[] currentGt = MemoryMarshal.Cast<byte, uint>(gtBytes).ToArray();
-                    Array.Copy(currentGt, 0, _gTable, currentGrain, gtEsPerGt);
-                    currentGrain += gtEsPerGt;
-
-                    // TODO: Check speed here
-                    /*
-                    for(int i = 0; i < gtEsPerGt; i++)
-                    {
-                        gTable[currentGrain] = BitConverter.ToUInt32(gtBytes, i * 4);
-                        currentGrain++;
-                    }
-                */
-                }
-
-                _maxCachedGrains = (uint)(MAX_CACHE_SIZE / (_grainSize * SECTOR_SIZE));
-
-                _grainCache = new Dictionary<ulong, byte[]>();
-            }
-
-            if(_hasParent)
-            {
-                IFilter parentFilter = new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, _parentName));
-
-                if(parentFilter == null)
-                {
-                    AaruConsole.ErrorWriteLine($"Cannot find parent \"{_parentName}\".");
-
-                    return ErrorNumber.NoSuchFile;
-                }
-
-                _parentImage = new VMware();
-                ErrorNumber parentError = _parentImage.Open(parentFilter);
-
-                if(parentError != ErrorNumber.NoError)
-                {
-                    AaruConsole.ErrorWriteLine($"Error {parentError} opening parent \"{_parentName}\".");
-
-                    return parentError;
-                }
-            }
-
-            _sectorCache = new Dictionary<ulong, byte[]>();
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.SectorSize           = SECTOR_SIZE;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.MediaType            = MediaType.GENERIC_HDD;
-            _imageInfo.ImageSize            = _imageInfo.Sectors * SECTOR_SIZE;
-
-            // VMDK version 1 started on VMware 4, so there is a previous version, "COWD"
-            _imageInfo.Version = cowD ? $"{_version}" : $"{_version + 3}";
-
-            if(cowD)
-            {
-                _imageInfo.Cylinders       = _vmCHdr.cylinders;
-                _imageInfo.Heads           = _vmCHdr.heads;
-                _imageInfo.SectorsPerTrack = _vmCHdr.spt;
-            }
-            else if(!matchedCyls ||
-                    !matchedHds  ||
-                    !matchedSpt)
-            {
-                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-                _imageInfo.Heads           = 16;
-                _imageInfo.SectorsPerTrack = 63;
-            }
-
-            return ErrorNumber.NoError;
+            stream.Seek(0, SeekOrigin.Begin);
+            byte[] vmEHdrB = new byte[Marshal.SizeOf<ExtentHeader>()];
+            stream.Read(vmEHdrB, 0, Marshal.SizeOf<ExtentHeader>());
+            _vmEHdr = Marshal.ByteArrayToStructureLittleEndian<ExtentHeader>(vmEHdrB);
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        if(stream.Length > Marshal.SizeOf<CowHeader>())
         {
-            buffer = null;
+            stream.Seek(0, SeekOrigin.Begin);
+            byte[] vmCHdrB = new byte[Marshal.SizeOf<CowHeader>()];
+            stream.Read(vmCHdrB, 0, Marshal.SizeOf<CowHeader>());
+            _vmCHdr = Marshal.ByteArrayToStructureLittleEndian<CowHeader>(vmCHdrB);
+        }
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+        var  ddfStream = new MemoryStream();
+        bool vmEHdrSet = false;
+        bool cowD      = false;
 
-            if(_sectorCache.TryGetValue(sectorAddress, out buffer))
-                return ErrorNumber.NoError;
+        if(_vmEHdr.magic == VMWARE_EXTENT_MAGIC)
+        {
+            vmEHdrSet = true;
+            _gdFilter = imageFilter;
 
-            var   currentExtent     = new Extent();
-            bool  extentFound       = false;
-            ulong extentStartSector = 0;
-
-            foreach(KeyValuePair<ulong, Extent> kvp in _extents.Where(kvp => sectorAddress >= kvp.Key))
+            if(_vmEHdr.descriptorOffset == 0 ||
+               _vmEHdr.descriptorSize   == 0)
             {
-                currentExtent     = kvp.Value;
-                extentFound       = true;
-                extentStartSector = kvp.Key;
+                AaruConsole.ErrorWriteLine("Please open VMDK descriptor.");
+
+                return ErrorNumber.InvalidArgument;
             }
 
-            if(!extentFound)
-                return ErrorNumber.SectorNotFound;
+            byte[] ddfEmbed = new byte[_vmEHdr.descriptorSize * SECTOR_SIZE];
 
-            Stream dataStream;
+            stream.Seek((long)(_vmEHdr.descriptorOffset * SECTOR_SIZE), SeekOrigin.Begin);
+            stream.Read(ddfEmbed, 0, ddfEmbed.Length);
+            ddfStream.Write(ddfEmbed, 0, ddfEmbed.Length);
 
-            switch(currentExtent.Type)
+            embedded = true;
+        }
+        else if(_vmCHdr.magic == VMWARE_COW_MAGIC)
+        {
+            _gdFilter = imageFilter;
+            cowD      = true;
+        }
+        else
+        {
+            byte[] ddfMagic = new byte[0x15];
+            stream.Seek(0, SeekOrigin.Begin);
+            stream.Read(ddfMagic, 0, 0x15);
+
+            if(!_ddfMagicBytes.SequenceEqual(ddfMagic))
             {
-                case "ZERO":
-                    buffer = new byte[SECTOR_SIZE];
+                AaruConsole.ErrorWriteLine("Not a descriptor.");
 
-                    if(_sectorCache.Count >= MAX_CACHED_SECTORS)
-                        _sectorCache.Clear();
-
-                    _sectorCache.Add(sectorAddress, buffer);
-
-                    return ErrorNumber.NoError;
-                case "FLAT":
-                case "VMFS":
-                    dataStream = currentExtent.Filter.GetDataForkStream();
-
-                    dataStream.Seek((long)((currentExtent.Offset + (sectorAddress - extentStartSector)) * SECTOR_SIZE),
-                                    SeekOrigin.Begin);
-
-                    buffer = new byte[SECTOR_SIZE];
-                    dataStream.Read(buffer, 0, buffer.Length);
-
-                    if(_sectorCache.Count >= MAX_CACHED_SECTORS)
-                        _sectorCache.Clear();
-
-                    _sectorCache.Add(sectorAddress, buffer);
-
-                    return ErrorNumber.NoError;
+                return ErrorNumber.InvalidArgument;
             }
 
-            ulong index  = sectorAddress              / _grainSize;
-            ulong secOff = sectorAddress % _grainSize * SECTOR_SIZE;
+            stream.Seek(0, SeekOrigin.Begin);
+            byte[] ddfExternal = new byte[imageFilter.DataForkLength];
+            stream.Read(ddfExternal, 0, ddfExternal.Length);
+            ddfStream.Write(ddfExternal, 0, ddfExternal.Length);
+        }
 
-            uint grainOff = _gTable[index];
+        _extents = new Dictionary<ulong, Extent>();
+        ulong currentSector = 0;
 
-            if(grainOff == 0 && _hasParent)
-                return _parentImage.ReadSector(sectorAddress, out buffer);
+        bool matchedCyls = false, matchedHds = false, matchedSpt = false;
 
-            if(grainOff == 0 ||
-               grainOff == 1)
+        if(cowD)
+        {
+            int    cowCount = 1;
+            string basePath = Path.GetFileNameWithoutExtension(imageFilter.BasePath);
+
+            while(true)
             {
+                string curPath;
+
+                if(cowCount == 1)
+                    curPath = basePath + ".vmdk";
+                else
+                    curPath = $"{basePath}-{cowCount:D2}.vmdk";
+
+                if(!File.Exists(curPath))
+                    break;
+
+                IFilter extentFilter = new FiltersList().GetFilter(curPath);
+                Stream  extentStream = extentFilter.GetDataForkStream();
+
+                if(stream.Length > Marshal.SizeOf<CowHeader>())
+                {
+                    extentStream.Seek(0, SeekOrigin.Begin);
+                    byte[] vmCHdrB = new byte[Marshal.SizeOf<CowHeader>()];
+                    extentStream.Read(vmCHdrB, 0, Marshal.SizeOf<CowHeader>());
+                    CowHeader extHdrCow = Marshal.ByteArrayToStructureLittleEndian<CowHeader>(vmCHdrB);
+
+                    if(extHdrCow.magic != VMWARE_COW_MAGIC)
+                        break;
+
+                    var newExtent = new Extent
+                    {
+                        Access   = "RW",
+                        Filter   = extentFilter,
+                        Filename = extentFilter.Filename,
+                        Offset   = 0,
+                        Sectors  = extHdrCow.sectors,
+                        Type     = "SPARSE"
+                    };
+
+                    AaruConsole.DebugWriteLine("VMware plugin", "{0} {1} {2} \"{3}\" {4}", newExtent.Access,
+                                               newExtent.Sectors, newExtent.Type, newExtent.Filename,
+                                               newExtent.Offset);
+
+                    _extents.Add(currentSector, newExtent);
+                    currentSector += newExtent.Sectors;
+                }
+                else
+                    break;
+
+                cowCount++;
+            }
+
+            _imageType = VM_TYPE_SPLIT_SPARSE;
+        }
+        else
+        {
+            ddfStream.Seek(0, SeekOrigin.Begin);
+
+            var regexVersion   = new Regex(REGEX_VERSION);
+            var regexCid       = new Regex(REGEX_CID);
+            var regexParentCid = new Regex(REGEX_CID_PARENT);
+            var regexType      = new Regex(REGEX_TYPE);
+            var regexExtent    = new Regex(REGEX_EXTENT);
+            var regexParent    = new Regex(PARENT_REGEX);
+            var regexCylinders = new Regex(REGEX_DDB_CYLINDERS);
+            var regexHeads     = new Regex(REGEX_DDB_HEADS);
+            var regexSectors   = new Regex(REGEX_DDB_SECTORS);
+
+            var ddfStreamRdr = new StreamReader(ddfStream);
+
+            while(ddfStreamRdr.Peek() >= 0)
+            {
+                string line = ddfStreamRdr.ReadLine();
+
+                Match matchVersion   = regexVersion.Match(line);
+                Match matchCid       = regexCid.Match(line);
+                Match matchParentCid = regexParentCid.Match(line);
+                Match matchType      = regexType.Match(line);
+                Match matchExtent    = regexExtent.Match(line);
+                Match matchParent    = regexParent.Match(line);
+                Match matchCylinders = regexCylinders.Match(line);
+                Match matchHeads     = regexHeads.Match(line);
+                Match matchSectors   = regexSectors.Match(line);
+
+                if(matchVersion.Success)
+                {
+                    uint.TryParse(matchVersion.Groups["version"].Value, out _version);
+                    AaruConsole.DebugWriteLine("VMware plugin", "version = {0}", _version);
+                }
+                else if(matchCid.Success)
+                {
+                    _cid = Convert.ToUInt32(matchCid.Groups["cid"].Value, 16);
+                    AaruConsole.DebugWriteLine("VMware plugin", "cid = {0:x8}", _cid);
+                }
+                else if(matchParentCid.Success)
+                {
+                    _parentCid = Convert.ToUInt32(matchParentCid.Groups["cid"].Value, 16);
+                    AaruConsole.DebugWriteLine("VMware plugin", "parentCID = {0:x8}", _parentCid);
+                }
+                else if(matchType.Success)
+                {
+                    _imageType = matchType.Groups["type"].Value;
+                    AaruConsole.DebugWriteLine("VMware plugin", "createType = \"{0}\"", _imageType);
+                }
+                else if(matchExtent.Success)
+                {
+                    var newExtent = new Extent
+                    {
+                        Access = matchExtent.Groups["access"].Value
+                    };
+
+                    if(!embedded)
+                        newExtent.Filter =
+                            new FiltersList().GetFilter(Path.Combine(Path.GetDirectoryName(imageFilter.BasePath),
+                                                                     matchExtent.Groups["filename"].Value));
+                    else
+                        newExtent.Filter = imageFilter;
+
+                    uint.TryParse(matchExtent.Groups["offset"].Value, out newExtent.Offset);
+                    uint.TryParse(matchExtent.Groups["sectors"].Value, out newExtent.Sectors);
+                    newExtent.Type = matchExtent.Groups["type"].Value;
+
+                    AaruConsole.DebugWriteLine("VMware plugin", "{0} {1} {2} \"{3}\" {4}", newExtent.Access,
+                                               newExtent.Sectors, newExtent.Type, newExtent.Filename,
+                                               newExtent.Offset);
+
+                    _extents.Add(currentSector, newExtent);
+                    currentSector += newExtent.Sectors;
+                }
+                else if(matchParent.Success)
+                {
+                    _parentName = matchParent.Groups["filename"].Value;
+                    AaruConsole.DebugWriteLine("VMware plugin", "parentFileNameHint = \"{0}\"", _parentName);
+                    _hasParent = true;
+                }
+                else if(matchCylinders.Success)
+                {
+                    uint.TryParse(matchCylinders.Groups["cylinders"].Value, out _imageInfo.Cylinders);
+                    matchedCyls = true;
+                }
+                else if(matchHeads.Success)
+                {
+                    uint.TryParse(matchHeads.Groups["heads"].Value, out _imageInfo.Heads);
+                    matchedHds = true;
+                }
+                else if(matchSectors.Success)
+                {
+                    uint.TryParse(matchSectors.Groups["sectors"].Value, out _imageInfo.SectorsPerTrack);
+                    matchedSpt = true;
+                }
+            }
+        }
+
+        if(_extents.Count == 0)
+        {
+            AaruConsole.ErrorWriteLine("Did not find any extent");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        switch(_imageType)
+        {
+            case VM_TYPE_MONO_SPARSE:  //"monolithicSparse";
+            case VM_TYPE_MONO_FLAT:    //"monolithicFlat";
+            case VM_TYPE_SPLIT_SPARSE: //"twoGbMaxExtentSparse";
+            case VM_TYPE_SPLIT_FLAT:   //"twoGbMaxExtentFlat";
+            case VMFS_TYPE_FLAT:       //"vmfsPreallocated";
+            case VMFS_TYPE_ZERO:       //"vmfsEagerZeroedThick";
+            case VMFS_TYPE_THIN:       //"vmfsThin";
+            case VMFS_TYPE_SPARSE:     //"vmfsSparse";
+            case VMFS_TYPE:            //"vmfs";
+            case VM_TYPE_STREAM:       //"streamOptimized";
+                break;
+            case VM_TYPE_FULL_DEVICE: //"fullDevice";
+            case VM_TYPE_PART_DEVICE: //"partitionedDevice";
+            case VMFS_TYPE_RDM:       //"vmfsRDM";
+            case VMFS_TYPE_RDM_OLD:   //"vmfsRawDeviceMap";
+            case VMFS_TYPE_RDMP:      //"vmfsRDMP";
+            case VMFS_TYPE_RDMP_OLD:  //"vmfsPassthroughRawDeviceMap";
+            case VMFS_TYPE_RAW:       //"vmfsRaw";
+                AaruConsole.
+                    ErrorWriteLine("Raw device image files are not supported, try accessing the device directly.");
+
+                return ErrorNumber.NotSupported;
+            default:
+                AaruConsole.ErrorWriteLine($"Dunno how to handle \"{_imageType}\" extents.");
+
+                return ErrorNumber.InvalidArgument;
+        }
+
+        bool oneNoFlat = cowD;
+
+        foreach(Extent extent in _extents.Values)
+        {
+            if(extent.Filter == null)
+            {
+                AaruConsole.ErrorWriteLine($"Extent file {extent.Filename} not found.");
+
+                return ErrorNumber.NoSuchFile;
+            }
+
+            if(extent.Access == "NOACCESS")
+            {
+                AaruConsole.ErrorWriteLine("Cannot access NOACCESS extents ;).");
+
+                return ErrorNumber.InvalidArgument;
+            }
+
+            if(extent.Type == "FLAT" ||
+               extent.Type == "ZERO" ||
+               extent.Type == "VMFS" ||
+               cowD)
+                continue;
+
+            Stream extentStream = extent.Filter.GetDataForkStream();
+            extentStream.Seek(0, SeekOrigin.Begin);
+
+            if(extentStream.Length < SECTOR_SIZE)
+            {
+                AaruConsole.ErrorWriteLine($"Extent {extent.Filename} is too small.");
+
+                return ErrorNumber.InvalidArgument;
+            }
+
+            byte[] extentHdrB = new byte[Marshal.SizeOf<ExtentHeader>()];
+            extentStream.Read(extentHdrB, 0, Marshal.SizeOf<ExtentHeader>());
+            ExtentHeader extentHdr = Marshal.ByteArrayToStructureLittleEndian<ExtentHeader>(extentHdrB);
+
+            if(extentHdr.magic != VMWARE_EXTENT_MAGIC)
+            {
+                AaruConsole.ErrorWriteLine($"{extent.Filter} is not an VMware extent.");
+
+                return ErrorNumber.InvalidArgument;
+            }
+
+            if(extentHdr.capacity < extent.Sectors)
+            {
+                AaruConsole.
+                    ErrorWriteLine($"Extent contains incorrect number of sectors, {extentHdr.capacity}. {extent.Sectors} were expected");
+
+                return ErrorNumber.InvalidArgument;
+            }
+
+            // TODO: Support compressed extents
+            if(extentHdr.compression != COMPRESSION_NONE)
+            {
+                AaruConsole.ErrorWriteLine("Compressed extents are not yet supported.");
+
+                return ErrorNumber.NotImplemented;
+            }
+
+            if(!vmEHdrSet)
+            {
+                _vmEHdr   = extentHdr;
+                _gdFilter = extent.Filter;
+                vmEHdrSet = true;
+            }
+
+            oneNoFlat = true;
+        }
+
+        if(oneNoFlat  &&
+           !vmEHdrSet &&
+           !cowD)
+        {
+            AaruConsole.
+                ErrorWriteLine("There are sparse extents but there is no header to find the grain tables, cannot proceed.");
+
+            return ErrorNumber.InvalidArgument;
+        }
+
+        _imageInfo.Sectors = currentSector;
+
+        uint grains    = 0;
+        uint gdEntries = 0;
+        long gdOffset  = 0;
+        uint gtEsPerGt = 0;
+
+        if(oneNoFlat && !cowD)
+        {
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.magic = 0x{0:X8}", _vmEHdr.magic);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.version = {0}", _vmEHdr.version);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.flags = 0x{0:X8}", _vmEHdr.flags);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.capacity = {0}", _vmEHdr.capacity);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.grainSize = {0}", _vmEHdr.grainSize);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.descriptorOffset = {0}", _vmEHdr.descriptorOffset);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.descriptorSize = {0}", _vmEHdr.descriptorSize);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.GTEsPerGT = {0}", _vmEHdr.GTEsPerGT);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.rgdOffset = {0}", _vmEHdr.rgdOffset);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.gdOffset = {0}", _vmEHdr.gdOffset);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.overhead = {0}", _vmEHdr.overhead);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.uncleanShutdown = {0}", _vmEHdr.uncleanShutdown);
+
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.singleEndLineChar = 0x{0:X2}",
+                                       _vmEHdr.singleEndLineChar);
+
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.nonEndLineChar = 0x{0:X2}", _vmEHdr.nonEndLineChar);
+
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.doubleEndLineChar1 = 0x{0:X2}",
+                                       _vmEHdr.doubleEndLineChar1);
+
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.doubleEndLineChar2 = 0x{0:X2}",
+                                       _vmEHdr.doubleEndLineChar2);
+
+            AaruConsole.DebugWriteLine("VMware plugin", "vmEHdr.compression = 0x{0:X4}", _vmEHdr.compression);
+
+            _grainSize = _vmEHdr.grainSize;
+            grains     = (uint)(_imageInfo.Sectors / _vmEHdr.grainSize) + 1;
+            gdEntries  = grains / _vmEHdr.GTEsPerGT;
+            gtEsPerGt  = _vmEHdr.GTEsPerGT;
+
+            if((_vmEHdr.flags & FLAGS_USE_REDUNDANT_TABLE) == FLAGS_USE_REDUNDANT_TABLE)
+                gdOffset = (long)_vmEHdr.rgdOffset;
+            else
+                gdOffset = (long)_vmEHdr.gdOffset;
+        }
+        else if(oneNoFlat && cowD)
+        {
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.magic = 0x{0:X8}", _vmCHdr.magic);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.version = {0}", _vmCHdr.version);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.flags = 0x{0:X8}", _vmCHdr.flags);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.sectors = {0}", _vmCHdr.sectors);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.grainSize = {0}", _vmCHdr.grainSize);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.gdOffset = {0}", _vmCHdr.gdOffset);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.numGDEntries = {0}", _vmCHdr.numGDEntries);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.freeSector = {0}", _vmCHdr.freeSector);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.cylinders = {0}", _vmCHdr.cylinders);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.heads = {0}", _vmCHdr.heads);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.spt = {0}", _vmCHdr.spt);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.generation = {0}", _vmCHdr.generation);
+
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.name = {0}",
+                                       StringHandlers.CToString(_vmCHdr.name));
+
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.description = {0}",
+                                       StringHandlers.CToString(_vmCHdr.description));
+
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.savedGeneration = {0}", _vmCHdr.savedGeneration);
+            AaruConsole.DebugWriteLine("VMware plugin", "vmCHdr.uncleanShutdown = {0}", _vmCHdr.uncleanShutdown);
+
+            _grainSize            = _vmCHdr.grainSize;
+            grains                = (uint)(_imageInfo.Sectors / _vmCHdr.grainSize) + 1;
+            gdEntries             = _vmCHdr.numGDEntries;
+            gdOffset              = _vmCHdr.gdOffset;
+            gtEsPerGt             = grains / gdEntries;
+            _imageInfo.MediaTitle = StringHandlers.CToString(_vmCHdr.name);
+            _imageInfo.Comments   = StringHandlers.CToString(_vmCHdr.description);
+            _version              = _vmCHdr.version;
+        }
+
+        if(oneNoFlat)
+        {
+            if(grains    == 0 ||
+               gdEntries == 0)
+            {
+                AaruConsole.ErrorWriteLine("Some error occurred setting GD sizes");
+
+                return ErrorNumber.InOutError;
+            }
+
+            AaruConsole.DebugWriteLine("VMware plugin", "{0} sectors in {1} grains in {2} tables",
+                                       _imageInfo.Sectors, grains, gdEntries);
+
+            Stream gdStream = _gdFilter.GetDataForkStream();
+
+            gdStream.Seek(gdOffset * SECTOR_SIZE, SeekOrigin.Begin);
+
+            AaruConsole.DebugWriteLine("VMware plugin", "Reading grain directory");
+            byte[] gdBytes = new byte[gdEntries * 4];
+            gdStream.Read(gdBytes, 0, gdBytes.Length);
+            Span<uint> gd = MemoryMarshal.Cast<byte, uint>(gdBytes);
+
+            AaruConsole.DebugWriteLine("VMware plugin", "Reading grain tables");
+            uint currentGrain = 0;
+            _gTable = new uint[grains];
+
+            foreach(uint gtOff in gd)
+            {
+                byte[] gtBytes = new byte[gtEsPerGt * 4];
+                gdStream.Seek(gtOff * SECTOR_SIZE, SeekOrigin.Begin);
+                gdStream.Read(gtBytes, 0, gtBytes.Length);
+
+                uint[] currentGt = MemoryMarshal.Cast<byte, uint>(gtBytes).ToArray();
+                Array.Copy(currentGt, 0, _gTable, currentGrain, gtEsPerGt);
+                currentGrain += gtEsPerGt;
+
+                // TODO: Check speed here
+                /*
+                for(int i = 0; i < gtEsPerGt; i++)
+                {
+                    gTable[currentGrain] = BitConverter.ToUInt32(gtBytes, i * 4);
+                    currentGrain++;
+                }
+            */
+            }
+
+            _maxCachedGrains = (uint)(MAX_CACHE_SIZE / (_grainSize * SECTOR_SIZE));
+
+            _grainCache = new Dictionary<ulong, byte[]>();
+        }
+
+        if(_hasParent)
+        {
+            IFilter parentFilter = new FiltersList().GetFilter(Path.Combine(imageFilter.ParentFolder, _parentName));
+
+            if(parentFilter == null)
+            {
+                AaruConsole.ErrorWriteLine($"Cannot find parent \"{_parentName}\".");
+
+                return ErrorNumber.NoSuchFile;
+            }
+
+            _parentImage = new VMware();
+            ErrorNumber parentError = _parentImage.Open(parentFilter);
+
+            if(parentError != ErrorNumber.NoError)
+            {
+                AaruConsole.ErrorWriteLine($"Error {parentError} opening parent \"{_parentName}\".");
+
+                return parentError;
+            }
+        }
+
+        _sectorCache = new Dictionary<ulong, byte[]>();
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.SectorSize           = SECTOR_SIZE;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.MediaType            = MediaType.GENERIC_HDD;
+        _imageInfo.ImageSize            = _imageInfo.Sectors * SECTOR_SIZE;
+
+        // VMDK version 1 started on VMware 4, so there is a previous version, "COWD"
+        _imageInfo.Version = cowD ? $"{_version}" : $"{_version + 3}";
+
+        if(cowD)
+        {
+            _imageInfo.Cylinders       = _vmCHdr.cylinders;
+            _imageInfo.Heads           = _vmCHdr.heads;
+            _imageInfo.SectorsPerTrack = _vmCHdr.spt;
+        }
+        else if(!matchedCyls ||
+                !matchedHds  ||
+                !matchedSpt)
+        {
+            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+            _imageInfo.Heads           = 16;
+            _imageInfo.SectorsPerTrack = 63;
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(_sectorCache.TryGetValue(sectorAddress, out buffer))
+            return ErrorNumber.NoError;
+
+        var   currentExtent     = new Extent();
+        bool  extentFound       = false;
+        ulong extentStartSector = 0;
+
+        foreach(KeyValuePair<ulong, Extent> kvp in _extents.Where(kvp => sectorAddress >= kvp.Key))
+        {
+            currentExtent     = kvp.Value;
+            extentFound       = true;
+            extentStartSector = kvp.Key;
+        }
+
+        if(!extentFound)
+            return ErrorNumber.SectorNotFound;
+
+        Stream dataStream;
+
+        switch(currentExtent.Type)
+        {
+            case "ZERO":
                 buffer = new byte[SECTOR_SIZE];
 
                 if(_sectorCache.Count >= MAX_CACHED_SECTORS)
@@ -656,25 +619,38 @@ namespace Aaru.DiscImages
                 _sectorCache.Add(sectorAddress, buffer);
 
                 return ErrorNumber.NoError;
-            }
-
-            if(!_grainCache.TryGetValue(grainOff, out byte[] grain))
-            {
-                grain      = new byte[SECTOR_SIZE * _grainSize];
+            case "FLAT":
+            case "VMFS":
                 dataStream = currentExtent.Filter.GetDataForkStream();
-                dataStream.Seek((long)((grainOff - extentStartSector) * SECTOR_SIZE), SeekOrigin.Begin);
-                dataStream.Read(grain, 0, grain.Length);
 
-                if(_grainCache.Count >= _maxCachedGrains)
-                    _grainCache.Clear();
+                dataStream.Seek((long)((currentExtent.Offset + (sectorAddress - extentStartSector)) * SECTOR_SIZE),
+                                SeekOrigin.Begin);
 
-                _grainCache.Add(grainOff, grain);
-            }
+                buffer = new byte[SECTOR_SIZE];
+                dataStream.Read(buffer, 0, buffer.Length);
 
+                if(_sectorCache.Count >= MAX_CACHED_SECTORS)
+                    _sectorCache.Clear();
+
+                _sectorCache.Add(sectorAddress, buffer);
+
+                return ErrorNumber.NoError;
+        }
+
+        ulong index  = sectorAddress              / _grainSize;
+        ulong secOff = sectorAddress % _grainSize * SECTOR_SIZE;
+
+        uint grainOff = _gTable[index];
+
+        if(grainOff == 0 && _hasParent)
+            return _parentImage.ReadSector(sectorAddress, out buffer);
+
+        if(grainOff == 0 ||
+           grainOff == 1)
+        {
             buffer = new byte[SECTOR_SIZE];
-            Array.Copy(grain, (int)secOff, buffer, 0, SECTOR_SIZE);
 
-            if(_sectorCache.Count > MAX_CACHED_SECTORS)
+            if(_sectorCache.Count >= MAX_CACHED_SECTORS)
                 _sectorCache.Clear();
 
             _sectorCache.Add(sectorAddress, buffer);
@@ -682,32 +658,55 @@ namespace Aaru.DiscImages
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        if(!_grainCache.TryGetValue(grainOff, out byte[] grain))
         {
-            buffer = null;
+            grain      = new byte[SECTOR_SIZE * _grainSize];
+            dataStream = currentExtent.Filter.GetDataForkStream();
+            dataStream.Seek((long)((grainOff - extentStartSector) * SECTOR_SIZE), SeekOrigin.Begin);
+            dataStream.Read(grain, 0, grain.Length);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(_grainCache.Count >= _maxCachedGrains)
+                _grainCache.Clear();
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            var ms = new MemoryStream();
-
-            for(uint i = 0; i < length; i++)
-            {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
-
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
-            }
-
-            buffer = ms.ToArray();
-
-            return ErrorNumber.NoError;
+            _grainCache.Add(grainOff, grain);
         }
+
+        buffer = new byte[SECTOR_SIZE];
+        Array.Copy(grain, (int)secOff, buffer, 0, SECTOR_SIZE);
+
+        if(_sectorCache.Count > MAX_CACHED_SECTORS)
+            _sectorCache.Clear();
+
+        _sectorCache.Add(sectorAddress, buffer);
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
+        {
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+
+            if(errno != ErrorNumber.NoError)
+                return errno;
+
+            ms.Write(sector, 0, sector.Length);
+        }
+
+        buffer = ms.ToArray();
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Structs.cs b/Aaru.Images/VMware/Structs.cs
index 5e36c7fc5..c43149355 100644
--- a/Aaru.Images/VMware/Structs.cs
+++ b/Aaru.Images/VMware/Structs.cs
@@ -33,76 +33,75 @@
 using System.Runtime.InteropServices;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class VMware
 {
-    public sealed partial class VMware
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ExtentHeader
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct ExtentHeader
-        {
-            public readonly uint  magic;
-            public readonly uint  version;
-            public readonly uint  flags;
-            public readonly ulong capacity;
-            public readonly ulong grainSize;
-            public readonly ulong descriptorOffset;
-            public readonly ulong descriptorSize;
-            public readonly uint  GTEsPerGT;
-            public readonly ulong rgdOffset;
-            public readonly ulong gdOffset;
-            public readonly ulong overhead;
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool uncleanShutdown;
-            public readonly byte   singleEndLineChar;
-            public readonly byte   nonEndLineChar;
-            public readonly byte   doubleEndLineChar1;
-            public readonly byte   doubleEndLineChar2;
-            public readonly ushort compression;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 433)]
-            public readonly byte[] padding;
-        }
+        public readonly uint  magic;
+        public readonly uint  version;
+        public readonly uint  flags;
+        public readonly ulong capacity;
+        public readonly ulong grainSize;
+        public readonly ulong descriptorOffset;
+        public readonly ulong descriptorSize;
+        public readonly uint  GTEsPerGT;
+        public readonly ulong rgdOffset;
+        public readonly ulong gdOffset;
+        public readonly ulong overhead;
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool uncleanShutdown;
+        public readonly byte   singleEndLineChar;
+        public readonly byte   nonEndLineChar;
+        public readonly byte   doubleEndLineChar1;
+        public readonly byte   doubleEndLineChar2;
+        public readonly ushort compression;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 433)]
+        public readonly byte[] padding;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct CowHeader
-        {
-            public readonly uint magic;
-            public readonly uint version;
-            public readonly uint flags;
-            public readonly uint sectors;
-            public readonly uint grainSize;
-            public readonly uint gdOffset;
-            public readonly uint numGDEntries;
-            public readonly uint freeSector;
-            public readonly uint cylinders;
-            public readonly uint heads;
-            public readonly uint spt;
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct CowHeader
+    {
+        public readonly uint magic;
+        public readonly uint version;
+        public readonly uint flags;
+        public readonly uint sectors;
+        public readonly uint grainSize;
+        public readonly uint gdOffset;
+        public readonly uint numGDEntries;
+        public readonly uint freeSector;
+        public readonly uint cylinders;
+        public readonly uint heads;
+        public readonly uint spt;
 
-            // It stats on cylinders, above, but, don't care
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1024 - 12)]
-            public readonly byte[] parentFileName;
-            public readonly uint parentGeneration;
-            public readonly uint generation;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 60)]
-            public readonly byte[] name;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public readonly byte[] description;
-            public readonly uint savedGeneration;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] reserved;
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool uncleanShutdown;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 396)]
-            public readonly byte[] padding;
-        }
+        // It stats on cylinders, above, but, don't care
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1024 - 12)]
+        public readonly byte[] parentFileName;
+        public readonly uint parentGeneration;
+        public readonly uint generation;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 60)]
+        public readonly byte[] name;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
+        public readonly byte[] description;
+        public readonly uint savedGeneration;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] reserved;
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool uncleanShutdown;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 396)]
+        public readonly byte[] padding;
+    }
 
-        struct Extent
-        {
-            public string  Access;
-            public uint    Sectors;
-            public string  Type;
-            public IFilter Filter;
-            public string  Filename;
-            public uint    Offset;
-        }
+    struct Extent
+    {
+        public string  Access;
+        public uint    Sectors;
+        public string  Type;
+        public IFilter Filter;
+        public string  Filename;
+        public uint    Offset;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Unsupported.cs b/Aaru.Images/VMware/Unsupported.cs
index d9dde34a9..88159b0ba 100644
--- a/Aaru.Images/VMware/Unsupported.cs
+++ b/Aaru.Images/VMware/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class VMware
 {
-    public sealed partial class VMware
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/VMware.cs b/Aaru.Images/VMware/VMware.cs
index bea12c49a..571801ab9 100644
--- a/Aaru.Images/VMware/VMware.cs
+++ b/Aaru.Images/VMware/VMware.cs
@@ -36,57 +36,56 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading VMware disk images</summary>
-    public sealed partial class VMware : IWritableImage
-    {
-        string                    _adapterType;
-        uint                      _cid;
-        StreamWriter              _descriptorStream;
-        Dictionary<ulong, Extent> _extents;
-        IFilter                   _gdFilter;
-        Dictionary<ulong, byte[]> _grainCache;
-        ulong                     _grainSize;
-        uint[]                    _gTable;
-        bool                      _hasParent;
-        uint                      _hwversion;
-        ImageInfo                 _imageInfo;
-        string                    _imageType;
-        uint                      _maxCachedGrains;
-        uint                      _parentCid;
-        IMediaImage               _parentImage;
-        string                    _parentName;
-        Dictionary<ulong, byte[]> _sectorCache;
-        uint                      _version;
-        CowHeader                 _vmCHdr;
-        ExtentHeader              _vmEHdr;
-        string                    _writingBaseName;
-        FileStream                _writingStream;
+namespace Aaru.DiscImages;
 
-        public VMware() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = "VMware",
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading VMware disk images</summary>
+public sealed partial class VMware : IWritableImage
+{
+    string                    _adapterType;
+    uint                      _cid;
+    StreamWriter              _descriptorStream;
+    Dictionary<ulong, Extent> _extents;
+    IFilter                   _gdFilter;
+    Dictionary<ulong, byte[]> _grainCache;
+    ulong                     _grainSize;
+    uint[]                    _gTable;
+    bool                      _hasParent;
+    uint                      _hwversion;
+    ImageInfo                 _imageInfo;
+    string                    _imageType;
+    uint                      _maxCachedGrains;
+    uint                      _parentCid;
+    IMediaImage               _parentImage;
+    string                    _parentName;
+    Dictionary<ulong, byte[]> _sectorCache;
+    uint                      _version;
+    CowHeader                 _vmCHdr;
+    ExtentHeader              _vmEHdr;
+    string                    _writingBaseName;
+    FileStream                _writingStream;
+
+    public VMware() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = "VMware",
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/VMware/Write.cs b/Aaru.Images/VMware/Write.cs
index 8e964a173..1aa1de569 100644
--- a/Aaru.Images/VMware/Write.cs
+++ b/Aaru.Images/VMware/Write.cs
@@ -40,343 +40,342 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class VMware
 {
-    public sealed partial class VMware
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(options != null)
         {
-            if(options != null)
+            if(options.TryGetValue("adapter", out _adapterType))
+                switch(_adapterType.ToLowerInvariant())
+                {
+                    case "ide":
+                    case "lsilogic":
+                    case "buslogic":
+                        _adapterType = _adapterType.ToLowerInvariant();
+
+                        break;
+                    case "legacyesx":
+                        _adapterType = "legacyESX";
+
+                        break;
+                    default:
+                        ErrorMessage = $"Invalid adapter type {_adapterType}";
+
+                        return false;
+                }
+            else
+                _adapterType = "ide";
+
+            if(options.TryGetValue("hwversion", out string tmpValue))
             {
-                if(options.TryGetValue("adapter", out _adapterType))
-                    switch(_adapterType.ToLowerInvariant())
-                    {
-                        case "ide":
-                        case "lsilogic":
-                        case "buslogic":
-                            _adapterType = _adapterType.ToLowerInvariant();
-
-                            break;
-                        case "legacyesx":
-                            _adapterType = "legacyESX";
-
-                            break;
-                        default:
-                            ErrorMessage = $"Invalid adapter type {_adapterType}";
-
-                            return false;
-                    }
-                else
-                    _adapterType = "ide";
-
-                if(options.TryGetValue("hwversion", out string tmpValue))
+                if(!uint.TryParse(tmpValue, out _hwversion))
                 {
-                    if(!uint.TryParse(tmpValue, out _hwversion))
-                    {
-                        ErrorMessage = "Invalid value for hwversion option";
+                    ErrorMessage = "Invalid value for hwversion option";
 
-                        return false;
-                    }
-                }
-                else
-                    _hwversion = 4;
-
-                if(options.TryGetValue("split", out tmpValue))
-                {
-                    if(!bool.TryParse(tmpValue, out bool tmpBool))
-                    {
-                        ErrorMessage = "Invalid value for split option";
-
-                        return false;
-                    }
-
-                    if(tmpBool)
-                    {
-                        ErrorMessage = "Splitted images not yet implemented";
-
-                        return false;
-                    }
-                }
-
-                if(options.TryGetValue("sparse", out tmpValue))
-                {
-                    if(!bool.TryParse(tmpValue, out bool tmpBool))
-                    {
-                        ErrorMessage = "Invalid value for sparse option";
-
-                        return false;
-                    }
-
-                    if(tmpBool)
-                    {
-                        ErrorMessage = "Sparse images not yet implemented";
-
-                        return false;
-                    }
+                    return false;
                 }
             }
             else
+                _hwversion = 4;
+
+            if(options.TryGetValue("split", out tmpValue))
             {
-                _adapterType = "ide";
-                _hwversion   = 4;
-            }
-
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingBaseName =
-                    Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path));
-
-                _descriptorStream = new StreamWriter(path, false, Encoding.ASCII);
-
-                // TODO: Support split
-                _writingStream = new FileStream(_writingBaseName + "-flat.vmdk", FileMode.OpenOrCreate,
-                                                FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != 512)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(sectorAddress * 512), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        // TODO: Implement sparse and split
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % 512 != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(sectorAddress * 512), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
-
-            return false;
-        }
-
-        // TODO: Implement sparse and split
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            if(_imageInfo.Cylinders == 0)
-            {
-                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-                _imageInfo.Heads           = 16;
-                _imageInfo.SectorsPerTrack = 63;
-
-                while(_imageInfo.Cylinders == 0)
+                if(!bool.TryParse(tmpValue, out bool tmpBool))
                 {
-                    _imageInfo.Heads--;
+                    ErrorMessage = "Invalid value for split option";
 
-                    if(_imageInfo.Heads == 0)
-                    {
-                        _imageInfo.SectorsPerTrack--;
-                        _imageInfo.Heads = 16;
-                    }
+                    return false;
+                }
 
-                    _imageInfo.Cylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
+                if(tmpBool)
+                {
+                    ErrorMessage = "Splitted images not yet implemented";
 
-                    if(_imageInfo.Cylinders       == 0 &&
-                       _imageInfo.Heads           == 0 &&
-                       _imageInfo.SectorsPerTrack == 0)
-                        break;
+                    return false;
                 }
             }
 
-            _descriptorStream.WriteLine("# Disk DescriptorFile");
-            _descriptorStream.WriteLine("version=1");
-            _descriptorStream.WriteLine($"CID={new Random().Next(int.MinValue, int.MaxValue):x8}");
-            _descriptorStream.WriteLine("parentCID=ffffffff");
-            _descriptorStream.WriteLine("createType=\"monolithicFlat\"");
-            _descriptorStream.WriteLine();
-            _descriptorStream.WriteLine("# Extent description");
-            _descriptorStream.WriteLine($"RW {_imageInfo.Sectors} FLAT \"{_writingBaseName + "-flat.vmdk"}\" 0");
-            _descriptorStream.WriteLine();
-            _descriptorStream.WriteLine("# The Disk Data Base");
-            _descriptorStream.WriteLine("#DDB");
-            _descriptorStream.WriteLine();
-            _descriptorStream.WriteLine($"ddb.virtualHWVersion = \"{_hwversion}\"");
-            _descriptorStream.WriteLine($"ddb.geometry.cylinders = \"{_imageInfo.Cylinders}\"");
-            _descriptorStream.WriteLine($"ddb.geometry.heads = \"{_imageInfo.Heads}\"");
-            _descriptorStream.WriteLine($"ddb.geometry.sectors = \"{_imageInfo.SectorsPerTrack}\"");
-            _descriptorStream.WriteLine($"ddb.adapterType = \"{_adapterType}\"");
+            if(options.TryGetValue("sparse", out tmpValue))
+            {
+                if(!bool.TryParse(tmpValue, out bool tmpBool))
+                {
+                    ErrorMessage = "Invalid value for sparse option";
 
-            _descriptorStream.Flush();
-            _descriptorStream.Close();
+                    return false;
+                }
 
-            IsWriting    = false;
-            ErrorMessage = "";
+                if(tmpBool)
+                {
+                    ErrorMessage = "Sparse images not yet implemented";
 
-            return true;
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            _adapterType = "ide";
+            _hwversion   = 4;
         }
 
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+        if(sectorSize != 512)
         {
-            if(cylinders > ushort.MaxValue)
-            {
-                ErrorMessage = "Too many cylinders.";
-
-                return false;
-            }
-
-            if(heads > byte.MaxValue)
-            {
-                ErrorMessage = "Too many heads.";
-
-                return false;
-            }
-
-            if(sectorsPerTrack > byte.MaxValue)
-            {
-                ErrorMessage = "Too many sectors per track.";
-
-                return false;
-            }
-
-            _imageInfo.SectorsPerTrack = sectorsPerTrack;
-            _imageInfo.Heads           = heads;
-            _imageInfo.Cylinders       = cylinders;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+        _imageInfo = new ImageInfo
+        {
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        try
+        {
+            _writingBaseName =
+                Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path));
+
+            _descriptorStream = new StreamWriter(path, false, Encoding.ASCII);
+
+            // TODO: Support split
+            _writingStream = new FileStream(_writingBaseName + "-flat.vmdk", FileMode.OpenOrCreate,
+                                            FileAccess.ReadWrite, FileShare.None);
+        }
+        catch(IOException e)
+        {
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
+
+            return false;
+        }
+
+        IsWriting    = true;
+        ErrorMessage = null;
+
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != 512)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(sectorAddress * 512), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    // TODO: Implement sparse and split
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % 512 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(sectorAddress * 512), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    // TODO: Implement sparse and split
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        if(_imageInfo.Cylinders == 0)
+        {
+            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+            _imageInfo.Heads           = 16;
+            _imageInfo.SectorsPerTrack = 63;
+
+            while(_imageInfo.Cylinders == 0)
+            {
+                _imageInfo.Heads--;
+
+                if(_imageInfo.Heads == 0)
+                {
+                    _imageInfo.SectorsPerTrack--;
+                    _imageInfo.Heads = 16;
+                }
+
+                _imageInfo.Cylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
+
+                if(_imageInfo.Cylinders       == 0 &&
+                   _imageInfo.Heads           == 0 &&
+                   _imageInfo.SectorsPerTrack == 0)
+                    break;
+            }
+        }
+
+        _descriptorStream.WriteLine("# Disk DescriptorFile");
+        _descriptorStream.WriteLine("version=1");
+        _descriptorStream.WriteLine($"CID={new Random().Next(int.MinValue, int.MaxValue):x8}");
+        _descriptorStream.WriteLine("parentCID=ffffffff");
+        _descriptorStream.WriteLine("createType=\"monolithicFlat\"");
+        _descriptorStream.WriteLine();
+        _descriptorStream.WriteLine("# Extent description");
+        _descriptorStream.WriteLine($"RW {_imageInfo.Sectors} FLAT \"{_writingBaseName + "-flat.vmdk"}\" 0");
+        _descriptorStream.WriteLine();
+        _descriptorStream.WriteLine("# The Disk Data Base");
+        _descriptorStream.WriteLine("#DDB");
+        _descriptorStream.WriteLine();
+        _descriptorStream.WriteLine($"ddb.virtualHWVersion = \"{_hwversion}\"");
+        _descriptorStream.WriteLine($"ddb.geometry.cylinders = \"{_imageInfo.Cylinders}\"");
+        _descriptorStream.WriteLine($"ddb.geometry.heads = \"{_imageInfo.Heads}\"");
+        _descriptorStream.WriteLine($"ddb.geometry.sectors = \"{_imageInfo.SectorsPerTrack}\"");
+        _descriptorStream.WriteLine($"ddb.adapterType = \"{_adapterType}\"");
+
+        _descriptorStream.Flush();
+        _descriptorStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        if(cylinders > ushort.MaxValue)
+        {
+            ErrorMessage = "Too many cylinders.";
+
+            return false;
+        }
+
+        if(heads > byte.MaxValue)
+        {
+            ErrorMessage = "Too many heads.";
+
+            return false;
+        }
+
+        if(sectorsPerTrack > byte.MaxValue)
+        {
+            ErrorMessage = "Too many sectors per track.";
+
+            return false;
+        }
+
+        _imageInfo.SectorsPerTrack = sectorsPerTrack;
+        _imageInfo.Heads           = heads;
+        _imageInfo.Cylinders       = cylinders;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Constants.cs b/Aaru.Images/Virtual98/Constants.cs
index 20b2e3412..f8daaa978 100644
--- a/Aaru.Images/Virtual98/Constants.cs
+++ b/Aaru.Images/Virtual98/Constants.cs
@@ -30,13 +30,12 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Virtual98
 {
-    public sealed partial class Virtual98
+    readonly byte[] _signature =
     {
-        readonly byte[] _signature =
-        {
-            0x56, 0x48, 0x44, 0x31, 0x2E, 0x30, 0x30, 0x00
-        };
-    }
+        0x56, 0x48, 0x44, 0x31, 0x2E, 0x30, 0x30, 0x00
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Identify.cs b/Aaru.Images/Virtual98/Identify.cs
index 54d340c20..692f5ca24 100644
--- a/Aaru.Images/Virtual98/Identify.cs
+++ b/Aaru.Images/Virtual98/Identify.cs
@@ -37,45 +37,44 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Virtual98
 {
-    public sealed partial class Virtual98
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            var shiftjis = Encoding.GetEncoding("shift_jis");
+        // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+        var shiftjis = Encoding.GetEncoding("shift_jis");
 
-            if(stream.Length < Marshal.SizeOf<Virtual98Header>())
-                return false;
+        if(stream.Length < Marshal.SizeOf<Virtual98Header>())
+            return false;
 
-            byte[] hdrB = new byte[Marshal.SizeOf<Virtual98Header>()];
-            stream.Read(hdrB, 0, hdrB.Length);
+        byte[] hdrB = new byte[Marshal.SizeOf<Virtual98Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
 
-            _v98Hdr = Marshal.ByteArrayToStructureLittleEndian<Virtual98Header>(hdrB);
+        _v98Hdr = Marshal.ByteArrayToStructureLittleEndian<Virtual98Header>(hdrB);
 
-            if(!_v98Hdr.signature.SequenceEqual(_signature))
-                return false;
+        if(!_v98Hdr.signature.SequenceEqual(_signature))
+            return false;
 
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.signature = \"{0}\"",
-                                       StringHandlers.CToString(_v98Hdr.signature, shiftjis));
+        AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.signature = \"{0}\"",
+                                   StringHandlers.CToString(_v98Hdr.signature, shiftjis));
 
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.comment = \"{0}\"",
-                                       StringHandlers.CToString(_v98Hdr.comment, shiftjis));
+        AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.comment = \"{0}\"",
+                                   StringHandlers.CToString(_v98Hdr.comment, shiftjis));
 
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.padding = {0}", _v98Hdr.padding);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.mbsize = {0}", _v98Hdr.mbsize);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.sectorsize = {0}", _v98Hdr.sectorsize);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.sectors = {0}", _v98Hdr.sectors);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.surfaces = {0}", _v98Hdr.surfaces);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.cylinders = {0}", _v98Hdr.cylinders);
-            AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.totals = {0}", _v98Hdr.totals);
+        AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.padding = {0}", _v98Hdr.padding);
+        AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.mbsize = {0}", _v98Hdr.mbsize);
+        AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.sectorsize = {0}", _v98Hdr.sectorsize);
+        AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.sectors = {0}", _v98Hdr.sectors);
+        AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.surfaces = {0}", _v98Hdr.surfaces);
+        AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.cylinders = {0}", _v98Hdr.cylinders);
+        AaruConsole.DebugWriteLine("Virtual98 plugin", "v98hdr.totals = {0}", _v98Hdr.totals);
 
-            return true;
-        }
+        return true;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Properties.cs b/Aaru.Images/Virtual98/Properties.cs
index dce5aae4a..e13b98e68 100644
--- a/Aaru.Images/Virtual98/Properties.cs
+++ b/Aaru.Images/Virtual98/Properties.cs
@@ -37,49 +37,48 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Virtual98
 {
-    public sealed partial class Virtual98
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Name => "Virtual98 Disk Image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("C0CDE13D-04D0-4913-8740-AFAA44D0A107");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Virtual98 disk image";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes => new[]
     {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Name => "Virtual98 Disk Image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("C0CDE13D-04D0-4913-8740-AFAA44D0A107");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Virtual98 disk image";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => new MediaTagType[]
+        MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
+        MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
+        MediaType.PCCardTypeIV
+    };
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
             {};
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes => new[]
-        {
-            MediaType.GENERIC_HDD, MediaType.Unknown, MediaType.FlashDrive, MediaType.CompactFlash,
-            MediaType.CompactFlashType2, MediaType.PCCardTypeI, MediaType.PCCardTypeII, MediaType.PCCardTypeIII,
-            MediaType.PCCardTypeIV
-        };
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".v98"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
-    }
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".v98"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Read.cs b/Aaru.Images/Virtual98/Read.cs
index 86670b972..9df57d836 100644
--- a/Aaru.Images/Virtual98/Read.cs
+++ b/Aaru.Images/Virtual98/Read.cs
@@ -38,77 +38,76 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Virtual98
 {
-    public sealed partial class Virtual98
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
-            var shiftjis = Encoding.GetEncoding("shift_jis");
+        // Even if comment is supposedly ASCII, I'm pretty sure most emulators allow Shift-JIS to be used :p
+        var shiftjis = Encoding.GetEncoding("shift_jis");
 
-            if(stream.Length < Marshal.SizeOf<Virtual98Header>())
-                return ErrorNumber.InvalidArgument;
+        if(stream.Length < Marshal.SizeOf<Virtual98Header>())
+            return ErrorNumber.InvalidArgument;
 
-            byte[] hdrB = new byte[Marshal.SizeOf<Virtual98Header>()];
-            stream.Read(hdrB, 0, hdrB.Length);
+        byte[] hdrB = new byte[Marshal.SizeOf<Virtual98Header>()];
+        stream.Read(hdrB, 0, hdrB.Length);
 
-            _v98Hdr = Marshal.ByteArrayToStructureLittleEndian<Virtual98Header>(hdrB);
+        _v98Hdr = Marshal.ByteArrayToStructureLittleEndian<Virtual98Header>(hdrB);
 
-            _imageInfo.MediaType = MediaType.GENERIC_HDD;
+        _imageInfo.MediaType = MediaType.GENERIC_HDD;
 
-            _imageInfo.ImageSize            = (ulong)(stream.Length - 0xDC);
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _imageInfo.Sectors              = _v98Hdr.totals;
-            _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
-            _imageInfo.SectorSize           = _v98Hdr.sectorsize;
-            _imageInfo.Cylinders            = _v98Hdr.cylinders;
-            _imageInfo.Heads                = _v98Hdr.surfaces;
-            _imageInfo.SectorsPerTrack      = _v98Hdr.sectors;
-            _imageInfo.Comments             = StringHandlers.CToString(_v98Hdr.comment, shiftjis);
+        _imageInfo.ImageSize            = (ulong)(stream.Length - 0xDC);
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _imageInfo.Sectors              = _v98Hdr.totals;
+        _imageInfo.XmlMediaType         = XmlMediaType.BlockMedia;
+        _imageInfo.SectorSize           = _v98Hdr.sectorsize;
+        _imageInfo.Cylinders            = _v98Hdr.cylinders;
+        _imageInfo.Heads                = _v98Hdr.surfaces;
+        _imageInfo.SectorsPerTrack      = _v98Hdr.sectors;
+        _imageInfo.Comments             = StringHandlers.CToString(_v98Hdr.comment, shiftjis);
 
-            _nhdImageFilter = imageFilter;
+        _nhdImageFilter = imageFilter;
 
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) => ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        buffer = new byte[length * _imageInfo.SectorSize];
+
+        Stream stream = _nhdImageFilter.GetDataForkStream();
+
+        // V98 are lazy allocated
+        if((long)(0xDC + (sectorAddress * _imageInfo.SectorSize)) >= stream.Length)
             return ErrorNumber.NoError;
-        }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) => ReadSectors(sectorAddress, 1, out buffer);
+        stream.Seek((long)(0xDC + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+        int toRead = (int)(length * _imageInfo.SectorSize);
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+        if(toRead + stream.Position > stream.Length)
+            toRead = (int)(stream.Length - stream.Position);
 
-            buffer = new byte[length * _imageInfo.SectorSize];
+        stream.Read(buffer, 0, toRead);
 
-            Stream stream = _nhdImageFilter.GetDataForkStream();
-
-            // V98 are lazy allocated
-            if((long)(0xDC + (sectorAddress * _imageInfo.SectorSize)) >= stream.Length)
-                return ErrorNumber.NoError;
-
-            stream.Seek((long)(0xDC + (sectorAddress * _imageInfo.SectorSize)), SeekOrigin.Begin);
-
-            int toRead = (int)(length * _imageInfo.SectorSize);
-
-            if(toRead + stream.Position > stream.Length)
-                toRead = (int)(stream.Length - stream.Position);
-
-            stream.Read(buffer, 0, toRead);
-
-            return ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Structs.cs b/Aaru.Images/Virtual98/Structs.cs
index f3a7ae66c..ceee545b4 100644
--- a/Aaru.Images/Virtual98/Structs.cs
+++ b/Aaru.Images/Virtual98/Structs.cs
@@ -32,26 +32,25 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Virtual98
 {
-    public sealed partial class Virtual98
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Virtual98Header
     {
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Virtual98Header
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public byte[] signature;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
-            public byte[] comment;
-            public readonly uint   padding;
-            public readonly ushort mbsize;
-            public          ushort sectorsize;
-            public          byte   sectors;
-            public          byte   surfaces;
-            public          ushort cylinders;
-            public          uint   totals;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x44)]
-            public byte[] padding2;
-        }
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public byte[] signature;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public byte[] comment;
+        public readonly uint   padding;
+        public readonly ushort mbsize;
+        public          ushort sectorsize;
+        public          byte   sectors;
+        public          byte   surfaces;
+        public          ushort cylinders;
+        public          uint   totals;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x44)]
+        public byte[] padding2;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Unsupported.cs b/Aaru.Images/Virtual98/Unsupported.cs
index 8e8df1044..31c0bcb1f 100644
--- a/Aaru.Images/Virtual98/Unsupported.cs
+++ b/Aaru.Images/Virtual98/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Virtual98
 {
-    public sealed partial class Virtual98
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Virtual98.cs b/Aaru.Images/Virtual98/Virtual98.cs
index d8be2abef..8991d43f3 100644
--- a/Aaru.Images/Virtual98/Virtual98.cs
+++ b/Aaru.Images/Virtual98/Virtual98.cs
@@ -36,40 +36,39 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    // Info from Neko Project II emulator
-    /// <inheritdoc />
-    /// <summary>Implements reading Virtual98 disk images</summary>
-    public sealed partial class Virtual98 : IWritableImage
-    {
-        ImageInfo       _imageInfo;
-        IFilter         _nhdImageFilter;
-        Virtual98Header _v98Hdr;
-        FileStream      _writingStream;
+namespace Aaru.DiscImages;
 
-        public Virtual98() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+// Info from Neko Project II emulator
+/// <inheritdoc />
+/// <summary>Implements reading Virtual98 disk images</summary>
+public sealed partial class Virtual98 : IWritableImage
+{
+    ImageInfo       _imageInfo;
+    IFilter         _nhdImageFilter;
+    Virtual98Header _v98Hdr;
+    FileStream      _writingStream;
+
+    public Virtual98() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/Virtual98/Write.cs b/Aaru.Images/Virtual98/Write.cs
index ed9000937..abf886dca 100644
--- a/Aaru.Images/Virtual98/Write.cs
+++ b/Aaru.Images/Virtual98/Write.cs
@@ -41,280 +41,279 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Helpers;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class Virtual98
 {
-    public sealed partial class Virtual98
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize != 512)
         {
-            if(sectorSize != 512)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            if(sectors > uint.MaxValue)
-            {
-                ErrorMessage = "Too many sectors";
-
-                return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
-        {
-            ErrorMessage = "Writing media tags is not supported.";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        if(sectors > uint.MaxValue)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != 512)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(0xDC + (sectorAddress * 512)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % 512 != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(0xDC + (sectorAddress * 512)), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = "Too many sectors";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+        if(!SupportedMediaTypes.Contains(mediaType))
         {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool Close()
+        _imageInfo = new ImageInfo
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
-
-            if(_imageInfo.Cylinders == 0)
-            {
-                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-                _imageInfo.Heads           = 16;
-                _imageInfo.SectorsPerTrack = 63;
-
-                while(_imageInfo.Cylinders == 0)
-                {
-                    _imageInfo.Heads--;
-
-                    if(_imageInfo.Heads == 0)
-                    {
-                        _imageInfo.SectorsPerTrack--;
-                        _imageInfo.Heads = 16;
-                    }
-
-                    _imageInfo.Cylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
-
-                    if(_imageInfo.Cylinders       == 0 &&
-                       _imageInfo.Heads           == 0 &&
-                       _imageInfo.SectorsPerTrack == 0)
-                        break;
-                }
-            }
-
-            byte[] commentsBytes = null;
-
-            if(!string.IsNullOrEmpty(_imageInfo.Comments))
-                commentsBytes = Encoding.GetEncoding("shift_jis").GetBytes(_imageInfo.Comments);
-
-            _v98Hdr = new Virtual98Header
-            {
-                comment    = new byte[128],
-                cylinders  = (ushort)_imageInfo.Cylinders,
-                padding2   = new byte[0x44],
-                sectors    = (byte)_imageInfo.SectorsPerTrack,
-                sectorsize = (ushort)_imageInfo.SectorSize,
-                signature  = _signature,
-                surfaces   = (byte)_imageInfo.Heads,
-                totals     = (uint)_imageInfo.Sectors
-            };
-
-            if(commentsBytes != null)
-                Array.Copy(commentsBytes, 0, _v98Hdr.comment, 0,
-                           commentsBytes.Length >= 128 ? 128 : commentsBytes.Length);
-
-            byte[] hdr    = new byte[Marshal.SizeOf<Virtual98Header>()];
-            IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Virtual98Header>());
-            System.Runtime.InteropServices.Marshal.StructureToPtr(_v98Hdr, hdrPtr, true);
-            System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
-            System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
-
-            _writingStream.Seek(0, SeekOrigin.Begin);
-            _writingStream.Write(hdr, 0, hdr.Length);
-
-            _writingStream.Flush();
-            _writingStream.Close();
-
-            IsWriting    = false;
-            ErrorMessage = "";
-
-            return true;
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
         }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata)
+        catch(IOException e)
         {
-            _imageInfo.Comments = metadata.Comments;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
-        {
-            if(cylinders > ushort.MaxValue)
-            {
-                ErrorMessage = "Too many cylinders.";
-
-                return false;
-            }
-
-            if(heads > byte.MaxValue)
-            {
-                ErrorMessage = "Too many heads.";
-
-                return false;
-            }
-
-            if(sectorsPerTrack > byte.MaxValue)
-            {
-                ErrorMessage = "Too many sectors per track.";
-
-                return false;
-            }
-
-            _imageInfo.SectorsPerTrack = sectorsPerTrack;
-            _imageInfo.Heads           = heads;
-            _imageInfo.Cylinders       = cylinders;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
+        IsWriting    = true;
+        ErrorMessage = null;
 
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        ErrorMessage = "Writing media tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != 512)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(0xDC + (sectorAddress * 512)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % 512 != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(0xDC + (sectorAddress * 512)), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        if(_imageInfo.Cylinders == 0)
+        {
+            _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+            _imageInfo.Heads           = 16;
+            _imageInfo.SectorsPerTrack = 63;
+
+            while(_imageInfo.Cylinders == 0)
+            {
+                _imageInfo.Heads--;
+
+                if(_imageInfo.Heads == 0)
+                {
+                    _imageInfo.SectorsPerTrack--;
+                    _imageInfo.Heads = 16;
+                }
+
+                _imageInfo.Cylinders = (uint)(_imageInfo.Sectors / _imageInfo.Heads / _imageInfo.SectorsPerTrack);
+
+                if(_imageInfo.Cylinders       == 0 &&
+                   _imageInfo.Heads           == 0 &&
+                   _imageInfo.SectorsPerTrack == 0)
+                    break;
+            }
+        }
+
+        byte[] commentsBytes = null;
+
+        if(!string.IsNullOrEmpty(_imageInfo.Comments))
+            commentsBytes = Encoding.GetEncoding("shift_jis").GetBytes(_imageInfo.Comments);
+
+        _v98Hdr = new Virtual98Header
+        {
+            comment    = new byte[128],
+            cylinders  = (ushort)_imageInfo.Cylinders,
+            padding2   = new byte[0x44],
+            sectors    = (byte)_imageInfo.SectorsPerTrack,
+            sectorsize = (ushort)_imageInfo.SectorSize,
+            signature  = _signature,
+            surfaces   = (byte)_imageInfo.Heads,
+            totals     = (uint)_imageInfo.Sectors
+        };
+
+        if(commentsBytes != null)
+            Array.Copy(commentsBytes, 0, _v98Hdr.comment, 0,
+                       commentsBytes.Length >= 128 ? 128 : commentsBytes.Length);
+
+        byte[] hdr    = new byte[Marshal.SizeOf<Virtual98Header>()];
+        IntPtr hdrPtr = System.Runtime.InteropServices.Marshal.AllocHGlobal(Marshal.SizeOf<Virtual98Header>());
+        System.Runtime.InteropServices.Marshal.StructureToPtr(_v98Hdr, hdrPtr, true);
+        System.Runtime.InteropServices.Marshal.Copy(hdrPtr, hdr, 0, hdr.Length);
+        System.Runtime.InteropServices.Marshal.FreeHGlobal(hdrPtr);
+
+        _writingStream.Seek(0, SeekOrigin.Begin);
+        _writingStream.Write(hdr, 0, hdr.Length);
+
+        _writingStream.Flush();
+        _writingStream.Close();
+
+        IsWriting    = false;
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata)
+    {
+        _imageInfo.Comments = metadata.Comments;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack)
+    {
+        if(cylinders > ushort.MaxValue)
+        {
+            ErrorMessage = "Too many cylinders.";
+
+            return false;
+        }
+
+        if(heads > byte.MaxValue)
+        {
+            ErrorMessage = "Too many heads.";
+
+            return false;
+        }
+
+        if(sectorsPerTrack > byte.MaxValue)
+        {
+            ErrorMessage = "Too many sectors per track.";
+
+            return false;
+        }
+
+        _imageInfo.SectorsPerTrack = sectorsPerTrack;
+        _imageInfo.Heads           = heads;
+        _imageInfo.Cylinders       = cylinders;
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
 }
\ No newline at end of file
diff --git a/Aaru.Images/WCDiskImage/Identify.cs b/Aaru.Images/WCDiskImage/Identify.cs
index e6ac1a8a6..d52be1616 100644
--- a/Aaru.Images/WCDiskImage/Identify.cs
+++ b/Aaru.Images/WCDiskImage/Identify.cs
@@ -36,53 +36,52 @@ using System.Text;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class WCDiskImage
 {
-    public sealed partial class WCDiskImage
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
-        {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
 
-            if(stream.Length < 32)
-                return false;
+        if(stream.Length < 32)
+            return false;
 
-            byte[] header = new byte[32];
-            stream.Read(header, 0, 32);
+        byte[] header = new byte[32];
+        stream.Read(header, 0, 32);
 
-            FileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<FileHeader>(header);
+        FileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<FileHeader>(header);
 
-            /* check the signature */
-            if(Encoding.ASCII.GetString(fheader.signature).TrimEnd('\x00') != FILE_SIGNATURE)
-                return false;
+        /* check the signature */
+        if(Encoding.ASCII.GetString(fheader.signature).TrimEnd('\x00') != FILE_SIGNATURE)
+            return false;
 
-            /* Some sanity checks on the values we just read. */
-            if(fheader.version > 1)
-                return false;
+        /* Some sanity checks on the values we just read. */
+        if(fheader.version > 1)
+            return false;
 
-            if(fheader.heads < 1 ||
-               fheader.heads > 2)
-                return false;
+        if(fheader.heads < 1 ||
+           fheader.heads > 2)
+            return false;
 
-            if(fheader.sectorsPerTrack < 8 ||
-               fheader.sectorsPerTrack > 18)
-                return false;
+        if(fheader.sectorsPerTrack < 8 ||
+           fheader.sectorsPerTrack > 18)
+            return false;
 
-            if(fheader.cylinders < 1 ||
-               fheader.cylinders > 80)
-                return false;
+        if(fheader.cylinders < 1 ||
+           fheader.cylinders > 80)
+            return false;
 
-            if(fheader.extraTracks[0] > 1 ||
-               fheader.extraTracks[1] > 1 ||
-               fheader.extraTracks[2] > 1 ||
-               fheader.extraTracks[3] > 1)
-                return false;
+        if(fheader.extraTracks[0] > 1 ||
+           fheader.extraTracks[1] > 1 ||
+           fheader.extraTracks[2] > 1 ||
+           fheader.extraTracks[3] > 1)
+            return false;
 
-            // TODO: validate all sectors
-            // For now, having a valid header will suffice.
-            return ((byte)fheader.extraFlags & ~0x03) == 0;
-        }
+        // TODO: validate all sectors
+        // For now, having a valid header will suffice.
+        return ((byte)fheader.extraFlags & ~0x03) == 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/WCDiskImage/Properties.cs b/Aaru.Images/WCDiskImage/Properties.cs
index acbd2be32..a343ba05f 100644
--- a/Aaru.Images/WCDiskImage/Properties.cs
+++ b/Aaru.Images/WCDiskImage/Properties.cs
@@ -36,24 +36,23 @@ using System.Collections.Generic;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class WCDiskImage
-    {
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
+namespace Aaru.DiscImages;
 
-        /// <inheritdoc />
-        public string Name => "d2f disk image";
-        /// <inheritdoc />
-        public Guid Id => new Guid("DDE01493-BCA2-41C2-A269-7E56D3716D2F");
-        /// <inheritdoc />
-        public string Author => "Michael Drüing";
-        /// <inheritdoc />
-        public string Format => "d2f disk image";
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata => null;
-    }
+public sealed partial class WCDiskImage
+{
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+
+    /// <inheritdoc />
+    public string Name => "d2f disk image";
+    /// <inheritdoc />
+    public Guid Id => new Guid("DDE01493-BCA2-41C2-A269-7E56D3716D2F");
+    /// <inheritdoc />
+    public string Author => "Michael Drüing";
+    /// <inheritdoc />
+    public string Format => "d2f disk image";
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata => null;
 }
\ No newline at end of file
diff --git a/Aaru.Images/WCDiskImage/Read.cs b/Aaru.Images/WCDiskImage/Read.cs
index 40d8b4f80..9c4254ecc 100644
--- a/Aaru.Images/WCDiskImage/Read.cs
+++ b/Aaru.Images/WCDiskImage/Read.cs
@@ -41,279 +41,278 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Aaru.Helpers;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class WCDiskImage
 {
-    public sealed partial class WCDiskImage
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        string comments = string.Empty;
+        Stream stream   = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        byte[] header = new byte[32];
+        stream.Read(header, 0, 32);
+
+        FileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<FileHeader>(header);
+
+        AaruConsole.DebugWriteLine("d2f plugin",
+                                   "Detected WC DISK IMAGE with {0} heads, {1} tracks and {2} sectors per track.",
+                                   fheader.heads, fheader.cylinders, fheader.sectorsPerTrack);
+
+        _imageInfo.Cylinders       = fheader.cylinders;
+        _imageInfo.SectorsPerTrack = fheader.sectorsPerTrack;
+        _imageInfo.SectorSize      = 512; // only 512 bytes per sector supported
+        _imageInfo.Heads           = fheader.heads;
+        _imageInfo.Sectors         = _imageInfo.Heads   * _imageInfo.Cylinders * _imageInfo.SectorsPerTrack;
+        _imageInfo.ImageSize       = _imageInfo.Sectors * _imageInfo.SectorSize;
+
+        _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+
+        _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
+                                                      (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
+                                                      false));
+
+        /* buffer the entire disk in memory */
+        for(int cyl = 0; cyl < _imageInfo.Cylinders; cyl++)
         {
-            string comments = string.Empty;
-            Stream stream   = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
-
-            byte[] header = new byte[32];
-            stream.Read(header, 0, 32);
-
-            FileHeader fheader = Marshal.ByteArrayToStructureLittleEndian<FileHeader>(header);
-
-            AaruConsole.DebugWriteLine("d2f plugin",
-                                       "Detected WC DISK IMAGE with {0} heads, {1} tracks and {2} sectors per track.",
-                                       fheader.heads, fheader.cylinders, fheader.sectorsPerTrack);
-
-            _imageInfo.Cylinders       = fheader.cylinders;
-            _imageInfo.SectorsPerTrack = fheader.sectorsPerTrack;
-            _imageInfo.SectorSize      = 512; // only 512 bytes per sector supported
-            _imageInfo.Heads           = fheader.heads;
-            _imageInfo.Sectors         = _imageInfo.Heads   * _imageInfo.Cylinders * _imageInfo.SectorsPerTrack;
-            _imageInfo.ImageSize       = _imageInfo.Sectors * _imageInfo.SectorSize;
-
-            _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-
-            _imageInfo.MediaType = Geometry.GetMediaType(((ushort)_imageInfo.Cylinders, (byte)_imageInfo.Heads,
-                                                          (ushort)_imageInfo.SectorsPerTrack, 512, MediaEncoding.MFM,
-                                                          false));
-
-            /* buffer the entire disk in memory */
-            for(int cyl = 0; cyl < _imageInfo.Cylinders; cyl++)
+            for(int head = 0; head < _imageInfo.Heads; head++)
             {
-                for(int head = 0; head < _imageInfo.Heads; head++)
-                {
-                    var errno =ReadTrack(stream, cyl, head);
+                var errno =ReadTrack(stream, cyl, head);
 
-                    if(errno != ErrorNumber.NoError)
-                        return errno;
-                }
+                if(errno != ErrorNumber.NoError)
+                    return errno;
             }
-
-            /* if there are extra tracks, read them as well */
-            if(fheader.extraTracks[0] == 1)
-            {
-                AaruConsole.DebugWriteLine("d2f plugin", "Extra track 1 (head 0) present, reading");
-                ReadTrack(stream, (int)_imageInfo.Cylinders, 0);
-            }
-
-            if(fheader.extraTracks[1] == 1)
-            {
-                AaruConsole.DebugWriteLine("d2f plugin", "Extra track 1 (head 1) present, reading");
-                ReadTrack(stream, (int)_imageInfo.Cylinders, 1);
-            }
-
-            if(fheader.extraTracks[2] == 1)
-            {
-                AaruConsole.DebugWriteLine("d2f plugin", "Extra track 2 (head 0) present, reading");
-                ReadTrack(stream, (int)_imageInfo.Cylinders + 1, 0);
-            }
-
-            if(fheader.extraTracks[3] == 1)
-            {
-                AaruConsole.DebugWriteLine("d2f plugin", "Extra track 2 (head 1) present, reading");
-                ReadTrack(stream, (int)_imageInfo.Cylinders + 1, 1);
-            }
-
-            /* adjust number of cylinders */
-            if(fheader.extraTracks[0] == 1 ||
-               fheader.extraTracks[1] == 1)
-                _imageInfo.Cylinders++;
-
-            if(fheader.extraTracks[2] == 1 ||
-               fheader.extraTracks[3] == 1)
-                _imageInfo.Cylinders++;
-
-            /* read the comment and directory data if present */
-            if(fheader.extraFlags.HasFlag(ExtraFlag.Comment))
-            {
-                AaruConsole.DebugWriteLine("d2f plugin", "Comment present, reading");
-                byte[] sheaderBuffer = new byte[6];
-                stream.Read(sheaderBuffer, 0, 6);
-
-                SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
-
-                if(sheader.flag != SectorFlag.Comment)
-                {
-                    AaruConsole.ErrorWriteLine($"Invalid sector type '{sheader.flag.ToString()}' encountered");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                byte[] comm = new byte[sheader.crc];
-                stream.Read(comm, 0, sheader.crc);
-                comments += Encoding.ASCII.GetString(comm) + Environment.NewLine;
-            }
-
-            if(fheader.extraFlags.HasFlag(ExtraFlag.Directory))
-            {
-                AaruConsole.DebugWriteLine("d2f plugin", "Directory listing present, reading");
-                byte[] sheaderBuffer = new byte[6];
-                stream.Read(sheaderBuffer, 0, 6);
-
-                SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
-
-                if(sheader.flag != SectorFlag.Directory)
-                {
-                    AaruConsole.ErrorWriteLine($"Invalid sector type '{sheader.flag.ToString()}' encountered");
-
-                    return ErrorNumber.InvalidArgument;
-                }
-
-                byte[] dir = new byte[sheader.crc];
-                stream.Read(dir, 0, sheader.crc);
-                comments += Encoding.ASCII.GetString(dir);
-            }
-
-            if(comments.Length > 0)
-                _imageInfo.Comments = comments;
-
-            // save some variables for later use
-            _fileHeader    = fheader;
-            _wcImageFilter = imageFilter;
-
-            return ErrorNumber.InvalidArgument;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+        /* if there are extra tracks, read them as well */
+        if(fheader.extraTracks[0] == 1)
         {
-            int sectorNumber   = (int)(sectorAddress % _imageInfo.SectorsPerTrack) + 1;
-            int trackNumber    = (int)(sectorAddress / _imageInfo.SectorsPerTrack);
-            int headNumber     = _imageInfo.Heads > 1 ? trackNumber % 2 : 0;
-            int cylinderNumber = _imageInfo.Heads > 1 ? trackNumber / 2 : trackNumber;
+            AaruConsole.DebugWriteLine("d2f plugin", "Extra track 1 (head 0) present, reading");
+            ReadTrack(stream, (int)_imageInfo.Cylinders, 0);
+        }
 
-            if(_badSectors[(cylinderNumber, headNumber, sectorNumber)])
+        if(fheader.extraTracks[1] == 1)
+        {
+            AaruConsole.DebugWriteLine("d2f plugin", "Extra track 1 (head 1) present, reading");
+            ReadTrack(stream, (int)_imageInfo.Cylinders, 1);
+        }
+
+        if(fheader.extraTracks[2] == 1)
+        {
+            AaruConsole.DebugWriteLine("d2f plugin", "Extra track 2 (head 0) present, reading");
+            ReadTrack(stream, (int)_imageInfo.Cylinders + 1, 0);
+        }
+
+        if(fheader.extraTracks[3] == 1)
+        {
+            AaruConsole.DebugWriteLine("d2f plugin", "Extra track 2 (head 1) present, reading");
+            ReadTrack(stream, (int)_imageInfo.Cylinders + 1, 1);
+        }
+
+        /* adjust number of cylinders */
+        if(fheader.extraTracks[0] == 1 ||
+           fheader.extraTracks[1] == 1)
+            _imageInfo.Cylinders++;
+
+        if(fheader.extraTracks[2] == 1 ||
+           fheader.extraTracks[3] == 1)
+            _imageInfo.Cylinders++;
+
+        /* read the comment and directory data if present */
+        if(fheader.extraFlags.HasFlag(ExtraFlag.Comment))
+        {
+            AaruConsole.DebugWriteLine("d2f plugin", "Comment present, reading");
+            byte[] sheaderBuffer = new byte[6];
+            stream.Read(sheaderBuffer, 0, 6);
+
+            SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
+
+            if(sheader.flag != SectorFlag.Comment)
             {
-                AaruConsole.DebugWriteLine("d2f plugin", "reading bad sector {0} ({1},{2},{3})", sectorAddress,
-                                           cylinderNumber, headNumber, sectorNumber);
+                AaruConsole.ErrorWriteLine($"Invalid sector type '{sheader.flag.ToString()}' encountered");
 
-                /* if we have sector data, return that */
-                if(_sectorCache.ContainsKey((cylinderNumber, headNumber, sectorNumber)))
-                {
-                    buffer = _sectorCache[(cylinderNumber, headNumber, sectorNumber)];
+                return ErrorNumber.InvalidArgument;
+            }
 
-                    return ErrorNumber.NoError;
-                }
+            byte[] comm = new byte[sheader.crc];
+            stream.Read(comm, 0, sheader.crc);
+            comments += Encoding.ASCII.GetString(comm) + Environment.NewLine;
+        }
 
-                /* otherwise, return an empty sector */
-                buffer = new byte[512];
+        if(fheader.extraFlags.HasFlag(ExtraFlag.Directory))
+        {
+            AaruConsole.DebugWriteLine("d2f plugin", "Directory listing present, reading");
+            byte[] sheaderBuffer = new byte[6];
+            stream.Read(sheaderBuffer, 0, 6);
+
+            SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
+
+            if(sheader.flag != SectorFlag.Directory)
+            {
+                AaruConsole.ErrorWriteLine($"Invalid sector type '{sheader.flag.ToString()}' encountered");
+
+                return ErrorNumber.InvalidArgument;
+            }
+
+            byte[] dir = new byte[sheader.crc];
+            stream.Read(dir, 0, sheader.crc);
+            comments += Encoding.ASCII.GetString(dir);
+        }
+
+        if(comments.Length > 0)
+            _imageInfo.Comments = comments;
+
+        // save some variables for later use
+        _fileHeader    = fheader;
+        _wcImageFilter = imageFilter;
+
+        return ErrorNumber.InvalidArgument;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer)
+    {
+        int sectorNumber   = (int)(sectorAddress % _imageInfo.SectorsPerTrack) + 1;
+        int trackNumber    = (int)(sectorAddress / _imageInfo.SectorsPerTrack);
+        int headNumber     = _imageInfo.Heads > 1 ? trackNumber % 2 : 0;
+        int cylinderNumber = _imageInfo.Heads > 1 ? trackNumber / 2 : trackNumber;
+
+        if(_badSectors[(cylinderNumber, headNumber, sectorNumber)])
+        {
+            AaruConsole.DebugWriteLine("d2f plugin", "reading bad sector {0} ({1},{2},{3})", sectorAddress,
+                                       cylinderNumber, headNumber, sectorNumber);
+
+            /* if we have sector data, return that */
+            if(_sectorCache.ContainsKey((cylinderNumber, headNumber, sectorNumber)))
+            {
+                buffer = _sectorCache[(cylinderNumber, headNumber, sectorNumber)];
 
                 return ErrorNumber.NoError;
             }
 
-            buffer = _sectorCache[(cylinderNumber, headNumber, sectorNumber)];
+            /* otherwise, return an empty sector */
+            buffer = new byte[512];
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        buffer = _sectorCache[(cylinderNumber, headNumber, sectorNumber)];
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        var ms = new MemoryStream();
+
+        for(uint i = 0; i < length; i++)
         {
-            buffer = null;
+            ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
+            if(errno != ErrorNumber.NoError)
+                return errno;
 
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
+            ms.Write(sector, 0, sector.Length);
+        }
 
-            var ms = new MemoryStream();
+        buffer = ms.ToArray();
 
-            for(uint i = 0; i < length; i++)
+        return ErrorNumber.NoError;
+    }
+
+    /// <summary>Read a whole track and cache it</summary>
+    /// <param name="stream">The stream to read from</param>
+    /// <param name="cyl">The cylinder number of the track being read.</param>
+    /// <param name="head">The head number of the track being read.</param>
+    ErrorNumber ReadTrack(Stream stream, int cyl, int head)
+    {
+        byte[] sectorData;
+        byte[] crc;
+        short  calculatedCRC;
+
+        for(int sect = 1; sect < _imageInfo.SectorsPerTrack + 1; sect++)
+        {
+            /* read the sector header */
+            byte[] sheaderBuffer = new byte[6];
+            stream.Read(sheaderBuffer, 0, 6);
+
+            SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
+
+            /* validate the sector header */
+            if(sheader.cylinder != cyl  ||
+               sheader.head     != head ||
+               sheader.sector   != sect)
             {
-                ErrorNumber errno = ReadSector(sectorAddress + i, out byte[] sector);
+                AaruConsole.
+                    ErrorWriteLine($"Unexpected sector encountered. Found CHS {sheader.cylinder},{sheader.head},{sheader.sector} but expected {cyl},{head},{sect}");
 
-                if(errno != ErrorNumber.NoError)
-                    return errno;
-
-                ms.Write(sector, 0, sector.Length);
+                return ErrorNumber.InvalidArgument;
             }
 
-            buffer = ms.ToArray();
+            sectorData = new byte[512];
 
-            return ErrorNumber.NoError;
-        }
-
-        /// <summary>Read a whole track and cache it</summary>
-        /// <param name="stream">The stream to read from</param>
-        /// <param name="cyl">The cylinder number of the track being read.</param>
-        /// <param name="head">The head number of the track being read.</param>
-        ErrorNumber ReadTrack(Stream stream, int cyl, int head)
-        {
-            byte[] sectorData;
-            byte[] crc;
-            short  calculatedCRC;
-
-            for(int sect = 1; sect < _imageInfo.SectorsPerTrack + 1; sect++)
+            /* read the sector data */
+            switch(sheader.flag)
             {
-                /* read the sector header */
-                byte[] sheaderBuffer = new byte[6];
-                stream.Read(sheaderBuffer, 0, 6);
+                case SectorFlag.Normal: /* read a normal sector and store it in cache */
+                    stream.Read(sectorData, 0, 512);
+                    _sectorCache[(cyl, head, sect)] = sectorData;
+                    CRC16IBMContext.Data(sectorData, 512, out crc);
+                    calculatedCRC = (short)((256 * crc[0]) | crc[1]);
+                    /*
+                    AaruConsole.DebugWriteLine("d2f plugin", "CHS {0},{1},{2}: Regular sector, stored CRC=0x{3:x4}, calculated CRC=0x{4:x4}",
+                        cyl, head, sect, sheader.crc, 256 * crc[0] + crc[1]);
+                     */
+                    _badSectors[(cyl, head, sect)] = sheader.crc != calculatedCRC;
 
-                SectorHeader sheader = Marshal.ByteArrayToStructureLittleEndian<SectorHeader>(sheaderBuffer);
+                    if(calculatedCRC != sheader.crc)
+                        AaruConsole.DebugWriteLine("d2f plugin",
+                                                   "CHS {0},{1},{2}: CRC mismatch: stored CRC=0x{3:x4}, calculated CRC=0x{4:x4}",
+                                                   cyl, head, sect, sheader.crc, calculatedCRC);
 
-                /* validate the sector header */
-                if(sheader.cylinder != cyl  ||
-                   sheader.head     != head ||
-                   sheader.sector   != sect)
-                {
-                    AaruConsole.
-                        ErrorWriteLine($"Unexpected sector encountered. Found CHS {sheader.cylinder},{sheader.head},{sheader.sector} but expected {cyl},{head},{sect}");
+                    break;
+                case SectorFlag.BadSector:
+                    /*
+                    AaruConsole.DebugWriteLine("d2f plugin", "CHS {0},{1},{2}: Bad sector",
+                        cyl, head, sect);
+                     */
+                    _badSectors[(cyl, head, sect)] = true;
+
+                    break;
+                case SectorFlag.RepeatByte:
+                    /*
+                    AaruConsole.DebugWriteLine("d2f plugin", "CHS {0},{1},{2}: RepeatByte sector, fill byte 0x{0:x2}",
+                        cyl, head, sect, sheader.crc & 0xff);
+                     */
+                    for(int i = 0; i < 512; i++)
+                        sectorData[i] = (byte)(sheader.crc & 0xff);
+
+                    _sectorCache[(cyl, head, sect)] = sectorData;
+                    _badSectors[(cyl, head, sect)]  = false;
+
+                    break;
+                default:
+                    AaruConsole.ErrorWriteLine($"Invalid sector type '{sheader.flag.ToString()}' encountered");
 
                     return ErrorNumber.InvalidArgument;
-                }
-
-                sectorData = new byte[512];
-
-                /* read the sector data */
-                switch(sheader.flag)
-                {
-                    case SectorFlag.Normal: /* read a normal sector and store it in cache */
-                        stream.Read(sectorData, 0, 512);
-                        _sectorCache[(cyl, head, sect)] = sectorData;
-                        CRC16IBMContext.Data(sectorData, 512, out crc);
-                        calculatedCRC = (short)((256 * crc[0]) | crc[1]);
-                        /*
-                        AaruConsole.DebugWriteLine("d2f plugin", "CHS {0},{1},{2}: Regular sector, stored CRC=0x{3:x4}, calculated CRC=0x{4:x4}",
-                            cyl, head, sect, sheader.crc, 256 * crc[0] + crc[1]);
-                         */
-                        _badSectors[(cyl, head, sect)] = sheader.crc != calculatedCRC;
-
-                        if(calculatedCRC != sheader.crc)
-                            AaruConsole.DebugWriteLine("d2f plugin",
-                                                       "CHS {0},{1},{2}: CRC mismatch: stored CRC=0x{3:x4}, calculated CRC=0x{4:x4}",
-                                                       cyl, head, sect, sheader.crc, calculatedCRC);
-
-                        break;
-                    case SectorFlag.BadSector:
-                        /*
-                        AaruConsole.DebugWriteLine("d2f plugin", "CHS {0},{1},{2}: Bad sector",
-                            cyl, head, sect);
-                         */
-                        _badSectors[(cyl, head, sect)] = true;
-
-                        break;
-                    case SectorFlag.RepeatByte:
-                        /*
-                        AaruConsole.DebugWriteLine("d2f plugin", "CHS {0},{1},{2}: RepeatByte sector, fill byte 0x{0:x2}",
-                            cyl, head, sect, sheader.crc & 0xff);
-                         */
-                        for(int i = 0; i < 512; i++)
-                            sectorData[i] = (byte)(sheader.crc & 0xff);
-
-                        _sectorCache[(cyl, head, sect)] = sectorData;
-                        _badSectors[(cyl, head, sect)]  = false;
-
-                        break;
-                    default:
-                        AaruConsole.ErrorWriteLine($"Invalid sector type '{sheader.flag.ToString()}' encountered");
-
-                        return ErrorNumber.InvalidArgument;
-                }
             }
-
-            return ErrorNumber.NoError;
         }
+
+        return ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/WCDiskImage/Structs.cs b/Aaru.Images/WCDiskImage/Structs.cs
index 81349e4bf..2cea45b4b 100644
--- a/Aaru.Images/WCDiskImage/Structs.cs
+++ b/Aaru.Images/WCDiskImage/Structs.cs
@@ -33,97 +33,96 @@
 
 using System.Runtime.InteropServices;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class WCDiskImage
 {
-    public sealed partial class WCDiskImage
+    /// <summary>The expected signature of a proper image file.</summary>
+    const string FILE_SIGNATURE = "WC DISK IMAGE\x1a\x1a";
+
+    /// <summary>The global header of a WCDiskImage file</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct FileHeader
     {
-        /// <summary>The expected signature of a proper image file.</summary>
-        const string FILE_SIGNATURE = "WC DISK IMAGE\x1a\x1a";
+        /// <summary>The signature should be "WC DISK IMAGE\0x1a\0x1a\0x00"</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] signature;
 
-        /// <summary>The global header of a WCDiskImage file</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct FileHeader
-        {
-            /// <summary>The signature should be "WC DISK IMAGE\0x1a\0x1a\0x00"</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] signature;
+        /// <summary>Version (currently only version 0 and 1 is known)</summary>
+        public readonly byte version;
 
-            /// <summary>Version (currently only version 0 and 1 is known)</summary>
-            public readonly byte version;
+        /// <summary>The number of heads. Only 1 or 2 is supported</summary>
+        public readonly byte heads;
 
-            /// <summary>The number of heads. Only 1 or 2 is supported</summary>
-            public readonly byte heads;
+        /// <summary>Sectors per track, maximum is 18</summary>
+        public readonly byte sectorsPerTrack;
 
-            /// <summary>Sectors per track, maximum is 18</summary>
-            public readonly byte sectorsPerTrack;
+        /// <summary>The number of tracks/cylinders. 80 is the maximum</summary>
+        public readonly byte cylinders;
 
-            /// <summary>The number of tracks/cylinders. 80 is the maximum</summary>
-            public readonly byte cylinders;
+        /// <summary>
+        ///     The "extra tracks" that are present. What this means is that the tracks 81 and 82 might contain data (on an
+        ///     80-track disk) and that this data was dumped too. The order is head0extra1, head1extra1, head0extra2, head1extra2.
+        ///     1 means track is present.
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly byte[] extraTracks;
 
-            /// <summary>
-            ///     The "extra tracks" that are present. What this means is that the tracks 81 and 82 might contain data (on an
-            ///     80-track disk) and that this data was dumped too. The order is head0extra1, head1extra1, head0extra2, head1extra2.
-            ///     1 means track is present.
-            /// </summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly byte[] extraTracks;
+        /// <summary>Additional metadata present flags.</summary>
+        public readonly ExtraFlag extraFlags;
 
-            /// <summary>Additional metadata present flags.</summary>
-            public readonly ExtraFlag extraFlags;
+        /// <summary>Padding to make the header 32 bytes.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)]
+        public readonly byte[] reserved;
+    }
 
-            /// <summary>Padding to make the header 32 bytes.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)]
-            public readonly byte[] reserved;
-        }
+    enum ExtraFlag : byte
+    {
+        /// <summary>Set if a Comment is present after the image</summary>
+        Comment = 0x01,
 
-        enum ExtraFlag : byte
-        {
-            /// <summary>Set if a Comment is present after the image</summary>
-            Comment = 0x01,
+        /// <summary>Set if a directory listing is present after the image</summary>
+        Directory = 0x02
+    }
 
-            /// <summary>Set if a directory listing is present after the image</summary>
-            Directory = 0x02
-        }
+    /// <summary>The Sector header that precedes each sector</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SectorHeader
+    {
+        /// <summary>The sector flag (i.e. type)</summary>
+        public readonly SectorFlag flag;
 
-        /// <summary>The Sector header that precedes each sector</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SectorHeader
-        {
-            /// <summary>The sector flag (i.e. type)</summary>
-            public readonly SectorFlag flag;
+        /// <summary>The head this sector belongs to.</summary>
+        public readonly byte head;
 
-            /// <summary>The head this sector belongs to.</summary>
-            public readonly byte head;
+        /// <summary>The sector number within the track. Must be consecutive.</summary>
+        public readonly byte sector;
 
-            /// <summary>The sector number within the track. Must be consecutive.</summary>
-            public readonly byte sector;
+        /// <summary>The cylinder number this sector belongs to.</summary>
+        public readonly byte cylinder;
 
-            /// <summary>The cylinder number this sector belongs to.</summary>
-            public readonly byte cylinder;
+        /// <summary>A simple CRC16 over the data, to detect errors.</summary>
+        public readonly short crc;
+    }
 
-            /// <summary>A simple CRC16 over the data, to detect errors.</summary>
-            public readonly short crc;
-        }
+    enum SectorFlag : byte
+    {
+        /// <summary>A normal sector</summary>
+        Normal = 0x00,
 
-        enum SectorFlag : byte
-        {
-            /// <summary>A normal sector</summary>
-            Normal = 0x00,
+        /// <summary>A bad sector that could not be read</summary>
+        BadSector = 0x01,
 
-            /// <summary>A bad sector that could not be read</summary>
-            BadSector = 0x01,
+        /// <summary>A sector filled with a repeating byte value. The value is encoded in the LSB of the <c>crc</c> field.</summary>
+        RepeatByte = 0x02,
 
-            /// <summary>A sector filled with a repeating byte value. The value is encoded in the LSB of the <c>crc</c> field.</summary>
-            RepeatByte = 0x02,
+        /// <summary>
+        ///     Not a sector but a comment. Must come after all user data. The <c>crc</c> field is the length of the comment
+        ///     data.
+        /// </summary>
+        Comment = 0x03,
 
-            /// <summary>
-            ///     Not a sector but a comment. Must come after all user data. The <c>crc</c> field is the length of the comment
-            ///     data.
-            /// </summary>
-            Comment = 0x03,
-
-            /// <summary>Not a sector but the directory information. The <c>crc</c> field is the length of the data.</summary>
-            Directory = 0x04
-        }
+        /// <summary>Not a sector but the directory information. The <c>crc</c> field is the length of the data.</summary>
+        Directory = 0x04
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/WCDiskImage/Unsupported.cs b/Aaru.Images/WCDiskImage/Unsupported.cs
index 8e3b3cbb6..c41efee51 100644
--- a/Aaru.Images/WCDiskImage/Unsupported.cs
+++ b/Aaru.Images/WCDiskImage/Unsupported.cs
@@ -32,48 +32,47 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class WCDiskImage
 {
-    public sealed partial class WCDiskImage
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
     {
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-            return ErrorNumber.NotSupported;
-        }
+        return ErrorNumber.NotSupported;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/WCDiskImage/WCDiskImage.cs b/Aaru.Images/WCDiskImage/WCDiskImage.cs
index 37fe5e767..c996bbd04 100644
--- a/Aaru.Images/WCDiskImage/WCDiskImage.cs
+++ b/Aaru.Images/WCDiskImage/WCDiskImage.cs
@@ -37,49 +37,48 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+/// <inheritdoc />
+/// <summary>Manages floppy disk images created with d2f by DataPackRat</summary>
+[SuppressMessage("ReSharper", "NotAccessedField.Local"), SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed partial class WCDiskImage : IMediaImage
 {
-    /// <inheritdoc />
+    readonly Dictionary<(int cylinder, int head, int sector), bool> _badSectors =
+        new Dictionary<(int cylinder, int head, int sector), bool>();
+    /// <summary>The file header after the image has been opened</summary>
+    FileHeader _fileHeader;
+    ImageInfo _imageInfo;
+
+    /* the sectors are cached here */
+    readonly Dictionary<(int cylinder, int head, int sector), byte[]> _sectorCache =
+        new Dictionary<(int cylinder, int head, int sector), byte[]>();
+
+    /// <summary>The ImageFilter we're reading from, after the file has been opened</summary>
+    IFilter _wcImageFilter;
+
     /// <summary>Manages floppy disk images created with d2f by DataPackRat</summary>
-    [SuppressMessage("ReSharper", "NotAccessedField.Local"), SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed partial class WCDiskImage : IMediaImage
+    public WCDiskImage() => _imageInfo = new ImageInfo
     {
-        readonly Dictionary<(int cylinder, int head, int sector), bool> _badSectors =
-            new Dictionary<(int cylinder, int head, int sector), bool>();
-        /// <summary>The file header after the image has been opened</summary>
-        FileHeader _fileHeader;
-        ImageInfo _imageInfo;
-
-        /* the sectors are cached here */
-        readonly Dictionary<(int cylinder, int head, int sector), byte[]> _sectorCache =
-            new Dictionary<(int cylinder, int head, int sector), byte[]>();
-
-        /// <summary>The ImageFilter we're reading from, after the file has been opened</summary>
-        IFilter _wcImageFilter;
-
-        /// <summary>Manages floppy disk images created with d2f by DataPackRat</summary>
-        public WCDiskImage() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/ZZZRawImage/Constants.cs b/Aaru.Images/ZZZRawImage/Constants.cs
index 2d37d003c..b8cc93319 100644
--- a/Aaru.Images/ZZZRawImage/Constants.cs
+++ b/Aaru.Images/ZZZRawImage/Constants.cs
@@ -32,40 +32,39 @@
 
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
-{
-    public sealed partial class ZZZRawImage
-    {
-        readonly byte[] _cdSync =
-        {
-            0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
-        };
-        readonly (MediaTagType tag, string name)[] _readWriteSidecars =
-        {
-            (MediaTagType.ATA_IDENTIFY, ".identify.bin"), (MediaTagType.BD_DI, ".di.bin"),
-            (MediaTagType.CD_ATIP, ".atip.bin"), (MediaTagType.CD_FullTOC, ".toc.bin"),
-            (MediaTagType.CD_FirstTrackPregap, ".leadin.bin"), (MediaTagType.CD_PMA, ".pma.bin"),
-            (MediaTagType.CD_TEXT, ".cdtext.bin"), (MediaTagType.DCB, ".dcb.bin"), (MediaTagType.DVD_ADIP, ".adip.bin"),
-            (MediaTagType.DVD_BCA, ".bca.bin"), (MediaTagType.DVD_CMI, ".cmi.bin"), (MediaTagType.DVD_DMI, ".dmi.bin"),
-            (MediaTagType.DVD_MediaIdentifier, ".mid.bin"), (MediaTagType.DVD_PFI, ".pfi.bin"),
-            (MediaTagType.DVDRAM_DDS, ".dds.bin"), (MediaTagType.DVDRAM_SpareArea, ".sai.bin"),
-            (MediaTagType.DVDR_PFI, ".pfir.bin"), (MediaTagType.DVDR_PreRecordedInfo, ".pri.bin"),
-            (MediaTagType.Floppy_LeadOut, ".leadout.bin"), (MediaTagType.HDDVD_CPI, ".cpi.bin"),
-            (MediaTagType.MMC_ExtendedCSD, ".ecsd.bin"), (MediaTagType.PCMCIA_CIS, ".cis.bin"),
-            (MediaTagType.SCSI_INQUIRY, ".inquiry.bin"), (MediaTagType.SCSI_MODEPAGE_2A, ".modepage2a.bin"),
-            (MediaTagType.SCSI_MODESENSE_10, ".modesense10.bin"), (MediaTagType.SCSI_MODESENSE_6, ".modesense.bin"),
-            (MediaTagType.SD_CID, ".cid.bin"), (MediaTagType.SD_CSD, ".csd.bin"), (MediaTagType.SD_OCR, ".ocr.bin"),
-            (MediaTagType.SD_SCR, ".scr.bin"), (MediaTagType.USB_Descriptors, ".usbdescriptors.bin"),
-            (MediaTagType.Xbox_DMI, ".xboxdmi.bin"), (MediaTagType.Xbox_PFI, ".xboxpfi.bin"),
-            (MediaTagType.Xbox_SecuritySector, ".ss.bin")
-        };
+namespace Aaru.DiscImages;
 
-        readonly (MediaTagType tag, string name)[] _writeOnlySidecars =
-        {
-            (MediaTagType.ATAPI_IDENTIFY, ".identify.bin"), (MediaTagType.BD_BCA, ".bca.bin"),
-            (MediaTagType.BD_DDS, ".dds.bin"), (MediaTagType.BD_DI, ".di.bin"), (MediaTagType.BD_SpareArea, ".sai.bin"),
-            (MediaTagType.CD_LeadOut, ".leadout.bin"), (MediaTagType.MMC_CID, ".cid.bin"),
-            (MediaTagType.MMC_CSD, ".csd.bin"), (MediaTagType.MMC_OCR, ".ocr.bin")
-        };
-    }
+public sealed partial class ZZZRawImage
+{
+    readonly byte[] _cdSync =
+    {
+        0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00
+    };
+    readonly (MediaTagType tag, string name)[] _readWriteSidecars =
+    {
+        (MediaTagType.ATA_IDENTIFY, ".identify.bin"), (MediaTagType.BD_DI, ".di.bin"),
+        (MediaTagType.CD_ATIP, ".atip.bin"), (MediaTagType.CD_FullTOC, ".toc.bin"),
+        (MediaTagType.CD_FirstTrackPregap, ".leadin.bin"), (MediaTagType.CD_PMA, ".pma.bin"),
+        (MediaTagType.CD_TEXT, ".cdtext.bin"), (MediaTagType.DCB, ".dcb.bin"), (MediaTagType.DVD_ADIP, ".adip.bin"),
+        (MediaTagType.DVD_BCA, ".bca.bin"), (MediaTagType.DVD_CMI, ".cmi.bin"), (MediaTagType.DVD_DMI, ".dmi.bin"),
+        (MediaTagType.DVD_MediaIdentifier, ".mid.bin"), (MediaTagType.DVD_PFI, ".pfi.bin"),
+        (MediaTagType.DVDRAM_DDS, ".dds.bin"), (MediaTagType.DVDRAM_SpareArea, ".sai.bin"),
+        (MediaTagType.DVDR_PFI, ".pfir.bin"), (MediaTagType.DVDR_PreRecordedInfo, ".pri.bin"),
+        (MediaTagType.Floppy_LeadOut, ".leadout.bin"), (MediaTagType.HDDVD_CPI, ".cpi.bin"),
+        (MediaTagType.MMC_ExtendedCSD, ".ecsd.bin"), (MediaTagType.PCMCIA_CIS, ".cis.bin"),
+        (MediaTagType.SCSI_INQUIRY, ".inquiry.bin"), (MediaTagType.SCSI_MODEPAGE_2A, ".modepage2a.bin"),
+        (MediaTagType.SCSI_MODESENSE_10, ".modesense10.bin"), (MediaTagType.SCSI_MODESENSE_6, ".modesense.bin"),
+        (MediaTagType.SD_CID, ".cid.bin"), (MediaTagType.SD_CSD, ".csd.bin"), (MediaTagType.SD_OCR, ".ocr.bin"),
+        (MediaTagType.SD_SCR, ".scr.bin"), (MediaTagType.USB_Descriptors, ".usbdescriptors.bin"),
+        (MediaTagType.Xbox_DMI, ".xboxdmi.bin"), (MediaTagType.Xbox_PFI, ".xboxpfi.bin"),
+        (MediaTagType.Xbox_SecuritySector, ".ss.bin")
+    };
+
+    readonly (MediaTagType tag, string name)[] _writeOnlySidecars =
+    {
+        (MediaTagType.ATAPI_IDENTIFY, ".identify.bin"), (MediaTagType.BD_BCA, ".bca.bin"),
+        (MediaTagType.BD_DDS, ".dds.bin"), (MediaTagType.BD_DI, ".di.bin"), (MediaTagType.BD_SpareArea, ".sai.bin"),
+        (MediaTagType.CD_LeadOut, ".leadout.bin"), (MediaTagType.MMC_CID, ".cid.bin"),
+        (MediaTagType.MMC_CSD, ".csd.bin"), (MediaTagType.MMC_OCR, ".ocr.bin")
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Images/ZZZRawImage/Helpers.cs b/Aaru.Images/ZZZRawImage/Helpers.cs
index f032d360e..8d5187b02 100644
--- a/Aaru.Images/ZZZRawImage/Helpers.cs
+++ b/Aaru.Images/ZZZRawImage/Helpers.cs
@@ -32,154 +32,153 @@
 
 using Aaru.CommonTypes;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class ZZZRawImage
 {
-    public sealed partial class ZZZRawImage
+    MediaType CalculateDiskType()
     {
-        MediaType CalculateDiskType()
+        if(_imageInfo.SectorSize == 2048)
         {
-            if(_imageInfo.SectorSize == 2048)
-            {
-                if(_imageInfo.Sectors == 58620544)
-                    return MediaType.REV120;
+            if(_imageInfo.Sectors == 58620544)
+                return MediaType.REV120;
 
-                if(_imageInfo.Sectors == 17090880)
-                    return MediaType.REV35;
+            if(_imageInfo.Sectors == 17090880)
+                return MediaType.REV35;
 
-                if(_imageInfo.Sectors <= 360000)
-                    return MediaType.CD;
+            if(_imageInfo.Sectors <= 360000)
+                return MediaType.CD;
 
-                if(_imageInfo.Sectors <= 2295104)
-                    return MediaType.DVDPR;
+            if(_imageInfo.Sectors <= 2295104)
+                return MediaType.DVDPR;
 
-                if(_imageInfo.Sectors <= 2298496)
-                    return MediaType.DVDR;
+            if(_imageInfo.Sectors <= 2298496)
+                return MediaType.DVDR;
 
-                if(_imageInfo.Sectors <= 4171712)
-                    return MediaType.DVDRDL;
+            if(_imageInfo.Sectors <= 4171712)
+                return MediaType.DVDRDL;
 
-                if(_imageInfo.Sectors <= 4173824)
-                    return MediaType.DVDPRDL;
+            if(_imageInfo.Sectors <= 4173824)
+                return MediaType.DVDPRDL;
 
-                if(_imageInfo.Sectors <= 24438784)
-                    return MediaType.BDR;
+            if(_imageInfo.Sectors <= 24438784)
+                return MediaType.BDR;
 
-                return _imageInfo.Sectors <= 62500864 ? MediaType.BDRXL : MediaType.Unknown;
-            }
+            return _imageInfo.Sectors <= 62500864 ? MediaType.BDRXL : MediaType.Unknown;
+        }
 
-            switch(_imageInfo.ImageSize)
-            {
-                case 80384:  return MediaType.ECMA_66;
-                case 81664:  return MediaType.IBM23FD;
-                case 92160:  return MediaType.ATARI_525_SD;
-                case 102400: return MediaType.ACORN_525_SS_SD_40;
-                case 116480: return MediaType.Apple32SS;
-                case 133120: return MediaType.ATARI_525_ED;
-                case 143360: return MediaType.Apple33SS;
-                case 163840:
-                    if(_imageInfo.SectorSize == 256)
-                        return MediaType.ACORN_525_SS_DD_40;
+        switch(_imageInfo.ImageSize)
+        {
+            case 80384:  return MediaType.ECMA_66;
+            case 81664:  return MediaType.IBM23FD;
+            case 92160:  return MediaType.ATARI_525_SD;
+            case 102400: return MediaType.ACORN_525_SS_SD_40;
+            case 116480: return MediaType.Apple32SS;
+            case 133120: return MediaType.ATARI_525_ED;
+            case 143360: return MediaType.Apple33SS;
+            case 163840:
+                if(_imageInfo.SectorSize == 256)
+                    return MediaType.ACORN_525_SS_DD_40;
 
-                    return MediaType.DOS_525_SS_DD_8;
-                case 184320: return MediaType.DOS_525_SS_DD_9;
-                case 204800: return MediaType.ACORN_525_SS_SD_80;
-                case 232960: return MediaType.Apple32DS;
-                case 242944: return MediaType.IBM33FD_128;
-                case 256256: return MediaType.ECMA_54;
-                case 286720: return MediaType.Apple33DS;
-                case 287488: return MediaType.IBM33FD_256;
-                case 306432: return MediaType.IBM33FD_512;
-                case 315392: return MediaType.MetaFloppy_Mod_II;
-                case 322560: return MediaType.Apricot_35;
-                case 325632: return MediaType.ECMA_70;
-                case 327680:
-                    if(_imageInfo.SectorSize == 256)
-                        return MediaType.ACORN_525_SS_DD_80;
+                return MediaType.DOS_525_SS_DD_8;
+            case 184320: return MediaType.DOS_525_SS_DD_9;
+            case 204800: return MediaType.ACORN_525_SS_SD_80;
+            case 232960: return MediaType.Apple32DS;
+            case 242944: return MediaType.IBM33FD_128;
+            case 256256: return MediaType.ECMA_54;
+            case 286720: return MediaType.Apple33DS;
+            case 287488: return MediaType.IBM33FD_256;
+            case 306432: return MediaType.IBM33FD_512;
+            case 315392: return MediaType.MetaFloppy_Mod_II;
+            case 322560: return MediaType.Apricot_35;
+            case 325632: return MediaType.ECMA_70;
+            case 327680:
+                if(_imageInfo.SectorSize == 256)
+                    return MediaType.ACORN_525_SS_DD_80;
 
-                    return MediaType.DOS_525_DS_DD_8;
-                case 368640:
-                    if(_extension == ".st")
-                        return MediaType.DOS_35_SS_DD_9;
+                return MediaType.DOS_525_DS_DD_8;
+            case 368640:
+                if(_extension == ".st")
+                    return MediaType.DOS_35_SS_DD_9;
 
-                    return MediaType.DOS_525_DS_DD_9;
-                case 409600:
-                    if(_extension == ".st")
-                        return MediaType.ATARI_35_SS_DD;
+                return MediaType.DOS_525_DS_DD_9;
+            case 409600:
+                if(_extension == ".st")
+                    return MediaType.ATARI_35_SS_DD;
 
-                    return MediaType.AppleSonySS;
-                case 450560: return MediaType.ATARI_35_SS_DD_11;
-                case 495872: return MediaType.IBM43FD_128;
-                case 512512: return MediaType.ECMA_59;
-                case 653312: return MediaType.ECMA_78;
-                case 655360: return MediaType.ACORN_525_DS_DD;
-                case 737280: return MediaType.DOS_35_DS_DD_9;
-                case 819200:
-                    if(_imageInfo.SectorSize == 256)
-                        return MediaType.CBM_35_DD;
+                return MediaType.AppleSonySS;
+            case 450560: return MediaType.ATARI_35_SS_DD_11;
+            case 495872: return MediaType.IBM43FD_128;
+            case 512512: return MediaType.ECMA_59;
+            case 653312: return MediaType.ECMA_78;
+            case 655360: return MediaType.ACORN_525_DS_DD;
+            case 737280: return MediaType.DOS_35_DS_DD_9;
+            case 819200:
+                if(_imageInfo.SectorSize == 256)
+                    return MediaType.CBM_35_DD;
 
-                    if((_extension == ".adf" || _extension == ".adl") &&
-                       _imageInfo.SectorSize == 1024)
-                        return MediaType.ACORN_35_DS_DD;
+                if((_extension == ".adf" || _extension == ".adl") &&
+                   _imageInfo.SectorSize == 1024)
+                    return MediaType.ACORN_35_DS_DD;
 
-                    if(_extension == ".st")
-                        return MediaType.ATARI_35_DS_DD;
+                if(_extension == ".st")
+                    return MediaType.ATARI_35_DS_DD;
 
-                    return MediaType.AppleSonyDS;
-                case 839680: return MediaType.FDFORMAT_35_DD;
-                case 901120:
-                    if(_extension == ".st")
-                        return MediaType.ATARI_35_DS_DD_11;
+                return MediaType.AppleSonyDS;
+            case 839680: return MediaType.FDFORMAT_35_DD;
+            case 901120:
+                if(_extension == ".st")
+                    return MediaType.ATARI_35_DS_DD_11;
 
-                    return MediaType.CBM_AMIGA_35_DD;
-                case 988416:                                      return MediaType.IBM43FD_256;
-                case 995072:                                      return MediaType.IBM53FD_256;
-                case 1021696:                                     return MediaType.ECMA_99_26;
-                case 1146624:                                     return MediaType.IBM53FD_512;
-                case 1177344:                                     return MediaType.ECMA_99_15;
-                case 1222400:                                     return MediaType.IBM53FD_1024;
-                case 1228800:                                     return MediaType.DOS_525_HD;
-                case 1255168:                                     return MediaType.ECMA_69_8;
-                case 1261568:                                     return MediaType.NEC_525_HD;
-                case 1304320:                                     return MediaType.ECMA_99_8;
-                case 1427456:                                     return MediaType.FDFORMAT_525_HD;
-                case 1474560:                                     return MediaType.DOS_35_HD;
-                case 1638400:                                     return MediaType.ACORN_35_DS_HD;
-                case 1720320:                                     return MediaType.DMF;
-                case 1763328:                                     return MediaType.FDFORMAT_35_HD;
-                case 1802240:                                     return MediaType.CBM_AMIGA_35_HD;
-                case 1880064:                                     return MediaType.XDF_35;
-                case 1884160:                                     return MediaType.XDF_35;
-                case 2949120:                                     return MediaType.DOS_35_ED;
-                case 9338880:                                     return MediaType.NEC_35_TD;
-                case 20818944:                                    return MediaType.Floptical;
-                case 33554432:                                    return MediaType.FD32MB;
-                case 40387584:                                    return MediaType.PocketZip;
-                case 100663296:                                   return MediaType.ZIP100;
-                case 126222336:                                   return MediaType.LS120;
-                case 127398912:                                   return MediaType.ECMA_154;
-                case 201410560:                                   return MediaType.HiFD;
-                case 228518400:                                   return MediaType.ECMA_201;
-                case 240386048:                                   return MediaType.LS240;
-                case 250640384:                                   return MediaType.ZIP250;
-                case 481520640:                                   return MediaType.ECMA_183_512;
-                case 533403648:                                   return MediaType.ECMA_183;
-                case 596787200:                                   return MediaType.ECMA_184_512;
-                case 654540800:                                   return MediaType.ECMA_184;
-                case 656310272 when _imageInfo.SectorSize == 512: return MediaType.PD650;
-                case 664829952 when _imageInfo.SectorSize == 512: return MediaType.PD650;
-                case 1070617600:                                  return MediaType.Jaz;
+                return MediaType.CBM_AMIGA_35_DD;
+            case 988416:                                      return MediaType.IBM43FD_256;
+            case 995072:                                      return MediaType.IBM53FD_256;
+            case 1021696:                                     return MediaType.ECMA_99_26;
+            case 1146624:                                     return MediaType.IBM53FD_512;
+            case 1177344:                                     return MediaType.ECMA_99_15;
+            case 1222400:                                     return MediaType.IBM53FD_1024;
+            case 1228800:                                     return MediaType.DOS_525_HD;
+            case 1255168:                                     return MediaType.ECMA_69_8;
+            case 1261568:                                     return MediaType.NEC_525_HD;
+            case 1304320:                                     return MediaType.ECMA_99_8;
+            case 1427456:                                     return MediaType.FDFORMAT_525_HD;
+            case 1474560:                                     return MediaType.DOS_35_HD;
+            case 1638400:                                     return MediaType.ACORN_35_DS_HD;
+            case 1720320:                                     return MediaType.DMF;
+            case 1763328:                                     return MediaType.FDFORMAT_35_HD;
+            case 1802240:                                     return MediaType.CBM_AMIGA_35_HD;
+            case 1880064:                                     return MediaType.XDF_35;
+            case 1884160:                                     return MediaType.XDF_35;
+            case 2949120:                                     return MediaType.DOS_35_ED;
+            case 9338880:                                     return MediaType.NEC_35_TD;
+            case 20818944:                                    return MediaType.Floptical;
+            case 33554432:                                    return MediaType.FD32MB;
+            case 40387584:                                    return MediaType.PocketZip;
+            case 100663296:                                   return MediaType.ZIP100;
+            case 126222336:                                   return MediaType.LS120;
+            case 127398912:                                   return MediaType.ECMA_154;
+            case 201410560:                                   return MediaType.HiFD;
+            case 228518400:                                   return MediaType.ECMA_201;
+            case 240386048:                                   return MediaType.LS240;
+            case 250640384:                                   return MediaType.ZIP250;
+            case 481520640:                                   return MediaType.ECMA_183_512;
+            case 533403648:                                   return MediaType.ECMA_183;
+            case 596787200:                                   return MediaType.ECMA_184_512;
+            case 654540800:                                   return MediaType.ECMA_184;
+            case 656310272 when _imageInfo.SectorSize == 512: return MediaType.PD650;
+            case 664829952 when _imageInfo.SectorSize == 512: return MediaType.PD650;
+            case 1070617600:                                  return MediaType.Jaz;
 
-                #region Commodore
-                case 174848:
-                case 175531: return MediaType.CBM_1540;
-                case 196608:
-                case 197376: return MediaType.CBM_1540_Ext;
-                case 349696:
-                case 351062: return MediaType.CBM_1571;
-                #endregion Commodore
+            #region Commodore
+            case 174848:
+            case 175531: return MediaType.CBM_1540;
+            case 196608:
+            case 197376: return MediaType.CBM_1540_Ext;
+            case 349696:
+            case 351062: return MediaType.CBM_1571;
+            #endregion Commodore
 
-                default: return MediaType.GENERIC_HDD;
-            }
+            default: return MediaType.GENERIC_HDD;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/ZZZRawImage/Identify.cs b/Aaru.Images/ZZZRawImage/Identify.cs
index 42ac5b708..9b0bb1768 100644
--- a/Aaru.Images/ZZZRawImage/Identify.cs
+++ b/Aaru.Images/ZZZRawImage/Identify.cs
@@ -34,86 +34,85 @@ using System.IO;
 using System.Linq;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class ZZZRawImage
 {
-    public sealed partial class ZZZRawImage
+    /// <inheritdoc />
+    public bool Identify(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public bool Identify(IFilter imageFilter)
+        _extension = Path.GetExtension(imageFilter.Filename)?.ToLower();
+
+        switch(_extension)
         {
-            _extension = Path.GetExtension(imageFilter.Filename)?.ToLower();
-
-            switch(_extension)
-            {
-                case ".1kn":  return imageFilter.DataForkLength % 1024  == 0;
-                case ".2kn":  return imageFilter.DataForkLength % 2048  == 0;
-                case ".4kn":  return imageFilter.DataForkLength % 4096  == 0;
-                case ".8kn":  return imageFilter.DataForkLength % 8192  == 0;
-                case ".16kn": return imageFilter.DataForkLength % 16384 == 0;
-                case ".32kn": return imageFilter.DataForkLength % 32768 == 0;
-                case ".64kn": return imageFilter.DataForkLength % 65536 == 0;
-                case ".512":
-                case ".512e": return imageFilter.DataForkLength % 512 == 0;
-                case ".128": return imageFilter.DataForkLength % 128 == 0;
-                case ".256": return imageFilter.DataForkLength % 256 == 0;
-                case ".2352" when imageFilter.DataForkLength % 2352 == 0 && imageFilter.DataForkLength <= 846720000:
-                case ".2448" when imageFilter.DataForkLength % 2448 == 0 && imageFilter.DataForkLength <= 881280000:
-                    byte[] sync   = new byte[12];
-                    Stream stream = imageFilter.GetDataForkStream();
-                    stream.Position = 0;
-                    stream.Read(sync, 0, 12);
-
-                    return _cdSync.SequenceEqual(sync);
-            }
-
-            // Check if file is not multiple of 512
-            if(imageFilter.DataForkLength % 512 == 0)
-                return true;
-
-            if(_extension                       == ".hdf" &&
-               imageFilter.DataForkLength % 256 == 0)
-                return true;
-
-            // Only for single track data CDs
-            if((imageFilter.DataForkLength % 2352 == 0 && imageFilter.DataForkLength <= 846720000) ||
-               (imageFilter.DataForkLength % 2448 == 0 && imageFilter.DataForkLength <= 881280000))
-            {
+            case ".1kn":  return imageFilter.DataForkLength % 1024  == 0;
+            case ".2kn":  return imageFilter.DataForkLength % 2048  == 0;
+            case ".4kn":  return imageFilter.DataForkLength % 4096  == 0;
+            case ".8kn":  return imageFilter.DataForkLength % 8192  == 0;
+            case ".16kn": return imageFilter.DataForkLength % 16384 == 0;
+            case ".32kn": return imageFilter.DataForkLength % 32768 == 0;
+            case ".64kn": return imageFilter.DataForkLength % 65536 == 0;
+            case ".512":
+            case ".512e": return imageFilter.DataForkLength % 512 == 0;
+            case ".128": return imageFilter.DataForkLength % 128 == 0;
+            case ".256": return imageFilter.DataForkLength % 256 == 0;
+            case ".2352" when imageFilter.DataForkLength % 2352 == 0 && imageFilter.DataForkLength <= 846720000:
+            case ".2448" when imageFilter.DataForkLength % 2448 == 0 && imageFilter.DataForkLength <= 881280000:
                 byte[] sync   = new byte[12];
                 Stream stream = imageFilter.GetDataForkStream();
                 stream.Position = 0;
                 stream.Read(sync, 0, 12);
 
                 return _cdSync.SequenceEqual(sync);
-            }
+        }
 
-            // Check known disk sizes with sectors smaller than 512
-            switch(imageFilter.DataForkLength)
-            {
-                #region Commodore
-                case 174848:
-                case 175531:
-                case 197376:
-                case 351062:
-                case 822400:
-                #endregion Commodore
+        // Check if file is not multiple of 512
+        if(imageFilter.DataForkLength % 512 == 0)
+            return true;
 
-                case 81664:
-                case 116480:
-                case 242944:
-                case 256256:
-                case 287488:
-                case 306432:
-                case 495872:
-                case 988416:
-                case 995072:
-                case 1021696:
-                case 1146624:
-                case 1177344:
-                case 1222400:
-                case 1304320:
-                case 1255168: return true;
-                default: return false;
-            }
+        if(_extension                       == ".hdf" &&
+           imageFilter.DataForkLength % 256 == 0)
+            return true;
+
+        // Only for single track data CDs
+        if((imageFilter.DataForkLength % 2352 == 0 && imageFilter.DataForkLength <= 846720000) ||
+           (imageFilter.DataForkLength % 2448 == 0 && imageFilter.DataForkLength <= 881280000))
+        {
+            byte[] sync   = new byte[12];
+            Stream stream = imageFilter.GetDataForkStream();
+            stream.Position = 0;
+            stream.Read(sync, 0, 12);
+
+            return _cdSync.SequenceEqual(sync);
+        }
+
+        // Check known disk sizes with sectors smaller than 512
+        switch(imageFilter.DataForkLength)
+        {
+            #region Commodore
+            case 174848:
+            case 175531:
+            case 197376:
+            case 351062:
+            case 822400:
+            #endregion Commodore
+
+            case 81664:
+            case 116480:
+            case 242944:
+            case 256256:
+            case 287488:
+            case 306432:
+            case 495872:
+            case 988416:
+            case 995072:
+            case 1021696:
+            case 1146624:
+            case 1177344:
+            case 1222400:
+            case 1304320:
+            case 1255168: return true;
+            default: return false;
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/ZZZRawImage/Properties.cs b/Aaru.Images/ZZZRawImage/Properties.cs
index 62d09f279..8d4b078a0 100644
--- a/Aaru.Images/ZZZRawImage/Properties.cs
+++ b/Aaru.Images/ZZZRawImage/Properties.cs
@@ -39,194 +39,193 @@ using Aaru.CommonTypes.Structs;
 using Schemas;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class ZZZRawImage
 {
-    public sealed partial class ZZZRawImage
+    /// <inheritdoc />
+    public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreDataTracks |
+                                                           OpticalImageCapabilities.CanStoreCookedData;
+    /// <inheritdoc />
+    public string Name => "Raw Disk Image";
+
+    // Non-random UUID to recognize this specific plugin
+    /// <inheritdoc />
+    public Guid Id => new("12345678-AAAA-BBBB-CCCC-123456789000");
+    /// <inheritdoc />
+    public ImageInfo Info => _imageInfo;
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+    /// <inheritdoc />
+    public string Format => "Raw disk image (sector by sector copy)";
+
+    /// <inheritdoc />
+    public List<Track> Tracks
     {
-        /// <inheritdoc />
-        public OpticalImageCapabilities OpticalCapabilities => OpticalImageCapabilities.CanStoreDataTracks |
-                                                               OpticalImageCapabilities.CanStoreCookedData;
-        /// <inheritdoc />
-        public string Name => "Raw Disk Image";
-
-        // Non-random UUID to recognize this specific plugin
-        /// <inheritdoc />
-        public Guid Id => new("12345678-AAAA-BBBB-CCCC-123456789000");
-        /// <inheritdoc />
-        public ImageInfo Info => _imageInfo;
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-        /// <inheritdoc />
-        public string Format => "Raw disk image (sector by sector copy)";
-
-        /// <inheritdoc />
-        public List<Track> Tracks
+        get
         {
-            get
+            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+                return null;
+
+            var trk = new Track
             {
-                if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                    return null;
+                BytesPerSector = _rawCompactDisc ? _mode2
+                                                       ? 2336
+                                                       : 2048 : (int)_imageInfo.SectorSize,
+                EndSector         = _imageInfo.Sectors - 1,
+                File              = _rawImageFilter?.Filename ?? _basePath,
+                FileOffset        = 0,
+                FileType          = "BINARY",
+                RawBytesPerSector = _rawCompactDisc ? 2352 : (int)_imageInfo.SectorSize,
+                Sequence          = 1,
+                StartSector       = 0,
+                SubchannelType    = _hasSubchannel ? TrackSubchannelType.RawInterleaved : TrackSubchannelType.None,
+                Type = _rawCompactDisc ? _mode2
+                                             ? TrackType.CdMode2Formless
+                                             : TrackType.CdMode1 : TrackType.Data,
+                Session = 1
+            };
 
-                var trk = new Track
+            if(_imageInfo.MediaType == MediaType.CD   ||
+               _imageInfo.MediaType == MediaType.CDRW ||
+               _imageInfo.MediaType == MediaType.CDR)
+            {
+                trk.Pregap     = 150;
+                trk.Indexes[0] = -150;
+                trk.Indexes[1] = 0;
+
+                if(trk.Type == TrackType.Data)
+                    trk.Type = TrackType.CdMode1;
+            }
+
+            List<Track> lst = new()
+            {
+                trk
+            };
+
+            return lst;
+        }
+    }
+
+    /// <inheritdoc />
+    public List<Session> Sessions
+    {
+        get
+        {
+            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+                return null;
+
+            var sess = new Session
+            {
+                EndSector   = _imageInfo.Sectors - 1,
+                EndTrack    = 1,
+                Sequence    = 1,
+                StartSector = 0,
+                StartTrack  = 1
+            };
+
+            List<Session> lst = new()
+            {
+                sess
+            };
+
+            return lst;
+        }
+    }
+
+    /// <inheritdoc />
+    public List<Partition> Partitions
+    {
+        get
+        {
+            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+                return null;
+
+            List<Partition> parts = new();
+
+            var part = new Partition
+            {
+                Start    = 0,
+                Length   = _imageInfo.Sectors,
+                Offset   = 0,
+                Sequence = 0,
+                Type = _rawCompactDisc
+                           ? _mode2
+                                 ? "MODE2/2352"
+                                 : "MODE1/2352"
+                           : _imageInfo.MediaType == MediaType.PD650 || _imageInfo.MediaType == MediaType.PD650_WORM
+                               ? "DATA/512"
+                               : "MODE1/2048",
+                Size = _imageInfo.Sectors * _imageInfo.SectorSize
+            };
+
+            parts.Add(part);
+
+            return parts;
+        }
+    }
+
+    /// <inheritdoc />
+    public List<DumpHardwareType> DumpHardware => null;
+    /// <inheritdoc />
+    public CICMMetadataType CicmMetadata { get; private set; }
+    /// <inheritdoc />
+    public IEnumerable<MediaTagType> SupportedMediaTags => _readWriteSidecars.Concat(_writeOnlySidecars).
+                                                                              OrderBy(t => t.tag).Select(t => t.tag).ToArray();
+
+    /// <inheritdoc />
+    public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
+        {};
+
+    /// <inheritdoc />
+    public IEnumerable<MediaType> SupportedMediaTypes
+    {
+        get
+        {
+            List<MediaType> types = new();
+
+            foreach(MediaType type in Enum.GetValues(typeof(MediaType)))
+                switch(type)
                 {
-                    BytesPerSector = _rawCompactDisc ? _mode2
-                                                           ? 2336
-                                                           : 2048 : (int)_imageInfo.SectorSize,
-                    EndSector         = _imageInfo.Sectors - 1,
-                    File              = _rawImageFilter?.Filename ?? _basePath,
-                    FileOffset        = 0,
-                    FileType          = "BINARY",
-                    RawBytesPerSector = _rawCompactDisc ? 2352 : (int)_imageInfo.SectorSize,
-                    Sequence          = 1,
-                    StartSector       = 0,
-                    SubchannelType    = _hasSubchannel ? TrackSubchannelType.RawInterleaved : TrackSubchannelType.None,
-                    Type = _rawCompactDisc ? _mode2
-                                                 ? TrackType.CdMode2Formless
-                                                 : TrackType.CdMode1 : TrackType.Data,
-                    Session = 1
-                };
+                    // TODO: Implement support for writing formats with different track 0 bytes per sector
+                    case MediaType.IBM33FD_256:
+                    case MediaType.IBM33FD_512:
+                    case MediaType.IBM43FD_128:
+                    case MediaType.IBM43FD_256:
+                    case MediaType.IBM53FD_256:
+                    case MediaType.IBM53FD_512:
+                    case MediaType.IBM53FD_1024:
+                    case MediaType.ECMA_99_8:
+                    case MediaType.ECMA_99_15:
+                    case MediaType.ECMA_99_26:
+                    case MediaType.ECMA_66:
+                    case MediaType.ECMA_69_8:
+                    case MediaType.ECMA_69_15:
+                    case MediaType.ECMA_69_26:
+                    case MediaType.ECMA_70:
+                    case MediaType.ECMA_78: continue;
+                    default:
+                        types.Add(type);
 
-                if(_imageInfo.MediaType == MediaType.CD   ||
-                   _imageInfo.MediaType == MediaType.CDRW ||
-                   _imageInfo.MediaType == MediaType.CDR)
-                {
-                    trk.Pregap     = 150;
-                    trk.Indexes[0] = -150;
-                    trk.Indexes[1] = 0;
-
-                    if(trk.Type == TrackType.Data)
-                        trk.Type = TrackType.CdMode1;
+                        break;
                 }
 
-                List<Track> lst = new()
-                {
-                    trk
-                };
-
-                return lst;
-            }
+            return types;
         }
-
-        /// <inheritdoc />
-        public List<Session> Sessions
-        {
-            get
-            {
-                if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                    return null;
-
-                var sess = new Session
-                {
-                    EndSector   = _imageInfo.Sectors - 1,
-                    EndTrack    = 1,
-                    Sequence    = 1,
-                    StartSector = 0,
-                    StartTrack  = 1
-                };
-
-                List<Session> lst = new()
-                {
-                    sess
-                };
-
-                return lst;
-            }
-        }
-
-        /// <inheritdoc />
-        public List<Partition> Partitions
-        {
-            get
-            {
-                if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                    return null;
-
-                List<Partition> parts = new();
-
-                var part = new Partition
-                {
-                    Start    = 0,
-                    Length   = _imageInfo.Sectors,
-                    Offset   = 0,
-                    Sequence = 0,
-                    Type = _rawCompactDisc
-                               ? _mode2
-                                     ? "MODE2/2352"
-                                     : "MODE1/2352"
-                               : _imageInfo.MediaType == MediaType.PD650 || _imageInfo.MediaType == MediaType.PD650_WORM
-                                   ? "DATA/512"
-                                   : "MODE1/2048",
-                    Size = _imageInfo.Sectors * _imageInfo.SectorSize
-                };
-
-                parts.Add(part);
-
-                return parts;
-            }
-        }
-
-        /// <inheritdoc />
-        public List<DumpHardwareType> DumpHardware => null;
-        /// <inheritdoc />
-        public CICMMetadataType CicmMetadata { get; private set; }
-        /// <inheritdoc />
-        public IEnumerable<MediaTagType> SupportedMediaTags => _readWriteSidecars.Concat(_writeOnlySidecars).
-            OrderBy(t => t.tag).Select(t => t.tag).ToArray();
-
-        /// <inheritdoc />
-        public IEnumerable<SectorTagType> SupportedSectorTags => new SectorTagType[]
-            {};
-
-        /// <inheritdoc />
-        public IEnumerable<MediaType> SupportedMediaTypes
-        {
-            get
-            {
-                List<MediaType> types = new();
-
-                foreach(MediaType type in Enum.GetValues(typeof(MediaType)))
-                    switch(type)
-                    {
-                        // TODO: Implement support for writing formats with different track 0 bytes per sector
-                        case MediaType.IBM33FD_256:
-                        case MediaType.IBM33FD_512:
-                        case MediaType.IBM43FD_128:
-                        case MediaType.IBM43FD_256:
-                        case MediaType.IBM53FD_256:
-                        case MediaType.IBM53FD_512:
-                        case MediaType.IBM53FD_1024:
-                        case MediaType.ECMA_99_8:
-                        case MediaType.ECMA_99_15:
-                        case MediaType.ECMA_99_26:
-                        case MediaType.ECMA_66:
-                        case MediaType.ECMA_69_8:
-                        case MediaType.ECMA_69_15:
-                        case MediaType.ECMA_69_26:
-                        case MediaType.ECMA_70:
-                        case MediaType.ECMA_78: continue;
-                        default:
-                            types.Add(type);
-
-                            break;
-                    }
-
-                return types;
-            }
-        }
-
-        /// <inheritdoc />
-        public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
-            new (string name, Type type, string description, object @default)[]
-                {};
-        /// <inheritdoc />
-        public IEnumerable<string> KnownExtensions => new[]
-        {
-            ".adf", ".adl", ".d81", ".dsk", ".hdf", ".ima", ".img", ".iso", ".ssd", ".st", ".1kn", ".2kn", ".4kn",
-            ".8kn", ".16kn", ".32kn", ".64kn", ".512e", ".512", ".128", ".256"
-        };
-        /// <inheritdoc />
-        public bool IsWriting { get; private set; }
-        /// <inheritdoc />
-        public string ErrorMessage { get; private set; }
     }
+
+    /// <inheritdoc />
+    public IEnumerable<(string name, Type type, string description, object @default)> SupportedOptions =>
+        new (string name, Type type, string description, object @default)[]
+            {};
+    /// <inheritdoc />
+    public IEnumerable<string> KnownExtensions => new[]
+    {
+        ".adf", ".adl", ".d81", ".dsk", ".hdf", ".ima", ".img", ".iso", ".ssd", ".st", ".1kn", ".2kn", ".4kn",
+        ".8kn", ".16kn", ".32kn", ".64kn", ".512e", ".512", ".128", ".256"
+    };
+    /// <inheritdoc />
+    public bool IsWriting { get; private set; }
+    /// <inheritdoc />
+    public string ErrorMessage { get; private set; }
 }
\ No newline at end of file
diff --git a/Aaru.Images/ZZZRawImage/Read.cs b/Aaru.Images/ZZZRawImage/Read.cs
index bbf95892c..4595b4e1e 100644
--- a/Aaru.Images/ZZZRawImage/Read.cs
+++ b/Aaru.Images/ZZZRawImage/Read.cs
@@ -52,1580 +52,1579 @@ using Inquiry = Aaru.CommonTypes.Structs.Devices.SCSI.Inquiry;
 using Session = Aaru.CommonTypes.Structs.Session;
 using TrackType = Aaru.CommonTypes.Enums.TrackType;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class ZZZRawImage
 {
-    public sealed partial class ZZZRawImage
+    /// <inheritdoc />
+    public ErrorNumber Open(IFilter imageFilter)
     {
-        /// <inheritdoc />
-        public ErrorNumber Open(IFilter imageFilter)
+        Stream stream = imageFilter.GetDataForkStream();
+        stream.Seek(0, SeekOrigin.Begin);
+
+        _extension = Path.GetExtension(imageFilter.Filename)?.ToLower();
+
+        switch(_extension)
         {
-            Stream stream = imageFilter.GetDataForkStream();
-            stream.Seek(0, SeekOrigin.Begin);
+            case ".1kn":
+                _imageInfo.SectorSize = 1024;
 
-            _extension = Path.GetExtension(imageFilter.Filename)?.ToLower();
+                break;
+            case ".2kn":
+                _imageInfo.SectorSize = 2048;
 
-            switch(_extension)
-            {
-                case ".1kn":
+                break;
+            case ".4kn":
+                _imageInfo.SectorSize = 4096;
+
+                break;
+            case ".8kn":
+                _imageInfo.SectorSize = 8192;
+
+                break;
+            case ".16kn":
+                _imageInfo.SectorSize = 16384;
+
+                break;
+            case ".32kn":
+                _imageInfo.SectorSize = 32768;
+
+                break;
+            case ".64kn":
+                _imageInfo.SectorSize = 65536;
+
+                break;
+            case ".512":
+            case ".512e":
+                _imageInfo.SectorSize = 512;
+
+                break;
+            case ".128":
+                _imageInfo.SectorSize = 128;
+
+                break;
+            case ".256":
+                _imageInfo.SectorSize = 256;
+
+                break;
+            case ".2352":
+                _imageInfo.SectorSize = 2352;
+
+                break;
+            case ".2448":
+                _imageInfo.SectorSize = 2448;
+
+                break;
+
+            case ".iso" when imageFilter.DataForkLength % 2048 == 0:
+                _imageInfo.SectorSize = 2048;
+
+                break;
+            case ".toast" when imageFilter.DataForkLength % 2048 == 0:
+                _imageInfo.SectorSize = 2048;
+
+                break;
+            case ".toast" when imageFilter.DataForkLength % 2336 == 0:
+                _imageInfo.SectorSize = 2336;
+
+                break;
+            case ".toast" when imageFilter.DataForkLength % 2352 == 0:
+                _imageInfo.SectorSize = 2352;
+
+                break;
+            case ".d81" when imageFilter.DataForkLength == 819200:
+                _imageInfo.SectorSize = 256;
+
+                break;
+            default:
+                if((_extension == ".adf" || _extension == ".adl" || _extension == ".ssd" || _extension == ".dsd") &&
+                   (imageFilter.DataForkLength == 163840 || imageFilter.DataForkLength == 327680 ||
+                    imageFilter.DataForkLength == 655360))
+                    _imageInfo.SectorSize = 256;
+                else if((_extension == ".adf" || _extension == ".adl") &&
+                        imageFilter.DataForkLength == 819200)
                     _imageInfo.SectorSize = 1024;
+                else
+                    switch(imageFilter.DataForkLength)
+                    {
+                        case 242944:
+                        case 256256:
+                        case 495872:
+                        case 92160:
+                        case 133120:
+                            _imageInfo.SectorSize = 128;
+
+                            break;
+                        case 116480:
+                        case 287488:  // T0S0 = 128bps
+                        case 988416:  // T0S0 = 128bps
+                        case 995072:  // T0S0 = 128bps, T0S1 = 256bps
+                        case 1021696: // T0S0 = 128bps, T0S1 = 256bps
+                        case 232960:
+                        case 143360:
+                        case 286720:
+                        case 512512:
+                        case 102400:
+                        case 204800:
+                        case 655360:
+                        case 80384:  // T0S0 = 128bps
+                        case 325632: // T0S0 = 128bps, T0S1 = 256bps
+                        case 653312: // T0S0 = 128bps, T0S1 = 256bps
+
+                        #region Commodore
+                        case 174848:
+                        case 175531:
+                        case 196608:
+                        case 197376:
+                        case 349696:
+                        case 351062:
+                        case 822400:
+                            #endregion Commodore
+
+                            _imageInfo.SectorSize = 256;
+
+                            break;
+                        case 81664:
+                            _imageInfo.SectorSize = 319;
+
+                            break;
+                        case 306432:  // T0S0 = 128bps
+                        case 1146624: // T0S0 = 128bps, T0S1 = 256bps
+                        case 1177344: // T0S0 = 128bps, T0S1 = 256bps
+                            _imageInfo.SectorSize = 512;
+
+                            break;
+                        case 1222400: // T0S0 = 128bps, T0S1 = 256bps
+                        case 1304320: // T0S0 = 128bps, T0S1 = 256bps
+                        case 1255168: // T0S0 = 128bps, T0S1 = 256bps
+                        case 1261568:
+                        case 1638400:
+                            _imageInfo.SectorSize = 1024;
+
+                            break;
+                        case 35002122240:
+                            _imageInfo.SectorSize = 2048;
+
+                            break;
+                        default:
+                            _imageInfo.SectorSize = 512;
+
+                            break;
+                    }
+
+                break;
+        }
+
+        _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
+        _imageInfo.CreationTime         = imageFilter.CreationTime;
+        _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
+        _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
+        _differentTrackZeroSize         = false;
+        _rawImageFilter                 = imageFilter;
+
+        switch(imageFilter.DataForkLength)
+        {
+            case 242944:
+                _imageInfo.Sectors = 1898;
+
+                break;
+            case 256256:
+                _imageInfo.Sectors = 2002;
+
+                break;
+            case 495872:
+                _imageInfo.Sectors = 3874;
+
+                break;
+            case 116480:
+                _imageInfo.Sectors = 455;
+
+                break;
+            case 287488: // T0S0 = 128bps
+                _imageInfo.Sectors      = 1136;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 988416: // T0S0 = 128bps
+                _imageInfo.Sectors      = 3874;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 995072: // T0S0 = 128bps, T0S1 = 256bps
+                _imageInfo.Sectors      = 3900;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 1021696: // T0S0 = 128bps, T0S1 = 256bps
+                _imageInfo.Sectors      = 4004;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 81664:
+                _imageInfo.Sectors = 256;
+
+                break;
+            case 306432: // T0S0 = 128bps
+                _imageInfo.Sectors      = 618;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 1146624: // T0S0 = 128bps, T0S1 = 256bps
+                _imageInfo.Sectors      = 2272;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 1177344: // T0S0 = 128bps, T0S1 = 256bps
+                _imageInfo.Sectors      = 2332;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 1222400: // T0S0 = 128bps, T0S1 = 256bps
+                _imageInfo.Sectors      = 1236;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 1304320: // T0S0 = 128bps, T0S1 = 256bps
+                _imageInfo.Sectors      = 1316;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 1255168: // T0S0 = 128bps, T0S1 = 256bps
+                _imageInfo.Sectors      = 1268;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 80384: // T0S0 = 128bps
+                _imageInfo.Sectors      = 322;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 325632: // T0S0 = 128bps, T0S1 = 256bps
+                _imageInfo.Sectors      = 1280;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 653312: // T0S0 = 128bps, T0S1 = 256bps
+                _imageInfo.Sectors      = 2560;
+                _differentTrackZeroSize = true;
+
+                break;
+            case 1880064: // IBM XDF, 3,5", real number of sectors
+                _imageInfo.Sectors      = 670;
+                _imageInfo.SectorSize   = 8192; // Biggest sector size
+                _differentTrackZeroSize = true;
+
+                break;
+            case 175531:
+                _imageInfo.Sectors = 683;
+
+                break;
+            case 197375:
+                _imageInfo.Sectors = 768;
+
+                break;
+            case 351062:
+                _imageInfo.Sectors = 1366;
+
+                break;
+            case 822400:
+                _imageInfo.Sectors = 3200;
+
+                break;
+            default:
+                _imageInfo.Sectors = _imageInfo.ImageSize / _imageInfo.SectorSize;
+
+                break;
+        }
+
+        _imageInfo.MediaType = CalculateDiskType();
+
+        if(_imageInfo.ImageSize % 2352 == 0 ||
+           _imageInfo.ImageSize % 2448 == 0)
+        {
+            byte[] sync   = new byte[12];
+            byte[] header = new byte[4];
+            stream.Seek(0, SeekOrigin.Begin);
+            stream.Read(sync, 0, 12);
+            stream.Read(header, 0, 4);
+
+            if(_cdSync.SequenceEqual(sync))
+            {
+                _rawCompactDisc       = true;
+                _hasSubchannel        = _imageInfo.ImageSize % 2448 == 0;
+                _imageInfo.Sectors    = _imageInfo.ImageSize / (ulong)(_hasSubchannel ? 2448 : 2352);
+                _imageInfo.MediaType  = MediaType.CD;
+                _mode2                = header[3] == 0x02;
+                _imageInfo.SectorSize = (uint)(_mode2 ? 2336 : 2048);
+            }
+        }
+
+        // Sharp X68000 SASI hard disks
+        if(_extension == ".hdf")
+            if(_imageInfo.ImageSize % 256 == 0)
+            {
+                _imageInfo.SectorSize = 256;
+                _imageInfo.Sectors    = _imageInfo.ImageSize / _imageInfo.SectorSize;
+                _imageInfo.MediaType  = MediaType.GENERIC_HDD;
+            }
+
+        // Search for known tags
+        string basename = imageFilter.BasePath;
+        basename = basename.Substring(0, basename.Length - _extension.Length);
+
+        _mediaTags = new Dictionary<MediaTagType, byte[]>();
+
+        foreach((MediaTagType tag, string name) sidecar in _readWriteSidecars)
+            try
+            {
+                var     filters = new FiltersList();
+                IFilter filter  = filters.GetFilter(basename + sidecar.name);
+
+                if(filter is null)
+                    continue;
+
+                AaruConsole.DebugWriteLine("ZZZRawImage Plugin", "Found media tag {0}", sidecar.tag);
+                byte[] data = new byte[filter.DataForkLength];
+                filter.GetDataForkStream().Read(data, 0, data.Length);
+                _mediaTags.Add(sidecar.tag, data);
+            }
+            catch(IOException) {}
+
+        // If there are INQUIRY and IDENTIFY tags, it's ATAPI
+        if(_mediaTags.ContainsKey(MediaTagType.SCSI_INQUIRY))
+            if(_mediaTags.TryGetValue(MediaTagType.ATA_IDENTIFY, out byte[] tag))
+            {
+                _mediaTags.Remove(MediaTagType.ATA_IDENTIFY);
+                _mediaTags.Add(MediaTagType.ATAPI_IDENTIFY, tag);
+            }
+
+        // It is a blu-ray
+        if(_mediaTags.ContainsKey(MediaTagType.BD_DI))
+        {
+            _imageInfo.MediaType = MediaType.BDROM;
+
+            if(_mediaTags.TryGetValue(MediaTagType.DVD_BCA, out byte[] bca))
+            {
+                _mediaTags.Remove(MediaTagType.DVD_BCA);
+                _mediaTags.Add(MediaTagType.BD_BCA, bca);
+            }
+
+            if(_mediaTags.TryGetValue(MediaTagType.DVDRAM_DDS, out byte[] dds))
+            {
+                _imageInfo.MediaType = MediaType.BDRE;
+                _mediaTags.Remove(MediaTagType.DVDRAM_DDS);
+                _mediaTags.Add(MediaTagType.BD_DDS, dds);
+            }
+
+            if(_mediaTags.TryGetValue(MediaTagType.DVDRAM_SpareArea, out byte[] sai))
+            {
+                _imageInfo.MediaType = MediaType.BDRE;
+                _mediaTags.Remove(MediaTagType.DVDRAM_SpareArea);
+                _mediaTags.Add(MediaTagType.BD_SpareArea, sai);
+            }
+        }
+
+        // It is a DVD
+        if(_mediaTags.TryGetValue(MediaTagType.DVD_PFI, out byte[] pfi))
+        {
+            PFI.PhysicalFormatInformation decPfi = PFI.Decode(pfi, _imageInfo.MediaType).Value;
+
+            switch(decPfi.DiskCategory)
+            {
+                case DiskCategory.DVDPR:
+                    _imageInfo.MediaType = MediaType.DVDPR;
 
                     break;
-                case ".2kn":
-                    _imageInfo.SectorSize = 2048;
+                case DiskCategory.DVDPRDL:
+                    _imageInfo.MediaType = MediaType.DVDPRDL;
 
                     break;
-                case ".4kn":
-                    _imageInfo.SectorSize = 4096;
+                case DiskCategory.DVDPRW:
+                    _imageInfo.MediaType = MediaType.DVDPRW;
 
                     break;
-                case ".8kn":
-                    _imageInfo.SectorSize = 8192;
+                case DiskCategory.DVDPRWDL:
+                    _imageInfo.MediaType = MediaType.DVDPRWDL;
 
                     break;
-                case ".16kn":
-                    _imageInfo.SectorSize = 16384;
+                case DiskCategory.DVDR:
+                    _imageInfo.MediaType = decPfi.PartVersion >= 6 ? MediaType.DVDRDL : MediaType.DVDR;
 
                     break;
-                case ".32kn":
-                    _imageInfo.SectorSize = 32768;
-
-                    break;
-                case ".64kn":
-                    _imageInfo.SectorSize = 65536;
-
-                    break;
-                case ".512":
-                case ".512e":
-                    _imageInfo.SectorSize = 512;
-
-                    break;
-                case ".128":
-                    _imageInfo.SectorSize = 128;
-
-                    break;
-                case ".256":
-                    _imageInfo.SectorSize = 256;
-
-                    break;
-                case ".2352":
-                    _imageInfo.SectorSize = 2352;
-
-                    break;
-                case ".2448":
-                    _imageInfo.SectorSize = 2448;
-
-                    break;
-
-                case ".iso" when imageFilter.DataForkLength % 2048 == 0:
-                    _imageInfo.SectorSize = 2048;
-
-                    break;
-                case ".toast" when imageFilter.DataForkLength % 2048 == 0:
-                    _imageInfo.SectorSize = 2048;
-
-                    break;
-                case ".toast" when imageFilter.DataForkLength % 2336 == 0:
-                    _imageInfo.SectorSize = 2336;
-
-                    break;
-                case ".toast" when imageFilter.DataForkLength % 2352 == 0:
-                    _imageInfo.SectorSize = 2352;
-
-                    break;
-                case ".d81" when imageFilter.DataForkLength == 819200:
-                    _imageInfo.SectorSize = 256;
+                case DiskCategory.DVDRAM:
+                    _imageInfo.MediaType = MediaType.DVDRAM;
 
                     break;
                 default:
-                    if((_extension == ".adf" || _extension == ".adl" || _extension == ".ssd" || _extension == ".dsd") &&
-                       (imageFilter.DataForkLength == 163840 || imageFilter.DataForkLength == 327680 ||
-                        imageFilter.DataForkLength == 655360))
-                        _imageInfo.SectorSize = 256;
-                    else if((_extension == ".adf" || _extension == ".adl") &&
-                            imageFilter.DataForkLength == 819200)
-                        _imageInfo.SectorSize = 1024;
-                    else
-                        switch(imageFilter.DataForkLength)
+                    _imageInfo.MediaType = MediaType.DVDROM;
+
+                    break;
+                case DiskCategory.DVDRW:
+                    _imageInfo.MediaType = decPfi.PartVersion >= 15 ? MediaType.DVDRWDL : MediaType.DVDRW;
+
+                    break;
+                case DiskCategory.HDDVDR:
+                    _imageInfo.MediaType = MediaType.HDDVDR;
+
+                    break;
+                case DiskCategory.HDDVDRAM:
+                    _imageInfo.MediaType = MediaType.HDDVDRAM;
+
+                    break;
+                case DiskCategory.HDDVDROM:
+                    _imageInfo.MediaType = MediaType.HDDVDROM;
+
+                    break;
+                case DiskCategory.HDDVDRW:
+                    _imageInfo.MediaType = MediaType.HDDVDRW;
+
+                    break;
+                case DiskCategory.Nintendo:
+                    _imageInfo.MediaType = decPfi.DiscSize == DVDSize.Eighty ? MediaType.GOD : MediaType.WOD;
+
+                    break;
+                case DiskCategory.UMD:
+                    _imageInfo.MediaType = MediaType.UMD;
+
+                    break;
+            }
+
+            if((_imageInfo.MediaType == MediaType.DVDR || _imageInfo.MediaType == MediaType.DVDRW ||
+                _imageInfo.MediaType == MediaType.HDDVDR) &&
+               _mediaTags.TryGetValue(MediaTagType.DVD_MediaIdentifier, out byte[] mid))
+            {
+                _mediaTags.Remove(MediaTagType.DVD_MediaIdentifier);
+                _mediaTags.Add(MediaTagType.DVDR_MediaIdentifier, mid);
+            }
+
+            // Check for Xbox
+            if(_mediaTags.TryGetValue(MediaTagType.DVD_DMI, out byte[] dmi))
+                if(DMI.IsXbox(dmi) ||
+                   DMI.IsXbox360(dmi))
+                    if(DMI.IsXbox(dmi))
+                    {
+                        _imageInfo.MediaType = MediaType.XGD;
+                    }
+                    else if(DMI.IsXbox360(dmi))
+                    {
+                        _imageInfo.MediaType = MediaType.XGD2;
+
+                        // All XGD3 all have the same number of blocks
+                        if(_imageInfo.Sectors == 25063   || // Locked (or non compatible drive)
+                           _imageInfo.Sectors == 4229664 || // Xtreme unlock
+                           _imageInfo.Sectors == 4246304)   // Wxripper unlock
+                            _imageInfo.MediaType = MediaType.XGD3;
+                    }
+        }
+
+        // It's MultiMediaCard or SecureDigital
+        if(_mediaTags.ContainsKey(MediaTagType.SD_CID) ||
+           _mediaTags.ContainsKey(MediaTagType.SD_CSD) ||
+           _mediaTags.ContainsKey(MediaTagType.SD_OCR))
+        {
+            _imageInfo.MediaType = MediaType.SecureDigital;
+
+            if(_mediaTags.ContainsKey(MediaTagType.MMC_ExtendedCSD) ||
+               !_mediaTags.ContainsKey(MediaTagType.SD_SCR))
+            {
+                _imageInfo.MediaType = MediaType.MMC;
+
+                if(_mediaTags.TryGetValue(MediaTagType.SD_CID, out byte[] cid))
+                {
+                    _mediaTags.Remove(MediaTagType.SD_CID);
+                    _mediaTags.Add(MediaTagType.MMC_CID, cid);
+                }
+
+                if(_mediaTags.TryGetValue(MediaTagType.SD_CSD, out byte[] csd))
+                {
+                    _mediaTags.Remove(MediaTagType.SD_CSD);
+                    _mediaTags.Add(MediaTagType.MMC_CSD, csd);
+                }
+
+                if(_mediaTags.TryGetValue(MediaTagType.SD_OCR, out byte[] ocr))
+                {
+                    _mediaTags.Remove(MediaTagType.SD_OCR);
+                    _mediaTags.Add(MediaTagType.MMC_OCR, ocr);
+                }
+            }
+        }
+
+        // It's a compact disc
+        if(_mediaTags.ContainsKey(MediaTagType.CD_FullTOC))
+        {
+            _imageInfo.MediaType = _imageInfo.Sectors > 360000 ? MediaType.DDCD : MediaType.CD;
+
+            // Only CD-R and CD-RW have ATIP
+            if(_mediaTags.TryGetValue(MediaTagType.CD_ATIP, out byte[] atipBuf))
+            {
+                ATIP.CDATIP atip = ATIP.Decode(atipBuf);
+
+                if(atip != null)
+                    _imageInfo.MediaType = atip.DiscType ? MediaType.CDRW : MediaType.CDR;
+            }
+
+            if(_mediaTags.TryGetValue(MediaTagType.Floppy_LeadOut, out byte[] leadout))
+            {
+                _mediaTags.Remove(MediaTagType.Floppy_LeadOut);
+                _mediaTags.Add(MediaTagType.CD_LeadOut, leadout);
+            }
+        }
+
+        switch(_imageInfo.MediaType)
+        {
+            case MediaType.ACORN_35_DS_DD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 5;
+
+                break;
+            case MediaType.ACORN_35_DS_HD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.ACORN_525_DS_DD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.ACORN_525_SS_DD_40:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.ACORN_525_SS_DD_80:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.ACORN_525_SS_SD_40:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.ACORN_525_SS_SD_80:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.Apple32DS:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 13;
+
+                break;
+            case MediaType.Apple32SS:
+                _imageInfo.Cylinders       = 36;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 13;
+
+                break;
+            case MediaType.Apple33DS:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.Apple33SS:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.AppleSonyDS:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.AppleSonySS:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.ATARI_35_DS_DD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.ATARI_35_DS_DD_11:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 11;
+
+                break;
+            case MediaType.ATARI_35_SS_DD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.ATARI_35_SS_DD_11:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 11;
+
+                break;
+            case MediaType.ATARI_525_ED:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 26;
+
+                break;
+            case MediaType.ATARI_525_SD:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 18;
+
+                break;
+            case MediaType.CBM_35_DD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.CBM_AMIGA_35_DD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 11;
+
+                break;
+            case MediaType.CBM_AMIGA_35_HD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 22;
+
+                break;
+            case MediaType.DMF:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 21;
+
+                break;
+            case MediaType.DOS_35_DS_DD_9:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case MediaType.Apricot_35:
+                _imageInfo.Cylinders       = 70;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case MediaType.DOS_35_ED:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 36;
+
+                break;
+            case MediaType.DOS_35_HD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 18;
+
+                break;
+            case MediaType.DOS_35_SS_DD_9:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case MediaType.DOS_525_DS_DD_8:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case MediaType.DOS_525_DS_DD_9:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case MediaType.DOS_525_HD:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 15;
+
+                break;
+            case MediaType.DOS_525_SS_DD_8:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case MediaType.DOS_525_SS_DD_9:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case MediaType.ECMA_54:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 26;
+
+                break;
+            case MediaType.ECMA_59:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 26;
+
+                break;
+            case MediaType.ECMA_66:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 9;
+
+                break;
+            case MediaType.ECMA_69_8:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case MediaType.ECMA_70:
+                _imageInfo.Cylinders       = 40;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.ECMA_78:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.ECMA_99_15:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 15;
+
+                break;
+            case MediaType.ECMA_99_26:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 26;
+
+                break;
+            case MediaType.ECMA_99_8:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case MediaType.FDFORMAT_35_DD:
+                _imageInfo.Cylinders       = 82;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 10;
+
+                break;
+            case MediaType.FDFORMAT_35_HD:
+                _imageInfo.Cylinders       = 82;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 21;
+
+                break;
+            case MediaType.FDFORMAT_525_HD:
+                _imageInfo.Cylinders       = 82;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 17;
+
+                break;
+            case MediaType.IBM23FD:
+                _imageInfo.Cylinders       = 32;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case MediaType.IBM33FD_128:
+                _imageInfo.Cylinders       = 73;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 26;
+
+                break;
+            case MediaType.IBM33FD_256:
+                _imageInfo.Cylinders       = 74;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 15;
+
+                break;
+            case MediaType.IBM33FD_512:
+                _imageInfo.Cylinders       = 74;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case MediaType.IBM43FD_128:
+                _imageInfo.Cylinders       = 74;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 26;
+
+                break;
+            case MediaType.IBM43FD_256:
+                _imageInfo.Cylinders       = 74;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 15;
+
+                break;
+            case MediaType.IBM53FD_1024:
+                _imageInfo.Cylinders       = 74;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case MediaType.IBM53FD_256:
+                _imageInfo.Cylinders       = 74;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 26;
+
+                break;
+            case MediaType.IBM53FD_512:
+                _imageInfo.Cylinders       = 74;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 15;
+
+                break;
+            case MediaType.NEC_35_TD:
+                _imageInfo.Cylinders       = 240;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 38;
+
+                break;
+            case MediaType.NEC_525_HD:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 8;
+
+                break;
+            case MediaType.XDF_35:
+                _imageInfo.Cylinders       = 80;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 23;
+
+                break;
+
+            // Following ones are what the device itself report, not the physical geometry
+            case MediaType.Jaz:
+                _imageInfo.Cylinders       = 1021;
+                _imageInfo.Heads           = 64;
+                _imageInfo.SectorsPerTrack = 32;
+
+                break;
+            case MediaType.PocketZip:
+                _imageInfo.Cylinders       = 154;
+                _imageInfo.Heads           = 16;
+                _imageInfo.SectorsPerTrack = 32;
+
+                break;
+            case MediaType.LS120:
+                _imageInfo.Cylinders       = 963;
+                _imageInfo.Heads           = 8;
+                _imageInfo.SectorsPerTrack = 32;
+
+                break;
+            case MediaType.LS240:
+                _imageInfo.Cylinders       = 262;
+                _imageInfo.Heads           = 32;
+                _imageInfo.SectorsPerTrack = 56;
+
+                break;
+            case MediaType.FD32MB:
+                _imageInfo.Cylinders       = 1024;
+                _imageInfo.Heads           = 2;
+                _imageInfo.SectorsPerTrack = 32;
+
+                break;
+            case MediaType.ZIP100:
+                _imageInfo.Cylinders       = 96;
+                _imageInfo.Heads           = 64;
+                _imageInfo.SectorsPerTrack = 32;
+
+                break;
+            case MediaType.ZIP250:
+                _imageInfo.Cylinders       = 239;
+                _imageInfo.Heads           = 64;
+                _imageInfo.SectorsPerTrack = 32;
+
+                break;
+            case MediaType.MetaFloppy_Mod_I:
+                _imageInfo.Cylinders       = 35;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            case MediaType.MetaFloppy_Mod_II:
+                _imageInfo.Cylinders       = 77;
+                _imageInfo.Heads           = 1;
+                _imageInfo.SectorsPerTrack = 16;
+
+                break;
+            default:
+                _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
+                _imageInfo.Heads           = 16;
+                _imageInfo.SectorsPerTrack = 63;
+
+                break;
+        }
+
+        // It's SCSI, check tags
+        if(_mediaTags.ContainsKey(MediaTagType.SCSI_INQUIRY))
+        {
+            PeripheralDeviceTypes devType = PeripheralDeviceTypes.DirectAccess;
+            Inquiry?              scsiInq = null;
+
+            if(_mediaTags.TryGetValue(MediaTagType.SCSI_INQUIRY, out byte[] inq))
+            {
+                scsiInq = Inquiry.Decode(inq);
+                devType = (PeripheralDeviceTypes)(inq[0] & 0x1F);
+            }
+
+            Modes.DecodedMode? decMode = null;
+
+            if(_mediaTags.TryGetValue(MediaTagType.SCSI_MODESENSE_6, out byte[] mode6))
+                decMode = Modes.DecodeMode6(mode6, devType);
+            else if(_mediaTags.TryGetValue(MediaTagType.SCSI_MODESENSE_10, out byte[] mode10))
+                decMode = Modes.DecodeMode10(mode10, devType);
+
+            byte mediumType  = 0;
+            byte densityCode = 0;
+
+            if(decMode.HasValue)
+            {
+                mediumType = (byte)decMode.Value.Header.MediumType;
+
+                if(decMode?.Header.BlockDescriptors?.Length > 0)
+                    densityCode = (byte)decMode.Value.Header.BlockDescriptors[0].Density;
+
+                if(decMode.Value.Pages != null)
+                    foreach(Modes.ModePage page in decMode.Value.Pages)
+
+                        // CD-ROM page
+                        if(page.Page    == 0x2A &&
+                           page.Subpage == 0)
                         {
-                            case 242944:
-                            case 256256:
-                            case 495872:
-                            case 92160:
-                            case 133120:
-                                _imageInfo.SectorSize = 128;
+                            if(_mediaTags.ContainsKey(MediaTagType.SCSI_MODEPAGE_2A))
+                                _mediaTags.Remove(MediaTagType.SCSI_MODEPAGE_2A);
 
-                                break;
-                            case 116480:
-                            case 287488:  // T0S0 = 128bps
-                            case 988416:  // T0S0 = 128bps
-                            case 995072:  // T0S0 = 128bps, T0S1 = 256bps
-                            case 1021696: // T0S0 = 128bps, T0S1 = 256bps
-                            case 232960:
-                            case 143360:
-                            case 286720:
-                            case 512512:
-                            case 102400:
-                            case 204800:
-                            case 655360:
-                            case 80384:  // T0S0 = 128bps
-                            case 325632: // T0S0 = 128bps, T0S1 = 256bps
-                            case 653312: // T0S0 = 128bps, T0S1 = 256bps
-
-                            #region Commodore
-                            case 174848:
-                            case 175531:
-                            case 196608:
-                            case 197376:
-                            case 349696:
-                            case 351062:
-                            case 822400:
-                                #endregion Commodore
-
-                                _imageInfo.SectorSize = 256;
-
-                                break;
-                            case 81664:
-                                _imageInfo.SectorSize = 319;
-
-                                break;
-                            case 306432:  // T0S0 = 128bps
-                            case 1146624: // T0S0 = 128bps, T0S1 = 256bps
-                            case 1177344: // T0S0 = 128bps, T0S1 = 256bps
-                                _imageInfo.SectorSize = 512;
-
-                                break;
-                            case 1222400: // T0S0 = 128bps, T0S1 = 256bps
-                            case 1304320: // T0S0 = 128bps, T0S1 = 256bps
-                            case 1255168: // T0S0 = 128bps, T0S1 = 256bps
-                            case 1261568:
-                            case 1638400:
-                                _imageInfo.SectorSize = 1024;
-
-                                break;
-                            case 35002122240:
-                                _imageInfo.SectorSize = 2048;
-
-                                break;
-                            default:
-                                _imageInfo.SectorSize = 512;
-
-                                break;
+                            _mediaTags.Add(MediaTagType.SCSI_MODEPAGE_2A, page.PageResponse);
                         }
 
-                    break;
-            }
-
-            _imageInfo.ImageSize            = (ulong)imageFilter.DataForkLength;
-            _imageInfo.CreationTime         = imageFilter.CreationTime;
-            _imageInfo.LastModificationTime = imageFilter.LastWriteTime;
-            _imageInfo.MediaTitle           = Path.GetFileNameWithoutExtension(imageFilter.Filename);
-            _differentTrackZeroSize         = false;
-            _rawImageFilter                 = imageFilter;
-
-            switch(imageFilter.DataForkLength)
-            {
-                case 242944:
-                    _imageInfo.Sectors = 1898;
-
-                    break;
-                case 256256:
-                    _imageInfo.Sectors = 2002;
-
-                    break;
-                case 495872:
-                    _imageInfo.Sectors = 3874;
-
-                    break;
-                case 116480:
-                    _imageInfo.Sectors = 455;
-
-                    break;
-                case 287488: // T0S0 = 128bps
-                    _imageInfo.Sectors      = 1136;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 988416: // T0S0 = 128bps
-                    _imageInfo.Sectors      = 3874;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 995072: // T0S0 = 128bps, T0S1 = 256bps
-                    _imageInfo.Sectors      = 3900;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 1021696: // T0S0 = 128bps, T0S1 = 256bps
-                    _imageInfo.Sectors      = 4004;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 81664:
-                    _imageInfo.Sectors = 256;
-
-                    break;
-                case 306432: // T0S0 = 128bps
-                    _imageInfo.Sectors      = 618;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 1146624: // T0S0 = 128bps, T0S1 = 256bps
-                    _imageInfo.Sectors      = 2272;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 1177344: // T0S0 = 128bps, T0S1 = 256bps
-                    _imageInfo.Sectors      = 2332;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 1222400: // T0S0 = 128bps, T0S1 = 256bps
-                    _imageInfo.Sectors      = 1236;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 1304320: // T0S0 = 128bps, T0S1 = 256bps
-                    _imageInfo.Sectors      = 1316;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 1255168: // T0S0 = 128bps, T0S1 = 256bps
-                    _imageInfo.Sectors      = 1268;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 80384: // T0S0 = 128bps
-                    _imageInfo.Sectors      = 322;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 325632: // T0S0 = 128bps, T0S1 = 256bps
-                    _imageInfo.Sectors      = 1280;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 653312: // T0S0 = 128bps, T0S1 = 256bps
-                    _imageInfo.Sectors      = 2560;
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 1880064: // IBM XDF, 3,5", real number of sectors
-                    _imageInfo.Sectors      = 670;
-                    _imageInfo.SectorSize   = 8192; // Biggest sector size
-                    _differentTrackZeroSize = true;
-
-                    break;
-                case 175531:
-                    _imageInfo.Sectors = 683;
-
-                    break;
-                case 197375:
-                    _imageInfo.Sectors = 768;
-
-                    break;
-                case 351062:
-                    _imageInfo.Sectors = 1366;
-
-                    break;
-                case 822400:
-                    _imageInfo.Sectors = 3200;
-
-                    break;
-                default:
-                    _imageInfo.Sectors = _imageInfo.ImageSize / _imageInfo.SectorSize;
-
-                    break;
-            }
-
-            _imageInfo.MediaType = CalculateDiskType();
-
-            if(_imageInfo.ImageSize % 2352 == 0 ||
-               _imageInfo.ImageSize % 2448 == 0)
-            {
-                byte[] sync   = new byte[12];
-                byte[] header = new byte[4];
-                stream.Seek(0, SeekOrigin.Begin);
-                stream.Read(sync, 0, 12);
-                stream.Read(header, 0, 4);
-
-                if(_cdSync.SequenceEqual(sync))
-                {
-                    _rawCompactDisc       = true;
-                    _hasSubchannel        = _imageInfo.ImageSize % 2448 == 0;
-                    _imageInfo.Sectors    = _imageInfo.ImageSize / (ulong)(_hasSubchannel ? 2448 : 2352);
-                    _imageInfo.MediaType  = MediaType.CD;
-                    _mode2                = header[3] == 0x02;
-                    _imageInfo.SectorSize = (uint)(_mode2 ? 2336 : 2048);
-                }
-            }
-
-            // Sharp X68000 SASI hard disks
-            if(_extension == ".hdf")
-                if(_imageInfo.ImageSize % 256 == 0)
-                {
-                    _imageInfo.SectorSize = 256;
-                    _imageInfo.Sectors    = _imageInfo.ImageSize / _imageInfo.SectorSize;
-                    _imageInfo.MediaType  = MediaType.GENERIC_HDD;
-                }
-
-            // Search for known tags
-            string basename = imageFilter.BasePath;
-            basename = basename.Substring(0, basename.Length - _extension.Length);
-
-            _mediaTags = new Dictionary<MediaTagType, byte[]>();
-
-            foreach((MediaTagType tag, string name) sidecar in _readWriteSidecars)
-                try
-                {
-                    var     filters = new FiltersList();
-                    IFilter filter  = filters.GetFilter(basename + sidecar.name);
-
-                    if(filter is null)
-                        continue;
-
-                    AaruConsole.DebugWriteLine("ZZZRawImage Plugin", "Found media tag {0}", sidecar.tag);
-                    byte[] data = new byte[filter.DataForkLength];
-                    filter.GetDataForkStream().Read(data, 0, data.Length);
-                    _mediaTags.Add(sidecar.tag, data);
-                }
-                catch(IOException) {}
-
-            // If there are INQUIRY and IDENTIFY tags, it's ATAPI
-            if(_mediaTags.ContainsKey(MediaTagType.SCSI_INQUIRY))
-                if(_mediaTags.TryGetValue(MediaTagType.ATA_IDENTIFY, out byte[] tag))
-                {
-                    _mediaTags.Remove(MediaTagType.ATA_IDENTIFY);
-                    _mediaTags.Add(MediaTagType.ATAPI_IDENTIFY, tag);
-                }
-
-            // It is a blu-ray
-            if(_mediaTags.ContainsKey(MediaTagType.BD_DI))
-            {
-                _imageInfo.MediaType = MediaType.BDROM;
-
-                if(_mediaTags.TryGetValue(MediaTagType.DVD_BCA, out byte[] bca))
-                {
-                    _mediaTags.Remove(MediaTagType.DVD_BCA);
-                    _mediaTags.Add(MediaTagType.BD_BCA, bca);
-                }
-
-                if(_mediaTags.TryGetValue(MediaTagType.DVDRAM_DDS, out byte[] dds))
-                {
-                    _imageInfo.MediaType = MediaType.BDRE;
-                    _mediaTags.Remove(MediaTagType.DVDRAM_DDS);
-                    _mediaTags.Add(MediaTagType.BD_DDS, dds);
-                }
-
-                if(_mediaTags.TryGetValue(MediaTagType.DVDRAM_SpareArea, out byte[] sai))
-                {
-                    _imageInfo.MediaType = MediaType.BDRE;
-                    _mediaTags.Remove(MediaTagType.DVDRAM_SpareArea);
-                    _mediaTags.Add(MediaTagType.BD_SpareArea, sai);
-                }
-            }
-
-            // It is a DVD
-            if(_mediaTags.TryGetValue(MediaTagType.DVD_PFI, out byte[] pfi))
-            {
-                PFI.PhysicalFormatInformation decPfi = PFI.Decode(pfi, _imageInfo.MediaType).Value;
-
-                switch(decPfi.DiskCategory)
-                {
-                    case DiskCategory.DVDPR:
-                        _imageInfo.MediaType = MediaType.DVDPR;
-
-                        break;
-                    case DiskCategory.DVDPRDL:
-                        _imageInfo.MediaType = MediaType.DVDPRDL;
-
-                        break;
-                    case DiskCategory.DVDPRW:
-                        _imageInfo.MediaType = MediaType.DVDPRW;
-
-                        break;
-                    case DiskCategory.DVDPRWDL:
-                        _imageInfo.MediaType = MediaType.DVDPRWDL;
-
-                        break;
-                    case DiskCategory.DVDR:
-                        _imageInfo.MediaType = decPfi.PartVersion >= 6 ? MediaType.DVDRDL : MediaType.DVDR;
-
-                        break;
-                    case DiskCategory.DVDRAM:
-                        _imageInfo.MediaType = MediaType.DVDRAM;
-
-                        break;
-                    default:
-                        _imageInfo.MediaType = MediaType.DVDROM;
-
-                        break;
-                    case DiskCategory.DVDRW:
-                        _imageInfo.MediaType = decPfi.PartVersion >= 15 ? MediaType.DVDRWDL : MediaType.DVDRW;
-
-                        break;
-                    case DiskCategory.HDDVDR:
-                        _imageInfo.MediaType = MediaType.HDDVDR;
-
-                        break;
-                    case DiskCategory.HDDVDRAM:
-                        _imageInfo.MediaType = MediaType.HDDVDRAM;
-
-                        break;
-                    case DiskCategory.HDDVDROM:
-                        _imageInfo.MediaType = MediaType.HDDVDROM;
-
-                        break;
-                    case DiskCategory.HDDVDRW:
-                        _imageInfo.MediaType = MediaType.HDDVDRW;
-
-                        break;
-                    case DiskCategory.Nintendo:
-                        _imageInfo.MediaType = decPfi.DiscSize == DVDSize.Eighty ? MediaType.GOD : MediaType.WOD;
-
-                        break;
-                    case DiskCategory.UMD:
-                        _imageInfo.MediaType = MediaType.UMD;
-
-                        break;
-                }
-
-                if((_imageInfo.MediaType == MediaType.DVDR || _imageInfo.MediaType == MediaType.DVDRW ||
-                    _imageInfo.MediaType == MediaType.HDDVDR) &&
-                   _mediaTags.TryGetValue(MediaTagType.DVD_MediaIdentifier, out byte[] mid))
-                {
-                    _mediaTags.Remove(MediaTagType.DVD_MediaIdentifier);
-                    _mediaTags.Add(MediaTagType.DVDR_MediaIdentifier, mid);
-                }
-
-                // Check for Xbox
-                if(_mediaTags.TryGetValue(MediaTagType.DVD_DMI, out byte[] dmi))
-                    if(DMI.IsXbox(dmi) ||
-                       DMI.IsXbox360(dmi))
-                        if(DMI.IsXbox(dmi))
+                        // Rigid Disk page
+                        else if(page.Page    == 0x04 &&
+                                page.Subpage == 0)
                         {
-                            _imageInfo.MediaType = MediaType.XGD;
+                            Modes.ModePage_04? mode04 = Modes.DecodeModePage_04(page.PageResponse);
+
+                            if(!mode04.HasValue)
+                                continue;
+
+                            _imageInfo.Cylinders = mode04.Value.Cylinders;
+                            _imageInfo.Heads     = mode04.Value.Heads;
+
+                            _imageInfo.SectorsPerTrack =
+                                (uint)(_imageInfo.Sectors / (mode04.Value.Cylinders * mode04.Value.Heads));
                         }
-                        else if(DMI.IsXbox360(dmi))
-                        {
-                            _imageInfo.MediaType = MediaType.XGD2;
 
-                            // All XGD3 all have the same number of blocks
-                            if(_imageInfo.Sectors == 25063   || // Locked (or non compatible drive)
-                               _imageInfo.Sectors == 4229664 || // Xtreme unlock
-                               _imageInfo.Sectors == 4246304)   // Wxripper unlock
-                                _imageInfo.MediaType = MediaType.XGD3;
+                        // Flexible Disk Page
+                        else if(page.Page    == 0x05 &&
+                                page.Subpage == 0)
+                        {
+                            Modes.ModePage_05? mode05 = Modes.DecodeModePage_05(page.PageResponse);
+
+                            if(!mode05.HasValue)
+                                continue;
+
+                            _imageInfo.Cylinders       = mode05.Value.Cylinders;
+                            _imageInfo.Heads           = mode05.Value.Heads;
+                            _imageInfo.SectorsPerTrack = mode05.Value.SectorsPerTrack;
                         }
             }
 
-            // It's MultiMediaCard or SecureDigital
-            if(_mediaTags.ContainsKey(MediaTagType.SD_CID) ||
-               _mediaTags.ContainsKey(MediaTagType.SD_CSD) ||
-               _mediaTags.ContainsKey(MediaTagType.SD_OCR))
+            if(scsiInq.HasValue)
             {
-                _imageInfo.MediaType = MediaType.SecureDigital;
+                _imageInfo.DriveManufacturer =
+                    VendorString.Prettify(StringHandlers.CToString(scsiInq.Value.VendorIdentification).Trim());
 
-                if(_mediaTags.ContainsKey(MediaTagType.MMC_ExtendedCSD) ||
-                   !_mediaTags.ContainsKey(MediaTagType.SD_SCR))
-                {
-                    _imageInfo.MediaType = MediaType.MMC;
+                _imageInfo.DriveModel = StringHandlers.CToString(scsiInq.Value.ProductIdentification).Trim();
 
-                    if(_mediaTags.TryGetValue(MediaTagType.SD_CID, out byte[] cid))
-                    {
-                        _mediaTags.Remove(MediaTagType.SD_CID);
-                        _mediaTags.Add(MediaTagType.MMC_CID, cid);
-                    }
+                _imageInfo.DriveFirmwareRevision =
+                    StringHandlers.CToString(scsiInq.Value.ProductRevisionLevel).Trim();
 
-                    if(_mediaTags.TryGetValue(MediaTagType.SD_CSD, out byte[] csd))
-                    {
-                        _mediaTags.Remove(MediaTagType.SD_CSD);
-                        _mediaTags.Add(MediaTagType.MMC_CSD, csd);
-                    }
-
-                    if(_mediaTags.TryGetValue(MediaTagType.SD_OCR, out byte[] ocr))
-                    {
-                        _mediaTags.Remove(MediaTagType.SD_OCR);
-                        _mediaTags.Add(MediaTagType.MMC_OCR, ocr);
-                    }
-                }
+                _imageInfo.MediaType = MediaTypeFromDevice.GetFromScsi((byte)devType, _imageInfo.DriveManufacturer,
+                                                                       _imageInfo.DriveModel, mediumType,
+                                                                       densityCode, _imageInfo.Sectors,
+                                                                       _imageInfo.SectorSize,
+                                                                       _mediaTags.ContainsKey(MediaTagType.
+                                                                           USB_Descriptors),
+                                                                       _rawCompactDisc);
             }
 
-            // It's a compact disc
-            if(_mediaTags.ContainsKey(MediaTagType.CD_FullTOC))
+            if(_imageInfo.MediaType == MediaType.Unknown)
+                _imageInfo.MediaType = devType == PeripheralDeviceTypes.OpticalDevice ? MediaType.UnknownMO
+                                           : MediaType.GENERIC_HDD;
+        }
+
+        // It's ATA, check tags
+        if(_mediaTags.TryGetValue(MediaTagType.ATA_IDENTIFY, out byte[] identifyBuf))
+        {
+            Identify.IdentifyDevice? ataId = CommonTypes.Structs.Devices.ATA.Identify.Decode(identifyBuf);
+
+            if(ataId.HasValue)
             {
-                _imageInfo.MediaType = _imageInfo.Sectors > 360000 ? MediaType.DDCD : MediaType.CD;
+                _imageInfo.MediaType = (ushort)ataId.Value.GeneralConfiguration == 0x848A ? MediaType.CompactFlash
+                                           : MediaType.GENERIC_HDD;
 
-                // Only CD-R and CD-RW have ATIP
-                if(_mediaTags.TryGetValue(MediaTagType.CD_ATIP, out byte[] atipBuf))
+                if(ataId.Value.Cylinders       == 0 ||
+                   ataId.Value.Heads           == 0 ||
+                   ataId.Value.SectorsPerTrack == 0)
                 {
-                    ATIP.CDATIP atip = ATIP.Decode(atipBuf);
-
-                    if(atip != null)
-                        _imageInfo.MediaType = atip.DiscType ? MediaType.CDRW : MediaType.CDR;
+                    _imageInfo.Cylinders       = ataId.Value.CurrentCylinders;
+                    _imageInfo.Heads           = ataId.Value.CurrentHeads;
+                    _imageInfo.SectorsPerTrack = ataId.Value.CurrentSectorsPerTrack;
                 }
-
-                if(_mediaTags.TryGetValue(MediaTagType.Floppy_LeadOut, out byte[] leadout))
+                else
                 {
-                    _mediaTags.Remove(MediaTagType.Floppy_LeadOut);
-                    _mediaTags.Add(MediaTagType.CD_LeadOut, leadout);
+                    _imageInfo.Cylinders       = ataId.Value.Cylinders;
+                    _imageInfo.Heads           = ataId.Value.Heads;
+                    _imageInfo.SectorsPerTrack = ataId.Value.SectorsPerTrack;
                 }
             }
+        }
 
-            switch(_imageInfo.MediaType)
+        switch(_imageInfo.MediaType)
+        {
+            case MediaType.CD:
+            case MediaType.CDRW:
+            case MediaType.CDR:
+                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
+                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
+
+                goto case MediaType.BDRE;
+            case MediaType.BDRE:
+            case MediaType.BDROM:
+            case MediaType.BDR:
+            case MediaType.BDRXL:
+            case MediaType.DVDPR:
+            case MediaType.DVDPRDL:
+            case MediaType.DVDPRW:
+            case MediaType.DVDPRWDL:
+            case MediaType.DVDRDL:
+            case MediaType.DVDR:
+            case MediaType.DVDRAM:
+            case MediaType.DVDROM:
+            case MediaType.DVDRWDL:
+            case MediaType.DVDRW:
+            case MediaType.HDDVDR:
+            case MediaType.HDDVDRAM:
+            case MediaType.HDDVDROM:
+            case MediaType.HDDVDRW:
+            case MediaType.GOD:
+            case MediaType.WOD:
+            case MediaType.UMD:
+            case MediaType.XGD:
+            case MediaType.XGD2:
+            case MediaType.XGD3:
+            case MediaType.PD650:
+            case MediaType.PD650_WORM:
+                _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
+
+                break;
+            default:
+                _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
+
+                break;
+        }
+
+        if(_imageInfo.XmlMediaType == XmlMediaType.OpticalDisc)
+        {
+            _imageInfo.HasSessions   = true;
+            _imageInfo.HasPartitions = true;
+        }
+
+        AaruConsole.VerboseWriteLine("Raw disk image contains a disk of type {0}", _imageInfo.MediaType);
+
+        var sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
+
+        if(File.Exists(basename + "cicm.xml"))
+            try
             {
-                case MediaType.ACORN_35_DS_DD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 5;
-
-                    break;
-                case MediaType.ACORN_35_DS_HD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.ACORN_525_DS_DD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.ACORN_525_SS_DD_40:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.ACORN_525_SS_DD_80:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.ACORN_525_SS_SD_40:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.ACORN_525_SS_SD_80:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.Apple32DS:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 13;
-
-                    break;
-                case MediaType.Apple32SS:
-                    _imageInfo.Cylinders       = 36;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 13;
-
-                    break;
-                case MediaType.Apple33DS:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.Apple33SS:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.AppleSonyDS:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.AppleSonySS:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.ATARI_35_DS_DD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.ATARI_35_DS_DD_11:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 11;
-
-                    break;
-                case MediaType.ATARI_35_SS_DD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.ATARI_35_SS_DD_11:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 11;
-
-                    break;
-                case MediaType.ATARI_525_ED:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 26;
-
-                    break;
-                case MediaType.ATARI_525_SD:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 18;
-
-                    break;
-                case MediaType.CBM_35_DD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.CBM_AMIGA_35_DD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 11;
-
-                    break;
-                case MediaType.CBM_AMIGA_35_HD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 22;
-
-                    break;
-                case MediaType.DMF:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 21;
-
-                    break;
-                case MediaType.DOS_35_DS_DD_9:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.Apricot_35:
-                    _imageInfo.Cylinders       = 70;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.DOS_35_ED:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 36;
-
-                    break;
-                case MediaType.DOS_35_HD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 18;
-
-                    break;
-                case MediaType.DOS_35_SS_DD_9:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.DOS_525_DS_DD_8:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.DOS_525_DS_DD_9:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.DOS_525_HD:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 15;
-
-                    break;
-                case MediaType.DOS_525_SS_DD_8:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.DOS_525_SS_DD_9:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.ECMA_54:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 26;
-
-                    break;
-                case MediaType.ECMA_59:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 26;
-
-                    break;
-                case MediaType.ECMA_66:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 9;
-
-                    break;
-                case MediaType.ECMA_69_8:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.ECMA_70:
-                    _imageInfo.Cylinders       = 40;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.ECMA_78:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.ECMA_99_15:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 15;
-
-                    break;
-                case MediaType.ECMA_99_26:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 26;
-
-                    break;
-                case MediaType.ECMA_99_8:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.FDFORMAT_35_DD:
-                    _imageInfo.Cylinders       = 82;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 10;
-
-                    break;
-                case MediaType.FDFORMAT_35_HD:
-                    _imageInfo.Cylinders       = 82;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 21;
-
-                    break;
-                case MediaType.FDFORMAT_525_HD:
-                    _imageInfo.Cylinders       = 82;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 17;
-
-                    break;
-                case MediaType.IBM23FD:
-                    _imageInfo.Cylinders       = 32;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.IBM33FD_128:
-                    _imageInfo.Cylinders       = 73;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 26;
-
-                    break;
-                case MediaType.IBM33FD_256:
-                    _imageInfo.Cylinders       = 74;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 15;
-
-                    break;
-                case MediaType.IBM33FD_512:
-                    _imageInfo.Cylinders       = 74;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.IBM43FD_128:
-                    _imageInfo.Cylinders       = 74;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 26;
-
-                    break;
-                case MediaType.IBM43FD_256:
-                    _imageInfo.Cylinders       = 74;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 15;
-
-                    break;
-                case MediaType.IBM53FD_1024:
-                    _imageInfo.Cylinders       = 74;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.IBM53FD_256:
-                    _imageInfo.Cylinders       = 74;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 26;
-
-                    break;
-                case MediaType.IBM53FD_512:
-                    _imageInfo.Cylinders       = 74;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 15;
-
-                    break;
-                case MediaType.NEC_35_TD:
-                    _imageInfo.Cylinders       = 240;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 38;
-
-                    break;
-                case MediaType.NEC_525_HD:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 8;
-
-                    break;
-                case MediaType.XDF_35:
-                    _imageInfo.Cylinders       = 80;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 23;
-
-                    break;
-
-                // Following ones are what the device itself report, not the physical geometry
-                case MediaType.Jaz:
-                    _imageInfo.Cylinders       = 1021;
-                    _imageInfo.Heads           = 64;
-                    _imageInfo.SectorsPerTrack = 32;
-
-                    break;
-                case MediaType.PocketZip:
-                    _imageInfo.Cylinders       = 154;
-                    _imageInfo.Heads           = 16;
-                    _imageInfo.SectorsPerTrack = 32;
-
-                    break;
-                case MediaType.LS120:
-                    _imageInfo.Cylinders       = 963;
-                    _imageInfo.Heads           = 8;
-                    _imageInfo.SectorsPerTrack = 32;
-
-                    break;
-                case MediaType.LS240:
-                    _imageInfo.Cylinders       = 262;
-                    _imageInfo.Heads           = 32;
-                    _imageInfo.SectorsPerTrack = 56;
-
-                    break;
-                case MediaType.FD32MB:
-                    _imageInfo.Cylinders       = 1024;
-                    _imageInfo.Heads           = 2;
-                    _imageInfo.SectorsPerTrack = 32;
-
-                    break;
-                case MediaType.ZIP100:
-                    _imageInfo.Cylinders       = 96;
-                    _imageInfo.Heads           = 64;
-                    _imageInfo.SectorsPerTrack = 32;
-
-                    break;
-                case MediaType.ZIP250:
-                    _imageInfo.Cylinders       = 239;
-                    _imageInfo.Heads           = 64;
-                    _imageInfo.SectorsPerTrack = 32;
-
-                    break;
-                case MediaType.MetaFloppy_Mod_I:
-                    _imageInfo.Cylinders       = 35;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                case MediaType.MetaFloppy_Mod_II:
-                    _imageInfo.Cylinders       = 77;
-                    _imageInfo.Heads           = 1;
-                    _imageInfo.SectorsPerTrack = 16;
-
-                    break;
-                default:
-                    _imageInfo.Cylinders       = (uint)(_imageInfo.Sectors / 16 / 63);
-                    _imageInfo.Heads           = 16;
-                    _imageInfo.SectorsPerTrack = 63;
-
-                    break;
+                var sr = new StreamReader(basename + "cicm.xml");
+                CicmMetadata = (CICMMetadataType)sidecarXs.Deserialize(sr);
+                sr.Close();
+            }
+            catch
+            {
+                // Do nothing.
             }
 
-            // It's SCSI, check tags
-            if(_mediaTags.ContainsKey(MediaTagType.SCSI_INQUIRY))
+        _imageInfo.ReadableMediaTags = new List<MediaTagType>(_mediaTags.Keys);
+
+        if(!_rawCompactDisc)
+            return ErrorNumber.NoError;
+
+        if(_hasSubchannel)
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
+
+        if(_mode2)
+        {
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+        }
+        else
+        {
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
+
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
+
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
+
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
+
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
+
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
+
+            if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
+                _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
+        }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectors(sectorAddress, 1, out buffer);
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_differentTrackZeroSize)
+            return ErrorNumber.NotImplemented;
+
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        Stream stream = _rawImageFilter.GetDataForkStream();
+
+        uint sectorOffset = 0;
+        uint sectorSize   = _imageInfo.SectorSize;
+        uint sectorSkip   = 0;
+
+        if(_rawCompactDisc)
+        {
+            sectorOffset = (uint)(_mode2 ? 0 : 16);
+            sectorSize   = (uint)(_mode2 ? 2352 : 2048);
+            sectorSkip   = (uint)(_mode2 ? 0 : 288);
+        }
+
+        if(_hasSubchannel)
+            sectorSkip += 96;
+
+        buffer = new byte[sectorSize * length];
+
+        var br = new BinaryReader(stream);
+        br.BaseStream.Seek((long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin);
+
+        if(_mode2)
+        {
+            var mode2Ms = new MemoryStream((int)(sectorSize * length));
+
+            buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length));
+
+            for(int i = 0; i < length; i++)
             {
-                PeripheralDeviceTypes devType = PeripheralDeviceTypes.DirectAccess;
-                Inquiry?              scsiInq = null;
-
-                if(_mediaTags.TryGetValue(MediaTagType.SCSI_INQUIRY, out byte[] inq))
-                {
-                    scsiInq = Inquiry.Decode(inq);
-                    devType = (PeripheralDeviceTypes)(inq[0] & 0x1F);
-                }
-
-                Modes.DecodedMode? decMode = null;
-
-                if(_mediaTags.TryGetValue(MediaTagType.SCSI_MODESENSE_6, out byte[] mode6))
-                    decMode = Modes.DecodeMode6(mode6, devType);
-                else if(_mediaTags.TryGetValue(MediaTagType.SCSI_MODESENSE_10, out byte[] mode10))
-                    decMode = Modes.DecodeMode10(mode10, devType);
-
-                byte mediumType  = 0;
-                byte densityCode = 0;
-
-                if(decMode.HasValue)
-                {
-                    mediumType = (byte)decMode.Value.Header.MediumType;
-
-                    if(decMode?.Header.BlockDescriptors?.Length > 0)
-                        densityCode = (byte)decMode.Value.Header.BlockDescriptors[0].Density;
-
-                    if(decMode.Value.Pages != null)
-                        foreach(Modes.ModePage page in decMode.Value.Pages)
-
-                            // CD-ROM page
-                            if(page.Page    == 0x2A &&
-                               page.Subpage == 0)
-                            {
-                                if(_mediaTags.ContainsKey(MediaTagType.SCSI_MODEPAGE_2A))
-                                    _mediaTags.Remove(MediaTagType.SCSI_MODEPAGE_2A);
-
-                                _mediaTags.Add(MediaTagType.SCSI_MODEPAGE_2A, page.PageResponse);
-                            }
-
-                            // Rigid Disk page
-                            else if(page.Page    == 0x04 &&
-                                    page.Subpage == 0)
-                            {
-                                Modes.ModePage_04? mode04 = Modes.DecodeModePage_04(page.PageResponse);
-
-                                if(!mode04.HasValue)
-                                    continue;
-
-                                _imageInfo.Cylinders = mode04.Value.Cylinders;
-                                _imageInfo.Heads     = mode04.Value.Heads;
-
-                                _imageInfo.SectorsPerTrack =
-                                    (uint)(_imageInfo.Sectors / (mode04.Value.Cylinders * mode04.Value.Heads));
-                            }
-
-                            // Flexible Disk Page
-                            else if(page.Page    == 0x05 &&
-                                    page.Subpage == 0)
-                            {
-                                Modes.ModePage_05? mode05 = Modes.DecodeModePage_05(page.PageResponse);
-
-                                if(!mode05.HasValue)
-                                    continue;
-
-                                _imageInfo.Cylinders       = mode05.Value.Cylinders;
-                                _imageInfo.Heads           = mode05.Value.Heads;
-                                _imageInfo.SectorsPerTrack = mode05.Value.SectorsPerTrack;
-                            }
-                }
-
-                if(scsiInq.HasValue)
-                {
-                    _imageInfo.DriveManufacturer =
-                        VendorString.Prettify(StringHandlers.CToString(scsiInq.Value.VendorIdentification).Trim());
-
-                    _imageInfo.DriveModel = StringHandlers.CToString(scsiInq.Value.ProductIdentification).Trim();
-
-                    _imageInfo.DriveFirmwareRevision =
-                        StringHandlers.CToString(scsiInq.Value.ProductRevisionLevel).Trim();
-
-                    _imageInfo.MediaType = MediaTypeFromDevice.GetFromScsi((byte)devType, _imageInfo.DriveManufacturer,
-                                                                           _imageInfo.DriveModel, mediumType,
-                                                                           densityCode, _imageInfo.Sectors,
-                                                                           _imageInfo.SectorSize,
-                                                                           _mediaTags.ContainsKey(MediaTagType.
-                                                                               USB_Descriptors),
-                                                                           _rawCompactDisc);
-                }
-
-                if(_imageInfo.MediaType == MediaType.Unknown)
-                    _imageInfo.MediaType = devType == PeripheralDeviceTypes.OpticalDevice ? MediaType.UnknownMO
-                                               : MediaType.GENERIC_HDD;
+                byte[] sector = new byte[sectorSize];
+                Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize);
+                sector = Sector.GetUserDataFromMode2(sector);
+                mode2Ms.Write(sector, 0, sector.Length);
             }
 
-            // It's ATA, check tags
-            if(_mediaTags.TryGetValue(MediaTagType.ATA_IDENTIFY, out byte[] identifyBuf))
+            buffer = mode2Ms.ToArray();
+        }
+        else if(sectorOffset == 0 &&
+                sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
             {
-                Identify.IdentifyDevice? ataId = CommonTypes.Structs.Devices.ATA.Identify.Decode(identifyBuf);
-
-                if(ataId.HasValue)
-                {
-                    _imageInfo.MediaType = (ushort)ataId.Value.GeneralConfiguration == 0x848A ? MediaType.CompactFlash
-                                               : MediaType.GENERIC_HDD;
-
-                    if(ataId.Value.Cylinders       == 0 ||
-                       ataId.Value.Heads           == 0 ||
-                       ataId.Value.SectorsPerTrack == 0)
-                    {
-                        _imageInfo.Cylinders       = ataId.Value.CurrentCylinders;
-                        _imageInfo.Heads           = ataId.Value.CurrentHeads;
-                        _imageInfo.SectorsPerTrack = ataId.Value.CurrentSectorsPerTrack;
-                    }
-                    else
-                    {
-                        _imageInfo.Cylinders       = ataId.Value.Cylinders;
-                        _imageInfo.Heads           = ataId.Value.Heads;
-                        _imageInfo.SectorsPerTrack = ataId.Value.SectorsPerTrack;
-                    }
-                }
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
             }
 
-            switch(_imageInfo.MediaType)
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(Session session)
+    {
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return null;
+
+        if(session.Sequence != 1)
+            return null;
+
+        var trk = new Track
+        {
+            BytesPerSector    = (int)_imageInfo.SectorSize,
+            EndSector         = _imageInfo.Sectors - 1,
+            Filter            = _rawImageFilter,
+            File              = _rawImageFilter.Filename,
+            FileOffset        = 0,
+            FileType          = "BINARY",
+            RawBytesPerSector = (int)_imageInfo.SectorSize,
+            Sequence          = 1,
+            StartSector       = 0,
+            SubchannelType    = TrackSubchannelType.None,
+            Type              = TrackType.Data,
+            Session           = 1
+        };
+
+        List<Track> lst = new()
+        {
+            trk
+        };
+
+        return lst;
+    }
+
+    /// <inheritdoc />
+    public List<Track> GetSessionTracks(ushort session)
+    {
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return null;
+
+        if(session != 1)
+            return null;
+
+        var trk = new Track
+        {
+            BytesPerSector    = (int)_imageInfo.SectorSize,
+            EndSector         = _imageInfo.Sectors - 1,
+            Filter            = _rawImageFilter,
+            File              = _rawImageFilter.Filename,
+            FileOffset        = 0,
+            FileType          = "BINARY",
+            RawBytesPerSector = (int)_imageInfo.SectorSize,
+            Sequence          = 1,
+            StartSector       = 0,
+            SubchannelType    = TrackSubchannelType.None,
+            Type              = TrackType.Data,
+            Session           = 1
+        };
+
+        List<Track> lst = new()
+        {
+            trk
+        };
+
+        return lst;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return ErrorNumber.NotSupported;
+
+        return track != 1 ? ErrorNumber.OutOfRange : ReadSector(sectorAddress, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return ErrorNumber.NotSupported;
+
+        return track != 1 ? ErrorNumber.OutOfRange : ReadSectors(sectorAddress, length, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return ErrorNumber.NotSupported;
+
+        return track != 1 ? ErrorNumber.OutOfRange : ReadSectorsLong(sectorAddress, 1, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
+            return ErrorNumber.NotSupported;
+
+        return track != 1 ? ErrorNumber.OutOfRange : ReadSectorsLong(sectorAddress, length, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc ||
+           (!_rawCompactDisc && tag != SectorTagType.CdTrackFlags))
+            return ErrorNumber.NotSupported;
+
+        return ReadSectorsTag(sectorAddress, 1, tag, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc ||
+           (!_rawCompactDisc && tag != SectorTagType.CdTrackFlags))
+            return ErrorNumber.NotSupported;
+
+        if(tag == SectorTagType.CdTrackFlags)
+        {
+            buffer = new byte[]
             {
-                case MediaType.CD:
-                case MediaType.CDRW:
-                case MediaType.CDR:
-                    if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
-                        _imageInfo.ReadableSectorTags.Add(SectorTagType.CdTrackFlags);
-
-                    goto case MediaType.BDRE;
-                case MediaType.BDRE:
-                case MediaType.BDROM:
-                case MediaType.BDR:
-                case MediaType.BDRXL:
-                case MediaType.DVDPR:
-                case MediaType.DVDPRDL:
-                case MediaType.DVDPRW:
-                case MediaType.DVDPRWDL:
-                case MediaType.DVDRDL:
-                case MediaType.DVDR:
-                case MediaType.DVDRAM:
-                case MediaType.DVDROM:
-                case MediaType.DVDRWDL:
-                case MediaType.DVDRW:
-                case MediaType.HDDVDR:
-                case MediaType.HDDVDRAM:
-                case MediaType.HDDVDROM:
-                case MediaType.HDDVDRW:
-                case MediaType.GOD:
-                case MediaType.WOD:
-                case MediaType.UMD:
-                case MediaType.XGD:
-                case MediaType.XGD2:
-                case MediaType.XGD3:
-                case MediaType.PD650:
-                case MediaType.PD650_WORM:
-                    _imageInfo.XmlMediaType = XmlMediaType.OpticalDisc;
-
-                    break;
-                default:
-                    _imageInfo.XmlMediaType = XmlMediaType.BlockMedia;
-
-                    break;
-            }
-
-            if(_imageInfo.XmlMediaType == XmlMediaType.OpticalDisc)
-            {
-                _imageInfo.HasSessions   = true;
-                _imageInfo.HasPartitions = true;
-            }
-
-            AaruConsole.VerboseWriteLine("Raw disk image contains a disk of type {0}", _imageInfo.MediaType);
-
-            var sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
-
-            if(File.Exists(basename + "cicm.xml"))
-                try
-                {
-                    var sr = new StreamReader(basename + "cicm.xml");
-                    CicmMetadata = (CICMMetadataType)sidecarXs.Deserialize(sr);
-                    sr.Close();
-                }
-                catch
-                {
-                    // Do nothing.
-                }
-
-            _imageInfo.ReadableMediaTags = new List<MediaTagType>(_mediaTags.Keys);
-
-            if(!_rawCompactDisc)
-                return ErrorNumber.NoError;
-
-            if(_hasSubchannel)
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubchannel);
-
-            if(_mode2)
-            {
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-            }
-            else
-            {
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSync))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSync);
-
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorHeader))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorHeader);
-
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorSubHeader))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorSubHeader);
-
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEcc))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEcc);
-
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccP))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccP);
-
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEccQ))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEccQ);
-
-                if(!_imageInfo.ReadableSectorTags.Contains(SectorTagType.CdSectorEdc))
-                    _imageInfo.ReadableSectorTags.Add(SectorTagType.CdSectorEdc);
-            }
+                4
+            };
 
             return ErrorNumber.NoError;
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectors(sectorAddress, 1, out buffer);
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, out byte[] buffer)
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        uint sectorOffset;
+        uint sectorSize;
+        uint sectorSkip = 0;
+
+        if(!_hasSubchannel &&
+           tag == SectorTagType.CdSectorSubchannel)
+            return ErrorNumber.NoData;
+
+        // Requires reading sector
+        if(_mode2)
         {
-            buffer = null;
-
-            if(_differentTrackZeroSize)
+            if(tag != SectorTagType.CdSectorSubchannel)
                 return ErrorNumber.NotImplemented;
 
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            Stream stream = _rawImageFilter.GetDataForkStream();
-
-            uint sectorOffset = 0;
-            uint sectorSize   = _imageInfo.SectorSize;
-            uint sectorSkip   = 0;
-
-            if(_rawCompactDisc)
+            sectorOffset = 2352;
+            sectorSize   = 96;
+        }
+        else
+        {
+            switch(tag)
             {
-                sectorOffset = (uint)(_mode2 ? 0 : 16);
-                sectorSize   = (uint)(_mode2 ? 2352 : 2048);
-                sectorSkip   = (uint)(_mode2 ? 0 : 288);
-            }
-
-            if(_hasSubchannel)
-                sectorSkip += 96;
-
-            buffer = new byte[sectorSize * length];
-
-            var br = new BinaryReader(stream);
-            br.BaseStream.Seek((long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin);
-
-            if(_mode2)
-            {
-                var mode2Ms = new MemoryStream((int)(sectorSize * length));
-
-                buffer = br.ReadBytes((int)((sectorSize + sectorSkip) * length));
-
-                for(int i = 0; i < length; i++)
+                case SectorTagType.CdSectorSync:
                 {
-                    byte[] sector = new byte[sectorSize];
-                    Array.Copy(buffer, (sectorSize + sectorSkip) * i, sector, 0, sectorSize);
-                    sector = Sector.GetUserDataFromMode2(sector);
-                    mode2Ms.Write(sector, 0, sector.Length);
+                    sectorOffset = 0;
+                    sectorSize   = 12;
+                    sectorSkip   = 2340;
+
+                    break;
                 }
 
-                buffer = mode2Ms.ToArray();
-            }
-            else if(sectorOffset == 0 &&
-                    sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
+                case SectorTagType.CdSectorHeader:
                 {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+                    sectorOffset = 12;
+                    sectorSize   = 4;
+                    sectorSkip   = 2336;
+
+                    break;
                 }
 
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(Session session)
-        {
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return null;
-
-            if(session.Sequence != 1)
-                return null;
-
-            var trk = new Track
-            {
-                BytesPerSector    = (int)_imageInfo.SectorSize,
-                EndSector         = _imageInfo.Sectors - 1,
-                Filter            = _rawImageFilter,
-                File              = _rawImageFilter.Filename,
-                FileOffset        = 0,
-                FileType          = "BINARY",
-                RawBytesPerSector = (int)_imageInfo.SectorSize,
-                Sequence          = 1,
-                StartSector       = 0,
-                SubchannelType    = TrackSubchannelType.None,
-                Type              = TrackType.Data,
-                Session           = 1
-            };
-
-            List<Track> lst = new()
-            {
-                trk
-            };
-
-            return lst;
-        }
-
-        /// <inheritdoc />
-        public List<Track> GetSessionTracks(ushort session)
-        {
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return null;
-
-            if(session != 1)
-                return null;
-
-            var trk = new Track
-            {
-                BytesPerSector    = (int)_imageInfo.SectorSize,
-                EndSector         = _imageInfo.Sectors - 1,
-                Filter            = _rawImageFilter,
-                File              = _rawImageFilter.Filename,
-                FileOffset        = 0,
-                FileType          = "BINARY",
-                RawBytesPerSector = (int)_imageInfo.SectorSize,
-                Sequence          = 1,
-                StartSector       = 0,
-                SubchannelType    = TrackSubchannelType.None,
-                Type              = TrackType.Data,
-                Session           = 1
-            };
-
-            List<Track> lst = new()
-            {
-                trk
-            };
-
-            return lst;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSector(ulong sectorAddress, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NotSupported;
-
-            return track != 1 ? ErrorNumber.OutOfRange : ReadSector(sectorAddress, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectors(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NotSupported;
-
-            return track != 1 ? ErrorNumber.OutOfRange : ReadSectors(sectorAddress, length, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NotSupported;
-
-            return track != 1 ? ErrorNumber.OutOfRange : ReadSectorsLong(sectorAddress, 1, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, uint track, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc)
-                return ErrorNumber.NotSupported;
-
-            return track != 1 ? ErrorNumber.OutOfRange : ReadSectorsLong(sectorAddress, length, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc ||
-               (!_rawCompactDisc && tag != SectorTagType.CdTrackFlags))
-                return ErrorNumber.NotSupported;
-
-            return ReadSectorsTag(sectorAddress, 1, tag, out buffer);
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc ||
-               (!_rawCompactDisc && tag != SectorTagType.CdTrackFlags))
-                return ErrorNumber.NotSupported;
-
-            if(tag == SectorTagType.CdTrackFlags)
-            {
-                buffer = new byte[]
+                case SectorTagType.CdSectorSubchannel:
                 {
-                    4
-                };
+                    sectorOffset = 2352;
+                    sectorSize   = 96;
 
-                return ErrorNumber.NoError;
-            }
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            uint sectorOffset;
-            uint sectorSize;
-            uint sectorSkip = 0;
-
-            if(!_hasSubchannel &&
-               tag == SectorTagType.CdSectorSubchannel)
-                return ErrorNumber.NoData;
-
-            // Requires reading sector
-            if(_mode2)
-            {
-                if(tag != SectorTagType.CdSectorSubchannel)
-                    return ErrorNumber.NotImplemented;
-
-                sectorOffset = 2352;
-                sectorSize   = 96;
-            }
-            else
-            {
-                switch(tag)
-                {
-                    case SectorTagType.CdSectorSync:
-                    {
-                        sectorOffset = 0;
-                        sectorSize   = 12;
-                        sectorSkip   = 2340;
-
-                        break;
-                    }
-
-                    case SectorTagType.CdSectorHeader:
-                    {
-                        sectorOffset = 12;
-                        sectorSize   = 4;
-                        sectorSkip   = 2336;
-
-                        break;
-                    }
-
-                    case SectorTagType.CdSectorSubchannel:
-                    {
-                        sectorOffset = 2352;
-                        sectorSize   = 96;
-
-                        break;
-                    }
-
-                    case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
-                    case SectorTagType.CdSectorEcc:
-                    {
-                        sectorOffset = 2076;
-                        sectorSize   = 276;
-                        sectorSkip   = 0;
-
-                        break;
-                    }
-
-                    case SectorTagType.CdSectorEccP:
-                    {
-                        sectorOffset = 2076;
-                        sectorSize   = 172;
-                        sectorSkip   = 104;
-
-                        break;
-                    }
-
-                    case SectorTagType.CdSectorEccQ:
-                    {
-                        sectorOffset = 2248;
-                        sectorSize   = 104;
-                        sectorSkip   = 0;
-
-                        break;
-                    }
-
-                    case SectorTagType.CdSectorEdc:
-                    {
-                        sectorOffset = 2064;
-                        sectorSize   = 4;
-                        sectorSkip   = 284;
-
-                        break;
-                    }
-
-                    default: return ErrorNumber.NotSupported;
-                }
-            }
-
-            buffer = new byte[sectorSize * length];
-
-            Stream stream = _rawImageFilter.GetDataForkStream();
-            var    br     = new BinaryReader(stream);
-            br.BaseStream.Seek((long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin);
-
-            if(sectorOffset == 0 &&
-               sectorSkip   == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
-                {
-                    br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+                    break;
                 }
 
-            return ErrorNumber.NoError;
-        }
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
-            ReadSectorsLong(sectorAddress, 1, out buffer);
-
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
-        {
-            buffer = null;
-
-            if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc ||
-               !_rawCompactDisc)
-                return ErrorNumber.NotSupported;
-
-            if(sectorAddress > _imageInfo.Sectors - 1)
-                return ErrorNumber.OutOfRange;
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-                return ErrorNumber.OutOfRange;
-
-            const uint sectorSize = 2352;
-            uint       sectorSkip = 0;
-
-            if(_hasSubchannel)
-                sectorSkip += 96;
-
-            buffer = new byte[sectorSize * length];
-
-            Stream stream = _rawImageFilter.GetDataForkStream();
-            var    br     = new BinaryReader(stream);
-
-            br.BaseStream.Seek((long)(sectorAddress * (sectorSize + sectorSkip)), SeekOrigin.Begin);
-
-            if(sectorSkip == 0)
-                buffer = br.ReadBytes((int)(sectorSize * length));
-            else
-                for(int i = 0; i < length; i++)
+                case SectorTagType.CdSectorSubHeader: return ErrorNumber.NotSupported;
+                case SectorTagType.CdSectorEcc:
                 {
-                    byte[] sector = br.ReadBytes((int)sectorSize);
-                    br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                    sectorOffset = 2076;
+                    sectorSize   = 276;
+                    sectorSkip   = 0;
 
-                    Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+                    break;
                 }
 
-            return ErrorNumber.NoError;
+                case SectorTagType.CdSectorEccP:
+                {
+                    sectorOffset = 2076;
+                    sectorSize   = 172;
+                    sectorSkip   = 104;
+
+                    break;
+                }
+
+                case SectorTagType.CdSectorEccQ:
+                {
+                    sectorOffset = 2248;
+                    sectorSize   = 104;
+                    sectorSkip   = 0;
+
+                    break;
+                }
+
+                case SectorTagType.CdSectorEdc:
+                {
+                    sectorOffset = 2064;
+                    sectorSize   = 4;
+                    sectorSkip   = 284;
+
+                    break;
+                }
+
+                default: return ErrorNumber.NotSupported;
+            }
         }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+        buffer = new byte[sectorSize * length];
 
-            if(!_mediaTags.TryGetValue(tag, out byte[] data))
-                return ErrorNumber.NoData;
+        Stream stream = _rawImageFilter.GetDataForkStream();
+        var    br     = new BinaryReader(stream);
+        br.BaseStream.Seek((long)(sectorAddress * (sectorOffset + sectorSize + sectorSkip)), SeekOrigin.Begin);
 
-            buffer = data?.Clone() as byte[];
+        if(sectorOffset == 0 &&
+           sectorSkip   == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                br.BaseStream.Seek(sectorOffset, SeekOrigin.Current);
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
 
-            return buffer == null ? ErrorNumber.NoData : ErrorNumber.NoError;
-        }
+        return ErrorNumber.NoError;
+    }
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer)
-        {
-            buffer = null;
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorLong(ulong sectorAddress, out byte[] buffer) =>
+        ReadSectorsLong(sectorAddress, 1, out buffer);
 
-            return _imageInfo.XmlMediaType != XmlMediaType.OpticalDisc || !_rawCompactDisc
-                       ? ErrorNumber.NotSupported
-                       : track != 1
-                           ? ErrorNumber.OutOfRange
-                           : ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
-        }
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsLong(ulong sectorAddress, uint length, out byte[] buffer)
+    {
+        buffer = null;
 
-        /// <inheritdoc />
-        public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
-                                          out byte[] buffer)
-        {
-            buffer = null;
+        if(_imageInfo.XmlMediaType != XmlMediaType.OpticalDisc ||
+           !_rawCompactDisc)
+            return ErrorNumber.NotSupported;
 
-            return _imageInfo.XmlMediaType != XmlMediaType.OpticalDisc || !_rawCompactDisc
-                       ? ErrorNumber.NotSupported
-                       : track != 1
-                           ? ErrorNumber.OutOfRange
-                           : ReadSectorsTag(sectorAddress, length, tag, out buffer);
-        }
+        if(sectorAddress > _imageInfo.Sectors - 1)
+            return ErrorNumber.OutOfRange;
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+            return ErrorNumber.OutOfRange;
+
+        const uint sectorSize = 2352;
+        uint       sectorSkip = 0;
+
+        if(_hasSubchannel)
+            sectorSkip += 96;
+
+        buffer = new byte[sectorSize * length];
+
+        Stream stream = _rawImageFilter.GetDataForkStream();
+        var    br     = new BinaryReader(stream);
+
+        br.BaseStream.Seek((long)(sectorAddress * (sectorSize + sectorSkip)), SeekOrigin.Begin);
+
+        if(sectorSkip == 0)
+            buffer = br.ReadBytes((int)(sectorSize * length));
+        else
+            for(int i = 0; i < length; i++)
+            {
+                byte[] sector = br.ReadBytes((int)sectorSize);
+                br.BaseStream.Seek(sectorSkip, SeekOrigin.Current);
+
+                Array.Copy(sector, 0, buffer, i * sectorSize, sectorSize);
+            }
+
+        return ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadMediaTag(MediaTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        if(!_mediaTags.TryGetValue(tag, out byte[] data))
+            return ErrorNumber.NoData;
+
+        buffer = data?.Clone() as byte[];
+
+        return buffer == null ? ErrorNumber.NoData : ErrorNumber.NoError;
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorTag(ulong sectorAddress, uint track, SectorTagType tag, out byte[] buffer)
+    {
+        buffer = null;
+
+        return _imageInfo.XmlMediaType != XmlMediaType.OpticalDisc || !_rawCompactDisc
+                   ? ErrorNumber.NotSupported
+                   : track != 1
+                       ? ErrorNumber.OutOfRange
+                       : ReadSectorsTag(sectorAddress, 1, track, tag, out buffer);
+    }
+
+    /// <inheritdoc />
+    public ErrorNumber ReadSectorsTag(ulong sectorAddress, uint length, uint track, SectorTagType tag,
+                                      out byte[] buffer)
+    {
+        buffer = null;
+
+        return _imageInfo.XmlMediaType != XmlMediaType.OpticalDisc || !_rawCompactDisc
+                   ? ErrorNumber.NotSupported
+                   : track != 1
+                       ? ErrorNumber.OutOfRange
+                       : ReadSectorsTag(sectorAddress, length, tag, out buffer);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/ZZZRawImage/Verify.cs b/Aaru.Images/ZZZRawImage/Verify.cs
index 6ce8356a9..2956ba86f 100644
--- a/Aaru.Images/ZZZRawImage/Verify.cs
+++ b/Aaru.Images/ZZZRawImage/Verify.cs
@@ -35,117 +35,116 @@ using System.Collections.Generic;
 using Aaru.Checksums;
 using Aaru.CommonTypes.Enums;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class ZZZRawImage
 {
-    public sealed partial class ZZZRawImage
+    /// <inheritdoc />
+    public bool? VerifySector(ulong sectorAddress)
     {
-        /// <inheritdoc />
-        public bool? VerifySector(ulong sectorAddress)
+        if(!_rawCompactDisc)
+            return null;
+
+        ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
+
+        return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        if(!_rawCompactDisc)
         {
-            if(!_rawCompactDisc)
-                return null;
-
-            ErrorNumber errno = ReadSectorLong(sectorAddress, out byte[] buffer);
-
-            return errno != ErrorNumber.NoError ? null : CdChecksums.CheckCdSector(buffer);
-        }
-
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
-        {
-            if(!_rawCompactDisc)
-            {
-                failingLbas = new List<ulong>();
-                unknownLbas = new List<ulong>();
-
-                for(ulong i = sectorAddress; i < sectorAddress + length; i++)
-                    unknownLbas.Add(i);
-
-                return null;
-            }
-
             failingLbas = new List<ulong>();
             unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
 
-            if(errno != ErrorNumber.NoError)
-                return null;
+            for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+                unknownLbas.Add(i);
 
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
-            {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
-
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
-            }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
+            return null;
         }
 
-        /// <inheritdoc />
-        public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
-                                   out List<ulong> unknownLbas)
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
         {
-            if(!_rawCompactDisc)
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+
+            switch(sectorStatus)
             {
-                failingLbas = new List<ulong>();
-                unknownLbas = new List<ulong>();
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
 
-                for(ulong i = sectorAddress; i < sectorAddress + length; i++)
-                    unknownLbas.Add(i);
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
 
-                return null;
+                    break;
             }
+        }
 
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
+    }
+
+    /// <inheritdoc />
+    public bool? VerifySectors(ulong sectorAddress, uint length, uint track, out List<ulong> failingLbas,
+                               out List<ulong> unknownLbas)
+    {
+        if(!_rawCompactDisc)
+        {
             failingLbas = new List<ulong>();
             unknownLbas = new List<ulong>();
-            ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
 
-            if(errno != ErrorNumber.NoError)
-                return null;
+            for(ulong i = sectorAddress; i < sectorAddress + length; i++)
+                unknownLbas.Add(i);
 
-            int    bps    = (int)(buffer.Length / length);
-            byte[] sector = new byte[bps];
-
-            for(int i = 0; i < length; i++)
-            {
-                Array.Copy(buffer, i * bps, sector, 0, bps);
-                bool? sectorStatus = CdChecksums.CheckCdSector(sector);
-
-                switch(sectorStatus)
-                {
-                    case null:
-                        unknownLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                    case false:
-                        failingLbas.Add((ulong)i + sectorAddress);
-
-                        break;
-                }
-            }
-
-            if(unknownLbas.Count > 0)
-                return null;
-
-            return failingLbas.Count <= 0;
+            return null;
         }
+
+        failingLbas = new List<ulong>();
+        unknownLbas = new List<ulong>();
+        ErrorNumber errno = ReadSectorsLong(sectorAddress, length, track, out byte[] buffer);
+
+        if(errno != ErrorNumber.NoError)
+            return null;
+
+        int    bps    = (int)(buffer.Length / length);
+        byte[] sector = new byte[bps];
+
+        for(int i = 0; i < length; i++)
+        {
+            Array.Copy(buffer, i * bps, sector, 0, bps);
+            bool? sectorStatus = CdChecksums.CheckCdSector(sector);
+
+            switch(sectorStatus)
+            {
+                case null:
+                    unknownLbas.Add((ulong)i + sectorAddress);
+
+                    break;
+                case false:
+                    failingLbas.Add((ulong)i + sectorAddress);
+
+                    break;
+            }
+        }
+
+        if(unknownLbas.Count > 0)
+            return null;
+
+        return failingLbas.Count <= 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Images/ZZZRawImage/Write.cs b/Aaru.Images/ZZZRawImage/Write.cs
index b5eb38bbd..906afe979 100644
--- a/Aaru.Images/ZZZRawImage/Write.cs
+++ b/Aaru.Images/ZZZRawImage/Write.cs
@@ -38,243 +38,242 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Structs;
 using Schemas;
 
-namespace Aaru.DiscImages
+namespace Aaru.DiscImages;
+
+public sealed partial class ZZZRawImage
 {
-    public sealed partial class ZZZRawImage
+    /// <inheritdoc />
+    public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
+                       uint sectorSize)
     {
-        /// <inheritdoc />
-        public bool Create(string path, MediaType mediaType, Dictionary<string, string> options, ulong sectors,
-                           uint sectorSize)
+        if(sectorSize == 0)
         {
-            if(sectorSize == 0)
-            {
-                ErrorMessage = "Unsupported sector size";
-
-                return false;
-            }
-
-            _extension = Path.GetExtension(path)?.ToLower();
-
-            switch(_extension)
-            {
-                case ".1kn" when sectorSize  != 1024:
-                case ".2kn" when sectorSize  != 2048:
-                case ".4kn" when sectorSize  != 4096:
-                case ".8kn" when sectorSize  != 8192:
-                case ".16kn" when sectorSize != 16384:
-                case ".32kn" when sectorSize != 32768:
-                case ".64kn" when sectorSize != 65536:
-                case ".512" when sectorSize  != 515:
-                case ".512e" when sectorSize != 512:
-                case ".128" when sectorSize  != 128:
-                case ".256" when sectorSize  != 256:
-                case ".iso" when sectorSize  != 2048:
-                    ErrorMessage = "The specified sector size does not correspond with the requested image extension.";
-
-                    return false;
-            }
-
-            if(!SupportedMediaTypes.Contains(mediaType))
-            {
-                ErrorMessage = $"Unsupported media format {mediaType}";
-
-                return false;
-            }
-
-            _imageInfo = new ImageInfo
-            {
-                MediaType  = mediaType,
-                SectorSize = sectorSize,
-                Sectors    = sectors
-            };
-
-            try
-            {
-                _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
-            }
-            catch(IOException e)
-            {
-                ErrorMessage = $"Could not create new image file, exception {e.Message}";
-
-                return false;
-            }
-
-            _basePath  = Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path));
-            _mediaTags = new Dictionary<MediaTagType, byte[]>();
-
-            IsWriting    = true;
-            ErrorMessage = null;
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
-
-        /// <inheritdoc />
-        public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
-        {
-            ErrorMessage = "Unsupported feature";
+            ErrorMessage = "Unsupported sector size";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+        _extension = Path.GetExtension(path)?.ToLower();
+
+        switch(_extension)
         {
-            ErrorMessage = "Unsupported feature";
+            case ".1kn" when sectorSize  != 1024:
+            case ".2kn" when sectorSize  != 2048:
+            case ".4kn" when sectorSize  != 4096:
+            case ".8kn" when sectorSize  != 8192:
+            case ".16kn" when sectorSize != 16384:
+            case ".32kn" when sectorSize != 32768:
+            case ".64kn" when sectorSize != 65536:
+            case ".512" when sectorSize  != 515:
+            case ".512e" when sectorSize != 512:
+            case ".128" when sectorSize  != 128:
+            case ".256" when sectorSize  != 256:
+            case ".iso" when sectorSize  != 2048:
+                ErrorMessage = "The specified sector size does not correspond with the requested image extension.";
+
+                return false;
+        }
+
+        if(!SupportedMediaTypes.Contains(mediaType))
+        {
+            ErrorMessage = $"Unsupported media format {mediaType}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
-
-        /// <inheritdoc />
-        public bool SetCicmMetadata(CICMMetadataType metadata) => false;
-
-        /// <inheritdoc />
-        public bool WriteMediaTag(byte[] data, MediaTagType tag)
+        _imageInfo = new ImageInfo
         {
-            if(!SupportedMediaTags.Contains(tag))
-            {
-                ErrorMessage = $"Tried to write unsupported media tag {tag}.";
+            MediaType  = mediaType,
+            SectorSize = sectorSize,
+            Sectors    = sectors
+        };
 
-                return false;
-            }
-
-            if(_mediaTags.ContainsKey(tag))
-                _mediaTags.Remove(tag);
-
-            _mediaTags.Add(tag, data);
-
-            return true;
+        try
+        {
+            _writingStream = new FileStream(path, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
         }
-
-        /// <inheritdoc />
-        public bool WriteSector(byte[] data, ulong sectorAddress)
+        catch(IOException e)
         {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length != _imageInfo.SectorSize)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress >= _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Tried to write on a non-writable image";
-
-                return false;
-            }
-
-            if(data.Length % _imageInfo.SectorSize != 0)
-            {
-                ErrorMessage = "Incorrect data size";
-
-                return false;
-            }
-
-            if(sectorAddress + length > _imageInfo.Sectors)
-            {
-                ErrorMessage = "Tried to write past image size";
-
-                return false;
-            }
-
-            _writingStream.Seek((long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
-            _writingStream.Write(data, 0, data.Length);
-
-            ErrorMessage = "";
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool WriteSectorLong(byte[] data, ulong sectorAddress)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+            ErrorMessage = $"Could not create new image file, exception {e.Message}";
 
             return false;
         }
 
-        /// <inheritdoc />
-        public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
-        {
-            ErrorMessage = "Writing sectors with tags is not supported.";
+        _basePath  = Path.Combine(Path.GetDirectoryName(path) ?? "", Path.GetFileNameWithoutExtension(path));
+        _mediaTags = new Dictionary<MediaTagType, byte[]>();
 
-            return false;
-        }
+        IsWriting    = true;
+        ErrorMessage = null;
 
-        /// <inheritdoc />
-        public bool SetTracks(List<Track> tracks)
-        {
-            if(tracks.Count <= 1)
-                return true;
-
-            ErrorMessage = "This format supports only 1 track";
-
-            return false;
-        }
-
-        /// <inheritdoc />
-        public bool Close()
-        {
-            if(!IsWriting)
-            {
-                ErrorMessage = "Image is not opened for writing";
-
-                return false;
-            }
-
-            _writingStream.Flush();
-            _writingStream.Close();
-            IsWriting = false;
-
-            foreach(KeyValuePair<MediaTagType, byte[]> tag in _mediaTags)
-            {
-                string suffix = _readWriteSidecars.Concat(_writeOnlySidecars).Where(t => t.tag == tag.Key).
-                                                   Select(t => t.name).FirstOrDefault();
-
-                if(suffix == null)
-                    continue;
-
-                var tagStream = new FileStream(_basePath + suffix, FileMode.Create, FileAccess.ReadWrite,
-                                               FileShare.None);
-
-                tagStream.Write(tag.Value, 0, tag.Value.Length);
-                tagStream.Close();
-            }
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public bool SetMetadata(ImageInfo metadata) => true;
+        return true;
     }
+
+    /// <inheritdoc />
+    public bool SetGeometry(uint cylinders, uint heads, uint sectorsPerTrack) => true;
+
+    /// <inheritdoc />
+    public bool WriteSectorTag(byte[] data, ulong sectorAddress, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsTag(byte[] data, ulong sectorAddress, uint length, SectorTagType tag)
+    {
+        ErrorMessage = "Unsupported feature";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetDumpHardware(List<DumpHardwareType> dumpHardware) => false;
+
+    /// <inheritdoc />
+    public bool SetCicmMetadata(CICMMetadataType metadata) => false;
+
+    /// <inheritdoc />
+    public bool WriteMediaTag(byte[] data, MediaTagType tag)
+    {
+        if(!SupportedMediaTags.Contains(tag))
+        {
+            ErrorMessage = $"Tried to write unsupported media tag {tag}.";
+
+            return false;
+        }
+
+        if(_mediaTags.ContainsKey(tag))
+            _mediaTags.Remove(tag);
+
+        _mediaTags.Add(tag, data);
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSector(byte[] data, ulong sectorAddress)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length != _imageInfo.SectorSize)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress >= _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectors(byte[] data, ulong sectorAddress, uint length)
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Tried to write on a non-writable image";
+
+            return false;
+        }
+
+        if(data.Length % _imageInfo.SectorSize != 0)
+        {
+            ErrorMessage = "Incorrect data size";
+
+            return false;
+        }
+
+        if(sectorAddress + length > _imageInfo.Sectors)
+        {
+            ErrorMessage = "Tried to write past image size";
+
+            return false;
+        }
+
+        _writingStream.Seek((long)(sectorAddress * _imageInfo.SectorSize), SeekOrigin.Begin);
+        _writingStream.Write(data, 0, data.Length);
+
+        ErrorMessage = "";
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorLong(byte[] data, ulong sectorAddress)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool WriteSectorsLong(byte[] data, ulong sectorAddress, uint length)
+    {
+        ErrorMessage = "Writing sectors with tags is not supported.";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool SetTracks(List<Track> tracks)
+    {
+        if(tracks.Count <= 1)
+            return true;
+
+        ErrorMessage = "This format supports only 1 track";
+
+        return false;
+    }
+
+    /// <inheritdoc />
+    public bool Close()
+    {
+        if(!IsWriting)
+        {
+            ErrorMessage = "Image is not opened for writing";
+
+            return false;
+        }
+
+        _writingStream.Flush();
+        _writingStream.Close();
+        IsWriting = false;
+
+        foreach(KeyValuePair<MediaTagType, byte[]> tag in _mediaTags)
+        {
+            string suffix = _readWriteSidecars.Concat(_writeOnlySidecars).Where(t => t.tag == tag.Key).
+                                               Select(t => t.name).FirstOrDefault();
+
+            if(suffix == null)
+                continue;
+
+            var tagStream = new FileStream(_basePath + suffix, FileMode.Create, FileAccess.ReadWrite,
+                                           FileShare.None);
+
+            tagStream.Write(tag.Value, 0, tag.Value.Length);
+            tagStream.Close();
+        }
+
+        return true;
+    }
+
+    /// <inheritdoc />
+    public bool SetMetadata(ImageInfo metadata) => true;
 }
\ No newline at end of file
diff --git a/Aaru.Images/ZZZRawImage/ZZZRawImage.cs b/Aaru.Images/ZZZRawImage/ZZZRawImage.cs
index 680ee363e..4f89f0240 100644
--- a/Aaru.Images/ZZZRawImage/ZZZRawImage.cs
+++ b/Aaru.Images/ZZZRawImage/ZZZRawImage.cs
@@ -37,47 +37,46 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.DiscImages
-{
-    /// <inheritdoc />
-    /// <summary>Implements reading and writing raw (sector by sector) images</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed partial class ZZZRawImage : IWritableOpticalImage
-    {
-        string                           _basePath;
-        bool                             _differentTrackZeroSize;
-        string                           _extension;
-        bool                             _hasSubchannel;
-        ImageInfo                        _imageInfo;
-        Dictionary<MediaTagType, byte[]> _mediaTags;
-        bool                             _mode2;
-        bool                             _rawCompactDisc;
-        IFilter                          _rawImageFilter;
-        FileStream                       _writingStream;
+namespace Aaru.DiscImages;
 
-        /// <summary>Implements reading and writing raw (sector by sector) images</summary>
-        public ZZZRawImage() => _imageInfo = new ImageInfo
-        {
-            ReadableSectorTags    = new List<SectorTagType>(),
-            ReadableMediaTags     = new List<MediaTagType>(),
-            HasPartitions         = false,
-            HasSessions           = false,
-            Version               = null,
-            Application           = null,
-            ApplicationVersion    = null,
-            Creator               = null,
-            Comments              = null,
-            MediaManufacturer     = null,
-            MediaModel            = null,
-            MediaSerialNumber     = null,
-            MediaBarcode          = null,
-            MediaPartNumber       = null,
-            MediaSequence         = 0,
-            LastMediaSequence     = 0,
-            DriveManufacturer     = null,
-            DriveModel            = null,
-            DriveSerialNumber     = null,
-            DriveFirmwareRevision = null
-        };
-    }
+/// <inheritdoc />
+/// <summary>Implements reading and writing raw (sector by sector) images</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed partial class ZZZRawImage : IWritableOpticalImage
+{
+    string                           _basePath;
+    bool                             _differentTrackZeroSize;
+    string                           _extension;
+    bool                             _hasSubchannel;
+    ImageInfo                        _imageInfo;
+    Dictionary<MediaTagType, byte[]> _mediaTags;
+    bool                             _mode2;
+    bool                             _rawCompactDisc;
+    IFilter                          _rawImageFilter;
+    FileStream                       _writingStream;
+
+    /// <summary>Implements reading and writing raw (sector by sector) images</summary>
+    public ZZZRawImage() => _imageInfo = new ImageInfo
+    {
+        ReadableSectorTags    = new List<SectorTagType>(),
+        ReadableMediaTags     = new List<MediaTagType>(),
+        HasPartitions         = false,
+        HasSessions           = false,
+        Version               = null,
+        Application           = null,
+        ApplicationVersion    = null,
+        Creator               = null,
+        Comments              = null,
+        MediaManufacturer     = null,
+        MediaModel            = null,
+        MediaSerialNumber     = null,
+        MediaBarcode          = null,
+        MediaPartNumber       = null,
+        MediaSequence         = 0,
+        LastMediaSequence     = 0,
+        DriveManufacturer     = null,
+        DriveModel            = null,
+        DriveSerialNumber     = null,
+        DriveFirmwareRevision = null
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Acorn.cs b/Aaru.Partitions/Acorn.cs
index b477c9e91..5e7b49d41 100644
--- a/Aaru.Partitions/Acorn.cs
+++ b/Aaru.Partitions/Acorn.cs
@@ -40,226 +40,225 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of Acorn partitions</summary>
+public sealed class Acorn : IPartition
 {
+    const ulong ADFS_SB_POS      = 0xC00;
+    const uint  LINUX_MAGIC      = 0xDEAFA1DE;
+    const uint  SWAP_MAGIC       = 0xDEAFAB1E;
+    const uint  RISCIX_MAGIC     = 0x4A657320;
+    const uint  TYPE_LINUX       = 9;
+    const uint  TYPE_RISCIX_MFM  = 1;
+    const uint  TYPE_RISCIX_SCSI = 2;
+    const uint  TYPE_MASK        = 15;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of Acorn partitions</summary>
-    public sealed class Acorn : IPartition
+    public string Name => "Acorn FileCore partitions";
+    /// <inheritdoc />
+    public Guid Id => new("A7C8FEBE-8D00-4933-B9F3-42184C8BA808");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        const ulong ADFS_SB_POS      = 0xC00;
-        const uint  LINUX_MAGIC      = 0xDEAFA1DE;
-        const uint  SWAP_MAGIC       = 0xDEAFAB1E;
-        const uint  RISCIX_MAGIC     = 0x4A657320;
-        const uint  TYPE_LINUX       = 9;
-        const uint  TYPE_RISCIX_MFM  = 1;
-        const uint  TYPE_RISCIX_SCSI = 2;
-        const uint  TYPE_MASK        = 15;
+        partitions = new List<Partition>();
 
-        /// <inheritdoc />
-        public string Name => "Acorn FileCore partitions";
-        /// <inheritdoc />
-        public Guid Id => new("A7C8FEBE-8D00-4933-B9F3-42184C8BA808");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ulong sbSector;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        // RISC OS always checks for the partition on 0. Afaik no emulator chains it.
+        if(sectorOffset != 0)
+            return false;
+
+        if(imagePlugin.Info.SectorSize > ADFS_SB_POS)
+            sbSector = 0;
+        else
+            sbSector = ADFS_SB_POS / imagePlugin.Info.SectorSize;
+
+        ErrorNumber errno = imagePlugin.ReadSector(sbSector, out byte[] sector);
+
+        if(errno         != ErrorNumber.NoError ||
+           sector.Length < 512)
+            return false;
+
+        AcornBootBlock bootBlock = Marshal.ByteArrayToStructureLittleEndian<AcornBootBlock>(sector);
+
+        int checksum = 0;
+
+        for(int i = 0; i < 0x1FF; i++)
+            checksum = (checksum & 0xFF) + (checksum >> 8) + sector[i];
+
+        int heads     = bootBlock.discRecord.heads + ((bootBlock.discRecord.lowsector >> 6) & 1);
+        int secCyl    = bootBlock.discRecord.spt * heads;
+        int mapSector = bootBlock.startCylinder  * secCyl;
+
+        if((ulong)mapSector >= imagePlugin.Info.Sectors)
+            return false;
+
+        errno = imagePlugin.ReadSector((ulong)mapSector, out byte[] map);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        ulong counter = 0;
+
+        if(checksum == bootBlock.checksum)
         {
-            partitions = new List<Partition>();
-
-            ulong sbSector;
-
-            // RISC OS always checks for the partition on 0. Afaik no emulator chains it.
-            if(sectorOffset != 0)
-                return false;
-
-            if(imagePlugin.Info.SectorSize > ADFS_SB_POS)
-                sbSector = 0;
-            else
-                sbSector = ADFS_SB_POS / imagePlugin.Info.SectorSize;
-
-            ErrorNumber errno = imagePlugin.ReadSector(sbSector, out byte[] sector);
-
-            if(errno         != ErrorNumber.NoError ||
-               sector.Length < 512)
-                return false;
-
-            AcornBootBlock bootBlock = Marshal.ByteArrayToStructureLittleEndian<AcornBootBlock>(sector);
-
-            int checksum = 0;
-
-            for(int i = 0; i < 0x1FF; i++)
-                checksum = (checksum & 0xFF) + (checksum >> 8) + sector[i];
-
-            int heads     = bootBlock.discRecord.heads + ((bootBlock.discRecord.lowsector >> 6) & 1);
-            int secCyl    = bootBlock.discRecord.spt * heads;
-            int mapSector = bootBlock.startCylinder  * secCyl;
-
-            if((ulong)mapSector >= imagePlugin.Info.Sectors)
-                return false;
-
-            errno = imagePlugin.ReadSector((ulong)mapSector, out byte[] map);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            ulong counter = 0;
-
-            if(checksum == bootBlock.checksum)
+            var part = new Partition
             {
-                var part = new Partition
-                {
-                    Size = ((ulong)bootBlock.discRecord.disc_size_high * 0x100000000) + bootBlock.discRecord.disc_size,
-                    Length = (((ulong)bootBlock.discRecord.disc_size_high * 0x100000000) +
-                              bootBlock.discRecord.disc_size) / imagePlugin.Info.SectorSize,
-                    Type = "ADFS",
-                    Name = StringHandlers.CToString(bootBlock.discRecord.disc_name, Encoding.GetEncoding("iso-8859-1"))
-                };
+                Size = ((ulong)bootBlock.discRecord.disc_size_high * 0x100000000) + bootBlock.discRecord.disc_size,
+                Length = (((ulong)bootBlock.discRecord.disc_size_high * 0x100000000) +
+                          bootBlock.discRecord.disc_size) / imagePlugin.Info.SectorSize,
+                Type = "ADFS",
+                Name = StringHandlers.CToString(bootBlock.discRecord.disc_name, Encoding.GetEncoding("iso-8859-1"))
+            };
 
-                if(part.Size > 0)
+            if(part.Size > 0)
+            {
+                partitions.Add(part);
+                counter++;
+            }
+        }
+
+        switch(bootBlock.flags & TYPE_MASK)
+        {
+            case TYPE_LINUX:
+            {
+                LinuxTable table = Marshal.ByteArrayToStructureLittleEndian<LinuxTable>(map);
+
+                foreach(LinuxEntry entry in table.entries)
                 {
+                    var part = new Partition
+                    {
+                        Start    = (ulong)(mapSector + entry.start),
+                        Size     = entry.size,
+                        Length   = (ulong)(entry.size * sector.Length),
+                        Sequence = counter,
+                        Scheme   = Name
+                    };
+
+                    part.Offset = part.Start * (ulong)sector.Length;
+
+                    if(entry.magic != LINUX_MAGIC &&
+                       entry.magic != SWAP_MAGIC)
+                        continue;
+
                     partitions.Add(part);
                     counter++;
                 }
+
+                break;
             }
-
-            switch(bootBlock.flags & TYPE_MASK)
+            case TYPE_RISCIX_MFM:
+            case TYPE_RISCIX_SCSI:
             {
-                case TYPE_LINUX:
-                {
-                    LinuxTable table = Marshal.ByteArrayToStructureLittleEndian<LinuxTable>(map);
+                RiscIxTable table = Marshal.ByteArrayToStructureLittleEndian<RiscIxTable>(map);
 
-                    foreach(LinuxEntry entry in table.entries)
+                if(table.magic == RISCIX_MAGIC)
+                    foreach(RiscIxEntry entry in table.partitions)
                     {
                         var part = new Partition
                         {
                             Start    = (ulong)(mapSector + entry.start),
-                            Size     = entry.size,
-                            Length   = (ulong)(entry.size * sector.Length),
+                            Size     = entry.length,
+                            Length   = (ulong)(entry.length * sector.Length),
+                            Name     = StringHandlers.CToString(entry.name, Encoding.GetEncoding("iso-8859-1")),
                             Sequence = counter,
                             Scheme   = Name
                         };
 
                         part.Offset = part.Start * (ulong)sector.Length;
 
-                        if(entry.magic != LINUX_MAGIC &&
-                           entry.magic != SWAP_MAGIC)
+                        if(entry.length <= 0)
                             continue;
 
                         partitions.Add(part);
                         counter++;
                     }
 
-                    break;
-                }
-                case TYPE_RISCIX_MFM:
-                case TYPE_RISCIX_SCSI:
-                {
-                    RiscIxTable table = Marshal.ByteArrayToStructureLittleEndian<RiscIxTable>(map);
-
-                    if(table.magic == RISCIX_MAGIC)
-                        foreach(RiscIxEntry entry in table.partitions)
-                        {
-                            var part = new Partition
-                            {
-                                Start    = (ulong)(mapSector + entry.start),
-                                Size     = entry.length,
-                                Length   = (ulong)(entry.length * sector.Length),
-                                Name     = StringHandlers.CToString(entry.name, Encoding.GetEncoding("iso-8859-1")),
-                                Sequence = counter,
-                                Scheme   = Name
-                            };
-
-                            part.Offset = part.Start * (ulong)sector.Length;
-
-                            if(entry.length <= 0)
-                                continue;
-
-                            partitions.Add(part);
-                            counter++;
-                        }
-
-                    break;
-                }
+                break;
             }
-
-            return partitions.Count != 0;
         }
 
-        [StructLayout(LayoutKind.Sequential)]
-        struct DiscRecord
-        {
-            public readonly byte   log2secsize;
-            public readonly byte   spt;
-            public readonly byte   heads;
-            public readonly byte   density;
-            public readonly byte   idlen;
-            public readonly byte   log2bpmb;
-            public readonly byte   skew;
-            public readonly byte   bootoption;
-            public readonly byte   lowsector;
-            public readonly byte   nzones;
-            public readonly ushort zone_spare;
-            public readonly uint   root;
-            public readonly uint   disc_size;
-            public readonly ushort disc_id;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly byte[] disc_name;
-            public readonly uint disc_type;
-            public readonly uint disc_size_high;
-            public readonly byte flags;
-            public readonly byte nzones_high;
-            public readonly uint format_version;
-            public readonly uint root_size;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] reserved;
-        }
+        return partitions.Count != 0;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct AcornBootBlock
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x1C0)]
-            public readonly byte[] spare;
-            public readonly DiscRecord discRecord;
-            public readonly byte       flags;
-            public readonly ushort     startCylinder;
-            public readonly byte       checksum;
-        }
+    [StructLayout(LayoutKind.Sequential)]
+    struct DiscRecord
+    {
+        public readonly byte   log2secsize;
+        public readonly byte   spt;
+        public readonly byte   heads;
+        public readonly byte   density;
+        public readonly byte   idlen;
+        public readonly byte   log2bpmb;
+        public readonly byte   skew;
+        public readonly byte   bootoption;
+        public readonly byte   lowsector;
+        public readonly byte   nzones;
+        public readonly ushort zone_spare;
+        public readonly uint   root;
+        public readonly uint   disc_size;
+        public readonly ushort disc_id;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly byte[] disc_name;
+        public readonly uint disc_type;
+        public readonly uint disc_size_high;
+        public readonly byte flags;
+        public readonly byte nzones_high;
+        public readonly uint format_version;
+        public readonly uint root_size;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] reserved;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct LinuxTable
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 42)]
-            public readonly LinuxEntry[] entries;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] padding;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct AcornBootBlock
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 0x1C0)]
+        public readonly byte[] spare;
+        public readonly DiscRecord discRecord;
+        public readonly byte       flags;
+        public readonly ushort     startCylinder;
+        public readonly byte       checksum;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct LinuxEntry
-        {
-            public readonly uint magic;
-            public readonly uint start;
-            public readonly uint size;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct LinuxTable
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 42)]
+        public readonly LinuxEntry[] entries;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] padding;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct RiscIxTable
-        {
-            public readonly uint magic;
-            public readonly uint date;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly RiscIxEntry[] partitions;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct LinuxEntry
+    {
+        public readonly uint magic;
+        public readonly uint start;
+        public readonly uint size;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct RiscIxEntry
-        {
-            public readonly uint start;
-            public readonly uint length;
-            public readonly uint one;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] name;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct RiscIxTable
+    {
+        public readonly uint magic;
+        public readonly uint date;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly RiscIxEntry[] partitions;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct RiscIxEntry
+    {
+        public readonly uint start;
+        public readonly uint length;
+        public readonly uint one;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] name;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/AppleMap.cs b/Aaru.Partitions/AppleMap.cs
index 40c263c35..7377a1cf1 100644
--- a/Aaru.Partitions/AppleMap.cs
+++ b/Aaru.Partitions/AppleMap.cs
@@ -42,211 +42,195 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+// Information about structures learnt from Inside Macintosh
+// Constants from image testing
+/// <inheritdoc />
+/// <summary>Implements decoding of the Apple Partition Map</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class AppleMap : IPartition
 {
-    // Information about structures learnt from Inside Macintosh
-    // Constants from image testing
+    /// <summary>"ER", driver descriptor magic</summary>
+    const ushort DDM_MAGIC = 0x4552;
+    /// <summary>"PM", new entry magic</summary>
+    const ushort APM_MAGIC = 0x504D;
+    /// <summary>"TS", old map magic</summary>
+    const ushort APM_MAGIC_OLD = 0x5453;
+    /// <summary>Old indicator for HFS partition, "TFS1"</summary>
+    const uint HFS_MAGIC_OLD = 0x54465331;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of the Apple Partition Map</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class AppleMap : IPartition
+    public string Name => "Apple Partition Map";
+    /// <inheritdoc />
+    public Guid Id => new("36405F8D-4F1A-07F5-209C-223D735D6D22");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        /// <summary>"ER", driver descriptor magic</summary>
-        const ushort DDM_MAGIC = 0x4552;
-        /// <summary>"PM", new entry magic</summary>
-        const ushort APM_MAGIC = 0x504D;
-        /// <summary>"TS", old map magic</summary>
-        const ushort APM_MAGIC_OLD = 0x5453;
-        /// <summary>Old indicator for HFS partition, "TFS1"</summary>
-        const uint HFS_MAGIC_OLD = 0x54465331;
+        uint sectorSize;
 
-        /// <inheritdoc />
-        public string Name => "Apple Partition Map";
-        /// <inheritdoc />
-        public Guid Id => new("36405F8D-4F1A-07F5-209C-223D735D6D22");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448)
+            sectorSize = 2048;
+        else
+            sectorSize = imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        partitions = new List<Partition>();
+
+        if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(sectorOffset, out byte[] ddmSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        ushort maxDrivers = 61;
+
+        if(sectorSize == 256)
         {
-            uint sectorSize;
+            byte[] tmp = new byte[512];
+            Array.Copy(ddmSector, 0, tmp, 0, 256);
+            ddmSector  = tmp;
+            maxDrivers = 29;
+        }
+        else if(sectorSize < 256)
+            return false;
 
-            if(imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448)
-                sectorSize = 2048;
-            else
-                sectorSize = imagePlugin.Info.SectorSize;
+        AppleDriverDescriptorMap ddm = Marshal.ByteArrayToStructureBigEndian<AppleDriverDescriptorMap>(ddmSector);
 
-            partitions = new List<Partition>();
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbSig = 0x{0:X4}", ddm.sbSig);
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbBlockSize = {0}", ddm.sbBlockSize);
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbBlocks = {0}", ddm.sbBlocks);
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDevType = {0}", ddm.sbDevType);
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDevId = {0}", ddm.sbDevId);
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbData = 0x{0:X8}", ddm.sbData);
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDrvrCount = {0}", ddm.sbDrvrCount);
 
-            if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
-                return false;
+        uint sequence = 0;
 
-            ErrorNumber errno = imagePlugin.ReadSector(sectorOffset, out byte[] ddmSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            ushort maxDrivers = 61;
-
-            if(sectorSize == 256)
+        if(ddm.sbSig == DDM_MAGIC)
+            if(ddm.sbDrvrCount < maxDrivers)
             {
-                byte[] tmp = new byte[512];
-                Array.Copy(ddmSector, 0, tmp, 0, 256);
-                ddmSector  = tmp;
-                maxDrivers = 29;
-            }
-            else if(sectorSize < 256)
-                return false;
+                ddm.sbMap = new AppleDriverEntry[ddm.sbDrvrCount];
 
-            AppleDriverDescriptorMap ddm = Marshal.ByteArrayToStructureBigEndian<AppleDriverDescriptorMap>(ddmSector);
-
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbSig = 0x{0:X4}", ddm.sbSig);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbBlockSize = {0}", ddm.sbBlockSize);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbBlocks = {0}", ddm.sbBlocks);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDevType = {0}", ddm.sbDevType);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDevId = {0}", ddm.sbDevId);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbData = 0x{0:X8}", ddm.sbData);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbDrvrCount = {0}", ddm.sbDrvrCount);
-
-            uint sequence = 0;
-
-            if(ddm.sbSig == DDM_MAGIC)
-                if(ddm.sbDrvrCount < maxDrivers)
+                for(int i = 0; i < ddm.sbDrvrCount; i++)
                 {
-                    ddm.sbMap = new AppleDriverEntry[ddm.sbDrvrCount];
+                    byte[] tmp = new byte[8];
+                    Array.Copy(ddmSector, 18 + (i * 8), tmp, 0, 8);
+                    ddm.sbMap[i] = Marshal.ByteArrayToStructureBigEndian<AppleDriverEntry>(tmp);
 
-                    for(int i = 0; i < ddm.sbDrvrCount; i++)
-                    {
-                        byte[] tmp = new byte[8];
-                        Array.Copy(ddmSector, 18 + (i * 8), tmp, 0, 8);
-                        ddm.sbMap[i] = Marshal.ByteArrayToStructureBigEndian<AppleDriverEntry>(tmp);
+                    AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddBlock = {0}",
+                                               ddm.sbMap[i].ddBlock, i);
 
-                        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddBlock = {0}",
-                                                   ddm.sbMap[i].ddBlock, i);
+                    AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddSize = {0}",
+                                               ddm.sbMap[i].ddSize, i);
 
-                        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddSize = {0}",
-                                                   ddm.sbMap[i].ddSize, i);
-
-                        AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddType = {0}",
-                                                   ddm.sbMap[i].ddType, i);
-
-                        if(ddm.sbMap[i].ddSize == 0)
-                            continue;
-
-                        var part = new Partition
-                        {
-                            Size     = (ulong)(ddm.sbMap[i].ddSize       * 512),
-                            Length   = (ulong)(ddm.sbMap[i].ddSize * 512 / sectorSize),
-                            Sequence = sequence,
-                            Offset   = ddm.sbMap[i].ddBlock * sectorSize,
-                            Start    = ddm.sbMap[i].ddBlock + sectorOffset,
-                            Type     = "Apple_Driver"
-                        };
-
-                        if(ddm.sbMap[i].ddSize * 512 % sectorSize > 0)
-                            part.Length++;
-
-                        partitions.Add(part);
-
-                        sequence++;
-                    }
-                }
-
-            errno = imagePlugin.ReadSector(1 + sectorOffset, out byte[] partSector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            AppleOldDevicePartitionMap oldMap =
-                Marshal.ByteArrayToStructureBigEndian<AppleOldDevicePartitionMap>(partSector);
-
-            // This is the easy one, no sector size mixing
-            if(oldMap.pdSig == APM_MAGIC_OLD)
-            {
-                for(int i = 2; i < partSector.Length; i += 12)
-                {
-                    byte[] tmp = new byte[12];
-                    Array.Copy(partSector, i, tmp, 0, 12);
-
-                    AppleMapOldPartitionEntry oldEntry =
-                        Marshal.ByteArrayToStructureBigEndian<AppleMapOldPartitionEntry>(tmp);
-
-                    AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdStart = {0}", oldEntry.pdStart,
-                                               (i - 2) / 12);
-
-                    AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdSize = {0}", oldEntry.pdSize,
-                                               (i - 2) / 12);
-
-                    AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdFSID = 0x{0:X8}",
-                                               oldEntry.pdFSID, (i - 2) / 12);
-
-                    if(oldEntry.pdSize == 0 &&
-                       oldEntry.pdFSID == 0)
-                    {
-                        if(oldEntry.pdStart == 0)
-                            break;
+                    AaruConsole.DebugWriteLine("AppleMap Plugin", "ddm.sbMap[{1}].ddType = {0}",
+                                               ddm.sbMap[i].ddType, i);
 
+                    if(ddm.sbMap[i].ddSize == 0)
                         continue;
-                    }
 
                     var part = new Partition
                     {
-                        Size     = oldEntry.pdStart                   * ddm.sbBlockSize,
-                        Length   = oldEntry.pdStart * ddm.sbBlockSize / sectorSize,
+                        Size     = (ulong)(ddm.sbMap[i].ddSize       * 512),
+                        Length   = (ulong)(ddm.sbMap[i].ddSize * 512 / sectorSize),
                         Sequence = sequence,
-                        Offset   = oldEntry.pdSize                   * ddm.sbBlockSize,
-                        Start    = oldEntry.pdSize * ddm.sbBlockSize / sectorSize,
-                        Scheme   = Name,
-                        Type     = oldEntry.pdFSID == HFS_MAGIC_OLD ? "Apple_HFS" : $"0x{oldEntry.pdFSID:X8}"
+                        Offset   = ddm.sbMap[i].ddBlock * sectorSize,
+                        Start    = ddm.sbMap[i].ddBlock + sectorOffset,
+                        Type     = "Apple_Driver"
                     };
 
+                    if(ddm.sbMap[i].ddSize * 512 % sectorSize > 0)
+                        part.Length++;
+
                     partitions.Add(part);
 
                     sequence++;
                 }
-
-                return partitions.Count > 0;
             }
 
-            AppleMapPartitionEntry entry;
-            uint                   entrySize;
-            uint                   entryCount;
-            uint                   sectorsToRead;
-            uint                   skipDdm;
+        errno = imagePlugin.ReadSector(1 + sectorOffset, out byte[] partSector);
 
-            // If sector is bigger than 512
-            if(ddmSector.Length > 512)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        AppleOldDevicePartitionMap oldMap =
+            Marshal.ByteArrayToStructureBigEndian<AppleOldDevicePartitionMap>(partSector);
+
+        // This is the easy one, no sector size mixing
+        if(oldMap.pdSig == APM_MAGIC_OLD)
+        {
+            for(int i = 2; i < partSector.Length; i += 12)
             {
-                byte[] tmp = new byte[512];
-                Array.Copy(ddmSector, 512, tmp, 0, 512);
-                entry = Marshal.ByteArrayToStructureBigEndian<AppleMapPartitionEntry>(tmp);
+                byte[] tmp = new byte[12];
+                Array.Copy(partSector, i, tmp, 0, 12);
 
-                // Check for a partition entry that's 512-byte aligned
-                if(entry.signature == APM_MAGIC)
-                {
-                    AaruConsole.DebugWriteLine("AppleMap Plugin", "Found misaligned entry.");
-                    entrySize     = 512;
-                    entryCount    = entry.entries;
-                    skipDdm       = 512;
-                    sectorsToRead = ((entryCount + 1) * 512 / sectorSize) + 1;
-                }
-                else
-                {
-                    entry = Marshal.ByteArrayToStructureBigEndian<AppleMapPartitionEntry>(partSector);
+                AppleMapOldPartitionEntry oldEntry =
+                    Marshal.ByteArrayToStructureBigEndian<AppleMapOldPartitionEntry>(tmp);
 
-                    if(entry.signature == APM_MAGIC)
-                    {
-                        AaruConsole.DebugWriteLine("AppleMap Plugin", "Found aligned entry.");
-                        entrySize     = sectorSize;
-                        entryCount    = entry.entries;
-                        skipDdm       = sectorSize;
-                        sectorsToRead = entryCount + 2;
-                    }
-                    else
-                        return partitions.Count > 0;
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdStart = {0}", oldEntry.pdStart,
+                                           (i - 2) / 12);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdSize = {0}", oldEntry.pdSize,
+                                           (i - 2) / 12);
+
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "old_map.sbMap[{1}].pdFSID = 0x{0:X8}",
+                                           oldEntry.pdFSID, (i - 2) / 12);
+
+                if(oldEntry.pdSize == 0 &&
+                   oldEntry.pdFSID == 0)
+                {
+                    if(oldEntry.pdStart == 0)
+                        break;
+
+                    continue;
                 }
+
+                var part = new Partition
+                {
+                    Size     = oldEntry.pdStart                   * ddm.sbBlockSize,
+                    Length   = oldEntry.pdStart * ddm.sbBlockSize / sectorSize,
+                    Sequence = sequence,
+                    Offset   = oldEntry.pdSize                   * ddm.sbBlockSize,
+                    Start    = oldEntry.pdSize * ddm.sbBlockSize / sectorSize,
+                    Scheme   = Name,
+                    Type     = oldEntry.pdFSID == HFS_MAGIC_OLD ? "Apple_HFS" : $"0x{oldEntry.pdFSID:X8}"
+                };
+
+                partitions.Add(part);
+
+                sequence++;
+            }
+
+            return partitions.Count > 0;
+        }
+
+        AppleMapPartitionEntry entry;
+        uint                   entrySize;
+        uint                   entryCount;
+        uint                   sectorsToRead;
+        uint                   skipDdm;
+
+        // If sector is bigger than 512
+        if(ddmSector.Length > 512)
+        {
+            byte[] tmp = new byte[512];
+            Array.Copy(ddmSector, 512, tmp, 0, 512);
+            entry = Marshal.ByteArrayToStructureBigEndian<AppleMapPartitionEntry>(tmp);
+
+            // Check for a partition entry that's 512-byte aligned
+            if(entry.signature == APM_MAGIC)
+            {
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "Found misaligned entry.");
+                entrySize     = 512;
+                entryCount    = entry.entries;
+                skipDdm       = 512;
+                sectorsToRead = ((entryCount + 1) * 512 / sectorSize) + 1;
             }
             else
             {
@@ -263,283 +247,298 @@ namespace Aaru.Partitions
                 else
                     return partitions.Count > 0;
             }
+        }
+        else
+        {
+            entry = Marshal.ByteArrayToStructureBigEndian<AppleMapPartitionEntry>(partSector);
 
-            errno = imagePlugin.ReadSectors(sectorOffset, sectorsToRead, out byte[] entries);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "entry_size = {0}", entrySize);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "entry_count = {0}", entryCount);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "skip_ddm = {0}", skipDdm);
-            AaruConsole.DebugWriteLine("AppleMap Plugin", "sectors_to_read = {0}", sectorsToRead);
-
-            byte[] copy = new byte[entries.Length - skipDdm];
-            Array.Copy(entries, skipDdm, copy, 0, copy.Length);
-            entries = copy;
-
-            for(int i = 0; i < entryCount; i++)
+            if(entry.signature == APM_MAGIC)
             {
-                byte[] tmp = new byte[entrySize];
-                Array.Copy(entries, i * entrySize, tmp, 0, entrySize);
-                entry = Marshal.ByteArrayToStructureBigEndian<AppleMapPartitionEntry>(tmp);
+                AaruConsole.DebugWriteLine("AppleMap Plugin", "Found aligned entry.");
+                entrySize     = sectorSize;
+                entryCount    = entry.entries;
+                skipDdm       = sectorSize;
+                sectorsToRead = entryCount + 2;
+            }
+            else
+                return partitions.Count > 0;
+        }
 
-                if(entry.signature != APM_MAGIC)
-                    continue;
+        errno = imagePlugin.ReadSectors(sectorOffset, sectorsToRead, out byte[] entries);
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].signature = 0x{1:X4}", i, entry.signature);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].reserved1 = 0x{1:X4}", i, entry.reserved1);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entries = {1}", i, entry.entries);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].start = {1}", i, entry.start);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].sectors = {1}", i, entry.sectors);
+        if(errno != ErrorNumber.NoError)
+            return false;
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].name = \"{1}\"", i,
-                                           StringHandlers.CToString(entry.name));
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "entry_size = {0}", entrySize);
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "entry_count = {0}", entryCount);
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "skip_ddm = {0}", skipDdm);
+        AaruConsole.DebugWriteLine("AppleMap Plugin", "sectors_to_read = {0}", sectorsToRead);
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].type = \"{1}\"", i,
-                                           StringHandlers.CToString(entry.type));
+        byte[] copy = new byte[entries.Length - skipDdm];
+        Array.Copy(entries, skipDdm, copy, 0, copy.Length);
+        entries = copy;
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].first_data_block = {1}", i,
-                                           entry.first_data_block);
+        for(int i = 0; i < entryCount; i++)
+        {
+            byte[] tmp = new byte[entrySize];
+            Array.Copy(entries, i * entrySize, tmp, 0, entrySize);
+            entry = Marshal.ByteArrayToStructureBigEndian<AppleMapPartitionEntry>(tmp);
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].data_sectors = {1}", i, entry.data_sectors);
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].flags = {1}", i, (AppleMapFlags)entry.flags);
+            if(entry.signature != APM_MAGIC)
+                continue;
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].first_boot_block = {1}", i,
-                                           entry.first_boot_block);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].signature = 0x{1:X4}", i, entry.signature);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].reserved1 = 0x{1:X4}", i, entry.reserved1);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entries = {1}", i, entry.entries);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].start = {1}", i, entry.start);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].sectors = {1}", i, entry.sectors);
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].boot_size = {1}", i, entry.boot_size);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].name = \"{1}\"", i,
+                                       StringHandlers.CToString(entry.name));
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].load_address = 0x{1:X8}", i,
-                                           entry.load_address);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].type = \"{1}\"", i,
+                                       StringHandlers.CToString(entry.type));
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].load_address2 = 0x{1:X8}", i,
-                                           entry.load_address2);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].first_data_block = {1}", i,
+                                       entry.first_data_block);
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entry_point = 0x{1:X8}", i, entry.entry_point);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].data_sectors = {1}", i, entry.data_sectors);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].flags = {1}", i, (AppleMapFlags)entry.flags);
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entry_point2 = 0x{1:X8}", i,
-                                           entry.entry_point2);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].first_boot_block = {1}", i,
+                                       entry.first_boot_block);
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].checksum = 0x{1:X8}", i, entry.checksum);
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].boot_size = {1}", i, entry.boot_size);
 
-                AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].processor = \"{1}\"", i,
-                                           StringHandlers.CToString(entry.processor));
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].load_address = 0x{1:X8}", i,
+                                       entry.load_address);
 
-                var flags = (AppleMapFlags)entry.flags;
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].load_address2 = 0x{1:X8}", i,
+                                       entry.load_address2);
 
-                // BeOS doesn't mark its partitions as valid
-                //if(flags.HasFlag(AppleMapFlags.Valid) &&
-                if(StringHandlers.CToString(entry.type) == "Apple_partition_map" ||
-                   entry.sectors                        <= 0)
-                    continue;
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entry_point = 0x{1:X8}", i, entry.entry_point);
 
-                var sb = new StringBuilder();
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].entry_point2 = 0x{1:X8}", i,
+                                       entry.entry_point2);
 
-                var partition = new Partition
-                {
-                    Sequence = sequence,
-                    Type     = StringHandlers.CToString(entry.type),
-                    Name     = StringHandlers.CToString(entry.name),
-                    Offset   = entry.start   * entrySize,
-                    Size     = entry.sectors * entrySize,
-                    Start    = (entry.start * entrySize / sectorSize) + sectorOffset,
-                    Length   = entry.sectors * entrySize / sectorSize,
-                    Scheme   = Name
-                };
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].checksum = 0x{1:X8}", i, entry.checksum);
 
-                sb.AppendLine("Partition flags:");
+            AaruConsole.DebugWriteLine("AppleMap Plugin", "dpme[{0}].processor = \"{1}\"", i,
+                                       StringHandlers.CToString(entry.processor));
 
-                if(flags.HasFlag(AppleMapFlags.Valid))
-                    sb.AppendLine("Partition is valid.");
+            var flags = (AppleMapFlags)entry.flags;
 
-                if(flags.HasFlag(AppleMapFlags.Allocated))
-                    sb.AppendLine("Partition entry is allocated.");
+            // BeOS doesn't mark its partitions as valid
+            //if(flags.HasFlag(AppleMapFlags.Valid) &&
+            if(StringHandlers.CToString(entry.type) == "Apple_partition_map" ||
+               entry.sectors                        <= 0)
+                continue;
 
-                if(flags.HasFlag(AppleMapFlags.InUse))
-                    sb.AppendLine("Partition is in use.");
+            var sb = new StringBuilder();
 
-                if(flags.HasFlag(AppleMapFlags.Bootable))
-                    sb.AppendLine("Partition is bootable.");
+            var partition = new Partition
+            {
+                Sequence = sequence,
+                Type     = StringHandlers.CToString(entry.type),
+                Name     = StringHandlers.CToString(entry.name),
+                Offset   = entry.start   * entrySize,
+                Size     = entry.sectors * entrySize,
+                Start    = (entry.start * entrySize / sectorSize) + sectorOffset,
+                Length   = entry.sectors * entrySize / sectorSize,
+                Scheme   = Name
+            };
 
-                if(flags.HasFlag(AppleMapFlags.Readable))
-                    sb.AppendLine("Partition is readable.");
+            sb.AppendLine("Partition flags:");
 
-                if(flags.HasFlag(AppleMapFlags.Writable))
-                    sb.AppendLine("Partition is writable.");
+            if(flags.HasFlag(AppleMapFlags.Valid))
+                sb.AppendLine("Partition is valid.");
 
-                if(flags.HasFlag(AppleMapFlags.Bootable))
-                {
-                    sb.AppendFormat("First boot sector: {0}", entry.first_boot_block * entrySize / sectorSize).
-                       AppendLine();
+            if(flags.HasFlag(AppleMapFlags.Allocated))
+                sb.AppendLine("Partition entry is allocated.");
 
-                    sb.AppendFormat("Boot is {0} bytes.", entry.boot_size).AppendLine();
-                    sb.AppendFormat("Boot load address: 0x{0:X8}", entry.load_address).AppendLine();
-                    sb.AppendFormat("Boot entry point: 0x{0:X8}", entry.entry_point).AppendLine();
-                    sb.AppendFormat("Boot code checksum: 0x{0:X8}", entry.checksum).AppendLine();
-                    sb.AppendFormat("Processor: {0}", StringHandlers.CToString(entry.processor)).AppendLine();
+            if(flags.HasFlag(AppleMapFlags.InUse))
+                sb.AppendLine("Partition is in use.");
 
-                    if(flags.HasFlag(AppleMapFlags.PicCode))
-                        sb.AppendLine("Partition's boot code is position independent.");
-                }
+            if(flags.HasFlag(AppleMapFlags.Bootable))
+                sb.AppendLine("Partition is bootable.");
 
-                partition.Description = sb.ToString();
+            if(flags.HasFlag(AppleMapFlags.Readable))
+                sb.AppendLine("Partition is readable.");
 
-                if(partition.Start < imagePlugin.Info.Sectors &&
-                   partition.End   < imagePlugin.Info.Sectors)
-                {
-                    partitions.Add(partition);
-                    sequence++;
-                }
+            if(flags.HasFlag(AppleMapFlags.Writable))
+                sb.AppendLine("Partition is writable.");
 
-                // Some CD and DVDs end with an Apple_Free that expands beyond the disc size...
-                else if(partition.Start < imagePlugin.Info.Sectors)
-                {
-                    AaruConsole.DebugWriteLine("AppleMap Plugin",
-                                               "Cutting last partition end ({0}) to media size ({1})", partition.End,
-                                               imagePlugin.Info.Sectors - 1);
+            if(flags.HasFlag(AppleMapFlags.Bootable))
+            {
+                sb.AppendFormat("First boot sector: {0}", entry.first_boot_block * entrySize / sectorSize).
+                   AppendLine();
 
-                    partition.Length = imagePlugin.Info.Sectors - partition.Start;
-                    partitions.Add(partition);
-                    sequence++;
-                }
-                else
-                    AaruConsole.DebugWriteLine("AppleMap Plugin",
-                                               "Not adding partition because start ({0}) is outside media size ({1})",
-                                               partition.Start, imagePlugin.Info.Sectors - 1);
+                sb.AppendFormat("Boot is {0} bytes.", entry.boot_size).AppendLine();
+                sb.AppendFormat("Boot load address: 0x{0:X8}", entry.load_address).AppendLine();
+                sb.AppendFormat("Boot entry point: 0x{0:X8}", entry.entry_point).AppendLine();
+                sb.AppendFormat("Boot code checksum: 0x{0:X8}", entry.checksum).AppendLine();
+                sb.AppendFormat("Processor: {0}", StringHandlers.CToString(entry.processor)).AppendLine();
+
+                if(flags.HasFlag(AppleMapFlags.PicCode))
+                    sb.AppendLine("Partition's boot code is position independent.");
             }
 
-            return partitions.Count > 0;
+            partition.Description = sb.ToString();
+
+            if(partition.Start < imagePlugin.Info.Sectors &&
+               partition.End   < imagePlugin.Info.Sectors)
+            {
+                partitions.Add(partition);
+                sequence++;
+            }
+
+            // Some CD and DVDs end with an Apple_Free that expands beyond the disc size...
+            else if(partition.Start < imagePlugin.Info.Sectors)
+            {
+                AaruConsole.DebugWriteLine("AppleMap Plugin",
+                                           "Cutting last partition end ({0}) to media size ({1})", partition.End,
+                                           imagePlugin.Info.Sectors - 1);
+
+                partition.Length = imagePlugin.Info.Sectors - partition.Start;
+                partitions.Add(partition);
+                sequence++;
+            }
+            else
+                AaruConsole.DebugWriteLine("AppleMap Plugin",
+                                           "Not adding partition because start ({0}) is outside media size ({1})",
+                                           partition.Start, imagePlugin.Info.Sectors - 1);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct AppleDriverDescriptorMap
-        {
-            /// <summary>Signature <see cref="DDM_MAGIC" /></summary>
-            public readonly ushort sbSig;
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort sbBlockSize;
-            /// <summary>Sectors of the disk</summary>
-            public readonly uint sbBlocks;
-            /// <summary>Device type</summary>
-            public readonly ushort sbDevType;
-            /// <summary>Device ID</summary>
-            public readonly ushort sbDevId;
-            /// <summary>Reserved</summary>
-            public readonly uint sbData;
-            /// <summary>Number of entries of the driver descriptor</summary>
-            public readonly ushort sbDrvrCount;
-            /// <summary>Entries of the driver descriptor</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 61)]
-            public AppleDriverEntry[] sbMap;
-        }
+        return partitions.Count > 0;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct AppleDriverEntry
-        {
-            /// <summary>First sector of the driver</summary>
-            public readonly uint ddBlock;
-            /// <summary>Size in 512bytes sectors of the driver</summary>
-            public readonly ushort ddSize;
-            /// <summary>Operating system (MacOS = 1)</summary>
-            public readonly ushort ddType;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct AppleDriverDescriptorMap
+    {
+        /// <summary>Signature <see cref="DDM_MAGIC" /></summary>
+        public readonly ushort sbSig;
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort sbBlockSize;
+        /// <summary>Sectors of the disk</summary>
+        public readonly uint sbBlocks;
+        /// <summary>Device type</summary>
+        public readonly ushort sbDevType;
+        /// <summary>Device ID</summary>
+        public readonly ushort sbDevId;
+        /// <summary>Reserved</summary>
+        public readonly uint sbData;
+        /// <summary>Number of entries of the driver descriptor</summary>
+        public readonly ushort sbDrvrCount;
+        /// <summary>Entries of the driver descriptor</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 61)]
+        public AppleDriverEntry[] sbMap;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct AppleOldDevicePartitionMap
-        {
-            /// <summary>Signature <see cref="APM_MAGIC_OLD" /></summary>
-            public readonly ushort pdSig;
-            /// <summary>Entries of the driver descriptor</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 42)]
-            public readonly AppleMapOldPartitionEntry[] pdMap;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct AppleDriverEntry
+    {
+        /// <summary>First sector of the driver</summary>
+        public readonly uint ddBlock;
+        /// <summary>Size in 512bytes sectors of the driver</summary>
+        public readonly ushort ddSize;
+        /// <summary>Operating system (MacOS = 1)</summary>
+        public readonly ushort ddType;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct AppleMapOldPartitionEntry
-        {
-            /// <summary>First sector of the partition</summary>
-            public readonly uint pdStart;
-            /// <summary>Number of sectors of the partition</summary>
-            public readonly uint pdSize;
-            /// <summary>Partition type</summary>
-            public readonly uint pdFSID;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct AppleOldDevicePartitionMap
+    {
+        /// <summary>Signature <see cref="APM_MAGIC_OLD" /></summary>
+        public readonly ushort pdSig;
+        /// <summary>Entries of the driver descriptor</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 42)]
+        public readonly AppleMapOldPartitionEntry[] pdMap;
+    }
 
-        [Flags]
-        enum AppleMapFlags : uint
-        {
-            /// <summary>Partition is valid</summary>
-            Valid = 0x01,
-            /// <summary>Partition is allocated</summary>
-            Allocated = 0x02,
-            /// <summary>Partition is in use</summary>
-            InUse = 0x04,
-            /// <summary>Partition is bootable</summary>
-            Bootable = 0x08,
-            /// <summary>Partition is readable</summary>
-            Readable = 0x10,
-            /// <summary>Partition is writable</summary>
-            Writable = 0x20,
-            /// <summary>Partition boot code is position independent</summary>
-            PicCode = 0x40,
-            /// <summary>OS specific flag</summary>
-            Specific1 = 0x80,
-            /// <summary>OS specific flag</summary>
-            Specific2 = 0x100,
-            /// <summary>Unknown, seen in the wild</summary>
-            Unknown = 0x200,
-            /// <summary>Unknown, seen in the wild</summary>
-            Unknown2 = 0x40000000,
-            /// <summary>Reserved, not seen in the wild</summary>
-            Reserved = 0xBFFFFC00
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct AppleMapOldPartitionEntry
+    {
+        /// <summary>First sector of the partition</summary>
+        public readonly uint pdStart;
+        /// <summary>Number of sectors of the partition</summary>
+        public readonly uint pdSize;
+        /// <summary>Partition type</summary>
+        public readonly uint pdFSID;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct AppleMapPartitionEntry
-        {
-            /// <summary>Signature <see cref="APM_MAGIC" /></summary>
-            public readonly ushort signature;
-            /// <summary>Reserved</summary>
-            public readonly ushort reserved1;
-            /// <summary>Number of entries on the partition map, each one sector</summary>
-            public readonly uint entries;
-            /// <summary>First sector of the partition</summary>
-            public readonly uint start;
-            /// <summary>Number of sectos of the partition</summary>
-            public readonly uint sectors;
-            /// <summary>Partition name, 32 bytes, null-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] name;
-            /// <summary>Partition type. 32 bytes, null-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] type;
-            /// <summary>First sector of the data area</summary>
-            public readonly uint first_data_block;
-            /// <summary>Number of sectors of the data area</summary>
-            public readonly uint data_sectors;
-            /// <summary>Partition flags</summary>
-            public readonly uint flags;
-            /// <summary>First sector of the boot code</summary>
-            public readonly uint first_boot_block;
-            /// <summary>Size in bytes of the boot code</summary>
-            public readonly uint boot_size;
-            /// <summary>Load address of the boot code</summary>
-            public readonly uint load_address;
-            /// <summary>Load address of the boot code</summary>
-            public readonly uint load_address2;
-            /// <summary>Entry point of the boot code</summary>
-            public readonly uint entry_point;
-            /// <summary>Entry point of the boot code</summary>
-            public readonly uint entry_point2;
-            /// <summary>Boot code checksum</summary>
-            public readonly uint checksum;
-            /// <summary>Processor type, 16 bytes, null-padded</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] processor;
-            /// <summary>Boot arguments</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly uint[] boot_arguments;
-        }
+    [Flags]
+    enum AppleMapFlags : uint
+    {
+        /// <summary>Partition is valid</summary>
+        Valid = 0x01,
+        /// <summary>Partition is allocated</summary>
+        Allocated = 0x02,
+        /// <summary>Partition is in use</summary>
+        InUse = 0x04,
+        /// <summary>Partition is bootable</summary>
+        Bootable = 0x08,
+        /// <summary>Partition is readable</summary>
+        Readable = 0x10,
+        /// <summary>Partition is writable</summary>
+        Writable = 0x20,
+        /// <summary>Partition boot code is position independent</summary>
+        PicCode = 0x40,
+        /// <summary>OS specific flag</summary>
+        Specific1 = 0x80,
+        /// <summary>OS specific flag</summary>
+        Specific2 = 0x100,
+        /// <summary>Unknown, seen in the wild</summary>
+        Unknown = 0x200,
+        /// <summary>Unknown, seen in the wild</summary>
+        Unknown2 = 0x40000000,
+        /// <summary>Reserved, not seen in the wild</summary>
+        Reserved = 0xBFFFFC00
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct AppleMapPartitionEntry
+    {
+        /// <summary>Signature <see cref="APM_MAGIC" /></summary>
+        public readonly ushort signature;
+        /// <summary>Reserved</summary>
+        public readonly ushort reserved1;
+        /// <summary>Number of entries on the partition map, each one sector</summary>
+        public readonly uint entries;
+        /// <summary>First sector of the partition</summary>
+        public readonly uint start;
+        /// <summary>Number of sectos of the partition</summary>
+        public readonly uint sectors;
+        /// <summary>Partition name, 32 bytes, null-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] name;
+        /// <summary>Partition type. 32 bytes, null-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] type;
+        /// <summary>First sector of the data area</summary>
+        public readonly uint first_data_block;
+        /// <summary>Number of sectors of the data area</summary>
+        public readonly uint data_sectors;
+        /// <summary>Partition flags</summary>
+        public readonly uint flags;
+        /// <summary>First sector of the boot code</summary>
+        public readonly uint first_boot_block;
+        /// <summary>Size in bytes of the boot code</summary>
+        public readonly uint boot_size;
+        /// <summary>Load address of the boot code</summary>
+        public readonly uint load_address;
+        /// <summary>Load address of the boot code</summary>
+        public readonly uint load_address2;
+        /// <summary>Entry point of the boot code</summary>
+        public readonly uint entry_point;
+        /// <summary>Entry point of the boot code</summary>
+        public readonly uint entry_point2;
+        /// <summary>Boot code checksum</summary>
+        public readonly uint checksum;
+        /// <summary>Processor type, 16 bytes, null-padded</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] processor;
+        /// <summary>Boot arguments</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly uint[] boot_arguments;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Apricot.cs b/Aaru.Partitions/Apricot.cs
index ef7f6d449..2e0f21d4a 100644
--- a/Aaru.Partitions/Apricot.cs
+++ b/Aaru.Partitions/Apricot.cs
@@ -40,548 +40,547 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of Apricot partitions</summary>
+public sealed class Apricot : IPartition
 {
-    /// <inheritdoc />
-    /// <summary>Implements decoding of Apricot partitions</summary>
-    public sealed class Apricot : IPartition
+    readonly int[] _baudRates =
     {
-        readonly int[] _baudRates =
+        50, 75, 110, 134, 150, 300, 600, 1200, 1800, 2400, 3600, 4800, 7200, 9600, 19200
+    };
+    readonly string[] _bootTypeCodes =
+    {
+        "Non-bootable", "Apricot & XI RAM BIOS", "Generic ROM BIOS", "Apricot & XI ROM BIOS",
+        "Apricot Portable ROM BIOS", "Apricot F1 ROM BIOS"
+    };
+    readonly string[] _diskTypeCodes =
+    {
+        "MF1DD 70-track", "MF1DD", "MF2DD", "Winchester 5M", "Winchester 10M", "Winchester 20M"
+    };
+    readonly int[] _lineModes =
+    {
+        256, 200
+    };
+    readonly int[] _lineWidths =
+    {
+        80, 40
+    };
+    readonly string[] _operatingSystemCodes =
+    {
+        "Invalid", "MS-DOS", "UCSD Pascal", "CP/M", "Concurrent CP/M"
+    };
+    readonly string[] _parityTypes =
+    {
+        "None", "Odd", "Even", "Mark", "Space"
+    };
+    readonly string[] _printDevices =
+    {
+        "Parallel", "Serial"
+    };
+    readonly double[] _stopBits =
+    {
+        1, 1.5, 2
+    };
+
+    /// <inheritdoc />
+    public string Name => "ACT Apricot partitions";
+    /// <inheritdoc />
+    public Guid Id => new("8CBF5864-7B5A-47A0-8CEB-199C74FA22DE");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+    {
+        partitions = new List<Partition>();
+
+        // I think Apricot can't chain partitions so.
+        if(sectorOffset != 0)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] sector);
+
+        if(errno         != ErrorNumber.NoError ||
+           sector.Length < 512)
+            return false;
+
+        Label label = Marshal.ByteArrayToStructureLittleEndian<Label>(sector);
+
+        // Not much to check but...
+        ulong deviceSectors              = imagePlugin.Info.Sectors;
+        ulong deviceSizeAccordingToLabel = label.cylinders * label.heads * label.spt;
+
+        if(label.operatingSystem      > 4             ||
+           label.bootType             > 5             ||
+           label.partitionCount       > 8             ||
+           deviceSizeAccordingToLabel > deviceSectors ||
+           label.firstDataBlock       > deviceSectors)
+            return false;
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.version = \"{0}\"",
+                                   StringHandlers.CToString(label.version));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.operatingSystem = {0} ({1})", label.operatingSystem,
+                                   label.operatingSystem < _operatingSystemCodes.Length
+                                       ? _operatingSystemCodes[label.operatingSystem] : "Unknown");
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.writeProtected = {0}", label.writeProtected);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.copyProtected = {0}", label.copyProtected);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.bootType = {0} ({1})", label.bootType,
+                                   label.bootType < _bootTypeCodes.Length ? _bootTypeCodes[label.bootType]
+                                       : "Unknown");
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.partitionCount = {0}", label.partitionCount);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.winchester = {0}", label.winchester);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.sectorSize = {0}", label.sectorSize);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.spt = {0}", label.spt);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.cylinders = {0}", label.cylinders);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.heads = {0}", label.heads);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.interleave = {0}", label.interleave);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.skew = {0}", label.skew);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.bootLocation = {0}", label.bootLocation);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.bootSize = {0}", label.bootSize);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.bootAddress = 0x{0:X8}", label.bootAddress);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.bootOffset:label.bootSegment = {0:X4}:{1:X4}",
+                                   label.bootOffset, label.bootSegment);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.firstDataBlock = {0}", label.firstDataBlock);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.generation = {0}", label.generation);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.copyCount = {0}", label.copyCount);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.maxCopies = {0}", label.maxCopies);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.serialNumber = \"{0}\"",
+                                   StringHandlers.CToString(label.serialNumber));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.partNumber = \"{0}\"",
+                                   StringHandlers.CToString(label.partNumber));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.copyright = \"{0}\"",
+                                   StringHandlers.CToString(label.copyright));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.bps = {0}", label.mainBPB.bps);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.spc = {0}", label.mainBPB.spc);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.rsectors = {0}", label.mainBPB.rsectors);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.fats_no = {0}", label.mainBPB.fats_no);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.root_ent = {0}", label.mainBPB.root_ent);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.sectors = {0}", label.mainBPB.sectors);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.media = {0}", label.mainBPB.media);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.spfat = {0}", label.mainBPB.spfat);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.diskType = {0} ({1})",
+                                   label.mainBPB.diskType,
+                                   label.mainBPB.diskType < _diskTypeCodes.Length
+                                       ? _diskTypeCodes[label.mainBPB.diskType] : "Unknown");
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.startSector = {0}",
+                                   label.mainBPB.startSector);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.fontName = \"{0}\"",
+                                   StringHandlers.CToString(label.fontName));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardName = \"{0}\"",
+                                   StringHandlers.CToString(label.keyboardName));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.biosMajorVersion = {0}", label.biosMajorVersion);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.biosMinorVersion = {0}", label.biosMinorVersion);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.diagnosticsFlag = {0}", label.diagnosticsFlag);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.prnDevice = {0} ({1})", label.prnDevice,
+                                   label.prnDevice < _printDevices.Length ? _printDevices[label.prnDevice]
+                                       : "Unknown");
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.bellVolume = {0}", label.bellVolume);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.enableCache = {0}", label.enableCache);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.enableGraphics = {0}", label.enableGraphics);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.dosLength = {0}", label.dosLength);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.fontLength = {0}", label.fontLength);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardLength = {0}", label.keyboardLength);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.dosStart = {0}", label.dosStart);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.fontStart = {0}", label.fontStart);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardStart = {0}", label.keyboardStart);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardVolume = {0}", label.keyboardVolume);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeat = {0}", label.autorepeat);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeatLeadIn = {0}", label.autorepeatLeadIn);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeatInterval = {0}",
+                                   label.autorepeatInterval);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.microscreenMode = {0}", label.microscreenMode);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.spareKeyboard is null? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(label.spareKeyboard));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.lineMode = {0} ({1} lines)", label.lineMode,
+                                   label.lineMode < _lineModes.Length ? _lineModes[label.lineMode] : 0);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.lineWidth = {0} ({1} columns)", label.lineWidth,
+                                   label.lineWidth < _lineWidths.Length ? _lineWidths[label.lineWidth] : 0);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.imageOff = {0}", label.imageOff);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.spareScreen is null? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(label.spareScreen));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.txBaudRate = {0} ({1} bps)", label.txBaudRate,
+                                   label.txBaudRate < _baudRates.Length ? _baudRates[label.txBaudRate] : 0);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.rxBaudRate = {0} ({1} bps)", label.rxBaudRate,
+                                   label.rxBaudRate < _baudRates.Length ? _baudRates[label.rxBaudRate] : 0);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.txBits = {0}", label.txBits);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.rxBits = {0}", label.rxBits);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.stopBits = {0} ({1} bits)", label.stopBits,
+                                   label.stopBits < _stopBits.Length ? _stopBits[label.stopBits] : 0);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.parityCheck = {0}", label.parityCheck);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.parityType = {0} ({1})", label.parityType,
+                                   label.parityType < _parityTypes.Length ? _parityTypes[label.parityType]
+                                       : "Unknown");
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.txXonXoff = {0}", label.txXonXoff);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.rxXonXoff = {0}", label.rxXonXoff);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.xonCharacter = {0}", label.xonCharacter);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.xoffCharacter = {0}", label.xoffCharacter);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.rxXonXoffBuffer = {0}", label.rxXonXoffBuffer);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.dtrDsr = {0}", label.dtrDsr);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.ctsRts = {0}", label.ctsRts);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.nullsAfterCr = {0}", label.nullsAfterCr);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.nullsAfterFF = {0}", label.nullsAfterFF);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.lfAfterCRSerial = {0}", label.lfAfterCRSerial);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.biosErrorReportSerial = {0}",
+                                   label.biosErrorReportSerial);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.spareSerial is null? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(label.spareSerial));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.lfAfterCrParallel = {0}", label.lfAfterCrParallel);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.selectLine = {0}", label.selectLine);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.paperEmpty = {0}", label.paperEmpty);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.faultLine = {0}", label.faultLine);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.biosErrorReportParallel = {0}",
+                                   label.biosErrorReportParallel);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.spareParallel is null? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(label.spareParallel));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.spareWinchester is null? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(label.spareWinchester));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.parkingEnabled = {0}", label.parkingEnabled);
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.formatProtection = {0}", label.formatProtection);
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.spareRamDisk is null? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(label.spareRamDisk));
+
+        for(int i = 0; i < 32; i++)
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.badBlocks[{1}] = {0}", label.badBlocks[i], i);
+
+        for(int i = 0; i < 8; i++)
         {
-            50, 75, 110, 134, 150, 300, 600, 1200, 1800, 2400, 3600, 4800, 7200, 9600, 19200
-        };
-        readonly string[] _bootTypeCodes =
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].bps = {0}",
+                                       label.partitions[i].bps, i);
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].spc = {0}",
+                                       label.partitions[i].spc, i);
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].rsectors = {0}",
+                                       label.partitions[i].rsectors, i);
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].fats_no = {0}",
+                                       label.partitions[i].fats_no, i);
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].root_ent = {0}",
+                                       label.partitions[i].root_ent, i);
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].sectors = {0}",
+                                       label.partitions[i].sectors, i);
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].media = {0}",
+                                       label.partitions[i].media, i);
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].spfat = {0}",
+                                       label.partitions[i].spfat, i);
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].diskType = {0} ({2})",
+                                       label.partitions[i].diskType, i,
+                                       label.partitions[i].diskType < _diskTypeCodes.Length
+                                           ? _diskTypeCodes[label.partitions[i].diskType] : "Unknown");
+
+            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].startSector = {0}",
+                                       label.partitions[i].startSector, i);
+        }
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.spare is null? = {0}",
+                                   ArrayHelpers.ArrayIsNullOrEmpty(label.spare));
+
+        AaruConsole.DebugWriteLine("Apricot partitions", "label.cpmDoubleSided = {0}", label.cpmDoubleSided);
+
+        // Only hard disks can contain partitions
+        if(!label.winchester)
+            return false;
+
+        for(byte i = 0; i < label.partitionCount; i++)
         {
-            "Non-bootable", "Apricot & XI RAM BIOS", "Generic ROM BIOS", "Apricot & XI ROM BIOS",
-            "Apricot Portable ROM BIOS", "Apricot F1 ROM BIOS"
-        };
-        readonly string[] _diskTypeCodes =
-        {
-            "MF1DD 70-track", "MF1DD", "MF2DD", "Winchester 5M", "Winchester 10M", "Winchester 20M"
-        };
-        readonly int[] _lineModes =
-        {
-            256, 200
-        };
-        readonly int[] _lineWidths =
-        {
-            80, 40
-        };
-        readonly string[] _operatingSystemCodes =
-        {
-            "Invalid", "MS-DOS", "UCSD Pascal", "CP/M", "Concurrent CP/M"
-        };
-        readonly string[] _parityTypes =
-        {
-            "None", "Odd", "Even", "Mark", "Space"
-        };
-        readonly string[] _printDevices =
-        {
-            "Parallel", "Serial"
-        };
-        readonly double[] _stopBits =
-        {
-            1, 1.5, 2
-        };
-
-        /// <inheritdoc />
-        public string Name => "ACT Apricot partitions";
-        /// <inheritdoc />
-        public Guid Id => new("8CBF5864-7B5A-47A0-8CEB-199C74FA22DE");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
-        {
-            partitions = new List<Partition>();
-
-            // I think Apricot can't chain partitions so.
-            if(sectorOffset != 0)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] sector);
-
-            if(errno         != ErrorNumber.NoError ||
-               sector.Length < 512)
-                return false;
-
-            Label label = Marshal.ByteArrayToStructureLittleEndian<Label>(sector);
-
-            // Not much to check but...
-            ulong deviceSectors              = imagePlugin.Info.Sectors;
-            ulong deviceSizeAccordingToLabel = label.cylinders * label.heads * label.spt;
-
-            if(label.operatingSystem      > 4             ||
-               label.bootType             > 5             ||
-               label.partitionCount       > 8             ||
-               deviceSizeAccordingToLabel > deviceSectors ||
-               label.firstDataBlock       > deviceSectors)
-                return false;
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.version = \"{0}\"",
-                                       StringHandlers.CToString(label.version));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.operatingSystem = {0} ({1})", label.operatingSystem,
-                                       label.operatingSystem < _operatingSystemCodes.Length
-                                           ? _operatingSystemCodes[label.operatingSystem] : "Unknown");
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.writeProtected = {0}", label.writeProtected);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.copyProtected = {0}", label.copyProtected);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.bootType = {0} ({1})", label.bootType,
-                                       label.bootType < _bootTypeCodes.Length ? _bootTypeCodes[label.bootType]
-                                           : "Unknown");
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.partitionCount = {0}", label.partitionCount);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.winchester = {0}", label.winchester);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.sectorSize = {0}", label.sectorSize);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.spt = {0}", label.spt);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.cylinders = {0}", label.cylinders);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.heads = {0}", label.heads);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.interleave = {0}", label.interleave);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.skew = {0}", label.skew);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.bootLocation = {0}", label.bootLocation);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.bootSize = {0}", label.bootSize);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.bootAddress = 0x{0:X8}", label.bootAddress);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.bootOffset:label.bootSegment = {0:X4}:{1:X4}",
-                                       label.bootOffset, label.bootSegment);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.firstDataBlock = {0}", label.firstDataBlock);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.generation = {0}", label.generation);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.copyCount = {0}", label.copyCount);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.maxCopies = {0}", label.maxCopies);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.serialNumber = \"{0}\"",
-                                       StringHandlers.CToString(label.serialNumber));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.partNumber = \"{0}\"",
-                                       StringHandlers.CToString(label.partNumber));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.copyright = \"{0}\"",
-                                       StringHandlers.CToString(label.copyright));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.bps = {0}", label.mainBPB.bps);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.spc = {0}", label.mainBPB.spc);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.rsectors = {0}", label.mainBPB.rsectors);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.fats_no = {0}", label.mainBPB.fats_no);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.root_ent = {0}", label.mainBPB.root_ent);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.sectors = {0}", label.mainBPB.sectors);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.media = {0}", label.mainBPB.media);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.spfat = {0}", label.mainBPB.spfat);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.diskType = {0} ({1})",
-                                       label.mainBPB.diskType,
-                                       label.mainBPB.diskType < _diskTypeCodes.Length
-                                           ? _diskTypeCodes[label.mainBPB.diskType] : "Unknown");
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.mainBPB.startSector = {0}",
-                                       label.mainBPB.startSector);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.fontName = \"{0}\"",
-                                       StringHandlers.CToString(label.fontName));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardName = \"{0}\"",
-                                       StringHandlers.CToString(label.keyboardName));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.biosMajorVersion = {0}", label.biosMajorVersion);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.biosMinorVersion = {0}", label.biosMinorVersion);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.diagnosticsFlag = {0}", label.diagnosticsFlag);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.prnDevice = {0} ({1})", label.prnDevice,
-                                       label.prnDevice < _printDevices.Length ? _printDevices[label.prnDevice]
-                                           : "Unknown");
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.bellVolume = {0}", label.bellVolume);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.enableCache = {0}", label.enableCache);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.enableGraphics = {0}", label.enableGraphics);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.dosLength = {0}", label.dosLength);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.fontLength = {0}", label.fontLength);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardLength = {0}", label.keyboardLength);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.dosStart = {0}", label.dosStart);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.fontStart = {0}", label.fontStart);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardStart = {0}", label.keyboardStart);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.keyboardVolume = {0}", label.keyboardVolume);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeat = {0}", label.autorepeat);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeatLeadIn = {0}", label.autorepeatLeadIn);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.autorepeatInterval = {0}",
-                                       label.autorepeatInterval);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.microscreenMode = {0}", label.microscreenMode);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.spareKeyboard is null? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareKeyboard));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.lineMode = {0} ({1} lines)", label.lineMode,
-                                       label.lineMode < _lineModes.Length ? _lineModes[label.lineMode] : 0);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.lineWidth = {0} ({1} columns)", label.lineWidth,
-                                       label.lineWidth < _lineWidths.Length ? _lineWidths[label.lineWidth] : 0);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.imageOff = {0}", label.imageOff);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.spareScreen is null? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareScreen));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.txBaudRate = {0} ({1} bps)", label.txBaudRate,
-                                       label.txBaudRate < _baudRates.Length ? _baudRates[label.txBaudRate] : 0);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.rxBaudRate = {0} ({1} bps)", label.rxBaudRate,
-                                       label.rxBaudRate < _baudRates.Length ? _baudRates[label.rxBaudRate] : 0);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.txBits = {0}", label.txBits);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.rxBits = {0}", label.rxBits);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.stopBits = {0} ({1} bits)", label.stopBits,
-                                       label.stopBits < _stopBits.Length ? _stopBits[label.stopBits] : 0);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.parityCheck = {0}", label.parityCheck);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.parityType = {0} ({1})", label.parityType,
-                                       label.parityType < _parityTypes.Length ? _parityTypes[label.parityType]
-                                           : "Unknown");
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.txXonXoff = {0}", label.txXonXoff);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.rxXonXoff = {0}", label.rxXonXoff);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.xonCharacter = {0}", label.xonCharacter);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.xoffCharacter = {0}", label.xoffCharacter);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.rxXonXoffBuffer = {0}", label.rxXonXoffBuffer);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.dtrDsr = {0}", label.dtrDsr);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.ctsRts = {0}", label.ctsRts);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.nullsAfterCr = {0}", label.nullsAfterCr);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.nullsAfterFF = {0}", label.nullsAfterFF);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.lfAfterCRSerial = {0}", label.lfAfterCRSerial);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.biosErrorReportSerial = {0}",
-                                       label.biosErrorReportSerial);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.spareSerial is null? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareSerial));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.lfAfterCrParallel = {0}", label.lfAfterCrParallel);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.selectLine = {0}", label.selectLine);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.paperEmpty = {0}", label.paperEmpty);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.faultLine = {0}", label.faultLine);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.biosErrorReportParallel = {0}",
-                                       label.biosErrorReportParallel);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.spareParallel is null? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareParallel));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.spareWinchester is null? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareWinchester));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.parkingEnabled = {0}", label.parkingEnabled);
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.formatProtection = {0}", label.formatProtection);
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.spareRamDisk is null? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spareRamDisk));
-
-            for(int i = 0; i < 32; i++)
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.badBlocks[{1}] = {0}", label.badBlocks[i], i);
-
-            for(int i = 0; i < 8; i++)
+            var part = new Partition
             {
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].bps = {0}",
-                                           label.partitions[i].bps, i);
+                Start    = label.partitions[i].startSector,
+                Size     = (ulong)(label.partitions[i].sectors * label.sectorSize),
+                Length   = label.partitions[i].sectors,
+                Type     = "ACT Apricot partition",
+                Sequence = i,
+                Scheme   = Name,
+                Offset   = (ulong)(label.partitions[i].startSector * label.sectorSize)
+            };
 
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].spc = {0}",
-                                           label.partitions[i].spc, i);
-
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].rsectors = {0}",
-                                           label.partitions[i].rsectors, i);
-
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].fats_no = {0}",
-                                           label.partitions[i].fats_no, i);
-
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].root_ent = {0}",
-                                           label.partitions[i].root_ent, i);
-
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].sectors = {0}",
-                                           label.partitions[i].sectors, i);
-
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].media = {0}",
-                                           label.partitions[i].media, i);
-
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].spfat = {0}",
-                                           label.partitions[i].spfat, i);
-
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].diskType = {0} ({2})",
-                                           label.partitions[i].diskType, i,
-                                           label.partitions[i].diskType < _diskTypeCodes.Length
-                                               ? _diskTypeCodes[label.partitions[i].diskType] : "Unknown");
-
-                AaruConsole.DebugWriteLine("Apricot partitions", "label.partitions[{1}].startSector = {0}",
-                                           label.partitions[i].startSector, i);
-            }
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.spare is null? = {0}",
-                                       ArrayHelpers.ArrayIsNullOrEmpty(label.spare));
-
-            AaruConsole.DebugWriteLine("Apricot partitions", "label.cpmDoubleSided = {0}", label.cpmDoubleSided);
-
-            // Only hard disks can contain partitions
-            if(!label.winchester)
-                return false;
-
-            for(byte i = 0; i < label.partitionCount; i++)
-            {
-                var part = new Partition
-                {
-                    Start    = label.partitions[i].startSector,
-                    Size     = (ulong)(label.partitions[i].sectors * label.sectorSize),
-                    Length   = label.partitions[i].sectors,
-                    Type     = "ACT Apricot partition",
-                    Sequence = i,
-                    Scheme   = Name,
-                    Offset   = (ulong)(label.partitions[i].startSector * label.sectorSize)
-                };
-
-                if(part.Start < deviceSectors &&
-                   part.End   < deviceSectors)
-                    partitions.Add(part);
-            }
-
-            return partitions.Count > 0;
+            if(part.Start < deviceSectors &&
+               part.End   < deviceSectors)
+                partitions.Add(part);
         }
 
-        /// <summary>Apricot Label.</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Label
-        {
-            /// <summary>Version of format which created disk</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] version;
-            /// <summary>Operating system.</summary>
-            public readonly byte operatingSystem;
-            /// <summary>Software write protection.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool writeProtected;
-            /// <summary>Copy protected.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool copyProtected;
-            /// <summary>Boot type.</summary>
-            public readonly byte bootType;
-            /// <summary>Partitions.</summary>
-            public readonly byte partitionCount;
-            /// <summary>Is hard disk?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool winchester;
-            /// <summary>Sector size.</summary>
-            public readonly ushort sectorSize;
-            /// <summary>Sectors per track.</summary>
-            public readonly ushort spt;
-            /// <summary>Tracks per side.</summary>
-            public readonly uint cylinders;
-            /// <summary>Sides.</summary>
-            public readonly byte heads;
-            /// <summary>Interleave factor.</summary>
-            public readonly byte interleave;
-            /// <summary>Skew factor.</summary>
-            public readonly ushort skew;
-            /// <summary>Sector where boot code starts.</summary>
-            public readonly uint bootLocation;
-            /// <summary>Size in sectors of boot code.</summary>
-            public readonly ushort bootSize;
-            /// <summary>Address at which to load boot code.</summary>
-            public readonly uint bootAddress;
-            /// <summary>Offset where to jump to boot.</summary>
-            public readonly ushort bootOffset;
-            /// <summary>Segment where to jump to boot.</summary>
-            public readonly ushort bootSegment;
-            /// <summary>First data sector.</summary>
-            public readonly uint firstDataBlock;
-            /// <summary>Generation.</summary>
-            public readonly ushort generation;
-            /// <summary>Copy count.</summary>
-            public readonly ushort copyCount;
-            /// <summary>Maximum number of copies.</summary>
-            public readonly ushort maxCopies;
-            /// <summary>Serial number.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] serialNumber;
-            /// <summary>Part number.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] partNumber;
-            /// <summary>Copyright.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public readonly byte[] copyright;
-            /// <summary>BPB for whole disk.</summary>
-            public readonly ParameterBlock mainBPB;
-            /// <summary>Name of FONT file.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] fontName;
-            /// <summary>Name of KEYBOARD file.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] keyboardName;
-            /// <summary>Minor BIOS version.</summary>
-            public readonly byte biosMinorVersion;
-            /// <summary>Major BIOS version.</summary>
-            public readonly byte biosMajorVersion;
-            /// <summary>Diagnostics enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool diagnosticsFlag;
-            /// <summary>Printer device.</summary>
-            public readonly byte prnDevice;
-            /// <summary>Bell volume.</summary>
-            public readonly byte bellVolume;
-            /// <summary>Cache enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool enableCache;
-            /// <summary>Graphics enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool enableGraphics;
-            /// <summary>Length in sectors of DOS.</summary>
-            public readonly byte dosLength;
-            /// <summary>Length in sectors of FONT file.</summary>
-            public readonly byte fontLength;
-            /// <summary>Length in sectors of KEYBOARD file.</summary>
-            public readonly byte keyboardLength;
-            /// <summary>Starting sector of DOS.</summary>
-            public readonly ushort dosStart;
-            /// <summary>Starting sector of FONT file.</summary>
-            public readonly ushort fontStart;
-            /// <summary>Starting sector of KEYBOARD file.</summary>
-            public readonly ushort keyboardStart;
-            /// <summary>Keyboard click volume.</summary>
-            public readonly byte keyboardVolume;
-            /// <summary>Auto-repeat enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool autorepeat;
-            /// <summary>Auto-repeat lead-in.</summary>
-            public readonly byte autorepeatLeadIn;
-            /// <summary>Auto-repeat interval.</summary>
-            public readonly byte autorepeatInterval;
-            /// <summary>Microscreen mode.</summary>
-            public readonly byte microscreenMode;
-            /// <summary>Spare area for keyboard values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] spareKeyboard;
-            /// <summary>Screen line mode.</summary>
-            public readonly byte lineMode;
-            /// <summary>Screen line width.</summary>
-            public readonly byte lineWidth;
-            /// <summary>Screen disabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool imageOff;
-            /// <summary>Spare area for screen values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public readonly byte[] spareScreen;
-            /// <summary>TX baud rate.</summary>
-            public readonly byte txBaudRate;
-            /// <summary>RX baud rate.</summary>
-            public readonly byte rxBaudRate;
-            /// <summary>TX bits.</summary>
-            public readonly byte txBits;
-            /// <summary>RX bits.</summary>
-            public readonly byte rxBits;
-            /// <summary>Stop bits.</summary>
-            public readonly byte stopBits;
-            /// <summary>Parity enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool parityCheck;
-            /// <summary>Parity type.</summary>
-            public readonly byte parityType;
-            /// <summary>Xon/Xoff enabled on TX.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool txXonXoff;
-            /// <summary>Xon/Xoff enabled on RX.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool rxXonXoff;
-            /// <summary>Xon character.</summary>
-            public readonly byte xonCharacter;
-            /// <summary>Xoff character.</summary>
-            public readonly byte xoffCharacter;
-            /// <summary>Xon/Xoff buffer on RX.</summary>
-            public readonly ushort rxXonXoffBuffer;
-            /// <summary>DTR/DSR enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool dtrDsr;
-            /// <summary>CTS/RTS enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool ctsRts;
-            /// <summary>NULLs after CR.</summary>
-            public readonly byte nullsAfterCr;
-            /// <summary>NULLs after 0xFF.</summary>
-            public readonly byte nullsAfterFF;
-            /// <summary>Send LF after CR in serial port.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool lfAfterCRSerial;
-            /// <summary>BIOS error report in serial port.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool biosErrorReportSerial;
-            /// <summary>Spare area for serial port values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
-            public readonly byte[] spareSerial;
-            /// <summary>Send LF after CR in parallel port.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool lfAfterCrParallel;
-            /// <summary>Select line supported?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool selectLine;
-            /// <summary>Paper empty supported?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool paperEmpty;
-            /// <summary>Fault line supported?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool faultLine;
-            /// <summary>BIOS error report in parallel port.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool biosErrorReportParallel;
-            /// <summary>Spare area for parallel port values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
-            public readonly byte[] spareParallel;
-            /// <summary>Spare area for Winchester values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
-            public readonly byte[] spareWinchester;
-            /// <summary>Parking enabled?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool parkingEnabled;
-            /// <summary>Format protection?.</summary>
-            [MarshalAs(UnmanagedType.U1)]
-            public readonly bool formatProtection;
-            /// <summary>Spare area for RAM disk values expansion.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] spareRamDisk;
-            /// <summary>List of bad blocks.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly ushort[] badBlocks;
-            /// <summary>Array of partition BPBs.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly ParameterBlock[] partitions;
-            /// <summary>Spare area.</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 63)]
-            public readonly byte[] spare;
-            /// <summary>CP/M double side indicator?.</summary>
-            public readonly bool cpmDoubleSided;
-        }
+        return partitions.Count > 0;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct ParameterBlock
-        {
-            /// <summary>Bytes per sector</summary>
-            public readonly ushort bps;
-            /// <summary>Sectors per cluster</summary>
-            public readonly byte spc;
-            /// <summary>Reserved sectors between BPB and FAT</summary>
-            public readonly ushort rsectors;
-            /// <summary>Number of FATs</summary>
-            public readonly byte fats_no;
-            /// <summary>Number of entries on root directory</summary>
-            public readonly ushort root_ent;
-            /// <summary>Sectors in volume</summary>
-            public readonly ushort sectors;
-            /// <summary>Media descriptor</summary>
-            public readonly byte media;
-            /// <summary>Sectors per FAT</summary>
-            public readonly ushort spfat;
-            /// <summary>Disk type</summary>
-            public readonly byte diskType;
-            /// <summary>Volume starting sector</summary>
-            public readonly ushort startSector;
-        }
+    /// <summary>Apricot Label.</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Label
+    {
+        /// <summary>Version of format which created disk</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] version;
+        /// <summary>Operating system.</summary>
+        public readonly byte operatingSystem;
+        /// <summary>Software write protection.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool writeProtected;
+        /// <summary>Copy protected.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool copyProtected;
+        /// <summary>Boot type.</summary>
+        public readonly byte bootType;
+        /// <summary>Partitions.</summary>
+        public readonly byte partitionCount;
+        /// <summary>Is hard disk?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool winchester;
+        /// <summary>Sector size.</summary>
+        public readonly ushort sectorSize;
+        /// <summary>Sectors per track.</summary>
+        public readonly ushort spt;
+        /// <summary>Tracks per side.</summary>
+        public readonly uint cylinders;
+        /// <summary>Sides.</summary>
+        public readonly byte heads;
+        /// <summary>Interleave factor.</summary>
+        public readonly byte interleave;
+        /// <summary>Skew factor.</summary>
+        public readonly ushort skew;
+        /// <summary>Sector where boot code starts.</summary>
+        public readonly uint bootLocation;
+        /// <summary>Size in sectors of boot code.</summary>
+        public readonly ushort bootSize;
+        /// <summary>Address at which to load boot code.</summary>
+        public readonly uint bootAddress;
+        /// <summary>Offset where to jump to boot.</summary>
+        public readonly ushort bootOffset;
+        /// <summary>Segment where to jump to boot.</summary>
+        public readonly ushort bootSegment;
+        /// <summary>First data sector.</summary>
+        public readonly uint firstDataBlock;
+        /// <summary>Generation.</summary>
+        public readonly ushort generation;
+        /// <summary>Copy count.</summary>
+        public readonly ushort copyCount;
+        /// <summary>Maximum number of copies.</summary>
+        public readonly ushort maxCopies;
+        /// <summary>Serial number.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] serialNumber;
+        /// <summary>Part number.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] partNumber;
+        /// <summary>Copyright.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
+        public readonly byte[] copyright;
+        /// <summary>BPB for whole disk.</summary>
+        public readonly ParameterBlock mainBPB;
+        /// <summary>Name of FONT file.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] fontName;
+        /// <summary>Name of KEYBOARD file.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] keyboardName;
+        /// <summary>Minor BIOS version.</summary>
+        public readonly byte biosMinorVersion;
+        /// <summary>Major BIOS version.</summary>
+        public readonly byte biosMajorVersion;
+        /// <summary>Diagnostics enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool diagnosticsFlag;
+        /// <summary>Printer device.</summary>
+        public readonly byte prnDevice;
+        /// <summary>Bell volume.</summary>
+        public readonly byte bellVolume;
+        /// <summary>Cache enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool enableCache;
+        /// <summary>Graphics enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool enableGraphics;
+        /// <summary>Length in sectors of DOS.</summary>
+        public readonly byte dosLength;
+        /// <summary>Length in sectors of FONT file.</summary>
+        public readonly byte fontLength;
+        /// <summary>Length in sectors of KEYBOARD file.</summary>
+        public readonly byte keyboardLength;
+        /// <summary>Starting sector of DOS.</summary>
+        public readonly ushort dosStart;
+        /// <summary>Starting sector of FONT file.</summary>
+        public readonly ushort fontStart;
+        /// <summary>Starting sector of KEYBOARD file.</summary>
+        public readonly ushort keyboardStart;
+        /// <summary>Keyboard click volume.</summary>
+        public readonly byte keyboardVolume;
+        /// <summary>Auto-repeat enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool autorepeat;
+        /// <summary>Auto-repeat lead-in.</summary>
+        public readonly byte autorepeatLeadIn;
+        /// <summary>Auto-repeat interval.</summary>
+        public readonly byte autorepeatInterval;
+        /// <summary>Microscreen mode.</summary>
+        public readonly byte microscreenMode;
+        /// <summary>Spare area for keyboard values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] spareKeyboard;
+        /// <summary>Screen line mode.</summary>
+        public readonly byte lineMode;
+        /// <summary>Screen line width.</summary>
+        public readonly byte lineWidth;
+        /// <summary>Screen disabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool imageOff;
+        /// <summary>Spare area for screen values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
+        public readonly byte[] spareScreen;
+        /// <summary>TX baud rate.</summary>
+        public readonly byte txBaudRate;
+        /// <summary>RX baud rate.</summary>
+        public readonly byte rxBaudRate;
+        /// <summary>TX bits.</summary>
+        public readonly byte txBits;
+        /// <summary>RX bits.</summary>
+        public readonly byte rxBits;
+        /// <summary>Stop bits.</summary>
+        public readonly byte stopBits;
+        /// <summary>Parity enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool parityCheck;
+        /// <summary>Parity type.</summary>
+        public readonly byte parityType;
+        /// <summary>Xon/Xoff enabled on TX.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool txXonXoff;
+        /// <summary>Xon/Xoff enabled on RX.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool rxXonXoff;
+        /// <summary>Xon character.</summary>
+        public readonly byte xonCharacter;
+        /// <summary>Xoff character.</summary>
+        public readonly byte xoffCharacter;
+        /// <summary>Xon/Xoff buffer on RX.</summary>
+        public readonly ushort rxXonXoffBuffer;
+        /// <summary>DTR/DSR enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool dtrDsr;
+        /// <summary>CTS/RTS enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool ctsRts;
+        /// <summary>NULLs after CR.</summary>
+        public readonly byte nullsAfterCr;
+        /// <summary>NULLs after 0xFF.</summary>
+        public readonly byte nullsAfterFF;
+        /// <summary>Send LF after CR in serial port.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool lfAfterCRSerial;
+        /// <summary>BIOS error report in serial port.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool biosErrorReportSerial;
+        /// <summary>Spare area for serial port values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 13)]
+        public readonly byte[] spareSerial;
+        /// <summary>Send LF after CR in parallel port.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool lfAfterCrParallel;
+        /// <summary>Select line supported?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool selectLine;
+        /// <summary>Paper empty supported?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool paperEmpty;
+        /// <summary>Fault line supported?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool faultLine;
+        /// <summary>BIOS error report in parallel port.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool biosErrorReportParallel;
+        /// <summary>Spare area for parallel port values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 11)]
+        public readonly byte[] spareParallel;
+        /// <summary>Spare area for Winchester values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 14)]
+        public readonly byte[] spareWinchester;
+        /// <summary>Parking enabled?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool parkingEnabled;
+        /// <summary>Format protection?.</summary>
+        [MarshalAs(UnmanagedType.U1)]
+        public readonly bool formatProtection;
+        /// <summary>Spare area for RAM disk values expansion.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] spareRamDisk;
+        /// <summary>List of bad blocks.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly ushort[] badBlocks;
+        /// <summary>Array of partition BPBs.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly ParameterBlock[] partitions;
+        /// <summary>Spare area.</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 63)]
+        public readonly byte[] spare;
+        /// <summary>CP/M double side indicator?.</summary>
+        public readonly bool cpmDoubleSided;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct ParameterBlock
+    {
+        /// <summary>Bytes per sector</summary>
+        public readonly ushort bps;
+        /// <summary>Sectors per cluster</summary>
+        public readonly byte spc;
+        /// <summary>Reserved sectors between BPB and FAT</summary>
+        public readonly ushort rsectors;
+        /// <summary>Number of FATs</summary>
+        public readonly byte fats_no;
+        /// <summary>Number of entries on root directory</summary>
+        public readonly ushort root_ent;
+        /// <summary>Sectors in volume</summary>
+        public readonly ushort sectors;
+        /// <summary>Media descriptor</summary>
+        public readonly byte media;
+        /// <summary>Sectors per FAT</summary>
+        public readonly ushort spfat;
+        /// <summary>Disk type</summary>
+        public readonly byte diskType;
+        /// <summary>Volume starting sector</summary>
+        public readonly ushort startSector;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Atari.cs b/Aaru.Partitions/Atari.cs
index e8699d1ef..0b6baeee9 100644
--- a/Aaru.Partitions/Atari.cs
+++ b/Aaru.Partitions/Atari.cs
@@ -41,483 +41,482 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Spectre.Console;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of Atari GEMDOS partitions</summary>
+public sealed class AtariPartitions : IPartition
 {
+    const uint TYPE_GEMDOS      = 0x0047454D;
+    const uint TYPE_BIG_GEMDOS  = 0x0042474D;
+    const uint TYPE_EXTENDED    = 0x0058474D;
+    const uint TYPE_LINUX       = 0x004C4E58;
+    const uint TYPE_SWAP        = 0x00535750;
+    const uint TYPE_RAW         = 0x00524157;
+    const uint TYPE_NETBSD      = 0x004E4244;
+    const uint TYPE_NETBSD_SWAP = 0x004E4253;
+    const uint TYPE_SYSTEM_V    = 0x00554E58;
+    const uint TYPE_MAC         = 0x004D4143;
+    const uint TYPE_MINIX       = 0x004D4958;
+    const uint TYPE_MINIX2      = 0x004D4E58;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of Atari GEMDOS partitions</summary>
-    public sealed class AtariPartitions : IPartition
+    public string Name => "Atari partitions";
+    /// <inheritdoc />
+    public Guid Id => new("d1dd0f24-ec39-4c4d-9072-be31919a3b5e");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        const uint TYPE_GEMDOS      = 0x0047454D;
-        const uint TYPE_BIG_GEMDOS  = 0x0042474D;
-        const uint TYPE_EXTENDED    = 0x0058474D;
-        const uint TYPE_LINUX       = 0x004C4E58;
-        const uint TYPE_SWAP        = 0x00535750;
-        const uint TYPE_RAW         = 0x00524157;
-        const uint TYPE_NETBSD      = 0x004E4244;
-        const uint TYPE_NETBSD_SWAP = 0x004E4253;
-        const uint TYPE_SYSTEM_V    = 0x00554E58;
-        const uint TYPE_MAC         = 0x004D4143;
-        const uint TYPE_MINIX       = 0x004D4958;
-        const uint TYPE_MINIX2      = 0x004D4E58;
+        partitions = new List<Partition>();
 
-        /// <inheritdoc />
-        public string Name => "Atari partitions";
-        /// <inheritdoc />
-        public Guid Id => new("d1dd0f24-ec39-4c4d-9072-be31919a3b5e");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(sectorOffset, out byte[] sector);
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        if(errno         != ErrorNumber.NoError ||
+           sector.Length < 512)
+            return false;
+
+        var table = new AtariTable
         {
-            partitions = new List<Partition>();
+            Boot       = new byte[342],
+            IcdEntries = new AtariEntry[8],
+            Unused     = new byte[12],
+            Entries    = new AtariEntry[4]
+        };
 
-            ErrorNumber errno = imagePlugin.ReadSector(sectorOffset, out byte[] sector);
+        Array.Copy(sector, 0, table.Boot, 0, 342);
 
-            if(errno         != ErrorNumber.NoError ||
-               sector.Length < 512)
-                return false;
+        for(int i = 0; i < 8; i++)
+        {
+            table.IcdEntries[i].Type   = BigEndianBitConverter.ToUInt32(sector, 342 + (i * 12) + 0);
+            table.IcdEntries[i].Start  = BigEndianBitConverter.ToUInt32(sector, 342 + (i * 12) + 4);
+            table.IcdEntries[i].Length = BigEndianBitConverter.ToUInt32(sector, 342 + (i * 12) + 8);
+        }
 
-            var table = new AtariTable
+        Array.Copy(sector, 438, table.Unused, 0, 12);
+
+        table.Size = BigEndianBitConverter.ToUInt32(sector, 450);
+
+        for(int i = 0; i < 4; i++)
+        {
+            table.Entries[i].Type   = BigEndianBitConverter.ToUInt32(sector, 454 + (i * 12) + 0);
+            table.Entries[i].Start  = BigEndianBitConverter.ToUInt32(sector, 454 + (i * 12) + 4);
+            table.Entries[i].Length = BigEndianBitConverter.ToUInt32(sector, 454 + (i * 12) + 8);
+        }
+
+        table.BadStart  = BigEndianBitConverter.ToUInt32(sector, 502);
+        table.BadLength = BigEndianBitConverter.ToUInt32(sector, 506);
+        table.Checksum  = BigEndianBitConverter.ToUInt16(sector, 510);
+
+        var sha1Ctx = new Sha1Context();
+        sha1Ctx.Update(table.Boot);
+        AaruConsole.DebugWriteLine("Atari partition plugin", "Boot code SHA1: {0}", sha1Ctx.End());
+
+        for(int i = 0; i < 8; i++)
+        {
+            AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.icdEntries[{0}].flag = 0x{1:X2}"), i,
+                                       (table.IcdEntries[i].Type & 0xFF000000) >> 24);
+
+            AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.icdEntries[{0}].type = 0x{1:X6}"), i,
+                                       table.IcdEntries[i].Type & 0x00FFFFFF);
+
+            AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.icdEntries[{0}].start = {1}"), i,
+                                       table.IcdEntries[i].Start);
+
+            AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.icdEntries[{0}].length = {1}"), i,
+                                       table.IcdEntries[i].Length);
+        }
+
+        AaruConsole.DebugWriteLine("Atari partition plugin", "table.size = {0}", table.Size);
+
+        for(int i = 0; i < 4; i++)
+        {
+            AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.entries[{0}].flag = 0x{1:X2}"), i,
+                                       (table.Entries[i].Type & 0xFF000000) >> 24);
+
+            AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.entries[{0}].type = 0x{1:X6}"), i,
+                                       table.Entries[i].Type & 0x00FFFFFF);
+
+            AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.entries[{0}].start = {1}"), i,
+                                       table.Entries[i].Start);
+
+            AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.entries[{0}].length = {1}"), i,
+                                       table.Entries[i].Length);
+        }
+
+        AaruConsole.DebugWriteLine("Atari partition plugin", "table.badStart = {0}", table.BadStart);
+        AaruConsole.DebugWriteLine("Atari partition plugin", "table.badLength = {0}", table.BadLength);
+        AaruConsole.DebugWriteLine("Atari partition plugin", "table.checksum = 0x{0:X4}", table.Checksum);
+
+        bool  validTable        = false;
+        ulong partitionSequence = 0;
+
+        for(int i = 0; i < 4; i++)
+        {
+            uint type = table.Entries[i].Type & 0x00FFFFFF;
+
+            switch(type)
             {
-                Boot       = new byte[342],
-                IcdEntries = new AtariEntry[8],
-                Unused     = new byte[12],
-                Entries    = new AtariEntry[4]
-            };
+                case TYPE_GEMDOS:
+                case TYPE_BIG_GEMDOS:
+                case TYPE_LINUX:
+                case TYPE_SWAP:
+                case TYPE_RAW:
+                case TYPE_NETBSD:
+                case TYPE_NETBSD_SWAP:
+                case TYPE_SYSTEM_V:
+                case TYPE_MAC:
+                case TYPE_MINIX:
+                case TYPE_MINIX2:
+                    validTable = true;
 
-            Array.Copy(sector, 0, table.Boot, 0, 342);
+                    if(table.Entries[i].Start <= imagePlugin.Info.Sectors)
+                    {
+                        if(table.Entries[i].Start + table.Entries[i].Length > imagePlugin.Info.Sectors)
+                            AaruConsole.DebugWriteLine("Atari partition plugin",
+                                                       "WARNING: End of partition goes beyond device size");
 
-            for(int i = 0; i < 8; i++)
-            {
-                table.IcdEntries[i].Type   = BigEndianBitConverter.ToUInt32(sector, 342 + (i * 12) + 0);
-                table.IcdEntries[i].Start  = BigEndianBitConverter.ToUInt32(sector, 342 + (i * 12) + 4);
-                table.IcdEntries[i].Length = BigEndianBitConverter.ToUInt32(sector, 342 + (i * 12) + 8);
-            }
+                        ulong sectorSize = imagePlugin.Info.SectorSize;
 
-            Array.Copy(sector, 438, table.Unused, 0, 12);
+                        if(sectorSize == 2448 ||
+                           sectorSize == 2352)
+                            sectorSize = 2048;
 
-            table.Size = BigEndianBitConverter.ToUInt32(sector, 450);
+                        byte[] partType = new byte[3];
+                        partType[0] = (byte)((type & 0xFF0000) >> 16);
+                        partType[1] = (byte)((type & 0x00FF00) >> 8);
+                        partType[2] = (byte)(type & 0x0000FF);
 
-            for(int i = 0; i < 4; i++)
-            {
-                table.Entries[i].Type   = BigEndianBitConverter.ToUInt32(sector, 454 + (i * 12) + 0);
-                table.Entries[i].Start  = BigEndianBitConverter.ToUInt32(sector, 454 + (i * 12) + 4);
-                table.Entries[i].Length = BigEndianBitConverter.ToUInt32(sector, 454 + (i * 12) + 8);
-            }
+                        var part = new Partition
+                        {
+                            Size     = table.Entries[i].Length * sectorSize,
+                            Length   = table.Entries[i].Length,
+                            Sequence = partitionSequence,
+                            Name     = "",
+                            Offset   = table.Entries[i].Start * sectorSize,
+                            Start    = table.Entries[i].Start,
+                            Type     = Encoding.ASCII.GetString(partType),
+                            Scheme   = Name
+                        };
 
-            table.BadStart  = BigEndianBitConverter.ToUInt32(sector, 502);
-            table.BadLength = BigEndianBitConverter.ToUInt32(sector, 506);
-            table.Checksum  = BigEndianBitConverter.ToUInt16(sector, 510);
+                        switch(type)
+                        {
+                            case TYPE_GEMDOS:
+                                part.Description = "Atari GEMDOS partition";
 
-            var sha1Ctx = new Sha1Context();
-            sha1Ctx.Update(table.Boot);
-            AaruConsole.DebugWriteLine("Atari partition plugin", "Boot code SHA1: {0}", sha1Ctx.End());
+                                break;
+                            case TYPE_BIG_GEMDOS:
+                                part.Description = "Atari GEMDOS partition bigger than 32 MiB";
 
-            for(int i = 0; i < 8; i++)
-            {
-                AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.icdEntries[{0}].flag = 0x{1:X2}"), i,
-                                           (table.IcdEntries[i].Type & 0xFF000000) >> 24);
+                                break;
+                            case TYPE_LINUX:
+                                part.Description = "Linux partition";
 
-                AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.icdEntries[{0}].type = 0x{1:X6}"), i,
-                                           table.IcdEntries[i].Type & 0x00FFFFFF);
+                                break;
+                            case TYPE_SWAP:
+                                part.Description = "Swap partition";
 
-                AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.icdEntries[{0}].start = {1}"), i,
-                                           table.IcdEntries[i].Start);
+                                break;
+                            case TYPE_RAW:
+                                part.Description = "RAW partition";
 
-                AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.icdEntries[{0}].length = {1}"), i,
-                                           table.IcdEntries[i].Length);
-            }
+                                break;
+                            case TYPE_NETBSD:
+                                part.Description = "NetBSD partition";
 
-            AaruConsole.DebugWriteLine("Atari partition plugin", "table.size = {0}", table.Size);
+                                break;
+                            case TYPE_NETBSD_SWAP:
+                                part.Description = "NetBSD swap partition";
 
-            for(int i = 0; i < 4; i++)
-            {
-                AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.entries[{0}].flag = 0x{1:X2}"), i,
-                                           (table.Entries[i].Type & 0xFF000000) >> 24);
+                                break;
+                            case TYPE_SYSTEM_V:
+                                part.Description = "Atari UNIX partition";
 
-                AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.entries[{0}].type = 0x{1:X6}"), i,
-                                           table.Entries[i].Type & 0x00FFFFFF);
+                                break;
+                            case TYPE_MAC:
+                                part.Description = "Macintosh partition";
 
-                AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.entries[{0}].start = {1}"), i,
-                                           table.Entries[i].Start);
+                                break;
+                            case TYPE_MINIX:
+                            case TYPE_MINIX2:
+                                part.Description = "MINIX partition";
 
-                AaruConsole.DebugWriteLine("Atari partition plugin", Markup.Escape("table.entries[{0}].length = {1}"), i,
-                                           table.Entries[i].Length);
-            }
+                                break;
+                            default:
+                                part.Description = "Unknown partition type";
 
-            AaruConsole.DebugWriteLine("Atari partition plugin", "table.badStart = {0}", table.BadStart);
-            AaruConsole.DebugWriteLine("Atari partition plugin", "table.badLength = {0}", table.BadLength);
-            AaruConsole.DebugWriteLine("Atari partition plugin", "table.checksum = 0x{0:X4}", table.Checksum);
+                                break;
+                        }
 
-            bool  validTable        = false;
-            ulong partitionSequence = 0;
+                        partitions.Add(part);
+                        partitionSequence++;
+                    }
 
-            for(int i = 0; i < 4; i++)
-            {
-                uint type = table.Entries[i].Type & 0x00FFFFFF;
+                    break;
+                case TYPE_EXTENDED:
+                    errno = imagePlugin.ReadSector(table.Entries[i].Start, out byte[] extendedSector);
+
+                    if(errno != ErrorNumber.NoError)
+                        break;
+
+                    var extendedTable = new AtariTable();
+                    extendedTable.Entries = new AtariEntry[4];
+
+                    for(int j = 0; j < 4; j++)
+                    {
+                        extendedTable.Entries[j].Type =
+                            BigEndianBitConverter.ToUInt32(extendedSector, 454 + (j * 12) + 0);
+
+                        extendedTable.Entries[j].Start =
+                            BigEndianBitConverter.ToUInt32(extendedSector, 454 + (j * 12) + 4);
+
+                        extendedTable.Entries[j].Length =
+                            BigEndianBitConverter.ToUInt32(extendedSector, 454 + (j * 12) + 8);
+                    }
+
+                    for(int j = 0; j < 4; j++)
+                    {
+                        uint extendedType = extendedTable.Entries[j].Type & 0x00FFFFFF;
+
+                        if(extendedType != TYPE_GEMDOS      &&
+                           extendedType != TYPE_BIG_GEMDOS  &&
+                           extendedType != TYPE_LINUX       &&
+                           extendedType != TYPE_SWAP        &&
+                           extendedType != TYPE_RAW         &&
+                           extendedType != TYPE_NETBSD      &&
+                           extendedType != TYPE_NETBSD_SWAP &&
+                           extendedType != TYPE_SYSTEM_V    &&
+                           extendedType != TYPE_MAC         &&
+                           extendedType != TYPE_MINIX       &&
+                           extendedType != TYPE_MINIX2)
+                            continue;
 
-                switch(type)
-                {
-                    case TYPE_GEMDOS:
-                    case TYPE_BIG_GEMDOS:
-                    case TYPE_LINUX:
-                    case TYPE_SWAP:
-                    case TYPE_RAW:
-                    case TYPE_NETBSD:
-                    case TYPE_NETBSD_SWAP:
-                    case TYPE_SYSTEM_V:
-                    case TYPE_MAC:
-                    case TYPE_MINIX:
-                    case TYPE_MINIX2:
                         validTable = true;
 
-                        if(table.Entries[i].Start <= imagePlugin.Info.Sectors)
+                        if(extendedTable.Entries[j].Start > imagePlugin.Info.Sectors)
+                            continue;
+
+                        if(extendedTable.Entries[j].Start + extendedTable.Entries[j].Length >
+                           imagePlugin.Info.Sectors)
+                            AaruConsole.DebugWriteLine("Atari partition plugin",
+                                                       "WARNING: End of partition goes beyond device size");
+
+                        ulong sectorSize = imagePlugin.Info.SectorSize;
+
+                        if(sectorSize == 2448 ||
+                           sectorSize == 2352)
+                            sectorSize = 2048;
+
+                        byte[] partType = new byte[3];
+                        partType[0] = (byte)((extendedType & 0xFF0000) >> 16);
+                        partType[1] = (byte)((extendedType & 0x00FF00) >> 8);
+                        partType[2] = (byte)(extendedType & 0x0000FF);
+
+                        var part = new Partition
                         {
-                            if(table.Entries[i].Start + table.Entries[i].Length > imagePlugin.Info.Sectors)
-                                AaruConsole.DebugWriteLine("Atari partition plugin",
-                                                           "WARNING: End of partition goes beyond device size");
+                            Size     = extendedTable.Entries[j].Length * sectorSize,
+                            Length   = extendedTable.Entries[j].Length,
+                            Sequence = partitionSequence,
+                            Name     = "",
+                            Offset   = extendedTable.Entries[j].Start * sectorSize,
+                            Start    = extendedTable.Entries[j].Start,
+                            Type     = Encoding.ASCII.GetString(partType),
+                            Scheme   = Name
+                        };
 
-                            ulong sectorSize = imagePlugin.Info.SectorSize;
+                        switch(extendedType)
+                        {
+                            case TYPE_GEMDOS:
+                                part.Description = "Atari GEMDOS partition";
 
-                            if(sectorSize == 2448 ||
-                               sectorSize == 2352)
-                                sectorSize = 2048;
+                                break;
+                            case TYPE_BIG_GEMDOS:
+                                part.Description = "Atari GEMDOS partition bigger than 32 MiB";
 
-                            byte[] partType = new byte[3];
-                            partType[0] = (byte)((type & 0xFF0000) >> 16);
-                            partType[1] = (byte)((type & 0x00FF00) >> 8);
-                            partType[2] = (byte)(type & 0x0000FF);
+                                break;
+                            case TYPE_LINUX:
+                                part.Description = "Linux partition";
 
-                            var part = new Partition
-                            {
-                                Size     = table.Entries[i].Length * sectorSize,
-                                Length   = table.Entries[i].Length,
-                                Sequence = partitionSequence,
-                                Name     = "",
-                                Offset   = table.Entries[i].Start * sectorSize,
-                                Start    = table.Entries[i].Start,
-                                Type     = Encoding.ASCII.GetString(partType),
-                                Scheme   = Name
-                            };
+                                break;
+                            case TYPE_SWAP:
+                                part.Description = "Swap partition";
 
-                            switch(type)
-                            {
-                                case TYPE_GEMDOS:
-                                    part.Description = "Atari GEMDOS partition";
+                                break;
+                            case TYPE_RAW:
+                                part.Description = "RAW partition";
 
-                                    break;
-                                case TYPE_BIG_GEMDOS:
-                                    part.Description = "Atari GEMDOS partition bigger than 32 MiB";
+                                break;
+                            case TYPE_NETBSD:
+                                part.Description = "NetBSD partition";
 
-                                    break;
-                                case TYPE_LINUX:
-                                    part.Description = "Linux partition";
+                                break;
+                            case TYPE_NETBSD_SWAP:
+                                part.Description = "NetBSD swap partition";
 
-                                    break;
-                                case TYPE_SWAP:
-                                    part.Description = "Swap partition";
+                                break;
+                            case TYPE_SYSTEM_V:
+                                part.Description = "Atari UNIX partition";
 
-                                    break;
-                                case TYPE_RAW:
-                                    part.Description = "RAW partition";
+                                break;
+                            case TYPE_MAC:
+                                part.Description = "Macintosh partition";
 
-                                    break;
-                                case TYPE_NETBSD:
-                                    part.Description = "NetBSD partition";
+                                break;
+                            case TYPE_MINIX:
+                            case TYPE_MINIX2:
+                                part.Description = "MINIX partition";
 
-                                    break;
-                                case TYPE_NETBSD_SWAP:
-                                    part.Description = "NetBSD swap partition";
+                                break;
+                            default:
+                                part.Description = "Unknown partition type";
 
-                                    break;
-                                case TYPE_SYSTEM_V:
-                                    part.Description = "Atari UNIX partition";
-
-                                    break;
-                                case TYPE_MAC:
-                                    part.Description = "Macintosh partition";
-
-                                    break;
-                                case TYPE_MINIX:
-                                case TYPE_MINIX2:
-                                    part.Description = "MINIX partition";
-
-                                    break;
-                                default:
-                                    part.Description = "Unknown partition type";
-
-                                    break;
-                            }
-
-                            partitions.Add(part);
-                            partitionSequence++;
+                                break;
                         }
 
-                        break;
-                    case TYPE_EXTENDED:
-                        errno = imagePlugin.ReadSector(table.Entries[i].Start, out byte[] extendedSector);
+                        partitions.Add(part);
+                        partitionSequence++;
+                    }
 
-                        if(errno != ErrorNumber.NoError)
-                            break;
-
-                        var extendedTable = new AtariTable();
-                        extendedTable.Entries = new AtariEntry[4];
-
-                        for(int j = 0; j < 4; j++)
-                        {
-                            extendedTable.Entries[j].Type =
-                                BigEndianBitConverter.ToUInt32(extendedSector, 454 + (j * 12) + 0);
-
-                            extendedTable.Entries[j].Start =
-                                BigEndianBitConverter.ToUInt32(extendedSector, 454 + (j * 12) + 4);
-
-                            extendedTable.Entries[j].Length =
-                                BigEndianBitConverter.ToUInt32(extendedSector, 454 + (j * 12) + 8);
-                        }
-
-                        for(int j = 0; j < 4; j++)
-                        {
-                            uint extendedType = extendedTable.Entries[j].Type & 0x00FFFFFF;
-
-                            if(extendedType != TYPE_GEMDOS      &&
-                               extendedType != TYPE_BIG_GEMDOS  &&
-                               extendedType != TYPE_LINUX       &&
-                               extendedType != TYPE_SWAP        &&
-                               extendedType != TYPE_RAW         &&
-                               extendedType != TYPE_NETBSD      &&
-                               extendedType != TYPE_NETBSD_SWAP &&
-                               extendedType != TYPE_SYSTEM_V    &&
-                               extendedType != TYPE_MAC         &&
-                               extendedType != TYPE_MINIX       &&
-                               extendedType != TYPE_MINIX2)
-                                continue;
-
-                            validTable = true;
-
-                            if(extendedTable.Entries[j].Start > imagePlugin.Info.Sectors)
-                                continue;
-
-                            if(extendedTable.Entries[j].Start + extendedTable.Entries[j].Length >
-                               imagePlugin.Info.Sectors)
-                                AaruConsole.DebugWriteLine("Atari partition plugin",
-                                                           "WARNING: End of partition goes beyond device size");
-
-                            ulong sectorSize = imagePlugin.Info.SectorSize;
-
-                            if(sectorSize == 2448 ||
-                               sectorSize == 2352)
-                                sectorSize = 2048;
-
-                            byte[] partType = new byte[3];
-                            partType[0] = (byte)((extendedType & 0xFF0000) >> 16);
-                            partType[1] = (byte)((extendedType & 0x00FF00) >> 8);
-                            partType[2] = (byte)(extendedType & 0x0000FF);
-
-                            var part = new Partition
-                            {
-                                Size     = extendedTable.Entries[j].Length * sectorSize,
-                                Length   = extendedTable.Entries[j].Length,
-                                Sequence = partitionSequence,
-                                Name     = "",
-                                Offset   = extendedTable.Entries[j].Start * sectorSize,
-                                Start    = extendedTable.Entries[j].Start,
-                                Type     = Encoding.ASCII.GetString(partType),
-                                Scheme   = Name
-                            };
-
-                            switch(extendedType)
-                            {
-                                case TYPE_GEMDOS:
-                                    part.Description = "Atari GEMDOS partition";
-
-                                    break;
-                                case TYPE_BIG_GEMDOS:
-                                    part.Description = "Atari GEMDOS partition bigger than 32 MiB";
-
-                                    break;
-                                case TYPE_LINUX:
-                                    part.Description = "Linux partition";
-
-                                    break;
-                                case TYPE_SWAP:
-                                    part.Description = "Swap partition";
-
-                                    break;
-                                case TYPE_RAW:
-                                    part.Description = "RAW partition";
-
-                                    break;
-                                case TYPE_NETBSD:
-                                    part.Description = "NetBSD partition";
-
-                                    break;
-                                case TYPE_NETBSD_SWAP:
-                                    part.Description = "NetBSD swap partition";
-
-                                    break;
-                                case TYPE_SYSTEM_V:
-                                    part.Description = "Atari UNIX partition";
-
-                                    break;
-                                case TYPE_MAC:
-                                    part.Description = "Macintosh partition";
-
-                                    break;
-                                case TYPE_MINIX:
-                                case TYPE_MINIX2:
-                                    part.Description = "MINIX partition";
-
-                                    break;
-                                default:
-                                    part.Description = "Unknown partition type";
-
-                                    break;
-                            }
-
-                            partitions.Add(part);
-                            partitionSequence++;
-                        }
-
-                        break;
-                }
-            }
-
-            if(!validTable)
-                return partitions.Count > 0;
-
-            for(int i = 0; i < 8; i++)
-            {
-                uint type = table.IcdEntries[i].Type & 0x00FFFFFF;
-
-                if(type != TYPE_GEMDOS      &&
-                   type != TYPE_BIG_GEMDOS  &&
-                   type != TYPE_LINUX       &&
-                   type != TYPE_SWAP        &&
-                   type != TYPE_RAW         &&
-                   type != TYPE_NETBSD      &&
-                   type != TYPE_NETBSD_SWAP &&
-                   type != TYPE_SYSTEM_V    &&
-                   type != TYPE_MAC         &&
-                   type != TYPE_MINIX       &&
-                   type != TYPE_MINIX2)
-                    continue;
-
-                if(table.IcdEntries[i].Start > imagePlugin.Info.Sectors)
-                    continue;
-
-                if(table.IcdEntries[i].Start + table.IcdEntries[i].Length > imagePlugin.Info.Sectors)
-                    AaruConsole.DebugWriteLine("Atari partition plugin",
-                                               "WARNING: End of partition goes beyond device size");
-
-                ulong sectorSize = imagePlugin.Info.SectorSize;
-
-                if(sectorSize == 2448 ||
-                   sectorSize == 2352)
-                    sectorSize = 2048;
-
-                byte[] partType = new byte[3];
-                partType[0] = (byte)((type & 0xFF0000) >> 16);
-                partType[1] = (byte)((type & 0x00FF00) >> 8);
-                partType[2] = (byte)(type & 0x0000FF);
-
-                var part = new Partition
-                {
-                    Size     = table.IcdEntries[i].Length * sectorSize,
-                    Length   = table.IcdEntries[i].Length,
-                    Sequence = partitionSequence,
-                    Name     = "",
-                    Offset   = table.IcdEntries[i].Start * sectorSize,
-                    Start    = table.IcdEntries[i].Start,
-                    Type     = Encoding.ASCII.GetString(partType),
-                    Scheme   = Name
-                };
-
-                switch(type)
-                {
-                    case TYPE_GEMDOS:
-                        part.Description = "Atari GEMDOS partition";
-
-                        break;
-                    case TYPE_BIG_GEMDOS:
-                        part.Description = "Atari GEMDOS partition bigger than 32 MiB";
-
-                        break;
-                    case TYPE_LINUX:
-                        part.Description = "Linux partition";
-
-                        break;
-                    case TYPE_SWAP:
-                        part.Description = "Swap partition";
-
-                        break;
-                    case TYPE_RAW:
-                        part.Description = "RAW partition";
-
-                        break;
-                    case TYPE_NETBSD:
-                        part.Description = "NetBSD partition";
-
-                        break;
-                    case TYPE_NETBSD_SWAP:
-                        part.Description = "NetBSD swap partition";
-
-                        break;
-                    case TYPE_SYSTEM_V:
-                        part.Description = "Atari UNIX partition";
-
-                        break;
-                    case TYPE_MAC:
-                        part.Description = "Macintosh partition";
-
-                        break;
-                    case TYPE_MINIX:
-                    case TYPE_MINIX2:
-                        part.Description = "MINIX partition";
-
-                        break;
-                    default:
-                        part.Description = "Unknown partition type";
-
-                        break;
-                }
-
-                partitions.Add(part);
-                partitionSequence++;
+                    break;
             }
+        }
 
+        if(!validTable)
             return partitions.Count > 0;
+
+        for(int i = 0; i < 8; i++)
+        {
+            uint type = table.IcdEntries[i].Type & 0x00FFFFFF;
+
+            if(type != TYPE_GEMDOS      &&
+               type != TYPE_BIG_GEMDOS  &&
+               type != TYPE_LINUX       &&
+               type != TYPE_SWAP        &&
+               type != TYPE_RAW         &&
+               type != TYPE_NETBSD      &&
+               type != TYPE_NETBSD_SWAP &&
+               type != TYPE_SYSTEM_V    &&
+               type != TYPE_MAC         &&
+               type != TYPE_MINIX       &&
+               type != TYPE_MINIX2)
+                continue;
+
+            if(table.IcdEntries[i].Start > imagePlugin.Info.Sectors)
+                continue;
+
+            if(table.IcdEntries[i].Start + table.IcdEntries[i].Length > imagePlugin.Info.Sectors)
+                AaruConsole.DebugWriteLine("Atari partition plugin",
+                                           "WARNING: End of partition goes beyond device size");
+
+            ulong sectorSize = imagePlugin.Info.SectorSize;
+
+            if(sectorSize == 2448 ||
+               sectorSize == 2352)
+                sectorSize = 2048;
+
+            byte[] partType = new byte[3];
+            partType[0] = (byte)((type & 0xFF0000) >> 16);
+            partType[1] = (byte)((type & 0x00FF00) >> 8);
+            partType[2] = (byte)(type & 0x0000FF);
+
+            var part = new Partition
+            {
+                Size     = table.IcdEntries[i].Length * sectorSize,
+                Length   = table.IcdEntries[i].Length,
+                Sequence = partitionSequence,
+                Name     = "",
+                Offset   = table.IcdEntries[i].Start * sectorSize,
+                Start    = table.IcdEntries[i].Start,
+                Type     = Encoding.ASCII.GetString(partType),
+                Scheme   = Name
+            };
+
+            switch(type)
+            {
+                case TYPE_GEMDOS:
+                    part.Description = "Atari GEMDOS partition";
+
+                    break;
+                case TYPE_BIG_GEMDOS:
+                    part.Description = "Atari GEMDOS partition bigger than 32 MiB";
+
+                    break;
+                case TYPE_LINUX:
+                    part.Description = "Linux partition";
+
+                    break;
+                case TYPE_SWAP:
+                    part.Description = "Swap partition";
+
+                    break;
+                case TYPE_RAW:
+                    part.Description = "RAW partition";
+
+                    break;
+                case TYPE_NETBSD:
+                    part.Description = "NetBSD partition";
+
+                    break;
+                case TYPE_NETBSD_SWAP:
+                    part.Description = "NetBSD swap partition";
+
+                    break;
+                case TYPE_SYSTEM_V:
+                    part.Description = "Atari UNIX partition";
+
+                    break;
+                case TYPE_MAC:
+                    part.Description = "Macintosh partition";
+
+                    break;
+                case TYPE_MINIX:
+                case TYPE_MINIX2:
+                    part.Description = "MINIX partition";
+
+                    break;
+                default:
+                    part.Description = "Unknown partition type";
+
+                    break;
+            }
+
+            partitions.Add(part);
+            partitionSequence++;
         }
 
-        /// <summary>Atari partition entry</summary>
-        struct AtariEntry
-        {
-            /// <summary>First byte flag, three bytes type in ASCII. Flag bit 0 = active Flag bit 7 = bootable</summary>
-            public uint Type;
-            /// <summary>Starting sector</summary>
-            public uint Start;
-            /// <summary>Length in sectors</summary>
-            public uint Length;
-        }
+        return partitions.Count > 0;
+    }
 
-        struct AtariTable
-        {
-            /// <summary>Boot code for 342 bytes</summary>
-            public byte[] Boot;
-            /// <summary>8 extra entries for ICDPro driver</summary>
-            public AtariEntry[] IcdEntries;
-            /// <summary>Unused, 12 bytes</summary>
-            public byte[] Unused;
-            /// <summary>Disk size in sectors</summary>
-            public uint Size;
-            /// <summary>4 partition entries</summary>
-            public AtariEntry[] Entries;
-            /// <summary>Starting sector of bad block list</summary>
-            public uint BadStart;
-            /// <summary>Length in sectors of bad block list</summary>
-            public uint BadLength;
-            /// <summary>Checksum for bootable disks</summary>
-            public ushort Checksum;
-        }
+    /// <summary>Atari partition entry</summary>
+    struct AtariEntry
+    {
+        /// <summary>First byte flag, three bytes type in ASCII. Flag bit 0 = active Flag bit 7 = bootable</summary>
+        public uint Type;
+        /// <summary>Starting sector</summary>
+        public uint Start;
+        /// <summary>Length in sectors</summary>
+        public uint Length;
+    }
+
+    struct AtariTable
+    {
+        /// <summary>Boot code for 342 bytes</summary>
+        public byte[] Boot;
+        /// <summary>8 extra entries for ICDPro driver</summary>
+        public AtariEntry[] IcdEntries;
+        /// <summary>Unused, 12 bytes</summary>
+        public byte[] Unused;
+        /// <summary>Disk size in sectors</summary>
+        public uint Size;
+        /// <summary>4 partition entries</summary>
+        public AtariEntry[] Entries;
+        /// <summary>Starting sector of bad block list</summary>
+        public uint BadStart;
+        /// <summary>Length in sectors of bad block list</summary>
+        public uint BadLength;
+        /// <summary>Checksum for bootable disks</summary>
+        public ushort Checksum;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/BSD.cs b/Aaru.Partitions/BSD.cs
index 5762387d3..3deba6c13 100644
--- a/Aaru.Partitions/BSD.cs
+++ b/Aaru.Partitions/BSD.cs
@@ -42,464 +42,463 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of BSD disklabels</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class BSD : IPartition
 {
-    /// <inheritdoc />
-    /// <summary>Implements decoding of BSD disklabels</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class BSD : IPartition
+    const uint DISK_MAGIC = 0x82564557;
+    const uint DISK_CIGAM = 0x57455682;
+    /// <summary>Maximum size of a disklabel with 22 partitions</summary>
+    const uint MAX_LABEL_SIZE = 500;
+    /// <summary>Known sector locations for BSD disklabel</summary>
+    readonly ulong[] _labelLocations =
     {
-        const uint DISK_MAGIC = 0x82564557;
-        const uint DISK_CIGAM = 0x57455682;
-        /// <summary>Maximum size of a disklabel with 22 partitions</summary>
-        const uint MAX_LABEL_SIZE = 500;
-        /// <summary>Known sector locations for BSD disklabel</summary>
-        readonly ulong[] _labelLocations =
+        0, 1, 2, 9
+    };
+    /// <summary>Known byte offsets for BSD disklabel</summary>
+    readonly uint[] _labelOffsets =
+    {
+        0, 9, 64, 128, 516
+    };
+
+    /// <inheritdoc />
+    public string Name => "BSD disklabel";
+    /// <inheritdoc />
+    public Guid Id => new("246A6D93-4F1A-1F8A-344D-50187A5513A9");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+    {
+        partitions = new List<Partition>();
+        uint run = (MAX_LABEL_SIZE + _labelOffsets.Last()) / imagePlugin.Info.SectorSize;
+
+        if((MAX_LABEL_SIZE + _labelOffsets.Last()) % imagePlugin.Info.SectorSize > 0)
+            run++;
+
+        var  dl    = new DiskLabel();
+        bool found = false;
+
+        foreach(ulong location in _labelLocations)
         {
-            0, 1, 2, 9
-        };
-        /// <summary>Known byte offsets for BSD disklabel</summary>
-        readonly uint[] _labelOffsets =
-        {
-            0, 9, 64, 128, 516
-        };
-
-        /// <inheritdoc />
-        public string Name => "BSD disklabel";
-        /// <inheritdoc />
-        public Guid Id => new("246A6D93-4F1A-1F8A-344D-50187A5513A9");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
-        {
-            partitions = new List<Partition>();
-            uint run = (MAX_LABEL_SIZE + _labelOffsets.Last()) / imagePlugin.Info.SectorSize;
-
-            if((MAX_LABEL_SIZE + _labelOffsets.Last()) % imagePlugin.Info.SectorSize > 0)
-                run++;
-
-            var  dl    = new DiskLabel();
-            bool found = false;
-
-            foreach(ulong location in _labelLocations)
-            {
-                if(location + run + sectorOffset >= imagePlugin.Info.Sectors)
-                    return false;
-
-                ErrorNumber errno = imagePlugin.ReadSectors(location + sectorOffset, run, out byte[] tmp);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                foreach(uint offset in _labelOffsets)
-                {
-                    byte[] sector = new byte[MAX_LABEL_SIZE];
-
-                    if(offset + MAX_LABEL_SIZE > tmp.Length)
-                        break;
-
-                    Array.Copy(tmp, offset, sector, 0, MAX_LABEL_SIZE);
-                    dl = Marshal.ByteArrayToStructureLittleEndian<DiskLabel>(sector);
-
-                    AaruConsole.DebugWriteLine("BSD plugin",
-                                               "dl.magic on sector {0} at offset {1} = 0x{2:X8} (expected 0x{3:X8})",
-                                               location + sectorOffset, offset, dl.d_magic, DISK_MAGIC);
-
-                    if((dl.d_magic != DISK_MAGIC || dl.d_magic2 != DISK_MAGIC) &&
-                       (dl.d_magic != DISK_CIGAM || dl.d_magic2 != DISK_CIGAM))
-                        continue;
-
-                    found = true;
-
-                    break;
-                }
-
-                if(found)
-                    break;
-            }
-
-            if(!found)
+            if(location + run + sectorOffset >= imagePlugin.Info.Sectors)
                 return false;
 
-            if(dl.d_magic  == DISK_CIGAM &&
-               dl.d_magic2 == DISK_CIGAM)
-                dl = SwapDiskLabel(dl);
+            ErrorNumber errno = imagePlugin.ReadSectors(location + sectorOffset, run, out byte[] tmp);
 
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_type = {0}", dl.d_type);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_subtype = {0}", dl.d_subtype);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_typename = {0}", StringHandlers.CToString(dl.d_typename));
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_packname = {0}", StringHandlers.CToString(dl.d_packname));
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secsize = {0}", dl.d_secsize);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_nsectors = {0}", dl.d_nsectors);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_ntracks = {0}", dl.d_ntracks);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_ncylinders = {0}", dl.d_ncylinders);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secpercyl = {0}", dl.d_secpercyl);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secperunit = {0}", dl.d_secperunit);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sparespertrack = {0}", dl.d_sparespertrack);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sparespercyl = {0}", dl.d_sparespercyl);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_acylinders = {0}", dl.d_acylinders);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_rpm = {0}", dl.d_rpm);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_interleave = {0}", dl.d_interleave);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_trackskew = {0}", dl.d_trackskew);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_cylskeew = {0}", dl.d_cylskeew);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_headswitch = {0}", dl.d_headswitch);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_trkseek = {0}", dl.d_trkseek);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_flags = {0}", dl.d_flags);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[0] = {0}", dl.d_drivedata[0]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[1] = {0}", dl.d_drivedata[1]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[2] = {0}", dl.d_drivedata[2]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[3] = {0}", dl.d_drivedata[3]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[4] = {0}", dl.d_drivedata[4]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[0] = {0}", dl.d_spare[0]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[1] = {0}", dl.d_spare[1]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[2] = {0}", dl.d_spare[2]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[3] = {0}", dl.d_spare[3]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[4] = {0}", dl.d_spare[4]);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_magic2 = 0x{0:X8}", dl.d_magic2);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_checksum = 0x{0:X8}", dl.d_checksum);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_npartitions = {0}", dl.d_npartitions);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_bbsize = {0}", dl.d_bbsize);
-            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sbsize = {0}", dl.d_sbsize);
+            if(errno != ErrorNumber.NoError)
+                continue;
 
-            ulong counter         = 0;
-            bool  addSectorOffset = false;
-
-            for(int i = 0; i < dl.d_npartitions && i < 22; i++)
+            foreach(uint offset in _labelOffsets)
             {
-                AaruConsole.DebugWriteLine("BSD plugin", "dl.d_partitions[i].p_offset = {0}",
-                                           dl.d_partitions[i].p_offset);
+                byte[] sector = new byte[MAX_LABEL_SIZE];
 
-                AaruConsole.DebugWriteLine("BSD plugin", "dl.d_partitions[i].p_size = {0}", dl.d_partitions[i].p_size);
+                if(offset + MAX_LABEL_SIZE > tmp.Length)
+                    break;
 
-                AaruConsole.DebugWriteLine("BSD plugin", "dl.d_partitions[i].p_fstype = {0} ({1})",
-                                           dl.d_partitions[i].p_fstype, FSTypeToString(dl.d_partitions[i].p_fstype));
+                Array.Copy(tmp, offset, sector, 0, MAX_LABEL_SIZE);
+                dl = Marshal.ByteArrayToStructureLittleEndian<DiskLabel>(sector);
 
-                var part = new Partition
-                {
-                    Start    = dl.d_partitions[i].p_offset * dl.d_secsize / imagePlugin.Info.SectorSize,
-                    Offset   = dl.d_partitions[i].p_offset                * dl.d_secsize,
-                    Length   = dl.d_partitions[i].p_size * dl.d_secsize   / imagePlugin.Info.SectorSize,
-                    Size     = dl.d_partitions[i].p_size                  * dl.d_secsize,
-                    Type     = FSTypeToString(dl.d_partitions[i].p_fstype),
-                    Sequence = counter,
-                    Scheme   = Name
-                };
+                AaruConsole.DebugWriteLine("BSD plugin",
+                                           "dl.magic on sector {0} at offset {1} = 0x{2:X8} (expected 0x{3:X8})",
+                                           location + sectorOffset, offset, dl.d_magic, DISK_MAGIC);
 
-                if(dl.d_partitions[i].p_fstype == fsType.Unused)
+                if((dl.d_magic != DISK_MAGIC || dl.d_magic2 != DISK_MAGIC) &&
+                   (dl.d_magic != DISK_CIGAM || dl.d_magic2 != DISK_CIGAM))
                     continue;
 
-                // Crude and dirty way to know if the disklabel is relative to its parent partition...
-                if(dl.d_partitions[i].p_offset < sectorOffset &&
-                   !addSectorOffset)
-                    addSectorOffset = true;
+                found = true;
 
-                if(addSectorOffset)
-                {
-                    part.Start  += sectorOffset;
-                    part.Offset += sectorOffset * imagePlugin.Info.SectorSize;
-                }
-
-                AaruConsole.DebugWriteLine("BSD plugin", "part.start = {0}", part.Start);
-                AaruConsole.DebugWriteLine("BSD plugin", "Adding it...");
-                partitions.Add(part);
-                counter++;
+                break;
             }
 
-            return partitions.Count > 0;
+            if(found)
+                break;
         }
 
-        internal static string FSTypeToString(fsType typ)
+        if(!found)
+            return false;
+
+        if(dl.d_magic  == DISK_CIGAM &&
+           dl.d_magic2 == DISK_CIGAM)
+            dl = SwapDiskLabel(dl);
+
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_type = {0}", dl.d_type);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_subtype = {0}", dl.d_subtype);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_typename = {0}", StringHandlers.CToString(dl.d_typename));
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_packname = {0}", StringHandlers.CToString(dl.d_packname));
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secsize = {0}", dl.d_secsize);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_nsectors = {0}", dl.d_nsectors);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_ntracks = {0}", dl.d_ntracks);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_ncylinders = {0}", dl.d_ncylinders);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secpercyl = {0}", dl.d_secpercyl);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_secperunit = {0}", dl.d_secperunit);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sparespertrack = {0}", dl.d_sparespertrack);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sparespercyl = {0}", dl.d_sparespercyl);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_acylinders = {0}", dl.d_acylinders);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_rpm = {0}", dl.d_rpm);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_interleave = {0}", dl.d_interleave);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_trackskew = {0}", dl.d_trackskew);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_cylskeew = {0}", dl.d_cylskeew);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_headswitch = {0}", dl.d_headswitch);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_trkseek = {0}", dl.d_trkseek);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_flags = {0}", dl.d_flags);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[0] = {0}", dl.d_drivedata[0]);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[1] = {0}", dl.d_drivedata[1]);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[2] = {0}", dl.d_drivedata[2]);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[3] = {0}", dl.d_drivedata[3]);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_drivedata[4] = {0}", dl.d_drivedata[4]);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[0] = {0}", dl.d_spare[0]);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[1] = {0}", dl.d_spare[1]);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[2] = {0}", dl.d_spare[2]);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[3] = {0}", dl.d_spare[3]);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_spare[4] = {0}", dl.d_spare[4]);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_magic2 = 0x{0:X8}", dl.d_magic2);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_checksum = 0x{0:X8}", dl.d_checksum);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_npartitions = {0}", dl.d_npartitions);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_bbsize = {0}", dl.d_bbsize);
+        AaruConsole.DebugWriteLine("BSD plugin", "dl.d_sbsize = {0}", dl.d_sbsize);
+
+        ulong counter         = 0;
+        bool  addSectorOffset = false;
+
+        for(int i = 0; i < dl.d_npartitions && i < 22; i++)
         {
-            switch(typ)
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_partitions[i].p_offset = {0}",
+                                       dl.d_partitions[i].p_offset);
+
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_partitions[i].p_size = {0}", dl.d_partitions[i].p_size);
+
+            AaruConsole.DebugWriteLine("BSD plugin", "dl.d_partitions[i].p_fstype = {0} ({1})",
+                                       dl.d_partitions[i].p_fstype, FSTypeToString(dl.d_partitions[i].p_fstype));
+
+            var part = new Partition
             {
-                case fsType.Unused:  return "Unused entry";
-                case fsType.Swap:    return "Swap partition";
-                case fsType.V6:      return "UNIX 6th Edition";
-                case fsType.V7:      return "UNIX 7th Edition";
-                case fsType.SystemV: return "UNIX System V";
-                case fsType.V7_1K:   return "UNIX 7th Edition with 1K blocks";
-                case fsType.V8:      return "UNIX 8th Edition with 4K blocks";
-                case fsType.BSDFFS:  return "4.2BSD Fast File System";
-                case fsType.BSDLFS:  return "4.4LFS";
-                case fsType.HPFS:    return "HPFS";
-                case fsType.ISO9660: return "ISO9660";
-                case fsType.Boot:
-                case fsType.SysVBoot: return "Boot";
-                case fsType.AFFS:       return "Amiga FFS";
-                case fsType.HFS:        return "Apple HFS";
-                case fsType.ADVfs:      return "Digital Advanced File System";
-                case fsType.LSMpublic:  return "Digital LSM Public Region";
-                case fsType.LSMprivate: return "Digital LSM Private Region";
-                case fsType.LSMsimple:  return "Digital LSM Simple Disk";
-                case fsType.CCD:        return "Concatenated disk";
-                case fsType.JFS2:       return "IBM JFS2";
-                case fsType.HAMMER:     return "Hammer";
-                case fsType.HAMMER2:    return "Hammer2";
-                case fsType.UDF:        return "UDF";
-                case fsType.EFS:        return "EFS";
-                case fsType.ZFS:        return "ZFS";
-                case fsType.NANDFS:     return "FreeBSD nandfs";
-                case fsType.MSDOS:      return "FAT";
-                case fsType.Other:      return "Other or unknown";
-                default:                return "Unknown";
+                Start    = dl.d_partitions[i].p_offset * dl.d_secsize / imagePlugin.Info.SectorSize,
+                Offset   = dl.d_partitions[i].p_offset                * dl.d_secsize,
+                Length   = dl.d_partitions[i].p_size * dl.d_secsize   / imagePlugin.Info.SectorSize,
+                Size     = dl.d_partitions[i].p_size                  * dl.d_secsize,
+                Type     = FSTypeToString(dl.d_partitions[i].p_fstype),
+                Sequence = counter,
+                Scheme   = Name
+            };
+
+            if(dl.d_partitions[i].p_fstype == fsType.Unused)
+                continue;
+
+            // Crude and dirty way to know if the disklabel is relative to its parent partition...
+            if(dl.d_partitions[i].p_offset < sectorOffset &&
+               !addSectorOffset)
+                addSectorOffset = true;
+
+            if(addSectorOffset)
+            {
+                part.Start  += sectorOffset;
+                part.Offset += sectorOffset * imagePlugin.Info.SectorSize;
             }
+
+            AaruConsole.DebugWriteLine("BSD plugin", "part.start = {0}", part.Start);
+            AaruConsole.DebugWriteLine("BSD plugin", "Adding it...");
+            partitions.Add(part);
+            counter++;
         }
 
-        static DiskLabel SwapDiskLabel(DiskLabel dl)
+        return partitions.Count > 0;
+    }
+
+    internal static string FSTypeToString(fsType typ)
+    {
+        switch(typ)
         {
-            dl = (DiskLabel)Marshal.SwapStructureMembersEndian(dl);
-
-            for(int i = 0; i < dl.d_drivedata.Length; i++)
-                dl.d_drivedata[i] = Swapping.Swap(dl.d_drivedata[i]);
-
-            for(int i = 0; i < dl.d_spare.Length; i++)
-                dl.d_spare[i] = Swapping.Swap(dl.d_spare[i]);
-
-            for(int i = 0; i < dl.d_partitions.Length; i++)
-                dl.d_partitions[i] = (BSDPartition)Marshal.SwapStructureMembersEndian(dl.d_partitions[i]);
-
-            return dl;
-        }
-
-        /// <summary>Drive type</summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum dType : ushort
-        {
-            /// <summary>SMD, XSMD</summary>
-            SMD = 1,
-            /// <summary>MSCP</summary>
-            MSCP = 2,
-            /// <summary>Other DEC (rk, rl)</summary>
-            DEC = 3,
-            /// <summary>SCSI</summary>
-            SCSI = 4,
-            /// <summary>ESDI</summary>
-            ESDI = 5,
-            /// <summary>ST506 et al</summary>
-            ST506 = 6,
-            /// <summary>CS/80 on HP-IB</summary>
-            HPIB = 7,
-            /// <summary>HP Fiber-link</summary>
-            HPFL = 8,
-            /// <summary>Floppy</summary>
-            FLOPPY = 10,
-            /// <summary>Concatenated disk</summary>
-            CCD = 11,
-            /// <summary>uvnode pseudo-disk</summary>
-            VND = 12,
-            /// <summary>DiskOnChip</summary>
-            DOC2K = 13,
-            /// <summary>ATAPI</summary>
-            ATAPI = 13,
-            /// <summary>CMU RAIDframe</summary>
-            RAID = 14,
-            /// <summary>Logical disk</summary>
-            LD = 15,
-            /// <summary>IBM JFS 2</summary>
-            JFS2 = 16,
-            /// <summary>Cryptographic pseudo-disk</summary>
-            CGD = 17,
-            /// <summary>Vinum volume</summary>
-            VINUM = 18,
-            /// <summary>Flash memory devices</summary>
-            FLASH = 19,
-            /// <summary>Device-mapper pseudo-disk devices</summary>
-            DM = 20,
-            /// <summary>Rump virtual disk</summary>
-            RUMPD = 21,
-            /// <summary>Memory disk</summary>
-            MD = 22
-        }
-
-        /// <summary>Filesystem type</summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        internal enum fsType : byte
-        {
-            /// <summary>Unused entry</summary>
-            Unused = 0,
-            /// <summary>Swap partition</summary>
-            Swap = 1,
-            /// <summary>UNIX 6th Edition</summary>
-            V6 = 2,
-            /// <summary>UNIX 7th Edition</summary>
-            V7 = 3,
-            /// <summary>UNIX System V</summary>
-            SystemV = 4,
-            /// <summary>UNIX 7th Edition with 1K blocks</summary>
-            V7_1K = 5,
-            /// <summary>UNIX 8th Edition with 4K blocks</summary>
-            V8 = 6,
-            /// <summary>4.2BSD Fast File System</summary>
-            BSDFFS = 7,
-            /// <summary>MS-DOS filesystem</summary>
-            MSDOS = 8,
-            /// <summary>4.4LFS</summary>
-            BSDLFS = 9,
-            /// <summary>In use, unknown or unsupported</summary>
-            Other = 10,
-            /// <summary>HPFS</summary>
-            HPFS = 11,
-            /// <summary>ISO9660</summary>
-            ISO9660 = 12,
-            /// <summary>Boot partition</summary>
-            Boot = 13,
-            /// <summary>Amiga FFS</summary>
-            AFFS = 14,
-            /// <summary>Apple HFS</summary>
-            HFS = 15,
-            /// <summary>Acorn ADFS</summary>
-            FileCore = 16,
-            /// <summary>Digital Advanced File System</summary>
-            ADVfs = 16,
-            /// <summary>Digital LSM Public Region</summary>
-            LSMpublic = 17,
-            /// <summary>Linux ext2</summary>
-            ext2 = 17,
-            /// <summary>Digital LSM Private Region</summary>
-            LSMprivate = 18,
-            /// <summary>NTFS</summary>
-            NTFS = 18,
-            /// <summary>Digital LSM Simple Disk</summary>
-            LSMsimple = 19,
-            /// <summary>RAIDframe component</summary>
-            RAID = 19,
-            /// <summary>Concatenated disk component</summary>
-            CCD = 20,
-            /// <summary>IBM JFS2</summary>
-            JFS2 = 21,
-            /// <summary>Apple UFS</summary>
-            AppleUFS = 22,
-            /// <summary>Hammer filesystem</summary>
-            HAMMER = 22,
-            /// <summary>Hammer2 filesystem</summary>
-            HAMMER2 = 23,
-            /// <summary>UDF</summary>
-            UDF = 24,
-            /// <summary>System V Boot filesystem</summary>
-            SysVBoot = 25,
-            /// <summary>EFS</summary>
-            EFS = 26,
-            /// <summary>ZFS</summary>
-            ZFS = 27,
-            /// <summary>NiLFS</summary>
-            NILFS = 27,
-            /// <summary>Cryptographic disk</summary>
-            CGD = 28,
-            /// <summary>MINIX v3</summary>
-            MINIX = 29,
-            /// <summary>FreeBSD nandfs</summary>
-            NANDFS = 30
-        }
-
-        /// <summary>Drive flags</summary>
-        [SuppressMessage("ReSharper", "InconsistentNaming"), Flags]
-        enum dFlags : uint
-        {
-            /// <summary>Removable media</summary>
-            Removable = 0x01,
-            /// <summary>Drive supports ECC</summary>
-            ECC = 0x02,
-            /// <summary>Drive supports bad sector forwarding</summary>
-            BadSectorForward = 0x04,
-            /// <summary>Disk emulator</summary>
-            RAMDisk = 0x08,
-            /// <summary>Can do back to back transfer</summary>
-            Chain = 0x10,
-            /// <summary>Dynamic geometry device</summary>
-            DynamicGeometry = 0x20
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct DiskLabel
-        {
-            /// <summary>
-            ///     <see cref="BSD.DISK_MAGIC" />
-            /// </summary>
-            public readonly uint d_magic;
-            /// <summary>
-            ///     <see cref="dType" />
-            /// </summary>
-            public readonly dType d_type;
-            /// <summary>Disk subtype</summary>
-            public readonly ushort d_subtype;
-            /// <summary>Type name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] d_typename;
-            /// <summary>Pack identifier</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] d_packname;
-            /// <summary>Bytes per sector</summary>
-            public readonly uint d_secsize;
-            /// <summary>Sectors per track</summary>
-            public readonly uint d_nsectors;
-            /// <summary>Tracks per cylinder</summary>
-            public readonly uint d_ntracks;
-            /// <summary>Cylinders per unit</summary>
-            public readonly uint d_ncylinders;
-            /// <summary>Sectors per cylinder</summary>
-            public readonly uint d_secpercyl;
-            /// <summary>Sectors per unit</summary>
-            public readonly uint d_secperunit;
-            /// <summary>Spare sectors per track</summary>
-            public readonly ushort d_sparespertrack;
-            /// <summary>Spare sectors per cylinder</summary>
-            public readonly ushort d_sparespercyl;
-            /// <summary>Alternate cylinders</summary>
-            public readonly uint d_acylinders;
-            /// <summary>Rotational speed</summary>
-            public readonly ushort d_rpm;
-            /// <summary>Hardware sector interleave</summary>
-            public readonly ushort d_interleave;
-            /// <summary>Sector 0 skew per track</summary>
-            public readonly ushort d_trackskew;
-            /// <summary>Sector 0 sker per cylinder</summary>
-            public readonly ushort d_cylskeew;
-            /// <summary>Head switch time in microseconds</summary>
-            public readonly uint d_headswitch;
-            /// <summary>Track to track seek in microseconds</summary>
-            public readonly uint d_trkseek;
-            /// <summary>
-            ///     <see cref="dFlags" />
-            /// </summary>
-            public readonly dFlags d_flags;
-            /// <summary>Drive-specific information</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly uint[] d_drivedata;
-            /// <summary>Reserved</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
-            public readonly uint[] d_spare;
-            /// <summary><see cref="BSD.DISK_MAGIC" /> again</summary>
-            public readonly uint d_magic2;
-            /// <summary>XOR of data</summary>
-            public readonly ushort d_checksum;
-            /// <summary>How many partitions</summary>
-            public readonly ushort d_npartitions;
-            /// <summary>Size of boot area in bytes</summary>
-            public readonly uint d_bbsize;
-            /// <summary>Maximum size of superblock in bytes</summary>
-            public readonly uint d_sbsize;
-            /// <summary>Partitions</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
-            public readonly BSDPartition[] d_partitions;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct BSDPartition
-        {
-            /// <summary>Sectors in partition</summary>
-            public readonly uint p_size;
-            /// <summary>Starting sector</summary>
-            public readonly uint p_offset;
-            /// <summary>Fragment size</summary>
-            public readonly uint p_fsize;
-            /// <summary>Filesystem type, <see cref="fsType" /></summary>
-            public readonly fsType p_fstype;
-            /// <summary>Fragment size</summary>
-            public readonly byte p_frag;
-            /// <summary>Cylinder per group</summary>
-            public readonly ushort p_cpg;
+            case fsType.Unused:  return "Unused entry";
+            case fsType.Swap:    return "Swap partition";
+            case fsType.V6:      return "UNIX 6th Edition";
+            case fsType.V7:      return "UNIX 7th Edition";
+            case fsType.SystemV: return "UNIX System V";
+            case fsType.V7_1K:   return "UNIX 7th Edition with 1K blocks";
+            case fsType.V8:      return "UNIX 8th Edition with 4K blocks";
+            case fsType.BSDFFS:  return "4.2BSD Fast File System";
+            case fsType.BSDLFS:  return "4.4LFS";
+            case fsType.HPFS:    return "HPFS";
+            case fsType.ISO9660: return "ISO9660";
+            case fsType.Boot:
+            case fsType.SysVBoot: return "Boot";
+            case fsType.AFFS:       return "Amiga FFS";
+            case fsType.HFS:        return "Apple HFS";
+            case fsType.ADVfs:      return "Digital Advanced File System";
+            case fsType.LSMpublic:  return "Digital LSM Public Region";
+            case fsType.LSMprivate: return "Digital LSM Private Region";
+            case fsType.LSMsimple:  return "Digital LSM Simple Disk";
+            case fsType.CCD:        return "Concatenated disk";
+            case fsType.JFS2:       return "IBM JFS2";
+            case fsType.HAMMER:     return "Hammer";
+            case fsType.HAMMER2:    return "Hammer2";
+            case fsType.UDF:        return "UDF";
+            case fsType.EFS:        return "EFS";
+            case fsType.ZFS:        return "ZFS";
+            case fsType.NANDFS:     return "FreeBSD nandfs";
+            case fsType.MSDOS:      return "FAT";
+            case fsType.Other:      return "Other or unknown";
+            default:                return "Unknown";
         }
     }
+
+    static DiskLabel SwapDiskLabel(DiskLabel dl)
+    {
+        dl = (DiskLabel)Marshal.SwapStructureMembersEndian(dl);
+
+        for(int i = 0; i < dl.d_drivedata.Length; i++)
+            dl.d_drivedata[i] = Swapping.Swap(dl.d_drivedata[i]);
+
+        for(int i = 0; i < dl.d_spare.Length; i++)
+            dl.d_spare[i] = Swapping.Swap(dl.d_spare[i]);
+
+        for(int i = 0; i < dl.d_partitions.Length; i++)
+            dl.d_partitions[i] = (BSDPartition)Marshal.SwapStructureMembersEndian(dl.d_partitions[i]);
+
+        return dl;
+    }
+
+    /// <summary>Drive type</summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum dType : ushort
+    {
+        /// <summary>SMD, XSMD</summary>
+        SMD = 1,
+        /// <summary>MSCP</summary>
+        MSCP = 2,
+        /// <summary>Other DEC (rk, rl)</summary>
+        DEC = 3,
+        /// <summary>SCSI</summary>
+        SCSI = 4,
+        /// <summary>ESDI</summary>
+        ESDI = 5,
+        /// <summary>ST506 et al</summary>
+        ST506 = 6,
+        /// <summary>CS/80 on HP-IB</summary>
+        HPIB = 7,
+        /// <summary>HP Fiber-link</summary>
+        HPFL = 8,
+        /// <summary>Floppy</summary>
+        FLOPPY = 10,
+        /// <summary>Concatenated disk</summary>
+        CCD = 11,
+        /// <summary>uvnode pseudo-disk</summary>
+        VND = 12,
+        /// <summary>DiskOnChip</summary>
+        DOC2K = 13,
+        /// <summary>ATAPI</summary>
+        ATAPI = 13,
+        /// <summary>CMU RAIDframe</summary>
+        RAID = 14,
+        /// <summary>Logical disk</summary>
+        LD = 15,
+        /// <summary>IBM JFS 2</summary>
+        JFS2 = 16,
+        /// <summary>Cryptographic pseudo-disk</summary>
+        CGD = 17,
+        /// <summary>Vinum volume</summary>
+        VINUM = 18,
+        /// <summary>Flash memory devices</summary>
+        FLASH = 19,
+        /// <summary>Device-mapper pseudo-disk devices</summary>
+        DM = 20,
+        /// <summary>Rump virtual disk</summary>
+        RUMPD = 21,
+        /// <summary>Memory disk</summary>
+        MD = 22
+    }
+
+    /// <summary>Filesystem type</summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    internal enum fsType : byte
+    {
+        /// <summary>Unused entry</summary>
+        Unused = 0,
+        /// <summary>Swap partition</summary>
+        Swap = 1,
+        /// <summary>UNIX 6th Edition</summary>
+        V6 = 2,
+        /// <summary>UNIX 7th Edition</summary>
+        V7 = 3,
+        /// <summary>UNIX System V</summary>
+        SystemV = 4,
+        /// <summary>UNIX 7th Edition with 1K blocks</summary>
+        V7_1K = 5,
+        /// <summary>UNIX 8th Edition with 4K blocks</summary>
+        V8 = 6,
+        /// <summary>4.2BSD Fast File System</summary>
+        BSDFFS = 7,
+        /// <summary>MS-DOS filesystem</summary>
+        MSDOS = 8,
+        /// <summary>4.4LFS</summary>
+        BSDLFS = 9,
+        /// <summary>In use, unknown or unsupported</summary>
+        Other = 10,
+        /// <summary>HPFS</summary>
+        HPFS = 11,
+        /// <summary>ISO9660</summary>
+        ISO9660 = 12,
+        /// <summary>Boot partition</summary>
+        Boot = 13,
+        /// <summary>Amiga FFS</summary>
+        AFFS = 14,
+        /// <summary>Apple HFS</summary>
+        HFS = 15,
+        /// <summary>Acorn ADFS</summary>
+        FileCore = 16,
+        /// <summary>Digital Advanced File System</summary>
+        ADVfs = 16,
+        /// <summary>Digital LSM Public Region</summary>
+        LSMpublic = 17,
+        /// <summary>Linux ext2</summary>
+        ext2 = 17,
+        /// <summary>Digital LSM Private Region</summary>
+        LSMprivate = 18,
+        /// <summary>NTFS</summary>
+        NTFS = 18,
+        /// <summary>Digital LSM Simple Disk</summary>
+        LSMsimple = 19,
+        /// <summary>RAIDframe component</summary>
+        RAID = 19,
+        /// <summary>Concatenated disk component</summary>
+        CCD = 20,
+        /// <summary>IBM JFS2</summary>
+        JFS2 = 21,
+        /// <summary>Apple UFS</summary>
+        AppleUFS = 22,
+        /// <summary>Hammer filesystem</summary>
+        HAMMER = 22,
+        /// <summary>Hammer2 filesystem</summary>
+        HAMMER2 = 23,
+        /// <summary>UDF</summary>
+        UDF = 24,
+        /// <summary>System V Boot filesystem</summary>
+        SysVBoot = 25,
+        /// <summary>EFS</summary>
+        EFS = 26,
+        /// <summary>ZFS</summary>
+        ZFS = 27,
+        /// <summary>NiLFS</summary>
+        NILFS = 27,
+        /// <summary>Cryptographic disk</summary>
+        CGD = 28,
+        /// <summary>MINIX v3</summary>
+        MINIX = 29,
+        /// <summary>FreeBSD nandfs</summary>
+        NANDFS = 30
+    }
+
+    /// <summary>Drive flags</summary>
+    [SuppressMessage("ReSharper", "InconsistentNaming"), Flags]
+    enum dFlags : uint
+    {
+        /// <summary>Removable media</summary>
+        Removable = 0x01,
+        /// <summary>Drive supports ECC</summary>
+        ECC = 0x02,
+        /// <summary>Drive supports bad sector forwarding</summary>
+        BadSectorForward = 0x04,
+        /// <summary>Disk emulator</summary>
+        RAMDisk = 0x08,
+        /// <summary>Can do back to back transfer</summary>
+        Chain = 0x10,
+        /// <summary>Dynamic geometry device</summary>
+        DynamicGeometry = 0x20
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct DiskLabel
+    {
+        /// <summary>
+        ///     <see cref="BSD.DISK_MAGIC" />
+        /// </summary>
+        public readonly uint d_magic;
+        /// <summary>
+        ///     <see cref="dType" />
+        /// </summary>
+        public readonly dType d_type;
+        /// <summary>Disk subtype</summary>
+        public readonly ushort d_subtype;
+        /// <summary>Type name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] d_typename;
+        /// <summary>Pack identifier</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] d_packname;
+        /// <summary>Bytes per sector</summary>
+        public readonly uint d_secsize;
+        /// <summary>Sectors per track</summary>
+        public readonly uint d_nsectors;
+        /// <summary>Tracks per cylinder</summary>
+        public readonly uint d_ntracks;
+        /// <summary>Cylinders per unit</summary>
+        public readonly uint d_ncylinders;
+        /// <summary>Sectors per cylinder</summary>
+        public readonly uint d_secpercyl;
+        /// <summary>Sectors per unit</summary>
+        public readonly uint d_secperunit;
+        /// <summary>Spare sectors per track</summary>
+        public readonly ushort d_sparespertrack;
+        /// <summary>Spare sectors per cylinder</summary>
+        public readonly ushort d_sparespercyl;
+        /// <summary>Alternate cylinders</summary>
+        public readonly uint d_acylinders;
+        /// <summary>Rotational speed</summary>
+        public readonly ushort d_rpm;
+        /// <summary>Hardware sector interleave</summary>
+        public readonly ushort d_interleave;
+        /// <summary>Sector 0 skew per track</summary>
+        public readonly ushort d_trackskew;
+        /// <summary>Sector 0 sker per cylinder</summary>
+        public readonly ushort d_cylskeew;
+        /// <summary>Head switch time in microseconds</summary>
+        public readonly uint d_headswitch;
+        /// <summary>Track to track seek in microseconds</summary>
+        public readonly uint d_trkseek;
+        /// <summary>
+        ///     <see cref="dFlags" />
+        /// </summary>
+        public readonly dFlags d_flags;
+        /// <summary>Drive-specific information</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly uint[] d_drivedata;
+        /// <summary>Reserved</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
+        public readonly uint[] d_spare;
+        /// <summary><see cref="BSD.DISK_MAGIC" /> again</summary>
+        public readonly uint d_magic2;
+        /// <summary>XOR of data</summary>
+        public readonly ushort d_checksum;
+        /// <summary>How many partitions</summary>
+        public readonly ushort d_npartitions;
+        /// <summary>Size of boot area in bytes</summary>
+        public readonly uint d_bbsize;
+        /// <summary>Maximum size of superblock in bytes</summary>
+        public readonly uint d_sbsize;
+        /// <summary>Partitions</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
+        public readonly BSDPartition[] d_partitions;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct BSDPartition
+    {
+        /// <summary>Sectors in partition</summary>
+        public readonly uint p_size;
+        /// <summary>Starting sector</summary>
+        public readonly uint p_offset;
+        /// <summary>Fragment size</summary>
+        public readonly uint p_fsize;
+        /// <summary>Filesystem type, <see cref="fsType" /></summary>
+        public readonly fsType p_fstype;
+        /// <summary>Fragment size</summary>
+        public readonly byte p_frag;
+        /// <summary>Cylinder per group</summary>
+        public readonly ushort p_cpg;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/DEC.cs b/Aaru.Partitions/DEC.cs
index 1f10eda71..7aa6bc2aa 100644
--- a/Aaru.Partitions/DEC.cs
+++ b/Aaru.Partitions/DEC.cs
@@ -38,78 +38,77 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of DEC disklabels</summary>
+public sealed class DEC : IPartition
 {
+    const int PT_MAGIC = 0x032957;
+    const int PT_VALID = 1;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of DEC disklabels</summary>
-    public sealed class DEC : IPartition
+    public string Name => "DEC disklabel";
+    /// <inheritdoc />
+    public Guid Id => new("58CEC3B7-3B93-4D47-86EE-D6DADE9D444F");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<CommonTypes.Partition> partitions,
+                               ulong sectorOffset)
     {
-        const int PT_MAGIC = 0x032957;
-        const int PT_VALID = 1;
+        partitions = new List<CommonTypes.Partition>();
 
-        /// <inheritdoc />
-        public string Name => "DEC disklabel";
-        /// <inheritdoc />
-        public Guid Id => new("58CEC3B7-3B93-4D47-86EE-D6DADE9D444F");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(31 + sectorOffset >= imagePlugin.Info.Sectors)
+            return false;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<CommonTypes.Partition> partitions,
-                                   ulong sectorOffset)
+        ErrorNumber errno = imagePlugin.ReadSector(31 + sectorOffset, out byte[] sector);
+
+        if(errno         != ErrorNumber.NoError ||
+           sector.Length < 512)
+            return false;
+
+        Label table = Marshal.ByteArrayToStructureLittleEndian<Label>(sector);
+
+        if(table.pt_magic != PT_MAGIC ||
+           table.pt_valid != PT_VALID)
+            return false;
+
+        ulong counter = 0;
+
+        foreach(CommonTypes.Partition part in table.pt_part.Select(entry => new CommonTypes.Partition
+                {
+                    Start    = entry.pi_blkoff,
+                    Offset   = (ulong)(entry.pi_blkoff * sector.Length),
+                    Size     = (ulong)entry.pi_nblocks,
+                    Length   = (ulong)(entry.pi_nblocks * sector.Length),
+                    Sequence = counter,
+                    Scheme   = Name
+                }).Where(part => part.Size > 0))
         {
-            partitions = new List<CommonTypes.Partition>();
-
-            if(31 + sectorOffset >= imagePlugin.Info.Sectors)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(31 + sectorOffset, out byte[] sector);
-
-            if(errno         != ErrorNumber.NoError ||
-               sector.Length < 512)
-                return false;
-
-            Label table = Marshal.ByteArrayToStructureLittleEndian<Label>(sector);
-
-            if(table.pt_magic != PT_MAGIC ||
-               table.pt_valid != PT_VALID)
-                return false;
-
-            ulong counter = 0;
-
-            foreach(CommonTypes.Partition part in table.pt_part.Select(entry => new CommonTypes.Partition
-            {
-                Start    = entry.pi_blkoff,
-                Offset   = (ulong)(entry.pi_blkoff * sector.Length),
-                Size     = (ulong)entry.pi_nblocks,
-                Length   = (ulong)(entry.pi_nblocks * sector.Length),
-                Sequence = counter,
-                Scheme   = Name
-            }).Where(part => part.Size > 0))
-            {
-                partitions.Add(part);
-                counter++;
-            }
-
-            return true;
+            partitions.Add(part);
+            counter++;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Label
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 440)]
-            public readonly byte[] padding;
-            public readonly int pt_magic;
-            public readonly int pt_valid;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly Partition[] pt_part;
-        }
+        return true;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Partition
-        {
-            public readonly int  pi_nblocks;
-            public readonly uint pi_blkoff;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Label
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 440)]
+        public readonly byte[] padding;
+        public readonly int pt_magic;
+        public readonly int pt_valid;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly Partition[] pt_part;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Partition
+    {
+        public readonly int  pi_nblocks;
+        public readonly uint pi_blkoff;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/DragonFlyBSD.cs b/Aaru.Partitions/DragonFlyBSD.cs
index adebf5fcc..63320f110 100644
--- a/Aaru.Partitions/DragonFlyBSD.cs
+++ b/Aaru.Partitions/DragonFlyBSD.cs
@@ -39,113 +39,112 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of DragonFly BSD disklabels</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class DragonFlyBSD : IPartition
 {
+    const uint DISK_MAGIC64 = 0xC4464C59;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of DragonFly BSD disklabels</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class DragonFlyBSD : IPartition
+    public string Name => "DragonFly BSD 64-bit disklabel";
+    /// <inheritdoc />
+    public Guid Id => new("D49E41A6-D952-4760-9D94-03DAE2450C5F");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        const uint DISK_MAGIC64 = 0xC4464C59;
+        partitions = new List<Partition>();
+        uint nSectors = 2048 / imagePlugin.Info.SectorSize;
 
-        /// <inheritdoc />
-        public string Name => "DragonFly BSD 64-bit disklabel";
-        /// <inheritdoc />
-        public Guid Id => new("D49E41A6-D952-4760-9D94-03DAE2450C5F");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(2048 % imagePlugin.Info.SectorSize > 0)
+            nSectors++;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        if(sectorOffset + nSectors >= imagePlugin.Info.Sectors)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSectors(sectorOffset, nSectors, out byte[] sectors);
+
+        if(errno          != ErrorNumber.NoError ||
+           sectors.Length < 2048)
+            return false;
+
+        Disklabel64 disklabel = Marshal.ByteArrayToStructureLittleEndian<Disklabel64>(sectors);
+
+        if(disklabel.d_magic != 0xC4464C59)
+            return false;
+
+        ulong counter = 0;
+
+        foreach(Partition64 entry in disklabel.d_partitions)
         {
-            partitions = new List<Partition>();
-            uint nSectors = 2048 / imagePlugin.Info.SectorSize;
-
-            if(2048 % imagePlugin.Info.SectorSize > 0)
-                nSectors++;
-
-            if(sectorOffset + nSectors >= imagePlugin.Info.Sectors)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSectors(sectorOffset, nSectors, out byte[] sectors);
-
-            if(errno          != ErrorNumber.NoError ||
-               sectors.Length < 2048)
-                return false;
-
-            Disklabel64 disklabel = Marshal.ByteArrayToStructureLittleEndian<Disklabel64>(sectors);
-
-            if(disklabel.d_magic != 0xC4464C59)
-                return false;
-
-            ulong counter = 0;
-
-            foreach(Partition64 entry in disklabel.d_partitions)
+            var part = new Partition
             {
-                var part = new Partition
-                {
-                    Start    = (entry.p_boffset / imagePlugin.Info.SectorSize) + sectorOffset,
-                    Offset   = entry.p_boffset + (sectorOffset * imagePlugin.Info.SectorSize),
-                    Size     = entry.p_bsize,
-                    Length   = entry.p_bsize / imagePlugin.Info.SectorSize,
-                    Name     = entry.p_stor_uuid.ToString(),
-                    Sequence = counter,
-                    Scheme   = Name,
-                    Type = (BSD.fsType)entry.p_fstype == BSD.fsType.Other ? entry.p_type_uuid.ToString()
-                               : BSD.FSTypeToString((BSD.fsType)entry.p_fstype)
-                };
+                Start    = (entry.p_boffset / imagePlugin.Info.SectorSize) + sectorOffset,
+                Offset   = entry.p_boffset + (sectorOffset * imagePlugin.Info.SectorSize),
+                Size     = entry.p_bsize,
+                Length   = entry.p_bsize / imagePlugin.Info.SectorSize,
+                Name     = entry.p_stor_uuid.ToString(),
+                Sequence = counter,
+                Scheme   = Name,
+                Type = (BSD.fsType)entry.p_fstype == BSD.fsType.Other ? entry.p_type_uuid.ToString()
+                           : BSD.FSTypeToString((BSD.fsType)entry.p_fstype)
+            };
 
-                if(entry.p_bsize % imagePlugin.Info.SectorSize > 0)
-                    part.Length++;
+            if(entry.p_bsize % imagePlugin.Info.SectorSize > 0)
+                part.Length++;
 
-                if(entry.p_bsize   <= 0 ||
-                   entry.p_boffset <= 0)
-                    continue;
+            if(entry.p_bsize   <= 0 ||
+               entry.p_boffset <= 0)
+                continue;
 
-                partitions.Add(part);
-                counter++;
-            }
-
-            return true;
+            partitions.Add(part);
+            counter++;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Disklabel64
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
-            public readonly byte[] d_reserved0;
-            public readonly uint  d_magic;
-            public readonly uint  d_crc;
-            public readonly uint  d_align;
-            public readonly uint  d_npartitions;
-            public readonly Guid  d_stor_uuid;
-            public readonly ulong d_total_size;
-            public readonly ulong d_bbase;
-            public readonly ulong d_pbase;
-            public readonly ulong d_pstop;
-            public readonly ulong d_abase;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] d_packname;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
-            public readonly byte[] d_reserved;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly Partition64[] d_partitions;
-        }
+        return true;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Partition64
-        {
-            public readonly ulong p_boffset;
-            public readonly ulong p_bsize;
-            public readonly byte  p_fstype;
-            public readonly byte  p_unused01;
-            public readonly byte  p_unused02;
-            public readonly byte  p_unused03;
-            public readonly uint  p_unused04;
-            public readonly uint  p_unused05;
-            public readonly uint  p_unused06;
-            public readonly Guid  p_type_uuid;
-            public readonly Guid  p_stor_uuid;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Disklabel64
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 512)]
+        public readonly byte[] d_reserved0;
+        public readonly uint  d_magic;
+        public readonly uint  d_crc;
+        public readonly uint  d_align;
+        public readonly uint  d_npartitions;
+        public readonly Guid  d_stor_uuid;
+        public readonly ulong d_total_size;
+        public readonly ulong d_bbase;
+        public readonly ulong d_pbase;
+        public readonly ulong d_pstop;
+        public readonly ulong d_abase;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] d_packname;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public readonly byte[] d_reserved;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly Partition64[] d_partitions;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Partition64
+    {
+        public readonly ulong p_boffset;
+        public readonly ulong p_bsize;
+        public readonly byte  p_fstype;
+        public readonly byte  p_unused01;
+        public readonly byte  p_unused02;
+        public readonly byte  p_unused03;
+        public readonly uint  p_unused04;
+        public readonly uint  p_unused05;
+        public readonly uint  p_unused06;
+        public readonly Guid  p_type_uuid;
+        public readonly Guid  p_stor_uuid;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/GPT.cs b/Aaru.Partitions/GPT.cs
index f9ca0dcc8..7a9a4283c 100644
--- a/Aaru.Partitions/GPT.cs
+++ b/Aaru.Partitions/GPT.cs
@@ -41,319 +41,318 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of the GUID Partition Table</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class GuidPartitionTable : IPartition
 {
+    const ulong GPT_MAGIC     = 0x5452415020494645;
+    const uint  GPT_REVISION1 = 0x00010000;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of the GUID Partition Table</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class GuidPartitionTable : IPartition
+    public string Name => "GUID Partition Table";
+    /// <inheritdoc />
+    public Guid Id => new("CBC9D281-C1D0-44E8-9038-4D66FD2678AB");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        const ulong GPT_MAGIC     = 0x5452415020494645;
-        const uint  GPT_REVISION1 = 0x00010000;
+        partitions = new List<Partition>();
 
-        /// <inheritdoc />
-        public string Name => "GUID Partition Table";
-        /// <inheritdoc />
-        public Guid Id => new("CBC9D281-C1D0-44E8-9038-4D66FD2678AB");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
+            return false;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
-        {
-            partitions = new List<Partition>();
+        ErrorNumber errno = imagePlugin.ReadSector(1 + sectorOffset, out byte[] hdrBytes);
 
-            if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
-                return false;
+        if(errno != ErrorNumber.NoError)
+            return false;
 
-            ErrorNumber errno = imagePlugin.ReadSector(1 + sectorOffset, out byte[] hdrBytes);
+        Header hdr;
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+        ulong signature  = BitConverter.ToUInt64(hdrBytes, 0);
+        bool  misaligned = false;
 
-            Header hdr;
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.signature = 0x{0:X16}", signature);
 
-            ulong signature  = BitConverter.ToUInt64(hdrBytes, 0);
-            bool  misaligned = false;
+        if(signature != GPT_MAGIC)
+            if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+            {
+                errno = imagePlugin.ReadSector(sectorOffset, out hdrBytes);
 
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.signature = 0x{0:X16}", signature);
+                if(errno != ErrorNumber.NoError)
+                    return false;
 
-            if(signature != GPT_MAGIC)
-                if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+                signature = BitConverter.ToUInt64(hdrBytes, 512);
+                AaruConsole.DebugWriteLine("GPT Plugin", "hdr.signature @ 0x200 = 0x{0:X16}", signature);
+
+                if(signature == GPT_MAGIC)
                 {
-                    errno = imagePlugin.ReadSector(sectorOffset, out hdrBytes);
-
-                    if(errno != ErrorNumber.NoError)
-                        return false;
-
-                    signature = BitConverter.ToUInt64(hdrBytes, 512);
-                    AaruConsole.DebugWriteLine("GPT Plugin", "hdr.signature @ 0x200 = 0x{0:X16}", signature);
-
-                    if(signature == GPT_MAGIC)
-                    {
-                        AaruConsole.DebugWriteLine("GPT Plugin", "Found unaligned signature", signature);
-                        byte[] real = new byte[512];
-                        Array.Copy(hdrBytes, 512, real, 0, 512);
-                        hdrBytes   = real;
-                        misaligned = true;
-                    }
-                    else
-                        return false;
+                    AaruConsole.DebugWriteLine("GPT Plugin", "Found unaligned signature", signature);
+                    byte[] real = new byte[512];
+                    Array.Copy(hdrBytes, 512, real, 0, 512);
+                    hdrBytes   = real;
+                    misaligned = true;
                 }
                 else
                     return false;
-
-            try
-            {
-                hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrBytes);
-            }
-            catch
-            {
-                return false;
-            }
-
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.revision = 0x{0:X8}", hdr.revision);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.headerSize = {0}", hdr.headerSize);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.headerCrc = 0x{0:X8}", hdr.headerCrc);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.reserved = 0x{0:X8}", hdr.reserved);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.myLBA = {0}", hdr.myLBA);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.alternateLBA = {0}", hdr.alternateLBA);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.firstUsableLBA = {0}", hdr.firstUsableLBA);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.lastUsableLBA = {0}", hdr.lastUsableLBA);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.diskGuid = {0}", hdr.diskGuid);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entryLBA = {0}", hdr.entryLBA);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entries = {0}", hdr.entries);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entriesSize = {0}", hdr.entriesSize);
-            AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entriesCrc = 0x{0:X8}", hdr.entriesCrc);
-
-            if(hdr.signature != GPT_MAGIC)
-                return false;
-
-            if(hdr.myLBA != 1 + sectorOffset)
-                return false;
-
-            uint divisor, modulo, sectorSize;
-
-            if(misaligned)
-            {
-                divisor    = 4;
-                modulo     = (uint)(hdr.entryLBA % divisor);
-                sectorSize = 512;
             }
             else
-            {
-                divisor    = 1;
-                modulo     = 0;
-                sectorSize = imagePlugin.Info.SectorSize;
-            }
-
-            uint totalEntriesSectors = hdr.entries * hdr.entriesSize / imagePlugin.Info.SectorSize;
-
-            if(hdr.entries * hdr.entriesSize % imagePlugin.Info.SectorSize > 0)
-                totalEntriesSectors++;
-
-            errno = imagePlugin.ReadSectors(hdr.entryLBA / divisor, totalEntriesSectors + modulo, out byte[] temp);
-
-            if(errno != ErrorNumber.NoError)
                 return false;
 
-            byte[] entriesBytes = new byte[temp.Length - (modulo * 512)];
-            Array.Copy(temp, modulo * 512, entriesBytes, 0, entriesBytes.Length);
-            List<Entry> entries = new();
+        try
+        {
+            hdr = Marshal.ByteArrayToStructureLittleEndian<Header>(hdrBytes);
+        }
+        catch
+        {
+            return false;
+        }
 
-            for(int i = 0; i < hdr.entries; i++)
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.revision = 0x{0:X8}", hdr.revision);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.headerSize = {0}", hdr.headerSize);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.headerCrc = 0x{0:X8}", hdr.headerCrc);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.reserved = 0x{0:X8}", hdr.reserved);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.myLBA = {0}", hdr.myLBA);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.alternateLBA = {0}", hdr.alternateLBA);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.firstUsableLBA = {0}", hdr.firstUsableLBA);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.lastUsableLBA = {0}", hdr.lastUsableLBA);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.diskGuid = {0}", hdr.diskGuid);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entryLBA = {0}", hdr.entryLBA);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entries = {0}", hdr.entries);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entriesSize = {0}", hdr.entriesSize);
+        AaruConsole.DebugWriteLine("GPT Plugin", "hdr.entriesCrc = 0x{0:X8}", hdr.entriesCrc);
+
+        if(hdr.signature != GPT_MAGIC)
+            return false;
+
+        if(hdr.myLBA != 1 + sectorOffset)
+            return false;
+
+        uint divisor, modulo, sectorSize;
+
+        if(misaligned)
+        {
+            divisor    = 4;
+            modulo     = (uint)(hdr.entryLBA % divisor);
+            sectorSize = 512;
+        }
+        else
+        {
+            divisor    = 1;
+            modulo     = 0;
+            sectorSize = imagePlugin.Info.SectorSize;
+        }
+
+        uint totalEntriesSectors = hdr.entries * hdr.entriesSize / imagePlugin.Info.SectorSize;
+
+        if(hdr.entries * hdr.entriesSize % imagePlugin.Info.SectorSize > 0)
+            totalEntriesSectors++;
+
+        errno = imagePlugin.ReadSectors(hdr.entryLBA / divisor, totalEntriesSectors + modulo, out byte[] temp);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        byte[] entriesBytes = new byte[temp.Length - (modulo * 512)];
+        Array.Copy(temp, modulo * 512, entriesBytes, 0, entriesBytes.Length);
+        List<Entry> entries = new();
+
+        for(int i = 0; i < hdr.entries; i++)
+        {
+            try
             {
-                try
-                {
-                    byte[] entryBytes = new byte[hdr.entriesSize];
-                    Array.Copy(entriesBytes, hdr.entriesSize * i, entryBytes, 0, hdr.entriesSize);
-                    entries.Add(Marshal.ByteArrayToStructureLittleEndian<Entry>(entryBytes));
-                }
-                #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
-                catch
-                {
-                    // ignored
-                }
-                #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
+                byte[] entryBytes = new byte[hdr.entriesSize];
+                Array.Copy(entriesBytes, hdr.entriesSize * i, entryBytes, 0, hdr.entriesSize);
+                entries.Add(Marshal.ByteArrayToStructureLittleEndian<Entry>(entryBytes));
             }
+            #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
+            catch
+            {
+                // ignored
+            }
+            #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
+        }
 
-            if(entries.Count == 0)
+        if(entries.Count == 0)
+            return false;
+
+        ulong pSeq = 0;
+
+        foreach(Entry entry in entries.Where(entry => entry.partitionType != Guid.Empty &&
+                                                      entry.partitionId   != Guid.Empty))
+        {
+            AaruConsole.DebugWriteLine("GPT Plugin", "entry.partitionType = {0}", entry.partitionType);
+            AaruConsole.DebugWriteLine("GPT Plugin", "entry.partitionId = {0}", entry.partitionId);
+            AaruConsole.DebugWriteLine("GPT Plugin", "entry.startLBA = {0}", entry.startLBA);
+            AaruConsole.DebugWriteLine("GPT Plugin", "entry.endLBA = {0}", entry.endLBA);
+            AaruConsole.DebugWriteLine("GPT Plugin", "entry.attributes = 0x{0:X16}", entry.attributes);
+            AaruConsole.DebugWriteLine("GPT Plugin", "entry.name = {0}", entry.name);
+
+            if(entry.startLBA / divisor > imagePlugin.Info.Sectors ||
+               entry.endLBA   / divisor > imagePlugin.Info.Sectors)
                 return false;
 
-            ulong pSeq = 0;
-
-            foreach(Entry entry in entries.Where(entry => entry.partitionType != Guid.Empty &&
-                                                          entry.partitionId   != Guid.Empty))
+            var part = new Partition
             {
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.partitionType = {0}", entry.partitionType);
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.partitionId = {0}", entry.partitionId);
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.startLBA = {0}", entry.startLBA);
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.endLBA = {0}", entry.endLBA);
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.attributes = 0x{0:X16}", entry.attributes);
-                AaruConsole.DebugWriteLine("GPT Plugin", "entry.name = {0}", entry.name);
+                Description = $"ID: {entry.partitionId}",
+                Size        = (entry.endLBA - entry.startLBA + 1) * sectorSize,
+                Name        = entry.name,
+                Length      = (entry.endLBA - entry.startLBA + 1) / divisor,
+                Sequence    = pSeq++,
+                Offset      = entry.startLBA * sectorSize,
+                Start       = entry.startLBA / divisor,
+                Type        = GetGuidTypeName(entry.partitionType),
+                Scheme      = Name
+            };
 
-                if(entry.startLBA / divisor > imagePlugin.Info.Sectors ||
-                   entry.endLBA   / divisor > imagePlugin.Info.Sectors)
-                    return false;
-
-                var part = new Partition
-                {
-                    Description = $"ID: {entry.partitionId}",
-                    Size        = (entry.endLBA - entry.startLBA + 1) * sectorSize,
-                    Name        = entry.name,
-                    Length      = (entry.endLBA - entry.startLBA + 1) / divisor,
-                    Sequence    = pSeq++,
-                    Offset      = entry.startLBA * sectorSize,
-                    Start       = entry.startLBA / divisor,
-                    Type        = GetGuidTypeName(entry.partitionType),
-                    Scheme      = Name
-                };
-
-                AaruConsole.DebugWriteLine("GPT Plugin", "part.PartitionType = {0}", part.Type);
-                partitions.Add(part);
-            }
-
-            return true;
+            AaruConsole.DebugWriteLine("GPT Plugin", "part.PartitionType = {0}", part.Type);
+            partitions.Add(part);
         }
 
-        static string GetGuidTypeName(Guid type)
-        {
-            string strType = type.ToString().ToUpperInvariant();
+        return true;
+    }
 
-            switch(strType)
-            {
-                case "024DEE41-33E7-11D3-9D69-0008C781F39F": return "MBR scheme";
-                case "C12A7328-F81F-11D2-BA4B-00A0C93EC93B": return "EFI System";
-                case "21686148-6449-6E6F-744E-656564454649": return "BIOS Boot";
-                case "D3BFE2DE-3DAF-11DF-BA40-E3A556D89593": return "Intel Fast Flash (iFFS)";
-                case "F4019732-066E-4E12-8273-346C5641494F": return "Sony boot";
-                case "BFBFAFE7-A34F-448A-9A5B-6213EB736C22": return "Lenovo boot";
-                case "E3C9E316-0B5C-4DB8-817D-F92DF00215AE": return "Microsoft Reserved (MSR)";
-                case "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7": return "Microsoft Basic data";
-                case "5808C8AA-7E8F-42E0-85D2-E1E90434CFB3": return "Logical Disk Manager (LDM) metadata";
-                case "AF9B60A0-1431-4F62-BC68-3311714A69AD": return "Logical Disk Manager data";
-                case "DE94BBA4-06D1-4D40-A16A-BFD50179D6AC": return "Windows Recovery Environment";
-                case "37AFFC90-EF7D-4E96-91C3-2D7AE055B174": return "IBM General Parallel File System (GPFS)";
-                case "E75CAF8F-F680-4CEE-AFA3-B001E56EFC2D": return "Windows Storage Spaces";
-                case "75894C1E-3AEB-11D3-B7C1-7B03A0000000": return "HP-UX Data";
-                case "E2A1E728-32E3-11D6-A682-7B03A0000000": return "HP-UX Service";
-                case "0FC63DAF-8483-4772-8E79-3D69D8477DE4": return "Linux filesystem";
-                case "A19D880F-05FC-4D3B-A006-743F0F84911E": return "Linux RAID";
-                case "44479540-F297-41B2-9AF7-D131D5F0458A": return "Linux Root (x86)";
-                case "4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709": return "Linux Root (x86-64)";
-                case "69DAD710-2CE4-4E3C-B16C-21A1D49ABED3": return "Linux Root (32-bit ARM)";
-                case "B921B045-1DF0-41C3-AF44-4C6F280D3FAE": return "Linux Root (64-bit ARM/AArch64)";
-                case "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F": return "Linux Swap";
-                case "E6D6D379-F507-44C2-A23C-238F2A3DF928": return "Logical Volume Manager (LVM)";
-                case "933AC7E1-2EB4-4F13-B844-0E14E2AEF915": return "Linux /home";
-                case "3B8F8425-20E0-4F3B-907F-1A25A76F98E8": return "Linux /srv";
-                case "7FFEC5C9-2D00-49B7-8941-3EA10A5586B7": return "Plain dm-crypt";
-                case "CA7D7CCB-63ED-4C53-861C-1742536059CC": return "LUKS";
-                case "8DA63339-0007-60C0-C436-083AC8230908": return "Linux Reserved";
-                case "83BD6B9D-7F41-11DC-BE0B-001560B84F0F": return "FreeBSD Boot";
-                case "516E7CB4-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD Data";
-                case "516E7CB5-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD Swap";
-                case "516E7CB6-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD UFS";
-                case "516E7CB7-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD UFS2";
-                case "516E7CB8-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD Vinum";
-                case "516E7CBA-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD ZFS";
-                case "74BA7DD9-A689-11E1-BD04-00E081286ACF": return "FreeBSD nandfs";
-                case "48465300-0000-11AA-AA11-00306543ECAC": return "Apple HFS";
-                case "55465300-0000-11AA-AA11-00306543ECAC": return "Apple UFS";
-                case "52414944-0000-11AA-AA11-00306543ECAC": return "Apple RAID";
-                case "52414944-5F4F-11AA-AA11-00306543ECAC": return "Apple RAID, offline";
-                case "426F6F74-0000-11AA-AA11-00306543ECAC": return "Apple Boot";
-                case "4C616265-6C00-11AA-AA11-00306543ECAC": return "Apple Label";
-                case "5265636F-7665-11AA-AA11-00306543ECAC": return "Apple TV Recovery";
-                case "53746F72-6167-11AA-AA11-00306543ECAC": return "Apple Core Storage";
-                case "6A82CB45-1DD2-11B2-99A6-080020736631": return "Solaris Boot";
-                case "6A85CF4D-1DD2-11B2-99A6-080020736631": return "Solaris Root";
-                case "6A87C46F-1DD2-11B2-99A6-080020736631": return "Solaris Swap";
-                case "6A8B642B-1DD2-11B2-99A6-080020736631": return "Solaris Backup";
-                case "6A898CC3-1DD2-11B2-99A6-080020736631": return "Solaris /usr or Apple ZFS";
-                case "6A8EF2E9-1DD2-11B2-99A6-080020736631": return "Solaris /var";
-                case "6A90BA39-1DD2-11B2-99A6-080020736631": return "Solaris /home";
-                case "6A9283A5-1DD2-11B2-99A6-080020736631": return "Solaris Alternate sector";
-                case "6A945A3B-1DD2-11B2-99A6-080020736631":
-                case "6A9630D1-1DD2-11B2-99A6-080020736631":
-                case "6A980767-1DD2-11B2-99A6-080020736631":
-                case "6A96237F-1DD2-11B2-99A6-080020736631":
-                case "6A8D2AC7-1DD2-11B2-99A6-080020736631": return "Solaris Reserved";
-                case "49F48D32-B10E-11DC-B99B-0019D1879648": return "NetBSD Swap";
-                case "49F48D5A-B10E-11DC-B99B-0019D1879648": return "NetBSD FFS";
-                case "49F48D82-B10E-11DC-B99B-0019D1879648": return "NetBSD LFS";
-                case "49F48DAA-B10E-11DC-B99B-0019D1879648": return "NetBSD RAID";
-                case "2DB519C4-B10F-11DC-B99B-0019D1879648": return "NetBSD Concatenated";
-                case "2DB519EC-B10F-11DC-B99B-0019D1879648": return "NetBSD Encrypted";
-                case "FE3A2A5D-4F32-41A7-B725-ACCC3285A309": return "ChromeOS kernel";
-                case "3CB8E202-3B7E-47DD-8A3C-7FF2A13CFCEC": return "ChromeOS rootfs";
-                case "2E0A753D-9E48-43B0-8337-B15192CB1B5E": return "ChromeOS future use";
-                case "42465331-3BA3-10F1-802A-4861696B7521": return "Haiku BFS";
-                case "85D5E45E-237C-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD Boot";
-                case "85D5E45A-237C-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD Data";
-                case "85D5E45B-237C-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD Swap";
-                case "0394EF8B-237E-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD UFS";
-                case "85D5E45C-237C-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD Vinum";
-                case "85D5E45D-237C-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD ZFS";
-                case "45B0969E-9B03-4F30-B4C6-B4B80CEFF106": return "Ceph Journal";
-                case "45B0969E-9B03-4F30-B4C6-5EC00CEFF106": return "Ceph dm-crypt Encrypted Journal";
-                case "4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D": return "Ceph OSD";
-                case "4FBD7E29-9D25-41B8-AFD0-5EC00CEFF05D": return "Ceph dm-crypt OSD";
-                case "89C57F98-2FE5-4DC0-89C1-F3AD0CEFF2BE": return "Ceph disk in creation";
-                case "89C57F98-2FE5-4DC0-89C1-5EC00CEFF2BE": return "Ceph dm-crypt disk in creation";
-                case "824CC7A0-36A8-11E3-890A-952519AD3F61": return "OpenBSD Data";
-                case "CEF5A9AD-73BC-4601-89F3-CDEEEEE321A1": return "QNX Power-safe (QNX6)";
-                case "C91818F9-8025-47AF-89D2-F030D7000C2C": return "Plan 9";
-                case "9D275380-40AD-11DB-BF97-000C2911D1B8": return "VMware vmkcore (coredump)";
-                case "AA31E02A-400F-11DB-9590-000C2911D1B8": return "VMware VMFS";
-                case "9198EFFC-31C0-11DB-8F78-000C2911D1B8": return "VMware Reserved";
-                case "7412F7D5-A156-4B13-81DC-867174929325": return "ONIE boot";
-                case "D4E6E2CD-4469-46F3-B5CB-1BFF57AFC149": return "ONIE config";
-                case "9E1A2D38-C612-4316-AA26-8B49521E5A8B": return "PowerPC PReP boot";
-                case "0311FC50-01CA-4725-AD77-9ADBB20ACE98": return "Acronis Secure Zone";
-                case "7C3457EF-0000-11AA-AA11-00306543ECAC": return "Apple File System";
-                case "9D087404-1CA5-11DC-8817-01301BB8A9F5": return "DragonflyBSD Label";
-                case "9D58FDBD-1CA5-11DC-8817-01301BB8A9F5": return "DragonflyBSD Swap";
-                case "9D94CE7C-1CA5-11DC-8817-01301BB8A9F5": return "DragonflyBSD UFS";
-                case "9DD4478F-1CA5-11DC-8817-01301BB8A9F5": return "DragonflyBSD Vinum";
-                case "DBD5211B-1CA5-11DC-8817-01301BB8A9F5": return "DragonflyBSD CCD";
-                case "3D48CE54-1D16-11DC-8817-01301BB8A9F5": return "DragonflyBSD Label";
-                case "BD215AB2-1D16-11DC-8696-01301BB8A9F5": return "DragonflyBSD Legacy";
-                case "61DC63AC-6E38-11DC-8513-01301BB8A9F5": return "DragonflyBSD Hammer";
-                case "5CBB9AD1-862D-11DC-A94D-01301BB8A9F5": return "DragonflyBSD Hammer2";
-                default:                                     return "";
-            }
-        }
+    static string GetGuidTypeName(Guid type)
+    {
+        string strType = type.ToString().ToUpperInvariant();
 
-        [StructLayout(LayoutKind.Sequential)]
-        struct Header
+        switch(strType)
         {
-            public readonly ulong signature;
-            public readonly uint  revision;
-            public readonly uint  headerSize;
-            public readonly uint  headerCrc;
-            public readonly uint  reserved;
-            public readonly ulong myLBA;
-            public readonly ulong alternateLBA;
-            public readonly ulong firstUsableLBA;
-            public readonly ulong lastUsableLBA;
-            public readonly Guid  diskGuid;
-            public readonly ulong entryLBA;
-            public readonly uint  entries;
-            public readonly uint  entriesSize;
-            public readonly uint  entriesCrc;
-        }
-
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        struct Entry
-        {
-            public readonly Guid  partitionType;
-            public readonly Guid  partitionId;
-            public readonly ulong startLBA;
-            public readonly ulong endLBA;
-            public readonly ulong attributes;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 36)]
-            public readonly string name;
+            case "024DEE41-33E7-11D3-9D69-0008C781F39F": return "MBR scheme";
+            case "C12A7328-F81F-11D2-BA4B-00A0C93EC93B": return "EFI System";
+            case "21686148-6449-6E6F-744E-656564454649": return "BIOS Boot";
+            case "D3BFE2DE-3DAF-11DF-BA40-E3A556D89593": return "Intel Fast Flash (iFFS)";
+            case "F4019732-066E-4E12-8273-346C5641494F": return "Sony boot";
+            case "BFBFAFE7-A34F-448A-9A5B-6213EB736C22": return "Lenovo boot";
+            case "E3C9E316-0B5C-4DB8-817D-F92DF00215AE": return "Microsoft Reserved (MSR)";
+            case "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7": return "Microsoft Basic data";
+            case "5808C8AA-7E8F-42E0-85D2-E1E90434CFB3": return "Logical Disk Manager (LDM) metadata";
+            case "AF9B60A0-1431-4F62-BC68-3311714A69AD": return "Logical Disk Manager data";
+            case "DE94BBA4-06D1-4D40-A16A-BFD50179D6AC": return "Windows Recovery Environment";
+            case "37AFFC90-EF7D-4E96-91C3-2D7AE055B174": return "IBM General Parallel File System (GPFS)";
+            case "E75CAF8F-F680-4CEE-AFA3-B001E56EFC2D": return "Windows Storage Spaces";
+            case "75894C1E-3AEB-11D3-B7C1-7B03A0000000": return "HP-UX Data";
+            case "E2A1E728-32E3-11D6-A682-7B03A0000000": return "HP-UX Service";
+            case "0FC63DAF-8483-4772-8E79-3D69D8477DE4": return "Linux filesystem";
+            case "A19D880F-05FC-4D3B-A006-743F0F84911E": return "Linux RAID";
+            case "44479540-F297-41B2-9AF7-D131D5F0458A": return "Linux Root (x86)";
+            case "4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709": return "Linux Root (x86-64)";
+            case "69DAD710-2CE4-4E3C-B16C-21A1D49ABED3": return "Linux Root (32-bit ARM)";
+            case "B921B045-1DF0-41C3-AF44-4C6F280D3FAE": return "Linux Root (64-bit ARM/AArch64)";
+            case "0657FD6D-A4AB-43C4-84E5-0933C84B4F4F": return "Linux Swap";
+            case "E6D6D379-F507-44C2-A23C-238F2A3DF928": return "Logical Volume Manager (LVM)";
+            case "933AC7E1-2EB4-4F13-B844-0E14E2AEF915": return "Linux /home";
+            case "3B8F8425-20E0-4F3B-907F-1A25A76F98E8": return "Linux /srv";
+            case "7FFEC5C9-2D00-49B7-8941-3EA10A5586B7": return "Plain dm-crypt";
+            case "CA7D7CCB-63ED-4C53-861C-1742536059CC": return "LUKS";
+            case "8DA63339-0007-60C0-C436-083AC8230908": return "Linux Reserved";
+            case "83BD6B9D-7F41-11DC-BE0B-001560B84F0F": return "FreeBSD Boot";
+            case "516E7CB4-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD Data";
+            case "516E7CB5-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD Swap";
+            case "516E7CB6-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD UFS";
+            case "516E7CB7-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD UFS2";
+            case "516E7CB8-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD Vinum";
+            case "516E7CBA-6ECF-11D6-8FF8-00022D09712B": return "FreeBSD ZFS";
+            case "74BA7DD9-A689-11E1-BD04-00E081286ACF": return "FreeBSD nandfs";
+            case "48465300-0000-11AA-AA11-00306543ECAC": return "Apple HFS";
+            case "55465300-0000-11AA-AA11-00306543ECAC": return "Apple UFS";
+            case "52414944-0000-11AA-AA11-00306543ECAC": return "Apple RAID";
+            case "52414944-5F4F-11AA-AA11-00306543ECAC": return "Apple RAID, offline";
+            case "426F6F74-0000-11AA-AA11-00306543ECAC": return "Apple Boot";
+            case "4C616265-6C00-11AA-AA11-00306543ECAC": return "Apple Label";
+            case "5265636F-7665-11AA-AA11-00306543ECAC": return "Apple TV Recovery";
+            case "53746F72-6167-11AA-AA11-00306543ECAC": return "Apple Core Storage";
+            case "6A82CB45-1DD2-11B2-99A6-080020736631": return "Solaris Boot";
+            case "6A85CF4D-1DD2-11B2-99A6-080020736631": return "Solaris Root";
+            case "6A87C46F-1DD2-11B2-99A6-080020736631": return "Solaris Swap";
+            case "6A8B642B-1DD2-11B2-99A6-080020736631": return "Solaris Backup";
+            case "6A898CC3-1DD2-11B2-99A6-080020736631": return "Solaris /usr or Apple ZFS";
+            case "6A8EF2E9-1DD2-11B2-99A6-080020736631": return "Solaris /var";
+            case "6A90BA39-1DD2-11B2-99A6-080020736631": return "Solaris /home";
+            case "6A9283A5-1DD2-11B2-99A6-080020736631": return "Solaris Alternate sector";
+            case "6A945A3B-1DD2-11B2-99A6-080020736631":
+            case "6A9630D1-1DD2-11B2-99A6-080020736631":
+            case "6A980767-1DD2-11B2-99A6-080020736631":
+            case "6A96237F-1DD2-11B2-99A6-080020736631":
+            case "6A8D2AC7-1DD2-11B2-99A6-080020736631": return "Solaris Reserved";
+            case "49F48D32-B10E-11DC-B99B-0019D1879648": return "NetBSD Swap";
+            case "49F48D5A-B10E-11DC-B99B-0019D1879648": return "NetBSD FFS";
+            case "49F48D82-B10E-11DC-B99B-0019D1879648": return "NetBSD LFS";
+            case "49F48DAA-B10E-11DC-B99B-0019D1879648": return "NetBSD RAID";
+            case "2DB519C4-B10F-11DC-B99B-0019D1879648": return "NetBSD Concatenated";
+            case "2DB519EC-B10F-11DC-B99B-0019D1879648": return "NetBSD Encrypted";
+            case "FE3A2A5D-4F32-41A7-B725-ACCC3285A309": return "ChromeOS kernel";
+            case "3CB8E202-3B7E-47DD-8A3C-7FF2A13CFCEC": return "ChromeOS rootfs";
+            case "2E0A753D-9E48-43B0-8337-B15192CB1B5E": return "ChromeOS future use";
+            case "42465331-3BA3-10F1-802A-4861696B7521": return "Haiku BFS";
+            case "85D5E45E-237C-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD Boot";
+            case "85D5E45A-237C-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD Data";
+            case "85D5E45B-237C-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD Swap";
+            case "0394EF8B-237E-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD UFS";
+            case "85D5E45C-237C-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD Vinum";
+            case "85D5E45D-237C-11E1-B4B3-E89A8F7FC3A7": return "MidnightBSD ZFS";
+            case "45B0969E-9B03-4F30-B4C6-B4B80CEFF106": return "Ceph Journal";
+            case "45B0969E-9B03-4F30-B4C6-5EC00CEFF106": return "Ceph dm-crypt Encrypted Journal";
+            case "4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D": return "Ceph OSD";
+            case "4FBD7E29-9D25-41B8-AFD0-5EC00CEFF05D": return "Ceph dm-crypt OSD";
+            case "89C57F98-2FE5-4DC0-89C1-F3AD0CEFF2BE": return "Ceph disk in creation";
+            case "89C57F98-2FE5-4DC0-89C1-5EC00CEFF2BE": return "Ceph dm-crypt disk in creation";
+            case "824CC7A0-36A8-11E3-890A-952519AD3F61": return "OpenBSD Data";
+            case "CEF5A9AD-73BC-4601-89F3-CDEEEEE321A1": return "QNX Power-safe (QNX6)";
+            case "C91818F9-8025-47AF-89D2-F030D7000C2C": return "Plan 9";
+            case "9D275380-40AD-11DB-BF97-000C2911D1B8": return "VMware vmkcore (coredump)";
+            case "AA31E02A-400F-11DB-9590-000C2911D1B8": return "VMware VMFS";
+            case "9198EFFC-31C0-11DB-8F78-000C2911D1B8": return "VMware Reserved";
+            case "7412F7D5-A156-4B13-81DC-867174929325": return "ONIE boot";
+            case "D4E6E2CD-4469-46F3-B5CB-1BFF57AFC149": return "ONIE config";
+            case "9E1A2D38-C612-4316-AA26-8B49521E5A8B": return "PowerPC PReP boot";
+            case "0311FC50-01CA-4725-AD77-9ADBB20ACE98": return "Acronis Secure Zone";
+            case "7C3457EF-0000-11AA-AA11-00306543ECAC": return "Apple File System";
+            case "9D087404-1CA5-11DC-8817-01301BB8A9F5": return "DragonflyBSD Label";
+            case "9D58FDBD-1CA5-11DC-8817-01301BB8A9F5": return "DragonflyBSD Swap";
+            case "9D94CE7C-1CA5-11DC-8817-01301BB8A9F5": return "DragonflyBSD UFS";
+            case "9DD4478F-1CA5-11DC-8817-01301BB8A9F5": return "DragonflyBSD Vinum";
+            case "DBD5211B-1CA5-11DC-8817-01301BB8A9F5": return "DragonflyBSD CCD";
+            case "3D48CE54-1D16-11DC-8817-01301BB8A9F5": return "DragonflyBSD Label";
+            case "BD215AB2-1D16-11DC-8696-01301BB8A9F5": return "DragonflyBSD Legacy";
+            case "61DC63AC-6E38-11DC-8513-01301BB8A9F5": return "DragonflyBSD Hammer";
+            case "5CBB9AD1-862D-11DC-A94D-01301BB8A9F5": return "DragonflyBSD Hammer2";
+            default:                                     return "";
         }
     }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct Header
+    {
+        public readonly ulong signature;
+        public readonly uint  revision;
+        public readonly uint  headerSize;
+        public readonly uint  headerCrc;
+        public readonly uint  reserved;
+        public readonly ulong myLBA;
+        public readonly ulong alternateLBA;
+        public readonly ulong firstUsableLBA;
+        public readonly ulong lastUsableLBA;
+        public readonly Guid  diskGuid;
+        public readonly ulong entryLBA;
+        public readonly uint  entries;
+        public readonly uint  entriesSize;
+        public readonly uint  entriesCrc;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    struct Entry
+    {
+        public readonly Guid  partitionType;
+        public readonly Guid  partitionId;
+        public readonly ulong startLBA;
+        public readonly ulong endLBA;
+        public readonly ulong attributes;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 36)]
+        public readonly string name;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Human68k.cs b/Aaru.Partitions/Human68k.cs
index 9b87ac58d..f647dc709 100644
--- a/Aaru.Partitions/Human68k.cs
+++ b/Aaru.Partitions/Human68k.cs
@@ -41,126 +41,125 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of Sharp's Human68K partitions</summary>
+public sealed class Human68K : IPartition
 {
+    // ReSharper disable once InconsistentNaming
+    const uint X68K_MAGIC = 0x5836384B;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of Sharp's Human68K partitions</summary>
-    public sealed class Human68K : IPartition
+    public string Name => "Human 68k partitions";
+    /// <inheritdoc />
+    public Guid Id => new("246A6D93-4F1A-1F8A-344D-50187A5513A9");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        // ReSharper disable once InconsistentNaming
-        const uint X68K_MAGIC = 0x5836384B;
+        partitions = new List<Partition>();
 
-        /// <inheritdoc />
-        public string Name => "Human 68k partitions";
-        /// <inheritdoc />
-        public Guid Id => new("246A6D93-4F1A-1F8A-344D-50187A5513A9");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        byte[]      sector;
+        ulong       sectsPerUnit;
+        ErrorNumber errno;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        AaruConsole.DebugWriteLine("Human68k plugin", "sectorSize = {0}", imagePlugin.Info.SectorSize);
+
+        if(sectorOffset + 4 >= imagePlugin.Info.Sectors)
+            return false;
+
+        switch(imagePlugin.Info.SectorSize)
         {
-            partitions = new List<Partition>();
+            case 256:
+                errno        = imagePlugin.ReadSector(4 + sectorOffset, out sector);
+                sectsPerUnit = 1;
 
-            byte[]      sector;
-            ulong       sectsPerUnit;
-            ErrorNumber errno;
+                break;
+            case 512:
+                errno        = imagePlugin.ReadSector(4 + sectorOffset, out sector);
+                sectsPerUnit = 2;
 
-            AaruConsole.DebugWriteLine("Human68k plugin", "sectorSize = {0}", imagePlugin.Info.SectorSize);
+                break;
+            case 1024:
+                errno        = imagePlugin.ReadSector(2 + sectorOffset, out sector);
+                sectsPerUnit = 1;
 
-            if(sectorOffset + 4 >= imagePlugin.Info.Sectors)
-                return false;
+                break;
+            default: return false;
+        }
 
-            switch(imagePlugin.Info.SectorSize)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        Table table = Marshal.ByteArrayToStructureBigEndian<Table>(sector);
+
+        AaruConsole.DebugWriteLine("Human68k plugin", "table.magic = {0:X4}", table.magic);
+
+        if(table.magic != X68K_MAGIC)
+            return false;
+
+        for(int i = 0; i < table.entries.Length; i++)
+            table.entries[i] = (Entry)Marshal.SwapStructureMembersEndian(table.entries[i]);
+
+        AaruConsole.DebugWriteLine("Human68k plugin", "table.size = {0:X4}", table.size);
+        AaruConsole.DebugWriteLine("Human68k plugin", "table.size2 = {0:X4}", table.size2);
+        AaruConsole.DebugWriteLine("Human68k plugin", "table.unknown = {0:X4}", table.unknown);
+
+        ulong counter = 0;
+
+        foreach(Entry entry in table.entries)
+        {
+            AaruConsole.DebugWriteLine("Human68k plugin", "entry.name = {0}",
+                                       StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)));
+
+            AaruConsole.DebugWriteLine("Human68k plugin", "entry.stateStart = {0}", entry.stateStart);
+            AaruConsole.DebugWriteLine("Human68k plugin", "entry.length = {0}", entry.length);
+
+            AaruConsole.DebugWriteLine("Human68k plugin", "sectsPerUnit = {0} {1}", sectsPerUnit,
+                                       imagePlugin.Info.SectorSize);
+
+            var part = new Partition
             {
-                case 256:
-                    errno        = imagePlugin.ReadSector(4 + sectorOffset, out sector);
-                    sectsPerUnit = 1;
+                Start    = (entry.stateStart & 0xFFFFFF) * sectsPerUnit,
+                Length   = entry.length                  * sectsPerUnit,
+                Type     = StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)),
+                Sequence = counter,
+                Scheme   = Name
+            };
 
-                    break;
-                case 512:
-                    errno        = imagePlugin.ReadSector(4 + sectorOffset, out sector);
-                    sectsPerUnit = 2;
+            part.Offset = part.Start  * (ulong)sector.Length;
+            part.Size   = part.Length * (ulong)sector.Length;
 
-                    break;
-                case 1024:
-                    errno        = imagePlugin.ReadSector(2 + sectorOffset, out sector);
-                    sectsPerUnit = 1;
+            if(entry.length <= 0)
+                continue;
 
-                    break;
-                default: return false;
-            }
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            Table table = Marshal.ByteArrayToStructureBigEndian<Table>(sector);
-
-            AaruConsole.DebugWriteLine("Human68k plugin", "table.magic = {0:X4}", table.magic);
-
-            if(table.magic != X68K_MAGIC)
-                return false;
-
-            for(int i = 0; i < table.entries.Length; i++)
-                table.entries[i] = (Entry)Marshal.SwapStructureMembersEndian(table.entries[i]);
-
-            AaruConsole.DebugWriteLine("Human68k plugin", "table.size = {0:X4}", table.size);
-            AaruConsole.DebugWriteLine("Human68k plugin", "table.size2 = {0:X4}", table.size2);
-            AaruConsole.DebugWriteLine("Human68k plugin", "table.unknown = {0:X4}", table.unknown);
-
-            ulong counter = 0;
-
-            foreach(Entry entry in table.entries)
-            {
-                AaruConsole.DebugWriteLine("Human68k plugin", "entry.name = {0}",
-                                           StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)));
-
-                AaruConsole.DebugWriteLine("Human68k plugin", "entry.stateStart = {0}", entry.stateStart);
-                AaruConsole.DebugWriteLine("Human68k plugin", "entry.length = {0}", entry.length);
-
-                AaruConsole.DebugWriteLine("Human68k plugin", "sectsPerUnit = {0} {1}", sectsPerUnit,
-                                           imagePlugin.Info.SectorSize);
-
-                var part = new Partition
-                {
-                    Start    = (entry.stateStart & 0xFFFFFF) * sectsPerUnit,
-                    Length   = entry.length                  * sectsPerUnit,
-                    Type     = StringHandlers.CToString(entry.name, Encoding.GetEncoding(932)),
-                    Sequence = counter,
-                    Scheme   = Name
-                };
-
-                part.Offset = part.Start  * (ulong)sector.Length;
-                part.Size   = part.Length * (ulong)sector.Length;
-
-                if(entry.length <= 0)
-                    continue;
-
-                partitions.Add(part);
-                counter++;
-            }
-
-            return true;
+            partitions.Add(part);
+            counter++;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Table
-        {
-            public readonly uint magic;
-            public readonly uint size;
-            public readonly uint size2;
-            public readonly uint unknown;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly Entry[] entries;
-        }
+        return true;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Entry
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] name;
-            public readonly uint stateStart;
-            public readonly uint length;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Table
+    {
+        public readonly uint magic;
+        public readonly uint size;
+        public readonly uint size2;
+        public readonly uint unknown;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly Entry[] entries;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Entry
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] name;
+        public readonly uint stateStart;
+        public readonly uint length;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/MBR.cs b/Aaru.Partitions/MBR.cs
index 321a58148..b4d81c2bc 100644
--- a/Aaru.Partitions/MBR.cs
+++ b/Aaru.Partitions/MBR.cs
@@ -41,839 +41,838 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+// TODO: Support AAP extensions
+/// <inheritdoc />
+/// <summary>Implements decoding of Intel/Microsoft Master Boot Record and extensions</summary>
+public sealed class MBR : IPartition
 {
-    // TODO: Support AAP extensions
-    /// <inheritdoc />
-    /// <summary>Implements decoding of Intel/Microsoft Master Boot Record and extensions</summary>
-    public sealed class MBR : IPartition
+    const ulong GPT_MAGIC = 0x5452415020494645;
+
+    const ushort MBR_MAGIC = 0xAA55;
+    const ushort NEC_MAGIC = 0xA55A;
+    const ushort DM_MAGIC  = 0x55AA;
+
+    static readonly string[] _mbrTypes =
     {
-        const ulong GPT_MAGIC = 0x5452415020494645;
+        // 0x00
+        "Empty", "FAT12", "XENIX root", "XENIX /usr",
 
-        const ushort MBR_MAGIC = 0xAA55;
-        const ushort NEC_MAGIC = 0xA55A;
-        const ushort DM_MAGIC  = 0x55AA;
+        // 0x04
+        "FAT16 < 32 MiB", "Extended", "FAT16", "IFS (HPFS/NTFS)",
 
-        static readonly string[] _mbrTypes =
+        // 0x08
+        "AIX boot, OS/2, Commodore DOS", "AIX data, Coherent, QNX", "Coherent swap, OPUS, OS/2 Boot Manager",
+        "FAT32",
+
+        // 0x0C
+        "FAT32 (LBA)", "Unknown", "FAT16 (LBA)", "Extended (LBA)",
+
+        // 0x10
+        "OPUS", "Hidden FAT12", "Compaq diagnostics, recovery partition", "Unknown",
+
+        // 0x14
+        "Hidden FAT16 < 32 MiB, AST-DOS", "Unknown", "Hidden FAT16", "Hidden IFS (HPFS/NTFS)",
+
+        // 0x18
+        "AST-Windows swap", "Willowtech Photon coS", "Unknown", "Hidden FAT32",
+
+        // 0x1C
+        "Hidden FAT32 (LBA)", "Unknown", "Hidden FAT16 (LBA)", "Unknown",
+
+        // 0x20
+        "Willowsoft Overture File System", "Oxygen FSo2", "Oxygen Extended ", "SpeedStor reserved",
+
+        // 0x24
+        "NEC-DOS", "Unknown", "SpeedStor reserved", "Hidden NTFS",
+
+        // 0x28
+        "Unknown", "Unknown", "Unknown", "Unknown",
+
+        // 0x2C
+        "Unknown", "Unknown", "Unknown", "Unknown",
+
+        // 0x30
+        "Unknown", "SpeedStor reserved", "Unknown", "SpeedStor reserved",
+
+        // 0x34
+        "SpeedStor reserved", "Unknown", "SpeedStor reserved", "Unknown",
+
+        // 0x38
+        "Theos", "Plan 9", "Unknown", "Unknown",
+
+        // 0x3C
+        "Partition Magic", "Hidden NetWare", "Unknown", "Unknown",
+
+        // 0x40
+        "VENIX 80286", "PReP Boot", "Secure File System", "PTS-DOS",
+
+        // 0x44
+        "Unknown", "Priam, EUMEL/Elan", "EUMEL/Elan", "EUMEL/Elan",
+
+        // 0x48
+        "EUMEL/Elan", "Unknown", "ALFS/THIN lightweight filesystem for DOS", "Unknown",
+
+        // 0x4C
+        "Unknown", "QNX 4", "QNX 4", "QNX 4, Oberon",
+
+        // 0x50
+        "Ontrack DM, R/O, FAT", "Ontrack DM, R/W, FAT", "CP/M, Microport UNIX", "Ontrack DM 6",
+
+        // 0x54
+        "Ontrack DM 6", "EZ-Drive", "Golden Bow VFeature", "Unknown",
+
+        // 0x58
+        "Unknown", "Unknown", "Unknown", "Unknown",
+
+        // 0x5C
+        "Priam EDISK", "Unknown", "Unknown", "Unknown",
+
+        // 0x60
+        "Unknown", "SpeedStor", "Unknown", "GNU Hurd, System V, 386/ix",
+
+        // 0x64
+        "NetWare 286", "NetWare", "NetWare 386", "NetWare",
+
+        // 0x68
+        "NetWare", "NetWare NSS", "Unknown", "Unknown",
+
+        // 0x6C
+        "Unknown", "Unknown", "Unknown", "Unknown",
+
+        // 0x70
+        "DiskSecure Multi-Boot", "Unknown", "UNIX 7th Edition", "Unknown",
+
+        // 0x74
+        "Unknown", "IBM PC/IX", "Unknown", "Unknown",
+
+        // 0x78
+        "Unknown", "Unknown", "Unknown", "Unknown",
+
+        // 0x7C
+        "Unknown", "Unknown", "Unknown", "Unknown",
+
+        // 0x80
+        "Old MINIX", "MINIX, Old Linux", "Linux swap, Solaris", "Linux",
+
+        // 0x84
+        "Hidden by OS/2, APM hibernation", "Linux extended", "NT Stripe Set", "NT Stripe Set",
+
+        // 0x88
+        "Linux Plaintext", "Unknown", "Unknown", "Unknown",
+
+        // 0x8C
+        "Unknown", "Unknown", "Linux LVM", "Unknown",
+
+        // 0x90
+        "Unknown", "Unknown", "Unknown", "Amoeba, Hidden Linux",
+
+        // 0x94
+        "Amoeba bad blocks", "Unknown", "Unknown", "Unknown",
+
+        // 0x98
+        "Unknown", "Mylex EISA SCSI", "Unknown", "Unknown",
+
+        // 0x9C
+        "Unknown", "Unknown", "Unknown", "BSD/OS",
+
+        // 0xA0
+        "Hibernation", "HP Volume Expansion", "Unknown", "HP Volume Expansion",
+
+        // 0xA4
+        "HP Volume Expansion", "FreeBSD", "OpenBSD", "NeXTStep",
+
+        // 0xA8
+        "Apple UFS", "NetBSD", "Olivetti DOS FAT12", "Apple Boot",
+
+        // 0xAC
+        "Unknown", "Unknown", "Unknown", "Apple HFS",
+
+        // 0xB0
+        "BootStar", "HP Volume Expansion", "Unknown", "HP Volume Expansion",
+
+        // 0xB4
+        "HP Volume Expansion", "Unknown", "HP Volume Expansion", "BSDi",
+
+        // 0xB8
+        "BSDi swap", "Unknown", "Unknown", "PTS BootWizard",
+
+        // 0xBC
+        "Unknown", "Unknown", "Solaris boot", "Solaris",
+
+        // 0xC0
+        "Novell DOS, DR-DOS secured", "DR-DOS secured FAT12", "DR-DOS reserved", "DR-DOS reserved",
+
+        // 0xC4
+        "DR-DOS secured FAT16 < 32 MiB", "Unknown", "DR-DOS secured FAT16", "Syrinx",
+
+        // 0xC8
+        "DR-DOS reserved", "DR-DOS reserved", "DR-DOS reserved", "DR-DOS secured FAT32",
+
+        // 0xCC
+        "DR-DOS secured FAT32 (LBA)", "DR-DOS reserved", "DR-DOS secured FAT16 (LBA)",
+        "DR-DOS secured extended (LBA)",
+
+        // 0xD0
+        "Multiuser DOS secured FAT12", "Multiuser DOS secured FAT12", "Unknown", "Unknown",
+
+        // 0xD4
+        "Multiuser DOS secured FAT16 < 32 MiB", "Multiuser DOS secured extended", "Multiuser DOS secured FAT16",
+        "Unknown",
+
+        // 0xD8
+        "CP/M", "Unknown", "Filesystem-less data", "CP/M, CCP/M, CTOS",
+
+        // 0xDC
+        "Unknown", "Unknown", "Dell partition", "BootIt EMBRM",
+
+        // 0xE0
+        "Unknown", "SpeedStor", "DOS read/only", "SpeedStor",
+
+        // 0xE4
+        "SpeedStor", "Tandy DOS", "SpeedStor", "Unknown",
+
+        // 0xE8
+        "Unknown", "Unknown", "Unknown", "BeOS",
+
+        // 0xEC
+        "Unknown", "Spryt*x", "Guid Partition Table", "EFI system partition",
+
+        // 0xF0
+        "Linux boot", "SpeedStor", "DOS 3.3 secondary, Unisys DOS", "SpeedStor",
+
+        // 0xF4
+        "SpeedStor", "Prologue", "SpeedStor", "Unknown",
+
+        // 0xF8
+        "Unknown", "Unknown", "Unknown", "VMWare VMFS",
+
+        // 0xFC
+        "VMWare VMKCORE", "Linux RAID, FreeDOS", "SpeedStor, LANStep, PS/2 IML", "Xenix bad block"
+    };
+
+    /// <inheritdoc />
+    public string Name => "Master Boot Record";
+    /// <inheritdoc />
+    public Guid Id => new("5E8A34E8-4F1A-59E6-4BF7-7EA647063A76");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    [SuppressMessage("ReSharper", "UnusedVariable")]
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+    {
+        ulong counter = 0;
+
+        partitions = new List<Partition>();
+
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
+
+        uint sectorSize = imagePlugin.Info.SectorSize;
+
+        // Divider of sector size in MBR between real sector size
+        ulong divider = 1;
+
+        if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
         {
-            // 0x00
-            "Empty", "FAT12", "XENIX root", "XENIX /usr",
+            sectorSize = 512;
+            divider    = 4;
+        }
 
-            // 0x04
-            "FAT16 < 32 MiB", "Extended", "FAT16", "IFS (HPFS/NTFS)",
+        ErrorNumber errno = imagePlugin.ReadSector(sectorOffset, out byte[] sector);
 
-            // 0x08
-            "AIX boot, OS/2, Commodore DOS", "AIX data, Coherent, QNX", "Coherent swap, OPUS, OS/2 Boot Manager",
-            "FAT32",
+        if(errno != ErrorNumber.NoError)
+            return false;
 
-            // 0x0C
-            "FAT32 (LBA)", "Unknown", "FAT16 (LBA)", "Extended (LBA)",
+        MasterBootRecord      mbr     = Marshal.ByteArrayToStructureLittleEndian<MasterBootRecord>(sector);
+        TimedMasterBootRecord mbrTime = Marshal.ByteArrayToStructureLittleEndian<TimedMasterBootRecord>(sector);
 
-            // 0x10
-            "OPUS", "Hidden FAT12", "Compaq diagnostics, recovery partition", "Unknown",
+        SerializedMasterBootRecord mbrSerial =
+            Marshal.ByteArrayToStructureLittleEndian<SerializedMasterBootRecord>(sector);
 
-            // 0x14
-            "Hidden FAT16 < 32 MiB, AST-DOS", "Unknown", "Hidden FAT16", "Hidden IFS (HPFS/NTFS)",
+        ModernMasterBootRecord mbrModern = Marshal.ByteArrayToStructureLittleEndian<ModernMasterBootRecord>(sector);
+        NecMasterBootRecord    mbrNec    = Marshal.ByteArrayToStructureLittleEndian<NecMasterBootRecord>(sector);
 
-            // 0x18
-            "AST-Windows swap", "Willowtech Photon coS", "Unknown", "Hidden FAT32",
+        DiskManagerMasterBootRecord mbrOntrack =
+            Marshal.ByteArrayToStructureLittleEndian<DiskManagerMasterBootRecord>(sector);
 
-            // 0x1C
-            "Hidden FAT32 (LBA)", "Unknown", "Hidden FAT16 (LBA)", "Unknown",
+        AaruConsole.DebugWriteLine("MBR plugin", "xmlmedia = {0}", imagePlugin.Info.XmlMediaType);
+        AaruConsole.DebugWriteLine("MBR plugin", "mbr.magic = {0:X4}", mbr.magic);
 
-            // 0x20
-            "Willowsoft Overture File System", "Oxygen FSo2", "Oxygen Extended ", "SpeedStor reserved",
+        if(mbr.magic != MBR_MAGIC)
+            return false; // Not MBR
 
-            // 0x24
-            "NEC-DOS", "Unknown", "SpeedStor reserved", "Hidden NTFS",
+        errno = imagePlugin.ReadSector(1 + sectorOffset, out byte[] hdrBytes);
 
-            // 0x28
-            "Unknown", "Unknown", "Unknown", "Unknown",
+        if(errno != ErrorNumber.NoError)
+            return false;
 
-            // 0x2C
-            "Unknown", "Unknown", "Unknown", "Unknown",
+        ulong signature = BitConverter.ToUInt64(hdrBytes, 0);
 
-            // 0x30
-            "Unknown", "SpeedStor reserved", "Unknown", "SpeedStor reserved",
+        AaruConsole.DebugWriteLine("MBR Plugin", "gpt.signature = 0x{0:X16}", signature);
 
-            // 0x34
-            "SpeedStor reserved", "Unknown", "SpeedStor reserved", "Unknown",
+        if(signature == GPT_MAGIC)
+            return false;
 
-            // 0x38
-            "Theos", "Plan 9", "Unknown", "Unknown",
-
-            // 0x3C
-            "Partition Magic", "Hidden NetWare", "Unknown", "Unknown",
-
-            // 0x40
-            "VENIX 80286", "PReP Boot", "Secure File System", "PTS-DOS",
-
-            // 0x44
-            "Unknown", "Priam, EUMEL/Elan", "EUMEL/Elan", "EUMEL/Elan",
-
-            // 0x48
-            "EUMEL/Elan", "Unknown", "ALFS/THIN lightweight filesystem for DOS", "Unknown",
-
-            // 0x4C
-            "Unknown", "QNX 4", "QNX 4", "QNX 4, Oberon",
-
-            // 0x50
-            "Ontrack DM, R/O, FAT", "Ontrack DM, R/W, FAT", "CP/M, Microport UNIX", "Ontrack DM 6",
-
-            // 0x54
-            "Ontrack DM 6", "EZ-Drive", "Golden Bow VFeature", "Unknown",
-
-            // 0x58
-            "Unknown", "Unknown", "Unknown", "Unknown",
-
-            // 0x5C
-            "Priam EDISK", "Unknown", "Unknown", "Unknown",
-
-            // 0x60
-            "Unknown", "SpeedStor", "Unknown", "GNU Hurd, System V, 386/ix",
-
-            // 0x64
-            "NetWare 286", "NetWare", "NetWare 386", "NetWare",
-
-            // 0x68
-            "NetWare", "NetWare NSS", "Unknown", "Unknown",
-
-            // 0x6C
-            "Unknown", "Unknown", "Unknown", "Unknown",
-
-            // 0x70
-            "DiskSecure Multi-Boot", "Unknown", "UNIX 7th Edition", "Unknown",
-
-            // 0x74
-            "Unknown", "IBM PC/IX", "Unknown", "Unknown",
-
-            // 0x78
-            "Unknown", "Unknown", "Unknown", "Unknown",
-
-            // 0x7C
-            "Unknown", "Unknown", "Unknown", "Unknown",
-
-            // 0x80
-            "Old MINIX", "MINIX, Old Linux", "Linux swap, Solaris", "Linux",
-
-            // 0x84
-            "Hidden by OS/2, APM hibernation", "Linux extended", "NT Stripe Set", "NT Stripe Set",
-
-            // 0x88
-            "Linux Plaintext", "Unknown", "Unknown", "Unknown",
-
-            // 0x8C
-            "Unknown", "Unknown", "Linux LVM", "Unknown",
-
-            // 0x90
-            "Unknown", "Unknown", "Unknown", "Amoeba, Hidden Linux",
-
-            // 0x94
-            "Amoeba bad blocks", "Unknown", "Unknown", "Unknown",
-
-            // 0x98
-            "Unknown", "Mylex EISA SCSI", "Unknown", "Unknown",
-
-            // 0x9C
-            "Unknown", "Unknown", "Unknown", "BSD/OS",
-
-            // 0xA0
-            "Hibernation", "HP Volume Expansion", "Unknown", "HP Volume Expansion",
-
-            // 0xA4
-            "HP Volume Expansion", "FreeBSD", "OpenBSD", "NeXTStep",
-
-            // 0xA8
-            "Apple UFS", "NetBSD", "Olivetti DOS FAT12", "Apple Boot",
-
-            // 0xAC
-            "Unknown", "Unknown", "Unknown", "Apple HFS",
-
-            // 0xB0
-            "BootStar", "HP Volume Expansion", "Unknown", "HP Volume Expansion",
-
-            // 0xB4
-            "HP Volume Expansion", "Unknown", "HP Volume Expansion", "BSDi",
-
-            // 0xB8
-            "BSDi swap", "Unknown", "Unknown", "PTS BootWizard",
-
-            // 0xBC
-            "Unknown", "Unknown", "Solaris boot", "Solaris",
-
-            // 0xC0
-            "Novell DOS, DR-DOS secured", "DR-DOS secured FAT12", "DR-DOS reserved", "DR-DOS reserved",
-
-            // 0xC4
-            "DR-DOS secured FAT16 < 32 MiB", "Unknown", "DR-DOS secured FAT16", "Syrinx",
-
-            // 0xC8
-            "DR-DOS reserved", "DR-DOS reserved", "DR-DOS reserved", "DR-DOS secured FAT32",
-
-            // 0xCC
-            "DR-DOS secured FAT32 (LBA)", "DR-DOS reserved", "DR-DOS secured FAT16 (LBA)",
-            "DR-DOS secured extended (LBA)",
-
-            // 0xD0
-            "Multiuser DOS secured FAT12", "Multiuser DOS secured FAT12", "Unknown", "Unknown",
-
-            // 0xD4
-            "Multiuser DOS secured FAT16 < 32 MiB", "Multiuser DOS secured extended", "Multiuser DOS secured FAT16",
-            "Unknown",
-
-            // 0xD8
-            "CP/M", "Unknown", "Filesystem-less data", "CP/M, CCP/M, CTOS",
-
-            // 0xDC
-            "Unknown", "Unknown", "Dell partition", "BootIt EMBRM",
-
-            // 0xE0
-            "Unknown", "SpeedStor", "DOS read/only", "SpeedStor",
-
-            // 0xE4
-            "SpeedStor", "Tandy DOS", "SpeedStor", "Unknown",
-
-            // 0xE8
-            "Unknown", "Unknown", "Unknown", "BeOS",
-
-            // 0xEC
-            "Unknown", "Spryt*x", "Guid Partition Table", "EFI system partition",
-
-            // 0xF0
-            "Linux boot", "SpeedStor", "DOS 3.3 secondary, Unisys DOS", "SpeedStor",
-
-            // 0xF4
-            "SpeedStor", "Prologue", "SpeedStor", "Unknown",
-
-            // 0xF8
-            "Unknown", "Unknown", "Unknown", "VMWare VMFS",
-
-            // 0xFC
-            "VMWare VMKCORE", "Linux RAID, FreeDOS", "SpeedStor, LANStep, PS/2 IML", "Xenix bad block"
-        };
-
-        /// <inheritdoc />
-        public string Name => "Master Boot Record";
-        /// <inheritdoc />
-        public Guid Id => new("5E8A34E8-4F1A-59E6-4BF7-7EA647063A76");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        [SuppressMessage("ReSharper", "UnusedVariable")]
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        if(signature                     != GPT_MAGIC &&
+           imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
         {
-            ulong counter = 0;
-
-            partitions = new List<Partition>();
-
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
-
-            uint sectorSize = imagePlugin.Info.SectorSize;
-
-            // Divider of sector size in MBR between real sector size
-            ulong divider = 1;
-
-            if(imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
-            {
-                sectorSize = 512;
-                divider    = 4;
-            }
-
-            ErrorNumber errno = imagePlugin.ReadSector(sectorOffset, out byte[] sector);
+            errno = imagePlugin.ReadSector(sectorOffset, out hdrBytes);
 
             if(errno != ErrorNumber.NoError)
                 return false;
 
-            MasterBootRecord      mbr     = Marshal.ByteArrayToStructureLittleEndian<MasterBootRecord>(sector);
-            TimedMasterBootRecord mbrTime = Marshal.ByteArrayToStructureLittleEndian<TimedMasterBootRecord>(sector);
-
-            SerializedMasterBootRecord mbrSerial =
-                Marshal.ByteArrayToStructureLittleEndian<SerializedMasterBootRecord>(sector);
-
-            ModernMasterBootRecord mbrModern = Marshal.ByteArrayToStructureLittleEndian<ModernMasterBootRecord>(sector);
-            NecMasterBootRecord    mbrNec    = Marshal.ByteArrayToStructureLittleEndian<NecMasterBootRecord>(sector);
-
-            DiskManagerMasterBootRecord mbrOntrack =
-                Marshal.ByteArrayToStructureLittleEndian<DiskManagerMasterBootRecord>(sector);
-
-            AaruConsole.DebugWriteLine("MBR plugin", "xmlmedia = {0}", imagePlugin.Info.XmlMediaType);
-            AaruConsole.DebugWriteLine("MBR plugin", "mbr.magic = {0:X4}", mbr.magic);
-
-            if(mbr.magic != MBR_MAGIC)
-                return false; // Not MBR
-
-            errno = imagePlugin.ReadSector(1 + sectorOffset, out byte[] hdrBytes);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            ulong signature = BitConverter.ToUInt64(hdrBytes, 0);
-
-            AaruConsole.DebugWriteLine("MBR Plugin", "gpt.signature = 0x{0:X16}", signature);
+            signature = BitConverter.ToUInt64(hdrBytes, 512);
+            AaruConsole.DebugWriteLine("MBR Plugin", "gpt.signature @ 0x200 = 0x{0:X16}", signature);
 
             if(signature == GPT_MAGIC)
                 return false;
-
-            if(signature                     != GPT_MAGIC &&
-               imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc)
-            {
-                errno = imagePlugin.ReadSector(sectorOffset, out hdrBytes);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-
-                signature = BitConverter.ToUInt64(hdrBytes, 512);
-                AaruConsole.DebugWriteLine("MBR Plugin", "gpt.signature @ 0x200 = 0x{0:X16}", signature);
-
-                if(signature == GPT_MAGIC)
-                    return false;
-            }
-
-            PartitionEntry[] entries;
-
-            if(mbrOntrack.dm_magic == DM_MAGIC)
-                entries = mbrOntrack.entries;
-            else if(mbrNec.nec_magic == NEC_MAGIC)
-                entries = mbrNec.entries;
-            else
-                entries = mbr.entries;
-
-            foreach(PartitionEntry entry in entries)
-            {
-                byte   startSector   = (byte)(entry.start_sector & 0x3F);
-                ushort startCylinder = (ushort)(((entry.start_sector & 0xC0) << 2) | entry.start_cylinder);
-                byte   endSector     = (byte)(entry.end_sector & 0x3F);
-                ushort endCylinder   = (ushort)(((entry.end_sector & 0xC0) << 2) | entry.end_cylinder);
-                ulong  lbaStart      = entry.lba_start;
-                ulong  lbaSectors    = entry.lba_sectors;
-
-                // Let's start the fun...
-
-                bool valid    = true;
-                bool extended = false;
-                bool minix    = false;
-
-                if(entry.status != 0x00 &&
-                   entry.status != 0x80)
-                    return false; // Maybe a FAT filesystem
-
-                valid &= entry.type != 0x00;
-
-                if(entry.type == 0x05 ||
-                   entry.type == 0x0F ||
-                   entry.type == 0x15 ||
-                   entry.type == 0x1F ||
-                   entry.type == 0x85 ||
-                   entry.type == 0x91 ||
-                   entry.type == 0x9B ||
-                   entry.type == 0xC5 ||
-                   entry.type == 0xCF ||
-                   entry.type == 0xD5)
-                {
-                    valid    = false;
-                    extended = true; // Extended partition
-                }
-
-                minix |= entry.type == 0x81 || entry.type == 0x80; // MINIX partition
-
-                valid &= entry.lba_start  != 0 || entry.lba_sectors  != 0 || entry.start_cylinder != 0 ||
-                         entry.start_head != 0 || entry.start_sector != 0 || entry.end_cylinder   != 0 ||
-                         entry.end_head   != 0 || entry.end_sector   != 0;
-
-                if(entry.lba_start   == 0 &&
-                   entry.lba_sectors == 0 &&
-                   valid)
-                {
-                    lbaStart = CHS.ToLBA(startCylinder, entry.start_head, startSector, imagePlugin.Info.Heads,
-                                         imagePlugin.Info.SectorsPerTrack);
-
-                    lbaSectors = CHS.ToLBA(endCylinder, entry.end_head, entry.end_sector, imagePlugin.Info.Heads,
-                                           imagePlugin.Info.SectorsPerTrack) - lbaStart;
-                }
-
-                // For optical media
-                lbaStart   /= divider;
-                lbaSectors /= divider;
-
-                if(minix && lbaStart == sectorOffset)
-                    minix = false;
-
-                if(lbaStart > imagePlugin.Info.Sectors)
-                {
-                    valid    = false;
-                    extended = false;
-                }
-
-                // Some buggy implementations do some rounding errors getting a few sectors beyond device size
-                if(lbaStart + lbaSectors > imagePlugin.Info.Sectors)
-                    lbaSectors = imagePlugin.Info.Sectors - lbaStart;
-
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.status {0}", entry.status);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.type {0}", entry.type);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.lba_start {0}", entry.lba_start);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.lba_sectors {0}", entry.lba_sectors);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.start_cylinder {0}", startCylinder);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.start_head {0}", entry.start_head);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.start_sector {0}", startSector);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.end_cylinder {0}", endCylinder);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.end_head {0}", entry.end_head);
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.end_sector {0}", endSector);
-
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.minix = {0}", minix);
-
-                AaruConsole.DebugWriteLine("MBR plugin", "lba_start {0}", lbaStart);
-                AaruConsole.DebugWriteLine("MBR plugin", "lba_sectors {0}", lbaSectors);
-
-                if(valid && minix) // Let's mix the fun
-                    if(GetMinix(imagePlugin, lbaStart, divider, sectorOffset, sectorSize, out List<Partition> mnxParts))
-                        partitions.AddRange(mnxParts);
-                    else
-                        minix = false;
-
-                if(valid && !minix)
-                {
-                    var part = new Partition();
-
-                    if((lbaStart > 0 || imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc) &&
-                       lbaSectors > 0)
-                    {
-                        part.Start  = lbaStart + sectorOffset;
-                        part.Length = lbaSectors;
-                        part.Offset = part.Start  * sectorSize;
-                        part.Size   = part.Length * sectorSize;
-                    }
-                    else
-                        valid = false;
-
-                    if(valid)
-                    {
-                        part.Type        = $"0x{entry.type:X2}";
-                        part.Name        = DecodeMbrType(entry.type);
-                        part.Sequence    = counter;
-                        part.Description = entry.status == 0x80 ? "Partition is bootable." : "";
-                        part.Scheme      = Name;
-
-                        counter++;
-
-                        partitions.Add(part);
-                    }
-                }
-
-                AaruConsole.DebugWriteLine("MBR plugin", "entry.extended = {0}", extended);
-
-                if(!extended)
-                    continue;
-
-                bool  processingExtended = true;
-                ulong chainStart         = lbaStart;
-
-                while(processingExtended)
-                {
-                    errno = imagePlugin.ReadSector(lbaStart, out sector);
-
-                    if(errno != ErrorNumber.NoError)
-                        break;
-
-                    ExtendedBootRecord ebr = Marshal.ByteArrayToStructureLittleEndian<ExtendedBootRecord>(sector);
-
-                    AaruConsole.DebugWriteLine("MBR plugin", "ebr.magic == MBR_Magic = {0}", ebr.magic == MBR_MAGIC);
-
-                    if(ebr.magic != MBR_MAGIC)
-                        break;
-
-                    ulong nextStart = 0;
-
-                    foreach(PartitionEntry ebrEntry in ebr.entries)
-                    {
-                        bool extValid = true;
-                        startSector   = (byte)(ebrEntry.start_sector & 0x3F);
-                        startCylinder = (ushort)(((ebrEntry.start_sector & 0xC0) << 2) | ebrEntry.start_cylinder);
-                        endSector     = (byte)(ebrEntry.end_sector & 0x3F);
-                        endCylinder   = (ushort)(((ebrEntry.end_sector & 0xC0) << 2) | ebrEntry.end_cylinder);
-                        ulong extStart   = ebrEntry.lba_start;
-                        ulong extSectors = ebrEntry.lba_sectors;
-                        bool  extMinix   = false;
-
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.status {0}", ebrEntry.status);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.type {0}", ebrEntry.type);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.lba_start {0}", ebrEntry.lba_start);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.lba_sectors {0}", ebrEntry.lba_sectors);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_cylinder {0}", startCylinder);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_head {0}", ebrEntry.start_head);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_sector {0}", startSector);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_cylinder {0}", endCylinder);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_head {0}", ebrEntry.end_head);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_sector {0}", endSector);
-
-                        // Let's start the fun...
-                        extValid &= ebrEntry.status == 0x00 || ebrEntry.status == 0x80;
-                        extValid &= ebrEntry.type != 0x00;
-
-                        extValid &= ebrEntry.lba_start      != 0 || ebrEntry.lba_sectors  != 0 ||
-                                    ebrEntry.start_cylinder != 0 || ebrEntry.start_head   != 0 ||
-                                    ebrEntry.start_sector   != 0 || ebrEntry.end_cylinder != 0 ||
-                                    ebrEntry.end_head       != 0 || ebrEntry.end_sector   != 0;
-
-                        if(ebrEntry.lba_start   == 0 &&
-                           ebrEntry.lba_sectors == 0 &&
-                           extValid)
-                        {
-                            extStart = CHS.ToLBA(startCylinder, ebrEntry.start_head, startSector,
-                                                 imagePlugin.Info.Heads, imagePlugin.Info.SectorsPerTrack);
-
-                            extSectors = CHS.ToLBA(endCylinder, ebrEntry.end_head, ebrEntry.end_sector,
-                                                   imagePlugin.Info.Heads, imagePlugin.Info.SectorsPerTrack) - extStart;
-                        }
-
-                        extMinix |= ebrEntry.type == 0x81 || ebrEntry.type == 0x80;
-
-                        // For optical media
-                        extStart   /= divider;
-                        extSectors /= divider;
-
-                        AaruConsole.DebugWriteLine("MBR plugin", "ext_start {0}", extStart);
-                        AaruConsole.DebugWriteLine("MBR plugin", "ext_sectors {0}", extSectors);
-
-                        if(ebrEntry.type == 0x05 ||
-                           ebrEntry.type == 0x0F ||
-                           ebrEntry.type == 0x15 ||
-                           ebrEntry.type == 0x1F ||
-                           ebrEntry.type == 0x85 ||
-                           ebrEntry.type == 0x91 ||
-                           ebrEntry.type == 0x9B ||
-                           ebrEntry.type == 0xC5 ||
-                           ebrEntry.type == 0xCF ||
-                           ebrEntry.type == 0xD5)
-                        {
-                            extValid  = false;
-                            nextStart = chainStart + extStart;
-                        }
-
-                        extStart += lbaStart;
-                        extValid &= extStart <= imagePlugin.Info.Sectors;
-
-                        // Some buggy implementations do some rounding errors getting a few sectors beyond device size
-                        if(extStart + extSectors > imagePlugin.Info.Sectors)
-                            extSectors = imagePlugin.Info.Sectors - extStart;
-
-                        if(extValid && extMinix) // Let's mix the fun
-                            if(GetMinix(imagePlugin, lbaStart, divider, sectorOffset, sectorSize,
-                                        out List<Partition> mnxParts))
-                                partitions.AddRange(mnxParts);
-                            else
-                                extMinix = false;
-
-                        if(!extValid || extMinix)
-                            continue;
-
-                        var part = new Partition();
-
-                        if(extStart   > 0 &&
-                           extSectors > 0)
-                        {
-                            part.Start  = extStart + sectorOffset;
-                            part.Length = extSectors;
-                            part.Offset = part.Start  * sectorSize;
-                            part.Size   = part.Length * sectorSize;
-                        }
-                        else
-                            extValid = false;
-
-                        if(!extValid)
-                            continue;
-
-                        part.Type        = $"0x{ebrEntry.type:X2}";
-                        part.Name        = DecodeMbrType(ebrEntry.type);
-                        part.Sequence    = counter;
-                        part.Description = ebrEntry.status == 0x80 ? "Partition is bootable." : "";
-                        part.Scheme      = Name;
-                        counter++;
-
-                        partitions.Add(part);
-                    }
-
-                    AaruConsole.DebugWriteLine("MBR plugin", "next_start {0}", nextStart);
-                    processingExtended &= nextStart != 0;
-                    processingExtended &= nextStart <= imagePlugin.Info.Sectors;
-                    lbaStart           =  nextStart;
-                }
-            }
-
-            // An empty MBR may exist, NeXT creates one and then hardcodes its disklabel
-            return partitions.Count != 0;
         }
 
-        static bool GetMinix(IMediaImage imagePlugin, ulong start, ulong divider, ulong sectorOffset, uint sectorSize,
-                             out List<Partition> partitions)
+        PartitionEntry[] entries;
+
+        if(mbrOntrack.dm_magic == DM_MAGIC)
+            entries = mbrOntrack.entries;
+        else if(mbrNec.nec_magic == NEC_MAGIC)
+            entries = mbrNec.entries;
+        else
+            entries = mbr.entries;
+
+        foreach(PartitionEntry entry in entries)
         {
-            partitions = new List<Partition>();
+            byte   startSector   = (byte)(entry.start_sector & 0x3F);
+            ushort startCylinder = (ushort)(((entry.start_sector & 0xC0) << 2) | entry.start_cylinder);
+            byte   endSector     = (byte)(entry.end_sector & 0x3F);
+            ushort endCylinder   = (ushort)(((entry.end_sector & 0xC0) << 2) | entry.end_cylinder);
+            ulong  lbaStart      = entry.lba_start;
+            ulong  lbaSectors    = entry.lba_sectors;
 
-            ErrorNumber errno = imagePlugin.ReadSector(start, out byte[] sector);
+            // Let's start the fun...
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+            bool valid    = true;
+            bool extended = false;
+            bool minix    = false;
 
-            ExtendedBootRecord mnx = Marshal.ByteArrayToStructureLittleEndian<ExtendedBootRecord>(sector);
+            if(entry.status != 0x00 &&
+               entry.status != 0x80)
+                return false; // Maybe a FAT filesystem
 
-            AaruConsole.DebugWriteLine("MBR plugin", "mnx.magic == MBR_Magic = {0}", mnx.magic == MBR_MAGIC);
+            valid &= entry.type != 0x00;
 
-            if(mnx.magic != MBR_MAGIC)
-                return false;
-
-            bool anyMnx = false;
-
-            foreach(PartitionEntry mnxEntry in mnx.entries)
+            if(entry.type == 0x05 ||
+               entry.type == 0x0F ||
+               entry.type == 0x15 ||
+               entry.type == 0x1F ||
+               entry.type == 0x85 ||
+               entry.type == 0x91 ||
+               entry.type == 0x9B ||
+               entry.type == 0xC5 ||
+               entry.type == 0xCF ||
+               entry.type == 0xD5)
             {
-                bool   mnxValid      = true;
-                byte   startSector   = (byte)(mnxEntry.start_sector & 0x3F);
-                ushort startCylinder = (ushort)(((mnxEntry.start_sector & 0xC0) << 2) | mnxEntry.start_cylinder);
-                byte   endSector     = (byte)(mnxEntry.end_sector & 0x3F);
-                ushort endCylinder   = (ushort)(((mnxEntry.end_sector & 0xC0) << 2) | mnxEntry.end_cylinder);
-                ulong  mnxStart      = mnxEntry.lba_start;
-                ulong  mnxSectors    = mnxEntry.lba_sectors;
+                valid    = false;
+                extended = true; // Extended partition
+            }
 
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.status {0}", mnxEntry.status);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.type {0}", mnxEntry.type);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.lba_start {0}", mnxEntry.lba_start);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.lba_sectors {0}", mnxEntry.lba_sectors);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_cylinder {0}", startCylinder);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_head {0}", mnxEntry.start_head);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_sector {0}", startSector);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_cylinder {0}", endCylinder);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_head {0}", mnxEntry.end_head);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_sector {0}", endSector);
+            minix |= entry.type == 0x81 || entry.type == 0x80; // MINIX partition
 
-                mnxValid &= mnxEntry.status == 0x00 || mnxEntry.status == 0x80;
-                mnxValid &= mnxEntry.type   == 0x81 || mnxEntry.type   == 0x80;
+            valid &= entry.lba_start  != 0 || entry.lba_sectors  != 0 || entry.start_cylinder != 0 ||
+                     entry.start_head != 0 || entry.start_sector != 0 || entry.end_cylinder   != 0 ||
+                     entry.end_head   != 0 || entry.end_sector   != 0;
 
-                mnxValid &= mnxEntry.lba_start  != 0 || mnxEntry.lba_sectors  != 0 || mnxEntry.start_cylinder != 0 ||
-                            mnxEntry.start_head != 0 || mnxEntry.start_sector != 0 || mnxEntry.end_cylinder   != 0 ||
-                            mnxEntry.end_head   != 0 || mnxEntry.end_sector   != 0;
+            if(entry.lba_start   == 0 &&
+               entry.lba_sectors == 0 &&
+               valid)
+            {
+                lbaStart = CHS.ToLBA(startCylinder, entry.start_head, startSector, imagePlugin.Info.Heads,
+                                     imagePlugin.Info.SectorsPerTrack);
 
-                if(mnxEntry.lba_start   == 0 &&
-                   mnxEntry.lba_sectors == 0 &&
-                   mnxValid)
-                {
-                    mnxStart = CHS.ToLBA(startCylinder, mnxEntry.start_head, startSector, imagePlugin.Info.Heads,
-                                         imagePlugin.Info.SectorsPerTrack);
+                lbaSectors = CHS.ToLBA(endCylinder, entry.end_head, entry.end_sector, imagePlugin.Info.Heads,
+                                       imagePlugin.Info.SectorsPerTrack) - lbaStart;
+            }
 
-                    mnxSectors = CHS.ToLBA(endCylinder, mnxEntry.end_head, mnxEntry.end_sector, imagePlugin.Info.Heads,
-                                           imagePlugin.Info.SectorsPerTrack) - mnxStart;
-                }
+            // For optical media
+            lbaStart   /= divider;
+            lbaSectors /= divider;
 
-                // For optical media
-                mnxStart   /= divider;
-                mnxSectors /= divider;
+            if(minix && lbaStart == sectorOffset)
+                minix = false;
 
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_start {0}", mnxStart);
-                AaruConsole.DebugWriteLine("MBR plugin", "mnx_sectors {0}", mnxSectors);
+            if(lbaStart > imagePlugin.Info.Sectors)
+            {
+                valid    = false;
+                extended = false;
+            }
 
-                if(!mnxValid)
-                    continue;
+            // Some buggy implementations do some rounding errors getting a few sectors beyond device size
+            if(lbaStart + lbaSectors > imagePlugin.Info.Sectors)
+                lbaSectors = imagePlugin.Info.Sectors - lbaStart;
 
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.status {0}", entry.status);
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.type {0}", entry.type);
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.lba_start {0}", entry.lba_start);
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.lba_sectors {0}", entry.lba_sectors);
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.start_cylinder {0}", startCylinder);
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.start_head {0}", entry.start_head);
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.start_sector {0}", startSector);
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.end_cylinder {0}", endCylinder);
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.end_head {0}", entry.end_head);
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.end_sector {0}", endSector);
+
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.minix = {0}", minix);
+
+            AaruConsole.DebugWriteLine("MBR plugin", "lba_start {0}", lbaStart);
+            AaruConsole.DebugWriteLine("MBR plugin", "lba_sectors {0}", lbaSectors);
+
+            if(valid && minix) // Let's mix the fun
+                if(GetMinix(imagePlugin, lbaStart, divider, sectorOffset, sectorSize, out List<Partition> mnxParts))
+                    partitions.AddRange(mnxParts);
+                else
+                    minix = false;
+
+            if(valid && !minix)
+            {
                 var part = new Partition();
 
-                if(mnxStart   > 0 &&
-                   mnxSectors > 0)
+                if((lbaStart > 0 || imagePlugin.Info.XmlMediaType == XmlMediaType.OpticalDisc) &&
+                   lbaSectors > 0)
                 {
-                    part.Start  = mnxStart + sectorOffset;
-                    part.Length = mnxSectors;
+                    part.Start  = lbaStart + sectorOffset;
+                    part.Length = lbaSectors;
                     part.Offset = part.Start  * sectorSize;
                     part.Size   = part.Length * sectorSize;
                 }
                 else
-                    mnxValid = false;
+                    valid = false;
 
-                if(!mnxValid)
-                    continue;
+                if(valid)
+                {
+                    part.Type        = $"0x{entry.type:X2}";
+                    part.Name        = DecodeMbrType(entry.type);
+                    part.Sequence    = counter;
+                    part.Description = entry.status == 0x80 ? "Partition is bootable." : "";
+                    part.Scheme      = Name;
 
-                anyMnx           = true;
-                part.Type        = "MINIX";
-                part.Name        = "MINIX";
-                part.Description = mnxEntry.status == 0x80 ? "Partition is bootable." : "";
-                part.Scheme      = "MINIX";
+                    counter++;
 
-                partitions.Add(part);
+                    partitions.Add(part);
+                }
             }
 
-            return anyMnx;
+            AaruConsole.DebugWriteLine("MBR plugin", "entry.extended = {0}", extended);
+
+            if(!extended)
+                continue;
+
+            bool  processingExtended = true;
+            ulong chainStart         = lbaStart;
+
+            while(processingExtended)
+            {
+                errno = imagePlugin.ReadSector(lbaStart, out sector);
+
+                if(errno != ErrorNumber.NoError)
+                    break;
+
+                ExtendedBootRecord ebr = Marshal.ByteArrayToStructureLittleEndian<ExtendedBootRecord>(sector);
+
+                AaruConsole.DebugWriteLine("MBR plugin", "ebr.magic == MBR_Magic = {0}", ebr.magic == MBR_MAGIC);
+
+                if(ebr.magic != MBR_MAGIC)
+                    break;
+
+                ulong nextStart = 0;
+
+                foreach(PartitionEntry ebrEntry in ebr.entries)
+                {
+                    bool extValid = true;
+                    startSector   = (byte)(ebrEntry.start_sector & 0x3F);
+                    startCylinder = (ushort)(((ebrEntry.start_sector & 0xC0) << 2) | ebrEntry.start_cylinder);
+                    endSector     = (byte)(ebrEntry.end_sector & 0x3F);
+                    endCylinder   = (ushort)(((ebrEntry.end_sector & 0xC0) << 2) | ebrEntry.end_cylinder);
+                    ulong extStart   = ebrEntry.lba_start;
+                    ulong extSectors = ebrEntry.lba_sectors;
+                    bool  extMinix   = false;
+
+                    AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.status {0}", ebrEntry.status);
+                    AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.type {0}", ebrEntry.type);
+                    AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.lba_start {0}", ebrEntry.lba_start);
+                    AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.lba_sectors {0}", ebrEntry.lba_sectors);
+                    AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_cylinder {0}", startCylinder);
+                    AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_head {0}", ebrEntry.start_head);
+                    AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.start_sector {0}", startSector);
+                    AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_cylinder {0}", endCylinder);
+                    AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_head {0}", ebrEntry.end_head);
+                    AaruConsole.DebugWriteLine("MBR plugin", "ebr_entry.end_sector {0}", endSector);
+
+                    // Let's start the fun...
+                    extValid &= ebrEntry.status == 0x00 || ebrEntry.status == 0x80;
+                    extValid &= ebrEntry.type != 0x00;
+
+                    extValid &= ebrEntry.lba_start      != 0 || ebrEntry.lba_sectors  != 0 ||
+                                ebrEntry.start_cylinder != 0 || ebrEntry.start_head   != 0 ||
+                                ebrEntry.start_sector   != 0 || ebrEntry.end_cylinder != 0 ||
+                                ebrEntry.end_head       != 0 || ebrEntry.end_sector   != 0;
+
+                    if(ebrEntry.lba_start   == 0 &&
+                       ebrEntry.lba_sectors == 0 &&
+                       extValid)
+                    {
+                        extStart = CHS.ToLBA(startCylinder, ebrEntry.start_head, startSector,
+                                             imagePlugin.Info.Heads, imagePlugin.Info.SectorsPerTrack);
+
+                        extSectors = CHS.ToLBA(endCylinder, ebrEntry.end_head, ebrEntry.end_sector,
+                                               imagePlugin.Info.Heads, imagePlugin.Info.SectorsPerTrack) - extStart;
+                    }
+
+                    extMinix |= ebrEntry.type == 0x81 || ebrEntry.type == 0x80;
+
+                    // For optical media
+                    extStart   /= divider;
+                    extSectors /= divider;
+
+                    AaruConsole.DebugWriteLine("MBR plugin", "ext_start {0}", extStart);
+                    AaruConsole.DebugWriteLine("MBR plugin", "ext_sectors {0}", extSectors);
+
+                    if(ebrEntry.type == 0x05 ||
+                       ebrEntry.type == 0x0F ||
+                       ebrEntry.type == 0x15 ||
+                       ebrEntry.type == 0x1F ||
+                       ebrEntry.type == 0x85 ||
+                       ebrEntry.type == 0x91 ||
+                       ebrEntry.type == 0x9B ||
+                       ebrEntry.type == 0xC5 ||
+                       ebrEntry.type == 0xCF ||
+                       ebrEntry.type == 0xD5)
+                    {
+                        extValid  = false;
+                        nextStart = chainStart + extStart;
+                    }
+
+                    extStart += lbaStart;
+                    extValid &= extStart <= imagePlugin.Info.Sectors;
+
+                    // Some buggy implementations do some rounding errors getting a few sectors beyond device size
+                    if(extStart + extSectors > imagePlugin.Info.Sectors)
+                        extSectors = imagePlugin.Info.Sectors - extStart;
+
+                    if(extValid && extMinix) // Let's mix the fun
+                        if(GetMinix(imagePlugin, lbaStart, divider, sectorOffset, sectorSize,
+                                    out List<Partition> mnxParts))
+                            partitions.AddRange(mnxParts);
+                        else
+                            extMinix = false;
+
+                    if(!extValid || extMinix)
+                        continue;
+
+                    var part = new Partition();
+
+                    if(extStart   > 0 &&
+                       extSectors > 0)
+                    {
+                        part.Start  = extStart + sectorOffset;
+                        part.Length = extSectors;
+                        part.Offset = part.Start  * sectorSize;
+                        part.Size   = part.Length * sectorSize;
+                    }
+                    else
+                        extValid = false;
+
+                    if(!extValid)
+                        continue;
+
+                    part.Type        = $"0x{ebrEntry.type:X2}";
+                    part.Name        = DecodeMbrType(ebrEntry.type);
+                    part.Sequence    = counter;
+                    part.Description = ebrEntry.status == 0x80 ? "Partition is bootable." : "";
+                    part.Scheme      = Name;
+                    counter++;
+
+                    partitions.Add(part);
+                }
+
+                AaruConsole.DebugWriteLine("MBR plugin", "next_start {0}", nextStart);
+                processingExtended &= nextStart != 0;
+                processingExtended &= nextStart <= imagePlugin.Info.Sectors;
+                lbaStart           =  nextStart;
+            }
         }
 
-        static string DecodeMbrType(byte type) => _mbrTypes[type];
+        // An empty MBR may exist, NeXT creates one and then hardcodes its disklabel
+        return partitions.Count != 0;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct MasterBootRecord
+    static bool GetMinix(IMediaImage imagePlugin, ulong start, ulong divider, ulong sectorOffset, uint sectorSize,
+                         out List<Partition> partitions)
+    {
+        partitions = new List<Partition>();
+
+        ErrorNumber errno = imagePlugin.ReadSector(start, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        ExtendedBootRecord mnx = Marshal.ByteArrayToStructureLittleEndian<ExtendedBootRecord>(sector);
+
+        AaruConsole.DebugWriteLine("MBR plugin", "mnx.magic == MBR_Magic = {0}", mnx.magic == MBR_MAGIC);
+
+        if(mnx.magic != MBR_MAGIC)
+            return false;
+
+        bool anyMnx = false;
+
+        foreach(PartitionEntry mnxEntry in mnx.entries)
         {
-            /// <summary>Boot code</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 446)]
-            public readonly byte[] boot_code;
-            /// <summary>Partitions</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly PartitionEntry[] entries;
-            /// <summary>
-            ///     <see cref="MBR.MBR_MAGIC" />
-            /// </summary>
-            public readonly ushort magic;
+            bool   mnxValid      = true;
+            byte   startSector   = (byte)(mnxEntry.start_sector & 0x3F);
+            ushort startCylinder = (ushort)(((mnxEntry.start_sector & 0xC0) << 2) | mnxEntry.start_cylinder);
+            byte   endSector     = (byte)(mnxEntry.end_sector & 0x3F);
+            ushort endCylinder   = (ushort)(((mnxEntry.end_sector & 0xC0) << 2) | mnxEntry.end_cylinder);
+            ulong  mnxStart      = mnxEntry.lba_start;
+            ulong  mnxSectors    = mnxEntry.lba_sectors;
+
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.status {0}", mnxEntry.status);
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.type {0}", mnxEntry.type);
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.lba_start {0}", mnxEntry.lba_start);
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.lba_sectors {0}", mnxEntry.lba_sectors);
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_cylinder {0}", startCylinder);
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_head {0}", mnxEntry.start_head);
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.start_sector {0}", startSector);
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_cylinder {0}", endCylinder);
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_head {0}", mnxEntry.end_head);
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_entry.end_sector {0}", endSector);
+
+            mnxValid &= mnxEntry.status == 0x00 || mnxEntry.status == 0x80;
+            mnxValid &= mnxEntry.type   == 0x81 || mnxEntry.type   == 0x80;
+
+            mnxValid &= mnxEntry.lba_start  != 0 || mnxEntry.lba_sectors  != 0 || mnxEntry.start_cylinder != 0 ||
+                        mnxEntry.start_head != 0 || mnxEntry.start_sector != 0 || mnxEntry.end_cylinder   != 0 ||
+                        mnxEntry.end_head   != 0 || mnxEntry.end_sector   != 0;
+
+            if(mnxEntry.lba_start   == 0 &&
+               mnxEntry.lba_sectors == 0 &&
+               mnxValid)
+            {
+                mnxStart = CHS.ToLBA(startCylinder, mnxEntry.start_head, startSector, imagePlugin.Info.Heads,
+                                     imagePlugin.Info.SectorsPerTrack);
+
+                mnxSectors = CHS.ToLBA(endCylinder, mnxEntry.end_head, mnxEntry.end_sector, imagePlugin.Info.Heads,
+                                       imagePlugin.Info.SectorsPerTrack) - mnxStart;
+            }
+
+            // For optical media
+            mnxStart   /= divider;
+            mnxSectors /= divider;
+
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_start {0}", mnxStart);
+            AaruConsole.DebugWriteLine("MBR plugin", "mnx_sectors {0}", mnxSectors);
+
+            if(!mnxValid)
+                continue;
+
+            var part = new Partition();
+
+            if(mnxStart   > 0 &&
+               mnxSectors > 0)
+            {
+                part.Start  = mnxStart + sectorOffset;
+                part.Length = mnxSectors;
+                part.Offset = part.Start  * sectorSize;
+                part.Size   = part.Length * sectorSize;
+            }
+            else
+                mnxValid = false;
+
+            if(!mnxValid)
+                continue;
+
+            anyMnx           = true;
+            part.Type        = "MINIX";
+            part.Name        = "MINIX";
+            part.Description = mnxEntry.status == 0x80 ? "Partition is bootable." : "";
+            part.Scheme      = "MINIX";
+
+            partitions.Add(part);
         }
 
-        // TODO: IBM Boot Manager
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ExtendedBootRecord
-        {
-            /// <summary>Boot code, almost always unused</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 446)]
-            public readonly byte[] boot_code;
-            /// <summary>Partitions or pointers</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly PartitionEntry[] entries;
-            /// <summary>
-            ///     <see cref="MBR.MBR_MAGIC" />
-            /// </summary>
-            public readonly ushort magic;
-        }
+        return anyMnx;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct TimedMasterBootRecord
-        {
-            /// <summary>Boot code</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 218)]
-            public readonly byte[] boot_code;
-            /// <summary>Set to 0</summary>
-            public readonly ushort zero;
-            /// <summary>Original physical drive</summary>
-            public readonly byte drive;
-            /// <summary>Disk timestamp, seconds</summary>
-            public readonly byte seconds;
-            /// <summary>Disk timestamp, minutes</summary>
-            public readonly byte minutes;
-            /// <summary>Disk timestamp, hours</summary>
-            public readonly byte hours;
-            /// <summary>Boot code, continuation</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 222)]
-            public readonly byte[] boot_code2;
-            /// <summary>Partitions</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly PartitionEntry[] entries;
-            /// <summary>
-            ///     <see cref="MBR.MBR_MAGIC" />
-            /// </summary>
-            public readonly ushort magic;
-        }
+    static string DecodeMbrType(byte type) => _mbrTypes[type];
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct SerializedMasterBootRecord
-        {
-            /// <summary>Boot code</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 440)]
-            public readonly byte[] boot_code;
-            /// <summary>Disk serial number</summary>
-            public readonly uint serial;
-            /// <summary>Set to 0</summary>
-            public readonly ushort zero;
-            /// <summary>Partitions</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly PartitionEntry[] entries;
-            /// <summary>
-            ///     <see cref="MBR.MBR_MAGIC" />
-            /// </summary>
-            public readonly ushort magic;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct MasterBootRecord
+    {
+        /// <summary>Boot code</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 446)]
+        public readonly byte[] boot_code;
+        /// <summary>Partitions</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly PartitionEntry[] entries;
+        /// <summary>
+        ///     <see cref="MBR.MBR_MAGIC" />
+        /// </summary>
+        public readonly ushort magic;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct ModernMasterBootRecord
-        {
-            /// <summary>Boot code</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 218)]
-            public readonly byte[] boot_code;
-            /// <summary>Set to 0</summary>
-            public readonly ushort zero;
-            /// <summary>Original physical drive</summary>
-            public readonly byte drive;
-            /// <summary>Disk timestamp, seconds</summary>
-            public readonly byte seconds;
-            /// <summary>Disk timestamp, minutes</summary>
-            public readonly byte minutes;
-            /// <summary>Disk timestamp, hours</summary>
-            public readonly byte hours;
-            /// <summary>Boot code, continuation</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 216)]
-            public readonly byte[] boot_code2;
-            /// <summary>Disk serial number</summary>
-            public readonly uint serial;
-            /// <summary>Set to 0</summary>
-            public readonly ushort zero2;
-            /// <summary>Partitions</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly PartitionEntry[] entries;
-            /// <summary>
-            ///     <see cref="MBR.MBR_MAGIC" />
-            /// </summary>
-            public readonly ushort magic;
-        }
+    // TODO: IBM Boot Manager
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ExtendedBootRecord
+    {
+        /// <summary>Boot code, almost always unused</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 446)]
+        public readonly byte[] boot_code;
+        /// <summary>Partitions or pointers</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly PartitionEntry[] entries;
+        /// <summary>
+        ///     <see cref="MBR.MBR_MAGIC" />
+        /// </summary>
+        public readonly ushort magic;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct NecMasterBootRecord
-        {
-            /// <summary>Boot code</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 380)]
-            public readonly byte[] boot_code;
-            /// <summary>
-            ///     <see cref="MBR.NEC_MAGIC" />
-            /// </summary>
-            public readonly ushort nec_magic;
-            /// <summary>Partitions</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly PartitionEntry[] entries;
-            /// <summary>
-            ///     <see cref="MBR.MBR_MAGIC" />
-            /// </summary>
-            public readonly ushort magic;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct TimedMasterBootRecord
+    {
+        /// <summary>Boot code</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 218)]
+        public readonly byte[] boot_code;
+        /// <summary>Set to 0</summary>
+        public readonly ushort zero;
+        /// <summary>Original physical drive</summary>
+        public readonly byte drive;
+        /// <summary>Disk timestamp, seconds</summary>
+        public readonly byte seconds;
+        /// <summary>Disk timestamp, minutes</summary>
+        public readonly byte minutes;
+        /// <summary>Disk timestamp, hours</summary>
+        public readonly byte hours;
+        /// <summary>Boot code, continuation</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 222)]
+        public readonly byte[] boot_code2;
+        /// <summary>Partitions</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly PartitionEntry[] entries;
+        /// <summary>
+        ///     <see cref="MBR.MBR_MAGIC" />
+        /// </summary>
+        public readonly ushort magic;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct DiskManagerMasterBootRecord
-        {
-            /// <summary>Boot code</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 252)]
-            public readonly byte[] boot_code;
-            /// <summary>
-            ///     <see cref="MBR.DM_MAGIC" />
-            /// </summary>
-            public readonly ushort dm_magic;
-            /// <summary>Partitions</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly PartitionEntry[] entries;
-            /// <summary>
-            ///     <see cref="MBR.MBR_MAGIC" />
-            /// </summary>
-            public readonly ushort magic;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct SerializedMasterBootRecord
+    {
+        /// <summary>Boot code</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 440)]
+        public readonly byte[] boot_code;
+        /// <summary>Disk serial number</summary>
+        public readonly uint serial;
+        /// <summary>Set to 0</summary>
+        public readonly ushort zero;
+        /// <summary>Partitions</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly PartitionEntry[] entries;
+        /// <summary>
+        ///     <see cref="MBR.MBR_MAGIC" />
+        /// </summary>
+        public readonly ushort magic;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct PartitionEntry
-        {
-            /// <summary>Partition status, 0x80 or 0x00, else invalid</summary>
-            public readonly byte status;
-            /// <summary>Starting head [0,254]</summary>
-            public readonly byte start_head;
-            /// <summary>Starting sector [1,63]</summary>
-            public readonly byte start_sector;
-            /// <summary>Starting cylinder [0,1023]</summary>
-            public readonly byte start_cylinder;
-            /// <summary>Partition type</summary>
-            public readonly byte type;
-            /// <summary>Ending head [0,254]</summary>
-            public readonly byte end_head;
-            /// <summary>Ending sector [1,63]</summary>
-            public readonly byte end_sector;
-            /// <summary>Ending cylinder [0,1023]</summary>
-            public readonly byte end_cylinder;
-            /// <summary>Starting absolute sector</summary>
-            public readonly uint lba_start;
-            /// <summary>Total sectors</summary>
-            public readonly uint lba_sectors;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct ModernMasterBootRecord
+    {
+        /// <summary>Boot code</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 218)]
+        public readonly byte[] boot_code;
+        /// <summary>Set to 0</summary>
+        public readonly ushort zero;
+        /// <summary>Original physical drive</summary>
+        public readonly byte drive;
+        /// <summary>Disk timestamp, seconds</summary>
+        public readonly byte seconds;
+        /// <summary>Disk timestamp, minutes</summary>
+        public readonly byte minutes;
+        /// <summary>Disk timestamp, hours</summary>
+        public readonly byte hours;
+        /// <summary>Boot code, continuation</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 216)]
+        public readonly byte[] boot_code2;
+        /// <summary>Disk serial number</summary>
+        public readonly uint serial;
+        /// <summary>Set to 0</summary>
+        public readonly ushort zero2;
+        /// <summary>Partitions</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly PartitionEntry[] entries;
+        /// <summary>
+        ///     <see cref="MBR.MBR_MAGIC" />
+        /// </summary>
+        public readonly ushort magic;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct NecMasterBootRecord
+    {
+        /// <summary>Boot code</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 380)]
+        public readonly byte[] boot_code;
+        /// <summary>
+        ///     <see cref="MBR.NEC_MAGIC" />
+        /// </summary>
+        public readonly ushort nec_magic;
+        /// <summary>Partitions</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly PartitionEntry[] entries;
+        /// <summary>
+        ///     <see cref="MBR.MBR_MAGIC" />
+        /// </summary>
+        public readonly ushort magic;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct DiskManagerMasterBootRecord
+    {
+        /// <summary>Boot code</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 252)]
+        public readonly byte[] boot_code;
+        /// <summary>
+        ///     <see cref="MBR.DM_MAGIC" />
+        /// </summary>
+        public readonly ushort dm_magic;
+        /// <summary>Partitions</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly PartitionEntry[] entries;
+        /// <summary>
+        ///     <see cref="MBR.MBR_MAGIC" />
+        /// </summary>
+        public readonly ushort magic;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct PartitionEntry
+    {
+        /// <summary>Partition status, 0x80 or 0x00, else invalid</summary>
+        public readonly byte status;
+        /// <summary>Starting head [0,254]</summary>
+        public readonly byte start_head;
+        /// <summary>Starting sector [1,63]</summary>
+        public readonly byte start_sector;
+        /// <summary>Starting cylinder [0,1023]</summary>
+        public readonly byte start_cylinder;
+        /// <summary>Partition type</summary>
+        public readonly byte type;
+        /// <summary>Ending head [0,254]</summary>
+        public readonly byte end_head;
+        /// <summary>Ending sector [1,63]</summary>
+        public readonly byte end_sector;
+        /// <summary>Ending cylinder [0,1023]</summary>
+        public readonly byte end_cylinder;
+        /// <summary>Starting absolute sector</summary>
+        public readonly uint lba_start;
+        /// <summary>Total sectors</summary>
+        public readonly uint lba_sectors;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/NeXT.cs b/Aaru.Partitions/NeXT.cs
index 0313a65f0..8135c27b7 100644
--- a/Aaru.Partitions/NeXT.cs
+++ b/Aaru.Partitions/NeXT.cs
@@ -44,367 +44,366 @@ using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
 // Information learnt from XNU source and testing against real disks
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of NeXT disklabels</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")]
+public sealed class NeXTDisklabel : IPartition
 {
+    /// <summary>"NeXT"</summary>
+    const uint NEXT_MAGIC1 = 0x4E655854;
+    /// <summary>"dlV2"</summary>
+    const uint NEXT_MAGIC2 = 0x646C5632;
+    /// <summary>"dlV3"</summary>
+    const uint NEXT_MAGIC3 = 0x646C5633;
+    /// <summary>180</summary>
+    const ushort DISKTAB_START = 0xB4;
+    /// <summary>44</summary>
+    const ushort DISKTAB_ENTRY_SIZE = 0x2C;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of NeXT disklabels</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local"), SuppressMessage("ReSharper", "UnusedType.Local")]
-    public sealed class NeXTDisklabel : IPartition
+    public string Name => "NeXT Disklabel";
+    /// <inheritdoc />
+    public Guid Id => new("246A6D93-4F1A-1F8A-344D-50187A5513A9");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        /// <summary>"NeXT"</summary>
-        const uint NEXT_MAGIC1 = 0x4E655854;
-        /// <summary>"dlV2"</summary>
-        const uint NEXT_MAGIC2 = 0x646C5632;
-        /// <summary>"dlV3"</summary>
-        const uint NEXT_MAGIC3 = 0x646C5633;
-        /// <summary>180</summary>
-        const ushort DISKTAB_START = 0xB4;
-        /// <summary>44</summary>
-        const ushort DISKTAB_ENTRY_SIZE = 0x2C;
+        bool   magicFound = false;
+        byte[] labelSector;
 
-        /// <inheritdoc />
-        public string Name => "NeXT Disklabel";
-        /// <inheritdoc />
-        public Guid Id => new("246A6D93-4F1A-1F8A-344D-50187A5513A9");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        uint sectorSize;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        if(imagePlugin.Info.SectorSize == 2352 ||
+           imagePlugin.Info.SectorSize == 2448)
+            sectorSize = 2048;
+        else
+            sectorSize = imagePlugin.Info.SectorSize;
+
+        partitions = new List<Partition>();
+
+        ulong       labelPosition = 0;
+        ErrorNumber errno;
+
+        foreach(ulong i in new ulong[]
+                {
+                    0, 4, 15, 16
+                }.TakeWhile(i => i + sectorOffset < imagePlugin.Info.Sectors))
         {
-            bool   magicFound = false;
-            byte[] labelSector;
-
-            uint sectorSize;
-
-            if(imagePlugin.Info.SectorSize == 2352 ||
-               imagePlugin.Info.SectorSize == 2448)
-                sectorSize = 2048;
-            else
-                sectorSize = imagePlugin.Info.SectorSize;
-
-            partitions = new List<Partition>();
-
-            ulong       labelPosition = 0;
-            ErrorNumber errno;
-
-            foreach(ulong i in new ulong[]
-            {
-                0, 4, 15, 16
-            }.TakeWhile(i => i + sectorOffset < imagePlugin.Info.Sectors))
-            {
-                errno = imagePlugin.ReadSector(i + sectorOffset, out labelSector);
-
-                if(errno != ErrorNumber.NoError)
-                    continue;
-
-                uint magic = BigEndianBitConverter.ToUInt32(labelSector, 0x00);
-
-                if(magic != NEXT_MAGIC1 &&
-                   magic != NEXT_MAGIC2 &&
-                   magic != NEXT_MAGIC3)
-                    continue;
-
-                magicFound    = true;
-                labelPosition = i + sectorOffset;
-
-                break;
-            }
-
-            if(!magicFound)
-                return false;
-
-            uint sectorsToRead = 7680 / imagePlugin.Info.SectorSize;
-
-            if(7680 % imagePlugin.Info.SectorSize > 0)
-                sectorsToRead++;
-
-            errno = imagePlugin.ReadSectors(labelPosition, sectorsToRead, out labelSector);
+            errno = imagePlugin.ReadSector(i + sectorOffset, out labelSector);
 
             if(errno != ErrorNumber.NoError)
-                return false;
+                continue;
 
-            Label  label    = Marshal.ByteArrayToStructureBigEndian<Label>(labelSector);
-            byte[] disktabB = new byte[498];
-            Array.Copy(labelSector, 44, disktabB, 0, 498);
-            label.dl_dt              = Marshal.ByteArrayToStructureBigEndian<DiskTab>(disktabB);
-            label.dl_dt.d_partitions = new Entry[8];
+            uint magic = BigEndianBitConverter.ToUInt32(labelSector, 0x00);
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_version = 0x{0:X8}", label.dl_version);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_label_blkno = {0}", label.dl_label_blkno);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_size = {0}", label.dl_size);
+            if(magic != NEXT_MAGIC1 &&
+               magic != NEXT_MAGIC2 &&
+               magic != NEXT_MAGIC3)
+                continue;
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_label = \"{0}\"",
-                                       StringHandlers.CToString(label.dl_label));
+            magicFound    = true;
+            labelPosition = i + sectorOffset;
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_flags = {0}", label.dl_flags);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_tag = 0x{0:X8}", label.dl_tag);
+            break;
+        }
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_name = \"{0}\"",
-                                       StringHandlers.CToString(label.dl_dt.d_name));
+        if(!magicFound)
+            return false;
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_type = \"{0}\"",
-                                       StringHandlers.CToString(label.dl_dt.d_type));
+        uint sectorsToRead = 7680 / imagePlugin.Info.SectorSize;
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_secsize = {0}", label.dl_dt.d_secsize);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ntracks = {0}", label.dl_dt.d_ntracks);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_nsectors = {0}", label.dl_dt.d_nsectors);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ncylinders = {0}", label.dl_dt.d_ncylinders);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rpm = {0}", label.dl_dt.d_rpm);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_front = {0}", label.dl_dt.d_front);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_back = {0}", label.dl_dt.d_back);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ngroups = {0}", label.dl_dt.d_ngroups);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_size = {0}", label.dl_dt.d_ag_size);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_alts = {0}", label.dl_dt.d_ag_alts);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_off = {0}", label.dl_dt.d_ag_off);
+        if(7680 % imagePlugin.Info.SectorSize > 0)
+            sectorsToRead++;
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_boot0_blkno[0] = {0}",
-                                       label.dl_dt.d_boot0_blkno[0]);
+        errno = imagePlugin.ReadSectors(labelPosition, sectorsToRead, out labelSector);
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_boot0_blkno[1] = {0}",
-                                       label.dl_dt.d_boot0_blkno[1]);
+        if(errno != ErrorNumber.NoError)
+            return false;
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_bootfile = \"{0}\"",
-                                       StringHandlers.CToString(label.dl_dt.d_bootfile));
+        Label  label    = Marshal.ByteArrayToStructureBigEndian<Label>(labelSector);
+        byte[] disktabB = new byte[498];
+        Array.Copy(labelSector, 44, disktabB, 0, 498);
+        label.dl_dt              = Marshal.ByteArrayToStructureBigEndian<DiskTab>(disktabB);
+        label.dl_dt.d_partitions = new Entry[8];
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_hostname = \"{0}\"",
-                                       StringHandlers.CToString(label.dl_dt.d_hostname));
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_version = 0x{0:X8}", label.dl_version);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_label_blkno = {0}", label.dl_label_blkno);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_size = {0}", label.dl_size);
 
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rootpartition = {0}", label.dl_dt.d_rootpartition);
-            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rwpartition = {0}", label.dl_dt.d_rwpartition);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_label = \"{0}\"",
+                                   StringHandlers.CToString(label.dl_label));
 
-            for(int i = 0; i < 8; i++)
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_flags = {0}", label.dl_flags);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_tag = 0x{0:X8}", label.dl_tag);
+
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_name = \"{0}\"",
+                                   StringHandlers.CToString(label.dl_dt.d_name));
+
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_type = \"{0}\"",
+                                   StringHandlers.CToString(label.dl_dt.d_type));
+
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_secsize = {0}", label.dl_dt.d_secsize);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ntracks = {0}", label.dl_dt.d_ntracks);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_nsectors = {0}", label.dl_dt.d_nsectors);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ncylinders = {0}", label.dl_dt.d_ncylinders);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rpm = {0}", label.dl_dt.d_rpm);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_front = {0}", label.dl_dt.d_front);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_back = {0}", label.dl_dt.d_back);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ngroups = {0}", label.dl_dt.d_ngroups);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_size = {0}", label.dl_dt.d_ag_size);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_alts = {0}", label.dl_dt.d_ag_alts);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_ag_off = {0}", label.dl_dt.d_ag_off);
+
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_boot0_blkno[0] = {0}",
+                                   label.dl_dt.d_boot0_blkno[0]);
+
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_boot0_blkno[1] = {0}",
+                                   label.dl_dt.d_boot0_blkno[1]);
+
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_bootfile = \"{0}\"",
+                                   StringHandlers.CToString(label.dl_dt.d_bootfile));
+
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_hostname = \"{0}\"",
+                                   StringHandlers.CToString(label.dl_dt.d_hostname));
+
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rootpartition = {0}", label.dl_dt.d_rootpartition);
+        AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_rwpartition = {0}", label.dl_dt.d_rwpartition);
+
+        for(int i = 0; i < 8; i++)
+        {
+            byte[] partB = new byte[44];
+            Array.Copy(labelSector, 44 + 146 + (44 * i), partB, 0, 44);
+            label.dl_dt.d_partitions[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(partB);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_base = {1}", i,
+                                       label.dl_dt.d_partitions[i].p_base);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_size = {1}", i,
+                                       label.dl_dt.d_partitions[i].p_size);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_bsize = {1}", i,
+                                       label.dl_dt.d_partitions[i].p_bsize);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_fsize = {1}", i,
+                                       label.dl_dt.d_partitions[i].p_fsize);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_opt = {1}", i,
+                                       label.dl_dt.d_partitions[i].p_opt);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_cpg = {1}", i,
+                                       label.dl_dt.d_partitions[i].p_cpg);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_density = {1}", i,
+                                       label.dl_dt.d_partitions[i].p_density);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_minfree = {1}", i,
+                                       label.dl_dt.d_partitions[i].p_minfree);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_newfs = {1}", i,
+                                       label.dl_dt.d_partitions[i].p_newfs);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_mountpt = \"{1}\"", i,
+                                       StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt));
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_automnt = {1}", i,
+                                       label.dl_dt.d_partitions[i].p_automnt);
+
+            AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_type = \"{1}\"", i,
+                                       StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type));
+
+            if(label.dl_dt.d_partitions[i].p_size  <= 0 ||
+               label.dl_dt.d_partitions[i].p_base  < 0  ||
+               label.dl_dt.d_partitions[i].p_bsize < 0)
+                continue;
+
+            var sb = new StringBuilder();
+
+            var part = new Partition
             {
-                byte[] partB = new byte[44];
-                Array.Copy(labelSector, 44 + 146 + (44 * i), partB, 0, 44);
-                label.dl_dt.d_partitions[i] = Marshal.ByteArrayToStructureBigEndian<Entry>(partB);
+                Size = (ulong)(label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize),
+                Offset =
+                    (ulong)((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) * label.dl_dt.d_secsize),
+                Type     = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type),
+                Sequence = (ulong)i,
+                Name     = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt),
+                Length   = (ulong)(label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize / sectorSize),
+                Start = (ulong)((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) * label.dl_dt.d_secsize /
+                                sectorSize),
+                Scheme = Name
+            };
 
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_base = {1}", i,
-                                           label.dl_dt.d_partitions[i].p_base);
+            if(part.Start + part.Length > imagePlugin.Info.Sectors)
+            {
+                AaruConsole.DebugWriteLine("NeXT Plugin", "Partition bigger than device, reducing...");
+                part.Length = imagePlugin.Info.Sectors - part.Start;
+                part.Size   = part.Length * sectorSize;
 
                 AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_size = {1}", i,
-                                           label.dl_dt.d_partitions[i].p_size);
-
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_bsize = {1}", i,
-                                           label.dl_dt.d_partitions[i].p_bsize);
-
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_fsize = {1}", i,
-                                           label.dl_dt.d_partitions[i].p_fsize);
-
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_opt = {1}", i,
-                                           label.dl_dt.d_partitions[i].p_opt);
-
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_cpg = {1}", i,
-                                           label.dl_dt.d_partitions[i].p_cpg);
-
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_density = {1}", i,
-                                           label.dl_dt.d_partitions[i].p_density);
-
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_minfree = {1}", i,
-                                           label.dl_dt.d_partitions[i].p_minfree);
-
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_newfs = {1}", i,
-                                           label.dl_dt.d_partitions[i].p_newfs);
-
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_mountpt = \"{1}\"", i,
-                                           StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt));
-
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_automnt = {1}", i,
-                                           label.dl_dt.d_partitions[i].p_automnt);
-
-                AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_type = \"{1}\"", i,
-                                           StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type));
-
-                if(label.dl_dt.d_partitions[i].p_size  <= 0 ||
-                   label.dl_dt.d_partitions[i].p_base  < 0  ||
-                   label.dl_dt.d_partitions[i].p_bsize < 0)
-                    continue;
-
-                var sb = new StringBuilder();
-
-                var part = new Partition
-                {
-                    Size = (ulong)(label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize),
-                    Offset =
-                        (ulong)((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) * label.dl_dt.d_secsize),
-                    Type     = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_type),
-                    Sequence = (ulong)i,
-                    Name     = StringHandlers.CToString(label.dl_dt.d_partitions[i].p_mountpt),
-                    Length   = (ulong)(label.dl_dt.d_partitions[i].p_size * label.dl_dt.d_secsize / sectorSize),
-                    Start = (ulong)((label.dl_dt.d_partitions[i].p_base + label.dl_dt.d_front) * label.dl_dt.d_secsize /
-                                    sectorSize),
-                    Scheme = Name
-                };
-
-                if(part.Start + part.Length > imagePlugin.Info.Sectors)
-                {
-                    AaruConsole.DebugWriteLine("NeXT Plugin", "Partition bigger than device, reducing...");
-                    part.Length = imagePlugin.Info.Sectors - part.Start;
-                    part.Size   = part.Length * sectorSize;
-
-                    AaruConsole.DebugWriteLine("NeXT Plugin", "label.dl_dt.d_partitions[{0}].p_size = {1}", i,
-                                               part.Length);
-                }
-
-                sb.AppendFormat("{0} bytes per block", label.dl_dt.d_partitions[i].p_bsize).AppendLine();
-                sb.AppendFormat("{0} bytes per fragment", label.dl_dt.d_partitions[i].p_fsize).AppendLine();
-
-                if(label.dl_dt.d_partitions[i].p_opt == 's')
-                    sb.AppendLine("Space optimized");
-                else if(label.dl_dt.d_partitions[i].p_opt == 't')
-                    sb.AppendLine("Time optimized");
-                else
-                    sb.AppendFormat("Unknown optimization {0:X2}", label.dl_dt.d_partitions[i].p_opt).AppendLine();
-
-                sb.AppendFormat("{0} cylinders per group", label.dl_dt.d_partitions[i].p_cpg).AppendLine();
-                sb.AppendFormat("{0} bytes per inode", label.dl_dt.d_partitions[i].p_density).AppendLine();
-
-                sb.AppendFormat("{0}% of space must be free at minimum", label.dl_dt.d_partitions[i].p_minfree).
-                   AppendLine();
-
-                if(label.dl_dt.d_partitions[i].p_newfs != 1)
-                    sb.AppendLine("Filesystem should be formatted at start");
-
-                if(label.dl_dt.d_partitions[i].p_automnt == 1)
-                    sb.AppendLine("Filesystem should be automatically mounted");
-
-                part.Description = sb.ToString();
-
-                partitions.Add(part);
+                                           part.Length);
             }
 
-            return true;
+            sb.AppendFormat("{0} bytes per block", label.dl_dt.d_partitions[i].p_bsize).AppendLine();
+            sb.AppendFormat("{0} bytes per fragment", label.dl_dt.d_partitions[i].p_fsize).AppendLine();
+
+            if(label.dl_dt.d_partitions[i].p_opt == 's')
+                sb.AppendLine("Space optimized");
+            else if(label.dl_dt.d_partitions[i].p_opt == 't')
+                sb.AppendLine("Time optimized");
+            else
+                sb.AppendFormat("Unknown optimization {0:X2}", label.dl_dt.d_partitions[i].p_opt).AppendLine();
+
+            sb.AppendFormat("{0} cylinders per group", label.dl_dt.d_partitions[i].p_cpg).AppendLine();
+            sb.AppendFormat("{0} bytes per inode", label.dl_dt.d_partitions[i].p_density).AppendLine();
+
+            sb.AppendFormat("{0}% of space must be free at minimum", label.dl_dt.d_partitions[i].p_minfree).
+               AppendLine();
+
+            if(label.dl_dt.d_partitions[i].p_newfs != 1)
+                sb.AppendLine("Filesystem should be formatted at start");
+
+            if(label.dl_dt.d_partitions[i].p_automnt == 1)
+                sb.AppendLine("Filesystem should be automatically mounted");
+
+            part.Description = sb.ToString();
+
+            partitions.Add(part);
         }
 
-        /// <summary>NeXT v3 disklabel, 544 bytes</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Label
-        {
-            /// <summary>Signature</summary>
-            public readonly uint dl_version;
-            /// <summary>Block on which this label resides</summary>
-            public readonly int dl_label_blkno;
-            /// <summary>Device size in blocks</summary>
-            public readonly int dl_size;
-            /// <summary>Device name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
-            public readonly byte[] dl_label;
-            /// <summary>Device flags</summary>
-            public readonly uint dl_flags;
-            /// <summary>Device tag</summary>
-            public readonly uint dl_tag;
-            /// <summary>Device info and partitions</summary>
-            public DiskTab dl_dt;
-            /// <summary>Checksum</summary>
-            public readonly ushort dl_v3_checksum;
-        }
+        return true;
+    }
 
-        /// <summary>NeXT v1 and v2 disklabel, 7224 bytes</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct LabelOld
-        {
-            /// <summary>Signature</summary>
-            public readonly uint dl_version;
-            /// <summary>Block on which this label resides</summary>
-            public readonly int dl_label_blkno;
-            /// <summary>Device size in blocks</summary>
-            public readonly int dl_size;
-            /// <summary>Device name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
-            public readonly byte[] dl_label;
-            /// <summary>Device flags</summary>
-            public readonly uint dl_flags;
-            /// <summary>Device tag</summary>
-            public readonly uint dl_tag;
-            /// <summary>Device info and partitions</summary>
-            public readonly DiskTab dl_dt;
-            /// <summary>Bad sector table</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1670)]
-            public readonly int[] dl_bad;
-            /// <summary>Checksum</summary>
-            public readonly ushort dl_checksum;
-        }
+    /// <summary>NeXT v3 disklabel, 544 bytes</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Label
+    {
+        /// <summary>Signature</summary>
+        public readonly uint dl_version;
+        /// <summary>Block on which this label resides</summary>
+        public readonly int dl_label_blkno;
+        /// <summary>Device size in blocks</summary>
+        public readonly int dl_size;
+        /// <summary>Device name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
+        public readonly byte[] dl_label;
+        /// <summary>Device flags</summary>
+        public readonly uint dl_flags;
+        /// <summary>Device tag</summary>
+        public readonly uint dl_tag;
+        /// <summary>Device info and partitions</summary>
+        public DiskTab dl_dt;
+        /// <summary>Checksum</summary>
+        public readonly ushort dl_v3_checksum;
+    }
 
-        /// <summary>NeXT disktab and partitions, 498 bytes</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct DiskTab
-        {
-            /// <summary>Drive name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
-            public readonly byte[] d_name;
-            /// <summary>Drive type</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
-            public readonly byte[] d_type;
-            /// <summary>Sector size</summary>
-            public readonly int d_secsize;
-            /// <summary>tracks/cylinder</summary>
-            public readonly int d_ntracks;
-            /// <summary>sectors/track</summary>
-            public readonly int d_nsectors;
-            /// <summary>cylinders</summary>
-            public readonly int d_ncylinders;
-            /// <summary>revolutions/minute</summary>
-            public readonly int d_rpm;
-            /// <summary>size of front porch in sectors</summary>
-            public readonly short d_front;
-            /// <summary>size of back porch in sectors</summary>
-            public readonly short d_back;
-            /// <summary>number of alt groups</summary>
-            public readonly short d_ngroups;
-            /// <summary>alt group size in sectors</summary>
-            public readonly short d_ag_size;
-            /// <summary>alternate sectors per alt group</summary>
-            public readonly short d_ag_alts;
-            /// <summary>sector offset to first alternate</summary>
-            public readonly short d_ag_off;
-            /// <summary>"blk 0" boot locations</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly int[] d_boot0_blkno;
-            /// <summary>default bootfile</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
-            public readonly byte[] d_bootfile;
-            /// <summary>host name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
-            public readonly byte[] d_hostname;
-            /// <summary>root partition</summary>
-            public readonly byte d_rootpartition;
-            /// <summary>r/w partition</summary>
-            public readonly byte d_rwpartition;
-            /// <summary>partitions</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public Entry[] d_partitions;
-        }
+    /// <summary>NeXT v1 and v2 disklabel, 7224 bytes</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct LabelOld
+    {
+        /// <summary>Signature</summary>
+        public readonly uint dl_version;
+        /// <summary>Block on which this label resides</summary>
+        public readonly int dl_label_blkno;
+        /// <summary>Device size in blocks</summary>
+        public readonly int dl_size;
+        /// <summary>Device name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
+        public readonly byte[] dl_label;
+        /// <summary>Device flags</summary>
+        public readonly uint dl_flags;
+        /// <summary>Device tag</summary>
+        public readonly uint dl_tag;
+        /// <summary>Device info and partitions</summary>
+        public readonly DiskTab dl_dt;
+        /// <summary>Bad sector table</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 1670)]
+        public readonly int[] dl_bad;
+        /// <summary>Checksum</summary>
+        public readonly ushort dl_checksum;
+    }
 
-        /// <summary>Partition entries, 44 bytes each</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 2)]
-        struct Entry
-        {
-            /// <summary>Sector of start, counting from front porch</summary>
-            public readonly int p_base;
-            /// <summary>Length in sectors</summary>
-            public readonly int p_size;
-            /// <summary>Filesystem's block size</summary>
-            public readonly short p_bsize;
-            /// <summary>Filesystem's fragment size</summary>
-            public readonly short p_fsize;
-            /// <summary>'s'pace or 't'ime</summary>
-            public readonly byte p_opt;
-            /// <summary>Cylinders per group</summary>
-            public readonly short p_cpg;
-            /// <summary>Bytes per inode</summary>
-            public readonly short p_density;
-            /// <summary>% of minimum free space</summary>
-            public readonly byte p_minfree;
-            /// <summary>Should newfs be run on first start?</summary>
-            public readonly byte p_newfs;
-            /// <summary>Mount point or empty if mount where you want</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] p_mountpt;
-            /// <summary>Should automount</summary>
-            public readonly byte p_automnt;
-            /// <summary>Filesystem type, always "4.3BSD"?</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] p_type;
-        }
+    /// <summary>NeXT disktab and partitions, 498 bytes</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct DiskTab
+    {
+        /// <summary>Drive name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
+        public readonly byte[] d_name;
+        /// <summary>Drive type</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
+        public readonly byte[] d_type;
+        /// <summary>Sector size</summary>
+        public readonly int d_secsize;
+        /// <summary>tracks/cylinder</summary>
+        public readonly int d_ntracks;
+        /// <summary>sectors/track</summary>
+        public readonly int d_nsectors;
+        /// <summary>cylinders</summary>
+        public readonly int d_ncylinders;
+        /// <summary>revolutions/minute</summary>
+        public readonly int d_rpm;
+        /// <summary>size of front porch in sectors</summary>
+        public readonly short d_front;
+        /// <summary>size of back porch in sectors</summary>
+        public readonly short d_back;
+        /// <summary>number of alt groups</summary>
+        public readonly short d_ngroups;
+        /// <summary>alt group size in sectors</summary>
+        public readonly short d_ag_size;
+        /// <summary>alternate sectors per alt group</summary>
+        public readonly short d_ag_alts;
+        /// <summary>sector offset to first alternate</summary>
+        public readonly short d_ag_off;
+        /// <summary>"blk 0" boot locations</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly int[] d_boot0_blkno;
+        /// <summary>default bootfile</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 24)]
+        public readonly byte[] d_bootfile;
+        /// <summary>host name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 32)]
+        public readonly byte[] d_hostname;
+        /// <summary>root partition</summary>
+        public readonly byte d_rootpartition;
+        /// <summary>r/w partition</summary>
+        public readonly byte d_rwpartition;
+        /// <summary>partitions</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public Entry[] d_partitions;
+    }
+
+    /// <summary>Partition entries, 44 bytes each</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 2)]
+    struct Entry
+    {
+        /// <summary>Sector of start, counting from front porch</summary>
+        public readonly int p_base;
+        /// <summary>Length in sectors</summary>
+        public readonly int p_size;
+        /// <summary>Filesystem's block size</summary>
+        public readonly short p_bsize;
+        /// <summary>Filesystem's fragment size</summary>
+        public readonly short p_fsize;
+        /// <summary>'s'pace or 't'ime</summary>
+        public readonly byte p_opt;
+        /// <summary>Cylinders per group</summary>
+        public readonly short p_cpg;
+        /// <summary>Bytes per inode</summary>
+        public readonly short p_density;
+        /// <summary>% of minimum free space</summary>
+        public readonly byte p_minfree;
+        /// <summary>Should newfs be run on first start?</summary>
+        public readonly byte p_newfs;
+        /// <summary>Mount point or empty if mount where you want</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] p_mountpt;
+        /// <summary>Should automount</summary>
+        public readonly byte p_automnt;
+        /// <summary>Filesystem type, always "4.3BSD"?</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] p_type;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/PC98.cs b/Aaru.Partitions/PC98.cs
index 7b78e3bc9..066da1beb 100644
--- a/Aaru.Partitions/PC98.cs
+++ b/Aaru.Partitions/PC98.cs
@@ -40,162 +40,161 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of NEC PC-9800 partitions</summary>
+public sealed class PC98 : IPartition
 {
     /// <inheritdoc />
-    /// <summary>Implements decoding of NEC PC-9800 partitions</summary>
-    public sealed class PC98 : IPartition
+    public string Name => "NEC PC-9800 partition table";
+    /// <inheritdoc />
+    public Guid Id => new("27333401-C7C2-447D-961C-22AD0641A09A");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<CommonTypes.Partition> partitions,
+                               ulong sectorOffset)
     {
-        /// <inheritdoc />
-        public string Name => "NEC PC-9800 partition table";
-        /// <inheritdoc />
-        public Guid Id => new("27333401-C7C2-447D-961C-22AD0641A09A");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        partitions = new List<CommonTypes.Partition>();
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<CommonTypes.Partition> partitions,
-                                   ulong sectorOffset)
+        if(sectorOffset != 0)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] bootSector);
+
+        if(errno          != ErrorNumber.NoError ||
+           bootSector[^2] != 0x55                ||
+           bootSector[^1] != 0xAA)
+            return false;
+
+        errno = imagePlugin.ReadSector(1, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        // Prevent false positives with some FAT BPBs
+        if(Encoding.ASCII.GetString(bootSector, 0x36, 3) == "FAT")
+            return false;
+
+        Table table = Marshal.ByteArrayToStructureLittleEndian<Table>(sector);
+
+        ulong counter = 0;
+
+        foreach(Partition entry in table.entries)
         {
-            partitions = new List<CommonTypes.Partition>();
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_mid = {0}", entry.dp_mid);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_sid = {0}", entry.dp_sid);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_dum1 = {0}", entry.dp_dum1);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_dum2 = {0}", entry.dp_dum2);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_sct = {0}", entry.dp_ipl_sct);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_head = {0}", entry.dp_ipl_head);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_cyl = {0}", entry.dp_ipl_cyl);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ssect = {0}", entry.dp_ssect);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_shd = {0}", entry.dp_shd);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_scyl = {0}", entry.dp_scyl);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_esect = {0}", entry.dp_esect);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ehd = {0}", entry.dp_ehd);
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ecyl = {0}", entry.dp_ecyl);
 
-            if(sectorOffset != 0)
-                return false;
+            AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_name = \"{0}\"",
+                                       StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)));
 
-            ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] bootSector);
+            if(entry.dp_scyl  == entry.dp_ecyl                   ||
+               entry.dp_ecyl  <= 0                               ||
+               entry.dp_scyl  > imagePlugin.Info.Cylinders       ||
+               entry.dp_ecyl  > imagePlugin.Info.Cylinders       ||
+               entry.dp_shd   > imagePlugin.Info.Heads           ||
+               entry.dp_ehd   > imagePlugin.Info.Heads           ||
+               entry.dp_ssect > imagePlugin.Info.SectorsPerTrack ||
+               entry.dp_esect > imagePlugin.Info.SectorsPerTrack)
+                continue;
 
-            if(errno          != ErrorNumber.NoError ||
-               bootSector[^2] != 0x55                ||
-               bootSector[^1] != 0xAA)
-                return false;
-
-            errno = imagePlugin.ReadSector(1, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            // Prevent false positives with some FAT BPBs
-            if(Encoding.ASCII.GetString(bootSector, 0x36, 3) == "FAT")
-                return false;
-
-            Table table = Marshal.ByteArrayToStructureLittleEndian<Table>(sector);
-
-            ulong counter = 0;
-
-            foreach(Partition entry in table.entries)
+            var part = new CommonTypes.Partition
             {
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_mid = {0}", entry.dp_mid);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_sid = {0}", entry.dp_sid);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_dum1 = {0}", entry.dp_dum1);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_dum2 = {0}", entry.dp_dum2);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_sct = {0}", entry.dp_ipl_sct);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_head = {0}", entry.dp_ipl_head);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ipl_cyl = {0}", entry.dp_ipl_cyl);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ssect = {0}", entry.dp_ssect);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_shd = {0}", entry.dp_shd);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_scyl = {0}", entry.dp_scyl);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_esect = {0}", entry.dp_esect);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ehd = {0}", entry.dp_ehd);
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_ecyl = {0}", entry.dp_ecyl);
+                Start = CHS.ToLBA(entry.dp_scyl, entry.dp_shd, (uint)(entry.dp_ssect + 1), imagePlugin.Info.Heads,
+                                  imagePlugin.Info.SectorsPerTrack),
+                Type     = DecodePC98Sid(entry.dp_sid),
+                Name     = StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)).Trim(),
+                Sequence = counter,
+                Scheme   = Name
+            };
 
-                AaruConsole.DebugWriteLine("PC98 plugin", "entry.dp_name = \"{0}\"",
-                                           StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)));
+            part.Offset = part.Start * imagePlugin.Info.SectorSize;
 
-                if(entry.dp_scyl  == entry.dp_ecyl                   ||
-                   entry.dp_ecyl  <= 0                               ||
-                   entry.dp_scyl  > imagePlugin.Info.Cylinders       ||
-                   entry.dp_ecyl  > imagePlugin.Info.Cylinders       ||
-                   entry.dp_shd   > imagePlugin.Info.Heads           ||
-                   entry.dp_ehd   > imagePlugin.Info.Heads           ||
-                   entry.dp_ssect > imagePlugin.Info.SectorsPerTrack ||
-                   entry.dp_esect > imagePlugin.Info.SectorsPerTrack)
-                    continue;
+            part.Length = CHS.ToLBA(entry.dp_ecyl, entry.dp_ehd, (uint)(entry.dp_esect + 1), imagePlugin.Info.Heads,
+                                    imagePlugin.Info.SectorsPerTrack) - part.Start;
 
-                var part = new CommonTypes.Partition
-                {
-                    Start = CHS.ToLBA(entry.dp_scyl, entry.dp_shd, (uint)(entry.dp_ssect + 1), imagePlugin.Info.Heads,
-                                      imagePlugin.Info.SectorsPerTrack),
-                    Type     = DecodePC98Sid(entry.dp_sid),
-                    Name     = StringHandlers.CToString(entry.dp_name, Encoding.GetEncoding(932)).Trim(),
-                    Sequence = counter,
-                    Scheme   = Name
-                };
+            part.Size = part.Length * imagePlugin.Info.SectorSize;
 
-                part.Offset = part.Start * imagePlugin.Info.SectorSize;
+            AaruConsole.DebugWriteLine("PC98 plugin", "part.Start = {0}", part.Start);
+            AaruConsole.DebugWriteLine("PC98 plugin", "part.Type = {0}", part.Type);
+            AaruConsole.DebugWriteLine("PC98 plugin", "part.Name = {0}", part.Name);
+            AaruConsole.DebugWriteLine("PC98 plugin", "part.Sequence = {0}", part.Sequence);
+            AaruConsole.DebugWriteLine("PC98 plugin", "part.Offset = {0}", part.Offset);
+            AaruConsole.DebugWriteLine("PC98 plugin", "part.Length = {0}", part.Length);
+            AaruConsole.DebugWriteLine("PC98 plugin", "part.Size = {0}", part.Size);
 
-                part.Length = CHS.ToLBA(entry.dp_ecyl, entry.dp_ehd, (uint)(entry.dp_esect + 1), imagePlugin.Info.Heads,
-                                        imagePlugin.Info.SectorsPerTrack) - part.Start;
+            if(((entry.dp_mid & 0x20) != 0x20 && (entry.dp_mid & 0x44) != 0x44) ||
+               part.Start >= imagePlugin.Info.Sectors                           ||
+               part.End   > imagePlugin.Info.Sectors)
+                continue;
 
-                part.Size = part.Length * imagePlugin.Info.SectorSize;
-
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Start = {0}", part.Start);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Type = {0}", part.Type);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Name = {0}", part.Name);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Sequence = {0}", part.Sequence);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Offset = {0}", part.Offset);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Length = {0}", part.Length);
-                AaruConsole.DebugWriteLine("PC98 plugin", "part.Size = {0}", part.Size);
-
-                if(((entry.dp_mid & 0x20) != 0x20 && (entry.dp_mid & 0x44) != 0x44) ||
-                   part.Start >= imagePlugin.Info.Sectors                           ||
-                   part.End   > imagePlugin.Info.Sectors)
-                    continue;
-
-                partitions.Add(part);
-                counter++;
-            }
-
-            return partitions.Count > 0;
+            partitions.Add(part);
+            counter++;
         }
 
-        static string DecodePC98Sid(byte sid)
-        {
-            switch(sid & 0x7F)
-            {
-                case 0x01: return "FAT12";
-                case 0x04: return "PC-UX";
-                case 0x06: return "N88-BASIC(86)";
+        return partitions.Count > 0;
+    }
 
-                // Supposedly for FAT16 < 32 MiB, seen in bigger partitions
-                case 0x11:
-                case 0x21: return "FAT16";
-                case 0x28:
-                case 0x41:
-                case 0x48: return "Windows Volume Set";
-                case 0x44: return "FreeBSD";
-                case 0x61: return "FAT32";
-                case 0x62: return "Linux";
-                default:   return "Unknown";
-            }
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Table
+    static string DecodePC98Sid(byte sid)
+    {
+        switch(sid & 0x7F)
         {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly Partition[] entries;
-        }
+            case 0x01: return "FAT12";
+            case 0x04: return "PC-UX";
+            case 0x06: return "N88-BASIC(86)";
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Partition
-        {
-            /// <summary>Some ID, if 0x80 bit is set, it is bootable</summary>
-            public readonly byte dp_mid;
-            /// <summary>Some ID, if 0x80 bit is set, it is active</summary>
-            public readonly byte dp_sid;
-            public readonly byte   dp_dum1;
-            public readonly byte   dp_dum2;
-            public readonly byte   dp_ipl_sct;
-            public readonly byte   dp_ipl_head;
-            public readonly ushort dp_ipl_cyl;
-            public readonly byte   dp_ssect;
-            public readonly byte   dp_shd;
-            public readonly ushort dp_scyl;
-            public readonly byte   dp_esect;
-            public readonly byte   dp_ehd;
-            public readonly ushort dp_ecyl;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] dp_name;
+            // Supposedly for FAT16 < 32 MiB, seen in bigger partitions
+            case 0x11:
+            case 0x21: return "FAT16";
+            case 0x28:
+            case 0x41:
+            case 0x48: return "Windows Volume Set";
+            case 0x44: return "FreeBSD";
+            case 0x61: return "FAT32";
+            case 0x62: return "Linux";
+            default:   return "Unknown";
         }
     }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Table
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly Partition[] entries;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Partition
+    {
+        /// <summary>Some ID, if 0x80 bit is set, it is bootable</summary>
+        public readonly byte dp_mid;
+        /// <summary>Some ID, if 0x80 bit is set, it is active</summary>
+        public readonly byte dp_sid;
+        public readonly byte   dp_dum1;
+        public readonly byte   dp_dum2;
+        public readonly byte   dp_ipl_sct;
+        public readonly byte   dp_ipl_head;
+        public readonly ushort dp_ipl_cyl;
+        public readonly byte   dp_ssect;
+        public readonly byte   dp_shd;
+        public readonly ushort dp_scyl;
+        public readonly byte   dp_esect;
+        public readonly byte   dp_ehd;
+        public readonly ushort dp_ecyl;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] dp_name;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Plan9.cs b/Aaru.Partitions/Plan9.cs
index 4d34c7147..6453f796c 100644
--- a/Aaru.Partitions/Plan9.cs
+++ b/Aaru.Partitions/Plan9.cs
@@ -38,62 +38,61 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.Helpers;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+// This is the most stupid or the most intelligent partition scheme ever done, pick or take
+// At sector 1 from offset, text resides (yes, TEXT) in following format:
+// "part type start end\n"
+// One line per partition, start and end relative to offset
+// e.g.: "part nvram 10110 10112\npart fossil 10112 3661056\n"
+/// <inheritdoc />
+/// <summary>Implements decoding of Plan-9 partitions</summary>
+public sealed class Plan9 : IPartition
 {
-    // This is the most stupid or the most intelligent partition scheme ever done, pick or take
-    // At sector 1 from offset, text resides (yes, TEXT) in following format:
-    // "part type start end\n"
-    // One line per partition, start and end relative to offset
-    // e.g.: "part nvram 10110 10112\npart fossil 10112 3661056\n"
     /// <inheritdoc />
-    /// <summary>Implements decoding of Plan-9 partitions</summary>
-    public sealed class Plan9 : IPartition
+    public string Name => "Plan9 partition table";
+    /// <inheritdoc />
+    public Guid Id => new("F0BF4FFC-056E-4E7C-8B65-4EAEE250ADD9");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        /// <inheritdoc />
-        public string Name => "Plan9 partition table";
-        /// <inheritdoc />
-        public Guid Id => new("F0BF4FFC-056E-4E7C-8B65-4EAEE250ADD9");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        partitions = new List<Partition>();
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
+            return false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(sectorOffset + 1, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        // While all of Plan9 is supposedly UTF-8, it uses ASCII strcmp for reading its partition table
+        string[] really = StringHandlers.CToString(sector).Split('\n');
+
+        foreach(string[] tokens in really.TakeWhile(part => part.Length >= 5 && part.Substring(0, 5) == "part ").
+                                          Select(part => part.Split(' ')).TakeWhile(tokens => tokens.Length == 4))
         {
-            partitions = new List<Partition>();
+            if(!ulong.TryParse(tokens[2], out ulong start) ||
+               !ulong.TryParse(tokens[3], out ulong end))
+                break;
 
-            if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(sectorOffset + 1, out byte[] sector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            // While all of Plan9 is supposedly UTF-8, it uses ASCII strcmp for reading its partition table
-            string[] really = StringHandlers.CToString(sector).Split('\n');
-
-            foreach(string[] tokens in really.TakeWhile(part => part.Length >= 5 && part.Substring(0, 5) == "part ").
-                                              Select(part => part.Split(' ')).TakeWhile(tokens => tokens.Length == 4))
+            var part = new Partition
             {
-                if(!ulong.TryParse(tokens[2], out ulong start) ||
-                   !ulong.TryParse(tokens[3], out ulong end))
-                    break;
+                Length   = end - start + 1,
+                Offset   = (start + sectorOffset) * imagePlugin.Info.SectorSize,
+                Scheme   = Name,
+                Sequence = (ulong)partitions.Count,
+                Size     = (end - start + 1) * imagePlugin.Info.SectorSize,
+                Start    = start + sectorOffset,
+                Type     = tokens[1]
+            };
 
-                var part = new Partition
-                {
-                    Length   = end - start + 1,
-                    Offset   = (start + sectorOffset) * imagePlugin.Info.SectorSize,
-                    Scheme   = Name,
-                    Sequence = (ulong)partitions.Count,
-                    Size     = (end - start + 1) * imagePlugin.Info.SectorSize,
-                    Start    = start + sectorOffset,
-                    Type     = tokens[1]
-                };
-
-                partitions.Add(part);
-            }
-
-            return partitions.Count > 0;
+            partitions.Add(part);
         }
+
+        return partitions.Count > 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/RDB.cs b/Aaru.Partitions/RDB.cs
index eb315fdd7..b0506874a 100644
--- a/Aaru.Partitions/RDB.cs
+++ b/Aaru.Partitions/RDB.cs
@@ -44,1145 +44,1144 @@ using Aaru.Helpers;
 
 // ReSharper disable NotAccessedField.Local
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of the Amiga Rigid Disk Block</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class AmigaRigidDiskBlock : IPartition
 {
+    /// <summary>RDB magic number "RDSK"</summary>
+    const uint RIGID_DISK_BLOCK_MAGIC = 0x5244534B;
+    /// <summary>Bad block list magic number "BADB"</summary>
+    const uint BAD_BLOCK_LIST_MAGIC = 0x42414442;
+    /// <summary>Partition entry magic number "PART"</summary>
+    const uint PARTITION_BLOCK_MAGIC = 0x50415254;
+    /// <summary>Filesystem header magic number "FSHD"</summary>
+    const uint FILESYSTEM_HEADER_MAGIC = 0x46534844;
+    /// <summary>LoadSeg block magic number "LSEG"</summary>
+    const uint LOAD_SEG_MAGIC = 0x4C534547;
+
+    /// <summary>Type ID for Amiga Original File System, "DOS\0"</summary>
+    const uint TYPEID_OFS = 0x444F5300;
+    /// <summary>Type ID for Amiga Fast File System, "DOS\1"</summary>
+    const uint TYPEID_FFS = 0x444F5301;
+    /// <summary>Type ID for Amiga Original File System with international characters, "DOS\2"</summary>
+    const uint TYPEID_OFS_INTL = 0x444F5302;
+    /// <summary>Type ID for Amiga Fast File System with international characters, "DOS\3"</summary>
+    const uint TYPEID_FFS_INTL = 0x444F5303;
+    /// <summary>Type ID for Amiga Original File System with directory cache, "DOS\4"</summary>
+    const uint TYPEID_OFS_CACHE = 0x444F5304;
+    /// <summary>Type ID for Amiga Fast File System with directory cache, "DOS\5"</summary>
+    const uint TYPEID_FFS_CACHE = 0x444F5305;
+    /// <summary>Type ID for Amiga Original File System with long filenames, "DOS\6"</summary>
+    const uint TYPEID_OFS2 = 0x444F5306;
+    /// <summary>Type ID for Amiga Fast File System with long filenames, "DOS\7"</summary>
+    const uint TYPEID_FFS2 = 0x444F5307;
+    /// <summary>Type ID for Amiga UNIX boot filesystem</summary>
+    const uint TYPEID_AMIX_BOOT = 0x554E4900;
+    /// <summary>Type ID for Amiga UNIX System V filesystem</summary>
+    const uint TYPEID_AMIX_SYSV = 0x554E4901;
+    /// <summary>Type ID for Amiga UNIX BSD filesystem</summary>
+    const uint TYPEID_AMIX_FFS = 0x554E4902;
+    /// <summary>Type ID for Amiga UNIX Reserved partition (swap)</summary>
+    const uint TYPEID_AMIX_RESERVED = 0x72657376;
+    /// <summary>Type ID for ProfessionalFileSystem, "PFS\1"</summary>
+    const uint TYPEID_PFS = 0x50465301;
+    /// <summary>Type ID for ProfessionalFileSystem, "PFS\2"</summary>
+    const uint TYPEID_PFS2 = 0x50465302;
+    /// <summary>Type ID for ProfessionalFileSystem, "muAF"</summary>
+    const uint TYPEID_PFS_MUSER = 0x6D754146;
+    /// <summary>Type ID for ProfessionalFileSystem, "AFS\1"</summary>
+    const uint TYPEID_AFS = 0x41465301;
+    /// <summary>Type ID for SmartFileSystem v1, "SFS\0"</summary>
+    const uint TYPEID_SFS = 0x53465300;
+    /// <summary>Type ID for SmartFileSystem v2, "SFS\2"</summary>
+    const uint TYPEID_SFS2 = 0x53465302;
+    /// <summary>Type ID for JXFS, "JXF\4"</summary>
+    const uint TYPEID_JXFS = 0x4A584604;
+    /// <summary>Type ID for FAT, as set by CrossDOS, "MSD\0"</summary>
+    const uint TYPEID_CROSS_DOS = 0x4D534400;
+    /// <summary>Type ID for HFS, as set by CrossMac, "MAC\0"</summary>
+    const uint TYPEID_CROSS_MAC = 0x4D414300;
+    /// <summary>Type ID for 4.2UFS, for BFFS, "BFFS"</summary>
+    const uint TYPEID_BFFS = 0x42464653;
+    /// <summary>Type ID for Amiga Original File System with multi-user patches, "muF\0"</summary>
+    const uint TYPEID_OFS_MUSER = 0x6D754600;
+    /// <summary>Type ID for Amiga Fast File System with multi-user patches, "muF\1"</summary>
+    const uint TYPEID_FFS_MUSER = 0x6D754601;
+    /// <summary>Type ID for Amiga Original File System with international characters and multi-user patches, "muF\2"</summary>
+    const uint TYPEID_OFS_INTL_MUSER = 0x6D754602;
+    /// <summary>Type ID for Amiga Fast File System with international characters and multi-user patches, "muF\3"</summary>
+    const uint TYPEID_FFS_INTL_MUSER = 0x6D754603;
+    /// <summary>Type ID for Amiga Original File System with directory cache and multi-user patches, "muF\4"</summary>
+    const uint TYPEID_OFS_CACHE_MUSER = 0x6D754604;
+    /// <summary>Type ID for Amiga Fast File System with directory cache and multi-user patches, "muF\5"</summary>
+    const uint TYPEID_FFS_CACHE_MUSER = 0x6D754605;
+    /// <summary>Type ID for BSD unused, "BSD\0"</summary>
+    const uint TYPEID_OLD_BSD_UNUSED = 0x42534400;
+    /// <summary>Type ID for BSD swap, "BSD\1"</summary>
+    const uint TYPEID_OLD_BSD_SWAP = 0x42534401;
+    /// <summary>Type ID for BSD 4.2 FFS, "BSD\7"</summary>
+    const uint TYPEID_OLD_BSD42_FFS = 0x42534407;
+    /// <summary>Type ID for BSD 4.4 LFS, "BSD\9"</summary>
+    const uint TYPEID_OLD_BSD44_LFS = 0x42534409;
+    /// <summary>Type ID for NetBSD unused root partition, "NBR\0"</summary>
+    const uint TYPEID_NETBSD_ROOT_UNUSED = 0x4E425200;
+    /// <summary>Type ID for NetBSD 4.2 FFS root partition, "NBR\7"</summary>
+
+    // ReSharper disable once InconsistentNaming
+    const uint TYPEID_NETBSD_ROOT_42FFS = 0x4E425207;
+    /// <summary>Type ID for NetBSD 4.4 LFS root partition, "NBR\9"</summary>
+
+    // ReSharper disable once InconsistentNaming
+    const uint TYPEID_NETBSD_ROOT_44LFS = 0x4E425209;
+    /// <summary>Type ID for NetBSD unused user partition, "NBR\0"</summary>
+    const uint TYPEID_NETBSD_USER_UNUSED = 0x4E425500;
+    /// <summary>Type ID for NetBSD 4.2 FFS user partition, "NBR\7"</summary>
+
+    // ReSharper disable once InconsistentNaming
+    const uint TYPEID_NETBSD_USER_42FFS = 0x4E425507;
+    /// <summary>Type ID for NetBSD 4.4 LFS user partition, "NBR\9"</summary>
+
+    // ReSharper disable once InconsistentNaming
+    const uint TYPEID_NETBSD_USER_44LFS = 0x4E425509;
+    /// <summary>Type ID for NetBSD swap partition</summary>
+    const uint TYPEID_NETBSD_SWAP = 0x4E425300;
+    /// <summary>Type ID for Linux filesystem partition, "LNX\0"</summary>
+    const uint TYPEID_LINUX = 0x4C4E5800;
+    /// <summary>Type ID for Linux swap partition, "SWP\0"</summary>
+    const uint TYPEID_LINUX_SWAP = 0x53575000;
+    /// <summary>Type ID for RaidFrame partition, "RAID"</summary>
+    const uint TYPEID_RAID_FRAME = 0x52414944;
+    /// <summary>Type ID for RaidFrame partition, "RAI\0"</summary>
+    const uint TYPEID_RAID_FRAME0 = 0x52414900;
+
+    /// <summary>No disks to be configured after this one</summary>
+    const uint FLAGS_NO_DISKS = 0x00000001;
+    /// <summary>No LUNs to be configured after this one</summary>
+    const uint FLAGS_NO_LUNS = 0x00000002;
+    /// <summary>No target IDs to be configured after this one</summary>
+    const uint FLAGS_NO_TARGETS = 0x00000004;
+    /// <summary>Don't try to perform reselection with this drive</summary>
+    const uint FLAGS_NO_RESELECTION = 0x00000008;
+    /// <summary>Disk identification is valid</summary>
+    const uint FLAGS_VALID_DISK_ID = 0x00000010;
+    /// <summary>Controller identification is valid</summary>
+    const uint FLAGS_VALID_CONTROLLER_ID = 0x00000020;
+    /// <summary>Drive supports synchronous SCSI mode</summary>
+    const uint FLAGS_SYNCH_SCSI = 0x00000040;
+
+    /// <summary>Partition is bootable</summary>
+    const uint FLAGS_BOOTABLE = 0x00000001;
+    /// <summary>Partition should not be mounted automatically</summary>
+    const uint FLAGS_NO_AUTOMOUNT = 0x00000002;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of the Amiga Rigid Disk Block</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class AmigaRigidDiskBlock : IPartition
+    public string Name => "Amiga Rigid Disk Block";
+    /// <inheritdoc />
+    public Guid Id => new("8D72ED97-1854-4170-9CE4-6E8446FD9863");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        /// <summary>RDB magic number "RDSK"</summary>
-        const uint RIGID_DISK_BLOCK_MAGIC = 0x5244534B;
-        /// <summary>Bad block list magic number "BADB"</summary>
-        const uint BAD_BLOCK_LIST_MAGIC = 0x42414442;
-        /// <summary>Partition entry magic number "PART"</summary>
-        const uint PARTITION_BLOCK_MAGIC = 0x50415254;
-        /// <summary>Filesystem header magic number "FSHD"</summary>
-        const uint FILESYSTEM_HEADER_MAGIC = 0x46534844;
-        /// <summary>LoadSeg block magic number "LSEG"</summary>
-        const uint LOAD_SEG_MAGIC = 0x4C534547;
+        partitions = new List<Partition>();
+        ulong       rdbBlock = 0;
+        bool        foundRdb = false;
+        ErrorNumber errno;
 
-        /// <summary>Type ID for Amiga Original File System, "DOS\0"</summary>
-        const uint TYPEID_OFS = 0x444F5300;
-        /// <summary>Type ID for Amiga Fast File System, "DOS\1"</summary>
-        const uint TYPEID_FFS = 0x444F5301;
-        /// <summary>Type ID for Amiga Original File System with international characters, "DOS\2"</summary>
-        const uint TYPEID_OFS_INTL = 0x444F5302;
-        /// <summary>Type ID for Amiga Fast File System with international characters, "DOS\3"</summary>
-        const uint TYPEID_FFS_INTL = 0x444F5303;
-        /// <summary>Type ID for Amiga Original File System with directory cache, "DOS\4"</summary>
-        const uint TYPEID_OFS_CACHE = 0x444F5304;
-        /// <summary>Type ID for Amiga Fast File System with directory cache, "DOS\5"</summary>
-        const uint TYPEID_FFS_CACHE = 0x444F5305;
-        /// <summary>Type ID for Amiga Original File System with long filenames, "DOS\6"</summary>
-        const uint TYPEID_OFS2 = 0x444F5306;
-        /// <summary>Type ID for Amiga Fast File System with long filenames, "DOS\7"</summary>
-        const uint TYPEID_FFS2 = 0x444F5307;
-        /// <summary>Type ID for Amiga UNIX boot filesystem</summary>
-        const uint TYPEID_AMIX_BOOT = 0x554E4900;
-        /// <summary>Type ID for Amiga UNIX System V filesystem</summary>
-        const uint TYPEID_AMIX_SYSV = 0x554E4901;
-        /// <summary>Type ID for Amiga UNIX BSD filesystem</summary>
-        const uint TYPEID_AMIX_FFS = 0x554E4902;
-        /// <summary>Type ID for Amiga UNIX Reserved partition (swap)</summary>
-        const uint TYPEID_AMIX_RESERVED = 0x72657376;
-        /// <summary>Type ID for ProfessionalFileSystem, "PFS\1"</summary>
-        const uint TYPEID_PFS = 0x50465301;
-        /// <summary>Type ID for ProfessionalFileSystem, "PFS\2"</summary>
-        const uint TYPEID_PFS2 = 0x50465302;
-        /// <summary>Type ID for ProfessionalFileSystem, "muAF"</summary>
-        const uint TYPEID_PFS_MUSER = 0x6D754146;
-        /// <summary>Type ID for ProfessionalFileSystem, "AFS\1"</summary>
-        const uint TYPEID_AFS = 0x41465301;
-        /// <summary>Type ID for SmartFileSystem v1, "SFS\0"</summary>
-        const uint TYPEID_SFS = 0x53465300;
-        /// <summary>Type ID for SmartFileSystem v2, "SFS\2"</summary>
-        const uint TYPEID_SFS2 = 0x53465302;
-        /// <summary>Type ID for JXFS, "JXF\4"</summary>
-        const uint TYPEID_JXFS = 0x4A584604;
-        /// <summary>Type ID for FAT, as set by CrossDOS, "MSD\0"</summary>
-        const uint TYPEID_CROSS_DOS = 0x4D534400;
-        /// <summary>Type ID for HFS, as set by CrossMac, "MAC\0"</summary>
-        const uint TYPEID_CROSS_MAC = 0x4D414300;
-        /// <summary>Type ID for 4.2UFS, for BFFS, "BFFS"</summary>
-        const uint TYPEID_BFFS = 0x42464653;
-        /// <summary>Type ID for Amiga Original File System with multi-user patches, "muF\0"</summary>
-        const uint TYPEID_OFS_MUSER = 0x6D754600;
-        /// <summary>Type ID for Amiga Fast File System with multi-user patches, "muF\1"</summary>
-        const uint TYPEID_FFS_MUSER = 0x6D754601;
-        /// <summary>Type ID for Amiga Original File System with international characters and multi-user patches, "muF\2"</summary>
-        const uint TYPEID_OFS_INTL_MUSER = 0x6D754602;
-        /// <summary>Type ID for Amiga Fast File System with international characters and multi-user patches, "muF\3"</summary>
-        const uint TYPEID_FFS_INTL_MUSER = 0x6D754603;
-        /// <summary>Type ID for Amiga Original File System with directory cache and multi-user patches, "muF\4"</summary>
-        const uint TYPEID_OFS_CACHE_MUSER = 0x6D754604;
-        /// <summary>Type ID for Amiga Fast File System with directory cache and multi-user patches, "muF\5"</summary>
-        const uint TYPEID_FFS_CACHE_MUSER = 0x6D754605;
-        /// <summary>Type ID for BSD unused, "BSD\0"</summary>
-        const uint TYPEID_OLD_BSD_UNUSED = 0x42534400;
-        /// <summary>Type ID for BSD swap, "BSD\1"</summary>
-        const uint TYPEID_OLD_BSD_SWAP = 0x42534401;
-        /// <summary>Type ID for BSD 4.2 FFS, "BSD\7"</summary>
-        const uint TYPEID_OLD_BSD42_FFS = 0x42534407;
-        /// <summary>Type ID for BSD 4.4 LFS, "BSD\9"</summary>
-        const uint TYPEID_OLD_BSD44_LFS = 0x42534409;
-        /// <summary>Type ID for NetBSD unused root partition, "NBR\0"</summary>
-        const uint TYPEID_NETBSD_ROOT_UNUSED = 0x4E425200;
-        /// <summary>Type ID for NetBSD 4.2 FFS root partition, "NBR\7"</summary>
-
-        // ReSharper disable once InconsistentNaming
-        const uint TYPEID_NETBSD_ROOT_42FFS = 0x4E425207;
-        /// <summary>Type ID for NetBSD 4.4 LFS root partition, "NBR\9"</summary>
-
-        // ReSharper disable once InconsistentNaming
-        const uint TYPEID_NETBSD_ROOT_44LFS = 0x4E425209;
-        /// <summary>Type ID for NetBSD unused user partition, "NBR\0"</summary>
-        const uint TYPEID_NETBSD_USER_UNUSED = 0x4E425500;
-        /// <summary>Type ID for NetBSD 4.2 FFS user partition, "NBR\7"</summary>
-
-        // ReSharper disable once InconsistentNaming
-        const uint TYPEID_NETBSD_USER_42FFS = 0x4E425507;
-        /// <summary>Type ID for NetBSD 4.4 LFS user partition, "NBR\9"</summary>
-
-        // ReSharper disable once InconsistentNaming
-        const uint TYPEID_NETBSD_USER_44LFS = 0x4E425509;
-        /// <summary>Type ID for NetBSD swap partition</summary>
-        const uint TYPEID_NETBSD_SWAP = 0x4E425300;
-        /// <summary>Type ID for Linux filesystem partition, "LNX\0"</summary>
-        const uint TYPEID_LINUX = 0x4C4E5800;
-        /// <summary>Type ID for Linux swap partition, "SWP\0"</summary>
-        const uint TYPEID_LINUX_SWAP = 0x53575000;
-        /// <summary>Type ID for RaidFrame partition, "RAID"</summary>
-        const uint TYPEID_RAID_FRAME = 0x52414944;
-        /// <summary>Type ID for RaidFrame partition, "RAI\0"</summary>
-        const uint TYPEID_RAID_FRAME0 = 0x52414900;
-
-        /// <summary>No disks to be configured after this one</summary>
-        const uint FLAGS_NO_DISKS = 0x00000001;
-        /// <summary>No LUNs to be configured after this one</summary>
-        const uint FLAGS_NO_LUNS = 0x00000002;
-        /// <summary>No target IDs to be configured after this one</summary>
-        const uint FLAGS_NO_TARGETS = 0x00000004;
-        /// <summary>Don't try to perform reselection with this drive</summary>
-        const uint FLAGS_NO_RESELECTION = 0x00000008;
-        /// <summary>Disk identification is valid</summary>
-        const uint FLAGS_VALID_DISK_ID = 0x00000010;
-        /// <summary>Controller identification is valid</summary>
-        const uint FLAGS_VALID_CONTROLLER_ID = 0x00000020;
-        /// <summary>Drive supports synchronous SCSI mode</summary>
-        const uint FLAGS_SYNCH_SCSI = 0x00000040;
-
-        /// <summary>Partition is bootable</summary>
-        const uint FLAGS_BOOTABLE = 0x00000001;
-        /// <summary>Partition should not be mounted automatically</summary>
-        const uint FLAGS_NO_AUTOMOUNT = 0x00000002;
-
-        /// <inheritdoc />
-        public string Name => "Amiga Rigid Disk Block";
-        /// <inheritdoc />
-        public Guid Id => new("8D72ED97-1854-4170-9CE4-6E8446FD9863");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        while(rdbBlock < 16)
         {
-            partitions = new List<Partition>();
-            ulong       rdbBlock = 0;
-            bool        foundRdb = false;
-            ErrorNumber errno;
-
-            while(rdbBlock < 16)
-            {
-                if(imagePlugin.Info.Sectors <= rdbBlock)
-                    return false;
-
-                if(rdbBlock + sectorOffset >= imagePlugin.Info.Sectors)
-                    break;
-
-                errno = imagePlugin.ReadSector(rdbBlock + sectorOffset, out byte[] tmpSector);
-
-                if(errno != ErrorNumber.NoError)
-                {
-                    rdbBlock++;
-
-                    continue;
-                }
-
-                uint magic = BigEndianBitConverter.ToUInt32(tmpSector, 0);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "Possible magic at block {0} is 0x{1:X8}", rdbBlock,
-                                           magic);
-
-                if(magic == RIGID_DISK_BLOCK_MAGIC)
-                {
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found RDB magic at block {0}", rdbBlock);
-
-                    foundRdb = true;
-
-                    break;
-                }
-
-                rdbBlock++;
-            }
-
-            if(!foundRdb)
+            if(imagePlugin.Info.Sectors <= rdbBlock)
                 return false;
 
-            rdbBlock += sectorOffset;
+            if(rdbBlock + sectorOffset >= imagePlugin.Info.Sectors)
+                break;
 
-            var rdb = new RigidDiskBlock();
-
-            errno = imagePlugin.ReadSector(rdbBlock, out byte[] sector);
+            errno = imagePlugin.ReadSector(rdbBlock + sectorOffset, out byte[] tmpSector);
 
             if(errno != ErrorNumber.NoError)
-                return false;
+            {
+                rdbBlock++;
 
-            rdb.Magic           = BigEndianBitConverter.ToUInt32(sector, 0x00);
-            rdb.Size            = BigEndianBitConverter.ToUInt32(sector, 0x04);
-            rdb.Checksum        = BigEndianBitConverter.ToInt32(sector, 0x08);
-            rdb.TargetId        = BigEndianBitConverter.ToUInt32(sector, 0x0C);
-            rdb.BlockSize       = BigEndianBitConverter.ToUInt32(sector, 0x10);
-            rdb.Flags           = BigEndianBitConverter.ToUInt32(sector, 0x04);
-            rdb.BadblockPtr     = BigEndianBitConverter.ToUInt32(sector, 0x18);
-            rdb.PartitionPtr    = BigEndianBitConverter.ToUInt32(sector, 0x1C);
-            rdb.FsheaderPtr     = BigEndianBitConverter.ToUInt32(sector, 0x20);
-            rdb.Driveinitcode   = BigEndianBitConverter.ToUInt32(sector, 0x24);
-            rdb.Reserved1       = BigEndianBitConverter.ToUInt32(sector, 0x28);
-            rdb.Reserved2       = BigEndianBitConverter.ToUInt32(sector, 0x2C);
-            rdb.Reserved3       = BigEndianBitConverter.ToUInt32(sector, 0x30);
-            rdb.Reserved4       = BigEndianBitConverter.ToUInt32(sector, 0x34);
-            rdb.Reserved5       = BigEndianBitConverter.ToUInt32(sector, 0x38);
-            rdb.Reserved6       = BigEndianBitConverter.ToUInt32(sector, 0x3C);
-            rdb.Cylinders       = BigEndianBitConverter.ToUInt32(sector, 0x40);
-            rdb.Spt             = BigEndianBitConverter.ToUInt32(sector, 0x44);
-            rdb.Heads           = BigEndianBitConverter.ToUInt32(sector, 0x48);
-            rdb.Interleave      = BigEndianBitConverter.ToUInt32(sector, 0x4C);
-            rdb.Parking         = BigEndianBitConverter.ToUInt32(sector, 0x50);
-            rdb.Reserved7       = BigEndianBitConverter.ToUInt32(sector, 0x54);
-            rdb.Reserved8       = BigEndianBitConverter.ToUInt32(sector, 0x58);
-            rdb.Reserved9       = BigEndianBitConverter.ToUInt32(sector, 0x5C);
-            rdb.Writeprecomp    = BigEndianBitConverter.ToUInt32(sector, 0x60);
-            rdb.Reducedwrite    = BigEndianBitConverter.ToUInt32(sector, 0x64);
-            rdb.Steprate        = BigEndianBitConverter.ToUInt32(sector, 0x68);
-            rdb.Reserved10      = BigEndianBitConverter.ToUInt32(sector, 0x6C);
-            rdb.Reserved11      = BigEndianBitConverter.ToUInt32(sector, 0x70);
-            rdb.Reserved12      = BigEndianBitConverter.ToUInt32(sector, 0x74);
-            rdb.Reserved13      = BigEndianBitConverter.ToUInt32(sector, 0x78);
-            rdb.Reserved14      = BigEndianBitConverter.ToUInt32(sector, 0x7C);
-            rdb.RdbBlockLow     = BigEndianBitConverter.ToUInt32(sector, 0x80);
-            rdb.RdbBlockHigh    = BigEndianBitConverter.ToUInt32(sector, 0x84);
-            rdb.LowCylinder     = BigEndianBitConverter.ToUInt32(sector, 0x88);
-            rdb.HighCylinder    = BigEndianBitConverter.ToUInt32(sector, 0x8C);
-            rdb.CylBlocks       = BigEndianBitConverter.ToUInt32(sector, 0x90);
-            rdb.AutoParkSeconds = BigEndianBitConverter.ToUInt32(sector, 0x94);
-            rdb.HighCylinder    = BigEndianBitConverter.ToUInt32(sector, 0x98);
-            rdb.Reserved15      = BigEndianBitConverter.ToUInt32(sector, 0x9C);
+                continue;
+            }
 
-            byte[] tmpString = new byte[8];
-            Array.Copy(sector, 0xA0, tmpString, 0, 8);
-            rdb.DiskVendor = StringHandlers.SpacePaddedToString(tmpString);
-            tmpString      = new byte[16];
-            Array.Copy(sector, 0xA8, tmpString, 0, 16);
-            rdb.DiskProduct = StringHandlers.SpacePaddedToString(tmpString);
-            tmpString       = new byte[4];
-            Array.Copy(sector, 0xB8, tmpString, 0, 4);
-            rdb.DiskRevision = StringHandlers.SpacePaddedToString(tmpString);
+            uint magic = BigEndianBitConverter.ToUInt32(tmpSector, 0);
 
-            tmpString = new byte[8];
-            Array.Copy(sector, 0xBC, tmpString, 0, 8);
-            rdb.ControllerVendor = StringHandlers.SpacePaddedToString(tmpString);
-            tmpString            = new byte[16];
-            Array.Copy(sector, 0xC4, tmpString, 0, 16);
-            rdb.ControllerProduct = StringHandlers.SpacePaddedToString(tmpString);
-            tmpString             = new byte[4];
-            Array.Copy(sector, 0xD4, tmpString, 0, 4);
-            rdb.ControllerRevision = StringHandlers.SpacePaddedToString(tmpString);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "Possible magic at block {0} is 0x{1:X8}", rdbBlock,
+                                       magic);
 
-            rdb.Reserved16 = BigEndianBitConverter.ToUInt32(sector, 0xD8);
-            rdb.Reserved17 = BigEndianBitConverter.ToUInt32(sector, 0xDC);
-            rdb.Reserved18 = BigEndianBitConverter.ToUInt32(sector, 0xE0);
-            rdb.Reserved19 = BigEndianBitConverter.ToUInt32(sector, 0xE4);
-            rdb.Reserved20 = BigEndianBitConverter.ToUInt32(sector, 0xE8);
-            rdb.Reserved21 = BigEndianBitConverter.ToUInt32(sector, 0xEC);
-            rdb.Reserved22 = BigEndianBitConverter.ToUInt32(sector, 0xF0);
-            rdb.Reserved23 = BigEndianBitConverter.ToUInt32(sector, 0xF4);
-            rdb.Reserved24 = BigEndianBitConverter.ToUInt32(sector, 0xF8);
-            rdb.Reserved25 = BigEndianBitConverter.ToUInt32(sector, 0xFC);
+            if(magic == RIGID_DISK_BLOCK_MAGIC)
+            {
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found RDB magic at block {0}", rdbBlock);
 
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.magic = 0x{0:X8}", rdb.Magic);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.size = {0} longs, {1} bytes", rdb.Size, rdb.Size * 4);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.checksum = 0x{0:X8}", rdb.Checksum);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.targetID = {0}", rdb.TargetId);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.block_size = {0}", rdb.BlockSize);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.badblock_ptr = {0}", rdb.BadblockPtr);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.partition_ptr = {0}", rdb.PartitionPtr);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.fsheader_ptr = {0}", rdb.FsheaderPtr);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.driveinitcode = {0}", rdb.Driveinitcode);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved1 = 0x{0:X8}", rdb.Reserved1);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved2 = 0x{0:X8}", rdb.Reserved2);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved3 = 0x{0:X8}", rdb.Reserved3);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved4 = 0x{0:X8}", rdb.Reserved4);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved5 = 0x{0:X8}", rdb.Reserved5);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved6 = 0x{0:X8}", rdb.Reserved6);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.cylinders = {0}", rdb.Cylinders);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.spt = {0}", rdb.Spt);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.heads = {0}", rdb.Heads);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.interleave = {0}", rdb.Interleave);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.parking = {0}", rdb.Parking);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved7 = 0x{0:X8}", rdb.Reserved7);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved8 = 0x{0:X8}", rdb.Reserved8);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved9 = 0x{0:X8}", rdb.Reserved9);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.writeprecomp = {0}", rdb.Writeprecomp);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reducedwrite = {0}", rdb.Reducedwrite);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.steprate = {0}", rdb.Steprate);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved10 = 0x{0:X8}", rdb.Reserved10);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved11 = 0x{0:X8}", rdb.Reserved11);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved12 = 0x{0:X8}", rdb.Reserved12);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved13 = 0x{0:X8}", rdb.Reserved13);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved14 = 0x{0:X8}", rdb.Reserved14);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.RDBBlockLow = {0}", rdb.RdbBlockLow);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.RDBBlockHigh = {0}", rdb.RdbBlockHigh);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.LowCylinder = {0}", rdb.LowCylinder);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.HighCylinder = {0}", rdb.HighCylinder);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.CylBlocks = {0}", rdb.CylBlocks);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.AutoParkSeconds = {0}", rdb.AutoParkSeconds);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.HighCylinder = {0}", rdb.HighCylinder);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved15 = 0x{0:X8}", rdb.Reserved15);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskVendor = \"{0}\"", rdb.DiskVendor);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskProduct = \"{0}\"", rdb.DiskProduct);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskRevision = \"{0}\"", rdb.DiskRevision);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerVendor = \"{0}\"", rdb.ControllerVendor);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerProduct = \"{0}\"", rdb.ControllerProduct);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerRevision = \"{0}\"", rdb.ControllerRevision);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved16 = 0x{0:X8}", rdb.Reserved16);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved17 = 0x{0:X8}", rdb.Reserved17);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved18 = 0x{0:X8}", rdb.Reserved18);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved19 = 0x{0:X8}", rdb.Reserved19);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved20 = 0x{0:X8}", rdb.Reserved20);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved21 = 0x{0:X8}", rdb.Reserved21);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved22 = 0x{0:X8}", rdb.Reserved22);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved23 = 0x{0:X8}", rdb.Reserved23);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved24 = 0x{0:X8}", rdb.Reserved24);
-            AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved25 = 0x{0:X8}", rdb.Reserved25);
+                foundRdb = true;
 
-            // Reading BadBlock list
-            List<BadBlockList> badBlockChain = new();
-            ulong              nextBlock     = rdb.BadblockPtr;
+                break;
+            }
+
+            rdbBlock++;
+        }
+
+        if(!foundRdb)
+            return false;
+
+        rdbBlock += sectorOffset;
+
+        var rdb = new RigidDiskBlock();
+
+        errno = imagePlugin.ReadSector(rdbBlock, out byte[] sector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        rdb.Magic           = BigEndianBitConverter.ToUInt32(sector, 0x00);
+        rdb.Size            = BigEndianBitConverter.ToUInt32(sector, 0x04);
+        rdb.Checksum        = BigEndianBitConverter.ToInt32(sector, 0x08);
+        rdb.TargetId        = BigEndianBitConverter.ToUInt32(sector, 0x0C);
+        rdb.BlockSize       = BigEndianBitConverter.ToUInt32(sector, 0x10);
+        rdb.Flags           = BigEndianBitConverter.ToUInt32(sector, 0x04);
+        rdb.BadblockPtr     = BigEndianBitConverter.ToUInt32(sector, 0x18);
+        rdb.PartitionPtr    = BigEndianBitConverter.ToUInt32(sector, 0x1C);
+        rdb.FsheaderPtr     = BigEndianBitConverter.ToUInt32(sector, 0x20);
+        rdb.Driveinitcode   = BigEndianBitConverter.ToUInt32(sector, 0x24);
+        rdb.Reserved1       = BigEndianBitConverter.ToUInt32(sector, 0x28);
+        rdb.Reserved2       = BigEndianBitConverter.ToUInt32(sector, 0x2C);
+        rdb.Reserved3       = BigEndianBitConverter.ToUInt32(sector, 0x30);
+        rdb.Reserved4       = BigEndianBitConverter.ToUInt32(sector, 0x34);
+        rdb.Reserved5       = BigEndianBitConverter.ToUInt32(sector, 0x38);
+        rdb.Reserved6       = BigEndianBitConverter.ToUInt32(sector, 0x3C);
+        rdb.Cylinders       = BigEndianBitConverter.ToUInt32(sector, 0x40);
+        rdb.Spt             = BigEndianBitConverter.ToUInt32(sector, 0x44);
+        rdb.Heads           = BigEndianBitConverter.ToUInt32(sector, 0x48);
+        rdb.Interleave      = BigEndianBitConverter.ToUInt32(sector, 0x4C);
+        rdb.Parking         = BigEndianBitConverter.ToUInt32(sector, 0x50);
+        rdb.Reserved7       = BigEndianBitConverter.ToUInt32(sector, 0x54);
+        rdb.Reserved8       = BigEndianBitConverter.ToUInt32(sector, 0x58);
+        rdb.Reserved9       = BigEndianBitConverter.ToUInt32(sector, 0x5C);
+        rdb.Writeprecomp    = BigEndianBitConverter.ToUInt32(sector, 0x60);
+        rdb.Reducedwrite    = BigEndianBitConverter.ToUInt32(sector, 0x64);
+        rdb.Steprate        = BigEndianBitConverter.ToUInt32(sector, 0x68);
+        rdb.Reserved10      = BigEndianBitConverter.ToUInt32(sector, 0x6C);
+        rdb.Reserved11      = BigEndianBitConverter.ToUInt32(sector, 0x70);
+        rdb.Reserved12      = BigEndianBitConverter.ToUInt32(sector, 0x74);
+        rdb.Reserved13      = BigEndianBitConverter.ToUInt32(sector, 0x78);
+        rdb.Reserved14      = BigEndianBitConverter.ToUInt32(sector, 0x7C);
+        rdb.RdbBlockLow     = BigEndianBitConverter.ToUInt32(sector, 0x80);
+        rdb.RdbBlockHigh    = BigEndianBitConverter.ToUInt32(sector, 0x84);
+        rdb.LowCylinder     = BigEndianBitConverter.ToUInt32(sector, 0x88);
+        rdb.HighCylinder    = BigEndianBitConverter.ToUInt32(sector, 0x8C);
+        rdb.CylBlocks       = BigEndianBitConverter.ToUInt32(sector, 0x90);
+        rdb.AutoParkSeconds = BigEndianBitConverter.ToUInt32(sector, 0x94);
+        rdb.HighCylinder    = BigEndianBitConverter.ToUInt32(sector, 0x98);
+        rdb.Reserved15      = BigEndianBitConverter.ToUInt32(sector, 0x9C);
+
+        byte[] tmpString = new byte[8];
+        Array.Copy(sector, 0xA0, tmpString, 0, 8);
+        rdb.DiskVendor = StringHandlers.SpacePaddedToString(tmpString);
+        tmpString      = new byte[16];
+        Array.Copy(sector, 0xA8, tmpString, 0, 16);
+        rdb.DiskProduct = StringHandlers.SpacePaddedToString(tmpString);
+        tmpString       = new byte[4];
+        Array.Copy(sector, 0xB8, tmpString, 0, 4);
+        rdb.DiskRevision = StringHandlers.SpacePaddedToString(tmpString);
+
+        tmpString = new byte[8];
+        Array.Copy(sector, 0xBC, tmpString, 0, 8);
+        rdb.ControllerVendor = StringHandlers.SpacePaddedToString(tmpString);
+        tmpString            = new byte[16];
+        Array.Copy(sector, 0xC4, tmpString, 0, 16);
+        rdb.ControllerProduct = StringHandlers.SpacePaddedToString(tmpString);
+        tmpString             = new byte[4];
+        Array.Copy(sector, 0xD4, tmpString, 0, 4);
+        rdb.ControllerRevision = StringHandlers.SpacePaddedToString(tmpString);
+
+        rdb.Reserved16 = BigEndianBitConverter.ToUInt32(sector, 0xD8);
+        rdb.Reserved17 = BigEndianBitConverter.ToUInt32(sector, 0xDC);
+        rdb.Reserved18 = BigEndianBitConverter.ToUInt32(sector, 0xE0);
+        rdb.Reserved19 = BigEndianBitConverter.ToUInt32(sector, 0xE4);
+        rdb.Reserved20 = BigEndianBitConverter.ToUInt32(sector, 0xE8);
+        rdb.Reserved21 = BigEndianBitConverter.ToUInt32(sector, 0xEC);
+        rdb.Reserved22 = BigEndianBitConverter.ToUInt32(sector, 0xF0);
+        rdb.Reserved23 = BigEndianBitConverter.ToUInt32(sector, 0xF4);
+        rdb.Reserved24 = BigEndianBitConverter.ToUInt32(sector, 0xF8);
+        rdb.Reserved25 = BigEndianBitConverter.ToUInt32(sector, 0xFC);
+
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.magic = 0x{0:X8}", rdb.Magic);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.size = {0} longs, {1} bytes", rdb.Size, rdb.Size * 4);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.checksum = 0x{0:X8}", rdb.Checksum);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.targetID = {0}", rdb.TargetId);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.block_size = {0}", rdb.BlockSize);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.badblock_ptr = {0}", rdb.BadblockPtr);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.partition_ptr = {0}", rdb.PartitionPtr);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.fsheader_ptr = {0}", rdb.FsheaderPtr);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.driveinitcode = {0}", rdb.Driveinitcode);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved1 = 0x{0:X8}", rdb.Reserved1);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved2 = 0x{0:X8}", rdb.Reserved2);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved3 = 0x{0:X8}", rdb.Reserved3);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved4 = 0x{0:X8}", rdb.Reserved4);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved5 = 0x{0:X8}", rdb.Reserved5);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved6 = 0x{0:X8}", rdb.Reserved6);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.cylinders = {0}", rdb.Cylinders);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.spt = {0}", rdb.Spt);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.heads = {0}", rdb.Heads);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.interleave = {0}", rdb.Interleave);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.parking = {0}", rdb.Parking);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved7 = 0x{0:X8}", rdb.Reserved7);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved8 = 0x{0:X8}", rdb.Reserved8);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved9 = 0x{0:X8}", rdb.Reserved9);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.writeprecomp = {0}", rdb.Writeprecomp);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reducedwrite = {0}", rdb.Reducedwrite);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.steprate = {0}", rdb.Steprate);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved10 = 0x{0:X8}", rdb.Reserved10);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved11 = 0x{0:X8}", rdb.Reserved11);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved12 = 0x{0:X8}", rdb.Reserved12);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved13 = 0x{0:X8}", rdb.Reserved13);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved14 = 0x{0:X8}", rdb.Reserved14);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.RDBBlockLow = {0}", rdb.RdbBlockLow);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.RDBBlockHigh = {0}", rdb.RdbBlockHigh);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.LowCylinder = {0}", rdb.LowCylinder);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.HighCylinder = {0}", rdb.HighCylinder);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.CylBlocks = {0}", rdb.CylBlocks);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.AutoParkSeconds = {0}", rdb.AutoParkSeconds);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.HighCylinder = {0}", rdb.HighCylinder);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved15 = 0x{0:X8}", rdb.Reserved15);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskVendor = \"{0}\"", rdb.DiskVendor);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskProduct = \"{0}\"", rdb.DiskProduct);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.diskRevision = \"{0}\"", rdb.DiskRevision);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerVendor = \"{0}\"", rdb.ControllerVendor);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerProduct = \"{0}\"", rdb.ControllerProduct);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.controllerRevision = \"{0}\"", rdb.ControllerRevision);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved16 = 0x{0:X8}", rdb.Reserved16);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved17 = 0x{0:X8}", rdb.Reserved17);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved18 = 0x{0:X8}", rdb.Reserved18);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved19 = 0x{0:X8}", rdb.Reserved19);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved20 = 0x{0:X8}", rdb.Reserved20);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved21 = 0x{0:X8}", rdb.Reserved21);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved22 = 0x{0:X8}", rdb.Reserved22);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved23 = 0x{0:X8}", rdb.Reserved23);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved24 = 0x{0:X8}", rdb.Reserved24);
+        AaruConsole.DebugWriteLine("Amiga RDB plugin", "RDB.reserved25 = 0x{0:X8}", rdb.Reserved25);
+
+        // Reading BadBlock list
+        List<BadBlockList> badBlockChain = new();
+        ulong              nextBlock     = rdb.BadblockPtr;
+
+        while(nextBlock != 0xFFFFFFFF)
+        {
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "Going to block {0} in search of a BadBlock block",
+                                       nextBlock);
+
+            errno = imagePlugin.ReadSector(nextBlock, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                break;
+
+            uint magic = BigEndianBitConverter.ToUInt32(sector, 0);
+
+            if(magic != BAD_BLOCK_LIST_MAGIC)
+                break;
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found BadBlock block");
+
+            var chainEntry = new BadBlockList
+            {
+                Magic    = BigEndianBitConverter.ToUInt32(sector, 0x00),
+                Size     = BigEndianBitConverter.ToUInt32(sector, 0x04),
+                Checksum = BigEndianBitConverter.ToInt32(sector, 0x08),
+                TargetId = BigEndianBitConverter.ToUInt32(sector, 0x0C),
+                NextPtr  = BigEndianBitConverter.ToUInt32(sector, 0x10),
+                Reserved = BigEndianBitConverter.ToUInt32(sector, 0x14)
+            };
+
+            ulong entries = (chainEntry.Size - 6) / 2;
+            chainEntry.BlockPairs = new BadBlockEntry[entries];
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.magic = 0x{0:X8}", chainEntry.Magic);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.size = {0} longs, {1} bytes",
+                                       chainEntry.Size, chainEntry.Size * 4);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.checksum = 0x{0:X8}", chainEntry.Checksum);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.targetID = {0}", chainEntry.TargetId);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.next_ptr = {0}", chainEntry.NextPtr);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.reserved = 0x{0:X8}", chainEntry.Reserved);
+
+            for(ulong i = 0; i < entries; i++)
+            {
+                chainEntry.BlockPairs[i].BadBlock =
+                    BigEndianBitConverter.ToUInt32(sector, (int)(0x18 + (i * 8) + 0));
+
+                chainEntry.BlockPairs[i].GoodBlock =
+                    BigEndianBitConverter.ToUInt32(sector, (int)(0x18 + (i * 8) + 4));
+
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "Bad block at {0} replaced with good block at {1}",
+                                           chainEntry.BlockPairs[i].BadBlock, chainEntry.BlockPairs[i].GoodBlock);
+            }
+
+            badBlockChain.Add(chainEntry);
+            nextBlock = chainEntry.NextPtr;
+        }
+
+        // Reading BadBlock list
+        List<PartitionEntry> partitionEntries = new();
+        nextBlock = rdb.PartitionPtr;
+
+        while(nextBlock != 0xFFFFFFFF)
+        {
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "Going to block {0} in search of a PartitionEntry block",
+                                       nextBlock + sectorOffset);
+
+            errno = imagePlugin.ReadSector(nextBlock + sectorOffset, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                break;
+
+            uint magic = BigEndianBitConverter.ToUInt32(sector, 0);
+
+            if(magic != PARTITION_BLOCK_MAGIC)
+                break;
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found PartitionEntry block");
+
+            var partEntry = new PartitionEntry
+            {
+                Magic        = BigEndianBitConverter.ToUInt32(sector, 0x00),
+                Size         = BigEndianBitConverter.ToUInt32(sector, 0x04),
+                Checksum     = BigEndianBitConverter.ToInt32(sector, 0x08),
+                TargetId     = BigEndianBitConverter.ToUInt32(sector, 0x0C),
+                NextPtr      = BigEndianBitConverter.ToUInt32(sector, 0x10),
+                Flags        = BigEndianBitConverter.ToUInt32(sector, 0x14),
+                Reserved1    = BigEndianBitConverter.ToUInt32(sector, 0x18),
+                Reserved2    = BigEndianBitConverter.ToUInt32(sector, 0x1C),
+                DevFlags     = BigEndianBitConverter.ToUInt32(sector, 0x20),
+                DriveNameLen = sector[0x24],
+                Reserved3    = BigEndianBitConverter.ToUInt32(sector, 0x44),
+                Reserved4    = BigEndianBitConverter.ToUInt32(sector, 0x48),
+                Reserved5    = BigEndianBitConverter.ToUInt32(sector, 0x4C),
+                Reserved6    = BigEndianBitConverter.ToUInt32(sector, 0x50),
+                Reserved7    = BigEndianBitConverter.ToUInt32(sector, 0x54),
+                Reserved8    = BigEndianBitConverter.ToUInt32(sector, 0x58),
+                Reserved9    = BigEndianBitConverter.ToUInt32(sector, 0x5C),
+                Reserved10   = BigEndianBitConverter.ToUInt32(sector, 0x60),
+                Reserved11   = BigEndianBitConverter.ToUInt32(sector, 0x64),
+                Reserved12   = BigEndianBitConverter.ToUInt32(sector, 0x68),
+                Reserved13   = BigEndianBitConverter.ToUInt32(sector, 0x6C),
+                Reserved14   = BigEndianBitConverter.ToUInt32(sector, 0x70),
+                Reserved15   = BigEndianBitConverter.ToUInt32(sector, 0x74),
+                Reserved16   = BigEndianBitConverter.ToUInt32(sector, 0x78),
+                Reserved17   = BigEndianBitConverter.ToUInt32(sector, 0x7C),
+                DosEnvVec = new DosEnvironmentVector
+                {
+                    Size           = BigEndianBitConverter.ToUInt32(sector, 0x80),
+                    BlockSize      = BigEndianBitConverter.ToUInt32(sector, 0x84),
+                    SecOrg         = BigEndianBitConverter.ToUInt32(sector, 0x88),
+                    Surfaces       = BigEndianBitConverter.ToUInt32(sector, 0x8C),
+                    Spb            = BigEndianBitConverter.ToUInt32(sector, 0x90),
+                    Bpt            = BigEndianBitConverter.ToUInt32(sector, 0x94),
+                    Reservedblocks = BigEndianBitConverter.ToUInt32(sector, 0x98),
+                    Prealloc       = BigEndianBitConverter.ToUInt32(sector, 0x9C),
+                    Interleave     = BigEndianBitConverter.ToUInt32(sector, 0xA0),
+                    LowCylinder    = BigEndianBitConverter.ToUInt32(sector, 0xA4),
+                    HighCylinder   = BigEndianBitConverter.ToUInt32(sector, 0xA8),
+                    NumBuffer      = BigEndianBitConverter.ToUInt32(sector, 0xAC),
+                    BufMemType     = BigEndianBitConverter.ToUInt32(sector, 0xB0),
+                    MaxTransfer    = BigEndianBitConverter.ToUInt32(sector, 0xB4),
+                    Mask           = BigEndianBitConverter.ToUInt32(sector, 0xB8),
+                    BootPriority   = BigEndianBitConverter.ToUInt32(sector, 0xBC),
+                    DosType        = BigEndianBitConverter.ToUInt32(sector, 0xC0),
+                    Baud           = BigEndianBitConverter.ToUInt32(sector, 0xC4),
+                    Control        = BigEndianBitConverter.ToUInt32(sector, 0xC8),
+                    BootBlocks     = BigEndianBitConverter.ToUInt32(sector, 0xCC)
+                }
+            };
+
+            byte[] driveName = new byte[32];
+            Array.Copy(sector, 0x24, driveName, 0, 32);
+            partEntry.DriveName = StringHandlers.PascalToString(driveName, Encoding.GetEncoding("iso-8859-1"));
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.magic = 0x{0:X8}", partEntry.Magic);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.size = {0} longs, {1} bytes", partEntry.Size,
+                                       partEntry.Size * 4);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.checksum = 0x{0:X8}", partEntry.Checksum);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.targetID = {0}", partEntry.TargetId);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.next_ptr = {0}", partEntry.NextPtr);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.flags = 0x{0:X8}", partEntry.Flags);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved1 = 0x{0:X8}", partEntry.Reserved1);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved2 = 0x{0:X8}", partEntry.Reserved2);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.devFlags = 0x{0:X8}", partEntry.DevFlags);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.driveNameLen = {0}", partEntry.DriveNameLen);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.driveName = \"{0}\"", partEntry.DriveName);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved3 = 0x{0:X8}", partEntry.Reserved3);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved4 = 0x{0:X8}", partEntry.Reserved4);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved5 = 0x{0:X8}", partEntry.Reserved5);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved6 = 0x{0:X8}", partEntry.Reserved6);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved7 = 0x{0:X8}", partEntry.Reserved7);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved8 = 0x{0:X8}", partEntry.Reserved8);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved9 = 0x{0:X8}", partEntry.Reserved9);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved10 = 0x{0:X8}", partEntry.Reserved10);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved11 = 0x{0:X8}", partEntry.Reserved11);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved12 = 0x{0:X8}", partEntry.Reserved12);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved13 = 0x{0:X8}", partEntry.Reserved13);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved14 = 0x{0:X8}", partEntry.Reserved14);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved15 = 0x{0:X8}", partEntry.Reserved15);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved16 = 0x{0:X8}", partEntry.Reserved16);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved17 = 0x{0:X8}", partEntry.Reserved17);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.size = {0} longs, {1} bytes",
+                                       partEntry.DosEnvVec.Size, partEntry.DosEnvVec.Size * 4);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.block_size = {0} longs, {1} bytes",
+                                       partEntry.DosEnvVec.BlockSize, partEntry.DosEnvVec.BlockSize * 4);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.sec_org = 0x{0:X8}",
+                                       partEntry.DosEnvVec.SecOrg);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.surfaces = {0}",
+                                       partEntry.DosEnvVec.Surfaces);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.spb = {0}",
+                                       partEntry.DosEnvVec.Spb);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bpt = {0}",
+                                       partEntry.DosEnvVec.Bpt);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.reservedblocks = {0}",
+                                       partEntry.DosEnvVec.Reservedblocks);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.prealloc = {0}",
+                                       partEntry.DosEnvVec.Prealloc);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.interleave = {0}",
+                                       partEntry.DosEnvVec.Interleave);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.lowCylinder = {0}",
+                                       partEntry.DosEnvVec.LowCylinder);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.highCylinder = {0}",
+                                       partEntry.DosEnvVec.HighCylinder);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.numBuffer = {0}",
+                                       partEntry.DosEnvVec.NumBuffer);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bufMemType = {0}",
+                                       partEntry.DosEnvVec.BufMemType);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.maxTransfer = {0}",
+                                       partEntry.DosEnvVec.MaxTransfer);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.Mask = 0x{0:X8}",
+                                       partEntry.DosEnvVec.Mask);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bootPriority = {0}",
+                                       partEntry.DosEnvVec.BootPriority);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.dosType = {0}",
+                                       AmigaDosTypeToString(partEntry.DosEnvVec.DosType));
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.baud = {0}",
+                                       partEntry.DosEnvVec.Baud);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.control = 0x{0:X8}",
+                                       partEntry.DosEnvVec.Control);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bootBlocks = {0}",
+                                       partEntry.DosEnvVec.BootBlocks);
+
+            partitionEntries.Add(partEntry);
+            nextBlock = partEntry.NextPtr;
+        }
+
+        // Reading BadBlock list
+        List<FileSystemHeader> fshdEntries    = new();
+        List<LoadSegment>      segmentEntries = new();
+        nextBlock = rdb.FsheaderPtr;
+
+        while(nextBlock != 0xFFFFFFFF)
+        {
+            AaruConsole.DebugWriteLine("Amiga RDB plugin",
+                                       "Going to block {0} in search of a FileSystemHeader block", nextBlock);
+
+            errno = imagePlugin.ReadSector(nextBlock, out sector);
+
+            if(errno != ErrorNumber.NoError)
+                break;
+
+            uint magic = BigEndianBitConverter.ToUInt32(sector, 0);
+
+            if(magic != FILESYSTEM_HEADER_MAGIC)
+                break;
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found FileSystemHeader block");
+
+            var fshd = new FileSystemHeader
+            {
+                Magic      = BigEndianBitConverter.ToUInt32(sector, 0x00),
+                Size       = BigEndianBitConverter.ToUInt32(sector, 0x04),
+                Checksum   = BigEndianBitConverter.ToInt32(sector, 0x08),
+                TargetId   = BigEndianBitConverter.ToUInt32(sector, 0x0C),
+                NextPtr    = BigEndianBitConverter.ToUInt32(sector, 0x10),
+                Flags      = BigEndianBitConverter.ToUInt32(sector, 0x14),
+                Reserved1  = BigEndianBitConverter.ToUInt32(sector, 0x18),
+                Reserved2  = BigEndianBitConverter.ToUInt32(sector, 0x1C),
+                DosType    = BigEndianBitConverter.ToUInt32(sector, 0x20),
+                Version    = BigEndianBitConverter.ToUInt32(sector, 0x24),
+                PatchFlags = BigEndianBitConverter.ToUInt32(sector, 0x28),
+                Dnode = new DeviceNode
+                {
+                    Type       = BigEndianBitConverter.ToUInt32(sector, 0x2C),
+                    Task       = BigEndianBitConverter.ToUInt32(sector, 0x30),
+                    Locked     = BigEndianBitConverter.ToUInt32(sector, 0x34),
+                    Handler    = BigEndianBitConverter.ToUInt32(sector, 0x38),
+                    StackSize  = BigEndianBitConverter.ToUInt32(sector, 0x3C),
+                    Priority   = BigEndianBitConverter.ToUInt32(sector, 0x40),
+                    Startup    = BigEndianBitConverter.ToUInt32(sector, 0x44),
+                    SeglistPtr = BigEndianBitConverter.ToUInt32(sector, 0x48),
+                    GlobalVec  = BigEndianBitConverter.ToUInt32(sector, 0x4C)
+                }
+            };
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.magic = 0x{0:X8}", fshd.Magic);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.size = {0} longs, {1} bytes", fshd.Size,
+                                       fshd.Size * 4);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.checksum = 0x{0:X8}", fshd.Checksum);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.targetID = {0}", fshd.TargetId);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.next_ptr = {0}", fshd.NextPtr);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.flags = 0x{0:X8}", fshd.Flags);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.reserved1 = 0x{0:X8}", fshd.Reserved1);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.reserved2 = 0x{0:X8}", fshd.Reserved2);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dosType = {0}",
+                                       AmigaDosTypeToString(fshd.DosType));
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.version = {0:D2}.{1:D2} (0x{2:X8})",
+                                       (fshd.Version & 0xFFFF0000) >> 16, fshd.Version & 0xFFFF, fshd.Version);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.patchFlags = 0x{0:X8}", fshd.PatchFlags);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.type = {0}", fshd.Dnode.Type);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.task = {0}", fshd.Dnode.Task);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.locked = {0}", fshd.Dnode.Locked);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.handler = {0}", fshd.Dnode.Handler);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.stackSize = {0}", fshd.Dnode.StackSize);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.priority = {0}", fshd.Dnode.Priority);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.startup = {0}", fshd.Dnode.Startup);
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.seglist_ptr = {0}", fshd.Dnode.SeglistPtr);
+
+            AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.global_vec = 0x{0:X8}",
+                                       fshd.Dnode.GlobalVec);
+
+            nextBlock = fshd.Dnode.SeglistPtr;
+            bool thereAreLoadSegments = false;
+            var  sha1Ctx              = new Sha1Context();
 
             while(nextBlock != 0xFFFFFFFF)
             {
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "Going to block {0} in search of a BadBlock block",
-                                           nextBlock);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin",
+                                           "Going to block {0} in search of a LoadSegment block", nextBlock);
 
                 errno = imagePlugin.ReadSector(nextBlock, out sector);
 
                 if(errno != ErrorNumber.NoError)
                     break;
 
-                uint magic = BigEndianBitConverter.ToUInt32(sector, 0);
+                uint magicSeg = BigEndianBitConverter.ToUInt32(sector, 0);
 
-                if(magic != BAD_BLOCK_LIST_MAGIC)
+                if(magicSeg != LOAD_SEG_MAGIC)
                     break;
 
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found BadBlock block");
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found LoadSegment block");
 
-                var chainEntry = new BadBlockList
+                thereAreLoadSegments = true;
+
+                var loadSeg = new LoadSegment
                 {
                     Magic    = BigEndianBitConverter.ToUInt32(sector, 0x00),
                     Size     = BigEndianBitConverter.ToUInt32(sector, 0x04),
                     Checksum = BigEndianBitConverter.ToInt32(sector, 0x08),
                     TargetId = BigEndianBitConverter.ToUInt32(sector, 0x0C),
-                    NextPtr  = BigEndianBitConverter.ToUInt32(sector, 0x10),
-                    Reserved = BigEndianBitConverter.ToUInt32(sector, 0x14)
+                    NextPtr  = BigEndianBitConverter.ToUInt32(sector, 0x10)
                 };
 
-                ulong entries = (chainEntry.Size - 6) / 2;
-                chainEntry.BlockPairs = new BadBlockEntry[entries];
+                loadSeg.LoadData = new byte[(loadSeg.Size - 5) * 4];
+                Array.Copy(sector, 0x14, loadSeg.LoadData, 0, (loadSeg.Size - 5) * 4);
 
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.magic = 0x{0:X8}", chainEntry.Magic);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.magic = 0x{0:X8}", loadSeg.Magic);
 
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.size = {0} longs, {1} bytes",
-                                           chainEntry.Size, chainEntry.Size * 4);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.size = {0} longs, {1} bytes", loadSeg.Size,
+                                           loadSeg.Size * 4);
 
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.checksum = 0x{0:X8}", chainEntry.Checksum);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.targetID = {0}", chainEntry.TargetId);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.next_ptr = {0}", chainEntry.NextPtr);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "chainEntry.reserved = 0x{0:X8}", chainEntry.Reserved);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.checksum = 0x{0:X8}", loadSeg.Checksum);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.targetID = {0}", loadSeg.TargetId);
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.next_ptr = {0}", loadSeg.NextPtr);
 
-                for(ulong i = 0; i < entries; i++)
-                {
-                    chainEntry.BlockPairs[i].BadBlock =
-                        BigEndianBitConverter.ToUInt32(sector, (int)(0x18 + (i * 8) + 0));
+                segmentEntries.Add(loadSeg);
+                nextBlock = loadSeg.NextPtr;
 
-                    chainEntry.BlockPairs[i].GoodBlock =
-                        BigEndianBitConverter.ToUInt32(sector, (int)(0x18 + (i * 8) + 4));
-
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "Bad block at {0} replaced with good block at {1}",
-                                               chainEntry.BlockPairs[i].BadBlock, chainEntry.BlockPairs[i].GoodBlock);
-                }
-
-                badBlockChain.Add(chainEntry);
-                nextBlock = chainEntry.NextPtr;
+                sha1Ctx.Update(loadSeg.LoadData);
             }
 
-            // Reading BadBlock list
-            List<PartitionEntry> partitionEntries = new();
-            nextBlock = rdb.PartitionPtr;
-
-            while(nextBlock != 0xFFFFFFFF)
+            if(thereAreLoadSegments)
             {
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "Going to block {0} in search of a PartitionEntry block",
-                                           nextBlock + sectorOffset);
-
-                errno = imagePlugin.ReadSector(nextBlock + sectorOffset, out sector);
-
-                if(errno != ErrorNumber.NoError)
-                    break;
-
-                uint magic = BigEndianBitConverter.ToUInt32(sector, 0);
-
-                if(magic != PARTITION_BLOCK_MAGIC)
-                    break;
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found PartitionEntry block");
-
-                var partEntry = new PartitionEntry
-                {
-                    Magic        = BigEndianBitConverter.ToUInt32(sector, 0x00),
-                    Size         = BigEndianBitConverter.ToUInt32(sector, 0x04),
-                    Checksum     = BigEndianBitConverter.ToInt32(sector, 0x08),
-                    TargetId     = BigEndianBitConverter.ToUInt32(sector, 0x0C),
-                    NextPtr      = BigEndianBitConverter.ToUInt32(sector, 0x10),
-                    Flags        = BigEndianBitConverter.ToUInt32(sector, 0x14),
-                    Reserved1    = BigEndianBitConverter.ToUInt32(sector, 0x18),
-                    Reserved2    = BigEndianBitConverter.ToUInt32(sector, 0x1C),
-                    DevFlags     = BigEndianBitConverter.ToUInt32(sector, 0x20),
-                    DriveNameLen = sector[0x24],
-                    Reserved3    = BigEndianBitConverter.ToUInt32(sector, 0x44),
-                    Reserved4    = BigEndianBitConverter.ToUInt32(sector, 0x48),
-                    Reserved5    = BigEndianBitConverter.ToUInt32(sector, 0x4C),
-                    Reserved6    = BigEndianBitConverter.ToUInt32(sector, 0x50),
-                    Reserved7    = BigEndianBitConverter.ToUInt32(sector, 0x54),
-                    Reserved8    = BigEndianBitConverter.ToUInt32(sector, 0x58),
-                    Reserved9    = BigEndianBitConverter.ToUInt32(sector, 0x5C),
-                    Reserved10   = BigEndianBitConverter.ToUInt32(sector, 0x60),
-                    Reserved11   = BigEndianBitConverter.ToUInt32(sector, 0x64),
-                    Reserved12   = BigEndianBitConverter.ToUInt32(sector, 0x68),
-                    Reserved13   = BigEndianBitConverter.ToUInt32(sector, 0x6C),
-                    Reserved14   = BigEndianBitConverter.ToUInt32(sector, 0x70),
-                    Reserved15   = BigEndianBitConverter.ToUInt32(sector, 0x74),
-                    Reserved16   = BigEndianBitConverter.ToUInt32(sector, 0x78),
-                    Reserved17   = BigEndianBitConverter.ToUInt32(sector, 0x7C),
-                    DosEnvVec = new DosEnvironmentVector
-                    {
-                        Size           = BigEndianBitConverter.ToUInt32(sector, 0x80),
-                        BlockSize      = BigEndianBitConverter.ToUInt32(sector, 0x84),
-                        SecOrg         = BigEndianBitConverter.ToUInt32(sector, 0x88),
-                        Surfaces       = BigEndianBitConverter.ToUInt32(sector, 0x8C),
-                        Spb            = BigEndianBitConverter.ToUInt32(sector, 0x90),
-                        Bpt            = BigEndianBitConverter.ToUInt32(sector, 0x94),
-                        Reservedblocks = BigEndianBitConverter.ToUInt32(sector, 0x98),
-                        Prealloc       = BigEndianBitConverter.ToUInt32(sector, 0x9C),
-                        Interleave     = BigEndianBitConverter.ToUInt32(sector, 0xA0),
-                        LowCylinder    = BigEndianBitConverter.ToUInt32(sector, 0xA4),
-                        HighCylinder   = BigEndianBitConverter.ToUInt32(sector, 0xA8),
-                        NumBuffer      = BigEndianBitConverter.ToUInt32(sector, 0xAC),
-                        BufMemType     = BigEndianBitConverter.ToUInt32(sector, 0xB0),
-                        MaxTransfer    = BigEndianBitConverter.ToUInt32(sector, 0xB4),
-                        Mask           = BigEndianBitConverter.ToUInt32(sector, 0xB8),
-                        BootPriority   = BigEndianBitConverter.ToUInt32(sector, 0xBC),
-                        DosType        = BigEndianBitConverter.ToUInt32(sector, 0xC0),
-                        Baud           = BigEndianBitConverter.ToUInt32(sector, 0xC4),
-                        Control        = BigEndianBitConverter.ToUInt32(sector, 0xC8),
-                        BootBlocks     = BigEndianBitConverter.ToUInt32(sector, 0xCC)
-                    }
-                };
-
-                byte[] driveName = new byte[32];
-                Array.Copy(sector, 0x24, driveName, 0, 32);
-                partEntry.DriveName = StringHandlers.PascalToString(driveName, Encoding.GetEncoding("iso-8859-1"));
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.magic = 0x{0:X8}", partEntry.Magic);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.size = {0} longs, {1} bytes", partEntry.Size,
-                                           partEntry.Size * 4);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.checksum = 0x{0:X8}", partEntry.Checksum);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.targetID = {0}", partEntry.TargetId);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.next_ptr = {0}", partEntry.NextPtr);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.flags = 0x{0:X8}", partEntry.Flags);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved1 = 0x{0:X8}", partEntry.Reserved1);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved2 = 0x{0:X8}", partEntry.Reserved2);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.devFlags = 0x{0:X8}", partEntry.DevFlags);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.driveNameLen = {0}", partEntry.DriveNameLen);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.driveName = \"{0}\"", partEntry.DriveName);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved3 = 0x{0:X8}", partEntry.Reserved3);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved4 = 0x{0:X8}", partEntry.Reserved4);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved5 = 0x{0:X8}", partEntry.Reserved5);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved6 = 0x{0:X8}", partEntry.Reserved6);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved7 = 0x{0:X8}", partEntry.Reserved7);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved8 = 0x{0:X8}", partEntry.Reserved8);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved9 = 0x{0:X8}", partEntry.Reserved9);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved10 = 0x{0:X8}", partEntry.Reserved10);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved11 = 0x{0:X8}", partEntry.Reserved11);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved12 = 0x{0:X8}", partEntry.Reserved12);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved13 = 0x{0:X8}", partEntry.Reserved13);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved14 = 0x{0:X8}", partEntry.Reserved14);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved15 = 0x{0:X8}", partEntry.Reserved15);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved16 = 0x{0:X8}", partEntry.Reserved16);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.reserved17 = 0x{0:X8}", partEntry.Reserved17);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.size = {0} longs, {1} bytes",
-                                           partEntry.DosEnvVec.Size, partEntry.DosEnvVec.Size * 4);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.block_size = {0} longs, {1} bytes",
-                                           partEntry.DosEnvVec.BlockSize, partEntry.DosEnvVec.BlockSize * 4);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.sec_org = 0x{0:X8}",
-                                           partEntry.DosEnvVec.SecOrg);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.surfaces = {0}",
-                                           partEntry.DosEnvVec.Surfaces);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.spb = {0}",
-                                           partEntry.DosEnvVec.Spb);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bpt = {0}",
-                                           partEntry.DosEnvVec.Bpt);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.reservedblocks = {0}",
-                                           partEntry.DosEnvVec.Reservedblocks);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.prealloc = {0}",
-                                           partEntry.DosEnvVec.Prealloc);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.interleave = {0}",
-                                           partEntry.DosEnvVec.Interleave);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.lowCylinder = {0}",
-                                           partEntry.DosEnvVec.LowCylinder);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.highCylinder = {0}",
-                                           partEntry.DosEnvVec.HighCylinder);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.numBuffer = {0}",
-                                           partEntry.DosEnvVec.NumBuffer);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bufMemType = {0}",
-                                           partEntry.DosEnvVec.BufMemType);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.maxTransfer = {0}",
-                                           partEntry.DosEnvVec.MaxTransfer);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.Mask = 0x{0:X8}",
-                                           partEntry.DosEnvVec.Mask);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bootPriority = {0}",
-                                           partEntry.DosEnvVec.BootPriority);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.dosType = {0}",
-                                           AmigaDosTypeToString(partEntry.DosEnvVec.DosType));
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.baud = {0}",
-                                           partEntry.DosEnvVec.Baud);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.control = 0x{0:X8}",
-                                           partEntry.DosEnvVec.Control);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "partEntry.dosEnvVec.bootBlocks = {0}",
-                                           partEntry.DosEnvVec.BootBlocks);
-
-                partitionEntries.Add(partEntry);
-                nextBlock = partEntry.NextPtr;
+                string loadSegSha1 = sha1Ctx.End();
+                AaruConsole.DebugWriteLine("Amiga RDB plugin", "LoadSegment data SHA1: {0}", loadSegSha1);
             }
 
-            // Reading BadBlock list
-            List<FileSystemHeader> fshdEntries    = new();
-            List<LoadSegment>      segmentEntries = new();
-            nextBlock = rdb.FsheaderPtr;
+            fshdEntries.Add(fshd);
+            nextBlock = fshd.NextPtr;
+        }
 
-            while(nextBlock != 0xFFFFFFFF)
+        ulong sequence = 0;
+
+        foreach(Partition entry in partitionEntries.Select(rdbEntry => new Partition
+                {
+                    Description = AmigaDosTypeToDescriptionString(rdbEntry.DosEnvVec.DosType),
+                    Name = rdbEntry.DriveName,
+                    Sequence = sequence,
+                    Length = (rdbEntry.DosEnvVec.HighCylinder + 1 - rdbEntry.DosEnvVec.LowCylinder) *
+                             rdbEntry.DosEnvVec.Surfaces * rdbEntry.DosEnvVec.Bpt,
+                    Start = (rdbEntry.DosEnvVec.LowCylinder * rdbEntry.DosEnvVec.Surfaces * rdbEntry.DosEnvVec.Bpt) +
+                            sectorOffset,
+                    Type = AmigaDosTypeToString(rdbEntry.DosEnvVec.DosType),
+                    Scheme = Name,
+                    Offset = ((rdbEntry.DosEnvVec.LowCylinder * rdbEntry.DosEnvVec.Surfaces * rdbEntry.DosEnvVec.Bpt) +
+                              sectorOffset) * rdb.BlockSize,
+                    Size = (rdbEntry.DosEnvVec.HighCylinder + 1 - rdbEntry.DosEnvVec.LowCylinder) *
+                           rdbEntry.DosEnvVec.Surfaces * rdbEntry.DosEnvVec.Bpt * rdb.BlockSize
+                }))
+        {
+            partitions.Add(entry);
+            sequence++;
+        }
+
+        return true;
+    }
+
+    static string AmigaDosTypeToDescriptionString(uint amigaDosType)
+    {
+        switch(amigaDosType)
+        {
+            case TYPEID_OFS:           return "Amiga Original File System";
+            case TYPEID_FFS:           return "Amiga Fast File System";
+            case TYPEID_OFS_INTL:      return "Amiga Original File System with international characters";
+            case TYPEID_FFS_INTL:      return "Amiga Fast File System with international characters";
+            case TYPEID_OFS_CACHE:     return "Amiga Original File System with directory cache";
+            case TYPEID_FFS_CACHE:     return "Amiga Fast File System with directory cache";
+            case TYPEID_OFS2:          return "Amiga Original File System with long filenames";
+            case TYPEID_FFS2:          return "Amiga Fast File System with long filenames";
+            case TYPEID_AMIX_SYSV:     return "Amiga UNIX System V filesystem";
+            case TYPEID_AMIX_BOOT:     return "Amiga UNIX boot filesystem";
+            case TYPEID_AMIX_FFS:      return "Amiga UNIX BSD filesystem";
+            case TYPEID_AMIX_RESERVED: return "Amiga UNIX Reserved partition (swap)";
+            case TYPEID_PFS:
+            case TYPEID_PFS2:
+            case TYPEID_PFS_MUSER:
+            case TYPEID_AFS: return "ProfessionalFileSystem";
+            case TYPEID_SFS:       return "SmartFileSystem v1";
+            case TYPEID_SFS2:      return "SmartFileSystem v2";
+            case TYPEID_JXFS:      return "JXFS";
+            case TYPEID_CROSS_DOS: return "FAT, as set by CrossDOS";
+            case TYPEID_CROSS_MAC: return "HFS, as set by CrossMac";
+            case TYPEID_BFFS:      return "4.2UFS, for BFFS";
+            case TYPEID_OFS_MUSER: return "Amiga Original File System with multi-user patches";
+            case TYPEID_FFS_MUSER: return "Amiga Fast File System with multi-user patches";
+            case TYPEID_OFS_INTL_MUSER:
+                return "Amiga Original File System with international characters and multi-user patches";
+            case TYPEID_FFS_INTL_MUSER:
+                return "Amiga Fast File System with international characters and multi-user patches";
+            case TYPEID_OFS_CACHE_MUSER:
+                return "Amiga Original File System with directory cache and multi-user patches";
+            case TYPEID_FFS_CACHE_MUSER:
+                return "Amiga Fast File System with directory cache and multi-user patches";
+            case TYPEID_OLD_BSD_UNUSED:     return "BSD unused";
+            case TYPEID_OLD_BSD_SWAP:       return "BSD swap";
+            case TYPEID_OLD_BSD42_FFS:      return "BSD 4.2 FFS";
+            case TYPEID_OLD_BSD44_LFS:      return "BSD 4.4 LFS";
+            case TYPEID_NETBSD_ROOT_UNUSED: return "NetBSD unused root partition";
+            case TYPEID_NETBSD_ROOT_42FFS:  return "NetBSD 4.2 FFS root partition";
+            case TYPEID_NETBSD_ROOT_44LFS:  return "NetBSD 4.4 LFS root partition";
+            case TYPEID_NETBSD_USER_UNUSED: return "NetBSD unused user partition";
+            case TYPEID_NETBSD_USER_42FFS:  return "NetBSD 4.2 FFS user partition";
+            case TYPEID_NETBSD_USER_44LFS:  return "NetBSD 4.4 LFS user partition";
+            case TYPEID_NETBSD_SWAP:        return "NetBSD swap partition";
+            case TYPEID_LINUX:              return "Linux filesystem partition";
+            case TYPEID_LINUX_SWAP:         return "Linux swap partition";
+            case TYPEID_RAID_FRAME:
+            case TYPEID_RAID_FRAME0: return "RaidFrame partition";
+
+            default:
             {
-                AaruConsole.DebugWriteLine("Amiga RDB plugin",
-                                           "Going to block {0} in search of a FileSystemHeader block", nextBlock);
+                if((amigaDosType & TYPEID_OFS) == TYPEID_OFS)
+                    return $"Unknown Amiga DOS filesystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                errno = imagePlugin.ReadSector(nextBlock, out sector);
+                if((amigaDosType & TYPEID_AMIX_SYSV) == TYPEID_AMIX_SYSV)
+                    return $"Unknown Amiga UNIX filesystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                if(errno != ErrorNumber.NoError)
-                    break;
+                if((amigaDosType & 0x50465300) == 0x50465300 ||
+                   (amigaDosType & 0x41465300) == 0x41465300)
+                    return $"Unknown ProfessionalFileSystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                uint magic = BigEndianBitConverter.ToUInt32(sector, 0);
+                if((amigaDosType & TYPEID_SFS) == TYPEID_SFS)
+                    return $"Unknown SmartFileSystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                if(magic != FILESYSTEM_HEADER_MAGIC)
-                    break;
+                if((amigaDosType & TYPEID_OFS_MUSER) == TYPEID_OFS_MUSER)
+                    return $"Unknown Amiga DOS multi-user filesystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found FileSystemHeader block");
+                if((amigaDosType & TYPEID_OLD_BSD_UNUSED) == TYPEID_OLD_BSD_UNUSED)
+                    return $"Unknown BSD filesystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                var fshd = new FileSystemHeader
-                {
-                    Magic      = BigEndianBitConverter.ToUInt32(sector, 0x00),
-                    Size       = BigEndianBitConverter.ToUInt32(sector, 0x04),
-                    Checksum   = BigEndianBitConverter.ToInt32(sector, 0x08),
-                    TargetId   = BigEndianBitConverter.ToUInt32(sector, 0x0C),
-                    NextPtr    = BigEndianBitConverter.ToUInt32(sector, 0x10),
-                    Flags      = BigEndianBitConverter.ToUInt32(sector, 0x14),
-                    Reserved1  = BigEndianBitConverter.ToUInt32(sector, 0x18),
-                    Reserved2  = BigEndianBitConverter.ToUInt32(sector, 0x1C),
-                    DosType    = BigEndianBitConverter.ToUInt32(sector, 0x20),
-                    Version    = BigEndianBitConverter.ToUInt32(sector, 0x24),
-                    PatchFlags = BigEndianBitConverter.ToUInt32(sector, 0x28),
-                    Dnode = new DeviceNode
-                    {
-                        Type       = BigEndianBitConverter.ToUInt32(sector, 0x2C),
-                        Task       = BigEndianBitConverter.ToUInt32(sector, 0x30),
-                        Locked     = BigEndianBitConverter.ToUInt32(sector, 0x34),
-                        Handler    = BigEndianBitConverter.ToUInt32(sector, 0x38),
-                        StackSize  = BigEndianBitConverter.ToUInt32(sector, 0x3C),
-                        Priority   = BigEndianBitConverter.ToUInt32(sector, 0x40),
-                        Startup    = BigEndianBitConverter.ToUInt32(sector, 0x44),
-                        SeglistPtr = BigEndianBitConverter.ToUInt32(sector, 0x48),
-                        GlobalVec  = BigEndianBitConverter.ToUInt32(sector, 0x4C)
-                    }
-                };
+                if((amigaDosType & TYPEID_NETBSD_ROOT_UNUSED) == TYPEID_NETBSD_ROOT_UNUSED)
+                    return $"Unknown NetBSD root filesystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.magic = 0x{0:X8}", fshd.Magic);
+                if((amigaDosType & TYPEID_NETBSD_USER_UNUSED) == TYPEID_NETBSD_USER_UNUSED)
+                    return $"Unknown NetBSD user filesystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.size = {0} longs, {1} bytes", fshd.Size,
-                                           fshd.Size * 4);
+                if((amigaDosType & TYPEID_NETBSD_SWAP) == TYPEID_NETBSD_SWAP)
+                    return $"Unknown NetBSD swap filesystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.checksum = 0x{0:X8}", fshd.Checksum);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.targetID = {0}", fshd.TargetId);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.next_ptr = {0}", fshd.NextPtr);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.flags = 0x{0:X8}", fshd.Flags);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.reserved1 = 0x{0:X8}", fshd.Reserved1);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.reserved2 = 0x{0:X8}", fshd.Reserved2);
+                if((amigaDosType & TYPEID_LINUX)      == TYPEID_LINUX ||
+                   (amigaDosType & TYPEID_LINUX_SWAP) == TYPEID_LINUX_SWAP)
+                    return $"Unknown Linux filesystem type {AmigaDosTypeToString(amigaDosType)}";
 
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dosType = {0}",
-                                           AmigaDosTypeToString(fshd.DosType));
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.version = {0:D2}.{1:D2} (0x{2:X8})",
-                                           (fshd.Version & 0xFFFF0000) >> 16, fshd.Version & 0xFFFF, fshd.Version);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.patchFlags = 0x{0:X8}", fshd.PatchFlags);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.type = {0}", fshd.Dnode.Type);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.task = {0}", fshd.Dnode.Task);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.locked = {0}", fshd.Dnode.Locked);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.handler = {0}", fshd.Dnode.Handler);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.stackSize = {0}", fshd.Dnode.StackSize);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.priority = {0}", fshd.Dnode.Priority);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.startup = {0}", fshd.Dnode.Startup);
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.seglist_ptr = {0}", fshd.Dnode.SeglistPtr);
-
-                AaruConsole.DebugWriteLine("Amiga RDB plugin", "FSHD.dnode.global_vec = 0x{0:X8}",
-                                           fshd.Dnode.GlobalVec);
-
-                nextBlock = fshd.Dnode.SeglistPtr;
-                bool thereAreLoadSegments = false;
-                var  sha1Ctx              = new Sha1Context();
-
-                while(nextBlock != 0xFFFFFFFF)
-                {
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin",
-                                               "Going to block {0} in search of a LoadSegment block", nextBlock);
-
-                    errno = imagePlugin.ReadSector(nextBlock, out sector);
-
-                    if(errno != ErrorNumber.NoError)
-                        break;
-
-                    uint magicSeg = BigEndianBitConverter.ToUInt32(sector, 0);
-
-                    if(magicSeg != LOAD_SEG_MAGIC)
-                        break;
-
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "Found LoadSegment block");
-
-                    thereAreLoadSegments = true;
-
-                    var loadSeg = new LoadSegment
-                    {
-                        Magic    = BigEndianBitConverter.ToUInt32(sector, 0x00),
-                        Size     = BigEndianBitConverter.ToUInt32(sector, 0x04),
-                        Checksum = BigEndianBitConverter.ToInt32(sector, 0x08),
-                        TargetId = BigEndianBitConverter.ToUInt32(sector, 0x0C),
-                        NextPtr  = BigEndianBitConverter.ToUInt32(sector, 0x10)
-                    };
-
-                    loadSeg.LoadData = new byte[(loadSeg.Size - 5) * 4];
-                    Array.Copy(sector, 0x14, loadSeg.LoadData, 0, (loadSeg.Size - 5) * 4);
-
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.magic = 0x{0:X8}", loadSeg.Magic);
-
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.size = {0} longs, {1} bytes", loadSeg.Size,
-                                               loadSeg.Size * 4);
-
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.checksum = 0x{0:X8}", loadSeg.Checksum);
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.targetID = {0}", loadSeg.TargetId);
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "loadSeg.next_ptr = {0}", loadSeg.NextPtr);
-
-                    segmentEntries.Add(loadSeg);
-                    nextBlock = loadSeg.NextPtr;
-
-                    sha1Ctx.Update(loadSeg.LoadData);
-                }
-
-                if(thereAreLoadSegments)
-                {
-                    string loadSegSha1 = sha1Ctx.End();
-                    AaruConsole.DebugWriteLine("Amiga RDB plugin", "LoadSegment data SHA1: {0}", loadSegSha1);
-                }
-
-                fshdEntries.Add(fshd);
-                nextBlock = fshd.NextPtr;
+                return $"Unknown partition type {AmigaDosTypeToString(amigaDosType)}";
             }
-
-            ulong sequence = 0;
-
-            foreach(Partition entry in partitionEntries.Select(rdbEntry => new Partition
-            {
-                Description = AmigaDosTypeToDescriptionString(rdbEntry.DosEnvVec.DosType),
-                Name = rdbEntry.DriveName,
-                Sequence = sequence,
-                Length = (rdbEntry.DosEnvVec.HighCylinder + 1 - rdbEntry.DosEnvVec.LowCylinder) *
-                         rdbEntry.DosEnvVec.Surfaces * rdbEntry.DosEnvVec.Bpt,
-                Start = (rdbEntry.DosEnvVec.LowCylinder * rdbEntry.DosEnvVec.Surfaces * rdbEntry.DosEnvVec.Bpt) +
-                        sectorOffset,
-                Type = AmigaDosTypeToString(rdbEntry.DosEnvVec.DosType),
-                Scheme = Name,
-                Offset = ((rdbEntry.DosEnvVec.LowCylinder * rdbEntry.DosEnvVec.Surfaces * rdbEntry.DosEnvVec.Bpt) +
-                          sectorOffset) * rdb.BlockSize,
-                Size = (rdbEntry.DosEnvVec.HighCylinder + 1 - rdbEntry.DosEnvVec.LowCylinder) *
-                       rdbEntry.DosEnvVec.Surfaces * rdbEntry.DosEnvVec.Bpt * rdb.BlockSize
-            }))
-            {
-                partitions.Add(entry);
-                sequence++;
-            }
-
-            return true;
-        }
-
-        static string AmigaDosTypeToDescriptionString(uint amigaDosType)
-        {
-            switch(amigaDosType)
-            {
-                case TYPEID_OFS:           return "Amiga Original File System";
-                case TYPEID_FFS:           return "Amiga Fast File System";
-                case TYPEID_OFS_INTL:      return "Amiga Original File System with international characters";
-                case TYPEID_FFS_INTL:      return "Amiga Fast File System with international characters";
-                case TYPEID_OFS_CACHE:     return "Amiga Original File System with directory cache";
-                case TYPEID_FFS_CACHE:     return "Amiga Fast File System with directory cache";
-                case TYPEID_OFS2:          return "Amiga Original File System with long filenames";
-                case TYPEID_FFS2:          return "Amiga Fast File System with long filenames";
-                case TYPEID_AMIX_SYSV:     return "Amiga UNIX System V filesystem";
-                case TYPEID_AMIX_BOOT:     return "Amiga UNIX boot filesystem";
-                case TYPEID_AMIX_FFS:      return "Amiga UNIX BSD filesystem";
-                case TYPEID_AMIX_RESERVED: return "Amiga UNIX Reserved partition (swap)";
-                case TYPEID_PFS:
-                case TYPEID_PFS2:
-                case TYPEID_PFS_MUSER:
-                case TYPEID_AFS: return "ProfessionalFileSystem";
-                case TYPEID_SFS:       return "SmartFileSystem v1";
-                case TYPEID_SFS2:      return "SmartFileSystem v2";
-                case TYPEID_JXFS:      return "JXFS";
-                case TYPEID_CROSS_DOS: return "FAT, as set by CrossDOS";
-                case TYPEID_CROSS_MAC: return "HFS, as set by CrossMac";
-                case TYPEID_BFFS:      return "4.2UFS, for BFFS";
-                case TYPEID_OFS_MUSER: return "Amiga Original File System with multi-user patches";
-                case TYPEID_FFS_MUSER: return "Amiga Fast File System with multi-user patches";
-                case TYPEID_OFS_INTL_MUSER:
-                    return "Amiga Original File System with international characters and multi-user patches";
-                case TYPEID_FFS_INTL_MUSER:
-                    return "Amiga Fast File System with international characters and multi-user patches";
-                case TYPEID_OFS_CACHE_MUSER:
-                    return "Amiga Original File System with directory cache and multi-user patches";
-                case TYPEID_FFS_CACHE_MUSER:
-                    return "Amiga Fast File System with directory cache and multi-user patches";
-                case TYPEID_OLD_BSD_UNUSED:     return "BSD unused";
-                case TYPEID_OLD_BSD_SWAP:       return "BSD swap";
-                case TYPEID_OLD_BSD42_FFS:      return "BSD 4.2 FFS";
-                case TYPEID_OLD_BSD44_LFS:      return "BSD 4.4 LFS";
-                case TYPEID_NETBSD_ROOT_UNUSED: return "NetBSD unused root partition";
-                case TYPEID_NETBSD_ROOT_42FFS:  return "NetBSD 4.2 FFS root partition";
-                case TYPEID_NETBSD_ROOT_44LFS:  return "NetBSD 4.4 LFS root partition";
-                case TYPEID_NETBSD_USER_UNUSED: return "NetBSD unused user partition";
-                case TYPEID_NETBSD_USER_42FFS:  return "NetBSD 4.2 FFS user partition";
-                case TYPEID_NETBSD_USER_44LFS:  return "NetBSD 4.4 LFS user partition";
-                case TYPEID_NETBSD_SWAP:        return "NetBSD swap partition";
-                case TYPEID_LINUX:              return "Linux filesystem partition";
-                case TYPEID_LINUX_SWAP:         return "Linux swap partition";
-                case TYPEID_RAID_FRAME:
-                case TYPEID_RAID_FRAME0: return "RaidFrame partition";
-
-                default:
-                {
-                    if((amigaDosType & TYPEID_OFS) == TYPEID_OFS)
-                        return $"Unknown Amiga DOS filesystem type {AmigaDosTypeToString(amigaDosType)}";
-
-                    if((amigaDosType & TYPEID_AMIX_SYSV) == TYPEID_AMIX_SYSV)
-                        return $"Unknown Amiga UNIX filesystem type {AmigaDosTypeToString(amigaDosType)}";
-
-                    if((amigaDosType & 0x50465300) == 0x50465300 ||
-                       (amigaDosType & 0x41465300) == 0x41465300)
-                        return $"Unknown ProfessionalFileSystem type {AmigaDosTypeToString(amigaDosType)}";
-
-                    if((amigaDosType & TYPEID_SFS) == TYPEID_SFS)
-                        return $"Unknown SmartFileSystem type {AmigaDosTypeToString(amigaDosType)}";
-
-                    if((amigaDosType & TYPEID_OFS_MUSER) == TYPEID_OFS_MUSER)
-                        return $"Unknown Amiga DOS multi-user filesystem type {AmigaDosTypeToString(amigaDosType)}";
-
-                    if((amigaDosType & TYPEID_OLD_BSD_UNUSED) == TYPEID_OLD_BSD_UNUSED)
-                        return $"Unknown BSD filesystem type {AmigaDosTypeToString(amigaDosType)}";
-
-                    if((amigaDosType & TYPEID_NETBSD_ROOT_UNUSED) == TYPEID_NETBSD_ROOT_UNUSED)
-                        return $"Unknown NetBSD root filesystem type {AmigaDosTypeToString(amigaDosType)}";
-
-                    if((amigaDosType & TYPEID_NETBSD_USER_UNUSED) == TYPEID_NETBSD_USER_UNUSED)
-                        return $"Unknown NetBSD user filesystem type {AmigaDosTypeToString(amigaDosType)}";
-
-                    if((amigaDosType & TYPEID_NETBSD_SWAP) == TYPEID_NETBSD_SWAP)
-                        return $"Unknown NetBSD swap filesystem type {AmigaDosTypeToString(amigaDosType)}";
-
-                    if((amigaDosType & TYPEID_LINUX)      == TYPEID_LINUX ||
-                       (amigaDosType & TYPEID_LINUX_SWAP) == TYPEID_LINUX_SWAP)
-                        return $"Unknown Linux filesystem type {AmigaDosTypeToString(amigaDosType)}";
-
-                    return $"Unknown partition type {AmigaDosTypeToString(amigaDosType)}";
-                }
-            }
-        }
-
-        static string AmigaDosTypeToString(uint amigaDosType, bool quoted = true)
-        {
-            byte[] textPart = new byte[3];
-
-            textPart[0] = (byte)((amigaDosType & 0xFF000000) >> 24);
-            textPart[1] = (byte)((amigaDosType & 0x00FF0000) >> 16);
-            textPart[2] = (byte)((amigaDosType & 0x0000FF00) >> 8);
-
-            string textPartString = Encoding.ASCII.GetString(textPart);
-
-            return quoted ? $"\"{textPartString}\\{amigaDosType & 0xFF}\"" : $"{textPartString}\\{amigaDosType & 0xFF}";
-        }
-
-        /// <summary>Amiga Rigid Disk Block, header for partitioning scheme Can be in any sector from 0 to 15, inclusive</summary>
-        struct RigidDiskBlock
-        {
-            /// <summary>"RDSK"</summary>
-            public uint Magic;
-            /// <summary>Size in longs</summary>
-            public uint Size;
-            /// <summary>Checksum</summary>
-            public int Checksum;
-            /// <summary>SCSI target ID, 7 for non-SCSI</summary>
-            public uint TargetId;
-            /// <summary>Block size in bytes</summary>
-            public uint BlockSize;
-            /// <summary>Flags</summary>
-            public uint Flags;
-            /// <summary>Pointer to first BadBlockList, 0xFFFFFFFF means last block in device</summary>
-            public uint BadblockPtr;
-            /// <summary>Pointer to first PartitionEntry, 0xFFFFFFFF means last block in device</summary>
-            public uint PartitionPtr;
-            /// <summary>Pointer to first FileSystemHeader, 0xFFFFFFFF means last block in device</summary>
-            public uint FsheaderPtr;
-            /// <summary>Optional drive specific init code</summary>
-            public uint Driveinitcode;
-            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
-            public uint Reserved1;
-            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
-            public uint Reserved2;
-            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
-            public uint Reserved3;
-            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
-            public uint Reserved4;
-            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
-            public uint Reserved5;
-            /// <summary>Reserved, should be 0xFFFFFFFF</summary>
-            public uint Reserved6;
-            /// <summary>Cylinders in drive</summary>
-            public uint Cylinders;
-            /// <summary>Sectors per track</summary>
-            public uint Spt;
-            /// <summary>Heads in drive</summary>
-            public uint Heads;
-            /// <summary>Drive interleave</summary>
-            public uint Interleave;
-            /// <summary>Cylinder for parking heads</summary>
-            public uint Parking;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved7;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved8;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved9;
-            /// <summary>Starting cylinder for write precompensation</summary>
-            public uint Writeprecomp;
-            /// <summary>Starting cylinder for reduced write current</summary>
-            public uint Reducedwrite;
-            /// <summary>Drive step rate</summary>
-            public uint Steprate;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved10;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved11;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved12;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved13;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved14;
-            /// <summary>Low block of RDB reserved blocks</summary>
-            public uint RdbBlockLow;
-            /// <summary>High block of RDB reserved blocks</summary>
-            public uint RdbBlockHigh;
-            /// <summary>Low cylinder for partitionable area</summary>
-            public uint LowCylinder;
-            /// <summary>High cylinder for partitionable area</summary>
-            public uint HighCylinder;
-            /// <summary>Blocks per cylinder</summary>
-            public uint CylBlocks;
-            /// <summary>Seconds for head autoparking</summary>
-            public uint AutoParkSeconds;
-            /// <summary>Highest block used by RDB</summary>
-            public uint HighRdskBlock;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved15;
-            /// <summary>Disk vendor, 8 bytes</summary>
-            public string DiskVendor;
-            /// <summary>Disk product, 16 bytes</summary>
-            public string DiskProduct;
-            /// <summary>Disk revision, 4 bytes</summary>
-            public string DiskRevision;
-            /// <summary>Controller vendor, 8 bytes</summary>
-            public string ControllerVendor;
-            /// <summary>Controller product, 16 bytes</summary>
-            public string ControllerProduct;
-            /// <summary>Controller revision, 4 bytes</summary>
-            public string ControllerRevision;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved16;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved17;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved18;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved19;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved20;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved21;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved22;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved23;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved24;
-            /// <summary>Reserved, should be zero</summary>
-            public uint Reserved25;
-        }
-
-        /// <summary>Pair for spare blocks</summary>
-        struct BadBlockEntry
-        {
-            /// <summary>Bad block pointer</summary>
-            public uint BadBlock;
-            /// <summary>Replacement block pointer</summary>
-            public uint GoodBlock;
-        }
-
-        /// <summary>List of bad blocks and spares</summary>
-        struct BadBlockList
-        {
-            /// <summary>"BADB"</summary>
-            public uint Magic;
-            /// <summary>Size in longs</summary>
-            public uint Size;
-            /// <summary>Checksum</summary>
-            public int Checksum;
-            /// <summary>SCSI target ID, 7 for non-SCSI</summary>
-            public uint TargetId;
-            /// <summary>Pointer for next BadBlockList</summary>
-            public uint NextPtr;
-            /// <summary>Reserved</summary>
-            public uint Reserved;
-            /// <summary>Bad block entries, up to block filling, 8 bytes each</summary>
-            public BadBlockEntry[] BlockPairs;
-        }
-
-        /// <summary>DOSEnvVec, used by AmigaDOS</summary>
-        struct DosEnvironmentVector
-        {
-            /// <summary>Size in longs, should be 16, minimum 11</summary>
-            public uint Size;
-            /// <summary>Block size in longs</summary>
-            public uint BlockSize;
-            /// <summary>Unknown, 0</summary>
-            public uint SecOrg;
-            /// <summary>Heads in drive</summary>
-            public uint Surfaces;
-            /// <summary>Sectors per block</summary>
-            public uint Spb;
-            /// <summary>Blocks per track</summary>
-            public uint Bpt;
-            /// <summary>DOS reserved blocks at start of partition</summary>
-            public uint Reservedblocks;
-            /// <summary>DOS reserved blocks at end of partition</summary>
-            public uint Prealloc;
-            /// <summary>Interleave</summary>
-            public uint Interleave;
-            /// <summary>First cylinder of a partition, inclusive</summary>
-            public uint LowCylinder;
-            /// <summary>Last cylinder of a partition, inclusive</summary>
-            public uint HighCylinder;
-            /// <summary>Buffers, usually 30</summary>
-            public uint NumBuffer;
-            /// <summary>Type of memory to allocate for buffers</summary>
-            public uint BufMemType;
-            /// <summary>Maximum transfer, usually 0x7FFFFFFF</summary>
-            public uint MaxTransfer;
-            /// <summary>Address mask to block out certain memory, usually 0xFFFFFFFE</summary>
-            public uint Mask;
-            /// <summary>Boot priority</summary>
-            public uint BootPriority;
-            /// <summary>Partition type, and filesystem driver identification for AmigaDOS</summary>
-            public uint DosType;
-            /// <summary>Default baud rate for SER and AUX handlers</summary>
-            public uint Baud;
-            /// <summary>Flow control values for SER and AUX handlers</summary>
-            public uint Control;
-            /// <summary>Since Kickstart 2, how many boot blocks are to be loaded</summary>
-            public uint BootBlocks;
-        }
-
-        struct PartitionEntry
-        {
-            /// <summary>"PART"</summary>
-            public uint Magic;
-            /// <summary>Size in longs</summary>
-            public uint Size;
-            /// <summary>Checksum</summary>
-            public int Checksum;
-            /// <summary>SCSI target ID, 7 for non-SCSI</summary>
-            public uint TargetId;
-            /// <summary>Pointer to next PartitionEntry</summary>
-            public uint NextPtr;
-            /// <summary>Partition flags</summary>
-            public uint Flags;
-            /// <summary>Reserved</summary>
-            public uint Reserved1;
-            /// <summary>Reserved</summary>
-            public uint Reserved2;
-            /// <summary>Preferred flags for OpenDevice()</summary>
-            public uint DevFlags;
-            /// <summary>Length of drive name</summary>
-            public uint DriveNameLen;
-            /// <summary>Drive name, 31 bytes</summary>
-            public string DriveName;
-            /// <summary>Reserved</summary>
-            public uint Reserved3;
-            /// <summary>Reserved</summary>
-            public uint Reserved4;
-            /// <summary>Reserved</summary>
-            public uint Reserved5;
-            /// <summary>Reserved</summary>
-            public uint Reserved6;
-            /// <summary>Reserved</summary>
-            public uint Reserved7;
-            /// <summary>Reserved</summary>
-            public uint Reserved8;
-            /// <summary>Reserved</summary>
-            public uint Reserved9;
-            /// <summary>Reserved</summary>
-            public uint Reserved10;
-            /// <summary>Reserved</summary>
-            public uint Reserved11;
-            /// <summary>Reserved</summary>
-            public uint Reserved12;
-            /// <summary>Reserved</summary>
-            public uint Reserved13;
-            /// <summary>Reserved</summary>
-            public uint Reserved14;
-            /// <summary>Reserved</summary>
-            public uint Reserved15;
-            /// <summary>Reserved</summary>
-            public uint Reserved16;
-            /// <summary>Reserved</summary>
-            public uint Reserved17;
-            /// <summary>DOSEnvVec, more information about partition</summary>
-            public DosEnvironmentVector DosEnvVec;
-        }
-
-        /// <summary>Device node, mostly useless, except for pointer to first LoadSegment block</summary>
-        struct DeviceNode
-        {
-            /// <summary>Device node type, =0</summary>
-            public uint Type;
-            /// <summary>DOS task field, =0</summary>
-            public uint Task;
-            /// <summary>Unused, =0</summary>
-            public uint Locked;
-            /// <summary>Filename handler to LoadSegment, =0</summary>
-            public uint Handler;
-            /// <summary>Stack size when starting task, =0</summary>
-            public uint StackSize;
-            /// <summary>Task priority, =0</summary>
-            public uint Priority;
-            /// <summary>Startup message, =0</summary>
-            public uint Startup;
-            /// <summary>Pointer to first LoadSegment block</summary>
-            public uint SeglistPtr;
-            /// <summary>BCPL globabl vector when starting task, =0xFFFFFFFF</summary>
-            public uint GlobalVec;
-        }
-
-        /// <summary>File system header</summary>
-        struct FileSystemHeader
-        {
-            /// <summary>"FSHD"</summary>
-            public uint Magic;
-            /// <summary>Size in longs, 64</summary>
-            public uint Size;
-            /// <summary>Checksum</summary>
-            public int Checksum;
-            /// <summary>SCSI target ID, 7 for non-SCSI</summary>
-            public uint TargetId;
-            /// <summary>Pointer to next FileSystemHeader block</summary>
-            public uint NextPtr;
-            /// <summary>Flags, unknown</summary>
-            public uint Flags;
-            /// <summary>Reserved</summary>
-            public uint Reserved1;
-            /// <summary>Reserved</summary>
-            public uint Reserved2;
-            /// <summary>Partition type, and filesystem driver identification for AmigaDOS</summary>
-            public uint DosType;
-            /// <summary>Filesystem version Mask 0xFFFF0000, >>16, major version Mask 0x0000FFFF, minor version</summary>
-            public uint Version;
-            /// <summary>Bits for DeviceNode fields that should be substituted into a standard device node</summary>
-            public uint PatchFlags;
-            /// <summary>Device node</summary>
-            public DeviceNode Dnode;
-        }
-
-        /// <summary>Filesystem code</summary>
-        struct LoadSegment
-        {
-            /// <summary>"LSEG"</summary>
-            public uint Magic;
-            /// <summary>Size in longs</summary>
-            public uint Size;
-            /// <summary>Checksum</summary>
-            public int Checksum;
-            /// <summary>SCSI target ID, 7 for non-SCSI</summary>
-            public uint TargetId;
-            /// <summary>Pointer to next LoadSegment</summary>
-            public uint NextPtr;
-            /// <summary>Executable code, with relocation hunks, til end of sector</summary>
-            public byte[] LoadData;
         }
     }
+
+    static string AmigaDosTypeToString(uint amigaDosType, bool quoted = true)
+    {
+        byte[] textPart = new byte[3];
+
+        textPart[0] = (byte)((amigaDosType & 0xFF000000) >> 24);
+        textPart[1] = (byte)((amigaDosType & 0x00FF0000) >> 16);
+        textPart[2] = (byte)((amigaDosType & 0x0000FF00) >> 8);
+
+        string textPartString = Encoding.ASCII.GetString(textPart);
+
+        return quoted ? $"\"{textPartString}\\{amigaDosType & 0xFF}\"" : $"{textPartString}\\{amigaDosType & 0xFF}";
+    }
+
+    /// <summary>Amiga Rigid Disk Block, header for partitioning scheme Can be in any sector from 0 to 15, inclusive</summary>
+    struct RigidDiskBlock
+    {
+        /// <summary>"RDSK"</summary>
+        public uint Magic;
+        /// <summary>Size in longs</summary>
+        public uint Size;
+        /// <summary>Checksum</summary>
+        public int Checksum;
+        /// <summary>SCSI target ID, 7 for non-SCSI</summary>
+        public uint TargetId;
+        /// <summary>Block size in bytes</summary>
+        public uint BlockSize;
+        /// <summary>Flags</summary>
+        public uint Flags;
+        /// <summary>Pointer to first BadBlockList, 0xFFFFFFFF means last block in device</summary>
+        public uint BadblockPtr;
+        /// <summary>Pointer to first PartitionEntry, 0xFFFFFFFF means last block in device</summary>
+        public uint PartitionPtr;
+        /// <summary>Pointer to first FileSystemHeader, 0xFFFFFFFF means last block in device</summary>
+        public uint FsheaderPtr;
+        /// <summary>Optional drive specific init code</summary>
+        public uint Driveinitcode;
+        /// <summary>Reserved, should be 0xFFFFFFFF</summary>
+        public uint Reserved1;
+        /// <summary>Reserved, should be 0xFFFFFFFF</summary>
+        public uint Reserved2;
+        /// <summary>Reserved, should be 0xFFFFFFFF</summary>
+        public uint Reserved3;
+        /// <summary>Reserved, should be 0xFFFFFFFF</summary>
+        public uint Reserved4;
+        /// <summary>Reserved, should be 0xFFFFFFFF</summary>
+        public uint Reserved5;
+        /// <summary>Reserved, should be 0xFFFFFFFF</summary>
+        public uint Reserved6;
+        /// <summary>Cylinders in drive</summary>
+        public uint Cylinders;
+        /// <summary>Sectors per track</summary>
+        public uint Spt;
+        /// <summary>Heads in drive</summary>
+        public uint Heads;
+        /// <summary>Drive interleave</summary>
+        public uint Interleave;
+        /// <summary>Cylinder for parking heads</summary>
+        public uint Parking;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved7;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved8;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved9;
+        /// <summary>Starting cylinder for write precompensation</summary>
+        public uint Writeprecomp;
+        /// <summary>Starting cylinder for reduced write current</summary>
+        public uint Reducedwrite;
+        /// <summary>Drive step rate</summary>
+        public uint Steprate;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved10;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved11;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved12;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved13;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved14;
+        /// <summary>Low block of RDB reserved blocks</summary>
+        public uint RdbBlockLow;
+        /// <summary>High block of RDB reserved blocks</summary>
+        public uint RdbBlockHigh;
+        /// <summary>Low cylinder for partitionable area</summary>
+        public uint LowCylinder;
+        /// <summary>High cylinder for partitionable area</summary>
+        public uint HighCylinder;
+        /// <summary>Blocks per cylinder</summary>
+        public uint CylBlocks;
+        /// <summary>Seconds for head autoparking</summary>
+        public uint AutoParkSeconds;
+        /// <summary>Highest block used by RDB</summary>
+        public uint HighRdskBlock;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved15;
+        /// <summary>Disk vendor, 8 bytes</summary>
+        public string DiskVendor;
+        /// <summary>Disk product, 16 bytes</summary>
+        public string DiskProduct;
+        /// <summary>Disk revision, 4 bytes</summary>
+        public string DiskRevision;
+        /// <summary>Controller vendor, 8 bytes</summary>
+        public string ControllerVendor;
+        /// <summary>Controller product, 16 bytes</summary>
+        public string ControllerProduct;
+        /// <summary>Controller revision, 4 bytes</summary>
+        public string ControllerRevision;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved16;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved17;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved18;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved19;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved20;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved21;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved22;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved23;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved24;
+        /// <summary>Reserved, should be zero</summary>
+        public uint Reserved25;
+    }
+
+    /// <summary>Pair for spare blocks</summary>
+    struct BadBlockEntry
+    {
+        /// <summary>Bad block pointer</summary>
+        public uint BadBlock;
+        /// <summary>Replacement block pointer</summary>
+        public uint GoodBlock;
+    }
+
+    /// <summary>List of bad blocks and spares</summary>
+    struct BadBlockList
+    {
+        /// <summary>"BADB"</summary>
+        public uint Magic;
+        /// <summary>Size in longs</summary>
+        public uint Size;
+        /// <summary>Checksum</summary>
+        public int Checksum;
+        /// <summary>SCSI target ID, 7 for non-SCSI</summary>
+        public uint TargetId;
+        /// <summary>Pointer for next BadBlockList</summary>
+        public uint NextPtr;
+        /// <summary>Reserved</summary>
+        public uint Reserved;
+        /// <summary>Bad block entries, up to block filling, 8 bytes each</summary>
+        public BadBlockEntry[] BlockPairs;
+    }
+
+    /// <summary>DOSEnvVec, used by AmigaDOS</summary>
+    struct DosEnvironmentVector
+    {
+        /// <summary>Size in longs, should be 16, minimum 11</summary>
+        public uint Size;
+        /// <summary>Block size in longs</summary>
+        public uint BlockSize;
+        /// <summary>Unknown, 0</summary>
+        public uint SecOrg;
+        /// <summary>Heads in drive</summary>
+        public uint Surfaces;
+        /// <summary>Sectors per block</summary>
+        public uint Spb;
+        /// <summary>Blocks per track</summary>
+        public uint Bpt;
+        /// <summary>DOS reserved blocks at start of partition</summary>
+        public uint Reservedblocks;
+        /// <summary>DOS reserved blocks at end of partition</summary>
+        public uint Prealloc;
+        /// <summary>Interleave</summary>
+        public uint Interleave;
+        /// <summary>First cylinder of a partition, inclusive</summary>
+        public uint LowCylinder;
+        /// <summary>Last cylinder of a partition, inclusive</summary>
+        public uint HighCylinder;
+        /// <summary>Buffers, usually 30</summary>
+        public uint NumBuffer;
+        /// <summary>Type of memory to allocate for buffers</summary>
+        public uint BufMemType;
+        /// <summary>Maximum transfer, usually 0x7FFFFFFF</summary>
+        public uint MaxTransfer;
+        /// <summary>Address mask to block out certain memory, usually 0xFFFFFFFE</summary>
+        public uint Mask;
+        /// <summary>Boot priority</summary>
+        public uint BootPriority;
+        /// <summary>Partition type, and filesystem driver identification for AmigaDOS</summary>
+        public uint DosType;
+        /// <summary>Default baud rate for SER and AUX handlers</summary>
+        public uint Baud;
+        /// <summary>Flow control values for SER and AUX handlers</summary>
+        public uint Control;
+        /// <summary>Since Kickstart 2, how many boot blocks are to be loaded</summary>
+        public uint BootBlocks;
+    }
+
+    struct PartitionEntry
+    {
+        /// <summary>"PART"</summary>
+        public uint Magic;
+        /// <summary>Size in longs</summary>
+        public uint Size;
+        /// <summary>Checksum</summary>
+        public int Checksum;
+        /// <summary>SCSI target ID, 7 for non-SCSI</summary>
+        public uint TargetId;
+        /// <summary>Pointer to next PartitionEntry</summary>
+        public uint NextPtr;
+        /// <summary>Partition flags</summary>
+        public uint Flags;
+        /// <summary>Reserved</summary>
+        public uint Reserved1;
+        /// <summary>Reserved</summary>
+        public uint Reserved2;
+        /// <summary>Preferred flags for OpenDevice()</summary>
+        public uint DevFlags;
+        /// <summary>Length of drive name</summary>
+        public uint DriveNameLen;
+        /// <summary>Drive name, 31 bytes</summary>
+        public string DriveName;
+        /// <summary>Reserved</summary>
+        public uint Reserved3;
+        /// <summary>Reserved</summary>
+        public uint Reserved4;
+        /// <summary>Reserved</summary>
+        public uint Reserved5;
+        /// <summary>Reserved</summary>
+        public uint Reserved6;
+        /// <summary>Reserved</summary>
+        public uint Reserved7;
+        /// <summary>Reserved</summary>
+        public uint Reserved8;
+        /// <summary>Reserved</summary>
+        public uint Reserved9;
+        /// <summary>Reserved</summary>
+        public uint Reserved10;
+        /// <summary>Reserved</summary>
+        public uint Reserved11;
+        /// <summary>Reserved</summary>
+        public uint Reserved12;
+        /// <summary>Reserved</summary>
+        public uint Reserved13;
+        /// <summary>Reserved</summary>
+        public uint Reserved14;
+        /// <summary>Reserved</summary>
+        public uint Reserved15;
+        /// <summary>Reserved</summary>
+        public uint Reserved16;
+        /// <summary>Reserved</summary>
+        public uint Reserved17;
+        /// <summary>DOSEnvVec, more information about partition</summary>
+        public DosEnvironmentVector DosEnvVec;
+    }
+
+    /// <summary>Device node, mostly useless, except for pointer to first LoadSegment block</summary>
+    struct DeviceNode
+    {
+        /// <summary>Device node type, =0</summary>
+        public uint Type;
+        /// <summary>DOS task field, =0</summary>
+        public uint Task;
+        /// <summary>Unused, =0</summary>
+        public uint Locked;
+        /// <summary>Filename handler to LoadSegment, =0</summary>
+        public uint Handler;
+        /// <summary>Stack size when starting task, =0</summary>
+        public uint StackSize;
+        /// <summary>Task priority, =0</summary>
+        public uint Priority;
+        /// <summary>Startup message, =0</summary>
+        public uint Startup;
+        /// <summary>Pointer to first LoadSegment block</summary>
+        public uint SeglistPtr;
+        /// <summary>BCPL globabl vector when starting task, =0xFFFFFFFF</summary>
+        public uint GlobalVec;
+    }
+
+    /// <summary>File system header</summary>
+    struct FileSystemHeader
+    {
+        /// <summary>"FSHD"</summary>
+        public uint Magic;
+        /// <summary>Size in longs, 64</summary>
+        public uint Size;
+        /// <summary>Checksum</summary>
+        public int Checksum;
+        /// <summary>SCSI target ID, 7 for non-SCSI</summary>
+        public uint TargetId;
+        /// <summary>Pointer to next FileSystemHeader block</summary>
+        public uint NextPtr;
+        /// <summary>Flags, unknown</summary>
+        public uint Flags;
+        /// <summary>Reserved</summary>
+        public uint Reserved1;
+        /// <summary>Reserved</summary>
+        public uint Reserved2;
+        /// <summary>Partition type, and filesystem driver identification for AmigaDOS</summary>
+        public uint DosType;
+        /// <summary>Filesystem version Mask 0xFFFF0000, >>16, major version Mask 0x0000FFFF, minor version</summary>
+        public uint Version;
+        /// <summary>Bits for DeviceNode fields that should be substituted into a standard device node</summary>
+        public uint PatchFlags;
+        /// <summary>Device node</summary>
+        public DeviceNode Dnode;
+    }
+
+    /// <summary>Filesystem code</summary>
+    struct LoadSegment
+    {
+        /// <summary>"LSEG"</summary>
+        public uint Magic;
+        /// <summary>Size in longs</summary>
+        public uint Size;
+        /// <summary>Checksum</summary>
+        public int Checksum;
+        /// <summary>SCSI target ID, 7 for non-SCSI</summary>
+        public uint TargetId;
+        /// <summary>Pointer to next LoadSegment</summary>
+        public uint NextPtr;
+        /// <summary>Executable code, with relocation hunks, til end of sector</summary>
+        public byte[] LoadData;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/RioKarma.cs b/Aaru.Partitions/RioKarma.cs
index cb61a5d61..c54fcc54b 100644
--- a/Aaru.Partitions/RioKarma.cs
+++ b/Aaru.Partitions/RioKarma.cs
@@ -39,73 +39,72 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of Rio Karma partitions</summary>
+public sealed class RioKarma : IPartition
 {
+    const ushort KARMA_MAGIC = 0xAB56;
+    const byte   ENTRY_MAGIC = 0x4D;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of Rio Karma partitions</summary>
-    public sealed class RioKarma : IPartition
+    public string Name => "Rio Karma partitioning";
+    /// <inheritdoc />
+    public Guid Id => new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        const ushort KARMA_MAGIC = 0xAB56;
-        const byte   ENTRY_MAGIC = 0x4D;
+        partitions = null;
+        var errno = imagePlugin.ReadSector(sectorOffset, out byte[] sector);
 
-        /// <inheritdoc />
-        public string Name => "Rio Karma partitioning";
-        /// <inheritdoc />
-        public Guid Id => new Guid("246A6D93-4F1A-1F8A-344D-50187A5513A9");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(errno != ErrorNumber.NoError ||sector.Length < 512)
+            return false;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
-        {
-            partitions = null;
-            var errno = imagePlugin.ReadSector(sectorOffset, out byte[] sector);
+        Table table = Marshal.ByteArrayToStructureLittleEndian<Table>(sector);
 
-            if(errno != ErrorNumber.NoError ||sector.Length < 512)
-                return false;
+        if(table.magic != KARMA_MAGIC)
+            return false;
 
-            Table table = Marshal.ByteArrayToStructureLittleEndian<Table>(sector);
+        ulong counter = 0;
 
-            if(table.magic != KARMA_MAGIC)
-                return false;
+        partitions = (from entry in table.entries let part = new Partition
+                         {
+                             Start    = entry.offset,
+                             Offset   = (ulong)(entry.offset * sector.Length),
+                             Size     = entry.size,
+                             Length   = (ulong)(entry.size * sector.Length),
+                             Type     = "Rio Karma",
+                             Sequence = counter++,
+                             Scheme   = Name
+                         } where entry.type == ENTRY_MAGIC select part).ToList();
 
-            ulong counter = 0;
+        return true;
+    }
 
-            partitions = (from entry in table.entries let part = new Partition
-                             {
-                                 Start    = entry.offset,
-                                 Offset   = (ulong)(entry.offset * sector.Length),
-                                 Size     = entry.size,
-                                 Length   = (ulong)(entry.size * sector.Length),
-                                 Type     = "Rio Karma",
-                                 Sequence = counter++,
-                                 Scheme   = Name
-                             } where entry.type == ENTRY_MAGIC select part).ToList();
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Table
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 270)]
+        public readonly byte[] reserved;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
+        public readonly Entry[] entries;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 208)]
+        public readonly byte[] padding;
+        public readonly ushort magic;
+    }
 
-            return true;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Table
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 270)]
-            public readonly byte[] reserved;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 2)]
-            public readonly Entry[] entries;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 208)]
-            public readonly byte[] padding;
-            public readonly ushort magic;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Entry
-        {
-            public readonly uint reserved;
-            public readonly byte type;
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly byte[] reserved2;
-            public readonly uint offset;
-            public readonly uint size;
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Entry
+    {
+        public readonly uint reserved;
+        public readonly byte type;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly byte[] reserved2;
+        public readonly uint offset;
+        public readonly uint size;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/SGI.cs b/Aaru.Partitions/SGI.cs
index 35821f2c7..b4d37c8e7 100644
--- a/Aaru.Partitions/SGI.cs
+++ b/Aaru.Partitions/SGI.cs
@@ -43,245 +43,244 @@ using Marshal = Aaru.Helpers.Marshal;
 #pragma warning disable 169
 #pragma warning disable 649
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of the SGI Disk Volume Header</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed class SGI : IPartition
 {
+    const int SGI_MAGIC = 0x0BE5A941;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of the SGI Disk Volume Header</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed class SGI : IPartition
+    public string Name => "SGI Disk Volume Header";
+    /// <inheritdoc />
+    public Guid Id => new("AEF5AB45-4880-4CE8-8735-F0A402E2E5F2");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<CommonTypes.Partition> partitions,
+                               ulong sectorOffset)
     {
-        const int SGI_MAGIC = 0x0BE5A941;
+        partitions = new List<CommonTypes.Partition>();
 
-        /// <inheritdoc />
-        public string Name => "SGI Disk Volume Header";
-        /// <inheritdoc />
-        public Guid Id => new("AEF5AB45-4880-4CE8-8735-F0A402E2E5F2");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(sectorOffset, out byte[] sector);
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<CommonTypes.Partition> partitions,
-                                   ulong sectorOffset)
+        if(errno         != ErrorNumber.NoError ||
+           sector.Length < 512)
+            return false;
+
+        Label dvh = Marshal.ByteArrayToStructureBigEndian<Label>(sector);
+
+        for(int i = 0; i < dvh.volume.Length; i++)
+            dvh.volume[i] = (Volume)Marshal.SwapStructureMembersEndian(dvh.volume[i]);
+
+        for(int i = 0; i < dvh.partitions.Length; i++)
+            dvh.partitions[i] = (Partition)Marshal.SwapStructureMembersEndian(dvh.partitions[i]);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.magic = 0x{0:X8} (should be 0x{1:X8})", dvh.magic,
+                                   SGI_MAGIC);
+
+        if(dvh.magic != SGI_MAGIC)
+            return false;
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.root_part_num = {0}", dvh.root_part_num);
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.swap_part_num = {0}", dvh.swap_part_num);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.boot_file = \"{0}\"",
+                                   StringHandlers.CToString(dvh.boot_file));
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_skew = {0}", dvh.device_params.dp_skew);
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_gap1 = {0}", dvh.device_params.dp_gap1);
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_gap2 = {0}", dvh.device_params.dp_gap2);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_spares_cyl = {0}",
+                                   dvh.device_params.dp_spares_cyl);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_cyls = {0}", dvh.device_params.dp_cyls);
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_shd0 = {0}", dvh.device_params.dp_shd0);
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_trks0 = {0}", dvh.device_params.dp_trks0);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_ctq_depth = {0}",
+                                   dvh.device_params.dp_ctq_depth);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_cylshi = {0}",
+                                   dvh.device_params.dp_cylshi);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_secs = {0}", dvh.device_params.dp_secs);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_secbytes = {0}",
+                                   dvh.device_params.dp_secbytes);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_interleave = {0}",
+                                   dvh.device_params.dp_interleave);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_flags = {0}", dvh.device_params.dp_flags);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_datarate = {0}",
+                                   dvh.device_params.dp_datarate);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_nretries = {0}",
+                                   dvh.device_params.dp_nretries);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_mspw = {0}", dvh.device_params.dp_mspw);
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xgap1 = {0}", dvh.device_params.dp_xgap1);
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xsync = {0}", dvh.device_params.dp_xsync);
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xrdly = {0}", dvh.device_params.dp_xrdly);
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xgap2 = {0}", dvh.device_params.dp_xgap2);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xrgate = {0}",
+                                   dvh.device_params.dp_xrgate);
+
+        AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xwcont = {0}",
+                                   dvh.device_params.dp_xwcont);
+
+        ulong counter = 0;
+
+        for(int i = 0; i < dvh.partitions.Length; i++)
         {
-            partitions = new List<CommonTypes.Partition>();
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.partitions[{0}].num_blocks = {1}", i,
+                                       dvh.partitions[i].num_blocks);
 
-            ErrorNumber errno = imagePlugin.ReadSector(sectorOffset, out byte[] sector);
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.partitions[{0}].first_block = {1}", i,
+                                       dvh.partitions[i].first_block);
 
-            if(errno         != ErrorNumber.NoError ||
-               sector.Length < 512)
-                return false;
+            // TODO: Solve big endian marshal with enumerations
+            dvh.partitions[i].type = (SGIType)Swapping.Swap((uint)dvh.partitions[i].type);
+            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.partitions[{0}].type = {1}", i, dvh.partitions[i].type);
 
-            Label dvh = Marshal.ByteArrayToStructureBigEndian<Label>(sector);
-
-            for(int i = 0; i < dvh.volume.Length; i++)
-                dvh.volume[i] = (Volume)Marshal.SwapStructureMembersEndian(dvh.volume[i]);
-
-            for(int i = 0; i < dvh.partitions.Length; i++)
-                dvh.partitions[i] = (Partition)Marshal.SwapStructureMembersEndian(dvh.partitions[i]);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.magic = 0x{0:X8} (should be 0x{1:X8})", dvh.magic,
-                                       SGI_MAGIC);
-
-            if(dvh.magic != SGI_MAGIC)
-                return false;
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.root_part_num = {0}", dvh.root_part_num);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.swap_part_num = {0}", dvh.swap_part_num);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.boot_file = \"{0}\"",
-                                       StringHandlers.CToString(dvh.boot_file));
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_skew = {0}", dvh.device_params.dp_skew);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_gap1 = {0}", dvh.device_params.dp_gap1);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_gap2 = {0}", dvh.device_params.dp_gap2);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_spares_cyl = {0}",
-                                       dvh.device_params.dp_spares_cyl);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_cyls = {0}", dvh.device_params.dp_cyls);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_shd0 = {0}", dvh.device_params.dp_shd0);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_trks0 = {0}", dvh.device_params.dp_trks0);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_ctq_depth = {0}",
-                                       dvh.device_params.dp_ctq_depth);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_cylshi = {0}",
-                                       dvh.device_params.dp_cylshi);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_secs = {0}", dvh.device_params.dp_secs);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_secbytes = {0}",
-                                       dvh.device_params.dp_secbytes);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_interleave = {0}",
-                                       dvh.device_params.dp_interleave);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_flags = {0}", dvh.device_params.dp_flags);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_datarate = {0}",
-                                       dvh.device_params.dp_datarate);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_nretries = {0}",
-                                       dvh.device_params.dp_nretries);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_mspw = {0}", dvh.device_params.dp_mspw);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xgap1 = {0}", dvh.device_params.dp_xgap1);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xsync = {0}", dvh.device_params.dp_xsync);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xrdly = {0}", dvh.device_params.dp_xrdly);
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xgap2 = {0}", dvh.device_params.dp_xgap2);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xrgate = {0}",
-                                       dvh.device_params.dp_xrgate);
-
-            AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.device_params.dp_xwcont = {0}",
-                                       dvh.device_params.dp_xwcont);
-
-            ulong counter = 0;
-
-            for(int i = 0; i < dvh.partitions.Length; i++)
+            var part = new CommonTypes.Partition
             {
-                AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.partitions[{0}].num_blocks = {1}", i,
-                                           dvh.partitions[i].num_blocks);
+                Start    = dvh.partitions[i].first_block * dvh.device_params.dp_secbytes / imagePlugin.Info.SectorSize,
+                Offset   = dvh.partitions[i].first_block * dvh.device_params.dp_secbytes,
+                Length   = dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes / imagePlugin.Info.SectorSize,
+                Size     = dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes,
+                Type     = TypeToString(dvh.partitions[i].type),
+                Sequence = counter,
+                Scheme   = Name
+            };
 
-                AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.partitions[{0}].first_block = {1}", i,
-                                           dvh.partitions[i].first_block);
+            if(part.Size              <= 0              ||
+               dvh.partitions[i].type == SGIType.Header ||
+               dvh.partitions[i].type == SGIType.Volume)
+                continue;
 
-                // TODO: Solve big endian marshal with enumerations
-                dvh.partitions[i].type = (SGIType)Swapping.Swap((uint)dvh.partitions[i].type);
-                AaruConsole.DebugWriteLine("SGIVH plugin", "dvh.partitions[{0}].type = {1}", i, dvh.partitions[i].type);
-
-                var part = new CommonTypes.Partition
-                {
-                    Start = dvh.partitions[i].first_block * dvh.device_params.dp_secbytes / imagePlugin.Info.SectorSize,
-                    Offset = dvh.partitions[i].first_block * dvh.device_params.dp_secbytes,
-                    Length = dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes / imagePlugin.Info.SectorSize,
-                    Size = dvh.partitions[i].num_blocks * dvh.device_params.dp_secbytes,
-                    Type = TypeToString(dvh.partitions[i].type),
-                    Sequence = counter,
-                    Scheme = Name
-                };
-
-                if(part.Size              <= 0              ||
-                   dvh.partitions[i].type == SGIType.Header ||
-                   dvh.partitions[i].type == SGIType.Volume)
-                    continue;
-
-                partitions.Add(part);
-                counter++;
-            }
-
-            return true;
+            partitions.Add(part);
+            counter++;
         }
 
-        static string TypeToString(SGIType typ)
-        {
-            switch(typ)
-            {
-                case SGIType.Header:    return "Volume header";
-                case SGIType.TrkRepl:   return "Track replacements";
-                case SGIType.SecRepl:   return "Sector replacements";
-                case SGIType.Swap:      return "Raw data (swap)";
-                case SGIType.Bsd:       return "4.2BSD Fast File System";
-                case SGIType.SystemV:   return "UNIX System V";
-                case SGIType.Volume:    return "Whole device";
-                case SGIType.EFS:       return "EFS";
-                case SGIType.Lvol:      return "Logical volume";
-                case SGIType.Rlvol:     return "Raw logical volume";
-                case SGIType.XFS:       return "XFS";
-                case SGIType.Xlvol:     return "XFS log device";
-                case SGIType.Rxlvol:    return "XLV volume";
-                case SGIType.Xvm:       return "SGI XVM";
-                case SGIType.LinuxSwap: return "Linux swap";
-                case SGIType.Linux:     return "Linux";
-                case SGIType.LinuxRAID: return "Linux RAID";
-                default:                return "Unknown";
-            }
-        }
+        return true;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Label
+    static string TypeToString(SGIType typ)
+    {
+        switch(typ)
         {
-            /// <summary></summary>
-            public readonly uint magic;
-            /// <summary></summary>
-            public readonly short root_part_num;
-            /// <summary></summary>
-            public readonly short swap_part_num;
-            /// <summary></summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly byte[] boot_file;
-            /// <summary></summary>
-            public readonly DeviceParameters device_params;
-            /// <summary></summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
-            public readonly Volume[] volume;
-            /// <summary></summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
-            public readonly Partition[] partitions;
-            /// <summary></summary>
-            public readonly uint csum;
-            /// <summary></summary>
-            public readonly uint padding;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Volume
-        {
-            /// <summary></summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] name;
-            /// <summary></summary>
-            public readonly uint block_num;
-            /// <summary></summary>
-            public readonly uint num_bytes;
-        }
-
-        enum SGIType : uint
-        {
-            Header = 0, TrkRepl      = 1, SecRepl      = 2,
-            Swap   = 3, Bsd          = 4, SystemV      = 5,
-            Volume = 6, EFS          = 7, Lvol         = 8,
-            Rlvol  = 9, XFS          = 0xA, Xlvol      = 0xB,
-            Rxlvol = 0xC, Xvm        = 0x0D, LinuxSwap = 0x82,
-            Linux  = 0x83, LinuxRAID = 0xFD
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Partition
-        {
-            /// <summary></summary>
-            public readonly uint num_blocks;
-            /// <summary></summary>
-            public readonly uint first_block;
-            /// <summary></summary>
-            public SGIType type;
-        }
-
-        struct DeviceParameters
-        {
-            public byte   dp_skew;
-            public byte   dp_gap1;
-            public byte   dp_gap2;
-            public byte   dp_spares_cyl;
-            public ushort dp_cyls;
-            public ushort dp_shd0;
-            public ushort dp_trks0;
-            public byte   dp_ctq_depth;
-            public byte   dp_cylshi;
-            public ushort dp_unused;
-            public ushort dp_secs;
-            public ushort dp_secbytes;
-            public ushort dp_interleave;
-            public uint   dp_flags;
-            public uint   dp_datarate;
-            public uint   dp_nretries;
-            public uint   dp_mspw;
-            public ushort dp_xgap1;
-            public ushort dp_xsync;
-            public ushort dp_xrdly;
-            public ushort dp_xgap2;
-            public ushort dp_xrgate;
-            public ushort dp_xwcont;
+            case SGIType.Header:    return "Volume header";
+            case SGIType.TrkRepl:   return "Track replacements";
+            case SGIType.SecRepl:   return "Sector replacements";
+            case SGIType.Swap:      return "Raw data (swap)";
+            case SGIType.Bsd:       return "4.2BSD Fast File System";
+            case SGIType.SystemV:   return "UNIX System V";
+            case SGIType.Volume:    return "Whole device";
+            case SGIType.EFS:       return "EFS";
+            case SGIType.Lvol:      return "Logical volume";
+            case SGIType.Rlvol:     return "Raw logical volume";
+            case SGIType.XFS:       return "XFS";
+            case SGIType.Xlvol:     return "XFS log device";
+            case SGIType.Rxlvol:    return "XLV volume";
+            case SGIType.Xvm:       return "SGI XVM";
+            case SGIType.LinuxSwap: return "Linux swap";
+            case SGIType.Linux:     return "Linux";
+            case SGIType.LinuxRAID: return "Linux RAID";
+            default:                return "Unknown";
         }
     }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Label
+    {
+        /// <summary></summary>
+        public readonly uint magic;
+        /// <summary></summary>
+        public readonly short root_part_num;
+        /// <summary></summary>
+        public readonly short swap_part_num;
+        /// <summary></summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly byte[] boot_file;
+        /// <summary></summary>
+        public readonly DeviceParameters device_params;
+        /// <summary></summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 15)]
+        public readonly Volume[] volume;
+        /// <summary></summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
+        public readonly Partition[] partitions;
+        /// <summary></summary>
+        public readonly uint csum;
+        /// <summary></summary>
+        public readonly uint padding;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Volume
+    {
+        /// <summary></summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] name;
+        /// <summary></summary>
+        public readonly uint block_num;
+        /// <summary></summary>
+        public readonly uint num_bytes;
+    }
+
+    enum SGIType : uint
+    {
+        Header = 0, TrkRepl      = 1, SecRepl      = 2,
+        Swap   = 3, Bsd          = 4, SystemV      = 5,
+        Volume = 6, EFS          = 7, Lvol         = 8,
+        Rlvol  = 9, XFS          = 0xA, Xlvol      = 0xB,
+        Rxlvol = 0xC, Xvm        = 0x0D, LinuxSwap = 0x82,
+        Linux  = 0x83, LinuxRAID = 0xFD
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Partition
+    {
+        /// <summary></summary>
+        public readonly uint num_blocks;
+        /// <summary></summary>
+        public readonly uint first_block;
+        /// <summary></summary>
+        public SGIType type;
+    }
+
+    struct DeviceParameters
+    {
+        public byte   dp_skew;
+        public byte   dp_gap1;
+        public byte   dp_gap2;
+        public byte   dp_spares_cyl;
+        public ushort dp_cyls;
+        public ushort dp_shd0;
+        public ushort dp_trks0;
+        public byte   dp_ctq_depth;
+        public byte   dp_cylshi;
+        public ushort dp_unused;
+        public ushort dp_secs;
+        public ushort dp_secbytes;
+        public ushort dp_interleave;
+        public uint   dp_flags;
+        public uint   dp_datarate;
+        public uint   dp_nretries;
+        public uint   dp_mspw;
+        public ushort dp_xgap1;
+        public ushort dp_xsync;
+        public ushort dp_xrdly;
+        public ushort dp_xgap2;
+        public ushort dp_xrgate;
+        public ushort dp_xwcont;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Sun.cs b/Aaru.Partitions/Sun.cs
index 62d5605ac..10beedb42 100644
--- a/Aaru.Partitions/Sun.cs
+++ b/Aaru.Partitions/Sun.cs
@@ -42,693 +42,692 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of Sun disklabels</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed class SunDisklabel : IPartition
 {
+    /// <summary>Sun disklabel magic number</summary>
+    const ushort DKL_MAGIC = 0xDABE;
+    /// <summary>Sun VTOC magic number</summary>
+    const uint VTOC_SANE = 0x600DDEEE;
+    /// <summary>Sun disklabel magic number, byte-swapped</summary>
+    const ushort DKL_CIGAM = 0xBEDA;
+    /// <summary>Sun VTOC magic number, byte-swapped</summary>
+    const uint VTOC_ENAS = 0xEEDE0D60;
+    /// <summary># of logical partitions</summary>
+    const int NDKMAP = 8;
+    /// <summary># of logical partitions</summary>
+    const int NDKMAP16 = 16;
+    /// <summary>Disk label size</summary>
+    const int DK_LABEL_SIZE = 512;
+    /// <summary>Volume label size</summary>
+    const int LEN_DKL_ASCII = 128;
+    /// <summary>Length of v_volume</summary>
+    const int LEN_DKL_VVOL = 8;
+    /// <summary>Size of padding in SunOS disk label</summary>
+    const int LEN_DKL_PAD = DK_LABEL_SIZE - (LEN_DKL_ASCII + (NDKMAP * 8) + (14 * 2));
+    /// <summary>Size of padding in Solaris disk label with 8 partitions</summary>
+    const int LEN_DKL_PAD8 = DK_LABEL_SIZE - (LEN_DKL_ASCII + 136      + // sizeof(dk_vtoc8)
+                                              (NDKMAP * 8)  + (14 * 2) + (2 * 2));
+    const int LEN_DKL_PAD16 = DK_LABEL_SIZE - (456     + // sizeof(dk_vtoc16)
+                                               (4 * 4) + (12 * 2) + (2 * 2));
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of Sun disklabels</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed class SunDisklabel : IPartition
+    public string Name => "Sun Disklabel";
+    /// <inheritdoc />
+    public Guid Id => new("50F35CC4-8375-4445-8DCB-1BA550C931A3");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        /// <summary>Sun disklabel magic number</summary>
-        const ushort DKL_MAGIC = 0xDABE;
-        /// <summary>Sun VTOC magic number</summary>
-        const uint VTOC_SANE = 0x600DDEEE;
-        /// <summary>Sun disklabel magic number, byte-swapped</summary>
-        const ushort DKL_CIGAM = 0xBEDA;
-        /// <summary>Sun VTOC magic number, byte-swapped</summary>
-        const uint VTOC_ENAS = 0xEEDE0D60;
-        /// <summary># of logical partitions</summary>
-        const int NDKMAP = 8;
-        /// <summary># of logical partitions</summary>
-        const int NDKMAP16 = 16;
-        /// <summary>Disk label size</summary>
-        const int DK_LABEL_SIZE = 512;
-        /// <summary>Volume label size</summary>
-        const int LEN_DKL_ASCII = 128;
-        /// <summary>Length of v_volume</summary>
-        const int LEN_DKL_VVOL = 8;
-        /// <summary>Size of padding in SunOS disk label</summary>
-        const int LEN_DKL_PAD = DK_LABEL_SIZE - (LEN_DKL_ASCII + (NDKMAP * 8) + (14 * 2));
-        /// <summary>Size of padding in Solaris disk label with 8 partitions</summary>
-        const int LEN_DKL_PAD8 = DK_LABEL_SIZE - (LEN_DKL_ASCII + 136      + // sizeof(dk_vtoc8)
-                                                  (NDKMAP * 8)  + (14 * 2) + (2 * 2));
-        const int LEN_DKL_PAD16 = DK_LABEL_SIZE - (456     + // sizeof(dk_vtoc16)
-                                                   (4 * 4) + (12 * 2) + (2 * 2));
+        partitions = new List<Partition>();
 
-        /// <inheritdoc />
-        public string Name => "Sun Disklabel";
-        /// <inheritdoc />
-        public Guid Id => new("50F35CC4-8375-4445-8DCB-1BA550C931A3");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        if(imagePlugin.Info.SectorSize < 512)
+            return false;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
+            return false;
+
+        bool useDkl = false, useDkl8 = false, useDkl16 = false;
+
+        ErrorNumber errno = imagePlugin.ReadSector(sectorOffset, out byte[] sunSector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        dk_label   dkl   = Marshal.ByteArrayToStructureLittleEndian<dk_label>(sunSector);
+        dk_label8  dkl8  = Marshal.ByteArrayToStructureLittleEndian<dk_label8>(sunSector);
+        dk_label16 dkl16 = Marshal.ByteArrayToStructureLittleEndian<dk_label16>(sunSector);
+
+        AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
+        AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
+        AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
+
+        if(dkl.dkl_magic == DKL_MAGIC ||
+           dkl.dkl_magic == DKL_CIGAM)
+            if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE ||
+               dkl16.dkl_vtoc.v_sanity == VTOC_ENAS)
+                useDkl16 = true;
+            else if(dkl8.dkl_vtoc.v_sanity == VTOC_SANE ||
+                    dkl8.dkl_vtoc.v_sanity == VTOC_ENAS)
+                useDkl8 = true;
+            else
+                useDkl = true;
+
+        if(!useDkl  &&
+           !useDkl8 &&
+           !useDkl16)
         {
-            partitions = new List<Partition>();
+            errno = imagePlugin.ReadSector(sectorOffset + 1, out sunSector);
 
-            if(imagePlugin.Info.SectorSize < 512)
-                return false;
+            if(errno == ErrorNumber.NoError)
+            {
+                dkl   = Marshal.ByteArrayToStructureLittleEndian<dk_label>(sunSector);
+                dkl8  = Marshal.ByteArrayToStructureLittleEndian<dk_label8>(sunSector);
+                dkl16 = Marshal.ByteArrayToStructureLittleEndian<dk_label16>(sunSector);
 
-            if(sectorOffset + 2 >= imagePlugin.Info.Sectors)
-                return false;
+                if(dkl.dkl_magic == DKL_MAGIC ||
+                   dkl.dkl_magic == DKL_CIGAM)
+                    if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE ||
+                       dkl16.dkl_vtoc.v_sanity == VTOC_ENAS)
+                        useDkl16 = true;
+                    else if(dkl8.dkl_vtoc.v_sanity == VTOC_SANE ||
+                            dkl8.dkl_vtoc.v_sanity == VTOC_ENAS)
+                        useDkl8 = true;
+                    else
+                        useDkl = true;
+            }
+        }
 
-            bool useDkl = false, useDkl8 = false, useDkl16 = false;
+        if(!useDkl  &&
+           !useDkl8 &&
+           !useDkl16)
+            return false;
 
-            ErrorNumber errno = imagePlugin.ReadSector(sectorOffset, out byte[] sunSector);
+        if(useDkl16 && dkl16.dkl_magic == DKL_CIGAM)
+            dkl16 = SwapDiskLabel(dkl16);
+        else if(useDkl8 && dkl8.dkl_magic == DKL_CIGAM)
+            dkl8 = SwapDiskLabel(dkl8);
+        else if(useDkl && dkl.dkl_magic == DKL_CIGAM)
+            dkl = SwapDiskLabel(dkl);
 
-            if(errno != ErrorNumber.NoError)
-                return false;
+        if(useDkl)
+        {
+            ulong sectorsPerCylinder = (ulong)(dkl.dkl_nsect * dkl.dkl_nhead);
 
-            dk_label   dkl   = Marshal.ByteArrayToStructureLittleEndian<dk_label>(sunSector);
-            dk_label8  dkl8  = Marshal.ByteArrayToStructureLittleEndian<dk_label8>(sunSector);
-            dk_label16 dkl16 = Marshal.ByteArrayToStructureLittleEndian<dk_label16>(sunSector);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_asciilabel = \"{0}\"",
+                                       StringHandlers.CToString(dkl.dkl_asciilabel));
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_rpm = {0}", dkl.dkl_rpm);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_pcyl = {0}", dkl.dkl_pcyl);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_apc = {0}", dkl.dkl_apc);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_gap1 = {0}", dkl.dkl_gap1);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_gap2 = {0}", dkl.dkl_gap2);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_intrlv = {0}", dkl.dkl_intrlv);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_ncyl = {0}", dkl.dkl_ncyl);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_acyl = {0}", dkl.dkl_acyl);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_nhead = {0}", dkl.dkl_nhead);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_nsect = {0}", dkl.dkl_nsect);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_bhead = {0}", dkl.dkl_bhead);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_ppart = {0}", dkl.dkl_ppart);
+
+            for(int i = 0; i < NDKMAP; i++)
+            {
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_map[{0}].dkl_cylno = {1}", i,
+                                           dkl.dkl_map[i].dkl_cylno);
+
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_map[{0}].dkl_nblk = {1}", i,
+                                           dkl.dkl_map[i].dkl_nblk);
+            }
 
             AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
-            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
-            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_cksum = 0x{0:X4}", dkl.dkl_cksum);
+            AaruConsole.DebugWriteLine("Sun plugin", "sectorsPerCylinder = {0}", sectorsPerCylinder);
 
-            if(dkl.dkl_magic == DKL_MAGIC ||
-               dkl.dkl_magic == DKL_CIGAM)
-                if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE ||
-                   dkl16.dkl_vtoc.v_sanity == VTOC_ENAS)
-                    useDkl16 = true;
-                else if(dkl8.dkl_vtoc.v_sanity == VTOC_SANE ||
-                        dkl8.dkl_vtoc.v_sanity == VTOC_ENAS)
-                    useDkl8 = true;
-                else
-                    useDkl = true;
-
-            if(!useDkl  &&
-               !useDkl8 &&
-               !useDkl16)
-            {
-                errno = imagePlugin.ReadSector(sectorOffset + 1, out sunSector);
-
-                if(errno == ErrorNumber.NoError)
+            for(int i = 0; i < NDKMAP; i++)
+                if(dkl.dkl_map[i].dkl_cylno > 0 &&
+                   dkl.dkl_map[i].dkl_nblk  > 0)
                 {
-                    dkl   = Marshal.ByteArrayToStructureLittleEndian<dk_label>(sunSector);
-                    dkl8  = Marshal.ByteArrayToStructureLittleEndian<dk_label8>(sunSector);
-                    dkl16 = Marshal.ByteArrayToStructureLittleEndian<dk_label16>(sunSector);
+                    var part = new Partition
+                    {
+                        Size     = (ulong)dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
+                        Length   = (ulong)(dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
+                        Sequence = (ulong)i,
+                        Offset = (((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
+                                 DK_LABEL_SIZE,
+                        Start = (((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
+                                DK_LABEL_SIZE / imagePlugin.Info.SectorSize,
+                        Type   = "SunOS partition",
+                        Scheme = Name
+                    };
 
-                    if(dkl.dkl_magic == DKL_MAGIC ||
-                       dkl.dkl_magic == DKL_CIGAM)
-                        if(dkl16.dkl_vtoc.v_sanity == VTOC_SANE ||
-                           dkl16.dkl_vtoc.v_sanity == VTOC_ENAS)
-                            useDkl16 = true;
-                        else if(dkl8.dkl_vtoc.v_sanity == VTOC_SANE ||
-                                dkl8.dkl_vtoc.v_sanity == VTOC_ENAS)
-                            useDkl8 = true;
-                        else
-                            useDkl = true;
+                    if(part.Start < imagePlugin.Info.Sectors &&
+                       part.End   <= imagePlugin.Info.Sectors)
+                        partitions.Add(part);
                 }
+        }
+        else if(useDkl8)
+        {
+            ulong sectorsPerCylinder = (ulong)(dkl8.dkl_nsect * dkl8.dkl_nhead);
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_asciilabel = \"{0}\"",
+                                       StringHandlers.CToString(dkl8.dkl_asciilabel));
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_version = {0}", dkl8.dkl_vtoc.v_version);
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_volume = \"{0}\"",
+                                       StringHandlers.CToString(dkl8.dkl_vtoc.v_volume));
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_nparts = {0}", dkl8.dkl_vtoc.v_nparts);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_write_reinstruct = {0}", dkl8.dkl_write_reinstruct);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_read_reinstruct = {0}", dkl8.dkl_read_reinstruct);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_rpm = {0}", dkl8.dkl_rpm);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_pcyl = {0}", dkl8.dkl_pcyl);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_apc = {0}", dkl8.dkl_apc);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs1 = {0}", dkl8.dkl_obs1);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs2 = {0}", dkl8.dkl_obs2);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_intrlv = {0}", dkl8.dkl_intrlv);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_ncyl = {0}", dkl8.dkl_ncyl);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_acyl = {0}", dkl8.dkl_acyl);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_nhead = {0}", dkl8.dkl_nhead);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_nsect = {0}", dkl8.dkl_nsect);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs3 = {0}", dkl8.dkl_obs3);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs4 = {0}", dkl8.dkl_obs4);
+
+            for(int i = 0; i < NDKMAP; i++)
+            {
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_map[{0}].dkl_cylno = {1}", i,
+                                           dkl8.dkl_map[i].dkl_cylno);
+
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_map[{0}].dkl_nblk = {1}", i,
+                                           dkl8.dkl_map[i].dkl_nblk);
+
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_part[{0}].p_tag = {1} ({2})", i,
+                                           dkl8.dkl_vtoc.v_part[i].p_tag, (ushort)dkl8.dkl_vtoc.v_part[i].p_tag);
+
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_part[{0}].p_flag = {1} ({2})", i,
+                                           dkl8.dkl_vtoc.v_part[i].p_flag, (ushort)dkl8.dkl_vtoc.v_part[i].p_flag);
+
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_timestamp[{0}] = {1}", i,
+                                           DateHandlers.UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i]));
             }
 
-            if(!useDkl  &&
-               !useDkl8 &&
-               !useDkl16)
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_magic = 0x{0:X4}", dkl8.dkl_magic);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_cksum = 0x{0:X4}", dkl8.dkl_cksum);
+            AaruConsole.DebugWriteLine("Sun plugin", "sectorsPerCylinder = {0}", sectorsPerCylinder);
+
+            if(dkl8.dkl_vtoc.v_nparts > NDKMAP)
                 return false;
 
-            if(useDkl16 && dkl16.dkl_magic == DKL_CIGAM)
-                dkl16 = SwapDiskLabel(dkl16);
-            else if(useDkl8 && dkl8.dkl_magic == DKL_CIGAM)
-                dkl8 = SwapDiskLabel(dkl8);
-            else if(useDkl && dkl.dkl_magic == DKL_CIGAM)
-                dkl = SwapDiskLabel(dkl);
-
-            if(useDkl)
-            {
-                ulong sectorsPerCylinder = (ulong)(dkl.dkl_nsect * dkl.dkl_nhead);
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_asciilabel = \"{0}\"",
-                                           StringHandlers.CToString(dkl.dkl_asciilabel));
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_rpm = {0}", dkl.dkl_rpm);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_pcyl = {0}", dkl.dkl_pcyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_apc = {0}", dkl.dkl_apc);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_gap1 = {0}", dkl.dkl_gap1);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_gap2 = {0}", dkl.dkl_gap2);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_intrlv = {0}", dkl.dkl_intrlv);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_ncyl = {0}", dkl.dkl_ncyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_acyl = {0}", dkl.dkl_acyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_nhead = {0}", dkl.dkl_nhead);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_nsect = {0}", dkl.dkl_nsect);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_bhead = {0}", dkl.dkl_bhead);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_ppart = {0}", dkl.dkl_ppart);
-
-                for(int i = 0; i < NDKMAP; i++)
+            for(int i = 0; i < dkl8.dkl_vtoc.v_nparts; i++)
+                if(dkl8.dkl_map[i].dkl_nblk      > 0                &&
+                   dkl8.dkl_vtoc.v_part[i].p_tag != SunTag.SunEmpty &&
+                   dkl8.dkl_vtoc.v_part[i].p_tag != SunTag.SunWholeDisk)
                 {
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_map[{0}].dkl_cylno = {1}", i,
-                                               dkl.dkl_map[i].dkl_cylno);
-
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_map[{0}].dkl_nblk = {1}", i,
-                                               dkl.dkl_map[i].dkl_nblk);
-                }
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_magic = 0x{0:X4}", dkl.dkl_magic);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl.dkl_cksum = 0x{0:X4}", dkl.dkl_cksum);
-                AaruConsole.DebugWriteLine("Sun plugin", "sectorsPerCylinder = {0}", sectorsPerCylinder);
-
-                for(int i = 0; i < NDKMAP; i++)
-                    if(dkl.dkl_map[i].dkl_cylno > 0 &&
-                       dkl.dkl_map[i].dkl_nblk  > 0)
+                    var part = new Partition
                     {
-                        var part = new Partition
-                        {
-                            Size     = (ulong)dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
-                            Length   = (ulong)(dkl.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
-                            Sequence = (ulong)i,
-                            Offset = (((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
-                                     DK_LABEL_SIZE,
-                            Start = (((ulong)dkl.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
-                                    DK_LABEL_SIZE / imagePlugin.Info.SectorSize,
-                            Type   = "SunOS partition",
-                            Scheme = Name
-                        };
+                        Description = SunFlagsToString(dkl8.dkl_vtoc.v_part[i].p_flag),
+                        Size        = (ulong)dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
+                        Length      = (ulong)(dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
+                        Sequence    = (ulong)i,
+                        Offset = (((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
+                                 DK_LABEL_SIZE,
+                        Start = (((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
+                                DK_LABEL_SIZE / imagePlugin.Info.SectorSize,
+                        Type   = SunIdToString(dkl8.dkl_vtoc.v_part[i].p_tag),
+                        Scheme = Name
+                    };
 
-                        if(part.Start < imagePlugin.Info.Sectors &&
-                           part.End   <= imagePlugin.Info.Sectors)
-                            partitions.Add(part);
-                    }
-            }
-            else if(useDkl8)
+                    if(dkl8.dkl_vtoc.v_timestamp[i] != 0)
+                        part.Description +=
+                            $"\nPartition timestamped on {DateHandlers.UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i])}";
+
+                    if(part.Start < imagePlugin.Info.Sectors &&
+                       part.End   <= imagePlugin.Info.Sectors)
+                        partitions.Add(part);
+                }
+        }
+        else
+        {
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_version = {0}", dkl16.dkl_vtoc.v_version);
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_volume = \"{0}\"",
+                                       StringHandlers.CToString(dkl16.dkl_vtoc.v_volume));
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sectorsz = {0}", dkl16.dkl_vtoc.v_sectorsz);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_nparts = {0}", dkl16.dkl_vtoc.v_nparts);
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_asciilabel = \"{0}\"",
+                                       StringHandlers.CToString(dkl16.dkl_vtoc.v_asciilabel));
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_pcyl = {0}", dkl16.dkl_pcyl);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_ncyl = {0}", dkl16.dkl_ncyl);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_acyl = {0}", dkl16.dkl_acyl);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_bcyl = {0}", dkl16.dkl_bcyl);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_nhead = {0}", dkl16.dkl_nhead);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_nsect = {0}", dkl16.dkl_nsect);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_intrlv = {0}", dkl16.dkl_intrlv);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_skew = {0}", dkl16.dkl_skew);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_apc = {0}", dkl16.dkl_apc);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_rpm = {0}", dkl16.dkl_rpm);
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_write_reinstruct = {0}",
+                                       dkl16.dkl_write_reinstruct);
+
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_read_reinstruct = {0}", dkl16.dkl_read_reinstruct);
+
+            for(int i = 0; i < NDKMAP16; i++)
             {
-                ulong sectorsPerCylinder = (ulong)(dkl8.dkl_nsect * dkl8.dkl_nhead);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_start = {1}", i,
+                                           dkl16.dkl_vtoc.v_part[i].p_start);
 
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_asciilabel = \"{0}\"",
-                                           StringHandlers.CToString(dkl8.dkl_asciilabel));
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_size = {1}", i,
+                                           dkl16.dkl_vtoc.v_part[i].p_size);
 
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_version = {0}", dkl8.dkl_vtoc.v_version);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_tag = {1} ({2})", i,
+                                           dkl16.dkl_vtoc.v_part[i].p_tag, (ushort)dkl16.dkl_vtoc.v_part[i].p_tag);
 
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_volume = \"{0}\"",
-                                           StringHandlers.CToString(dkl8.dkl_vtoc.v_volume));
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_flag = {1} ({2})", i,
+                                           dkl16.dkl_vtoc.v_part[i].p_flag,
+                                           (ushort)dkl16.dkl_vtoc.v_part[i].p_flag);
 
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_nparts = {0}", dkl8.dkl_vtoc.v_nparts);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_sanity = 0x{0:X8}", dkl8.dkl_vtoc.v_sanity);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_write_reinstruct = {0}", dkl8.dkl_write_reinstruct);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_read_reinstruct = {0}", dkl8.dkl_read_reinstruct);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_rpm = {0}", dkl8.dkl_rpm);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_pcyl = {0}", dkl8.dkl_pcyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_apc = {0}", dkl8.dkl_apc);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs1 = {0}", dkl8.dkl_obs1);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs2 = {0}", dkl8.dkl_obs2);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_intrlv = {0}", dkl8.dkl_intrlv);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_ncyl = {0}", dkl8.dkl_ncyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_acyl = {0}", dkl8.dkl_acyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_nhead = {0}", dkl8.dkl_nhead);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_nsect = {0}", dkl8.dkl_nsect);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs3 = {0}", dkl8.dkl_obs3);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_obs4 = {0}", dkl8.dkl_obs4);
+                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_timestamp[{0}] = {1}", i,
+                                           DateHandlers.UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i]));
+            }
 
-                for(int i = 0; i < NDKMAP; i++)
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_magic = 0x{0:X4}", dkl16.dkl_magic);
+            AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_cksum = 0x{0:X4}", dkl16.dkl_cksum);
+
+            if(dkl16.dkl_vtoc.v_nparts > NDKMAP16)
+                return false;
+
+            for(int i = 0; i < dkl16.dkl_vtoc.v_nparts; i++)
+                if(dkl16.dkl_vtoc.v_part[i].p_size > 0                &&
+                   dkl16.dkl_vtoc.v_part[i].p_tag  != SunTag.SunEmpty &&
+                   dkl16.dkl_vtoc.v_part[i].p_tag  != SunTag.SunWholeDisk)
                 {
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_map[{0}].dkl_cylno = {1}", i,
-                                               dkl8.dkl_map[i].dkl_cylno);
-
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_map[{0}].dkl_nblk = {1}", i,
-                                               dkl8.dkl_map[i].dkl_nblk);
-
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_part[{0}].p_tag = {1} ({2})", i,
-                                               dkl8.dkl_vtoc.v_part[i].p_tag, (ushort)dkl8.dkl_vtoc.v_part[i].p_tag);
-
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_part[{0}].p_flag = {1} ({2})", i,
-                                               dkl8.dkl_vtoc.v_part[i].p_flag, (ushort)dkl8.dkl_vtoc.v_part[i].p_flag);
-
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_vtoc.v_timestamp[{0}] = {1}", i,
-                                               DateHandlers.UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i]));
-                }
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_magic = 0x{0:X4}", dkl8.dkl_magic);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl8.dkl_cksum = 0x{0:X4}", dkl8.dkl_cksum);
-                AaruConsole.DebugWriteLine("Sun plugin", "sectorsPerCylinder = {0}", sectorsPerCylinder);
-
-                if(dkl8.dkl_vtoc.v_nparts > NDKMAP)
-                    return false;
-
-                for(int i = 0; i < dkl8.dkl_vtoc.v_nparts; i++)
-                    if(dkl8.dkl_map[i].dkl_nblk      > 0                &&
-                       dkl8.dkl_vtoc.v_part[i].p_tag != SunTag.SunEmpty &&
-                       dkl8.dkl_vtoc.v_part[i].p_tag != SunTag.SunWholeDisk)
+                    var part = new Partition
                     {
-                        var part = new Partition
-                        {
-                            Description = SunFlagsToString(dkl8.dkl_vtoc.v_part[i].p_flag),
-                            Size = (ulong)dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE,
-                            Length = (ulong)(dkl8.dkl_map[i].dkl_nblk * DK_LABEL_SIZE / imagePlugin.Info.SectorSize),
-                            Sequence = (ulong)i,
-                            Offset = (((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
-                                     DK_LABEL_SIZE,
-                            Start = (((ulong)dkl8.dkl_map[i].dkl_cylno * sectorsPerCylinder) + sectorOffset) *
-                                    DK_LABEL_SIZE / imagePlugin.Info.SectorSize,
-                            Type   = SunIdToString(dkl8.dkl_vtoc.v_part[i].p_tag),
-                            Scheme = Name
-                        };
+                        Description = SunFlagsToString(dkl16.dkl_vtoc.v_part[i].p_flag),
+                        Size        = (ulong)dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz,
+                        Length = (ulong)(dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz /
+                                         imagePlugin.Info.SectorSize),
+                        Sequence = (ulong)i,
+                        Offset = ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) *
+                                 dkl16.dkl_vtoc.v_sectorsz,
+                        Start = ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) *
+                                dkl16.dkl_vtoc.v_sectorsz / imagePlugin.Info.SectorSize,
+                        Type   = SunIdToString(dkl16.dkl_vtoc.v_part[i].p_tag),
+                        Scheme = Name
+                    };
 
-                        if(dkl8.dkl_vtoc.v_timestamp[i] != 0)
-                            part.Description +=
-                                $"\nPartition timestamped on {DateHandlers.UnixToDateTime(dkl8.dkl_vtoc.v_timestamp[i])}";
+                    if(dkl16.dkl_vtoc.v_timestamp[i] != 0)
+                        part.Description +=
+                            $"\nPartition timestamped on {DateHandlers.UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i])}";
 
-                        if(part.Start < imagePlugin.Info.Sectors &&
-                           part.End   <= imagePlugin.Info.Sectors)
-                            partitions.Add(part);
-                    }
-            }
-            else
-            {
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sanity = 0x{0:X8}", dkl16.dkl_vtoc.v_sanity);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_version = {0}", dkl16.dkl_vtoc.v_version);
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_volume = \"{0}\"",
-                                           StringHandlers.CToString(dkl16.dkl_vtoc.v_volume));
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_sectorsz = {0}", dkl16.dkl_vtoc.v_sectorsz);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_nparts = {0}", dkl16.dkl_vtoc.v_nparts);
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_asciilabel = \"{0}\"",
-                                           StringHandlers.CToString(dkl16.dkl_vtoc.v_asciilabel));
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_pcyl = {0}", dkl16.dkl_pcyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_ncyl = {0}", dkl16.dkl_ncyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_acyl = {0}", dkl16.dkl_acyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_bcyl = {0}", dkl16.dkl_bcyl);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_nhead = {0}", dkl16.dkl_nhead);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_nsect = {0}", dkl16.dkl_nsect);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_intrlv = {0}", dkl16.dkl_intrlv);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_skew = {0}", dkl16.dkl_skew);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_apc = {0}", dkl16.dkl_apc);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_rpm = {0}", dkl16.dkl_rpm);
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_write_reinstruct = {0}",
-                                           dkl16.dkl_write_reinstruct);
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_read_reinstruct = {0}", dkl16.dkl_read_reinstruct);
-
-                for(int i = 0; i < NDKMAP16; i++)
-                {
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_start = {1}", i,
-                                               dkl16.dkl_vtoc.v_part[i].p_start);
-
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_size = {1}", i,
-                                               dkl16.dkl_vtoc.v_part[i].p_size);
-
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_tag = {1} ({2})", i,
-                                               dkl16.dkl_vtoc.v_part[i].p_tag, (ushort)dkl16.dkl_vtoc.v_part[i].p_tag);
-
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_part[{0}].p_flag = {1} ({2})", i,
-                                               dkl16.dkl_vtoc.v_part[i].p_flag,
-                                               (ushort)dkl16.dkl_vtoc.v_part[i].p_flag);
-
-                    AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_vtoc.v_timestamp[{0}] = {1}", i,
-                                               DateHandlers.UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i]));
+                    if(part.Start < imagePlugin.Info.Sectors &&
+                       part.End   <= imagePlugin.Info.Sectors)
+                        partitions.Add(part);
                 }
-
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_magic = 0x{0:X4}", dkl16.dkl_magic);
-                AaruConsole.DebugWriteLine("Sun plugin", "dkl16.dkl_cksum = 0x{0:X4}", dkl16.dkl_cksum);
-
-                if(dkl16.dkl_vtoc.v_nparts > NDKMAP16)
-                    return false;
-
-                for(int i = 0; i < dkl16.dkl_vtoc.v_nparts; i++)
-                    if(dkl16.dkl_vtoc.v_part[i].p_size > 0                &&
-                       dkl16.dkl_vtoc.v_part[i].p_tag  != SunTag.SunEmpty &&
-                       dkl16.dkl_vtoc.v_part[i].p_tag  != SunTag.SunWholeDisk)
-                    {
-                        var part = new Partition
-                        {
-                            Description = SunFlagsToString(dkl16.dkl_vtoc.v_part[i].p_flag),
-                            Size        = (ulong)dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz,
-                            Length = (ulong)(dkl16.dkl_vtoc.v_part[i].p_size * dkl16.dkl_vtoc.v_sectorsz /
-                                             imagePlugin.Info.SectorSize),
-                            Sequence = (ulong)i,
-                            Offset = ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) *
-                                     dkl16.dkl_vtoc.v_sectorsz,
-                            Start = ((ulong)dkl16.dkl_vtoc.v_part[i].p_start + sectorOffset) *
-                                    dkl16.dkl_vtoc.v_sectorsz / imagePlugin.Info.SectorSize,
-                            Type   = SunIdToString(dkl16.dkl_vtoc.v_part[i].p_tag),
-                            Scheme = Name
-                        };
-
-                        if(dkl16.dkl_vtoc.v_timestamp[i] != 0)
-                            part.Description +=
-                                $"\nPartition timestamped on {DateHandlers.UnixToDateTime(dkl16.dkl_vtoc.v_timestamp[i])}";
-
-                        if(part.Start < imagePlugin.Info.Sectors &&
-                           part.End   <= imagePlugin.Info.Sectors)
-                            partitions.Add(part);
-                    }
-            }
-
-            return partitions.Count > 0;
         }
 
-        static dk_label SwapDiskLabel(dk_label label)
+        return partitions.Count > 0;
+    }
+
+    static dk_label SwapDiskLabel(dk_label label)
+    {
+        AaruConsole.DebugWriteLine("Sun plugin", "Swapping dk_label");
+        label = (dk_label)Marshal.SwapStructureMembersEndian(label);
+
+        for(int i = 0; i < label.dkl_map.Length; i++)
+            label.dkl_map[i] = (dk_map)Marshal.SwapStructureMembersEndian(label.dkl_map[i]);
+
+        return label;
+    }
+
+    static dk_label8 SwapDiskLabel(dk_label8 label)
+    {
+        AaruConsole.DebugWriteLine("Sun plugin", "Swapping dk_label8");
+        label = (dk_label8)Marshal.SwapStructureMembersEndian(label);
+
+        for(int i = 0; i < label.dkl_map.Length; i++)
+            label.dkl_map[i] = (dk_map)Marshal.SwapStructureMembersEndian(label.dkl_map[i]);
+
+        for(int i = 0; i < label.dkl_vtoc.v_bootinfo.Length; i++)
+            label.dkl_vtoc.v_bootinfo[i] = Swapping.Swap(label.dkl_vtoc.v_bootinfo[i]);
+
+        for(int i = 0; i < label.dkl_vtoc.v_part.Length; i++)
         {
-            AaruConsole.DebugWriteLine("Sun plugin", "Swapping dk_label");
-            label = (dk_label)Marshal.SwapStructureMembersEndian(label);
-
-            for(int i = 0; i < label.dkl_map.Length; i++)
-                label.dkl_map[i] = (dk_map)Marshal.SwapStructureMembersEndian(label.dkl_map[i]);
-
-            return label;
+            label.dkl_vtoc.v_part[i].p_flag = (SunFlags)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_flag);
+            label.dkl_vtoc.v_part[i].p_tag  = (SunTag)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_tag);
         }
 
-        static dk_label8 SwapDiskLabel(dk_label8 label)
+        for(int i = 0; i < label.dkl_vtoc.v_timestamp.Length; i++)
+            label.dkl_vtoc.v_timestamp[i] = Swapping.Swap(label.dkl_vtoc.v_timestamp[i]);
+
+        for(int i = 0; i < label.dkl_vtoc.v_reserved.Length; i++)
+            label.dkl_vtoc.v_reserved[i] = Swapping.Swap(label.dkl_vtoc.v_reserved[i]);
+
+        return label;
+    }
+
+    static dk_label16 SwapDiskLabel(dk_label16 label)
+    {
+        AaruConsole.DebugWriteLine("Sun plugin", "Swapping dk_label16");
+        label = (dk_label16)Marshal.SwapStructureMembersEndian(label);
+
+        for(int i = 0; i < label.dkl_vtoc.v_bootinfo.Length; i++)
+            label.dkl_vtoc.v_bootinfo[i] = Swapping.Swap(label.dkl_vtoc.v_bootinfo[i]);
+
+        for(int i = 0; i < label.dkl_vtoc.v_part.Length; i++)
         {
-            AaruConsole.DebugWriteLine("Sun plugin", "Swapping dk_label8");
-            label = (dk_label8)Marshal.SwapStructureMembersEndian(label);
-
-            for(int i = 0; i < label.dkl_map.Length; i++)
-                label.dkl_map[i] = (dk_map)Marshal.SwapStructureMembersEndian(label.dkl_map[i]);
-
-            for(int i = 0; i < label.dkl_vtoc.v_bootinfo.Length; i++)
-                label.dkl_vtoc.v_bootinfo[i] = Swapping.Swap(label.dkl_vtoc.v_bootinfo[i]);
-
-            for(int i = 0; i < label.dkl_vtoc.v_part.Length; i++)
-            {
-                label.dkl_vtoc.v_part[i].p_flag = (SunFlags)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_flag);
-                label.dkl_vtoc.v_part[i].p_tag  = (SunTag)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_tag);
-            }
-
-            for(int i = 0; i < label.dkl_vtoc.v_timestamp.Length; i++)
-                label.dkl_vtoc.v_timestamp[i] = Swapping.Swap(label.dkl_vtoc.v_timestamp[i]);
-
-            for(int i = 0; i < label.dkl_vtoc.v_reserved.Length; i++)
-                label.dkl_vtoc.v_reserved[i] = Swapping.Swap(label.dkl_vtoc.v_reserved[i]);
-
-            return label;
+            label.dkl_vtoc.v_part[i].p_flag  = (SunFlags)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_flag);
+            label.dkl_vtoc.v_part[i].p_tag   = (SunTag)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_tag);
+            label.dkl_vtoc.v_part[i].p_size  = Swapping.Swap(label.dkl_vtoc.v_part[i].p_size);
+            label.dkl_vtoc.v_part[i].p_start = Swapping.Swap(label.dkl_vtoc.v_part[i].p_start);
         }
 
-        static dk_label16 SwapDiskLabel(dk_label16 label)
+        for(int i = 0; i < label.dkl_vtoc.v_timestamp.Length; i++)
+            label.dkl_vtoc.v_timestamp[i] = Swapping.Swap(label.dkl_vtoc.v_timestamp[i]);
+
+        for(int i = 0; i < label.dkl_vtoc.v_reserved.Length; i++)
+            label.dkl_vtoc.v_reserved[i] = Swapping.Swap(label.dkl_vtoc.v_reserved[i]);
+
+        return label;
+    }
+
+    static string SunFlagsToString(SunFlags flags)
+    {
+        var sb = new StringBuilder();
+
+        if(flags.HasFlag(SunFlags.NoMount))
+            sb.AppendLine("Unmountable");
+
+        if(flags.HasFlag(SunFlags.ReadOnly))
+            sb.AppendLine("Read-only");
+
+        return sb.ToString();
+    }
+
+    static string SunIdToString(SunTag id)
+    {
+        switch(id)
         {
-            AaruConsole.DebugWriteLine("Sun plugin", "Swapping dk_label16");
-            label = (dk_label16)Marshal.SwapStructureMembersEndian(label);
-
-            for(int i = 0; i < label.dkl_vtoc.v_bootinfo.Length; i++)
-                label.dkl_vtoc.v_bootinfo[i] = Swapping.Swap(label.dkl_vtoc.v_bootinfo[i]);
-
-            for(int i = 0; i < label.dkl_vtoc.v_part.Length; i++)
-            {
-                label.dkl_vtoc.v_part[i].p_flag  = (SunFlags)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_flag);
-                label.dkl_vtoc.v_part[i].p_tag   = (SunTag)Swapping.Swap((ushort)label.dkl_vtoc.v_part[i].p_tag);
-                label.dkl_vtoc.v_part[i].p_size  = Swapping.Swap(label.dkl_vtoc.v_part[i].p_size);
-                label.dkl_vtoc.v_part[i].p_start = Swapping.Swap(label.dkl_vtoc.v_part[i].p_start);
-            }
-
-            for(int i = 0; i < label.dkl_vtoc.v_timestamp.Length; i++)
-                label.dkl_vtoc.v_timestamp[i] = Swapping.Swap(label.dkl_vtoc.v_timestamp[i]);
-
-            for(int i = 0; i < label.dkl_vtoc.v_reserved.Length; i++)
-                label.dkl_vtoc.v_reserved[i] = Swapping.Swap(label.dkl_vtoc.v_reserved[i]);
-
-            return label;
-        }
-
-        static string SunFlagsToString(SunFlags flags)
-        {
-            var sb = new StringBuilder();
-
-            if(flags.HasFlag(SunFlags.NoMount))
-                sb.AppendLine("Unmountable");
-
-            if(flags.HasFlag(SunFlags.ReadOnly))
-                sb.AppendLine("Read-only");
-
-            return sb.ToString();
-        }
-
-        static string SunIdToString(SunTag id)
-        {
-            switch(id)
-            {
-                case SunTag.Linux:          return "Linux";
-                case SunTag.LinuxRaid:      return "Linux RAID";
-                case SunTag.LinuxSwap:      return "Linux swap";
-                case SunTag.LVM:            return "LVM";
-                case SunTag.SunBoot:        return "Sun boot";
-                case SunTag.SunEmpty:       return "Empty";
-                case SunTag.SunHome:        return "Sun /home";
-                case SunTag.SunRoot:        return "Sun /";
-                case SunTag.SunStand:       return "Sun /stand";
-                case SunTag.SunSwap:        return "Sun swap";
-                case SunTag.SunUsr:         return "Sun /usr";
-                case SunTag.SunVar:         return "Sun /var";
-                case SunTag.SunWholeDisk:   return "Whole disk";
-                case SunTag.SunAlt:         return "Replacement sectors";
-                case SunTag.SunCache:       return "Sun cachefs";
-                case SunTag.SunReserved:    return "Reserved for SMI";
-                case SunTag.VxVmPublic:     return "Veritas public";
-                case SunTag.VxVmPrivate:    return "Veritas private";
-                case SunTag.NetBSD:         return "NetBSD";
-                case SunTag.FreeBSD_Swap:   return "FreeBSD swap";
-                case SunTag.FreeBSD_UFS:    return "FreeBSD";
-                case SunTag.FreeBSD_Vinum:  return "Vinum";
-                case SunTag.FreeBSD_ZFS:    return "FreeBSD ZFS";
-                case SunTag.FreeBSD_NANDFS: return "FreeBSD nandfs";
-                default:                    return "Unknown";
-            }
-        }
-
-        enum SunTag : ushort
-        {
-            SunEmpty      = 0x0000, SunBoot      = 0x0001, SunRoot        = 0x0002,
-            SunSwap       = 0x0003, SunUsr       = 0x0004, SunWholeDisk   = 0x0005,
-            SunStand      = 0x0006, SunVar       = 0x0007, SunHome        = 0x0008,
-            SunAlt        = 0x0009, SunCache     = 0x000A, SunReserved    = 0x000B,
-            VxVmPublic    = 0x000E, VxVmPrivate  = 0x000F, LinuxSwap      = 0x0082,
-            Linux         = 0x0083, LVM          = 0x008E, LinuxRaid      = 0x00FD,
-            NetBSD        = 0x00FF, FreeBSD_Swap = 0x0901, FreeBSD_UFS    = 0x0902,
-            FreeBSD_Vinum = 0x0903, FreeBSD_ZFS  = 0x0904, FreeBSD_NANDFS = 0x0905
-        }
-
-        [Flags]
-        enum SunFlags : ushort
-        {
-            NoMount = 0x0001, ReadOnly = 0x0010
-        }
-
-        /// <summary>SunOS logical partitions</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct dk_map
-        {
-            /// <summary>starting cylinder</summary>
-            public readonly int dkl_cylno;
-            /// <summary>number of blocks</summary>
-            public readonly int dkl_nblk;
-        }
-
-        /// <summary>SunOS disk label</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct dk_label
-        {
-            /// <summary>Informative string</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
-            public readonly byte[] dkl_asciilabel;
-            /// <summary>Padding</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD)]
-            public readonly byte[] dkl_pad;
-            /// <summary>rotations per minute</summary>
-            public readonly ushort dkl_rpm;
-            /// <summary># physical cylinders</summary>
-            public readonly ushort dkl_pcyl;
-            /// <summary>alternates per cylinder</summary>
-            public readonly ushort dkl_apc;
-            /// <summary>size of gap 1</summary>
-            public readonly ushort dkl_gap1;
-            /// <summary>size of gap 2</summary>
-            public readonly ushort dkl_gap2;
-            /// <summary>interleave factor</summary>
-            public readonly ushort dkl_intrlv;
-            /// <summary># of data cylinders</summary>
-            public readonly ushort dkl_ncyl;
-            /// <summary># of alternate cylinders</summary>
-            public readonly ushort dkl_acyl;
-            /// <summary># of heads in this partition</summary>
-            public readonly ushort dkl_nhead;
-            /// <summary># of 512 byte sectors per track</summary>
-            public readonly ushort dkl_nsect;
-            /// <summary>identifies proper label location</summary>
-            public readonly ushort dkl_bhead;
-            /// <summary>physical partition #</summary>
-            public readonly ushort dkl_ppart;
-            /// <summary>Logical partitions</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
-            public readonly dk_map[] dkl_map;
-            /// <summary>identifies this label format</summary>
-            public readonly ushort dkl_magic;
-            /// <summary>xor checksum of sector</summary>
-            public readonly ushort dkl_cksum;
-        }
-
-        /// <summary>Solaris logical partition for small disk label</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct dk_map2
-        {
-            /// <summary> ID tag of partition</summary>
-            public SunTag p_tag;
-            /// <summary> permission flag</summary>
-            public SunFlags p_flag;
-        }
-
-        /// <summary>Solaris logical partition</summary>
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct dkl_partition
-        {
-            /// <summary>ID tag of partition</summary>
-            public SunTag p_tag;
-            /// <summary>permision flags</summary>
-            public SunFlags p_flag;
-            /// <summary>start sector no of partition</summary>
-            public int p_start;
-            /// <summary># of blocks in partition</summary>
-            public int p_size;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct dk_vtoc8
-        {
-            /// <summary> layout version</summary>
-            public readonly uint v_version;
-            /// <summary> volume name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_VVOL)]
-            public readonly byte[] v_volume;
-            /// <summary> number of partitions </summary>
-            public readonly ushort v_nparts;
-            /// <summary> partition hdrs, sec 2</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
-            public readonly dk_map2[] v_part;
-            /// <summary>Alignment</summary>
-            public readonly ushort padding;
-            /// <summary> info needed by mboot</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly uint[] v_bootinfo;
-            /// <summary> to verify vtoc sanity</summary>
-            public readonly uint v_sanity;
-            /// <summary> free space</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly uint[] v_reserved;
-            /// <summary> partition timestamp</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
-            public readonly int[] v_timestamp;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct dk_vtoc16
-        {
-            /// <summary>info needed by mboot</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly uint[] v_bootinfo;
-            /// <summary>to verify vtoc sanity</summary>
-            public readonly uint v_sanity;
-            /// <summary>layout version</summary>
-            public readonly uint v_version;
-            /// <summary>volume name</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_VVOL)]
-            public readonly byte[] v_volume;
-            /// <summary>sector size in bytes</summary>
-            public readonly ushort v_sectorsz;
-            /// <summary>number of partitions</summary>
-            public readonly ushort v_nparts;
-            /// <summary>free space</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly uint[] v_reserved;
-            /// <summary>partition headers</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP16)]
-            public readonly dkl_partition[] v_part;
-            /// <summary>partition timestamp</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP16)]
-            public readonly int[] v_timestamp;
-            /// <summary>for compatibility</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
-            public readonly byte[] v_asciilabel;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct dk_label8
-        {
-            /// <summary>for compatibility</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
-            public readonly byte[] dkl_asciilabel;
-            /// <summary>vtoc inclusions from AT&amp;T SVr4</summary>
-            public readonly dk_vtoc8 dkl_vtoc;
-            /// <summary># sectors to skip, writes</summary>
-            public readonly ushort dkl_write_reinstruct;
-            /// <summary># sectors to skip, reads</summary>
-            public readonly ushort dkl_read_reinstruct;
-            /// <summary>unused part of 512 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD8)]
-            public readonly byte[] dkl_pad;
-            /// <summary>rotations per minute</summary>
-            public readonly ushort dkl_rpm;
-            /// <summary># physical cylinders</summary>
-            public readonly ushort dkl_pcyl;
-            /// <summary>alternates per cylinder</summary>
-            public readonly ushort dkl_apc;
-            /// <summary>obsolete</summary>
-            public readonly ushort dkl_obs1;
-            /// <summary>obsolete</summary>
-            public readonly ushort dkl_obs2;
-            /// <summary>interleave factor</summary>
-            public readonly ushort dkl_intrlv;
-            /// <summary># of data cylinders</summary>
-            public readonly ushort dkl_ncyl;
-            /// <summary># of alternate cylinders</summary>
-            public readonly ushort dkl_acyl;
-            /// <summary># of heads in this partition</summary>
-            public readonly ushort dkl_nhead;
-            /// <summary># of 512 byte sectors per track</summary>
-            public readonly ushort dkl_nsect;
-            /// <summary>obsolete</summary>
-            public readonly ushort dkl_obs3;
-            /// <summary>obsolete</summary>
-            public readonly ushort dkl_obs4;
-            /// <summary>logical partition headers</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
-            public readonly dk_map[] dkl_map;
-            /// <summary>identifies this label format</summary>
-            public readonly ushort dkl_magic;
-            /// <summary>xor checksum of sector</summary>
-            public readonly ushort dkl_cksum;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct dk_label16
-        {
-            /// <summary>vtoc inclusions from AT&amp;T SVr4</summary>
-            public readonly dk_vtoc16 dkl_vtoc;
-            /// <summary># of physical cylinders</summary>
-            public readonly uint dkl_pcyl;
-            /// <summary># of data cylinders</summary>
-            public readonly uint dkl_ncyl;
-            /// <summary># of alternate cylinders</summary>
-            public readonly ushort dkl_acyl;
-            /// <summary>cyl offset (for fixed head area)</summary>
-            public readonly ushort dkl_bcyl;
-            /// <summary># of heads</summary>
-            public readonly uint dkl_nhead;
-            /// <summary># of data sectors per track</summary>
-            public readonly uint dkl_nsect;
-            /// <summary>interleave factor</summary>
-            public readonly ushort dkl_intrlv;
-            /// <summary>skew factor</summary>
-            public readonly ushort dkl_skew;
-            /// <summary>alternates per cyl (SCSI only)  </summary>
-            public readonly ushort dkl_apc;
-            /// <summary>revolutions per minute</summary>
-            public readonly ushort dkl_rpm;
-            /// <summary># sectors to skip, writes</summary>
-            public readonly ushort dkl_write_reinstruct;
-            /// <summary># sectors to skip, reads </summary>
-            public readonly ushort dkl_read_reinstruct;
-            /// <summary>for compatible expansion</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
-            public readonly ushort[] dkl_extra;
-            /// <summary>unused part of 512 bytes</summary>
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD16)]
-            public readonly byte[] dkl_pad;
-            /// <summary>identifies this label format</summary>
-            public readonly ushort dkl_magic;
-            /// <summary>xor checksum of sector</summary>
-            public readonly ushort dkl_cksum;
+            case SunTag.Linux:          return "Linux";
+            case SunTag.LinuxRaid:      return "Linux RAID";
+            case SunTag.LinuxSwap:      return "Linux swap";
+            case SunTag.LVM:            return "LVM";
+            case SunTag.SunBoot:        return "Sun boot";
+            case SunTag.SunEmpty:       return "Empty";
+            case SunTag.SunHome:        return "Sun /home";
+            case SunTag.SunRoot:        return "Sun /";
+            case SunTag.SunStand:       return "Sun /stand";
+            case SunTag.SunSwap:        return "Sun swap";
+            case SunTag.SunUsr:         return "Sun /usr";
+            case SunTag.SunVar:         return "Sun /var";
+            case SunTag.SunWholeDisk:   return "Whole disk";
+            case SunTag.SunAlt:         return "Replacement sectors";
+            case SunTag.SunCache:       return "Sun cachefs";
+            case SunTag.SunReserved:    return "Reserved for SMI";
+            case SunTag.VxVmPublic:     return "Veritas public";
+            case SunTag.VxVmPrivate:    return "Veritas private";
+            case SunTag.NetBSD:         return "NetBSD";
+            case SunTag.FreeBSD_Swap:   return "FreeBSD swap";
+            case SunTag.FreeBSD_UFS:    return "FreeBSD";
+            case SunTag.FreeBSD_Vinum:  return "Vinum";
+            case SunTag.FreeBSD_ZFS:    return "FreeBSD ZFS";
+            case SunTag.FreeBSD_NANDFS: return "FreeBSD nandfs";
+            default:                    return "Unknown";
         }
     }
+
+    enum SunTag : ushort
+    {
+        SunEmpty      = 0x0000, SunBoot      = 0x0001, SunRoot        = 0x0002,
+        SunSwap       = 0x0003, SunUsr       = 0x0004, SunWholeDisk   = 0x0005,
+        SunStand      = 0x0006, SunVar       = 0x0007, SunHome        = 0x0008,
+        SunAlt        = 0x0009, SunCache     = 0x000A, SunReserved    = 0x000B,
+        VxVmPublic    = 0x000E, VxVmPrivate  = 0x000F, LinuxSwap      = 0x0082,
+        Linux         = 0x0083, LVM          = 0x008E, LinuxRaid      = 0x00FD,
+        NetBSD        = 0x00FF, FreeBSD_Swap = 0x0901, FreeBSD_UFS    = 0x0902,
+        FreeBSD_Vinum = 0x0903, FreeBSD_ZFS  = 0x0904, FreeBSD_NANDFS = 0x0905
+    }
+
+    [Flags]
+    enum SunFlags : ushort
+    {
+        NoMount = 0x0001, ReadOnly = 0x0010
+    }
+
+    /// <summary>SunOS logical partitions</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct dk_map
+    {
+        /// <summary>starting cylinder</summary>
+        public readonly int dkl_cylno;
+        /// <summary>number of blocks</summary>
+        public readonly int dkl_nblk;
+    }
+
+    /// <summary>SunOS disk label</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct dk_label
+    {
+        /// <summary>Informative string</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
+        public readonly byte[] dkl_asciilabel;
+        /// <summary>Padding</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD)]
+        public readonly byte[] dkl_pad;
+        /// <summary>rotations per minute</summary>
+        public readonly ushort dkl_rpm;
+        /// <summary># physical cylinders</summary>
+        public readonly ushort dkl_pcyl;
+        /// <summary>alternates per cylinder</summary>
+        public readonly ushort dkl_apc;
+        /// <summary>size of gap 1</summary>
+        public readonly ushort dkl_gap1;
+        /// <summary>size of gap 2</summary>
+        public readonly ushort dkl_gap2;
+        /// <summary>interleave factor</summary>
+        public readonly ushort dkl_intrlv;
+        /// <summary># of data cylinders</summary>
+        public readonly ushort dkl_ncyl;
+        /// <summary># of alternate cylinders</summary>
+        public readonly ushort dkl_acyl;
+        /// <summary># of heads in this partition</summary>
+        public readonly ushort dkl_nhead;
+        /// <summary># of 512 byte sectors per track</summary>
+        public readonly ushort dkl_nsect;
+        /// <summary>identifies proper label location</summary>
+        public readonly ushort dkl_bhead;
+        /// <summary>physical partition #</summary>
+        public readonly ushort dkl_ppart;
+        /// <summary>Logical partitions</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
+        public readonly dk_map[] dkl_map;
+        /// <summary>identifies this label format</summary>
+        public readonly ushort dkl_magic;
+        /// <summary>xor checksum of sector</summary>
+        public readonly ushort dkl_cksum;
+    }
+
+    /// <summary>Solaris logical partition for small disk label</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct dk_map2
+    {
+        /// <summary> ID tag of partition</summary>
+        public SunTag p_tag;
+        /// <summary> permission flag</summary>
+        public SunFlags p_flag;
+    }
+
+    /// <summary>Solaris logical partition</summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct dkl_partition
+    {
+        /// <summary>ID tag of partition</summary>
+        public SunTag p_tag;
+        /// <summary>permision flags</summary>
+        public SunFlags p_flag;
+        /// <summary>start sector no of partition</summary>
+        public int p_start;
+        /// <summary># of blocks in partition</summary>
+        public int p_size;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct dk_vtoc8
+    {
+        /// <summary> layout version</summary>
+        public readonly uint v_version;
+        /// <summary> volume name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_VVOL)]
+        public readonly byte[] v_volume;
+        /// <summary> number of partitions </summary>
+        public readonly ushort v_nparts;
+        /// <summary> partition hdrs, sec 2</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
+        public readonly dk_map2[] v_part;
+        /// <summary>Alignment</summary>
+        public readonly ushort padding;
+        /// <summary> info needed by mboot</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly uint[] v_bootinfo;
+        /// <summary> to verify vtoc sanity</summary>
+        public readonly uint v_sanity;
+        /// <summary> free space</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly uint[] v_reserved;
+        /// <summary> partition timestamp</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
+        public readonly int[] v_timestamp;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct dk_vtoc16
+    {
+        /// <summary>info needed by mboot</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly uint[] v_bootinfo;
+        /// <summary>to verify vtoc sanity</summary>
+        public readonly uint v_sanity;
+        /// <summary>layout version</summary>
+        public readonly uint v_version;
+        /// <summary>volume name</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_VVOL)]
+        public readonly byte[] v_volume;
+        /// <summary>sector size in bytes</summary>
+        public readonly ushort v_sectorsz;
+        /// <summary>number of partitions</summary>
+        public readonly ushort v_nparts;
+        /// <summary>free space</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly uint[] v_reserved;
+        /// <summary>partition headers</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP16)]
+        public readonly dkl_partition[] v_part;
+        /// <summary>partition timestamp</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP16)]
+        public readonly int[] v_timestamp;
+        /// <summary>for compatibility</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
+        public readonly byte[] v_asciilabel;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct dk_label8
+    {
+        /// <summary>for compatibility</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_ASCII)]
+        public readonly byte[] dkl_asciilabel;
+        /// <summary>vtoc inclusions from AT&amp;T SVr4</summary>
+        public readonly dk_vtoc8 dkl_vtoc;
+        /// <summary># sectors to skip, writes</summary>
+        public readonly ushort dkl_write_reinstruct;
+        /// <summary># sectors to skip, reads</summary>
+        public readonly ushort dkl_read_reinstruct;
+        /// <summary>unused part of 512 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD8)]
+        public readonly byte[] dkl_pad;
+        /// <summary>rotations per minute</summary>
+        public readonly ushort dkl_rpm;
+        /// <summary># physical cylinders</summary>
+        public readonly ushort dkl_pcyl;
+        /// <summary>alternates per cylinder</summary>
+        public readonly ushort dkl_apc;
+        /// <summary>obsolete</summary>
+        public readonly ushort dkl_obs1;
+        /// <summary>obsolete</summary>
+        public readonly ushort dkl_obs2;
+        /// <summary>interleave factor</summary>
+        public readonly ushort dkl_intrlv;
+        /// <summary># of data cylinders</summary>
+        public readonly ushort dkl_ncyl;
+        /// <summary># of alternate cylinders</summary>
+        public readonly ushort dkl_acyl;
+        /// <summary># of heads in this partition</summary>
+        public readonly ushort dkl_nhead;
+        /// <summary># of 512 byte sectors per track</summary>
+        public readonly ushort dkl_nsect;
+        /// <summary>obsolete</summary>
+        public readonly ushort dkl_obs3;
+        /// <summary>obsolete</summary>
+        public readonly ushort dkl_obs4;
+        /// <summary>logical partition headers</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = NDKMAP)]
+        public readonly dk_map[] dkl_map;
+        /// <summary>identifies this label format</summary>
+        public readonly ushort dkl_magic;
+        /// <summary>xor checksum of sector</summary>
+        public readonly ushort dkl_cksum;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct dk_label16
+    {
+        /// <summary>vtoc inclusions from AT&amp;T SVr4</summary>
+        public readonly dk_vtoc16 dkl_vtoc;
+        /// <summary># of physical cylinders</summary>
+        public readonly uint dkl_pcyl;
+        /// <summary># of data cylinders</summary>
+        public readonly uint dkl_ncyl;
+        /// <summary># of alternate cylinders</summary>
+        public readonly ushort dkl_acyl;
+        /// <summary>cyl offset (for fixed head area)</summary>
+        public readonly ushort dkl_bcyl;
+        /// <summary># of heads</summary>
+        public readonly uint dkl_nhead;
+        /// <summary># of data sectors per track</summary>
+        public readonly uint dkl_nsect;
+        /// <summary>interleave factor</summary>
+        public readonly ushort dkl_intrlv;
+        /// <summary>skew factor</summary>
+        public readonly ushort dkl_skew;
+        /// <summary>alternates per cyl (SCSI only)  </summary>
+        public readonly ushort dkl_apc;
+        /// <summary>revolutions per minute</summary>
+        public readonly ushort dkl_rpm;
+        /// <summary># sectors to skip, writes</summary>
+        public readonly ushort dkl_write_reinstruct;
+        /// <summary># sectors to skip, reads </summary>
+        public readonly ushort dkl_read_reinstruct;
+        /// <summary>for compatible expansion</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)]
+        public readonly ushort[] dkl_extra;
+        /// <summary>unused part of 512 bytes</summary>
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = LEN_DKL_PAD16)]
+        public readonly byte[] dkl_pad;
+        /// <summary>identifies this label format</summary>
+        public readonly ushort dkl_magic;
+        /// <summary>xor checksum of sector</summary>
+        public readonly ushort dkl_cksum;
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/UNIX.cs b/Aaru.Partitions/UNIX.cs
index 0429c49ff..e9e3ca51e 100644
--- a/Aaru.Partitions/UNIX.cs
+++ b/Aaru.Partitions/UNIX.cs
@@ -37,1443 +37,1442 @@ using System.Linq;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+// These partitions are hardwired in kernel sources for some UNIX versions predating System V.
+// They depend on exact device, indeed the kernel chooses what to use depending on the disk driver, so that's what we do.
+// Currently only DEC devices used in Ultrix are added, probably it's missing a lot of entries.
+/// <inheritdoc />
+/// <summary>Implements decoding of historic UNIX static partitions</summary>
+[SuppressMessage("ReSharper", "InconsistentNaming")]
+public sealed class UNIX : IPartition
 {
-    // These partitions are hardwired in kernel sources for some UNIX versions predating System V.
-    // They depend on exact device, indeed the kernel chooses what to use depending on the disk driver, so that's what we do.
-    // Currently only DEC devices used in Ultrix are added, probably it's missing a lot of entries.
-    /// <inheritdoc />
-    /// <summary>Implements decoding of historic UNIX static partitions</summary>
-    [SuppressMessage("ReSharper", "InconsistentNaming")]
-    public sealed class UNIX : IPartition
+    readonly Partition[] RA60 =
     {
-        readonly Partition[] RA60 =
+        new Partition
         {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9600,
-                Start       = 0,
-                Size        = 4915200,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 20000,
-                Start       = 9600,
-                Size        = 10240000,
-                Offset      = 4915200,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 29600,
-                Size        = 102400,
-                Offset      = 15155200,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6000,
-                Start       = 29800,
-                Size        = 3072000,
-                Offset      = 15257600,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 363376,
-                Start       = 35800,
-                Size        = 186048512,
-                Offset      = 18329600,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 181688,
-                Start       = 35800,
-                Size        = 93024256,
-                Offset      = 18329600,
-                Sequence    = 4
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 181688,
-                Start       = 217488,
-                Size        = 93024256,
-                Offset      = 111353856,
-                Sequence    = 5
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 1000,
-                Start       = 399176,
-                Size        = 512000,
-                Offset      = 204378112,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RA80 =
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9600,
+            Start       = 0,
+            Size        = 4915200,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
         {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9600,
-                Start       = 0,
-                Size        = 4915200,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 20000,
-                Start       = 9600,
-                Size        = 10240000,
-                Offset      = 4915200,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 29600,
-                Size        = 102400,
-                Offset      = 15155200,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6000,
-                Start       = 29800,
-                Size        = 3072000,
-                Offset      = 15257600,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 200412,
-                Start       = 35800,
-                Size        = 102610944,
-                Offset      = 18329600,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 1000,
-                Start       = 236212,
-                Size        = 512000,
-                Offset      = 120940544,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RA81 =
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 20000,
+            Start       = 9600,
+            Size        = 10240000,
+            Offset      = 4915200,
+            Sequence    = 1
+        },
+        new Partition
         {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9600,
-                Start       = 0,
-                Size        = 4915200,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 20000,
-                Start       = 9600,
-                Size        = 10240000,
-                Offset      = 4915200,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 29600,
-                Size        = 102400,
-                Offset      = 15155200,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6000,
-                Start       = 29800,
-                Size        = 3072000,
-                Offset      = 15257600,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 854272,
-                Start       = 35800,
-                Size        = 437387264,
-                Offset      = 18329600,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 181688,
-                Start       = 35800,
-                Size        = 93024256,
-                Offset      = 18329600,
-                Sequence    = 4
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 181688,
-                Start       = 217488,
-                Size        = 93024256,
-                Offset      = 111353856,
-                Sequence    = 5
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 490896,
-                Start       = 399176,
-                Size        = 251338752,
-                Offset      = 204378112,
-                Sequence    = 6
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 1000,
-                Start       = 890072,
-                Size        = 512000,
-                Offset      = 455716864,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RC25 =
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 200,
+            Start       = 29600,
+            Size        = 102400,
+            Offset      = 15155200,
+            Sequence    = 2
+        },
+        new Partition
         {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9000,
-                Start       = 0,
-                Size        = 4608000,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 9000,
-                Size        = 102400,
-                Offset      = 4608000,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 4000,
-                Start       = 9200,
-                Size        = 2048000,
-                Offset      = 4710400,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 37600,
-                Start       = 13200,
-                Size        = 19251200,
-                Offset      = 6758400,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 12000,
-                Start       = 13200,
-                Size        = 6144000,
-                Offset      = 6758400,
-                Sequence    = 4
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 25600,
-                Start       = 25200,
-                Size        = 13107200,
-                Offset      = 6758400,
-                Sequence    = 5
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 102,
-                Start       = 890072,
-                Size        = 50800,
-                Offset      = 26009600,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RD31 =
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 6000,
+            Start       = 29800,
+            Size        = 3072000,
+            Offset      = 15257600,
+            Sequence    = 2
+        },
+        new Partition
         {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9700,
-                Start       = 0,
-                Size        = 4966400,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 9700,
-                Size        = 51200,
-                Offset      = 4966400,
-                Sequence    = 5
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3000,
-                Start       = 9800,
-                Size        = 1536000,
-                Offset      = 5017600,
-                Sequence    = 5
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 28728,
-                Start       = 12800,
-                Size        = 14708736,
-                Offset      = 6553600,
-                Sequence    = 6
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 41528,
-                Size        = 16384,
-                Offset      = 21262336,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RD32 =
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 363376,
+            Start       = 35800,
+            Size        = 186048512,
+            Offset      = 18329600,
+            Sequence    = 3
+        },
+        new Partition
         {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9700,
-                Start       = 0,
-                Size        = 4966400,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 17300,
-                Start       = 9700,
-                Size        = 102400,
-                Offset      = 4966400,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 27000,
-                Size        = 51200,
-                Offset      = 13824000,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3000,
-                Start       = 27100,
-                Size        = 1536000,
-                Offset      = 13875200,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 53072,
-                Start       = 30100,
-                Size        = 27172864,
-                Offset      = 15411200,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 83172,
-                Size        = 16384,
-                Offset      = 42584064,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RD51 =
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 181688,
+            Start       = 35800,
+            Size        = 93024256,
+            Offset      = 18329600,
+            Sequence    = 4
+        },
+        new Partition
         {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 7460,
-                Start       = 0,
-                Size        = 4608000,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 40,
-                Start       = 0,
-                Size        = 20480,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 2200,
-                Start       = 0,
-                Size        = 1126400,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 11868,
-                Start       = 9700,
-                Size        = 6076416,
-                Offset      = 6758400,
-                Sequence    = 4
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 21568,
-                Size        = 16384,
-                Offset      = 11042816,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RD52 =
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 181688,
+            Start       = 217488,
+            Size        = 93024256,
+            Offset      = 111353856,
+            Sequence    = 5
+        },
+        new Partition
         {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9700,
-                Start       = 0,
-                Size        = 4966400,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 17300,
-                Start       = 9700,
-                Size        = 8857600,
-                Offset      = 4966400,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 27000,
-                Size        = 51200,
-                Offset      = 13824000,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3000,
-                Start       = 27100,
-                Size        = 1536000,
-                Offset      = 13875200,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 30348,
-                Start       = 30100,
-                Size        = 15538176,
-                Offset      = 15411200,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 60448,
-                Size        = 16384,
-                Offset      = 30949376,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RD53 =
-        {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9700,
-                Start       = 0,
-                Size        = 4966400,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 17300,
-                Start       = 9700,
-                Size        = 8857600,
-                Offset      = 4966400,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 27000,
-                Size        = 51200,
-                Offset      = 13824000,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3000,
-                Start       = 27100,
-                Size        = 1536000,
-                Offset      = 13875200,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 108540,
-                Start       = 30100,
-                Size        = 55572480,
-                Offset      = 15411200,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 138640,
-                Size        = 16384,
-                Offset      = 70983680,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RD54 =
-        {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9700,
-                Start       = 0,
-                Size        = 4966400,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 17300,
-                Start       = 9700,
-                Size        = 8857600,
-                Offset      = 4966400,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 27000,
-                Size        = 51200,
-                Offset      = 13824000,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3000,
-                Start       = 27100,
-                Size        = 1536000,
-                Offset      = 13875200,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 281068,
-                Start       = 30100,
-                Size        = 143906816,
-                Offset      = 15411200,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "maintenance area",
-                Type        = "maintenance",
-                Length      = 32,
-                Start       = 311168,
-                Size        = 16384,
-                Offset      = 159318016,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RK06 =
-        {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 7920,
-                Start       = 0,
-                Size        = 4055040,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 7920,
-                Size        = 51200,
-                Offset      = 4055040,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 2936,
-                Start       = 8020,
-                Size        = 1503232,
-                Offset      = 4106240,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 16126,
-                Start       = 10956,
-                Size        = 8256512,
-                Offset      = 5609472,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 44,
-                Start       = 27082,
-                Size        = 22528,
-                Offset      = 13865984,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RK07 =
-        {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 7920,
-                Start       = 0,
-                Size        = 4055040,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 7920,
-                Size        = 51200,
-                Offset      = 4055040,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 2936,
-                Start       = 8020,
-                Size        = 1503232,
-                Offset      = 4106240,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 42790,
-                Start       = 10956,
-                Size        = 21908480,
-                Offset      = 5609472,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 44,
-                Start       = 53746,
-                Size        = 22528,
-                Offset      = 27517952,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RM02 =
-        {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9120,
-                Start       = 0,
-                Size        = 4669440,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 9120,
-                Size        = 102400,
-                Offset      = 4669440,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 5400,
-                Start       = 9320,
-                Size        = 2764800,
-                Offset      = 2764800,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 5600,
-                Start       = 29120,
-                Size        = 2867200,
-                Offset      = 14909440,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 96896,
-                Start       = 34720,
-                Size        = 49610752,
-                Offset      = 17776640,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 32160,
-                Start       = 34720,
-                Size        = 16465920,
-                Offset      = 17776640,
-                Sequence    = 4
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 32160,
-                Start       = 66880,
-                Size        = 16465920,
-                Offset      = 34242560,
-                Sequence    = 5
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 32576,
-                Start       = 99040,
-                Size        = 16678912,
-                Offset      = 50708480,
-                Sequence    = 6
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 64,
-                Start       = 131616,
-                Size        = 32768,
-                Offset      = 67387392,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RM05 =
-        {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 10336,
-                Start       = 0,
-                Size        = 5292032,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 21280,
-                Start       = 10336,
-                Size        = 10895360,
-                Offset      = 5292032,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 31616,
-                Size        = 102400,
-                Offset      = 16187392,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6388,
-                Start       = 31816,
-                Size        = 3270656,
-                Offset      = 16289792,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 462016,
-                Start       = 38304,
-                Size        = 236552192,
-                Offset      = 19611648,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 153824,
-                Start       = 38304,
-                Size        = 78757888,
-                Offset      = 19611648,
-                Sequence    = 4
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 153824,
-                Start       = 192128,
-                Size        = 78757888,
-                Offset      = 98369536,
-                Sequence    = 5
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 154368,
-                Start       = 192128,
-                Size        = 79036416,
-                Offset      = 98369536,
-                Sequence    = 6
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 64,
-                Start       = 421312,
-                Size        = 32768,
-                Offset      = 215711744,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RP02 =
-        {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 8400,
-                Start       = 0,
-                Size        = 4300800,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 8400,
-                Size        = 51200,
-                Offset      = 4300800,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3100,
-                Start       = 8500,
-                Size        = 1587200,
-                Offset      = 4352000,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 28400,
-                Start       = 11600,
-                Size        = 14540800,
-                Offset      = 5939200,
-                Sequence    = 2
-            }
-        };
-
-        readonly Partition[] RP03 =
-        {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 8400,
-                Start       = 0,
-                Size        = 4300800,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 100,
-                Start       = 8400,
-                Size        = 51200,
-                Offset      = 4300800,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 3100,
-                Start       = 8500,
-                Size        = 1587200,
-                Offset      = 4352000,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 68400,
-                Start       = 11600,
-                Size        = 35020800,
-                Offset      = 5939200,
-                Sequence    = 2
-            }
-        };
-
-        readonly Partition[] RP04 =
-        {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9614,
-                Start       = 0,
-                Size        = 4922368,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 20064,
-                Start       = 9614,
-                Size        = 10272768,
-                Offset      = 4922368,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 29678,
-                Size        = 102400,
-                Offset      = 15195136,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6070,
-                Start       = 29878,
-                Size        = 1587200,
-                Offset      = 15297536,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 135806,
-                Start       = 35948,
-                Size        = 69532672,
-                Offset      = 18405376,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 44,
-                Start       = 171754,
-                Size        = 22528,
-                Offset      = 87938048,
-                Sequence    = 8
-            }
-        };
-
-        readonly Partition[] RP06 =
-        {
-            new Partition
-            {
-                Description = null,
-                Name        = "/",
-                Type        = "data",
-                Length      = 9614,
-                Start       = 0,
-                Size        = 4922368,
-                Offset      = 0,
-                Sequence    = 0
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "/usr",
-                Type        = "data",
-                Length      = 20064,
-                Start       = 9614,
-                Size        = 10272768,
-                Offset      = 4922368,
-                Sequence    = 1
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "error log",
-                Type        = "errorlog",
-                Length      = 200,
-                Start       = 29678,
-                Size        = 102400,
-                Offset      = 15195136,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "swap",
-                Type        = "swap",
-                Length      = 6070,
-                Start       = 29878,
-                Size        = 1587200,
-                Offset      = 15297536,
-                Sequence    = 2
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 135806,
-                Start       = 35948,
-                Size        = 69532672,
-                Offset      = 18405376,
-                Sequence    = 3
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 304678,
-                Start       = 35948,
-                Size        = 155995136,
-                Offset      = 18405376,
-                Sequence    = 4
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "user",
-                Type        = "data",
-                Length      = 166828,
-                Start       = 171798,
-                Size        = 85415936,
-                Offset      = 87960576,
-                Sequence    = 5
-            },
-            new Partition
-            {
-                Description = null,
-                Name        = "bad sector file",
-                Type        = "bad",
-                Length      = 44,
-                Start       = 340626,
-                Size        = 22528,
-                Offset      = 174400512,
-                Sequence    = 8
-            }
-        };
-
-        /// <inheritdoc />
-        public string Name => "UNIX hardwired";
-        /// <inheritdoc />
-        public Guid Id => new Guid("9ED7E30B-53BF-4619-87A0-5D2002155617");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
-
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
-        {
-            partitions = new List<Partition>();
-            Partition[] parts;
-
-            if(sectorOffset != 0)
-                return false;
-
-            switch(imagePlugin.Info.MediaType)
-            {
-                case MediaType.RA60:
-                    parts = RA60;
-
-                    break;
-                case MediaType.RA80:
-                    parts = RA80;
-
-                    break;
-                case MediaType.RA81:
-                    parts = RA81;
-
-                    break;
-                case MediaType.RC25:
-                    parts = RC25;
-
-                    break;
-                case MediaType.RD31:
-                    parts = RD31;
-
-                    break;
-                case MediaType.RD32:
-                    parts = RD32;
-
-                    break;
-                case MediaType.RD51:
-                    parts = RD51;
-
-                    break;
-                case MediaType.RD52:
-                    parts = RD52;
-
-                    break;
-                case MediaType.RD53:
-                    parts = RD53;
-
-                    break;
-                case MediaType.RD54:
-                    parts = RD54;
-
-                    break;
-                case MediaType.RK06:
-                    parts = RK06;
-
-                    break;
-                case MediaType.RK07:
-                    parts = RK07;
-
-                    break;
-                case MediaType.RM02:
-                case MediaType.RM03:
-                    parts = RM02;
-
-                    break;
-                case MediaType.RM05:
-                    parts = RM05;
-
-                    break;
-                case MediaType.RP02:
-                    parts = RP02;
-
-                    break;
-                case MediaType.RP03:
-                    parts = RP03;
-
-                    break;
-                case MediaType.RP04:
-                case MediaType.RP05:
-                    parts = RP04;
-
-                    break;
-                case MediaType.RP06:
-                    parts = RP06;
-
-                    break;
-                default: return false;
-            }
-
-            for(int i = 0; i < parts.Length; i++)
-                parts[i].Scheme = "";
-
-            partitions = parts.ToList();
-
-            return partitions.Count > 0;
+            Description = null,
+            Name        = "maintenance area",
+            Type        = "maintenance",
+            Length      = 1000,
+            Start       = 399176,
+            Size        = 512000,
+            Offset      = 204378112,
+            Sequence    = 8
         }
+    };
+
+    readonly Partition[] RA80 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9600,
+            Start       = 0,
+            Size        = 4915200,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 20000,
+            Start       = 9600,
+            Size        = 10240000,
+            Offset      = 4915200,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 200,
+            Start       = 29600,
+            Size        = 102400,
+            Offset      = 15155200,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 6000,
+            Start       = 29800,
+            Size        = 3072000,
+            Offset      = 15257600,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 200412,
+            Start       = 35800,
+            Size        = 102610944,
+            Offset      = 18329600,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "maintenance area",
+            Type        = "maintenance",
+            Length      = 1000,
+            Start       = 236212,
+            Size        = 512000,
+            Offset      = 120940544,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RA81 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9600,
+            Start       = 0,
+            Size        = 4915200,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 20000,
+            Start       = 9600,
+            Size        = 10240000,
+            Offset      = 4915200,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 200,
+            Start       = 29600,
+            Size        = 102400,
+            Offset      = 15155200,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 6000,
+            Start       = 29800,
+            Size        = 3072000,
+            Offset      = 15257600,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 854272,
+            Start       = 35800,
+            Size        = 437387264,
+            Offset      = 18329600,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 181688,
+            Start       = 35800,
+            Size        = 93024256,
+            Offset      = 18329600,
+            Sequence    = 4
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 181688,
+            Start       = 217488,
+            Size        = 93024256,
+            Offset      = 111353856,
+            Sequence    = 5
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 490896,
+            Start       = 399176,
+            Size        = 251338752,
+            Offset      = 204378112,
+            Sequence    = 6
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "maintenance area",
+            Type        = "maintenance",
+            Length      = 1000,
+            Start       = 890072,
+            Size        = 512000,
+            Offset      = 455716864,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RC25 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9000,
+            Start       = 0,
+            Size        = 4608000,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 200,
+            Start       = 9000,
+            Size        = 102400,
+            Offset      = 4608000,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 4000,
+            Start       = 9200,
+            Size        = 2048000,
+            Offset      = 4710400,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 37600,
+            Start       = 13200,
+            Size        = 19251200,
+            Offset      = 6758400,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 12000,
+            Start       = 13200,
+            Size        = 6144000,
+            Offset      = 6758400,
+            Sequence    = 4
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 25600,
+            Start       = 25200,
+            Size        = 13107200,
+            Offset      = 6758400,
+            Sequence    = 5
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "maintenance area",
+            Type        = "maintenance",
+            Length      = 102,
+            Start       = 890072,
+            Size        = 50800,
+            Offset      = 26009600,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RD31 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9700,
+            Start       = 0,
+            Size        = 4966400,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 100,
+            Start       = 9700,
+            Size        = 51200,
+            Offset      = 4966400,
+            Sequence    = 5
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 3000,
+            Start       = 9800,
+            Size        = 1536000,
+            Offset      = 5017600,
+            Sequence    = 5
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 28728,
+            Start       = 12800,
+            Size        = 14708736,
+            Offset      = 6553600,
+            Sequence    = 6
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "maintenance area",
+            Type        = "maintenance",
+            Length      = 32,
+            Start       = 41528,
+            Size        = 16384,
+            Offset      = 21262336,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RD32 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9700,
+            Start       = 0,
+            Size        = 4966400,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 17300,
+            Start       = 9700,
+            Size        = 102400,
+            Offset      = 4966400,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 100,
+            Start       = 27000,
+            Size        = 51200,
+            Offset      = 13824000,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 3000,
+            Start       = 27100,
+            Size        = 1536000,
+            Offset      = 13875200,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 53072,
+            Start       = 30100,
+            Size        = 27172864,
+            Offset      = 15411200,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "maintenance area",
+            Type        = "maintenance",
+            Length      = 32,
+            Start       = 83172,
+            Size        = 16384,
+            Offset      = 42584064,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RD51 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 7460,
+            Start       = 0,
+            Size        = 4608000,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 40,
+            Start       = 0,
+            Size        = 20480,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 2200,
+            Start       = 0,
+            Size        = 1126400,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 11868,
+            Start       = 9700,
+            Size        = 6076416,
+            Offset      = 6758400,
+            Sequence    = 4
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "maintenance area",
+            Type        = "maintenance",
+            Length      = 32,
+            Start       = 21568,
+            Size        = 16384,
+            Offset      = 11042816,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RD52 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9700,
+            Start       = 0,
+            Size        = 4966400,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 17300,
+            Start       = 9700,
+            Size        = 8857600,
+            Offset      = 4966400,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 100,
+            Start       = 27000,
+            Size        = 51200,
+            Offset      = 13824000,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 3000,
+            Start       = 27100,
+            Size        = 1536000,
+            Offset      = 13875200,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 30348,
+            Start       = 30100,
+            Size        = 15538176,
+            Offset      = 15411200,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "maintenance area",
+            Type        = "maintenance",
+            Length      = 32,
+            Start       = 60448,
+            Size        = 16384,
+            Offset      = 30949376,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RD53 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9700,
+            Start       = 0,
+            Size        = 4966400,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 17300,
+            Start       = 9700,
+            Size        = 8857600,
+            Offset      = 4966400,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 100,
+            Start       = 27000,
+            Size        = 51200,
+            Offset      = 13824000,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 3000,
+            Start       = 27100,
+            Size        = 1536000,
+            Offset      = 13875200,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 108540,
+            Start       = 30100,
+            Size        = 55572480,
+            Offset      = 15411200,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "maintenance area",
+            Type        = "maintenance",
+            Length      = 32,
+            Start       = 138640,
+            Size        = 16384,
+            Offset      = 70983680,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RD54 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9700,
+            Start       = 0,
+            Size        = 4966400,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 17300,
+            Start       = 9700,
+            Size        = 8857600,
+            Offset      = 4966400,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 100,
+            Start       = 27000,
+            Size        = 51200,
+            Offset      = 13824000,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 3000,
+            Start       = 27100,
+            Size        = 1536000,
+            Offset      = 13875200,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 281068,
+            Start       = 30100,
+            Size        = 143906816,
+            Offset      = 15411200,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "maintenance area",
+            Type        = "maintenance",
+            Length      = 32,
+            Start       = 311168,
+            Size        = 16384,
+            Offset      = 159318016,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RK06 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 7920,
+            Start       = 0,
+            Size        = 4055040,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 100,
+            Start       = 7920,
+            Size        = 51200,
+            Offset      = 4055040,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 2936,
+            Start       = 8020,
+            Size        = 1503232,
+            Offset      = 4106240,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 16126,
+            Start       = 10956,
+            Size        = 8256512,
+            Offset      = 5609472,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "bad sector file",
+            Type        = "bad",
+            Length      = 44,
+            Start       = 27082,
+            Size        = 22528,
+            Offset      = 13865984,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RK07 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 7920,
+            Start       = 0,
+            Size        = 4055040,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 100,
+            Start       = 7920,
+            Size        = 51200,
+            Offset      = 4055040,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 2936,
+            Start       = 8020,
+            Size        = 1503232,
+            Offset      = 4106240,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 42790,
+            Start       = 10956,
+            Size        = 21908480,
+            Offset      = 5609472,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "bad sector file",
+            Type        = "bad",
+            Length      = 44,
+            Start       = 53746,
+            Size        = 22528,
+            Offset      = 27517952,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RM02 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9120,
+            Start       = 0,
+            Size        = 4669440,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 200,
+            Start       = 9120,
+            Size        = 102400,
+            Offset      = 4669440,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 5400,
+            Start       = 9320,
+            Size        = 2764800,
+            Offset      = 2764800,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 5600,
+            Start       = 29120,
+            Size        = 2867200,
+            Offset      = 14909440,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 96896,
+            Start       = 34720,
+            Size        = 49610752,
+            Offset      = 17776640,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 32160,
+            Start       = 34720,
+            Size        = 16465920,
+            Offset      = 17776640,
+            Sequence    = 4
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 32160,
+            Start       = 66880,
+            Size        = 16465920,
+            Offset      = 34242560,
+            Sequence    = 5
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 32576,
+            Start       = 99040,
+            Size        = 16678912,
+            Offset      = 50708480,
+            Sequence    = 6
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "bad sector file",
+            Type        = "bad",
+            Length      = 64,
+            Start       = 131616,
+            Size        = 32768,
+            Offset      = 67387392,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RM05 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 10336,
+            Start       = 0,
+            Size        = 5292032,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 21280,
+            Start       = 10336,
+            Size        = 10895360,
+            Offset      = 5292032,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 200,
+            Start       = 31616,
+            Size        = 102400,
+            Offset      = 16187392,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 6388,
+            Start       = 31816,
+            Size        = 3270656,
+            Offset      = 16289792,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 462016,
+            Start       = 38304,
+            Size        = 236552192,
+            Offset      = 19611648,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 153824,
+            Start       = 38304,
+            Size        = 78757888,
+            Offset      = 19611648,
+            Sequence    = 4
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 153824,
+            Start       = 192128,
+            Size        = 78757888,
+            Offset      = 98369536,
+            Sequence    = 5
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 154368,
+            Start       = 192128,
+            Size        = 79036416,
+            Offset      = 98369536,
+            Sequence    = 6
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "bad sector file",
+            Type        = "bad",
+            Length      = 64,
+            Start       = 421312,
+            Size        = 32768,
+            Offset      = 215711744,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RP02 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 8400,
+            Start       = 0,
+            Size        = 4300800,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 100,
+            Start       = 8400,
+            Size        = 51200,
+            Offset      = 4300800,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 3100,
+            Start       = 8500,
+            Size        = 1587200,
+            Offset      = 4352000,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 28400,
+            Start       = 11600,
+            Size        = 14540800,
+            Offset      = 5939200,
+            Sequence    = 2
+        }
+    };
+
+    readonly Partition[] RP03 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 8400,
+            Start       = 0,
+            Size        = 4300800,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 100,
+            Start       = 8400,
+            Size        = 51200,
+            Offset      = 4300800,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 3100,
+            Start       = 8500,
+            Size        = 1587200,
+            Offset      = 4352000,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 68400,
+            Start       = 11600,
+            Size        = 35020800,
+            Offset      = 5939200,
+            Sequence    = 2
+        }
+    };
+
+    readonly Partition[] RP04 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9614,
+            Start       = 0,
+            Size        = 4922368,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 20064,
+            Start       = 9614,
+            Size        = 10272768,
+            Offset      = 4922368,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 200,
+            Start       = 29678,
+            Size        = 102400,
+            Offset      = 15195136,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 6070,
+            Start       = 29878,
+            Size        = 1587200,
+            Offset      = 15297536,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 135806,
+            Start       = 35948,
+            Size        = 69532672,
+            Offset      = 18405376,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "bad sector file",
+            Type        = "bad",
+            Length      = 44,
+            Start       = 171754,
+            Size        = 22528,
+            Offset      = 87938048,
+            Sequence    = 8
+        }
+    };
+
+    readonly Partition[] RP06 =
+    {
+        new Partition
+        {
+            Description = null,
+            Name        = "/",
+            Type        = "data",
+            Length      = 9614,
+            Start       = 0,
+            Size        = 4922368,
+            Offset      = 0,
+            Sequence    = 0
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "/usr",
+            Type        = "data",
+            Length      = 20064,
+            Start       = 9614,
+            Size        = 10272768,
+            Offset      = 4922368,
+            Sequence    = 1
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "error log",
+            Type        = "errorlog",
+            Length      = 200,
+            Start       = 29678,
+            Size        = 102400,
+            Offset      = 15195136,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "swap",
+            Type        = "swap",
+            Length      = 6070,
+            Start       = 29878,
+            Size        = 1587200,
+            Offset      = 15297536,
+            Sequence    = 2
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 135806,
+            Start       = 35948,
+            Size        = 69532672,
+            Offset      = 18405376,
+            Sequence    = 3
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 304678,
+            Start       = 35948,
+            Size        = 155995136,
+            Offset      = 18405376,
+            Sequence    = 4
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "user",
+            Type        = "data",
+            Length      = 166828,
+            Start       = 171798,
+            Size        = 85415936,
+            Offset      = 87960576,
+            Sequence    = 5
+        },
+        new Partition
+        {
+            Description = null,
+            Name        = "bad sector file",
+            Type        = "bad",
+            Length      = 44,
+            Start       = 340626,
+            Size        = 22528,
+            Offset      = 174400512,
+            Sequence    = 8
+        }
+    };
+
+    /// <inheritdoc />
+    public string Name => "UNIX hardwired";
+    /// <inheritdoc />
+    public Guid Id => new Guid("9ED7E30B-53BF-4619-87A0-5D2002155617");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+    {
+        partitions = new List<Partition>();
+        Partition[] parts;
+
+        if(sectorOffset != 0)
+            return false;
+
+        switch(imagePlugin.Info.MediaType)
+        {
+            case MediaType.RA60:
+                parts = RA60;
+
+                break;
+            case MediaType.RA80:
+                parts = RA80;
+
+                break;
+            case MediaType.RA81:
+                parts = RA81;
+
+                break;
+            case MediaType.RC25:
+                parts = RC25;
+
+                break;
+            case MediaType.RD31:
+                parts = RD31;
+
+                break;
+            case MediaType.RD32:
+                parts = RD32;
+
+                break;
+            case MediaType.RD51:
+                parts = RD51;
+
+                break;
+            case MediaType.RD52:
+                parts = RD52;
+
+                break;
+            case MediaType.RD53:
+                parts = RD53;
+
+                break;
+            case MediaType.RD54:
+                parts = RD54;
+
+                break;
+            case MediaType.RK06:
+                parts = RK06;
+
+                break;
+            case MediaType.RK07:
+                parts = RK07;
+
+                break;
+            case MediaType.RM02:
+            case MediaType.RM03:
+                parts = RM02;
+
+                break;
+            case MediaType.RM05:
+                parts = RM05;
+
+                break;
+            case MediaType.RP02:
+                parts = RP02;
+
+                break;
+            case MediaType.RP03:
+                parts = RP03;
+
+                break;
+            case MediaType.RP04:
+            case MediaType.RP05:
+                parts = RP04;
+
+                break;
+            case MediaType.RP06:
+                parts = RP06;
+
+                break;
+            default: return false;
+        }
+
+        for(int i = 0; i < parts.Length; i++)
+            parts[i].Scheme = "";
+
+        partitions = parts.ToList();
+
+        return partitions.Count > 0;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/VTOC.cs b/Aaru.Partitions/VTOC.cs
index 9c811fb76..dfb1f1d12 100644
--- a/Aaru.Partitions/VTOC.cs
+++ b/Aaru.Partitions/VTOC.cs
@@ -42,140 +42,222 @@ using Aaru.Console;
 using Aaru.Helpers;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of UNIX VTOC partitions</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class VTOC : IPartition
 {
+    const uint PD_MAGIC  = 0xCA5E600D;
+    const uint VTOC_SANE = 0x600DDEEE;
+    const uint PD_CIGAM  = 0x0D605ECA;
+    const uint VTOC_ENAS = 0xEEDE0D60;
+    const int  V_NUMPAR  = 16;
+    const uint XPDVERS   = 3; /* 1st version of extended pdinfo */
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of UNIX VTOC partitions</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class VTOC : IPartition
+    public string Name => "UNIX VTOC";
+    /// <inheritdoc />
+    public Guid Id => new Guid("6D35A66F-8D77-426F-A562-D88F6A1F1702");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        const uint PD_MAGIC  = 0xCA5E600D;
-        const uint VTOC_SANE = 0x600DDEEE;
-        const uint PD_CIGAM  = 0x0D605ECA;
-        const uint VTOC_ENAS = 0xEEDE0D60;
-        const int  V_NUMPAR  = 16;
-        const uint XPDVERS   = 3; /* 1st version of extended pdinfo */
+        partitions = new List<Partition>();
 
-        /// <inheritdoc />
-        public string Name => "UNIX VTOC";
-        /// <inheritdoc />
-        public Guid Id => new Guid("6D35A66F-8D77-426F-A562-D88F6A1F1702");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        uint        magic      = 0;
+        ulong       pdloc      = 0;
+        byte[]      pdsector   = null;
+        bool        magicFound = false;
+        bool        absolute   = false;
+        ErrorNumber errno;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        foreach(ulong i in new ulong[]
+                {
+                    0, 1, 8, 29
+                }.TakeWhile(i => i + sectorOffset < imagePlugin.Info.Sectors))
         {
-            partitions = new List<Partition>();
+            errno = imagePlugin.ReadSector(i + sectorOffset, out pdsector);
 
-            uint        magic      = 0;
-            ulong       pdloc      = 0;
-            byte[]      pdsector   = null;
-            bool        magicFound = false;
-            bool        absolute   = false;
-            ErrorNumber errno;
+            if(errno != ErrorNumber.NoError)
+                continue;
+            magic = BitConverter.ToUInt32(pdsector, 4);
 
-            foreach(ulong i in new ulong[]
-            {
-                0, 1, 8, 29
-            }.TakeWhile(i => i + sectorOffset < imagePlugin.Info.Sectors))
-            {
-                errno = imagePlugin.ReadSector(i + sectorOffset, out pdsector);
+            AaruConsole.DebugWriteLine("VTOC plugin", "sanity at {0} is 0x{1:X8} (should be 0x{2:X8} or 0x{3:X8})",
+                                       i + sectorOffset, magic, PD_MAGIC, PD_CIGAM);
 
-                if(errno != ErrorNumber.NoError)
-                    continue;
-                magic = BitConverter.ToUInt32(pdsector, 4);
+            if(magic != PD_MAGIC &&
+               magic != PD_CIGAM)
+                continue;
 
-                AaruConsole.DebugWriteLine("VTOC plugin", "sanity at {0} is 0x{1:X8} (should be 0x{2:X8} or 0x{3:X8})",
-                                           i + sectorOffset, magic, PD_MAGIC, PD_CIGAM);
+            magicFound = true;
+            pdloc      = i;
 
-                if(magic != PD_MAGIC &&
-                   magic != PD_CIGAM)
-                    continue;
+            break;
+        }
 
-                magicFound = true;
-                pdloc      = i;
+        if(!magicFound)
+            return false;
 
-                break;
-            }
+        PDInfo    pd;
+        PDInfoOld pdold;
 
-            if(!magicFound)
-                return false;
+        if(magic == PD_MAGIC)
+        {
+            pd    = Marshal.ByteArrayToStructureLittleEndian<PDInfo>(pdsector);
+            pdold = Marshal.ByteArrayToStructureLittleEndian<PDInfoOld>(pdsector);
+        }
+        else
+        {
+            pd    = Marshal.ByteArrayToStructureBigEndian<PDInfo>(pdsector);
+            pdold = Marshal.ByteArrayToStructureBigEndian<PDInfoOld>(pdsector);
+        }
 
-            PDInfo    pd;
-            PDInfoOld pdold;
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.driveid = {0}", pd.driveid);
 
-            if(magic == PD_MAGIC)
-            {
-                pd    = Marshal.ByteArrayToStructureLittleEndian<PDInfo>(pdsector);
-                pdold = Marshal.ByteArrayToStructureLittleEndian<PDInfoOld>(pdsector);
-            }
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.sanity = 0x{0:X8} (should be 0x{1:X8})", pd.sanity,
+                                   PD_MAGIC);
+
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.version = {0}", pd.version);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.serial = \"{0}\"", StringHandlers.CToString(pd.serial));
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.cyls = {0}", pd.cyls);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.tracks = {0}", pd.tracks);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.sectors = {0}", pd.sectors);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.bytes = {0}", pd.bytes);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.logicalst = {0}", pd.logicalst);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.errlogst = {0}", pd.errlogst);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.errlogsz = {0}", pd.errlogsz);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.mfgst = {0}", pd.mfgst);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.mfgsz = {0}", pd.mfgsz);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.defectst = {0}", pd.defectst);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.defectsz = {0}", pd.defectsz);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relno = {0}", pd.relno);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relst = {0}", pd.relst);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relsz = {0}", pd.relsz);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relnext = {0}", pd.relnext);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.allcstrt = {0}", pdold.allcstrt);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.allcend = {0}", pdold.allcend);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_ptr = {0}", pd.vtoc_ptr);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_len = {0}", pd.vtoc_len);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_pad = {0}", pd.vtoc_pad);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.alt_ptr = {0}", pd.alt_ptr);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.alt_len = {0}", pd.alt_len);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pcyls = {0}", pd.pcyls);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.ptracks = {0}", pd.ptracks);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.psectors = {0}", pd.psectors);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pbytes = {0}", pd.pbytes);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.secovhd = {0}", pd.secovhd);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.interleave = {0}", pd.interleave);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.skew = {0}", pd.skew);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[0] = {0}", pd.pad[0]);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[1] = {0}", pd.pad[1]);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[2] = {0}", pd.pad[2]);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[3] = {0}", pd.pad[3]);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[4] = {0}", pd.pad[4]);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[5] = {0}", pd.pad[5]);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[6] = {0}", pd.pad[6]);
+        AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[7] = {0}", pd.pad[7]);
+
+        magicFound = false;
+        bool useOld = false;
+        errno = imagePlugin.ReadSector(pdloc + sectorOffset + 1, out byte[] vtocsector);
+
+        if(errno != ErrorNumber.NoError)
+            return false;
+        var vtoc    = new vtoc();
+        var vtocOld = new vtocold();
+        magic = BitConverter.ToUInt32(vtocsector, 0);
+
+        if(magic == VTOC_SANE ||
+           magic == VTOC_ENAS)
+        {
+            magicFound = true;
+            AaruConsole.DebugWriteLine("VTOC plugin", "New VTOC found at {0}", pdloc + sectorOffset + 1);
+
+            if(magic == VTOC_SANE)
+                vtoc = Marshal.ByteArrayToStructureLittleEndian<vtoc>(vtocsector);
             else
             {
-                pd    = Marshal.ByteArrayToStructureBigEndian<PDInfo>(pdsector);
-                pdold = Marshal.ByteArrayToStructureBigEndian<PDInfoOld>(pdsector);
+                vtoc = Marshal.ByteArrayToStructureBigEndian<vtoc>(vtocsector);
+
+                for(int i = 0; i < vtoc.v_part.Length; i++)
+                {
+                    vtoc.v_part[i].p_tag   = (pTag)Swapping.Swap((ushort)vtoc.v_part[i].p_tag);
+                    vtoc.v_part[i].p_flag  = (pFlag)Swapping.Swap((ushort)vtoc.v_part[i].p_flag);
+                    vtoc.v_part[i].p_start = Swapping.Swap(vtoc.v_part[i].p_start);
+                    vtoc.v_part[i].p_size  = Swapping.Swap(vtoc.v_part[i].p_size);
+                    vtoc.timestamp[i]      = Swapping.Swap(vtoc.timestamp[i]);
+                }
+            }
+        }
+
+        if(!magicFound &&
+           pd.version < XPDVERS)
+        {
+            magic = BitConverter.ToUInt32(vtocsector, 12);
+
+            if(magic == VTOC_SANE ||
+               magic == VTOC_ENAS)
+            {
+                magicFound = true;
+                useOld     = true;
+                AaruConsole.DebugWriteLine("VTOC plugin", "Old VTOC found at {0}", pdloc + sectorOffset + 1);
+
+                if(magic == VTOC_SANE)
+                    vtocOld = Marshal.ByteArrayToStructureLittleEndian<vtocold>(vtocsector);
+                else
+                {
+                    vtocOld = Marshal.ByteArrayToStructureBigEndian<vtocold>(vtocsector);
+
+                    for(int i = 0; i < vtocOld.v_part.Length; i++)
+                    {
+                        vtocOld.v_part[i].p_tag   = (pTag)Swapping.Swap((ushort)vtocOld.v_part[i].p_tag);
+                        vtocOld.v_part[i].p_flag  = (pFlag)Swapping.Swap((ushort)vtocOld.v_part[i].p_flag);
+                        vtocOld.v_part[i].p_start = Swapping.Swap(vtocOld.v_part[i].p_start);
+                        vtocOld.v_part[i].p_size  = Swapping.Swap(vtocOld.v_part[i].p_size);
+                        vtocOld.timestamp[i]      = Swapping.Swap(vtocOld.timestamp[i]);
+                    }
+                }
+            }
+        }
+
+        if(!magicFound)
+        {
+            AaruConsole.DebugWriteLine("VTOC plugin", "Searching for VTOC on relative byte {0}", pd.vtoc_ptr);
+            ulong relSecPtr = pd.vtoc_ptr               / imagePlugin.Info.SectorSize;
+            uint  relSecOff = pd.vtoc_ptr               % imagePlugin.Info.SectorSize;
+            uint  secCount  = (relSecOff + pd.vtoc_len) / imagePlugin.Info.SectorSize;
+
+            if((relSecOff + pd.vtoc_len) % imagePlugin.Info.SectorSize > 0)
+                secCount++;
+
+            AaruConsole.DebugWriteLine("VTOC plugin",
+                                       "Going to read {0} sectors from sector {1}, getting VTOC from byte {2}",
+                                       secCount, relSecPtr + sectorOffset, relSecOff);
+
+            if(relSecPtr + sectorOffset + secCount >= imagePlugin.Info.Sectors)
+            {
+                AaruConsole.DebugWriteLine("VTOC plugin", "Going to read past device size, aborting...");
+
+                return false;
             }
 
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.driveid = {0}", pd.driveid);
-
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.sanity = 0x{0:X8} (should be 0x{1:X8})", pd.sanity,
-                                       PD_MAGIC);
-
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.version = {0}", pd.version);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.serial = \"{0}\"", StringHandlers.CToString(pd.serial));
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.cyls = {0}", pd.cyls);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.tracks = {0}", pd.tracks);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.sectors = {0}", pd.sectors);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.bytes = {0}", pd.bytes);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.logicalst = {0}", pd.logicalst);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.errlogst = {0}", pd.errlogst);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.errlogsz = {0}", pd.errlogsz);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.mfgst = {0}", pd.mfgst);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.mfgsz = {0}", pd.mfgsz);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.defectst = {0}", pd.defectst);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.defectsz = {0}", pd.defectsz);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relno = {0}", pd.relno);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relst = {0}", pd.relst);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relsz = {0}", pd.relsz);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.relnext = {0}", pd.relnext);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.allcstrt = {0}", pdold.allcstrt);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.allcend = {0}", pdold.allcend);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_ptr = {0}", pd.vtoc_ptr);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_len = {0}", pd.vtoc_len);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.vtoc_pad = {0}", pd.vtoc_pad);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.alt_ptr = {0}", pd.alt_ptr);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.alt_len = {0}", pd.alt_len);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pcyls = {0}", pd.pcyls);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.ptracks = {0}", pd.ptracks);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.psectors = {0}", pd.psectors);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pbytes = {0}", pd.pbytes);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.secovhd = {0}", pd.secovhd);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.interleave = {0}", pd.interleave);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.skew = {0}", pd.skew);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[0] = {0}", pd.pad[0]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[1] = {0}", pd.pad[1]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[2] = {0}", pd.pad[2]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[3] = {0}", pd.pad[3]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[4] = {0}", pd.pad[4]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[5] = {0}", pd.pad[5]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[6] = {0}", pd.pad[6]);
-            AaruConsole.DebugWriteLine("VTOC plugin", "pdinfo.pad[7] = {0}", pd.pad[7]);
-
-            magicFound = false;
-            bool   useOld     = false;
-            errno = imagePlugin.ReadSector(pdloc + sectorOffset + 1, out byte[] vtocsector);
+            errno = imagePlugin.ReadSectors(relSecPtr + sectorOffset, secCount, out byte[] tmp);
 
             if(errno != ErrorNumber.NoError)
                 return false;
-            var    vtoc       = new vtoc();
-            var    vtocOld    = new vtocold();
+            vtocsector = new byte[pd.vtoc_len];
+            Array.Copy(tmp, relSecOff, vtocsector, 0, pd.vtoc_len);
             magic = BitConverter.ToUInt32(vtocsector, 0);
 
             if(magic == VTOC_SANE ||
                magic == VTOC_ENAS)
             {
                 magicFound = true;
-                AaruConsole.DebugWriteLine("VTOC plugin", "New VTOC found at {0}", pdloc + sectorOffset + 1);
+                AaruConsole.DebugWriteLine("VTOC plugin", "New VTOC found.");
 
                 if(magic == VTOC_SANE)
                     vtoc = Marshal.ByteArrayToStructureLittleEndian<vtoc>(vtocsector);
@@ -193,434 +275,351 @@ namespace Aaru.Partitions
                     }
                 }
             }
+        }
 
-            if(!magicFound &&
-               pd.version < XPDVERS)
-            {
-                magic = BitConverter.ToUInt32(vtocsector, 12);
+        if(!magicFound)
+        {
+            AaruConsole.DebugWriteLine("VTOC plugin", "Cannot find VTOC.");
 
-                if(magic == VTOC_SANE ||
-                   magic == VTOC_ENAS)
-                {
-                    magicFound = true;
-                    useOld     = true;
-                    AaruConsole.DebugWriteLine("VTOC plugin", "Old VTOC found at {0}", pdloc + sectorOffset + 1);
+            return false;
+        }
 
-                    if(magic == VTOC_SANE)
-                        vtocOld = Marshal.ByteArrayToStructureLittleEndian<vtocold>(vtocsector);
-                    else
-                    {
-                        vtocOld = Marshal.ByteArrayToStructureBigEndian<vtocold>(vtocsector);
+        if(useOld)
+        {
+            AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_sanity = 0x{0:X8} (should be 0x{1:X8})",
+                                       vtocOld.v_sanity, VTOC_SANE);
 
-                        for(int i = 0; i < vtocOld.v_part.Length; i++)
-                        {
-                            vtocOld.v_part[i].p_tag   = (pTag)Swapping.Swap((ushort)vtocOld.v_part[i].p_tag);
-                            vtocOld.v_part[i].p_flag  = (pFlag)Swapping.Swap((ushort)vtocOld.v_part[i].p_flag);
-                            vtocOld.v_part[i].p_start = Swapping.Swap(vtocOld.v_part[i].p_start);
-                            vtocOld.v_part[i].p_size  = Swapping.Swap(vtocOld.v_part[i].p_size);
-                            vtocOld.timestamp[i]      = Swapping.Swap(vtocOld.timestamp[i]);
-                        }
-                    }
-                }
-            }
+            AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_version = {0}", vtocOld.v_version);
 
-            if(!magicFound)
-            {
-                AaruConsole.DebugWriteLine("VTOC plugin", "Searching for VTOC on relative byte {0}", pd.vtoc_ptr);
-                ulong relSecPtr = pd.vtoc_ptr               / imagePlugin.Info.SectorSize;
-                uint  relSecOff = pd.vtoc_ptr               % imagePlugin.Info.SectorSize;
-                uint  secCount  = (relSecOff + pd.vtoc_len) / imagePlugin.Info.SectorSize;
+            AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_volume = \"{0}\"",
+                                       StringHandlers.CToString(vtocOld.v_volume));
 
-                if((relSecOff + pd.vtoc_len) % imagePlugin.Info.SectorSize > 0)
-                    secCount++;
-
-                AaruConsole.DebugWriteLine("VTOC plugin",
-                                           "Going to read {0} sectors from sector {1}, getting VTOC from byte {2}",
-                                           secCount, relSecPtr + sectorOffset, relSecOff);
-
-                if(relSecPtr + sectorOffset + secCount >= imagePlugin.Info.Sectors)
-                {
-                    AaruConsole.DebugWriteLine("VTOC plugin", "Going to read past device size, aborting...");
-
-                    return false;
-                }
-
-                errno      = imagePlugin.ReadSectors(relSecPtr + sectorOffset, secCount, out byte[] tmp);
-
-                if(errno != ErrorNumber.NoError)
-                    return false;
-                vtocsector = new byte[pd.vtoc_len];
-                Array.Copy(tmp, relSecOff, vtocsector, 0, pd.vtoc_len);
-                magic = BitConverter.ToUInt32(vtocsector, 0);
-
-                if(magic == VTOC_SANE ||
-                   magic == VTOC_ENAS)
-                {
-                    magicFound = true;
-                    AaruConsole.DebugWriteLine("VTOC plugin", "New VTOC found.");
-
-                    if(magic == VTOC_SANE)
-                        vtoc = Marshal.ByteArrayToStructureLittleEndian<vtoc>(vtocsector);
-                    else
-                    {
-                        vtoc = Marshal.ByteArrayToStructureBigEndian<vtoc>(vtocsector);
-
-                        for(int i = 0; i < vtoc.v_part.Length; i++)
-                        {
-                            vtoc.v_part[i].p_tag   = (pTag)Swapping.Swap((ushort)vtoc.v_part[i].p_tag);
-                            vtoc.v_part[i].p_flag  = (pFlag)Swapping.Swap((ushort)vtoc.v_part[i].p_flag);
-                            vtoc.v_part[i].p_start = Swapping.Swap(vtoc.v_part[i].p_start);
-                            vtoc.v_part[i].p_size  = Swapping.Swap(vtoc.v_part[i].p_size);
-                            vtoc.timestamp[i]      = Swapping.Swap(vtoc.timestamp[i]);
-                        }
-                    }
-                }
-            }
-
-            if(!magicFound)
-            {
-                AaruConsole.DebugWriteLine("VTOC plugin", "Cannot find VTOC.");
-
-                return false;
-            }
-
-            if(useOld)
-            {
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_sanity = 0x{0:X8} (should be 0x{1:X8})",
-                                           vtocOld.v_sanity, VTOC_SANE);
-
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_version = {0}", vtocOld.v_version);
-
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_volume = \"{0}\"",
-                                           StringHandlers.CToString(vtocOld.v_volume));
-
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_sectorsz = {0}", vtocOld.v_sectorsz);
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_nparts = {0}", vtocOld.v_nparts);
-
-                for(int i = 0; i < V_NUMPAR; i++)
-                {
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_tag = {1} ({2})", i,
-                                               vtocOld.v_part[i].p_tag, (ushort)vtocOld.v_part[i].p_tag);
-
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_flag = {1} ({2})", i,
-                                               vtocOld.v_part[i].p_flag, (ushort)vtocOld.v_part[i].p_flag);
-
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_start = {1}", i,
-                                               vtocOld.v_part[i].p_start);
-
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_size = {1}", i,
-                                               vtocOld.v_part[i].p_size);
-
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.timestamp[{0}] = {1}", i,
-                                               DateHandlers.UnixToDateTime(vtocOld.timestamp[i]));
-                }
-            }
-            else
-            {
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_sanity = 0x{0:X8} (should be 0x{1:X8})",
-                                           vtoc.v_sanity, VTOC_SANE);
-
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_version = {0}", vtoc.v_version);
-
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_volume = \"{0}\"",
-                                           StringHandlers.CToString(vtoc.v_volume));
-
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_pad = {0}", vtoc.v_pad);
-                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_nparts = {0}", vtoc.v_nparts);
-
-                for(int i = 0; i < V_NUMPAR; i++)
-                {
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_tag = {1} ({2})", i,
-                                               vtoc.v_part[i].p_tag, (ushort)vtoc.v_part[i].p_tag);
-
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_flag = {1} ({2})", i,
-                                               vtoc.v_part[i].p_flag, (ushort)vtoc.v_part[i].p_flag);
-
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_start = {1}", i,
-                                               vtoc.v_part[i].p_start);
-
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_size = {1}", i,
-                                               vtoc.v_part[i].p_size);
-
-                    AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.timestamp[{0}] = {1}", i,
-                                               DateHandlers.UnixToDateTime(vtoc.timestamp[i]));
-                }
-            }
-
-            uint        bps;
-            partition[] parts;
-            int[]       timestamps;
-
-            if(useOld)
-            {
-                bps        = vtocOld.v_sectorsz;
-                parts      = vtocOld.v_part;
-                timestamps = vtocOld.timestamp;
-            }
-            else
-            {
-                bps        = pd.bytes;
-                parts      = vtoc.v_part;
-                timestamps = vtoc.timestamp;
-            }
-
-            // Check for a partition describing the VTOC whose start is the same as the start we know.
-            // This means partition starts are absolute, not relative, to the VTOC position
-            for(int i = 0; i < V_NUMPAR; i++)
-                if(parts[i].p_tag          == pTag.V_BACKUP &&
-                   (ulong)parts[i].p_start == sectorOffset)
-                {
-                    absolute = true;
-
-                    break;
-                }
+            AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_sectorsz = {0}", vtocOld.v_sectorsz);
+            AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_nparts = {0}", vtocOld.v_nparts);
 
             for(int i = 0; i < V_NUMPAR; i++)
-                if(parts[i].p_tag != pTag.V_UNUSED)
-                {
-                    var part = new Partition
-                    {
-                        Start    = (ulong)(parts[i].p_start * bps) / imagePlugin.Info.SectorSize,
-                        Length   = (ulong)(parts[i].p_size  * bps) / imagePlugin.Info.SectorSize,
-                        Offset   = (ulong)(parts[i].p_start * bps),
-                        Size     = (ulong)(parts[i].p_size  * bps),
-                        Sequence = (ulong)i,
-                        Type     = $"UNIX: {DecodeUnixtag(parts[i].p_tag, !useOld)}",
-                        Scheme   = Name
-                    };
-
-                    string info = "";
-
-                    // Apparently old ones are absolute :?
-                    if(!useOld &&
-                       !absolute)
-                    {
-                        part.Start  += sectorOffset;
-                        part.Offset += sectorOffset * imagePlugin.Info.SectorSize;
-                    }
-
-                    if(parts[i].p_flag.HasFlag(pFlag.V_VALID))
-                        info += " (valid)";
-
-                    if(parts[i].p_flag.HasFlag(pFlag.V_UNMNT))
-                        info += " (unmountable)";
-
-                    if(parts[i].p_flag.HasFlag(pFlag.V_OPEN))
-                        info += " (open)";
-
-                    if(parts[i].p_flag.HasFlag(pFlag.V_REMAP))
-                        info += " (alternate sector mapping)";
-
-                    if(parts[i].p_flag.HasFlag(pFlag.V_RONLY))
-                        info += " (read-only)";
-
-                    if(timestamps[i] != 0)
-                        info += $" created on {DateHandlers.UnixToDateTime(timestamps[i])}";
-
-                    part.Description = "UNIX slice" + info + ".";
-
-                    if(part.End < imagePlugin.Info.Sectors)
-                        partitions.Add(part);
-                }
-
-            return partitions.Count > 0;
-        }
-
-        static string DecodeUnixtag(pTag type, bool isNew)
-        {
-            switch(type)
             {
-                case pTag.V_UNUSED:      return "Unused";
-                case pTag.V_BOOT:        return "Boot";
-                case pTag.V_ROOT:        return "/";
-                case pTag.V_SWAP:        return "Swap";
-                case pTag.V_USER:        return "/usr";
-                case pTag.V_BACKUP:      return "Whole disk";
-                case pTag.V_STAND_OLD:   return isNew ? "Stand" : "Alternate sector space";
-                case pTag.V_VAR_OLD:     return isNew ? "/var" : "non UNIX";
-                case pTag.V_HOME_OLD:    return isNew ? "/home" : "Alternate track space";
-                case pTag.V_ALTSCTR_OLD: return isNew ? "Alternate sector track" : "Stand";
-                case pTag.V_CACHE:       return isNew ? "Cache" : "/var";
-                case pTag.V_RESERVED:    return isNew ? "Reserved" : "/home";
-                case pTag.V_DUMP:        return "dump";
-                case pTag.V_ALTSCTR:     return "Alternate sector track";
-                case pTag.V_VMPUBLIC:    return "volume mgt public partition";
-                case pTag.V_VMPRIVATE:   return "volume mgt private partition";
-                default:                 return $"Unknown TAG: 0x{type:X4}";
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_tag = {1} ({2})", i,
+                                           vtocOld.v_part[i].p_tag, (ushort)vtocOld.v_part[i].p_tag);
+
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_flag = {1} ({2})", i,
+                                           vtocOld.v_part[i].p_flag, (ushort)vtocOld.v_part[i].p_flag);
+
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_start = {1}", i,
+                                           vtocOld.v_part[i].p_start);
+
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.v_part[{0}].p_size = {1}", i,
+                                           vtocOld.v_part[i].p_size);
+
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtocOld.timestamp[{0}] = {1}", i,
+                                           DateHandlers.UnixToDateTime(vtocOld.timestamp[i]));
+            }
+        }
+        else
+        {
+            AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_sanity = 0x{0:X8} (should be 0x{1:X8})",
+                                       vtoc.v_sanity, VTOC_SANE);
+
+            AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_version = {0}", vtoc.v_version);
+
+            AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_volume = \"{0}\"",
+                                       StringHandlers.CToString(vtoc.v_volume));
+
+            AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_pad = {0}", vtoc.v_pad);
+            AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_nparts = {0}", vtoc.v_nparts);
+
+            for(int i = 0; i < V_NUMPAR; i++)
+            {
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_tag = {1} ({2})", i,
+                                           vtoc.v_part[i].p_tag, (ushort)vtoc.v_part[i].p_tag);
+
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_flag = {1} ({2})", i,
+                                           vtoc.v_part[i].p_flag, (ushort)vtoc.v_part[i].p_flag);
+
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_start = {1}", i,
+                                           vtoc.v_part[i].p_start);
+
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.v_part[{0}].p_size = {1}", i,
+                                           vtoc.v_part[i].p_size);
+
+                AaruConsole.DebugWriteLine("VTOC plugin", "vtoc.timestamp[{0}] = {1}", i,
+                                           DateHandlers.UnixToDateTime(vtoc.timestamp[i]));
             }
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct PDInfo
+        uint        bps;
+        partition[] parts;
+        int[]       timestamps;
+
+        if(useOld)
         {
-            public readonly uint driveid; /*identifies the device type*/
-            public readonly uint sanity;  /*verifies device sanity*/
-            public readonly uint version; /*version number*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] serial;  /*serial number of the device*/
-            public readonly uint cyls;      /*number of cylinders per drive*/
-            public readonly uint tracks;    /*number tracks per cylinder*/
-            public readonly uint sectors;   /*number sectors per track*/
-            public readonly uint bytes;     /*number of bytes per sector*/
-            public readonly uint logicalst; /*sector address of logical sector 0*/
-            public readonly uint errlogst;  /*sector address of error log area*/
-            public readonly uint errlogsz;  /*size in bytes of error log area*/
-            public readonly uint mfgst;     /*sector address of mfg. defect info*/
-            public readonly uint mfgsz;     /*size in bytes of mfg. defect info*/
-            public readonly uint defectst;  /*sector address of the defect map*/
-            public readonly uint defectsz;  /*size in bytes of defect map*/
-            public readonly uint relno;     /*number of relocation areas*/
-            public readonly uint relst;     /*sector address of relocation area*/
-            public readonly uint relsz;     /*size in sectors of relocation area*/
-            public readonly uint relnext;   /*address of next avail reloc sector*/
-            /* the previous items are left intact from AT&T's 3b2 pdinfo.  Following
-               are added for the 80386 port */
-            public readonly uint   vtoc_ptr; /*byte offset of vtoc block*/
-            public readonly ushort vtoc_len; /*byte length of vtoc block*/
-            public readonly ushort vtoc_pad; /* pad for 16-bit machine alignment */
-            public readonly uint   alt_ptr;  /*byte offset of alternates table*/
-            public readonly ushort alt_len;  /*byte length of alternates table*/
-            /* new in version 3 */
-            public readonly uint   pcyls;      /*physical cylinders per drive*/
-            public readonly uint   ptracks;    /*physical tracks per cylinder*/
-            public readonly uint   psectors;   /*physical sectors per track*/
-            public readonly uint   pbytes;     /*physical bytes per sector*/
-            public readonly uint   secovhd;    /*sector overhead bytes per sector*/
-            public readonly ushort interleave; /*interleave factor*/
-            public readonly ushort skew;       /*skew factor*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly uint[] pad; /*space for more stuff*/
+            bps        = vtocOld.v_sectorsz;
+            parts      = vtocOld.v_part;
+            timestamps = vtocOld.timestamp;
+        }
+        else
+        {
+            bps        = pd.bytes;
+            parts      = vtoc.v_part;
+            timestamps = vtoc.timestamp;
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct PDInfoOld
-        {
-            public readonly uint driveid; /*identifies the device type*/
-            public readonly uint sanity;  /*verifies device sanity*/
-            public readonly uint version; /*version number*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
-            public readonly byte[] serial;  /*serial number of the device*/
-            public readonly uint cyls;      /*number of cylinders per drive*/
-            public readonly uint tracks;    /*number tracks per cylinder*/
-            public readonly uint sectors;   /*number sectors per track*/
-            public readonly uint bytes;     /*number of bytes per sector*/
-            public readonly uint logicalst; /*sector address of logical sector 0*/
-            public readonly uint errlogst;  /*sector address of error log area*/
-            public readonly uint errlogsz;  /*size in bytes of error log area*/
-            public readonly uint mfgst;     /*sector address of mfg. defect info*/
-            public readonly uint mfgsz;     /*size in bytes of mfg. defect info*/
-            public readonly uint defectst;  /*sector address of the defect map*/
-            public readonly uint defectsz;  /*size in bytes of defect map*/
-            public readonly uint relno;     /*number of relocation areas*/
-            public readonly uint relst;     /*sector address of relocation area*/
-            public readonly uint relsz;     /*size in sectors of relocation area*/
-            public readonly uint relnext;   /*address of next avail reloc sector*/
-            public readonly uint allcstrt;  /*start of the allocatable disk*/
-            public readonly uint allcend;   /*end of allocatable disk*/
-        }
+        // Check for a partition describing the VTOC whose start is the same as the start we know.
+        // This means partition starts are absolute, not relative, to the VTOC position
+        for(int i = 0; i < V_NUMPAR; i++)
+            if(parts[i].p_tag          == pTag.V_BACKUP &&
+               (ulong)parts[i].p_start == sectorOffset)
+            {
+                absolute = true;
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct vtocold
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
-            public readonly uint[] v_bootinfo; /*info needed by mboot*/
-            public readonly uint v_sanity;     /*to verify vtoc sanity*/
-            public readonly uint v_version;    /*layout version*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] v_volume;   /*volume name*/
-            public readonly ushort v_sectorsz; /*sector size in bytes*/
-            public readonly ushort v_nparts;   /*number of partitions*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly uint[] v_reserved; /*free space*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
-            public readonly partition[] v_part; /*partition headers*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
-            public readonly int[] timestamp; /* SCSI time stamp */
-        }
+                break;
+            }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct vtoc
-        {
-            public readonly uint v_sanity;  /*to verify vtoc sanity*/
-            public readonly uint v_version; /*layout version*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
-            public readonly byte[] v_volume; /*volume name*/
-            public readonly ushort v_nparts; /*number of partitions*/
-            public readonly ushort v_pad;    /*pad for 286 compiler*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
-            public readonly uint[] v_reserved; /*free space*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
-            public readonly partition[] v_part; /*partition headers*/
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
-            public readonly int[] timestamp; /* SCSI time stamp */
-        }
+        for(int i = 0; i < V_NUMPAR; i++)
+            if(parts[i].p_tag != pTag.V_UNUSED)
+            {
+                var part = new Partition
+                {
+                    Start    = (ulong)(parts[i].p_start * bps) / imagePlugin.Info.SectorSize,
+                    Length   = (ulong)(parts[i].p_size  * bps) / imagePlugin.Info.SectorSize,
+                    Offset   = (ulong)(parts[i].p_start * bps),
+                    Size     = (ulong)(parts[i].p_size  * bps),
+                    Sequence = (ulong)i,
+                    Type     = $"UNIX: {DecodeUnixtag(parts[i].p_tag, !useOld)}",
+                    Scheme   = Name
+                };
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
+                string info = "";
 
-        // ReSharper disable once InconsistentNaming
-        struct partition
-        {
-            public pTag  p_tag;   /*ID tag of partition*/
-            public pFlag p_flag;  /*permision flags*/
-            public int   p_start; /*start sector no of partition*/
-            public int   p_size;  /*# of blocks in partition*/
-        }
+                // Apparently old ones are absolute :?
+                if(!useOld &&
+                   !absolute)
+                {
+                    part.Start  += sectorOffset;
+                    part.Offset += sectorOffset * imagePlugin.Info.SectorSize;
+                }
 
-        [SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum pTag : ushort
-        {
-            /// <summary>empty</summary>
-            V_UNUSED = 0x0000,
-            /// <summary>boot</summary>
-            V_BOOT = 0x0001,
-            /// <summary>root</summary>
-            V_ROOT = 0x0002,
-            /// <summary>swap</summary>
-            V_SWAP = 0x0003,
-            /// <summary>/usr</summary>
-            V_USER = 0x0004,
-            /// <summary>whole disk</summary>
-            V_BACKUP = 0x0005,
-            /// <summary>stand partition ??</summary>
-            V_STAND_OLD = 0x0006,
-            /// <summary>alternate sector space</summary>
-            V_ALTS_OLD = 0x0006,
-            /// <summary>/var</summary>
-            V_VAR_OLD = 0x0007,
-            /// <summary>non UNIX</summary>
-            V_OTHER = 0x0007,
-            /// <summary>/home</summary>
-            V_HOME_OLD = 0x0008,
-            /// <summary>alternate track space</summary>
-            V_ALTS = 0x0008,
-            /// <summary>alternate sector track</summary>
-            V_ALTSCTR_OLD = 0x0009,
-            /// <summary>stand partition ??</summary>
-            V_STAND = 0x0009,
-            /// <summary>cache</summary>
-            V_CACHE = 0x000A,
-            /// <summary>/var</summary>
-            V_VAR = 0x000A,
-            /// <summary>reserved</summary>
-            V_RESERVED = 0x000B,
-            /// <summary>/home</summary>
-            V_HOME = 0x000B,
-            /// <summary>dump partition</summary>
-            V_DUMP = 0x000C,
-            /// <summary>alternate sector track</summary>
-            V_ALTSCTR = 0x000D,
-            /// <summary>volume mgt public partition</summary>
-            V_VMPUBLIC = 0x000E,
-            /// <summary>volume mgt private partition</summary>
-            V_VMPRIVATE = 0x000F
-        }
+                if(parts[i].p_flag.HasFlag(pFlag.V_VALID))
+                    info += " (valid)";
 
-        [Flags, SuppressMessage("ReSharper", "InconsistentNaming")]
-        enum pFlag : ushort
+                if(parts[i].p_flag.HasFlag(pFlag.V_UNMNT))
+                    info += " (unmountable)";
+
+                if(parts[i].p_flag.HasFlag(pFlag.V_OPEN))
+                    info += " (open)";
+
+                if(parts[i].p_flag.HasFlag(pFlag.V_REMAP))
+                    info += " (alternate sector mapping)";
+
+                if(parts[i].p_flag.HasFlag(pFlag.V_RONLY))
+                    info += " (read-only)";
+
+                if(timestamps[i] != 0)
+                    info += $" created on {DateHandlers.UnixToDateTime(timestamps[i])}";
+
+                part.Description = "UNIX slice" + info + ".";
+
+                if(part.End < imagePlugin.Info.Sectors)
+                    partitions.Add(part);
+            }
+
+        return partitions.Count > 0;
+    }
+
+    static string DecodeUnixtag(pTag type, bool isNew)
+    {
+        switch(type)
         {
-            /* Partition permission flags */ V_UNMNT = 0x01, /* Unmountable partition */ V_RONLY = 0x10, /* Read only */
-            V_REMAP = 0x20, /* do alternate sector mapping */ V_OPEN = 0x100, /* Partition open (for driver use) */
-            V_VALID = 0x200, /* Partition is valid to use */ V_VOMASK = 0x300 /* mask for open and valid */
+            case pTag.V_UNUSED:      return "Unused";
+            case pTag.V_BOOT:        return "Boot";
+            case pTag.V_ROOT:        return "/";
+            case pTag.V_SWAP:        return "Swap";
+            case pTag.V_USER:        return "/usr";
+            case pTag.V_BACKUP:      return "Whole disk";
+            case pTag.V_STAND_OLD:   return isNew ? "Stand" : "Alternate sector space";
+            case pTag.V_VAR_OLD:     return isNew ? "/var" : "non UNIX";
+            case pTag.V_HOME_OLD:    return isNew ? "/home" : "Alternate track space";
+            case pTag.V_ALTSCTR_OLD: return isNew ? "Alternate sector track" : "Stand";
+            case pTag.V_CACHE:       return isNew ? "Cache" : "/var";
+            case pTag.V_RESERVED:    return isNew ? "Reserved" : "/home";
+            case pTag.V_DUMP:        return "dump";
+            case pTag.V_ALTSCTR:     return "Alternate sector track";
+            case pTag.V_VMPUBLIC:    return "volume mgt public partition";
+            case pTag.V_VMPRIVATE:   return "volume mgt private partition";
+            default:                 return $"Unknown TAG: 0x{type:X4}";
         }
     }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct PDInfo
+    {
+        public readonly uint driveid; /*identifies the device type*/
+        public readonly uint sanity;  /*verifies device sanity*/
+        public readonly uint version; /*version number*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] serial;  /*serial number of the device*/
+        public readonly uint cyls;      /*number of cylinders per drive*/
+        public readonly uint tracks;    /*number tracks per cylinder*/
+        public readonly uint sectors;   /*number sectors per track*/
+        public readonly uint bytes;     /*number of bytes per sector*/
+        public readonly uint logicalst; /*sector address of logical sector 0*/
+        public readonly uint errlogst;  /*sector address of error log area*/
+        public readonly uint errlogsz;  /*size in bytes of error log area*/
+        public readonly uint mfgst;     /*sector address of mfg. defect info*/
+        public readonly uint mfgsz;     /*size in bytes of mfg. defect info*/
+        public readonly uint defectst;  /*sector address of the defect map*/
+        public readonly uint defectsz;  /*size in bytes of defect map*/
+        public readonly uint relno;     /*number of relocation areas*/
+        public readonly uint relst;     /*sector address of relocation area*/
+        public readonly uint relsz;     /*size in sectors of relocation area*/
+        public readonly uint relnext;   /*address of next avail reloc sector*/
+        /* the previous items are left intact from AT&T's 3b2 pdinfo.  Following
+           are added for the 80386 port */
+        public readonly uint   vtoc_ptr; /*byte offset of vtoc block*/
+        public readonly ushort vtoc_len; /*byte length of vtoc block*/
+        public readonly ushort vtoc_pad; /* pad for 16-bit machine alignment */
+        public readonly uint   alt_ptr;  /*byte offset of alternates table*/
+        public readonly ushort alt_len;  /*byte length of alternates table*/
+        /* new in version 3 */
+        public readonly uint   pcyls;      /*physical cylinders per drive*/
+        public readonly uint   ptracks;    /*physical tracks per cylinder*/
+        public readonly uint   psectors;   /*physical sectors per track*/
+        public readonly uint   pbytes;     /*physical bytes per sector*/
+        public readonly uint   secovhd;    /*sector overhead bytes per sector*/
+        public readonly ushort interleave; /*interleave factor*/
+        public readonly ushort skew;       /*skew factor*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly uint[] pad; /*space for more stuff*/
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct PDInfoOld
+    {
+        public readonly uint driveid; /*identifies the device type*/
+        public readonly uint sanity;  /*verifies device sanity*/
+        public readonly uint version; /*version number*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 12)]
+        public readonly byte[] serial;  /*serial number of the device*/
+        public readonly uint cyls;      /*number of cylinders per drive*/
+        public readonly uint tracks;    /*number tracks per cylinder*/
+        public readonly uint sectors;   /*number sectors per track*/
+        public readonly uint bytes;     /*number of bytes per sector*/
+        public readonly uint logicalst; /*sector address of logical sector 0*/
+        public readonly uint errlogst;  /*sector address of error log area*/
+        public readonly uint errlogsz;  /*size in bytes of error log area*/
+        public readonly uint mfgst;     /*sector address of mfg. defect info*/
+        public readonly uint mfgsz;     /*size in bytes of mfg. defect info*/
+        public readonly uint defectst;  /*sector address of the defect map*/
+        public readonly uint defectsz;  /*size in bytes of defect map*/
+        public readonly uint relno;     /*number of relocation areas*/
+        public readonly uint relst;     /*sector address of relocation area*/
+        public readonly uint relsz;     /*size in sectors of relocation area*/
+        public readonly uint relnext;   /*address of next avail reloc sector*/
+        public readonly uint allcstrt;  /*start of the allocatable disk*/
+        public readonly uint allcend;   /*end of allocatable disk*/
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct vtocold
+    {
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
+        public readonly uint[] v_bootinfo; /*info needed by mboot*/
+        public readonly uint v_sanity;     /*to verify vtoc sanity*/
+        public readonly uint v_version;    /*layout version*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] v_volume;   /*volume name*/
+        public readonly ushort v_sectorsz; /*sector size in bytes*/
+        public readonly ushort v_nparts;   /*number of partitions*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly uint[] v_reserved; /*free space*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
+        public readonly partition[] v_part; /*partition headers*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
+        public readonly int[] timestamp; /* SCSI time stamp */
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct vtoc
+    {
+        public readonly uint v_sanity;  /*to verify vtoc sanity*/
+        public readonly uint v_version; /*layout version*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 8)]
+        public readonly byte[] v_volume; /*volume name*/
+        public readonly ushort v_nparts; /*number of partitions*/
+        public readonly ushort v_pad;    /*pad for 286 compiler*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 10)]
+        public readonly uint[] v_reserved; /*free space*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
+        public readonly partition[] v_part; /*partition headers*/
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = V_NUMPAR)]
+        public readonly int[] timestamp; /* SCSI time stamp */
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+
+    // ReSharper disable once InconsistentNaming
+    struct partition
+    {
+        public pTag  p_tag;   /*ID tag of partition*/
+        public pFlag p_flag;  /*permision flags*/
+        public int   p_start; /*start sector no of partition*/
+        public int   p_size;  /*# of blocks in partition*/
+    }
+
+    [SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum pTag : ushort
+    {
+        /// <summary>empty</summary>
+        V_UNUSED = 0x0000,
+        /// <summary>boot</summary>
+        V_BOOT = 0x0001,
+        /// <summary>root</summary>
+        V_ROOT = 0x0002,
+        /// <summary>swap</summary>
+        V_SWAP = 0x0003,
+        /// <summary>/usr</summary>
+        V_USER = 0x0004,
+        /// <summary>whole disk</summary>
+        V_BACKUP = 0x0005,
+        /// <summary>stand partition ??</summary>
+        V_STAND_OLD = 0x0006,
+        /// <summary>alternate sector space</summary>
+        V_ALTS_OLD = 0x0006,
+        /// <summary>/var</summary>
+        V_VAR_OLD = 0x0007,
+        /// <summary>non UNIX</summary>
+        V_OTHER = 0x0007,
+        /// <summary>/home</summary>
+        V_HOME_OLD = 0x0008,
+        /// <summary>alternate track space</summary>
+        V_ALTS = 0x0008,
+        /// <summary>alternate sector track</summary>
+        V_ALTSCTR_OLD = 0x0009,
+        /// <summary>stand partition ??</summary>
+        V_STAND = 0x0009,
+        /// <summary>cache</summary>
+        V_CACHE = 0x000A,
+        /// <summary>/var</summary>
+        V_VAR = 0x000A,
+        /// <summary>reserved</summary>
+        V_RESERVED = 0x000B,
+        /// <summary>/home</summary>
+        V_HOME = 0x000B,
+        /// <summary>dump partition</summary>
+        V_DUMP = 0x000C,
+        /// <summary>alternate sector track</summary>
+        V_ALTSCTR = 0x000D,
+        /// <summary>volume mgt public partition</summary>
+        V_VMPUBLIC = 0x000E,
+        /// <summary>volume mgt private partition</summary>
+        V_VMPRIVATE = 0x000F
+    }
+
+    [Flags, SuppressMessage("ReSharper", "InconsistentNaming")]
+    enum pFlag : ushort
+    {
+        /* Partition permission flags */ V_UNMNT = 0x01, /* Unmountable partition */ V_RONLY = 0x10, /* Read only */
+        V_REMAP = 0x20, /* do alternate sector mapping */ V_OPEN = 0x100, /* Partition open (for driver use) */
+        V_VALID = 0x200, /* Partition is valid to use */ V_VOMASK = 0x300 /* mask for open and valid */
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/XENIX.cs b/Aaru.Partitions/XENIX.cs
index 08c28f1b3..7aed751ce 100644
--- a/Aaru.Partitions/XENIX.cs
+++ b/Aaru.Partitions/XENIX.cs
@@ -38,90 +38,89 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Console;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+// TODO: Find better documentation, this is working for XENIX 2 but not for SCO OpenServer...
+/// <inheritdoc />
+/// <summary>Implements decoding of XENIX partitions</summary>
+public sealed class XENIX : IPartition
 {
-    // TODO: Find better documentation, this is working for XENIX 2 but not for SCO OpenServer...
+    const ushort PAMAGIC     = 0x1234;
+    const int    MAXPARTS    = 16;
+    const uint   XENIX_BSIZE = 1024;
+
+    // Can't find this in any documentation but everything is aligned to this offset (in sectors)
+    const uint XENIX_OFFSET = 977;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of XENIX partitions</summary>
-    public sealed class XENIX : IPartition
+    public string Name => "XENIX";
+    /// <inheritdoc />
+    public Guid Id => new("53BE01DE-E68B-469F-A17F-EC2E4BD61CD9");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<CommonTypes.Partition> partitions,
+                               ulong sectorOffset)
     {
-        const ushort PAMAGIC     = 0x1234;
-        const int    MAXPARTS    = 16;
-        const uint   XENIX_BSIZE = 1024;
+        partitions = new List<CommonTypes.Partition>();
 
-        // Can't find this in any documentation but everything is aligned to this offset (in sectors)
-        const uint XENIX_OFFSET = 977;
+        if(42 + sectorOffset >= imagePlugin.Info.Sectors)
+            return false;
 
-        /// <inheritdoc />
-        public string Name => "XENIX";
-        /// <inheritdoc />
-        public Guid Id => new("53BE01DE-E68B-469F-A17F-EC2E4BD61CD9");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        ErrorNumber errno = imagePlugin.ReadSector(42 + sectorOffset, out byte[] tblsector);
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<CommonTypes.Partition> partitions,
-                                   ulong sectorOffset)
+        if(errno != ErrorNumber.NoError)
+            return false;
+
+        Partable xnxtbl = Marshal.ByteArrayToStructureLittleEndian<Partable>(tblsector);
+
+        AaruConsole.DebugWriteLine("XENIX plugin", "xnxtbl.p_magic = 0x{0:X4} (should be 0x{1:X4})", xnxtbl.p_magic,
+                                   PAMAGIC);
+
+        if(xnxtbl.p_magic != PAMAGIC)
+            return false;
+
+        for(int i = 0; i < MAXPARTS; i++)
         {
-            partitions = new List<CommonTypes.Partition>();
+            AaruConsole.DebugWriteLine("XENIX plugin", "xnxtbl.p[{0}].p_off = {1}", i, xnxtbl.p[i].p_off);
+            AaruConsole.DebugWriteLine("XENIX plugin", "xnxtbl.p[{0}].p_size = {1}", i, xnxtbl.p[i].p_size);
 
-            if(42 + sectorOffset >= imagePlugin.Info.Sectors)
-                return false;
+            if(xnxtbl.p[i].p_size <= 0)
+                continue;
 
-            ErrorNumber errno = imagePlugin.ReadSector(42 + sectorOffset, out byte[] tblsector);
-
-            if(errno != ErrorNumber.NoError)
-                return false;
-
-            Partable xnxtbl = Marshal.ByteArrayToStructureLittleEndian<Partable>(tblsector);
-
-            AaruConsole.DebugWriteLine("XENIX plugin", "xnxtbl.p_magic = 0x{0:X4} (should be 0x{1:X4})", xnxtbl.p_magic,
-                                       PAMAGIC);
-
-            if(xnxtbl.p_magic != PAMAGIC)
-                return false;
-
-            for(int i = 0; i < MAXPARTS; i++)
+            var part = new CommonTypes.Partition
             {
-                AaruConsole.DebugWriteLine("XENIX plugin", "xnxtbl.p[{0}].p_off = {1}", i, xnxtbl.p[i].p_off);
-                AaruConsole.DebugWriteLine("XENIX plugin", "xnxtbl.p[{0}].p_size = {1}", i, xnxtbl.p[i].p_size);
+                Start = ((ulong)((xnxtbl.p[i].p_off + XENIX_OFFSET) * XENIX_BSIZE) / imagePlugin.Info.SectorSize) +
+                        sectorOffset,
+                Length = (ulong)(xnxtbl.p[i].p_size * XENIX_BSIZE) / imagePlugin.Info.SectorSize,
+                Offset = (ulong)((xnxtbl.p[i].p_off + XENIX_OFFSET) * XENIX_BSIZE) +
+                         (imagePlugin.Info.SectorSize * sectorOffset),
+                Size     = (ulong)(xnxtbl.p[i].p_size * XENIX_BSIZE),
+                Sequence = (ulong)i,
+                Type     = "XENIX",
+                Scheme   = Name
+            };
 
-                if(xnxtbl.p[i].p_size <= 0)
-                    continue;
-
-                var part = new CommonTypes.Partition
-                {
-                    Start = ((ulong)((xnxtbl.p[i].p_off + XENIX_OFFSET) * XENIX_BSIZE) / imagePlugin.Info.SectorSize) +
-                            sectorOffset,
-                    Length = (ulong)(xnxtbl.p[i].p_size * XENIX_BSIZE) / imagePlugin.Info.SectorSize,
-                    Offset = (ulong)((xnxtbl.p[i].p_off + XENIX_OFFSET) * XENIX_BSIZE) +
-                             (imagePlugin.Info.SectorSize * sectorOffset),
-                    Size     = (ulong)(xnxtbl.p[i].p_size * XENIX_BSIZE),
-                    Sequence = (ulong)i,
-                    Type     = "XENIX",
-                    Scheme   = Name
-                };
-
-                if(part.End < imagePlugin.Info.Sectors)
-                    partitions.Add(part);
-            }
-
-            return partitions.Count > 0;
+            if(part.End < imagePlugin.Info.Sectors)
+                partitions.Add(part);
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Partable
-        {
-            public readonly ushort p_magic; /* magic number validity indicator */
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAXPARTS)]
-            public readonly Partition[] p; /*partition headers*/
-        }
+        return partitions.Count > 0;
+    }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        readonly struct Partition
-        {
-            public readonly int p_off;  /*start 1K block no of partition*/
-            public readonly int p_size; /*# of 1K blocks in partition*/
-        }
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Partable
+    {
+        public readonly ushort p_magic; /* magic number validity indicator */
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = MAXPARTS)]
+        public readonly Partition[] p; /*partition headers*/
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    readonly struct Partition
+    {
+        public readonly int p_off;  /*start 1K block no of partition*/
+        public readonly int p_size; /*# of 1K blocks in partition*/
     }
 }
\ No newline at end of file
diff --git a/Aaru.Partitions/Xbox.cs b/Aaru.Partitions/Xbox.cs
index 32384b921..97640a6d2 100644
--- a/Aaru.Partitions/Xbox.cs
+++ b/Aaru.Partitions/Xbox.cs
@@ -39,245 +39,244 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using Marshal = Aaru.Helpers.Marshal;
 
-namespace Aaru.Partitions
+namespace Aaru.Partitions;
+
+/// <inheritdoc />
+/// <summary>Implements decoding of Xbox partitions</summary>
+[SuppressMessage("ReSharper", "UnusedMember.Local")]
+public sealed class Xbox : IPartition
 {
+    const uint XBOX_CIGAM                  = 0x46415458;
+    const uint XBOX_MAGIC                  = 0x58544146;
+    const long MEMORY_UNIT_DATA_OFF        = 0x7FF000;
+    const long XBOX360_SECURITY_SECTOR_OFF = 0x2000;
+    const long XBOX360_SYSTEM_CACHE_OFF    = 0x80000;
+    const long XBOX360_GAME_CACHE_OFF      = 0x8008000;
+    const long XBOX368_SYS_EXT_OFF         = 0x10C080000;
+    const long XBOX360_SYS_EXT2_OFF        = 0x118EB0000;
+    const long XBOX360_COMPAT_OFF          = 0x120EB0000;
+    const long XBOX_360DATA_OFF            = 0x130EB0000;
+    const long XBOX360_SECURITY_SECTOR_LEN = 0x80000;
+    const long XBOX360_SYSTEM_CACHE_LEN    = 0x80000000;
+    const long XBOX360_GAME_CACHE_LEN      = 0xA0E30000;
+    const long XBOX368_SYS_EXT_LEN         = 0xCE30000;
+    const long XBOX360_SYS_EXT2_LEN        = 0x8000000;
+    const long XBOX360_COMPAT_LEN          = 0x10000000;
+    const uint XBOX360_DEVKIT_MAGIC        = 0x00020000;
+
     /// <inheritdoc />
-    /// <summary>Implements decoding of Xbox partitions</summary>
-    [SuppressMessage("ReSharper", "UnusedMember.Local")]
-    public sealed class Xbox : IPartition
+    public string Name => "Xbox partitioning";
+    /// <inheritdoc />
+    public Guid Id => new("E3F6FB91-D358-4F22-A550-81E92D50EB78");
+    /// <inheritdoc />
+    public string Author => "Natalia Portillo";
+
+    /// <inheritdoc />
+    public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
     {
-        const uint XBOX_CIGAM                  = 0x46415458;
-        const uint XBOX_MAGIC                  = 0x58544146;
-        const long MEMORY_UNIT_DATA_OFF        = 0x7FF000;
-        const long XBOX360_SECURITY_SECTOR_OFF = 0x2000;
-        const long XBOX360_SYSTEM_CACHE_OFF    = 0x80000;
-        const long XBOX360_GAME_CACHE_OFF      = 0x8008000;
-        const long XBOX368_SYS_EXT_OFF         = 0x10C080000;
-        const long XBOX360_SYS_EXT2_OFF        = 0x118EB0000;
-        const long XBOX360_COMPAT_OFF          = 0x120EB0000;
-        const long XBOX_360DATA_OFF            = 0x130EB0000;
-        const long XBOX360_SECURITY_SECTOR_LEN = 0x80000;
-        const long XBOX360_SYSTEM_CACHE_LEN    = 0x80000000;
-        const long XBOX360_GAME_CACHE_LEN      = 0xA0E30000;
-        const long XBOX368_SYS_EXT_LEN         = 0xCE30000;
-        const long XBOX360_SYS_EXT2_LEN        = 0x8000000;
-        const long XBOX360_COMPAT_LEN          = 0x10000000;
-        const uint XBOX360_DEVKIT_MAGIC        = 0x00020000;
+        partitions = new List<Partition>();
 
-        /// <inheritdoc />
-        public string Name => "Xbox partitioning";
-        /// <inheritdoc />
-        public Guid Id => new("E3F6FB91-D358-4F22-A550-81E92D50EB78");
-        /// <inheritdoc />
-        public string Author => "Natalia Portillo";
+        // Xbox partitions always start on 0
+        if(sectorOffset != 0)
+            return false;
 
-        /// <inheritdoc />
-        public bool GetInformation(IMediaImage imagePlugin, out List<Partition> partitions, ulong sectorOffset)
+        ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] sector);
+
+        if(errno         != ErrorNumber.NoError ||
+           sector.Length < 512)
+            return false;
+
+        Xbox360DevKitPartitionTable table =
+            Marshal.ByteArrayToStructureBigEndian<Xbox360DevKitPartitionTable>(sector);
+
+        if(table.magic                             == XBOX360_DEVKIT_MAGIC     &&
+           table.contentOff   + table.contentLen   <= imagePlugin.Info.Sectors &&
+           table.dashboardOff + table.dashboardLen <= imagePlugin.Info.Sectors)
         {
-            partitions = new List<Partition>();
-
-            // Xbox partitions always start on 0
-            if(sectorOffset != 0)
-                return false;
-
-            ErrorNumber errno = imagePlugin.ReadSector(0, out byte[] sector);
-
-            if(errno         != ErrorNumber.NoError ||
-               sector.Length < 512)
-                return false;
-
-            Xbox360DevKitPartitionTable table =
-                Marshal.ByteArrayToStructureBigEndian<Xbox360DevKitPartitionTable>(sector);
-
-            if(table.magic                             == XBOX360_DEVKIT_MAGIC     &&
-               table.contentOff   + table.contentLen   <= imagePlugin.Info.Sectors &&
-               table.dashboardOff + table.dashboardLen <= imagePlugin.Info.Sectors)
+            var contentPart = new Partition
             {
-                var contentPart = new Partition
-                {
-                    Description = "Content volume",
-                    Size        = (ulong)table.contentLen * imagePlugin.Info.SectorSize,
-                    Length      = table.contentLen,
-                    Sequence    = 1,
-                    Offset      = (ulong)table.contentOff * imagePlugin.Info.SectorSize,
-                    Start       = table.contentOff,
-                    Scheme      = Name
-                };
+                Description = "Content volume",
+                Size        = (ulong)table.contentLen * imagePlugin.Info.SectorSize,
+                Length      = table.contentLen,
+                Sequence    = 1,
+                Offset      = (ulong)table.contentOff * imagePlugin.Info.SectorSize,
+                Start       = table.contentOff,
+                Scheme      = Name
+            };
 
-                var dashboardPart = new Partition
-                {
-                    Description = "Dashboard volume",
-                    Size        = (ulong)table.dashboardLen * imagePlugin.Info.SectorSize,
-                    Length      = table.dashboardLen,
-                    Sequence    = 2,
-                    Offset      = (ulong)table.dashboardOff * imagePlugin.Info.SectorSize,
-                    Start       = table.dashboardOff,
-                    Scheme      = Name
-                };
-
-                partitions.Add(contentPart);
-                partitions.Add(dashboardPart);
-
-                return true;
-            }
-
-            uint temp;
-
-            if(imagePlugin.Info.Sectors > (ulong)(MEMORY_UNIT_DATA_OFF / imagePlugin.Info.SectorSize))
+            var dashboardPart = new Partition
             {
-                errno = imagePlugin.ReadSector((ulong)(MEMORY_UNIT_DATA_OFF / imagePlugin.Info.SectorSize), out sector);
+                Description = "Dashboard volume",
+                Size        = (ulong)table.dashboardLen * imagePlugin.Info.SectorSize,
+                Length      = table.dashboardLen,
+                Sequence    = 2,
+                Offset      = (ulong)table.dashboardOff * imagePlugin.Info.SectorSize,
+                Start       = table.dashboardOff,
+                Scheme      = Name
+            };
 
-                if(errno == ErrorNumber.NoError)
-                {
-                    temp = BitConverter.ToUInt32(sector, 0);
+            partitions.Add(contentPart);
+            partitions.Add(dashboardPart);
 
-                    if(temp == XBOX_CIGAM)
-                    {
-                        var sysCachePart = new Partition
-                        {
-                            Description = "System cache",
-                            Size        = MEMORY_UNIT_DATA_OFF,
-                            Length      = (ulong)(MEMORY_UNIT_DATA_OFF / imagePlugin.Info.SectorSize),
-                            Sequence    = 1,
-                            Offset      = 0,
-                            Start       = 0,
-                            Scheme      = Name
-                        };
+            return true;
+        }
 
-                        var dataPart = new Partition
-                        {
-                            Description = "Data volume",
-                            Size = (imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize) - MEMORY_UNIT_DATA_OFF,
-                            Length = imagePlugin.Info.Sectors - sysCachePart.Length,
-                            Sequence = 2,
-                            Offset = MEMORY_UNIT_DATA_OFF,
-                            Start = sysCachePart.Length,
-                            Scheme = Name
-                        };
+        uint temp;
 
-                        partitions.Add(sysCachePart);
-                        partitions.Add(dataPart);
-
-                        return true;
-                    }
-                }
-            }
-
-            if(imagePlugin.Info.Sectors <= (ulong)(XBOX_360DATA_OFF / imagePlugin.Info.SectorSize))
-                return false;
+        if(imagePlugin.Info.Sectors > (ulong)(MEMORY_UNIT_DATA_OFF / imagePlugin.Info.SectorSize))
+        {
+            errno = imagePlugin.ReadSector((ulong)(MEMORY_UNIT_DATA_OFF / imagePlugin.Info.SectorSize), out sector);
 
+            if(errno == ErrorNumber.NoError)
             {
-                errno = imagePlugin.ReadSector((ulong)(XBOX_360DATA_OFF / imagePlugin.Info.SectorSize), out sector);
+                temp = BitConverter.ToUInt32(sector, 0);
 
-                if(errno == ErrorNumber.NoError)
+                if(temp == XBOX_CIGAM)
                 {
-                    temp = BitConverter.ToUInt32(sector, 0);
-
-                    if(temp != XBOX_CIGAM)
-                        return false;
-
-                    var securityPart = new Partition
-                    {
-                        Description = "Security sectors",
-                        Size        = XBOX360_SECURITY_SECTOR_LEN,
-                        Length      = (ulong)(XBOX360_SECURITY_SECTOR_LEN / imagePlugin.Info.SectorSize),
-                        Sequence    = 1,
-                        Offset      = XBOX360_SECURITY_SECTOR_OFF,
-                        Start       = (ulong)(XBOX360_SECURITY_SECTOR_OFF / imagePlugin.Info.SectorSize),
-                        Scheme      = Name
-                    };
-
                     var sysCachePart = new Partition
                     {
                         Description = "System cache",
-                        Size        = XBOX360_SYSTEM_CACHE_LEN,
-                        Length      = (ulong)(XBOX360_SYSTEM_CACHE_LEN / imagePlugin.Info.SectorSize),
-                        Sequence    = 2,
-                        Offset      = XBOX360_SYSTEM_CACHE_OFF,
-                        Start       = (ulong)(XBOX360_SYSTEM_CACHE_OFF / imagePlugin.Info.SectorSize),
-                        Scheme      = Name
-                    };
-
-                    var gameCachePart = new Partition
-                    {
-                        Description = "Game cache",
-                        Size        = XBOX360_GAME_CACHE_LEN,
-                        Length      = (ulong)(XBOX360_GAME_CACHE_LEN / imagePlugin.Info.SectorSize),
-                        Sequence    = 3,
-                        Offset      = XBOX360_GAME_CACHE_OFF,
-                        Start       = (ulong)(XBOX360_GAME_CACHE_OFF / imagePlugin.Info.SectorSize),
-                        Scheme      = Name
-                    };
-
-                    var sysExtPart = new Partition
-                    {
-                        Description = "System volume",
-                        Size        = XBOX368_SYS_EXT_LEN,
-                        Length      = (ulong)(XBOX368_SYS_EXT_LEN / imagePlugin.Info.SectorSize),
-                        Sequence    = 4,
-                        Offset      = XBOX368_SYS_EXT_OFF,
-                        Start       = (ulong)(XBOX368_SYS_EXT_OFF / imagePlugin.Info.SectorSize),
-                        Scheme      = Name
-                    };
-
-                    var sysExt2Part = new Partition
-                    {
-                        Description = "System volume 2",
-                        Size        = XBOX360_SYS_EXT2_LEN,
-                        Length      = (ulong)(XBOX360_SYS_EXT2_LEN / imagePlugin.Info.SectorSize),
-                        Sequence    = 5,
-                        Offset      = XBOX360_SYS_EXT2_OFF,
-                        Start       = (ulong)(XBOX360_SYS_EXT2_OFF / imagePlugin.Info.SectorSize),
-                        Scheme      = Name
-                    };
-
-                    var xbox1Part = new Partition
-                    {
-                        Description = "Xbox backwards compatibility",
-                        Size        = XBOX360_COMPAT_LEN,
-                        Length      = (ulong)(XBOX360_COMPAT_LEN / imagePlugin.Info.SectorSize),
-                        Sequence    = 6,
-                        Offset      = XBOX360_COMPAT_OFF,
-                        Start       = (ulong)(XBOX360_COMPAT_OFF / imagePlugin.Info.SectorSize),
+                        Size        = MEMORY_UNIT_DATA_OFF,
+                        Length      = (ulong)(MEMORY_UNIT_DATA_OFF / imagePlugin.Info.SectorSize),
+                        Sequence    = 1,
+                        Offset      = 0,
+                        Start       = 0,
                         Scheme      = Name
                     };
 
                     var dataPart = new Partition
                     {
                         Description = "Data volume",
-                        Sequence    = 7,
-                        Offset      = XBOX_360DATA_OFF,
-                        Start       = (ulong)(XBOX_360DATA_OFF / imagePlugin.Info.SectorSize),
+                        Size        = (imagePlugin.Info.Sectors * imagePlugin.Info.SectorSize) - MEMORY_UNIT_DATA_OFF,
+                        Length      = imagePlugin.Info.Sectors                                 - sysCachePart.Length,
+                        Sequence    = 2,
+                        Offset      = MEMORY_UNIT_DATA_OFF,
+                        Start       = sysCachePart.Length,
                         Scheme      = Name
                     };
 
-                    dataPart.Length = imagePlugin.Info.Sectors - dataPart.Start;
-                    dataPart.Size   = dataPart.Length * imagePlugin.Info.SectorSize;
-
-                    partitions.Add(securityPart);
                     partitions.Add(sysCachePart);
-                    partitions.Add(gameCachePart);
-                    partitions.Add(sysExtPart);
-                    partitions.Add(sysExt2Part);
-                    partitions.Add(xbox1Part);
                     partitions.Add(dataPart);
 
                     return true;
                 }
             }
+        }
 
+        if(imagePlugin.Info.Sectors <= (ulong)(XBOX_360DATA_OFF / imagePlugin.Info.SectorSize))
             return false;
+
+        {
+            errno = imagePlugin.ReadSector((ulong)(XBOX_360DATA_OFF / imagePlugin.Info.SectorSize), out sector);
+
+            if(errno == ErrorNumber.NoError)
+            {
+                temp = BitConverter.ToUInt32(sector, 0);
+
+                if(temp != XBOX_CIGAM)
+                    return false;
+
+                var securityPart = new Partition
+                {
+                    Description = "Security sectors",
+                    Size        = XBOX360_SECURITY_SECTOR_LEN,
+                    Length      = (ulong)(XBOX360_SECURITY_SECTOR_LEN / imagePlugin.Info.SectorSize),
+                    Sequence    = 1,
+                    Offset      = XBOX360_SECURITY_SECTOR_OFF,
+                    Start       = (ulong)(XBOX360_SECURITY_SECTOR_OFF / imagePlugin.Info.SectorSize),
+                    Scheme      = Name
+                };
+
+                var sysCachePart = new Partition
+                {
+                    Description = "System cache",
+                    Size        = XBOX360_SYSTEM_CACHE_LEN,
+                    Length      = (ulong)(XBOX360_SYSTEM_CACHE_LEN / imagePlugin.Info.SectorSize),
+                    Sequence    = 2,
+                    Offset      = XBOX360_SYSTEM_CACHE_OFF,
+                    Start       = (ulong)(XBOX360_SYSTEM_CACHE_OFF / imagePlugin.Info.SectorSize),
+                    Scheme      = Name
+                };
+
+                var gameCachePart = new Partition
+                {
+                    Description = "Game cache",
+                    Size        = XBOX360_GAME_CACHE_LEN,
+                    Length      = (ulong)(XBOX360_GAME_CACHE_LEN / imagePlugin.Info.SectorSize),
+                    Sequence    = 3,
+                    Offset      = XBOX360_GAME_CACHE_OFF,
+                    Start       = (ulong)(XBOX360_GAME_CACHE_OFF / imagePlugin.Info.SectorSize),
+                    Scheme      = Name
+                };
+
+                var sysExtPart = new Partition
+                {
+                    Description = "System volume",
+                    Size        = XBOX368_SYS_EXT_LEN,
+                    Length      = (ulong)(XBOX368_SYS_EXT_LEN / imagePlugin.Info.SectorSize),
+                    Sequence    = 4,
+                    Offset      = XBOX368_SYS_EXT_OFF,
+                    Start       = (ulong)(XBOX368_SYS_EXT_OFF / imagePlugin.Info.SectorSize),
+                    Scheme      = Name
+                };
+
+                var sysExt2Part = new Partition
+                {
+                    Description = "System volume 2",
+                    Size        = XBOX360_SYS_EXT2_LEN,
+                    Length      = (ulong)(XBOX360_SYS_EXT2_LEN / imagePlugin.Info.SectorSize),
+                    Sequence    = 5,
+                    Offset      = XBOX360_SYS_EXT2_OFF,
+                    Start       = (ulong)(XBOX360_SYS_EXT2_OFF / imagePlugin.Info.SectorSize),
+                    Scheme      = Name
+                };
+
+                var xbox1Part = new Partition
+                {
+                    Description = "Xbox backwards compatibility",
+                    Size        = XBOX360_COMPAT_LEN,
+                    Length      = (ulong)(XBOX360_COMPAT_LEN / imagePlugin.Info.SectorSize),
+                    Sequence    = 6,
+                    Offset      = XBOX360_COMPAT_OFF,
+                    Start       = (ulong)(XBOX360_COMPAT_OFF / imagePlugin.Info.SectorSize),
+                    Scheme      = Name
+                };
+
+                var dataPart = new Partition
+                {
+                    Description = "Data volume",
+                    Sequence    = 7,
+                    Offset      = XBOX_360DATA_OFF,
+                    Start       = (ulong)(XBOX_360DATA_OFF / imagePlugin.Info.SectorSize),
+                    Scheme      = Name
+                };
+
+                dataPart.Length = imagePlugin.Info.Sectors - dataPart.Start;
+                dataPart.Size   = dataPart.Length * imagePlugin.Info.SectorSize;
+
+                partitions.Add(securityPart);
+                partitions.Add(sysCachePart);
+                partitions.Add(gameCachePart);
+                partitions.Add(sysExtPart);
+                partitions.Add(sysExt2Part);
+                partitions.Add(xbox1Part);
+                partitions.Add(dataPart);
+
+                return true;
+            }
         }
 
-        [StructLayout(LayoutKind.Sequential, Pack = 1)]
-        struct Xbox360DevKitPartitionTable
-        {
-            public readonly uint magic;
-            public readonly uint unknown;
-            public readonly uint contentOff;
-            public readonly uint contentLen;
-            public readonly uint dashboardOff;
-            public readonly uint dashboardLen;
-        }
+        return false;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 1)]
+    struct Xbox360DevKitPartitionTable
+    {
+        public readonly uint magic;
+        public readonly uint unknown;
+        public readonly uint contentOff;
+        public readonly uint contentLen;
+        public readonly uint dashboardOff;
+        public readonly uint dashboardLen;
     }
 }
\ No newline at end of file
diff --git a/Aaru.Settings/Settings.cs b/Aaru.Settings/Settings.cs
index 323fa54b5..5fceb46b9 100644
--- a/Aaru.Settings/Settings.cs
+++ b/Aaru.Settings/Settings.cs
@@ -39,652 +39,651 @@ using Claunia.PropertyList;
 using Microsoft.Win32;
 using PlatformID = Aaru.CommonTypes.Interop.PlatformID;
 
-namespace Aaru.Settings
+namespace Aaru.Settings;
+
+/// <summary>Settings</summary>
+public class DicSettings
 {
-    /// <summary>Settings</summary>
-    public class DicSettings
+    /// <summary>
+    ///     Level for GDPR compliance checking. Every time a new feature may share user information this level should go
+    ///     up, and the user asked to opt-in.
+    /// </summary>
+    public const ulong GDPR_LEVEL = 1;
+    /// <summary>If set to <c>true</c>, enables the ability to decrypt encrypted data</summary>
+    public bool EnableDecryption;
+    /// <summary>Set of GDPR compliance, if lower than <see cref="GDPR_LEVEL" />, ask user for compliance.</summary>
+    public ulong GdprCompliance;
+
+    /// <summary>If set to <c>true</c>, reports will be saved locally</summary>
+    public bool SaveReportsGlobally;
+    /// <summary>If set to <c>true</c>, reports will be sent to Aaru.Server</summary>
+    public bool ShareReports;
+    /// <summary>Statistics</summary>
+    public StatsSettings Stats;
+}
+
+// TODO: Use this
+/// <summary>User settings, for media dumps, completely unused</summary>
+public class UserSettings
+{
+    /// <summary>User email</summary>
+    public string Email;
+    /// <summary>User name or nick</summary>
+    public string Name;
+}
+
+/// <summary>Statistics settings</summary>
+public class StatsSettings
+{
+    /// <summary>If set to <c>true</c>, benchmark statistics will be stored</summary>
+    public bool BenchmarkStats = false;
+    /// <summary>If set to <c>true</c>, command usage statistics will be stored</summary>
+    public bool CommandStats;
+    /// <summary>If set to <c>true</c>, device statistics will be stored</summary>
+    public bool DeviceStats;
+    /// <summary>If set to <c>true</c>, filesystem statistics will be stored</summary>
+    public bool FilesystemStats;
+    /// <summary>If set to <c>true</c>, filters statistics will be stored</summary>
+    public bool FilterStats;
+    /// <summary>If set to <c>true</c>, dump media images statistics will be stored</summary>
+    public bool MediaImageStats;
+    /// <summary>If set to <c>true</c>, media scan statistics will be stored</summary>
+    public bool MediaScanStats;
+    /// <summary>If set to <c>true</c>, media types statistics will be stored</summary>
+    public bool MediaStats;
+    /// <summary>If set to <c>true</c>, partition schemes statistics will be stored</summary>
+    public bool PartitionStats;
+    /// <summary>If set to <c>true</c>, statistics will be sent to Aaru.Server</summary>
+    public bool ShareStats;
+    /// <summary>If set to <c>true</c>, dump media verification statistics will be stored</summary>
+    public bool VerifyStats;
+}
+
+/// <summary>Manages statistics</summary>
+public static class Settings
+{
+    const string XDG_DATA_HOME            = "XDG_DATA_HOME";
+    const string XDG_CONFIG_HOME          = "XDG_CONFIG_HOME";
+    const string XDG_DATA_HOME_RESOLVED   = ".local/share";
+    const string XDG_CONFIG_HOME_RESOLVED = ".config";
+    /// <summary>Current statistics</summary>
+    public static DicSettings Current;
+
+    /// <summary>Global path to save reports</summary>
+    static string ReportsPath { get; set; }
+
+    /// <summary>Global path to save statistics</summary>
+    public static string StatsPath { get; private set; }
+
+    /// <summary>Local database path</summary>
+    public static string LocalDbPath { get; private set; }
+    /// <summary>Main database path</summary>
+    public static string MainDbPath { get; private set; }
+
+    /// <summary>Loads settings</summary>
+    public static void LoadSettings()
     {
-        /// <summary>
-        ///     Level for GDPR compliance checking. Every time a new feature may share user information this level should go
-        ///     up, and the user asked to opt-in.
-        /// </summary>
-        public const ulong GDPR_LEVEL = 1;
-        /// <summary>If set to <c>true</c>, enables the ability to decrypt encrypted data</summary>
-        public bool EnableDecryption;
-        /// <summary>Set of GDPR compliance, if lower than <see cref="GDPR_LEVEL" />, ask user for compliance.</summary>
-        public ulong GdprCompliance;
+        Current = new DicSettings();
+        PlatformID ptId     = DetectOS.GetRealPlatformID();
+        string     homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+        LocalDbPath = "local.db";
+        string oldMainDbPath = "master.db";
+        MainDbPath = "main.db";
 
-        /// <summary>If set to <c>true</c>, reports will be saved locally</summary>
-        public bool SaveReportsGlobally;
-        /// <summary>If set to <c>true</c>, reports will be sent to Aaru.Server</summary>
-        public bool ShareReports;
-        /// <summary>Statistics</summary>
-        public StatsSettings Stats;
-    }
-
-    // TODO: Use this
-    /// <summary>User settings, for media dumps, completely unused</summary>
-    public class UserSettings
-    {
-        /// <summary>User email</summary>
-        public string Email;
-        /// <summary>User name or nick</summary>
-        public string Name;
-    }
-
-    /// <summary>Statistics settings</summary>
-    public class StatsSettings
-    {
-        /// <summary>If set to <c>true</c>, benchmark statistics will be stored</summary>
-        public bool BenchmarkStats = false;
-        /// <summary>If set to <c>true</c>, command usage statistics will be stored</summary>
-        public bool CommandStats;
-        /// <summary>If set to <c>true</c>, device statistics will be stored</summary>
-        public bool DeviceStats;
-        /// <summary>If set to <c>true</c>, filesystem statistics will be stored</summary>
-        public bool FilesystemStats;
-        /// <summary>If set to <c>true</c>, filters statistics will be stored</summary>
-        public bool FilterStats;
-        /// <summary>If set to <c>true</c>, dump media images statistics will be stored</summary>
-        public bool MediaImageStats;
-        /// <summary>If set to <c>true</c>, media scan statistics will be stored</summary>
-        public bool MediaScanStats;
-        /// <summary>If set to <c>true</c>, media types statistics will be stored</summary>
-        public bool MediaStats;
-        /// <summary>If set to <c>true</c>, partition schemes statistics will be stored</summary>
-        public bool PartitionStats;
-        /// <summary>If set to <c>true</c>, statistics will be sent to Aaru.Server</summary>
-        public bool ShareStats;
-        /// <summary>If set to <c>true</c>, dump media verification statistics will be stored</summary>
-        public bool VerifyStats;
-    }
-
-    /// <summary>Manages statistics</summary>
-    public static class Settings
-    {
-        const string XDG_DATA_HOME            = "XDG_DATA_HOME";
-        const string XDG_CONFIG_HOME          = "XDG_CONFIG_HOME";
-        const string XDG_DATA_HOME_RESOLVED   = ".local/share";
-        const string XDG_CONFIG_HOME_RESOLVED = ".config";
-        /// <summary>Current statistics</summary>
-        public static DicSettings Current;
-
-        /// <summary>Global path to save reports</summary>
-        static string ReportsPath { get; set; }
-
-        /// <summary>Global path to save statistics</summary>
-        public static string StatsPath { get; private set; }
-
-        /// <summary>Local database path</summary>
-        public static string LocalDbPath { get; private set; }
-        /// <summary>Main database path</summary>
-        public static string MainDbPath { get; private set; }
-
-        /// <summary>Loads settings</summary>
-        public static void LoadSettings()
+        try
         {
-            Current = new DicSettings();
-            PlatformID ptId     = DetectOS.GetRealPlatformID();
-            string     homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-            LocalDbPath = "local.db";
-            string oldMainDbPath = "master.db";
-            MainDbPath = "main.db";
-
-            try
+            switch(ptId)
             {
-                switch(ptId)
+                // In case of macOS or iOS statistics and reports will be saved in ~/Library/Application Support/Claunia.com/Aaru
+                case PlatformID.MacOSX:
+                case PlatformID.iOS:
                 {
-                    // In case of macOS or iOS statistics and reports will be saved in ~/Library/Application Support/Claunia.com/Aaru
-                    case PlatformID.MacOSX:
-                    case PlatformID.iOS:
-                    {
-                        string appSupportPath =
-                            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library",
-                                         "Application Support", "Claunia.com");
+                    string appSupportPath =
+                        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library",
+                                     "Application Support", "Claunia.com");
 
-                        if(!Directory.Exists(appSupportPath))
-                            Directory.CreateDirectory(appSupportPath);
+                    if(!Directory.Exists(appSupportPath))
+                        Directory.CreateDirectory(appSupportPath);
 
-                        string dicPath  = Path.Combine(appSupportPath, "DiscImageChef");
-                        string aaruPath = Path.Combine(appSupportPath, "Aaru");
+                    string dicPath  = Path.Combine(appSupportPath, "DiscImageChef");
+                    string aaruPath = Path.Combine(appSupportPath, "Aaru");
 
-                        if(Directory.Exists(dicPath) &&
-                           !Directory.Exists(aaruPath))
-                            Directory.Move(dicPath, aaruPath);
+                    if(Directory.Exists(dicPath) &&
+                       !Directory.Exists(aaruPath))
+                        Directory.Move(dicPath, aaruPath);
 
-                        if(!Directory.Exists(aaruPath))
-                            Directory.CreateDirectory(aaruPath);
+                    if(!Directory.Exists(aaruPath))
+                        Directory.CreateDirectory(aaruPath);
 
-                        LocalDbPath   = Path.Combine(aaruPath, LocalDbPath);
-                        MainDbPath    = Path.Combine(aaruPath, MainDbPath);
-                        oldMainDbPath = Path.Combine(aaruPath, oldMainDbPath);
+                    LocalDbPath   = Path.Combine(aaruPath, LocalDbPath);
+                    MainDbPath    = Path.Combine(aaruPath, MainDbPath);
+                    oldMainDbPath = Path.Combine(aaruPath, oldMainDbPath);
 
-                        ReportsPath = Path.Combine(aaruPath, "Reports");
+                    ReportsPath = Path.Combine(aaruPath, "Reports");
 
-                        if(!Directory.Exists(ReportsPath))
-                            Directory.CreateDirectory(ReportsPath);
+                    if(!Directory.Exists(ReportsPath))
+                        Directory.CreateDirectory(ReportsPath);
 
-                        StatsPath = Path.Combine(aaruPath, "Statistics");
+                    StatsPath = Path.Combine(aaruPath, "Statistics");
 
-                        if(!Directory.Exists(StatsPath))
-                            Directory.CreateDirectory(StatsPath);
-                    }
-
-                        break;
-
-                    // In case of Windows statistics and reports will be saved in %APPDATA%\Claunia.com\Aaru
-                    case PlatformID.Win32NT:
-                    case PlatformID.Win32S:
-                    case PlatformID.Win32Windows:
-                    case PlatformID.WinCE:
-                    case PlatformID.WindowsPhone:
-                    {
-                        string appSupportPath =
-                            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                                         "Claunia.com");
-
-                        if(!Directory.Exists(appSupportPath))
-                            Directory.CreateDirectory(appSupportPath);
-
-                        string dicPath  = Path.Combine(appSupportPath, "DiscImageChef");
-                        string aaruPath = Path.Combine(appSupportPath, "Aaru");
-
-                        if(Directory.Exists(dicPath) &&
-                           !Directory.Exists(aaruPath))
-                            Directory.Move(dicPath, aaruPath);
-
-                        if(!Directory.Exists(aaruPath))
-                            Directory.CreateDirectory(aaruPath);
-
-                        LocalDbPath   = Path.Combine(aaruPath, LocalDbPath);
-                        MainDbPath    = Path.Combine(aaruPath, MainDbPath);
-                        oldMainDbPath = Path.Combine(aaruPath, oldMainDbPath);
-
-                        ReportsPath = Path.Combine(aaruPath, "Reports");
-
-                        if(!Directory.Exists(ReportsPath))
-                            Directory.CreateDirectory(ReportsPath);
-
-                        StatsPath = Path.Combine(aaruPath, "Statistics");
-
-                        if(!Directory.Exists(StatsPath))
-                            Directory.CreateDirectory(StatsPath);
-                    }
-
-                        break;
-
-                    // Otherwise, statistics and reports will be saved in ~/.claunia.com/Aaru
-                    default:
-                    {
-                        string xdgDataPath =
-                            Path.Combine(homePath,
-                                         Environment.GetEnvironmentVariable(XDG_DATA_HOME) ?? XDG_DATA_HOME_RESOLVED);
-
-                        string oldDicPath = Path.Combine(homePath, ".claunia.com", "DiscImageChef");
-                        string dicPath    = Path.Combine(xdgDataPath, "DiscImageChef");
-                        string aaruPath   = Path.Combine(xdgDataPath, "Aaru");
-
-                        if(Directory.Exists(oldDicPath) &&
-                           !Directory.Exists(aaruPath))
-                        {
-                            Directory.Move(oldDicPath, aaruPath);
-                            Directory.Delete(Path.Combine(homePath, ".claunia.com"));
-                        }
-
-                        if(Directory.Exists(dicPath) &&
-                           !Directory.Exists(aaruPath))
-                            Directory.Move(dicPath, aaruPath);
-
-                        if(!Directory.Exists(aaruPath))
-                            Directory.CreateDirectory(aaruPath);
-
-                        LocalDbPath   = Path.Combine(aaruPath, LocalDbPath);
-                        MainDbPath    = Path.Combine(aaruPath, MainDbPath);
-                        oldMainDbPath = Path.Combine(aaruPath, oldMainDbPath);
-
-                        ReportsPath = Path.Combine(aaruPath, "Reports");
-
-                        if(!Directory.Exists(ReportsPath))
-                            Directory.CreateDirectory(ReportsPath);
-
-                        StatsPath = Path.Combine(aaruPath, "Statistics");
-
-                        if(!Directory.Exists(StatsPath))
-                            Directory.CreateDirectory(StatsPath);
-                    }
-
-                        break;
+                    if(!Directory.Exists(StatsPath))
+                        Directory.CreateDirectory(StatsPath);
                 }
 
-                if(File.Exists(oldMainDbPath))
-                    File.Move(oldMainDbPath, MainDbPath);
-            }
-            catch
-            {
-                ReportsPath = null;
-            }
+                    break;
 
-            FileStream   prefsFs = null;
-            StreamReader prefsSr = null;
-
-            try
-            {
-                switch(ptId)
+                // In case of Windows statistics and reports will be saved in %APPDATA%\Claunia.com\Aaru
+                case PlatformID.Win32NT:
+                case PlatformID.Win32S:
+                case PlatformID.Win32Windows:
+                case PlatformID.WinCE:
+                case PlatformID.WindowsPhone:
                 {
-                    // In case of macOS or iOS settings will be saved in ~/Library/Preferences/com.claunia.aaru.plist
-                    case PlatformID.MacOSX:
-                    case PlatformID.iOS:
+                    string appSupportPath =
+                        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                                     "Claunia.com");
+
+                    if(!Directory.Exists(appSupportPath))
+                        Directory.CreateDirectory(appSupportPath);
+
+                    string dicPath  = Path.Combine(appSupportPath, "DiscImageChef");
+                    string aaruPath = Path.Combine(appSupportPath, "Aaru");
+
+                    if(Directory.Exists(dicPath) &&
+                       !Directory.Exists(aaruPath))
+                        Directory.Move(dicPath, aaruPath);
+
+                    if(!Directory.Exists(aaruPath))
+                        Directory.CreateDirectory(aaruPath);
+
+                    LocalDbPath   = Path.Combine(aaruPath, LocalDbPath);
+                    MainDbPath    = Path.Combine(aaruPath, MainDbPath);
+                    oldMainDbPath = Path.Combine(aaruPath, oldMainDbPath);
+
+                    ReportsPath = Path.Combine(aaruPath, "Reports");
+
+                    if(!Directory.Exists(ReportsPath))
+                        Directory.CreateDirectory(ReportsPath);
+
+                    StatsPath = Path.Combine(aaruPath, "Statistics");
+
+                    if(!Directory.Exists(StatsPath))
+                        Directory.CreateDirectory(StatsPath);
+                }
+
+                    break;
+
+                // Otherwise, statistics and reports will be saved in ~/.claunia.com/Aaru
+                default:
+                {
+                    string xdgDataPath =
+                        Path.Combine(homePath,
+                                     Environment.GetEnvironmentVariable(XDG_DATA_HOME) ?? XDG_DATA_HOME_RESOLVED);
+
+                    string oldDicPath = Path.Combine(homePath, ".claunia.com", "DiscImageChef");
+                    string dicPath    = Path.Combine(xdgDataPath, "DiscImageChef");
+                    string aaruPath   = Path.Combine(xdgDataPath, "Aaru");
+
+                    if(Directory.Exists(oldDicPath) &&
+                       !Directory.Exists(aaruPath))
                     {
-                        string preferencesPath =
-                            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library",
-                                         "Preferences");
-
-                        string dicPreferencesFilePath =
-                            Path.Combine(preferencesPath, "com.claunia.discimagechef.plist");
-
-                        string preferencesFilePath = Path.Combine(preferencesPath, "com.claunia.aaru.plist");
-
-                        if(File.Exists(dicPreferencesFilePath))
-                            File.Move(dicPreferencesFilePath, preferencesFilePath);
-
-                        if(!File.Exists(preferencesFilePath))
-                        {
-                            SetDefaultSettings();
-                            SaveSettings();
-                        }
-
-                        prefsFs = new FileStream(preferencesFilePath, FileMode.Open, FileAccess.Read);
-
-                        var parsedPreferences = (NSDictionary)BinaryPropertyListParser.Parse(prefsFs);
-
-                        if(parsedPreferences != null)
-                        {
-                            Current.SaveReportsGlobally =
-                                parsedPreferences.TryGetValue("SaveReportsGlobally", out NSObject obj) &&
-                                ((NSNumber)obj).ToBool();
-
-                            Current.ShareReports = parsedPreferences.TryGetValue("ShareReports", out obj) &&
-                                                   ((NSNumber)obj).ToBool();
-
-                            Current.EnableDecryption = parsedPreferences.TryGetValue("EnableDecryption", out obj) &&
-                                                       ((NSNumber)obj).ToBool();
-
-                            if(parsedPreferences.TryGetValue("Stats", out obj))
-                            {
-                                var stats = (NSDictionary)obj;
-
-                                if(stats != null)
-                                    Current.Stats = new StatsSettings
-                                    {
-                                        ShareStats = stats.TryGetValue("ShareStats", out NSObject obj2) &&
-                                                     ((NSNumber)obj2).ToBool(),
-                                        CommandStats = stats.TryGetValue("CommandStats", out obj2) &&
-                                                       ((NSNumber)obj2).ToBool(),
-                                        DeviceStats = stats.TryGetValue("DeviceStats", out obj2) &&
-                                                      ((NSNumber)obj2).ToBool(),
-                                        FilesystemStats =
-                                            stats.TryGetValue("FilesystemStats", out obj2) && ((NSNumber)obj2).ToBool(),
-                                        FilterStats = stats.TryGetValue("FilterStats", out obj2) &&
-                                                      ((NSNumber)obj2).ToBool(),
-                                        MediaImageStats =
-                                            stats.TryGetValue("MediaImageStats", out obj2) && ((NSNumber)obj2).ToBool(),
-                                        MediaScanStats =
-                                            stats.TryGetValue("MediaScanStats", out obj2) && ((NSNumber)obj2).ToBool(),
-                                        PartitionStats =
-                                            stats.TryGetValue("PartitionStats", out obj2) && ((NSNumber)obj2).ToBool(),
-                                        MediaStats = stats.TryGetValue("MediaStats", out obj2) &&
-                                                     ((NSNumber)obj2).ToBool(),
-                                        VerifyStats = stats.TryGetValue("VerifyStats", out obj2) &&
-                                                      ((NSNumber)obj2).ToBool()
-                                    };
-                            }
-                            else
-                                Current.Stats = null;
-
-                            Current.GdprCompliance = parsedPreferences.TryGetValue("GdprCompliance", out obj)
-                                                         ? (ulong)((NSNumber)obj).ToLong() : 0;
-
-                            prefsFs.Close();
-                        }
-                        else
-                        {
-                            prefsFs.Close();
-
-                            SetDefaultSettings();
-                            SaveSettings();
-                        }
+                        Directory.Move(oldDicPath, aaruPath);
+                        Directory.Delete(Path.Combine(homePath, ".claunia.com"));
                     }
 
-                        break;
-                #if !NETSTANDARD2_0
+                    if(Directory.Exists(dicPath) &&
+                       !Directory.Exists(aaruPath))
+                        Directory.Move(dicPath, aaruPath);
 
-                    // In case of Windows settings will be saved in the registry: HKLM/SOFTWARE/Claunia.com/Aaru
-                    case PlatformID.Win32NT:
-                    case PlatformID.Win32S:
-                    case PlatformID.Win32Windows:
-                    case PlatformID.WinCE:
-                    case PlatformID.WindowsPhone:
+                    if(!Directory.Exists(aaruPath))
+                        Directory.CreateDirectory(aaruPath);
+
+                    LocalDbPath   = Path.Combine(aaruPath, LocalDbPath);
+                    MainDbPath    = Path.Combine(aaruPath, MainDbPath);
+                    oldMainDbPath = Path.Combine(aaruPath, oldMainDbPath);
+
+                    ReportsPath = Path.Combine(aaruPath, "Reports");
+
+                    if(!Directory.Exists(ReportsPath))
+                        Directory.CreateDirectory(ReportsPath);
+
+                    StatsPath = Path.Combine(aaruPath, "Statistics");
+
+                    if(!Directory.Exists(StatsPath))
+                        Directory.CreateDirectory(StatsPath);
+                }
+
+                    break;
+            }
+
+            if(File.Exists(oldMainDbPath))
+                File.Move(oldMainDbPath, MainDbPath);
+        }
+        catch
+        {
+            ReportsPath = null;
+        }
+
+        FileStream   prefsFs = null;
+        StreamReader prefsSr = null;
+
+        try
+        {
+            switch(ptId)
+            {
+                // In case of macOS or iOS settings will be saved in ~/Library/Preferences/com.claunia.aaru.plist
+                case PlatformID.MacOSX:
+                case PlatformID.iOS:
+                {
+                    string preferencesPath =
+                        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library",
+                                     "Preferences");
+
+                    string dicPreferencesFilePath =
+                        Path.Combine(preferencesPath, "com.claunia.discimagechef.plist");
+
+                    string preferencesFilePath = Path.Combine(preferencesPath, "com.claunia.aaru.plist");
+
+                    if(File.Exists(dicPreferencesFilePath))
+                        File.Move(dicPreferencesFilePath, preferencesFilePath);
+
+                    if(!File.Exists(preferencesFilePath))
                     {
-                        RegistryKey parentKey = Registry.CurrentUser.OpenSubKey("SOFTWARE")?.OpenSubKey("Claunia.com");
+                        SetDefaultSettings();
+                        SaveSettings();
+                    }
 
-                        if(parentKey == null)
+                    prefsFs = new FileStream(preferencesFilePath, FileMode.Open, FileAccess.Read);
+
+                    var parsedPreferences = (NSDictionary)BinaryPropertyListParser.Parse(prefsFs);
+
+                    if(parsedPreferences != null)
+                    {
+                        Current.SaveReportsGlobally =
+                            parsedPreferences.TryGetValue("SaveReportsGlobally", out NSObject obj) &&
+                            ((NSNumber)obj).ToBool();
+
+                        Current.ShareReports = parsedPreferences.TryGetValue("ShareReports", out obj) &&
+                                               ((NSNumber)obj).ToBool();
+
+                        Current.EnableDecryption = parsedPreferences.TryGetValue("EnableDecryption", out obj) &&
+                                                   ((NSNumber)obj).ToBool();
+
+                        if(parsedPreferences.TryGetValue("Stats", out obj))
                         {
-                            SetDefaultSettings();
-                            SaveSettings();
+                            var stats = (NSDictionary)obj;
 
-                            return;
-                        }
-
-                        RegistryKey dicKey = parentKey.OpenSubKey("DiscImageChef");
-                        RegistryKey key    = parentKey.OpenSubKey("Aaru");
-                        bool        stats;
-
-                        if(dicKey != null &&
-                           key    == null)
-                        {
-                            Current.SaveReportsGlobally = Convert.ToBoolean(dicKey.GetValue("SaveReportsGlobally"));
-                            Current.ShareReports        = Convert.ToBoolean(dicKey.GetValue("ShareReports"));
-                            Current.GdprCompliance      = Convert.ToUInt64(dicKey.GetValue("GdprCompliance"));
-                            Current.EnableDecryption    = Convert.ToBoolean(dicKey.GetValue("EnableDecryption"));
-
-                            stats = Convert.ToBoolean(dicKey.GetValue("Statistics"));
-
-                            if(stats)
+                            if(stats != null)
                                 Current.Stats = new StatsSettings
                                 {
-                                    ShareStats      = Convert.ToBoolean(dicKey.GetValue("ShareStats")),
-                                    CommandStats    = Convert.ToBoolean(dicKey.GetValue("CommandStats")),
-                                    DeviceStats     = Convert.ToBoolean(dicKey.GetValue("DeviceStats")),
-                                    FilesystemStats = Convert.ToBoolean(dicKey.GetValue("FilesystemStats")),
-                                    FilterStats     = Convert.ToBoolean(dicKey.GetValue("FilterStats")),
-                                    MediaImageStats = Convert.ToBoolean(dicKey.GetValue("MediaImageStats")),
-                                    MediaScanStats  = Convert.ToBoolean(dicKey.GetValue("MediaScanStats")),
-                                    PartitionStats  = Convert.ToBoolean(dicKey.GetValue("PartitionStats")),
-                                    MediaStats      = Convert.ToBoolean(dicKey.GetValue("MediaStats")),
-                                    VerifyStats     = Convert.ToBoolean(dicKey.GetValue("VerifyStats"))
+                                    ShareStats = stats.TryGetValue("ShareStats", out NSObject obj2) &&
+                                                 ((NSNumber)obj2).ToBool(),
+                                    CommandStats = stats.TryGetValue("CommandStats", out obj2) &&
+                                                   ((NSNumber)obj2).ToBool(),
+                                    DeviceStats = stats.TryGetValue("DeviceStats", out obj2) &&
+                                                  ((NSNumber)obj2).ToBool(),
+                                    FilesystemStats =
+                                        stats.TryGetValue("FilesystemStats", out obj2) && ((NSNumber)obj2).ToBool(),
+                                    FilterStats = stats.TryGetValue("FilterStats", out obj2) &&
+                                                  ((NSNumber)obj2).ToBool(),
+                                    MediaImageStats =
+                                        stats.TryGetValue("MediaImageStats", out obj2) && ((NSNumber)obj2).ToBool(),
+                                    MediaScanStats =
+                                        stats.TryGetValue("MediaScanStats", out obj2) && ((NSNumber)obj2).ToBool(),
+                                    PartitionStats =
+                                        stats.TryGetValue("PartitionStats", out obj2) && ((NSNumber)obj2).ToBool(),
+                                    MediaStats = stats.TryGetValue("MediaStats", out obj2) &&
+                                                 ((NSNumber)obj2).ToBool(),
+                                    VerifyStats = stats.TryGetValue("VerifyStats", out obj2) &&
+                                                  ((NSNumber)obj2).ToBool()
                                 };
-
-                            SaveSettings();
-
-                            parentKey.DeleteSubKeyTree("DiscImageChef");
-
-                            return;
                         }
+                        else
+                            Current.Stats = null;
 
-                        if(key == null)
-                        {
-                            SetDefaultSettings();
-                            SaveSettings();
+                        Current.GdprCompliance = parsedPreferences.TryGetValue("GdprCompliance", out obj)
+                                                     ? (ulong)((NSNumber)obj).ToLong() : 0;
 
-                            return;
-                        }
+                        prefsFs.Close();
+                    }
+                    else
+                    {
+                        prefsFs.Close();
 
-                        Current.SaveReportsGlobally = Convert.ToBoolean(key.GetValue("SaveReportsGlobally"));
-                        Current.ShareReports        = Convert.ToBoolean(key.GetValue("ShareReports"));
-                        Current.GdprCompliance      = Convert.ToUInt64(key.GetValue("GdprCompliance"));
-                        Current.EnableDecryption    = Convert.ToBoolean(key.GetValue("EnableDecryption"));
+                        SetDefaultSettings();
+                        SaveSettings();
+                    }
+                }
 
-                        stats = Convert.ToBoolean(key.GetValue("Statistics"));
+                    break;
+            #if !NETSTANDARD2_0
+
+                // In case of Windows settings will be saved in the registry: HKLM/SOFTWARE/Claunia.com/Aaru
+                case PlatformID.Win32NT:
+                case PlatformID.Win32S:
+                case PlatformID.Win32Windows:
+                case PlatformID.WinCE:
+                case PlatformID.WindowsPhone:
+                {
+                    RegistryKey parentKey = Registry.CurrentUser.OpenSubKey("SOFTWARE")?.OpenSubKey("Claunia.com");
+
+                    if(parentKey == null)
+                    {
+                        SetDefaultSettings();
+                        SaveSettings();
+
+                        return;
+                    }
+
+                    RegistryKey dicKey = parentKey.OpenSubKey("DiscImageChef");
+                    RegistryKey key    = parentKey.OpenSubKey("Aaru");
+                    bool        stats;
+
+                    if(dicKey != null &&
+                       key    == null)
+                    {
+                        Current.SaveReportsGlobally = Convert.ToBoolean(dicKey.GetValue("SaveReportsGlobally"));
+                        Current.ShareReports        = Convert.ToBoolean(dicKey.GetValue("ShareReports"));
+                        Current.GdprCompliance      = Convert.ToUInt64(dicKey.GetValue("GdprCompliance"));
+                        Current.EnableDecryption    = Convert.ToBoolean(dicKey.GetValue("EnableDecryption"));
+
+                        stats = Convert.ToBoolean(dicKey.GetValue("Statistics"));
 
                         if(stats)
                             Current.Stats = new StatsSettings
                             {
-                                ShareStats      = Convert.ToBoolean(key.GetValue("ShareStats")),
-                                CommandStats    = Convert.ToBoolean(key.GetValue("CommandStats")),
-                                DeviceStats     = Convert.ToBoolean(key.GetValue("DeviceStats")),
-                                FilesystemStats = Convert.ToBoolean(key.GetValue("FilesystemStats")),
-                                FilterStats     = Convert.ToBoolean(key.GetValue("FilterStats")),
-                                MediaImageStats = Convert.ToBoolean(key.GetValue("MediaImageStats")),
-                                MediaScanStats  = Convert.ToBoolean(key.GetValue("MediaScanStats")),
-                                PartitionStats  = Convert.ToBoolean(key.GetValue("PartitionStats")),
-                                MediaStats      = Convert.ToBoolean(key.GetValue("MediaStats")),
-                                VerifyStats     = Convert.ToBoolean(key.GetValue("VerifyStats"))
+                                ShareStats      = Convert.ToBoolean(dicKey.GetValue("ShareStats")),
+                                CommandStats    = Convert.ToBoolean(dicKey.GetValue("CommandStats")),
+                                DeviceStats     = Convert.ToBoolean(dicKey.GetValue("DeviceStats")),
+                                FilesystemStats = Convert.ToBoolean(dicKey.GetValue("FilesystemStats")),
+                                FilterStats     = Convert.ToBoolean(dicKey.GetValue("FilterStats")),
+                                MediaImageStats = Convert.ToBoolean(dicKey.GetValue("MediaImageStats")),
+                                MediaScanStats  = Convert.ToBoolean(dicKey.GetValue("MediaScanStats")),
+                                PartitionStats  = Convert.ToBoolean(dicKey.GetValue("PartitionStats")),
+                                MediaStats      = Convert.ToBoolean(dicKey.GetValue("MediaStats")),
+                                VerifyStats     = Convert.ToBoolean(dicKey.GetValue("VerifyStats"))
                             };
+
+                        SaveSettings();
+
+                        parentKey.DeleteSubKeyTree("DiscImageChef");
+
+                        return;
                     }
 
-                        break;
-                #endif
-
-                    // Otherwise, settings will be saved in ~/.config/Aaru.xml
-                    default:
+                    if(key == null)
                     {
-                        string oldConfigPath =
-                            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".config");
+                        SetDefaultSettings();
+                        SaveSettings();
 
-                        string oldSettingsPath = Path.Combine(oldConfigPath, "DiscImageChef.xml");
-
-                        string xdgConfigPath =
-                            Path.Combine(homePath,
-                                         Environment.GetEnvironmentVariable(XDG_CONFIG_HOME) ??
-                                         XDG_CONFIG_HOME_RESOLVED);
-
-                        string dicSettingsPath = Path.Combine(xdgConfigPath, "DiscImageChef.xml");
-                        string settingsPath    = Path.Combine(xdgConfigPath, "Aaru.xml");
-
-                        if(File.Exists(oldSettingsPath) &&
-                           !File.Exists(settingsPath))
-                        {
-                            if(!Directory.Exists(xdgConfigPath))
-                                Directory.CreateDirectory(xdgConfigPath);
-
-                            File.Move(oldSettingsPath, settingsPath);
-                        }
-
-                        if(File.Exists(dicSettingsPath) &&
-                           !File.Exists(settingsPath))
-                            File.Move(dicSettingsPath, settingsPath);
-
-                        if(!File.Exists(settingsPath))
-                        {
-                            SetDefaultSettings();
-                            SaveSettings();
-
-                            return;
-                        }
-
-                        var xs = new XmlSerializer(Current.GetType());
-                        prefsSr = new StreamReader(settingsPath);
-                        Current = (DicSettings)xs.Deserialize(prefsSr);
+                        return;
                     }
 
-                        break;
-                }
-            }
-            catch
-            {
-                prefsFs?.Close();
-                prefsSr?.Close();
-                SetDefaultSettings();
-                SaveSettings();
-            }
-        }
+                    Current.SaveReportsGlobally = Convert.ToBoolean(key.GetValue("SaveReportsGlobally"));
+                    Current.ShareReports        = Convert.ToBoolean(key.GetValue("ShareReports"));
+                    Current.GdprCompliance      = Convert.ToUInt64(key.GetValue("GdprCompliance"));
+                    Current.EnableDecryption    = Convert.ToBoolean(key.GetValue("EnableDecryption"));
 
-        /// <summary>Saves current settings</summary>
-        public static void SaveSettings()
-        {
-            try
-            {
-                PlatformID ptId = DetectOS.GetRealPlatformID();
+                    stats = Convert.ToBoolean(key.GetValue("Statistics"));
 
-                switch(ptId)
-                {
-                    // In case of macOS or iOS settings will be saved in ~/Library/Preferences/com.claunia.aaru.plist
-                    case PlatformID.MacOSX:
-                    case PlatformID.iOS:
-                    {
-                        var root = new NSDictionary
+                    if(stats)
+                        Current.Stats = new StatsSettings
                         {
-                            {
-                                "SaveReportsGlobally", Current.SaveReportsGlobally
-                            },
-                            {
-                                "ShareReports", Current.ShareReports
-                            },
-                            {
-                                "GdprCompliance", Current.GdprCompliance
-                            },
-                            {
-                                "EnableDecryption", Current.EnableDecryption
-                            }
+                            ShareStats      = Convert.ToBoolean(key.GetValue("ShareStats")),
+                            CommandStats    = Convert.ToBoolean(key.GetValue("CommandStats")),
+                            DeviceStats     = Convert.ToBoolean(key.GetValue("DeviceStats")),
+                            FilesystemStats = Convert.ToBoolean(key.GetValue("FilesystemStats")),
+                            FilterStats     = Convert.ToBoolean(key.GetValue("FilterStats")),
+                            MediaImageStats = Convert.ToBoolean(key.GetValue("MediaImageStats")),
+                            MediaScanStats  = Convert.ToBoolean(key.GetValue("MediaScanStats")),
+                            PartitionStats  = Convert.ToBoolean(key.GetValue("PartitionStats")),
+                            MediaStats      = Convert.ToBoolean(key.GetValue("MediaStats")),
+                            VerifyStats     = Convert.ToBoolean(key.GetValue("VerifyStats"))
                         };
+                }
 
-                        if(Current.Stats != null)
-                        {
-                            var stats = new NSDictionary
-                            {
-                                {
-                                    "ShareStats", Current.Stats.ShareStats
-                                },
-                                {
-                                    "CommandStats", Current.Stats.CommandStats
-                                },
-                                {
-                                    "DeviceStats", Current.Stats.DeviceStats
-                                },
-                                {
-                                    "FilesystemStats", Current.Stats.FilesystemStats
-                                },
-                                {
-                                    "FilterStats", Current.Stats.FilterStats
-                                },
-                                {
-                                    "MediaImageStats", Current.Stats.MediaImageStats
-                                },
-                                {
-                                    "MediaScanStats", Current.Stats.MediaScanStats
-                                },
-                                {
-                                    "PartitionStats", Current.Stats.PartitionStats
-                                },
-                                {
-                                    "MediaStats", Current.Stats.MediaStats
-                                },
-                                {
-                                    "VerifyStats", Current.Stats.VerifyStats
-                                }
-                            };
+                    break;
+            #endif
 
-                            root.Add("Stats", stats);
-                        }
+                // Otherwise, settings will be saved in ~/.config/Aaru.xml
+                default:
+                {
+                    string oldConfigPath =
+                        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".config");
 
-                        string preferencesPath =
-                            Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library",
-                                         "Preferences");
+                    string oldSettingsPath = Path.Combine(oldConfigPath, "DiscImageChef.xml");
 
-                        string preferencesFilePath = Path.Combine(preferencesPath, "com.claunia.aaru.plist");
+                    string xdgConfigPath =
+                        Path.Combine(homePath,
+                                     Environment.GetEnvironmentVariable(XDG_CONFIG_HOME) ??
+                                     XDG_CONFIG_HOME_RESOLVED);
 
-                        var fs = new FileStream(preferencesFilePath, FileMode.Create);
-                        BinaryPropertyListWriter.Write(fs, root);
-                        fs.Close();
-                    }
+                    string dicSettingsPath = Path.Combine(xdgConfigPath, "DiscImageChef.xml");
+                    string settingsPath    = Path.Combine(xdgConfigPath, "Aaru.xml");
 
-                        break;
-                #if !NETSTANDARD2_0
-
-                    // In case of Windows settings will be saved in the registry: HKLM/SOFTWARE/Claunia.com/Aaru
-                    case PlatformID.Win32NT:
-                    case PlatformID.Win32S:
-                    case PlatformID.Win32Windows:
-                    case PlatformID.WinCE:
-                    case PlatformID.WindowsPhone:
+                    if(File.Exists(oldSettingsPath) &&
+                       !File.Exists(settingsPath))
                     {
-                        RegistryKey parentKey = Registry.CurrentUser.OpenSubKey("SOFTWARE", true)?.
-                                                         CreateSubKey("Claunia.com");
-
-                        RegistryKey key = parentKey?.CreateSubKey("Aaru");
-
-                        if(key != null)
-                        {
-                            key.SetValue("SaveReportsGlobally", Current.SaveReportsGlobally);
-                            key.SetValue("ShareReports", Current.ShareReports);
-                            key.SetValue("GdprCompliance", Current.GdprCompliance);
-                            key.SetValue("EnableDecryption", Current.EnableDecryption);
-
-                            if(Current.Stats != null)
-                            {
-                                key.SetValue("Statistics", true);
-                                key.SetValue("ShareStats", Current.Stats.ShareStats);
-                                key.SetValue("CommandStats", Current.Stats.CommandStats);
-                                key.SetValue("DeviceStats", Current.Stats.DeviceStats);
-                                key.SetValue("FilesystemStats", Current.Stats.FilesystemStats);
-                                key.SetValue("FilterStats", Current.Stats.FilterStats);
-                                key.SetValue("MediaImageStats", Current.Stats.MediaImageStats);
-                                key.SetValue("MediaScanStats", Current.Stats.MediaScanStats);
-                                key.SetValue("PartitionStats", Current.Stats.PartitionStats);
-                                key.SetValue("MediaStats", Current.Stats.MediaStats);
-                                key.SetValue("VerifyStats", Current.Stats.VerifyStats);
-                            }
-                            else
-                            {
-                                key.SetValue("Statistics", true);
-                                key.DeleteValue("ShareStats", false);
-                                key.DeleteValue("CommandStats", false);
-                                key.DeleteValue("DeviceStats", false);
-                                key.DeleteValue("FilesystemStats", false);
-                                key.DeleteValue("MediaImageStats", false);
-                                key.DeleteValue("MediaScanStats", false);
-                                key.DeleteValue("PartitionStats", false);
-                                key.DeleteValue("MediaStats", false);
-                                key.DeleteValue("VerifyStats", false);
-                            }
-                        }
-                    }
-
-                        break;
-                #endif
-
-                    // Otherwise, settings will be saved in ~/.config/Aaru.xml
-                    default:
-                    {
-                        string homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-
-                        string xdgConfigPath =
-                            Path.Combine(homePath,
-                                         Environment.GetEnvironmentVariable(XDG_CONFIG_HOME) ??
-                                         XDG_CONFIG_HOME_RESOLVED);
-
-                        string settingsPath = Path.Combine(xdgConfigPath, "Aaru.xml");
-
                         if(!Directory.Exists(xdgConfigPath))
                             Directory.CreateDirectory(xdgConfigPath);
 
-                        var fs = new FileStream(settingsPath, FileMode.Create);
-                        var xs = new XmlSerializer(Current.GetType());
-                        xs.Serialize(fs, Current);
-                        fs.Close();
+                        File.Move(oldSettingsPath, settingsPath);
                     }
 
-                        break;
-                }
-            }
-            #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
-            catch
-            {
-                // ignored
-            }
-            #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
-        }
+                    if(File.Exists(dicSettingsPath) &&
+                       !File.Exists(settingsPath))
+                        File.Move(dicSettingsPath, settingsPath);
 
-        /// <summary>Sets default settings as all statistics, share everything</summary>
-        static void SetDefaultSettings() => Current = new DicSettings
-        {
-            SaveReportsGlobally = true,
-            ShareReports        = true,
-            GdprCompliance      = 0,
-            EnableDecryption    = true,
-            Stats = new StatsSettings
-            {
-                CommandStats    = true,
-                DeviceStats     = true,
-                FilesystemStats = true,
-                MediaImageStats = true,
-                MediaScanStats  = true,
-                FilterStats     = true,
-                MediaStats      = true,
-                PartitionStats  = true,
-                ShareStats      = true,
-                VerifyStats     = true
+                    if(!File.Exists(settingsPath))
+                    {
+                        SetDefaultSettings();
+                        SaveSettings();
+
+                        return;
+                    }
+
+                    var xs = new XmlSerializer(Current.GetType());
+                    prefsSr = new StreamReader(settingsPath);
+                    Current = (DicSettings)xs.Deserialize(prefsSr);
+                }
+
+                    break;
             }
-        };
+        }
+        catch
+        {
+            prefsFs?.Close();
+            prefsSr?.Close();
+            SetDefaultSettings();
+            SaveSettings();
+        }
     }
+
+    /// <summary>Saves current settings</summary>
+    public static void SaveSettings()
+    {
+        try
+        {
+            PlatformID ptId = DetectOS.GetRealPlatformID();
+
+            switch(ptId)
+            {
+                // In case of macOS or iOS settings will be saved in ~/Library/Preferences/com.claunia.aaru.plist
+                case PlatformID.MacOSX:
+                case PlatformID.iOS:
+                {
+                    var root = new NSDictionary
+                    {
+                        {
+                            "SaveReportsGlobally", Current.SaveReportsGlobally
+                        },
+                        {
+                            "ShareReports", Current.ShareReports
+                        },
+                        {
+                            "GdprCompliance", Current.GdprCompliance
+                        },
+                        {
+                            "EnableDecryption", Current.EnableDecryption
+                        }
+                    };
+
+                    if(Current.Stats != null)
+                    {
+                        var stats = new NSDictionary
+                        {
+                            {
+                                "ShareStats", Current.Stats.ShareStats
+                            },
+                            {
+                                "CommandStats", Current.Stats.CommandStats
+                            },
+                            {
+                                "DeviceStats", Current.Stats.DeviceStats
+                            },
+                            {
+                                "FilesystemStats", Current.Stats.FilesystemStats
+                            },
+                            {
+                                "FilterStats", Current.Stats.FilterStats
+                            },
+                            {
+                                "MediaImageStats", Current.Stats.MediaImageStats
+                            },
+                            {
+                                "MediaScanStats", Current.Stats.MediaScanStats
+                            },
+                            {
+                                "PartitionStats", Current.Stats.PartitionStats
+                            },
+                            {
+                                "MediaStats", Current.Stats.MediaStats
+                            },
+                            {
+                                "VerifyStats", Current.Stats.VerifyStats
+                            }
+                        };
+
+                        root.Add("Stats", stats);
+                    }
+
+                    string preferencesPath =
+                        Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library",
+                                     "Preferences");
+
+                    string preferencesFilePath = Path.Combine(preferencesPath, "com.claunia.aaru.plist");
+
+                    var fs = new FileStream(preferencesFilePath, FileMode.Create);
+                    BinaryPropertyListWriter.Write(fs, root);
+                    fs.Close();
+                }
+
+                    break;
+            #if !NETSTANDARD2_0
+
+                // In case of Windows settings will be saved in the registry: HKLM/SOFTWARE/Claunia.com/Aaru
+                case PlatformID.Win32NT:
+                case PlatformID.Win32S:
+                case PlatformID.Win32Windows:
+                case PlatformID.WinCE:
+                case PlatformID.WindowsPhone:
+                {
+                    RegistryKey parentKey = Registry.CurrentUser.OpenSubKey("SOFTWARE", true)?.
+                                                     CreateSubKey("Claunia.com");
+
+                    RegistryKey key = parentKey?.CreateSubKey("Aaru");
+
+                    if(key != null)
+                    {
+                        key.SetValue("SaveReportsGlobally", Current.SaveReportsGlobally);
+                        key.SetValue("ShareReports", Current.ShareReports);
+                        key.SetValue("GdprCompliance", Current.GdprCompliance);
+                        key.SetValue("EnableDecryption", Current.EnableDecryption);
+
+                        if(Current.Stats != null)
+                        {
+                            key.SetValue("Statistics", true);
+                            key.SetValue("ShareStats", Current.Stats.ShareStats);
+                            key.SetValue("CommandStats", Current.Stats.CommandStats);
+                            key.SetValue("DeviceStats", Current.Stats.DeviceStats);
+                            key.SetValue("FilesystemStats", Current.Stats.FilesystemStats);
+                            key.SetValue("FilterStats", Current.Stats.FilterStats);
+                            key.SetValue("MediaImageStats", Current.Stats.MediaImageStats);
+                            key.SetValue("MediaScanStats", Current.Stats.MediaScanStats);
+                            key.SetValue("PartitionStats", Current.Stats.PartitionStats);
+                            key.SetValue("MediaStats", Current.Stats.MediaStats);
+                            key.SetValue("VerifyStats", Current.Stats.VerifyStats);
+                        }
+                        else
+                        {
+                            key.SetValue("Statistics", true);
+                            key.DeleteValue("ShareStats", false);
+                            key.DeleteValue("CommandStats", false);
+                            key.DeleteValue("DeviceStats", false);
+                            key.DeleteValue("FilesystemStats", false);
+                            key.DeleteValue("MediaImageStats", false);
+                            key.DeleteValue("MediaScanStats", false);
+                            key.DeleteValue("PartitionStats", false);
+                            key.DeleteValue("MediaStats", false);
+                            key.DeleteValue("VerifyStats", false);
+                        }
+                    }
+                }
+
+                    break;
+            #endif
+
+                // Otherwise, settings will be saved in ~/.config/Aaru.xml
+                default:
+                {
+                    string homePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+
+                    string xdgConfigPath =
+                        Path.Combine(homePath,
+                                     Environment.GetEnvironmentVariable(XDG_CONFIG_HOME) ??
+                                     XDG_CONFIG_HOME_RESOLVED);
+
+                    string settingsPath = Path.Combine(xdgConfigPath, "Aaru.xml");
+
+                    if(!Directory.Exists(xdgConfigPath))
+                        Directory.CreateDirectory(xdgConfigPath);
+
+                    var fs = new FileStream(settingsPath, FileMode.Create);
+                    var xs = new XmlSerializer(Current.GetType());
+                    xs.Serialize(fs, Current);
+                    fs.Close();
+                }
+
+                    break;
+            }
+        }
+        #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
+        catch
+        {
+            // ignored
+        }
+        #pragma warning restore RECS0022 // A catch clause that catches System.Exception and has an empty body
+    }
+
+    /// <summary>Sets default settings as all statistics, share everything</summary>
+    static void SetDefaultSettings() => Current = new DicSettings
+    {
+        SaveReportsGlobally = true,
+        ShareReports        = true,
+        GdprCompliance      = 0,
+        EnableDecryption    = true,
+        Stats = new StatsSettings
+        {
+            CommandStats    = true,
+            DeviceStats     = true,
+            FilesystemStats = true,
+            MediaImageStats = true,
+            MediaScanStats  = true,
+            FilterStats     = true,
+            MediaStats      = true,
+            PartitionStats  = true,
+            ShareStats      = true,
+            VerifyStats     = true
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/ATA.cs b/Aaru.Tests.Devices/ATA.cs
index ff4dc73ab..53d02f297 100644
--- a/Aaru.Tests.Devices/ATA.cs
+++ b/Aaru.Tests.Devices/ATA.cs
@@ -30,77 +30,76 @@ using Aaru.Console;
 using Aaru.Devices;
 using Aaru.Tests.Devices.ATA;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class MainClass
 {
-    internal static partial class MainClass
+    public static void Ata(string devPath, Device dev)
     {
-        public static void Ata(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send an ATA command to the device:");
+            AaruConsole.WriteLine("1.- Send a CHS ATA command to the device.");
+            AaruConsole.WriteLine("2.- Send a 28-bit ATA command to the device.");
+            AaruConsole.WriteLine("3.- Send a 48-bit ATA command to the device.");
+            AaruConsole.WriteLine("4.- Send an ATAPI command to the device.");
+            AaruConsole.WriteLine("5.- Send a CompactFlash command to the device.");
+            AaruConsole.WriteLine("6.- Send a Media Card Pass Through command to the device.");
+            AaruConsole.WriteLine("7.- Send a S.M.A.R.T. command to the device.");
+            AaruConsole.WriteLine("0.- Return to command class menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send an ATA command to the device:");
-                AaruConsole.WriteLine("1.- Send a CHS ATA command to the device.");
-                AaruConsole.WriteLine("2.- Send a 28-bit ATA command to the device.");
-                AaruConsole.WriteLine("3.- Send a 48-bit ATA command to the device.");
-                AaruConsole.WriteLine("4.- Send an ATAPI command to the device.");
-                AaruConsole.WriteLine("5.- Send a CompactFlash command to the device.");
-                AaruConsole.WriteLine("6.- Send a Media Card Pass Through command to the device.");
-                AaruConsole.WriteLine("7.- Send a S.M.A.R.T. command to the device.");
-                AaruConsole.WriteLine("0.- Return to command class menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to command class menu...");
+
+                    return;
+                case 1:
+                    AtaChs.Menu(devPath, dev);
+
+                    continue;
+                case 2:
+                    Ata28.Menu(devPath, dev);
+
+                    continue;
+                case 3:
+                    Ata48.Menu(devPath, dev);
+
+                    continue;
+                case 4:
+                    Atapi.Menu(devPath, dev);
+
+                    continue;
+                case 5:
+                    Cfa.Menu(devPath, dev);
+
+                    continue;
+                case 6:
+                    Mcpt.Menu(devPath, dev);
+
+                    continue;
+                case 7:
+                    Smart.Menu(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to command class menu...");
-
-                        return;
-                    case 1:
-                        AtaChs.Menu(devPath, dev);
-
-                        continue;
-                    case 2:
-                        Ata28.Menu(devPath, dev);
-
-                        continue;
-                    case 3:
-                        Ata48.Menu(devPath, dev);
-
-                        continue;
-                    case 4:
-                        Atapi.Menu(devPath, dev);
-
-                        continue;
-                    case 5:
-                        Cfa.Menu(devPath, dev);
-
-                        continue;
-                    case 6:
-                        Mcpt.Menu(devPath, dev);
-
-                        continue;
-                    case 7:
-                        Smart.Menu(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
     }
diff --git a/Aaru.Tests.Devices/ATA/Ata28.cs b/Aaru.Tests.Devices/ATA/Ata28.cs
index 00f2a5d89..63c005db5 100644
--- a/Aaru.Tests.Devices/ATA/Ata28.cs
+++ b/Aaru.Tests.Devices/ATA/Ata28.cs
@@ -31,121 +31,29 @@ using Aaru.Decoders.ATA;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.ATA
+namespace Aaru.Tests.Devices.ATA;
+
+internal static class Ata28
 {
-    internal static class Ata28
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a 28-bit ATA command to the device:");
-                AaruConsole.WriteLine("1.- Send READ BUFFER command.");
-                AaruConsole.WriteLine("2.- Send READ BUFFER DMA command.");
-                AaruConsole.WriteLine("3.- Send READ DMA command.");
-                AaruConsole.WriteLine("4.- Send READ DMA WITH RETRIES command.");
-                AaruConsole.WriteLine("5.- Send READ LONG command.");
-                AaruConsole.WriteLine("6.- Send READ LONG WITH RETRIES command.");
-                AaruConsole.WriteLine("7.- Send READ MULTIPLE command.");
-                AaruConsole.WriteLine("8.- Send READ NATIVE MAX ADDRESS command.");
-                AaruConsole.WriteLine("9.- Send READ SECTORS command.");
-                AaruConsole.WriteLine("10.- Send READ SECTORS WITH RETRIES command.");
-                AaruConsole.WriteLine("11.- Send SEEK command.");
-                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to ATA commands menu...");
-
-                        return;
-                    case 1:
-                        ReadBuffer(devPath, dev);
-
-                        continue;
-                    case 2:
-                        ReadBufferDma(devPath, dev);
-
-                        continue;
-                    case 3:
-                        ReadDma(devPath, dev, false);
-
-                        continue;
-                    case 4:
-                        ReadDma(devPath, dev, true);
-
-                        continue;
-                    case 5:
-                        ReadLong(devPath, dev, false);
-
-                        continue;
-                    case 6:
-                        ReadLong(devPath, dev, true);
-
-                        continue;
-                    case 7:
-                        ReadMultiple(devPath, dev);
-
-                        continue;
-                    case 8:
-                        ReadNativeMaxAddress(devPath, dev);
-
-                        continue;
-                    case 9:
-                        ReadSectors(devPath, dev, false);
-
-                        continue;
-                    case 10:
-                        ReadSectors(devPath, dev, true);
-
-                        continue;
-                    case 11:
-                        Seek(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void ReadBuffer(string devPath, Device dev)
-        {
-            start:
             System.Console.Clear();
-
-            bool sense = dev.ReadBuffer(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
-                                        out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ BUFFER to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+            AaruConsole.WriteLine("Send a 28-bit ATA command to the device:");
+            AaruConsole.WriteLine("1.- Send READ BUFFER command.");
+            AaruConsole.WriteLine("2.- Send READ BUFFER DMA command.");
+            AaruConsole.WriteLine("3.- Send READ DMA command.");
+            AaruConsole.WriteLine("4.- Send READ DMA WITH RETRIES command.");
+            AaruConsole.WriteLine("5.- Send READ LONG command.");
+            AaruConsole.WriteLine("6.- Send READ LONG WITH RETRIES command.");
+            AaruConsole.WriteLine("7.- Send READ MULTIPLE command.");
+            AaruConsole.WriteLine("8.- Send READ NATIVE MAX ADDRESS command.");
+            AaruConsole.WriteLine("9.- Send READ SECTORS command.");
+            AaruConsole.WriteLine("10.- Send READ SECTORS WITH RETRIES command.");
+            AaruConsole.WriteLine("11.- Send SEEK command.");
+            AaruConsole.WriteLine("0.- Return to ATA commands menu.");
             AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
@@ -154,903 +62,994 @@ namespace Aaru.Tests.Devices.ATA
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to ATA commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ BUFFER response:");
+                    ReadBuffer(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ BUFFER status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    ReadBufferDma(devPath, dev);
 
-                    goto menu;
-                case 3: goto start;
+                    continue;
+                case 3:
+                    ReadDma(devPath, dev, false);
+
+                    continue;
+                case 4:
+                    ReadDma(devPath, dev, true);
+
+                    continue;
+                case 5:
+                    ReadLong(devPath, dev, false);
+
+                    continue;
+                case 6:
+                    ReadLong(devPath, dev, true);
+
+                    continue;
+                case 7:
+                    ReadMultiple(devPath, dev);
+
+                    continue;
+                case 8:
+                    ReadNativeMaxAddress(devPath, dev);
+
+                    continue;
+                case 9:
+                    ReadSectors(devPath, dev, false);
+
+                    continue;
+                case 10:
+                    ReadSectors(devPath, dev, true);
+
+                    continue;
+                case 11:
+                    Seek(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadBufferDma(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadBufferDma(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
-                                           out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ BUFFER DMA to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ BUFFER DMA response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ BUFFER DMA status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadDma(string devPath, Device dev, bool retries)
-        {
-            uint   lba   = 0;
-            byte   count = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ DMA {0}command:", retries ? "WITH RETRIES " : "");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What logical block address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0xFFFFFFF)
-                        {
-                            AaruConsole.
-                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
-                                          0xFFFFFFF);
-
-                            lba = 0xFFFFFFF;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadDma(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, retries, lba, count,
-                                     dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ DMA {0}to the device:", retries ? "WITH RETRIES " : "");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DMA {0}response:", retries ? "WITH RETRIES " : "");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DMA {0}status registers:", retries ? "WITH RETRIES " : "");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadLong(string devPath, Device dev, bool retries)
-        {
-            uint   lba       = 0;
-            uint   blockSize = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ LONG {0}command:", retries ? "WITH RETRIES " : "");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("Block size: {0}", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What logical block address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0xFFFFFFF)
-                        {
-                            AaruConsole.
-                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
-                                          0xFFFFFFF);
-
-                            lba = 0xFFFFFFF;
-                        }
-
-                        AaruConsole.Write("How many bytes to expect?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadLong(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, retries, lba,
-                                      blockSize, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ LONG {0}to the device:", retries ? "WITH RETRIES " : "");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG {0}response:", retries ? "WITH RETRIES " : "");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG {0}status registers:", retries ? "WITH RETRIES " : "");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadMultiple(string devPath, Device dev)
-        {
-            uint   lba   = 0;
-            byte   count = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ MULTIPLE command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What logical block address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0xFFFFFFF)
-                        {
-                            AaruConsole.
-                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
-                                          0xFFFFFFF);
-
-                            lba = 0xFFFFFFF;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, lba, count,
-                                          dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ MULTIPLE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ MULTIPLE response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ MULTIPLE status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadNativeMaxAddress(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadNativeMaxAddress(out uint lba, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
-                                                  out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ NATIVE MAX ADDRESS to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Max LBA is {0}.", lba);
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Decode error registers.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ NATIVE MAX ADDRESS status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadSectors(string devPath, Device dev, bool retries)
-        {
-            uint   lba   = 0;
-            byte   count = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ SECTORS {0}command:", retries ? "WITH RETRIES " : "");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What logical block address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0xFFFFFFF)
-                        {
-                            AaruConsole.
-                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
-                                          0xFFFFFFF);
-
-                            lba = 0xFFFFFFF;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Read(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, retries, lba, count,
-                                  dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ SECTORS {0}to the device:", retries ? "WITH RETRIES " : "");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ SECTORS {0}response:", retries ? "WITH RETRIES " : "");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ SECTORS {0}status registers:", retries ? "WITH RETRIES " : "");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Seek(string devPath, Device dev)
-        {
-            uint   lba = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SEEK command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What logical block address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0xFFFFFFF)
-                        {
-                            AaruConsole.
-                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
-                                          0xFFFFFFF);
-
-                            lba = 0xFFFFFFF;
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-            bool sense = dev.Seek(out AtaErrorRegistersLba28 errorRegisters, lba, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEEK to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Decode error registers.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEEK status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void ReadBuffer(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadBuffer(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
+                                    out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ BUFFER to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ BUFFER response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ BUFFER status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadBufferDma(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadBufferDma(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
+                                       out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ BUFFER DMA to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ BUFFER DMA response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ BUFFER DMA status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadDma(string devPath, Device dev, bool retries)
+    {
+        uint   lba   = 0;
+        byte   count = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ DMA {0}command:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What logical block address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0xFFFFFFF)
+                    {
+                        AaruConsole.
+                            WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                                      0xFFFFFFF);
+
+                        lba = 0xFFFFFFF;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadDma(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, retries, lba, count,
+                                 dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ DMA {0}to the device:", retries ? "WITH RETRIES " : "");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DMA {0}response:", retries ? "WITH RETRIES " : "");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DMA {0}status registers:", retries ? "WITH RETRIES " : "");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadLong(string devPath, Device dev, bool retries)
+    {
+        uint   lba       = 0;
+        uint   blockSize = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ LONG {0}command:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("Block size: {0}", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What logical block address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0xFFFFFFF)
+                    {
+                        AaruConsole.
+                            WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                                      0xFFFFFFF);
+
+                        lba = 0xFFFFFFF;
+                    }
+
+                    AaruConsole.Write("How many bytes to expect?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadLong(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, retries, lba,
+                                  blockSize, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ LONG {0}to the device:", retries ? "WITH RETRIES " : "");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG {0}response:", retries ? "WITH RETRIES " : "");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG {0}status registers:", retries ? "WITH RETRIES " : "");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadMultiple(string devPath, Device dev)
+    {
+        uint   lba   = 0;
+        byte   count = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ MULTIPLE command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What logical block address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0xFFFFFFF)
+                    {
+                        AaruConsole.
+                            WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                                      0xFFFFFFF);
+
+                        lba = 0xFFFFFFF;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, lba, count,
+                                      dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ MULTIPLE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ MULTIPLE response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ MULTIPLE status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadNativeMaxAddress(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadNativeMaxAddress(out uint lba, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
+                                              out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ NATIVE MAX ADDRESS to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Max LBA is {0}.", lba);
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Decode error registers.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ NATIVE MAX ADDRESS status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadSectors(string devPath, Device dev, bool retries)
+    {
+        uint   lba   = 0;
+        byte   count = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ SECTORS {0}command:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What logical block address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0xFFFFFFF)
+                    {
+                        AaruConsole.
+                            WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                                      0xFFFFFFF);
+
+                        lba = 0xFFFFFFF;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, retries, lba, count,
+                              dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ SECTORS {0}to the device:", retries ? "WITH RETRIES " : "");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ SECTORS {0}response:", retries ? "WITH RETRIES " : "");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ SECTORS {0}status registers:", retries ? "WITH RETRIES " : "");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Seek(string devPath, Device dev)
+    {
+        uint   lba = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SEEK command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What logical block address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0xFFFFFFF)
+                    {
+                        AaruConsole.
+                            WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                                      0xFFFFFFF);
+
+                        lba = 0xFFFFFFF;
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+        bool sense = dev.Seek(out AtaErrorRegistersLba28 errorRegisters, lba, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEEK to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Decode error registers.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to 28-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 28-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEEK status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/ATA/Ata48.cs b/Aaru.Tests.Devices/ATA/Ata48.cs
index de6f83ef3..5c961f3d5 100644
--- a/Aaru.Tests.Devices/ATA/Ata48.cs
+++ b/Aaru.Tests.Devices/ATA/Ata48.cs
@@ -31,99 +31,25 @@ using Aaru.Decoders.ATA;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.ATA
+namespace Aaru.Tests.Devices.ATA;
+
+internal static class Ata48
 {
-    internal static class Ata48
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a 48-bit ATA command to the device:");
-                AaruConsole.WriteLine("1.- Send GET NATIVE MAX ADDRESS EXT command.");
-                AaruConsole.WriteLine("2.- Send READ DMA EXT command.");
-                AaruConsole.WriteLine("3.- Send READ LOG DMA EXT command.");
-                AaruConsole.WriteLine("4.- Send READ LOG EXT command.");
-                AaruConsole.WriteLine("5.- Send READ MATIVE MAX ADDRESS EXT command.");
-                AaruConsole.WriteLine("6.- Send READ MULTIPLE EXT command.");
-                AaruConsole.WriteLine("7.- Send READ SECTORS EXT command.");
-                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to ATA commands menu...");
-
-                        return;
-                    case 1:
-                        GetNativeMaxAddressExt(devPath, dev);
-
-                        continue;
-                    case 2:
-                        ReadDmaExt(devPath, dev);
-
-                        continue;
-                    case 3:
-                        ReadLogDmaExt(devPath, dev);
-
-                        continue;
-                    case 4:
-                        ReadLogExt(devPath, dev);
-
-                        continue;
-                    case 5:
-                        ReadNativeMaxAddressExt(devPath, dev);
-
-                        continue;
-                    case 6:
-                        ReadMultipleExt(devPath, dev);
-
-                        continue;
-                    case 7:
-                        ReadSectorsExt(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void GetNativeMaxAddressExt(string devPath, Device dev)
-        {
-            start:
             System.Console.Clear();
-
-            bool sense = dev.GetNativeMaxAddressExt(out ulong lba, out AtaErrorRegistersLba48 errorRegisters,
-                                                    dev.Timeout, out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET NATIVE MAX ADDRESS EXT to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Max LBA is {0}.", lba);
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Decode error registers.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+            AaruConsole.WriteLine("Send a 48-bit ATA command to the device:");
+            AaruConsole.WriteLine("1.- Send GET NATIVE MAX ADDRESS EXT command.");
+            AaruConsole.WriteLine("2.- Send READ DMA EXT command.");
+            AaruConsole.WriteLine("3.- Send READ LOG DMA EXT command.");
+            AaruConsole.WriteLine("4.- Send READ LOG EXT command.");
+            AaruConsole.WriteLine("5.- Send READ MATIVE MAX ADDRESS EXT command.");
+            AaruConsole.WriteLine("6.- Send READ MULTIPLE EXT command.");
+            AaruConsole.WriteLine("7.- Send READ SECTORS EXT command.");
+            AaruConsole.WriteLine("0.- Return to ATA commands menu.");
             AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
@@ -132,855 +58,928 @@ namespace Aaru.Tests.Devices.ATA
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to ATA commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET NATIVE MAX ADDRESS EXT status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    GetNativeMaxAddressExt(devPath, dev);
 
-                    goto menu;
-                case 2: goto start;
+                    continue;
+                case 2:
+                    ReadDmaExt(devPath, dev);
+
+                    continue;
+                case 3:
+                    ReadLogDmaExt(devPath, dev);
+
+                    continue;
+                case 4:
+                    ReadLogExt(devPath, dev);
+
+                    continue;
+                case 5:
+                    ReadNativeMaxAddressExt(devPath, dev);
+
+                    continue;
+                case 6:
+                    ReadMultipleExt(devPath, dev);
+
+                    continue;
+                case 7:
+                    ReadSectorsExt(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadDmaExt(string devPath, Device dev)
-        {
-            ulong  lba   = 0;
-            ushort count = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ DMA EXT command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What logical block address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ulong.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0xFFFFFFFFFFFF)
-                        {
-                            AaruConsole.
-                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
-                                          0xFFFFFFFFFFFF);
-
-                            lba = 0xFFFFFFFFFFFF;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadDma(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, lba, count,
-                                     dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ DMA EXT to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DMA EXT response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DMA EXT status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadLogExt(string devPath, Device dev)
-        {
-            byte   address = 0;
-            ushort page    = 0;
-            ushort count   = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ LOG EXT command:");
-                AaruConsole.WriteLine("Log address: {0}", address);
-                AaruConsole.WriteLine("Page number: {0}", page);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What log address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("What page number?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out page))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            page = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadLog(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, address, page, count,
-                                     dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ LOG EXT to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LOG EXT response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LOG EXT status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadLogDmaExt(string devPath, Device dev)
-        {
-            byte   address = 0;
-            ushort page    = 0;
-            ushort count   = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ LOG DMA EXT command:");
-                AaruConsole.WriteLine("Log address: {0}", address);
-                AaruConsole.WriteLine("Page number: {0}", page);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What log address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("What page number?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out page))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            page = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadLogDma(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, address, page,
-                                        count, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ LOG DMA EXT to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LOG DMA EXT response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LOG DMA EXT status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadMultipleExt(string devPath, Device dev)
-        {
-            ulong  lba   = 0;
-            ushort count = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ MULTIPLE EXT command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What logical block address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ulong.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0xFFFFFFFFFFFF)
-                        {
-                            AaruConsole.
-                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
-                                          0xFFFFFFFFFFFF);
-
-                            lba = 0xFFFFFFFFFFFF;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, lba, count,
-                                          dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ MULTIPLE EXT to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ MULTIPLE EXT response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ MULTIPLE EXT status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadNativeMaxAddressExt(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadNativeMaxAddress(out ulong lba, out AtaErrorRegistersLba48 errorRegisters, dev.Timeout,
-                                                  out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ NATIVE MAX ADDRESS EXT to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Max LBA is {0}.", lba);
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Decode error registers.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ NATIVE MAX ADDRESS status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadSectorsExt(string devPath, Device dev)
-        {
-            ulong  lba   = 0;
-            ushort count = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ SECTORS EXT command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What logical block address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ulong.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0xFFFFFFFFFFFF)
-                        {
-                            AaruConsole.
-                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
-                                          0xFFFFFFFFFFFF);
-
-                            lba = 0xFFFFFFFFFFFF;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Read(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, lba, count, dev.Timeout,
-                                  out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ SECTORS EXT to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ SECTORS EXT response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ SECTORS EXT status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void GetNativeMaxAddressExt(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.GetNativeMaxAddressExt(out ulong lba, out AtaErrorRegistersLba48 errorRegisters,
+                                                dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET NATIVE MAX ADDRESS EXT to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Max LBA is {0}.", lba);
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Decode error registers.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET NATIVE MAX ADDRESS EXT status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadDmaExt(string devPath, Device dev)
+    {
+        ulong  lba   = 0;
+        ushort count = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ DMA EXT command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What logical block address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ulong.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0xFFFFFFFFFFFF)
+                    {
+                        AaruConsole.
+                            WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                                      0xFFFFFFFFFFFF);
+
+                        lba = 0xFFFFFFFFFFFF;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadDma(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, lba, count,
+                                 dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ DMA EXT to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DMA EXT response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DMA EXT status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadLogExt(string devPath, Device dev)
+    {
+        byte   address = 0;
+        ushort page    = 0;
+        ushort count   = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ LOG EXT command:");
+            AaruConsole.WriteLine("Log address: {0}", address);
+            AaruConsole.WriteLine("Page number: {0}", page);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What log address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("What page number?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out page))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        page = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadLog(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, address, page, count,
+                                 dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ LOG EXT to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LOG EXT response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LOG EXT status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadLogDmaExt(string devPath, Device dev)
+    {
+        byte   address = 0;
+        ushort page    = 0;
+        ushort count   = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ LOG DMA EXT command:");
+            AaruConsole.WriteLine("Log address: {0}", address);
+            AaruConsole.WriteLine("Page number: {0}", page);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What log address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("What page number?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out page))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        page = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadLogDma(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, address, page,
+                                    count, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ LOG DMA EXT to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LOG DMA EXT response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LOG DMA EXT status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadMultipleExt(string devPath, Device dev)
+    {
+        ulong  lba   = 0;
+        ushort count = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ MULTIPLE EXT command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What logical block address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ulong.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0xFFFFFFFFFFFF)
+                    {
+                        AaruConsole.
+                            WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                                      0xFFFFFFFFFFFF);
+
+                        lba = 0xFFFFFFFFFFFF;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadMultiple(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, lba, count,
+                                      dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ MULTIPLE EXT to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ MULTIPLE EXT response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ MULTIPLE EXT status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadNativeMaxAddressExt(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadNativeMaxAddress(out ulong lba, out AtaErrorRegistersLba48 errorRegisters, dev.Timeout,
+                                              out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ NATIVE MAX ADDRESS EXT to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Max LBA is {0}.", lba);
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Decode error registers.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ NATIVE MAX ADDRESS status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadSectorsExt(string devPath, Device dev)
+    {
+        ulong  lba   = 0;
+        ushort count = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ SECTORS EXT command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What logical block address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ulong.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0xFFFFFFFFFFFF)
+                    {
+                        AaruConsole.
+                            WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                                      0xFFFFFFFFFFFF);
+
+                        lba = 0xFFFFFFFFFFFF;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read(out byte[] buffer, out AtaErrorRegistersLba48 errorRegisters, lba, count, dev.Timeout,
+                              out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ SECTORS EXT to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to 48-bit ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to 48-bit ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ SECTORS EXT response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ SECTORS EXT status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/ATA/AtaCHS.cs b/Aaru.Tests.Devices/ATA/AtaCHS.cs
index 4a9d4e95a..7f0700ac6 100644
--- a/Aaru.Tests.Devices/ATA/AtaCHS.cs
+++ b/Aaru.Tests.Devices/ATA/AtaCHS.cs
@@ -31,117 +31,28 @@ using Aaru.Decoders.ATA;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.ATA
+namespace Aaru.Tests.Devices.ATA;
+
+internal static class AtaChs
 {
-    internal static class AtaChs
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a CHS ATA command to the device:");
-                AaruConsole.WriteLine("1.- Send IDENTIFY DEVICE command.");
-                AaruConsole.WriteLine("2.- Send READ DMA command.");
-                AaruConsole.WriteLine("3.- Send READ DMA WITH RETRIES command.");
-                AaruConsole.WriteLine("4.- Send READ LONG command.");
-                AaruConsole.WriteLine("5.- Send READ LONG WITH RETRIES command.");
-                AaruConsole.WriteLine("6.- Send READ MULTIPLE command.");
-                AaruConsole.WriteLine("7.- Send READ SECTORS command.");
-                AaruConsole.WriteLine("8.- Send READ SECTORS WITH RETRIES command.");
-                AaruConsole.WriteLine("9.- Send SEEK command.");
-                AaruConsole.WriteLine("10.- Send SET FEATURES command.");
-                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to ATA commands menu...");
-
-                        return;
-                    case 1:
-                        Identify(devPath, dev);
-
-                        continue;
-                    case 2:
-                        ReadDma(devPath, dev, false);
-
-                        continue;
-                    case 3:
-                        ReadDma(devPath, dev, true);
-
-                        continue;
-                    case 4:
-                        ReadLong(devPath, dev, false);
-
-                        continue;
-                    case 5:
-                        ReadLong(devPath, dev, true);
-
-                        continue;
-                    case 6:
-                        ReadMultiple(devPath, dev);
-
-                        continue;
-                    case 7:
-                        ReadSectors(devPath, dev, false);
-
-                        continue;
-                    case 8:
-                        ReadSectors(devPath, dev, true);
-
-                        continue;
-                    case 9:
-                        Seek(devPath, dev);
-
-                        continue;
-                    case 10:
-                        SetFeatures(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void Identify(string devPath, Device dev)
-        {
-            start:
             System.Console.Clear();
-
-            bool sense = dev.AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs errorRegisters,
-                                         out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending IDENTIFY DEVICE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Decode error registers.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+            AaruConsole.WriteLine("Send a CHS ATA command to the device:");
+            AaruConsole.WriteLine("1.- Send IDENTIFY DEVICE command.");
+            AaruConsole.WriteLine("2.- Send READ DMA command.");
+            AaruConsole.WriteLine("3.- Send READ DMA WITH RETRIES command.");
+            AaruConsole.WriteLine("4.- Send READ LONG command.");
+            AaruConsole.WriteLine("5.- Send READ LONG WITH RETRIES command.");
+            AaruConsole.WriteLine("6.- Send READ MULTIPLE command.");
+            AaruConsole.WriteLine("7.- Send READ SECTORS command.");
+            AaruConsole.WriteLine("8.- Send READ SECTORS WITH RETRIES command.");
+            AaruConsole.WriteLine("9.- Send SEEK command.");
+            AaruConsole.WriteLine("10.- Send SET FEATURES command.");
+            AaruConsole.WriteLine("0.- Return to ATA commands menu.");
             AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
@@ -150,1076 +61,1164 @@ namespace Aaru.Tests.Devices.ATA
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+                    AaruConsole.WriteLine("Returning to ATA commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("IDENTIFY DEVICE response:");
+                    Identify(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("IDENTIFY DEVICE decoded response:");
+                    ReadDma(devPath, dev, false);
 
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("IDENTIFY DEVICE status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    ReadDma(devPath, dev, true);
 
-                    goto menu;
-                case 4: goto start;
+                    continue;
+                case 4:
+                    ReadLong(devPath, dev, false);
+
+                    continue;
+                case 5:
+                    ReadLong(devPath, dev, true);
+
+                    continue;
+                case 6:
+                    ReadMultiple(devPath, dev);
+
+                    continue;
+                case 7:
+                    ReadSectors(devPath, dev, false);
+
+                    continue;
+                case 8:
+                    ReadSectors(devPath, dev, true);
+
+                    continue;
+                case 9:
+                    Seek(devPath, dev);
+
+                    continue;
+                case 10:
+                    SetFeatures(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadDma(string devPath, Device dev, bool retries)
-        {
-            ushort cylinder = 0;
-            byte   head     = 0;
-            byte   sector   = 1;
-            byte   count    = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ DMA {0}command:", retries ? "WITH RETRIES " : "");
-                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
-                AaruConsole.WriteLine("Head: {0}", head);
-                AaruConsole.WriteLine("Sector: {0}", sector);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What cylinder?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out cylinder))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            cylinder = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("What head?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out head))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            head = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(head > 15)
-                        {
-                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
-                            head = 15;
-                        }
-
-                        AaruConsole.Write("What sector?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out sector))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            sector = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadDma(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, retries, cylinder,
-                                     head, sector, count, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ DMA {0}to the device:", retries ? "WITH RETRIES " : "");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DMA {0}response:", retries ? "WITH RETRIES " : "");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DMA {0}status registers:", retries ? "WITH RETRIES " : "");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadLong(string devPath, Device dev, bool retries)
-        {
-            ushort cylinder  = 0;
-            byte   head      = 0;
-            byte   sector    = 1;
-            uint   blockSize = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ LONG {0}command:", retries ? "WITH RETRIES " : "");
-                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
-                AaruConsole.WriteLine("Head: {0}", head);
-                AaruConsole.WriteLine("Sector: {0}", sector);
-                AaruConsole.WriteLine("Block size: {0}", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What cylinder?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out cylinder))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            cylinder = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("What head?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out head))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            head = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(head > 15)
-                        {
-                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
-                            head = 15;
-                        }
-
-                        AaruConsole.Write("What sector?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out sector))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            sector = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many bytes to expect?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadLong(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, retries, cylinder,
-                                      head, sector, blockSize, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ LONG {0}to the device:", retries ? "WITH RETRIES " : "");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG {0}response:", retries ? "WITH RETRIES " : "");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG {0}status registers:", retries ? "WITH RETRIES " : "");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadMultiple(string devPath, Device dev)
-        {
-            ushort cylinder = 0;
-            byte   head     = 0;
-            byte   sector   = 1;
-            byte   count    = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ MULTIPLE command:");
-                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
-                AaruConsole.WriteLine("Head: {0}", head);
-                AaruConsole.WriteLine("Sector: {0}", sector);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What cylinder?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out cylinder))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            cylinder = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("What head?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out head))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            head = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(head > 15)
-                        {
-                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
-                            head = 15;
-                        }
-
-                        AaruConsole.Write("What sector?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out sector))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            sector = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadMultiple(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, cylinder, head,
-                                          sector, count, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ MULTIPLE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ MULTIPLE response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ MULTIPLE status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadSectors(string devPath, Device dev, bool retries)
-        {
-            ushort cylinder = 0;
-            byte   head     = 0;
-            byte   sector   = 1;
-            byte   count    = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ SECTORS {0}command:", retries ? "WITH RETRIES " : "");
-                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
-                AaruConsole.WriteLine("Head: {0}", head);
-                AaruConsole.WriteLine("Sector: {0}", sector);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What cylinder?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out cylinder))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            cylinder = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("What head?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out head))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            head = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(head > 15)
-                        {
-                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
-                            head = 15;
-                        }
-
-                        AaruConsole.Write("What sector?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out sector))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            sector = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Read(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, retries, cylinder, head,
-                                  sector, count, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ SECTORS {0}to the device:", retries ? "WITH RETRIES " : "");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ SECTORS {0}response:", retries ? "WITH RETRIES " : "");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ SECTORS {0}status registers:", retries ? "WITH RETRIES " : "");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Seek(string devPath, Device dev)
-        {
-            ushort cylinder = 0;
-            byte   head     = 0;
-            byte   sector   = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SEEK command:");
-                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
-                AaruConsole.WriteLine("Head: {0}", head);
-                AaruConsole.WriteLine("Sector: {0}", sector);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What cylinder?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out cylinder))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            cylinder = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("What head?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out head))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            head = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(head > 15)
-                        {
-                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
-                            head = 15;
-                        }
-
-                        AaruConsole.Write("What sector?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out sector))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            sector = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Seek(out AtaErrorRegistersChs errorRegisters, cylinder, head, sector, dev.Timeout,
-                                  out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEEK to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Decode error registers.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEEK status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SetFeatures(string devPath, Device dev)
-        {
-            ushort cylinder    = 0;
-            byte   head        = 0;
-            byte   sector      = 0;
-            byte   feature     = 0;
-            byte   sectorCount = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SET FEATURES command:");
-                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
-                AaruConsole.WriteLine("Head: {0}", head);
-                AaruConsole.WriteLine("Sector: {0}", sector);
-                AaruConsole.WriteLine("Sector count: {0}", sectorCount);
-                AaruConsole.WriteLine("Feature: 0x{0:X2}", feature);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What cylinder?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out cylinder))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            cylinder = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("What head?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out head))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            head = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(head > 15)
-                        {
-                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
-                            head = 15;
-                        }
-
-                        AaruConsole.Write("What sector?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out sector))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            sector = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        AaruConsole.Write("What sector count?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out sectorCount))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            sectorCount = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        AaruConsole.Write("What feature?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out feature))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            feature = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Seek(out AtaErrorRegistersChs errorRegisters, cylinder, head, sector, dev.Timeout,
-                                  out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SET FEATURES to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Decode error registers.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SET FEATURES status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void Identify(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.AtaIdentify(out byte[] buffer, out AtaErrorRegistersChs errorRegisters,
+                                     out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending IDENTIFY DEVICE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Decode error registers.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("IDENTIFY DEVICE response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("IDENTIFY DEVICE decoded response:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("IDENTIFY DEVICE status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadDma(string devPath, Device dev, bool retries)
+    {
+        ushort cylinder = 0;
+        byte   head     = 0;
+        byte   sector   = 1;
+        byte   count    = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ DMA {0}command:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+            AaruConsole.WriteLine("Head: {0}", head);
+            AaruConsole.WriteLine("Sector: {0}", sector);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What cylinder?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out cylinder))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        cylinder = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("What head?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out head))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        head = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(head > 15)
+                    {
+                        AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                        head = 15;
+                    }
+
+                    AaruConsole.Write("What sector?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out sector))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        sector = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadDma(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, retries, cylinder,
+                                 head, sector, count, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ DMA {0}to the device:", retries ? "WITH RETRIES " : "");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DMA {0}response:", retries ? "WITH RETRIES " : "");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DMA {0}status registers:", retries ? "WITH RETRIES " : "");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadLong(string devPath, Device dev, bool retries)
+    {
+        ushort cylinder  = 0;
+        byte   head      = 0;
+        byte   sector    = 1;
+        uint   blockSize = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ LONG {0}command:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+            AaruConsole.WriteLine("Head: {0}", head);
+            AaruConsole.WriteLine("Sector: {0}", sector);
+            AaruConsole.WriteLine("Block size: {0}", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What cylinder?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out cylinder))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        cylinder = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("What head?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out head))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        head = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(head > 15)
+                    {
+                        AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                        head = 15;
+                    }
+
+                    AaruConsole.Write("What sector?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out sector))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        sector = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many bytes to expect?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadLong(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, retries, cylinder,
+                                  head, sector, blockSize, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ LONG {0}to the device:", retries ? "WITH RETRIES " : "");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG {0}response:", retries ? "WITH RETRIES " : "");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG {0}status registers:", retries ? "WITH RETRIES " : "");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadMultiple(string devPath, Device dev)
+    {
+        ushort cylinder = 0;
+        byte   head     = 0;
+        byte   sector   = 1;
+        byte   count    = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ MULTIPLE command:");
+            AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+            AaruConsole.WriteLine("Head: {0}", head);
+            AaruConsole.WriteLine("Sector: {0}", sector);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What cylinder?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out cylinder))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        cylinder = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("What head?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out head))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        head = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(head > 15)
+                    {
+                        AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                        head = 15;
+                    }
+
+                    AaruConsole.Write("What sector?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out sector))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        sector = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadMultiple(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, cylinder, head,
+                                      sector, count, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ MULTIPLE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ MULTIPLE response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ MULTIPLE status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadSectors(string devPath, Device dev, bool retries)
+    {
+        ushort cylinder = 0;
+        byte   head     = 0;
+        byte   sector   = 1;
+        byte   count    = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ SECTORS {0}command:", retries ? "WITH RETRIES " : "");
+            AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+            AaruConsole.WriteLine("Head: {0}", head);
+            AaruConsole.WriteLine("Sector: {0}", sector);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What cylinder?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out cylinder))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        cylinder = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("What head?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out head))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        head = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(head > 15)
+                    {
+                        AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                        head = 15;
+                    }
+
+                    AaruConsole.Write("What sector?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out sector))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        sector = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, retries, cylinder, head,
+                              sector, count, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ SECTORS {0}to the device:", retries ? "WITH RETRIES " : "");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ SECTORS {0}response:", retries ? "WITH RETRIES " : "");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ SECTORS {0}status registers:", retries ? "WITH RETRIES " : "");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Seek(string devPath, Device dev)
+    {
+        ushort cylinder = 0;
+        byte   head     = 0;
+        byte   sector   = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SEEK command:");
+            AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+            AaruConsole.WriteLine("Head: {0}", head);
+            AaruConsole.WriteLine("Sector: {0}", sector);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What cylinder?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out cylinder))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        cylinder = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("What head?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out head))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        head = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(head > 15)
+                    {
+                        AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                        head = 15;
+                    }
+
+                    AaruConsole.Write("What sector?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out sector))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        sector = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Seek(out AtaErrorRegistersChs errorRegisters, cylinder, head, sector, dev.Timeout,
+                              out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEEK to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Decode error registers.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEEK status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SetFeatures(string devPath, Device dev)
+    {
+        ushort cylinder    = 0;
+        byte   head        = 0;
+        byte   sector      = 0;
+        byte   feature     = 0;
+        byte   sectorCount = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SET FEATURES command:");
+            AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+            AaruConsole.WriteLine("Head: {0}", head);
+            AaruConsole.WriteLine("Sector: {0}", sector);
+            AaruConsole.WriteLine("Sector count: {0}", sectorCount);
+            AaruConsole.WriteLine("Feature: 0x{0:X2}", feature);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What cylinder?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out cylinder))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        cylinder = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("What head?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out head))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        head = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(head > 15)
+                    {
+                        AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                        head = 15;
+                    }
+
+                    AaruConsole.Write("What sector?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out sector))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        sector = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    AaruConsole.Write("What sector count?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out sectorCount))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        sectorCount = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    AaruConsole.Write("What feature?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out feature))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        feature = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Seek(out AtaErrorRegistersChs errorRegisters, cylinder, head, sector, dev.Timeout,
+                              out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SET FEATURES to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Decode error registers.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to CHS ATA commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to CHS ATA commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SET FEATURES status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/ATA/Atapi.cs b/Aaru.Tests.Devices/ATA/Atapi.cs
index d49440640..7e13804f3 100644
--- a/Aaru.Tests.Devices/ATA/Atapi.cs
+++ b/Aaru.Tests.Devices/ATA/Atapi.cs
@@ -31,72 +31,19 @@ using Aaru.Decoders.ATA;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.ATA
+namespace Aaru.Tests.Devices.ATA;
+
+internal static class Atapi
 {
-    internal static class Atapi
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send an ATAPI command to the device:");
-                AaruConsole.WriteLine("1.- Send IDENTIFY PACKET DEVICE command.");
-                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to ATA commands menu...");
-
-                        return;
-                    case 1:
-                        Identify(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void Identify(string devPath, Device dev)
-        {
-            start:
             System.Console.Clear();
-
-            bool sense = dev.AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs errorRegisters,
-                                           out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending IDENTIFY PACKET DEVICE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Decode error registers.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to ATAPI commands menu.");
+            AaruConsole.WriteLine("Send an ATAPI command to the device:");
+            AaruConsole.WriteLine("1.- Send IDENTIFY PACKET DEVICE command.");
+            AaruConsole.WriteLine("0.- Return to ATA commands menu.");
             AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
@@ -105,64 +52,116 @@ namespace Aaru.Tests.Devices.ATA
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to ATAPI commands menu...");
+                    AaruConsole.WriteLine("Returning to ATA commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("IDENTIFY PACKET DEVICE response:");
+                    Identify(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("IDENTIFY PACKET DEVICE decoded response:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("IDENTIFY PACKET DEVICE status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
 
-                    goto menu;
+                    continue;
             }
         }
     }
+
+    static void Identify(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.AtapiIdentify(out byte[] buffer, out AtaErrorRegistersChs errorRegisters,
+                                       out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending IDENTIFY PACKET DEVICE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Decode error registers.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to ATAPI commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to ATAPI commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("IDENTIFY PACKET DEVICE response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("IDENTIFY PACKET DEVICE decoded response:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.ATA.Identify.Prettify(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("IDENTIFY PACKET DEVICE status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/ATA/Cfa.cs b/Aaru.Tests.Devices/ATA/Cfa.cs
index 56006c7f4..4351fa722 100644
--- a/Aaru.Tests.Devices/ATA/Cfa.cs
+++ b/Aaru.Tests.Devices/ATA/Cfa.cs
@@ -31,79 +31,21 @@ using Aaru.Decoders.ATA;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.ATA
+namespace Aaru.Tests.Devices.ATA;
+
+internal static class Cfa
 {
-    internal static class Cfa
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a CompactFlash command to the device:");
-                AaruConsole.WriteLine("1.- Send REQUEST EXTENDED ERROR CODE command.");
-                AaruConsole.WriteLine("2.- Send CHS TRANSLATE SECTOR command.");
-                AaruConsole.WriteLine("3.- Send LBA TRANSLATE SECTOR command.");
-                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to ATA commands menu...");
-
-                        return;
-                    case 1:
-                        RequestExtendedErrorCode(devPath, dev);
-
-                        continue;
-                    case 2:
-                        TranslateSectorChs(devPath, dev);
-
-                        continue;
-                    case 3:
-                        TranslateSectorLba(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void RequestExtendedErrorCode(string devPath, Device dev)
-        {
-            start:
             System.Console.Clear();
-
-            bool sense = dev.RequestExtendedErrorCode(out byte errorCode, out AtaErrorRegistersLba28 errorRegisters,
-                                                      dev.Timeout, out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending REQUEST EXTENDED ERROR CODE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Error code is {0}.", errorCode);
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Decode error registers.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+            AaruConsole.WriteLine("Send a CompactFlash command to the device:");
+            AaruConsole.WriteLine("1.- Send REQUEST EXTENDED ERROR CODE command.");
+            AaruConsole.WriteLine("2.- Send CHS TRANSLATE SECTOR command.");
+            AaruConsole.WriteLine("3.- Send LBA TRANSLATE SECTOR command.");
+            AaruConsole.WriteLine("0.- Return to ATA commands menu.");
             AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
@@ -112,335 +54,392 @@ namespace Aaru.Tests.Devices.ATA
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+                    AaruConsole.WriteLine("Returning to ATA commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("REQUEST EXTENDED ERROR CODE status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    RequestExtendedErrorCode(devPath, dev);
 
-                    goto menu;
-                case 2: goto start;
+                    continue;
+                case 2:
+                    TranslateSectorChs(devPath, dev);
+
+                    continue;
+                case 3:
+                    TranslateSectorLba(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void TranslateSectorChs(string devPath, Device dev)
-        {
-            ushort cylinder = 0;
-            byte   head     = 0;
-            byte   sector   = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for TRANSLATE SECTOR command:");
-                AaruConsole.WriteLine("Cylinder: {0}", cylinder);
-                AaruConsole.WriteLine("Head: {0}", head);
-                AaruConsole.WriteLine("Sector: {0}", sector);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What cylinder?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out cylinder))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            cylinder = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("What head?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out head))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            head = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(head > 15)
-                        {
-                            AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
-                            head = 15;
-                        }
-
-                        AaruConsole.Write("What sector?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out sector))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            sector = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.TranslateSector(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, cylinder, head,
-                                             sector, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending TRANSLATE SECTOR to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("TRANSLATE SECTOR response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("TRANSLATE SECTOR status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void TranslateSectorLba(string devPath, Device dev)
-        {
-            uint   lba = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for TRANSLATE SECTOR command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("What logical block address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0xFFFFFFF)
-                        {
-                            AaruConsole.
-                                WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
-                                          0xFFFFFFF);
-
-                            lba = 0xFFFFFFF;
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.TranslateSector(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, lba,
-                                             dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending TRANSLATE SECTOR to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("TRANSLATE SECTOR response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("TRANSLATE SECTOR status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void RequestExtendedErrorCode(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.RequestExtendedErrorCode(out byte errorCode, out AtaErrorRegistersLba28 errorRegisters,
+                                                  dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending REQUEST EXTENDED ERROR CODE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Error code is {0}.", errorCode);
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Decode error registers.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("REQUEST EXTENDED ERROR CODE status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void TranslateSectorChs(string devPath, Device dev)
+    {
+        ushort cylinder = 0;
+        byte   head     = 0;
+        byte   sector   = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for TRANSLATE SECTOR command:");
+            AaruConsole.WriteLine("Cylinder: {0}", cylinder);
+            AaruConsole.WriteLine("Head: {0}", head);
+            AaruConsole.WriteLine("Sector: {0}", sector);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What cylinder?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out cylinder))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        cylinder = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("What head?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out head))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        head = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(head > 15)
+                    {
+                        AaruConsole.WriteLine("Head cannot be bigger than 15. Setting it to 15...");
+                        head = 15;
+                    }
+
+                    AaruConsole.Write("What sector?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out sector))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        sector = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.TranslateSector(out byte[] buffer, out AtaErrorRegistersChs errorRegisters, cylinder, head,
+                                         sector, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending TRANSLATE SECTOR to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("TRANSLATE SECTOR response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("TRANSLATE SECTOR status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void TranslateSectorLba(string devPath, Device dev)
+    {
+        uint   lba = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for TRANSLATE SECTOR command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("What logical block address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0xFFFFFFF)
+                    {
+                        AaruConsole.
+                            WriteLine("Logical block address cannot be bigger than {0}. Setting it to {0}...",
+                                      0xFFFFFFF);
+
+                        lba = 0xFFFFFFF;
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.TranslateSector(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, lba,
+                                         dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending TRANSLATE SECTOR to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to CompactFlash commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to CompactFlash commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("TRANSLATE SECTOR response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("TRANSLATE SECTOR status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/ATA/MCPT.cs b/Aaru.Tests.Devices/ATA/MCPT.cs
index 25eda567b..269812a05 100644
--- a/Aaru.Tests.Devices/ATA/MCPT.cs
+++ b/Aaru.Tests.Devices/ATA/MCPT.cs
@@ -30,121 +30,69 @@ using Aaru.Console;
 using Aaru.Decoders.ATA;
 using Aaru.Devices;
 
-namespace Aaru.Tests.Devices.ATA
+namespace Aaru.Tests.Devices.ATA;
+
+internal static class Mcpt
 {
-    internal static class Mcpt
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a Media Card Pass Through command to the device:");
+            AaruConsole.WriteLine("1.- Send CHECK MEDIA CARD TYPE command.");
+            AaruConsole.WriteLine("0.- Return to ATA commands menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a Media Card Pass Through command to the device:");
-                AaruConsole.WriteLine("1.- Send CHECK MEDIA CARD TYPE command.");
-                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to ATA commands menu...");
+
+                    return;
+                case 1:
+                    CheckMediaCardType(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to ATA commands menu...");
-
-                        return;
-                    case 1:
-                        CheckMediaCardType(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
+    }
 
-        static void CheckMediaCardType(string devPath, Device dev)
+    static void CheckMediaCardType(string devPath, Device dev)
+    {
+        byte   feature = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
         {
-            byte   feature = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for CHECK MEDIA CARD TYPE command:");
-                AaruConsole.WriteLine("Feature: {0}", feature);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Media Card Pass Through commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Feature?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out feature))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            feature = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.CheckMediaCardType(feature, out AtaErrorRegistersChs errorRegisters, dev.Timeout,
-                                                out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending CHECK MEDIA CARD TYPE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("CHECK MEDIA CARD TYPE status registers:");
-            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+            AaruConsole.WriteLine("Parameters for CHECK MEDIA CARD TYPE command:");
+            AaruConsole.WriteLine("Feature: {0}", feature);
             AaruConsole.WriteLine();
             AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("2.- Change parameters.");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
             AaruConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
-            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
 
@@ -152,9 +100,8 @@ namespace Aaru.Tests.Devices.ATA
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
@@ -163,15 +110,67 @@ namespace Aaru.Tests.Devices.ATA
                     AaruConsole.WriteLine("Returning to Media Card Pass Through commands menu...");
 
                     return;
-                case 1: goto start;
-                case 2: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
+                case 1:
+                    AaruConsole.Write("Feature?: ");
+                    strDev = System.Console.ReadLine();
 
-                    goto menu;
+                    if(!byte.TryParse(strDev, out feature))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        feature = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
             }
         }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.CheckMediaCardType(feature, out AtaErrorRegistersChs errorRegisters, dev.Timeout,
+                                            out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending CHECK MEDIA CARD TYPE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("CHECK MEDIA CARD TYPE status registers:");
+        AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("2.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Media Card Pass Through commands menu...");
+
+                return;
+            case 1: goto start;
+            case 2: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/ATA/Smart.cs b/Aaru.Tests.Devices/ATA/Smart.cs
index 58b4e6c30..9de7f9274 100644
--- a/Aaru.Tests.Devices/ATA/Smart.cs
+++ b/Aaru.Tests.Devices/ATA/Smart.cs
@@ -31,105 +31,26 @@ using Aaru.Decoders.ATA;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.ATA
+namespace Aaru.Tests.Devices.ATA;
+
+internal static class Smart
 {
-    internal static class Smart
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a S.M.A.R.T. command to the device:");
-                AaruConsole.WriteLine("1.- Send DISABLE ATTRIBUTE AUTOSAVE command.");
-                AaruConsole.WriteLine("2.- Send DISABLE OPERATIONS command.");
-                AaruConsole.WriteLine("3.- Send ENABLE ATTRIBUTE AUTOSAVE command.");
-                AaruConsole.WriteLine("4.- Send ENABLE OPERATIONS command.");
-                AaruConsole.WriteLine("5.- Send EXECUTE OFF-LINE IMMEDIATE command.");
-                AaruConsole.WriteLine("6.- Send READ DATA command.");
-                AaruConsole.WriteLine("7.- Send READ LOG command.");
-                AaruConsole.WriteLine("8.- Send RETURN STATUS command.");
-                AaruConsole.WriteLine("0.- Return to ATA commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to ATA commands menu...");
-
-                        return;
-                    case 1:
-                        DisableAttributeAutosave(devPath, dev);
-
-                        continue;
-                    case 2:
-                        DisableOperations(devPath, dev);
-
-                        continue;
-                    case 3:
-                        EnableAttributeAutosave(devPath, dev);
-
-                        continue;
-                    case 4:
-                        EnableOperations(devPath, dev);
-
-                        continue;
-                    case 5:
-                        ExecuteOfflineImmediate(devPath, dev);
-
-                        continue;
-                    case 6:
-                        ReadData(devPath, dev);
-
-                        continue;
-                    case 7:
-                        ReadLog(devPath, dev);
-
-                        continue;
-                    case 8:
-                        ReturnStatus(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void DisableAttributeAutosave(string devPath, Device dev)
-        {
-            start:
             System.Console.Clear();
-
-            bool sense =
-                dev.SmartDisableAttributeAutosave(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
-                                                  out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending DISABLE ATTRIBUTE AUTOSAVE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("DISABLE ATTRIBUTE AUTOSAVE status registers:");
-            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+            AaruConsole.WriteLine("Send a S.M.A.R.T. command to the device:");
+            AaruConsole.WriteLine("1.- Send DISABLE ATTRIBUTE AUTOSAVE command.");
+            AaruConsole.WriteLine("2.- Send DISABLE OPERATIONS command.");
+            AaruConsole.WriteLine("3.- Send ENABLE ATTRIBUTE AUTOSAVE command.");
+            AaruConsole.WriteLine("4.- Send ENABLE OPERATIONS command.");
+            AaruConsole.WriteLine("5.- Send EXECUTE OFF-LINE IMMEDIATE command.");
+            AaruConsole.WriteLine("6.- Send READ DATA command.");
+            AaruConsole.WriteLine("7.- Send READ LOG command.");
+            AaruConsole.WriteLine("8.- Send RETURN STATUS command.");
+            AaruConsole.WriteLine("0.- Return to ATA commands menu.");
             AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
@@ -138,516 +59,594 @@ namespace Aaru.Tests.Devices.ATA
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
-
-                    return;
-                case 1: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void DisableOperations(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.SmartDisable(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending DISABLE OPERATIONS to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("DISABLE OPERATIONS status registers:");
-            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
-
-                    return;
-                case 1: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void EnableAttributeAutosave(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense =
-                dev.SmartEnableAttributeAutosave(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
-                                                 out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending ENABLE ATTRIBUTE AUTOSAVE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("ENABLE ATTRIBUTE AUTOSAVE status registers:");
-            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
-
-                    return;
-                case 1: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void EnableOperations(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.SmartEnable(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending ENABLE OPERATIONS to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("ENABLE OPERATIONS status registers:");
-            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
-
-                    return;
-                case 1: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ExecuteOfflineImmediate(string devPath, Device dev)
-        {
-            byte   subcommand = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for EXECUTE OFF-LINE IMMEDIATE command:");
-                AaruConsole.WriteLine("Subcommand: {0}", subcommand);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Subcommand?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out subcommand))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            subcommand = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.SmartExecuteOffLineImmediate(out AtaErrorRegistersLba28 errorRegisters, subcommand,
-                                                          dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending EXECUTE OFF-LINE IMMEDIATE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("EXECUTE OFF-LINE IMMEDIATE status registers:");
-            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("2.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
-
-                    return;
-                case 1: goto start;
-                case 2: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadData(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.SmartReadData(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
-                                           out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ DATA to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+                    AaruConsole.WriteLine("Returning to ATA commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DATA response:");
+                    DisableAttributeAutosave(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DATA status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    DisableOperations(devPath, dev);
 
-                    goto menu;
-                case 4: goto start;
+                    continue;
+                case 3:
+                    EnableAttributeAutosave(devPath, dev);
+
+                    continue;
+                case 4:
+                    EnableOperations(devPath, dev);
+
+                    continue;
+                case 5:
+                    ExecuteOfflineImmediate(devPath, dev);
+
+                    continue;
+                case 6:
+                    ReadData(devPath, dev);
+
+                    continue;
+                case 7:
+                    ReadLog(devPath, dev);
+
+                    continue;
+                case 8:
+                    ReturnStatus(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadLog(string devPath, Device dev)
-        {
-            byte   address = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ LOG command:");
-                AaruConsole.WriteLine("Log address: {0}", address);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Log address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.SmartReadLog(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, address,
-                                          dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ LOG to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode error registers.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LOG response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LOG status registers:");
-                    AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReturnStatus(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.SmartReturnStatus(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
-                                               out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending RETURN STATUS to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("RETURN STATUS status registers:");
-            AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
-
-                    return;
-                case 1: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void DisableAttributeAutosave(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense =
+            dev.SmartDisableAttributeAutosave(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
+                                              out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending DISABLE ATTRIBUTE AUTOSAVE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("DISABLE ATTRIBUTE AUTOSAVE status registers:");
+        AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
+                return;
+            case 1: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void DisableOperations(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.SmartDisable(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending DISABLE OPERATIONS to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("DISABLE OPERATIONS status registers:");
+        AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
+                return;
+            case 1: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void EnableAttributeAutosave(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense =
+            dev.SmartEnableAttributeAutosave(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
+                                             out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending ENABLE ATTRIBUTE AUTOSAVE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("ENABLE ATTRIBUTE AUTOSAVE status registers:");
+        AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
+                return;
+            case 1: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void EnableOperations(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.SmartEnable(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending ENABLE OPERATIONS to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("ENABLE OPERATIONS status registers:");
+        AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
+                return;
+            case 1: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ExecuteOfflineImmediate(string devPath, Device dev)
+    {
+        byte   subcommand = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for EXECUTE OFF-LINE IMMEDIATE command:");
+            AaruConsole.WriteLine("Subcommand: {0}", subcommand);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Subcommand?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out subcommand))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        subcommand = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.SmartExecuteOffLineImmediate(out AtaErrorRegistersLba28 errorRegisters, subcommand,
+                                                      dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending EXECUTE OFF-LINE IMMEDIATE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("EXECUTE OFF-LINE IMMEDIATE status registers:");
+        AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("2.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Media Card Pass Through commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
+                return;
+            case 1: goto start;
+            case 2: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadData(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.SmartReadData(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
+                                       out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ DATA to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DATA response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DATA status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadLog(string devPath, Device dev)
+    {
+        byte   address = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ LOG command:");
+            AaruConsole.WriteLine("Log address: {0}", address);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Log address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.SmartReadLog(out byte[] buffer, out AtaErrorRegistersLba28 errorRegisters, address,
+                                      dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ LOG to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode error registers.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LOG response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LOG status registers:");
+                AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReturnStatus(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.SmartReturnStatus(out AtaErrorRegistersLba28 errorRegisters, dev.Timeout,
+                                           out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending RETURN STATUS to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("RETURN STATUS status registers:");
+        AaruConsole.Write("{0}", MainClass.DecodeAtaRegisters(errorRegisters));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to S.M.A.R.T. commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to S.M.A.R.T. commands menu...");
+
+                return;
+            case 1: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/Command.cs b/Aaru.Tests.Devices/Command.cs
index 5b5bf7f99..a61d7d580 100644
--- a/Aaru.Tests.Devices/Command.cs
+++ b/Aaru.Tests.Devices/Command.cs
@@ -30,71 +30,70 @@ using Aaru.CommonTypes.Structs.Devices.SCSI;
 using Aaru.Console;
 using Aaru.Devices;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class MainClass
 {
-    internal static partial class MainClass
+    public static void Command(string devPath, Device dev)
     {
-        public static void Command(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a command to the device:");
+            AaruConsole.WriteLine("1.- Send a SCSI command.");
+            AaruConsole.WriteLine("2.- Send an ATA command.");
+            AaruConsole.WriteLine("3.- Send a SecureDigital/MultiMediaCard command.");
+            AaruConsole.WriteLine("4.- Send a NVMe command.");
+
+            if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
+                AaruConsole.WriteLine("5.- Send a special sequence of commands for SCSI Multimedia devices.");
+
+            AaruConsole.WriteLine("0.- Return to device menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a command to the device:");
-                AaruConsole.WriteLine("1.- Send a SCSI command.");
-                AaruConsole.WriteLine("2.- Send an ATA command.");
-                AaruConsole.WriteLine("3.- Send a SecureDigital/MultiMediaCard command.");
-                AaruConsole.WriteLine("4.- Send a NVMe command.");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
-                    AaruConsole.WriteLine("5.- Send a special sequence of commands for SCSI Multimedia devices.");
+                continue;
+            }
 
-                AaruConsole.WriteLine("0.- Return to device menu.");
-                AaruConsole.Write("Choose: ");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to device menu...");
 
-                string strDev = System.Console.ReadLine();
+                    return;
+                case 1:
+                    Scsi(devPath, dev);
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                    continue;
+                case 2:
+                    Ata(devPath, dev);
+
+                    continue;
+                case 3:
+                    SecureDigital(devPath, dev);
+
+                    continue;
+                case 4:
+                    NVMe(devPath, dev);
+
+                    continue;
+                case 5 when dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice:
+                    ScsiMmc.Menu(devPath, dev);
+
+                    continue;
+
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to device menu...");
-
-                        return;
-                    case 1:
-                        Scsi(devPath, dev);
-
-                        continue;
-                    case 2:
-                        Ata(devPath, dev);
-
-                        continue;
-                    case 3:
-                        SecureDigital(devPath, dev);
-
-                        continue;
-                    case 4:
-                        NVMe(devPath, dev);
-
-                        continue;
-                    case 5 when dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice:
-                        ScsiMmc.Menu(devPath, dev);
-
-                        continue;
-
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
     }
diff --git a/Aaru.Tests.Devices/DecodeATARegisters.cs b/Aaru.Tests.Devices/DecodeATARegisters.cs
index b70619dd1..68f267d51 100644
--- a/Aaru.Tests.Devices/DecodeATARegisters.cs
+++ b/Aaru.Tests.Devices/DecodeATARegisters.cs
@@ -30,130 +30,129 @@ using System;
 using System.Text;
 using Aaru.Decoders.ATA;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class MainClass
 {
-    internal static partial class MainClass
+    static string DecodeAtaStatus(byte status)
     {
-        static string DecodeAtaStatus(byte status)
-        {
-            string ret = "";
+        string ret = "";
 
-            if((status & 0x80) == 0x80)
-                ret += "BSY ";
+        if((status & 0x80) == 0x80)
+            ret += "BSY ";
 
-            if((status & 0x40) == 0x40)
-                ret += "DRDY ";
+        if((status & 0x40) == 0x40)
+            ret += "DRDY ";
 
-            if((status & 0x20) == 0x20)
-                ret += "DWF ";
+        if((status & 0x20) == 0x20)
+            ret += "DWF ";
 
-            if((status & 0x10) == 0x10)
-                ret += "DSC ";
+        if((status & 0x10) == 0x10)
+            ret += "DSC ";
 
-            if((status & 0x8) == 0x8)
-                ret += "DRQ ";
+        if((status & 0x8) == 0x8)
+            ret += "DRQ ";
 
-            if((status & 0x4) == 0x4)
-                ret += "CORR ";
+        if((status & 0x4) == 0x4)
+            ret += "CORR ";
 
-            if((status & 0x2) == 0x2)
-                ret += "IDX ";
+        if((status & 0x2) == 0x2)
+            ret += "IDX ";
 
-            if((status & 0x1) == 0x1)
-                ret += "ERR ";
+        if((status & 0x1) == 0x1)
+            ret += "ERR ";
 
-            return ret;
-        }
+        return ret;
+    }
 
-        static string DecodeAtaError(byte status)
-        {
-            string ret = "";
+    static string DecodeAtaError(byte status)
+    {
+        string ret = "";
 
-            if((status & 0x80) == 0x80)
-                ret += "BBK ";
+        if((status & 0x80) == 0x80)
+            ret += "BBK ";
 
-            if((status & 0x40) == 0x40)
-                ret += "UNC ";
+        if((status & 0x40) == 0x40)
+            ret += "UNC ";
 
-            if((status & 0x20) == 0x20)
-                ret += "MC ";
+        if((status & 0x20) == 0x20)
+            ret += "MC ";
 
-            if((status & 0x10) == 0x10)
-                ret += "IDNF ";
+        if((status & 0x10) == 0x10)
+            ret += "IDNF ";
 
-            if((status & 0x8) == 0x8)
-                ret += "MCR ";
+        if((status & 0x8) == 0x8)
+            ret += "MCR ";
 
-            if((status & 0x4) == 0x4)
-                ret += "ABRT ";
+        if((status & 0x4) == 0x4)
+            ret += "ABRT ";
 
-            if((status & 0x2) == 0x2)
-                ret += "TK0NF ";
+        if((status & 0x2) == 0x2)
+            ret += "TK0NF ";
 
-            if((status & 0x1) == 0x1)
-                ret += "AMNF ";
+        if((status & 0x1) == 0x1)
+            ret += "AMNF ";
 
-            return ret;
-        }
+        return ret;
+    }
 
-        public static string DecodeAtaRegisters(AtaErrorRegistersChs registers)
-        {
-            var sb = new StringBuilder();
-            sb.AppendFormat("Status: {0}", DecodeAtaStatus(registers.Status)).AppendLine();
-            sb.AppendFormat("Error: {0}", DecodeAtaStatus(registers.Error)).AppendLine();
-            sb.AppendFormat("Device: {0}", (registers.DeviceHead >> 4) & 0x01).AppendLine();
-            sb.AppendFormat("Cylinder: {0}", registers.CylinderHigh << (8 + registers.CylinderLow)).AppendLine();
-            sb.AppendFormat("Head: {0}", registers.DeviceHead & 0xF).AppendLine();
-            sb.AppendFormat("Sector: {0}", registers.Sector).AppendLine();
-            sb.AppendFormat("Count: {0}", registers.SectorCount).AppendLine();
-            sb.AppendFormat("LBA?: {0}", Convert.ToBoolean(registers.DeviceHead       & 0x40)).AppendLine();
-            sb.AppendFormat("Bit 7 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x80)).AppendLine();
-            sb.AppendFormat("Bit 5 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x20)).AppendLine();
+    public static string DecodeAtaRegisters(AtaErrorRegistersChs registers)
+    {
+        var sb = new StringBuilder();
+        sb.AppendFormat("Status: {0}", DecodeAtaStatus(registers.Status)).AppendLine();
+        sb.AppendFormat("Error: {0}", DecodeAtaStatus(registers.Error)).AppendLine();
+        sb.AppendFormat("Device: {0}", (registers.DeviceHead >> 4) & 0x01).AppendLine();
+        sb.AppendFormat("Cylinder: {0}", registers.CylinderHigh << (8 + registers.CylinderLow)).AppendLine();
+        sb.AppendFormat("Head: {0}", registers.DeviceHead & 0xF).AppendLine();
+        sb.AppendFormat("Sector: {0}", registers.Sector).AppendLine();
+        sb.AppendFormat("Count: {0}", registers.SectorCount).AppendLine();
+        sb.AppendFormat("LBA?: {0}", Convert.ToBoolean(registers.DeviceHead       & 0x40)).AppendLine();
+        sb.AppendFormat("Bit 7 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x80)).AppendLine();
+        sb.AppendFormat("Bit 5 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x20)).AppendLine();
 
-            return sb.ToString();
-        }
+        return sb.ToString();
+    }
 
-        public static string DecodeAtaRegisters(AtaErrorRegistersLba28 registers)
-        {
-            var sb = new StringBuilder();
-            sb.AppendFormat("Status: {0}", DecodeAtaStatus(registers.Status)).AppendLine();
-            sb.AppendFormat("Error: {0}", DecodeAtaStatus(registers.Error)).AppendLine();
-            sb.AppendFormat("Device: {0}", (registers.DeviceHead >> 4) & 0x01).AppendLine();
+    public static string DecodeAtaRegisters(AtaErrorRegistersLba28 registers)
+    {
+        var sb = new StringBuilder();
+        sb.AppendFormat("Status: {0}", DecodeAtaStatus(registers.Status)).AppendLine();
+        sb.AppendFormat("Error: {0}", DecodeAtaStatus(registers.Error)).AppendLine();
+        sb.AppendFormat("Device: {0}", (registers.DeviceHead >> 4) & 0x01).AppendLine();
 
-            sb.AppendFormat("LBA: {0}",
-                            ((registers.DeviceHead & 0xF) << 24) + (registers.LbaHigh << 16) + (registers.LbaMid << 8) +
-                            registers.LbaLow);
+        sb.AppendFormat("LBA: {0}",
+                        ((registers.DeviceHead & 0xF) << 24) + (registers.LbaHigh << 16) + (registers.LbaMid << 8) +
+                        registers.LbaLow);
 
-            sb.AppendFormat("Count: {0}", registers.SectorCount).AppendLine();
-            sb.AppendFormat("LBA?: {0}", Convert.ToBoolean(registers.DeviceHead       & 0x40)).AppendLine();
-            sb.AppendFormat("Bit 7 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x80)).AppendLine();
-            sb.AppendFormat("Bit 5 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x20)).AppendLine();
+        sb.AppendFormat("Count: {0}", registers.SectorCount).AppendLine();
+        sb.AppendFormat("LBA?: {0}", Convert.ToBoolean(registers.DeviceHead       & 0x40)).AppendLine();
+        sb.AppendFormat("Bit 7 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x80)).AppendLine();
+        sb.AppendFormat("Bit 5 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x20)).AppendLine();
 
-            return sb.ToString();
-        }
+        return sb.ToString();
+    }
 
-        public static string DecodeAtaRegisters(AtaErrorRegistersLba48 registers)
-        {
-            var sb = new StringBuilder();
-            sb.AppendFormat("Status: {0}", DecodeAtaStatus(registers.Status)).AppendLine();
-            sb.AppendFormat("Error: {0}", DecodeAtaStatus(registers.Error)).AppendLine();
-            sb.AppendFormat("Device: {0}", (registers.DeviceHead >> 4) & 0x01).AppendLine();
+    public static string DecodeAtaRegisters(AtaErrorRegistersLba48 registers)
+    {
+        var sb = new StringBuilder();
+        sb.AppendFormat("Status: {0}", DecodeAtaStatus(registers.Status)).AppendLine();
+        sb.AppendFormat("Error: {0}", DecodeAtaStatus(registers.Error)).AppendLine();
+        sb.AppendFormat("Device: {0}", (registers.DeviceHead >> 4) & 0x01).AppendLine();
 
-            ulong lba = registers.LbaHighPrevious * 0x10000000000UL;
-            lba += registers.LbaMidPrevious * 0x100000000UL;
-            lba += registers.LbaLowPrevious * 0x1000000UL;
-            lba += registers.LbaHighCurrent * 0x10000UL;
-            lba += registers.LbaMidCurrent  * 0x100UL;
-            lba += registers.LbaLowCurrent;
+        ulong lba = registers.LbaHighPrevious * 0x10000000000UL;
+        lba += registers.LbaMidPrevious * 0x100000000UL;
+        lba += registers.LbaLowPrevious * 0x1000000UL;
+        lba += registers.LbaHighCurrent * 0x10000UL;
+        lba += registers.LbaMidCurrent  * 0x100UL;
+        lba += registers.LbaLowCurrent;
 
-            sb.AppendFormat("LBA: {0}", lba);
+        sb.AppendFormat("LBA: {0}", lba);
 
-            sb.AppendFormat("Count: {0}", registers.SectorCount).AppendLine();
-            sb.AppendFormat("LBA?: {0}", Convert.ToBoolean(registers.DeviceHead       & 0x40)).AppendLine();
-            sb.AppendFormat("Bit 7 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x80)).AppendLine();
-            sb.AppendFormat("Bit 5 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x20)).AppendLine();
+        sb.AppendFormat("Count: {0}", registers.SectorCount).AppendLine();
+        sb.AppendFormat("LBA?: {0}", Convert.ToBoolean(registers.DeviceHead       & 0x40)).AppendLine();
+        sb.AppendFormat("Bit 7 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x80)).AppendLine();
+        sb.AppendFormat("Bit 5 set?: {0}", Convert.ToBoolean(registers.DeviceHead & 0x20)).AppendLine();
 
-            return sb.ToString();
-        }
+        return sb.ToString();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/Device.cs b/Aaru.Tests.Devices/Device.cs
index 01dfe8a60..7f286c4d8 100644
--- a/Aaru.Tests.Devices/Device.cs
+++ b/Aaru.Tests.Devices/Device.cs
@@ -30,114 +30,113 @@ using Aaru.Console;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class MainClass
 {
-    internal static partial class MainClass
+    public static void Device(string devPath)
     {
-        public static void Device(string devPath)
+        AaruConsole.WriteLine("Going to open {0}. Press any key to continue...", devPath);
+        System.Console.ReadKey();
+
+        var dev = new Device(devPath);
+
+        while(true)
         {
-            AaruConsole.WriteLine("Going to open {0}. Press any key to continue...", devPath);
+            AaruConsole.WriteLine("dev.PlatformID = {0}", dev.PlatformId);
+            AaruConsole.WriteLine("dev.FileHandle = {0}", dev.FileHandle);
+            AaruConsole.WriteLine("dev.Timeout = {0}", dev.Timeout);
+            AaruConsole.WriteLine("dev.Error = {0}", dev.Error);
+            AaruConsole.WriteLine("dev.LastError = {0}", dev.LastError);
+            AaruConsole.WriteLine("dev.Type = {0}", dev.Type);
+            AaruConsole.WriteLine("dev.Manufacturer = \"{0}\"", dev.Manufacturer);
+            AaruConsole.WriteLine("dev.Model = \"{0}\"", dev.Model);
+            AaruConsole.WriteLine("dev.Revision = \"{0}\"", dev.FirmwareRevision);
+            AaruConsole.WriteLine("dev.Serial = \"{0}\"", dev.Serial);
+            AaruConsole.WriteLine("dev.SCSIType = {0}", dev.ScsiType);
+            AaruConsole.WriteLine("dev.IsRemovable = {0}", dev.IsRemovable);
+            AaruConsole.WriteLine("dev.IsUSB = {0}", dev.IsUsb);
+            AaruConsole.WriteLine("dev.USBVendorID = 0x{0:X4}", dev.UsbVendorId);
+            AaruConsole.WriteLine("dev.USBProductID = 0x{0:X4}", dev.UsbProductId);
+
+            AaruConsole.WriteLine("dev.USBDescriptors.Length = {0}",
+                                  dev.UsbDescriptors?.Length.ToString() ?? "null");
+
+            AaruConsole.WriteLine("dev.USBManufacturerString = \"{0}\"", dev.UsbManufacturerString);
+            AaruConsole.WriteLine("dev.USBProductString = \"{0}\"", dev.UsbProductString);
+            AaruConsole.WriteLine("dev.USBSerialString = \"{0}\"", dev.UsbSerialString);
+            AaruConsole.WriteLine("dev.IsFireWire = {0}", dev.IsFireWire);
+            AaruConsole.WriteLine("dev.FireWireGUID = {0:X16}", dev.FireWireGuid);
+            AaruConsole.WriteLine("dev.FireWireModel = 0x{0:X8}", dev.FireWireModel);
+            AaruConsole.WriteLine("dev.FireWireModelName = \"{0}\"", dev.FireWireModelName);
+            AaruConsole.WriteLine("dev.FireWireVendor = 0x{0:X8}", dev.FireWireVendor);
+            AaruConsole.WriteLine("dev.FireWireVendorName = \"{0}\"", dev.FireWireVendorName);
+            AaruConsole.WriteLine("dev.IsCompactFlash = {0}", dev.IsCompactFlash);
+            AaruConsole.WriteLine("dev.IsPCMCIA = {0}", dev.IsPcmcia);
+            AaruConsole.WriteLine("dev.CIS.Length = {0}", dev.Cis?.Length.ToString() ?? "null");
+
+            AaruConsole.WriteLine("Press any key to continue...", devPath);
             System.Console.ReadKey();
 
-            var dev = new Device(devPath);
+            menu:
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Options:");
+            AaruConsole.WriteLine("1.- Print USB descriptors.");
+            AaruConsole.WriteLine("2.- Print PCMCIA CIS.");
+            AaruConsole.WriteLine("3.- Send a command to the device.");
+            AaruConsole.WriteLine("0.- Return to device selection.");
+            AaruConsole.Write("Choose: ");
 
-            while(true)
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                AaruConsole.WriteLine("dev.PlatformID = {0}", dev.PlatformId);
-                AaruConsole.WriteLine("dev.FileHandle = {0}", dev.FileHandle);
-                AaruConsole.WriteLine("dev.Timeout = {0}", dev.Timeout);
-                AaruConsole.WriteLine("dev.Error = {0}", dev.Error);
-                AaruConsole.WriteLine("dev.LastError = {0}", dev.LastError);
-                AaruConsole.WriteLine("dev.Type = {0}", dev.Type);
-                AaruConsole.WriteLine("dev.Manufacturer = \"{0}\"", dev.Manufacturer);
-                AaruConsole.WriteLine("dev.Model = \"{0}\"", dev.Model);
-                AaruConsole.WriteLine("dev.Revision = \"{0}\"", dev.FirmwareRevision);
-                AaruConsole.WriteLine("dev.Serial = \"{0}\"", dev.Serial);
-                AaruConsole.WriteLine("dev.SCSIType = {0}", dev.ScsiType);
-                AaruConsole.WriteLine("dev.IsRemovable = {0}", dev.IsRemovable);
-                AaruConsole.WriteLine("dev.IsUSB = {0}", dev.IsUsb);
-                AaruConsole.WriteLine("dev.USBVendorID = 0x{0:X4}", dev.UsbVendorId);
-                AaruConsole.WriteLine("dev.USBProductID = 0x{0:X4}", dev.UsbProductId);
-
-                AaruConsole.WriteLine("dev.USBDescriptors.Length = {0}",
-                                      dev.UsbDescriptors?.Length.ToString() ?? "null");
-
-                AaruConsole.WriteLine("dev.USBManufacturerString = \"{0}\"", dev.UsbManufacturerString);
-                AaruConsole.WriteLine("dev.USBProductString = \"{0}\"", dev.UsbProductString);
-                AaruConsole.WriteLine("dev.USBSerialString = \"{0}\"", dev.UsbSerialString);
-                AaruConsole.WriteLine("dev.IsFireWire = {0}", dev.IsFireWire);
-                AaruConsole.WriteLine("dev.FireWireGUID = {0:X16}", dev.FireWireGuid);
-                AaruConsole.WriteLine("dev.FireWireModel = 0x{0:X8}", dev.FireWireModel);
-                AaruConsole.WriteLine("dev.FireWireModelName = \"{0}\"", dev.FireWireModelName);
-                AaruConsole.WriteLine("dev.FireWireVendor = 0x{0:X8}", dev.FireWireVendor);
-                AaruConsole.WriteLine("dev.FireWireVendorName = \"{0}\"", dev.FireWireVendorName);
-                AaruConsole.WriteLine("dev.IsCompactFlash = {0}", dev.IsCompactFlash);
-                AaruConsole.WriteLine("dev.IsPCMCIA = {0}", dev.IsPcmcia);
-                AaruConsole.WriteLine("dev.CIS.Length = {0}", dev.Cis?.Length.ToString() ?? "null");
-
-                AaruConsole.WriteLine("Press any key to continue...", devPath);
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
 
-                menu:
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Options:");
-                AaruConsole.WriteLine("1.- Print USB descriptors.");
-                AaruConsole.WriteLine("2.- Print PCMCIA CIS.");
-                AaruConsole.WriteLine("3.- Send a command to the device.");
-                AaruConsole.WriteLine("0.- Return to device selection.");
-                AaruConsole.Write("Choose: ");
+                goto menu;
+            }
 
-                string strDev = System.Console.ReadLine();
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to device selection...");
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                    return;
+                case 1:
+                    System.Console.Clear();
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("USB descriptors:");
+
+                    if(dev.UsbDescriptors != null)
+                        PrintHex.PrintHexArray(dev.UsbDescriptors, 64);
+
+                    AaruConsole.WriteLine("Press any key to continue...");
                     System.Console.ReadKey();
 
                     goto menu;
-                }
+                case 2:
+                    System.Console.Clear();
+                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.WriteLine("PCMCIA CIS:");
 
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to device selection...");
+                    if(dev.Cis != null)
+                        PrintHex.PrintHexArray(dev.Cis, 64);
 
-                        return;
-                    case 1:
-                        System.Console.Clear();
-                        AaruConsole.WriteLine("Device: {0}", devPath);
-                        AaruConsole.WriteLine("USB descriptors:");
+                    AaruConsole.WriteLine("Press any key to continue...");
+                    System.Console.ReadKey();
 
-                        if(dev.UsbDescriptors != null)
-                            PrintHex.PrintHexArray(dev.UsbDescriptors, 64);
+                    goto menu;
+                case 3:
+                    Command(devPath, dev);
 
-                        AaruConsole.WriteLine("Press any key to continue...");
-                        System.Console.ReadKey();
+                    goto menu;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    System.Console.ReadKey();
 
-                        goto menu;
-                    case 2:
-                        System.Console.Clear();
-                        AaruConsole.WriteLine("Device: {0}", devPath);
-                        AaruConsole.WriteLine("PCMCIA CIS:");
-
-                        if(dev.Cis != null)
-                            PrintHex.PrintHexArray(dev.Cis, 64);
-
-                        AaruConsole.WriteLine("Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        goto menu;
-                    case 3:
-                        Command(devPath, dev);
-
-                        goto menu;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        goto menu;
-                }
+                    goto menu;
             }
         }
     }
diff --git a/Aaru.Tests.Devices/Main.cs b/Aaru.Tests.Devices/Main.cs
index f977b591b..222ba0942 100644
--- a/Aaru.Tests.Devices/Main.cs
+++ b/Aaru.Tests.Devices/Main.cs
@@ -30,76 +30,75 @@ using System.Linq;
 using Aaru.Console;
 using Aaru.Devices;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class MainClass
 {
-    internal static partial class MainClass
+    public static void Main()
     {
-        public static void Main()
+        AaruConsole.WriteLineEvent        += System.Console.WriteLine;
+        AaruConsole.WriteEvent            += System.Console.Write;
+        AaruConsole.ErrorWriteLineEvent   += System.Console.Error.WriteLine;
+        AaruConsole.DebugWriteLineEvent   += System.Console.Error.WriteLine;
+        AaruConsole.VerboseWriteLineEvent += System.Console.WriteLine;
+
+        DeviceInfo[] devices = Aaru.Devices.Device.ListDevices();
+
+        if(devices        == null ||
+           devices.Length == 0)
         {
-            AaruConsole.WriteLineEvent        += System.Console.WriteLine;
-            AaruConsole.WriteEvent            += System.Console.Write;
-            AaruConsole.ErrorWriteLineEvent   += System.Console.Error.WriteLine;
-            AaruConsole.DebugWriteLineEvent   += System.Console.Error.WriteLine;
-            AaruConsole.VerboseWriteLineEvent += System.Console.WriteLine;
+            AaruConsole.WriteLine("No known devices attached.");
 
-            DeviceInfo[] devices = Aaru.Devices.Device.ListDevices();
+            return;
+        }
 
-            if(devices        == null ||
-               devices.Length == 0)
+        devices = devices.OrderBy(d => d.Path).ToArray();
+
+        while(true)
+        {
+            System.Console.Clear();
+
+            AaruConsole.WriteLine("DiscImageChef device handling tests");
+
+            AaruConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", "Path", "Vendor",
+                                  "Model", "Serial", "Bus", "Supported?", "Number");
+
+            AaruConsole.WriteLine("{6,-8}|{0,-22}+{1,-16}+{2,-24}+{3,-24}+{4,-10}+{5,-10}",
+                                  "----------------------", "----------------", "------------------------",
+                                  "------------------------", "----------", "----------", "--------");
+
+            for(int i = 0; i < devices.Length; i++)
+                AaruConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", devices[i].Path,
+                                      devices[i].Vendor, devices[i].Model, devices[i].Serial, devices[i].Bus,
+                                      devices[i].Supported, i + 1);
+
+            AaruConsole.Write("Please choose which drive to test (0 to exit): ");
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                AaruConsole.WriteLine("No known devices attached.");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            if(item == 0)
+            {
+                AaruConsole.WriteLine("Exiting...");
 
                 return;
             }
 
-            devices = devices.OrderBy(d => d.Path).ToArray();
-
-            while(true)
+            if(item > devices.Length)
             {
-                System.Console.Clear();
+                AaruConsole.WriteLine("No such device. Press any key to continue...");
+                System.Console.ReadKey();
 
-                AaruConsole.WriteLine("DiscImageChef device handling tests");
-
-                AaruConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", "Path", "Vendor",
-                                      "Model", "Serial", "Bus", "Supported?", "Number");
-
-                AaruConsole.WriteLine("{6,-8}|{0,-22}+{1,-16}+{2,-24}+{3,-24}+{4,-10}+{5,-10}",
-                                      "----------------------", "----------------", "------------------------",
-                                      "------------------------", "----------", "----------", "--------");
-
-                for(int i = 0; i < devices.Length; i++)
-                    AaruConsole.WriteLine("{6,-8}|{0,-22}|{1,-16}|{2,-24}|{3,-24}|{4,-10}|{5,-10}", devices[i].Path,
-                                          devices[i].Vendor, devices[i].Model, devices[i].Serial, devices[i].Bus,
-                                          devices[i].Supported, i + 1);
-
-                AaruConsole.Write("Please choose which drive to test (0 to exit): ");
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                if(item == 0)
-                {
-                    AaruConsole.WriteLine("Exiting...");
-
-                    return;
-                }
-
-                if(item > devices.Length)
-                {
-                    AaruConsole.WriteLine("No such device. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                Device(devices[item - 1].Path);
+                continue;
             }
+
+            Device(devices[item - 1].Path);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/NVMe.cs b/Aaru.Tests.Devices/NVMe.cs
index c4ab53c05..b2448f7c8 100644
--- a/Aaru.Tests.Devices/NVMe.cs
+++ b/Aaru.Tests.Devices/NVMe.cs
@@ -29,14 +29,13 @@
 using Aaru.Console;
 using Aaru.Devices;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class MainClass
 {
-    internal static partial class MainClass
+    public static void NVMe(string devPath, Device dev)
     {
-        public static void NVMe(string devPath, Device dev)
-        {
-            AaruConsole.WriteLine("NVMe commands not yet implemented. Press any key to continue...");
-            System.Console.ReadKey();
-        }
+        AaruConsole.WriteLine("NVMe commands not yet implemented. Press any key to continue...");
+        System.Console.ReadKey();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI.cs b/Aaru.Tests.Devices/SCSI.cs
index ef8989402..7c5b71f80 100644
--- a/Aaru.Tests.Devices/SCSI.cs
+++ b/Aaru.Tests.Devices/SCSI.cs
@@ -30,127 +30,126 @@ using Aaru.Console;
 using Aaru.Devices;
 using Aaru.Tests.Devices.SCSI;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class MainClass
 {
-    internal static partial class MainClass
+    public static void Scsi(string devPath, Device dev)
     {
-        public static void Scsi(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a SCSI command to the device:");
+            AaruConsole.WriteLine("1.- Send an Adaptec vendor command to the device.");
+            AaruConsole.WriteLine("2.- Send an Archive vendor command to the device.");
+            AaruConsole.WriteLine("3.- Send a Certance vendor command to the device.");
+            AaruConsole.WriteLine("4.- Send a Fujitsu vendor command to the device.");
+            AaruConsole.WriteLine("5.- Send an HL-DT-ST vendor command to the device.");
+            AaruConsole.WriteLine("6.- Send a Hewlett-Packard vendor command to the device.");
+            AaruConsole.WriteLine("7.- Send a Kreon vendor command to the device.");
+            AaruConsole.WriteLine("8.- Send a SCSI MultiMedia Command to the device.");
+            AaruConsole.WriteLine("9.- Send a NEC vendor command to the device.");
+            AaruConsole.WriteLine("10.- Send a Pioneer vendor command to the device.");
+            AaruConsole.WriteLine("11.- Send a Plasmon vendor command to the device.");
+            AaruConsole.WriteLine("12.- Send a Plextor vendor command to the device.");
+            AaruConsole.WriteLine("13.- Send a SCSI Block Command to the device.");
+            AaruConsole.WriteLine("14.- Send a SCSI Media Changer command to the device.");
+            AaruConsole.WriteLine("15.- Send a SCSI Primary Command to the device.");
+            AaruConsole.WriteLine("16.- Send a SCSI Streaming Command to the device.");
+            AaruConsole.WriteLine("17.- Send a SyQuest vendor command to the device.");
+            AaruConsole.WriteLine("0.- Return to command class menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a SCSI command to the device:");
-                AaruConsole.WriteLine("1.- Send an Adaptec vendor command to the device.");
-                AaruConsole.WriteLine("2.- Send an Archive vendor command to the device.");
-                AaruConsole.WriteLine("3.- Send a Certance vendor command to the device.");
-                AaruConsole.WriteLine("4.- Send a Fujitsu vendor command to the device.");
-                AaruConsole.WriteLine("5.- Send an HL-DT-ST vendor command to the device.");
-                AaruConsole.WriteLine("6.- Send a Hewlett-Packard vendor command to the device.");
-                AaruConsole.WriteLine("7.- Send a Kreon vendor command to the device.");
-                AaruConsole.WriteLine("8.- Send a SCSI MultiMedia Command to the device.");
-                AaruConsole.WriteLine("9.- Send a NEC vendor command to the device.");
-                AaruConsole.WriteLine("10.- Send a Pioneer vendor command to the device.");
-                AaruConsole.WriteLine("11.- Send a Plasmon vendor command to the device.");
-                AaruConsole.WriteLine("12.- Send a Plextor vendor command to the device.");
-                AaruConsole.WriteLine("13.- Send a SCSI Block Command to the device.");
-                AaruConsole.WriteLine("14.- Send a SCSI Media Changer command to the device.");
-                AaruConsole.WriteLine("15.- Send a SCSI Primary Command to the device.");
-                AaruConsole.WriteLine("16.- Send a SCSI Streaming Command to the device.");
-                AaruConsole.WriteLine("17.- Send a SyQuest vendor command to the device.");
-                AaruConsole.WriteLine("0.- Return to command class menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to command class menu...");
+
+                    return;
+                case 1:
+                    Adaptec.Menu(devPath, dev);
+
+                    continue;
+                case 2:
+                    ArchiveCorp.Menu(devPath, dev);
+
+                    continue;
+                case 3:
+                    Certance.Menu(devPath, dev);
+
+                    continue;
+                case 4:
+                    Fujitsu.Menu(devPath, dev);
+
+                    continue;
+                case 5:
+                    HlDtSt.Menu(devPath, dev);
+
+                    continue;
+                case 6:
+                    Hp.Menu(devPath, dev);
+
+                    continue;
+                case 7:
+                    Kreon.Menu(devPath, dev);
+
+                    continue;
+                case 8:
+                    Mmc.Menu(devPath, dev);
+
+                    continue;
+                case 9:
+                    Nec.Menu(devPath, dev);
+
+                    continue;
+                case 10:
+                    Pioneer.Menu(devPath, dev);
+
+                    continue;
+                case 11:
+                    Plasmon.Menu(devPath, dev);
+
+                    continue;
+                case 12:
+                    Plextor.Menu(devPath, dev);
+
+                    continue;
+                case 13:
+                    Sbc.Menu(devPath, dev);
+
+                    continue;
+                case 14:
+                    Smc.Menu(devPath, dev);
+
+                    continue;
+                case 15:
+                    Spc.Menu(devPath, dev);
+
+                    continue;
+                case 16:
+                    Ssc.Menu(devPath, dev);
+
+                    continue;
+                case 17:
+                    SyQuest.Menu(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to command class menu...");
-
-                        return;
-                    case 1:
-                        Adaptec.Menu(devPath, dev);
-
-                        continue;
-                    case 2:
-                        ArchiveCorp.Menu(devPath, dev);
-
-                        continue;
-                    case 3:
-                        Certance.Menu(devPath, dev);
-
-                        continue;
-                    case 4:
-                        Fujitsu.Menu(devPath, dev);
-
-                        continue;
-                    case 5:
-                        HlDtSt.Menu(devPath, dev);
-
-                        continue;
-                    case 6:
-                        Hp.Menu(devPath, dev);
-
-                        continue;
-                    case 7:
-                        Kreon.Menu(devPath, dev);
-
-                        continue;
-                    case 8:
-                        Mmc.Menu(devPath, dev);
-
-                        continue;
-                    case 9:
-                        Nec.Menu(devPath, dev);
-
-                        continue;
-                    case 10:
-                        Pioneer.Menu(devPath, dev);
-
-                        continue;
-                    case 11:
-                        Plasmon.Menu(devPath, dev);
-
-                        continue;
-                    case 12:
-                        Plextor.Menu(devPath, dev);
-
-                        continue;
-                    case 13:
-                        Sbc.Menu(devPath, dev);
-
-                        continue;
-                    case 14:
-                        Smc.Menu(devPath, dev);
-
-                        continue;
-                    case 15:
-                        Spc.Menu(devPath, dev);
-
-                        continue;
-                    case 16:
-                        Ssc.Menu(devPath, dev);
-
-                        continue;
-                    case 17:
-                        SyQuest.Menu(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
     }
diff --git a/Aaru.Tests.Devices/SCSI/Adaptec.cs b/Aaru.Tests.Devices/SCSI/Adaptec.cs
index 097fb5592..4efab72d9 100644
--- a/Aaru.Tests.Devices/SCSI/Adaptec.cs
+++ b/Aaru.Tests.Devices/SCSI/Adaptec.cs
@@ -31,233 +31,22 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Adaptec
 {
-    internal static class Adaptec
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send an Adaptec vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send READ/RESET USAGE COUNTER command.");
-                AaruConsole.WriteLine("2.- Send READ DATA BUFFER command.");
-                AaruConsole.WriteLine("3.- Send SET ERROR THRESHOLD command.");
-                AaruConsole.WriteLine("4.- Send TRANSLATE command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        ReadResetUsageCounter(devPath, dev);
-
-                        continue;
-                    case 2:
-                        ReadDataBuffer(devPath, dev);
-
-                        continue;
-                    case 3:
-                        SetErrorThreshold(devPath, dev);
-
-                        continue;
-                    case 4:
-                        Translate(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void ReadResetUsageCounter(string devPath, Device dev)
-        {
-            bool   drive1 = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ/RESET USAGE COUNTER command:");
-                AaruConsole.WriteLine("Drive 1?: {0}", drive1);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Drive 1?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out drive1))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            drive1 = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.AdaptecReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, drive1, dev.Timeout,
-                                                     out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ/RESET USAGE COUNTER to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadDataBuffer(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.AdaptecReadBuffer(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                               out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ DATA BUFFER to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+            AaruConsole.WriteLine("Send an Adaptec vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send READ/RESET USAGE COUNTER command.");
+            AaruConsole.WriteLine("2.- Send READ DATA BUFFER command.");
+            AaruConsole.WriteLine("3.- Send SET ERROR THRESHOLD command.");
+            AaruConsole.WriteLine("4.- Send TRANSLATE command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
             AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
@@ -266,354 +55,564 @@ namespace Aaru.Tests.Devices.SCSI
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DATA BUFFER response:");
+                    ReadResetUsageCounter(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DATA BUFFER sense:");
+                    ReadDataBuffer(devPath, dev);
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DATA BUFFER decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    SetErrorThreshold(devPath, dev);
 
-                    goto menu;
-                case 4: goto start;
+                    continue;
+                case 4:
+                    Translate(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SetErrorThreshold(string devPath, Device dev)
-        {
-            bool   drive1    = false;
-            byte   threshold = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SET ERROR THRESHOLD command:");
-                AaruConsole.WriteLine("Drive 1?: {0}", drive1);
-                AaruConsole.WriteLine("Error threshold: {0}", threshold);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Drive 1?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out drive1))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            drive1 = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Error threshold?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out threshold))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            threshold = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense =
-                dev.AdaptecSetErrorThreshold(threshold, out byte[] senseBuffer, drive1, dev.Timeout,
-                                             out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SET ERROR THRESHOLD to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("SET ERROR THRESHOLD decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SET ERROR THRESHOLD sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Translate(string devPath, Device dev)
-        {
-            bool   drive1 = false;
-            uint   lba    = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for TRANSLATE command:");
-                AaruConsole.WriteLine("Drive 1?: {0}", drive1);
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Drive 1?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out drive1))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            drive1 = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.AdaptecTranslate(out byte[] buffer, out byte[] senseBuffer, drive1, lba, dev.Timeout,
-                                              out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending TRANSLATE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("TRANSLATE response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("TRANSLATE sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("TRANSLATE decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void ReadResetUsageCounter(string devPath, Device dev)
+    {
+        bool   drive1 = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ/RESET USAGE COUNTER command:");
+            AaruConsole.WriteLine("Drive 1?: {0}", drive1);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Drive 1?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out drive1))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        drive1 = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.AdaptecReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, drive1, dev.Timeout,
+                                                 out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ/RESET USAGE COUNTER to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ/RESET USAGE COUNTER response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ/RESET USAGE COUNTER sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ/RESET USAGE COUNTER decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadDataBuffer(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.AdaptecReadBuffer(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                           out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ DATA BUFFER to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DATA BUFFER response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DATA BUFFER sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DATA BUFFER decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SetErrorThreshold(string devPath, Device dev)
+    {
+        bool   drive1    = false;
+        byte   threshold = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SET ERROR THRESHOLD command:");
+            AaruConsole.WriteLine("Drive 1?: {0}", drive1);
+            AaruConsole.WriteLine("Error threshold: {0}", threshold);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Drive 1?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out drive1))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        drive1 = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Error threshold?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out threshold))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        threshold = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense =
+            dev.AdaptecSetErrorThreshold(threshold, out byte[] senseBuffer, drive1, dev.Timeout,
+                                         out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SET ERROR THRESHOLD to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("SET ERROR THRESHOLD decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SET ERROR THRESHOLD sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Translate(string devPath, Device dev)
+    {
+        bool   drive1 = false;
+        uint   lba    = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for TRANSLATE command:");
+            AaruConsole.WriteLine("Drive 1?: {0}", drive1);
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Drive 1?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out drive1))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        drive1 = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.AdaptecTranslate(out byte[] buffer, out byte[] senseBuffer, drive1, lba, dev.Timeout,
+                                          out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending TRANSLATE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Adaptec vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Adaptec vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("TRANSLATE response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("TRANSLATE sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("TRANSLATE decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs b/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs
index b53d2475d..ec99d416f 100644
--- a/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs
+++ b/Aaru.Tests.Devices/SCSI/ArchiveCorp.cs
@@ -31,328 +31,327 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class ArchiveCorp
 {
-    internal static class ArchiveCorp
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send an Archive vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send REQUEST BLOCK ADDRESS command.");
-                AaruConsole.WriteLine("2.- Send SEEK BLOCK command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        RequestBlockAddress(devPath, dev);
-
-                        continue;
-                    case 2:
-                        SeekBlock(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void RequestBlockAddress(string devPath, Device dev)
-        {
-            uint   lba = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for REQUEST BLOCK ADDRESS command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.ArchiveCorpRequestBlockAddress(out byte[] buffer, out byte[] senseBuffer, lba, dev.Timeout,
-                                                            out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending REQUEST BLOCK ADDRESS to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
+            AaruConsole.WriteLine("Send an Archive vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send REQUEST BLOCK ADDRESS command.");
+            AaruConsole.WriteLine("2.- Send SEEK BLOCK command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
             AaruConsole.Write("Choose: ");
 
-            strDev = System.Console.ReadLine();
+            string strDev = System.Console.ReadLine();
 
-            if(!int.TryParse(strDev, out item))
+            if(!int.TryParse(strDev, out int item))
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("REQUEST BLOCK ADDRESS response:");
+                    RequestBlockAddress(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("REQUEST BLOCK ADDRESS sense:");
+                    SeekBlock(devPath, dev);
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("REQUEST BLOCK ADDRESS decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SeekBlock(string devPath, Device dev)
-        {
-            bool   immediate = false;
-            uint   lba       = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SEEK BLOCK command:");
-                AaruConsole.WriteLine("Immediate?: {0}", immediate);
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Immediate?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out immediate))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            immediate = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense =
-                dev.ArchiveCorpSeekBlock(out byte[] senseBuffer, immediate, lba, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEEK BLOCK to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("SEEK BLOCK decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEEK BLOCK sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void RequestBlockAddress(string devPath, Device dev)
+    {
+        uint   lba = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for REQUEST BLOCK ADDRESS command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ArchiveCorpRequestBlockAddress(out byte[] buffer, out byte[] senseBuffer, lba, dev.Timeout,
+                                                        out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending REQUEST BLOCK ADDRESS to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("REQUEST BLOCK ADDRESS response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("REQUEST BLOCK ADDRESS sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("REQUEST BLOCK ADDRESS decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SeekBlock(string devPath, Device dev)
+    {
+        bool   immediate = false;
+        uint   lba       = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SEEK BLOCK command:");
+            AaruConsole.WriteLine("Immediate?: {0}", immediate);
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Immediate?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out immediate))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        immediate = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense =
+            dev.ArchiveCorpSeekBlock(out byte[] senseBuffer, immediate, lba, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEEK BLOCK to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("SEEK BLOCK decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Archive vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Archive vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEEK BLOCK sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/Certance.cs b/Aaru.Tests.Devices/SCSI/Certance.cs
index 71a02bbcf..9acd5a6f4 100644
--- a/Aaru.Tests.Devices/SCSI/Certance.cs
+++ b/Aaru.Tests.Devices/SCSI/Certance.cs
@@ -31,179 +31,178 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Certance
 {
-    internal static class Certance
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a Certance vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send PARK command.");
+            AaruConsole.WriteLine("2.- Send UNPARK command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a Certance vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send PARK command.");
-                AaruConsole.WriteLine("2.- Send UNPARK command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
+                    return;
+                case 1:
+                    Park(devPath, dev);
+
+                    continue;
+                case 2:
+                    Unpark(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        Park(devPath, dev);
-
-                        continue;
-                    case 2:
-                        Unpark(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void Park(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.CertancePark(out byte[] senseBuffer, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending PARK to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("PARK decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Certance vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Certance vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("PARK sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Unpark(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.CertanceUnpark(out byte[] senseBuffer, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending UNPARK to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("UNPARK decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Certance vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Certance vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("UNPARK sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void Park(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.CertancePark(out byte[] senseBuffer, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending PARK to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("PARK decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Certance vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Certance vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("PARK sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Unpark(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.CertanceUnpark(out byte[] senseBuffer, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending UNPARK to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("UNPARK decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Certance vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Certance vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("UNPARK sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/Fujitsu.cs b/Aaru.Tests.Devices/SCSI/Fujitsu.cs
index 15fdf767a..501e05476 100644
--- a/Aaru.Tests.Devices/SCSI/Fujitsu.cs
+++ b/Aaru.Tests.Devices/SCSI/Fujitsu.cs
@@ -32,152 +32,72 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Fujitsu
 {
-    internal static class Fujitsu
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a Fujitsu vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send DISPLAY command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a Fujitsu vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send DISPLAY command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
+                    return;
+                case 1:
+                    Display(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        Display(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
+    }
 
-        static void Display(string devPath, Device dev)
+    static void Display(string devPath, Device dev)
+    {
+        bool                flash      = false;
+        FujitsuDisplayModes mode       = FujitsuDisplayModes.Ready;
+        string              firstHalf  = "DIC TEST";
+        string              secondHalf = "TEST DIC";
+        string              strDev;
+        int                 item;
+
+        parameters:
+
+        while(true)
         {
-            bool                flash      = false;
-            FujitsuDisplayModes mode       = FujitsuDisplayModes.Ready;
-            string              firstHalf  = "DIC TEST";
-            string              secondHalf = "TEST DIC";
-            string              strDev;
-            int                 item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for DISPLAY command:");
-                AaruConsole.WriteLine("Descriptor: {0}", flash);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Fujitsu vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Fujitsu vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Flash?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out flash))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            flash = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Display mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", FujitsuDisplayModes.Cancel,
-                                              FujitsuDisplayModes.Cart, FujitsuDisplayModes.Half,
-                                              FujitsuDisplayModes.Idle, FujitsuDisplayModes.Ready);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out mode))
-                        {
-                            AaruConsole.WriteLine("Not a correct display mode. Press any key to continue...");
-                            mode = FujitsuDisplayModes.Ready;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("First display half (will be cut to 7-bit ASCII, 8 chars?: ");
-                        firstHalf = System.Console.ReadLine();
-                        AaruConsole.Write("Second display half (will be cut to 7-bit ASCII, 8 chars?: ");
-                        secondHalf = System.Console.ReadLine();
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.FujitsuDisplay(out byte[] senseBuffer, flash, mode, firstHalf, secondHalf, dev.Timeout,
-                                            out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending DISPLAY to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("DISPLAY decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine("Parameters for DISPLAY command:");
+            AaruConsole.WriteLine("Descriptor: {0}", flash);
             AaruConsole.WriteLine();
             AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
             AaruConsole.WriteLine("0.- Return to Fujitsu vendor commands menu.");
-            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
 
@@ -185,9 +105,8 @@ namespace Aaru.Tests.Devices.SCSI
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
@@ -197,28 +116,108 @@ namespace Aaru.Tests.Devices.SCSI
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("DISPLAY sense:");
+                    AaruConsole.Write("Flash?: ");
+                    strDev = System.Console.ReadLine();
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
+                    if(!bool.TryParse(strDev, out flash))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        flash = false;
+                        System.Console.ReadKey();
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                        continue;
+                    }
 
-                    goto menu;
+                    AaruConsole.WriteLine("Display mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", FujitsuDisplayModes.Cancel,
+                                          FujitsuDisplayModes.Cart, FujitsuDisplayModes.Half,
+                                          FujitsuDisplayModes.Idle, FujitsuDisplayModes.Ready);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out mode))
+                    {
+                        AaruConsole.WriteLine("Not a correct display mode. Press any key to continue...");
+                        mode = FujitsuDisplayModes.Ready;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("First display half (will be cut to 7-bit ASCII, 8 chars?: ");
+                    firstHalf = System.Console.ReadLine();
+                    AaruConsole.Write("Second display half (will be cut to 7-bit ASCII, 8 chars?: ");
+                    secondHalf = System.Console.ReadLine();
+
+                    break;
                 case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.FujitsuDisplay(out byte[] senseBuffer, flash, mode, firstHalf, secondHalf, dev.Timeout,
+                                        out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending DISPLAY to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("DISPLAY decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Fujitsu vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Fujitsu vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("DISPLAY sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs
index b64055abd..626dff7e7 100644
--- a/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs
+++ b/Aaru.Tests.Devices/SCSI/HL-DT-ST.cs
@@ -31,140 +31,71 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class HlDtSt
 {
-    internal static class HlDtSt
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send an HL-DT-ST vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send READ DVD (RAW) command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send an HL-DT-ST vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send READ DVD (RAW) command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
+                    return;
+                case 1:
+                    ReadDvdRaw(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        ReadDvdRaw(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
+    }
 
-        static void ReadDvdRaw(string devPath, Device dev)
+    static void ReadDvdRaw(string devPath, Device dev)
+    {
+        uint   count = 1;
+        uint   lba   = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
         {
-            uint   count = 1;
-            uint   lba   = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ DVD (RAW) command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to HL-DT-ST vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to HL-DT-ST vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.HlDtStReadRawDvd(out byte[] buffer, out byte[] senseBuffer, lba, count, dev.Timeout,
-                                              out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ DVD (RAW) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("Parameters for READ DVD (RAW) command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("Count: {0}", count);
             AaruConsole.WriteLine();
             AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
             AaruConsole.WriteLine("0.- Return to HL-DT-ST vendor commands menu.");
-            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
 
@@ -172,9 +103,8 @@ namespace Aaru.Tests.Devices.SCSI
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
@@ -184,53 +114,122 @@ namespace Aaru.Tests.Devices.SCSI
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DVD (RAW) response:");
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
+                    if(!uint.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                        continue;
+                    }
 
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DVD (RAW) sense:");
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+                    }
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DVD (RAW) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
+                    break;
+                case 2: goto start;
             }
         }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.HlDtStReadRawDvd(out byte[] buffer, out byte[] senseBuffer, lba, count, dev.Timeout,
+                                          out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ DVD (RAW) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to HL-DT-ST vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to HL-DT-ST vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DVD (RAW) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DVD (RAW) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DVD (RAW) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/HP.cs b/Aaru.Tests.Devices/SCSI/HP.cs
index edd8bd52f..726b871b5 100644
--- a/Aaru.Tests.Devices/SCSI/HP.cs
+++ b/Aaru.Tests.Devices/SCSI/HP.cs
@@ -31,200 +31,80 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Hp
 {
-    internal static class Hp
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a Hewlett-Packard vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send READ LONG command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a Hewlett-Packard vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send READ LONG command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
+                    return;
+                case 1:
+                    ReadLong(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        ReadLong(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
+    }
 
-        static void ReadLong(string devPath, Device dev)
+    static void ReadLong(string devPath, Device dev)
+    {
+        bool   relative    = false;
+        uint   address     = 0;
+        ushort length      = 1;
+        ushort bps         = 512;
+        bool   physical    = false;
+        bool   sectorCount = true;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
         {
-            bool   relative    = false;
-            uint   address     = 0;
-            ushort length      = 1;
-            ushort bps         = 512;
-            bool   physical    = false;
-            bool   sectorCount = true;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ LONG command:");
-                AaruConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
-                AaruConsole.WriteLine("Relative?: {0}", relative);
-                AaruConsole.WriteLine("Will transfer {0} {1}", length, sectorCount ? "sectors" : "bytes");
-
-                if(sectorCount)
-                    AaruConsole.WriteLine("Expected sector size: {0} bytes", bps);
-
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Hewlett-Packard vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Hewlett-Packard vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Physical address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out physical))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            physical = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Relative address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out relative))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            relative = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Transfer sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out sectorCount))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            sectorCount = true;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many {0} to transfer?: ", sectorCount ? "sectors" : "bytes");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = (ushort)(sectorCount ? 1 : 512);
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(sectorCount)
-                        {
-                            AaruConsole.Write("How many bytes to expect per sector?");
-                            strDev = System.Console.ReadLine();
-
-                            if(!ushort.TryParse(strDev, out bps))
-                            {
-                                AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
-                                bps = 512;
-                                System.Console.ReadKey();
-                            }
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.HpReadLong(out byte[] buffer, out byte[] senseBuffer, relative, address, length, bps,
-                                        physical, sectorCount, dev.Timeout, out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ LONG to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("Parameters for READ LONG command:");
+            AaruConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
+            AaruConsole.WriteLine("Relative?: {0}", relative);
+            AaruConsole.WriteLine("Will transfer {0} {1}", length, sectorCount ? "sectors" : "bytes");
+
+            if(sectorCount)
+                AaruConsole.WriteLine("Expected sector size: {0} bytes", bps);
+
             AaruConsole.WriteLine();
             AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
             AaruConsole.WriteLine("0.- Return to Hewlett-Packard vendor commands menu.");
-            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
 
@@ -232,9 +112,8 @@ namespace Aaru.Tests.Devices.SCSI
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
@@ -244,53 +123,173 @@ namespace Aaru.Tests.Devices.SCSI
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG response:");
+                    AaruConsole.Write("Physical address?: ");
+                    strDev = System.Console.ReadLine();
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
+                    if(!bool.TryParse(strDev, out physical))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        physical = false;
+                        System.Console.ReadKey();
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                        continue;
+                    }
 
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG sense:");
+                    AaruConsole.Write("Relative address?: ");
+                    strDev = System.Console.ReadLine();
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
+                    if(!bool.TryParse(strDev, out relative))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        relative = false;
+                        System.Console.ReadKey();
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                        continue;
+                    }
 
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
+                    strDev = System.Console.ReadLine();
 
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
 
-                    goto menu;
+                        continue;
+                    }
+
+                    AaruConsole.Write("Transfer sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out sectorCount))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        sectorCount = true;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many {0} to transfer?: ", sectorCount ? "sectors" : "bytes");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = (ushort)(sectorCount ? 1 : 512);
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(sectorCount)
+                    {
+                        AaruConsole.Write("How many bytes to expect per sector?");
+                        strDev = System.Console.ReadLine();
+
+                        if(!ushort.TryParse(strDev, out bps))
+                        {
+                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
+                            bps = 512;
+                            System.Console.ReadKey();
+                        }
+                    }
+
+                    break;
+                case 2: goto start;
             }
         }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.HpReadLong(out byte[] buffer, out byte[] senseBuffer, relative, address, length, bps,
+                                    physical, sectorCount, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ LONG to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Hewlett-Packard vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Hewlett-Packard vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/Kreon.cs b/Aaru.Tests.Devices/SCSI/Kreon.cs
index c50ce66bb..fb037f2e8 100644
--- a/Aaru.Tests.Devices/SCSI/Kreon.cs
+++ b/Aaru.Tests.Devices/SCSI/Kreon.cs
@@ -32,439 +32,438 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Kreon
 {
-    internal static class Kreon
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a Kreon vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send EXTRACT SS command.");
-                AaruConsole.WriteLine("2.- Send GET FEATURE LIST command.");
-                AaruConsole.WriteLine("3.- Send SET LOCK STATE command.");
-                AaruConsole.WriteLine("4.- Send UNLOCK command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        ExtractSecuritySectors(devPath, dev);
-
-                        continue;
-                    case 2:
-                        GetFeatureList(devPath, dev);
-
-                        continue;
-                    case 3:
-                        SetLockState(devPath, dev);
-
-                        continue;
-                    case 4:
-                        Unlock(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void ExtractSecuritySectors(string devPath, Device dev)
-        {
-            byte   requestNumber = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for EXTRACT SS command:");
-                AaruConsole.WriteLine("Request number: {0}", requestNumber);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Request number?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out requestNumber))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            requestNumber = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.KreonExtractSs(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out double duration,
-                                            requestNumber);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending EXTRACT SS to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+            AaruConsole.WriteLine("Send a Kreon vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send EXTRACT SS command.");
+            AaruConsole.WriteLine("2.- Send GET FEATURE LIST command.");
+            AaruConsole.WriteLine("3.- Send SET LOCK STATE command.");
+            AaruConsole.WriteLine("4.- Send UNLOCK command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
             AaruConsole.Write("Choose: ");
 
-            strDev = System.Console.ReadLine();
+            string strDev = System.Console.ReadLine();
 
-            if(!int.TryParse(strDev, out item))
+            if(!int.TryParse(strDev, out int item))
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("EXTRACT SS response:");
+                    ExtractSecuritySectors(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("EXTRACT SS sense:");
+                    GetFeatureList(devPath, dev);
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("EXTRACT SS decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    SetLockState(devPath, dev);
 
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
+                    continue;
+                case 4:
+                    Unlock(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void GetFeatureList(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.KreonGetFeatureList(out byte[] senseBuffer, out KreonFeatures features, dev.Timeout,
-                                                 out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET FEATURE LIST to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("Features: {0}.", features);
-            AaruConsole.WriteLine("GET FEATURE LIST decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET FEATURE LIST sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SetLockState(string devPath, Device dev)
-        {
-            KreonLockStates state = KreonLockStates.Locked;
-            string          strDev;
-            int             item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SET LOCK STATE command:");
-                AaruConsole.WriteLine("Lock state: {0}", state);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.WriteLine("Lock state");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2}", KreonLockStates.Locked,
-                                              KreonLockStates.Wxripper, KreonLockStates.Xtreme);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out state))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            state = KreonLockStates.Locked;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-            bool sense = dev.KreonSetLockState(out byte[] senseBuffer, state, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SET LOCK STATE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("SET LOCK STATE decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("2.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
-
-                    return;
-                case 1: goto start;
-                case 2: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Unlock(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.KreonDeprecatedUnlock(out byte[] senseBuffer, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending UNLOCK to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("UNLOCK decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("UNLOCK sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void ExtractSecuritySectors(string devPath, Device dev)
+    {
+        byte   requestNumber = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for EXTRACT SS command:");
+            AaruConsole.WriteLine("Request number: {0}", requestNumber);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Request number?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out requestNumber))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        requestNumber = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.KreonExtractSs(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out double duration,
+                                        requestNumber);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending EXTRACT SS to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("EXTRACT SS response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("EXTRACT SS sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("EXTRACT SS decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void GetFeatureList(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.KreonGetFeatureList(out byte[] senseBuffer, out KreonFeatures features, dev.Timeout,
+                                             out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET FEATURE LIST to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("Features: {0}.", features);
+        AaruConsole.WriteLine("GET FEATURE LIST decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET FEATURE LIST sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SetLockState(string devPath, Device dev)
+    {
+        KreonLockStates state = KreonLockStates.Locked;
+        string          strDev;
+        int             item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SET LOCK STATE command:");
+            AaruConsole.WriteLine("Lock state: {0}", state);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.WriteLine("Lock state");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2}", KreonLockStates.Locked,
+                                          KreonLockStates.Wxripper, KreonLockStates.Xtreme);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out state))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        state = KreonLockStates.Locked;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+        bool sense = dev.KreonSetLockState(out byte[] senseBuffer, state, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SET LOCK STATE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("SET LOCK STATE decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("2.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
+                return;
+            case 1: goto start;
+            case 2: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Unlock(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.KreonDeprecatedUnlock(out byte[] senseBuffer, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending UNLOCK to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("UNLOCK decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Kreon vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Kreon vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("UNLOCK sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/MMC.cs b/Aaru.Tests.Devices/SCSI/MMC.cs
index 68a990b13..a52e1f0cf 100644
--- a/Aaru.Tests.Devices/SCSI/MMC.cs
+++ b/Aaru.Tests.Devices/SCSI/MMC.cs
@@ -34,2244 +34,2243 @@ using Aaru.Decoders.SCSI.MMC;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Mmc
 {
-    internal static class Mmc
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a MultiMedia Command to the device:");
-                AaruConsole.WriteLine("1.- Send GET CONFIGURATION command.");
-                AaruConsole.WriteLine("2.- Send PREVENT ALLOW MEDIUM REMOVAL command.");
-                AaruConsole.WriteLine("3.- Send READ CD command.");
-                AaruConsole.WriteLine("4.- Send READ CD MSF command.");
-                AaruConsole.WriteLine("5.- Send READ DISC INFORMATION command.");
-                AaruConsole.WriteLine("6.- Send READ DISC STRUCTURE command.");
-                AaruConsole.WriteLine("7.- Send READ TOC/PMA/ATIP command.");
-                AaruConsole.WriteLine("8.- Send START STOP UNIT command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        GetConfiguration(devPath, dev);
-
-                        continue;
-                    case 2:
-                        PreventAllowMediumRemoval(devPath, dev);
-
-                        continue;
-                    case 3:
-                        ReadCd(devPath, dev);
-
-                        continue;
-                    case 4:
-                        ReadCdMsf(devPath, dev);
-
-                        continue;
-                    case 5:
-                        ReadDiscInformation(devPath, dev);
-
-                        continue;
-                    case 6:
-                        ReadDiscStructure(devPath, dev);
-
-                        continue;
-                    case 7:
-                        ReadTocPmaAtip(devPath, dev);
-
-                        continue;
-                    case 8:
-                        StartStopUnit(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void GetConfiguration(string devPath, Device dev)
-        {
-            MmcGetConfigurationRt rt                    = MmcGetConfigurationRt.All;
-            ushort                startingFeatureNumber = 0;
-            string                strDev;
-            int                   item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for GET CONFIGURATION command:");
-                AaruConsole.WriteLine("RT: {0}", rt);
-                AaruConsole.WriteLine("Feature number: {0}", startingFeatureNumber);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.WriteLine("RT");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcGetConfigurationRt.All,
-                                              MmcGetConfigurationRt.Current, MmcGetConfigurationRt.Reserved,
-                                              MmcGetConfigurationRt.Single);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out rt))
-                        {
-                            AaruConsole.WriteLine("Not a correct object type. Press any key to continue...");
-                            rt = MmcGetConfigurationRt.All;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Feature number");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out startingFeatureNumber))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            startingFeatureNumber = 1;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.GetConfiguration(out byte[] buffer, out byte[] senseBuffer, startingFeatureNumber, rt,
-                                              dev.Timeout, out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET CONFIGURATION to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print sense buffer.");
-            AaruConsole.WriteLine("4.- Decode sense buffer.");
-            AaruConsole.WriteLine("5.- Send command again.");
-            AaruConsole.WriteLine("6.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+            AaruConsole.WriteLine("Send a MultiMedia Command to the device:");
+            AaruConsole.WriteLine("1.- Send GET CONFIGURATION command.");
+            AaruConsole.WriteLine("2.- Send PREVENT ALLOW MEDIUM REMOVAL command.");
+            AaruConsole.WriteLine("3.- Send READ CD command.");
+            AaruConsole.WriteLine("4.- Send READ CD MSF command.");
+            AaruConsole.WriteLine("5.- Send READ DISC INFORMATION command.");
+            AaruConsole.WriteLine("6.- Send READ DISC STRUCTURE command.");
+            AaruConsole.WriteLine("7.- Send READ TOC/PMA/ATIP command.");
+            AaruConsole.WriteLine("8.- Send START STOP UNIT command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
             AaruConsole.Write("Choose: ");
 
-            strDev = System.Console.ReadLine();
+            string strDev = System.Console.ReadLine();
 
-            if(!int.TryParse(strDev, out item))
+            if(!int.TryParse(strDev, out int item))
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET CONFIGURATION buffer:");
+                    GetConfiguration(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET CONFIGURATION decoded buffer:");
+                    PreventAllowMediumRemoval(devPath, dev);
 
-                    if(buffer != null)
-                    {
-                        Features.SeparatedFeatures ftr = Features.Separate(buffer);
-                        AaruConsole.WriteLine("GET CONFIGURATION length is {0} bytes", ftr.DataLength);
-                        AaruConsole.WriteLine("GET CONFIGURATION current profile is {0:X4}h", ftr.CurrentProfile);
-
-                        if(ftr.Descriptors != null)
-                            foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
-                            {
-                                AaruConsole.WriteLine("Feature {0:X4}h", desc.Code);
-
-                                switch(desc.Code)
-                                {
-                                    case 0x0000:
-                                        AaruConsole.Write("{0}", Features.Prettify_0000(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0001:
-                                        AaruConsole.Write("{0}", Features.Prettify_0001(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0002:
-                                        AaruConsole.Write("{0}", Features.Prettify_0002(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0003:
-                                        AaruConsole.Write("{0}", Features.Prettify_0003(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0004:
-                                        AaruConsole.Write("{0}", Features.Prettify_0004(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0010:
-                                        AaruConsole.Write("{0}", Features.Prettify_0010(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x001D:
-                                        AaruConsole.Write("{0}", Features.Prettify_001D(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x001E:
-                                        AaruConsole.Write("{0}", Features.Prettify_001E(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x001F:
-                                        AaruConsole.Write("{0}", Features.Prettify_001F(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0020:
-                                        AaruConsole.Write("{0}", Features.Prettify_0020(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0021:
-                                        AaruConsole.Write("{0}", Features.Prettify_0021(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0022:
-                                        AaruConsole.Write("{0}", Features.Prettify_0022(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0023:
-                                        AaruConsole.Write("{0}", Features.Prettify_0023(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0024:
-                                        AaruConsole.Write("{0}", Features.Prettify_0024(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0025:
-                                        AaruConsole.Write("{0}", Features.Prettify_0025(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0026:
-                                        AaruConsole.Write("{0}", Features.Prettify_0026(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0027:
-                                        AaruConsole.Write("{0}", Features.Prettify_0027(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0028:
-                                        AaruConsole.Write("{0}", Features.Prettify_0028(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0029:
-                                        AaruConsole.Write("{0}", Features.Prettify_0029(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x002A:
-                                        AaruConsole.Write("{0}", Features.Prettify_002A(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x002B:
-                                        AaruConsole.Write("{0}", Features.Prettify_002B(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x002C:
-                                        AaruConsole.Write("{0}", Features.Prettify_002C(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x002D:
-                                        AaruConsole.Write("{0}", Features.Prettify_002D(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x002E:
-                                        AaruConsole.Write("{0}", Features.Prettify_002E(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x002F:
-                                        AaruConsole.Write("{0}", Features.Prettify_002F(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0030:
-                                        AaruConsole.Write("{0}", Features.Prettify_0030(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0031:
-                                        AaruConsole.Write("{0}", Features.Prettify_0031(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0032:
-                                        AaruConsole.Write("{0}", Features.Prettify_0032(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0033:
-                                        AaruConsole.Write("{0}", Features.Prettify_0033(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0035:
-                                        AaruConsole.Write("{0}", Features.Prettify_0035(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0037:
-                                        AaruConsole.Write("{0}", Features.Prettify_0037(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0038:
-                                        AaruConsole.Write("{0}", Features.Prettify_0038(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x003A:
-                                        AaruConsole.Write("{0}", Features.Prettify_003A(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x003B:
-                                        AaruConsole.Write("{0}", Features.Prettify_003B(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0040:
-                                        AaruConsole.Write("{0}", Features.Prettify_0040(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0041:
-                                        AaruConsole.Write("{0}", Features.Prettify_0041(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0042:
-                                        AaruConsole.Write("{0}", Features.Prettify_0042(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0050:
-                                        AaruConsole.Write("{0}", Features.Prettify_0050(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0051:
-                                        AaruConsole.Write("{0}", Features.Prettify_0051(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0080:
-                                        AaruConsole.Write("{0}", Features.Prettify_0080(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0100:
-                                        AaruConsole.Write("{0}", Features.Prettify_0100(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0101:
-                                        AaruConsole.Write("{0}", Features.Prettify_0101(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0102:
-                                        AaruConsole.Write("{0}", Features.Prettify_0102(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0103:
-                                        AaruConsole.Write("{0}", Features.Prettify_0103(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0104:
-                                        AaruConsole.Write("{0}", Features.Prettify_0104(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0105:
-                                        AaruConsole.Write("{0}", Features.Prettify_0105(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0106:
-                                        AaruConsole.Write("{0}", Features.Prettify_0106(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0107:
-                                        AaruConsole.Write("{0}", Features.Prettify_0107(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0108:
-                                        AaruConsole.Write("{0}", Features.Prettify_0108(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0109:
-                                        AaruConsole.Write("{0}", Features.Prettify_0109(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x010A:
-                                        AaruConsole.Write("{0}", Features.Prettify_010A(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x010B:
-                                        AaruConsole.Write("{0}", Features.Prettify_010B(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x010C:
-                                        AaruConsole.Write("{0}", Features.Prettify_010C(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x010D:
-                                        AaruConsole.Write("{0}", Features.Prettify_010D(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x010E:
-                                        AaruConsole.Write("{0}", Features.Prettify_010E(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0110:
-                                        AaruConsole.Write("{0}", Features.Prettify_0110(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0113:
-                                        AaruConsole.Write("{0}", Features.Prettify_0113(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    case 0x0142:
-                                        AaruConsole.Write("{0}", Features.Prettify_0142(desc.Data));
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                    default:
-                                        AaruConsole.WriteLine("Don't know how to decode feature 0x{0:X4}", desc.Code);
-                                        PrintHex.PrintHexArray(desc.Data, 64);
-
-                                        break;
-                                }
-                            }
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET CONFIGURATION sense:");
+                    ReadCd(devPath, dev);
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET CONFIGURATION decoded sense:");
+                    ReadCdMsf(devPath, dev);
 
-                    if(senseBuffer != null)
-                        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                    continue;
+                case 5:
+                    ReadDiscInformation(devPath, dev);
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    continue;
+                case 6:
+                    ReadDiscStructure(devPath, dev);
 
-                    goto menu;
-                case 5: goto start;
-                case 6: goto parameters;
+                    continue;
+                case 7:
+                    ReadTocPmaAtip(devPath, dev);
+
+                    continue;
+                case 8:
+                    StartStopUnit(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void PreventAllowMediumRemoval(string devPath, Device dev)
-        {
-            bool   prevent    = false;
-            bool   persistent = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for PREVENT ALLOW MEDIUM REMOVAL command:");
-                AaruConsole.WriteLine("Prevent removal?: {0}", prevent);
-                AaruConsole.WriteLine("Persistent value?: {0}", persistent);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Prevent removal?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out prevent))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            prevent = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Persistent value?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out persistent))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            persistent = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PreventAllowMediumRemoval(out byte[] senseBuffer, persistent, prevent, dev.Timeout,
-                                                       out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending PREVENT ALLOW MEDIUM REMOVAL to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadCd(string devPath, Device dev)
-        {
-            uint           address    = 0;
-            uint           length     = 1;
-            MmcSectorTypes sectorType = MmcSectorTypes.AllTypes;
-            bool           dap        = false;
-            bool           relative   = false;
-            bool           sync       = false;
-            MmcHeaderCodes header     = MmcHeaderCodes.None;
-            bool           user       = true;
-            bool           edc        = false;
-            MmcErrorField  c2         = MmcErrorField.None;
-            MmcSubchannel  subchan    = MmcSubchannel.None;
-            uint           blockSize  = 2352;
-            string         strDev;
-            int            item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ CD command:");
-                AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
-                AaruConsole.WriteLine("{1}: {0}", address, relative ? "Address" : "LBA");
-                AaruConsole.WriteLine("Will transfer {0} sectors", length);
-                AaruConsole.WriteLine("Sector type: {0}", sectorType);
-                AaruConsole.WriteLine("Process audio?: {0}", dap);
-                AaruConsole.WriteLine("Retrieve sync bytes?: {0}", sync);
-                AaruConsole.WriteLine("Header mode: {0}", header);
-                AaruConsole.WriteLine("Retrieve user data?: {0}", user);
-                AaruConsole.WriteLine("Retrieve EDC/ECC data?: {0}", edc);
-                AaruConsole.WriteLine("C2 mode: {0}", c2);
-                AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
-                AaruConsole.WriteLine("{0} bytes per sector", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Address is relative to current position?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out relative))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            relative = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many sectors to transfer?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Sector type");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", MmcSectorTypes.AllTypes,
-                                              MmcSectorTypes.Cdda, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
-                                              MmcSectorTypes.Mode2Form1, MmcSectorTypes.Mode2Form2);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out sectorType))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            sectorType = MmcSectorTypes.AllTypes;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Process audio?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out dap))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            dap = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Retrieve sync bytes?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out sync))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            sync = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Header mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcHeaderCodes.None,
-                                              MmcHeaderCodes.HeaderOnly, MmcHeaderCodes.SubHeaderOnly,
-                                              MmcHeaderCodes.AllHeaders);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out header))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            header = MmcHeaderCodes.None;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Retrieve user data?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out user))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            user = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Retrieve EDC/ECC?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out edc))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            edc = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("C2 mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2}", MmcErrorField.None,
-                                              MmcErrorField.C2Pointers, MmcErrorField.C2PointersAndBlock);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out c2))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            c2 = MmcErrorField.None;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Subchannel mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcSubchannel.None,
-                                              MmcSubchannel.Raw, MmcSubchannel.Q16, MmcSubchannel.Rw);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out subchan))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            subchan = MmcSubchannel.None;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Expected block size?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 2352;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadCd(out byte[] buffer, out byte[] senseBuffer, address, blockSize, length, sectorType,
-                                    dap, relative, sync, header, user, edc, c2, subchan, dev.Timeout,
-                                    out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ CD to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadCdMsf(string devPath, Device dev)
-        {
-            byte           startFrame  = 0;
-            byte           startSecond = 2;
-            byte           startMinute = 0;
-            byte           endFrame    = 0;
-            byte           endSecond   = 0;
-            byte           endMinute   = 0;
-            MmcSectorTypes sectorType  = MmcSectorTypes.AllTypes;
-            bool           dap         = false;
-            bool           sync        = false;
-            MmcHeaderCodes header      = MmcHeaderCodes.None;
-            bool           user        = true;
-            bool           edc         = false;
-            MmcErrorField  c2          = MmcErrorField.None;
-            MmcSubchannel  subchan     = MmcSubchannel.None;
-            uint           blockSize   = 2352;
-            string         strDev;
-            int            item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ CD MSF command:");
-                AaruConsole.WriteLine("Start: {0:D2}:{1:D2}:{2:D2}", startMinute, startSecond, startFrame);
-                AaruConsole.WriteLine("End: {0:D2}:{1:D2}:{2:D2}", endMinute, endSecond, endFrame);
-                AaruConsole.WriteLine("Sector type: {0}", sectorType);
-                AaruConsole.WriteLine("Process audio?: {0}", dap);
-                AaruConsole.WriteLine("Retrieve sync bytes?: {0}", sync);
-                AaruConsole.WriteLine("Header mode: {0}", header);
-                AaruConsole.WriteLine("Retrieve user data?: {0}", user);
-                AaruConsole.WriteLine("Retrieve EDC/ECC data?: {0}", edc);
-                AaruConsole.WriteLine("C2 mode: {0}", c2);
-                AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
-                AaruConsole.WriteLine("{0} bytes per sector", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Start minute?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out startMinute))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            startMinute = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Start second?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out startSecond))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            startSecond = 2;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Start frame?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out startFrame))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            startFrame = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("End minute?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out endMinute))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            endMinute = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("End second?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out endMinute))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            endMinute = 2;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("End frame?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out endFrame))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            endFrame = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Sector type");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", MmcSectorTypes.AllTypes,
-                                              MmcSectorTypes.Cdda, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
-                                              MmcSectorTypes.Mode2Form1, MmcSectorTypes.Mode2Form2);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out sectorType))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            sectorType = MmcSectorTypes.AllTypes;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Process audio?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out dap))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            dap = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Retrieve sync bytes?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out sync))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            sync = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Header mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcHeaderCodes.None,
-                                              MmcHeaderCodes.HeaderOnly, MmcHeaderCodes.SubHeaderOnly,
-                                              MmcHeaderCodes.AllHeaders);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out header))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            header = MmcHeaderCodes.None;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Retrieve user data?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out user))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            user = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Retrieve EDC/ECC?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out edc))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            edc = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("C2 mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2}", MmcErrorField.None,
-                                              MmcErrorField.C2Pointers, MmcErrorField.C2PointersAndBlock);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out c2))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            c2 = MmcErrorField.None;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Subchannel mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcSubchannel.None,
-                                              MmcSubchannel.Raw, MmcSubchannel.Q16, MmcSubchannel.Rw);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out subchan))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            subchan = MmcSubchannel.None;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Expected block size?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 2352;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            uint startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
-            uint endMsf   = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
-            System.Console.Clear();
-
-            bool sense = dev.ReadCdMsf(out byte[] buffer, out byte[] senseBuffer, startMsf, endMsf, blockSize,
-                                       sectorType, dap, sync, header, user, edc, c2, subchan, dev.Timeout,
-                                       out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ CD MSF to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD MSF response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD MSF sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD MSF decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadDiscInformation(string devPath, Device dev)
-        {
-            MmcDiscInformationDataTypes info = MmcDiscInformationDataTypes.DiscInformation;
-            string                      strDev;
-            int                         item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ DISC INFORMATION command:");
-                AaruConsole.WriteLine("Information type: {0}", info);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.WriteLine("Information type");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2}",
-                                              MmcDiscInformationDataTypes.DiscInformation,
-                                              MmcDiscInformationDataTypes.TrackResources,
-                                              MmcDiscInformationDataTypes.PowResources);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out info))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            info = MmcDiscInformationDataTypes.DiscInformation;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadDiscInformation(out byte[] buffer, out byte[] senseBuffer, info, dev.Timeout,
-                                                 out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ DISC INFORMATION to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print sense buffer.");
-            AaruConsole.WriteLine("4.- Decode sense buffer.");
-            AaruConsole.WriteLine("5.- Send command again.");
-            AaruConsole.WriteLine("6.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DISC INFORMATION response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DISC INFORMATION decoded response:");
-                    AaruConsole.Write("{0}", DiscInformation.Prettify(buffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DISC INFORMATION sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DISC INFORMATION decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 5: goto start;
-                case 6: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadDiscStructure(string devPath, Device dev)
-        {
-            MmcDiscStructureMediaType mediaType = MmcDiscStructureMediaType.Dvd;
-            MmcDiscStructureFormat    format    = MmcDiscStructureFormat.CapabilityList;
-            uint                      address   = 0;
-            byte                      layer     = 0;
-            byte                      agid      = 0;
-            string                    strDev;
-            int                       item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ DISC STRUCTURE command:");
-                AaruConsole.WriteLine("Media type: {0}", mediaType);
-                AaruConsole.WriteLine("Format: {0}", format);
-                AaruConsole.WriteLine("Address: {0}", address);
-                AaruConsole.WriteLine("Layer: {0}", layer);
-                AaruConsole.WriteLine("AGID: {0}", agid);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.WriteLine("Media type");
-
-                        AaruConsole.WriteLine("Available values: {0} {1}", MmcDiscStructureMediaType.Dvd,
-                                              MmcDiscStructureMediaType.Bd);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out mediaType))
-                        {
-                            AaruConsole.WriteLine("Not a correct media type. Press any key to continue...");
-                            mediaType = MmcDiscStructureMediaType.Dvd;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Format");
-                        AaruConsole.WriteLine("Available values:");
-
-                        switch(mediaType)
-                        {
-                            case MmcDiscStructureMediaType.Dvd:
-                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.PhysicalInformation,
-                                                      MmcDiscStructureFormat.CopyrightInformation,
-                                                      MmcDiscStructureFormat.DiscKey,
-                                                      MmcDiscStructureFormat.BurstCuttingArea);
-
-                                AaruConsole.WriteLine("\t{0} {1} {2} {3}",
-                                                      MmcDiscStructureFormat.DiscManufacturingInformation,
-                                                      MmcDiscStructureFormat.SectorCopyrightInformation,
-                                                      MmcDiscStructureFormat.MediaIdentifier,
-                                                      MmcDiscStructureFormat.MediaKeyBlock);
-
-                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DvdramDds,
-                                                      MmcDiscStructureFormat.DvdramMediumStatus,
-                                                      MmcDiscStructureFormat.DvdramSpareAreaInformation,
-                                                      MmcDiscStructureFormat.DvdramRecordingType);
-
-                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.LastBorderOutRmd,
-                                                      MmcDiscStructureFormat.SpecifiedRmd,
-                                                      MmcDiscStructureFormat.PreRecordedInfo,
-                                                      MmcDiscStructureFormat.DvdrMediaIdentifier);
-
-                                AaruConsole.WriteLine("\t{0} {1} {2} {3}",
-                                                      MmcDiscStructureFormat.DvdrPhysicalInformation,
-                                                      MmcDiscStructureFormat.Adip,
-                                                      MmcDiscStructureFormat.HddvdCopyrightInformation,
-                                                      MmcDiscStructureFormat.DvdAacs);
-
-                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.HddvdrMediumStatus,
-                                                      MmcDiscStructureFormat.HddvdrLastRmd,
-                                                      MmcDiscStructureFormat.DvdrLayerCapacity,
-                                                      MmcDiscStructureFormat.MiddleZoneStart);
-
-                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.JumpIntervalSize,
-                                                      MmcDiscStructureFormat.ManualLayerJumpStartLba,
-                                                      MmcDiscStructureFormat.RemapAnchorPoint,
-                                                      MmcDiscStructureFormat.Dcb);
-
-                                break;
-                            case MmcDiscStructureMediaType.Bd:
-                                AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DiscInformation,
-                                                      MmcDiscStructureFormat.BdBurstCuttingArea,
-                                                      MmcDiscStructureFormat.BdDds,
-                                                      MmcDiscStructureFormat.CartridgeStatus);
-
-                                AaruConsole.WriteLine("\t{0} {1} {2}", MmcDiscStructureFormat.BdSpareAreaInformation,
-                                                      MmcDiscStructureFormat.RawDfl, MmcDiscStructureFormat.Pac);
-
-                                break;
-                        }
-
-                        AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AacsVolId,
-                                              MmcDiscStructureFormat.AacsMediaSerial,
-                                              MmcDiscStructureFormat.AacsMediaId, MmcDiscStructureFormat.Aacsmkb);
-
-                        AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AacsDataKeys,
-                                              MmcDiscStructureFormat.AacslbaExtents, MmcDiscStructureFormat.Aacsmkbcprm,
-                                              MmcDiscStructureFormat.RecognizedFormatLayers);
-
-                        AaruConsole.WriteLine("\t{0} {1}", MmcDiscStructureFormat.WriteProtectionStatus,
-                                              MmcDiscStructureFormat.CapabilityList);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out format))
-                        {
-                            AaruConsole.WriteLine("Not a correct media type. Press any key to continue...");
-                            format = MmcDiscStructureFormat.CapabilityList;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Layer?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out layer))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            layer = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("AGID?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out agid))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            agid = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadDiscStructure(out byte[] buffer, out byte[] senseBuffer, mediaType, address, layer,
-                                               format, agid, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ DISC STRUCTURE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print sense buffer.");
-            AaruConsole.WriteLine("4.- Decode sense buffer.");
-            AaruConsole.WriteLine("5.- Send command again.");
-            AaruConsole.WriteLine("6.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DISC STRUCTURE response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    // TODO: Implement
-                    AaruConsole.WriteLine("READ DISC STRUCTURE decoding not yet implemented:");
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DISC STRUCTURE sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DISC STRUCTURE decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 5: goto start;
-                case 6: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadTocPmaAtip(string devPath, Device dev)
-        {
-            bool   msf     = false;
-            byte   format  = 0;
-            byte   session = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ TOC/PMA/ATIP command:");
-                AaruConsole.WriteLine("Return MSF values?: {0}", msf);
-                AaruConsole.WriteLine("Format byte: {0}", format);
-                AaruConsole.WriteLine("Session: {0}", session);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Return MSF values?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out msf))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            msf = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Format?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out format))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            format = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Session?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out session))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            session = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadTocPmaAtip(out byte[] buffer, out byte[] senseBuffer, msf, format, session,
-                                            dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ TOC/PMA/ATIP to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print sense buffer.");
-            AaruConsole.WriteLine("4.- Decode sense buffer.");
-            AaruConsole.WriteLine("5.- Send command again.");
-            AaruConsole.WriteLine("6.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ TOC/PMA/ATIP buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ TOC/PMA/ATIP decoded buffer:");
-
-                    if(buffer != null)
-                        switch(format)
-                        {
-                            case 0:
-                                AaruConsole.Write("{0}", TOC.Prettify(buffer));
-                                PrintHex.PrintHexArray(buffer, 64);
-
-                                break;
-                            case 1:
-                                AaruConsole.Write("{0}", Session.Prettify(buffer));
-                                PrintHex.PrintHexArray(buffer, 64);
-
-                                break;
-                            case 2:
-                                AaruConsole.Write("{0}", FullTOC.Prettify(buffer));
-                                PrintHex.PrintHexArray(buffer, 64);
-
-                                break;
-                            case 3:
-                                AaruConsole.Write("{0}", PMA.Prettify(buffer));
-                                PrintHex.PrintHexArray(buffer, 64);
-
-                                break;
-                            case 4:
-                                AaruConsole.Write("{0}", ATIP.Prettify(buffer));
-                                PrintHex.PrintHexArray(buffer, 64);
-
-                                break;
-                            case 5:
-                                AaruConsole.Write("{0}", CDTextOnLeadIn.Prettify(buffer));
-                                PrintHex.PrintHexArray(buffer, 64);
-
-                                break;
-                        }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ TOC/PMA/ATIP sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ TOC/PMA/ATIP decoded sense:");
-
-                    if(senseBuffer != null)
-                        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 5: goto start;
-                case 6: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void StartStopUnit(string devPath, Device dev)
-        {
-            bool   immediate         = false;
-            bool   changeFormatLayer = false;
-            bool   loadEject         = false;
-            bool   start             = false;
-            byte   formatLayer       = 0;
-            byte   powerConditions   = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for START STOP UNIT command:");
-                AaruConsole.WriteLine("Immediate?: {0}", immediate);
-                AaruConsole.WriteLine("Change format layer?: {0}", changeFormatLayer);
-                AaruConsole.WriteLine("Eject?: {0}", loadEject);
-                AaruConsole.WriteLine("Start?: {0}", start);
-                AaruConsole.WriteLine("Format layer: {0}", formatLayer);
-                AaruConsole.WriteLine("Power conditions: {0}", powerConditions);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Immediate?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out immediate))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            immediate = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Change format layer?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out changeFormatLayer))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            changeFormatLayer = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Eject?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out loadEject))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            loadEject = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Start?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out start))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            start = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Format layer?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out formatLayer))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            formatLayer = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Power conditions?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out powerConditions))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            powerConditions = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.StartStopUnit(out byte[] senseBuffer, immediate, formatLayer, powerConditions,
-                                           changeFormatLayer, loadEject, start, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending START STOP UNIT to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("START STOP UNIT decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("START STOP UNIT sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void GetConfiguration(string devPath, Device dev)
+    {
+        MmcGetConfigurationRt rt                    = MmcGetConfigurationRt.All;
+        ushort                startingFeatureNumber = 0;
+        string                strDev;
+        int                   item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for GET CONFIGURATION command:");
+            AaruConsole.WriteLine("RT: {0}", rt);
+            AaruConsole.WriteLine("Feature number: {0}", startingFeatureNumber);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.WriteLine("RT");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcGetConfigurationRt.All,
+                                          MmcGetConfigurationRt.Current, MmcGetConfigurationRt.Reserved,
+                                          MmcGetConfigurationRt.Single);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out rt))
+                    {
+                        AaruConsole.WriteLine("Not a correct object type. Press any key to continue...");
+                        rt = MmcGetConfigurationRt.All;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Feature number");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out startingFeatureNumber))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        startingFeatureNumber = 1;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.GetConfiguration(out byte[] buffer, out byte[] senseBuffer, startingFeatureNumber, rt,
+                                          dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET CONFIGURATION to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print sense buffer.");
+        AaruConsole.WriteLine("4.- Decode sense buffer.");
+        AaruConsole.WriteLine("5.- Send command again.");
+        AaruConsole.WriteLine("6.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET CONFIGURATION buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET CONFIGURATION decoded buffer:");
+
+                if(buffer != null)
+                {
+                    Features.SeparatedFeatures ftr = Features.Separate(buffer);
+                    AaruConsole.WriteLine("GET CONFIGURATION length is {0} bytes", ftr.DataLength);
+                    AaruConsole.WriteLine("GET CONFIGURATION current profile is {0:X4}h", ftr.CurrentProfile);
+
+                    if(ftr.Descriptors != null)
+                        foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
+                        {
+                            AaruConsole.WriteLine("Feature {0:X4}h", desc.Code);
+
+                            switch(desc.Code)
+                            {
+                                case 0x0000:
+                                    AaruConsole.Write("{0}", Features.Prettify_0000(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0001:
+                                    AaruConsole.Write("{0}", Features.Prettify_0001(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0002:
+                                    AaruConsole.Write("{0}", Features.Prettify_0002(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0003:
+                                    AaruConsole.Write("{0}", Features.Prettify_0003(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0004:
+                                    AaruConsole.Write("{0}", Features.Prettify_0004(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0010:
+                                    AaruConsole.Write("{0}", Features.Prettify_0010(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x001D:
+                                    AaruConsole.Write("{0}", Features.Prettify_001D(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x001E:
+                                    AaruConsole.Write("{0}", Features.Prettify_001E(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x001F:
+                                    AaruConsole.Write("{0}", Features.Prettify_001F(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0020:
+                                    AaruConsole.Write("{0}", Features.Prettify_0020(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0021:
+                                    AaruConsole.Write("{0}", Features.Prettify_0021(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0022:
+                                    AaruConsole.Write("{0}", Features.Prettify_0022(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0023:
+                                    AaruConsole.Write("{0}", Features.Prettify_0023(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0024:
+                                    AaruConsole.Write("{0}", Features.Prettify_0024(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0025:
+                                    AaruConsole.Write("{0}", Features.Prettify_0025(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0026:
+                                    AaruConsole.Write("{0}", Features.Prettify_0026(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0027:
+                                    AaruConsole.Write("{0}", Features.Prettify_0027(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0028:
+                                    AaruConsole.Write("{0}", Features.Prettify_0028(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0029:
+                                    AaruConsole.Write("{0}", Features.Prettify_0029(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x002A:
+                                    AaruConsole.Write("{0}", Features.Prettify_002A(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x002B:
+                                    AaruConsole.Write("{0}", Features.Prettify_002B(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x002C:
+                                    AaruConsole.Write("{0}", Features.Prettify_002C(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x002D:
+                                    AaruConsole.Write("{0}", Features.Prettify_002D(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x002E:
+                                    AaruConsole.Write("{0}", Features.Prettify_002E(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x002F:
+                                    AaruConsole.Write("{0}", Features.Prettify_002F(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0030:
+                                    AaruConsole.Write("{0}", Features.Prettify_0030(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0031:
+                                    AaruConsole.Write("{0}", Features.Prettify_0031(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0032:
+                                    AaruConsole.Write("{0}", Features.Prettify_0032(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0033:
+                                    AaruConsole.Write("{0}", Features.Prettify_0033(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0035:
+                                    AaruConsole.Write("{0}", Features.Prettify_0035(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0037:
+                                    AaruConsole.Write("{0}", Features.Prettify_0037(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0038:
+                                    AaruConsole.Write("{0}", Features.Prettify_0038(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x003A:
+                                    AaruConsole.Write("{0}", Features.Prettify_003A(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x003B:
+                                    AaruConsole.Write("{0}", Features.Prettify_003B(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0040:
+                                    AaruConsole.Write("{0}", Features.Prettify_0040(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0041:
+                                    AaruConsole.Write("{0}", Features.Prettify_0041(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0042:
+                                    AaruConsole.Write("{0}", Features.Prettify_0042(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0050:
+                                    AaruConsole.Write("{0}", Features.Prettify_0050(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0051:
+                                    AaruConsole.Write("{0}", Features.Prettify_0051(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0080:
+                                    AaruConsole.Write("{0}", Features.Prettify_0080(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0100:
+                                    AaruConsole.Write("{0}", Features.Prettify_0100(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0101:
+                                    AaruConsole.Write("{0}", Features.Prettify_0101(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0102:
+                                    AaruConsole.Write("{0}", Features.Prettify_0102(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0103:
+                                    AaruConsole.Write("{0}", Features.Prettify_0103(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0104:
+                                    AaruConsole.Write("{0}", Features.Prettify_0104(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0105:
+                                    AaruConsole.Write("{0}", Features.Prettify_0105(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0106:
+                                    AaruConsole.Write("{0}", Features.Prettify_0106(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0107:
+                                    AaruConsole.Write("{0}", Features.Prettify_0107(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0108:
+                                    AaruConsole.Write("{0}", Features.Prettify_0108(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0109:
+                                    AaruConsole.Write("{0}", Features.Prettify_0109(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x010A:
+                                    AaruConsole.Write("{0}", Features.Prettify_010A(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x010B:
+                                    AaruConsole.Write("{0}", Features.Prettify_010B(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x010C:
+                                    AaruConsole.Write("{0}", Features.Prettify_010C(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x010D:
+                                    AaruConsole.Write("{0}", Features.Prettify_010D(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x010E:
+                                    AaruConsole.Write("{0}", Features.Prettify_010E(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0110:
+                                    AaruConsole.Write("{0}", Features.Prettify_0110(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0113:
+                                    AaruConsole.Write("{0}", Features.Prettify_0113(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                case 0x0142:
+                                    AaruConsole.Write("{0}", Features.Prettify_0142(desc.Data));
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                                default:
+                                    AaruConsole.WriteLine("Don't know how to decode feature 0x{0:X4}", desc.Code);
+                                    PrintHex.PrintHexArray(desc.Data, 64);
+
+                                    break;
+                            }
+                        }
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET CONFIGURATION sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET CONFIGURATION decoded sense:");
+
+                if(senseBuffer != null)
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 5: goto start;
+            case 6: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void PreventAllowMediumRemoval(string devPath, Device dev)
+    {
+        bool   prevent    = false;
+        bool   persistent = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for PREVENT ALLOW MEDIUM REMOVAL command:");
+            AaruConsole.WriteLine("Prevent removal?: {0}", prevent);
+            AaruConsole.WriteLine("Persistent value?: {0}", persistent);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Prevent removal?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out prevent))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        prevent = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Persistent value?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out persistent))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        persistent = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PreventAllowMediumRemoval(out byte[] senseBuffer, persistent, prevent, dev.Timeout,
+                                                   out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending PREVENT ALLOW MEDIUM REMOVAL to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadCd(string devPath, Device dev)
+    {
+        uint           address    = 0;
+        uint           length     = 1;
+        MmcSectorTypes sectorType = MmcSectorTypes.AllTypes;
+        bool           dap        = false;
+        bool           relative   = false;
+        bool           sync       = false;
+        MmcHeaderCodes header     = MmcHeaderCodes.None;
+        bool           user       = true;
+        bool           edc        = false;
+        MmcErrorField  c2         = MmcErrorField.None;
+        MmcSubchannel  subchan    = MmcSubchannel.None;
+        uint           blockSize  = 2352;
+        string         strDev;
+        int            item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ CD command:");
+            AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
+            AaruConsole.WriteLine("{1}: {0}", address, relative ? "Address" : "LBA");
+            AaruConsole.WriteLine("Will transfer {0} sectors", length);
+            AaruConsole.WriteLine("Sector type: {0}", sectorType);
+            AaruConsole.WriteLine("Process audio?: {0}", dap);
+            AaruConsole.WriteLine("Retrieve sync bytes?: {0}", sync);
+            AaruConsole.WriteLine("Header mode: {0}", header);
+            AaruConsole.WriteLine("Retrieve user data?: {0}", user);
+            AaruConsole.WriteLine("Retrieve EDC/ECC data?: {0}", edc);
+            AaruConsole.WriteLine("C2 mode: {0}", c2);
+            AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
+            AaruConsole.WriteLine("{0} bytes per sector", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Address is relative to current position?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out relative))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        relative = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many sectors to transfer?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Sector type");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", MmcSectorTypes.AllTypes,
+                                          MmcSectorTypes.Cdda, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
+                                          MmcSectorTypes.Mode2Form1, MmcSectorTypes.Mode2Form2);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out sectorType))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        sectorType = MmcSectorTypes.AllTypes;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Process audio?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out dap))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        dap = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Retrieve sync bytes?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out sync))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        sync = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Header mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcHeaderCodes.None,
+                                          MmcHeaderCodes.HeaderOnly, MmcHeaderCodes.SubHeaderOnly,
+                                          MmcHeaderCodes.AllHeaders);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out header))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        header = MmcHeaderCodes.None;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Retrieve user data?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out user))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        user = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Retrieve EDC/ECC?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out edc))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        edc = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("C2 mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2}", MmcErrorField.None,
+                                          MmcErrorField.C2Pointers, MmcErrorField.C2PointersAndBlock);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out c2))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        c2 = MmcErrorField.None;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Subchannel mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcSubchannel.None,
+                                          MmcSubchannel.Raw, MmcSubchannel.Q16, MmcSubchannel.Rw);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out subchan))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        subchan = MmcSubchannel.None;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Expected block size?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 2352;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadCd(out byte[] buffer, out byte[] senseBuffer, address, blockSize, length, sectorType,
+                                dap, relative, sync, header, user, edc, c2, subchan, dev.Timeout,
+                                out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ CD to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadCdMsf(string devPath, Device dev)
+    {
+        byte           startFrame  = 0;
+        byte           startSecond = 2;
+        byte           startMinute = 0;
+        byte           endFrame    = 0;
+        byte           endSecond   = 0;
+        byte           endMinute   = 0;
+        MmcSectorTypes sectorType  = MmcSectorTypes.AllTypes;
+        bool           dap         = false;
+        bool           sync        = false;
+        MmcHeaderCodes header      = MmcHeaderCodes.None;
+        bool           user        = true;
+        bool           edc         = false;
+        MmcErrorField  c2          = MmcErrorField.None;
+        MmcSubchannel  subchan     = MmcSubchannel.None;
+        uint           blockSize   = 2352;
+        string         strDev;
+        int            item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ CD MSF command:");
+            AaruConsole.WriteLine("Start: {0:D2}:{1:D2}:{2:D2}", startMinute, startSecond, startFrame);
+            AaruConsole.WriteLine("End: {0:D2}:{1:D2}:{2:D2}", endMinute, endSecond, endFrame);
+            AaruConsole.WriteLine("Sector type: {0}", sectorType);
+            AaruConsole.WriteLine("Process audio?: {0}", dap);
+            AaruConsole.WriteLine("Retrieve sync bytes?: {0}", sync);
+            AaruConsole.WriteLine("Header mode: {0}", header);
+            AaruConsole.WriteLine("Retrieve user data?: {0}", user);
+            AaruConsole.WriteLine("Retrieve EDC/ECC data?: {0}", edc);
+            AaruConsole.WriteLine("C2 mode: {0}", c2);
+            AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
+            AaruConsole.WriteLine("{0} bytes per sector", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Start minute?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out startMinute))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        startMinute = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Start second?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out startSecond))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        startSecond = 2;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Start frame?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out startFrame))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        startFrame = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("End minute?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out endMinute))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        endMinute = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("End second?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out endMinute))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        endMinute = 2;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("End frame?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out endFrame))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        endFrame = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Sector type");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", MmcSectorTypes.AllTypes,
+                                          MmcSectorTypes.Cdda, MmcSectorTypes.Mode1, MmcSectorTypes.Mode2,
+                                          MmcSectorTypes.Mode2Form1, MmcSectorTypes.Mode2Form2);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out sectorType))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        sectorType = MmcSectorTypes.AllTypes;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Process audio?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out dap))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        dap = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Retrieve sync bytes?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out sync))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        sync = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Header mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcHeaderCodes.None,
+                                          MmcHeaderCodes.HeaderOnly, MmcHeaderCodes.SubHeaderOnly,
+                                          MmcHeaderCodes.AllHeaders);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out header))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        header = MmcHeaderCodes.None;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Retrieve user data?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out user))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        user = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Retrieve EDC/ECC?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out edc))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        edc = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("C2 mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2}", MmcErrorField.None,
+                                          MmcErrorField.C2Pointers, MmcErrorField.C2PointersAndBlock);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out c2))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        c2 = MmcErrorField.None;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Subchannel mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", MmcSubchannel.None,
+                                          MmcSubchannel.Raw, MmcSubchannel.Q16, MmcSubchannel.Rw);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out subchan))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        subchan = MmcSubchannel.None;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Expected block size?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 2352;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        uint startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
+        uint endMsf   = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
+        System.Console.Clear();
+
+        bool sense = dev.ReadCdMsf(out byte[] buffer, out byte[] senseBuffer, startMsf, endMsf, blockSize,
+                                   sectorType, dap, sync, header, user, edc, c2, subchan, dev.Timeout,
+                                   out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ CD MSF to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD MSF response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD MSF sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD MSF decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadDiscInformation(string devPath, Device dev)
+    {
+        MmcDiscInformationDataTypes info = MmcDiscInformationDataTypes.DiscInformation;
+        string                      strDev;
+        int                         item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ DISC INFORMATION command:");
+            AaruConsole.WriteLine("Information type: {0}", info);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.WriteLine("Information type");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2}",
+                                          MmcDiscInformationDataTypes.DiscInformation,
+                                          MmcDiscInformationDataTypes.TrackResources,
+                                          MmcDiscInformationDataTypes.PowResources);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out info))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        info = MmcDiscInformationDataTypes.DiscInformation;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadDiscInformation(out byte[] buffer, out byte[] senseBuffer, info, dev.Timeout,
+                                             out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ DISC INFORMATION to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print sense buffer.");
+        AaruConsole.WriteLine("4.- Decode sense buffer.");
+        AaruConsole.WriteLine("5.- Send command again.");
+        AaruConsole.WriteLine("6.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DISC INFORMATION response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DISC INFORMATION decoded response:");
+                AaruConsole.Write("{0}", DiscInformation.Prettify(buffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DISC INFORMATION sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DISC INFORMATION decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 5: goto start;
+            case 6: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadDiscStructure(string devPath, Device dev)
+    {
+        MmcDiscStructureMediaType mediaType = MmcDiscStructureMediaType.Dvd;
+        MmcDiscStructureFormat    format    = MmcDiscStructureFormat.CapabilityList;
+        uint                      address   = 0;
+        byte                      layer     = 0;
+        byte                      agid      = 0;
+        string                    strDev;
+        int                       item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ DISC STRUCTURE command:");
+            AaruConsole.WriteLine("Media type: {0}", mediaType);
+            AaruConsole.WriteLine("Format: {0}", format);
+            AaruConsole.WriteLine("Address: {0}", address);
+            AaruConsole.WriteLine("Layer: {0}", layer);
+            AaruConsole.WriteLine("AGID: {0}", agid);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.WriteLine("Media type");
+
+                    AaruConsole.WriteLine("Available values: {0} {1}", MmcDiscStructureMediaType.Dvd,
+                                          MmcDiscStructureMediaType.Bd);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out mediaType))
+                    {
+                        AaruConsole.WriteLine("Not a correct media type. Press any key to continue...");
+                        mediaType = MmcDiscStructureMediaType.Dvd;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Format");
+                    AaruConsole.WriteLine("Available values:");
+
+                    switch(mediaType)
+                    {
+                        case MmcDiscStructureMediaType.Dvd:
+                            AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.PhysicalInformation,
+                                                  MmcDiscStructureFormat.CopyrightInformation,
+                                                  MmcDiscStructureFormat.DiscKey,
+                                                  MmcDiscStructureFormat.BurstCuttingArea);
+
+                            AaruConsole.WriteLine("\t{0} {1} {2} {3}",
+                                                  MmcDiscStructureFormat.DiscManufacturingInformation,
+                                                  MmcDiscStructureFormat.SectorCopyrightInformation,
+                                                  MmcDiscStructureFormat.MediaIdentifier,
+                                                  MmcDiscStructureFormat.MediaKeyBlock);
+
+                            AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DvdramDds,
+                                                  MmcDiscStructureFormat.DvdramMediumStatus,
+                                                  MmcDiscStructureFormat.DvdramSpareAreaInformation,
+                                                  MmcDiscStructureFormat.DvdramRecordingType);
+
+                            AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.LastBorderOutRmd,
+                                                  MmcDiscStructureFormat.SpecifiedRmd,
+                                                  MmcDiscStructureFormat.PreRecordedInfo,
+                                                  MmcDiscStructureFormat.DvdrMediaIdentifier);
+
+                            AaruConsole.WriteLine("\t{0} {1} {2} {3}",
+                                                  MmcDiscStructureFormat.DvdrPhysicalInformation,
+                                                  MmcDiscStructureFormat.Adip,
+                                                  MmcDiscStructureFormat.HddvdCopyrightInformation,
+                                                  MmcDiscStructureFormat.DvdAacs);
+
+                            AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.HddvdrMediumStatus,
+                                                  MmcDiscStructureFormat.HddvdrLastRmd,
+                                                  MmcDiscStructureFormat.DvdrLayerCapacity,
+                                                  MmcDiscStructureFormat.MiddleZoneStart);
+
+                            AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.JumpIntervalSize,
+                                                  MmcDiscStructureFormat.ManualLayerJumpStartLba,
+                                                  MmcDiscStructureFormat.RemapAnchorPoint,
+                                                  MmcDiscStructureFormat.Dcb);
+
+                            break;
+                        case MmcDiscStructureMediaType.Bd:
+                            AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.DiscInformation,
+                                                  MmcDiscStructureFormat.BdBurstCuttingArea,
+                                                  MmcDiscStructureFormat.BdDds,
+                                                  MmcDiscStructureFormat.CartridgeStatus);
+
+                            AaruConsole.WriteLine("\t{0} {1} {2}", MmcDiscStructureFormat.BdSpareAreaInformation,
+                                                  MmcDiscStructureFormat.RawDfl, MmcDiscStructureFormat.Pac);
+
+                            break;
+                    }
+
+                    AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AacsVolId,
+                                          MmcDiscStructureFormat.AacsMediaSerial,
+                                          MmcDiscStructureFormat.AacsMediaId, MmcDiscStructureFormat.Aacsmkb);
+
+                    AaruConsole.WriteLine("\t{0} {1} {2} {3}", MmcDiscStructureFormat.AacsDataKeys,
+                                          MmcDiscStructureFormat.AacslbaExtents, MmcDiscStructureFormat.Aacsmkbcprm,
+                                          MmcDiscStructureFormat.RecognizedFormatLayers);
+
+                    AaruConsole.WriteLine("\t{0} {1}", MmcDiscStructureFormat.WriteProtectionStatus,
+                                          MmcDiscStructureFormat.CapabilityList);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out format))
+                    {
+                        AaruConsole.WriteLine("Not a correct media type. Press any key to continue...");
+                        format = MmcDiscStructureFormat.CapabilityList;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Layer?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out layer))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        layer = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("AGID?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out agid))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        agid = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadDiscStructure(out byte[] buffer, out byte[] senseBuffer, mediaType, address, layer,
+                                           format, agid, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ DISC STRUCTURE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print sense buffer.");
+        AaruConsole.WriteLine("4.- Decode sense buffer.");
+        AaruConsole.WriteLine("5.- Send command again.");
+        AaruConsole.WriteLine("6.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DISC STRUCTURE response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                // TODO: Implement
+                AaruConsole.WriteLine("READ DISC STRUCTURE decoding not yet implemented:");
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DISC STRUCTURE sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DISC STRUCTURE decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 5: goto start;
+            case 6: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadTocPmaAtip(string devPath, Device dev)
+    {
+        bool   msf     = false;
+        byte   format  = 0;
+        byte   session = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ TOC/PMA/ATIP command:");
+            AaruConsole.WriteLine("Return MSF values?: {0}", msf);
+            AaruConsole.WriteLine("Format byte: {0}", format);
+            AaruConsole.WriteLine("Session: {0}", session);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Return MSF values?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out msf))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        msf = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Format?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out format))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        format = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Session?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out session))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        session = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadTocPmaAtip(out byte[] buffer, out byte[] senseBuffer, msf, format, session,
+                                        dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ TOC/PMA/ATIP to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print sense buffer.");
+        AaruConsole.WriteLine("4.- Decode sense buffer.");
+        AaruConsole.WriteLine("5.- Send command again.");
+        AaruConsole.WriteLine("6.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ TOC/PMA/ATIP buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ TOC/PMA/ATIP decoded buffer:");
+
+                if(buffer != null)
+                    switch(format)
+                    {
+                        case 0:
+                            AaruConsole.Write("{0}", TOC.Prettify(buffer));
+                            PrintHex.PrintHexArray(buffer, 64);
+
+                            break;
+                        case 1:
+                            AaruConsole.Write("{0}", Session.Prettify(buffer));
+                            PrintHex.PrintHexArray(buffer, 64);
+
+                            break;
+                        case 2:
+                            AaruConsole.Write("{0}", FullTOC.Prettify(buffer));
+                            PrintHex.PrintHexArray(buffer, 64);
+
+                            break;
+                        case 3:
+                            AaruConsole.Write("{0}", PMA.Prettify(buffer));
+                            PrintHex.PrintHexArray(buffer, 64);
+
+                            break;
+                        case 4:
+                            AaruConsole.Write("{0}", ATIP.Prettify(buffer));
+                            PrintHex.PrintHexArray(buffer, 64);
+
+                            break;
+                        case 5:
+                            AaruConsole.Write("{0}", CDTextOnLeadIn.Prettify(buffer));
+                            PrintHex.PrintHexArray(buffer, 64);
+
+                            break;
+                    }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ TOC/PMA/ATIP sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ TOC/PMA/ATIP decoded sense:");
+
+                if(senseBuffer != null)
+                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 5: goto start;
+            case 6: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void StartStopUnit(string devPath, Device dev)
+    {
+        bool   immediate         = false;
+        bool   changeFormatLayer = false;
+        bool   loadEject         = false;
+        bool   start             = false;
+        byte   formatLayer       = 0;
+        byte   powerConditions   = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for START STOP UNIT command:");
+            AaruConsole.WriteLine("Immediate?: {0}", immediate);
+            AaruConsole.WriteLine("Change format layer?: {0}", changeFormatLayer);
+            AaruConsole.WriteLine("Eject?: {0}", loadEject);
+            AaruConsole.WriteLine("Start?: {0}", start);
+            AaruConsole.WriteLine("Format layer: {0}", formatLayer);
+            AaruConsole.WriteLine("Power conditions: {0}", powerConditions);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Immediate?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out immediate))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        immediate = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Change format layer?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out changeFormatLayer))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        changeFormatLayer = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Eject?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out loadEject))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        loadEject = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Start?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out start))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        start = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Format layer?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out formatLayer))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        formatLayer = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Power conditions?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out powerConditions))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        powerConditions = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.StartStopUnit(out byte[] senseBuffer, immediate, formatLayer, powerConditions,
+                                       changeFormatLayer, loadEject, start, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending START STOP UNIT to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("START STOP UNIT decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI MultiMedia Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("START STOP UNIT sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/NEC.cs b/Aaru.Tests.Devices/SCSI/NEC.cs
index cbde8f9d4..2369c72c4 100644
--- a/Aaru.Tests.Devices/SCSI/NEC.cs
+++ b/Aaru.Tests.Devices/SCSI/NEC.cs
@@ -31,140 +31,71 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Nec
 {
-    internal static class Nec
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a NEC vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send READ CD-DA command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a NEC vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send READ CD-DA command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
+                    return;
+                case 1:
+                    ReadCdDa(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        ReadCdDa(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
+    }
 
-        static void ReadCdDa(string devPath, Device dev)
+    static void ReadCdDa(string devPath, Device dev)
+    {
+        uint   address = 0;
+        uint   length  = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
         {
-            uint   address = 0;
-            uint   length  = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ CD-DA command:");
-                AaruConsole.WriteLine("LBA: {0}", address);
-                AaruConsole.WriteLine("Will transfer {0} sectors", length);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to NEC vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to NEC vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Logical Block Address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many sectors to transfer?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = 1;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.NecReadCdDa(out byte[] buffer, out byte[] senseBuffer, address, length, dev.Timeout,
-                                         out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ CD-DA to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("Parameters for READ CD-DA command:");
+            AaruConsole.WriteLine("LBA: {0}", address);
+            AaruConsole.WriteLine("Will transfer {0} sectors", length);
             AaruConsole.WriteLine();
             AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
             AaruConsole.WriteLine("0.- Return to NEC vendor commands menu.");
-            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
 
@@ -172,9 +103,8 @@ namespace Aaru.Tests.Devices.SCSI
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
@@ -184,53 +114,122 @@ namespace Aaru.Tests.Devices.SCSI
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA response:");
+                    AaruConsole.Write("Logical Block Address?: ");
+                    strDev = System.Console.ReadLine();
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                        continue;
+                    }
 
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA sense:");
+                    AaruConsole.Write("How many sectors to transfer?: ");
+                    strDev = System.Console.ReadLine();
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
+                    if(!uint.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = 1;
+                        System.Console.ReadKey();
+                    }
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
+                    break;
+                case 2: goto start;
             }
         }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.NecReadCdDa(out byte[] buffer, out byte[] senseBuffer, address, length, dev.Timeout,
+                                     out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ CD-DA to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to NEC vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to NEC vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/Pioneer.cs b/Aaru.Tests.Devices/SCSI/Pioneer.cs
index 0cd029cb2..c08d5019d 100644
--- a/Aaru.Tests.Devices/SCSI/Pioneer.cs
+++ b/Aaru.Tests.Devices/SCSI/Pioneer.cs
@@ -32,700 +32,699 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Pioneer
 {
-    internal static class Pioneer
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a Pioneer vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send READ CD-DA command.");
-                AaruConsole.WriteLine("2.- Send READ CD-DA MSF command.");
-                AaruConsole.WriteLine("3.- Send READ CD-XA command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        ReadCdDa(devPath, dev);
-
-                        continue;
-                    case 2:
-                        ReadCdDaMsf(devPath, dev);
-
-                        continue;
-                    case 3:
-                        ReadCdXa(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void ReadCdDa(string devPath, Device dev)
-        {
-            uint              address   = 0;
-            uint              length    = 1;
-            PioneerSubchannel subchan   = PioneerSubchannel.None;
-            uint              blockSize = 2352;
-            string            strDev;
-            int               item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ CD-DA command:");
-                AaruConsole.WriteLine("LBA: {0}", address);
-                AaruConsole.WriteLine("Will transfer {0} sectors", length);
-                AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
-                AaruConsole.WriteLine("{0} bytes per sectors", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Logical Block Address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many sectors to transfer?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Subchannel mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", PioneerSubchannel.None,
-                                              PioneerSubchannel.Q16, PioneerSubchannel.All, PioneerSubchannel.Only);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out subchan))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            subchan = PioneerSubchannel.None;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        switch(subchan)
-                        {
-                            case PioneerSubchannel.Q16:
-                                blockSize = 2368;
-
-                                break;
-                            case PioneerSubchannel.All:
-                                blockSize = 2448;
-
-                                break;
-                            case PioneerSubchannel.Only:
-                                blockSize = 96;
-
-                                break;
-                            default:
-                                blockSize = 2352;
-
-                                break;
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.PioneerReadCdDa(out byte[] buffer, out byte[] senseBuffer, address, blockSize, length,
-                                             subchan, dev.Timeout, out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ CD-DA to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+            AaruConsole.WriteLine("Send a Pioneer vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send READ CD-DA command.");
+            AaruConsole.WriteLine("2.- Send READ CD-DA MSF command.");
+            AaruConsole.WriteLine("3.- Send READ CD-XA command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
             AaruConsole.Write("Choose: ");
 
-            strDev = System.Console.ReadLine();
+            string strDev = System.Console.ReadLine();
 
-            if(!int.TryParse(strDev, out item))
+            if(!int.TryParse(strDev, out int item))
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA response:");
+                    ReadCdDa(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA sense:");
+                    ReadCdDaMsf(devPath, dev);
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    ReadCdXa(devPath, dev);
 
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadCdDaMsf(string devPath, Device dev)
-        {
-            byte              startFrame  = 0;
-            byte              startSecond = 2;
-            byte              startMinute = 0;
-            byte              endFrame    = 0;
-            byte              endSecond   = 0;
-            byte              endMinute   = 0;
-            PioneerSubchannel subchan     = PioneerSubchannel.None;
-            uint              blockSize   = 2352;
-            string            strDev;
-            int               item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ CD-DA MSF command:");
-                AaruConsole.WriteLine("Start: {0:D2}:{1:D2}:{2:D2}", startMinute, startSecond, startFrame);
-                AaruConsole.WriteLine("End: {0:D2}:{1:D2}:{2:D2}", endMinute, endSecond, endFrame);
-                AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
-                AaruConsole.WriteLine("{0} bytes per sectors", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Start minute?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out startMinute))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            startMinute = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Start second?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out startSecond))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            startSecond = 2;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Start frame?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out startFrame))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            startFrame = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("End minute?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out endMinute))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            endMinute = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("End second?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out endMinute))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            endMinute = 2;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("End frame?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out endFrame))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            endFrame = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Subchannel mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", PioneerSubchannel.None,
-                                              PioneerSubchannel.Q16, PioneerSubchannel.All, PioneerSubchannel.Only);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out subchan))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            subchan = PioneerSubchannel.None;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        switch(subchan)
-                        {
-                            case PioneerSubchannel.Q16:
-                                blockSize = 2368;
-
-                                break;
-                            case PioneerSubchannel.All:
-                                blockSize = 2448;
-
-                                break;
-                            case PioneerSubchannel.Only:
-                                blockSize = 96;
-
-                                break;
-                            default:
-                                blockSize = 2352;
-
-                                break;
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            uint startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
-            uint endMsf   = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
-            System.Console.Clear();
-
-            bool sense = dev.PioneerReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, startMsf, endMsf, blockSize,
-                                                subchan, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ CD-DA MSF to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA MSF response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA MSF sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA MSF decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadCdXa(string devPath, Device dev)
-        {
-            uint   address     = 0;
-            uint   length      = 1;
-            bool   errorFlags  = false;
-            bool   wholeSector = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ CD-XA command:");
-                AaruConsole.WriteLine("LBA: {0}", address);
-                AaruConsole.WriteLine("Will transfer {0} sectors", length);
-                AaruConsole.WriteLine("Include error flags?: {0}", errorFlags);
-                AaruConsole.WriteLine("Whole sector?: {0}", wholeSector);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Logical Block Address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many sectors to transfer?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Include error flags?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out errorFlags))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            errorFlags = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Read whole sector?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out wholeSector))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            wholeSector = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PioneerReadCdXa(out byte[] buffer, out byte[] senseBuffer, address, length, errorFlags,
-                                             wholeSector, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ CD-XA to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-XA response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-XA sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-XA decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void ReadCdDa(string devPath, Device dev)
+    {
+        uint              address   = 0;
+        uint              length    = 1;
+        PioneerSubchannel subchan   = PioneerSubchannel.None;
+        uint              blockSize = 2352;
+        string            strDev;
+        int               item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ CD-DA command:");
+            AaruConsole.WriteLine("LBA: {0}", address);
+            AaruConsole.WriteLine("Will transfer {0} sectors", length);
+            AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
+            AaruConsole.WriteLine("{0} bytes per sectors", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Logical Block Address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many sectors to transfer?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Subchannel mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", PioneerSubchannel.None,
+                                          PioneerSubchannel.Q16, PioneerSubchannel.All, PioneerSubchannel.Only);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out subchan))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        subchan = PioneerSubchannel.None;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    switch(subchan)
+                    {
+                        case PioneerSubchannel.Q16:
+                            blockSize = 2368;
+
+                            break;
+                        case PioneerSubchannel.All:
+                            blockSize = 2448;
+
+                            break;
+                        case PioneerSubchannel.Only:
+                            blockSize = 96;
+
+                            break;
+                        default:
+                            blockSize = 2352;
+
+                            break;
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PioneerReadCdDa(out byte[] buffer, out byte[] senseBuffer, address, blockSize, length,
+                                         subchan, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ CD-DA to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadCdDaMsf(string devPath, Device dev)
+    {
+        byte              startFrame  = 0;
+        byte              startSecond = 2;
+        byte              startMinute = 0;
+        byte              endFrame    = 0;
+        byte              endSecond   = 0;
+        byte              endMinute   = 0;
+        PioneerSubchannel subchan     = PioneerSubchannel.None;
+        uint              blockSize   = 2352;
+        string            strDev;
+        int               item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ CD-DA MSF command:");
+            AaruConsole.WriteLine("Start: {0:D2}:{1:D2}:{2:D2}", startMinute, startSecond, startFrame);
+            AaruConsole.WriteLine("End: {0:D2}:{1:D2}:{2:D2}", endMinute, endSecond, endFrame);
+            AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
+            AaruConsole.WriteLine("{0} bytes per sectors", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Start minute?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out startMinute))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        startMinute = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Start second?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out startSecond))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        startSecond = 2;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Start frame?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out startFrame))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        startFrame = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("End minute?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out endMinute))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        endMinute = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("End second?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out endMinute))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        endMinute = 2;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("End frame?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out endFrame))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        endFrame = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Subchannel mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", PioneerSubchannel.None,
+                                          PioneerSubchannel.Q16, PioneerSubchannel.All, PioneerSubchannel.Only);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out subchan))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        subchan = PioneerSubchannel.None;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    switch(subchan)
+                    {
+                        case PioneerSubchannel.Q16:
+                            blockSize = 2368;
+
+                            break;
+                        case PioneerSubchannel.All:
+                            blockSize = 2448;
+
+                            break;
+                        case PioneerSubchannel.Only:
+                            blockSize = 96;
+
+                            break;
+                        default:
+                            blockSize = 2352;
+
+                            break;
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        uint startMsf = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
+        uint endMsf   = (uint)((startMinute << 16) + (startSecond << 8) + startFrame);
+        System.Console.Clear();
+
+        bool sense = dev.PioneerReadCdDaMsf(out byte[] buffer, out byte[] senseBuffer, startMsf, endMsf, blockSize,
+                                            subchan, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ CD-DA MSF to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA MSF response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA MSF sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA MSF decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadCdXa(string devPath, Device dev)
+    {
+        uint   address     = 0;
+        uint   length      = 1;
+        bool   errorFlags  = false;
+        bool   wholeSector = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ CD-XA command:");
+            AaruConsole.WriteLine("LBA: {0}", address);
+            AaruConsole.WriteLine("Will transfer {0} sectors", length);
+            AaruConsole.WriteLine("Include error flags?: {0}", errorFlags);
+            AaruConsole.WriteLine("Whole sector?: {0}", wholeSector);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Logical Block Address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many sectors to transfer?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Include error flags?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out errorFlags))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        errorFlags = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Read whole sector?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out wholeSector))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        wholeSector = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PioneerReadCdXa(out byte[] buffer, out byte[] senseBuffer, address, length, errorFlags,
+                                         wholeSector, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ CD-XA to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Pioneer vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Pioneer vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-XA response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-XA sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-XA decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/Plasmon.cs b/Aaru.Tests.Devices/SCSI/Plasmon.cs
index 05a99c0d4..6af9c6bde 100644
--- a/Aaru.Tests.Devices/SCSI/Plasmon.cs
+++ b/Aaru.Tests.Devices/SCSI/Plasmon.cs
@@ -31,428 +31,427 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Plasmon
 {
-    internal static class Plasmon
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a Plasmon vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send READ LONG command.");
-                AaruConsole.WriteLine("2.- Send READ SECTOR LOCATION command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        ReadLong(devPath, dev);
-
-                        continue;
-                    case 2:
-                        ReadSectorLocation(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void ReadLong(string devPath, Device dev)
-        {
-            bool   relative    = false;
-            uint   address     = 0;
-            ushort length      = 1;
-            ushort bps         = 512;
-            bool   physical    = false;
-            bool   sectorCount = true;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ LONG command:");
-                AaruConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
-                AaruConsole.WriteLine("Relative?: {0}", relative);
-                AaruConsole.WriteLine("Will transfer {0} {1}", length, sectorCount ? "sectors" : "bytes");
-
-                if(sectorCount)
-                    AaruConsole.WriteLine("Expected sector size: {0} bytes", bps);
-
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Physical address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out physical))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            physical = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Relative address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out relative))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            relative = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Transfer sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out sectorCount))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            sectorCount = true;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many {0} to transfer?: ", sectorCount ? "sectors" : "bytes");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = (ushort)(sectorCount ? 1 : 512);
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(sectorCount)
-                        {
-                            AaruConsole.Write("How many bytes to expect per sector?");
-                            strDev = System.Console.ReadLine();
-
-                            if(!ushort.TryParse(strDev, out bps))
-                            {
-                                AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
-                                bps = 512;
-                                System.Console.ReadKey();
-                            }
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, relative, address, length, bps,
-                                             physical, sectorCount, dev.Timeout, out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ LONG to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
+            AaruConsole.WriteLine("Send a Plasmon vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send READ LONG command.");
+            AaruConsole.WriteLine("2.- Send READ SECTOR LOCATION command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
             AaruConsole.Write("Choose: ");
 
-            strDev = System.Console.ReadLine();
+            string strDev = System.Console.ReadLine();
 
-            if(!int.TryParse(strDev, out item))
+            if(!int.TryParse(strDev, out int item))
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG response:");
+                    ReadLong(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG sense:");
+                    ReadSectorLocation(devPath, dev);
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadSectorLocation(string devPath, Device dev)
-        {
-            uint   address  = 0;
-            bool   physical = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ SECTOR LOCATION command:");
-                AaruConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Physical address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out physical))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            physical = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlasmonReadSectorLocation(out byte[] buffer, out byte[] senseBuffer, address, physical,
-                                                       dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ SECTOR LOCATION to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ SECTOR LOCATION response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ SECTOR LOCATION sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ SECTOR LOCATION decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void ReadLong(string devPath, Device dev)
+    {
+        bool   relative    = false;
+        uint   address     = 0;
+        ushort length      = 1;
+        ushort bps         = 512;
+        bool   physical    = false;
+        bool   sectorCount = true;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ LONG command:");
+            AaruConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
+            AaruConsole.WriteLine("Relative?: {0}", relative);
+            AaruConsole.WriteLine("Will transfer {0} {1}", length, sectorCount ? "sectors" : "bytes");
+
+            if(sectorCount)
+                AaruConsole.WriteLine("Expected sector size: {0} bytes", bps);
+
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Physical address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out physical))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        physical = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Relative address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out relative))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        relative = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Transfer sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out sectorCount))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        sectorCount = true;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many {0} to transfer?: ", sectorCount ? "sectors" : "bytes");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = (ushort)(sectorCount ? 1 : 512);
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(sectorCount)
+                    {
+                        AaruConsole.Write("How many bytes to expect per sector?");
+                        strDev = System.Console.ReadLine();
+
+                        if(!ushort.TryParse(strDev, out bps))
+                        {
+                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
+                            bps = 512;
+                            System.Console.ReadKey();
+                        }
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlasmonReadLong(out byte[] buffer, out byte[] senseBuffer, relative, address, length, bps,
+                                         physical, sectorCount, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ LONG to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadSectorLocation(string devPath, Device dev)
+    {
+        uint   address  = 0;
+        bool   physical = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ SECTOR LOCATION command:");
+            AaruConsole.WriteLine("{0} Block Address: {1}", physical ? "Physical" : "Logical", address);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Physical address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out physical))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        physical = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("{0} Block Address?: ", physical ? "Physical" : "Logical");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlasmonReadSectorLocation(out byte[] buffer, out byte[] senseBuffer, address, physical,
+                                                   dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ SECTOR LOCATION to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Plasmon vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plasmon vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ SECTOR LOCATION response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ SECTOR LOCATION sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ SECTOR LOCATION decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/Plextor.cs b/Aaru.Tests.Devices/SCSI/Plextor.cs
index 50dc61e0c..1d4cd1a64 100644
--- a/Aaru.Tests.Devices/SCSI/Plextor.cs
+++ b/Aaru.Tests.Devices/SCSI/Plextor.cs
@@ -32,1724 +32,1723 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Plextor
 {
-    internal static class Plextor
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a Plextor vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send GET BOOK BITSETTING command.");
+            AaruConsole.WriteLine("2.- Send GET GIGAREC command.");
+            AaruConsole.WriteLine("3.- Send GET SECUREC command.");
+            AaruConsole.WriteLine("4.- Send GET SILENT MODE command.");
+            AaruConsole.WriteLine("5.- Send GET SINGLE-SESSION / HIDE CD-R command.");
+            AaruConsole.WriteLine("6.- Send GET SPEEDREAD command.");
+            AaruConsole.WriteLine("7.- Send GET TEST WRITE DVD+ command.");
+            AaruConsole.WriteLine("8.- Send GET VARIREC command.");
+            AaruConsole.WriteLine("9.- Send POWEREC GET SPEEDS command.");
+            AaruConsole.WriteLine("10.- Send READ CD-DA command.");
+            AaruConsole.WriteLine("11.- Send READ DVD (RAW) command.");
+            AaruConsole.WriteLine("12.- Send READ EEPROM (CD recorders) command.");
+            AaruConsole.WriteLine("13.- Send READ EEPROM (DVD recorders) command.");
+            AaruConsole.WriteLine("14.- Send READ EEPROM (PX-708 and PX-712) command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a Plextor vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send GET BOOK BITSETTING command.");
-                AaruConsole.WriteLine("2.- Send GET GIGAREC command.");
-                AaruConsole.WriteLine("3.- Send GET SECUREC command.");
-                AaruConsole.WriteLine("4.- Send GET SILENT MODE command.");
-                AaruConsole.WriteLine("5.- Send GET SINGLE-SESSION / HIDE CD-R command.");
-                AaruConsole.WriteLine("6.- Send GET SPEEDREAD command.");
-                AaruConsole.WriteLine("7.- Send GET TEST WRITE DVD+ command.");
-                AaruConsole.WriteLine("8.- Send GET VARIREC command.");
-                AaruConsole.WriteLine("9.- Send POWEREC GET SPEEDS command.");
-                AaruConsole.WriteLine("10.- Send READ CD-DA command.");
-                AaruConsole.WriteLine("11.- Send READ DVD (RAW) command.");
-                AaruConsole.WriteLine("12.- Send READ EEPROM (CD recorders) command.");
-                AaruConsole.WriteLine("13.- Send READ EEPROM (DVD recorders) command.");
-                AaruConsole.WriteLine("14.- Send READ EEPROM (PX-708 and PX-712) command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
+                    return;
+                case 1:
+                    GetBookBitsetting(devPath, dev);
+
+                    continue;
+                case 2:
+                    GetGigaRec(devPath, dev);
+
+                    continue;
+                case 3:
+                    GetSecuRec(devPath, dev);
+
+                    continue;
+                case 4:
+                    GetSilentMode(devPath, dev);
+
+                    continue;
+                case 5:
+                    GetSingleSessionHideCdR(devPath, dev);
+
+                    continue;
+                case 6:
+                    GetSpeedRead(devPath, dev);
+
+                    continue;
+                case 7:
+                    GetTestWriteDvdPlus(devPath, dev);
+
+                    continue;
+                case 8:
+                    GetVariRec(devPath, dev);
+
+                    continue;
+                case 9:
+                    PoweRecGetSpeeds(devPath, dev);
+
+                    continue;
+                case 10:
+                    ReadCdDa(devPath, dev);
+
+                    continue;
+                case 11:
+                    ReadDvdRaw(devPath, dev);
+
+                    continue;
+                case 12:
+                    ReadEepromCdR(devPath, dev);
+
+                    continue;
+                case 13:
+                    ReadEeprom(devPath, dev);
+
+                    continue;
+                case 14:
+                    ReadEepromBlock(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        GetBookBitsetting(devPath, dev);
-
-                        continue;
-                    case 2:
-                        GetGigaRec(devPath, dev);
-
-                        continue;
-                    case 3:
-                        GetSecuRec(devPath, dev);
-
-                        continue;
-                    case 4:
-                        GetSilentMode(devPath, dev);
-
-                        continue;
-                    case 5:
-                        GetSingleSessionHideCdR(devPath, dev);
-
-                        continue;
-                    case 6:
-                        GetSpeedRead(devPath, dev);
-
-                        continue;
-                    case 7:
-                        GetTestWriteDvdPlus(devPath, dev);
-
-                        continue;
-                    case 8:
-                        GetVariRec(devPath, dev);
-
-                        continue;
-                    case 9:
-                        PoweRecGetSpeeds(devPath, dev);
-
-                        continue;
-                    case 10:
-                        ReadCdDa(devPath, dev);
-
-                        continue;
-                    case 11:
-                        ReadDvdRaw(devPath, dev);
-
-                        continue;
-                    case 12:
-                        ReadEepromCdR(devPath, dev);
-
-                        continue;
-                    case 13:
-                        ReadEeprom(devPath, dev);
-
-                        continue;
-                    case 14:
-                        ReadEepromBlock(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void GetBookBitsetting(string devPath, Device dev)
-        {
-            bool   dl = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for GET BOOK BITSETTING command:");
-                AaruConsole.WriteLine("Dual layer?: {0}", dl);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Dual layer?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out dl))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            dl = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorGetBitsetting(out byte[] buffer, out byte[] senseBuffer, dl, dev.Timeout,
-                                                  out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET BOOK BITSETTING to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET BOOK BITSETTING response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET BOOK BITSETTING sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET BOOK BITSETTING decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void GetGigaRec(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorGetGigaRec(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                               out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET GIGAREC to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET GIGAREC response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET GIGAREC sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET GIGAREC decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void GetSecuRec(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorGetSecuRec(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                               out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET SECUREC to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SECUREC response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SECUREC sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SECUREC decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void GetSilentMode(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorGetSilentMode(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                                  out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET SILENT MODE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SILENT MODE response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SILENT MODE sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SILENT MODE decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void GetSingleSessionHideCdR(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorGetHiding(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                              out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET SINGLE-SESSION / HIDE CD-R to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void GetSpeedRead(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorGetSpeedRead(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                                 out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET SPEEDREAD to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SPEEDREAD response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SPEEDREAD sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET SPEEDREAD decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void GetTestWriteDvdPlus(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense =
-                dev.PlextorGetTestWriteDvdPlus(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                               out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET TEST WRITE DVD+ to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET TEST WRITE DVD+ response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET TEST WRITE DVD+ sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET TEST WRITE DVD+ decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void GetVariRec(string devPath, Device dev)
-        {
-            bool   dvd = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for GET VARIREC command:");
-                AaruConsole.WriteLine("DVD?: {0}", dvd);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("DVD?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out dvd))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            dvd = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorGetVariRec(out byte[] buffer, out byte[] senseBuffer, dvd, dev.Timeout,
-                                               out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending GET VARIREC to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET VARIREC response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET VARIREC sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("GET VARIREC decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void PoweRecGetSpeeds(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorGetPoweRec(out byte[] senseBuffer, out bool enabled, out ushort speed, dev.Timeout,
-                                               out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending POWEREC GET SPEEDS to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("PoweRec is {0}.", enabled ? "enabled" : "disabled");
-            AaruConsole.WriteLine("Speed: {0}", speed);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("POWEREC GET SPEEDS decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("POWEREC GET SPEEDS sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadCdDa(string devPath, Device dev)
-        {
-            uint              address   = 0;
-            uint              length    = 1;
-            PlextorSubchannel subchan   = PlextorSubchannel.None;
-            uint              blockSize = 2352;
-            string            strDev;
-            int               item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ CD-DA command:");
-                AaruConsole.WriteLine("LBA: {0}", address);
-                AaruConsole.WriteLine("Will transfer {0} sectors", length);
-                AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
-                AaruConsole.WriteLine("{0} bytes per sectors", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Logical Block Address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many sectors to transfer?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Subchannel mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", PlextorSubchannel.None,
-                                              PlextorSubchannel.Q16, PlextorSubchannel.All, PlextorSubchannel.Pack,
-                                              PlextorSubchannel.RawC2);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out subchan))
-                        {
-                            AaruConsole.WriteLine("Not a correct subchannel mode. Press any key to continue...");
-                            subchan = PlextorSubchannel.None;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        switch(subchan)
-                        {
-                            case PlextorSubchannel.Q16:
-                                blockSize = 2368;
-
-                                break;
-                            case PlextorSubchannel.Pack:
-                            case PlextorSubchannel.All:
-                                blockSize = 2448;
-
-                                break;
-                            case PlextorSubchannel.RawC2:
-                                blockSize = 2742;
-
-                                break;
-                            default:
-                                blockSize = 2352;
-
-                                break;
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorReadCdDa(out byte[] buffer, out byte[] senseBuffer, address, blockSize, length,
-                                             subchan, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ CD-DA to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CD-DA decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadDvdRaw(string devPath, Device dev)
-        {
-            uint   count = 1;
-            uint   lba   = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ DVD (RAW) command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("Count: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("How many sectors?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorReadRawDvd(out byte[] buffer, out byte[] senseBuffer, lba, count, dev.Timeout,
-                                               out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ DVD (RAW) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DVD (RAW) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DVD (RAW) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ DVD (RAW) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadEepromCdR(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorReadEepromCdr(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                                  out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ EEPROM to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ EEPROM response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ EEPROM sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ EEPROM decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadEepromBlock(string devPath, Device dev)
-        {
-            byte   block     = 0;
-            ushort blockSize = 256;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ EEPROM command:");
-                AaruConsole.WriteLine("EEPROM block to read: {0}", block);
-                AaruConsole.WriteLine("EEPROM block size: {0}", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("EEPROM block to read?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out block))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            block = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("EEPROM block size?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorReadEepromBlock(out byte[] buffer, out byte[] senseBuffer, block, blockSize,
-                                                    dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ EEPROM to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ EEPROM response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ EEPROM sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ EEPROM decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadEeprom(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.PlextorReadEeprom(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                               out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ EEPROM to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ EEPROM response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ EEPROM sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ EEPROM decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void GetBookBitsetting(string devPath, Device dev)
+    {
+        bool   dl = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for GET BOOK BITSETTING command:");
+            AaruConsole.WriteLine("Dual layer?: {0}", dl);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Dual layer?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out dl))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        dl = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorGetBitsetting(out byte[] buffer, out byte[] senseBuffer, dl, dev.Timeout,
+                                              out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET BOOK BITSETTING to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET BOOK BITSETTING response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET BOOK BITSETTING sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET BOOK BITSETTING decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void GetGigaRec(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorGetGigaRec(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                           out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET GIGAREC to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET GIGAREC response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET GIGAREC sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET GIGAREC decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void GetSecuRec(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorGetSecuRec(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                           out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET SECUREC to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SECUREC response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SECUREC sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SECUREC decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void GetSilentMode(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorGetSilentMode(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                              out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET SILENT MODE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SILENT MODE response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SILENT MODE sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SILENT MODE decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void GetSingleSessionHideCdR(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorGetHiding(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                          out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET SINGLE-SESSION / HIDE CD-R to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SINGLE-SESSION / HIDE CD-R decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void GetSpeedRead(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorGetSpeedRead(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                             out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET SPEEDREAD to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SPEEDREAD response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SPEEDREAD sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET SPEEDREAD decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void GetTestWriteDvdPlus(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense =
+            dev.PlextorGetTestWriteDvdPlus(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                           out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET TEST WRITE DVD+ to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET TEST WRITE DVD+ response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET TEST WRITE DVD+ sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET TEST WRITE DVD+ decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void GetVariRec(string devPath, Device dev)
+    {
+        bool   dvd = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for GET VARIREC command:");
+            AaruConsole.WriteLine("DVD?: {0}", dvd);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("DVD?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out dvd))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        dvd = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorGetVariRec(out byte[] buffer, out byte[] senseBuffer, dvd, dev.Timeout,
+                                           out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending GET VARIREC to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET VARIREC response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET VARIREC sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("GET VARIREC decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void PoweRecGetSpeeds(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorGetPoweRec(out byte[] senseBuffer, out bool enabled, out ushort speed, dev.Timeout,
+                                           out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending POWEREC GET SPEEDS to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("PoweRec is {0}.", enabled ? "enabled" : "disabled");
+        AaruConsole.WriteLine("Speed: {0}", speed);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("POWEREC GET SPEEDS decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("POWEREC GET SPEEDS sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadCdDa(string devPath, Device dev)
+    {
+        uint              address   = 0;
+        uint              length    = 1;
+        PlextorSubchannel subchan   = PlextorSubchannel.None;
+        uint              blockSize = 2352;
+        string            strDev;
+        int               item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ CD-DA command:");
+            AaruConsole.WriteLine("LBA: {0}", address);
+            AaruConsole.WriteLine("Will transfer {0} sectors", length);
+            AaruConsole.WriteLine("Subchannel mode: {0}", subchan);
+            AaruConsole.WriteLine("{0} bytes per sectors", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Logical Block Address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many sectors to transfer?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Subchannel mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", PlextorSubchannel.None,
+                                          PlextorSubchannel.Q16, PlextorSubchannel.All, PlextorSubchannel.Pack,
+                                          PlextorSubchannel.RawC2);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out subchan))
+                    {
+                        AaruConsole.WriteLine("Not a correct subchannel mode. Press any key to continue...");
+                        subchan = PlextorSubchannel.None;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    switch(subchan)
+                    {
+                        case PlextorSubchannel.Q16:
+                            blockSize = 2368;
+
+                            break;
+                        case PlextorSubchannel.Pack:
+                        case PlextorSubchannel.All:
+                            blockSize = 2448;
+
+                            break;
+                        case PlextorSubchannel.RawC2:
+                            blockSize = 2742;
+
+                            break;
+                        default:
+                            blockSize = 2352;
+
+                            break;
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorReadCdDa(out byte[] buffer, out byte[] senseBuffer, address, blockSize, length,
+                                         subchan, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ CD-DA to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CD-DA decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadDvdRaw(string devPath, Device dev)
+    {
+        uint   count = 1;
+        uint   lba   = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ DVD (RAW) command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("Count: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("How many sectors?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a numbr. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorReadRawDvd(out byte[] buffer, out byte[] senseBuffer, lba, count, dev.Timeout,
+                                           out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ DVD (RAW) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DVD (RAW) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DVD (RAW) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ DVD (RAW) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadEepromCdR(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorReadEepromCdr(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                              out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ EEPROM to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ EEPROM response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ EEPROM sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ EEPROM decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadEepromBlock(string devPath, Device dev)
+    {
+        byte   block     = 0;
+        ushort blockSize = 256;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ EEPROM command:");
+            AaruConsole.WriteLine("EEPROM block to read: {0}", block);
+            AaruConsole.WriteLine("EEPROM block size: {0}", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("EEPROM block to read?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out block))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        block = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("EEPROM block size?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorReadEepromBlock(out byte[] buffer, out byte[] senseBuffer, block, blockSize,
+                                                dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ EEPROM to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ EEPROM response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ EEPROM sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ EEPROM decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadEeprom(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.PlextorReadEeprom(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                           out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ EEPROM to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to Plextor vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to Plextor vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ EEPROM response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ EEPROM sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ EEPROM decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/SBC.cs b/Aaru.Tests.Devices/SCSI/SBC.cs
index ff2db05bc..1cf903aff 100644
--- a/Aaru.Tests.Devices/SCSI/SBC.cs
+++ b/Aaru.Tests.Devices/SCSI/SBC.cs
@@ -31,1639 +31,1638 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Sbc
 {
-    internal static class Sbc
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a SCSI Block Command to the device:");
-                AaruConsole.WriteLine("1.- Send READ (6) command.");
-                AaruConsole.WriteLine("2.- Send READ (10) command.");
-                AaruConsole.WriteLine("3.- Send READ (12) command.");
-                AaruConsole.WriteLine("4.- Send READ (16) command.");
-                AaruConsole.WriteLine("5.- Send READ LONG (10) command.");
-                AaruConsole.WriteLine("6.- Send READ LONG (16) command.");
-                AaruConsole.WriteLine("7.- Send SEEK (6) command.");
-                AaruConsole.WriteLine("8.- Send SEEK (10) command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        Read6(devPath, dev);
-
-                        continue;
-                    case 2:
-                        Read10(devPath, dev);
-
-                        continue;
-                    case 3:
-                        Read12(devPath, dev);
-
-                        continue;
-                    case 4:
-                        Read16(devPath, dev);
-
-                        continue;
-                    case 5:
-                        ReadLong10(devPath, dev);
-
-                        continue;
-                    case 6:
-                        ReadLong16(devPath, dev);
-
-                        continue;
-                    case 7:
-                        Seek6(devPath, dev);
-
-                        continue;
-                    case 8:
-                        Seek10(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void Read6(string devPath, Device dev)
-        {
-            uint   lba       = 0;
-            uint   blockSize = 512;
-            byte   count     = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ (6) command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
-                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0x1FFFFF)
-                        {
-                            AaruConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
-                            lba = 0x1FFFFF;
-                        }
-
-                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many bytes to expect per block?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.Read6(out byte[] buffer, out byte[] senseBuffer, lba, blockSize, count, dev.Timeout,
-                                   out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ (6) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+            AaruConsole.WriteLine("Send a SCSI Block Command to the device:");
+            AaruConsole.WriteLine("1.- Send READ (6) command.");
+            AaruConsole.WriteLine("2.- Send READ (10) command.");
+            AaruConsole.WriteLine("3.- Send READ (12) command.");
+            AaruConsole.WriteLine("4.- Send READ (16) command.");
+            AaruConsole.WriteLine("5.- Send READ LONG (10) command.");
+            AaruConsole.WriteLine("6.- Send READ LONG (16) command.");
+            AaruConsole.WriteLine("7.- Send SEEK (6) command.");
+            AaruConsole.WriteLine("8.- Send SEEK (10) command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
             AaruConsole.Write("Choose: ");
 
-            strDev = System.Console.ReadLine();
+            string strDev = System.Console.ReadLine();
 
-            if(!int.TryParse(strDev, out item))
+            if(!int.TryParse(strDev, out int item))
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (6) response:");
+                    Read6(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (6) sense:");
+                    Read10(devPath, dev);
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (6) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    Read12(devPath, dev);
 
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
+                    continue;
+                case 4:
+                    Read16(devPath, dev);
+
+                    continue;
+                case 5:
+                    ReadLong10(devPath, dev);
+
+                    continue;
+                case 6:
+                    ReadLong16(devPath, dev);
+
+                    continue;
+                case 7:
+                    Seek6(devPath, dev);
+
+                    continue;
+                case 8:
+                    Seek10(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Read10(string devPath, Device dev)
-        {
-            uint   lba         = 0;
-            uint   blockSize   = 512;
-            byte   count       = 1;
-            byte   rdprotect   = 0;
-            bool   dpo         = false;
-            bool   fua         = false;
-            bool   fuaNv       = false;
-            byte   groupNumber = 0;
-            bool   relative    = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ (10) command:");
-                AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
-                AaruConsole.WriteLine("{1}: {0}", lba, relative ? "Address" : "LBA");
-                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
-                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-                AaruConsole.WriteLine("How to check protection information: {0}", rdprotect);
-                AaruConsole.WriteLine("Give lowest cache priority?: {0}", dpo);
-                AaruConsole.WriteLine("Force bypassing cache and reading from medium?: {0}", fua);
-                AaruConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
-                AaruConsole.WriteLine("Group number: {0}", groupNumber);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Address relative to current position?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out relative))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many bytes to expect per block?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How to check protection information?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out rdprotect))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Give lowest cache priority?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out dpo))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Force bypassing cache and reading from medium?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fua))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fuaNv))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Group number?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Read10(out byte[] buffer, out byte[] senseBuffer, rdprotect, dpo, fua, fuaNv, relative,
-                                    lba, blockSize, groupNumber, count, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ (10) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (10) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (10) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (10) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Read12(string devPath, Device dev)
-        {
-            uint   lba         = 0;
-            uint   blockSize   = 512;
-            byte   count       = 1;
-            byte   rdprotect   = 0;
-            bool   dpo         = false;
-            bool   fua         = false;
-            bool   fuaNv       = false;
-            byte   groupNumber = 0;
-            bool   relative    = false;
-            bool   streaming   = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ (12) command:");
-                AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
-                AaruConsole.WriteLine("{1}: {0}", lba, relative ? "Address" : "LBA");
-                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
-                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-                AaruConsole.WriteLine("How to check protection information: {0}", rdprotect);
-                AaruConsole.WriteLine("Give lowest cache priority?: {0}", dpo);
-                AaruConsole.WriteLine("Force bypassing cache and reading from medium?: {0}", fua);
-                AaruConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
-                AaruConsole.WriteLine("Group number: {0}", groupNumber);
-                AaruConsole.WriteLine("Use streaming?: {0}", streaming);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Address relative to current position?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out relative))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many bytes to expect per block?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How to check protection information?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out rdprotect))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Give lowest cache priority?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out dpo))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Force bypassing cache and reading from medium?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fua))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fuaNv))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Group number?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Use streaming?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out streaming))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Read12(out byte[] buffer, out byte[] senseBuffer, rdprotect, dpo, fua, fuaNv, relative,
-                                    lba, blockSize, groupNumber, count, streaming, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ (12) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (12) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (12) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (12) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Read16(string devPath, Device dev)
-        {
-            ulong  lba         = 0;
-            uint   blockSize   = 512;
-            byte   count       = 1;
-            byte   rdprotect   = 0;
-            bool   dpo         = false;
-            bool   fua         = false;
-            bool   fuaNv       = false;
-            byte   groupNumber = 0;
-            bool   streaming   = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ (16) command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
-                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-                AaruConsole.WriteLine("How to check protection information: {0}", rdprotect);
-                AaruConsole.WriteLine("Give lowest cache priority?: {0}", dpo);
-                AaruConsole.WriteLine("Force bypassing cache and reading from medium?: {0}", fua);
-                AaruConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
-                AaruConsole.WriteLine("Group number: {0}", groupNumber);
-                AaruConsole.WriteLine("Use streaming?: {0}", streaming);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ulong.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many bytes to expect per block?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How to check protection information?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out rdprotect))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Give lowest cache priority?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out dpo))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Force bypassing cache and reading from medium?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fua))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fuaNv))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Group number?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Use streaming?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out streaming))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Read16(out byte[] buffer, out byte[] senseBuffer, rdprotect, dpo, fua, fuaNv, lba,
-                                    blockSize, groupNumber, count, streaming, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ (16) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (16) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (16) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (16) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadLong10(string devPath, Device dev)
-        {
-            uint   lba       = 0;
-            ushort blockSize = 512;
-            bool   correct   = false;
-            bool   relative  = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ LONG (10) command:");
-                AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
-                AaruConsole.WriteLine("{1}: {0}", lba, relative ? "Address" : "LBA");
-                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-                AaruConsole.WriteLine("Try to error correct block?: {0}", correct);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Address relative to current position?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out relative))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many bytes to expect per block?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Try to error correct block?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out correct))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadLong10(out byte[] buffer, out byte[] senseBuffer, correct, relative, lba, blockSize,
-                                        dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ LONG (10) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG (10) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG (10) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG (10) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadLong16(string devPath, Device dev)
-        {
-            ulong  lba       = 0;
-            uint   blockSize = 512;
-            bool   correct   = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ LONG (16) command:");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-                AaruConsole.WriteLine("Try to error correct block?: {0}", correct);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ulong.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many bytes to expect per block?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Try to error correct block?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out correct))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadLong16(out byte[] buffer, out byte[] senseBuffer, correct, lba, blockSize, dev.Timeout,
-                                        out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ LONG (16) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG (16) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG (16) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ LONG (16) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Seek6(string devPath, Device dev)
-        {
-            uint   lba = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SEEK (6) command:");
-                AaruConsole.WriteLine("Descriptor: {0}", lba);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0x1FFFFF)
-                        {
-                            AaruConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
-                            lba = 0x1FFFFF;
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-            bool sense = dev.Seek6(out byte[] senseBuffer, lba, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEEK (6) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("SEEK (6) decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEEK (6) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Seek10(string devPath, Device dev)
-        {
-            uint   lba = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SEEK (10) command:");
-                AaruConsole.WriteLine("Descriptor: {0}", lba);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Descriptor?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-            bool sense = dev.Seek10(out byte[] senseBuffer, lba, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEEK (10) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("SEEK (6) decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEEK (10) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void Read6(string devPath, Device dev)
+    {
+        uint   lba       = 0;
+        uint   blockSize = 512;
+        byte   count     = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ (6) command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+            AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0x1FFFFF)
+                    {
+                        AaruConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
+                        lba = 0x1FFFFF;
+                    }
+
+                    AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many bytes to expect per block?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read6(out byte[] buffer, out byte[] senseBuffer, lba, blockSize, count, dev.Timeout,
+                               out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ (6) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (6) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (6) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (6) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Read10(string devPath, Device dev)
+    {
+        uint   lba         = 0;
+        uint   blockSize   = 512;
+        byte   count       = 1;
+        byte   rdprotect   = 0;
+        bool   dpo         = false;
+        bool   fua         = false;
+        bool   fuaNv       = false;
+        byte   groupNumber = 0;
+        bool   relative    = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ (10) command:");
+            AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
+            AaruConsole.WriteLine("{1}: {0}", lba, relative ? "Address" : "LBA");
+            AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+            AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+            AaruConsole.WriteLine("How to check protection information: {0}", rdprotect);
+            AaruConsole.WriteLine("Give lowest cache priority?: {0}", dpo);
+            AaruConsole.WriteLine("Force bypassing cache and reading from medium?: {0}", fua);
+            AaruConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
+            AaruConsole.WriteLine("Group number: {0}", groupNumber);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Address relative to current position?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out relative))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many bytes to expect per block?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How to check protection information?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out rdprotect))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Give lowest cache priority?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out dpo))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Force bypassing cache and reading from medium?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fua))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fuaNv))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Group number?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read10(out byte[] buffer, out byte[] senseBuffer, rdprotect, dpo, fua, fuaNv, relative,
+                                lba, blockSize, groupNumber, count, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ (10) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (10) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (10) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (10) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Read12(string devPath, Device dev)
+    {
+        uint   lba         = 0;
+        uint   blockSize   = 512;
+        byte   count       = 1;
+        byte   rdprotect   = 0;
+        bool   dpo         = false;
+        bool   fua         = false;
+        bool   fuaNv       = false;
+        byte   groupNumber = 0;
+        bool   relative    = false;
+        bool   streaming   = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ (12) command:");
+            AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
+            AaruConsole.WriteLine("{1}: {0}", lba, relative ? "Address" : "LBA");
+            AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+            AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+            AaruConsole.WriteLine("How to check protection information: {0}", rdprotect);
+            AaruConsole.WriteLine("Give lowest cache priority?: {0}", dpo);
+            AaruConsole.WriteLine("Force bypassing cache and reading from medium?: {0}", fua);
+            AaruConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
+            AaruConsole.WriteLine("Group number: {0}", groupNumber);
+            AaruConsole.WriteLine("Use streaming?: {0}", streaming);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Address relative to current position?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out relative))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many bytes to expect per block?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How to check protection information?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out rdprotect))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Give lowest cache priority?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out dpo))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Force bypassing cache and reading from medium?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fua))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fuaNv))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Group number?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Use streaming?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out streaming))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read12(out byte[] buffer, out byte[] senseBuffer, rdprotect, dpo, fua, fuaNv, relative,
+                                lba, blockSize, groupNumber, count, streaming, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ (12) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (12) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (12) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (12) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Read16(string devPath, Device dev)
+    {
+        ulong  lba         = 0;
+        uint   blockSize   = 512;
+        byte   count       = 1;
+        byte   rdprotect   = 0;
+        bool   dpo         = false;
+        bool   fua         = false;
+        bool   fuaNv       = false;
+        byte   groupNumber = 0;
+        bool   streaming   = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ (16) command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+            AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+            AaruConsole.WriteLine("How to check protection information: {0}", rdprotect);
+            AaruConsole.WriteLine("Give lowest cache priority?: {0}", dpo);
+            AaruConsole.WriteLine("Force bypassing cache and reading from medium?: {0}", fua);
+            AaruConsole.WriteLine("Force bypassing cache and reading from non-volatile cache?: {0}", fuaNv);
+            AaruConsole.WriteLine("Group number: {0}", groupNumber);
+            AaruConsole.WriteLine("Use streaming?: {0}", streaming);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ulong.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many bytes to expect per block?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How to check protection information?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out rdprotect))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Give lowest cache priority?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out dpo))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Force bypassing cache and reading from medium?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fua))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Force bypassing cache and reading from non-volatile cache?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fuaNv))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Group number?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Use streaming?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out streaming))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read16(out byte[] buffer, out byte[] senseBuffer, rdprotect, dpo, fua, fuaNv, lba,
+                                blockSize, groupNumber, count, streaming, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ (16) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (16) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (16) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (16) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadLong10(string devPath, Device dev)
+    {
+        uint   lba       = 0;
+        ushort blockSize = 512;
+        bool   correct   = false;
+        bool   relative  = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ LONG (10) command:");
+            AaruConsole.WriteLine("Address relative to current position?: {0}", relative);
+            AaruConsole.WriteLine("{1}: {0}", lba, relative ? "Address" : "LBA");
+            AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+            AaruConsole.WriteLine("Try to error correct block?: {0}", correct);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Address relative to current position?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out relative))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("{0}?: ", relative ? "Address" : "LBA");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many bytes to expect per block?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Try to error correct block?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out correct))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadLong10(out byte[] buffer, out byte[] senseBuffer, correct, relative, lba, blockSize,
+                                    dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ LONG (10) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG (10) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG (10) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG (10) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadLong16(string devPath, Device dev)
+    {
+        ulong  lba       = 0;
+        uint   blockSize = 512;
+        bool   correct   = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ LONG (16) command:");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+            AaruConsole.WriteLine("Try to error correct block?: {0}", correct);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ulong.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many bytes to expect per block?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Try to error correct block?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out correct))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadLong16(out byte[] buffer, out byte[] senseBuffer, correct, lba, blockSize, dev.Timeout,
+                                    out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ LONG (16) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG (16) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG (16) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ LONG (16) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Seek6(string devPath, Device dev)
+    {
+        uint   lba = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SEEK (6) command:");
+            AaruConsole.WriteLine("Descriptor: {0}", lba);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(lba > 0x1FFFFF)
+                    {
+                        AaruConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
+                        lba = 0x1FFFFF;
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+        bool sense = dev.Seek6(out byte[] senseBuffer, lba, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEEK (6) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("SEEK (6) decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEEK (6) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Seek10(string devPath, Device dev)
+    {
+        uint   lba = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SEEK (10) command:");
+            AaruConsole.WriteLine("Descriptor: {0}", lba);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Descriptor?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+        bool sense = dev.Seek10(out byte[] senseBuffer, lba, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEEK (10) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("SEEK (6) decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Block Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Block Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEEK (10) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/SMC.cs b/Aaru.Tests.Devices/SCSI/SMC.cs
index 8f73b98c9..cb4042624 100644
--- a/Aaru.Tests.Devices/SCSI/SMC.cs
+++ b/Aaru.Tests.Devices/SCSI/SMC.cs
@@ -32,217 +32,81 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Smc
 {
-    internal static class Smc
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a SCSI Media Changer command to the device:");
+            AaruConsole.WriteLine("1.- Send READ ATTRIBUTE command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a SCSI Media Changer command to the device:");
-                AaruConsole.WriteLine("1.- Send READ ATTRIBUTE command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
+                    return;
+                case 1:
+                    ReadAttribute(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        ReadAttribute(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
+    }
 
-        static void ReadAttribute(string devPath, Device dev)
+    static void ReadAttribute(string devPath, Device dev)
+    {
+        ushort              element        = 0;
+        byte                elementType    = 0;
+        byte                volume         = 0;
+        byte                partition      = 0;
+        ushort              firstAttribute = 0;
+        bool                cache          = false;
+        ScsiAttributeAction action         = ScsiAttributeAction.Values;
+        string              strDev;
+        int                 item;
+
+        parameters:
+
+        while(true)
         {
-            ushort              element        = 0;
-            byte                elementType    = 0;
-            byte                volume         = 0;
-            byte                partition      = 0;
-            ushort              firstAttribute = 0;
-            bool                cache          = false;
-            ScsiAttributeAction action         = ScsiAttributeAction.Values;
-            string              strDev;
-            int                 item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ ATTRIBUTE command:");
-                AaruConsole.WriteLine("Action: {0}", action);
-                AaruConsole.WriteLine("Element: {0}", element);
-                AaruConsole.WriteLine("Element type: {0}", elementType);
-                AaruConsole.WriteLine("Volume: {0}", volume);
-                AaruConsole.WriteLine("Partition: {0}", partition);
-                AaruConsole.WriteLine("First attribute: {0}", firstAttribute);
-                AaruConsole.WriteLine("Use cache?: {0}", cache);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Media Changer commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Media Changer commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.WriteLine("Attribute action");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", ScsiAttributeAction.Values,
-                                              ScsiAttributeAction.List, ScsiAttributeAction.VolumeList,
-                                              ScsiAttributeAction.PartitionList, ScsiAttributeAction.ElementList,
-                                              ScsiAttributeAction.Supported);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out action))
-                        {
-                            AaruConsole.WriteLine("Not a valid attribute action. Press any key to continue...");
-                            action = ScsiAttributeAction.Values;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Element?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out element))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            element = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Element type?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out elementType))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            elementType = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Volume?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out volume))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            volume = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Partition?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out partition))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            partition = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("First attribute?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ushort.TryParse(strDev, out firstAttribute))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            firstAttribute = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Use cache?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out cache))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            cache = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.ReadAttribute(out byte[] buffer, out byte[] senseBuffer, action, element, elementType,
-                                           volume, partition, firstAttribute, cache, dev.Timeout, out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ ATTRIBUTE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("Parameters for READ ATTRIBUTE command:");
+            AaruConsole.WriteLine("Action: {0}", action);
+            AaruConsole.WriteLine("Element: {0}", element);
+            AaruConsole.WriteLine("Element type: {0}", elementType);
+            AaruConsole.WriteLine("Volume: {0}", volume);
+            AaruConsole.WriteLine("Partition: {0}", partition);
+            AaruConsole.WriteLine("First attribute: {0}", firstAttribute);
+            AaruConsole.WriteLine("Use cache?: {0}", cache);
             AaruConsole.WriteLine();
             AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
             AaruConsole.WriteLine("0.- Return to SCSI Media Changer commands menu.");
-            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
 
@@ -250,9 +114,8 @@ namespace Aaru.Tests.Devices.SCSI
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
@@ -262,53 +125,189 @@ namespace Aaru.Tests.Devices.SCSI
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ ATTRIBUTE response:");
+                    AaruConsole.WriteLine("Attribute action");
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4}", ScsiAttributeAction.Values,
+                                          ScsiAttributeAction.List, ScsiAttributeAction.VolumeList,
+                                          ScsiAttributeAction.PartitionList, ScsiAttributeAction.ElementList,
+                                          ScsiAttributeAction.Supported);
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
 
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ ATTRIBUTE sense:");
+                    if(!Enum.TryParse(strDev, true, out action))
+                    {
+                        AaruConsole.WriteLine("Not a valid attribute action. Press any key to continue...");
+                        action = ScsiAttributeAction.Values;
+                        System.Console.ReadKey();
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
+                        continue;
+                    }
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    AaruConsole.Write("Element?: ");
+                    strDev = System.Console.ReadLine();
 
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ ATTRIBUTE decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    if(!ushort.TryParse(strDev, out element))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        element = 0;
+                        System.Console.ReadKey();
 
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
+                        continue;
+                    }
 
-                    goto menu;
+                    AaruConsole.Write("Element type?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out elementType))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        elementType = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Volume?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out volume))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        volume = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Partition?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out partition))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        partition = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("First attribute?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ushort.TryParse(strDev, out firstAttribute))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        firstAttribute = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Use cache?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out cache))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        cache = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
             }
         }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadAttribute(out byte[] buffer, out byte[] senseBuffer, action, element, elementType,
+                                       volume, partition, firstAttribute, cache, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ ATTRIBUTE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Media Changer commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Media Changer commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ ATTRIBUTE response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ ATTRIBUTE sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ ATTRIBUTE decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/SPC.cs b/Aaru.Tests.Devices/SCSI/SPC.cs
index 6fa9d4268..9352f0182 100644
--- a/Aaru.Tests.Devices/SCSI/SPC.cs
+++ b/Aaru.Tests.Devices/SCSI/SPC.cs
@@ -32,118 +32,28 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Spc
 {
-    internal static class Spc
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a SCSI Primary Commands to the device:");
-                AaruConsole.WriteLine("1.- Send INQUIRY command.");
-                AaruConsole.WriteLine("2.- Send INQUIRY EVPD command.");
-                AaruConsole.WriteLine("3.- Send MODE SENSE (6) command.");
-                AaruConsole.WriteLine("4.- Send MODE SENSE (10) command.");
-                AaruConsole.WriteLine("5.- Send PREVENT ALLOW MEDIUM REMOVAL command.");
-                AaruConsole.WriteLine("6.- Send READ CAPACITY (10) command.");
-                AaruConsole.WriteLine("7.- Send READ CAPACITY (16) command.");
-                AaruConsole.WriteLine("8.- Send READ MEDIA SERIAL NUMBER command.");
-                AaruConsole.WriteLine("9.- Send REQUEST SENSE command.");
-                AaruConsole.WriteLine("10.- Send TEST UNIT READY command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        Inquiry(devPath, dev);
-
-                        continue;
-                    case 2:
-                        InquiryEvpd(devPath, dev);
-
-                        continue;
-                    case 3:
-                        ModeSense6(devPath, dev);
-
-                        continue;
-                    case 4:
-                        ModeSense10(devPath, dev);
-
-                        continue;
-                    case 5:
-                        PreventAllowMediumRemoval(devPath, dev);
-
-                        continue;
-                    case 6:
-                        ReadCapacity10(devPath, dev);
-
-                        continue;
-                    case 7:
-                        ReadCapacity16(devPath, dev);
-
-                        continue;
-                    case 8:
-                        ReadMediaSerialNumber(devPath, dev);
-
-                        continue;
-                    case 9:
-                        RequestSense(devPath, dev);
-
-                        continue;
-                    case 10:
-                        TestUnitReady(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void Inquiry(string devPath, Device dev)
-        {
-            start:
             System.Console.Clear();
-            bool sense = dev.ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending INQUIRY to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print sense buffer.");
-            AaruConsole.WriteLine("4.- Decode sense buffer.");
-            AaruConsole.WriteLine("5.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+            AaruConsole.WriteLine("Send a SCSI Primary Commands to the device:");
+            AaruConsole.WriteLine("1.- Send INQUIRY command.");
+            AaruConsole.WriteLine("2.- Send INQUIRY EVPD command.");
+            AaruConsole.WriteLine("3.- Send MODE SENSE (6) command.");
+            AaruConsole.WriteLine("4.- Send MODE SENSE (10) command.");
+            AaruConsole.WriteLine("5.- Send PREVENT ALLOW MEDIUM REMOVAL command.");
+            AaruConsole.WriteLine("6.- Send READ CAPACITY (10) command.");
+            AaruConsole.WriteLine("7.- Send READ CAPACITY (16) command.");
+            AaruConsole.WriteLine("8.- Send READ MEDIA SERIAL NUMBER command.");
+            AaruConsole.WriteLine("9.- Send REQUEST SENSE command.");
+            AaruConsole.WriteLine("10.- Send TEST UNIT READY command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
             AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
@@ -152,1356 +62,1445 @@ namespace Aaru.Tests.Devices.SCSI
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("INQUIRY response:");
+                    Inquiry(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("INQUIRY decoded response:");
+                    InquiryEvpd(devPath, dev);
 
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.SCSI.Inquiry.Prettify(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("INQUIRY sense:");
+                    ModeSense6(devPath, dev);
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("INQUIRY decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    ModeSense10(devPath, dev);
 
-                    goto menu;
-                case 5: goto start;
+                    continue;
+                case 5:
+                    PreventAllowMediumRemoval(devPath, dev);
+
+                    continue;
+                case 6:
+                    ReadCapacity10(devPath, dev);
+
+                    continue;
+                case 7:
+                    ReadCapacity16(devPath, dev);
+
+                    continue;
+                case 8:
+                    ReadMediaSerialNumber(devPath, dev);
+
+                    continue;
+                case 9:
+                    RequestSense(devPath, dev);
+
+                    continue;
+                case 10:
+                    TestUnitReady(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void InquiryEvpd(string devPath, Device dev)
-        {
-            byte   page = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for INQUIRY command:");
-                AaruConsole.WriteLine("EVPD page: {0}", page);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Page?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out page))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            page = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, page, dev.Timeout,
-                                         out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending INQUIRY to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("INQUIRY response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("INQUIRY sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("INQUIRY decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ModeSense6(string devPath, Device dev)
-        {
-            bool                     dbd         = false;
-            ScsiModeSensePageControl pageControl = ScsiModeSensePageControl.Current;
-            byte                     page        = 0x3F;
-            byte                     subpage     = 0xFF;
-            string                   strDev;
-            int                      item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for MODE SENSE (6) command:");
-                AaruConsole.WriteLine("DBD?: {0}", dbd);
-                AaruConsole.WriteLine("Page control: {0}", pageControl);
-                AaruConsole.WriteLine("Page: {0}", page);
-                AaruConsole.WriteLine("Subpage: {0}", subpage);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("DBD?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out dbd))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            dbd = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Page control");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiModeSensePageControl.Changeable,
-                                              ScsiModeSensePageControl.Current, ScsiModeSensePageControl.Default,
-                                              ScsiModeSensePageControl.Saved);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out pageControl))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            pageControl = ScsiModeSensePageControl.Current;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Page?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out page))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            page = 0x3F;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Subpage?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out subpage))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            subpage = 0xFF;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ModeSense6(out byte[] buffer, out byte[] senseBuffer, dbd, pageControl, page, subpage,
-                                        dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending MODE SENSE (6) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print sense buffer.");
-            AaruConsole.WriteLine("4.- Decode sense buffer.");
-            AaruConsole.WriteLine("5.- Send command again.");
-            AaruConsole.WriteLine("6.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MODE SENSE (6) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MODE SENSE (6) decoded response:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Modes.PrettifyModeHeader6(buffer, dev.ScsiType));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MODE SENSE (6) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MODE SENSE (6) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 5: goto start;
-                case 6: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ModeSense10(string devPath, Device dev)
-        {
-            bool                     llba        = false;
-            bool                     dbd         = false;
-            ScsiModeSensePageControl pageControl = ScsiModeSensePageControl.Current;
-            byte                     page        = 0x3F;
-            byte                     subpage     = 0xFF;
-            string                   strDev;
-            int                      item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for MODE SENSE (10) command:");
-                AaruConsole.WriteLine("LLBA?: {0}", llba);
-                AaruConsole.WriteLine("DBD?: {0}", dbd);
-                AaruConsole.WriteLine("Page control: {0}", pageControl);
-                AaruConsole.WriteLine("Page: {0}", page);
-                AaruConsole.WriteLine("Subpage: {0}", subpage);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("LLBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out llba))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            llba = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("DBD?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out dbd))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            dbd = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.WriteLine("Page control");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiModeSensePageControl.Changeable,
-                                              ScsiModeSensePageControl.Current, ScsiModeSensePageControl.Default,
-                                              ScsiModeSensePageControl.Saved);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out pageControl))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            pageControl = ScsiModeSensePageControl.Current;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Page?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out page))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            page = 0x3F;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Subpage?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out subpage))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            subpage = 0xFF;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ModeSense10(out byte[] buffer, out byte[] senseBuffer, llba, dbd, pageControl, page,
-                                         subpage, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending MODE SENSE (10) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print sense buffer.");
-            AaruConsole.WriteLine("4.- Decode sense buffer.");
-            AaruConsole.WriteLine("5.- Send command again.");
-            AaruConsole.WriteLine("6.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MODE SENSE (10) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MODE SENSE (10) decoded response:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Modes.PrettifyModeHeader10(buffer, dev.ScsiType));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MODE SENSE (10) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MODE SENSE (10) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 5: goto start;
-                case 6: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void PreventAllowMediumRemoval(string devPath, Device dev)
-        {
-            ScsiPreventAllowMode mode = ScsiPreventAllowMode.Allow;
-            string               strDev;
-            int                  item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for PREVENT ALLOW MEDIUM REMOVAL command:");
-                AaruConsole.WriteLine("Mode: {0}", mode);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.WriteLine("Mode");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiPreventAllowMode.Allow,
-                                              ScsiPreventAllowMode.Prevent, ScsiPreventAllowMode.PreventAll,
-                                              ScsiPreventAllowMode.PreventChanger);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out mode))
-                        {
-                            AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
-                            mode = ScsiPreventAllowMode.Allow;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense =
-                dev.SpcPreventAllowMediumRemoval(out byte[] senseBuffer, mode, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending PREVENT ALLOW MEDIUM REMOVAL to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("2.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                    return;
-                case 1: goto start;
-                case 2: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadCapacity10(string devPath, Device dev)
-        {
-            bool   relative = false;
-            bool   partial  = false;
-            uint   address  = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ CAPACITY (10) command:");
-                AaruConsole.WriteLine("Relative address?: {0}", relative);
-                AaruConsole.WriteLine("Partial capacity?: {0}", partial);
-                AaruConsole.WriteLine("Address: {0}", address);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Relative address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out relative))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            relative = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Partial capacity?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out partial))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            partial = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadCapacity(out byte[] buffer, out byte[] senseBuffer, relative, address, partial,
-                                          dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ CAPACITY (10) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CAPACITY (10) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CAPACITY (10) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CAPACITY (10) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadCapacity16(string devPath, Device dev)
-        {
-            bool   partial = false;
-            ulong  address = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ CAPACITY (16) command:");
-                AaruConsole.WriteLine("Partial capacity?: {0}", partial);
-                AaruConsole.WriteLine("Address: {0}", address);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Partial capacity?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out partial))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            partial = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Address?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ulong.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadCapacity16(out byte[] buffer, out byte[] senseBuffer, address, partial, dev.Timeout,
-                                            out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ CAPACITY (16) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CAPACITY (16) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CAPACITY (16) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ CAPACITY (16) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadMediaSerialNumber(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadMediaSerialNumber(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                                   out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ MEDIA SERIAL NUMBER to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ MEDIA SERIAL NUMBER response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ MEDIA SERIAL NUMBER sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ MEDIA SERIAL NUMBER decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void RequestSense(string devPath, Device dev)
-        {
-            bool   descriptor = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for REQUEST SENSE command:");
-                AaruConsole.WriteLine("Descriptor: {0}", descriptor);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Descriptor?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out descriptor))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            descriptor = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-            bool sense = dev.RequestSense(descriptor, out byte[] senseBuffer, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending REQUEST SENSE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("REQUEST SENSE decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("REQUEST SENSE sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void TestUnitReady(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ScsiTestUnitReady(out byte[] senseBuffer, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending TEST UNIT READY to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("TEST UNIT READY decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("TEST UNIT READY sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void Inquiry(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending INQUIRY to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print sense buffer.");
+        AaruConsole.WriteLine("4.- Decode sense buffer.");
+        AaruConsole.WriteLine("5.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("INQUIRY response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("INQUIRY decoded response:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.SCSI.Inquiry.Prettify(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("INQUIRY sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("INQUIRY decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 5: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void InquiryEvpd(string devPath, Device dev)
+    {
+        byte   page = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for INQUIRY command:");
+            AaruConsole.WriteLine("EVPD page: {0}", page);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Page?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out page))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        page = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ScsiInquiry(out byte[] buffer, out byte[] senseBuffer, page, dev.Timeout,
+                                     out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending INQUIRY to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("INQUIRY response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("INQUIRY sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("INQUIRY decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ModeSense6(string devPath, Device dev)
+    {
+        bool                     dbd         = false;
+        ScsiModeSensePageControl pageControl = ScsiModeSensePageControl.Current;
+        byte                     page        = 0x3F;
+        byte                     subpage     = 0xFF;
+        string                   strDev;
+        int                      item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for MODE SENSE (6) command:");
+            AaruConsole.WriteLine("DBD?: {0}", dbd);
+            AaruConsole.WriteLine("Page control: {0}", pageControl);
+            AaruConsole.WriteLine("Page: {0}", page);
+            AaruConsole.WriteLine("Subpage: {0}", subpage);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("DBD?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out dbd))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        dbd = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Page control");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiModeSensePageControl.Changeable,
+                                          ScsiModeSensePageControl.Current, ScsiModeSensePageControl.Default,
+                                          ScsiModeSensePageControl.Saved);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out pageControl))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        pageControl = ScsiModeSensePageControl.Current;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Page?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out page))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        page = 0x3F;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Subpage?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out subpage))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        subpage = 0xFF;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ModeSense6(out byte[] buffer, out byte[] senseBuffer, dbd, pageControl, page, subpage,
+                                    dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending MODE SENSE (6) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print sense buffer.");
+        AaruConsole.WriteLine("4.- Decode sense buffer.");
+        AaruConsole.WriteLine("5.- Send command again.");
+        AaruConsole.WriteLine("6.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MODE SENSE (6) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MODE SENSE (6) decoded response:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Modes.PrettifyModeHeader6(buffer, dev.ScsiType));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MODE SENSE (6) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MODE SENSE (6) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 5: goto start;
+            case 6: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ModeSense10(string devPath, Device dev)
+    {
+        bool                     llba        = false;
+        bool                     dbd         = false;
+        ScsiModeSensePageControl pageControl = ScsiModeSensePageControl.Current;
+        byte                     page        = 0x3F;
+        byte                     subpage     = 0xFF;
+        string                   strDev;
+        int                      item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for MODE SENSE (10) command:");
+            AaruConsole.WriteLine("LLBA?: {0}", llba);
+            AaruConsole.WriteLine("DBD?: {0}", dbd);
+            AaruConsole.WriteLine("Page control: {0}", pageControl);
+            AaruConsole.WriteLine("Page: {0}", page);
+            AaruConsole.WriteLine("Subpage: {0}", subpage);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("LLBA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out llba))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        llba = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("DBD?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out dbd))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        dbd = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.WriteLine("Page control");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiModeSensePageControl.Changeable,
+                                          ScsiModeSensePageControl.Current, ScsiModeSensePageControl.Default,
+                                          ScsiModeSensePageControl.Saved);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out pageControl))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        pageControl = ScsiModeSensePageControl.Current;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Page?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out page))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        page = 0x3F;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Subpage?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out subpage))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        subpage = 0xFF;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ModeSense10(out byte[] buffer, out byte[] senseBuffer, llba, dbd, pageControl, page,
+                                     subpage, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending MODE SENSE (10) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print sense buffer.");
+        AaruConsole.WriteLine("4.- Decode sense buffer.");
+        AaruConsole.WriteLine("5.- Send command again.");
+        AaruConsole.WriteLine("6.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MODE SENSE (10) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MODE SENSE (10) decoded response:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Modes.PrettifyModeHeader10(buffer, dev.ScsiType));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MODE SENSE (10) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MODE SENSE (10) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 5: goto start;
+            case 6: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void PreventAllowMediumRemoval(string devPath, Device dev)
+    {
+        ScsiPreventAllowMode mode = ScsiPreventAllowMode.Allow;
+        string               strDev;
+        int                  item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for PREVENT ALLOW MEDIUM REMOVAL command:");
+            AaruConsole.WriteLine("Mode: {0}", mode);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.WriteLine("Mode");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", ScsiPreventAllowMode.Allow,
+                                          ScsiPreventAllowMode.Prevent, ScsiPreventAllowMode.PreventAll,
+                                          ScsiPreventAllowMode.PreventChanger);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out mode))
+                    {
+                        AaruConsole.WriteLine("Not a correct page control. Press any key to continue...");
+                        mode = ScsiPreventAllowMode.Allow;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense =
+            dev.SpcPreventAllowMediumRemoval(out byte[] senseBuffer, mode, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending PREVENT ALLOW MEDIUM REMOVAL to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("PREVENT ALLOW MEDIUM REMOVAL decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("2.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                return;
+            case 1: goto start;
+            case 2: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadCapacity10(string devPath, Device dev)
+    {
+        bool   relative = false;
+        bool   partial  = false;
+        uint   address  = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ CAPACITY (10) command:");
+            AaruConsole.WriteLine("Relative address?: {0}", relative);
+            AaruConsole.WriteLine("Partial capacity?: {0}", partial);
+            AaruConsole.WriteLine("Address: {0}", address);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Relative address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out relative))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        relative = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Partial capacity?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out partial))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        partial = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadCapacity(out byte[] buffer, out byte[] senseBuffer, relative, address, partial,
+                                      dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ CAPACITY (10) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CAPACITY (10) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CAPACITY (10) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CAPACITY (10) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadCapacity16(string devPath, Device dev)
+    {
+        bool   partial = false;
+        ulong  address = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ CAPACITY (16) command:");
+            AaruConsole.WriteLine("Partial capacity?: {0}", partial);
+            AaruConsole.WriteLine("Address: {0}", address);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Partial capacity?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out partial))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        partial = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Address?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ulong.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadCapacity16(out byte[] buffer, out byte[] senseBuffer, address, partial, dev.Timeout,
+                                        out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ CAPACITY (16) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CAPACITY (16) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CAPACITY (16) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ CAPACITY (16) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadMediaSerialNumber(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadMediaSerialNumber(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                               out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ MEDIA SERIAL NUMBER to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ MEDIA SERIAL NUMBER response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ MEDIA SERIAL NUMBER sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ MEDIA SERIAL NUMBER decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void RequestSense(string devPath, Device dev)
+    {
+        bool   descriptor = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for REQUEST SENSE command:");
+            AaruConsole.WriteLine("Descriptor: {0}", descriptor);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Descriptor?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out descriptor))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        descriptor = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+        bool sense = dev.RequestSense(descriptor, out byte[] senseBuffer, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending REQUEST SENSE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("REQUEST SENSE decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("REQUEST SENSE sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void TestUnitReady(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ScsiTestUnitReady(out byte[] senseBuffer, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending TEST UNIT READY to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("TEST UNIT READY decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to SCSI Primary Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Primary Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("TEST UNIT READY sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/SSC.cs b/Aaru.Tests.Devices/SCSI/SSC.cs
index c00c0e2d2..e65dd3680 100644
--- a/Aaru.Tests.Devices/SCSI/SSC.cs
+++ b/Aaru.Tests.Devices/SCSI/SSC.cs
@@ -33,1106 +33,32 @@ using Aaru.Decoders.SCSI.SSC;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class Ssc
 {
-    internal static class Ssc
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a SCSI Streaming Command to the device:");
-                AaruConsole.WriteLine("1.- Send LOAD UNLOAD command.");
-                AaruConsole.WriteLine("2.- Send LOCATE (10) command.");
-                AaruConsole.WriteLine("3.- Send LOCATE (16) command.");
-                AaruConsole.WriteLine("4.- Send READ (6) command.");
-                AaruConsole.WriteLine("5.- Send READ (16) command.");
-                AaruConsole.WriteLine("6.- Send READ BLOCK LIMITS command.");
-                AaruConsole.WriteLine("7.- Send READ POSITION command.");
-                AaruConsole.WriteLine("8.- Send READ REVERSE (6) command.");
-                AaruConsole.WriteLine("9.- Send READ REVERSE (16) command.");
-                AaruConsole.WriteLine("10.- Send RECOVER BUFFERED DATA command.");
-                AaruConsole.WriteLine("11.- Send REPORT DENSITY SUPPORT command.");
-                AaruConsole.WriteLine("12.- Send REWIND command.");
-                AaruConsole.WriteLine("13.- Send SPACE command.");
-                AaruConsole.WriteLine("14.- Send TRACK SELECT command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        LoadUnload(devPath, dev);
-
-                        continue;
-                    case 2:
-                        Locate10(devPath, dev);
-
-                        continue;
-                    case 3:
-                        Locate16(devPath, dev);
-
-                        continue;
-                    case 4:
-                        Read6(devPath, dev);
-
-                        continue;
-                    case 5:
-                        Read16(devPath, dev);
-
-                        continue;
-                    case 6:
-                        ReadBlockLimits(devPath, dev);
-
-                        continue;
-                    case 7:
-                        ReadPosition(devPath, dev);
-
-                        continue;
-                    case 8:
-                        ReadReverse6(devPath, dev);
-
-                        continue;
-                    case 9:
-                        ReadReverse16(devPath, dev);
-
-                        continue;
-                    case 10:
-                        RecoverBufferedData(devPath, dev);
-
-                        continue;
-                    case 11:
-                        ReportDensitySupport(devPath, dev);
-
-                        continue;
-                    case 12:
-                        Rewind(devPath, dev);
-
-                        continue;
-                    case 13:
-                        Space(devPath, dev);
-
-                        continue;
-                    case 14:
-                        TrackSelect(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void LoadUnload(string devPath, Device dev)
-        {
-            bool   load      = true;
-            bool   immediate = false;
-            bool   retense   = false;
-            bool   eot       = false;
-            bool   hold      = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for LOAD UNLOAD command:");
-                AaruConsole.WriteLine("Load?: {0}", load);
-                AaruConsole.WriteLine("Immediate?: {0}", immediate);
-                AaruConsole.WriteLine("Retense?: {0}", retense);
-                AaruConsole.WriteLine("End of tape?: {0}", eot);
-                AaruConsole.WriteLine("Hold?: {0}", hold);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Load?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out load))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            load = true;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Immediate?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out immediate))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            immediate = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Retense?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out retense))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            retense = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("End of tape?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out eot))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            eot = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Hold?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out hold))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            hold = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.LoadUnload(out byte[] senseBuffer, immediate, load, retense, eot, hold, dev.Timeout,
-                                        out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending LOAD UNLOAD to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("LOAD UNLOAD decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LOAD UNLOAD sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Locate10(string devPath, Device dev)
-        {
-            bool   blockType       = true;
-            bool   immediate       = false;
-            bool   changePartition = false;
-            byte   partition       = 0;
-            uint   objectId        = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for LOCATE (10) command:");
-                AaruConsole.WriteLine("Locate block?: {0}", blockType);
-                AaruConsole.WriteLine("Immediate?: {0}", immediate);
-                AaruConsole.WriteLine("Change partition?: {0}", changePartition);
-                AaruConsole.WriteLine("Partition: {0}", partition);
-                AaruConsole.WriteLine("{1}: {0}", objectId, blockType ? "Block" : "Object");
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Load?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out blockType))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            blockType = true;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Immediate?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out immediate))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            immediate = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Change partition?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out changePartition))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            changePartition = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Partition?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out partition))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            partition = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("{0}?: ", blockType ? "Block" : "Object");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out objectId))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            objectId = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Locate(out byte[] senseBuffer, immediate, blockType, changePartition, partition, objectId,
-                                    dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending LOCATE (10) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("LOCATE (10) decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LOCATE (10) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Locate16(string devPath, Device dev)
-        {
-            SscLogicalIdTypes destType        = SscLogicalIdTypes.FileId;
-            bool              immediate       = false;
-            bool              changePartition = false;
-            bool              bam             = false;
-            byte              partition       = 0;
-            ulong             objectId        = 1;
-            string            strDev;
-            int               item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for LOCATE (16) command:");
-                AaruConsole.WriteLine("Object type: {0}", destType);
-                AaruConsole.WriteLine("Immediate?: {0}", immediate);
-                AaruConsole.WriteLine("Explicit identifier?: {0}", bam);
-                AaruConsole.WriteLine("Change partition?: {0}", changePartition);
-                AaruConsole.WriteLine("Partition: {0}", partition);
-                AaruConsole.WriteLine("Object identifier: {0}", objectId);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.WriteLine("Object type");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", SscLogicalIdTypes.FileId,
-                                              SscLogicalIdTypes.ObjectId, SscLogicalIdTypes.Reserved,
-                                              SscLogicalIdTypes.SetId);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out destType))
-                        {
-                            AaruConsole.WriteLine("Not a correct object type. Press any key to continue...");
-                            destType = SscLogicalIdTypes.FileId;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Immediate?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out immediate))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            immediate = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Explicit identifier?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out bam))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            bam = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Change partition?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out changePartition))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            changePartition = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Partition?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out partition))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            partition = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Identifier");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ulong.TryParse(strDev, out objectId))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            objectId = 1;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Locate16(out byte[] senseBuffer, immediate, changePartition, destType, bam, partition,
-                                      objectId, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending LOCATE (16) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("LOCATE (16) decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LOCATE (16) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Read6(string devPath, Device dev)
-        {
-            bool   sili      = false;
-            bool   fixedLen  = true;
-            uint   blockSize = 512;
-            uint   length    = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ (6) command:");
-                AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
-                AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "blocks" : "bytes");
-
-                if(fixedLen)
-                    AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-
-                AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Fixed block size?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fixedLen))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            fixedLen = true;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = (uint)(fixedLen ? 1 : 512);
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(length > 0xFFFFFF)
-                        {
-                            AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
-                                                  fixedLen ? "blocks" : "bytes");
-
-                            length = 0xFFFFFF;
-                        }
-
-                        if(fixedLen)
-                        {
-                            AaruConsole.Write("How many bytes to expect per block?: ");
-                            strDev = System.Console.ReadLine();
-
-                            if(!uint.TryParse(strDev, out blockSize))
-                            {
-                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                                blockSize = 512;
-                                System.Console.ReadKey();
-
-                                continue;
-                            }
-                        }
-
-                        AaruConsole.Write("Suppress length indicator?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out sili))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            sili = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Read6(out byte[] buffer, out byte[] senseBuffer, sili, fixedLen, length, blockSize,
-                                   dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ (6) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (6) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (6) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (6) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Read16(string devPath, Device dev)
-        {
-            bool   sili       = false;
-            bool   fixedLen   = true;
-            uint   objectSize = 512;
-            uint   length     = 1;
-            byte   partition  = 0;
-            ulong  objectId   = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ (16) command:");
-                AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
-                AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "objects" : "bytes");
-
-                if(fixedLen)
-                    AaruConsole.WriteLine("{0} bytes expected per object", objectSize);
-
-                AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
-                AaruConsole.WriteLine("Read object {0} from partition {1}", objectId, partition);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Fixed block size?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fixedLen))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            fixedLen = true;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many {0} to read?: ", fixedLen ? "objects" : "bytes");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = (uint)(fixedLen ? 1 : 512);
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(length > 0xFFFFFF)
-                        {
-                            AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
-                                                  fixedLen ? "blocks" : "bytes");
-
-                            length = 0xFFFFFF;
-                        }
-
-                        if(fixedLen)
-                        {
-                            AaruConsole.Write("How many bytes to expect per object?: ");
-                            strDev = System.Console.ReadLine();
-
-                            if(!uint.TryParse(strDev, out objectSize))
-                            {
-                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                                objectSize = 512;
-                                System.Console.ReadKey();
-
-                                continue;
-                            }
-                        }
-
-                        AaruConsole.Write("Suppress length indicator?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out sili))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            sili = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Object identifier?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ulong.TryParse(strDev, out objectId))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            objectId = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Partition?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out partition))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            partition = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Read16(out byte[] buffer, out byte[] senseBuffer, sili, fixedLen, partition, objectId,
-                                    length, objectSize, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ (16) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (16) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (16) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ (16) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadBlockLimits(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadBlockLimits(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                             out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ BLOCK LIMITS to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print sense buffer.");
-            AaruConsole.WriteLine("4.- Decode sense buffer.");
-            AaruConsole.WriteLine("5.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+            AaruConsole.WriteLine("Send a SCSI Streaming Command to the device:");
+            AaruConsole.WriteLine("1.- Send LOAD UNLOAD command.");
+            AaruConsole.WriteLine("2.- Send LOCATE (10) command.");
+            AaruConsole.WriteLine("3.- Send LOCATE (16) command.");
+            AaruConsole.WriteLine("4.- Send READ (6) command.");
+            AaruConsole.WriteLine("5.- Send READ (16) command.");
+            AaruConsole.WriteLine("6.- Send READ BLOCK LIMITS command.");
+            AaruConsole.WriteLine("7.- Send READ POSITION command.");
+            AaruConsole.WriteLine("8.- Send READ REVERSE (6) command.");
+            AaruConsole.WriteLine("9.- Send READ REVERSE (16) command.");
+            AaruConsole.WriteLine("10.- Send RECOVER BUFFERED DATA command.");
+            AaruConsole.WriteLine("11.- Send REPORT DENSITY SUPPORT command.");
+            AaruConsole.WriteLine("12.- Send REWIND command.");
+            AaruConsole.WriteLine("13.- Send SPACE command.");
+            AaruConsole.WriteLine("14.- Send TRACK SELECT command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
             AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
@@ -1141,1399 +67,2472 @@ namespace Aaru.Tests.Devices.SCSI
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
             {
                 case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ BLOCK LIMITS response:");
+                    LoadUnload(devPath, dev);
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ BLOCK LIMITS decoded response:");
+                    Locate10(devPath, dev);
 
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", BlockLimits.Prettify(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ BLOCK LIMITS sense:");
+                    Locate16(devPath, dev);
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
+                    continue;
                 case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ BLOCK LIMITS decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    Read6(devPath, dev);
 
-                    goto menu;
-                case 5: goto start;
+                    continue;
+                case 5:
+                    Read16(devPath, dev);
+
+                    continue;
+                case 6:
+                    ReadBlockLimits(devPath, dev);
+
+                    continue;
+                case 7:
+                    ReadPosition(devPath, dev);
+
+                    continue;
+                case 8:
+                    ReadReverse6(devPath, dev);
+
+                    continue;
+                case 9:
+                    ReadReverse16(devPath, dev);
+
+                    continue;
+                case 10:
+                    RecoverBufferedData(devPath, dev);
+
+                    continue;
+                case 11:
+                    ReportDensitySupport(devPath, dev);
+
+                    continue;
+                case 12:
+                    Rewind(devPath, dev);
+
+                    continue;
+                case 13:
+                    Space(devPath, dev);
+
+                    continue;
+                case 14:
+                    TrackSelect(devPath, dev);
+
+                    continue;
                 default:
                     AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadPosition(string devPath, Device dev)
-        {
-            SscPositionForms responseForm = SscPositionForms.Short;
-            string           strDev;
-            int              item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for LOCATE (16) command:");
-                AaruConsole.WriteLine("Response form: {0}", responseForm);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.WriteLine("Response form");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5} {6} {7} {8}",
-                                              SscPositionForms.Short, SscPositionForms.VendorShort,
-                                              SscPositionForms.OldLong, SscPositionForms.OldLongVendor,
-                                              SscPositionForms.OldTclp, SscPositionForms.OldTclpVendor,
-                                              SscPositionForms.Long, SscPositionForms.OldLongTclpVendor,
-                                              SscPositionForms.Extended);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out responseForm))
-                        {
-                            AaruConsole.WriteLine("Not a correct response form. Press any key to continue...");
-                            responseForm = SscPositionForms.Short;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadPosition(out _, out byte[] senseBuffer, responseForm, dev.Timeout,
-                                          out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ POSITION to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("READ POSITION decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ POSITION sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadReverse6(string devPath, Device dev)
-        {
-            bool   byteOrder = false;
-            bool   sili      = false;
-            bool   fixedLen  = true;
-            uint   blockSize = 512;
-            uint   length    = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ REVERSE (6) command:");
-                AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
-                AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "blocks" : "bytes");
-
-                if(fixedLen)
-                    AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-
-                AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
-                AaruConsole.WriteLine("Drive should unreverse bytes?: {0}", byteOrder);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Fixed block size?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fixedLen))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            fixedLen = true;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = (uint)(fixedLen ? 1 : 512);
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(length > 0xFFFFFF)
-                        {
-                            AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
-                                                  fixedLen ? "blocks" : "bytes");
-
-                            length = 0xFFFFFF;
-                        }
-
-                        if(fixedLen)
-                        {
-                            AaruConsole.Write("How many bytes to expect per block?: ");
-                            strDev = System.Console.ReadLine();
-
-                            if(!uint.TryParse(strDev, out blockSize))
-                            {
-                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                                blockSize = 512;
-                                System.Console.ReadKey();
-
-                                continue;
-                            }
-                        }
-
-                        AaruConsole.Write("Suppress length indicator?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out sili))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            sili = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Drive should unreverse bytes?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out byteOrder))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            byteOrder = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadReverse6(out byte[] buffer, out byte[] senseBuffer, byteOrder, sili, fixedLen, length,
-                                          blockSize, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ REVERSE (6) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ REVERSE (6) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ REVERSE (6) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ REVERSE (6) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadReverse16(string devPath, Device dev)
-        {
-            bool   byteOrder  = false;
-            bool   sili       = false;
-            bool   fixedLen   = true;
-            uint   objectSize = 512;
-            uint   length     = 1;
-            byte   partition  = 0;
-            ulong  objectId   = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ REVERSE (16) command:");
-                AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
-                AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "objects" : "bytes");
-
-                if(fixedLen)
-                    AaruConsole.WriteLine("{0} bytes expected per object", objectSize);
-
-                AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
-                AaruConsole.WriteLine("Read object {0} from partition {1}", objectId, partition);
-                AaruConsole.WriteLine("Drive should unreverse bytes?: {0}", byteOrder);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Fixed block size?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fixedLen))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            fixedLen = true;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many {0} to read?: ", fixedLen ? "objects" : "bytes");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = (uint)(fixedLen ? 1 : 512);
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(length > 0xFFFFFF)
-                        {
-                            AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
-                                                  fixedLen ? "blocks" : "bytes");
-
-                            length = 0xFFFFFF;
-                        }
-
-                        if(fixedLen)
-                        {
-                            AaruConsole.Write("How many bytes to expect per object?: ");
-                            strDev = System.Console.ReadLine();
-
-                            if(!uint.TryParse(strDev, out objectSize))
-                            {
-                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                                objectSize = 512;
-                                System.Console.ReadKey();
-
-                                continue;
-                            }
-                        }
-
-                        AaruConsole.Write("Suppress length indicator?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out sili))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            sili = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Object identifier?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!ulong.TryParse(strDev, out objectId))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            objectId = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Partition?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out partition))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            partition = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Drive should unreverse bytes?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out byteOrder))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            byteOrder = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReadReverse16(out byte[] buffer, out byte[] senseBuffer, byteOrder, sili, fixedLen,
-                                           partition, objectId, length, objectSize, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ REVERSE (16) to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ REVERSE (16) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ REVERSE (16) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ REVERSE (16) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void RecoverBufferedData(string devPath, Device dev)
-        {
-            bool   sili      = false;
-            bool   fixedLen  = true;
-            uint   blockSize = 512;
-            uint   length    = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for RECOVER BUFFERED DATA command:");
-                AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
-                AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "blocks" : "bytes");
-
-                if(fixedLen)
-                    AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-
-                AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Fixed block size?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out fixedLen))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            fixedLen = true;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out length))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            length = (uint)(fixedLen ? 1 : 512);
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(length > 0xFFFFFF)
-                        {
-                            AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
-                                                  fixedLen ? "blocks" : "bytes");
-
-                            length = 0xFFFFFF;
-                        }
-
-                        if(fixedLen)
-                        {
-                            AaruConsole.Write("How many bytes to expect per block?: ");
-                            strDev = System.Console.ReadLine();
-
-                            if(!uint.TryParse(strDev, out blockSize))
-                            {
-                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                                blockSize = 512;
-                                System.Console.ReadKey();
-
-                                continue;
-                            }
-                        }
-
-                        AaruConsole.Write("Suppress length indicator?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out sili))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            sili = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, sili, fixedLen, length,
-                                                 blockSize, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending RECOVER BUFFERED DATA to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("RECOVER BUFFERED DATA response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("RECOVER BUFFERED DATA sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("RECOVER BUFFERED DATA decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReportDensitySupport(string devPath, Device dev)
-        {
-            bool   medium  = false;
-            bool   current = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for REPORT DENSITY SUPPORT command:");
-                AaruConsole.WriteLine("Report about medium types?: {0}", medium);
-                AaruConsole.WriteLine("Report about current medium?: {0}", current);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Report about medium types?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out medium))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            medium = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Report about current medium?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out current))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            current = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, medium, current,
-                                                  dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending REPORT DENSITY SUPPORT to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print sense buffer.");
-            AaruConsole.WriteLine("4.- Decode sense buffer.");
-            AaruConsole.WriteLine("5.- Send command again.");
-            AaruConsole.WriteLine("6.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("REPORT DENSITY SUPPORT response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("REPORT DENSITY SUPPORT decoded buffer:");
-
-                    AaruConsole.Write("{0}",
-                                      medium ? DensitySupport.PrettifyMediumType(buffer)
-                                          : DensitySupport.PrettifyDensity(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("REPORT DENSITY SUPPORT sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("REPORT DENSITY SUPPORT decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 5: goto start;
-                case 6: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Rewind(string devPath, Device dev)
-        {
-            bool   immediate = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for REWIND command:");
-                AaruConsole.WriteLine("Immediate?: {0}", immediate);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Immediate?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out immediate))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            immediate = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-            bool sense = dev.Rewind(out byte[] senseBuffer, immediate, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending REWIND to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("REWIND decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("REWIND sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Space(string devPath, Device dev)
-        {
-            SscSpaceCodes what  = SscSpaceCodes.LogicalBlock;
-            int           count = -1;
-            string        strDev;
-            int           item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SPACE command:");
-                AaruConsole.WriteLine("What to space: {0}", what);
-                AaruConsole.WriteLine("How many: {0}", count);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.WriteLine("What to space");
-
-                        AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", SscSpaceCodes.LogicalBlock,
-                                              SscSpaceCodes.Filemark, SscSpaceCodes.SequentialFilemark,
-                                              SscSpaceCodes.EndOfData, SscSpaceCodes.Obsolete1,
-                                              SscSpaceCodes.Obsolete2);
-
-                        AaruConsole.Write("Choose?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!Enum.TryParse(strDev, true, out what))
-                        {
-                            AaruConsole.WriteLine("Not a correct object type. Press any key to continue...");
-                            what = SscSpaceCodes.LogicalBlock;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many (negative for reverse)?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!int.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-            bool sense = dev.Space(out byte[] senseBuffer, what, count, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SPACE to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("SPACE decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SPACE sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void TrackSelect(string devPath, Device dev)
-        {
-            byte   track = 1;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for TRACK SELECT command:");
-                AaruConsole.WriteLine("Track: {0}", track);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Track?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out track))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            track = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-            bool sense = dev.TrackSelect(out byte[] senseBuffer, track, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending TRACK SELECT to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine("TRACK SELECT decoded sense:");
-            AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print sense buffer.");
-            AaruConsole.WriteLine("2.- Send command again.");
-            AaruConsole.WriteLine("3.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("TRACK SELECT sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2: goto start;
-                case 3: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void LoadUnload(string devPath, Device dev)
+    {
+        bool   load      = true;
+        bool   immediate = false;
+        bool   retense   = false;
+        bool   eot       = false;
+        bool   hold      = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for LOAD UNLOAD command:");
+            AaruConsole.WriteLine("Load?: {0}", load);
+            AaruConsole.WriteLine("Immediate?: {0}", immediate);
+            AaruConsole.WriteLine("Retense?: {0}", retense);
+            AaruConsole.WriteLine("End of tape?: {0}", eot);
+            AaruConsole.WriteLine("Hold?: {0}", hold);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Load?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out load))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        load = true;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Immediate?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out immediate))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        immediate = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Retense?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out retense))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        retense = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("End of tape?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out eot))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        eot = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Hold?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out hold))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        hold = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.LoadUnload(out byte[] senseBuffer, immediate, load, retense, eot, hold, dev.Timeout,
+                                    out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending LOAD UNLOAD to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("LOAD UNLOAD decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LOAD UNLOAD sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Locate10(string devPath, Device dev)
+    {
+        bool   blockType       = true;
+        bool   immediate       = false;
+        bool   changePartition = false;
+        byte   partition       = 0;
+        uint   objectId        = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for LOCATE (10) command:");
+            AaruConsole.WriteLine("Locate block?: {0}", blockType);
+            AaruConsole.WriteLine("Immediate?: {0}", immediate);
+            AaruConsole.WriteLine("Change partition?: {0}", changePartition);
+            AaruConsole.WriteLine("Partition: {0}", partition);
+            AaruConsole.WriteLine("{1}: {0}", objectId, blockType ? "Block" : "Object");
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Load?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out blockType))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        blockType = true;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Immediate?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out immediate))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        immediate = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Change partition?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out changePartition))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        changePartition = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Partition?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out partition))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        partition = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("{0}?: ", blockType ? "Block" : "Object");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out objectId))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        objectId = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Locate(out byte[] senseBuffer, immediate, blockType, changePartition, partition, objectId,
+                                dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending LOCATE (10) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("LOCATE (10) decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LOCATE (10) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Locate16(string devPath, Device dev)
+    {
+        SscLogicalIdTypes destType        = SscLogicalIdTypes.FileId;
+        bool              immediate       = false;
+        bool              changePartition = false;
+        bool              bam             = false;
+        byte              partition       = 0;
+        ulong             objectId        = 1;
+        string            strDev;
+        int               item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for LOCATE (16) command:");
+            AaruConsole.WriteLine("Object type: {0}", destType);
+            AaruConsole.WriteLine("Immediate?: {0}", immediate);
+            AaruConsole.WriteLine("Explicit identifier?: {0}", bam);
+            AaruConsole.WriteLine("Change partition?: {0}", changePartition);
+            AaruConsole.WriteLine("Partition: {0}", partition);
+            AaruConsole.WriteLine("Object identifier: {0}", objectId);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.WriteLine("Object type");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3}", SscLogicalIdTypes.FileId,
+                                          SscLogicalIdTypes.ObjectId, SscLogicalIdTypes.Reserved,
+                                          SscLogicalIdTypes.SetId);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out destType))
+                    {
+                        AaruConsole.WriteLine("Not a correct object type. Press any key to continue...");
+                        destType = SscLogicalIdTypes.FileId;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Immediate?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out immediate))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        immediate = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Explicit identifier?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out bam))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        bam = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Change partition?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out changePartition))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        changePartition = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Partition?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out partition))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        partition = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Identifier");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ulong.TryParse(strDev, out objectId))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        objectId = 1;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Locate16(out byte[] senseBuffer, immediate, changePartition, destType, bam, partition,
+                                  objectId, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending LOCATE (16) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("LOCATE (16) decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LOCATE (16) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Read6(string devPath, Device dev)
+    {
+        bool   sili      = false;
+        bool   fixedLen  = true;
+        uint   blockSize = 512;
+        uint   length    = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ (6) command:");
+            AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
+            AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "blocks" : "bytes");
+
+            if(fixedLen)
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+
+            AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Fixed block size?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fixedLen))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        fixedLen = true;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = (uint)(fixedLen ? 1 : 512);
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(length > 0xFFFFFF)
+                    {
+                        AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
+                                              fixedLen ? "blocks" : "bytes");
+
+                        length = 0xFFFFFF;
+                    }
+
+                    if(fixedLen)
+                    {
+                        AaruConsole.Write("How many bytes to expect per block?: ");
+                        strDev = System.Console.ReadLine();
+
+                        if(!uint.TryParse(strDev, out blockSize))
+                        {
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                            blockSize = 512;
+                            System.Console.ReadKey();
+
+                            continue;
+                        }
+                    }
+
+                    AaruConsole.Write("Suppress length indicator?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out sili))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        sili = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read6(out byte[] buffer, out byte[] senseBuffer, sili, fixedLen, length, blockSize,
+                               dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ (6) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (6) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (6) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (6) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Read16(string devPath, Device dev)
+    {
+        bool   sili       = false;
+        bool   fixedLen   = true;
+        uint   objectSize = 512;
+        uint   length     = 1;
+        byte   partition  = 0;
+        ulong  objectId   = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ (16) command:");
+            AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
+            AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "objects" : "bytes");
+
+            if(fixedLen)
+                AaruConsole.WriteLine("{0} bytes expected per object", objectSize);
+
+            AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
+            AaruConsole.WriteLine("Read object {0} from partition {1}", objectId, partition);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Fixed block size?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fixedLen))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        fixedLen = true;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many {0} to read?: ", fixedLen ? "objects" : "bytes");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = (uint)(fixedLen ? 1 : 512);
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(length > 0xFFFFFF)
+                    {
+                        AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
+                                              fixedLen ? "blocks" : "bytes");
+
+                        length = 0xFFFFFF;
+                    }
+
+                    if(fixedLen)
+                    {
+                        AaruConsole.Write("How many bytes to expect per object?: ");
+                        strDev = System.Console.ReadLine();
+
+                        if(!uint.TryParse(strDev, out objectSize))
+                        {
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                            objectSize = 512;
+                            System.Console.ReadKey();
+
+                            continue;
+                        }
+                    }
+
+                    AaruConsole.Write("Suppress length indicator?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out sili))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        sili = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Object identifier?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ulong.TryParse(strDev, out objectId))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        objectId = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Partition?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out partition))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        partition = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read16(out byte[] buffer, out byte[] senseBuffer, sili, fixedLen, partition, objectId,
+                                length, objectSize, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ (16) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (16) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (16) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ (16) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadBlockLimits(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadBlockLimits(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                         out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ BLOCK LIMITS to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print sense buffer.");
+        AaruConsole.WriteLine("4.- Decode sense buffer.");
+        AaruConsole.WriteLine("5.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ BLOCK LIMITS response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ BLOCK LIMITS decoded response:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", BlockLimits.Prettify(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ BLOCK LIMITS sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ BLOCK LIMITS decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 5: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadPosition(string devPath, Device dev)
+    {
+        SscPositionForms responseForm = SscPositionForms.Short;
+        string           strDev;
+        int              item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for LOCATE (16) command:");
+            AaruConsole.WriteLine("Response form: {0}", responseForm);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.WriteLine("Response form");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5} {6} {7} {8}",
+                                          SscPositionForms.Short, SscPositionForms.VendorShort,
+                                          SscPositionForms.OldLong, SscPositionForms.OldLongVendor,
+                                          SscPositionForms.OldTclp, SscPositionForms.OldTclpVendor,
+                                          SscPositionForms.Long, SscPositionForms.OldLongTclpVendor,
+                                          SscPositionForms.Extended);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out responseForm))
+                    {
+                        AaruConsole.WriteLine("Not a correct response form. Press any key to continue...");
+                        responseForm = SscPositionForms.Short;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadPosition(out _, out byte[] senseBuffer, responseForm, dev.Timeout,
+                                      out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ POSITION to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("READ POSITION decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ POSITION sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadReverse6(string devPath, Device dev)
+    {
+        bool   byteOrder = false;
+        bool   sili      = false;
+        bool   fixedLen  = true;
+        uint   blockSize = 512;
+        uint   length    = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ REVERSE (6) command:");
+            AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
+            AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "blocks" : "bytes");
+
+            if(fixedLen)
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+
+            AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
+            AaruConsole.WriteLine("Drive should unreverse bytes?: {0}", byteOrder);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Fixed block size?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fixedLen))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        fixedLen = true;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = (uint)(fixedLen ? 1 : 512);
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(length > 0xFFFFFF)
+                    {
+                        AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
+                                              fixedLen ? "blocks" : "bytes");
+
+                        length = 0xFFFFFF;
+                    }
+
+                    if(fixedLen)
+                    {
+                        AaruConsole.Write("How many bytes to expect per block?: ");
+                        strDev = System.Console.ReadLine();
+
+                        if(!uint.TryParse(strDev, out blockSize))
+                        {
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                            blockSize = 512;
+                            System.Console.ReadKey();
+
+                            continue;
+                        }
+                    }
+
+                    AaruConsole.Write("Suppress length indicator?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out sili))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        sili = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Drive should unreverse bytes?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out byteOrder))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        byteOrder = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadReverse6(out byte[] buffer, out byte[] senseBuffer, byteOrder, sili, fixedLen, length,
+                                      blockSize, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ REVERSE (6) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ REVERSE (6) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ REVERSE (6) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ REVERSE (6) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadReverse16(string devPath, Device dev)
+    {
+        bool   byteOrder  = false;
+        bool   sili       = false;
+        bool   fixedLen   = true;
+        uint   objectSize = 512;
+        uint   length     = 1;
+        byte   partition  = 0;
+        ulong  objectId   = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ REVERSE (16) command:");
+            AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
+            AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "objects" : "bytes");
+
+            if(fixedLen)
+                AaruConsole.WriteLine("{0} bytes expected per object", objectSize);
+
+            AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
+            AaruConsole.WriteLine("Read object {0} from partition {1}", objectId, partition);
+            AaruConsole.WriteLine("Drive should unreverse bytes?: {0}", byteOrder);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Fixed block size?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fixedLen))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        fixedLen = true;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many {0} to read?: ", fixedLen ? "objects" : "bytes");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = (uint)(fixedLen ? 1 : 512);
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(length > 0xFFFFFF)
+                    {
+                        AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
+                                              fixedLen ? "blocks" : "bytes");
+
+                        length = 0xFFFFFF;
+                    }
+
+                    if(fixedLen)
+                    {
+                        AaruConsole.Write("How many bytes to expect per object?: ");
+                        strDev = System.Console.ReadLine();
+
+                        if(!uint.TryParse(strDev, out objectSize))
+                        {
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                            objectSize = 512;
+                            System.Console.ReadKey();
+
+                            continue;
+                        }
+                    }
+
+                    AaruConsole.Write("Suppress length indicator?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out sili))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        sili = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Object identifier?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!ulong.TryParse(strDev, out objectId))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        objectId = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Partition?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out partition))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        partition = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Drive should unreverse bytes?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out byteOrder))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        byteOrder = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReadReverse16(out byte[] buffer, out byte[] senseBuffer, byteOrder, sili, fixedLen,
+                                       partition, objectId, length, objectSize, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ REVERSE (16) to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ REVERSE (16) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ REVERSE (16) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ REVERSE (16) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void RecoverBufferedData(string devPath, Device dev)
+    {
+        bool   sili      = false;
+        bool   fixedLen  = true;
+        uint   blockSize = 512;
+        uint   length    = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for RECOVER BUFFERED DATA command:");
+            AaruConsole.WriteLine("Fixed block size?: {0}", fixedLen);
+            AaruConsole.WriteLine("Will read {0} {1}", length, fixedLen ? "blocks" : "bytes");
+
+            if(fixedLen)
+                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+
+            AaruConsole.WriteLine("Suppress length indicator?: {0}", sili);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Fixed block size?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out fixedLen))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        fixedLen = true;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many {0} to read?: ", fixedLen ? "blocks" : "bytes");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out length))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        length = (uint)(fixedLen ? 1 : 512);
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(length > 0xFFFFFF)
+                    {
+                        AaruConsole.WriteLine("Max number of {1} is {0}, setting to {0}", 0xFFFFFF,
+                                              fixedLen ? "blocks" : "bytes");
+
+                        length = 0xFFFFFF;
+                    }
+
+                    if(fixedLen)
+                    {
+                        AaruConsole.Write("How many bytes to expect per block?: ");
+                        strDev = System.Console.ReadLine();
+
+                        if(!uint.TryParse(strDev, out blockSize))
+                        {
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                            blockSize = 512;
+                            System.Console.ReadKey();
+
+                            continue;
+                        }
+                    }
+
+                    AaruConsole.Write("Suppress length indicator?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out sili))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        sili = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.RecoverBufferedData(out byte[] buffer, out byte[] senseBuffer, sili, fixedLen, length,
+                                             blockSize, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending RECOVER BUFFERED DATA to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("RECOVER BUFFERED DATA response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("RECOVER BUFFERED DATA sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("RECOVER BUFFERED DATA decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReportDensitySupport(string devPath, Device dev)
+    {
+        bool   medium  = false;
+        bool   current = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for REPORT DENSITY SUPPORT command:");
+            AaruConsole.WriteLine("Report about medium types?: {0}", medium);
+            AaruConsole.WriteLine("Report about current medium?: {0}", current);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Report about medium types?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out medium))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        medium = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Report about current medium?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out current))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        current = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.ReportDensitySupport(out byte[] buffer, out byte[] senseBuffer, medium, current,
+                                              dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending REPORT DENSITY SUPPORT to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print sense buffer.");
+        AaruConsole.WriteLine("4.- Decode sense buffer.");
+        AaruConsole.WriteLine("5.- Send command again.");
+        AaruConsole.WriteLine("6.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("REPORT DENSITY SUPPORT response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("REPORT DENSITY SUPPORT decoded buffer:");
+
+                AaruConsole.Write("{0}",
+                                  medium ? DensitySupport.PrettifyMediumType(buffer)
+                                      : DensitySupport.PrettifyDensity(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("REPORT DENSITY SUPPORT sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("REPORT DENSITY SUPPORT decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 5: goto start;
+            case 6: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Rewind(string devPath, Device dev)
+    {
+        bool   immediate = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for REWIND command:");
+            AaruConsole.WriteLine("Immediate?: {0}", immediate);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Immediate?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out immediate))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        immediate = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+        bool sense = dev.Rewind(out byte[] senseBuffer, immediate, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending REWIND to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("REWIND decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("REWIND sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Space(string devPath, Device dev)
+    {
+        SscSpaceCodes what  = SscSpaceCodes.LogicalBlock;
+        int           count = -1;
+        string        strDev;
+        int           item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SPACE command:");
+            AaruConsole.WriteLine("What to space: {0}", what);
+            AaruConsole.WriteLine("How many: {0}", count);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.WriteLine("What to space");
+
+                    AaruConsole.WriteLine("Available values: {0} {1} {2} {3} {4} {5}", SscSpaceCodes.LogicalBlock,
+                                          SscSpaceCodes.Filemark, SscSpaceCodes.SequentialFilemark,
+                                          SscSpaceCodes.EndOfData, SscSpaceCodes.Obsolete1,
+                                          SscSpaceCodes.Obsolete2);
+
+                    AaruConsole.Write("Choose?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!Enum.TryParse(strDev, true, out what))
+                    {
+                        AaruConsole.WriteLine("Not a correct object type. Press any key to continue...");
+                        what = SscSpaceCodes.LogicalBlock;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many (negative for reverse)?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!int.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+        bool sense = dev.Space(out byte[] senseBuffer, what, count, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SPACE to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("SPACE decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SPACE sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void TrackSelect(string devPath, Device dev)
+    {
+        byte   track = 1;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for TRACK SELECT command:");
+            AaruConsole.WriteLine("Track: {0}", track);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Track?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out track))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        track = 0;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+        bool sense = dev.TrackSelect(out byte[] senseBuffer, track, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending TRACK SELECT to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine("TRACK SELECT decoded sense:");
+        AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print sense buffer.");
+        AaruConsole.WriteLine("2.- Send command again.");
+        AaruConsole.WriteLine("3.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SCSI Streaming Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SCSI Streaming Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("TRACK SELECT sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2: goto start;
+            case 3: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI/SyQuest.cs b/Aaru.Tests.Devices/SCSI/SyQuest.cs
index 15841cd34..322a89131 100644
--- a/Aaru.Tests.Devices/SCSI/SyQuest.cs
+++ b/Aaru.Tests.Devices/SCSI/SyQuest.cs
@@ -31,473 +31,23 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SCSI
+namespace Aaru.Tests.Devices.SCSI;
+
+internal static class SyQuest
 {
-    internal static class SyQuest
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a SyQuest vendor command to the device:");
-                AaruConsole.WriteLine("1.- Send READ (6) command.");
-                AaruConsole.WriteLine("2.- Send READ (10) command.");
-                AaruConsole.WriteLine("3.- Send READ LONG (6) command.");
-                AaruConsole.WriteLine("4.- Send READ LONG (10) command.");
-                AaruConsole.WriteLine("5.- Send READ/RESET USAGE COUNTER command.");
-                AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
-                AaruConsole.Write("Choose: ");
-
-                string strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SCSI commands menu...");
-
-                        return;
-                    case 1:
-                        Read6(devPath, dev, false);
-
-                        continue;
-                    case 2:
-                        Read10(devPath, dev, false);
-
-                        continue;
-                    case 3:
-                        Read6(devPath, dev, true);
-
-                        continue;
-                    case 4:
-                        Read10(devPath, dev, true);
-
-                        continue;
-                    case 5:
-                        ReadResetUsageCounter(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void Read6(string devPath, Device dev, bool readlong)
-        {
-            uint   lba       = 0;
-            uint   blockSize = 512;
-            byte   count     = 1;
-            bool   noDma     = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ {0}(6) command:", readlong ? "LONG " : "");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
-                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-                AaruConsole.WriteLine("Inhibit DMA?: {0}", noDma);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(lba > 0x1FFFFF)
-                        {
-                            AaruConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
-                            lba = 0x1FFFFF;
-                        }
-
-                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many bytes to expect per block?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Inhibit DMA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out noDma))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            noDma = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            bool sense = dev.SyQuestRead6(out byte[] buffer, out byte[] senseBuffer, lba, blockSize, count, noDma,
-                                          readlong, dev.Timeout, out double duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ {0}(6) to the device:", readlong ? "LONG " : "");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ {0}(6) response:", readlong ? "LONG " : "");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ {0}(6) sense:", readlong ? "LONG " : "");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ {0}(6) decoded sense:", readlong ? "LONG " : "");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Read10(string devPath, Device dev, bool readlong)
-        {
-            uint   lba       = 0;
-            uint   blockSize = 512;
-            byte   count     = 1;
-            bool   noDma     = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ {0}(10) command:", readlong ? "LONG " : "");
-                AaruConsole.WriteLine("LBA: {0}", lba);
-                AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
-                AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
-                AaruConsole.WriteLine("Inhibit DMA?: {0}", noDma);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out lba))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            lba = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!byte.TryParse(strDev, out count))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            count = 1;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("How many bytes to expect per block?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Inhibit DMA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out noDma))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            noDma = false;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.SyQuestRead10(out byte[] buffer, out byte[] senseBuffer, lba, blockSize, count, noDma,
-                                           readlong, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ {0}(10) to the device:", readlong ? "LONG " : "");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ {0}(10) response:", readlong ? "LONG " : "");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ {0}(10) sense:", readlong ? "LONG " : "");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ {0}(10) decoded sense:", readlong ? "LONG " : "");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void ReadResetUsageCounter(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-
-            bool sense =
-                dev.SyQuestReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
-                                            out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ/RESET USAGE COUNTER to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+            AaruConsole.WriteLine("Send a SyQuest vendor command to the device:");
+            AaruConsole.WriteLine("1.- Send READ (6) command.");
+            AaruConsole.WriteLine("2.- Send READ (10) command.");
+            AaruConsole.WriteLine("3.- Send READ LONG (6) command.");
+            AaruConsole.WriteLine("4.- Send READ LONG (10) command.");
+            AaruConsole.WriteLine("5.- Send READ/RESET USAGE COUNTER command.");
+            AaruConsole.WriteLine("0.- Return to SCSI commands menu.");
             AaruConsole.Write("Choose: ");
 
             string strDev = System.Console.ReadLine();
@@ -506,9 +56,79 @@ namespace Aaru.Tests.Devices.SCSI
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SCSI commands menu...");
+
+                    return;
+                case 1:
+                    Read6(devPath, dev, false);
+
+                    continue;
+                case 2:
+                    Read10(devPath, dev, false);
+
+                    continue;
+                case 3:
+                    Read6(devPath, dev, true);
+
+                    continue;
+                case 4:
+                    Read10(devPath, dev, true);
+
+                    continue;
+                case 5:
+                    ReadResetUsageCounter(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                    System.Console.ReadKey();
+
+                    continue;
+            }
+        }
+    }
+
+    static void Read6(string devPath, Device dev, bool readlong)
+    {
+        uint   lba       = 0;
+        uint   blockSize = 512;
+        byte   count     = 1;
+        bool   noDma     = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ {0}(6) command:", readlong ? "LONG " : "");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+            AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+            AaruConsole.WriteLine("Inhibit DMA?: {0}", noDma);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
             }
 
             switch(item)
@@ -518,52 +138,431 @@ namespace Aaru.Tests.Devices.SCSI
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER response:");
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                        continue;
+                    }
 
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER sense:");
+                    if(lba > 0x1FFFFF)
+                    {
+                        AaruConsole.WriteLine("Max LBA is {0}, setting to {0}", 0x1FFFFF);
+                        lba = 0x1FFFFF;
+                    }
 
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
+                    AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                    strDev = System.Console.ReadLine();
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
 
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ/RESET USAGE COUNTER decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
+                        continue;
+                    }
 
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
+                    AaruConsole.Write("How many bytes to expect per block?: ");
+                    strDev = System.Console.ReadLine();
 
-                    goto menu;
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Inhibit DMA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out noDma))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        noDma = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
             }
         }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.SyQuestRead6(out byte[] buffer, out byte[] senseBuffer, lba, blockSize, count, noDma,
+                                      readlong, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ {0}(6) to the device:", readlong ? "LONG " : "");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ {0}(6) response:", readlong ? "LONG " : "");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ {0}(6) sense:", readlong ? "LONG " : "");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ {0}(6) decoded sense:", readlong ? "LONG " : "");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Read10(string devPath, Device dev, bool readlong)
+    {
+        uint   lba       = 0;
+        uint   blockSize = 512;
+        byte   count     = 1;
+        bool   noDma     = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ {0}(10) command:", readlong ? "LONG " : "");
+            AaruConsole.WriteLine("LBA: {0}", lba);
+            AaruConsole.WriteLine("{0} blocks to read", count == 0 ? 256 : count);
+            AaruConsole.WriteLine("{0} bytes expected per block", blockSize);
+            AaruConsole.WriteLine("Inhibit DMA?: {0}", noDma);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out lba))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        lba = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Blocks to read (0 for 256 blocks)?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!byte.TryParse(strDev, out count))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        count = 1;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("How many bytes to expect per block?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Inhibit DMA?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out noDma))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        noDma = false;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.SyQuestRead10(out byte[] buffer, out byte[] senseBuffer, lba, blockSize, count, noDma,
+                                       readlong, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ {0}(10) to the device:", readlong ? "LONG " : "");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ {0}(10) response:", readlong ? "LONG " : "");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ {0}(10) sense:", readlong ? "LONG " : "");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ {0}(10) decoded sense:", readlong ? "LONG " : "");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void ReadResetUsageCounter(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+
+        bool sense =
+            dev.SyQuestReadUsageCounter(out byte[] buffer, out byte[] senseBuffer, dev.Timeout,
+                                        out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ/RESET USAGE COUNTER to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to SyQuest vendor commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SyQuest vendor commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ/RESET USAGE COUNTER response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ/RESET USAGE COUNTER sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ/RESET USAGE COUNTER decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs b/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs
index 6ba6ce72c..1d14f5353 100644
--- a/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs
+++ b/Aaru.Tests.Devices/SCSI_MMC/GdRom.cs
@@ -6,697 +6,696 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class ScsiMmc
 {
-    internal static partial class ScsiMmc
+    static void CheckGdromReadability(string devPath, Device dev)
     {
-        static void CheckGdromReadability(string devPath, Device dev)
+        string strDev;
+        int    item;
+        bool   tocIsNotBcd = false;
+        bool   sense;
+        byte[] buffer;
+        byte[] senseBuffer;
+        int    retries;
+
+        start:
+        System.Console.Clear();
+
+        AaruConsole.WriteLine("Ejecting disc...");
+
+        dev.AllowMediumRemoval(out _, dev.Timeout, out _);
+        dev.EjectTray(out _, dev.Timeout, out _);
+
+        AaruConsole.WriteLine("Please insert trap disc inside...");
+        AaruConsole.WriteLine("Press any key to continue...");
+        System.Console.ReadLine();
+
+        AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+
+        retries = 0;
+
+        do
         {
-            string strDev;
-            int    item;
-            bool   tocIsNotBcd = false;
-            bool   sense;
-            byte[] buffer;
-            byte[] senseBuffer;
-            int    retries;
+            retries++;
+            sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
 
-            start:
-            System.Console.Clear();
+            if(!sense)
+                break;
 
-            AaruConsole.WriteLine("Ejecting disc...");
+            DecodedSense? decodedSense = Sense.Decode(senseBuffer);
 
-            dev.AllowMediumRemoval(out _, dev.Timeout, out _);
-            dev.EjectTray(out _, dev.Timeout, out _);
+            if(decodedSense.Value.ASC != 0x04)
+                break;
 
-            AaruConsole.WriteLine("Please insert trap disc inside...");
+            if(decodedSense.Value.ASCQ != 0x01)
+                break;
+
+            Thread.Sleep(2000);
+        } while(retries < 25);
+
+        sense = dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _);
+
+        if(sense)
+        {
+            AaruConsole.WriteLine("READ FULL TOC failed...");
+            AaruConsole.WriteLine("{0}", Sense.PrettifySense(senseBuffer));
             AaruConsole.WriteLine("Press any key to continue...");
             System.Console.ReadLine();
 
-            AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+            return;
+        }
 
-            retries = 0;
+        FullTOC.CDFullTOC? decodedToc = FullTOC.Decode(buffer);
 
-            do
-            {
-                retries++;
-                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+        if(decodedToc is null)
+        {
+            AaruConsole.WriteLine("Could not decode TOC...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
 
-                if(!sense)
-                    break;
+            return;
+        }
 
-                DecodedSense? decodedSense = Sense.Decode(senseBuffer);
+        FullTOC.CDFullTOC toc = decodedToc.Value;
 
-                if(decodedSense.Value.ASC != 0x04)
-                    break;
+        FullTOC.TrackDataDescriptor leadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
 
-                if(decodedSense.Value.ASCQ != 0x01)
-                    break;
+        if(leadOutTrack.POINT != 0xA2)
+        {
+            AaruConsole.WriteLine("Cannot find lead-out...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
 
-                Thread.Sleep(2000);
-            } while(retries < 25);
+            return;
+        }
 
+        int min = 0, sec, frame;
+
+        if(leadOutTrack.PMIN == 122)
+            tocIsNotBcd = true;
+
+        if(leadOutTrack.PMIN >= 0xA0 &&
+           !tocIsNotBcd)
+        {
+            min               += 90;
+            leadOutTrack.PMIN -= 0x90;
+        }
+
+        if(tocIsNotBcd)
+        {
+            min   = leadOutTrack.PMIN;
+            sec   = leadOutTrack.PSEC;
+            frame = leadOutTrack.PFRAME;
+        }
+        else
+        {
+            min   += ((leadOutTrack.PMIN   >> 4) * 10) + (leadOutTrack.PMIN   & 0x0F);
+            sec   =  ((leadOutTrack.PSEC   >> 4) * 10) + (leadOutTrack.PSEC   & 0x0F);
+            frame =  ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F);
+        }
+
+        int sectors = (min * 60 * 75) + (sec * 75) + frame - 150;
+
+        AaruConsole.WriteLine("Trap disc shows {0} sectors...", sectors);
+
+        if(sectors < 450000)
+        {
+            AaruConsole.WriteLine("Trap disc doesn't have enough sectors...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
+
+            return;
+        }
+
+        AaruConsole.WriteLine("Stopping motor...");
+
+        dev.StopUnit(out _, dev.Timeout, out _);
+
+        AaruConsole.WriteLine("Please MANUALLY get the trap disc out and put the GD-ROM disc inside...");
+        AaruConsole.WriteLine("Press any key to continue...");
+        System.Console.ReadLine();
+
+        AaruConsole.WriteLine("Waiting 5 seconds...");
+        Thread.Sleep(5000);
+
+        AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+
+        retries = 0;
+
+        do
+        {
+            retries++;
             sense = dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _);
 
-            if(sense)
-            {
-                AaruConsole.WriteLine("READ FULL TOC failed...");
-                AaruConsole.WriteLine("{0}", Sense.PrettifySense(senseBuffer));
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+            if(!sense)
+                break;
 
-                return;
-            }
+            DecodedSense? decodedSense = Sense.Decode(senseBuffer);
 
-            FullTOC.CDFullTOC? decodedToc = FullTOC.Decode(buffer);
+            if(decodedSense.Value.ASC != 0x04)
+                break;
 
-            if(decodedToc is null)
-            {
-                AaruConsole.WriteLine("Could not decode TOC...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+            if(decodedSense.Value.ASCQ != 0x01)
+                break;
+        } while(retries < 25);
 
-                return;
-            }
-
-            FullTOC.CDFullTOC toc = decodedToc.Value;
-
-            FullTOC.TrackDataDescriptor leadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
-
-            if(leadOutTrack.POINT != 0xA2)
-            {
-                AaruConsole.WriteLine("Cannot find lead-out...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
-
-                return;
-            }
-
-            int min = 0, sec, frame;
-
-            if(leadOutTrack.PMIN == 122)
-                tocIsNotBcd = true;
-
-            if(leadOutTrack.PMIN >= 0xA0 &&
-               !tocIsNotBcd)
-            {
-                min               += 90;
-                leadOutTrack.PMIN -= 0x90;
-            }
-
-            if(tocIsNotBcd)
-            {
-                min   = leadOutTrack.PMIN;
-                sec   = leadOutTrack.PSEC;
-                frame = leadOutTrack.PFRAME;
-            }
-            else
-            {
-                min   += ((leadOutTrack.PMIN   >> 4) * 10) + (leadOutTrack.PMIN   & 0x0F);
-                sec   =  ((leadOutTrack.PSEC   >> 4) * 10) + (leadOutTrack.PSEC   & 0x0F);
-                frame =  ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F);
-            }
-
-            int sectors = (min * 60 * 75) + (sec * 75) + frame - 150;
-
-            AaruConsole.WriteLine("Trap disc shows {0} sectors...", sectors);
-
-            if(sectors < 450000)
-            {
-                AaruConsole.WriteLine("Trap disc doesn't have enough sectors...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
-
-                return;
-            }
-
-            AaruConsole.WriteLine("Stopping motor...");
-
-            dev.StopUnit(out _, dev.Timeout, out _);
-
-            AaruConsole.WriteLine("Please MANUALLY get the trap disc out and put the GD-ROM disc inside...");
+        if(sense)
+        {
+            AaruConsole.WriteLine("READ FULL TOC failed...");
+            AaruConsole.WriteLine("{0}", Sense.PrettifySense(senseBuffer));
             AaruConsole.WriteLine("Press any key to continue...");
             System.Console.ReadLine();
 
-            AaruConsole.WriteLine("Waiting 5 seconds...");
-            Thread.Sleep(5000);
+            return;
+        }
 
-            AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+        decodedToc = FullTOC.Decode(buffer);
 
-            retries = 0;
+        if(decodedToc is null)
+        {
+            AaruConsole.WriteLine("Could not decode TOC...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
 
-            do
-            {
-                retries++;
-                sense = dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _);
+            return;
+        }
 
-                if(!sense)
-                    break;
+        toc = decodedToc.Value;
 
-                DecodedSense? decodedSense = Sense.Decode(senseBuffer);
+        FullTOC.TrackDataDescriptor newLeadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
 
-                if(decodedSense.Value.ASC != 0x04)
-                    break;
+        if(newLeadOutTrack.POINT != 0xA2)
+        {
+            AaruConsole.WriteLine("Cannot find lead-out...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
 
-                if(decodedSense.Value.ASCQ != 0x01)
-                    break;
-            } while(retries < 25);
+            return;
+        }
 
-            if(sense)
-            {
-                AaruConsole.WriteLine("READ FULL TOC failed...");
-                AaruConsole.WriteLine("{0}", Sense.PrettifySense(senseBuffer));
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+        if(newLeadOutTrack.PMIN >= 0xA0 &&
+           !tocIsNotBcd)
+            newLeadOutTrack.PMIN -= 0x90;
 
-                return;
-            }
+        if(newLeadOutTrack.PMIN   != leadOutTrack.PMIN ||
+           newLeadOutTrack.PSEC   != leadOutTrack.PSEC ||
+           newLeadOutTrack.PFRAME != leadOutTrack.PFRAME)
+        {
+            AaruConsole.WriteLine("Lead-out has changed, this drive does not support hot swapping discs...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
 
-            decodedToc = FullTOC.Decode(buffer);
+            return;
+        }
 
-            if(decodedToc is null)
-            {
-                AaruConsole.WriteLine("Could not decode TOC...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+        dev.SetCdSpeed(out _, RotationalControl.PureCav, 170, 0, dev.Timeout, out _);
 
-                return;
-            }
+        AaruConsole.Write("Reading LBA 0... ");
 
-            toc = decodedToc.Value;
+        bool lba0Result = dev.ReadCd(out byte[] lba0Buffer, out byte[] lba0Sense, 0, 2352, 1,
+                                     MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true,
+                                     true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
-            FullTOC.TrackDataDescriptor newLeadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
+        AaruConsole.WriteLine(lba0Result ? "FAIL!" : "Success!");
 
-            if(newLeadOutTrack.POINT != 0xA2)
-            {
-                AaruConsole.WriteLine("Cannot find lead-out...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+        AaruConsole.Write("Reading LBA 0 as audio (scrambled)... ");
 
-                return;
-            }
+        bool lba0ScrambledResult = dev.ReadCd(out byte[] lba0ScrambledBuffer, out byte[] lba0ScrambledSense, 0,
+                                              2352, 1, MmcSectorTypes.Cdda, false, false, false,
+                                              MmcHeaderCodes.None, true, false, MmcErrorField.None,
+                                              MmcSubchannel.None, dev.Timeout, out _);
 
-            if(newLeadOutTrack.PMIN >= 0xA0 &&
-               !tocIsNotBcd)
-                newLeadOutTrack.PMIN -= 0x90;
+        AaruConsole.WriteLine(lba0ScrambledResult ? "FAIL!" : "Success!");
 
-            if(newLeadOutTrack.PMIN   != leadOutTrack.PMIN ||
-               newLeadOutTrack.PSEC   != leadOutTrack.PSEC ||
-               newLeadOutTrack.PFRAME != leadOutTrack.PFRAME)
-            {
-                AaruConsole.WriteLine("Lead-out has changed, this drive does not support hot swapping discs...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+        AaruConsole.Write("Reading LBA 100000... ");
 
-                return;
-            }
+        bool lba100000Result = dev.ReadCd(out byte[] lba100000Buffer, out byte[] lba100000Sense, 100000, 2352, 1,
+                                          MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                          true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
-            dev.SetCdSpeed(out _, RotationalControl.PureCav, 170, 0, dev.Timeout, out _);
+        AaruConsole.WriteLine(lba100000Result ? "FAIL!" : "Success!");
 
-            AaruConsole.Write("Reading LBA 0... ");
+        AaruConsole.Write("Reading LBA 50000... ");
 
-            bool lba0Result = dev.ReadCd(out byte[] lba0Buffer, out byte[] lba0Sense, 0, 2352, 1,
-                                         MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true,
-                                         true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+        bool lba50000Result = dev.ReadCd(out byte[] lba50000Buffer, out byte[] lba50000Sense, 50000, 2352, 1,
+                                         MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                         true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
-            AaruConsole.WriteLine(lba0Result ? "FAIL!" : "Success!");
+        AaruConsole.WriteLine(lba50000Result ? "FAIL!" : "Success!");
 
-            AaruConsole.Write("Reading LBA 0 as audio (scrambled)... ");
+        AaruConsole.Write("Reading LBA 450000... ");
 
-            bool lba0ScrambledResult = dev.ReadCd(out byte[] lba0ScrambledBuffer, out byte[] lba0ScrambledSense, 0,
-                                                  2352, 1, MmcSectorTypes.Cdda, false, false, false,
-                                                  MmcHeaderCodes.None, true, false, MmcErrorField.None,
-                                                  MmcSubchannel.None, dev.Timeout, out _);
+        bool lba450000Result = dev.ReadCd(out byte[] lba450000Buffer, out byte[] lba450000Sense, 450000, 2352, 1,
+                                          MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                          true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
-            AaruConsole.WriteLine(lba0ScrambledResult ? "FAIL!" : "Success!");
+        AaruConsole.WriteLine(lba450000Result ? "FAIL!" : "Success!");
 
-            AaruConsole.Write("Reading LBA 100000... ");
+        AaruConsole.Write("Reading LBA 400000... ");
 
-            bool lba100000Result = dev.ReadCd(out byte[] lba100000Buffer, out byte[] lba100000Sense, 100000, 2352, 1,
-                                              MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                              true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+        bool lba400000Result = dev.ReadCd(out byte[] lba400000Buffer, out byte[] lba400000Sense, 400000, 2352, 1,
+                                          MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                          true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
-            AaruConsole.WriteLine(lba100000Result ? "FAIL!" : "Success!");
+        AaruConsole.WriteLine(lba400000Result ? "FAIL!" : "Success!");
 
-            AaruConsole.Write("Reading LBA 50000... ");
+        AaruConsole.Write("Reading LBA 45000... ");
 
-            bool lba50000Result = dev.ReadCd(out byte[] lba50000Buffer, out byte[] lba50000Sense, 50000, 2352, 1,
-                                             MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                             true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+        bool lba45000Result = dev.ReadCd(out byte[] lba45000Buffer, out byte[] lba45000Sense, 45000, 2352, 1,
+                                         MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                         true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
-            AaruConsole.WriteLine(lba50000Result ? "FAIL!" : "Success!");
+        AaruConsole.WriteLine(lba45000Result ? "FAIL!" : "Success!");
 
-            AaruConsole.Write("Reading LBA 450000... ");
+        AaruConsole.Write("Reading LBA 44990... ");
 
-            bool lba450000Result = dev.ReadCd(out byte[] lba450000Buffer, out byte[] lba450000Sense, 450000, 2352, 1,
-                                              MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                              true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+        bool lba44990Result = dev.ReadCd(out byte[] lba44990Buffer, out byte[] lba44990Sense, 44990, 2352, 1,
+                                         MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
+                                         true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
-            AaruConsole.WriteLine(lba450000Result ? "FAIL!" : "Success!");
+        AaruConsole.WriteLine(lba44990Result ? "FAIL!" : "Success!");
 
-            AaruConsole.Write("Reading LBA 400000... ");
+        menu:
+        System.Console.Clear();
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Device {0} read HD area.", lba450000Result ? "cannot" : "can");
 
-            bool lba400000Result = dev.ReadCd(out byte[] lba400000Buffer, out byte[] lba400000Sense, 400000, 2352, 1,
-                                              MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                              true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+        AaruConsole.WriteLine("LBA 0 sense is {0}, buffer is {1}, sense buffer is {2}.", lba0Result,
+                              lba0Buffer is null
+                                  ? "null"
+                                  : ArrayHelpers.ArrayIsNullOrEmpty(lba0Buffer)
+                                      ? "empty"
+                                      : $"{lba0Buffer.Length} bytes", lba0Sense is null
+                                                                          ? "null"
+                                                                          : ArrayHelpers.
+                                                                              ArrayIsNullOrEmpty(lba0Sense)
+                                                                              ? "empty"
+                                                                              : $"{lba0Sense.Length}");
 
-            AaruConsole.WriteLine(lba400000Result ? "FAIL!" : "Success!");
+        AaruConsole.WriteLine("LBA 0 (scrambled) sense is {0}, buffer is {1}, sense buffer is {2}.",
+                              lba0ScrambledResult, lba0ScrambledBuffer is null
+                                                       ? "null"
+                                                       : ArrayHelpers.ArrayIsNullOrEmpty(lba0ScrambledBuffer)
+                                                           ? "empty"
+                                                           : $"{lba0ScrambledBuffer.Length} bytes",
+                              lba0ScrambledSense is null
+                                  ? "null"
+                                  : ArrayHelpers.ArrayIsNullOrEmpty(lba0ScrambledSense)
+                                      ? "empty"
+                                      : $"{lba0ScrambledSense.Length}");
 
-            AaruConsole.Write("Reading LBA 45000... ");
-
-            bool lba45000Result = dev.ReadCd(out byte[] lba45000Buffer, out byte[] lba45000Sense, 45000, 2352, 1,
-                                             MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                             true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
-
-            AaruConsole.WriteLine(lba45000Result ? "FAIL!" : "Success!");
-
-            AaruConsole.Write("Reading LBA 44990... ");
-
-            bool lba44990Result = dev.ReadCd(out byte[] lba44990Buffer, out byte[] lba44990Sense, 44990, 2352, 1,
-                                             MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders,
-                                             true, true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
-
-            AaruConsole.WriteLine(lba44990Result ? "FAIL!" : "Success!");
-
-            menu:
-            System.Console.Clear();
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Device {0} read HD area.", lba450000Result ? "cannot" : "can");
-
-            AaruConsole.WriteLine("LBA 0 sense is {0}, buffer is {1}, sense buffer is {2}.", lba0Result,
-                                  lba0Buffer is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(lba0Buffer)
-                                          ? "empty"
-                                          : $"{lba0Buffer.Length} bytes", lba0Sense is null
+        AaruConsole.WriteLine("LBA 44990 sense is {0}, buffer is {1}, sense buffer is {2}.", lba44990Result,
+                              lba44990Buffer is null
+                                  ? "null"
+                                  : ArrayHelpers.ArrayIsNullOrEmpty(lba44990Buffer)
+                                      ? "empty"
+                                      : $"{lba44990Buffer.Length} bytes", lba44990Sense is null
                                                                               ? "null"
                                                                               : ArrayHelpers.
-                                                                                  ArrayIsNullOrEmpty(lba0Sense)
+                                                                                  ArrayIsNullOrEmpty(lba44990Sense)
                                                                                   ? "empty"
-                                                                                  : $"{lba0Sense.Length}");
+                                                                                  : $"{lba44990Sense.Length}");
 
-            AaruConsole.WriteLine("LBA 0 (scrambled) sense is {0}, buffer is {1}, sense buffer is {2}.",
-                                  lba0ScrambledResult, lba0ScrambledBuffer is null
-                                                           ? "null"
-                                                           : ArrayHelpers.ArrayIsNullOrEmpty(lba0ScrambledBuffer)
-                                                               ? "empty"
-                                                               : $"{lba0ScrambledBuffer.Length} bytes",
-                                  lba0ScrambledSense is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(lba0ScrambledSense)
-                                          ? "empty"
-                                          : $"{lba0ScrambledSense.Length}");
+        AaruConsole.WriteLine("LBA 45000 sense is {0}, buffer is {1}, sense buffer is {2}.", lba45000Result,
+                              lba45000Buffer is null
+                                  ? "null"
+                                  : ArrayHelpers.ArrayIsNullOrEmpty(lba45000Buffer)
+                                      ? "empty"
+                                      : $"{lba45000Buffer.Length} bytes", lba45000Sense is null
+                                                                              ? "null"
+                                                                              : ArrayHelpers.
+                                                                                  ArrayIsNullOrEmpty(lba45000Sense)
+                                                                                  ? "empty"
+                                                                                  : $"{lba45000Sense.Length}");
 
-            AaruConsole.WriteLine("LBA 44990 sense is {0}, buffer is {1}, sense buffer is {2}.", lba44990Result,
-                                  lba44990Buffer is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(lba44990Buffer)
-                                          ? "empty"
-                                          : $"{lba44990Buffer.Length} bytes", lba44990Sense is null
-                                                                                  ? "null"
-                                                                                  : ArrayHelpers.
-                                                                                      ArrayIsNullOrEmpty(lba44990Sense)
-                                                                                      ? "empty"
-                                                                                      : $"{lba44990Sense.Length}");
+        AaruConsole.WriteLine("LBA 50000 sense is {0}, buffer is {1}, sense buffer is {2}.", lba50000Result,
+                              lba50000Buffer is null
+                                  ? "null"
+                                  : ArrayHelpers.ArrayIsNullOrEmpty(lba50000Buffer)
+                                      ? "empty"
+                                      : $"{lba50000Buffer.Length} bytes", lba50000Sense is null
+                                                                              ? "null"
+                                                                              : ArrayHelpers.
+                                                                                  ArrayIsNullOrEmpty(lba50000Sense)
+                                                                                  ? "empty"
+                                                                                  : $"{lba50000Sense.Length}");
 
-            AaruConsole.WriteLine("LBA 45000 sense is {0}, buffer is {1}, sense buffer is {2}.", lba45000Result,
-                                  lba45000Buffer is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(lba45000Buffer)
-                                          ? "empty"
-                                          : $"{lba45000Buffer.Length} bytes", lba45000Sense is null
-                                                                                  ? "null"
-                                                                                  : ArrayHelpers.
-                                                                                      ArrayIsNullOrEmpty(lba45000Sense)
-                                                                                      ? "empty"
-                                                                                      : $"{lba45000Sense.Length}");
+        AaruConsole.WriteLine("LBA 100000 sense is {0}, buffer is {1}, sense buffer is {2}.", lba100000Result,
+                              lba100000Buffer is null
+                                  ? "null"
+                                  : ArrayHelpers.ArrayIsNullOrEmpty(lba100000Buffer)
+                                      ? "empty"
+                                      : $"{lba100000Buffer.Length} bytes", lba100000Sense is null
+                                                                               ? "null"
+                                                                               : ArrayHelpers.
+                                                                                   ArrayIsNullOrEmpty(lba100000Sense)
+                                                                                   ? "empty"
+                                                                                   : $"{lba100000Sense.Length}");
 
-            AaruConsole.WriteLine("LBA 50000 sense is {0}, buffer is {1}, sense buffer is {2}.", lba50000Result,
-                                  lba50000Buffer is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(lba50000Buffer)
-                                          ? "empty"
-                                          : $"{lba50000Buffer.Length} bytes", lba50000Sense is null
-                                                                                  ? "null"
-                                                                                  : ArrayHelpers.
-                                                                                      ArrayIsNullOrEmpty(lba50000Sense)
-                                                                                      ? "empty"
-                                                                                      : $"{lba50000Sense.Length}");
+        AaruConsole.WriteLine("LBA 400000 sense is {0}, buffer is {1}, sense buffer is {2}.", lba400000Result,
+                              lba400000Buffer is null
+                                  ? "null"
+                                  : ArrayHelpers.ArrayIsNullOrEmpty(lba400000Buffer)
+                                      ? "empty"
+                                      : $"{lba400000Buffer.Length} bytes", lba400000Sense is null
+                                                                               ? "null"
+                                                                               : ArrayHelpers.
+                                                                                   ArrayIsNullOrEmpty(lba400000Sense)
+                                                                                   ? "empty"
+                                                                                   : $"{lba400000Sense.Length}");
 
-            AaruConsole.WriteLine("LBA 100000 sense is {0}, buffer is {1}, sense buffer is {2}.", lba100000Result,
-                                  lba100000Buffer is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(lba100000Buffer)
-                                          ? "empty"
-                                          : $"{lba100000Buffer.Length} bytes", lba100000Sense is null
-                                                                                   ? "null"
-                                                                                   : ArrayHelpers.
-                                                                                       ArrayIsNullOrEmpty(lba100000Sense)
-                                                                                       ? "empty"
-                                                                                       : $"{lba100000Sense.Length}");
+        AaruConsole.WriteLine("LBA 450000 sense is {0}, buffer is {1}, sense buffer is {2}.", lba450000Result,
+                              lba450000Buffer is null
+                                  ? "null"
+                                  : ArrayHelpers.ArrayIsNullOrEmpty(lba450000Buffer)
+                                      ? "empty"
+                                      : $"{lba450000Buffer.Length} bytes", lba450000Sense is null
+                                                                               ? "null"
+                                                                               : ArrayHelpers.
+                                                                                   ArrayIsNullOrEmpty(lba450000Sense)
+                                                                                   ? "empty"
+                                                                                   : $"{lba450000Sense.Length}");
 
-            AaruConsole.WriteLine("LBA 400000 sense is {0}, buffer is {1}, sense buffer is {2}.", lba400000Result,
-                                  lba400000Buffer is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(lba400000Buffer)
-                                          ? "empty"
-                                          : $"{lba400000Buffer.Length} bytes", lba400000Sense is null
-                                                                                   ? "null"
-                                                                                   : ArrayHelpers.
-                                                                                       ArrayIsNullOrEmpty(lba400000Sense)
-                                                                                       ? "empty"
-                                                                                       : $"{lba400000Sense.Length}");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print LBA 0 buffer.");
+        AaruConsole.WriteLine("2.- Print LBA 0 sense buffer.");
+        AaruConsole.WriteLine("3.- Decode LBA 0 sense buffer.");
+        AaruConsole.WriteLine("4.- Print LBA 0 (scrambled) buffer.");
+        AaruConsole.WriteLine("5.- Print LBA 0 (scrambled) sense buffer.");
+        AaruConsole.WriteLine("6.- Decode LBA 0 (scrambled) sense buffer.");
+        AaruConsole.WriteLine("7.- Print LBA 44990 buffer.");
+        AaruConsole.WriteLine("8.- Print LBA 44990 sense buffer.");
+        AaruConsole.WriteLine("9.- Decode LBA 44990 sense buffer.");
+        AaruConsole.WriteLine("10.- Print LBA 45000 buffer.");
+        AaruConsole.WriteLine("11.- Print LBA 45000 sense buffer.");
+        AaruConsole.WriteLine("12.- Decode LBA 45000 sense buffer.");
+        AaruConsole.WriteLine("13.- Print LBA 50000 buffer.");
+        AaruConsole.WriteLine("14.- Print LBA 50000 sense buffer.");
+        AaruConsole.WriteLine("15.- Decode LBA 50000 sense buffer.");
+        AaruConsole.WriteLine("16.- Print LBA 100000 buffer.");
+        AaruConsole.WriteLine("17.- Print LBA 100000 sense buffer.");
+        AaruConsole.WriteLine("18.- Decode LBA 100000 sense buffer.");
+        AaruConsole.WriteLine("19.- Print LBA 400000 buffer.");
+        AaruConsole.WriteLine("20.- Print LBA 400000 sense buffer.");
+        AaruConsole.WriteLine("21.- Decode LBA 400000 sense buffer.");
+        AaruConsole.WriteLine("22.- Print LBA 450000 buffer.");
+        AaruConsole.WriteLine("23.- Print LBA 450000 sense buffer.");
+        AaruConsole.WriteLine("24.- Decode LBA 450000 sense buffer.");
+        AaruConsole.WriteLine("25.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to special SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
 
-            AaruConsole.WriteLine("LBA 450000 sense is {0}, buffer is {1}, sense buffer is {2}.", lba450000Result,
-                                  lba450000Buffer is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(lba450000Buffer)
-                                          ? "empty"
-                                          : $"{lba450000Buffer.Length} bytes", lba450000Sense is null
-                                                                                   ? "null"
-                                                                                   : ArrayHelpers.
-                                                                                       ArrayIsNullOrEmpty(lba450000Sense)
-                                                                                       ? "empty"
-                                                                                       : $"{lba450000Sense.Length}");
+        strDev = System.Console.ReadLine();
 
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print LBA 0 buffer.");
-            AaruConsole.WriteLine("2.- Print LBA 0 sense buffer.");
-            AaruConsole.WriteLine("3.- Decode LBA 0 sense buffer.");
-            AaruConsole.WriteLine("4.- Print LBA 0 (scrambled) buffer.");
-            AaruConsole.WriteLine("5.- Print LBA 0 (scrambled) sense buffer.");
-            AaruConsole.WriteLine("6.- Decode LBA 0 (scrambled) sense buffer.");
-            AaruConsole.WriteLine("7.- Print LBA 44990 buffer.");
-            AaruConsole.WriteLine("8.- Print LBA 44990 sense buffer.");
-            AaruConsole.WriteLine("9.- Decode LBA 44990 sense buffer.");
-            AaruConsole.WriteLine("10.- Print LBA 45000 buffer.");
-            AaruConsole.WriteLine("11.- Print LBA 45000 sense buffer.");
-            AaruConsole.WriteLine("12.- Decode LBA 45000 sense buffer.");
-            AaruConsole.WriteLine("13.- Print LBA 50000 buffer.");
-            AaruConsole.WriteLine("14.- Print LBA 50000 sense buffer.");
-            AaruConsole.WriteLine("15.- Decode LBA 50000 sense buffer.");
-            AaruConsole.WriteLine("16.- Print LBA 100000 buffer.");
-            AaruConsole.WriteLine("17.- Print LBA 100000 sense buffer.");
-            AaruConsole.WriteLine("18.- Decode LBA 100000 sense buffer.");
-            AaruConsole.WriteLine("19.- Print LBA 400000 buffer.");
-            AaruConsole.WriteLine("20.- Print LBA 400000 sense buffer.");
-            AaruConsole.WriteLine("21.- Decode LBA 400000 sense buffer.");
-            AaruConsole.WriteLine("22.- Print LBA 450000 buffer.");
-            AaruConsole.WriteLine("23.- Print LBA 450000 sense buffer.");
-            AaruConsole.WriteLine("24.- Decode LBA 450000 sense buffer.");
-            AaruConsole.WriteLine("25.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to special SCSI MultiMedia Commands menu.");
-            AaruConsole.Write("Choose: ");
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
 
-            strDev = System.Console.ReadLine();
+            goto menu;
+        }
 
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to special SCSI MultiMedia Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 0 response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(lba0Buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 0 sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(lba0Sense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 0 decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(lba0Sense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 0 (scrambled) response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(lba0ScrambledBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 5:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 0 (scrambled) sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(lba0ScrambledSense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 6:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 0 (scrambled) decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(lba0ScrambledSense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 7:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 44990 response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(lba44990Buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 8:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 44990 sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(lba44990Sense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 9:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 44990 decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(lba44990Sense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 10:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 45000 response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(lba45000Buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 11:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 45000 sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(lba45000Sense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 12:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 45000 decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(lba45000Sense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 13:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 50000 response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(lba50000Buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 14:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 50000 sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(lba50000Sense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 15:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 50000 decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(lba50000Sense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 16:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 100000 response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(lba100000Buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 17:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 100000 sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(lba100000Sense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 18:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 100000 decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(lba100000Sense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 19:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 400000 response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(lba400000Buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 20:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 400000 sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(lba400000Sense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 21:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 400000 decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(lba400000Sense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 22:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 450000 response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(lba450000Buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 23:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 450000 sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(lba450000Sense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 24:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA 450000 decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(lba450000Sense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 25: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
 
                 goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to special SCSI MultiMedia Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 0 response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(lba0Buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 0 sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(lba0Sense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 0 decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(lba0Sense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 0 (scrambled) response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(lba0ScrambledBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 5:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 0 (scrambled) sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(lba0ScrambledSense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 6:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 0 (scrambled) decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(lba0ScrambledSense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 7:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 44990 response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(lba44990Buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 8:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 44990 sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(lba44990Sense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 9:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 44990 decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(lba44990Sense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 10:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 45000 response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(lba45000Buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 11:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 45000 sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(lba45000Sense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 12:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 45000 decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(lba45000Sense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 13:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 50000 response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(lba50000Buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 14:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 50000 sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(lba50000Sense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 15:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 50000 decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(lba50000Sense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 16:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 100000 response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(lba100000Buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 17:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 100000 sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(lba100000Sense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 18:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 100000 decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(lba100000Sense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 19:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 400000 response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(lba400000Buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 20:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 400000 sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(lba400000Sense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 21:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 400000 decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(lba400000Sense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 22:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 450000 response:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(lba450000Buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 23:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 450000 sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(lba450000Sense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 24:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA 450000 decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(lba450000Sense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 25: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs b/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs
index d2bbf4f92..20ab87daf 100644
--- a/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs
+++ b/Aaru.Tests.Devices/SCSI_MMC/LeadOutTrap.cs
@@ -6,554 +6,553 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class ScsiMmc
 {
-    internal static partial class ScsiMmc
+    static void ReadLeadOutUsingTrapDisc(string devPath, Device dev)
     {
-        static void ReadLeadOutUsingTrapDisc(string devPath, Device dev)
+        string strDev;
+        int    item;
+        bool   tocIsNotBcd = false;
+        bool   sense;
+        byte[] buffer;
+        byte[] senseBuffer;
+        int    retries;
+
+        start:
+        System.Console.Clear();
+
+        AaruConsole.WriteLine("Ejecting disc...");
+
+        dev.AllowMediumRemoval(out _, dev.Timeout, out _);
+        dev.EjectTray(out _, dev.Timeout, out _);
+
+        AaruConsole.WriteLine("Please insert a data only disc inside...");
+        AaruConsole.WriteLine("Press any key to continue...");
+        System.Console.ReadLine();
+
+        AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+
+        retries = 0;
+
+        do
         {
-            string strDev;
-            int    item;
-            bool   tocIsNotBcd = false;
-            bool   sense;
-            byte[] buffer;
-            byte[] senseBuffer;
-            int    retries;
+            retries++;
+            sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
 
-            start:
-            System.Console.Clear();
+            if(!sense)
+                break;
 
-            AaruConsole.WriteLine("Ejecting disc...");
+            DecodedSense? decodedSense = Sense.Decode(senseBuffer);
 
-            dev.AllowMediumRemoval(out _, dev.Timeout, out _);
-            dev.EjectTray(out _, dev.Timeout, out _);
+            if(decodedSense.Value.ASC != 0x04)
+                break;
 
-            AaruConsole.WriteLine("Please insert a data only disc inside...");
+            if(decodedSense.Value.ASCQ != 0x01)
+                break;
+
+            Thread.Sleep(2000);
+        } while(retries < 25);
+
+        sense = dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _);
+
+        if(sense)
+        {
+            AaruConsole.WriteLine("READ FULL TOC failed...");
+            AaruConsole.WriteLine("{0}", Sense.PrettifySense(senseBuffer));
             AaruConsole.WriteLine("Press any key to continue...");
             System.Console.ReadLine();
 
-            AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+            return;
+        }
 
-            retries = 0;
+        FullTOC.CDFullTOC? decodedToc = FullTOC.Decode(buffer);
 
-            do
-            {
-                retries++;
-                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+        if(decodedToc is null)
+        {
+            AaruConsole.WriteLine("Could not decode TOC...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
 
-                if(!sense)
-                    break;
+            return;
+        }
 
-                DecodedSense? decodedSense = Sense.Decode(senseBuffer);
+        FullTOC.CDFullTOC toc = decodedToc.Value;
 
-                if(decodedSense.Value.ASC != 0x04)
-                    break;
+        FullTOC.TrackDataDescriptor leadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
 
-                if(decodedSense.Value.ASCQ != 0x01)
-                    break;
+        if(leadOutTrack.POINT != 0xA2)
+        {
+            AaruConsole.WriteLine("Cannot find lead-out...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
 
-                Thread.Sleep(2000);
-            } while(retries < 25);
+            return;
+        }
 
+        int min   = ((leadOutTrack.PMIN   >> 4) * 10) + (leadOutTrack.PMIN   & 0x0F);
+        int sec   = ((leadOutTrack.PSEC   >> 4) * 10) + (leadOutTrack.PSEC   & 0x0F);
+        int frame = ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F);
+
+        int sectors = (min * 60 * 75) + (sec * 75) + frame - 150;
+
+        AaruConsole.WriteLine("Data disc shows {0} sectors...", sectors);
+
+        AaruConsole.WriteLine("Ejecting disc...");
+
+        dev.AllowMediumRemoval(out _, dev.Timeout, out _);
+        dev.EjectTray(out _, dev.Timeout, out _);
+
+        AaruConsole.WriteLine("Please insert the trap disc inside...");
+        AaruConsole.WriteLine("Press any key to continue...");
+        System.Console.ReadLine();
+
+        AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+
+        retries = 0;
+
+        do
+        {
+            retries++;
+            sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+
+            if(!sense)
+                break;
+
+            DecodedSense? decodedSense = Sense.Decode(senseBuffer);
+
+            if(decodedSense.Value.ASC != 0x04)
+                break;
+
+            if(decodedSense.Value.ASCQ != 0x01)
+                break;
+
+            Thread.Sleep(2000);
+        } while(retries < 25);
+
+        sense = dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _);
+
+        if(sense)
+        {
+            AaruConsole.WriteLine("READ FULL TOC failed...");
+            AaruConsole.WriteLine("{0}", Sense.PrettifySense(senseBuffer));
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
+
+            return;
+        }
+
+        decodedToc = FullTOC.Decode(buffer);
+
+        if(decodedToc is null)
+        {
+            AaruConsole.WriteLine("Could not decode TOC...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
+
+            return;
+        }
+
+        toc = decodedToc.Value;
+
+        leadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
+
+        if(leadOutTrack.POINT != 0xA2)
+        {
+            AaruConsole.WriteLine("Cannot find lead-out...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
+
+            return;
+        }
+
+        min = 0;
+
+        if(leadOutTrack.PMIN == 122)
+            tocIsNotBcd = true;
+
+        if(leadOutTrack.PMIN >= 0xA0 &&
+           !tocIsNotBcd)
+        {
+            min               += 90;
+            leadOutTrack.PMIN -= 0x90;
+        }
+
+        if(tocIsNotBcd)
+        {
+            min   = leadOutTrack.PMIN;
+            sec   = leadOutTrack.PSEC;
+            frame = leadOutTrack.PFRAME;
+        }
+        else
+        {
+            min   += ((leadOutTrack.PMIN   >> 4) * 10) + (leadOutTrack.PMIN   & 0x0F);
+            sec   =  ((leadOutTrack.PSEC   >> 4) * 10) + (leadOutTrack.PSEC   & 0x0F);
+            frame =  ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F);
+        }
+
+        int trapSectors = (min * 60 * 75) + (sec * 75) + frame - 150;
+
+        AaruConsole.WriteLine("Trap disc shows {0} sectors...", trapSectors);
+
+        if(trapSectors < sectors + 100)
+        {
+            AaruConsole.WriteLine("Trap disc doesn't have enough sectors...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
+
+            return;
+        }
+
+        AaruConsole.WriteLine("Stopping motor...");
+
+        dev.StopUnit(out _, dev.Timeout, out _);
+
+        AaruConsole.WriteLine("Please MANUALLY get the trap disc out and put the data disc back inside...");
+        AaruConsole.WriteLine("Press any key to continue...");
+        System.Console.ReadLine();
+
+        AaruConsole.WriteLine("Waiting 5 seconds...");
+        Thread.Sleep(5000);
+
+        AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+
+        retries = 0;
+
+        do
+        {
+            retries++;
             sense = dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _);
 
-            if(sense)
-            {
-                AaruConsole.WriteLine("READ FULL TOC failed...");
-                AaruConsole.WriteLine("{0}", Sense.PrettifySense(senseBuffer));
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+            if(!sense)
+                break;
 
-                return;
-            }
+            DecodedSense? decodedSense = Sense.Decode(senseBuffer);
 
-            FullTOC.CDFullTOC? decodedToc = FullTOC.Decode(buffer);
+            if(decodedSense.Value.ASC != 0x04)
+                break;
 
-            if(decodedToc is null)
-            {
-                AaruConsole.WriteLine("Could not decode TOC...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+            if(decodedSense.Value.ASCQ != 0x01)
+                break;
+        } while(retries < 25);
 
-                return;
-            }
-
-            FullTOC.CDFullTOC toc = decodedToc.Value;
-
-            FullTOC.TrackDataDescriptor leadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
-
-            if(leadOutTrack.POINT != 0xA2)
-            {
-                AaruConsole.WriteLine("Cannot find lead-out...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
-
-                return;
-            }
-
-            int min   = ((leadOutTrack.PMIN   >> 4) * 10) + (leadOutTrack.PMIN   & 0x0F);
-            int sec   = ((leadOutTrack.PSEC   >> 4) * 10) + (leadOutTrack.PSEC   & 0x0F);
-            int frame = ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F);
-
-            int sectors = (min * 60 * 75) + (sec * 75) + frame - 150;
-
-            AaruConsole.WriteLine("Data disc shows {0} sectors...", sectors);
-
-            AaruConsole.WriteLine("Ejecting disc...");
-
-            dev.AllowMediumRemoval(out _, dev.Timeout, out _);
-            dev.EjectTray(out _, dev.Timeout, out _);
-
-            AaruConsole.WriteLine("Please insert the trap disc inside...");
+        if(sense)
+        {
+            AaruConsole.WriteLine("READ FULL TOC failed...");
+            AaruConsole.WriteLine("{0}", Sense.PrettifySense(senseBuffer));
             AaruConsole.WriteLine("Press any key to continue...");
             System.Console.ReadLine();
 
-            AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+            return;
+        }
 
-            retries = 0;
+        decodedToc = FullTOC.Decode(buffer);
 
-            do
-            {
-                retries++;
-                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
-
-                if(!sense)
-                    break;
-
-                DecodedSense? decodedSense = Sense.Decode(senseBuffer);
-
-                if(decodedSense.Value.ASC != 0x04)
-                    break;
-
-                if(decodedSense.Value.ASCQ != 0x01)
-                    break;
-
-                Thread.Sleep(2000);
-            } while(retries < 25);
-
-            sense = dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _);
-
-            if(sense)
-            {
-                AaruConsole.WriteLine("READ FULL TOC failed...");
-                AaruConsole.WriteLine("{0}", Sense.PrettifySense(senseBuffer));
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
-
-                return;
-            }
-
-            decodedToc = FullTOC.Decode(buffer);
-
-            if(decodedToc is null)
-            {
-                AaruConsole.WriteLine("Could not decode TOC...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
-
-                return;
-            }
-
-            toc = decodedToc.Value;
-
-            leadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
-
-            if(leadOutTrack.POINT != 0xA2)
-            {
-                AaruConsole.WriteLine("Cannot find lead-out...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
-
-                return;
-            }
-
-            min = 0;
-
-            if(leadOutTrack.PMIN == 122)
-                tocIsNotBcd = true;
-
-            if(leadOutTrack.PMIN >= 0xA0 &&
-               !tocIsNotBcd)
-            {
-                min               += 90;
-                leadOutTrack.PMIN -= 0x90;
-            }
-
-            if(tocIsNotBcd)
-            {
-                min   = leadOutTrack.PMIN;
-                sec   = leadOutTrack.PSEC;
-                frame = leadOutTrack.PFRAME;
-            }
-            else
-            {
-                min   += ((leadOutTrack.PMIN   >> 4) * 10) + (leadOutTrack.PMIN   & 0x0F);
-                sec   =  ((leadOutTrack.PSEC   >> 4) * 10) + (leadOutTrack.PSEC   & 0x0F);
-                frame =  ((leadOutTrack.PFRAME >> 4) * 10) + (leadOutTrack.PFRAME & 0x0F);
-            }
-
-            int trapSectors = (min * 60 * 75) + (sec * 75) + frame - 150;
-
-            AaruConsole.WriteLine("Trap disc shows {0} sectors...", trapSectors);
-
-            if(trapSectors < sectors + 100)
-            {
-                AaruConsole.WriteLine("Trap disc doesn't have enough sectors...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
-
-                return;
-            }
-
-            AaruConsole.WriteLine("Stopping motor...");
-
-            dev.StopUnit(out _, dev.Timeout, out _);
-
-            AaruConsole.WriteLine("Please MANUALLY get the trap disc out and put the data disc back inside...");
+        if(decodedToc is null)
+        {
+            AaruConsole.WriteLine("Could not decode TOC...");
             AaruConsole.WriteLine("Press any key to continue...");
             System.Console.ReadLine();
 
-            AaruConsole.WriteLine("Waiting 5 seconds...");
-            Thread.Sleep(5000);
+            return;
+        }
 
-            AaruConsole.WriteLine("Sending READ FULL TOC to the device...");
+        toc = decodedToc.Value;
 
-            retries = 0;
+        FullTOC.TrackDataDescriptor newLeadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
 
-            do
-            {
-                retries++;
-                sense = dev.ReadRawToc(out buffer, out senseBuffer, 1, dev.Timeout, out _);
+        if(newLeadOutTrack.POINT != 0xA2)
+        {
+            AaruConsole.WriteLine("Cannot find lead-out...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
 
-                if(!sense)
-                    break;
+            return;
+        }
 
-                DecodedSense? decodedSense = Sense.Decode(senseBuffer);
+        if(newLeadOutTrack.PMIN >= 0xA0 &&
+           !tocIsNotBcd)
+            newLeadOutTrack.PMIN -= 0x90;
 
-                if(decodedSense.Value.ASC != 0x04)
-                    break;
+        if(newLeadOutTrack.PMIN   != leadOutTrack.PMIN ||
+           newLeadOutTrack.PSEC   != leadOutTrack.PSEC ||
+           newLeadOutTrack.PFRAME != leadOutTrack.PFRAME)
+        {
+            AaruConsole.WriteLine("Lead-out has changed, this drive does not support hot swapping discs...");
+            AaruConsole.WriteLine("Press any key to continue...");
+            System.Console.ReadLine();
 
-                if(decodedSense.Value.ASCQ != 0x01)
-                    break;
-            } while(retries < 25);
+            return;
+        }
 
-            if(sense)
-            {
-                AaruConsole.WriteLine("READ FULL TOC failed...");
-                AaruConsole.WriteLine("{0}", Sense.PrettifySense(senseBuffer));
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+        AaruConsole.Write("Reading LBA {0}... ", sectors + 5);
 
-                return;
-            }
+        bool dataResult = dev.ReadCd(out byte[] dataBuffer, out byte[] dataSense, (uint)(sectors + 5), 2352, 1,
+                                     MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true,
+                                     true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
 
-            decodedToc = FullTOC.Decode(buffer);
+        AaruConsole.WriteLine(dataResult ? "FAIL!" : "Success!");
 
-            if(decodedToc is null)
-            {
-                AaruConsole.WriteLine("Could not decode TOC...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+        AaruConsole.Write("Reading LBA {0} as audio (scrambled)... ", sectors + 5);
 
-                return;
-            }
+        bool scrambledResult = dev.ReadCd(out byte[] scrambledBuffer, out byte[] scrambledSense,
+                                          (uint)(sectors + 5), 2352, 1, MmcSectorTypes.Cdda, false, false, false,
+                                          MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
+                                          dev.Timeout, out _);
 
-            toc = decodedToc.Value;
+        AaruConsole.WriteLine(scrambledResult ? "FAIL!" : "Success!");
 
-            FullTOC.TrackDataDescriptor newLeadOutTrack = toc.TrackDescriptors.FirstOrDefault(t => t.POINT == 0xA2);
+        AaruConsole.Write("Reading LBA {0}'s PQ subchannel... ", sectors + 5);
 
-            if(newLeadOutTrack.POINT != 0xA2)
-            {
-                AaruConsole.WriteLine("Cannot find lead-out...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+        bool pqResult = dev.ReadCd(out byte[] pqBuffer, out byte[] pqSense, (uint)(sectors + 5), 16, 1,
+                                   MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, false, false,
+                                   MmcErrorField.None, MmcSubchannel.Q16, dev.Timeout, out _);
 
-                return;
-            }
+        if(pqResult)
+            pqResult = dev.ReadCd(out pqBuffer, out pqSense, (uint)(sectors + 5), 16, 1, MmcSectorTypes.AllTypes,
+                                  false, false, false, MmcHeaderCodes.None, false, false, MmcErrorField.None,
+                                  MmcSubchannel.Q16, dev.Timeout, out _);
 
-            if(newLeadOutTrack.PMIN >= 0xA0 &&
-               !tocIsNotBcd)
-                newLeadOutTrack.PMIN -= 0x90;
+        AaruConsole.WriteLine(pqResult ? "FAIL!" : "Success!");
 
-            if(newLeadOutTrack.PMIN   != leadOutTrack.PMIN ||
-               newLeadOutTrack.PSEC   != leadOutTrack.PSEC ||
-               newLeadOutTrack.PFRAME != leadOutTrack.PFRAME)
-            {
-                AaruConsole.WriteLine("Lead-out has changed, this drive does not support hot swapping discs...");
-                AaruConsole.WriteLine("Press any key to continue...");
-                System.Console.ReadLine();
+        AaruConsole.Write("Reading LBA {0}'s PQ subchannel... ", sectors + 5);
 
-                return;
-            }
+        bool rwResult = dev.ReadCd(out byte[] rwBuffer, out byte[] rwSense, (uint)(sectors + 5), 16, 1,
+                                   MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, false, false,
+                                   MmcErrorField.None, MmcSubchannel.Rw, dev.Timeout, out _);
 
-            AaruConsole.Write("Reading LBA {0}... ", sectors + 5);
+        if(rwResult)
+            rwResult = dev.ReadCd(out rwBuffer, out rwSense, (uint)(sectors + 5), 16, 1, MmcSectorTypes.Cdda, false,
+                                  false, false, MmcHeaderCodes.None, false, false, MmcErrorField.None,
+                                  MmcSubchannel.Rw, dev.Timeout, out _);
 
-            bool dataResult = dev.ReadCd(out byte[] dataBuffer, out byte[] dataSense, (uint)(sectors + 5), 2352, 1,
-                                         MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true,
-                                         true, MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out _);
+        AaruConsole.WriteLine(pqResult ? "FAIL!" : "Success!");
 
-            AaruConsole.WriteLine(dataResult ? "FAIL!" : "Success!");
+        menu:
+        System.Console.Clear();
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Device {0} read Lead-Out.", dataResult && scrambledResult ? "cannot" : "can");
 
-            AaruConsole.Write("Reading LBA {0} as audio (scrambled)... ", sectors + 5);
+        AaruConsole.WriteLine("LBA {0} sense is {1}, buffer is {2}, sense buffer is {3}.", sectors + 5, dataResult,
+                              dataBuffer is null
+                                  ? "null"
+                                  : ArrayHelpers.ArrayIsNullOrEmpty(dataBuffer)
+                                      ? "empty"
+                                      : $"{dataBuffer.Length} bytes", dataSense is null
+                                                                          ? "null"
+                                                                          : ArrayHelpers.
+                                                                              ArrayIsNullOrEmpty(dataSense)
+                                                                              ? "empty"
+                                                                              : $"{dataSense.Length}");
 
-            bool scrambledResult = dev.ReadCd(out byte[] scrambledBuffer, out byte[] scrambledSense,
-                                              (uint)(sectors + 5), 2352, 1, MmcSectorTypes.Cdda, false, false, false,
-                                              MmcHeaderCodes.None, true, false, MmcErrorField.None, MmcSubchannel.None,
-                                              dev.Timeout, out _);
+        AaruConsole.WriteLine("LBA {0} (scrambled) sense is {1}, buffer is {2}, sense buffer is {3}.", sectors + 5,
+                              scrambledResult, scrambledBuffer is null
+                                                   ? "null"
+                                                   : ArrayHelpers.ArrayIsNullOrEmpty(scrambledBuffer)
+                                                       ? "empty"
+                                                       : $"{scrambledBuffer.Length} bytes", scrambledSense is null
+                                  ? "null"
+                                  : ArrayHelpers.ArrayIsNullOrEmpty(scrambledSense)
+                                      ? "empty"
+                                      : $"{scrambledSense.Length}");
 
-            AaruConsole.WriteLine(scrambledResult ? "FAIL!" : "Success!");
+        AaruConsole.WriteLine("LBA {0}'s PQ sense is {1}, buffer is {2}, sense buffer is {3}.", sectors + 5,
+                              pqResult, pqBuffer is null
+                                            ? "null"
+                                            : ArrayHelpers.ArrayIsNullOrEmpty(pqBuffer)
+                                                ? "empty"
+                                                : $"{pqBuffer.Length} bytes", pqSense is null
+                                                                                  ? "null"
+                                                                                  : ArrayHelpers.ArrayIsNullOrEmpty(pqSense)
+                                                                                      ? "empty"
+                                                                                      : $"{pqSense.Length}");
 
-            AaruConsole.Write("Reading LBA {0}'s PQ subchannel... ", sectors + 5);
+        AaruConsole.WriteLine("LBA {0}'s RW sense is {1}, buffer is {2}, sense buffer is {3}.", sectors + 5,
+                              rwResult, rwBuffer is null
+                                            ? "null"
+                                            : ArrayHelpers.ArrayIsNullOrEmpty(rwBuffer)
+                                                ? "empty"
+                                                : $"{rwBuffer.Length} bytes", rwSense is null
+                                                                                  ? "null"
+                                                                                  : ArrayHelpers.ArrayIsNullOrEmpty(rwSense)
+                                                                                      ? "empty"
+                                                                                      : $"{rwSense.Length}");
 
-            bool pqResult = dev.ReadCd(out byte[] pqBuffer, out byte[] pqSense, (uint)(sectors + 5), 16, 1,
-                                       MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, false, false,
-                                       MmcErrorField.None, MmcSubchannel.Q16, dev.Timeout, out _);
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print LBA {0} buffer.", sectors                    + 5);
+        AaruConsole.WriteLine("2.- Print LBA {0} sense buffer.", sectors              + 5);
+        AaruConsole.WriteLine("3.- Decode LBA {0} sense buffer.", sectors             + 5);
+        AaruConsole.WriteLine("4.- Print LBA {0} (scrambled) buffer.", sectors        + 5);
+        AaruConsole.WriteLine("5.- Print LBA {0} (scrambled) sense buffer.", sectors  + 5);
+        AaruConsole.WriteLine("6.- Decode LBA {0} (scrambled) sense buffer.", sectors + 5);
+        AaruConsole.WriteLine("7.- Print LBA {0}'s PQ buffer.", sectors               + 5);
+        AaruConsole.WriteLine("8.- Print LBA {0}'s PQ sense buffer.", sectors         + 5);
+        AaruConsole.WriteLine("9.- Decode LBA {0}'s PQ sense buffer.", sectors        + 5);
+        AaruConsole.WriteLine("10.- Print LBA {0}'s RW buffer.", sectors              + 5);
+        AaruConsole.WriteLine("11.- Print LBA {0}'s RW sense buffer.", sectors        + 5);
+        AaruConsole.WriteLine("12.- Decode LBA {0}'s RW sense buffer.", sectors       + 5);
+        AaruConsole.WriteLine("13.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to special SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
 
-            if(pqResult)
-                pqResult = dev.ReadCd(out pqBuffer, out pqSense, (uint)(sectors + 5), 16, 1, MmcSectorTypes.AllTypes,
-                                      false, false, false, MmcHeaderCodes.None, false, false, MmcErrorField.None,
-                                      MmcSubchannel.Q16, dev.Timeout, out _);
+        strDev = System.Console.ReadLine();
 
-            AaruConsole.WriteLine(pqResult ? "FAIL!" : "Success!");
-
-            AaruConsole.Write("Reading LBA {0}'s PQ subchannel... ", sectors + 5);
-
-            bool rwResult = dev.ReadCd(out byte[] rwBuffer, out byte[] rwSense, (uint)(sectors + 5), 16, 1,
-                                       MmcSectorTypes.AllTypes, false, false, false, MmcHeaderCodes.None, false, false,
-                                       MmcErrorField.None, MmcSubchannel.Rw, dev.Timeout, out _);
-
-            if(rwResult)
-                rwResult = dev.ReadCd(out rwBuffer, out rwSense, (uint)(sectors + 5), 16, 1, MmcSectorTypes.Cdda, false,
-                                      false, false, MmcHeaderCodes.None, false, false, MmcErrorField.None,
-                                      MmcSubchannel.Rw, dev.Timeout, out _);
-
-            AaruConsole.WriteLine(pqResult ? "FAIL!" : "Success!");
-
-            menu:
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
             System.Console.Clear();
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Device {0} read Lead-Out.", dataResult && scrambledResult ? "cannot" : "can");
 
-            AaruConsole.WriteLine("LBA {0} sense is {1}, buffer is {2}, sense buffer is {3}.", sectors + 5, dataResult,
-                                  dataBuffer is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(dataBuffer)
-                                          ? "empty"
-                                          : $"{dataBuffer.Length} bytes", dataSense is null
-                                                                              ? "null"
-                                                                              : ArrayHelpers.
-                                                                                  ArrayIsNullOrEmpty(dataSense)
-                                                                                  ? "empty"
-                                                                                  : $"{dataSense.Length}");
+            goto menu;
+        }
 
-            AaruConsole.WriteLine("LBA {0} (scrambled) sense is {1}, buffer is {2}, sense buffer is {3}.", sectors + 5,
-                                  scrambledResult, scrambledBuffer is null
-                                                       ? "null"
-                                                       : ArrayHelpers.ArrayIsNullOrEmpty(scrambledBuffer)
-                                                           ? "empty"
-                                                           : $"{scrambledBuffer.Length} bytes", scrambledSense is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(scrambledSense)
-                                          ? "empty"
-                                          : $"{scrambledSense.Length}");
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to special SCSI MultiMedia Commands menu...");
 
-            AaruConsole.WriteLine("LBA {0}'s PQ sense is {1}, buffer is {2}, sense buffer is {3}.", sectors + 5,
-                                  pqResult, pqBuffer is null
-                                                ? "null"
-                                                : ArrayHelpers.ArrayIsNullOrEmpty(pqBuffer)
-                                                    ? "empty"
-                                                    : $"{pqBuffer.Length} bytes", pqSense is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(pqSense)
-                                          ? "empty"
-                                          : $"{pqSense.Length}");
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA {0} response:", sectors + 5);
 
-            AaruConsole.WriteLine("LBA {0}'s RW sense is {1}, buffer is {2}, sense buffer is {3}.", sectors + 5,
-                                  rwResult, rwBuffer is null
-                                                ? "null"
-                                                : ArrayHelpers.ArrayIsNullOrEmpty(rwBuffer)
-                                                    ? "empty"
-                                                    : $"{rwBuffer.Length} bytes", rwSense is null
-                                      ? "null"
-                                      : ArrayHelpers.ArrayIsNullOrEmpty(rwSense)
-                                          ? "empty"
-                                          : $"{rwSense.Length}");
+                if(buffer != null)
+                    PrintHex.PrintHexArray(dataBuffer, 64);
 
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print LBA {0} buffer.", sectors                    + 5);
-            AaruConsole.WriteLine("2.- Print LBA {0} sense buffer.", sectors              + 5);
-            AaruConsole.WriteLine("3.- Decode LBA {0} sense buffer.", sectors             + 5);
-            AaruConsole.WriteLine("4.- Print LBA {0} (scrambled) buffer.", sectors        + 5);
-            AaruConsole.WriteLine("5.- Print LBA {0} (scrambled) sense buffer.", sectors  + 5);
-            AaruConsole.WriteLine("6.- Decode LBA {0} (scrambled) sense buffer.", sectors + 5);
-            AaruConsole.WriteLine("7.- Print LBA {0}'s PQ buffer.", sectors               + 5);
-            AaruConsole.WriteLine("8.- Print LBA {0}'s PQ sense buffer.", sectors         + 5);
-            AaruConsole.WriteLine("9.- Decode LBA {0}'s PQ sense buffer.", sectors        + 5);
-            AaruConsole.WriteLine("10.- Print LBA {0}'s RW buffer.", sectors              + 5);
-            AaruConsole.WriteLine("11.- Print LBA {0}'s RW sense buffer.", sectors        + 5);
-            AaruConsole.WriteLine("12.- Decode LBA {0}'s RW sense buffer.", sectors       + 5);
-            AaruConsole.WriteLine("13.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to special SCSI MultiMedia Commands menu.");
-            AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
 
-            strDev = System.Console.ReadLine();
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA {0} sense:", sectors + 5);
 
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(dataSense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA {0} decoded sense:", sectors + 5);
+                AaruConsole.Write("{0}", Sense.PrettifySense(dataSense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 4:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA {0} (scrambled) response:", sectors + 5);
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(scrambledBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 5:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA {0} (scrambled) sense:", sectors + 5);
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(scrambledSense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 6:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA {0} (scrambled) decoded sense:", sectors + 5);
+                AaruConsole.Write("{0}", Sense.PrettifySense(scrambledSense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 7:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA's PQ {0} response:", sectors + 5);
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(pqBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 8:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA's PQ {0} sense:", sectors + 5);
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(pqSense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 9:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA's PQ {0} decoded sense:", sectors + 5);
+                AaruConsole.Write("{0}", Sense.PrettifySense(pqSense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 10:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA's RW {0} response:", sectors + 5);
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(rwBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 11:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA's RW {0} sense:", sectors + 5);
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(rwSense, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 12:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("LBA's RW {0} decoded sense:", sectors + 5);
+                AaruConsole.Write("{0}", Sense.PrettifySense(rwSense));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+
+                goto menu;
+            case 13: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                 System.Console.ReadKey();
                 System.Console.Clear();
 
                 goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to special SCSI MultiMedia Commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA {0} response:", sectors + 5);
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(dataBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA {0} sense:", sectors + 5);
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(dataSense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA {0} decoded sense:", sectors + 5);
-                    AaruConsole.Write("{0}", Sense.PrettifySense(dataSense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 4:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA {0} (scrambled) response:", sectors + 5);
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(scrambledBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 5:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA {0} (scrambled) sense:", sectors + 5);
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(scrambledSense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 6:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA {0} (scrambled) decoded sense:", sectors + 5);
-                    AaruConsole.Write("{0}", Sense.PrettifySense(scrambledSense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 7:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA's PQ {0} response:", sectors + 5);
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(pqBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 8:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA's PQ {0} sense:", sectors + 5);
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(pqSense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 9:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA's PQ {0} decoded sense:", sectors + 5);
-                    AaruConsole.Write("{0}", Sense.PrettifySense(pqSense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 10:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA's RW {0} response:", sectors + 5);
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(rwBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 11:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA's RW {0} sense:", sectors + 5);
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(rwSense, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 12:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("LBA's RW {0} decoded sense:", sectors + 5);
-                    AaruConsole.Write("{0}", Sense.PrettifySense(rwSense));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    goto menu;
-                case 13: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs b/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs
index 7e025aae6..47b9c98b3 100644
--- a/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs
+++ b/Aaru.Tests.Devices/SCSI_MMC/MediaTek.cs
@@ -3,95 +3,29 @@ using Aaru.Decoders.SCSI;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class ScsiMmc
 {
-    internal static partial class ScsiMmc
+    static void MediaTekReadCache(string devPath, Device dev)
     {
-        static void MediaTekReadCache(string devPath, Device dev)
+        uint   address = 0;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
         {
-            uint   address = 0;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for MediaTek READ CACHE command:");
-                AaruConsole.WriteLine("LBA: {0}", address);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to special SCSI MultiMedia Commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to special SCSI MultiMedia Commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("LBA?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
             System.Console.Clear();
-
-            AaruConsole.WriteLine("Sending READ CD to the device...");
-
-            bool sense = dev.ReadCd(out byte[] buffer, out byte[] senseBuffer, address, 2352, 1,
-                                    MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
-                                    MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out double duration);
-
-            if(sense)
-                AaruConsole.WriteLine("READ CD failed...");
-
-            AaruConsole.WriteLine("Sending MediaTek READ DRAM to the device...");
-            sense = dev.MediaTekReadDram(out buffer, out senseBuffer, 0, 0xB00, dev.Timeout, out duration);
-
-            menu:
             AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("System error status is {0} and error number is {1}.", dev.Error, dev.LastError);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+            AaruConsole.WriteLine("Parameters for MediaTek READ CACHE command:");
+            AaruConsole.WriteLine("LBA: {0}", address);
             AaruConsole.WriteLine();
             AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print sense buffer.");
-            AaruConsole.WriteLine("3.- Decode sense buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("5.- Change parameters.");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
             AaruConsole.WriteLine("0.- Return to special SCSI MultiMedia Commands menu.");
-            AaruConsole.Write("Choose: ");
 
             strDev = System.Console.ReadLine();
 
@@ -99,9 +33,8 @@ namespace Aaru.Tests.Devices
             {
                 AaruConsole.WriteLine("Not a number. Press any key to continue...");
                 System.Console.ReadKey();
-                System.Console.Clear();
 
-                goto menu;
+                continue;
             }
 
             switch(item)
@@ -111,53 +44,119 @@ namespace Aaru.Tests.Devices
 
                     return;
                 case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MediaTek's READ CACHE response:");
+                    AaruConsole.Write("LBA?: ");
+                    strDev = System.Console.ReadLine();
 
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+                    }
 
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MediaTek's READ CACHE sense:");
-
-                    if(senseBuffer != null)
-                        PrintHex.PrintHexArray(senseBuffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("MediaTek's READ CACHE decoded sense:");
-                    AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                case 5: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
+                    break;
+                case 2: goto start;
             }
         }
+
+        start:
+        System.Console.Clear();
+
+        AaruConsole.WriteLine("Sending READ CD to the device...");
+
+        bool sense = dev.ReadCd(out byte[] buffer, out byte[] senseBuffer, address, 2352, 1,
+                                MmcSectorTypes.AllTypes, false, false, true, MmcHeaderCodes.AllHeaders, true, true,
+                                MmcErrorField.None, MmcSubchannel.None, dev.Timeout, out double duration);
+
+        if(sense)
+            AaruConsole.WriteLine("READ CD failed...");
+
+        AaruConsole.WriteLine("Sending MediaTek READ DRAM to the device...");
+        sense = dev.MediaTekReadDram(out buffer, out senseBuffer, 0, 0xB00, dev.Timeout, out duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("System error status is {0} and error number is {1}.", dev.Error, dev.LastError);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Sense buffer is {0} bytes.", senseBuffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Sense buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(senseBuffer));
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print sense buffer.");
+        AaruConsole.WriteLine("3.- Decode sense buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("5.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to special SCSI MultiMedia Commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to special SCSI MultiMedia Commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MediaTek's READ CACHE response:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MediaTek's READ CACHE sense:");
+
+                if(senseBuffer != null)
+                    PrintHex.PrintHexArray(senseBuffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("MediaTek's READ CACHE decoded sense:");
+                AaruConsole.Write("{0}", Sense.PrettifySense(senseBuffer));
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            case 5: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SCSI_MMC/SCSI_MMC.cs b/Aaru.Tests.Devices/SCSI_MMC/SCSI_MMC.cs
index 3139ac37f..d05e66815 100644
--- a/Aaru.Tests.Devices/SCSI_MMC/SCSI_MMC.cs
+++ b/Aaru.Tests.Devices/SCSI_MMC/SCSI_MMC.cs
@@ -29,61 +29,60 @@
 using Aaru.Console;
 using Aaru.Devices;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class ScsiMmc
 {
-    internal static partial class ScsiMmc
+    public static void Menu(string devPath, Device dev)
     {
-        public static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a special SCSI MultiMedia command to the device:");
+
+            AaruConsole.
+                WriteLine("1.- Try to read the cache data from a device with a MediaTek chipset (F1h command 06h subcommand).");
+
+            AaruConsole.WriteLine("2.- Try to read a GD-ROM using a trap disc.");
+            AaruConsole.WriteLine("3.- Try to read Lead-Out using a trap disc.");
+
+            AaruConsole.WriteLine("0.- Return to command class menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a special SCSI MultiMedia command to the device:");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                AaruConsole.
-                    WriteLine("1.- Try to read the cache data from a device with a MediaTek chipset (F1h command 06h subcommand).");
+                continue;
+            }
 
-                AaruConsole.WriteLine("2.- Try to read a GD-ROM using a trap disc.");
-                AaruConsole.WriteLine("3.- Try to read Lead-Out using a trap disc.");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to command class menu...");
 
-                AaruConsole.WriteLine("0.- Return to command class menu.");
-                AaruConsole.Write("Choose: ");
+                    return;
+                case 1:
+                    MediaTekReadCache(devPath, dev);
 
-                string strDev = System.Console.ReadLine();
+                    continue;
+                case 2:
+                    CheckGdromReadability(devPath, dev);
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                    continue;
+                case 3:
+                    ReadLeadOutUsingTrapDisc(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to command class menu...");
-
-                        return;
-                    case 1:
-                        MediaTekReadCache(devPath, dev);
-
-                        continue;
-                    case 2:
-                        CheckGdromReadability(devPath, dev);
-
-                        continue;
-                    case 3:
-                        ReadLeadOutUsingTrapDisc(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
     }
diff --git a/Aaru.Tests.Devices/SecureDigital.cs b/Aaru.Tests.Devices/SecureDigital.cs
index b4cdf0754..35ee73980 100644
--- a/Aaru.Tests.Devices/SecureDigital.cs
+++ b/Aaru.Tests.Devices/SecureDigital.cs
@@ -30,52 +30,51 @@ using Aaru.Console;
 using Aaru.Devices;
 using Aaru.Tests.Devices.SecureDigital;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+internal static partial class MainClass
 {
-    internal static partial class MainClass
+    public static void SecureDigital(string devPath, Device dev)
     {
-        public static void SecureDigital(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send an SecureDigital/MultiMediaCard command to the device:");
+            AaruConsole.WriteLine("1.- Send a SecureDigital command to the device.");
+            AaruConsole.WriteLine("2.- Send a MultiMediaCard command to the device.");
+            AaruConsole.WriteLine("0.- Return to command class menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send an SecureDigital/MultiMediaCard command to the device:");
-                AaruConsole.WriteLine("1.- Send a SecureDigital command to the device.");
-                AaruConsole.WriteLine("2.- Send a MultiMediaCard command to the device.");
-                AaruConsole.WriteLine("0.- Return to command class menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to command class menu...");
+
+                    return;
+                case 1:
+                    Devices.SecureDigital.SecureDigital.Menu(devPath, dev);
+
+                    continue;
+                case 2:
+                    MultiMediaCard.Menu(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to command class menu...");
-
-                        return;
-                    case 1:
-                        Devices.SecureDigital.SecureDigital.Menu(devPath, dev);
-
-                        continue;
-                    case 2:
-                        MultiMediaCard.Menu(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
             }
         }
     }
diff --git a/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs b/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs
index 5691bae02..3dc03a7ca 100644
--- a/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs
+++ b/Aaru.Tests.Devices/SecureDigital/MultiMediaCard.cs
@@ -30,843 +30,842 @@ using Aaru.Console;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SecureDigital
+namespace Aaru.Tests.Devices.SecureDigital;
+
+internal static class MultiMediaCard
 {
-    internal static class MultiMediaCard
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a MultiMediaCard command to the device:");
+            AaruConsole.WriteLine("1.- Send READ_MULTIPLE_BLOCK command.");
+            AaruConsole.WriteLine("2.- Send READ_SINGLE_BLOCK command.");
+            AaruConsole.WriteLine("3.- Send SEND_CID command.");
+            AaruConsole.WriteLine("4.- Send SEND_CSD command.");
+            AaruConsole.WriteLine("5.- Send SEND_EXT_CSD command.");
+            AaruConsole.WriteLine("6.- Send SEND_OP_COND command.");
+            AaruConsole.WriteLine("7.- Send SEND_STATUS command.");
+            AaruConsole.WriteLine("8.- Send SET_BLOCKLEN command.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital/MultiMediaCard commands menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a MultiMediaCard command to the device:");
-                AaruConsole.WriteLine("1.- Send READ_MULTIPLE_BLOCK command.");
-                AaruConsole.WriteLine("2.- Send READ_SINGLE_BLOCK command.");
-                AaruConsole.WriteLine("3.- Send SEND_CID command.");
-                AaruConsole.WriteLine("4.- Send SEND_CSD command.");
-                AaruConsole.WriteLine("5.- Send SEND_EXT_CSD command.");
-                AaruConsole.WriteLine("6.- Send SEND_OP_COND command.");
-                AaruConsole.WriteLine("7.- Send SEND_STATUS command.");
-                AaruConsole.WriteLine("8.- Send SET_BLOCKLEN command.");
-                AaruConsole.WriteLine("0.- Return to SecureDigital/MultiMediaCard commands menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SecureDigital/MultiMediaCard commands menu...");
+
+                    return;
+                case 1:
+                    Read(devPath, dev, true);
+
+                    continue;
+                case 2:
+                    Read(devPath, dev, false);
+
+                    continue;
+                case 3:
+                    SendCid(devPath, dev);
+
+                    continue;
+                case 4:
+                    SendCsd(devPath, dev);
+
+                    continue;
+                case 5:
+                    SendExtendedCsd(devPath, dev);
+
+                    continue;
+                case 6:
+                    SendOpCond(devPath, dev);
+
+                    continue;
+                case 7:
+                    Status(devPath, dev);
+
+                    continue;
+                case 8:
+                    SetBlockLength(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SecureDigital/MultiMediaCard commands menu...");
-
-                        return;
-                    case 1:
-                        Read(devPath, dev, true);
-
-                        continue;
-                    case 2:
-                        Read(devPath, dev, false);
-
-                        continue;
-                    case 3:
-                        SendCid(devPath, dev);
-
-                        continue;
-                    case 4:
-                        SendCsd(devPath, dev);
-
-                        continue;
-                    case 5:
-                        SendExtendedCsd(devPath, dev);
-
-                        continue;
-                    case 6:
-                        SendOpCond(devPath, dev);
-
-                        continue;
-                    case 7:
-                        Status(devPath, dev);
-
-                        continue;
-                    case 8:
-                        SetBlockLength(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void Read(string devPath, Device dev, bool multiple)
-        {
-            uint   address   = 0;
-            uint   blockSize = 512;
-            ushort count     = 1;
-            bool   byteAddr  = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ_{0}_BLOCK command:", multiple ? "MULTIPLE" : "SINGLE");
-                AaruConsole.WriteLine("Read from {1}: {0}", address, byteAddr ? "byte" : "block");
-                AaruConsole.WriteLine("Expected block size: {0} bytes", blockSize);
-
-                if(multiple)
-                    AaruConsole.WriteLine("Will read {0} blocks", count);
-
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Use byte addressing?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out byteAddr))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            byteAddr = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Read from {0}?: ", byteAddr ? "byte" : "block");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(multiple)
-                        {
-                            AaruConsole.Write("How many blocks to read?");
-                            strDev = System.Console.ReadLine();
-
-                            if(!ushort.TryParse(strDev, out count))
-                            {
-                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                                count = 1;
-                                System.Console.ReadKey();
-
-                                continue;
-                            }
-                        }
-
-                        AaruConsole.Write("How many bytes to expect in a block?");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Read(out byte[] buffer, out uint[] response, address, blockSize,
-                                  multiple ? count : (ushort)1, byteAddr, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ_{0}_BLOCK to the device:", multiple ? "MULTIPLE" : "SINGLE");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print response buffer.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ_{0}_BLOCK buffer:", multiple ? "MULTIPLE" : "SINGLE");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ_{0}_BLOCK response:", multiple ? "MULTIPLE" : "SINGLE");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SendOpCond(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ReadOcr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEND_OP_COND to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print response buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_OP_COND buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_OP_COND decoded buffer:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_OP_COND response:");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Status(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ReadSdStatus(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEND_STATUS to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print response buffer.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_STATUS buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_STATUS response:");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SendCid(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ReadCid(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEND_CID to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print response buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CID buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CID decoded buffer:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CID response:");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SendCsd(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ReadCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEND_CSD to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print response buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CSD buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CSD decoded buffer:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CSD response:");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SendExtendedCsd(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ReadExtendedCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEND_EXT_CSD to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print response buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_EXT_CSD buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_EXT_CSD decoded buffer:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_EXT_CSD response:");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SetBlockLength(string devPath, Device dev)
-        {
-            uint   blockSize = 512;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SET_BLOCKLEN command:");
-                AaruConsole.WriteLine("Set block length to: {0} bytes", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Set block length to?");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-            bool sense = dev.SetBlockLength(blockSize, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SET_BLOCKLEN to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("SET_BLOCKLEN response:");
-
-            if(response != null)
-            {
-                foreach(uint res in response)
-                    AaruConsole.Write("0x{0:x8} ", res);
-
-                AaruConsole.WriteLine();
-            }
-
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("2.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
-
-                    return;
-                case 1: goto start;
-                case 2: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void Read(string devPath, Device dev, bool multiple)
+    {
+        uint   address   = 0;
+        uint   blockSize = 512;
+        ushort count     = 1;
+        bool   byteAddr  = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ_{0}_BLOCK command:", multiple ? "MULTIPLE" : "SINGLE");
+            AaruConsole.WriteLine("Read from {1}: {0}", address, byteAddr ? "byte" : "block");
+            AaruConsole.WriteLine("Expected block size: {0} bytes", blockSize);
+
+            if(multiple)
+                AaruConsole.WriteLine("Will read {0} blocks", count);
+
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Use byte addressing?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out byteAddr))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        byteAddr = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Read from {0}?: ", byteAddr ? "byte" : "block");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(multiple)
+                    {
+                        AaruConsole.Write("How many blocks to read?");
+                        strDev = System.Console.ReadLine();
+
+                        if(!ushort.TryParse(strDev, out count))
+                        {
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                            count = 1;
+                            System.Console.ReadKey();
+
+                            continue;
+                        }
+                    }
+
+                    AaruConsole.Write("How many bytes to expect in a block?");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read(out byte[] buffer, out uint[] response, address, blockSize,
+                              multiple ? count : (ushort)1, byteAddr, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ_{0}_BLOCK to the device:", multiple ? "MULTIPLE" : "SINGLE");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print response buffer.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ_{0}_BLOCK buffer:", multiple ? "MULTIPLE" : "SINGLE");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ_{0}_BLOCK response:", multiple ? "MULTIPLE" : "SINGLE");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SendOpCond(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ReadOcr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEND_OP_COND to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print response buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_OP_COND buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_OP_COND decoded buffer:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_OP_COND response:");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Status(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ReadSdStatus(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEND_STATUS to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print response buffer.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_STATUS buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_STATUS response:");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SendCid(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ReadCid(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEND_CID to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print response buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CID buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CID decoded buffer:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CID response:");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SendCsd(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ReadCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEND_CSD to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print response buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CSD buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CSD decoded buffer:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CSD response:");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SendExtendedCsd(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ReadExtendedCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEND_EXT_CSD to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print response buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_EXT_CSD buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_EXT_CSD decoded buffer:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_EXT_CSD response:");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SetBlockLength(string devPath, Device dev)
+    {
+        uint   blockSize = 512;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SET_BLOCKLEN command:");
+            AaruConsole.WriteLine("Set block length to: {0} bytes", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Set block length to?");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+        bool sense = dev.SetBlockLength(blockSize, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SET_BLOCKLEN to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("SET_BLOCKLEN response:");
+
+        if(response != null)
+        {
+            foreach(uint res in response)
+                AaruConsole.Write("0x{0:x8} ", res);
+
+            AaruConsole.WriteLine();
+        }
+
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("2.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to MultiMediaCard commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to MultiMediaCard commands menu...");
+
+                return;
+            case 1: goto start;
+            case 2: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs b/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs
index b018b5e56..225de3d78 100644
--- a/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs
+++ b/Aaru.Tests.Devices/SecureDigital/SecureDigital.cs
@@ -30,843 +30,842 @@ using Aaru.Console;
 using Aaru.Devices;
 using Aaru.Helpers;
 
-namespace Aaru.Tests.Devices.SecureDigital
+namespace Aaru.Tests.Devices.SecureDigital;
+
+internal static class SecureDigital
 {
-    internal static class SecureDigital
+    internal static void Menu(string devPath, Device dev)
     {
-        internal static void Menu(string devPath, Device dev)
+        while(true)
         {
-            while(true)
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Send a SecureDigital command to the device:");
+            AaruConsole.WriteLine("1.- Send READ_MULTIPLE_BLOCK command.");
+            AaruConsole.WriteLine("2.- Send READ_SINGLE_BLOCK command.");
+            AaruConsole.WriteLine("3.- Send SD_SEND_OP_COND command.");
+            AaruConsole.WriteLine("4.- Send SD_STATUS command.");
+            AaruConsole.WriteLine("5.- Send SEND_CID command.");
+            AaruConsole.WriteLine("6.- Send SEND_CSD command.");
+            AaruConsole.WriteLine("7.- Send SEND_SCR command.");
+            AaruConsole.WriteLine("8.- Send SET_BLOCKLEN command.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital/MultiMediaCard commands menu.");
+            AaruConsole.Write("Choose: ");
+
+            string strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out int item))
             {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Send a SecureDigital command to the device:");
-                AaruConsole.WriteLine("1.- Send READ_MULTIPLE_BLOCK command.");
-                AaruConsole.WriteLine("2.- Send READ_SINGLE_BLOCK command.");
-                AaruConsole.WriteLine("3.- Send SD_SEND_OP_COND command.");
-                AaruConsole.WriteLine("4.- Send SD_STATUS command.");
-                AaruConsole.WriteLine("5.- Send SEND_CID command.");
-                AaruConsole.WriteLine("6.- Send SEND_CSD command.");
-                AaruConsole.WriteLine("7.- Send SEND_SCR command.");
-                AaruConsole.WriteLine("8.- Send SET_BLOCKLEN command.");
-                AaruConsole.WriteLine("0.- Return to SecureDigital/MultiMediaCard commands menu.");
-                AaruConsole.Write("Choose: ");
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
 
-                string strDev = System.Console.ReadLine();
+                continue;
+            }
 
-                if(!int.TryParse(strDev, out int item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SecureDigital/MultiMediaCard commands menu...");
+
+                    return;
+                case 1:
+                    Read(devPath, dev, true);
+
+                    continue;
+                case 2:
+                    Read(devPath, dev, false);
+
+                    continue;
+                case 3:
+                    SendOpCond(devPath, dev);
+
+                    continue;
+                case 4:
+                    Status(devPath, dev);
+
+                    continue;
+                case 5:
+                    SendCid(devPath, dev);
+
+                    continue;
+                case 6:
+                    SendCsd(devPath, dev);
+
+                    continue;
+                case 7:
+                    SendScr(devPath, dev);
+
+                    continue;
+                case 8:
+                    SetBlockLength(devPath, dev);
+
+                    continue;
+                default:
+                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
                     System.Console.ReadKey();
 
                     continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SecureDigital/MultiMediaCard commands menu...");
-
-                        return;
-                    case 1:
-                        Read(devPath, dev, true);
-
-                        continue;
-                    case 2:
-                        Read(devPath, dev, false);
-
-                        continue;
-                    case 3:
-                        SendOpCond(devPath, dev);
-
-                        continue;
-                    case 4:
-                        Status(devPath, dev);
-
-                        continue;
-                    case 5:
-                        SendCid(devPath, dev);
-
-                        continue;
-                    case 6:
-                        SendCsd(devPath, dev);
-
-                        continue;
-                    case 7:
-                        SendScr(devPath, dev);
-
-                        continue;
-                    case 8:
-                        SetBlockLength(devPath, dev);
-
-                        continue;
-                    default:
-                        AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                        System.Console.ReadKey();
-
-                        continue;
-                }
-            }
-        }
-
-        static void Read(string devPath, Device dev, bool multiple)
-        {
-            uint   address   = 0;
-            uint   blockSize = 512;
-            ushort count     = 1;
-            bool   byteAddr  = false;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for READ_{0}_BLOCK command:", multiple ? "MULTIPLE" : "SINGLE");
-                AaruConsole.WriteLine("Read from {1}: {0}", address, byteAddr ? "byte" : "block");
-                AaruConsole.WriteLine("Expected block size: {0} bytes", blockSize);
-
-                if(multiple)
-                    AaruConsole.WriteLine("Will read {0} blocks", count);
-
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Use byte addressing?: ");
-                        strDev = System.Console.ReadLine();
-
-                        if(!bool.TryParse(strDev, out byteAddr))
-                        {
-                            AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
-                            byteAddr = false;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        AaruConsole.Write("Read from {0}?: ", byteAddr ? "byte" : "block");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out address))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            address = 0;
-                            System.Console.ReadKey();
-
-                            continue;
-                        }
-
-                        if(multiple)
-                        {
-                            AaruConsole.Write("How many blocks to read?");
-                            strDev = System.Console.ReadLine();
-
-                            if(!ushort.TryParse(strDev, out count))
-                            {
-                                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                                count = 1;
-                                System.Console.ReadKey();
-
-                                continue;
-                            }
-                        }
-
-                        AaruConsole.Write("How many bytes to expect in a block?");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-
-            bool sense = dev.Read(out byte[] buffer, out uint[] response, address, blockSize,
-                                  multiple ? count : (ushort)1, byteAddr, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending READ_{0}_BLOCK to the device:", multiple ? "MULTIPLE" : "SINGLE");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print response buffer.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("4.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ_{0}_BLOCK buffer:", multiple ? "MULTIPLE" : "SINGLE");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("READ_{0}_BLOCK response:", multiple ? "MULTIPLE" : "SINGLE");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                case 4: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SendOpCond(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ReadSdocr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SD_SEND_OP_COND to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print response buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SD_SEND_OP_COND buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SD_SEND_OP_COND decoded buffer:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SD_SEND_OP_COND response:");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void Status(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ReadSdStatus(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SD_STATUS to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Print response buffer.");
-            AaruConsole.WriteLine("3.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SD_STATUS buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SD_STATUS response:");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SendCid(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ReadCid(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEND_CID to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print response buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CID buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CID decoded buffer:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CID response:");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SendCsd(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ReadCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEND_CSD to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print response buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CSD buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CSD decoded buffer:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_CSD response:");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SendScr(string devPath, Device dev)
-        {
-            start:
-            System.Console.Clear();
-            bool sense = dev.ReadScr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SEND_SCR to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Print buffer.");
-            AaruConsole.WriteLine("2.- Decode buffer.");
-            AaruConsole.WriteLine("3.- Print response buffer.");
-            AaruConsole.WriteLine("4.- Send command again.");
-            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            string strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out int item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
-
-                    return;
-                case 1:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_SCR buffer:");
-
-                    if(buffer != null)
-                        PrintHex.PrintHexArray(buffer, 64);
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 2:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_SCR decoded buffer:");
-
-                    if(buffer != null)
-                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(buffer));
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 3:
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-                    AaruConsole.WriteLine("SEND_SCR response:");
-
-                    if(response != null)
-                    {
-                        foreach(uint res in response)
-                            AaruConsole.Write("0x{0:x8} ", res);
-
-                        AaruConsole.WriteLine();
-                    }
-
-                    AaruConsole.WriteLine("Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-                    AaruConsole.WriteLine("Device: {0}", devPath);
-
-                    goto menu;
-                case 4: goto start;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
-            }
-        }
-
-        static void SetBlockLength(string devPath, Device dev)
-        {
-            uint   blockSize = 512;
-            string strDev;
-            int    item;
-
-            parameters:
-
-            while(true)
-            {
-                System.Console.Clear();
-                AaruConsole.WriteLine("Device: {0}", devPath);
-                AaruConsole.WriteLine("Parameters for SET_BLOCKLEN command:");
-                AaruConsole.WriteLine("Set block length to: {0} bytes", blockSize);
-                AaruConsole.WriteLine();
-                AaruConsole.WriteLine("Choose what to do:");
-                AaruConsole.WriteLine("1.- Change parameters.");
-                AaruConsole.WriteLine("2.- Send command with these parameters.");
-                AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-
-                strDev = System.Console.ReadLine();
-
-                if(!int.TryParse(strDev, out item))
-                {
-                    AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                    System.Console.ReadKey();
-
-                    continue;
-                }
-
-                switch(item)
-                {
-                    case 0:
-                        AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
-
-                        return;
-                    case 1:
-                        AaruConsole.Write("Set block length to?");
-                        strDev = System.Console.ReadLine();
-
-                        if(!uint.TryParse(strDev, out blockSize))
-                        {
-                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                            blockSize = 512;
-                            System.Console.ReadKey();
-                        }
-
-                        break;
-                    case 2: goto start;
-                }
-            }
-
-            start:
-            System.Console.Clear();
-            bool sense = dev.SetBlockLength(blockSize, out uint[] response, dev.Timeout, out double duration);
-
-            menu:
-            AaruConsole.WriteLine("Device: {0}", devPath);
-            AaruConsole.WriteLine("Sending SET_BLOCKLEN to the device:");
-            AaruConsole.WriteLine("Command took {0} ms.", duration);
-            AaruConsole.WriteLine("Sense is {0}.", sense);
-            AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
-            AaruConsole.WriteLine("SET_BLOCKLEN response:");
-
-            if(response != null)
-            {
-                foreach(uint res in response)
-                    AaruConsole.Write("0x{0:x8} ", res);
-
-                AaruConsole.WriteLine();
-            }
-
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("Choose what to do:");
-            AaruConsole.WriteLine("1.- Send command again.");
-            AaruConsole.WriteLine("2.- Change parameters.");
-            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
-            AaruConsole.Write("Choose: ");
-
-            strDev = System.Console.ReadLine();
-
-            if(!int.TryParse(strDev, out item))
-            {
-                AaruConsole.WriteLine("Not a number. Press any key to continue...");
-                System.Console.ReadKey();
-                System.Console.Clear();
-
-                goto menu;
-            }
-
-            switch(item)
-            {
-                case 0:
-                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
-
-                    return;
-                case 1: goto start;
-                case 2: goto parameters;
-                default:
-                    AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
-                    System.Console.ReadKey();
-                    System.Console.Clear();
-
-                    goto menu;
             }
         }
     }
+
+    static void Read(string devPath, Device dev, bool multiple)
+    {
+        uint   address   = 0;
+        uint   blockSize = 512;
+        ushort count     = 1;
+        bool   byteAddr  = false;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for READ_{0}_BLOCK command:", multiple ? "MULTIPLE" : "SINGLE");
+            AaruConsole.WriteLine("Read from {1}: {0}", address, byteAddr ? "byte" : "block");
+            AaruConsole.WriteLine("Expected block size: {0} bytes", blockSize);
+
+            if(multiple)
+                AaruConsole.WriteLine("Will read {0} blocks", count);
+
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Use byte addressing?: ");
+                    strDev = System.Console.ReadLine();
+
+                    if(!bool.TryParse(strDev, out byteAddr))
+                    {
+                        AaruConsole.WriteLine("Not a boolean. Press any key to continue...");
+                        byteAddr = false;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    AaruConsole.Write("Read from {0}?: ", byteAddr ? "byte" : "block");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out address))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        address = 0;
+                        System.Console.ReadKey();
+
+                        continue;
+                    }
+
+                    if(multiple)
+                    {
+                        AaruConsole.Write("How many blocks to read?");
+                        strDev = System.Console.ReadLine();
+
+                        if(!ushort.TryParse(strDev, out count))
+                        {
+                            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                            count = 1;
+                            System.Console.ReadKey();
+
+                            continue;
+                        }
+                    }
+
+                    AaruConsole.Write("How many bytes to expect in a block?");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+
+        bool sense = dev.Read(out byte[] buffer, out uint[] response, address, blockSize,
+                              multiple ? count : (ushort)1, byteAddr, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending READ_{0}_BLOCK to the device:", multiple ? "MULTIPLE" : "SINGLE");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print response buffer.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("4.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ_{0}_BLOCK buffer:", multiple ? "MULTIPLE" : "SINGLE");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("READ_{0}_BLOCK response:", multiple ? "MULTIPLE" : "SINGLE");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            case 4: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SendOpCond(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ReadSdocr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SD_SEND_OP_COND to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print response buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SD_SEND_OP_COND buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SD_SEND_OP_COND decoded buffer:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SD_SEND_OP_COND response:");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void Status(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ReadSdStatus(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SD_STATUS to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Print response buffer.");
+        AaruConsole.WriteLine("3.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SD_STATUS buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SD_STATUS response:");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SendCid(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ReadCid(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEND_CID to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print response buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CID buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CID decoded buffer:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CID response:");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SendCsd(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ReadCsd(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEND_CSD to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print response buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CSD buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CSD decoded buffer:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_CSD response:");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SendScr(string devPath, Device dev)
+    {
+        start:
+        System.Console.Clear();
+        bool sense = dev.ReadScr(out byte[] buffer, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SEND_SCR to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Buffer is {0} bytes.", buffer?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("Buffer is null or empty? {0}", ArrayHelpers.ArrayIsNullOrEmpty(buffer));
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Print buffer.");
+        AaruConsole.WriteLine("2.- Decode buffer.");
+        AaruConsole.WriteLine("3.- Print response buffer.");
+        AaruConsole.WriteLine("4.- Send command again.");
+        AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        string strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out int item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
+                return;
+            case 1:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_SCR buffer:");
+
+                if(buffer != null)
+                    PrintHex.PrintHexArray(buffer, 64);
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 2:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_SCR decoded buffer:");
+
+                if(buffer != null)
+                    AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(buffer));
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 3:
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+                AaruConsole.WriteLine("SEND_SCR response:");
+
+                if(response != null)
+                {
+                    foreach(uint res in response)
+                        AaruConsole.Write("0x{0:x8} ", res);
+
+                    AaruConsole.WriteLine();
+                }
+
+                AaruConsole.WriteLine("Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+                AaruConsole.WriteLine("Device: {0}", devPath);
+
+                goto menu;
+            case 4: goto start;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
+
+    static void SetBlockLength(string devPath, Device dev)
+    {
+        uint   blockSize = 512;
+        string strDev;
+        int    item;
+
+        parameters:
+
+        while(true)
+        {
+            System.Console.Clear();
+            AaruConsole.WriteLine("Device: {0}", devPath);
+            AaruConsole.WriteLine("Parameters for SET_BLOCKLEN command:");
+            AaruConsole.WriteLine("Set block length to: {0} bytes", blockSize);
+            AaruConsole.WriteLine();
+            AaruConsole.WriteLine("Choose what to do:");
+            AaruConsole.WriteLine("1.- Change parameters.");
+            AaruConsole.WriteLine("2.- Send command with these parameters.");
+            AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+
+            strDev = System.Console.ReadLine();
+
+            if(!int.TryParse(strDev, out item))
+            {
+                AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                System.Console.ReadKey();
+
+                continue;
+            }
+
+            switch(item)
+            {
+                case 0:
+                    AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
+                    return;
+                case 1:
+                    AaruConsole.Write("Set block length to?");
+                    strDev = System.Console.ReadLine();
+
+                    if(!uint.TryParse(strDev, out blockSize))
+                    {
+                        AaruConsole.WriteLine("Not a number. Press any key to continue...");
+                        blockSize = 512;
+                        System.Console.ReadKey();
+                    }
+
+                    break;
+                case 2: goto start;
+            }
+        }
+
+        start:
+        System.Console.Clear();
+        bool sense = dev.SetBlockLength(blockSize, out uint[] response, dev.Timeout, out double duration);
+
+        menu:
+        AaruConsole.WriteLine("Device: {0}", devPath);
+        AaruConsole.WriteLine("Sending SET_BLOCKLEN to the device:");
+        AaruConsole.WriteLine("Command took {0} ms.", duration);
+        AaruConsole.WriteLine("Sense is {0}.", sense);
+        AaruConsole.WriteLine("Response has {0} elements.", response?.Length.ToString() ?? "null");
+        AaruConsole.WriteLine("SET_BLOCKLEN response:");
+
+        if(response != null)
+        {
+            foreach(uint res in response)
+                AaruConsole.Write("0x{0:x8} ", res);
+
+            AaruConsole.WriteLine();
+        }
+
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("Choose what to do:");
+        AaruConsole.WriteLine("1.- Send command again.");
+        AaruConsole.WriteLine("2.- Change parameters.");
+        AaruConsole.WriteLine("0.- Return to SecureDigital commands menu.");
+        AaruConsole.Write("Choose: ");
+
+        strDev = System.Console.ReadLine();
+
+        if(!int.TryParse(strDev, out item))
+        {
+            AaruConsole.WriteLine("Not a number. Press any key to continue...");
+            System.Console.ReadKey();
+            System.Console.Clear();
+
+            goto menu;
+        }
+
+        switch(item)
+        {
+            case 0:
+                AaruConsole.WriteLine("Returning to SecureDigital commands menu...");
+
+                return;
+            case 1: goto start;
+            case 2: goto parameters;
+            default:
+                AaruConsole.WriteLine("Incorrect option. Press any key to continue...");
+                System.Console.ReadKey();
+                System.Console.Clear();
+
+                goto menu;
+        }
+    }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/Adler32.cs b/Aaru.Tests/Checksums/Adler32.cs
index a67c6c293..626b62245 100644
--- a/Aaru.Tests/Checksums/Adler32.cs
+++ b/Aaru.Tests/Checksums/Adler32.cs
@@ -32,184 +32,183 @@ using Aaru.CommonTypes.Interfaces;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class Adler32
 {
-    [TestFixture]
-    public class Adler32
+    static readonly byte[] _expectedEmpty =
     {
-        static readonly byte[] _expectedEmpty =
-        {
-            0x00, 0xf0, 0x00, 0x01
-        };
-        static readonly byte[] _expectedRandom =
-        {
-            0x37, 0x28, 0xd1, 0x86
-        };
+        0x00, 0xf0, 0x00, 0x01
+    };
+    static readonly byte[] _expectedRandom =
+    {
+        0x37, 0x28, 0xd1, 0x86
+    };
 
-        static readonly byte[] _expectedRandom15 =
-        {
-            0x34, 0xDC, 0x06, 0x7D
-        };
+    static readonly byte[] _expectedRandom15 =
+    {
+        0x34, 0xDC, 0x06, 0x7D
+    };
 
-        static readonly byte[] _expectedRandom31 =
-        {
-            0xD8, 0xF1, 0x0E, 0xAA
-        };
+    static readonly byte[] _expectedRandom31 =
+    {
+        0xD8, 0xF1, 0x0E, 0xAA
+    };
 
-        static readonly byte[] _expectedRandom63 =
-        {
-            0xD8, 0xAC, 0x20, 0x81
-        };
+    static readonly byte[] _expectedRandom63 =
+    {
+        0xD8, 0xAC, 0x20, 0x81
+    };
 
-        static readonly byte[] _expectedRandom2352 =
-        {
-            0xEC, 0xD1, 0x73, 0x8B
-        };
+    static readonly byte[] _expectedRandom2352 =
+    {
+        0xEC, 0xD1, 0x73, 0x8B
+    };
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Adler32Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Adler32Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyFile()
-        {
-            byte[] result = Adler32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+    [Test]
+    public void EmptyFile()
+    {
+        byte[] result = Adler32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Adler32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Adler32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Adler32Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Adler32Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomFile()
-        {
-            byte[] result = Adler32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+    [Test]
+    public void RandomFile()
+    {
+        byte[] result = Adler32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Adler32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Adler32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void PartialInstanceAuto15()
-        {
-            byte[] data = new byte[15];
+    [Test]
+    public void PartialInstanceAuto15()
+    {
+        byte[] data = new byte[15];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 15);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Adler32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom15);
-        }
+        fs.Read(data, 0, 15);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Adler32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom15);
+    }
 
-        [Test]
-        public void PartialInstanceAuto31()
-        {
-            byte[] data = new byte[31];
+    [Test]
+    public void PartialInstanceAuto31()
+    {
+        byte[] data = new byte[31];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 31);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Adler32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom31);
-        }
+        fs.Read(data, 0, 31);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Adler32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom31);
+    }
 
-        [Test]
-        public void PartialInstanceAuto63()
-        {
-            byte[] data = new byte[63];
+    [Test]
+    public void PartialInstanceAuto63()
+    {
+        byte[] data = new byte[63];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 63);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Adler32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom63);
-        }
+        fs.Read(data, 0, 63);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Adler32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom63);
+    }
 
-        [Test]
-        public void PartialInstanceAuto2352()
-        {
-            byte[] data = new byte[2352];
+    [Test]
+    public void PartialInstanceAuto2352()
+    {
+        byte[] data = new byte[2352];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 2352);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Adler32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom2352);
-        }
+        fs.Read(data, 0, 2352);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Adler32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom2352);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/CRC16CCITT.cs b/Aaru.Tests/Checksums/CRC16CCITT.cs
index 2ae0079ad..aeb64c95f 100644
--- a/Aaru.Tests/Checksums/CRC16CCITT.cs
+++ b/Aaru.Tests/Checksums/CRC16CCITT.cs
@@ -31,184 +31,183 @@ using Aaru.Checksums;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class Crc16Ccitt
 {
-    [TestFixture]
-    public class Crc16Ccitt
+    static readonly byte[] _expectedEmpty =
     {
-        static readonly byte[] _expectedEmpty =
-        {
-            0xFF, 0xFF
-        };
-        static readonly byte[] _expectedRandom =
-        {
-            0x36, 0x40
-        };
-        static readonly byte[] _expectedRandom15 =
-        {
-            0x16, 0x6e
-        };
-        static readonly byte[] _expectedRandom31 =
-        {
-            0xd0, 0x16
-        };
-        static readonly byte[] _expectedRandom63 =
-        {
-            0x73, 0xc4
-        };
-        static readonly byte[] _expectedRandom2352 =
-        {
-            0x19, 0x46
-        };
+        0xFF, 0xFF
+    };
+    static readonly byte[] _expectedRandom =
+    {
+        0x36, 0x40
+    };
+    static readonly byte[] _expectedRandom15 =
+    {
+        0x16, 0x6e
+    };
+    static readonly byte[] _expectedRandom31 =
+    {
+        0xd0, 0x16
+    };
+    static readonly byte[] _expectedRandom63 =
+    {
+        0x73, 0xc4
+    };
+    static readonly byte[] _expectedRandom2352 =
+    {
+        0x19, 0x46
+    };
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            CRC16CCITTContext.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        CRC16CCITTContext.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyFile()
-        {
-            byte[] result =
-                CRC16CCITTContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+    [Test]
+    public void EmptyFile()
+    {
+        byte[] result =
+            CRC16CCITTContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
 
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            var ctx = new CRC16CCITTContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        var ctx = new CRC16CCITTContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            CRC16CCITTContext.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        CRC16CCITTContext.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomFile()
-        {
-            byte[] result =
-                CRC16CCITTContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+    [Test]
+    public void RandomFile()
+    {
+        byte[] result =
+            CRC16CCITTContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
 
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            var ctx = new CRC16CCITTContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        var ctx = new CRC16CCITTContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void PartialInstance15()
-        {
-            byte[] data = new byte[15];
+    [Test]
+    public void PartialInstance15()
+    {
+        byte[] data = new byte[15];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 15);
-            fs.Close();
-            fs.Dispose();
-            var ctx = new CRC16CCITTContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom15);
-        }
+        fs.Read(data, 0, 15);
+        fs.Close();
+        fs.Dispose();
+        var ctx = new CRC16CCITTContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom15);
+    }
 
-        [Test]
-        public void PartialInstance31()
-        {
-            byte[] data = new byte[31];
+    [Test]
+    public void PartialInstance31()
+    {
+        byte[] data = new byte[31];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 31);
-            fs.Close();
-            fs.Dispose();
-            var ctx = new CRC16CCITTContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom31);
-        }
+        fs.Read(data, 0, 31);
+        fs.Close();
+        fs.Dispose();
+        var ctx = new CRC16CCITTContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom31);
+    }
 
-        [Test]
-        public void PartialInstance63()
-        {
-            byte[] data = new byte[63];
+    [Test]
+    public void PartialInstance63()
+    {
+        byte[] data = new byte[63];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 63);
-            fs.Close();
-            fs.Dispose();
-            var ctx = new CRC16CCITTContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom63);
-        }
+        fs.Read(data, 0, 63);
+        fs.Close();
+        fs.Dispose();
+        var ctx = new CRC16CCITTContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom63);
+    }
 
-        [Test]
-        public void PartialInstance2352()
-        {
-            byte[] data = new byte[2352];
+    [Test]
+    public void PartialInstance2352()
+    {
+        byte[] data = new byte[2352];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 2352);
-            fs.Close();
-            fs.Dispose();
-            var ctx = new CRC16CCITTContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom2352);
-        }
+        fs.Read(data, 0, 2352);
+        fs.Close();
+        fs.Dispose();
+        var ctx = new CRC16CCITTContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom2352);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/CRC16IBM.cs b/Aaru.Tests/Checksums/CRC16IBM.cs
index 5e5febbe4..5e8a7c919 100644
--- a/Aaru.Tests/Checksums/CRC16IBM.cs
+++ b/Aaru.Tests/Checksums/CRC16IBM.cs
@@ -32,182 +32,181 @@ using Aaru.CommonTypes.Interfaces;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class Crc16Ibm
 {
-    [TestFixture]
-    public class Crc16Ibm
+    static readonly byte[] _expectedEmpty =
     {
-        static readonly byte[] _expectedEmpty =
-        {
-            0x00, 0x00
-        };
-        static readonly byte[] _expectedRandom =
-        {
-            0x2d, 0x6d
-        };
-        static readonly byte[] _expectedRandom15 =
-        {
-            0x72, 0xa6
-        };
-        static readonly byte[] _expectedRandom31 =
-        {
-            0xf4, 0x9e
-        };
-        static readonly byte[] _expectedRandom63 =
-        {
-            0xfb, 0xd9
-        };
-        static readonly byte[] _expectedRandom2352 =
-        {
-            0x23, 0xf4
-        };
+        0x00, 0x00
+    };
+    static readonly byte[] _expectedRandom =
+    {
+        0x2d, 0x6d
+    };
+    static readonly byte[] _expectedRandom15 =
+    {
+        0x72, 0xa6
+    };
+    static readonly byte[] _expectedRandom31 =
+    {
+        0xf4, 0x9e
+    };
+    static readonly byte[] _expectedRandom63 =
+    {
+        0xfb, 0xd9
+    };
+    static readonly byte[] _expectedRandom2352 =
+    {
+        0x23, 0xf4
+    };
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            CRC16IBMContext.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        CRC16IBMContext.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyFile()
-        {
-            byte[] result = CRC16IBMContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+    [Test]
+    public void EmptyFile()
+    {
+        byte[] result = CRC16IBMContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
 
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new CRC16IBMContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new CRC16IBMContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            CRC16IBMContext.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        CRC16IBMContext.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomFile()
-        {
-            byte[] result = CRC16IBMContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+    [Test]
+    public void RandomFile()
+    {
+        byte[] result = CRC16IBMContext.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
 
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new CRC16IBMContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new CRC16IBMContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void PartialInstance15()
-        {
-            byte[] data = new byte[15];
+    [Test]
+    public void PartialInstance15()
+    {
+        byte[] data = new byte[15];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 15);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new CRC16IBMContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom15);
-        }
+        fs.Read(data, 0, 15);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new CRC16IBMContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom15);
+    }
 
-        [Test]
-        public void PartialInstance31()
-        {
-            byte[] data = new byte[31];
+    [Test]
+    public void PartialInstance31()
+    {
+        byte[] data = new byte[31];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 31);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new CRC16IBMContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom31);
-        }
+        fs.Read(data, 0, 31);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new CRC16IBMContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom31);
+    }
 
-        [Test]
-        public void PartialInstance63()
-        {
-            byte[] data = new byte[63];
+    [Test]
+    public void PartialInstance63()
+    {
+        byte[] data = new byte[63];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 63);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new CRC16IBMContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom63);
-        }
+        fs.Read(data, 0, 63);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new CRC16IBMContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom63);
+    }
 
-        [Test]
-        public void PartialInstance2352()
-        {
-            byte[] data = new byte[2352];
+    [Test]
+    public void PartialInstance2352()
+    {
+        byte[] data = new byte[2352];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 2352);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new CRC16IBMContext();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom2352);
-        }
+        fs.Read(data, 0, 2352);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new CRC16IBMContext();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom2352);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/CRC32.cs b/Aaru.Tests/Checksums/CRC32.cs
index a8ebd97dd..84e4bfc12 100644
--- a/Aaru.Tests/Checksums/CRC32.cs
+++ b/Aaru.Tests/Checksums/CRC32.cs
@@ -32,180 +32,179 @@ using Aaru.CommonTypes.Interfaces;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class Crc32
 {
-    [TestFixture]
-    public class Crc32
+    static readonly byte[] _expectedEmpty =
     {
-        static readonly byte[] _expectedEmpty =
-        {
-            0xa7, 0x38, 0xea, 0x1c
-        };
-        static readonly byte[] _expectedRandom =
-        {
-            0x2b, 0x6e, 0x68, 0x54
-        };
-        static readonly byte[] _expectedRandom15 =
-        {
-            0xad, 0x6d, 0xa7, 0x27
-        };
-        static readonly byte[] _expectedRandom31 =
-        {
-            0xa2, 0xad, 0x2f, 0xaa
-        };
-        static readonly byte[] _expectedRandom63 =
-        {
-            0xbf, 0xf6, 0xa3, 0x41
-        };
-        static readonly byte[] _expectedRandom2352 =
-        {
-            0x08, 0xba, 0x93, 0xea
-        };
+        0xa7, 0x38, 0xea, 0x1c
+    };
+    static readonly byte[] _expectedRandom =
+    {
+        0x2b, 0x6e, 0x68, 0x54
+    };
+    static readonly byte[] _expectedRandom15 =
+    {
+        0xad, 0x6d, 0xa7, 0x27
+    };
+    static readonly byte[] _expectedRandom31 =
+    {
+        0xa2, 0xad, 0x2f, 0xaa
+    };
+    static readonly byte[] _expectedRandom63 =
+    {
+        0xbf, 0xf6, 0xa3, 0x41
+    };
+    static readonly byte[] _expectedRandom2352 =
+    {
+        0x08, 0xba, 0x93, 0xea
+    };
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Crc32Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Crc32Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyFile()
-        {
-            byte[] result = Crc32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+    [Test]
+    public void EmptyFile()
+    {
+        byte[] result = Crc32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Crc32Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Crc32Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomFile()
-        {
-            byte[] result = Crc32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+    [Test]
+    public void RandomFile()
+    {
+        byte[] result = Crc32Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void PartialInstance15()
-        {
-            byte[] data = new byte[15];
+    [Test]
+    public void PartialInstance15()
+    {
+        byte[] data = new byte[15];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 15);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom15);
-        }
+        fs.Read(data, 0, 15);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom15);
+    }
 
-        [Test]
-        public void PartialInstance31()
-        {
-            byte[] data = new byte[31];
+    [Test]
+    public void PartialInstance31()
+    {
+        byte[] data = new byte[31];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 31);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom31);
-        }
+        fs.Read(data, 0, 31);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom31);
+    }
 
-        [Test]
-        public void PartialInstance63()
-        {
-            byte[] data = new byte[63];
+    [Test]
+    public void PartialInstance63()
+    {
+        byte[] data = new byte[63];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 63);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom63);
-        }
+        fs.Read(data, 0, 63);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom63);
+    }
 
-        [Test]
-        public void PartialInstance2352()
-        {
-            byte[] data = new byte[2352];
+    [Test]
+    public void PartialInstance2352()
+    {
+        byte[] data = new byte[2352];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 2352);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc32Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom2352);
-        }
+        fs.Read(data, 0, 2352);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc32Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom2352);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/CRC64.cs b/Aaru.Tests/Checksums/CRC64.cs
index 386a7ad06..088413bcc 100644
--- a/Aaru.Tests/Checksums/CRC64.cs
+++ b/Aaru.Tests/Checksums/CRC64.cs
@@ -32,180 +32,179 @@ using Aaru.CommonTypes.Interfaces;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class Crc64
 {
-    [TestFixture]
-    public class Crc64
+    static readonly byte[] _expectedEmpty =
     {
-        static readonly byte[] _expectedEmpty =
-        {
-            0x60, 0x6b, 0x70, 0xa2, 0x3e, 0xba, 0xf6, 0xc2
-        };
-        static readonly byte[] _expectedRandom =
-        {
-            0xbf, 0x09, 0x99, 0x2c, 0xc5, 0xed, 0xe3, 0x8e
-        };
-        static readonly byte[] _expectedRandom15 =
-        {
-            0x79, 0x7F, 0x37, 0x66, 0xFD, 0x93, 0x97, 0x5B
-        };
-        static readonly byte[] _expectedRandom31 =
-        {
-            0xCD, 0x92, 0x01, 0x90, 0x5A, 0x79, 0x37, 0xFD
-        };
-        static readonly byte[] _expectedRandom63 =
-        {
-            0x29, 0xF3, 0x31, 0xFC, 0x90, 0x70, 0x2B, 0xF4
-        };
-        static readonly byte[] _expectedRandom2352 =
-        {
-            0x12, 0x64, 0x35, 0xDB, 0x43, 0x47, 0x76, 0x23
-        };
+        0x60, 0x6b, 0x70, 0xa2, 0x3e, 0xba, 0xf6, 0xc2
+    };
+    static readonly byte[] _expectedRandom =
+    {
+        0xbf, 0x09, 0x99, 0x2c, 0xc5, 0xed, 0xe3, 0x8e
+    };
+    static readonly byte[] _expectedRandom15 =
+    {
+        0x79, 0x7F, 0x37, 0x66, 0xFD, 0x93, 0x97, 0x5B
+    };
+    static readonly byte[] _expectedRandom31 =
+    {
+        0xCD, 0x92, 0x01, 0x90, 0x5A, 0x79, 0x37, 0xFD
+    };
+    static readonly byte[] _expectedRandom63 =
+    {
+        0x29, 0xF3, 0x31, 0xFC, 0x90, 0x70, 0x2B, 0xF4
+    };
+    static readonly byte[] _expectedRandom2352 =
+    {
+        0x12, 0x64, 0x35, 0xDB, 0x43, 0x47, 0x76, 0x23
+    };
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Crc64Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Crc64Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyFile()
-        {
-            byte[] result = Crc64Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+    [Test]
+    public void EmptyFile()
+    {
+        byte[] result = Crc64Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc64Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc64Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Crc64Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Crc64Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomFile()
-        {
-            byte[] result = Crc64Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+    [Test]
+    public void RandomFile()
+    {
+        byte[] result = Crc64Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc64Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc64Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void PartialInstance15()
-        {
-            byte[] data = new byte[15];
+    [Test]
+    public void PartialInstance15()
+    {
+        byte[] data = new byte[15];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 15);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc64Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom15);
-        }
+        fs.Read(data, 0, 15);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc64Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom15);
+    }
 
-        [Test]
-        public void PartialInstance31()
-        {
-            byte[] data = new byte[31];
+    [Test]
+    public void PartialInstance31()
+    {
+        byte[] data = new byte[31];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 31);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc64Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom31);
-        }
+        fs.Read(data, 0, 31);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc64Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom31);
+    }
 
-        [Test]
-        public void PartialInstance63()
-        {
-            byte[] data = new byte[63];
+    [Test]
+    public void PartialInstance63()
+    {
+        byte[] data = new byte[63];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 63);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc64Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom63);
-        }
+        fs.Read(data, 0, 63);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc64Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom63);
+    }
 
-        [Test]
-        public void PartialInstance2352()
-        {
-            byte[] data = new byte[2352];
+    [Test]
+    public void PartialInstance2352()
+    {
+        byte[] data = new byte[2352];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 2352);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Crc64Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom2352);
-        }
+        fs.Read(data, 0, 2352);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Crc64Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom2352);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/MD5.cs b/Aaru.Tests/Checksums/MD5.cs
index ffd315c1e..fd9a2c5a3 100644
--- a/Aaru.Tests/Checksums/MD5.cs
+++ b/Aaru.Tests/Checksums/MD5.cs
@@ -32,96 +32,95 @@ using Aaru.CommonTypes.Interfaces;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class Md5
 {
-    [TestFixture]
-    public class Md5
+    static readonly byte[] _expectedEmpty =
     {
-        static readonly byte[] _expectedEmpty =
-        {
-            0xb6, 0xd8, 0x1b, 0x36, 0x0a, 0x56, 0x72, 0xd8, 0x0c, 0x27, 0x43, 0x0f, 0x39, 0x15, 0x3e, 0x2c
-        };
-        static readonly byte[] _expectedRandom =
-        {
-            0xd7, 0x8f, 0x0e, 0xec, 0x41, 0x7b, 0xe3, 0x86, 0x21, 0x9b, 0x21, 0xb7, 0x00, 0x04, 0x4b, 0x95
-        };
+        0xb6, 0xd8, 0x1b, 0x36, 0x0a, 0x56, 0x72, 0xd8, 0x0c, 0x27, 0x43, 0x0f, 0x39, 0x15, 0x3e, 0x2c
+    };
+    static readonly byte[] _expectedRandom =
+    {
+        0xd7, 0x8f, 0x0e, 0xec, 0x41, 0x7b, 0xe3, 0x86, 0x21, 0x9b, 0x21, 0xb7, 0x00, 0x04, 0x4b, 0x95
+    };
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Md5Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Md5Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyFile()
-        {
-            byte[] result = Md5Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+    [Test]
+    public void EmptyFile()
+    {
+        byte[] result = Md5Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Md5Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Md5Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Md5Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Md5Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomFile()
-        {
-            byte[] result = Md5Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+    [Test]
+    public void RandomFile()
+    {
+        byte[] result = Md5Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Md5Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Md5Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/SHA1.cs b/Aaru.Tests/Checksums/SHA1.cs
index 478079f2b..97447611b 100644
--- a/Aaru.Tests/Checksums/SHA1.cs
+++ b/Aaru.Tests/Checksums/SHA1.cs
@@ -32,98 +32,97 @@ using Aaru.CommonTypes.Interfaces;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class Sha1
 {
-    [TestFixture]
-    public class Sha1
+    static readonly byte[] _expectedEmpty =
     {
-        static readonly byte[] _expectedEmpty =
-        {
-            0x3b, 0x71, 0xf4, 0x3f, 0xf3, 0x0f, 0x4b, 0x15, 0xb5, 0xcd, 0x85, 0xdd, 0x9e, 0x95, 0xeb, 0xc7, 0xe8, 0x4e,
-            0xb5, 0xa3
-        };
-        static readonly byte[] _expectedRandom =
-        {
-            0x72, 0x0d, 0x3b, 0x71, 0x7d, 0xe0, 0xc7, 0x4c, 0x77, 0xdd, 0x9c, 0xaa, 0x9e, 0xba, 0x50, 0x60, 0xdc, 0xbd,
-            0x28, 0x8d
-        };
+        0x3b, 0x71, 0xf4, 0x3f, 0xf3, 0x0f, 0x4b, 0x15, 0xb5, 0xcd, 0x85, 0xdd, 0x9e, 0x95, 0xeb, 0xc7, 0xe8, 0x4e,
+        0xb5, 0xa3
+    };
+    static readonly byte[] _expectedRandom =
+    {
+        0x72, 0x0d, 0x3b, 0x71, 0x7d, 0xe0, 0xc7, 0x4c, 0x77, 0xdd, 0x9c, 0xaa, 0x9e, 0xba, 0x50, 0x60, 0xdc, 0xbd,
+        0x28, 0x8d
+    };
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha1Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Sha1Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyFile()
-        {
-            byte[] result = Sha1Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+    [Test]
+    public void EmptyFile()
+    {
+        byte[] result = Sha1Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Sha1Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Sha1Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha1Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Sha1Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomFile()
-        {
-            byte[] result = Sha1Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+    [Test]
+    public void RandomFile()
+    {
+        byte[] result = Sha1Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Sha1Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Sha1Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/SHA256.cs b/Aaru.Tests/Checksums/SHA256.cs
index 37f476d6d..1bd5424f3 100644
--- a/Aaru.Tests/Checksums/SHA256.cs
+++ b/Aaru.Tests/Checksums/SHA256.cs
@@ -32,98 +32,97 @@ using Aaru.CommonTypes.Interfaces;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class Sha256
 {
-    [TestFixture]
-    public class Sha256
+    static readonly byte[] _expectedEmpty =
     {
-        static readonly byte[] _expectedEmpty =
-        {
-            0x30, 0xe1, 0x49, 0x55, 0xeb, 0xf1, 0x35, 0x22, 0x66, 0xdc, 0x2f, 0xf8, 0x06, 0x7e, 0x68, 0x10, 0x46, 0x07,
-            0xe7, 0x50, 0xab, 0xb9, 0xd3, 0xb3, 0x65, 0x82, 0xb8, 0xaf, 0x90, 0x9f, 0xcb, 0x58
-        };
-        static readonly byte[] _expectedRandom =
-        {
-            0x4d, 0x1a, 0x6b, 0x8a, 0x54, 0x67, 0x00, 0xc4, 0x8e, 0xda, 0x70, 0xd3, 0x39, 0x1c, 0x8f, 0x15, 0x8a, 0x8d,
-            0x12, 0xb2, 0x38, 0x92, 0x89, 0x29, 0x50, 0x47, 0x8c, 0x41, 0x8e, 0x25, 0xcc, 0x39
-        };
+        0x30, 0xe1, 0x49, 0x55, 0xeb, 0xf1, 0x35, 0x22, 0x66, 0xdc, 0x2f, 0xf8, 0x06, 0x7e, 0x68, 0x10, 0x46, 0x07,
+        0xe7, 0x50, 0xab, 0xb9, 0xd3, 0xb3, 0x65, 0x82, 0xb8, 0xaf, 0x90, 0x9f, 0xcb, 0x58
+    };
+    static readonly byte[] _expectedRandom =
+    {
+        0x4d, 0x1a, 0x6b, 0x8a, 0x54, 0x67, 0x00, 0xc4, 0x8e, 0xda, 0x70, 0xd3, 0x39, 0x1c, 0x8f, 0x15, 0x8a, 0x8d,
+        0x12, 0xb2, 0x38, 0x92, 0x89, 0x29, 0x50, 0x47, 0x8c, 0x41, 0x8e, 0x25, 0xcc, 0x39
+    };
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha256Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Sha256Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyFile()
-        {
-            byte[] result = Sha256Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+    [Test]
+    public void EmptyFile()
+    {
+        byte[] result = Sha256Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Sha256Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Sha256Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha256Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Sha256Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomFile()
-        {
-            byte[] result = Sha256Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+    [Test]
+    public void RandomFile()
+    {
+        byte[] result = Sha256Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Sha256Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Sha256Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/SHA384.cs b/Aaru.Tests/Checksums/SHA384.cs
index 9f82462cc..d5d449700 100644
--- a/Aaru.Tests/Checksums/SHA384.cs
+++ b/Aaru.Tests/Checksums/SHA384.cs
@@ -32,100 +32,99 @@ using Aaru.CommonTypes.Interfaces;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class Sha384
 {
-    [TestFixture]
-    public class Sha384
+    static readonly byte[] _expectedEmpty =
     {
-        static readonly byte[] _expectedEmpty =
-        {
-            0x31, 0x64, 0x67, 0x3a, 0x8a, 0xc2, 0x75, 0x76, 0xab, 0x5f, 0xc0, 0x6b, 0x9a, 0xdc, 0x4c, 0xe0, 0xac, 0xa5,
-            0xbd, 0x30, 0x25, 0x38, 0x4b, 0x1c, 0xf2, 0x12, 0x8a, 0x87, 0x95, 0xe7, 0x47, 0xc4, 0x31, 0xe8, 0x82, 0x78,
-            0x5a, 0x0b, 0xf8, 0xdc, 0x70, 0xb4, 0x29, 0x95, 0xdb, 0x38, 0x85, 0x75
-        };
-        static readonly byte[] _expectedRandom =
-        {
-            0xdb, 0x53, 0x0e, 0x17, 0x9b, 0x81, 0xfe, 0x5f, 0x6d, 0x20, 0x41, 0x04, 0x6e, 0x77, 0xd9, 0x85, 0xf2, 0x85,
-            0x8a, 0x66, 0xca, 0xd3, 0x8d, 0x1a, 0xd5, 0xac, 0x67, 0xa9, 0x74, 0xe1, 0xef, 0x3f, 0x4d, 0xdf, 0x94, 0x15,
-            0x2e, 0xac, 0x2e, 0xfe, 0x16, 0x95, 0x81, 0x54, 0xdc, 0x59, 0xd4, 0xc3
-        };
+        0x31, 0x64, 0x67, 0x3a, 0x8a, 0xc2, 0x75, 0x76, 0xab, 0x5f, 0xc0, 0x6b, 0x9a, 0xdc, 0x4c, 0xe0, 0xac, 0xa5,
+        0xbd, 0x30, 0x25, 0x38, 0x4b, 0x1c, 0xf2, 0x12, 0x8a, 0x87, 0x95, 0xe7, 0x47, 0xc4, 0x31, 0xe8, 0x82, 0x78,
+        0x5a, 0x0b, 0xf8, 0xdc, 0x70, 0xb4, 0x29, 0x95, 0xdb, 0x38, 0x85, 0x75
+    };
+    static readonly byte[] _expectedRandom =
+    {
+        0xdb, 0x53, 0x0e, 0x17, 0x9b, 0x81, 0xfe, 0x5f, 0x6d, 0x20, 0x41, 0x04, 0x6e, 0x77, 0xd9, 0x85, 0xf2, 0x85,
+        0x8a, 0x66, 0xca, 0xd3, 0x8d, 0x1a, 0xd5, 0xac, 0x67, 0xa9, 0x74, 0xe1, 0xef, 0x3f, 0x4d, 0xdf, 0x94, 0x15,
+        0x2e, 0xac, 0x2e, 0xfe, 0x16, 0x95, 0x81, 0x54, 0xdc, 0x59, 0xd4, 0xc3
+    };
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha384Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Sha384Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyFile()
-        {
-            byte[] result = Sha384Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+    [Test]
+    public void EmptyFile()
+    {
+        byte[] result = Sha384Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Sha384Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Sha384Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha384Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Sha384Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomFile()
-        {
-            byte[] result = Sha384Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+    [Test]
+    public void RandomFile()
+    {
+        byte[] result = Sha384Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+        result.Should().BeEquivalentTo(_expectedRandom);
+    }
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Sha384Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedRandom);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Sha384Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedRandom);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/SHA512.cs b/Aaru.Tests/Checksums/SHA512.cs
index 03a07ed57..e24545446 100644
--- a/Aaru.Tests/Checksums/SHA512.cs
+++ b/Aaru.Tests/Checksums/SHA512.cs
@@ -32,102 +32,101 @@ using Aaru.CommonTypes.Interfaces;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class Sha512
 {
-    [TestFixture]
-    public class Sha512
+    static readonly byte[] _expectedEmpty =
     {
-        static readonly byte[] _expectedEmpty =
-        {
-            0xd6, 0x29, 0x26, 0x85, 0xb3, 0x80, 0xe3, 0x38, 0xe0, 0x25, 0xb3, 0x41, 0x5a, 0x90, 0xfe, 0x8f, 0x9d, 0x39,
-            0xa4, 0x6e, 0x7b, 0xdb, 0xa8, 0xcb, 0x78, 0xc5, 0x0a, 0x33, 0x8c, 0xef, 0xca, 0x74, 0x1f, 0x69, 0xe4, 0xe4,
-            0x64, 0x11, 0xc3, 0x2d, 0xe1, 0xaf, 0xde, 0xdf, 0xb2, 0x68, 0xe5, 0x79, 0xa5, 0x1f, 0x81, 0xff, 0x85, 0xe5,
-            0x6f, 0x55, 0xb0, 0xee, 0x7c, 0x33, 0xfe, 0x8c, 0x25, 0xc9
-        };
-        static readonly byte[] _expectedRandom =
-        {
-            0x6a, 0x0a, 0x18, 0xc2, 0xad, 0xf8, 0x83, 0xac, 0x58, 0xe6, 0x21, 0x96, 0xdb, 0x8d, 0x3d, 0x0e, 0xb9, 0x87,
-            0xd1, 0x49, 0x24, 0x97, 0xdb, 0x15, 0xb9, 0xfc, 0xcc, 0xb0, 0x36, 0xdf, 0x64, 0xae, 0xdb, 0x3e, 0x82, 0xa0,
-            0x4d, 0xdc, 0xd1, 0x37, 0x48, 0x92, 0x95, 0x51, 0xf9, 0xdd, 0xab, 0x82, 0xf4, 0x8a, 0x85, 0x3f, 0x9a, 0x01,
-            0xb5, 0xf2, 0x8c, 0xbb, 0x4a, 0xa5, 0x1b, 0x40, 0x7c, 0xb6
-        };
+        0xd6, 0x29, 0x26, 0x85, 0xb3, 0x80, 0xe3, 0x38, 0xe0, 0x25, 0xb3, 0x41, 0x5a, 0x90, 0xfe, 0x8f, 0x9d, 0x39,
+        0xa4, 0x6e, 0x7b, 0xdb, 0xa8, 0xcb, 0x78, 0xc5, 0x0a, 0x33, 0x8c, 0xef, 0xca, 0x74, 0x1f, 0x69, 0xe4, 0xe4,
+        0x64, 0x11, 0xc3, 0x2d, 0xe1, 0xaf, 0xde, 0xdf, 0xb2, 0x68, 0xe5, 0x79, 0xa5, 0x1f, 0x81, 0xff, 0x85, 0xe5,
+        0x6f, 0x55, 0xb0, 0xee, 0x7c, 0x33, 0xfe, 0x8c, 0x25, 0xc9
+    };
+    static readonly byte[] _expectedRandom =
+    {
+        0x6a, 0x0a, 0x18, 0xc2, 0xad, 0xf8, 0x83, 0xac, 0x58, 0xe6, 0x21, 0x96, 0xdb, 0x8d, 0x3d, 0x0e, 0xb9, 0x87,
+        0xd1, 0x49, 0x24, 0x97, 0xdb, 0x15, 0xb9, 0xfc, 0xcc, 0xb0, 0x36, 0xdf, 0x64, 0xae, 0xdb, 0x3e, 0x82, 0xa0,
+        0x4d, 0xdc, 0xd1, 0x37, 0x48, 0x92, 0x95, 0x51, 0xf9, 0xdd, 0xab, 0x82, 0xf4, 0x8a, 0x85, 0x3f, 0x9a, 0x01,
+        0xb5, 0xf2, 0x8c, 0xbb, 0x4a, 0xa5, 0x1b, 0x40, 0x7c, 0xb6
+    };
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha512Context.Data(data, out byte[] result);
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Sha512Context.Data(data, out byte[] result);
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyFile()
-        {
-            byte[] result = Sha512Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+    [Test]
+    public void EmptyFile()
+    {
+        byte[] result = Sha512Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"));
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Sha512Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            result.Should().BeEquivalentTo(_expectedEmpty);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Sha512Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        result.Should().BeEquivalentTo(_expectedEmpty);
+    }
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            Sha512Context.Data(data, out byte[] result);
-            Assert.AreEqual(_expectedRandom, result);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        Sha512Context.Data(data, out byte[] result);
+        Assert.AreEqual(_expectedRandom, result);
+    }
 
-        [Test]
-        public void RandomFile()
-        {
-            byte[] result = Sha512Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
-            Assert.AreEqual(_expectedRandom, result);
-        }
+    [Test]
+    public void RandomFile()
+    {
+        byte[] result = Sha512Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"));
+        Assert.AreEqual(_expectedRandom, result);
+    }
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new Sha512Context();
-            ctx.Update(data);
-            byte[] result = ctx.Final();
-            Assert.AreEqual(_expectedRandom, result);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new Sha512Context();
+        ctx.Update(data);
+        byte[] result = ctx.Final();
+        Assert.AreEqual(_expectedRandom, result);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Checksums/SpamSum.cs b/Aaru.Tests/Checksums/SpamSum.cs
index 5b38e50db..42506cb6b 100644
--- a/Aaru.Tests/Checksums/SpamSum.cs
+++ b/Aaru.Tests/Checksums/SpamSum.cs
@@ -31,76 +31,75 @@ using Aaru.Checksums;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Checksums
+namespace Aaru.Tests.Checksums;
+
+[TestFixture]
+public class SpamSum
 {
-    [TestFixture]
-    public class SpamSum
+    const string EXPECTED_EMPTY  = "3::";
+    const string EXPECTED_RANDOM = "24576:3dvzuAsHTQ16pc7O1Q/gS9qze+Swwn9s6IX:8/TQQpaVqze+JN6IX";
+
+    [Test]
+    public void EmptyData()
     {
-        const string EXPECTED_EMPTY  = "3::";
-        const string EXPECTED_RANDOM = "24576:3dvzuAsHTQ16pc7O1Q/gS9qze+Swwn9s6IX:8/TQQpaVqze+JN6IX";
+        byte[] data = new byte[1048576];
 
-        [Test]
-        public void EmptyData()
-        {
-            byte[] data = new byte[1048576];
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        string result = SpamSumContext.Data(data, out _);
+        Assert.AreEqual(EXPECTED_EMPTY, result);
+    }
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            string result = SpamSumContext.Data(data, out _);
-            Assert.AreEqual(EXPECTED_EMPTY, result);
-        }
+    [Test]
+    public void EmptyInstance()
+    {
+        byte[] data = new byte[1048576];
 
-        [Test]
-        public void EmptyInstance()
-        {
-            byte[] data = new byte[1048576];
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
+                                FileAccess.Read);
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "empty"), FileMode.Open,
-                                    FileAccess.Read);
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new SpamSumContext();
+        ctx.Update(data);
+        string result = ctx.End();
+        Assert.AreEqual(EXPECTED_EMPTY, result);
+    }
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new SpamSumContext();
-            ctx.Update(data);
-            string result = ctx.End();
-            Assert.AreEqual(EXPECTED_EMPTY, result);
-        }
+    [Test]
+    public void RandomData()
+    {
+        byte[] data = new byte[1048576];
 
-        [Test]
-        public void RandomData()
-        {
-            byte[] data = new byte[1048576];
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        string result = SpamSumContext.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RANDOM, result);
+    }
 
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            string result = SpamSumContext.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RANDOM, result);
-        }
+    [Test]
+    public void RandomInstance()
+    {
+        byte[] data = new byte[1048576];
 
-        [Test]
-        public void RandomInstance()
-        {
-            byte[] data = new byte[1048576];
+        var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
+                                FileMode.Open, FileAccess.Read);
 
-            var fs = new FileStream(Path.Combine(Consts.TEST_FILES_ROOT, "Checksum test files", "random"),
-                                    FileMode.Open, FileAccess.Read);
-
-            fs.Read(data, 0, 1048576);
-            fs.Close();
-            fs.Dispose();
-            IChecksum ctx = new SpamSumContext();
-            ctx.Update(data);
-            string result = ctx.End();
-            Assert.AreEqual(EXPECTED_RANDOM, result);
-        }
+        fs.Read(data, 0, 1048576);
+        fs.Close();
+        fs.Dispose();
+        IChecksum ctx = new SpamSumContext();
+        ctx.Update(data);
+        string result = ctx.End();
+        Assert.AreEqual(EXPECTED_RANDOM, result);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Consts.cs b/Aaru.Tests/Consts.cs
index 05bfe6d02..ca3f109fb 100644
--- a/Aaru.Tests/Consts.cs
+++ b/Aaru.Tests/Consts.cs
@@ -26,10 +26,9 @@
 // Copyright © 2011-2022 Natalia Portillo
 // ****************************************************************************/
 
-namespace Aaru.Tests
+namespace Aaru.Tests;
+
+internal static class Consts
 {
-    internal static class Consts
-    {
-        public const string TEST_FILES_ROOT = "/mnt/DiscImageChef";
-    }
+    public const string TEST_FILES_ROOT = "/mnt/DiscImageChef";
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Devices/IomegaJaz.cs b/Aaru.Tests/Devices/IomegaJaz.cs
index 2c3032668..35220cfc6 100644
--- a/Aaru.Tests/Devices/IomegaJaz.cs
+++ b/Aaru.Tests/Devices/IomegaJaz.cs
@@ -35,64 +35,63 @@ using Aaru.Filters;
 using FluentAssertions.Execution;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+[TestFixture]
+public class IomegaJaz
 {
-    [TestFixture]
-    public class IomegaJaz
+    readonly string[] _testFiles =
     {
-        readonly string[] _testFiles =
+        "jaz1.bin.lz"
+    };
+
+    readonly MediaType[] _mediaTypes =
+    {
+        MediaType.Jaz
+    };
+
+    readonly ulong[] _sectors =
+    {
+        2091050
+    };
+
+    readonly uint[] _sectorSize =
+    {
+        512
+    };
+
+    readonly string _dataFolder = Path.Combine(Consts.TEST_FILES_ROOT, "Device test dumps", "JAZ");
+
+    [Test]
+    public void Info()
+    {
+        Environment.CurrentDirectory = _dataFolder;
+
+        Assert.Multiple(() =>
         {
-            "jaz1.bin.lz"
-        };
-
-        readonly MediaType[] _mediaTypes =
-        {
-            MediaType.Jaz
-        };
-
-        readonly ulong[] _sectors =
-        {
-            2091050
-        };
-
-        readonly uint[] _sectorSize =
-        {
-            512
-        };
-
-        readonly string _dataFolder = Path.Combine(Consts.TEST_FILES_ROOT, "Device test dumps", "JAZ");
-
-        [Test]
-        public void Info()
-        {
-            Environment.CurrentDirectory = _dataFolder;
-
-            Assert.Multiple(() =>
+            for(int i = 0; i < _testFiles.Length; i++)
             {
-                for(int i = 0; i < _testFiles.Length; i++)
+                var filter = new LZip();
+                filter.Open(_testFiles[i]);
+
+                var         image  = new ZZZRawImage();
+                ErrorNumber opened = image.Open(filter);
+
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {_testFiles[i]}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                using(new AssertionScope())
                 {
-                    var filter = new LZip();
-                    filter.Open(_testFiles[i]);
-
-                    var         image  = new ZZZRawImage();
-                    ErrorNumber opened = image.Open(filter);
-
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {_testFiles[i]}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    using(new AssertionScope())
+                    Assert.Multiple(() =>
                     {
-                        Assert.Multiple(() =>
-                        {
-                            Assert.AreEqual(_sectors[i], image.Info.Sectors, $"Sectors: {_testFiles[i]}");
-                            Assert.AreEqual(_sectorSize[i], image.Info.SectorSize, $"Sector size: {_testFiles[i]}");
-                            Assert.AreEqual(_mediaTypes[i], image.Info.MediaType, $"Media type: {_testFiles[i]}");
-                        });
-                    }
+                        Assert.AreEqual(_sectors[i], image.Info.Sectors, $"Sectors: {_testFiles[i]}");
+                        Assert.AreEqual(_sectorSize[i], image.Info.SectorSize, $"Sector size: {_testFiles[i]}");
+                        Assert.AreEqual(_mediaTypes[i], image.Info.MediaType, $"Media type: {_testFiles[i]}");
+                    });
                 }
-            });
-        }
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Devices/LS120.cs b/Aaru.Tests/Devices/LS120.cs
index 8a0a4f008..8c104afc5 100644
--- a/Aaru.Tests/Devices/LS120.cs
+++ b/Aaru.Tests/Devices/LS120.cs
@@ -35,64 +35,63 @@ using Aaru.Filters;
 using FluentAssertions.Execution;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+[TestFixture]
+public class Ls120
 {
-    [TestFixture]
-    public class Ls120
+    readonly string[] _testFiles =
     {
-        readonly string[] _testFiles =
+        "ls120.bin.lz", "mf2dd.bin.lz", "mf2hd.bin.lz"
+    };
+
+    readonly MediaType[] _mediaTypes =
+    {
+        MediaType.LS120, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD
+    };
+
+    readonly ulong[] _sectors =
+    {
+        246528, 1440, 2880
+    };
+
+    readonly uint[] _sectorSize =
+    {
+        512, 512, 512
+    };
+
+    readonly string _dataFolder = Path.Combine(Consts.TEST_FILES_ROOT, "Device test dumps", "LS-120");
+
+    [Test]
+    public void Info()
+    {
+        Environment.CurrentDirectory = _dataFolder;
+
+        Assert.Multiple(() =>
         {
-            "ls120.bin.lz", "mf2dd.bin.lz", "mf2hd.bin.lz"
-        };
-
-        readonly MediaType[] _mediaTypes =
-        {
-            MediaType.LS120, MediaType.DOS_35_DS_DD_9, MediaType.DOS_35_HD
-        };
-
-        readonly ulong[] _sectors =
-        {
-            246528, 1440, 2880
-        };
-
-        readonly uint[] _sectorSize =
-        {
-            512, 512, 512
-        };
-
-        readonly string _dataFolder = Path.Combine(Consts.TEST_FILES_ROOT, "Device test dumps", "LS-120");
-
-        [Test]
-        public void Info()
-        {
-            Environment.CurrentDirectory = _dataFolder;
-
-            Assert.Multiple(() =>
+            for(int i = 0; i < _testFiles.Length; i++)
             {
-                for(int i = 0; i < _testFiles.Length; i++)
+                var filter = new LZip();
+                filter.Open(_testFiles[i]);
+
+                var         image  = new ZZZRawImage();
+                ErrorNumber opened = image.Open(filter);
+
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {_testFiles[i]}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                using(new AssertionScope())
                 {
-                    var filter = new LZip();
-                    filter.Open(_testFiles[i]);
-
-                    var         image  = new ZZZRawImage();
-                    ErrorNumber opened = image.Open(filter);
-
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {_testFiles[i]}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    using(new AssertionScope())
+                    Assert.Multiple(() =>
                     {
-                        Assert.Multiple(() =>
-                        {
-                            Assert.AreEqual(_sectors[i], image.Info.Sectors, $"Sectors: {_testFiles[i]}");
-                            Assert.AreEqual(_sectorSize[i], image.Info.SectorSize, $"Sector size: {_testFiles[i]}");
-                            Assert.AreEqual(_mediaTypes[i], image.Info.MediaType, $"Media type: {_testFiles[i]}");
-                        });
-                    }
+                        Assert.AreEqual(_sectors[i], image.Info.Sectors, $"Sectors: {_testFiles[i]}");
+                        Assert.AreEqual(_sectorSize[i], image.Info.SectorSize, $"Sector size: {_testFiles[i]}");
+                        Assert.AreEqual(_mediaTypes[i], image.Info.MediaType, $"Media type: {_testFiles[i]}");
+                    });
                 }
-            });
-        }
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Devices/MultiMediaCard/CID.cs b/Aaru.Tests/Devices/MultiMediaCard/CID.cs
index bbe60e499..40e9b5d54 100644
--- a/Aaru.Tests/Devices/MultiMediaCard/CID.cs
+++ b/Aaru.Tests/Devices/MultiMediaCard/CID.cs
@@ -4,78 +4,77 @@ using NUnit.Framework;
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Tests.Devices.MultiMediaCard
+namespace Aaru.Tests.Devices.MultiMediaCard;
+
+[TestFixture]
+public class CID
 {
-    [TestFixture]
-    public class CID
+    readonly string[] cards =
     {
-        readonly string[] cards =
-        {
-            "mmc_6600_32mb", "mmc_pretec_32mb", "mmc_takems_256mb"
-        };
+        "mmc_6600_32mb", "mmc_pretec_32mb", "mmc_takems_256mb"
+    };
 
-        readonly string[] cids =
-        {
-            "15000030303030303007b20212909701", "06000033324d202020011923a457c601", "2c0000414620484d5010a9000b1a6801"
-        };
+    readonly string[] cids =
+    {
+        "15000030303030303007b20212909701", "06000033324d202020011923a457c601", "2c0000414620484d5010a9000b1a6801"
+    };
 
-        readonly byte[] manufacturers =
-        {
-            0x15, 0x06, 0x2c
-        };
+    readonly byte[] manufacturers =
+    {
+        0x15, 0x06, 0x2c
+    };
 
-        readonly ushort[] applications =
-        {
-            0, 0, 0
-        };
+    readonly ushort[] applications =
+    {
+        0, 0, 0
+    };
 
-        readonly string[] names =
-        {
-            "000000", "32M   ", "AF HMP"
-        };
+    readonly string[] names =
+    {
+        "000000", "32M   ", "AF HMP"
+    };
 
-        readonly byte[] revisions =
-        {
-            0x07, 0x01, 0x10
-        };
+    readonly byte[] revisions =
+    {
+        0x07, 0x01, 0x10
+    };
 
-        readonly uint[] serials =
-        {
-            0xb2021290, 0x1923a457, 0xa9000b1a
-        };
+    readonly uint[] serials =
+    {
+        0xb2021290, 0x1923a457, 0xa9000b1a
+    };
 
-        readonly byte[] dates =
-        {
-            0x97, 0xc6, 0x68
-        };
+    readonly byte[] dates =
+    {
+        0x97, 0xc6, 0x68
+    };
 
-        readonly byte[] crcs =
-        {
-            0x00, 0x00, 0x00
-        };
+    readonly byte[] crcs =
+    {
+        0x00, 0x00, 0x00
+    };
 
-        [Test]
-        public void Test()
+    [Test]
+    public void Test()
+    {
+        for(int i = 0; i < cards.Length; i++)
         {
-            for(int i = 0; i < cards.Length; i++)
+            using(new AssertionScope())
             {
-                using(new AssertionScope())
+                Assert.Multiple(() =>
                 {
-                    Assert.Multiple(() =>
-                    {
-                        int count = Marshal.ConvertFromHexAscii(cids[i], out byte[] response);
-                        Assert.AreEqual(16, count, $"Size - {cards[i]}");
-                        Decoders.MMC.CID cid = Decoders.MMC.Decoders.DecodeCID(response);
-                        Assert.IsNotNull(cid, $"Decoded - {cards[i]}");
-                        Assert.AreEqual(manufacturers[i], cid.Manufacturer, $"Manufacturer - {cards[i]}");
-                        Assert.AreEqual(applications[i], cid.ApplicationID, $"Application ID - {cards[i]}");
-                        Assert.AreEqual(names[i], cid.ProductName, $"Product name - {cards[i]}");
-                        Assert.AreEqual(revisions[i], cid.ProductRevision, $"Product revision - {cards[i]}");
-                        Assert.AreEqual(serials[i], cid.ProductSerialNumber, $"Serial number - {cards[i]}");
-                        Assert.AreEqual(dates[i], cid.ManufacturingDate, $"Manufacturing date - {cards[i]}");
-                        Assert.AreEqual(crcs[i], cid.CRC, $"CRC - {cards[i]}");
-                    });
-                }
+                    int count = Marshal.ConvertFromHexAscii(cids[i], out byte[] response);
+                    Assert.AreEqual(16, count, $"Size - {cards[i]}");
+                    Decoders.MMC.CID cid = Decoders.MMC.Decoders.DecodeCID(response);
+                    Assert.IsNotNull(cid, $"Decoded - {cards[i]}");
+                    Assert.AreEqual(manufacturers[i], cid.Manufacturer, $"Manufacturer - {cards[i]}");
+                    Assert.AreEqual(applications[i], cid.ApplicationID, $"Application ID - {cards[i]}");
+                    Assert.AreEqual(names[i], cid.ProductName, $"Product name - {cards[i]}");
+                    Assert.AreEqual(revisions[i], cid.ProductRevision, $"Product revision - {cards[i]}");
+                    Assert.AreEqual(serials[i], cid.ProductSerialNumber, $"Serial number - {cards[i]}");
+                    Assert.AreEqual(dates[i], cid.ManufacturingDate, $"Manufacturing date - {cards[i]}");
+                    Assert.AreEqual(crcs[i], cid.CRC, $"CRC - {cards[i]}");
+                });
             }
         }
     }
diff --git a/Aaru.Tests/Devices/MultiMediaCard/CSD.cs b/Aaru.Tests/Devices/MultiMediaCard/CSD.cs
index f85f8a47f..dc84d8f1a 100644
--- a/Aaru.Tests/Devices/MultiMediaCard/CSD.cs
+++ b/Aaru.Tests/Devices/MultiMediaCard/CSD.cs
@@ -4,255 +4,254 @@ using NUnit.Framework;
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Tests.Devices.MultiMediaCard
+namespace Aaru.Tests.Devices.MultiMediaCard;
+
+[TestFixture]
+public class CSD
 {
-    [TestFixture]
-    public class CSD
+    readonly string[] cards =
     {
-        readonly string[] cards =
-        {
-            "mmc_6600_32mb", "mmc_pretec_32mb", "mmc_takems_256mb"
-        };
+        "mmc_6600_32mb", "mmc_pretec_32mb", "mmc_takems_256mb"
+    };
 
-        readonly string[] csds =
-        {
-            "8c26012a0f5901e9f6d983e392404001", "8c0e012a0ff981e9f6d981e18a400001", "905e002a1f5983d3edb683ff96400001"
-        };
+    readonly string[] csds =
+    {
+        "8c26012a0f5901e9f6d983e392404001", "8c0e012a0ff981e9f6d981e18a400001", "905e002a1f5983d3edb683ff96400001"
+    };
 
-        readonly byte[] structure_versions =
-        {
-            2, 2, 2
-        };
+    readonly byte[] structure_versions =
+    {
+        2, 2, 2
+    };
 
-        readonly byte[] spec_versions =
-        {
-            3, 3, 4
-        };
+    readonly byte[] spec_versions =
+    {
+        3, 3, 4
+    };
 
-        readonly byte[] taacs =
-        {
-            38, 14, 94
-        };
+    readonly byte[] taacs =
+    {
+        38, 14, 94
+    };
 
-        readonly byte[] nsacs =
-        {
-            1, 1, 0
-        };
+    readonly byte[] nsacs =
+    {
+        1, 1, 0
+    };
 
-        readonly byte[] speeds =
-        {
-            42, 42, 42
-        };
+    readonly byte[] speeds =
+    {
+        42, 42, 42
+    };
 
-        readonly ushort[] classes =
-        {
-            245, 255, 501
-        };
+    readonly ushort[] classes =
+    {
+        245, 255, 501
+    };
 
-        readonly byte[] read_block_lengths =
-        {
-            9, 9, 9
-        };
+    readonly byte[] read_block_lengths =
+    {
+        9, 9, 9
+    };
 
-        readonly bool[] read_partial_blocks =
-        {
-            false, true, true
-        };
+    readonly bool[] read_partial_blocks =
+    {
+        false, true, true
+    };
 
-        readonly bool[] write_misaligned_block =
-        {
-            false, false, false
-        };
+    readonly bool[] write_misaligned_block =
+    {
+        false, false, false
+    };
 
-        readonly bool[] read_misaligned_block =
-        {
-            false, false, false
-        };
+    readonly bool[] read_misaligned_block =
+    {
+        false, false, false
+    };
 
-        readonly bool[] dsr_implemented =
-        {
-            false, false, false
-        };
+    readonly bool[] dsr_implemented =
+    {
+        false, false, false
+    };
 
-        readonly uint[] card_sizes =
-        {
-            1959, 1959, 3919
-        };
+    readonly uint[] card_sizes =
+    {
+        1959, 1959, 3919
+    };
 
-        readonly byte[] min_read_current =
-        {
-            6, 6, 5
-        };
+    readonly byte[] min_read_current =
+    {
+        6, 6, 5
+    };
 
-        readonly byte[] max_read_current =
-        {
-            6, 6, 5
-        };
+    readonly byte[] max_read_current =
+    {
+        6, 6, 5
+    };
 
-        readonly byte[] min_write_current =
-        {
-            6, 6, 5
-        };
+    readonly byte[] min_write_current =
+    {
+        6, 6, 5
+    };
 
-        readonly byte[] max_write_current =
-        {
-            6, 6, 5
-        };
+    readonly byte[] max_write_current =
+    {
+        6, 6, 5
+    };
 
-        readonly byte[] size_multiplier =
-        {
-            3, 3, 5
-        };
+    readonly byte[] size_multiplier =
+    {
+        3, 3, 5
+    };
 
-        readonly byte[] sector_sizes =
-        {
-            0, 0, 0
-        };
+    readonly byte[] sector_sizes =
+    {
+        0, 0, 0
+    };
 
-        readonly byte[] erase_sector_sizes =
-        {
-            31, 15, 31
-        };
+    readonly byte[] erase_sector_sizes =
+    {
+        31, 15, 31
+    };
 
-        readonly byte[] write_protect_group_size =
-        {
-            3, 1, 31
-        };
+    readonly byte[] write_protect_group_size =
+    {
+        3, 1, 31
+    };
 
-        readonly bool[] write_protect_group_enable =
-        {
-            true, true, true
-        };
+    readonly bool[] write_protect_group_enable =
+    {
+        true, true, true
+    };
 
-        readonly byte[] default_eccs =
-        {
-            0, 0, 0
-        };
+    readonly byte[] default_eccs =
+    {
+        0, 0, 0
+    };
 
-        readonly byte[] r2w_factors =
-        {
-            4, 2, 5
-        };
+    readonly byte[] r2w_factors =
+    {
+        4, 2, 5
+    };
 
-        readonly byte[] write_block_lengths =
-        {
-            9, 9, 9
-        };
+    readonly byte[] write_block_lengths =
+    {
+        9, 9, 9
+    };
 
-        readonly bool[] write_partial_blocks =
-        {
-            false, false, false
-        };
+    readonly bool[] write_partial_blocks =
+    {
+        false, false, false
+    };
 
-        readonly bool[] file_format_group =
-        {
-            false, false, false
-        };
+    readonly bool[] file_format_group =
+    {
+        false, false, false
+    };
 
-        readonly bool[] copy =
-        {
-            true, false, false
-        };
+    readonly bool[] copy =
+    {
+        true, false, false
+    };
 
-        readonly bool[] permanent_write_protect =
-        {
-            false, false, false
-        };
+    readonly bool[] permanent_write_protect =
+    {
+        false, false, false
+    };
 
-        readonly bool[] temporary_write_protect =
-        {
-            false, false, false
-        };
+    readonly bool[] temporary_write_protect =
+    {
+        false, false, false
+    };
 
-        readonly byte[] file_format =
-        {
-            0, 0, 0
-        };
+    readonly byte[] file_format =
+    {
+        0, 0, 0
+    };
 
-        readonly byte[] ecc =
-        {
-            0, 0, 0
-        };
+    readonly byte[] ecc =
+    {
+        0, 0, 0
+    };
 
-        [Test]
-        public void Test()
+    [Test]
+    public void Test()
+    {
+        for(int i = 0; i < cards.Length; i++)
         {
-            for(int i = 0; i < cards.Length; i++)
+            using(new AssertionScope())
             {
-                using(new AssertionScope())
+                Assert.Multiple(() =>
                 {
-                    Assert.Multiple(() =>
-                    {
-                        int count = Marshal.ConvertFromHexAscii(csds[i], out byte[] response);
-                        Assert.AreEqual(16, count, $"Size - {cards[i]}");
-                        Decoders.MMC.CSD csd = Decoders.MMC.Decoders.DecodeCSD(response);
-                        Assert.IsNotNull(csd, $"Decoded - {cards[i]}");
-                        Assert.AreEqual(structure_versions[i], csd.Structure, $"Structure version - {cards[i]}");
-                        Assert.AreEqual(spec_versions[i], csd.Version, $"Specification version - {cards[i]}");
-                        Assert.AreEqual(taacs[i], csd.TAAC, $"TAAC - {cards[i]}");
-                        Assert.AreEqual(nsacs[i], csd.NSAC, $"NSAC - {cards[i]}");
-                        Assert.AreEqual(speeds[i], csd.Speed, $"Transfer speed - {cards[i]}");
-                        Assert.AreEqual(classes[i], csd.Classes, $"Classes - {cards[i]}");
-                        Assert.AreEqual(read_block_lengths[i], csd.ReadBlockLength, $"Read block length - {cards[i]}");
+                    int count = Marshal.ConvertFromHexAscii(csds[i], out byte[] response);
+                    Assert.AreEqual(16, count, $"Size - {cards[i]}");
+                    Decoders.MMC.CSD csd = Decoders.MMC.Decoders.DecodeCSD(response);
+                    Assert.IsNotNull(csd, $"Decoded - {cards[i]}");
+                    Assert.AreEqual(structure_versions[i], csd.Structure, $"Structure version - {cards[i]}");
+                    Assert.AreEqual(spec_versions[i], csd.Version, $"Specification version - {cards[i]}");
+                    Assert.AreEqual(taacs[i], csd.TAAC, $"TAAC - {cards[i]}");
+                    Assert.AreEqual(nsacs[i], csd.NSAC, $"NSAC - {cards[i]}");
+                    Assert.AreEqual(speeds[i], csd.Speed, $"Transfer speed - {cards[i]}");
+                    Assert.AreEqual(classes[i], csd.Classes, $"Classes - {cards[i]}");
+                    Assert.AreEqual(read_block_lengths[i], csd.ReadBlockLength, $"Read block length - {cards[i]}");
 
-                        Assert.AreEqual(read_partial_blocks[i], csd.ReadsPartialBlocks,
-                                        $"Reads partial blocks - {cards[i]}");
+                    Assert.AreEqual(read_partial_blocks[i], csd.ReadsPartialBlocks,
+                                    $"Reads partial blocks - {cards[i]}");
 
-                        Assert.AreEqual(write_misaligned_block[i], csd.WriteMisalignment,
-                                        $"Writes misaligned blocks - {cards[i]}");
+                    Assert.AreEqual(write_misaligned_block[i], csd.WriteMisalignment,
+                                    $"Writes misaligned blocks - {cards[i]}");
 
-                        Assert.AreEqual(read_misaligned_block[i], csd.ReadMisalignment,
-                                        $"Reads misaligned blocks - {cards[i]}");
+                    Assert.AreEqual(read_misaligned_block[i], csd.ReadMisalignment,
+                                    $"Reads misaligned blocks - {cards[i]}");
 
-                        Assert.AreEqual(dsr_implemented[i], csd.DSRImplemented, $"DSR implemented - {cards[i]}");
-                        Assert.AreEqual(card_sizes[i], csd.Size, $"Card size - {cards[i]}");
+                    Assert.AreEqual(dsr_implemented[i], csd.DSRImplemented, $"DSR implemented - {cards[i]}");
+                    Assert.AreEqual(card_sizes[i], csd.Size, $"Card size - {cards[i]}");
 
-                        Assert.AreEqual(min_read_current[i], csd.ReadCurrentAtVddMin,
-                                        $"Reading current at minimum Vdd - {cards[i]}");
+                    Assert.AreEqual(min_read_current[i], csd.ReadCurrentAtVddMin,
+                                    $"Reading current at minimum Vdd - {cards[i]}");
 
-                        Assert.AreEqual(max_read_current[i], csd.ReadCurrentAtVddMax,
-                                        $"Reading current at maximum Vdd - {cards[i]}");
+                    Assert.AreEqual(max_read_current[i], csd.ReadCurrentAtVddMax,
+                                    $"Reading current at maximum Vdd - {cards[i]}");
 
-                        Assert.AreEqual(min_write_current[i], csd.WriteCurrentAtVddMin,
-                                        $"Writing current at minimum Vdd - {cards[i]}");
+                    Assert.AreEqual(min_write_current[i], csd.WriteCurrentAtVddMin,
+                                    $"Writing current at minimum Vdd - {cards[i]}");
 
-                        Assert.AreEqual(max_write_current[i], csd.WriteCurrentAtVddMax,
-                                        $"Writing current at maximum Vdd - {cards[i]}");
+                    Assert.AreEqual(max_write_current[i], csd.WriteCurrentAtVddMax,
+                                    $"Writing current at maximum Vdd - {cards[i]}");
 
-                        Assert.AreEqual(size_multiplier[i], csd.SizeMultiplier, $"Card size multiplier - {cards[i]}");
-                        Assert.AreEqual(sector_sizes[i], csd.EraseGroupSize, $"Erase sector size - {cards[i]}");
+                    Assert.AreEqual(size_multiplier[i], csd.SizeMultiplier, $"Card size multiplier - {cards[i]}");
+                    Assert.AreEqual(sector_sizes[i], csd.EraseGroupSize, $"Erase sector size - {cards[i]}");
 
-                        Assert.AreEqual(erase_sector_sizes[i], csd.EraseGroupSizeMultiplier,
-                                        $"Erase group size - {cards[i]}");
+                    Assert.AreEqual(erase_sector_sizes[i], csd.EraseGroupSizeMultiplier,
+                                    $"Erase group size - {cards[i]}");
 
-                        Assert.AreEqual(write_protect_group_size[i], csd.WriteProtectGroupSize,
-                                        $"Write protect group size - {cards[i]}");
+                    Assert.AreEqual(write_protect_group_size[i], csd.WriteProtectGroupSize,
+                                    $"Write protect group size - {cards[i]}");
 
-                        Assert.AreEqual(write_protect_group_enable[i], csd.WriteProtectGroupEnable,
-                                        $"Write protect group enable - {cards[i]}");
+                    Assert.AreEqual(write_protect_group_enable[i], csd.WriteProtectGroupEnable,
+                                    $"Write protect group enable - {cards[i]}");
 
-                        Assert.AreEqual(default_eccs[i], csd.DefaultECC, $"Default ECC - {cards[i]}");
-                        Assert.AreEqual(r2w_factors[i], csd.WriteSpeedFactor, $"Read to write factor - {cards[i]}");
+                    Assert.AreEqual(default_eccs[i], csd.DefaultECC, $"Default ECC - {cards[i]}");
+                    Assert.AreEqual(r2w_factors[i], csd.WriteSpeedFactor, $"Read to write factor - {cards[i]}");
 
-                        Assert.AreEqual(write_block_lengths[i], csd.WriteBlockLength,
-                                        $"write block length - {cards[i]}");
+                    Assert.AreEqual(write_block_lengths[i], csd.WriteBlockLength,
+                                    $"write block length - {cards[i]}");
 
-                        Assert.AreEqual(write_partial_blocks[i], csd.WritesPartialBlocks,
-                                        $"Writes partial blocks - {cards[i]}");
+                    Assert.AreEqual(write_partial_blocks[i], csd.WritesPartialBlocks,
+                                    $"Writes partial blocks - {cards[i]}");
 
-                        Assert.AreEqual(file_format_group[i], csd.FileFormatGroup, $"File format group - {cards[i]}");
-                        Assert.AreEqual(copy[i], csd.Copy, $"Copy - {cards[i]}");
+                    Assert.AreEqual(file_format_group[i], csd.FileFormatGroup, $"File format group - {cards[i]}");
+                    Assert.AreEqual(copy[i], csd.Copy, $"Copy - {cards[i]}");
 
-                        Assert.AreEqual(permanent_write_protect[i], csd.PermanentWriteProtect,
-                                        $"Permanent write protect - {cards[i]}");
+                    Assert.AreEqual(permanent_write_protect[i], csd.PermanentWriteProtect,
+                                    $"Permanent write protect - {cards[i]}");
 
-                        Assert.AreEqual(temporary_write_protect[i], csd.TemporaryWriteProtect,
-                                        $"Temporary write protect - {cards[i]}");
+                    Assert.AreEqual(temporary_write_protect[i], csd.TemporaryWriteProtect,
+                                    $"Temporary write protect - {cards[i]}");
 
-                        Assert.AreEqual(file_format[i], csd.FileFormat, $"File format - {cards[i]}");
-                        Assert.AreEqual(ecc[i], csd.ECC, $"ECC - {cards[i]}");
-                    });
-                }
+                    Assert.AreEqual(file_format[i], csd.FileFormat, $"File format - {cards[i]}");
+                    Assert.AreEqual(ecc[i], csd.ECC, $"ECC - {cards[i]}");
+                });
             }
         }
     }
diff --git a/Aaru.Tests/Devices/MultiMediaCard/ExtendedCSD.cs b/Aaru.Tests/Devices/MultiMediaCard/ExtendedCSD.cs
index d0adb782f..d6ef939a8 100644
--- a/Aaru.Tests/Devices/MultiMediaCard/ExtendedCSD.cs
+++ b/Aaru.Tests/Devices/MultiMediaCard/ExtendedCSD.cs
@@ -2,224 +2,223 @@ using Aaru.Decoders.MMC;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Devices.MultiMediaCard
+namespace Aaru.Tests.Devices.MultiMediaCard;
+
+[TestFixture]
+public class ExtendedCSD
 {
-    [TestFixture]
-    public class ExtendedCSD
+    readonly byte[][] ecsd =
     {
-        readonly byte[][] ecsd =
+        new byte[]
         {
-            new byte[]
-            {
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x34, 0x13, 0x00, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x15, 0x1F, 0x20, 0x00,
-                0x00, 0x00, 0x00, 0x11, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x57, 0x01, 0x05, 0x0A, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xC0, 0x33, 0x07, 0x10, 0x16, 0x00, 0x07, 0x07,
-                0x08, 0x01, 0x05, 0x01, 0x06, 0x20, 0x00, 0x07, 0x11, 0x1B, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x0A, 0x00, 0x00, 0x01, 0x00, 0x00, 0x1B,
-                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x1F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x03, 0x03, 0x07, 0x05, 0x00, 0x03, 0x01, 0x3F, 0x3F, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00
-            }
-        };
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+            0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x34, 0x13, 0x00, 0x07, 0x01, 0x01, 0x00, 0x00, 0x00, 0x15, 0x1F, 0x20, 0x00,
+            0x00, 0x00, 0x00, 0x11, 0x05, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x02, 0x00, 0x57, 0x01, 0x05, 0x0A, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0xC0, 0x33, 0x07, 0x10, 0x16, 0x00, 0x07, 0x07,
+            0x08, 0x01, 0x05, 0x01, 0x06, 0x20, 0x00, 0x07, 0x11, 0x1B, 0x55, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x1E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3C, 0x0A, 0x00, 0x00, 0x01, 0x00, 0x00, 0x1B,
+            0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x20, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x1F, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x03, 0x03, 0x07, 0x05, 0x00, 0x03, 0x01, 0x3F, 0x3F, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+            0x00, 0x00
+        }
+    };
 
-        readonly Decoders.MMC.ExtendedCSD[] decoded =
+    readonly Decoders.MMC.ExtendedCSD[] decoded =
+    {
+        new Decoders.MMC.ExtendedCSD
         {
-            new Decoders.MMC.ExtendedCSD
+            Reserved0                                 = new byte[15],
+            CommandQueueModeEnable                    = 0,
+            SecureRemovalType                         = 9,
+            ProductStateAwarenessEnablement           = 0,
+            MaxPreLoadingDataSize                     = 0,
+            FFUStatus                                 = 0,
+            Reserved1                                 = 0,
+            ModeOperationCodes                        = 0,
+            ModeConfig                                = 0,
+            BarrierControl                            = 0,
+            CacheFlushing                             = 0,
+            CacheControl                              = 1,
+            PowerOffNotification                      = 1,
+            PackedCommandFailureIndex                 = 0,
+            PackedCommandStatus                       = 0,
+            ContextConfiguration                      = new byte[15],
+            ExtendedPartitionsAttribute               = 0,
+            ExceptionEventsStatus                     = 0,
+            ExceptionEventsControl                    = 0,
+            DyncapNeeded                              = 0,
+            Class6CommandsControl                     = 0,
+            InitializationTimeoutAfterEmulationChange = 0,
+            SectorSize                                = 0,
+            SectorSizeEmulation                       = 0,
+            NativeSectorSize                          = 0,
+            VendorSpecific                            = new byte[64],
+            Reserved2                                 = 0,
+            SupportsProgramCxDInDDR                   = 1,
+            PeriodicWakeUp                            = 0,
+            PackageCaseTemperatureControl             = 0,
+            ProductionStateAwareness                  = 0,
+            BadBlockManagementMode                    = 0,
+            Reserved3                                 = 0,
+            EnhancedUserDataStartAddress              = 0,
+            EnhancedUserDataAreaSize                  = new byte[3],
+            GeneralPurposePartitionSize               = new byte[12],
+            PartitioningSetting                       = 0,
+            PartitionsAttribute                       = 0,
+            MaxEnhancedAreaSize = new byte[]
             {
-                Reserved0                                 = new byte[15],
-                CommandQueueModeEnable                    = 0,
-                SecureRemovalType                         = 9,
-                ProductStateAwarenessEnablement           = 0,
-                MaxPreLoadingDataSize                     = 0,
-                FFUStatus                                 = 0,
-                Reserved1                                 = 0,
-                ModeOperationCodes                        = 0,
-                ModeConfig                                = 0,
-                BarrierControl                            = 0,
-                CacheFlushing                             = 0,
-                CacheControl                              = 1,
-                PowerOffNotification                      = 1,
-                PackedCommandFailureIndex                 = 0,
-                PackedCommandStatus                       = 0,
-                ContextConfiguration                      = new byte[15],
-                ExtendedPartitionsAttribute               = 0,
-                ExceptionEventsStatus                     = 0,
-                ExceptionEventsControl                    = 0,
-                DyncapNeeded                              = 0,
-                Class6CommandsControl                     = 0,
-                InitializationTimeoutAfterEmulationChange = 0,
-                SectorSize                                = 0,
-                SectorSizeEmulation                       = 0,
-                NativeSectorSize                          = 0,
-                VendorSpecific                            = new byte[64],
-                Reserved2                                 = 0,
-                SupportsProgramCxDInDDR                   = 1,
-                PeriodicWakeUp                            = 0,
-                PackageCaseTemperatureControl             = 0,
-                ProductionStateAwareness                  = 0,
-                BadBlockManagementMode                    = 0,
-                Reserved3                                 = 0,
-                EnhancedUserDataStartAddress              = 0,
-                EnhancedUserDataAreaSize                  = new byte[3],
-                GeneralPurposePartitionSize               = new byte[12],
-                PartitioningSetting                       = 0,
-                PartitionsAttribute                       = 0,
-                MaxEnhancedAreaSize = new byte[]
-                {
-                    52, 19, 0
-                },
-                PartitioningSupport                  = (PartitioningSupport)7,
-                HPIManagement                        = 1,
-                HWResetFunction                      = 1,
-                EnableBackgroundOperationsHandshake  = 0,
-                ManuallyStartBackgroundOperations    = 0,
-                StartSanitizeOperation               = 0,
-                WriteReliabilityParameterRegister    = 21,
-                WriteReliabilitySettingRegister      = 31,
-                RPMBSize                             = 32,
-                FirmwareConfiguration                = 0,
-                Reserved4                            = 0,
-                UserAreaWriteProtectionRegister      = 0,
-                Reserved5                            = 0,
-                BootAreaWriteProtectionRegister      = (BootAreaWriteProtectionRegister)17,
-                BootWriteProtectionStatus            = 5,
-                HighCapacityEraseGroupDefinition     = (HighCapacityEraseGroupDefinition)1,
-                Reserved6                            = 0,
-                BootBusConditions                    = 0,
-                BootConfigProtection                 = 0,
-                PartitionConfiguration               = 0,
-                Reserved7                            = 0,
-                ErasedMemoryContent                  = 0,
-                Reserved8                            = 0,
-                BusWidth                             = 0,
-                StrobeSupport                        = 1,
-                HighSpeedInterfaceTiming             = 3,
-                Reserved9                            = 0,
-                PowerClass                           = 0,
-                Reserved10                           = 0,
-                CommandSetRevision                   = 0,
-                Reserved11                           = 0,
-                CommandSet                           = 0,
-                Revision                             = 8,
-                Reserved12                           = 0,
-                Structure                            = 2,
-                Reserved13                           = 0,
-                DeviceType                           = (DeviceType)87,
-                DriverStrength                       = (DriverStrength)1,
-                OutOfInterruptBusyTiming             = 5,
-                PartitionSwitchingTime               = 10,
-                PowerClass52_195                     = 0,
-                PowerClass26_195                     = 0,
-                PowerClass52                         = 0,
-                PowerClass26                         = 0,
-                Reserved14                           = 0,
-                MinimumReadPerformance26_4           = 0,
-                MinimumWritePerformance26_4          = 0,
-                MinimumReadPerformance26             = 0,
-                MinimumWritePerformance26            = 0,
-                MinimumReadPerformance52             = 0,
-                MinimumWritePerformance52            = 0,
-                SecureWriteProtectInformation        = (SecureWriteProtectInformation)1,
-                SectorCount                          = 120832000,
-                SleepNotificationTimeout             = 16,
-                SleepAwakeTimeout                    = 22,
-                ProductionStateAwarenessTimeout      = 0,
-                SleepCurrentVccQ                     = 7,
-                SleepCurrentVcc                      = 7,
-                HighCapacityWriteProtectGroupSize    = 8,
-                ReliableWriteSectorCount             = 1,
-                HighCapacityEraseTimeout             = 5,
-                HighCapacityEraseUnitSize            = 1,
-                AccessSize                           = 6,
-                BootPartitionSize                    = 32,
-                Reserved15                           = 0,
-                BootInformation                      = (BootInformation)7,
-                SecureTRIMMultiplier                 = 17,
-                SecureEraseMultiplier                = 27,
-                SecureFeatureSupport                 = (SecureFeatureSupport)85,
-                TRIMMultiplier                       = 5,
-                Reserved16                           = 0,
-                MinimumReadPerformanceDDR52          = 0,
-                MinimumWritePerformanceDDR52         = 0,
-                PowerClassDDR200_130                 = 0,
-                PowerClassDDR200_195                 = 0,
-                PowerClassDDR52_195                  = 0,
-                PowerClassDDR52                      = 0,
-                CacheFlushingPolicy                  = 0,
-                InitializationTimeAfterPartition     = 30,
-                CorrectlyProgrammedSectors           = 0,
-                BackgroundOperationsStatus           = 0,
-                PowerOffNotificationTimeout          = 60,
-                GenericCMD6Timeout                   = 10,
-                CacheSize                            = 65536,
-                PowerClassDDR200                     = 0,
-                FirmwareVersion                      = 283,
-                DeviceVersion                        = 0,
-                OptimalTrimUnitSize                  = 1,
-                OptimalWriteSize                     = 32,
-                OptimalReadSize                      = 0,
-                PreEOLInformation                    = 1,
-                DeviceLifeEstimationTypeA            = 1,
-                DeviceLifeEstimationTypeB            = 1,
-                VendorHealthReport                   = new byte[32],
-                NumberOfFWSectorsCorrectlyProgrammed = 0,
-                Reserved17                           = 0,
-                CMDQueuingDepth                      = 31,
-                CMDQueuingSupport                    = (CMDQueuingSupport)1,
-                Reserved18                           = new byte[177],
-                BarrierSupport                       = 0,
-                FFUArgument                          = 0,
-                OperationCodesTimeout                = 0,
-                FFUFeatures                          = 0,
-                SupportedModes                       = (SupportedModes)3,
-                ExtendedPartitionsSupport            = (ExtendedPartitionsSupport)3,
-                LargeUnitSize                        = 7,
-                ContextManagementCaps                = 5,
-                TagResourcesSize                     = 0,
-                TagUnitSize                          = 3,
-                DataTagSupport                       = (DataTagSupport)1,
-                MaxPackedWriteCommands               = 63,
-                MaxPackedReadCommands                = 63,
-                BackgroundOperationsSupport          = (BackgroundOperationsSupport)1,
-                HPIFeatures                          = (HPIFeatures)1,
-                SupportedCommandSets                 = (DeviceSupportedCommandSets)1,
-                ExtendedSecurityCommandsError        = 0,
-                Reserved19                           = new byte[6]
-            }
-        };
+                52, 19, 0
+            },
+            PartitioningSupport                  = (PartitioningSupport)7,
+            HPIManagement                        = 1,
+            HWResetFunction                      = 1,
+            EnableBackgroundOperationsHandshake  = 0,
+            ManuallyStartBackgroundOperations    = 0,
+            StartSanitizeOperation               = 0,
+            WriteReliabilityParameterRegister    = 21,
+            WriteReliabilitySettingRegister      = 31,
+            RPMBSize                             = 32,
+            FirmwareConfiguration                = 0,
+            Reserved4                            = 0,
+            UserAreaWriteProtectionRegister      = 0,
+            Reserved5                            = 0,
+            BootAreaWriteProtectionRegister      = (BootAreaWriteProtectionRegister)17,
+            BootWriteProtectionStatus            = 5,
+            HighCapacityEraseGroupDefinition     = (HighCapacityEraseGroupDefinition)1,
+            Reserved6                            = 0,
+            BootBusConditions                    = 0,
+            BootConfigProtection                 = 0,
+            PartitionConfiguration               = 0,
+            Reserved7                            = 0,
+            ErasedMemoryContent                  = 0,
+            Reserved8                            = 0,
+            BusWidth                             = 0,
+            StrobeSupport                        = 1,
+            HighSpeedInterfaceTiming             = 3,
+            Reserved9                            = 0,
+            PowerClass                           = 0,
+            Reserved10                           = 0,
+            CommandSetRevision                   = 0,
+            Reserved11                           = 0,
+            CommandSet                           = 0,
+            Revision                             = 8,
+            Reserved12                           = 0,
+            Structure                            = 2,
+            Reserved13                           = 0,
+            DeviceType                           = (DeviceType)87,
+            DriverStrength                       = (DriverStrength)1,
+            OutOfInterruptBusyTiming             = 5,
+            PartitionSwitchingTime               = 10,
+            PowerClass52_195                     = 0,
+            PowerClass26_195                     = 0,
+            PowerClass52                         = 0,
+            PowerClass26                         = 0,
+            Reserved14                           = 0,
+            MinimumReadPerformance26_4           = 0,
+            MinimumWritePerformance26_4          = 0,
+            MinimumReadPerformance26             = 0,
+            MinimumWritePerformance26            = 0,
+            MinimumReadPerformance52             = 0,
+            MinimumWritePerformance52            = 0,
+            SecureWriteProtectInformation        = (SecureWriteProtectInformation)1,
+            SectorCount                          = 120832000,
+            SleepNotificationTimeout             = 16,
+            SleepAwakeTimeout                    = 22,
+            ProductionStateAwarenessTimeout      = 0,
+            SleepCurrentVccQ                     = 7,
+            SleepCurrentVcc                      = 7,
+            HighCapacityWriteProtectGroupSize    = 8,
+            ReliableWriteSectorCount             = 1,
+            HighCapacityEraseTimeout             = 5,
+            HighCapacityEraseUnitSize            = 1,
+            AccessSize                           = 6,
+            BootPartitionSize                    = 32,
+            Reserved15                           = 0,
+            BootInformation                      = (BootInformation)7,
+            SecureTRIMMultiplier                 = 17,
+            SecureEraseMultiplier                = 27,
+            SecureFeatureSupport                 = (SecureFeatureSupport)85,
+            TRIMMultiplier                       = 5,
+            Reserved16                           = 0,
+            MinimumReadPerformanceDDR52          = 0,
+            MinimumWritePerformanceDDR52         = 0,
+            PowerClassDDR200_130                 = 0,
+            PowerClassDDR200_195                 = 0,
+            PowerClassDDR52_195                  = 0,
+            PowerClassDDR52                      = 0,
+            CacheFlushingPolicy                  = 0,
+            InitializationTimeAfterPartition     = 30,
+            CorrectlyProgrammedSectors           = 0,
+            BackgroundOperationsStatus           = 0,
+            PowerOffNotificationTimeout          = 60,
+            GenericCMD6Timeout                   = 10,
+            CacheSize                            = 65536,
+            PowerClassDDR200                     = 0,
+            FirmwareVersion                      = 283,
+            DeviceVersion                        = 0,
+            OptimalTrimUnitSize                  = 1,
+            OptimalWriteSize                     = 32,
+            OptimalReadSize                      = 0,
+            PreEOLInformation                    = 1,
+            DeviceLifeEstimationTypeA            = 1,
+            DeviceLifeEstimationTypeB            = 1,
+            VendorHealthReport                   = new byte[32],
+            NumberOfFWSectorsCorrectlyProgrammed = 0,
+            Reserved17                           = 0,
+            CMDQueuingDepth                      = 31,
+            CMDQueuingSupport                    = (CMDQueuingSupport)1,
+            Reserved18                           = new byte[177],
+            BarrierSupport                       = 0,
+            FFUArgument                          = 0,
+            OperationCodesTimeout                = 0,
+            FFUFeatures                          = 0,
+            SupportedModes                       = (SupportedModes)3,
+            ExtendedPartitionsSupport            = (ExtendedPartitionsSupport)3,
+            LargeUnitSize                        = 7,
+            ContextManagementCaps                = 5,
+            TagResourcesSize                     = 0,
+            TagUnitSize                          = 3,
+            DataTagSupport                       = (DataTagSupport)1,
+            MaxPackedWriteCommands               = 63,
+            MaxPackedReadCommands                = 63,
+            BackgroundOperationsSupport          = (BackgroundOperationsSupport)1,
+            HPIFeatures                          = (HPIFeatures)1,
+            SupportedCommandSets                 = (DeviceSupportedCommandSets)1,
+            ExtendedSecurityCommandsError        = 0,
+            Reserved19                           = new byte[6]
+        }
+    };
 
-        [Test]
-        public void Test()
+    [Test]
+    public void Test()
+    {
+        for(int i = 0; i < ecsd.Length; i++)
         {
-            for(int i = 0; i < ecsd.Length; i++)
-            {
-                Decoders.MMC.ExtendedCSD csd = Decoders.MMC.Decoders.DecodeExtendedCSD(ecsd[i]);
-                Assert.IsNotNull(csd, $"Not decoded - {i}");
-                csd.Should().BeEquivalentTo(decoded[i]);
-            }
+            Decoders.MMC.ExtendedCSD csd = Decoders.MMC.Decoders.DecodeExtendedCSD(ecsd[i]);
+            Assert.IsNotNull(csd, $"Not decoded - {i}");
+            csd.Should().BeEquivalentTo(decoded[i]);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Devices/PocketZip.cs b/Aaru.Tests/Devices/PocketZip.cs
index 76c4f4fc0..5f0614d47 100644
--- a/Aaru.Tests/Devices/PocketZip.cs
+++ b/Aaru.Tests/Devices/PocketZip.cs
@@ -35,64 +35,63 @@ using Aaru.Filters;
 using FluentAssertions.Execution;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Devices
+namespace Aaru.Tests.Devices;
+
+[TestFixture]
+public class PocketZip
 {
-    [TestFixture]
-    public class PocketZip
+    readonly string[] _testFiles =
     {
-        readonly string[] _testFiles =
+        "clik!.bin.lz", "pocketzip.bin.lz"
+    };
+
+    readonly MediaType[] _mediaTypes =
+    {
+        MediaType.PocketZip, MediaType.PocketZip
+    };
+
+    readonly ulong[] _sectors =
+    {
+        78882, 78882
+    };
+
+    readonly uint[] _sectorSize =
+    {
+        512, 512
+    };
+
+    readonly string _dataFolder = Path.Combine(Consts.TEST_FILES_ROOT, "Device test dumps", "PocketZIP");
+
+    [Test]
+    public void Info()
+    {
+        Environment.CurrentDirectory = _dataFolder;
+
+        Assert.Multiple(() =>
         {
-            "clik!.bin.lz", "pocketzip.bin.lz"
-        };
-
-        readonly MediaType[] _mediaTypes =
-        {
-            MediaType.PocketZip, MediaType.PocketZip
-        };
-
-        readonly ulong[] _sectors =
-        {
-            78882, 78882
-        };
-
-        readonly uint[] _sectorSize =
-        {
-            512, 512
-        };
-
-        readonly string _dataFolder = Path.Combine(Consts.TEST_FILES_ROOT, "Device test dumps", "PocketZIP");
-
-        [Test]
-        public void Info()
-        {
-            Environment.CurrentDirectory = _dataFolder;
-
-            Assert.Multiple(() =>
+            for(int i = 0; i < _testFiles.Length; i++)
             {
-                for(int i = 0; i < _testFiles.Length; i++)
+                var filter = new LZip();
+                filter.Open(_testFiles[i]);
+
+                var         image  = new ZZZRawImage();
+                ErrorNumber opened = image.Open(filter);
+
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {_testFiles[i]}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                using(new AssertionScope())
                 {
-                    var filter = new LZip();
-                    filter.Open(_testFiles[i]);
-
-                    var         image  = new ZZZRawImage();
-                    ErrorNumber opened = image.Open(filter);
-
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {_testFiles[i]}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    using(new AssertionScope())
+                    Assert.Multiple(() =>
                     {
-                        Assert.Multiple(() =>
-                        {
-                            Assert.AreEqual(_sectors[i], image.Info.Sectors, $"Sectors: {_testFiles[i]}");
-                            Assert.AreEqual(_sectorSize[i], image.Info.SectorSize, $"Sector size: {_testFiles[i]}");
-                            Assert.AreEqual(_mediaTypes[i], image.Info.MediaType, $"Media type: {_testFiles[i]}");
-                        });
-                    }
+                        Assert.AreEqual(_sectors[i], image.Info.Sectors, $"Sectors: {_testFiles[i]}");
+                        Assert.AreEqual(_sectorSize[i], image.Info.SectorSize, $"Sector size: {_testFiles[i]}");
+                        Assert.AreEqual(_mediaTypes[i], image.Info.MediaType, $"Media type: {_testFiles[i]}");
+                    });
                 }
-            });
-        }
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Devices/SecureDigital/CID.cs b/Aaru.Tests/Devices/SecureDigital/CID.cs
index 1141a0366..70e1bdf24 100644
--- a/Aaru.Tests/Devices/SecureDigital/CID.cs
+++ b/Aaru.Tests/Devices/SecureDigital/CID.cs
@@ -4,85 +4,84 @@ using NUnit.Framework;
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Tests.Devices.SecureDigital
+namespace Aaru.Tests.Devices.SecureDigital;
+
+[TestFixture]
+public class CID
 {
-    [TestFixture]
-    public class CID
+    readonly string[] cards =
     {
-        readonly string[] cards =
-        {
-            "microsdhc_goodram_16gb", "microsdhc_kingston_4gb", "microsdhc_kingston_8gb", "microsdhc_kodak_2gb",
-            "microsdhc_nobrand_2gb", "microsdhc_sandisk_16gb", "microsdhc_sandisk_32gb", "microsdhc_trascend_2gb",
-            "sd_adata_4gb", "sdhc_fujifilm_4gb", "sdhc_kodak_4gb", "sdhc_pny_4gb", "sdhc_puntitos_4gb", "sd_pqi_64mb"
-        };
-        readonly string[] cids =
-        {
-            "275048534431364760011a77d2014701", "02544d534430344738b26a38aa008901", "02544d5341303847049cd164d9009a01",
-            "1b534d30303030301075a72c7e00a501", "02544d534430324738a2cd4987009101", "035344534c313647800eace07e00e801",
-            "0353445342333247809b2f1533012301", "1b534d30303030301000ca9e3d00b201", "1d4144534420202010000256db006701",
-            "275048534430344730b00de36100b801", "64504320202020201088026f6400aa01", "035344534430344780708200ac009501",
-            "035344544f000000ff000147da00fa01", "02544d5344303634055744cb0f003401"
-        };
+        "microsdhc_goodram_16gb", "microsdhc_kingston_4gb", "microsdhc_kingston_8gb", "microsdhc_kodak_2gb",
+        "microsdhc_nobrand_2gb", "microsdhc_sandisk_16gb", "microsdhc_sandisk_32gb", "microsdhc_trascend_2gb",
+        "sd_adata_4gb", "sdhc_fujifilm_4gb", "sdhc_kodak_4gb", "sdhc_pny_4gb", "sdhc_puntitos_4gb", "sd_pqi_64mb"
+    };
+    readonly string[] cids =
+    {
+        "275048534431364760011a77d2014701", "02544d534430344738b26a38aa008901", "02544d5341303847049cd164d9009a01",
+        "1b534d30303030301075a72c7e00a501", "02544d534430324738a2cd4987009101", "035344534c313647800eace07e00e801",
+        "0353445342333247809b2f1533012301", "1b534d30303030301000ca9e3d00b201", "1d4144534420202010000256db006701",
+        "275048534430344730b00de36100b801", "64504320202020201088026f6400aa01", "035344534430344780708200ac009501",
+        "035344544f000000ff000147da00fa01", "02544d5344303634055744cb0f003401"
+    };
 
-        readonly byte[] manufacturers =
-        {
-            0x27, 0x02, 0x02, 0x1b, 0x02, 0x03, 0x03, 0x1b, 0x1d, 0x27, 0x64, 0x03, 0x03, 0x02
-        };
+    readonly byte[] manufacturers =
+    {
+        0x27, 0x02, 0x02, 0x1b, 0x02, 0x03, 0x03, 0x1b, 0x1d, 0x27, 0x64, 0x03, 0x03, 0x02
+    };
 
-        readonly string[] applications =
-        {
-            "PH", "TM", "TM", "SM", "TM", "SD", "SD", "SM", "AD", "PH", "PC", "SD", "SD", "TM"
-        };
+    readonly string[] applications =
+    {
+        "PH", "TM", "TM", "SM", "TM", "SD", "SD", "SM", "AD", "PH", "PC", "SD", "SD", "TM"
+    };
 
-        readonly string[] names =
-        {
-            "SD16G", "SD04G", "SA08G", "00000", "SD02G", "SL16G", "SB32G", "00000", "SD   ", "SD04G", "     ", "SD04G",
-            "TO", "SD064"
-        };
+    readonly string[] names =
+    {
+        "SD16G", "SD04G", "SA08G", "00000", "SD02G", "SL16G", "SB32G", "00000", "SD   ", "SD04G", "     ", "SD04G",
+        "TO", "SD064"
+    };
 
-        readonly byte[] revisions =
-        {
-            0x60, 0x38, 0x04, 0x10, 0x38, 0x80, 0x80, 0x10, 0x10, 0x30, 0x10, 0x80, 0xff, 0x05
-        };
+    readonly byte[] revisions =
+    {
+        0x60, 0x38, 0x04, 0x10, 0x38, 0x80, 0x80, 0x10, 0x10, 0x30, 0x10, 0x80, 0xff, 0x05
+    };
 
-        readonly uint[] serials =
-        {
-            0x011a77d2, 0xb26a38aa, 0x9cd164d9, 0x75a72c7e, 0xa2cd4987, 0x0eace07e, 0x9b2f1533, 0x00ca9e3d, 0x000256db,
-            0xb00de361, 0x88026f64, 0x708200ac, 0x000147da, 0x5744cb0f
-        };
+    readonly uint[] serials =
+    {
+        0x011a77d2, 0xb26a38aa, 0x9cd164d9, 0x75a72c7e, 0xa2cd4987, 0x0eace07e, 0x9b2f1533, 0x00ca9e3d, 0x000256db,
+        0xb00de361, 0x88026f64, 0x708200ac, 0x000147da, 0x5744cb0f
+    };
 
-        readonly ushort[] dates =
-        {
-            0x147, 0x089, 0x09a, 0x0a5, 0x091, 0x0e8, 0x123, 0x0b2, 0x067, 0x0b8, 0x0aa, 0x095, 0x0fa, 0x034
-        };
+    readonly ushort[] dates =
+    {
+        0x147, 0x089, 0x09a, 0x0a5, 0x091, 0x0e8, 0x123, 0x0b2, 0x067, 0x0b8, 0x0aa, 0x095, 0x0fa, 0x034
+    };
 
-        readonly byte[] crcs =
-        {
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        };
+    readonly byte[] crcs =
+    {
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+    };
 
-        [Test]
-        public void Test()
+    [Test]
+    public void Test()
+    {
+        for(int i = 0; i < cards.Length; i++)
         {
-            for(int i = 0; i < cards.Length; i++)
+            using(new AssertionScope())
             {
-                using(new AssertionScope())
+                Assert.Multiple(() =>
                 {
-                    Assert.Multiple(() =>
-                    {
-                        int count = Marshal.ConvertFromHexAscii(cids[i], out byte[] response);
-                        Assert.AreEqual(16, count, $"Size - {cards[i]}");
-                        Decoders.SecureDigital.CID cid = Decoders.SecureDigital.Decoders.DecodeCID(response);
-                        Assert.IsNotNull(cid, $"Decoded - {cards[i]}");
-                        Assert.AreEqual(manufacturers[i], cid.Manufacturer, $"Manufacturer - {cards[i]}");
-                        Assert.AreEqual(applications[i], cid.ApplicationID, $"Application ID - {cards[i]}");
-                        Assert.AreEqual(names[i], cid.ProductName, $"Product name - {cards[i]}");
-                        Assert.AreEqual(revisions[i], cid.ProductRevision, $"Product revision - {cards[i]}");
-                        Assert.AreEqual(serials[i], cid.ProductSerialNumber, $"Serial number - {cards[i]}");
-                        Assert.AreEqual(dates[i], cid.ManufacturingDate, $"Manufacturing date - {cards[i]}");
-                        Assert.AreEqual(crcs[i], cid.CRC, $"CRC - {cards[i]}");
-                    });
-                }
+                    int count = Marshal.ConvertFromHexAscii(cids[i], out byte[] response);
+                    Assert.AreEqual(16, count, $"Size - {cards[i]}");
+                    Decoders.SecureDigital.CID cid = Decoders.SecureDigital.Decoders.DecodeCID(response);
+                    Assert.IsNotNull(cid, $"Decoded - {cards[i]}");
+                    Assert.AreEqual(manufacturers[i], cid.Manufacturer, $"Manufacturer - {cards[i]}");
+                    Assert.AreEqual(applications[i], cid.ApplicationID, $"Application ID - {cards[i]}");
+                    Assert.AreEqual(names[i], cid.ProductName, $"Product name - {cards[i]}");
+                    Assert.AreEqual(revisions[i], cid.ProductRevision, $"Product revision - {cards[i]}");
+                    Assert.AreEqual(serials[i], cid.ProductSerialNumber, $"Serial number - {cards[i]}");
+                    Assert.AreEqual(dates[i], cid.ManufacturingDate, $"Manufacturing date - {cards[i]}");
+                    Assert.AreEqual(crcs[i], cid.CRC, $"CRC - {cards[i]}");
+                });
             }
         }
     }
diff --git a/Aaru.Tests/Devices/SecureDigital/CSD.cs b/Aaru.Tests/Devices/SecureDigital/CSD.cs
index 244e7d0bb..3b70fd184 100644
--- a/Aaru.Tests/Devices/SecureDigital/CSD.cs
+++ b/Aaru.Tests/Devices/SecureDigital/CSD.cs
@@ -4,227 +4,226 @@ using NUnit.Framework;
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Tests.Devices.SecureDigital
+namespace Aaru.Tests.Devices.SecureDigital;
+
+[TestFixture]
+public class CSD
 {
-    [TestFixture]
-    public class CSD
+    readonly string[] cards =
     {
-        readonly string[] cards =
-        {
-            "microsdhc_goodram_16gb", "microsdhc_kingston_4gb", "microsdhc_kingston_8gb", "microsdhc_kodak_2gb",
-            "microsdhc_nobrand_2gb", "microsdhc_sandisk_16gb", "microsdhc_sandisk_32gb", "microsdhc_trascend_2gb",
-            "sd_adata_4gb", "sdhc_fujifilm_4gb", "sdhc_kodak_4gb", "sdhc_pny_4gb", "sdhc_puntitos_4gb", "sd_pqi_64mb"
-        };
+        "microsdhc_goodram_16gb", "microsdhc_kingston_4gb", "microsdhc_kingston_8gb", "microsdhc_kodak_2gb",
+        "microsdhc_nobrand_2gb", "microsdhc_sandisk_16gb", "microsdhc_sandisk_32gb", "microsdhc_trascend_2gb",
+        "sd_adata_4gb", "sdhc_fujifilm_4gb", "sdhc_kodak_4gb", "sdhc_pny_4gb", "sdhc_puntitos_4gb", "sd_pqi_64mb"
+    };
 
-        readonly string[] csds =
-        {
-            "400e00325b590000740f7f800a400001", "400e00325b5900001d877f800a400001", "400e00325b5900003b677f800a400001",
-            "002601325b5a83c7f6dbff9f16804001", "002e00325b5a83a9ffffff8016800001", "400e00325b59000076b27f800a404001",
-            "400e00325b590000edc87f800a404001", "007fff325b5a83baf6dbdfff0e800001", "005e0032575b83d56db7ffff96c00001",
-            "400e00325b5900001da77f800a400001", "400e00325b5900001deb7f800a400001", "400e00325b5900001d8a7f800a404001",
-            "400e00325b5900001dbf7f800a400001", "002d0032135983c9f6d9cf8016400001"
-        };
+    readonly string[] csds =
+    {
+        "400e00325b590000740f7f800a400001", "400e00325b5900001d877f800a400001", "400e00325b5900003b677f800a400001",
+        "002601325b5a83c7f6dbff9f16804001", "002e00325b5a83a9ffffff8016800001", "400e00325b59000076b27f800a404001",
+        "400e00325b590000edc87f800a404001", "007fff325b5a83baf6dbdfff0e800001", "005e0032575b83d56db7ffff96c00001",
+        "400e00325b5900001da77f800a400001", "400e00325b5900001deb7f800a400001", "400e00325b5900001d8a7f800a404001",
+        "400e00325b5900001dbf7f800a400001", "002d0032135983c9f6d9cf8016400001"
+    };
 
-        readonly byte[] structure_versions =
-        {
-            1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0
-        };
+    readonly byte[] structure_versions =
+    {
+        1, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0
+    };
 
-        readonly byte[] taacs =
-        {
-            14, 14, 14, 38, 46, 14, 14, 127, 94, 14, 14, 14, 14, 45
-        };
+    readonly byte[] taacs =
+    {
+        14, 14, 14, 38, 46, 14, 14, 127, 94, 14, 14, 14, 14, 45
+    };
 
-        readonly byte[] nsacs =
-        {
-            0, 0, 0, 1, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0
-        };
+    readonly byte[] nsacs =
+    {
+        0, 0, 0, 1, 0, 0, 0, 255, 0, 0, 0, 0, 0, 0
+    };
 
-        readonly byte[] speeds =
-        {
-            50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50
-        };
+    readonly byte[] speeds =
+    {
+        50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50
+    };
 
-        readonly ushort[] classes =
-        {
-            1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1397, 1461, 1461, 1461, 1461, 309
-        };
+    readonly ushort[] classes =
+    {
+        1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1397, 1461, 1461, 1461, 1461, 309
+    };
 
-        readonly byte[] read_block_lengths =
-        {
-            9, 9, 9, 10, 10, 9, 9, 10, 11, 9, 9, 9, 9, 9
-        };
+    readonly byte[] read_block_lengths =
+    {
+        9, 9, 9, 10, 10, 9, 9, 10, 11, 9, 9, 9, 9, 9
+    };
 
-        readonly bool[] read_partial_blocks =
-        {
-            false, false, false, true, true, false, false, true, true, false, false, false, false, true
-        };
+    readonly bool[] read_partial_blocks =
+    {
+        false, false, false, true, true, false, false, true, true, false, false, false, false, true
+    };
 
-        readonly bool[] write_misaligned_block =
-        {
-            false, false, false, false, false, false, false, false, false, false, false, false, false, false
-        };
+    readonly bool[] write_misaligned_block =
+    {
+        false, false, false, false, false, false, false, false, false, false, false, false, false, false
+    };
 
-        readonly bool[] read_misaligned_block =
-        {
-            false, false, false, false, false, false, false, false, false, false, false, false, false, false
-        };
+    readonly bool[] read_misaligned_block =
+    {
+        false, false, false, false, false, false, false, false, false, false, false, false, false, false
+    };
 
-        readonly bool[] dsr_implemented =
-        {
-            false, false, false, false, false, false, false, false, false, false, false, false, false, false
-        };
+    readonly bool[] dsr_implemented =
+    {
+        false, false, false, false, false, false, false, false, false, false, false, false, false, false
+    };
 
-        readonly uint[] card_sizes =
-        {
-            29711, 7559, 15207, 3871, 3751, 30386, 60872, 3819, 3925, 7591, 7659, 7562, 7615, 3879
-        };
+    readonly uint[] card_sizes =
+    {
+        29711, 7559, 15207, 3871, 3751, 30386, 60872, 3819, 3925, 7591, 7659, 7562, 7615, 3879
+    };
 
-        readonly byte[] min_read_current =
-        {
-            0, 0, 0, 6, 7, 0, 0, 6, 5, 0, 0, 0, 0, 6
-        };
+    readonly byte[] min_read_current =
+    {
+        0, 0, 0, 6, 7, 0, 0, 6, 5, 0, 0, 0, 0, 6
+    };
 
-        readonly byte[] max_read_current =
-        {
-            0, 0, 0, 6, 7, 0, 0, 6, 5, 0, 0, 0, 0, 6
-        };
+    readonly byte[] max_read_current =
+    {
+        0, 0, 0, 6, 7, 0, 0, 6, 5, 0, 0, 0, 0, 6
+    };
 
-        readonly byte[] min_write_current =
-        {
-            0, 0, 0, 6, 7, 0, 0, 6, 5, 0, 0, 0, 0, 6
-        };
+    readonly byte[] min_write_current =
+    {
+        0, 0, 0, 6, 7, 0, 0, 6, 5, 0, 0, 0, 0, 6
+    };
 
-        readonly byte[] max_write_current =
-        {
-            0, 0, 0, 6, 7, 0, 0, 6, 5, 0, 0, 0, 0, 6
-        };
+    readonly byte[] max_write_current =
+    {
+        0, 0, 0, 6, 7, 0, 0, 6, 5, 0, 0, 0, 0, 6
+    };
 
-        readonly byte[] size_multiplier =
-        {
-            0, 0, 0, 7, 7, 0, 0, 7, 7, 0, 0, 0, 0, 3
-        };
+    readonly byte[] size_multiplier =
+    {
+        0, 0, 0, 7, 7, 0, 0, 7, 7, 0, 0, 0, 0, 3
+    };
 
-        readonly bool[] erase_block_enable =
-        {
-            true, true, true, true, true, true, true, true, true, true, true, true, true, true
-        };
+    readonly bool[] erase_block_enable =
+    {
+        true, true, true, true, true, true, true, true, true, true, true, true, true, true
+    };
 
-        readonly byte[] erase_sector_sizes =
-        {
-            127, 127, 127, 127, 127, 127, 127, 63, 127, 127, 127, 127, 127, 31
-        };
+    readonly byte[] erase_sector_sizes =
+    {
+        127, 127, 127, 127, 127, 127, 127, 63, 127, 127, 127, 127, 127, 31
+    };
 
-        readonly byte[] write_protect_group_size =
-        {
-            0, 0, 0, 31, 0, 0, 0, 127, 127, 0, 0, 0, 0, 0
-        };
+    readonly byte[] write_protect_group_size =
+    {
+        0, 0, 0, 31, 0, 0, 0, 127, 127, 0, 0, 0, 0, 0
+    };
 
-        readonly bool[] write_protect_group_enable =
-        {
-            false, false, false, false, false, false, false, false, true, false, false, false, false, false
-        };
+    readonly bool[] write_protect_group_enable =
+    {
+        false, false, false, false, false, false, false, false, true, false, false, false, false, false
+    };
 
-        readonly byte[] r2w_factors =
-        {
-            2, 2, 2, 5, 5, 2, 2, 3, 5, 2, 2, 2, 2, 5
-        };
+    readonly byte[] r2w_factors =
+    {
+        2, 2, 2, 5, 5, 2, 2, 3, 5, 2, 2, 2, 2, 5
+    };
 
-        readonly bool[] file_format_group =
-        {
-            false, false, false, false, false, false, false, false, false, false, false, false, false, false
-        };
+    readonly bool[] file_format_group =
+    {
+        false, false, false, false, false, false, false, false, false, false, false, false, false, false
+    };
 
-        readonly bool[] copy =
-        {
-            false, false, false, true, false, true, true, false, false, false, false, true, false, false, false
-        };
+    readonly bool[] copy =
+    {
+        false, false, false, true, false, true, true, false, false, false, false, true, false, false, false
+    };
 
-        readonly bool[] permanent_write_protect =
-        {
-            false, false, false, false, false, false, false, false, false, false, false, false, false, false
-        };
+    readonly bool[] permanent_write_protect =
+    {
+        false, false, false, false, false, false, false, false, false, false, false, false, false, false
+    };
 
-        readonly bool[] temporary_write_protect =
-        {
-            false, false, false, false, false, false, false, false, false, false, false, false, false, false
-        };
+    readonly bool[] temporary_write_protect =
+    {
+        false, false, false, false, false, false, false, false, false, false, false, false, false, false
+    };
 
-        readonly byte[] file_format =
-        {
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
+    readonly byte[] file_format =
+    {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
 
-        [Test]
-        public void Test()
+    [Test]
+    public void Test()
+    {
+        for(int i = 0; i < cards.Length; i++)
         {
-            for(int i = 0; i < cards.Length; i++)
+            using(new AssertionScope())
             {
-                using(new AssertionScope())
+                Assert.Multiple(() =>
                 {
-                    Assert.Multiple(() =>
-                    {
-                        int count = Marshal.ConvertFromHexAscii(csds[i], out byte[] response);
-                        Assert.AreEqual(16, count, $"Size - {cards[i]}");
-                        Decoders.SecureDigital.CSD csd = Decoders.SecureDigital.Decoders.DecodeCSD(response);
-                        Assert.IsNotNull(csd, $"Decoded - {cards[i]}");
-                        Assert.AreEqual(structure_versions[i], csd.Structure, $"Version - {cards[i]}");
-                        Assert.AreEqual(taacs[i], csd.TAAC, $"TAAC - {cards[i]}");
-                        Assert.AreEqual(nsacs[i], csd.NSAC, $"NSAC - {cards[i]}");
-                        Assert.AreEqual(speeds[i], csd.Speed, $"Transfer speed - {cards[i]}");
-                        Assert.AreEqual(classes[i], csd.Classes, $"Classes - {cards[i]}");
-                        Assert.AreEqual(read_block_lengths[i], csd.ReadBlockLength, $"Read block length - {cards[i]}");
+                    int count = Marshal.ConvertFromHexAscii(csds[i], out byte[] response);
+                    Assert.AreEqual(16, count, $"Size - {cards[i]}");
+                    Decoders.SecureDigital.CSD csd = Decoders.SecureDigital.Decoders.DecodeCSD(response);
+                    Assert.IsNotNull(csd, $"Decoded - {cards[i]}");
+                    Assert.AreEqual(structure_versions[i], csd.Structure, $"Version - {cards[i]}");
+                    Assert.AreEqual(taacs[i], csd.TAAC, $"TAAC - {cards[i]}");
+                    Assert.AreEqual(nsacs[i], csd.NSAC, $"NSAC - {cards[i]}");
+                    Assert.AreEqual(speeds[i], csd.Speed, $"Transfer speed - {cards[i]}");
+                    Assert.AreEqual(classes[i], csd.Classes, $"Classes - {cards[i]}");
+                    Assert.AreEqual(read_block_lengths[i], csd.ReadBlockLength, $"Read block length - {cards[i]}");
 
-                        Assert.AreEqual(read_partial_blocks[i], csd.ReadsPartialBlocks,
-                                        $"Reads partial blocks - {cards[i]}");
+                    Assert.AreEqual(read_partial_blocks[i], csd.ReadsPartialBlocks,
+                                    $"Reads partial blocks - {cards[i]}");
 
-                        Assert.AreEqual(write_misaligned_block[i], csd.WriteMisalignment,
-                                        $"Writes misaligned blocks - {cards[i]}");
+                    Assert.AreEqual(write_misaligned_block[i], csd.WriteMisalignment,
+                                    $"Writes misaligned blocks - {cards[i]}");
 
-                        Assert.AreEqual(read_misaligned_block[i], csd.ReadMisalignment,
-                                        $"Reads misaligned blocks - {cards[i]}");
+                    Assert.AreEqual(read_misaligned_block[i], csd.ReadMisalignment,
+                                    $"Reads misaligned blocks - {cards[i]}");
 
-                        Assert.AreEqual(dsr_implemented[i], csd.DSRImplemented, $"DSR implemented - {cards[i]}");
-                        Assert.AreEqual(card_sizes[i], csd.Size, $"Card size - {cards[i]}");
+                    Assert.AreEqual(dsr_implemented[i], csd.DSRImplemented, $"DSR implemented - {cards[i]}");
+                    Assert.AreEqual(card_sizes[i], csd.Size, $"Card size - {cards[i]}");
 
-                        Assert.AreEqual(min_read_current[i], csd.ReadCurrentAtVddMin,
-                                        $"Reading current at minimum Vdd - {cards[i]}");
+                    Assert.AreEqual(min_read_current[i], csd.ReadCurrentAtVddMin,
+                                    $"Reading current at minimum Vdd - {cards[i]}");
 
-                        Assert.AreEqual(max_read_current[i], csd.ReadCurrentAtVddMax,
-                                        $"Reading current at maximum Vdd - {cards[i]}");
+                    Assert.AreEqual(max_read_current[i], csd.ReadCurrentAtVddMax,
+                                    $"Reading current at maximum Vdd - {cards[i]}");
 
-                        Assert.AreEqual(min_write_current[i], csd.WriteCurrentAtVddMin,
-                                        $"Writing current at minimum Vdd - {cards[i]}");
+                    Assert.AreEqual(min_write_current[i], csd.WriteCurrentAtVddMin,
+                                    $"Writing current at minimum Vdd - {cards[i]}");
 
-                        Assert.AreEqual(max_write_current[i], csd.WriteCurrentAtVddMax,
-                                        $"Writing current at maximum Vdd - {cards[i]}");
+                    Assert.AreEqual(max_write_current[i], csd.WriteCurrentAtVddMax,
+                                    $"Writing current at maximum Vdd - {cards[i]}");
 
-                        Assert.AreEqual(size_multiplier[i], csd.SizeMultiplier, $"Card size multiplier - {cards[i]}");
+                    Assert.AreEqual(size_multiplier[i], csd.SizeMultiplier, $"Card size multiplier - {cards[i]}");
 
-                        Assert.AreEqual(erase_block_enable[i], csd.EraseBlockEnable,
-                                        $"Erase block enable - {cards[i]}");
+                    Assert.AreEqual(erase_block_enable[i], csd.EraseBlockEnable,
+                                    $"Erase block enable - {cards[i]}");
 
-                        Assert.AreEqual(erase_sector_sizes[i], csd.EraseSectorSize, $"Erase sector size - {cards[i]}");
+                    Assert.AreEqual(erase_sector_sizes[i], csd.EraseSectorSize, $"Erase sector size - {cards[i]}");
 
-                        Assert.AreEqual(write_protect_group_size[i], csd.WriteProtectGroupSize,
-                                        $"Write protect group size - {cards[i]}");
+                    Assert.AreEqual(write_protect_group_size[i], csd.WriteProtectGroupSize,
+                                    $"Write protect group size - {cards[i]}");
 
-                        Assert.AreEqual(write_protect_group_enable[i], csd.WriteProtectGroupEnable,
-                                        $"Write protect group enable - {cards[i]}");
+                    Assert.AreEqual(write_protect_group_enable[i], csd.WriteProtectGroupEnable,
+                                    $"Write protect group enable - {cards[i]}");
 
-                        Assert.AreEqual(r2w_factors[i], csd.WriteSpeedFactor, $"Read to write factor - {cards[i]}");
-                        Assert.AreEqual(file_format_group[i], csd.FileFormatGroup, $"File format group - {cards[i]}");
-                        Assert.AreEqual(copy[i], csd.Copy, $"Copy - {cards[i]}");
+                    Assert.AreEqual(r2w_factors[i], csd.WriteSpeedFactor, $"Read to write factor - {cards[i]}");
+                    Assert.AreEqual(file_format_group[i], csd.FileFormatGroup, $"File format group - {cards[i]}");
+                    Assert.AreEqual(copy[i], csd.Copy, $"Copy - {cards[i]}");
 
-                        Assert.AreEqual(permanent_write_protect[i], csd.PermanentWriteProtect,
-                                        $"Permanent write protect - {cards[i]}");
+                    Assert.AreEqual(permanent_write_protect[i], csd.PermanentWriteProtect,
+                                    $"Permanent write protect - {cards[i]}");
 
-                        Assert.AreEqual(temporary_write_protect[i], csd.TemporaryWriteProtect,
-                                        $"Temporary write protect - {cards[i]}");
+                    Assert.AreEqual(temporary_write_protect[i], csd.TemporaryWriteProtect,
+                                    $"Temporary write protect - {cards[i]}");
 
-                        Assert.AreEqual(file_format[i], csd.FileFormat, $"File format - {cards[i]}");
-                    });
-                }
+                    Assert.AreEqual(file_format[i], csd.FileFormat, $"File format - {cards[i]}");
+                });
             }
         }
     }
diff --git a/Aaru.Tests/Devices/SecureDigital/SCR.cs b/Aaru.Tests/Devices/SecureDigital/SCR.cs
index 2adbcabc0..4d8430eaf 100644
--- a/Aaru.Tests/Devices/SecureDigital/SCR.cs
+++ b/Aaru.Tests/Devices/SecureDigital/SCR.cs
@@ -5,167 +5,166 @@ using NUnit.Framework;
 
 // ReSharper disable InconsistentNaming
 
-namespace Aaru.Tests.Devices.SecureDigital
+namespace Aaru.Tests.Devices.SecureDigital;
+
+[TestFixture]
+public class SCR
 {
-    [TestFixture]
-    public class SCR
+    readonly string[] cards =
     {
-        readonly string[] cards =
-        {
-            "microsdhc_goodram_16gb", "microsdhc_kingston_4gb", "microsdhc_kingston_8gb", "microsdhc_kodak_2gb",
-            "microsdhc_nobrand_2gb", "microsdhc_sandisk_16gb", "microsdhc_sandisk_32gb", "microsdhc_trascend_2gb",
-            "sd_adata_4gb", "sdhc_fujifilm_4gb", "sdhc_kodak_4gb", "sdhc_pny_4gb", "sdhc_puntitos_4gb", "sd_pqi_64mb"
-        };
+        "microsdhc_goodram_16gb", "microsdhc_kingston_4gb", "microsdhc_kingston_8gb", "microsdhc_kodak_2gb",
+        "microsdhc_nobrand_2gb", "microsdhc_sandisk_16gb", "microsdhc_sandisk_32gb", "microsdhc_trascend_2gb",
+        "sd_adata_4gb", "sdhc_fujifilm_4gb", "sdhc_kodak_4gb", "sdhc_pny_4gb", "sdhc_puntitos_4gb", "sd_pqi_64mb"
+    };
 
-        readonly string[] scrs =
-        {
-            "0205808301000000", "02b500001c022102", "0235800001000000", "02a5000000000000", "02a500001c021402",
-            "0235800100000000", "0235804300000000", "0225800000000000", "0125000000000000", "0235800001000000",
-            "0235000000000000", "0235000000000000", "02b5800000000000", "00a5000008070302"
-        };
+    readonly string[] scrs =
+    {
+        "0205808301000000", "02b500001c022102", "0235800001000000", "02a5000000000000", "02a500001c021402",
+        "0235800100000000", "0235804300000000", "0225800000000000", "0125000000000000", "0235800001000000",
+        "0235000000000000", "0235000000000000", "02b5800000000000", "00a5000008070302"
+    };
 
-        readonly byte[] structure_version =
-        {
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
+    readonly byte[] structure_version =
+    {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
 
-        readonly byte[] specification_version =
-        {
-            2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 0
-        };
+    readonly byte[] specification_version =
+    {
+        2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 0
+    };
 
-        readonly bool[] data_stat_after_erase =
-        {
-            false, true, false, true, true, false, false, false, false, false, false, false, true, true
-        };
+    readonly bool[] data_stat_after_erase =
+    {
+        false, true, false, true, true, false, false, false, false, false, false, false, true, true
+    };
 
-        readonly byte[] sd_security =
-        {
-            0, 3, 3, 2, 2, 3, 3, 2, 2, 3, 3, 3, 3, 2
-        };
+    readonly byte[] sd_security =
+    {
+        0, 3, 3, 2, 2, 3, 3, 2, 2, 3, 3, 3, 3, 2
+    };
 
-        readonly byte[] sd_bus_widths =
-        {
-            5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5
-        };
+    readonly byte[] sd_bus_widths =
+    {
+        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5
+    };
 
-        readonly bool[] sd_spec3 =
-        {
-            true, false, true, false, false, true, true, true, false, true, false, false, true, false
-        };
+    readonly bool[] sd_spec3 =
+    {
+        true, false, true, false, false, true, true, true, false, true, false, false, true, false
+    };
 
-        readonly byte[] ex_security =
-        {
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-        };
+    readonly byte[] ex_security =
+    {
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
 
-        readonly bool[] sd_spec4 =
-        {
-            false, false, false, false, false, false, false, false, false, false, false, false, false, false
-        };
+    readonly bool[] sd_spec4 =
+    {
+        false, false, false, false, false, false, false, false, false, false, false, false, false, false
+    };
 
-        readonly byte[] sd_specx =
-        {
-            2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0
-        };
+    readonly byte[] sd_specx =
+    {
+        2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0
+    };
 
-        readonly byte[] cmd_support =
-        {
-            3, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 0, 0
-        };
+    readonly byte[] cmd_support =
+    {
+        3, 0, 0, 0, 0, 1, 3, 0, 0, 0, 0, 0, 0, 0
+    };
 
-        readonly byte[][] mfg =
+    readonly byte[][] mfg =
+    {
+        new byte[]
         {
-            new byte[]
-            {
-                0x01, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x1c, 0x02, 0x21, 0x02
-            },
-            new byte[]
-            {
-                0x01, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x00, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x1c, 0x02, 0x14, 0x02
-            },
-            new byte[]
-            {
-                0x00, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x00, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x00, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x00, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x01, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x00, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x00, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x00, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0x08, 0x07, 0x03, 0x02
-            }
-        };
+            0x01, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x1c, 0x02, 0x21, 0x02
+        },
+        new byte[]
+        {
+            0x01, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x00, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x1c, 0x02, 0x14, 0x02
+        },
+        new byte[]
+        {
+            0x00, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x00, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x00, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x00, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x01, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x00, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x00, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x00, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0x08, 0x07, 0x03, 0x02
+        }
+    };
 
-        [Test]
-        public void Test()
+    [Test]
+    public void Test()
+    {
+        for(int i = 0; i < cards.Length; i++)
         {
-            for(int i = 0; i < cards.Length; i++)
+            using(new AssertionScope())
             {
-                using(new AssertionScope())
+                Assert.Multiple(() =>
                 {
-                    Assert.Multiple(() =>
-                    {
-                        int count = Marshal.ConvertFromHexAscii(scrs[i], out byte[] response);
-                        Assert.AreEqual(8, count, $"Size - {cards[i]}");
-                        Decoders.SecureDigital.SCR scr = Decoders.SecureDigital.Decoders.DecodeSCR(response);
-                        Assert.IsNotNull(scr, $"Decoded - {cards[i]}");
-                        Assert.AreEqual(structure_version[i], scr.Structure, $"Version - {cards[i]}");
-                        Assert.AreEqual(specification_version[i], scr.Spec, $"Specification version - {cards[i]}");
+                    int count = Marshal.ConvertFromHexAscii(scrs[i], out byte[] response);
+                    Assert.AreEqual(8, count, $"Size - {cards[i]}");
+                    Decoders.SecureDigital.SCR scr = Decoders.SecureDigital.Decoders.DecodeSCR(response);
+                    Assert.IsNotNull(scr, $"Decoded - {cards[i]}");
+                    Assert.AreEqual(structure_version[i], scr.Structure, $"Version - {cards[i]}");
+                    Assert.AreEqual(specification_version[i], scr.Spec, $"Specification version - {cards[i]}");
 
-                        Assert.AreEqual(data_stat_after_erase[i], scr.DataStatusAfterErase,
-                                        $"Data stat after erase - {cards[i]}");
+                    Assert.AreEqual(data_stat_after_erase[i], scr.DataStatusAfterErase,
+                                    $"Data stat after erase - {cards[i]}");
 
-                        Assert.AreEqual(sd_security[i], scr.Security, $"Security - {cards[i]}");
-                        Assert.AreEqual((BusWidth)sd_bus_widths[i], scr.BusWidth, $"Bus widths - {cards[i]}");
-                        Assert.AreEqual(sd_spec3[i], scr.Spec3, $"Spec 3 - {cards[i]}");
-                        Assert.AreEqual(ex_security[i], scr.ExtendedSecurity, $"Extended security - {cards[i]}");
-                        Assert.AreEqual(sd_spec4[i], scr.Spec4, $"Spec 4 - {cards[i]}");
-                        Assert.AreEqual(sd_specx[i], scr.SpecX, $"Spec X - {cards[i]}");
+                    Assert.AreEqual(sd_security[i], scr.Security, $"Security - {cards[i]}");
+                    Assert.AreEqual((BusWidth)sd_bus_widths[i], scr.BusWidth, $"Bus widths - {cards[i]}");
+                    Assert.AreEqual(sd_spec3[i], scr.Spec3, $"Spec 3 - {cards[i]}");
+                    Assert.AreEqual(ex_security[i], scr.ExtendedSecurity, $"Extended security - {cards[i]}");
+                    Assert.AreEqual(sd_spec4[i], scr.Spec4, $"Spec 4 - {cards[i]}");
+                    Assert.AreEqual(sd_specx[i], scr.SpecX, $"Spec X - {cards[i]}");
 
-                        Assert.AreEqual((CommandSupport)cmd_support[i], scr.CommandSupport,
-                                        $"Command support - {cards[i]}");
+                    Assert.AreEqual((CommandSupport)cmd_support[i], scr.CommandSupport,
+                                    $"Command support - {cards[i]}");
 
-                        Assert.AreEqual(mfg[i], scr.ManufacturerReserved, $"Manufacturer reserved - {cards[i]}");
-                    });
-                }
+                    Assert.AreEqual(mfg[i], scr.ManufacturerReserved, $"Manufacturer reserved - {cards[i]}");
+                });
             }
         }
     }
diff --git a/Aaru.Tests/Encoding.cs b/Aaru.Tests/Encoding.cs
index 29636cdac..95cc2d4a7 100644
--- a/Aaru.Tests/Encoding.cs
+++ b/Aaru.Tests/Encoding.cs
@@ -1,12 +1,11 @@
 using System.Text;
 using NUnit.Framework;
 
-namespace Aaru.Tests
+namespace Aaru.Tests;
+
+[SetUpFixture]
+public class Tests
 {
-    [SetUpFixture]
-    public class Tests
-    {
-        [OneTimeSetUp]
-        public void EnableEncodings() => Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-    }
+    [OneTimeSetUp]
+    public void EnableEncodings() => Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/ADFS.cs b/Aaru.Tests/Filesystems/ADFS.cs
index 30b83abff..fca42f221 100644
--- a/Aaru.Tests/Filesystems/ADFS.cs
+++ b/Aaru.Tests/Filesystems/ADFS.cs
@@ -32,125 +32,124 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Adfs : FilesystemTest
 {
-    [TestFixture]
-    public class Adfs : FilesystemTest
+    public Adfs() : base("Acorn Advanced Disc Filing System") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+                                                      "Acorn Advanced Disc Filing System");
+
+    public override IFilesystem Plugin     => new AcornADFS();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Adfs() : base("Acorn Advanced Disc Filing System") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
-                                                          "Acorn Advanced Disc Filing System");
-
-        public override IFilesystem Plugin     => new AcornADFS();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "adfs_d.adf.lz",
-                MediaType    = MediaType.ACORN_35_DS_DD,
-                Sectors      = 800,
-                SectorSize   = 1024,
-                Clusters     = 800,
-                ClusterSize  = 1024,
-                VolumeName   = "ADFSD",
-                VolumeSerial = "3E48"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "adfs_e.adf.lz",
-                MediaType    = MediaType.ACORN_35_DS_DD,
-                Sectors      = 800,
-                SectorSize   = 1024,
-                Clusters     = 800,
-                ClusterSize  = 1024,
-                VolumeName   = "ADFSE     ",
-                VolumeSerial = "E13A"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "adfs_f.adf.lz",
-                MediaType   = MediaType.ACORN_35_DS_HD,
-                Sectors     = 1600,
-                SectorSize  = 1024,
-                Clusters    = 1600,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile     = "adfs_e+.adf.lz",
-                MediaType    = MediaType.ACORN_35_DS_DD,
-                Sectors      = 800,
-                SectorSize   = 1024,
-                Clusters     = 800,
-                ClusterSize  = 1024,
-                VolumeName   = "ADFSE+    ",
-                VolumeSerial = "1142"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "adfs_f+.adf.lz",
-                MediaType   = MediaType.ACORN_35_DS_HD,
-                Sectors     = 1600,
-                SectorSize  = 1024,
-                Clusters    = 1600,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile     = "adfs_s.adf.lz",
-                MediaType    = MediaType.ACORN_525_SS_DD_40,
-                Sectors      = 640,
-                SectorSize   = 256,
-                Clusters     = 640,
-                ClusterSize  = 256,
-                VolumeName   = "$",
-                VolumeSerial = "F20D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "adfs_m.adf.lz",
-                MediaType    = MediaType.ACORN_525_SS_DD_80,
-                Sectors      = 1280,
-                SectorSize   = 256,
-                Clusters     = 1280,
-                ClusterSize  = 256,
-                VolumeName   = "$",
-                VolumeSerial = "D6CA"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "adfs_l.adf.lz",
-                MediaType    = MediaType.ACORN_525_DS_DD,
-                Sectors      = 2560,
-                SectorSize   = 256,
-                Clusters     = 2560,
-                ClusterSize  = 256,
-                VolumeName   = "$",
-                VolumeSerial = "0CA6"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "hdd_old.hdf.lz",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 78336,
-                SectorSize   = 256,
-                Clusters     = 78336,
-                ClusterSize  = 256,
-                VolumeName   = "VolLablOld",
-                VolumeSerial = "080E"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "hdd_new.hdf.lz",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 78336,
-                SectorSize  = 256,
-                Clusters    = 78336,
-                ClusterSize = 256
-            }
-        };
-    }
+            TestFile     = "adfs_d.adf.lz",
+            MediaType    = MediaType.ACORN_35_DS_DD,
+            Sectors      = 800,
+            SectorSize   = 1024,
+            Clusters     = 800,
+            ClusterSize  = 1024,
+            VolumeName   = "ADFSD",
+            VolumeSerial = "3E48"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "adfs_e.adf.lz",
+            MediaType    = MediaType.ACORN_35_DS_DD,
+            Sectors      = 800,
+            SectorSize   = 1024,
+            Clusters     = 800,
+            ClusterSize  = 1024,
+            VolumeName   = "ADFSE     ",
+            VolumeSerial = "E13A"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "adfs_f.adf.lz",
+            MediaType   = MediaType.ACORN_35_DS_HD,
+            Sectors     = 1600,
+            SectorSize  = 1024,
+            Clusters    = 1600,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile     = "adfs_e+.adf.lz",
+            MediaType    = MediaType.ACORN_35_DS_DD,
+            Sectors      = 800,
+            SectorSize   = 1024,
+            Clusters     = 800,
+            ClusterSize  = 1024,
+            VolumeName   = "ADFSE+    ",
+            VolumeSerial = "1142"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "adfs_f+.adf.lz",
+            MediaType   = MediaType.ACORN_35_DS_HD,
+            Sectors     = 1600,
+            SectorSize  = 1024,
+            Clusters    = 1600,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile     = "adfs_s.adf.lz",
+            MediaType    = MediaType.ACORN_525_SS_DD_40,
+            Sectors      = 640,
+            SectorSize   = 256,
+            Clusters     = 640,
+            ClusterSize  = 256,
+            VolumeName   = "$",
+            VolumeSerial = "F20D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "adfs_m.adf.lz",
+            MediaType    = MediaType.ACORN_525_SS_DD_80,
+            Sectors      = 1280,
+            SectorSize   = 256,
+            Clusters     = 1280,
+            ClusterSize  = 256,
+            VolumeName   = "$",
+            VolumeSerial = "D6CA"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "adfs_l.adf.lz",
+            MediaType    = MediaType.ACORN_525_DS_DD,
+            Sectors      = 2560,
+            SectorSize   = 256,
+            Clusters     = 2560,
+            ClusterSize  = 256,
+            VolumeName   = "$",
+            VolumeSerial = "0CA6"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "hdd_old.hdf.lz",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 78336,
+            SectorSize   = 256,
+            Clusters     = 78336,
+            ClusterSize  = 256,
+            VolumeName   = "VolLablOld",
+            VolumeSerial = "080E"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "hdd_new.hdf.lz",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 78336,
+            SectorSize  = 256,
+            Clusters    = 78336,
+            ClusterSize = 256
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AFFS/APM.cs b/Aaru.Tests/Filesystems/AFFS/APM.cs
index f6a713fcf..5349670d5 100644
--- a/Aaru.Tests/Filesystems/AFFS/APM.cs
+++ b/Aaru.Tests/Filesystems/AFFS/APM.cs
@@ -32,53 +32,52 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AFFS
+namespace Aaru.Tests.Filesystems.AFFS;
+
+[TestFixture]
+public class APM : FilesystemTest
 {
-    [TestFixture]
-    public class APM : FilesystemTest
+    public APM() : base("Amiga FFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (APM)");
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("Amiga FFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (APM)");
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262018,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "1D930192"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13_cache.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262018,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "1D9105B0"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262018,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "1D93031D"
-            }
-        };
-    }
+            TestFile     = "morphos_3.13.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262018,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "1D930192"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "morphos_3.13_cache.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262018,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "1D9105B0"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "morphos_3.13_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262018,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "1D93031D"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs
index e593c8721..ffe4874e7 100644
--- a/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs
+++ b/Aaru.Tests/Filesystems/AFFS/MBR+RDB.cs
@@ -32,42 +32,41 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AFFS
+namespace Aaru.Tests.Filesystems.AFFS;
+
+[TestFixture]
+public class MBR_RDB : FilesystemTest
 {
-    [TestFixture]
-    public class MBR_RDB : FilesystemTest
+    public MBR_RDB() : base("Amiga FFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (MBR+RDB)");
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR_RDB() : base("Amiga FFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (MBR+RDB)");
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "aros.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 406224,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A58348CE"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "aros_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 406224,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A5833CD0"
-            }
-        };
-    }
+            TestFile     = "aros.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 406224,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A58348CE"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "aros_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 406224,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A5833CD0"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AFFS/MBR.cs b/Aaru.Tests/Filesystems/AFFS/MBR.cs
index 175871bab..c06a91064 100644
--- a/Aaru.Tests/Filesystems/AFFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/AFFS/MBR.cs
@@ -32,42 +32,41 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AFFS
+namespace Aaru.Tests.Filesystems.AFFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("Amiga FFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (MBR)");
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("Amiga FFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (MBR)");
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "aros.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 408240,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A582DCA4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "aros_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 408240,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A582BC91"
-            }
-        };
-    }
+            TestFile     = "aros.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 408240,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A582DCA4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "aros_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 408240,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A582BC91"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AFFS/RDB.cs b/Aaru.Tests/Filesystems/AFFS/RDB.cs
index 21affae56..ef940307d 100644
--- a/Aaru.Tests/Filesystems/AFFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/AFFS/RDB.cs
@@ -32,130 +32,129 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AFFS
+namespace Aaru.Tests.Filesystems.AFFS;
+
+[TestFixture]
+public class RDB : FilesystemTest
 {
-    [TestFixture]
-    public class RDB : FilesystemTest
+    public RDB() : base("Amiga FFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (RDB)");
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public RDB() : base("Amiga FFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System (RDB)");
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_3.9.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Clusters     = 510032,
-                ClusterSize  = 1024,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A56D0F5C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_3.9_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Clusters     = 510032,
-                ClusterSize  = 1024,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A56D049C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "aros.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 407232,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A58307A9"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "aros_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 407232,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A58304BE"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_4.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Clusters     = 511040,
-                ClusterSize  = 1024,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A56CC7EE"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_4.0_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Clusters     = 511040,
-                ClusterSize  = 1024,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A56CDDC4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_4.0_cache.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Clusters     = 511040,
-                ClusterSize  = 1024,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A56CC133"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 261936,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "1D93009A"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13_cache.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 261936,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "1D9107DA"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 261936,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "1D92FD23"
-            }
-        };
-    }
+            TestFile     = "amigaos_3.9.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Clusters     = 510032,
+            ClusterSize  = 1024,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A56D0F5C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "amigaos_3.9_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Clusters     = 510032,
+            ClusterSize  = 1024,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A56D049C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "aros.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 407232,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A58307A9"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "aros_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 407232,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A58304BE"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "amigaos_4.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Clusters     = 511040,
+            ClusterSize  = 1024,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A56CC7EE"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "amigaos_4.0_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Clusters     = 511040,
+            ClusterSize  = 1024,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A56CDDC4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "amigaos_4.0_cache.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Clusters     = 511040,
+            ClusterSize  = 1024,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A56CC133"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "morphos_3.13.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 261936,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "1D93009A"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "morphos_3.13_cache.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 261936,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "1D9107DA"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "morphos_3.13_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 261936,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "1D92FD23"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AFFS/Whole.cs b/Aaru.Tests/Filesystems/AFFS/Whole.cs
index 30bd59220..e22e1a72f 100644
--- a/Aaru.Tests/Filesystems/AFFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/AFFS/Whole.cs
@@ -32,43 +32,42 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AFFS
+namespace Aaru.Tests.Filesystems.AFFS;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("Amiga FFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System");
+
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("Amiga FFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System");
-
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_3.9.adf.lz",
-                MediaType    = MediaType.CBM_AMIGA_35_DD,
-                Sectors      = 1760,
-                SectorSize   = 512,
-                Clusters     = 1760,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A5D9FAE2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_3.9_intl.adf.lz",
-                MediaType    = MediaType.CBM_AMIGA_35_DD,
-                Sectors      = 1760,
-                SectorSize   = 512,
-                Clusters     = 1760,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A5DA0CC9"
-            }
-        };
-    }
+            TestFile     = "amigaos_3.9.adf.lz",
+            MediaType    = MediaType.CBM_AMIGA_35_DD,
+            Sectors      = 1760,
+            SectorSize   = 512,
+            Clusters     = 1760,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A5D9FAE2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "amigaos_3.9_intl.adf.lz",
+            MediaType    = MediaType.CBM_AMIGA_35_DD,
+            Sectors      = 1760,
+            SectorSize   = 512,
+            Clusters     = 1760,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A5DA0CC9"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AFFS2/APM.cs b/Aaru.Tests/Filesystems/AFFS2/APM.cs
index ac497c4d8..61cf22099 100644
--- a/Aaru.Tests/Filesystems/AFFS2/APM.cs
+++ b/Aaru.Tests/Filesystems/AFFS2/APM.cs
@@ -32,32 +32,31 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AFFS2
+namespace Aaru.Tests.Filesystems.AFFS2;
+
+[TestFixture]
+public class APM : FilesystemTest
 {
-    [TestFixture]
-    public class APM : FilesystemTest
+    public APM() : base("Amiga FFS2") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System 2 (APM)");
+
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("Amiga FFS2") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System 2 (APM)");
-
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262018,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "6144B870"
-            }
-        };
-    }
+            TestFile     = "morphos_3.13.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262018,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "6144B870"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AFFS2/RDB.cs b/Aaru.Tests/Filesystems/AFFS2/RDB.cs
index 0d6776339..4751ae42f 100644
--- a/Aaru.Tests/Filesystems/AFFS2/RDB.cs
+++ b/Aaru.Tests/Filesystems/AFFS2/RDB.cs
@@ -32,43 +32,42 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AFFS2
+namespace Aaru.Tests.Filesystems.AFFS2;
+
+[TestFixture]
+public class RDB : FilesystemTest
 {
-    [TestFixture]
-    public class RDB : FilesystemTest
+    public RDB() : base("Amiga FFS2") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System 2 (RDB)");
+
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public RDB() : base("Amiga FFS2") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Fast File System 2 (RDB)");
-
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_4.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Clusters     = 511040,
-                ClusterSize  = 1024,
-                VolumeName   = "Volume label",
-                VolumeSerial = "611D85E5"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 261936,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "D943AA14"
-            }
-        };
-    }
+            TestFile     = "amigaos_4.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Clusters     = 511040,
+            ClusterSize  = 1024,
+            VolumeName   = "Volume label",
+            VolumeSerial = "611D85E5"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "morphos_3.13.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 261936,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "D943AA14"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AFS/MBR.cs b/Aaru.Tests/Filesystems/AFS/MBR.cs
index 4f03e371d..5e0ea64a5 100644
--- a/Aaru.Tests/Filesystems/AFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/AFS/MBR.cs
@@ -32,30 +32,29 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AFS
+namespace Aaru.Tests.Filesystems.AFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("Acer Fast Filesystem") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Acer File System (MBR)");
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("Acer Fast Filesystem") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Acer File System (MBR)");
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 510048,
-                ClusterSize = 1024,
-                VolumeName  = "d1150"
-            }
-        };
-    }
+            TestFile    = "scoopenserver_5.0.7hw.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 510048,
+            ClusterSize = 1024,
+            VolumeName  = "d1150"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AFS/Whole.cs b/Aaru.Tests/Filesystems/AFS/Whole.cs
index 551bcfb49..56816fcc0 100644
--- a/Aaru.Tests/Filesystems/AFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/AFS/Whole.cs
@@ -32,70 +32,69 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AFS
+namespace Aaru.Tests.Filesystems.AFS;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("Acer Fast Filesystem") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Acer File System");
+
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("Acer Fast Filesystem") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Acer File System");
-
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
-                MediaType   = MediaType.DMF,
-                Sectors     = 3360,
-                SectorSize  = 512,
-                Clusters    = 1680,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 1200,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
-                MediaType   = MediaType.ECMA_147,
-                Sectors     = 5760,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            }
-        };
-    }
+            TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
+            MediaType   = MediaType.DMF,
+            Sectors     = 3360,
+            SectorSize  = 512,
+            Clusters    = 1680,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 1200,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
+            MediaType   = MediaType.ECMA_147,
+            Sectors     = 5760,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs
index 7868bc3ee..0aa4de562 100644
--- a/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs
+++ b/Aaru.Tests/Filesystems/AOFS/MBR+RDB.cs
@@ -32,42 +32,41 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AOFS
+namespace Aaru.Tests.Filesystems.AOFS;
+
+[TestFixture]
+public class MBR_RDB : FilesystemTest
 {
-    [TestFixture]
-    public class MBR_RDB : FilesystemTest
+    public MBR_RDB() : base("Amiga OFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System (MBR+RDB)");
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR_RDB() : base("Amiga OFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System (MBR+RDB)");
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "aros.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 406224,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A5833C5B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "aros_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 406224,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A5833085"
-            }
-        };
-    }
+            TestFile     = "aros.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 406224,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A5833C5B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "aros_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 406224,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A5833085"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AOFS/MBR.cs b/Aaru.Tests/Filesystems/AOFS/MBR.cs
index 392b12002..aaf15a168 100644
--- a/Aaru.Tests/Filesystems/AOFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/AOFS/MBR.cs
@@ -32,42 +32,41 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AOFS
+namespace Aaru.Tests.Filesystems.AOFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("Amiga OFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System (MBR)");
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("Amiga OFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System (MBR)");
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "aros.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 408240,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A582C90C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "aros_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 408240,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A582CE0D"
-            }
-        };
-    }
+            TestFile     = "aros.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 408240,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A582C90C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "aros_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 408240,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A582CE0D"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AOFS/RDB.cs b/Aaru.Tests/Filesystems/AOFS/RDB.cs
index 4fbe67049..ba09a7b42 100644
--- a/Aaru.Tests/Filesystems/AOFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/AOFS/RDB.cs
@@ -32,64 +32,63 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AOFS
+namespace Aaru.Tests.Filesystems.AOFS;
+
+[TestFixture]
+public class RDB : FilesystemTest
 {
-    [TestFixture]
-    public class RDB : FilesystemTest
+    public RDB() : base("Amiga OFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System (RDB)");
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public RDB() : base("Amiga OFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System (RDB)");
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_3.9.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Clusters     = 510032,
-                ClusterSize  = 1024,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A56D13BB"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_3.9_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Clusters     = 510032,
-                ClusterSize  = 1024,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A56D0415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "aros.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 407232,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A582F3A0"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "aros_intl.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 407232,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A5830B06"
-            }
-        };
-    }
+            TestFile     = "amigaos_3.9.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Clusters     = 510032,
+            ClusterSize  = 1024,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A56D13BB"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "amigaos_3.9_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Clusters     = 510032,
+            ClusterSize  = 1024,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A56D0415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "aros.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 407232,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A582F3A0"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "aros_intl.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 407232,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A5830B06"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/AOFS/Whole.cs b/Aaru.Tests/Filesystems/AOFS/Whole.cs
index ddcbd52a6..8e659922a 100644
--- a/Aaru.Tests/Filesystems/AOFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/AOFS/Whole.cs
@@ -32,43 +32,42 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.AOFS
+namespace Aaru.Tests.Filesystems.AOFS;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("Amiga OFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System");
+
+    public override IFilesystem Plugin     => new AmigaDOSPlugin();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("Amiga OFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Amiga Old File System");
-
-        public override IFilesystem Plugin     => new AmigaDOSPlugin();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_3.9.adf.lz",
-                MediaType    = MediaType.CBM_AMIGA_35_DD,
-                Sectors      = 1760,
-                SectorSize   = 512,
-                Clusters     = 1760,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A5D9FE71"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_3.9_intl.adf.lz",
-                MediaType    = MediaType.CBM_AMIGA_35_DD,
-                Sectors      = 1760,
-                SectorSize   = 512,
-                Clusters     = 1760,
-                ClusterSize  = 512,
-                VolumeName   = "Volume label",
-                VolumeSerial = "A5D9F14F"
-            }
-        };
-    }
+            TestFile     = "amigaos_3.9.adf.lz",
+            MediaType    = MediaType.CBM_AMIGA_35_DD,
+            Sectors      = 1760,
+            SectorSize   = 512,
+            Clusters     = 1760,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A5D9FE71"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "amigaos_3.9_intl.adf.lz",
+            MediaType    = MediaType.CBM_AMIGA_35_DD,
+            Sectors      = 1760,
+            SectorSize   = 512,
+            Clusters     = 1760,
+            ClusterSize  = 512,
+            VolumeName   = "Volume label",
+            VolumeSerial = "A5D9F14F"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/Atheos.cs b/Aaru.Tests/Filesystems/Atheos.cs
index e1c830a52..aba1df6c4 100644
--- a/Aaru.Tests/Filesystems/Atheos.cs
+++ b/Aaru.Tests/Filesystems/Atheos.cs
@@ -32,29 +32,28 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Atheos : FilesystemTest
 {
-    [TestFixture]
-    public class Atheos : FilesystemTest
+    public Atheos() : base("AtheOS filesystem") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "AtheOS (MBR)");
+    public override IFilesystem Plugin     => new AtheOS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Atheos() : base("AtheOS filesystem") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "AtheOS (MBR)");
-        public override IFilesystem Plugin     => new AtheOS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "syllable_0.6.7.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 4194304,
-                SectorSize  = 512,
-                Clusters    = 2097120,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "syllable_0.6.7.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 4194304,
+            SectorSize  = 512,
+            Clusters    = 2097120,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/BeFS/APM.cs b/Aaru.Tests/Filesystems/BeFS/APM.cs
index 91c002f3b..2b87e8f33 100644
--- a/Aaru.Tests/Filesystems/BeFS/APM.cs
+++ b/Aaru.Tests/Filesystems/BeFS/APM.cs
@@ -31,50 +31,49 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.BeFS
+namespace Aaru.Tests.Filesystems.BeFS;
+
+[TestFixture]
+public class APM : FilesystemTest
 {
-    [TestFixture]
-    public class APM : FilesystemTest
+    public APM() : base("BeFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System (APM)");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("BeFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System (APM)");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "beos_r3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1572864,
-                SectorSize  = 512,
-                Clusters    = 786336,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "beos_r4.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130976,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "beos_r5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130976,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "beos_r3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1572864,
+            SectorSize  = 512,
+            Clusters    = 786336,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "beos_r4.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130976,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "beos_r5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130976,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/BeFS/GPT.cs b/Aaru.Tests/Filesystems/BeFS/GPT.cs
index 7cdddd6f0..93bfb5d7f 100644
--- a/Aaru.Tests/Filesystems/BeFS/GPT.cs
+++ b/Aaru.Tests/Filesystems/BeFS/GPT.cs
@@ -31,30 +31,29 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.BeFS
+namespace Aaru.Tests.Filesystems.BeFS;
+
+[TestFixture]
+public class GPT : FilesystemTest
 {
-    [TestFixture]
-    public class GPT : FilesystemTest
+    public GPT() : base("BeFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System (GPT)");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public GPT() : base("BeFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System (GPT)");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "haiku_hrev51259.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65024,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "haiku_hrev51259.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65024,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/BeFS/MBR.cs b/Aaru.Tests/Filesystems/BeFS/MBR.cs
index 8398291bf..ef9b8eb18 100644
--- a/Aaru.Tests/Filesystems/BeFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/BeFS/MBR.cs
@@ -31,100 +31,99 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.BeFS
+namespace Aaru.Tests.Filesystems.BeFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("BeFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System (MBR)");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("BeFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System (MBR)");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "beos_r3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                VolumeName  = "Big Volume Label Goes Big Brrrr"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "beos_r4.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130536,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "haiku_hrev51259.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65024,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "haiku_hrev51259_8k.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 16256,
-                ClusterSize = 8192,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "syllable_0.6.7.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 2097152,
-                SectorSize  = 512,
-                Clusters    = 524272,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "beos_r5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130536,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "beos_r5_2k.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65268,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label 2K"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "beos_r5_4k.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32634,
-                ClusterSize = 4096,
-                VolumeName  = "Volume label 4K"
-            }
-        };
-    }
+            TestFile    = "beos_r3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            VolumeName  = "Big Volume Label Goes Big Brrrr"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "beos_r4.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130536,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "haiku_hrev51259.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65024,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "haiku_hrev51259_8k.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 16256,
+            ClusterSize = 8192,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "syllable_0.6.7.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 2097152,
+            SectorSize  = 512,
+            Clusters    = 524272,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "beos_r5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130536,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "beos_r5_2k.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65268,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label 2K"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "beos_r5_4k.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32634,
+            ClusterSize = 4096,
+            VolumeName  = "Volume label 4K"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/BeFS/Whole.cs b/Aaru.Tests/Filesystems/BeFS/Whole.cs
index 3310db0cc..6f5691b58 100644
--- a/Aaru.Tests/Filesystems/BeFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/BeFS/Whole.cs
@@ -31,50 +31,49 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.BeFS
+namespace Aaru.Tests.Filesystems.BeFS;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("BeFS") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("BeFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Be File System");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.BeFS();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "beos_r3.1.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                VolumeName  = "volume label goes brrrr"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "beos_r4.5.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "beos_r5.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "beos_r3.1.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            VolumeName  = "volume label goes brrrr"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "beos_r4.5.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "beos_r5.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/COHERENT/MBR.cs b/Aaru.Tests/Filesystems/COHERENT/MBR.cs
index ae19e668b..6986ddfaa 100644
--- a/Aaru.Tests/Filesystems/COHERENT/MBR.cs
+++ b/Aaru.Tests/Filesystems/COHERENT/MBR.cs
@@ -32,30 +32,29 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.COHERENT
+namespace Aaru.Tests.Filesystems.COHERENT;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("Coherent fs") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "COHERENT filesystem (MBR)");
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("Coherent fs") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "COHERENT filesystem (MBR)");
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "coherentunix_4.2.10.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 510048,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "coherentunix_4.2.10.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 510048,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/COHERENT/Whole.cs b/Aaru.Tests/Filesystems/COHERENT/Whole.cs
index 7ef13f56a..35a275c1f 100644
--- a/Aaru.Tests/Filesystems/COHERENT/Whole.cs
+++ b/Aaru.Tests/Filesystems/COHERENT/Whole.cs
@@ -32,60 +32,59 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.COHERENT
+namespace Aaru.Tests.Filesystems.COHERENT;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("Coherent fs") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "COHERENT filesystem");
+
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("Coherent fs") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "COHERENT filesystem");
-
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "coherentunix_4.2.10_dsdd.img.lz",
-                MediaType   = MediaType.DOS_525_DS_DD_9,
-                Sectors     = 720,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 512,
-                VolumeName  = "noname"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "coherentunix_4.2.10_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 2400,
-                ClusterSize = 512,
-                VolumeName  = "noname"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "coherentunix_4.2.10_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 512,
-                VolumeName  = "noname"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "coherentunix_4.2.10_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                VolumeName  = "noname"
-            }
-        };
-    }
+            TestFile    = "coherentunix_4.2.10_dsdd.img.lz",
+            MediaType   = MediaType.DOS_525_DS_DD_9,
+            Sectors     = 720,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 512,
+            VolumeName  = "noname"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "coherentunix_4.2.10_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 2400,
+            ClusterSize = 512,
+            VolumeName  = "noname"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "coherentunix_4.2.10_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 512,
+            VolumeName  = "noname"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "coherentunix_4.2.10_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            VolumeName  = "noname"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/AMSDOS.cs b/Aaru.Tests/Filesystems/CPM/AMSDOS.cs
index fa1c85332..794464758 100644
--- a/Aaru.Tests/Filesystems/CPM/AMSDOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/AMSDOS.cs
@@ -30,78 +30,77 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class AMSDOS : FilesystemTest
 {
-    [TestFixture]
-    public class AMSDOS : FilesystemTest
+    public AMSDOS() : base("CP/M") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "AMSDOS");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public AMSDOS() : base("CP/M") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "AMSDOS");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "data_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Clusters    = 180,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "data_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Clusters    = 180,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ibm_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 320,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 155,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ibm_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 155,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "system_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 170,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "system_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 170,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "data_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Clusters    = 180,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "data_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Clusters    = 180,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ibm_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 320,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 155,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ibm_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 155,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "system_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 170,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "system_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 170,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs b/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs
index f70f75a6c..c51b30a79 100644
--- a/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs
+++ b/Aaru.Tests/Filesystems/CPM/AmstradCPM.cs
@@ -30,60 +30,59 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class AmstradCPM : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class AmstradCPM : ReadOnlyFilesystemTest
+    public AmstradCPM() : base("CP/M") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Amstrad CPM");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public AmstradCPM() : base("CP/M") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Amstrad CPM");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "data_filename.imd",
-                MediaType   = MediaType.DOS_525_SS_DD_9,
-                Bootable    = true,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Clusters    = 171,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "data_files.imd",
-                MediaType   = MediaType.DOS_525_SS_DD_9,
-                Bootable    = true,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Clusters    = 171,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "system_filename.imd",
-                MediaType   = MediaType.DOS_525_SS_DD_9,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 171,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "system_files.imd",
-                MediaType   = MediaType.DOS_525_SS_DD_9,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 171,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "data_filename.imd",
+            MediaType   = MediaType.DOS_525_SS_DD_9,
+            Bootable    = true,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Clusters    = 171,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "data_files.imd",
+            MediaType   = MediaType.DOS_525_SS_DD_9,
+            Bootable    = true,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Clusters    = 171,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "system_filename.imd",
+            MediaType   = MediaType.DOS_525_SS_DD_9,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 171,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "system_files.imd",
+            MediaType   = MediaType.DOS_525_SS_DD_9,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 171,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs b/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs
index 1a72e9b89..a6ab4e2c6 100644
--- a/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs
+++ b/Aaru.Tests/Filesystems/CPM/AmstradCPMPlus.cs
@@ -30,118 +30,117 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class AmstradCPMPlus : FilesystemTest
 {
-    [TestFixture]
-    public class AmstradCPMPlus : FilesystemTest
+    public AmstradCPMPlus() : base("CP/M") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Amstrad CPM+");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public AmstradCPMPlus() : base("CP/M") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Amstrad CPM+");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "data_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Clusters    = 180,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "data_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Clusters    = 180,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "system_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 171,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "system_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 171,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcw_1.4_filename.aif",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 359,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcw_1.4_files.aif",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 359,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcw_2.5_filename.aif",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 356,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcw_2.5_files.aif",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 356,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "spectrum_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 359,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "spectrum_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 359,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "data_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Clusters    = 180,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "data_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Clusters    = 180,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "system_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 171,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "system_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 171,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcw_1.4_filename.aif",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 359,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcw_1.4_files.aif",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 359,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcw_2.5_filename.aif",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 356,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcw_2.5_files.aif",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 356,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "spectrum_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 359,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "spectrum_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 359,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/Attache.cs b/Aaru.Tests/Filesystems/CPM/Attache.cs
index 4dbcf3091..4cd62dd6f 100644
--- a/Aaru.Tests/Filesystems/CPM/Attache.cs
+++ b/Aaru.Tests/Filesystems/CPM/Attache.cs
@@ -30,39 +30,38 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class Attache : FilesystemTest
 {
-    [TestFixture]
-    public class Attache : FilesystemTest
+    public Attache() : base("CP/M") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Otrona Attaché");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Attache() : base("CP/M") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Otrona Attaché");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "filename.imd",
-                MediaType   = MediaType.Unknown,
-                Sectors     = 790,
-                SectorSize  = 512,
-                Clusters    = 395,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "files.imd",
-                MediaType   = MediaType.Unknown,
-                Sectors     = 790,
-                SectorSize  = 512,
-                Clusters    = 395,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "filename.imd",
+            MediaType   = MediaType.Unknown,
+            Sectors     = 790,
+            SectorSize  = 512,
+            Clusters    = 395,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "files.imd",
+            MediaType   = MediaType.Unknown,
+            Sectors     = 790,
+            SectorSize  = 512,
+            Clusters    = 395,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/Bondwell.cs b/Aaru.Tests/Filesystems/CPM/Bondwell.cs
index 14a7a380b..37afa4049 100644
--- a/Aaru.Tests/Filesystems/CPM/Bondwell.cs
+++ b/Aaru.Tests/Filesystems/CPM/Bondwell.cs
@@ -30,40 +30,39 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class Bondwell : FilesystemTest
 {
-    [TestFixture]
-    public class Bondwell : FilesystemTest
+    public Bondwell() : base("CP/M") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Bondwell");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Bondwell() : base("CP/M") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Bondwell");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "filename.imd",
-                MediaType   = MediaType.Unknown,
-                Sectors     = 1440,
-                SectorSize  = 256,
-                Bootable    = true,
-                Clusters    = 174,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "files.imd",
-                MediaType   = MediaType.Unknown,
-                Sectors     = 1440,
-                SectorSize  = 256,
-                Bootable    = true,
-                Clusters    = 174,
-                ClusterSize = 2048
-            }
-        };
-    }
+            TestFile    = "filename.imd",
+            MediaType   = MediaType.Unknown,
+            Sectors     = 1440,
+            SectorSize  = 256,
+            Bootable    = true,
+            Clusters    = 174,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "files.imd",
+            MediaType   = MediaType.Unknown,
+            Sectors     = 1440,
+            SectorSize  = 256,
+            Bootable    = true,
+            Clusters    = 174,
+            ClusterSize = 2048
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/Excalibur64.cs b/Aaru.Tests/Filesystems/CPM/Excalibur64.cs
index 5a915b877..b27c5a3f1 100644
--- a/Aaru.Tests/Filesystems/CPM/Excalibur64.cs
+++ b/Aaru.Tests/Filesystems/CPM/Excalibur64.cs
@@ -30,40 +30,39 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class Excalibur64 : FilesystemTest
 {
-    [TestFixture]
-    public class Excalibur64 : FilesystemTest
+    public Excalibur64() : base("CP/M") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Excalibur 64");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Excalibur64() : base("CP/M") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Excalibur 64");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "filename.img",
-                MediaType   = MediaType.Unknown,
-                Sectors     = 400,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 189,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "files.img",
-                MediaType   = MediaType.Unknown,
-                Sectors     = 400,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 189,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "filename.img",
+            MediaType   = MediaType.Unknown,
+            Sectors     = 400,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 189,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "files.img",
+            MediaType   = MediaType.Unknown,
+            Sectors     = 400,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 189,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/KayproII.cs b/Aaru.Tests/Filesystems/CPM/KayproII.cs
index 328864eee..af5568b3a 100644
--- a/Aaru.Tests/Filesystems/CPM/KayproII.cs
+++ b/Aaru.Tests/Filesystems/CPM/KayproII.cs
@@ -30,40 +30,39 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class KayproII : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class KayproII : ReadOnlyFilesystemTest
+    public KayproII() : base("CP/M") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Kaypro II");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public KayproII() : base("CP/M") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Kaypro II");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "filename.imd",
-                MediaType   = MediaType.Unknown,
-                Sectors     = 400,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 194,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "files.imd",
-                MediaType   = MediaType.Unknown,
-                Sectors     = 400,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 194,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "filename.imd",
+            MediaType   = MediaType.Unknown,
+            Sectors     = 400,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 194,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "files.imd",
+            MediaType   = MediaType.Unknown,
+            Sectors     = 400,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 194,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/ParaDOS.cs b/Aaru.Tests/Filesystems/CPM/ParaDOS.cs
index 460bceb57..e2a72bb6a 100644
--- a/Aaru.Tests/Filesystems/CPM/ParaDOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/ParaDOS.cs
@@ -30,78 +30,77 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class ParaDOS : FilesystemTest
 {
-    [TestFixture]
-    public class ParaDOS : FilesystemTest
+    public ParaDOS() : base("CP/M") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "ParaDOS");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public ParaDOS() : base("CP/M") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "ParaDOS");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "40d_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 800,
-                SectorSize  = 512,
-                Clusters    = 180,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "40d_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 800,
-                SectorSize  = 512,
-                Clusters    = 180,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "41_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 410,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 170,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "41_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 410,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 170,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "80_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 800,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 170,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "80_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 800,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 170,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "40d_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 800,
+            SectorSize  = 512,
+            Clusters    = 180,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "40d_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 800,
+            SectorSize  = 512,
+            Clusters    = 180,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "41_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 410,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 170,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "41_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 410,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 170,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "80_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 800,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 170,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "80_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 800,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 170,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs b/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs
index 609dfba8e..60d8ccc8e 100644
--- a/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/Plus3DOS.cs
@@ -30,40 +30,39 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class Plus3DOS : FilesystemTest
 {
-    [TestFixture]
-    public class Plus3DOS : FilesystemTest
+    public Plus3DOS() : base("CP/M") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "+3DOS");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Plus3DOS() : base("CP/M") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "+3DOS");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 359,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 360,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 359,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 359,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 360,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 359,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/ROMDOS.cs b/Aaru.Tests/Filesystems/CPM/ROMDOS.cs
index f151e310f..718acdb84 100644
--- a/Aaru.Tests/Filesystems/CPM/ROMDOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/ROMDOS.cs
@@ -30,138 +30,137 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class ROMDOS : FilesystemTest
 {
-    [TestFixture]
-    public class ROMDOS : FilesystemTest
+    public ROMDOS() : base("CP/M") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "ROMDOS");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public ROMDOS() : base("CP/M") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "ROMDOS");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "d1_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 360,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d1_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 360,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d2_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 360,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d2_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 360,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d10_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 400,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d10_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 400,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d20_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 400,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d20_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 400,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d40_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 400,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d40_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 400,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d80_filename.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 400,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d80_files.dsk.lz",
-                MediaType   = MediaType.CompactFloppy,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 400,
-                ClusterSize = 2048
-            }
-        };
-    }
+            TestFile    = "d1_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 360,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d1_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 360,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d2_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 360,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d2_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 360,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d10_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 400,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d10_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 400,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d20_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 400,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d20_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 400,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d40_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 400,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d40_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 400,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d80_filename.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 400,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d80_files.dsk.lz",
+            MediaType   = MediaType.CompactFloppy,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 400,
+            ClusterSize = 2048
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs b/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs
index d1d3f53e7..33f946dcc 100644
--- a/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs
+++ b/Aaru.Tests/Filesystems/CPM/SharpPersonalCPM.cs
@@ -30,41 +30,40 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class SharpPersonalCPM : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class SharpPersonalCPM : ReadOnlyFilesystemTest
+    public SharpPersonalCPM() : base("CP/M") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Sharp Personal CPM");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public SharpPersonalCPM() : base("CP/M") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "Sharp Personal CPM");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "filename.imd",
-                MediaType   = MediaType.ACORN_525_DS_DD,
-                Sectors     = 2560,
-                SectorSize  = 256,
-                Bootable    = true,
-                Clusters    = 316,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "files.imd",
-                MediaType   = MediaType.ACORN_525_DS_DD,
-                Sectors     = 2560,
-                SectorSize  = 256,
-                Bootable    = true,
-                Clusters    = 316,
-                ClusterSize = 2048
-            }
-        };
-    }
+            TestFile    = "filename.imd",
+            MediaType   = MediaType.ACORN_525_DS_DD,
+            Sectors     = 2560,
+            SectorSize  = 256,
+            Bootable    = true,
+            Clusters    = 316,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "files.imd",
+            MediaType   = MediaType.ACORN_525_DS_DD,
+            Sectors     = 2560,
+            SectorSize  = 256,
+            Bootable    = true,
+            Clusters    = 316,
+            ClusterSize = 2048
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/CPM/XtalDOS.cs b/Aaru.Tests/Filesystems/CPM/XtalDOS.cs
index 811914c6a..accc36970 100644
--- a/Aaru.Tests/Filesystems/CPM/XtalDOS.cs
+++ b/Aaru.Tests/Filesystems/CPM/XtalDOS.cs
@@ -30,40 +30,39 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.CPM
+namespace Aaru.Tests.Filesystems.CPM;
+
+[TestFixture]
+public class XtalDOS : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class XtalDOS : ReadOnlyFilesystemTest
+    public XtalDOS() : base("CP/M") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "XtalDOS");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public XtalDOS() : base("CP/M") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "CPM", "XtalDOS");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.CPM();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "filename.imd",
-                MediaType   = MediaType.Unknown,
-                Sectors     = 400,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 189,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "files.imd",
-                MediaType   = MediaType.Unknown,
-                Sectors     = 400,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 189,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "filename.imd",
+            MediaType   = MediaType.Unknown,
+            Sectors     = 400,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 189,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "files.imd",
+            MediaType   = MediaType.Unknown,
+            Sectors     = 400,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 189,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/DTFS/MBR.cs b/Aaru.Tests/Filesystems/DTFS/MBR.cs
index da4dd8b8d..7e4d4af1a 100644
--- a/Aaru.Tests/Filesystems/DTFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/DTFS/MBR.cs
@@ -32,29 +32,28 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.DTFS
+namespace Aaru.Tests.Filesystems.DTFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("DTFS") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "DTFS (MBR)");
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("DTFS") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "DTFS (MBR)");
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 510048,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "scoopenserver_5.0.7hw.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 510048,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/DTFS/Whole.cs b/Aaru.Tests/Filesystems/DTFS/Whole.cs
index 4a71638df..dca9c6000 100644
--- a/Aaru.Tests/Filesystems/DTFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/DTFS/Whole.cs
@@ -32,70 +32,69 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.DTFS
+namespace Aaru.Tests.Filesystems.DTFS;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("DTFS") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "DTFS");
+
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("DTFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "DTFS");
-
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
-                MediaType   = MediaType.DMF,
-                Sectors     = 3360,
-                SectorSize  = 512,
-                Clusters    = 1680,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 1200,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
-                MediaType   = MediaType.ECMA_147,
-                Sectors     = 5760,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            }
-        };
-    }
+            TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
+            MediaType   = MediaType.DMF,
+            Sectors     = 3360,
+            SectorSize  = 512,
+            Clusters    = 1680,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 1200,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
+            MediaType   = MediaType.ECMA_147,
+            Sectors     = 5760,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/EAFS/MBR.cs b/Aaru.Tests/Filesystems/EAFS/MBR.cs
index 348556fe5..e8dbd21cb 100644
--- a/Aaru.Tests/Filesystems/EAFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/EAFS/MBR.cs
@@ -32,29 +32,28 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.EAFS
+namespace Aaru.Tests.Filesystems.EAFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("Extended Acer Fast Filesystem") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "EAFS (MBR)");
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("Extended Acer Fast Filesystem") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "EAFS (MBR)");
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 510048,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "scoopenserver_5.0.7hw.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 510048,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/EAFS/Whole.cs b/Aaru.Tests/Filesystems/EAFS/Whole.cs
index 23589c729..e337f2e4d 100644
--- a/Aaru.Tests/Filesystems/EAFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/EAFS/Whole.cs
@@ -32,70 +32,69 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.EAFS
+namespace Aaru.Tests.Filesystems.EAFS;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("Extended Acer Fast Filesystem") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "EAFS");
+
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("Extended Acer Fast Filesystem") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "EAFS");
-
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
-                MediaType   = MediaType.DMF,
-                Sectors     = 3360,
-                SectorSize  = 512,
-                Clusters    = 1680,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 1200,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
-                MediaType   = MediaType.ECMA_147,
-                Sectors     = 5760,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            }
-        };
-    }
+            TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
+            MediaType   = MediaType.DMF,
+            Sectors     = 3360,
+            SectorSize  = 512,
+            Clusters    = 1680,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 1200,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
+            MediaType   = MediaType.ECMA_147,
+            Sectors     = 5760,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/F2FS.cs b/Aaru.Tests/Filesystems/F2FS.cs
index 6bf36aeb1..912de185e 100644
--- a/Aaru.Tests/Filesystems/F2FS.cs
+++ b/Aaru.Tests/Filesystems/F2FS.cs
@@ -32,41 +32,40 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class F2Fs : FilesystemTest
 {
-    [TestFixture]
-    public class F2Fs : FilesystemTest
+    public F2Fs() : base("F2FS filesystem") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "F2FS");
+    public override IFilesystem Plugin     => new F2FS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public F2Fs() : base("F2FS filesystem") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "F2FS");
-        public override IFilesystem Plugin     => new F2FS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32512,
-                ClusterSize  = 4096,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "81bd3a4e-de0c-484c-becc-aaa479b2070a"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_f2fs_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 2097152,
-                SectorSize   = 512,
-                Clusters     = 261888,
-                ClusterSize  = 4096,
-                VolumeName   = "DicSetter",
-                VolumeSerial = "422bd2a8-68ab-6f45-9a04-9c264d07dd6e"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32512,
+            ClusterSize  = 4096,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "81bd3a4e-de0c-484c-becc-aaa479b2070a"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_f2fs_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 2097152,
+            SectorSize   = 512,
+            Clusters     = 261888,
+            ClusterSize  = 4096,
+            VolumeName   = "DicSetter",
+            VolumeSerial = "422bd2a8-68ab-6f45-9a04-9c264d07dd6e"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT12/APM.cs b/Aaru.Tests/Filesystems/FAT12/APM.cs
index 75e1109bb..556ce1453 100644
--- a/Aaru.Tests/Filesystems/FAT12/APM.cs
+++ b/Aaru.Tests/Filesystems/FAT12/APM.cs
@@ -32,97 +32,96 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT12
+namespace Aaru.Tests.Filesystems.FAT12;
+
+[TestFixture]
+public class APM : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class APM : ReadOnlyFilesystemTest
+    public APM() : base("FAT12") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (APM)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("FAT12") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (APM)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "darwin_6.0.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3057,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "60270BF5"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3057,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "7DDF1B02"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3057,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "FFCC1915"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2835,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "746E08F4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3055,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "84A90C04"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 4061,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "32181F09"
-            }
-        };
-    }
+            TestFile     = "darwin_6.0.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3057,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "60270BF5"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3057,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "7DDF1B02"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3057,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "FFCC1915"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2835,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "746E08F4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3055,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "84A90C04"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 4061,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "32181F09"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT12/GPT.cs b/Aaru.Tests/Filesystems/FAT12/GPT.cs
index b1b7f8c4a..2ec4269c1 100644
--- a/Aaru.Tests/Filesystems/FAT12/GPT.cs
+++ b/Aaru.Tests/Filesystems/FAT12/GPT.cs
@@ -32,32 +32,31 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT12
+namespace Aaru.Tests.Filesystems.FAT12;
+
+[TestFixture]
+public class GPT : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class GPT : ReadOnlyFilesystemTest
+    public GPT() : base("FAT12") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (GPT)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public GPT() : base("FAT12") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (GPT)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 4061,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "66901F1B"
-            }
-        };
-    }
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 4061,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "66901F1B"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT12/Human.cs b/Aaru.Tests/Filesystems/FAT12/Human.cs
index 274b03e97..8fd8d035f 100644
--- a/Aaru.Tests/Filesystems/FAT12/Human.cs
+++ b/Aaru.Tests/Filesystems/FAT12/Human.cs
@@ -32,41 +32,40 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT12
+namespace Aaru.Tests.Filesystems.FAT12;
+
+[TestFixture]
+public class Human : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class Human : ReadOnlyFilesystemTest
+    public Human() : base("FAT12") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (Human68K)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Human() : base("FAT12") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (Human68K)");
-        public override IFilesystem Plugin => new FAT();
-        public override bool Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "diska.aif",
-                MediaType   = MediaType.SHARP_525,
-                Sectors     = 1232,
-                SectorSize  = 1024,
-                Bootable    = true,
-                Clusters    = 1232,
-                ClusterSize = 1024,
-                SystemId    = "Hudson soft 2.00"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "diskb.aif",
-                MediaType   = MediaType.SHARP_525,
-                Sectors     = 1232,
-                SectorSize  = 1024,
-                Bootable    = true,
-                Clusters    = 1232,
-                ClusterSize = 1024,
-                SystemId    = "Hudson soft 2.00"
-            }
-        };
-    }
+            TestFile    = "diska.aif",
+            MediaType   = MediaType.SHARP_525,
+            Sectors     = 1232,
+            SectorSize  = 1024,
+            Bootable    = true,
+            Clusters    = 1232,
+            ClusterSize = 1024,
+            SystemId    = "Hudson soft 2.00"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "diskb.aif",
+            MediaType   = MediaType.SHARP_525,
+            Sectors     = 1232,
+            SectorSize  = 1024,
+            Bootable    = true,
+            Clusters    = 1232,
+            ClusterSize = 1024,
+            SystemId    = "Hudson soft 2.00"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT12/MBR.cs b/Aaru.Tests/Filesystems/FAT12/MBR.cs
index ab6df8ca1..de0d78ee5 100644
--- a/Aaru.Tests/Filesystems/FAT12/MBR.cs
+++ b/Aaru.Tests/Filesystems/FAT12/MBR.cs
@@ -32,1143 +32,1142 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT12
+namespace Aaru.Tests.Filesystems.FAT12;
+
+[TestFixture]
+public class MBR : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class MBR : ReadOnlyFilesystemTest
+    public MBR() : base("FAT12") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (MBR)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("FAT12") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT12 (MBR)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "darwin_6.0.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "AA180CF0"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3057,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "EC241B05"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3057,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "64F5191A"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "compaqmsdos331.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 8192,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 995,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_3.40.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 24576,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2765,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.2",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_3.41.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 24576,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2883,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.2",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_5.00.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 24576,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2883,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_6.00.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 24576,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2883,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_7.02.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 24576,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2883,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_7.03.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 24576,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2883,
-                ClusterSize = 4096,
-                SystemId    = "DRDOS  7",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "drdos_8.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "IBM  5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "09F92756"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "drdos_8.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "IBM  5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "08FF1164"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "msdos_3.31.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 24576,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2883,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_4.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS4.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "3C2B0903"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_4.01.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 8192,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 995,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS4.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "407D1907"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_5.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "1B08090B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_5.00a.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "3348090C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_6.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "124008FB"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_6.20rc1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 8192,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 995,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "395718E9"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_6.20.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "31190907"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_6.21.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "27230917"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_6.22.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "156308F3"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_7.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2002,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2F781809"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "novelldos_7.00.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 24576,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2883,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "opendos_7.01.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 24576,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2883,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_2000.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "IBM  7.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "390F090A"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcdos_2.00.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 32768,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 4024,
-                ClusterSize = 4096,
-                SystemId    = "IBM  2.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcdos_2.10.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 32768,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 4024,
-                ClusterSize = 4096,
-                SystemId    = "IBM  2.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcdos_3.00.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 32768,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 4017,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcdos_3.10.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 32768,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 4017,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcdos_3.20.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 24576,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2883,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.2",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcdos_3.30.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 32768,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 4017,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_4.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 32768,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 4017,
-                ClusterSize  = 4096,
-                SystemId     = "IBM  4.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0F340FE4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_5.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "IBM  5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "363B0904"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_5.02.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "IBM  5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "10650902"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_6.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "IBM  6.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "313208FE"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_6.30.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "IBM  6.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "253E0901"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_7.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "IBM  7.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0E1E090D"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "toshibamsdos_3.30.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 8192,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 995,
-                ClusterSize = 4096,
-                SystemId    = "T V3.30 ",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "toshibamsdos_4.01.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 8192,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 995,
-                ClusterSize  = 4096,
-                SystemId     = "T V4.00 ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "3C2319E8"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msos2_1.21.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2002,
-                ClusterSize  = 4096,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "66CC3C15"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msos2_1.30.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2002,
-                ClusterSize  = 4096,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "66A54C15"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "multiuserdos_7.22r4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 16384,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 2002,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.2",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_1.20.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5D13D815"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_1.30.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5D48C815"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_6.307.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "IBM 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5D165815"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_6.514.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "IBM 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5D036415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_6.617.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "IBM 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5CED2415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_8.162.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "IBM 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5D470415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_9.023.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "IBM 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "9BA14415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "ecs.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1884,
-                ClusterSize  = 4096,
-                SystemId     = "IBM 4.50",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "E6B0B814"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3055,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "919408FC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3057,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "BD970C0C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 4065,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "26A21EF4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3538,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "74F4921D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win2000.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 4073,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "C4B64D11"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2002,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "29200D0C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95osr2.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2002,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "234F0DE4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95osr2.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2002,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "074C0DFC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95osr2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2002,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "33640D18"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win98.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2038,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0E121460"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win98se.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2038,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "094C0EED"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winme.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2038,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "38310F02"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 4002,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "50489A1B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.50.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2038,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2CE52101"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.51.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2038,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "94313E7E"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_4.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 28672,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3513,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "00621759"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winvista.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3058,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "BAD08A1E"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "beos_r4.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 16384,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2036,
-                ClusterSize  = 4096,
-                SystemId     = "BeOS    ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "00000000"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = false,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                VolumeSerial = "670000"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.29.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609AC96F"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.34.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609BAA17"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.37.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "609D1C96"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.38.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C3CCA"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C651A"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.20.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C9B1B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609CA8CE"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "freebsd_6.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "76D11EF0"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "freebsd_7.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "52491EF0"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "freebsd_8.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3009,
-                ClusterSize  = 4096,
-                SystemId     = "BSD4.4  ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "DF9D1EEF"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "dflybsd_1.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2891,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "NO NAME",
-                VolumeSerial = "63C81AFB"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_1.6.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3057,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "84431CEB"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_6.1.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3057,
-                ClusterSize  = 4096,
-                SystemId     = "NetBSD  ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "7F161B1D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3057,
-                ClusterSize  = 4096,
-                SystemId     = "NetBSD  ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "40961817"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "openbsd_4.7.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3057,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "F01F07F2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_2.0.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "PCX 2.0 ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "241408F2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_2.0.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "PCX 2.0 ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "241408F2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_2.1.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 3055,
-                ClusterSize  = 4096,
-                SystemId     = "PCX 2.0 ",
-                VolumeName   = "volumelabel",
-                VolumeSerial = "CA6C188B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_2.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2883,
-                ClusterSize  = 4096,
-                SystemId     = "PCX_2.2 ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "241408F2"
-            }
-        };
-    }
+            TestFile     = "darwin_6.0.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "AA180CF0"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3057,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "EC241B05"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3057,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "64F5191A"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "compaqmsdos331.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 8192,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 995,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_3.40.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 24576,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2765,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.2",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_3.41.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 24576,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2883,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.2",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_5.00.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 24576,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2883,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_6.00.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 24576,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2883,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_7.02.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 24576,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2883,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_7.03.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 24576,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2883,
+            ClusterSize = 4096,
+            SystemId    = "DRDOS  7",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "drdos_8.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "IBM  5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "09F92756"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "drdos_8.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "IBM  5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "08FF1164"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "msdos_3.31.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 24576,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2883,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_4.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS4.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "3C2B0903"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_4.01.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 8192,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 995,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS4.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "407D1907"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_5.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "1B08090B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_5.00a.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "3348090C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_6.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "124008FB"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_6.20rc1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 8192,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 995,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "395718E9"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_6.20.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "31190907"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_6.21.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "27230917"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_6.22.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "156308F3"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_7.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2002,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2F781809"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "novelldos_7.00.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 24576,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2883,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "opendos_7.01.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 24576,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2883,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_2000.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "IBM  7.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "390F090A"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcdos_2.00.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 32768,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 4024,
+            ClusterSize = 4096,
+            SystemId    = "IBM  2.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcdos_2.10.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 32768,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 4024,
+            ClusterSize = 4096,
+            SystemId    = "IBM  2.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcdos_3.00.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 32768,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 4017,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcdos_3.10.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 32768,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 4017,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcdos_3.20.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 24576,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2883,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.2",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcdos_3.30.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 32768,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 4017,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_4.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 32768,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 4017,
+            ClusterSize  = 4096,
+            SystemId     = "IBM  4.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0F340FE4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_5.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "IBM  5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "363B0904"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_5.02.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "IBM  5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "10650902"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_6.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "IBM  6.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "313208FE"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_6.30.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "IBM  6.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "253E0901"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_7.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "IBM  7.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0E1E090D"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "toshibamsdos_3.30.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 8192,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 995,
+            ClusterSize = 4096,
+            SystemId    = "T V3.30 ",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "toshibamsdos_4.01.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 8192,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 995,
+            ClusterSize  = 4096,
+            SystemId     = "T V4.00 ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "3C2319E8"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msos2_1.21.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2002,
+            ClusterSize  = 4096,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "66CC3C15"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msos2_1.30.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2002,
+            ClusterSize  = 4096,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "66A54C15"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "multiuserdos_7.22r4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 16384,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 2002,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.2",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_1.20.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5D13D815"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_1.30.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5D48C815"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_6.307.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "IBM 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5D165815"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_6.514.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "IBM 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5D036415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_6.617.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "IBM 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5CED2415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_8.162.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "IBM 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5D470415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_9.023.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "IBM 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "9BA14415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "ecs.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1884,
+            ClusterSize  = 4096,
+            SystemId     = "IBM 4.50",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "E6B0B814"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3055,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "919408FC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3057,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "BD970C0C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 4065,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "26A21EF4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3538,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "74F4921D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win2000.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 4073,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "C4B64D11"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2002,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "29200D0C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95osr2.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2002,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "234F0DE4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95osr2.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2002,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "074C0DFC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95osr2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2002,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "33640D18"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win98.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2038,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0E121460"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win98se.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2038,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "094C0EED"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winme.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2038,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "38310F02"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 4002,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "50489A1B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.50.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2038,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2CE52101"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.51.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2038,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "94313E7E"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_4.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 28672,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3513,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "00621759"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winvista.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3058,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "BAD08A1E"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "beos_r4.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 16384,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2036,
+            ClusterSize  = 4096,
+            SystemId     = "BeOS    ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "00000000"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = false,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            VolumeSerial = "670000"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.29.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609AC96F"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.34.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609BAA17"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.37.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "609D1C96"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.38.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C3CCA"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C651A"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.20.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C9B1B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609CA8CE"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "freebsd_6.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "76D11EF0"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "freebsd_7.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "52491EF0"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "freebsd_8.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3009,
+            ClusterSize  = 4096,
+            SystemId     = "BSD4.4  ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "DF9D1EEF"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "dflybsd_1.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2891,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "NO NAME",
+            VolumeSerial = "63C81AFB"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_1.6.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3057,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "84431CEB"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_6.1.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3057,
+            ClusterSize  = 4096,
+            SystemId     = "NetBSD  ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "7F161B1D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_7.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3057,
+            ClusterSize  = 4096,
+            SystemId     = "NetBSD  ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "40961817"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "openbsd_4.7.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3057,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "F01F07F2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_2.0.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "PCX 2.0 ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "241408F2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_2.0.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "PCX 2.0 ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "241408F2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_2.1.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 3055,
+            ClusterSize  = 4096,
+            SystemId     = "PCX 2.0 ",
+            VolumeName   = "volumelabel",
+            VolumeSerial = "CA6C188B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_2.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2883,
+            ClusterSize  = 4096,
+            SystemId     = "PCX_2.2 ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "241408F2"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT16/APM.cs b/Aaru.Tests/Filesystems/FAT16/APM.cs
index f2d828258..9aa08f9c1 100644
--- a/Aaru.Tests/Filesystems/FAT16/APM.cs
+++ b/Aaru.Tests/Filesystems/FAT16/APM.cs
@@ -32,109 +32,108 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT16
+namespace Aaru.Tests.Filesystems.FAT16;
+
+[TestFixture]
+public class APM : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class APM : ReadOnlyFilesystemTest
+    public APM() : base("FAT16") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (APM)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("FAT16") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (APM)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "darwin_6.0.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65383,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "96AE0CF4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65383,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "385C1B08"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65383,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "024F191D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 64940,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "C45B0908"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65379,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "24660C0F"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63961,
-                ClusterSize  = 8192,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "063D1F09"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "519F5D1B"
-            }
-        };
-    }
+            TestFile     = "darwin_6.0.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65383,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "96AE0CF4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65383,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "385C1B08"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65383,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "024F191D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 64940,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "C45B0908"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65379,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "24660C0F"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63961,
+            ClusterSize  = 8192,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "063D1F09"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "morphos_3.13.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "519F5D1B"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT16/Atari.cs b/Aaru.Tests/Filesystems/FAT16/Atari.cs
index 1eb51118e..cb160a002 100644
--- a/Aaru.Tests/Filesystems/FAT16/Atari.cs
+++ b/Aaru.Tests/Filesystems/FAT16/Atari.cs
@@ -32,151 +32,150 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT16
+namespace Aaru.Tests.Filesystems.FAT16;
+
+[TestFixture]
+public class Atari : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class Atari : ReadOnlyFilesystemTest
+    public Atari() : base("FAT16") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (Atari)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Atari() : base("FAT16") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (Atari)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "tos_1.00_gem.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Clusters     = 12230,
-                ClusterSize  = 1024,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "DA6664"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_1.00_bgm.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 8188,
-                ClusterSize  = 16384,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "D0EFA1"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_1.02_gem.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Clusters     = 12230,
-                ClusterSize  = 1024,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "1079CC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_1.02_bgm.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 8188,
-                ClusterSize  = 16384,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "9C65B3"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_1.04_gem.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Clusters     = 12230,
-                ClusterSize  = 1024,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "DD5AA6"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_1.04_bgm.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 16374,
-                ClusterSize  = 8192,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "D430E2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_1.06_gem.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Clusters     = 12230,
-                ClusterSize  = 1024,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "D0599C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_1.06_bgm.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 16374,
-                ClusterSize  = 8192,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "895043"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_1.62_gem.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Clusters     = 12230,
-                ClusterSize  = 1024,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "D22E19"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_1.62_bgm.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 16374,
-                ClusterSize  = 8192,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "6566D8"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_2.06_gem.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 24576,
-                SectorSize   = 512,
-                Clusters     = 12230,
-                ClusterSize  = 1024,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "700332"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tos_2.06_bgm.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 16374,
-                ClusterSize  = 8192,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "086A33"
-            }
-        };
-    }
+            TestFile     = "tos_1.00_gem.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Clusters     = 12230,
+            ClusterSize  = 1024,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "DA6664"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_1.00_bgm.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 8188,
+            ClusterSize  = 16384,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "D0EFA1"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_1.02_gem.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Clusters     = 12230,
+            ClusterSize  = 1024,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "1079CC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_1.02_bgm.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 8188,
+            ClusterSize  = 16384,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "9C65B3"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_1.04_gem.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Clusters     = 12230,
+            ClusterSize  = 1024,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "DD5AA6"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_1.04_bgm.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 16374,
+            ClusterSize  = 8192,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "D430E2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_1.06_gem.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Clusters     = 12230,
+            ClusterSize  = 1024,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "D0599C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_1.06_bgm.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 16374,
+            ClusterSize  = 8192,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "895043"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_1.62_gem.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Clusters     = 12230,
+            ClusterSize  = 1024,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "D22E19"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_1.62_bgm.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 16374,
+            ClusterSize  = 8192,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "6566D8"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_2.06_gem.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 24576,
+            SectorSize   = 512,
+            Clusters     = 12230,
+            ClusterSize  = 1024,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "700332"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tos_2.06_bgm.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 16374,
+            ClusterSize  = 8192,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "086A33"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT16/GPT.cs b/Aaru.Tests/Filesystems/FAT16/GPT.cs
index ff62209ce..27b1a87fb 100644
--- a/Aaru.Tests/Filesystems/FAT16/GPT.cs
+++ b/Aaru.Tests/Filesystems/FAT16/GPT.cs
@@ -32,32 +32,31 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT16
+namespace Aaru.Tests.Filesystems.FAT16;
+
+[TestFixture]
+public class GPT : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class GPT : ReadOnlyFilesystemTest
+    public GPT() : base("FAT16") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (GPT)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public GPT() : base("FAT16") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (GPT)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63961,
-                ClusterSize  = 8192,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2E8A1F1B"
-            }
-        };
-    }
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63961,
+            ClusterSize  = 8192,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2E8A1F1B"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT16/Human.cs b/Aaru.Tests/Filesystems/FAT16/Human.cs
index 89d6e1dab..cd2218792 100644
--- a/Aaru.Tests/Filesystems/FAT16/Human.cs
+++ b/Aaru.Tests/Filesystems/FAT16/Human.cs
@@ -32,41 +32,40 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT16
+namespace Aaru.Tests.Filesystems.FAT16;
+
+[TestFixture]
+public class Human : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class Human : ReadOnlyFilesystemTest
+    public Human() : base("FAT16") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (Human68K)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Human() : base("FAT16") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (Human68K)");
-        public override IFilesystem Plugin => new FAT();
-        public override bool Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "sasidisk.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 162096,
-                SectorSize  = 256,
-                Bootable    = true,
-                Clusters    = 40510,
-                ClusterSize = 1024,
-                SystemId    = "Hudson soft 2.00"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scsidisk.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 204800,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 102367,
-                ClusterSize = 1024,
-                SystemId    = " Hero Soft V1.10"
-            }
-        };
-    }
+            TestFile    = "sasidisk.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 162096,
+            SectorSize  = 256,
+            Bootable    = true,
+            Clusters    = 40510,
+            ClusterSize = 1024,
+            SystemId    = "Hudson soft 2.00"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scsidisk.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 204800,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 102367,
+            ClusterSize = 1024,
+            SystemId    = " Hero Soft V1.10"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT16/MBR.cs b/Aaru.Tests/Filesystems/FAT16/MBR.cs
index 97f444ef6..5384bb037 100644
--- a/Aaru.Tests/Filesystems/FAT16/MBR.cs
+++ b/Aaru.Tests/Filesystems/FAT16/MBR.cs
@@ -32,1280 +32,1279 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT16
+namespace Aaru.Tests.Filesystems.FAT16;
+
+[TestFixture]
+public class MBR : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class MBR : ReadOnlyFilesystemTest
+    public MBR() : base("FAT16") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (MBR)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("FAT16") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (MBR)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "darwin_6.0.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "44B70CF7"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65384,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "1F2E1B0B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65384,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "936619E5"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_3.40.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 32472,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.2",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_3.41.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 32590,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.2",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_5.00.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 32590,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_6.00.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 65116,
-                ClusterSize = 2048,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_7.02.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 32590,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "drdos_7.03.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 32590,
-                ClusterSize = 4096,
-                SystemId    = "DRDOS  7",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "drdos_8.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "IBM  5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0A070554"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "drdos_8.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "IBM  5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0A1A113F"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "msdos_3.30.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 16324,
-                ClusterSize = 2048,
-                SystemId    = "MSDOS3.3"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "msdos_3.30A.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 16324,
-                ClusterSize = 2048,
-                SystemId    = "MSDOS3.3"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "msdos_3.31.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 32590,
-                ClusterSize = 4096,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_4.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS4.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0F2E0A16"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_4.01.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "MSDOS4.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "217B1909"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_5.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "19320A14"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_5.00a.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "30400A09"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_6.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "39660A0C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_6.20rc1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "3E2018E9"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_6.20.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "10550A18"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_6.21.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "05580A12"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_6.22.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "054C0A08"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_7.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "356B1809"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "novelldos_7.00.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 65116,
-                ClusterSize = 2048,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "opendos_7.01.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 65116,
-                ClusterSize = 2048,
-                SystemId    = "IBM  3.3",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_2000.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "IBM  7.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "30490A0F"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_4.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "IBM  4.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2D670A17"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_4.01.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "IBM  4.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "23350A15"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_5.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "IBM  5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "1B290A0D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_5.02.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "IBM  5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "340B0A13"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_6.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "IBM  6.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "052A0A0B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_6.30.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "IBM  6.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "1E3D0A0F"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcdos_7.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "IBM  7.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2A420A06"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msos2_1.21.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "9C162C15"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msos2_1.30.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "9C1E2C15"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "multiuserdos_7.22r4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 63907,
-                ClusterSize = 8192,
-                SystemId    = "IBM  3.2",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_1.20.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5D4CA815"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_1.30.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5D49D815"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_6.307.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "IBM 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5D544815"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_6.514.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "IBM 20.0",
-                VolumeName   = "NO NAME",
-                VolumeSerial = "5CEEF415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_6.617.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "IBM 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5D430415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_8.162.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "IBM 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5CF5A415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_9.023.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "IBM 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "9BBC8415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "ecs.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63848,
-                ClusterSize  = 8192,
-                SystemId     = "IBM 4.50",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "1BE5B814"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65397,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "84FC0912"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65383,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "82451318"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63958,
-                ClusterSize  = 8192,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "3EF71EF4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63830,
-                ClusterSize  = 8192,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "DAF97911"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win2000.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63219,
-                ClusterSize  = 8192,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "305637BD"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95osr2.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "275B0DE4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95osr2.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "09650DFC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95osr2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "38270D18"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "MSWIN4.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2E620D0C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win98se.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63964,
-                ClusterSize  = 8192,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0B4F0EED"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win98.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63964,
-                ClusterSize  = 8192,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0E122464"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winme.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63964,
-                ClusterSize  = 8192,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "3B5F0F02"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "C84CB6F2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.50.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63964,
-                ClusterSize  = 8192,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "D0E9AD4E"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.51.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63964,
-                ClusterSize  = 8192,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "C039A2EC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_4.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "D840DD84"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winvista.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63582,
-                ClusterSize  = 8192,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "9AAA4216"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "beos_r4.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65132,
-                ClusterSize  = 2048,
-                SystemId     = "BeOS    ",
-                VolumeName   = "VOLUME LABE",
-                VolumeSerial = "00000000"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65367,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.29.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609ACB34"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.34.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609BAB2B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.37.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "609D1C9C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.38.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C3E60"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C663E"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.20.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C9BCB"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609CA8D4"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.0_umsdos.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65367,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.29_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609ACD0D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.34_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609BAD75"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.37_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "609D1E3A"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.38_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C4C2C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C6CF3"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.20_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C9F38"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65367,
-                ClusterSize  = 2048,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609CAC4B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_3.9.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "CDP  5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "374D3BD1"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "aros.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 63848,
-                ClusterSize  = 8192,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "52BEA34A"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "freebsd_6.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "437B1EF6"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "freebsd_7.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65368,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "BE841EF5"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "freebsd_8.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 16366,
-                ClusterSize  = 8192,
-                SystemId     = "BSD4.4  ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "E40B1EF6"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macos_7.6.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63907,
-                ClusterSize  = 8192,
-                SystemId     = "PCX 2.0 ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "27761816"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "ecs20_fstester.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63848,
-                ClusterSize  = 8192,
-                SystemId     = "IBM 4.50",
-                VolumeName   = "VOLUME LABE",
-                VolumeSerial = "66AAF014"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_fat16_msdos_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63837,
-                ClusterSize  = 8192,
-                SystemId     = "mkfs.fat",
-                VolumeName   = "DICSETTER",
-                VolumeSerial = "A552A493"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_vfat16_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63837,
-                ClusterSize  = 8192,
-                SystemId     = "mkfs.fat",
-                VolumeName   = "DICSETTER",
-                VolumeSerial = "FCC308A7"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "beos_r5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65132,
-                ClusterSize  = 2048,
-                SystemId     = "BeOS    ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "00000000"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "dflybsd_1.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65132,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "NO NAME",
-                VolumeSerial = "1B3F1B00"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_1.6.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65384,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "80A91CF3"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_6.1.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 16369,
-                ClusterSize  = 8192,
-                SystemId     = "NetBSD  ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "40C91B1F"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 16370,
-                ClusterSize  = 8192,
-                SystemId     = "NetBSD  ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "8413181B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "openbsd_4.7.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65384,
-                ClusterSize  = 2048,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "84E407F6"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_2.0.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "PCX 2.0 ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2A6508F2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_2.0.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "PCX 2.0 ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2A6508F2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_2.1.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65383,
-                ClusterSize  = 2048,
-                SystemId     = "PCX 2.0 ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "CB430C38"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_2.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65116,
-                ClusterSize  = 2048,
-                SystemId     = "PCX_2.2 ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2A6508F2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "accesspc_2.0f6.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262174,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 65391,
-                ClusterSize = 2048,
-                SystemId    = "INSIGNIA",
-                VolumeName  = "VOLUMELABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65397,
-                ClusterSize  = 2048,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "519F5C06"
-            }
-        };
-    }
+            TestFile     = "darwin_6.0.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "44B70CF7"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65384,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "1F2E1B0B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65384,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "936619E5"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_3.40.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 32472,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.2",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_3.41.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 32590,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.2",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_5.00.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 32590,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_6.00.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 65116,
+            ClusterSize = 2048,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_7.02.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 32590,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "drdos_7.03.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 32590,
+            ClusterSize = 4096,
+            SystemId    = "DRDOS  7",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "drdos_8.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "IBM  5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0A070554"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "drdos_8.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "IBM  5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0A1A113F"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "msdos_3.30.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 16324,
+            ClusterSize = 2048,
+            SystemId    = "MSDOS3.3"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "msdos_3.30A.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 16324,
+            ClusterSize = 2048,
+            SystemId    = "MSDOS3.3"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "msdos_3.31.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 32590,
+            ClusterSize = 4096,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_4.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS4.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0F2E0A16"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_4.01.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "MSDOS4.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "217B1909"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_5.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "19320A14"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_5.00a.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "30400A09"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_6.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "39660A0C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_6.20rc1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "3E2018E9"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_6.20.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "10550A18"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_6.21.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "05580A12"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_6.22.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "054C0A08"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_7.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "356B1809"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "novelldos_7.00.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 65116,
+            ClusterSize = 2048,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "opendos_7.01.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 65116,
+            ClusterSize = 2048,
+            SystemId    = "IBM  3.3",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_2000.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "IBM  7.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "30490A0F"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_4.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "IBM  4.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2D670A17"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_4.01.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "IBM  4.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "23350A15"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_5.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "IBM  5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "1B290A0D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_5.02.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "IBM  5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "340B0A13"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_6.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "IBM  6.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "052A0A0B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_6.30.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "IBM  6.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "1E3D0A0F"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcdos_7.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "IBM  7.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2A420A06"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msos2_1.21.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "9C162C15"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msos2_1.30.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "9C1E2C15"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "multiuserdos_7.22r4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 63907,
+            ClusterSize = 8192,
+            SystemId    = "IBM  3.2",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_1.20.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5D4CA815"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_1.30.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5D49D815"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_6.307.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "IBM 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5D544815"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_6.514.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "IBM 20.0",
+            VolumeName   = "NO NAME",
+            VolumeSerial = "5CEEF415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_6.617.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "IBM 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5D430415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_8.162.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "IBM 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5CF5A415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_9.023.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "IBM 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "9BBC8415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "ecs.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63848,
+            ClusterSize  = 8192,
+            SystemId     = "IBM 4.50",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "1BE5B814"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65397,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "84FC0912"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65383,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "82451318"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63958,
+            ClusterSize  = 8192,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "3EF71EF4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63830,
+            ClusterSize  = 8192,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "DAF97911"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win2000.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63219,
+            ClusterSize  = 8192,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "305637BD"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95osr2.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "275B0DE4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95osr2.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "09650DFC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95osr2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "38270D18"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "MSWIN4.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2E620D0C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win98se.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63964,
+            ClusterSize  = 8192,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0B4F0EED"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win98.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63964,
+            ClusterSize  = 8192,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0E122464"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winme.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63964,
+            ClusterSize  = 8192,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "3B5F0F02"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "C84CB6F2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.50.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63964,
+            ClusterSize  = 8192,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "D0E9AD4E"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.51.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63964,
+            ClusterSize  = 8192,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "C039A2EC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_4.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "D840DD84"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winvista.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63582,
+            ClusterSize  = 8192,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "9AAA4216"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "beos_r4.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65132,
+            ClusterSize  = 2048,
+            SystemId     = "BeOS    ",
+            VolumeName   = "VOLUME LABE",
+            VolumeSerial = "00000000"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65367,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.29.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609ACB34"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.34.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609BAB2B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.37.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "609D1C9C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.38.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C3E60"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C663E"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.20.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C9BCB"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609CA8D4"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.0_umsdos.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65367,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.29_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609ACD0D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.34_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609BAD75"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.37_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "609D1E3A"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.38_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C4C2C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C6CF3"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.20_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C9F38"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65367,
+            ClusterSize  = 2048,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609CAC4B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "amigaos_3.9.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "CDP  5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "374D3BD1"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "aros.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 63848,
+            ClusterSize  = 8192,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "52BEA34A"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "freebsd_6.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "437B1EF6"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "freebsd_7.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65368,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "BE841EF5"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "freebsd_8.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 16366,
+            ClusterSize  = 8192,
+            SystemId     = "BSD4.4  ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "E40B1EF6"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macos_7.6.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63907,
+            ClusterSize  = 8192,
+            SystemId     = "PCX 2.0 ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "27761816"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "ecs20_fstester.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63848,
+            ClusterSize  = 8192,
+            SystemId     = "IBM 4.50",
+            VolumeName   = "VOLUME LABE",
+            VolumeSerial = "66AAF014"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_fat16_msdos_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63837,
+            ClusterSize  = 8192,
+            SystemId     = "mkfs.fat",
+            VolumeName   = "DICSETTER",
+            VolumeSerial = "A552A493"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_vfat16_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63837,
+            ClusterSize  = 8192,
+            SystemId     = "mkfs.fat",
+            VolumeName   = "DICSETTER",
+            VolumeSerial = "FCC308A7"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "beos_r5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65132,
+            ClusterSize  = 2048,
+            SystemId     = "BeOS    ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "00000000"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "dflybsd_1.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65132,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "NO NAME",
+            VolumeSerial = "1B3F1B00"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_1.6.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65384,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "80A91CF3"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_6.1.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 16369,
+            ClusterSize  = 8192,
+            SystemId     = "NetBSD  ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "40C91B1F"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_7.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 16370,
+            ClusterSize  = 8192,
+            SystemId     = "NetBSD  ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "8413181B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "openbsd_4.7.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65384,
+            ClusterSize  = 2048,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "84E407F6"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_2.0.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "PCX 2.0 ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2A6508F2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_2.0.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "PCX 2.0 ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2A6508F2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_2.1.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65383,
+            ClusterSize  = 2048,
+            SystemId     = "PCX 2.0 ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "CB430C38"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_2.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65116,
+            ClusterSize  = 2048,
+            SystemId     = "PCX_2.2 ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2A6508F2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "accesspc_2.0f6.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262174,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 65391,
+            ClusterSize = 2048,
+            SystemId    = "INSIGNIA",
+            VolumeName  = "VOLUMELABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "morphos_3.13.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65397,
+            ClusterSize  = 2048,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "519F5C06"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT16/RDB.cs b/Aaru.Tests/Filesystems/FAT16/RDB.cs
index 647e21df4..d962b8eee 100644
--- a/Aaru.Tests/Filesystems/FAT16/RDB.cs
+++ b/Aaru.Tests/Filesystems/FAT16/RDB.cs
@@ -32,44 +32,43 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT16
+namespace Aaru.Tests.Filesystems.FAT16;
+
+[TestFixture]
+public class RDB : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class RDB : ReadOnlyFilesystemTest
+    public RDB() : base("FAT16") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (RDB)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public RDB() : base("FAT16") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16 (RDB)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "amigaos_3.9.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 63655,
-                ClusterSize  = 8192,
-                SystemId     = "CDP  5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "374D40D1"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "morphos_3.13.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65347,
-                ClusterSize  = 2048,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "519F5D8B"
-            }
-        };
-    }
+            TestFile     = "amigaos_3.9.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 63655,
+            ClusterSize  = 8192,
+            SystemId     = "CDP  5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "374D40D1"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "morphos_3.13.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65347,
+            ClusterSize  = 2048,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "519F5D8B"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT16/Whole.cs b/Aaru.Tests/Filesystems/FAT16/Whole.cs
index 39844d9b3..f0d8269a6 100644
--- a/Aaru.Tests/Filesystems/FAT16/Whole.cs
+++ b/Aaru.Tests/Filesystems/FAT16/Whole.cs
@@ -32,174 +32,173 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT16
+namespace Aaru.Tests.Filesystems.FAT16;
+
+[TestFixture]
+public class Whole : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class Whole : ReadOnlyFilesystemTest
+    public Whole() : base("FAT16") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16");
+
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("FAT16") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT16");
-
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "msdos_3.30A_mf2ed.img.lz",
-                MediaType   = MediaType.ECMA_147,
-                Sectors     = 5760,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 5711,
-                ClusterSize = 512,
-                SystemId    = "MSDOS3.3"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "msdos_3.31_mf2ed.img.lz",
-                MediaType   = MediaType.ECMA_147,
-                Sectors     = 5760,
-                SectorSize  = 512,
-                Bootable    = true,
-                Clusters    = 5711,
-                ClusterSize = 512,
-                SystemId    = "IBM  3.3"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17_mf2hd.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2841,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C51D1"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.20_mf2hd.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2841,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C817B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18_mf2hd.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2841,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609CA5B2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17_mf2hd_umsdos.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2841,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C545C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.20_mf2hd_umsdos.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2841,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C87E7"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18_mf2hd_umsdos.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2841,
-                ClusterSize  = 512,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609CA685"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macos_8.5.img.lz",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 204800,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 51091,
-                ClusterSize  = 2048,
-                VolumeName   = "FAT",
-                VolumeSerial = "34050000"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macos_8.6.img.lz",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 204800,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 51091,
-                ClusterSize  = 2048,
-                VolumeName   = "FAT",
-                VolumeSerial = "A6040000"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_3.0.3.img.lz",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32731,
-                ClusterSize  = 4096,
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "A1360000"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_3.0.4.img.lz",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32731,
-                ClusterSize  = 4096,
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "4B320000"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_3.0.5.img.lz",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32731,
-                ClusterSize  = 4096,
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "E3230000"
-            }
-        };
-    }
+            TestFile    = "msdos_3.30A_mf2ed.img.lz",
+            MediaType   = MediaType.ECMA_147,
+            Sectors     = 5760,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 5711,
+            ClusterSize = 512,
+            SystemId    = "MSDOS3.3"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "msdos_3.31_mf2ed.img.lz",
+            MediaType   = MediaType.ECMA_147,
+            Sectors     = 5760,
+            SectorSize  = 512,
+            Bootable    = true,
+            Clusters    = 5711,
+            ClusterSize = 512,
+            SystemId    = "IBM  3.3"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17_mf2hd.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2841,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C51D1"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.20_mf2hd.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2841,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C817B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18_mf2hd.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2841,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609CA5B2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17_mf2hd_umsdos.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2841,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C545C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.20_mf2hd_umsdos.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2841,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C87E7"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18_mf2hd_umsdos.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2841,
+            ClusterSize  = 512,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609CA685"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macos_8.5.img.lz",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 204800,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 51091,
+            ClusterSize  = 2048,
+            VolumeName   = "FAT",
+            VolumeSerial = "34050000"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macos_8.6.img.lz",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 204800,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 51091,
+            ClusterSize  = 2048,
+            VolumeName   = "FAT",
+            VolumeSerial = "A6040000"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_3.0.3.img.lz",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32731,
+            ClusterSize  = 4096,
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "A1360000"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_3.0.4.img.lz",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32731,
+            ClusterSize  = 4096,
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "4B320000"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_3.0.5.img.lz",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32731,
+            ClusterSize  = 4096,
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "E3230000"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT32/APM.cs b/Aaru.Tests/Filesystems/FAT32/APM.cs
index 92d40fc8a..c50fd61c2 100644
--- a/Aaru.Tests/Filesystems/FAT32/APM.cs
+++ b/Aaru.Tests/Filesystems/FAT32/APM.cs
@@ -32,97 +32,96 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT32
+namespace Aaru.Tests.Filesystems.FAT32;
+
+[TestFixture]
+public class APM : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class APM : ReadOnlyFilesystemTest
+    public APM() : base("FAT32") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32 (APM)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("FAT32") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32 (APM)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "darwin_6.0.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262080,
-                ClusterSize  = 512,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "7C930CFA"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262080,
-                ClusterSize  = 512,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "44681B0D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262080,
-                ClusterSize  = 512,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "72D719E8"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 260304,
-                ClusterSize  = 512,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "7CD11609"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262064,
-                ClusterSize  = 512,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "4495131D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524278,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "35BD1F0A"
-            }
-        };
-    }
+            TestFile     = "darwin_6.0.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262080,
+            ClusterSize  = 512,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "7C930CFA"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262080,
+            ClusterSize  = 512,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "44681B0D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262080,
+            ClusterSize  = 512,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "72D719E8"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 260304,
+            ClusterSize  = 512,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "7CD11609"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262064,
+            ClusterSize  = 512,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "4495131D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524278,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "35BD1F0A"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT32/GPT.cs b/Aaru.Tests/Filesystems/FAT32/GPT.cs
index 3b38d1ac2..56e704094 100644
--- a/Aaru.Tests/Filesystems/FAT32/GPT.cs
+++ b/Aaru.Tests/Filesystems/FAT32/GPT.cs
@@ -32,32 +32,31 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT32
+namespace Aaru.Tests.Filesystems.FAT32;
+
+[TestFixture]
+public class GPT : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class GPT : ReadOnlyFilesystemTest
+    public GPT() : base("FAT32") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32 (GPT)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public GPT() : base("FAT32") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32 (GPT)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 523775,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "7ABE1F1B"
-            }
-        };
-    }
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 523775,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "7ABE1F1B"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT32/MBR.cs b/Aaru.Tests/Filesystems/FAT32/MBR.cs
index 9a1593196..60086899e 100644
--- a/Aaru.Tests/Filesystems/FAT32/MBR.cs
+++ b/Aaru.Tests/Filesystems/FAT32/MBR.cs
@@ -32,588 +32,587 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT32
+namespace Aaru.Tests.Filesystems.FAT32;
+
+[TestFixture]
+public class MBR : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class MBR : ReadOnlyFilesystemTest
+    public MBR() : base("FAT32") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32 (MBR)");
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("FAT32") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32 (MBR)");
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "darwin_6.0.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262017,
-                ClusterSize  = 512,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "03A50CFD"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262081,
-                ClusterSize  = 512,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "24981B10"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262081,
-                ClusterSize  = 512,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "829119EB"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "drdos_7.03.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 8388608,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1048233,
-                ClusterSize  = 4096,
-                SystemId     = "DRDOS7.X",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5955996C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "drdos_8.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 261009,
-                ClusterSize  = 512,
-                SystemId     = "IBM  7.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "09F93020"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "drdos_8.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 261009,
-                ClusterSize  = 512,
-                SystemId     = "IBM  7.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "09FF2765"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msdos_7.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 8388608,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1048233,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "3B331809"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262136,
-                ClusterSize  = 512,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "B4E7161C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262080,
-                ClusterSize  = 512,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "F47713E9"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524287,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "42D51EF1"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524016,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "48073346"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win2000.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 8388608,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1048233,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "EC62E6DE"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95osr2.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524152,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2A310DE4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95osr2.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524152,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0C140DFC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win95osr2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524152,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "3E310D18"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win98se.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524112,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0D3D0EED"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win98.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524112,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "0E131162"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winme.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524112,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "3F500F02"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winvista.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 523520,
-                ClusterSize  = 4096,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "82EB4C04"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "beos_r4.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 261072,
-                ClusterSize  = 512,
-                SystemId     = "BeOS    ",
-                VolumeName   = "VOLUME LABE",
-                VolumeSerial = "00000000"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.37.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "609D1CBD"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C673B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.20.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C9CCA"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609CA8D7"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.37_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "609D1F50"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C6F93"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.20_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C9FFF"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18_umsdos.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609CAC4E"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "aros.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Clusters     = 524160,
-                ClusterSize  = 4096,
-                SystemId     = "MSWIN4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "5CAC9B4E"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "freebsd_6.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32752,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "40931EFC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "freebsd_7.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32752,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "F4181EFC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "freebsd_8.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 4194304,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65514,
-                ClusterSize  = 32768,
-                SystemId     = "BSD4.4  ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "26E20E0F"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "freedos_1.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 8388608,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1048233,
-                ClusterSize  = 4096,
-                SystemId     = "FRDOS4.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "3E0C1BE8"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "ecs20_fstester.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 127744,
-                ClusterSize  = 4096,
-                SystemId     = "mkfs.fat",
-                VolumeName   = "Volume labe",
-                VolumeSerial = "63084BBA"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2_umsdos32_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 127882,
-                ClusterSize  = 4096,
-                SystemId     = "mkdosfs",
-                VolumeName   = "DICSETTER",
-                VolumeSerial = "5CC7908D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_fat32_msdos_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 127744,
-                ClusterSize  = 4096,
-                SystemId     = "mkfs.fat",
-                VolumeName   = "DICSETTER",
-                VolumeSerial = "D1290612"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_vfat32_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 127744,
-                ClusterSize  = 4096,
-                SystemId     = "mkfs.fat",
-                VolumeName   = "DICSETTER",
-                VolumeSerial = "79BCA86E"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "beos_r5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 261072,
-                ClusterSize  = 512,
-                SystemId     = "BeOS    ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "00000000"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "dflybsd_1.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32634,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "NO NAME",
-                VolumeSerial = "837A1B05"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_1.6.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "CFAD1CF7"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_6.1.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 16380,
-                ClusterSize  = 8192,
-                SystemId     = "NetBSD  ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "A1CC1BED"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 131040,
-                ClusterSize  = 1024,
-                SystemId     = "NetBSD  ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "843A181F"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "openbsd_4.7.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32634,
-                ClusterSize  = 4096,
-                SystemId     = "BSD  4.4",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "C27607FB"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "pcexchange_2.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262080,
-                ClusterSize  = 512,
-                SystemId     = "PCX_2.2 ",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "CBCE71E4"
-            }
-        };
-    }
+            TestFile     = "darwin_6.0.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262017,
+            ClusterSize  = 512,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "03A50CFD"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262081,
+            ClusterSize  = 512,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "24981B10"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262081,
+            ClusterSize  = 512,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "829119EB"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "drdos_7.03.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 8388608,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1048233,
+            ClusterSize  = 4096,
+            SystemId     = "DRDOS7.X",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5955996C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "drdos_8.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 261009,
+            ClusterSize  = 512,
+            SystemId     = "IBM  7.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "09F93020"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "drdos_8.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 261009,
+            ClusterSize  = 512,
+            SystemId     = "IBM  7.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "09FF2765"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msdos_7.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 8388608,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1048233,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "3B331809"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262136,
+            ClusterSize  = 512,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "B4E7161C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262080,
+            ClusterSize  = 512,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "F47713E9"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524287,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "42D51EF1"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524016,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "48073346"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win2000.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 8388608,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1048233,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "EC62E6DE"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95osr2.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524152,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2A310DE4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95osr2.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524152,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0C140DFC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win95osr2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524152,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "3E310D18"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win98se.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524112,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0D3D0EED"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win98.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524112,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "0E131162"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winme.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524112,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "3F500F02"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winvista.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 523520,
+            ClusterSize  = 4096,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "82EB4C04"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "beos_r4.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 261072,
+            ClusterSize  = 512,
+            SystemId     = "BeOS    ",
+            VolumeName   = "VOLUME LABE",
+            VolumeSerial = "00000000"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.37.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "609D1CBD"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C673B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.20.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C9CCA"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609CA8D7"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.37_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "609D1F50"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C6F93"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.20_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C9FFF"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18_umsdos.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609CAC4E"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "aros.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Clusters     = 524160,
+            ClusterSize  = 4096,
+            SystemId     = "MSWIN4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "5CAC9B4E"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "freebsd_6.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32752,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "40931EFC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "freebsd_7.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32752,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "F4181EFC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "freebsd_8.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 4194304,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65514,
+            ClusterSize  = 32768,
+            SystemId     = "BSD4.4  ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "26E20E0F"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "freedos_1.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 8388608,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1048233,
+            ClusterSize  = 4096,
+            SystemId     = "FRDOS4.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "3E0C1BE8"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "ecs20_fstester.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 127744,
+            ClusterSize  = 4096,
+            SystemId     = "mkfs.fat",
+            VolumeName   = "Volume labe",
+            VolumeSerial = "63084BBA"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2_umsdos32_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 127882,
+            ClusterSize  = 4096,
+            SystemId     = "mkdosfs",
+            VolumeName   = "DICSETTER",
+            VolumeSerial = "5CC7908D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_fat32_msdos_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 127744,
+            ClusterSize  = 4096,
+            SystemId     = "mkfs.fat",
+            VolumeName   = "DICSETTER",
+            VolumeSerial = "D1290612"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_vfat32_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 127744,
+            ClusterSize  = 4096,
+            SystemId     = "mkfs.fat",
+            VolumeName   = "DICSETTER",
+            VolumeSerial = "79BCA86E"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "beos_r5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 261072,
+            ClusterSize  = 512,
+            SystemId     = "BeOS    ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "00000000"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "dflybsd_1.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32634,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "NO NAME",
+            VolumeSerial = "837A1B05"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_1.6.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "CFAD1CF7"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_6.1.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 16380,
+            ClusterSize  = 8192,
+            SystemId     = "NetBSD  ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "A1CC1BED"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_7.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 131040,
+            ClusterSize  = 1024,
+            SystemId     = "NetBSD  ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "843A181F"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "openbsd_4.7.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32634,
+            ClusterSize  = 4096,
+            SystemId     = "BSD  4.4",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "C27607FB"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "pcexchange_2.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262080,
+            ClusterSize  = 512,
+            SystemId     = "PCX_2.2 ",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "CBCE71E4"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FAT32/Whole.cs b/Aaru.Tests/Filesystems/FAT32/Whole.cs
index 2b94718aa..071b633c7 100644
--- a/Aaru.Tests/Filesystems/FAT32/Whole.cs
+++ b/Aaru.Tests/Filesystems/FAT32/Whole.cs
@@ -32,121 +32,120 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FAT32
+namespace Aaru.Tests.Filesystems.FAT32;
+
+[TestFixture]
+public class Whole : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class Whole : ReadOnlyFilesystemTest
+    public Whole() : base("FAT32") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32");
+
+    public override IFilesystem Plugin     => new FAT();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("FAT32") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "FAT32");
-
-        public override IFilesystem Plugin     => new FAT();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        /*   new FileSystemTest
+           {
+               TestFile     = "beos_r4.5_mf2hd.img.lz",
+               MediaType    = MediaType.DOS_35_HD,
+               Sectors      = 2880,
+               SectorSize   = 512,
+               Bootable     = true,
+               Clusters     = 2880,
+               ClusterSize  = 512,
+               SystemId     = "BeOS    ",
+               VolumeName   = "VOLUME LABE",
+               VolumeSerial = "00000000"
+           },
+           new FileSystemTest
+           {
+               TestFile     = "beos_r5_mf2hd.img.lz",
+               MediaType    = MediaType.DOS_35_HD,
+               Sectors      = 2880,
+               SectorSize   = 512,
+               Bootable     = true,
+               Clusters     = 2880,
+               ClusterSize  = 512,
+               SystemId     = "BeOS    ",
+               VolumeName   = "VOLUMELABEL",
+               VolumeSerial = "00000000"
+           },*/ new FileSystemTest
         {
-            /*   new FileSystemTest
-               {
-                   TestFile     = "beos_r4.5_mf2hd.img.lz",
-                   MediaType    = MediaType.DOS_35_HD,
-                   Sectors      = 2880,
-                   SectorSize   = 512,
-                   Bootable     = true,
-                   Clusters     = 2880,
-                   ClusterSize  = 512,
-                   SystemId     = "BeOS    ",
-                   VolumeName   = "VOLUME LABE",
-                   VolumeSerial = "00000000"
-               },
-               new FileSystemTest
-               {
-                   TestFile     = "beos_r5_mf2hd.img.lz",
-                   MediaType    = MediaType.DOS_35_HD,
-                   Sectors      = 2880,
-                   SectorSize   = 512,
-                   Bootable     = true,
-                   Clusters     = 2880,
-                   ClusterSize  = 512,
-                   SystemId     = "BeOS    ",
-                   VolumeName   = "VOLUMELABEL",
-                   VolumeSerial = "00000000"
-               },*/ new FileSystemTest
-            {
-                TestFile     = "linux_2.0.37_mf2hd.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Clusters     = 2880,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "609D1892"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17_mf2hd.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2880,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C5215"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.20_mf2hd.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2880,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C81A9"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18_mf2hd.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2880,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609CA5D8"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.37_mf2hd_umsdos.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Clusters     = 2880,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "609D1912"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17_mf2hd_umsdos.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 2880,
-                ClusterSize  = 512,
-                SystemId     = "mkdosfs",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "609C5425"
-            }
-        };
-    }
+            TestFile     = "linux_2.0.37_mf2hd.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Clusters     = 2880,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "609D1892"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17_mf2hd.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2880,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C5215"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.20_mf2hd.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2880,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C81A9"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18_mf2hd.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2880,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609CA5D8"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.37_mf2hd_umsdos.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Clusters     = 2880,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "609D1912"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17_mf2hd_umsdos.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 2880,
+            ClusterSize  = 512,
+            SystemId     = "mkdosfs",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "609C5425"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FATX/Xbox.cs b/Aaru.Tests/Filesystems/FATX/Xbox.cs
index 5aac6979f..bbbf51b1f 100644
--- a/Aaru.Tests/Filesystems/FATX/Xbox.cs
+++ b/Aaru.Tests/Filesystems/FATX/Xbox.cs
@@ -34,30 +34,29 @@ using NUnit.Framework;
 
 // ReSharper disable StringLiteralTypo
 
-namespace Aaru.Tests.Filesystems.FATX
+namespace Aaru.Tests.Filesystems.FATX;
+
+[TestFixture]
+public class Xbox : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class Xbox : ReadOnlyFilesystemTest
+    public Xbox() : base("FATX filesystem") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Xbox FAT16", "le");
+    public override IFilesystem Plugin     => new XboxFatPlugin();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Xbox() : base("FATX filesystem") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Xbox FAT16", "le");
-        public override IFilesystem Plugin => new XboxFatPlugin();
-        public override bool Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "fatx.img.lz",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 62720,
-                SectorSize   = 512,
-                Clusters     = 1960,
-                ClusterSize  = 16384,
-                VolumeName   = "Volume láb€l",
-                VolumeSerial = "4639B7D0"
-            }
-        };
-    }
+            TestFile     = "fatx.img.lz",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 62720,
+            SectorSize   = 512,
+            Clusters     = 1960,
+            ClusterSize  = 16384,
+            VolumeName   = "Volume láb€l",
+            VolumeSerial = "4639B7D0"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FATX/Xbox360.cs b/Aaru.Tests/Filesystems/FATX/Xbox360.cs
index e5b004c02..38ee12872 100644
--- a/Aaru.Tests/Filesystems/FATX/Xbox360.cs
+++ b/Aaru.Tests/Filesystems/FATX/Xbox360.cs
@@ -32,31 +32,30 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.FATX
+namespace Aaru.Tests.Filesystems.FATX;
+
+[TestFixture]
+public class Xbox360 : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class Xbox360 : ReadOnlyFilesystemTest
+    public Xbox360() : base("FATX filesystem") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Xbox FAT16", "be");
+
+    public override IFilesystem Plugin     => new XboxFatPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Xbox360() : base("FATX filesystem") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Xbox FAT16", "be");
-
-        public override IFilesystem Plugin     => new XboxFatPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "microsoft256mb.img.lz",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 491520,
-                SectorSize   = 512,
-                Clusters     = 14848,
-                ClusterSize  = 16384,
-                VolumeName   = "",
-                VolumeSerial = "66C2E9D0"
-            }
-        };
-    }
+            TestFile     = "microsoft256mb.img.lz",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 491520,
+            SectorSize   = 512,
+            Clusters     = 14848,
+            ClusterSize  = 16384,
+            VolumeName   = "",
+            VolumeSerial = "66C2E9D0"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/FilesystemTest.cs b/Aaru.Tests/Filesystems/FilesystemTest.cs
index 8b81a24a9..d1fefec92 100644
--- a/Aaru.Tests/Filesystems/FilesystemTest.cs
+++ b/Aaru.Tests/Filesystems/FilesystemTest.cs
@@ -7,238 +7,237 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Core;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+public abstract class FilesystemTest
 {
-    public abstract class FilesystemTest
+    readonly string _fileSystemType;
+
+    public FilesystemTest() => _fileSystemType = null;
+
+    public FilesystemTest(string fileSystemType) => _fileSystemType = fileSystemType;
+
+    public abstract string      DataFolder { get; }
+    public abstract IFilesystem Plugin     { get; }
+    public abstract bool        Partitions { get; }
+
+    public abstract FileSystemTest[] Tests { get; }
+
+    [Test]
+    public void Detect()
     {
-        readonly string _fileSystemType;
+        Environment.CurrentDirectory = DataFolder;
 
-        public FilesystemTest() => _fileSystemType = null;
-
-        public FilesystemTest(string fileSystemType) => _fileSystemType = fileSystemType;
-
-        public abstract string      DataFolder { get; }
-        public abstract IFilesystem Plugin     { get; }
-        public abstract bool        Partitions { get; }
-
-        public abstract FileSystemTest[] Tests { get; }
-
-        [Test]
-        public void Detect()
+        Assert.Multiple(() =>
         {
-            Environment.CurrentDirectory = DataFolder;
-
-            Assert.Multiple(() =>
+            foreach(FileSystemTest test in Tests)
             {
-                foreach(FileSystemTest test in Tests)
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter inputFilter = filtersList.GetFilter(testFile);
+
+                Assert.IsNotNull(inputFilter, $"Filter: {testFile}");
+
+                IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
+
+                Assert.IsNotNull(image, $"Image format: {testFile}");
+
+                Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), $"Cannot open image for {testFile}");
+
+                List<string> idPlugins;
+
+                if(Partitions)
                 {
-                    string testFile = test.TestFile;
+                    List<Partition> partitionsList = Core.Partitions.GetAll(image);
 
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
+                    Assert.Greater(partitionsList.Count, 0, $"No partitions found for {testFile}");
 
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
+                    bool found = false;
 
-                    var     filtersList = new FiltersList();
-                    IFilter inputFilter = filtersList.GetFilter(testFile);
-
-                    Assert.IsNotNull(inputFilter, $"Filter: {testFile}");
-
-                    IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
-
-                    Assert.IsNotNull(image, $"Image format: {testFile}");
-
-                    Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), $"Cannot open image for {testFile}");
-
-                    List<string> idPlugins;
-
-                    if(Partitions)
+                    foreach(Partition p in partitionsList)
                     {
-                        List<Partition> partitionsList = Core.Partitions.GetAll(image);
+                        Core.Filesystems.Identify(image, out idPlugins, p, true);
 
-                        Assert.Greater(partitionsList.Count, 0, $"No partitions found for {testFile}");
+                        if(idPlugins.Count == 0)
+                            continue;
 
-                        bool found = false;
+                        if(!idPlugins.Contains(Plugin.Id.ToString()))
+                            continue;
 
-                        foreach(Partition p in partitionsList)
-                        {
-                            Core.Filesystems.Identify(image, out idPlugins, p, true);
+                        found = true;
 
-                            if(idPlugins.Count == 0)
-                                continue;
-
-                            if(!idPlugins.Contains(Plugin.Id.ToString()))
-                                continue;
-
-                            found = true;
-
-                            break;
-                        }
-
-                        Assert.True(found, $"Filesystem not identified for {testFile}");
-                    }
-                    else
-                    {
-                        var wholePart = new Partition
-                        {
-                            Name   = "Whole device",
-                            Length = image.Info.Sectors,
-                            Size   = image.Info.Sectors * image.Info.SectorSize
-                        };
-
-                        Core.Filesystems.Identify(image, out idPlugins, wholePart, true);
-
-                        Assert.Greater(idPlugins.Count, 0, $"No filesystems found for {testFile}");
-
-                        Assert.True(idPlugins.Contains(Plugin.Id.ToString()), $"Not identified for {testFile}");
-                    }
-                }
-            });
-        }
-
-        [Test]
-        public void ImageInfo()
-        {
-            Environment.CurrentDirectory = DataFolder;
-
-            Assert.Multiple(() =>
-            {
-                foreach(FileSystemTest test in Tests)
-                {
-                    string testFile = test.TestFile;
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter inputFilter = filtersList.GetFilter(testFile);
-
-                    Assert.IsNotNull(inputFilter, $"Filter: {testFile}");
-
-                    IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
-
-                    Assert.IsNotNull(image, $"Image format: {testFile}");
-
-                    Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), $"Cannot open image for {testFile}");
-
-                    Assert.AreEqual(test.MediaType, image.Info.MediaType, testFile);
-                    Assert.AreEqual(test.Sectors, image.Info.Sectors, testFile);
-                    Assert.AreEqual(test.SectorSize, image.Info.SectorSize, testFile);
-                }
-            });
-        }
-
-        [Test]
-        public void Info()
-        {
-            Environment.CurrentDirectory = DataFolder;
-
-            Assert.Multiple(() =>
-            {
-                foreach(FileSystemTest test in Tests)
-                {
-                    string testFile  = test.TestFile;
-                    bool   found     = false;
-                    var    partition = new Partition();
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter inputFilter = filtersList.GetFilter(testFile);
-
-                    Assert.IsNotNull(inputFilter, $"Filter: {testFile}");
-
-                    IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
-
-                    Assert.IsNotNull(image, $"Image format: {testFile}");
-
-                    Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), $"Cannot open image for {testFile}");
-
-                    List<string> idPlugins;
-
-                    if(Partitions)
-                    {
-                        List<Partition> partitionsList = Core.Partitions.GetAll(image);
-
-                        Assert.Greater(partitionsList.Count, 0, $"No partitions found for {testFile}");
-
-                        // In reverse to skip boot partitions we're not interested in
-                        for(int index = partitionsList.Count - 1; index >= 0; index--)
-                        {
-                            Core.Filesystems.Identify(image, out idPlugins, partitionsList[index], true);
-
-                            if(idPlugins.Count == 0)
-                                continue;
-
-                            if(!idPlugins.Contains(Plugin.Id.ToString()))
-                                continue;
-
-                            found     = true;
-                            partition = partitionsList[index];
-
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        partition = new Partition
-                        {
-                            Name   = "Whole device",
-                            Length = image.Info.Sectors,
-                            Size   = image.Info.Sectors * image.Info.SectorSize
-                        };
-
-                        Core.Filesystems.Identify(image, out idPlugins, partition, true);
-
-                        Assert.Greater(idPlugins.Count, 0, $"No filesystems found for {testFile}");
-
-                        found = idPlugins.Contains(Plugin.Id.ToString());
+                        break;
                     }
 
                     Assert.True(found, $"Filesystem not identified for {testFile}");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It is not the case, it changes
-                    if(!found)
-                        continue;
-
-                    var fs = Activator.CreateInstance(Plugin.GetType()) as IFilesystem;
-
-                    Assert.NotNull(fs, $"Could not instantiate filesystem for {testFile}");
-
-                    fs.GetInformation(image, partition, out _, null);
-
-                    if(test.ApplicationId != null)
-                        Assert.AreEqual(test.ApplicationId, fs.XmlFsType.ApplicationIdentifier,
-                                        $"Application ID: {testFile}");
-
-                    Assert.AreEqual(test.Bootable, fs.XmlFsType.Bootable, $"Bootable: {testFile}");
-                    Assert.AreEqual(test.Clusters, fs.XmlFsType.Clusters, $"Clusters: {testFile}");
-                    Assert.AreEqual(test.ClusterSize, fs.XmlFsType.ClusterSize, $"Cluster size: {testFile}");
-
-                    if(test.SystemId != null)
-                        Assert.AreEqual(test.SystemId, fs.XmlFsType.SystemIdentifier, $"System ID: {testFile}");
-
-                    Assert.AreEqual(_fileSystemType ?? test.Type, fs.XmlFsType.Type, $"Filesystem type: {testFile}");
-
-                    Assert.AreEqual(test.VolumeName, fs.XmlFsType.VolumeName, $"Volume name: {testFile}");
-                    Assert.AreEqual(test.VolumeSerial, fs.XmlFsType.VolumeSerial, $"Volume serial: {testFile}");
                 }
-            });
-        }
+                else
+                {
+                    var wholePart = new Partition
+                    {
+                        Name   = "Whole device",
+                        Length = image.Info.Sectors,
+                        Size   = image.Info.Sectors * image.Info.SectorSize
+                    };
+
+                    Core.Filesystems.Identify(image, out idPlugins, wholePart, true);
+
+                    Assert.Greater(idPlugins.Count, 0, $"No filesystems found for {testFile}");
+
+                    Assert.True(idPlugins.Contains(Plugin.Id.ToString()), $"Not identified for {testFile}");
+                }
+            }
+        });
+    }
+
+    [Test]
+    public void ImageInfo()
+    {
+        Environment.CurrentDirectory = DataFolder;
+
+        Assert.Multiple(() =>
+        {
+            foreach(FileSystemTest test in Tests)
+            {
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter inputFilter = filtersList.GetFilter(testFile);
+
+                Assert.IsNotNull(inputFilter, $"Filter: {testFile}");
+
+                IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
+
+                Assert.IsNotNull(image, $"Image format: {testFile}");
+
+                Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), $"Cannot open image for {testFile}");
+
+                Assert.AreEqual(test.MediaType, image.Info.MediaType, testFile);
+                Assert.AreEqual(test.Sectors, image.Info.Sectors, testFile);
+                Assert.AreEqual(test.SectorSize, image.Info.SectorSize, testFile);
+            }
+        });
+    }
+
+    [Test]
+    public void Info()
+    {
+        Environment.CurrentDirectory = DataFolder;
+
+        Assert.Multiple(() =>
+        {
+            foreach(FileSystemTest test in Tests)
+            {
+                string testFile  = test.TestFile;
+                bool   found     = false;
+                var    partition = new Partition();
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter inputFilter = filtersList.GetFilter(testFile);
+
+                Assert.IsNotNull(inputFilter, $"Filter: {testFile}");
+
+                IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
+
+                Assert.IsNotNull(image, $"Image format: {testFile}");
+
+                Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), $"Cannot open image for {testFile}");
+
+                List<string> idPlugins;
+
+                if(Partitions)
+                {
+                    List<Partition> partitionsList = Core.Partitions.GetAll(image);
+
+                    Assert.Greater(partitionsList.Count, 0, $"No partitions found for {testFile}");
+
+                    // In reverse to skip boot partitions we're not interested in
+                    for(int index = partitionsList.Count - 1; index >= 0; index--)
+                    {
+                        Core.Filesystems.Identify(image, out idPlugins, partitionsList[index], true);
+
+                        if(idPlugins.Count == 0)
+                            continue;
+
+                        if(!idPlugins.Contains(Plugin.Id.ToString()))
+                            continue;
+
+                        found     = true;
+                        partition = partitionsList[index];
+
+                        break;
+                    }
+                }
+                else
+                {
+                    partition = new Partition
+                    {
+                        Name   = "Whole device",
+                        Length = image.Info.Sectors,
+                        Size   = image.Info.Sectors * image.Info.SectorSize
+                    };
+
+                    Core.Filesystems.Identify(image, out idPlugins, partition, true);
+
+                    Assert.Greater(idPlugins.Count, 0, $"No filesystems found for {testFile}");
+
+                    found = idPlugins.Contains(Plugin.Id.ToString());
+                }
+
+                Assert.True(found, $"Filesystem not identified for {testFile}");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It is not the case, it changes
+                if(!found)
+                    continue;
+
+                var fs = Activator.CreateInstance(Plugin.GetType()) as IFilesystem;
+
+                Assert.NotNull(fs, $"Could not instantiate filesystem for {testFile}");
+
+                fs.GetInformation(image, partition, out _, null);
+
+                if(test.ApplicationId != null)
+                    Assert.AreEqual(test.ApplicationId, fs.XmlFsType.ApplicationIdentifier,
+                                    $"Application ID: {testFile}");
+
+                Assert.AreEqual(test.Bootable, fs.XmlFsType.Bootable, $"Bootable: {testFile}");
+                Assert.AreEqual(test.Clusters, fs.XmlFsType.Clusters, $"Clusters: {testFile}");
+                Assert.AreEqual(test.ClusterSize, fs.XmlFsType.ClusterSize, $"Cluster size: {testFile}");
+
+                if(test.SystemId != null)
+                    Assert.AreEqual(test.SystemId, fs.XmlFsType.SystemIdentifier, $"System ID: {testFile}");
+
+                Assert.AreEqual(_fileSystemType ?? test.Type, fs.XmlFsType.Type, $"Filesystem type: {testFile}");
+
+                Assert.AreEqual(test.VolumeName, fs.XmlFsType.VolumeName, $"Volume name: {testFile}");
+                Assert.AreEqual(test.VolumeSerial, fs.XmlFsType.VolumeSerial, $"Volume serial: {testFile}");
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HAMMER.cs b/Aaru.Tests/Filesystems/HAMMER.cs
index 8ef1ce595..83b928dd8 100644
--- a/Aaru.Tests/Filesystems/HAMMER.cs
+++ b/Aaru.Tests/Filesystems/HAMMER.cs
@@ -32,41 +32,40 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Hammer : FilesystemTest
 {
-    [TestFixture]
-    public class Hammer : FilesystemTest
+    public Hammer() : base("HAMMER") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "HAMMER (MBR)");
+    public override IFilesystem Plugin     => new HAMMER();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Hammer() : base("HAMMER") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "HAMMER (MBR)");
-        public override IFilesystem Plugin     => new HAMMER();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "dflybsd_3.6.1.vdi.lz",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 104857600,
-                SectorSize   = 512,
-                Clusters     = 6310,
-                ClusterSize  = 8388608,
-                VolumeName   = "Volume label",
-                VolumeSerial = "f8e1a8bb-626d-11e7-94b5-0900274691e4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "dflybsd_4.0.5.vdi.lz",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 104857600,
-                SectorSize   = 512,
-                Clusters     = 6310,
-                ClusterSize  = 8388608,
-                VolumeName   = "Volume label",
-                VolumeSerial = "ff4dc664-6276-11e7-983f-090027c41b46"
-            }
-        };
-    }
+            TestFile     = "dflybsd_3.6.1.vdi.lz",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 104857600,
+            SectorSize   = 512,
+            Clusters     = 6310,
+            ClusterSize  = 8388608,
+            VolumeName   = "Volume label",
+            VolumeSerial = "f8e1a8bb-626d-11e7-94b5-0900274691e4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "dflybsd_4.0.5.vdi.lz",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 104857600,
+            SectorSize   = 512,
+            Clusters     = 6310,
+            ClusterSize  = 8388608,
+            VolumeName   = "Volume label",
+            VolumeSerial = "ff4dc664-6276-11e7-983f-090027c41b46"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFS+/APM.cs b/Aaru.Tests/Filesystems/HFS+/APM.cs
index f8e0fe1fb..4fbabb37d 100644
--- a/Aaru.Tests/Filesystems/HFS+/APM.cs
+++ b/Aaru.Tests/Filesystems/HFS+/APM.cs
@@ -34,262 +34,261 @@ using NUnit.Framework;
 
 // ReSharper disable CheckNamespace
 
-namespace Aaru.Tests.Filesystems.HFSPlus
+namespace Aaru.Tests.Filesystems.HFSPlus;
+
+[TestFixture]
+public class APM : FilesystemTest
 {
-    [TestFixture]
-    public class APM : FilesystemTest
+    public APM() : base("HFS+") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS+ (APM)");
+    public override IFilesystem Plugin     => new AppleHFSPlus();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("HFS+") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS+ (APM)");
-        public override IFilesystem Plugin => new AppleHFSPlus();
-        public override bool Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 51190,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "FA94762D086A18A9"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 614400,
-                SectorSize   = 512,
-                Clusters     = 76790,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "33D4A309C8E7BD10"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32760,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32760,
-                ClusterSize = 4096,
-                SystemId    = "8.10"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32760,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.4.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32760,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_6.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32760,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "DF8853FD178AE8BE"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "6FE2BC81D9725A6B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "06309CEDD929D53A"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "4A3AE13A1F410E25"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_8.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 261340,
-                ClusterSize = 512,
-                SystemId    = "8.10"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.0.4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 260824,
-                ClusterSize = 512,
-                SystemId    = "8.10"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 260828,
-                ClusterSize = 512,
-                SystemId    = "8.10"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.2.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 260828,
-                ClusterSize = 512,
-                SystemId    = "8.10"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.2.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 260824,
-                ClusterSize = 512,
-                SystemId    = "8.10"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32526,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "ED2DC1BFDBB80AFB"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32526,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "6CEAA69B7E8E154A"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32526,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "BDCB2D31BDBD60CD"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32525,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "7FDF37D35B3C220A"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32525,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "EA42A9AC5FAC2CE3"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32525,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "05A25B5EF0D99402"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32525,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "2812682CF7B8EB3B"
-            }
-        };
-    }
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 51190,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "FA94762D086A18A9"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 614400,
+            SectorSize   = 512,
+            Clusters     = 76790,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "33D4A309C8E7BD10"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32760,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32760,
+            ClusterSize = 4096,
+            SystemId    = "8.10"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32760,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.4.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32760,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_6.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32760,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "DF8853FD178AE8BE"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "6FE2BC81D9725A6B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "06309CEDD929D53A"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "4A3AE13A1F410E25"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_8.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 261340,
+            ClusterSize = 512,
+            SystemId    = "8.10"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.0.4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 260824,
+            ClusterSize = 512,
+            SystemId    = "8.10"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 260828,
+            ClusterSize = 512,
+            SystemId    = "8.10"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.2.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 260828,
+            ClusterSize = 512,
+            SystemId    = "8.10"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.2.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 260824,
+            ClusterSize = 512,
+            SystemId    = "8.10"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32526,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "ED2DC1BFDBB80AFB"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32526,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "6CEAA69B7E8E154A"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32526,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "BDCB2D31BDBD60CD"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.3_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32525,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "7FDF37D35B3C220A"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32525,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "EA42A9AC5FAC2CE3"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32525,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "05A25B5EF0D99402"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32525,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "2812682CF7B8EB3B"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFS+/GPT.cs b/Aaru.Tests/Filesystems/HFS+/GPT.cs
index 36e875848..ab76db907 100644
--- a/Aaru.Tests/Filesystems/HFS+/GPT.cs
+++ b/Aaru.Tests/Filesystems/HFS+/GPT.cs
@@ -34,41 +34,40 @@ using NUnit.Framework;
 
 // ReSharper disable CheckNamespace
 
-namespace Aaru.Tests.Filesystems.HFSPlus
+namespace Aaru.Tests.Filesystems.HFSPlus;
+
+[TestFixture]
+public class GPT : FilesystemTest
 {
-    [TestFixture]
-    public class GPT : FilesystemTest
+    public GPT() : base("HFS+") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS+ (GPT)");
+    public override IFilesystem Plugin     => new AppleHFSPlus();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public GPT() : base("HFS+") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS+ (GPT)");
-        public override IFilesystem Plugin => new AppleHFSPlus();
-        public override bool Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 51190,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "D8C68470046E67BE"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 614400,
-                SectorSize   = 512,
-                Clusters     = 76790,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "FD3CB598F3C6294A"
-            }
-        };
-    }
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 51190,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "D8C68470046E67BE"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 614400,
+            SectorSize   = 512,
+            Clusters     = 76790,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "FD3CB598F3C6294A"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFS+/MBR.cs b/Aaru.Tests/Filesystems/HFS+/MBR.cs
index 0818eb459..b8aa7dbf5 100644
--- a/Aaru.Tests/Filesystems/HFS+/MBR.cs
+++ b/Aaru.Tests/Filesystems/HFS+/MBR.cs
@@ -34,191 +34,190 @@ using NUnit.Framework;
 
 // ReSharper disable CheckNamespace
 
-namespace Aaru.Tests.Filesystems.HFSPlus
+namespace Aaru.Tests.Filesystems.HFSPlus;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("HFS+") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS+ (MBR)");
+
+    public override IFilesystem Plugin     => new AppleHFSPlus();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("HFS+") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS+ (MBR)");
-
-        public override IFilesystem Plugin     => new AppleHFSPlus();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32767,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "97B4DC7AC201699A"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32767,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "9BF2CE504121C20F"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "092FD8AF262EAE9C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "326CC53BB867CCDC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 303104,
-                SectorSize   = 512,
-                Clusters     = 37878,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "C84F550907D13F50"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 352256,
-                SectorSize   = 512,
-                Clusters     = 44021,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "016599F88029F73D"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32512,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_journal.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32512,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32752,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.4.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32752,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_6.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32752,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "B2B3DCFC3EBF92F9"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "EF9142272A79F2C7"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "191CACE470B64449"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "27E25570C58F3CDB"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_hfs+_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 127744,
-                ClusterSize  = 4096,
-                SystemId     = "H+Lx",
-                VolumeSerial = "B9BAC6856878A404"
-            }
-        };
-    }
+            TestFile     = "macosx_10.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32767,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "97B4DC7AC201699A"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.3_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32767,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "9BF2CE504121C20F"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "092FD8AF262EAE9C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "326CC53BB867CCDC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 303104,
+            SectorSize   = 512,
+            Clusters     = 37878,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "C84F550907D13F50"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 352256,
+            SectorSize   = 512,
+            Clusters     = 44021,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "016599F88029F73D"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32512,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_journal.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32512,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32752,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.4.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32752,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_6.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32752,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "B2B3DCFC3EBF92F9"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "EF9142272A79F2C7"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "191CACE470B64449"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "27E25570C58F3CDB"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_hfs+_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 127744,
+            ClusterSize  = 4096,
+            SystemId     = "H+Lx",
+            VolumeSerial = "B9BAC6856878A404"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFS/APM.cs b/Aaru.Tests/Filesystems/HFS/APM.cs
index 1e2f5bbee..792a23efd 100644
--- a/Aaru.Tests/Filesystems/HFS/APM.cs
+++ b/Aaru.Tests/Filesystems/HFS/APM.cs
@@ -32,479 +32,478 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.HFS
+namespace Aaru.Tests.Filesystems.HFS;
+
+[TestFixture]
+public class APM : FilesystemTest
 {
-    [TestFixture]
-    public class APM : FilesystemTest
+    public APM() : base("HFS") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (APM)");
+    public override IFilesystem Plugin     => new AppleHFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("HFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (APM)");
-        public override IFilesystem Plugin => new AppleHFS();
-        public override bool Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "amigaos_3.9.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024128,
-                SectorSize  = 512,
-                Clusters    = 64003,
-                ClusterSize = 8192,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32758,
-                ClusterSize = 4096,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32758,
-                ClusterSize = 4096,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.4.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32758,
-                ClusterSize = 4096,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_6.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65514,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65514,
-                ClusterSize  = 2048,
-                VolumeName   = "Volume label",
-                VolumeSerial = "AE72FE7C300796B3"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65514,
-                ClusterSize  = 2048,
-                VolumeName   = "Volume label",
-                VolumeSerial = "5D4A28AA69D62082"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_1.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 41820,
-                SectorSize  = 512,
-                Clusters    = 41788,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_2.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 41820,
-                SectorSize  = 512,
-                Clusters    = 38950,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_4.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 41820,
-                SectorSize  = 512,
-                Clusters    = 38950,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_4.3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 41820,
-                SectorSize  = 512,
-                Clusters    = 38950,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_6.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 41820,
-                SectorSize  = 512,
-                Clusters    = 38950,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_6.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 54840,
-                SectorSize  = 512,
-                Clusters    = 38950,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_6.0.3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 54840,
-                SectorSize  = 512,
-                Clusters    = 38950,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_6.0.4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 54840,
-                SectorSize  = 512,
-                Clusters    = 7673,
-                ClusterSize = 512,
-                VolumeName  = "Test disk"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_6.0.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 54840,
-                SectorSize  = 512,
-                Clusters    = 38950,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_6.0.7.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 81648,
-                SectorSize  = 512,
-                Clusters    = 39991,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_6.0.8.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 54840,
-                SectorSize  = 512,
-                Clusters    = 38950,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_7.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 54840,
-                SectorSize  = 512,
-                Clusters    = 38950,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_7.1.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65504,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_7.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Bootable    = true,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65350,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_7.5.3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65352,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_7.6.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65352,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_8.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Bootable    = true,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65352,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_8.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Bootable    = true,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65352,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.0.4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65224,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65224,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.2.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65224,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.2.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65224,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32537,
-                ClusterSize  = 4096,
-                VolumeName   = "Volume label",
-                VolumeSerial = "BD1F12F12468C949"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32537,
-                ClusterSize  = 4096,
-                VolumeName   = "Volume label",
-                VolumeSerial = "6AC7046792447A85"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.2.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65072,
-                ClusterSize  = 2048,
-                VolumeName   = "Volume label",
-                VolumeSerial = "8D00F9766E58A900"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65070,
-                ClusterSize  = 2048,
-                VolumeName   = "Volume label",
-                VolumeSerial = "4D9FC602A1273D8D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65070,
-                ClusterSize  = 2048,
-                VolumeName   = "Volume label",
-                VolumeSerial = "B28973FD0129BD10"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "rhapsody_dr1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 409600,
-                SectorSize  = 512,
-                Clusters    = 58506,
-                ClusterSize = 3584,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "d2_driver.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 51200,
-                SectorSize  = 512,
-                Clusters    = 50926,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "hdt_1.8.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 51200,
-                SectorSize  = 512,
-                Clusters    = 50094,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "parted.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 46071,
-                ClusterSize = 1024,
-                VolumeName  = "Untitled"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "silverlining_2.2.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 51200,
-                SectorSize  = 512,
-                Clusters    = 50382,
-                ClusterSize = 512,
-                VolumeName  = "Untitled  #1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "speedtools_3.6.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 51200,
-                SectorSize  = 512,
-                Clusters    = 49135,
-                ClusterSize = 512,
-                VolumeName  = "24 MB Disk"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "nextstep_3.3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65224,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openstep_4.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65224,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openstep_4.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65224,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "aux_3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65504,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "morphos_3.13.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65499,
-                ClusterSize = 2048,
-                VolumeName  = "VolumeLabel"
-            }
-        };
-    }
+            TestFile    = "amigaos_3.9.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024128,
+            SectorSize  = 512,
+            Clusters    = 64003,
+            ClusterSize = 8192,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32758,
+            ClusterSize = 4096,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32758,
+            ClusterSize = 4096,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.4.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32758,
+            ClusterSize = 4096,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_6.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65514,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65514,
+            ClusterSize  = 2048,
+            VolumeName   = "Volume label",
+            VolumeSerial = "AE72FE7C300796B3"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65514,
+            ClusterSize  = 2048,
+            VolumeName   = "Volume label",
+            VolumeSerial = "5D4A28AA69D62082"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_1.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 41820,
+            SectorSize  = 512,
+            Clusters    = 41788,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_2.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 41820,
+            SectorSize  = 512,
+            Clusters    = 38950,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_4.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 41820,
+            SectorSize  = 512,
+            Clusters    = 38950,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_4.3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 41820,
+            SectorSize  = 512,
+            Clusters    = 38950,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_6.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 41820,
+            SectorSize  = 512,
+            Clusters    = 38950,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_6.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 54840,
+            SectorSize  = 512,
+            Clusters    = 38950,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_6.0.3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 54840,
+            SectorSize  = 512,
+            Clusters    = 38950,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_6.0.4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 54840,
+            SectorSize  = 512,
+            Clusters    = 7673,
+            ClusterSize = 512,
+            VolumeName  = "Test disk"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_6.0.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 54840,
+            SectorSize  = 512,
+            Clusters    = 38950,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_6.0.7.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 81648,
+            SectorSize  = 512,
+            Clusters    = 39991,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_6.0.8.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 54840,
+            SectorSize  = 512,
+            Clusters    = 38950,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_7.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 54840,
+            SectorSize  = 512,
+            Clusters    = 38950,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_7.1.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65504,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_7.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Bootable    = true,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65350,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_7.5.3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65352,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_7.6.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65352,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_8.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Bootable    = true,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65352,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_8.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Bootable    = true,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65352,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.0.4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65224,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65224,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.2.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65224,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.2.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65224,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32537,
+            ClusterSize  = 4096,
+            VolumeName   = "Volume label",
+            VolumeSerial = "BD1F12F12468C949"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32537,
+            ClusterSize  = 4096,
+            VolumeName   = "Volume label",
+            VolumeSerial = "6AC7046792447A85"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.2.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65072,
+            ClusterSize  = 2048,
+            VolumeName   = "Volume label",
+            VolumeSerial = "8D00F9766E58A900"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65070,
+            ClusterSize  = 2048,
+            VolumeName   = "Volume label",
+            VolumeSerial = "4D9FC602A1273D8D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65070,
+            ClusterSize  = 2048,
+            VolumeName   = "Volume label",
+            VolumeSerial = "B28973FD0129BD10"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "rhapsody_dr1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 409600,
+            SectorSize  = 512,
+            Clusters    = 58506,
+            ClusterSize = 3584,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "d2_driver.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 51200,
+            SectorSize  = 512,
+            Clusters    = 50926,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "hdt_1.8.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 51200,
+            SectorSize  = 512,
+            Clusters    = 50094,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "parted.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 46071,
+            ClusterSize = 1024,
+            VolumeName  = "Untitled"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "silverlining_2.2.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 51200,
+            SectorSize  = 512,
+            Clusters    = 50382,
+            ClusterSize = 512,
+            VolumeName  = "Untitled  #1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "speedtools_3.6.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 51200,
+            SectorSize  = 512,
+            Clusters    = 49135,
+            ClusterSize = 512,
+            VolumeName  = "24 MB Disk"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "nextstep_3.3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65224,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openstep_4.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65224,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openstep_4.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65224,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "aux_3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65504,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "morphos_3.13.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65499,
+            ClusterSize = 2048,
+            VolumeName  = "VolumeLabel"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFS/MBR.cs b/Aaru.Tests/Filesystems/HFS/MBR.cs
index 6dd164517..28ab2231c 100644
--- a/Aaru.Tests/Filesystems/HFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/HFS/MBR.cs
@@ -32,113 +32,112 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.HFS
+namespace Aaru.Tests.Filesystems.HFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("HFS") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (MBR)");
+    public override IFilesystem Plugin     => new AppleHFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("HFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (MBR)");
-        public override IFilesystem Plugin => new AppleHFS();
-        public override bool Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65528,
-                ClusterSize  = 2048,
-                VolumeName   = "Volume label",
-                VolumeSerial = "5426B36FBE19CF1E"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65514,
-                ClusterSize  = 2048,
-                VolumeName   = "Volume label",
-                VolumeSerial = "E7E1830009BA60A8"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65018,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32750,
-                ClusterSize = 4096,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_1.4.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32750,
-                ClusterSize = 4096,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "darwin_6.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65499,
-                ClusterSize = 2048,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65515,
-                ClusterSize  = 2048,
-                VolumeName   = "Volume label",
-                VolumeSerial = "8BF73DE208CD7E7B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65515,
-                ClusterSize  = 2048,
-                VolumeName   = "Volume label",
-                VolumeSerial = "D149994212CC652E"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_4.19_hfs_flashdrive.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 63870,
-                ClusterSize = 8192,
-                VolumeName  = "DicSetter"
-            }
-        };
-    }
+            TestFile     = "macosx_10.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65528,
+            ClusterSize  = 2048,
+            VolumeName   = "Volume label",
+            VolumeSerial = "5426B36FBE19CF1E"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65514,
+            ClusterSize  = 2048,
+            VolumeName   = "Volume label",
+            VolumeSerial = "E7E1830009BA60A8"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65018,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32750,
+            ClusterSize = 4096,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_1.4.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32750,
+            ClusterSize = 4096,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "darwin_6.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65499,
+            ClusterSize = 2048,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65515,
+            ClusterSize  = 2048,
+            VolumeName   = "Volume label",
+            VolumeSerial = "8BF73DE208CD7E7B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65515,
+            ClusterSize  = 2048,
+            VolumeName   = "Volume label",
+            VolumeSerial = "D149994212CC652E"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_4.19_hfs_flashdrive.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 63870,
+            ClusterSize = 8192,
+            VolumeName  = "DicSetter"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFS/Optical.cs b/Aaru.Tests/Filesystems/HFS/Optical.cs
index 1a3eabf25..ab02c076a 100644
--- a/Aaru.Tests/Filesystems/HFS/Optical.cs
+++ b/Aaru.Tests/Filesystems/HFS/Optical.cs
@@ -32,79 +32,78 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.HFS
+namespace Aaru.Tests.Filesystems.HFS;
+
+[TestFixture]
+public class Optical : FilesystemTest
 {
-    [TestFixture]
-    public class Optical : FilesystemTest
+    public Optical() : base("HFS") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (CD-ROM)");
+    public override IFilesystem Plugin     => new AppleHFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Optical() : base("HFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (CD-ROM)");
-        public override IFilesystem Plugin => new AppleHFS();
-        public override bool Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "toast_3.5.7_hfs_from_volume.aif",
-                MediaType   = MediaType.CD,
-                Sectors     = 942,
-                SectorSize  = 2048,
-                Clusters    = 3724,
-                ClusterSize = 512,
-                VolumeName  = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "toast_3.5.7_iso9660_hfs.aif",
-                MediaType   = MediaType.CD,
-                Sectors     = 1880,
-                SectorSize  = 2048,
-                Clusters    = 931,
-                ClusterSize = 2048,
-                VolumeName  = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "toast_4.1.3_hfs_from_volume.aif",
-                MediaType   = MediaType.CD,
-                Sectors     = 943,
-                SectorSize  = 2048,
-                Clusters    = 931,
-                ClusterSize = 2048,
-                VolumeName  = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "toast_4.1.3_iso9660_hfs.aif",
-                MediaType   = MediaType.CD,
-                Sectors     = 1882,
-                SectorSize  = 2048,
-                Clusters    = 931,
-                ClusterSize = 2048,
-                VolumeName  = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "toast_3.5.7_hfs_from_files.aif",
-                MediaType   = MediaType.CD,
-                Sectors     = 1509,
-                SectorSize  = 2048,
-                Clusters    = 249,
-                ClusterSize = 12288,
-                VolumeName  = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "toast_4.1.3_hfs_from_files.aif",
-                MediaType   = MediaType.CD,
-                Sectors     = 1529,
-                SectorSize  = 2048,
-                Clusters    = 249,
-                ClusterSize = 12288,
-                VolumeName  = "Disk utils"
-            }
-        };
-    }
+            TestFile    = "toast_3.5.7_hfs_from_volume.aif",
+            MediaType   = MediaType.CD,
+            Sectors     = 942,
+            SectorSize  = 2048,
+            Clusters    = 3724,
+            ClusterSize = 512,
+            VolumeName  = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "toast_3.5.7_iso9660_hfs.aif",
+            MediaType   = MediaType.CD,
+            Sectors     = 1880,
+            SectorSize  = 2048,
+            Clusters    = 931,
+            ClusterSize = 2048,
+            VolumeName  = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "toast_4.1.3_hfs_from_volume.aif",
+            MediaType   = MediaType.CD,
+            Sectors     = 943,
+            SectorSize  = 2048,
+            Clusters    = 931,
+            ClusterSize = 2048,
+            VolumeName  = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "toast_4.1.3_iso9660_hfs.aif",
+            MediaType   = MediaType.CD,
+            Sectors     = 1882,
+            SectorSize  = 2048,
+            Clusters    = 931,
+            ClusterSize = 2048,
+            VolumeName  = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "toast_3.5.7_hfs_from_files.aif",
+            MediaType   = MediaType.CD,
+            Sectors     = 1509,
+            SectorSize  = 2048,
+            Clusters    = 249,
+            ClusterSize = 12288,
+            VolumeName  = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "toast_4.1.3_hfs_from_files.aif",
+            MediaType   = MediaType.CD,
+            Sectors     = 1529,
+            SectorSize  = 2048,
+            Clusters    = 249,
+            ClusterSize = 12288,
+            VolumeName  = "Disk utils"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFS/RDB.cs b/Aaru.Tests/Filesystems/HFS/RDB.cs
index ca26c5469..a9144891a 100644
--- a/Aaru.Tests/Filesystems/HFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/HFS/RDB.cs
@@ -32,29 +32,28 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.HFS
+namespace Aaru.Tests.Filesystems.HFS;
+
+[TestFixture]
+public class RDB : FilesystemTest
 {
-    [TestFixture]
-    public class RDB : FilesystemTest
+    public RDB() : base("HFS") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (RDB)");
+    public override IFilesystem Plugin     => new AppleHFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public RDB() : base("HFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS (RDB)");
-        public override IFilesystem Plugin => new AppleHFS();
-        public override bool Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "amigaos_3.9.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024128,
-                SectorSize  = 512,
-                Clusters    = 63752,
-                ClusterSize = 8192,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "amigaos_3.9.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024128,
+            SectorSize  = 512,
+            Clusters    = 63752,
+            ClusterSize = 8192,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFS/Whole.cs b/Aaru.Tests/Filesystems/HFS/Whole.cs
index edd26c635..15d947b80 100644
--- a/Aaru.Tests/Filesystems/HFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/HFS/Whole.cs
@@ -32,130 +32,129 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.HFS
+namespace Aaru.Tests.Filesystems.HFS;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("HFS") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS");
+
+    public override IFilesystem Plugin     => new AppleHFS();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("HFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFS");
-
-        public override IFilesystem Plugin     => new AppleHFS();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "macos_1.1_mf2dd.img.lz",
-                MediaType   = MediaType.AppleSonyDS,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Clusters    = 1594,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_2.0_mf2dd.img.lz",
-                MediaType   = MediaType.AppleSonyDS,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Clusters    = 1594,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_6.0.7_mf2dd.img.lz",
-                MediaType   = MediaType.AppleSonyDS,
-                Sectors     = 1600,
-                SectorSize  = 512,
-                Clusters    = 1594,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "nextstep_3.3_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2874,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openstep_4.0_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2874,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openstep_4.2_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2874,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "rhapsody_dr1_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2874,
-                ClusterSize = 512,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ecs20_mf2hd_fstester.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2874,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.17_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2874,
-                ClusterSize = 512,
-                VolumeName  = "VolumeLabel"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.20_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2874,
-                ClusterSize = 512,
-                VolumeName  = "VolumeLabel"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.4.18_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2874,
-                ClusterSize = 512,
-                VolumeName  = "VolumeLabel"
-            }
-        };
-    }
+            TestFile    = "macos_1.1_mf2dd.img.lz",
+            MediaType   = MediaType.AppleSonyDS,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Clusters    = 1594,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_2.0_mf2dd.img.lz",
+            MediaType   = MediaType.AppleSonyDS,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Clusters    = 1594,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_6.0.7_mf2dd.img.lz",
+            MediaType   = MediaType.AppleSonyDS,
+            Sectors     = 1600,
+            SectorSize  = 512,
+            Clusters    = 1594,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "nextstep_3.3_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2874,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openstep_4.0_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2874,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openstep_4.2_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2874,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "rhapsody_dr1_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2874,
+            ClusterSize = 512,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ecs20_mf2hd_fstester.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2874,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.2.17_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2874,
+            ClusterSize = 512,
+            VolumeName  = "VolumeLabel"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.2.20_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2874,
+            ClusterSize = 512,
+            VolumeName  = "VolumeLabel"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.4.18_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2874,
+            ClusterSize = 512,
+            VolumeName  = "VolumeLabel"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFSX/APM.cs b/Aaru.Tests/Filesystems/HFSX/APM.cs
index ee93c2c6d..1096b25e2 100644
--- a/Aaru.Tests/Filesystems/HFSX/APM.cs
+++ b/Aaru.Tests/Filesystems/HFSX/APM.cs
@@ -32,107 +32,106 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.HFSX
+namespace Aaru.Tests.Filesystems.HFSX;
+
+[TestFixture]
+public class APM : FilesystemTest
 {
-    [TestFixture]
-    public class APM : FilesystemTest
+    public APM() : base("HFSX") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFSX (APM)");
+    public override IFilesystem Plugin     => new AppleHFSPlus();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("HFSX") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFSX (APM)");
-        public override IFilesystem Plugin => new AppleHFSPlus();
-        public override bool Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32758,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "62F6BD837D62D1DB"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.4.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32758,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "32517120509F8539"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 819200,
-                SectorSize   = 512,
-                Clusters     = 102390,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "CC2D56884950D9AE"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1228800,
-                SectorSize   = 512,
-                Clusters     = 153590,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "7AF1175D8EA7A072"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "675A390EBFDFC534"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "EA0C27012D10135B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "50059A9AA0119AD3"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "BCA9EBC858957259"
-            }
-        };
-    }
+            TestFile     = "macosx_10.4_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32758,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "62F6BD837D62D1DB"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.4.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32758,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "32517120509F8539"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 819200,
+            SectorSize   = 512,
+            Clusters     = 102390,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "CC2D56884950D9AE"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1228800,
+            SectorSize   = 512,
+            Clusters     = 153590,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "7AF1175D8EA7A072"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "675A390EBFDFC534"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "EA0C27012D10135B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "50059A9AA0119AD3"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "BCA9EBC858957259"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFSX/GPT.cs b/Aaru.Tests/Filesystems/HFSX/GPT.cs
index 0db741541..cc5046ce6 100644
--- a/Aaru.Tests/Filesystems/HFSX/GPT.cs
+++ b/Aaru.Tests/Filesystems/HFSX/GPT.cs
@@ -32,41 +32,40 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.HFSX
+namespace Aaru.Tests.Filesystems.HFSX;
+
+[TestFixture]
+public class GPT : FilesystemTest
 {
-    [TestFixture]
-    public class GPT : FilesystemTest
+    public GPT() : base("HFSX") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFSX (GPT)");
+    public override IFilesystem Plugin     => new AppleHFSPlus();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public GPT() : base("HFSX") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFSX (GPT)");
-        public override IFilesystem Plugin => new AppleHFSPlus();
-        public override bool Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 819200,
-                SectorSize   = 512,
-                Clusters     = 102390,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "328343989312AE9F"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1228800,
-                SectorSize   = 512,
-                Clusters     = 153590,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "FB98504073464C5C"
-            }
-        };
-    }
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 819200,
+            SectorSize   = 512,
+            Clusters     = 102390,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "328343989312AE9F"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1228800,
+            SectorSize   = 512,
+            Clusters     = 153590,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "FB98504073464C5C"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HFSX/MBR.cs b/Aaru.Tests/Filesystems/HFSX/MBR.cs
index 4c7b75749..ea4206e0a 100644
--- a/Aaru.Tests/Filesystems/HFSX/MBR.cs
+++ b/Aaru.Tests/Filesystems/HFSX/MBR.cs
@@ -32,117 +32,116 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.HFSX
+namespace Aaru.Tests.Filesystems.HFSX;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("HFSX") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFSX (MBR)");
+
+    public override IFilesystem Plugin     => new AppleHFSPlus();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("HFSX") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Apple HFSX (MBR)");
-
-        public override IFilesystem Plugin     => new AppleHFSPlus();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 393216,
-                SectorSize   = 512,
-                Clusters     = 49140,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "C2BCCCE6DE5BC98D"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 51187,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "AC54CD78C75CC30F"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32512,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_journal.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32512,
-                ClusterSize = 4096,
-                SystemId    = "10.0"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "49296DD5D4998317"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_7.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "6086D6721C36DB41"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1_journal.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "HFSJ",
-                VolumeSerial = "E6ADDA7180241419"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "darwin_8.0.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32760,
-                ClusterSize  = 4096,
-                SystemId     = "10.0",
-                VolumeSerial = "EA6229EBC75E4F92"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_hfsx_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 127744,
-                ClusterSize  = 4096,
-                SystemId     = "H+Lx",
-                VolumeSerial = "5E4A8781D3C9286C"
-            }
-        };
-    }
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 393216,
+            SectorSize   = 512,
+            Clusters     = 49140,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "C2BCCCE6DE5BC98D"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 51187,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "AC54CD78C75CC30F"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32512,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_journal.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32512,
+            ClusterSize = 4096,
+            SystemId    = "10.0"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "49296DD5D4998317"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_7.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "6086D6721C36DB41"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1_journal.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "HFSJ",
+            VolumeSerial = "E6ADDA7180241419"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "darwin_8.0.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32760,
+            ClusterSize  = 4096,
+            SystemId     = "10.0",
+            VolumeSerial = "EA6229EBC75E4F92"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_hfsx_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 127744,
+            ClusterSize  = 4096,
+            SystemId     = "H+Lx",
+            VolumeSerial = "5E4A8781D3C9286C"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HPFS.cs b/Aaru.Tests/Filesystems/HPFS.cs
index d60bd8fdc..a58fb95d4 100644
--- a/Aaru.Tests/Filesystems/HPFS.cs
+++ b/Aaru.Tests/Filesystems/HPFS.cs
@@ -32,189 +32,188 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Hpfs : FilesystemTest
 {
-    [TestFixture]
-    public class Hpfs : FilesystemTest
+    public Hpfs() : base("HPFS") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+                                                      "High Performance File System");
+    public override IFilesystem Plugin     => new HPFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Hpfs() : base("HPFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
-                                                          "High Performance File System");
-        public override IFilesystem Plugin     => new HPFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "ecs.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 261072,
-                ClusterSize  = 512,
-                SystemId     = "IBM 4.50",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "2BBBD814"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msos2_1.21.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1023056,
-                ClusterSize  = 512,
-                SystemId     = "OS2 10.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "AC0DDC15"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "msos2_1.30.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1023056,
-                ClusterSize  = 512,
-                SystemId     = "OS2 10.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "ABEB2C15"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_1.20.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "OS2 10.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "6D3D2815"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_1.30.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "OS2 10.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "6D195815"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_6.307.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "OS2 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "6D24F815"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_6.514.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "OS2 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "6D27F415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_6.617.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "OS2 20.1",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "6D396415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_8.162.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "OS2 20.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "6D118415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "os2_9.023.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "OS2 20.0",
-                VolumeName   = "VOLUME LABE",
-                VolumeSerial = "ACA08415"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "E851CB14"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.50.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262112,
-                ClusterSize  = 512,
-                SystemId     = "MSDOS5.0",
-                VolumeName   = "VOLUMELABEL",
-                VolumeSerial = "A4EDC29C"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "ecs20_fstester.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1022112,
-                ClusterSize  = 512,
-                SystemId     = "IBM 4.50",
-                VolumeName   = "VOLUME LABE",
-                VolumeSerial = "AC096014"
-            }
-        };
-    }
+            TestFile     = "ecs.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 261072,
+            ClusterSize  = 512,
+            SystemId     = "IBM 4.50",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "2BBBD814"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msos2_1.21.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1023056,
+            ClusterSize  = 512,
+            SystemId     = "OS2 10.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "AC0DDC15"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "msos2_1.30.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1023056,
+            ClusterSize  = 512,
+            SystemId     = "OS2 10.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "ABEB2C15"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_1.20.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "OS2 10.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "6D3D2815"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_1.30.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "OS2 10.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "6D195815"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_6.307.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "OS2 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "6D24F815"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_6.514.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "OS2 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "6D27F415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_6.617.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "OS2 20.1",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "6D396415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_8.162.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "OS2 20.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "6D118415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "os2_9.023.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "OS2 20.0",
+            VolumeName   = "VOLUME LABE",
+            VolumeSerial = "ACA08415"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "E851CB14"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.50.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262112,
+            ClusterSize  = 512,
+            SystemId     = "MSDOS5.0",
+            VolumeName   = "VOLUMELABEL",
+            VolumeSerial = "A4EDC29C"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "ecs20_fstester.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1022112,
+            ClusterSize  = 512,
+            SystemId     = "IBM 4.50",
+            VolumeName   = "VOLUME LABE",
+            VolumeSerial = "AC096014"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HPOFS.cs b/Aaru.Tests/Filesystems/HPOFS.cs
index cebfa22fe..0e0498009 100644
--- a/Aaru.Tests/Filesystems/HPOFS.cs
+++ b/Aaru.Tests/Filesystems/HPOFS.cs
@@ -32,68 +32,67 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Hpofs : FilesystemTest
 {
-    [TestFixture]
-    public class Hpofs : FilesystemTest
+    public Hpofs() : base("HPOFS") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+                                                      "High Performance Optical File System");
+    public override IFilesystem Plugin     => new HPOFS();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Hpofs() : base("HPOFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
-                                                          "High Performance Optical File System");
-        public override IFilesystem Plugin     => new HPOFS();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "rid1.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Clusters     = 2880,
-                ClusterSize  = 512,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUME LABEL",
-                VolumeSerial = "AC226814"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "rid10.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Clusters     = 2880,
-                ClusterSize  = 512,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUME LABEL",
-                VolumeSerial = "AC160814"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "rid66percent.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Clusters     = 2880,
-                ClusterSize  = 512,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUME LABEL",
-                VolumeSerial = "AC306C14"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "rid266.img.lz",
-                MediaType    = MediaType.DOS_35_HD,
-                Sectors      = 2880,
-                SectorSize   = 512,
-                Clusters     = 2880,
-                ClusterSize  = 512,
-                SystemId     = "IBM 10.2",
-                VolumeName   = "VOLUME LABEL",
-                VolumeSerial = "ABEF2C14"
-            }
-        };
-    }
+            TestFile     = "rid1.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Clusters     = 2880,
+            ClusterSize  = 512,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUME LABEL",
+            VolumeSerial = "AC226814"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "rid10.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Clusters     = 2880,
+            ClusterSize  = 512,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUME LABEL",
+            VolumeSerial = "AC160814"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "rid66percent.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Clusters     = 2880,
+            ClusterSize  = 512,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUME LABEL",
+            VolumeSerial = "AC306C14"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "rid266.img.lz",
+            MediaType    = MediaType.DOS_35_HD,
+            Sectors      = 2880,
+            SectorSize   = 512,
+            Clusters     = 2880,
+            ClusterSize  = 512,
+            SystemId     = "IBM 10.2",
+            VolumeName   = "VOLUME LABEL",
+            VolumeSerial = "ABEF2C14"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HTFS/MBR.cs b/Aaru.Tests/Filesystems/HTFS/MBR.cs
index 271face31..8863ddd66 100644
--- a/Aaru.Tests/Filesystems/HTFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/HTFS/MBR.cs
@@ -32,30 +32,29 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.HTFS
+namespace Aaru.Tests.Filesystems.HTFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("HTFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "High Throughtput File System (MBR)");
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("HTFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "High Throughtput File System (MBR)");
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 2097152,
-                SectorSize  = 512,
-                Clusters    = 1020096,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "scoopenserver_5.0.7hw.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 2097152,
+            SectorSize  = 512,
+            Clusters    = 1020096,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/HTFS/Whole.cs b/Aaru.Tests/Filesystems/HTFS/Whole.cs
index b0becb3bd..3d6993882 100644
--- a/Aaru.Tests/Filesystems/HTFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/HTFS/Whole.cs
@@ -32,71 +32,70 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.HTFS
+namespace Aaru.Tests.Filesystems.HTFS;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("HTFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "High Throughtput File System");
+
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("HTFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "High Throughtput File System");
-
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
-                MediaType   = MediaType.DMF,
-                Sectors     = 3360,
-                SectorSize  = 512,
-                Clusters    = 1680,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 1200,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
-                MediaType   = MediaType.ECMA_147,
-                Sectors     = 5760,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            }
-        };
-    }
+            TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
+            MediaType   = MediaType.DMF,
+            Sectors     = 3360,
+            SectorSize  = 512,
+            Clusters    = 1680,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 1200,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
+            MediaType   = MediaType.ECMA_147,
+            Sectors     = 5760,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/ISO9660.cs b/Aaru.Tests/Filesystems/ISO9660.cs
index 7caecf9b4..9eadc11a8 100644
--- a/Aaru.Tests/Filesystems/ISO9660.cs
+++ b/Aaru.Tests/Filesystems/ISO9660.cs
@@ -32,939 +32,938 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Iso9660 : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class Iso9660 : ReadOnlyFilesystemTest
+    public Iso9660() : base("ISO9660") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "ISO9660");
+    public override IFilesystem Plugin     => new ISO9660();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Iso9660() : base("ISO9660") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "ISO9660");
-        public override IFilesystem Plugin     => new ISO9660();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 946,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 946,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_dos_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 946,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 946,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_dos.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 244,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_hfs.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 1880,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 946,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 244,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_joliet_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 951,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 951,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_joliet.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 249,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_mac_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 946,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 946,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_mac.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 244,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_ver_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 946,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 946,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_ver_dos_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 946,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 946,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_ver_dos.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 244,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_ver.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 244,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_ver_joliet_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 951,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 951,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660_ver_joliet.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 249,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Disk utils"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_3.5.7_iso9660.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 244,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_4.1.3_iso9660_hfs.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 1882,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 948,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "DISK_UTILS"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_4.0.3_iso9660_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 305,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 305,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "UNTITLED_CD"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_4.0.3_iso9660_dos_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 305,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 305,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "UNTITLED_CD"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_4.0.3_iso9660_dos.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 220,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "UNTITLED_CD"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_4.0.3_iso9660_hfs.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 954,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 954,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Untitled CD"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_4.0.3_iso9660.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 220,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "UNTITLED_CD"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_4.0.3_iso9660_joliet_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 323,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 323,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Untitled CD"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_4.0.3_iso9660_joliet.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 234,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Untitled CD"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_4.0.3_iso9660_mac_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 305,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 305,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Untitled CD"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "toast_4.0.3_iso9660_mac.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 300,
-                SectorSize    = 2048,
-                ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
-                Clusters      = 220,
-                ClusterSize   = 2048,
-                SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
-                VolumeName    = "Untitled CD"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_apple_rockrige.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3662,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3662,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_apple_xa.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3606,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3606,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_hybrid.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3800,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3800,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_hybrid_nopart.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3800,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3800,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_iso9660_level1_dirnest.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 2983,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 2983,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_iso9660_level1.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 2531,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 2531,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_iso9660_level2_dirnest.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 2983,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 2983,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_iso9660_level2.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 2531,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 2531,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_iso9660_level3_dirnest.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 2983,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 2983,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_iso9660_level3.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 2531,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 2531,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_iso9660_level4_dirnest.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 2894,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 2894,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_iso9660_level4.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 2894,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 2894,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_iso9660_udf_hybrid_dirnest.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 106589,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 106589,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_iso9660_udf_hybrid.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 105241,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 105241,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_joliet.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 5055,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 5055,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_joliet_level1.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3651,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3651,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_joliet_level2.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3651,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3651,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_joliet_level3.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3651,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3651,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_joliet_violating.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3651,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3651,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_level1.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3637,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3637,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_level2.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3637,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3637,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_level3.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3637,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3637,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_level4.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3689,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3689,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_rockridge_dirnest.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 7481,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 7481,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_rockridge.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 7487,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 7487,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_rockridge_old.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3693,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3693,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_rockridge_rational.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 7487,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 7487,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "CDROM"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_udf.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3925,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3925,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_violating.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3637,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3637,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_xa.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3637,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3637,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_zisofs.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3637,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3637,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile   = "mkisofs_zisofs_rockridge.aif",
-                MediaType  = MediaType.CD,
-                Sectors    = 3693,
-                SectorSize = 2048,
-                ApplicationId =
-                    "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
-                Clusters    = 3693,
-                ClusterSize = 2048,
-                SystemId    = "LINUX",
-                VolumeName  = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "neromax_iso_mode1_apple.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 389,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 389,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "Root"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "neromax_iso_mode1_joliet.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 417,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 417,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "Root"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "neromax_iso_mode1_level1.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 257,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 257,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "Root"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "neromax_iso_mode1_level2.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 266,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 266,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "Root"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_hybrid.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3688,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3688,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_joliet.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3686,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3686,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_joliet_utf.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3686,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3686,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_joliet_violating.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3686,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3686,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_level1.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3673,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3673,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_level2.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3673,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3673,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_level3.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3673,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3673,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_level4.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3686,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3686,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_rockridge.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3675,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3675,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_violating.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3673,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3673,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_zisofs.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3673,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3673,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            },
-            new FileSystemTest
-            {
-                TestFile      = "xorriso_zisofs_rockridge.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 3675,
-                SectorSize    = 2048,
-                ApplicationId = "",
-                Clusters      = 3675,
-                ClusterSize   = 2048,
-                SystemId      = "",
-                VolumeName    = "test"
-            }
-        };
-    }
+            TestFile      = "toast_3.5.7_iso9660_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 946,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 946,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_dos_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 946,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 946,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_dos.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 244,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_hfs.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 1880,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 946,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 244,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_joliet_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 951,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 951,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_joliet.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 249,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_mac_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 946,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 946,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_mac.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 244,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_ver_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 946,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 946,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_ver_dos_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 946,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 946,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_ver_dos.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 244,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_ver.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 244,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_ver_joliet_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 951,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 951,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660_ver_joliet.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 249,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Disk utils"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_3.5.7_iso9660.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 244,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_4.1.3_iso9660_hfs.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 1882,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 948,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "DISK_UTILS"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_4.0.3_iso9660_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 305,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 305,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "UNTITLED_CD"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_4.0.3_iso9660_dos_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 305,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 305,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "UNTITLED_CD"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_4.0.3_iso9660_dos.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 220,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "UNTITLED_CD"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_4.0.3_iso9660_hfs.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 954,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 954,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Untitled CD"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_4.0.3_iso9660.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 220,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "UNTITLED_CD"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_4.0.3_iso9660_joliet_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 323,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 323,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Untitled CD"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_4.0.3_iso9660_joliet.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 234,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Untitled CD"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_4.0.3_iso9660_mac_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 305,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 305,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Untitled CD"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "toast_4.0.3_iso9660_mac.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 300,
+            SectorSize    = 2048,
+            ApplicationId = "TOAST ISO 9660 BUILDER COPYRIGHT (C) 1997 ADAPTEC, INC. - HAVE A NICE DAY",
+            Clusters      = 220,
+            ClusterSize   = 2048,
+            SystemId      = "APPLE COMPUTER, INC., TYPE: 0002",
+            VolumeName    = "Untitled CD"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_apple_rockrige.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3662,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3662,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_apple_xa.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3606,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3606,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_hybrid.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3800,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3800,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_hybrid_nopart.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3800,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3800,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_iso9660_level1_dirnest.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 2983,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 2983,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_iso9660_level1.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 2531,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 2531,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_iso9660_level2_dirnest.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 2983,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 2983,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_iso9660_level2.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 2531,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 2531,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_iso9660_level3_dirnest.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 2983,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 2983,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_iso9660_level3.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 2531,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 2531,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_iso9660_level4_dirnest.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 2894,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 2894,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_iso9660_level4.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 2894,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 2894,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_iso9660_udf_hybrid_dirnest.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 106589,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 106589,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_iso9660_udf_hybrid.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 105241,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 105241,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_joliet.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 5055,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 5055,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_joliet_level1.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3651,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3651,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_joliet_level2.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3651,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3651,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_joliet_level3.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3651,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3651,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_joliet_violating.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3651,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3651,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_level1.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3637,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3637,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_level2.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3637,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3637,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_level3.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3637,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3637,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_level4.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3689,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3689,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_rockridge_dirnest.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 7481,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 7481,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_rockridge.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 7487,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 7487,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_rockridge_old.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3693,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3693,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_rockridge_rational.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 7487,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 7487,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "CDROM"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_udf.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3925,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3925,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_violating.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3637,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3637,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_xa.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3637,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3637,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_zisofs.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3637,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3637,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile   = "mkisofs_zisofs_rockridge.aif",
+            MediaType  = MediaType.CD,
+            Sectors    = 3693,
+            SectorSize = 2048,
+            ApplicationId =
+                "MKISOFS ISO9660/HFS/UDF FILESYSTEM BUILDER & CDRECORD CD/DVD/BluRay CREATOR (C) 1993 E.YOUNGDALE (C) 1997 J.PEARSON/J.SCHILLING",
+            Clusters    = 3693,
+            ClusterSize = 2048,
+            SystemId    = "LINUX",
+            VolumeName  = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "neromax_iso_mode1_apple.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 389,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 389,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "Root"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "neromax_iso_mode1_joliet.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 417,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 417,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "Root"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "neromax_iso_mode1_level1.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 257,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 257,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "Root"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "neromax_iso_mode1_level2.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 266,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 266,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "Root"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_hybrid.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3688,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3688,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_joliet.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3686,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3686,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_joliet_utf.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3686,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3686,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_joliet_violating.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3686,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3686,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_level1.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3673,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3673,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_level2.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3673,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3673,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_level3.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3673,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3673,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_level4.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3686,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3686,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_rockridge.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3675,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3675,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_violating.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3673,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3673,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_zisofs.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3673,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3673,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        },
+        new FileSystemTest
+        {
+            TestFile      = "xorriso_zisofs_rockridge.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 3675,
+            SectorSize    = 2048,
+            ApplicationId = "",
+            Clusters      = 3675,
+            ClusterSize   = 2048,
+            SystemId      = "",
+            VolumeName    = "test"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/JFS2.cs b/Aaru.Tests/Filesystems/JFS2.cs
index baa9c45d9..e3e5bb666 100644
--- a/Aaru.Tests/Filesystems/JFS2.cs
+++ b/Aaru.Tests/Filesystems/JFS2.cs
@@ -32,79 +32,78 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Jfs2 : FilesystemTest
 {
-    [TestFixture]
-    public class Jfs2 : FilesystemTest
+    public Jfs2() : base("JFS filesystem") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "JFS2");
+    public override IFilesystem Plugin     => new JFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Jfs2() : base("JFS filesystem") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "JFS2");
-        public override IFilesystem Plugin     => new JFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 257632,
-                ClusterSize  = 4096,
-                VolumeName   = "Volume labe",
-                VolumeSerial = "8033b783-0cd1-1645-8ecc-f8f113ad6a47"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_caseinsensitive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 257632,
-                ClusterSize  = 4096,
-                VolumeName   = "Volume labe",
-                VolumeSerial = "d6cd91e9-3899-7e40-8468-baab688ee2e2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "ecs20_fstester.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1017512,
-                ClusterSize  = 4096,
-                VolumeName   = "Volume labe",
-                VolumeSerial = "f4077ce9-0000-0000-0000-000000007c10"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_jfs_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1017416,
-                ClusterSize  = 4096,
-                VolumeName   = "DicSetter",
-                VolumeSerial = "91746c77-eb51-7441-85e2-902c925969f8"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_jfs_os2_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1017416,
-                ClusterSize  = 4096,
-                VolumeName   = "DicSetter",
-                VolumeSerial = "08fc8e22-0201-894e-89c9-31ec3f546203"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 257632,
+            ClusterSize  = 4096,
+            VolumeName   = "Volume labe",
+            VolumeSerial = "8033b783-0cd1-1645-8ecc-f8f113ad6a47"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_caseinsensitive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 257632,
+            ClusterSize  = 4096,
+            VolumeName   = "Volume labe",
+            VolumeSerial = "d6cd91e9-3899-7e40-8468-baab688ee2e2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "ecs20_fstester.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1017512,
+            ClusterSize  = 4096,
+            VolumeName   = "Volume labe",
+            VolumeSerial = "f4077ce9-0000-0000-0000-000000007c10"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_jfs_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1017416,
+            ClusterSize  = 4096,
+            VolumeName   = "DicSetter",
+            VolumeSerial = "91746c77-eb51-7441-85e2-902c925969f8"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_jfs_os2_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1017416,
+            ClusterSize  = 4096,
+            VolumeName   = "DicSetter",
+            VolumeSerial = "08fc8e22-0201-894e-89c9-31ec3f546203"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/LisaFS.cs b/Aaru.Tests/Filesystems/LisaFS.cs
index de090f7cd..ea1dc89ef 100644
--- a/Aaru.Tests/Filesystems/LisaFS.cs
+++ b/Aaru.Tests/Filesystems/LisaFS.cs
@@ -32,196 +32,195 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems.LisaFS;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class LisaFs : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class LisaFs : ReadOnlyFilesystemTest
+    public LisaFs() : base("LisaFS") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+                                                      "Apple Lisa filesystem");
+    public override IFilesystem Plugin     => new LisaFS();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public LisaFs() : base("LisaFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
-                                                          "Apple Lisa filesystem");
-        public override IFilesystem Plugin     => new LisaFS();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "166files.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "166Files",
-                VolumeSerial = "A23703A202010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "222files.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "222Files",
-                VolumeSerial = "A23703A201010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "blank2.0.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 792,
-                ClusterSize  = 512,
-                VolumeName   = "AOS  4:59 pm 10/02/87",
-                VolumeSerial = "A32D261301010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "blank-disk.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 3.0",
-                VolumeSerial = "A22CB48D01010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "file-with-a-password.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 3.0",
-                VolumeSerial = "A22CC3A702010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tfwdndrc-has-been-erased.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 3.0",
-                VolumeSerial = "A22CB48D14010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "tfwdndrc-has-been-restored.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 3.0",
-                VolumeSerial = "A22CB48D14010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "three-empty-folders.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 3.0",
-                VolumeSerial = "A22CB48D01010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "three-folders-with-differently-named-docs.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 3.0",
-                VolumeSerial = "A22CB48D01010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "three-folders-with-differently-named-docs-root-alphabetical.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 3.0",
-                VolumeSerial = "A22CB48D01010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "three-folders-with-differently-named-docs-root-chronological.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 3.0",
-                VolumeSerial = "A22CB48D01010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "three-folders-with-identically-named-docs.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 3.0",
-                VolumeSerial = "A22CB48D01010663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "lisafs1.dc42.lz",
-                MediaType    = MediaType.AppleFileWare,
-                Sectors      = 1702,
-                SectorSize   = 512,
-                Clusters     = 1684,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 4:15 pm 5/06/1983",
-                VolumeSerial = "9924151E190001E1"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "lisafs2.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 792,
-                ClusterSize  = 512,
-                VolumeName   = "Office System 1 2.0",
-                VolumeSerial = "9497F10016010D10"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "lisafs3.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "Office System 1 3.0",
-                VolumeSerial = "9CF9CF89070100A8"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "lisafs3_with_desktop.dc42.lz",
-                MediaType    = MediaType.AppleSonySS,
-                Sectors      = 800,
-                SectorSize   = 512,
-                Clusters     = 800,
-                ClusterSize  = 512,
-                VolumeName   = "AOS 3.0",
-                VolumeSerial = "A4FE1A191F011652"
-            }
-        };
-    }
+            TestFile     = "166files.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "166Files",
+            VolumeSerial = "A23703A202010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "222files.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "222Files",
+            VolumeSerial = "A23703A201010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "blank2.0.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 792,
+            ClusterSize  = 512,
+            VolumeName   = "AOS  4:59 pm 10/02/87",
+            VolumeSerial = "A32D261301010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "blank-disk.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 3.0",
+            VolumeSerial = "A22CB48D01010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "file-with-a-password.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 3.0",
+            VolumeSerial = "A22CC3A702010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tfwdndrc-has-been-erased.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 3.0",
+            VolumeSerial = "A22CB48D14010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "tfwdndrc-has-been-restored.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 3.0",
+            VolumeSerial = "A22CB48D14010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "three-empty-folders.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 3.0",
+            VolumeSerial = "A22CB48D01010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "three-folders-with-differently-named-docs.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 3.0",
+            VolumeSerial = "A22CB48D01010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "three-folders-with-differently-named-docs-root-alphabetical.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 3.0",
+            VolumeSerial = "A22CB48D01010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "three-folders-with-differently-named-docs-root-chronological.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 3.0",
+            VolumeSerial = "A22CB48D01010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "three-folders-with-identically-named-docs.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 3.0",
+            VolumeSerial = "A22CB48D01010663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "lisafs1.dc42.lz",
+            MediaType    = MediaType.AppleFileWare,
+            Sectors      = 1702,
+            SectorSize   = 512,
+            Clusters     = 1684,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 4:15 pm 5/06/1983",
+            VolumeSerial = "9924151E190001E1"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "lisafs2.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 792,
+            ClusterSize  = 512,
+            VolumeName   = "Office System 1 2.0",
+            VolumeSerial = "9497F10016010D10"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "lisafs3.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "Office System 1 3.0",
+            VolumeSerial = "9CF9CF89070100A8"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "lisafs3_with_desktop.dc42.lz",
+            MediaType    = MediaType.AppleSonySS,
+            Sectors      = 800,
+            SectorSize   = 512,
+            Clusters     = 800,
+            ClusterSize  = 512,
+            VolumeName   = "AOS 3.0",
+            VolumeSerial = "A4FE1A191F011652"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/Locus.cs b/Aaru.Tests/Filesystems/Locus.cs
index 1ac7bcfc4..797b14830 100644
--- a/Aaru.Tests/Filesystems/Locus.cs
+++ b/Aaru.Tests/Filesystems/Locus.cs
@@ -31,39 +31,38 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Locus : FilesystemTest
 {
-    [TestFixture]
-    public class Locus : FilesystemTest
+    public Locus() : base("Locus filesystem") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Locus filesystem");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.Locus();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Locus() : base("Locus filesystem") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Locus filesystem");
-        public override IFilesystem Plugin => new Aaru.Filesystems.Locus();
-        public override bool Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 180,
-                ClusterSize = 4096,
-                VolumeName  = "Label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 360,
-                ClusterSize = 4096,
-                VolumeName  = "Label"
-            }
-        };
-    }
+            TestFile    = "mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 180,
+            ClusterSize = 4096,
+            VolumeName  = "Label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 360,
+            ClusterSize = 4096,
+            VolumeName  = "Label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/MFS.cs b/Aaru.Tests/Filesystems/MFS.cs
index 7bffa133a..02744732a 100644
--- a/Aaru.Tests/Filesystems/MFS.cs
+++ b/Aaru.Tests/Filesystems/MFS.cs
@@ -32,70 +32,69 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Mfs : ReadOnlyFilesystemTest
 {
-    [TestFixture]
-    public class Mfs : ReadOnlyFilesystemTest
+    public Mfs() : base("MFS") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+                                                      "Macintosh File System");
+    public override IFilesystem Plugin     => new AppleMFS();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Mfs() : base("MFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
-                                                          "Macintosh File System");
-        public override IFilesystem Plugin     => new AppleMFS();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "macos_0.1_mf1dd.img.lz",
-                MediaType   = MediaType.AppleSonySS,
-                Sectors     = 800,
-                SectorSize  = 512,
-                Clusters    = 391,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_0.5_mf1dd.img.lz",
-                MediaType   = MediaType.AppleSonySS,
-                Sectors     = 800,
-                SectorSize  = 512,
-                Clusters    = 391,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_1.1_mf1dd.img.lz",
-                MediaType   = MediaType.AppleSonySS,
-                Sectors     = 800,
-                SectorSize  = 512,
-                Clusters    = 391,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_2.0_mf1dd.img.lz",
-                MediaType   = MediaType.AppleSonySS,
-                Sectors     = 800,
-                SectorSize  = 512,
-                Clusters    = 391,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_6.0.7_mf1dd.img.lz",
-                MediaType   = MediaType.AppleSonySS,
-                Sectors     = 800,
-                SectorSize  = 512,
-                Clusters    = 391,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "macos_0.1_mf1dd.img.lz",
+            MediaType   = MediaType.AppleSonySS,
+            Sectors     = 800,
+            SectorSize  = 512,
+            Clusters    = 391,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_0.5_mf1dd.img.lz",
+            MediaType   = MediaType.AppleSonySS,
+            Sectors     = 800,
+            SectorSize  = 512,
+            Clusters    = 391,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_1.1_mf1dd.img.lz",
+            MediaType   = MediaType.AppleSonySS,
+            Sectors     = 800,
+            SectorSize  = 512,
+            Clusters    = 391,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_2.0_mf1dd.img.lz",
+            MediaType   = MediaType.AppleSonySS,
+            Sectors     = 800,
+            SectorSize  = 512,
+            Clusters    = 391,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_6.0.7_mf1dd.img.lz",
+            MediaType   = MediaType.AppleSonySS,
+            Sectors     = 800,
+            SectorSize  = 512,
+            Clusters    = 391,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/MINIX/V1/MBR.cs b/Aaru.Tests/Filesystems/MINIX/V1/MBR.cs
index f1c1a2482..0e52cfd3d 100644
--- a/Aaru.Tests/Filesystems/MINIX/V1/MBR.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V1/MBR.cs
@@ -32,118 +32,117 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.MINIX.V1
-{
-    [TestFixture]
-    public class MBR : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v1 filesystem (MBR)");
-        public override IFilesystem Plugin     => new MinixFS();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems.MINIX.V1;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class MBR : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v1 filesystem (MBR)");
+    public override IFilesystem Plugin     => new MinixFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 102400,
-                SectorSize  = 512,
-                Clusters    = 50399,
-                ClusterSize = 1024,
-                Type        = "Minix 3 v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_4.19_minix1_flashdrive.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 131072,
-                SectorSize  = 512,
-                Clusters    = 64512,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65535,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.29.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65535,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.34.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65535,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.37.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65535,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.38.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65535,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.17.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65535,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.20.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65535,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.4.18.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65535,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            }
-        };
-    }
+            TestFile    = "minix_3.1.2a.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 102400,
+            SectorSize  = 512,
+            Clusters    = 50399,
+            ClusterSize = 1024,
+            Type        = "Minix 3 v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_4.19_minix1_flashdrive.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 131072,
+            SectorSize  = 512,
+            Clusters    = 64512,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65535,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.29.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65535,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.34.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65535,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.37.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65535,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.38.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65535,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.2.17.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65535,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.2.20.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65535,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.4.18.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65535,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/MINIX/V1/Whole.cs b/Aaru.Tests/Filesystems/MINIX/V1/Whole.cs
index 65178aeeb..d96df6a54 100644
--- a/Aaru.Tests/Filesystems/MINIX/V1/Whole.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V1/Whole.cs
@@ -32,137 +32,136 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.MINIX.V1
-{
-    [TestFixture]
-    public class Whole : FilesystemTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v1 filesystem");
-        public override IFilesystem Plugin => new MinixFS();
-        public override bool Partitions => false;
+namespace Aaru.Tests.Filesystems.MINIX.V1;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Whole : FilesystemTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v1 filesystem");
+    public override IFilesystem Plugin => new MinixFS();
+    public override bool Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_dsdd.img.lz",
-                MediaType   = MediaType.DOS_525_DS_DD_9,
-                Sectors     = 720,
-                SectorSize  = 512,
-                Clusters    = 360,
-                ClusterSize = 1024,
-                Type        = "Minix 3 v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 1200,
-                ClusterSize = 1024,
-                Type        = "Minix 3 v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 1024,
-                Type        = "Minix 3 v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix 3 v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.0_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.29_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.34_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.37_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.38_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.17_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.20_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.4.18_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v1"
-            }
-        };
-    }
+            TestFile    = "minix_3.1.2a_dsdd.img.lz",
+            MediaType   = MediaType.DOS_525_DS_DD_9,
+            Sectors     = 720,
+            SectorSize  = 512,
+            Clusters    = 360,
+            ClusterSize = 1024,
+            Type        = "Minix 3 v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "minix_3.1.2a_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 1200,
+            ClusterSize = 1024,
+            Type        = "Minix 3 v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "minix_3.1.2a_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 1024,
+            Type        = "Minix 3 v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "minix_3.1.2a_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix 3 v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.0_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.29_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.34_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.37_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.38_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.2.17_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.2.20_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.4.18_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v1"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/MINIX/V2/MBR.cs b/Aaru.Tests/Filesystems/MINIX/V2/MBR.cs
index c3e3a3ea4..6373e5a6a 100644
--- a/Aaru.Tests/Filesystems/MINIX/V2/MBR.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V2/MBR.cs
@@ -32,108 +32,107 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.MINIX.V2
-{
-    [TestFixture]
-    public class MBR : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v2 filesystem (MBR)");
-        public override IFilesystem Plugin     => new MinixFS();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems.MINIX.V2;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class MBR : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v2 filesystem (MBR)");
+    public override IFilesystem Plugin     => new MinixFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 511055,
-                ClusterSize = 1024,
-                Type        = "Minix 3 v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_4.19_minix2_flashdrive.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 510976,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.29.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.34.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.37.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.38.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.17.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.20.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.4.18.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            }
-        };
-    }
+            TestFile    = "minix_3.1.2a.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 511055,
+            ClusterSize = 1024,
+            Type        = "Minix 3 v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_4.19_minix2_flashdrive.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 510976,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.29.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.34.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.37.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.38.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.2.17.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.2.20.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.4.18.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/MINIX/V2/Whole.cs b/Aaru.Tests/Filesystems/MINIX/V2/Whole.cs
index a7ecc9fd3..a9ebd3e30 100644
--- a/Aaru.Tests/Filesystems/MINIX/V2/Whole.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V2/Whole.cs
@@ -32,127 +32,126 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.MINIX.V2
-{
-    [TestFixture]
-    public class Whole : FilesystemTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v2 filesystem");
-        public override IFilesystem Plugin => new MinixFS();
-        public override bool Partitions => false;
+namespace Aaru.Tests.Filesystems.MINIX.V2;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Whole : FilesystemTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v2 filesystem");
+    public override IFilesystem Plugin => new MinixFS();
+    public override bool Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_dsdd.img.lz",
-                MediaType   = MediaType.DOS_525_DS_DD_9,
-                Sectors     = 720,
-                SectorSize  = 512,
-                Clusters    = 360,
-                ClusterSize = 1024,
-                Type        = "Minix 3 v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 1200,
-                ClusterSize = 1024,
-                Type        = "Minix 3 v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 1024,
-                Type        = "Minix 3 v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix 3 v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.29_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.34_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.37_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.38_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.17_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.20_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.4.18_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "Minix v2"
-            }
-        };
-    }
+            TestFile    = "minix_3.1.2a_dsdd.img.lz",
+            MediaType   = MediaType.DOS_525_DS_DD_9,
+            Sectors     = 720,
+            SectorSize  = 512,
+            Clusters    = 360,
+            ClusterSize = 1024,
+            Type        = "Minix 3 v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "minix_3.1.2a_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 1200,
+            ClusterSize = 1024,
+            Type        = "Minix 3 v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "minix_3.1.2a_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 1024,
+            Type        = "Minix 3 v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "minix_3.1.2a_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix 3 v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.29_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.34_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.37_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.38_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.2.17_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.2.20_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.4.18_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "Minix v2"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/MINIX/V3/MBR.cs b/Aaru.Tests/Filesystems/MINIX/V3/MBR.cs
index f466b116d..c00e30b4e 100644
--- a/Aaru.Tests/Filesystems/MINIX/V3/MBR.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V3/MBR.cs
@@ -32,38 +32,37 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.MINIX.V3
-{
-    [TestFixture]
-    public class MBR : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v3 filesystem (MBR)");
-        public override IFilesystem Plugin     => new MinixFS();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems.MINIX.V3;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class MBR : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v3 filesystem (MBR)");
+    public override IFilesystem Plugin     => new MinixFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 4194304,
-                SectorSize  = 512,
-                Clusters    = 523151,
-                ClusterSize = 4096,
-                Type        = "Minix v3"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_4.19_minix3_flashdrive.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 510976,
-                ClusterSize = 1024,
-                Type        = "Minix v3"
-            }
-        };
-    }
+            TestFile    = "minix_3.1.2a.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 4194304,
+            SectorSize  = 512,
+            Clusters    = 523151,
+            ClusterSize = 4096,
+            Type        = "Minix v3"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_4.19_minix3_flashdrive.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 510976,
+            ClusterSize = 1024,
+            Type        = "Minix v3"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/MINIX/V3/Whole.cs b/Aaru.Tests/Filesystems/MINIX/V3/Whole.cs
index 08492cf7b..4311ab574 100644
--- a/Aaru.Tests/Filesystems/MINIX/V3/Whole.cs
+++ b/Aaru.Tests/Filesystems/MINIX/V3/Whole.cs
@@ -32,58 +32,57 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.MINIX.V3
+namespace Aaru.Tests.Filesystems.MINIX.V3;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v3 filesystem");
+
+    public override IFilesystem Plugin     => new MinixFS();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "MINIX v3 filesystem");
-
-        public override IFilesystem Plugin     => new MinixFS();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_dsdd.img.lz",
-                MediaType   = MediaType.DOS_525_DS_DD_9,
-                Sectors     = 720,
-                SectorSize  = 512,
-                Clusters    = 90,
-                ClusterSize = 4096,
-                Type        = "Minix v3"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 300,
-                ClusterSize = 4096,
-                Type        = "Minix v3"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 180,
-                ClusterSize = 4096,
-                Type        = "Minix v3"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "minix_3.1.2a_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 360,
-                ClusterSize = 4096,
-                Type        = "Minix v3"
-            }
-        };
-    }
+            TestFile    = "minix_3.1.2a_dsdd.img.lz",
+            MediaType   = MediaType.DOS_525_DS_DD_9,
+            Sectors     = 720,
+            SectorSize  = 512,
+            Clusters    = 90,
+            ClusterSize = 4096,
+            Type        = "Minix v3"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "minix_3.1.2a_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 300,
+            ClusterSize = 4096,
+            Type        = "Minix v3"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "minix_3.1.2a_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 180,
+            ClusterSize = 4096,
+            Type        = "Minix v3"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "minix_3.1.2a_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 360,
+            ClusterSize = 4096,
+            Type        = "Minix v3"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/NILFS2.cs b/Aaru.Tests/Filesystems/NILFS2.cs
index fab460167..f613fe27b 100644
--- a/Aaru.Tests/Filesystems/NILFS2.cs
+++ b/Aaru.Tests/Filesystems/NILFS2.cs
@@ -32,31 +32,30 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Nilfs2 : FilesystemTest
 {
-    [TestFixture]
-    public class Nilfs2 : FilesystemTest
+    public Nilfs2() : base("NILFS2 filesystem") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+                                                      "New Implementation of a Log-structured File System 2");
+    public override IFilesystem Plugin     => new NILFS2();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Nilfs2() : base("NILFS2 filesystem") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
-                                                          "New Implementation of a Log-structured File System 2");
-        public override IFilesystem Plugin     => new NILFS2();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32512,
-                ClusterSize  = 4096,
-                VolumeName   = "Volume label",
-                VolumeSerial = "6b1ca79e-7048-a748-93a0-89c74b02cb5a"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32512,
+            ClusterSize  = 4096,
+            VolumeName   = "Volume label",
+            VolumeSerial = "6b1ca79e-7048-a748-93a0-89c74b02cb5a"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/NTFS/GPT.cs b/Aaru.Tests/Filesystems/NTFS/GPT.cs
index 8d1ca5c8e..aad2ca2de 100644
--- a/Aaru.Tests/Filesystems/NTFS/GPT.cs
+++ b/Aaru.Tests/Filesystems/NTFS/GPT.cs
@@ -31,31 +31,30 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.NTFS
+namespace Aaru.Tests.Filesystems.NTFS;
+
+[TestFixture]
+public class GPT : FilesystemTest
 {
-    [TestFixture]
-    public class GPT : FilesystemTest
+    public GPT() : base("NTFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "New Technology File System (GPT)");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.NTFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public GPT() : base("NTFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "New Technology File System (GPT)");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.NTFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "haiku_hrev51259.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32511,
-                ClusterSize  = 4096,
-                VolumeSerial = "2A1DF87732D3285C"
-            }
-        };
-    }
+            TestFile     = "haiku_hrev51259.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32511,
+            ClusterSize  = 4096,
+            VolumeSerial = "2A1DF87732D3285C"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/NTFS/MBR.cs b/Aaru.Tests/Filesystems/NTFS/MBR.cs
index ef8a3cd44..0c28ff1fd 100644
--- a/Aaru.Tests/Filesystems/NTFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/NTFS/MBR.cs
@@ -31,131 +31,130 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.NTFS
+namespace Aaru.Tests.Filesystems.NTFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("NTFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "New Technology File System (MBR)");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.NTFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("NTFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "New Technology File System (MBR)");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.NTFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "win10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 524288,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 65263,
-                ClusterSize  = 4096,
-                VolumeSerial = "C46C1B3C6C1B28A6"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win2000.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 2097152,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1046511,
-                ClusterSize  = 1024,
-                VolumeSerial = "8070C8EC70C8E9CC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 1023057,
-                ClusterSize  = 512,
-                VolumeSerial = "10CC6AC6CC6AA5A6"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.50.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 524288,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524256,
-                ClusterSize  = 512,
-                VolumeSerial = "7A14F50014F4BFE5"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_3.51.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 524288,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 524256,
-                ClusterSize  = 512,
-                VolumeSerial = "24884447884419A6"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winnt_4.00.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 262016,
-                ClusterSize  = 512,
-                VolumeSerial = "DE047EC1047E9C69"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winvista.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 524288,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 64767,
-                ClusterSize  = 4096,
-                VolumeSerial = "E20AF54B0AF51D6B"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32511,
-                ClusterSize  = 4096,
-                VolumeSerial = "065BB96B7C1BCFDA"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "haiku_hrev51259.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 32511,
-                ClusterSize  = 4096,
-                VolumeSerial = "323BED1E2A2FF4D5"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_ntfs3g_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Bootable     = true,
-                Clusters     = 127743,
-                ClusterSize  = 4096,
-                VolumeSerial = "1FC3802B52F9611C"
-            }
-        };
-    }
+            TestFile     = "win10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 524288,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 65263,
+            ClusterSize  = 4096,
+            VolumeSerial = "C46C1B3C6C1B28A6"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win2000.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 2097152,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1046511,
+            ClusterSize  = 1024,
+            VolumeSerial = "8070C8EC70C8E9CC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 1023057,
+            ClusterSize  = 512,
+            VolumeSerial = "10CC6AC6CC6AA5A6"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.50.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 524288,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524256,
+            ClusterSize  = 512,
+            VolumeSerial = "7A14F50014F4BFE5"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_3.51.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 524288,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 524256,
+            ClusterSize  = 512,
+            VolumeSerial = "24884447884419A6"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winnt_4.00.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 262016,
+            ClusterSize  = 512,
+            VolumeSerial = "DE047EC1047E9C69"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winvista.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 524288,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 64767,
+            ClusterSize  = 4096,
+            VolumeSerial = "E20AF54B0AF51D6B"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32511,
+            ClusterSize  = 4096,
+            VolumeSerial = "065BB96B7C1BCFDA"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "haiku_hrev51259.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 32511,
+            ClusterSize  = 4096,
+            VolumeSerial = "323BED1E2A2FF4D5"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_ntfs3g_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Bootable     = true,
+            Clusters     = 127743,
+            ClusterSize  = 4096,
+            VolumeSerial = "1FC3802B52F9611C"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/PFS3/APM.cs b/Aaru.Tests/Filesystems/PFS3/APM.cs
index 891fc89c8..834de1446 100644
--- a/Aaru.Tests/Filesystems/PFS3/APM.cs
+++ b/Aaru.Tests/Filesystems/PFS3/APM.cs
@@ -32,30 +32,29 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.PFS3
+namespace Aaru.Tests.Filesystems.PFS3;
+
+[TestFixture]
+public class APM : FilesystemTest
 {
-    [TestFixture]
-    public class APM : FilesystemTest
+    public APM() : base("PFS v3") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+                                                      "Professional File System 3 (APM)");
+    public override IFilesystem Plugin     => new PFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("PFS v3") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
-                                                          "Professional File System 3 (APM)");
-        public override IFilesystem Plugin     => new PFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "morphos_3.13.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 262018,
-                ClusterSize = 512,
-                VolumeName  = "VolumeLabel"
-            }
-        };
-    }
+            TestFile    = "morphos_3.13.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 262018,
+            ClusterSize = 512,
+            VolumeName  = "VolumeLabel"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/PFS3/RDB.cs b/Aaru.Tests/Filesystems/PFS3/RDB.cs
index 4e4d11c4c..a7c51b188 100644
--- a/Aaru.Tests/Filesystems/PFS3/RDB.cs
+++ b/Aaru.Tests/Filesystems/PFS3/RDB.cs
@@ -32,40 +32,39 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.PFS3
+namespace Aaru.Tests.Filesystems.PFS3;
+
+[TestFixture]
+public class RDB : FilesystemTest
 {
-    [TestFixture]
-    public class RDB : FilesystemTest
+    public RDB() : base("PFS v3") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+                                                      "Professional File System 3 (RDB)");
+    public override IFilesystem Plugin     => new PFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public RDB() : base("PFS v3") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
-                                                          "Professional File System 3 (RDB)");
-        public override IFilesystem Plugin     => new PFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "uae.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024128,
-                SectorSize  = 512,
-                Clusters    = 1023552,
-                ClusterSize = 512,
-                VolumeName  = "PFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "morphos_3.13.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 261936,
-                ClusterSize = 512,
-                VolumeName  = "VolumeLabel"
-            }
-        };
-    }
+            TestFile    = "uae.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024128,
+            SectorSize  = 512,
+            Clusters    = 1023552,
+            ClusterSize = 512,
+            VolumeName  = "PFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "morphos_3.13.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 261936,
+            ClusterSize = 512,
+            VolumeName  = "VolumeLabel"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/ProDOS/APM.cs b/Aaru.Tests/Filesystems/ProDOS/APM.cs
index 4314ccd7d..ac4d70510 100644
--- a/Aaru.Tests/Filesystems/ProDOS/APM.cs
+++ b/Aaru.Tests/Filesystems/ProDOS/APM.cs
@@ -32,141 +32,140 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.ProDOS
+namespace Aaru.Tests.Filesystems.ProDOS;
+
+[TestFixture]
+public class APM : FilesystemTest
 {
-    [TestFixture]
-    public class APM : FilesystemTest
+    public APM() : base("ProDOS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "ProDOS filesystem (APM)");
+
+    public override IFilesystem Plugin     => new ProDOSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("ProDOS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "ProDOS filesystem (APM)");
-
-        public override IFilesystem Plugin     => new ProDOSPlugin();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "macos_7.6.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 49152,
-                SectorSize  = 512,
-                Clusters    = 48438,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.0.4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 49152,
-                SectorSize  = 512,
-                Clusters    = 46326,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 49152,
-                SectorSize  = 512,
-                Clusters    = 46326,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.2.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 49152,
-                SectorSize  = 512,
-                Clusters    = 46326,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macos_9.2.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 49152,
-                SectorSize  = 512,
-                Clusters    = 46326,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcexchange_2.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 61440,
-                SectorSize  = 512,
-                Clusters    = 59126,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcexchange_2.0.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 61440,
-                SectorSize  = 512,
-                Clusters    = 59126,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcexchange_2.1.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 65536,
-                SectorSize  = 512,
-                Clusters    = 63222,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcexchange_2.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 61440,
-                SectorSize  = 512,
-                Clusters    = 60726,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcexchange_3.0.3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 61440,
-                SectorSize  = 512,
-                Clusters    = 60207,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcexchange_3.0.4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 61440,
-                SectorSize  = 512,
-                Clusters    = 60207,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "pcexchange_3.0.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 61440,
-                SectorSize  = 512,
-                Clusters    = 60207,
-                ClusterSize = 512,
-                VolumeName  = "VOLUME.LABEL"
-            }
-        };
-    }
+            TestFile    = "macos_7.6.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 49152,
+            SectorSize  = 512,
+            Clusters    = 48438,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.0.4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 49152,
+            SectorSize  = 512,
+            Clusters    = 46326,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 49152,
+            SectorSize  = 512,
+            Clusters    = 46326,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.2.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 49152,
+            SectorSize  = 512,
+            Clusters    = 46326,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macos_9.2.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 49152,
+            SectorSize  = 512,
+            Clusters    = 46326,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcexchange_2.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 61440,
+            SectorSize  = 512,
+            Clusters    = 59126,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcexchange_2.0.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 61440,
+            SectorSize  = 512,
+            Clusters    = 59126,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcexchange_2.1.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 65536,
+            SectorSize  = 512,
+            Clusters    = 63222,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcexchange_2.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 61440,
+            SectorSize  = 512,
+            Clusters    = 60726,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcexchange_3.0.3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 61440,
+            SectorSize  = 512,
+            Clusters    = 60207,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcexchange_3.0.4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 61440,
+            SectorSize  = 512,
+            Clusters    = 60207,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "pcexchange_3.0.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 61440,
+            SectorSize  = 512,
+            Clusters    = 60207,
+            ClusterSize = 512,
+            VolumeName  = "VOLUME.LABEL"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/QNX4/MBR.cs b/Aaru.Tests/Filesystems/QNX4/MBR.cs
index e8ec1bf95..5efc2d176 100644
--- a/Aaru.Tests/Filesystems/QNX4/MBR.cs
+++ b/Aaru.Tests/Filesystems/QNX4/MBR.cs
@@ -31,29 +31,28 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.QNX4
+namespace Aaru.Tests.Filesystems.QNX4;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("QNX4 filesystem") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "QNX 4 filesystem (MBR)");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.QNX4();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("QNX4 filesystem") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "QNX 4 filesystem (MBR)");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.QNX4();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "qnx_4.24.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 1023104,
-                ClusterSize = 512
-            }
-        };
-    }
+            TestFile    = "qnx_4.24.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 1023104,
+            ClusterSize = 512
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/QNX4/Whole.cs b/Aaru.Tests/Filesystems/QNX4/Whole.cs
index 986ae7597..b09b7dfdd 100644
--- a/Aaru.Tests/Filesystems/QNX4/Whole.cs
+++ b/Aaru.Tests/Filesystems/QNX4/Whole.cs
@@ -31,56 +31,55 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.QNX4
+namespace Aaru.Tests.Filesystems.QNX4;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("QNX4 filesystem") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "QNX 4 filesystem");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.QNX4();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("QNX4 filesystem") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "QNX 4 filesystem");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.QNX4();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "qnx_4.24_dsdd.img.lz",
-                MediaType   = MediaType.DOS_525_DS_DD_9,
-                Sectors     = 720,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 512
-            },
-            new FileSystemTest
-            {
-                TestFile    = "qnx_4.24_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 2400,
-                ClusterSize = 512
-            },
-            new FileSystemTest
-            {
-                TestFile    = "qnx_4.24_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 512
-            },
-            new FileSystemTest
-            {
-                TestFile    = "qnx_4.24_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512
-            }
-        };
-    }
+            TestFile    = "qnx_4.24_dsdd.img.lz",
+            MediaType   = MediaType.DOS_525_DS_DD_9,
+            Sectors     = 720,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 512
+        },
+        new FileSystemTest
+        {
+            TestFile    = "qnx_4.24_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 2400,
+            ClusterSize = 512
+        },
+        new FileSystemTest
+        {
+            TestFile    = "qnx_4.24_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 512
+        },
+        new FileSystemTest
+        {
+            TestFile    = "qnx_4.24_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/ReFS.cs b/Aaru.Tests/Filesystems/ReFS.cs
index cf273a2f6..66040e5ae 100644
--- a/Aaru.Tests/Filesystems/ReFS.cs
+++ b/Aaru.Tests/Filesystems/ReFS.cs
@@ -32,29 +32,28 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class ReFsMbr : FilesystemTest
 {
-    [TestFixture]
-    public class ReFsMbr : FilesystemTest
+    public ReFsMbr() : base("Resilient File System") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+                                                      "Resilient File System (MBR)");
+    public override IFilesystem Plugin     => new ReFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public ReFsMbr() : base("Resilient File System") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
-                                                          "Resilient File System (MBR)");
-        public override IFilesystem Plugin     => new ReFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "win10.vdi.lz",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 67108864,
-                SectorSize  = 512,
-                Clusters    = 8372224,
-                ClusterSize = 4096
-            }
-        };
-    }
+            TestFile    = "win10.vdi.lz",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 67108864,
+            SectorSize  = 512,
+            Clusters    = 8372224,
+            ClusterSize = 4096
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs b/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs
index e3fdb5e81..fcc6a1dec 100644
--- a/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs
+++ b/Aaru.Tests/Filesystems/ReadOnlyFilesystemTest.cs
@@ -14,140 +14,21 @@ using Newtonsoft.Json.Converters;
 using NUnit.Framework;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+public abstract class ReadOnlyFilesystemTest : FilesystemTest
 {
-    public abstract class ReadOnlyFilesystemTest : FilesystemTest
+    public ReadOnlyFilesystemTest() {}
+
+    public ReadOnlyFilesystemTest(string fileSystemType) : base(fileSystemType) {}
+
+    [Test]
+    public void Contents()
     {
-        public ReadOnlyFilesystemTest() {}
+        Environment.CurrentDirectory = DataFolder;
 
-        public ReadOnlyFilesystemTest(string fileSystemType) : base(fileSystemType) {}
-
-        [Test]
-        public void Contents()
+        Assert.Multiple(() =>
         {
-            Environment.CurrentDirectory = DataFolder;
-
-            Assert.Multiple(() =>
-            {
-                foreach(FileSystemTest test in Tests)
-                {
-                    string testFile  = test.TestFile;
-                    bool   found     = false;
-                    var    partition = new Partition();
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter inputFilter = filtersList.GetFilter(testFile);
-
-                    Assert.IsNotNull(inputFilter, $"Filter: {testFile}");
-
-                    IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
-
-                    Assert.IsNotNull(image, $"Image format: {testFile}");
-
-                    Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), $"Cannot open image for {testFile}");
-
-                    List<string> idPlugins;
-
-                    if(Partitions)
-                    {
-                        List<Partition> partitionsList = Core.Partitions.GetAll(image);
-
-                        Assert.Greater(partitionsList.Count, 0, $"No partitions found for {testFile}");
-
-                        // In reverse to skip boot partitions we're not interested in
-                        for(int index = partitionsList.Count - 1; index >= 0; index--)
-                        {
-                            Core.Filesystems.Identify(image, out idPlugins, partitionsList[index], true);
-
-                            if(idPlugins.Count == 0)
-                                continue;
-
-                            if(!idPlugins.Contains(Plugin.Id.ToString()))
-                                continue;
-
-                            found     = true;
-                            partition = partitionsList[index];
-
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        partition = new Partition
-                        {
-                            Name   = "Whole device",
-                            Length = image.Info.Sectors,
-                            Size   = image.Info.Sectors * image.Info.SectorSize
-                        };
-
-                        Core.Filesystems.Identify(image, out idPlugins, partition, true);
-
-                        Assert.Greater(idPlugins.Count, 0, $"No filesystems found for {testFile}");
-
-                        found = idPlugins.Contains(Plugin.Id.ToString());
-                    }
-
-                    Assert.True(found, $"Filesystem not identified for {testFile}");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It is not the case, it changes
-                    if(!found)
-                        continue;
-
-                    var fs = Activator.CreateInstance(Plugin.GetType()) as IReadOnlyFilesystem;
-
-                    Assert.NotNull(fs, $"Could not instantiate filesystem for {testFile}");
-
-                    test.Encoding ??= Encoding.ASCII;
-
-                    ErrorNumber ret = fs.Mount(image, partition, test.Encoding, null, test.Namespace);
-
-                    Assert.AreEqual(ErrorNumber.NoError, ret, $"Unmountable: {testFile}");
-
-                    var serializer = new JsonSerializer
-                    {
-                        Formatting        = Formatting.Indented,
-                        MaxDepth          = 16384,
-                        NullValueHandling = NullValueHandling.Ignore
-                    };
-
-                    serializer.Converters.Add(new StringEnumConverter());
-
-                    if(test.ContentsJson != null)
-                    {
-                        test.Contents =
-                            serializer.
-                                Deserialize<
-                                    Dictionary<string,
-                                        FileData>>(new JsonTextReader(new StringReader(test.ContentsJson)));
-                    }
-                    else if(File.Exists($"{testFile}.contents.json"))
-                    {
-                        var sr = new StreamReader($"{testFile}.contents.json");
-                        test.Contents = serializer.Deserialize<Dictionary<string, FileData>>(new JsonTextReader(sr));
-                    }
-
-                    if(test.Contents is null)
-                        continue;
-
-                    TestDirectory(fs, "/", test.Contents, testFile, true);
-                }
-            });
-        }
-
-        [Test, Ignore("Not a test, do not run")]
-        public void Build()
-        {
-            Environment.CurrentDirectory = DataFolder;
-
             foreach(FileSystemTest test in Tests)
             {
                 string testFile  = test.TestFile;
@@ -155,19 +36,23 @@ namespace Aaru.Tests.Filesystems
                 var    partition = new Partition();
 
                 bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
 
                 // ReSharper disable once ConditionIsAlwaysTrueOrFalse
                 // It arrives here...
                 if(!exists)
                     continue;
 
-                var         filtersList = new FiltersList();
-                IFilter     inputFilter = filtersList.GetFilter(testFile);
-                IMediaImage image       = ImageFormat.Detect(inputFilter) as IMediaImage;
-                ErrorNumber opened      = image.Open(inputFilter);
+                var     filtersList = new FiltersList();
+                IFilter inputFilter = filtersList.GetFilter(testFile);
 
-                if(opened != ErrorNumber.NoError)
-                    continue;
+                Assert.IsNotNull(inputFilter, $"Filter: {testFile}");
+
+                IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
+
+                Assert.IsNotNull(image, $"Image format: {testFile}");
+
+                Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), $"Cannot open image for {testFile}");
 
                 List<string> idPlugins;
 
@@ -175,6 +60,8 @@ namespace Aaru.Tests.Filesystems
                 {
                     List<Partition> partitionsList = Core.Partitions.GetAll(image);
 
+                    Assert.Greater(partitionsList.Count, 0, $"No partitions found for {testFile}");
+
                     // In reverse to skip boot partitions we're not interested in
                     for(int index = partitionsList.Count - 1; index >= 0; index--)
                     {
@@ -203,9 +90,13 @@ namespace Aaru.Tests.Filesystems
 
                     Core.Filesystems.Identify(image, out idPlugins, partition, true);
 
+                    Assert.Greater(idPlugins.Count, 0, $"No filesystems found for {testFile}");
+
                     found = idPlugins.Contains(Plugin.Id.ToString());
                 }
 
+                Assert.True(found, $"Filesystem not identified for {testFile}");
+
                 // ReSharper disable once ConditionIsAlwaysTrueOrFalse
                 // It is not the case, it changes
                 if(!found)
@@ -213,11 +104,13 @@ namespace Aaru.Tests.Filesystems
 
                 var fs = Activator.CreateInstance(Plugin.GetType()) as IReadOnlyFilesystem;
 
+                Assert.NotNull(fs, $"Could not instantiate filesystem for {testFile}");
+
                 test.Encoding ??= Encoding.ASCII;
 
-                fs?.Mount(image, partition, test.Encoding, null, test.Namespace);
+                ErrorNumber ret = fs.Mount(image, partition, test.Encoding, null, test.Namespace);
 
-                Dictionary<string, FileData> contents = BuildDirectory(fs, "/");
+                Assert.AreEqual(ErrorNumber.NoError, ret, $"Unmountable: {testFile}");
 
                 var serializer = new JsonSerializer
                 {
@@ -228,218 +121,324 @@ namespace Aaru.Tests.Filesystems
 
                 serializer.Converters.Add(new StringEnumConverter());
 
-                var sw = new StreamWriter($"{testFile}.contents.json");
-                serializer.Serialize(sw, contents);
-                sw.Close();
-            }
-        }
-
-        internal static Dictionary<string, FileData> BuildDirectory(IReadOnlyFilesystem fs, string path)
-        {
-            if(path == "/")
-                path = "";
-
-            Dictionary<string, FileData> children = new();
-            fs.ReadDir(path, out List<string> contents);
-
-            if(contents is null)
-                return children;
-
-            foreach(string child in contents)
-            {
-                string childPath = $"{path}/{child}";
-                fs.Stat(childPath, out FileEntryInfo stat);
-
-                var data = new FileData
+                if(test.ContentsJson != null)
                 {
-                    Info = stat
+                    test.Contents =
+                        serializer.
+                            Deserialize<
+                                Dictionary<string,
+                                    FileData>>(new JsonTextReader(new StringReader(test.ContentsJson)));
+                }
+                else if(File.Exists($"{testFile}.contents.json"))
+                {
+                    var sr = new StreamReader($"{testFile}.contents.json");
+                    test.Contents = serializer.Deserialize<Dictionary<string, FileData>>(new JsonTextReader(sr));
+                }
+
+                if(test.Contents is null)
+                    continue;
+
+                TestDirectory(fs, "/", test.Contents, testFile, true);
+            }
+        });
+    }
+
+    [Test, Ignore("Not a test, do not run")]
+    public void Build()
+    {
+        Environment.CurrentDirectory = DataFolder;
+
+        foreach(FileSystemTest test in Tests)
+        {
+            string testFile  = test.TestFile;
+            bool   found     = false;
+            var    partition = new Partition();
+
+            bool exists = File.Exists(testFile);
+
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+            // It arrives here...
+            if(!exists)
+                continue;
+
+            var         filtersList = new FiltersList();
+            IFilter     inputFilter = filtersList.GetFilter(testFile);
+            IMediaImage image       = ImageFormat.Detect(inputFilter) as IMediaImage;
+            ErrorNumber opened      = image.Open(inputFilter);
+
+            if(opened != ErrorNumber.NoError)
+                continue;
+
+            List<string> idPlugins;
+
+            if(Partitions)
+            {
+                List<Partition> partitionsList = Core.Partitions.GetAll(image);
+
+                // In reverse to skip boot partitions we're not interested in
+                for(int index = partitionsList.Count - 1; index >= 0; index--)
+                {
+                    Core.Filesystems.Identify(image, out idPlugins, partitionsList[index], true);
+
+                    if(idPlugins.Count == 0)
+                        continue;
+
+                    if(!idPlugins.Contains(Plugin.Id.ToString()))
+                        continue;
+
+                    found     = true;
+                    partition = partitionsList[index];
+
+                    break;
+                }
+            }
+            else
+            {
+                partition = new Partition
+                {
+                    Name   = "Whole device",
+                    Length = image.Info.Sectors,
+                    Size   = image.Info.Sectors * image.Info.SectorSize
                 };
 
-                if(stat.Attributes.HasFlag(FileAttributes.Directory))
-                {
-                    data.Children = BuildDirectory(fs, childPath);
-                }
-                else if(stat.Attributes.HasFlag(FileAttributes.Symlink))
-                {
-                    if(fs.ReadLink(childPath, out string link) == ErrorNumber.NoError)
-                        data.LinkTarget = link;
-                }
-                else
-                {
-                    data.MD5 = BuildFile(fs, childPath, stat.Length);
-                }
+                Core.Filesystems.Identify(image, out idPlugins, partition, true);
 
-                children[child] = data;
+                found = idPlugins.Contains(Plugin.Id.ToString());
             }
 
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+            // It is not the case, it changes
+            if(!found)
+                continue;
+
+            var fs = Activator.CreateInstance(Plugin.GetType()) as IReadOnlyFilesystem;
+
+            test.Encoding ??= Encoding.ASCII;
+
+            fs?.Mount(image, partition, test.Encoding, null, test.Namespace);
+
+            Dictionary<string, FileData> contents = BuildDirectory(fs, "/");
+
+            var serializer = new JsonSerializer
+            {
+                Formatting        = Formatting.Indented,
+                MaxDepth          = 16384,
+                NullValueHandling = NullValueHandling.Ignore
+            };
+
+            serializer.Converters.Add(new StringEnumConverter());
+
+            var sw = new StreamWriter($"{testFile}.contents.json");
+            serializer.Serialize(sw, contents);
+            sw.Close();
+        }
+    }
+
+    internal static Dictionary<string, FileData> BuildDirectory(IReadOnlyFilesystem fs, string path)
+    {
+        if(path == "/")
+            path = "";
+
+        Dictionary<string, FileData> children = new();
+        fs.ReadDir(path, out List<string> contents);
+
+        if(contents is null)
             return children;
+
+        foreach(string child in contents)
+        {
+            string childPath = $"{path}/{child}";
+            fs.Stat(childPath, out FileEntryInfo stat);
+
+            var data = new FileData
+            {
+                Info = stat
+            };
+
+            if(stat.Attributes.HasFlag(FileAttributes.Directory))
+            {
+                data.Children = BuildDirectory(fs, childPath);
+            }
+            else if(stat.Attributes.HasFlag(FileAttributes.Symlink))
+            {
+                if(fs.ReadLink(childPath, out string link) == ErrorNumber.NoError)
+                    data.LinkTarget = link;
+            }
+            else
+            {
+                data.MD5 = BuildFile(fs, childPath, stat.Length);
+            }
+
+            children[child] = data;
         }
 
-        static string BuildFile(IReadOnlyFilesystem fs, string path, long length)
-        {
-            byte[] buffer = new byte[length];
-            fs.Read(path, 0, length, ref buffer);
+        return children;
+    }
 
-            return Md5Context.Data(buffer, out _);
-        }
+    static string BuildFile(IReadOnlyFilesystem fs, string path, long length)
+    {
+        byte[] buffer = new byte[length];
+        fs.Read(path, 0, length, ref buffer);
 
-        internal static void TestDirectory(IReadOnlyFilesystem fs, string path, Dictionary<string, FileData> children,
-                                           string testFile, bool testXattr)
+        return Md5Context.Data(buffer, out _);
+    }
+
+    internal static void TestDirectory(IReadOnlyFilesystem fs, string path, Dictionary<string, FileData> children,
+                                       string testFile, bool testXattr)
+    {
+        ErrorNumber ret = fs.ReadDir(path, out List<string> contents);
+
+        Assert.AreEqual(ErrorNumber.NoError, ret,
+                        $"Unexpected error {ret} when reading directory \"{path}\" of {testFile}.");
+
+        if(children.Count == 0 &&
+           contents.Count == 0)
+            return;
+
+        if(path == "/")
+            path = "";
+
+        List<string> expectedNotFound = new();
+
+        foreach(KeyValuePair<string, FileData> child in children)
         {
-            ErrorNumber ret = fs.ReadDir(path, out List<string> contents);
+            string childPath = $"{path}/{child.Key}";
+            ret = fs.Stat(childPath, out FileEntryInfo stat);
+
+            if(ret == ErrorNumber.NoSuchFile ||
+               contents is null              ||
+               (ret == ErrorNumber.NoError && !contents.Contains(child.Key)))
+            {
+                expectedNotFound.Add(child.Key);
+
+                continue;
+            }
+
+            contents.Remove(child.Key);
 
             Assert.AreEqual(ErrorNumber.NoError, ret,
-                            $"Unexpected error {ret} when reading directory \"{path}\" of {testFile}.");
+                            $"Unexpected error {ret} retrieving stats for \"{childPath}\" in {testFile}");
 
-            if(children.Count == 0 &&
-               contents.Count == 0)
-                return;
+            stat.Should().BeEquivalentTo(child.Value.Info, $"Wrong info for \"{childPath}\" in {testFile}");
 
-            if(path == "/")
-                path = "";
+            byte[] buffer = Array.Empty<byte>();
 
-            List<string> expectedNotFound = new();
-
-            foreach(KeyValuePair<string, FileData> child in children)
+            if(child.Value.Info.Attributes.HasFlag(FileAttributes.Directory))
             {
-                string childPath = $"{path}/{child.Key}";
-                ret = fs.Stat(childPath, out FileEntryInfo stat);
+                ret = fs.Read(childPath, 0, 1, ref buffer);
 
-                if(ret == ErrorNumber.NoSuchFile ||
-                   contents is null              ||
-                   (ret == ErrorNumber.NoError && !contents.Contains(child.Key)))
-                {
-                    expectedNotFound.Add(child.Key);
+                Assert.AreEqual(ErrorNumber.IsDirectory, ret,
+                                $"Got wrong data for directory \"{childPath}\" in {testFile}");
 
-                    continue;
-                }
+                Assert.IsNotNull(child.Value.Children,
+                                 $"Contents for \"{childPath}\" in {testFile} must be defined in unit test declaration!");
 
-                contents.Remove(child.Key);
+                if(child.Value.Children != null)
+                    TestDirectory(fs, childPath, child.Value.Children, testFile, testXattr);
+            }
+            else if(child.Value.Info.Attributes.HasFlag(FileAttributes.Symlink))
+            {
+                ret = fs.ReadLink(childPath, out string link);
 
                 Assert.AreEqual(ErrorNumber.NoError, ret,
-                                $"Unexpected error {ret} retrieving stats for \"{childPath}\" in {testFile}");
+                                $"Got wrong data for symbolic link \"{childPath}\" in {testFile}");
 
-                stat.Should().BeEquivalentTo(child.Value.Info, $"Wrong info for \"{childPath}\" in {testFile}");
+                Assert.AreEqual(child.Value.LinkTarget, link,
+                                $"Invalid target for symbolic link \"{childPath}\" in {testFile}");
+            }
+            else
 
-                byte[] buffer = Array.Empty<byte>();
+                // This ensure the buffer does not hang for collection
+                TestFile(fs, childPath, child.Value.MD5, child.Value.Info.Length, testFile);
 
-                if(child.Value.Info.Attributes.HasFlag(FileAttributes.Directory))
-                {
-                    ret = fs.Read(childPath, 0, 1, ref buffer);
+            if(!testXattr)
+                continue;
 
-                    Assert.AreEqual(ErrorNumber.IsDirectory, ret,
-                                    $"Got wrong data for directory \"{childPath}\" in {testFile}");
+            ret = fs.ListXAttr(childPath, out List<string> xattrs);
 
-                    Assert.IsNotNull(child.Value.Children,
-                                     $"Contents for \"{childPath}\" in {testFile} must be defined in unit test declaration!");
+            if(ret == ErrorNumber.NotSupported)
+            {
+                Assert.IsNull(child.Value.XattrsWithMd5,
+                              $"Defined extended attributes for \"{childPath}\" in {testFile} are not supported by filesystem.");
 
-                    if(child.Value.Children != null)
-                        TestDirectory(fs, childPath, child.Value.Children, testFile, testXattr);
-                }
-                else if(child.Value.Info.Attributes.HasFlag(FileAttributes.Symlink))
-                {
-                    ret = fs.ReadLink(childPath, out string link);
-
-                    Assert.AreEqual(ErrorNumber.NoError, ret,
-                                    $"Got wrong data for symbolic link \"{childPath}\" in {testFile}");
-
-                    Assert.AreEqual(child.Value.LinkTarget, link,
-                                    $"Invalid target for symbolic link \"{childPath}\" in {testFile}");
-                }
-                else
-
-                    // This ensure the buffer does not hang for collection
-                    TestFile(fs, childPath, child.Value.MD5, child.Value.Info.Length, testFile);
-
-                if(!testXattr)
-                    continue;
-
-                ret = fs.ListXAttr(childPath, out List<string> xattrs);
-
-                if(ret == ErrorNumber.NotSupported)
-                {
-                    Assert.IsNull(child.Value.XattrsWithMd5,
-                                  $"Defined extended attributes for \"{childPath}\" in {testFile} are not supported by filesystem.");
-
-                    continue;
-                }
-
-                Assert.AreEqual(ErrorNumber.NoError, ret,
-                                $"Unexpected error {ret} when listing extended attributes for \"{childPath}\" in {testFile}");
-
-                if(xattrs.Count > 0)
-                    Assert.IsNotNull(child.Value.XattrsWithMd5,
-                                     $"Extended attributes for \"{childPath}\" in {testFile} must be defined in unit test declaration!");
-
-                if(xattrs.Count                     > 0 ||
-                   child.Value.XattrsWithMd5?.Count > 0)
-                    TestFileXattrs(fs, childPath, child.Value.XattrsWithMd5, testFile);
+                continue;
             }
 
-            Assert.IsEmpty(expectedNotFound,
-                           $"Could not find the children of \"{path}\" in {testFile}: {string.Join(" ", expectedNotFound)}");
+            Assert.AreEqual(ErrorNumber.NoError, ret,
+                            $"Unexpected error {ret} when listing extended attributes for \"{childPath}\" in {testFile}");
 
-            if(contents != null)
-                Assert.IsEmpty(contents,
-                               $"Found the following unexpected children of \"{path}\" in {testFile}: {string.Join(" ", contents)}");
+            if(xattrs.Count > 0)
+                Assert.IsNotNull(child.Value.XattrsWithMd5,
+                                 $"Extended attributes for \"{childPath}\" in {testFile} must be defined in unit test declaration!");
+
+            if(xattrs.Count                     > 0 ||
+               child.Value.XattrsWithMd5?.Count > 0)
+                TestFileXattrs(fs, childPath, child.Value.XattrsWithMd5, testFile);
         }
 
-        static void TestFile(IReadOnlyFilesystem fs, string path, string md5, long length, string testFile)
-        {
-            byte[]      buffer = new byte[length];
-            ErrorNumber ret    = fs.Read(path, 0, length, ref buffer);
+        Assert.IsEmpty(expectedNotFound,
+                       $"Could not find the children of \"{path}\" in {testFile}: {string.Join(" ", expectedNotFound)}");
 
-            Assert.AreEqual(ErrorNumber.NoError, ret, $"Unexpected error {ret} when reading \"{path}\" in {testFile}");
+        if(contents != null)
+            Assert.IsEmpty(contents,
+                           $"Found the following unexpected children of \"{path}\" in {testFile}: {string.Join(" ", contents)}");
+    }
+
+    static void TestFile(IReadOnlyFilesystem fs, string path, string md5, long length, string testFile)
+    {
+        byte[]      buffer = new byte[length];
+        ErrorNumber ret    = fs.Read(path, 0, length, ref buffer);
+
+        Assert.AreEqual(ErrorNumber.NoError, ret, $"Unexpected error {ret} when reading \"{path}\" in {testFile}");
+
+        string data = Md5Context.Data(buffer, out _);
+
+        Assert.AreEqual(md5, data, $"Got MD5 {data} for \"{path}\" in {testFile} but expected {md5}");
+    }
+
+    static void TestFileXattrs(IReadOnlyFilesystem fs, string path, Dictionary<string, string> xattrs,
+                               string testFile)
+    {
+        // Nothing to test
+        if(xattrs is null)
+            return;
+
+        fs.ListXAttr(path, out List<string> contents);
+
+        if(xattrs.Count   == 0 &&
+           contents.Count == 0)
+            return;
+
+        List<string> expectedNotFound = new();
+
+        foreach(KeyValuePair<string, string> xattr in xattrs)
+        {
+            byte[]      buffer = Array.Empty<byte>();
+            ErrorNumber ret    = fs.GetXattr(path, xattr.Key, ref buffer);
+
+            if(ret == ErrorNumber.NoSuchExtendedAttribute ||
+               !contents.Contains(xattr.Key))
+            {
+                expectedNotFound.Add(xattr.Key);
+
+                continue;
+            }
+
+            contents.Remove(xattr.Key);
+
+            Assert.AreEqual(ErrorNumber.NoError, ret,
+                            $"Unexpected error {ret} retrieving extended attributes for \"{path}\" in {testFile}");
 
             string data = Md5Context.Data(buffer, out _);
 
-            Assert.AreEqual(md5, data, $"Got MD5 {data} for \"{path}\" in {testFile} but expected {md5}");
+            Assert.AreEqual(xattr.Value, data,
+                            $"Got MD5 {data} for {xattr.Key} of \"{path}\" in {testFile} but expected {xattr.Value}");
         }
 
-        static void TestFileXattrs(IReadOnlyFilesystem fs, string path, Dictionary<string, string> xattrs,
-                                   string testFile)
-        {
-            // Nothing to test
-            if(xattrs is null)
-                return;
+        Assert.IsEmpty(expectedNotFound,
+                       $"Could not find the following extended attributes of \"{path}\" in {testFile}: {string.Join(" ", expectedNotFound)}");
 
-            fs.ListXAttr(path, out List<string> contents);
-
-            if(xattrs.Count   == 0 &&
-               contents.Count == 0)
-                return;
-
-            List<string> expectedNotFound = new();
-
-            foreach(KeyValuePair<string, string> xattr in xattrs)
-            {
-                byte[]      buffer = Array.Empty<byte>();
-                ErrorNumber ret    = fs.GetXattr(path, xattr.Key, ref buffer);
-
-                if(ret == ErrorNumber.NoSuchExtendedAttribute ||
-                   !contents.Contains(xattr.Key))
-                {
-                    expectedNotFound.Add(xattr.Key);
-
-                    continue;
-                }
-
-                contents.Remove(xattr.Key);
-
-                Assert.AreEqual(ErrorNumber.NoError, ret,
-                                $"Unexpected error {ret} retrieving extended attributes for \"{path}\" in {testFile}");
-
-                string data = Md5Context.Data(buffer, out _);
-
-                Assert.AreEqual(xattr.Value, data,
-                                $"Got MD5 {data} for {xattr.Key} of \"{path}\" in {testFile} but expected {xattr.Value}");
-            }
-
-            Assert.IsEmpty(expectedNotFound,
-                           $"Could not find the following extended attributes of \"{path}\" in {testFile}: {string.Join(" ", expectedNotFound)}");
-
-            Assert.IsEmpty(contents,
-                           $"Found the following unexpected extended attributes of \"{path}\" in {testFile}: {string.Join(" ", contents)}");
-        }
+        Assert.IsEmpty(contents,
+                       $"Found the following unexpected extended attributes of \"{path}\" in {testFile}: {string.Join(" ", contents)}");
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/Reiser3.cs b/Aaru.Tests/Filesystems/Reiser3.cs
index 976095793..aa7e98f33 100644
--- a/Aaru.Tests/Filesystems/Reiser3.cs
+++ b/Aaru.Tests/Filesystems/Reiser3.cs
@@ -32,72 +32,71 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
-{
-    [TestFixture]
-    public class Reiser3 : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Reiser filesystem v3");
-        public override IFilesystem Plugin     => new Reiser();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Reiser3 : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Reiser filesystem v3");
+    public override IFilesystem Plugin     => new Reiser();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.2.20_r3.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32752,
-                ClusterSize = 4096,
-                Type        = "Reiser 3.5 filesystem"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.4.18_r3.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 32752,
-                ClusterSize = 4096,
-                Type        = "Reiser 3.5 filesystem"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18_r3.6.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32752,
-                ClusterSize  = 4096,
-                Type         = "Reiser 3.6 filesystem",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "43c72111-6512-e747-b626-63704e65352a"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_4.19_reiser_3.5_flashdrive.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 127744,
-                ClusterSize = 4096,
-                Type        = "Reiser 3.5 filesystem"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_reiser_3.6_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 127744,
-                ClusterSize  = 4096,
-                Type         = "Reiser 3.6 filesystem",
-                VolumeName   = "DicSetter",
-                VolumeSerial = "8902ac3c-3e0c-4c4c-84ec-03405c1710f1"
-            }
-        };
-    }
+            TestFile    = "linux_2.2.20_r3.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32752,
+            ClusterSize = 4096,
+            Type        = "Reiser 3.5 filesystem"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.4.18_r3.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 32752,
+            ClusterSize = 4096,
+            Type        = "Reiser 3.5 filesystem"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18_r3.6.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32752,
+            ClusterSize  = 4096,
+            Type         = "Reiser 3.6 filesystem",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "43c72111-6512-e747-b626-63704e65352a"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_4.19_reiser_3.5_flashdrive.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 127744,
+            ClusterSize = 4096,
+            Type        = "Reiser 3.5 filesystem"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_reiser_3.6_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 127744,
+            ClusterSize  = 4096,
+            Type         = "Reiser 3.6 filesystem",
+            VolumeName   = "DicSetter",
+            VolumeSerial = "8902ac3c-3e0c-4c4c-84ec-03405c1710f1"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/Reiser4.cs b/Aaru.Tests/Filesystems/Reiser4.cs
index 70f099d97..86ef9e771 100644
--- a/Aaru.Tests/Filesystems/Reiser4.cs
+++ b/Aaru.Tests/Filesystems/Reiser4.cs
@@ -31,31 +31,30 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Reiser4 : FilesystemTest
 {
-    [TestFixture]
-    public class Reiser4 : FilesystemTest
+    public Reiser4() : base("Reiser 4 filesystem") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Reiser filesystem v4");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.Reiser4();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Reiser4() : base("Reiser 4 filesystem") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Reiser filesystem v4");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.Reiser4();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32511,
-                ClusterSize  = 4096,
-                VolumeName   = "Volume label",
-                VolumeSerial = "b0c1924e-6f10-8c42-b6c5-66a457896460"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32511,
+            ClusterSize  = 4096,
+            VolumeName   = "Volume label",
+            VolumeSerial = "b0c1924e-6f10-8c42-b6c5-66a457896460"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/SFS/APM.cs b/Aaru.Tests/Filesystems/SFS/APM.cs
index 88af3e972..03a227aaf 100644
--- a/Aaru.Tests/Filesystems/SFS/APM.cs
+++ b/Aaru.Tests/Filesystems/SFS/APM.cs
@@ -31,30 +31,29 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.SFS
+namespace Aaru.Tests.Filesystems.SFS;
+
+[TestFixture]
+public class APM : FilesystemTest
 {
-    [TestFixture]
-    public class APM : FilesystemTest
+    public APM() : base("SmartFileSystem") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (APM)");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("SmartFileSystem") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (APM)");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "morphos_3.13.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 262018,
-                ClusterSize = 512
-            }
-        };
-    }
+            TestFile    = "morphos_3.13.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 262018,
+            ClusterSize = 512
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs b/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs
index ee3353eef..8d2445437 100644
--- a/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs
+++ b/Aaru.Tests/Filesystems/SFS/MBR+RDB.cs
@@ -31,29 +31,28 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.SFS
+namespace Aaru.Tests.Filesystems.SFS;
+
+[TestFixture]
+public class MBR_RDB : FilesystemTest
 {
-    [TestFixture]
-    public class MBR_RDB : FilesystemTest
+    public MBR_RDB() : base("SmartFileSystem") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (MBR+RDB)");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR_RDB() : base("SmartFileSystem") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (MBR+RDB)");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "aros.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 409600,
-                SectorSize  = 512,
-                Clusters    = 406224,
-                ClusterSize = 512
-            }
-        };
-    }
+            TestFile    = "aros.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 409600,
+            SectorSize  = 512,
+            Clusters    = 406224,
+            ClusterSize = 512
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/SFS/MBR.cs b/Aaru.Tests/Filesystems/SFS/MBR.cs
index 0d4c7079d..7f51e1546 100644
--- a/Aaru.Tests/Filesystems/SFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/SFS/MBR.cs
@@ -31,29 +31,28 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.SFS
+namespace Aaru.Tests.Filesystems.SFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("SmartFileSystem") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (MBR)");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("SmartFileSystem") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (MBR)");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "aros.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 409600,
-                SectorSize  = 512,
-                Clusters    = 408240,
-                ClusterSize = 512
-            }
-        };
-    }
+            TestFile    = "aros.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 409600,
+            SectorSize  = 512,
+            Clusters    = 408240,
+            ClusterSize = 512
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/SFS/RDB.cs b/Aaru.Tests/Filesystems/SFS/RDB.cs
index 16e297bd2..ff5fa80ca 100644
--- a/Aaru.Tests/Filesystems/SFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/SFS/RDB.cs
@@ -31,66 +31,65 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.SFS
+namespace Aaru.Tests.Filesystems.SFS;
+
+[TestFixture]
+public class RDB : FilesystemTest
 {
-    [TestFixture]
-    public class RDB : FilesystemTest
+    public RDB() : base("SmartFileSystem") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (RDB)");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public RDB() : base("SmartFileSystem") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Smart File System (RDB)");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.SFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "uae.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024128,
-                SectorSize  = 512,
-                Clusters    = 127000,
-                ClusterSize = 2048
-            },
-            new FileSystemTest
-            {
-                TestFile    = "aros.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 409600,
-                SectorSize  = 512,
-                Clusters    = 407232,
-                ClusterSize = 512
-            },
-            new FileSystemTest
-            {
-                TestFile    = "amigaos_4.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024128,
-                SectorSize  = 512,
-                Clusters    = 511040,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "amigaos_4.0_sfs2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024128,
-                SectorSize  = 512,
-                Clusters    = 511040,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "morphos_3.13.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 261936,
-                ClusterSize = 512
-            }
-        };
-    }
+            TestFile    = "uae.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024128,
+            SectorSize  = 512,
+            Clusters    = 127000,
+            ClusterSize = 2048
+        },
+        new FileSystemTest
+        {
+            TestFile    = "aros.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 409600,
+            SectorSize  = 512,
+            Clusters    = 407232,
+            ClusterSize = 512
+        },
+        new FileSystemTest
+        {
+            TestFile    = "amigaos_4.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024128,
+            SectorSize  = 512,
+            Clusters    = 511040,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "amigaos_4.0_sfs2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024128,
+            SectorSize  = 512,
+            Clusters    = 511040,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "morphos_3.13.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 261936,
+            ClusterSize = 512
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/SysV/MBR.cs b/Aaru.Tests/Filesystems/SysV/MBR.cs
index c79524e65..87a7b144c 100644
--- a/Aaru.Tests/Filesystems/SysV/MBR.cs
+++ b/Aaru.Tests/Filesystems/SysV/MBR.cs
@@ -32,50 +32,49 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.SysV
+namespace Aaru.Tests.Filesystems.SysV;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("SVR4 fs") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "System V filesystem (MBR)");
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("SVR4 fs") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "System V filesystem (MBR)");
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 511056,
-                ClusterSize = 1024,
-                VolumeName  = "/usr3"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_2k.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 255528,
-                ClusterSize = 2048,
-                VolumeName  = "/usr3"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 2097152,
-                SectorSize  = 512,
-                Clusters    = 1020096,
-                ClusterSize = 1024,
-                VolumeName  = "Volume label"
-            }
-        };
-    }
+            TestFile    = "att_unix_svr4v2.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 511056,
+            ClusterSize = 1024,
+            VolumeName  = "/usr3"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_2k.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 255528,
+            ClusterSize = 2048,
+            VolumeName  = "/usr3"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 2097152,
+            SectorSize  = 512,
+            Clusters    = 1020096,
+            ClusterSize = 1024,
+            VolumeName  = "Volume label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/SysV/RDB.cs b/Aaru.Tests/Filesystems/SysV/RDB.cs
index 2a979d302..15a26834a 100644
--- a/Aaru.Tests/Filesystems/SysV/RDB.cs
+++ b/Aaru.Tests/Filesystems/SysV/RDB.cs
@@ -32,30 +32,29 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.SysV
+namespace Aaru.Tests.Filesystems.SysV;
+
+[TestFixture]
+public class RDB : FilesystemTest
 {
-    [TestFixture]
-    public class RDB : FilesystemTest
+    public RDB() : base("SVR4 fs") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "System V filesystem (RDB)");
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public RDB() : base("SVR4 fs") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "System V filesystem (RDB)");
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "amix.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024128,
-                SectorSize  = 512,
-                Clusters    = 511424,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            }
-        };
-    }
+            TestFile    = "amix.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024128,
+            SectorSize  = 512,
+            Clusters    = 511424,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/SysV/Whole.cs b/Aaru.Tests/Filesystems/SysV/Whole.cs
index 30c6dd7fd..e4d0bedeb 100644
--- a/Aaru.Tests/Filesystems/SysV/Whole.cs
+++ b/Aaru.Tests/Filesystems/SysV/Whole.cs
@@ -32,110 +32,109 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.SysV
+namespace Aaru.Tests.Filesystems.SysV;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("SVR4 fs") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "System V filesystem");
+
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("SVR4 fs") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "System V filesystem");
-
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "amix.adf.lz",
-                MediaType   = MediaType.CBM_AMIGA_35_DD,
-                Sectors     = 1760,
-                SectorSize  = 512,
-                Clusters    = 880,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_dsdd.img.lz",
-                MediaType   = MediaType.DOS_525_DS_DD_9,
-                Sectors     = 720,
-                SectorSize  = 512,
-                Clusters    = 360,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
-                MediaType   = MediaType.DMF,
-                Sectors     = 3360,
-                SectorSize  = 512,
-                Clusters    = 1680,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 1200,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
-                MediaType   = MediaType.ECMA_147,
-                Sectors     = 5760,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            }
-        };
-    }
+            TestFile    = "amix.adf.lz",
+            MediaType   = MediaType.CBM_AMIGA_35_DD,
+            Sectors     = 1760,
+            SectorSize  = 512,
+            Clusters    = 880,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_dsdd.img.lz",
+            MediaType   = MediaType.DOS_525_DS_DD_9,
+            Sectors     = 720,
+            SectorSize  = 512,
+            Clusters    = 360,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
+            MediaType   = MediaType.DMF,
+            Sectors     = 3360,
+            SectorSize  = 512,
+            Clusters    = 1680,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 1200,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
+            MediaType   = MediaType.ECMA_147,
+            Sectors     = 5760,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs b/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs
index def48cf5c..613eeeffd 100644
--- a/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/1.02/Whole.cs
@@ -32,83 +32,82 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UDF._102
-{
-    [TestFixture]
-    public class Whole : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "1.02");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
-        public override bool        Partitions => false;
+namespace Aaru.Tests.Filesystems.UDF._102;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Whole : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "1.02");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 1024000,
-                ClusterSize  = 512,
-                SystemId     = "*Linux UDFFS",
-                Type         = "UDF v1.02",
-                VolumeName   = "Volume label",
-                VolumeSerial = "595c5cfa38ce8b66LinuxUDF"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 204800,
-                SectorSize   = 512,
-                Clusters     = 204800,
-                ClusterSize  = 512,
-                SystemId     = "*Apple Mac OS X UDF FS",
-                Type         = "UDF v1.02",
-                VolumeName   = "Volume label",
-                VolumeSerial = "6D02A231 (Mac OS X newfs_udf) UDF Volume Set"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_udf_1.02_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 1024000,
-                ClusterSize  = 512,
-                SystemId     = "*Linux UDFFS",
-                Type         = "UDF v2.01",
-                VolumeName   = "DicSetter",
-                VolumeSerial = "5cc7882441a86e93LinuxUDF"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_6.1.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262144,
-                ClusterSize  = 512,
-                SystemId     = "*NetBSD userland UDF",
-                Type         = "UDF v1.50",
-                VolumeName   = "anonymous",
-                VolumeSerial = "47b062a138bcfb83"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262144,
-                ClusterSize  = 512,
-                SystemId     = "*NetBSD userland UDF",
-                Type         = "UDF v1.50",
-                VolumeName   = "anonymous",
-                VolumeSerial = "382885b272e72ab8"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 1024000,
+            ClusterSize  = 512,
+            SystemId     = "*Linux UDFFS",
+            Type         = "UDF v1.02",
+            VolumeName   = "Volume label",
+            VolumeSerial = "595c5cfa38ce8b66LinuxUDF"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 204800,
+            SectorSize   = 512,
+            Clusters     = 204800,
+            ClusterSize  = 512,
+            SystemId     = "*Apple Mac OS X UDF FS",
+            Type         = "UDF v1.02",
+            VolumeName   = "Volume label",
+            VolumeSerial = "6D02A231 (Mac OS X newfs_udf) UDF Volume Set"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_udf_1.02_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 1024000,
+            ClusterSize  = 512,
+            SystemId     = "*Linux UDFFS",
+            Type         = "UDF v2.01",
+            VolumeName   = "DicSetter",
+            VolumeSerial = "5cc7882441a86e93LinuxUDF"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_6.1.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262144,
+            ClusterSize  = 512,
+            SystemId     = "*NetBSD userland UDF",
+            Type         = "UDF v1.50",
+            VolumeName   = "anonymous",
+            VolumeSerial = "47b062a138bcfb83"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_7.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262144,
+            ClusterSize  = 512,
+            SystemId     = "*NetBSD userland UDF",
+            Type         = "UDF v1.50",
+            VolumeName   = "anonymous",
+            VolumeSerial = "382885b272e72ab8"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UDF/1.50/Optical.cs b/Aaru.Tests/Filesystems/UDF/1.50/Optical.cs
index ff5415a35..c59a6953f 100644
--- a/Aaru.Tests/Filesystems/UDF/1.50/Optical.cs
+++ b/Aaru.Tests/Filesystems/UDF/1.50/Optical.cs
@@ -32,31 +32,30 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UDF._150
-{
-    [TestFixture]
-    public class Optical : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "1.50");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
-        public override bool        Partitions => false;
+namespace Aaru.Tests.Filesystems.UDF._150;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Optical : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "1.50");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "ecs20.aif",
-                MediaType    = MediaType.DVDPR,
-                Sectors      = 2295104,
-                SectorSize   = 2048,
-                Clusters     = 2295104,
-                ClusterSize  = 2048,
-                SystemId     = "*ExpressUDF",
-                Type         = "UDF v2.01",
-                VolumeName   = "Volume label",
-                VolumeSerial = "Volume Set ID not specified"
-            }
-        };
-    }
+            TestFile     = "ecs20.aif",
+            MediaType    = MediaType.DVDPR,
+            Sectors      = 2295104,
+            SectorSize   = 2048,
+            Clusters     = 2295104,
+            ClusterSize  = 2048,
+            SystemId     = "*ExpressUDF",
+            Type         = "UDF v2.01",
+            VolumeName   = "Volume label",
+            VolumeSerial = "Volume Set ID not specified"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs b/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs
index 705c768c1..179234d7f 100644
--- a/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/1.50/Whole.cs
@@ -32,109 +32,108 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UDF._150
-{
-    [TestFixture]
-    public class Whole : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "1.50");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
-        public override bool        Partitions => false;
+namespace Aaru.Tests.Filesystems.UDF._150;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Whole : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "1.50");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 1024000,
-                ClusterSize  = 512,
-                SystemId     = "*Linux UDFFS",
-                Type         = "UDF v1.50",
-                VolumeName   = "Volume label",
-                VolumeSerial = "595c5d00c5b3405aLinuxUDF"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 409600,
-                SectorSize   = 512,
-                Clusters     = 409600,
-                ClusterSize  = 512,
-                SystemId     = "*Apple Mac OS X UDF FS",
-                Type         = "UDF v1.50",
-                VolumeName   = "Volume label",
-                VolumeSerial = "4DD0458B (Mac OS X newfs_udf) UDF Volume Set"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "solaris_9.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 8388608,
-                SectorSize   = 512,
-                Clusters     = 8388608,
-                ClusterSize  = 512,
-                SystemId     = "*SUN SOLARIS UDF",
-                Type         = "UDF v1.50",
-                VolumeName   = "*NoLabel*",
-                VolumeSerial = "595EB55A"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_udf_1.50_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 1024000,
-                ClusterSize  = 512,
-                SystemId     = "*Linux UDFFS",
-                Type         = "UDF v2.01",
-                VolumeName   = "DicSetter",
-                VolumeSerial = "5cc78f8bba4dfe00LinuxUDF"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_6.1.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262144,
-                ClusterSize  = 512,
-                SystemId     = "*NetBSD userland UDF",
-                Type         = "UDF v1.50",
-                VolumeName   = "anonymous",
-                VolumeSerial = "441072592d72c6e9"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262144,
-                ClusterSize  = 512,
-                SystemId     = "*NetBSD userland UDF",
-                Type         = "UDF v1.50",
-                VolumeName   = "anonymous",
-                VolumeSerial = "5b2ab9f9605af1ae"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "appleudf_1.5.3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 65536,
-                ClusterSize  = 2048,
-                SystemId     = "*Apple Computer, Inc.",
-                Type         = "UDF v1.50",
-                VolumeName   = "Volume label",
-                VolumeSerial = "DCC41202AppleUDF"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 1024000,
+            ClusterSize  = 512,
+            SystemId     = "*Linux UDFFS",
+            Type         = "UDF v1.50",
+            VolumeName   = "Volume label",
+            VolumeSerial = "595c5d00c5b3405aLinuxUDF"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 409600,
+            SectorSize   = 512,
+            Clusters     = 409600,
+            ClusterSize  = 512,
+            SystemId     = "*Apple Mac OS X UDF FS",
+            Type         = "UDF v1.50",
+            VolumeName   = "Volume label",
+            VolumeSerial = "4DD0458B (Mac OS X newfs_udf) UDF Volume Set"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "solaris_9.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 8388608,
+            SectorSize   = 512,
+            Clusters     = 8388608,
+            ClusterSize  = 512,
+            SystemId     = "*SUN SOLARIS UDF",
+            Type         = "UDF v1.50",
+            VolumeName   = "*NoLabel*",
+            VolumeSerial = "595EB55A"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_udf_1.50_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 1024000,
+            ClusterSize  = 512,
+            SystemId     = "*Linux UDFFS",
+            Type         = "UDF v2.01",
+            VolumeName   = "DicSetter",
+            VolumeSerial = "5cc78f8bba4dfe00LinuxUDF"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_6.1.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262144,
+            ClusterSize  = 512,
+            SystemId     = "*NetBSD userland UDF",
+            Type         = "UDF v1.50",
+            VolumeName   = "anonymous",
+            VolumeSerial = "441072592d72c6e9"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_7.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262144,
+            ClusterSize  = 512,
+            SystemId     = "*NetBSD userland UDF",
+            Type         = "UDF v1.50",
+            VolumeName   = "anonymous",
+            VolumeSerial = "5b2ab9f9605af1ae"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "appleudf_1.5.3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 65536,
+            ClusterSize  = 2048,
+            SystemId     = "*Apple Computer, Inc.",
+            Type         = "UDF v1.50",
+            VolumeName   = "Volume label",
+            VolumeSerial = "DCC41202AppleUDF"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UDF/2.00/Optical.cs b/Aaru.Tests/Filesystems/UDF/2.00/Optical.cs
index ec73b9e77..0ab399e38 100644
--- a/Aaru.Tests/Filesystems/UDF/2.00/Optical.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.00/Optical.cs
@@ -32,31 +32,30 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UDF._200
-{
-    [TestFixture]
-    public class Optical : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.00");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
-        public override bool        Partitions => false;
+namespace Aaru.Tests.Filesystems.UDF._200;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Optical : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.00");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "ecs20.aif",
-                MediaType    = MediaType.DVDPR,
-                Sectors      = 2295104,
-                SectorSize   = 2048,
-                Clusters     = 2295104,
-                ClusterSize  = 2048,
-                SystemId     = "*ExpressUDF",
-                Type         = "UDF v2.01",
-                VolumeName   = "UDF5A5DEF48",
-                VolumeSerial = "Volume Set ID not specified"
-            }
-        };
-    }
+            TestFile     = "ecs20.aif",
+            MediaType    = MediaType.DVDPR,
+            Sectors      = 2295104,
+            SectorSize   = 2048,
+            Clusters     = 2295104,
+            ClusterSize  = 2048,
+            SystemId     = "*ExpressUDF",
+            Type         = "UDF v2.01",
+            VolumeName   = "UDF5A5DEF48",
+            VolumeSerial = "Volume Set ID not specified"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UDF/2.00/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.00/Whole.cs
index 826c00ba5..f70a834a3 100644
--- a/Aaru.Tests/Filesystems/UDF/2.00/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.00/Whole.cs
@@ -32,57 +32,56 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UDF._200
-{
-    [TestFixture]
-    public class Whole : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.00");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
-        public override bool        Partitions => false;
+namespace Aaru.Tests.Filesystems.UDF._200;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Whole : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.00");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 1024000,
-                ClusterSize  = 512,
-                SystemId     = "*Linux UDFFS",
-                Type         = "UDF v2.00",
-                VolumeName   = "Volume label",
-                VolumeSerial = "595c5d07f4fc8e8dLinuxUDF"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 614400,
-                SectorSize   = 512,
-                Clusters     = 614400,
-                ClusterSize  = 512,
-                SystemId     = "*Apple Mac OS X UDF FS",
-                Type         = "UDF v2.00",
-                VolumeName   = "Volume label",
-                VolumeSerial = "5D91CB4F (Mac OS X newfs_udf) UDF Volume Set"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_udf_2.00_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 1024000,
-                ClusterSize  = 512,
-                SystemId     = "*Linux UDFFS",
-                Type         = "UDF v2.01",
-                VolumeName   = "DicSetter",
-                VolumeSerial = "5cc7f4183e0d5f7aLinuxUDF"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 1024000,
+            ClusterSize  = 512,
+            SystemId     = "*Linux UDFFS",
+            Type         = "UDF v2.00",
+            VolumeName   = "Volume label",
+            VolumeSerial = "595c5d07f4fc8e8dLinuxUDF"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 614400,
+            SectorSize   = 512,
+            Clusters     = 614400,
+            ClusterSize  = 512,
+            SystemId     = "*Apple Mac OS X UDF FS",
+            Type         = "UDF v2.00",
+            VolumeName   = "Volume label",
+            VolumeSerial = "5D91CB4F (Mac OS X newfs_udf) UDF Volume Set"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_udf_2.00_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 1024000,
+            ClusterSize  = 512,
+            SystemId     = "*Linux UDFFS",
+            Type         = "UDF v2.01",
+            VolumeName   = "DicSetter",
+            VolumeSerial = "5cc7f4183e0d5f7aLinuxUDF"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UDF/2.01/Optical.cs b/Aaru.Tests/Filesystems/UDF/2.01/Optical.cs
index eb9058efb..fd42e2580 100644
--- a/Aaru.Tests/Filesystems/UDF/2.01/Optical.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.01/Optical.cs
@@ -32,44 +32,43 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UDF._201
-{
-    [TestFixture]
-    public class Optical : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.01");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
-        public override bool        Partitions => false;
+namespace Aaru.Tests.Filesystems.UDF._201;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Optical : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.01");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "ecs20.aif",
-                MediaType    = MediaType.DVDPR,
-                Sectors      = 2295104,
-                SectorSize   = 2048,
-                Clusters     = 2295104,
-                ClusterSize  = 2048,
-                SystemId     = "*ExpressUDF",
-                Type         = "UDF v2.01",
-                VolumeName   = "VolLabel",
-                VolumeSerial = "VolumeSetId"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "ecs20_cdrw.aif",
-                MediaType    = MediaType.CDRW,
-                Sectors      = 295264,
-                SectorSize   = 2048,
-                Clusters     = 295264,
-                ClusterSize  = 2048,
-                SystemId     = "*ExpressUDF",
-                Type         = "UDF v2.01",
-                VolumeName   = "UDF5A5DFF10",
-                VolumeSerial = "Volume Set ID not specified"
-            }
-        };
-    }
+            TestFile     = "ecs20.aif",
+            MediaType    = MediaType.DVDPR,
+            Sectors      = 2295104,
+            SectorSize   = 2048,
+            Clusters     = 2295104,
+            ClusterSize  = 2048,
+            SystemId     = "*ExpressUDF",
+            Type         = "UDF v2.01",
+            VolumeName   = "VolLabel",
+            VolumeSerial = "VolumeSetId"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "ecs20_cdrw.aif",
+            MediaType    = MediaType.CDRW,
+            Sectors      = 295264,
+            SectorSize   = 2048,
+            Clusters     = 295264,
+            ClusterSize  = 2048,
+            SystemId     = "*ExpressUDF",
+            Type         = "UDF v2.01",
+            VolumeName   = "UDF5A5DFF10",
+            VolumeSerial = "Volume Set ID not specified"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs
index adf7906a6..1926c2cfa 100644
--- a/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.01/Whole.cs
@@ -32,83 +32,82 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UDF._201
-{
-    [TestFixture]
-    public class Whole : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.01");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
-        public override bool        Partitions => false;
+namespace Aaru.Tests.Filesystems.UDF._201;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Whole : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.01");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 1024000,
-                ClusterSize  = 512,
-                SystemId     = "*Linux UDFFS",
-                Type         = "UDF v2.01",
-                VolumeName   = "Volume label",
-                VolumeSerial = "595c5d0bee60c3bbLinuxUDF"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 819200,
-                SectorSize   = 512,
-                Clusters     = 819200,
-                ClusterSize  = 512,
-                SystemId     = "*Apple Mac OS X UDF FS",
-                Type         = "UDF v2.01",
-                VolumeName   = "Volume label",
-                VolumeSerial = "48847EB3 (Mac OS X newfs_udf) UDF Volume Set"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262144,
-                ClusterSize  = 512,
-                SystemId     = "*NetBSD userland UDF",
-                Type         = "UDF v2.01",
-                VolumeName   = "anonymous",
-                VolumeSerial = "5bc935e11b089104"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_udf_2.01_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 1024000,
-                ClusterSize  = 512,
-                SystemId     = "*Linux UDFFS",
-                Type         = "UDF v2.01",
-                VolumeName   = "DicSetter",
-                VolumeSerial = "5cc8816fcb3a3b38LinuxUDF"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_6.1.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262144,
-                ClusterSize  = 512,
-                SystemId     = "*NetBSD userland UDF",
-                Type         = "UDF v2.01",
-                VolumeName   = "anonymous",
-                VolumeSerial = "60a80c385dda0f96"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 1024000,
+            ClusterSize  = 512,
+            SystemId     = "*Linux UDFFS",
+            Type         = "UDF v2.01",
+            VolumeName   = "Volume label",
+            VolumeSerial = "595c5d0bee60c3bbLinuxUDF"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 819200,
+            SectorSize   = 512,
+            Clusters     = 819200,
+            ClusterSize  = 512,
+            SystemId     = "*Apple Mac OS X UDF FS",
+            Type         = "UDF v2.01",
+            VolumeName   = "Volume label",
+            VolumeSerial = "48847EB3 (Mac OS X newfs_udf) UDF Volume Set"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_7.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262144,
+            ClusterSize  = 512,
+            SystemId     = "*NetBSD userland UDF",
+            Type         = "UDF v2.01",
+            VolumeName   = "anonymous",
+            VolumeSerial = "5bc935e11b089104"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_udf_2.01_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 1024000,
+            ClusterSize  = 512,
+            SystemId     = "*Linux UDFFS",
+            Type         = "UDF v2.01",
+            VolumeName   = "DicSetter",
+            VolumeSerial = "5cc8816fcb3a3b38LinuxUDF"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_6.1.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262144,
+            ClusterSize  = 512,
+            SystemId     = "*NetBSD userland UDF",
+            Type         = "UDF v2.01",
+            VolumeName   = "anonymous",
+            VolumeSerial = "60a80c385dda0f96"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs
index d907b86a0..02525bd02 100644
--- a/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.50/Whole.cs
@@ -32,70 +32,69 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UDF._250
-{
-    [TestFixture]
-    public class Whole : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.50");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
-        public override bool        Partitions => false;
+namespace Aaru.Tests.Filesystems.UDF._250;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Whole : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.50");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 1024000,
-                ClusterSize  = 512,
-                SystemId     = "*Linux UDFFS",
-                Type         = "UDF v2.50",
-                VolumeName   = "Volume label",
-                VolumeSerial = "595c5d0e4f338552LinuxUDF"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 1024000,
-                ClusterSize  = 512,
-                SystemId     = "*Apple Mac OS X UDF FS",
-                Type         = "UDF v2.50",
-                VolumeName   = "Volume label",
-                VolumeSerial = "709E84A1 (Mac OS X newfs_udf) UDF Volume Set"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_6.1.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262144,
-                ClusterSize  = 512,
-                SystemId     = "*NetBSD userland UDF",
-                Type         = "UDF v2.50",
-                VolumeName   = "anonymous",
-                VolumeSerial = "672fe9a0114cdddb"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262144,
-                ClusterSize  = 512,
-                SystemId     = "*NetBSD userland UDF",
-                Type         = "UDF v2.50",
-                VolumeName   = "anonymous",
-                VolumeSerial = "723d15a55a5d8156"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 1024000,
+            ClusterSize  = 512,
+            SystemId     = "*Linux UDFFS",
+            Type         = "UDF v2.50",
+            VolumeName   = "Volume label",
+            VolumeSerial = "595c5d0e4f338552LinuxUDF"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 1024000,
+            ClusterSize  = 512,
+            SystemId     = "*Apple Mac OS X UDF FS",
+            Type         = "UDF v2.50",
+            VolumeName   = "Volume label",
+            VolumeSerial = "709E84A1 (Mac OS X newfs_udf) UDF Volume Set"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_6.1.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262144,
+            ClusterSize  = 512,
+            SystemId     = "*NetBSD userland UDF",
+            Type         = "UDF v2.50",
+            VolumeName   = "anonymous",
+            VolumeSerial = "672fe9a0114cdddb"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_7.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262144,
+            ClusterSize  = 512,
+            SystemId     = "*NetBSD userland UDF",
+            Type         = "UDF v2.50",
+            VolumeName   = "anonymous",
+            VolumeSerial = "723d15a55a5d8156"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs b/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs
index c3a5e6030..d298ae4c9 100644
--- a/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs
+++ b/Aaru.Tests/Filesystems/UDF/2.60/Whole.cs
@@ -33,57 +33,56 @@ using NUnit.Framework;
 
 // ReSharper disable CheckNamespace
 
-namespace Aaru.Tests.Filesystems.UDF._260
-{
-    [TestFixture]
-    public class Whole : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.60");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
-        public override bool        Partitions => false;
+namespace Aaru.Tests.Filesystems.UDF._260;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Whole : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Universal Disc Format", "2.60");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.UDF();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1228800,
-                SectorSize   = 512,
-                Clusters     = 1228800,
-                ClusterSize  = 512,
-                SystemId     = "*Apple Mac OS X UDF FS",
-                Type         = "UDF v2.60",
-                VolumeName   = "Volume label",
-                VolumeSerial = "78CE3237 (Mac OS X newfs_udf) UDF Volume Set"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_6.1.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262144,
-                ClusterSize  = 512,
-                SystemId     = "*NetBSD userland UDF",
-                Type         = "UDF v2.60",
-                VolumeName   = "anonymous",
-                VolumeSerial = "10f24d1248067621"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 262144,
-                ClusterSize  = 512,
-                SystemId     = "*NetBSD userland UDF",
-                Type         = "UDF v2.60",
-                VolumeName   = "anonymous",
-                VolumeSerial = "05f537510deab1e7"
-            }
-        };
-    }
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1228800,
+            SectorSize   = 512,
+            Clusters     = 1228800,
+            ClusterSize  = 512,
+            SystemId     = "*Apple Mac OS X UDF FS",
+            Type         = "UDF v2.60",
+            VolumeName   = "Volume label",
+            VolumeSerial = "78CE3237 (Mac OS X newfs_udf) UDF Volume Set"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_6.1.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262144,
+            ClusterSize  = 512,
+            SystemId     = "*NetBSD userland UDF",
+            Type         = "UDF v2.60",
+            VolumeName   = "anonymous",
+            VolumeSerial = "10f24d1248067621"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_7.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 262144,
+            ClusterSize  = 512,
+            SystemId     = "*NetBSD userland UDF",
+            Type         = "UDF v2.60",
+            VolumeName   = "anonymous",
+            VolumeSerial = "05f537510deab1e7"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UFS/APM.cs b/Aaru.Tests/Filesystems/UFS/APM.cs
index 15e18af3d..7c668cec6 100644
--- a/Aaru.Tests/Filesystems/UFS/APM.cs
+++ b/Aaru.Tests/Filesystems/UFS/APM.cs
@@ -32,258 +32,257 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UFS
-{
-    [TestFixture]
-    public class APM : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (APM)");
-        public override IFilesystem Plugin     => new FFSPlugin();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems.UFS;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class APM : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (APM)");
+    public override IFilesystem Plugin     => new FFSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/macosx_10.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130156,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/macosx_10.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130156,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/macosx_10.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130156,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/macosx_10.3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 121448,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/macosx_10.4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 122328,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_1.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_1.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_1.3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_1.4.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_6.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_7.0.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_8.0.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_1.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_1.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_1.3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_1.4.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_6.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_7.0.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_8.0.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/macosx_10.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130156,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/macosx_10.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130156,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/macosx_10.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130156,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/macosx_10.3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 121448,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/macosx_10.4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 122328,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            }
-        };
-    }
+            TestFile    = "ffs43/macosx_10.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130156,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/macosx_10.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130156,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/macosx_10.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130156,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/macosx_10.3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 121448,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/macosx_10.4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 122328,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_1.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_1.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_1.3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_1.4.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_6.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_7.0.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_8.0.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_1.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_1.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_1.3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_1.4.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_6.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_7.0.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_8.0.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/macosx_10.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130156,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/macosx_10.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130156,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/macosx_10.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130156,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/macosx_10.3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 121448,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/macosx_10.4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 122328,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UFS/MBR.cs b/Aaru.Tests/Filesystems/UFS/MBR.cs
index 2ce8b9a9f..b4ecc25ab 100644
--- a/Aaru.Tests/Filesystems/UFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/UFS/MBR.cs
@@ -32,488 +32,487 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UFS
-{
-    [TestFixture]
-    public class MBR : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (MBR)");
-        public override IFilesystem Plugin     => new FFSPlugin();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems.UFS;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class MBR : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (MBR)");
+    public override IFilesystem Plugin     => new FFSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/linux.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65024,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs2/linux.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65024,
-                ClusterSize = 2048,
-                Type        = "UFS2",
-                VolumeName  = "VolumeLabel"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_1.3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_1.4.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_6.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_7.0.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/darwin_8.0.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/dflybsd_1.2.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 511950,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/dflybsd_3.6.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 255470,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/dflybsd_4.0.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024000,
-                SectorSize  = 512,
-                Clusters    = 255470,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/netbsd_1.6.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130032,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/netbsd_6.1.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/netbsd_7.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/netbsd_7.1_be.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/openbsd_4.7.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65504,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_1.3.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_1.4.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_6.0.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_7.0.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/darwin_8.0.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/dflybsd_1.2.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 2097152,
-                SectorSize  = 512,
-                Clusters    = 1048500,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/dflybsd_3.6.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 2097152,
-                SectorSize  = 512,
-                Clusters    = 523758,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/dflybsd_4.0.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 2097152,
-                SectorSize  = 512,
-                Clusters    = 523758,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/freebsd_6.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65500,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/freebsd_7.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65500,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/freebsd_8.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65500,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/netbsd_1.6.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130032,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/netbsd_6.1.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/netbsd_7.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/netbsd_7.1_be.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/solaris_7.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 2097152,
-                SectorSize  = 512,
-                Clusters    = 1038240,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/solaris_9.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 2097152,
-                SectorSize  = 512,
-                Clusters    = 1046808,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs2/freebsd_6.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65500,
-                ClusterSize = 2048,
-                Type        = "UFS2",
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs2/freebsd_7.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65500,
-                ClusterSize = 2048,
-                Type        = "UFS2",
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs2/freebsd_8.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65500,
-                ClusterSize = 2048,
-                Type        = "UFS2",
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs2/netbsd_7.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS2",
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs2/netbsd_7.1_be.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS2",
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs2/netbsd_6.1.5.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS2",
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs2/openbsd_4.7.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65254,
-                ClusterSize = 2048,
-                Type        = "UFS2",
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/dflybsd_1.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130504,
-                ClusterSize = 1024,
-                Type        = "UFS",
-                VolumeName  = null
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/dflybsd_1.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "UFS",
-                VolumeName  = null
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/openbsd_4.7.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 65504,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/macosx_10.3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131068,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/macosx_10.3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131068,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ffs43/macosx_10.4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "ufs1/macosx_10.4.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131040,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            }
-        };
-    }
+            TestFile    = "ufs1/linux.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65024,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs2/linux.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65024,
+            ClusterSize = 2048,
+            Type        = "UFS2",
+            VolumeName  = "VolumeLabel"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_1.3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_1.4.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_6.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_7.0.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/darwin_8.0.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/dflybsd_1.2.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 511950,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/dflybsd_3.6.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 255470,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/dflybsd_4.0.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024000,
+            SectorSize  = 512,
+            Clusters    = 255470,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/netbsd_1.6.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130032,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/netbsd_6.1.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/netbsd_7.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/netbsd_7.1_be.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/openbsd_4.7.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65504,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_1.3.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_1.4.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_6.0.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_7.0.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/darwin_8.0.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/dflybsd_1.2.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 2097152,
+            SectorSize  = 512,
+            Clusters    = 1048500,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/dflybsd_3.6.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 2097152,
+            SectorSize  = 512,
+            Clusters    = 523758,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/dflybsd_4.0.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 2097152,
+            SectorSize  = 512,
+            Clusters    = 523758,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/freebsd_6.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65500,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/freebsd_7.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65500,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/freebsd_8.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65500,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/netbsd_1.6.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130032,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/netbsd_6.1.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/netbsd_7.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/netbsd_7.1_be.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/solaris_7.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 2097152,
+            SectorSize  = 512,
+            Clusters    = 1038240,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/solaris_9.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 2097152,
+            SectorSize  = 512,
+            Clusters    = 1046808,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs2/freebsd_6.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65500,
+            ClusterSize = 2048,
+            Type        = "UFS2",
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs2/freebsd_7.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65500,
+            ClusterSize = 2048,
+            Type        = "UFS2",
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs2/freebsd_8.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65500,
+            ClusterSize = 2048,
+            Type        = "UFS2",
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs2/netbsd_7.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS2",
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs2/netbsd_7.1_be.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS2",
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs2/netbsd_6.1.5.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS2",
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs2/openbsd_4.7.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65254,
+            ClusterSize = 2048,
+            Type        = "UFS2",
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/dflybsd_1.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130504,
+            ClusterSize = 1024,
+            Type        = "UFS",
+            VolumeName  = null
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/dflybsd_1.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "UFS",
+            VolumeName  = null
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/openbsd_4.7.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 65504,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/macosx_10.3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131068,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/macosx_10.3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131068,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ffs43/macosx_10.4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "ufs1/macosx_10.4.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131040,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs b/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs
index ca06218ce..fdfd41399 100644
--- a/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs	
+++ b/Aaru.Tests/Filesystems/UFS/NeXT Floppy.cs	
@@ -32,118 +32,117 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UFS
-{
-    [TestFixture]
-    public class NeXT_Floppy : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (NeXT)");
-        public override IFilesystem Plugin     => new FFSPlugin();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems.UFS;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class NeXT_Floppy : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (NeXT)");
+    public override IFilesystem Plugin     => new FFSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "nextstep_3.3_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 624,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "nextstep_3.3_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1344,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openstep_4.0_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 624,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openstep_4.0_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1344,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openstep_4.2_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 624,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openstep_4.2_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1344,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "rhapsody_dr1_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 624,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "rhapsody_dr1_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1344,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "rhapsody_dr2_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 624,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "rhapsody_dr2_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1344,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            }
-        };
-    }
+            TestFile    = "nextstep_3.3_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 624,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "nextstep_3.3_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1344,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openstep_4.0_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 624,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openstep_4.0_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1344,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openstep_4.2_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 624,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openstep_4.2_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1344,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "rhapsody_dr1_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 624,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "rhapsody_dr1_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1344,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "rhapsody_dr2_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 624,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "rhapsody_dr2_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1344,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UFS/NeXT.cs b/Aaru.Tests/Filesystems/UFS/NeXT.cs
index c90e7ddc2..c2c1c5377 100644
--- a/Aaru.Tests/Filesystems/UFS/NeXT.cs
+++ b/Aaru.Tests/Filesystems/UFS/NeXT.cs
@@ -32,108 +32,107 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UFS
-{
-    [TestFixture]
-    public class NeXT : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (NeXT)");
-        public override IFilesystem Plugin     => new FFSPlugin();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems.UFS;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class NeXT : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (NeXT)");
+    public override IFilesystem Plugin     => new FFSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "nextstep_3.3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130912,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openstep_4.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130912,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openstep_4.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130912,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "rhapsody_dr1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130912,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "rhapsody_dr2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130880,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macosx_1.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130912,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macosx_1.1.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130912,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macosx_1.2.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130912,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "macosx_1.2v3.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 130912,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            }
-        };
-    }
+            TestFile    = "nextstep_3.3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130912,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openstep_4.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130912,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openstep_4.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130912,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "rhapsody_dr1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130912,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "rhapsody_dr2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130880,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macosx_1.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130912,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macosx_1.1.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130912,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macosx_1.2.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130912,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "macosx_1.2v3.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 130912,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UFS/RDB.cs b/Aaru.Tests/Filesystems/UFS/RDB.cs
index 8d4f6bc07..93d654ef4 100644
--- a/Aaru.Tests/Filesystems/UFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/UFS/RDB.cs
@@ -32,28 +32,27 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UFS
-{
-    [TestFixture]
-    public class RDB : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (RDB)");
-        public override IFilesystem Plugin     => new FFSPlugin();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems.UFS;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class RDB : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (RDB)");
+    public override IFilesystem Plugin     => new FFSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "amix.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 1024128,
-                SectorSize  = 512,
-                Clusters    = 511424,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            }
-        };
-    }
+            TestFile    = "amix.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 1024128,
+            SectorSize  = 512,
+            Clusters    = 511424,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UFS/Sun i86.cs b/Aaru.Tests/Filesystems/UFS/Sun i86.cs
index 1eed2d66b..f69e5ce19 100644
--- a/Aaru.Tests/Filesystems/UFS/Sun i86.cs	
+++ b/Aaru.Tests/Filesystems/UFS/Sun i86.cs	
@@ -32,28 +32,27 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UFS
-{
-    [TestFixture]
-    public class Sun_i86 : FilesystemTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (SunOS x86)");
-        public override IFilesystem Plugin     => new FFSPlugin();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems.UFS;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Sun_i86 : FilesystemTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem (SunOS x86)");
+    public override IFilesystem Plugin     => new FFSPlugin();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "solaris_7.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 4194304,
-                SectorSize  = 512,
-                Clusters    = 2063376,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            }
-        };
-    }
+            TestFile    = "solaris_7.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 4194304,
+            SectorSize  = 512,
+            Clusters    = 2063376,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UFS/Whole.cs b/Aaru.Tests/Filesystems/UFS/Whole.cs
index 69e629983..1df7865a6 100644
--- a/Aaru.Tests/Filesystems/UFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/UFS/Whole.cs
@@ -32,242 +32,241 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UFS
+namespace Aaru.Tests.Filesystems.UFS;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem");
+
+    public override IFilesystem Plugin     => new FFSPlugin();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "UNIX filesystem");
-
-        public override IFilesystem Plugin     => new FFSPlugin();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "amix_mf2dd.adf.lz",
-                MediaType   = MediaType.CBM_AMIGA_35_DD,
-                Sectors     = 1760,
-                SectorSize  = 512,
-                Clusters    = 880,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_1.6_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_1.6_mf2hd_ffs43.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_dsdd.img.lz",
-                MediaType   = MediaType.DOS_525_DS_DD_9,
-                Sectors     = 720,
-                SectorSize  = 512,
-                Clusters    = 360,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 1200,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "solaris_2.4_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 711,
-                ClusterSize = 1024,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "dflybsd_1.0_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "dflybsd_1.0_mf2hd_ffs43.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_6.1.5_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_6.1.5_mf2hd_ffs43.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_6.1.5_mf2hd_ufs2.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                VolumeName  = "",
-                Type        = "UFS2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_7.1_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_7.1_mf2hd_ffs43.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_7.1_mf2hd_ufs2.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                VolumeName  = "",
-                Type        = "UFS2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_7.1_mf2hd_be.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_7.1_mf2hd_ffs43_be.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "netbsd_7.1_mf2hd_ufs2_be.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512,
-                VolumeName  = "",
-                Type        = "UFS2"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openbsd_4.7_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openbsd_4.7_mf2hd_ffs43.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 2048,
-                Type        = "UFS"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "openbsd_4.7_mf2hd_ufs2.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 2048,
-                VolumeName  = "",
-                Type        = "UFS2"
-            }
-        };
-    }
+            TestFile    = "amix_mf2dd.adf.lz",
+            MediaType   = MediaType.CBM_AMIGA_35_DD,
+            Sectors     = 1760,
+            SectorSize  = 512,
+            Clusters    = 880,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_1.6_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_1.6_mf2hd_ffs43.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_dsdd.img.lz",
+            MediaType   = MediaType.DOS_525_DS_DD_9,
+            Sectors     = 720,
+            SectorSize  = 512,
+            Clusters    = 360,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 1200,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "solaris_2.4_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 711,
+            ClusterSize = 1024,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "dflybsd_1.0_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "dflybsd_1.0_mf2hd_ffs43.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_6.1.5_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_6.1.5_mf2hd_ffs43.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_6.1.5_mf2hd_ufs2.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            VolumeName  = "",
+            Type        = "UFS2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_7.1_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_7.1_mf2hd_ffs43.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_7.1_mf2hd_ufs2.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            VolumeName  = "",
+            Type        = "UFS2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_7.1_mf2hd_be.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_7.1_mf2hd_ffs43_be.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "netbsd_7.1_mf2hd_ufs2_be.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512,
+            VolumeName  = "",
+            Type        = "UFS2"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openbsd_4.7_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openbsd_4.7_mf2hd_ffs43.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 2048,
+            Type        = "UFS"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "openbsd_4.7_mf2hd_ufs2.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 2048,
+            VolumeName  = "",
+            Type        = "UFS2"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs b/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs
index 3bfb3622e..07caddf81 100644
--- a/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs
+++ b/Aaru.Tests/Filesystems/UNIXBFS/MBR.cs
@@ -32,30 +32,29 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UNIXBFS
+namespace Aaru.Tests.Filesystems.UNIXBFS;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("BFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Boot File System (MBR)");
+    public override IFilesystem Plugin     => new BFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("BFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Boot File System (MBR)");
-        public override IFilesystem Plugin     => new BFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "linux.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 260096,
-                ClusterSize = 512,
-                VolumeName  = "Label"
-            }
-        };
-    }
+            TestFile    = "linux.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 260096,
+            ClusterSize = 512,
+            VolumeName  = "Label"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs b/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs
index 15a359abc..f399476a8 100644
--- a/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs
+++ b/Aaru.Tests/Filesystems/UNIXBFS/RDB.cs
@@ -32,30 +32,29 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UNIXBFS
+namespace Aaru.Tests.Filesystems.UNIXBFS;
+
+[TestFixture]
+public class RDB : FilesystemTest
 {
-    [TestFixture]
-    public class RDB : FilesystemTest
+    public RDB() : base("UFS") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Boot File System (RDB)");
+    public override IFilesystem Plugin     => new BFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public RDB() : base("UFS") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Boot File System (RDB)");
-        public override IFilesystem Plugin     => new BFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "amix.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024128,
-                SectorSize   = 512,
-                Clusters     = 65024,
-                ClusterSize  = 2048,
-                VolumeSerial = "UNKNOWN"
-            }
-        };
-    }
+            TestFile     = "amix.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024128,
+            SectorSize   = 512,
+            Clusters     = 65024,
+            ClusterSize  = 2048,
+            VolumeSerial = "UNKNOWN"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs b/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs
index 7cc495724..e6bee980b 100644
--- a/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs
+++ b/Aaru.Tests/Filesystems/UNIXBFS/Whole.cs
@@ -32,66 +32,65 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.UNIXBFS
+namespace Aaru.Tests.Filesystems.UNIXBFS;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("BFS") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Boot File System");
+
+    public override IFilesystem Plugin     => new BFS();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("BFS") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Boot File System");
-
-        public override IFilesystem Plugin     => new BFS();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "amix_mf2dd.adf.lz",
-                MediaType   = MediaType.CBM_AMIGA_35_DD,
-                Sectors     = 1760,
-                SectorSize  = 512,
-                Clusters    = 1760,
-                ClusterSize = 512,
-                VolumeName  = "Label"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_dsdd.img.lz",
-                MediaType   = MediaType.DOS_525_DS_DD_9,
-                Sectors     = 720,
-                SectorSize  = 512,
-                Clusters    = 720,
-                ClusterSize = 512
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                Clusters    = 2400,
-                ClusterSize = 512
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                Clusters    = 1440,
-                ClusterSize = 512
-            },
-            new FileSystemTest
-            {
-                TestFile    = "att_unix_svr4v2.1_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                Clusters    = 2880,
-                ClusterSize = 512
-            }
-        };
-    }
+            TestFile    = "amix_mf2dd.adf.lz",
+            MediaType   = MediaType.CBM_AMIGA_35_DD,
+            Sectors     = 1760,
+            SectorSize  = 512,
+            Clusters    = 1760,
+            ClusterSize = 512,
+            VolumeName  = "Label"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_dsdd.img.lz",
+            MediaType   = MediaType.DOS_525_DS_DD_9,
+            Sectors     = 720,
+            SectorSize  = 512,
+            Clusters    = 720,
+            ClusterSize = 512
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            Clusters    = 2400,
+            ClusterSize = 512
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            Clusters    = 1440,
+            ClusterSize = 512
+        },
+        new FileSystemTest
+        {
+            TestFile    = "att_unix_svr4v2.1_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            Clusters    = 2880,
+            ClusterSize = 512
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/XENIX/MBR.cs b/Aaru.Tests/Filesystems/XENIX/MBR.cs
index 3d93dc33f..d42021077 100644
--- a/Aaru.Tests/Filesystems/XENIX/MBR.cs
+++ b/Aaru.Tests/Filesystems/XENIX/MBR.cs
@@ -32,47 +32,46 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.XENIX
+namespace Aaru.Tests.Filesystems.XENIX;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("XENIX fs") {}
+
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "XENIX filesystem (MBR)");
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("XENIX fs") {}
-
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "XENIX filesystem (MBR)");
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "xenix_2.3.2d.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 40960,
-                SectorSize  = 512,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "xenix_2.3.4h.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 40960,
-                SectorSize  = 512,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 2097152,
-                SectorSize  = 512,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            }
-        };
-    }
+            TestFile    = "xenix_2.3.2d.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 40960,
+            SectorSize  = 512,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "xenix_2.3.4h.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 40960,
+            SectorSize  = 512,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 2097152,
+            SectorSize  = 512,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/XENIX/Whole.cs b/Aaru.Tests/Filesystems/XENIX/Whole.cs
index 9a3516053..289f148c2 100644
--- a/Aaru.Tests/Filesystems/XENIX/Whole.cs
+++ b/Aaru.Tests/Filesystems/XENIX/Whole.cs
@@ -32,65 +32,64 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.XENIX
+namespace Aaru.Tests.Filesystems.XENIX;
+
+[TestFixture]
+public class Whole : FilesystemTest
 {
-    [TestFixture]
-    public class Whole : FilesystemTest
+    public Whole() : base("XENIX fs") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "XENIX filesystem");
+
+    public override IFilesystem Plugin     => new SysVfs();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Whole() : base("XENIX fs") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "XENIX filesystem");
-
-        public override IFilesystem Plugin     => new SysVfs();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
-                MediaType   = MediaType.DMF,
-                Sectors     = 3360,
-                SectorSize  = 512,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
-                MediaType   = MediaType.DOS_525_HD,
-                Sectors     = 2400,
-                SectorSize  = 512,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
-                MediaType   = MediaType.DOS_35_DS_DD_9,
-                Sectors     = 1440,
-                SectorSize  = 512,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
-                MediaType   = MediaType.ECMA_147,
-                Sectors     = 5760,
-                SectorSize  = 512,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            },
-            new FileSystemTest
-            {
-                TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
-                MediaType   = MediaType.DOS_35_HD,
-                Sectors     = 2880,
-                SectorSize  = 512,
-                ClusterSize = 1024,
-                VolumeName  = ""
-            }
-        };
-    }
+            TestFile    = "scoopenserver_5.0.7hw_dmf.img.lz",
+            MediaType   = MediaType.DMF,
+            Sectors     = 3360,
+            SectorSize  = 512,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_dshd.img.lz",
+            MediaType   = MediaType.DOS_525_HD,
+            Sectors     = 2400,
+            SectorSize  = 512,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2dd.img.lz",
+            MediaType   = MediaType.DOS_35_DS_DD_9,
+            Sectors     = 1440,
+            SectorSize  = 512,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2ed.img.lz",
+            MediaType   = MediaType.ECMA_147,
+            Sectors     = 5760,
+            SectorSize  = 512,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        },
+        new FileSystemTest
+        {
+            TestFile    = "scoopenserver_5.0.7hw_mf2hd.img.lz",
+            MediaType   = MediaType.DOS_35_HD,
+            Sectors     = 2880,
+            SectorSize  = 512,
+            ClusterSize = 1024,
+            VolumeName  = ""
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/XFS.cs b/Aaru.Tests/Filesystems/XFS.cs
index 2e1fedef3..c8f65859f 100644
--- a/Aaru.Tests/Filesystems/XFS.cs
+++ b/Aaru.Tests/Filesystems/XFS.cs
@@ -31,41 +31,40 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class XFS : FilesystemTest
 {
-    [TestFixture]
-    public class XFS : FilesystemTest
+    public XFS() : base("XFS filesystem") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "XFS");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.XFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public XFS() : base("XFS filesystem") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "XFS");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.XFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1048576,
-                SectorSize   = 512,
-                Clusters     = 130816,
-                ClusterSize  = 4096,
-                VolumeName   = "Volume label",
-                VolumeSerial = "230075b7-9834-b44e-a257-982a058311d8"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_xfs_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 127744,
-                ClusterSize  = 4096,
-                VolumeName   = "DicSetter",
-                VolumeSerial = "ed6b4d35-aa66-ce4a-9d8f-c56dbc6d7c8c"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1048576,
+            SectorSize   = 512,
+            Clusters     = 130816,
+            ClusterSize  = 4096,
+            VolumeName   = "Volume label",
+            VolumeSerial = "230075b7-9834-b44e-a257-982a058311d8"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_xfs_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 127744,
+            ClusterSize  = 4096,
+            VolumeName   = "DicSetter",
+            VolumeSerial = "ed6b4d35-aa66-ce4a-9d8f-c56dbc6d7c8c"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/Xia.cs b/Aaru.Tests/Filesystems/Xia.cs
index 57ce6f0db..2847cd940 100644
--- a/Aaru.Tests/Filesystems/Xia.cs
+++ b/Aaru.Tests/Filesystems/Xia.cs
@@ -31,37 +31,36 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Xia : FilesystemTest
 {
-    [TestFixture]
-    public class Xia : FilesystemTest
+    public Xia() : base("Xia filesystem") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Xia filesystem");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.Xia();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Xia() : base("Xia filesystem") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Xia filesystem");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.Xia();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.37.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "linux_2.0.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.37.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/ZFS.cs b/Aaru.Tests/Filesystems/ZFS.cs
index 105be4c65..6a7831070 100644
--- a/Aaru.Tests/Filesystems/ZFS.cs
+++ b/Aaru.Tests/Filesystems/ZFS.cs
@@ -32,30 +32,29 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Zfs : FilesystemTest
 {
-    [TestFixture]
-    public class Zfs : FilesystemTest
+    public Zfs() : base("ZFS filesystem") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
+                                                      "Zettabyte File System");
+
+    public override IFilesystem Plugin     => new ZFS();
+    public override bool        Partitions => false;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Zfs() : base("ZFS filesystem") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems",
-                                                          "Zettabyte File System");
-
-        public override IFilesystem Plugin     => new ZFS();
-        public override bool        Partitions => false;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 33554432,
-                SectorSize   = 512,
-                VolumeName   = "NetBSD 7.1",
-                VolumeSerial = "2639895335654686206"
-            }
-        };
-    }
+            TestFile     = "netbsd_7.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 33554432,
+            SectorSize   = 512,
+            VolumeName   = "NetBSD 7.1",
+            VolumeSerial = "2639895335654686206"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/btrfs.cs b/Aaru.Tests/Filesystems/btrfs.cs
index b863489c2..7d6c7c627 100644
--- a/Aaru.Tests/Filesystems/btrfs.cs
+++ b/Aaru.Tests/Filesystems/btrfs.cs
@@ -32,41 +32,40 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Btrfs : FilesystemTest
 {
-    [TestFixture]
-    public class Btrfs : FilesystemTest
+    public Btrfs() : base("B-tree file system") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "btrfs");
+    public override IFilesystem Plugin     => new BTRFS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public Btrfs() : base("B-tree file system") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "btrfs");
-        public override IFilesystem Plugin     => new BTRFS();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32512,
-                ClusterSize  = 4096,
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "a4fc5201-85cc-6840-8a68-998cab9ae897"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_btrfs_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 127744,
-                ClusterSize  = 4096,
-                VolumeName   = "btrfs",
-                VolumeSerial = "5af44541-0605-f541-af6d-c229576707ab"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32512,
+            ClusterSize  = 4096,
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "a4fc5201-85cc-6840-8a68-998cab9ae897"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_btrfs_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 127744,
+            ClusterSize  = 4096,
+            VolumeName   = "btrfs",
+            VolumeSerial = "5af44541-0605-f541-af6d-c229576707ab"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/exFAT/APM.cs b/Aaru.Tests/Filesystems/exFAT/APM.cs
index 4b671d0d5..2d0632cc1 100644
--- a/Aaru.Tests/Filesystems/exFAT/APM.cs
+++ b/Aaru.Tests/Filesystems/exFAT/APM.cs
@@ -31,29 +31,28 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.exFAT
+namespace Aaru.Tests.Filesystems.exFAT;
+
+[TestFixture]
+public class APM : FilesystemTest
 {
-    [TestFixture]
-    public class APM : FilesystemTest
+    public APM() : base("exFAT") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "exFAT (APM)");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.exFAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public APM() : base("exFAT") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "exFAT (APM)");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.exFAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32710,
-                ClusterSize  = 4096,
-                VolumeSerial = "595AC82C"
-            }
-        };
-    }
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32710,
+            ClusterSize  = 4096,
+            VolumeSerial = "595AC82C"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/exFAT/GPT.cs b/Aaru.Tests/Filesystems/exFAT/GPT.cs
index 735a16a35..c7aad24c1 100644
--- a/Aaru.Tests/Filesystems/exFAT/GPT.cs
+++ b/Aaru.Tests/Filesystems/exFAT/GPT.cs
@@ -31,29 +31,28 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.exFAT
+namespace Aaru.Tests.Filesystems.exFAT;
+
+[TestFixture]
+public class GPT : FilesystemTest
 {
-    [TestFixture]
-    public class GPT : FilesystemTest
+    public GPT() : base("exFAT") {}
+
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "exFAT (GPT)");
+    public override IFilesystem Plugin     => new Aaru.Filesystems.exFAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public GPT() : base("exFAT") {}
-
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "exFAT (GPT)");
-        public override IFilesystem Plugin     => new Aaru.Filesystems.exFAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32208,
-                ClusterSize  = 4096,
-                VolumeSerial = "595ACC39"
-            }
-        };
-    }
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32208,
+            ClusterSize  = 4096,
+            VolumeSerial = "595ACC39"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/exFAT/MBR.cs b/Aaru.Tests/Filesystems/exFAT/MBR.cs
index d93789239..9922cb4fb 100644
--- a/Aaru.Tests/Filesystems/exFAT/MBR.cs
+++ b/Aaru.Tests/Filesystems/exFAT/MBR.cs
@@ -31,70 +31,69 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems.exFAT
+namespace Aaru.Tests.Filesystems.exFAT;
+
+[TestFixture]
+public class MBR : FilesystemTest
 {
-    [TestFixture]
-    public class MBR : FilesystemTest
+    public MBR() : base("exFAT") {}
+
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "exFAT (MBR)");
+
+    public override IFilesystem Plugin     => new Aaru.Filesystems.exFAT();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public MBR() : base("exFAT") {}
-
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "exFAT (MBR)");
-
-        public override IFilesystem Plugin     => new Aaru.Filesystems.exFAT();
-        public override bool        Partitions => true;
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "linux.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32464,
-                ClusterSize  = 4096,
-                VolumeSerial = "603565AC"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "macosx_10.11.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32712,
-                ClusterSize  = 4096,
-                VolumeSerial = "595AC21E"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "win10.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32448,
-                ClusterSize  = 4096,
-                VolumeSerial = "20126663"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "winvista.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 32208,
-                ClusterSize  = 4096,
-                VolumeSerial = "0AC5CA52"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_exfat_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 15964,
-                ClusterSize  = 32768,
-                VolumeSerial = "636E083B"
-            }
-        };
-    }
+            TestFile     = "linux.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32464,
+            ClusterSize  = 4096,
+            VolumeSerial = "603565AC"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "macosx_10.11.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32712,
+            ClusterSize  = 4096,
+            VolumeSerial = "595AC21E"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "win10.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32448,
+            ClusterSize  = 4096,
+            VolumeSerial = "20126663"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "winvista.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 32208,
+            ClusterSize  = 4096,
+            VolumeSerial = "0AC5CA52"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_exfat_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 15964,
+            ClusterSize  = 32768,
+            VolumeSerial = "636E083B"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/ext.cs b/Aaru.Tests/Filesystems/ext.cs
index 41a3d9d16..a8c72b815 100644
--- a/Aaru.Tests/Filesystems/ext.cs
+++ b/Aaru.Tests/Filesystems/ext.cs
@@ -32,29 +32,28 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
+namespace Aaru.Tests.Filesystems;
+
+[TestFixture]
+public class Ext : FilesystemTest
 {
-    [TestFixture]
-    public class Ext : FilesystemTest
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Linux extended File System");
+    public override IFilesystem Plugin     => new extFS();
+    public override bool        Partitions => true;
+
+    public Ext() : base("ext") {}
+
+    public override FileSystemTest[] Tests => new[]
     {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "Linux extended File System");
-        public override IFilesystem Plugin     => new extFS();
-        public override bool        Partitions => true;
-
-        public Ext() : base("ext") {}
-
-        public override FileSystemTest[] Tests => new[]
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.37.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024
-            }
-        };
-    }
+            TestFile    = "linux_2.0.37.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filesystems/ext2.cs b/Aaru.Tests/Filesystems/ext2.cs
index b9b338798..276df7361 100644
--- a/Aaru.Tests/Filesystems/ext2.cs
+++ b/Aaru.Tests/Filesystems/ext2.cs
@@ -32,315 +32,314 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Filesystems;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filesystems
-{
-    [TestFixture]
-    public class Ext2 : FilesystemTest
-    {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "ext2");
-        public override IFilesystem Plugin     => new ext2FS();
-        public override bool        Partitions => true;
+namespace Aaru.Tests.Filesystems;
 
-        public override FileSystemTest[] Tests => new[]
+[TestFixture]
+public class Ext2 : FilesystemTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Filesystems", "ext2");
+    public override IFilesystem Plugin     => new ext2FS();
+    public override bool        Partitions => true;
+
+    public override FileSystemTest[] Tests => new[]
+    {
+        new FileSystemTest
         {
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_6.1.5.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131040,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "Volume label",
-                VolumeSerial = "a4a95973-ab77-11eb-811f-08002792bfed"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_6.1.5_r0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131040,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "Volume label",
-                VolumeSerial = "19b1dda1-ab75-11eb-a6ba-08002792bfed"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 130540,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "Volume label",
-                VolumeSerial = "7f49b17e-ab5d-11eb-bc21-0800272a08ec"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "netbsd_7.1_r0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131040,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "Volume label",
-                VolumeSerial = "e2601450-ab5c-11eb-a154-0800272a08ec"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "openbsd_4.7.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131040,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "Volume label",
-                VolumeSerial = "0b2bb462-17ac-c444-8ff0-ab10537ae902"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "openbsd_4.7_r0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131040,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "Volume label",
-                VolumeSerial = "32e4de93-37f9-6747-9650-ae7b1f1bb901"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_ext2_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 510976,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "DicSetter",
-                VolumeSerial = "f5b2500f-99fb-764b-a6c4-c4db0b98a653"
-            },
-            new FileSystemTest
-            {
-                TestFile    = "linux_2.0.0.aif",
-                MediaType   = MediaType.GENERIC_HDD,
-                Sectors     = 262144,
-                SectorSize  = 512,
-                Clusters    = 131008,
-                ClusterSize = 1024,
-                Type        = "ext2"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.29.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "a81d28a3-83b2-eb11-9ae7-525400123456"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.29_r0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "1a4fbe63-84b2-eb11-9bda-525400123456"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.34.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "00d2a5e7-fab2-eb11-8eae-525400123456"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.34_r0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "3e1dfd3a-f9b2-eb11-8384-525400123456"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.37.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "Volume label",
-                VolumeSerial = "ccac0734-e6b3-eb11-885b-525400123456"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.37_r0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "Volume label",
-                VolumeSerial = "a85e3131-e6b3-eb11-886c-525400123456"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.38.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "e48311a9-0fb3-eb11-83ed-525400123456"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.0.38_r0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "86e00f25-0fb3-eb11-8f77-525400123456"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "9bdfe82d-778f-c64a-816c-a5ab33eb4f52"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.17_r0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "6248975a-8692-bc42-bf66-22790157be29"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.20.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "e7263487-cec2-3444-8e58-218181083a89"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.2.20_r0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "d227254f-b684-2244-9ad1-23b95e331c95"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "7f1a86dd-18a7-7d4e-aef0-728b1f674001"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18_r0.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext2",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "c9e61e78-98c3-844e-98d5-d54b880d07cb"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_2.4.18_ext3.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 262144,
-                SectorSize   = 512,
-                Clusters     = 131008,
-                ClusterSize  = 1024,
-                Type         = "ext3",
-                VolumeName   = "VolumeLabel",
-                VolumeSerial = "40bb6664-4e0e-ca4b-a328-7c744ddd8bf4"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_ext3_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 510976,
-                ClusterSize  = 1024,
-                Type         = "ext3",
-                VolumeName   = "DicSetter",
-                VolumeSerial = "a3914b55-260f-7245-8c72-7ccdf45436cb"
-            },
-            new FileSystemTest
-            {
-                TestFile     = "linux_4.19_ext4_flashdrive.aif",
-                MediaType    = MediaType.GENERIC_HDD,
-                Sectors      = 1024000,
-                SectorSize   = 512,
-                Clusters     = 510976,
-                ClusterSize  = 1024,
-                Type         = "ext4",
-                VolumeName   = "DicSetter",
-                VolumeSerial = "10413797-43d1-6545-8fbc-6ebc9d328be9"
-            }
-        };
-    }
+            TestFile     = "netbsd_6.1.5.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131040,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "Volume label",
+            VolumeSerial = "a4a95973-ab77-11eb-811f-08002792bfed"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_6.1.5_r0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131040,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "Volume label",
+            VolumeSerial = "19b1dda1-ab75-11eb-a6ba-08002792bfed"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_7.1.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 130540,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "Volume label",
+            VolumeSerial = "7f49b17e-ab5d-11eb-bc21-0800272a08ec"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "netbsd_7.1_r0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131040,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "Volume label",
+            VolumeSerial = "e2601450-ab5c-11eb-a154-0800272a08ec"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "openbsd_4.7.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131040,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "Volume label",
+            VolumeSerial = "0b2bb462-17ac-c444-8ff0-ab10537ae902"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "openbsd_4.7_r0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131040,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "Volume label",
+            VolumeSerial = "32e4de93-37f9-6747-9650-ae7b1f1bb901"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_ext2_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 510976,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "DicSetter",
+            VolumeSerial = "f5b2500f-99fb-764b-a6c4-c4db0b98a653"
+        },
+        new FileSystemTest
+        {
+            TestFile    = "linux_2.0.0.aif",
+            MediaType   = MediaType.GENERIC_HDD,
+            Sectors     = 262144,
+            SectorSize  = 512,
+            Clusters    = 131008,
+            ClusterSize = 1024,
+            Type        = "ext2"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.29.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "a81d28a3-83b2-eb11-9ae7-525400123456"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.29_r0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "1a4fbe63-84b2-eb11-9bda-525400123456"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.34.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "00d2a5e7-fab2-eb11-8eae-525400123456"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.34_r0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "3e1dfd3a-f9b2-eb11-8384-525400123456"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.37.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "Volume label",
+            VolumeSerial = "ccac0734-e6b3-eb11-885b-525400123456"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.37_r0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "Volume label",
+            VolumeSerial = "a85e3131-e6b3-eb11-886c-525400123456"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.38.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "e48311a9-0fb3-eb11-83ed-525400123456"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.0.38_r0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "86e00f25-0fb3-eb11-8f77-525400123456"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "9bdfe82d-778f-c64a-816c-a5ab33eb4f52"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.17_r0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "6248975a-8692-bc42-bf66-22790157be29"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.20.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "e7263487-cec2-3444-8e58-218181083a89"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.2.20_r0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "d227254f-b684-2244-9ad1-23b95e331c95"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "7f1a86dd-18a7-7d4e-aef0-728b1f674001"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18_r0.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext2",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "c9e61e78-98c3-844e-98d5-d54b880d07cb"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_2.4.18_ext3.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 262144,
+            SectorSize   = 512,
+            Clusters     = 131008,
+            ClusterSize  = 1024,
+            Type         = "ext3",
+            VolumeName   = "VolumeLabel",
+            VolumeSerial = "40bb6664-4e0e-ca4b-a328-7c744ddd8bf4"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_ext3_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 510976,
+            ClusterSize  = 1024,
+            Type         = "ext3",
+            VolumeName   = "DicSetter",
+            VolumeSerial = "a3914b55-260f-7245-8c72-7ccdf45436cb"
+        },
+        new FileSystemTest
+        {
+            TestFile     = "linux_4.19_ext4_flashdrive.aif",
+            MediaType    = MediaType.GENERIC_HDD,
+            Sectors      = 1024000,
+            SectorSize   = 512,
+            Clusters     = 510976,
+            ClusterSize  = 1024,
+            Type         = "ext4",
+            VolumeName   = "DicSetter",
+            VolumeSerial = "10413797-43d1-6545-8fbc-6ebc9d328be9"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleDave.cs b/Aaru.Tests/Filters/AppleDoubleDave.cs
index 150d3f226..ef9197ea7 100644
--- a/Aaru.Tests/Filters/AppleDoubleDave.cs
+++ b/Aaru.Tests/Filters/AppleDoubleDave.cs
@@ -34,84 +34,83 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class AppleDoubleDave
 {
-    [TestFixture]
-    public class AppleDoubleDave
+    const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+    readonly string _sidecar;
+
+    public AppleDoubleDave()
     {
-        const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
-        readonly string _sidecar;
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dave", "DOS_720.dmg");
 
-        public AppleDoubleDave()
-        {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dave", "DOS_720.dmg");
+        _sidecar = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dave", "resource.frk",
+                                "DOS_720.dmg");
+    }
 
-            _sidecar = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dave", "resource.frk",
-                                    "DOS_720.dmg");
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
+        result = Md5Context.File(_sidecar, out _);
+        Assert.AreEqual(EXPECTED_SIDECAR, result);
+    }
 
-            result = Md5Context.File(_sidecar, out _);
-            Assert.AreEqual(EXPECTED_SIDECAR, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleDos.cs b/Aaru.Tests/Filters/AppleDoubleDos.cs
index 230247845..7d24b17be 100644
--- a/Aaru.Tests/Filters/AppleDoubleDos.cs
+++ b/Aaru.Tests/Filters/AppleDoubleDos.cs
@@ -34,82 +34,81 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class AppleDoubleDos
 {
-    [TestFixture]
-    public class AppleDoubleDos
+    const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+    readonly string _sidecar;
+
+    public AppleDoubleDos()
     {
-        const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
-        readonly string _sidecar;
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dos", "DOS_720.dmg");
+        _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dos", "DOS_720.adf");
+    }
 
-        public AppleDoubleDos()
-        {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dos", "DOS_720.dmg");
-            _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "dos", "DOS_720.adf");
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
+        result = Md5Context.File(_sidecar, out _);
+        Assert.AreEqual(EXPECTED_SIDECAR, result);
+    }
 
-            result = Md5Context.File(_sidecar, out _);
-            Assert.AreEqual(EXPECTED_SIDECAR, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleNetatalk.cs b/Aaru.Tests/Filters/AppleDoubleNetatalk.cs
index fddf80a08..0491285bb 100644
--- a/Aaru.Tests/Filters/AppleDoubleNetatalk.cs
+++ b/Aaru.Tests/Filters/AppleDoubleNetatalk.cs
@@ -34,84 +34,83 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class AppleDoubleNetatalk
 {
-    [TestFixture]
-    public class AppleDoubleNetatalk
+    const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+    readonly string _sidecar;
+
+    public AppleDoubleNetatalk()
     {
-        const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
-        readonly string _sidecar;
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "netatalk", "DOS_720.dmg");
 
-        public AppleDoubleNetatalk()
-        {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "netatalk", "DOS_720.dmg");
+        _sidecar = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "netatalk", ".AppleDouble",
+                                "DOS_720.dmg");
+    }
 
-            _sidecar = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "netatalk", ".AppleDouble",
-                                    "DOS_720.dmg");
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
+        result = Md5Context.File(_sidecar, out _);
+        Assert.AreEqual(EXPECTED_SIDECAR, result);
+    }
 
-            result = Md5Context.File(_sidecar, out _);
-            Assert.AreEqual(EXPECTED_SIDECAR, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleOsX.cs b/Aaru.Tests/Filters/AppleDoubleOsX.cs
index 1dacfb0b9..2ab6ca704 100644
--- a/Aaru.Tests/Filters/AppleDoubleOsX.cs
+++ b/Aaru.Tests/Filters/AppleDoubleOsX.cs
@@ -34,82 +34,81 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class AppleDoubleOsX
 {
-    [TestFixture]
-    public class AppleDoubleOsX
+    const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+    readonly string _sidecar;
+
+    public AppleDoubleOsX()
     {
-        const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
-        readonly string _sidecar;
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "osx", "DOS_720.dmg");
+        _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "osx", "._DOS_720.dmg");
+    }
 
-        public AppleDoubleOsX()
-        {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "osx", "DOS_720.dmg");
-            _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "osx", "._DOS_720.dmg");
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
+        result = Md5Context.File(_sidecar, out _);
+        Assert.AreEqual(EXPECTED_SIDECAR, result);
+    }
 
-            result = Md5Context.File(_sidecar, out _);
-            Assert.AreEqual(EXPECTED_SIDECAR, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleProDos.cs b/Aaru.Tests/Filters/AppleDoubleProDos.cs
index 3510a9658..87da4fe46 100644
--- a/Aaru.Tests/Filters/AppleDoubleProDos.cs
+++ b/Aaru.Tests/Filters/AppleDoubleProDos.cs
@@ -34,82 +34,81 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class AppleDoubleProDos
 {
-    [TestFixture]
-    public class AppleDoubleProDos
+    const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+    readonly string _sidecar;
+
+    public AppleDoubleProDos()
     {
-        const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
-        readonly string _sidecar;
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "prodos", "DOS_720.dmg");
+        _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "prodos", "R.DOS_720.dmg");
+    }
 
-        public AppleDoubleProDos()
-        {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "prodos", "DOS_720.dmg");
-            _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "prodos", "R.DOS_720.dmg");
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
+        result = Md5Context.File(_sidecar, out _);
+        Assert.AreEqual(EXPECTED_SIDECAR, result);
+    }
 
-            result = Md5Context.File(_sidecar, out _);
-            Assert.AreEqual(EXPECTED_SIDECAR, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleUnAr.cs b/Aaru.Tests/Filters/AppleDoubleUnAr.cs
index c1f2d03ab..0209101eb 100644
--- a/Aaru.Tests/Filters/AppleDoubleUnAr.cs
+++ b/Aaru.Tests/Filters/AppleDoubleUnAr.cs
@@ -34,82 +34,81 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class AppleDoubleUnAr
 {
-    [TestFixture]
-    public class AppleDoubleUnAr
+    const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+    readonly string _sidecar;
+
+    public AppleDoubleUnAr()
     {
-        const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
-        readonly string _sidecar;
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unar", "DOS_720.dmg");
+        _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unar", "DOS_720.dmg.rsrc");
+    }
 
-        public AppleDoubleUnAr()
-        {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unar", "DOS_720.dmg");
-            _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unar", "DOS_720.dmg.rsrc");
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
+        result = Md5Context.File(_sidecar, out _);
+        Assert.AreEqual(EXPECTED_SIDECAR, result);
+    }
 
-            result = Md5Context.File(_sidecar, out _);
-            Assert.AreEqual(EXPECTED_SIDECAR, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleDoubleUnix.cs b/Aaru.Tests/Filters/AppleDoubleUnix.cs
index db582a906..8928185f6 100644
--- a/Aaru.Tests/Filters/AppleDoubleUnix.cs
+++ b/Aaru.Tests/Filters/AppleDoubleUnix.cs
@@ -34,82 +34,81 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class AppleDoubleUnix
 {
-    [TestFixture]
-    public class AppleDoubleUnix
+    const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+    readonly string _sidecar;
+
+    public AppleDoubleUnix()
     {
-        const    string EXPECTED_FILE     = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_SIDECAR  = "7b0c25bf8cb70f6fb1a15eca31585250";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
-        readonly string _sidecar;
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unix", "DOS_720.dmg");
+        _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unix", "%DOS_720.dmg");
+    }
 
-        public AppleDoubleUnix()
-        {
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unix", "DOS_720.dmg");
-            _sidecar  = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleDouble", "unix", "%DOS_720.dmg");
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
+        result = Md5Context.File(_sidecar, out _);
+        Assert.AreEqual(EXPECTED_SIDECAR, result);
+    }
 
-            result = Md5Context.File(_sidecar, out _);
-            Assert.AreEqual(EXPECTED_SIDECAR, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new AppleDouble();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new AppleDouble();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new AppleDouble();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new AppleDouble();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/AppleSingle.cs b/Aaru.Tests/Filters/AppleSingle.cs
index c28f589e0..2331184de 100644
--- a/Aaru.Tests/Filters/AppleSingle.cs
+++ b/Aaru.Tests/Filters/AppleSingle.cs
@@ -33,74 +33,73 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class AppleSingle
 {
-    [TestFixture]
-    public class AppleSingle
+    const    string EXPECTED_FILE     = "7497a3b156dcd0c1046a1ab12e188ab7";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+
+    public AppleSingle() =>
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleSingle", "DOS_720.ASF");
+
+    [Test]
+    public void CheckContents()
     {
-        const    string EXPECTED_FILE     = "7497a3b156dcd0c1046a1ab12e188ab7";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
+        IFilter filter = new Aaru.Filters.AppleSingle();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        public AppleSingle() =>
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "AppleSingle", "DOS_720.ASF");
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new Aaru.Filters.AppleSingle();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new Aaru.Filters.AppleSingle();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new Aaru.Filters.AppleSingle();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new Aaru.Filters.AppleSingle();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
-
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new Aaru.Filters.AppleSingle();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new Aaru.Filters.AppleSingle();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new Aaru.Filters.AppleSingle();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/BZip2.cs b/Aaru.Tests/Filters/BZip2.cs
index 887d08e56..30dfd530d 100644
--- a/Aaru.Tests/Filters/BZip2.cs
+++ b/Aaru.Tests/Filters/BZip2.cs
@@ -33,63 +33,62 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class BZip2
 {
-    [TestFixture]
-    public class BZip2
+    static readonly byte[] _expectedFile =
     {
-        static readonly byte[] _expectedFile =
-        {
-            0xf8, 0xb6, 0xbc, 0x62, 0x33, 0xcf, 0x1d, 0x28, 0x02, 0xef, 0x80, 0xf1, 0xe4, 0xfc, 0x1b, 0xdf
-        };
-        static readonly byte[] _expectedContents =
-        {
-            0x18, 0x90, 0x5a, 0xf9, 0x83, 0xd8, 0x2b, 0xdd, 0x1a, 0xcc, 0x69, 0x75, 0x4f, 0x0f, 0x81, 0x5e
-        };
-        readonly string _location;
+        0xf8, 0xb6, 0xbc, 0x62, 0x33, 0xcf, 0x1d, 0x28, 0x02, 0xef, 0x80, 0xf1, 0xe4, 0xfc, 0x1b, 0xdf
+    };
+    static readonly byte[] _expectedContents =
+    {
+        0x18, 0x90, 0x5a, 0xf9, 0x83, 0xd8, 0x2b, 0xdd, 0x1a, 0xcc, 0x69, 0x75, 0x4f, 0x0f, 0x81, 0x5e
+    };
+    readonly string _location;
 
-        public BZip2() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "bzip2.bz2");
+    public BZip2() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "bzip2.bz2");
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new Aaru.Filters.BZip2();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[1048576];
-            str.Read(data, 0, 1048576);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            Md5Context.Data(data, out byte[] result);
-            Assert.AreEqual(_expectedContents, result);
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new Aaru.Filters.BZip2();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[1048576];
+        str.Read(data, 0, 1048576);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        Md5Context.Data(data, out byte[] result);
+        Assert.AreEqual(_expectedContents, result);
+    }
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            byte[] result = Md5Context.File(_location);
-            Assert.AreEqual(_expectedFile, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        byte[] result = Md5Context.File(_location);
+        Assert.AreEqual(_expectedFile, result);
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new Aaru.Filters.BZip2();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new Aaru.Filters.BZip2();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new Aaru.Filters.BZip2();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(1048576, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(0, filter.ResourceForkLength);
-            Assert.AreEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(false, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new Aaru.Filters.BZip2();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(1048576, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(0, filter.ResourceForkLength);
+        Assert.AreEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(false, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/GZip.cs b/Aaru.Tests/Filters/GZip.cs
index 8a80d42d7..5d6dd0ee5 100644
--- a/Aaru.Tests/Filters/GZip.cs
+++ b/Aaru.Tests/Filters/GZip.cs
@@ -33,63 +33,62 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class GZip
 {
-    [TestFixture]
-    public class GZip
+    static readonly byte[] _expectedFile =
     {
-        static readonly byte[] _expectedFile =
-        {
-            0x35, 0xe2, 0x9c, 0x9d, 0x05, 0x1b, 0x6d, 0xa6, 0x6c, 0x24, 0xeb, 0x30, 0xe8, 0xd2, 0xa6, 0x6b
-        };
-        static readonly byte[] _expectedContents =
-        {
-            0x18, 0x90, 0x5a, 0xf9, 0x83, 0xd8, 0x2b, 0xdd, 0x1a, 0xcc, 0x69, 0x75, 0x4f, 0x0f, 0x81, 0x5e
-        };
-        readonly string _location;
+        0x35, 0xe2, 0x9c, 0x9d, 0x05, 0x1b, 0x6d, 0xa6, 0x6c, 0x24, 0xeb, 0x30, 0xe8, 0xd2, 0xa6, 0x6b
+    };
+    static readonly byte[] _expectedContents =
+    {
+        0x18, 0x90, 0x5a, 0xf9, 0x83, 0xd8, 0x2b, 0xdd, 0x1a, 0xcc, 0x69, 0x75, 0x4f, 0x0f, 0x81, 0x5e
+    };
+    readonly string _location;
 
-        public GZip() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "gzip.gz");
+    public GZip() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "gzip.gz");
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new Aaru.Filters.GZip();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[1048576];
-            str.Read(data, 0, 1048576);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            Md5Context.Data(data, out byte[] result);
-            Assert.AreEqual(_expectedContents, result);
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new Aaru.Filters.GZip();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[1048576];
+        str.Read(data, 0, 1048576);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        Md5Context.Data(data, out byte[] result);
+        Assert.AreEqual(_expectedContents, result);
+    }
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            byte[] result = Md5Context.File(_location);
-            Assert.AreEqual(_expectedFile, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        byte[] result = Md5Context.File(_location);
+        Assert.AreEqual(_expectedFile, result);
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new Aaru.Filters.GZip();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new Aaru.Filters.GZip();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new Aaru.Filters.GZip();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(1048576, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(0, filter.ResourceForkLength);
-            Assert.AreEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(false, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new Aaru.Filters.GZip();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(1048576, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(0, filter.ResourceForkLength);
+        Assert.AreEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(false, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/LZip.cs b/Aaru.Tests/Filters/LZip.cs
index f91136c10..f5564c587 100644
--- a/Aaru.Tests/Filters/LZip.cs
+++ b/Aaru.Tests/Filters/LZip.cs
@@ -33,63 +33,62 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class LZip
 {
-    [TestFixture]
-    public class LZip
+    static readonly byte[] _expectedFile =
     {
-        static readonly byte[] _expectedFile =
-        {
-            0x3f, 0x7b, 0x77, 0x3e, 0x52, 0x48, 0xd5, 0x26, 0xf4, 0xb1, 0xac, 0x15, 0xb2, 0xb3, 0x5f, 0x87
-        };
-        static readonly byte[] _expectedContents =
-        {
-            0x18, 0x90, 0x5a, 0xf9, 0x83, 0xd8, 0x2b, 0xdd, 0x1a, 0xcc, 0x69, 0x75, 0x4f, 0x0f, 0x81, 0x5e
-        };
-        readonly string _location;
+        0x3f, 0x7b, 0x77, 0x3e, 0x52, 0x48, 0xd5, 0x26, 0xf4, 0xb1, 0xac, 0x15, 0xb2, 0xb3, 0x5f, 0x87
+    };
+    static readonly byte[] _expectedContents =
+    {
+        0x18, 0x90, 0x5a, 0xf9, 0x83, 0xd8, 0x2b, 0xdd, 0x1a, 0xcc, 0x69, 0x75, 0x4f, 0x0f, 0x81, 0x5e
+    };
+    readonly string _location;
 
-        public LZip() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "lzip.lz");
+    public LZip() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "lzip.lz");
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new Aaru.Filters.LZip();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[1048576];
-            str.Read(data, 0, 1048576);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            Md5Context.Data(data, out byte[] result);
-            Assert.AreEqual(_expectedContents, result);
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new Aaru.Filters.LZip();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[1048576];
+        str.Read(data, 0, 1048576);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        Md5Context.Data(data, out byte[] result);
+        Assert.AreEqual(_expectedContents, result);
+    }
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            byte[] result = Md5Context.File(_location);
-            Assert.AreEqual(_expectedFile, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        byte[] result = Md5Context.File(_location);
+        Assert.AreEqual(_expectedFile, result);
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new Aaru.Filters.LZip();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new Aaru.Filters.LZip();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new Aaru.Filters.LZip();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(1048576, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(0, filter.ResourceForkLength);
-            Assert.AreEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(false, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new Aaru.Filters.LZip();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(1048576, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(0, filter.ResourceForkLength);
+        Assert.AreEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(false, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/MacBinary1.cs b/Aaru.Tests/Filters/MacBinary1.cs
index b764efbea..edfb53fe8 100644
--- a/Aaru.Tests/Filters/MacBinary1.cs
+++ b/Aaru.Tests/Filters/MacBinary1.cs
@@ -34,74 +34,73 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class MacBinary1
 {
-    [TestFixture]
-    public class MacBinary1
+    const    string EXPECTED_FILE     = "596c38555bc7ba284648d1ce57700884";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+
+    public MacBinary1() =>
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "MacBinary", "macbinary1.bin");
+
+    [Test]
+    public void CheckContents()
     {
-        const    string EXPECTED_FILE     = "596c38555bc7ba284648d1ce57700884";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
+        IFilter filter = new MacBinary();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        public MacBinary1() =>
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "MacBinary", "macbinary1.bin");
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new MacBinary();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new MacBinary();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new MacBinary();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new MacBinary();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
-
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new MacBinary();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new MacBinary();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new MacBinary();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/MacBinary2.cs b/Aaru.Tests/Filters/MacBinary2.cs
index e1c60f727..060054f66 100644
--- a/Aaru.Tests/Filters/MacBinary2.cs
+++ b/Aaru.Tests/Filters/MacBinary2.cs
@@ -34,74 +34,73 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class MacBinary2
 {
-    [TestFixture]
-    public class MacBinary2
+    const    string EXPECTED_FILE     = "a8daa55a65432353e95dc4c61d42660f";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+
+    public MacBinary2() =>
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "MacBinary", "macbinary2.bin");
+
+    [Test]
+    public void CheckContents()
     {
-        const    string EXPECTED_FILE     = "a8daa55a65432353e95dc4c61d42660f";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
+        IFilter filter = new MacBinary();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        public MacBinary2() =>
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "MacBinary", "macbinary2.bin");
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new MacBinary();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new MacBinary();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new MacBinary();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new MacBinary();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
-
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new MacBinary();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new MacBinary();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new MacBinary();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/MacBinary3.cs b/Aaru.Tests/Filters/MacBinary3.cs
index be92c5468..9dcd84312 100644
--- a/Aaru.Tests/Filters/MacBinary3.cs
+++ b/Aaru.Tests/Filters/MacBinary3.cs
@@ -34,74 +34,73 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class MacBinary3
 {
-    [TestFixture]
-    public class MacBinary3
+    const    string EXPECTED_FILE     = "3a7363a6109fb52a264b0b45dfa16694";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
+    readonly string _location;
+
+    public MacBinary3() =>
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "MacBinary", "macbinary3.bin");
+
+    [Test]
+    public void CheckContents()
     {
-        const    string EXPECTED_FILE     = "3a7363a6109fb52a264b0b45dfa16694";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "c689c58945169065483d94e39583d416";
-        readonly string _location;
+        IFilter filter = new MacBinary();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        public MacBinary3() =>
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "MacBinary", "macbinary3.bin");
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result = Md5Context.File(_location, out _);
+        Assert.AreEqual(EXPECTED_FILE, result);
+    }
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new MacBinary();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new MacBinary();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result = Md5Context.File(_location, out _);
-            Assert.AreEqual(EXPECTED_FILE, result);
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new MacBinary();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[286];
+        str.Read(data, 0, 286);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new MacBinary();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
-
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new MacBinary();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[286];
-            str.Read(data, 0, 286);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new MacBinary();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(286, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new MacBinary();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(286, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/PCExchange.cs b/Aaru.Tests/Filters/PCExchange.cs
index 6372f8d2d..e08102bc5 100644
--- a/Aaru.Tests/Filters/PCExchange.cs
+++ b/Aaru.Tests/Filters/PCExchange.cs
@@ -33,76 +33,75 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class PcExchange
 {
-    [TestFixture]
-    public class PcExchange
+    const    string EXPECTED_FILE     = "348825a08fa84766d20b91ed917012b9";
+    const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
+    const    string EXPECTED_RESOURCE = "5cb168d60ce8b2b1b3133c2faaf47165";
+    readonly string _location;
+
+    public PcExchange() =>
+        _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "PC Exchange", "DC6_RW_DOS_720.img");
+
+    [Test]
+    public void CheckContents()
     {
-        const    string EXPECTED_FILE     = "348825a08fa84766d20b91ed917012b9";
-        const    string EXPECTED_CONTENTS = "c2be571406cf6353269faa59a4a8c0a4";
-        const    string EXPECTED_RESOURCE = "5cb168d60ce8b2b1b3133c2faaf47165";
-        readonly string _location;
+        IFilter filter = new Aaru.Filters.PcExchange();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[737280];
+        str.Read(data, 0, 737280);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_CONTENTS, result);
+    }
 
-        public PcExchange() =>
-            _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "PC Exchange", "DC6_RW_DOS_720.img");
+    [Test]
+    public void CheckCorrectFile()
+    {
+        string result =
+            Md5Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "PC Exchange", "FINDER.DAT"), out _);
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new Aaru.Filters.PcExchange();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[737280];
-            str.Read(data, 0, 737280);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_CONTENTS, result);
-        }
+        Assert.AreEqual(EXPECTED_FILE, result);
+    }
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            string result =
-                Md5Context.File(Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "PC Exchange", "FINDER.DAT"), out _);
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new Aaru.Filters.PcExchange();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-            Assert.AreEqual(EXPECTED_FILE, result);
-        }
+    [Test]
+    public void CheckResource()
+    {
+        IFilter filter = new Aaru.Filters.PcExchange();
+        filter.Open(_location);
+        Stream str  = filter.GetResourceForkStream();
+        byte[] data = new byte[546];
+        str.Read(data, 0, 546);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        string result = Md5Context.Data(data, out _);
+        Assert.AreEqual(EXPECTED_RESOURCE, result);
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new Aaru.Filters.PcExchange();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
-
-        [Test]
-        public void CheckResource()
-        {
-            IFilter filter = new Aaru.Filters.PcExchange();
-            filter.Open(_location);
-            Stream str  = filter.GetResourceForkStream();
-            byte[] data = new byte[546];
-            str.Read(data, 0, 546);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            string result = Md5Context.Data(data, out _);
-            Assert.AreEqual(EXPECTED_RESOURCE, result);
-        }
-
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new Aaru.Filters.PcExchange();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(737280, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(546, filter.ResourceForkLength);
-            Assert.AreNotEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(true, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new Aaru.Filters.PcExchange();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(737280, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(546, filter.ResourceForkLength);
+        Assert.AreNotEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(true, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Filters/XZ.cs b/Aaru.Tests/Filters/XZ.cs
index cbb5b03a0..6aef4ebf4 100644
--- a/Aaru.Tests/Filters/XZ.cs
+++ b/Aaru.Tests/Filters/XZ.cs
@@ -34,63 +34,62 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Filters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Filters
+namespace Aaru.Tests.Filters;
+
+[TestFixture]
+public class Xz
 {
-    [TestFixture]
-    public class Xz
+    static readonly byte[] _expectedFile =
     {
-        static readonly byte[] _expectedFile =
-        {
-            0x6c, 0x88, 0xa5, 0x9a, 0x1b, 0x7a, 0xec, 0x59, 0x2b, 0xef, 0x8a, 0x28, 0xdb, 0x11, 0x01, 0xc8
-        };
-        static readonly byte[] _expectedContents =
-        {
-            0x18, 0x90, 0x5a, 0xf9, 0x83, 0xd8, 0x2b, 0xdd, 0x1a, 0xcc, 0x69, 0x75, 0x4f, 0x0f, 0x81, 0x5e
-        };
-        readonly string _location;
+        0x6c, 0x88, 0xa5, 0x9a, 0x1b, 0x7a, 0xec, 0x59, 0x2b, 0xef, 0x8a, 0x28, 0xdb, 0x11, 0x01, 0xc8
+    };
+    static readonly byte[] _expectedContents =
+    {
+        0x18, 0x90, 0x5a, 0xf9, 0x83, 0xd8, 0x2b, 0xdd, 0x1a, 0xcc, 0x69, 0x75, 0x4f, 0x0f, 0x81, 0x5e
+    };
+    readonly string _location;
 
-        public Xz() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "xz.xz");
+    public Xz() => _location = Path.Combine(Consts.TEST_FILES_ROOT, "Filters", "xz.xz");
 
-        [Test]
-        public void CheckContents()
-        {
-            IFilter filter = new XZ();
-            filter.Open(_location);
-            Stream str  = filter.GetDataForkStream();
-            byte[] data = new byte[1048576];
-            str.Read(data, 0, 1048576);
-            str.Close();
-            str.Dispose();
-            filter.Close();
-            Md5Context.Data(data, out byte[] result);
-            Assert.AreEqual(_expectedContents, result);
-        }
+    [Test]
+    public void CheckContents()
+    {
+        IFilter filter = new XZ();
+        filter.Open(_location);
+        Stream str  = filter.GetDataForkStream();
+        byte[] data = new byte[1048576];
+        str.Read(data, 0, 1048576);
+        str.Close();
+        str.Dispose();
+        filter.Close();
+        Md5Context.Data(data, out byte[] result);
+        Assert.AreEqual(_expectedContents, result);
+    }
 
-        [Test]
-        public void CheckCorrectFile()
-        {
-            byte[] result = Md5Context.File(_location);
-            Assert.AreEqual(_expectedFile, result);
-        }
+    [Test]
+    public void CheckCorrectFile()
+    {
+        byte[] result = Md5Context.File(_location);
+        Assert.AreEqual(_expectedFile, result);
+    }
 
-        [Test]
-        public void CheckFilterId()
-        {
-            IFilter filter = new XZ();
-            Assert.AreEqual(true, filter.Identify(_location));
-        }
+    [Test]
+    public void CheckFilterId()
+    {
+        IFilter filter = new XZ();
+        Assert.AreEqual(true, filter.Identify(_location));
+    }
 
-        [Test]
-        public void Test()
-        {
-            IFilter filter = new XZ();
-            Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
-            Assert.AreEqual(1048576, filter.DataForkLength);
-            Assert.AreNotEqual(null, filter.GetDataForkStream());
-            Assert.AreEqual(0, filter.ResourceForkLength);
-            Assert.AreEqual(null, filter.GetResourceForkStream());
-            Assert.AreEqual(false, filter.HasResourceFork);
-            filter.Close();
-        }
+    [Test]
+    public void Test()
+    {
+        IFilter filter = new XZ();
+        Assert.AreEqual(ErrorNumber.NoError, filter.Open(_location));
+        Assert.AreEqual(1048576, filter.DataForkLength);
+        Assert.AreNotEqual(null, filter.GetDataForkStream());
+        Assert.AreEqual(0, filter.ResourceForkLength);
+        Assert.AreEqual(null, filter.GetResourceForkStream());
+        Assert.AreEqual(false, filter.HasResourceFork);
+        filter.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Helpers/Marshal.cs b/Aaru.Tests/Helpers/Marshal.cs
index 0ec645d61..214f02978 100644
--- a/Aaru.Tests/Helpers/Marshal.cs
+++ b/Aaru.Tests/Helpers/Marshal.cs
@@ -1,46 +1,45 @@
 using NUnit.Framework;
 
-namespace Aaru.Tests.Helpers
+namespace Aaru.Tests.Helpers;
+
+[TestFixture]
+public class Marshal
 {
-    [TestFixture]
-    public class Marshal
+    readonly string[] _testStrings =
     {
-        readonly string[] _testStrings =
-        {
-            "275048534431364760011a77d2014701", "0235800001000000", "0xbabeface", "0xcefaadde"
-        };
+        "275048534431364760011a77d2014701", "0235800001000000", "0xbabeface", "0xcefaadde"
+    };
 
-        readonly byte[][] _resultBytes =
+    readonly byte[][] _resultBytes =
+    {
+        new byte[]
         {
-            new byte[]
-            {
-                0x27, 0x50, 0x48, 0x53, 0x44, 0x31, 0x36, 0x47, 0x60, 0x01, 0x1a, 0x77, 0xd2, 0x01, 0x47, 0x01
-            },
-            new byte[]
-            {
-                0x02, 0x35, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00
-            },
-            new byte[]
-            {
-                0xba, 0xbe, 0xfa, 0xce
-            },
-            new byte[]
-            {
-                0xce, 0xfa, 0xad, 0xde
-            }
-        };
-
-        [Test]
-        public void ConvertFromHexAscii()
+            0x27, 0x50, 0x48, 0x53, 0x44, 0x31, 0x36, 0x47, 0x60, 0x01, 0x1a, 0x77, 0xd2, 0x01, 0x47, 0x01
+        },
+        new byte[]
         {
-            for(int i = 0; i < _testStrings.Length; i++)
-            {
-                int count = Aaru.Helpers.Marshal.ConvertFromHexAscii(_testStrings[i], out byte[] buf);
+            0x02, 0x35, 0x80, 0x00, 0x01, 0x00, 0x00, 0x00
+        },
+        new byte[]
+        {
+            0xba, 0xbe, 0xfa, 0xce
+        },
+        new byte[]
+        {
+            0xce, 0xfa, 0xad, 0xde
+        }
+    };
 
-                Assert.AreEqual(_resultBytes[i].Length, buf.Length);
-                Assert.AreEqual(_resultBytes[i].Length, count);
-                Assert.AreEqual(_resultBytes[i], buf);
-            }
+    [Test]
+    public void ConvertFromHexAscii()
+    {
+        for(int i = 0; i < _testStrings.Length; i++)
+        {
+            int count = Aaru.Helpers.Marshal.ConvertFromHexAscii(_testStrings[i], out byte[] buf);
+
+            Assert.AreEqual(_resultBytes[i].Length, buf.Length);
+            Assert.AreEqual(_resultBytes[i].Length, count);
+            Assert.AreEqual(_resultBytes[i], buf);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/2MG.cs b/Aaru.Tests/Images/2MG.cs
index 9fca893ec..21a48fd92 100644
--- a/Aaru.Tests/Images/2MG.cs
+++ b/Aaru.Tests/Images/2MG.cs
@@ -31,344 +31,343 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class Apple2Mg : BlockMediaImageTest
-    {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "2mg");
-        public override IMediaImage _plugin    => new DiscImages.Apple2Mg();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Apple2Mg : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "2mg");
+    public override IMediaImage _plugin    => new DiscImages.Apple2Mg();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "blank140.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "7db5d585270ab858043d50e60068d45f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dos32.2mg.lz",
+            MediaType  = MediaType.Apple32SS,
+            Sectors    = 455,
+            SectorSize = 256,
+            MD5        = "906c1bdbf76bf089ea47aae98151df5d",
+            Partitions = new[]
             {
-                TestFile   = "blank140.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "7db5d585270ab858043d50e60068d45f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dos32.2mg.lz",
-                MediaType  = MediaType.Apple32SS,
-                Sectors    = 455,
-                SectorSize = 256,
-                MD5        = "906c1bdbf76bf089ea47aae98151df5d",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 455
-                    }
+                    Start  = 0,
+                    Length = 455
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dos32_alt.2mg.lz",
-                MediaType  = MediaType.Apple32SS,
-                Sectors    = 455,
-                SectorSize = 256,
-                MD5        = "76f8fe4c5bc1976f99641ad7cdf53109",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 455
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dos33_dic.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "0ffcbd4180306192726926b43755db2f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 560
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dos33-do.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "91d020725d081500caa1fd8aad959397",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 560
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dos33-nib.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "91d020725d081500caa1fd8aad959397",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 560
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dos33_nib.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "0ffcbd4180306192726926b43755db2f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 560
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dos33-po.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "91d020725d081500caa1fd8aad959397",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 560
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dos33_po.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "0ffcbd4180306192726926b43755db2f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 560
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "hfs1440.2mg.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "535648d1f9838b695403f2f48d5ac94c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "hfs800_dic.2mg.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "2762f41d0379b476042fc62891baac84"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "hfs_do.2mg.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "2762f41d0379b476042fc62891baac84"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "hfs_po.2mg.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "2762f41d0379b476042fc62891baac84"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "modified_do.2mg.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "b748f6df3e60e7169d42ec6fcc857ea4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "modified_po.2mg.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "b748f6df3e60e7169d42ec6fcc857ea4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal800_do.2mg.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "dbd0ec8a3126236910709faf923adcf2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal800_p.2mg.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "dbd0ec8a3126236910709faf923adcf2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal_dic.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal_do.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal_nib.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal_po.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos1440.2mg.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "eb9b60c78b30d2b6541ed0781944b6da"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos1440_po.2mg.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "1fe841b418ede51133878641e01544b5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos5mb.2mg.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "b156441e159a625ee00a0659dfb6e2f8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos5m_dic.2mg.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "b156441e159a625ee00a0659dfb6e2f8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos800_dic.2mg.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fcf747bd356b48d442ff74adb8f3516b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos800_do.2mg.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fcf747bd356b48d442ff74adb8f3516b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos800_po.2mg.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fcf747bd356b48d442ff74adb8f3516b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos_dic.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos_do.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos_nib.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos_po.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos.2mg.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "6f692a8fadfaa243d9f2d8d41f0e4cad"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dos32_alt.2mg.lz",
+            MediaType  = MediaType.Apple32SS,
+            Sectors    = 455,
+            SectorSize = 256,
+            MD5        = "76f8fe4c5bc1976f99641ad7cdf53109",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 455
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dos33_dic.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "0ffcbd4180306192726926b43755db2f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 560
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dos33-do.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "91d020725d081500caa1fd8aad959397",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 560
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dos33-nib.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "91d020725d081500caa1fd8aad959397",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 560
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dos33_nib.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "0ffcbd4180306192726926b43755db2f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 560
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dos33-po.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "91d020725d081500caa1fd8aad959397",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 560
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dos33_po.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "0ffcbd4180306192726926b43755db2f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 560
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "hfs1440.2mg.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "535648d1f9838b695403f2f48d5ac94c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "hfs800_dic.2mg.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "2762f41d0379b476042fc62891baac84"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "hfs_do.2mg.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "2762f41d0379b476042fc62891baac84"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "hfs_po.2mg.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "2762f41d0379b476042fc62891baac84"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "modified_do.2mg.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "b748f6df3e60e7169d42ec6fcc857ea4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "modified_po.2mg.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "b748f6df3e60e7169d42ec6fcc857ea4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal800_do.2mg.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "dbd0ec8a3126236910709faf923adcf2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal800_p.2mg.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "dbd0ec8a3126236910709faf923adcf2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal_dic.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal_do.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal_nib.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal_po.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos1440.2mg.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "eb9b60c78b30d2b6541ed0781944b6da"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos1440_po.2mg.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "1fe841b418ede51133878641e01544b5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos5mb.2mg.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "b156441e159a625ee00a0659dfb6e2f8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos5m_dic.2mg.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "b156441e159a625ee00a0659dfb6e2f8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos800_dic.2mg.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fcf747bd356b48d442ff74adb8f3516b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos800_do.2mg.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fcf747bd356b48d442ff74adb8f3516b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos800_po.2mg.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fcf747bd356b48d442ff74adb8f3516b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos_dic.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos_do.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos_nib.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos_po.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos.2mg.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "6f692a8fadfaa243d9f2d8d41f0e4cad"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/AaruFormat/Tape/V1.cs b/Aaru.Tests/Images/AaruFormat/Tape/V1.cs
index 93fa1dab1..7408a433d 100644
--- a/Aaru.Tests/Images/AaruFormat/Tape/V1.cs
+++ b/Aaru.Tests/Images/AaruFormat/Tape/V1.cs
@@ -32,718 +32,717 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.AaruFormat.Tape
-{
-    [TestFixture]
-    public class V1 : TapeMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
-        public override IMediaImage _plugin => new DiscImages.AaruFormat();
+namespace Aaru.Tests.Images.AaruFormat.Tape;
 
-        public override TapeImageTestExpected[] Tests => new[]
+[TestFixture]
+public class V1 : TapeMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+    public override IMediaImage _plugin => new DiscImages.AaruFormat();
+
+    public override TapeImageTestExpected[] Tests => new[]
+    {
+        new TapeImageTestExpected
         {
-            new TapeImageTestExpected
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Boot Tape).aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 1604,
+            SectorSize = 10240,
+            MD5        = "a6334d975523b3422fea522b0cc118a9",
+            Partitions = new[]
             {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Boot Tape).aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 1604,
-                SectorSize = 10240,
-                MD5        = "a6334d975523b3422fea522b0cc118a9",
-                Partitions = new[]
+                new TapePartition
                 {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 1603,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 1603,
-                        Partition  = 0
-                    }
+                    FirstBlock = 0,
+                    LastBlock  = 1603,
+                    Number     = 0
                 }
             },
-            new TapeImageTestExpected
+            Files = new[]
             {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Integrity SX25 VME V5.0+).aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 15485,
-                SectorSize = 512,
-                MD5        = "17ef78d9e5c53b976f530d4ca44223fd",
-                Partitions = new[]
+                new TapeFile
                 {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 15484,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 15484,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Online Software Upgrade).aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 15,
-                SectorSize = 32256,
-                MD5        = "76c0ae10f4ec70ef8681b212f02a71c8",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 14,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 14,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Operating System).aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 3298,
-                SectorSize = 32256,
-                MD5        = "e331c9d0ae7c25c81c6580bc9965e2d0",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 3297,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 3297,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Optional Packages).aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 3152,
-                SectorSize = 32256,
-                MD5        = "018c37c40f8df91ab9b098d643c9ae6c",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 3151,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 3151,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (OSF-Motif 1.2.4).aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 818,
-                SectorSize = 32256,
-                MD5        = "eb3ce36b2c3afeeec59e5b8ed802a393",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 817,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 817,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Reliable Ethernet).aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 7,
-                SectorSize = 32256,
-                MD5        = "b057656698a224187afb2bdbb8caf7f3",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 6,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 6,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Required Packages).aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 684,
-                SectorSize = 32256,
-                MD5        = "8e48e388e7094f3170065718ab618b53",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 683,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 683,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "OpenWindows.3.0.exabyte.aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 73525,
-                SectorSize = 1024,
-                MD5        = "8861f8c06a2e93ca5a81d729ad3e1de1",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 73524,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 0,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 1,
-                        FirstBlock = 1,
-                        LastBlock  = 164,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 2,
-                        FirstBlock = 165,
-                        LastBlock  = 2412,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 3,
-                        FirstBlock = 2413,
-                        LastBlock  = 5612,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 4,
-                        FirstBlock = 5613,
-                        LastBlock  = 73524,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "OpenWindows.3.0.Q150.aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 290,
-                SectorSize = 262144,
-                MD5        = "bfc402b23af0cf1ad22d9fb2ea29b58f",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 289,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 0,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 1,
-                        FirstBlock = 1,
-                        LastBlock  = 1,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 2,
-                        FirstBlock = 2,
-                        LastBlock  = 10,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 3,
-                        FirstBlock = 11,
-                        LastBlock  = 23,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 4,
-                        FirstBlock = 24,
-                        LastBlock  = 289,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "OS.MP.4.1C.exabyte.aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 37587,
-                SectorSize = 8192,
-                MD5        = "e4a3e2fe26c72ca025ac0c017ec73ee9",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 37586,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 1,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 1,
-                        FirstBlock = 2,
-                        LastBlock  = 3,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 2,
-                        FirstBlock = 4,
-                        LastBlock  = 6860,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 3,
-                        FirstBlock = 6861,
-                        LastBlock  = 13773,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 4,
-                        FirstBlock = 13774,
-                        LastBlock  = 20263,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 5,
-                        FirstBlock = 20264,
-                        LastBlock  = 20299,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 6,
-                        FirstBlock = 20300,
-                        LastBlock  = 22603,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 7,
-                        FirstBlock = 22604,
-                        LastBlock  = 23472,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 8,
-                        FirstBlock = 23473,
-                        LastBlock  = 24946,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 9,
-                        FirstBlock = 24947,
-                        LastBlock  = 26436,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 10,
-                        FirstBlock = 26437,
-                        LastBlock  = 27720,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 11,
-                        FirstBlock = 27721,
-                        LastBlock  = 31922,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 12,
-                        FirstBlock = 31923,
-                        LastBlock  = 32283,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 13,
-                        FirstBlock = 32284,
-                        LastBlock  = 32675,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 14,
-                        FirstBlock = 32676,
-                        LastBlock  = 33549,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 15,
-                        FirstBlock = 33550,
-                        LastBlock  = 33686,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 16,
-                        FirstBlock = 33687,
-                        LastBlock  = 33909,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 17,
-                        FirstBlock = 33910,
-                        LastBlock  = 33949,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 18,
-                        FirstBlock = 33950,
-                        LastBlock  = 34180,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 19,
-                        FirstBlock = 34181,
-                        LastBlock  = 34573,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 20,
-                        FirstBlock = 34574,
-                        LastBlock  = 35072,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 21,
-                        FirstBlock = 35073,
-                        LastBlock  = 35163,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 22,
-                        FirstBlock = 35164,
-                        LastBlock  = 35908,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 23,
-                        FirstBlock = 35909,
-                        LastBlock  = 35984,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 24,
-                        FirstBlock = 35985,
-                        LastBlock  = 36098,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 25,
-                        FirstBlock = 36099,
-                        LastBlock  = 36270,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 26,
-                        FirstBlock = 36271,
-                        LastBlock  = 36276,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 27,
-                        FirstBlock = 36277,
-                        LastBlock  = 36647,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 28,
-                        FirstBlock = 36648,
-                        LastBlock  = 37111,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 29,
-                        FirstBlock = 37112,
-                        LastBlock  = 37583,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 30,
-                        FirstBlock = 37584,
-                        LastBlock  = 37584,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 31,
-                        FirstBlock = 37585,
-                        LastBlock  = 37585,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 32,
-                        FirstBlock = 37586,
-                        LastBlock  = 37586,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "X.3.0.exabyte.aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 25046,
-                SectorSize = 1024,
-                MD5        = "e625c03d7493dc22fe49f91f731446e8",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 25045,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 0,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 1,
-                        FirstBlock = 1,
-                        LastBlock  = 61,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 2,
-                        FirstBlock = 62,
-                        LastBlock  = 149,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 3,
-                        FirstBlock = 150,
-                        LastBlock  = 2781,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 4,
-                        FirstBlock = 2782,
-                        LastBlock  = 11885,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 5,
-                        FirstBlock = 11886,
-                        LastBlock  = 25045,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "X.3.Q150.aif",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 102,
-                SectorSize = 262144,
-                MD5        = "198464b1daf8e674debf8eda0fcbf016",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 101,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 0,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 1,
-                        FirstBlock = 1,
-                        LastBlock  = 1,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 2,
-                        FirstBlock = 2,
-                        LastBlock  = 2,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 3,
-                        FirstBlock = 3,
-                        LastBlock  = 13,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 4,
-                        FirstBlock = 14,
-                        LastBlock  = 49,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 5,
-                        FirstBlock = 50,
-                        LastBlock  = 101,
-                        Partition  = 0
-                    }
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 1603,
+                    Partition  = 0
                 }
             }
-        };
-    }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Integrity SX25 VME V5.0+).aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 15485,
+            SectorSize = 512,
+            MD5        = "17ef78d9e5c53b976f530d4ca44223fd",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 15484,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 15484,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Online Software Upgrade).aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 15,
+            SectorSize = 32256,
+            MD5        = "76c0ae10f4ec70ef8681b212f02a71c8",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 14,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 14,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Operating System).aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 3298,
+            SectorSize = 32256,
+            MD5        = "e331c9d0ae7c25c81c6580bc9965e2d0",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 3297,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 3297,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Optional Packages).aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 3152,
+            SectorSize = 32256,
+            MD5        = "018c37c40f8df91ab9b098d643c9ae6c",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 3151,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 3151,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (OSF-Motif 1.2.4).aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 818,
+            SectorSize = 32256,
+            MD5        = "eb3ce36b2c3afeeec59e5b8ed802a393",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 817,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 817,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Reliable Ethernet).aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 7,
+            SectorSize = 32256,
+            MD5        = "b057656698a224187afb2bdbb8caf7f3",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 6,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 6,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Required Packages).aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 684,
+            SectorSize = 32256,
+            MD5        = "8e48e388e7094f3170065718ab618b53",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 683,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 683,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "OpenWindows.3.0.exabyte.aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 73525,
+            SectorSize = 1024,
+            MD5        = "8861f8c06a2e93ca5a81d729ad3e1de1",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 73524,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 0,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 1,
+                    FirstBlock = 1,
+                    LastBlock  = 164,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 2,
+                    FirstBlock = 165,
+                    LastBlock  = 2412,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 3,
+                    FirstBlock = 2413,
+                    LastBlock  = 5612,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 4,
+                    FirstBlock = 5613,
+                    LastBlock  = 73524,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "OpenWindows.3.0.Q150.aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 290,
+            SectorSize = 262144,
+            MD5        = "bfc402b23af0cf1ad22d9fb2ea29b58f",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 289,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 0,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 1,
+                    FirstBlock = 1,
+                    LastBlock  = 1,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 2,
+                    FirstBlock = 2,
+                    LastBlock  = 10,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 3,
+                    FirstBlock = 11,
+                    LastBlock  = 23,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 4,
+                    FirstBlock = 24,
+                    LastBlock  = 289,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "OS.MP.4.1C.exabyte.aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 37587,
+            SectorSize = 8192,
+            MD5        = "e4a3e2fe26c72ca025ac0c017ec73ee9",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 37586,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 1,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 1,
+                    FirstBlock = 2,
+                    LastBlock  = 3,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 2,
+                    FirstBlock = 4,
+                    LastBlock  = 6860,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 3,
+                    FirstBlock = 6861,
+                    LastBlock  = 13773,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 4,
+                    FirstBlock = 13774,
+                    LastBlock  = 20263,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 5,
+                    FirstBlock = 20264,
+                    LastBlock  = 20299,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 6,
+                    FirstBlock = 20300,
+                    LastBlock  = 22603,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 7,
+                    FirstBlock = 22604,
+                    LastBlock  = 23472,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 8,
+                    FirstBlock = 23473,
+                    LastBlock  = 24946,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 9,
+                    FirstBlock = 24947,
+                    LastBlock  = 26436,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 10,
+                    FirstBlock = 26437,
+                    LastBlock  = 27720,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 11,
+                    FirstBlock = 27721,
+                    LastBlock  = 31922,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 12,
+                    FirstBlock = 31923,
+                    LastBlock  = 32283,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 13,
+                    FirstBlock = 32284,
+                    LastBlock  = 32675,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 14,
+                    FirstBlock = 32676,
+                    LastBlock  = 33549,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 15,
+                    FirstBlock = 33550,
+                    LastBlock  = 33686,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 16,
+                    FirstBlock = 33687,
+                    LastBlock  = 33909,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 17,
+                    FirstBlock = 33910,
+                    LastBlock  = 33949,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 18,
+                    FirstBlock = 33950,
+                    LastBlock  = 34180,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 19,
+                    FirstBlock = 34181,
+                    LastBlock  = 34573,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 20,
+                    FirstBlock = 34574,
+                    LastBlock  = 35072,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 21,
+                    FirstBlock = 35073,
+                    LastBlock  = 35163,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 22,
+                    FirstBlock = 35164,
+                    LastBlock  = 35908,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 23,
+                    FirstBlock = 35909,
+                    LastBlock  = 35984,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 24,
+                    FirstBlock = 35985,
+                    LastBlock  = 36098,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 25,
+                    FirstBlock = 36099,
+                    LastBlock  = 36270,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 26,
+                    FirstBlock = 36271,
+                    LastBlock  = 36276,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 27,
+                    FirstBlock = 36277,
+                    LastBlock  = 36647,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 28,
+                    FirstBlock = 36648,
+                    LastBlock  = 37111,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 29,
+                    FirstBlock = 37112,
+                    LastBlock  = 37583,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 30,
+                    FirstBlock = 37584,
+                    LastBlock  = 37584,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 31,
+                    FirstBlock = 37585,
+                    LastBlock  = 37585,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 32,
+                    FirstBlock = 37586,
+                    LastBlock  = 37586,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "X.3.0.exabyte.aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 25046,
+            SectorSize = 1024,
+            MD5        = "e625c03d7493dc22fe49f91f731446e8",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 25045,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 0,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 1,
+                    FirstBlock = 1,
+                    LastBlock  = 61,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 2,
+                    FirstBlock = 62,
+                    LastBlock  = 149,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 3,
+                    FirstBlock = 150,
+                    LastBlock  = 2781,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 4,
+                    FirstBlock = 2782,
+                    LastBlock  = 11885,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 5,
+                    FirstBlock = 11886,
+                    LastBlock  = 25045,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "X.3.Q150.aif",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 102,
+            SectorSize = 262144,
+            MD5        = "198464b1daf8e674debf8eda0fcbf016",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 101,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 0,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 1,
+                    FirstBlock = 1,
+                    LastBlock  = 1,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 2,
+                    FirstBlock = 2,
+                    LastBlock  = 2,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 3,
+                    FirstBlock = 3,
+                    LastBlock  = 13,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 4,
+                    FirstBlock = 14,
+                    LastBlock  = 49,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 5,
+                    FirstBlock = 50,
+                    LastBlock  = 101,
+                    Partition  = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/AaruFormat/V1.cs b/Aaru.Tests/Images/AaruFormat/V1.cs
index 2884620e1..a2faf7bdc 100644
--- a/Aaru.Tests/Images/AaruFormat/V1.cs
+++ b/Aaru.Tests/Images/AaruFormat/V1.cs
@@ -31,1400 +31,1399 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.AaruFormat
-{
-    [TestFixture]
-    public class V1 : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
-        public override IMediaImage _plugin => new DiscImages.AaruFormat();
+namespace Aaru.Tests.Images.AaruFormat;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class V1 : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+    public override IMediaImage _plugin => new DiscImages.AaruFormat();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "cdiready_the_apprentice.aif",
+            MediaType     = MediaType.CDIREADY,
+            Sectors       = 279300,
+            SectorSize    = 2352,
+            MD5           = "ad6b898e5f93faf33967fe53fea7037e",
+            LongMD5       = "8c897ff39ce1ae7b091bfd00fbc3c1bb",
+            SubchannelMD5 = "579e2b502d86bc1eb7d6aded2b752c36",
+            Tracks = new[]
             {
-                TestFile      = "cdiready_the_apprentice.aif",
-                MediaType     = MediaType.CDIREADY,
-                Sectors       = 279300,
-                SectorSize    = 2352,
-                MD5           = "ad6b898e5f93faf33967fe53fea7037e",
-                LongMD5       = "8c897ff39ce1ae7b091bfd00fbc3c1bb",
-                SubchannelMD5 = "579e2b502d86bc1eb7d6aded2b752c36",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 69149,
+                    Pregap  = 0,
+                    Flags   = 4,
+                    Number  = 0,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 69149,
-                        Pregap  = 0,
-                        Flags   = 4,
-                        Number  = 0,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 279300,
-                                ClusterSize = 2048,
-                                Type        = "CD-i",
-                                VolumeName  = "The Apprentice"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 69150,
-                        End     = 88649,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88650,
-                        End     = 107474,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107475,
-                        End     = 112049,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112050,
-                        End     = 133499,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133500,
-                        End     = 138074,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138075,
-                        End     = 159674,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159675,
-                        End     = 164624,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164625,
-                        End     = 185249,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185250,
-                        End     = 189974,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 189975,
-                        End     = 208724,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208725,
-                        End     = 212849,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 212850,
-                        End     = 232049,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232050,
-                        End     = 236549,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236550,
-                        End     = 241724,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241725,
-                        End     = 255974,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 255975,
-                        End     = 256724,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256725,
-                        End     = 265499,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265500,
-                        End     = 267224,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267225,
-                        End     = 269849,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269850,
-                        End     = 271499,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271500,
-                        End     = 274124,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274125,
-                        End     = 279299,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_audiocd.aif",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                SectorSize    = 2352,
-                MD5           = "c9036cb72bcb67d469ca82eb7a66cb2a",
-                LongMD5       = "c9036cb72bcb67d469ca82eb7a66cb2a",
-                SubchannelMD5 = "6d2ae02b362918f531ad414c736d349a",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16398,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16399,
-                        End     = 29900,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29901,
-                        End     = 47799,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47800,
-                        End     = 63163,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63164,
-                        End     = 78774,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78775,
-                        End     = 94581,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94582,
-                        End     = 116974,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 116975,
-                        End     = 136015,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136016,
-                        End     = 153921,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153922,
-                        End     = 170600,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170601,
-                        End     = 186388,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186389,
-                        End     = 201648,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201649,
-                        End     = 224298,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224299,
-                        End     = 247072,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdr.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "34b8e75c3038deceaea7d382f22740cb",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 279300,
+                            ClusterSize = 2048,
+                            Type        = "CD-i",
+                            VolumeName  = "The Apprentice"
                         }
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.aif",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "5d7f79a75e21f56e62d6fc894ee71ee6",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw_2x.aif",
-                MediaType     = MediaType.CDRW,
-                Sectors       = 308224,
-                SectorSize    = 2048,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "80a59aaf861f925a530e1b0d7857fe25",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 69150,
+                    End     = 88649,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_dvd+r.aif",
-                MediaType  = MediaType.DVDPR,
-                Sectors    = 2146368,
-                SectorSize = 2048,
-                MD5        = "106f141400355476b499213f36a363f9",
-                LongMD5    = "106f141400355476b499213f36a363f9",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 88650,
+                    End     = 107474,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_dvd-r.aif",
-                MediaType  = MediaType.DVDR,
-                Sectors    = 2146368,
-                SectorSize = 2048,
-                MD5        = "106f141400355476b499213f36a363f9",
-                LongMD5    = "106f141400355476b499213f36a363f9",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 107475,
+                    End     = 112049,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_dvd-ram_v1.aif",
-                MediaType  = MediaType.DVDRAM,
-                Sectors    = 1218960,
-                SectorSize = 2048,
-                MD5        = "c22b7796791cd4299d74863ed04496c6",
-                LongMD5    = "c22b7796791cd4299d74863ed04496c6",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 112050,
+                    End     = 133499,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1218959,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_dvd-ram_v2.aif",
-                MediaType  = MediaType.DVDRAM,
-                Sectors    = 2236704,
-                SectorSize = 2048,
-                MD5        = "00b1d7c5e9855959a4d2f6b796aeaf4c",
-                LongMD5    = "00b1d7c5e9855959a4d2f6b796aeaf4c",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 133500,
+                    End     = 138074,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2236703,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_dvd+r_dl.aif",
-                MediaType  = MediaType.DVDROM,
-                Sectors    = 16384000,
-                SectorSize = 2048,
-                MD5        = "63d0fd3f25ab503a1818b15ca5eb86b5",
-                LongMD5    = "63d0fd3f25ab503a1818b15ca5eb86b5",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 138075,
+                    End     = 159674,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16383999,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters     = 16384000,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Test DVD",
-                                VolumeSerial = "483E25D50034BBB0"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_dvd-rom.aif",
-                MediaType  = MediaType.DVDROM,
-                Sectors    = 2146368,
-                SectorSize = 2048,
-                MD5        = "106f141400355476b499213f36a363f9",
-                LongMD5    = "106f141400355476b499213f36a363f9",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 159675,
+                    End     = 164624,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_dvd+rw.aif",
-                MediaType  = MediaType.DVDPRW,
-                Sectors    = 2295104,
-                SectorSize = 2048,
-                MD5        = "3c03ab1def372553f1b04afa0fdbc527",
-                LongMD5    = "3c03ab1def372553f1b04afa0fdbc527",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 164625,
+                    End     = 185249,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2295103,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_dvd-rw.aif",
-                MediaType  = MediaType.DVDRWDL,
-                Sectors    = 2146368,
-                SectorSize = 2048,
-                MD5        = "106f141400355476b499213f36a363f9",
-                LongMD5    = "106f141400355476b499213f36a363f9",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 185250,
+                    End     = 189974,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_enhancedcd.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 303316,
-                SectorSize    = 2352,
-                MD5           = "b6cb0d4b3a7763dc2ba6b5256a23bcbe",
-                LongMD5       = "74cf2db1d7a0c1d790728e6250f866b7",
-                SubchannelMD5 = "27d433659fd0142310b81175fbd610a7",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 189975,
+                    End     = 208724,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 14,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_audiocd_cdtext.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 277696,
-                SectorSize    = 2352,
-                MD5           = "78466ec1a08d7804a6cb38f2ed89b10f",
-                LongMD5       = "78466ec1a08d7804a6cb38f2ed89b10f",
-                SubchannelMD5 = "ac39ed98b7033da6aa936b4314574a2a",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 208725,
+                    End     = 212849,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29751,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29752,
-                        End     = 65033,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65034,
-                        End     = 78425,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78426,
-                        End     = 95079,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95080,
-                        End     = 126146,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126147,
-                        End     = 154958,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154959,
-                        End     = 191684,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191685,
-                        End     = 222775,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222776,
-                        End     = 243437,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243438,
-                        End     = 269599,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269600,
-                        End     = 277695,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_audiocd_multiple_indexes.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 65536,
-                SectorSize    = 2352,
-                MD5           = "d5d22e15dcf3f081d562b351611a8991",
-                LongMD5       = "d5d22e15dcf3f081d562b351611a8991",
-                SubchannelMD5 = "3546cc3e1b2b3898de5a03083af9d6ee",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 212850,
+                    End     = 232049,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4652,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4653,
-                        End     = 13804,
-                        Pregap  = 151,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13805,
-                        End     = 36684,
-                        Pregap  = 70,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 36685,
-                        End     = 54988,
-                        Pregap  = 4500,
-                        Flags   = 8
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 0,
-                        Flags   = 1
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_cdr_incd_finalized.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 350134,
-                SectorSize    = 2048,
-                MD5           = "edc146b00d622f92c6a9bb4648cbea82",
-                LongMD5       = "6b36340c27d5583e73539175eb87c683",
-                SubchannelMD5 = "663da762a5bef780d09217fca9d23e08",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 232050,
+                    End     = 236549,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 7,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 600,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "INCD"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 350134,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "InCD",
-                                VolumeSerial = "40888C15CA13D401InCD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_enhancedcd.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 59206,
-                SectorSize    = 2352,
-                MD5           = "3e9862ad534415cb3b1ef216f9446d4e",
-                LongMD5       = "502cdc0391687bc2e2a89ea7a5906ebb",
-                SubchannelMD5 = "1aa52cf9468044489d791ab69a023a31",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 236550,
+                    End     = 241724,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14255,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14256,
-                        End     = 28952,
-                        Pregap  = 149,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 40203,
-                        End     = 59205,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 18853,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sampler.aif",
-                MediaType     = MediaType.CD,
-                Sectors       = 329158,
-                SectorSize    = 2352,
-                MD5           = "fef9ff409aa2643ac0c0649e84346f5f",
-                LongMD5       = "ef18dc4f63ad59c6294ab09da7704366",
-                SubchannelMD5 = "aa71734f6385319656e2f1a64af5328b",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 241725,
+                    End     = 255974,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32748,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 51168,
-                SectorSize    = 2048,
-                MD5           = "e2e19cf38891e67a0829d01842b4052e",
-                LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
-                SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 255975,
+                    End     = 256724,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 7876,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 8133,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 1",
-                                VolumeSerial = "50958B61AF6A749E"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 6170,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 2"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6427,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 2",
-                                VolumeSerial = "50958BBBAF6A7444"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 5360,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 3"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 5618,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "Session 3",
-                                VolumeSerial = "50958C19AF6A73E6"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 4,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 45796,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 4"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 5790,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.60",
-                                VolumeName   = "Session 4",
-                                VolumeSerial = "50958C82AF6A737D"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_videocd.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 48794,
-                SectorSize    = 2328,
-                MD5           = "a5531d15eefe70ff21718b3b5da08255",
-                LongMD5       = "11a0d9994ee761655ef4d61c6cda99e9",
-                SubchannelMD5 = "f49e383ccee2f3cb97aeb82fcb4fdb18",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 256725,
+                    End     = 265499,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 265500,
+                    End     = 267224,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267225,
+                    End     = 269849,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269850,
+                    End     = 271499,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271500,
+                    End     = 274124,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274125,
+                    End     = 279299,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.aif",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            SectorSize    = 2352,
+            MD5           = "c9036cb72bcb67d469ca82eb7a66cb2a",
+            LongMD5       = "c9036cb72bcb67d469ca82eb7a66cb2a",
+            SubchannelMD5 = "6d2ae02b362918f531ad414c736d349a",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16398,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16399,
+                    End     = 29900,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29901,
+                    End     = 47799,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47800,
+                    End     = 63163,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63164,
+                    End     = 78774,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78775,
+                    End     = 94581,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94582,
+                    End     = 116974,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 116975,
+                    End     = 136015,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136016,
+                    End     = 153921,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153922,
+                    End     = 170600,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170601,
+                    End     = 186388,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186389,
+                    End     = 201648,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201649,
+                    End     = 224298,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224299,
+                    End     = 247072,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "34b8e75c3038deceaea7d382f22740cb",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1107,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1108,
-                        End     = 48793,
-                        Pregap  = 144,
-                        Flags   = 4
                     }
                 }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.aif",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "5d7f79a75e21f56e62d6fc894ee71ee6",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw_2x.aif",
+            MediaType     = MediaType.CDRW,
+            Sectors       = 308224,
+            SectorSize    = 2048,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "80a59aaf861f925a530e1b0d7857fe25",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_dvd+r.aif",
+            MediaType  = MediaType.DVDPR,
+            Sectors    = 2146368,
+            SectorSize = 2048,
+            MD5        = "106f141400355476b499213f36a363f9",
+            LongMD5    = "106f141400355476b499213f36a363f9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_dvd-r.aif",
+            MediaType  = MediaType.DVDR,
+            Sectors    = 2146368,
+            SectorSize = 2048,
+            MD5        = "106f141400355476b499213f36a363f9",
+            LongMD5    = "106f141400355476b499213f36a363f9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_dvd-ram_v1.aif",
+            MediaType  = MediaType.DVDRAM,
+            Sectors    = 1218960,
+            SectorSize = 2048,
+            MD5        = "c22b7796791cd4299d74863ed04496c6",
+            LongMD5    = "c22b7796791cd4299d74863ed04496c6",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1218959,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_dvd-ram_v2.aif",
+            MediaType  = MediaType.DVDRAM,
+            Sectors    = 2236704,
+            SectorSize = 2048,
+            MD5        = "00b1d7c5e9855959a4d2f6b796aeaf4c",
+            LongMD5    = "00b1d7c5e9855959a4d2f6b796aeaf4c",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2236703,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_dvd+r_dl.aif",
+            MediaType  = MediaType.DVDROM,
+            Sectors    = 16384000,
+            SectorSize = 2048,
+            MD5        = "63d0fd3f25ab503a1818b15ca5eb86b5",
+            LongMD5    = "63d0fd3f25ab503a1818b15ca5eb86b5",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16383999,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters     = 16384000,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Test DVD",
+                            VolumeSerial = "483E25D50034BBB0"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_dvd-rom.aif",
+            MediaType  = MediaType.DVDROM,
+            Sectors    = 2146368,
+            SectorSize = 2048,
+            MD5        = "106f141400355476b499213f36a363f9",
+            LongMD5    = "106f141400355476b499213f36a363f9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_dvd+rw.aif",
+            MediaType  = MediaType.DVDPRW,
+            Sectors    = 2295104,
+            SectorSize = 2048,
+            MD5        = "3c03ab1def372553f1b04afa0fdbc527",
+            LongMD5    = "3c03ab1def372553f1b04afa0fdbc527",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2295103,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_dvd-rw.aif",
+            MediaType  = MediaType.DVDRWDL,
+            Sectors    = 2146368,
+            SectorSize = 2048,
+            MD5        = "106f141400355476b499213f36a363f9",
+            LongMD5    = "106f141400355476b499213f36a363f9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_enhancedcd.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 303316,
+            SectorSize    = 2352,
+            MD5           = "b6cb0d4b3a7763dc2ba6b5256a23bcbe",
+            LongMD5       = "74cf2db1d7a0c1d790728e6250f866b7",
+            SubchannelMD5 = "27d433659fd0142310b81175fbd610a7",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 14,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_audiocd_cdtext.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 277696,
+            SectorSize    = 2352,
+            MD5           = "78466ec1a08d7804a6cb38f2ed89b10f",
+            LongMD5       = "78466ec1a08d7804a6cb38f2ed89b10f",
+            SubchannelMD5 = "ac39ed98b7033da6aa936b4314574a2a",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29751,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29752,
+                    End     = 65033,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65034,
+                    End     = 78425,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78426,
+                    End     = 95079,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95080,
+                    End     = 126146,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126147,
+                    End     = 154958,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154959,
+                    End     = 191684,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191685,
+                    End     = 222775,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222776,
+                    End     = 243437,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243438,
+                    End     = 269599,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269600,
+                    End     = 277695,
+                    Pregap  = 150,
+                    Flags   = 2
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_audiocd_multiple_indexes.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 65536,
+            SectorSize    = 2352,
+            MD5           = "d5d22e15dcf3f081d562b351611a8991",
+            LongMD5       = "d5d22e15dcf3f081d562b351611a8991",
+            SubchannelMD5 = "3546cc3e1b2b3898de5a03083af9d6ee",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4652,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4653,
+                    End     = 13804,
+                    Pregap  = 151,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13805,
+                    End     = 36684,
+                    Pregap  = 70,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 36685,
+                    End     = 54988,
+                    Pregap  = 4500,
+                    Flags   = 8
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 0,
+                    Flags   = 1
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_cdr_incd_finalized.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 350134,
+            SectorSize    = 2048,
+            MD5           = "edc146b00d622f92c6a9bb4648cbea82",
+            LongMD5       = "6b36340c27d5583e73539175eb87c683",
+            SubchannelMD5 = "663da762a5bef780d09217fca9d23e08",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 7,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 600,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "INCD"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 350134,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "InCD",
+                            VolumeSerial = "40888C15CA13D401InCD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_enhancedcd.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 59206,
+            SectorSize    = 2352,
+            MD5           = "3e9862ad534415cb3b1ef216f9446d4e",
+            LongMD5       = "502cdc0391687bc2e2a89ea7a5906ebb",
+            SubchannelMD5 = "1aa52cf9468044489d791ab69a023a31",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14255,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14256,
+                    End     = 28952,
+                    Pregap  = 149,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 40203,
+                    End     = 59205,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 18853,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.aif",
+            MediaType     = MediaType.CD,
+            Sectors       = 329158,
+            SectorSize    = 2352,
+            MD5           = "fef9ff409aa2643ac0c0649e84346f5f",
+            LongMD5       = "ef18dc4f63ad59c6294ab09da7704366",
+            SubchannelMD5 = "aa71734f6385319656e2f1a64af5328b",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32748,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 51168,
+            SectorSize    = 2048,
+            MD5           = "e2e19cf38891e67a0829d01842b4052e",
+            LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
+            SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 7876,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 8133,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 1",
+                            VolumeSerial = "50958B61AF6A749E"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 6170,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 2"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6427,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 2",
+                            VolumeSerial = "50958BBBAF6A7444"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 5360,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 3"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 5618,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "Session 3",
+                            VolumeSerial = "50958C19AF6A73E6"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 4,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 45796,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 4"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 5790,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.60",
+                            VolumeName   = "Session 4",
+                            VolumeSerial = "50958C82AF6A737D"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 48794,
+            SectorSize    = 2328,
+            MD5           = "a5531d15eefe70ff21718b3b5da08255",
+            LongMD5       = "11a0d9994ee761655ef4d61c6cda99e9",
+            SubchannelMD5 = "f49e383ccee2f3cb97aeb82fcb4fdb18",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1107,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1108,
+                    End     = 48793,
+                    Pregap  = 144,
+                    Flags   = 4
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/Alcohol120.cs b/Aaru.Tests/Images/Alcohol120.cs
index fe5b769c0..b7b6438a1 100644
--- a/Aaru.Tests/Images/Alcohol120.cs
+++ b/Aaru.Tests/Images/Alcohol120.cs
@@ -31,717 +31,717 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
+namespace Aaru.Tests.Images;
+
+[TestFixture]
+public class Alcohol120 : OpticalMediaImageTest
 {
-    [TestFixture]
-    public class Alcohol120 : OpticalMediaImageTest
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Alcohol 120%");
+    public override IMediaImage _plugin => new DiscImages.Alcohol120();
+
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Alcohol 120%");
-        public override IMediaImage _plugin => new DiscImages.Alcohol120();
-
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "cdiready_the_apprentice.mds",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 279300,
+            MD5           = "556d7d32e3c01c2087cc56b25fe5f66d",
+            LongMD5       = "556d7d32e3c01c2087cc56b25fe5f66d",
+            SubchannelMD5 = "6ffdfdeacee7cd3caf6316f6b5f3a635",
+            Tracks = new[]
             {
-                TestFile      = "cdiready_the_apprentice.mds",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 279300,
-                MD5           = "556d7d32e3c01c2087cc56b25fe5f66d",
-                LongMD5       = "556d7d32e3c01c2087cc56b25fe5f66d",
-                SubchannelMD5 = "6ffdfdeacee7cd3caf6316f6b5f3a635",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 88799,
-                        Pregap  = 69300,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 88799,
+                    Pregap  = 69300,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279299,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "gigarec.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 469652,
+            MD5           = "dc8aaff9bd1a8a6f642e15bce29cd03e",
+            LongMD5       = "1ba5f0fb9f3572197a8d039fd341c0aa",
+            SubchannelMD5 = "95ef603d7dc9e285929cbf3c79ba9db2",
+            Tracks = new[]
             {
-                TestFile      = "gigarec.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 469652,
-                MD5           = "dc8aaff9bd1a8a6f642e15bce29cd03e",
-                LongMD5       = "1ba5f0fb9f3572197a8d039fd341c0aa",
-                SubchannelMD5 = "95ef603d7dc9e285929cbf3c79ba9db2",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 469651,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 469651,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 469652,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New Volume"
-                            }
+                            Clusters    = 469652,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New Volume"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "jaguarcd.mds",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 243587,
+            MD5           = "1dee46e2fa0de388d1f225ab8fa6d0b4",
+            LongMD5       = "1dee46e2fa0de388d1f225ab8fa6d0b4",
+            SubchannelMD5 = "b765ee54404c081b6aa8e67181d04e17",
+            Tracks = new[]
             {
-                TestFile      = "jaguarcd.mds",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 243587,
-                MD5           = "1dee46e2fa0de388d1f225ab8fa6d0b4",
-                LongMD5       = "1dee46e2fa0de388d1f225ab8fa6d0b4",
-                SubchannelMD5 = "b765ee54404c081b6aa8e67181d04e17",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16239,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 27490,
-                        End     = 28236,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 28237,
-                        End     = 78891,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 78892,
-                        End     = 100053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 100054,
-                        End     = 133202,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 133203,
-                        End     = 160907,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 160908,
-                        End     = 181465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 181466,
-                        End     = 202023,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 202024,
-                        End     = 222581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 222582,
-                        End     = 243139,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 243140,
-                        End     = 243586,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16239,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 27490,
+                    End     = 28236,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 28237,
+                    End     = 78891,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 78892,
+                    End     = 100053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 100054,
+                    End     = 133202,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 133203,
+                    End     = 160907,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 160908,
+                    End     = 181465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 181466,
+                    End     = 202023,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 202024,
+                    End     = 222581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 222582,
+                    End     = 243139,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 243140,
+                    End     = 243586,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcengine.mds",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 160956,
+            MD5           = "248ff28ea147ecdf0724fdfb0e59174a",
+            LongMD5       = "eb48e46f5bd085dd6f9936d89afe6e9b",
+            SubchannelMD5 = "42eea856ab1bbb04d16b1efed7c54d3f",
+            Tracks = new[]
             {
-                TestFile      = "pcengine.mds",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 160956,
-                MD5           = "248ff28ea147ecdf0724fdfb0e59174a",
-                LongMD5       = "eb48e46f5bd085dd6f9936d89afe6e9b",
-                SubchannelMD5 = "42eea856ab1bbb04d16b1efed7c54d3f",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3439,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3440,
+                    End     = 38463,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3439,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3440,
-                        End     = 38463,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 28672,
-                                ClusterSize = 2048,
-                                Type        = "PC Engine filesystem"
-                            }
+                            Clusters    = 28672,
+                            ClusterSize = 2048,
+                            Type        = "PC Engine filesystem"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38464,
-                        End     = 47216,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47217,
-                        End     = 53500,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53501,
-                        End     = 61818,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61819,
-                        End     = 68562,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68563,
-                        End     = 75396,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75397,
-                        End     = 83129,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 83130,
-                        End     = 86480,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86481,
-                        End     = 91266,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 91267,
-                        End     = 99273,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99274,
-                        End     = 106692,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106693,
-                        End     = 112237,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112238,
-                        End     = 120269,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 120270,
-                        End     = 126078,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126079,
-                        End     = 160955,
-                        Pregap  = 150,
-                        Flags   = 4
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcfx.mds",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 246680,
-                MD5           = "64d6baf711d2e0f24499d284ac2bc580",
-                LongMD5       = "f0af56f9d093b214e1b7c9148a869eb3",
-                SubchannelMD5 = "e596bcd432f69758678cda1e04207de5",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 38464,
+                    End     = 47216,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47217,
+                    End     = 53500,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53501,
+                    End     = 61818,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61819,
+                    End     = 68562,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68563,
+                    End     = 75396,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75397,
+                    End     = 83129,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 83130,
+                    End     = 86480,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86481,
+                    End     = 91266,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 91267,
+                    End     = 99273,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99274,
+                    End     = 106692,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106693,
+                    End     = 112237,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112238,
+                    End     = 120269,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 120270,
+                    End     = 126078,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126079,
+                    End     = 160955,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcfx.mds",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 246680,
+            MD5           = "64d6baf711d2e0f24499d284ac2bc580",
+            LongMD5       = "f0af56f9d093b214e1b7c9148a869eb3",
+            SubchannelMD5 = "e596bcd432f69758678cda1e04207de5",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4244,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4245,
+                    End     = 4908,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4244,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4245,
-                        End     = 4908,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 514,
-                                ClusterSize = 2048,
-                                Type        = "PC-FX",
-                                VolumeName  = "同級生２"
-                            }
+                            Bootable    = true,
+                            Clusters    = 514,
+                            ClusterSize = 2048,
+                            Type        = "PC-FX",
+                            VolumeName  = "同級生２"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4909,
-                        End     = 5940,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5941,
-                        End     = 42058,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 42059,
-                        End     = 220644,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220645,
-                        End     = 225645,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225646,
-                        End     = 235497,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235498,
-                        End     = 246679,
-                        Pregap  = 0,
-                        Flags   = 0
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_audiocd.mds",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 247073,
-                MD5           = "ff35cfa013871b322ef54612e719c185",
-                LongMD5       = "ff35cfa013871b322ef54612e719c185",
-                SubchannelMD5 = "9da6ad8f6f0cadd92509c10809da7296",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 4909,
+                    End     = 5940,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 5941,
+                    End     = 42058,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 42059,
+                    End     = 220644,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220645,
+                    End     = 225645,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225646,
+                    End     = 235497,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235498,
+                    End     = 246679,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.mds",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 247073,
+            MD5           = "ff35cfa013871b322ef54612e719c185",
+            LongMD5       = "ff35cfa013871b322ef54612e719c185",
+            SubchannelMD5 = "9da6ad8f6f0cadd92509c10809da7296",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
 
-            // TODO: Needs redump, corrupted image
-            new OpticalImageTestExpected
+        // TODO: Needs redump, corrupted image
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 254265,
+            MD5           = "016e9431ca3161d427b29dbc1312a232",
+            LongMD5       = "6b4e35ec371770751f26163629253015",
+            SubchannelMD5 = "6ea1db8638c111b7fd45b35a138d24fe",
+            Tracks = new[]
             {
-                TestFile      = "report_cdr.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 254265,
-                MD5           = "016e9431ca3161d427b29dbc1312a232",
-                LongMD5       = "6b4e35ec371770751f26163629253015",
-                SubchannelMD5 = "6ea1db8638c111b7fd45b35a138d24fe",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4 /*
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4 /*
                         Number  =1,
                         FileSystems = new[]
                         {
@@ -760,28 +760,28 @@ namespace Aaru.Tests.Images
                                 VolumeName  = "Winpower"
                             }
                         }*/
-                    }
                 }
-            },
+            }
+        },
 
-            // TODO: Needs redump, corrupted image
-            new OpticalImageTestExpected
+        // TODO: Needs redump, corrupted image
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.mds",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "016e9431ca3161d427b29dbc1312a232",
+            LongMD5       = "6b4e35ec371770751f26163629253015",
+            SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrom.mds",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "016e9431ca3161d427b29dbc1312a232",
-                LongMD5       = "6b4e35ec371770751f26163629253015",
-                SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4 /*,
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4 /*,
                         Number  =1,
                         FileSystems = new[]
                         {
@@ -800,158 +800,158 @@ namespace Aaru.Tests.Images
                                 VolumeName  = "Winpower"
                             }
                         }*/
-                    }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw_12x.mds",
+            MediaType     = MediaType.CDRW,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "a1890f71563eb9907e4a08fef6afd6bf",
+            SubchannelMD5 = "337aefffca57a2d0222dabd8989f0b3f",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrw_12x.mds",
-                MediaType     = MediaType.CDRW,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "a1890f71563eb9907e4a08fef6afd6bf",
-                SubchannelMD5 = "337aefffca57a2d0222dabd8989f0b3f",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw_2x.mds",
+            MediaType     = MediaType.CDRW,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "6fe81a972e750c68e08f6935e4d91e34",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrw_2x.mds",
-                MediaType     = MediaType.CDRW,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "6fe81a972e750c68e08f6935e4d91e34",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw_4x.mds",
+            MediaType     = MediaType.CDRW,
+            Sectors       = 254265,
+            MD5           = "fe67ffb95da123e060a1c4d278df3c5a",
+            LongMD5       = "9c13c4f7dcb76feae684ba9a368094c5",
+            SubchannelMD5 = "e4095cb91fa40382dcadc22433b281c3",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrw_4x.mds",
-                MediaType     = MediaType.CDRW,
-                Sectors       = 254265,
-                MD5           = "fe67ffb95da123e060a1c4d278df3c5a",
-                LongMD5       = "9c13c4f7dcb76feae684ba9a368094c5",
-                SubchannelMD5 = "e4095cb91fa40382dcadc22433b281c3",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+r-dl.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 3455936,
+            MD5       = "692148a01b4204160b088141fb52bd70",
+            LongMD5   = "692148a01b4204160b088141fb52bd70",
+            Tracks = new[]
             {
-                TestFile  = "report_dvd+r-dl.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 3455936,
-                MD5       = "692148a01b4204160b088141fb52bd70",
-                LongMD5   = "692148a01b4204160b088141fb52bd70",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3455935,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3455935,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters     = 3455936,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Test DVD",
-                                VolumeSerial = "483E25D50034BBB0"
-                            }
+                            Clusters     = 3455936,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Test DVD",
+                            VolumeSerial = "483E25D50034BBB0"
                         }
                     }
                 }
-            },
+            }
+        },
 
-            // TODO: Needs redump, corrupted image
-            new OpticalImageTestExpected
+        // TODO: Needs redump, corrupted image
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+r.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146368,
+            MD5       = "32746029d25e430cd50c464232536d1a",
+            LongMD5   = "32746029d25e430cd50c464232536d1a",
+            Tracks = new[]
             {
-                TestFile  = "report_dvd+r.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146368,
-                MD5       = "32746029d25e430cd50c464232536d1a",
-                LongMD5   = "32746029d25e430cd50c464232536d1a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0 /*,
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0 /*,
                         Number  = 1,
                         FileSystems = new[]
                         {
@@ -964,26 +964,26 @@ namespace Aaru.Tests.Images
                                 VolumeName  = "SU1100.001"
                             }
                         }*/
-                    }
                 }
-            },
+            }
+        },
 
-            // TODO: Needs redump, corrupted image
-            new OpticalImageTestExpected
+        // TODO: Needs redump, corrupted image
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-r.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146368,
+            MD5       = "c20217c0356fcd074c33b5f4b1355914",
+            LongMD5   = "c20217c0356fcd074c33b5f4b1355914",
+            Tracks = new[]
             {
-                TestFile  = "report_dvd-r.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146368,
-                MD5       = "c20217c0356fcd074c33b5f4b1355914",
-                LongMD5   = "c20217c0356fcd074c33b5f4b1355914",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0 /*,
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0 /*,
                         Number  = 1,
                         FileSystems = new[]
                         {
@@ -996,26 +996,26 @@ namespace Aaru.Tests.Images
                                 VolumeName  = "SU1100.001"
                             }
                         }*/
-                    }
                 }
-            },
+            }
+        },
 
-            // TODO: Needs redump, corrupted image
-            new OpticalImageTestExpected
+        // TODO: Needs redump, corrupted image
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdrom.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146368,
+            MD5       = "0a49394278360f737a22e48ef125d7cd",
+            LongMD5   = "0a49394278360f737a22e48ef125d7cd",
+            Tracks = new[]
             {
-                TestFile  = "report_dvdrom.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146368,
-                MD5       = "0a49394278360f737a22e48ef125d7cd",
-                LongMD5   = "0a49394278360f737a22e48ef125d7cd",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0 /*,
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0 /*,
                         Number  = 1,
                         FileSystems = new[]
                         {
@@ -1028,26 +1028,26 @@ namespace Aaru.Tests.Images
                                 VolumeName  = "SU1100.001"
                             }
                         }*/
-                    }
                 }
-            },
+            }
+        },
 
-            // TODO: Needs redump, corrupted image
-            new OpticalImageTestExpected
+        // TODO: Needs redump, corrupted image
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+rw.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2295104,
+            MD5       = "4d0cac3a6f56c581870de38682408f95",
+            LongMD5   = "4d0cac3a6f56c581870de38682408f95",
+            Tracks = new[]
             {
-                TestFile  = "report_dvd+rw.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2295104,
-                MD5       = "4d0cac3a6f56c581870de38682408f95",
-                LongMD5   = "4d0cac3a6f56c581870de38682408f95",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2295103,
-                        Pregap  = 0 /*,
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2295103,
+                    Pregap  = 0 /*,
                         Number  = 1,
                         FileSystems = new[]
                         {
@@ -1060,26 +1060,26 @@ namespace Aaru.Tests.Images
                                 VolumeName  = "SU1100.001"
                             }
                         }*/
-                    }
                 }
-            },
+            }
+        },
 
-            // TODO: Needs redump, corrupted image
-            new OpticalImageTestExpected
+        // TODO: Needs redump, corrupted image
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-rw.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146368,
+            MD5       = "4844a94a97027b0fea664a1fba3ecbb2",
+            LongMD5   = "4844a94a97027b0fea664a1fba3ecbb2",
+            Tracks = new[]
             {
-                TestFile  = "report_dvd-rw.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146368,
-                MD5       = "4844a94a97027b0fea664a1fba3ecbb2",
-                LongMD5   = "4844a94a97027b0fea664a1fba3ecbb2",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0 /*,
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0 /*,
                         Number  = 1,
                         FileSystems = new[]
                         {
@@ -1092,349 +1092,349 @@ namespace Aaru.Tests.Images
                                 VolumeName  = "SU1100.001"
                             }
                         }*/
-                    }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_enhancedcd.mds",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 303316,
+            MD5           = "7246ab63afe862677302929fb3514676",
+            LongMD5       = "797e7cb29028763ab827212d8630cb50",
+            SubchannelMD5 = "ceee6cf49071da484dd995c50a0b09fb",
+            Tracks = new[]
             {
-                TestFile      = "report_enhancedcd.mds",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 303316,
-                MD5           = "7246ab63afe862677302929fb3514676",
-                LongMD5       = "797e7cb29028763ab827212d8630cb50",
-                SubchannelMD5 = "ceee6cf49071da484dd995c50a0b09fb",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 14,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 14,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_audiocd_cdtext.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 277696,
+            MD5           = "7c8fc7bb768cff15d702ac8cd10108d7",
+            LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
+            SubchannelMD5 = "ca781a7afc4eb77c51f7c551ed45c03c",
+            Tracks = new[]
             {
-                TestFile      = "test_audiocd_cdtext.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 277696,
-                MD5           = "7c8fc7bb768cff15d702ac8cd10108d7",
-                LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
-                SubchannelMD5 = "ca781a7afc4eb77c51f7c551ed45c03c",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 0,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_enhancedcd.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 59206,
+            MD5           = "947139fcc9924337f11040945ee8f1f7",
+            LongMD5       = "5d755e3ea7c66f81a381b9c59168107a",
+            SubchannelMD5 = "84cb28d835c25e51fdcb6c2291707786",
+            Tracks = new[]
             {
-                TestFile      = "test_enhancedcd.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 59206,
-                MD5           = "947139fcc9924337f11040945ee8f1f7",
-                LongMD5       = "5d755e3ea7c66f81a381b9c59168107a",
-                SubchannelMD5 = "84cb28d835c25e51fdcb6c2291707786",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14404,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14405,
+                    End     = 28952,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 40203,
+                    End     = 59205,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14404,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14405,
-                        End     = 28952,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 40203,
-                        End     = 59205,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 18853,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New"
-                            }
+                            Clusters    = 18853,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_incd_udf200_finalized.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 350134,
+            MD5           = "f95d6f978ddb4f98bbffda403f627fe1",
+            LongMD5       = "6751e0ae7821f92221672b1cd5a1ff36",
+            SubchannelMD5 = "65f938f7f9ac34fabd3ab94c14eb76b5",
+            Tracks = new[]
             {
-                TestFile      = "test_incd_udf200_finalized.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 350134,
-                MD5           = "f95d6f978ddb4f98bbffda403f627fe1",
-                LongMD5       = "6751e0ae7821f92221672b1cd5a1ff36",
-                SubchannelMD5 = "65f938f7f9ac34fabd3ab94c14eb76b5",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 7,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 7,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 600,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "INCD"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 350134,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "InCD",
-                                VolumeSerial = "40888C15CA13D401InCD"
-                            }
+                            Clusters    = 600,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "INCD"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 350134,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "InCD",
+                            VolumeSerial = "40888C15CA13D401InCD"
                         }
                     }
                 }
-            },
+            }
+        },
 
-            // TODO: Needs redump, corrupted image
-            new OpticalImageTestExpected
+        // TODO: Needs redump, corrupted image
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.mds",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 329158,
+            MD5           = "064afaa489a2f402f42aaf9b546a3fef",
+            LongMD5       = "4d02563f72bdfbbf5a41bacf7a0fe916",
+            SubchannelMD5 = "e5e51af5f0a689f956ffc52df2949e71",
+            Tracks = new[]
             {
-                TestFile      = "test_multi_karaoke_sampler.mds",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 329158,
-                MD5           = "064afaa489a2f402f42aaf9b546a3fef",
-                LongMD5       = "4d02563f72bdfbbf5a41bacf7a0fe916",
-                SubchannelMD5 = "e5e51af5f0a689f956ffc52df2949e71",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4 /*,
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4 /*,
                         Number  = 1,
                         FileSystems = new[]
                         {
@@ -1446,801 +1446,800 @@ namespace Aaru.Tests.Images
                                 VolumeName  = ""
                             }
                         }*/
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32748,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multiple_indexes.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 65536,
-                MD5           = "1b13a8f8aeb23f0b8bbc68518217e771",
-                LongMD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
-                SubchannelMD5 = "25bae9e30657e2f64a45e5f690e3ae9e",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4803,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4804,
-                        End     = 13874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13875,
-                        End     = 41184,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41185,
-                        End     = 54988,
-                        Pregap  = 0,
-                        Flags   = 8
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 0,
-                        Flags   = 1
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multisession_dvd+r.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 230624,
-                MD5       = "020993315e49ab0d36bc7248819162ea",
-                LongMD5   = "020993315e49ab0d36bc7248819162ea",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32748,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multiple_indexes.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 65536,
+            MD5           = "1b13a8f8aeb23f0b8bbc68518217e771",
+            LongMD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
+            SubchannelMD5 = "25bae9e30657e2f64a45e5f690e3ae9e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4803,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4804,
+                    End     = 13874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13875,
+                    End     = 41184,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41185,
+                    End     = 54988,
+                    Pregap  = 0,
+                    Flags   = 8
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 0,
+                    Flags   = 1
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multisession_dvd+r.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 230624,
+            MD5       = "020993315e49ab0d36bc7248819162ea",
+            LongMD5   = "020993315e49ab0d36bc7248819162ea",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 230623,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 230623,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 22016,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            }
+                            Clusters    = 22016,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multisession_dvd-r.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 257264,
+            MD5       = "dff8f2107a4ea9633a88ce38ff609b8e",
+            LongMD5   = "dff8f2107a4ea9633a88ce38ff609b8e",
+            Tracks = new[]
             {
-                TestFile  = "test_multisession_dvd-r.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 257264,
-                MD5       = "dff8f2107a4ea9633a88ce38ff609b8e",
-                LongMD5   = "dff8f2107a4ea9633a88ce38ff609b8e",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 257263,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 257263,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 206560,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            }
+                            Clusters    = 206560,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 51168,
+            MD5           = "236f95016ad395ba691517d35a05b767",
+            LongMD5       = "8c48c8951229fd083c1aafcb3e062f2b",
+            SubchannelMD5 = "5731d17924f9fa8934c1e1ac076c6259",
+            Tracks = new[]
             {
-                TestFile      = "test_multisession.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 51168,
-                MD5           = "236f95016ad395ba691517d35a05b767",
-                LongMD5       = "8c48c8951229fd083c1aafcb3e062f2b",
-                SubchannelMD5 = "5731d17924f9fa8934c1e1ac076c6259",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 7876,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 8133,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 1",
-                                VolumeSerial = "50958B61AF6A749E"
-                            }
+                            Clusters    = 7876,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 8133,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 1",
+                            VolumeSerial = "50958B61AF6A749E"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 6170,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 2"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6427,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 2",
-                                VolumeSerial = "50958BBBAF6A7444"
-                            }
+                            Clusters    = 6170,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 2"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6427,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 2",
+                            VolumeSerial = "50958BBBAF6A7444"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 5360,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 3"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 5618,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "Session 3",
-                                VolumeSerial = "50958C19AF6A73E6"
-                            }
+                            Clusters    = 5360,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 3"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 5618,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "Session 3",
+                            VolumeSerial = "50958C19AF6A73E6"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 4,
+                    FileSystems = new[]
                     {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 4,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 45796,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 4"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 5790,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.60",
-                                VolumeName   = "Session 4",
-                                VolumeSerial = "50958C82AF6A737D"
-                            }
+                            Clusters    = 45796,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 4"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 5790,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.60",
+                            VolumeName   = "Session 4",
+                            VolumeSerial = "50958C82AF6A737D"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 48794,
+            MD5           = "ab3cf9dfcc3e79c57e11e4675655d5e2",
+            LongMD5       = "cadb31c693c0996f50ba47e262d84518",
+            SubchannelMD5 = "4da6d2891fc0f916c1d6cd6eebe4586a",
+            Tracks = new[]
             {
-                TestFile      = "test_videocd.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 48794,
-                MD5           = "ab3cf9dfcc3e79c57e11e4675655d5e2",
-                LongMD5       = "cadb31c693c0996f50ba47e262d84518",
-                SubchannelMD5 = "4da6d2891fc0f916c1d6cd6eebe4586a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1101,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1101,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1102,
-                        End     = 48793,
-                        Pregap  = 150,
-                        Flags   = 4
                     }
-                }
-            },
-            #region These test images violate the specifications and are not expected to work yet
-            /*
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_all_tracks_are_track_1.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 51078,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 25539,
-                        End     = 51077,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 1102,
+                    End     = 48793,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        #region These test images violate the specifications and are not expected to work yet
+        /*
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_all_tracks_are_track_1.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 51078,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_castrated_leadout.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 1050,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 1049,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 25539,
+                    End     = 51077,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_castrated_leadout.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 1050,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_data_track_as_audio_fixed_sub.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 62385,
-                MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
-                LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
-                SubchannelMD5 = "77778d0e72a499b6c22f75df11a8d97f",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36939,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 1049,
+                    Pregap  = 0,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio_fixed_sub.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 62385,
+            MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
+            LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
+            SubchannelMD5 = "77778d0e72a499b6c22f75df11a8d97f",
+            Tracks = new[]
             {
-                TestFile      = "test_data_track_as_audio.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 62385,
-                MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
-                LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
-                SubchannelMD5 = "5479a1115bb6481db69fd6262e8c6076",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36939,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36939,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 62385,
+            MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
+            LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
+            SubchannelMD5 = "5479a1115bb6481db69fd6262e8c6076",
+            Tracks = new[]
             {
-                TestFile      = "test_track0_in_session2.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 25539,
-                MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
-                LongMD5       = "3b3172070738044417ae5284195acbfd",
-                SubchannelMD5 = "7eedb60edb3dc77eac41fd8f2214dfb8",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36939,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track0_in_session2.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 25539,
+            MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
+            LongMD5       = "3b3172070738044417ae5284195acbfd",
+            SubchannelMD5 = "7eedb60edb3dc77eac41fd8f2214dfb8",
+            Tracks = new[]
             {
-                TestFile      = "test_track111_in_session2_fixed_sub.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 25539,
-                MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
-                LongMD5       = "396f86cdd8bfb012b68eabd5a94f604b",
-                SubchannelMD5 = "c81a161af0fcd01dfd340290178a32fd",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track111_in_session2_fixed_sub.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 25539,
+            MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
+            LongMD5       = "396f86cdd8bfb012b68eabd5a94f604b",
+            SubchannelMD5 = "c81a161af0fcd01dfd340290178a32fd",
+            Tracks = new[]
             {
-                TestFile      = "test_track111_in_session2.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 25539,
-                MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
-                LongMD5       = "76175679c852073137299c5ca7b113e4",
-                SubchannelMD5 = "8a3b37786d5276529c8cdbbf57e2d528",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track111_in_session2.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 25539,
+            MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
+            LongMD5       = "76175679c852073137299c5ca7b113e4",
+            SubchannelMD5 = "8a3b37786d5276529c8cdbbf57e2d528",
+            Tracks = new[]
             {
-                TestFile      = "test_track1_2_9_fixed_sub.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 25539,
-                MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
-                LongMD5       = "6ff84bf8ecf2624fbaba37df08462294",
-                SubchannelMD5 = "b6051aa115a91c08de0ffc47ca64275e",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13349,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13350,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track1_2_9_fixed_sub.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 25539,
+            MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
+            LongMD5       = "6ff84bf8ecf2624fbaba37df08462294",
+            SubchannelMD5 = "b6051aa115a91c08de0ffc47ca64275e",
+            Tracks = new[]
             {
-                TestFile      = "test_track1_2_9.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 25539,
-                MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
-                LongMD5       = "3b3172070738044417ae5284195acbfd",
-                SubchannelMD5 = "ee1a81152b386347dc656697d8f50ab9",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13349,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13350,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13349,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13350,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track1_2_9.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 25539,
+            MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
+            LongMD5       = "3b3172070738044417ae5284195acbfd",
+            SubchannelMD5 = "ee1a81152b386347dc656697d8f50ab9",
+            Tracks = new[]
             {
-                TestFile      = "test_track2_inside_leadout.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 25539,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 62234,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 62385,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13349,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13350,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_leadout.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 25539,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_track2_inside_session2_leadin.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 62385,
-                MD5           = "6fa06c10561343438736a8d3d9a965ea",
-                LongMD5       = "608a73cd10bccdadde68523aead1ee72",
-                SubchannelMD5 = "933f1699ba88a70aff5062f9626ef529",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25499,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 25500,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 36939,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 62234,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 62385,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_session2_leadin.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 62385,
+            MD5           = "6fa06c10561343438736a8d3d9a965ea",
+            LongMD5       = "608a73cd10bccdadde68523aead1ee72",
+            SubchannelMD5 = "933f1699ba88a70aff5062f9626ef529",
+            Tracks = new[]
             {
-                TestFile      = "test_track2_inside_track1.mds",
-                MediaType     = MediaType.CDR,
-                Sectors       = 62385,
-                MD5           = "6fa06c10561343438736a8d3d9a965ea",
-                LongMD5       = "c82d20702d31bc15bdc91f7e107862ae",
-                SubchannelMD5 = "d8eed571f137c92f22bb858d78fc1e41",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13349,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13350,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 36939,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25499,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 25500,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 36939,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },*/
-            #endregion
-        };
-    }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_track1.mds",
+            MediaType     = MediaType.CDR,
+            Sectors       = 62385,
+            MD5           = "6fa06c10561343438736a8d3d9a965ea",
+            LongMD5       = "c82d20702d31bc15bdc91f7e107862ae",
+            SubchannelMD5 = "d8eed571f137c92f22bb858d78fc1e41",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13349,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13350,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 36939,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },*/
+        #endregion
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/Anex86.cs b/Aaru.Tests/Images/Anex86.cs
index 5ad4610ae..89b8fa1ee 100644
--- a/Aaru.Tests/Images/Anex86.cs
+++ b/Aaru.Tests/Images/Anex86.cs
@@ -31,138 +31,137 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class Anex86 : BlockMediaImageTest
-    {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Anex86");
-        public override IMediaImage _plugin    => new DiscImages.Anex86();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Anex86 : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Anex86");
+    public override IMediaImage _plugin    => new DiscImages.Anex86();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "anex86_10mb.hdi.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 40920,
+            SectorSize = 256,
+            MD5        = "1c5387e38e58165c517c059e5d48905d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "anex86_15mb.hdi.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 61380,
+            SectorSize = 256,
+            MD5        = "a84366658c1c3bd09af4d0d42fbf716e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "anex86_20mb.hdi.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 81840,
+            SectorSize = 256,
+            MD5        = "919c9eecf1b65b10870f617cb976668a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "anex86_30mb.hdi.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 121770,
+            SectorSize = 256,
+            MD5        = "02d35af02581afb2e56792dcaba2c1af"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "anex86_40mb.hdi.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 162360,
+            SectorSize = 256,
+            MD5        = "b8c3f858f1a9d300d3e74f36eea04354"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "anex86_5mb.hdi.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 20196,
+            SectorSize = 256,
+            MD5        = "c348bbbaf99fcb8c8e66de157aef62f4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "blank_md2hd.fdi.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "c3587f7020743067cf948c9d5c5edb27"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos33d_md2hd.fdi.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "a23874a4474334b035a24c6924140744"
+            /* TODO: NullReferenceException
+            Partitions = new[]
             {
-                TestFile   = "anex86_10mb.hdi.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 40920,
-                SectorSize = 256,
-                MD5        = "1c5387e38e58165c517c059e5d48905d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "anex86_15mb.hdi.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 61380,
-                SectorSize = 256,
-                MD5        = "a84366658c1c3bd09af4d0d42fbf716e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "anex86_20mb.hdi.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 81840,
-                SectorSize = 256,
-                MD5        = "919c9eecf1b65b10870f617cb976668a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "anex86_30mb.hdi.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 121770,
-                SectorSize = 256,
-                MD5        = "02d35af02581afb2e56792dcaba2c1af"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "anex86_40mb.hdi.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 162360,
-                SectorSize = 256,
-                MD5        = "b8c3f858f1a9d300d3e74f36eea04354"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "anex86_5mb.hdi.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 20196,
-                SectorSize = 256,
-                MD5        = "c348bbbaf99fcb8c8e66de157aef62f4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "blank_md2hd.fdi.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "c3587f7020743067cf948c9d5c5edb27"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos33d_md2hd.fdi.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "a23874a4474334b035a24c6924140744"
-                /* TODO: NullReferenceException
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos50_epson_md2hd.fdi.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "bc1ef3236e75cb09575037b884ee9dce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos50_md2hd.fdi.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "243036c4617b666a6c886cc23d7274e0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos62_md2hd.fdi.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "09bb2ff964a0c5c223a1900f085e3955",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
+                    Start  = 0,
+                    Length = 1232
                 }
             }
-        };
-    }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos50_epson_md2hd.fdi.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "bc1ef3236e75cb09575037b884ee9dce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos50_md2hd.fdi.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "243036c4617b666a6c886cc23d7274e0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos62_md2hd.fdi.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "09bb2ff964a0c5c223a1900f085e3955",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/AppleDOS/DOS.cs b/Aaru.Tests/Images/AppleDOS/DOS.cs
index 7b6b5632c..9bf9a26e4 100644
--- a/Aaru.Tests/Images/AppleDOS/DOS.cs
+++ b/Aaru.Tests/Images/AppleDOS/DOS.cs
@@ -32,81 +32,80 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.AppleDOS
-{
-    [TestFixture]
-    public class DOS : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple DOS Order");
-        public override IMediaImage _plugin => new AppleDos();
+namespace Aaru.Tests.Images.AppleDOS;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class DOS : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple DOS Order");
+    public override IMediaImage _plugin => new AppleDos();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "dos33.do.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "0ffcbd4180306192726926b43755db2f",
+            Partitions = new[]
             {
-                TestFile   = "dos33.do.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "0ffcbd4180306192726926b43755db2f",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 560
-                    }
+                    Start  = 0,
+                    Length = 560
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "hfs.do.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "ddd04ef378552c789f85382b4f49da06"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal800.do.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "5158e2fe9d8e7ae1f7db73156478e4f4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal.do.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos800.do.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "193c5cc22f07e5aeb96eb187cb59c2d9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos.do.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "23f42e529c9fde2a8033f1bc6a7bca93"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodosmod.do.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "a7ec980472c320da5ea6f2f0aec0f502"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "hfs.do.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "ddd04ef378552c789f85382b4f49da06"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal800.do.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "5158e2fe9d8e7ae1f7db73156478e4f4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal.do.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos800.do.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "193c5cc22f07e5aeb96eb187cb59c2d9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos.do.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "23f42e529c9fde2a8033f1bc6a7bca93"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodosmod.do.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "a7ec980472c320da5ea6f2f0aec0f502"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/AppleDOS/DOS32.cs b/Aaru.Tests/Images/AppleDOS/DOS32.cs
index 993b1c243..64c8b2d07 100644
--- a/Aaru.Tests/Images/AppleDOS/DOS32.cs
+++ b/Aaru.Tests/Images/AppleDOS/DOS32.cs
@@ -32,33 +32,32 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.AppleDOS
-{
-    [TestFixture]
-    public class DOS32 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple DOS 13 sectors");
-        public override IMediaImage _plugin => new AppleDos();
+namespace Aaru.Tests.Images.AppleDOS;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class DOS32 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple DOS 13 sectors");
+    public override IMediaImage _plugin => new AppleDos();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "alice.d13.lz",
+            MediaType  = MediaType.Apple32SS,
+            Sectors    = 455,
+            SectorSize = 256,
+            MD5        = "76f8fe4c5bc1976f99641ad7cdf53109",
+            Partitions = new[]
             {
-                TestFile   = "alice.d13.lz",
-                MediaType  = MediaType.Apple32SS,
-                Sectors    = 455,
-                SectorSize = 256,
-                MD5        = "76f8fe4c5bc1976f99641ad7cdf53109",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 455
-                    }
+                    Start  = 0,
+                    Length = 455
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/AppleDOS/ProDOS.cs b/Aaru.Tests/Images/AppleDOS/ProDOS.cs
index 97039cd12..4e25405d5 100644
--- a/Aaru.Tests/Images/AppleDOS/ProDOS.cs
+++ b/Aaru.Tests/Images/AppleDOS/ProDOS.cs
@@ -32,105 +32,104 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.AppleDOS
-{
-    [TestFixture]
-    public class ProDOS : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple ProDOS Order");
-        public override IMediaImage _plugin => new AppleDos();
+namespace Aaru.Tests.Images.AppleDOS;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class ProDOS : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apple ProDOS Order");
+    public override IMediaImage _plugin => new AppleDos();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "dos33.po.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "0ffcbd4180306192726926b43755db2f",
+            Partitions = new[]
             {
-                TestFile   = "dos33.po.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "0ffcbd4180306192726926b43755db2f",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 560
-                    }
+                    Start  = 0,
+                    Length = 560
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "hfs1440.po.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "2c0b397aa3fe23a52cf7908340739f78"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "hfs.po.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "ddd04ef378552c789f85382b4f49da06"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal800.po.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "5158e2fe9d8e7ae1f7db73156478e4f4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal.po.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos1440.po.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "55ff5838139c0e8fa3f904397dc22fa5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos5mb.po.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "137463bc1f758fb8f2c354b02603817b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos800.po.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "193c5cc22f07e5aeb96eb187cb59c2d9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodosmod.po.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "26d9c57e262f61c4eb6c150eefafe4c0"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos.po.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "hfs1440.po.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "2c0b397aa3fe23a52cf7908340739f78"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "hfs.po.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "ddd04ef378552c789f85382b4f49da06"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal800.po.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "5158e2fe9d8e7ae1f7db73156478e4f4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal.po.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos1440.po.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "55ff5838139c0e8fa3f904397dc22fa5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos5mb.po.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "137463bc1f758fb8f2c354b02603817b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos800.po.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "193c5cc22f07e5aeb96eb187cb59c2d9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodosmod.po.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "26d9c57e262f61c4eb6c150eefafe4c0"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos.po.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/AppleNIB.cs b/Aaru.Tests/Images/AppleNIB.cs
index 452278681..024d9797f 100644
--- a/Aaru.Tests/Images/AppleNIB.cs
+++ b/Aaru.Tests/Images/AppleNIB.cs
@@ -31,64 +31,63 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class AppleNib : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nibbles");
-        public override IMediaImage _plugin => new DiscImages.AppleNib();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class AppleNib : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nibbles");
+    public override IMediaImage _plugin    => new DiscImages.AppleNib();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "dos32.nib.lz",
+            MediaType  = MediaType.Apple32SS,
+            Sectors    = 455,
+            SectorSize = 256,
+            MD5        = "76f8fe4c5bc1976f99641ad7cdf53109",
+            Partitions = new[]
             {
-                TestFile   = "dos32.nib.lz",
-                MediaType  = MediaType.Apple32SS,
-                Sectors    = 455,
-                SectorSize = 256,
-                MD5        = "76f8fe4c5bc1976f99641ad7cdf53109",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 455
-                    }
+                    Start  = 0,
+                    Length = 455
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dos33.nib.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "0ffcbd4180306192726926b43755db2f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 560
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal.nib.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos.nib.lz",
-                MediaType  = MediaType.Apple33SS,
-                Sectors    = 560,
-                SectorSize = 256,
-                MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dos33.nib.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "0ffcbd4180306192726926b43755db2f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 560
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal.nib.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "4c4926103a32ac15f7e430ec3ced4be5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos.nib.lz",
+            MediaType  = MediaType.Apple33SS,
+            Sectors    = 560,
+            SectorSize = 256,
+            MD5        = "11ef56c80c94347d2e3f921d5c36c8de"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/Apridisk.cs b/Aaru.Tests/Images/Apridisk.cs
index 6f471b0d6..5bca61e76 100644
--- a/Aaru.Tests/Images/Apridisk.cs
+++ b/Aaru.Tests/Images/Apridisk.cs
@@ -31,80 +31,79 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class Apridisk : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apridisk");
-        public override IMediaImage _plugin => new DiscImages.Apridisk();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Apridisk : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Apridisk");
+    public override IMediaImage _plugin    => new DiscImages.Apridisk();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "apr00001.dsk.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "6c264287a3260a6d89e36dfcb1c98dce",
+            Partitions = new[]
             {
-                TestFile   = "apr00001.dsk.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "6c264287a3260a6d89e36dfcb1c98dce",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "apr00002.dsk.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "dd8e04939baeb0fcdb11ddade60c9a93",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "apr00006.dsk.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "89132d303ef6b0ff69f4cfd38e2a22a6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "apr00203.dsk.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "cd34832ca3aa7f55e0dd8ba126372f97",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
+                    Start  = 0,
+                    Length = 1440
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "apr00002.dsk.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "dd8e04939baeb0fcdb11ddade60c9a93",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "apr00006.dsk.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "89132d303ef6b0ff69f4cfd38e2a22a6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "apr00203.dsk.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "cd34832ca3aa7f55e0dd8ba126372f97",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/BaseMediaImageTest.cs b/Aaru.Tests/Images/BaseMediaImageTest.cs
index b6e6749d1..ca6ea6524 100644
--- a/Aaru.Tests/Images/BaseMediaImageTest.cs
+++ b/Aaru.Tests/Images/BaseMediaImageTest.cs
@@ -1,10 +1,9 @@
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.Tests.Images
+namespace Aaru.Tests.Images;
+
+public abstract class BaseMediaImageTest
 {
-    public abstract class BaseMediaImageTest
-    {
-        public abstract string      DataFolder { get; }
-        public abstract IMediaImage _plugin    { get; }
-    }
+    public abstract string      DataFolder { get; }
+    public abstract IMediaImage _plugin    { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/BlindWrite4.cs b/Aaru.Tests/Images/BlindWrite4.cs
index fdeb528e7..53187c2aa 100644
--- a/Aaru.Tests/Images/BlindWrite4.cs
+++ b/Aaru.Tests/Images/BlindWrite4.cs
@@ -31,1372 +31,1371 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class BlindWrite4 : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 4");
-        public override IMediaImage _plugin => new DiscImages.BlindWrite4();
+namespace Aaru.Tests.Images;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class BlindWrite4 : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 4");
+    public override IMediaImage _plugin => new DiscImages.BlindWrite4();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "cdiready_the_apprentice.BWT",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 279300,
+            MD5           = "e202d6851822b03b537f7b356e61ebcc",
+            LongMD5       = "e202d6851822b03b537f7b356e61ebcc",
+            SubchannelMD5 = "b158732e5396be73a25e2a12bce4ec28",
+            Tracks = new[]
             {
-                TestFile      = "cdiready_the_apprentice.BWT",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 279300,
-                MD5           = "e202d6851822b03b537f7b356e61ebcc",
-                LongMD5       = "e202d6851822b03b537f7b356e61ebcc",
-                SubchannelMD5 = "b158732e5396be73a25e2a12bce4ec28",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 88649,
-                        Pregap  = 69300,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88650,
-                        End     = 107474,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107475,
-                        End     = 112049,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112050,
-                        End     = 133499,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133500,
-                        End     = 138074,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138075,
-                        End     = 159674,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159675,
-                        End     = 164624,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164625,
-                        End     = 185249,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185250,
-                        End     = 189974,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 189975,
-                        End     = 208724,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208725,
-                        End     = 212849,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 212850,
-                        End     = 232049,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232050,
-                        End     = 236549,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236550,
-                        End     = 241724,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241725,
-                        End     = 255974,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 255975,
-                        End     = 256724,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256725,
-                        End     = 265499,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265500,
-                        End     = 267224,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267225,
-                        End     = 269849,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269850,
-                        End     = 271499,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271500,
-                        End     = 274124,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274125,
-                        End     = 279299,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 88649,
+                    Pregap  = 69300,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88650,
+                    End     = 107474,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107475,
+                    End     = 112049,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112050,
+                    End     = 133499,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133500,
+                    End     = 138074,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138075,
+                    End     = 159674,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159675,
+                    End     = 164624,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164625,
+                    End     = 185249,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185250,
+                    End     = 189974,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 189975,
+                    End     = 208724,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208725,
+                    End     = 212849,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 212850,
+                    End     = 232049,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232050,
+                    End     = 236549,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236550,
+                    End     = 241724,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241725,
+                    End     = 255974,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 255975,
+                    End     = 256724,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256725,
+                    End     = 265499,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265500,
+                    End     = 267224,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267225,
+                    End     = 269849,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269850,
+                    End     = 271499,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271500,
+                    End     = 274124,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274125,
+                    End     = 279299,
+                    Pregap  = 150,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.BWT",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "2cf7f3f06c28032f7609aaab970c001f",
+            Tracks = new[]
             {
-                TestFile      = "report_audiocd.BWT",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "2cf7f3f06c28032f7609aaab970c001f",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16398,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16399,
-                        End     = 29900,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29901,
-                        End     = 47799,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47800,
-                        End     = 63163,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63164,
-                        End     = 78774,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78775,
-                        End     = 94581,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94582,
-                        End     = 116974,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 116975,
-                        End     = 136015,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136016,
-                        End     = 153921,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153922,
-                        End     = 170600,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170601,
-                        End     = 186388,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186389,
-                        End     = 201648,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201649,
-                        End     = 224298,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224299,
-                        End     = 247072,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16398,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16399,
+                    End     = 29900,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29901,
+                    End     = 47799,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47800,
+                    End     = 63163,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63164,
+                    End     = 78774,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78775,
+                    End     = 94581,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94582,
+                    End     = 116974,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 116975,
+                    End     = 136015,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136016,
+                    End     = 153921,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153922,
+                    End     = 170600,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170601,
+                    End     = 186388,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186389,
+                    End     = 201648,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201649,
+                    End     = 224298,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224299,
+                    End     = 247072,
+                    Pregap  = 150,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.BWT",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "00c0dd9095dcc8ac17246dd56d2a368c",
+            Tracks = new[]
             {
-                TestFile      = "report_cdr.BWT",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "00c0dd9095dcc8ac17246dd56d2a368c",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.BWT",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "00c0dd9095dcc8ac17246dd56d2a368c",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrom.BWT",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "00c0dd9095dcc8ac17246dd56d2a368c",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.BWT",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "3aa50e929756b926e7471255fd1aa894",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrw.BWT",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "3aa50e929756b926e7471255fd1aa894",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_enhancedcd.BWT",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 303316,
+            MD5           = "c15f0beeed08f943cfc50c3246334dd2",
+            LongMD5       = "1aab899e2965a74763b1bb232ff8bf21",
+            SubchannelMD5 = "d5a424eedad28620468f215d5b24d453",
+            Tracks = new[]
             {
-                TestFile      = "report_enhancedcd.BWT",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 303316,
-                MD5           = "c15f0beeed08f943cfc50c3246334dd2",
-                LongMD5       = "1aab899e2965a74763b1bb232ff8bf21",
-                SubchannelMD5 = "d5a424eedad28620468f215d5b24d453",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15510,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15511,
+                    End     = 33808,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33809,
+                    End     = 51179,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51180,
+                    End     = 71822,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71823,
+                    End     = 87431,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87432,
+                    End     = 103154,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103155,
+                    End     = 117540,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117541,
+                    End     = 136016,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136017,
+                    End     = 153267,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153268,
+                    End     = 166781,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166782,
+                    End     = 186962,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186963,
+                    End     = 201290,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201291,
+                    End     = 222779,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 14,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15510,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15511,
-                        End     = 33808,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33809,
-                        End     = 51179,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51180,
-                        End     = 71822,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71823,
-                        End     = 87431,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87432,
-                        End     = 103154,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103155,
-                        End     = 117540,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117541,
-                        End     = 136016,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136017,
-                        End     = 153267,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153268,
-                        End     = 166781,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166782,
-                        End     = 186962,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186963,
-                        End     = 201290,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201291,
-                        End     = 222779,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 14,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_audiocd_cdtext.BWT",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 277696,
+            MD5           = "7c8fc7bb768cff15d702ac8cd10108d7",
+            LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
+            SubchannelMD5 = "4637654a333c5917232b343ba465fba0",
+            Tracks = new[]
             {
-                TestFile      = "test_audiocd_cdtext.BWT",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 277696,
-                MD5           = "7c8fc7bb768cff15d702ac8cd10108d7",
-                LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
-                SubchannelMD5 = "4637654a333c5917232b343ba465fba0",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29751,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29752,
-                        End     = 65033,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65034,
-                        End     = 78425,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78426,
-                        End     = 95079,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95080,
-                        End     = 126146,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126147,
-                        End     = 154958,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154959,
-                        End     = 191684,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191685,
-                        End     = 222775,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222776,
-                        End     = 243437,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243438,
-                        End     = 269599,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269600,
-                        End     = 277695,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29751,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29752,
+                    End     = 65033,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65034,
+                    End     = 78425,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78426,
+                    End     = 95079,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95080,
+                    End     = 126146,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126147,
+                    End     = 154958,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154959,
+                    End     = 191684,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191685,
+                    End     = 222775,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222776,
+                    End     = 243437,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243438,
+                    End     = 269599,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269600,
+                    End     = 277695,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_enhancedcd.BWT",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 59206,
+            MD5           = "c0cdd94f1488226d37f0398eef75eb4c",
+            LongMD5       = "843302a664a074dc4c02b27e53eb228a",
+            SubchannelMD5 = "fd13f0194b8e141d4384abf1ad00fbf2",
+            Tracks = new[]
             {
-                TestFile      = "test_enhancedcd.BWT",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 59206,
-                MD5           = "c0cdd94f1488226d37f0398eef75eb4c",
-                LongMD5       = "843302a664a074dc4c02b27e53eb228a",
-                SubchannelMD5 = "fd13f0194b8e141d4384abf1ad00fbf2",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14254,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14255,
+                    End     = 28952,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 40203,
+                    End     = 59205,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14254,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14255,
-                        End     = 28952,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 40203,
-                        End     = 59205,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 18853,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New"
-                            }
+                            Clusters    = 18853,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_incd_udf200_finalized.BWT",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 350134,
+            MD5           = "f95d6f978ddb4f98bbffda403f627fe1",
+            LongMD5       = "6751e0ae7821f92221672b1cd5a1ff36",
+            SubchannelMD5 = "d651d48c8839ad94f0a285660999db00",
+            Tracks = new[]
             {
-                TestFile      = "test_incd_udf200_finalized.BWT",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 350134,
-                MD5           = "f95d6f978ddb4f98bbffda403f627fe1",
-                LongMD5       = "6751e0ae7821f92221672b1cd5a1ff36",
-                SubchannelMD5 = "d651d48c8839ad94f0a285660999db00",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 7,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 7,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 600,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "INCD"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 399371,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "InCD",
-                                VolumeSerial = "40888C15CA13D401InCD"
-                            }
+                            Clusters    = 600,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "INCD"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 399371,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "InCD",
+                            VolumeSerial = "40888C15CA13D401InCD"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.BWT",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 329158,
+            MD5           = "a34e29e42b60023a6ae59f37d2bd4bea",
+            LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
+            SubchannelMD5 = "00045e5e72d806f84fb363e4ae73cf46",
+            Tracks = new[]
             {
-                TestFile      = "test_multi_karaoke_sampler.BWT",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 329158,
-                MD5           = "a34e29e42b60023a6ae59f37d2bd4bea",
-                LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
-                SubchannelMD5 = "00045e5e72d806f84fb363e4ae73cf46",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329157,
-                        Pregap  = 150,
-                        Flags   = 4
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multiple_indexes.BWT",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 65536,
-                MD5           = "1b13a8f8aeb23f0b8bbc68518217e771",
-                LongMD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
-                SubchannelMD5 = "2ff4170eafb73c4be3a81c35f37e9c3d",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329157,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multiple_indexes.BWT",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 65536,
+            MD5           = "1b13a8f8aeb23f0b8bbc68518217e771",
+            LongMD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
+            SubchannelMD5 = "2ff4170eafb73c4be3a81c35f37e9c3d",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4653,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4654,
+                    End     = 13724,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13725,
+                    End     = 41034,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41035,
+                    End     = 54838,
+                    Pregap  = 150,
+                    Flags   = 8
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54839,
+                    End     = 65535,
+                    Pregap  = 150,
+                    Flags   = 1
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.BWT",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 51168,
+            MD5           = "e2e19cf38891e67a0829d01842b4052e",
+            LongMD5       = "3e646a04eb29a8e0ad892b6ac00ba962",
+            SubchannelMD5 = "b0b18100d5d38211f057bd3781407fc6",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4653,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4654,
-                        End     = 13724,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13725,
-                        End     = 41034,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41035,
-                        End     = 54838,
-                        Pregap  = 150,
-                        Flags   = 8
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54839,
-                        End     = 65535,
-                        Pregap  = 150,
-                        Flags   = 1
+                        new FileSystemTest
+                        {
+                            Clusters    = 7876,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 9276,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 1",
+                            VolumeSerial = "50958B61AF6A749E"
+                        }
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession.BWT",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 51168,
-                MD5           = "e2e19cf38891e67a0829d01842b4052e",
-                LongMD5       = "3e646a04eb29a8e0ad892b6ac00ba962",
-                SubchannelMD5 = "b0b18100d5d38211f057bd3781407fc6",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 7876,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 9276,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 1",
-                                VolumeSerial = "50958B61AF6A749E"
-                            }
+                            Clusters    = 6170,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 2"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 7330,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 2",
+                            VolumeSerial = "50958BBBAF6A7444"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 6170,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 2"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 7330,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 2",
-                                VolumeSerial = "50958BBBAF6A7444"
-                            }
+                            Clusters    = 5360,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 3"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6408,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "Session 3",
+                            VolumeSerial = "50958C19AF6A73E6"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 4,
+                    FileSystems = new[]
                     {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 5360,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 3"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6408,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "Session 3",
-                                VolumeSerial = "50958C19AF6A73E6"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 4,
-                        FileSystems = new[]
+                            Clusters    = 45796,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 4"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 45796,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 4"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6604,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.60",
-                                VolumeName   = "Session 4",
-                                VolumeSerial = "50958C82AF6A737D"
-                            }
+                            Clusters     = 6604,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.60",
+                            VolumeName   = "Session 4",
+                            VolumeSerial = "50958C82AF6A737D"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.BWT",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 48794,
+            MD5           = "67ed7ec2aac06b56b4d693146d64adb7",
+            LongMD5       = "84c5329e55e3cc8c125c636c71ba2c17",
+            SubchannelMD5 = "5027417c4cbb4975482b902c57232dfb",
+            Tracks = new[]
             {
-                TestFile      = "test_videocd.BWT",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 48794,
-                MD5           = "67ed7ec2aac06b56b4d693146d64adb7",
-                LongMD5       = "84c5329e55e3cc8c125c636c71ba2c17",
-                SubchannelMD5 = "5027417c4cbb4975482b902c57232dfb",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1101,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1101,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1102,
-                        End     = 48793,
-                        Pregap  = 150,
-                        Flags   = 4
                     }
-                }
-            },
-            #region These test images violate the specifications and are not expected to work yet
-            /*
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_all_tracks_are_track1.BWT",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 1102,
+                    End     = 48793,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        #region These test images violate the specifications and are not expected to work yet
+        /*
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_all_tracks_are_track1.BWT",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_castrated_leadout.BWT",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 269750,
-                MD5           = "b91cad51e94fa20b3108bde2fa846b2d",
-                LongMD5       = "b91cad51e94fa20b3108bde2fa846b2d",
-                SubchannelMD5 = "03f4de8844777f08a7114e4c28eb3d09",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29751,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29752,
-                        End     = 65033,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65034,
-                        End     = 78425,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78426,
-                        End     = 95079,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95080,
-                        End     = 126146,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126147,
-                        End     = 154958,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154959,
-                        End     = 191684,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191685,
-                        End     = 222775,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222776,
-                        End     = 243437,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243438,
-                        End     = 269599,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269600,
-                        End     = 269749,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_castrated_leadout.BWT",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 269750,
+            MD5           = "b91cad51e94fa20b3108bde2fa846b2d",
+            LongMD5       = "b91cad51e94fa20b3108bde2fa846b2d",
+            SubchannelMD5 = "03f4de8844777f08a7114e4c28eb3d09",
+            Tracks = new[]
             {
-                TestFile      = "test_data_track_as_audio.BWT",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "9d4baa88af74fea2a372f65e9d03f719",
-                LongMD5       = "44bcce47a30f7ee6aa20c7a612d63b34",
-                SubchannelMD5 = "f9576f95faf9d6874642ad0a3033e0f5",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29751,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29752,
+                    End     = 65033,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65034,
+                    End     = 78425,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78426,
+                    End     = 95079,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95080,
+                    End     = 126146,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126147,
+                    End     = 154958,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154959,
+                    End     = 191684,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191685,
+                    End     = 222775,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222776,
+                    End     = 243437,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243438,
+                    End     = 269599,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269600,
+                    End     = 269749,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio.BWT",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "9d4baa88af74fea2a372f65e9d03f719",
+            LongMD5       = "44bcce47a30f7ee6aa20c7a612d63b34",
+            SubchannelMD5 = "f9576f95faf9d6874642ad0a3033e0f5",
+            Tracks = new[]
             {
-                TestFile      = "test_data_track_as_audio_fixed_sub.BWT",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "9d4baa88af74fea2a372f65e9d03f719",
-                LongMD5       = "44bcce47a30f7ee6aa20c7a612d63b34",
-                SubchannelMD5 = "f9576f95faf9d6874642ad0a3033e0f5",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio_fixed_sub.BWT",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "9d4baa88af74fea2a372f65e9d03f719",
+            LongMD5       = "44bcce47a30f7ee6aa20c7a612d63b34",
+            SubchannelMD5 = "f9576f95faf9d6874642ad0a3033e0f5",
+            Tracks = new[]
             {
-                TestFile      = "test_disc_starts_at_track2.BWT",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "807b4b5fb725a4bd2c3820e5d51b39ac",
-                LongMD5       = "292c210e3f7ee29f0c75097477a2f29c",
-                SubchannelMD5 = "f9576f95faf9d6874642ad0a3033e0f5",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_disc_starts_at_track2.BWT",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "807b4b5fb725a4bd2c3820e5d51b39ac",
+            LongMD5       = "292c210e3f7ee29f0c75097477a2f29c",
+            SubchannelMD5 = "f9576f95faf9d6874642ad0a3033e0f5",
+            Tracks = new[]
             {
-                TestFile      = "test_track2_inside_track1.BWT",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "1474ba6a5dba04e711fe4008503877ff",
-                LongMD5       = "539aea27a6c9b8b507ffc9d942c9df92",
-                SubchannelMD5 = "f9576f95faf9d6874642ad0a3033e0f5",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13199,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13200,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            */
-            #endregion
-        };
-    }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_track1.BWT",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "1474ba6a5dba04e711fe4008503877ff",
+            LongMD5       = "539aea27a6c9b8b507ffc9d942c9df92",
+            SubchannelMD5 = "f9576f95faf9d6874642ad0a3033e0f5",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13199,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13200,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        */
+        #endregion
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/BlindWrite5.cs b/Aaru.Tests/Images/BlindWrite5.cs
index 1d7403a3d..1ed007da1 100644
--- a/Aaru.Tests/Images/BlindWrite5.cs
+++ b/Aaru.Tests/Images/BlindWrite5.cs
@@ -31,1338 +31,1337 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class BlindWrite5 : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 5");
-        public override IMediaImage _plugin => new DiscImages.BlindWrite5();
+namespace Aaru.Tests.Images;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class BlindWrite5 : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 5");
+    public override IMediaImage _plugin => new DiscImages.BlindWrite5();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile  = "dvdrom.B5T",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2287072,
+            MD5       = "b9b0b4318e6264c405c3f96128901815",
+            LongMD5   = "b9b0b4318e6264c405c3f96128901815",
+            Tracks = new[]
             {
-                TestFile  = "dvdrom.B5T",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2287072,
-                MD5       = "b9b0b4318e6264c405c3f96128901815",
-                LongMD5   = "b9b0b4318e6264c405c3f96128901815",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2287071,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2287071,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 2287072,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "GuiaRaw"
-                            }
+                            Clusters    = 2287072,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "GuiaRaw"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "gigarec.B5T",
+            MediaType     = MediaType.CDR,
+            Sectors       = 469652,
+            MD5           = "e2e967adc0e5c530964ac4eebe8cac47",
+            LongMD5       = "1dc7801008110af6b8015aad64d91739",
+            SubchannelMD5 = "26c27541d0d55fe9a87f3f7de622466d",
+            Tracks = new[]
             {
-                TestFile      = "gigarec.B5T",
-                MediaType     = MediaType.CDR,
-                Sectors       = 469652,
-                MD5           = "e2e967adc0e5c530964ac4eebe8cac47",
-                LongMD5       = "1dc7801008110af6b8015aad64d91739",
-                SubchannelMD5 = "26c27541d0d55fe9a87f3f7de622466d",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 469651,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 469651,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 469652,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New Volume"
-                            }
+                            Clusters    = 469652,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New Volume"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "jaguarcd.B5T",
+            MediaType = MediaType.CDDA,
+            Sectors   = 243587,
+            MD5       = "3dd5bd0f7d95a40d411761d69255567a",
+            LongMD5   = "3dd5bd0f7d95a40d411761d69255567a",
+            Tracks = new[]
             {
-                TestFile  = "jaguarcd.B5T",
-                MediaType = MediaType.CDDA,
-                Sectors   = 243587,
-                MD5       = "3dd5bd0f7d95a40d411761d69255567a",
-                LongMD5   = "3dd5bd0f7d95a40d411761d69255567a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16239,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 27490,
-                        End     = 28236,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 28237,
-                        End     = 78891,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 78892,
-                        End     = 100053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 100054,
-                        End     = 133202,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 133203,
-                        End     = 160907,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 160908,
-                        End     = 181465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 181466,
-                        End     = 202023,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 202024,
-                        End     = 222581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 222582,
-                        End     = 243139,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 243140,
-                        End     = 243586,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16239,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 27490,
+                    End     = 28236,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 28237,
+                    End     = 78891,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 78892,
+                    End     = 100053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 100054,
+                    End     = 133202,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 133203,
+                    End     = 160907,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 160908,
+                    End     = 181465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 181466,
+                    End     = 202023,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 202024,
+                    End     = 222581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 222582,
+                    End     = 243139,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 243140,
+                    End     = 243586,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "pcengine.B5T",
+            MediaType = MediaType.CD,
+            Sectors   = 160956,
+            MD5       = "4f5165069b3c5f11afe5f59711bd945d",
+            LongMD5   = "fd30db9486f67654179c90c8a5052edb",
+            Tracks = new[]
             {
-                TestFile  = "pcengine.B5T",
-                MediaType = MediaType.CD,
-                Sectors   = 160956,
-                MD5       = "4f5165069b3c5f11afe5f59711bd945d",
-                LongMD5   = "fd30db9486f67654179c90c8a5052edb",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3589,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3590,
+                    End     = 38463,
+                    Pregap  = 0,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3589,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3590,
-                        End     = 38463,
-                        Pregap  = 0,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 28672,
-                                ClusterSize = 2048,
-                                Type        = "PC Engine filesystem"
-                            }
+                            Clusters    = 28672,
+                            ClusterSize = 2048,
+                            Type        = "PC Engine filesystem"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38464,
-                        End     = 47216,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47217,
-                        End     = 53500,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53501,
-                        End     = 61818,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61819,
-                        End     = 68562,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68563,
-                        End     = 75396,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75397,
-                        End     = 83129,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 83130,
-                        End     = 86480,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86481,
-                        End     = 91266,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 91267,
-                        End     = 99273,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99274,
-                        End     = 106692,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106693,
-                        End     = 112237,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112238,
-                        End     = 120269,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 120270,
-                        End     = 126228,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126229,
-                        End     = 160955,
-                        Pregap  = 0,
-                        Flags   = 4
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "pcfx.B5T",
-                MediaType = MediaType.CD,
-                Sectors   = 246680,
-                MD5       = "c1bc8de499756453d1387542bb32bb4d",
-                LongMD5   = "455ec326506d2c5b974c4617c1010796",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 38464,
+                    End     = 47216,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47217,
+                    End     = 53500,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53501,
+                    End     = 61818,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61819,
+                    End     = 68562,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68563,
+                    End     = 75396,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75397,
+                    End     = 83129,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 83130,
+                    End     = 86480,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86481,
+                    End     = 91266,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 91267,
+                    End     = 99273,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99274,
+                    End     = 106692,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106693,
+                    End     = 112237,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112238,
+                    End     = 120269,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 120270,
+                    End     = 126228,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126229,
+                    End     = 160955,
+                    Pregap  = 0,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "pcfx.B5T",
+            MediaType = MediaType.CD,
+            Sectors   = 246680,
+            MD5       = "c1bc8de499756453d1387542bb32bb4d",
+            LongMD5   = "455ec326506d2c5b974c4617c1010796",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4394,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4395,
+                    End     = 4908,
+                    Pregap  = 0,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4394,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4395,
-                        End     = 4908,
-                        Pregap  = 0,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 514,
-                                ClusterSize = 2048,
-                                Type        = "PC-FX",
-                                VolumeName  = "同級生２"
-                            }
+                            Bootable    = true,
+                            Clusters    = 514,
+                            ClusterSize = 2048,
+                            Type        = "PC-FX",
+                            VolumeName  = "同級生２"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4909,
-                        End     = 5940,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5941,
-                        End     = 42058,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 42059,
-                        End     = 220644,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220645,
-                        End     = 225645,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225646,
-                        End     = 235497,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235498,
-                        End     = 246679,
-                        Pregap  = 0,
-                        Flags   = 0
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_audiocd.B5T",
-                MediaType = MediaType.CDDA,
-                Sectors   = 247073,
-                MD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5   = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdr.B5T",
-                MediaType     = MediaType.CDR,
-                Sectors       = 254265,
-                MD5           = "65e79ef740833188a0f5be19da14c09d",
-                LongMD5       = "47b32c32a6427ad1e6b4b1bd047df716",
-                SubchannelMD5 = "f2246afbf3dfbcad5acd2c85134b568e",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 4909,
+                    End     = 5940,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 5941,
+                    End     = 42058,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 42059,
+                    End     = 220644,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220645,
+                    End     = 225645,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225646,
+                    End     = 235497,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235498,
+                    End     = 246679,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_audiocd.B5T",
+            MediaType = MediaType.CDDA,
+            Sectors   = 247073,
+            MD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5   = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.B5T",
+            MediaType     = MediaType.CDR,
+            Sectors       = 254265,
+            MD5           = "65e79ef740833188a0f5be19da14c09d",
+            LongMD5       = "47b32c32a6427ad1e6b4b1bd047df716",
+            SubchannelMD5 = "f2246afbf3dfbcad5acd2c85134b568e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.B5T",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "7a01c3f2fe95664ef5726b3ad9597282",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrom.B5T",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "7a01c3f2fe95664ef5726b3ad9597282",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw_2x.B5T",
+            MediaType     = MediaType.CDRW,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "6da685990c9b366bf49d556dc3e1db08",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrw_2x.B5T",
-                MediaType     = MediaType.CDRW,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "6da685990c9b366bf49d556dc3e1db08",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_audiocd_cdtext.B5T",
+            MediaType = MediaType.CDR,
+            Sectors   = 277696,
+            MD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
+            LongMD5   = "7c8fc7bb768cff15d702ac8cd10108d7",
+            Tracks = new[]
             {
-                TestFile  = "test_audiocd_cdtext.B5T",
-                MediaType = MediaType.CDR,
-                Sectors   = 277696,
-                MD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
-                LongMD5   = "7c8fc7bb768cff15d702ac8cd10108d7",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 0,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_enhancedcd.B5T",
+            MediaType     = MediaType.CDR,
+            Sectors       = 59206,
+            MD5           = "3736dbfcb7bf5648e3ac067379087001",
+            LongMD5       = "c2dfd5a32678c3ff049c143c98ad36a5",
+            SubchannelMD5 = "f486c17d8b43d802e8f00637d4b27de1",
+            Tracks = new[]
             {
-                TestFile      = "test_enhancedcd.B5T",
-                MediaType     = MediaType.CDR,
-                Sectors       = 59206,
-                MD5           = "3736dbfcb7bf5648e3ac067379087001",
-                LongMD5       = "c2dfd5a32678c3ff049c143c98ad36a5",
-                SubchannelMD5 = "f486c17d8b43d802e8f00637d4b27de1",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14404,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14405,
+                    End     = 28952,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 40203,
+                    End     = 59205,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14404,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14405,
-                        End     = 28952,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 40203,
-                        End     = 59205,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 18853,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New"
-                            }
+                            Clusters    = 18853,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_incd_udf200_finalized.B5T",
+            MediaType     = MediaType.CDR,
+            Sectors       = 350134,
+            MD5           = "901e4fe17ea6591b1fd53ba822428ef4",
+            LongMD5       = "7b489457540c40037aabcf3f21e0201e",
+            SubchannelMD5 = "51f7e060a5d85539bfea0fd7aa3ee107",
+            Tracks = new[]
             {
-                TestFile      = "test_incd_udf200_finalized.B5T",
-                MediaType     = MediaType.CDR,
-                Sectors       = 350134,
-                MD5           = "901e4fe17ea6591b1fd53ba822428ef4",
-                LongMD5       = "7b489457540c40037aabcf3f21e0201e",
-                SubchannelMD5 = "51f7e060a5d85539bfea0fd7aa3ee107",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 7,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 7,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 600,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "INCD"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 399371,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "InCD",
-                                VolumeSerial = "40888C15CA13D401InCD"
-                            }
+                            Clusters    = 600,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "INCD"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 399371,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "InCD",
+                            VolumeSerial = "40888C15CA13D401InCD"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multiple_indexes.B5T",
+            MediaType = MediaType.CDR,
+            Sectors   = 65536,
+            MD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
+            LongMD5   = "1b13a8f8aeb23f0b8bbc68518217e771",
+            Tracks = new[]
             {
-                TestFile  = "test_multiple_indexes.B5T",
-                MediaType = MediaType.CDR,
-                Sectors   = 65536,
-                MD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
-                LongMD5   = "1b13a8f8aeb23f0b8bbc68518217e771",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4803,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4804,
-                        End     = 13874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13875,
-                        End     = 41184,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41185,
-                        End     = 54988,
-                        Pregap  = 0,
-                        Flags   = 8
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 0,
-                        Flags   = 1
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4803,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4804,
+                    End     = 13874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13875,
+                    End     = 41184,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41185,
+                    End     = 54988,
+                    Pregap  = 0,
+                    Flags   = 8
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 0,
+                    Flags   = 1
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.B5T",
+            MediaType     = MediaType.CDR,
+            Sectors       = 51168,
+            MD5           = "e2e19cf38891e67a0829d01842b4052e",
+            LongMD5       = "3e646a04eb29a8e0ad892b6ac00ba962",
+            SubchannelMD5 = "94c9b99c0ca454bbbb399da2b7e4c86d",
+            Tracks = new[]
             {
-                TestFile      = "test_multisession.B5T",
-                MediaType     = MediaType.CDR,
-                Sectors       = 51168,
-                MD5           = "e2e19cf38891e67a0829d01842b4052e",
-                LongMD5       = "3e646a04eb29a8e0ad892b6ac00ba962",
-                SubchannelMD5 = "94c9b99c0ca454bbbb399da2b7e4c86d",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 7876,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 8133,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 1",
-                                VolumeSerial = "50958B61AF6A749E"
-                            }
+                            Clusters    = 7876,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 8133,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 1",
+                            VolumeSerial = "50958B61AF6A749E"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 6170,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 2"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6427,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 2",
-                                VolumeSerial = "50958BBBAF6A7444"
-                            }
+                            Clusters    = 6170,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 2"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6427,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 2",
+                            VolumeSerial = "50958BBBAF6A7444"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 5360,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 3"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 5618,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "Session 3",
-                                VolumeSerial = "50958C19AF6A73E6"
-                            }
+                            Clusters    = 5360,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 3"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 5618,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "Session 3",
+                            VolumeSerial = "50958C19AF6A73E6"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 4,
+                    FileSystems = new[]
                     {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 4,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 45796,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 4"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 5790,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.60",
-                                VolumeName   = "Session 4",
-                                VolumeSerial = "50958C82AF6A737D"
-                            }
+                            Clusters    = 45796,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 4"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 5790,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.60",
+                            VolumeName   = "Session 4",
+                            VolumeSerial = "50958C82AF6A737D"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.B5T",
+            MediaType     = MediaType.CDR,
+            Sectors       = 48794,
+            MD5           = "203a40d27b9bee018705c2df8d15e96d",
+            LongMD5       = "a686cade367db0a12fef1d9862f39e1d",
+            SubchannelMD5 = "177b666c1fb45c85f5a2bfe690046802",
+            Tracks = new[]
             {
-                TestFile      = "test_videocd.B5T",
-                MediaType     = MediaType.CDR,
-                Sectors       = 48794,
-                MD5           = "203a40d27b9bee018705c2df8d15e96d",
-                LongMD5       = "a686cade367db0a12fef1d9862f39e1d",
-                SubchannelMD5 = "177b666c1fb45c85f5a2bfe690046802",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1251,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1251,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1252,
-                        End     = 48793,
-                        Pregap  = 0,
-                        Flags   = 4
                     }
-                }
-            },
-            #region These test images violate the specifications and are not expected to work yet
-            /*
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_all_tracks_are_track1.B5T",
-                MediaType = MediaType.CDR,
-                Sectors   = 0,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 25539,
-                        End     = 51077,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 1252,
+                    End     = 48793,
+                    Pregap  = 0,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        #region These test images violate the specifications and are not expected to work yet
+        /*
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_all_tracks_are_track1.B5T",
+            MediaType = MediaType.CDR,
+            Sectors   = 0,
+            MD5       = "UNKNOWN",
+            LongMD5   = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile  = "test_castrated_leadout.B5T",
-                MediaType = MediaType.CDR,
-                Sectors   = 0,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 1049,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 25539,
+                    End     = 51077,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_castrated_leadout.B5T",
+            MediaType = MediaType.CDR,
+            Sectors   = 0,
+            MD5       = "UNKNOWN",
+            LongMD5   = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile  = "test_data_track_as_audio.B5T",
-                MediaType = MediaType.CDR,
-                Sectors   = 62385,
-                MD5       = "ce3d63e831b4e6191b05ec9ce452ad91",
-                LongMD5   = "4bd5511229857ca167b45e607dea12dc",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 1049,
+                    Pregap  = 0,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_data_track_as_audio.B5T",
+            MediaType = MediaType.CDR,
+            Sectors   = 62385,
+            MD5       = "ce3d63e831b4e6191b05ec9ce452ad91",
+            LongMD5   = "4bd5511229857ca167b45e607dea12dc",
+            Tracks = new[]
             {
-                TestFile  = "test_data_track_as_audio_fixed_sub.B5T",
-                MediaType = MediaType.CDR,
-                Sectors   = 62385,
-                MD5       = "ce3d63e831b4e6191b05ec9ce452ad91",
-                LongMD5   = "4bd5511229857ca167b45e607dea12dc",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_data_track_as_audio_fixed_sub.B5T",
+            MediaType = MediaType.CDR,
+            Sectors   = 62385,
+            MD5       = "ce3d63e831b4e6191b05ec9ce452ad91",
+            LongMD5   = "4bd5511229857ca167b45e607dea12dc",
+            Tracks = new[]
             {
-                TestFile  = "test_disc_starts_at_track2.B5T",
-                MediaType = MediaType.CDR,
-                Sectors   = 62385,
-                MD5       = "25fb1b49726aaac09196ea56490beeb1",
-                LongMD5   = "8fd0dbe9085363cc20709f0ca76a373d",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_disc_starts_at_track2.B5T",
+            MediaType = MediaType.CDR,
+            Sectors   = 62385,
+            MD5       = "25fb1b49726aaac09196ea56490beeb1",
+            LongMD5   = "8fd0dbe9085363cc20709f0ca76a373d",
+            Tracks = new[]
             {
-                TestFile  = "test_track1_overlaps_session2.B5T",
-                MediaType = MediaType.CDR,
-                Sectors   = 0,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_track1_overlaps_session2.B5T",
+            MediaType = MediaType.CDR,
+            Sectors   = 0,
+            MD5       = "UNKNOWN",
+            LongMD5   = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile  = "test_track2_inside_session2_leadin.B5T",
-                MediaType = MediaType.CDR,
-                Sectors   = 62385,
-                MD5       = "4e797aa5dedaac71a0e67ebd9ac9d555",
-                LongMD5   = "311d641c93a3fe1dfae7deb3a2be28c7",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25499,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 25500,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_track2_inside_session2_leadin.B5T",
+            MediaType = MediaType.CDR,
+            Sectors   = 62385,
+            MD5       = "4e797aa5dedaac71a0e67ebd9ac9d555",
+            LongMD5   = "311d641c93a3fe1dfae7deb3a2be28c7",
+            Tracks = new[]
             {
-                TestFile  = "test_track2_inside_track1.B5T",
-                MediaType = MediaType.CDR,
-                Sectors   = 0,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13349,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13350,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 36939,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25499,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 25500,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            */
-            #endregion
-        };
-    }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_track2_inside_track1.B5T",
+            MediaType = MediaType.CDR,
+            Sectors   = 0,
+            MD5       = "UNKNOWN",
+            LongMD5   = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13349,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13350,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 36939,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        */
+        #endregion
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/BlindWrite6.cs b/Aaru.Tests/Images/BlindWrite6.cs
index 2ed237658..e23086283 100644
--- a/Aaru.Tests/Images/BlindWrite6.cs
+++ b/Aaru.Tests/Images/BlindWrite6.cs
@@ -31,640 +31,639 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class BlindWrite6 : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 6");
-        public override IMediaImage _plugin => new DiscImages.BlindWrite5();
+namespace Aaru.Tests.Images;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class BlindWrite6 : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 6");
+    public override IMediaImage _plugin => new DiscImages.BlindWrite5();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile  = "dvdrom.B6T",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2287072,
+            MD5       = "7272cae103a922910a09fdb6a6841dff",
+            LongMD5   = "7272cae103a922910a09fdb6a6841dff",
+            Tracks = new[]
             {
-                TestFile  = "dvdrom.B6T",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2287072,
-                MD5       = "7272cae103a922910a09fdb6a6841dff",
-                LongMD5   = "7272cae103a922910a09fdb6a6841dff",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2287071,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2287071,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 2287072,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "GuiaRaw"
-                            }
+                            Clusters    = 2287072,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "GuiaRaw"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "jaguarcd.B6T",
-                MediaType = MediaType.CDDA,
-                Sectors   = 243587,
-                MD5       = "3dd5bd0f7d95a40d411761d69255567a",
-                LongMD5   = "3dd5bd0f7d95a40d411761d69255567a",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16239,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 27490,
-                        End     = 28236,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 28237,
-                        End     = 78891,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 78892,
-                        End     = 100053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 100054,
-                        End     = 133202,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 133203,
-                        End     = 160907,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 160908,
-                        End     = 181465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 181466,
-                        End     = 202023,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 202024,
-                        End     = 222581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 222582,
-                        End     = 243139,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 243140,
-                        End     = 243586,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "pcengine.B6T",
-                MediaType = MediaType.CD,
-                Sectors   = 160956,
-                MD5       = "4f5165069b3c5f11afe5f59711bd945d",
-                LongMD5   = "fd30db9486f67654179c90c8a5052edb",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3589,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3590,
-                        End     = 38463,
-                        Pregap  = 0,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 28672,
-                                ClusterSize = 2048,
-                                Type        = "PC Engine filesystem"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38464,
-                        End     = 47216,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47217,
-                        End     = 53500,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53501,
-                        End     = 61818,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61819,
-                        End     = 68562,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68563,
-                        End     = 75396,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75397,
-                        End     = 83129,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 83130,
-                        End     = 86480,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86481,
-                        End     = 91266,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 91267,
-                        End     = 99273,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99274,
-                        End     = 106692,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106693,
-                        End     = 112237,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112238,
-                        End     = 120269,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 120270,
-                        End     = 126228,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126229,
-                        End     = 160955,
-                        Pregap  = 0,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "pcfx.B6T",
-                MediaType = MediaType.CD,
-                Sectors   = 246680,
-                MD5       = "c1bc8de499756453d1387542bb32bb4d",
-                LongMD5   = "455ec326506d2c5b974c4617c1010796",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4394,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4395,
-                        End     = 4908,
-                        Pregap  = 0,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 514,
-                                ClusterSize = 2048,
-                                Type        = "PC-FX",
-                                VolumeName  = "同級生２"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4909,
-                        End     = 5940,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5941,
-                        End     = 42058,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 42059,
-                        End     = 220644,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220645,
-                        End     = 225645,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225646,
-                        End     = 235497,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235498,
-                        End     = 246679,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdr.B6T",
-                MediaType     = MediaType.CDR,
-                Sectors       = 254265,
-                MD5           = "63c99a087570b8936bb55156f5502f38",
-                LongMD5       = "368c06d4b42ed581f3ad7f6ad57f70f6",
-                SubchannelMD5 = "9c231e680e601cd10bb61fb519f00c84",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.B6T",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "46b6244ed63434cb0f91e0610c63fec8",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw_2x.B6T",
-                MediaType     = MediaType.CDRW,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "19f74cd5f05894203465374111be2aa7",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_karaoke_multi_sampler.B6T",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 329158,
-                MD5           = "a34e29e42b60023a6ae59f37d2bd4bea",
-                LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
-                SubchannelMD5 = "485a233924c003a1ab2ea9228f582344",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32748,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "jaguarcd.B6T",
+            MediaType = MediaType.CDDA,
+            Sectors   = 243587,
+            MD5       = "3dd5bd0f7d95a40d411761d69255567a",
+            LongMD5   = "3dd5bd0f7d95a40d411761d69255567a",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16239,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 27490,
+                    End     = 28236,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 28237,
+                    End     = 78891,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 78892,
+                    End     = 100053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 100054,
+                    End     = 133202,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 133203,
+                    End     = 160907,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 160908,
+                    End     = 181465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 181466,
+                    End     = 202023,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 202024,
+                    End     = 222581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 222582,
+                    End     = 243139,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 243140,
+                    End     = 243586,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "pcengine.B6T",
+            MediaType = MediaType.CD,
+            Sectors   = 160956,
+            MD5       = "4f5165069b3c5f11afe5f59711bd945d",
+            LongMD5   = "fd30db9486f67654179c90c8a5052edb",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3589,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3590,
+                    End     = 38463,
+                    Pregap  = 0,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 28672,
+                            ClusterSize = 2048,
+                            Type        = "PC Engine filesystem"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 38464,
+                    End     = 47216,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47217,
+                    End     = 53500,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53501,
+                    End     = 61818,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61819,
+                    End     = 68562,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68563,
+                    End     = 75396,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75397,
+                    End     = 83129,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 83130,
+                    End     = 86480,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86481,
+                    End     = 91266,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 91267,
+                    End     = 99273,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99274,
+                    End     = 106692,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106693,
+                    End     = 112237,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112238,
+                    End     = 120269,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 120270,
+                    End     = 126228,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126229,
+                    End     = 160955,
+                    Pregap  = 0,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "pcfx.B6T",
+            MediaType = MediaType.CD,
+            Sectors   = 246680,
+            MD5       = "c1bc8de499756453d1387542bb32bb4d",
+            LongMD5   = "455ec326506d2c5b974c4617c1010796",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4394,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4395,
+                    End     = 4908,
+                    Pregap  = 0,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 514,
+                            ClusterSize = 2048,
+                            Type        = "PC-FX",
+                            VolumeName  = "同級生２"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4909,
+                    End     = 5940,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 5941,
+                    End     = 42058,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 42059,
+                    End     = 220644,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220645,
+                    End     = 225645,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225646,
+                    End     = 235497,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235498,
+                    End     = 246679,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.B6T",
+            MediaType     = MediaType.CDR,
+            Sectors       = 254265,
+            MD5           = "63c99a087570b8936bb55156f5502f38",
+            LongMD5       = "368c06d4b42ed581f3ad7f6ad57f70f6",
+            SubchannelMD5 = "9c231e680e601cd10bb61fb519f00c84",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.B6T",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "46b6244ed63434cb0f91e0610c63fec8",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw_2x.B6T",
+            MediaType     = MediaType.CDRW,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "19f74cd5f05894203465374111be2aa7",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_karaoke_multi_sampler.B6T",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 329158,
+            MD5           = "a34e29e42b60023a6ae59f37d2bd4bea",
+            LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
+            SubchannelMD5 = "485a233924c003a1ab2ea9228f582344",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32748,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/BlindWrite7.cs b/Aaru.Tests/Images/BlindWrite7.cs
index 657eb6592..b0d1ed7c0 100644
--- a/Aaru.Tests/Images/BlindWrite7.cs
+++ b/Aaru.Tests/Images/BlindWrite7.cs
@@ -31,125 +31,124 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class BlindWrite7 : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 7");
-        public override IMediaImage _plugin => new DiscImages.BlindWrite5();
+namespace Aaru.Tests.Images;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class BlindWrite7 : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "BlindWrite 7");
+    public override IMediaImage _plugin => new DiscImages.BlindWrite5();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile   = "report_cdr.B6T",
+            MediaType  = MediaType.CDR,
+            Sectors    = 254265,
+            SectorSize = 2048,
+            MD5        = "86b8a763ef6522fccf97f743d7bf4fa3",
+            LongMD5    = "a292359cce05849dec1d06ae471ecf9e",
+            Tracks = new[]
             {
-                TestFile   = "report_cdr.B6T",
-                MediaType  = MediaType.CDR,
-                Sectors    = 254265,
-                SectorSize = 2048,
-                MD5        = "86b8a763ef6522fccf97f743d7bf4fa3",
-                LongMD5    = "a292359cce05849dec1d06ae471ecf9e",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_cdrom.B6T",
-                MediaType  = MediaType.CDROM,
-                Sectors    = 254265,
-                SectorSize = 2048,
-                MD5        = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5    = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_cdrw.B6T",
-                MediaType  = MediaType.CDRW,
-                Sectors    = 308224,
-                SectorSize = 2048,
-                MD5        = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5    = "3af5f943ddb9427d9c63a4ce3b704db9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_cdrom.B6T",
+            MediaType  = MediaType.CDROM,
+            Sectors    = 254265,
+            SectorSize = 2048,
+            MD5        = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5    = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_cdrw.B6T",
+            MediaType  = MediaType.CDRW,
+            Sectors    = 308224,
+            SectorSize = 2048,
+            MD5        = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5    = "3af5f943ddb9427d9c63a4ce3b704db9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/BlockMediaImageTest.cs b/Aaru.Tests/Images/BlockMediaImageTest.cs
index 544644991..32dd9ddb7 100644
--- a/Aaru.Tests/Images/BlockMediaImageTest.cs
+++ b/Aaru.Tests/Images/BlockMediaImageTest.cs
@@ -12,297 +12,296 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
+namespace Aaru.Tests.Images;
+
+public abstract class BlockMediaImageTest : BaseMediaImageTest
 {
-    public abstract class BlockMediaImageTest : BaseMediaImageTest
+    // How many sectors to read at once
+    const           uint                     SECTORS_TO_READ = 256;
+    public abstract BlockImageTestExpected[] Tests { get; }
+
+    [Test]
+    public void Info()
     {
-        // How many sectors to read at once
-        const           uint                     SECTORS_TO_READ = 256;
-        public abstract BlockImageTestExpected[] Tests { get; }
+        Environment.CurrentDirectory = DataFolder;
 
-        [Test]
-        public void Info()
+        Assert.Multiple(() =>
         {
-            Environment.CurrentDirectory = DataFolder;
-
-            Assert.Multiple(() =>
+            foreach(BlockImageTestExpected test in Tests)
             {
-                foreach(BlockImageTestExpected test in Tests)
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage;
+                Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
+
+                ErrorNumber opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                using(new AssertionScope())
                 {
-                    string testFile = test.TestFile;
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage;
-                    Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
-
-                    ErrorNumber opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    using(new AssertionScope())
+                    Assert.Multiple(() =>
                     {
-                        Assert.Multiple(() =>
-                        {
-                            Assert.AreEqual(test.Sectors, image.Info.Sectors, $"Sectors: {testFile}");
-                            Assert.AreEqual(test.SectorSize, image.Info.SectorSize, $"Sector size: {testFile}");
-                            Assert.AreEqual(test.MediaType, image.Info.MediaType, $"Media type: {testFile}");
-                        });
-                    }
+                        Assert.AreEqual(test.Sectors, image.Info.Sectors, $"Sectors: {testFile}");
+                        Assert.AreEqual(test.SectorSize, image.Info.SectorSize, $"Sector size: {testFile}");
+                        Assert.AreEqual(test.MediaType, image.Info.MediaType, $"Media type: {testFile}");
+                    });
                 }
-            });
-        }
+            }
+        });
+    }
 
-        [Test]
-        public void Hashes()
+    [Test]
+    public void Hashes()
+    {
+        Environment.CurrentDirectory = DataFolder;
+        ErrorNumber errno;
+
+        Assert.Multiple(() =>
         {
-            Environment.CurrentDirectory = DataFolder;
-            ErrorNumber errno;
-
-            Assert.Multiple(() =>
+            foreach(BlockImageTestExpected test in Tests)
             {
-                foreach(BlockImageTestExpected test in Tests)
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage;
+                Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
+
+                ErrorNumber opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                ulong doneSectors = 0;
+                var   ctx         = new Md5Context();
+
+                while(doneSectors < image.Info.Sectors)
                 {
-                    string testFile = test.TestFile;
+                    byte[] sector;
 
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage;
-                    Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
-
-                    ErrorNumber opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    ulong doneSectors = 0;
-                    var   ctx         = new Md5Context();
-
-                    while(doneSectors < image.Info.Sectors)
+                    if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
                     {
-                        byte[] sector;
+                        errno       =  image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
+                        doneSectors += SECTORS_TO_READ;
+                    }
+                    else
+                    {
+                        errno = image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors),
+                                                  out sector);
 
-                        if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
-                        {
-                            errno       =  image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
-                            doneSectors += SECTORS_TO_READ;
-                        }
-                        else
-                        {
-                            errno = image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors),
-                                                      out sector);
-
-                            doneSectors += image.Info.Sectors - doneSectors;
-                        }
-
-                        Assert.AreEqual(ErrorNumber.NoError, errno);
-                        ctx.Update(sector);
+                        doneSectors += image.Info.Sectors - doneSectors;
                     }
 
-                    Assert.AreEqual(test.MD5, ctx.End(), $"Hash: {testFile}");
+                    Assert.AreEqual(ErrorNumber.NoError, errno);
+                    ctx.Update(sector);
                 }
-            });
-        }
 
-        [Test]
-        public void Contents()
+                Assert.AreEqual(test.MD5, ctx.End(), $"Hash: {testFile}");
+            }
+        });
+    }
+
+    [Test]
+    public void Contents()
+    {
+        Environment.CurrentDirectory = DataFolder;
+        PluginBase plugins = GetPluginBase.Instance;
+
+        Assert.Multiple(() =>
         {
-            Environment.CurrentDirectory = DataFolder;
-            PluginBase plugins = GetPluginBase.Instance;
-
-            Assert.Multiple(() =>
+            foreach(BlockImageTestExpected test in Tests)
             {
-                foreach(BlockImageTestExpected test in Tests)
+                if(test.Partitions is null)
+                    continue;
+
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage;
+                Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
+
+                ErrorNumber opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                List<Partition> partitions = Core.Partitions.GetAll(image);
+
+                if(partitions.Count == 0)
                 {
-                    if(test.Partitions is null)
-                        continue;
-
-                    string testFile = test.TestFile;
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage;
-                    Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
-
-                    ErrorNumber opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    List<Partition> partitions = Core.Partitions.GetAll(image);
-
-                    if(partitions.Count == 0)
+                    partitions.Add(new Partition
                     {
-                        partitions.Add(new Partition
-                        {
-                            Description = "Whole device",
-                            Length      = image.Info.Sectors,
-                            Offset      = 0,
-                            Size        = image.Info.SectorSize * image.Info.Sectors,
-                            Sequence    = 1,
-                            Start       = 0
-                        });
-                    }
+                        Description = "Whole device",
+                        Length      = image.Info.Sectors,
+                        Offset      = 0,
+                        Size        = image.Info.SectorSize * image.Info.Sectors,
+                        Sequence    = 1,
+                        Start       = 0
+                    });
+                }
 
-                    Assert.AreEqual(test.Partitions.Length, partitions.Count,
-                                    $"Expected {test.Partitions.Length} partitions in {testFile} but found {partitions.Count}");
+                Assert.AreEqual(test.Partitions.Length, partitions.Count,
+                                $"Expected {test.Partitions.Length} partitions in {testFile} but found {partitions.Count}");
 
-                    using(new AssertionScope())
+                using(new AssertionScope())
+                {
+                    Assert.Multiple(() =>
                     {
-                        Assert.Multiple(() =>
+                        for(int i = 0; i < test.Partitions.Length; i++)
                         {
-                            for(int i = 0; i < test.Partitions.Length; i++)
+                            BlockPartitionVolumes expectedPartition = test.Partitions[i];
+                            Partition             foundPartition    = partitions[i];
+
+                            Assert.AreEqual(expectedPartition.Start, foundPartition.Start,
+                                            $"Expected partition {i} to start at sector {expectedPartition.Start} but found it starts at {foundPartition.Start} in {testFile}");
+
+                            Assert.AreEqual(expectedPartition.Length, foundPartition.Length,
+                                            $"Expected partition {i} to have {expectedPartition.Length} sectors but found it has {foundPartition.Length} sectors in {testFile}");
+
+                            string expectedDataFilename = $"{testFile}.contents.partition{i}.json";
+
+                            if(!File.Exists(expectedDataFilename))
+                                continue;
+
+                            var serializer = new JsonSerializer
                             {
-                                BlockPartitionVolumes expectedPartition = test.Partitions[i];
-                                Partition             foundPartition    = partitions[i];
+                                Formatting        = Formatting.Indented,
+                                MaxDepth          = 16384,
+                                NullValueHandling = NullValueHandling.Ignore
+                            };
 
-                                Assert.AreEqual(expectedPartition.Start, foundPartition.Start,
-                                                $"Expected partition {i} to start at sector {expectedPartition.Start} but found it starts at {foundPartition.Start} in {testFile}");
+                            serializer.Converters.Add(new StringEnumConverter());
 
-                                Assert.AreEqual(expectedPartition.Length, foundPartition.Length,
-                                                $"Expected partition {i} to have {expectedPartition.Length} sectors but found it has {foundPartition.Length} sectors in {testFile}");
+                            var sr = new StreamReader(expectedDataFilename);
 
-                                string expectedDataFilename = $"{testFile}.contents.partition{i}.json";
+                            VolumeData[] expectedData =
+                                serializer.Deserialize<VolumeData[]>(new JsonTextReader(sr));
 
-                                if(!File.Exists(expectedDataFilename))
-                                    continue;
+                            Assert.NotNull(expectedData);
 
-                                var serializer = new JsonSerializer
-                                {
-                                    Formatting        = Formatting.Indented,
-                                    MaxDepth          = 16384,
-                                    NullValueHandling = NullValueHandling.Ignore
-                                };
+                            Core.Filesystems.Identify(image, out List<string> idPlugins, partitions[i]);
 
-                                serializer.Converters.Add(new StringEnumConverter());
+                            if(expectedData.Length != idPlugins.Count)
+                            {
+                                continue;
 
-                                var sr = new StreamReader(expectedDataFilename);
-
-                                VolumeData[] expectedData =
-                                    serializer.Deserialize<VolumeData[]>(new JsonTextReader(sr));
-
-                                Assert.NotNull(expectedData);
-
-                                Core.Filesystems.Identify(image, out List<string> idPlugins, partitions[i]);
-
-                                if(expectedData.Length != idPlugins.Count)
-                                {
-                                    continue;
-
-                                    // Uncomment to generate JSON file
-                                    /*
-                                    expectedData = new VolumeData[idPlugins.Count];
-
-                                    for(int j = 0; j < idPlugins.Count; j++)
-                                    {
-                                        string pluginName = idPlugins[j];
-
-                                        if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName,
-                                               out IReadOnlyFilesystem plugin))
-                                            continue;
-
-                                        Assert.IsNotNull(plugin, "Could not instantiate filesystem plugin");
-
-                                        var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.
-                                                                             Invoke(new object[]
-                                                                                 {});
-
-                                        Assert.IsNotNull(fs, $"Could not instantiate filesystem {pluginName}");
-
-                                        Errno error = fs.Mount(image, partitions[i], null, null, null);
-
-                                        Assert.AreEqual(ErrorNumber.NoError, error,
-                                                        $"Could not mount {pluginName} in partition {i}.");
-
-                                        if(error != ErrorNumber.NoError)
-                                            continue;
-
-                                        expectedData[j] = new VolumeData
-                                        {
-                                            Files = ReadOnlyFilesystemTest.BuildDirectory(fs, "/")
-                                        };
-                                    }
-
-                                    var sw = new StreamWriter(expectedDataFilename);
-                                    serializer.Serialize(sw, expectedData);
-                                    sw.Close();
-                                    */
-                                }
-
-                                if(idPlugins.Count == 0)
-                                    continue;
-
-                                Assert.AreEqual(expectedData.Length, idPlugins.Count,
-                                                $"Expected {expectedData.Length} filesystems identified in partition {i} but found {idPlugins.Count} in {testFile}");
+                                // Uncomment to generate JSON file
+                                /*
+                                expectedData = new VolumeData[idPlugins.Count];
 
                                 for(int j = 0; j < idPlugins.Count; j++)
                                 {
                                     string pluginName = idPlugins[j];
 
                                     if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName,
-                                                                                    out IReadOnlyFilesystem plugin))
+                                           out IReadOnlyFilesystem plugin))
                                         continue;
 
                                     Assert.IsNotNull(plugin, "Could not instantiate filesystem plugin");
 
                                     var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.
                                                                          Invoke(new object[]
-                                                                                    {});
+                                                                             {});
 
-                                    Assert.IsNotNull(fs,
-                                                     $"Could not instantiate filesystem {pluginName} in {testFile}");
+                                    Assert.IsNotNull(fs, $"Could not instantiate filesystem {pluginName}");
 
-                                    ErrorNumber error = fs.Mount(image, partitions[i], null, null, null);
+                                    Errno error = fs.Mount(image, partitions[i], null, null, null);
 
                                     Assert.AreEqual(ErrorNumber.NoError, error,
-                                                    $"Could not mount {pluginName} in partition {i} in {testFile}.");
+                                                    $"Could not mount {pluginName} in partition {i}.");
 
                                     if(error != ErrorNumber.NoError)
                                         continue;
 
-                                    VolumeData volumeData = expectedData[j];
-
-                                    ReadOnlyFilesystemTest.TestDirectory(fs, "/", volumeData.Files, testFile, false);
+                                    expectedData[j] = new VolumeData
+                                    {
+                                        Files = ReadOnlyFilesystemTest.BuildDirectory(fs, "/")
+                                    };
                                 }
+
+                                var sw = new StreamWriter(expectedDataFilename);
+                                serializer.Serialize(sw, expectedData);
+                                sw.Close();
+                                */
                             }
-                        });
-                    }
+
+                            if(idPlugins.Count == 0)
+                                continue;
+
+                            Assert.AreEqual(expectedData.Length, idPlugins.Count,
+                                            $"Expected {expectedData.Length} filesystems identified in partition {i} but found {idPlugins.Count} in {testFile}");
+
+                            for(int j = 0; j < idPlugins.Count; j++)
+                            {
+                                string pluginName = idPlugins[j];
+
+                                if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName,
+                                                                            out IReadOnlyFilesystem plugin))
+                                    continue;
+
+                                Assert.IsNotNull(plugin, "Could not instantiate filesystem plugin");
+
+                                var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.
+                                                                     Invoke(new object[]
+                                                                                {});
+
+                                Assert.IsNotNull(fs,
+                                                 $"Could not instantiate filesystem {pluginName} in {testFile}");
+
+                                ErrorNumber error = fs.Mount(image, partitions[i], null, null, null);
+
+                                Assert.AreEqual(ErrorNumber.NoError, error,
+                                                $"Could not mount {pluginName} in partition {i} in {testFile}.");
+
+                                if(error != ErrorNumber.NoError)
+                                    continue;
+
+                                VolumeData volumeData = expectedData[j];
+
+                                ReadOnlyFilesystemTest.TestDirectory(fs, "/", volumeData.Files, testFile, false);
+                            }
+                        }
+                    });
                 }
-            });
-        }
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/CDRWin.cs b/Aaru.Tests/Images/CDRWin.cs
index f8523ea30..98c6ae2b5 100644
--- a/Aaru.Tests/Images/CDRWin.cs
+++ b/Aaru.Tests/Images/CDRWin.cs
@@ -32,1473 +32,1472 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class CDRWin : OpticalMediaImageTest
-    {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin");
-        public override IMediaImage _plugin    => new CdrWin();
+namespace Aaru.Tests.Images;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class CDRWin : OpticalMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin");
+    public override IMediaImage _plugin    => new CdrWin();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile  = "pcengine.cue",
+            MediaType = MediaType.CD,
+            Sectors   = 160956,
+            MD5       = "875ea735f0d10d6fa321fb222714117b",
+            LongMD5   = "0188cf74fdc367a8e370bbe236a5100c",
+            Tracks = new[]
             {
-                TestFile  = "pcengine.cue",
-                MediaType = MediaType.CD,
-                Sectors   = 160956,
-                MD5       = "875ea735f0d10d6fa321fb222714117b",
-                LongMD5   = "0188cf74fdc367a8e370bbe236a5100c",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3364,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3365,
+                    End     = 38463,
+                    Pregap  = 225,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3364,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3365,
-                        End     = 38463,
-                        Pregap  = 225,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 34816,
-                                ClusterSize = 2048,
-                                Type        = "PC Engine filesystem"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38464,
-                        End     = 47066,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47067,
-                        End     = 53350,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53351,
-                        End     = 61668,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61669,
-                        End     = 68412,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68413,
-                        End     = 75246,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75247,
-                        End     = 82979,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 82980,
-                        End     = 86330,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86331,
-                        End     = 91116,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 91117,
-                        End     = 99123,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99124,
-                        End     = 106542,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106543,
-                        End     = 112087,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112088,
-                        End     = 120119,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 120120,
-                        End     = 126003,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126004,
-                        End     = 160955,
-                        Pregap  = 225,
-                        Flags   = 4,
-                        Number  = 16,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 32768,
-                                ClusterSize = 2048,
-                                Type        = "PC Engine filesystem"
-                            }
+                            Clusters    = 34816,
+                            ClusterSize = 2048,
+                            Type        = "PC Engine filesystem"
                         }
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "pcfx.cue",
-                MediaType = MediaType.CD,
-                Sectors   = 246680,
-                MD5       = "d2fbcb46735a5ac90c10f81ca564c9dd",
-                LongMD5   = "f10ae52c1a530ba3ed49447417d9451e",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 38464,
+                    End     = 47066,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47067,
+                    End     = 53350,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53351,
+                    End     = 61668,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61669,
+                    End     = 68412,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68413,
+                    End     = 75246,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75247,
+                    End     = 82979,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 82980,
+                    End     = 86330,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86331,
+                    End     = 91116,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 91117,
+                    End     = 99123,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99124,
+                    End     = 106542,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106543,
+                    End     = 112087,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112088,
+                    End     = 120119,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 120120,
+                    End     = 126003,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126004,
+                    End     = 160955,
+                    Pregap  = 225,
+                    Flags   = 4,
+                    Number  = 16,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4169,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4170,
-                        End     = 4908,
-                        Pregap  = 225,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 514,
-                                ClusterSize = 2048,
-                                Type        = "PC-FX",
-                                VolumeName  = "同級生２"
-                            }
+                            Clusters    = 32768,
+                            ClusterSize = 2048,
+                            Type        = "PC Engine filesystem"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4909,
-                        End     = 5940,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5941,
-                        End     = 42058,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 42059,
-                        End     = 220644,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220645,
-                        End     = 225495,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225496,
-                        End     = 235347,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235348,
-                        End     = 246679,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_audiocd.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 247073,
-                MD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5   = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16398,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16399,
-                        End     = 29900,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29901,
-                        End     = 47799,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47800,
-                        End     = 63163,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63164,
-                        End     = 78774,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78775,
-                        End     = 94581,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94582,
-                        End     = 116974,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 116975,
-                        End     = 136015,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136016,
-                        End     = 153921,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153922,
-                        End     = 170600,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170601,
-                        End     = 186388,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186389,
-                        End     = 201648,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201649,
-                        End     = 224298,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224299,
-                        End     = 247072,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_cdr.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 254265,
-                MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_cdrw.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 308224,
-                MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_audiocd_cdtext.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 277696,
-                MD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
-                LongMD5   = "7c8fc7bb768cff15d702ac8cd10108d7",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29751,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29752,
-                        End     = 65033,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65034,
-                        End     = 78425,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78426,
-                        End     = 95079,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95080,
-                        End     = 126146,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126147,
-                        End     = 154958,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154959,
-                        End     = 191684,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191685,
-                        End     = 222775,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222776,
-                        End     = 243437,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243438,
-                        End     = 269599,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269600,
-                        End     = 277695,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_incd_udf200_finalized.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 350134,
-                MD5       = "13d4c3def37e968b2ddc5cf5a9f18fdc",
-                LongMD5   = "31e772f6997eb8dbf3ecf9aca9ea6bc6",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 7,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 600,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "INCD"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 402107,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "InCD",
-                                VolumeSerial = "40888C15CA13D401InCD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multi_karaoke_sampler.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 329158,
-                MD5       = "397d93a649a2a502cf831b49771a2c35",
-                LongMD5   = "c92ec0c7671b1b992d94a726ea10a238",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329157,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multiple_indexes.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 65536,
-                MD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
-                LongMD5   = "1b13a8f8aeb23f0b8bbc68518217e771",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4653,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4654,
-                        End     = 13724,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13725,
-                        End     = 41034,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41035,
-                        End     = 54838,
-                        Pregap  = 150,
-                        Flags   = 8
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54839,
-                        End     = 65535,
-                        Pregap  = 150,
-                        Flags   = 1
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_videocd.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 48794,
-                MD5       = "0d80890beeadf3f6e2cf2f88d0067afe",
-                LongMD5   = "96ac6c364e4c3cb2f043197a45a97183",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1251,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1252,
-                        End     = 48793,
-                        Pregap  = 0,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "cdg_report_audiocd.cue",
-                MediaType     = MediaType.CDG,
-                Sectors       = 247073,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "1d0e4118993a75311fe774e46326306a",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16398,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16399,
-                        End     = 29900,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29901,
-                        End     = 47799,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47800,
-                        End     = 63163,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63164,
-                        End     = 78774,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78775,
-                        End     = 94581,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94582,
-                        End     = 116974,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 116975,
-                        End     = 136015,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136016,
-                        End     = 153921,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153922,
-                        End     = 170600,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170601,
-                        End     = 186388,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186389,
-                        End     = 201648,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201649,
-                        End     = 224298,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224299,
-                        End     = 247072,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "cdg_test_multi_karaoke_sampler.cue",
-                MediaType     = MediaType.CDG,
-                Sectors       = 329158,
-                MD5           = "be1bdbd55883dd53397ea21715107706",
-                LongMD5       = "3d3a8e2243f40201c6bdc5c10a65bb76",
-                SubchannelMD5 = "f9794c8d8ab2c7bf7815e740a77b12f4",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329157,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "cooked_cdg_test_multi_karaoke_sampler.cue",
-                MediaType     = MediaType.CDG,
-                Sectors       = 329158,
-                MD5           = "215c0b3efab1b04e4f2d35b323cdbc96",
-                LongMD5       = "296cfef5de90e1cfadaf2ecf41f2e184",
-                SubchannelMD5 = "536ebf5b21280a721dc0604739ca7db3",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329157,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "cooked_report_cdrom.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 254265,
-                MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "cooked_report_cdrw.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 308224,
-                MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "cooked_test_multi_karaoke_sampler.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 329158,
-                MD5       = "bb1ace550c0a22f18c32bd053739d6ce",
-                LongMD5   = "857b80195d1e29bd0bace2ef20b733ed",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329157,
-                        Pregap  = 150,
-                        Flags   = 0
                     }
                 }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "pcfx.cue",
+            MediaType = MediaType.CD,
+            Sectors   = 246680,
+            MD5       = "d2fbcb46735a5ac90c10f81ca564c9dd",
+            LongMD5   = "f10ae52c1a530ba3ed49447417d9451e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4169,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4170,
+                    End     = 4908,
+                    Pregap  = 225,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 514,
+                            ClusterSize = 2048,
+                            Type        = "PC-FX",
+                            VolumeName  = "同級生２"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4909,
+                    End     = 5940,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 5941,
+                    End     = 42058,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 42059,
+                    End     = 220644,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220645,
+                    End     = 225495,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225496,
+                    End     = 235347,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235348,
+                    End     = 246679,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_audiocd.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 247073,
+            MD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5   = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16398,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16399,
+                    End     = 29900,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29901,
+                    End     = 47799,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47800,
+                    End     = 63163,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63164,
+                    End     = 78774,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78775,
+                    End     = 94581,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94582,
+                    End     = 116974,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 116975,
+                    End     = 136015,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136016,
+                    End     = 153921,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153922,
+                    End     = 170600,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170601,
+                    End     = 186388,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186389,
+                    End     = 201648,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201649,
+                    End     = 224298,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224299,
+                    End     = 247072,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdr.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 254265,
+            MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrw.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 308224,
+            MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_audiocd_cdtext.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 277696,
+            MD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
+            LongMD5   = "7c8fc7bb768cff15d702ac8cd10108d7",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29751,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29752,
+                    End     = 65033,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65034,
+                    End     = 78425,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78426,
+                    End     = 95079,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95080,
+                    End     = 126146,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126147,
+                    End     = 154958,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154959,
+                    End     = 191684,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191685,
+                    End     = 222775,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222776,
+                    End     = 243437,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243438,
+                    End     = 269599,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269600,
+                    End     = 277695,
+                    Pregap  = 150,
+                    Flags   = 2
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_incd_udf200_finalized.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 350134,
+            MD5       = "13d4c3def37e968b2ddc5cf5a9f18fdc",
+            LongMD5   = "31e772f6997eb8dbf3ecf9aca9ea6bc6",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 7,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 600,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "INCD"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 402107,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "InCD",
+                            VolumeSerial = "40888C15CA13D401InCD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multi_karaoke_sampler.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 329158,
+            MD5       = "397d93a649a2a502cf831b49771a2c35",
+            LongMD5   = "c92ec0c7671b1b992d94a726ea10a238",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329157,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multiple_indexes.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 65536,
+            MD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
+            LongMD5   = "1b13a8f8aeb23f0b8bbc68518217e771",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4653,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4654,
+                    End     = 13724,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13725,
+                    End     = 41034,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41035,
+                    End     = 54838,
+                    Pregap  = 150,
+                    Flags   = 8
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54839,
+                    End     = 65535,
+                    Pregap  = 150,
+                    Flags   = 1
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_videocd.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 48794,
+            MD5       = "0d80890beeadf3f6e2cf2f88d0067afe",
+            LongMD5   = "96ac6c364e4c3cb2f043197a45a97183",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1251,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1252,
+                    End     = 48793,
+                    Pregap  = 0,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "cdg_report_audiocd.cue",
+            MediaType     = MediaType.CDG,
+            Sectors       = 247073,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "1d0e4118993a75311fe774e46326306a",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16398,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16399,
+                    End     = 29900,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29901,
+                    End     = 47799,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47800,
+                    End     = 63163,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63164,
+                    End     = 78774,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78775,
+                    End     = 94581,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94582,
+                    End     = 116974,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 116975,
+                    End     = 136015,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136016,
+                    End     = 153921,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153922,
+                    End     = 170600,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170601,
+                    End     = 186388,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186389,
+                    End     = 201648,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201649,
+                    End     = 224298,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224299,
+                    End     = 247072,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "cdg_test_multi_karaoke_sampler.cue",
+            MediaType     = MediaType.CDG,
+            Sectors       = 329158,
+            MD5           = "be1bdbd55883dd53397ea21715107706",
+            LongMD5       = "3d3a8e2243f40201c6bdc5c10a65bb76",
+            SubchannelMD5 = "f9794c8d8ab2c7bf7815e740a77b12f4",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329157,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "cooked_cdg_test_multi_karaoke_sampler.cue",
+            MediaType     = MediaType.CDG,
+            Sectors       = 329158,
+            MD5           = "215c0b3efab1b04e4f2d35b323cdbc96",
+            LongMD5       = "296cfef5de90e1cfadaf2ecf41f2e184",
+            SubchannelMD5 = "536ebf5b21280a721dc0604739ca7db3",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329157,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "cooked_report_cdrom.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 254265,
+            MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "cooked_report_cdrw.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 308224,
+            MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "cooked_test_multi_karaoke_sampler.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 329158,
+            MD5       = "bb1ace550c0a22f18c32bd053739d6ce",
+            LongMD5   = "857b80195d1e29bd0bace2ef20b733ed",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329157,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/CDRWin10.cs b/Aaru.Tests/Images/CDRWin10.cs
index e16e95009..6a6a9a0bf 100644
--- a/Aaru.Tests/Images/CDRWin10.cs
+++ b/Aaru.Tests/Images/CDRWin10.cs
@@ -31,534 +31,533 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class CDRWin10 : OpticalMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin 10");
-        public override IMediaImage _plugin => new DiscImages.Alcohol120();
+namespace Aaru.Tests.Images;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class CDRWin10 : OpticalMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CDRWin 10");
+    public override IMediaImage _plugin    => new DiscImages.Alcohol120();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "report_audiocd.xmd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 247073,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "d4075209391c6955f438d0fa6095c6e2",
+            Tracks = new[]
             {
-                TestFile      = "report_audiocd.xmd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 247073,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "d4075209391c6955f438d0fa6095c6e2",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.xmd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "811058470f33be5988ea1c2627200039",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrom.xmd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "811058470f33be5988ea1c2627200039",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw_2x.xmd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "6d0cd8e56dada05a86a4abd10f77e054",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdr.xmd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "d814823071e3671fbf204e5bf063f432",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_enhancedcd.xmd",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 303316,
-                MD5           = "557b9658671c16602e635f157b7525db",
-                LongMD5       = "76454ac3a025857dc41e05c430783eab",
-                SubchannelMD5 = "5a33440f5c51acff1921e92269978645",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234180,
-                        End     = 303315,
-                        Pregap  = 0,
-                        Flags   = 4,
-                        Number  = 14,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_karaoke_multi_sampler.xmd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 329158,
-                MD5           = "9a19aa0df066732a8ec34025e8160248",
-                LongMD5       = "f4adafc5f2bdda2e4d70dce667cf47c1",
-                SubchannelMD5 = "b349f26946197859f6a0ef5c3881b8ca",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1887,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw_2x.xmd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "6d0cd8e56dada05a86a4abd10f77e054",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.xmd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "d814823071e3671fbf204e5bf063f432",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_enhancedcd.xmd",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 303316,
+            MD5           = "557b9658671c16602e635f157b7525db",
+            LongMD5       = "76454ac3a025857dc41e05c430783eab",
+            SubchannelMD5 = "5a33440f5c51acff1921e92269978645",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234180,
+                    End     = 303315,
+                    Pregap  = 0,
+                    Flags   = 4,
+                    Number  = 14,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_karaoke_multi_sampler.xmd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 329158,
+            MD5           = "9a19aa0df066732a8ec34025e8160248",
+            LongMD5       = "f4adafc5f2bdda2e4d70dce667cf47c1",
+            SubchannelMD5 = "b349f26946197859f6a0ef5c3881b8ca",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1887,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/CPCDSK.cs b/Aaru.Tests/Images/CPCDSK.cs
index 39b55973d..0d7492b30 100644
--- a/Aaru.Tests/Images/CPCDSK.cs
+++ b/Aaru.Tests/Images/CPCDSK.cs
@@ -32,249 +32,248 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class CPCDSK : BlockMediaImageTest
-    {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CPCDSK");
-        public override IMediaImage _plugin    => new Cpcdsk();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class CPCDSK : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CPCDSK");
+    public override IMediaImage _plugin    => new Cpcdsk();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "3D Construction Kit (1991)(Domark)(Disk 1 of 2)[a].dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "ee601c0d2beade20bb5c04b3f5800ff6",
+            Partitions = new[]
             {
-                TestFile   = "3D Construction Kit (1991)(Domark)(Disk 1 of 2)[a].dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "ee601c0d2beade20bb5c04b3f5800ff6",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3D Construction Kit (1991)(Domark)(Disk 1 of 2).dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "ee601c0d2beade20bb5c04b3f5800ff6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3D Construction Kit (1991)(Domark)(Disk 2 of 2)[a].dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "dcb039b3b2ff2d6bdef8bf6c13ef3f83",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3D Construction Kit (1991)(Domark)(Disk 2 of 2).dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "dcb039b3b2ff2d6bdef8bf6c13ef3f83",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            /* TODO: Does not open
-            new BlockImageTestExpected
-            {
-                TestFile   = "3D Construction Kit (1991)(Domark).dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "e1b14e9b744b08a1b2b56fa25f034682"
-            },
-            */ new BlockImageTestExpected
-            {
-                TestFile   = "3D Construction Kit (1991)(Domark)[Objects Disk].dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 387,
-                SectorSize = 512,
-                MD5        = "82007217a3aa6bb91468b71a6dc4bfe5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 387
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "BCPL Compiler v1.0 (1986)(Arnor)[CPM Version].dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "acd60bb0119e0b5aa1790bef344211ac",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "BCPL Compiler v1.0 (1986)(Arnor).dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "0330956c2fe38f278d7cba6f7bd8aa2d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "CPM Plus v1.0 (1985)(Amstrad)(Disk 1 of 4)[a][CPM Version].dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 359,
-                SectorSize = 512,
-                MD5        = "a568e44f556661f9e4b7db01c126c676"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "CPM Plus v1.0 (1985)(Amstrad)(Disk 1 of 4)[CPM Version].dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "5dc0d482a773043d8683a84c8220df95",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "CPM Plus v1.0 (1985)(Amstrad)(Disk 2 of 4)[CPM Version].dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "64edd62fabb381ef49bf3a8f43435824",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "CPM Plus v1.0 (1985)(Amstrad)(Disk 3 of 4)[CPM Version].dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "b381bbc72ab664d658ddd5898c7ff266",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "CPM Plus v1.0 (1985)(Amstrad)(Disk 4 of 4)[CPM Version].dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "ad43345ac469844465da6d73369cc6b1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "z88dk_cpc.dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "6e4ab38fcc5dc2d8173173dcbf8ca2e1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "z88dk_pcw40.dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "37cfac07eb636ca8181878a06101a955"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "z88dk_pcw80.dsk.lz",
-                MediaType  = MediaType.CompactFloppy,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "17b79ecfd045d1d5d3526b182b32064a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
+                    Start  = 0,
+                    Length = 360
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3D Construction Kit (1991)(Domark)(Disk 1 of 2).dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "ee601c0d2beade20bb5c04b3f5800ff6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3D Construction Kit (1991)(Domark)(Disk 2 of 2)[a].dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "dcb039b3b2ff2d6bdef8bf6c13ef3f83",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3D Construction Kit (1991)(Domark)(Disk 2 of 2).dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "dcb039b3b2ff2d6bdef8bf6c13ef3f83",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        /* TODO: Does not open
+        new BlockImageTestExpected
+        {
+            TestFile   = "3D Construction Kit (1991)(Domark).dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "e1b14e9b744b08a1b2b56fa25f034682"
+        },
+        */ new BlockImageTestExpected
+        {
+            TestFile   = "3D Construction Kit (1991)(Domark)[Objects Disk].dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 387,
+            SectorSize = 512,
+            MD5        = "82007217a3aa6bb91468b71a6dc4bfe5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 387
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "BCPL Compiler v1.0 (1986)(Arnor)[CPM Version].dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "acd60bb0119e0b5aa1790bef344211ac",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "BCPL Compiler v1.0 (1986)(Arnor).dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "0330956c2fe38f278d7cba6f7bd8aa2d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "CPM Plus v1.0 (1985)(Amstrad)(Disk 1 of 4)[a][CPM Version].dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 359,
+            SectorSize = 512,
+            MD5        = "a568e44f556661f9e4b7db01c126c676"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "CPM Plus v1.0 (1985)(Amstrad)(Disk 1 of 4)[CPM Version].dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "5dc0d482a773043d8683a84c8220df95",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "CPM Plus v1.0 (1985)(Amstrad)(Disk 2 of 4)[CPM Version].dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "64edd62fabb381ef49bf3a8f43435824",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "CPM Plus v1.0 (1985)(Amstrad)(Disk 3 of 4)[CPM Version].dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "b381bbc72ab664d658ddd5898c7ff266",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "CPM Plus v1.0 (1985)(Amstrad)(Disk 4 of 4)[CPM Version].dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "ad43345ac469844465da6d73369cc6b1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "z88dk_cpc.dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "6e4ab38fcc5dc2d8173173dcbf8ca2e1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "z88dk_pcw40.dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "37cfac07eb636ca8181878a06101a955"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "z88dk_pcw80.dsk.lz",
+            MediaType  = MediaType.CompactFloppy,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "17b79ecfd045d1d5d3526b182b32064a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/CisCopy/Uncompressed.cs b/Aaru.Tests/Images/CisCopy/Uncompressed.cs
index 84438f7e5..c8f59bc9e 100644
--- a/Aaru.Tests/Images/CisCopy/Uncompressed.cs
+++ b/Aaru.Tests/Images/CisCopy/Uncompressed.cs
@@ -31,333 +31,332 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.CisCopy
+namespace Aaru.Tests.Images.CisCopy;
+
+[TestFixture]
+public class Uncompressed : BlockMediaImageTest
 {
-    [TestFixture]
-    public class Uncompressed : BlockMediaImageTest
+    // TODO: Support compression
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CisCopy");
+    public override IMediaImage _plugin    => new DiscImages.CisCopy();
+
+    public override BlockImageTestExpected[] Tests => new[]
     {
-        // TODO: Support compression
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CisCopy");
-        public override IMediaImage _plugin => new DiscImages.CisCopy();
-
-        public override BlockImageTestExpected[] Tests => new[]
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "md1dd8_all.dcf.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "95c0b76419c1c74db6dbe1d790f97dde",
+            Partitions = new[]
             {
-                TestFile   = "md1dd8_all.dcf.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "95c0b76419c1c74db6dbe1d790f97dde",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd8_belelung.dcf.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "95c0b76419c1c74db6dbe1d790f97dde",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd8_fat.dcf.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6f6507e416b7320d583dc347b8e57844",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd_all.dcf.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "48b93e8619c4c13f4a3724b550e4b371",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd_belelung.dcf.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "48b93e8619c4c13f4a3724b550e4b371",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd_fat.dcf.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "1d060d2e2543e1c2e8569f5451660060",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd8_all.dcf.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "0c93155bbc5e412f5014e037d08c2745",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd8_belelung.dcf.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "0c93155bbc5e412f5014e037d08c2745",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd8_fat.dcf.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "0c93155bbc5e412f5014e037d08c2745",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-
-            // TODO: False positive CP/M filesystem
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_all.dcf.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "d2a33090ec03bfb536e7356deacf4bbc"
-            },
-
-            // TODO: False positive CP/M filesystem
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_belelung.dcf.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "d2a33090ec03bfb536e7356deacf4bbc"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fat.dcf.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "d2a33090ec03bfb536e7356deacf4bbc"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_all.dcf.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "181f3bc62f0b90f74af9d8027ebf7512",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_belelung.dcf.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "181f3bc62f0b90f74af9d8027ebf7512",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_fat.dcf.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "181f3bc62f0b90f74af9d8027ebf7512",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_all.dcf.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "783559ee5e774515d5e7d2feab9c333e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_belelung.dcf.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "783559ee5e774515d5e7d2feab9c333e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fat.dcf.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "783559ee5e774515d5e7d2feab9c333e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_all.dcf.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "91f3fde8d56a536cdda4c6758e5dbc93",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_belelung.dcf.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "91f3fde8d56a536cdda4c6758e5dbc93",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fat.dcf.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "91f3fde8d56a536cdda4c6758e5dbc93",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 320
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd8_belelung.dcf.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "95c0b76419c1c74db6dbe1d790f97dde",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd8_fat.dcf.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6f6507e416b7320d583dc347b8e57844",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd_all.dcf.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "48b93e8619c4c13f4a3724b550e4b371",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd_belelung.dcf.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "48b93e8619c4c13f4a3724b550e4b371",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd_fat.dcf.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "1d060d2e2543e1c2e8569f5451660060",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd8_all.dcf.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "0c93155bbc5e412f5014e037d08c2745",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd8_belelung.dcf.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "0c93155bbc5e412f5014e037d08c2745",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd8_fat.dcf.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "0c93155bbc5e412f5014e037d08c2745",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+
+        // TODO: False positive CP/M filesystem
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_all.dcf.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "d2a33090ec03bfb536e7356deacf4bbc"
+        },
+
+        // TODO: False positive CP/M filesystem
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_belelung.dcf.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "d2a33090ec03bfb536e7356deacf4bbc"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fat.dcf.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "d2a33090ec03bfb536e7356deacf4bbc"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_all.dcf.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "181f3bc62f0b90f74af9d8027ebf7512",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_belelung.dcf.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "181f3bc62f0b90f74af9d8027ebf7512",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_fat.dcf.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "181f3bc62f0b90f74af9d8027ebf7512",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_all.dcf.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "783559ee5e774515d5e7d2feab9c333e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_belelung.dcf.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "783559ee5e774515d5e7d2feab9c333e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fat.dcf.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "783559ee5e774515d5e7d2feab9c333e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_all.dcf.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "91f3fde8d56a536cdda4c6758e5dbc93",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_belelung.dcf.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "91f3fde8d56a536cdda4c6758e5dbc93",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fat.dcf.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "91f3fde8d56a536cdda4c6758e5dbc93",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/CloneCD.cs b/Aaru.Tests/Images/CloneCD.cs
index c32b9c981..697827eca 100644
--- a/Aaru.Tests/Images/CloneCD.cs
+++ b/Aaru.Tests/Images/CloneCD.cs
@@ -32,1820 +32,1819 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class CloneCD : OpticalMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CloneCD");
-        public override IMediaImage _plugin => new CloneCd();
+namespace Aaru.Tests.Images;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class CloneCD : OpticalMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CloneCD");
+    public override IMediaImage _plugin    => new CloneCd();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "cdiready_theapprentice.ccd",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 279300,
+            MD5           = "a9412931e69111ba162d5d8b4822ac3f",
+            LongMD5       = "a9412931e69111ba162d5d8b4822ac3f",
+            SubchannelMD5 = "96f314754e66d95133308d5bb8573536",
+            Tracks = new[]
             {
-                TestFile      = "cdiready_theapprentice.ccd",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 279300,
-                MD5           = "a9412931e69111ba162d5d8b4822ac3f",
-                LongMD5       = "a9412931e69111ba162d5d8b4822ac3f",
-                SubchannelMD5 = "96f314754e66d95133308d5bb8573536",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 88799,
-                        Pregap  = 69300,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 88799,
+                    Pregap  = 69300,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279299,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "jaguarcd.ccd",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 243587,
+            MD5           = "530a6d7a9ce9b60f8c727d2db0f6039e",
+            LongMD5       = "530a6d7a9ce9b60f8c727d2db0f6039e",
+            SubchannelMD5 = "47d4397c640734f5f85fe0c843e480f8",
+            Tracks = new[]
             {
-                TestFile      = "jaguarcd.ccd",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 243587,
-                MD5           = "530a6d7a9ce9b60f8c727d2db0f6039e",
-                LongMD5       = "530a6d7a9ce9b60f8c727d2db0f6039e",
-                SubchannelMD5 = "47d4397c640734f5f85fe0c843e480f8",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16239,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 27490,
-                        End     = 28236,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 28237,
-                        End     = 78891,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 78892,
-                        End     = 100053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 100054,
-                        End     = 133202,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 133203,
-                        End     = 160907,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 160908,
-                        End     = 181465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 181466,
-                        End     = 202023,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 202024,
-                        End     = 222581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 222582,
-                        End     = 243139,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 243140,
-                        End     = 243586,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16239,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 27490,
+                    End     = 28236,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 28237,
+                    End     = 78891,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 78892,
+                    End     = 100053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 100054,
+                    End     = 133202,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 133203,
+                    End     = 160907,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 160908,
+                    End     = 181465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 181466,
+                    End     = 202023,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 202024,
+                    End     = 222581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 222582,
+                    End     = 243139,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 243140,
+                    End     = 243586,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcengine.ccd",
+            MediaType     = MediaType.CD,
+            Sectors       = 160956,
+            MD5           = "127b0a92b00ea9a67df1ed8c80daadc7",
+            LongMD5       = "6ead3bdedb374f7b9bdf24773d30e491",
+            SubchannelMD5 = "315ee5ebb36969b4ce0fb0162f7a9932",
+            Tracks = new[]
             {
-                TestFile      = "pcengine.ccd",
-                MediaType     = MediaType.CD,
-                Sectors       = 160956,
-                MD5           = "127b0a92b00ea9a67df1ed8c80daadc7",
-                LongMD5       = "6ead3bdedb374f7b9bdf24773d30e491",
-                SubchannelMD5 = "315ee5ebb36969b4ce0fb0162f7a9932",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3589,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3590,
+                    End     = 38613,
+                    Pregap  = 0,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3589,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3590,
-                        End     = 38613,
-                        Pregap  = 0,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 28672,
-                                ClusterSize = 2048,
-                                Type        = "PC Engine filesystem"
-                            }
+                            Clusters    = 28672,
+                            ClusterSize = 2048,
+                            Type        = "PC Engine filesystem"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38614,
-                        End     = 47216,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47217,
-                        End     = 53500,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53501,
-                        End     = 61818,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61819,
-                        End     = 68562,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68563,
-                        End     = 75396,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75397,
-                        End     = 83129,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 83130,
-                        End     = 86480,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86481,
-                        End     = 91266,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 91267,
-                        End     = 99273,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99274,
-                        End     = 106692,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106693,
-                        End     = 112237,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112238,
-                        End     = 120269,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 120270,
-                        End     = 126228,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126229,
-                        End     = 160955,
-                        Pregap  = 0,
-                        Flags   = 4
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcfx.ccd",
-                MediaType     = MediaType.CD,
-                Sectors       = 246680,
-                MD5           = "9d538bd1ee1db068685ed59d29185941",
-                LongMD5       = "76f4bd63c13db3e44fbf7acda20f49e2",
-                SubchannelMD5 = "d9804e5f919ffb1531832049df8f0165",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 38614,
+                    End     = 47216,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47217,
+                    End     = 53500,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53501,
+                    End     = 61818,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61819,
+                    End     = 68562,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68563,
+                    End     = 75396,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75397,
+                    End     = 83129,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 83130,
+                    End     = 86480,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86481,
+                    End     = 91266,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 91267,
+                    End     = 99273,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99274,
+                    End     = 106692,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106693,
+                    End     = 112237,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112238,
+                    End     = 120269,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 120270,
+                    End     = 126228,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126229,
+                    End     = 160955,
+                    Pregap  = 0,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcfx.ccd",
+            MediaType     = MediaType.CD,
+            Sectors       = 246680,
+            MD5           = "9d538bd1ee1db068685ed59d29185941",
+            LongMD5       = "76f4bd63c13db3e44fbf7acda20f49e2",
+            SubchannelMD5 = "d9804e5f919ffb1531832049df8f0165",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4394,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4395,
+                    End     = 4908,
+                    Pregap  = 0,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4394,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4395,
-                        End     = 4908,
-                        Pregap  = 0,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 514,
-                                ClusterSize = 2048,
-                                Type        = "PC-FX",
-                                VolumeName  = "同級生２"
-                            }
+                            Bootable    = true,
+                            Clusters    = 514,
+                            ClusterSize = 2048,
+                            Type        = "PC-FX",
+                            VolumeName  = "同級生２"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4909,
-                        End     = 5940,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5941,
-                        End     = 42058,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 42059,
-                        End     = 220794,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220795,
-                        End     = 225645,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225646,
-                        End     = 235497,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235498,
-                        End     = 246679,
-                        Pregap  = 0,
-                        Flags   = 0
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_audiocd.ccd",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "b744ddaf1d4ebd3bd0b96a160f55637d",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.ccd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "c5ae648d586e55afd1108294c9b86ca6",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 4909,
+                    End     = 5940,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 5941,
+                    End     = 42058,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 42059,
+                    End     = 220794,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220795,
+                    End     = 225645,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225646,
+                    End     = 235497,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235498,
+                    End     = 246679,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.ccd",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "b744ddaf1d4ebd3bd0b96a160f55637d",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.ccd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "c5ae648d586e55afd1108294c9b86ca6",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw_2x.ccd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "c73559a91abd57f732c7ea609fef547a",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrw_2x.ccd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "c73559a91abd57f732c7ea609fef547a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_enhancedcd.ccd",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 303316,
+            MD5           = "97e5bf1caf3998e818d40cd845c6ecc9",
+            LongMD5       = "07b4d88c8f38cc0168a2f5725b31c52e",
+            SubchannelMD5 = "a71264ddd9d364a4b1cd0ee4d4a7e1ad",
+            Tracks = new[]
             {
-                TestFile      = "report_enhancedcd.ccd",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 303316,
-                MD5           = "97e5bf1caf3998e818d40cd845c6ecc9",
-                LongMD5       = "07b4d88c8f38cc0168a2f5725b31c52e",
-                SubchannelMD5 = "a71264ddd9d364a4b1cd0ee4d4a7e1ad",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 14,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 14,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_audiocd_cdtext.ccd",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 277696,
+            MD5           = "7c8fc7bb768cff15d702ac8cd10108d7",
+            LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
+            SubchannelMD5 = "2a2918ad19f5bf1b6e52b57e40fe47eb",
+            Tracks = new[]
             {
-                TestFile      = "test_audiocd_cdtext.ccd",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 277696,
-                MD5           = "7c8fc7bb768cff15d702ac8cd10108d7",
-                LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
-                SubchannelMD5 = "2a2918ad19f5bf1b6e52b57e40fe47eb",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 0,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_enhancedcd.ccd",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 59206,
+            MD5           = "0ddda63b1cb61f8f961eabfa90737171",
+            LongMD5       = "666ec8a1213cf4f6adc4675d9dd5955a",
+            SubchannelMD5 = "d6184c3ac1966e61c528ae875627e65c",
+            Tracks = new[]
             {
-                TestFile      = "test_enhancedcd.ccd",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 59206,
-                MD5           = "0ddda63b1cb61f8f961eabfa90737171",
-                LongMD5       = "666ec8a1213cf4f6adc4675d9dd5955a",
-                SubchannelMD5 = "d6184c3ac1966e61c528ae875627e65c",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14404,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14405,
+                    End     = 28952,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 40203,
+                    End     = 59205,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14404,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14405,
-                        End     = 28952,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 40203,
-                        End     = 59205,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 18853,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New"
-                            }
+                            Clusters    = 18853,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_incd_udf200_finalized.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 350134,
+            MD5           = "f95d6f978ddb4f98bbffda403f627fe1",
+            LongMD5       = "6751e0ae7821f92221672b1cd5a1ff36",
+            SubchannelMD5 = "569c87cdc115f2d02b2268fc2b4d8b11",
+            Tracks = new[]
             {
-                TestFile      = "test_incd_udf200_finalized.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 350134,
-                MD5           = "f95d6f978ddb4f98bbffda403f627fe1",
-                LongMD5       = "6751e0ae7821f92221672b1cd5a1ff36",
-                SubchannelMD5 = "569c87cdc115f2d02b2268fc2b4d8b11",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 7,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 7,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 600,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "INCD"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 402107,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "InCD",
-                                VolumeSerial = "40888C15CA13D401InCD"
-                            }
+                            Clusters    = 600,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "INCD"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 402107,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "InCD",
+                            VolumeSerial = "40888C15CA13D401InCD"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_karaoke_multi_sampler.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 329158,
+            MD5           = "9a19aa0df066732a8ec34025e8160248",
+            LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
+            SubchannelMD5 = "c48c09b8c7c4af99de1cf97faaef32fc",
+            Tracks = new[]
             {
-                TestFile      = "test_karaoke_multi_sampler.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 329158,
-                MD5           = "9a19aa0df066732a8ec34025e8160248",
-                LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
-                SubchannelMD5 = "c48c09b8c7c4af99de1cf97faaef32fc",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1887,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multiple_indexes.ccd",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 65536,
-                MD5           = "1b13a8f8aeb23f0b8bbc68518217e771",
-                LongMD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
-                SubchannelMD5 = "d374e82dfcbc4515c09a9a6e5955bf1d",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4803,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4804,
-                        End     = 13874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13875,
-                        End     = 41184,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41185,
-                        End     = 54988,
-                        Pregap  = 0,
-                        Flags   = 8
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 0,
-                        Flags   = 1
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 51168,
-                MD5           = "236f95016ad395ba691517d35a05b767",
-                LongMD5       = "8c48c8951229fd083c1aafcb3e062f2b",
-                SubchannelMD5 = "a49b0b2dcebcc4a106524cb7f0f3c331",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 1887,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multiple_indexes.ccd",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 65536,
+            MD5           = "1b13a8f8aeb23f0b8bbc68518217e771",
+            LongMD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
+            SubchannelMD5 = "d374e82dfcbc4515c09a9a6e5955bf1d",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4803,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4804,
+                    End     = 13874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13875,
+                    End     = 41184,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41185,
+                    End     = 54988,
+                    Pregap  = 0,
+                    Flags   = 8
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 0,
+                    Flags   = 1
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 51168,
+            MD5           = "236f95016ad395ba691517d35a05b767",
+            LongMD5       = "8c48c8951229fd083c1aafcb3e062f2b",
+            SubchannelMD5 = "a49b0b2dcebcc4a106524cb7f0f3c331",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 7876,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 9340,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 1",
-                                VolumeSerial = "50958B61AF6A749E"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                            Clusters    = 7876,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 6170,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 2"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 7381,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 2",
-                                VolumeSerial = "50958BBBAF6A7444"
-                            }
+                            Clusters     = 9340,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 1",
+                            VolumeSerial = "50958B61AF6A749E"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 5360,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 3"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6451,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "Session 3",
-                                VolumeSerial = "50958C19AF6A73E6"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_videocd.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 48794,
-                MD5           = "b640eed2eba209ebba4e6cd3171883a4",
-                LongMD5       = "a1194d29dfb4e207eabf6208f908a213",
-                SubchannelMD5 = "712725733e44be46e55f16569659fd07",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1251,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 6170,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 2"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
+                            Clusters     = 7381,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 2",
+                            VolumeSerial = "50958BBBAF6A7444"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1252,
-                        End     = 48793,
-                        Pregap  = 0,
-                        Flags   = 4
                     }
-                }
-            },
-            #region These test images violate the specifications and are not expected to work yet
-            /*
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_castrated_leadout.ccd",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 1050,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 1049,
-                        Pregap  = 0,
-                        Flags   = 2
+                        new FileSystemTest
+                        {
+                            Clusters    = 5360,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 3"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6451,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "Session 3",
+                            VolumeSerial = "50958C19AF6A73E6"
+                        }
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_disc_starts_at_track2.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "6fa06c10561343438736a8d3d9a965ea",
-                LongMD5       = "c82d20702d31bc15bdc91f7e107862ae",
-                SubchannelMD5 = "976f4684da623c64acee464e9dca046e",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36939,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 48794,
+            MD5           = "b640eed2eba209ebba4e6cd3171883a4",
+            LongMD5       = "a1194d29dfb4e207eabf6208f908a213",
+            SubchannelMD5 = "712725733e44be46e55f16569659fd07",
+            Tracks = new[]
             {
-                TestFile      = "test_data_track_as_audio_fixed_sub.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
-                LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
-                SubchannelMD5 = "a53aba8a0fdb038ef67e68ba009aa5b1",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1251,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36939,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 2
+                        new FileSystemTest
+                        {
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
+                        }
                     }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1252,
+                    End     = 48793,
+                    Pregap  = 0,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        #region These test images violate the specifications and are not expected to work yet
+        /*
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_castrated_leadout.ccd",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 1050,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_data_track_as_audio.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
-                LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
-                SubchannelMD5 = "a53aba8a0fdb038ef67e68ba009aa5b1",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36939,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 1049,
+                    Pregap  = 0,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_disc_starts_at_track2.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "6fa06c10561343438736a8d3d9a965ea",
+            LongMD5       = "c82d20702d31bc15bdc91f7e107862ae",
+            SubchannelMD5 = "976f4684da623c64acee464e9dca046e",
+            Tracks = new[]
             {
-                TestFile      = "test_track0_in_session2.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 36939,
-                MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
-                LongMD5       = "3b3172070738044417ae5284195acbfd",
-                SubchannelMD5 = "7eedb60edb3dc77eac41fd8f2214dfb8",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 36938,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 36939,
-                        End     = 36938,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36939,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio_fixed_sub.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
+            LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
+            SubchannelMD5 = "a53aba8a0fdb038ef67e68ba009aa5b1",
+            Tracks = new[]
             {
-                TestFile      = "test_track111_in_session2_fixed_sub.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 36939,
-                MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
-                LongMD5       = "396f86cdd8bfb012b68eabd5a94f604b",
-                SubchannelMD5 = "c81a161af0fcd01dfd340290178a32fd",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 36938,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 36939,
-                        End     = 36938,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36939,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
+            LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
+            SubchannelMD5 = "a53aba8a0fdb038ef67e68ba009aa5b1",
+            Tracks = new[]
             {
-                TestFile      = "test_track1-2-9_fixed_sub.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 25539,
-                MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
-                LongMD5       = "649047a018bc6c1ba667397049eae888",
-                SubchannelMD5 = "5fcfa6ec0511a0b5c73a817a456d5412",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13349,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13350,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36939,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track0_in_session2.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 36939,
+            MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
+            LongMD5       = "3b3172070738044417ae5284195acbfd",
+            SubchannelMD5 = "7eedb60edb3dc77eac41fd8f2214dfb8",
+            Tracks = new[]
             {
-                TestFile      = "test_track1-2-9.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 25539,
-                MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
-                LongMD5       = "3b3172070738044417ae5284195acbfd",
-                SubchannelMD5 = "5fcfa6ec0511a0b5c73a817a456d5412",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13349,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13350,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 36938,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 36939,
+                    End     = 36938,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track111_in_session2_fixed_sub.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 36939,
+            MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
+            LongMD5       = "396f86cdd8bfb012b68eabd5a94f604b",
+            SubchannelMD5 = "c81a161af0fcd01dfd340290178a32fd",
+            Tracks = new[]
             {
-                TestFile      = "test_track1_overlaps_session2.ccd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 25539,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 113870,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 36938,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 36939,
+                    End     = 36938,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track1-2-9_fixed_sub.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 25539,
+            MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
+            LongMD5       = "649047a018bc6c1ba667397049eae888",
+            SubchannelMD5 = "5fcfa6ec0511a0b5c73a817a456d5412",
+            Tracks = new[]
             {
-                TestFile      = "test_track2_inside_leadout.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 25539,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 62385,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13349,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13350,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track1-2-9.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 25539,
+            MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
+            LongMD5       = "3b3172070738044417ae5284195acbfd",
+            SubchannelMD5 = "5fcfa6ec0511a0b5c73a817a456d5412",
+            Tracks = new[]
             {
-                TestFile      = "test_track2_inside_session2_leadin.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "6fa06c10561343438736a8d3d9a965ea",
-                LongMD5       = "608a73cd10bccdadde68523aead1ee72",
-                SubchannelMD5 = "933f1699ba88a70aff5062f9626ef529",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25499,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 25500,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36939,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13349,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13350,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track1_overlaps_session2.ccd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 25539,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_track2_inside_track1.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "6fa06c10561343438736a8d3d9a965ea",
-                LongMD5       = "450fe640a58c0bc1fc9cd6e779884d2c",
-                SubchannelMD5 = "1bf8af738f8dddb7142b308c245d05f5",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13349,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13350,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36939,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 113870,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 0
                 }
-            },
-            */
-            #endregion
-        };
-    }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_leadout.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 25539,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 62385,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_session2_leadin.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "6fa06c10561343438736a8d3d9a965ea",
+            LongMD5       = "608a73cd10bccdadde68523aead1ee72",
+            SubchannelMD5 = "933f1699ba88a70aff5062f9626ef529",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25499,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 25500,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36939,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_track1.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "6fa06c10561343438736a8d3d9a965ea",
+            LongMD5       = "450fe640a58c0bc1fc9cd6e779884d2c",
+            SubchannelMD5 = "1bf8af738f8dddb7142b308c245d05f5",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13349,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13350,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36939,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        */
+        #endregion
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/Commodore64/D64.cs b/Aaru.Tests/Images/Commodore64/D64.cs
index 7ac2fec02..6ad467aea 100644
--- a/Aaru.Tests/Images/Commodore64/D64.cs
+++ b/Aaru.Tests/Images/Commodore64/D64.cs
@@ -32,25 +32,24 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.Commodore64
-{
-    [TestFixture]
-    public class D64 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Commodore D64");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.Commodore64;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class D64 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Commodore D64");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "0 Grad Nord (1985)(Ariolasoft)(de)(Side A).d64.lz",
-                MediaType  = MediaType.CBM_1540,
-                Sectors    = 683,
-                SectorSize = 256,
-                MD5        = "9205f7ccdb19cfbdb0b46d10e40b2a90"
-            }
-        };
-    }
+            TestFile   = "0 Grad Nord (1985)(Ariolasoft)(de)(Side A).d64.lz",
+            MediaType  = MediaType.CBM_1540,
+            Sectors    = 683,
+            SectorSize = 256,
+            MD5        = "9205f7ccdb19cfbdb0b46d10e40b2a90"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/Commodore64/D81.cs b/Aaru.Tests/Images/Commodore64/D81.cs
index 370ff09d5..58ac29e24 100644
--- a/Aaru.Tests/Images/Commodore64/D81.cs
+++ b/Aaru.Tests/Images/Commodore64/D81.cs
@@ -32,25 +32,24 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.Commodore64
-{
-    [TestFixture]
-    public class D81 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Commodore D81");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.Commodore64;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class D81 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Commodore D81");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "Strategiegames #01 (19xx)(-).d81.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 3200,
-                SectorSize = 256,
-                MD5        = "e84d86b63e798747c42b27b58ab88665"
-            }
-        };
-    }
+            TestFile   = "Strategiegames #01 (19xx)(-).d81.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 3200,
+            SectorSize = 256,
+            MD5        = "e84d86b63e798747c42b27b58ab88665"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/CopyQM.cs b/Aaru.Tests/Images/CopyQM.cs
index b144965f6..8fd24e545 100644
--- a/Aaru.Tests/Images/CopyQM.cs
+++ b/Aaru.Tests/Images/CopyQM.cs
@@ -31,2578 +31,2577 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class CopyQm : BlockMediaImageTest
-    {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CopyQM");
-        public override IMediaImage _plugin    => new DiscImages.CopyQm();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class CopyQm : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "CopyQM");
+    public override IMediaImage _plugin    => new DiscImages.CopyQm();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0000.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "e8bbbd22db87181974e12ba0227ea011"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0001.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "9f5635f3df4d880a500910b0ad1ab535"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0002.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "9176f59e9205846b6212e084f46ed95c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0003.CQM.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0004.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "1045bfd216ae1ae480dd0ef626f5ff39"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0006.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "46fce47baf08c6f093f2c355a603543d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0009.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "95ea232f59e44db374b994cfe7f1c07f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0010.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "9e2b01f4397db2a6c76e2bc267df37b3"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0011.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "dbbf55398d930e14c2b0a035dd1277b9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0012.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "656002e6e620cb3b73c27f4c21d32edb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0013.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "1244cc2c101c66e6bb4ad5183b356b19"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0017.CQM.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "8cad624afc06ab756f9800eba22ee886"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0018.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "84cce7b4d8c8e21040163cd2d03a730c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0019.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 640,
-                SectorSize = 1024,
-                MD5        = "76a1ef9485ffd5da1e9836725e375ada"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0020.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "d236783dfd1dc29f350c51949b1e9e68"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0021.CQM.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "6915f208cdda762eea2fe64ad754e72f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0023.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "b52f26c3c5b9b2cfc93a287a7fca3548"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0024.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2302991363cb3681cffdc4388915b51e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0025.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4e4cafed1cc22ea72201169427e5e1b6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0026.CQM.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "a579b349a5a24218d59a44e36bdb1333"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0027.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 640,
-                SectorSize = 1024,
-                MD5        = "3135430552171a832339a8a93d44cc90"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0028.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1a4c7487382c98b7bc74623ddfb488e6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0029.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 576,
-                SectorSize = 1024,
-                MD5        = "a8a9caa886a338b66181cfa21db6b620"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0030.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "af83d011608042d35021e39aa5e10b2f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0031.CQM.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_40,
-                Sectors    = 640,
-                SectorSize = 256,
-                MD5        = "e640835966327f3f662e1db8e0575510"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0032.CQM.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_40,
-                Sectors    = 640,
-                SectorSize = 256,
-                MD5        = "ff3534234d1d2dd88bf6e83be23d9227"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0033.CQM.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "dfaff34a6556b515642f1e54f839b02e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0034.CQM.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "ca8f5c7f9ed161b03ccb166eb9d62146"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0035.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6642c1a32d2c58e93481d664974fc202",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0036.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "846f01b8b60cb3c775bd66419e977926",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0037.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "5101f89850dc28efbcfb7622086a9ddf",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0038.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "8e570be2ed1f00ddea82e50a2d9c446a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0039.CQM.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "abba2a1ddd60a649047a9c44d94bbeae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0040.CQM.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "e3bc48bec81be5b35be73d41fdffd2ab",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0041.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "43b5068af9d016d1432eb2e12d2b802a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0042.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "5bf2ad4dc300592604b6e32f8b8e2656",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0043.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "cb9a832ca6a4097b8ccc30d2108e1f7d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0044.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "56d181a6bb8713e6b2854fe8887faab6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0045.CQM.lz",
-                MediaType  = MediaType.NEC_35_HD_15,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "41aef7cff26aefda1add8d49c5b962c2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0046.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "2437c5f089f1cba3866b36360b016f16",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2460
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0047.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_8,
-                Sectors    = 1280,
-                SectorSize = 512,
-                MD5        = "bdaa8f17373b265830fdf3a06b794367",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0048.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "629932c285478d0540ff7936aa008351",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0049.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "7a2abef5d4701e2e49abb05af8d4da50",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1476
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0050.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "e3507522c914264f44fb2c92c3170c09",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0051.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "824fe65dbb1a42b6b94f05405ef984f2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0052.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "1a8c2e78e7132cf9ba5d6c2b75876be0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0053.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "936b20bb0966fe693b4d5e2353e24846",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0054.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "803b01a0b440c2837d37c21308f30cd5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0055.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "aa0d31f914760cc4cde75479779ebed6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0056.CQM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "31269ed6464302ae26d22b7c87bceb23",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0057.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "5e413433c54f48978d281c6e66d1106e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0058.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "4fc28b0128543b2eb70f6432c4c8a980",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0059.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3528,
-                SectorSize = 512,
-                MD5        = "24a7459d080cea3a60d131b8fd7dc5d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3528
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0060.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3570,
-                SectorSize = 512,
-                MD5        = "2031b1e16ee2defc0d15f732f633df33",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3570
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0069.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "5fc19ca552b6db957061e9a1750394d2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0070.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "d1e978b679c63a218c3f77a7ca2c7206"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0073.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "a33b46f042b78fe3d0b3c5dbb3908a93",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0074.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "565d3c001cbb532154aa5d3c65b2439c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0075.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "e60442c3ebd72c99bdd7545fdba59613",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0076.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "058a33a129539285c9b64010496af52f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0077.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "0726ecbc38965d30a6222c3e74cd1aa3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0078.CQM.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "c9a193837db7d8a5eb025eb41e8a76d7"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0080.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c38d69ac88520f14fcc6d6ced22b065d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0081.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "91d51964e1e64ef3f6f622fa19aa833c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0082.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "db36d9651c952ff679ec33223c8db2d3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0083.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2988,
-                SectorSize = 512,
-                MD5        = "5f1d98806309aee7f81de72e51e6d386",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2988
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0084.CQM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "1207a1cc7ff73d4f74c8984b4e7db33f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0085.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "c97a3081fd25474b6b7945b8572d5ab8",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0105.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "d40a99cb549fcfb26fcf9ef01b5dfca7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0106.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 410,
-                SectorSize = 512,
-                MD5        = "7b41dd9ca7eb32828960eb1417a6092a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 410
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0107.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "126dfd25363c076727dfaab03955c931",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0108.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 820,
-                SectorSize = 512,
-                MD5        = "e6492aac144f5f6f593b84c64680cf64",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 820
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0109.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0110.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a793047503af08e83361427b3e2806e0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0111.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "f01541de322c8d6d7321084d7a245e7b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0112.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0113.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0114.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a793047503af08e83361427b3e2806e0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
+            TestFile   = "DSKA0000.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "e8bbbd22db87181974e12ba0227ea011"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0001.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "9f5635f3df4d880a500910b0ad1ab535"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0002.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "9176f59e9205846b6212e084f46ed95c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0003.CQM.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0004.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "1045bfd216ae1ae480dd0ef626f5ff39"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0006.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "46fce47baf08c6f093f2c355a603543d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0009.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "95ea232f59e44db374b994cfe7f1c07f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0115.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0116.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "6631b66fdfd89319323771c41334c7ba",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0117.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "56471a253f4d6803b634e2bbff6c0931",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0120.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "7d36aee5a3071ff75b979f3acb649c40",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0121.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "0ccb62039363ab544c69eca229a17fae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0122.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "7851d31fad9302ff45d3ded4fba25387",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0123.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "915b08c82591e8488320e001b7303b6d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0124.CQM.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "5e5ea6fe9adf842221fdc60e56630405",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0125.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0126.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ddc6c1200c60e9f7796280f50c2e5283",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0147.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6efa72a33021d5051546c3e0dd4c3c09"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0148.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "8b5acfd14818ff9556d3d81361ce4862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0149.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 200,
-                SectorSize = 1024,
-                MD5        = "cf42d08469548a31caf2649a1d08a85f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0150.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 1024,
-                MD5        = "62745e10683cf2ec1dac177535459891"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0151.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "298c377de52947c472a85d281b6d3d4d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0153.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "298c377de52947c472a85d281b6d3d4d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0158.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "8b5acfd14818ff9556d3d81361ce4862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0159.CQM.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_40,
-                Sectors    = 640,
-                SectorSize = 256,
-                MD5        = "6efa72a33021d5051546c3e0dd4c3c09"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0162.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "e63014a4299f52f22e6e2c9609f51979"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0163.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0164.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 820,
-                SectorSize = 512,
-                MD5        = "32823b9009c99b6711e89336ad03ec7f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 820
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0166.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1c8b03a8550ed3e70e1c78316aa445aa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0167.CQM.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "185bc63e4304a2d2554615362b2d25c5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0168.CQM.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "0bdf9130c07bb5d558a4705249f949d0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0169.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0173.CQM.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "028769dc0abefab1740cc309432588b6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0174.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "152023525154b45ab26687190bac94db",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0175.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "db38ecd93f28dd065927fed21917eed5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0180.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "f206c0caa4e0eda37233ab6e89ab5493",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0181.CQM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "554492a7b41f4cd9068a3a2b70eb0e5f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0182.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3402,
-                SectorSize = 512,
-                MD5        = "865ad9072cb6c7458f7d86d7e9368622"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0183.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "2461e458438f0033bc5811fd6958ad02"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0184.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "606d5fbf174708c7ecfbfdd2a50fec9c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0185.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 2048,
-                MD5        = "6173d4c7b6a1addb14a4cbe088ede9d7"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0186.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 160,
-                SectorSize = 8192,
-                MD5        = "5f47876d515d9495789f5e27ed313959"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0197.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 600,
-                SectorSize = 256,
-                MD5        = "65531301132413a81f3994eaf0b16f50"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0198.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1200,
-                SectorSize = 256,
-                MD5        = "a13fbf4d230f421d1bc4d21b714dc36b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0199.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2400,
-                SectorSize = 256,
-                MD5        = "de0170cd10ddd839a63370355b2ba4ed"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0200.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "1045bfd216ae1ae480dd0ef626f5ff39"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0201.CQM.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0202.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "1045bfd216ae1ae480dd0ef626f5ff39"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0203.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "8a16a3008739516fc3ba4c878868d056"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0204.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "46fce47baf08c6f093f2c355a603543d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0205.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "ee73a5d5c8dfac236baf7b99811696f9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0206.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "8245ddd644583bd78ac0638133c89824"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0207.CQM.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "33c51a3d6f13cfedb5f08bf4c3cba7b9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0209.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0210.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0211.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "647f14749f59be471aac04a71a079a64"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0212.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "517cdd5e42a4673f733d1aedfb46770f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0213.CQM.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "6ad92e9522e4ba902c01beecb5943bb1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0214.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "8e077143864bb20e36f25a4685860a1e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0215.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "9724c94417cef88b2ad2f3c1db9d8730"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0216.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "40199611e6e75bbc37ad6c52a5b77eae"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0221.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 5120,
-                SectorSize = 256,
-                MD5        = "f92b2e52259531d50bfb403dc1274ab1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0222.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0225.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 990,
-                SectorSize = 256,
-                MD5        = "dbcd4aa7c1c670a667c89b309bd9de42"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0228.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1050,
-                SectorSize = 256,
-                MD5        = "d88f521c048df99b8ef5f01a8a001455"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0232.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 621,
-                SectorSize = 512,
-                MD5        = "b76bd117ce24d933cdefe09b1de2164a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0234.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2400,
-                SectorSize = 256,
-                MD5        = "a50f82253aa4d8dea4fb193d64a66778"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0240.CQM.lz",
-                MediaType  = MediaType.ATARI_525_DD,
-                Sectors    = 720,
-                SectorSize = 256,
-                MD5        = "d1ab955f0961ab94e6cf69f78134a84b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0241.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 714,
-                SectorSize = 256,
-                MD5        = "8b62738f15bcc916a668eaa67eec86e7"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0242.CQM.lz",
-                MediaType  = MediaType.NEC_35_HD_8,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "87a432496cb23b5c2299545500df3553",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0243.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "9866ab8e58fa4be25010184aec4ad3aa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0244.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "9dab329ae098b29889ab08278de38f95"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0245.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "0d71b4952dadbfb1061acc1f4640c787"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0246.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "af7ac6b5b9d2d57dad22dbb64ef7de38"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0247.CQM.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "f8f81f945aaad6fbfe7e2db1905302c1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0248.CQM.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "f6f81c75b5ba45d91c1886c6dda9caee"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0250.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 640,
-                SectorSize = 1024,
-                MD5        = "0b9cb8107cbb94c5e36aea438a04dc98"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0251.CQM.lz",
-                MediaType  = MediaType.ACORN_525_DS_DD,
-                Sectors    = 2560,
-                SectorSize = 256,
-                MD5        = "d075e50705f4ddca7ba4dbc981ec1176"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0252.CQM.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "9f86480c86bae33a5b444e4a7ed55048"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0253.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 640,
-                SectorSize = 1024,
-                MD5        = "231891ccd0cc599cfe25419c669fc5f8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0254.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "5dc0d482a773043d8683a84c8220df95",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0258.CQM.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "855943f9caecdcce9b06f0098d773c6b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0262.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "5ac0a9fc7337f761098f816359b0f6f7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0263.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "1ea6ec8e663218b1372048f6e25795b5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0264.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "77a1167b1b9043496e32b8578cde0ff0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0265.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "4b07d760d65f3f0f8ffa5f2b81cee907",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0266.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "32c044c5c2b0bd13806149a759c14935",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0267.CQM.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "8752095abc13dba3f3467669da333891",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3040
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0268.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "aece7cd34bbba3e75307fa70404d9d30",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0269.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "5289afb16a6e4a33213e3bcca56c6230",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0270.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3320,
-                SectorSize = 512,
-                MD5        = "1aef0a0ba233476db6567878c3c2b266",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0271.CQM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "b96596711f4d2ee85dfda0fe3b9f26c3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0272.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "a4f461af7fda5e93a7ab63fcbb7e7683",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0273.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "8f7f7099d4475f6631fcf0a79b031d61",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0280.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "4feeaf4b4ee5dad85db727fbbda4b6d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0281.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "3c77ca681df78e4cd7baa162aa9b0859",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0282.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "51da1f86c49657ffdb367bb2ddeb7990",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0283.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "b81a4987f89936630b8ebc62e4bbce6e"
-                /* TODO: IndexOutOfRangeException
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0284.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "f76f92dd326c99c5efad5ee58daf72e1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0285.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "b6f2c10e42908e334025bc4ffd81e771",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0287.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "f2f409ea2a62a7866fd2777cc4fc9739",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0288.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1494,
-                SectorSize = 512,
-                MD5        = "3e441d69cec5c3169274e1379de4af4b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1494
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0289.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "30a93f30dd4485c6fc037fe0775d3fc7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0290.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "e0caf02cce5597c98313bcc480366ec7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0291.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "4af4904d2b3c815da7bef7049209f5eb",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0299.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "39bf5a98bcb2185d855ac06378febcfa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0300.CQM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "dc20055b6e6fd6f8e1114d4be2effeed",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0301.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "56af9256cf71d5aac5fd5d363674bc49",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0302.CQM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "bbba1e2d1418e05c3a4e7b4d585d160b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0303.CQM.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "bca3a045e81617f7f5ebb5a8818eac47",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0304.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "a296663cb8e75e94603221352f29cfff",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0305.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ecda36ebf0e1100233cb0ec722c18583",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0307.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "cef2f4fe9b1a32d5c0544f814e634264",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0308.CQM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "bbe58e26b8f8f822cd3edfd37a4e4924",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0311.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "b9b6ebdf711364c979de7cf70c3a438a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0314.CQM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "d37424f367f545acbb397f2bed766843",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0316.CQM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "9963dd6f19ce6bd56eabeccdfbbd821a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0317.CQM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "acf6604559ae8217f7869823e2429024",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0318.CQM.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "23bf2139cdfdc4c16db058fd31ea6481",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0319.CQM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "fa26adda0415f02057b113ad29c80c8d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0320.CQM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "4f2a8d036fefd6c6c88d99eda3aa12b7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0322.CQM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1386,
-                SectorSize = 512,
-                MD5        = "e794a3ffa4069ea999fdf7146710fa9e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1386
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.cqm.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_800.cqm.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos.cqm.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "1ff7649b679ba22ff20d39ff717dbec8",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_blind.cqm.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b4a602f67903c46eef62addb0780aa56",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.cqm.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b4a602f67903c46eef62addb0780aa56",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_168.cqm.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "03c2af6a8ebf4bd6f530335de34ae5dd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos.cqm.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "1a9f2eeb3cbeeb057b9a9a5c6e9b0cc6"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0010.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "9e2b01f4397db2a6c76e2bc267df37b3"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0011.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "dbbf55398d930e14c2b0a035dd1277b9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0012.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "656002e6e620cb3b73c27f4c21d32edb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0013.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "1244cc2c101c66e6bb4ad5183b356b19"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0017.CQM.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "8cad624afc06ab756f9800eba22ee886"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0018.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "84cce7b4d8c8e21040163cd2d03a730c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0019.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 640,
+            SectorSize = 1024,
+            MD5        = "76a1ef9485ffd5da1e9836725e375ada"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0020.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "d236783dfd1dc29f350c51949b1e9e68"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0021.CQM.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "6915f208cdda762eea2fe64ad754e72f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0023.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "b52f26c3c5b9b2cfc93a287a7fca3548"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0024.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2302991363cb3681cffdc4388915b51e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0025.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4e4cafed1cc22ea72201169427e5e1b6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0026.CQM.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "a579b349a5a24218d59a44e36bdb1333"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0027.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 640,
+            SectorSize = 1024,
+            MD5        = "3135430552171a832339a8a93d44cc90"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0028.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1a4c7487382c98b7bc74623ddfb488e6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0029.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 576,
+            SectorSize = 1024,
+            MD5        = "a8a9caa886a338b66181cfa21db6b620"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0030.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "af83d011608042d35021e39aa5e10b2f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0031.CQM.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_40,
+            Sectors    = 640,
+            SectorSize = 256,
+            MD5        = "e640835966327f3f662e1db8e0575510"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0032.CQM.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_40,
+            Sectors    = 640,
+            SectorSize = 256,
+            MD5        = "ff3534234d1d2dd88bf6e83be23d9227"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0033.CQM.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "dfaff34a6556b515642f1e54f839b02e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0034.CQM.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "ca8f5c7f9ed161b03ccb166eb9d62146"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0035.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6642c1a32d2c58e93481d664974fc202",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0036.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "846f01b8b60cb3c775bd66419e977926",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0037.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "5101f89850dc28efbcfb7622086a9ddf",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0038.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "8e570be2ed1f00ddea82e50a2d9c446a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0039.CQM.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "abba2a1ddd60a649047a9c44d94bbeae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0040.CQM.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "e3bc48bec81be5b35be73d41fdffd2ab",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0041.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "43b5068af9d016d1432eb2e12d2b802a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0042.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "5bf2ad4dc300592604b6e32f8b8e2656",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0043.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "cb9a832ca6a4097b8ccc30d2108e1f7d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0044.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "56d181a6bb8713e6b2854fe8887faab6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0045.CQM.lz",
+            MediaType  = MediaType.NEC_35_HD_15,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "41aef7cff26aefda1add8d49c5b962c2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0046.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "2437c5f089f1cba3866b36360b016f16",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2460
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0047.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_8,
+            Sectors    = 1280,
+            SectorSize = 512,
+            MD5        = "bdaa8f17373b265830fdf3a06b794367",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0048.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "629932c285478d0540ff7936aa008351",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0049.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "7a2abef5d4701e2e49abb05af8d4da50",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1476
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0050.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "e3507522c914264f44fb2c92c3170c09",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0051.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "824fe65dbb1a42b6b94f05405ef984f2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0052.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "1a8c2e78e7132cf9ba5d6c2b75876be0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0053.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "936b20bb0966fe693b4d5e2353e24846",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0054.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "803b01a0b440c2837d37c21308f30cd5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0055.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "aa0d31f914760cc4cde75479779ebed6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0056.CQM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "31269ed6464302ae26d22b7c87bceb23",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0057.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "5e413433c54f48978d281c6e66d1106e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0058.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "4fc28b0128543b2eb70f6432c4c8a980",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0059.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3528,
+            SectorSize = 512,
+            MD5        = "24a7459d080cea3a60d131b8fd7dc5d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3528
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0060.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3570,
+            SectorSize = 512,
+            MD5        = "2031b1e16ee2defc0d15f732f633df33",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3570
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0069.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "5fc19ca552b6db957061e9a1750394d2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0070.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "d1e978b679c63a218c3f77a7ca2c7206"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0073.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "a33b46f042b78fe3d0b3c5dbb3908a93",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0074.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "565d3c001cbb532154aa5d3c65b2439c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0075.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "e60442c3ebd72c99bdd7545fdba59613",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0076.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "058a33a129539285c9b64010496af52f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0077.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "0726ecbc38965d30a6222c3e74cd1aa3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0078.CQM.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "c9a193837db7d8a5eb025eb41e8a76d7"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0080.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c38d69ac88520f14fcc6d6ced22b065d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0081.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "91d51964e1e64ef3f6f622fa19aa833c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0082.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "db36d9651c952ff679ec33223c8db2d3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0083.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2988,
+            SectorSize = 512,
+            MD5        = "5f1d98806309aee7f81de72e51e6d386",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2988
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0084.CQM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "1207a1cc7ff73d4f74c8984b4e7db33f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0085.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "c97a3081fd25474b6b7945b8572d5ab8",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0105.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "d40a99cb549fcfb26fcf9ef01b5dfca7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0106.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 410,
+            SectorSize = 512,
+            MD5        = "7b41dd9ca7eb32828960eb1417a6092a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 410
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0107.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "126dfd25363c076727dfaab03955c931",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0108.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 820,
+            SectorSize = 512,
+            MD5        = "e6492aac144f5f6f593b84c64680cf64",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 820
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0109.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0110.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a793047503af08e83361427b3e2806e0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0111.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "f01541de322c8d6d7321084d7a245e7b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0112.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0113.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0114.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a793047503af08e83361427b3e2806e0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0115.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0116.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "6631b66fdfd89319323771c41334c7ba",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0117.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "56471a253f4d6803b634e2bbff6c0931",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0120.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "7d36aee5a3071ff75b979f3acb649c40",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0121.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "0ccb62039363ab544c69eca229a17fae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0122.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "7851d31fad9302ff45d3ded4fba25387",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0123.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "915b08c82591e8488320e001b7303b6d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0124.CQM.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "5e5ea6fe9adf842221fdc60e56630405",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0125.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0126.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ddc6c1200c60e9f7796280f50c2e5283",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0147.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6efa72a33021d5051546c3e0dd4c3c09"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0148.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "8b5acfd14818ff9556d3d81361ce4862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0149.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 200,
+            SectorSize = 1024,
+            MD5        = "cf42d08469548a31caf2649a1d08a85f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0150.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 1024,
+            MD5        = "62745e10683cf2ec1dac177535459891"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0151.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "298c377de52947c472a85d281b6d3d4d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0153.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "298c377de52947c472a85d281b6d3d4d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0158.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "8b5acfd14818ff9556d3d81361ce4862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0159.CQM.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_40,
+            Sectors    = 640,
+            SectorSize = 256,
+            MD5        = "6efa72a33021d5051546c3e0dd4c3c09"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0162.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "e63014a4299f52f22e6e2c9609f51979"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0163.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0164.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 820,
+            SectorSize = 512,
+            MD5        = "32823b9009c99b6711e89336ad03ec7f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 820
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0166.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1c8b03a8550ed3e70e1c78316aa445aa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0167.CQM.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "185bc63e4304a2d2554615362b2d25c5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0168.CQM.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "0bdf9130c07bb5d558a4705249f949d0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0169.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0173.CQM.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "028769dc0abefab1740cc309432588b6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0174.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "152023525154b45ab26687190bac94db",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0175.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "db38ecd93f28dd065927fed21917eed5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0180.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "f206c0caa4e0eda37233ab6e89ab5493",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0181.CQM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "554492a7b41f4cd9068a3a2b70eb0e5f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0182.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3402,
+            SectorSize = 512,
+            MD5        = "865ad9072cb6c7458f7d86d7e9368622"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0183.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "2461e458438f0033bc5811fd6958ad02"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0184.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "606d5fbf174708c7ecfbfdd2a50fec9c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0185.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 2048,
+            MD5        = "6173d4c7b6a1addb14a4cbe088ede9d7"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0186.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 160,
+            SectorSize = 8192,
+            MD5        = "5f47876d515d9495789f5e27ed313959"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0197.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 600,
+            SectorSize = 256,
+            MD5        = "65531301132413a81f3994eaf0b16f50"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0198.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1200,
+            SectorSize = 256,
+            MD5        = "a13fbf4d230f421d1bc4d21b714dc36b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0199.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2400,
+            SectorSize = 256,
+            MD5        = "de0170cd10ddd839a63370355b2ba4ed"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0200.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "1045bfd216ae1ae480dd0ef626f5ff39"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0201.CQM.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0202.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "1045bfd216ae1ae480dd0ef626f5ff39"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0203.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "8a16a3008739516fc3ba4c878868d056"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0204.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "46fce47baf08c6f093f2c355a603543d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0205.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "ee73a5d5c8dfac236baf7b99811696f9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0206.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "8245ddd644583bd78ac0638133c89824"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0207.CQM.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "33c51a3d6f13cfedb5f08bf4c3cba7b9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0209.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0210.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0211.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "647f14749f59be471aac04a71a079a64"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0212.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "517cdd5e42a4673f733d1aedfb46770f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0213.CQM.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "6ad92e9522e4ba902c01beecb5943bb1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0214.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "8e077143864bb20e36f25a4685860a1e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0215.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "9724c94417cef88b2ad2f3c1db9d8730"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0216.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "40199611e6e75bbc37ad6c52a5b77eae"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0221.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 5120,
+            SectorSize = 256,
+            MD5        = "f92b2e52259531d50bfb403dc1274ab1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0222.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0225.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 990,
+            SectorSize = 256,
+            MD5        = "dbcd4aa7c1c670a667c89b309bd9de42"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0228.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1050,
+            SectorSize = 256,
+            MD5        = "d88f521c048df99b8ef5f01a8a001455"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0232.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 621,
+            SectorSize = 512,
+            MD5        = "b76bd117ce24d933cdefe09b1de2164a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0234.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2400,
+            SectorSize = 256,
+            MD5        = "a50f82253aa4d8dea4fb193d64a66778"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0240.CQM.lz",
+            MediaType  = MediaType.ATARI_525_DD,
+            Sectors    = 720,
+            SectorSize = 256,
+            MD5        = "d1ab955f0961ab94e6cf69f78134a84b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0241.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 714,
+            SectorSize = 256,
+            MD5        = "8b62738f15bcc916a668eaa67eec86e7"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0242.CQM.lz",
+            MediaType  = MediaType.NEC_35_HD_8,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "87a432496cb23b5c2299545500df3553",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0243.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "9866ab8e58fa4be25010184aec4ad3aa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0244.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "9dab329ae098b29889ab08278de38f95"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0245.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "0d71b4952dadbfb1061acc1f4640c787"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0246.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "af7ac6b5b9d2d57dad22dbb64ef7de38"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0247.CQM.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "f8f81f945aaad6fbfe7e2db1905302c1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0248.CQM.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "f6f81c75b5ba45d91c1886c6dda9caee"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0250.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 640,
+            SectorSize = 1024,
+            MD5        = "0b9cb8107cbb94c5e36aea438a04dc98"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0251.CQM.lz",
+            MediaType  = MediaType.ACORN_525_DS_DD,
+            Sectors    = 2560,
+            SectorSize = 256,
+            MD5        = "d075e50705f4ddca7ba4dbc981ec1176"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0252.CQM.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "9f86480c86bae33a5b444e4a7ed55048"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0253.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 640,
+            SectorSize = 1024,
+            MD5        = "231891ccd0cc599cfe25419c669fc5f8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0254.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "5dc0d482a773043d8683a84c8220df95",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0258.CQM.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "855943f9caecdcce9b06f0098d773c6b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0262.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "5ac0a9fc7337f761098f816359b0f6f7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0263.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "1ea6ec8e663218b1372048f6e25795b5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0264.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "77a1167b1b9043496e32b8578cde0ff0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0265.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "4b07d760d65f3f0f8ffa5f2b81cee907",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0266.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "32c044c5c2b0bd13806149a759c14935",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0267.CQM.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "8752095abc13dba3f3467669da333891",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3040
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0268.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "aece7cd34bbba3e75307fa70404d9d30",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0269.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "5289afb16a6e4a33213e3bcca56c6230",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0270.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3320,
+            SectorSize = 512,
+            MD5        = "1aef0a0ba233476db6567878c3c2b266",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0271.CQM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "b96596711f4d2ee85dfda0fe3b9f26c3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0272.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "a4f461af7fda5e93a7ab63fcbb7e7683",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0273.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "8f7f7099d4475f6631fcf0a79b031d61",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0280.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "4feeaf4b4ee5dad85db727fbbda4b6d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0281.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "3c77ca681df78e4cd7baa162aa9b0859",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0282.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "51da1f86c49657ffdb367bb2ddeb7990",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0283.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "b81a4987f89936630b8ebc62e4bbce6e"
+            /* TODO: IndexOutOfRangeException
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0284.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "f76f92dd326c99c5efad5ee58daf72e1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0285.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "b6f2c10e42908e334025bc4ffd81e771",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0287.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "f2f409ea2a62a7866fd2777cc4fc9739",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0288.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1494,
+            SectorSize = 512,
+            MD5        = "3e441d69cec5c3169274e1379de4af4b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1494
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0289.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "30a93f30dd4485c6fc037fe0775d3fc7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0290.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "e0caf02cce5597c98313bcc480366ec7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0291.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "4af4904d2b3c815da7bef7049209f5eb",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0299.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "39bf5a98bcb2185d855ac06378febcfa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0300.CQM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "dc20055b6e6fd6f8e1114d4be2effeed",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0301.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "56af9256cf71d5aac5fd5d363674bc49",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0302.CQM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "bbba1e2d1418e05c3a4e7b4d585d160b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0303.CQM.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "bca3a045e81617f7f5ebb5a8818eac47",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0304.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "a296663cb8e75e94603221352f29cfff",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0305.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ecda36ebf0e1100233cb0ec722c18583",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0307.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "cef2f4fe9b1a32d5c0544f814e634264",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0308.CQM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "bbe58e26b8f8f822cd3edfd37a4e4924",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0311.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "b9b6ebdf711364c979de7cf70c3a438a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0314.CQM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "d37424f367f545acbb397f2bed766843",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0316.CQM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "9963dd6f19ce6bd56eabeccdfbbd821a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0317.CQM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "acf6604559ae8217f7869823e2429024",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0318.CQM.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "23bf2139cdfdc4c16db058fd31ea6481",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0319.CQM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "fa26adda0415f02057b113ad29c80c8d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0320.CQM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "4f2a8d036fefd6c6c88d99eda3aa12b7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0322.CQM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1386,
+            SectorSize = 512,
+            MD5        = "e794a3ffa4069ea999fdf7146710fa9e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1386
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.cqm.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_800.cqm.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "c533488a21098a62c85f1649abda2803",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos.cqm.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "1ff7649b679ba22ff20d39ff717dbec8",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_blind.cqm.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b4a602f67903c46eef62addb0780aa56",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.cqm.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b4a602f67903c46eef62addb0780aa56",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_168.cqm.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "03c2af6a8ebf4bd6f530335de34ae5dd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos.cqm.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "1a9f2eeb3cbeeb057b9a9a5c6e9b0cc6"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/CopyTape.cs b/Aaru.Tests/Images/CopyTape.cs
index 30162908d..bd4d2e02e 100644
--- a/Aaru.Tests/Images/CopyTape.cs
+++ b/Aaru.Tests/Images/CopyTape.cs
@@ -32,717 +32,716 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.CommonTypes.Structs;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class CopyTape : TapeMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "copytape");
-        public override IMediaImage _plugin => new DiscImages.CopyTape();
+namespace Aaru.Tests.Images;
 
-        public override TapeImageTestExpected[] Tests => new[]
+[TestFixture]
+public class CopyTape : TapeMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "copytape");
+    public override IMediaImage _plugin    => new DiscImages.CopyTape();
+
+    public override TapeImageTestExpected[] Tests => new[]
+    {
+        new TapeImageTestExpected
         {
-            new TapeImageTestExpected
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Boot Tape).cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 1604,
+            SectorSize = 10240,
+            MD5        = "a6334d975523b3422fea522b0cc118a9",
+            Partitions = new[]
             {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Boot Tape).cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 1604,
-                SectorSize = 10240,
-                MD5        = "a6334d975523b3422fea522b0cc118a9",
-                Partitions = new[]
+                new TapePartition
                 {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 1603,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 1603,
-                        Partition  = 0
-                    }
+                    FirstBlock = 0,
+                    LastBlock  = 1603,
+                    Number     = 0
                 }
             },
-            new TapeImageTestExpected
+            Files = new[]
             {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Integrity SX25 VME V5.0+).cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 15485,
-                SectorSize = 512,
-                MD5        = "17ef78d9e5c53b976f530d4ca44223fd",
-                Partitions = new[]
+                new TapeFile
                 {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 15484,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 15484,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Online Software Upgrade).cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 15,
-                SectorSize = 32256,
-                MD5        = "76c0ae10f4ec70ef8681b212f02a71c8",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 14,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 14,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Operating System).cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 3298,
-                SectorSize = 32256,
-                MD5        = "e331c9d0ae7c25c81c6580bc9965e2d0",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 3297,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 3297,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Optional Packages).cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 3152,
-                SectorSize = 32256,
-                MD5        = "018c37c40f8df91ab9b098d643c9ae6c",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 3151,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 3151,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (OSF-Motif 1.2.4).cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 818,
-                SectorSize = 32256,
-                MD5        = "eb3ce36b2c3afeeec59e5b8ed802a393",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 817,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 817,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Reliable Ethernet).cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 7,
-                SectorSize = 32256,
-                MD5        = "b057656698a224187afb2bdbb8caf7f3",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 6,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 6,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "Nonstop-UX System V Release 4 B32 (Required Packages).cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 684,
-                SectorSize = 32256,
-                MD5        = "8e48e388e7094f3170065718ab618b53",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 683,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 683,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "OpenWindows.3.0.exabyte.cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 73525,
-                SectorSize = 1024,
-                MD5        = "8861f8c06a2e93ca5a81d729ad3e1de1",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 73524,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 0,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 1,
-                        FirstBlock = 1,
-                        LastBlock  = 164,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 2,
-                        FirstBlock = 165,
-                        LastBlock  = 2412,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 3,
-                        FirstBlock = 2413,
-                        LastBlock  = 5612,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 4,
-                        FirstBlock = 5613,
-                        LastBlock  = 73524,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "OpenWindows.3.0.Q150.cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 290,
-                SectorSize = 262144,
-                MD5        = "bfc402b23af0cf1ad22d9fb2ea29b58f",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 289,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 0,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 1,
-                        FirstBlock = 1,
-                        LastBlock  = 1,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 2,
-                        FirstBlock = 2,
-                        LastBlock  = 10,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 3,
-                        FirstBlock = 11,
-                        LastBlock  = 23,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 4,
-                        FirstBlock = 24,
-                        LastBlock  = 289,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "OS.MP.4.1C.exabyte.cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 37587,
-                SectorSize = 8192,
-                MD5        = "e4a3e2fe26c72ca025ac0c017ec73ee9",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 37586,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 1,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 1,
-                        FirstBlock = 2,
-                        LastBlock  = 3,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 2,
-                        FirstBlock = 4,
-                        LastBlock  = 6860,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 3,
-                        FirstBlock = 6861,
-                        LastBlock  = 13773,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 4,
-                        FirstBlock = 13774,
-                        LastBlock  = 20263,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 5,
-                        FirstBlock = 20264,
-                        LastBlock  = 20299,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 6,
-                        FirstBlock = 20300,
-                        LastBlock  = 22603,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 7,
-                        FirstBlock = 22604,
-                        LastBlock  = 23472,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 8,
-                        FirstBlock = 23473,
-                        LastBlock  = 24946,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 9,
-                        FirstBlock = 24947,
-                        LastBlock  = 26436,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 10,
-                        FirstBlock = 26437,
-                        LastBlock  = 27720,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 11,
-                        FirstBlock = 27721,
-                        LastBlock  = 31922,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 12,
-                        FirstBlock = 31923,
-                        LastBlock  = 32283,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 13,
-                        FirstBlock = 32284,
-                        LastBlock  = 32675,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 14,
-                        FirstBlock = 32676,
-                        LastBlock  = 33549,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 15,
-                        FirstBlock = 33550,
-                        LastBlock  = 33686,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 16,
-                        FirstBlock = 33687,
-                        LastBlock  = 33909,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 17,
-                        FirstBlock = 33910,
-                        LastBlock  = 33949,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 18,
-                        FirstBlock = 33950,
-                        LastBlock  = 34180,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 19,
-                        FirstBlock = 34181,
-                        LastBlock  = 34573,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 20,
-                        FirstBlock = 34574,
-                        LastBlock  = 35072,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 21,
-                        FirstBlock = 35073,
-                        LastBlock  = 35163,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 22,
-                        FirstBlock = 35164,
-                        LastBlock  = 35908,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 23,
-                        FirstBlock = 35909,
-                        LastBlock  = 35984,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 24,
-                        FirstBlock = 35985,
-                        LastBlock  = 36098,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 25,
-                        FirstBlock = 36099,
-                        LastBlock  = 36270,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 26,
-                        FirstBlock = 36271,
-                        LastBlock  = 36276,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 27,
-                        FirstBlock = 36277,
-                        LastBlock  = 36647,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 28,
-                        FirstBlock = 36648,
-                        LastBlock  = 37111,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 29,
-                        FirstBlock = 37112,
-                        LastBlock  = 37583,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 30,
-                        FirstBlock = 37584,
-                        LastBlock  = 37584,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 31,
-                        FirstBlock = 37585,
-                        LastBlock  = 37585,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 32,
-                        FirstBlock = 37586,
-                        LastBlock  = 37586,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "X.3.0.exabyte.cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 25046,
-                SectorSize = 1024,
-                MD5        = "e625c03d7493dc22fe49f91f731446e8",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 25045,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 0,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 1,
-                        FirstBlock = 1,
-                        LastBlock  = 61,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 2,
-                        FirstBlock = 62,
-                        LastBlock  = 149,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 3,
-                        FirstBlock = 150,
-                        LastBlock  = 2781,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 4,
-                        FirstBlock = 2782,
-                        LastBlock  = 11885,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 5,
-                        FirstBlock = 11886,
-                        LastBlock  = 25045,
-                        Partition  = 0
-                    }
-                }
-            },
-            new TapeImageTestExpected
-            {
-                TestFile   = "X.3.Q150.cptp.lz",
-                MediaType  = MediaType.UnknownTape,
-                Sectors    = 102,
-                SectorSize = 262144,
-                MD5        = "198464b1daf8e674debf8eda0fcbf016",
-                Partitions = new[]
-                {
-                    new TapePartition
-                    {
-                        FirstBlock = 0,
-                        LastBlock  = 101,
-                        Number     = 0
-                    }
-                },
-                Files = new[]
-                {
-                    new TapeFile
-                    {
-                        File       = 0,
-                        FirstBlock = 0,
-                        LastBlock  = 0,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 1,
-                        FirstBlock = 1,
-                        LastBlock  = 1,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 2,
-                        FirstBlock = 2,
-                        LastBlock  = 2,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 3,
-                        FirstBlock = 3,
-                        LastBlock  = 13,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 4,
-                        FirstBlock = 14,
-                        LastBlock  = 49,
-                        Partition  = 0
-                    },
-                    new TapeFile
-                    {
-                        File       = 5,
-                        FirstBlock = 50,
-                        LastBlock  = 101,
-                        Partition  = 0
-                    }
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 1603,
+                    Partition  = 0
                 }
             }
-        };
-    }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Integrity SX25 VME V5.0+).cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 15485,
+            SectorSize = 512,
+            MD5        = "17ef78d9e5c53b976f530d4ca44223fd",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 15484,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 15484,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Online Software Upgrade).cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 15,
+            SectorSize = 32256,
+            MD5        = "76c0ae10f4ec70ef8681b212f02a71c8",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 14,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 14,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Operating System).cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 3298,
+            SectorSize = 32256,
+            MD5        = "e331c9d0ae7c25c81c6580bc9965e2d0",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 3297,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 3297,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Optional Packages).cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 3152,
+            SectorSize = 32256,
+            MD5        = "018c37c40f8df91ab9b098d643c9ae6c",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 3151,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 3151,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (OSF-Motif 1.2.4).cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 818,
+            SectorSize = 32256,
+            MD5        = "eb3ce36b2c3afeeec59e5b8ed802a393",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 817,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 817,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Reliable Ethernet).cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 7,
+            SectorSize = 32256,
+            MD5        = "b057656698a224187afb2bdbb8caf7f3",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 6,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 6,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "Nonstop-UX System V Release 4 B32 (Required Packages).cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 684,
+            SectorSize = 32256,
+            MD5        = "8e48e388e7094f3170065718ab618b53",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 683,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 683,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "OpenWindows.3.0.exabyte.cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 73525,
+            SectorSize = 1024,
+            MD5        = "8861f8c06a2e93ca5a81d729ad3e1de1",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 73524,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 0,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 1,
+                    FirstBlock = 1,
+                    LastBlock  = 164,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 2,
+                    FirstBlock = 165,
+                    LastBlock  = 2412,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 3,
+                    FirstBlock = 2413,
+                    LastBlock  = 5612,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 4,
+                    FirstBlock = 5613,
+                    LastBlock  = 73524,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "OpenWindows.3.0.Q150.cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 290,
+            SectorSize = 262144,
+            MD5        = "bfc402b23af0cf1ad22d9fb2ea29b58f",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 289,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 0,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 1,
+                    FirstBlock = 1,
+                    LastBlock  = 1,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 2,
+                    FirstBlock = 2,
+                    LastBlock  = 10,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 3,
+                    FirstBlock = 11,
+                    LastBlock  = 23,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 4,
+                    FirstBlock = 24,
+                    LastBlock  = 289,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "OS.MP.4.1C.exabyte.cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 37587,
+            SectorSize = 8192,
+            MD5        = "e4a3e2fe26c72ca025ac0c017ec73ee9",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 37586,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 1,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 1,
+                    FirstBlock = 2,
+                    LastBlock  = 3,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 2,
+                    FirstBlock = 4,
+                    LastBlock  = 6860,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 3,
+                    FirstBlock = 6861,
+                    LastBlock  = 13773,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 4,
+                    FirstBlock = 13774,
+                    LastBlock  = 20263,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 5,
+                    FirstBlock = 20264,
+                    LastBlock  = 20299,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 6,
+                    FirstBlock = 20300,
+                    LastBlock  = 22603,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 7,
+                    FirstBlock = 22604,
+                    LastBlock  = 23472,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 8,
+                    FirstBlock = 23473,
+                    LastBlock  = 24946,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 9,
+                    FirstBlock = 24947,
+                    LastBlock  = 26436,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 10,
+                    FirstBlock = 26437,
+                    LastBlock  = 27720,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 11,
+                    FirstBlock = 27721,
+                    LastBlock  = 31922,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 12,
+                    FirstBlock = 31923,
+                    LastBlock  = 32283,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 13,
+                    FirstBlock = 32284,
+                    LastBlock  = 32675,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 14,
+                    FirstBlock = 32676,
+                    LastBlock  = 33549,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 15,
+                    FirstBlock = 33550,
+                    LastBlock  = 33686,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 16,
+                    FirstBlock = 33687,
+                    LastBlock  = 33909,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 17,
+                    FirstBlock = 33910,
+                    LastBlock  = 33949,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 18,
+                    FirstBlock = 33950,
+                    LastBlock  = 34180,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 19,
+                    FirstBlock = 34181,
+                    LastBlock  = 34573,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 20,
+                    FirstBlock = 34574,
+                    LastBlock  = 35072,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 21,
+                    FirstBlock = 35073,
+                    LastBlock  = 35163,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 22,
+                    FirstBlock = 35164,
+                    LastBlock  = 35908,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 23,
+                    FirstBlock = 35909,
+                    LastBlock  = 35984,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 24,
+                    FirstBlock = 35985,
+                    LastBlock  = 36098,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 25,
+                    FirstBlock = 36099,
+                    LastBlock  = 36270,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 26,
+                    FirstBlock = 36271,
+                    LastBlock  = 36276,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 27,
+                    FirstBlock = 36277,
+                    LastBlock  = 36647,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 28,
+                    FirstBlock = 36648,
+                    LastBlock  = 37111,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 29,
+                    FirstBlock = 37112,
+                    LastBlock  = 37583,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 30,
+                    FirstBlock = 37584,
+                    LastBlock  = 37584,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 31,
+                    FirstBlock = 37585,
+                    LastBlock  = 37585,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 32,
+                    FirstBlock = 37586,
+                    LastBlock  = 37586,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "X.3.0.exabyte.cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 25046,
+            SectorSize = 1024,
+            MD5        = "e625c03d7493dc22fe49f91f731446e8",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 25045,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 0,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 1,
+                    FirstBlock = 1,
+                    LastBlock  = 61,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 2,
+                    FirstBlock = 62,
+                    LastBlock  = 149,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 3,
+                    FirstBlock = 150,
+                    LastBlock  = 2781,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 4,
+                    FirstBlock = 2782,
+                    LastBlock  = 11885,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 5,
+                    FirstBlock = 11886,
+                    LastBlock  = 25045,
+                    Partition  = 0
+                }
+            }
+        },
+        new TapeImageTestExpected
+        {
+            TestFile   = "X.3.Q150.cptp.lz",
+            MediaType  = MediaType.UnknownTape,
+            Sectors    = 102,
+            SectorSize = 262144,
+            MD5        = "198464b1daf8e674debf8eda0fcbf016",
+            Partitions = new[]
+            {
+                new TapePartition
+                {
+                    FirstBlock = 0,
+                    LastBlock  = 101,
+                    Number     = 0
+                }
+            },
+            Files = new[]
+            {
+                new TapeFile
+                {
+                    File       = 0,
+                    FirstBlock = 0,
+                    LastBlock  = 0,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 1,
+                    FirstBlock = 1,
+                    LastBlock  = 1,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 2,
+                    FirstBlock = 2,
+                    LastBlock  = 2,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 3,
+                    FirstBlock = 3,
+                    LastBlock  = 13,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 4,
+                    FirstBlock = 14,
+                    LastBlock  = 49,
+                    Partition  = 0
+                },
+                new TapeFile
+                {
+                    File       = 5,
+                    FirstBlock = 50,
+                    LastBlock  = 101,
+                    Partition  = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/D88.cs b/Aaru.Tests/Images/D88.cs
index ab77c632a..e7bd12a08 100644
--- a/Aaru.Tests/Images/D88.cs
+++ b/Aaru.Tests/Images/D88.cs
@@ -31,207 +31,206 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
+namespace Aaru.Tests.Images;
+
+[TestFixture]
+public class D88 : BlockMediaImageTest
 {
-    [TestFixture]
-    public class D88 : BlockMediaImageTest
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "D88");
+    public override IMediaImage _plugin    => new DiscImages.D88();
+    public override BlockImageTestExpected[] Tests => new[]
     {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "D88");
-        public override IMediaImage _plugin    => new DiscImages.D88();
-        public override BlockImageTestExpected[] Tests => new[]
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "1942 (1987)(ASCII)(JP).d77.lz",
+            MediaType  = MediaType.NEC_525_SS,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "a4103c39cd7fd9fc3de8418dfcf22364"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "'Ashe (1988)(Quasar)(Disk 4 of 4)(User Disk).d88.lz",
+            MediaType  = MediaType.NEC_525_SS,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "b948048c03e0b3d34d77f5c9dced0b41"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "Crimsin (1988)(Xtalsoft)(Disk 3 of 3).d88.lz",
+            MediaType  = MediaType.NEC_525_SS,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "f91152fab791d4dc0677a289d90478a5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "Dragon Slayer (1986)(Falcom - Login)(JP).d88.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 411,
+            SectorSize = 256,
+            MD5        = "39b01df04a6312b09f1b83c9f3a46b22"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "D-Side - Lagrange L-2 Part II (1986)(Compaq)(JP).d88.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1440,
+            SectorSize = 256,
+            MD5        = "ef775ec1f41b8b725ea83ec8c5ca04e2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "File Master FM, The v1.01 (1986)(Kyoto Media)(JP).d77.lz",
+            MediaType  = MediaType.NEC_525_SS,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "5c2b22f824524cd6c539aaeb2ecb84cd"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "Gandhara (1987)(Enix)(JP).d88.lz",
+            MediaType  = MediaType.NEC_525_SS,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "6bddf3dd32877f7b552cbf9da6b89f76"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "Might & Magic (198x)(Star Craft)(Disk 1 of 3)(Disk A).d88.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 4033,
+            SectorSize = 128,
+            MD5        = "003cd0292879733b6eab7ca79ab9cfeb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos33d_md2dd.d88.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "acb738a5a945e4e2ba1504a14a529933"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos33d_md2hd.d88.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "106068dbdf13803979c7bbb63612f43d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos50_epson_md2dd.d88.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "be916f25847b9cfc9776d88cc150ae7e",
+            Partitions = new[]
             {
-                TestFile   = "1942 (1987)(ASCII)(JP).d77.lz",
-                MediaType  = MediaType.NEC_525_SS,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "a4103c39cd7fd9fc3de8418dfcf22364"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "'Ashe (1988)(Quasar)(Disk 4 of 4)(User Disk).d88.lz",
-                MediaType  = MediaType.NEC_525_SS,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "b948048c03e0b3d34d77f5c9dced0b41"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "Crimsin (1988)(Xtalsoft)(Disk 3 of 3).d88.lz",
-                MediaType  = MediaType.NEC_525_SS,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "f91152fab791d4dc0677a289d90478a5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "Dragon Slayer (1986)(Falcom - Login)(JP).d88.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 411,
-                SectorSize = 256,
-                MD5        = "39b01df04a6312b09f1b83c9f3a46b22"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "D-Side - Lagrange L-2 Part II (1986)(Compaq)(JP).d88.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1440,
-                SectorSize = 256,
-                MD5        = "ef775ec1f41b8b725ea83ec8c5ca04e2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "File Master FM, The v1.01 (1986)(Kyoto Media)(JP).d77.lz",
-                MediaType  = MediaType.NEC_525_SS,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "5c2b22f824524cd6c539aaeb2ecb84cd"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "Gandhara (1987)(Enix)(JP).d88.lz",
-                MediaType  = MediaType.NEC_525_SS,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "6bddf3dd32877f7b552cbf9da6b89f76"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "Might & Magic (198x)(Star Craft)(Disk 1 of 3)(Disk A).d88.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 4033,
-                SectorSize = 128,
-                MD5        = "003cd0292879733b6eab7ca79ab9cfeb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos33d_md2dd.d88.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "acb738a5a945e4e2ba1504a14a529933"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos33d_md2hd.d88.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "106068dbdf13803979c7bbb63612f43d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos50_epson_md2dd.d88.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "be916f25847b9cfc9776d88cc150ae7e",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
+                    Start  = 0,
+                    Length = 1440
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos50_epson_md2hd.d88.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "ccc7f98e216db35c2b7a08634a9f3e20",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos50_md2dd.d88.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "7a3332e82b0fe8c5673a2615f6c0b9a2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos50_md2hd.d88.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "62f5be96a8b8ccab9ee4aebf557cfcf7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos62_md2dd.d88.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "07fb4c225d4b5a2e2a1046ae66fc153c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "msdos62_md2hd.d88.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "1f73980e45a384bed331eaa33c9ef65b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "R-Type (1988)(Irem)(Disk 1 of 2).d88.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1284,
-                SectorSize = 1024,
-                MD5        = "9d675e5147b55cee0b2bc05476eef825"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "Towns System Software v1.1L30 (1992)(Fujitsu)(JP).d88.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "bb48546ced9c61462e1c89dca4987143",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "Visual Instrument Player (198x)(Kamiya)(JP)(Disk 1 of 2).d88.lz",
-                MediaType  = MediaType.NEC_525_SS,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "c7df67f4e66dad658fe856d3c8b36c7a"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos50_epson_md2hd.d88.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "ccc7f98e216db35c2b7a08634a9f3e20",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos50_md2dd.d88.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "7a3332e82b0fe8c5673a2615f6c0b9a2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos50_md2hd.d88.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "62f5be96a8b8ccab9ee4aebf557cfcf7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos62_md2dd.d88.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "07fb4c225d4b5a2e2a1046ae66fc153c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "msdos62_md2hd.d88.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "1f73980e45a384bed331eaa33c9ef65b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "R-Type (1988)(Irem)(Disk 1 of 2).d88.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1284,
+            SectorSize = 1024,
+            MD5        = "9d675e5147b55cee0b2bc05476eef825"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "Towns System Software v1.1L30 (1992)(Fujitsu)(JP).d88.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "bb48546ced9c61462e1c89dca4987143",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "Visual Instrument Player (198x)(Kamiya)(JP)(Disk 1 of 2).d88.lz",
+            MediaType  = MediaType.NEC_525_SS,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "c7df67f4e66dad658fe856d3c8b36c7a"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DART.cs b/Aaru.Tests/Images/DART.cs
index c7df7827d..812e2c4e7 100644
--- a/Aaru.Tests/Images/DART.cs
+++ b/Aaru.Tests/Images/DART.cs
@@ -31,84 +31,83 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class Dart : BlockMediaImageTest
-    {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DART");
-        public override IMediaImage _plugin    => new DiscImages.Dart();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Dart : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DART");
+    public override IMediaImage _plugin    => new DiscImages.Dart();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_hfs_fast.dart.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "eae3a95671d077deb702b3549a769f56"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_mfs_fast.dart.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_hfs_fast.dart.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a99744348a70b62b57bce2dec9132ced"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_mfs_fast.dart.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "93e71b9ecdb39d3ec9245b4f451856d4"
-            }
-            #region Unsupported LZH compression
-            /*
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_hfs_best.dart.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "eae3a95671d077deb702b3549a769f56"
-            },
-           new BlockImageTestExpected
-           {
-               TestFile   = "mf1dd_mfs_best.dart.lz",
-               MediaType  = MediaType.AppleSonySS,
-               Sectors    = 800,
-               SectorSize = 512,
-               MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec"
-           },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_hfs_best.dart.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a99744348a70b62b57bce2dec9132ced"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_mfs_best.dart.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "93e71b9ecdb39d3ec9245b4f451856d4"
-            },
-            */
-            #endregion Unsupported LZH compression
-        };
-    }
+            TestFile   = "mf1dd_hfs_fast.dart.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "eae3a95671d077deb702b3549a769f56"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_mfs_fast.dart.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_hfs_fast.dart.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a99744348a70b62b57bce2dec9132ced"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_mfs_fast.dart.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "93e71b9ecdb39d3ec9245b4f451856d4"
+        }
+        #region Unsupported LZH compression
+        /*
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_hfs_best.dart.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "eae3a95671d077deb702b3549a769f56"
+        },
+       new BlockImageTestExpected
+       {
+           TestFile   = "mf1dd_mfs_best.dart.lz",
+           MediaType  = MediaType.AppleSonySS,
+           Sectors    = 800,
+           SectorSize = 512,
+           MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec"
+       },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_hfs_best.dart.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a99744348a70b62b57bce2dec9132ced"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_mfs_best.dart.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "93e71b9ecdb39d3ec9245b4f451856d4"
+        },
+        */
+        #endregion Unsupported LZH compression
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiscJuggler.cs b/Aaru.Tests/Images/DiscJuggler.cs
index 83dae7066..6671506c2 100644
--- a/Aaru.Tests/Images/DiscJuggler.cs
+++ b/Aaru.Tests/Images/DiscJuggler.cs
@@ -31,2082 +31,2081 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
+namespace Aaru.Tests.Images;
+
+[TestFixture]
+public class DiscJuggler : OpticalMediaImageTest
 {
-    [TestFixture]
-    public class DiscJuggler : OpticalMediaImageTest
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiscJuggler");
+    public override IMediaImage _plugin => new DiscImages.DiscJuggler();
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiscJuggler");
-        public override IMediaImage _plugin => new DiscImages.DiscJuggler();
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "jaguarcd.cdi",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 243587,
+            MD5           = "01de32dcb21ac62be269ddd3bc99ab3e",
+            LongMD5       = "01de32dcb21ac62be269ddd3bc99ab3e",
+            SubchannelMD5 = "214794f37c41d1e2727eba68efdd369d",
+            Tracks = new[]
             {
-                TestFile      = "jaguarcd.cdi",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 243587,
-                MD5           = "01de32dcb21ac62be269ddd3bc99ab3e",
-                LongMD5       = "01de32dcb21ac62be269ddd3bc99ab3e",
-                SubchannelMD5 = "214794f37c41d1e2727eba68efdd369d",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16239,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 27490,
-                        End     = 28087,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 28088,
-                        End     = 78741,
-                        Pregap  = 149,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 78742,
-                        End     = 99904,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 99905,
-                        End     = 133053,
-                        Pregap  = 149,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 133054,
-                        End     = 160758,
-                        Pregap  = 149,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 160759,
-                        End     = 181316,
-                        Pregap  = 149,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 181317,
-                        End     = 201874,
-                        Pregap  = 149,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 201875,
-                        End     = 222432,
-                        Pregap  = 149,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 222433,
-                        End     = 242990,
-                        Pregap  = 149,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 242991,
-                        End     = 243586,
-                        Pregap  = 149,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16239,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 27490,
+                    End     = 28087,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 28088,
+                    End     = 78741,
+                    Pregap  = 149,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 78742,
+                    End     = 99904,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 99905,
+                    End     = 133053,
+                    Pregap  = 149,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 133054,
+                    End     = 160758,
+                    Pregap  = 149,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 160759,
+                    End     = 181316,
+                    Pregap  = 149,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 181317,
+                    End     = 201874,
+                    Pregap  = 149,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 201875,
+                    End     = 222432,
+                    Pregap  = 149,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 222433,
+                    End     = 242990,
+                    Pregap  = 149,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 242991,
+                    End     = 243586,
+                    Pregap  = 149,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "make_audiocd.cdi",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 277696,
+            MD5           = "0c355a31a7a488ec387c4508c498d6c0",
+            LongMD5       = "0c355a31a7a488ec387c4508c498d6c0",
+            SubchannelMD5 = "ac79fa4b07a042bcdd033a3e0319a0ae",
+            Tracks = new[]
             {
-                TestFile      = "make_audiocd.cdi",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 277696,
-                MD5           = "0c355a31a7a488ec387c4508c498d6c0",
-                LongMD5       = "0c355a31a7a488ec387c4508c498d6c0",
-                SubchannelMD5 = "ac79fa4b07a042bcdd033a3e0319a0ae",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet.cdi",
+            MediaType = MediaType.CDROM,
+            Sectors   = 83063,
+            MD5       = "9f1251feaed14a62326ab399b73342e3",
+            LongMD5   = "8ae1725d36537af9395ece058992e2b3",
+            Tracks = new[]
             {
-                TestFile  = "make_data_mode1_joliet.cdi",
-                MediaType = MediaType.CDROM,
-                Sectors   = 83063,
-                MD5       = "9f1251feaed14a62326ab399b73342e3",
-                LongMD5   = "8ae1725d36537af9395ece058992e2b3",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83062,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83062,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet.cdi",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 83077,
+            MD5       = "68d39977149d3062b41dba6c1ff475cf",
+            LongMD5   = "382b5d7957ee7e19b0e9dd7db866e4c4",
+            Tracks = new[]
             {
-                TestFile  = "make_data_mode2_joliet.cdi",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 83077,
-                MD5       = "68d39977149d3062b41dba6c1ff475cf",
-                LongMD5   = "382b5d7957ee7e19b0e9dd7db866e4c4",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83076,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83076,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_dvd.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 84896,
+            MD5       = "5240b794f12174da73915e8c1f38b6a4",
+            LongMD5   = "5240b794f12174da73915e8c1f38b6a4",
+            Tracks = new[]
             {
-                TestFile  = "make_dvd.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 84896,
-                MD5       = "5240b794f12174da73915e8c1f38b6a4",
-                LongMD5   = "5240b794f12174da73915e8c1f38b6a4",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84895,
-                        Pregap  = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84895,
+                    Pregap  = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_enhancedcd.cdi",
+            MediaType = MediaType.CD,
+            Sectors   = 335666,
+            MD5       = "ce5de948ef5d1fccd1c1664451b1ba10",
+            LongMD5   = "fe4165656cc6023b999d9fbf05501b25",
+            Tracks = new[]
             {
-                TestFile  = "make_enhancedcd.cdi",
-                MediaType = MediaType.CD,
-                Sectors   = 335666,
-                MD5       = "ce5de948ef5d1fccd1c1664451b1ba10",
-                LongMD5   = "fe4165656cc6023b999d9fbf05501b25",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 288946,
-                        End     = 335665,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 288946,
+                    End     = 335665,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_mixed_mode.cdi",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 360909,
+            MD5       = "a5eba1d1bfeae8d6eea6c8abfdf79be4",
+            LongMD5   = "b981912374fe50f91c91085e31028886",
+            Tracks = new[]
             {
-                TestFile  = "make_mixed_mode.cdi",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 360909,
-                MD5       = "a5eba1d1bfeae8d6eea6c8abfdf79be4",
-                LongMD5   = "b981912374fe50f91c91085e31028886",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83062,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 83063,
-                        End     = 113114,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 113115,
-                        End     = 148396,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 148397,
-                        End     = 161788,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 161789,
-                        End     = 178442,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 178443,
-                        End     = 209509,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 209510,
-                        End     = 238321,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 238322,
-                        End     = 275047,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 275048,
-                        End     = 306138,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 306139,
-                        End     = 326800,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 326801,
-                        End     = 352962,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 352963,
-                        End     = 360908,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83062,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 83063,
+                    End     = 113114,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 113115,
+                    End     = 148396,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 148397,
+                    End     = 161788,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 161789,
+                    End     = 178442,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 178443,
+                    End     = 209509,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 209510,
+                    End     = 238321,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 238322,
+                    End     = 275047,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 275048,
+                    End     = 306138,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 306139,
+                    End     = 326800,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 326801,
+                    End     = 352962,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 352963,
+                    End     = 360908,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_multisession_dvd.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 86560,
+            MD5       = "95388d443073217e7cc4cf6b0391ec7f",
+            LongMD5   = "95388d443073217e7cc4cf6b0391ec7f",
+            Tracks = new[]
             {
-                TestFile  = "make_multisession_dvd.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 86560,
-                MD5       = "95388d443073217e7cc4cf6b0391ec7f",
-                LongMD5   = "95388d443073217e7cc4cf6b0391ec7f",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86559
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86559
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_pangram_mode1_joliet.cdi",
+            MediaType = MediaType.CDROM,
+            Sectors   = 642,
+            MD5       = "36477c851cd6184034c86cc61cdd0e60",
+            LongMD5   = "1b11183918ed5a2295f89272e2fa5810",
+            Tracks = new[]
             {
-                TestFile  = "make_pangram_mode1_joliet.cdi",
-                MediaType = MediaType.CDROM,
-                Sectors   = 642,
-                MD5       = "36477c851cd6184034c86cc61cdd0e60",
-                LongMD5   = "1b11183918ed5a2295f89272e2fa5810",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 641,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 641,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_pangram_mode2_joliet.cdi",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 656,
+            MD5       = "ea2e0354dccd3dfdca6242154f024b59",
+            LongMD5   = "18c580f0621cabdd9fc81be6275c41f0",
+            Tracks = new[]
             {
-                TestFile  = "make_pangram_mode2_joliet.cdi",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 656,
-                MD5       = "ea2e0354dccd3dfdca6242154f024b59",
-                LongMD5   = "18c580f0621cabdd9fc81be6275c41f0",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 655,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 655,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcengine.cdi",
+            MediaType     = MediaType.CD,
+            Sectors       = 160956,
+            MD5           = "4fc2665cec77b289a68d35edbdd50730",
+            LongMD5       = "afabe77571db99e29cf4e6854b6f523e",
+            SubchannelMD5 = "c2026374c196855ee95f19de967f3ba1",
+            Tracks = new[]
             {
-                TestFile      = "pcengine.cdi",
-                MediaType     = MediaType.CD,
-                Sectors       = 160956,
-                MD5           = "4fc2665cec77b289a68d35edbdd50730",
-                LongMD5       = "afabe77571db99e29cf4e6854b6f523e",
-                SubchannelMD5 = "c2026374c196855ee95f19de967f3ba1",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3364,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3365,
+                    End     = 38463,
+                    Pregap  = 225,
+                    Flags   = 0,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3364,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3365,
-                        End     = 38463,
-                        Pregap  = 225,
-                        Flags   = 0,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 28672,
-                                ClusterSize = 2048,
-                                Type        = "PC Engine filesystem"
-                            }
+                            Clusters    = 28672,
+                            ClusterSize = 2048,
+                            Type        = "PC Engine filesystem"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38464,
-                        End     = 47216,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47217,
-                        End     = 53500,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53501,
-                        End     = 61818,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61819,
-                        End     = 68562,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68563,
-                        End     = 75396,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75397,
-                        End     = 83129,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 83130,
-                        End     = 86480,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86481,
-                        End     = 91266,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 91267,
-                        End     = 99273,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99274,
-                        End     = 106692,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106693,
-                        End     = 112237,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112238,
-                        End     = 120269,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 120270,
-                        End     = 126003,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126004,
-                        End     = 160955,
-                        Pregap  = 225,
-                        Flags   = 4
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "pcfx.cdi",
-                MediaType = MediaType.CD,
-                Sectors   = 246680,
-                MD5       = "2e872a5cfa43959183677398ede15c08",
-                LongMD5   = "a8939e0fd28ee0bd876101b218af3572",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 38464,
+                    End     = 47216,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47217,
+                    End     = 53500,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53501,
+                    End     = 61818,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61819,
+                    End     = 68562,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68563,
+                    End     = 75396,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75397,
+                    End     = 83129,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 83130,
+                    End     = 86480,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86481,
+                    End     = 91266,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 91267,
+                    End     = 99273,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99274,
+                    End     = 106692,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106693,
+                    End     = 112237,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112238,
+                    End     = 120269,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 120270,
+                    End     = 126003,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126004,
+                    End     = 160955,
+                    Pregap  = 225,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "pcfx.cdi",
+            MediaType = MediaType.CD,
+            Sectors   = 246680,
+            MD5       = "2e872a5cfa43959183677398ede15c08",
+            LongMD5   = "a8939e0fd28ee0bd876101b218af3572",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4244,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4245,
+                    End     = 4758,
+                    Pregap  = 150,
+                    Flags   = 0,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4244,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4245,
-                        End     = 4758,
-                        Pregap  = 150,
-                        Flags   = 0,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 364,
-                                ClusterSize = 2048,
-                                Type        = "PC-FX",
-                                VolumeName  = "同級生２"
-                            }
+                            Bootable    = true,
+                            Clusters    = 364,
+                            ClusterSize = 2048,
+                            Type        = "PC-FX",
+                            VolumeName  = "同級生２"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4759,
-                        End     = 5790,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5791,
-                        End     = 41908,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41909,
-                        End     = 220644,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220645,
-                        End     = 225645,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225646,
-                        End     = 235497,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235498,
-                        End     = 246679,
-                        Pregap  = 0,
-                        Flags   = 4
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_audiocd.cdi",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                MD5           = "9f8abbb08746f86d7c3d0b1b22f1fcc2",
-                LongMD5       = "9f8abbb08746f86d7c3d0b1b22f1fcc2",
-                SubchannelMD5 = "1045e621183bf4c8a9d641f8a5767fec",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16398,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16399,
-                        End     = 30050,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47799,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47800,
-                        End     = 63163,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63164,
-                        End     = 78774,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78775,
-                        End     = 94581,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94582,
-                        End     = 116974,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 116975,
-                        End     = 136015,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136016,
-                        End     = 153921,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153922,
-                        End     = 170600,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170601,
-                        End     = 186388,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186389,
-                        End     = 201648,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201649,
-                        End     = 224298,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224299,
-                        End     = 247072,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdr.cdi",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "dc02efe9c59c0d0e72bb7d26d7f01bce",
-                Tracks = new[]
+                    Session = 1,
+                    Start   = 4759,
+                    End     = 5790,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 5791,
+                    End     = 41908,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41909,
+                    End     = 220644,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220645,
+                    End     = 225645,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225646,
+                    End     = 235497,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235498,
+                    End     = 246679,
+                    Pregap  = 0,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.cdi",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            MD5           = "9f8abbb08746f86d7c3d0b1b22f1fcc2",
+            LongMD5       = "9f8abbb08746f86d7c3d0b1b22f1fcc2",
+            SubchannelMD5 = "1045e621183bf4c8a9d641f8a5767fec",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16398,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16399,
+                    End     = 30050,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47799,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47800,
+                    End     = 63163,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63164,
+                    End     = 78774,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78775,
+                    End     = 94581,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94582,
+                    End     = 116974,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 116975,
+                    End     = 136015,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136016,
+                    End     = 153921,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153922,
+                    End     = 170600,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170601,
+                    End     = 186388,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186389,
+                    End     = 201648,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201649,
+                    End     = 224298,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224299,
+                    End     = 247072,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.cdi",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "dc02efe9c59c0d0e72bb7d26d7f01bce",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.cdi",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "e0d121ac5c0e4e30a823ac445942feae",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrom.cdi",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "e0d121ac5c0e4e30a823ac445942feae",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw_2x.cdi",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "82e9a16a532717d7b733258d674073c3",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrw_2x.cdi",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "82e9a16a532717d7b733258d674073c3",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v1.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 1218961,
+            MD5       = "b04c88635c5d493c250c289964018a7a",
+            LongMD5   = "b04c88635c5d493c250c289964018a7a",
+            Tracks = new[]
             {
-                TestFile  = "report_dvdram_v1.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 1218961,
-                MD5       = "b04c88635c5d493c250c289964018a7a",
-                LongMD5   = "b04c88635c5d493c250c289964018a7a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1218960,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1218960,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v2.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2236705,
+            MD5       = "c0823b070513d02c9f272986f23e74e8",
+            LongMD5   = "c0823b070513d02c9f272986f23e74e8",
+            Tracks = new[]
             {
-                TestFile  = "report_dvdram_v2.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2236705,
-                MD5       = "c0823b070513d02c9f272986f23e74e8",
-                LongMD5   = "c0823b070513d02c9f272986f23e74e8",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2236704,
+                    Pregap  = 0,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2236704,
-                        Pregap  = 0,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-r.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146368,
+            MD5       = "106f141400355476b499213f36a363f9",
+            LongMD5   = "106f141400355476b499213f36a363f9",
+            Tracks = new[]
             {
-                TestFile  = "report_dvd-r.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146368,
-                MD5       = "106f141400355476b499213f36a363f9",
-                LongMD5   = "106f141400355476b499213f36a363f9",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+r-dl.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 3455936,
+            MD5       = "692148a01b4204160b088141fb52bd70",
+            LongMD5   = "692148a01b4204160b088141fb52bd70",
+            Tracks = new[]
             {
-                TestFile  = "report_dvd+r-dl.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 3455936,
-                MD5       = "692148a01b4204160b088141fb52bd70",
-                LongMD5   = "692148a01b4204160b088141fb52bd70",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3455935,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3455935,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters     = 3455936,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Test DVD",
-                                VolumeSerial = "483E25D50034BBB0"
-                            }
+                            Clusters     = 3455936,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Test DVD",
+                            VolumeSerial = "483E25D50034BBB0"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdrom.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146368,
+            MD5       = "106f141400355476b499213f36a363f9",
+            LongMD5   = "106f141400355476b499213f36a363f9",
+            Tracks = new[]
             {
-                TestFile  = "report_dvdrom.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146368,
-                MD5       = "106f141400355476b499213f36a363f9",
-                LongMD5   = "106f141400355476b499213f36a363f9",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+rw.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2295104,
+            MD5       = "759e9c19389aee07f88a994132b6f8d9",
+            LongMD5   = "759e9c19389aee07f88a994132b6f8d9",
+            Tracks = new[]
             {
-                TestFile  = "report_dvd+rw.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2295104,
-                MD5       = "759e9c19389aee07f88a994132b6f8d9",
-                LongMD5   = "759e9c19389aee07f88a994132b6f8d9",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2295103,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2295103,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-rw.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146368,
+            MD5       = "106f141400355476b499213f36a363f9",
+            LongMD5   = "106f141400355476b499213f36a363f9",
+            Tracks = new[]
             {
-                TestFile  = "report_dvd-rw.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146368,
-                MD5       = "106f141400355476b499213f36a363f9",
-                LongMD5   = "106f141400355476b499213f36a363f9",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_enhancedcd.cdi",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 303316,
+            MD5           = "7a76c22590401d57b84396c9fc2925e4",
+            LongMD5       = "63a318522c436ccd6b3ac3959bdb417f",
+            SubchannelMD5 = "2581844f8192c719da44ba57e8e5512b",
+            Tracks = new[]
             {
-                TestFile      = "report_enhancedcd.cdi",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 303316,
-                MD5           = "7a76c22590401d57b84396c9fc2925e4",
-                LongMD5       = "63a318522c436ccd6b3ac3959bdb417f",
-                SubchannelMD5 = "2581844f8192c719da44ba57e8e5512b",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 14,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 14,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_audiocd_cdtext.cdi",
+            MediaType = MediaType.CDDA,
+            Sectors   = 277696,
+            MD5       = "52d7a2793b7600dc94d007f5e7dfd942",
+            LongMD5   = "52d7a2793b7600dc94d007f5e7dfd942",
+            Tracks = new[]
             {
-                TestFile  = "test_audiocd_cdtext.cdi",
-                MediaType = MediaType.CDDA,
-                Sectors   = 277696,
-                MD5       = "52d7a2793b7600dc94d007f5e7dfd942",
-                LongMD5   = "52d7a2793b7600dc94d007f5e7dfd942",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 0,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_enhancedcd.cdi",
+            MediaType = MediaType.CDPLUS,
+            Sectors   = 59206,
+            MD5       = "31054e6b8f4d51fe502ac340490bcd46",
+            LongMD5   = "2fc4b8966350322ed3fd553b9e628164",
+            Tracks = new[]
             {
-                TestFile  = "test_enhancedcd.cdi",
-                MediaType = MediaType.CDPLUS,
-                Sectors   = 59206,
-                MD5       = "31054e6b8f4d51fe502ac340490bcd46",
-                LongMD5   = "2fc4b8966350322ed3fd553b9e628164",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14404,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14405,
+                    End     = 28952,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 40203,
+                    End     = 59205,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14404,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14405,
-                        End     = 28952,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 40203,
-                        End     = 59205,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 18853,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New"
-                            }
+                            Clusters    = 18853,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_incd_udf200_finalized.cdi",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 350134,
+            MD5       = "d976a8d0131bf48926542160bb41fc13",
+            LongMD5   = "cd55978d00f1bc127a0e652259ba2418",
+            Tracks = new[]
             {
-                TestFile  = "test_incd_udf200_finalized.cdi",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 350134,
-                MD5       = "d976a8d0131bf48926542160bb41fc13",
-                LongMD5   = "cd55978d00f1bc127a0e652259ba2418",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 7,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 7,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 600,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "INCD"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 399371,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "InCD",
-                                VolumeSerial = "40888C15CA13D401InCD"
-                            }
+                            Clusters    = 600,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "INCD"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 399371,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "InCD",
+                            VolumeSerial = "40888C15CA13D401InCD"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_karaoke_multi_sampler.cdi",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 329158,
+            MD5           = "a34e29e42b60023a6ae59f37d2bd4bea",
+            LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
+            SubchannelMD5 = "62164333675c194acbe14eed5213e4f4",
+            Tracks = new[]
             {
-                TestFile      = "test_karaoke_multi_sampler.cdi",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 329158,
-                MD5           = "a34e29e42b60023a6ae59f37d2bd4bea",
-                LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
-                SubchannelMD5 = "62164333675c194acbe14eed5213e4f4",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32748,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multiple_indexes.cdi",
-                MediaType = MediaType.CDDA,
-                Sectors   = 65536,
-                MD5       = "9315c6fc3cf5371ae3795df2b624bd5e",
-                LongMD5   = "9315c6fc3cf5371ae3795df2b624bd5e",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32748,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multiple_indexes.cdi",
+            MediaType = MediaType.CDDA,
+            Sectors   = 65536,
+            MD5       = "9315c6fc3cf5371ae3795df2b624bd5e",
+            LongMD5   = "9315c6fc3cf5371ae3795df2b624bd5e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4803,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4804,
+                    End     = 13874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13875,
+                    End     = 41184,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41185,
+                    End     = 54988,
+                    Pregap  = 0,
+                    Flags   = 8
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 0,
+                    Flags   = 1
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multisession.cdi",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 51168,
+            MD5       = "46e43ed4712e5ae61b653b4d19f27080",
+            LongMD5   = "cac33e71b4693b2902f086a0a433129d",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4803,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4804,
-                        End     = 13874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13875,
-                        End     = 41184,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41185,
-                        End     = 54988,
-                        Pregap  = 0,
-                        Flags   = 8
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 0,
-                        Flags   = 1
+                        new FileSystemTest
+                        {
+                            Clusters    = 7876,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 9276,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 1",
+                            VolumeSerial = "50958B61AF6A749E"
+                        }
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multisession.cdi",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 51168,
-                MD5       = "46e43ed4712e5ae61b653b4d19f27080",
-                LongMD5   = "cac33e71b4693b2902f086a0a433129d",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 7876,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 9276,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 1",
-                                VolumeSerial = "50958B61AF6A749E"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                            Clusters    = 6170,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 2"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 6170,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 2"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 7330,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 2",
-                                VolumeSerial = "50958BBBAF6A7444"
-                            }
+                            Clusters     = 7330,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 2",
+                            VolumeSerial = "50958BBBAF6A7444"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 5360,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 3"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6408,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "Session 3",
-                                VolumeSerial = "50958C19AF6A73E6"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multisession_dvd+r.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 230624,
-                MD5       = "020993315e49ab0d36bc7248819162ea",
-                LongMD5   = "020993315e49ab0d36bc7248819162ea",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 230623,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 22016,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            }
+                            Clusters    = 5360,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 3"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6408,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "Session 3",
+                            VolumeSerial = "50958C19AF6A73E6"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multisession_dvd+r.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 230624,
+            MD5       = "020993315e49ab0d36bc7248819162ea",
+            LongMD5   = "020993315e49ab0d36bc7248819162ea",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 230623,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 22016,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multisession_dvd-r.cdi",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 257264,
+            MD5       = "dff8f2107a4ea9633a88ce38ff609b8e",
+            LongMD5   = "dff8f2107a4ea9633a88ce38ff609b8e",
+            Tracks = new[]
             {
-                TestFile  = "test_multisession_dvd-r.cdi",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 257264,
-                MD5       = "dff8f2107a4ea9633a88ce38ff609b8e",
-                LongMD5   = "dff8f2107a4ea9633a88ce38ff609b8e",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 257263,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 257263,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 206560,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            }
+                            Clusters    = 206560,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_videocd.cdi",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 48794,
+            MD5       = "e5b596e73f46f646a51e1315b59e7cb9",
+            LongMD5   = "acd1a8de676ebe6feeb9d6964ccd63ea",
+            Tracks = new[]
             {
-                TestFile  = "test_videocd.cdi",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 48794,
-                MD5       = "e5b596e73f46f646a51e1315b59e7cb9",
-                LongMD5   = "acd1a8de676ebe6feeb9d6964ccd63ea",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1101,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1101,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1102,
-                        End     = 48793,
-                        Pregap  = 150,
-                        Flags   = 4
                     }
-                }
-            },
-            #region These test images violate the specifications and are not expected to work yet
-            /*
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_data_track_as_audio.cdi",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 50985,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 1
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 1102,
+                    End     = 48793,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        #region These test images violate the specifications and are not expected to work yet
+        /*
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio.cdi",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 50985,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_data_track_as_audio_fixed_sub.cdi",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 50985,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 1
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio_fixed_sub.cdi",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 50985,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_disc_starts_at_track2.cdi",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 50985,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_disc_starts_at_track2.cdi",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 50985,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_track111_in_session2.cdi",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1,
-                        End     = 1,
-                        Pregap  = 1,
-                        Flags   = 1
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track111_in_session2.cdi",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_track111_in_session2_fixed_sub.cdi",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1,
-                        End     = 1,
-                        Pregap  = 1,
-                        Flags   = 1
-                    }
+                    Session = 1,
+                    Start   = 1,
+                    End     = 1,
+                    Pregap  = 1,
+                    Flags   = 1
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track111_in_session2_fixed_sub.cdi",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_track2_inside_track1.cdi",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1,
-                        End     = 1,
-                        Pregap  = 1,
-                        Flags   = 1
-                    }
+                    Session = 1,
+                    Start   = 1,
+                    End     = 1,
+                    Pregap  = 1,
+                    Flags   = 1
                 }
-            },
-            */
-            #endregion
-        };
-    }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_track1.cdi",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1,
+                    End     = 1,
+                    Pregap  = 1,
+                    Flags   = 1
+                }
+            }
+        },
+        */
+        #endregion
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy42.cs
index 39a65a136..99b1a668e 100644
--- a/Aaru.Tests/Images/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskCopy42.cs
@@ -31,88 +31,87 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
+namespace Aaru.Tests.Images;
+
+[TestFixture]
+public class DiskCopy42 : BlockMediaImageTest
 {
-    [TestFixture]
-    public class DiskCopy42 : BlockMediaImageTest
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 4.2");
+    public override IMediaImage _plugin => new DiscImages.DiskCopy42();
+    public override BlockImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 4.2");
-        public override IMediaImage _plugin => new DiscImages.DiskCopy42();
-        public override BlockImageTestExpected[] Tests => new[]
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "hfs.dsk.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "2762f41d0379b476042fc62891baac84"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_hfs.img.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "eae3a95671d077deb702b3549a769f56"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_mfs.img.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_hfs.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a99744348a70b62b57bce2dec9132ced"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_mfs.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "93e71b9ecdb39d3ec9245b4f451856d4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "modified.dsk.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "b748f6df3e60e7169d42ec6fcc857ea4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "pascal800.dsk.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "dbd0ec8a3126236910709faf923adcf2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos1440.dsk.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fcf747bd356b48d442ff74adb8f3516b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "prodos800.dsk.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fcf747bd356b48d442ff74adb8f3516b"
-            }
-        };
-    }
+            TestFile   = "hfs.dsk.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "2762f41d0379b476042fc62891baac84"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_hfs.img.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "eae3a95671d077deb702b3549a769f56"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_mfs.img.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_hfs.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a99744348a70b62b57bce2dec9132ced"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_mfs.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "93e71b9ecdb39d3ec9245b4f451856d4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "modified.dsk.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "b748f6df3e60e7169d42ec6fcc857ea4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "pascal800.dsk.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "dbd0ec8a3126236910709faf923adcf2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos1440.dsk.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fcf747bd356b48d442ff74adb8f3516b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "prodos800.dsk.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fcf747bd356b48d442ff74adb8f3516b"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs
index de82fcee0..6e8b65968 100644
--- a/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskCopy633/DiskCopy42.cs
@@ -31,81 +31,80 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskCopy633
-{
-    [TestFixture]
-    public class DiskCopy42 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "DiskCopy 4.2");
-        public override IMediaImage _plugin => new DiscImages.DiskCopy42();
+namespace Aaru.Tests.Images.DiskCopy633;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class DiskCopy42 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "DiskCopy 4.2");
+    public override IMediaImage _plugin => new DiscImages.DiskCopy42();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DC6_42_DOS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DC6_42_DOS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_42_DOS_720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_42_HFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_42_HFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_42_PD_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_42_PD_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_42_DOS_720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_42_HFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_42_HFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_42_PD_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_42_PD_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs
index 75d7f17d0..534fd8abc 100644
--- a/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/DiskCopy633/NDIF/ROCo.cs
@@ -32,209 +32,208 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskCopy633.NDIF
-{
-    [TestFixture]
-    public class ROCo : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "ROCo");
-        public override IMediaImage _plugin => new Ndif();
+namespace Aaru.Tests.Images.DiskCopy633.NDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class ROCo : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "ROCo");
+    public override IMediaImage _plugin => new Ndif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DC6_RC_DOS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DC6_RC_DOS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_DOS_1440.smi",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_DOS_720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_DOS_720.smi",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_DOS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_DOS_DMF.smi",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_HFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_HFS_1440.smi",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_HFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_HFS_800.smi",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_HFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_HFS_DMF.smi",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_PD_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_PD_1440.smi",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_PD_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_PD_800.smi",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_PD_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RC_PD_DMF.smi",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_DOS_1440.smi",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_DOS_720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_DOS_720.smi",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_DOS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_DOS_DMF.smi",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_HFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_HFS_1440.smi",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_HFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_HFS_800.smi",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_HFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_HFS_DMF.smi",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_PD_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_PD_1440.smi",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_PD_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_PD_800.smi",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_PD_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RC_PD_DMF.smi",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs
index 4baf24e75..262a02dc3 100644
--- a/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/DiskCopy633/NDIF/RdWr.cs
@@ -32,113 +32,112 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskCopy633.NDIF
-{
-    [TestFixture]
-    public class RdWr : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "RdWr");
-        public override IMediaImage _plugin => new Ndif();
+namespace Aaru.Tests.Images.DiskCopy633.NDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class RdWr : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "RdWr");
+    public override IMediaImage _plugin => new Ndif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DC6_RW_DOS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DC6_RW_DOS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_DOS_720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_DOS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_PD_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_PD_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_PD_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_DOS_720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_DOS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_PD_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_PD_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_PD_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs
index 30ad1e2fb..072de593f 100644
--- a/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/DiskCopy633/NDIF/Rdxx.cs
@@ -32,113 +32,112 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskCopy633.NDIF
-{
-    [TestFixture]
-    public class Rdxx : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "Rdxx");
-        public override IMediaImage _plugin => new Ndif();
+namespace Aaru.Tests.Images.DiskCopy633.NDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Rdxx : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.3.3", "NDIF", "Rdxx");
+    public override IMediaImage _plugin => new Ndif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DC6_RO_DOS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DC6_RO_DOS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RO_DOS_720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RO_DOS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RO_HFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RO_HFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RO_HFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RO_PD_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RO_PD_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RO_PD_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RO_DOS_720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RO_DOS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RO_HFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RO_HFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RO_HFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RO_PD_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RO_PD_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RO_PD_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskCopy65/UDCO.cs b/Aaru.Tests/Images/DiskCopy65/UDCO.cs
index a8b4bc249..714954e5e 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDCO.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDCO.cs
@@ -32,117 +32,116 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskCopy65
-{
-    [TestFixture]
-    public class UDCO : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCO");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskCopy65;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDCO : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCO");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DC6_UDCO_DOS_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "4306922864c6cf40a419fd5876b5879d",
+            Partitions = new[]
             {
-                TestFile   = "DC6_UDCO_DOS_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "4306922864c6cf40a419fd5876b5879d",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 2880
-                    }
+                    Start  = 4,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCO_DOS_720.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1444,
-                SectorSize = 512,
-                MD5        = "a885825f28929a5626e71201b37ed96e"
-                /* TODO: NullReferenceException when getting cluster of last depth folder
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 1440
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCO_DOS_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "180a0db19ecfe9d55d068c6460f028be"
-                /* TODO: NullReferenceException when getting cluster of last depth folder
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 3360
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCO_HFS_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "e307949819edeecd5e855b661a3bfba3"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCO_HFS_800.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1604,
-                SectorSize = 512,
-                MD5        = "c5a5ad78997ddc30f1dc768112f52609"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCO_HFS_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "5fd35f80791be6eaa44195875aa0465a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCO_PD_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "1c336199896d1f9bff9b2d5c49b48b63"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCO_PD_800.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1604,
-                SectorSize = 512,
-                MD5        = "d654f84668c671e801f4aa107e0aee92"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCO_PD_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "e7b1de07a1f402e4663c3dee4fd3d6fe"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCO_DOS_720.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1444,
+            SectorSize = 512,
+            MD5        = "a885825f28929a5626e71201b37ed96e"
+            /* TODO: NullReferenceException when getting cluster of last depth folder
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 4,
+                    Length = 1440
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCO_DOS_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "180a0db19ecfe9d55d068c6460f028be"
+            /* TODO: NullReferenceException when getting cluster of last depth folder
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 4,
+                    Length = 3360
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCO_HFS_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "e307949819edeecd5e855b661a3bfba3"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCO_HFS_800.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1604,
+            SectorSize = 512,
+            MD5        = "c5a5ad78997ddc30f1dc768112f52609"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCO_HFS_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "5fd35f80791be6eaa44195875aa0465a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCO_PD_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "1c336199896d1f9bff9b2d5c49b48b63"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCO_PD_800.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1604,
+            SectorSize = 512,
+            MD5        = "d654f84668c671e801f4aa107e0aee92"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCO_PD_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "e7b1de07a1f402e4663c3dee4fd3d6fe"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs b/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs
index 881733c53..4e96f43a6 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDCo_obsolete.cs
@@ -32,117 +32,116 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskCopy65
-{
-    [TestFixture]
-    public class UDCo_obsolete : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCo_OBS");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskCopy65;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDCo_obsolete : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDCo_OBS");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DC6_UDCo_DOS_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "4306922864c6cf40a419fd5876b5879d",
+            Partitions = new[]
             {
-                TestFile   = "DC6_UDCo_DOS_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "4306922864c6cf40a419fd5876b5879d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCo_DOS_720.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1444,
-                SectorSize = 512,
-                MD5        = "a885825f28929a5626e71201b37ed96e"
-                /* TODO: NullReferenceException when getting cluster of last depth folder
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 1440
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCo_DOS_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "180a0db19ecfe9d55d068c6460f028be"
-                /* TODO: NullReferenceException when getting cluster of last depth folder
-                Partitions = new[]
-                {
                 new BlockPartitionVolumes
                 {
-                Start  = 4,
-                Length = 3360
+                    Start  = 4,
+                    Length = 2880
                 }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCo_HFS_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "e307949819edeecd5e855b661a3bfba3"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCo_HFS_800.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1604,
-                SectorSize = 512,
-                MD5        = "c5a5ad78997ddc30f1dc768112f52609"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCo_HFS_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "5fd35f80791be6eaa44195875aa0465a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCo_PD_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "1c336199896d1f9bff9b2d5c49b48b63"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCo_PD_800.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1604,
-                SectorSize = 512,
-                MD5        = "d654f84668c671e801f4aa107e0aee92"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDCo_PD_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "e7b1de07a1f402e4663c3dee4fd3d6fe"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCo_DOS_720.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1444,
+            SectorSize = 512,
+            MD5        = "a885825f28929a5626e71201b37ed96e"
+            /* TODO: NullReferenceException when getting cluster of last depth folder
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 4,
+                    Length = 1440
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCo_DOS_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "180a0db19ecfe9d55d068c6460f028be"
+            /* TODO: NullReferenceException when getting cluster of last depth folder
+            Partitions = new[]
+            {
+            new BlockPartitionVolumes
+            {
+            Start  = 4,
+            Length = 3360
+            }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCo_HFS_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "e307949819edeecd5e855b661a3bfba3"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCo_HFS_800.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1604,
+            SectorSize = 512,
+            MD5        = "c5a5ad78997ddc30f1dc768112f52609"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCo_HFS_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "5fd35f80791be6eaa44195875aa0465a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCo_PD_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "1c336199896d1f9bff9b2d5c49b48b63"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCo_PD_800.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1604,
+            SectorSize = 512,
+            MD5        = "d654f84668c671e801f4aa107e0aee92"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDCo_PD_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "e7b1de07a1f402e4663c3dee4fd3d6fe"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskCopy65/UDRAW.cs b/Aaru.Tests/Images/DiskCopy65/UDRAW.cs
index aafa44fdd..9afe22d9c 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDRAW.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDRAW.cs
@@ -32,117 +32,116 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskCopy65
-{
-    [TestFixture]
-    public class UDRAW : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRAW");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskCopy65;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDRAW : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRAW");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DC6_UDRAW_DOS_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "4306922864c6cf40a419fd5876b5879d",
+            Partitions = new[]
             {
-                TestFile   = "DC6_UDRAW_DOS_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "4306922864c6cf40a419fd5876b5879d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRAW_DOS_720.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1444,
-                SectorSize = 512,
-                MD5        = "a885825f28929a5626e71201b37ed96e"
-                /* TODO: NullReferenceException when getting cluster of last depth folder
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 1440
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRAW_DOS_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "180a0db19ecfe9d55d068c6460f028be"
-                /* TODO: NullReferenceException when getting cluster of last depth folder
-                Partitions = new[]
-                {
                 new BlockPartitionVolumes
                 {
-                Start  = 4,
-                Length = 3360
+                    Start  = 4,
+                    Length = 2880
                 }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRAW_HFS_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "e307949819edeecd5e855b661a3bfba3"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRAW_HFS_800.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1604,
-                SectorSize = 512,
-                MD5        = "c5a5ad78997ddc30f1dc768112f52609"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRAW_HFS_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "5fd35f80791be6eaa44195875aa0465a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRAW_PD_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "1c336199896d1f9bff9b2d5c49b48b63"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRAW_PD_800.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1604,
-                SectorSize = 512,
-                MD5        = "d654f84668c671e801f4aa107e0aee92"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRAW_PD_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "e7b1de07a1f402e4663c3dee4fd3d6fe"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRAW_DOS_720.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1444,
+            SectorSize = 512,
+            MD5        = "a885825f28929a5626e71201b37ed96e"
+            /* TODO: NullReferenceException when getting cluster of last depth folder
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 4,
+                    Length = 1440
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRAW_DOS_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "180a0db19ecfe9d55d068c6460f028be"
+            /* TODO: NullReferenceException when getting cluster of last depth folder
+            Partitions = new[]
+            {
+            new BlockPartitionVolumes
+            {
+            Start  = 4,
+            Length = 3360
+            }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRAW_HFS_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "e307949819edeecd5e855b661a3bfba3"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRAW_HFS_800.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1604,
+            SectorSize = 512,
+            MD5        = "c5a5ad78997ddc30f1dc768112f52609"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRAW_HFS_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "5fd35f80791be6eaa44195875aa0465a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRAW_PD_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "1c336199896d1f9bff9b2d5c49b48b63"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRAW_PD_800.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1604,
+            SectorSize = 512,
+            MD5        = "d654f84668c671e801f4aa107e0aee92"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRAW_PD_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "e7b1de07a1f402e4663c3dee4fd3d6fe"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskCopy65/UDRO.cs b/Aaru.Tests/Images/DiskCopy65/UDRO.cs
index 839f959f7..ad0f77468 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDRO.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDRO.cs
@@ -32,117 +32,116 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskCopy65
-{
-    [TestFixture]
-    public class UDRO : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRO");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskCopy65;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDRO : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRO");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DC6_UDRO_DOS_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "4306922864c6cf40a419fd5876b5879d",
+            Partitions = new[]
             {
-                TestFile   = "DC6_UDRO_DOS_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "4306922864c6cf40a419fd5876b5879d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRO_DOS_720.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1444,
-                SectorSize = 512,
-                MD5        = "a885825f28929a5626e71201b37ed96e"
-                /* TODO: NullReferenceException when getting cluster of last depth folder
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 1440
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRO_DOS_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "180a0db19ecfe9d55d068c6460f028be"
-                /* TODO: NullReferenceException when getting cluster of last depth folder
-                Partitions = new[]
-                {
                 new BlockPartitionVolumes
                 {
-                Start  = 4,
-                Length = 3360
+                    Start  = 4,
+                    Length = 2880
                 }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRO_HFS_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "e307949819edeecd5e855b661a3bfba3"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRO_HFS_800.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1604,
-                SectorSize = 512,
-                MD5        = "c5a5ad78997ddc30f1dc768112f52609"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRO_HFS_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "5fd35f80791be6eaa44195875aa0465a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRO_PD_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "1c336199896d1f9bff9b2d5c49b48b63"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRO_PD_800.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1604,
-                SectorSize = 512,
-                MD5        = "d654f84668c671e801f4aa107e0aee92"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRO_PD_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "e7b1de07a1f402e4663c3dee4fd3d6fe"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRO_DOS_720.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1444,
+            SectorSize = 512,
+            MD5        = "a885825f28929a5626e71201b37ed96e"
+            /* TODO: NullReferenceException when getting cluster of last depth folder
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 4,
+                    Length = 1440
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRO_DOS_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "180a0db19ecfe9d55d068c6460f028be"
+            /* TODO: NullReferenceException when getting cluster of last depth folder
+            Partitions = new[]
+            {
+            new BlockPartitionVolumes
+            {
+            Start  = 4,
+            Length = 3360
+            }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRO_HFS_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "e307949819edeecd5e855b661a3bfba3"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRO_HFS_800.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1604,
+            SectorSize = 512,
+            MD5        = "c5a5ad78997ddc30f1dc768112f52609"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRO_HFS_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "5fd35f80791be6eaa44195875aa0465a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRO_PD_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "1c336199896d1f9bff9b2d5c49b48b63"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRO_PD_800.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1604,
+            SectorSize = 512,
+            MD5        = "d654f84668c671e801f4aa107e0aee92"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRO_PD_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "e7b1de07a1f402e4663c3dee4fd3d6fe"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs b/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs
index 94ebae375..9e82457eb 100644
--- a/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs
+++ b/Aaru.Tests/Images/DiskCopy65/UDRo_obsolete.cs
@@ -32,117 +32,116 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskCopy65
-{
-    [TestFixture]
-    public class UDRo_obsolete : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRo_OBS");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskCopy65;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDRo_obsolete : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskCopy 6.5", "UDIF", "UDRo_OBS");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DC6_UDRo_DOS_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "4306922864c6cf40a419fd5876b5879d",
+            Partitions = new[]
             {
-                TestFile   = "DC6_UDRo_DOS_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "4306922864c6cf40a419fd5876b5879d",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 2880
-                    }
+                    Start  = 4,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRo_DOS_720.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1444,
-                SectorSize = 512,
-                MD5        = "a885825f28929a5626e71201b37ed96e"
-                /* TODO: NullReferenceException when getting cluster of last depth folder
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 1440
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRo_DOS_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "180a0db19ecfe9d55d068c6460f028be"
-                /* TODO: NullReferenceException when getting cluster of last depth folder
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 4,
-                        Length = 3360
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRo_HFS_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "e307949819edeecd5e855b661a3bfba3"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRo_HFS_800.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1604,
-                SectorSize = 512,
-                MD5        = "c5a5ad78997ddc30f1dc768112f52609"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRo_HFS_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "5fd35f80791be6eaa44195875aa0465a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRo_PD_1440.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2884,
-                SectorSize = 512,
-                MD5        = "1c336199896d1f9bff9b2d5c49b48b63"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRo_PD_800.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1604,
-                SectorSize = 512,
-                MD5        = "d654f84668c671e801f4aa107e0aee92"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_UDRo_PD_DMF.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3364,
-                SectorSize = 512,
-                MD5        = "e7b1de07a1f402e4663c3dee4fd3d6fe"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRo_DOS_720.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1444,
+            SectorSize = 512,
+            MD5        = "a885825f28929a5626e71201b37ed96e"
+            /* TODO: NullReferenceException when getting cluster of last depth folder
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 4,
+                    Length = 1440
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRo_DOS_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "180a0db19ecfe9d55d068c6460f028be"
+            /* TODO: NullReferenceException when getting cluster of last depth folder
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 4,
+                    Length = 3360
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRo_HFS_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "e307949819edeecd5e855b661a3bfba3"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRo_HFS_800.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1604,
+            SectorSize = 512,
+            MD5        = "c5a5ad78997ddc30f1dc768112f52609"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRo_HFS_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "5fd35f80791be6eaa44195875aa0465a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRo_PD_1440.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2884,
+            SectorSize = 512,
+            MD5        = "1c336199896d1f9bff9b2d5c49b48b63"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRo_PD_800.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1604,
+            SectorSize = 512,
+            MD5        = "d654f84668c671e801f4aa107e0aee92"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_UDRo_PD_DMF.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3364,
+            SectorSize = 512,
+            MD5        = "e7b1de07a1f402e4663c3dee4fd3d6fe"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskDupe.cs b/Aaru.Tests/Images/DiskDupe.cs
index 79f9c69d8..10e464811 100644
--- a/Aaru.Tests/Images/DiskDupe.cs
+++ b/Aaru.Tests/Images/DiskDupe.cs
@@ -32,512 +32,511 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
+namespace Aaru.Tests.Images;
+
+[TestFixture]
+public class DiskDupe : BlockMediaImageTest
 {
-    [TestFixture]
-    public class DiskDupe : BlockMediaImageTest
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskDupe");
+    public override IMediaImage _plugin    => new DiscImages.DiskDupe();
+
+    public override BlockImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskDupe");
-        public override IMediaImage _plugin => new DiscImages.DiskDupe();
-
-        public override BlockImageTestExpected[] Tests => new[]
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "1.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "0d5735269cb9c3d0e63ec9ccfb38e4e2"
+            /* TODO: IndexOutOfRangeException
+            Partitions = new[]
             {
-                TestFile   = "1.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "0d5735269cb9c3d0e63ec9ccfb38e4e2"
-                /* TODO: IndexOutOfRangeException
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "2.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "fa639b4bd96d2fb7be33a1725e9c7c4f"
-                /* TODO: IndexOutOfRangeException
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "f63e676310b2f1a9e44e9a471c7cf1f2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0000.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "0fca5f810ce3179bbc67c7967370f1c2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0009.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "9fbe4254ed34991d38a4cde57e867360",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0024.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2302991363cb3681cffdc4388915b51e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0052.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "015f4f812fd5b03741e3dcad534a4a8d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0076.DDI.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "dc2b7b7eb6d83ce25a6f51d1e457ca24",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0078.DDI.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "410203d55d05581ad377fc8ffda0f4e8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0080.DDI.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1cc0a19579c841ace37c36ef1cd57a05",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0082.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "323322148c4c7394a92fa6a73542e32a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0111.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "f01541de322c8d6d7321084d7a245e7b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0123.DDI.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "28f3cda83fa1e22a420e06704abc6139",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0124.DDI.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "b057202adb98964e8f630a3299e86490",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0125.DDI.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "d987313a46843017e906ee122163ded6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0126.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "c64ef58dc6d875b9f6e7c0a7362c6832",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0163.DDI.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0166.DDI.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1c8b03a8550ed3e70e1c78316aa445aa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0168.DDI.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "0bdf9130c07bb5d558a4705249f949d0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0169.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0283.DDI.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "b81a4987f89936630b8ebc62e4bbce6e"
-                /* TODO: IndexOutOfRangeException
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0287.DDI.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "0e002201126260afa26b03df227175d7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0302.DDI.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "07eefdd2a6261be61af5b29de9dd56ee",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0304.DDI.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "b7c377c7456071b7e886210d9b002bf3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0305.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "fe4ce9782a5a42bf2bf6b41f7a51d744",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0314.DDI.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "b28f4850eaca9909db3aa8d9b185d1a2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0316.DDI.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "0c438ab43509da1863b1fecff8d806aa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-
-            // TODO: CP/M false positive
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd.ddi.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "6715d0ed2097a762e24e64165bd6c801"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd.ddi.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "834cf0380eba331b4dc43ad55edd42a6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.ddi.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "3201d13f82cb3d933158d2c5208c20a1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_alt.ddi.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b4b8eea68483ad5ba983c865e93f2ec6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.ddi.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3335dc14ff1efa58d410afc045a9b425",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
             }
-        };
-    }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "2.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "fa639b4bd96d2fb7be33a1725e9c7c4f"
+            /* TODO: IndexOutOfRangeException
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "f63e676310b2f1a9e44e9a471c7cf1f2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0000.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "0fca5f810ce3179bbc67c7967370f1c2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0009.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "9fbe4254ed34991d38a4cde57e867360",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0024.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2302991363cb3681cffdc4388915b51e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0052.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "015f4f812fd5b03741e3dcad534a4a8d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0076.DDI.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "dc2b7b7eb6d83ce25a6f51d1e457ca24",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0078.DDI.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "410203d55d05581ad377fc8ffda0f4e8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0080.DDI.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1cc0a19579c841ace37c36ef1cd57a05",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0082.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "323322148c4c7394a92fa6a73542e32a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0111.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "f01541de322c8d6d7321084d7a245e7b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0123.DDI.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "28f3cda83fa1e22a420e06704abc6139",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0124.DDI.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "b057202adb98964e8f630a3299e86490",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0125.DDI.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "d987313a46843017e906ee122163ded6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0126.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "c64ef58dc6d875b9f6e7c0a7362c6832",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0163.DDI.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0166.DDI.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1c8b03a8550ed3e70e1c78316aa445aa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0168.DDI.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "0bdf9130c07bb5d558a4705249f949d0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0169.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0283.DDI.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "b81a4987f89936630b8ebc62e4bbce6e"
+            /* TODO: IndexOutOfRangeException
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0287.DDI.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "0e002201126260afa26b03df227175d7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0302.DDI.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "07eefdd2a6261be61af5b29de9dd56ee",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0304.DDI.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "b7c377c7456071b7e886210d9b002bf3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0305.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "fe4ce9782a5a42bf2bf6b41f7a51d744",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0314.DDI.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "b28f4850eaca9909db3aa8d9b185d1a2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0316.DDI.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "0c438ab43509da1863b1fecff8d806aa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+
+        // TODO: CP/M false positive
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd.ddi.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "6715d0ed2097a762e24e64165bd6c801"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd.ddi.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "834cf0380eba331b4dc43ad55edd42a6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.ddi.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "3201d13f82cb3d933158d2c5208c20a1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_alt.ddi.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b4b8eea68483ad5ba983c865e93f2ec6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.ddi.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3335dc14ff1efa58d410afc045a9b425",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
index cb4ef85f1..7be17c2d2 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/DiskCopy42.cs
@@ -31,105 +31,104 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework
-{
-    [TestFixture]
-    public class DiskCopy42 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "DiskCopy 4.2");
-        public override IMediaImage _plugin => new DiscImages.DiskCopy42();
+namespace Aaru.Tests.Images.DiskImagesFramework;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class DiskCopy42 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "DiskCopy 4.2");
+    public override IMediaImage _plugin => new DiscImages.DiskCopy42();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.img.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.img.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.img.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.img.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.img.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.img.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.img.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.img.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.img.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.img.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.img.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.img.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
index 0a7850077..f5984347f 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/ROCo.cs
@@ -32,177 +32,176 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
-{
-    [TestFixture]
-    public class ROCo : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "ROCo");
-        public override IMediaImage _plugin => new Ndif();
+namespace Aaru.Tests.Images.DiskImagesFramework.NDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class ROCo : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "ROCo");
+    public override IMediaImage _plugin => new Ndif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10144,
-                SectorSize = 512,
-                MD5        = "5841dbaceb4937df2518742c2d5cb8d5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10144,
+            SectorSize = 512,
+            MD5        = "5841dbaceb4937df2518742c2d5cb8d5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
index 6e8178a47..f4c2085c7 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/RdWr.cs
@@ -32,177 +32,176 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
-{
-    [TestFixture]
-    public class RdWr : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "RdWr");
-        public override IMediaImage _plugin => new Ndif();
+namespace Aaru.Tests.Images.DiskImagesFramework.NDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class RdWr : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "RdWr");
+    public override IMediaImage _plugin => new Ndif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "894fa8596f64e161fe7d7f81e74a8839"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "894fa8596f64e161fe7d7f81e74a8839"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
index bee6cfcfb..015534ab0 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/NDIF/Rdxx.cs
@@ -32,177 +32,176 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.NDIF
-{
-    [TestFixture]
-    public class Rdxx : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "Rdxx");
-        public override IMediaImage _plugin => new Ndif();
+namespace Aaru.Tests.Images.DiskImagesFramework.NDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Rdxx : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "NDIF", "Rdxx");
+    public override IMediaImage _plugin => new Ndif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10144,
-                SectorSize = 512,
-                MD5        = "5841dbaceb4937df2518742c2d5cb8d5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10144,
+            SectorSize = 512,
+            MD5        = "5841dbaceb4937df2518742c2d5cb8d5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
index 3e0f4a021..787f99c12 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/IPOD.cs
@@ -32,185 +32,184 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
-{
-    [TestFixture]
-    public class IPOD : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "IPOD");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class IPOD : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "IPOD");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "894fa8596f64e161fe7d7f81e74a8839"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10304,
-                SectorSize = 512,
-                MD5        = "b7d4ad55c7702658081b6578b588a57f"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "894fa8596f64e161fe7d7f81e74a8839"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10304,
+            SectorSize = 512,
+            MD5        = "b7d4ad55c7702658081b6578b588a57f"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
index 9f35dbb01..b2f52e6c2 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDBZ.cs
@@ -32,185 +32,184 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
-{
-    [TestFixture]
-    public class UDBZ : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDBZ");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDBZ : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDBZ");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "894fa8596f64e161fe7d7f81e74a8839"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10304,
-                SectorSize = 512,
-                MD5        = "b7d4ad55c7702658081b6578b588a57f"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "894fa8596f64e161fe7d7f81e74a8839"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10304,
+            SectorSize = 512,
+            MD5        = "b7d4ad55c7702658081b6578b588a57f"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
index b2d807364..9f0c79c61 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDCO.cs
@@ -32,185 +32,184 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
-{
-    [TestFixture]
-    public class UDCO : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDCO");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDCO : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDCO");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "894fa8596f64e161fe7d7f81e74a8839"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10304,
-                SectorSize = 512,
-                MD5        = "b7d4ad55c7702658081b6578b588a57f"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "894fa8596f64e161fe7d7f81e74a8839"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10304,
+            SectorSize = 512,
+            MD5        = "b7d4ad55c7702658081b6578b588a57f"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
index 7c68c52e3..4fed7be70 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRO.cs
@@ -32,185 +32,184 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
-{
-    [TestFixture]
-    public class UDRO : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRO");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDRO : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRO");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "894fa8596f64e161fe7d7f81e74a8839"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10304,
-                SectorSize = 512,
-                MD5        = "b7d4ad55c7702658081b6578b588a57f"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "894fa8596f64e161fe7d7f81e74a8839"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10304,
+            SectorSize = 512,
+            MD5        = "b7d4ad55c7702658081b6578b588a57f"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
index 90d7c440c..efd9932c6 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDRW.cs
@@ -32,185 +32,184 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
-{
-    [TestFixture]
-    public class UDRW : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRW");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDRW : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDRW");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.dmg",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.dmg",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.dmg",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.dmg",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.dmg",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.dmg",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.dmg",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "894fa8596f64e161fe7d7f81e74a8839"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.dmg",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.dmg",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.dmg",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.dmg",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.dmg",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.dmg",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.dmg",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_SP_5Mb.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10304,
-                SectorSize = 512,
-                MD5        = "b7d4ad55c7702658081b6578b588a57f"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.dmg",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.dmg",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.dmg",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.dmg",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.dmg",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "894fa8596f64e161fe7d7f81e74a8839"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.dmg",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.dmg",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.dmg",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.dmg",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.dmg",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.dmg",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.dmg",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_SP_5Mb.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10304,
+            SectorSize = 512,
+            MD5        = "b7d4ad55c7702658081b6578b588a57f"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
index 932f81e40..7562422d9 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDTO.cs
@@ -32,185 +32,184 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
-{
-    [TestFixture]
-    public class UDTO : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDTO");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDTO : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDTO");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.dmg",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.dmg",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.dmg",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.dmg",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.dmg",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.dmg",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.dmg",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "894fa8596f64e161fe7d7f81e74a8839"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.dmg",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.dmg",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.dmg",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.dmg",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.dmg",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.dmg",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.dmg",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_SP_5Mb.dmg",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10292,
-                SectorSize = 512,
-                MD5        = "ad555f90bad6a75e8b6ba6cdaafc4458"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.dmg",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.dmg",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.dmg",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.dmg",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.dmg",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "894fa8596f64e161fe7d7f81e74a8839"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.dmg",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.dmg",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.dmg",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.dmg",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.dmg",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.dmg",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.dmg",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_SP_5Mb.dmg",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10292,
+            SectorSize = 512,
+            MD5        = "ad555f90bad6a75e8b6ba6cdaafc4458"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
index 3a76d6bd8..8e01cd18a 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UDZO.cs
@@ -32,185 +32,184 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
-{
-    [TestFixture]
-    public class UDZO : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDZO");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UDZO : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UDZO");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "894fa8596f64e161fe7d7f81e74a8839"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10304,
-                SectorSize = 512,
-                MD5        = "b7d4ad55c7702658081b6578b588a57f"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "894fa8596f64e161fe7d7f81e74a8839"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10304,
+            SectorSize = 512,
+            MD5        = "b7d4ad55c7702658081b6578b588a57f"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
index 7d26e70f0..55ca55023 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/UFBI.cs
@@ -32,185 +32,184 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
-{
-    [TestFixture]
-    public class UFBI : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UFBI");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class UFBI : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "UFBI");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "894fa8596f64e161fe7d7f81e74a8839"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10304,
-                SectorSize = 512,
-                MD5        = "b7d4ad55c7702658081b6578b588a57f"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "894fa8596f64e161fe7d7f81e74a8839"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10304,
+            SectorSize = 512,
+            MD5        = "b7d4ad55c7702658081b6578b588a57f"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
index fb2922edb..ed32bd8ee 100644
--- a/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
+++ b/Aaru.Tests/Images/DiskImagesFramework/UDIF/ULMO.cs
@@ -31,187 +31,186 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskImagesFramework.UDIF
-{
-    [TestFixture]
-    public class ULMO : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "ULMO");
-        public override IMediaImage _plugin => new Udif();
+namespace Aaru.Tests.Images.DiskImagesFramework.UDIF;
 
-        public override BlockImageTestExpected[] Tests => new BlockImageTestExpected[]
+[TestFixture]
+public class ULMO : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DiskImagesFramework", "UDIF", "ULMO");
+    public override IMediaImage _plugin => new Udif();
+
+    public override BlockImageTestExpected[] Tests => new BlockImageTestExpected[]
+    {
+        /* TODO: Chunks compressed with lzma are not yet supported.
+        new BlockImageTestExpected
         {
-            /* TODO: Chunks compressed with lzma are not yet supported.
-            new BlockImageTestExpected
+            TestFile   = "DOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "df3b4331a4a5652393ff55f001998439",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10240
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFSP_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "894fa8596f64e161fe7d7f81e74a8839"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "HFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10240,
-                SectorSize = 512,
-                MD5        = "506c3deb99e78579b4d77e76224d3b4e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ProDOS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_1440.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b37823c7a90d1917f719ba5927b23da8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_720.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4942032f7bf1d115237ea1764424828b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_800.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_DMF.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "UFS_SP_5Mb.dmg.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10304,
-                SectorSize = 512,
-                MD5        = "b7d4ad55c7702658081b6578b588a57f"
             }
-            */
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "df3b4331a4a5652393ff55f001998439",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10240
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFSP_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "894fa8596f64e161fe7d7f81e74a8839"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "HFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10240,
+            SectorSize = 512,
+            MD5        = "506c3deb99e78579b4d77e76224d3b4e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ProDOS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_1440.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b37823c7a90d1917f719ba5927b23da8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_720.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4942032f7bf1d115237ea1764424828b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_800.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_DMF.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cdfebf3f8b8f250dc6905a90dd1bc90f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "UFS_SP_5Mb.dmg.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10304,
+            SectorSize = 512,
+            MD5        = "b7d4ad55c7702658081b6578b588a57f"
+        }
+        */
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs b/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs
index adcb1e0e5..f1978f9bf 100644
--- a/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs
+++ b/Aaru.Tests/Images/DiskUtilities/ImageDisk.cs
@@ -32,49 +32,48 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskUtilities
-{
-    [TestFixture]
-    public class ImageDisk : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "disk-analyse", "ImageDisk");
-        public override IMediaImage _plugin => new Imd();
+namespace Aaru.Tests.Images.DiskUtilities;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class ImageDisk : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "disk-analyse", "ImageDisk");
+    public override IMediaImage _plugin => new Imd();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_acorn.imd.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "2626f65b49ec085253c41fa2e2a9e788"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.imd.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "9d978dff1196b456b8372d78e6b17970"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1812,
-                SectorSize = 1024,
-                MD5        = "7ee82cecd23b30cc9aa6f0ec59877851"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.imd.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "9dea1e119a73a21a38d134f36b2e5564"
-            }
-        };
-    }
+            TestFile   = "mf2dd_acorn.imd.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "2626f65b49ec085253c41fa2e2a9e788"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.imd.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "9d978dff1196b456b8372d78e6b17970"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1812,
+            SectorSize = 1024,
+            MD5        = "7ee82cecd23b30cc9aa6f0ec59877851"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.imd.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "9dea1e119a73a21a38d134f36b2e5564"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DiskUtilities/Raw.cs b/Aaru.Tests/Images/DiskUtilities/Raw.cs
index 4e4f2b544..e5055a00a 100644
--- a/Aaru.Tests/Images/DiskUtilities/Raw.cs
+++ b/Aaru.Tests/Images/DiskUtilities/Raw.cs
@@ -32,75 +32,74 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.DiskUtilities
-{
-    [TestFixture]
-    public class Raw : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "disk-analyse", "raw");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.DiskUtilities;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Raw : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "disk-analyse", "raw");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_acorn.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "2626f65b49ec085253c41fa2e2a9e788"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_amiga.adf.lz",
-                MediaType  = MediaType.CBM_AMIGA_35_DD,
-                Sectors    = 1760,
-                SectorSize = 512,
-                MD5        = "7db6730656efb22695cdf0a49e2674c9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "9d978dff1196b456b8372d78e6b17970"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3605,
-                SectorSize = 512,
-                MD5        = "7ee82cecd23b30cc9aa6f0ec59877851"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_max.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3768,
-                SectorSize = 512,
-                MD5        = "c96c0be31797a0e6c9f23aad8ae38555"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "9dea1e119a73a21a38d134f36b2e5564"
-            }
-            /* TODO: XDF reading is not implemented
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf.img.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 670,
-                SectorSize = 8192,
-                MD5        = "UNKNOWN"
-            }
-            */
-        };
-    }
+            TestFile   = "mf2dd_acorn.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "2626f65b49ec085253c41fa2e2a9e788"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_amiga.adf.lz",
+            MediaType  = MediaType.CBM_AMIGA_35_DD,
+            Sectors    = 1760,
+            SectorSize = 512,
+            MD5        = "7db6730656efb22695cdf0a49e2674c9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "9d978dff1196b456b8372d78e6b17970"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3605,
+            SectorSize = 512,
+            MD5        = "7ee82cecd23b30cc9aa6f0ec59877851"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_max.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3768,
+            SectorSize = 512,
+            MD5        = "c96c0be31797a0e6c9f23aad8ae38555"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "9dea1e119a73a21a38d134f36b2e5564"
+        }
+        /* TODO: XDF reading is not implemented
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.img.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 670,
+            SectorSize = 8192,
+            MD5        = "UNKNOWN"
+        }
+        */
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/DriDiskCopy.cs b/Aaru.Tests/Images/DriDiskCopy.cs
index 279e70979..a3449db39 100644
--- a/Aaru.Tests/Images/DriDiskCopy.cs
+++ b/Aaru.Tests/Images/DriDiskCopy.cs
@@ -31,2875 +31,2874 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class DriDiskCopy : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DRI DISKCOPY");
-        public override IMediaImage _plugin => new DiscImages.DriDiskCopy();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class DriDiskCopy : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "DRI DISKCOPY");
+    public override IMediaImage _plugin => new DiscImages.DriDiskCopy();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0000.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "e8bbbd22db87181974e12ba0227ea011"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0001.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "9f5635f3df4d880a500910b0ad1ab535"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0009.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "95ea232f59e44db374b994cfe7f1c07f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0010.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "9e2b01f4397db2a6c76e2bc267df37b3"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0024.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2302991363cb3681cffdc4388915b51e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0025.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "f7dd138edcab7bd328d7396d48aac395"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0030.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "af83d011608042d35021e39aa5e10b2f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0035.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6642c1a32d2c58e93481d664974fc202",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0036.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "846f01b8b60cb3c775bd66419e977926",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0037.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "5101f89850dc28efbcfb7622086a9ddf",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0038.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "8e570be2ed1f00ddea82e50a2d9c446a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0039.IMG.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "abba2a1ddd60a649047a9c44d94bbeae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0040.IMG.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "e3bc48bec81be5b35be73d41fdffd2ab",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0041.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "43b5068af9d016d1432eb2e12d2b802a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0042.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "5bf2ad4dc300592604b6e32f8b8e2656",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0043.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "cb9a832ca6a4097b8ccc30d2108e1f7d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0044.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "56d181a6bb8713e6b2854fe8887faab6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0045.IMG.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "41aef7cff26aefda1add8d49c5b962c2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0046.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "2437c5f089f1cba3866b36360b016f16",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2460
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0047.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_8,
-                Sectors    = 1280,
-                SectorSize = 512,
-                MD5        = "bdaa8f17373b265830fdf3a06b794367",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0048.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "629932c285478d0540ff7936aa008351",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0049.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "7a2abef5d4701e2e49abb05af8d4da50",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1476
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0050.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "e3507522c914264f44fb2c92c3170c09",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0051.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "824fe65dbb1a42b6b94f05405ef984f2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0052.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "1a8c2e78e7132cf9ba5d6c2b75876be0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0053.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "936b20bb0966fe693b4d5e2353e24846",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0054.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "803b01a0b440c2837d37c21308f30cd5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0055.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "aa0d31f914760cc4cde75479779ebed6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0056.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "31269ed6464302ae26d22b7c87bceb23",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0057.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "5e413433c54f48978d281c6e66d1106e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0058.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "4fc28b0128543b2eb70f6432c4c8a980",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0059.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3528,
-                SectorSize = 512,
-                MD5        = "24a7459d080cea3a60d131b8fd7dc5d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3528
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0060.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3570,
-                SectorSize = 512,
-                MD5        = "2031b1e16ee2defc0d15f732f633df33",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3570
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0069.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "5fc19ca552b6db957061e9a1750394d2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0073.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "a33b46f042b78fe3d0b3c5dbb3908a93",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0074.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "565d3c001cbb532154aa5d3c65b2439c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0075.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "e60442c3ebd72c99bdd7545fdba59613",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0076.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "058a33a129539285c9b64010496af52f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0077.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "0726ecbc38965d30a6222c3e74cd1aa3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0078.IMG.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "c9a193837db7d8a5eb025eb41e8a76d7"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0080.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c38d69ac88520f14fcc6d6ced22b065d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0081.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "91d51964e1e64ef3f6f622fa19aa833c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0082.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "db36d9651c952ff679ec33223c8db2d3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0083.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2988,
-                SectorSize = 512,
-                MD5        = "5f1d98806309aee7f81de72e51e6d386",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2988
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0084.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "1207a1cc7ff73d4f74c8984b4e7db33f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0085.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "c97a3081fd25474b6b7945b8572d5ab8",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0089.IMG.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "0abf995856080e5292e63c63f7c97a45"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0090.IMG.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "8be2aaf6ecea213aee9fc82c8a85061e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0091.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "0a432572a28d3b53a0cf2b5c211fe777",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0092.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1804,
-                SectorSize = 512,
-                MD5        = "cd84fa2d62ac7c36783224c3ba0be664",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1804
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0093.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "63d29a9d867d924421c10793a0f22965",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0094.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3116,
-                SectorSize = 512,
-                MD5        = "21778906886c0314f0f33c4b0040ba16",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3116
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0097.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3608,
-                SectorSize = 512,
-                MD5        = "6b8e89b1d5117ba19c3e52544ffe041e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3608
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0098.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3772,
-                SectorSize = 512,
-                MD5        = "543fc539902eb66b5c312d7908ecf97a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3772
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0099.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1952,
-                SectorSize = 512,
-                MD5        = "b30709f798bfb8469d02a82c882f780c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0101.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "0f3e923010b50b550591a89ea2dee62b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0103.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3944,
-                SectorSize = 512,
-                MD5        = "d5b927503abcd1978496bc679bb9c2f7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3944
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0105.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "d40a99cb549fcfb26fcf9ef01b5dfca7"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0106.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 410,
-                SectorSize = 512,
-                MD5        = "7b41dd9ca7eb32828960eb1417a6092a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 410
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0107.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "126dfd25363c076727dfaab03955c931",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0108.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 820,
-                SectorSize = 512,
-                MD5        = "e6492aac144f5f6f593b84c64680cf64",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 820
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0109.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0110.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a793047503af08e83361427b3e2806e0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0111.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "f01541de322c8d6d7321084d7a245e7b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0112.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0113.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0114.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a793047503af08e83361427b3e2806e0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0115.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0116.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "6631b66fdfd89319323771c41334c7ba",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0117.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "56471a253f4d6803b634e2bbff6c0931",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0120.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "7d36aee5a3071ff75b979f3acb649c40",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0121.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "0ccb62039363ab544c69eca229a17fae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0122.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "7851d31fad9302ff45d3ded4fba25387",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0123.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "915b08c82591e8488320e001b7303b6d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0124.IMG.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "5e5ea6fe9adf842221fdc60e56630405",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0125.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0126.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ddc6c1200c60e9f7796280f50c2e5283",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0163.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0164.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 820,
-                SectorSize = 512,
-                MD5        = "32823b9009c99b6711e89336ad03ec7f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 820
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0166.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1c8b03a8550ed3e70e1c78316aa445aa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0168.IMG.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "0bdf9130c07bb5d558a4705249f949d0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0169.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0173.IMG.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "028769dc0abefab1740cc309432588b6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0174.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "152023525154b45ab26687190bac94db",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0175.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "db38ecd93f28dd065927fed21917eed5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0180.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "f206c0caa4e0eda37233ab6e89ab5493",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0181.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "554492a7b41f4cd9068a3a2b70eb0e5f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0182.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "36dd03967a2a3369538cad29b8b74b71",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0183.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "4f5c02448e75bbc086e051c728414513",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0262.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "5ac0a9fc7337f761098f816359b0f6f7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0263.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "1ea6ec8e663218b1372048f6e25795b5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0264.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "77a1167b1b9043496e32b8578cde0ff0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0265.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "4b07d760d65f3f0f8ffa5f2b81cee907",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0266.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "32c044c5c2b0bd13806149a759c14935",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0267.IMG.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "8752095abc13dba3f3467669da333891",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3040
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0268.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "aece7cd34bbba3e75307fa70404d9d30",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0269.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "5289afb16a6e4a33213e3bcca56c6230",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0270.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3320,
-                SectorSize = 512,
-                MD5        = "1aef0a0ba233476db6567878c3c2b266",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0271.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "b96596711f4d2ee85dfda0fe3b9f26c3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0272.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "a4f461af7fda5e93a7ab63fcbb7e7683",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0273.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "8f7f7099d4475f6631fcf0a79b031d61",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0280.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "4feeaf4b4ee5dad85db727fbbda4b6d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0281.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "3c77ca681df78e4cd7baa162aa9b0859",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0282.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "51da1f86c49657ffdb367bb2ddeb7990",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0283.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "b81a4987f89936630b8ebc62e4bbce6e"
-                /* TODO IndexOutOfRangeException
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0284.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "f76f92dd326c99c5efad5ee58daf72e1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0285.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "b6f2c10e42908e334025bc4ffd81e771",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0287.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "f2f409ea2a62a7866fd2777cc4fc9739",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0288.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1494,
-                SectorSize = 512,
-                MD5        = "3e441d69cec5c3169274e1379de4af4b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1494
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0289.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "30a93f30dd4485c6fc037fe0775d3fc7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0290.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "e0caf02cce5597c98313bcc480366ec7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0291.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "4af4904d2b3c815da7bef7049209f5eb",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0299.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "39bf5a98bcb2185d855ac06378febcfa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0300.IMG.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "dc20055b6e6fd6f8e1114d4be2effeed",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0301.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "56af9256cf71d5aac5fd5d363674bc49",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0302.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "bbba1e2d1418e05c3a4e7b4d585d160b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0303.IMG.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "bca3a045e81617f7f5ebb5a8818eac47",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0304.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "a296663cb8e75e94603221352f29cfff",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0305.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ecda36ebf0e1100233cb0ec722c18583",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0308.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "bbe58e26b8f8f822cd3edfd37a4e4924",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0311.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "b9b6ebdf711364c979de7cf70c3a438a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0314.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "d37424f367f545acbb397f2bed766843",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0316.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "9963dd6f19ce6bd56eabeccdfbbd821a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0317.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "acf6604559ae8217f7869823e2429024",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0318.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "23bf2139cdfdc4c16db058fd31ea6481",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0319.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "fa26adda0415f02057b113ad29c80c8d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0320.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "4f2a8d036fefd6c6c88d99eda3aa12b7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0322.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1386,
-                SectorSize = 512,
-                MD5        = "e794a3ffa4069ea999fdf7146710fa9e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1386
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd8.img.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "d81f5cb64fd0b99f138eab34110bbc3c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd.img.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "a89006a75d13bee9202d1d6e52721ccb",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_2m_fast.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "319fa8bef964c2a63e34bdb48e77cc4e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_2m_max.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1804,
-                SectorSize = 512,
-                MD5        = "306a61469b4c3c83f3e5f9ae409d83cd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1804
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd8.img.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "beef1cdb004dc69391d6b3d508988b95",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_freedos_800s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "29054ef703394ee3b35e849468a412ba"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd.img.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "6213897b7dbf263f12abf76901d43862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_maxiform_1640s.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "c91e852828c2aeee2fc94a6adbeed0ae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_maxiform_840s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "efb6cfe53a6770f0ae388cb2c7f46264",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1476s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "6116f7c1397cadd55ba8d79c2aadc9dd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1476
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1600s.img.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "93100f8d86e5d0d0e6340f59c52a5e0d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1640s.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "cf7b7d43aa70863bedcc4a8432a5af67",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_2m_fast.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "215198cf2a336e718208fc207bb62c6d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_2m_max.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3116,
-                SectorSize = 512,
-                MD5        = "2c96964b5d91444302e21721c25ea120",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3116
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd.img.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_maxiform_2788s.img.lz",
-                MediaType  = MediaType.FDFORMAT_525_HD,
-                Sectors    = 2788,
-                SectorSize = 512,
-                MD5        = "09ca721aa883d5bbaa422c7943b0782c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2788
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_nec.img.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 2464,
-                SectorSize = 1024,
-                MD5        = "84812b791fd2113b4aa00894f6894339"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_xdf.img.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "d78dc81491edeec99aa202d02f3daf00"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2m.dsk.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1968,
-                SectorSize = 512,
-                MD5        = "9a8670fbaf6307b8d5f32aa10e1be435",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1968
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2m_fast.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1968,
-                SectorSize = 512,
-                MD5        = "05d29642cdcddafa0dcaff91682f8fe0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1968
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2mgui.dsk.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 9408,
-                SectorSize = 128,
-                MD5        = "beb782f6bc970e32ceef79cd112e2e48"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2m_max.dsk.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2132,
-                SectorSize = 512,
-                MD5        = "a99603cd3219aab1299e66b2999f0e57",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2132
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2m_max.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2132,
-                SectorSize = 512,
-                MD5        = "3da419125f45e1fe3b46f6fad3acc1c2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2132
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.dsk.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_800.dsk.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.dsk.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "81d3bfec7b201f6a4503eb24c4394d4a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos_1600s.img.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "d07f7ffaee89742c6477aaaf94eb5715",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos.dsk.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "1ff7649b679ba22ff20d39ff717dbec8",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.img.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "9827ba1b3e9cac41263caabd862e78f9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_maxiform_1600s.img.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "56af87802a9852e6e01e08d544740816",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1494s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1494,
-                SectorSize = 512,
-                MD5        = "fd7fb1ba11cdfe11db54af0322abf59d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1494
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1600s.img.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "d9db52d992a76bf3bbc626ff844215a5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1660s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "5949d0be57ce8bffcda7c4be4d1348ee",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed.img.lz",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "4aeafaf2a088d6a7406856dce8118567",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 5760
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.dsk.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3608,
-                SectorSize = 512,
-                MD5        = "2f6964d410b275c8e9f60fe2f24b361a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_fast.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3608,
-                SectorSize = 512,
-                MD5        = "967726aede85c68f66887672078f8856",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3608
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2mgui.dsk.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 15776,
-                SectorSize = 128,
-                MD5        = "0037b5497d5cb0c7721085f61e223b6a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_max.dsk.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3772,
-                SectorSize = 512,
-                MD5        = "3fa4f87d7058ba940b88e0d80f0d7ded",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3772
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_max.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3772,
-                SectorSize = 512,
-                MD5        = "5a6d961ed5f089364f2816692bcbe685",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3772
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_dmf.img.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "b042310181410227d0072fef1e98a989",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.dsk.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b4a602f67903c46eef62addb0780aa56",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_168.dsk.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "1e06f21a1c11ea3347212da115bca08f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.dsk.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "3fc3a03d049416d81f81cc3b9ea8e5de",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos_3360s.img.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos_3486s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "a79ec33c623697b4562dacaed31523b8",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.img.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "00e61c06bf29f0c04a7eabe2dbd7efb6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_maxiform_3200s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "3c4becd695ed25866d39966a9a93c2d9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_nec.img.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 2464,
-                SectorSize = 1024,
-                MD5        = "626ec389d4f8968170401b3775181a2b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2460s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "72282e11f7d91bf9c090b550fabfe80d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2460
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2720s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2720,
-                SectorSize = 512,
-                MD5        = "457c1126dc7f36bbbabe9e17e90372e3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2788s.img.lz",
-                MediaType  = MediaType.FDFORMAT_525_HD,
-                Sectors    = 2788,
-                SectorSize = 512,
-                MD5        = "852181d5913c6f290872c66bbe992314",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2788
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2880s.img.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2980cc32504c945598dc50f1db576994",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2952s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "c1c58d74fffb3656dd7f60f74ae8a629",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2988s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2988,
-                SectorSize = 512,
-                MD5        = "097bb2fd34cee5ebde7b5641975ffd60",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2988
-                    }
+            TestFile   = "DSKA0000.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "e8bbbd22db87181974e12ba0227ea011"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0001.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "9f5635f3df4d880a500910b0ad1ab535"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0009.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "95ea232f59e44db374b994cfe7f1c07f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3200s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "e45d41a61fbe48f328c995fcc10a5548",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3320s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3320,
-                SectorSize = 512,
-                MD5        = "c25f2a57c71db1cd4fea2263598f544a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3360s.img.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "15f71b92bd72aba5d80bf70eca4d5b1e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3486s.img.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "d88c8d818e238c9e52b8588b5fd52efe",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf.dsk.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "3d5fcdaf627257ae9f50a06bdba26965",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3680
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf.img.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "4cb9398cf02ed9e08d0972c1ccba804b"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0010.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "9e2b01f4397db2a6c76e2bc267df37b3"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0024.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2302991363cb3681cffdc4388915b51e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0025.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "f7dd138edcab7bd328d7396d48aac395"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0030.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "af83d011608042d35021e39aa5e10b2f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0035.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6642c1a32d2c58e93481d664974fc202",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0036.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "846f01b8b60cb3c775bd66419e977926",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0037.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "5101f89850dc28efbcfb7622086a9ddf",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0038.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "8e570be2ed1f00ddea82e50a2d9c446a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0039.IMG.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "abba2a1ddd60a649047a9c44d94bbeae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0040.IMG.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "e3bc48bec81be5b35be73d41fdffd2ab",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0041.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "43b5068af9d016d1432eb2e12d2b802a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0042.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "5bf2ad4dc300592604b6e32f8b8e2656",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0043.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "cb9a832ca6a4097b8ccc30d2108e1f7d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0044.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "56d181a6bb8713e6b2854fe8887faab6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0045.IMG.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "41aef7cff26aefda1add8d49c5b962c2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0046.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "2437c5f089f1cba3866b36360b016f16",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2460
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0047.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_8,
+            Sectors    = 1280,
+            SectorSize = 512,
+            MD5        = "bdaa8f17373b265830fdf3a06b794367",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0048.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "629932c285478d0540ff7936aa008351",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0049.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "7a2abef5d4701e2e49abb05af8d4da50",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1476
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0050.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "e3507522c914264f44fb2c92c3170c09",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0051.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "824fe65dbb1a42b6b94f05405ef984f2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0052.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "1a8c2e78e7132cf9ba5d6c2b75876be0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0053.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "936b20bb0966fe693b4d5e2353e24846",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0054.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "803b01a0b440c2837d37c21308f30cd5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0055.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "aa0d31f914760cc4cde75479779ebed6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0056.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "31269ed6464302ae26d22b7c87bceb23",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0057.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "5e413433c54f48978d281c6e66d1106e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0058.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "4fc28b0128543b2eb70f6432c4c8a980",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0059.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3528,
+            SectorSize = 512,
+            MD5        = "24a7459d080cea3a60d131b8fd7dc5d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3528
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0060.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3570,
+            SectorSize = 512,
+            MD5        = "2031b1e16ee2defc0d15f732f633df33",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3570
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0069.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "5fc19ca552b6db957061e9a1750394d2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0073.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "a33b46f042b78fe3d0b3c5dbb3908a93",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0074.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "565d3c001cbb532154aa5d3c65b2439c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0075.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "e60442c3ebd72c99bdd7545fdba59613",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0076.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "058a33a129539285c9b64010496af52f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0077.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "0726ecbc38965d30a6222c3e74cd1aa3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0078.IMG.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "c9a193837db7d8a5eb025eb41e8a76d7"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0080.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c38d69ac88520f14fcc6d6ced22b065d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0081.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "91d51964e1e64ef3f6f622fa19aa833c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0082.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "db36d9651c952ff679ec33223c8db2d3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0083.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2988,
+            SectorSize = 512,
+            MD5        = "5f1d98806309aee7f81de72e51e6d386",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2988
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0084.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "1207a1cc7ff73d4f74c8984b4e7db33f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0085.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "c97a3081fd25474b6b7945b8572d5ab8",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0089.IMG.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "0abf995856080e5292e63c63f7c97a45"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0090.IMG.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "8be2aaf6ecea213aee9fc82c8a85061e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0091.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "0a432572a28d3b53a0cf2b5c211fe777",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0092.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1804,
+            SectorSize = 512,
+            MD5        = "cd84fa2d62ac7c36783224c3ba0be664",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1804
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0093.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "63d29a9d867d924421c10793a0f22965",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0094.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3116,
+            SectorSize = 512,
+            MD5        = "21778906886c0314f0f33c4b0040ba16",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3116
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0097.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3608,
+            SectorSize = 512,
+            MD5        = "6b8e89b1d5117ba19c3e52544ffe041e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3608
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0098.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3772,
+            SectorSize = 512,
+            MD5        = "543fc539902eb66b5c312d7908ecf97a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3772
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0099.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1952,
+            SectorSize = 512,
+            MD5        = "b30709f798bfb8469d02a82c882f780c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0101.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "0f3e923010b50b550591a89ea2dee62b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0103.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3944,
+            SectorSize = 512,
+            MD5        = "d5b927503abcd1978496bc679bb9c2f7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3944
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0105.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "d40a99cb549fcfb26fcf9ef01b5dfca7"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0106.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 410,
+            SectorSize = 512,
+            MD5        = "7b41dd9ca7eb32828960eb1417a6092a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 410
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0107.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "126dfd25363c076727dfaab03955c931",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0108.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 820,
+            SectorSize = 512,
+            MD5        = "e6492aac144f5f6f593b84c64680cf64",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 820
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0109.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0110.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a793047503af08e83361427b3e2806e0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0111.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "f01541de322c8d6d7321084d7a245e7b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0112.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0113.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0114.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a793047503af08e83361427b3e2806e0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0115.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0116.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "6631b66fdfd89319323771c41334c7ba",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0117.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "56471a253f4d6803b634e2bbff6c0931",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0120.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "7d36aee5a3071ff75b979f3acb649c40",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0121.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "0ccb62039363ab544c69eca229a17fae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0122.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "7851d31fad9302ff45d3ded4fba25387",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0123.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "915b08c82591e8488320e001b7303b6d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0124.IMG.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "5e5ea6fe9adf842221fdc60e56630405",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0125.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0126.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ddc6c1200c60e9f7796280f50c2e5283",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0163.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0164.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 820,
+            SectorSize = 512,
+            MD5        = "32823b9009c99b6711e89336ad03ec7f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 820
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0166.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1c8b03a8550ed3e70e1c78316aa445aa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0168.IMG.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "0bdf9130c07bb5d558a4705249f949d0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0169.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0173.IMG.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "028769dc0abefab1740cc309432588b6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0174.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "152023525154b45ab26687190bac94db",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0175.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "db38ecd93f28dd065927fed21917eed5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0180.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "f206c0caa4e0eda37233ab6e89ab5493",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0181.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "554492a7b41f4cd9068a3a2b70eb0e5f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0182.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "36dd03967a2a3369538cad29b8b74b71",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0183.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "4f5c02448e75bbc086e051c728414513",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0262.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "5ac0a9fc7337f761098f816359b0f6f7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0263.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "1ea6ec8e663218b1372048f6e25795b5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0264.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "77a1167b1b9043496e32b8578cde0ff0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0265.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "4b07d760d65f3f0f8ffa5f2b81cee907",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0266.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "32c044c5c2b0bd13806149a759c14935",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0267.IMG.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "8752095abc13dba3f3467669da333891",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3040
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0268.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "aece7cd34bbba3e75307fa70404d9d30",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0269.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "5289afb16a6e4a33213e3bcca56c6230",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0270.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3320,
+            SectorSize = 512,
+            MD5        = "1aef0a0ba233476db6567878c3c2b266",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0271.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "b96596711f4d2ee85dfda0fe3b9f26c3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0272.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "a4f461af7fda5e93a7ab63fcbb7e7683",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0273.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "8f7f7099d4475f6631fcf0a79b031d61",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0280.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "4feeaf4b4ee5dad85db727fbbda4b6d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0281.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "3c77ca681df78e4cd7baa162aa9b0859",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0282.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "51da1f86c49657ffdb367bb2ddeb7990",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0283.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "b81a4987f89936630b8ebc62e4bbce6e"
+            /* TODO IndexOutOfRangeException
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0284.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "f76f92dd326c99c5efad5ee58daf72e1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0285.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "b6f2c10e42908e334025bc4ffd81e771",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0287.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "f2f409ea2a62a7866fd2777cc4fc9739",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0288.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1494,
+            SectorSize = 512,
+            MD5        = "3e441d69cec5c3169274e1379de4af4b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1494
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0289.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "30a93f30dd4485c6fc037fe0775d3fc7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0290.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "e0caf02cce5597c98313bcc480366ec7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0291.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "4af4904d2b3c815da7bef7049209f5eb",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0299.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "39bf5a98bcb2185d855ac06378febcfa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0300.IMG.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "dc20055b6e6fd6f8e1114d4be2effeed",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0301.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "56af9256cf71d5aac5fd5d363674bc49",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0302.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "bbba1e2d1418e05c3a4e7b4d585d160b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0303.IMG.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "bca3a045e81617f7f5ebb5a8818eac47",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0304.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "a296663cb8e75e94603221352f29cfff",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0305.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ecda36ebf0e1100233cb0ec722c18583",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0308.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "bbe58e26b8f8f822cd3edfd37a4e4924",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0311.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "b9b6ebdf711364c979de7cf70c3a438a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0314.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "d37424f367f545acbb397f2bed766843",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0316.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "9963dd6f19ce6bd56eabeccdfbbd821a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0317.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "acf6604559ae8217f7869823e2429024",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0318.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "23bf2139cdfdc4c16db058fd31ea6481",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0319.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "fa26adda0415f02057b113ad29c80c8d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0320.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "4f2a8d036fefd6c6c88d99eda3aa12b7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0322.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1386,
+            SectorSize = 512,
+            MD5        = "e794a3ffa4069ea999fdf7146710fa9e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1386
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd8.img.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "d81f5cb64fd0b99f138eab34110bbc3c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd.img.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "a89006a75d13bee9202d1d6e52721ccb",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_2m_fast.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "319fa8bef964c2a63e34bdb48e77cc4e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_2m_max.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1804,
+            SectorSize = 512,
+            MD5        = "306a61469b4c3c83f3e5f9ae409d83cd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1804
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd8.img.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "beef1cdb004dc69391d6b3d508988b95",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_freedos_800s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "29054ef703394ee3b35e849468a412ba"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd.img.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "6213897b7dbf263f12abf76901d43862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_maxiform_1640s.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "c91e852828c2aeee2fc94a6adbeed0ae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_maxiform_840s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "efb6cfe53a6770f0ae388cb2c7f46264",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1476s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "6116f7c1397cadd55ba8d79c2aadc9dd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1476
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1600s.img.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "93100f8d86e5d0d0e6340f59c52a5e0d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1640s.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "cf7b7d43aa70863bedcc4a8432a5af67",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_2m_fast.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "215198cf2a336e718208fc207bb62c6d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_2m_max.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3116,
+            SectorSize = 512,
+            MD5        = "2c96964b5d91444302e21721c25ea120",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3116
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd.img.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_maxiform_2788s.img.lz",
+            MediaType  = MediaType.FDFORMAT_525_HD,
+            Sectors    = 2788,
+            SectorSize = 512,
+            MD5        = "09ca721aa883d5bbaa422c7943b0782c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2788
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_nec.img.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 2464,
+            SectorSize = 1024,
+            MD5        = "84812b791fd2113b4aa00894f6894339"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_xdf.img.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "d78dc81491edeec99aa202d02f3daf00"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2m.dsk.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1968,
+            SectorSize = 512,
+            MD5        = "9a8670fbaf6307b8d5f32aa10e1be435",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1968
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2m_fast.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1968,
+            SectorSize = 512,
+            MD5        = "05d29642cdcddafa0dcaff91682f8fe0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1968
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2mgui.dsk.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 9408,
+            SectorSize = 128,
+            MD5        = "beb782f6bc970e32ceef79cd112e2e48"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2m_max.dsk.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2132,
+            SectorSize = 512,
+            MD5        = "a99603cd3219aab1299e66b2999f0e57",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2132
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2m_max.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2132,
+            SectorSize = 512,
+            MD5        = "3da419125f45e1fe3b46f6fad3acc1c2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2132
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.dsk.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_800.dsk.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "c533488a21098a62c85f1649abda2803",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.dsk.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "81d3bfec7b201f6a4503eb24c4394d4a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos_1600s.img.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "d07f7ffaee89742c6477aaaf94eb5715",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos.dsk.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "1ff7649b679ba22ff20d39ff717dbec8",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.img.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "9827ba1b3e9cac41263caabd862e78f9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_maxiform_1600s.img.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "56af87802a9852e6e01e08d544740816",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1494s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1494,
+            SectorSize = 512,
+            MD5        = "fd7fb1ba11cdfe11db54af0322abf59d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1494
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1600s.img.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "d9db52d992a76bf3bbc626ff844215a5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1660s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "5949d0be57ce8bffcda7c4be4d1348ee",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed.img.lz",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "4aeafaf2a088d6a7406856dce8118567",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 5760
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.dsk.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3608,
+            SectorSize = 512,
+            MD5        = "2f6964d410b275c8e9f60fe2f24b361a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_fast.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3608,
+            SectorSize = 512,
+            MD5        = "967726aede85c68f66887672078f8856",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3608
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2mgui.dsk.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 15776,
+            SectorSize = 128,
+            MD5        = "0037b5497d5cb0c7721085f61e223b6a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_max.dsk.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3772,
+            SectorSize = 512,
+            MD5        = "3fa4f87d7058ba940b88e0d80f0d7ded",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3772
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_max.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3772,
+            SectorSize = 512,
+            MD5        = "5a6d961ed5f089364f2816692bcbe685",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3772
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_dmf.img.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "b042310181410227d0072fef1e98a989",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.dsk.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b4a602f67903c46eef62addb0780aa56",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_168.dsk.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "1e06f21a1c11ea3347212da115bca08f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.dsk.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "3fc3a03d049416d81f81cc3b9ea8e5de",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos_3360s.img.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos_3486s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "a79ec33c623697b4562dacaed31523b8",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.img.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "00e61c06bf29f0c04a7eabe2dbd7efb6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_maxiform_3200s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "3c4becd695ed25866d39966a9a93c2d9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_nec.img.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 2464,
+            SectorSize = 1024,
+            MD5        = "626ec389d4f8968170401b3775181a2b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2460s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "72282e11f7d91bf9c090b550fabfe80d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2460
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2720s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2720,
+            SectorSize = 512,
+            MD5        = "457c1126dc7f36bbbabe9e17e90372e3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2788s.img.lz",
+            MediaType  = MediaType.FDFORMAT_525_HD,
+            Sectors    = 2788,
+            SectorSize = 512,
+            MD5        = "852181d5913c6f290872c66bbe992314",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2788
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2880s.img.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2980cc32504c945598dc50f1db576994",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2952s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "c1c58d74fffb3656dd7f60f74ae8a629",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2988s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2988,
+            SectorSize = 512,
+            MD5        = "097bb2fd34cee5ebde7b5641975ffd60",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2988
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3200s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "e45d41a61fbe48f328c995fcc10a5548",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3320s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3320,
+            SectorSize = 512,
+            MD5        = "c25f2a57c71db1cd4fea2263598f544a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3360s.img.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "15f71b92bd72aba5d80bf70eca4d5b1e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3486s.img.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "d88c8d818e238c9e52b8588b5fd52efe",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.dsk.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "3d5fcdaf627257ae9f50a06bdba26965",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3680
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.img.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "4cb9398cf02ed9e08d0972c1ccba804b"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/GameJack6.cs b/Aaru.Tests/Images/GameJack6.cs
index eda9788cf..ba932b10c 100644
--- a/Aaru.Tests/Images/GameJack6.cs
+++ b/Aaru.Tests/Images/GameJack6.cs
@@ -31,450 +31,449 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
+namespace Aaru.Tests.Images;
+
+[TestFixture]
+public class GameJack6 : OpticalMediaImageTest
 {
-    [TestFixture]
-    public class GameJack6 : OpticalMediaImageTest
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "GameJack 6");
+    public override IMediaImage _plugin    => new DiscImages.Alcohol120();
+
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "GameJack 6");
-        public override IMediaImage _plugin => new DiscImages.Alcohol120();
-
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "report_cdrom_cooked_nodpm.xmd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrom_cooked_nodpm.xmd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom_cooked.xmd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom_nodpm.xmd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "66518892168f9bd5003e14979573861c",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.xmd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "8f0313d7a5f85e23be0d254f3c091004",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.xmd",
-                MediaType     = MediaType.CDRW,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "124df553ac9337d1b36c611aa1a3e16f",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdr.xmd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "248dd7375479f40267b6d4f9fd889d5b",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v1.xmd",
-                MediaType = MediaType.DVDRAM,
-                Sectors   = 471091,
-                MD5       = "b6fe37716c05c1d52ef19c28946f3b76",
-                LongMD5   = "b6fe37716c05c1d52ef19c28946f3b76",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 471090,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v2.xmd",
-                MediaType = MediaType.DVDRAM,
-                Sectors   = 471091,
-                MD5       = "b6fe37716c05c1d52ef19c28946f3b76",
-                LongMD5   = "b6fe37716c05c1d52ef19c28946f3b76",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 471090,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdrom.xmd",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146358,
-                MD5       = "ae08c024d6942e62884abe137f66a80f",
-                LongMD5   = "ae08c024d6942e62884abe137f66a80f",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146357,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd+rw.xmd",
-                MediaType = MediaType.DVDPRW,
-                Sectors   = 2146358,
-                MD5       = "cea717c199230bef889ce268a473d2e6",
-                LongMD5   = "cea717c199230bef889ce268a473d2e6",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146357,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd-rw.xmd",
-                MediaType = MediaType.DVDRW,
-                Sectors   = 2146369,
-                MD5       = "a60ea0383c5b39e14e09f47e749a3f46",
-                LongMD5   = "a60ea0383c5b39e14e09f47e749a3f46",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146368,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd+r.xmd",
-                MediaType = MediaType.DVDPR,
-                Sectors   = 2146358,
-                MD5       = "cea717c199230bef889ce268a473d2e6",
-                LongMD5   = "cea717c199230bef889ce268a473d2e6",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146357,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd-r.xmd",
-                MediaType = MediaType.DVDR,
-                Sectors   = 2146358,
-                MD5       = "6ba700d9b40b7ef1a9e4f78e317f124d",
-                LongMD5   = "6ba700d9b40b7ef1a9e4f78e317f124d",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146357,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom_cooked.xmd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom_nodpm.xmd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "66518892168f9bd5003e14979573861c",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.xmd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "8f0313d7a5f85e23be0d254f3c091004",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.xmd",
+            MediaType     = MediaType.CDRW,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "124df553ac9337d1b36c611aa1a3e16f",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.xmd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "248dd7375479f40267b6d4f9fd889d5b",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v1.xmd",
+            MediaType = MediaType.DVDRAM,
+            Sectors   = 471091,
+            MD5       = "b6fe37716c05c1d52ef19c28946f3b76",
+            LongMD5   = "b6fe37716c05c1d52ef19c28946f3b76",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 471090,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v2.xmd",
+            MediaType = MediaType.DVDRAM,
+            Sectors   = 471091,
+            MD5       = "b6fe37716c05c1d52ef19c28946f3b76",
+            LongMD5   = "b6fe37716c05c1d52ef19c28946f3b76",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 471090,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdrom.xmd",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146358,
+            MD5       = "ae08c024d6942e62884abe137f66a80f",
+            LongMD5   = "ae08c024d6942e62884abe137f66a80f",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146357,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+rw.xmd",
+            MediaType = MediaType.DVDPRW,
+            Sectors   = 2146358,
+            MD5       = "cea717c199230bef889ce268a473d2e6",
+            LongMD5   = "cea717c199230bef889ce268a473d2e6",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146357,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-rw.xmd",
+            MediaType = MediaType.DVDRW,
+            Sectors   = 2146369,
+            MD5       = "a60ea0383c5b39e14e09f47e749a3f46",
+            LongMD5   = "a60ea0383c5b39e14e09f47e749a3f46",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146368,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+r.xmd",
+            MediaType = MediaType.DVDPR,
+            Sectors   = 2146358,
+            MD5       = "cea717c199230bef889ce268a473d2e6",
+            LongMD5   = "cea717c199230bef889ce268a473d2e6",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146357,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-r.xmd",
+            MediaType = MediaType.DVDR,
+            Sectors   = 2146358,
+            MD5       = "6ba700d9b40b7ef1a9e4f78e317f124d",
+            LongMD5   = "6ba700d9b40b7ef1a9e4f78e317f124d",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146357,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/HDCopy.cs b/Aaru.Tests/Images/HDCopy.cs
index 4c3c708b2..deb483493 100644
--- a/Aaru.Tests/Images/HDCopy.cs
+++ b/Aaru.Tests/Images/HDCopy.cs
@@ -32,1397 +32,1396 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class HDCopy : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HD-COPY");
-        public override IMediaImage _plugin => new HdCopy();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class HDCopy : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HD-COPY");
+    public override IMediaImage _plugin    => new HdCopy();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0000.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "0fca5f810ce3179bbc67c7967370f1c2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0001.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "7abbee308589a097e434c52099b1905c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0009.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "9fbe4254ed34991d38a4cde57e867360",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0010.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "f42a1f0d64378f5fca289d60f65cac91"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0024.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "72abac3d635b24555b3b8fe4d71c6c50",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0025.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_8,
-                Sectors    = 1280,
-                SectorSize = 512,
-                MD5        = "758a18f67c5b609ff18a49910df3ac8e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0030.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "dacbe6b6677a76004bc0f8fbeb6c3a83",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0045.IMG.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "1a642606e79b5fb8e41536c320ba81ea",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0046.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "66a8bec544008abcd735e51fd19ed00b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2460
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0047.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_8,
-                Sectors    = 1280,
-                SectorSize = 512,
-                MD5        = "2840b7b7fb457cbabe3cc8b2f50411d9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0048.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "28c7d3ee80055b4fd19cd154ac610a3c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0049.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "19c6430529da8f390bf2cbfc0eaf21e3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1476
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0050.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "0c7ba41e67b07f0f203165b10c0a4e89",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0051.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "63267008556ad5704b2cf91049e5e255",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0052.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "015f4f812fd5b03741e3dcad534a4a8d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0053.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "60ebe39494bccd4d74daaa47003395e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0054.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "00260b1a20f19fa618d2acdee59dc471",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0055.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "dfb67a1f3c1fe596db30eeac92887583",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0056.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "fa5a213b8827cf7341b946e3fd1866cd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0057.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "f59f095594fc408cb2de1a977538afad",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0058.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "1826a1a29d65411a2d21ed28998d7c43",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0059.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3528,
-                SectorSize = 512,
-                MD5        = "16a5d02a2e73be36fec6abb8a671c13e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3528
-                    }
-                }
-            },
-            /* TODO: Open error
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0060.IMG.lz",
-                MediaType  = MediaType.CD,
-                Sectors    = 0,
-                SectorSize = 512,
-                MD5        = "UNKNOWN",
-            },
-            */ new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0069.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4c45b8baeef58e9ed76eb6782dd8535b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0075.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "3c1e16778895a28f15d119c426ed4332",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0076.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "dc2b7b7eb6d83ce25a6f51d1e457ca24",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0078.IMG.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "e800a80461a46369564e3bcdb8e54dbc"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0080.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4e502fab83012d988d9c915cfea00901",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0082.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "323322148c4c7394a92fa6a73542e32a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0084.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "38d8177e53175fb2cd60362339a548c1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0107.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "126dfd25363c076727dfaab03955c931",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0108.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 820,
-                SectorSize = 512,
-                MD5        = "e6492aac144f5f6f593b84c64680cf64",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 820
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0111.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "f01541de322c8d6d7321084d7a245e7b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0112.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0113.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0114.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a793047503af08e83361427b3e2806e0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0115.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0116.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "6631b66fdfd89319323771c41334c7ba",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0117.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "56471a253f4d6803b634e2bbff6c0931",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0122.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "9f91d2cfe918c6701d6b267294b092bc",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0123.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "28f3cda83fa1e22a420e06704abc6139",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0124.IMG.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "b057202adb98964e8f630a3299e86490",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0125.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "387f7d0468559b619e929db4451b3074",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0126.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "c64ef58dc6d875b9f6e7c0a7362c6832",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0163.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0164.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 820,
-                SectorSize = 512,
-                MD5        = "32823b9009c99b6711e89336ad03ec7f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 820
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0168.IMG.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "0bdf9130c07bb5d558a4705249f949d0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0169.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0170.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "589ae671a19e78ffcba5032092c4c0d5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0171.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2988,
-                SectorSize = 512,
-                MD5        = "cf0c71b65b56cb6b617d29525bd719dd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2988
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0174.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "152023525154b45ab26687190bac94db",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0175.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "db38ecd93f28dd065927fed21917eed5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0176.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "716262401bc69f2f440a9c156c21c9e9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0177.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "83213865ca6a40c289b22324a32a2608",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0180.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "f206c0caa4e0eda37233ab6e89ab5493",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0181.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "554492a7b41f4cd9068a3a2b70eb0e5f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0182.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "36dd03967a2a3369538cad29b8b74b71",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0183.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "4f5c02448e75bbc086e051c728414513",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0262.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "f8f951518283d395b6dd662a303e088d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0263.IMG.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "e6a87175b9dbac1916a735eb2418abd0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0264.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "2f576fb4c408d16fa49ef3093a2a3969",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0265.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "dab393b265b3b8d82b0eb920bc316299",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0266.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7c13a4f0c223d30916ba218186a42fad",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0267.IMG.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "e3797cf190f00a7205c0cc68e3977e04",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3040
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0268.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "e9de4f065fd056b90b16c3464d501daa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0269.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "cb7cedbe89c2859779f921c44ff0807a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0270.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3320,
-                SectorSize = 512,
-                MD5        = "db5f924b17bd7f1bf29784ede7b45dbb",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0271.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "2df2eaef283e5be894c0be29ba2feae1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0272.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "57af8042541c13d673ebb04bcdbca81b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0273.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "afcf6b2f8d762295ea8450aadf8b4319",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0282.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "ecfc55db0d383c1a2c5e639014954f85",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0283.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "0f11deec629979e6ea351ac18479c805"
-                /* TODO: IndexOutOfRangeException
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0284.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "0f11deec629979e6ea351ac18479c805"
-                /* TODO: IndexOutOfRangeException
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0285.IMG.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "976b335e4fe2356d16f45c123330249c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0301.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "9812da7e10dc3ff388907c135360b8bc",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0302.IMG.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "07eefdd2a6261be61af5b29de9dd56ee",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0303.IMG.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "6539a5d8ed493940e6a97e39eae0ca3e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0304.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "01f01805a6b22cad7e82a9cf614b8040",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0305.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "fe4ce9782a5a42bf2bf6b41f7a51d744",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0311.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "f8514aa0d100ad7eb14ef0f472416b67",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0314.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "5487ed4ca8e165d10ac0f04d8b96bbce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0316.IMG.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "0c438ab43509da1863b1fecff8d806aa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0317.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "cd0a831f1668b6ccd99d284513b86461",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0318.IMG.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "2a09063703e21f2440d2a9128c29147f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0319.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "ca24bcbfe70de3c1fd4955a6c12b9a0f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0320.IMG.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "ca24bcbfe70de3c1fd4955a6c12b9a0f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "TFULL.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "TFULLPAS.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "TNORMAL.IMG.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "387f7d0468559b619e929db4451b3074",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
+            TestFile   = "DSKA0000.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "0fca5f810ce3179bbc67c7967370f1c2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0001.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "7abbee308589a097e434c52099b1905c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0009.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "9fbe4254ed34991d38a4cde57e867360",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0010.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "f42a1f0d64378f5fca289d60f65cac91"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0024.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "72abac3d635b24555b3b8fe4d71c6c50",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0025.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_8,
+            Sectors    = 1280,
+            SectorSize = 512,
+            MD5        = "758a18f67c5b609ff18a49910df3ac8e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0030.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "dacbe6b6677a76004bc0f8fbeb6c3a83",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0045.IMG.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "1a642606e79b5fb8e41536c320ba81ea",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0046.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "66a8bec544008abcd735e51fd19ed00b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2460
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0047.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_8,
+            Sectors    = 1280,
+            SectorSize = 512,
+            MD5        = "2840b7b7fb457cbabe3cc8b2f50411d9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0048.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "28c7d3ee80055b4fd19cd154ac610a3c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0049.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "19c6430529da8f390bf2cbfc0eaf21e3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1476
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0050.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "0c7ba41e67b07f0f203165b10c0a4e89",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0051.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "63267008556ad5704b2cf91049e5e255",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0052.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "015f4f812fd5b03741e3dcad534a4a8d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0053.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "60ebe39494bccd4d74daaa47003395e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0054.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "00260b1a20f19fa618d2acdee59dc471",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0055.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "dfb67a1f3c1fe596db30eeac92887583",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0056.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "fa5a213b8827cf7341b946e3fd1866cd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0057.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "f59f095594fc408cb2de1a977538afad",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0058.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "1826a1a29d65411a2d21ed28998d7c43",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0059.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3528,
+            SectorSize = 512,
+            MD5        = "16a5d02a2e73be36fec6abb8a671c13e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3528
+                }
+            }
+        },
+        /* TODO: Open error
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0060.IMG.lz",
+            MediaType  = MediaType.CD,
+            Sectors    = 0,
+            SectorSize = 512,
+            MD5        = "UNKNOWN",
+        },
+        */ new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0069.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4c45b8baeef58e9ed76eb6782dd8535b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0075.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "3c1e16778895a28f15d119c426ed4332",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0076.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "dc2b7b7eb6d83ce25a6f51d1e457ca24",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0078.IMG.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "e800a80461a46369564e3bcdb8e54dbc"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0080.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4e502fab83012d988d9c915cfea00901",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0082.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "323322148c4c7394a92fa6a73542e32a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0084.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "38d8177e53175fb2cd60362339a548c1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0107.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "126dfd25363c076727dfaab03955c931",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0108.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 820,
+            SectorSize = 512,
+            MD5        = "e6492aac144f5f6f593b84c64680cf64",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 820
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0111.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "f01541de322c8d6d7321084d7a245e7b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0112.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0113.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0114.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a793047503af08e83361427b3e2806e0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0115.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0116.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "6631b66fdfd89319323771c41334c7ba",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0117.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "56471a253f4d6803b634e2bbff6c0931",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0122.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "9f91d2cfe918c6701d6b267294b092bc",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0123.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "28f3cda83fa1e22a420e06704abc6139",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0124.IMG.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "b057202adb98964e8f630a3299e86490",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0125.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "387f7d0468559b619e929db4451b3074",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0126.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "c64ef58dc6d875b9f6e7c0a7362c6832",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0163.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0164.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 820,
+            SectorSize = 512,
+            MD5        = "32823b9009c99b6711e89336ad03ec7f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 820
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0168.IMG.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "0bdf9130c07bb5d558a4705249f949d0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0169.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0170.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "589ae671a19e78ffcba5032092c4c0d5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0171.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2988,
+            SectorSize = 512,
+            MD5        = "cf0c71b65b56cb6b617d29525bd719dd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2988
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0174.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "152023525154b45ab26687190bac94db",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0175.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "db38ecd93f28dd065927fed21917eed5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0176.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "716262401bc69f2f440a9c156c21c9e9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0177.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "83213865ca6a40c289b22324a32a2608",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0180.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "f206c0caa4e0eda37233ab6e89ab5493",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0181.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "554492a7b41f4cd9068a3a2b70eb0e5f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0182.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "36dd03967a2a3369538cad29b8b74b71",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0183.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "4f5c02448e75bbc086e051c728414513",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0262.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "f8f951518283d395b6dd662a303e088d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0263.IMG.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "e6a87175b9dbac1916a735eb2418abd0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0264.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "2f576fb4c408d16fa49ef3093a2a3969",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0265.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "dab393b265b3b8d82b0eb920bc316299",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0266.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7c13a4f0c223d30916ba218186a42fad",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0267.IMG.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "e3797cf190f00a7205c0cc68e3977e04",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3040
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0268.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "e9de4f065fd056b90b16c3464d501daa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0269.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "cb7cedbe89c2859779f921c44ff0807a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0270.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3320,
+            SectorSize = 512,
+            MD5        = "db5f924b17bd7f1bf29784ede7b45dbb",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0271.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "2df2eaef283e5be894c0be29ba2feae1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0272.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "57af8042541c13d673ebb04bcdbca81b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0273.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "afcf6b2f8d762295ea8450aadf8b4319",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0282.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "ecfc55db0d383c1a2c5e639014954f85",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0283.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "0f11deec629979e6ea351ac18479c805"
+            /* TODO: IndexOutOfRangeException
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0284.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "0f11deec629979e6ea351ac18479c805"
+            /* TODO: IndexOutOfRangeException
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0285.IMG.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "976b335e4fe2356d16f45c123330249c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0301.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "9812da7e10dc3ff388907c135360b8bc",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0302.IMG.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "07eefdd2a6261be61af5b29de9dd56ee",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0303.IMG.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "6539a5d8ed493940e6a97e39eae0ca3e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0304.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "01f01805a6b22cad7e82a9cf614b8040",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0305.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "fe4ce9782a5a42bf2bf6b41f7a51d744",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0311.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "f8514aa0d100ad7eb14ef0f472416b67",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0314.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "5487ed4ca8e165d10ac0f04d8b96bbce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0316.IMG.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "0c438ab43509da1863b1fecff8d806aa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0317.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "cd0a831f1668b6ccd99d284513b86461",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0318.IMG.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "2a09063703e21f2440d2a9128c29147f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0319.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "ca24bcbfe70de3c1fd4955a6c12b9a0f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0320.IMG.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "ca24bcbfe70de3c1fd4955a6c12b9a0f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "TFULL.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "TFULLPAS.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "TNORMAL.IMG.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "387f7d0468559b619e929db4451b3074",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/HxC/ImageDisk.cs b/Aaru.Tests/Images/HxC/ImageDisk.cs
index 8f56e9f6f..2701d7ed7 100644
--- a/Aaru.Tests/Images/HxC/ImageDisk.cs
+++ b/Aaru.Tests/Images/HxC/ImageDisk.cs
@@ -32,293 +32,292 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.HxC
-{
-    [TestFixture]
-    public class ImageDisk : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "ImageDisk");
-        public override IMediaImage _plugin => new Imd();
+namespace Aaru.Tests.Images.HxC;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class ImageDisk : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "ImageDisk");
+    public override IMediaImage _plugin => new Imd();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "md1dd_8.imd.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "8308e749af855a3ded48d474eb7c305e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd.imd.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "b7b8a69b10ee4ec921aa8eea232fdd75"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_8.imd.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "f4a77a2d2a1868dc18e8b92032d02fd2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd.imd.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "099d95ac42d1a8010f914ac64ede7a70"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd.imd.lz",
+            MediaType  = MediaType.NEC_35_HD_15,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "3df7cd10044af75d77e8936af0dbf9ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_nec.imd.lz",
+            MediaType  = MediaType.NEC_35_HD_8,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "fd54916f713d01b670c1a5df5e74a97f",
+            Partitions = new[]
             {
-                TestFile   = "md1dd_8.imd.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "8308e749af855a3ded48d474eb7c305e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd.imd.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "b7b8a69b10ee4ec921aa8eea232fdd75"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_8.imd.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "f4a77a2d2a1868dc18e8b92032d02fd2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd.imd.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "099d95ac42d1a8010f914ac64ede7a70"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd.imd.lz",
-                MediaType  = MediaType.NEC_35_HD_15,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "3df7cd10044af75d77e8936af0dbf9ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_nec.imd.lz",
-                MediaType  = MediaType.NEC_35_HD_8,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "fd54916f713d01b670c1a5df5e74a97f",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_10.imd.lz",
-                MediaType  = MediaType.RX50,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "d75d3e79d9c5051922d4c2226fa4a6ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_11.imd.lz",
-                MediaType  = MediaType.ATARI_35_SS_DD_11,
-                Sectors    = 880,
-                SectorSize = 512,
-                MD5        = "e16ed33a1a466826562c681d8bdf3e27"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_10.imd.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fd48b2c12097cbc646b4a93ef4f92259"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_11.imd.lz",
-                MediaType  = MediaType.CBM_AMIGA_35_DD,
-                Sectors    = 1760,
-                SectorSize = 512,
-                MD5        = "512f7175e753e2e2ad620d448c42545d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_acorn.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "2626f65b49ec085253c41fa2e2a9e788"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_800.imd.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "9d978dff1196b456b8372d78e6b17970"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos.imd.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "456390a9c6ab05cb458a03c47296de08",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.imd.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed.imd.lz",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "854d0d49a522b64af698e319a24cd68e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1812,
-                SectorSize = 1024,
-                MD5        = "7ee82cecd23b30cc9aa6f0ec59877851"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_max.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1160,
-                SectorSize = 2048,
-                MD5        = "90a3c86eb9f8bdf6e4c15c445dff121e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_168.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3372,
-                SectorSize = 512,
-                MD5        = "7f9164dc43bffc895db751ba1d9b55a9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3372
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "9dea1e119a73a21a38d134f36b2e5564"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "dbd52e9e684f97d9e2292811242bb24e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2882,
-                SectorSize = 2048,
-                MD5        = "f5fff7704fb677ebf23d27cd937c9403"
-                /* TODO: Division by zero because bytes per cluster is 0
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2882
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "rx01.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2002,
-                SectorSize = 128,
-                MD5        = "5b4e36d92b180c3845387391cb5a1c64"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "rx50.imd.lz",
-                MediaType  = MediaType.RX50,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "ccd4431139755c58f340681f63510642",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
+                    Start  = 0,
+                    Length = 1232
                 }
             }
-            /* TODO: Sector type 119 is not implemented
-            new BlockImageTestExpected
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_10.imd.lz",
+            MediaType  = MediaType.RX50,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "d75d3e79d9c5051922d4c2226fa4a6ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_11.imd.lz",
+            MediaType  = MediaType.ATARI_35_SS_DD_11,
+            Sectors    = 880,
+            SectorSize = 512,
+            MD5        = "e16ed33a1a466826562c681d8bdf3e27"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_10.imd.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fd48b2c12097cbc646b4a93ef4f92259"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_11.imd.lz",
+            MediaType  = MediaType.CBM_AMIGA_35_DD,
+            Sectors    = 1760,
+            SectorSize = 512,
+            MD5        = "512f7175e753e2e2ad620d448c42545d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_acorn.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "2626f65b49ec085253c41fa2e2a9e788"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_800.imd.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "c533488a21098a62c85f1649abda2803",
+            Partitions = new[]
             {
-                TestFile   = "mf2hd_xdf.imd.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 0,
-                SectorSize = 0,
-                MD5        = "UNKNOWN"
-            },
-            new BlockImageTestExpected
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "9d978dff1196b456b8372d78e6b17970"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos.imd.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "456390a9c6ab05cb458a03c47296de08",
+            Partitions = new[]
             {
-                TestFile   = "mf2hd_xdf_teledisk.imd.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 0,
-                SectorSize = 0,
-                MD5        = "UNKNOWN"
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.imd.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed.imd.lz",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "854d0d49a522b64af698e319a24cd68e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1812,
+            SectorSize = 1024,
+            MD5        = "7ee82cecd23b30cc9aa6f0ec59877851"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_max.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1160,
+            SectorSize = 2048,
+            MD5        = "90a3c86eb9f8bdf6e4c15c445dff121e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_168.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3372,
+            SectorSize = 512,
+            MD5        = "7f9164dc43bffc895db751ba1d9b55a9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3372
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "9dea1e119a73a21a38d134f36b2e5564"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "dbd52e9e684f97d9e2292811242bb24e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2882,
+            SectorSize = 2048,
+            MD5        = "f5fff7704fb677ebf23d27cd937c9403"
+            /* TODO: Division by zero because bytes per cluster is 0
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2882
+                }
             }
             */
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "rx01.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2002,
+            SectorSize = 128,
+            MD5        = "5b4e36d92b180c3845387391cb5a1c64"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "rx50.imd.lz",
+            MediaType  = MediaType.RX50,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "ccd4431139755c58f340681f63510642",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        }
+        /* TODO: Sector type 119 is not implemented
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.imd.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 0,
+            SectorSize = 0,
+            MD5        = "UNKNOWN"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_teledisk.imd.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 0,
+            SectorSize = 0,
+            MD5        = "UNKNOWN"
+        }
+        */
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/HxC/Raw.cs b/Aaru.Tests/Images/HxC/Raw.cs
index b635d9e6e..e230e7671 100644
--- a/Aaru.Tests/Images/HxC/Raw.cs
+++ b/Aaru.Tests/Images/HxC/Raw.cs
@@ -32,298 +32,297 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.HxC
-{
-    [TestFixture]
-    public class Raw : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "raw");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.HxC;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Raw : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "HxC", "raw");
+    public override IMediaImage _plugin    => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "md1dd_8.img.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "8308e749af855a3ded48d474eb7c305e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd.img.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "b7b8a69b10ee4ec921aa8eea232fdd75"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_8.img.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "f4a77a2d2a1868dc18e8b92032d02fd2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd.img.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "099d95ac42d1a8010f914ac64ede7a70"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd.img.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "3df7cd10044af75d77e8936af0dbf9ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_nec.img.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "fd54916f713d01b670c1a5df5e74a97f",
+            Partitions = new[]
             {
-                TestFile   = "md1dd_8.img.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "8308e749af855a3ded48d474eb7c305e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd.img.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "b7b8a69b10ee4ec921aa8eea232fdd75"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_8.img.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "f4a77a2d2a1868dc18e8b92032d02fd2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd.img.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "099d95ac42d1a8010f914ac64ede7a70"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd.img.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "3df7cd10044af75d77e8936af0dbf9ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_nec.img.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "fd54916f713d01b670c1a5df5e74a97f",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_10.img.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "d75d3e79d9c5051922d4c2226fa4a6ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_11.img.lz",
-                MediaType  = MediaType.ATARI_35_SS_DD_11,
-                Sectors    = 880,
-                SectorSize = 512,
-                MD5        = "e16ed33a1a466826562c681d8bdf3e27"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_10.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fd48b2c12097cbc646b4a93ef4f92259"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_11.img.lz",
-                MediaType  = MediaType.CBM_AMIGA_35_DD,
-                Sectors    = 1760,
-                SectorSize = 512,
-                MD5        = "512f7175e753e2e2ad620d448c42545d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_acorn.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "2626f65b49ec085253c41fa2e2a9e788"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_amiga.img.lz",
-                MediaType  = MediaType.CBM_AMIGA_35_DD,
-                Sectors    = 1760,
-                SectorSize = 512,
-                MD5        = "7db6730656efb22695cdf0a49e2674c9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_800.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "9d978dff1196b456b8372d78e6b17970"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "456390a9c6ab05cb458a03c47296de08",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.img.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed.img.lz",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "854d0d49a522b64af698e319a24cd68e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3605,
-                SectorSize = 512,
-                MD5        = "7ee82cecd23b30cc9aa6f0ec59877851"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_max.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3768,
-                SectorSize = 512,
-                MD5        = "c96c0be31797a0e6c9f23aad8ae38555"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_168.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3372,
-                SectorSize = 512,
-                MD5        = "7f9164dc43bffc895db751ba1d9b55a9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3372
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "9dea1e119a73a21a38d134f36b2e5564"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "dbd52e9e684f97d9e2292811242bb24e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2888,
-                SectorSize = 512,
-                MD5        = "f5fff7704fb677ebf23d27cd937c9403",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2888
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "rx01.img.lz",
-                MediaType  = MediaType.ECMA_54,
-                Sectors    = 2002,
-                SectorSize = 128,
-                MD5        = "5b4e36d92b180c3845387391cb5a1c64"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "rx50.img.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "ccd4431139755c58f340681f63510642",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
+                    Start  = 0,
+                    Length = 1232
                 }
             }
-            /* TODO: XDF reading is not implemented
-            new BlockImageTestExpected
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_10.img.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "d75d3e79d9c5051922d4c2226fa4a6ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_11.img.lz",
+            MediaType  = MediaType.ATARI_35_SS_DD_11,
+            Sectors    = 880,
+            SectorSize = 512,
+            MD5        = "e16ed33a1a466826562c681d8bdf3e27"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_10.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fd48b2c12097cbc646b4a93ef4f92259"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_11.img.lz",
+            MediaType  = MediaType.CBM_AMIGA_35_DD,
+            Sectors    = 1760,
+            SectorSize = 512,
+            MD5        = "512f7175e753e2e2ad620d448c42545d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_acorn.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "2626f65b49ec085253c41fa2e2a9e788"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_amiga.img.lz",
+            MediaType  = MediaType.CBM_AMIGA_35_DD,
+            Sectors    = 1760,
+            SectorSize = 512,
+            MD5        = "7db6730656efb22695cdf0a49e2674c9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_800.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "c533488a21098a62c85f1649abda2803",
+            Partitions = new[]
             {
-                TestFile   = "mf2hd_xdf.img.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 670,
-                SectorSize = 8192,
-                MD5        = "UNKNOWN"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_teledisk.img.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "UNKNOWN"
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
             }
-            */
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "9d978dff1196b456b8372d78e6b17970"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "456390a9c6ab05cb458a03c47296de08",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.img.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed.img.lz",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "854d0d49a522b64af698e319a24cd68e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3605,
+            SectorSize = 512,
+            MD5        = "7ee82cecd23b30cc9aa6f0ec59877851"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_max.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3768,
+            SectorSize = 512,
+            MD5        = "c96c0be31797a0e6c9f23aad8ae38555"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_168.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3372,
+            SectorSize = 512,
+            MD5        = "7f9164dc43bffc895db751ba1d9b55a9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3372
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "9dea1e119a73a21a38d134f36b2e5564"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "dbd52e9e684f97d9e2292811242bb24e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2888,
+            SectorSize = 512,
+            MD5        = "f5fff7704fb677ebf23d27cd937c9403",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2888
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "rx01.img.lz",
+            MediaType  = MediaType.ECMA_54,
+            Sectors    = 2002,
+            SectorSize = 128,
+            MD5        = "5b4e36d92b180c3845387391cb5a1c64"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "rx50.img.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "ccd4431139755c58f340681f63510642",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        }
+        /* TODO: XDF reading is not implemented
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.img.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 670,
+            SectorSize = 8192,
+            MD5        = "UNKNOWN"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_teledisk.img.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "UNKNOWN"
+        }
+        */
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/HyperV.cs b/Aaru.Tests/Images/HyperV.cs
index b80ca8ce0..a267b552d 100644
--- a/Aaru.Tests/Images/HyperV.cs
+++ b/Aaru.Tests/Images/HyperV.cs
@@ -32,93 +32,92 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class HyperV : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Hyper-V");
-        public override IMediaImage _plugin => new Vhdx();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class HyperV : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Hyper-V");
+    public override IMediaImage _plugin    => new Vhdx();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "dynamic_exfat.vhdx.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 409600,
+            SectorSize = 512,
+            MD5        = "b3b3e6b89763ef45f6863d7fd1195778"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dynamic_fat32.vhdx.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 409600,
+            SectorSize = 512,
+            MD5        = "f2a720176adb4cf70c04c56b58339024",
+            Partitions = new[]
             {
-                TestFile   = "dynamic_exfat.vhdx.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 409600,
-                SectorSize = 512,
-                MD5        = "b3b3e6b89763ef45f6863d7fd1195778"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dynamic_fat32.vhdx.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 409600,
-                SectorSize = 512,
-                MD5        = "f2a720176adb4cf70c04c56b58339024",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 34,
-                        Length = 65536
-                    },
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 65664,
-                        Length = 339968
-                    }
+                    Start  = 34,
+                    Length = 65536
+                },
+                new BlockPartitionVolumes
+                {
+                    Start  = 65664,
+                    Length = 339968
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dynamic_ntfs.vhdx.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 409600,
-                SectorSize = 512,
-                MD5        = "bc6be23bbb139bd6fcd928f212205ce1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "dynamic_udf.vhdx.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 409600,
-                SectorSize = 512,
-                MD5        = "cfc501f3bcc12a00aa08db30e80c25ae"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "fixed_exfat.vhdx.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 409600,
-                SectorSize = 512,
-                MD5        = "06e97867ff89301fef7e9451ad7aa4ed"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "fixed_fat32.vhdx.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 409600,
-                SectorSize = 512,
-                MD5        = "d544a96ac1bd4431b884e244717d3dca"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "fixed_ntfs.vhdx.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 409600,
-                SectorSize = 512,
-                MD5        = "b10ed3ac22d882f7080b6f9859d1e646"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "fixed_udf.vhdx.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 409600,
-                SectorSize = 512,
-                MD5        = "338ba2043d7f9cb2693c35e3194e6c9c"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dynamic_ntfs.vhdx.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 409600,
+            SectorSize = 512,
+            MD5        = "bc6be23bbb139bd6fcd928f212205ce1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "dynamic_udf.vhdx.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 409600,
+            SectorSize = 512,
+            MD5        = "cfc501f3bcc12a00aa08db30e80c25ae"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "fixed_exfat.vhdx.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 409600,
+            SectorSize = 512,
+            MD5        = "06e97867ff89301fef7e9451ad7aa4ed"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "fixed_fat32.vhdx.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 409600,
+            SectorSize = 512,
+            MD5        = "d544a96ac1bd4431b884e244717d3dca"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "fixed_ntfs.vhdx.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 409600,
+            SectorSize = 512,
+            MD5        = "b10ed3ac22d882f7080b6f9859d1e646"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "fixed_udf.vhdx.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 409600,
+            SectorSize = 512,
+            MD5        = "338ba2043d7f9cb2693c35e3194e6c9c"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/ImageDisk.cs b/Aaru.Tests/Images/ImageDisk.cs
index d1896bc10..26647c3fe 100644
--- a/Aaru.Tests/Images/ImageDisk.cs
+++ b/Aaru.Tests/Images/ImageDisk.cs
@@ -32,3058 +32,3057 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class ImageDisk : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ImageDisk");
-        public override IMediaImage _plugin => new Imd();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class ImageDisk : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ImageDisk");
+    public override IMediaImage _plugin    => new Imd();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "CPM1_ALL.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_8,
+            Sectors    = 1280,
+            SectorSize = 512,
+            MD5        = "b5ab1915fc3d7fceecfcd7fda82f6b0d",
+            Partitions = new[]
             {
-                TestFile   = "CPM1_ALL.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_8,
-                Sectors    = 1280,
-                SectorSize = 512,
-                MD5        = "b5ab1915fc3d7fceecfcd7fda82f6b0d",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1280
-                    }
+                    Start  = 0,
+                    Length = 1280
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0000.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "e8bbbd22db87181974e12ba0227ea011"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0001.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "9f5635f3df4d880a500910b0ad1ab535"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0002.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_HD,
-                Sectors    = 1600,
-                SectorSize = 1024,
-                MD5        = "3bad4b4db8f5e2f991637fccf7a25740"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0003.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0004.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_HD,
-                Sectors    = 1600,
-                SectorSize = 1024,
-                MD5        = "a481bd5a8281dad089edbef390c136ed"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0006.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "46fce47baf08c6f093f2c355a603543d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0009.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "95ea232f59e44db374b994cfe7f1c07f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0010.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "9e2b01f4397db2a6c76e2bc267df37b3"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0011.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "dbbf55398d930e14c2b0a035dd1277b9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0012.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "656002e6e620cb3b73c27f4c21d32edb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0013.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "1244cc2c101c66e6bb4ad5183b356b19"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0017.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "a817a56036f591a5cff11857b7d466be"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0018.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "439b2b76e154f3ce7e86bf1377282d5f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0019.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 90,
-                SectorSize = 512,
-                MD5        = "3c21d11e2b4ca108de3ec8ffface814d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0020.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "c2e64e8a388b4401719f06d6a868dd1b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0021.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "6fc7f2233f094af7ae0d454668976858"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0022.IMD.lz",
-                MediaType  = MediaType.ACORN_525_DS_DD,
-                Sectors    = 2560,
-                SectorSize = 256,
-                MD5        = "ad6c3e6910457a53572695401efda4ab"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0023.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_HD,
-                Sectors    = 1600,
-                SectorSize = 1024,
-                MD5        = "5e41fe3201ab32f25873faf8d3f79a02"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0024.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2302991363cb3681cffdc4388915b51e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0025.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4e4cafed1cc22ea72201169427e5e1b6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0026.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "a579b349a5a24218d59a44e36bdb1333"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0027.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 960,
-                SectorSize = 1024,
-                MD5        = "669b2155d5e4d7849d662729717a68d8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0028.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1a4c7487382c98b7bc74623ddfb488e6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0029.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 960,
-                SectorSize = 1024,
-                MD5        = "23f5700ea3bfe076c88dd399a8026a1e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0030.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "af83d011608042d35021e39aa5e10b2f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0031.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_40,
-                Sectors    = 640,
-                SectorSize = 256,
-                MD5        = "e640835966327f3f662e1db8e0575510"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0032.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_40,
-                Sectors    = 640,
-                SectorSize = 256,
-                MD5        = "ff3534234d1d2dd88bf6e83be23d9227"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0033.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "dfaff34a6556b515642f1e54f839b02e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0034.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "ca8f5c7f9ed161b03ccb166eb9d62146"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0035.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6642c1a32d2c58e93481d664974fc202",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0036.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6642c1a32d2c58e93481d664974fc202",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0037.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "5101f89850dc28efbcfb7622086a9ddf",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0038.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "8e570be2ed1f00ddea82e50a2d9c446a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0039.IMD.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "abba2a1ddd60a649047a9c44d94bbeae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0040.IMD.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "e3bc48bec81be5b35be73d41fdffd2ab",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0041.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "43b5068af9d016d1432eb2e12d2b802a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0042.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "5bf2ad4dc300592604b6e32f8b8e2656",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0043.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "cb9a832ca6a4097b8ccc30d2108e1f7d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0044.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "56d181a6bb8713e6b2854fe8887faab6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0045.IMD.lz",
-                MediaType  = MediaType.NEC_35_HD_15,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "41aef7cff26aefda1add8d49c5b962c2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0046.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "2437c5f089f1cba3866b36360b016f16",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2460
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0047.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_8,
-                Sectors    = 1280,
-                SectorSize = 512,
-                MD5        = "bdaa8f17373b265830fdf3a06b794367",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0048.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "629932c285478d0540ff7936aa008351",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0049.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "7a2abef5d4701e2e49abb05af8d4da50",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1476
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0050.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "e3507522c914264f44fb2c92c3170c09",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0051.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "824fe65dbb1a42b6b94f05405ef984f2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0052.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "1a8c2e78e7132cf9ba5d6c2b75876be0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0053.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "936b20bb0966fe693b4d5e2353e24846",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0054.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "803b01a0b440c2837d37c21308f30cd5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0055.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "aa0d31f914760cc4cde75479779ebed6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0057.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "5e413433c54f48978d281c6e66d1106e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0058.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "4fc28b0128543b2eb70f6432c4c8a980",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0059.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3528,
-                SectorSize = 512,
-                MD5        = "24a7459d080cea3a60d131b8fd7dc5d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3528
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0060.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3570,
-                SectorSize = 512,
-                MD5        = "2031b1e16ee2defc0d15f732f633df33",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3570
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0061.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 5100,
-                SectorSize = 512,
-                MD5        = "79e5f1fbd63b87c087d85904d45964e6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 5100
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0063.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 6604,
-                SectorSize = 512,
-                MD5        = "1b2495a8f2274852b6fae80ae6fbff2f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 6604
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0064.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 9180,
-                SectorSize = 512,
-                MD5        = "3a70851950ad06c20e3063ad6f128eef",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 9180
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0065.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 10710,
-                SectorSize = 512,
-                MD5        = "98a91bbdbe8454cf64e20d0ec5c35017",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10710
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0066.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 10710,
-                SectorSize = 512,
-                MD5        = "666706f299a1362cb30f34a3a7f555be",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 10710
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0067.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 13770,
-                SectorSize = 512,
-                MD5        = "2fa1eedb57fac492d6f6b71e2c0a079c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 13770
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0068.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "3152c8e3544bbfaceff14b7522faf5af",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0069.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "5fc19ca552b6db957061e9a1750394d2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0070.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "d1e978b679c63a218c3f77a7ca2c7206"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0073.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "a33b46f042b78fe3d0b3c5dbb3908a93",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0074.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "565d3c001cbb532154aa5d3c65b2439c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0075.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "e60442c3ebd72c99bdd7545fdba59613",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0076.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "058a33a129539285c9b64010496af52f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0077.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "0726ecbc38965d30a6222c3e74cd1aa3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0078.IMD.lz",
-                MediaType  = MediaType.NEC_35_HD_15,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "c9a193837db7d8a5eb025eb41e8a76d7"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0080.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c38d69ac88520f14fcc6d6ced22b065d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0081.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "91d51964e1e64ef3f6f622fa19aa833c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0082.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "db36d9651c952ff679ec33223c8db2d3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0083.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2988,
-                SectorSize = 512,
-                MD5        = "5f1d98806309aee7f81de72e51e6d386",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2988
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0084.IMD.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "1207a1cc7ff73d4f74c8984b4e7db33f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0085.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "c97a3081fd25474b6b7945b8572d5ab8",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0086.IMD.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "31269ed6464302ae26d22b7c87bceb23",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0089.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 664,
-                SectorSize = 512,
-                MD5        = "8b31e5865611dbe01cc25b5ba2fbdf25"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0090.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 670,
-                SectorSize = 2048,
-                MD5        = "be278c00c3ec906756e7c8d544d8833d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0091.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 824,
-                SectorSize = 1024,
-                MD5        = "8e7fb60151e0002e8bae2fb2abe13a69"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0092.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 824,
-                SectorSize = 2048,
-                MD5        = "45e0b2a2925a95bbdcb43a914d70f91b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0093.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1483,
-                SectorSize = 1024,
-                MD5        = "082d7eda62eead1e20fd5a060997ff0f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0094.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 995,
-                SectorSize = 2048,
-                MD5        = "9b75a2fb671d1e7fa27434038b375e5e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0097.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1812,
-                SectorSize = 1024,
-                MD5        = "97c4f895d64ba196f19a3179e68ef693"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0098.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1160,
-                SectorSize = 2048,
-                MD5        = "c838233a380973de386e66ee0e0cbcc2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0099.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 164,
-                SectorSize = 16384,
-                MD5        = "dea88f91ca0f6d90626b4029286cb01f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0101.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 164,
-                SectorSize = 16384,
-                MD5        = "db82b15389e2ffa9a20f7251cc5cce5b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0103.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 164,
-                SectorSize = 16384,
-                MD5        = "638b56d7061a8156ee87166c78f06111"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0105.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "d40a99cb549fcfb26fcf9ef01b5dfca7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0106.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 410,
-                SectorSize = 512,
-                MD5        = "7b41dd9ca7eb32828960eb1417a6092a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 410
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0107.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "126dfd25363c076727dfaab03955c931",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0108.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 820,
-                SectorSize = 512,
-                MD5        = "e6492aac144f5f6f593b84c64680cf64",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 820
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0109.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0110.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a793047503af08e83361427b3e2806e0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0111.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "f01541de322c8d6d7321084d7a245e7b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0112.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0113.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0114.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a793047503af08e83361427b3e2806e0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0115.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0116.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "6631b66fdfd89319323771c41334c7ba",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0117.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3240,
-                SectorSize = 512,
-                MD5        = "4b5e2c9599bb7861b3b52bec00d81278"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0120.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "7d36aee5a3071ff75b979f3acb649c40",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0121.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "0ccb62039363ab544c69eca229a17fae"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0122.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "7851d31fad9302ff45d3ded4fba25387",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0123.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "915b08c82591e8488320e001b7303b6d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0124.IMD.lz",
-                MediaType  = MediaType.NEC_35_HD_15,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "5e5ea6fe9adf842221fdc60e56630405",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0125.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0126.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ddc6c1200c60e9f7796280f50c2e5283",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0147.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6efa72a33021d5051546c3e0dd4c3c09"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0148.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "8b5acfd14818ff9556d3d81361ce4862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0149.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 200,
-                SectorSize = 1024,
-                MD5        = "cf42d08469548a31caf2649a1d08a85f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0150.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 1024,
-                MD5        = "62745e10683cf2ec1dac177535459891"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0151.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "cf42d08469548a31caf2649a1d08a85f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0153.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "298c377de52947c472a85d281b6d3d4d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0154.IMD.lz",
-                MediaType  = MediaType.RX50,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "387373301cf6c15d61eec9bab18d9b6a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0155.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 848,
-                SectorSize = 512,
-                MD5        = "83b66a88d92cbf2715343016e4108211"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0157.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "20e047061b6ca4059288deed8c9dd247"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0158.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "8b5acfd14818ff9556d3d81361ce4862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0159.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_40,
-                Sectors    = 640,
-                SectorSize = 256,
-                MD5        = "6efa72a33021d5051546c3e0dd4c3c09"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0160.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "8b5acfd14818ff9556d3d81361ce4862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0162.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "e63014a4299f52f22e6e2c9609f51979"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0163.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0164.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 820,
-                SectorSize = 512,
-                MD5        = "32823b9009c99b6711e89336ad03ec7f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 820
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0166.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1c8b03a8550ed3e70e1c78316aa445aa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0167.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 960,
-                SectorSize = 1024,
-                MD5        = "efbc62e2ecddc15241aa0779e078d478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0168.IMD.lz",
-                MediaType  = MediaType.NEC_35_HD_15,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "0bdf9130c07bb5d558a4705249f949d0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0169.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0170.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "589ae671a19e78ffcba5032092c4c0d5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0171.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2988,
-                SectorSize = 512,
-                MD5        = "cf0c71b65b56cb6b617d29525bd719dd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2988
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0173.IMD.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "028769dc0abefab1740cc309432588b6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0174.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "152023525154b45ab26687190bac94db",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0175.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "db38ecd93f28dd065927fed21917eed5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0176.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "716262401bc69f2f440a9c156c21c9e9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0177.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "83213865ca6a40c289b22324a32a2608",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0180.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "f206c0caa4e0eda37233ab6e89ab5493",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0181.IMD.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "554492a7b41f4cd9068a3a2b70eb0e5f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0182.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3402,
-                SectorSize = 512,
-                MD5        = "865ad9072cb6c7458f7d86d7e9368622"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0183.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "2461e458438f0033bc5811fd6958ad02"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0184.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1760,
-                SectorSize = 1024,
-                MD5        = "be75996696aa70ee9338297137556d83"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0185.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1120,
-                SectorSize = 2048,
-                MD5        = "5a0f2bad567464288ec7ce935672870a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0186.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 320,
-                SectorSize = 4096,
-                MD5        = "69f9f0b5c1fc00a8f398151df9d93ab5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0191.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 626,
-                SectorSize = 1024,
-                MD5        = "fb144f79239f6f5f113b417700c2d278"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0192.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 670,
-                SectorSize = 2048,
-                MD5        = "6a936d2ecb771e37b856bdad16822c32"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0194.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 356,
-                SectorSize = 4096,
-                MD5        = "e283af9d280efaf059c816b6a2c9206b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0196.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 960,
-                SectorSize = 1024,
-                MD5        = "e4625838148a4b7c6580c697cd47362c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0197.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_40,
-                Sectors    = 640,
-                SectorSize = 256,
-                MD5        = "74f71ef3978fefce64689e8be18359ba"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0198.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "5c4e555b29a264f2a81f8a2b58bfc442"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0199.IMD.lz",
-                MediaType  = MediaType.ACORN_525_DS_DD,
-                Sectors    = 2560,
-                SectorSize = 256,
-                MD5        = "64ae73ac812bbf473a5d443de4d5dfbf"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0200.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_HD,
-                Sectors    = 1600,
-                SectorSize = 1024,
-                MD5        = "a481bd5a8281dad089edbef390c136ed"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0201.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0202.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_HD,
-                Sectors    = 1600,
-                SectorSize = 1024,
-                MD5        = "a481bd5a8281dad089edbef390c136ed"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0203.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 1024,
-                MD5        = "8a16a3008739516fc3ba4c878868d056"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0204.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "46fce47baf08c6f093f2c355a603543d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0205.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "ee73a5d5c8dfac236baf7b99811696f9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0206.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "b3bdbc62fb96e3893dac3bccbde59ab0"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0207.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "02942b9dc9d3b1bc9335b73c99e6da2e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0208.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 480,
-                SectorSize = 1024,
-                MD5        = "dfc9e8c7bd3d50f404d6f0b6ada20b0c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0209.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0210.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0211.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "647f14749f59be471aac04a71a079a64"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0212.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "517cdd5e42a4673f733d1aedfb46770f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0213.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "6ad92e9522e4ba902c01beecb5943bb1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0214.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_HD,
-                Sectors    = 1600,
-                SectorSize = 1024,
-                MD5        = "9a1a7d8f53fcfad7603fe585c6c7214c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0215.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_HD,
-                Sectors    = 1600,
-                SectorSize = 1024,
-                MD5        = "2a7a9b48551fd4d8b166bcfcbe1ca132"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0216.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "40199611e6e75bbc37ad6c52a5b77eae"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0218.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 5100,
-                SectorSize = 512,
-                MD5        = "8fa0ffd7481a94b9e7c4006599329250"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0219.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 9180,
-                SectorSize = 512,
-                MD5        = "3fa51592c5a65b7e4915a8e22d523ced"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0220.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 13770,
-                SectorSize = 512,
-                MD5        = "2153339750c119627bab75bd0bf7a193"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0221.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 5120,
-                SectorSize = 256,
-                MD5        = "f92b2e52259531d50bfb403dc1274ab1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0222.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0223.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1600,
-                SectorSize = 256,
-                MD5        = "a5dc382d75ec46434b313e289c281d8c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0224.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1152,
-                SectorSize = 256,
-                MD5        = "8335b175c352352e19f9008ad67d1375"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0225.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1056,
-                SectorSize = 256,
-                MD5        = "447efa963c19474508c503d037a3b429"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0226.IMD.lz",
-                MediaType  = MediaType.ACORN_525_DS_DD,
-                Sectors    = 2560,
-                SectorSize = 256,
-                MD5        = "b7669fa76ecf5634313675b001bb7fa2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0227.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 5120,
-                SectorSize = 256,
-                MD5        = "676f1bc7764899912ab6ad8257c63a16"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0228.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1120,
-                SectorSize = 256,
-                MD5        = "d72e86324d4d518996f6671751614800"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0232.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 621,
-                SectorSize = 512,
-                MD5        = "b76bd117ce24d933cdefe09b1de2164a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0233.IMD.lz",
-                MediaType  = MediaType.ATARI_525_SD,
-                Sectors    = 720,
-                SectorSize = 128,
-                MD5        = "a769b7642a222d97a56c46f53833fafa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0234.IMD.lz",
-                MediaType  = MediaType.ACORN_525_DS_DD,
-                Sectors    = 2560,
-                SectorSize = 256,
-                MD5        = "dfa733d034bb1f83d694dfa217910081"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0235.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1600,
-                SectorSize = 256,
-                MD5        = "8260ee01a245aec2de162ee0d85f4b7f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0236.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_SD_80,
-                Sectors    = 800,
-                SectorSize = 256,
-                MD5        = "261c7a5a4298e9f050928dd770097c77"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0238.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a47068ff73dfbea58c25daa5b9132a9e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0240.IMD.lz",
-                MediaType  = MediaType.ATARI_525_DD,
-                Sectors    = 720,
-                SectorSize = 256,
-                MD5        = "d1ab955f0961ab94e6cf69f78134a84b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0241.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 714,
-                SectorSize = 256,
-                MD5        = "8b62738f15bcc916a668eaa67eec86e7"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0242.IMD.lz",
-                MediaType  = MediaType.NEC_35_HD_8,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "87a432496cb23b5c2299545500df3553",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0243.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "9866ab8e58fa4be25010184aec4ad3aa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0244.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "9dab329ae098b29889ab08278de38f95"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0245.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "0d71b4952dadbfb1061acc1f4640c787"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0246.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "af7ac6b5b9d2d57dad22dbb64ef7de38"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0247.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "f8f81f945aaad6fbfe7e2db1905302c1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0248.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "f6f81c75b5ba45d91c1886c6dda9caee"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0250.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "d4809467b321991a9c772ad87fc8aa19"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0251.IMD.lz",
-                MediaType  = MediaType.ACORN_525_DS_DD,
-                Sectors    = 2560,
-                SectorSize = 256,
-                MD5        = "d075e50705f4ddca7ba4dbc981ec1176"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0252.IMD.lz",
-                MediaType  = MediaType.ACORN_525_SS_DD_80,
-                Sectors    = 1280,
-                SectorSize = 256,
-                MD5        = "9f86480c86bae33a5b444e4a7ed55048"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0253.IMD.lz",
-                MediaType  = MediaType.ACORN_35_DS_DD,
-                Sectors    = 800,
-                SectorSize = 1024,
-                MD5        = "629971775d902d1cc2658fc76f57e072"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0254.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "5dc0d482a773043d8683a84c8220df95",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0255.IMD.lz",
-                MediaType  = MediaType.ACORN_525_DS_DD,
-                Sectors    = 2544,
-                SectorSize = 256,
-                MD5        = "1718d8acd18fce3c5c1a7a074ed8ac29"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0258.IMD.lz",
-                MediaType  = MediaType.NEC_35_HD_8,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "855943f9caecdcce9b06f0098d773c6b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0262.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "5ac0a9fc7337f761098f816359b0f6f7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0263.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "1ea6ec8e663218b1372048f6e25795b5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0264.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "77a1167b1b9043496e32b8578cde0ff0"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0265.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "4b07d760d65f3f0f8ffa5f2b81cee907",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0266.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "32c044c5c2b0bd13806149a759c14935",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0267.IMD.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "8752095abc13dba3f3467669da333891",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3040
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0268.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "aece7cd34bbba3e75307fa70404d9d30",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0269.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "5289afb16a6e4a33213e3bcca56c6230",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0270.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3320,
-                SectorSize = 512,
-                MD5        = "1aef0a0ba233476db6567878c3c2b266"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0271.IMD.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "b96596711f4d2ee85dfda0fe3b9f26c3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0272.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "a4f461af7fda5e93a7ab63fcbb7e7683"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0273.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "8f7f7099d4475f6631fcf0a79b031d61",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0280.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "4feeaf4b4ee5dad85db727fbbda4b6d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0281.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "3c77ca681df78e4cd7baa162aa9b0859",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0282.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "51da1f86c49657ffdb367bb2ddeb7990",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0283.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "b81a4987f89936630b8ebc62e4bbce6e"
-                /* TODO: IndexOutOfRangeException
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0284.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "f76f92dd326c99c5efad5ee58daf72e1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0285.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "b6f2c10e42908e334025bc4ffd81e771",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0287.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "f2f409ea2a62a7866fd2777cc4fc9739",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0288.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1494,
-                SectorSize = 512,
-                MD5        = "3e441d69cec5c3169274e1379de4af4b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1494
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0289.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "30a93f30dd4485c6fc037fe0775d3fc7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0290.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "e0caf02cce5597c98313bcc480366ec7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0291.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "4af4904d2b3c815da7bef7049209f5eb",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0299.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "39bf5a98bcb2185d855ac06378febcfa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0300.IMD.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "dc20055b6e6fd6f8e1114d4be2effeed",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0301.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "56af9256cf71d5aac5fd5d363674bc49"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0302.IMD.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "bbba1e2d1418e05c3a4e7b4d585d160b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0303.IMD.lz",
-                MediaType  = MediaType.NEC_35_HD_15,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "bca3a045e81617f7f5ebb5a8818eac47",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0304.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "a296663cb8e75e94603221352f29cfff",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0305.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ecda36ebf0e1100233cb0ec722c18583",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0307.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "cef2f4fe9b1a32d5c0544f814e634264",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0308.IMD.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "bbe58e26b8f8f822cd3edfd37a4e4924"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0311.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "b9b6ebdf711364c979de7cf70c3a438a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0314.IMD.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "d37424f367f545acbb397f2bed766843"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0316.IMD.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "9963dd6f19ce6bd56eabeccdfbbd821a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0317.IMD.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "acf6604559ae8217f7869823e2429024",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0318.IMD.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "23bf2139cdfdc4c16db058fd31ea6481",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0319.IMD.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "fa26adda0415f02057b113ad29c80c8d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0320.IMD.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "4f2a8d036fefd6c6c88d99eda3aa12b7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0322.IMD.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1386,
-                SectorSize = 512,
-                MD5        = "e794a3ffa4069ea999fdf7146710fa9e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1386
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd_rx01.imd.lz",
-                MediaType  = MediaType.RX01,
-                Sectors    = 2002,
-                SectorSize = 128,
-                MD5        = "5b4e36d92b180c3845387391cb5a1c64"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1qd_rx50.imd.lz",
-                MediaType  = MediaType.RX50,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "ccd4431139755c58f340681f63510642",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_nec.imd.lz",
-                MediaType  = MediaType.NEC_35_HD_8,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "fd54916f713d01b670c1a5df5e74a97f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2mgui.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 164,
-                SectorSize = 16384,
-                MD5        = "623b224f63d65ae3b6c3ddadadf3b836"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2m.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 987,
-                SectorSize = 1024,
-                MD5        = "08b530d8c25d785b20c93a1a7a6468a0"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_800.imd.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.imd.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "db9cfb6eea18820b7a7e0b5b45594471",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos.imd.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "1ff7649b679ba22ff20d39ff717dbec8",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.imd.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2mgui.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 164,
-                SectorSize = 16384,
-                MD5        = "adafed1fac3d1a181380bdb590249385"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1812,
-                SectorSize = 1024,
-                MD5        = "c741c78eecd673f8fc49e77459871940"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_168.imd.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "03c2af6a8ebf4bd6f530335de34ae5dd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.imd.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "9dea1e119a73a21a38d134f36b2e5564"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "dbd52e9e684f97d9e2292811242bb24e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.imd.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b4a602f67903c46eef62addb0780aa56",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 670,
-                SectorSize = 2048,
-                MD5        = "71194f8dba31d29780bd0a6ecee5ab2b"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0000.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "e8bbbd22db87181974e12ba0227ea011"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0001.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "9f5635f3df4d880a500910b0ad1ab535"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0002.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_HD,
+            Sectors    = 1600,
+            SectorSize = 1024,
+            MD5        = "3bad4b4db8f5e2f991637fccf7a25740"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0003.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0004.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_HD,
+            Sectors    = 1600,
+            SectorSize = 1024,
+            MD5        = "a481bd5a8281dad089edbef390c136ed"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0006.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "46fce47baf08c6f093f2c355a603543d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0009.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "95ea232f59e44db374b994cfe7f1c07f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0010.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "9e2b01f4397db2a6c76e2bc267df37b3"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0011.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "dbbf55398d930e14c2b0a035dd1277b9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0012.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "656002e6e620cb3b73c27f4c21d32edb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0013.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "1244cc2c101c66e6bb4ad5183b356b19"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0017.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "a817a56036f591a5cff11857b7d466be"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0018.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "439b2b76e154f3ce7e86bf1377282d5f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0019.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 90,
+            SectorSize = 512,
+            MD5        = "3c21d11e2b4ca108de3ec8ffface814d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0020.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "c2e64e8a388b4401719f06d6a868dd1b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0021.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "6fc7f2233f094af7ae0d454668976858"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0022.IMD.lz",
+            MediaType  = MediaType.ACORN_525_DS_DD,
+            Sectors    = 2560,
+            SectorSize = 256,
+            MD5        = "ad6c3e6910457a53572695401efda4ab"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0023.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_HD,
+            Sectors    = 1600,
+            SectorSize = 1024,
+            MD5        = "5e41fe3201ab32f25873faf8d3f79a02"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0024.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2302991363cb3681cffdc4388915b51e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0025.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4e4cafed1cc22ea72201169427e5e1b6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0026.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "a579b349a5a24218d59a44e36bdb1333"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0027.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 960,
+            SectorSize = 1024,
+            MD5        = "669b2155d5e4d7849d662729717a68d8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0028.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1a4c7487382c98b7bc74623ddfb488e6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0029.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 960,
+            SectorSize = 1024,
+            MD5        = "23f5700ea3bfe076c88dd399a8026a1e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0030.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "af83d011608042d35021e39aa5e10b2f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0031.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_40,
+            Sectors    = 640,
+            SectorSize = 256,
+            MD5        = "e640835966327f3f662e1db8e0575510"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0032.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_40,
+            Sectors    = 640,
+            SectorSize = 256,
+            MD5        = "ff3534234d1d2dd88bf6e83be23d9227"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0033.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "dfaff34a6556b515642f1e54f839b02e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0034.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "ca8f5c7f9ed161b03ccb166eb9d62146"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0035.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6642c1a32d2c58e93481d664974fc202",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0036.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6642c1a32d2c58e93481d664974fc202",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0037.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "5101f89850dc28efbcfb7622086a9ddf",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0038.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "8e570be2ed1f00ddea82e50a2d9c446a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0039.IMD.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "abba2a1ddd60a649047a9c44d94bbeae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0040.IMD.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "e3bc48bec81be5b35be73d41fdffd2ab",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0041.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "43b5068af9d016d1432eb2e12d2b802a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0042.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "5bf2ad4dc300592604b6e32f8b8e2656",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0043.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "cb9a832ca6a4097b8ccc30d2108e1f7d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0044.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "56d181a6bb8713e6b2854fe8887faab6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0045.IMD.lz",
+            MediaType  = MediaType.NEC_35_HD_15,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "41aef7cff26aefda1add8d49c5b962c2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0046.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "2437c5f089f1cba3866b36360b016f16",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2460
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0047.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_8,
+            Sectors    = 1280,
+            SectorSize = 512,
+            MD5        = "bdaa8f17373b265830fdf3a06b794367",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0048.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "629932c285478d0540ff7936aa008351",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0049.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "7a2abef5d4701e2e49abb05af8d4da50",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1476
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0050.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "e3507522c914264f44fb2c92c3170c09",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0051.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "824fe65dbb1a42b6b94f05405ef984f2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0052.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "1a8c2e78e7132cf9ba5d6c2b75876be0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0053.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "936b20bb0966fe693b4d5e2353e24846",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0054.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "803b01a0b440c2837d37c21308f30cd5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0055.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "aa0d31f914760cc4cde75479779ebed6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0057.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "5e413433c54f48978d281c6e66d1106e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0058.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "4fc28b0128543b2eb70f6432c4c8a980",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0059.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3528,
+            SectorSize = 512,
+            MD5        = "24a7459d080cea3a60d131b8fd7dc5d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3528
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0060.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3570,
+            SectorSize = 512,
+            MD5        = "2031b1e16ee2defc0d15f732f633df33",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3570
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0061.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 5100,
+            SectorSize = 512,
+            MD5        = "79e5f1fbd63b87c087d85904d45964e6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 5100
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0063.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 6604,
+            SectorSize = 512,
+            MD5        = "1b2495a8f2274852b6fae80ae6fbff2f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 6604
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0064.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 9180,
+            SectorSize = 512,
+            MD5        = "3a70851950ad06c20e3063ad6f128eef",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 9180
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0065.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 10710,
+            SectorSize = 512,
+            MD5        = "98a91bbdbe8454cf64e20d0ec5c35017",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10710
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0066.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 10710,
+            SectorSize = 512,
+            MD5        = "666706f299a1362cb30f34a3a7f555be",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 10710
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0067.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 13770,
+            SectorSize = 512,
+            MD5        = "2fa1eedb57fac492d6f6b71e2c0a079c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 13770
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0068.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "3152c8e3544bbfaceff14b7522faf5af",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0069.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "5fc19ca552b6db957061e9a1750394d2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0070.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "d1e978b679c63a218c3f77a7ca2c7206"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0073.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "a33b46f042b78fe3d0b3c5dbb3908a93",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0074.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "565d3c001cbb532154aa5d3c65b2439c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0075.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "e60442c3ebd72c99bdd7545fdba59613",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0076.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "058a33a129539285c9b64010496af52f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0077.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "0726ecbc38965d30a6222c3e74cd1aa3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0078.IMD.lz",
+            MediaType  = MediaType.NEC_35_HD_15,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "c9a193837db7d8a5eb025eb41e8a76d7"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0080.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c38d69ac88520f14fcc6d6ced22b065d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0081.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "91d51964e1e64ef3f6f622fa19aa833c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0082.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "db36d9651c952ff679ec33223c8db2d3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0083.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2988,
+            SectorSize = 512,
+            MD5        = "5f1d98806309aee7f81de72e51e6d386",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2988
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0084.IMD.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "1207a1cc7ff73d4f74c8984b4e7db33f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0085.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "c97a3081fd25474b6b7945b8572d5ab8",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0086.IMD.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "31269ed6464302ae26d22b7c87bceb23",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0089.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 664,
+            SectorSize = 512,
+            MD5        = "8b31e5865611dbe01cc25b5ba2fbdf25"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0090.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 670,
+            SectorSize = 2048,
+            MD5        = "be278c00c3ec906756e7c8d544d8833d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0091.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 824,
+            SectorSize = 1024,
+            MD5        = "8e7fb60151e0002e8bae2fb2abe13a69"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0092.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 824,
+            SectorSize = 2048,
+            MD5        = "45e0b2a2925a95bbdcb43a914d70f91b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0093.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1483,
+            SectorSize = 1024,
+            MD5        = "082d7eda62eead1e20fd5a060997ff0f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0094.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 995,
+            SectorSize = 2048,
+            MD5        = "9b75a2fb671d1e7fa27434038b375e5e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0097.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1812,
+            SectorSize = 1024,
+            MD5        = "97c4f895d64ba196f19a3179e68ef693"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0098.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1160,
+            SectorSize = 2048,
+            MD5        = "c838233a380973de386e66ee0e0cbcc2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0099.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 164,
+            SectorSize = 16384,
+            MD5        = "dea88f91ca0f6d90626b4029286cb01f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0101.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 164,
+            SectorSize = 16384,
+            MD5        = "db82b15389e2ffa9a20f7251cc5cce5b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0103.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 164,
+            SectorSize = 16384,
+            MD5        = "638b56d7061a8156ee87166c78f06111"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0105.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "d40a99cb549fcfb26fcf9ef01b5dfca7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0106.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 410,
+            SectorSize = 512,
+            MD5        = "7b41dd9ca7eb32828960eb1417a6092a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 410
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0107.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "126dfd25363c076727dfaab03955c931",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0108.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 820,
+            SectorSize = 512,
+            MD5        = "e6492aac144f5f6f593b84c64680cf64",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 820
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0109.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0110.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a793047503af08e83361427b3e2806e0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0111.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "f01541de322c8d6d7321084d7a245e7b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0112.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0113.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0114.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a793047503af08e83361427b3e2806e0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0115.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0116.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "6631b66fdfd89319323771c41334c7ba",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0117.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3240,
+            SectorSize = 512,
+            MD5        = "4b5e2c9599bb7861b3b52bec00d81278"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0120.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "7d36aee5a3071ff75b979f3acb649c40",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0121.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "0ccb62039363ab544c69eca229a17fae"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0122.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "7851d31fad9302ff45d3ded4fba25387",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0123.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "915b08c82591e8488320e001b7303b6d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0124.IMD.lz",
+            MediaType  = MediaType.NEC_35_HD_15,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "5e5ea6fe9adf842221fdc60e56630405",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0125.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0126.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ddc6c1200c60e9f7796280f50c2e5283",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0147.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6efa72a33021d5051546c3e0dd4c3c09"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0148.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "8b5acfd14818ff9556d3d81361ce4862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0149.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 200,
+            SectorSize = 1024,
+            MD5        = "cf42d08469548a31caf2649a1d08a85f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0150.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 1024,
+            MD5        = "62745e10683cf2ec1dac177535459891"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0151.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "cf42d08469548a31caf2649a1d08a85f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0153.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "298c377de52947c472a85d281b6d3d4d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0154.IMD.lz",
+            MediaType  = MediaType.RX50,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "387373301cf6c15d61eec9bab18d9b6a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0155.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 848,
+            SectorSize = 512,
+            MD5        = "83b66a88d92cbf2715343016e4108211"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0157.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "20e047061b6ca4059288deed8c9dd247"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0158.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "8b5acfd14818ff9556d3d81361ce4862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0159.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_40,
+            Sectors    = 640,
+            SectorSize = 256,
+            MD5        = "6efa72a33021d5051546c3e0dd4c3c09"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0160.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "8b5acfd14818ff9556d3d81361ce4862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0162.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "e63014a4299f52f22e6e2c9609f51979"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0163.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0164.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 820,
+            SectorSize = 512,
+            MD5        = "32823b9009c99b6711e89336ad03ec7f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 820
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0166.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1c8b03a8550ed3e70e1c78316aa445aa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0167.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 960,
+            SectorSize = 1024,
+            MD5        = "efbc62e2ecddc15241aa0779e078d478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0168.IMD.lz",
+            MediaType  = MediaType.NEC_35_HD_15,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "0bdf9130c07bb5d558a4705249f949d0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0169.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0170.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "589ae671a19e78ffcba5032092c4c0d5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0171.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2988,
+            SectorSize = 512,
+            MD5        = "cf0c71b65b56cb6b617d29525bd719dd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2988
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0173.IMD.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "028769dc0abefab1740cc309432588b6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0174.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "152023525154b45ab26687190bac94db",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0175.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "db38ecd93f28dd065927fed21917eed5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0176.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "716262401bc69f2f440a9c156c21c9e9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0177.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "83213865ca6a40c289b22324a32a2608",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0180.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "f206c0caa4e0eda37233ab6e89ab5493",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0181.IMD.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "554492a7b41f4cd9068a3a2b70eb0e5f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0182.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3402,
+            SectorSize = 512,
+            MD5        = "865ad9072cb6c7458f7d86d7e9368622"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0183.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "2461e458438f0033bc5811fd6958ad02"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0184.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1760,
+            SectorSize = 1024,
+            MD5        = "be75996696aa70ee9338297137556d83"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0185.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1120,
+            SectorSize = 2048,
+            MD5        = "5a0f2bad567464288ec7ce935672870a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0186.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 320,
+            SectorSize = 4096,
+            MD5        = "69f9f0b5c1fc00a8f398151df9d93ab5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0191.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 626,
+            SectorSize = 1024,
+            MD5        = "fb144f79239f6f5f113b417700c2d278"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0192.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 670,
+            SectorSize = 2048,
+            MD5        = "6a936d2ecb771e37b856bdad16822c32"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0194.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 356,
+            SectorSize = 4096,
+            MD5        = "e283af9d280efaf059c816b6a2c9206b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0196.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 960,
+            SectorSize = 1024,
+            MD5        = "e4625838148a4b7c6580c697cd47362c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0197.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_40,
+            Sectors    = 640,
+            SectorSize = 256,
+            MD5        = "74f71ef3978fefce64689e8be18359ba"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0198.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "5c4e555b29a264f2a81f8a2b58bfc442"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0199.IMD.lz",
+            MediaType  = MediaType.ACORN_525_DS_DD,
+            Sectors    = 2560,
+            SectorSize = 256,
+            MD5        = "64ae73ac812bbf473a5d443de4d5dfbf"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0200.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_HD,
+            Sectors    = 1600,
+            SectorSize = 1024,
+            MD5        = "a481bd5a8281dad089edbef390c136ed"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0201.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0202.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_HD,
+            Sectors    = 1600,
+            SectorSize = 1024,
+            MD5        = "a481bd5a8281dad089edbef390c136ed"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0203.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 1024,
+            MD5        = "8a16a3008739516fc3ba4c878868d056"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0204.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "46fce47baf08c6f093f2c355a603543d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0205.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "ee73a5d5c8dfac236baf7b99811696f9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0206.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "b3bdbc62fb96e3893dac3bccbde59ab0"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0207.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "02942b9dc9d3b1bc9335b73c99e6da2e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0208.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 480,
+            SectorSize = 1024,
+            MD5        = "dfc9e8c7bd3d50f404d6f0b6ada20b0c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0209.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0210.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0211.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "647f14749f59be471aac04a71a079a64"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0212.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "517cdd5e42a4673f733d1aedfb46770f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0213.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "6ad92e9522e4ba902c01beecb5943bb1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0214.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_HD,
+            Sectors    = 1600,
+            SectorSize = 1024,
+            MD5        = "9a1a7d8f53fcfad7603fe585c6c7214c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0215.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_HD,
+            Sectors    = 1600,
+            SectorSize = 1024,
+            MD5        = "2a7a9b48551fd4d8b166bcfcbe1ca132"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0216.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "40199611e6e75bbc37ad6c52a5b77eae"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0218.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 5100,
+            SectorSize = 512,
+            MD5        = "8fa0ffd7481a94b9e7c4006599329250"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0219.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 9180,
+            SectorSize = 512,
+            MD5        = "3fa51592c5a65b7e4915a8e22d523ced"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0220.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 13770,
+            SectorSize = 512,
+            MD5        = "2153339750c119627bab75bd0bf7a193"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0221.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 5120,
+            SectorSize = 256,
+            MD5        = "f92b2e52259531d50bfb403dc1274ab1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0222.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0223.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1600,
+            SectorSize = 256,
+            MD5        = "a5dc382d75ec46434b313e289c281d8c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0224.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1152,
+            SectorSize = 256,
+            MD5        = "8335b175c352352e19f9008ad67d1375"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0225.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1056,
+            SectorSize = 256,
+            MD5        = "447efa963c19474508c503d037a3b429"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0226.IMD.lz",
+            MediaType  = MediaType.ACORN_525_DS_DD,
+            Sectors    = 2560,
+            SectorSize = 256,
+            MD5        = "b7669fa76ecf5634313675b001bb7fa2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0227.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 5120,
+            SectorSize = 256,
+            MD5        = "676f1bc7764899912ab6ad8257c63a16"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0228.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1120,
+            SectorSize = 256,
+            MD5        = "d72e86324d4d518996f6671751614800"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0232.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 621,
+            SectorSize = 512,
+            MD5        = "b76bd117ce24d933cdefe09b1de2164a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0233.IMD.lz",
+            MediaType  = MediaType.ATARI_525_SD,
+            Sectors    = 720,
+            SectorSize = 128,
+            MD5        = "a769b7642a222d97a56c46f53833fafa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0234.IMD.lz",
+            MediaType  = MediaType.ACORN_525_DS_DD,
+            Sectors    = 2560,
+            SectorSize = 256,
+            MD5        = "dfa733d034bb1f83d694dfa217910081"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0235.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1600,
+            SectorSize = 256,
+            MD5        = "8260ee01a245aec2de162ee0d85f4b7f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0236.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_SD_80,
+            Sectors    = 800,
+            SectorSize = 256,
+            MD5        = "261c7a5a4298e9f050928dd770097c77"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0238.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a47068ff73dfbea58c25daa5b9132a9e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0240.IMD.lz",
+            MediaType  = MediaType.ATARI_525_DD,
+            Sectors    = 720,
+            SectorSize = 256,
+            MD5        = "d1ab955f0961ab94e6cf69f78134a84b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0241.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 714,
+            SectorSize = 256,
+            MD5        = "8b62738f15bcc916a668eaa67eec86e7"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0242.IMD.lz",
+            MediaType  = MediaType.NEC_35_HD_8,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "87a432496cb23b5c2299545500df3553",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0243.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "9866ab8e58fa4be25010184aec4ad3aa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0244.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "9dab329ae098b29889ab08278de38f95"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0245.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "0d71b4952dadbfb1061acc1f4640c787"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0246.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "af7ac6b5b9d2d57dad22dbb64ef7de38"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0247.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "f8f81f945aaad6fbfe7e2db1905302c1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0248.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "f6f81c75b5ba45d91c1886c6dda9caee"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0250.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "d4809467b321991a9c772ad87fc8aa19"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0251.IMD.lz",
+            MediaType  = MediaType.ACORN_525_DS_DD,
+            Sectors    = 2560,
+            SectorSize = 256,
+            MD5        = "d075e50705f4ddca7ba4dbc981ec1176"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0252.IMD.lz",
+            MediaType  = MediaType.ACORN_525_SS_DD_80,
+            Sectors    = 1280,
+            SectorSize = 256,
+            MD5        = "9f86480c86bae33a5b444e4a7ed55048"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0253.IMD.lz",
+            MediaType  = MediaType.ACORN_35_DS_DD,
+            Sectors    = 800,
+            SectorSize = 1024,
+            MD5        = "629971775d902d1cc2658fc76f57e072"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0254.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "5dc0d482a773043d8683a84c8220df95",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0255.IMD.lz",
+            MediaType  = MediaType.ACORN_525_DS_DD,
+            Sectors    = 2544,
+            SectorSize = 256,
+            MD5        = "1718d8acd18fce3c5c1a7a074ed8ac29"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0258.IMD.lz",
+            MediaType  = MediaType.NEC_35_HD_8,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "855943f9caecdcce9b06f0098d773c6b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0262.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "5ac0a9fc7337f761098f816359b0f6f7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0263.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "1ea6ec8e663218b1372048f6e25795b5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0264.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "77a1167b1b9043496e32b8578cde0ff0"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0265.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "4b07d760d65f3f0f8ffa5f2b81cee907",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0266.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "32c044c5c2b0bd13806149a759c14935",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0267.IMD.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "8752095abc13dba3f3467669da333891",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3040
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0268.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "aece7cd34bbba3e75307fa70404d9d30",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0269.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "5289afb16a6e4a33213e3bcca56c6230",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0270.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3320,
+            SectorSize = 512,
+            MD5        = "1aef0a0ba233476db6567878c3c2b266"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0271.IMD.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "b96596711f4d2ee85dfda0fe3b9f26c3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0272.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "a4f461af7fda5e93a7ab63fcbb7e7683"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0273.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "8f7f7099d4475f6631fcf0a79b031d61",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0280.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "4feeaf4b4ee5dad85db727fbbda4b6d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0281.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "3c77ca681df78e4cd7baa162aa9b0859",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0282.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "51da1f86c49657ffdb367bb2ddeb7990",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0283.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "b81a4987f89936630b8ebc62e4bbce6e"
+            /* TODO: IndexOutOfRangeException
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0284.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "f76f92dd326c99c5efad5ee58daf72e1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0285.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "b6f2c10e42908e334025bc4ffd81e771",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0287.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "f2f409ea2a62a7866fd2777cc4fc9739",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0288.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1494,
+            SectorSize = 512,
+            MD5        = "3e441d69cec5c3169274e1379de4af4b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1494
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0289.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "30a93f30dd4485c6fc037fe0775d3fc7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0290.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "e0caf02cce5597c98313bcc480366ec7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0291.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "4af4904d2b3c815da7bef7049209f5eb",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0299.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "39bf5a98bcb2185d855ac06378febcfa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0300.IMD.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "dc20055b6e6fd6f8e1114d4be2effeed",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0301.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "56af9256cf71d5aac5fd5d363674bc49"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0302.IMD.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "bbba1e2d1418e05c3a4e7b4d585d160b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0303.IMD.lz",
+            MediaType  = MediaType.NEC_35_HD_15,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "bca3a045e81617f7f5ebb5a8818eac47",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0304.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "a296663cb8e75e94603221352f29cfff",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0305.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ecda36ebf0e1100233cb0ec722c18583",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0307.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "cef2f4fe9b1a32d5c0544f814e634264",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0308.IMD.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "bbe58e26b8f8f822cd3edfd37a4e4924"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0311.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "b9b6ebdf711364c979de7cf70c3a438a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0314.IMD.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "d37424f367f545acbb397f2bed766843"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0316.IMD.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "9963dd6f19ce6bd56eabeccdfbbd821a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0317.IMD.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "acf6604559ae8217f7869823e2429024",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0318.IMD.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "23bf2139cdfdc4c16db058fd31ea6481",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0319.IMD.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "fa26adda0415f02057b113ad29c80c8d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0320.IMD.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "4f2a8d036fefd6c6c88d99eda3aa12b7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0322.IMD.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1386,
+            SectorSize = 512,
+            MD5        = "e794a3ffa4069ea999fdf7146710fa9e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1386
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd_rx01.imd.lz",
+            MediaType  = MediaType.RX01,
+            Sectors    = 2002,
+            SectorSize = 128,
+            MD5        = "5b4e36d92b180c3845387391cb5a1c64"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1qd_rx50.imd.lz",
+            MediaType  = MediaType.RX50,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "ccd4431139755c58f340681f63510642",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_nec.imd.lz",
+            MediaType  = MediaType.NEC_35_HD_8,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "fd54916f713d01b670c1a5df5e74a97f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1232
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2mgui.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 164,
+            SectorSize = 16384,
+            MD5        = "623b224f63d65ae3b6c3ddadadf3b836"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2m.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 987,
+            SectorSize = 1024,
+            MD5        = "08b530d8c25d785b20c93a1a7a6468a0"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_800.imd.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "c533488a21098a62c85f1649abda2803",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.imd.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "db9cfb6eea18820b7a7e0b5b45594471",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos.imd.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "1ff7649b679ba22ff20d39ff717dbec8",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.imd.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2mgui.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 164,
+            SectorSize = 16384,
+            MD5        = "adafed1fac3d1a181380bdb590249385"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1812,
+            SectorSize = 1024,
+            MD5        = "c741c78eecd673f8fc49e77459871940"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_168.imd.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "03c2af6a8ebf4bd6f530335de34ae5dd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.imd.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "9dea1e119a73a21a38d134f36b2e5564"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "dbd52e9e684f97d9e2292811242bb24e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.imd.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b4a602f67903c46eef62addb0780aa56",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 670,
+            SectorSize = 2048,
+            MD5        = "71194f8dba31d29780bd0a6ecee5ab2b"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/IsoBuster/Cuesheet.cs b/Aaru.Tests/Images/IsoBuster/Cuesheet.cs
index 079a1cbd8..a25ae8c2d 100644
--- a/Aaru.Tests/Images/IsoBuster/Cuesheet.cs
+++ b/Aaru.Tests/Images/IsoBuster/Cuesheet.cs
@@ -32,1120 +32,1119 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.IsoBuster
-{
-    [TestFixture]
-    public class Cuesheet : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "IsoBuster", "Cuesheet");
-        public override IMediaImage _plugin => new CdrWin();
+namespace Aaru.Tests.Images.IsoBuster;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Cuesheet : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "IsoBuster", "Cuesheet");
+    public override IMediaImage _plugin => new CdrWin();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile  = "gigarec.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 469652,
+            MD5       = "b7659466b925296a36390c58c480e4bb",
+            LongMD5   = "51bf2c54fee363520906709cc42a710a",
+            Tracks = new[]
             {
-                TestFile  = "gigarec.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 469652,
-                MD5       = "b7659466b925296a36390c58c480e4bb",
-                LongMD5   = "51bf2c54fee363520906709cc42a710a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 469651,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 469651,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 469652,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New Volume"
-                            }
+                            Clusters    = 469652,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New Volume"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "jaguarcd.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 243587,
-                MD5       = "e20824bc6258d8434096c84548f1c4cf",
-                LongMD5   = "e20824bc6258d8434096c84548f1c4cf",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16239,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 27490,
-                        End     = 28236,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 28237,
-                        End     = 78891,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 78892,
-                        End     = 100053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 100054,
-                        End     = 133202,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 133203,
-                        End     = 160907,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 160908,
-                        End     = 181465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 181466,
-                        End     = 202023,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 202024,
-                        End     = 222581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 222582,
-                        End     = 243139,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 243140,
-                        End     = 243586,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "pcengine.cue",
-                MediaType = MediaType.CD,
-                Sectors   = 160956,
-                MD5       = "989122b6c1f0fc135ee6d481bc347295",
-                LongMD5   = "2f58bc40012040bd3c9e4ae56fbbfad3",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3589,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3440,
-                        End     = 38613,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 34816,
-                                ClusterSize = 2048,
-                                Type        = "PC Engine filesystem"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38614,
-                        End     = 47216,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47217,
-                        End     = 53500,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53501,
-                        End     = 61818,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61819,
-                        End     = 68562,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68563,
-                        End     = 75396,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75397,
-                        End     = 83129,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 83130,
-                        End     = 86480,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86481,
-                        End     = 91266,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 91267,
-                        End     = 99273,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99274,
-                        End     = 106692,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106693,
-                        End     = 112237,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112238,
-                        End     = 120269,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 120270,
-                        End     = 126228,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126229,
-                        End     = 160955,
-                        Pregap  = 0,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "pcfx.cue",
-                MediaType = MediaType.CD,
-                Sectors   = 246680,
-                MD5       = "0034c2e54afd76387797c7221c4a054b",
-                LongMD5   = "77a9dcd8f5a69d939e076e45602923e0",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4394,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4245,
-                        End     = 4908,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 514,
-                                ClusterSize = 2048,
-                                Type        = "PC-FX",
-                                VolumeName  = "同級生２"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4909,
-                        End     = 5940,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5941,
-                        End     = 42058,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 42059,
-                        End     = 220794,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220795,
-                        End     = 225645,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225646,
-                        End     = 235497,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235498,
-                        End     = 246679,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_cdr.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 254265,
-                MD5       = "aacfe792d28a17f641c7218ccd35f5ff",
-                LongMD5   = "73e38276225ec2d26c0ace10d42513e1",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_cdrom.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 254265,
-                MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_cdrw.cue",
-                MediaType = MediaType.CDRW,
-                Sectors   = 308224,
-                MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_audiocd_cdtext.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 277696,
-                MD5       = "b236def899758bd04b8a3105b47126db",
-                LongMD5   = "b236def899758bd04b8a3105b47126db",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29752,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_enhancedcd.cue",
-                MediaType = MediaType.CDPLUS,
-                Sectors   = 59206,
-                MD5       = "04b7bcd252635eaa8e6b21c1597d44ba",
-                LongMD5   = "b480c86b959c246294a2cc4ad3180cbf",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14254,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14255,
-                        End     = 28952,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 40203,
-                        End     = 59205,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 18853,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_incd_udf200_finalized.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 350134,
-                MD5       = "7b3e4a952c369cd4837cee40f1a567f2",
-                LongMD5   = "d6555969dd70fb2772cd5b979c6fa284",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 600,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "INCD"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 402107,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "InCD",
-                                VolumeSerial = "40888C15CA13D401InCD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multi_karaoke_sampler.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 329158,
-                MD5       = "546f85b167c61c2e80dec709f4a4bfb5",
-                LongMD5   = "82e40f2e2e36a1ec2eeb89ea154aa7f3",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multiple_indexes.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 65536,
-                MD5       = "4bc4eb89184a69d902ecc1f2745ecf32",
-                LongMD5   = "4bc4eb89184a69d902ecc1f2745ecf32",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4803,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4654,
-                        End     = 13874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13875,
-                        End     = 41184,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41185,
-                        End     = 54988,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multisession.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 51168,
-                MD5       = "671f5b747692780a979b3c4b59b39597",
-                LongMD5   = "4171f86df9f3b8c277958324a48c54d8",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 7876,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 9340,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 1",
-                                VolumeSerial = "50958B61AF6A749E"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 6170,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 2"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 7381,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 2",
-                                VolumeSerial = "50958BBBAF6A7444"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 5360,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 3"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6451,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "Session 3",
-                                VolumeSerial = "50958C19AF6A73E6"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 4,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 45796,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 4"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6649,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.60",
-                                VolumeName   = "Session 4",
-                                VolumeSerial = "50958C82AF6A737D"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multisession_dvd+r.cue",
-                MediaType = MediaType.DVDPRDL,
-                Sectors   = 230624,
-                MD5       = "020993315e49ab0d36bc7248819162ea",
-                LongMD5   = "020993315e49ab0d36bc7248819162ea",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 24063,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 22016,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 24064,
-                        End     = 230623,
-                        Pregap  = 0 /*,Number = 2,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 222,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }*/
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multisession_dvd-r.cue",
-                MediaType = MediaType.DVDR,
-                Sectors   = 257264,
-                MD5       = "dff8f2107a4ea9633a88ce38ff609b8e",
-                LongMD5   = "dff8f2107a4ea9633a88ce38ff609b8e",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 235247,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 206560,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 235248,
-                        End     = 257263,
-                        Pregap  = 0 /*,Number = 2,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 222,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }*/
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_videocd.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 48794,
-                MD5       = "22d646f182b79efcf8915fd01f484391",
-                LongMD5   = "72243676a71ff7a3161dce368d3ddc71",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1099,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1100,
-                        End     = 48793,
-                        Pregap  = 152,
-                        Flags   = 4
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "jaguarcd.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 243587,
+            MD5       = "e20824bc6258d8434096c84548f1c4cf",
+            LongMD5   = "e20824bc6258d8434096c84548f1c4cf",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16239,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 27490,
+                    End     = 28236,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 28237,
+                    End     = 78891,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 78892,
+                    End     = 100053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 100054,
+                    End     = 133202,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 133203,
+                    End     = 160907,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 160908,
+                    End     = 181465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 181466,
+                    End     = 202023,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 202024,
+                    End     = 222581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 222582,
+                    End     = 243139,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 243140,
+                    End     = 243586,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "pcengine.cue",
+            MediaType = MediaType.CD,
+            Sectors   = 160956,
+            MD5       = "989122b6c1f0fc135ee6d481bc347295",
+            LongMD5   = "2f58bc40012040bd3c9e4ae56fbbfad3",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3589,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3440,
+                    End     = 38613,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 34816,
+                            ClusterSize = 2048,
+                            Type        = "PC Engine filesystem"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 38614,
+                    End     = 47216,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47217,
+                    End     = 53500,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53501,
+                    End     = 61818,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61819,
+                    End     = 68562,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68563,
+                    End     = 75396,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75397,
+                    End     = 83129,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 83130,
+                    End     = 86480,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86481,
+                    End     = 91266,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 91267,
+                    End     = 99273,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99274,
+                    End     = 106692,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106693,
+                    End     = 112237,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112238,
+                    End     = 120269,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 120270,
+                    End     = 126228,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126229,
+                    End     = 160955,
+                    Pregap  = 0,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "pcfx.cue",
+            MediaType = MediaType.CD,
+            Sectors   = 246680,
+            MD5       = "0034c2e54afd76387797c7221c4a054b",
+            LongMD5   = "77a9dcd8f5a69d939e076e45602923e0",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4394,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4245,
+                    End     = 4908,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 514,
+                            ClusterSize = 2048,
+                            Type        = "PC-FX",
+                            VolumeName  = "同級生２"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4909,
+                    End     = 5940,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 5941,
+                    End     = 42058,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 42059,
+                    End     = 220794,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220795,
+                    End     = 225645,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225646,
+                    End     = 235497,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235498,
+                    End     = 246679,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdr.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 254265,
+            MD5       = "aacfe792d28a17f641c7218ccd35f5ff",
+            LongMD5   = "73e38276225ec2d26c0ace10d42513e1",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrom.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 254265,
+            MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrw.cue",
+            MediaType = MediaType.CDRW,
+            Sectors   = 308224,
+            MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_audiocd_cdtext.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 277696,
+            MD5       = "b236def899758bd04b8a3105b47126db",
+            LongMD5   = "b236def899758bd04b8a3105b47126db",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29752,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_enhancedcd.cue",
+            MediaType = MediaType.CDPLUS,
+            Sectors   = 59206,
+            MD5       = "04b7bcd252635eaa8e6b21c1597d44ba",
+            LongMD5   = "b480c86b959c246294a2cc4ad3180cbf",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14254,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14255,
+                    End     = 28952,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 40203,
+                    End     = 59205,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 18853,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_incd_udf200_finalized.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 350134,
+            MD5       = "7b3e4a952c369cd4837cee40f1a567f2",
+            LongMD5   = "d6555969dd70fb2772cd5b979c6fa284",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 600,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "INCD"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 402107,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "InCD",
+                            VolumeSerial = "40888C15CA13D401InCD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multi_karaoke_sampler.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 329158,
+            MD5       = "546f85b167c61c2e80dec709f4a4bfb5",
+            LongMD5   = "82e40f2e2e36a1ec2eeb89ea154aa7f3",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multiple_indexes.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 65536,
+            MD5       = "4bc4eb89184a69d902ecc1f2745ecf32",
+            LongMD5   = "4bc4eb89184a69d902ecc1f2745ecf32",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4803,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4654,
+                    End     = 13874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13875,
+                    End     = 41184,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41185,
+                    End     = 54988,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multisession.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 51168,
+            MD5       = "671f5b747692780a979b3c4b59b39597",
+            LongMD5   = "4171f86df9f3b8c277958324a48c54d8",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 7876,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 9340,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 1",
+                            VolumeSerial = "50958B61AF6A749E"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 6170,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 2"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 7381,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 2",
+                            VolumeSerial = "50958BBBAF6A7444"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 5360,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 3"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6451,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "Session 3",
+                            VolumeSerial = "50958C19AF6A73E6"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 4,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 45796,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 4"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6649,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.60",
+                            VolumeName   = "Session 4",
+                            VolumeSerial = "50958C82AF6A737D"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multisession_dvd+r.cue",
+            MediaType = MediaType.DVDPRDL,
+            Sectors   = 230624,
+            MD5       = "020993315e49ab0d36bc7248819162ea",
+            LongMD5   = "020993315e49ab0d36bc7248819162ea",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 24063,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 22016,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 24064,
+                    End     = 230623,
+                    Pregap  = 0 /*,Number = 2,
+                        FileSystems = new[]
+                        {
+                            new FileSystemTest
+                            {
+                                Clusters    = 222,
+                                ClusterSize = 2048,
+                                Type        = "ISO9660",
+                                VolumeName  = ""
+                            }
+                        }*/
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multisession_dvd-r.cue",
+            MediaType = MediaType.DVDR,
+            Sectors   = 257264,
+            MD5       = "dff8f2107a4ea9633a88ce38ff609b8e",
+            LongMD5   = "dff8f2107a4ea9633a88ce38ff609b8e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 235247,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 206560,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 235248,
+                    End     = 257263,
+                    Pregap  = 0 /*,Number = 2,
+                        FileSystems = new[]
+                        {
+                            new FileSystemTest
+                            {
+                                Clusters    = 222,
+                                ClusterSize = 2048,
+                                Type        = "ISO9660",
+                                VolumeName  = ""
+                            }
+                        }*/
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_videocd.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 48794,
+            MD5       = "22d646f182b79efcf8915fd01f484391",
+            LongMD5   = "72243676a71ff7a3161dce368d3ddc71",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1099,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1100,
+                    End     = 48793,
+                    Pregap  = 152,
+                    Flags   = 4
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/KryoFlux/Raw.cs b/Aaru.Tests/Images/KryoFlux/Raw.cs
index 933731b24..37cc4d716 100644
--- a/Aaru.Tests/Images/KryoFlux/Raw.cs
+++ b/Aaru.Tests/Images/KryoFlux/Raw.cs
@@ -32,65 +32,64 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.KryoFlux
-{
-    [TestFixture]
-    public class Raw : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "KryoFlux", "raw");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.KryoFlux;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Raw : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "KryoFlux", "raw");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_gcr_s0.img.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "c1b868482a064686d2a592f3246c2958"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_acorn.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "2626f65b49ec085253c41fa2e2a9e788"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_amiga.adf.lz",
-                MediaType  = MediaType.CBM_AMIGA_35_DD,
-                Sectors    = 1760,
-                SectorSize = 512,
-                MD5        = "7db6730656efb22695cdf0a49e2674c9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "9d978dff1196b456b8372d78e6b17970"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_gcr.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "ee038347920d088c14f79e6c5fc241c9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "9dea1e119a73a21a38d134f36b2e5564"
-            }
-        };
-    }
+            TestFile   = "mf1dd_gcr_s0.img.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "c1b868482a064686d2a592f3246c2958"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_acorn.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "2626f65b49ec085253c41fa2e2a9e788"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_amiga.adf.lz",
+            MediaType  = MediaType.CBM_AMIGA_35_DD,
+            Sectors    = 1760,
+            SectorSize = 512,
+            MD5        = "7db6730656efb22695cdf0a49e2674c9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "9d978dff1196b456b8372d78e6b17970"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_gcr.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "ee038347920d088c14f79e6c5fc241c9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "9dea1e119a73a21a38d134f36b2e5564"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/Lisa/Raw.cs b/Aaru.Tests/Images/Lisa/Raw.cs
index a6c5e0a1b..d9fdaae68 100644
--- a/Aaru.Tests/Images/Lisa/Raw.cs
+++ b/Aaru.Tests/Images/Lisa/Raw.cs
@@ -32,65 +32,64 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.Lisa
-{
-    [TestFixture]
-    public class Raw : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Lisa emulators", "raw");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.Lisa;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Raw : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Lisa emulators", "raw");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "profile_los202.raw.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10108,
-                SectorSize = 512,
-                MD5        = "24001116ee48e6545e4514b3ea18b4e2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "profile_los31.raw.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10108,
-                SectorSize = 512,
-                MD5        = "2e328345fda18a97721c4a35cb2bb5bb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "profile_macworksxl3.raw.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10108,
-                SectorSize = 512,
-                MD5        = "78cdf7207060bf05c272cb8b22fc6449"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "profile_uniplus.raw.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 20216,
-                SectorSize = 512,
-                MD5        = "fc729677df4ba92da98137058aa1c298"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "profile_xenix_10Mb.raw.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 20216,
-                SectorSize = 512,
-                MD5        = "e98bf459bd20cfb466d92a91086cdaa7"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "profile_xenix.raw.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 10108,
-                SectorSize = 512,
-                MD5        = "dd146bc14be87d5ad98b961dd462f469"
-            }
-        };
-    }
+            TestFile   = "profile_los202.raw.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10108,
+            SectorSize = 512,
+            MD5        = "24001116ee48e6545e4514b3ea18b4e2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "profile_los31.raw.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10108,
+            SectorSize = 512,
+            MD5        = "2e328345fda18a97721c4a35cb2bb5bb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "profile_macworksxl3.raw.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10108,
+            SectorSize = 512,
+            MD5        = "78cdf7207060bf05c272cb8b22fc6449"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "profile_uniplus.raw.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 20216,
+            SectorSize = 512,
+            MD5        = "fc729677df4ba92da98137058aa1c298"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "profile_xenix_10Mb.raw.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 20216,
+            SectorSize = 512,
+            MD5        = "e98bf459bd20cfb466d92a91086cdaa7"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "profile_xenix.raw.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 10108,
+            SectorSize = 512,
+            MD5        = "dd146bc14be87d5ad98b961dd462f469"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/MAME/v1.cs b/Aaru.Tests/Images/MAME/v1.cs
index f9de2bbec..891329a1b 100644
--- a/Aaru.Tests/Images/MAME/v1.cs
+++ b/Aaru.Tests/Images/MAME/v1.cs
@@ -32,24 +32,23 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.MAME
-{
-    [TestFixture]
-    public class V1 : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v1");
-        public override IMediaImage _plugin => new Chd();
+namespace Aaru.Tests.Images.MAME;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class V1 : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v1");
+    public override IMediaImage _plugin    => new Chd();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "hdd.chd",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "43476343f53a177dd57b68dd769917aa"
-            }
-        };
-    }
+            TestFile   = "hdd.chd",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "43476343f53a177dd57b68dd769917aa"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/MAME/v3.cs b/Aaru.Tests/Images/MAME/v3.cs
index 2c053b71a..573dde550 100644
--- a/Aaru.Tests/Images/MAME/v3.cs
+++ b/Aaru.Tests/Images/MAME/v3.cs
@@ -32,671 +32,670 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.MAME
-{
-    [TestFixture]
-    public class V3 : OpticalMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v3");
-        public override IMediaImage _plugin => new Chd();
+namespace Aaru.Tests.Images.MAME;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class V3 : OpticalMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v3");
+    public override IMediaImage _plugin    => new Chd();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "gigarec.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 469652,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "gigarec.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 469652,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 469651,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "hdd.chd",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "43476343f53a177dd57b68dd769917aa"
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcengine.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 160506,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3439,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3440,
-                        End     = 38313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38316,
-                        End     = 46918,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 46920,
-                        End     = 53203,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53204,
-                        End     = 61521,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61524,
-                        End     = 68267,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68268,
-                        End     = 75101,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75104,
-                        End     = 82836,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 82840,
-                        End     = 86190,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86192,
-                        End     = 90977,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 90980,
-                        End     = 98986,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 98988,
-                        End     = 106406,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106408,
-                        End     = 111952,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 111956,
-                        End     = 119987,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119988,
-                        End     = 125796,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 125800,
-                        End     = 160526,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcfx.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 246380,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4244,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4248,
-                        End     = 4761,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4764,
-                        End     = 5795,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5796,
-                        End     = 41913,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41916,
-                        End     = 220501,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220504,
-                        End     = 225354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225356,
-                        End     = 235207,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235208,
-                        End     = 246389,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_audiocd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 247073,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16552,
-                        End     = 30053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30056,
-                        End     = 47954,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47956,
-                        End     = 63319,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63320,
-                        End     = 78930,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78932,
-                        End     = 94738,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94740,
-                        End     = 117132,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117136,
-                        End     = 136176,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136180,
-                        End     = 154085,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154088,
-                        End     = 170766,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170768,
-                        End     = 186555,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186556,
-                        End     = 201815,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201816,
-                        End     = 224465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224468,
-                        End     = 247091,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdr.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_enhancedcd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 28953,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14404,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14408,
-                        End     = 28955,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sample.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 329008,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1740,
-                        End     = 32601,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32604,
-                        End     = 52526,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52528,
-                        End     = 70159,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70160,
-                        End     = 99953,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99956,
-                        End     = 119618,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119620,
-                        End     = 136857,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136860,
-                        End     = 155650,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155652,
-                        End     = 175687,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175688,
-                        End     = 206322,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206324,
-                        End     = 226312,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226316,
-                        End     = 244220,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244224,
-                        End     = 273833,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273836,
-                        End     = 293622,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293624,
-                        End     = 310582,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310584,
-                        End     = 329030,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 8133,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_videocd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 48794,
-                SectorSize    = 2336,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1251,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1252,
-                        End     = 48793,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 469651,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "hdd.chd",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "43476343f53a177dd57b68dd769917aa"
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcengine.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 160506,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3439,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3440,
+                    End     = 38313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 38316,
+                    End     = 46918,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 46920,
+                    End     = 53203,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53204,
+                    End     = 61521,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61524,
+                    End     = 68267,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68268,
+                    End     = 75101,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75104,
+                    End     = 82836,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 82840,
+                    End     = 86190,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86192,
+                    End     = 90977,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 90980,
+                    End     = 98986,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 98988,
+                    End     = 106406,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106408,
+                    End     = 111952,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 111956,
+                    End     = 119987,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119988,
+                    End     = 125796,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 125800,
+                    End     = 160526,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcfx.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 246380,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4244,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4248,
+                    End     = 4761,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4764,
+                    End     = 5795,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 5796,
+                    End     = 41913,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41916,
+                    End     = 220501,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220504,
+                    End     = 225354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225356,
+                    End     = 235207,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235208,
+                    End     = 246389,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 247073,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16552,
+                    End     = 30053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30056,
+                    End     = 47954,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47956,
+                    End     = 63319,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63320,
+                    End     = 78930,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78932,
+                    End     = 94738,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94740,
+                    End     = 117132,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117136,
+                    End     = 136176,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136180,
+                    End     = 154085,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154088,
+                    End     = 170766,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170768,
+                    End     = 186555,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186556,
+                    End     = 201815,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201816,
+                    End     = 224465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224468,
+                    End     = 247091,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_enhancedcd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 28953,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14404,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14408,
+                    End     = 28955,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sample.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 329008,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1740,
+                    End     = 32601,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32604,
+                    End     = 52526,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52528,
+                    End     = 70159,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70160,
+                    End     = 99953,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99956,
+                    End     = 119618,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119620,
+                    End     = 136857,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136860,
+                    End     = 155650,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155652,
+                    End     = 175687,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175688,
+                    End     = 206322,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206324,
+                    End     = 226312,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226316,
+                    End     = 244220,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244224,
+                    End     = 273833,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273836,
+                    End     = 293622,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293624,
+                    End     = 310582,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310584,
+                    End     = 329030,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 8133,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 48794,
+            SectorSize    = 2336,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1251,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1252,
+                    End     = 48793,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/MAME/v4.cs b/Aaru.Tests/Images/MAME/v4.cs
index 9dc5a7829..340deb8df 100644
--- a/Aaru.Tests/Images/MAME/v4.cs
+++ b/Aaru.Tests/Images/MAME/v4.cs
@@ -32,1037 +32,1036 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.MAME
-{
-    [TestFixture]
-    public class V4 : OpticalMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v4");
-        public override IMediaImage _plugin => new Chd();
+namespace Aaru.Tests.Images.MAME;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class V4 : OpticalMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v4");
+    public override IMediaImage _plugin    => new Chd();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "gigarec.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 469652,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "gigarec.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 469652,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 469651,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "hdd.chd",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "43476343f53a177dd57b68dd769917aa"
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "jaguarcd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 243587,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 27639,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 27640,
-                        End     = 28236,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 28237,
-                        End     = 78891,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78892,
-                        End     = 100053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100054,
-                        End     = 133202,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133203,
-                        End     = 160907,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 160908,
-                        End     = 181465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 181466,
-                        End     = 202023,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 202024,
-                        End     = 222581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222582,
-                        End     = 243139,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243140,
-                        End     = 243586,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcengine.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 160506,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3439,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3440,
-                        End     = 38313,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38314,
-                        End     = 46916,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 46917,
-                        End     = 53200,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53201,
-                        End     = 61518,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61519,
-                        End     = 68262,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68263,
-                        End     = 75096,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75097,
-                        End     = 82829,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 82830,
-                        End     = 86180,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86181,
-                        End     = 90966,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 90967,
-                        End     = 98973,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 98974,
-                        End     = 106392,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106393,
-                        End     = 111937,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 111938,
-                        End     = 119969,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119970,
-                        End     = 125778,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 125779,
-                        End     = 160505,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcfx.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 246380,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4244,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4245,
-                        End     = 4758,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4759,
-                        End     = 5790,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5791,
-                        End     = 41908,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41909,
-                        End     = 220494,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220495,
-                        End     = 225345,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225346,
-                        End     = 235197,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235198,
-                        End     = 246379,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_audiocd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 247073,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdr.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_audiocd_cdtext.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 277696,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_enhancedcd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 59206,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14404,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14405,
-                        End     = 40352,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 40353,
-                        End     = 59205,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_incd_udf200_finalized.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 350134,
-                SectorSize    = 2336,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sampler.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 329158,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1887,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multiple_indexes.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 65536,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4803,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4804,
-                        End     = 13874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13875,
-                        End     = 41184,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41185,
-                        End     = 54988,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 51168,
-                SectorSize    = 2336,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 19532,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 19533,
-                        End     = 32859,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32860,
-                        End     = 45377,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 45378,
-                        End     = 51167,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession_dvd+r.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 230624,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 24063,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 24064,
-                        End     = 230623,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession_dvd-r.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 257264,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 235247,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235248,
-                        End     = 257263,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_videocd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 48794,
-                SectorSize    = 2336,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1251,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1252,
-                        End     = 48793,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 469651,
+                    Pregap  = 150,
+                    Flags   = 0
                 }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "hdd.chd",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "43476343f53a177dd57b68dd769917aa"
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "jaguarcd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 243587,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 27639,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 27640,
+                    End     = 28236,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 28237,
+                    End     = 78891,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78892,
+                    End     = 100053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100054,
+                    End     = 133202,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133203,
+                    End     = 160907,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 160908,
+                    End     = 181465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 181466,
+                    End     = 202023,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 202024,
+                    End     = 222581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222582,
+                    End     = 243139,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243140,
+                    End     = 243586,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcengine.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 160506,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3439,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3440,
+                    End     = 38313,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 38314,
+                    End     = 46916,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 46917,
+                    End     = 53200,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53201,
+                    End     = 61518,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61519,
+                    End     = 68262,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68263,
+                    End     = 75096,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75097,
+                    End     = 82829,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 82830,
+                    End     = 86180,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86181,
+                    End     = 90966,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 90967,
+                    End     = 98973,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 98974,
+                    End     = 106392,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106393,
+                    End     = 111937,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 111938,
+                    End     = 119969,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119970,
+                    End     = 125778,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 125779,
+                    End     = 160505,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcfx.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 246380,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4244,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4245,
+                    End     = 4758,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4759,
+                    End     = 5790,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 5791,
+                    End     = 41908,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41909,
+                    End     = 220494,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220495,
+                    End     = 225345,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225346,
+                    End     = 235197,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235198,
+                    End     = 246379,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 247073,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_audiocd_cdtext.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 277696,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_enhancedcd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 59206,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14404,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14405,
+                    End     = 40352,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 40353,
+                    End     = 59205,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_incd_udf200_finalized.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 350134,
+            SectorSize    = 2336,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 329158,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1887,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multiple_indexes.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 65536,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4803,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4804,
+                    End     = 13874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13875,
+                    End     = 41184,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41185,
+                    End     = 54988,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 51168,
+            SectorSize    = 2336,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 19532,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 19533,
+                    End     = 32859,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32860,
+                    End     = 45377,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 45378,
+                    End     = 51167,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession_dvd+r.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 230624,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 24063,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 24064,
+                    End     = 230623,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession_dvd-r.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 257264,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 235247,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235248,
+                    End     = 257263,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 48794,
+            SectorSize    = 2336,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1251,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1252,
+                    End     = 48793,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/MAME/v5/compressed.cs b/Aaru.Tests/Images/MAME/v5/compressed.cs
index 8710c0201..94da29deb 100644
--- a/Aaru.Tests/Images/MAME/v5/compressed.cs
+++ b/Aaru.Tests/Images/MAME/v5/compressed.cs
@@ -32,1038 +32,1037 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.MAME.v5
-{
-    [TestFixture]
-    public class Compressed : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v5", "compressed");
-        public override IMediaImage _plugin => new Chd();
+namespace Aaru.Tests.Images.MAME.v5;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Compressed : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v5", "compressed");
+    public override IMediaImage _plugin => new Chd();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "gigarec.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 469652,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "gigarec.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 469652,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 469651,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "hdd.chd",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "43476343f53a177dd57b68dd769917aa"
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "jaguarcd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 243587,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 27639,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 27640,
-                        End     = 28236,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 28237,
-                        End     = 78891,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78892,
-                        End     = 100053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100054,
-                        End     = 133202,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133203,
-                        End     = 160907,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 160908,
-                        End     = 181465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 181466,
-                        End     = 202023,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 202024,
-                        End     = 222581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222582,
-                        End     = 243139,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243140,
-                        End     = 243586,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcengine.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 160506,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3439,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3440,
-                        End     = 38313,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38314,
-                        End     = 46916,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 46917,
-                        End     = 53200,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53201,
-                        End     = 61518,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61519,
-                        End     = 68262,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68263,
-                        End     = 75096,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75097,
-                        End     = 82829,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 82830,
-                        End     = 86180,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86181,
-                        End     = 90966,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 90967,
-                        End     = 98973,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 98974,
-                        End     = 106392,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106393,
-                        End     = 111937,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 111938,
-                        End     = 119969,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119970,
-                        End     = 125778,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 125779,
-                        End     = 160505,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcfx.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 246380,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4244,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4245,
-                        End     = 4758,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4759,
-                        End     = 5790,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5791,
-                        End     = 41908,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41909,
-                        End     = 220494,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220495,
-                        End     = 225345,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225346,
-                        End     = 235197,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235198,
-                        End     = 246379,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_audiocd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 247073,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdr.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_audiocd_cdtext.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 277696,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_enhancedcd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 59206,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14404,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14405,
-                        End     = 40352,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 40353,
-                        End     = 59205,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_incd_udf200_finalized.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 350134,
-                SectorSize    = 2336,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sampler.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 329158,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1887,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multiple_indexes.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 65536,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4803,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4804,
-                        End     = 13874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13875,
-                        End     = 41184,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41185,
-                        End     = 54988,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 51168,
-                SectorSize    = 2336,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 19532,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 19533,
-                        End     = 32859,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32860,
-                        End     = 45377,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 45378,
-                        End     = 51167,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession_dvd+r.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 230624,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 24063,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 24064,
-                        End     = 230623,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession_dvd-r.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 257264,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 235247,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235248,
-                        End     = 257263,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_videocd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 48794,
-                SectorSize    = 2336,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1251,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1252,
-                        End     = 48793,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 469651,
+                    Pregap  = 150,
+                    Flags   = 0
                 }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "hdd.chd",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "43476343f53a177dd57b68dd769917aa"
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "jaguarcd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 243587,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 27639,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 27640,
+                    End     = 28236,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 28237,
+                    End     = 78891,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78892,
+                    End     = 100053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100054,
+                    End     = 133202,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133203,
+                    End     = 160907,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 160908,
+                    End     = 181465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 181466,
+                    End     = 202023,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 202024,
+                    End     = 222581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222582,
+                    End     = 243139,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243140,
+                    End     = 243586,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcengine.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 160506,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3439,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3440,
+                    End     = 38313,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 38314,
+                    End     = 46916,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 46917,
+                    End     = 53200,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53201,
+                    End     = 61518,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61519,
+                    End     = 68262,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68263,
+                    End     = 75096,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75097,
+                    End     = 82829,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 82830,
+                    End     = 86180,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86181,
+                    End     = 90966,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 90967,
+                    End     = 98973,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 98974,
+                    End     = 106392,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106393,
+                    End     = 111937,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 111938,
+                    End     = 119969,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119970,
+                    End     = 125778,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 125779,
+                    End     = 160505,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcfx.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 246380,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4244,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4245,
+                    End     = 4758,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4759,
+                    End     = 5790,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 5791,
+                    End     = 41908,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41909,
+                    End     = 220494,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220495,
+                    End     = 225345,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225346,
+                    End     = 235197,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235198,
+                    End     = 246379,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 247073,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_audiocd_cdtext.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 277696,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_enhancedcd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 59206,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14404,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14405,
+                    End     = 40352,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 40353,
+                    End     = 59205,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_incd_udf200_finalized.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 350134,
+            SectorSize    = 2336,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 329158,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1887,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multiple_indexes.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 65536,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4803,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4804,
+                    End     = 13874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13875,
+                    End     = 41184,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41185,
+                    End     = 54988,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 51168,
+            SectorSize    = 2336,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 19532,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 19533,
+                    End     = 32859,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32860,
+                    End     = 45377,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 45378,
+                    End     = 51167,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession_dvd+r.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 230624,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 24063,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 24064,
+                    End     = 230623,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession_dvd-r.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 257264,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 235247,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235248,
+                    End     = 257263,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 48794,
+            SectorSize    = 2336,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1251,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1252,
+                    End     = 48793,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/MAME/v5/uncompressed.cs b/Aaru.Tests/Images/MAME/v5/uncompressed.cs
index be11fd516..63b0a3800 100644
--- a/Aaru.Tests/Images/MAME/v5/uncompressed.cs
+++ b/Aaru.Tests/Images/MAME/v5/uncompressed.cs
@@ -32,1038 +32,1037 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.MAME.v5
-{
-    [TestFixture]
-    public class Uncompressed : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v5", "uncompressed");
-        public override IMediaImage _plugin => new Chd();
+namespace Aaru.Tests.Images.MAME.v5;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Uncompressed : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MAME", "v5", "uncompressed");
+    public override IMediaImage _plugin => new Chd();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "gigarec.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 469652,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "gigarec.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 469652,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 469651,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "hdd.chd",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "43476343f53a177dd57b68dd769917aa"
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "jaguarcd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 243587,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 27639,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 27640,
-                        End     = 28236,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 28237,
-                        End     = 78891,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78892,
-                        End     = 100053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100054,
-                        End     = 133202,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133203,
-                        End     = 160907,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 160908,
-                        End     = 181465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 181466,
-                        End     = 202023,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 202024,
-                        End     = 222581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222582,
-                        End     = 243139,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243140,
-                        End     = 243586,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcengine.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 160506,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3439,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3440,
-                        End     = 38313,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38314,
-                        End     = 46916,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 46917,
-                        End     = 53200,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53201,
-                        End     = 61518,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61519,
-                        End     = 68262,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68263,
-                        End     = 75096,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75097,
-                        End     = 82829,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 82830,
-                        End     = 86180,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86181,
-                        End     = 90966,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 90967,
-                        End     = 98973,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 98974,
-                        End     = 106392,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106393,
-                        End     = 111937,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 111938,
-                        End     = 119969,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119970,
-                        End     = 125778,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 125779,
-                        End     = 160505,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcfx.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 246380,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4244,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4245,
-                        End     = 4758,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4759,
-                        End     = 5790,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5791,
-                        End     = 41908,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41909,
-                        End     = 220494,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220495,
-                        End     = 225345,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225346,
-                        End     = 235197,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235198,
-                        End     = 246379,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_audiocd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 247073,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdr.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_audiocd_cdtext.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 277696,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_enhancedcd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 59206,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14404,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14405,
-                        End     = 40352,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 40353,
-                        End     = 59205,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_incd_udf200_finalized.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 350134,
-                SectorSize    = 2336,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sampler.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 329158,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1887,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multiple_indexes.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 65536,
-                SectorSize    = 2352,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4803,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4804,
-                        End     = 13874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13875,
-                        End     = 41184,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41185,
-                        End     = 54988,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 51168,
-                SectorSize    = 2336,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 19532,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 19533,
-                        End     = 32859,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32860,
-                        End     = 45377,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 45378,
-                        End     = 51167,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession_dvd+r.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 230624,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 24063,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 24064,
-                        End     = 230623,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession_dvd-r.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 257264,
-                SectorSize    = 2048,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 235247,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235248,
-                        End     = 257263,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_videocd.chd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 48794,
-                SectorSize    = 2336,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1251,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1252,
-                        End     = 48793,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 469651,
+                    Pregap  = 150,
+                    Flags   = 0
                 }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "hdd.chd",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "43476343f53a177dd57b68dd769917aa"
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "jaguarcd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 243587,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 27639,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 27640,
+                    End     = 28236,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 28237,
+                    End     = 78891,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78892,
+                    End     = 100053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100054,
+                    End     = 133202,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133203,
+                    End     = 160907,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 160908,
+                    End     = 181465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 181466,
+                    End     = 202023,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 202024,
+                    End     = 222581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222582,
+                    End     = 243139,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243140,
+                    End     = 243586,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcengine.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 160506,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3439,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3440,
+                    End     = 38313,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 38314,
+                    End     = 46916,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 46917,
+                    End     = 53200,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53201,
+                    End     = 61518,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61519,
+                    End     = 68262,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68263,
+                    End     = 75096,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75097,
+                    End     = 82829,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 82830,
+                    End     = 86180,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86181,
+                    End     = 90966,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 90967,
+                    End     = 98973,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 98974,
+                    End     = 106392,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106393,
+                    End     = 111937,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 111938,
+                    End     = 119969,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119970,
+                    End     = 125778,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 125779,
+                    End     = 160505,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcfx.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 246380,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4244,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4245,
+                    End     = 4758,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4759,
+                    End     = 5790,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 5791,
+                    End     = 41908,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41909,
+                    End     = 220494,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220495,
+                    End     = 225345,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225346,
+                    End     = 235197,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235198,
+                    End     = 246379,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 247073,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_audiocd_cdtext.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 277696,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_enhancedcd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 59206,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14404,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14405,
+                    End     = 40352,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 40353,
+                    End     = 59205,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_incd_udf200_finalized.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 350134,
+            SectorSize    = 2336,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 329158,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1887,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multiple_indexes.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 65536,
+            SectorSize    = 2352,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4803,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4804,
+                    End     = 13874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13875,
+                    End     = 41184,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41185,
+                    End     = 54988,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 51168,
+            SectorSize    = 2336,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 19532,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 19533,
+                    End     = 32859,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32860,
+                    End     = 45377,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 45378,
+                    End     = 51167,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession_dvd+r.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 230624,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 24063,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 24064,
+                    End     = 230623,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession_dvd-r.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 257264,
+            SectorSize    = 2048,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 235247,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235248,
+                    End     = 257263,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.chd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 48794,
+            SectorSize    = 2336,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1251,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1252,
+                    End     = 48793,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/MagicISO/Cuesheet.cs b/Aaru.Tests/Images/MagicISO/Cuesheet.cs
index 5cb0ffc7e..ced5f4ef1 100644
--- a/Aaru.Tests/Images/MagicISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/MagicISO/Cuesheet.cs
@@ -32,791 +32,790 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.MagicISO
-{
-    [TestFixture]
-    public class Cuesheet : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MagicISO", "Cuesheet");
-        public override IMediaImage _plugin => new CdrWin();
+namespace Aaru.Tests.Images.MagicISO;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Cuesheet : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MagicISO", "Cuesheet");
+    public override IMediaImage _plugin => new CdrWin();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile  = "cdiready_the_apprentice.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 279299,
+            MD5       = "ab350df419f96d967f51d0161ebeba63",
+            LongMD5   = "ab350df419f96d967f51d0161ebeba63",
+            Tracks = new[]
             {
-                TestFile  = "cdiready_the_apprentice.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 279299,
-                MD5       = "ab350df419f96d967f51d0161ebeba63",
-                LongMD5   = "ab350df419f96d967f51d0161ebeba63",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 69000,
-                        End     = 88799,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279298,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 69000,
+                    End     = 88799,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279298,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_audiocd.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 247072,
+            MD5       = "277e98295297f618cc63687e98288d7e",
+            LongMD5   = "277e98295297f618cc63687e98288d7e",
+            Tracks = new[]
             {
-                TestFile  = "report_audiocd.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 247072,
-                MD5       = "277e98295297f618cc63687e98288d7e",
-                LongMD5   = "277e98295297f618cc63687e98288d7e",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16399,
-                        End     = 30050,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16399,
+                    End     = 30050,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247071,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrom.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 254264,
+            MD5       = "2de6dd5eaa71c1a97625bab68382da60",
+            LongMD5   = "222edd2c920b63aefe2087ed6278abe6",
+            Tracks = new[]
             {
-                TestFile  = "report_cdrom.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 254264,
-                MD5       = "2de6dd5eaa71c1a97625bab68382da60",
-                LongMD5   = "222edd2c920b63aefe2087ed6278abe6",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254263,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254263,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_cdrw.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 308223,
-                MD5       = "f1510c82ea4ff535415833242adddac6",
-                LongMD5   = "22bd168e59e075229821448b60d1820b",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308222,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v1.cue",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 1218959,
-                MD5       = "fa58d5645e091cc3f0c87998c819955e",
-                LongMD5   = "fa58d5645e091cc3f0c87998c819955e",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1218958,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v2.cue",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2236703,
-                MD5       = "c02a2cf88af17ed8333af2e7d4560e40",
-                LongMD5   = "c02a2cf88af17ed8333af2e7d4560e40",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2236702,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd+r-dl.cue",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 3455935,
-                MD5       = "e71164a331f656e30025c39956e35372",
-                LongMD5   = "e71164a331f656e30025c39956e35372",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3455934
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd-rom.cue",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146367,
-                MD5       = "fa1beeef4c4f1493f306a13f4fd113b2",
-                LongMD5   = "fa1beeef4c4f1493f306a13f4fd113b2",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146366,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd+rw.cue",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2295103,
-                MD5       = "767692b526a7ea7020e7144d6d7cadab",
-                LongMD5   = "767692b526a7ea7020e7144d6d7cadab",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2295102,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            /* This image is invalid an impossible to process properly due to a bug in MagicISO
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_enhancedcd.cue",
-                MediaType = MediaType.CDPLUS,
-                Sectors   = 303315,
-                MD5       = "0ac3eaefdd2c138e86229d195d63cba2",
-                LongMD5   = "2524762a816af8e8c188b971dfd27374",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15511,
-                        End     = 33958,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 234179,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303314,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            */ new OpticalImageTestExpected
-            {
-                TestFile  = "test_multi_karaoke_sampler.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 329157,
-                MD5       = "cc6354d06b009b0446012842c7f94be7",
-                LongMD5   = "bb3ebf139ebb76fff1b229a379d289e4",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32748,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329156,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrw.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 308223,
+            MD5       = "f1510c82ea4ff535415833242adddac6",
+            LongMD5   = "22bd168e59e075229821448b60d1820b",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308222,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v1.cue",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 1218959,
+            MD5       = "fa58d5645e091cc3f0c87998c819955e",
+            LongMD5   = "fa58d5645e091cc3f0c87998c819955e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1218958,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v2.cue",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2236703,
+            MD5       = "c02a2cf88af17ed8333af2e7d4560e40",
+            LongMD5   = "c02a2cf88af17ed8333af2e7d4560e40",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2236702,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+r-dl.cue",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 3455935,
+            MD5       = "e71164a331f656e30025c39956e35372",
+            LongMD5   = "e71164a331f656e30025c39956e35372",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3455934
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-rom.cue",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146367,
+            MD5       = "fa1beeef4c4f1493f306a13f4fd113b2",
+            LongMD5   = "fa1beeef4c4f1493f306a13f4fd113b2",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146366,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+rw.cue",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2295103,
+            MD5       = "767692b526a7ea7020e7144d6d7cadab",
+            LongMD5   = "767692b526a7ea7020e7144d6d7cadab",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2295102,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        /* This image is invalid an impossible to process properly due to a bug in MagicISO
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_enhancedcd.cue",
+            MediaType = MediaType.CDPLUS,
+            Sectors   = 303315,
+            MD5       = "0ac3eaefdd2c138e86229d195d63cba2",
+            LongMD5   = "2524762a816af8e8c188b971dfd27374",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15511,
+                    End     = 33958,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 234179,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303314,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        */ new OpticalImageTestExpected
+        {
+            TestFile  = "test_multi_karaoke_sampler.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 329157,
+            MD5       = "cc6354d06b009b0446012842c7f94be7",
+            LongMD5   = "bb3ebf139ebb76fff1b229a379d289e4",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32748,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329156,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/MagicISO/Nero.cs b/Aaru.Tests/Images/MagicISO/Nero.cs
index 79fd13149..e2f785cd7 100644
--- a/Aaru.Tests/Images/MagicISO/Nero.cs
+++ b/Aaru.Tests/Images/MagicISO/Nero.cs
@@ -31,889 +31,888 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.MagicISO
-{
-    [TestFixture]
-    public class Nero : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MagicISO", "Nero");
-        public override IMediaImage _plugin => new DiscImages.Nero();
+namespace Aaru.Tests.Images.MagicISO;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Nero : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MagicISO", "Nero");
+    public override IMediaImage _plugin => new DiscImages.Nero();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile  = "cdiready_the_apprentice.nrg",
+            MediaType = MediaType.CDDA,
+            Sectors   = 279300,
+            MD5       = "7557c72d4cf6df8bc1896388b863727a",
+            LongMD5   = "7557c72d4cf6df8bc1896388b863727a",
+            Tracks = new[]
             {
-                TestFile  = "cdiready_the_apprentice.nrg",
-                MediaType = MediaType.CDDA,
-                Sectors   = 279300,
-                MD5       = "7557c72d4cf6df8bc1896388b863727a",
-                LongMD5   = "7557c72d4cf6df8bc1896388b863727a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 88799,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 88799,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279299,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_audiocd.nrg",
+            MediaType = MediaType.CDDA,
+            Sectors   = 247073,
+            MD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5   = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            Tracks = new[]
             {
-                TestFile  = "report_audiocd.nrg",
-                MediaType = MediaType.CDDA,
-                Sectors   = 247073,
-                MD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5   = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrom.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 254265,
+            MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
             {
-                TestFile  = "report_cdrom.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 254265,
-                MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_cdrw.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 308224,
-                MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v1.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 1218811,
-                MD5       = "e2d40f64b4ae274c3ef55252fbda99cf",
-                LongMD5   = "e2d40f64b4ae274c3ef55252fbda99cf",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1218810,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v2.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2236555,
-                MD5       = "d46730ef92b0115505d9035f78d90ca3",
-                LongMD5   = "d46730ef92b0115505d9035f78d90ca3",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2236554,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd+r-dl.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 13099755,
-                MD5       = "3b36362c20c5a75cb4726d64a7e2729c",
-                LongMD5   = "3b36362c20c5a75cb4726d64a7e2729c",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13099754,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters     = 13099755,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Test DVD",
-                                VolumeSerial = "483E25D50034BBB0"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd-rom.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146219,
-                MD5       = "117c7207751e4d94d6b396f77d3ef367",
-                LongMD5   = "117c7207751e4d94d6b396f77d3ef367",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146218,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd+rw.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2294955,
-                MD5       = "3313752e2493fce618ced27aecffc79b",
-                LongMD5   = "3313752e2493fce618ced27aecffc79b",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2294954,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_enhancedcd.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 303316,
-                MD5       = "ca5698b203534de70dd82916d33aae99",
-                LongMD5   = "bf1cd9a3b5dca86ac03ffe51c962840e",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222782,
-                        End     = 303315,
-                        Pregap  = 11398,
-                        Flags   = 4,
-                        Number  = 14,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multi_karaoke_sampler.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 329158,
-                MD5       = "d22fde4f71e3faa8f048770ae9d7635e",
-                LongMD5   = "bced53ad182fe1b13ecd05caf1fe73a7",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1887,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd-r.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146219,
-                MD5       = "117c7207751e4d94d6b396f77d3ef367",
-                LongMD5   = "117c7207751e4d94d6b396f77d3ef367",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146218,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd-rw.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146219,
-                MD5       = "117c7207751e4d94d6b396f77d3ef367",
-                LongMD5   = "117c7207751e4d94d6b396f77d3ef367",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146218,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrw.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 308224,
+            MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v1.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 1218811,
+            MD5       = "e2d40f64b4ae274c3ef55252fbda99cf",
+            LongMD5   = "e2d40f64b4ae274c3ef55252fbda99cf",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1218810,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v2.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2236555,
+            MD5       = "d46730ef92b0115505d9035f78d90ca3",
+            LongMD5   = "d46730ef92b0115505d9035f78d90ca3",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2236554,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+r-dl.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 13099755,
+            MD5       = "3b36362c20c5a75cb4726d64a7e2729c",
+            LongMD5   = "3b36362c20c5a75cb4726d64a7e2729c",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13099754,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters     = 13099755,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Test DVD",
+                            VolumeSerial = "483E25D50034BBB0"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-rom.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146219,
+            MD5       = "117c7207751e4d94d6b396f77d3ef367",
+            LongMD5   = "117c7207751e4d94d6b396f77d3ef367",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146218,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+rw.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2294955,
+            MD5       = "3313752e2493fce618ced27aecffc79b",
+            LongMD5   = "3313752e2493fce618ced27aecffc79b",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2294954,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_enhancedcd.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 303316,
+            MD5       = "ca5698b203534de70dd82916d33aae99",
+            LongMD5   = "bf1cd9a3b5dca86ac03ffe51c962840e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222782,
+                    End     = 303315,
+                    Pregap  = 11398,
+                    Flags   = 4,
+                    Number  = 14,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multi_karaoke_sampler.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 329158,
+            MD5       = "d22fde4f71e3faa8f048770ae9d7635e",
+            LongMD5   = "bced53ad182fe1b13ecd05caf1fe73a7",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1887,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-r.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146219,
+            MD5       = "117c7207751e4d94d6b396f77d3ef367",
+            LongMD5   = "117c7207751e4d94d6b396f77d3ef367",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146218,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-rw.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146219,
+            MD5       = "117c7207751e4d94d6b396f77d3ef367",
+            LongMD5   = "117c7207751e4d94d6b396f77d3ef367",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146218,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/MaxiDisk.cs b/Aaru.Tests/Images/MaxiDisk.cs
index c9922a85e..387ef066a 100644
--- a/Aaru.Tests/Images/MaxiDisk.cs
+++ b/Aaru.Tests/Images/MaxiDisk.cs
@@ -31,232 +31,231 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class MaxiDisk : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MaxiDisk");
-        public override IMediaImage _plugin => new DiscImages.MaxiDisk();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class MaxiDisk : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "MaxiDisk");
+    public override IMediaImage _plugin    => new DiscImages.MaxiDisk();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "3DF800.HDK.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "26532a62985b51a2c3b877a57f6d257b",
+            Partitions = new[]
             {
-                TestFile   = "3DF800.HDK.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "26532a62985b51a2c3b877a57f6d257b",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3DS.HDK.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "9827ba1b3e9cac41263caabd862e78f9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3ES.HDK.lz",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "4aeafaf2a088d6a7406856dce8118567",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 5760
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3HD6.HDK.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3HF168.HDK.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7e3bf04f3660dd1052a335dc99441e44",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3HF16.HDK.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "8eb8cb310feaf03c69fffd4f6e729847",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3HF172.HDK.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "a58fd062f024b95714f1223a8bc2232f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "3HS.HDK.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "00e61c06bf29f0c04a7eabe2dbd7efb6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5DS18.HDK.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "d81f5cb64fd0b99f138eab34110bbc3c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5DS1.HDK.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "a89006a75d13bee9202d1d6e52721ccb",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5DS28.HDK.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "beef1cdb004dc69391d6b3d508988b95",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5DS2.HDK.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "6213897b7dbf263f12abf76901d43862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5HF144.HDK.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "073a172879a71339ef4b00ebb47b67fc",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5HS.HDK.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
+                    Start  = 0,
+                    Length = 1600
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3DS.HDK.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "9827ba1b3e9cac41263caabd862e78f9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3ES.HDK.lz",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "4aeafaf2a088d6a7406856dce8118567",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 5760
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3HD6.HDK.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3HF168.HDK.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7e3bf04f3660dd1052a335dc99441e44",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3HF16.HDK.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "8eb8cb310feaf03c69fffd4f6e729847",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3HF172.HDK.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "a58fd062f024b95714f1223a8bc2232f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "3HS.HDK.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "00e61c06bf29f0c04a7eabe2dbd7efb6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5DS18.HDK.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "d81f5cb64fd0b99f138eab34110bbc3c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5DS1.HDK.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "a89006a75d13bee9202d1d6e52721ccb",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5DS28.HDK.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "beef1cdb004dc69391d6b3d508988b95",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5DS2.HDK.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "6213897b7dbf263f12abf76901d43862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5HF144.HDK.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "073a172879a71339ef4b00ebb47b67fc",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5HS.HDK.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/NHDr0.cs b/Aaru.Tests/Images/NHDr0.cs
index af688185c..1e2d29550 100644
--- a/Aaru.Tests/Images/NHDr0.cs
+++ b/Aaru.Tests/Images/NHDr0.cs
@@ -32,72 +32,71 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class NHDr0 : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "T-98 Next");
-        public override IMediaImage _plugin => new Nhdr0();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class NHDr0 : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "T-98 Next");
+    public override IMediaImage _plugin    => new Nhdr0();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "t98n_128.nhd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 261120,
-                SectorSize = 512,
-                MD5        = "af7c3cfa315b6661300017f865bf26d6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "t98n_20.nhd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 40800,
-                SectorSize = 512,
-                MD5        = "bcb390d0b4d12feac29dbadc1a623c99"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "t98n_256.nhd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 522240,
-                SectorSize = 512,
-                MD5        = "e50e78b3742f5f89dd1a5573ba3141c4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "t98n_41.nhd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 83640,
-                SectorSize = 512,
-                MD5        = "007acca6fb53f90728d78f7c40c2b094"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "t98n_512.nhd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1044480,
-                SectorSize = 512,
-                MD5        = "42d1cb6fc2a9df39ecd53002edd978d6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "t98n_65.nhd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 132600,
-                SectorSize = 512,
-                MD5        = "b53f5b406234663de6c2bdffac88322d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "t98n_80.nhd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 163200,
-                SectorSize = 512,
-                MD5        = "fe9ecc6f0b5beb9635a1595155941925"
-            }
-        };
-    }
+            TestFile   = "t98n_128.nhd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 261120,
+            SectorSize = 512,
+            MD5        = "af7c3cfa315b6661300017f865bf26d6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "t98n_20.nhd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 40800,
+            SectorSize = 512,
+            MD5        = "bcb390d0b4d12feac29dbadc1a623c99"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "t98n_256.nhd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 522240,
+            SectorSize = 512,
+            MD5        = "e50e78b3742f5f89dd1a5573ba3141c4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "t98n_41.nhd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 83640,
+            SectorSize = 512,
+            MD5        = "007acca6fb53f90728d78f7c40c2b094"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "t98n_512.nhd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1044480,
+            SectorSize = 512,
+            MD5        = "42d1cb6fc2a9df39ecd53002edd978d6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "t98n_65.nhd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 132600,
+            SectorSize = 512,
+            MD5        = "b53f5b406234663de6c2bdffac88322d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "t98n_80.nhd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 163200,
+            SectorSize = 512,
+            MD5        = "fe9ecc6f0b5beb9635a1595155941925"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/Nero/V1.cs b/Aaru.Tests/Images/Nero/V1.cs
index 19d0bf7ee..11f8eb235 100644
--- a/Aaru.Tests/Images/Nero/V1.cs
+++ b/Aaru.Tests/Images/Nero/V1.cs
@@ -31,2154 +31,2153 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.Nero
-{
-    [TestFixture]
-    public class V1 : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nero Burning ROM", "V1");
-        public override IMediaImage _plugin => new DiscImages.Nero();
+namespace Aaru.Tests.Images.Nero;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class V1 : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nero Burning ROM", "V1");
+    public override IMediaImage _plugin => new DiscImages.Nero();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile  = "cdiready_the_apprentice.nrg",
+            MediaType = MediaType.CDDA,
+            Sectors   = 279300,
+            MD5       = "7557c72d4cf6df8bc1896388b863727a",
+            LongMD5   = "7557c72d4cf6df8bc1896388b863727a",
+            Tracks = new[]
             {
-                TestFile  = "cdiready_the_apprentice.nrg",
-                MediaType = MediaType.CDDA,
-                Sectors   = 279300,
-                MD5       = "7557c72d4cf6df8bc1896388b863727a",
-                LongMD5   = "7557c72d4cf6df8bc1896388b863727a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 88799,
-                        Pregap  = 69300,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 88799,
+                    Pregap  = 69300,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279299,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "jaguarcd.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 243587,
+            MD5           = "79ade978aad90667f272a693012c11ca",
+            LongMD5       = "79ade978aad90667f272a693012c11ca",
+            SubchannelMD5 = "83ec1010fc44694d69dc48bacec5481a",
+            Tracks = new[]
             {
-                TestFile      = "jaguarcd.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 243587,
-                MD5           = "79ade978aad90667f272a693012c11ca",
-                LongMD5       = "79ade978aad90667f272a693012c11ca",
-                SubchannelMD5 = "83ec1010fc44694d69dc48bacec5481a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 27639,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 27640,
-                        End     = 28236,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 28237,
-                        End     = 78891,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78892,
-                        End     = 100053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100054,
-                        End     = 133202,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133203,
-                        End     = 160907,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 160908,
-                        End     = 181465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 181466,
-                        End     = 202023,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 202024,
-                        End     = 222581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222582,
-                        End     = 243139,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243140,
-                        End     = 243586,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 27639,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 27640,
+                    End     = 28236,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 28237,
+                    End     = 78891,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78892,
+                    End     = 100053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100054,
+                    End     = 133202,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133203,
+                    End     = 160907,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 160908,
+                    End     = 181465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 181466,
+                    End     = 202023,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 202024,
+                    End     = 222581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222582,
+                    End     = 243139,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243140,
+                    End     = 243586,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcengine.nrg",
+            MediaType     = MediaType.CD,
+            Sectors       = 160956,
+            MD5           = "8218b4aeea658111957fa3815a139e74",
+            LongMD5       = "58b875ac8cb3b6b1f426bc734c3400e4",
+            SubchannelMD5 = "9e9a6b51bc2e5ec67400cb33ad0ca33f",
+            Tracks = new[]
             {
-                TestFile      = "pcengine.nrg",
-                MediaType     = MediaType.CD,
-                Sectors       = 160956,
-                MD5           = "8218b4aeea658111957fa3815a139e74",
-                LongMD5       = "58b875ac8cb3b6b1f426bc734c3400e4",
-                SubchannelMD5 = "9e9a6b51bc2e5ec67400cb33ad0ca33f",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3364,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 3365,
+                    End     = 38463,
+                    Pregap  = 225,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3364,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 3365,
-                        End     = 38463,
-                        Pregap  = 225,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 28672,
-                                ClusterSize = 2048,
-                                Type        = "PC Engine filesystem"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 38464,
-                        End     = 47216,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47217,
-                        End     = 53500,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 53501,
-                        End     = 61818,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 61819,
-                        End     = 68562,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 68563,
-                        End     = 75396,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 75397,
-                        End     = 83129,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 83130,
-                        End     = 86480,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 86481,
-                        End     = 91266,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 91267,
-                        End     = 99273,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99274,
-                        End     = 106692,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 106693,
-                        End     = 112237,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112238,
-                        End     = 120269,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 120270,
-                        End     = 126003,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126004,
-                        End     = 160955,
-                        Pregap  = 225,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "pcfx.nrg",
-                MediaType     = MediaType.CD,
-                Sectors       = 246680,
-                MD5           = "24ff2f3451489a71ee502475137cccc3",
-                LongMD5       = "891ebf5e6bd2eda7445f02958cc4fbd5",
-                SubchannelMD5 = "e3a0d78b6c32f5795b1b513bd13a6bda",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4169,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4170,
-                        End     = 4758,
-                        Pregap  = 225,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 364,
-                                ClusterSize = 2048,
-                                Type        = "PC-FX",
-                                VolumeName  = "同級生２"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4759,
-                        End     = 5790,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 5791,
-                        End     = 41908,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41909,
-                        End     = 220644,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 220645,
-                        End     = 225645,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 225646,
-                        End     = 235497,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 235498,
-                        End     = 246679,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_audiocd.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "9da6ad8f6f0cadd92509c10809da7296",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.nrg",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 28672,
+                            ClusterSize = 2048,
+                            Type        = "PC Engine filesystem"
                         }
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.nrg",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "6fe81a972e750c68e08f6935e4d91e34",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 38464,
+                    End     = 47216,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47217,
+                    End     = 53500,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 53501,
+                    End     = 61818,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 61819,
+                    End     = 68562,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 68563,
+                    End     = 75396,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 75397,
+                    End     = 83129,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 83130,
+                    End     = 86480,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 86481,
+                    End     = 91266,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 91267,
+                    End     = 99273,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99274,
+                    End     = 106692,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 106693,
+                    End     = 112237,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112238,
+                    End     = 120269,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 120270,
+                    End     = 126003,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126004,
+                    End     = 160955,
+                    Pregap  = 225,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "pcfx.nrg",
+            MediaType     = MediaType.CD,
+            Sectors       = 246680,
+            MD5           = "24ff2f3451489a71ee502475137cccc3",
+            LongMD5       = "891ebf5e6bd2eda7445f02958cc4fbd5",
+            SubchannelMD5 = "e3a0d78b6c32f5795b1b513bd13a6bda",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4169,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4170,
+                    End     = 4758,
+                    Pregap  = 225,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Bootable    = true,
+                            Clusters    = 364,
+                            ClusterSize = 2048,
+                            Type        = "PC-FX",
+                            VolumeName  = "同級生２"
                         }
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_enhancedcd.nrg",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 303316,
-                MD5           = "97e5bf1caf3998e818d40cd845c6ecc9",
-                LongMD5       = "07b4d88c8f38cc0168a2f5725b31c52e",
-                SubchannelMD5 = "e6f7319532f46c3fa4fd3569c65546e1",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 4759,
+                    End     = 5790,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 5791,
+                    End     = 41908,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41909,
+                    End     = 220644,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 220645,
+                    End     = 225645,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 225646,
+                    End     = 235497,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 235498,
+                    End     = 246679,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "9da6ad8f6f0cadd92509c10809da7296",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.nrg",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 14,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_audiocd_cdtext.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 277696,
-                MD5           = "7c8fc7bb768cff15d702ac8cd10108d7",
-                LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
-                SubchannelMD5 = "ca781a7afc4eb77c51f7c551ed45c03c",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_incd_udf200_finalized.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 350134,
-                MD5           = "684122981d4d762daf7b9e559584bccf",
-                LongMD5       = "f3c26446201534c3635f4d2633310e45",
-                SubchannelMD5 = "65f938f7f9ac34fabd3ab94c14eb76b5",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 6,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 600,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "INCD"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 402107,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "InCD",
-                                VolumeSerial = "40888C15CA13D401InCD"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sampler.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 329158,
-                MD5           = "a34e29e42b60023a6ae59f37d2bd4bea",
-                LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
-                SubchannelMD5 = "f8c96f120cac18c52178b99ef4c4e2a9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32748,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multiple_indexes.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 65536,
-                MD5           = "1b13a8f8aeb23f0b8bbc68518217e771",
-                LongMD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
-                SubchannelMD5 = "25bae9e30657e2f64a45e5f690e3ae9e",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4803,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4804,
-                        End     = 13874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13875,
-                        End     = 41184,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41185,
-                        End     = 54988,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 0,
-                        Flags   = 1
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 51168,
-                MD5           = "5c35db53f7d4d9acce660de76eb81654",
-                LongMD5       = "e8737ac5b670175abfa6dc927098abab",
-                SubchannelMD5 = "48656afdbc40b6df06486a04a4d62401",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 7876,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 9340,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 1",
-                                VolumeSerial = "50958B61AF6A749E"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 6170,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 2"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 7381,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 2",
-                                VolumeSerial = "50958BBBAF6A7444"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 5360,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 3"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6451,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "Session 3",
-                                VolumeSerial = "50958C19AF6A73E6"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 4,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 45796,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 4"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6649,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.60",
-                                VolumeName   = "Session 4",
-                                VolumeSerial = "50958C82AF6A737D"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_videocd.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 48794,
-                MD5           = "5412af85d30455e1466644ea97d1adae",
-                LongMD5       = "610f972fa2e1c5988e4bd0f912b0f12f",
-                SubchannelMD5 = "935a91f5850352818d92b71f1c87c393",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1101,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1102,
-                        End     = 48793,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_audiocd_dao.nrg",
-                MediaType = MediaType.CDDA,
-                Sectors   = 279196,
-                MD5       = "cce718c0d4d60eb9a0571cd0ae7e2ff2",
-                LongMD5   = "cce718c0d4d60eb9a0571cd0ae7e2ff2",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65333,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65334,
-                        End     = 78875,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78876,
-                        End     = 95679,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95680,
-                        End     = 126896,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126897,
-                        End     = 155858,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155859,
-                        End     = 192734,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 192735,
-                        End     = 223975,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 223976,
-                        End     = 244787,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244788,
-                        End     = 271099,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271100,
-                        End     = 279195,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_audiocd_tao.nrg",
-                MediaType = MediaType.CDDA,
-                Sectors   = 277696,
-                MD5       = "0c355a31a7a488ec387c4508c498d6c0",
-                LongMD5   = "0c355a31a7a488ec387c4508c498d6c0",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 83078,
-                MD5       = "6cdbcf18acc4c5edd7cc8d6e744dfda7",
-                LongMD5   = "25fee97101ad661bb719ee008a1404c0",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83077,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_level2_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 83084,
-                MD5       = "25f3dca4291f9c79bfa5592a3e050e8f",
-                LongMD5   = "3acc918a3633f16c4242a39b76af3b35",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83083,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_level2_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 83084,
-                MD5       = "25f3dca4291f9c79bfa5592a3e050e8f",
-                LongMD5   = "3acc918a3633f16c4242a39b76af3b35",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83083,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 83078,
-                MD5       = "6cdbcf18acc4c5edd7cc8d6e744dfda7",
-                LongMD5   = "25fee97101ad661bb719ee008a1404c0",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83077,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_udf_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85733,
-                MD5       = "d4088d90592000fbe3f8da5d6822aab1",
-                LongMD5   = "761122bad9da6699773436a9f6ce753b",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85732,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_udf_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85733,
-                MD5       = "1ec9d3cb33dd32b82d338ebf5c4da09c",
-                LongMD5   = "f85fd68d3d159dbe417ccd39b221827a",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85732,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 83092,
-                MD5       = "d9627277c18e16ab83da11e0c86afb8f",
-                LongMD5   = "1ccd0e946b422fea751bddfde2ef245c",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83091,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_level2_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 83092,
-                MD5       = "50e24226e31ad48de312135a5d3410bb",
-                LongMD5   = "99f99437dadf65e1acac27fa68495525",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83091,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_level2_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 83092,
-                MD5       = "50e24226e31ad48de312135a5d3410bb",
-                LongMD5   = "99f99437dadf65e1acac27fa68495525",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83091,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 83092,
-                MD5       = "d9627277c18e16ab83da11e0c86afb8f",
-                LongMD5   = "1ccd0e946b422fea751bddfde2ef245c",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83091,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_udf_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85747,
-                MD5       = "9eef8934d6354be6fe6d03630d19de9e",
-                LongMD5   = "c7ac66550c45dae54bc456070f408ff7",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85746,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_udf_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85747,
-                MD5       = "046d55938e6d075f40e738d0f3f1161a",
-                LongMD5   = "86c65c7e9fcf61eb6fe28d3bfc749da8",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85746,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_mixed_mode_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 325928,
-                MD5       = "666cf279a98e99a28af0347cac190118",
-                LongMD5   = "d7dc3fe279da7643882818751b9e0ac0",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 46581,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 46582,
-                        End     = 76633,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 76634,
-                        End     = 112065,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112066,
-                        End     = 125607,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 125608,
-                        End     = 142411,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 142412,
-                        End     = 173628,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 173629,
-                        End     = 202590,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 202591,
-                        End     = 239466,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 239467,
-                        End     = 270707,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270708,
-                        End     = 291519,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 291520,
-                        End     = 317831,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 317832,
-                        End     = 325927,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_mixed_mode_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 324278,
-                MD5       = "7a82a04d2e6b283337e42b93a52f5083",
-                LongMD5   = "c17ccaaf93dc07444cd9f03dc27a3b9f",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 46581,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 46582,
-                        End     = 76483,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 76484,
-                        End     = 111765,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 111766,
-                        End     = 125157,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 125158,
-                        End     = 141811,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 141812,
-                        End     = 172878,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 172879,
-                        End     = 201690,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201691,
-                        End     = 238416,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 238417,
-                        End     = 269507,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269508,
-                        End     = 290169,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 290170,
-                        End     = 316331,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 316332,
-                        End     = 324277,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_udf_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84985,
-                MD5       = "34ef81d7871dcb2911cd4c682c8413fe",
-                LongMD5   = "22f62fe5f6b6fe696e582ab879d44508",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84984,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_udf_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84985,
-                MD5       = "549c2a6729fbecf222b85a0fc71a8ce5",
-                LongMD5   = "a1236fa2aa68dc2fea157930ec0d0b62",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84984,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
             }
-            #region These test images violate the specifications and are not expected to work yet
-            /*
-            new OpticalImageTestExpected
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.nrg",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "6fe81a972e750c68e08f6935e4d91e34",
+            Tracks = new[]
             {
-                TestFile      = "test_data_track_as_audio.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
-                LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
-                SubchannelMD5 = "5479a1115bb6481db69fd6262e8c6076",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 0
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_enhancedcd.nrg",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 303316,
+            MD5           = "97e5bf1caf3998e818d40cd845c6ecc9",
+            LongMD5       = "07b4d88c8f38cc0168a2f5725b31c52e",
+            SubchannelMD5 = "e6f7319532f46c3fa4fd3569c65546e1",
+            Tracks = new[]
             {
-                TestFile      = "test_track2_inside_session2_leadin.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "6fa06c10561343438736a8d3d9a965ea",
-                LongMD5       = "608a73cd10bccdadde68523aead1ee72",
-                SubchannelMD5 = "933f1699ba88a70aff5062f9626ef529",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 14,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25349,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 25350,
-                        End     = 36788,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
+                        new FileSystemTest
+                        {
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
+                        }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_audiocd_cdtext.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 277696,
+            MD5           = "7c8fc7bb768cff15d702ac8cd10108d7",
+            LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
+            SubchannelMD5 = "ca781a7afc4eb77c51f7c551ed45c03c",
+            Tracks = new[]
             {
-                TestFile      = "test_track2_inside_track1.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "6fa06c10561343438736a8d3d9a965ea",
-                LongMD5       = "c82d20702d31bc15bdc91f7e107862ae",
-                SubchannelMD5 = "d8eed571f137c92f22bb858d78fc1e41",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 0,
+                    Flags   = 2
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_incd_udf200_finalized.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 350134,
+            MD5           = "684122981d4d762daf7b9e559584bccf",
+            LongMD5       = "f3c26446201534c3635f4d2633310e45",
+            SubchannelMD5 = "65f938f7f9ac34fabd3ab94c14eb76b5",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 6,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13199,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13200,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
+                        new FileSystemTest
+                        {
+                            Clusters    = 600,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "INCD"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 402107,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "InCD",
+                            VolumeSerial = "40888C15CA13D401InCD"
+                        }
                     }
                 }
-            },
-            */
-            #endregion
-        };
-    }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 329158,
+            MD5           = "a34e29e42b60023a6ae59f37d2bd4bea",
+            LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
+            SubchannelMD5 = "f8c96f120cac18c52178b99ef4c4e2a9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32748,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multiple_indexes.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 65536,
+            MD5           = "1b13a8f8aeb23f0b8bbc68518217e771",
+            LongMD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
+            SubchannelMD5 = "25bae9e30657e2f64a45e5f690e3ae9e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4803,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4804,
+                    End     = 13874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13875,
+                    End     = 41184,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41185,
+                    End     = 54988,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 0,
+                    Flags   = 1
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 51168,
+            MD5           = "5c35db53f7d4d9acce660de76eb81654",
+            LongMD5       = "e8737ac5b670175abfa6dc927098abab",
+            SubchannelMD5 = "48656afdbc40b6df06486a04a4d62401",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 7876,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 9340,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 1",
+                            VolumeSerial = "50958B61AF6A749E"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 6170,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 2"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 7381,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 2",
+                            VolumeSerial = "50958BBBAF6A7444"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 5360,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 3"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6451,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "Session 3",
+                            VolumeSerial = "50958C19AF6A73E6"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 4,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 45796,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 4"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6649,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.60",
+                            VolumeName   = "Session 4",
+                            VolumeSerial = "50958C82AF6A737D"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 48794,
+            MD5           = "5412af85d30455e1466644ea97d1adae",
+            LongMD5       = "610f972fa2e1c5988e4bd0f912b0f12f",
+            SubchannelMD5 = "935a91f5850352818d92b71f1c87c393",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1101,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1102,
+                    End     = 48793,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_audiocd_dao.nrg",
+            MediaType = MediaType.CDDA,
+            Sectors   = 279196,
+            MD5       = "cce718c0d4d60eb9a0571cd0ae7e2ff2",
+            LongMD5   = "cce718c0d4d60eb9a0571cd0ae7e2ff2",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65333,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65334,
+                    End     = 78875,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78876,
+                    End     = 95679,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95680,
+                    End     = 126896,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126897,
+                    End     = 155858,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155859,
+                    End     = 192734,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 192735,
+                    End     = 223975,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 223976,
+                    End     = 244787,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244788,
+                    End     = 271099,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271100,
+                    End     = 279195,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_audiocd_tao.nrg",
+            MediaType = MediaType.CDDA,
+            Sectors   = 277696,
+            MD5       = "0c355a31a7a488ec387c4508c498d6c0",
+            LongMD5   = "0c355a31a7a488ec387c4508c498d6c0",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 83078,
+            MD5       = "6cdbcf18acc4c5edd7cc8d6e744dfda7",
+            LongMD5   = "25fee97101ad661bb719ee008a1404c0",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83077,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_level2_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 83084,
+            MD5       = "25f3dca4291f9c79bfa5592a3e050e8f",
+            LongMD5   = "3acc918a3633f16c4242a39b76af3b35",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83083,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_level2_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 83084,
+            MD5       = "25f3dca4291f9c79bfa5592a3e050e8f",
+            LongMD5   = "3acc918a3633f16c4242a39b76af3b35",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83083,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 83078,
+            MD5       = "6cdbcf18acc4c5edd7cc8d6e744dfda7",
+            LongMD5   = "25fee97101ad661bb719ee008a1404c0",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83077,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_udf_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85733,
+            MD5       = "d4088d90592000fbe3f8da5d6822aab1",
+            LongMD5   = "761122bad9da6699773436a9f6ce753b",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85732,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_udf_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85733,
+            MD5       = "1ec9d3cb33dd32b82d338ebf5c4da09c",
+            LongMD5   = "f85fd68d3d159dbe417ccd39b221827a",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85732,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 83092,
+            MD5       = "d9627277c18e16ab83da11e0c86afb8f",
+            LongMD5   = "1ccd0e946b422fea751bddfde2ef245c",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83091,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_level2_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 83092,
+            MD5       = "50e24226e31ad48de312135a5d3410bb",
+            LongMD5   = "99f99437dadf65e1acac27fa68495525",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83091,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_level2_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 83092,
+            MD5       = "50e24226e31ad48de312135a5d3410bb",
+            LongMD5   = "99f99437dadf65e1acac27fa68495525",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83091,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 83092,
+            MD5       = "d9627277c18e16ab83da11e0c86afb8f",
+            LongMD5   = "1ccd0e946b422fea751bddfde2ef245c",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83091,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_udf_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85747,
+            MD5       = "9eef8934d6354be6fe6d03630d19de9e",
+            LongMD5   = "c7ac66550c45dae54bc456070f408ff7",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85746,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_udf_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85747,
+            MD5       = "046d55938e6d075f40e738d0f3f1161a",
+            LongMD5   = "86c65c7e9fcf61eb6fe28d3bfc749da8",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85746,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_mixed_mode_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 325928,
+            MD5       = "666cf279a98e99a28af0347cac190118",
+            LongMD5   = "d7dc3fe279da7643882818751b9e0ac0",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 46581,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 46582,
+                    End     = 76633,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 76634,
+                    End     = 112065,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112066,
+                    End     = 125607,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 125608,
+                    End     = 142411,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 142412,
+                    End     = 173628,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 173629,
+                    End     = 202590,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 202591,
+                    End     = 239466,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 239467,
+                    End     = 270707,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270708,
+                    End     = 291519,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 291520,
+                    End     = 317831,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 317832,
+                    End     = 325927,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_mixed_mode_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 324278,
+            MD5       = "7a82a04d2e6b283337e42b93a52f5083",
+            LongMD5   = "c17ccaaf93dc07444cd9f03dc27a3b9f",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 46581,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 46582,
+                    End     = 76483,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 76484,
+                    End     = 111765,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 111766,
+                    End     = 125157,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 125158,
+                    End     = 141811,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 141812,
+                    End     = 172878,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 172879,
+                    End     = 201690,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201691,
+                    End     = 238416,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 238417,
+                    End     = 269507,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269508,
+                    End     = 290169,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 290170,
+                    End     = 316331,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 316332,
+                    End     = 324277,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_udf_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84985,
+            MD5       = "34ef81d7871dcb2911cd4c682c8413fe",
+            LongMD5   = "22f62fe5f6b6fe696e582ab879d44508",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84984,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_udf_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84985,
+            MD5       = "549c2a6729fbecf222b85a0fc71a8ce5",
+            LongMD5   = "a1236fa2aa68dc2fea157930ec0d0b62",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84984,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        }
+        #region These test images violate the specifications and are not expected to work yet
+        /*
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
+            LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
+            SubchannelMD5 = "5479a1115bb6481db69fd6262e8c6076",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_session2_leadin.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "6fa06c10561343438736a8d3d9a965ea",
+            LongMD5       = "608a73cd10bccdadde68523aead1ee72",
+            SubchannelMD5 = "933f1699ba88a70aff5062f9626ef529",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25349,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 25350,
+                    End     = 36788,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_track1.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "6fa06c10561343438736a8d3d9a965ea",
+            LongMD5       = "c82d20702d31bc15bdc91f7e107862ae",
+            SubchannelMD5 = "d8eed571f137c92f22bb858d78fc1e41",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13199,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13200,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        */
+        #endregion
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/Nero/V2.cs b/Aaru.Tests/Images/Nero/V2.cs
index a7550a382..bdaa701f5 100644
--- a/Aaru.Tests/Images/Nero/V2.cs
+++ b/Aaru.Tests/Images/Nero/V2.cs
@@ -31,3658 +31,3657 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.Nero
+namespace Aaru.Tests.Images.Nero;
+
+[TestFixture]
+public class V2 : OpticalMediaImageTest
 {
-    [TestFixture]
-    public class V2 : OpticalMediaImageTest
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nero Burning ROM", "V2");
+    public override IMediaImage _plugin => new DiscImages.Nero();
+
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Nero Burning ROM", "V2");
-        public override IMediaImage _plugin => new DiscImages.Nero();
-
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "cdiready_the_apprentice.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 279300,
+            MD5           = "7557c72d4cf6df8bc1896388b863727a",
+            LongMD5       = "7557c72d4cf6df8bc1896388b863727a",
+            SubchannelMD5 = "08cda0c6092a6d831712f56e676c021a",
+            Tracks = new[]
             {
-                TestFile      = "cdiready_the_apprentice.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 279300,
-                MD5           = "7557c72d4cf6df8bc1896388b863727a",
-                LongMD5       = "7557c72d4cf6df8bc1896388b863727a",
-                SubchannelMD5 = "08cda0c6092a6d831712f56e676c021a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 88799,
-                        Pregap  = 69300,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 88799,
+                    Pregap  = 69300,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279299,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "jaguarcd.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 243587,
+            MD5           = "49dbfa68a7b3873d376fabec174be493",
+            LongMD5       = "49dbfa68a7b3873d376fabec174be493",
+            SubchannelMD5 = "aaa144eb86936ebd352193c836e62d48",
+            Tracks = new[]
             {
-                TestFile      = "jaguarcd.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 243587,
-                MD5           = "49dbfa68a7b3873d376fabec174be493",
-                LongMD5       = "49dbfa68a7b3873d376fabec174be493",
-                SubchannelMD5 = "aaa144eb86936ebd352193c836e62d48",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16239,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 27490,
-                        End     = 28236,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 28237,
-                        End     = 78891,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 78892,
-                        End     = 100053,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 100054,
-                        End     = 133202,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 133203,
-                        End     = 160907,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 160908,
-                        End     = 181465,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 181466,
-                        End     = 202023,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 202024,
-                        End     = 222581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 222582,
-                        End     = 243139,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 243140,
-                        End     = 243586,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16239,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 27490,
+                    End     = 28236,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 28237,
+                    End     = 78891,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 78892,
+                    End     = 100053,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 100054,
+                    End     = 133202,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 133203,
+                    End     = 160907,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 160908,
+                    End     = 181465,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 181466,
+                    End     = 202023,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 202024,
+                    End     = 222581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 222582,
+                    End     = 243139,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 243140,
+                    End     = 243586,
+                    Pregap  = 150,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "securdisc.nrg",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 169536,
+            MD5           = "95fa1df73ec2dbe008cb691495af6344",
+            LongMD5       = "6649f47b6829715c1d1ca74e17ac7c0b",
+            SubchannelMD5 = "8527822753d8123e9a01507a9acc8956",
+            Tracks = new[]
             {
-                TestFile      = "securdisc.nrg",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 169536,
-                MD5           = "95fa1df73ec2dbe008cb691495af6344",
-                LongMD5       = "6649f47b6829715c1d1ca74e17ac7c0b",
-                SubchannelMD5 = "8527822753d8123e9a01507a9acc8956",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 169535,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 169535,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "9da6ad8f6f0cadd92509c10809da7296",
+            Tracks = new[]
             {
-                TestFile      = "report_audiocd.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "9da6ad8f6f0cadd92509c10809da7296",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16398,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16399,
-                        End     = 29900,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29901,
-                        End     = 47799,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47800,
-                        End     = 63163,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63164,
-                        End     = 78774,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78775,
-                        End     = 94581,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94582,
-                        End     = 116974,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 116975,
-                        End     = 136015,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136016,
-                        End     = 153921,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153922,
-                        End     = 170600,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170601,
-                        End     = 186388,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186389,
-                        End     = 201648,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201649,
-                        End     = 224298,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224299,
-                        End     = 247072,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16398,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16399,
+                    End     = 29900,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29901,
+                    End     = 47799,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47800,
+                    End     = 63163,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63164,
+                    End     = 78774,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78775,
+                    End     = 94581,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94582,
+                    End     = 116974,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 116975,
+                    End     = 136015,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136016,
+                    End     = 153921,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153922,
+                    End     = 170600,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170601,
+                    End     = 186388,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186389,
+                    End     = 201648,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201649,
+                    End     = 224298,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224299,
+                    End     = 247072,
+                    Pregap  = 150,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.nrg",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrom.nrg",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "1994c303674718c74b35f9a4ea1d3515",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.nrg",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "6fe81a972e750c68e08f6935e4d91e34",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrw.nrg",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "6fe81a972e750c68e08f6935e4d91e34",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd+r-dl.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 3455936,
-                MD5       = "692148a01b4204160b088141fb52bd70",
-                LongMD5   = "692148a01b4204160b088141fb52bd70",
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+r-dl.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 3455936,
+            MD5       = "692148a01b4204160b088141fb52bd70",
+            LongMD5   = "692148a01b4204160b088141fb52bd70",
 
-                Tracks = new[]
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3455935,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3455935,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters     = 3455936,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Test DVD",
-                                VolumeSerial = "483E25D50034BBB0"
-                            }
+                            Clusters     = 3455936,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Test DVD",
+                            VolumeSerial = "483E25D50034BBB0"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd+rw.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2295104,
-                MD5       = "759e9c19389aee07f88a994132b6f8d9",
-                LongMD5   = "759e9c19389aee07f88a994132b6f8d9",
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd+rw.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2295104,
+            MD5       = "759e9c19389aee07f88a994132b6f8d9",
+            LongMD5   = "759e9c19389aee07f88a994132b6f8d9",
 
-                Tracks = new[]
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2295103,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2295103,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v1.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 1218960,
-                MD5       = "c22b7796791cd4299d74863ed04496c6",
-                LongMD5   = "c22b7796791cd4299d74863ed04496c6",
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v1.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 1218960,
+            MD5       = "c22b7796791cd4299d74863ed04496c6",
+            LongMD5   = "c22b7796791cd4299d74863ed04496c6",
 
-                Tracks = new[]
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1218959,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1218959,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v2.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2236704,
-                MD5       = "00b1d7c5e9855959a4d2f6b796aeaf4c",
-                LongMD5   = "00b1d7c5e9855959a4d2f6b796aeaf4c",
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v2.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2236704,
+            MD5       = "00b1d7c5e9855959a4d2f6b796aeaf4c",
+            LongMD5   = "00b1d7c5e9855959a4d2f6b796aeaf4c",
 
-                Tracks = new[]
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2236703,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2236703,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdrom.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146368,
-                MD5       = "106f141400355476b499213f36a363f9",
-                LongMD5   = "106f141400355476b499213f36a363f9",
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdrom.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146368,
+            MD5       = "106f141400355476b499213f36a363f9",
+            LongMD5   = "106f141400355476b499213f36a363f9",
 
-                Tracks = new[]
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146367,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146367,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_enhancedcd.nrg",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 303316,
+            MD5           = "7174351b366e423082846c7e396905ff",
+            LongMD5       = "0988146c02c49fe563894d0e24435bbc",
+            SubchannelMD5 = "758e4933c5703b9d90db0766dcb47b79",
+            Tracks = new[]
             {
-                TestFile      = "report_enhancedcd.nrg",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 303316,
-                MD5           = "7174351b366e423082846c7e396905ff",
-                LongMD5       = "0988146c02c49fe563894d0e24435bbc",
-                SubchannelMD5 = "758e4933c5703b9d90db0766dcb47b79",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 14,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 14,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_audiocd_cdtext.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 277696,
+            MD5           = "7c8fc7bb768cff15d702ac8cd10108d7",
+            LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
+            SubchannelMD5 = "c0bc1ac22c7e0e53407836c8f2331a94",
+            Tracks = new[]
             {
-                TestFile      = "test_audiocd_cdtext.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 277696,
-                MD5           = "7c8fc7bb768cff15d702ac8cd10108d7",
-                LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
-                SubchannelMD5 = "c0bc1ac22c7e0e53407836c8f2331a94",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 277695,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 277695,
+                    Pregap  = 0,
+                    Flags   = 2
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_incd_udf200_finalized.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 350134,
+            MD5           = "4a76893cf5e5bee7016692b8f26504e3",
+            LongMD5       = "f633fb0d3e63ded81118df8d955517a3",
+            SubchannelMD5 = "d6257be337751e6f10effacaa82d8350",
+            Tracks = new[]
             {
-                TestFile      = "test_incd_udf200_finalized.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 350134,
-                MD5           = "4a76893cf5e5bee7016692b8f26504e3",
-                LongMD5       = "f633fb0d3e63ded81118df8d955517a3",
-                SubchannelMD5 = "d6257be337751e6f10effacaa82d8350",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 350133,
+                    Pregap  = 150,
+                    Flags   = 6,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 350133,
-                        Pregap  = 150,
-                        Flags   = 6,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 600,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "INCD"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 418519,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "InCD",
-                                VolumeSerial = "40888C15CA13D401InCD"
-                            }
+                            Clusters    = 600,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "INCD"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 418519,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "InCD",
+                            VolumeSerial = "40888C15CA13D401InCD"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 329158,
+            MD5           = "a34e29e42b60023a6ae59f37d2bd4bea",
+            LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
+            SubchannelMD5 = "d6ba23bc1118deb2db4a609e72437385",
+            Tracks = new[]
             {
-                TestFile      = "test_multi_karaoke_sampler.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 329158,
-                MD5           = "a34e29e42b60023a6ae59f37d2bd4bea",
-                LongMD5       = "e981f7dfdb522ba937fe75474e23a446",
-                SubchannelMD5 = "d6ba23bc1118deb2db4a609e72437385",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32748,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multiple_indexes.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 65536,
-                MD5           = "1b13a8f8aeb23f0b8bbc68518217e771",
-                LongMD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
-                SubchannelMD5 = "1a2583cb21730c2ed4f1c53fadffa60a",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32748,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multiple_indexes.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 65536,
+            MD5           = "1b13a8f8aeb23f0b8bbc68518217e771",
+            LongMD5       = "1b13a8f8aeb23f0b8bbc68518217e771",
+            SubchannelMD5 = "1a2583cb21730c2ed4f1c53fadffa60a",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 4803,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 4804,
+                    End     = 13874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13875,
+                    End     = 41184,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 41185,
+                    End     = 54988,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 54989,
+                    End     = 65535,
+                    Pregap  = 0,
+                    Flags   = 2
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 51168,
+            MD5           = "d5b4f6cd608800aa02a79eb4ddc714dc",
+            LongMD5       = "5cd43bed94fc3e98f5ad805841c3d0a3",
+            SubchannelMD5 = "67db42c525f3c850481e94465acd2423",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 4803,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 4804,
-                        End     = 13874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13875,
-                        End     = 41184,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 41185,
-                        End     = 54988,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 54989,
-                        End     = 65535,
-                        Pregap  = 0,
-                        Flags   = 2
+                        new FileSystemTest
+                        {
+                            Clusters    = 7876,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 9721,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 1",
+                            VolumeSerial = "50958B61AF6A749E"
+                        }
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 51168,
-                MD5           = "d5b4f6cd608800aa02a79eb4ddc714dc",
-                LongMD5       = "5cd43bed94fc3e98f5ad805841c3d0a3",
-                SubchannelMD5 = "67db42c525f3c850481e94465acd2423",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 2,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 7876,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 9721,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 1",
-                                VolumeSerial = "50958B61AF6A749E"
-                            }
+                            Clusters    = 6170,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 2"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 7682,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 2",
+                            VolumeSerial = "50958BBBAF6A7444"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 3,
+                    FileSystems = new[]
                     {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 2,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 6170,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 2"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 7682,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 2",
-                                VolumeSerial = "50958BBBAF6A7444"
-                            }
+                            Clusters    = 5360,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 3"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 6715,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.00",
+                            VolumeName   = "Session 3",
+                            VolumeSerial = "50958C19AF6A73E6"
                         }
-                    },
-                    new TrackInfoTestExpected
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 4,
+                    FileSystems = new[]
                     {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 3,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 5360,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 3"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6715,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.00",
-                                VolumeName   = "Session 3",
-                                VolumeSerial = "50958C19AF6A73E6"
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 4,
-                        FileSystems = new[]
+                            Clusters    = 45796,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 4"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 45796,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 4"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 6920,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v2.60",
-                                VolumeName   = "Session 4",
-                                VolumeSerial = "50958C82AF6A737D"
-                            }
+                            Clusters     = 6920,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v2.60",
+                            VolumeName   = "Session 4",
+                            VolumeSerial = "50958C82AF6A737D"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 48794,
+            MD5           = "5b5e93e5477cd7e8e444d25e8ff42a2a",
+            LongMD5       = "806eee4238d63e8330710bc141e85bc8",
+            SubchannelMD5 = "2f111b57f8932c43a6cf4ad2fd5eb5e2",
+            Tracks = new[]
             {
-                TestFile      = "test_videocd.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 48794,
-                MD5           = "5b5e93e5477cd7e8e444d25e8ff42a2a",
-                LongMD5       = "806eee4238d63e8330710bc141e85bc8",
-                SubchannelMD5 = "2f111b57f8932c43a6cf4ad2fd5eb5e2",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 949,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 949,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 950,
-                        End     = 48793,
-                        Pregap  = 302,
-                        Flags   = 4
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_audiocd_dao.nrg",
-                MediaType = MediaType.CDDA,
-                Sectors   = 279196,
-                MD5       = "cce718c0d4d60eb9a0571cd0ae7e2ff2",
-                LongMD5   = "cce718c0d4d60eb9a0571cd0ae7e2ff2",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65333,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65334,
-                        End     = 78875,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78876,
-                        End     = 95679,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95680,
-                        End     = 126896,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126897,
-                        End     = 155858,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155859,
-                        End     = 192734,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 192735,
-                        End     = 223975,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 223976,
-                        End     = 244787,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244788,
-                        End     = 271099,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271100,
-                        End     = 279195,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_audiocd_tao.nrg",
-                MediaType = MediaType.CDDA,
-                Sectors   = 279196,
-                MD5       = "5c30e6a6fa2e85751a2e1592fbf3245d",
-                LongMD5   = "5c30e6a6fa2e85751a2e1592fbf3245d",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65333,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65334,
-                        End     = 78875,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78876,
-                        End     = 95679,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95680,
-                        End     = 126896,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126897,
-                        End     = 155858,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155859,
-                        End     = 192734,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 192735,
-                        End     = 223975,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 223976,
-                        End     = 244787,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244788,
-                        End     = 271099,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271100,
-                        End     = 279195,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_dvd_iso9660-1999.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 82704,
-                MD5       = "dac40e24aeccfe416a044bf9502d2b7e",
-                LongMD5   = "dac40e24aeccfe416a044bf9502d2b7e",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 82703,
-                        Pregap  = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_dvd_joliet.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 83072,
-                MD5       = "a412c13e81a4044407a81ad794095306",
-                LongMD5   = "a412c13e81a4044407a81ad794095306",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83071,
-                        Pregap  = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_iso9660-1999_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 82695,
-                MD5       = "b14ace0656db97360e21bc9d7d3d5109",
-                LongMD5   = "5793b471f2ef0087af63facba9485bee",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 82694,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_iso9660-1999_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 82695,
-                MD5       = "b14ace0656db97360e21bc9d7d3d5109",
-                LongMD5   = "5793b471f2ef0087af63facba9485bee",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 82694,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 83068,
-                MD5       = "05dcbde7856dae96bb1fcff7d02fdb96",
-                LongMD5   = "bf5a216352b7a025fb98d76b38afbe3d",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83067,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 83068,
-                MD5       = "05dcbde7856dae96bb1fcff7d02fdb96",
-                LongMD5   = "bf5a216352b7a025fb98d76b38afbe3d",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83067,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_102_physical_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85364,
-                MD5       = "331c02751e4c2fd505fffa163b1bc361",
-                LongMD5   = "12f448affe38c96311c9de4633f787e1",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85363,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_102_physical_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85364,
-                MD5       = "52df6748a9436452e6a024d6d43cc5fb",
-                LongMD5   = "ed6f139b0e763690d84b1f4aba2a6b78",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85363,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_150_physical_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85364,
-                MD5       = "45703870e27a99cdc5ee486f9b919209",
-                LongMD5   = "d9ed9c8bafd5f218d3b7f6aee6be2d44",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85363,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_150_physical_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85364,
-                MD5       = "56392a983981f9e222ea18807934a3d4",
-                LongMD5   = "9cbd519fe328fcb206c1786fbbfeeb87",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85363,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_150_sparing_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 86529,
-                MD5       = "ee86f608a9276e4bc267b8c66907ada4",
-                LongMD5   = "f92ebc7cd69e2e060db761eba6582d67",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_150_sparing_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 86529,
-                MD5       = "6fbd06e26bbeb49b19434b8630b4711d",
-                LongMD5   = "68692050b99c94dc61c38c2b315ac8f5",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_150_virtual_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85368,
-                MD5       = "408ff544e060baa6b67cce490aba1f77",
-                LongMD5   = "c48e0ec4b399399507e1da52e569db33",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85367,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_150_virtual_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85368,
-                MD5       = "79fc10eb1b87a95cc46581a6680fed02",
-                LongMD5   = "1ba7ebd3904756d07f28c8cca5df3176",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85367,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_200_physical_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85366,
-                MD5       = "cfd56ea81d9927f3bd84303e2e46f3d0",
-                LongMD5   = "5906fae5ed3eae8b34d7b1c3768254f3",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85365,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_200_physical_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85366,
-                MD5       = "45a74e0240eafd4a25f3719fcb63c423",
-                LongMD5   = "5d2ebb99b0aaaacd08294f910b95ea25",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85365,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_200_sparing_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 86529,
-                MD5       = "a36f10b5881798f73a60dcabfdbda2e5",
-                LongMD5   = "cbef2b2fa29347456f2d2c6aadf0a65a",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_200_sparing_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 86529,
-                MD5       = "20484d666fdb7be5cb4783853f1d5e11",
-                LongMD5   = "3fd901634fca7ec9979b69ae8b242d5c",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_200_virtual_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85370,
-                MD5       = "477788d0e383b9dbd9bf179c6eae1950",
-                LongMD5   = "b688819e815a7dea55ab894666d98a36",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85369,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_200_virtual_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85370,
-                MD5       = "884633f3720b20c36c2f56032456ff42",
-                LongMD5   = "520c0da95e556285f264055309d0643d",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85369,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_201_physical_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85366,
-                MD5       = "8703cbb59eb1dfb6f7b3748f9e410698",
-                LongMD5   = "750009655962df0f01d3261ed71e2b06",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85365,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_201_physical_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85366,
-                MD5       = "5a8ee84276bdf1b1d0b07b64639892a4",
-                LongMD5   = "2b89eb05149632731bc07aef7bd85518",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85365,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_201_sparing_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 86529,
-                MD5       = "b88ca672a6f86f84072a626b62ba9f14",
-                LongMD5   = "131c8da49d40e850f4e956cc8770445d",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_201_sparing_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 86529,
-                MD5       = "7b7558a98a0ade5e3d5046eb24983c2b",
-                LongMD5   = "2d625d5192a506cf2baf91f8b04ff722",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_201_virtual_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85370,
-                MD5       = "2b96f44ee072f04cb7477abc23c0ac78",
-                LongMD5   = "bf7ad9935df332783848f815458e1687",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85369,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode1_joliet_udf_201_virtual_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85370,
-                MD5       = "70ea1fca4e5929514d15be2b16156961",
-                LongMD5   = "929cff7615d84c900c637067e6bf44e6",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85369,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_iso9660-1999_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 82697,
-                MD5       = "9712faa85483cf520e0efae0bbd53164",
-                LongMD5   = "c7a5031c12fcac644f20384c8cafe3a8",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 82696,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_iso9660-1999_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 82697,
-                MD5       = "9712faa85483cf520e0efae0bbd53164",
-                LongMD5   = "c7a5031c12fcac644f20384c8cafe3a8",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 82696,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 83082,
-                MD5       = "2a391c84479c34267439103ca6abf7bf",
-                LongMD5   = "dd5fd9f1e45acff0c2c9b85f6abb3ab8",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83081,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 83082,
-                MD5       = "2a391c84479c34267439103ca6abf7bf",
-                LongMD5   = "dd5fd9f1e45acff0c2c9b85f6abb3ab8",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 83081,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_102_physical_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85378,
-                MD5       = "0861eb66287123d470b7945debe8fb12",
-                LongMD5   = "139d794e62632e4845ab24daff3685f0",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85377,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_102_physical_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85378,
-                MD5       = "b2b0772bbc6b950bbdbaaac90831c9f2",
-                LongMD5   = "9cd6841be3c35cd3ea012fbb4f5b313d",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85377,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_150_physical_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85378,
-                MD5       = "8329b3663619eca9d424eb1fbc7036b7",
-                LongMD5   = "451bc347c53260b50c48b101e64e9023",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85377,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_150_physical_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85378,
-                MD5       = "055310ad3609d44011081863d617d33f",
-                LongMD5   = "a9d37132e6b519bb774f603129c1b7dd",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85377,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_150_sparing_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 86529,
-                MD5       = "cc9ece6ddcbb456ff5cf197d0f21b785",
-                LongMD5   = "d0042821851343b7149231e13f60677d",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_150_sparing_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 86529,
-                MD5       = "ae08aedc15e623ed2a035b9813e5360d",
-                LongMD5   = "260416feefd735fbfa9d428197fc31ce",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_150_virtual_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85382,
-                MD5       = "23ba6f2deb635e408e7938345aaecd5e",
-                LongMD5   = "3c3cc0829c0f5b3dc90552cd06f6caca",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85381,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_150_virtual_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85382,
-                MD5       = "1b7b0d16a910b65173fd777c974e94b6",
-                LongMD5   = "cb9495de8c27af64b84925b32351ceb2",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85381,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_200_physical_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85380,
-                MD5       = "7f550c2b0b587275a63ccf13a732bb55",
-                LongMD5   = "629a18aa832bc0336d7f5eeb69d179c8",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85379,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_200_physical_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85380,
-                MD5       = "119fe576b2a81e0070b48748545ed691",
-                LongMD5   = "aae875760f7a1e6e41b1b93b71de3b20",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85379,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_200_sparing_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 86529,
-                MD5       = "2b4b5af6ac9d988a2dc38dc5b873d574",
-                LongMD5   = "5c18f49d07d53fd799e74f24d4d53484",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_200_sparing_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 86529,
-                MD5       = "0613ae6e1c5b87ae563b3f7f572a8b18",
-                LongMD5   = "a6169364cb292c245e435eb63cb47057",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_200_virtual_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85384,
-                MD5       = "d45ffe1153db6f5c71596cbd905fc488",
-                LongMD5   = "a902f86d13d56f2e6f227a52634089d9",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85383,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_200_virtual_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85384,
-                MD5       = "779eecd0085b18b1d9918b41423dd339",
-                LongMD5   = "d0513c7eee273befeff5ce89f9238560",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85383,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_201_physical_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85380,
-                MD5       = "4c81ffc4fa384850de42910b35a5aca3",
-                LongMD5   = "b3a211be5fdae118e301a64de7fcb179",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85379,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_201_physical_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85380,
-                MD5       = "55785037c6349fa1f7fdd0b908181818",
-                LongMD5   = "eab4b4988478a929abb00456c79bdd93",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85379,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_201_sparing_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 86529,
-                MD5       = "92ce7748584f7e6ed60c4bd507b4dc0f",
-                LongMD5   = "685810f81bfdf3726b29c6bfb3fe6240",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_201_sparing_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 86529,
-                MD5       = "2a546c0c5eabb2bdcf23f30b463bb275",
-                LongMD5   = "50de9b1be03914910e6c60f7bfa0e077",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 86528,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_201_virtual_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85384,
-                MD5       = "8122aa37899aea7ca6edd5da216ea172",
-                LongMD5   = "20a452a3389e06af32a79137b005dc66",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85383,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_mode2_joliet_udf_201_virtual_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 85384,
-                MD5       = "92b7c6ba9530389f8189f5ca271dfb25",
-                LongMD5   = "f7c3a968839604a0317132c76387617c",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85383,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_102_physical_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84616,
-                MD5       = "d15dc18c94c1800c578dc50130395a3e",
-                LongMD5   = "e133b2452e7f8a3fb0993e6626b81dbf",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84615,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_102_physical_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84616,
-                MD5       = "897d2c63f0e181854191c859d9aa8bd2",
-                LongMD5   = "00b91fff0f255a541f9e6ce1484f7853",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84615,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_150_physical_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84616,
-                MD5       = "d3dd0903e74a4a714114751fe3071ceb",
-                LongMD5   = "9764d6dcd88081043d12592ec529739e",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84615,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_150_physical_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84616,
-                MD5       = "076f320539c8171246e4d24a5cf3d533",
-                LongMD5   = "70a988b0c6c9ecd3ae3b12a18dd4dc0e",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84615,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_150_sparing_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85793,
-                MD5       = "fac65be4def378788d467966e2b795d8",
-                LongMD5   = "0c221dec63b409a3785d7183b4149176",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85792,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_150_sparing_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85793,
-                MD5       = "366195d1e5140c0a690d2b256891db60",
-                LongMD5   = "934e4d7fde8b1ad40c8135e43159e74b",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85792,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_150_virtual_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84620,
-                MD5       = "a40b83ad5ba0de4a1e19426c0bd05934",
-                LongMD5   = "4b7698c901b19739c5911db97eb1ca55",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84619,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_150_virtual_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84620,
-                MD5       = "cc0ebb19ee2fa513c7fcdc6c4916536d",
-                LongMD5   = "7cee40146211ed2bbd50dbe5082bd290",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84619,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_200_physical_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84618,
-                MD5       = "86d67a9f66ff43f89f5a58b785598b08",
-                LongMD5   = "1bb6cc5f1db38a4bb4598cd8776d5aaf",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84617,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_200_physical_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84618,
-                MD5       = "ca9cee749466053ab344a27a4b5c2e11",
-                LongMD5   = "3880fae96c3fb170fb4f337985adc5c5",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84617,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_200_sparing_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85793,
-                MD5       = "803526863c0ec3f64c2a89cdb7ebce77",
-                LongMD5   = "5f16344d375502a1082c635f5e27ea4e",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85792,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_200_sparing_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85793,
-                MD5       = "00570af53cea4275c7191ba52e65f1bf",
-                LongMD5   = "2efedcd2a6bfb1658015221ecfba0752",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85792,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_200_virtual_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84622,
-                MD5       = "b0b56d1663c508e7d0ceb33f3bb5cc78",
-                LongMD5   = "20a0714daaff2d41798d97f72cd95b3a",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84621,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_200_virtual_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84622,
-                MD5       = "de4c155829449b40632bb9165dba0839",
-                LongMD5   = "f12ca7d65ddad197d3075926ad7c3aaf",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84621,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_201_physical_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84618,
-                MD5       = "bd83c27796677aa75f067c474952226e",
-                LongMD5   = "220904f85af94dff3b899e36c30c6511",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84617,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_201_physical_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84618,
-                MD5       = "fa86ee2ecaf7a0b9e06b1e0ea3e66a16",
-                LongMD5   = "e6e3a29fc6642716c1c302c63586f7cb",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84617,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_201_sparing_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85793,
-                MD5       = "7f6b97cd47875e397de275b56a3cfd86",
-                LongMD5   = "1b50de41d291308c1aa678da06a38978",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85792,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_201_sparing_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 85793,
-                MD5       = "c3bed9a87c42cafe1f7a1239eaa0fac6",
-                LongMD5   = "0c5c3ab226f73c3c36636abdb6ac289e",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 85792,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_201_virtual_dao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84622,
-                MD5       = "54ba4fe1ac87998dd0cb7dddfea97664",
-                LongMD5   = "a946851e149714a084ea3d1794964fc5",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84621,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_data_udf_201_virtual_tao.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 84622,
-                MD5       = "372d1a672f8ec1310c8665024b35b483",
-                LongMD5   = "e4e2304b1cccffdac1e781bae228dee4",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 84621,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_enhancedcd_dao.nrg",
-                MediaType = MediaType.CDPLUS,
-                Sectors   = 337261,
-                MD5       = "9f1272614a307e3fac0b3e6ba90098e8",
-                LongMD5   = "b5d6a75d73752f78a978e51e7f4c4adf",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65333,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65334,
-                        End     = 78875,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78876,
-                        End     = 95679,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95680,
-                        End     = 126896,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126897,
-                        End     = 155858,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155859,
-                        End     = 192734,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 192735,
-                        End     = 223975,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 223976,
-                        End     = 244787,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244788,
-                        End     = 271099,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271100,
-                        End     = 279195,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 290446,
-                        End     = 337260,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_enhancedcd_tao.nrg",
-                MediaType = MediaType.CDPLUS,
-                Sectors   = 337261,
-                MD5       = "7bbe7fd534a37882924c718604c9a6e9",
-                LongMD5   = "c3053f05e4f371fcceeaf001bd1b235c",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65333,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65334,
-                        End     = 78875,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78876,
-                        End     = 95679,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95680,
-                        End     = 126896,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126897,
-                        End     = 155858,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155859,
-                        End     = 192734,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 192735,
-                        End     = 223975,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 223976,
-                        End     = 244787,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244788,
-                        End     = 271099,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271100,
-                        End     = 279195,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 290296,
-                        End     = 337260,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_hdburn_full.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 727605,
-                MD5       = "f47418bf60ea47be64e97c17192e2d5f",
-                LongMD5   = "e7daf8bc5100fd211028cf0f6491d343",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 727604,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_hdburn.nrg",
-                MediaType = MediaType.CDROM,
-                Sectors   = 31084,
-                MD5       = "c76c3537f1b3f3c4feecca0e35b4b859",
-                LongMD5   = "a58449cfb0de9708f2a19d515d9d37f8",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 31083,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_mixed_mode_dao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 362041,
-                MD5       = "e50fb58ee954ae5bcec18c09896095a5",
-                LongMD5   = "1d3da4b1804a0e9aa07d8f7c2f51672b",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 82694,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 82695,
-                        End     = 112746,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112747,
-                        End     = 148178,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 148179,
-                        End     = 161720,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 161721,
-                        End     = 178524,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 178525,
-                        End     = 209741,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 209742,
-                        End     = 238703,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 238704,
-                        End     = 275579,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 275580,
-                        End     = 306820,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 306821,
-                        End     = 327632,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 327633,
-                        End     = 353944,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 353945,
-                        End     = 362040,
-                        Pregap  = 150,
-                        Flags   = 2
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "make_mixed_mode_tao.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 362041,
-                MD5       = "c1b14eec8c9bc1177926c8ef5f382cc0",
-                LongMD5   = "8f62724f4f6bfe8898daca1b39b25eb8",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 82694,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 82695,
-                        End     = 112746,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112747,
-                        End     = 148178,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 148179,
-                        End     = 161720,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 161721,
-                        End     = 178524,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 178525,
-                        End     = 209741,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 209742,
-                        End     = 238703,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 238704,
-                        End     = 275579,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 275580,
-                        End     = 306820,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 306821,
-                        End     = 327632,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 327633,
-                        End     = 353944,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 353945,
-                        End     = 362040,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            #region These test images violate the specifications and are not expected to work yet
-            /*
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_all_tracks_are_track1.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 36939,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 36938,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_castrated_leadout.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 270050,
-                MD5           = "UNKNOWN",
-                LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
-                SubchannelMD5 = "ca781a7afc4eb77c51f7c551ed45c03c",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 270049,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_data_track_as_audio.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
-                LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
-                SubchannelMD5 = "5479a1115bb6481db69fd6262e8c6076",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_data_track_as_audio_fixed_sub.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "UNKNOWN",
-                LongMD5       = "6751e0ae7821f92221672b1cd5a1ff36",
-                SubchannelMD5 = "65f938f7f9ac34fabd3ab94c14eb76b5",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_track1_overlaps_session2.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 4294992835,
-                MD5           = "UNKNOWN",
-                LongMD5       = "608a73cd10bccdadde68523aead1ee72",
-                SubchannelMD5 = "d8eed571f137c92f22bb858d78fc1e41",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 113870,
-                        End     = 4294992834,
-                        Pregap  = 114020,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_track2_inside_session2_leadin.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 62385,
-                MD5           = "6fa06c10561343438736a8d3d9a965ea",
-                LongMD5       = "c82d20702d31bc15bdc91f7e107862ae",
-                SubchannelMD5 = "935a91f5850352818d92b71f1c87c393",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25349,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 25350,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_track2_inside_track1.nrg",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 62385,
-                MD5       = "6fa06c10561343438736a8d3d9a965ea",
-                LongMD5   = "4a045788e69965efe0c87950d013e720",
-
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 13199,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 13200,
-                        End     = 25538,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 36789,
-                        End     = 62384,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            */
-            #endregion
-        };
-    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 950,
+                    End     = 48793,
+                    Pregap  = 302,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_audiocd_dao.nrg",
+            MediaType = MediaType.CDDA,
+            Sectors   = 279196,
+            MD5       = "cce718c0d4d60eb9a0571cd0ae7e2ff2",
+            LongMD5   = "cce718c0d4d60eb9a0571cd0ae7e2ff2",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65333,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65334,
+                    End     = 78875,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78876,
+                    End     = 95679,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95680,
+                    End     = 126896,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126897,
+                    End     = 155858,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155859,
+                    End     = 192734,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 192735,
+                    End     = 223975,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 223976,
+                    End     = 244787,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244788,
+                    End     = 271099,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271100,
+                    End     = 279195,
+                    Pregap  = 150,
+                    Flags   = 2
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_audiocd_tao.nrg",
+            MediaType = MediaType.CDDA,
+            Sectors   = 279196,
+            MD5       = "5c30e6a6fa2e85751a2e1592fbf3245d",
+            LongMD5   = "5c30e6a6fa2e85751a2e1592fbf3245d",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65333,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65334,
+                    End     = 78875,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78876,
+                    End     = 95679,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95680,
+                    End     = 126896,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126897,
+                    End     = 155858,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155859,
+                    End     = 192734,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 192735,
+                    End     = 223975,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 223976,
+                    End     = 244787,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244788,
+                    End     = 271099,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271100,
+                    End     = 279195,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_dvd_iso9660-1999.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 82704,
+            MD5       = "dac40e24aeccfe416a044bf9502d2b7e",
+            LongMD5   = "dac40e24aeccfe416a044bf9502d2b7e",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 82703,
+                    Pregap  = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_dvd_joliet.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 83072,
+            MD5       = "a412c13e81a4044407a81ad794095306",
+            LongMD5   = "a412c13e81a4044407a81ad794095306",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83071,
+                    Pregap  = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_iso9660-1999_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 82695,
+            MD5       = "b14ace0656db97360e21bc9d7d3d5109",
+            LongMD5   = "5793b471f2ef0087af63facba9485bee",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 82694,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_iso9660-1999_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 82695,
+            MD5       = "b14ace0656db97360e21bc9d7d3d5109",
+            LongMD5   = "5793b471f2ef0087af63facba9485bee",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 82694,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 83068,
+            MD5       = "05dcbde7856dae96bb1fcff7d02fdb96",
+            LongMD5   = "bf5a216352b7a025fb98d76b38afbe3d",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83067,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 83068,
+            MD5       = "05dcbde7856dae96bb1fcff7d02fdb96",
+            LongMD5   = "bf5a216352b7a025fb98d76b38afbe3d",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83067,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_102_physical_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85364,
+            MD5       = "331c02751e4c2fd505fffa163b1bc361",
+            LongMD5   = "12f448affe38c96311c9de4633f787e1",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85363,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_102_physical_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85364,
+            MD5       = "52df6748a9436452e6a024d6d43cc5fb",
+            LongMD5   = "ed6f139b0e763690d84b1f4aba2a6b78",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85363,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_150_physical_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85364,
+            MD5       = "45703870e27a99cdc5ee486f9b919209",
+            LongMD5   = "d9ed9c8bafd5f218d3b7f6aee6be2d44",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85363,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_150_physical_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85364,
+            MD5       = "56392a983981f9e222ea18807934a3d4",
+            LongMD5   = "9cbd519fe328fcb206c1786fbbfeeb87",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85363,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_150_sparing_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 86529,
+            MD5       = "ee86f608a9276e4bc267b8c66907ada4",
+            LongMD5   = "f92ebc7cd69e2e060db761eba6582d67",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_150_sparing_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 86529,
+            MD5       = "6fbd06e26bbeb49b19434b8630b4711d",
+            LongMD5   = "68692050b99c94dc61c38c2b315ac8f5",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_150_virtual_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85368,
+            MD5       = "408ff544e060baa6b67cce490aba1f77",
+            LongMD5   = "c48e0ec4b399399507e1da52e569db33",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85367,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_150_virtual_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85368,
+            MD5       = "79fc10eb1b87a95cc46581a6680fed02",
+            LongMD5   = "1ba7ebd3904756d07f28c8cca5df3176",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85367,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_200_physical_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85366,
+            MD5       = "cfd56ea81d9927f3bd84303e2e46f3d0",
+            LongMD5   = "5906fae5ed3eae8b34d7b1c3768254f3",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85365,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_200_physical_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85366,
+            MD5       = "45a74e0240eafd4a25f3719fcb63c423",
+            LongMD5   = "5d2ebb99b0aaaacd08294f910b95ea25",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85365,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_200_sparing_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 86529,
+            MD5       = "a36f10b5881798f73a60dcabfdbda2e5",
+            LongMD5   = "cbef2b2fa29347456f2d2c6aadf0a65a",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_200_sparing_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 86529,
+            MD5       = "20484d666fdb7be5cb4783853f1d5e11",
+            LongMD5   = "3fd901634fca7ec9979b69ae8b242d5c",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_200_virtual_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85370,
+            MD5       = "477788d0e383b9dbd9bf179c6eae1950",
+            LongMD5   = "b688819e815a7dea55ab894666d98a36",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85369,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_200_virtual_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85370,
+            MD5       = "884633f3720b20c36c2f56032456ff42",
+            LongMD5   = "520c0da95e556285f264055309d0643d",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85369,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_201_physical_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85366,
+            MD5       = "8703cbb59eb1dfb6f7b3748f9e410698",
+            LongMD5   = "750009655962df0f01d3261ed71e2b06",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85365,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_201_physical_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85366,
+            MD5       = "5a8ee84276bdf1b1d0b07b64639892a4",
+            LongMD5   = "2b89eb05149632731bc07aef7bd85518",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85365,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_201_sparing_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 86529,
+            MD5       = "b88ca672a6f86f84072a626b62ba9f14",
+            LongMD5   = "131c8da49d40e850f4e956cc8770445d",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_201_sparing_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 86529,
+            MD5       = "7b7558a98a0ade5e3d5046eb24983c2b",
+            LongMD5   = "2d625d5192a506cf2baf91f8b04ff722",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_201_virtual_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85370,
+            MD5       = "2b96f44ee072f04cb7477abc23c0ac78",
+            LongMD5   = "bf7ad9935df332783848f815458e1687",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85369,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode1_joliet_udf_201_virtual_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85370,
+            MD5       = "70ea1fca4e5929514d15be2b16156961",
+            LongMD5   = "929cff7615d84c900c637067e6bf44e6",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85369,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_iso9660-1999_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 82697,
+            MD5       = "9712faa85483cf520e0efae0bbd53164",
+            LongMD5   = "c7a5031c12fcac644f20384c8cafe3a8",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 82696,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_iso9660-1999_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 82697,
+            MD5       = "9712faa85483cf520e0efae0bbd53164",
+            LongMD5   = "c7a5031c12fcac644f20384c8cafe3a8",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 82696,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 83082,
+            MD5       = "2a391c84479c34267439103ca6abf7bf",
+            LongMD5   = "dd5fd9f1e45acff0c2c9b85f6abb3ab8",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83081,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 83082,
+            MD5       = "2a391c84479c34267439103ca6abf7bf",
+            LongMD5   = "dd5fd9f1e45acff0c2c9b85f6abb3ab8",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 83081,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_102_physical_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85378,
+            MD5       = "0861eb66287123d470b7945debe8fb12",
+            LongMD5   = "139d794e62632e4845ab24daff3685f0",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85377,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_102_physical_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85378,
+            MD5       = "b2b0772bbc6b950bbdbaaac90831c9f2",
+            LongMD5   = "9cd6841be3c35cd3ea012fbb4f5b313d",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85377,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_150_physical_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85378,
+            MD5       = "8329b3663619eca9d424eb1fbc7036b7",
+            LongMD5   = "451bc347c53260b50c48b101e64e9023",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85377,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_150_physical_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85378,
+            MD5       = "055310ad3609d44011081863d617d33f",
+            LongMD5   = "a9d37132e6b519bb774f603129c1b7dd",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85377,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_150_sparing_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 86529,
+            MD5       = "cc9ece6ddcbb456ff5cf197d0f21b785",
+            LongMD5   = "d0042821851343b7149231e13f60677d",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_150_sparing_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 86529,
+            MD5       = "ae08aedc15e623ed2a035b9813e5360d",
+            LongMD5   = "260416feefd735fbfa9d428197fc31ce",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_150_virtual_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85382,
+            MD5       = "23ba6f2deb635e408e7938345aaecd5e",
+            LongMD5   = "3c3cc0829c0f5b3dc90552cd06f6caca",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85381,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_150_virtual_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85382,
+            MD5       = "1b7b0d16a910b65173fd777c974e94b6",
+            LongMD5   = "cb9495de8c27af64b84925b32351ceb2",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85381,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_200_physical_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85380,
+            MD5       = "7f550c2b0b587275a63ccf13a732bb55",
+            LongMD5   = "629a18aa832bc0336d7f5eeb69d179c8",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85379,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_200_physical_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85380,
+            MD5       = "119fe576b2a81e0070b48748545ed691",
+            LongMD5   = "aae875760f7a1e6e41b1b93b71de3b20",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85379,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_200_sparing_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 86529,
+            MD5       = "2b4b5af6ac9d988a2dc38dc5b873d574",
+            LongMD5   = "5c18f49d07d53fd799e74f24d4d53484",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_200_sparing_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 86529,
+            MD5       = "0613ae6e1c5b87ae563b3f7f572a8b18",
+            LongMD5   = "a6169364cb292c245e435eb63cb47057",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_200_virtual_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85384,
+            MD5       = "d45ffe1153db6f5c71596cbd905fc488",
+            LongMD5   = "a902f86d13d56f2e6f227a52634089d9",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85383,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_200_virtual_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85384,
+            MD5       = "779eecd0085b18b1d9918b41423dd339",
+            LongMD5   = "d0513c7eee273befeff5ce89f9238560",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85383,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_201_physical_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85380,
+            MD5       = "4c81ffc4fa384850de42910b35a5aca3",
+            LongMD5   = "b3a211be5fdae118e301a64de7fcb179",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85379,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_201_physical_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85380,
+            MD5       = "55785037c6349fa1f7fdd0b908181818",
+            LongMD5   = "eab4b4988478a929abb00456c79bdd93",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85379,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_201_sparing_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 86529,
+            MD5       = "92ce7748584f7e6ed60c4bd507b4dc0f",
+            LongMD5   = "685810f81bfdf3726b29c6bfb3fe6240",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_201_sparing_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 86529,
+            MD5       = "2a546c0c5eabb2bdcf23f30b463bb275",
+            LongMD5   = "50de9b1be03914910e6c60f7bfa0e077",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 86528,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_201_virtual_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85384,
+            MD5       = "8122aa37899aea7ca6edd5da216ea172",
+            LongMD5   = "20a452a3389e06af32a79137b005dc66",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85383,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_mode2_joliet_udf_201_virtual_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 85384,
+            MD5       = "92b7c6ba9530389f8189f5ca271dfb25",
+            LongMD5   = "f7c3a968839604a0317132c76387617c",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85383,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_102_physical_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84616,
+            MD5       = "d15dc18c94c1800c578dc50130395a3e",
+            LongMD5   = "e133b2452e7f8a3fb0993e6626b81dbf",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84615,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_102_physical_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84616,
+            MD5       = "897d2c63f0e181854191c859d9aa8bd2",
+            LongMD5   = "00b91fff0f255a541f9e6ce1484f7853",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84615,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_150_physical_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84616,
+            MD5       = "d3dd0903e74a4a714114751fe3071ceb",
+            LongMD5   = "9764d6dcd88081043d12592ec529739e",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84615,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_150_physical_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84616,
+            MD5       = "076f320539c8171246e4d24a5cf3d533",
+            LongMD5   = "70a988b0c6c9ecd3ae3b12a18dd4dc0e",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84615,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_150_sparing_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85793,
+            MD5       = "fac65be4def378788d467966e2b795d8",
+            LongMD5   = "0c221dec63b409a3785d7183b4149176",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85792,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_150_sparing_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85793,
+            MD5       = "366195d1e5140c0a690d2b256891db60",
+            LongMD5   = "934e4d7fde8b1ad40c8135e43159e74b",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85792,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_150_virtual_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84620,
+            MD5       = "a40b83ad5ba0de4a1e19426c0bd05934",
+            LongMD5   = "4b7698c901b19739c5911db97eb1ca55",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84619,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_150_virtual_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84620,
+            MD5       = "cc0ebb19ee2fa513c7fcdc6c4916536d",
+            LongMD5   = "7cee40146211ed2bbd50dbe5082bd290",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84619,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_200_physical_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84618,
+            MD5       = "86d67a9f66ff43f89f5a58b785598b08",
+            LongMD5   = "1bb6cc5f1db38a4bb4598cd8776d5aaf",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84617,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_200_physical_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84618,
+            MD5       = "ca9cee749466053ab344a27a4b5c2e11",
+            LongMD5   = "3880fae96c3fb170fb4f337985adc5c5",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84617,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_200_sparing_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85793,
+            MD5       = "803526863c0ec3f64c2a89cdb7ebce77",
+            LongMD5   = "5f16344d375502a1082c635f5e27ea4e",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85792,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_200_sparing_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85793,
+            MD5       = "00570af53cea4275c7191ba52e65f1bf",
+            LongMD5   = "2efedcd2a6bfb1658015221ecfba0752",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85792,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_200_virtual_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84622,
+            MD5       = "b0b56d1663c508e7d0ceb33f3bb5cc78",
+            LongMD5   = "20a0714daaff2d41798d97f72cd95b3a",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84621,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_200_virtual_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84622,
+            MD5       = "de4c155829449b40632bb9165dba0839",
+            LongMD5   = "f12ca7d65ddad197d3075926ad7c3aaf",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84621,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_201_physical_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84618,
+            MD5       = "bd83c27796677aa75f067c474952226e",
+            LongMD5   = "220904f85af94dff3b899e36c30c6511",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84617,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_201_physical_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84618,
+            MD5       = "fa86ee2ecaf7a0b9e06b1e0ea3e66a16",
+            LongMD5   = "e6e3a29fc6642716c1c302c63586f7cb",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84617,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_201_sparing_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85793,
+            MD5       = "7f6b97cd47875e397de275b56a3cfd86",
+            LongMD5   = "1b50de41d291308c1aa678da06a38978",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85792,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_201_sparing_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 85793,
+            MD5       = "c3bed9a87c42cafe1f7a1239eaa0fac6",
+            LongMD5   = "0c5c3ab226f73c3c36636abdb6ac289e",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 85792,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_201_virtual_dao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84622,
+            MD5       = "54ba4fe1ac87998dd0cb7dddfea97664",
+            LongMD5   = "a946851e149714a084ea3d1794964fc5",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84621,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_data_udf_201_virtual_tao.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 84622,
+            MD5       = "372d1a672f8ec1310c8665024b35b483",
+            LongMD5   = "e4e2304b1cccffdac1e781bae228dee4",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 84621,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_enhancedcd_dao.nrg",
+            MediaType = MediaType.CDPLUS,
+            Sectors   = 337261,
+            MD5       = "9f1272614a307e3fac0b3e6ba90098e8",
+            LongMD5   = "b5d6a75d73752f78a978e51e7f4c4adf",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65333,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65334,
+                    End     = 78875,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78876,
+                    End     = 95679,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95680,
+                    End     = 126896,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126897,
+                    End     = 155858,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155859,
+                    End     = 192734,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 192735,
+                    End     = 223975,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 223976,
+                    End     = 244787,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244788,
+                    End     = 271099,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271100,
+                    End     = 279195,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 290446,
+                    End     = 337260,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_enhancedcd_tao.nrg",
+            MediaType = MediaType.CDPLUS,
+            Sectors   = 337261,
+            MD5       = "7bbe7fd534a37882924c718604c9a6e9",
+            LongMD5   = "c3053f05e4f371fcceeaf001bd1b235c",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65333,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65334,
+                    End     = 78875,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78876,
+                    End     = 95679,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95680,
+                    End     = 126896,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126897,
+                    End     = 155858,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155859,
+                    End     = 192734,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 192735,
+                    End     = 223975,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 223976,
+                    End     = 244787,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244788,
+                    End     = 271099,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271100,
+                    End     = 279195,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 290296,
+                    End     = 337260,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_hdburn_full.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 727605,
+            MD5       = "f47418bf60ea47be64e97c17192e2d5f",
+            LongMD5   = "e7daf8bc5100fd211028cf0f6491d343",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 727604,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_hdburn.nrg",
+            MediaType = MediaType.CDROM,
+            Sectors   = 31084,
+            MD5       = "c76c3537f1b3f3c4feecca0e35b4b859",
+            LongMD5   = "a58449cfb0de9708f2a19d515d9d37f8",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 31083,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_mixed_mode_dao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 362041,
+            MD5       = "e50fb58ee954ae5bcec18c09896095a5",
+            LongMD5   = "1d3da4b1804a0e9aa07d8f7c2f51672b",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 82694,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 82695,
+                    End     = 112746,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112747,
+                    End     = 148178,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 148179,
+                    End     = 161720,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 161721,
+                    End     = 178524,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 178525,
+                    End     = 209741,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 209742,
+                    End     = 238703,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 238704,
+                    End     = 275579,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 275580,
+                    End     = 306820,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 306821,
+                    End     = 327632,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 327633,
+                    End     = 353944,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 353945,
+                    End     = 362040,
+                    Pregap  = 150,
+                    Flags   = 2
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "make_mixed_mode_tao.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 362041,
+            MD5       = "c1b14eec8c9bc1177926c8ef5f382cc0",
+            LongMD5   = "8f62724f4f6bfe8898daca1b39b25eb8",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 82694,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 82695,
+                    End     = 112746,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112747,
+                    End     = 148178,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 148179,
+                    End     = 161720,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 161721,
+                    End     = 178524,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 178525,
+                    End     = 209741,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 209742,
+                    End     = 238703,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 238704,
+                    End     = 275579,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 275580,
+                    End     = 306820,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 306821,
+                    End     = 327632,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 327633,
+                    End     = 353944,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 353945,
+                    End     = 362040,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        #region These test images violate the specifications and are not expected to work yet
+        /*
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_all_tracks_are_track1.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 36939,
+            MD5       = "UNKNOWN",
+            LongMD5   = "UNKNOWN",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 36938,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_castrated_leadout.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 270050,
+            MD5           = "UNKNOWN",
+            LongMD5       = "7c8fc7bb768cff15d702ac8cd10108d7",
+            SubchannelMD5 = "ca781a7afc4eb77c51f7c551ed45c03c",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 270049,
+                    Pregap  = 0,
+                    Flags   = 2
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "d9d46cae2a3a46316c8e1411e84d40ef",
+            LongMD5       = "b3550e61649ba5276fed8d74f8e512ee",
+            SubchannelMD5 = "5479a1115bb6481db69fd6262e8c6076",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio_fixed_sub.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "UNKNOWN",
+            LongMD5       = "6751e0ae7821f92221672b1cd5a1ff36",
+            SubchannelMD5 = "65f938f7f9ac34fabd3ab94c14eb76b5",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track1_overlaps_session2.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 4294992835,
+            MD5           = "UNKNOWN",
+            LongMD5       = "608a73cd10bccdadde68523aead1ee72",
+            SubchannelMD5 = "d8eed571f137c92f22bb858d78fc1e41",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 113870,
+                    End     = 4294992834,
+                    Pregap  = 114020,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_track2_inside_session2_leadin.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 62385,
+            MD5           = "6fa06c10561343438736a8d3d9a965ea",
+            LongMD5       = "c82d20702d31bc15bdc91f7e107862ae",
+            SubchannelMD5 = "935a91f5850352818d92b71f1c87c393",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25349,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 25350,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_track2_inside_track1.nrg",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 62385,
+            MD5       = "6fa06c10561343438736a8d3d9a965ea",
+            LongMD5   = "4a045788e69965efe0c87950d013e720",
+
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 13199,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 13200,
+                    End     = 25538,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 36789,
+                    End     = 62384,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        */
+        #endregion
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/OpticalMediaImageTest.cs b/Aaru.Tests/Images/OpticalMediaImageTest.cs
index df5ac24ce..e66bf0d09 100644
--- a/Aaru.Tests/Images/OpticalMediaImageTest.cs
+++ b/Aaru.Tests/Images/OpticalMediaImageTest.cs
@@ -17,365 +17,320 @@ using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
+namespace Aaru.Tests.Images;
+
+public abstract class OpticalMediaImageTest : BaseMediaImageTest
 {
-    public abstract class OpticalMediaImageTest : BaseMediaImageTest
+    const           uint                       SECTORS_TO_READ = 256;
+    public abstract OpticalImageTestExpected[] Tests { get; }
+
+    [Test]
+    public void Info()
     {
-        const           uint                       SECTORS_TO_READ = 256;
-        public abstract OpticalImageTestExpected[] Tests { get; }
+        Environment.CurrentDirectory = DataFolder;
 
-        [Test]
-        public void Info()
+        Assert.Multiple(() =>
         {
-            Environment.CurrentDirectory = DataFolder;
-
-            Assert.Multiple(() =>
+            foreach(OpticalImageTestExpected test in Tests)
             {
-                foreach(OpticalImageTestExpected test in Tests)
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var image = Activator.CreateInstance(_plugin.GetType()) as IOpticalMediaImage;
+                Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
+
+                ErrorNumber opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                using(new AssertionScope())
                 {
-                    string testFile = test.TestFile;
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var image = Activator.CreateInstance(_plugin.GetType()) as IOpticalMediaImage;
-                    Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
-
-                    ErrorNumber opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    using(new AssertionScope())
+                    Assert.Multiple(() =>
                     {
-                        Assert.Multiple(() =>
-                        {
-                            Assert.AreEqual(test.Sectors, image.Info.Sectors, $"Sectors: {testFile}");
+                        Assert.AreEqual(test.Sectors, image.Info.Sectors, $"Sectors: {testFile}");
 
-                            if(test.SectorSize > 0)
-                                Assert.AreEqual(test.SectorSize, image.Info.SectorSize, $"Sector size: {testFile}");
+                        if(test.SectorSize > 0)
+                            Assert.AreEqual(test.SectorSize, image.Info.SectorSize, $"Sector size: {testFile}");
 
-                            Assert.AreEqual(test.MediaType, image.Info.MediaType, $"Media type: {testFile}");
+                        Assert.AreEqual(test.MediaType, image.Info.MediaType, $"Media type: {testFile}");
 
-                            if(image.Info.XmlMediaType != XmlMediaType.OpticalDisc)
-                                return;
-
-                            Assert.AreEqual(test.Tracks.Length, image.Tracks.Count, $"Tracks: {testFile}");
-
-                            image.Tracks.Select(t => t.Session).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.Session), $"Track session: {testFile}");
-
-                            image.Tracks.Select(t => t.StartSector).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.Start), $"Track start: {testFile}");
-
-                            image.Tracks.Select(t => t.EndSector).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.End), $"Track end: {testFile}");
-
-                            image.Tracks.Select(t => t.Pregap).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.Pregap), $"Track pregap: {testFile}");
-
-                            int trackNo = 0;
-
-                            byte?[] flags           = new byte?[image.Tracks.Count];
-                            ulong   latestEndSector = 0;
-
-                            foreach(Track currentTrack in image.Tracks)
-                            {
-                                if(currentTrack.EndSector > latestEndSector)
-                                    latestEndSector = currentTrack.EndSector;
-
-                                if(image.Info.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
-                                {
-                                    ErrorNumber errno =
-                                        image.ReadSectorTag(currentTrack.Sequence, SectorTagType.CdTrackFlags,
-                                                            out byte[] tmp);
-
-                                    if(errno != ErrorNumber.NoError)
-                                        continue;
-
-                                    flags[trackNo] = tmp[0];
-                                }
-
-                                trackNo++;
-                            }
-
-                            flags.Should().BeEquivalentTo(test.Tracks.Select(s => s.Flags), $"Track flags: {testFile}");
-
-                            Assert.AreEqual(latestEndSector, image.Info.Sectors - 1,
-                                            $"Last sector for tracks is {latestEndSector}, but it is {image.Info.Sectors} for image");
-                        });
-                    }
-                }
-            });
-        }
-
-        [Test]
-        public void Contents()
-        {
-            Environment.CurrentDirectory = DataFolder;
-
-            Assert.Multiple(() =>
-            {
-                foreach(OpticalImageTestExpected test in Tests)
-                {
-                    string testFile = test.TestFile;
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var image = Activator.CreateInstance(_plugin.GetType()) as IOpticalMediaImage;
-                    Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
-
-                    ErrorNumber opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    using(new AssertionScope())
-                    {
-                        Assert.Multiple(() =>
-                        {
-                            foreach(TrackInfoTestExpected track in test.Tracks)
-                            {
-                                if(track.FileSystems is null)
-                                    continue;
-
-                                ulong trackStart = track.Start + track.Pregap;
-
-                                if(track.Number == 1 &&
-                                   track.Pregap >= 150)
-                                    trackStart -= 150;
-
-                                var partition = new Partition
-                                {
-                                    Length = track.End - trackStart + 1,
-                                    Start  = trackStart
-                                };
-
-                                Core.Filesystems.Identify(image, out List<string> idPlugins, partition);
-
-                                Assert.AreEqual(track.FileSystems.Length, idPlugins.Count,
-                                                $"Expected {track.FileSystems.Length} filesystems in {testFile} but found {idPlugins.Count}");
-
-                                for(int i = 0; i < track.FileSystems.Length; i++)
-                                {
-                                    PluginBase plugins = GetPluginBase.Instance;
-                                    bool found = plugins.PluginsList.TryGetValue(idPlugins[i], out IFilesystem plugin);
-
-                                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                                    // It is not the case, it changes
-                                    if(!found)
-                                        continue;
-
-                                    var fs = Activator.CreateInstance(plugin.GetType()) as IFilesystem;
-
-                                    Assert.NotNull(fs, $"Could not instantiate filesystem for {testFile}");
-
-                                    fs.GetInformation(image, partition, out _, null);
-
-                                    if(track.FileSystems[i].ApplicationId != null)
-                                        Assert.AreEqual(track.FileSystems[i].ApplicationId,
-                                                        fs.XmlFsType.ApplicationIdentifier,
-                                                        $"Application ID: {testFile}");
-
-                                    Assert.AreEqual(track.FileSystems[i].Bootable, fs.XmlFsType.Bootable,
-                                                    $"Bootable: {testFile}");
-
-                                    Assert.AreEqual(track.FileSystems[i].Clusters, fs.XmlFsType.Clusters,
-                                                    $"Clusters: {testFile}");
-
-                                    Assert.AreEqual(track.FileSystems[i].ClusterSize, fs.XmlFsType.ClusterSize,
-                                                    $"Cluster size: {testFile}");
-
-                                    if(track.FileSystems[i].SystemId != null)
-                                        Assert.AreEqual(track.FileSystems[i].SystemId, fs.XmlFsType.SystemIdentifier,
-                                                        $"System ID: {testFile}");
-
-                                    Assert.AreEqual(track.FileSystems[i].Type, fs.XmlFsType.Type,
-                                                    $"Filesystem type: {testFile}");
-
-                                    Assert.AreEqual(track.FileSystems[i].VolumeName, fs.XmlFsType.VolumeName,
-                                                    $"Volume name: {testFile}");
-
-                                    Assert.AreEqual(track.FileSystems[i].VolumeSerial, fs.XmlFsType.VolumeSerial,
-                                                    $"Volume serial: {testFile}");
-
-                                    var rofs = Activator.CreateInstance(plugin.GetType()) as IReadOnlyFilesystem;
-
-                                    if(rofs == null)
-                                    {
-                                        if(track.FileSystems[i].Contents     != null ||
-                                           track.FileSystems[i].ContentsJson != null ||
-                                           File.Exists($"{testFile}.track{track.Number}.filesystem{i}.contents.json"))
-                                            Assert.NotNull(rofs,
-                                                           $"Could not instantiate filesystem for {testFile}, track {track.Number}, filesystem {i}");
-
-                                        continue;
-                                    }
-
-                                    track.FileSystems[i].Encoding ??= Encoding.ASCII;
-
-                                    ErrorNumber ret = rofs.Mount(image, partition, track.FileSystems[i].Encoding, null,
-                                                                 track.FileSystems[i].Namespace);
-
-                                    Assert.AreEqual(ErrorNumber.NoError, ret, $"Unmountable: {testFile}");
-
-                                    var serializer = new JsonSerializer
-                                    {
-                                        Formatting        = Formatting.Indented,
-                                        MaxDepth          = 16384,
-                                        NullValueHandling = NullValueHandling.Ignore
-                                    };
-
-                                    serializer.Converters.Add(new StringEnumConverter());
-
-                                    if(track.FileSystems[i].ContentsJson != null)
-                                    {
-                                        track.FileSystems[i].Contents =
-                                            serializer.
-                                                Deserialize<
-                                                    Dictionary<string,
-                                                        FileData>>(new JsonTextReader(new StringReader(track.
-                                                                       FileSystems[i].ContentsJson)));
-                                    }
-                                    else if(File.Exists($"{testFile}.track{track.Number}.filesystem{i}.contents.json"))
-                                    {
-                                        var sr =
-                                            new
-                                                StreamReader($"{testFile}.track{track.Number}.filesystem{i}.contents.json");
-
-                                        track.FileSystems[i].Contents =
-                                            serializer.
-                                                Deserialize<Dictionary<string, FileData>>(new JsonTextReader(sr));
-                                    }
-
-                                    if(track.FileSystems[i].Contents is null)
-                                        continue;
-
-                                    ReadOnlyFilesystemTest.TestDirectory(rofs, "/", track.FileSystems[i].Contents,
-                                                                         testFile, false);
-
-                                    // Uncomment to generate JSON file
-                                    /*    var contents = ReadOnlyFilesystemTest.BuildDirectory(rofs, "/");
-
-                                        var sw = new StreamWriter($"{testFile}.track{track.Number}.filesystem{i}.contents.json");
-                                        serializer.Serialize(sw, contents);
-                                        sw.Close();*/
-                                }
-                            }
-                        });
-                    }
-                }
-            });
-        }
-
-        [Test]
-        public void Hashes()
-        {
-            Environment.CurrentDirectory = Environment.CurrentDirectory = DataFolder;
-            ErrorNumber errno;
-
-            Assert.Multiple(() =>
-            {
-                Parallel.For(0L, Tests.Length, (i, state) =>
-                {
-                    string testFile = Tests[i].TestFile;
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        return;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var image = Activator.CreateInstance(_plugin.GetType()) as IOpticalMediaImage;
-                    Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
-
-                    ErrorNumber opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        return;
-
-                    Md5Context ctx;
-
-                    if(image.Info.XmlMediaType == XmlMediaType.OpticalDisc)
-                    {
-                        foreach(bool @long in new[]
-                        {
-                            false, true
-                        })
-                        {
-                            ctx = new Md5Context();
-
-                            foreach(Track currentTrack in image.Tracks)
-                            {
-                                ulong sectors     = currentTrack.EndSector - currentTrack.StartSector + 1;
-                                ulong doneSectors = 0;
-
-                                while(doneSectors < sectors)
-                                {
-                                    byte[] sector;
-
-                                    if(sectors - doneSectors >= SECTORS_TO_READ)
-                                    {
-                                        errno = @long ? image.ReadSectorsLong(doneSectors, SECTORS_TO_READ,
-                                                                              currentTrack.Sequence, out sector)
-                                                    : image.ReadSectors(doneSectors, SECTORS_TO_READ,
-                                                                        currentTrack.Sequence,
-                                                                        out sector);
-
-                                        doneSectors += SECTORS_TO_READ;
-                                    }
-                                    else
-                                    {
-                                        errno = @long ? image.ReadSectorsLong(doneSectors,
-                                                                              (uint)(sectors - doneSectors),
-                                                                              currentTrack.Sequence, out sector)
-                                                    : image.ReadSectors(doneSectors, (uint)(sectors - doneSectors),
-                                                                        currentTrack.Sequence, out sector);
-
-                                        doneSectors += sectors - doneSectors;
-                                    }
-
-                                    Assert.AreEqual(ErrorNumber.NoError, errno);
-
-                                    ctx.Update(sector);
-                                }
-                            }
-
-                            Assert.AreEqual(@long ? Tests[i].LongMD5 : Tests[i].MD5, ctx.End(),
-                                            $"{(@long ? "Long hash" : "Hash")}: {testFile}");
-                        }
-
-                        if(!image.Info.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                        if(image.Info.XmlMediaType != XmlMediaType.OpticalDisc)
                             return;
 
+                        Assert.AreEqual(test.Tracks.Length, image.Tracks.Count, $"Tracks: {testFile}");
+
+                        image.Tracks.Select(t => t.Session).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.Session), $"Track session: {testFile}");
+
+                        image.Tracks.Select(t => t.StartSector).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.Start), $"Track start: {testFile}");
+
+                        image.Tracks.Select(t => t.EndSector).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.End), $"Track end: {testFile}");
+
+                        image.Tracks.Select(t => t.Pregap).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.Pregap), $"Track pregap: {testFile}");
+
+                        int trackNo = 0;
+
+                        byte?[] flags           = new byte?[image.Tracks.Count];
+                        ulong   latestEndSector = 0;
+
+                        foreach(Track currentTrack in image.Tracks)
+                        {
+                            if(currentTrack.EndSector > latestEndSector)
+                                latestEndSector = currentTrack.EndSector;
+
+                            if(image.Info.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
+                            {
+                                ErrorNumber errno =
+                                    image.ReadSectorTag(currentTrack.Sequence, SectorTagType.CdTrackFlags,
+                                                        out byte[] tmp);
+
+                                if(errno != ErrorNumber.NoError)
+                                    continue;
+
+                                flags[trackNo] = tmp[0];
+                            }
+
+                            trackNo++;
+                        }
+
+                        flags.Should().BeEquivalentTo(test.Tracks.Select(s => s.Flags), $"Track flags: {testFile}");
+
+                        Assert.AreEqual(latestEndSector, image.Info.Sectors - 1,
+                                        $"Last sector for tracks is {latestEndSector}, but it is {image.Info.Sectors} for image");
+                    });
+                }
+            }
+        });
+    }
+
+    [Test]
+    public void Contents()
+    {
+        Environment.CurrentDirectory = DataFolder;
+
+        Assert.Multiple(() =>
+        {
+            foreach(OpticalImageTestExpected test in Tests)
+            {
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var image = Activator.CreateInstance(_plugin.GetType()) as IOpticalMediaImage;
+                Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
+
+                ErrorNumber opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                using(new AssertionScope())
+                {
+                    Assert.Multiple(() =>
+                    {
+                        foreach(TrackInfoTestExpected track in test.Tracks)
+                        {
+                            if(track.FileSystems is null)
+                                continue;
+
+                            ulong trackStart = track.Start + track.Pregap;
+
+                            if(track.Number == 1 &&
+                               track.Pregap >= 150)
+                                trackStart -= 150;
+
+                            var partition = new Partition
+                            {
+                                Length = track.End - trackStart + 1,
+                                Start  = trackStart
+                            };
+
+                            Core.Filesystems.Identify(image, out List<string> idPlugins, partition);
+
+                            Assert.AreEqual(track.FileSystems.Length, idPlugins.Count,
+                                            $"Expected {track.FileSystems.Length} filesystems in {testFile} but found {idPlugins.Count}");
+
+                            for(int i = 0; i < track.FileSystems.Length; i++)
+                            {
+                                PluginBase plugins = GetPluginBase.Instance;
+                                bool found = plugins.PluginsList.TryGetValue(idPlugins[i], out IFilesystem plugin);
+
+                                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                                // It is not the case, it changes
+                                if(!found)
+                                    continue;
+
+                                var fs = Activator.CreateInstance(plugin.GetType()) as IFilesystem;
+
+                                Assert.NotNull(fs, $"Could not instantiate filesystem for {testFile}");
+
+                                fs.GetInformation(image, partition, out _, null);
+
+                                if(track.FileSystems[i].ApplicationId != null)
+                                    Assert.AreEqual(track.FileSystems[i].ApplicationId,
+                                                    fs.XmlFsType.ApplicationIdentifier,
+                                                    $"Application ID: {testFile}");
+
+                                Assert.AreEqual(track.FileSystems[i].Bootable, fs.XmlFsType.Bootable,
+                                                $"Bootable: {testFile}");
+
+                                Assert.AreEqual(track.FileSystems[i].Clusters, fs.XmlFsType.Clusters,
+                                                $"Clusters: {testFile}");
+
+                                Assert.AreEqual(track.FileSystems[i].ClusterSize, fs.XmlFsType.ClusterSize,
+                                                $"Cluster size: {testFile}");
+
+                                if(track.FileSystems[i].SystemId != null)
+                                    Assert.AreEqual(track.FileSystems[i].SystemId, fs.XmlFsType.SystemIdentifier,
+                                                    $"System ID: {testFile}");
+
+                                Assert.AreEqual(track.FileSystems[i].Type, fs.XmlFsType.Type,
+                                                $"Filesystem type: {testFile}");
+
+                                Assert.AreEqual(track.FileSystems[i].VolumeName, fs.XmlFsType.VolumeName,
+                                                $"Volume name: {testFile}");
+
+                                Assert.AreEqual(track.FileSystems[i].VolumeSerial, fs.XmlFsType.VolumeSerial,
+                                                $"Volume serial: {testFile}");
+
+                                var rofs = Activator.CreateInstance(plugin.GetType()) as IReadOnlyFilesystem;
+
+                                if(rofs == null)
+                                {
+                                    if(track.FileSystems[i].Contents     != null ||
+                                       track.FileSystems[i].ContentsJson != null ||
+                                       File.Exists($"{testFile}.track{track.Number}.filesystem{i}.contents.json"))
+                                        Assert.NotNull(rofs,
+                                                       $"Could not instantiate filesystem for {testFile}, track {track.Number}, filesystem {i}");
+
+                                    continue;
+                                }
+
+                                track.FileSystems[i].Encoding ??= Encoding.ASCII;
+
+                                ErrorNumber ret = rofs.Mount(image, partition, track.FileSystems[i].Encoding, null,
+                                                             track.FileSystems[i].Namespace);
+
+                                Assert.AreEqual(ErrorNumber.NoError, ret, $"Unmountable: {testFile}");
+
+                                var serializer = new JsonSerializer
+                                {
+                                    Formatting        = Formatting.Indented,
+                                    MaxDepth          = 16384,
+                                    NullValueHandling = NullValueHandling.Ignore
+                                };
+
+                                serializer.Converters.Add(new StringEnumConverter());
+
+                                if(track.FileSystems[i].ContentsJson != null)
+                                {
+                                    track.FileSystems[i].Contents =
+                                        serializer.
+                                            Deserialize<
+                                                Dictionary<string,
+                                                    FileData>>(new JsonTextReader(new StringReader(track.
+                                                                   FileSystems[i].ContentsJson)));
+                                }
+                                else if(File.Exists($"{testFile}.track{track.Number}.filesystem{i}.contents.json"))
+                                {
+                                    var sr =
+                                        new
+                                            StreamReader($"{testFile}.track{track.Number}.filesystem{i}.contents.json");
+
+                                    track.FileSystems[i].Contents =
+                                        serializer.
+                                            Deserialize<Dictionary<string, FileData>>(new JsonTextReader(sr));
+                                }
+
+                                if(track.FileSystems[i].Contents is null)
+                                    continue;
+
+                                ReadOnlyFilesystemTest.TestDirectory(rofs, "/", track.FileSystems[i].Contents,
+                                                                     testFile, false);
+
+                                // Uncomment to generate JSON file
+                                /*    var contents = ReadOnlyFilesystemTest.BuildDirectory(rofs, "/");
+
+                                    var sw = new StreamWriter($"{testFile}.track{track.Number}.filesystem{i}.contents.json");
+                                    serializer.Serialize(sw, contents);
+                                    sw.Close();*/
+                            }
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    [Test]
+    public void Hashes()
+    {
+        Environment.CurrentDirectory = Environment.CurrentDirectory = DataFolder;
+        ErrorNumber errno;
+
+        Assert.Multiple(() =>
+        {
+            Parallel.For(0L, Tests.Length, (i, state) =>
+            {
+                string testFile = Tests[i].TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    return;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var image = Activator.CreateInstance(_plugin.GetType()) as IOpticalMediaImage;
+                Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
+
+                ErrorNumber opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    return;
+
+                Md5Context ctx;
+
+                if(image.Info.XmlMediaType == XmlMediaType.OpticalDisc)
+                {
+                    foreach(bool @long in new[]
+                            {
+                                false, true
+                            })
+                    {
                         ctx = new Md5Context();
 
                         foreach(Track currentTrack in image.Tracks)
@@ -389,57 +344,101 @@ namespace Aaru.Tests.Images
 
                                 if(sectors - doneSectors >= SECTORS_TO_READ)
                                 {
-                                    errno = image.ReadSectorsTag(doneSectors, SECTORS_TO_READ, currentTrack.Sequence,
-                                                                 SectorTagType.CdSectorSubchannel, out sector);
+                                    errno = @long ? image.ReadSectorsLong(doneSectors, SECTORS_TO_READ,
+                                                                          currentTrack.Sequence, out sector)
+                                                : image.ReadSectors(doneSectors, SECTORS_TO_READ,
+                                                                    currentTrack.Sequence,
+                                                                    out sector);
 
                                     doneSectors += SECTORS_TO_READ;
                                 }
                                 else
                                 {
-                                    errno = image.ReadSectorsTag(doneSectors, (uint)(sectors - doneSectors),
-                                                                 currentTrack.Sequence,
-                                                                 SectorTagType.CdSectorSubchannel, out sector);
+                                    errno = @long ? image.ReadSectorsLong(doneSectors,
+                                                                          (uint)(sectors - doneSectors),
+                                                                          currentTrack.Sequence, out sector)
+                                                : image.ReadSectors(doneSectors, (uint)(sectors - doneSectors),
+                                                                    currentTrack.Sequence, out sector);
 
                                     doneSectors += sectors - doneSectors;
                                 }
 
                                 Assert.AreEqual(ErrorNumber.NoError, errno);
+
                                 ctx.Update(sector);
                             }
                         }
 
-                        Assert.AreEqual(Tests[i].SubchannelMD5, ctx.End(), $"Subchannel hash: {testFile}");
+                        Assert.AreEqual(@long ? Tests[i].LongMD5 : Tests[i].MD5, ctx.End(),
+                                        $"{(@long ? "Long hash" : "Hash")}: {testFile}");
                     }
-                    else
+
+                    if(!image.Info.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                        return;
+
+                    ctx = new Md5Context();
+
+                    foreach(Track currentTrack in image.Tracks)
                     {
-                        ctx = new Md5Context();
+                        ulong sectors     = currentTrack.EndSector - currentTrack.StartSector + 1;
                         ulong doneSectors = 0;
 
-                        while(doneSectors < image.Info.Sectors)
+                        while(doneSectors < sectors)
                         {
                             byte[] sector;
 
-                            if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
+                            if(sectors - doneSectors >= SECTORS_TO_READ)
                             {
-                                errno       =  image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
+                                errno = image.ReadSectorsTag(doneSectors, SECTORS_TO_READ, currentTrack.Sequence,
+                                                             SectorTagType.CdSectorSubchannel, out sector);
+
                                 doneSectors += SECTORS_TO_READ;
                             }
                             else
                             {
-                                errno = image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors),
-                                                          out sector);
+                                errno = image.ReadSectorsTag(doneSectors, (uint)(sectors - doneSectors),
+                                                             currentTrack.Sequence,
+                                                             SectorTagType.CdSectorSubchannel, out sector);
 
-                                doneSectors += image.Info.Sectors - doneSectors;
+                                doneSectors += sectors - doneSectors;
                             }
 
                             Assert.AreEqual(ErrorNumber.NoError, errno);
                             ctx.Update(sector);
                         }
-
-                        Assert.AreEqual(Tests[i].MD5, ctx.End(), $"Hash: {testFile}");
                     }
-                });
+
+                    Assert.AreEqual(Tests[i].SubchannelMD5, ctx.End(), $"Subchannel hash: {testFile}");
+                }
+                else
+                {
+                    ctx = new Md5Context();
+                    ulong doneSectors = 0;
+
+                    while(doneSectors < image.Info.Sectors)
+                    {
+                        byte[] sector;
+
+                        if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
+                        {
+                            errno       =  image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
+                            doneSectors += SECTORS_TO_READ;
+                        }
+                        else
+                        {
+                            errno = image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors),
+                                                      out sector);
+
+                            doneSectors += image.Info.Sectors - doneSectors;
+                        }
+
+                        Assert.AreEqual(ErrorNumber.NoError, errno);
+                        ctx.Update(sector);
+                    }
+
+                    Assert.AreEqual(Tests[i].MD5, ctx.End(), $"Hash: {testFile}");
+                }
             });
-        }
+        });
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/PowerISO/Cuesheet.cs b/Aaru.Tests/Images/PowerISO/Cuesheet.cs
index d70ab023f..cd1cdc681 100644
--- a/Aaru.Tests/Images/PowerISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/PowerISO/Cuesheet.cs
@@ -32,700 +32,699 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.PowerISO
-{
-    [TestFixture]
-    public class Cuesheet : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "PowerISO", "Cuesheet");
-        public override IMediaImage _plugin => new CdrWin();
+namespace Aaru.Tests.Images.PowerISO;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Cuesheet : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "PowerISO", "Cuesheet");
+    public override IMediaImage _plugin => new CdrWin();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile  = "cdiready_the_apprentice.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 279300,
+            MD5       = "7557c72d4cf6df8bc1896388b863727a",
+            LongMD5   = "7557c72d4cf6df8bc1896388b863727a",
+            Tracks = new[]
             {
-                TestFile  = "cdiready_the_apprentice.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 279300,
-                MD5       = "7557c72d4cf6df8bc1896388b863727a",
-                LongMD5   = "7557c72d4cf6df8bc1896388b863727a",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 88799,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 88799,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279299,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_audiocd.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 247073,
+            MD5       = "c7e38c848cdaf293fc5f62df06bc574d",
+            LongMD5   = "c7e38c848cdaf293fc5f62df06bc574d",
+            Tracks = new[]
             {
-                TestFile  = "report_audiocd.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 247073,
-                MD5       = "c7e38c848cdaf293fc5f62df06bc574d",
-                LongMD5   = "c7e38c848cdaf293fc5f62df06bc574d",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrom.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 254265,
+            MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
             {
-                TestFile  = "report_cdrom.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 254265,
-                MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_cdrw.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 308224,
-                MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            /* These images are corrupted by PowerISO beyond repair
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v1.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 0,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v2.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 0,
-                MD5       = "UNKNOWN",
-                LongMD5   = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            */
-            /* This image is invalid and impossible to process properly due to a bug in PowerISO
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_enhancedcd.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 303316,
-                MD5       = "945f0230f2bb461b036282b6fae0e303",
-                LongMD5   = "8626728920d2caad7832c74518aece35",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15511,
-                        End     = 33958,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 234179,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            */
-            /* This image is marked all as MODE2 tracks when they are MODE1 and Audio. PowerISO does not end to amaze me */
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multi_karaoke_sampler.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 329158,
-                MD5       = "b91d0e8e6b486051734134dc009d8c0a",
-                LongMD5   = "b91d0e8e6b486051734134dc009d8c0a",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1887,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 4
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrw.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 308224,
+            MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        /* These images are corrupted by PowerISO beyond repair
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v1.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 0,
+            MD5       = "UNKNOWN",
+            LongMD5   = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v2.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 0,
+            MD5       = "UNKNOWN",
+            LongMD5   = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        */
+        /* This image is invalid and impossible to process properly due to a bug in PowerISO
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_enhancedcd.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 303316,
+            MD5       = "945f0230f2bb461b036282b6fae0e303",
+            LongMD5   = "8626728920d2caad7832c74518aece35",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15511,
+                    End     = 33958,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 234179,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        */
+        /* This image is marked all as MODE2 tracks when they are MODE1 and Audio. PowerISO does not end to amaze me */
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multi_karaoke_sampler.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 329158,
+            MD5       = "b91d0e8e6b486051734134dc009d8c0a",
+            LongMD5   = "b91d0e8e6b486051734134dc009d8c0a",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1887,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 4
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/HyperV.cs b/Aaru.Tests/Images/QEMU/HyperV.cs
index db84fdc67..bfb5bc754 100644
--- a/Aaru.Tests/Images/QEMU/HyperV.cs
+++ b/Aaru.Tests/Images/QEMU/HyperV.cs
@@ -32,33 +32,32 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class HyperV : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "Hyper-V");
-        public override IMediaImage _plugin => new Vhdx();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class HyperV : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "Hyper-V");
+    public override IMediaImage _plugin => new Vhdx();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "vhdx.vhdx.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
+            Partitions = new[]
             {
-                TestFile   = "vhdx.vhdx.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 63,
+                    Length = 251841
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/Parallels.cs b/Aaru.Tests/Images/QEMU/Parallels.cs
index ee3068f7d..383b546a6 100644
--- a/Aaru.Tests/Images/QEMU/Parallels.cs
+++ b/Aaru.Tests/Images/QEMU/Parallels.cs
@@ -31,33 +31,32 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class Parallels : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "Parallels");
-        public override IMediaImage _plugin => new DiscImages.Parallels();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Parallels : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "Parallels");
+    public override IMediaImage _plugin => new DiscImages.Parallels();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "parallels.hdd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
+            Partitions = new[]
             {
-                TestFile   = "parallels.hdd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 63,
+                    Length = 251841
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/QCOW.cs b/Aaru.Tests/Images/QEMU/QCOW.cs
index 801a27976..a63bddf7a 100644
--- a/Aaru.Tests/Images/QEMU/QCOW.cs
+++ b/Aaru.Tests/Images/QEMU/QCOW.cs
@@ -32,33 +32,32 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class QCOW : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write");
-        public override IMediaImage _plugin => new Qcow();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class QCOW : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write");
+    public override IMediaImage _plugin => new Qcow();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "qcow.qc.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
+            Partitions = new[]
             {
-                TestFile   = "qcow.qc.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 63,
+                    Length = 251841
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/QCOW2.cs b/Aaru.Tests/Images/QEMU/QCOW2.cs
index 42550249f..2751a8ed2 100644
--- a/Aaru.Tests/Images/QEMU/QCOW2.cs
+++ b/Aaru.Tests/Images/QEMU/QCOW2.cs
@@ -32,49 +32,48 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class QCOW2 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write 2");
-        public override IMediaImage _plugin => new Qcow2();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class QCOW2 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write 2");
+    public override IMediaImage _plugin => new Qcow2();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "qcow2.qc2.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
+            Partitions = new[]
             {
-                TestFile   = "qcow2.qc2.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "qcow2_compressed.qc2.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 63,
+                    Length = 251841
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "qcow2_compressed.qc2.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 63,
+                    Length = 251841
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/QCOW3.cs b/Aaru.Tests/Images/QEMU/QCOW3.cs
index 9e42b97d9..2cd4f8011 100644
--- a/Aaru.Tests/Images/QEMU/QCOW3.cs
+++ b/Aaru.Tests/Images/QEMU/QCOW3.cs
@@ -32,49 +32,48 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class QCOW3 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write 3");
-        public override IMediaImage _plugin => new Qcow2();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class QCOW3 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Copy On Write 3");
+    public override IMediaImage _plugin => new Qcow2();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "qcow3.qc2.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
+            Partitions = new[]
             {
-                TestFile   = "qcow3.qc2.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "qcow3_compressed.qc2.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 63,
+                    Length = 251841
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "qcow3_compressed.qc2.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 63,
+                    Length = 251841
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/QED.cs b/Aaru.Tests/Images/QEMU/QED.cs
index e7d508531..0e8e7cc5d 100644
--- a/Aaru.Tests/Images/QEMU/QED.cs
+++ b/Aaru.Tests/Images/QEMU/QED.cs
@@ -32,33 +32,32 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class QED : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Enhanced Disk");
-        public override IMediaImage _plugin => new Qed();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class QED : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "QEMU Enhanced Disk");
+    public override IMediaImage _plugin => new Qed();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "qed.qed.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
+            Partitions = new[]
             {
-                TestFile   = "qed.qed.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 63,
+                    Length = 251841
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/Raw.cs b/Aaru.Tests/Images/QEMU/Raw.cs
index c9c90c755..b21fd2c08 100644
--- a/Aaru.Tests/Images/QEMU/Raw.cs
+++ b/Aaru.Tests/Images/QEMU/Raw.cs
@@ -32,32 +32,31 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class Raw : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "raw");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Raw : BlockMediaImageTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "raw");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "raw.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
+            Partitions = new[]
             {
-                TestFile   = "raw.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 63,
+                    Length = 251841
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/VMware5.cs b/Aaru.Tests/Images/QEMU/VMware5.cs
index 7a2c76e1b..9dad33164 100644
--- a/Aaru.Tests/Images/QEMU/VMware5.cs
+++ b/Aaru.Tests/Images/QEMU/VMware5.cs
@@ -32,33 +32,32 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class VMware5 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VMware 5");
-        public override IMediaImage _plugin => new VMware();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class VMware5 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VMware 5");
+    public override IMediaImage _plugin => new VMware();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "vmdk5.vmdk.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "1ad282643cc7f97c57dc874b3d4ece9b",
+            Partitions = new[]
             {
-                TestFile   = "vmdk5.vmdk.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "1ad282643cc7f97c57dc874b3d4ece9b",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 63,
+                    Length = 251841
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/VMware6.cs b/Aaru.Tests/Images/QEMU/VMware6.cs
index d7ad4f049..06336dc2b 100644
--- a/Aaru.Tests/Images/QEMU/VMware6.cs
+++ b/Aaru.Tests/Images/QEMU/VMware6.cs
@@ -32,33 +32,32 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class VMware6 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VMware 6");
-        public override IMediaImage _plugin => new VMware();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class VMware6 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VMware 6");
+    public override IMediaImage _plugin => new VMware();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "vmdk6.vmdk.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "1ad282643cc7f97c57dc874b3d4ece9b",
+            Partitions = new[]
             {
-                TestFile   = "vmdk6.vmdk.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "1ad282643cc7f97c57dc874b3d4ece9b",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 63,
+                    Length = 251841
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/VirtualBox.cs b/Aaru.Tests/Images/QEMU/VirtualBox.cs
index e0505c6d8..d95dfa612 100644
--- a/Aaru.Tests/Images/QEMU/VirtualBox.cs
+++ b/Aaru.Tests/Images/QEMU/VirtualBox.cs
@@ -32,33 +32,32 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class VirtualBox : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VirtualBox");
-        public override IMediaImage _plugin => new Vdi();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class VirtualBox : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VirtualBox");
+    public override IMediaImage _plugin => new Vdi();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "virtualbox.vdi.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 251904,
+            SectorSize = 512,
+            MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
+            Partitions = new[]
             {
-                TestFile   = "virtualbox.vdi.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 251904,
-                SectorSize = 512,
-                MD5        = "4bfc9e9e2dd86aa52ef709e77d2617ed",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 63,
+                    Length = 251841
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/QEMU/VirtualPC.cs b/Aaru.Tests/Images/QEMU/VirtualPC.cs
index 9dd1c6382..3bfc7f24a 100644
--- a/Aaru.Tests/Images/QEMU/VirtualPC.cs
+++ b/Aaru.Tests/Images/QEMU/VirtualPC.cs
@@ -32,65 +32,64 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.QEMU
-{
-    [TestFixture]
-    public class VirtualPC : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VirtualPC");
-        public override IMediaImage _plugin => new Vhd();
+namespace Aaru.Tests.Images.QEMU;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class VirtualPC : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "QEMU", "VirtualPC");
+    public override IMediaImage _plugin => new Vhd();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "qemu_dynamic_250mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 512064,
+            SectorSize = 512,
+            MD5        = "26d2745c1d614207b4bce4ee003c326d",
+            Partitions = new[]
             {
-                TestFile   = "qemu_dynamic_250mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 512064,
-                SectorSize = 512,
-                MD5        = "26d2745c1d614207b4bce4ee003c326d",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 512064
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "qemu_fixed_10mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 20536,
-                SectorSize = 512,
-                MD5        = "adfad4fb019f157e868baa39e7753db7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 20536
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "virtualpc.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 251940,
-                SectorSize = 512,
-                MD5        = "7126d647c1cefc5a81b4140e10f50269",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 251841
-                    }
+                    Start  = 0,
+                    Length = 512064
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "qemu_fixed_10mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 20536,
+            SectorSize = 512,
+            MD5        = "adfad4fb019f157e868baa39e7753db7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 20536
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "virtualpc.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 251940,
+            SectorSize = 512,
+            MD5        = "7126d647c1cefc5a81b4140e10f50269",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 63,
+                    Length = 251841
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/RayDIM.cs b/Aaru.Tests/Images/RayDIM.cs
index cec23aa51..e499200b6 100644
--- a/Aaru.Tests/Images/RayDIM.cs
+++ b/Aaru.Tests/Images/RayDIM.cs
@@ -32,3059 +32,3058 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class RayDIM : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Disk IMage Archiver");
-        public override IMediaImage _plugin => new RayDim();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class RayDIM : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Disk IMage Archiver");
+    public override IMediaImage _plugin => new RayDim();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "5f1dd8.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 336,
-                SectorSize = 512,
-                MD5        = "c109e802e65365245dedd1737ec65c92"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5f1dd8_pass.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 336,
-                SectorSize = 512,
-                MD5        = "d6eb723ac53eb469f64d8df69efef3dd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 336
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5f1dd.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 378,
-                SectorSize = 512,
-                MD5        = "a327c34060570e1a917eb1d88716a11a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5f1dd_pass.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 378,
-                SectorSize = 512,
-                MD5        = "b9807f1c25bf472633e7e80fa947a4d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 378
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5f2dd8.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 672,
-                SectorSize = 512,
-                MD5        = "8b9e6662ef25a08d167f7ec4436efac8"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5f2dd8_pass.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 672,
-                SectorSize = 512,
-                MD5        = "532694cde41f1553587b65c528bc185b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 672
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5f2dd.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 756,
-                SectorSize = 512,
-                MD5        = "a0b2aa16acaab9f521dff74ba93485ae"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5f2dd_pass.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 756,
-                SectorSize = 512,
-                MD5        = "934e3a0f07410d0f4750f2beb3ce48f1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 756
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5f2hd.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "78819708381987b3120fc777a5f08f2d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5f2hd_pass.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "37dbeabaf72384870284ccd102b85eb7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2460
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0000.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "e8bbbd22db87181974e12ba0227ea011"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0001.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "9f5635f3df4d880a500910b0ad1ab535"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0009.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "95ea232f59e44db374b994cfe7f1c07f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0010.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "9e2b01f4397db2a6c76e2bc267df37b3"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0012.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "656002e6e620cb3b73c27f4c21d32edb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0013.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "1244cc2c101c66e6bb4ad5183b356b19"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0017.DIM.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "8cad624afc06ab756f9800eba22ee886"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0018.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "84cce7b4d8c8e21040163cd2d03a730c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0020.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "d236783dfd1dc29f350c51949b1e9e68"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0021.DIM.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "6915f208cdda762eea2fe64ad754e72f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0024.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2302991363cb3681cffdc4388915b51e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0025.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "4e4cafed1cc22ea72201169427e5e1b6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0028.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1a4c7487382c98b7bc74623ddfb488e6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0030.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "af83d011608042d35021e39aa5e10b2f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0035.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6642c1a32d2c58e93481d664974fc202",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0036.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "846f01b8b60cb3c775bd66419e977926",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0037.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "5101f89850dc28efbcfb7622086a9ddf",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0038.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "8e570be2ed1f00ddea82e50a2d9c446a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0039.DIM.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "abba2a1ddd60a649047a9c44d94bbeae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0040.DIM.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "e3bc48bec81be5b35be73d41fdffd2ab",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0041.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "43b5068af9d016d1432eb2e12d2b802a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0042.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "5bf2ad4dc300592604b6e32f8b8e2656",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0043.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "cb9a832ca6a4097b8ccc30d2108e1f7d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0044.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "56d181a6bb8713e6b2854fe8887faab6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0045.DIM.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "41aef7cff26aefda1add8d49c5b962c2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0046.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "2437c5f089f1cba3866b36360b016f16",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2460
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0047.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_8,
-                Sectors    = 1280,
-                SectorSize = 512,
-                MD5        = "bdaa8f17373b265830fdf3a06b794367",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0048.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "629932c285478d0540ff7936aa008351",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0049.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "7a2abef5d4701e2e49abb05af8d4da50",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1476
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0050.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "e3507522c914264f44fb2c92c3170c09",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0051.DIM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "824fe65dbb1a42b6b94f05405ef984f2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0052.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "1a8c2e78e7132cf9ba5d6c2b75876be0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0053.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "936b20bb0966fe693b4d5e2353e24846",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0054.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "803b01a0b440c2837d37c21308f30cd5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0055.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "aa0d31f914760cc4cde75479779ebed6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0056.DIM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "31269ed6464302ae26d22b7c87bceb23",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0057.DIM.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "5e413433c54f48978d281c6e66d1106e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0058.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3528,
-                SectorSize = 512,
-                MD5        = "a7688d6be942272ce866736e6007bc46",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3528
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0059.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3528,
-                SectorSize = 512,
-                MD5        = "24a7459d080cea3a60d131b8fd7dc5d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3528
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0060.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3612,
-                SectorSize = 512,
-                MD5        = "ef0c3da4749da2f79d7d623d9b6f3d4d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3612
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0061.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 5120,
-                SectorSize = 512,
-                MD5        = "5231d2e8a99ba5f8dfd16ca1a05f40cd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 5120
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0068.DIM.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "8f91482c56161ecbf5d86f42b03b9636",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0069.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "5fc19ca552b6db957061e9a1750394d2",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0073.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "a33b46f042b78fe3d0b3c5dbb3908a93",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0074.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "565d3c001cbb532154aa5d3c65b2439c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0075.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "e60442c3ebd72c99bdd7545fdba59613",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0076.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "058a33a129539285c9b64010496af52f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0077.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "0726ecbc38965d30a6222c3e74cd1aa3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0078.DIM.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "c9a193837db7d8a5eb025eb41e8a76d7"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0080.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c38d69ac88520f14fcc6d6ced22b065d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0081.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "91d51964e1e64ef3f6f622fa19aa833c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0082.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "db36d9651c952ff679ec33223c8db2d3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0083.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3024,
-                SectorSize = 512,
-                MD5        = "952f33314fb930c2d02ef4604585c0e6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3024
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0084.DIM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "1207a1cc7ff73d4f74c8984b4e7db33f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0085.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3528,
-                SectorSize = 512,
-                MD5        = "53dfcaceed8203ee629fc7fe520e1217",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3528
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0105.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "d40a99cb549fcfb26fcf9ef01b5dfca7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0106.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 420,
-                SectorSize = 512,
-                MD5        = "6433f8fbf8dda1e307b15a4203c1a4e6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 420
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0107.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "126dfd25363c076727dfaab03955c931",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0108.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "386763ae9afde1a0a19eb4a54ba462aa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0109.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0110.DIM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a793047503af08e83361427b3e2806e0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0111.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "f01541de322c8d6d7321084d7a245e7b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0112.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0113.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0114.DIM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a793047503af08e83361427b3e2806e0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0115.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0116.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "6631b66fdfd89319323771c41334c7ba",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0117.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "56471a253f4d6803b634e2bbff6c0931",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0120.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "7d36aee5a3071ff75b979f3acb649c40",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0121.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "0ccb62039363ab544c69eca229a17fae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0122.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "7851d31fad9302ff45d3ded4fba25387",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0123.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "915b08c82591e8488320e001b7303b6d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0124.DIM.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "5e5ea6fe9adf842221fdc60e56630405",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0125.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0126.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ddc6c1200c60e9f7796280f50c2e5283",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0147.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6efa72a33021d5051546c3e0dd4c3c09"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0148.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "8b5acfd14818ff9556d3d81361ce4862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0151.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "298c377de52947c472a85d281b6d3d4d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0153.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "32975e1a2d10a360331de84682371277"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0154.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "a5dc382d75ec46434b313e289c281d8c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0157.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "3a7f25fa38019109e89051993076063a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0162.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "e63014a4299f52f22e6e2c9609f51979"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0163.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0164.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "e01d813dd6c3a49428520df40d63cadd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0166.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1c8b03a8550ed3e70e1c78316aa445aa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0168.DIM.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "0bdf9130c07bb5d558a4705249f949d0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0169.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0170.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "0c043ceba489ef80c1b7f58534af12f5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0173.DIM.lz",
-                MediaType  = MediaType.DOS_35_SS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "028769dc0abefab1740cc309432588b6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0174.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "152023525154b45ab26687190bac94db",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0175.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "db38ecd93f28dd065927fed21917eed5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0176.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "ca53f9cc4dcd04d06f5c4c3df09195ab"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0177.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fde94075cb3fd1c52af32062b0251af0"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0180.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "f206c0caa4e0eda37233ab6e89ab5493",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0181.DIM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "4375fe3d7e50a5044b4850d8542363fb",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0205.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1512,
-                SectorSize = 512,
-                MD5        = "d3106f2c989a0afcf97b63b051be8312"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0206.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "8245ddd644583bd78ac0638133c89824"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0207.DIM.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "33c51a3d6f13cfedb5f08bf4c3cba7b9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0209.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0210.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0211.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "647f14749f59be471aac04a71a079a64"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0212.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "517cdd5e42a4673f733d1aedfb46770f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0216.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "40199611e6e75bbc37ad6c52a5b77eae"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0218.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 5080,
-                SectorSize = 512,
-                MD5        = "fabacd63bd25f4c3db71523c21242bfb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0219.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 9144,
-                SectorSize = 512,
-                MD5        = "0d1a1dfa4482422ff11fea76f8cef3a9"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0220.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 13716,
-                SectorSize = 512,
-                MD5        = "a6a67106457a20b46d05f2d9b27244f1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0222.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "85574aebeef03eb355bf8541955d06ea"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0232.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 630,
-                SectorSize = 512,
-                MD5        = "53a50481d90228f527b72f058de257da",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 630
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0245.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "0d71b4952dadbfb1061acc1f4640c787"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0246.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "af7ac6b5b9d2d57dad22dbb64ef7de38"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0262.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "5ac0a9fc7337f761098f816359b0f6f7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0263.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "1ea6ec8e663218b1372048f6e25795b5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0264.DIM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "77a1167b1b9043496e32b8578cde0ff0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0265.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1680,
-                SectorSize = 512,
-                MD5        = "2b2c891ef5edee8518a1ae2ed3ab71a0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1680
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0266.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "32c044c5c2b0bd13806149a759c14935",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0267.DIM.lz",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "8752095abc13dba3f3467669da333891",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3040
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0268.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "aece7cd34bbba3e75307fa70404d9d30",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0269.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3280,
-                SectorSize = 512,
-                MD5        = "5289afb16a6e4a33213e3bcca56c6230",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3280
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0270.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "092308e5df684702dd0ec393b6d3563a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0271.DIM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "b96596711f4d2ee85dfda0fe3b9f26c3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0272.DIM.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "a4f461af7fda5e93a7ab63fcbb7e7683",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0273.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3528,
-                SectorSize = 512,
-                MD5        = "963f3aa8d4468d4373054f842d0e2245",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3528
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0280.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "4feeaf4b4ee5dad85db727fbbda4b6d1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0281.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "3c77ca681df78e4cd7baa162aa9b0859",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0282.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "51da1f86c49657ffdb367bb2ddeb7990",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0283.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "b81a4987f89936630b8ebc62e4bbce6e"
-                /* TODO: IndexOutOfRangeException
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0284.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "f76f92dd326c99c5efad5ee58daf72e1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0285.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "b6f2c10e42908e334025bc4ffd81e771",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0287.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "f2f409ea2a62a7866fd2777cc4fc9739",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0288.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1512,
-                SectorSize = 512,
-                MD5        = "be89d2aab865a1217a3dda86e99bed97",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1512
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0289.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "30a93f30dd4485c6fc037fe0775d3fc7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0290.DIM.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "e0caf02cce5597c98313bcc480366ec7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0299.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "39bf5a98bcb2185d855ac06378febcfa",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0300.DIM.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "dc20055b6e6fd6f8e1114d4be2effeed",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0301.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "56af9256cf71d5aac5fd5d363674bc49",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0302.DIM.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "bbba1e2d1418e05c3a4e7b4d585d160b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0303.DIM.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "bca3a045e81617f7f5ebb5a8818eac47",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0304.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "a296663cb8e75e94603221352f29cfff",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0305.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ecda36ebf0e1100233cb0ec722c18583",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0307.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "cef2f4fe9b1a32d5c0544f814e634264",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0308.DIM.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "bbe58e26b8f8f822cd3edfd37a4e4924",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0311.DIM.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "b9b6ebdf711364c979de7cf70c3a438a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0314.DIM.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "d37424f367f545acbb397f2bed766843",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0316.DIM.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "9963dd6f19ce6bd56eabeccdfbbd821a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0317.DIM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "acf6604559ae8217f7869823e2429024",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0318.DIM.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "23bf2139cdfdc4c16db058fd31ea6481",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0319.DIM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "fa26adda0415f02057b113ad29c80c8d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0320.DIM.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "4f2a8d036fefd6c6c88d99eda3aa12b7",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DSKA0322.DIM.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1404,
-                SectorSize = 512,
-                MD5        = "1f6a23974b29d525706a2b0228325656",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1404
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd8.dim.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "d81f5cb64fd0b99f138eab34110bbc3c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd.dim.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "a89006a75d13bee9202d1d6e52721ccb",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd_fdformat_f200.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "e1ad4a022778d7a0b24a93d8e68a59dc",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd_fdformat_f205.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 420,
-                SectorSize = 512,
-                MD5        = "56a95fcf1d6f5c3108a17207b53ec07c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 420
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd8.dim.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "beef1cdb004dc69391d6b3d508988b95",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd.dim.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "6213897b7dbf263f12abf76901d43862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f400.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "0aef12c906b744101b932d799ca88a78",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f410.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "e7367df9998de0030a97b5131d1bed20",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f720.dim.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1c36b819cfe355c11360bc120c9216fe",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f800.dim.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "25114403c11e337480e2afc4e6e32108",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f820.dim.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "3d7760ddaa55cd258057773d15106b78",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_freedos_800s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "29054ef703394ee3b35e849468a412ba",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_maxiform_1640s.dim.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "c91e852828c2aeee2fc94a6adbeed0ae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_maxiform_840s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "efb6cfe53a6770f0ae388cb2c7f46264",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1476s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "6116f7c1397cadd55ba8d79c2aadc9dd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1476
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1600s.dim.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "93100f8d86e5d0d0e6340f59c52a5e0d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1640s.dim.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "cf7b7d43aa70863bedcc4a8432a5af67",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd.dim.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_fdformat_f144.dim.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "073a172879a71339ef4b00ebb47b67fc",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_fdformat_f148.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "d9890897130d0fc1eee3dbf4d9b0440f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_maxiform_2788s.dim.lz",
-                MediaType  = MediaType.FDFORMAT_525_HD,
-                Sectors    = 2788,
-                SectorSize = 512,
-                MD5        = "09ca721aa883d5bbaa422c7943b0782c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2788
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_alt.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "259ff90e41e60682d948dd7d6af89735"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_alt_pass.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "b40f8273fa7492bfe71c3d743269b97c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1476
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.dim.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "9827ba1b3e9cac41263caabd862e78f9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_f800.dim.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "67d299c6e83f3f0fbcb8faa9ffa422c1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_f820.dim.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "81d3bfec7b201f6a4503eb24c4394d4a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos_1600s.dim.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "d07f7ffaee89742c6477aaaf94eb5715",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_maxiform_1600s.dim.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "56af87802a9852e6e01e08d544740816",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1494s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1512,
-                SectorSize = 512,
-                MD5        = "34b7b99ef6fba2235eedbd8ae406d7d3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1512
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1600s.dim.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "d9db52d992a76bf3bbc626ff844215a5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1660s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1680,
-                SectorSize = 512,
-                MD5        = "3b74e367926181152c3499de8dd9b914",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1680
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 5904,
-                SectorSize = 512,
-                MD5        = "82825116ffe6d68b4d920ad4875bd709"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed_pass.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 5904,
-                SectorSize = 512,
-                MD5        = "e7cdd1123b08eac4e9571825b1f6172f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 5904
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_alt.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "3b16537076c5517306dc672f8f1e376e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_alt_pass.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "022893d7766205894fca41bcde3c9f6c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.dim.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "1d32a686b7675c7a4f88c15522738432"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_dmf.dim.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "084d4d75f5e780cb9ec66a2fa784c371",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_f168.dim.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "1e06f21a1c11ea3347212da115bca08f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_f16.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "8eb8cb310feaf03c69fffd4f6e729847",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_f172.dim.lz",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "3fc3a03d049416d81f81cc3b9ea8e5de",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos_3360s.dim.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_maxiform_3200s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "3c4becd695ed25866d39966a9a93c2d9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_pass.dim.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "1d32a686b7675c7a4f88c15522738432"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2460s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "72282e11f7d91bf9c090b550fabfe80d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2460
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2720s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2720,
-                SectorSize = 512,
-                MD5        = "457c1126dc7f36bbbabe9e17e90372e3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2788s.dim.lz",
-                MediaType  = MediaType.FDFORMAT_525_HD,
-                Sectors    = 2788,
-                SectorSize = 512,
-                MD5        = "852181d5913c6f290872c66bbe992314",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2788
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2880s.dim.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2980cc32504c945598dc50f1db576994",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2952s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "c1c58d74fffb3656dd7f60f74ae8a629",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2988s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3024,
-                SectorSize = 512,
-                MD5        = "67391c3750f17a806503be3f9d514b1f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3024
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3200s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "e45d41a61fbe48f328c995fcc10a5548",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3320s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "c7764476489072dd053d5ec878171423",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3360s.dim.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "15f71b92bd72aba5d80bf70eca4d5b1e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3486s.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3528,
-                SectorSize = 512,
-                MD5        = "f725bc714c3204e835e23c726ce77b89",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3528
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_alt.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3772,
-                SectorSize = 512,
-                MD5        = "02d7c237c6ac1fbcd2fbbfb45c5fb767"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_alt_pass.dim.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3772,
-                SectorSize = 512,
-                MD5        = "99f83e846c5106dd4992646726e91636",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3772
-                    }
+            TestFile   = "5f1dd8.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 336,
+            SectorSize = 512,
+            MD5        = "c109e802e65365245dedd1737ec65c92"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5f1dd8_pass.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 336,
+            SectorSize = 512,
+            MD5        = "d6eb723ac53eb469f64d8df69efef3dd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 336
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5f1dd.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 378,
+            SectorSize = 512,
+            MD5        = "a327c34060570e1a917eb1d88716a11a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5f1dd_pass.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 378,
+            SectorSize = 512,
+            MD5        = "b9807f1c25bf472633e7e80fa947a4d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 378
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5f2dd8.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 672,
+            SectorSize = 512,
+            MD5        = "8b9e6662ef25a08d167f7ec4436efac8"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5f2dd8_pass.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 672,
+            SectorSize = 512,
+            MD5        = "532694cde41f1553587b65c528bc185b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 672
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5f2dd.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 756,
+            SectorSize = 512,
+            MD5        = "a0b2aa16acaab9f521dff74ba93485ae"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5f2dd_pass.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 756,
+            SectorSize = 512,
+            MD5        = "934e3a0f07410d0f4750f2beb3ce48f1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 756
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5f2hd.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "78819708381987b3120fc777a5f08f2d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5f2hd_pass.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "37dbeabaf72384870284ccd102b85eb7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2460
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0000.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "e8bbbd22db87181974e12ba0227ea011"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0001.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "9f5635f3df4d880a500910b0ad1ab535"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0009.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "95ea232f59e44db374b994cfe7f1c07f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0010.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "9e2b01f4397db2a6c76e2bc267df37b3"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0012.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "656002e6e620cb3b73c27f4c21d32edb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0013.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "1244cc2c101c66e6bb4ad5183b356b19"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0017.DIM.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "8cad624afc06ab756f9800eba22ee886"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0018.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "84cce7b4d8c8e21040163cd2d03a730c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0020.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "d236783dfd1dc29f350c51949b1e9e68"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0021.DIM.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "6915f208cdda762eea2fe64ad754e72f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0024.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2302991363cb3681cffdc4388915b51e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0025.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "4e4cafed1cc22ea72201169427e5e1b6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0028.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1a4c7487382c98b7bc74623ddfb488e6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0030.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "af83d011608042d35021e39aa5e10b2f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0035.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6642c1a32d2c58e93481d664974fc202",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0036.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "846f01b8b60cb3c775bd66419e977926",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0037.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "5101f89850dc28efbcfb7622086a9ddf",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0038.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "8e570be2ed1f00ddea82e50a2d9c446a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0039.DIM.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "abba2a1ddd60a649047a9c44d94bbeae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0040.DIM.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "e3bc48bec81be5b35be73d41fdffd2ab",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0041.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "43b5068af9d016d1432eb2e12d2b802a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0042.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "5bf2ad4dc300592604b6e32f8b8e2656",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0043.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "cb9a832ca6a4097b8ccc30d2108e1f7d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0044.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "56d181a6bb8713e6b2854fe8887faab6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0045.DIM.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "41aef7cff26aefda1add8d49c5b962c2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0046.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "2437c5f089f1cba3866b36360b016f16",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2460
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0047.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_8,
+            Sectors    = 1280,
+            SectorSize = 512,
+            MD5        = "bdaa8f17373b265830fdf3a06b794367",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0048.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "629932c285478d0540ff7936aa008351",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0049.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "7a2abef5d4701e2e49abb05af8d4da50",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1476
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0050.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "e3507522c914264f44fb2c92c3170c09",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0051.DIM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "824fe65dbb1a42b6b94f05405ef984f2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0052.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "1a8c2e78e7132cf9ba5d6c2b75876be0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0053.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "936b20bb0966fe693b4d5e2353e24846",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0054.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "803b01a0b440c2837d37c21308f30cd5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0055.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "aa0d31f914760cc4cde75479779ebed6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0056.DIM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "31269ed6464302ae26d22b7c87bceb23",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0057.DIM.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "5e413433c54f48978d281c6e66d1106e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0058.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3528,
+            SectorSize = 512,
+            MD5        = "a7688d6be942272ce866736e6007bc46",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3528
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0059.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3528,
+            SectorSize = 512,
+            MD5        = "24a7459d080cea3a60d131b8fd7dc5d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3528
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0060.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3612,
+            SectorSize = 512,
+            MD5        = "ef0c3da4749da2f79d7d623d9b6f3d4d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3612
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0061.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 5120,
+            SectorSize = 512,
+            MD5        = "5231d2e8a99ba5f8dfd16ca1a05f40cd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 5120
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0068.DIM.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "8f91482c56161ecbf5d86f42b03b9636",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0069.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "5fc19ca552b6db957061e9a1750394d2",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0073.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "a33b46f042b78fe3d0b3c5dbb3908a93",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0074.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "565d3c001cbb532154aa5d3c65b2439c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0075.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "e60442c3ebd72c99bdd7545fdba59613",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0076.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "058a33a129539285c9b64010496af52f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0077.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "0726ecbc38965d30a6222c3e74cd1aa3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0078.DIM.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "c9a193837db7d8a5eb025eb41e8a76d7"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0080.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c38d69ac88520f14fcc6d6ced22b065d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0081.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "91d51964e1e64ef3f6f622fa19aa833c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0082.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "db36d9651c952ff679ec33223c8db2d3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0083.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3024,
+            SectorSize = 512,
+            MD5        = "952f33314fb930c2d02ef4604585c0e6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3024
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0084.DIM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "1207a1cc7ff73d4f74c8984b4e7db33f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0085.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3528,
+            SectorSize = 512,
+            MD5        = "53dfcaceed8203ee629fc7fe520e1217",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3528
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0105.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "d40a99cb549fcfb26fcf9ef01b5dfca7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0106.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 420,
+            SectorSize = 512,
+            MD5        = "6433f8fbf8dda1e307b15a4203c1a4e6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 420
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0107.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "126dfd25363c076727dfaab03955c931",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0108.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "386763ae9afde1a0a19eb4a54ba462aa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0109.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0110.DIM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a793047503af08e83361427b3e2806e0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0111.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "f01541de322c8d6d7321084d7a245e7b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0112.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0113.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "7973e569ed93beb1ece2e84a5ef3a8d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0114.DIM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a793047503af08e83361427b3e2806e0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0115.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "ba6ec1652ff41bcc687aaf9c4e32dc18",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0116.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "6631b66fdfd89319323771c41334c7ba",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0117.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "56471a253f4d6803b634e2bbff6c0931",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0120.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "7d36aee5a3071ff75b979f3acb649c40",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0121.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "0ccb62039363ab544c69eca229a17fae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0122.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "7851d31fad9302ff45d3ded4fba25387",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0123.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "915b08c82591e8488320e001b7303b6d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0124.DIM.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "5e5ea6fe9adf842221fdc60e56630405",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0125.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "a22e254f7e3526ec30dc4915a19fcb52",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0126.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ddc6c1200c60e9f7796280f50c2e5283",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0147.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6efa72a33021d5051546c3e0dd4c3c09"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0148.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "8b5acfd14818ff9556d3d81361ce4862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0151.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "298c377de52947c472a85d281b6d3d4d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0153.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "32975e1a2d10a360331de84682371277"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0154.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "a5dc382d75ec46434b313e289c281d8c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0157.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "3a7f25fa38019109e89051993076063a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0162.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "e63014a4299f52f22e6e2c9609f51979"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0163.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "be05d1ff10ef8b2220546c4db962ac9e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0164.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "e01d813dd6c3a49428520df40d63cadd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0166.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1c8b03a8550ed3e70e1c78316aa445aa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0168.DIM.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "0bdf9130c07bb5d558a4705249f949d0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0169.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2dafeddaa99e7dc0db5ef69e128f9c8e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0170.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "0c043ceba489ef80c1b7f58534af12f5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0173.DIM.lz",
+            MediaType  = MediaType.DOS_35_SS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "028769dc0abefab1740cc309432588b6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0174.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "152023525154b45ab26687190bac94db",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0175.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "db38ecd93f28dd065927fed21917eed5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0176.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "ca53f9cc4dcd04d06f5c4c3df09195ab"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0177.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fde94075cb3fd1c52af32062b0251af0"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0180.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "f206c0caa4e0eda37233ab6e89ab5493",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0181.DIM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "4375fe3d7e50a5044b4850d8542363fb",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0205.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1512,
+            SectorSize = 512,
+            MD5        = "d3106f2c989a0afcf97b63b051be8312"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0206.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "8245ddd644583bd78ac0638133c89824"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0207.DIM.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "33c51a3d6f13cfedb5f08bf4c3cba7b9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0209.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0210.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0211.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "647f14749f59be471aac04a71a079a64"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0212.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "517cdd5e42a4673f733d1aedfb46770f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0216.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "40199611e6e75bbc37ad6c52a5b77eae"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0218.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 5080,
+            SectorSize = 512,
+            MD5        = "fabacd63bd25f4c3db71523c21242bfb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0219.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 9144,
+            SectorSize = 512,
+            MD5        = "0d1a1dfa4482422ff11fea76f8cef3a9"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0220.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 13716,
+            SectorSize = 512,
+            MD5        = "a6a67106457a20b46d05f2d9b27244f1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0222.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "85574aebeef03eb355bf8541955d06ea"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0232.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 630,
+            SectorSize = 512,
+            MD5        = "53a50481d90228f527b72f058de257da",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 630
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0245.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "0d71b4952dadbfb1061acc1f4640c787"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0246.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "af7ac6b5b9d2d57dad22dbb64ef7de38"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0262.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "5ac0a9fc7337f761098f816359b0f6f7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0263.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "1ea6ec8e663218b1372048f6e25795b5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0264.DIM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "77a1167b1b9043496e32b8578cde0ff0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0265.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1680,
+            SectorSize = 512,
+            MD5        = "2b2c891ef5edee8518a1ae2ed3ab71a0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1680
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0266.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "32c044c5c2b0bd13806149a759c14935",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0267.DIM.lz",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "8752095abc13dba3f3467669da333891",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3040
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0268.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "aece7cd34bbba3e75307fa70404d9d30",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0269.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3280,
+            SectorSize = 512,
+            MD5        = "5289afb16a6e4a33213e3bcca56c6230",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3280
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0270.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "092308e5df684702dd0ec393b6d3563a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0271.DIM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "b96596711f4d2ee85dfda0fe3b9f26c3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0272.DIM.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "a4f461af7fda5e93a7ab63fcbb7e7683",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0273.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3528,
+            SectorSize = 512,
+            MD5        = "963f3aa8d4468d4373054f842d0e2245",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3528
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0280.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "4feeaf4b4ee5dad85db727fbbda4b6d1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0281.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "3c77ca681df78e4cd7baa162aa9b0859",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0282.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "51da1f86c49657ffdb367bb2ddeb7990",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0283.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "b81a4987f89936630b8ebc62e4bbce6e"
+            /* TODO: IndexOutOfRangeException
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0284.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "f76f92dd326c99c5efad5ee58daf72e1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0285.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "b6f2c10e42908e334025bc4ffd81e771",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0287.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "f2f409ea2a62a7866fd2777cc4fc9739",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0288.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1512,
+            SectorSize = 512,
+            MD5        = "be89d2aab865a1217a3dda86e99bed97",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1512
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0289.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "30a93f30dd4485c6fc037fe0775d3fc7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0290.DIM.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "e0caf02cce5597c98313bcc480366ec7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0299.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "39bf5a98bcb2185d855ac06378febcfa",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0300.DIM.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "dc20055b6e6fd6f8e1114d4be2effeed",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0301.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "56af9256cf71d5aac5fd5d363674bc49",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0302.DIM.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "bbba1e2d1418e05c3a4e7b4d585d160b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0303.DIM.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "bca3a045e81617f7f5ebb5a8818eac47",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0304.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "a296663cb8e75e94603221352f29cfff",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0305.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ecda36ebf0e1100233cb0ec722c18583",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0307.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "cef2f4fe9b1a32d5c0544f814e634264",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0308.DIM.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "bbe58e26b8f8f822cd3edfd37a4e4924",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0311.DIM.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "b9b6ebdf711364c979de7cf70c3a438a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0314.DIM.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "d37424f367f545acbb397f2bed766843",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0316.DIM.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "9963dd6f19ce6bd56eabeccdfbbd821a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0317.DIM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "acf6604559ae8217f7869823e2429024",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0318.DIM.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "23bf2139cdfdc4c16db058fd31ea6481",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0319.DIM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "fa26adda0415f02057b113ad29c80c8d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0320.DIM.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "4f2a8d036fefd6c6c88d99eda3aa12b7",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DSKA0322.DIM.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1404,
+            SectorSize = 512,
+            MD5        = "1f6a23974b29d525706a2b0228325656",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1404
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd8.dim.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "d81f5cb64fd0b99f138eab34110bbc3c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd.dim.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "a89006a75d13bee9202d1d6e52721ccb",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd_fdformat_f200.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "e1ad4a022778d7a0b24a93d8e68a59dc",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd_fdformat_f205.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 420,
+            SectorSize = 512,
+            MD5        = "56a95fcf1d6f5c3108a17207b53ec07c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 420
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd8.dim.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "beef1cdb004dc69391d6b3d508988b95",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd.dim.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "6213897b7dbf263f12abf76901d43862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f400.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "0aef12c906b744101b932d799ca88a78",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f410.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "e7367df9998de0030a97b5131d1bed20",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f720.dim.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1c36b819cfe355c11360bc120c9216fe",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f800.dim.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "25114403c11e337480e2afc4e6e32108",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f820.dim.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "3d7760ddaa55cd258057773d15106b78",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_freedos_800s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "29054ef703394ee3b35e849468a412ba",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_maxiform_1640s.dim.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "c91e852828c2aeee2fc94a6adbeed0ae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_maxiform_840s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "efb6cfe53a6770f0ae388cb2c7f46264",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1476s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "6116f7c1397cadd55ba8d79c2aadc9dd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1476
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1600s.dim.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "93100f8d86e5d0d0e6340f59c52a5e0d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1640s.dim.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "cf7b7d43aa70863bedcc4a8432a5af67",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd.dim.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_fdformat_f144.dim.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "073a172879a71339ef4b00ebb47b67fc",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_fdformat_f148.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "d9890897130d0fc1eee3dbf4d9b0440f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_maxiform_2788s.dim.lz",
+            MediaType  = MediaType.FDFORMAT_525_HD,
+            Sectors    = 2788,
+            SectorSize = 512,
+            MD5        = "09ca721aa883d5bbaa422c7943b0782c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2788
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_alt.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "259ff90e41e60682d948dd7d6af89735"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_alt_pass.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "b40f8273fa7492bfe71c3d743269b97c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1476
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.dim.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "9827ba1b3e9cac41263caabd862e78f9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_f800.dim.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "67d299c6e83f3f0fbcb8faa9ffa422c1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_f820.dim.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "81d3bfec7b201f6a4503eb24c4394d4a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos_1600s.dim.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "d07f7ffaee89742c6477aaaf94eb5715",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_maxiform_1600s.dim.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "56af87802a9852e6e01e08d544740816",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1494s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1512,
+            SectorSize = 512,
+            MD5        = "34b7b99ef6fba2235eedbd8ae406d7d3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1512
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1600s.dim.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "d9db52d992a76bf3bbc626ff844215a5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1660s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1680,
+            SectorSize = 512,
+            MD5        = "3b74e367926181152c3499de8dd9b914",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1680
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 5904,
+            SectorSize = 512,
+            MD5        = "82825116ffe6d68b4d920ad4875bd709"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed_pass.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 5904,
+            SectorSize = 512,
+            MD5        = "e7cdd1123b08eac4e9571825b1f6172f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 5904
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_alt.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "3b16537076c5517306dc672f8f1e376e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_alt_pass.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "022893d7766205894fca41bcde3c9f6c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.dim.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "1d32a686b7675c7a4f88c15522738432"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_dmf.dim.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "084d4d75f5e780cb9ec66a2fa784c371",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_f168.dim.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "1e06f21a1c11ea3347212da115bca08f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_f16.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "8eb8cb310feaf03c69fffd4f6e729847",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_f172.dim.lz",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "3fc3a03d049416d81f81cc3b9ea8e5de",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos_3360s.dim.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_maxiform_3200s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "3c4becd695ed25866d39966a9a93c2d9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_pass.dim.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "1d32a686b7675c7a4f88c15522738432"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2460s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "72282e11f7d91bf9c090b550fabfe80d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2460
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2720s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2720,
+            SectorSize = 512,
+            MD5        = "457c1126dc7f36bbbabe9e17e90372e3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2788s.dim.lz",
+            MediaType  = MediaType.FDFORMAT_525_HD,
+            Sectors    = 2788,
+            SectorSize = 512,
+            MD5        = "852181d5913c6f290872c66bbe992314",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2788
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2880s.dim.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2980cc32504c945598dc50f1db576994",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2952s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "c1c58d74fffb3656dd7f60f74ae8a629",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2988s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3024,
+            SectorSize = 512,
+            MD5        = "67391c3750f17a806503be3f9d514b1f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3024
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3200s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "e45d41a61fbe48f328c995fcc10a5548",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3320s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "c7764476489072dd053d5ec878171423",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3360s.dim.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "15f71b92bd72aba5d80bf70eca4d5b1e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3486s.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3528,
+            SectorSize = 512,
+            MD5        = "f725bc714c3204e835e23c726ce77b89",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3528
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_alt.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3772,
+            SectorSize = 512,
+            MD5        = "02d7c237c6ac1fbcd2fbbfb45c5fb767"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_alt_pass.dim.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3772,
+            SectorSize = 512,
+            MD5        = "99f83e846c5106dd4992646726e91636",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3772
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/RsIde.cs b/Aaru.Tests/Images/RsIde.cs
index e8b8af7be..43130d740 100644
--- a/Aaru.Tests/Images/RsIde.cs
+++ b/Aaru.Tests/Images/RsIde.cs
@@ -31,32 +31,31 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class RsIde : BlockMediaImageTest
-    {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "RS-IDE");
-        public override IMediaImage _plugin    => new DiscImages.RsIde();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class RsIde : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "RS-IDE");
+    public override IMediaImage _plugin    => new DiscImages.RsIde();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "divide.hdf.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 20480,
+            SectorSize = 512,
+            MD5        = "ee7b8fe07784f2ebacc18da1fc248f5a",
+            Partitions = new[]
             {
-                TestFile   = "divide.hdf.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 20480,
-                SectorSize = 512,
-                MD5        = "ee7b8fe07784f2ebacc18da1fc248f5a",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 20417
-                    }
+                    Start  = 63,
+                    Length = 20417
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/SaveDskF.cs b/Aaru.Tests/Images/SaveDskF.cs
index 7887c7bde..8a84a4459 100644
--- a/Aaru.Tests/Images/SaveDskF.cs
+++ b/Aaru.Tests/Images/SaveDskF.cs
@@ -31,1456 +31,1455 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class SaveDskF : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "SaveDskF");
-        public override IMediaImage _plugin => new DiscImages.SaveDskF();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class SaveDskF : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "SaveDskF");
+    public override IMediaImage _plugin    => new DiscImages.SaveDskF();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "5dd8_c.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "5a1e0a75d31d88c1ce7429fd333c268f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd8_ck.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "5a1e0a75d31d88c1ce7429fd333c268f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd8_na.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "4989762c82f173f9b52e0bdb8cf5becb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd8_nak.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "4989762c82f173f9b52e0bdb8cf5becb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd8_n.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "5a1e0a75d31d88c1ce7429fd333c268f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd8_nk.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "5a1e0a75d31d88c1ce7429fd333c268f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd_c.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "c1a67b27bc76b64d0845965501b24120"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd_ck.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "c1a67b27bc76b64d0845965501b24120"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd_na.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "8a4d35dd0d97e6bca8b000170a43a56f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd_nak.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "8a4d35dd0d97e6bca8b000170a43a56f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd_n.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "c1a67b27bc76b64d0845965501b24120"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5dd_nk.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "c1a67b27bc76b64d0845965501b24120"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5hd_c.dsk",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "1c28b4c3cdc1dbf19c24a5eca3891a87"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5hd_ck.dsk",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "1c28b4c3cdc1dbf19c24a5eca3891a87"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5hd_na.dsk",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "2ce745ac23712d3eb03d7a11ba933b12"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5hd_nak.dsk",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "2ce745ac23712d3eb03d7a11ba933b12"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5hd_n.dsk",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "1c28b4c3cdc1dbf19c24a5eca3891a87"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5hd_nk.dsk",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "1c28b4c3cdc1dbf19c24a5eca3891a87"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd8_c.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "65ce0cd08d90c882df12637c9c72c1ba"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd8_ck.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "65ce0cd08d90c882df12637c9c72c1ba"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd8_na.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6f5d09c13a7b481bad9ea78042e61e00"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd8_nak.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "6f5d09c13a7b481bad9ea78042e61e00"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd8_n.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "65ce0cd08d90c882df12637c9c72c1ba"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd8_nk.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "65ce0cd08d90c882df12637c9c72c1ba"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd_c.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "412fdc582506c0d7e76735d403b30759"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd_ck.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "412fdc582506c0d7e76735d403b30759"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd_na.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "fd81fceb26bda5b02053c5c729a6f67f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd_nak.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "fd81fceb26bda5b02053c5c729a6f67f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd_n.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "412fdc582506c0d7e76735d403b30759"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "5sd_nk.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "412fdc582506c0d7e76735d403b30759"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd8.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "d81f5cb64fd0b99f138eab34110bbc3c",
+            Partitions = new[]
             {
-                TestFile   = "5dd8_c.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "5a1e0a75d31d88c1ce7429fd333c268f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd8_ck.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "5a1e0a75d31d88c1ce7429fd333c268f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd8_na.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "4989762c82f173f9b52e0bdb8cf5becb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd8_nak.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "4989762c82f173f9b52e0bdb8cf5becb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd8_n.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "5a1e0a75d31d88c1ce7429fd333c268f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd8_nk.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "5a1e0a75d31d88c1ce7429fd333c268f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd_c.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "c1a67b27bc76b64d0845965501b24120"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd_ck.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "c1a67b27bc76b64d0845965501b24120"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd_na.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "8a4d35dd0d97e6bca8b000170a43a56f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd_nak.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "8a4d35dd0d97e6bca8b000170a43a56f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd_n.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "c1a67b27bc76b64d0845965501b24120"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5dd_nk.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "c1a67b27bc76b64d0845965501b24120"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5hd_c.dsk",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "1c28b4c3cdc1dbf19c24a5eca3891a87"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5hd_ck.dsk",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "1c28b4c3cdc1dbf19c24a5eca3891a87"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5hd_na.dsk",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "2ce745ac23712d3eb03d7a11ba933b12"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5hd_nak.dsk",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "2ce745ac23712d3eb03d7a11ba933b12"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5hd_n.dsk",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "1c28b4c3cdc1dbf19c24a5eca3891a87"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5hd_nk.dsk",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "1c28b4c3cdc1dbf19c24a5eca3891a87"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd8_c.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "65ce0cd08d90c882df12637c9c72c1ba"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd8_ck.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "65ce0cd08d90c882df12637c9c72c1ba"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd8_na.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6f5d09c13a7b481bad9ea78042e61e00"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd8_nak.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "6f5d09c13a7b481bad9ea78042e61e00"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd8_n.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "65ce0cd08d90c882df12637c9c72c1ba"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd8_nk.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "65ce0cd08d90c882df12637c9c72c1ba"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd_c.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "412fdc582506c0d7e76735d403b30759"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd_ck.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "412fdc582506c0d7e76735d403b30759"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd_na.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "fd81fceb26bda5b02053c5c729a6f67f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd_nak.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "fd81fceb26bda5b02053c5c729a6f67f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd_n.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "412fdc582506c0d7e76735d403b30759"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "5sd_nk.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "412fdc582506c0d7e76735d403b30759"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd8.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "d81f5cb64fd0b99f138eab34110bbc3c",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 320
-                    }
+                    Start  = 0,
+                    Length = 320
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd.dsk",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "a89006a75d13bee9202d1d6e52721ccb",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd_fdformat_f200.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 400,
-                SectorSize = 512,
-                MD5        = "e1ad4a022778d7a0b24a93d8e68a59dc",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd_fdformat_f205.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 410,
-                SectorSize = 512,
-                MD5        = "353f3c2125ab6f74e3a271b60ad34840",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 410
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_2m_fast.dsk",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "319fa8bef964c2a63e34bdb48e77cc4e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_2m_max.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1804,
-                SectorSize = 512,
-                MD5        = "306a61469b4c3c83f3e5f9ae409d83cd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1804
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd8.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "beef1cdb004dc69391d6b3d508988b95",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd.dsk",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "6213897b7dbf263f12abf76901d43862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f400.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "0aef12c906b744101b932d799ca88a78",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f410.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 820,
-                SectorSize = 512,
-                MD5        = "348d12add1ed226cd712a4a6a10d1a34",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 820
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f720.dsk",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1c36b819cfe355c11360bc120c9216fe",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f800.dsk",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "25114403c11e337480e2afc4e6e32108",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f820.dsk",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "3d7760ddaa55cd258057773d15106b78",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_freedos_800s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "29054ef703394ee3b35e849468a412ba",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_maxiform_1640s.dsk",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "c91e852828c2aeee2fc94a6adbeed0ae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_maxiform_840s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "efb6cfe53a6770f0ae388cb2c7f46264",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1476s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "6116f7c1397cadd55ba8d79c2aadc9dd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1476
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1600s.dsk",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "93100f8d86e5d0d0e6340f59c52a5e0d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1640s.dsk",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "cf7b7d43aa70863bedcc4a8432a5af67",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_2m_fast.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "215198cf2a336e718208fc207bb62c6d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_2m_max.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3116,
-                SectorSize = 512,
-                MD5        = "2c96964b5d91444302e21721c25ea120",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3116
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd.dsk",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_fdformat_f144.dsk",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "073a172879a71339ef4b00ebb47b67fc",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_fdformat_f148.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "d9890897130d0fc1eee3dbf4d9b0440f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_maxiform_2788s.dsk",
-                MediaType  = MediaType.FDFORMAT_525_HD,
-                Sectors    = 2788,
-                SectorSize = 512,
-                MD5        = "09ca721aa883d5bbaa422c7943b0782c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2788
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_xdf.dsk",
-                MediaType  = MediaType.XDF_525,
-                Sectors    = 3040,
-                SectorSize = 512,
-                MD5        = "d78dc81491edeec99aa202d02f3daf00"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2m.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1968,
-                SectorSize = 512,
-                MD5        = "9a8670fbaf6307b8d5f32aa10e1be435",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1968
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2m_fast.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1968,
-                SectorSize = 512,
-                MD5        = "05d29642cdcddafa0dcaff91682f8fe0",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1968
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2mgui.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 9408,
-                SectorSize = 128,
-                MD5        = "beb782f6bc970e32ceef79cd112e2e48"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_2m_max.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2132,
-                SectorSize = 512,
-                MD5        = "a99603cd3219aab1299e66b2999f0e57",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2132
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_c.dsk",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "2aefc1e97f29bf9982e0fd7091dfb9f5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_ck.dsk",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "2aefc1e97f29bf9982e0fd7091dfb9f5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.dsk",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "9827ba1b3e9cac41263caabd862e78f9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_800.dsk",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "2e69bbd591ab736e471834ae03dde9a6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.dsk",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "81d3bfec7b201f6a4503eb24c4394d4a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_f800.dsk",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "26532a62985b51a2c3b877a57f6d257b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_f820.dsk",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a7771acff766557cc23b8c6943b588f9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos_1600s.dsk",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "d07f7ffaee89742c6477aaaf94eb5715",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_maxiform_1600s.dsk",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "56af87802a9852e6e01e08d544740816",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_na.dsk",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "e574be0d057f2ef775dfb685561d27cf"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_nak.dsk",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "e574be0d057f2ef775dfb685561d27cf"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_n.dsk",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "2aefc1e97f29bf9982e0fd7091dfb9f5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_nk.dsk",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "2aefc1e97f29bf9982e0fd7091dfb9f5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1494s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1494,
-                SectorSize = 512,
-                MD5        = "fd7fb1ba11cdfe11db54af0322abf59d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1494
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1600s.dsk",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "d9db52d992a76bf3bbc626ff844215a5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1660s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "5949d0be57ce8bffcda7c4be4d1348ee",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed_c.dsk",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "e4746aa9629a2325c520db1c8a641ac6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed_ck.dsk",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "e4746aa9629a2325c520db1c8a641ac6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed.dsk",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "4aeafaf2a088d6a7406856dce8118567",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 5760
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed_na.dsk",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "42e73287b23ac985c9825466cae26859"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed_nak.dsk",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "42e73287b23ac985c9825466cae26859"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed_n.dsk",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "e4746aa9629a2325c520db1c8a641ac6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed_nk.dsk",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "e4746aa9629a2325c520db1c8a641ac6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3608,
-                SectorSize = 512,
-                MD5        = "2f6964d410b275c8e9f60fe2f24b361a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_fast.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3608,
-                SectorSize = 512,
-                MD5        = "967726aede85c68f66887672078f8856",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3608
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2mgui.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 15776,
-                SectorSize = 128,
-                MD5        = "786e45bbfcb369913968aa31365f00bb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_max.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3772,
-                SectorSize = 512,
-                MD5        = "3fa4f87d7058ba940b88e0d80f0d7ded",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3772
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_c.dsk",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "003e9130d83a23018f488f9fa89cae5e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_ck.dsk",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "003e9130d83a23018f488f9fa89cae5e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_dmf.dsk",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "b042310181410227d0072fef1e98a989",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.dsk",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "00e61c06bf29f0c04a7eabe2dbd7efb6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_168.dsk",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "1e06f21a1c11ea3347212da115bca08f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.dsk",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "3fc3a03d049416d81f81cc3b9ea8e5de",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_f168.dsk",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7e3bf04f3660dd1052a335dc99441e44",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_f16.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "8eb8cb310feaf03c69fffd4f6e729847",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_f172.dsk",
-                MediaType  = MediaType.FDFORMAT_35_HD,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "a58fd062f024b95714f1223a8bc2232f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos_3360s.dsk",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos_3486s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "a79ec33c623697b4562dacaed31523b8",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_maxiform_3200s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "3c4becd695ed25866d39966a9a93c2d9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_na.dsk",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "009cc68e28b2b13814d3afbec9d9e59f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_nak.dsk",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "009cc68e28b2b13814d3afbec9d9e59f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_n.dsk",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "003e9130d83a23018f488f9fa89cae5e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_nk.dsk",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "003e9130d83a23018f488f9fa89cae5e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2460s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "72282e11f7d91bf9c090b550fabfe80d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2460
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2720s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2720,
-                SectorSize = 512,
-                MD5        = "457c1126dc7f36bbbabe9e17e90372e3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2788s.dsk",
-                MediaType  = MediaType.FDFORMAT_525_HD,
-                Sectors    = 2788,
-                SectorSize = 512,
-                MD5        = "852181d5913c6f290872c66bbe992314",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2788
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2880s.dsk",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2980cc32504c945598dc50f1db576994",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2952s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "c1c58d74fffb3656dd7f60f74ae8a629",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2988s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2988,
-                SectorSize = 512,
-                MD5        = "097bb2fd34cee5ebde7b5641975ffd60",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2988
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3200s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "e45d41a61fbe48f328c995fcc10a5548",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3320s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3320,
-                SectorSize = 512,
-                MD5        = "c25f2a57c71db1cd4fea2263598f544a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3360s.dsk",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "15f71b92bd72aba5d80bf70eca4d5b1e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3486s.dsk",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "d88c8d818e238c9e52b8588b5fd52efe",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_c.dsk",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "2770e5b1b7935ca6e9695a32008b936a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_ck.dsk",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "2770e5b1b7935ca6e9695a32008b936a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf.dsk",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "3d5fcdaf627257ae9f50a06bdba26965",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3680
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_na.dsk",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "34b4bdab5fcc17076cceb7c1a39ea430"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_nak.dsk",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "34b4bdab5fcc17076cceb7c1a39ea430"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_n.dsk",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "2770e5b1b7935ca6e9695a32008b936a"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_nk.dsk",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "2770e5b1b7935ca6e9695a32008b936a"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd.dsk",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "a89006a75d13bee9202d1d6e52721ccb",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd_fdformat_f200.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 400,
+            SectorSize = 512,
+            MD5        = "e1ad4a022778d7a0b24a93d8e68a59dc",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd_fdformat_f205.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 410,
+            SectorSize = 512,
+            MD5        = "353f3c2125ab6f74e3a271b60ad34840",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 410
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_2m_fast.dsk",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "319fa8bef964c2a63e34bdb48e77cc4e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_2m_max.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1804,
+            SectorSize = 512,
+            MD5        = "306a61469b4c3c83f3e5f9ae409d83cd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1804
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd8.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "beef1cdb004dc69391d6b3d508988b95",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd.dsk",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "6213897b7dbf263f12abf76901d43862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f400.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "0aef12c906b744101b932d799ca88a78",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f410.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 820,
+            SectorSize = 512,
+            MD5        = "348d12add1ed226cd712a4a6a10d1a34",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 820
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f720.dsk",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1c36b819cfe355c11360bc120c9216fe",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f800.dsk",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "25114403c11e337480e2afc4e6e32108",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f820.dsk",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "3d7760ddaa55cd258057773d15106b78",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_freedos_800s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "29054ef703394ee3b35e849468a412ba",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_maxiform_1640s.dsk",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "c91e852828c2aeee2fc94a6adbeed0ae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_maxiform_840s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "efb6cfe53a6770f0ae388cb2c7f46264",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1476s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "6116f7c1397cadd55ba8d79c2aadc9dd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1476
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1600s.dsk",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "93100f8d86e5d0d0e6340f59c52a5e0d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1640s.dsk",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "cf7b7d43aa70863bedcc4a8432a5af67",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_2m_fast.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "215198cf2a336e718208fc207bb62c6d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_2m_max.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3116,
+            SectorSize = 512,
+            MD5        = "2c96964b5d91444302e21721c25ea120",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3116
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd.dsk",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_fdformat_f144.dsk",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "073a172879a71339ef4b00ebb47b67fc",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_fdformat_f148.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "d9890897130d0fc1eee3dbf4d9b0440f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_maxiform_2788s.dsk",
+            MediaType  = MediaType.FDFORMAT_525_HD,
+            Sectors    = 2788,
+            SectorSize = 512,
+            MD5        = "09ca721aa883d5bbaa422c7943b0782c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2788
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_xdf.dsk",
+            MediaType  = MediaType.XDF_525,
+            Sectors    = 3040,
+            SectorSize = 512,
+            MD5        = "d78dc81491edeec99aa202d02f3daf00"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2m.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1968,
+            SectorSize = 512,
+            MD5        = "9a8670fbaf6307b8d5f32aa10e1be435",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1968
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2m_fast.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1968,
+            SectorSize = 512,
+            MD5        = "05d29642cdcddafa0dcaff91682f8fe0",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1968
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2mgui.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 9408,
+            SectorSize = 128,
+            MD5        = "beb782f6bc970e32ceef79cd112e2e48"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_2m_max.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2132,
+            SectorSize = 512,
+            MD5        = "a99603cd3219aab1299e66b2999f0e57",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2132
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_c.dsk",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "2aefc1e97f29bf9982e0fd7091dfb9f5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_ck.dsk",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "2aefc1e97f29bf9982e0fd7091dfb9f5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.dsk",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "9827ba1b3e9cac41263caabd862e78f9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_800.dsk",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "2e69bbd591ab736e471834ae03dde9a6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.dsk",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "81d3bfec7b201f6a4503eb24c4394d4a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_f800.dsk",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "26532a62985b51a2c3b877a57f6d257b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_f820.dsk",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a7771acff766557cc23b8c6943b588f9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos_1600s.dsk",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "d07f7ffaee89742c6477aaaf94eb5715",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_maxiform_1600s.dsk",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "56af87802a9852e6e01e08d544740816",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_na.dsk",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "e574be0d057f2ef775dfb685561d27cf"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_nak.dsk",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "e574be0d057f2ef775dfb685561d27cf"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_n.dsk",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "2aefc1e97f29bf9982e0fd7091dfb9f5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_nk.dsk",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "2aefc1e97f29bf9982e0fd7091dfb9f5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1494s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1494,
+            SectorSize = 512,
+            MD5        = "fd7fb1ba11cdfe11db54af0322abf59d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1494
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1600s.dsk",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "d9db52d992a76bf3bbc626ff844215a5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1660s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "5949d0be57ce8bffcda7c4be4d1348ee",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed_c.dsk",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "e4746aa9629a2325c520db1c8a641ac6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed_ck.dsk",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "e4746aa9629a2325c520db1c8a641ac6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed.dsk",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "4aeafaf2a088d6a7406856dce8118567",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 5760
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed_na.dsk",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "42e73287b23ac985c9825466cae26859"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed_nak.dsk",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "42e73287b23ac985c9825466cae26859"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed_n.dsk",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "e4746aa9629a2325c520db1c8a641ac6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed_nk.dsk",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "e4746aa9629a2325c520db1c8a641ac6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3608,
+            SectorSize = 512,
+            MD5        = "2f6964d410b275c8e9f60fe2f24b361a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_fast.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3608,
+            SectorSize = 512,
+            MD5        = "967726aede85c68f66887672078f8856",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3608
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2mgui.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 15776,
+            SectorSize = 128,
+            MD5        = "786e45bbfcb369913968aa31365f00bb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_max.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3772,
+            SectorSize = 512,
+            MD5        = "3fa4f87d7058ba940b88e0d80f0d7ded",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3772
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_c.dsk",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "003e9130d83a23018f488f9fa89cae5e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_ck.dsk",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "003e9130d83a23018f488f9fa89cae5e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_dmf.dsk",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "b042310181410227d0072fef1e98a989",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.dsk",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "00e61c06bf29f0c04a7eabe2dbd7efb6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_168.dsk",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "1e06f21a1c11ea3347212da115bca08f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.dsk",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "3fc3a03d049416d81f81cc3b9ea8e5de",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_f168.dsk",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7e3bf04f3660dd1052a335dc99441e44",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_f16.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "8eb8cb310feaf03c69fffd4f6e729847",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_f172.dsk",
+            MediaType  = MediaType.FDFORMAT_35_HD,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "a58fd062f024b95714f1223a8bc2232f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos_3360s.dsk",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos_3486s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "a79ec33c623697b4562dacaed31523b8",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_maxiform_3200s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "3c4becd695ed25866d39966a9a93c2d9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_na.dsk",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "009cc68e28b2b13814d3afbec9d9e59f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_nak.dsk",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "009cc68e28b2b13814d3afbec9d9e59f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_n.dsk",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "003e9130d83a23018f488f9fa89cae5e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_nk.dsk",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "003e9130d83a23018f488f9fa89cae5e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2460s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "72282e11f7d91bf9c090b550fabfe80d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2460
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2720s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2720,
+            SectorSize = 512,
+            MD5        = "457c1126dc7f36bbbabe9e17e90372e3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2788s.dsk",
+            MediaType  = MediaType.FDFORMAT_525_HD,
+            Sectors    = 2788,
+            SectorSize = 512,
+            MD5        = "852181d5913c6f290872c66bbe992314",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2788
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2880s.dsk",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2980cc32504c945598dc50f1db576994",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2952s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "c1c58d74fffb3656dd7f60f74ae8a629",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2988s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2988,
+            SectorSize = 512,
+            MD5        = "097bb2fd34cee5ebde7b5641975ffd60",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2988
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3200s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "e45d41a61fbe48f328c995fcc10a5548",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3320s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3320,
+            SectorSize = 512,
+            MD5        = "c25f2a57c71db1cd4fea2263598f544a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3360s.dsk",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "15f71b92bd72aba5d80bf70eca4d5b1e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3486s.dsk",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "d88c8d818e238c9e52b8588b5fd52efe",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_c.dsk",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "2770e5b1b7935ca6e9695a32008b936a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_ck.dsk",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "2770e5b1b7935ca6e9695a32008b936a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.dsk",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "3d5fcdaf627257ae9f50a06bdba26965",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3680
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_na.dsk",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "34b4bdab5fcc17076cceb7c1a39ea430"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_nak.dsk",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "34b4bdab5fcc17076cceb7c1a39ea430"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_n.dsk",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "2770e5b1b7935ca6e9695a32008b936a"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_nk.dsk",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "2770e5b1b7935ca6e9695a32008b936a"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
index 9a89a7807..5832de353 100644
--- a/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/DiskCopy42.cs
@@ -31,81 +31,80 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.ShrinkWrap
-{
-    [TestFixture]
-    public class DiskCopy42 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "DiskCopy 4.2");
-        public override IMediaImage _plugin => new DiscImages.DiskCopy42();
+namespace Aaru.Tests.Images.ShrinkWrap;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class DiskCopy42 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "DiskCopy 4.2");
+    public override IMediaImage _plugin => new DiscImages.DiskCopy42();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "DC6_RW_HFS_1440.image.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_800.image.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS1440.image.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "DC6_RW_HFS_1440.image.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_800.image.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS1440.image.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS720.image.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD1440.image.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD800.image.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS720.image.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD1440.image.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD800.image.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
index 2aaab3fb1..69ddd8a7d 100644
--- a/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/DiskDup.cs
@@ -32,121 +32,120 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.ShrinkWrap
-{
-    [TestFixture]
-    public class DiskDup : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "DiskDup+");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.ShrinkWrap;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class DiskDup : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "DiskDup+");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "CDROM.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 91108,
+            SectorSize = 512,
+            MD5        = "69e3234920e472b24365060241934ca6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_1440.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_800.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_DMF.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS1440.image.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "CDROM.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 91108,
-                SectorSize = 512,
-                MD5        = "69e3234920e472b24365060241934ca6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_1440.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_800.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_DMF.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS1440.image.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS720.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOSDMF.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD1440.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD800.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PDDMF.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS720.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOSDMF.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD1440.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD800.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PDDMF.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
index 654e68717..0bd3a747a 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/ROCo.cs
@@ -32,121 +32,120 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.ShrinkWrap.NDIF
-{
-    [TestFixture]
-    public class ROCo : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3",
-                                                          "NDIF", "DiskCopy compression");
-        public override IMediaImage _plugin => new Ndif();
+namespace Aaru.Tests.Images.ShrinkWrap.NDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class ROCo : BlockMediaImageTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3",
+                                                      "NDIF", "DiskCopy compression");
+    public override IMediaImage _plugin => new Ndif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "CDROM.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 91108,
+            SectorSize = 512,
+            MD5        = "69e3234920e472b24365060241934ca6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "CDROM.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 91108,
-                SectorSize = 512,
-                MD5        = "69e3234920e472b24365060241934ca6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOSDMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PDDMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOSDMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PDDMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
index 311ca1274..6121595e5 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/RdWr.cs
@@ -32,121 +32,120 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.ShrinkWrap.NDIF
-{
-    [TestFixture]
-    public class RdWr : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3",
-                                                          "NDIF", "No compression", "No encryption");
-        public override IMediaImage _plugin => new Ndif();
+namespace Aaru.Tests.Images.ShrinkWrap.NDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class RdWr : BlockMediaImageTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3",
+                                                      "NDIF", "No compression", "No encryption");
+    public override IMediaImage _plugin => new Ndif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "CDROM.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 91108,
+            SectorSize = 512,
+            MD5        = "69e3234920e472b24365060241934ca6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "CDROM.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 91108,
-                SectorSize = 512,
-                MD5        = "69e3234920e472b24365060241934ca6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOSDMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PDDMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOSDMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PDDMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
index da5e4fec8..55ddce8f1 100644
--- a/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/NDIF/Rdxx.cs
@@ -32,121 +32,120 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.ShrinkWrap.NDIF
-{
-    [TestFixture]
-    public class Rdxx : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3",
-                                                          "NDIF", "Simple compression");
-        public override IMediaImage _plugin => new Ndif();
+namespace Aaru.Tests.Images.ShrinkWrap.NDIF;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Rdxx : BlockMediaImageTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3",
+                                                      "NDIF", "Simple compression");
+    public override IMediaImage _plugin => new Ndif();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "CDROM.img",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 91108,
+            SectorSize = 512,
+            MD5        = "69e3234920e472b24365060241934ca6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_DMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "CDROM.img",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 91108,
-                SectorSize = 512,
-                MD5        = "69e3234920e472b24365060241934ca6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_DMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS720.img",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOSDMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD1440.img",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD800.img",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PDDMF.img",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS720.img",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOSDMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD1440.img",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD800.img",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PDDMF.img",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/ShrinkWrap/Raw.cs b/Aaru.Tests/Images/ShrinkWrap/Raw.cs
index d3fb6f527..3be1b2636 100644
--- a/Aaru.Tests/Images/ShrinkWrap/Raw.cs
+++ b/Aaru.Tests/Images/ShrinkWrap/Raw.cs
@@ -32,121 +32,120 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.ShrinkWrap
-{
-    [TestFixture]
-    public class Raw : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "raw");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.ShrinkWrap;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Raw : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "ShrinkWrap 3", "raw");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "CDROM.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 91108,
+            SectorSize = 512,
+            MD5        = "69e3234920e472b24365060241934ca6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_1440.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "3160038ca028ccf52ad7863790072145"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_800.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DC6_RW_HFS_DMF.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "652dc979c177f2d8e846587158b38478"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS1440.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "ff419213080574056ebd9adf7bab3d32",
+            Partitions = new[]
             {
-                TestFile   = "CDROM.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 91108,
-                SectorSize = 512,
-                MD5        = "69e3234920e472b24365060241934ca6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_1440.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "3160038ca028ccf52ad7863790072145"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_800.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "5e255c4bc0f6a26ecd27845b37e65aaa"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DC6_RW_HFS_DMF.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "652dc979c177f2d8e846587158b38478"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS1440.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "ff419213080574056ebd9adf7bab3d32",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
+                    Start  = 0,
+                    Length = 2880
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOS720.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "c2be571406cf6353269faa59a4a8c0a4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "DOSDMF.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "92ea7a359957012a682ba126cfdef0ce",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD1440.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PD800.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "a72da7aedadbe194c22a3d71c62e4766"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "PDDMF.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOS720.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "c2be571406cf6353269faa59a4a8c0a4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "DOSDMF.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "92ea7a359957012a682ba126cfdef0ce",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD1440.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "7975e8cf7579a6848d6fb4e546d1f682"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PD800.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "a72da7aedadbe194c22a3d71c62e4766"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "PDDMF.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7fbf0251a93cb36d98e68b7d19624de5"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/TapeMediaImageTest.cs b/Aaru.Tests/Images/TapeMediaImageTest.cs
index f03bc0ba8..e54dd887d 100644
--- a/Aaru.Tests/Images/TapeMediaImageTest.cs
+++ b/Aaru.Tests/Images/TapeMediaImageTest.cs
@@ -8,168 +8,167 @@ using FluentAssertions;
 using FluentAssertions.Execution;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
+namespace Aaru.Tests.Images;
+
+public abstract class TapeMediaImageTest : BaseMediaImageTest
 {
-    public abstract class TapeMediaImageTest : BaseMediaImageTest
+    // How many sectors to read at once
+    const uint SECTORS_TO_READ = 256;
+
+    public abstract TapeImageTestExpected[] Tests { get; }
+
+    [Test]
+    public void Tape()
     {
-        // How many sectors to read at once
-        const uint SECTORS_TO_READ = 256;
+        Environment.CurrentDirectory = DataFolder;
 
-        public abstract TapeImageTestExpected[] Tests { get; }
-
-        [Test]
-        public void Tape()
+        Assert.Multiple(() =>
         {
-            Environment.CurrentDirectory = DataFolder;
-
-            Assert.Multiple(() =>
+            foreach(TapeImageTestExpected test in Tests)
             {
-                foreach(TapeImageTestExpected test in Tests)
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var image = Activator.CreateInstance(_plugin.GetType()) as ITapeImage;
+                Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
+
+                ErrorNumber opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                Assert.AreEqual(true, image.IsTape, $"Is tape?: {testFile}");
+
+                using(new AssertionScope())
                 {
-                    string testFile = test.TestFile;
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var image = Activator.CreateInstance(_plugin.GetType()) as ITapeImage;
-                    Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
-
-                    ErrorNumber opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    Assert.AreEqual(true, image.IsTape, $"Is tape?: {testFile}");
-
-                    using(new AssertionScope())
+                    Assert.Multiple(() =>
                     {
-                        Assert.Multiple(() =>
-                        {
-                            image.Files.Should().BeEquivalentTo(test.Files, $"Tape files: {testFile}");
+                        image.Files.Should().BeEquivalentTo(test.Files, $"Tape files: {testFile}");
 
-                            image.TapePartitions.Should().
-                                  BeEquivalentTo(test.Partitions, $"Tape partitions: {testFile}");
-                        });
-                    }
+                        image.TapePartitions.Should().
+                              BeEquivalentTo(test.Partitions, $"Tape partitions: {testFile}");
+                    });
                 }
-            });
-        }
+            }
+        });
+    }
 
-        [Test]
-        public void Info()
+    [Test]
+    public void Info()
+    {
+        Environment.CurrentDirectory = DataFolder;
+
+        Assert.Multiple(() =>
         {
-            Environment.CurrentDirectory = DataFolder;
-
-            Assert.Multiple(() =>
+            foreach(TapeImageTestExpected test in Tests)
             {
-                foreach(TapeImageTestExpected test in Tests)
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage;
+                Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
+
+                ErrorNumber opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                using(new AssertionScope())
                 {
-                    string testFile = test.TestFile;
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage;
-                    Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
-
-                    ErrorNumber opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    using(new AssertionScope())
+                    Assert.Multiple(() =>
                     {
-                        Assert.Multiple(() =>
-                        {
-                            Assert.AreEqual(test.Sectors, image.Info.Sectors, $"Sectors: {testFile}");
-                            Assert.AreEqual(test.SectorSize, image.Info.SectorSize, $"Sector size: {testFile}");
-                            Assert.AreEqual(test.MediaType, image.Info.MediaType, $"Media type: {testFile}");
-                        });
-                    }
+                        Assert.AreEqual(test.Sectors, image.Info.Sectors, $"Sectors: {testFile}");
+                        Assert.AreEqual(test.SectorSize, image.Info.SectorSize, $"Sector size: {testFile}");
+                        Assert.AreEqual(test.MediaType, image.Info.MediaType, $"Media type: {testFile}");
+                    });
                 }
-            });
-        }
+            }
+        });
+    }
 
-        [Test]
-        public void Hashes()
+    [Test]
+    public void Hashes()
+    {
+        Environment.CurrentDirectory = DataFolder;
+        ErrorNumber errno;
+
+        Assert.Multiple(() =>
         {
-            Environment.CurrentDirectory = DataFolder;
-            ErrorNumber errno;
-
-            Assert.Multiple(() =>
+            foreach(TapeImageTestExpected test in Tests)
             {
-                foreach(TapeImageTestExpected test in Tests)
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage;
+                Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
+
+                ErrorNumber opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                ulong doneSectors = 0;
+                var   ctx         = new Md5Context();
+
+                while(doneSectors < image.Info.Sectors)
                 {
-                    string testFile = test.TestFile;
+                    byte[] sector;
 
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var image = Activator.CreateInstance(_plugin.GetType()) as IMediaImage;
-                    Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
-
-                    ErrorNumber opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    ulong doneSectors = 0;
-                    var   ctx         = new Md5Context();
-
-                    while(doneSectors < image.Info.Sectors)
+                    if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
                     {
-                        byte[] sector;
+                        errno       =  image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
+                        doneSectors += SECTORS_TO_READ;
+                    }
+                    else
+                    {
+                        errno = image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors),
+                                                  out sector);
 
-                        if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
-                        {
-                            errno       =  image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
-                            doneSectors += SECTORS_TO_READ;
-                        }
-                        else
-                        {
-                            errno = image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors),
-                                                      out sector);
-
-                            doneSectors += image.Info.Sectors - doneSectors;
-                        }
-
-                        Assert.AreEqual(ErrorNumber.NoError, errno);
-                        ctx.Update(sector);
+                        doneSectors += image.Info.Sectors - doneSectors;
                     }
 
-                    Assert.AreEqual(test.MD5, ctx.End(), $"Hash: {testFile}");
+                    Assert.AreEqual(ErrorNumber.NoError, errno);
+                    ctx.Update(sector);
                 }
-            });
-        }
+
+                Assert.AreEqual(test.MD5, ctx.End(), $"Hash: {testFile}");
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/TeleDisk.cs b/Aaru.Tests/Images/TeleDisk.cs
index 3fd26fad7..2f343dbaf 100644
--- a/Aaru.Tests/Images/TeleDisk.cs
+++ b/Aaru.Tests/Images/TeleDisk.cs
@@ -31,808 +31,807 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class TeleDisk : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "TeleDisk");
-        public override IMediaImage _plugin => new DiscImages.TeleDisk();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class TeleDisk : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "TeleDisk");
+    public override IMediaImage _plugin    => new DiscImages.TeleDisk();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "md2dd8.td0.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "beef1cdb004dc69391d6b3d508988b95",
+            Partitions = new[]
             {
-                TestFile   = "md2dd8.td0.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "beef1cdb004dc69391d6b3d508988b95",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 640
-                    }
+                    Start  = 0,
+                    Length = 640
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f400.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "0aef12c906b744101b932d799ca88a78"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f410.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 820,
-                SectorSize = 512,
-                MD5        = "348d12add1ed226cd712a4a6a10d1a34",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 820
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f720.td0.lz",
-                MediaType  = MediaType.ECMA_78_2,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "1c36b819cfe355c11360bc120c9216fe",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f800.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "25114403c11e337480e2afc4e6e32108",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_fdformat_f820.td0.lz",
-                MediaType  = MediaType.FDFORMAT_525_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "3d7760ddaa55cd258057773d15106b78",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_freedos_800s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "29054ef703394ee3b35e849468a412ba"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_maxiform_1640s.td0.lz",
-                MediaType  = MediaType.FDFORMAT_525_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "c91e852828c2aeee2fc94a6adbeed0ae",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_maxiform_840s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 840,
-                SectorSize = 512,
-                MD5        = "efb6cfe53a6770f0ae388cb2c7f46264",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 840
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1476s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1476,
-                SectorSize = 512,
-                MD5        = "6116f7c1397cadd55ba8d79c2aadc9dd",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1476
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1600s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "93100f8d86e5d0d0e6340f59c52a5e0d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_qcopy_1640s.td0.lz",
-                MediaType  = MediaType.FDFORMAT_525_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "cf7b7d43aa70863bedcc4a8432a5af67",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd.td0.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "6213897b7dbf263f12abf76901d43862"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_fdformat_f144.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "073a172879a71339ef4b00ebb47b67fc",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_fdformat_f148.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "d9890897130d0fc1eee3dbf4d9b0440f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_maxiform_2788s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2788,
-                SectorSize = 512,
-                MD5        = "09ca721aa883d5bbaa422c7943b0782c",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2788
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd.td0.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2400
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_xdf.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 640,
-                SectorSize = 128,
-                MD5        = "b903ea7e0c9d7e4c6251df4825212db4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_800.td0.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "db9cfb6eea18820b7a7e0b5b45594471",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_f800.td0.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "26532a62985b51a2c3b877a57f6d257b",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_f820.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "a7771acff766557cc23b8c6943b588f9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos_1600s.td0.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "d07f7ffaee89742c6477aaaf94eb5715",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "456390a9c6ab05cb458a03c47296de08",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_maxiform_1600s.td0.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "56af87802a9852e6e01e08d544740816",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1494s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1494,
-                SectorSize = 512,
-                MD5        = "fd7fb1ba11cdfe11db54af0322abf59d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1494
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1600s.td0.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "d9db52d992a76bf3bbc626ff844215a5",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_qcopy_1660s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1660,
-                SectorSize = 512,
-                MD5        = "5949d0be57ce8bffcda7c4be4d1348ee",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1660
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.td0.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_max.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1148,
-                SectorSize = 512,
-                MD5        = "4b88a3e43b57778422e8b1e851a9c902"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1804,
-                SectorSize = 512,
-                MD5        = "d032d928c43b66419b7404b016ec07ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_alt_adv.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "1d32a686b7675c7a4f88c15522738432"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_alt_dos_adv.td0.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "8aea37782c507baf6b294467249b4608"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_alt_dos.td0.lz",
-                MediaType  = MediaType.DOS_35_HD,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "8aea37782c507baf6b294467249b4608"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_alt.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "1d32a686b7675c7a4f88c15522738432"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_dmf.td0.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "28764d4f69c3865e2af71a41ca3f432f"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_168.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 332,
-                SectorSize = 512,
-                MD5        = "62b900808c3e9f91f8361fd1716155a1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "9dea1e119a73a21a38d134f36b2e5564"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_f168.td0.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "7e3bf04f3660dd1052a335dc99441e44",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_f16.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "8eb8cb310feaf03c69fffd4f6e729847",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_f172.td0.lz",
-                MediaType  = MediaType.DMF_82,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "a58fd062f024b95714f1223a8bc2232f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3444
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos_3360s.td0.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos_3486s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "a79ec33c623697b4562dacaed31523b8",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "dbd52e9e684f97d9e2292811242bb24e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_maxiform_3200s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "3c4becd695ed25866d39966a9a93c2d9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2460s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2460,
-                SectorSize = 512,
-                MD5        = "72282e11f7d91bf9c090b550fabfe80d",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2460
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2720s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2720,
-                SectorSize = 512,
-                MD5        = "457c1126dc7f36bbbabe9e17e90372e3",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2720
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2788s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2788,
-                SectorSize = 512,
-                MD5        = "852181d5913c6f290872c66bbe992314",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2788
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2880s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "2980cc32504c945598dc50f1db576994",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_2952s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2952,
-                SectorSize = 512,
-                MD5        = "c1c58d74fffb3656dd7f60f74ae8a629",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2952
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3200s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3200,
-                SectorSize = 512,
-                MD5        = "e45d41a61fbe48f328c995fcc10a5548",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3200
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3320s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3320,
-                SectorSize = 512,
-                MD5        = "c25f2a57c71db1cd4fea2263598f544a",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3320
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3360s.td0.lz",
-                MediaType  = MediaType.DMF,
-                Sectors    = 3360,
-                SectorSize = 512,
-                MD5        = "15f71b92bd72aba5d80bf70eca4d5b1e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3360
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_qcopy_3486s.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "d88c8d818e238c9e52b8588b5fd52efe",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b4a602f67903c46eef62addb0780aa56",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_adv.td0.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "728f9361203dc39961b1413aa050f70d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf.td0.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "728f9361203dc39961b1413aa050f70d"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f400.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "0aef12c906b744101b932d799ca88a78"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f410.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 820,
+            SectorSize = 512,
+            MD5        = "348d12add1ed226cd712a4a6a10d1a34",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 820
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f720.td0.lz",
+            MediaType  = MediaType.ECMA_78_2,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "1c36b819cfe355c11360bc120c9216fe",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f800.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "25114403c11e337480e2afc4e6e32108",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_fdformat_f820.td0.lz",
+            MediaType  = MediaType.FDFORMAT_525_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "3d7760ddaa55cd258057773d15106b78",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_freedos_800s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "29054ef703394ee3b35e849468a412ba"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_maxiform_1640s.td0.lz",
+            MediaType  = MediaType.FDFORMAT_525_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "c91e852828c2aeee2fc94a6adbeed0ae",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_maxiform_840s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 840,
+            SectorSize = 512,
+            MD5        = "efb6cfe53a6770f0ae388cb2c7f46264",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 840
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1476s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1476,
+            SectorSize = 512,
+            MD5        = "6116f7c1397cadd55ba8d79c2aadc9dd",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1476
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1600s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "93100f8d86e5d0d0e6340f59c52a5e0d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_qcopy_1640s.td0.lz",
+            MediaType  = MediaType.FDFORMAT_525_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "cf7b7d43aa70863bedcc4a8432a5af67",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd.td0.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "6213897b7dbf263f12abf76901d43862"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_fdformat_f144.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "073a172879a71339ef4b00ebb47b67fc",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_fdformat_f148.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "d9890897130d0fc1eee3dbf4d9b0440f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_maxiform_2788s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2788,
+            SectorSize = 512,
+            MD5        = "09ca721aa883d5bbaa422c7943b0782c",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2788
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd.td0.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "02259cd5fbcc20f8484aa6bece7a37c6",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2400
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_xdf.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 640,
+            SectorSize = 128,
+            MD5        = "b903ea7e0c9d7e4c6251df4825212db4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_800.td0.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "c533488a21098a62c85f1649abda2803",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "db9cfb6eea18820b7a7e0b5b45594471",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_f800.td0.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "26532a62985b51a2c3b877a57f6d257b",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_f820.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "a7771acff766557cc23b8c6943b588f9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos_1600s.td0.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "d07f7ffaee89742c6477aaaf94eb5715",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "456390a9c6ab05cb458a03c47296de08",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_maxiform_1600s.td0.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "56af87802a9852e6e01e08d544740816",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1494s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1494,
+            SectorSize = 512,
+            MD5        = "fd7fb1ba11cdfe11db54af0322abf59d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1494
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1600s.td0.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "d9db52d992a76bf3bbc626ff844215a5",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_qcopy_1660s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1660,
+            SectorSize = 512,
+            MD5        = "5949d0be57ce8bffcda7c4be4d1348ee",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1660
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.td0.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_max.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1148,
+            SectorSize = 512,
+            MD5        = "4b88a3e43b57778422e8b1e851a9c902"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1804,
+            SectorSize = 512,
+            MD5        = "d032d928c43b66419b7404b016ec07ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_alt_adv.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "1d32a686b7675c7a4f88c15522738432"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_alt_dos_adv.td0.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "8aea37782c507baf6b294467249b4608"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_alt_dos.td0.lz",
+            MediaType  = MediaType.DOS_35_HD,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "8aea37782c507baf6b294467249b4608"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_alt.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "1d32a686b7675c7a4f88c15522738432"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_dmf.td0.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "28764d4f69c3865e2af71a41ca3f432f"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_168.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 332,
+            SectorSize = 512,
+            MD5        = "62b900808c3e9f91f8361fd1716155a1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "9dea1e119a73a21a38d134f36b2e5564"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_f168.td0.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "7e3bf04f3660dd1052a335dc99441e44",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_f16.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "8eb8cb310feaf03c69fffd4f6e729847",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_f172.td0.lz",
+            MediaType  = MediaType.DMF_82,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "a58fd062f024b95714f1223a8bc2232f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3444
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos_3360s.td0.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "2bfd2e0a81bad704f8fc7758358cfcca",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos_3486s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "a79ec33c623697b4562dacaed31523b8",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "dbd52e9e684f97d9e2292811242bb24e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_maxiform_3200s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "3c4becd695ed25866d39966a9a93c2d9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2460s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2460,
+            SectorSize = 512,
+            MD5        = "72282e11f7d91bf9c090b550fabfe80d",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2460
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2720s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2720,
+            SectorSize = 512,
+            MD5        = "457c1126dc7f36bbbabe9e17e90372e3",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2720
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2788s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2788,
+            SectorSize = 512,
+            MD5        = "852181d5913c6f290872c66bbe992314",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2788
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2880s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "2980cc32504c945598dc50f1db576994",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_2952s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2952,
+            SectorSize = 512,
+            MD5        = "c1c58d74fffb3656dd7f60f74ae8a629",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2952
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3200s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3200,
+            SectorSize = 512,
+            MD5        = "e45d41a61fbe48f328c995fcc10a5548",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3200
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3320s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3320,
+            SectorSize = 512,
+            MD5        = "c25f2a57c71db1cd4fea2263598f544a",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3320
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3360s.td0.lz",
+            MediaType  = MediaType.DMF,
+            Sectors    = 3360,
+            SectorSize = 512,
+            MD5        = "15f71b92bd72aba5d80bf70eca4d5b1e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3360
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_qcopy_3486s.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "d88c8d818e238c9e52b8588b5fd52efe",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b4a602f67903c46eef62addb0780aa56",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_adv.td0.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "728f9361203dc39961b1413aa050f70d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.td0.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "728f9361203dc39961b1413aa050f70d"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/Toast.cs b/Aaru.Tests/Images/Toast.cs
index be0725982..b2df4a39e 100644
--- a/Aaru.Tests/Images/Toast.cs
+++ b/Aaru.Tests/Images/Toast.cs
@@ -32,336 +32,335 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class Toast : OpticalMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Roxio Toast");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Toast : OpticalMediaImageTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Roxio Toast");
+    public override IMediaImage _plugin => new ZZZRawImage();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "toast_3.5.7_iso9660_xa_apple.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "toast_3.5.7_iso9660_xa_apple.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_dos_apple.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_dos.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_ebook_eng.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_ebook_fra.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_joliet_apple.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_joliet.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_mac_apple.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_mac.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_ver_apple.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_ver_dos_apple.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_ver_dos.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_ver_joliet_apple.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_ver_joliet.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "toast_3.5.7_iso9660_xa_ver.toast.lz",
-                MediaType     = MediaType.CD,
-                Sectors       = 0,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 0,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_dos_apple.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_dos.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_ebook_eng.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_ebook_fra.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_joliet_apple.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_joliet.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_mac_apple.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_mac.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_ver_apple.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_ver_dos_apple.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_ver_dos.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_ver_joliet_apple.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_ver_joliet.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "toast_3.5.7_iso9660_xa_ver.toast.lz",
+            MediaType     = MediaType.CD,
+            Sectors       = 0,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 0,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/UltraISO/Alcohol.cs b/Aaru.Tests/Images/UltraISO/Alcohol.cs
index 25f5c0dd7..9474a720e 100644
--- a/Aaru.Tests/Images/UltraISO/Alcohol.cs
+++ b/Aaru.Tests/Images/UltraISO/Alcohol.cs
@@ -31,769 +31,768 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.UltraISO
-{
-    [TestFixture]
-    public class Alcohol : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Alcohol");
-        public override IMediaImage _plugin => new DiscImages.Alcohol120();
+namespace Aaru.Tests.Images.UltraISO;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Alcohol : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Alcohol");
+    public override IMediaImage _plugin => new DiscImages.Alcohol120();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile  = "cdiready_the_apprentice.mds",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 279300,
+            MD5       = "556d7d32e3c01c2087cc56b25fe5f66d",
+            LongMD5   = "556d7d32e3c01c2087cc56b25fe5f66d",
+            Tracks = new[]
             {
-                TestFile  = "cdiready_the_apprentice.mds",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 279300,
-                MD5       = "556d7d32e3c01c2087cc56b25fe5f66d",
-                LongMD5   = "556d7d32e3c01c2087cc56b25fe5f66d",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 88799,
-                        Pregap  = 69300,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 88799,
+                    Pregap  = 69300,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279299,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_audiocd.mds",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 247073,
+            MD5       = "c96a7bf12427078bab252d941716cc32",
+            LongMD5   = "c96a7bf12427078bab252d941716cc32",
+            Tracks = new[]
             {
-                TestFile  = "report_audiocd.mds",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 247073,
-                MD5       = "c96a7bf12427078bab252d941716cc32",
-                LongMD5   = "c96a7bf12427078bab252d941716cc32",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrom.mds",
+            MediaType = MediaType.CDROM,
+            Sectors   = 254265,
+            MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
             {
-                TestFile  = "report_cdrom.mds",
-                MediaType = MediaType.CDROM,
-                Sectors   = 254265,
-                MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_cdrw.mds",
-                MediaType = MediaType.CDROM,
-                Sectors   = 308224,
-                MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v2.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 471090,
-                MD5       = "35cb08dd5fedfb8e9ad2918292e51791",
-                LongMD5   = "35cb08dd5fedfb8e9ad2918292e51791",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 471089,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd-r+dl.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 3455920,
-                MD5       = "1cd9b9be5c5e337c5e6576156b84b726",
-                LongMD5   = "1cd9b9be5c5e337c5e6576156b84b726",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3455919,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters     = 3455920,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Test DVD",
-                                VolumeSerial = "483E25D50034BBB0"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdrom.mds",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146357,
-                MD5       = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
-                LongMD5   = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146356,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_enhancedcd.mds",
-                MediaType = MediaType.CDPLUS,
-                Sectors   = 303316,
-                MD5       = "97e5bf1caf3998e818d40cd845c6ecc9",
-                LongMD5   = "07b4d88c8f38cc0168a2f5725b31c52e",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 0,
-                        Number  = 14,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "test_multi_karaoke_sampler.mds",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 329158,
-                MD5       = "9a19aa0df066732a8ec34025e8160248",
-                LongMD5   = "e981f7dfdb522ba937fe75474e23a446",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1887,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrw.mds",
+            MediaType = MediaType.CDROM,
+            Sectors   = 308224,
+            MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v2.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 471090,
+            MD5       = "35cb08dd5fedfb8e9ad2918292e51791",
+            LongMD5   = "35cb08dd5fedfb8e9ad2918292e51791",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 471089,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-r+dl.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 3455920,
+            MD5       = "1cd9b9be5c5e337c5e6576156b84b726",
+            LongMD5   = "1cd9b9be5c5e337c5e6576156b84b726",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3455919,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters     = 3455920,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Test DVD",
+                            VolumeSerial = "483E25D50034BBB0"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdrom.mds",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146357,
+            MD5       = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
+            LongMD5   = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146356,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_enhancedcd.mds",
+            MediaType = MediaType.CDPLUS,
+            Sectors   = 303316,
+            MD5       = "97e5bf1caf3998e818d40cd845c6ecc9",
+            LongMD5   = "07b4d88c8f38cc0168a2f5725b31c52e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 0,
+                    Number  = 14,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "test_multi_karaoke_sampler.mds",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 329158,
+            MD5       = "9a19aa0df066732a8ec34025e8160248",
+            LongMD5   = "e981f7dfdb522ba937fe75474e23a446",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1887,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/UltraISO/CloneCD.cs b/Aaru.Tests/Images/UltraISO/CloneCD.cs
index 3b32e84c0..e1d13b915 100644
--- a/Aaru.Tests/Images/UltraISO/CloneCD.cs
+++ b/Aaru.Tests/Images/UltraISO/CloneCD.cs
@@ -32,685 +32,684 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.UltraISO
-{
-    [TestFixture]
-    public class CloneCD : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "CloneCD");
-        public override IMediaImage _plugin => new CloneCd();
+namespace Aaru.Tests.Images.UltraISO;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class CloneCD : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "CloneCD");
+    public override IMediaImage _plugin => new CloneCd();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "cdiready_the_apprentice.ccd",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 279300,
+            MD5           = "e159c422cba79ce772437458c11c00d8",
+            LongMD5       = "e159c422cba79ce772437458c11c00d8",
+            SubchannelMD5 = "f43afdef9df3fc5b3d74494f0908223f",
+            Tracks = new[]
             {
-                TestFile      = "cdiready_the_apprentice.ccd",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 279300,
-                MD5           = "e159c422cba79ce772437458c11c00d8",
-                LongMD5       = "e159c422cba79ce772437458c11c00d8",
-                SubchannelMD5 = "f43afdef9df3fc5b3d74494f0908223f",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 88799,
-                        Pregap  = 69300,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 88799,
+                    Pregap  = 69300,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279299,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.ccd",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "e6b61ad780c72d162c3ceb784de1fbd2",
+            Tracks = new[]
             {
-                TestFile      = "report_audiocd.ccd",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "e6b61ad780c72d162c3ceb784de1fbd2",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.ccd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "292b671b4b296a20511516557dbbd2b1",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrom.ccd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "292b671b4b296a20511516557dbbd2b1",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.ccd",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "4b054ac37c290a91a47997c84c9978d6",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_enhancedcd.ccd",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 303316,
-                MD5           = "97e5bf1caf3998e818d40cd845c6ecc9",
-                LongMD5       = "07b4d88c8f38cc0168a2f5725b31c52e",
-                SubchannelMD5 = "74910fc131a456fa3d39a666dcee3dcc",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 0,
-                        Number  = 14,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sampler.ccd",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 329158,
-                MD5           = "8d8493eb8eba6c67be7a8f47d4fde971",
-                LongMD5       = "5a9eb4f35ecc39de5c011a2bac8549b5",
-                SubchannelMD5 = "159b910e0ec1a88e004b9bcebdbde747",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1887,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.ccd",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "4b054ac37c290a91a47997c84c9978d6",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_enhancedcd.ccd",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 303316,
+            MD5           = "97e5bf1caf3998e818d40cd845c6ecc9",
+            LongMD5       = "07b4d88c8f38cc0168a2f5725b31c52e",
+            SubchannelMD5 = "74910fc131a456fa3d39a666dcee3dcc",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 0,
+                    Number  = 14,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.ccd",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 329158,
+            MD5           = "8d8493eb8eba6c67be7a8f47d4fde971",
+            LongMD5       = "5a9eb4f35ecc39de5c011a2bac8549b5",
+            SubchannelMD5 = "159b910e0ec1a88e004b9bcebdbde747",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1887,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/UltraISO/Cuesheet.cs b/Aaru.Tests/Images/UltraISO/Cuesheet.cs
index f86c61af3..98439c8ec 100644
--- a/Aaru.Tests/Images/UltraISO/Cuesheet.cs
+++ b/Aaru.Tests/Images/UltraISO/Cuesheet.cs
@@ -32,762 +32,761 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.UltraISO
-{
-    [TestFixture]
-    public class Cuesheet : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Cuesheet");
-        public override IMediaImage _plugin => new CdrWin();
+namespace Aaru.Tests.Images.UltraISO;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Cuesheet : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Cuesheet");
+    public override IMediaImage _plugin => new CdrWin();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile  = "cdiready_the_apprentice.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 279300,
+            MD5       = "d3b069721052a1093151c6f7504ca593",
+            LongMD5   = "d3b069721052a1093151c6f7504ca593",
+            Tracks = new[]
             {
-                TestFile  = "cdiready_the_apprentice.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 279300,
-                MD5       = "d3b069721052a1093151c6f7504ca593",
-                LongMD5   = "d3b069721052a1093151c6f7504ca593",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 69150,
-                        End     = 88799,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 69150,
+                    End     = 88799,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279299,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_audiocd.cue",
+            MediaType = MediaType.CDDA,
+            Sectors   = 247073,
+            MD5       = "c041297aca68c206d95d20aa9435e01b",
+            LongMD5   = "c041297aca68c206d95d20aa9435e01b",
+            Tracks = new[]
             {
-                TestFile  = "report_audiocd.cue",
-                MediaType = MediaType.CDDA,
-                Sectors   = 247073,
-                MD5       = "c041297aca68c206d95d20aa9435e01b",
-                LongMD5   = "c041297aca68c206d95d20aa9435e01b",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrom.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 254265,
+            MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
             {
-                TestFile  = "report_cdrom.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 254265,
-                MD5       = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5   = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_cdrw.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 308224,
-                MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v2.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 471090,
-                MD5       = "35cb08dd5fedfb8e9ad2918292e51791",
-                LongMD5   = "c7ee3dc509bb40948c383686b6f66da9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 471089,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd-r+dl.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 3455920,
-                MD5       = "ea4cfa28a4e449d7b59251b98394c7f4",
-                LongMD5   = "282de41e0118781f8a9216b0a4a31088",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3455919,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters     = 3455920,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Test DVD",
-                                VolumeSerial = "483E25D50034BBB0"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdrom.cue",
-                MediaType = MediaType.CDROM,
-                Sectors   = 2146357,
-                MD5       = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
-                LongMD5   = "8325ba263cfa419f9566de93e55248d5",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146356,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            /* This image is invalid an impossible to process properly due to a bug in UltraISO
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_enhancedcd.cue",
-                MediaType = MediaType.CDPLUS,
-                Sectors   = 303316,
-                MD5       = "026acd68cecc7b2d49a3f9a42312a18f",
-                LongMD5   = "31a4c8805b6e8fa7edf93d41b1785661",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15511,
-                        End     = 33958,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 234179,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
-                }
-            },
-            */ new OpticalImageTestExpected
-            {
-                TestFile  = "test_multi_karaoke_sampler.cue",
-                MediaType = MediaType.CDROMXA,
-                Sectors   = 329158,
-                MD5       = "9a19aa0df066732a8ec34025e8160248",
-                LongMD5   = "e981f7dfdb522ba937fe75474e23a446",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1886,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1887,
-                        End     = 32748,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_cdrw.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 308224,
+            MD5       = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5   = "3af5f943ddb9427d9c63a4ce3b704db9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v2.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 471090,
+            MD5       = "35cb08dd5fedfb8e9ad2918292e51791",
+            LongMD5   = "c7ee3dc509bb40948c383686b6f66da9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 471089,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-r+dl.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 3455920,
+            MD5       = "ea4cfa28a4e449d7b59251b98394c7f4",
+            LongMD5   = "282de41e0118781f8a9216b0a4a31088",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3455919,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters     = 3455920,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Test DVD",
+                            VolumeSerial = "483E25D50034BBB0"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdrom.cue",
+            MediaType = MediaType.CDROM,
+            Sectors   = 2146357,
+            MD5       = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
+            LongMD5   = "8325ba263cfa419f9566de93e55248d5",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146356,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        /* This image is invalid an impossible to process properly due to a bug in UltraISO
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_enhancedcd.cue",
+            MediaType = MediaType.CDPLUS,
+            Sectors   = 303316,
+            MD5       = "026acd68cecc7b2d49a3f9a42312a18f",
+            LongMD5   = "31a4c8805b6e8fa7edf93d41b1785661",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15511,
+                    End     = 33958,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 234179,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 4
+                }
+            }
+        },
+        */ new OpticalImageTestExpected
+        {
+            TestFile  = "test_multi_karaoke_sampler.cue",
+            MediaType = MediaType.CDROMXA,
+            Sectors   = 329158,
+            MD5       = "9a19aa0df066732a8ec34025e8160248",
+            LongMD5   = "e981f7dfdb522ba937fe75474e23a446",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1886,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1887,
+                    End     = 32748,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/UltraISO/Nero.cs b/Aaru.Tests/Images/UltraISO/Nero.cs
index d7c26aeb2..84d1aa903 100644
--- a/Aaru.Tests/Images/UltraISO/Nero.cs
+++ b/Aaru.Tests/Images/UltraISO/Nero.cs
@@ -31,775 +31,774 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.UltraISO
-{
-    [TestFixture]
-    public class Nero : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Nero");
-        public override IMediaImage _plugin => new DiscImages.Nero();
+namespace Aaru.Tests.Images.UltraISO;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Nero : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "UltraISO", "Nero");
+    public override IMediaImage _plugin => new DiscImages.Nero();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "cdiready_the_apprentice.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 279300,
+            MD5           = "f6bd226d3f249fa821460aeb1393cf3b",
+            LongMD5       = "f6bd226d3f249fa821460aeb1393cf3b",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "cdiready_the_apprentice.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 279300,
-                MD5           = "f6bd226d3f249fa821460aeb1393cf3b",
-                LongMD5       = "f6bd226d3f249fa821460aeb1393cf3b",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 19649,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 88800,
-                        End     = 107624,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 107625,
-                        End     = 112199,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 112200,
-                        End     = 133649,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 133650,
-                        End     = 138224,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 138225,
-                        End     = 159824,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 159825,
-                        End     = 164774,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 164775,
-                        End     = 185399,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 185400,
-                        End     = 190124,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 190125,
-                        End     = 208874,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 208875,
-                        End     = 212999,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 213000,
-                        End     = 232199,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 232200,
-                        End     = 236699,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 236700,
-                        End     = 241874,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 241875,
-                        End     = 256124,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256125,
-                        End     = 256874,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 256875,
-                        End     = 265649,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 265650,
-                        End     = 267374,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 267375,
-                        End     = 269999,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 270000,
-                        End     = 271649,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 271650,
-                        End     = 274274,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 274275,
-                        End     = 279299,
-                        Pregap  = 18446744073709482466,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 19649,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 88800,
+                    End     = 107624,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 107625,
+                    End     = 112199,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 112200,
+                    End     = 133649,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 133650,
+                    End     = 138224,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 138225,
+                    End     = 159824,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 159825,
+                    End     = 164774,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 164775,
+                    End     = 185399,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 185400,
+                    End     = 190124,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 190125,
+                    End     = 208874,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 208875,
+                    End     = 212999,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 213000,
+                    End     = 232199,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 232200,
+                    End     = 236699,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 236700,
+                    End     = 241874,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 241875,
+                    End     = 256124,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256125,
+                    End     = 256874,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 256875,
+                    End     = 265649,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 265650,
+                    End     = 267374,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 267375,
+                    End     = 269999,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 270000,
+                    End     = 271649,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 271650,
+                    End     = 274274,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 274275,
+                    End     = 279299,
+                    Pregap  = 18446744073709482466,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.nrg",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "report_audiocd.nrg",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.nrg",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrom.nrg",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.nrg",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdram_v2.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 471090,
-                MD5       = "35cb08dd5fedfb8e9ad2918292e51791",
-                LongMD5   = "35cb08dd5fedfb8e9ad2918292e51791",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 471089,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 471090,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "12_2_RELEASE_AMD64_CD"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvd-r+dl.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 3455920,
-                MD5       = "1cd9b9be5c5e337c5e6576156b84b726",
-                LongMD5   = "1cd9b9be5c5e337c5e6576156b84b726",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 3455919,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters     = 3455920,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Test DVD",
-                                VolumeSerial = "483E25D50034BBB0"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile  = "report_dvdrom.nrg",
-                MediaType = MediaType.DVDROM,
-                Sectors   = 2146357,
-                MD5       = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
-                LongMD5   = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 2146356,
-                        Pregap  = 0,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 2146357,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "SU1100.001"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_enhancedcd.nrg",
-                MediaType     = MediaType.CDPLUS,
-                Sectors       = 303316,
-                MD5           = "31d07fe62a6505c1d15a88d2c264f3b5",
-                LongMD5       = "916333b50640479f0c989997bb6de629",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 15660,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 15661,
-                        End     = 33958,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 33959,
-                        End     = 51329,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 51330,
-                        End     = 71972,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 71973,
-                        End     = 87581,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 87582,
-                        End     = 103304,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 103305,
-                        End     = 117690,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117691,
-                        End     = 136166,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136167,
-                        End     = 153417,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 153418,
-                        End     = 166931,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 166932,
-                        End     = 187112,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 187113,
-                        End     = 201440,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201441,
-                        End     = 222779,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 234030,
-                        End     = 303315,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 14,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 69136,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Melanie C"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sampler.nrg",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 329158,
-                MD5           = "f09312ba25a479fb81912a2965babd22",
-                LongMD5       = "f48603d11883593f45ec4a3824681e4e",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 150,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32749,
-                        End     = 52671,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52672,
-                        End     = 70303,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70304,
-                        End     = 100097,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 100098,
-                        End     = 119760,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119761,
-                        End     = 136998,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136999,
-                        End     = 155789,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155790,
-                        End     = 175825,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175826,
-                        End     = 206460,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206461,
-                        End     = 226449,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226450,
-                        End     = 244354,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244355,
-                        End     = 273964,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273965,
-                        End     = 293751,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293752,
-                        End     = 310710,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310711,
-                        End     = 329157,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.nrg",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdram_v2.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 471090,
+            MD5       = "35cb08dd5fedfb8e9ad2918292e51791",
+            LongMD5   = "35cb08dd5fedfb8e9ad2918292e51791",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 471089,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 471090,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "12_2_RELEASE_AMD64_CD"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvd-r+dl.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 3455920,
+            MD5       = "1cd9b9be5c5e337c5e6576156b84b726",
+            LongMD5   = "1cd9b9be5c5e337c5e6576156b84b726",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 3455919,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters     = 3455920,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Test DVD",
+                            VolumeSerial = "483E25D50034BBB0"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile  = "report_dvdrom.nrg",
+            MediaType = MediaType.DVDROM,
+            Sectors   = 2146357,
+            MD5       = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
+            LongMD5   = "5e1841b7cd6ac0a95b8ae6f110fd89f2",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 2146356,
+                    Pregap  = 0,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 2146357,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "SU1100.001"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_enhancedcd.nrg",
+            MediaType     = MediaType.CDPLUS,
+            Sectors       = 303316,
+            MD5           = "31d07fe62a6505c1d15a88d2c264f3b5",
+            LongMD5       = "916333b50640479f0c989997bb6de629",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 15660,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 15661,
+                    End     = 33958,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 33959,
+                    End     = 51329,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 51330,
+                    End     = 71972,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 71973,
+                    End     = 87581,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 87582,
+                    End     = 103304,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 103305,
+                    End     = 117690,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117691,
+                    End     = 136166,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136167,
+                    End     = 153417,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 153418,
+                    End     = 166931,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 166932,
+                    End     = 187112,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 187113,
+                    End     = 201440,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201441,
+                    End     = 222779,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 234030,
+                    End     = 303315,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 14,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 69136,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Melanie C"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.nrg",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 329158,
+            MD5           = "f09312ba25a479fb81912a2965babd22",
+            LongMD5       = "f48603d11883593f45ec4a3824681e4e",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 150,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32749,
+                    End     = 52671,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52672,
+                    End     = 70303,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70304,
+                    End     = 100097,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 100098,
+                    End     = 119760,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119761,
+                    End     = 136998,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136999,
+                    End     = 155789,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155790,
+                    End     = 175825,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175826,
+                    End     = 206460,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206461,
+                    End     = 226449,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226450,
+                    End     = 244354,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244355,
+                    End     = 273964,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273965,
+                    End     = 293751,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293752,
+                    End     = 310710,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310711,
+                    End     = 329157,
+                    Pregap  = 0,
+                    Flags   = 2
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/Virtual98.cs b/Aaru.Tests/Images/Virtual98.cs
index ef279ad22..09f8c4850 100644
--- a/Aaru.Tests/Images/Virtual98.cs
+++ b/Aaru.Tests/Images/Virtual98.cs
@@ -31,72 +31,71 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class Virtual98 : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Virtual98");
-        public override IMediaImage _plugin => new DiscImages.Virtual98();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Virtual98 : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "Virtual98");
+    public override IMediaImage _plugin    => new DiscImages.Virtual98();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "v98_128.hdd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 524288,
-                SectorSize = 256,
-                MD5        = "be3693b92a5242101e80087611b33092"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "v98_20.hdd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 81920,
-                SectorSize = 256,
-                MD5        = "811b2a9d08abbecf4cb75531d5e51808"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "v98_256.hdd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1048576,
-                SectorSize = 256,
-                MD5        = "cf4375422f50d62e163d697a18542eca"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "v98_41.hdd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 167936,
-                SectorSize = 256,
-                MD5        = "fe4fc08015f1e3a4562e8e867107b561"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "v98_512.hdd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2097152,
-                SectorSize = 256,
-                MD5        = "afb49485f0ef2b39e8377c1fe880e77b"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "v98_65.hdd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 266240,
-                SectorSize = 256,
-                MD5        = "9e4c0bc8bc955b1a21a94df0f7bec3ab"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "v98_80.hdd.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 327680,
-                SectorSize = 256,
-                MD5        = "f5906261c390ea5c5a0e46864fb066cd"
-            }
-        };
-    }
+            TestFile   = "v98_128.hdd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 524288,
+            SectorSize = 256,
+            MD5        = "be3693b92a5242101e80087611b33092"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "v98_20.hdd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 81920,
+            SectorSize = 256,
+            MD5        = "811b2a9d08abbecf4cb75531d5e51808"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "v98_256.hdd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1048576,
+            SectorSize = 256,
+            MD5        = "cf4375422f50d62e163d697a18542eca"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "v98_41.hdd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 167936,
+            SectorSize = 256,
+            MD5        = "fe4fc08015f1e3a4562e8e867107b561"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "v98_512.hdd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2097152,
+            SectorSize = 256,
+            MD5        = "afb49485f0ef2b39e8377c1fe880e77b"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "v98_65.hdd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 266240,
+            SectorSize = 256,
+            MD5        = "9e4c0bc8bc955b1a21a94df0f7bec3ab"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "v98_80.hdd.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 327680,
+            SectorSize = 256,
+            MD5        = "f5906261c390ea5c5a0e46864fb066cd"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
index 8bcdc02d8..d4a857769 100644
--- a/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
+++ b/Aaru.Tests/Images/VirtualBox/VirtualPC.cs
@@ -32,65 +32,64 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.VirtualBox
-{
-    [TestFixture]
-    public class VirtualPc : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualBox", "VirtualPC");
-        public override IMediaImage _plugin => new Vhd();
+namespace Aaru.Tests.Images.VirtualBox;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class VirtualPc : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualBox", "VirtualPC");
+    public override IMediaImage _plugin => new Vhd();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "virtualbox_linux_dynamic_250mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 512000,
-                SectorSize = 512,
-                MD5        = "ab3248888d6f10ef30a084fac6a1e2fd"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "virtualbox_linux_fixed_10mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 20480,
-                SectorSize = 512,
-                MD5        = "f1c9645dbc14efddc7d8a322685f26eb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "virtualbox_macos_dynamic_250mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 512000,
-                SectorSize = 512,
-                MD5        = "ab3248888d6f10ef30a084fac6a1e2fd"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "virtualbox_macos_fixed_10mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 20480,
-                SectorSize = 512,
-                MD5        = "f1c9645dbc14efddc7d8a322685f26eb"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "virtualbox_windows_dynamic_250mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 512000,
-                SectorSize = 512,
-                MD5        = "ab3248888d6f10ef30a084fac6a1e2fd"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "virtualbox_windows_fixed_10mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 20480,
-                SectorSize = 512,
-                MD5        = "f1c9645dbc14efddc7d8a322685f26eb"
-            }
-        };
-    }
+            TestFile   = "virtualbox_linux_dynamic_250mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 512000,
+            SectorSize = 512,
+            MD5        = "ab3248888d6f10ef30a084fac6a1e2fd"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "virtualbox_linux_fixed_10mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 20480,
+            SectorSize = 512,
+            MD5        = "f1c9645dbc14efddc7d8a322685f26eb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "virtualbox_macos_dynamic_250mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 512000,
+            SectorSize = 512,
+            MD5        = "ab3248888d6f10ef30a084fac6a1e2fd"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "virtualbox_macos_fixed_10mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 20480,
+            SectorSize = 512,
+            MD5        = "f1c9645dbc14efddc7d8a322685f26eb"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "virtualbox_windows_dynamic_250mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 512000,
+            SectorSize = 512,
+            MD5        = "ab3248888d6f10ef30a084fac6a1e2fd"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "virtualbox_windows_fixed_10mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 20480,
+            SectorSize = 512,
+            MD5        = "f1c9645dbc14efddc7d8a322685f26eb"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/VirtualPC/Raw.cs b/Aaru.Tests/Images/VirtualPC/Raw.cs
index bf4967631..d12b78fe4 100644
--- a/Aaru.Tests/Images/VirtualPC/Raw.cs
+++ b/Aaru.Tests/Images/VirtualPC/Raw.cs
@@ -32,64 +32,63 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.VirtualPC
-{
-    [TestFixture]
-    public class Raw : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.VirtualPC;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Raw : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC");
+    public override IMediaImage _plugin    => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "vpc106b_fixed_150mb_fat16.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 307024,
+            SectorSize = 512,
+            MD5        = "56eb1b7a4ea849e93de35f48b8912cd1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc213_fixed_50mb_fat16.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 102306,
+            SectorSize = 512,
+            MD5        = "f05abd9ff39f6b7e39834724b52a49e1"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc303_fixed_30mb_fat16.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 62356,
+            SectorSize = 512,
+            MD5        = "46d5f39b1169a2721863b71e2944e3c2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc30_fixed_30mb_fat16.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 61404,
+            SectorSize = 512,
+            MD5        = "86b522d83ab057fa76eab0941357e1f6"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc4_fixed_130mb_fat16.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 266016,
+            SectorSize = 512,
+            MD5        = "5f4d4c4f268ea19c91bf4fb49f4894b6",
+            Partitions = new[]
             {
-                TestFile   = "vpc106b_fixed_150mb_fat16.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 307024,
-                SectorSize = 512,
-                MD5        = "56eb1b7a4ea849e93de35f48b8912cd1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc213_fixed_50mb_fat16.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 102306,
-                SectorSize = 512,
-                MD5        = "f05abd9ff39f6b7e39834724b52a49e1"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc303_fixed_30mb_fat16.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 62356,
-                SectorSize = 512,
-                MD5        = "46d5f39b1169a2721863b71e2944e3c2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc30_fixed_30mb_fat16.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 61404,
-                SectorSize = 512,
-                MD5        = "86b522d83ab057fa76eab0941357e1f6"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc4_fixed_130mb_fat16.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 266016,
-                SectorSize = 512,
-                MD5        = "5f4d4c4f268ea19c91bf4fb49f4894b6",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 17,
-                        Length = 265727
-                    }
+                    Start  = 17,
+                    Length = 265727
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
index a73fea818..3eb0d736c 100644
--- a/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
+++ b/Aaru.Tests/Images/VirtualPC/VirtualPC.cs
@@ -32,176 +32,175 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.VirtualPC
-{
-    [TestFixture]
-    public class VirtualPc : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC");
-        public override IMediaImage _plugin => new Vhd();
+namespace Aaru.Tests.Images.VirtualPC;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class VirtualPc : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "VirtualPC");
+    public override IMediaImage _plugin    => new Vhd();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "vpc40_dynamic_128mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 261936,
+            SectorSize = 512,
+            MD5        = "cc634bb9bbf2dcdd88cfe251390e2049",
+            Partitions = new[]
             {
-                TestFile   = "vpc40_dynamic_128mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 261936,
-                SectorSize = 512,
-                MD5        = "cc634bb9bbf2dcdd88cfe251390e2049",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 17,
-                        Length = 261647
-                    }
+                    Start  = 17,
+                    Length = 261647
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc40_fixed_128mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 261936,
-                SectorSize = 512,
-                MD5        = "0b6f655387e101c0249e922b1714a484",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 17,
-                        Length = 261647
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc50_dynamic_512mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1052352,
-                SectorSize = 512,
-                MD5        = "12ebc62199ecaae97efe406ee891d68f",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 1052289
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc50_fixed_512mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1052352,
-                SectorSize = 512,
-                MD5        = "4943fc799eddd6f386b2923847824ffc",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 63,
-                        Length = 1052289
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc50_dynamic_250mb.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 511056,
-                SectorSize = 512,
-                MD5        = "a6041066df8f52f5d14b8200766d6bb5"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc50_fixed_10mb.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 20468,
-                SectorSize = 512,
-                MD5        = "1c843b778d48a67b78e4ca65ab602673"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc504_dynamic_250mb.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 511056,
-                SectorSize = 512,
-                MD5        = "e924cd1bbb16f6a6056f81df410922ae"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc504_fixed_10mb.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 20468,
-                SectorSize = 512,
-                MD5        = "b790693b1c94bed209ee1bb9d0b6a075"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc60_differencing_parent_250mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 511056,
-                SectorSize = 512,
-                MD5        = "1f9e3dc39db37a9e01fede6a12844222"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc60_dynamic_250mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 511056,
-                SectorSize = 512,
-                MD5        = "943a9da318111f50a92c3f2314fad1e0"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc60_fixed_10mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 20468,
-                SectorSize = 512,
-                MD5        = "4b4e98a5bba2469382132f9289ae1c57"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc601_dynamic_250mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 511056,
-                SectorSize = 512,
-                MD5        = "1f9e3dc39db37a9e01fede6a12844222"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc601_fixed_10mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 20468,
-                SectorSize = 512,
-                MD5        = "4b4e98a5bba2469382132f9289ae1c57"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc702_differencing_parent_250mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 31456656,
-                SectorSize = 512,
-                MD5        = "df41b76f8532fc8ef775f89212191244"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc702_dynamic_250mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 511056,
-                SectorSize = 512,
-                MD5        = "1f9e3dc39db37a9e01fede6a12844222"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "vpc702_fixed_10mb.vhd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 20468,
-                SectorSize = 512,
-                MD5        = "4b4e98a5bba2469382132f9289ae1c57"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc40_fixed_128mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 261936,
+            SectorSize = 512,
+            MD5        = "0b6f655387e101c0249e922b1714a484",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 17,
+                    Length = 261647
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc50_dynamic_512mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1052352,
+            SectorSize = 512,
+            MD5        = "12ebc62199ecaae97efe406ee891d68f",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 63,
+                    Length = 1052289
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc50_fixed_512mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1052352,
+            SectorSize = 512,
+            MD5        = "4943fc799eddd6f386b2923847824ffc",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 63,
+                    Length = 1052289
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc50_dynamic_250mb.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 511056,
+            SectorSize = 512,
+            MD5        = "a6041066df8f52f5d14b8200766d6bb5"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc50_fixed_10mb.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 20468,
+            SectorSize = 512,
+            MD5        = "1c843b778d48a67b78e4ca65ab602673"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc504_dynamic_250mb.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 511056,
+            SectorSize = 512,
+            MD5        = "e924cd1bbb16f6a6056f81df410922ae"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc504_fixed_10mb.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 20468,
+            SectorSize = 512,
+            MD5        = "b790693b1c94bed209ee1bb9d0b6a075"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc60_differencing_parent_250mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 511056,
+            SectorSize = 512,
+            MD5        = "1f9e3dc39db37a9e01fede6a12844222"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc60_dynamic_250mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 511056,
+            SectorSize = 512,
+            MD5        = "943a9da318111f50a92c3f2314fad1e0"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc60_fixed_10mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 20468,
+            SectorSize = 512,
+            MD5        = "4b4e98a5bba2469382132f9289ae1c57"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc601_dynamic_250mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 511056,
+            SectorSize = 512,
+            MD5        = "1f9e3dc39db37a9e01fede6a12844222"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc601_fixed_10mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 20468,
+            SectorSize = 512,
+            MD5        = "4b4e98a5bba2469382132f9289ae1c57"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc702_differencing_parent_250mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 31456656,
+            SectorSize = 512,
+            MD5        = "df41b76f8532fc8ef775f89212191244"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc702_dynamic_250mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 511056,
+            SectorSize = 512,
+            MD5        = "1f9e3dc39db37a9e01fede6a12844222"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "vpc702_fixed_10mb.vhd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 20468,
+            SectorSize = 512,
+            MD5        = "4b4e98a5bba2469382132f9289ae1c57"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/cdrdao/cooked/nosub.cs b/Aaru.Tests/Images/cdrdao/cooked/nosub.cs
index 7502fa8ba..e8b1326fd 100644
--- a/Aaru.Tests/Images/cdrdao/cooked/nosub.cs
+++ b/Aaru.Tests/Images/cdrdao/cooked/nosub.cs
@@ -32,400 +32,399 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.cdrdao.cooked
-{
-    [TestFixture]
-    public class nosub : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "nosub");
-        public override IMediaImage _plugin => new Cdrdao();
+namespace Aaru.Tests.Images.cdrdao.cooked;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class nosub : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "nosub");
+    public override IMediaImage _plugin => new Cdrdao();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile   = "report_audiocd.toc",
+            MediaType  = MediaType.CDDA,
+            Sectors    = 247073,
+            SectorSize = 2352,
+            MD5        = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5    = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            Tracks = new[]
             {
-                TestFile   = "report_audiocd.toc",
-                MediaType  = MediaType.CDDA,
-                Sectors    = 247073,
-                SectorSize = 2352,
-                MD5        = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5    = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16539,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16540,
-                        End     = 30039,
-                        Pregap  = 9,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30040,
-                        End     = 47923,
-                        Pregap  = 11,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47924,
-                        End     = 63307,
-                        Pregap  = 26,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63308,
-                        End     = 78918,
-                        Pregap  = 6,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78919,
-                        End     = 94723,
-                        Pregap  = 6,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94724,
-                        End     = 117106,
-                        Pregap  = 8,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117107,
-                        End     = 136157,
-                        Pregap  = 18,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136158,
-                        End     = 154048,
-                        Pregap  = 8,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154049,
-                        End     = 170747,
-                        Pregap  = 23,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170748,
-                        End     = 186519,
-                        Pregap  = 3,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186520,
-                        End     = 201793,
-                        Pregap  = 19,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201794,
-                        End     = 224444,
-                        Pregap  = 5,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224445,
-                        End     = 247072,
-                        Pregap  = 4,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16539,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16540,
+                    End     = 30039,
+                    Pregap  = 9,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30040,
+                    End     = 47923,
+                    Pregap  = 11,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47924,
+                    End     = 63307,
+                    Pregap  = 26,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63308,
+                    End     = 78918,
+                    Pregap  = 6,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78919,
+                    End     = 94723,
+                    Pregap  = 6,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94724,
+                    End     = 117106,
+                    Pregap  = 8,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117107,
+                    End     = 136157,
+                    Pregap  = 18,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136158,
+                    End     = 154048,
+                    Pregap  = 8,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154049,
+                    End     = 170747,
+                    Pregap  = 23,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170748,
+                    End     = 186519,
+                    Pregap  = 3,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186520,
+                    End     = 201793,
+                    Pregap  = 19,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201794,
+                    End     = 224444,
+                    Pregap  = 5,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224445,
+                    End     = 247072,
+                    Pregap  = 4,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_cdr.toc",
+            MediaType  = MediaType.CDROM,
+            Sectors    = 254265,
+            SectorSize = 2048,
+            MD5        = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5    = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
             {
-                TestFile   = "report_cdr.toc",
-                MediaType  = MediaType.CDROM,
-                Sectors    = 254265,
-                SectorSize = 2048,
-                MD5        = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5    = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_cdrom.toc",
-                MediaType  = MediaType.CDROM,
-                Sectors    = 254265,
-                SectorSize = 2048,
-                MD5        = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5    = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_cdrw.toc",
-                MediaType  = MediaType.CDROM,
-                Sectors    = 308224,
-                SectorSize = 2048,
-                MD5        = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5    = "3af5f943ddb9427d9c63a4ce3b704db9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "test_multi_karaoke_sampler.toc",
-                MediaType  = MediaType.CDROM,
-                Sectors    = 329008,
-                SectorSize = 2048,
-                MD5        = "f09312ba25a479fb81912a2965babd22",
-                LongMD5    = "f48603d11883593f45ec4a3824681e4e",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329007,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_cdrom.toc",
+            MediaType  = MediaType.CDROM,
+            Sectors    = 254265,
+            SectorSize = 2048,
+            MD5        = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5    = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_cdrw.toc",
+            MediaType  = MediaType.CDROM,
+            Sectors    = 308224,
+            SectorSize = 2048,
+            MD5        = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5    = "3af5f943ddb9427d9c63a4ce3b704db9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "test_multi_karaoke_sampler.toc",
+            MediaType  = MediaType.CDROM,
+            Sectors    = 329008,
+            SectorSize = 2048,
+            MD5        = "f09312ba25a479fb81912a2965babd22",
+            LongMD5    = "f48603d11883593f45ec4a3824681e4e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329007,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/cdrdao/cooked/rw.cs b/Aaru.Tests/Images/cdrdao/cooked/rw.cs
index 9d06af2b7..a74363d54 100644
--- a/Aaru.Tests/Images/cdrdao/cooked/rw.cs
+++ b/Aaru.Tests/Images/cdrdao/cooked/rw.cs
@@ -32,405 +32,404 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.cdrdao.cooked
-{
-    [TestFixture]
-    public class rw : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "rw");
-        public override IMediaImage _plugin => new Cdrdao();
+namespace Aaru.Tests.Images.cdrdao.cooked;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class rw : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "rw");
+    public override IMediaImage _plugin => new Cdrdao();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "report_audiocd.toc",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            SectorSize    = 2352,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "d62fd0cdca05b4b42f7c17b316610e15",
+            Tracks = new[]
             {
-                TestFile      = "report_audiocd.toc",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                SectorSize    = 2352,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "d62fd0cdca05b4b42f7c17b316610e15",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "e89c610fbf1093480603de7e4b5fe99b",
+            Tracks = new[]
             {
-                TestFile      = "report_cdr.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "e89c610fbf1093480603de7e4b5fe99b",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "7e67d6238f1cda44cb491e5f590f5794",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                SectorSize    = 2048,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "2ec808f5618ef407ae1f49cb23648914",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sampler.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 329008,
-                SectorSize    = 2048,
-                MD5           = "f09312ba25a479fb81912a2965babd22",
-                LongMD5       = "f48603d11883593f45ec4a3824681e4e",
-                SubchannelMD5 = "6841e5744d8301c219742ecd61fd9ac4",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329007,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "7e67d6238f1cda44cb491e5f590f5794",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            SectorSize    = 2048,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "2ec808f5618ef407ae1f49cb23648914",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 329008,
+            SectorSize    = 2048,
+            MD5           = "f09312ba25a479fb81912a2965babd22",
+            LongMD5       = "f48603d11883593f45ec4a3824681e4e",
+            SubchannelMD5 = "6841e5744d8301c219742ecd61fd9ac4",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329007,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs b/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
index 22cf050c7..e71c97fc2 100644
--- a/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
+++ b/Aaru.Tests/Images/cdrdao/cooked/rw_raw.cs
@@ -32,405 +32,404 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.cdrdao.cooked
-{
-    [TestFixture]
-    public class rw_raw : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "rw_raw");
-        public override IMediaImage _plugin => new Cdrdao();
+namespace Aaru.Tests.Images.cdrdao.cooked;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class rw_raw : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "cooked", "rw_raw");
+    public override IMediaImage _plugin => new Cdrdao();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "report_audiocd.toc",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            SectorSize    = 2352,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "e68088c7f1236c2304778e976057bd6e",
+            Tracks = new[]
             {
-                TestFile      = "report_audiocd.toc",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                SectorSize    = 2352,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "e68088c7f1236c2304778e976057bd6e",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "8ed5c39d7435aeac23e77478625f14f1",
+            Tracks = new[]
             {
-                TestFile      = "report_cdr.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "8ed5c39d7435aeac23e77478625f14f1",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "0ba3fa223e887fb955458fc7b40b0396",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                SectorSize    = 2048,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "eaf6dcfb86e9aca9856d736f3b04c765",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sampler.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 329008,
-                SectorSize    = 2048,
-                MD5           = "f09312ba25a479fb81912a2965babd22",
-                LongMD5       = "f48603d11883593f45ec4a3824681e4e",
-                SubchannelMD5 = "7ac088d8a737d8d39b1cced86d11c7b5",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329007,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "0ba3fa223e887fb955458fc7b40b0396",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            SectorSize    = 2048,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "eaf6dcfb86e9aca9856d736f3b04c765",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 329008,
+            SectorSize    = 2048,
+            MD5           = "f09312ba25a479fb81912a2965babd22",
+            LongMD5       = "f48603d11883593f45ec4a3824681e4e",
+            SubchannelMD5 = "7ac088d8a737d8d39b1cced86d11c7b5",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329007,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/cdrdao/raw/nosub.cs b/Aaru.Tests/Images/cdrdao/raw/nosub.cs
index 638391493..f57a3080d 100644
--- a/Aaru.Tests/Images/cdrdao/raw/nosub.cs
+++ b/Aaru.Tests/Images/cdrdao/raw/nosub.cs
@@ -32,400 +32,399 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.cdrdao.raw
-{
-    [TestFixture]
-    public class nosub : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "nosub");
-        public override IMediaImage _plugin => new Cdrdao();
+namespace Aaru.Tests.Images.cdrdao.raw;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class nosub : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "nosub");
+    public override IMediaImage _plugin => new Cdrdao();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile   = "report_audiocd.toc",
+            MediaType  = MediaType.CDDA,
+            Sectors    = 247073,
+            SectorSize = 2352,
+            MD5        = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5    = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            Tracks = new[]
             {
-                TestFile   = "report_audiocd.toc",
-                MediaType  = MediaType.CDDA,
-                Sectors    = 247073,
-                SectorSize = 2352,
-                MD5        = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5    = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16539,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16540,
-                        End     = 30039,
-                        Pregap  = 9,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30040,
-                        End     = 47923,
-                        Pregap  = 11,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47924,
-                        End     = 63307,
-                        Pregap  = 26,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63308,
-                        End     = 78918,
-                        Pregap  = 6,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78919,
-                        End     = 94723,
-                        Pregap  = 6,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94724,
-                        End     = 117106,
-                        Pregap  = 8,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117107,
-                        End     = 136157,
-                        Pregap  = 18,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136158,
-                        End     = 154048,
-                        Pregap  = 8,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154049,
-                        End     = 170747,
-                        Pregap  = 23,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170748,
-                        End     = 186519,
-                        Pregap  = 3,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186520,
-                        End     = 201793,
-                        Pregap  = 19,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201794,
-                        End     = 224444,
-                        Pregap  = 5,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224445,
-                        End     = 247072,
-                        Pregap  = 4,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16539,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16540,
+                    End     = 30039,
+                    Pregap  = 9,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30040,
+                    End     = 47923,
+                    Pregap  = 11,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47924,
+                    End     = 63307,
+                    Pregap  = 26,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63308,
+                    End     = 78918,
+                    Pregap  = 6,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78919,
+                    End     = 94723,
+                    Pregap  = 6,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94724,
+                    End     = 117106,
+                    Pregap  = 8,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117107,
+                    End     = 136157,
+                    Pregap  = 18,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136158,
+                    End     = 154048,
+                    Pregap  = 8,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154049,
+                    End     = 170747,
+                    Pregap  = 23,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170748,
+                    End     = 186519,
+                    Pregap  = 3,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186520,
+                    End     = 201793,
+                    Pregap  = 19,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201794,
+                    End     = 224444,
+                    Pregap  = 5,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224445,
+                    End     = 247072,
+                    Pregap  = 4,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_cdr.toc",
+            MediaType  = MediaType.CDROM,
+            Sectors    = 254265,
+            SectorSize = 2048,
+            MD5        = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5    = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
             {
-                TestFile   = "report_cdr.toc",
-                MediaType  = MediaType.CDROM,
-                Sectors    = 254265,
-                SectorSize = 2048,
-                MD5        = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5    = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_cdrom.toc",
-                MediaType  = MediaType.CDROM,
-                Sectors    = 254265,
-                SectorSize = 2048,
-                MD5        = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5    = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "report_cdrw.toc",
-                MediaType  = MediaType.CDROM,
-                Sectors    = 308224,
-                SectorSize = 2048,
-                MD5        = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5    = "3af5f943ddb9427d9c63a4ce3b704db9",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile   = "test_multi_karaoke_sampler.toc",
-                MediaType  = MediaType.CDROM,
-                Sectors    = 329008,
-                SectorSize = 2048,
-                MD5        = "f09312ba25a479fb81912a2965babd22",
-                LongMD5    = "f48603d11883593f45ec4a3824681e4e",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329007,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_cdrom.toc",
+            MediaType  = MediaType.CDROM,
+            Sectors    = 254265,
+            SectorSize = 2048,
+            MD5        = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5    = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "report_cdrw.toc",
+            MediaType  = MediaType.CDROM,
+            Sectors    = 308224,
+            SectorSize = 2048,
+            MD5        = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5    = "3af5f943ddb9427d9c63a4ce3b704db9",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile   = "test_multi_karaoke_sampler.toc",
+            MediaType  = MediaType.CDROM,
+            Sectors    = 329008,
+            SectorSize = 2048,
+            MD5        = "f09312ba25a479fb81912a2965babd22",
+            LongMD5    = "f48603d11883593f45ec4a3824681e4e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329007,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/cdrdao/raw/rw.cs b/Aaru.Tests/Images/cdrdao/raw/rw.cs
index 48ae9aadb..fd8e09b58 100644
--- a/Aaru.Tests/Images/cdrdao/raw/rw.cs
+++ b/Aaru.Tests/Images/cdrdao/raw/rw.cs
@@ -32,405 +32,404 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.cdrdao.raw
-{
-    [TestFixture]
-    public class rw : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "rw");
-        public override IMediaImage _plugin => new Cdrdao();
+namespace Aaru.Tests.Images.cdrdao.raw;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class rw : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "rw");
+    public override IMediaImage _plugin => new Cdrdao();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "report_audiocd.toc",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            SectorSize    = 2352,
+            MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
+            SubchannelMD5 = "2dc7b6159f8ba4fc8c1c58407d7741ba",
+            Tracks = new[]
             {
-                TestFile      = "report_audiocd.toc",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                SectorSize    = 2352,
-                MD5           = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                LongMD5       = "c09f408a4416634d8ac1c1ffd0ed75a5",
-                SubchannelMD5 = "2dc7b6159f8ba4fc8c1c58407d7741ba",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "5bdb9b11d8bc01867f629134ee635f90",
+            Tracks = new[]
             {
-                TestFile      = "report_cdr.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "5bdb9b11d8bc01867f629134ee635f90",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrom.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "2cee3bd721e3ecee6f426cbe7c7026c2",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "report_cdrw.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                SectorSize    = 2048,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "7e39b9ba733af2efefcc4297ec01e66e",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
-                        }
-                    }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multi_karaoke_sampler.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 329008,
-                SectorSize    = 2048,
-                MD5           = "d38c92fe94f3c3ac3c7799ff9866e46b",
-                LongMD5       = "40b4ea8170056ea27190fd0bdaec3a6c",
-                SubchannelMD5 = "24d557ef2fafe96991d9a15474e27eae",
-                Tracks = new[]
-                {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
-                        {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
-                        }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329007,
-                        Pregap  = 150,
-                        Flags   = 0
-                    }
-                }
             }
-        };
-    }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "2cee3bd721e3ecee6f426cbe7c7026c2",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            SectorSize    = 2048,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "7e39b9ba733af2efefcc4297ec01e66e",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
+                        }
+                    }
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sampler.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 329008,
+            SectorSize    = 2048,
+            MD5           = "d38c92fe94f3c3ac3c7799ff9866e46b",
+            LongMD5       = "40b4ea8170056ea27190fd0bdaec3a6c",
+            SubchannelMD5 = "24d557ef2fafe96991d9a15474e27eae",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
+                    {
+                        new FileSystemTest
+                        {
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
+                        }
+                    }
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329007,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs b/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs
index fa8964d32..571f7aeb3 100644
--- a/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs
+++ b/Aaru.Tests/Images/cdrdao/raw/rw_raw.cs
@@ -32,666 +32,665 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.cdrdao.raw
-{
-    [TestFixture]
-    public class rw_raw : OpticalMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "rw_raw");
-        public override IMediaImage _plugin => new Cdrdao();
+namespace Aaru.Tests.Images.cdrdao.raw;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+[TestFixture]
+public class rw_raw : OpticalMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "cdrdao", "raw", "rw_raw");
+    public override IMediaImage _plugin => new Cdrdao();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "gigarec.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 469652,
+            MD5           = "cafcd998298d8d1d447ab2e567638c9e",
+            LongMD5       = "092b4207604685c6b274068b6eca52c0",
+            SubchannelMD5 = "607c53d8ea5589bbc8a3e4ff5857cb5d",
+            Tracks = new[]
             {
-                TestFile      = "gigarec.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 469652,
-                MD5           = "cafcd998298d8d1d447ab2e567638c9e",
-                LongMD5       = "092b4207604685c6b274068b6eca52c0",
-                SubchannelMD5 = "607c53d8ea5589bbc8a3e4ff5857cb5d",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 469651,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 469651,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 469652,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "New Volume"
-                            }
+                            Clusters    = 469652,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "New Volume"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_audiocd.toc",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 247073,
+            SectorSize    = 2352,
+            MD5           = "1787cdeab550752d159a8ecca62fe386",
+            LongMD5       = "1787cdeab550752d159a8ecca62fe386",
+            SubchannelMD5 = "4fa3d7dd5e1710878ac318986a677fb3",
+            Tracks = new[]
             {
-                TestFile      = "report_audiocd.toc",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 247073,
-                SectorSize    = 2352,
-                MD5           = "1787cdeab550752d159a8ecca62fe386",
-                LongMD5       = "1787cdeab550752d159a8ecca62fe386",
-                SubchannelMD5 = "4fa3d7dd5e1710878ac318986a677fb3",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 16548,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 16549,
-                        End     = 30050,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 30051,
-                        End     = 47949,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 47950,
-                        End     = 63313,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 63314,
-                        End     = 78924,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78925,
-                        End     = 94731,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 94732,
-                        End     = 117124,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 117125,
-                        End     = 136165,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136166,
-                        End     = 154071,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 154072,
-                        End     = 170750,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 170751,
-                        End     = 186538,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 186539,
-                        End     = 201798,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 201799,
-                        End     = 224448,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 224449,
-                        End     = 247072,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 16548,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 16549,
+                    End     = 30050,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 30051,
+                    End     = 47949,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 47950,
+                    End     = 63313,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 63314,
+                    End     = 78924,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78925,
+                    End     = 94731,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 94732,
+                    End     = 117124,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 117125,
+                    End     = 136165,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136166,
+                    End     = 154071,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 154072,
+                    End     = 170750,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 170751,
+                    End     = 186538,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 186539,
+                    End     = 201798,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 201799,
+                    End     = 224448,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 224449,
+                    End     = 247072,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdr.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "d81b6abcfa5f84ba0647f38f86cc8fc8",
+            Tracks = new[]
             {
-                TestFile      = "report_cdr.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "d81b6abcfa5f84ba0647f38f86cc8fc8",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrom.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 254265,
+            SectorSize    = 2048,
+            MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
+            LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
+            SubchannelMD5 = "935c5d899c1cf0e46fa571df99400253",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrom.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 254265,
-                SectorSize    = 2048,
-                MD5           = "bf4bbec517101d0d6f45d2e4d50cb875",
-                LongMD5       = "3d3f9cf7d1ba2249b1e7960071e5af46",
-                SubchannelMD5 = "935c5d899c1cf0e46fa571df99400253",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254264,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254264,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 63562,
-                                ClusterSize = 8192,
-                                Type        = "HFS",
-                                VolumeName  = "Winpower"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters    = 254265,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Winpower"
-                            }
+                            Clusters    = 63562,
+                            ClusterSize = 8192,
+                            Type        = "HFS",
+                            VolumeName  = "Winpower"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters    = 254265,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Winpower"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "report_cdrw.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 308224,
+            SectorSize    = 2048,
+            MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
+            LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
+            SubchannelMD5 = "2e9b8107254e46b7be689105f680ee84",
+            Tracks = new[]
             {
-                TestFile      = "report_cdrw.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 308224,
-                SectorSize    = 2048,
-                MD5           = "1e55aa420ca8f8ea77d5b597c9cfc19b",
-                LongMD5       = "3af5f943ddb9427d9c63a4ce3b704db9",
-                SubchannelMD5 = "2e9b8107254e46b7be689105f680ee84",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 308223,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 308223,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Bootable    = true,
-                                Clusters    = 308224,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "ARCH_201901"
-                            }
+                            Bootable    = true,
+                            Clusters    = 308224,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "ARCH_201901"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_enhancedcd.toc",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 28953,
+            MD5           = "08629b564dc094927b657b8b9d2106d6",
+            LongMD5       = "08629b564dc094927b657b8b9d2106d6",
+            SubchannelMD5 = "4747b7451c06564582940008522c40a4",
+            Tracks = new[]
             {
-                TestFile      = "test_enhancedcd.toc",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 28953,
-                MD5           = "08629b564dc094927b657b8b9d2106d6",
-                LongMD5       = "08629b564dc094927b657b8b9d2106d6",
-                SubchannelMD5 = "4747b7451c06564582940008522c40a4",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 14404,
-                        Pregap  = 150,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 14405,
-                        End     = 28952,
-                        Pregap  = 0,
-                        Flags   = 0
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 14404,
+                    Pregap  = 150,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 14405,
+                    End     = 28952,
+                    Pregap  = 0,
+                    Flags   = 0
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multi_karaoke_sample.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 329008,
+            SectorSize    = 2048,
+            MD5           = "f09312ba25a479fb81912a2965babd22",
+            LongMD5       = "f48603d11883593f45ec4a3824681e4e",
+            SubchannelMD5 = "ed0ca0f9bcdd0ebae2671549bf13311e",
+            Tracks = new[]
             {
-                TestFile      = "test_multi_karaoke_sample.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 329008,
-                SectorSize    = 2048,
-                MD5           = "f09312ba25a479fb81912a2965babd22",
-                LongMD5       = "f48603d11883593f45ec4a3824681e4e",
-                SubchannelMD5 = "ed0ca0f9bcdd0ebae2671549bf13311e",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1736,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1736,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1587,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = ""
-                            }
+                            Clusters    = 1587,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = ""
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1737,
-                        End     = 32598,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 32599,
-                        End     = 52521,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 52522,
-                        End     = 70153,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 70154,
-                        End     = 99947,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 99948,
-                        End     = 119610,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 119611,
-                        End     = 136848,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 136849,
-                        End     = 155639,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155640,
-                        End     = 175675,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 175676,
-                        End     = 206310,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 206311,
-                        End     = 226299,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 226300,
-                        End     = 244204,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 244205,
-                        End     = 273814,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 273815,
-                        End     = 293601,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 293602,
-                        End     = 310560,
-                        Pregap  = 0,
-                        Flags   = 0
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 310561,
-                        End     = 329007,
-                        Pregap  = 150,
-                        Flags   = 0
                     }
-                }
-            },
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_multisession.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 8133,
-                MD5           = "5a62e796e3d3224d4d7c4a94fa067947",
-                LongMD5       = "84ce0389b12772b371bf93b9ef9cd0d6",
-                SubchannelMD5 = "90f2548c86ea8fc9cde74ac89c01fad7",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 1737,
+                    End     = 32598,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 32599,
+                    End     = 52521,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 52522,
+                    End     = 70153,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 70154,
+                    End     = 99947,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 99948,
+                    End     = 119610,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 119611,
+                    End     = 136848,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 136849,
+                    End     = 155639,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155640,
+                    End     = 175675,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 175676,
+                    End     = 206310,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 206311,
+                    End     = 226299,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 226300,
+                    End     = 244204,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 244205,
+                    End     = 273814,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 273815,
+                    End     = 293601,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 293602,
+                    End     = 310560,
+                    Pregap  = 0,
+                    Flags   = 0
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 310561,
+                    End     = 329007,
+                    Pregap  = 150,
+                    Flags   = 0
+                }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_multisession.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 8133,
+            MD5           = "5a62e796e3d3224d4d7c4a94fa067947",
+            LongMD5       = "84ce0389b12772b371bf93b9ef9cd0d6",
+            SubchannelMD5 = "90f2548c86ea8fc9cde74ac89c01fad7",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 7876,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "Session 1"
-                            },
-                            new FileSystemTest
-                            {
-                                Clusters     = 8133,
-                                ClusterSize  = 2048,
-                                Type         = "UDF v1.02",
-                                VolumeName   = "Session 1",
-                                VolumeSerial = "50958B61AF6A749E"
-                            }
+                            Clusters    = 7876,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "Session 1"
+                        },
+                        new FileSystemTest
+                        {
+                            Clusters     = 8133,
+                            ClusterSize  = 2048,
+                            Type         = "UDF v1.02",
+                            VolumeName   = "Session 1",
+                            VolumeSerial = "50958B61AF6A749E"
                         }
                     }
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_videocd.toc",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 48794,
+            MD5           = "e30dbde1dbb5a384e9005f148541abbe",
+            LongMD5       = "23e2214500204f2c42ca2989f928fea2",
+            SubchannelMD5 = "f738847620ace3f333dbc305321820a1",
+            Tracks = new[]
             {
-                TestFile      = "test_videocd.toc",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 48794,
-                MD5           = "e30dbde1dbb5a384e9005f148541abbe",
-                LongMD5       = "23e2214500204f2c42ca2989f928fea2",
-                SubchannelMD5 = "f738847620ace3f333dbc305321820a1",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
+                    Session = 1,
+                    Start   = 0,
+                    End     = 1251,
+                    Pregap  = 150,
+                    Flags   = 4,
+                    Number  = 1,
+                    FileSystems = new[]
                     {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 1251,
-                        Pregap  = 150,
-                        Flags   = 4,
-                        Number  = 1,
-                        FileSystems = new[]
+                        new FileSystemTest
                         {
-                            new FileSystemTest
-                            {
-                                Clusters    = 1102,
-                                ClusterSize = 2048,
-                                Type        = "ISO9660",
-                                VolumeName  = "VIDEOCD"
-                            }
+                            Clusters    = 1102,
+                            ClusterSize = 2048,
+                            Type        = "ISO9660",
+                            VolumeName  = "VIDEOCD"
                         }
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 1252,
-                        End     = 48793,
-                        Pregap  = 0,
-                        Flags   = 4
                     }
-                }
-            },
-            #region These test images violate the specifications and are not expected to work yet
-            /*
-            new OpticalImageTestExpected
-            {
-                TestFile      = "test_castrated_leadout.toc",
-                MediaType     = MediaType.CDDA,
-                Sectors       = 7843003432689721,
-                MD5           = "UNKNOWN",
-                LongMD5       = "UNKNOWN",
-                SubchannelMD5 = "UNKNOWN",
-                Tracks = new[]
+                },
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 29901,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 29902,
-                        End     = 65183,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 65184,
-                        End     = 78575,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 78576,
-                        End     = 95229,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 95230,
-                        End     = 126296,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 126297,
-                        End     = 155108,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 155109,
-                        End     = 191834,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 191835,
-                        End     = 222925,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 222926,
-                        End     = 243587,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 243588,
-                        End     = 269749,
-                        Pregap  = 0,
-                        Flags   = 2
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 269750,
-                        End     = 7843003432689720,
-                        Pregap  = 0,
-                        Flags   = 2
-                    }
+                    Session = 1,
+                    Start   = 1252,
+                    End     = 48793,
+                    Pregap  = 0,
+                    Flags   = 4
                 }
-            },
-            new OpticalImageTestExpected
+            }
+        },
+        #region These test images violate the specifications and are not expected to work yet
+        /*
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_castrated_leadout.toc",
+            MediaType     = MediaType.CDDA,
+            Sectors       = 7843003432689721,
+            MD5           = "UNKNOWN",
+            LongMD5       = "UNKNOWN",
+            SubchannelMD5 = "UNKNOWN",
+            Tracks = new[]
             {
-                TestFile      = "test_data_track_as_audio_fixed_sub.toc",
-                MediaType     = MediaType.CDROMXA,
-                Sectors       = 25539,
-                MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
-                LongMD5       = "3b3172070738044417ae5284195acbfd",
-                SubchannelMD5 = "caf393bb809eda1a6d3a1727fbac7cb7",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 25538,
-                        Pregap  = 0,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 29901,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 29902,
+                    End     = 65183,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 65184,
+                    End     = 78575,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 78576,
+                    End     = 95229,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 95230,
+                    End     = 126296,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 126297,
+                    End     = 155108,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 155109,
+                    End     = 191834,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 191835,
+                    End     = 222925,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 222926,
+                    End     = 243587,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 243588,
+                    End     = 269749,
+                    Pregap  = 0,
+                    Flags   = 2
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 269750,
+                    End     = 7843003432689720,
+                    Pregap  = 0,
+                    Flags   = 2
                 }
-            },
-            */
-            #endregion
-        };
-    }
+            }
+        },
+        new OpticalImageTestExpected
+        {
+            TestFile      = "test_data_track_as_audio_fixed_sub.toc",
+            MediaType     = MediaType.CDROMXA,
+            Sectors       = 25539,
+            MD5           = "f9efc75192a7c0f3252e696c617f8ddd",
+            LongMD5       = "3b3172070738044417ae5284195acbfd",
+            SubchannelMD5 = "caf393bb809eda1a6d3a1727fbac7cb7",
+            Tracks = new[]
+            {
+                new TrackInfoTestExpected
+                {
+                    Session = 1,
+                    Start   = 0,
+                    End     = 25538,
+                    Pregap  = 0,
+                    Flags   = 4
+                }
+            }
+        },
+        */
+        #endregion
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/partclone.cs b/Aaru.Tests/Images/partclone.cs
index 62016b37c..79be1ccd5 100644
--- a/Aaru.Tests/Images/partclone.cs
+++ b/Aaru.Tests/Images/partclone.cs
@@ -32,74 +32,73 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images
-{
-    [TestFixture]
-    public class Partclone : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "partclone");
-        public override IMediaImage _plugin => new PartClone();
+namespace Aaru.Tests.Images;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Partclone : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "partclone");
+    public override IMediaImage _plugin    => new PartClone();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "ext2.partclone.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 127882,
+            SectorSize = 4096,
+            MD5        = "ff239c91166b6b13fa826dd258b40666"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "fat16.partclone.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1012032,
+            SectorSize = 512,
+            MD5        = "f98b1a51ca2e7bf047d84969a2392a3d",
+            Partitions = new[]
             {
-                TestFile   = "ext2.partclone.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 127882,
-                SectorSize = 4096,
-                MD5        = "ff239c91166b6b13fa826dd258b40666"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "fat16.partclone.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1012032,
-                SectorSize = 512,
-                MD5        = "f98b1a51ca2e7bf047d84969a2392a3d",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1012032
-                    }
+                    Start  = 0,
+                    Length = 1012032
                 }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "fat32.partclone.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1023057,
-                SectorSize = 512,
-                MD5        = "1b0b5eb965a401f16fa8a07e303cd1c0"
-                /* TODO: NullReferenceException
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1023057
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "hfsplus.partclone.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 127882,
-                SectorSize = 4096,
-                MD5        = "880a6777d05c496901e930684abbecff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "ntfs.partclone.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 1023056,
-                SectorSize = 512,
-                MD5        = "61cc3faa286364e7ad5bab18120c1151"
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "fat32.partclone.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1023057,
+            SectorSize = 512,
+            MD5        = "1b0b5eb965a401f16fa8a07e303cd1c0"
+            /* TODO: NullReferenceException
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1023057
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "hfsplus.partclone.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 127882,
+            SectorSize = 4096,
+            MD5        = "880a6777d05c496901e930684abbecff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "ntfs.partclone.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 1023056,
+            SectorSize = 512,
+            MD5        = "61cc3faa286364e7ad5bab18120c1151"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/pce/DiskCopy42.cs b/Aaru.Tests/Images/pce/DiskCopy42.cs
index cceb712ea..127d6a1ba 100644
--- a/Aaru.Tests/Images/pce/DiskCopy42.cs
+++ b/Aaru.Tests/Images/pce/DiskCopy42.cs
@@ -31,65 +31,64 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.pce
-{
-    [TestFixture]
-    public class DiskCopy42 : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "DiskCopy 4.2");
-        public override IMediaImage _plugin => new DiscImages.DiskCopy42();
+namespace Aaru.Tests.Images.pce;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class DiskCopy42 : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "DiskCopy 4.2");
+    public override IMediaImage _plugin => new DiscImages.DiskCopy42();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "mf1dd_gcr.dc42.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec",
+            Partitions = new[]
             {
-                TestFile   = "mf1dd_gcr.dc42.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.dc42.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_gcr.dc42.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "93e71b9ecdb39d3ec9245b4f451856d4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
+                    Start  = 0,
+                    Length = 800
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.dc42.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_gcr.dc42.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "93e71b9ecdb39d3ec9245b4f451856d4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/pce/ImageDisk.cs b/Aaru.Tests/Images/pce/ImageDisk.cs
index 48a830398..c2a31b1f3 100644
--- a/Aaru.Tests/Images/pce/ImageDisk.cs
+++ b/Aaru.Tests/Images/pce/ImageDisk.cs
@@ -32,283 +32,282 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.pce
-{
-    [TestFixture]
-    public class ImageDisk : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "ImageDisk");
-        public override IMediaImage _plugin => new Imd();
+namespace Aaru.Tests.Images.pce;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class ImageDisk : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "ImageDisk");
+    public override IMediaImage _plugin => new Imd();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "md1dd_8.imd.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "8308e749af855a3ded48d474eb7c305e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd.imd.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "b7b8a69b10ee4ec921aa8eea232fdd75"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_8.imd.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "f4a77a2d2a1868dc18e8b92032d02fd2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd.imd.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "099d95ac42d1a8010f914ac64ede7a70"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd.imd.lz",
+            MediaType  = MediaType.NEC_35_HD_15,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "3df7cd10044af75d77e8936af0dbf9ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_nec.imd.lz",
+            MediaType  = MediaType.NEC_35_HD_8,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "fd54916f713d01b670c1a5df5e74a97f",
+            Partitions = new[]
             {
-                TestFile   = "md1dd_8.imd.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "8308e749af855a3ded48d474eb7c305e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd.imd.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "b7b8a69b10ee4ec921aa8eea232fdd75"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_8.imd.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "f4a77a2d2a1868dc18e8b92032d02fd2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd.imd.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "099d95ac42d1a8010f914ac64ede7a70"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd.imd.lz",
-                MediaType  = MediaType.NEC_35_HD_15,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "3df7cd10044af75d77e8936af0dbf9ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_nec.imd.lz",
-                MediaType  = MediaType.NEC_35_HD_8,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "fd54916f713d01b670c1a5df5e74a97f",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_10.imd.lz",
-                MediaType  = MediaType.RX50,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "d75d3e79d9c5051922d4c2226fa4a6ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_11.imd.lz",
-                MediaType  = MediaType.ATARI_35_SS_DD_11,
-                Sectors    = 880,
-                SectorSize = 512,
-                MD5        = "e16ed33a1a466826562c681d8bdf3e27"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_gcr.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_10.imd.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fd48b2c12097cbc646b4a93ef4f92259"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_11.imd.lz",
-                MediaType  = MediaType.CBM_AMIGA_35_DD,
-                Sectors    = 1760,
-                SectorSize = 512,
-                MD5        = "512f7175e753e2e2ad620d448c42545d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_800.imd.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.imd.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "db9cfb6eea18820b7a7e0b5b45594471",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos.imd.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "456390a9c6ab05cb458a03c47296de08",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_gcr.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "93e71b9ecdb39d3ec9245b4f451856d4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.imd.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed.imd.lz",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "854d0d49a522b64af698e319a24cd68e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1812,
-                SectorSize = 1024,
-                MD5        = "c741c78eecd673f8fc49e77459871940"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_168.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3372,
-                SectorSize = 512,
-                MD5        = "7f9164dc43bffc895db751ba1d9b55a9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3372
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3448,
-                SectorSize = 512,
-                MD5        = "d6ff5df3707887a6ba4cfdc30b3deff4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "dbd52e9e684f97d9e2292811242bb24e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.imd.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2882,
-                SectorSize = 2048,
-                MD5        = "f5fff7704fb677ebf23d27cd937c9403"
-                /* TODO: Division by zero because bytes per cluster is 0
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2882
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "rx01.imd.lz",
-                MediaType  = MediaType.RX01,
-                Sectors    = 2002,
-                SectorSize = 128,
-                MD5        = "5b4e36d92b180c3845387391cb5a1c64"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "rx50.imd.lz",
-                MediaType  = MediaType.RX50,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "ccd4431139755c58f340681f63510642",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
+                    Start  = 0,
+                    Length = 1232
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_10.imd.lz",
+            MediaType  = MediaType.RX50,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "d75d3e79d9c5051922d4c2226fa4a6ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_11.imd.lz",
+            MediaType  = MediaType.ATARI_35_SS_DD_11,
+            Sectors    = 880,
+            SectorSize = 512,
+            MD5        = "e16ed33a1a466826562c681d8bdf3e27"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_gcr.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_10.imd.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fd48b2c12097cbc646b4a93ef4f92259"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_11.imd.lz",
+            MediaType  = MediaType.CBM_AMIGA_35_DD,
+            Sectors    = 1760,
+            SectorSize = 512,
+            MD5        = "512f7175e753e2e2ad620d448c42545d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_800.imd.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "c533488a21098a62c85f1649abda2803",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.imd.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "db9cfb6eea18820b7a7e0b5b45594471",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos.imd.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "456390a9c6ab05cb458a03c47296de08",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_gcr.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "93e71b9ecdb39d3ec9245b4f451856d4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.imd.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed.imd.lz",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "854d0d49a522b64af698e319a24cd68e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1812,
+            SectorSize = 1024,
+            MD5        = "c741c78eecd673f8fc49e77459871940"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_168.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3372,
+            SectorSize = 512,
+            MD5        = "7f9164dc43bffc895db751ba1d9b55a9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3372
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3448,
+            SectorSize = 512,
+            MD5        = "d6ff5df3707887a6ba4cfdc30b3deff4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "dbd52e9e684f97d9e2292811242bb24e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.imd.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2882,
+            SectorSize = 2048,
+            MD5        = "f5fff7704fb677ebf23d27cd937c9403"
+            /* TODO: Division by zero because bytes per cluster is 0
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2882
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "rx01.imd.lz",
+            MediaType  = MediaType.RX01,
+            Sectors    = 2002,
+            SectorSize = 128,
+            MD5        = "5b4e36d92b180c3845387391cb5a1c64"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "rx50.imd.lz",
+            MediaType  = MediaType.RX50,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "ccd4431139755c58f340681f63510642",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/pce/TeleDisk.cs b/Aaru.Tests/Images/pce/TeleDisk.cs
index cc8c8df44..f75d23a82 100644
--- a/Aaru.Tests/Images/pce/TeleDisk.cs
+++ b/Aaru.Tests/Images/pce/TeleDisk.cs
@@ -31,292 +31,291 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.pce
-{
-    [TestFixture]
-    public class TeleDisk : BlockMediaImageTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "TeleDisk");
-        public override IMediaImage _plugin => new DiscImages.TeleDisk();
+namespace Aaru.Tests.Images.pce;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class TeleDisk : BlockMediaImageTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "TeleDisk");
+    public override IMediaImage _plugin => new DiscImages.TeleDisk();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "md1dd_8.td0.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "8308e749af855a3ded48d474eb7c305e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd.td0.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "b7b8a69b10ee4ec921aa8eea232fdd75"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_8.td0.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "f4a77a2d2a1868dc18e8b92032d02fd2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd.td0.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "099d95ac42d1a8010f914ac64ede7a70"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_nec.td0.lz",
+            MediaType  = MediaType.NEC_35_HD_8,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "fd54916f713d01b670c1a5df5e74a97f",
+            Partitions = new[]
             {
-                TestFile   = "md1dd_8.td0.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "8308e749af855a3ded48d474eb7c305e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd.td0.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "b7b8a69b10ee4ec921aa8eea232fdd75"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_8.td0.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "f4a77a2d2a1868dc18e8b92032d02fd2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd.td0.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "099d95ac42d1a8010f914ac64ede7a70"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_nec.td0.lz",
-                MediaType  = MediaType.NEC_35_HD_8,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "fd54916f713d01b670c1a5df5e74a97f",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd.td0.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "3df7cd10044af75d77e8936af0dbf9ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_10.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "d75d3e79d9c5051922d4c2226fa4a6ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_11.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 880,
-                SectorSize = 512,
-                MD5        = "e16ed33a1a466826562c681d8bdf3e27"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_10.td0.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fd48b2c12097cbc646b4a93ef4f92259"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_11.td0.lz",
-                MediaType  = MediaType.CBM_AMIGA_35_DD,
-                Sectors    = 1760,
-                SectorSize = 512,
-                MD5        = "512f7175e753e2e2ad620d448c42545d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_800.td0.lz",
-                MediaType  = MediaType.CBM_35_DD,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "db9cfb6eea18820b7a7e0b5b45594471",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "456390a9c6ab05cb458a03c47296de08",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.td0.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed.td0.lz",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "854d0d49a522b64af698e319a24cd68e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_max.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1148,
-                SectorSize = 512,
-                MD5        = "4b88a3e43b57778422e8b1e851a9c902"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 1804,
-                SectorSize = 512,
-                MD5        = "d032d928c43b66419b7404b016ec07ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_168.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 332,
-                SectorSize = 512,
-                MD5        = "62b900808c3e9f91f8361fd1716155a1",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 332
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3444,
-                SectorSize = 512,
-                MD5        = "9dea1e119a73a21a38d134f36b2e5564"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "dbd52e9e684f97d9e2292811242bb24e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2880,
-                SectorSize = 512,
-                MD5        = "b4a602f67903c46eef62addb0780aa56"
-                /* TODO: Division by zero because bytes per cluster is 0
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2880
-                    }
-                }
-                */
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "57965378275db490527ff8c8fc517adf"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_teledisk.td0.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "728f9361203dc39961b1413aa050f70d"
-            },
-            /* TODO: Not opening
-            new BlockImageTestExpected
-            {
-                TestFile   = "rx01.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 2002,
-                SectorSize = 0,
-                MD5        = "UNKNOWN"
-            },
-            */ new BlockImageTestExpected
-            {
-                TestFile   = "rx50.td0.lz",
-                MediaType  = MediaType.Unknown,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "ccd4431139755c58f340681f63510642",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
+                    Start  = 0,
+                    Length = 1232
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd.td0.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "3df7cd10044af75d77e8936af0dbf9ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_10.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "d75d3e79d9c5051922d4c2226fa4a6ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_11.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 880,
+            SectorSize = 512,
+            MD5        = "e16ed33a1a466826562c681d8bdf3e27"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_10.td0.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fd48b2c12097cbc646b4a93ef4f92259"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_11.td0.lz",
+            MediaType  = MediaType.CBM_AMIGA_35_DD,
+            Sectors    = 1760,
+            SectorSize = 512,
+            MD5        = "512f7175e753e2e2ad620d448c42545d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_800.td0.lz",
+            MediaType  = MediaType.CBM_35_DD,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "c533488a21098a62c85f1649abda2803",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "db9cfb6eea18820b7a7e0b5b45594471",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "456390a9c6ab05cb458a03c47296de08",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.td0.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed.td0.lz",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "854d0d49a522b64af698e319a24cd68e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_max.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1148,
+            SectorSize = 512,
+            MD5        = "4b88a3e43b57778422e8b1e851a9c902"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 1804,
+            SectorSize = 512,
+            MD5        = "d032d928c43b66419b7404b016ec07ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_168.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 332,
+            SectorSize = 512,
+            MD5        = "62b900808c3e9f91f8361fd1716155a1",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 332
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3444,
+            SectorSize = 512,
+            MD5        = "9dea1e119a73a21a38d134f36b2e5564"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "dbd52e9e684f97d9e2292811242bb24e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2880,
+            SectorSize = 512,
+            MD5        = "b4a602f67903c46eef62addb0780aa56"
+            /* TODO: Division by zero because bytes per cluster is 0
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2880
+                }
+            }
+            */
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "57965378275db490527ff8c8fc517adf"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_teledisk.td0.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "728f9361203dc39961b1413aa050f70d"
+        },
+        /* TODO: Not opening
+        new BlockImageTestExpected
+        {
+            TestFile   = "rx01.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 2002,
+            SectorSize = 0,
+            MD5        = "UNKNOWN"
+        },
+        */ new BlockImageTestExpected
+        {
+            TestFile   = "rx50.td0.lz",
+            MediaType  = MediaType.Unknown,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "ccd4431139755c58f340681f63510642",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/pce/XDF.cs b/Aaru.Tests/Images/pce/XDF.cs
index a24d852bd..9f81d55c7 100644
--- a/Aaru.Tests/Images/pce/XDF.cs
+++ b/Aaru.Tests/Images/pce/XDF.cs
@@ -32,32 +32,31 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.pce
-{
-    [TestFixture]
-    public class XDF : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "XDF");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.pce;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class XDF : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "XDF");
+    public override IMediaImage _plugin    => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_teledisk.xdf.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "90e8f5022bff8fa90c5148ec35f5d64c"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf.xdf.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "825ca9cdcb2f35ff8bbbda9cb0a27c4d"
-            }
-        };
-    }
+            TestFile   = "mf2hd_xdf_teledisk.xdf.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "90e8f5022bff8fa90c5148ec35f5d64c"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.xdf.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "825ca9cdcb2f35ff8bbbda9cb0a27c4d"
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Images/pce/raw.cs b/Aaru.Tests/Images/pce/raw.cs
index c11987233..5f5d9a43b 100644
--- a/Aaru.Tests/Images/pce/raw.cs
+++ b/Aaru.Tests/Images/pce/raw.cs
@@ -32,307 +32,306 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Images.pce
-{
-    [TestFixture]
-    public class Raw : BlockMediaImageTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "raw");
-        public override IMediaImage _plugin => new ZZZRawImage();
+namespace Aaru.Tests.Images.pce;
 
-        public override BlockImageTestExpected[] Tests => new[]
+[TestFixture]
+public class Raw : BlockMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "pce", "raw");
+    public override IMediaImage _plugin    => new ZZZRawImage();
+
+    public override BlockImageTestExpected[] Tests => new[]
+    {
+        new BlockImageTestExpected
         {
-            new BlockImageTestExpected
+            TestFile   = "md1dd_8.img.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_8,
+            Sectors    = 320,
+            SectorSize = 512,
+            MD5        = "8308e749af855a3ded48d474eb7c305e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md1dd.img.lz",
+            MediaType  = MediaType.DOS_525_SS_DD_9,
+            Sectors    = 360,
+            SectorSize = 512,
+            MD5        = "b7b8a69b10ee4ec921aa8eea232fdd75"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd_8.img.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_8,
+            Sectors    = 640,
+            SectorSize = 512,
+            MD5        = "f4a77a2d2a1868dc18e8b92032d02fd2"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2dd.img.lz",
+            MediaType  = MediaType.DOS_525_DS_DD_9,
+            Sectors    = 720,
+            SectorSize = 512,
+            MD5        = "099d95ac42d1a8010f914ac64ede7a70"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd.img.lz",
+            MediaType  = MediaType.DOS_525_HD,
+            Sectors    = 2400,
+            SectorSize = 512,
+            MD5        = "3df7cd10044af75d77e8936af0dbf9ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "md2hd_nec.img.lz",
+            MediaType  = MediaType.SHARP_525,
+            Sectors    = 1232,
+            SectorSize = 1024,
+            MD5        = "fd54916f713d01b670c1a5df5e74a97f",
+            Partitions = new[]
             {
-                TestFile   = "md1dd_8.img.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_8,
-                Sectors    = 320,
-                SectorSize = 512,
-                MD5        = "8308e749af855a3ded48d474eb7c305e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md1dd.img.lz",
-                MediaType  = MediaType.DOS_525_SS_DD_9,
-                Sectors    = 360,
-                SectorSize = 512,
-                MD5        = "b7b8a69b10ee4ec921aa8eea232fdd75"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd_8.img.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_8,
-                Sectors    = 640,
-                SectorSize = 512,
-                MD5        = "f4a77a2d2a1868dc18e8b92032d02fd2"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2dd.img.lz",
-                MediaType  = MediaType.DOS_525_DS_DD_9,
-                Sectors    = 720,
-                SectorSize = 512,
-                MD5        = "099d95ac42d1a8010f914ac64ede7a70"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd.img.lz",
-                MediaType  = MediaType.DOS_525_HD,
-                Sectors    = 2400,
-                SectorSize = 512,
-                MD5        = "3df7cd10044af75d77e8936af0dbf9ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "md2hd_nec.img.lz",
-                MediaType  = MediaType.SHARP_525,
-                Sectors    = 1232,
-                SectorSize = 1024,
-                MD5        = "fd54916f713d01b670c1a5df5e74a97f",
-                Partitions = new[]
+                new BlockPartitionVolumes
                 {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1232
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_10.img.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "d75d3e79d9c5051922d4c2226fa4a6ff"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_11.img.lz",
-                MediaType  = MediaType.ATARI_35_SS_DD_11,
-                Sectors    = 880,
-                SectorSize = 512,
-                MD5        = "e16ed33a1a466826562c681d8bdf3e27"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf1dd_gcr.img.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_10.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "fd48b2c12097cbc646b4a93ef4f92259"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_11.img.lz",
-                MediaType  = MediaType.CBM_AMIGA_35_DD,
-                Sectors    = 1760,
-                SectorSize = 512,
-                MD5        = "512f7175e753e2e2ad620d448c42545d"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_800.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "c533488a21098a62c85f1649abda2803",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1600
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_fdformat_820.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "db9cfb6eea18820b7a7e0b5b45594471",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_freedos.img.lz",
-                MediaType  = MediaType.FDFORMAT_35_DD,
-                Sectors    = 1640,
-                SectorSize = 512,
-                MD5        = "456390a9c6ab05cb458a03c47296de08",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1640
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd_gcr.img.lz",
-                MediaType  = MediaType.AppleSonyDS,
-                Sectors    = 1600,
-                SectorSize = 512,
-                MD5        = "93e71b9ecdb39d3ec9245b4f451856d4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2dd.img.lz",
-                MediaType  = MediaType.DOS_35_DS_DD_9,
-                Sectors    = 1440,
-                SectorSize = 512,
-                MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 1440
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2ed.img.lz",
-                MediaType  = MediaType.ECMA_147,
-                Sectors    = 5760,
-                SectorSize = 512,
-                MD5        = "854d0d49a522b64af698e319a24cd68e"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3605,
-                SectorSize = 512,
-                MD5        = "c741c78eecd673f8fc49e77459871940"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_2m_max.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3768,
-                SectorSize = 512,
-                MD5        = "0393fbfee10e47c71e0fb7b39237be49"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_168.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3372,
-                SectorSize = 512,
-                MD5        = "7f9164dc43bffc895db751ba1d9b55a9",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3372
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_fdformat_172.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3448,
-                SectorSize = 512,
-                MD5        = "d6ff5df3707887a6ba4cfdc30b3deff4"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_freedos.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 3486,
-                SectorSize = 512,
-                MD5        = "dbd52e9e684f97d9e2292811242bb24e",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 3486
-                    }
-                }
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd.img.lz",
-                MediaType  = MediaType.GENERIC_HDD,
-                Sectors    = 2888,
-                SectorSize = 512,
-                MD5        = "f5fff7704fb677ebf23d27cd937c9403"
-                /* TODO: Division by zero because bytes per cluster is 0
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 2888
-                    }
-                }
-                */
-            },
-            /* TODO: XDF not implemented
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf.img.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 670,
-                SectorSize = 8192,
-                MD5        = "UNKNOWN"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "mf2hd_xdf_teledisk.img.lz",
-                MediaType  = MediaType.XDF_35,
-                Sectors    = 3680,
-                SectorSize = 512,
-                MD5        = "UNKNOWN"
-            },
-            */ new BlockImageTestExpected
-            {
-                TestFile   = "rx01.img.lz",
-                MediaType  = MediaType.ECMA_54,
-                Sectors    = 2002,
-                SectorSize = 128,
-                MD5        = "5b4e36d92b180c3845387391cb5a1c64"
-            },
-            new BlockImageTestExpected
-            {
-                TestFile   = "rx50.img.lz",
-                MediaType  = MediaType.AppleSonySS,
-                Sectors    = 800,
-                SectorSize = 512,
-                MD5        = "ccd4431139755c58f340681f63510642",
-                Partitions = new[]
-                {
-                    new BlockPartitionVolumes
-                    {
-                        Start  = 0,
-                        Length = 800
-                    }
+                    Start  = 0,
+                    Length = 1232
                 }
             }
-        };
-    }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_10.img.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "d75d3e79d9c5051922d4c2226fa4a6ff"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_11.img.lz",
+            MediaType  = MediaType.ATARI_35_SS_DD_11,
+            Sectors    = 880,
+            SectorSize = 512,
+            MD5        = "e16ed33a1a466826562c681d8bdf3e27"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf1dd_gcr.img.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "c5d92544c3e78b7f0a9b4baaa9a64eec"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_10.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "fd48b2c12097cbc646b4a93ef4f92259"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_11.img.lz",
+            MediaType  = MediaType.CBM_AMIGA_35_DD,
+            Sectors    = 1760,
+            SectorSize = 512,
+            MD5        = "512f7175e753e2e2ad620d448c42545d"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_800.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "c533488a21098a62c85f1649abda2803",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1600
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_fdformat_820.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "db9cfb6eea18820b7a7e0b5b45594471",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_freedos.img.lz",
+            MediaType  = MediaType.FDFORMAT_35_DD,
+            Sectors    = 1640,
+            SectorSize = 512,
+            MD5        = "456390a9c6ab05cb458a03c47296de08",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1640
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd_gcr.img.lz",
+            MediaType  = MediaType.AppleSonyDS,
+            Sectors    = 1600,
+            SectorSize = 512,
+            MD5        = "93e71b9ecdb39d3ec9245b4f451856d4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2dd.img.lz",
+            MediaType  = MediaType.DOS_35_DS_DD_9,
+            Sectors    = 1440,
+            SectorSize = 512,
+            MD5        = "de3f85896f771b7e5bc4c9e3926d64e4",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 1440
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2ed.img.lz",
+            MediaType  = MediaType.ECMA_147,
+            Sectors    = 5760,
+            SectorSize = 512,
+            MD5        = "854d0d49a522b64af698e319a24cd68e"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3605,
+            SectorSize = 512,
+            MD5        = "c741c78eecd673f8fc49e77459871940"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_2m_max.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3768,
+            SectorSize = 512,
+            MD5        = "0393fbfee10e47c71e0fb7b39237be49"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_168.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3372,
+            SectorSize = 512,
+            MD5        = "7f9164dc43bffc895db751ba1d9b55a9",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3372
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_fdformat_172.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3448,
+            SectorSize = 512,
+            MD5        = "d6ff5df3707887a6ba4cfdc30b3deff4"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_freedos.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 3486,
+            SectorSize = 512,
+            MD5        = "dbd52e9e684f97d9e2292811242bb24e",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 3486
+                }
+            }
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd.img.lz",
+            MediaType  = MediaType.GENERIC_HDD,
+            Sectors    = 2888,
+            SectorSize = 512,
+            MD5        = "f5fff7704fb677ebf23d27cd937c9403"
+            /* TODO: Division by zero because bytes per cluster is 0
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 2888
+                }
+            }
+            */
+        },
+        /* TODO: XDF not implemented
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf.img.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 670,
+            SectorSize = 8192,
+            MD5        = "UNKNOWN"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "mf2hd_xdf_teledisk.img.lz",
+            MediaType  = MediaType.XDF_35,
+            Sectors    = 3680,
+            SectorSize = 512,
+            MD5        = "UNKNOWN"
+        },
+        */ new BlockImageTestExpected
+        {
+            TestFile   = "rx01.img.lz",
+            MediaType  = MediaType.ECMA_54,
+            Sectors    = 2002,
+            SectorSize = 128,
+            MD5        = "5b4e36d92b180c3845387391cb5a1c64"
+        },
+        new BlockImageTestExpected
+        {
+            TestFile   = "rx50.img.lz",
+            MediaType  = MediaType.AppleSonySS,
+            Sectors    = 800,
+            SectorSize = 512,
+            MD5        = "ccd4431139755c58f340681f63510642",
+            Partitions = new[]
+            {
+                new BlockPartitionVolumes
+                {
+                    Start  = 0,
+                    Length = 800
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/176.cs b/Aaru.Tests/Issues/176.cs
index ecb910bc1..10e55fb4c 100644
--- a/Aaru.Tests/Issues/176.cs
+++ b/Aaru.Tests/Issues/176.cs
@@ -1,23 +1,21 @@
 using System.IO;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Issues
-{
-    /*
-     * SilasLaspada commented on May 13, 2018
-     * Trying to convert an MDF/MDS file pair that is CD-ROM XA that has 2 tracks results in the program crashing
-     * with the command window having been spammed with "Converting sectors x to x in track 2 (xx.xx% done)Error
-     * Can't found track containing x writing sector x, continuing..." before the crash. A very similar crash occurs
-     * when dumping the disc to MDF/MDS. The image is dumped correctly when using the BIN/CUE format. I have had the
-     * same issue with similar CD-ROM XA discs, but seemingly only if they had multiple tracks. I attached all the logs
-     * and I'll try to get a link to the image file up ASAP, let me know if you need anything else!
-     */
+namespace Aaru.Tests.Issues;
+/*
+ * SilasLaspada commented on May 13, 2018
+ * Trying to convert an MDF/MDS file pair that is CD-ROM XA that has 2 tracks results in the program crashing
+ * with the command window having been spammed with "Converting sectors x to x in track 2 (xx.xx% done)Error
+ * Can't found track containing x writing sector x, continuing..." before the crash. A very similar crash occurs
+ * when dumping the disc to MDF/MDS. The image is dumped correctly when using the BIN/CUE format. I have had the
+ * same issue with similar CD-ROM XA discs, but seemingly only if they had multiple tracks. I attached all the logs
+ * and I'll try to get a link to the image file up ASAP, let me know if you need anything else!
+ */
 
-    // CLAUNIA: Fixed in bdaece414e5f1329610dcbc4a490ebe7ab1ad43e
-    [TestFixture]
-    public class _176 : OpticalImageReadIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue176");
-        public override string TestFile   => "WEBBEARS.mds";
-    }
+// CLAUNIA: Fixed in bdaece414e5f1329610dcbc4a490ebe7ab1ad43e
+[TestFixture]
+public class _176 : OpticalImageReadIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue176");
+    public override string TestFile   => "WEBBEARS.mds";
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/257.cs b/Aaru.Tests/Issues/257.cs
index 2421c3705..1ec1545a9 100644
--- a/Aaru.Tests/Issues/257.cs
+++ b/Aaru.Tests/Issues/257.cs
@@ -3,28 +3,26 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.Issues
-{
-    /* SilasLaspada commented on Nov 23, 2019
-     *
-     * Trying to convert an NRG image to various images formats fails in various ways. Converting it to ISO prints
-     * "Converting sectors X to Y in track 1 (XX.XX% done)Error Writing sectors with tags is not supported. writing
-     * sector X, continuing..." several times. Converting to MDS doesn't result in any visible errors in the log, but
-     * DIC is unable to identify the file system in the resulting image. Converting to DICF prints "Converting sectors
-     * 0 to 64 in track 1 (0.00% done)Error Incorrect data size writing sector 0, not continuing..." once before
-     * stopping. DIC is able to extract the files from the original image so it seems to be good.
-     */
+namespace Aaru.Tests.Issues;
+/* SilasLaspada commented on Nov 23, 2019
+ *
+ * Trying to convert an NRG image to various images formats fails in various ways. Converting it to ISO prints
+ * "Converting sectors X to Y in track 1 (XX.XX% done)Error Writing sectors with tags is not supported. writing
+ * sector X, continuing..." several times. Converting to MDS doesn't result in any visible errors in the log, but
+ * DIC is unable to identify the file system in the resulting image. Converting to DICF prints "Converting sectors
+ * 0 to 64 in track 1 (0.00% done)Error Incorrect data size writing sector 0, not continuing..." once before
+ * stopping. DIC is able to extract the files from the original image so it seems to be good.
+ */
 
-    // 20200311 CLAUNIA: Fixed in f4a1c28feabb50a43036944cf7f6c028eb6f8b93
-    // 20200621 CLAUNIA: Fixed in c80baa5efb4ea8a9e4347278086b2414469ae4c6
-    public class _257 : OpticalImageConvertIssueTest
-    {
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue257");
-        public override string InputPath => "TempImage.nrg.xz";
-        public override string SuggestedOutputFilename => "AaruIssue257Output.iso";
-        public override IWritableImage OutputFormat => new ZZZRawImage();
-        public override string Md5 => "51303b30b4e4896c01d47af9b5c0d5b5";
-        public override bool UseLong => false;
-    }
+// 20200311 CLAUNIA: Fixed in f4a1c28feabb50a43036944cf7f6c028eb6f8b93
+// 20200621 CLAUNIA: Fixed in c80baa5efb4ea8a9e4347278086b2414469ae4c6
+public class _257 : OpticalImageConvertIssueTest
+{
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue257");
+    public override string InputPath => "TempImage.nrg.xz";
+    public override string SuggestedOutputFilename => "AaruIssue257Output.iso";
+    public override IWritableImage OutputFormat => new ZZZRawImage();
+    public override string Md5 => "51303b30b4e4896c01d47af9b5c0d5b5";
+    public override bool UseLong => false;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/263/AaruFormat.cs b/Aaru.Tests/Issues/263/AaruFormat.cs
index 95e71ee7f..6f6d049dd 100644
--- a/Aaru.Tests/Issues/263/AaruFormat.cs
+++ b/Aaru.Tests/Issues/263/AaruFormat.cs
@@ -1,28 +1,26 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Aaru.Tests.Issues._263
-{
-    /* https://github.com/aaru-dps/Aaru/issues/263
-     * 
-     * SilasLaspada commented on Jan 2, 2020
-     * Trying to extract the files from a DICF image results in the error "Error reading file: Object reference not
-     * set to an instance of an object." Dumping and extracting as ISO does work, but there are issues with that too.
-     * Full logs of dumping the disc as DICF and ISO, trying to extract the images, and comparing them are here:
-     * https://pastebin.com/AuKum4QR.
-     * Link to the image files themselves: https://drive.google.com/file/d/1lXlhV-EUVrSg-ceKi0xI7t5OAdGWvH9_/view?usp=sharing
-     */
+namespace Aaru.Tests.Issues._263;
+/* https://github.com/aaru-dps/Aaru/issues/263
+ * 
+ * SilasLaspada commented on Jan 2, 2020
+ * Trying to extract the files from a DICF image results in the error "Error reading file: Object reference not
+ * set to an instance of an object." Dumping and extracting as ISO does work, but there are issues with that too.
+ * Full logs of dumping the disc as DICF and ISO, trying to extract the images, and comparing them are here:
+ * https://pastebin.com/AuKum4QR.
+ * Link to the image files themselves: https://drive.google.com/file/d/1lXlhV-EUVrSg-ceKi0xI7t5OAdGWvH9_/view?usp=sharing
+ */
 
-    // 20200309 CLAUNIA: Fixed in 3b2bb0ebf0c6c615c5622aebff494ed34b51055d
-    public class AaruFormat : FsExtractIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue263");
-        public override string TestFile => "Sony1.dicf";
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override bool Debug => true;
-        public override bool Xattrs => false;
-        public override string Encoding => null;
-        public override bool ExpectPartitions => true;
-        public override string Namespace => null;
-    }
+// 20200309 CLAUNIA: Fixed in 3b2bb0ebf0c6c615c5622aebff494ed34b51055d
+public class AaruFormat : FsExtractIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue263");
+    public override string TestFile => "Sony1.dicf";
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override bool Debug => true;
+    public override bool Xattrs => false;
+    public override string Encoding => null;
+    public override bool ExpectPartitions => true;
+    public override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/263/Raw.cs b/Aaru.Tests/Issues/263/Raw.cs
index 010c1fc3d..2aa9ad68c 100644
--- a/Aaru.Tests/Issues/263/Raw.cs
+++ b/Aaru.Tests/Issues/263/Raw.cs
@@ -1,28 +1,26 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Aaru.Tests.Issues._263
-{
-    /* https://github.com/aaru-dps/Aaru/issues/263
-     * 
-     * SilasLaspada commented on Jan 2, 2020
-     * Trying to extract the files from a DICF image results in the error "Error reading file: Object reference not
-     * set to an instance of an object." Dumping and extracting as ISO does work, but there are issues with that too.
-     * Full logs of dumping the disc as DICF and ISO, trying to extract the images, and comparing them are here:
-     * https://pastebin.com/AuKum4QR.
-     * Link to the image files themselves: https://drive.google.com/file/d/1lXlhV-EUVrSg-ceKi0xI7t5OAdGWvH9_/view?usp=sharing
-     */
+namespace Aaru.Tests.Issues._263;
+/* https://github.com/aaru-dps/Aaru/issues/263
+ * 
+ * SilasLaspada commented on Jan 2, 2020
+ * Trying to extract the files from a DICF image results in the error "Error reading file: Object reference not
+ * set to an instance of an object." Dumping and extracting as ISO does work, but there are issues with that too.
+ * Full logs of dumping the disc as DICF and ISO, trying to extract the images, and comparing them are here:
+ * https://pastebin.com/AuKum4QR.
+ * Link to the image files themselves: https://drive.google.com/file/d/1lXlhV-EUVrSg-ceKi0xI7t5OAdGWvH9_/view?usp=sharing
+ */
 
-    // 20200309 CLAUNIA: Fixed in 3b2bb0ebf0c6c615c5622aebff494ed34b51055d
-    public class Raw : FsExtractIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue263");
-        public override string TestFile => "Sony2.iso";
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override bool Debug => true;
-        public override bool Xattrs => false;
-        public override string Encoding => null;
-        public override bool ExpectPartitions => true;
-        public override string Namespace => null;
-    }
+// 20200309 CLAUNIA: Fixed in 3b2bb0ebf0c6c615c5622aebff494ed34b51055d
+public class Raw : FsExtractIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue263");
+    public override string TestFile => "Sony2.iso";
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override bool Debug => true;
+    public override bool Xattrs => false;
+    public override string Encoding => null;
+    public override bool ExpectPartitions => true;
+    public override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/266.cs b/Aaru.Tests/Issues/266.cs
index 79205619a..6af64e60c 100644
--- a/Aaru.Tests/Issues/266.cs
+++ b/Aaru.Tests/Issues/266.cs
@@ -3,27 +3,25 @@ using System.IO;
 
 // ReSharper disable StringLiteralTypo
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/263
-     *
-     * SilasLaspada commented on Jan 2, 2020
-     *
-     * Trying to extract files from an ISO9660 cue image results in output that have the correct names and folders,
-     * but are corrupted past the first few sectors. The image can be found at
-     * https://archive.org/details/redump-id-54014
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/263
+ *
+ * SilasLaspada commented on Jan 2, 2020
+ *
+ * Trying to extract files from an ISO9660 cue image results in output that have the correct names and folders,
+ * but are corrupted past the first few sectors. The image can be found at
+ * https://archive.org/details/redump-id-54014
+ */
 
-    // 20200309 CLAUNIA: Fixed in 3b2bb0ebf0c6c615c5622aebff494ed34b51055d
-    public class _266 : FsExtractHashIssueTest
-    {
-        protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue266");
-        protected override string TestFile => "Namco (USA) (2005 Assets).cue";
-        protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        protected override bool Debug => false;
-        protected override bool Xattrs => false;
-        protected override string Encoding => null;
-        protected override bool ExpectPartitions => true;
-        protected override string Namespace => null;
-    }
+// 20200309 CLAUNIA: Fixed in 3b2bb0ebf0c6c615c5622aebff494ed34b51055d
+public class _266 : FsExtractHashIssueTest
+{
+    protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue266");
+    protected override string TestFile => "Namco (USA) (2005 Assets).cue";
+    protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    protected override bool Debug => false;
+    protected override bool Xattrs => false;
+    protected override string Encoding => null;
+    protected override bool ExpectPartitions => true;
+    protected override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/286.cs b/Aaru.Tests/Issues/286.cs
index 390529d26..069db827b 100644
--- a/Aaru.Tests/Issues/286.cs
+++ b/Aaru.Tests/Issues/286.cs
@@ -3,24 +3,22 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.Issues
-{
-    /* FakeShemp commented on Mar 1, 2020
-     *
-     * Neither of the Dreamcast homebrew images found on
-     * http://dcevolution.sourceforge.net/index.php?id=house_of_terror can be converted to DICF.
-     */
+namespace Aaru.Tests.Issues;
+/* FakeShemp commented on Mar 1, 2020
+ *
+ * Neither of the Dreamcast homebrew images found on
+ * http://dcevolution.sourceforge.net/index.php?id=house_of_terror can be converted to DICF.
+ */
 
-    // 20200309 CLAUNIA: Fixed in 21e81753cd106a52ee599281f0b977cda90484a7
-    // 20210307 CLAUNIA: Reopened.
-    public class _286 : OpticalImageConvertIssueTest
-    {
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue286");
-        public override string InputPath => "2d_house_of_terror.nrg";
-        public override string SuggestedOutputFilename => "AaruTestIssue286.aif";
-        public override IWritableImage OutputFormat => new AaruFormat();
-        public override string Md5 => null;
-        public override bool UseLong => true;
-    }
+// 20200309 CLAUNIA: Fixed in 21e81753cd106a52ee599281f0b977cda90484a7
+// 20210307 CLAUNIA: Reopened.
+public class _286 : OpticalImageConvertIssueTest
+{
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue286");
+    public override string InputPath => "2d_house_of_terror.nrg";
+    public override string SuggestedOutputFilename => "AaruTestIssue286.aif";
+    public override IWritableImage OutputFormat => new AaruFormat();
+    public override string Md5 => null;
+    public override bool UseLong => true;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/288/18Wheeler.cs b/Aaru.Tests/Issues/288/18Wheeler.cs
index 4035cb10f..07bdae1bc 100644
--- a/Aaru.Tests/Issues/288/18Wheeler.cs
+++ b/Aaru.Tests/Issues/288/18Wheeler.cs
@@ -3,23 +3,21 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.Issues._288
-{
-    /* FakeShemp commented on Mar 3, 2020
-     *
-     * When trying to convert a GDI Dreamcast image to aaruf, the app crashes.
-     */
+namespace Aaru.Tests.Issues._288;
+/* FakeShemp commented on Mar 3, 2020
+ *
+ * When trying to convert a GDI Dreamcast image to aaruf, the app crashes.
+ */
 
-    // 20200309 CLAUNIA: Fixed in af0abca12d429276fc864e1de14a7a40f12bde26
-    public class _18Wheeler : OpticalImageConvertIssueTest
-    {
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue288", "18wheeler");
-        public override string         InputPath => "18 Wheeler - American Pro Trucker v1.500 (2001)(Sega)(US)[!].gdi";
-        public override string         SuggestedOutputFilename => "AaruTestIssue288_18wheeler.aif";
-        public override IWritableImage OutputFormat => new AaruFormat();
-        public override string         Md5 => null;
-        public override bool           UseLong => true;
-    }
+// 20200309 CLAUNIA: Fixed in af0abca12d429276fc864e1de14a7a40f12bde26
+public class _18Wheeler : OpticalImageConvertIssueTest
+{
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue288", "18wheeler");
+    public override string         InputPath => "18 Wheeler - American Pro Trucker v1.500 (2001)(Sega)(US)[!].gdi";
+    public override string         SuggestedOutputFilename => "AaruTestIssue288_18wheeler.aif";
+    public override IWritableImage OutputFormat => new AaruFormat();
+    public override string         Md5 => null;
+    public override bool           UseLong => true;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/288/ArcadeHits.cs b/Aaru.Tests/Issues/288/ArcadeHits.cs
index 4f027c03b..3c68a1cb6 100644
--- a/Aaru.Tests/Issues/288/ArcadeHits.cs
+++ b/Aaru.Tests/Issues/288/ArcadeHits.cs
@@ -3,24 +3,22 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.Issues._288
-{
-    /* FakeShemp commented on Mar 3, 2020
-     *
-     * When trying to convert a GDI Dreamcast image to aaruf, the app crashes.
-     */
+namespace Aaru.Tests.Issues._288;
+/* FakeShemp commented on Mar 3, 2020
+ *
+ * When trying to convert a GDI Dreamcast image to aaruf, the app crashes.
+ */
 
-    // 20200309 CLAUNIA: Fixed in af0abca12d429276fc864e1de14a7a40f12bde26
-    public class ArcadeHits : OpticalImageConvertIssueTest
-    {
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue288", "arcadehits");
-        public override string InputPath =>
-            "Midway's Greatest Arcade Hits Volume 1 v1.001 (2000)(Midway)(US)[!][compilation].gdi";
-        public override string         SuggestedOutputFilename => "AaruTestIssue288_arcadehits.aif";
-        public override IWritableImage OutputFormat            => new AaruFormat();
-        public override string         Md5                     => null;
-        public override bool           UseLong                 => true;
-    }
+// 20200309 CLAUNIA: Fixed in af0abca12d429276fc864e1de14a7a40f12bde26
+public class ArcadeHits : OpticalImageConvertIssueTest
+{
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue288", "arcadehits");
+    public override string InputPath =>
+        "Midway's Greatest Arcade Hits Volume 1 v1.001 (2000)(Midway)(US)[!][compilation].gdi";
+    public override string         SuggestedOutputFilename => "AaruTestIssue288_arcadehits.aif";
+    public override IWritableImage OutputFormat            => new AaruFormat();
+    public override string         Md5                     => null;
+    public override bool           UseLong                 => true;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/288/Roadsters.cs b/Aaru.Tests/Issues/288/Roadsters.cs
index 4e7fa4cbe..e23d47584 100644
--- a/Aaru.Tests/Issues/288/Roadsters.cs
+++ b/Aaru.Tests/Issues/288/Roadsters.cs
@@ -3,23 +3,21 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.Issues._288
-{
-    /* FakeShemp commented on Mar 3, 2020
-     *
-     * When trying to convert a GDI Dreamcast image to aaruf, the app crashes.
-     */
+namespace Aaru.Tests.Issues._288;
+/* FakeShemp commented on Mar 3, 2020
+ *
+ * When trying to convert a GDI Dreamcast image to aaruf, the app crashes.
+ */
 
-    // 20200309 CLAUNIA: Fixed in af0abca12d429276fc864e1de14a7a40f12bde26
-    public class Roadsters : OpticalImageConvertIssueTest
-    {
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue288", "roadsters");
-        public override string         InputPath               => "Roadsters (USA).cue";
-        public override string         SuggestedOutputFilename => "AaruTestIssue288_roadsters.aif";
-        public override IWritableImage OutputFormat            => new AaruFormat();
-        public override string         Md5                     => null;
-        public override bool           UseLong                 => true;
-    }
+// 20200309 CLAUNIA: Fixed in af0abca12d429276fc864e1de14a7a40f12bde26
+public class Roadsters : OpticalImageConvertIssueTest
+{
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue288", "roadsters");
+    public override string         InputPath               => "Roadsters (USA).cue";
+    public override string         SuggestedOutputFilename => "AaruTestIssue288_roadsters.aif";
+    public override IWritableImage OutputFormat            => new AaruFormat();
+    public override string         Md5                     => null;
+    public override bool           UseLong                 => true;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/299.cs b/Aaru.Tests/Issues/299.cs
index 32de6b575..64233a595 100644
--- a/Aaru.Tests/Issues/299.cs
+++ b/Aaru.Tests/Issues/299.cs
@@ -3,22 +3,20 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.Issues
-{
-    /* FakeShemp commented on Mar 1, 2020
-     *
-     * Neither of the Dreamcast homebrew images found on
-     * http://dcevolution.sourceforge.net/index.php?id=house_of_terror can be converted to DICF.
-     */
+namespace Aaru.Tests.Issues;
+/* FakeShemp commented on Mar 1, 2020
+ *
+ * Neither of the Dreamcast homebrew images found on
+ * http://dcevolution.sourceforge.net/index.php?id=house_of_terror can be converted to DICF.
+ */
 
-    public class _299 : OpticalImageConvertIssueTest
-    {
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue299");
-        public override string InputPath => "2d_house_of_terror.cdi";
-        public override string SuggestedOutputFilename => "AaruTestIssue299.aif";
-        public override IWritableImage OutputFormat => new AaruFormat();
-        public override string Md5 => null;
-        public override bool UseLong => true;
-    }
+public class _299 : OpticalImageConvertIssueTest
+{
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue299");
+    public override string InputPath => "2d_house_of_terror.cdi";
+    public override string SuggestedOutputFilename => "AaruTestIssue299.aif";
+    public override IWritableImage OutputFormat => new AaruFormat();
+    public override string Md5 => null;
+    public override bool UseLong => true;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/300.cs b/Aaru.Tests/Issues/300.cs
index 20029e910..cc8047f32 100644
--- a/Aaru.Tests/Issues/300.cs
+++ b/Aaru.Tests/Issues/300.cs
@@ -3,31 +3,29 @@ using System.IO;
 
 // ReSharper disable StringLiteralTypo
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/300
-     *
-     * SilasLaspada commented on Mar 9, 2020
-     *
-     * Trying to extract files from an image results in
-     * "Partition 1:
-     * Identifying filesystem on partition
-     * Error reading file: Object reference not set to an instance of an object."
-     *
-     * Aaru does extract the files successfully as far as I can tell despite the error.
-     * Log and image files: https://drive.google.com/open?id=17Hzuo4rj9UbLA8Zh3-tclkWM3a_L43e7
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/300
+ *
+ * SilasLaspada commented on Mar 9, 2020
+ *
+ * Trying to extract files from an image results in
+ * "Partition 1:
+ * Identifying filesystem on partition
+ * Error reading file: Object reference not set to an instance of an object."
+ *
+ * Aaru does extract the files successfully as far as I can tell despite the error.
+ * Log and image files: https://drive.google.com/open?id=17Hzuo4rj9UbLA8Zh3-tclkWM3a_L43e7
+ */
 
-    // 20200309 CLAUNIA: Fixed in 48f067d79ff30cfd10e084085ff479bbb0939512
-    public class _300 : FsExtractHashIssueTest
-    {
-        protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue300");
-        protected override string TestFile => "sony.dicf";
-        protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        protected override bool Debug => true;
-        protected override bool Xattrs => false;
-        protected override string Encoding => null;
-        protected override bool ExpectPartitions => true;
-        protected override string Namespace => null;
-    }
+// 20200309 CLAUNIA: Fixed in 48f067d79ff30cfd10e084085ff479bbb0939512
+public class _300 : FsExtractHashIssueTest
+{
+    protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue300");
+    protected override string TestFile => "sony.dicf";
+    protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    protected override bool Debug => true;
+    protected override bool Xattrs => false;
+    protected override string Encoding => null;
+    protected override bool ExpectPartitions => true;
+    protected override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/325.cs b/Aaru.Tests/Issues/325.cs
index 51e3ae6be..eabdc98ba 100644
--- a/Aaru.Tests/Issues/325.cs
+++ b/Aaru.Tests/Issues/325.cs
@@ -1,21 +1,19 @@
 using System.IO;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Issues
-{
-    /*
-     * SilasLaspada commented on Mar 19, 2020
-     *
-     * "Exception: Attempted to divide by zero." when opening a CUE/TRK image. The cue itself was hardcoded to a
-     * specific path that I changed to a relative one. ImgBurn and IsoBuster can read the files fine. The exact files
-     * I used are in https://drive.google.com/drive/folders/1tlixznMyuQiL_D57OLIDIPeX7a99yHqx?usp=sharing.
-     */
+namespace Aaru.Tests.Issues;
+/*
+ * SilasLaspada commented on Mar 19, 2020
+ *
+ * "Exception: Attempted to divide by zero." when opening a CUE/TRK image. The cue itself was hardcoded to a
+ * specific path that I changed to a relative one. ImgBurn and IsoBuster can read the files fine. The exact files
+ * I used are in https://drive.google.com/drive/folders/1tlixznMyuQiL_D57OLIDIPeX7a99yHqx?usp=sharing.
+ */
 
-    // 20200418 CLAUNIA: Fixed in e92c1e77418bb3fc1c9971b9bc76f47f86f2f76a
-    [TestFixture]
-    public class _325 : OpticalImageReadIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue325");
-        public override string TestFile   => "TEST.cue";
-    }
+// 20200418 CLAUNIA: Fixed in e92c1e77418bb3fc1c9971b9bc76f47f86f2f76a
+[TestFixture]
+public class _325 : OpticalImageReadIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue325");
+    public override string TestFile   => "TEST.cue";
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/338.cs b/Aaru.Tests/Issues/338.cs
index ff2854ecb..a47cda819 100644
--- a/Aaru.Tests/Issues/338.cs
+++ b/Aaru.Tests/Issues/338.cs
@@ -1,19 +1,17 @@
 using System.IO;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Issues
-{
-    /*
-     * SilasLaspada commented on Apr 18, 2020
-     *
-     * When running the entropy command on an NRG image, Aaru crashes with an unhandled exception. NRG image.zip
-     */
+namespace Aaru.Tests.Issues;
+/*
+ * SilasLaspada commented on Apr 18, 2020
+ *
+ * When running the entropy command on an NRG image, Aaru crashes with an unhandled exception. NRG image.zip
+ */
 
-    // 20200621 CLAUNIA: Fixed in c80baa5efb4ea8a9e4347278086b2414469ae4c6
-    [TestFixture]
-    public class _338 : OpticalImageReadIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue338");
-        public override string TestFile   => "TempImage.nrg.xz";
-    }
+// 20200621 CLAUNIA: Fixed in c80baa5efb4ea8a9e4347278086b2414469ae4c6
+[TestFixture]
+public class _338 : OpticalImageReadIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue338");
+    public override string TestFile   => "TempImage.nrg.xz";
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/358.cs b/Aaru.Tests/Issues/358.cs
index 84a880b6d..354ef3042 100644
--- a/Aaru.Tests/Issues/358.cs
+++ b/Aaru.Tests/Issues/358.cs
@@ -3,26 +3,24 @@ using System.IO;
 
 // ReSharper disable StringLiteralTypo
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/358
-     *
-     * roysmeding commented on Apr 27, 2020
-     *
-     * When extracting files from a CD-i disk image, the sector subheader data that is required to be able to
-     * interpret most real-time files is not extracted.
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/358
+ *
+ * roysmeding commented on Apr 27, 2020
+ *
+ * When extracting files from a CD-i disk image, the sector subheader data that is required to be able to
+ * interpret most real-time files is not extracted.
+ */
 
-    // 20200621 CLAUNIA: Fixed in 83a28237fab9e21b23bd43eb91b5b29f1bf9f220
-    public class _358 : FsExtractHashIssueTest
-    {
-        protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue358");
-        protected override string TestFile => "cdi.aif";
-        protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        protected override bool Debug => false;
-        protected override bool Xattrs => true;
-        protected override string Encoding => null;
-        protected override bool ExpectPartitions => true;
-        protected override string Namespace => null;
-    }
+// 20200621 CLAUNIA: Fixed in 83a28237fab9e21b23bd43eb91b5b29f1bf9f220
+public class _358 : FsExtractHashIssueTest
+{
+    protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue358");
+    protected override string TestFile => "cdi.aif";
+    protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    protected override bool Debug => false;
+    protected override bool Xattrs => true;
+    protected override string Encoding => null;
+    protected override bool ExpectPartitions => true;
+    protected override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/360.cs b/Aaru.Tests/Issues/360.cs
index f8ae0c697..7fc89da20 100644
--- a/Aaru.Tests/Issues/360.cs
+++ b/Aaru.Tests/Issues/360.cs
@@ -1,26 +1,24 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/360
-     *
-     * claunia commented on May 20, 2020
-     *
-     * ISO9660 filesystem from HP9000 cannot be read
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/360
+ *
+ * claunia commented on May 20, 2020
+ *
+ * ISO9660 filesystem from HP9000 cannot be read
+ */
 
-    // 20201107 CLAUNIA: Fixed in c45f1bff6d75a2e31b2b2d889455eefd3262b2cc
-    // 20210307 CLAUNIA: Reopened
-    public class _360 : FsExtractIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue360");
-        public override string TestFile => "AAAA.iso.xz";
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override bool Debug => true;
-        public override bool Xattrs => false;
-        public override string Encoding => null;
-        public override bool ExpectPartitions => true;
-        public override string Namespace => null;
-    }
+// 20201107 CLAUNIA: Fixed in c45f1bff6d75a2e31b2b2d889455eefd3262b2cc
+// 20210307 CLAUNIA: Reopened
+public class _360 : FsExtractIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue360");
+    public override string TestFile => "AAAA.iso.xz";
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override bool Debug => true;
+    public override bool Xattrs => false;
+    public override string Encoding => null;
+    public override bool ExpectPartitions => true;
+    public override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/379.cs b/Aaru.Tests/Issues/379.cs
index 48983bc2c..865da010f 100644
--- a/Aaru.Tests/Issues/379.cs
+++ b/Aaru.Tests/Issues/379.cs
@@ -3,26 +3,24 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/379
-     *
-     * SilasLaspada commented on Jul 24, 2020
-     *
-     * Converting a B6T image from BlindWrite 6 to aaruf crashes Aaru with
-     * "Unhandled exception: System.Reflection.TargetInvocationException: Exception has been thrown by the target of
-     * an invocation."
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/379
+ *
+ * SilasLaspada commented on Jul 24, 2020
+ *
+ * Converting a B6T image from BlindWrite 6 to aaruf crashes Aaru with
+ * "Unhandled exception: System.Reflection.TargetInvocationException: Exception has been thrown by the target of
+ * an invocation."
+ */
 
-    // 20201103 CLAUNIA: Fixed in 532b2adddc900d8e4c61a6399d4da20a566d4876
-    public class _379 : OpticalImageConvertIssueTest
-    {
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue379");
-        public override string InputPath => "Sony USB Driver.B6T";
-        public override string SuggestedOutputFilename => "AaruIssue379Output.aif";
-        public override IWritableImage OutputFormat => new AaruFormat();
-        public override string Md5 => null;
-        public override bool UseLong => false;
-    }
+// 20201103 CLAUNIA: Fixed in 532b2adddc900d8e4c61a6399d4da20a566d4876
+public class _379 : OpticalImageConvertIssueTest
+{
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue379");
+    public override string InputPath => "Sony USB Driver.B6T";
+    public override string SuggestedOutputFilename => "AaruIssue379Output.aif";
+    public override IWritableImage OutputFormat => new AaruFormat();
+    public override string Md5 => null;
+    public override bool UseLong => false;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/398.cs b/Aaru.Tests/Issues/398.cs
index e9be5fec1..ba1a2d842 100644
--- a/Aaru.Tests/Issues/398.cs
+++ b/Aaru.Tests/Issues/398.cs
@@ -3,25 +3,23 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/398
-     *
-     * SilasLaspada commented on Jul 28, 2020
-     *
-     * Trying to convert a CDI image of a CDROM crashes Aaru. I've tried ISO, CUE, MDS, and AARUF.
-     * Image file: sonycdi.zip
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/398
+ *
+ * SilasLaspada commented on Jul 28, 2020
+ *
+ * Trying to convert a CDI image of a CDROM crashes Aaru. I've tried ISO, CUE, MDS, and AARUF.
+ * Image file: sonycdi.zip
+ */
 
-    // 20201104 CLAUNIA: Fixed in 7723fc2d0dbe0a6e6dc7b5cabc17f6798bb5eebb
-    public class _398 : OpticalImageConvertIssueTest
-    {
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue398");
-        public override string InputPath => "sonycdi.cdi.xz";
-        public override string SuggestedOutputFilename => "AaruIssue398Output.aif";
-        public override IWritableImage OutputFormat => new AaruFormat();
-        public override string Md5 => null;
-        public override bool UseLong => false;
-    }
+// 20201104 CLAUNIA: Fixed in 7723fc2d0dbe0a6e6dc7b5cabc17f6798bb5eebb
+public class _398 : OpticalImageConvertIssueTest
+{
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue398");
+    public override string InputPath => "sonycdi.cdi.xz";
+    public override string SuggestedOutputFilename => "AaruIssue398Output.aif";
+    public override IWritableImage OutputFormat => new AaruFormat();
+    public override string Md5 => null;
+    public override bool UseLong => false;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/410.cs b/Aaru.Tests/Issues/410.cs
index bdc11d309..33f0f5087 100644
--- a/Aaru.Tests/Issues/410.cs
+++ b/Aaru.Tests/Issues/410.cs
@@ -1,33 +1,31 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/410
-     * 
-     * darkstar commented on Sep 27, 2020
-     * 
-     * I have two (original/pressed) CDs that were apparently mastered incorrectly. Neither the physical discs nor the
-     * dumps (as generated by Aaru, A120% or any other tool) can be read by and "modern"-ish operating system or ISO
-     * tool. They just show either an empty root directory or abort with an error.
-     *  
-     * However, both the CDs and the dumps can be read perfectly fine in a VM running Windows 98
-     *  
-     * The CD in question for this issue is:
-     *  
-     * MissionForce: Cyberstorm (uploaded to archive.org here )
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/410
+ * 
+ * darkstar commented on Sep 27, 2020
+ * 
+ * I have two (original/pressed) CDs that were apparently mastered incorrectly. Neither the physical discs nor the
+ * dumps (as generated by Aaru, A120% or any other tool) can be read by and "modern"-ish operating system or ISO
+ * tool. They just show either an empty root directory or abort with an error.
+ *  
+ * However, both the CDs and the dumps can be read perfectly fine in a VM running Windows 98
+ *  
+ * The CD in question for this issue is:
+ *  
+ * MissionForce: Cyberstorm (uploaded to archive.org here )
+ */
 
-    // 20201106 CLAUNIA: Fixed in d30a6d18cd1f6d8b9075f096bd56e23fc5106dbf
-    public class _410 : FsExtractIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue410");
-        public override string TestFile => "cyberstorm.mds";
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override bool Debug => false;
-        public override bool Xattrs => false;
-        public override string Encoding => null;
-        public override bool ExpectPartitions => true;
-        public override string Namespace => null;
-    }
+// 20201106 CLAUNIA: Fixed in d30a6d18cd1f6d8b9075f096bd56e23fc5106dbf
+public class _410 : FsExtractIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue410");
+    public override string TestFile => "cyberstorm.mds";
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override bool Debug => false;
+    public override bool Xattrs => false;
+    public override string Encoding => null;
+    public override bool ExpectPartitions => true;
+    public override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/411.cs b/Aaru.Tests/Issues/411.cs
index 5a65189d5..d87fe1ab1 100644
--- a/Aaru.Tests/Issues/411.cs
+++ b/Aaru.Tests/Issues/411.cs
@@ -1,33 +1,31 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/411
-     * 
-     * darkstar commented on Sep 27, 2020
-     * 
-     * I have two (original/pressed) CDs that were apparently mastered incorrectly. Neither the physical discs nor the
-     * dumps (as generated by Aaru, A120% or any other tool) can be read by and "modern"-ish operating system or ISO
-     * tool. They just show either an empty root directory or abort with an error.
-     *  
-     * However, both the CDs and the dumps can be read perfectly fine in a VM running Windows 98
-     *
-     * The CD in question is:
-     *  
-     * CD 2 ("Master Quiz") of the 10-game pack available here
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/411
+ * 
+ * darkstar commented on Sep 27, 2020
+ * 
+ * I have two (original/pressed) CDs that were apparently mastered incorrectly. Neither the physical discs nor the
+ * dumps (as generated by Aaru, A120% or any other tool) can be read by and "modern"-ish operating system or ISO
+ * tool. They just show either an empty root directory or abort with an error.
+ *  
+ * However, both the CDs and the dumps can be read perfectly fine in a VM running Windows 98
+ *
+ * The CD in question is:
+ *  
+ * CD 2 ("Master Quiz") of the 10-game pack available here
+ */
 
-    // 20201106 CLAUNIA: Fixed in d30a6d18cd1f6d8b9075f096bd56e23fc5106dbf
-    public class _411 : FsExtractIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue411");
-        public override string TestFile => "CD02 - Master Quiz - Das total abgeflogene Quiz.mds";
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override bool Debug => false;
-        public override bool Xattrs => false;
-        public override string Encoding => null;
-        public override bool ExpectPartitions => true;
-        public override string Namespace => null;
-    }
+// 20201106 CLAUNIA: Fixed in d30a6d18cd1f6d8b9075f096bd56e23fc5106dbf
+public class _411 : FsExtractIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue411");
+    public override string TestFile => "CD02 - Master Quiz - Das total abgeflogene Quiz.mds";
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override bool Debug => false;
+    public override bool Xattrs => false;
+    public override string Encoding => null;
+    public override bool ExpectPartitions => true;
+    public override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/441.cs b/Aaru.Tests/Issues/441.cs
index a23a2f1b6..a2a4ca8c7 100644
--- a/Aaru.Tests/Issues/441.cs
+++ b/Aaru.Tests/Issues/441.cs
@@ -1,25 +1,23 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/441
-     *
-     * SilasLaspada commented on Nov 11, 2020
-     *
-     * When trying to extract files from a Zip 100 Aaruf image, some files can't be extracted due to the error
-     * "Error EINVAL reading file".
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/441
+ *
+ * SilasLaspada commented on Nov 11, 2020
+ *
+ * When trying to extract files from a Zip 100 Aaruf image, some files can't be extracted due to the error
+ * "Error EINVAL reading file".
+ */
 
-    public class _441 : FsExtractIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue441");
-        public override string TestFile => "Zip-100_aaru_5.2.aaruf";
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override bool Debug => true;
-        public override bool Xattrs => false;
-        public override string Encoding => null;
-        public override bool ExpectPartitions => true;
-        public override string Namespace => null;
-    }
+public class _441 : FsExtractIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue441");
+    public override string TestFile => "Zip-100_aaru_5.2.aaruf";
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override bool Debug => true;
+    public override bool Xattrs => false;
+    public override string Encoding => null;
+    public override bool ExpectPartitions => true;
+    public override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/448.cs b/Aaru.Tests/Issues/448.cs
index 85ffe679e..61675d7b3 100644
--- a/Aaru.Tests/Issues/448.cs
+++ b/Aaru.Tests/Issues/448.cs
@@ -4,35 +4,34 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Tests.Images;
 using BlindWrite5 = Aaru.DiscImages.BlindWrite5;
 
-namespace Aaru.Tests.Issues
-{
-    public class _448 : OpticalMediaImageTest
-    {
-        public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue448");
-        public override IMediaImage _plugin    => new BlindWrite5();
+namespace Aaru.Tests.Issues;
 
-        public override OpticalImageTestExpected[] Tests => new[]
+public class _448 : OpticalMediaImageTest
+{
+    public override string      DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue448");
+    public override IMediaImage _plugin    => new BlindWrite5();
+
+    public override OpticalImageTestExpected[] Tests => new[]
+    {
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "B6T_ISO-BlindWrite7.B6T",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 255,
+            SectorSize    = 2048,
+            LongMD5       = "1bea7f781be0fb3b878de96e965c53a0",
+            SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c",
+            Tracks = new[]
             {
-                TestFile      = "B6T_ISO-BlindWrite7.B6T",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 255,
-                SectorSize    = 2048,
-                LongMD5       = "1bea7f781be0fb3b878de96e965c53a0",
-                SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/449.cs b/Aaru.Tests/Issues/449.cs
index b0c558e86..39994a234 100644
--- a/Aaru.Tests/Issues/449.cs
+++ b/Aaru.Tests/Issues/449.cs
@@ -1,15 +1,13 @@
 using System.IO;
 
-namespace Aaru.Tests.Issues
-{
-    /* SilasLaspada commented on Nov 16, 2020
-     *
-     * Aaru doesn't support specific NRG (Version 1) image
-     */
+namespace Aaru.Tests.Issues;
+/* SilasLaspada commented on Nov 16, 2020
+ *
+ * Aaru doesn't support specific NRG (Version 1) image
+ */
 
-    public class _449 : OpticalImageReadIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue449");
-        public override string TestFile   => "NRG-Nero_Burning_ROM4.nrg";
-    }
+public class _449 : OpticalImageReadIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue449");
+    public override string TestFile   => "NRG-Nero_Burning_ROM4.nrg";
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/450.cs b/Aaru.Tests/Issues/450.cs
index 286e0304e..304df39c4 100644
--- a/Aaru.Tests/Issues/450.cs
+++ b/Aaru.Tests/Issues/450.cs
@@ -3,21 +3,19 @@ using System.IO;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.Issues
-{
-    /* SilasLaspada commented on Nov 16, 2020
-     *
-     * Error converting NRG version 2 to other formats
-     */
+namespace Aaru.Tests.Issues;
+/* SilasLaspada commented on Nov 16, 2020
+ *
+ * Error converting NRG version 2 to other formats
+ */
 
-    public class _450 : OpticalImageConvertIssueTest
-    {
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue450");
-        public override string InputPath => "NRG-Nero_Burning_ROM7.nrg";
-        public override string SuggestedOutputFilename => "AaruTestIssue450.aif";
-        public override IWritableImage OutputFormat => new AaruFormat();
-        public override string Md5 => null;
-        public override bool UseLong => true;
-    }
+public class _450 : OpticalImageConvertIssueTest
+{
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue450");
+    public override string InputPath => "NRG-Nero_Burning_ROM7.nrg";
+    public override string SuggestedOutputFilename => "AaruTestIssue450.aif";
+    public override IWritableImage OutputFormat => new AaruFormat();
+    public override string Md5 => null;
+    public override bool UseLong => true;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/495.cs b/Aaru.Tests/Issues/495.cs
index 2a80cede5..fa2d8f92e 100644
--- a/Aaru.Tests/Issues/495.cs
+++ b/Aaru.Tests/Issues/495.cs
@@ -1,24 +1,22 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/495
-     *
-     * SilasLaspada commented on Jan 10, 2021
-     *
-     * Trying to extract files from a CDTV image crashes with "Error reading file: Object reference not set to an instance of an object."
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/495
+ *
+ * SilasLaspada commented on Jan 10, 2021
+ *
+ * Trying to extract files from a CDTV image crashes with "Error reading file: Object reference not set to an instance of an object."
+ */
 
-    public class _495 : FsExtractIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue495");
-        public override string TestFile => "NetworkCD.aaruf";
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override bool Debug => false;
-        public override bool Xattrs => false;
-        public override string Encoding => null;
-        public override bool ExpectPartitions => true;
-        public override string Namespace => null;
-    }
+public class _495 : FsExtractIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue495");
+    public override string TestFile => "NetworkCD.aaruf";
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override bool Debug => false;
+    public override bool Xattrs => false;
+    public override string Encoding => null;
+    public override bool ExpectPartitions => true;
+    public override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/531.cs b/Aaru.Tests/Issues/531.cs
index 295e04b1e..b671315e2 100644
--- a/Aaru.Tests/Issues/531.cs
+++ b/Aaru.Tests/Issues/531.cs
@@ -1,25 +1,23 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/531
-     *
-     * SilasLaspada commented on Jan 19, 2021
-     *
-     * When extracting files from a FAT32 partition found on a DVD-RAM Gen. 1 image, Aaru reports
-     * "Error reading file: Object reference not set to an instance of an object.".
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/531
+ *
+ * SilasLaspada commented on Jan 19, 2021
+ *
+ * When extracting files from a FAT32 partition found on a DVD-RAM Gen. 1 image, Aaru reports
+ * "Error reading file: Object reference not set to an instance of an object.".
+ */
 
-    public class _531 : FsExtractIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue531");
-        public override string TestFile => "DVD-RAM-GEN1_aaru_5.3.aaruf";
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override bool Debug => true;
-        public override bool Xattrs => false;
-        public override string Encoding => null;
-        public override bool ExpectPartitions => true;
-        public override string Namespace => null;
-    }
+public class _531 : FsExtractIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue531");
+    public override string TestFile => "DVD-RAM-GEN1_aaru_5.3.aaruf";
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override bool Debug => true;
+    public override bool Xattrs => false;
+    public override string Encoding => null;
+    public override bool ExpectPartitions => true;
+    public override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/542/Sims.cs b/Aaru.Tests/Issues/542/Sims.cs
index 5e4ba8343..d4448b072 100644
--- a/Aaru.Tests/Issues/542/Sims.cs
+++ b/Aaru.Tests/Issues/542/Sims.cs
@@ -3,25 +3,23 @@ using System.IO;
 
 // ReSharper disable StringLiteralTypo
 
-namespace Aaru.Tests.Issues._542
-{
-    /* https://github.com/aaru-dps/Aaru/issues/542
-     *
-     * SilasLaspada commented on Feb 10, 2021
-     *
-     * When extracting an image of a SafeDisc protected CD, most files aren't properly extracted.
-     */
+namespace Aaru.Tests.Issues._542;
+/* https://github.com/aaru-dps/Aaru/issues/542
+ *
+ * SilasLaspada commented on Feb 10, 2021
+ *
+ * When extracting an image of a SafeDisc protected CD, most files aren't properly extracted.
+ */
 
-    public class Sims : FsExtractHashIssueTest
-    {
-        protected override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue542", "sims");
-        protected override string                     TestFile         => "The Sims.aaruf";
-        protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
-        protected override bool                       Debug            => false;
-        protected override bool                       Xattrs           => false;
-        protected override string                     Encoding         => null;
-        protected override bool                       ExpectPartitions => true;
-        protected override string                     Namespace        => null;
-    }
+public class Sims : FsExtractHashIssueTest
+{
+    protected override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue542", "sims");
+    protected override string                     TestFile         => "The Sims.aaruf";
+    protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
+    protected override bool                       Debug            => false;
+    protected override bool                       Xattrs           => false;
+    protected override string                     Encoding         => null;
+    protected override bool                       ExpectPartitions => true;
+    protected override string                     Namespace        => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/542/SimsEP.cs b/Aaru.Tests/Issues/542/SimsEP.cs
index b899df03c..7cff19da9 100644
--- a/Aaru.Tests/Issues/542/SimsEP.cs
+++ b/Aaru.Tests/Issues/542/SimsEP.cs
@@ -3,25 +3,23 @@ using System.IO;
 
 // ReSharper disable StringLiteralTypo
 
-namespace Aaru.Tests.Issues._542
-{
-    /* https://github.com/aaru-dps/Aaru/issues/542
-     *
-     * SilasLaspada commented on Feb 10, 2021
-     *
-     * When extracting an image of a SafeDisc protected CD, most files aren't properly extracted.
-     */
+namespace Aaru.Tests.Issues._542;
+/* https://github.com/aaru-dps/Aaru/issues/542
+ *
+ * SilasLaspada commented on Feb 10, 2021
+ *
+ * When extracting an image of a SafeDisc protected CD, most files aren't properly extracted.
+ */
 
-    public class SimsEP : FsExtractHashIssueTest
-    {
-        protected override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue542", "exp");
-        protected override string                     TestFile         => "THE_SIMS_EP.aaruf";
-        protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
-        protected override bool                       Debug            => false;
-        protected override bool                       Xattrs           => false;
-        protected override string                     Encoding         => null;
-        protected override bool                       ExpectPartitions => true;
-        protected override string                     Namespace        => null;
-    }
+public class SimsEP : FsExtractHashIssueTest
+{
+    protected override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue542", "exp");
+    protected override string                     TestFile         => "THE_SIMS_EP.aaruf";
+    protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
+    protected override bool                       Debug            => false;
+    protected override bool                       Xattrs           => false;
+    protected override string                     Encoding         => null;
+    protected override bool                       ExpectPartitions => true;
+    protected override string                     Namespace        => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/584.cs b/Aaru.Tests/Issues/584.cs
index 4e1a4948b..55e466e45 100644
--- a/Aaru.Tests/Issues/584.cs
+++ b/Aaru.Tests/Issues/584.cs
@@ -1,24 +1,22 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace Aaru.Tests.Issues
-{
-    /* https://github.com/aaru-dps/Aaru/issues/584
-     *
-     * robin-francois commented on May 27, 2021
-     *
-     * When performing file extraction, the following exception is raised
-     */
+namespace Aaru.Tests.Issues;
+/* https://github.com/aaru-dps/Aaru/issues/584
+ *
+ * robin-francois commented on May 27, 2021
+ *
+ * When performing file extraction, the following exception is raised
+ */
 
-    public class _584 : FsExtractIssueTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue584");
-        public override string TestFile => "001-Disquette_issue_584.img";
-        public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        public override bool Debug => false;
-        public override bool Xattrs => false;
-        public override string Encoding => null;
-        public override bool ExpectPartitions => false;
-        public override string Namespace => null;
-    }
+public class _584 : FsExtractIssueTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue584");
+    public override string TestFile => "001-Disquette_issue_584.img";
+    public override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    public override bool Debug => false;
+    public override bool Xattrs => false;
+    public override string Encoding => null;
+    public override bool ExpectPartitions => false;
+    public override string Namespace => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs b/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs
index 9993dc525..63e9356d7 100644
--- a/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs
+++ b/Aaru.Tests/Issues/590/asus-driver-gpu-tweak-v1231-2014.cs
@@ -3,25 +3,23 @@ using System.IO;
 
 // ReSharper disable StringLiteralTypo
 
-namespace Aaru.Tests.Issues._590
-{
-    /* https://github.com/aaru-dps/Aaru/issues/590
-     *
-     * SilasLaspada commented on June 1, 2021
-     *
-     * Other images seemingly affected by the same bug
-     */
+namespace Aaru.Tests.Issues._590;
+/* https://github.com/aaru-dps/Aaru/issues/590
+ *
+ * SilasLaspada commented on June 1, 2021
+ *
+ * Other images seemingly affected by the same bug
+ */
 
-    public class asus_driver_gpu_tweak_v1231_2014 : FsExtractHashIssueTest
-    {
-        protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590",
-                                                             "asus-driver-gpu-tweak-v1231-2014");
-        protected override string                     TestFile         => "V1231.aaruf";
-        protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
-        protected override bool                       Debug            => false;
-        protected override bool                       Xattrs           => false;
-        protected override string                     Encoding         => null;
-        protected override bool                       ExpectPartitions => true;
-        protected override string                     Namespace        => null;
-    }
+public class asus_driver_gpu_tweak_v1231_2014 : FsExtractHashIssueTest
+{
+    protected override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590",
+                                                         "asus-driver-gpu-tweak-v1231-2014");
+    protected override string                     TestFile         => "V1231.aaruf";
+    protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
+    protected override bool                       Debug            => false;
+    protected override bool                       Xattrs           => false;
+    protected override string                     Encoding         => null;
+    protected override bool                       ExpectPartitions => true;
+    protected override string                     Namespace        => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/590/m5a99fx.cs b/Aaru.Tests/Issues/590/m5a99fx.cs
index 907fd5568..cf62826db 100644
--- a/Aaru.Tests/Issues/590/m5a99fx.cs
+++ b/Aaru.Tests/Issues/590/m5a99fx.cs
@@ -3,25 +3,23 @@ using System.IO;
 
 // ReSharper disable StringLiteralTypo
 
-namespace Aaru.Tests.Issues._590
-{
-    /* https://github.com/aaru-dps/Aaru/issues/590
-     *
-     * SilasLaspada commented on May 30, 2021
-     *
-     * When extracting the files from a specific image, Aaru hangs without crashing.
-     */
+namespace Aaru.Tests.Issues._590;
+/* https://github.com/aaru-dps/Aaru/issues/590
+ *
+ * SilasLaspada commented on May 30, 2021
+ *
+ * When extracting the files from a specific image, Aaru hangs without crashing.
+ */
 
-    public class m5a99fx : FsExtractHashIssueTest
-    {
-        protected override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590", "m5a99fx");
-        protected override string                     TestFile         => "MB Support CD.aaruf";
-        protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
-        protected override bool                       Debug            => false;
-        protected override bool                       Xattrs           => false;
-        protected override string                     Encoding         => null;
-        protected override bool                       ExpectPartitions => true;
-        protected override string                     Namespace        => null;
-    }
+public class m5a99fx : FsExtractHashIssueTest
+{
+    protected override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590", "m5a99fx");
+    protected override string                     TestFile         => "MB Support CD.aaruf";
+    protected override Dictionary<string, string> ParsedOptions    => new Dictionary<string, string>();
+    protected override bool                       Debug            => false;
+    protected override bool                       Xattrs           => false;
+    protected override string                     Encoding         => null;
+    protected override bool                       ExpectPartitions => true;
+    protected override string                     Namespace        => null;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/590/win3.cs b/Aaru.Tests/Issues/590/win3.cs
index 51703fcdc..b3f6172df 100644
--- a/Aaru.Tests/Issues/590/win3.cs
+++ b/Aaru.Tests/Issues/590/win3.cs
@@ -3,25 +3,23 @@ using System.IO;
 
 // ReSharper disable StringLiteralTypo
 
-namespace Aaru.Tests.Issues._590
-{
-    /* https://github.com/aaru-dps/Aaru/issues/590
-     *
-     * SilasLaspada commented on May 30, 2021
-     *
-     * When extracting the files from a specific image, Aaru hangs without crashing.
-     */
+namespace Aaru.Tests.Issues._590;
+/* https://github.com/aaru-dps/Aaru/issues/590
+ *
+ * SilasLaspada commented on May 30, 2021
+ *
+ * When extracting the files from a specific image, Aaru hangs without crashing.
+ */
 
-    public class win3 : FsExtractHashIssueTest
-    {
-        protected override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590", "win3");
-        protected override string TestFile => "microsoft-windows-3.0-international-versions-promotional-copy.aif";
-        protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
-        protected override bool Debug => false;
-        protected override bool Xattrs => false;
-        protected override string Encoding => "cp850";
-        protected override bool ExpectPartitions => true;
-        protected override string Namespace => "romeo";
-    }
+public class win3 : FsExtractHashIssueTest
+{
+    protected override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue590", "win3");
+    protected override string TestFile => "microsoft-windows-3.0-international-versions-promotional-copy.aif";
+    protected override Dictionary<string, string> ParsedOptions => new Dictionary<string, string>();
+    protected override bool Debug => false;
+    protected override bool Xattrs => false;
+    protected override string Encoding => "cp850";
+    protected override bool ExpectPartitions => true;
+    protected override string Namespace => "romeo";
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/623.cs b/Aaru.Tests/Issues/623.cs
index 932a1e2c3..024e5b611 100644
--- a/Aaru.Tests/Issues/623.cs
+++ b/Aaru.Tests/Issues/623.cs
@@ -4,36 +4,35 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using Aaru.Tests.WritableImages;
 
-namespace Aaru.Tests.Issues
+namespace Aaru.Tests.Issues;
+
+public class _623 : WritableOpticalMediaImageTest
 {
-    public class _623 : WritableOpticalMediaImageTest
+    public override string         DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue623");
+    public override IMediaImage    InputPlugin => new AaruFormat();
+    public override IWritableImage OutputPlugin => new Alcohol120();
+    public override string         OutputExtension => "mds";
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue623");
-        public override IMediaImage InputPlugin => new AaruFormat();
-        public override IWritableImage OutputPlugin => new Alcohol120();
-        public override string OutputExtension => "mds";
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "alice.aif",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 255,
+            SectorSize    = 2048,
+            LongMD5       = "1bea7f781be0fb3b878de96e965c53a0",
+            SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c",
+            Tracks = new[]
             {
-                TestFile      = "alice.aif",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 255,
-                SectorSize    = 2048,
-                LongMD5       = "1bea7f781be0fb3b878de96e965c53a0",
-                SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/624.cs b/Aaru.Tests/Issues/624.cs
index 9b295a271..2d7603e64 100644
--- a/Aaru.Tests/Issues/624.cs
+++ b/Aaru.Tests/Issues/624.cs
@@ -4,36 +4,35 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using Aaru.Tests.WritableImages;
 
-namespace Aaru.Tests.Issues
+namespace Aaru.Tests.Issues;
+
+public class _624 : WritableOpticalMediaImageTest
 {
-    public class _624 : WritableOpticalMediaImageTest
+    public override string         DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue624");
+    public override IMediaImage    InputPlugin => new ZZZRawImage();
+    public override IWritableImage OutputPlugin => new Alcohol120();
+    public override string         OutputExtension => "mds";
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Pending", "issue624");
-        public override IMediaImage InputPlugin => new ZZZRawImage();
-        public override IWritableImage OutputPlugin => new Alcohol120();
-        public override string OutputExtension => "mds";
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "alice.iso",
+            MediaType     = MediaType.CD,
+            Sectors       = 255,
+            SectorSize    = 2048,
+            LongMD5       = "1bea7f781be0fb3b878de96e965c53a0",
+            SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c",
+            Tracks = new[]
             {
-                TestFile      = "alice.iso",
-                MediaType     = MediaType.CD,
-                Sectors       = 255,
-                SectorSize    = 2048,
-                LongMD5       = "1bea7f781be0fb3b878de96e965c53a0",
-                SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/625.cs b/Aaru.Tests/Issues/625.cs
index 147a1d74b..4323c0c11 100644
--- a/Aaru.Tests/Issues/625.cs
+++ b/Aaru.Tests/Issues/625.cs
@@ -4,36 +4,35 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 using Aaru.Tests.WritableImages;
 
-namespace Aaru.Tests.Issues
+namespace Aaru.Tests.Issues;
+
+public class _625 : WritableOpticalMediaImageTest
 {
-    public class _625 : WritableOpticalMediaImageTest
+    public override string         DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue625");
+    public override IMediaImage    InputPlugin => new Cdrdao();
+    public override IWritableImage OutputPlugin => new CloneCd();
+    public override string         OutputExtension => "mds";
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Issues", "Fixed", "issue625");
-        public override IMediaImage InputPlugin => new Cdrdao();
-        public override IWritableImage OutputPlugin => new CloneCd();
-        public override string OutputExtension => "mds";
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "alice.toc",
+            MediaType     = MediaType.CDROM,
+            Sectors       = 255,
+            SectorSize    = 2048,
+            LongMD5       = "1bea7f781be0fb3b878de96e965c53a0",
+            SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c",
+            Tracks = new[]
             {
-                TestFile      = "alice.toc",
-                MediaType     = MediaType.CDROM,
-                Sectors       = 255,
-                SectorSize    = 2048,
-                LongMD5       = "1bea7f781be0fb3b878de96e965c53a0",
-                SubchannelMD5 = "01fef9f42fe53e6256ba713ad237dc8c",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 254,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 254,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/FsExtractHashIssueTest.cs b/Aaru.Tests/Issues/FsExtractHashIssueTest.cs
index bb8453ab5..d4adf4456 100644
--- a/Aaru.Tests/Issues/FsExtractHashIssueTest.cs
+++ b/Aaru.Tests/Issues/FsExtractHashIssueTest.cs
@@ -14,233 +14,232 @@ using Newtonsoft.Json.Converters;
 using NUnit.Framework;
 using FileAttributes = Aaru.CommonTypes.Structs.FileAttributes;
 
-namespace Aaru.Tests.Issues
+namespace Aaru.Tests.Issues;
+
+/// <summary>This will extract (and discard data) all files in all filesystems detected in an image.</summary>
+public abstract class FsExtractHashIssueTest
 {
-    /// <summary>This will extract (and discard data) all files in all filesystems detected in an image.</summary>
-    public abstract class FsExtractHashIssueTest
+    protected abstract string                     DataFolder       { get; }
+    protected abstract string                     TestFile         { get; }
+    protected abstract Dictionary<string, string> ParsedOptions    { get; }
+    protected abstract bool                       Debug            { get; }
+    protected abstract bool                       Xattrs           { get; }
+    protected abstract string                     Encoding         { get; }
+    protected abstract bool                       ExpectPartitions { get; }
+    protected abstract string                     Namespace        { get; }
+
+    [Test]
+    public void Test()
     {
-        protected abstract string                     DataFolder       { get; }
-        protected abstract string                     TestFile         { get; }
-        protected abstract Dictionary<string, string> ParsedOptions    { get; }
-        protected abstract bool                       Debug            { get; }
-        protected abstract bool                       Xattrs           { get; }
-        protected abstract string                     Encoding         { get; }
-        protected abstract bool                       ExpectPartitions { get; }
-        protected abstract string                     Namespace        { get; }
+        Environment.CurrentDirectory = DataFolder;
 
-        [Test]
-        public void Test()
+        var     filtersList = new FiltersList();
+        IFilter inputFilter = filtersList.GetFilter(TestFile);
+
+        Dictionary<string, string> options = ParsedOptions;
+        options["debug"] = Debug.ToString();
+
+        Assert.IsNotNull(inputFilter, "Cannot open specified file.");
+
+        Encoding encodingClass = null;
+
+        if(Encoding != null)
+            encodingClass = Claunia.Encoding.Encoding.GetEncoding(Encoding);
+
+        PluginBase plugins = GetPluginBase.Instance;
+
+        IMediaImage imageFormat = ImageFormat.Detect(inputFilter) as IMediaImage;
+
+        Assert.NotNull(imageFormat, "Image format not identified, not proceeding with analysis.");
+
+        Assert.AreEqual(ErrorNumber.NoError, imageFormat.Open(inputFilter), "Unable to open image format");
+
+        List<Partition> partitions = Core.Partitions.GetAll(imageFormat);
+
+        if(partitions.Count == 0)
         {
-            Environment.CurrentDirectory = DataFolder;
+            Assert.IsFalse(ExpectPartitions, "No partitions found");
 
-            var     filtersList = new FiltersList();
-            IFilter inputFilter = filtersList.GetFilter(TestFile);
-
-            Dictionary<string, string> options = ParsedOptions;
-            options["debug"] = Debug.ToString();
-
-            Assert.IsNotNull(inputFilter, "Cannot open specified file.");
-
-            Encoding encodingClass = null;
-
-            if(Encoding != null)
-                encodingClass = Claunia.Encoding.Encoding.GetEncoding(Encoding);
-
-            PluginBase plugins = GetPluginBase.Instance;
-
-            IMediaImage imageFormat = ImageFormat.Detect(inputFilter) as IMediaImage;
-
-            Assert.NotNull(imageFormat, "Image format not identified, not proceeding with analysis.");
-
-            Assert.AreEqual(ErrorNumber.NoError, imageFormat.Open(inputFilter), "Unable to open image format");
-
-            List<Partition> partitions = Core.Partitions.GetAll(imageFormat);
-
-            if(partitions.Count == 0)
+            partitions.Add(new Partition
             {
-                Assert.IsFalse(ExpectPartitions, "No partitions found");
-
-                partitions.Add(new Partition
-                {
-                    Description = "Whole device",
-                    Length      = imageFormat.Info.Sectors,
-                    Offset      = 0,
-                    Size        = imageFormat.Info.SectorSize * imageFormat.Info.Sectors,
-                    Sequence    = 1,
-                    Start       = 0
-                });
-            }
-
-            bool filesystemFound = false;
-
-            Assert.True(File.Exists($"{TestFile}.unittest.json"));
-
-            var serializer = new JsonSerializer
-            {
-                Formatting        = Formatting.Indented,
-                MaxDepth          = 16384,
-                NullValueHandling = NullValueHandling.Ignore
-            };
-
-            serializer.Converters.Add(new StringEnumConverter());
-
-            var               sr           = new StreamReader($"{TestFile}.unittest.json");
-            FsExtractHashData expectedData = serializer.Deserialize<FsExtractHashData>(new JsonTextReader(sr));
-
-            Assert.NotNull(expectedData);
-
-            Assert.AreEqual(expectedData.Partitions.Length, partitions.Count,
-                            $"Excepted {expectedData.Partitions.Length} partitions but found {partitions.Count}");
-
-            for(int i = 0; i < partitions.Count; i++)
-            {
-                Core.Filesystems.Identify(imageFormat, out List<string> idPlugins, partitions[i]);
-
-                if(idPlugins.Count == 0)
-                {
-                    Assert.IsNull(expectedData.Partitions[i],
-                                  $"Expected no filesystems identified in partition {i} but found {idPlugins.Count}");
-
-                    continue;
-                }
-
-                if(expectedData.Partitions[i].Volumes is null)
-                    continue;
-
-                Assert.AreEqual(expectedData.Partitions[i].Volumes.Length, idPlugins.Count,
-                                $"Expected {expectedData.Partitions[i].Volumes.Length} filesystems identified in partition {i} but found {idPlugins.Count}");
-
-                for(int j = 0; j < idPlugins.Count; j++)
-                {
-                    string pluginName = idPlugins[j];
-
-                    if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out IReadOnlyFilesystem plugin))
-                        continue;
-
-                    Assert.IsNotNull(plugin, "Could not instantiate filesystem plugin");
-
-                    var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
-                        {});
-
-                    Assert.IsNotNull(fs, $"Could not instantiate filesystem {pluginName}");
-
-                    filesystemFound = true;
-
-                    ErrorNumber error = fs.Mount(imageFormat, partitions[i], encodingClass, options, Namespace);
-
-                    Assert.AreEqual(ErrorNumber.NoError, error, $"Could not mount {pluginName} in partition {i}.");
-
-                    Assert.AreEqual(expectedData.Partitions[i].Volumes[j].VolumeName, fs.XmlFsType.VolumeName,
-                                    $"Excepted volume name \"{expectedData.Partitions[i].Volumes[j].VolumeName}\" for filesystem {j} in partition {i} but found \"{fs.XmlFsType.VolumeName}\"");
-
-                    VolumeData volumeData = expectedData.Partitions[i].Volumes[j];
-
-                    ExtractFilesInDir("/", fs, Xattrs, volumeData);
-
-                    volumeData.Directories.Should().BeEmpty("Expected directories not found:", volumeData.Directories);
-                    volumeData.Files.Should().BeEmpty("Expected files not found:", volumeData.Files.Keys);
-                }
-            }
-
-            Assert.IsTrue(filesystemFound, "No filesystems found.");
+                Description = "Whole device",
+                Length      = imageFormat.Info.Sectors,
+                Offset      = 0,
+                Size        = imageFormat.Info.SectorSize * imageFormat.Info.Sectors,
+                Sequence    = 1,
+                Start       = 0
+            });
         }
 
-        static void ExtractFilesInDir(string path, IReadOnlyFilesystem fs, bool doXattrs, VolumeData volumeData)
+        bool filesystemFound = false;
+
+        Assert.True(File.Exists($"{TestFile}.unittest.json"));
+
+        var serializer = new JsonSerializer
         {
-            if(path.StartsWith('/'))
-                path = path[1..];
+            Formatting        = Formatting.Indented,
+            MaxDepth          = 16384,
+            NullValueHandling = NullValueHandling.Ignore
+        };
 
-            ErrorNumber error = fs.ReadDir(path, out List<string> directory);
+        serializer.Converters.Add(new StringEnumConverter());
 
-            Assert.AreEqual(ErrorNumber.NoError, error,
-                            string.Format("Error {0} reading root directory {0}", error.ToString()));
+        var               sr           = new StreamReader($"{TestFile}.unittest.json");
+        FsExtractHashData expectedData = serializer.Deserialize<FsExtractHashData>(new JsonTextReader(sr));
 
-            foreach(string entry in directory)
+        Assert.NotNull(expectedData);
+
+        Assert.AreEqual(expectedData.Partitions.Length, partitions.Count,
+                        $"Excepted {expectedData.Partitions.Length} partitions but found {partitions.Count}");
+
+        for(int i = 0; i < partitions.Count; i++)
+        {
+            Core.Filesystems.Identify(imageFormat, out List<string> idPlugins, partitions[i]);
+
+            if(idPlugins.Count == 0)
             {
-                error = fs.Stat(path + "/" + entry, out FileEntryInfo stat);
+                Assert.IsNull(expectedData.Partitions[i],
+                              $"Expected no filesystems identified in partition {i} but found {idPlugins.Count}");
 
-                Assert.AreEqual(ErrorNumber.NoError, error, $"Error getting stat for entry {entry}");
+                continue;
+            }
 
-                if(stat.Attributes.HasFlag(FileAttributes.Directory))
-                {
-                    if(string.IsNullOrWhiteSpace(path))
-                    {
-                        Assert.True(volumeData.Directories.Contains(entry), $"Found unexpected directory {entry}");
-                        volumeData.Directories.Remove(entry);
-                    }
-                    else
-                    {
-                        Assert.True(volumeData.Directories.Contains(path + "/" + entry),
-                                    $"Found unexpected directory {path + "/" + entry}");
+            if(expectedData.Partitions[i].Volumes is null)
+                continue;
 
-                        volumeData.Directories.Remove(path + "/" + entry);
-                    }
+            Assert.AreEqual(expectedData.Partitions[i].Volumes.Length, idPlugins.Count,
+                            $"Expected {expectedData.Partitions[i].Volumes.Length} filesystems identified in partition {i} but found {idPlugins.Count}");
 
-                    ExtractFilesInDir(path + "/" + entry, fs, doXattrs, volumeData);
+            for(int j = 0; j < idPlugins.Count; j++)
+            {
+                string pluginName = idPlugins[j];
 
+                if(!plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out IReadOnlyFilesystem plugin))
                     continue;
-                }
 
-                FileData fileData;
+                Assert.IsNotNull(plugin, "Could not instantiate filesystem plugin");
 
+                var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
+                    {});
+
+                Assert.IsNotNull(fs, $"Could not instantiate filesystem {pluginName}");
+
+                filesystemFound = true;
+
+                ErrorNumber error = fs.Mount(imageFormat, partitions[i], encodingClass, options, Namespace);
+
+                Assert.AreEqual(ErrorNumber.NoError, error, $"Could not mount {pluginName} in partition {i}.");
+
+                Assert.AreEqual(expectedData.Partitions[i].Volumes[j].VolumeName, fs.XmlFsType.VolumeName,
+                                $"Excepted volume name \"{expectedData.Partitions[i].Volumes[j].VolumeName}\" for filesystem {j} in partition {i} but found \"{fs.XmlFsType.VolumeName}\"");
+
+                VolumeData volumeData = expectedData.Partitions[i].Volumes[j];
+
+                ExtractFilesInDir("/", fs, Xattrs, volumeData);
+
+                volumeData.Directories.Should().BeEmpty("Expected directories not found:", volumeData.Directories);
+                volumeData.Files.Should().BeEmpty("Expected files not found:", volumeData.Files.Keys);
+            }
+        }
+
+        Assert.IsTrue(filesystemFound, "No filesystems found.");
+    }
+
+    static void ExtractFilesInDir(string path, IReadOnlyFilesystem fs, bool doXattrs, VolumeData volumeData)
+    {
+        if(path.StartsWith('/'))
+            path = path[1..];
+
+        ErrorNumber error = fs.ReadDir(path, out List<string> directory);
+
+        Assert.AreEqual(ErrorNumber.NoError, error,
+                        string.Format("Error {0} reading root directory {0}", error.ToString()));
+
+        foreach(string entry in directory)
+        {
+            error = fs.Stat(path + "/" + entry, out FileEntryInfo stat);
+
+            Assert.AreEqual(ErrorNumber.NoError, error, $"Error getting stat for entry {entry}");
+
+            if(stat.Attributes.HasFlag(FileAttributes.Directory))
+            {
                 if(string.IsNullOrWhiteSpace(path))
                 {
-                    Assert.IsTrue(volumeData.Files.TryGetValue(entry, out fileData), $"Found unexpected file {entry}");
-
-                    volumeData.Files.Remove(entry);
+                    Assert.True(volumeData.Directories.Contains(entry), $"Found unexpected directory {entry}");
+                    volumeData.Directories.Remove(entry);
                 }
                 else
                 {
-                    Assert.IsTrue(volumeData.Files.TryGetValue(path + "/" + entry, out fileData),
-                                  $"Found unexpected file {path + "/" + entry}");
+                    Assert.True(volumeData.Directories.Contains(path + "/" + entry),
+                                $"Found unexpected directory {path + "/" + entry}");
 
-                    volumeData.Files.Remove(path + "/" + entry);
+                    volumeData.Directories.Remove(path + "/" + entry);
                 }
 
-                if(doXattrs)
-                {
-                    error = fs.ListXAttr(path + "/" + entry, out List<string> xattrs);
+                ExtractFilesInDir(path + "/" + entry, fs, doXattrs, volumeData);
 
-                    Assert.AreEqual(ErrorNumber.NoError, error,
-                                    $"Error {error} getting extended attributes for entry {path + "/" + entry}");
-
-                    Dictionary<string, string> expectedXattrs = fileData.XattrsWithMd5;
-
-                    if(error == ErrorNumber.NoError)
-                        foreach(string xattr in xattrs)
-                        {
-                            Assert.IsTrue(expectedXattrs.TryGetValue(xattr, out string expectedXattrMd5),
-                                          $"Found unexpected extended attribute {xattr} in file {entry}");
-
-                            expectedXattrs.Remove(xattr);
-
-                            byte[] xattrBuf = Array.Empty<byte>();
-                            error = fs.GetXattr(path + "/" + entry, xattr, ref xattrBuf);
-
-                            Assert.AreEqual(ErrorNumber.NoError, error,
-                                            $"Error {error} reading extended attributes for entry {path + "/" + entry}");
-
-                            string xattrMd5 = Md5Context.Data(xattrBuf, out _);
-
-                            Assert.AreEqual(expectedXattrMd5, xattrMd5,
-                                            $"Invalid checksum for xattr {xattr} for file {path + "/" + entry}");
-                        }
-
-                    expectedXattrs.Should().
-                                   BeEmpty($"Expected extended attributes not found for file {path + "/" + entry}:",
-                                           expectedXattrs);
-                }
-
-                byte[] outBuf = Array.Empty<byte>();
-
-                error = fs.Read(path + "/" + entry, 0, stat.Length, ref outBuf);
-
-                Assert.AreEqual(ErrorNumber.NoError, error, $"Error {error} reading file {path + "/" + entry}");
-
-                string calculatedMd5 = Md5Context.Data(outBuf, out _);
-
-                Assert.AreEqual(fileData.MD5, calculatedMd5, $"Invalid checksum for file {path + "/" + entry}");
+                continue;
             }
+
+            FileData fileData;
+
+            if(string.IsNullOrWhiteSpace(path))
+            {
+                Assert.IsTrue(volumeData.Files.TryGetValue(entry, out fileData), $"Found unexpected file {entry}");
+
+                volumeData.Files.Remove(entry);
+            }
+            else
+            {
+                Assert.IsTrue(volumeData.Files.TryGetValue(path + "/" + entry, out fileData),
+                              $"Found unexpected file {path + "/" + entry}");
+
+                volumeData.Files.Remove(path + "/" + entry);
+            }
+
+            if(doXattrs)
+            {
+                error = fs.ListXAttr(path + "/" + entry, out List<string> xattrs);
+
+                Assert.AreEqual(ErrorNumber.NoError, error,
+                                $"Error {error} getting extended attributes for entry {path + "/" + entry}");
+
+                Dictionary<string, string> expectedXattrs = fileData.XattrsWithMd5;
+
+                if(error == ErrorNumber.NoError)
+                    foreach(string xattr in xattrs)
+                    {
+                        Assert.IsTrue(expectedXattrs.TryGetValue(xattr, out string expectedXattrMd5),
+                                      $"Found unexpected extended attribute {xattr} in file {entry}");
+
+                        expectedXattrs.Remove(xattr);
+
+                        byte[] xattrBuf = Array.Empty<byte>();
+                        error = fs.GetXattr(path + "/" + entry, xattr, ref xattrBuf);
+
+                        Assert.AreEqual(ErrorNumber.NoError, error,
+                                        $"Error {error} reading extended attributes for entry {path + "/" + entry}");
+
+                        string xattrMd5 = Md5Context.Data(xattrBuf, out _);
+
+                        Assert.AreEqual(expectedXattrMd5, xattrMd5,
+                                        $"Invalid checksum for xattr {xattr} for file {path + "/" + entry}");
+                    }
+
+                expectedXattrs.Should().
+                               BeEmpty($"Expected extended attributes not found for file {path + "/" + entry}:",
+                                       expectedXattrs);
+            }
+
+            byte[] outBuf = Array.Empty<byte>();
+
+            error = fs.Read(path + "/" + entry, 0, stat.Length, ref outBuf);
+
+            Assert.AreEqual(ErrorNumber.NoError, error, $"Error {error} reading file {path + "/" + entry}");
+
+            string calculatedMd5 = Md5Context.Data(outBuf, out _);
+
+            Assert.AreEqual(fileData.MD5, calculatedMd5, $"Invalid checksum for file {path + "/" + entry}");
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/FsExtractIssueTest.cs b/Aaru.Tests/Issues/FsExtractIssueTest.cs
index 450eb4679..820923878 100644
--- a/Aaru.Tests/Issues/FsExtractIssueTest.cs
+++ b/Aaru.Tests/Issues/FsExtractIssueTest.cs
@@ -8,170 +8,169 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Core;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Issues
+namespace Aaru.Tests.Issues;
+
+/// <summary>This will extract (and discard data) all files in all filesystems detected in an image.</summary>
+public abstract class FsExtractIssueTest
 {
-    /// <summary>This will extract (and discard data) all files in all filesystems detected in an image.</summary>
-    public abstract class FsExtractIssueTest
+    public abstract string                     DataFolder       { get; }
+    public abstract string                     TestFile         { get; }
+    public abstract Dictionary<string, string> ParsedOptions    { get; }
+    public abstract bool                       Debug            { get; }
+    public abstract bool                       Xattrs           { get; }
+    public abstract string                     Encoding         { get; }
+    public abstract bool                       ExpectPartitions { get; }
+    public abstract string                     Namespace        { get; }
+
+    [Test]
+    public void Test()
     {
-        public abstract string                     DataFolder       { get; }
-        public abstract string                     TestFile         { get; }
-        public abstract Dictionary<string, string> ParsedOptions    { get; }
-        public abstract bool                       Debug            { get; }
-        public abstract bool                       Xattrs           { get; }
-        public abstract string                     Encoding         { get; }
-        public abstract bool                       ExpectPartitions { get; }
-        public abstract string                     Namespace        { get; }
+        Environment.CurrentDirectory = DataFolder;
 
-        [Test]
-        public void Test()
+        var     filtersList = new FiltersList();
+        IFilter inputFilter = filtersList.GetFilter(TestFile);
+
+        Dictionary<string, string> options = ParsedOptions;
+        options["debug"] = Debug.ToString();
+
+        Assert.IsNotNull(inputFilter, "Cannot open specified file.");
+
+        Encoding encodingClass = null;
+
+        if(Encoding != null)
+            encodingClass = Claunia.Encoding.Encoding.GetEncoding(Encoding);
+
+        PluginBase plugins = GetPluginBase.Instance;
+
+        IMediaImage imageFormat = ImageFormat.Detect(inputFilter) as IMediaImage;
+
+        Assert.NotNull(imageFormat, "Image format not identified, not proceeding with analysis.");
+
+        Assert.AreEqual(ErrorNumber.NoError, imageFormat.Open(inputFilter), "Unable to open image format");
+
+        List<Partition> partitions = Core.Partitions.GetAll(imageFormat);
+
+        if(partitions.Count == 0)
         {
-            Environment.CurrentDirectory = DataFolder;
+            Assert.IsFalse(ExpectPartitions, "No partitions found");
 
-            var     filtersList = new FiltersList();
-            IFilter inputFilter = filtersList.GetFilter(TestFile);
-
-            Dictionary<string, string> options = ParsedOptions;
-            options["debug"] = Debug.ToString();
-
-            Assert.IsNotNull(inputFilter, "Cannot open specified file.");
-
-            Encoding encodingClass = null;
-
-            if(Encoding != null)
-                encodingClass = Claunia.Encoding.Encoding.GetEncoding(Encoding);
-
-            PluginBase plugins = GetPluginBase.Instance;
-
-            IMediaImage imageFormat = ImageFormat.Detect(inputFilter) as IMediaImage;
-
-            Assert.NotNull(imageFormat, "Image format not identified, not proceeding with analysis.");
-
-            Assert.AreEqual(ErrorNumber.NoError, imageFormat.Open(inputFilter), "Unable to open image format");
-
-            List<Partition> partitions = Core.Partitions.GetAll(imageFormat);
-
-            if(partitions.Count == 0)
+            partitions.Add(new Partition
             {
-                Assert.IsFalse(ExpectPartitions, "No partitions found");
-
-                partitions.Add(new Partition
-                {
-                    Description = "Whole device",
-                    Length      = imageFormat.Info.Sectors,
-                    Offset      = 0,
-                    Size        = imageFormat.Info.SectorSize * imageFormat.Info.Sectors,
-                    Sequence    = 1,
-                    Start       = 0
-                });
-            }
-
-            bool filesystemFound = false;
-
-            for(int i = 0; i < partitions.Count; i++)
-            {
-                Core.Filesystems.Identify(imageFormat, out List<string> idPlugins, partitions[i]);
-
-                if(idPlugins.Count == 0)
-                    continue;
-
-                IReadOnlyFilesystem plugin;
-                ErrorNumber         error;
-
-                if(idPlugins.Count > 1)
-                {
-                    foreach(string pluginName in idPlugins)
-                        if(plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out plugin))
-                        {
-                            Assert.IsNotNull(plugin, "Could not instantiate filesystem plugin");
-
-                            var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.
-                                                                 Invoke(new object[]
-                                                                            {});
-
-                            Assert.IsNotNull(fs, $"Could not instantiate filesystem {pluginName}");
-
-                            filesystemFound = true;
-
-                            error = fs.Mount(imageFormat, partitions[i], encodingClass, options, Namespace);
-
-                            Assert.AreEqual(ErrorNumber.NoError, error,
-                                            $"Could not mount {pluginName} in partition {i}.");
-
-                            ExtractFilesInDir("/", fs, Xattrs);
-                        }
-                }
-                else
-                {
-                    plugins.ReadOnlyFilesystems.TryGetValue(idPlugins[0], out plugin);
-
-                    if(plugin is null)
-                        continue;
-
-                    var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
-                        {});
-
-                    Assert.IsNotNull(fs, $"Could not instantiate filesystem {plugin.Name}");
-
-                    filesystemFound = true;
-
-                    error = fs.Mount(imageFormat, partitions[i], encodingClass, options, Namespace);
-
-                    Assert.AreEqual(ErrorNumber.NoError, error, $"Could not mount {plugin.Name} in partition {i}.");
-
-                    ExtractFilesInDir("/", fs, Xattrs);
-                }
-            }
-
-            Assert.IsTrue(filesystemFound, "No filesystems found.");
+                Description = "Whole device",
+                Length      = imageFormat.Info.Sectors,
+                Offset      = 0,
+                Size        = imageFormat.Info.SectorSize * imageFormat.Info.Sectors,
+                Sequence    = 1,
+                Start       = 0
+            });
         }
 
-        static void ExtractFilesInDir(string path, IReadOnlyFilesystem fs, bool doXattrs)
+        bool filesystemFound = false;
+
+        for(int i = 0; i < partitions.Count; i++)
         {
-            if(path.StartsWith('/'))
-                path = path[1..];
+            Core.Filesystems.Identify(imageFormat, out List<string> idPlugins, partitions[i]);
 
-            ErrorNumber error = fs.ReadDir(path, out List<string> directory);
+            if(idPlugins.Count == 0)
+                continue;
 
-            Assert.AreEqual(ErrorNumber.NoError, error,
-                            string.Format("Error {0} reading root directory {0}", error.ToString()));
+            IReadOnlyFilesystem plugin;
+            ErrorNumber         error;
 
-            foreach(string entry in directory)
+            if(idPlugins.Count > 1)
             {
-                error = fs.Stat(path + "/" + entry, out FileEntryInfo stat);
+                foreach(string pluginName in idPlugins)
+                    if(plugins.ReadOnlyFilesystems.TryGetValue(pluginName, out plugin))
+                    {
+                        Assert.IsNotNull(plugin, "Could not instantiate filesystem plugin");
 
-                Assert.AreEqual(ErrorNumber.NoError, error, $"Error getting stat for entry {entry}");
+                        var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.
+                                                             Invoke(new object[]
+                                                                        {});
 
-                if(stat.Attributes.HasFlag(FileAttributes.Directory))
-                {
-                    ExtractFilesInDir(path + "/" + entry, fs, doXattrs);
+                        Assert.IsNotNull(fs, $"Could not instantiate filesystem {pluginName}");
 
-                    continue;
-                }
+                        filesystemFound = true;
 
-                if(doXattrs)
-                {
-                    error = fs.ListXAttr(path + "/" + entry, out List<string> xattrs);
+                        error = fs.Mount(imageFormat, partitions[i], encodingClass, options, Namespace);
 
-                    Assert.AreEqual(ErrorNumber.NoError, error,
-                                    $"Error {error} getting extended attributes for entry {path + "/" + entry}");
+                        Assert.AreEqual(ErrorNumber.NoError, error,
+                                        $"Could not mount {pluginName} in partition {i}.");
 
-                    if(error == ErrorNumber.NoError)
-                        foreach(string xattr in xattrs)
-                        {
-                            byte[] xattrBuf = Array.Empty<byte>();
-                            error = fs.GetXattr(path + "/" + entry, xattr, ref xattrBuf);
-
-                            Assert.AreEqual(ErrorNumber.NoError, error,
-                                            $"Error {error} reading extended attributes for entry {path + "/" + entry}");
-                        }
-                }
-
-                byte[] outBuf = Array.Empty<byte>();
-
-                error = fs.Read(path + "/" + entry, 0, stat.Length, ref outBuf);
-
-                Assert.AreEqual(ErrorNumber.NoError, error, $"Error {error} reading file {path + "/" + entry}");
+                        ExtractFilesInDir("/", fs, Xattrs);
+                    }
             }
+            else
+            {
+                plugins.ReadOnlyFilesystems.TryGetValue(idPlugins[0], out plugin);
+
+                if(plugin is null)
+                    continue;
+
+                var fs = (IReadOnlyFilesystem)plugin.GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
+                    {});
+
+                Assert.IsNotNull(fs, $"Could not instantiate filesystem {plugin.Name}");
+
+                filesystemFound = true;
+
+                error = fs.Mount(imageFormat, partitions[i], encodingClass, options, Namespace);
+
+                Assert.AreEqual(ErrorNumber.NoError, error, $"Could not mount {plugin.Name} in partition {i}.");
+
+                ExtractFilesInDir("/", fs, Xattrs);
+            }
+        }
+
+        Assert.IsTrue(filesystemFound, "No filesystems found.");
+    }
+
+    static void ExtractFilesInDir(string path, IReadOnlyFilesystem fs, bool doXattrs)
+    {
+        if(path.StartsWith('/'))
+            path = path[1..];
+
+        ErrorNumber error = fs.ReadDir(path, out List<string> directory);
+
+        Assert.AreEqual(ErrorNumber.NoError, error,
+                        string.Format("Error {0} reading root directory {0}", error.ToString()));
+
+        foreach(string entry in directory)
+        {
+            error = fs.Stat(path + "/" + entry, out FileEntryInfo stat);
+
+            Assert.AreEqual(ErrorNumber.NoError, error, $"Error getting stat for entry {entry}");
+
+            if(stat.Attributes.HasFlag(FileAttributes.Directory))
+            {
+                ExtractFilesInDir(path + "/" + entry, fs, doXattrs);
+
+                continue;
+            }
+
+            if(doXattrs)
+            {
+                error = fs.ListXAttr(path + "/" + entry, out List<string> xattrs);
+
+                Assert.AreEqual(ErrorNumber.NoError, error,
+                                $"Error {error} getting extended attributes for entry {path + "/" + entry}");
+
+                if(error == ErrorNumber.NoError)
+                    foreach(string xattr in xattrs)
+                    {
+                        byte[] xattrBuf = Array.Empty<byte>();
+                        error = fs.GetXattr(path + "/" + entry, xattr, ref xattrBuf);
+
+                        Assert.AreEqual(ErrorNumber.NoError, error,
+                                        $"Error {error} reading extended attributes for entry {path + "/" + entry}");
+                    }
+            }
+
+            byte[] outBuf = Array.Empty<byte>();
+
+            error = fs.Read(path + "/" + entry, 0, stat.Length, ref outBuf);
+
+            Assert.AreEqual(ErrorNumber.NoError, error, $"Error {error} reading file {path + "/" + entry}");
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/ImageReadIssueTest.cs b/Aaru.Tests/Issues/ImageReadIssueTest.cs
index 4faf74d46..0aa5912dc 100644
--- a/Aaru.Tests/Issues/ImageReadIssueTest.cs
+++ b/Aaru.Tests/Issues/ImageReadIssueTest.cs
@@ -7,57 +7,56 @@ using Aaru.CommonTypes.Interfaces;
 using Aaru.Core;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Issues
+namespace Aaru.Tests.Issues;
+
+/// <summary>This class will test an issue that happens when reading an image completely, from start to end, crashes.</summary>
+public abstract class ImageReadIssueTest
 {
-    /// <summary>This class will test an issue that happens when reading an image completely, from start to end, crashes.</summary>
-    public abstract class ImageReadIssueTest
+    const           uint   SECTORS_TO_READ = 256;
+    public abstract string DataFolder { get; }
+    public abstract string TestFile   { get; }
+
+    [Test]
+    public void Test()
     {
-        const           uint   SECTORS_TO_READ = 256;
-        public abstract string DataFolder { get; }
-        public abstract string TestFile   { get; }
+        Environment.CurrentDirectory = DataFolder;
 
-        [Test]
-        public void Test()
+        bool exists = File.Exists(TestFile);
+        Assert.True(exists, "Test file not found");
+
+        var     filtersList = new FiltersList();
+        IFilter inputFilter = filtersList.GetFilter(TestFile);
+
+        Assert.IsNotNull(inputFilter, "Filter for test file is not detected");
+
+        IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
+
+        Assert.IsNotNull(image, "Image format for test file is not detected");
+
+        Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), "Cannot open image for test file");
+
+        ulong       doneSectors = 0;
+        var         ctx         = new Crc32Context();
+        ErrorNumber errno;
+
+        while(doneSectors < image.Info.Sectors)
         {
-            Environment.CurrentDirectory = DataFolder;
+            byte[] sector;
 
-            bool exists = File.Exists(TestFile);
-            Assert.True(exists, "Test file not found");
-
-            var     filtersList = new FiltersList();
-            IFilter inputFilter = filtersList.GetFilter(TestFile);
-
-            Assert.IsNotNull(inputFilter, "Filter for test file is not detected");
-
-            IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
-
-            Assert.IsNotNull(image, "Image format for test file is not detected");
-
-            Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), "Cannot open image for test file");
-
-            ulong       doneSectors = 0;
-            var         ctx         = new Crc32Context();
-            ErrorNumber errno;
-
-            while(doneSectors < image.Info.Sectors)
+            if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
             {
-                byte[] sector;
-
-                if(image.Info.Sectors - doneSectors >= SECTORS_TO_READ)
-                {
-                    errno       =  image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
-                    doneSectors += SECTORS_TO_READ;
-                }
-                else
-                {
-                    errno       =  image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors), out sector);
-                    doneSectors += image.Info.Sectors - doneSectors;
-                }
-
-                Assert.AreEqual(ErrorNumber.NoError, errno);
-
-                ctx.Update(sector);
+                errno       =  image.ReadSectors(doneSectors, SECTORS_TO_READ, out sector);
+                doneSectors += SECTORS_TO_READ;
             }
+            else
+            {
+                errno       =  image.ReadSectors(doneSectors, (uint)(image.Info.Sectors - doneSectors), out sector);
+                doneSectors += image.Info.Sectors - doneSectors;
+            }
+
+            Assert.AreEqual(ErrorNumber.NoError, errno);
+
+            ctx.Update(sector);
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs b/Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs
index 20c9dbd9b..aabcdb69e 100644
--- a/Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs
+++ b/Aaru.Tests/Issues/OpticalImageConvertIssueTest.cs
@@ -18,118 +18,274 @@ using Schemas;
 using ImageInfo = Aaru.CommonTypes.Structs.ImageInfo;
 using Version = Aaru.CommonTypes.Interop.Version;
 
-namespace Aaru.Tests.Issues
+namespace Aaru.Tests.Issues;
+
+/// <summary>
+///     This tests the conversion of an input image (autodetected) to an output image and checks that the resulting
+///     image has the same hash as it should
+/// </summary>
+
+// TODO: The algorithm should be in Core, not copied in 3 places
+public abstract class OpticalImageConvertIssueTest
 {
-    /// <summary>
-    ///     This tests the conversion of an input image (autodetected) to an output image and checks that the resulting
-    ///     image has the same hash as it should
-    /// </summary>
+    public const    int                        SECTORS_TO_READ = 256;
+    public abstract Dictionary<string, string> ParsedOptions           { get; }
+    public abstract string                     DataFolder              { get; }
+    public abstract string                     InputPath               { get; }
+    public abstract string                     SuggestedOutputFilename { get; }
+    public abstract IWritableImage             OutputFormat            { get; }
+    public abstract string                     Md5                     { get; }
+    public abstract bool                       UseLong                 { get; }
 
-    // TODO: The algorithm should be in Core, not copied in 3 places
-    public abstract class OpticalImageConvertIssueTest
+    [Test]
+    public void Convert()
     {
-        public const    int                        SECTORS_TO_READ = 256;
-        public abstract Dictionary<string, string> ParsedOptions           { get; }
-        public abstract string                     DataFolder              { get; }
-        public abstract string                     InputPath               { get; }
-        public abstract string                     SuggestedOutputFilename { get; }
-        public abstract IWritableImage             OutputFormat            { get; }
-        public abstract string                     Md5                     { get; }
-        public abstract bool                       UseLong                 { get; }
+        Environment.CurrentDirectory = DataFolder;
 
-        [Test]
-        public void Convert()
+        Resume           resume  = null;
+        CICMMetadataType sidecar = null;
+        ErrorNumber      errno;
+
+        var     filtersList = new FiltersList();
+        IFilter inputFilter = filtersList.GetFilter(InputPath);
+
+        Assert.IsNotNull(inputFilter, "Cannot open specified file.");
+
+        string outputPath = Path.Combine(Path.GetTempPath(), SuggestedOutputFilename);
+
+        Assert.IsFalse(File.Exists(outputPath), "Output file already exists, not continuing.");
+
+        IMediaImage inputFormat = ImageFormat.Detect(inputFilter) as IMediaImage;
+
+        Assert.IsNotNull(inputFormat, "Input image format not identified, not proceeding with conversion.");
+
+        Assert.AreEqual(ErrorNumber.NoError, inputFormat.Open(inputFilter), "Unable to open image format");
+
+        Assert.IsTrue(OutputFormat.SupportedMediaTypes.Contains(inputFormat.Info.MediaType),
+                      "Output format does not support media type, cannot continue...");
+
+        if(inputFormat.Info.ReadableSectorTags.Count == 0)
         {
-            Environment.CurrentDirectory = DataFolder;
+            Assert.IsFalse(UseLong, "Input image does not support long sectors.");
+        }
 
-            Resume           resume  = null;
-            CICMMetadataType sidecar = null;
-            ErrorNumber      errno;
+        var inputOptical  = inputFormat as IOpticalMediaImage;
+        var outputOptical = OutputFormat as IWritableOpticalImage;
 
-            var     filtersList = new FiltersList();
-            IFilter inputFilter = filtersList.GetFilter(InputPath);
+        Assert.IsNotNull(inputOptical, "Could not treat existing image as optical disc.");
+        Assert.IsNotNull(outputOptical, "Could not treat new image as optical disc.");
+        Assert.IsNotNull(inputOptical.Tracks, "Existing image contains no tracks.");
 
-            Assert.IsNotNull(inputFilter, "Cannot open specified file.");
+        Assert.IsTrue(outputOptical.Create(outputPath, inputFormat.Info.MediaType, ParsedOptions, inputFormat.Info.Sectors, inputFormat.Info.SectorSize),
+                      $"Error {outputOptical.ErrorMessage} creating output image.");
 
-            string outputPath = Path.Combine(Path.GetTempPath(), SuggestedOutputFilename);
+        var metadata = new ImageInfo
+        {
+            Application           = "Aaru",
+            ApplicationVersion    = Version.GetVersion(),
+            Comments              = inputFormat.Info.Comments,
+            Creator               = inputFormat.Info.Creator,
+            DriveFirmwareRevision = inputFormat.Info.DriveFirmwareRevision,
+            DriveManufacturer     = inputFormat.Info.DriveManufacturer,
+            DriveModel            = inputFormat.Info.DriveModel,
+            DriveSerialNumber     = inputFormat.Info.DriveSerialNumber,
+            LastMediaSequence     = inputFormat.Info.LastMediaSequence,
+            MediaBarcode          = inputFormat.Info.MediaBarcode,
+            MediaManufacturer     = inputFormat.Info.MediaManufacturer,
+            MediaModel            = inputFormat.Info.MediaModel,
+            MediaPartNumber       = inputFormat.Info.MediaPartNumber,
+            MediaSequence         = inputFormat.Info.MediaSequence,
+            MediaSerialNumber     = inputFormat.Info.MediaSerialNumber,
+            MediaTitle            = inputFormat.Info.MediaTitle
+        };
 
-            Assert.IsFalse(File.Exists(outputPath), "Output file already exists, not continuing.");
+        Assert.IsTrue(outputOptical.SetMetadata(metadata),
+                      $"Error {outputOptical.ErrorMessage} setting metadata, ");
 
-            IMediaImage inputFormat = ImageFormat.Detect(inputFilter) as IMediaImage;
+        CICMMetadataType       cicmMetadata = inputFormat.CicmMetadata;
+        List<DumpHardwareType> dumpHardware = inputFormat.DumpHardware;
 
-            Assert.IsNotNull(inputFormat, "Input image format not identified, not proceeding with conversion.");
+        foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags.Where(mediaTag =>
+                    outputOptical.SupportedMediaTags.Contains(mediaTag)))
+        {
+            AaruConsole.WriteLine("Converting media tag {0}", mediaTag);
+            errno = inputFormat.ReadMediaTag(mediaTag, out byte[] tag);
 
-            Assert.AreEqual(ErrorNumber.NoError, inputFormat.Open(inputFilter), "Unable to open image format");
+            Assert.AreEqual(ErrorNumber.NoError, errno);
+            Assert.IsTrue(outputOptical.WriteMediaTag(tag, mediaTag));
+        }
 
-            Assert.IsTrue(OutputFormat.SupportedMediaTypes.Contains(inputFormat.Info.MediaType),
-                          "Output format does not support media type, cannot continue...");
+        AaruConsole.WriteLine("{0} sectors to convert", inputFormat.Info.Sectors);
+        ulong doneSectors;
 
-            if(inputFormat.Info.ReadableSectorTags.Count == 0)
+        Assert.IsTrue(outputOptical.SetTracks(inputOptical.Tracks),
+                      $"Error {outputOptical.ErrorMessage} sending tracks list to output image.");
+
+        foreach(Track track in inputOptical.Tracks)
+        {
+            doneSectors = 0;
+            ulong trackSectors = track.EndSector - track.StartSector + 1;
+
+            while(doneSectors < trackSectors)
             {
-                Assert.IsFalse(UseLong, "Input image does not support long sectors.");
+                byte[] sector;
+
+                uint sectorsToDo;
+
+                if(trackSectors - doneSectors >= SECTORS_TO_READ)
+                    sectorsToDo = SECTORS_TO_READ;
+                else
+                    sectorsToDo = (uint)(trackSectors - doneSectors);
+
+                bool useNotLong = false;
+                bool result     = false;
+
+                if(UseLong)
+                {
+                    errno = sectorsToDo == 1
+                                ? inputFormat.ReadSectorLong(doneSectors + track.StartSector, out sector)
+                                : inputFormat.ReadSectorsLong(doneSectors + track.StartSector, sectorsToDo,
+                                                              out sector);
+
+                    if(errno == ErrorNumber.NoError)
+                        result = sectorsToDo == 1
+                                     ? outputOptical.WriteSectorLong(sector, doneSectors + track.StartSector)
+                                     : outputOptical.WriteSectorsLong(sector, doneSectors + track.StartSector,
+                                                                      sectorsToDo);
+                    else
+                        result = true;
+
+                    if(!result &&
+                       sector.Length % 2352 != 0)
+                        useNotLong = true;
+                }
+
+                if(!UseLong || useNotLong)
+                {
+                    errno = sectorsToDo == 1 ? inputFormat.ReadSector(doneSectors + track.StartSector, out sector)
+                                : inputFormat.ReadSectors(doneSectors + track.StartSector, sectorsToDo, out sector);
+
+                    Assert.AreEqual(ErrorNumber.NoError, errno);
+
+                    result = sectorsToDo == 1 ? outputOptical.WriteSector(sector, doneSectors + track.StartSector)
+                                 : outputOptical.WriteSectors(sector, doneSectors + track.StartSector, sectorsToDo);
+                }
+
+                Assert.IsTrue(result,
+                              $"Error {outputOptical.ErrorMessage} writing sector {doneSectors + track.StartSector}, not continuing...");
+
+                doneSectors += sectorsToDo;
             }
+        }
 
-            var inputOptical  = inputFormat as IOpticalMediaImage;
-            var outputOptical = OutputFormat as IWritableOpticalImage;
+        Dictionary<byte, string> isrcs                     = new();
+        Dictionary<byte, byte>   trackFlags                = new();
+        string                   mcn                       = null;
+        HashSet<int>             subchannelExtents         = new();
+        Dictionary<byte, int>    smallestPregapLbaPerTrack = new();
+        Track[]                  tracks                    = new Track[inputOptical.Tracks.Count];
 
-            Assert.IsNotNull(inputOptical, "Could not treat existing image as optical disc.");
-            Assert.IsNotNull(outputOptical, "Could not treat new image as optical disc.");
-            Assert.IsNotNull(inputOptical.Tracks, "Existing image contains no tracks.");
-
-            Assert.IsTrue(outputOptical.Create(outputPath, inputFormat.Info.MediaType, ParsedOptions, inputFormat.Info.Sectors, inputFormat.Info.SectorSize),
-                          $"Error {outputOptical.ErrorMessage} creating output image.");
-
-            var metadata = new ImageInfo
+        for(int i = 0; i < tracks.Length; i++)
+        {
+            tracks[i] = new Track
             {
-                Application           = "Aaru",
-                ApplicationVersion    = Version.GetVersion(),
-                Comments              = inputFormat.Info.Comments,
-                Creator               = inputFormat.Info.Creator,
-                DriveFirmwareRevision = inputFormat.Info.DriveFirmwareRevision,
-                DriveManufacturer     = inputFormat.Info.DriveManufacturer,
-                DriveModel            = inputFormat.Info.DriveModel,
-                DriveSerialNumber     = inputFormat.Info.DriveSerialNumber,
-                LastMediaSequence     = inputFormat.Info.LastMediaSequence,
-                MediaBarcode          = inputFormat.Info.MediaBarcode,
-                MediaManufacturer     = inputFormat.Info.MediaManufacturer,
-                MediaModel            = inputFormat.Info.MediaModel,
-                MediaPartNumber       = inputFormat.Info.MediaPartNumber,
-                MediaSequence         = inputFormat.Info.MediaSequence,
-                MediaSerialNumber     = inputFormat.Info.MediaSerialNumber,
-                MediaTitle            = inputFormat.Info.MediaTitle
+                Indexes           = new Dictionary<ushort, int>(),
+                Description       = inputOptical.Tracks[i].Description,
+                EndSector         = inputOptical.Tracks[i].EndSector,
+                StartSector       = inputOptical.Tracks[i].StartSector,
+                Pregap            = inputOptical.Tracks[i].Pregap,
+                Sequence          = inputOptical.Tracks[i].Sequence,
+                Session           = inputOptical.Tracks[i].Session,
+                BytesPerSector    = inputOptical.Tracks[i].BytesPerSector,
+                RawBytesPerSector = inputOptical.Tracks[i].RawBytesPerSector,
+                Type              = inputOptical.Tracks[i].Type,
+                SubchannelType    = inputOptical.Tracks[i].SubchannelType
             };
 
-            Assert.IsTrue(outputOptical.SetMetadata(metadata),
-                          $"Error {outputOptical.ErrorMessage} setting metadata, ");
+            foreach(KeyValuePair<ushort, int> idx in inputOptical.Tracks[i].Indexes)
+                tracks[i].Indexes[idx.Key] = idx.Value;
+        }
 
-            CICMMetadataType       cicmMetadata = inputFormat.CicmMetadata;
-            List<DumpHardwareType> dumpHardware = inputFormat.DumpHardware;
-
-            foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags.Where(mediaTag =>
-                outputOptical.SupportedMediaTags.Contains(mediaTag)))
+        foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.Where(t => t == SectorTagType.CdTrackIsrc).
+                                                 OrderBy(t => t))
+        {
+            foreach(Track track in tracks)
             {
-                AaruConsole.WriteLine("Converting media tag {0}", mediaTag);
-                errno = inputFormat.ReadMediaTag(mediaTag, out byte[] tag);
+                errno = inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] isrc);
 
-                Assert.AreEqual(ErrorNumber.NoError, errno);
-                Assert.IsTrue(outputOptical.WriteMediaTag(tag, mediaTag));
+                if(errno != ErrorNumber.NoError)
+                    continue;
+
+                isrcs[(byte)track.Sequence] = Encoding.UTF8.GetString(isrc);
+            }
+        }
+
+        foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.
+                                                 Where(t => t == SectorTagType.CdTrackFlags).OrderBy(t => t))
+        {
+            foreach(Track track in tracks)
+            {
+                errno = inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] flags);
+
+                if(errno != ErrorNumber.NoError)
+                    continue;
+
+                trackFlags[(byte)track.Sequence] = flags[0];
+            }
+        }
+
+        for(ulong s = 0; s < inputFormat.Info.Sectors; s++)
+        {
+            if(s > int.MaxValue)
+                break;
+
+            subchannelExtents.Add((int)s);
+        }
+
+        foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.OrderBy(t => t).TakeWhile(tag => UseLong))
+        {
+            switch(tag)
+            {
+                case SectorTagType.AppleSectorTag:
+                case SectorTagType.CdSectorSync:
+                case SectorTagType.CdSectorHeader:
+                case SectorTagType.CdSectorSubHeader:
+                case SectorTagType.CdSectorEdc:
+                case SectorTagType.CdSectorEccP:
+                case SectorTagType.CdSectorEccQ:
+                case SectorTagType.CdSectorEcc:
+                    // This tags are inline in long sector
+                    continue;
             }
 
-            AaruConsole.WriteLine("{0} sectors to convert", inputFormat.Info.Sectors);
-            ulong doneSectors;
-
-            Assert.IsTrue(outputOptical.SetTracks(inputOptical.Tracks),
-                          $"Error {outputOptical.ErrorMessage} sending tracks list to output image.");
+            if(!outputOptical.SupportedSectorTags.Contains(tag))
+                continue;
 
             foreach(Track track in inputOptical.Tracks)
             {
                 doneSectors = 0;
-                ulong trackSectors = track.EndSector - track.StartSector + 1;
+                ulong  trackSectors = track.EndSector - track.StartSector + 1;
+                byte[] sector;
+                bool   result;
+
+                switch(tag)
+                {
+                    case SectorTagType.CdTrackFlags:
+                    case SectorTagType.CdTrackIsrc:
+                        errno = inputFormat.ReadSectorTag(track.Sequence, tag, out sector);
+
+                        Assert.AreEqual(ErrorNumber.NoError, errno,
+                                        $"Error {errno} reading tag, not continuing...");
+
+                        result = outputOptical.WriteSectorTag(sector, track.Sequence, tag);
+
+                        Assert.IsTrue(result, $"Error {outputOptical.ErrorMessage} writing tag, not continuing...");
+
+                        continue;
+                }
 
                 while(doneSectors < trackSectors)
                 {
-                    byte[] sector;
-
                     uint sectorsToDo;
 
                     if(trackSectors - doneSectors >= SECTORS_TO_READ)
@@ -137,262 +293,105 @@ namespace Aaru.Tests.Issues
                     else
                         sectorsToDo = (uint)(trackSectors - doneSectors);
 
-                    bool useNotLong = false;
-                    bool result     = false;
-
-                    if(UseLong)
+                    if(sectorsToDo == 1)
                     {
-                        errno = sectorsToDo == 1
-                                    ? inputFormat.ReadSectorLong(doneSectors + track.StartSector, out sector)
-                                    : inputFormat.ReadSectorsLong(doneSectors + track.StartSector, sectorsToDo,
-                                                                  out sector);
+                        errno = inputFormat.ReadSectorTag(doneSectors + track.StartSector, tag, out sector);
+
+                        Assert.AreEqual(ErrorNumber.NoError, errno,
+                                        $"Error {errno} reading tag, not continuing...");
+
+                        if(tag == SectorTagType.CdSectorSubchannel)
+                        {
+                            bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
+                                MmcSubchannel.Raw, sector, doneSectors + track.StartSector, 1, null, isrcs,
+                                (byte)track.Sequence, ref mcn, tracks, subchannelExtents, true, outputOptical,
+                                true, true, null, null, smallestPregapLbaPerTrack, false);
+
+                            if(indexesChanged)
+                                outputOptical.SetTracks(tracks.ToList());
 
-                        if(errno == ErrorNumber.NoError)
-                            result = sectorsToDo == 1
-                                         ? outputOptical.WriteSectorLong(sector, doneSectors + track.StartSector)
-                                         : outputOptical.WriteSectorsLong(sector, doneSectors + track.StartSector,
-                                                                          sectorsToDo);
-                        else
                             result = true;
-
-                        if(!result &&
-                           sector.Length % 2352 != 0)
-                            useNotLong = true;
+                        }
+                        else
+                            result = outputOptical.WriteSectorTag(sector, doneSectors + track.StartSector, tag);
                     }
-
-                    if(!UseLong || useNotLong)
+                    else
                     {
-                        errno = sectorsToDo == 1 ? inputFormat.ReadSector(doneSectors + track.StartSector, out sector)
-                                    : inputFormat.ReadSectors(doneSectors + track.StartSector, sectorsToDo, out sector);
+                        errno = inputFormat.ReadSectorsTag(doneSectors + track.StartSector, sectorsToDo, tag,
+                                                           out sector);
 
-                        Assert.AreEqual(ErrorNumber.NoError, errno);
+                        Assert.AreEqual(ErrorNumber.NoError, errno,
+                                        $"Error {errno} reading tag, not continuing...");
 
-                        result = sectorsToDo == 1 ? outputOptical.WriteSector(sector, doneSectors + track.StartSector)
-                                     : outputOptical.WriteSectors(sector, doneSectors + track.StartSector, sectorsToDo);
+                        if(tag == SectorTagType.CdSectorSubchannel)
+                        {
+                            bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
+                                MmcSubchannel.Raw, sector, doneSectors + track.StartSector, sectorsToDo, null,
+                                isrcs, (byte)track.Sequence, ref mcn, tracks, subchannelExtents, true,
+                                outputOptical, true, true, null, null, smallestPregapLbaPerTrack, false);
+
+                            if(indexesChanged)
+                                outputOptical.SetTracks(tracks.ToList());
+
+                            result = true;
+                        }
+                        else
+                            result = outputOptical.WriteSectorsTag(sector, doneSectors + track.StartSector,
+                                                                   sectorsToDo, tag);
                     }
 
                     Assert.IsTrue(result,
-                                  $"Error {outputOptical.ErrorMessage} writing sector {doneSectors + track.StartSector}, not continuing...");
+                                  $"Error {outputOptical.ErrorMessage} writing tag for sector {doneSectors + track.StartSector}, not continuing...");
 
                     doneSectors += sectorsToDo;
                 }
             }
-
-            Dictionary<byte, string> isrcs                     = new();
-            Dictionary<byte, byte>   trackFlags                = new();
-            string                   mcn                       = null;
-            HashSet<int>             subchannelExtents         = new();
-            Dictionary<byte, int>    smallestPregapLbaPerTrack = new();
-            Track[]                  tracks                    = new Track[inputOptical.Tracks.Count];
-
-            for(int i = 0; i < tracks.Length; i++)
-            {
-                tracks[i] = new Track
-                {
-                    Indexes           = new Dictionary<ushort, int>(),
-                    Description       = inputOptical.Tracks[i].Description,
-                    EndSector         = inputOptical.Tracks[i].EndSector,
-                    StartSector       = inputOptical.Tracks[i].StartSector,
-                    Pregap            = inputOptical.Tracks[i].Pregap,
-                    Sequence          = inputOptical.Tracks[i].Sequence,
-                    Session           = inputOptical.Tracks[i].Session,
-                    BytesPerSector    = inputOptical.Tracks[i].BytesPerSector,
-                    RawBytesPerSector = inputOptical.Tracks[i].RawBytesPerSector,
-                    Type              = inputOptical.Tracks[i].Type,
-                    SubchannelType    = inputOptical.Tracks[i].SubchannelType
-                };
-
-                foreach(KeyValuePair<ushort, int> idx in inputOptical.Tracks[i].Indexes)
-                    tracks[i].Indexes[idx.Key] = idx.Value;
-            }
-
-            foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.Where(t => t == SectorTagType.CdTrackIsrc).
-                                                     OrderBy(t => t))
-            {
-                foreach(Track track in tracks)
-                {
-                    errno = inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] isrc);
-
-                    if(errno != ErrorNumber.NoError)
-                        continue;
-
-                    isrcs[(byte)track.Sequence] = Encoding.UTF8.GetString(isrc);
-                }
-            }
-
-            foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.
-                                                     Where(t => t == SectorTagType.CdTrackFlags).OrderBy(t => t))
-            {
-                foreach(Track track in tracks)
-                {
-                    errno = inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] flags);
-
-                    if(errno != ErrorNumber.NoError)
-                        continue;
-
-                    trackFlags[(byte)track.Sequence] = flags[0];
-                }
-            }
-
-            for(ulong s = 0; s < inputFormat.Info.Sectors; s++)
-            {
-                if(s > int.MaxValue)
-                    break;
-
-                subchannelExtents.Add((int)s);
-            }
-
-            foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.OrderBy(t => t).TakeWhile(tag => UseLong))
-            {
-                switch(tag)
-                {
-                    case SectorTagType.AppleSectorTag:
-                    case SectorTagType.CdSectorSync:
-                    case SectorTagType.CdSectorHeader:
-                    case SectorTagType.CdSectorSubHeader:
-                    case SectorTagType.CdSectorEdc:
-                    case SectorTagType.CdSectorEccP:
-                    case SectorTagType.CdSectorEccQ:
-                    case SectorTagType.CdSectorEcc:
-                        // This tags are inline in long sector
-                        continue;
-                }
-
-                if(!outputOptical.SupportedSectorTags.Contains(tag))
-                    continue;
-
-                foreach(Track track in inputOptical.Tracks)
-                {
-                    doneSectors = 0;
-                    ulong  trackSectors = track.EndSector - track.StartSector + 1;
-                    byte[] sector;
-                    bool   result;
-
-                    switch(tag)
-                    {
-                        case SectorTagType.CdTrackFlags:
-                        case SectorTagType.CdTrackIsrc:
-                            errno = inputFormat.ReadSectorTag(track.Sequence, tag, out sector);
-
-                            Assert.AreEqual(ErrorNumber.NoError, errno,
-                                            $"Error {errno} reading tag, not continuing...");
-
-                            result = outputOptical.WriteSectorTag(sector, track.Sequence, tag);
-
-                            Assert.IsTrue(result, $"Error {outputOptical.ErrorMessage} writing tag, not continuing...");
-
-                            continue;
-                    }
-
-                    while(doneSectors < trackSectors)
-                    {
-                        uint sectorsToDo;
-
-                        if(trackSectors - doneSectors >= SECTORS_TO_READ)
-                            sectorsToDo = SECTORS_TO_READ;
-                        else
-                            sectorsToDo = (uint)(trackSectors - doneSectors);
-
-                        if(sectorsToDo == 1)
-                        {
-                            errno = inputFormat.ReadSectorTag(doneSectors + track.StartSector, tag, out sector);
-
-                            Assert.AreEqual(ErrorNumber.NoError, errno,
-                                            $"Error {errno} reading tag, not continuing...");
-
-                            if(tag == SectorTagType.CdSectorSubchannel)
-                            {
-                                bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
-                                    MmcSubchannel.Raw, sector, doneSectors + track.StartSector, 1, null, isrcs,
-                                    (byte)track.Sequence, ref mcn, tracks, subchannelExtents, true, outputOptical,
-                                    true, true, null, null, smallestPregapLbaPerTrack, false);
-
-                                if(indexesChanged)
-                                    outputOptical.SetTracks(tracks.ToList());
-
-                                result = true;
-                            }
-                            else
-                                result = outputOptical.WriteSectorTag(sector, doneSectors + track.StartSector, tag);
-                        }
-                        else
-                        {
-                            errno = inputFormat.ReadSectorsTag(doneSectors + track.StartSector, sectorsToDo, tag,
-                                                               out sector);
-
-                            Assert.AreEqual(ErrorNumber.NoError, errno,
-                                            $"Error {errno} reading tag, not continuing...");
-
-                            if(tag == SectorTagType.CdSectorSubchannel)
-                            {
-                                bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
-                                    MmcSubchannel.Raw, sector, doneSectors + track.StartSector, sectorsToDo, null,
-                                    isrcs, (byte)track.Sequence, ref mcn, tracks, subchannelExtents, true,
-                                    outputOptical, true, true, null, null, smallestPregapLbaPerTrack, false);
-
-                                if(indexesChanged)
-                                    outputOptical.SetTracks(tracks.ToList());
-
-                                result = true;
-                            }
-                            else
-                                result = outputOptical.WriteSectorsTag(sector, doneSectors + track.StartSector,
-                                                                       sectorsToDo, tag);
-                        }
-
-                        Assert.IsTrue(result,
-                                      $"Error {outputOptical.ErrorMessage} writing tag for sector {doneSectors + track.StartSector}, not continuing...");
-
-                        doneSectors += sectorsToDo;
-                    }
-                }
-            }
-
-            if(isrcs.Count > 0)
-                foreach(KeyValuePair<byte, string> isrc in isrcs)
-                    outputOptical.WriteSectorTag(Encoding.UTF8.GetBytes(isrc.Value), isrc.Key,
-                                                 SectorTagType.CdTrackIsrc);
-
-            if(trackFlags.Count > 0)
-                foreach((byte track, byte flags) in trackFlags)
-                    outputOptical.WriteSectorTag(new[]
-                    {
-                        flags
-                    }, track, SectorTagType.CdTrackFlags);
-
-            if(mcn != null)
-                outputOptical.WriteMediaTag(Encoding.UTF8.GetBytes(mcn), MediaTagType.CD_MCN);
-
-            if(resume       != null ||
-               dumpHardware != null)
-            {
-                if(resume != null)
-                    outputOptical.SetDumpHardware(resume.Tries);
-                else if(dumpHardware != null)
-                    outputOptical.SetDumpHardware(dumpHardware);
-            }
-
-            if(sidecar      != null ||
-               cicmMetadata != null)
-            {
-                if(sidecar != null)
-                    outputOptical.SetCicmMetadata(sidecar);
-                else if(cicmMetadata != null)
-                    outputOptical.SetCicmMetadata(cicmMetadata);
-            }
-
-            Assert.True(outputOptical.Close(),
-                        $"Error {outputOptical.ErrorMessage} closing output image... Contents are not correct.");
-
-            // Some images will never generate the same
-            if(Md5 != null)
-            {
-                string md5 = Md5Context.File(outputPath, out _);
-
-                Assert.AreEqual(Md5, md5, "Hashes are different");
-            }
-
-            File.Delete(outputPath);
         }
+
+        if(isrcs.Count > 0)
+            foreach(KeyValuePair<byte, string> isrc in isrcs)
+                outputOptical.WriteSectorTag(Encoding.UTF8.GetBytes(isrc.Value), isrc.Key,
+                                             SectorTagType.CdTrackIsrc);
+
+        if(trackFlags.Count > 0)
+            foreach((byte track, byte flags) in trackFlags)
+                outputOptical.WriteSectorTag(new[]
+                {
+                    flags
+                }, track, SectorTagType.CdTrackFlags);
+
+        if(mcn != null)
+            outputOptical.WriteMediaTag(Encoding.UTF8.GetBytes(mcn), MediaTagType.CD_MCN);
+
+        if(resume       != null ||
+           dumpHardware != null)
+        {
+            if(resume != null)
+                outputOptical.SetDumpHardware(resume.Tries);
+            else if(dumpHardware != null)
+                outputOptical.SetDumpHardware(dumpHardware);
+        }
+
+        if(sidecar      != null ||
+           cicmMetadata != null)
+        {
+            if(sidecar != null)
+                outputOptical.SetCicmMetadata(sidecar);
+            else if(cicmMetadata != null)
+                outputOptical.SetCicmMetadata(cicmMetadata);
+        }
+
+        Assert.True(outputOptical.Close(),
+                    $"Error {outputOptical.ErrorMessage} closing output image... Contents are not correct.");
+
+        // Some images will never generate the same
+        if(Md5 != null)
+        {
+            string md5 = Md5Context.File(outputPath, out _);
+
+            Assert.AreEqual(Md5, md5, "Hashes are different");
+        }
+
+        File.Delete(outputPath);
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Issues/OpticalImageReadIssueTest.cs b/Aaru.Tests/Issues/OpticalImageReadIssueTest.cs
index 03502f75a..bf59e7abe 100644
--- a/Aaru.Tests/Issues/OpticalImageReadIssueTest.cs
+++ b/Aaru.Tests/Issues/OpticalImageReadIssueTest.cs
@@ -9,75 +9,74 @@ using Aaru.CommonTypes.Structs;
 using Aaru.Core;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Issues
+namespace Aaru.Tests.Issues;
+
+/// <summary>This class will test an issue that happens when reading an image completely, from start to end, crashes.</summary>
+public abstract class OpticalImageReadIssueTest
 {
-    /// <summary>This class will test an issue that happens when reading an image completely, from start to end, crashes.</summary>
-    public abstract class OpticalImageReadIssueTest
+    const           uint   SECTORS_TO_READ = 256;
+    public abstract string DataFolder { get; }
+    public abstract string TestFile   { get; }
+
+    [Test]
+    public void Test()
     {
-        const           uint   SECTORS_TO_READ = 256;
-        public abstract string DataFolder { get; }
-        public abstract string TestFile   { get; }
+        Environment.CurrentDirectory = DataFolder;
 
-        [Test]
-        public void Test()
+        bool exists = File.Exists(TestFile);
+        Assert.True(exists, "Test file not found");
+
+        var     filtersList = new FiltersList();
+        IFilter inputFilter = filtersList.GetFilter(TestFile);
+
+        Assert.IsNotNull(inputFilter, "Filter for test file is not detected");
+
+        IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
+
+        Assert.IsNotNull(image, "Image format for test file is not detected");
+
+        Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), "Cannot open image for test file");
+
+        var opticalInput = image as IOpticalMediaImage;
+
+        Assert.IsNotNull(opticalInput, "Image format for test file is not for an optical disc");
+
+        var ctx = new Crc32Context();
+
+        Checksum trackChecksum = null;
+
+        ulong previousTrackEnd = 0;
+
+        List<Track> inputTracks = opticalInput.Tracks;
+        ErrorNumber errno;
+
+        foreach(Track currentTrack in inputTracks)
         {
-            Environment.CurrentDirectory = DataFolder;
+            ulong sectors     = currentTrack.EndSector - currentTrack.StartSector + 1;
+            ulong doneSectors = 0;
 
-            bool exists = File.Exists(TestFile);
-            Assert.True(exists, "Test file not found");
-
-            var     filtersList = new FiltersList();
-            IFilter inputFilter = filtersList.GetFilter(TestFile);
-
-            Assert.IsNotNull(inputFilter, "Filter for test file is not detected");
-
-            IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
-
-            Assert.IsNotNull(image, "Image format for test file is not detected");
-
-            Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), "Cannot open image for test file");
-
-            var opticalInput = image as IOpticalMediaImage;
-
-            Assert.IsNotNull(opticalInput, "Image format for test file is not for an optical disc");
-
-            var ctx = new Crc32Context();
-
-            Checksum trackChecksum = null;
-
-            ulong previousTrackEnd = 0;
-
-            List<Track> inputTracks = opticalInput.Tracks;
-            ErrorNumber errno;
-
-            foreach(Track currentTrack in inputTracks)
+            while(doneSectors < sectors)
             {
-                ulong sectors     = currentTrack.EndSector - currentTrack.StartSector + 1;
-                ulong doneSectors = 0;
+                byte[] sector;
 
-                while(doneSectors < sectors)
+                if(sectors - doneSectors >= SECTORS_TO_READ)
                 {
-                    byte[] sector;
+                    errno = opticalInput.ReadSectors(doneSectors, SECTORS_TO_READ, currentTrack.Sequence,
+                                                     out sector);
 
-                    if(sectors - doneSectors >= SECTORS_TO_READ)
-                    {
-                        errno = opticalInput.ReadSectors(doneSectors, SECTORS_TO_READ, currentTrack.Sequence,
-                                                         out sector);
-
-                        doneSectors += SECTORS_TO_READ;
-                    }
-                    else
-                    {
-                        errno = opticalInput.ReadSectors(doneSectors, (uint)(sectors - doneSectors),
-                                                         currentTrack.Sequence, out sector);
-
-                        doneSectors += sectors - doneSectors;
-                    }
-
-                    Assert.AreEqual(ErrorNumber.NoError, errno);
-
-                    ctx.Update(sector);
+                    doneSectors += SECTORS_TO_READ;
                 }
+                else
+                {
+                    errno = opticalInput.ReadSectors(doneSectors, (uint)(sectors - doneSectors),
+                                                     currentTrack.Sequence, out sector);
+
+                    doneSectors += sectors - doneSectors;
+                }
+
+                Assert.AreEqual(ErrorNumber.NoError, errno);
+
+                ctx.Update(sector);
             }
         }
     }
diff --git a/Aaru.Tests/Partitions/Acorn.cs b/Aaru.Tests/Partitions/Acorn.cs
index c3d4ebba5..a63759daf 100644
--- a/Aaru.Tests/Partitions/Acorn.cs
+++ b/Aaru.Tests/Partitions/Acorn.cs
@@ -30,58 +30,57 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    [TestFixture]
-    public class Acorn : PartitionSchemeTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Acorn");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+[TestFixture]
+public class Acorn : PartitionSchemeTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Acorn");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "linux_ics.aif",
+            Partitions = new[]
             {
-                TestFile = "linux_ics.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 61440,
-                        Offset   = 512,
-                        Sequence = 0,
-                        Size     = 31457280,
-                        Start    = 1,
-                        Type     = "GEM"
-                    },
-                    new Partition
-                    {
-                        Length   = 81920,
-                        Offset   = 31457792,
-                        Sequence = 1,
-                        Size     = 41943040,
-                        Start    = 61441,
-                        Type     = "BGM"
-                    },
-                    new Partition
-                    {
-                        Length   = 110161,
-                        Offset   = 73400832,
-                        Sequence = 2,
-                        Size     = 56402432,
-                        Start    = 143361,
-                        Type     = "LNX"
-                    },
-                    new Partition
-                    {
-                        Length   = 84400,
-                        Offset   = 129803264,
-                        Sequence = 3,
-                        Size     = 43212800,
-                        Start    = 253522,
-                        Type     = "MAC"
-                    }
+                    Length   = 61440,
+                    Offset   = 512,
+                    Sequence = 0,
+                    Size     = 31457280,
+                    Start    = 1,
+                    Type     = "GEM"
+                },
+                new Partition
+                {
+                    Length   = 81920,
+                    Offset   = 31457792,
+                    Sequence = 1,
+                    Size     = 41943040,
+                    Start    = 61441,
+                    Type     = "BGM"
+                },
+                new Partition
+                {
+                    Length   = 110161,
+                    Offset   = 73400832,
+                    Sequence = 2,
+                    Size     = 56402432,
+                    Start    = 143361,
+                    Type     = "LNX"
+                },
+                new Partition
+                {
+                    Length   = 84400,
+                    Offset   = 129803264,
+                    Sequence = 3,
+                    Size     = 43212800,
+                    Start    = 253522,
+                    Type     = "MAC"
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/AppleMap.cs b/Aaru.Tests/Partitions/AppleMap.cs
index c34e49a64..d1d6c03d9 100644
--- a/Aaru.Tests/Partitions/AppleMap.cs
+++ b/Aaru.Tests/Partitions/AppleMap.cs
@@ -30,1840 +30,1839 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
+namespace Aaru.Tests.Partitions;
+
+[TestFixture]
+public class AppleMap : PartitionSchemeTest
 {
-    [TestFixture]
-    public class AppleMap : PartitionSchemeTest
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Apple Partition Map");
+    public override PartitionTest[] Tests => new[]
     {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Apple Partition Map");
-        public override PartitionTest[] Tests => new[]
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "d2_driver.aif",
+            Partitions = new[]
             {
-                TestFile = "d2_driver.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 2,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 1024,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 83,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 42496,
-                        Start    = 64,
-                        Type     = "Apple_Driver43"
-                    },
-                    new Partition
-                    {
-                        Length   = 109,
-                        Name     = "Empty",
-                        Offset   = 75264,
-                        Sequence = 2,
-                        Size     = 55808,
-                        Start    = 147,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 50944,
-                        Name     = "Volume label",
-                        Offset   = 131072,
-                        Sequence = 3,
-                        Size     = 26083328,
-                        Start    = 256,
-                        Type     = "Apple_HFS"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "hdt_1.8_encrypted1.aif",
-                Partitions = new[]
+                    Length   = 2,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 1024,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 14,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 7168,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 1024,
-                        Name     = "FWB Disk Driver",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 524288,
-                        Start    = 64,
-                        Type     = "Apple_Driver43"
-                    },
-                    new Partition
-                    {
-                        Length   = 50112,
-                        Name     = "MacOS",
-                        Offset   = 557056,
-                        Sequence = 2,
-                        Size     = 25657344,
-                        Start    = 1088,
-                        Type     = "Apple_HFS"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "hdt_1.8_encrypted2.aif",
-                Partitions = new[]
+                    Length   = 83,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 42496,
+                    Start    = 64,
+                    Type     = "Apple_Driver43"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 14,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 7168,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 1024,
-                        Name     = "FWB Disk Driver",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 524288,
-                        Start    = 64,
-                        Type     = "Apple_Driver43"
-                    },
-                    new Partition
-                    {
-                        Length   = 50112,
-                        Name     = "MacOS",
-                        Offset   = 557056,
-                        Sequence = 2,
-                        Size     = 25657344,
-                        Start    = 1088,
-                        Type     = "Apple_HFS"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "hdt_1.8_password.aif",
-                Partitions = new[]
+                    Length   = 109,
+                    Name     = "Empty",
+                    Offset   = 75264,
+                    Sequence = 2,
+                    Size     = 55808,
+                    Start    = 147,
+                    Type     = "Apple_Free"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 14,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 7168,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 1024,
-                        Name     = "FWB Disk Driver",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 524288,
-                        Start    = 64,
-                        Type     = "Apple_Driver43"
-                    },
-                    new Partition
-                    {
-                        Length   = 50112,
-                        Name     = "MacOS",
-                        Offset   = 557056,
-                        Sequence = 2,
-                        Size     = 25657344,
-                        Start    = 1088,
-                        Type     = "Apple_HFS"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "hdt_1.8.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 14,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 7168,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 1024,
-                        Name     = "FWB Disk Driver",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 524288,
-                        Start    = 64,
-                        Type     = "Apple_Driver43"
-                    },
-                    new Partition
-                    {
-                        Length   = 50112,
-                        Name     = "MacOS",
-                        Offset   = 557056,
-                        Sequence = 2,
-                        Size     = 25657344,
-                        Start    = 1088,
-                        Type     = "Apple_HFS"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "linux.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 1,
-                        Name     = "Extra",
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 512,
-                        Start    = 64,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 1600,
-                        Name     = "bootstrap",
-                        Offset   = 33280,
-                        Sequence = 1,
-                        Size     = 819200,
-                        Start    = 65,
-                        Type     = "Apple_Bootstrap"
-                    },
-                    new Partition
-                    {
-                        Length   = 1,
-                        Name     = "Extra",
-                        Offset   = 852480,
-                        Sequence = 2,
-                        Size     = 512,
-                        Start    = 1665,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Name     = "Linux",
-                        Offset   = 852992,
-                        Sequence = 3,
-                        Size     = 52428800,
-                        Start    = 1666,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 40960,
-                        Name     = "ProDOS",
-                        Offset   = 53281792,
-                        Sequence = 4,
-                        Size     = 20971520,
-                        Start    = 104066,
-                        Type     = "Apple_PRODOS"
-                    },
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Name     = "Macintosh",
-                        Offset   = 74253312,
-                        Sequence = 5,
-                        Size     = 52428800,
-                        Start    = 145026,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 14718,
-                        Name     = "Extra",
-                        Offset   = 126682112,
-                        Sequence = 6,
-                        Size     = 7535616,
-                        Start    = 247426,
-                        Type     = "Apple_Free"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_1.1.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 10,
-                        Offset   = 2048,
-                        Sequence = 0,
-                        Size     = 5120,
-                        Start    = 4,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 41804,
-                        Name     = "Macintosh",
-                        Offset   = 8192,
-                        Sequence = 1,
-                        Size     = 21403648,
-                        Start    = 16,
-                        Type     = "Apple_HFS"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_2.0.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 10,
-                        Offset   = 2048,
-                        Sequence = 0,
-                        Size     = 5120,
-                        Start    = 4,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 38965,
-                        Name     = "Macintosh",
-                        Offset   = 8192,
-                        Sequence = 1,
-                        Size     = 19950080,
-                        Start    = 16,
-                        Type     = "Apple_HFS"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_4.2.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 11,
-                        Offset   = 2048,
-                        Sequence = 0,
-                        Size     = 5632,
-                        Start    = 4,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 38965,
-                        Name     = "Macintosh",
-                        Offset   = 8192,
-                        Sequence = 1,
-                        Size     = 19950080,
-                        Start    = 16,
-                        Type     = "Apple_HFS"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_4.3.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 11,
-                        Offset   = 2048,
-                        Sequence = 0,
-                        Size     = 5632,
-                        Start    = 4,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 38965,
-                        Name     = "Macintosh",
-                        Offset   = 8192,
-                        Sequence = 1,
-                        Size     = 19950080,
-                        Start    = 16,
-                        Type     = "Apple_HFS"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_6.0.2.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 10,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 5120,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 6256,
-                        Name     = "MacOS",
-                        Offset   = 49152,
-                        Sequence = 2,
-                        Size     = 3203072,
-                        Start    = 96,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 1024,
-                        Name     = "Scratch",
-                        Offset   = 3252224,
-                        Sequence = 3,
-                        Size     = 524288,
-                        Start    = 6352,
-                        Type     = "Apple_Scratch"
-                    },
-                    new Partition
-                    {
-                        Length   = 2048,
-                        Name     = "Eschatology 1",
-                        Offset   = 3776512,
-                        Sequence = 4,
-                        Size     = 1048576,
-                        Start    = 7376,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4280,
-                        Name     = "A/UX Root",
-                        Offset   = 4825088,
-                        Sequence = 5,
-                        Size     = 2191360,
-                        Start    = 9424,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2377,
-                        Name     = "Swap",
-                        Offset   = 7016448,
-                        Sequence = 6,
-                        Size     = 1217024,
-                        Start    = 13704,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 3072,
-                        Name     = "Eschatology 2",
-                        Offset   = 8233472,
-                        Sequence = 7,
-                        Size     = 1572864,
-                        Start    = 16081,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2560,
-                        Name     = "Root file system",
-                        Offset   = 9806336,
-                        Sequence = 8,
-                        Size     = 1310720,
-                        Start    = 19153,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4981,
-                        Name     = "Usr file system",
-                        Offset   = 11117056,
-                        Sequence = 9,
-                        Size     = 2550272,
-                        Start    = 21713,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4000,
-                        Name     = "Random A/UX fs",
-                        Offset   = 13667328,
-                        Sequence = 10,
-                        Size     = 2048000,
-                        Start    = 26694,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2532,
-                        Name     = "Random A/UX fs",
-                        Offset   = 15715328,
-                        Sequence = 11,
-                        Size     = 1296384,
-                        Start    = 30694,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2666,
-                        Name     = "Usr file system",
-                        Offset   = 17011712,
-                        Sequence = 12,
-                        Size     = 1364992,
-                        Start    = 33226,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 7786,
-                        Name     = "Usr file system",
-                        Offset   = 18376704,
-                        Sequence = 13,
-                        Size     = 3986432,
-                        Start    = 35892,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 11162,
-                        Name     = "Extra",
-                        Offset   = 22363136,
-                        Sequence = 14,
-                        Size     = 5714944,
-                        Start    = 43678,
-                        Type     = "Apple_Free"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_6.0.3.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 10,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 5120,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 11619,
-                        Name     = "MacOS",
-                        Offset   = 49152,
-                        Sequence = 2,
-                        Size     = 5948928,
-                        Start    = 96,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 2011,
-                        Name     = "Scratch",
-                        Offset   = 5998080,
-                        Sequence = 3,
-                        Size     = 1029632,
-                        Start    = 11715,
-                        Type     = "Apple_Scratch"
-                    },
-                    new Partition
-                    {
-                        Length   = 4796,
-                        Name     = "Eschatology 1",
-                        Offset   = 7027712,
-                        Sequence = 4,
-                        Size     = 2455552,
-                        Start    = 13726,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 7680,
-                        Name     = "A/UX Root",
-                        Offset   = 9483264,
-                        Sequence = 5,
-                        Size     = 3932160,
-                        Start    = 18522,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 8192,
-                        Name     = "Swap",
-                        Offset   = 13415424,
-                        Sequence = 6,
-                        Size     = 4194304,
-                        Start    = 26202,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 1148,
-                        Name     = "Eschatology 2",
-                        Offset   = 17609728,
-                        Sequence = 7,
-                        Size     = 587776,
-                        Start    = 34394,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 12768,
-                        Name     = "Root file system",
-                        Offset   = 18197504,
-                        Sequence = 8,
-                        Size     = 6537216,
-                        Start    = 35542,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 3450,
-                        Name     = "Usr file system",
-                        Offset   = 24734720,
-                        Sequence = 9,
-                        Size     = 1766400,
-                        Start    = 48310,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 36,
-                        Name     = "Extra",
-                        Offset   = 26501120,
-                        Sequence = 10,
-                        Size     = 18432,
-                        Start    = 51760,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 3044,
-                        Name     = "Random A/UX fs",
-                        Offset   = 26519552,
-                        Sequence = 11,
-                        Size     = 1558528,
-                        Start    = 51796,
-                        Type     = "Apple_UNIX_SVR2"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_6.0.4.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 10,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 5120,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 7680,
-                        Name     = "MacOS",
-                        Offset   = 49152,
-                        Sequence = 2,
-                        Size     = 3932160,
-                        Start    = 96,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 6245,
-                        Name     = "Scratch",
-                        Offset   = 3981312,
-                        Sequence = 3,
-                        Size     = 3197440,
-                        Start    = 7776,
-                        Type     = "Apple_Scratch"
-                    },
-                    new Partition
-                    {
-                        Length   = 6245,
-                        Name     = "Eschatology 1",
-                        Offset   = 7178752,
-                        Sequence = 4,
-                        Size     = 3197440,
-                        Start    = 14021,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 5130,
-                        Name     = "A/UX Root",
-                        Offset   = 10376192,
-                        Sequence = 5,
-                        Size     = 2626560,
-                        Start    = 20266,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2676,
-                        Name     = "Swap",
-                        Offset   = 13002752,
-                        Sequence = 6,
-                        Size     = 1370112,
-                        Start    = 25396,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 5751,
-                        Name     = "Eschatology 2",
-                        Offset   = 14372864,
-                        Sequence = 7,
-                        Size     = 2944512,
-                        Start    = 28072,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 5423,
-                        Name     = "Root file system",
-                        Offset   = 17317376,
-                        Sequence = 8,
-                        Size     = 2776576,
-                        Start    = 33823,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 5650,
-                        Name     = "Usr file system",
-                        Offset   = 20093952,
-                        Sequence = 9,
-                        Size     = 2892800,
-                        Start    = 39246,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 6706,
-                        Name     = "Random A/UX fs",
-                        Offset   = 22986752,
-                        Sequence = 10,
-                        Size     = 3433472,
-                        Start    = 44896,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 3238,
-                        Name     = "Extra",
-                        Offset   = 26420224,
-                        Sequence = 11,
-                        Size     = 1657856,
-                        Start    = 51602,
-                        Type     = "Apple_Free"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_6.0.5.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 10,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 5120,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 4096,
-                        Name     = "MacOS",
-                        Offset   = 49152,
-                        Sequence = 2,
-                        Size     = 2097152,
-                        Start    = 96,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 669,
-                        Name     = "Scratch",
-                        Offset   = 2146304,
-                        Sequence = 3,
-                        Size     = 342528,
-                        Start    = 4192,
-                        Type     = "Apple_Scratch"
-                    },
-                    new Partition
-                    {
-                        Length   = 2768,
-                        Name     = "Eschatology 1",
-                        Offset   = 2488832,
-                        Sequence = 4,
-                        Size     = 1417216,
-                        Start    = 4861,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 3576,
-                        Name     = "A/UX Root",
-                        Offset   = 3906048,
-                        Sequence = 5,
-                        Size     = 1830912,
-                        Start    = 7629,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2830,
-                        Name     = "Swap",
-                        Offset   = 5736960,
-                        Sequence = 6,
-                        Size     = 1448960,
-                        Start    = 11205,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 5249,
-                        Name     = "Root file system",
-                        Offset   = 7185920,
-                        Sequence = 7,
-                        Size     = 2687488,
-                        Start    = 14035,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 5011,
-                        Name     = "Usr file system",
-                        Offset   = 9873408,
-                        Sequence = 8,
-                        Size     = 2565632,
-                        Start    = 19284,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 3818,
-                        Name     = "Unreserved 1",
-                        Offset   = 12439040,
-                        Sequence = 9,
-                        Size     = 1954816,
-                        Start    = 24295,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 6920,
-                        Name     = "Unreserved 2",
-                        Offset   = 14393856,
-                        Sequence = 10,
-                        Size     = 3543040,
-                        Start    = 28113,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 5011,
-                        Name     = "Unreserved 3",
-                        Offset   = 17936896,
-                        Sequence = 11,
-                        Size     = 2565632,
-                        Start    = 35033,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 5727,
-                        Name     = "Unreserved 4",
-                        Offset   = 20502528,
-                        Sequence = 12,
-                        Size     = 2932224,
-                        Start    = 40044,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2386,
-                        Name     = "Random A/UX fs",
-                        Offset   = 23434752,
-                        Sequence = 13,
-                        Size     = 1221632,
-                        Start    = 45771,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 6683,
-                        Name     = "Extra",
-                        Offset   = 24656384,
-                        Sequence = 14,
-                        Size     = 3421696,
-                        Start    = 48157,
-                        Type     = "Apple_Free"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_6.0.7.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 10,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 5120,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 27371,
-                        Name     = "MacOS",
-                        Offset   = 49152,
-                        Sequence = 2,
-                        Size     = 14013952,
-                        Start    = 96,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 2916,
-                        Name     = "Eschatology 1",
-                        Offset   = 14063104,
-                        Sequence = 3,
-                        Size     = 1492992,
-                        Start    = 27467,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 1795,
-                        Name     = "A/UX Root",
-                        Offset   = 15556096,
-                        Sequence = 4,
-                        Size     = 919040,
-                        Start    = 30383,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2543,
-                        Name     = "Swap",
-                        Offset   = 16475136,
-                        Sequence = 5,
-                        Size     = 1302016,
-                        Start    = 32178,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 3509,
-                        Name     = "Root file system",
-                        Offset   = 17777152,
-                        Sequence = 6,
-                        Size     = 1796608,
-                        Start    = 34721,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 3796,
-                        Name     = "Usr file system",
-                        Offset   = 19573760,
-                        Sequence = 7,
-                        Size     = 1943552,
-                        Start    = 38230,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4271,
-                        Name     = "Random A/UX fs",
-                        Offset   = 21517312,
-                        Sequence = 8,
-                        Size     = 2186752,
-                        Start    = 42026,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 1024,
-                        Name     = "Unreserved 1",
-                        Offset   = 23704064,
-                        Sequence = 9,
-                        Size     = 524288,
-                        Start    = 46297,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 1280,
-                        Name     = "Unreserved 2",
-                        Offset   = 24228352,
-                        Sequence = 10,
-                        Size     = 655360,
-                        Start    = 47321,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 1559,
-                        Name     = "Unreserved 3",
-                        Offset   = 24883712,
-                        Sequence = 11,
-                        Size     = 798208,
-                        Start    = 48601,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 280,
-                        Name     = "Extra",
-                        Offset   = 25681920,
-                        Sequence = 12,
-                        Size     = 143360,
-                        Start    = 50160,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 4400,
-                        Name     = "Unreserved 4",
-                        Offset   = 25825280,
-                        Sequence = 13,
-                        Size     = 2252800,
-                        Start    = 50440,
-                        Type     = "Apple_UNIX_SVR2"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_6.0.8.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 10,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 5120,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 8937,
-                        Name     = "MacOS",
-                        Offset   = 49152,
-                        Sequence = 2,
-                        Size     = 4575744,
-                        Start    = 96,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 2234,
-                        Name     = "Scratch",
-                        Offset   = 4624896,
-                        Sequence = 3,
-                        Size     = 1143808,
-                        Start    = 9033,
-                        Type     = "Apple_Scratch"
-                    },
-                    new Partition
-                    {
-                        Length   = 5900,
-                        Name     = "Eschatology 1",
-                        Offset   = 5768704,
-                        Sequence = 4,
-                        Size     = 3020800,
-                        Start    = 11267,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 3156,
-                        Name     = "Unreserved 1",
-                        Offset   = 8789504,
-                        Sequence = 5,
-                        Size     = 1615872,
-                        Start    = 17167,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2705,
-                        Name     = "Unreserved 3",
-                        Offset   = 10405376,
-                        Sequence = 6,
-                        Size     = 1384960,
-                        Start    = 20323,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 1861,
-                        Name     = "Unreserved 4",
-                        Offset   = 11790336,
-                        Sequence = 7,
-                        Size     = 952832,
-                        Start    = 23028,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2434,
-                        Name     = "Extra",
-                        Offset   = 12743168,
-                        Sequence = 8,
-                        Size     = 1246208,
-                        Start    = 24889,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 2920,
-                        Name     = "Random A/UX fs",
-                        Offset   = 13989376,
-                        Sequence = 9,
-                        Size     = 1495040,
-                        Start    = 27323,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 3156,
-                        Name     = "Unreserved 2",
-                        Offset   = 15484416,
-                        Sequence = 10,
-                        Size     = 1615872,
-                        Start    = 30243,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 5635,
-                        Name     = "Usr file system",
-                        Offset   = 17100288,
-                        Sequence = 11,
-                        Size     = 2885120,
-                        Start    = 33399,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4508,
-                        Name     = "Root file system",
-                        Offset   = 19985408,
-                        Sequence = 12,
-                        Size     = 2308096,
-                        Start    = 39034,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 7213,
-                        Name     = "Swap",
-                        Offset   = 22293504,
-                        Sequence = 13,
-                        Size     = 3693056,
-                        Start    = 43542,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4085,
-                        Name     = "A/UX Root",
-                        Offset   = 25986560,
-                        Sequence = 14,
-                        Size     = 2091520,
-                        Start    = 50755,
-                        Type     = "Apple_UNIX_SVR2"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_6.0.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 10,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 5120,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 4096,
-                        Name     = "MacOS",
-                        Offset   = 49152,
-                        Sequence = 2,
-                        Size     = 2097152,
-                        Start    = 96,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 4096,
-                        Name     = "Scratch",
-                        Offset   = 2146304,
-                        Sequence = 3,
-                        Size     = 2097152,
-                        Start    = 4192,
-                        Type     = "Apple_Scratch"
-                    },
-                    new Partition
-                    {
-                        Length   = 4096,
-                        Name     = "Eschatology 1",
-                        Offset   = 4243456,
-                        Sequence = 4,
-                        Size     = 2097152,
-                        Start    = 8288,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4096,
-                        Name     = "A/UX Root",
-                        Offset   = 6340608,
-                        Sequence = 5,
-                        Size     = 2097152,
-                        Start    = 12384,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 2048,
-                        Name     = "Swap",
-                        Offset   = 8437760,
-                        Sequence = 6,
-                        Size     = 1048576,
-                        Start    = 16480,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4096,
-                        Name     = "Eschatology 2",
-                        Offset   = 9486336,
-                        Sequence = 7,
-                        Size     = 2097152,
-                        Start    = 18528,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4096,
-                        Name     = "Root file system",
-                        Offset   = 11583488,
-                        Sequence = 8,
-                        Size     = 2097152,
-                        Start    = 22624,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4512,
-                        Name     = "Usr file system",
-                        Offset   = 13680640,
-                        Sequence = 9,
-                        Size     = 2310144,
-                        Start    = 26720,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 10580,
-                        Name     = "Random A/UX fs",
-                        Offset   = 15990784,
-                        Sequence = 10,
-                        Size     = 5416960,
-                        Start    = 31232,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 8,
-                        Name     = "Extra",
-                        Offset   = 21407744,
-                        Sequence = 11,
-                        Size     = 4096,
-                        Start    = 41812,
-                        Type     = "Apple_Free"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_7.0.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 10,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 5120,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 6002,
-                        Name     = "Scratch",
-                        Offset   = 49152,
-                        Sequence = 2,
-                        Size     = 3073024,
-                        Start    = 96,
-                        Type     = "Apple_Scratch"
-                    },
-                    new Partition
-                    {
-                        Length   = 5325,
-                        Name     = "Root file system",
-                        Offset   = 3122176,
-                        Sequence = 3,
-                        Size     = 2726400,
-                        Start    = 6098,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 6212,
-                        Name     = "Extra",
-                        Offset   = 5848576,
-                        Sequence = 4,
-                        Size     = 3180544,
-                        Start    = 11423,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 8210,
-                        Name     = "Random A/UX fs",
-                        Offset   = 9029120,
-                        Sequence = 5,
-                        Size     = 4203520,
-                        Start    = 17635,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 5104,
-                        Name     = "Extra",
-                        Offset   = 13232640,
-                        Sequence = 6,
-                        Size     = 2613248,
-                        Start    = 25845,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 10278,
-                        Name     = "MacOS",
-                        Offset   = 15845888,
-                        Sequence = 7,
-                        Size     = 5262336,
-                        Start    = 30949,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 3335,
-                        Name     = "Eschatology 1",
-                        Offset   = 21108224,
-                        Sequence = 8,
-                        Size     = 1707520,
-                        Start    = 41227,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 10278,
-                        Name     = "Extra",
-                        Offset   = 22815744,
-                        Sequence = 9,
-                        Size     = 5262336,
-                        Start    = 44562,
-                        Type     = "Apple_Free"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_7.1.1.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 17,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 8704,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 64,
-                        Type     = "Apple_Driver43"
-                    },
-                    new Partition
-                    {
-                        Length   = 2904,
-                        Name     = "Random A/UX fs",
-                        Offset   = 49152,
-                        Sequence = 2,
-                        Size     = 1486848,
-                        Start    = 96,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 4096,
-                        Name     = "ProDOS",
-                        Offset   = 1536000,
-                        Sequence = 3,
-                        Size     = 2097152,
-                        Start    = 3000,
-                        Type     = "Apple_PRODOS"
-                    },
-                    new Partition
-                    {
-                        Length   = 3055,
-                        Name     = "Extra",
-                        Offset   = 3633152,
-                        Sequence = 4,
-                        Size     = 1564160,
-                        Start    = 7096,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 4096,
-                        Name     = "ProDOS",
-                        Offset   = 5197312,
-                        Sequence = 5,
-                        Size     = 2097152,
-                        Start    = 10151,
-                        Type     = "Apple_PRODOS"
-                    },
-                    new Partition
-                    {
-                        Length   = 10055,
-                        Name     = "MacOS",
-                        Offset   = 7294464,
-                        Sequence = 6,
-                        Size     = 5148160,
-                        Start    = 14247,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 8607,
-                        Name     = "Extra",
-                        Offset   = 12442624,
-                        Sequence = 7,
-                        Size     = 4406784,
-                        Start    = 24302,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 4855,
-                        Name     = "Random A/UX fs",
-                        Offset   = 16849408,
-                        Sequence = 8,
-                        Size     = 2485760,
-                        Start    = 32909,
-                        Type     = "Apple_UNIX_SVR2"
-                    },
-                    new Partition
-                    {
-                        Length   = 9270,
-                        Name     = "Extra",
-                        Offset   = 19335168,
-                        Sequence = 9,
-                        Size     = 4746240,
-                        Start    = 37764,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 7806,
-                        Name     = "A/UX Root",
-                        Offset   = 24081408,
-                        Sequence = 10,
-                        Size     = 3996672,
-                        Start    = 47034,
-                        Type     = "Apple_UNIX_SVR2"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macos_7.5.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 18,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 9216,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 64,
-                        Type     = "Apple_Driver43"
-                    },
-                    new Partition
-                    {
-                        Length   = 54744,
-                        Name     = "MacOS",
-                        Offset   = 49152,
-                        Sequence = 2,
-                        Size     = 28028928,
-                        Start    = 96,
-                        Type     = "Apple_HFS"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "parted.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 4032,
-                        Name     = "Extra",
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 2064384,
-                        Start    = 64,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 92160,
-                        Name     = "untitled",
-                        Offset   = 2097152,
-                        Sequence = 1,
-                        Size     = 47185920,
-                        Start    = 4096,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 165888,
-                        Name     = "untitled",
-                        Offset   = 49283072,
-                        Sequence = 2,
-                        Size     = 84934656,
-                        Start    = 96256,
-                        Type     = "Apple_UNIX_SVR2"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "silverlining_2.2.1.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 6,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 3072,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 128,
-                        Name     = "Macintosh_SL",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 65536,
-                        Start    = 64,
-                        Type     = "Apple_Driver43"
-                    },
-                    new Partition
-                    {
-                        Length   = 49,
-                        Offset   = 98304,
-                        Sequence = 2,
-                        Size     = 25088,
-                        Start    = 192,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 128,
-                        Name     = "Macintosh_SL",
-                        Offset   = 98304,
-                        Sequence = 3,
-                        Size     = 65536,
-                        Start    = 192,
-                        Type     = "Apple_Driver_ATA"
-                    },
-                    new Partition
-                    {
-                        Length   = 50400,
-                        Name     = "Untitled  #1",
-                        Offset   = 163840,
-                        Sequence = 4,
-                        Size     = 25804800,
-                        Start    = 320,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 464,
-                        Name     = "Extra",
-                        Offset   = 25968640,
-                        Sequence = 5,
-                        Size     = 237568,
-                        Start    = 50720,
-                        Type     = "Apple_Free"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "speedtools_3.6.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 27,
-                        Offset   = 32768,
-                        Sequence = 0,
-                        Size     = 13824,
-                        Start    = 64,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 100,
-                        Name     = "Macintosh",
-                        Offset   = 32768,
-                        Sequence = 1,
-                        Size     = 51200,
-                        Start    = 64,
-                        Type     = "Apple_Driver43"
-                    },
-                    new Partition
-                    {
-                        Length   = 49152,
-                        Name     = "untitled",
-                        Offset   = 83968,
-                        Sequence = 2,
-                        Size     = 25165824,
-                        Start    = 164,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 1882,
-                        Name     = "Extra",
-                        Offset   = 25249792,
-                        Sequence = 3,
-                        Size     = 963584,
-                        Start    = 49316,
-                        Type     = "Apple_Free"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "vcpformatter_2.1.1.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 24,
-                        Offset   = 57344,
-                        Sequence = 0,
-                        Size     = 12288,
-                        Start    = 112,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Macintosh",
-                        Offset   = 57344,
-                        Sequence = 1,
-                        Size     = 16384,
-                        Start    = 112,
-                        Type     = "Apple_Driver"
-                    },
-                    new Partition
-                    {
-                        Length   = 32,
-                        Name     = "Extra",
-                        Offset   = 73728,
-                        Sequence = 2,
-                        Size     = 16384,
-                        Start    = 144,
-                        Type     = "Apple_Free"
-                    },
-                    new Partition
-                    {
-                        Length   = 54662,
-                        Name     = "MacOS",
-                        Offset   = 90112,
-                        Sequence = 3,
-                        Size     = 27986944,
-                        Start    = 176,
-                        Type     = "Apple_HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 2,
-                        Name     = "Extra",
-                        Offset   = 28077056,
-                        Sequence = 4,
-                        Size     = 1024,
-                        Start    = 54838,
-                        Type     = "Apple_Free"
-                    }
+                    Length   = 50944,
+                    Name     = "Volume label",
+                    Offset   = 131072,
+                    Sequence = 3,
+                    Size     = 26083328,
+                    Start    = 256,
+                    Type     = "Apple_HFS"
                 }
             }
-        };
-    }
+        },
+        new PartitionTest
+        {
+            TestFile = "hdt_1.8_encrypted1.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 14,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 7168,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 1024,
+                    Name     = "FWB Disk Driver",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 524288,
+                    Start    = 64,
+                    Type     = "Apple_Driver43"
+                },
+                new Partition
+                {
+                    Length   = 50112,
+                    Name     = "MacOS",
+                    Offset   = 557056,
+                    Sequence = 2,
+                    Size     = 25657344,
+                    Start    = 1088,
+                    Type     = "Apple_HFS"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "hdt_1.8_encrypted2.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 14,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 7168,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 1024,
+                    Name     = "FWB Disk Driver",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 524288,
+                    Start    = 64,
+                    Type     = "Apple_Driver43"
+                },
+                new Partition
+                {
+                    Length   = 50112,
+                    Name     = "MacOS",
+                    Offset   = 557056,
+                    Sequence = 2,
+                    Size     = 25657344,
+                    Start    = 1088,
+                    Type     = "Apple_HFS"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "hdt_1.8_password.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 14,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 7168,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 1024,
+                    Name     = "FWB Disk Driver",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 524288,
+                    Start    = 64,
+                    Type     = "Apple_Driver43"
+                },
+                new Partition
+                {
+                    Length   = 50112,
+                    Name     = "MacOS",
+                    Offset   = 557056,
+                    Sequence = 2,
+                    Size     = 25657344,
+                    Start    = 1088,
+                    Type     = "Apple_HFS"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "hdt_1.8.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 14,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 7168,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 1024,
+                    Name     = "FWB Disk Driver",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 524288,
+                    Start    = 64,
+                    Type     = "Apple_Driver43"
+                },
+                new Partition
+                {
+                    Length   = 50112,
+                    Name     = "MacOS",
+                    Offset   = 557056,
+                    Sequence = 2,
+                    Size     = 25657344,
+                    Start    = 1088,
+                    Type     = "Apple_HFS"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "linux.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 1,
+                    Name     = "Extra",
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 512,
+                    Start    = 64,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 1600,
+                    Name     = "bootstrap",
+                    Offset   = 33280,
+                    Sequence = 1,
+                    Size     = 819200,
+                    Start    = 65,
+                    Type     = "Apple_Bootstrap"
+                },
+                new Partition
+                {
+                    Length   = 1,
+                    Name     = "Extra",
+                    Offset   = 852480,
+                    Sequence = 2,
+                    Size     = 512,
+                    Start    = 1665,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 102400,
+                    Name     = "Linux",
+                    Offset   = 852992,
+                    Sequence = 3,
+                    Size     = 52428800,
+                    Start    = 1666,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 40960,
+                    Name     = "ProDOS",
+                    Offset   = 53281792,
+                    Sequence = 4,
+                    Size     = 20971520,
+                    Start    = 104066,
+                    Type     = "Apple_PRODOS"
+                },
+                new Partition
+                {
+                    Length   = 102400,
+                    Name     = "Macintosh",
+                    Offset   = 74253312,
+                    Sequence = 5,
+                    Size     = 52428800,
+                    Start    = 145026,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 14718,
+                    Name     = "Extra",
+                    Offset   = 126682112,
+                    Sequence = 6,
+                    Size     = 7535616,
+                    Start    = 247426,
+                    Type     = "Apple_Free"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_1.1.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 10,
+                    Offset   = 2048,
+                    Sequence = 0,
+                    Size     = 5120,
+                    Start    = 4,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 41804,
+                    Name     = "Macintosh",
+                    Offset   = 8192,
+                    Sequence = 1,
+                    Size     = 21403648,
+                    Start    = 16,
+                    Type     = "Apple_HFS"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_2.0.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 10,
+                    Offset   = 2048,
+                    Sequence = 0,
+                    Size     = 5120,
+                    Start    = 4,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 38965,
+                    Name     = "Macintosh",
+                    Offset   = 8192,
+                    Sequence = 1,
+                    Size     = 19950080,
+                    Start    = 16,
+                    Type     = "Apple_HFS"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_4.2.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 11,
+                    Offset   = 2048,
+                    Sequence = 0,
+                    Size     = 5632,
+                    Start    = 4,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 38965,
+                    Name     = "Macintosh",
+                    Offset   = 8192,
+                    Sequence = 1,
+                    Size     = 19950080,
+                    Start    = 16,
+                    Type     = "Apple_HFS"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_4.3.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 11,
+                    Offset   = 2048,
+                    Sequence = 0,
+                    Size     = 5632,
+                    Start    = 4,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 38965,
+                    Name     = "Macintosh",
+                    Offset   = 8192,
+                    Sequence = 1,
+                    Size     = 19950080,
+                    Start    = 16,
+                    Type     = "Apple_HFS"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_6.0.2.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 10,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 5120,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 6256,
+                    Name     = "MacOS",
+                    Offset   = 49152,
+                    Sequence = 2,
+                    Size     = 3203072,
+                    Start    = 96,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 1024,
+                    Name     = "Scratch",
+                    Offset   = 3252224,
+                    Sequence = 3,
+                    Size     = 524288,
+                    Start    = 6352,
+                    Type     = "Apple_Scratch"
+                },
+                new Partition
+                {
+                    Length   = 2048,
+                    Name     = "Eschatology 1",
+                    Offset   = 3776512,
+                    Sequence = 4,
+                    Size     = 1048576,
+                    Start    = 7376,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4280,
+                    Name     = "A/UX Root",
+                    Offset   = 4825088,
+                    Sequence = 5,
+                    Size     = 2191360,
+                    Start    = 9424,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2377,
+                    Name     = "Swap",
+                    Offset   = 7016448,
+                    Sequence = 6,
+                    Size     = 1217024,
+                    Start    = 13704,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 3072,
+                    Name     = "Eschatology 2",
+                    Offset   = 8233472,
+                    Sequence = 7,
+                    Size     = 1572864,
+                    Start    = 16081,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2560,
+                    Name     = "Root file system",
+                    Offset   = 9806336,
+                    Sequence = 8,
+                    Size     = 1310720,
+                    Start    = 19153,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4981,
+                    Name     = "Usr file system",
+                    Offset   = 11117056,
+                    Sequence = 9,
+                    Size     = 2550272,
+                    Start    = 21713,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4000,
+                    Name     = "Random A/UX fs",
+                    Offset   = 13667328,
+                    Sequence = 10,
+                    Size     = 2048000,
+                    Start    = 26694,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2532,
+                    Name     = "Random A/UX fs",
+                    Offset   = 15715328,
+                    Sequence = 11,
+                    Size     = 1296384,
+                    Start    = 30694,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2666,
+                    Name     = "Usr file system",
+                    Offset   = 17011712,
+                    Sequence = 12,
+                    Size     = 1364992,
+                    Start    = 33226,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 7786,
+                    Name     = "Usr file system",
+                    Offset   = 18376704,
+                    Sequence = 13,
+                    Size     = 3986432,
+                    Start    = 35892,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 11162,
+                    Name     = "Extra",
+                    Offset   = 22363136,
+                    Sequence = 14,
+                    Size     = 5714944,
+                    Start    = 43678,
+                    Type     = "Apple_Free"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_6.0.3.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 10,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 5120,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 11619,
+                    Name     = "MacOS",
+                    Offset   = 49152,
+                    Sequence = 2,
+                    Size     = 5948928,
+                    Start    = 96,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 2011,
+                    Name     = "Scratch",
+                    Offset   = 5998080,
+                    Sequence = 3,
+                    Size     = 1029632,
+                    Start    = 11715,
+                    Type     = "Apple_Scratch"
+                },
+                new Partition
+                {
+                    Length   = 4796,
+                    Name     = "Eschatology 1",
+                    Offset   = 7027712,
+                    Sequence = 4,
+                    Size     = 2455552,
+                    Start    = 13726,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 7680,
+                    Name     = "A/UX Root",
+                    Offset   = 9483264,
+                    Sequence = 5,
+                    Size     = 3932160,
+                    Start    = 18522,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 8192,
+                    Name     = "Swap",
+                    Offset   = 13415424,
+                    Sequence = 6,
+                    Size     = 4194304,
+                    Start    = 26202,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 1148,
+                    Name     = "Eschatology 2",
+                    Offset   = 17609728,
+                    Sequence = 7,
+                    Size     = 587776,
+                    Start    = 34394,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 12768,
+                    Name     = "Root file system",
+                    Offset   = 18197504,
+                    Sequence = 8,
+                    Size     = 6537216,
+                    Start    = 35542,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 3450,
+                    Name     = "Usr file system",
+                    Offset   = 24734720,
+                    Sequence = 9,
+                    Size     = 1766400,
+                    Start    = 48310,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 36,
+                    Name     = "Extra",
+                    Offset   = 26501120,
+                    Sequence = 10,
+                    Size     = 18432,
+                    Start    = 51760,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 3044,
+                    Name     = "Random A/UX fs",
+                    Offset   = 26519552,
+                    Sequence = 11,
+                    Size     = 1558528,
+                    Start    = 51796,
+                    Type     = "Apple_UNIX_SVR2"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_6.0.4.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 10,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 5120,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 7680,
+                    Name     = "MacOS",
+                    Offset   = 49152,
+                    Sequence = 2,
+                    Size     = 3932160,
+                    Start    = 96,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 6245,
+                    Name     = "Scratch",
+                    Offset   = 3981312,
+                    Sequence = 3,
+                    Size     = 3197440,
+                    Start    = 7776,
+                    Type     = "Apple_Scratch"
+                },
+                new Partition
+                {
+                    Length   = 6245,
+                    Name     = "Eschatology 1",
+                    Offset   = 7178752,
+                    Sequence = 4,
+                    Size     = 3197440,
+                    Start    = 14021,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 5130,
+                    Name     = "A/UX Root",
+                    Offset   = 10376192,
+                    Sequence = 5,
+                    Size     = 2626560,
+                    Start    = 20266,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2676,
+                    Name     = "Swap",
+                    Offset   = 13002752,
+                    Sequence = 6,
+                    Size     = 1370112,
+                    Start    = 25396,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 5751,
+                    Name     = "Eschatology 2",
+                    Offset   = 14372864,
+                    Sequence = 7,
+                    Size     = 2944512,
+                    Start    = 28072,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 5423,
+                    Name     = "Root file system",
+                    Offset   = 17317376,
+                    Sequence = 8,
+                    Size     = 2776576,
+                    Start    = 33823,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 5650,
+                    Name     = "Usr file system",
+                    Offset   = 20093952,
+                    Sequence = 9,
+                    Size     = 2892800,
+                    Start    = 39246,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 6706,
+                    Name     = "Random A/UX fs",
+                    Offset   = 22986752,
+                    Sequence = 10,
+                    Size     = 3433472,
+                    Start    = 44896,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 3238,
+                    Name     = "Extra",
+                    Offset   = 26420224,
+                    Sequence = 11,
+                    Size     = 1657856,
+                    Start    = 51602,
+                    Type     = "Apple_Free"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_6.0.5.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 10,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 5120,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 4096,
+                    Name     = "MacOS",
+                    Offset   = 49152,
+                    Sequence = 2,
+                    Size     = 2097152,
+                    Start    = 96,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 669,
+                    Name     = "Scratch",
+                    Offset   = 2146304,
+                    Sequence = 3,
+                    Size     = 342528,
+                    Start    = 4192,
+                    Type     = "Apple_Scratch"
+                },
+                new Partition
+                {
+                    Length   = 2768,
+                    Name     = "Eschatology 1",
+                    Offset   = 2488832,
+                    Sequence = 4,
+                    Size     = 1417216,
+                    Start    = 4861,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 3576,
+                    Name     = "A/UX Root",
+                    Offset   = 3906048,
+                    Sequence = 5,
+                    Size     = 1830912,
+                    Start    = 7629,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2830,
+                    Name     = "Swap",
+                    Offset   = 5736960,
+                    Sequence = 6,
+                    Size     = 1448960,
+                    Start    = 11205,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 5249,
+                    Name     = "Root file system",
+                    Offset   = 7185920,
+                    Sequence = 7,
+                    Size     = 2687488,
+                    Start    = 14035,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 5011,
+                    Name     = "Usr file system",
+                    Offset   = 9873408,
+                    Sequence = 8,
+                    Size     = 2565632,
+                    Start    = 19284,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 3818,
+                    Name     = "Unreserved 1",
+                    Offset   = 12439040,
+                    Sequence = 9,
+                    Size     = 1954816,
+                    Start    = 24295,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 6920,
+                    Name     = "Unreserved 2",
+                    Offset   = 14393856,
+                    Sequence = 10,
+                    Size     = 3543040,
+                    Start    = 28113,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 5011,
+                    Name     = "Unreserved 3",
+                    Offset   = 17936896,
+                    Sequence = 11,
+                    Size     = 2565632,
+                    Start    = 35033,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 5727,
+                    Name     = "Unreserved 4",
+                    Offset   = 20502528,
+                    Sequence = 12,
+                    Size     = 2932224,
+                    Start    = 40044,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2386,
+                    Name     = "Random A/UX fs",
+                    Offset   = 23434752,
+                    Sequence = 13,
+                    Size     = 1221632,
+                    Start    = 45771,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 6683,
+                    Name     = "Extra",
+                    Offset   = 24656384,
+                    Sequence = 14,
+                    Size     = 3421696,
+                    Start    = 48157,
+                    Type     = "Apple_Free"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_6.0.7.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 10,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 5120,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 27371,
+                    Name     = "MacOS",
+                    Offset   = 49152,
+                    Sequence = 2,
+                    Size     = 14013952,
+                    Start    = 96,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 2916,
+                    Name     = "Eschatology 1",
+                    Offset   = 14063104,
+                    Sequence = 3,
+                    Size     = 1492992,
+                    Start    = 27467,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 1795,
+                    Name     = "A/UX Root",
+                    Offset   = 15556096,
+                    Sequence = 4,
+                    Size     = 919040,
+                    Start    = 30383,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2543,
+                    Name     = "Swap",
+                    Offset   = 16475136,
+                    Sequence = 5,
+                    Size     = 1302016,
+                    Start    = 32178,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 3509,
+                    Name     = "Root file system",
+                    Offset   = 17777152,
+                    Sequence = 6,
+                    Size     = 1796608,
+                    Start    = 34721,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 3796,
+                    Name     = "Usr file system",
+                    Offset   = 19573760,
+                    Sequence = 7,
+                    Size     = 1943552,
+                    Start    = 38230,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4271,
+                    Name     = "Random A/UX fs",
+                    Offset   = 21517312,
+                    Sequence = 8,
+                    Size     = 2186752,
+                    Start    = 42026,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 1024,
+                    Name     = "Unreserved 1",
+                    Offset   = 23704064,
+                    Sequence = 9,
+                    Size     = 524288,
+                    Start    = 46297,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 1280,
+                    Name     = "Unreserved 2",
+                    Offset   = 24228352,
+                    Sequence = 10,
+                    Size     = 655360,
+                    Start    = 47321,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 1559,
+                    Name     = "Unreserved 3",
+                    Offset   = 24883712,
+                    Sequence = 11,
+                    Size     = 798208,
+                    Start    = 48601,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 280,
+                    Name     = "Extra",
+                    Offset   = 25681920,
+                    Sequence = 12,
+                    Size     = 143360,
+                    Start    = 50160,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 4400,
+                    Name     = "Unreserved 4",
+                    Offset   = 25825280,
+                    Sequence = 13,
+                    Size     = 2252800,
+                    Start    = 50440,
+                    Type     = "Apple_UNIX_SVR2"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_6.0.8.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 10,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 5120,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 8937,
+                    Name     = "MacOS",
+                    Offset   = 49152,
+                    Sequence = 2,
+                    Size     = 4575744,
+                    Start    = 96,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 2234,
+                    Name     = "Scratch",
+                    Offset   = 4624896,
+                    Sequence = 3,
+                    Size     = 1143808,
+                    Start    = 9033,
+                    Type     = "Apple_Scratch"
+                },
+                new Partition
+                {
+                    Length   = 5900,
+                    Name     = "Eschatology 1",
+                    Offset   = 5768704,
+                    Sequence = 4,
+                    Size     = 3020800,
+                    Start    = 11267,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 3156,
+                    Name     = "Unreserved 1",
+                    Offset   = 8789504,
+                    Sequence = 5,
+                    Size     = 1615872,
+                    Start    = 17167,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2705,
+                    Name     = "Unreserved 3",
+                    Offset   = 10405376,
+                    Sequence = 6,
+                    Size     = 1384960,
+                    Start    = 20323,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 1861,
+                    Name     = "Unreserved 4",
+                    Offset   = 11790336,
+                    Sequence = 7,
+                    Size     = 952832,
+                    Start    = 23028,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2434,
+                    Name     = "Extra",
+                    Offset   = 12743168,
+                    Sequence = 8,
+                    Size     = 1246208,
+                    Start    = 24889,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 2920,
+                    Name     = "Random A/UX fs",
+                    Offset   = 13989376,
+                    Sequence = 9,
+                    Size     = 1495040,
+                    Start    = 27323,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 3156,
+                    Name     = "Unreserved 2",
+                    Offset   = 15484416,
+                    Sequence = 10,
+                    Size     = 1615872,
+                    Start    = 30243,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 5635,
+                    Name     = "Usr file system",
+                    Offset   = 17100288,
+                    Sequence = 11,
+                    Size     = 2885120,
+                    Start    = 33399,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4508,
+                    Name     = "Root file system",
+                    Offset   = 19985408,
+                    Sequence = 12,
+                    Size     = 2308096,
+                    Start    = 39034,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 7213,
+                    Name     = "Swap",
+                    Offset   = 22293504,
+                    Sequence = 13,
+                    Size     = 3693056,
+                    Start    = 43542,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4085,
+                    Name     = "A/UX Root",
+                    Offset   = 25986560,
+                    Sequence = 14,
+                    Size     = 2091520,
+                    Start    = 50755,
+                    Type     = "Apple_UNIX_SVR2"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_6.0.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 10,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 5120,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 4096,
+                    Name     = "MacOS",
+                    Offset   = 49152,
+                    Sequence = 2,
+                    Size     = 2097152,
+                    Start    = 96,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 4096,
+                    Name     = "Scratch",
+                    Offset   = 2146304,
+                    Sequence = 3,
+                    Size     = 2097152,
+                    Start    = 4192,
+                    Type     = "Apple_Scratch"
+                },
+                new Partition
+                {
+                    Length   = 4096,
+                    Name     = "Eschatology 1",
+                    Offset   = 4243456,
+                    Sequence = 4,
+                    Size     = 2097152,
+                    Start    = 8288,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4096,
+                    Name     = "A/UX Root",
+                    Offset   = 6340608,
+                    Sequence = 5,
+                    Size     = 2097152,
+                    Start    = 12384,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 2048,
+                    Name     = "Swap",
+                    Offset   = 8437760,
+                    Sequence = 6,
+                    Size     = 1048576,
+                    Start    = 16480,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4096,
+                    Name     = "Eschatology 2",
+                    Offset   = 9486336,
+                    Sequence = 7,
+                    Size     = 2097152,
+                    Start    = 18528,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4096,
+                    Name     = "Root file system",
+                    Offset   = 11583488,
+                    Sequence = 8,
+                    Size     = 2097152,
+                    Start    = 22624,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4512,
+                    Name     = "Usr file system",
+                    Offset   = 13680640,
+                    Sequence = 9,
+                    Size     = 2310144,
+                    Start    = 26720,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 10580,
+                    Name     = "Random A/UX fs",
+                    Offset   = 15990784,
+                    Sequence = 10,
+                    Size     = 5416960,
+                    Start    = 31232,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 8,
+                    Name     = "Extra",
+                    Offset   = 21407744,
+                    Sequence = 11,
+                    Size     = 4096,
+                    Start    = 41812,
+                    Type     = "Apple_Free"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_7.0.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 10,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 5120,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 6002,
+                    Name     = "Scratch",
+                    Offset   = 49152,
+                    Sequence = 2,
+                    Size     = 3073024,
+                    Start    = 96,
+                    Type     = "Apple_Scratch"
+                },
+                new Partition
+                {
+                    Length   = 5325,
+                    Name     = "Root file system",
+                    Offset   = 3122176,
+                    Sequence = 3,
+                    Size     = 2726400,
+                    Start    = 6098,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 6212,
+                    Name     = "Extra",
+                    Offset   = 5848576,
+                    Sequence = 4,
+                    Size     = 3180544,
+                    Start    = 11423,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 8210,
+                    Name     = "Random A/UX fs",
+                    Offset   = 9029120,
+                    Sequence = 5,
+                    Size     = 4203520,
+                    Start    = 17635,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 5104,
+                    Name     = "Extra",
+                    Offset   = 13232640,
+                    Sequence = 6,
+                    Size     = 2613248,
+                    Start    = 25845,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 10278,
+                    Name     = "MacOS",
+                    Offset   = 15845888,
+                    Sequence = 7,
+                    Size     = 5262336,
+                    Start    = 30949,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 3335,
+                    Name     = "Eschatology 1",
+                    Offset   = 21108224,
+                    Sequence = 8,
+                    Size     = 1707520,
+                    Start    = 41227,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 10278,
+                    Name     = "Extra",
+                    Offset   = 22815744,
+                    Sequence = 9,
+                    Size     = 5262336,
+                    Start    = 44562,
+                    Type     = "Apple_Free"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_7.1.1.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 17,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 8704,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 64,
+                    Type     = "Apple_Driver43"
+                },
+                new Partition
+                {
+                    Length   = 2904,
+                    Name     = "Random A/UX fs",
+                    Offset   = 49152,
+                    Sequence = 2,
+                    Size     = 1486848,
+                    Start    = 96,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 4096,
+                    Name     = "ProDOS",
+                    Offset   = 1536000,
+                    Sequence = 3,
+                    Size     = 2097152,
+                    Start    = 3000,
+                    Type     = "Apple_PRODOS"
+                },
+                new Partition
+                {
+                    Length   = 3055,
+                    Name     = "Extra",
+                    Offset   = 3633152,
+                    Sequence = 4,
+                    Size     = 1564160,
+                    Start    = 7096,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 4096,
+                    Name     = "ProDOS",
+                    Offset   = 5197312,
+                    Sequence = 5,
+                    Size     = 2097152,
+                    Start    = 10151,
+                    Type     = "Apple_PRODOS"
+                },
+                new Partition
+                {
+                    Length   = 10055,
+                    Name     = "MacOS",
+                    Offset   = 7294464,
+                    Sequence = 6,
+                    Size     = 5148160,
+                    Start    = 14247,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 8607,
+                    Name     = "Extra",
+                    Offset   = 12442624,
+                    Sequence = 7,
+                    Size     = 4406784,
+                    Start    = 24302,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 4855,
+                    Name     = "Random A/UX fs",
+                    Offset   = 16849408,
+                    Sequence = 8,
+                    Size     = 2485760,
+                    Start    = 32909,
+                    Type     = "Apple_UNIX_SVR2"
+                },
+                new Partition
+                {
+                    Length   = 9270,
+                    Name     = "Extra",
+                    Offset   = 19335168,
+                    Sequence = 9,
+                    Size     = 4746240,
+                    Start    = 37764,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 7806,
+                    Name     = "A/UX Root",
+                    Offset   = 24081408,
+                    Sequence = 10,
+                    Size     = 3996672,
+                    Start    = 47034,
+                    Type     = "Apple_UNIX_SVR2"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macos_7.5.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 18,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 9216,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 64,
+                    Type     = "Apple_Driver43"
+                },
+                new Partition
+                {
+                    Length   = 54744,
+                    Name     = "MacOS",
+                    Offset   = 49152,
+                    Sequence = 2,
+                    Size     = 28028928,
+                    Start    = 96,
+                    Type     = "Apple_HFS"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "parted.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 4032,
+                    Name     = "Extra",
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 2064384,
+                    Start    = 64,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 92160,
+                    Name     = "untitled",
+                    Offset   = 2097152,
+                    Sequence = 1,
+                    Size     = 47185920,
+                    Start    = 4096,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 165888,
+                    Name     = "untitled",
+                    Offset   = 49283072,
+                    Sequence = 2,
+                    Size     = 84934656,
+                    Start    = 96256,
+                    Type     = "Apple_UNIX_SVR2"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "silverlining_2.2.1.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 6,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 3072,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 128,
+                    Name     = "Macintosh_SL",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 65536,
+                    Start    = 64,
+                    Type     = "Apple_Driver43"
+                },
+                new Partition
+                {
+                    Length   = 49,
+                    Offset   = 98304,
+                    Sequence = 2,
+                    Size     = 25088,
+                    Start    = 192,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 128,
+                    Name     = "Macintosh_SL",
+                    Offset   = 98304,
+                    Sequence = 3,
+                    Size     = 65536,
+                    Start    = 192,
+                    Type     = "Apple_Driver_ATA"
+                },
+                new Partition
+                {
+                    Length   = 50400,
+                    Name     = "Untitled  #1",
+                    Offset   = 163840,
+                    Sequence = 4,
+                    Size     = 25804800,
+                    Start    = 320,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 464,
+                    Name     = "Extra",
+                    Offset   = 25968640,
+                    Sequence = 5,
+                    Size     = 237568,
+                    Start    = 50720,
+                    Type     = "Apple_Free"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "speedtools_3.6.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 27,
+                    Offset   = 32768,
+                    Sequence = 0,
+                    Size     = 13824,
+                    Start    = 64,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 100,
+                    Name     = "Macintosh",
+                    Offset   = 32768,
+                    Sequence = 1,
+                    Size     = 51200,
+                    Start    = 64,
+                    Type     = "Apple_Driver43"
+                },
+                new Partition
+                {
+                    Length   = 49152,
+                    Name     = "untitled",
+                    Offset   = 83968,
+                    Sequence = 2,
+                    Size     = 25165824,
+                    Start    = 164,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 1882,
+                    Name     = "Extra",
+                    Offset   = 25249792,
+                    Sequence = 3,
+                    Size     = 963584,
+                    Start    = 49316,
+                    Type     = "Apple_Free"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "vcpformatter_2.1.1.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 24,
+                    Offset   = 57344,
+                    Sequence = 0,
+                    Size     = 12288,
+                    Start    = 112,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Macintosh",
+                    Offset   = 57344,
+                    Sequence = 1,
+                    Size     = 16384,
+                    Start    = 112,
+                    Type     = "Apple_Driver"
+                },
+                new Partition
+                {
+                    Length   = 32,
+                    Name     = "Extra",
+                    Offset   = 73728,
+                    Sequence = 2,
+                    Size     = 16384,
+                    Start    = 144,
+                    Type     = "Apple_Free"
+                },
+                new Partition
+                {
+                    Length   = 54662,
+                    Name     = "MacOS",
+                    Offset   = 90112,
+                    Sequence = 3,
+                    Size     = 27986944,
+                    Start    = 176,
+                    Type     = "Apple_HFS"
+                },
+                new Partition
+                {
+                    Length   = 2,
+                    Name     = "Extra",
+                    Offset   = 28077056,
+                    Sequence = 4,
+                    Size     = 1024,
+                    Start    = 54838,
+                    Type     = "Apple_Free"
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/Atari.cs b/Aaru.Tests/Partitions/Atari.cs
index bd78f3fae..ecf611b42 100644
--- a/Aaru.Tests/Partitions/Atari.cs
+++ b/Aaru.Tests/Partitions/Atari.cs
@@ -30,242 +30,241 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
+namespace Aaru.Tests.Partitions;
+
+[TestFixture]
+public class Atari : PartitionSchemeTest
 {
-    [TestFixture]
-    public class Atari : PartitionSchemeTest
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Atari ST");
+    public override PartitionTest[] Tests => new[]
     {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Atari ST");
-        public override PartitionTest[] Tests => new[]
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "linux_ahdi.aif",
+            Partitions = new[]
             {
-                TestFile = "linux_ahdi.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 61440,
-                        Offset   = 512,
-                        Sequence = 0,
-                        Size     = 31457280,
-                        Start    = 1,
-                        Type     = "GEM"
-                    },
-                    new Partition
-                    {
-                        Length   = 81920,
-                        Offset   = 31457792,
-                        Sequence = 1,
-                        Size     = 41943040,
-                        Start    = 61441,
-                        Type     = "BGM"
-                    },
-                    new Partition
-                    {
-                        Length   = 110161,
-                        Offset   = 73400832,
-                        Sequence = 2,
-                        Size     = 56402432,
-                        Start    = 143361,
-                        Type     = "LNX"
-                    },
-                    new Partition
-                    {
-                        Length   = 84400,
-                        Offset   = 129803264,
-                        Sequence = 3,
-                        Size     = 43212800,
-                        Start    = 253522,
-                        Type     = "MAC"
-                    },
-                    new Partition
-                    {
-                        Length   = 112640,
-                        Offset   = 173016064,
-                        Sequence = 4,
-                        Size     = 57671680,
-                        Start    = 337922,
-                        Type     = "MIX"
-                    },
-                    new Partition
-                    {
-                        Length   = 122880,
-                        Offset   = 230687744,
-                        Sequence = 5,
-                        Size     = 62914560,
-                        Start    = 450562,
-                        Type     = "MNX"
-                    },
-                    new Partition
-                    {
-                        Length   = 143360,
-                        Offset   = 293602304,
-                        Sequence = 6,
-                        Size     = 73400320,
-                        Start    = 573442,
-                        Type     = "RAW"
-                    },
-                    new Partition
-                    {
-                        Length   = 153600,
-                        Offset   = 367002624,
-                        Sequence = 7,
-                        Size     = 78643200,
-                        Start    = 716802,
-                        Type     = "SWP"
-                    },
-                    new Partition
-                    {
-                        Length   = 2048,
-                        Offset   = 445645824,
-                        Sequence = 8,
-                        Size     = 1048576,
-                        Start    = 870402,
-                        Type     = "UNX"
-                    },
-                    new Partition
-                    {
-                        Length   = 151550,
-                        Offset   = 446694400,
-                        Sequence = 9,
-                        Size     = 77593600,
-                        Start    = 872450,
-                        Type     = "LNX"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "linux_icd.aif",
-                Partitions = new[]
+                    Length   = 61440,
+                    Offset   = 512,
+                    Sequence = 0,
+                    Size     = 31457280,
+                    Start    = 1,
+                    Type     = "GEM"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 30720,
-                        Offset   = 512,
-                        Sequence = 0,
-                        Size     = 15728640,
-                        Start    = 1,
-                        Type     = "GEM"
-                    },
-                    new Partition
-                    {
-                        Length   = 40960,
-                        Offset   = 15729152,
-                        Sequence = 1,
-                        Size     = 20971520,
-                        Start    = 30721,
-                        Type     = "UNX"
-                    },
-                    new Partition
-                    {
-                        Length   = 61440,
-                        Offset   = 36700672,
-                        Sequence = 2,
-                        Size     = 31457280,
-                        Start    = 71681,
-                        Type     = "LNX"
-                    },
-                    new Partition
-                    {
-                        Length   = 81920,
-                        Offset   = 68157952,
-                        Sequence = 3,
-                        Size     = 41943040,
-                        Start    = 133121,
-                        Type     = "BGM"
-                    },
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Offset   = 110100992,
-                        Sequence = 4,
-                        Size     = 52428800,
-                        Start    = 215041,
-                        Type     = "MAC"
-                    },
-                    new Partition
-                    {
-                        Length   = 122880,
-                        Offset   = 162529792,
-                        Sequence = 5,
-                        Size     = 62914560,
-                        Start    = 317441,
-                        Type     = "MIX"
-                    },
-                    new Partition
-                    {
-                        Length   = 163840,
-                        Offset   = 225444352,
-                        Sequence = 6,
-                        Size     = 83886080,
-                        Start    = 440321,
-                        Type     = "SWP"
-                    },
-                    new Partition
-                    {
-                        Length   = 202752,
-                        Offset   = 309330432,
-                        Sequence = 7,
-                        Size     = 103809024,
-                        Start    = 604161,
-                        Type     = "MNX"
-                    },
-                    new Partition
-                    {
-                        Length   = 204800,
-                        Offset   = 413139456,
-                        Sequence = 8,
-                        Size     = 104857600,
-                        Start    = 806913,
-                        Type     = "LNX"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "tos_1.04.aif",
-                Partitions = new[]
+                    Length   = 81920,
+                    Offset   = 31457792,
+                    Sequence = 1,
+                    Size     = 41943040,
+                    Start    = 61441,
+                    Type     = "BGM"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 14336,
-                        Offset   = 1024,
-                        Sequence = 0,
-                        Size     = 7340032,
-                        Start    = 2,
-                        Type     = "GEM"
-                    },
-                    new Partition
-                    {
-                        Length   = 14336,
-                        Offset   = 7341056,
-                        Sequence = 1,
-                        Size     = 7340032,
-                        Start    = 14338,
-                        Type     = "GEM"
-                    },
-                    new Partition
-                    {
-                        Length   = 14336,
-                        Offset   = 14681088,
-                        Sequence = 2,
-                        Size     = 7340032,
-                        Start    = 28674,
-                        Type     = "GEM"
-                    },
-                    new Partition
-                    {
-                        Length   = 14334,
-                        Offset   = 22021120,
-                        Sequence = 3,
-                        Size     = 7339008,
-                        Start    = 43010,
-                        Type     = "GEM"
-                    }
+                    Length   = 110161,
+                    Offset   = 73400832,
+                    Sequence = 2,
+                    Size     = 56402432,
+                    Start    = 143361,
+                    Type     = "LNX"
+                },
+                new Partition
+                {
+                    Length   = 84400,
+                    Offset   = 129803264,
+                    Sequence = 3,
+                    Size     = 43212800,
+                    Start    = 253522,
+                    Type     = "MAC"
+                },
+                new Partition
+                {
+                    Length   = 112640,
+                    Offset   = 173016064,
+                    Sequence = 4,
+                    Size     = 57671680,
+                    Start    = 337922,
+                    Type     = "MIX"
+                },
+                new Partition
+                {
+                    Length   = 122880,
+                    Offset   = 230687744,
+                    Sequence = 5,
+                    Size     = 62914560,
+                    Start    = 450562,
+                    Type     = "MNX"
+                },
+                new Partition
+                {
+                    Length   = 143360,
+                    Offset   = 293602304,
+                    Sequence = 6,
+                    Size     = 73400320,
+                    Start    = 573442,
+                    Type     = "RAW"
+                },
+                new Partition
+                {
+                    Length   = 153600,
+                    Offset   = 367002624,
+                    Sequence = 7,
+                    Size     = 78643200,
+                    Start    = 716802,
+                    Type     = "SWP"
+                },
+                new Partition
+                {
+                    Length   = 2048,
+                    Offset   = 445645824,
+                    Sequence = 8,
+                    Size     = 1048576,
+                    Start    = 870402,
+                    Type     = "UNX"
+                },
+                new Partition
+                {
+                    Length   = 151550,
+                    Offset   = 446694400,
+                    Sequence = 9,
+                    Size     = 77593600,
+                    Start    = 872450,
+                    Type     = "LNX"
                 }
             }
-        };
-    }
+        },
+        new PartitionTest
+        {
+            TestFile = "linux_icd.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 30720,
+                    Offset   = 512,
+                    Sequence = 0,
+                    Size     = 15728640,
+                    Start    = 1,
+                    Type     = "GEM"
+                },
+                new Partition
+                {
+                    Length   = 40960,
+                    Offset   = 15729152,
+                    Sequence = 1,
+                    Size     = 20971520,
+                    Start    = 30721,
+                    Type     = "UNX"
+                },
+                new Partition
+                {
+                    Length   = 61440,
+                    Offset   = 36700672,
+                    Sequence = 2,
+                    Size     = 31457280,
+                    Start    = 71681,
+                    Type     = "LNX"
+                },
+                new Partition
+                {
+                    Length   = 81920,
+                    Offset   = 68157952,
+                    Sequence = 3,
+                    Size     = 41943040,
+                    Start    = 133121,
+                    Type     = "BGM"
+                },
+                new Partition
+                {
+                    Length   = 102400,
+                    Offset   = 110100992,
+                    Sequence = 4,
+                    Size     = 52428800,
+                    Start    = 215041,
+                    Type     = "MAC"
+                },
+                new Partition
+                {
+                    Length   = 122880,
+                    Offset   = 162529792,
+                    Sequence = 5,
+                    Size     = 62914560,
+                    Start    = 317441,
+                    Type     = "MIX"
+                },
+                new Partition
+                {
+                    Length   = 163840,
+                    Offset   = 225444352,
+                    Sequence = 6,
+                    Size     = 83886080,
+                    Start    = 440321,
+                    Type     = "SWP"
+                },
+                new Partition
+                {
+                    Length   = 202752,
+                    Offset   = 309330432,
+                    Sequence = 7,
+                    Size     = 103809024,
+                    Start    = 604161,
+                    Type     = "MNX"
+                },
+                new Partition
+                {
+                    Length   = 204800,
+                    Offset   = 413139456,
+                    Sequence = 8,
+                    Size     = 104857600,
+                    Start    = 806913,
+                    Type     = "LNX"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "tos_1.04.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 14336,
+                    Offset   = 1024,
+                    Sequence = 0,
+                    Size     = 7340032,
+                    Start    = 2,
+                    Type     = "GEM"
+                },
+                new Partition
+                {
+                    Length   = 14336,
+                    Offset   = 7341056,
+                    Sequence = 1,
+                    Size     = 7340032,
+                    Start    = 14338,
+                    Type     = "GEM"
+                },
+                new Partition
+                {
+                    Length   = 14336,
+                    Offset   = 14681088,
+                    Sequence = 2,
+                    Size     = 7340032,
+                    Start    = 28674,
+                    Type     = "GEM"
+                },
+                new Partition
+                {
+                    Length   = 14334,
+                    Offset   = 22021120,
+                    Sequence = 3,
+                    Size     = 7339008,
+                    Start    = 43010,
+                    Type     = "GEM"
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/BSD.cs b/Aaru.Tests/Partitions/BSD.cs
index 07ecdf134..0f2c0df81 100644
--- a/Aaru.Tests/Partitions/BSD.cs
+++ b/Aaru.Tests/Partitions/BSD.cs
@@ -30,304 +30,303 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    [TestFixture]
-    public class Bsd : PartitionSchemeTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "BSD slices");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+[TestFixture]
+public class Bsd : PartitionSchemeTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "BSD slices");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "parted.aif",
+            Partitions = new[]
             {
-                TestFile = "parted.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 75776,
-                        Offset   = 1048576,
-                        Sequence = 0,
-                        Size     = 38797312,
-                        Start    = 2048,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 38912,
-                        Offset   = 40894464,
-                        Sequence = 1,
-                        Size     = 19922944,
-                        Start    = 79872,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 94208,
-                        Offset   = 61865984,
-                        Sequence = 2,
-                        Size     = 48234496,
-                        Start    = 120832,
-                        Type     = "FAT"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "netbsd_1.6.aif",
-                Partitions = new[]
+                    Length   = 75776,
+                    Offset   = 1048576,
+                    Sequence = 0,
+                    Size     = 38797312,
+                    Start    = 2048,
+                    Type     = "FAT"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 20417,
-                        Offset   = 516096,
-                        Sequence = 0,
-                        Size     = 10453504,
-                        Start    = 1008,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 409600,
-                        Offset   = 11354112,
-                        Sequence = 1,
-                        Size     = 209715200,
-                        Start    = 22176,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 1572864,
-                        Offset   = 221405184,
-                        Sequence = 2,
-                        Size     = 805306368,
-                        Start    = 432432,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 1460266,
-                        Offset   = 1027031040,
-                        Sequence = 3,
-                        Size     = 747656192,
-                        Start    = 2005920,
-                        Type     = "4.2BSD Fast File System"
-                    },
-                    new Partition
-                    {
-                        Length   = 524288,
-                        Offset   = 1774854144,
-                        Sequence = 4,
-                        Size     = 268435456,
-                        Start    = 3466512,
-                        Type     = "4.4LFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 202624,
-                        Offset   = 2043740160,
-                        Sequence = 5,
-                        Size     = 103743488,
-                        Start    = 3991680,
-                        Type     = "4.2BSD Fast File System"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "netbsd_6.1.5.aif",
-                Partitions = new[]
+                    Length   = 38912,
+                    Offset   = 40894464,
+                    Sequence = 1,
+                    Size     = 19922944,
+                    Start    = 79872,
+                    Type     = "FAT"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 20480,
-                        Offset   = 516096,
-                        Sequence = 0,
-                        Size     = 10485760,
-                        Start    = 1008,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 204800,
-                        Offset   = 11354112,
-                        Sequence = 1,
-                        Size     = 104857600,
-                        Start    = 22176,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 409600,
-                        Offset   = 116637696,
-                        Sequence = 2,
-                        Size     = 209715200,
-                        Start    = 227808,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 79632,
-                        Offset   = 326688768,
-                        Sequence = 3,
-                        Size     = 40771584,
-                        Start    = 638064,
-                        Type     = "4.2BSD Fast File System"
-                    },
-                    new Partition
-                    {
-                        Length   = 819200,
-                        Offset   = 367460352,
-                        Sequence = 4,
-                        Size     = 419430400,
-                        Start    = 717696,
-                        Type     = "4.2BSD Fast File System"
-                    },
-                    new Partition
-                    {
-                        Length   = 921600,
-                        Offset   = 787562496,
-                        Sequence = 5,
-                        Size     = 471859200,
-                        Start    = 1538208,
-                        Type     = "4.2BSD Fast File System"
-                    },
-                    new Partition
-                    {
-                        Length   = 153600,
-                        Offset   = 1259790336,
-                        Sequence = 6,
-                        Size     = 78643200,
-                        Start    = 2460528,
-                        Type     = "Hammer"
-                    },
-                    new Partition
-                    {
-                        Length   = 194560,
-                        Offset   = 1338753024,
-                        Sequence = 7,
-                        Size     = 99614720,
-                        Start    = 2614752,
-                        Type     = "UNIX 7th Edition"
-                    },
-                    new Partition
-                    {
-                        Length   = 477184,
-                        Offset   = 1438875648,
-                        Sequence = 8,
-                        Size     = 244318208,
-                        Start    = 2810304,
-                        Type     = "4.4LFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 906208,
-                        Offset   = 1683505152,
-                        Sequence = 9,
-                        Size     = 463978496,
-                        Start    = 3288096,
-                        Type     = "Digital LSM Public Region"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "netbsd_7.1.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 20160,
-                        Offset   = 516096,
-                        Sequence = 0,
-                        Size     = 10321920,
-                        Start    = 1008,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 204624,
-                        Offset   = 11354112,
-                        Sequence = 1,
-                        Size     = 104767488,
-                        Start    = 22176,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 409248,
-                        Offset   = 116637696,
-                        Sequence = 2,
-                        Size     = 209534976,
-                        Start    = 227808,
-                        Type     = "FAT"
-                    },
-                    new Partition
-                    {
-                        Length   = 78624,
-                        Offset   = 326688768,
-                        Sequence = 3,
-                        Size     = 40255488,
-                        Start    = 638064,
-                        Type     = "4.2BSD Fast File System"
-                    },
-                    new Partition
-                    {
-                        Length   = 818496,
-                        Offset   = 367460352,
-                        Sequence = 4,
-                        Size     = 419069952,
-                        Start    = 717696,
-                        Type     = "4.2BSD Fast File System"
-                    },
-                    new Partition
-                    {
-                        Length   = 921312,
-                        Offset   = 787562496,
-                        Sequence = 5,
-                        Size     = 471711744,
-                        Start    = 1538208,
-                        Type     = "4.2BSD Fast File System"
-                    },
-                    new Partition
-                    {
-                        Length   = 153216,
-                        Offset   = 1259790336,
-                        Sequence = 6,
-                        Size     = 78446592,
-                        Start    = 2460528,
-                        Type     = "Hammer"
-                    },
-                    new Partition
-                    {
-                        Length   = 194544,
-                        Offset   = 1338753024,
-                        Sequence = 7,
-                        Size     = 99606528,
-                        Start    = 2614752,
-                        Type     = "UNIX 7th Edition"
-                    },
-                    new Partition
-                    {
-                        Length   = 475776,
-                        Offset   = 1438875648,
-                        Sequence = 8,
-                        Size     = 243597312,
-                        Start    = 2810304,
-                        Type     = "4.4LFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 906192,
-                        Offset   = 1683505152,
-                        Sequence = 9,
-                        Size     = 463970304,
-                        Start    = 3288096,
-                        Type     = "Digital LSM Public Region"
-                    }
+                    Length   = 94208,
+                    Offset   = 61865984,
+                    Sequence = 2,
+                    Size     = 48234496,
+                    Start    = 120832,
+                    Type     = "FAT"
                 }
             }
-        };
-    }
+        },
+        new PartitionTest
+        {
+            TestFile = "netbsd_1.6.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 20417,
+                    Offset   = 516096,
+                    Sequence = 0,
+                    Size     = 10453504,
+                    Start    = 1008,
+                    Type     = "FAT"
+                },
+                new Partition
+                {
+                    Length   = 409600,
+                    Offset   = 11354112,
+                    Sequence = 1,
+                    Size     = 209715200,
+                    Start    = 22176,
+                    Type     = "FAT"
+                },
+                new Partition
+                {
+                    Length   = 1572864,
+                    Offset   = 221405184,
+                    Sequence = 2,
+                    Size     = 805306368,
+                    Start    = 432432,
+                    Type     = "FAT"
+                },
+                new Partition
+                {
+                    Length   = 1460266,
+                    Offset   = 1027031040,
+                    Sequence = 3,
+                    Size     = 747656192,
+                    Start    = 2005920,
+                    Type     = "4.2BSD Fast File System"
+                },
+                new Partition
+                {
+                    Length   = 524288,
+                    Offset   = 1774854144,
+                    Sequence = 4,
+                    Size     = 268435456,
+                    Start    = 3466512,
+                    Type     = "4.4LFS"
+                },
+                new Partition
+                {
+                    Length   = 202624,
+                    Offset   = 2043740160,
+                    Sequence = 5,
+                    Size     = 103743488,
+                    Start    = 3991680,
+                    Type     = "4.2BSD Fast File System"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "netbsd_6.1.5.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 20480,
+                    Offset   = 516096,
+                    Sequence = 0,
+                    Size     = 10485760,
+                    Start    = 1008,
+                    Type     = "FAT"
+                },
+                new Partition
+                {
+                    Length   = 204800,
+                    Offset   = 11354112,
+                    Sequence = 1,
+                    Size     = 104857600,
+                    Start    = 22176,
+                    Type     = "FAT"
+                },
+                new Partition
+                {
+                    Length   = 409600,
+                    Offset   = 116637696,
+                    Sequence = 2,
+                    Size     = 209715200,
+                    Start    = 227808,
+                    Type     = "FAT"
+                },
+                new Partition
+                {
+                    Length   = 79632,
+                    Offset   = 326688768,
+                    Sequence = 3,
+                    Size     = 40771584,
+                    Start    = 638064,
+                    Type     = "4.2BSD Fast File System"
+                },
+                new Partition
+                {
+                    Length   = 819200,
+                    Offset   = 367460352,
+                    Sequence = 4,
+                    Size     = 419430400,
+                    Start    = 717696,
+                    Type     = "4.2BSD Fast File System"
+                },
+                new Partition
+                {
+                    Length   = 921600,
+                    Offset   = 787562496,
+                    Sequence = 5,
+                    Size     = 471859200,
+                    Start    = 1538208,
+                    Type     = "4.2BSD Fast File System"
+                },
+                new Partition
+                {
+                    Length   = 153600,
+                    Offset   = 1259790336,
+                    Sequence = 6,
+                    Size     = 78643200,
+                    Start    = 2460528,
+                    Type     = "Hammer"
+                },
+                new Partition
+                {
+                    Length   = 194560,
+                    Offset   = 1338753024,
+                    Sequence = 7,
+                    Size     = 99614720,
+                    Start    = 2614752,
+                    Type     = "UNIX 7th Edition"
+                },
+                new Partition
+                {
+                    Length   = 477184,
+                    Offset   = 1438875648,
+                    Sequence = 8,
+                    Size     = 244318208,
+                    Start    = 2810304,
+                    Type     = "4.4LFS"
+                },
+                new Partition
+                {
+                    Length   = 906208,
+                    Offset   = 1683505152,
+                    Sequence = 9,
+                    Size     = 463978496,
+                    Start    = 3288096,
+                    Type     = "Digital LSM Public Region"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "netbsd_7.1.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 20160,
+                    Offset   = 516096,
+                    Sequence = 0,
+                    Size     = 10321920,
+                    Start    = 1008,
+                    Type     = "FAT"
+                },
+                new Partition
+                {
+                    Length   = 204624,
+                    Offset   = 11354112,
+                    Sequence = 1,
+                    Size     = 104767488,
+                    Start    = 22176,
+                    Type     = "FAT"
+                },
+                new Partition
+                {
+                    Length   = 409248,
+                    Offset   = 116637696,
+                    Sequence = 2,
+                    Size     = 209534976,
+                    Start    = 227808,
+                    Type     = "FAT"
+                },
+                new Partition
+                {
+                    Length   = 78624,
+                    Offset   = 326688768,
+                    Sequence = 3,
+                    Size     = 40255488,
+                    Start    = 638064,
+                    Type     = "4.2BSD Fast File System"
+                },
+                new Partition
+                {
+                    Length   = 818496,
+                    Offset   = 367460352,
+                    Sequence = 4,
+                    Size     = 419069952,
+                    Start    = 717696,
+                    Type     = "4.2BSD Fast File System"
+                },
+                new Partition
+                {
+                    Length   = 921312,
+                    Offset   = 787562496,
+                    Sequence = 5,
+                    Size     = 471711744,
+                    Start    = 1538208,
+                    Type     = "4.2BSD Fast File System"
+                },
+                new Partition
+                {
+                    Length   = 153216,
+                    Offset   = 1259790336,
+                    Sequence = 6,
+                    Size     = 78446592,
+                    Start    = 2460528,
+                    Type     = "Hammer"
+                },
+                new Partition
+                {
+                    Length   = 194544,
+                    Offset   = 1338753024,
+                    Sequence = 7,
+                    Size     = 99606528,
+                    Start    = 2614752,
+                    Type     = "UNIX 7th Edition"
+                },
+                new Partition
+                {
+                    Length   = 475776,
+                    Offset   = 1438875648,
+                    Sequence = 8,
+                    Size     = 243597312,
+                    Start    = 2810304,
+                    Type     = "4.4LFS"
+                },
+                new Partition
+                {
+                    Length   = 906192,
+                    Offset   = 1683505152,
+                    Sequence = 9,
+                    Size     = 463970304,
+                    Start    = 3288096,
+                    Type     = "Digital LSM Public Region"
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/GPT.cs b/Aaru.Tests/Partitions/GPT.cs
index 079224476..966244137 100644
--- a/Aaru.Tests/Partitions/GPT.cs
+++ b/Aaru.Tests/Partitions/GPT.cs
@@ -30,120 +30,119 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    [TestFixture]
-    public class Gpt : PartitionSchemeTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "GUID Partition Table");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+[TestFixture]
+public class Gpt : PartitionSchemeTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "GUID Partition Table");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "linux.aif",
+            Partitions = new[]
             {
-                TestFile = "linux.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 20480,
-                        Name     = "EFI System",
-                        Offset   = 1048576,
-                        Sequence = 0,
-                        Size     = 10485760,
-                        Start    = 2048,
-                        Type     = "EFI System"
-                    },
-                    new Partition
-                    {
-                        Length   = 30720,
-                        Name     = "Microsoft basic data",
-                        Offset   = 11534336,
-                        Sequence = 1,
-                        Size     = 15728640,
-                        Start    = 22528,
-                        Type     = "Microsoft Basic data"
-                    },
-                    new Partition
-                    {
-                        Length   = 40960,
-                        Name     = "Apple label",
-                        Offset   = 27262976,
-                        Sequence = 2,
-                        Size     = 20971520,
-                        Start    = 53248,
-                        Type     = "Apple Label"
-                    },
-                    new Partition
-                    {
-                        Length   = 51200,
-                        Name     = "Solaris /usr & Mac ZFS",
-                        Offset   = 48234496,
-                        Sequence = 3,
-                        Size     = 26214400,
-                        Start    = 94208,
-                        Type     = "Solaris /usr or Apple ZFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 61440,
-                        Name     = "FreeBSD ZFS",
-                        Offset   = 74448896,
-                        Sequence = 4,
-                        Size     = 31457280,
-                        Start    = 145408,
-                        Type     = "FreeBSD ZFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 55263,
-                        Name     = "HP-UX data",
-                        Offset   = 105906176,
-                        Sequence = 5,
-                        Size     = 28294656,
-                        Start    = 206848,
-                        Type     = "HP-UX Data"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "parted.aif",
-                Partitions = new[]
+                    Length   = 20480,
+                    Name     = "EFI System",
+                    Offset   = 1048576,
+                    Sequence = 0,
+                    Size     = 10485760,
+                    Start    = 2048,
+                    Type     = "EFI System"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 83968,
-                        Name     = "",
-                        Offset   = 1048576,
-                        Sequence = 0,
-                        Size     = 42991616,
-                        Start    = 2048,
-                        Type     = "Apple HFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Name     = "",
-                        Offset   = 44040192,
-                        Sequence = 1,
-                        Size     = 52428800,
-                        Start    = 86016,
-                        Type     = "Linux filesystem"
-                    },
-                    new Partition
-                    {
-                        Length   = 71680,
-                        Name     = "",
-                        Offset   = 96468992,
-                        Sequence = 2,
-                        Size     = 36700160,
-                        Start    = 188416,
-                        Type     = "Microsoft Basic data"
-                    }
+                    Length   = 30720,
+                    Name     = "Microsoft basic data",
+                    Offset   = 11534336,
+                    Sequence = 1,
+                    Size     = 15728640,
+                    Start    = 22528,
+                    Type     = "Microsoft Basic data"
+                },
+                new Partition
+                {
+                    Length   = 40960,
+                    Name     = "Apple label",
+                    Offset   = 27262976,
+                    Sequence = 2,
+                    Size     = 20971520,
+                    Start    = 53248,
+                    Type     = "Apple Label"
+                },
+                new Partition
+                {
+                    Length   = 51200,
+                    Name     = "Solaris /usr & Mac ZFS",
+                    Offset   = 48234496,
+                    Sequence = 3,
+                    Size     = 26214400,
+                    Start    = 94208,
+                    Type     = "Solaris /usr or Apple ZFS"
+                },
+                new Partition
+                {
+                    Length   = 61440,
+                    Name     = "FreeBSD ZFS",
+                    Offset   = 74448896,
+                    Sequence = 4,
+                    Size     = 31457280,
+                    Start    = 145408,
+                    Type     = "FreeBSD ZFS"
+                },
+                new Partition
+                {
+                    Length   = 55263,
+                    Name     = "HP-UX data",
+                    Offset   = 105906176,
+                    Sequence = 5,
+                    Size     = 28294656,
+                    Start    = 206848,
+                    Type     = "HP-UX Data"
                 }
             }
-        };
-    }
+        },
+        new PartitionTest
+        {
+            TestFile = "parted.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 83968,
+                    Name     = "",
+                    Offset   = 1048576,
+                    Sequence = 0,
+                    Size     = 42991616,
+                    Start    = 2048,
+                    Type     = "Apple HFS"
+                },
+                new Partition
+                {
+                    Length   = 102400,
+                    Name     = "",
+                    Offset   = 44040192,
+                    Sequence = 1,
+                    Size     = 52428800,
+                    Start    = 86016,
+                    Type     = "Linux filesystem"
+                },
+                new Partition
+                {
+                    Length   = 71680,
+                    Name     = "",
+                    Offset   = 96468992,
+                    Sequence = 2,
+                    Size     = 36700160,
+                    Start    = 188416,
+                    Type     = "Microsoft Basic data"
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/MBR.cs b/Aaru.Tests/Partitions/MBR.cs
index 42754cdea..5177cffa2 100644
--- a/Aaru.Tests/Partitions/MBR.cs
+++ b/Aaru.Tests/Partitions/MBR.cs
@@ -30,2023 +30,2022 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    [TestFixture]
-    public class Mbr : PartitionSchemeTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Master Boot Record");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+[TestFixture]
+public class Mbr : PartitionSchemeTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Master Boot Record");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "concurrentdos_6.0.aif",
+            Partitions = new[]
             {
-                TestFile = "concurrentdos_6.0.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 100800,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 1008,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 99792,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 102816,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 100800,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 202608,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 303408,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 352800,
-                        Type     = "0x04"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "darwin_1.4.1.aif",
-                Partitions = new[]
+                    Length   = 100800,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 1008,
+                    Type     = "0x04"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 409248,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 409248,
-                        Type     = "0x07"
-                    },
-                    new Partition
-                    {
-                        Length   = 204624,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 818496,
-                        Type     = "0xA8"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "darwin_6.0.2.aif",
-                Partitions = new[]
+                    Length   = 99792,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 102816,
+                    Type     = "0x04"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 204561,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0xA8"
-                    },
-                    new Partition
-                    {
-                        Length   = 81648,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 204624,
-                        Type     = "0xAB"
-                    },
-                    new Partition
-                    {
-                        Length   = 245952,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 286272,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 488880,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 532224,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "darwin_8.0.1.aif",
-                Partitions = new[]
+                    Length   = 100800,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 202608,
+                    Type     = "0x04"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 150000,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 176000,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 150063,
-                        Type     = "0xAF"
-                    },
-                    new Partition
-                    {
-                        Length   = 350000,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 326063,
-                        Type     = "0xA8"
-                    },
-                    new Partition
-                    {
-                        Length   = 347937,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 676063,
-                        Type     = "0x0C"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "drdos_3.40.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 100800,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 1008,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 402129,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 101871,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 152145,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 504063,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 365841,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 656271,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "drdos_3.41.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 126945,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 124929,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 127071,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 101745,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 252063,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 668241,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 353871,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "drdos_5.00.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 128016,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 124992,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 99729,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 253071,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 100737,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 352863,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 313425,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 453663,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 254961,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 767151,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "drdos_6.00.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 101745,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 18081,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 102879,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 130977,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 121023,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 202545,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 252063,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 567441,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 454671,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "drdos_7.02.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 102753,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 307377,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 102879,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 384993,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 410319,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 17073,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 795375,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 209601,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 812511,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "drdos_7.03.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 202545,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 141057,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 202671,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 152145,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 352863,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 364833,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 505071,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 152145,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 869967,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "drdos_8.0.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 205569,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 138033,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 205695,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 303345,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 352863,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 249921,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 656271,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 115857,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 906255,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "linux.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 20480,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 2048,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 40960,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 22528,
-                        Type     = "0x24"
-                    },
-                    new Partition
-                    {
-                        Length   = 61440,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 65536,
-                        Type     = "0xA7"
-                    },
-                    new Partition
-                    {
-                        Length   = 81920,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 129024,
-                        Type     = "0x42"
-                    },
-                    new Partition
-                    {
-                        Length   = 49152,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 212992,
-                        Type     = "0x83"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macosx_10.3.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 204800,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 8,
-                        Type     = "0xA8"
-                    },
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 204816,
-                        Type     = "0xAF"
-                    },
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 307224,
-                        Type     = "0x0B"
-                    },
-                    new Partition
-                    {
-                        Length   = 204800,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 409632,
-                        Type     = "0xAF"
-                    },
-                    new Partition
-                    {
-                        Length   = 204800,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 614440,
-                        Type     = "0xAF"
-                    },
-                    new Partition
-                    {
-                        Length   = 204752,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 819248,
-                        Type     = "0xAF"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "macosx_10.4.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0xAF"
-                    },
-                    new Partition
-                    {
-                        Length   = 204800,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 102501,
-                        Type     = "0xAF"
-                    },
-                    new Partition
-                    {
-                        Length   = 204800,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 307314,
-                        Type     = "0x0B"
-                    },
-                    new Partition
-                    {
-                        Length   = 204800,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 512127,
-                        Type     = "0xA8"
-                    },
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 716940,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 204622,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 819378,
-                        Type     = "0xAF"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "msdos_3.30a.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 65583,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 131103,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 196623,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 262143,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 327663,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 393183,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 7,
-                        Size     = 0,
-                        Start    = 458703,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 8,
-                        Size     = 0,
-                        Start    = 524223,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 9,
-                        Size     = 0,
-                        Start    = 589743,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 10,
-                        Size     = 0,
-                        Start    = 655263,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 11,
-                        Size     = 0,
-                        Start    = 720783,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 12,
-                        Size     = 0,
-                        Start    = 786303,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 13,
-                        Size     = 0,
-                        Start    = 851823,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 14,
-                        Size     = 0,
-                        Start    = 917343,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 39249,
-                        Offset   = 0,
-                        Sequence = 15,
-                        Size     = 0,
-                        Start    = 982863,
-                        Type     = "0x04"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "msdos_5.00.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 102753,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 31185,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 102879,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 41265,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 134127,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 51345,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 175455,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 61425,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 226863,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 72513,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 288351,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 82593,
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 360927,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 92673,
-                        Offset   = 0,
-                        Sequence = 7,
-                        Size     = 0,
-                        Start    = 443583,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 102753,
-                        Offset   = 0,
-                        Sequence = 8,
-                        Size     = 0,
-                        Start    = 536319,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 112833,
-                        Offset   = 0,
-                        Sequence = 9,
-                        Size     = 0,
-                        Start    = 639135,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 122913,
-                        Offset   = 0,
-                        Sequence = 10,
-                        Size     = 0,
-                        Start    = 752031,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 134001,
-                        Offset   = 0,
-                        Sequence = 11,
-                        Size     = 0,
-                        Start    = 875007,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 13041,
-                        Offset   = 0,
-                        Sequence = 12,
-                        Size     = 0,
-                        Start    = 1009071,
-                        Type     = "0x01"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "msdos_6.00.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 51345,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 72513,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 51471,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 92673,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 124047,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 112833,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 216783,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 134001,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 329679,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 154161,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 463743,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 178353,
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 617967,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 184401,
-                        Offset   = 0,
-                        Sequence = 7,
-                        Size     = 0,
-                        Start    = 796383,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 41265,
-                        Offset   = 0,
-                        Sequence = 8,
-                        Size     = 0,
-                        Start    = 980847,
-                        Type     = "0x04"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "msdos_6.20.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 205569,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 225729,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 205695,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 245889,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 431487,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 267057,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 677439,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 61425,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 944559,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 16065,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 1006047,
-                        Type     = "0x01"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "msdos_6.21.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 205569,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 225729,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 205695,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 245889,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 431487,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 267057,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 677439,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 51345,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 944559,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 6993,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 995967,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 19089,
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 1003023,
-                        Type     = "0x01"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "msdos_6.22.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 245889,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 205569,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 246015,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 307377,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 451647,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 225729,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 759087,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 37233,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 984879,
-                        Type     = "0x04"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "multiuserdos_7.22r04.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 152145,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 99729,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 152271,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 202545,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 252063,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 1953,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 454671,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 565425,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 456687,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "novelldos_7.00.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 252945,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 4977,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 253071,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 202545,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 352863,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 348705,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 555471,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 117873,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 904239,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "opendos_7.01.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 307377,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 4977,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 307503,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 40257,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 312543,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 202545,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 352863,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 466641,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 555471,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "parted.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 67584,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 4096,
-                        Type     = "0x83"
-                    },
-                    new Partition
-                    {
-                        Length   = 59392,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 73728,
-                        Type     = "0x07"
-                    },
-                    new Partition
-                    {
-                        Length   = 129024,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 133120,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "pcdos_2000.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 205569,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 225729,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 205695,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 245889,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 431487,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 287217,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 677439,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 57393,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 964719,
-                        Type     = "0x04"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "pcdos_2.00.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 1022111,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 1,
-                        Type     = "0x01"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "pcdos_2.10.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 1022111,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 1,
-                        Type     = "0x01"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "pcdos_3.00.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 66465,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x01"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "pcdos_3.10.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 66465,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x01"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "pcdos_3.30.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 65583,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 131103,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 196623,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 262143,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 327663,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 393183,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 7,
-                        Size     = 0,
-                        Start    = 458703,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 8,
-                        Size     = 0,
-                        Start    = 524223,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 9,
-                        Size     = 0,
-                        Start    = 589743,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 10,
-                        Size     = 0,
-                        Start    = 655263,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 11,
-                        Size     = 0,
-                        Start    = 720783,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 12,
-                        Size     = 0,
-                        Start    = 786303,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 13,
-                        Size     = 0,
-                        Start    = 851823,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 65457,
-                        Offset   = 0,
-                        Sequence = 14,
-                        Size     = 0,
-                        Start    = 917343,
-                        Type     = "0x04"
-                    },
-                    new Partition
-                    {
-                        Length   = 39249,
-                        Offset   = 0,
-                        Sequence = 15,
-                        Size     = 0,
-                        Start    = 982863,
-                        Type     = "0x04"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "pcdos_4.00.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 205569,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 25137,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 205695,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 245889,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 230895,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 307377,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 476847,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 237825,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 784287,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "pcdos_5.00.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 205569,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 25137,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 205695,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 245889,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 230895,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 287217,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 476847,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 257985,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 764127,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "pcdos_6.10.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 205569,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 25137,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 205695,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 225729,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 230895,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 245889,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 456687,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 319473,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 702639,
-                        Type     = "0x06"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "win95.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 205569,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 245889,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 205695,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 267057,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 451647,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 287217,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 718767,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 17073,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 1006047,
-                        Type     = "0x01"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "win96osr25.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 307377,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 245889,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 307503,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 328545,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 553455,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 102753,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 882063,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 21105,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 984879,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 17073,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 1006047,
-                        Type     = "0x01"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "winnt_3.10.aif",
-                Partitions = new[]
-                {
-                    new Partition
-                    {
-                        Length   = 204561,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "0x07"
-                    },
-                    new Partition
-                    {
-                        Length   = 307377,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 204687,
-                        Type     = "0x07"
-                    },
-                    new Partition
-                    {
-                        Length   = 224721,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 512127,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 214641,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 736911,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 10017,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 951615,
-                        Type     = "0x01"
-                    },
-                    new Partition
-                    {
-                        Length   = 60480,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 962640,
-                        Type     = "0x07"
-                    }
+                    Length   = 303408,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 352800,
+                    Type     = "0x04"
                 }
             }
-        };
-    }
+        },
+        new PartitionTest
+        {
+            TestFile = "darwin_1.4.1.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 409248,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 409248,
+                    Type     = "0x07"
+                },
+                new Partition
+                {
+                    Length   = 204624,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 818496,
+                    Type     = "0xA8"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "darwin_6.0.2.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 204561,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0xA8"
+                },
+                new Partition
+                {
+                    Length   = 81648,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 204624,
+                    Type     = "0xAB"
+                },
+                new Partition
+                {
+                    Length   = 245952,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 286272,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 488880,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 532224,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "darwin_8.0.1.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 150000,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 176000,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 150063,
+                    Type     = "0xAF"
+                },
+                new Partition
+                {
+                    Length   = 350000,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 326063,
+                    Type     = "0xA8"
+                },
+                new Partition
+                {
+                    Length   = 347937,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 676063,
+                    Type     = "0x0C"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "drdos_3.40.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 100800,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 1008,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 402129,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 101871,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 152145,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 504063,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 365841,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 656271,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "drdos_3.41.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 126945,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 124929,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 127071,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 101745,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 252063,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 668241,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 353871,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "drdos_5.00.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 128016,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 124992,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 99729,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 253071,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 100737,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 352863,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 313425,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 453663,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 254961,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 767151,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "drdos_6.00.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 101745,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 18081,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 102879,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 130977,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 121023,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 202545,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 252063,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 567441,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 454671,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "drdos_7.02.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 102753,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 307377,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 102879,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 384993,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 410319,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 17073,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 795375,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 209601,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 812511,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "drdos_7.03.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 202545,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 141057,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 202671,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 152145,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 352863,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 364833,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 505071,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 152145,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 869967,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "drdos_8.0.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 205569,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 138033,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 205695,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 303345,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 352863,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 249921,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 656271,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 115857,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 906255,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "linux.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 20480,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 2048,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 40960,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 22528,
+                    Type     = "0x24"
+                },
+                new Partition
+                {
+                    Length   = 61440,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 65536,
+                    Type     = "0xA7"
+                },
+                new Partition
+                {
+                    Length   = 81920,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 129024,
+                    Type     = "0x42"
+                },
+                new Partition
+                {
+                    Length   = 49152,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 212992,
+                    Type     = "0x83"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macosx_10.3.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 204800,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 8,
+                    Type     = "0xA8"
+                },
+                new Partition
+                {
+                    Length   = 102400,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 204816,
+                    Type     = "0xAF"
+                },
+                new Partition
+                {
+                    Length   = 102400,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 307224,
+                    Type     = "0x0B"
+                },
+                new Partition
+                {
+                    Length   = 204800,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 409632,
+                    Type     = "0xAF"
+                },
+                new Partition
+                {
+                    Length   = 204800,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 614440,
+                    Type     = "0xAF"
+                },
+                new Partition
+                {
+                    Length   = 204752,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 819248,
+                    Type     = "0xAF"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "macosx_10.4.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 102400,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0xAF"
+                },
+                new Partition
+                {
+                    Length   = 204800,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 102501,
+                    Type     = "0xAF"
+                },
+                new Partition
+                {
+                    Length   = 204800,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 307314,
+                    Type     = "0x0B"
+                },
+                new Partition
+                {
+                    Length   = 204800,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 512127,
+                    Type     = "0xA8"
+                },
+                new Partition
+                {
+                    Length   = 102400,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 716940,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 204622,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 819378,
+                    Type     = "0xAF"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "msdos_3.30a.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 65583,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 131103,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 196623,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 262143,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 327663,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 393183,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 7,
+                    Size     = 0,
+                    Start    = 458703,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 8,
+                    Size     = 0,
+                    Start    = 524223,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 9,
+                    Size     = 0,
+                    Start    = 589743,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 10,
+                    Size     = 0,
+                    Start    = 655263,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 11,
+                    Size     = 0,
+                    Start    = 720783,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 12,
+                    Size     = 0,
+                    Start    = 786303,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 13,
+                    Size     = 0,
+                    Start    = 851823,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 14,
+                    Size     = 0,
+                    Start    = 917343,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 39249,
+                    Offset   = 0,
+                    Sequence = 15,
+                    Size     = 0,
+                    Start    = 982863,
+                    Type     = "0x04"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "msdos_5.00.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 102753,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 31185,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 102879,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 41265,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 134127,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 51345,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 175455,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 61425,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 226863,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 72513,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 288351,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 82593,
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 360927,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 92673,
+                    Offset   = 0,
+                    Sequence = 7,
+                    Size     = 0,
+                    Start    = 443583,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 102753,
+                    Offset   = 0,
+                    Sequence = 8,
+                    Size     = 0,
+                    Start    = 536319,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 112833,
+                    Offset   = 0,
+                    Sequence = 9,
+                    Size     = 0,
+                    Start    = 639135,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 122913,
+                    Offset   = 0,
+                    Sequence = 10,
+                    Size     = 0,
+                    Start    = 752031,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 134001,
+                    Offset   = 0,
+                    Sequence = 11,
+                    Size     = 0,
+                    Start    = 875007,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 13041,
+                    Offset   = 0,
+                    Sequence = 12,
+                    Size     = 0,
+                    Start    = 1009071,
+                    Type     = "0x01"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "msdos_6.00.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 51345,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 72513,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 51471,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 92673,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 124047,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 112833,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 216783,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 134001,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 329679,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 154161,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 463743,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 178353,
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 617967,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 184401,
+                    Offset   = 0,
+                    Sequence = 7,
+                    Size     = 0,
+                    Start    = 796383,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 41265,
+                    Offset   = 0,
+                    Sequence = 8,
+                    Size     = 0,
+                    Start    = 980847,
+                    Type     = "0x04"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "msdos_6.20.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 205569,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 225729,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 205695,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 245889,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 431487,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 267057,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 677439,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 61425,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 944559,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 16065,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 1006047,
+                    Type     = "0x01"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "msdos_6.21.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 205569,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 225729,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 205695,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 245889,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 431487,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 267057,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 677439,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 51345,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 944559,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 6993,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 995967,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 19089,
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 1003023,
+                    Type     = "0x01"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "msdos_6.22.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 245889,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 205569,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 246015,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 307377,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 451647,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 225729,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 759087,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 37233,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 984879,
+                    Type     = "0x04"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "multiuserdos_7.22r04.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 152145,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 99729,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 152271,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 202545,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 252063,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 1953,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 454671,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 565425,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 456687,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "novelldos_7.00.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 252945,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 4977,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 253071,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 202545,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 352863,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 348705,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 555471,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 117873,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 904239,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "opendos_7.01.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 307377,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 4977,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 307503,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 40257,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 312543,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 202545,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 352863,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 466641,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 555471,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "parted.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 67584,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 4096,
+                    Type     = "0x83"
+                },
+                new Partition
+                {
+                    Length   = 59392,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 73728,
+                    Type     = "0x07"
+                },
+                new Partition
+                {
+                    Length   = 129024,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 133120,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "pcdos_2000.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 205569,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 225729,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 205695,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 245889,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 431487,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 287217,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 677439,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 57393,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 964719,
+                    Type     = "0x04"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "pcdos_2.00.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 1022111,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 1,
+                    Type     = "0x01"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "pcdos_2.10.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 1022111,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 1,
+                    Type     = "0x01"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "pcdos_3.00.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 66465,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x01"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "pcdos_3.10.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 66465,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x01"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "pcdos_3.30.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 65583,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 131103,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 196623,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 262143,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 327663,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 393183,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 7,
+                    Size     = 0,
+                    Start    = 458703,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 8,
+                    Size     = 0,
+                    Start    = 524223,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 9,
+                    Size     = 0,
+                    Start    = 589743,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 10,
+                    Size     = 0,
+                    Start    = 655263,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 11,
+                    Size     = 0,
+                    Start    = 720783,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 12,
+                    Size     = 0,
+                    Start    = 786303,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 13,
+                    Size     = 0,
+                    Start    = 851823,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 65457,
+                    Offset   = 0,
+                    Sequence = 14,
+                    Size     = 0,
+                    Start    = 917343,
+                    Type     = "0x04"
+                },
+                new Partition
+                {
+                    Length   = 39249,
+                    Offset   = 0,
+                    Sequence = 15,
+                    Size     = 0,
+                    Start    = 982863,
+                    Type     = "0x04"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "pcdos_4.00.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 205569,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 25137,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 205695,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 245889,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 230895,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 307377,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 476847,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 237825,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 784287,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "pcdos_5.00.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 205569,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 25137,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 205695,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 245889,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 230895,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 287217,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 476847,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 257985,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 764127,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "pcdos_6.10.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 205569,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 25137,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 205695,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 225729,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 230895,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 245889,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 456687,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 319473,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 702639,
+                    Type     = "0x06"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "win95.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 205569,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 245889,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 205695,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 267057,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 451647,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 287217,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 718767,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 17073,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 1006047,
+                    Type     = "0x01"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "win96osr25.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 307377,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 245889,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 307503,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 328545,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 553455,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 102753,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 882063,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 21105,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 984879,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 17073,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 1006047,
+                    Type     = "0x01"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "winnt_3.10.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 204561,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "0x07"
+                },
+                new Partition
+                {
+                    Length   = 307377,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 204687,
+                    Type     = "0x07"
+                },
+                new Partition
+                {
+                    Length   = 224721,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 512127,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 214641,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 736911,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 10017,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 951615,
+                    Type     = "0x01"
+                },
+                new Partition
+                {
+                    Length   = 60480,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 962640,
+                    Type     = "0x07"
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/MINIX.cs b/Aaru.Tests/Partitions/MINIX.cs
index 80741d175..6f45930a5 100644
--- a/Aaru.Tests/Partitions/MINIX.cs
+++ b/Aaru.Tests/Partitions/MINIX.cs
@@ -30,62 +30,61 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    [TestFixture]
-    public class Minix : PartitionSchemeTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "MINIX");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+[TestFixture]
+public class Minix : PartitionSchemeTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "MINIX");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "minix_3.1.2a.aif",
+            Partitions = new[]
             {
-                TestFile = "minix_3.1.2a.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 524159,
-                        Name     = "MINIX",
-                        Offset   = 2064896,
-                        Sequence = 0,
-                        Size     = 268369408,
-                        Start    = 4033,
-                        Type     = "MINIX"
-                    },
-                    new Partition
-                    {
-                        Length   = 528192,
-                        Name     = "MINIX",
-                        Offset   = 270434304,
-                        Sequence = 1,
-                        Size     = 270434304,
-                        Start    = 528192,
-                        Type     = "MINIX"
-                    },
-                    new Partition
-                    {
-                        Length   = 528192,
-                        Name     = "MINIX",
-                        Offset   = 540868608,
-                        Sequence = 2,
-                        Size     = 270434304,
-                        Start    = 1056384,
-                        Type     = "MINIX"
-                    },
-                    new Partition
-                    {
-                        Length   = 512064,
-                        Name     = "MINIX",
-                        Offset   = 811302912,
-                        Sequence = 3,
-                        Size     = 262176768,
-                        Start    = 1584576,
-                        Type     = "MINIX"
-                    }
+                    Length   = 524159,
+                    Name     = "MINIX",
+                    Offset   = 2064896,
+                    Sequence = 0,
+                    Size     = 268369408,
+                    Start    = 4033,
+                    Type     = "MINIX"
+                },
+                new Partition
+                {
+                    Length   = 528192,
+                    Name     = "MINIX",
+                    Offset   = 270434304,
+                    Sequence = 1,
+                    Size     = 270434304,
+                    Start    = 528192,
+                    Type     = "MINIX"
+                },
+                new Partition
+                {
+                    Length   = 528192,
+                    Name     = "MINIX",
+                    Offset   = 540868608,
+                    Sequence = 2,
+                    Size     = 270434304,
+                    Start    = 1056384,
+                    Type     = "MINIX"
+                },
+                new Partition
+                {
+                    Length   = 512064,
+                    Name     = "MINIX",
+                    Offset   = 811302912,
+                    Sequence = 3,
+                    Size     = 262176768,
+                    Start    = 1584576,
+                    Type     = "MINIX"
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/PC98.cs b/Aaru.Tests/Partitions/PC98.cs
index 827ab97a9..387dde65b 100644
--- a/Aaru.Tests/Partitions/PC98.cs
+++ b/Aaru.Tests/Partitions/PC98.cs
@@ -30,390 +30,389 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    [TestFixture]
-    public class Pc98 : PartitionSchemeTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "PC-98");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+[TestFixture]
+public class Pc98 : PartitionSchemeTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "PC-98");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "msdos330.aif",
+            Partitions = new[]
             {
-                TestFile = "msdos330.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 19536,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 264,
-                        Type     = "FAT12"
-                    },
-                    new Partition
-                    {
-                        Length   = 39336,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 20064,
-                        Type     = "FAT12"
-                    },
-                    new Partition
-                    {
-                        Length   = 59136,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 59664,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 78936,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 119064,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 118536,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 198264,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 197736,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 317064,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 237336,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 515064,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 245256,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 7,
-                        Size     = 0,
-                        Start    = 752664,
-                        Type     = "FAT16"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "msdos330_alt.aif",
-                Partitions = new[]
+                    Length   = 19536,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 264,
+                    Type     = "FAT12"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 59136,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 264,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 158136,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 59664,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 94776,
-                        Name     = "MS-DOS 3.30",
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 218064,
-                        Type     = "FAT16"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "msdos500_epson.aif",
-                Partitions = new[]
+                    Length   = 39336,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 20064,
+                    Type     = "FAT12"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 35639,
-                        Name     = "NamenameName",
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 264,
-                        Type     = "FAT12"
-                    },
-                    new Partition
-                    {
-                        Length   = 59399,
-                        Name     = "12BitFAT",
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 35904,
-                        Type     = "FAT12"
-                    },
-                    new Partition
-                    {
-                        Length   = 79199,
-                        Name     = "16BitFAT",
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 95304,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 118799,
-                        Name     = "PartLblMaxNameXX",
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 174504,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 158399,
-                        Name     = "BigFAT12",
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 293304,
-                        Type     = "FAT12"
-                    },
-                    new Partition
-                    {
-                        Length   = 197999,
-                        Name     = "Lalalalalalalala",
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 451704,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 237599,
-                        Name     = "MS-DOS Ver 5.0",
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 649704,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 118799,
-                        Name     = "MS-DOS Ver 5.0",
-                        Offset   = 0,
-                        Sequence = 7,
-                        Size     = 0,
-                        Start    = 887304,
-                        Type     = "FAT16"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "msdos500.aif",
-                Partitions = new[]
+                    Length   = 59136,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 59664,
+                    Type     = "FAT16"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 28512,
-                        Name     = "MS-DOS 5.00",
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 264,
-                        Type     = "FAT12"
-                    },
-                    new Partition
-                    {
-                        Length   = 49104,
-                        Name     = "MS-DOS 5.00",
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 29040,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 93984,
-                        Name     = "MS-DOS 5.00",
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 78408,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 122760,
-                        Name     = "MS-DOS 5.00",
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 172656,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 163680,
-                        Name     = "MS-DOS 5.00",
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 295680,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 204600,
-                        Name     = "MS-DOS 5.00",
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 459624,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 204600,
-                        Name     = "MS-DOS 5.00",
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 664488,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 139128,
-                        Name     = "MS-DOS 5.00",
-                        Offset   = 0,
-                        Sequence = 7,
-                        Size     = 0,
-                        Start    = 869352,
-                        Type     = "FAT16"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "msdos620.aif",
-                Partitions = new[]
+                    Length   = 78936,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 119064,
+                    Type     = "FAT16"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 61248,
-                        Name     = "MS-DOS 6.20",
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 264,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 81840,
-                        Name     = "MS-DOS 6.20",
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 61776,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 122760,
-                        Name     = "MS-DOS 6.20",
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 143880,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 163680,
-                        Name     = "MS-DOS 6.20",
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 266904,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 20328,
-                        Name     = "MS-DOS 6.20",
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 430848,
-                        Type     = "FAT12"
-                    },
-                    new Partition
-                    {
-                        Length   = 245520,
-                        Name     = "MS-DOS 6.20",
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 451440,
-                        Type     = "FAT16"
-                    },
-                    new Partition
-                    {
-                        Length   = 315216,
-                        Name     = "MS-DOS 6.20",
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 697224,
-                        Type     = "FAT16"
-                    }
+                    Length   = 118536,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 198264,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 197736,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 317064,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 237336,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 515064,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 245256,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 7,
+                    Size     = 0,
+                    Start    = 752664,
+                    Type     = "FAT16"
                 }
             }
-        };
-    }
+        },
+        new PartitionTest
+        {
+            TestFile = "msdos330_alt.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 59136,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 264,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 158136,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 59664,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 94776,
+                    Name     = "MS-DOS 3.30",
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 218064,
+                    Type     = "FAT16"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "msdos500_epson.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 35639,
+                    Name     = "NamenameName",
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 264,
+                    Type     = "FAT12"
+                },
+                new Partition
+                {
+                    Length   = 59399,
+                    Name     = "12BitFAT",
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 35904,
+                    Type     = "FAT12"
+                },
+                new Partition
+                {
+                    Length   = 79199,
+                    Name     = "16BitFAT",
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 95304,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 118799,
+                    Name     = "PartLblMaxNameXX",
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 174504,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 158399,
+                    Name     = "BigFAT12",
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 293304,
+                    Type     = "FAT12"
+                },
+                new Partition
+                {
+                    Length   = 197999,
+                    Name     = "Lalalalalalalala",
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 451704,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 237599,
+                    Name     = "MS-DOS Ver 5.0",
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 649704,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 118799,
+                    Name     = "MS-DOS Ver 5.0",
+                    Offset   = 0,
+                    Sequence = 7,
+                    Size     = 0,
+                    Start    = 887304,
+                    Type     = "FAT16"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "msdos500.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 28512,
+                    Name     = "MS-DOS 5.00",
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 264,
+                    Type     = "FAT12"
+                },
+                new Partition
+                {
+                    Length   = 49104,
+                    Name     = "MS-DOS 5.00",
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 29040,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 93984,
+                    Name     = "MS-DOS 5.00",
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 78408,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 122760,
+                    Name     = "MS-DOS 5.00",
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 172656,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 163680,
+                    Name     = "MS-DOS 5.00",
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 295680,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 204600,
+                    Name     = "MS-DOS 5.00",
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 459624,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 204600,
+                    Name     = "MS-DOS 5.00",
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 664488,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 139128,
+                    Name     = "MS-DOS 5.00",
+                    Offset   = 0,
+                    Sequence = 7,
+                    Size     = 0,
+                    Start    = 869352,
+                    Type     = "FAT16"
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "msdos620.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 61248,
+                    Name     = "MS-DOS 6.20",
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 264,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 81840,
+                    Name     = "MS-DOS 6.20",
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 61776,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 122760,
+                    Name     = "MS-DOS 6.20",
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 143880,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 163680,
+                    Name     = "MS-DOS 6.20",
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 266904,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 20328,
+                    Name     = "MS-DOS 6.20",
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 430848,
+                    Type     = "FAT12"
+                },
+                new Partition
+                {
+                    Length   = 245520,
+                    Name     = "MS-DOS 6.20",
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 451440,
+                    Type     = "FAT16"
+                },
+                new Partition
+                {
+                    Length   = 315216,
+                    Name     = "MS-DOS 6.20",
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 697224,
+                    Type     = "FAT16"
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/PartitionSchemeTest.cs b/Aaru.Tests/Partitions/PartitionSchemeTest.cs
index 4e5d7032d..ff530b499 100644
--- a/Aaru.Tests/Partitions/PartitionSchemeTest.cs
+++ b/Aaru.Tests/Partitions/PartitionSchemeTest.cs
@@ -8,44 +8,43 @@ using Aaru.Core;
 using FluentAssertions;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
+namespace Aaru.Tests.Partitions;
+
+public abstract class PartitionSchemeTest
 {
-    public abstract class PartitionSchemeTest
+    public abstract string          DataFolder { get; }
+    public abstract PartitionTest[] Tests      { get; }
+
+    [Test]
+    public void Test()
     {
-        public abstract string          DataFolder { get; }
-        public abstract PartitionTest[] Tests      { get; }
-
-        [Test]
-        public void Test()
+        foreach(PartitionTest test in Tests)
         {
-            foreach(PartitionTest test in Tests)
-            {
-                string testFile = test.TestFile;
-                Environment.CurrentDirectory = DataFolder;
+            string testFile = test.TestFile;
+            Environment.CurrentDirectory = DataFolder;
 
-                bool exists = File.Exists(testFile);
-                Assert.True(exists, $"{testFile} not found");
+            bool exists = File.Exists(testFile);
+            Assert.True(exists, $"{testFile} not found");
 
-                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                // It arrives here...
-                if(!exists)
-                    continue;
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+            // It arrives here...
+            if(!exists)
+                continue;
 
-                var     filtersList = new FiltersList();
-                IFilter inputFilter = filtersList.GetFilter(testFile);
+            var     filtersList = new FiltersList();
+            IFilter inputFilter = filtersList.GetFilter(testFile);
 
-                Assert.IsNotNull(inputFilter, $"Filter: {testFile}");
+            Assert.IsNotNull(inputFilter, $"Filter: {testFile}");
 
-                IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
+            IMediaImage image = ImageFormat.Detect(inputFilter) as IMediaImage;
 
-                Assert.IsNotNull(image, $"Image format: {testFile}");
+            Assert.IsNotNull(image, $"Image format: {testFile}");
 
-                Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), $"Cannot open image for {testFile}");
+            Assert.AreEqual(ErrorNumber.NoError, image.Open(inputFilter), $"Cannot open image for {testFile}");
 
-                List<Partition> partitions = Core.Partitions.GetAll(image);
+            List<Partition> partitions = Core.Partitions.GetAll(image);
 
-                partitions.Should().BeEquivalentTo(test.Partitions, $"Partitions: {testFile}");
-            }
+            partitions.Should().BeEquivalentTo(test.Partitions, $"Partitions: {testFile}");
         }
     }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/RDB.cs b/Aaru.Tests/Partitions/RDB.cs
index 94562cd54..5b4820efb 100644
--- a/Aaru.Tests/Partitions/RDB.cs
+++ b/Aaru.Tests/Partitions/RDB.cs
@@ -30,187 +30,186 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    [TestFixture]
-    public class Rdb : PartitionSchemeTest
-    {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Rigid Disk Block");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+[TestFixture]
+public class Rdb : PartitionSchemeTest
+{
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Rigid Disk Block");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "amigaos_3.9.aif",
+            Partitions = new[]
             {
-                TestFile = "amigaos_3.9.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 170688,
-                        Name     = "UDH0",
-                        Offset   = 2080768,
-                        Sequence = 0,
-                        Size     = 87392256,
-                        Start    = 4064,
-                        Type     = "\"DOS\\0\""
-                    },
-                    new Partition
-                    {
-                        Length   = 170688,
-                        Name     = "UDH1",
-                        Offset   = 89473024,
-                        Sequence = 1,
-                        Size     = 87392256,
-                        Start    = 174752,
-                        Type     = "\"DOS\\2\""
-                    },
-                    new Partition
-                    {
-                        Length   = 170688,
-                        Name     = "UDH2",
-                        Offset   = 176865280,
-                        Sequence = 2,
-                        Size     = 87392256,
-                        Start    = 345440,
-                        Type     = "\"DOS\\1\""
-                    },
-                    new Partition
-                    {
-                        Length   = 170688,
-                        Name     = "UDH3",
-                        Offset   = 264257536,
-                        Sequence = 3,
-                        Size     = 87392256,
-                        Start    = 516128,
-                        Type     = "\"DOS\\3\""
-                    },
-                    new Partition
-                    {
-                        Length   = 170508,
-                        Name     = "FAT16",
-                        Offset   = 351663104,
-                        Sequence = 4,
-                        Size     = 87300096,
-                        Start    = 686842,
-                        Type     = "0x06"
-                    },
-                    new Partition
-                    {
-                        Length   = 166624,
-                        Name     = "UDH5",
-                        Offset   = 439042048,
-                        Sequence = 5,
-                        Size     = 85311488,
-                        Start    = 857504,
-                        Type     = "\"RES\\86\""
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "amigaos_4.0.aif",
-                Partitions = new[]
+                    Length   = 170688,
+                    Name     = "UDH0",
+                    Offset   = 2080768,
+                    Sequence = 0,
+                    Size     = 87392256,
+                    Start    = 4064,
+                    Type     = "\"DOS\\0\""
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 178624,
-                        Name     = "DH1",
-                        Offset   = 1048576,
-                        Sequence = 0,
-                        Size     = 91455488,
-                        Start    = 2048,
-                        Type     = "\"DOS\\1\""
-                    },
-                    new Partition
-                    {
-                        Length   = 149504,
-                        Name     = "DH2",
-                        Offset   = 92504064,
-                        Sequence = 1,
-                        Size     = 76546048,
-                        Start    = 180672,
-                        Type     = "\"DOS\\3\""
-                    },
-                    new Partition
-                    {
-                        Length   = 153792,
-                        Name     = "DH3",
-                        Offset   = 169050112,
-                        Sequence = 2,
-                        Size     = 78741504,
-                        Start    = 330176,
-                        Type     = "\"DOS\\3\""
-                    },
-                    new Partition
-                    {
-                        Length   = 152384,
-                        Name     = "DH4",
-                        Offset   = 247791616,
-                        Sequence = 3,
-                        Size     = 78020608,
-                        Start    = 483968,
-                        Type     = "\"DOS\\7\""
-                    },
-                    new Partition
-                    {
-                        Length   = 166016,
-                        Name     = "DH5",
-                        Offset   = 325812224,
-                        Sequence = 4,
-                        Size     = 85000192,
-                        Start    = 636352,
-                        Type     = "\"SFS\\0\""
-                    },
-                    new Partition
-                    {
-                        Length   = 221760,
-                        Name     = "DH6",
-                        Offset   = 410812416,
-                        Sequence = 5,
-                        Size     = 113541120,
-                        Start    = 802368,
-                        Type     = "\"SFS\\2\""
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "parted.aif",
-                Partitions = new[]
+                    Length   = 170688,
+                    Name     = "UDH1",
+                    Offset   = 89473024,
+                    Sequence = 1,
+                    Size     = 87392256,
+                    Start    = 174752,
+                    Type     = "\"DOS\\2\""
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 16065,
-                        Name     = "primary",
-                        Offset   = 8225280,
-                        Sequence = 0,
-                        Size     = 8225280,
-                        Start    = 16065,
-                        Type     = "\"\0\0\0\\0\""
-                    },
-                    new Partition
-                    {
-                        Length   = 48195,
-                        Name     = "name",
-                        Offset   = 16450560,
-                        Sequence = 1,
-                        Size     = 24675840,
-                        Start    = 32130,
-                        Type     = "\"FAT\\1\""
-                    },
-                    new Partition
-                    {
-                        Length   = 176715,
-                        Name     = "partition",
-                        Offset   = 41126400,
-                        Sequence = 2,
-                        Size     = 90478080,
-                        Start    = 80325,
-                        Type     = "\"\0\0\0\\0\""
-                    }
+                    Length   = 170688,
+                    Name     = "UDH2",
+                    Offset   = 176865280,
+                    Sequence = 2,
+                    Size     = 87392256,
+                    Start    = 345440,
+                    Type     = "\"DOS\\1\""
+                },
+                new Partition
+                {
+                    Length   = 170688,
+                    Name     = "UDH3",
+                    Offset   = 264257536,
+                    Sequence = 3,
+                    Size     = 87392256,
+                    Start    = 516128,
+                    Type     = "\"DOS\\3\""
+                },
+                new Partition
+                {
+                    Length   = 170508,
+                    Name     = "FAT16",
+                    Offset   = 351663104,
+                    Sequence = 4,
+                    Size     = 87300096,
+                    Start    = 686842,
+                    Type     = "0x06"
+                },
+                new Partition
+                {
+                    Length   = 166624,
+                    Name     = "UDH5",
+                    Offset   = 439042048,
+                    Sequence = 5,
+                    Size     = 85311488,
+                    Start    = 857504,
+                    Type     = "\"RES\\86\""
                 }
             }
-        };
-    }
+        },
+        new PartitionTest
+        {
+            TestFile = "amigaos_4.0.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 178624,
+                    Name     = "DH1",
+                    Offset   = 1048576,
+                    Sequence = 0,
+                    Size     = 91455488,
+                    Start    = 2048,
+                    Type     = "\"DOS\\1\""
+                },
+                new Partition
+                {
+                    Length   = 149504,
+                    Name     = "DH2",
+                    Offset   = 92504064,
+                    Sequence = 1,
+                    Size     = 76546048,
+                    Start    = 180672,
+                    Type     = "\"DOS\\3\""
+                },
+                new Partition
+                {
+                    Length   = 153792,
+                    Name     = "DH3",
+                    Offset   = 169050112,
+                    Sequence = 2,
+                    Size     = 78741504,
+                    Start    = 330176,
+                    Type     = "\"DOS\\3\""
+                },
+                new Partition
+                {
+                    Length   = 152384,
+                    Name     = "DH4",
+                    Offset   = 247791616,
+                    Sequence = 3,
+                    Size     = 78020608,
+                    Start    = 483968,
+                    Type     = "\"DOS\\7\""
+                },
+                new Partition
+                {
+                    Length   = 166016,
+                    Name     = "DH5",
+                    Offset   = 325812224,
+                    Sequence = 4,
+                    Size     = 85000192,
+                    Start    = 636352,
+                    Type     = "\"SFS\\0\""
+                },
+                new Partition
+                {
+                    Length   = 221760,
+                    Name     = "DH6",
+                    Offset   = 410812416,
+                    Sequence = 5,
+                    Size     = 113541120,
+                    Start    = 802368,
+                    Type     = "\"SFS\\2\""
+                }
+            }
+        },
+        new PartitionTest
+        {
+            TestFile = "parted.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 16065,
+                    Name     = "primary",
+                    Offset   = 8225280,
+                    Sequence = 0,
+                    Size     = 8225280,
+                    Start    = 16065,
+                    Type     = "\"\0\0\0\\0\""
+                },
+                new Partition
+                {
+                    Length   = 48195,
+                    Name     = "name",
+                    Offset   = 16450560,
+                    Sequence = 1,
+                    Size     = 24675840,
+                    Start    = 32130,
+                    Type     = "\"FAT\\1\""
+                },
+                new Partition
+                {
+                    Length   = 176715,
+                    Name     = "partition",
+                    Offset   = 41126400,
+                    Sequence = 2,
+                    Size     = 90478080,
+                    Start    = 80325,
+                    Type     = "\"\0\0\0\\0\""
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/SGI.cs b/Aaru.Tests/Partitions/SGI.cs
index b0c164e96..27c7030da 100644
--- a/Aaru.Tests/Partitions/SGI.cs
+++ b/Aaru.Tests/Partitions/SGI.cs
@@ -30,191 +30,190 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    [TestFixture]
-    public class Sgi : PartitionSchemeTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "SGI");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+[TestFixture]
+public class Sgi : PartitionSchemeTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "SGI");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "linux.aif",
+            Partitions = new[]
             {
-                TestFile = "linux.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 40961,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 16065,
-                        Type     = "XFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 61441,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 64260,
-                        Type     = "Linux RAID"
-                    },
-                    new Partition
-                    {
-                        Length   = 81921,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 128520,
-                        Type     = "Track replacements"
-                    },
-                    new Partition
-                    {
-                        Length   = 92161,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 224910,
-                        Type     = "Sector replacements"
-                    },
-                    new Partition
-                    {
-                        Length   = 102401,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 321300,
-                        Type     = "Raw data (swap)"
-                    },
-                    new Partition
-                    {
-                        Length   = 30721,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 433755,
-                        Type     = "4.2BSD Fast File System"
-                    },
-                    new Partition
-                    {
-                        Length   = 71681,
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 465885,
-                        Type     = "UNIX System V"
-                    },
-                    new Partition
-                    {
-                        Length   = 10241,
-                        Offset   = 0,
-                        Sequence = 7,
-                        Size     = 0,
-                        Start    = 546210,
-                        Type     = "EFS"
-                    },
-                    new Partition
-                    {
-                        Length   = 122881,
-                        Offset   = 0,
-                        Sequence = 8,
-                        Size     = 0,
-                        Start    = 562275,
-                        Type     = "Logical volume"
-                    },
-                    new Partition
-                    {
-                        Length   = 133121,
-                        Offset   = 0,
-                        Sequence = 9,
-                        Size     = 0,
-                        Start    = 690795,
-                        Type     = "Raw logical volume"
-                    },
-                    new Partition
-                    {
-                        Length   = 51201,
-                        Offset   = 0,
-                        Sequence = 10,
-                        Size     = 0,
-                        Start    = 835380,
-                        Type     = "XFS log device"
-                    },
-                    new Partition
-                    {
-                        Length   = 30721,
-                        Offset   = 0,
-                        Sequence = 11,
-                        Size     = 0,
-                        Start    = 899640,
-                        Type     = "Linux swap"
-                    },
-                    new Partition
-                    {
-                        Length   = 6145,
-                        Offset   = 0,
-                        Sequence = 12,
-                        Size     = 0,
-                        Start    = 931770,
-                        Type     = "SGI XVM"
-                    },
-                    new Partition
-                    {
-                        Length   = 64260,
-                        Offset   = 0,
-                        Sequence = 13,
-                        Size     = 0,
-                        Start    = 947835,
-                        Type     = "Linux"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "parted.aif",
-                Partitions = new[]
+                    Length   = 40961,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 16065,
+                    Type     = "XFS"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 22528,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 6144,
-                        Type     = "Raw data (swap)"
-                    },
-                    new Partition
-                    {
-                        Length   = 67584,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 30720,
-                        Type     = "Raw data (swap)"
-                    },
-                    new Partition
-                    {
-                        Length   = 94208,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 100352,
-                        Type     = "Raw data (swap)"
-                    },
-                    new Partition
-                    {
-                        Length   = 36864,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 196608,
-                        Type     = "XFS"
-                    }
+                    Length   = 61441,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 64260,
+                    Type     = "Linux RAID"
+                },
+                new Partition
+                {
+                    Length   = 81921,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 128520,
+                    Type     = "Track replacements"
+                },
+                new Partition
+                {
+                    Length   = 92161,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 224910,
+                    Type     = "Sector replacements"
+                },
+                new Partition
+                {
+                    Length   = 102401,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 321300,
+                    Type     = "Raw data (swap)"
+                },
+                new Partition
+                {
+                    Length   = 30721,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 433755,
+                    Type     = "4.2BSD Fast File System"
+                },
+                new Partition
+                {
+                    Length   = 71681,
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 465885,
+                    Type     = "UNIX System V"
+                },
+                new Partition
+                {
+                    Length   = 10241,
+                    Offset   = 0,
+                    Sequence = 7,
+                    Size     = 0,
+                    Start    = 546210,
+                    Type     = "EFS"
+                },
+                new Partition
+                {
+                    Length   = 122881,
+                    Offset   = 0,
+                    Sequence = 8,
+                    Size     = 0,
+                    Start    = 562275,
+                    Type     = "Logical volume"
+                },
+                new Partition
+                {
+                    Length   = 133121,
+                    Offset   = 0,
+                    Sequence = 9,
+                    Size     = 0,
+                    Start    = 690795,
+                    Type     = "Raw logical volume"
+                },
+                new Partition
+                {
+                    Length   = 51201,
+                    Offset   = 0,
+                    Sequence = 10,
+                    Size     = 0,
+                    Start    = 835380,
+                    Type     = "XFS log device"
+                },
+                new Partition
+                {
+                    Length   = 30721,
+                    Offset   = 0,
+                    Sequence = 11,
+                    Size     = 0,
+                    Start    = 899640,
+                    Type     = "Linux swap"
+                },
+                new Partition
+                {
+                    Length   = 6145,
+                    Offset   = 0,
+                    Sequence = 12,
+                    Size     = 0,
+                    Start    = 931770,
+                    Type     = "SGI XVM"
+                },
+                new Partition
+                {
+                    Length   = 64260,
+                    Offset   = 0,
+                    Sequence = 13,
+                    Size     = 0,
+                    Start    = 947835,
+                    Type     = "Linux"
                 }
             }
-        };
-    }
+        },
+        new PartitionTest
+        {
+            TestFile = "parted.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 22528,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 6144,
+                    Type     = "Raw data (swap)"
+                },
+                new Partition
+                {
+                    Length   = 67584,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 30720,
+                    Type     = "Raw data (swap)"
+                },
+                new Partition
+                {
+                    Length   = 94208,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 100352,
+                    Type     = "Raw data (swap)"
+                },
+                new Partition
+                {
+                    Length   = 36864,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 196608,
+                    Type     = "XFS"
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/Sun.cs b/Aaru.Tests/Partitions/Sun.cs
index 571e76bc1..f08580cdb 100644
--- a/Aaru.Tests/Partitions/Sun.cs
+++ b/Aaru.Tests/Partitions/Sun.cs
@@ -30,120 +30,119 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    // TODO: Get SunOS and VTOC16 disk labels
-    [TestFixture]
-    public class Sun : PartitionSchemeTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Sun");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+// TODO: Get SunOS and VTOC16 disk labels
+[TestFixture]
+public class Sun : PartitionSchemeTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Sun");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "linux.aif",
+            Partitions = new[]
             {
-                TestFile = "linux.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 204800,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 0,
-                        Type     = "Linux"
-                    },
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 208845,
-                        Type     = "Sun boot"
-                    },
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 321300,
-                        Type     = "Sun /"
-                    },
-                    new Partition
-                    {
-                        Length   = 102400,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 433755,
-                        Type     = "Sun /home"
-                    },
-                    new Partition
-                    {
-                        Length   = 153600,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 546210,
-                        Type     = "Sun swap"
-                    },
-                    new Partition
-                    {
-                        Length   = 208845,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 706860,
-                        Type     = "Sun /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 96390,
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 915705,
-                        Type     = "Linux swap"
-                    }
-                }
-            },
-            new PartitionTest
-            {
-                TestFile = "parted.aif",
-                Partitions = new[]
+                    Length   = 204800,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 0,
+                    Type     = "Linux"
+                },
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 49152,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 0,
-                        Type     = "Linux"
-                    },
-                    new Partition
-                    {
-                        Length   = 80325,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 64260,
-                        Type     = "Linux"
-                    },
-                    new Partition
-                    {
-                        Length   = 96390,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 144585,
-                        Type     = "Linux"
-                    }
+                    Length   = 102400,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 208845,
+                    Type     = "Sun boot"
+                },
+                new Partition
+                {
+                    Length   = 102400,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 321300,
+                    Type     = "Sun /"
+                },
+                new Partition
+                {
+                    Length   = 102400,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 433755,
+                    Type     = "Sun /home"
+                },
+                new Partition
+                {
+                    Length   = 153600,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 546210,
+                    Type     = "Sun swap"
+                },
+                new Partition
+                {
+                    Length   = 208845,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 706860,
+                    Type     = "Sun /usr"
+                },
+                new Partition
+                {
+                    Length   = 96390,
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 915705,
+                    Type     = "Linux swap"
                 }
             }
-        };
-    }
+        },
+        new PartitionTest
+        {
+            TestFile = "parted.aif",
+            Partitions = new[]
+            {
+                new Partition
+                {
+                    Length   = 49152,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 0,
+                    Type     = "Linux"
+                },
+                new Partition
+                {
+                    Length   = 80325,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 64260,
+                    Type     = "Linux"
+                },
+                new Partition
+                {
+                    Length   = 96390,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 144585,
+                    Type     = "Linux"
+                }
+            }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/VTOC.cs b/Aaru.Tests/Partitions/VTOC.cs
index c78255df2..ce3d6046f 100644
--- a/Aaru.Tests/Partitions/VTOC.cs
+++ b/Aaru.Tests/Partitions/VTOC.cs
@@ -30,166 +30,165 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    [TestFixture]
-    public class Vtoc : PartitionSchemeTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "UNIX VTOC");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+[TestFixture]
+public class Vtoc : PartitionSchemeTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "UNIX VTOC");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "att_unix_vtoc.aif",
+            Partitions = new[]
             {
-                TestFile = "att_unix_vtoc.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Length   = 34,
-                        Offset   = 0,
-                        Sequence = 0,
-                        Size     = 0,
-                        Start    = 1,
-                        Type     = "UNIX: Boot"
-                    },
-                    new Partition
-                    {
-                        Length   = 1023119,
-                        Offset   = 0,
-                        Sequence = 1,
-                        Size     = 0,
-                        Start    = 1,
-                        Type     = "UNIX: Whole disk"
-                    },
-                    new Partition
-                    {
-                        Length   = 253,
-                        Offset   = 0,
-                        Sequence = 2,
-                        Size     = 0,
-                        Start    = 63,
-                        Type     = "UNIX: Stand"
-                    },
-                    new Partition
-                    {
-                        Length   = 78624,
-                        Offset   = 0,
-                        Sequence = 3,
-                        Size     = 0,
-                        Start    = 378,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 78624,
-                        Offset   = 0,
-                        Sequence = 4,
-                        Size     = 0,
-                        Start    = 79002,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 78624,
-                        Offset   = 0,
-                        Sequence = 5,
-                        Size     = 0,
-                        Start    = 157626,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 78624,
-                        Offset   = 0,
-                        Sequence = 6,
-                        Size     = 0,
-                        Start    = 236250,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 78624,
-                        Offset   = 0,
-                        Sequence = 7,
-                        Size     = 0,
-                        Start    = 314874,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 78624,
-                        Offset   = 0,
-                        Sequence = 8,
-                        Size     = 0,
-                        Start    = 393498,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 78624,
-                        Offset   = 0,
-                        Sequence = 9,
-                        Size     = 0,
-                        Start    = 472122,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 78624,
-                        Offset   = 0,
-                        Sequence = 10,
-                        Size     = 0,
-                        Start    = 550746,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 78624,
-                        Offset   = 0,
-                        Sequence = 11,
-                        Size     = 0,
-                        Start    = 629370,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 76608,
-                        Offset   = 0,
-                        Sequence = 12,
-                        Size     = 0,
-                        Start    = 707994,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 77616,
-                        Offset   = 0,
-                        Sequence = 13,
-                        Size     = 0,
-                        Start    = 784602,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 75600,
-                        Offset   = 0,
-                        Sequence = 14,
-                        Size     = 0,
-                        Start    = 862218,
-                        Type     = "UNIX: /usr"
-                    },
-                    new Partition
-                    {
-                        Length   = 84672,
-                        Offset   = 0,
-                        Sequence = 15,
-                        Size     = 0,
-                        Start    = 937818,
-                        Type     = "UNIX: /usr"
-                    }
+                    Length   = 34,
+                    Offset   = 0,
+                    Sequence = 0,
+                    Size     = 0,
+                    Start    = 1,
+                    Type     = "UNIX: Boot"
+                },
+                new Partition
+                {
+                    Length   = 1023119,
+                    Offset   = 0,
+                    Sequence = 1,
+                    Size     = 0,
+                    Start    = 1,
+                    Type     = "UNIX: Whole disk"
+                },
+                new Partition
+                {
+                    Length   = 253,
+                    Offset   = 0,
+                    Sequence = 2,
+                    Size     = 0,
+                    Start    = 63,
+                    Type     = "UNIX: Stand"
+                },
+                new Partition
+                {
+                    Length   = 78624,
+                    Offset   = 0,
+                    Sequence = 3,
+                    Size     = 0,
+                    Start    = 378,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 78624,
+                    Offset   = 0,
+                    Sequence = 4,
+                    Size     = 0,
+                    Start    = 79002,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 78624,
+                    Offset   = 0,
+                    Sequence = 5,
+                    Size     = 0,
+                    Start    = 157626,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 78624,
+                    Offset   = 0,
+                    Sequence = 6,
+                    Size     = 0,
+                    Start    = 236250,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 78624,
+                    Offset   = 0,
+                    Sequence = 7,
+                    Size     = 0,
+                    Start    = 314874,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 78624,
+                    Offset   = 0,
+                    Sequence = 8,
+                    Size     = 0,
+                    Start    = 393498,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 78624,
+                    Offset   = 0,
+                    Sequence = 9,
+                    Size     = 0,
+                    Start    = 472122,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 78624,
+                    Offset   = 0,
+                    Sequence = 10,
+                    Size     = 0,
+                    Start    = 550746,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 78624,
+                    Offset   = 0,
+                    Sequence = 11,
+                    Size     = 0,
+                    Start    = 629370,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 76608,
+                    Offset   = 0,
+                    Sequence = 12,
+                    Size     = 0,
+                    Start    = 707994,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 77616,
+                    Offset   = 0,
+                    Sequence = 13,
+                    Size     = 0,
+                    Start    = 784602,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 75600,
+                    Offset   = 0,
+                    Sequence = 14,
+                    Size     = 0,
+                    Start    = 862218,
+                    Type     = "UNIX: /usr"
+                },
+                new Partition
+                {
+                    Length   = 84672,
+                    Offset   = 0,
+                    Sequence = 15,
+                    Size     = 0,
+                    Start    = 937818,
+                    Type     = "UNIX: /usr"
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Partitions/Xbox.cs b/Aaru.Tests/Partitions/Xbox.cs
index 6f1c32c3c..09a498938 100644
--- a/Aaru.Tests/Partitions/Xbox.cs
+++ b/Aaru.Tests/Partitions/Xbox.cs
@@ -30,40 +30,39 @@ using System.IO;
 using Aaru.CommonTypes;
 using NUnit.Framework;
 
-namespace Aaru.Tests.Partitions
-{
-    [TestFixture]
-    public class Xbox : PartitionSchemeTest
-    {
-        public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Xbox");
+namespace Aaru.Tests.Partitions;
 
-        public override PartitionTest[] Tests => new[]
+[TestFixture]
+public class Xbox : PartitionSchemeTest
+{
+    public override string DataFolder => Path.Combine(Consts.TEST_FILES_ROOT, "Partitioning schemes", "Xbox");
+
+    public override PartitionTest[] Tests => new[]
+    {
+        new PartitionTest
         {
-            new PartitionTest
+            TestFile = "microsoft256mb.aif",
+            Partitions = new[]
             {
-                TestFile = "microsoft256mb.aif",
-                Partitions = new[]
+                new Partition
                 {
-                    new Partition
-                    {
-                        Description = "System cache",
-                        Length      = 16376,
-                        Offset      = 0,
-                        Sequence    = 0,
-                        Size        = 0,
-                        Start       = 0
-                    },
-                    new Partition
-                    {
-                        Description = "Data volume",
-                        Length      = 475144,
-                        Offset      = 0,
-                        Sequence    = 1,
-                        Size        = 0,
-                        Start       = 16376
-                    }
+                    Description = "System cache",
+                    Length      = 16376,
+                    Offset      = 0,
+                    Sequence    = 0,
+                    Size        = 0,
+                    Start       = 0
+                },
+                new Partition
+                {
+                    Description = "Data volume",
+                    Length      = 475144,
+                    Offset      = 0,
+                    Sequence    = 1,
+                    Size        = 0,
+                    Start       = 16376
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/Structs.cs b/Aaru.Tests/Structs.cs
index d410ce3b4..c53acfe72 100644
--- a/Aaru.Tests/Structs.cs
+++ b/Aaru.Tests/Structs.cs
@@ -3,116 +3,115 @@ using System.Text;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Structs;
 
-namespace Aaru.Tests
+namespace Aaru.Tests;
+
+/// <summary>Class to define expected data when testing media info</summary>
+public class MediaInfoTest
 {
-    /// <summary>Class to define expected data when testing media info</summary>
-    public class MediaInfoTest
-    {
-        /// <summary>Expected media type</summary>
-        public MediaType MediaType;
-        /// <summary>Expected number of sectors in media</summary>
-        public ulong Sectors;
-        /// <summary>Expected media sector size</summary>
-        public uint SectorSize;
-        /// <summary>File that contains the image to test</summary>
-        public string TestFile;
+    /// <summary>Expected media type</summary>
+    public MediaType MediaType;
+    /// <summary>Expected number of sectors in media</summary>
+    public ulong Sectors;
+    /// <summary>Expected media sector size</summary>
+    public uint SectorSize;
+    /// <summary>File that contains the image to test</summary>
+    public string TestFile;
 
-        public override string ToString() => TestFile;
-    }
+    public override string ToString() => TestFile;
+}
 
-    /// <inheritdoc />
-    /// <summary>Class to define expected data when testing filesystem info</summary>
-    public class FileSystemTest : MediaInfoTest
-    {
-        /// <summary>Application ID</summary>
-        public string ApplicationId;
-        /// <summary>Can the volume boot?</summary>
-        public bool Bootable;
-        /// <summary>Clusters in volume</summary>
-        public long Clusters;
-        /// <summary>Bytes per cluster</summary>
-        public uint ClusterSize;
-        public Dictionary<string, FileData> Contents;
-        public string                       ContentsJson;
-        public Encoding                     Encoding;
-        public string                       Namespace;
-        /// <summary>System or OEM ID</summary>
-        public string SystemId;
-        /// <summary>Filesystem type. null if always the same, as defined in test class</summary>
-        public string Type;
-        /// <summary>Volume name</summary>
-        public string VolumeName;
-        /// <summary>Volume serial number or set identifier</summary>
-        public string VolumeSerial;
-    }
+/// <inheritdoc />
+/// <summary>Class to define expected data when testing filesystem info</summary>
+public class FileSystemTest : MediaInfoTest
+{
+    /// <summary>Application ID</summary>
+    public string ApplicationId;
+    /// <summary>Can the volume boot?</summary>
+    public bool Bootable;
+    /// <summary>Clusters in volume</summary>
+    public long Clusters;
+    /// <summary>Bytes per cluster</summary>
+    public uint ClusterSize;
+    public Dictionary<string, FileData> Contents;
+    public string                       ContentsJson;
+    public Encoding                     Encoding;
+    public string                       Namespace;
+    /// <summary>System or OEM ID</summary>
+    public string SystemId;
+    /// <summary>Filesystem type. null if always the same, as defined in test class</summary>
+    public string Type;
+    /// <summary>Volume name</summary>
+    public string VolumeName;
+    /// <summary>Volume serial number or set identifier</summary>
+    public string VolumeSerial;
+}
 
-    public class BlockImageTestExpected : MediaInfoTest
-    {
-        public string                  MD5;
-        public BlockPartitionVolumes[] Partitions;
-    }
+public class BlockImageTestExpected : MediaInfoTest
+{
+    public string                  MD5;
+    public BlockPartitionVolumes[] Partitions;
+}
 
-    public class TrackInfoTestExpected
-    {
-        public ulong            End;
-        public FileSystemTest[] FileSystems;
-        public byte?            Flags;
-        public byte             Number;
-        public ulong            Pregap;
-        public int              Session;
-        public ulong            Start;
-    }
+public class TrackInfoTestExpected
+{
+    public ulong            End;
+    public FileSystemTest[] FileSystems;
+    public byte?            Flags;
+    public byte             Number;
+    public ulong            Pregap;
+    public int              Session;
+    public ulong            Start;
+}
 
-    public class OpticalImageTestExpected : BlockImageTestExpected
-    {
-        public string                  LongMD5;
-        public string                  SubchannelMD5;
-        public TrackInfoTestExpected[] Tracks;
-    }
+public class OpticalImageTestExpected : BlockImageTestExpected
+{
+    public string                  LongMD5;
+    public string                  SubchannelMD5;
+    public TrackInfoTestExpected[] Tracks;
+}
 
-    public class TapeImageTestExpected : BlockImageTestExpected
-    {
-        public TapeFile[]      Files;
-        public TapePartition[] Partitions;
-    }
+public class TapeImageTestExpected : BlockImageTestExpected
+{
+    public TapeFile[]      Files;
+    public TapePartition[] Partitions;
+}
 
-    public class PartitionTest
-    {
-        public Partition[] Partitions;
-        /// <summary>File that contains the partition scheme to test</summary>
-        public string TestFile;
-    }
+public class PartitionTest
+{
+    public Partition[] Partitions;
+    /// <summary>File that contains the partition scheme to test</summary>
+    public string TestFile;
+}
 
-    public class FsExtractHashData
-    {
-        public PartitionVolumes[] Partitions;
-    }
+public class FsExtractHashData
+{
+    public PartitionVolumes[] Partitions;
+}
 
-    public class PartitionVolumes
-    {
-        public VolumeData[] Volumes;
-    }
+public class PartitionVolumes
+{
+    public VolumeData[] Volumes;
+}
 
-    public class FileData
-    {
-        public Dictionary<string, FileData> Children      { get; set; }
-        public FileEntryInfo                Info          { get; set; }
-        public string                       LinkTarget    { get; set; }
-        public string                       MD5           { get; set; }
-        public Dictionary<string, string>   XattrsWithMd5 { get; set; }
-    }
+public class FileData
+{
+    public Dictionary<string, FileData> Children      { get; set; }
+    public FileEntryInfo                Info          { get; set; }
+    public string                       LinkTarget    { get; set; }
+    public string                       MD5           { get; set; }
+    public Dictionary<string, string>   XattrsWithMd5 { get; set; }
+}
 
-    public class VolumeData
-    {
-        public List<string>                 Directories;
-        public Dictionary<string, FileData> Files;
-        public string                       VolumeName;
-    }
+public class VolumeData
+{
+    public List<string>                 Directories;
+    public Dictionary<string, FileData> Files;
+    public string                       VolumeName;
+}
 
-    public class BlockPartitionVolumes
-    {
-        public ulong        Length;
-        public ulong        Start;
-        public VolumeData[] Volumes;
-    }
+public class BlockPartitionVolumes
+{
+    public ulong        Length;
+    public ulong        Start;
+    public VolumeData[] Volumes;
 }
\ No newline at end of file
diff --git a/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs b/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs
index f0d560664..a01e3e703 100644
--- a/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/AaruFormat/V1/FromAaru.cs
@@ -2,62 +2,61 @@ using System.IO;
 using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.Tests.WritableImages.AaruFormat.V1
+namespace Aaru.Tests.WritableImages.AaruFormat.V1;
+
+public class FromAaru : WritableOpticalMediaImageTest
 {
-    public class FromAaru : WritableOpticalMediaImageTest
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+    public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
+    public override IWritableImage OutputPlugin    => new DiscImages.AaruFormat();
+    public override string         OutputExtension => "aif";
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
-        public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
-        public override IWritableImage OutputPlugin    => new DiscImages.AaruFormat();
-        public override string         OutputExtension => "aif";
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "test_multisession.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 51168,
+            SectorSize    = 2048,
+            MD5           = "e2e19cf38891e67a0829d01842b4052e",
+            LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
+            SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
+            Tracks = new[]
             {
-                TestFile      = "test_multisession.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 51168,
-                SectorSize    = 2048,
-                MD5           = "e2e19cf38891e67a0829d01842b4052e",
-                LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
-                SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs b/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs
index 6d10511df..dad4b4ba2 100644
--- a/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/Alcohol/FromAaru.cs
@@ -3,62 +3,61 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.WritableImages.Alcohol
+namespace Aaru.Tests.WritableImages.Alcohol;
+
+public class FromAaru : WritableOpticalMediaImageTest
 {
-    public class FromAaru : WritableOpticalMediaImageTest
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+    public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
+    public override IWritableImage OutputPlugin    => new Alcohol120();
+    public override string         OutputExtension => "mds";
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
-        public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
-        public override IWritableImage OutputPlugin    => new Alcohol120();
-        public override string         OutputExtension => "mds";
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "test_multisession.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 51168,
+            SectorSize    = 2048,
+            MD5           = "e2e19cf38891e67a0829d01842b4052e",
+            LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
+            SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
+            Tracks = new[]
             {
-                TestFile      = "test_multisession.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 51168,
-                SectorSize    = 2048,
-                MD5           = "e2e19cf38891e67a0829d01842b4052e",
-                LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
-                SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/WritableImages/BaseWritableMediaImageTest.cs b/Aaru.Tests/WritableImages/BaseWritableMediaImageTest.cs
index be694c5dd..fd261bf5c 100644
--- a/Aaru.Tests/WritableImages/BaseWritableMediaImageTest.cs
+++ b/Aaru.Tests/WritableImages/BaseWritableMediaImageTest.cs
@@ -1,12 +1,11 @@
 using Aaru.CommonTypes.Interfaces;
 
-namespace Aaru.Tests.WritableImages
+namespace Aaru.Tests.WritableImages;
+
+public abstract class BaseWritableMediaImageTest
 {
-    public abstract class BaseWritableMediaImageTest
-    {
-        public abstract string         DataFolder      { get; }
-        public abstract IMediaImage    InputPlugin     { get; }
-        public abstract IWritableImage OutputPlugin    { get; }
-        public abstract string         OutputExtension { get; }
-    }
+    public abstract string         DataFolder      { get; }
+    public abstract IMediaImage    InputPlugin     { get; }
+    public abstract IWritableImage OutputPlugin    { get; }
+    public abstract string         OutputExtension { get; }
 }
\ No newline at end of file
diff --git a/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs b/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs
index 57999e840..0511fb6d1 100644
--- a/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/CDRDAO/FromAaru.cs
@@ -3,62 +3,61 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.WritableImages.CDRDAO
+namespace Aaru.Tests.WritableImages.CDRDAO;
+
+public class FromAaru : WritableOpticalMediaImageTest
 {
-    public class FromAaru : WritableOpticalMediaImageTest
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+    public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
+    public override IWritableImage OutputPlugin    => new Cdrdao();
+    public override string         OutputExtension => "toc";
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
-        public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
-        public override IWritableImage OutputPlugin    => new Cdrdao();
-        public override string         OutputExtension => "toc";
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "test_multisession.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 51168,
+            SectorSize    = 2048,
+            MD5           = "e2e19cf38891e67a0829d01842b4052e",
+            LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
+            SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
+            Tracks = new[]
             {
-                TestFile      = "test_multisession.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 51168,
-                SectorSize    = 2048,
-                MD5           = "e2e19cf38891e67a0829d01842b4052e",
-                LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
-                SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs b/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs
index 93165b6a6..c781dc820 100644
--- a/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/CDRWin/FromAaru.cs
@@ -3,62 +3,61 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.WritableImages.CDRWin
+namespace Aaru.Tests.WritableImages.CDRWin;
+
+public class FromAaru : WritableOpticalMediaImageTest
 {
-    public class FromAaru : WritableOpticalMediaImageTest
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+    public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
+    public override IWritableImage OutputPlugin    => new CdrWin();
+    public override string         OutputExtension => "cue";
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
-        public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
-        public override IWritableImage OutputPlugin    => new CdrWin();
-        public override string         OutputExtension => "cue";
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "test_multisession.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 51168,
+            SectorSize    = 2048,
+            MD5           = "e2e19cf38891e67a0829d01842b4052e",
+            LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
+            SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
+            Tracks = new[]
             {
-                TestFile      = "test_multisession.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 51168,
-                SectorSize    = 2048,
-                MD5           = "e2e19cf38891e67a0829d01842b4052e",
-                LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
-                SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs b/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs
index 585f201b4..fd742141d 100644
--- a/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs
+++ b/Aaru.Tests/WritableImages/CloneCD/FromAaru.cs
@@ -3,62 +3,61 @@ using Aaru.CommonTypes;
 using Aaru.CommonTypes.Interfaces;
 using Aaru.DiscImages;
 
-namespace Aaru.Tests.WritableImages.CloneCD
+namespace Aaru.Tests.WritableImages.CloneCD;
+
+public class FromAaru : WritableOpticalMediaImageTest
 {
-    public class FromAaru : WritableOpticalMediaImageTest
+    public override string DataFolder =>
+        Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
+    public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
+    public override IWritableImage OutputPlugin    => new CloneCd();
+    public override string         OutputExtension => "ccd";
+    public override OpticalImageTestExpected[] Tests => new[]
     {
-        public override string DataFolder =>
-            Path.Combine(Consts.TEST_FILES_ROOT, "Media image formats", "AaruFormat", "V1");
-        public override IMediaImage    InputPlugin     => new DiscImages.AaruFormat();
-        public override IWritableImage OutputPlugin    => new CloneCd();
-        public override string         OutputExtension => "ccd";
-        public override OpticalImageTestExpected[] Tests => new[]
+        new OpticalImageTestExpected
         {
-            new OpticalImageTestExpected
+            TestFile      = "test_multisession.aif",
+            MediaType     = MediaType.CDR,
+            Sectors       = 51168,
+            SectorSize    = 2048,
+            MD5           = "e2e19cf38891e67a0829d01842b4052e",
+            LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
+            SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
+            Tracks = new[]
             {
-                TestFile      = "test_multisession.aif",
-                MediaType     = MediaType.CDR,
-                Sectors       = 51168,
-                SectorSize    = 2048,
-                MD5           = "e2e19cf38891e67a0829d01842b4052e",
-                LongMD5       = "b31f2d228dd564c88ad851b12b43c01d",
-                SubchannelMD5 = "989c696ee5bb336b4ad30474da573925",
-                Tracks = new[]
+                new TrackInfoTestExpected
                 {
-                    new TrackInfoTestExpected
-                    {
-                        Session = 1,
-                        Start   = 0,
-                        End     = 8132,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 2,
-                        Start   = 19383,
-                        End     = 25959,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 3,
-                        Start   = 32710,
-                        End     = 38477,
-                        Pregap  = 150,
-                        Flags   = 4
-                    },
-                    new TrackInfoTestExpected
-                    {
-                        Session = 4,
-                        Start   = 45228,
-                        End     = 51167,
-                        Pregap  = 150,
-                        Flags   = 4
-                    }
+                    Session = 1,
+                    Start   = 0,
+                    End     = 8132,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 2,
+                    Start   = 19383,
+                    End     = 25959,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 3,
+                    Start   = 32710,
+                    End     = 38477,
+                    Pregap  = 150,
+                    Flags   = 4
+                },
+                new TrackInfoTestExpected
+                {
+                    Session = 4,
+                    Start   = 45228,
+                    End     = 51167,
+                    Pregap  = 150,
+                    Flags   = 4
                 }
             }
-        };
-    }
+        }
+    };
 }
\ No newline at end of file
diff --git a/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs b/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs
index fe3078638..933cf685f 100644
--- a/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs
+++ b/Aaru.Tests/WritableImages/WritableOpticalMediaImageTest.cs
@@ -14,185 +14,348 @@ using FluentAssertions;
 using FluentAssertions.Execution;
 using NUnit.Framework;
 
-namespace Aaru.Tests.WritableImages
+namespace Aaru.Tests.WritableImages;
+
+public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
 {
-    public abstract class WritableOpticalMediaImageTest : BaseWritableMediaImageTest
+    const           uint                       SECTORS_TO_READ = 256;
+    public abstract OpticalImageTestExpected[] Tests { get; }
+
+    [Test]
+    public void Info()
     {
-        const           uint                       SECTORS_TO_READ = 256;
-        public abstract OpticalImageTestExpected[] Tests { get; }
+        Environment.CurrentDirectory = DataFolder;
+        ErrorNumber errno;
 
-        [Test]
-        public void Info()
+        Assert.Multiple(() =>
         {
-            Environment.CurrentDirectory = DataFolder;
-            ErrorNumber errno;
-
-            Assert.Multiple(() =>
+            foreach(OpticalImageTestExpected test in Tests)
             {
-                foreach(OpticalImageTestExpected test in Tests)
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var image = Activator.CreateInstance(InputPlugin.GetType()) as IOpticalMediaImage;
+                Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
+
+                ErrorNumber opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                using(new AssertionScope())
                 {
-                    string testFile = test.TestFile;
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var image = Activator.CreateInstance(InputPlugin.GetType()) as IOpticalMediaImage;
-                    Assert.NotNull(image, $"Could not instantiate filesystem for {testFile}");
-
-                    ErrorNumber opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    using(new AssertionScope())
+                    Assert.Multiple(() =>
                     {
-                        Assert.Multiple(() =>
+                        Assert.AreEqual(test.Sectors, image.Info.Sectors, $"Sectors: {testFile}");
+
+                        if(test.SectorSize > 0)
+                            Assert.AreEqual(test.SectorSize, image.Info.SectorSize, $"Sector size: {testFile}");
+
+                        Assert.AreEqual(test.MediaType, image.Info.MediaType, $"Media type: {testFile}");
+
+                        if(image.Info.XmlMediaType != XmlMediaType.OpticalDisc)
+                            return;
+
+                        Assert.AreEqual(test.Tracks.Length, image.Tracks.Count, $"Tracks: {testFile}");
+
+                        image.Tracks.Select(t => t.Session).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.Session), $"Track session: {testFile}");
+
+                        image.Tracks.Select(t => t.StartSector).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.Start), $"Track start: {testFile}");
+
+                        image.Tracks.Select(t => t.EndSector).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.End), $"Track end: {testFile}");
+
+                        image.Tracks.Select(t => t.Pregap).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.Pregap), $"Track pregap: {testFile}");
+
+                        int trackNo = 0;
+
+                        byte?[] flags           = new byte?[image.Tracks.Count];
+                        ulong   latestEndSector = 0;
+
+                        foreach(Track currentTrack in image.Tracks)
                         {
-                            Assert.AreEqual(test.Sectors, image.Info.Sectors, $"Sectors: {testFile}");
+                            if(currentTrack.EndSector > latestEndSector)
+                                latestEndSector = currentTrack.EndSector;
 
-                            if(test.SectorSize > 0)
-                                Assert.AreEqual(test.SectorSize, image.Info.SectorSize, $"Sector size: {testFile}");
-
-                            Assert.AreEqual(test.MediaType, image.Info.MediaType, $"Media type: {testFile}");
-
-                            if(image.Info.XmlMediaType != XmlMediaType.OpticalDisc)
-                                return;
-
-                            Assert.AreEqual(test.Tracks.Length, image.Tracks.Count, $"Tracks: {testFile}");
-
-                            image.Tracks.Select(t => t.Session).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.Session), $"Track session: {testFile}");
-
-                            image.Tracks.Select(t => t.StartSector).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.Start), $"Track start: {testFile}");
-
-                            image.Tracks.Select(t => t.EndSector).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.End), $"Track end: {testFile}");
-
-                            image.Tracks.Select(t => t.Pregap).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.Pregap), $"Track pregap: {testFile}");
-
-                            int trackNo = 0;
-
-                            byte?[] flags           = new byte?[image.Tracks.Count];
-                            ulong   latestEndSector = 0;
-
-                            foreach(Track currentTrack in image.Tracks)
+                            if(image.Info.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
                             {
-                                if(currentTrack.EndSector > latestEndSector)
-                                    latestEndSector = currentTrack.EndSector;
+                                errno = image.ReadSectorTag(currentTrack.Sequence, SectorTagType.CdTrackFlags,
+                                                            out byte[] tmp);
 
-                                if(image.Info.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
-                                {
-                                    errno = image.ReadSectorTag(currentTrack.Sequence, SectorTagType.CdTrackFlags,
-                                                                out byte[] tmp);
-
-                                    if(errno != ErrorNumber.NoError)
-                                        flags[trackNo] = tmp[0];
-                                }
-
-                                trackNo++;
+                                if(errno != ErrorNumber.NoError)
+                                    flags[trackNo] = tmp[0];
                             }
 
-                            flags.Should().BeEquivalentTo(test.Tracks.Select(s => s.Flags), $"Track flags: {testFile}");
+                            trackNo++;
+                        }
 
-                            Assert.AreEqual(latestEndSector, image.Info.Sectors - 1,
-                                            $"Last sector for tracks is {latestEndSector}, but it is {image.Info.Sectors} for image");
-                        });
+                        flags.Should().BeEquivalentTo(test.Tracks.Select(s => s.Flags), $"Track flags: {testFile}");
+
+                        Assert.AreEqual(latestEndSector, image.Info.Sectors - 1,
+                                        $"Last sector for tracks is {latestEndSector}, but it is {image.Info.Sectors} for image");
+                    });
+                }
+            }
+        });
+    }
+
+    [Test]
+    public void Convert()
+    {
+        Environment.CurrentDirectory = DataFolder;
+        ErrorNumber errno;
+
+        Assert.Multiple(() =>
+        {
+            foreach(OpticalImageTestExpected test in Tests)
+            {
+                string testFile = test.TestFile;
+
+                bool exists = File.Exists(testFile);
+                Assert.True(exists, $"{testFile} not found");
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                // It arrives here...
+                if(!exists)
+                    continue;
+
+                var     filtersList = new FiltersList();
+                IFilter filter      = filtersList.GetFilter(testFile);
+                filter.Open(testFile);
+
+                var inputFormat = Activator.CreateInstance(InputPlugin.GetType()) as IOpticalMediaImage;
+                Assert.NotNull(inputFormat, $"Could not instantiate input plugin for {testFile}");
+
+                ErrorNumber opened = inputFormat.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                string outputPath =
+                    Path.Combine(Path.GetTempPath(), $"{Path.GetRandomFileName()}.{OutputExtension}");
+
+                var outputFormat = Activator.CreateInstance(OutputPlugin.GetType()) as IWritableOpticalImage;
+                Assert.NotNull(outputFormat, $"Could not instantiate output plugin for {testFile}");
+
+                Assert.IsTrue(outputFormat.SupportedMediaTypes.Contains(inputFormat.Info.MediaType),
+                              $"Trying to convert unsupported media type {inputFormat.Info.MediaType} for {testFile}");
+
+                bool useLong = inputFormat.Info.ReadableSectorTags.Count != 0;
+
+                foreach(SectorTagType sectorTag in inputFormat.Info.ReadableSectorTags.Where(sectorTag =>
+                            !outputFormat.SupportedSectorTags.Contains(sectorTag)))
+                {
+                    if(sectorTag != SectorTagType.CdTrackFlags &&
+                       sectorTag != SectorTagType.CdTrackIsrc  &&
+                       sectorTag != SectorTagType.CdSectorSubchannel)
+                        useLong = false;
+                }
+
+                Assert.IsTrue(outputFormat.Create(outputPath, inputFormat.Info.MediaType, new Dictionary<string, string>(), inputFormat.Info.Sectors, inputFormat.Info.SectorSize),
+                              $"Error {outputFormat.ErrorMessage} creating output image.");
+
+                foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags.Where(mediaTag =>
+                            outputFormat.SupportedMediaTags.Contains(mediaTag)))
+                {
+                    ErrorNumber errno = inputFormat.ReadMediaTag(mediaTag, out byte[] buffer);
+
+                    if(errno == ErrorNumber.NoError)
+                        outputFormat.WriteMediaTag(buffer, mediaTag);
+                }
+
+                Assert.IsTrue(outputFormat.SetTracks(inputFormat.Tracks),
+                              $"Error {outputFormat.ErrorMessage} sending tracks list to output image.");
+
+                ulong doneSectors;
+
+                foreach(Track track in inputFormat.Tracks)
+                {
+                    doneSectors = 0;
+                    ulong trackSectors = track.EndSector - track.StartSector + 1;
+
+                    while(doneSectors < trackSectors)
+                    {
+                        byte[] sector;
+
+                        uint sectorsToDo;
+
+                        if(trackSectors - doneSectors >= SECTORS_TO_READ)
+                            sectorsToDo = SECTORS_TO_READ;
+                        else
+                            sectorsToDo = (uint)(trackSectors - doneSectors);
+
+                        bool useNotLong = false;
+                        bool result     = false;
+
+                        if(useLong)
+                        {
+                            errno = sectorsToDo == 1
+                                        ? inputFormat.ReadSectorLong(doneSectors + track.StartSector, out sector)
+                                        : inputFormat.ReadSectorsLong(doneSectors + track.StartSector, sectorsToDo,
+                                                                      out sector);
+
+                            if(errno == ErrorNumber.NoError)
+                                result = sectorsToDo == 1
+                                             ? outputFormat.WriteSectorLong(sector, doneSectors + track.StartSector)
+                                             : outputFormat.WriteSectorsLong(sector,
+                                                                             doneSectors + track.StartSector, sectorsToDo);
+                            else
+                                result = false;
+
+                            if(!result &&
+                               sector.Length % 2352 != 0)
+                                useNotLong = true;
+                        }
+
+                        if(!useLong || useNotLong)
+                        {
+                            errno = sectorsToDo == 1
+                                        ? inputFormat.ReadSector(doneSectors + track.StartSector, out sector)
+                                        : inputFormat.ReadSectors(doneSectors + track.StartSector, sectorsToDo,
+                                                                  out sector);
+
+                            Assert.AreEqual(ErrorNumber.NoError, errno);
+
+                            result = sectorsToDo == 1
+                                         ? outputFormat.WriteSector(sector, doneSectors + track.StartSector)
+                                         : outputFormat.WriteSectors(sector, doneSectors + track.StartSector,
+                                                                     sectorsToDo);
+                        }
+
+                        Assert.IsTrue(result,
+                                      $"Error {outputFormat.ErrorMessage} writing sector {doneSectors + track.StartSector}...");
+
+                        doneSectors += sectorsToDo;
                     }
                 }
-            });
-        }
 
-        [Test]
-        public void Convert()
-        {
-            Environment.CurrentDirectory = DataFolder;
-            ErrorNumber errno;
+                Dictionary<byte, string> isrcs                     = new();
+                Dictionary<byte, byte>   trackFlags                = new();
+                string                   mcn                       = null;
+                HashSet<int>             subchannelExtents         = new();
+                Dictionary<byte, int>    smallestPregapLbaPerTrack = new();
+                Track[]                  tracks                    = new Track[inputFormat.Tracks.Count];
 
-            Assert.Multiple(() =>
-            {
-                foreach(OpticalImageTestExpected test in Tests)
+                for(int i = 0; i < tracks.Length; i++)
                 {
-                    string testFile = test.TestFile;
-
-                    bool exists = File.Exists(testFile);
-                    Assert.True(exists, $"{testFile} not found");
-
-                    // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-                    // It arrives here...
-                    if(!exists)
-                        continue;
-
-                    var     filtersList = new FiltersList();
-                    IFilter filter      = filtersList.GetFilter(testFile);
-                    filter.Open(testFile);
-
-                    var inputFormat = Activator.CreateInstance(InputPlugin.GetType()) as IOpticalMediaImage;
-                    Assert.NotNull(inputFormat, $"Could not instantiate input plugin for {testFile}");
-
-                    ErrorNumber opened = inputFormat.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    string outputPath =
-                        Path.Combine(Path.GetTempPath(), $"{Path.GetRandomFileName()}.{OutputExtension}");
-
-                    var outputFormat = Activator.CreateInstance(OutputPlugin.GetType()) as IWritableOpticalImage;
-                    Assert.NotNull(outputFormat, $"Could not instantiate output plugin for {testFile}");
-
-                    Assert.IsTrue(outputFormat.SupportedMediaTypes.Contains(inputFormat.Info.MediaType),
-                                  $"Trying to convert unsupported media type {inputFormat.Info.MediaType} for {testFile}");
-
-                    bool useLong = inputFormat.Info.ReadableSectorTags.Count != 0;
-
-                    foreach(SectorTagType sectorTag in inputFormat.Info.ReadableSectorTags.Where(sectorTag =>
-                        !outputFormat.SupportedSectorTags.Contains(sectorTag)))
+                    tracks[i] = new Track
                     {
-                        if(sectorTag != SectorTagType.CdTrackFlags &&
-                           sectorTag != SectorTagType.CdTrackIsrc  &&
-                           sectorTag != SectorTagType.CdSectorSubchannel)
-                            useLong = false;
+                        Indexes           = new Dictionary<ushort, int>(),
+                        Description       = inputFormat.Tracks[i].Description,
+                        EndSector         = inputFormat.Tracks[i].EndSector,
+                        StartSector       = inputFormat.Tracks[i].StartSector,
+                        Pregap            = inputFormat.Tracks[i].Pregap,
+                        Sequence          = inputFormat.Tracks[i].Sequence,
+                        Session           = inputFormat.Tracks[i].Session,
+                        BytesPerSector    = inputFormat.Tracks[i].BytesPerSector,
+                        RawBytesPerSector = inputFormat.Tracks[i].RawBytesPerSector,
+                        Type              = inputFormat.Tracks[i].Type,
+                        SubchannelType    = inputFormat.Tracks[i].SubchannelType
+                    };
+
+                    foreach(KeyValuePair<ushort, int> idx in inputFormat.Tracks[i].Indexes)
+                        tracks[i].Indexes[idx.Key] = idx.Value;
+                }
+
+                foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.
+                                                         Where(t => t == SectorTagType.CdTrackIsrc).OrderBy(t => t))
+                {
+                    foreach(Track track in tracks)
+                    {
+                        errno = inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] isrc);
+
+                        if(errno != ErrorNumber.NoError)
+                            continue;
+
+                        isrcs[(byte)track.Sequence] = Encoding.UTF8.GetString(isrc);
+                    }
+                }
+
+                foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.
+                                                         Where(t => t == SectorTagType.CdTrackFlags).
+                                                         OrderBy(t => t))
+                {
+                    foreach(Track track in tracks)
+                    {
+                        errno = inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] flags);
+
+                        if(errno != ErrorNumber.NoError)
+                            continue;
+
+                        trackFlags[(byte)track.Sequence] = flags[0];
+                    }
+                }
+
+                for(ulong s = 0; s < inputFormat.Info.Sectors; s++)
+                {
+                    if(s > int.MaxValue)
+                        break;
+
+                    subchannelExtents.Add((int)s);
+                }
+
+                foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.OrderBy(t => t).
+                                                         TakeWhile(tag => useLong))
+                {
+                    switch(tag)
+                    {
+                        case SectorTagType.AppleSectorTag:
+                        case SectorTagType.CdSectorSync:
+                        case SectorTagType.CdSectorHeader:
+                        case SectorTagType.CdSectorSubHeader:
+                        case SectorTagType.CdSectorEdc:
+                        case SectorTagType.CdSectorEccP:
+                        case SectorTagType.CdSectorEccQ:
+                        case SectorTagType.CdSectorEcc:
+                            // This tags are inline in long sector
+                            continue;
                     }
 
-                    Assert.IsTrue(outputFormat.Create(outputPath, inputFormat.Info.MediaType, new Dictionary<string, string>(), inputFormat.Info.Sectors, inputFormat.Info.SectorSize),
-                                  $"Error {outputFormat.ErrorMessage} creating output image.");
-
-                    foreach(MediaTagType mediaTag in inputFormat.Info.ReadableMediaTags.Where(mediaTag =>
-                        outputFormat.SupportedMediaTags.Contains(mediaTag)))
-                    {
-                        ErrorNumber errno = inputFormat.ReadMediaTag(mediaTag, out byte[] buffer);
-
-                        if(errno == ErrorNumber.NoError)
-                            outputFormat.WriteMediaTag(buffer, mediaTag);
-                    }
-
-                    Assert.IsTrue(outputFormat.SetTracks(inputFormat.Tracks),
-                                  $"Error {outputFormat.ErrorMessage} sending tracks list to output image.");
-
-                    ulong doneSectors;
+                    if(!outputFormat.SupportedSectorTags.Contains(tag))
+                        continue;
 
                     foreach(Track track in inputFormat.Tracks)
                     {
                         doneSectors = 0;
-                        ulong trackSectors = track.EndSector - track.StartSector + 1;
+                        ulong  trackSectors = track.EndSector - track.StartSector + 1;
+                        byte[] sector;
+                        bool   result;
+
+                        switch(tag)
+                        {
+                            case SectorTagType.CdTrackFlags:
+                            case SectorTagType.CdTrackIsrc:
+                                errno = inputFormat.ReadSectorTag(track.Sequence, tag, out sector);
+
+                                Assert.AreEqual(ErrorNumber.NoError, errno,
+                                                $"Error {errno} reading tag, not continuing...");
+
+                                result = outputFormat.WriteSectorTag(sector, track.Sequence, tag);
+
+                                Assert.IsTrue(result,
+                                              $"Error {outputFormat.ErrorMessage} writing tag, not continuing...");
+
+                                continue;
+                        }
 
                         while(doneSectors < trackSectors)
                         {
-                            byte[] sector;
-
                             uint sectorsToDo;
 
                             if(trackSectors - doneSectors >= SECTORS_TO_READ)
@@ -200,411 +363,205 @@ namespace Aaru.Tests.WritableImages
                             else
                                 sectorsToDo = (uint)(trackSectors - doneSectors);
 
-                            bool useNotLong = false;
-                            bool result     = false;
-
-                            if(useLong)
+                            if(sectorsToDo == 1)
                             {
-                                errno = sectorsToDo == 1
-                                            ? inputFormat.ReadSectorLong(doneSectors + track.StartSector, out sector)
-                                            : inputFormat.ReadSectorsLong(doneSectors + track.StartSector, sectorsToDo,
-                                                                          out sector);
+                                errno = inputFormat.ReadSectorTag(doneSectors + track.StartSector, tag, out sector);
 
-                                if(errno == ErrorNumber.NoError)
-                                    result = sectorsToDo == 1
-                                                 ? outputFormat.WriteSectorLong(sector, doneSectors + track.StartSector)
-                                                 : outputFormat.WriteSectorsLong(sector,
-                                                     doneSectors + track.StartSector, sectorsToDo);
+                                Assert.AreEqual(ErrorNumber.NoError, errno,
+                                                $"Error {errno} reading tag, not continuing...");
+
+                                if(tag == SectorTagType.CdSectorSubchannel)
+                                {
+                                    bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
+                                        MmcSubchannel.Raw, sector, doneSectors + track.StartSector, 1, null,
+                                        isrcs, (byte)track.Sequence, ref mcn, tracks, subchannelExtents, true,
+                                        outputFormat, true, true, null, null, smallestPregapLbaPerTrack,
+                                        false);
+
+                                    if(indexesChanged)
+                                        outputFormat.SetTracks(tracks.ToList());
+
+                                    result = true;
+                                }
                                 else
-                                    result = false;
-
-                                if(!result &&
-                                   sector.Length % 2352 != 0)
-                                    useNotLong = true;
+                                    result = outputFormat.WriteSectorTag(sector, doneSectors + track.StartSector,
+                                                                         tag);
                             }
-
-                            if(!useLong || useNotLong)
+                            else
                             {
-                                errno = sectorsToDo == 1
-                                            ? inputFormat.ReadSector(doneSectors + track.StartSector, out sector)
-                                            : inputFormat.ReadSectors(doneSectors + track.StartSector, sectorsToDo,
-                                                                      out sector);
+                                errno = inputFormat.ReadSectorsTag(doneSectors + track.StartSector, sectorsToDo,
+                                                                   tag, out sector);
 
-                                Assert.AreEqual(ErrorNumber.NoError, errno);
+                                Assert.AreEqual(ErrorNumber.NoError, errno,
+                                                $"Error {errno} reading tag, not continuing...");
 
-                                result = sectorsToDo == 1
-                                             ? outputFormat.WriteSector(sector, doneSectors + track.StartSector)
-                                             : outputFormat.WriteSectors(sector, doneSectors + track.StartSector,
-                                                                         sectorsToDo);
+                                if(tag == SectorTagType.CdSectorSubchannel)
+                                {
+                                    bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
+                                        MmcSubchannel.Raw, sector, doneSectors + track.StartSector,
+                                        sectorsToDo, null, isrcs, (byte)track.Sequence, ref mcn, tracks,
+                                        subchannelExtents, true, outputFormat, true, true, null, null,
+                                        smallestPregapLbaPerTrack, false);
+
+                                    if(indexesChanged)
+                                        outputFormat.SetTracks(tracks.ToList());
+
+                                    result = true;
+                                }
+                                else
+                                    result = outputFormat.WriteSectorsTag(sector, doneSectors + track.StartSector,
+                                                                          sectorsToDo, tag);
                             }
 
                             Assert.IsTrue(result,
-                                          $"Error {outputFormat.ErrorMessage} writing sector {doneSectors + track.StartSector}...");
+                                          $"Error {outputFormat.ErrorMessage} writing tag for sector {doneSectors + track.StartSector}, not continuing...");
 
                             doneSectors += sectorsToDo;
                         }
                     }
+                }
 
-                    Dictionary<byte, string> isrcs                     = new();
-                    Dictionary<byte, byte>   trackFlags                = new();
-                    string                   mcn                       = null;
-                    HashSet<int>             subchannelExtents         = new();
-                    Dictionary<byte, int>    smallestPregapLbaPerTrack = new();
-                    Track[]                  tracks                    = new Track[inputFormat.Tracks.Count];
+                if(isrcs.Count > 0)
+                    foreach(KeyValuePair<byte, string> isrc in isrcs)
+                        outputFormat.WriteSectorTag(Encoding.UTF8.GetBytes(isrc.Value), isrc.Key,
+                                                    SectorTagType.CdTrackIsrc);
 
-                    for(int i = 0; i < tracks.Length; i++)
-                    {
-                        tracks[i] = new Track
+                if(trackFlags.Count > 0)
+                    foreach((byte track, byte flags) in trackFlags)
+                        outputFormat.WriteSectorTag(new[]
                         {
-                            Indexes           = new Dictionary<ushort, int>(),
-                            Description       = inputFormat.Tracks[i].Description,
-                            EndSector         = inputFormat.Tracks[i].EndSector,
-                            StartSector       = inputFormat.Tracks[i].StartSector,
-                            Pregap            = inputFormat.Tracks[i].Pregap,
-                            Sequence          = inputFormat.Tracks[i].Sequence,
-                            Session           = inputFormat.Tracks[i].Session,
-                            BytesPerSector    = inputFormat.Tracks[i].BytesPerSector,
-                            RawBytesPerSector = inputFormat.Tracks[i].RawBytesPerSector,
-                            Type              = inputFormat.Tracks[i].Type,
-                            SubchannelType    = inputFormat.Tracks[i].SubchannelType
-                        };
+                            flags
+                        }, track, SectorTagType.CdTrackFlags);
 
-                        foreach(KeyValuePair<ushort, int> idx in inputFormat.Tracks[i].Indexes)
-                            tracks[i].Indexes[idx.Key] = idx.Value;
-                    }
+                if(mcn != null)
+                    outputFormat.WriteMediaTag(Encoding.UTF8.GetBytes(mcn), MediaTagType.CD_MCN);
 
-                    foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.
-                                                             Where(t => t == SectorTagType.CdTrackIsrc).OrderBy(t => t))
+                // TODO: Progress
+                if(inputFormat.Info.MediaType == MediaType.CD            ||
+                   inputFormat.Info.MediaType == MediaType.CDDA          ||
+                   inputFormat.Info.MediaType == MediaType.CDG           ||
+                   inputFormat.Info.MediaType == MediaType.CDEG          ||
+                   inputFormat.Info.MediaType == MediaType.CDI           ||
+                   inputFormat.Info.MediaType == MediaType.CDROM         ||
+                   inputFormat.Info.MediaType == MediaType.CDROMXA       ||
+                   inputFormat.Info.MediaType == MediaType.CDPLUS        ||
+                   inputFormat.Info.MediaType == MediaType.CDMO          ||
+                   inputFormat.Info.MediaType == MediaType.CDR           ||
+                   inputFormat.Info.MediaType == MediaType.CDRW          ||
+                   inputFormat.Info.MediaType == MediaType.CDMRW         ||
+                   inputFormat.Info.MediaType == MediaType.VCD           ||
+                   inputFormat.Info.MediaType == MediaType.SVCD          ||
+                   inputFormat.Info.MediaType == MediaType.PCD           ||
+                   inputFormat.Info.MediaType == MediaType.DTSCD         ||
+                   inputFormat.Info.MediaType == MediaType.CDMIDI        ||
+                   inputFormat.Info.MediaType == MediaType.CDV           ||
+                   inputFormat.Info.MediaType == MediaType.CDIREADY      ||
+                   inputFormat.Info.MediaType == MediaType.FMTOWNS       ||
+                   inputFormat.Info.MediaType == MediaType.PS1CD         ||
+                   inputFormat.Info.MediaType == MediaType.PS2CD         ||
+                   inputFormat.Info.MediaType == MediaType.MEGACD        ||
+                   inputFormat.Info.MediaType == MediaType.SATURNCD      ||
+                   inputFormat.Info.MediaType == MediaType.GDROM         ||
+                   inputFormat.Info.MediaType == MediaType.GDR           ||
+                   inputFormat.Info.MediaType == MediaType.MilCD         ||
+                   inputFormat.Info.MediaType == MediaType.SuperCDROM2   ||
+                   inputFormat.Info.MediaType == MediaType.JaguarCD      ||
+                   inputFormat.Info.MediaType == MediaType.ThreeDO       ||
+                   inputFormat.Info.MediaType == MediaType.PCFX          ||
+                   inputFormat.Info.MediaType == MediaType.NeoGeoCD      ||
+                   inputFormat.Info.MediaType == MediaType.CDTV          ||
+                   inputFormat.Info.MediaType == MediaType.CD32          ||
+                   inputFormat.Info.MediaType == MediaType.Playdia       ||
+                   inputFormat.Info.MediaType == MediaType.Pippin        ||
+                   inputFormat.Info.MediaType == MediaType.VideoNow      ||
+                   inputFormat.Info.MediaType == MediaType.VideoNowColor ||
+                   inputFormat.Info.MediaType == MediaType.VideoNowXp    ||
+                   inputFormat.Info.MediaType == MediaType.CVD)
+                    CompactDisc.GenerateSubchannels(subchannelExtents, tracks, trackFlags, inputFormat.Info.Sectors,
+                                                    null, null, null, null, null, outputFormat);
+
+                Assert.IsTrue(outputFormat.Close(),
+                              $"Error {outputFormat.ErrorMessage} closing output image... Contents are not correct.");
+
+                filtersList = new FiltersList();
+                filter      = filtersList.GetFilter(outputPath);
+                filter.Open(outputPath);
+
+                string tmpFolder = Path.GetDirectoryName(outputPath);
+                Environment.CurrentDirectory = tmpFolder;
+
+                var image = Activator.CreateInstance(OutputPlugin.GetType()) as IOpticalMediaImage;
+                Assert.NotNull(image, $"Could not instantiate output plugin for {testFile}");
+
+                opened = image.Open(filter);
+                Assert.AreEqual(ErrorNumber.NoError, opened, $"Open created: {testFile}");
+
+                if(opened != ErrorNumber.NoError)
+                    continue;
+
+                using(new AssertionScope())
+                {
+                    Assert.Multiple(() =>
                     {
-                        foreach(Track track in tracks)
-                        {
-                            errno = inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] isrc);
+                        Assert.AreEqual(test.Sectors, image.Info.Sectors, $"Sectors (output): {testFile}");
 
-                            if(errno != ErrorNumber.NoError)
-                                continue;
+                        if(test.SectorSize > 0)
+                            Assert.AreEqual(test.SectorSize, image.Info.SectorSize,
+                                            $"Sector size (output): {testFile}");
 
-                            isrcs[(byte)track.Sequence] = Encoding.UTF8.GetString(isrc);
-                        }
-                    }
+                        Assert.AreEqual(test.Tracks.Length, image.Tracks.Count, $"Tracks (output): {testFile}");
 
-                    foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.
-                                                             Where(t => t == SectorTagType.CdTrackFlags).
-                                                             OrderBy(t => t))
-                    {
-                        foreach(Track track in tracks)
-                        {
-                            errno = inputFormat.ReadSectorTag(track.Sequence, tag, out byte[] flags);
+                        image.Tracks.Select(t => t.Session).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.Session),
+                                             $"Track session (output): {testFile}");
 
-                            if(errno != ErrorNumber.NoError)
-                                continue;
+                        image.Tracks.Select(t => t.StartSector).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.Start), $"Track start (output): {testFile}");
 
-                            trackFlags[(byte)track.Sequence] = flags[0];
-                        }
-                    }
+                        image.Tracks.Select(t => t.EndSector).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.End), $"Track end (output): {testFile}");
 
-                    for(ulong s = 0; s < inputFormat.Info.Sectors; s++)
-                    {
-                        if(s > int.MaxValue)
-                            break;
+                        image.Tracks.Select(t => t.Pregap).Should().
+                              BeEquivalentTo(test.Tracks.Select(s => s.Pregap),
+                                             $"Track pregap (output): {testFile}");
 
-                        subchannelExtents.Add((int)s);
-                    }
+                        int trackNo = 0;
 
-                    foreach(SectorTagType tag in inputFormat.Info.ReadableSectorTags.OrderBy(t => t).
-                                                             TakeWhile(tag => useLong))
-                    {
-                        switch(tag)
-                        {
-                            case SectorTagType.AppleSectorTag:
-                            case SectorTagType.CdSectorSync:
-                            case SectorTagType.CdSectorHeader:
-                            case SectorTagType.CdSectorSubHeader:
-                            case SectorTagType.CdSectorEdc:
-                            case SectorTagType.CdSectorEccP:
-                            case SectorTagType.CdSectorEccQ:
-                            case SectorTagType.CdSectorEcc:
-                                // This tags are inline in long sector
-                                continue;
-                        }
-
-                        if(!outputFormat.SupportedSectorTags.Contains(tag))
-                            continue;
-
-                        foreach(Track track in inputFormat.Tracks)
-                        {
-                            doneSectors = 0;
-                            ulong  trackSectors = track.EndSector - track.StartSector + 1;
-                            byte[] sector;
-                            bool   result;
-
-                            switch(tag)
-                            {
-                                case SectorTagType.CdTrackFlags:
-                                case SectorTagType.CdTrackIsrc:
-                                    errno = inputFormat.ReadSectorTag(track.Sequence, tag, out sector);
-
-                                    Assert.AreEqual(ErrorNumber.NoError, errno,
-                                                    $"Error {errno} reading tag, not continuing...");
-
-                                    result = outputFormat.WriteSectorTag(sector, track.Sequence, tag);
-
-                                    Assert.IsTrue(result,
-                                                  $"Error {outputFormat.ErrorMessage} writing tag, not continuing...");
-
-                                    continue;
-                            }
-
-                            while(doneSectors < trackSectors)
-                            {
-                                uint sectorsToDo;
-
-                                if(trackSectors - doneSectors >= SECTORS_TO_READ)
-                                    sectorsToDo = SECTORS_TO_READ;
-                                else
-                                    sectorsToDo = (uint)(trackSectors - doneSectors);
-
-                                if(sectorsToDo == 1)
-                                {
-                                    errno = inputFormat.ReadSectorTag(doneSectors + track.StartSector, tag, out sector);
-
-                                    Assert.AreEqual(ErrorNumber.NoError, errno,
-                                                    $"Error {errno} reading tag, not continuing...");
-
-                                    if(tag == SectorTagType.CdSectorSubchannel)
-                                    {
-                                        bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
-                                            MmcSubchannel.Raw, sector, doneSectors + track.StartSector, 1, null,
-                                            isrcs, (byte)track.Sequence, ref mcn, tracks, subchannelExtents, true,
-                                            outputFormat, true, true, null, null, smallestPregapLbaPerTrack,
-                                            false);
-
-                                        if(indexesChanged)
-                                            outputFormat.SetTracks(tracks.ToList());
-
-                                        result = true;
-                                    }
-                                    else
-                                        result = outputFormat.WriteSectorTag(sector, doneSectors + track.StartSector,
-                                                                             tag);
-                                }
-                                else
-                                {
-                                    errno = inputFormat.ReadSectorsTag(doneSectors + track.StartSector, sectorsToDo,
-                                                                       tag, out sector);
-
-                                    Assert.AreEqual(ErrorNumber.NoError, errno,
-                                                    $"Error {errno} reading tag, not continuing...");
-
-                                    if(tag == SectorTagType.CdSectorSubchannel)
-                                    {
-                                        bool indexesChanged = CompactDisc.WriteSubchannelToImage(MmcSubchannel.Raw,
-                                            MmcSubchannel.Raw, sector, doneSectors + track.StartSector,
-                                            sectorsToDo, null, isrcs, (byte)track.Sequence, ref mcn, tracks,
-                                            subchannelExtents, true, outputFormat, true, true, null, null,
-                                            smallestPregapLbaPerTrack, false);
-
-                                        if(indexesChanged)
-                                            outputFormat.SetTracks(tracks.ToList());
-
-                                        result = true;
-                                    }
-                                    else
-                                        result = outputFormat.WriteSectorsTag(sector, doneSectors + track.StartSector,
-                                                                              sectorsToDo, tag);
-                                }
-
-                                Assert.IsTrue(result,
-                                              $"Error {outputFormat.ErrorMessage} writing tag for sector {doneSectors + track.StartSector}, not continuing...");
-
-                                doneSectors += sectorsToDo;
-                            }
-                        }
-                    }
-
-                    if(isrcs.Count > 0)
-                        foreach(KeyValuePair<byte, string> isrc in isrcs)
-                            outputFormat.WriteSectorTag(Encoding.UTF8.GetBytes(isrc.Value), isrc.Key,
-                                                        SectorTagType.CdTrackIsrc);
-
-                    if(trackFlags.Count > 0)
-                        foreach((byte track, byte flags) in trackFlags)
-                            outputFormat.WriteSectorTag(new[]
-                            {
-                                flags
-                            }, track, SectorTagType.CdTrackFlags);
-
-                    if(mcn != null)
-                        outputFormat.WriteMediaTag(Encoding.UTF8.GetBytes(mcn), MediaTagType.CD_MCN);
-
-                    // TODO: Progress
-                    if(inputFormat.Info.MediaType == MediaType.CD            ||
-                       inputFormat.Info.MediaType == MediaType.CDDA          ||
-                       inputFormat.Info.MediaType == MediaType.CDG           ||
-                       inputFormat.Info.MediaType == MediaType.CDEG          ||
-                       inputFormat.Info.MediaType == MediaType.CDI           ||
-                       inputFormat.Info.MediaType == MediaType.CDROM         ||
-                       inputFormat.Info.MediaType == MediaType.CDROMXA       ||
-                       inputFormat.Info.MediaType == MediaType.CDPLUS        ||
-                       inputFormat.Info.MediaType == MediaType.CDMO          ||
-                       inputFormat.Info.MediaType == MediaType.CDR           ||
-                       inputFormat.Info.MediaType == MediaType.CDRW          ||
-                       inputFormat.Info.MediaType == MediaType.CDMRW         ||
-                       inputFormat.Info.MediaType == MediaType.VCD           ||
-                       inputFormat.Info.MediaType == MediaType.SVCD          ||
-                       inputFormat.Info.MediaType == MediaType.PCD           ||
-                       inputFormat.Info.MediaType == MediaType.DTSCD         ||
-                       inputFormat.Info.MediaType == MediaType.CDMIDI        ||
-                       inputFormat.Info.MediaType == MediaType.CDV           ||
-                       inputFormat.Info.MediaType == MediaType.CDIREADY      ||
-                       inputFormat.Info.MediaType == MediaType.FMTOWNS       ||
-                       inputFormat.Info.MediaType == MediaType.PS1CD         ||
-                       inputFormat.Info.MediaType == MediaType.PS2CD         ||
-                       inputFormat.Info.MediaType == MediaType.MEGACD        ||
-                       inputFormat.Info.MediaType == MediaType.SATURNCD      ||
-                       inputFormat.Info.MediaType == MediaType.GDROM         ||
-                       inputFormat.Info.MediaType == MediaType.GDR           ||
-                       inputFormat.Info.MediaType == MediaType.MilCD         ||
-                       inputFormat.Info.MediaType == MediaType.SuperCDROM2   ||
-                       inputFormat.Info.MediaType == MediaType.JaguarCD      ||
-                       inputFormat.Info.MediaType == MediaType.ThreeDO       ||
-                       inputFormat.Info.MediaType == MediaType.PCFX          ||
-                       inputFormat.Info.MediaType == MediaType.NeoGeoCD      ||
-                       inputFormat.Info.MediaType == MediaType.CDTV          ||
-                       inputFormat.Info.MediaType == MediaType.CD32          ||
-                       inputFormat.Info.MediaType == MediaType.Playdia       ||
-                       inputFormat.Info.MediaType == MediaType.Pippin        ||
-                       inputFormat.Info.MediaType == MediaType.VideoNow      ||
-                       inputFormat.Info.MediaType == MediaType.VideoNowColor ||
-                       inputFormat.Info.MediaType == MediaType.VideoNowXp    ||
-                       inputFormat.Info.MediaType == MediaType.CVD)
-                        CompactDisc.GenerateSubchannels(subchannelExtents, tracks, trackFlags, inputFormat.Info.Sectors,
-                                                        null, null, null, null, null, outputFormat);
-
-                    Assert.IsTrue(outputFormat.Close(),
-                                  $"Error {outputFormat.ErrorMessage} closing output image... Contents are not correct.");
-
-                    filtersList = new FiltersList();
-                    filter      = filtersList.GetFilter(outputPath);
-                    filter.Open(outputPath);
-
-                    string tmpFolder = Path.GetDirectoryName(outputPath);
-                    Environment.CurrentDirectory = tmpFolder;
-
-                    var image = Activator.CreateInstance(OutputPlugin.GetType()) as IOpticalMediaImage;
-                    Assert.NotNull(image, $"Could not instantiate output plugin for {testFile}");
-
-                    opened = image.Open(filter);
-                    Assert.AreEqual(ErrorNumber.NoError, opened, $"Open created: {testFile}");
-
-                    if(opened != ErrorNumber.NoError)
-                        continue;
-
-                    using(new AssertionScope())
-                    {
-                        Assert.Multiple(() =>
-                        {
-                            Assert.AreEqual(test.Sectors, image.Info.Sectors, $"Sectors (output): {testFile}");
-
-                            if(test.SectorSize > 0)
-                                Assert.AreEqual(test.SectorSize, image.Info.SectorSize,
-                                                $"Sector size (output): {testFile}");
-
-                            Assert.AreEqual(test.Tracks.Length, image.Tracks.Count, $"Tracks (output): {testFile}");
-
-                            image.Tracks.Select(t => t.Session).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.Session),
-                                                 $"Track session (output): {testFile}");
-
-                            image.Tracks.Select(t => t.StartSector).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.Start), $"Track start (output): {testFile}");
-
-                            image.Tracks.Select(t => t.EndSector).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.End), $"Track end (output): {testFile}");
-
-                            image.Tracks.Select(t => t.Pregap).Should().
-                                  BeEquivalentTo(test.Tracks.Select(s => s.Pregap),
-                                                 $"Track pregap (output): {testFile}");
-
-                            int trackNo = 0;
-
-                            byte?[] flags           = new byte?[image.Tracks.Count];
-                            ulong   latestEndSector = 0;
-
-                            foreach(Track currentTrack in image.Tracks)
-                            {
-                                if(currentTrack.EndSector > latestEndSector)
-                                    latestEndSector = currentTrack.EndSector;
-
-                                if(image.Info.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
-                                {
-                                    errno = image.ReadSectorTag(currentTrack.Sequence, SectorTagType.CdTrackFlags,
-                                                                out byte[] tmp);
-
-                                    if(errno == ErrorNumber.NoError)
-                                        flags[trackNo] = tmp[0];
-                                }
-
-                                trackNo++;
-                            }
-
-                            flags.Should().BeEquivalentTo(test.Tracks.Select(s => s.Flags),
-                                                          $"Track flags (output): {testFile}");
-
-                            Assert.AreEqual(latestEndSector, image.Info.Sectors - 1,
-                                            $"Last sector for tracks is {latestEndSector}, but it is {image.Info.Sectors} for image (output)");
-                        });
-                    }
-
-                    Md5Context ctx;
-
-                    foreach(bool @long in new[]
-                    {
-                        /*false,*/ true
-                    })
-                    {
-                        ctx = new Md5Context();
+                        byte?[] flags           = new byte?[image.Tracks.Count];
+                        ulong   latestEndSector = 0;
 
                         foreach(Track currentTrack in image.Tracks)
                         {
-                            ulong sectors = currentTrack.EndSector - currentTrack.StartSector + 1;
-                            doneSectors = 0;
+                            if(currentTrack.EndSector > latestEndSector)
+                                latestEndSector = currentTrack.EndSector;
 
-                            while(doneSectors < sectors)
+                            if(image.Info.ReadableSectorTags.Contains(SectorTagType.CdTrackFlags))
                             {
-                                byte[] sector;
+                                errno = image.ReadSectorTag(currentTrack.Sequence, SectorTagType.CdTrackFlags,
+                                                            out byte[] tmp);
 
-                                if(sectors - doneSectors >= SECTORS_TO_READ)
-                                {
-                                    errno = @long ? image.ReadSectorsLong(doneSectors, SECTORS_TO_READ,
-                                                                          currentTrack.Sequence, out sector)
-                                                : image.ReadSectors(doneSectors, SECTORS_TO_READ, currentTrack.Sequence,
-                                                                    out sector);
-
-                                    doneSectors += SECTORS_TO_READ;
-                                }
-                                else
-                                {
-                                    errno = @long ? image.ReadSectorsLong(doneSectors, (uint)(sectors - doneSectors),
-                                                                          currentTrack.Sequence, out sector)
-                                                : image.ReadSectors(doneSectors, (uint)(sectors - doneSectors),
-                                                                    currentTrack.Sequence, out sector);
-
-                                    doneSectors += sectors - doneSectors;
-                                }
-
-                                Assert.AreEqual(ErrorNumber.NoError, errno);
-
-                                ctx.Update(sector);
+                                if(errno == ErrorNumber.NoError)
+                                    flags[trackNo] = tmp[0];
                             }
+
+                            trackNo++;
                         }
 
-                        Assert.AreEqual(@long ? test.LongMD5 : test.MD5, ctx.End(),
-                                        $"{(@long ? "Long hash (output)" : "Hash (output)")}: {testFile}");
-                    }
+                        flags.Should().BeEquivalentTo(test.Tracks.Select(s => s.Flags),
+                                                      $"Track flags (output): {testFile}");
 
-                    if(!image.Info.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
-                        return;
+                        Assert.AreEqual(latestEndSector, image.Info.Sectors - 1,
+                                        $"Last sector for tracks is {latestEndSector}, but it is {image.Info.Sectors} for image (output)");
+                    });
+                }
 
+                Md5Context ctx;
+
+                foreach(bool @long in new[]
+                        {
+                            /*false,*/ true
+                        })
+                {
                     ctx = new Md5Context();
 
                     foreach(Track currentTrack in image.Tracks)
@@ -618,16 +575,19 @@ namespace Aaru.Tests.WritableImages
 
                             if(sectors - doneSectors >= SECTORS_TO_READ)
                             {
-                                errno = image.ReadSectorsTag(doneSectors, SECTORS_TO_READ, currentTrack.Sequence,
-                                                             SectorTagType.CdSectorSubchannel, out sector);
+                                errno = @long ? image.ReadSectorsLong(doneSectors, SECTORS_TO_READ,
+                                                                      currentTrack.Sequence, out sector)
+                                            : image.ReadSectors(doneSectors, SECTORS_TO_READ, currentTrack.Sequence,
+                                                                out sector);
 
                                 doneSectors += SECTORS_TO_READ;
                             }
                             else
                             {
-                                errno = image.ReadSectorsTag(doneSectors, (uint)(sectors - doneSectors),
-                                                             currentTrack.Sequence, SectorTagType.CdSectorSubchannel,
-                                                             out sector);
+                                errno = @long ? image.ReadSectorsLong(doneSectors, (uint)(sectors - doneSectors),
+                                                                      currentTrack.Sequence, out sector)
+                                            : image.ReadSectors(doneSectors, (uint)(sectors - doneSectors),
+                                                                currentTrack.Sequence, out sector);
 
                                 doneSectors += sectors - doneSectors;
                             }
@@ -638,9 +598,48 @@ namespace Aaru.Tests.WritableImages
                         }
                     }
 
-                    Assert.AreEqual(test.SubchannelMD5, ctx.End(), $"Subchannel hash (output): {testFile}");
+                    Assert.AreEqual(@long ? test.LongMD5 : test.MD5, ctx.End(),
+                                    $"{(@long ? "Long hash (output)" : "Hash (output)")}: {testFile}");
                 }
-            });
-        }
+
+                if(!image.Info.ReadableSectorTags.Contains(SectorTagType.CdSectorSubchannel))
+                    return;
+
+                ctx = new Md5Context();
+
+                foreach(Track currentTrack in image.Tracks)
+                {
+                    ulong sectors = currentTrack.EndSector - currentTrack.StartSector + 1;
+                    doneSectors = 0;
+
+                    while(doneSectors < sectors)
+                    {
+                        byte[] sector;
+
+                        if(sectors - doneSectors >= SECTORS_TO_READ)
+                        {
+                            errno = image.ReadSectorsTag(doneSectors, SECTORS_TO_READ, currentTrack.Sequence,
+                                                         SectorTagType.CdSectorSubchannel, out sector);
+
+                            doneSectors += SECTORS_TO_READ;
+                        }
+                        else
+                        {
+                            errno = image.ReadSectorsTag(doneSectors, (uint)(sectors - doneSectors),
+                                                         currentTrack.Sequence, SectorTagType.CdSectorSubchannel,
+                                                         out sector);
+
+                            doneSectors += sectors - doneSectors;
+                        }
+
+                        Assert.AreEqual(ErrorNumber.NoError, errno);
+
+                        ctx.Update(sector);
+                    }
+                }
+
+                Assert.AreEqual(test.SubchannelMD5, ctx.End(), $"Subchannel hash (output): {testFile}");
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Archive/ArchiveFamily.cs b/Aaru/Commands/Archive/ArchiveFamily.cs
index 94bff8f78..3c68a18ab 100644
--- a/Aaru/Commands/Archive/ArchiveFamily.cs
+++ b/Aaru/Commands/Archive/ArchiveFamily.cs
@@ -33,15 +33,14 @@
 
 using System.CommandLine;
 
-namespace Aaru.Commands.Archive
-{
-    internal sealed class ArchiveFamily : Command
-    {
-        internal ArchiveFamily() : base("archive", "Commands to manage archive files")
-        {
-            AddAlias("arc");
+namespace Aaru.Commands.Archive;
 
-            AddCommand(new ArchiveInfoCommand());
-        }
+internal sealed class ArchiveFamily : Command
+{
+    internal ArchiveFamily() : base("archive", "Commands to manage archive files")
+    {
+        AddAlias("arc");
+
+        AddCommand(new ArchiveInfoCommand());
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Archive/Info.cs b/Aaru/Commands/Archive/Info.cs
index 98fa38c41..becdb4d2e 100644
--- a/Aaru/Commands/Archive/Info.cs
+++ b/Aaru/Commands/Archive/Info.cs
@@ -38,60 +38,59 @@ using Aaru.Console;
 using Aaru.Core;
 using Spectre.Console;
 
-namespace Aaru.Commands.Archive
+namespace Aaru.Commands.Archive;
+
+internal sealed class ArchiveInfoCommand : Command
 {
-    internal sealed class ArchiveInfoCommand : Command
+    public ArchiveInfoCommand() : base("info", "Identifies an archive file and shows information about it.")
     {
-        public ArchiveInfoCommand() : base("info", "Identifies an archive file and shows information about it.")
+        AddArgument(new Argument<string>
         {
-            AddArgument(new Argument<string>
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "Archive file path",
+            Name        = "archive-path"
+        });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, string imagePath)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "Archive file path",
-                Name        = "archive-path"
+                Out = new AnsiConsoleOutput(System.Console.Error)
             });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
-        }
-
-        public static int Invoke(bool debug, bool verbose, string imagePath)
-        {
-            MainClass.PrintCopyright();
-
-            if(debug)
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
-
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            Statistics.AddCommand("archive-info");
-
-            AaruConsole.DebugWriteLine("Analyze command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Analyze command", "--input={0}", imagePath);
-            AaruConsole.DebugWriteLine("Analyze command", "--verbose={0}", verbose);
-
-            /* TODO: This is just a stub for now */
-
-            return (int)ErrorNumber.NoError;
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
+
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        Statistics.AddCommand("archive-info");
+
+        AaruConsole.DebugWriteLine("Analyze command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Analyze command", "--input={0}", imagePath);
+        AaruConsole.DebugWriteLine("Analyze command", "--verbose={0}", verbose);
+
+        /* TODO: This is just a stub for now */
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Configure.cs b/Aaru/Commands/Configure.cs
index 4fbd02077..2b59e2f9d 100644
--- a/Aaru/Commands/Configure.cs
+++ b/Aaru/Commands/Configure.cs
@@ -38,147 +38,163 @@ using Aaru.Console;
 using Aaru.Settings;
 using Spectre.Console;
 
-namespace Aaru.Commands
+namespace Aaru.Commands;
+
+internal sealed class ConfigureCommand : Command
 {
-    internal sealed class ConfigureCommand : Command
+    public ConfigureCommand() : base("configure", "Configures user settings and statistics.") =>
+        Handler = CommandHandler.Create((Func<bool, bool, int>)Invoke);
+
+    int Invoke(bool debug, bool verbose)
     {
-        public ConfigureCommand() : base("configure", "Configures user settings and statistics.") =>
-            Handler = CommandHandler.Create((Func<bool, bool, int>)Invoke);
+        MainClass.PrintCopyright();
 
-        int Invoke(bool debug, bool verbose)
+        if(debug)
         {
-            MainClass.PrintCopyright();
-
-            if(debug)
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            return DoConfigure(false);
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        internal int DoConfigure(bool gdprChange)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        return DoConfigure(false);
+    }
+
+    internal int DoConfigure(bool gdprChange)
+    {
+        if(gdprChange)
         {
-            if(gdprChange)
-            {
-                AaruConsole.
-                    WriteLine("In compliance with the [bold]European Union General Data Protection Regulation 2016/679 ([italic]GDPR[/])[/],\n" +
-                              "we must give you the following information about [italic]Aaru[/] and ask if you want to opt-in\n" +
-                              "in some information sharing.");
-
-                AaruConsole.WriteLine();
-
-                AaruConsole.
-                    WriteLine("Disclaimer: Because [italic]Aaru[/] is an open source software this information, and therefore,\n" +
-                              "compliance with [bold]GDPR[/] only holds true if you obtained a certificated copy from its original\n" +
-                              "authors. In case of doubt, close [italic]Aaru[/] now and ask in our IRC support channel.");
-
-                AaruConsole.WriteLine();
-
-                AaruConsole.
-                    WriteLine("For any information sharing your IP address may be stored in our server, in a way that is not\n" +
-                              "possible for any person, manual, or automated process, to link with your identity, unless\n" +
-                              "specified otherwise.");
-            }
-
-            var pressedKey = new ConsoleKeyInfo();
+            AaruConsole.
+                WriteLine("In compliance with the [bold]European Union General Data Protection Regulation 2016/679 ([italic]GDPR[/])[/],\n" +
+                          "we must give you the following information about [italic]Aaru[/] and ask if you want to opt-in\n" +
+                          "in some information sharing.");
 
             AaruConsole.WriteLine();
 
             AaruConsole.
-                WriteLine("Do you want to enable the decryption of copy protected media (also known as [italic]DRM[/]),\n" +
-                          "like for example [italic]DVD Video CSS[/] encryption.\n" +
-                          "[bold]Consult your local laws before enabling it, as this is illegal in some countries, or\n" +
-                          "only legal under some circumstances[/].");
+                WriteLine("Disclaimer: Because [italic]Aaru[/] is an open source software this information, and therefore,\n" +
+                          "compliance with [bold]GDPR[/] only holds true if you obtained a certificated copy from its original\n" +
+                          "authors. In case of doubt, close [italic]Aaru[/] now and ask in our IRC support channel.");
 
-            while(pressedKey.Key != ConsoleKey.Y &&
-                  pressedKey.Key != ConsoleKey.N)
-            {
-                AaruConsole.
-                    Write("[italic]Do you want to enable decryption of copy protected media?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                pressedKey = System.Console.ReadKey();
-                AaruConsole.WriteLine();
-            }
-
-            Settings.Settings.Current.EnableDecryption = pressedKey.Key == ConsoleKey.Y;
-
-            #region Device reports
             AaruConsole.WriteLine();
 
             AaruConsole.
-                WriteLine(
-                          "With the 'device-report' command, [italic]Aaru[/] creates a report of a device, that includes its\n" +
-                          "manufacturer, model, firmware revision and/or version, attached bus, size, and supported commands.\n" +
-                          "The serial number of the device is not stored in the report. If used with the debug parameter,\n" +
-                          "extra information about the device will be stored in the report. This information is known to contain\n" +
-                          "the device serial number in non-standard places that prevent the automatic removal of it on a handful\n" +
-                          "of devices. A human-readable copy of the report in XML format is always created in the same directory\n" +
-                          "where [italic]Aaru[/] is being run from.");
+                WriteLine("For any information sharing your IP address may be stored in our server, in a way that is not\n" +
+                          "possible for any person, manual, or automated process, to link with your identity, unless\n" +
+                          "specified otherwise.");
+        }
 
-            while(pressedKey.Key != ConsoleKey.Y &&
-                  pressedKey.Key != ConsoleKey.N)
-            {
-                AaruConsole.
-                    Write("[italic]Do you want to save device reports in shared folder of your computer? [bold]([green]Y[/]/[red]N[/]):[/] ");
+        var pressedKey = new ConsoleKeyInfo();
 
-                pressedKey = System.Console.ReadKey();
-                AaruConsole.WriteLine();
-            }
+        AaruConsole.WriteLine();
 
-            Settings.Settings.Current.SaveReportsGlobally = pressedKey.Key == ConsoleKey.Y;
-
-            pressedKey = new ConsoleKeyInfo();
-            AaruConsole.WriteLine();
+        AaruConsole.
+            WriteLine("Do you want to enable the decryption of copy protected media (also known as [italic]DRM[/]),\n" +
+                      "like for example [italic]DVD Video CSS[/] encryption.\n"                                        +
+                      "[bold]Consult your local laws before enabling it, as this is illegal in some countries, or\n"   +
+                      "only legal under some circumstances[/].");
 
+        while(pressedKey.Key != ConsoleKey.Y &&
+              pressedKey.Key != ConsoleKey.N)
+        {
             AaruConsole.
-                WriteLine("Sharing a report with us will send it to our server, that's in the european union territory, where it\n" +
-                          "will be manually analyzed by an european union citizen to remove any trace of personal identification\n" +
-                          "from it. Once that is done, it will be shared in our stats website, [italic][blue]https://www.aaru.app[/][/]\n" +
-                          "These report will be used to improve [italic]Aaru[/] support, and in some cases, to provide emulation of the\n" +
-                          "devices to other open-source projects. In any case, no information linking the report to you will be stored.");
+                Write("[italic]Do you want to enable decryption of copy protected media?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
 
-            while(pressedKey.Key != ConsoleKey.Y &&
-                  pressedKey.Key != ConsoleKey.N)
-            {
-                AaruConsole.
-                    Write("[italic]Do you want to share your device reports with us?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                pressedKey = System.Console.ReadKey();
-                AaruConsole.WriteLine();
-            }
-
-            Settings.Settings.Current.ShareReports = pressedKey.Key == ConsoleKey.Y;
-            #endregion Device reports
-
-            #region Statistics
+            pressedKey = System.Console.ReadKey();
             AaruConsole.WriteLine();
+        }
 
+        Settings.Settings.Current.EnableDecryption = pressedKey.Key == ConsoleKey.Y;
+
+        #region Device reports
+        AaruConsole.WriteLine();
+
+        AaruConsole.
+            WriteLine(
+                      "With the 'device-report' command, [italic]Aaru[/] creates a report of a device, that includes its\n" +
+                      "manufacturer, model, firmware revision and/or version, attached bus, size, and supported commands.\n" +
+                      "The serial number of the device is not stored in the report. If used with the debug parameter,\n" +
+                      "extra information about the device will be stored in the report. This information is known to contain\n" +
+                      "the device serial number in non-standard places that prevent the automatic removal of it on a handful\n" +
+                      "of devices. A human-readable copy of the report in XML format is always created in the same directory\n" +
+                      "where [italic]Aaru[/] is being run from.");
+
+        while(pressedKey.Key != ConsoleKey.Y &&
+              pressedKey.Key != ConsoleKey.N)
+        {
             AaruConsole.
-                WriteLine("[italic]Aaru[/] can store some usage statistics. These statistics are limited to the number of times a\n" +
-                          "command is executed, a filesystem, partition, or device is used, the operating system version, and other.\n" +
-                          "In no case, any information besides pure statistical usage numbers is stored, and they're just joint to the\n" +
-                          "pool with no way of using them to identify you.");
+                Write("[italic]Do you want to save device reports in shared folder of your computer? [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+            pressedKey = System.Console.ReadKey();
+            AaruConsole.WriteLine();
+        }
+
+        Settings.Settings.Current.SaveReportsGlobally = pressedKey.Key == ConsoleKey.Y;
+
+        pressedKey = new ConsoleKeyInfo();
+        AaruConsole.WriteLine();
+
+        AaruConsole.
+            WriteLine("Sharing a report with us will send it to our server, that's in the european union territory, where it\n" +
+                      "will be manually analyzed by an european union citizen to remove any trace of personal identification\n" +
+                      "from it. Once that is done, it will be shared in our stats website, [italic][blue]https://www.aaru.app[/][/]\n" +
+                      "These report will be used to improve [italic]Aaru[/] support, and in some cases, to provide emulation of the\n" +
+                      "devices to other open-source projects. In any case, no information linking the report to you will be stored.");
+
+        while(pressedKey.Key != ConsoleKey.Y &&
+              pressedKey.Key != ConsoleKey.N)
+        {
+            AaruConsole.
+                Write("[italic]Do you want to share your device reports with us?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+            pressedKey = System.Console.ReadKey();
+            AaruConsole.WriteLine();
+        }
+
+        Settings.Settings.Current.ShareReports = pressedKey.Key == ConsoleKey.Y;
+        #endregion Device reports
+
+        #region Statistics
+        AaruConsole.WriteLine();
+
+        AaruConsole.
+            WriteLine("[italic]Aaru[/] can store some usage statistics. These statistics are limited to the number of times a\n" +
+                      "command is executed, a filesystem, partition, or device is used, the operating system version, and other.\n" +
+                      "In no case, any information besides pure statistical usage numbers is stored, and they're just joint to the\n" +
+                      "pool with no way of using them to identify you.");
+
+        pressedKey = new ConsoleKeyInfo();
+
+        while(pressedKey.Key != ConsoleKey.Y &&
+              pressedKey.Key != ConsoleKey.N)
+        {
+            AaruConsole.
+                Write("[italic]Do you want to save stats about your Aaru usage?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+            pressedKey = System.Console.ReadKey();
+            AaruConsole.WriteLine();
+        }
+
+        if(pressedKey.Key == ConsoleKey.Y)
+        {
+            Settings.Settings.Current.Stats = new StatsSettings();
 
             pressedKey = new ConsoleKeyInfo();
 
@@ -186,164 +202,147 @@ namespace Aaru.Commands
                   pressedKey.Key != ConsoleKey.N)
             {
                 AaruConsole.
-                    Write("[italic]Do you want to save stats about your Aaru usage?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+                    Write("[italic]Do you want to share your stats (anonymously)?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
 
                 pressedKey = System.Console.ReadKey();
                 AaruConsole.WriteLine();
             }
 
-            if(pressedKey.Key == ConsoleKey.Y)
+            Settings.Settings.Current.Stats.ShareStats = pressedKey.Key == ConsoleKey.Y;
+
+            pressedKey = new ConsoleKeyInfo();
+
+            while(pressedKey.Key != ConsoleKey.Y &&
+                  pressedKey.Key != ConsoleKey.N)
             {
-                Settings.Settings.Current.Stats = new StatsSettings();
+                AaruConsole.
+                    Write("[italic]Do you want to gather statistics about command usage?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
 
-                pressedKey = new ConsoleKeyInfo();
-
-                while(pressedKey.Key != ConsoleKey.Y &&
-                      pressedKey.Key != ConsoleKey.N)
-                {
-                    AaruConsole.
-                        Write("[italic]Do you want to share your stats (anonymously)?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                    pressedKey = System.Console.ReadKey();
-                    AaruConsole.WriteLine();
-                }
-
-                Settings.Settings.Current.Stats.ShareStats = pressedKey.Key == ConsoleKey.Y;
-
-                pressedKey = new ConsoleKeyInfo();
-
-                while(pressedKey.Key != ConsoleKey.Y &&
-                      pressedKey.Key != ConsoleKey.N)
-                {
-                    AaruConsole.
-                        Write("[italic]Do you want to gather statistics about command usage?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                    pressedKey = System.Console.ReadKey();
-                    AaruConsole.WriteLine();
-                }
-
-                Settings.Settings.Current.Stats.CommandStats = pressedKey.Key == ConsoleKey.Y;
-
-                pressedKey = new ConsoleKeyInfo();
-
-                while(pressedKey.Key != ConsoleKey.Y &&
-                      pressedKey.Key != ConsoleKey.N)
-                {
-                    AaruConsole.
-                        Write("[italic]Do you want to gather statistics about found devices?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                    pressedKey = System.Console.ReadKey();
-                    AaruConsole.WriteLine();
-                }
-
-                Settings.Settings.Current.Stats.DeviceStats = pressedKey.Key == ConsoleKey.Y;
-
-                pressedKey = new ConsoleKeyInfo();
-
-                while(pressedKey.Key != ConsoleKey.Y &&
-                      pressedKey.Key != ConsoleKey.N)
-                {
-                    AaruConsole.
-                        Write("[italic]Do you want to gather statistics about found filesystems?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                    pressedKey = System.Console.ReadKey();
-                    AaruConsole.WriteLine();
-                }
-
-                Settings.Settings.Current.Stats.FilesystemStats = pressedKey.Key == ConsoleKey.Y;
-
-                pressedKey = new ConsoleKeyInfo();
-
-                while(pressedKey.Key != ConsoleKey.Y &&
-                      pressedKey.Key != ConsoleKey.N)
-                {
-                    AaruConsole.
-                        Write("[italic]Do you want to gather statistics about found file filters?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                    pressedKey = System.Console.ReadKey();
-                    AaruConsole.WriteLine();
-                }
-
-                Settings.Settings.Current.Stats.FilterStats = pressedKey.Key == ConsoleKey.Y;
-
-                pressedKey = new ConsoleKeyInfo();
-
-                while(pressedKey.Key != ConsoleKey.Y &&
-                      pressedKey.Key != ConsoleKey.N)
-                {
-                    AaruConsole.
-                        Write("[italic]Do you want to gather statistics about found media image formats?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                    pressedKey = System.Console.ReadKey();
-                    AaruConsole.WriteLine();
-                }
-
-                Settings.Settings.Current.Stats.MediaImageStats = pressedKey.Key == ConsoleKey.Y;
-
-                pressedKey = new ConsoleKeyInfo();
-
-                while(pressedKey.Key != ConsoleKey.Y &&
-                      pressedKey.Key != ConsoleKey.N)
-                {
-                    AaruConsole.
-                        Write("[italic]Do you want to gather statistics about scanned media?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                    pressedKey = System.Console.ReadKey();
-                    AaruConsole.WriteLine();
-                }
-
-                Settings.Settings.Current.Stats.MediaScanStats = pressedKey.Key == ConsoleKey.Y;
-
-                pressedKey = new ConsoleKeyInfo();
-
-                while(pressedKey.Key != ConsoleKey.Y &&
-                      pressedKey.Key != ConsoleKey.N)
-                {
-                    AaruConsole.
-                        Write("[italic]Do you want to gather statistics about found partitioning schemes?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                    pressedKey = System.Console.ReadKey();
-                    AaruConsole.WriteLine();
-                }
-
-                Settings.Settings.Current.Stats.PartitionStats = pressedKey.Key == ConsoleKey.Y;
-
-                pressedKey = new ConsoleKeyInfo();
-
-                while(pressedKey.Key != ConsoleKey.Y &&
-                      pressedKey.Key != ConsoleKey.N)
-                {
-                    AaruConsole.
-                        Write("[italic]Do you want to gather statistics about media types?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                    pressedKey = System.Console.ReadKey();
-                    AaruConsole.WriteLine();
-                }
-
-                Settings.Settings.Current.Stats.MediaStats = pressedKey.Key == ConsoleKey.Y;
-
-                pressedKey = new ConsoleKeyInfo();
-
-                while(pressedKey.Key != ConsoleKey.Y &&
-                      pressedKey.Key != ConsoleKey.N)
-                {
-                    AaruConsole.
-                        Write("[italic]Do you want to gather statistics about media image verifications?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
-
-                    pressedKey = System.Console.ReadKey();
-                    AaruConsole.WriteLine();
-                }
-
-                Settings.Settings.Current.Stats.VerifyStats = pressedKey.Key == ConsoleKey.Y;
+                pressedKey = System.Console.ReadKey();
+                AaruConsole.WriteLine();
             }
-            else
-                Settings.Settings.Current.Stats = null;
-            #endregion Statistics
 
-            Settings.Settings.Current.GdprCompliance = DicSettings.GDPR_LEVEL;
-            Settings.Settings.SaveSettings();
+            Settings.Settings.Current.Stats.CommandStats = pressedKey.Key == ConsoleKey.Y;
 
-            return (int)ErrorNumber.NoError;
+            pressedKey = new ConsoleKeyInfo();
+
+            while(pressedKey.Key != ConsoleKey.Y &&
+                  pressedKey.Key != ConsoleKey.N)
+            {
+                AaruConsole.
+                    Write("[italic]Do you want to gather statistics about found devices?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+                pressedKey = System.Console.ReadKey();
+                AaruConsole.WriteLine();
+            }
+
+            Settings.Settings.Current.Stats.DeviceStats = pressedKey.Key == ConsoleKey.Y;
+
+            pressedKey = new ConsoleKeyInfo();
+
+            while(pressedKey.Key != ConsoleKey.Y &&
+                  pressedKey.Key != ConsoleKey.N)
+            {
+                AaruConsole.
+                    Write("[italic]Do you want to gather statistics about found filesystems?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+                pressedKey = System.Console.ReadKey();
+                AaruConsole.WriteLine();
+            }
+
+            Settings.Settings.Current.Stats.FilesystemStats = pressedKey.Key == ConsoleKey.Y;
+
+            pressedKey = new ConsoleKeyInfo();
+
+            while(pressedKey.Key != ConsoleKey.Y &&
+                  pressedKey.Key != ConsoleKey.N)
+            {
+                AaruConsole.
+                    Write("[italic]Do you want to gather statistics about found file filters?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+                pressedKey = System.Console.ReadKey();
+                AaruConsole.WriteLine();
+            }
+
+            Settings.Settings.Current.Stats.FilterStats = pressedKey.Key == ConsoleKey.Y;
+
+            pressedKey = new ConsoleKeyInfo();
+
+            while(pressedKey.Key != ConsoleKey.Y &&
+                  pressedKey.Key != ConsoleKey.N)
+            {
+                AaruConsole.
+                    Write("[italic]Do you want to gather statistics about found media image formats?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+                pressedKey = System.Console.ReadKey();
+                AaruConsole.WriteLine();
+            }
+
+            Settings.Settings.Current.Stats.MediaImageStats = pressedKey.Key == ConsoleKey.Y;
+
+            pressedKey = new ConsoleKeyInfo();
+
+            while(pressedKey.Key != ConsoleKey.Y &&
+                  pressedKey.Key != ConsoleKey.N)
+            {
+                AaruConsole.
+                    Write("[italic]Do you want to gather statistics about scanned media?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+                pressedKey = System.Console.ReadKey();
+                AaruConsole.WriteLine();
+            }
+
+            Settings.Settings.Current.Stats.MediaScanStats = pressedKey.Key == ConsoleKey.Y;
+
+            pressedKey = new ConsoleKeyInfo();
+
+            while(pressedKey.Key != ConsoleKey.Y &&
+                  pressedKey.Key != ConsoleKey.N)
+            {
+                AaruConsole.
+                    Write("[italic]Do you want to gather statistics about found partitioning schemes?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+                pressedKey = System.Console.ReadKey();
+                AaruConsole.WriteLine();
+            }
+
+            Settings.Settings.Current.Stats.PartitionStats = pressedKey.Key == ConsoleKey.Y;
+
+            pressedKey = new ConsoleKeyInfo();
+
+            while(pressedKey.Key != ConsoleKey.Y &&
+                  pressedKey.Key != ConsoleKey.N)
+            {
+                AaruConsole.
+                    Write("[italic]Do you want to gather statistics about media types?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+                pressedKey = System.Console.ReadKey();
+                AaruConsole.WriteLine();
+            }
+
+            Settings.Settings.Current.Stats.MediaStats = pressedKey.Key == ConsoleKey.Y;
+
+            pressedKey = new ConsoleKeyInfo();
+
+            while(pressedKey.Key != ConsoleKey.Y &&
+                  pressedKey.Key != ConsoleKey.N)
+            {
+                AaruConsole.
+                    Write("[italic]Do you want to gather statistics about media image verifications?[/] [bold]([green]Y[/]/[red]N[/]):[/] ");
+
+                pressedKey = System.Console.ReadKey();
+                AaruConsole.WriteLine();
+            }
+
+            Settings.Settings.Current.Stats.VerifyStats = pressedKey.Key == ConsoleKey.Y;
         }
+        else
+            Settings.Settings.Current.Stats = null;
+        #endregion Statistics
+
+        Settings.Settings.Current.GdprCompliance = DicSettings.GDPR_LEVEL;
+        Settings.Settings.SaveSettings();
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Database/DatabaseFamily.cs b/Aaru/Commands/Database/DatabaseFamily.cs
index 281ff816d..15b1c66b6 100644
--- a/Aaru/Commands/Database/DatabaseFamily.cs
+++ b/Aaru/Commands/Database/DatabaseFamily.cs
@@ -32,17 +32,16 @@
 
 using System.CommandLine;
 
-namespace Aaru.Commands.Database
-{
-    internal sealed class DatabaseFamily : Command
-    {
-        internal DatabaseFamily(bool mainDbUpdate) : base("database",
-                                                          "Commands to manage the device and statistics database")
-        {
-            AddAlias("db");
+namespace Aaru.Commands.Database;
 
-            AddCommand(new StatisticsCommand());
-            AddCommand(new UpdateCommand(mainDbUpdate));
-        }
+internal sealed class DatabaseFamily : Command
+{
+    internal DatabaseFamily(bool mainDbUpdate) : base("database",
+                                                      "Commands to manage the device and statistics database")
+    {
+        AddAlias("db");
+
+        AddCommand(new StatisticsCommand());
+        AddCommand(new UpdateCommand(mainDbUpdate));
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Database/Statistics.cs b/Aaru/Commands/Database/Statistics.cs
index 2234428f2..c059650f3 100644
--- a/Aaru/Commands/Database/Statistics.cs
+++ b/Aaru/Commands/Database/Statistics.cs
@@ -39,321 +39,320 @@ using Aaru.Database.Models;
 using Spectre.Console;
 using Command = System.CommandLine.Command;
 
-namespace Aaru.Commands.Database
+namespace Aaru.Commands.Database;
+
+internal sealed class StatisticsCommand : Command
 {
-    internal sealed class StatisticsCommand : Command
+    public StatisticsCommand() : base("stats", "Shows statistics.") =>
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+
+    public static int Invoke(bool debug, bool verbose)
     {
-        public StatisticsCommand() : base("stats", "Shows statistics.") =>
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        MainClass.PrintCopyright();
 
-        public static int Invoke(bool debug, bool verbose)
+        if(debug)
         {
-            MainClass.PrintCopyright();
-
-            if(debug)
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-
-            if(!ctx.Commands.Any()     &&
-               !ctx.Filesystems.Any()  &&
-               !ctx.Filters.Any()      &&
-               !ctx.MediaFormats.Any() &&
-               !ctx.Medias.Any()       &&
-               !ctx.Partitions.Any()   &&
-               !ctx.SeenDevices.Any())
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
             {
-                AaruConsole.WriteLine("There are no statistics.");
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
+        }
 
-                return (int)ErrorNumber.NothingFound;
-            }
-
-            bool  thereAreStats = false;
-            Table table;
-
-            if(ctx.Commands.Any())
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
             {
-                table = new Table
-                {
-                    Title = new TableTitle("Commands statistics")
-                };
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
 
-                table.AddColumn("Command");
-                table.AddColumn("Times used");
-                table.Columns[1].RightAligned();
+        var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
 
-                if(ctx.Commands.Any(c => c.Name == "analyze"))
+        if(!ctx.Commands.Any()     &&
+           !ctx.Filesystems.Any()  &&
+           !ctx.Filters.Any()      &&
+           !ctx.MediaFormats.Any() &&
+           !ctx.Medias.Any()       &&
+           !ctx.Partitions.Any()   &&
+           !ctx.SeenDevices.Any())
+        {
+            AaruConsole.WriteLine("There are no statistics.");
+
+            return (int)ErrorNumber.NothingFound;
+        }
+
+        bool  thereAreStats = false;
+        Table table;
+
+        if(ctx.Commands.Any())
+        {
+            table = new Table
+            {
+                Title = new TableTitle("Commands statistics")
+            };
+
+            table.AddColumn("Command");
+            table.AddColumn("Times used");
+            table.Columns[1].RightAligned();
+
+            if(ctx.Commands.Any(c => c.Name == "analyze"))
+            {
+                foreach(Aaru.Database.Models.Command oldAnalyze in ctx.Commands.Where(c => c.Name == "analyze"))
                 {
-                    foreach(Aaru.Database.Models.Command oldAnalyze in ctx.Commands.Where(c => c.Name == "analyze"))
+                    oldAnalyze.Name = "fs-info";
+                    ctx.Commands.Update(oldAnalyze);
+                }
+
+                ulong count = 0;
+
+                foreach(Aaru.Database.Models.Command fsInfo in ctx.Commands.Where(c => c.Name == "fs-info" &&
+                            c.Synchronized))
+                {
+                    count += fsInfo.Count;
+                    ctx.Remove(fsInfo);
+                }
+
+                if(count > 0)
+                    ctx.Commands.Add(new Aaru.Database.Models.Command
                     {
-                        oldAnalyze.Name = "fs-info";
-                        ctx.Commands.Update(oldAnalyze);
-                    }
+                        Count        = count,
+                        Name         = "fs-info",
+                        Synchronized = true
+                    });
 
-                    ulong count = 0;
-
-                    foreach(Aaru.Database.Models.Command fsInfo in ctx.Commands.Where(c => c.Name == "fs-info" &&
-                        c.Synchronized))
-                    {
-                        count += fsInfo.Count;
-                        ctx.Remove(fsInfo);
-                    }
-
-                    if(count > 0)
-                        ctx.Commands.Add(new Aaru.Database.Models.Command
-                        {
-                            Count        = count,
-                            Name         = "fs-info",
-                            Synchronized = true
-                        });
-
-                    ctx.SaveChanges();
-                }
-
-                foreach(string command in ctx.Commands.Select(c => c.Name).Distinct().OrderBy(c => c))
-                {
-                    ulong count = ctx.Commands.Where(c => c.Name == command && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Commands.LongCount(c => c.Name == command && !c.Synchronized);
-
-                    if(count == 0)
-                        continue;
-
-                    table.AddRow(Markup.Escape(command), $"{count}");
-                    thereAreStats = true;
-                }
-
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
+                ctx.SaveChanges();
             }
 
-            if(ctx.Filters.Any())
+            foreach(string command in ctx.Commands.Select(c => c.Name).Distinct().OrderBy(c => c))
             {
-                table = new Table
-                {
-                    Title = new TableTitle("Filters statistics")
-                };
+                ulong count = ctx.Commands.Where(c => c.Name == command && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
 
-                table.AddColumn("Filter");
-                table.AddColumn("Times found");
-                table.Columns[1].RightAligned();
+                count += (ulong)ctx.Commands.LongCount(c => c.Name == command && !c.Synchronized);
 
-                foreach(string filter in ctx.Filters.Select(c => c.Name).Distinct().OrderBy(c => c))
-                {
-                    ulong count = ctx.Filters.Where(c => c.Name == filter && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
+                if(count == 0)
+                    continue;
 
-                    count += (ulong)ctx.Filters.LongCount(c => c.Name == filter && !c.Synchronized);
-
-                    if(count == 0)
-                        continue;
-
-                    table.AddRow(Markup.Escape(filter), $"{count}");
-                    thereAreStats = true;
-                }
-
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
-
-            if(ctx.MediaFormats.Any())
-            {
-                table = new Table
-                {
-                    Title = new TableTitle("Media image format statistics")
-                };
-
-                table.AddColumn("Format");
-                table.AddColumn("Times found");
-                table.Columns[1].RightAligned();
-
-                foreach(string format in ctx.MediaFormats.Select(c => c.Name).Distinct().OrderBy(c => c))
-                {
-                    ulong count = ctx.MediaFormats.Where(c => c.Name == format && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.MediaFormats.LongCount(c => c.Name == format && !c.Synchronized);
-
-                    if(count == 0)
-                        continue;
-
-                    table.AddRow(Markup.Escape(format), $"{count}");
-                    thereAreStats = true;
-                }
-
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
-
-            if(ctx.Partitions.Any())
-            {
-                table = new Table
-                {
-                    Title = new TableTitle("Partitioning scheme statistics")
-                };
-
-                table.AddColumn("Scheme");
-                table.AddColumn("Times found");
-                table.Columns[1].RightAligned();
-
-                foreach(string partition in ctx.Partitions.Select(c => c.Name).Distinct().OrderBy(c => c))
-                {
-                    ulong count = ctx.Partitions.Where(c => c.Name == partition && c.Synchronized).Select(c => c.Count).
-                                      FirstOrDefault();
-
-                    count += (ulong)ctx.Partitions.LongCount(c => c.Name == partition && !c.Synchronized);
-
-                    if(count == 0)
-                        continue;
-
-                    table.AddRow(Markup.Escape(partition), $"{count}");
-                    thereAreStats = true;
-                }
-
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
-
-            if(ctx.Filesystems.Any())
-            {
-                table = new Table
-                {
-                    Title = new TableTitle("Filesystem statistics")
-                };
-
-                table.AddColumn("Filesystem");
-                table.AddColumn("Times found");
-                table.Columns[1].RightAligned();
-
-                foreach(string filesystem in ctx.Filesystems.Select(c => c.Name).Distinct().OrderBy(c => c))
-                {
-                    ulong count = ctx.Filesystems.Where(c => c.Name == filesystem && c.Synchronized).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Filesystems.LongCount(c => c.Name == filesystem && !c.Synchronized);
-
-                    if(count == 0)
-                        continue;
-
-                    table.AddRow(Markup.Escape(filesystem), $"{count}");
-                    thereAreStats = true;
-                }
-
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
-
-            if(ctx.SeenDevices.Any())
-            {
-                table = new Table
-                {
-                    Title = new TableTitle("Device statistics")
-                };
-
-                table.AddColumn("Manufacturer");
-                table.AddColumn("Model");
-                table.AddColumn("Revision");
-                table.AddColumn("Bus");
-
-                foreach(DeviceStat ds in ctx.SeenDevices.OrderBy(ds => ds.Manufacturer).ThenBy(ds => ds.Model).
-                                             ThenBy(ds => ds.Revision).ThenBy(ds => ds.Bus))
-                    table.AddRow(Markup.Escape(ds.Manufacturer ?? ""), Markup.Escape(ds.Model ?? ""),
-                                 Markup.Escape(ds.Revision     ?? ""), Markup.Escape(ds.Bus   ?? ""));
-
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
+                table.AddRow(Markup.Escape(command), $"{count}");
                 thereAreStats = true;
             }
 
-            if(ctx.Medias.Any(ms => ms.Real))
-            {
-                table = new Table
-                {
-                    Title = new TableTitle("Media found in real device statistics")
-                };
-
-                table.AddColumn("Type");
-                table.AddColumn("Times found");
-                table.Columns[1].RightAligned();
-
-                foreach(string media in ctx.Medias.Where(ms => ms.Real).Select(ms => ms.Type).Distinct().
-                                            OrderBy(ms => ms))
-                {
-                    ulong count = ctx.Medias.Where(c => c.Type == media && c.Synchronized && c.Real).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Medias.LongCount(c => c.Type == media && !c.Synchronized && c.Real);
-
-                    if(count <= 0)
-                        continue;
-
-                    table.AddRow(Markup.Escape(media), $"{count}");
-
-                    thereAreStats = true;
-                }
-
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
-
-            if(ctx.Medias.Any(ms => !ms.Real))
-            {
-                table = new Table
-                {
-                    Title = new TableTitle("Media found in images statistics")
-                };
-
-                table.AddColumn("Type");
-                table.AddColumn("Times found");
-                table.Columns[1].RightAligned();
-
-                foreach(string media in ctx.Medias.Where(ms => !ms.Real).Select(ms => ms.Type).Distinct().
-                                            OrderBy(ms => ms))
-                {
-                    ulong count = ctx.Medias.Where(c => c.Type == media && c.Synchronized && !c.Real).
-                                      Select(c => c.Count).FirstOrDefault();
-
-                    count += (ulong)ctx.Medias.LongCount(c => c.Type == media && !c.Synchronized && !c.Real);
-
-                    if(count <= 0)
-                        continue;
-
-                    table.AddRow(Markup.Escape(media), $"{count}");
-
-                    thereAreStats = true;
-                }
-
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
-
-            if(!thereAreStats)
-                AaruConsole.WriteLine("There are no statistics.");
-
-            return (int)ErrorNumber.NoError;
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
         }
+
+        if(ctx.Filters.Any())
+        {
+            table = new Table
+            {
+                Title = new TableTitle("Filters statistics")
+            };
+
+            table.AddColumn("Filter");
+            table.AddColumn("Times found");
+            table.Columns[1].RightAligned();
+
+            foreach(string filter in ctx.Filters.Select(c => c.Name).Distinct().OrderBy(c => c))
+            {
+                ulong count = ctx.Filters.Where(c => c.Name == filter && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Filters.LongCount(c => c.Name == filter && !c.Synchronized);
+
+                if(count == 0)
+                    continue;
+
+                table.AddRow(Markup.Escape(filter), $"{count}");
+                thereAreStats = true;
+            }
+
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
+        }
+
+        if(ctx.MediaFormats.Any())
+        {
+            table = new Table
+            {
+                Title = new TableTitle("Media image format statistics")
+            };
+
+            table.AddColumn("Format");
+            table.AddColumn("Times found");
+            table.Columns[1].RightAligned();
+
+            foreach(string format in ctx.MediaFormats.Select(c => c.Name).Distinct().OrderBy(c => c))
+            {
+                ulong count = ctx.MediaFormats.Where(c => c.Name == format && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.MediaFormats.LongCount(c => c.Name == format && !c.Synchronized);
+
+                if(count == 0)
+                    continue;
+
+                table.AddRow(Markup.Escape(format), $"{count}");
+                thereAreStats = true;
+            }
+
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
+        }
+
+        if(ctx.Partitions.Any())
+        {
+            table = new Table
+            {
+                Title = new TableTitle("Partitioning scheme statistics")
+            };
+
+            table.AddColumn("Scheme");
+            table.AddColumn("Times found");
+            table.Columns[1].RightAligned();
+
+            foreach(string partition in ctx.Partitions.Select(c => c.Name).Distinct().OrderBy(c => c))
+            {
+                ulong count = ctx.Partitions.Where(c => c.Name == partition && c.Synchronized).Select(c => c.Count).
+                                  FirstOrDefault();
+
+                count += (ulong)ctx.Partitions.LongCount(c => c.Name == partition && !c.Synchronized);
+
+                if(count == 0)
+                    continue;
+
+                table.AddRow(Markup.Escape(partition), $"{count}");
+                thereAreStats = true;
+            }
+
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
+        }
+
+        if(ctx.Filesystems.Any())
+        {
+            table = new Table
+            {
+                Title = new TableTitle("Filesystem statistics")
+            };
+
+            table.AddColumn("Filesystem");
+            table.AddColumn("Times found");
+            table.Columns[1].RightAligned();
+
+            foreach(string filesystem in ctx.Filesystems.Select(c => c.Name).Distinct().OrderBy(c => c))
+            {
+                ulong count = ctx.Filesystems.Where(c => c.Name == filesystem && c.Synchronized).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Filesystems.LongCount(c => c.Name == filesystem && !c.Synchronized);
+
+                if(count == 0)
+                    continue;
+
+                table.AddRow(Markup.Escape(filesystem), $"{count}");
+                thereAreStats = true;
+            }
+
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
+        }
+
+        if(ctx.SeenDevices.Any())
+        {
+            table = new Table
+            {
+                Title = new TableTitle("Device statistics")
+            };
+
+            table.AddColumn("Manufacturer");
+            table.AddColumn("Model");
+            table.AddColumn("Revision");
+            table.AddColumn("Bus");
+
+            foreach(DeviceStat ds in ctx.SeenDevices.OrderBy(ds => ds.Manufacturer).ThenBy(ds => ds.Model).
+                                         ThenBy(ds => ds.Revision).ThenBy(ds => ds.Bus))
+                table.AddRow(Markup.Escape(ds.Manufacturer ?? ""), Markup.Escape(ds.Model ?? ""),
+                             Markup.Escape(ds.Revision     ?? ""), Markup.Escape(ds.Bus   ?? ""));
+
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
+            thereAreStats = true;
+        }
+
+        if(ctx.Medias.Any(ms => ms.Real))
+        {
+            table = new Table
+            {
+                Title = new TableTitle("Media found in real device statistics")
+            };
+
+            table.AddColumn("Type");
+            table.AddColumn("Times found");
+            table.Columns[1].RightAligned();
+
+            foreach(string media in ctx.Medias.Where(ms => ms.Real).Select(ms => ms.Type).Distinct().
+                                        OrderBy(ms => ms))
+            {
+                ulong count = ctx.Medias.Where(c => c.Type == media && c.Synchronized && c.Real).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Medias.LongCount(c => c.Type == media && !c.Synchronized && c.Real);
+
+                if(count <= 0)
+                    continue;
+
+                table.AddRow(Markup.Escape(media), $"{count}");
+
+                thereAreStats = true;
+            }
+
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
+        }
+
+        if(ctx.Medias.Any(ms => !ms.Real))
+        {
+            table = new Table
+            {
+                Title = new TableTitle("Media found in images statistics")
+            };
+
+            table.AddColumn("Type");
+            table.AddColumn("Times found");
+            table.Columns[1].RightAligned();
+
+            foreach(string media in ctx.Medias.Where(ms => !ms.Real).Select(ms => ms.Type).Distinct().
+                                        OrderBy(ms => ms))
+            {
+                ulong count = ctx.Medias.Where(c => c.Type == media && c.Synchronized && !c.Real).
+                                  Select(c => c.Count).FirstOrDefault();
+
+                count += (ulong)ctx.Medias.LongCount(c => c.Type == media && !c.Synchronized && !c.Real);
+
+                if(count <= 0)
+                    continue;
+
+                table.AddRow(Markup.Escape(media), $"{count}");
+
+                thereAreStats = true;
+            }
+
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
+        }
+
+        if(!thereAreStats)
+            AaruConsole.WriteLine("There are no statistics.");
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Database/Update.cs b/Aaru/Commands/Database/Update.cs
index fb46cd116..c67552785 100644
--- a/Aaru/Commands/Database/Update.cs
+++ b/Aaru/Commands/Database/Update.cs
@@ -42,113 +42,112 @@ using Aaru.Database;
 using Microsoft.EntityFrameworkCore;
 using Spectre.Console;
 
-namespace Aaru.Commands.Database
+namespace Aaru.Commands.Database;
+
+internal sealed class UpdateCommand : Command
 {
-    internal sealed class UpdateCommand : Command
+    readonly bool _mainDbUpdate;
+
+    public UpdateCommand(bool mainDbUpdate) : base("update", "Updates the database.")
     {
-        readonly bool _mainDbUpdate;
+        _mainDbUpdate = mainDbUpdate;
 
-        public UpdateCommand(bool mainDbUpdate) : base("update", "Updates the database.")
+        Add(new Option("--clear", "Clear existing main database.")
         {
-            _mainDbUpdate = mainDbUpdate;
+            Argument = new Argument<bool>(() => false),
+            Required = false
+        });
 
-            Add(new Option("--clear", "Clear existing main database.")
-            {
-                Argument = new Argument<bool>(() => false),
-                Required = false
-            });
-
-            Add(new Option("--clear-all", "Clear existing main and local database.")
-            {
-                Argument = new Argument<bool>(() => false),
-                Required = false
-            });
-
-            Handler = CommandHandler.Create((Func<bool, bool, bool, bool, int>)Invoke);
-        }
-
-        int Invoke(bool debug, bool verbose, bool clear, bool clearAll)
+        Add(new Option("--clear-all", "Clear existing main and local database.")
         {
-            if(_mainDbUpdate)
-                return (int)ErrorNumber.NoError;
+            Argument = new Argument<bool>(() => false),
+            Required = false
+        });
 
-            MainClass.PrintCopyright();
-
-            if(debug)
-            {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
-
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            AaruConsole.DebugWriteLine("Update command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Update command", "--verbose={0}", verbose);
-
-            if(clearAll)
-            {
-                try
-                {
-                    File.Delete(Settings.Settings.LocalDbPath);
-
-                    var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-                    ctx.Database.Migrate();
-                    ctx.SaveChanges();
-                }
-                catch(Exception)
-                {
-                    if(Debugger.IsAttached)
-                        throw;
-
-                    AaruConsole.ErrorWriteLine("Could not remove local database.");
-
-                    return (int)ErrorNumber.CannotRemoveDatabase;
-                }
-            }
-
-            if(clear || clearAll)
-            {
-                try
-                {
-                    File.Delete(Settings.Settings.MainDbPath);
-                }
-                catch(Exception)
-                {
-                    if(Debugger.IsAttached)
-                        throw;
-
-                    AaruConsole.ErrorWriteLine("Could not remove main database.");
-
-                    return (int)ErrorNumber.CannotRemoveDatabase;
-                }
-            }
-
-            DoUpdate(clear || clearAll);
+        Handler = CommandHandler.Create((Func<bool, bool, bool, bool, int>)Invoke);
+    }
 
+    int Invoke(bool debug, bool verbose, bool clear, bool clearAll)
+    {
+        if(_mainDbUpdate)
             return (int)ErrorNumber.NoError;
+
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
+            {
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
+
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        internal static void DoUpdate(bool create)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        AaruConsole.DebugWriteLine("Update command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Update command", "--verbose={0}", verbose);
+
+        if(clearAll)
         {
-            Remote.UpdateMainDatabase(create);
-            Statistics.AddCommand("update");
+            try
+            {
+                File.Delete(Settings.Settings.LocalDbPath);
+
+                var ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+                ctx.Database.Migrate();
+                ctx.SaveChanges();
+            }
+            catch(Exception)
+            {
+                if(Debugger.IsAttached)
+                    throw;
+
+                AaruConsole.ErrorWriteLine("Could not remove local database.");
+
+                return (int)ErrorNumber.CannotRemoveDatabase;
+            }
         }
+
+        if(clear || clearAll)
+        {
+            try
+            {
+                File.Delete(Settings.Settings.MainDbPath);
+            }
+            catch(Exception)
+            {
+                if(Debugger.IsAttached)
+                    throw;
+
+                AaruConsole.ErrorWriteLine("Could not remove main database.");
+
+                return (int)ErrorNumber.CannotRemoveDatabase;
+            }
+        }
+
+        DoUpdate(clear || clearAll);
+
+        return (int)ErrorNumber.NoError;
+    }
+
+    internal static void DoUpdate(bool create)
+    {
+        Remote.UpdateMainDatabase(create);
+        Statistics.AddCommand("update");
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Device/DeviceFamily.cs b/Aaru/Commands/Device/DeviceFamily.cs
index 6270251ab..a453d730e 100644
--- a/Aaru/Commands/Device/DeviceFamily.cs
+++ b/Aaru/Commands/Device/DeviceFamily.cs
@@ -32,17 +32,16 @@
 
 using System.CommandLine;
 
-namespace Aaru.Commands.Device
-{
-    internal sealed class DeviceFamily : Command
-    {
-        public DeviceFamily() : base("device", "Commands that talks to devices")
-        {
-            AddAlias("dev");
+namespace Aaru.Commands.Device;
 
-            AddCommand(new DeviceInfoCommand());
-            AddCommand(new DeviceReportCommand());
-            AddCommand(new ListDevicesCommand());
-        }
+internal sealed class DeviceFamily : Command
+{
+    public DeviceFamily() : base("device", "Commands that talks to devices")
+    {
+        AddAlias("dev");
+
+        AddCommand(new DeviceInfoCommand());
+        AddCommand(new DeviceReportCommand());
+        AddCommand(new ListDevicesCommand());
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Device/DeviceReport.cs b/Aaru/Commands/Device/DeviceReport.cs
index 7c320ea20..1e70e935e 100644
--- a/Aaru/Commands/Device/DeviceReport.cs
+++ b/Aaru/Commands/Device/DeviceReport.cs
@@ -56,1091 +56,705 @@ using Command = System.CommandLine.Command;
 using DeviceReport = Aaru.Core.Devices.Report.DeviceReport;
 using Profile = Aaru.Decoders.SCSI.MMC.Profile;
 
-namespace Aaru.Commands.Device
+namespace Aaru.Commands.Device;
+
+internal sealed class DeviceReportCommand : Command
 {
-    internal sealed class DeviceReportCommand : Command
+    public DeviceReportCommand() : base("report",
+                                        "Tests the device capabilities and creates an JSON report of them.")
     {
-        public DeviceReportCommand() : base("report",
-                                            "Tests the device capabilities and creates an JSON report of them.")
+        AddArgument(new Argument<string>
         {
-            AddArgument(new Argument<string>
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "Device path",
+            Name        = "device-path"
+        });
+
+        Add(new Option(new[]
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "Device path",
-                Name        = "device-path"
+                "--trap-disc", "-t"
+            }, "Does a device report using a trap disc.")
+            {
+                Argument = new Argument<bool>(() => false),
+                Required = false
             });
 
-            Add(new Option(new[]
-                {
-                    "--trap-disc", "-t"
-                }, "Does a device report using a trap disc.")
-                {
-                    Argument = new Argument<bool>(() => false),
-                    Required = false
-                });
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    public static int Invoke(bool debug, bool verbose, string devicePath, bool trapDisc)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
+            {
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
+
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, string devicePath, bool trapDisc)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        Statistics.AddCommand("device-report");
+
+        AaruConsole.DebugWriteLine("Device-Report command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Device-Report command", "--device={0}", devicePath);
+        AaruConsole.DebugWriteLine("Device-Report command", "--verbose={0}", verbose);
+
+        if(devicePath.Length == 2   &&
+           devicePath[1]     == ':' &&
+           devicePath[0]     != '/' &&
+           char.IsLetter(devicePath[0]))
+            devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
+
+        Devices.Device dev;
+
+        try
         {
-            MainClass.PrintCopyright();
+            dev = new Devices.Device(devicePath);
 
-            if(debug)
+            if(dev.IsRemote)
+                Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
+                                     dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
+
+            if(dev.Error)
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
-
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            Statistics.AddCommand("device-report");
-
-            AaruConsole.DebugWriteLine("Device-Report command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Device-Report command", "--device={0}", devicePath);
-            AaruConsole.DebugWriteLine("Device-Report command", "--verbose={0}", verbose);
-
-            if(devicePath.Length == 2   &&
-               devicePath[1]     == ':' &&
-               devicePath[0]     != '/' &&
-               char.IsLetter(devicePath[0]))
-                devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
-
-            Devices.Device dev;
-
-            try
-            {
-                dev = new Devices.Device(devicePath);
-
-                if(dev.IsRemote)
-                    Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
-                                         dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
-
-                if(dev.Error)
-                {
-                    AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
-
-                    return (int)ErrorNumber.CannotOpenDevice;
-                }
-            }
-            catch(DeviceException e)
-            {
-                AaruConsole.ErrorWriteLine(e.Message);
+                AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
 
                 return (int)ErrorNumber.CannotOpenDevice;
             }
+        }
+        catch(DeviceException e)
+        {
+            AaruConsole.ErrorWriteLine(e.Message);
 
-            Statistics.AddDevice(dev);
+            return (int)ErrorNumber.CannotOpenDevice;
+        }
 
-            bool isAdmin = dev.IsRemote ? dev.IsRemoteAdmin : DetectOS.IsAdmin;
+        Statistics.AddDevice(dev);
 
-            if(!isAdmin)
+        bool isAdmin = dev.IsRemote ? dev.IsRemoteAdmin : DetectOS.IsAdmin;
+
+        if(!isAdmin)
+        {
+            AaruConsole.
+                ErrorWriteLine("Because of the commands sent to a device, device report must be run with administrative privileges.");
+
+            AaruConsole.ErrorWriteLine("Not continuing.");
+
+            return (int)ErrorNumber.NotPermitted;
+        }
+
+        var report = new DeviceReportV2
+        {
+            Manufacturer = dev.Manufacturer,
+            Model        = dev.Model,
+            Revision     = dev.FirmwareRevision,
+            Type         = dev.Type
+        };
+
+        bool   removable = false;
+        string jsonFile;
+
+        if(!string.IsNullOrWhiteSpace(dev.Manufacturer) &&
+           !string.IsNullOrWhiteSpace(dev.FirmwareRevision))
+            jsonFile = dev.Manufacturer + "_" + dev.Model + "_" + dev.FirmwareRevision + ".json";
+        else if(!string.IsNullOrWhiteSpace(dev.Manufacturer))
+            jsonFile = dev.Manufacturer + "_" + dev.Model + ".json";
+        else if(!string.IsNullOrWhiteSpace(dev.FirmwareRevision))
+            jsonFile = dev.Model + "_" + dev.FirmwareRevision + ".json";
+        else
+            jsonFile = dev.Model + ".json";
+
+        jsonFile = jsonFile.Replace('\\', '_').Replace('/', '_').Replace('?', '_');
+
+        if(trapDisc && dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
+        {
+            AaruConsole.ErrorWriteLine("This device type does not support doing reports with trap discs.");
+
+            return (int)ErrorNumber.InvalidArgument;
+        }
+
+        var reporter = new DeviceReport(dev);
+
+        ConsoleKeyInfo pressedKey;
+
+        if(dev.IsUsb)
+        {
+            if(AnsiConsole.Confirm("[italic]Is the device natively USB (in case of doubt, press Y)?[/]"))
             {
-                AaruConsole.
-                    ErrorWriteLine("Because of the commands sent to a device, device report must be run with administrative privileges.");
-
-                AaruConsole.ErrorWriteLine("Not continuing.");
-
-                return (int)ErrorNumber.NotPermitted;
-            }
-
-            var report = new DeviceReportV2
-            {
-                Manufacturer = dev.Manufacturer,
-                Model        = dev.Model,
-                Revision     = dev.FirmwareRevision,
-                Type         = dev.Type
-            };
-
-            bool   removable = false;
-            string jsonFile;
-
-            if(!string.IsNullOrWhiteSpace(dev.Manufacturer) &&
-               !string.IsNullOrWhiteSpace(dev.FirmwareRevision))
-                jsonFile = dev.Manufacturer + "_" + dev.Model + "_" + dev.FirmwareRevision + ".json";
-            else if(!string.IsNullOrWhiteSpace(dev.Manufacturer))
-                jsonFile = dev.Manufacturer + "_" + dev.Model + ".json";
-            else if(!string.IsNullOrWhiteSpace(dev.FirmwareRevision))
-                jsonFile = dev.Model + "_" + dev.FirmwareRevision + ".json";
-            else
-                jsonFile = dev.Model + ".json";
-
-            jsonFile = jsonFile.Replace('\\', '_').Replace('/', '_').Replace('?', '_');
-
-            if(trapDisc && dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
-            {
-                AaruConsole.ErrorWriteLine("This device type does not support doing reports with trap discs.");
-
-                return (int)ErrorNumber.InvalidArgument;
-            }
-
-            var reporter = new DeviceReport(dev);
-
-            ConsoleKeyInfo pressedKey;
-
-            if(dev.IsUsb)
-            {
-                if(AnsiConsole.Confirm("[italic]Is the device natively USB (in case of doubt, press Y)?[/]"))
-                {
-                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying USB information...").IsIndeterminate();
-                        report.USB = reporter.UsbReport();
-                    });
-
-                    report.USB.RemovableMedia =
-                        AnsiConsole.Confirm("[italic]Is the media removable from the reading/writing elements?[/]");
-
-                    removable = report.USB.RemovableMedia;
-                }
-            }
-
-            if(dev.IsFireWire)
-            {
-                if(AnsiConsole.Confirm("[italic]Is the device natively FireWire (in case of doubt, press Y)?[/]"))
-                {
-                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying FireWire information...").IsIndeterminate();
-                        report.FireWire = reporter.FireWireReport();
-                    });
-
-                    report.FireWire.RemovableMedia =
-                        AnsiConsole.Confirm("[italic]Is the media removable from the reading/writing elements?[/]");
-
-                    removable = report.FireWire.RemovableMedia;
-                }
-            }
-
-            if(dev.IsPcmcia)
                 Core.Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Querying PCMCIA information...").IsIndeterminate();
-                    report.PCMCIA = reporter.PcmciaReport();
+                    ctx.AddTask("Querying USB information...").IsIndeterminate();
+                    report.USB = reporter.UsbReport();
                 });
 
-            byte[] buffer = Array.Empty<byte>();
-            string mediumTypeName;
-            string mediumModel;
+                report.USB.RemovableMedia =
+                    AnsiConsole.Confirm("[italic]Is the media removable from the reading/writing elements?[/]");
 
-            switch(dev.Type)
+                removable = report.USB.RemovableMedia;
+            }
+        }
+
+        if(dev.IsFireWire)
+        {
+            if(AnsiConsole.Confirm("[italic]Is the device natively FireWire (in case of doubt, press Y)?[/]"))
             {
-                case DeviceType.ATA:
+                Core.Spectre.ProgressSingleSpinner(ctx =>
                 {
+                    ctx.AddTask("Querying FireWire information...").IsIndeterminate();
+                    report.FireWire = reporter.FireWireReport();
+                });
+
+                report.FireWire.RemovableMedia =
+                    AnsiConsole.Confirm("[italic]Is the media removable from the reading/writing elements?[/]");
+
+                removable = report.FireWire.RemovableMedia;
+            }
+        }
+
+        if(dev.IsPcmcia)
+            Core.Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Querying PCMCIA information...").IsIndeterminate();
+                report.PCMCIA = reporter.PcmciaReport();
+            });
+
+        byte[] buffer = Array.Empty<byte>();
+        string mediumTypeName;
+        string mediumModel;
+
+        switch(dev.Type)
+        {
+            case DeviceType.ATA:
+            {
+                Core.Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Querying ATA IDENTIFY...").IsIndeterminate();
+                    dev.AtaIdentify(out buffer, out _, dev.Timeout, out _);
+                });
+
+                if(!Identify.Decode(buffer).HasValue)
+                    break;
+
+                report.ATA = new Ata
+                {
+                    Identify = DeviceReport.ClearIdentify(buffer)
+                };
+
+                if(report.ATA.IdentifyDevice == null)
+                    break;
+
+                if((ushort)report.ATA.IdentifyDevice?.GeneralConfiguration == 0x848A)
+                {
+                    report.CompactFlash = true;
+                    removable           = false;
+                }
+                else if(!removable &&
+                        report.ATA.IdentifyDevice?.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.
+                                                                                    Removable) == true)
+                    removable =
+                        AnsiConsole.Confirm("[italic]Is the media removable from the reading/writing elements?[/]");
+
+                if(removable)
+                {
+                    AaruConsole.
+                        WriteLine("Please remove any media from the device and press any key when it is out.");
+
+                    System.Console.ReadKey(true);
+
                     Core.Spectre.ProgressSingleSpinner(ctx =>
                     {
                         ctx.AddTask("Querying ATA IDENTIFY...").IsIndeterminate();
                         dev.AtaIdentify(out buffer, out _, dev.Timeout, out _);
                     });
 
-                    if(!Identify.Decode(buffer).HasValue)
-                        break;
+                    report.ATA.Identify = DeviceReport.ClearIdentify(buffer);
+                    List<TestedMedia> mediaTests = new();
 
-                    report.ATA = new Ata
+                    while(AnsiConsole.Confirm("[italic]Do you have media that you can insert in the drive?[/]"))
+                    {
+                        AaruConsole.WriteLine("Please insert it in the drive and press any key when it is ready.");
+                        System.Console.ReadKey(true);
+
+                        mediumTypeName =
+                            AnsiConsole.
+                                Ask<string>("Please write a description of the media type and press enter: ");
+
+                        mediumModel = AnsiConsole.Ask<string>("Please write the media model and press enter: ");
+
+                        TestedMedia mediaTest = reporter.ReportAtaMedia();
+                        mediaTest.MediumTypeName = mediumTypeName;
+                        mediaTest.Model          = mediumModel;
+
+                        mediaTests.Add(mediaTest);
+                    }
+
+                    report.ATA.RemovableMedias = mediaTests;
+                }
+                else
+                {
+                    report.ATA.ReadCapabilities = reporter.ReportAta(report.ATA.IdentifyDevice.Value);
+                }
+
+                break;
+            }
+
+            case DeviceType.MMC:
+                report.MultiMediaCard = reporter.MmcSdReport();
+
+                break;
+            case DeviceType.SecureDigital:
+                report.SecureDigital = reporter.MmcSdReport();
+
+                break;
+            case DeviceType.NVMe: throw new NotImplementedException("NVMe devices not yet supported.");
+            case DeviceType.ATAPI:
+                Core.Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Querying ATAPI IDENTIFY...").IsIndeterminate();
+                    dev.AtapiIdentify(out buffer, out _, dev.Timeout, out _);
+                });
+
+                if(Identify.Decode(buffer).HasValue)
+                    report.ATAPI = new Ata
                     {
                         Identify = DeviceReport.ClearIdentify(buffer)
                     };
 
-                    if(report.ATA.IdentifyDevice == null)
-                        break;
-
-                    if((ushort)report.ATA.IdentifyDevice?.GeneralConfiguration == 0x848A)
+                goto case DeviceType.SCSI;
+            case DeviceType.SCSI:
+                switch(dev.ScsiType)
+                {
+                    case PeripheralDeviceTypes.DirectAccess:
+                    case PeripheralDeviceTypes.SequentialAccess:
+                    case PeripheralDeviceTypes.WriteOnceDevice:
+                    case PeripheralDeviceTypes.MultiMediaDevice:
+                    case PeripheralDeviceTypes.OpticalDevice:
+                    case PeripheralDeviceTypes.BridgingExpander
+                        when dev.Model.StartsWith("MDM", StringComparison.Ordinal) ||
+                             dev.Model.StartsWith("MDH", StringComparison.Ordinal):
+                    case PeripheralDeviceTypes.SCSIZonedBlockDevice: break;
+                    default:
                     {
-                        report.CompactFlash = true;
-                        removable           = false;
+                        AaruConsole.ErrorWriteLine("Unsupported device type, report cannot be created");
+
+                        throw new IOException();
                     }
-                    else if(!removable &&
-                            report.ATA.IdentifyDevice?.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.
-                                Removable) == true)
-                        removable =
-                            AnsiConsole.Confirm("[italic]Is the media removable from the reading/writing elements?[/]");
-
-                    if(removable)
-                    {
-                        AaruConsole.
-                            WriteLine("Please remove any media from the device and press any key when it is out.");
-
-                        System.Console.ReadKey(true);
-
-                        Core.Spectre.ProgressSingleSpinner(ctx =>
-                        {
-                            ctx.AddTask("Querying ATA IDENTIFY...").IsIndeterminate();
-                            dev.AtaIdentify(out buffer, out _, dev.Timeout, out _);
-                        });
-
-                        report.ATA.Identify = DeviceReport.ClearIdentify(buffer);
-                        List<TestedMedia> mediaTests = new();
-
-                        while(AnsiConsole.Confirm("[italic]Do you have media that you can insert in the drive?[/]"))
-                        {
-                            AaruConsole.WriteLine("Please insert it in the drive and press any key when it is ready.");
-                            System.Console.ReadKey(true);
-
-                            mediumTypeName =
-                                AnsiConsole.
-                                    Ask<string>("Please write a description of the media type and press enter: ");
-
-                            mediumModel = AnsiConsole.Ask<string>("Please write the media model and press enter: ");
-
-                            TestedMedia mediaTest = reporter.ReportAtaMedia();
-                            mediaTest.MediumTypeName = mediumTypeName;
-                            mediaTest.Model          = mediumModel;
-
-                            mediaTests.Add(mediaTest);
-                        }
-
-                        report.ATA.RemovableMedias = mediaTests;
-                    }
-                    else
-                    {
-                        report.ATA.ReadCapabilities = reporter.ReportAta(report.ATA.IdentifyDevice.Value);
-                    }
-
-                    break;
                 }
 
-                case DeviceType.MMC:
-                    report.MultiMediaCard = reporter.MmcSdReport();
+                if(!dev.IsUsb      &&
+                   !dev.IsFireWire &&
+                   dev.IsRemovable)
+                    removable =
+                        AnsiConsole.
+                            Confirm("[italic]Is the media removable from the reading/writing elements (flash memories ARE NOT removable)?[/]");
 
-                    break;
-                case DeviceType.SecureDigital:
-                    report.SecureDigital = reporter.MmcSdReport();
-
-                    break;
-                case DeviceType.NVMe: throw new NotImplementedException("NVMe devices not yet supported.");
-                case DeviceType.ATAPI:
-                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Querying ATAPI IDENTIFY...").IsIndeterminate();
-                        dev.AtapiIdentify(out buffer, out _, dev.Timeout, out _);
-                    });
-
-                    if(Identify.Decode(buffer).HasValue)
-                        report.ATAPI = new Ata
-                        {
-                            Identify = DeviceReport.ClearIdentify(buffer)
-                        };
-
-                    goto case DeviceType.SCSI;
-                case DeviceType.SCSI:
+                if(removable)
+                {
                     switch(dev.ScsiType)
                     {
-                        case PeripheralDeviceTypes.DirectAccess:
-                        case PeripheralDeviceTypes.SequentialAccess:
-                        case PeripheralDeviceTypes.WriteOnceDevice:
                         case PeripheralDeviceTypes.MultiMediaDevice:
-                        case PeripheralDeviceTypes.OpticalDevice:
                         case PeripheralDeviceTypes.BridgingExpander
                             when dev.Model.StartsWith("MDM", StringComparison.Ordinal) ||
                                  dev.Model.StartsWith("MDH", StringComparison.Ordinal):
-                        case PeripheralDeviceTypes.SCSIZonedBlockDevice: break;
-                        default:
-                        {
-                            AaruConsole.ErrorWriteLine("Unsupported device type, report cannot be created");
+                            dev.AllowMediumRemoval(out buffer, dev.Timeout, out _);
+                            dev.EjectTray(out buffer, dev.Timeout, out _);
 
-                            throw new IOException();
-                        }
-                    }
+                            break;
+                        case PeripheralDeviceTypes.SequentialAccess:
+                            dev.SpcAllowMediumRemoval(out buffer, dev.Timeout, out _);
 
-                    if(!dev.IsUsb      &&
-                       !dev.IsFireWire &&
-                       dev.IsRemovable)
-                        removable =
-                            AnsiConsole.
-                                Confirm("[italic]Is the media removable from the reading/writing elements (flash memories ARE NOT removable)?[/]");
-
-                    if(removable)
-                    {
-                        switch(dev.ScsiType)
-                        {
-                            case PeripheralDeviceTypes.MultiMediaDevice:
-                            case PeripheralDeviceTypes.BridgingExpander
-                                when dev.Model.StartsWith("MDM", StringComparison.Ordinal) ||
-                                     dev.Model.StartsWith("MDH", StringComparison.Ordinal):
-                                dev.AllowMediumRemoval(out buffer, dev.Timeout, out _);
-                                dev.EjectTray(out buffer, dev.Timeout, out _);
-
-                                break;
-                            case PeripheralDeviceTypes.SequentialAccess:
-                                dev.SpcAllowMediumRemoval(out buffer, dev.Timeout, out _);
-
-                                Core.Spectre.ProgressSingleSpinner(ctx =>
-                                {
-                                    ctx.AddTask("Asking drive to unload tape (can take a few minutes)...").
-                                        IsIndeterminate();
-
-                                    dev.Unload(out buffer, dev.Timeout, out _);
-                                });
-
-                                break;
-                        }
-
-                        AaruConsole.
-                            WriteLine("Please remove any media from the device and press any key when it is out.");
-
-                        System.Console.ReadKey(true);
-                    }
-
-                    report.SCSI = reporter.ReportScsiInquiry();
-
-                    if(report.SCSI == null)
-                        break;
-
-                    report.SCSI.EVPDPages =
-                        reporter.ReportEvpdPages(StringHandlers.CToString(report.SCSI.Inquiry?.VendorIdentification)?.
-                                                                Trim().ToLowerInvariant());
-
-                    reporter.ReportScsiModes(ref report, out byte[] cdromMode, out MediumTypes mediumType);
-
-                    string mediumManufacturer;
-                    byte[] senseBuffer = Array.Empty<byte>();
-                    bool   sense       = true;
-
-                    switch(dev.ScsiType)
-                    {
-                        case PeripheralDeviceTypes.MultiMediaDevice:
-                        {
-                            if(dev.IsUsb &&
-                               (mediumType == MediumTypes.UnknownBlockDevice  ||
-                                mediumType == MediumTypes.ReadOnlyBlockDevice ||
-                                mediumType == MediumTypes.ReadWriteBlockDevice))
-                                goto default;
-
-                            bool iomegaRev = dev.Manufacturer.ToLowerInvariant() == "iomega" && dev.Model.
-                                                 ToLowerInvariant().
-                                                 StartsWith("rrd", StringComparison.OrdinalIgnoreCase);
-
-                            if(trapDisc)
+                            Core.Spectre.ProgressSingleSpinner(ctx =>
                             {
-                                if(iomegaRev)
-                                {
-                                    AaruConsole.
-                                        ErrorWriteLine("This device type does not support doing reports with trap discs.");
+                                ctx.AddTask("Asking drive to unload tape (can take a few minutes)...").
+                                    IsIndeterminate();
 
-                                    return (int)ErrorNumber.InvalidArgument;
-                                }
+                                dev.Unload(out buffer, dev.Timeout, out _);
+                            });
 
-                                if(
-                                    !AnsiConsole.
-                                        Confirm("[italic]Are you sure you want to do a report using a trap disc and the swapping method?\n" +
-                                                "This method can damage the drive, or the disc, and requires some ability.\n" +
-                                                "In you are unsure, please press N to not continue.[/]"))
-                                    return (int)ErrorNumber.NoError;
+                            break;
+                    }
 
-                                if(!AnsiConsole.
-                                       Confirm("[italic]Do you have an audio trap disc (if unsure press N)?[/]"))
-                                {
-                                    AaruConsole.ErrorWriteLine("Please burn an audio trap disc before continuing...");
+                    AaruConsole.
+                        WriteLine("Please remove any media from the device and press any key when it is out.");
 
-                                    return (int)ErrorNumber.NoError;
-                                }
+                    System.Console.ReadKey(true);
+                }
 
-                                if(AnsiConsole.Confirm("[italic]Do you have a GD-ROM disc (if unsure press N)?[/]"))
-                                    reporter.ReportGdRomSwapTrick(ref report);
-                                else
-                                    return (int)ErrorNumber.NoError;
+                report.SCSI = reporter.ReportScsiInquiry();
+
+                if(report.SCSI == null)
+                    break;
+
+                report.SCSI.EVPDPages =
+                    reporter.ReportEvpdPages(StringHandlers.CToString(report.SCSI.Inquiry?.VendorIdentification)?.
+                                                            Trim().ToLowerInvariant());
+
+                reporter.ReportScsiModes(ref report, out byte[] cdromMode, out MediumTypes mediumType);
+
+                string mediumManufacturer;
+                byte[] senseBuffer = Array.Empty<byte>();
+                bool   sense       = true;
+
+                switch(dev.ScsiType)
+                {
+                    case PeripheralDeviceTypes.MultiMediaDevice:
+                    {
+                        if(dev.IsUsb &&
+                           (mediumType == MediumTypes.UnknownBlockDevice  ||
+                            mediumType == MediumTypes.ReadOnlyBlockDevice ||
+                            mediumType == MediumTypes.ReadWriteBlockDevice))
+                            goto default;
+
+                        bool iomegaRev = dev.Manufacturer.ToLowerInvariant() == "iomega" && dev.Model.
+                                             ToLowerInvariant().
+                                             StartsWith("rrd", StringComparison.OrdinalIgnoreCase);
+
+                        if(trapDisc)
+                        {
+                            if(iomegaRev)
+                            {
+                                AaruConsole.
+                                    ErrorWriteLine("This device type does not support doing reports with trap discs.");
+
+                                return (int)ErrorNumber.InvalidArgument;
                             }
-                            else
+
+                            if(
+                                !AnsiConsole.
+                                    Confirm("[italic]Are you sure you want to do a report using a trap disc and the swapping method?\n" +
+                                            "This method can damage the drive, or the disc, and requires some ability.\n" +
+                                            "In you are unsure, please press N to not continue.[/]"))
+                                return (int)ErrorNumber.NoError;
+
+                            if(!AnsiConsole.
+                                   Confirm("[italic]Do you have an audio trap disc (if unsure press N)?[/]"))
                             {
-                                List<string> mediaTypes = new();
+                                AaruConsole.ErrorWriteLine("Please burn an audio trap disc before continuing...");
 
-                                report.SCSI.MultiMediaDevice = new Mmc
+                                return (int)ErrorNumber.NoError;
+                            }
+
+                            if(AnsiConsole.Confirm("[italic]Do you have a GD-ROM disc (if unsure press N)?[/]"))
+                                reporter.ReportGdRomSwapTrick(ref report);
+                            else
+                                return (int)ErrorNumber.NoError;
+                        }
+                        else
+                        {
+                            List<string> mediaTypes = new();
+
+                            report.SCSI.MultiMediaDevice = new Mmc
+                            {
+                                ModeSense2AData = cdromMode,
+                                Features        = reporter.ReportMmcFeatures()
+                            };
+
+                            if(report.SCSI.MultiMediaDevice.Features?.BinaryData != null)
+                            {
+                                Features.SeparatedFeatures ftr =
+                                    Features.Separate(report.SCSI.MultiMediaDevice.Features.BinaryData);
+
+                                if(ftr.Descriptors != null)
                                 {
-                                    ModeSense2AData = cdromMode,
-                                    Features        = reporter.ReportMmcFeatures()
-                                };
-
-                                if(report.SCSI.MultiMediaDevice.Features?.BinaryData != null)
-                                {
-                                    Features.SeparatedFeatures ftr =
-                                        Features.Separate(report.SCSI.MultiMediaDevice.Features.BinaryData);
-
-                                    if(ftr.Descriptors != null)
+                                    foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
                                     {
-                                        foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
+                                        if(desc.Code != 0x0000)
+                                            continue;
+
+                                        Feature_0000? ftr0000 = Features.Decode_0000(desc.Data);
+
+                                        if(ftr0000 == null)
+                                            continue;
+
+                                        foreach(Profile prof in ftr0000.Value.Profiles)
                                         {
-                                            if(desc.Code != 0x0000)
-                                                continue;
-
-                                            Feature_0000? ftr0000 = Features.Decode_0000(desc.Data);
-
-                                            if(ftr0000 == null)
-                                                continue;
-
-                                            foreach(Profile prof in ftr0000.Value.Profiles)
+                                            switch(prof.Number)
                                             {
-                                                switch(prof.Number)
-                                                {
-                                                    case ProfileNumber.CDROM:
-                                                    case ProfileNumber.CDR:
-                                                    case ProfileNumber.CDRW:
-                                                        mediaTypes.Add("CD-ROM");
-                                                        mediaTypes.Add("Audio CD");
-                                                        mediaTypes.Add("Enhanced CD (aka E-CD, CD-Plus or CD+)");
-                                                        mediaTypes.Add("CD-R");
-                                                        mediaTypes.Add("CD-RW Ultra Speed (marked 16x or higher)");
-                                                        mediaTypes.Add("CD-RW High Speed (marked between 8x and 12x)");
-                                                        mediaTypes.Add("CD-RW (marked 4x or lower)");
+                                                case ProfileNumber.CDROM:
+                                                case ProfileNumber.CDR:
+                                                case ProfileNumber.CDRW:
+                                                    mediaTypes.Add("CD-ROM");
+                                                    mediaTypes.Add("Audio CD");
+                                                    mediaTypes.Add("Enhanced CD (aka E-CD, CD-Plus or CD+)");
+                                                    mediaTypes.Add("CD-R");
+                                                    mediaTypes.Add("CD-RW Ultra Speed (marked 16x or higher)");
+                                                    mediaTypes.Add("CD-RW High Speed (marked between 8x and 12x)");
+                                                    mediaTypes.Add("CD-RW (marked 4x or lower)");
 
-                                                        break;
-                                                    case ProfileNumber.DVDRWRes:
-                                                    case ProfileNumber.DVDRWSeq:
-                                                    case ProfileNumber.DVDRDLSeq:
-                                                    case ProfileNumber.DVDRDLJump:
-                                                    case ProfileNumber.DVDRWDL:
-                                                    case ProfileNumber.DVDDownload:
-                                                    case ProfileNumber.DVDRWPlus:
-                                                    case ProfileNumber.DVDRPlus:
-                                                    case ProfileNumber.DVDRSeq:
-                                                    case ProfileNumber.DVDRWDLPlus:
-                                                    case ProfileNumber.DVDRDLPlus:
+                                                    break;
+                                                case ProfileNumber.DVDRWRes:
+                                                case ProfileNumber.DVDRWSeq:
+                                                case ProfileNumber.DVDRDLSeq:
+                                                case ProfileNumber.DVDRDLJump:
+                                                case ProfileNumber.DVDRWDL:
+                                                case ProfileNumber.DVDDownload:
+                                                case ProfileNumber.DVDRWPlus:
+                                                case ProfileNumber.DVDRPlus:
+                                                case ProfileNumber.DVDRSeq:
+                                                case ProfileNumber.DVDRWDLPlus:
+                                                case ProfileNumber.DVDRDLPlus:
 
-                                                    case ProfileNumber.DVDROM:
-                                                        mediaTypes.Add("DVD-ROM");
-                                                        mediaTypes.Add("DVD-R");
-                                                        mediaTypes.Add("DVD-RW");
-                                                        mediaTypes.Add("DVD+R");
-                                                        mediaTypes.Add("DVD+RW");
-                                                        mediaTypes.Add("DVD-R DL");
-                                                        mediaTypes.Add("DVD+R DL");
-                                                        mediaTypes.Add("Nintendo GameCube game");
-                                                        mediaTypes.Add("Nintendo Wii game");
+                                                case ProfileNumber.DVDROM:
+                                                    mediaTypes.Add("DVD-ROM");
+                                                    mediaTypes.Add("DVD-R");
+                                                    mediaTypes.Add("DVD-RW");
+                                                    mediaTypes.Add("DVD+R");
+                                                    mediaTypes.Add("DVD+RW");
+                                                    mediaTypes.Add("DVD-R DL");
+                                                    mediaTypes.Add("DVD+R DL");
+                                                    mediaTypes.Add("Nintendo GameCube game");
+                                                    mediaTypes.Add("Nintendo Wii game");
 
-                                                        break;
-                                                    case ProfileNumber.DVDRAM:
-                                                        mediaTypes.Add("DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)");
-                                                        mediaTypes.Add("DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)");
+                                                    break;
+                                                case ProfileNumber.DVDRAM:
+                                                    mediaTypes.Add("DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)");
+                                                    mediaTypes.Add("DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)");
 
-                                                        break;
-                                                    case ProfileNumber.DDCDROM:
-                                                    case ProfileNumber.DDCDR:
-                                                    case ProfileNumber.DDCDRW:
-                                                        mediaTypes.Add("DDCD-ROM");
-                                                        mediaTypes.Add("DDCD-R");
-                                                        mediaTypes.Add("DDCD-RW");
+                                                    break;
+                                                case ProfileNumber.DDCDROM:
+                                                case ProfileNumber.DDCDR:
+                                                case ProfileNumber.DDCDRW:
+                                                    mediaTypes.Add("DDCD-ROM");
+                                                    mediaTypes.Add("DDCD-R");
+                                                    mediaTypes.Add("DDCD-RW");
 
-                                                        break;
-                                                    case ProfileNumber.BDROM:
-                                                    case ProfileNumber.BDRSeq:
-                                                    case ProfileNumber.BDRRdm:
-                                                    case ProfileNumber.BDRE:
-                                                        mediaTypes.Add("BD-ROM");
-                                                        mediaTypes.Add("BD-R HTL (not LTH)");
-                                                        mediaTypes.Add("BD-RE");
-                                                        mediaTypes.Add("BD-R LTH");
-                                                        mediaTypes.Add("BD-R Triple Layer (100Gb)");
-                                                        mediaTypes.Add("BD-R Quad Layer (128Gb)");
-                                                        mediaTypes.Add("Ultra HD Blu-ray movie");
-                                                        mediaTypes.Add("PlayStation 3 game");
-                                                        mediaTypes.Add("PlayStation 4 game");
-                                                        mediaTypes.Add("PlayStation 5 game");
-                                                        mediaTypes.Add("Xbox One game");
-                                                        mediaTypes.Add("Nintendo Wii U game");
+                                                    break;
+                                                case ProfileNumber.BDROM:
+                                                case ProfileNumber.BDRSeq:
+                                                case ProfileNumber.BDRRdm:
+                                                case ProfileNumber.BDRE:
+                                                    mediaTypes.Add("BD-ROM");
+                                                    mediaTypes.Add("BD-R HTL (not LTH)");
+                                                    mediaTypes.Add("BD-RE");
+                                                    mediaTypes.Add("BD-R LTH");
+                                                    mediaTypes.Add("BD-R Triple Layer (100Gb)");
+                                                    mediaTypes.Add("BD-R Quad Layer (128Gb)");
+                                                    mediaTypes.Add("Ultra HD Blu-ray movie");
+                                                    mediaTypes.Add("PlayStation 3 game");
+                                                    mediaTypes.Add("PlayStation 4 game");
+                                                    mediaTypes.Add("PlayStation 5 game");
+                                                    mediaTypes.Add("Xbox One game");
+                                                    mediaTypes.Add("Nintendo Wii U game");
 
-                                                        break;
-                                                    case ProfileNumber.HDDVDROM:
-                                                    case ProfileNumber.HDDVDR:
-                                                    case ProfileNumber.HDDVDRW:
-                                                    case ProfileNumber.HDDVDRDL:
-                                                    case ProfileNumber.HDDVDRWDL:
-                                                        mediaTypes.Add("HD DVD-ROM");
-                                                        mediaTypes.Add("HD DVD-R");
-                                                        mediaTypes.Add("HD DVD-RW");
+                                                    break;
+                                                case ProfileNumber.HDDVDROM:
+                                                case ProfileNumber.HDDVDR:
+                                                case ProfileNumber.HDDVDRW:
+                                                case ProfileNumber.HDDVDRDL:
+                                                case ProfileNumber.HDDVDRWDL:
+                                                    mediaTypes.Add("HD DVD-ROM");
+                                                    mediaTypes.Add("HD DVD-R");
+                                                    mediaTypes.Add("HD DVD-RW");
 
-                                                        break;
-                                                    case ProfileNumber.HDDVDRAM:
-                                                        mediaTypes.Add("HD DVD-RAM");
+                                                    break;
+                                                case ProfileNumber.HDDVDRAM:
+                                                    mediaTypes.Add("HD DVD-RAM");
 
-                                                        break;
-                                                }
+                                                    break;
                                             }
                                         }
                                     }
                                 }
+                            }
 
-                                if(cdromMode != null &&
-                                   !iomegaRev)
+                            if(cdromMode != null &&
+                               !iomegaRev)
+                            {
+                                mediaTypes.Add("CD-ROM");
+                                mediaTypes.Add("Audio CD");
+                                mediaTypes.Add("Enhanced CD (aka E-CD, CD-Plus or CD+)");
+
+                                if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadCDR)
+                                    mediaTypes.Add("CD-R");
+
+                                if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadCDRW)
+                                {
+                                    mediaTypes.Add("CD-RW Ultra Speed (marked 16x or higher)");
+                                    mediaTypes.Add("CD-RW High Speed (marked between 8x and 12x)");
+                                    mediaTypes.Add("CD-RW (marked 4x or lower)");
+                                }
+
+                                if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadDVDROM)
+                                    mediaTypes.Add("DVD-ROM");
+
+                                if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadDVDRAM)
+                                {
+                                    mediaTypes.Add("DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)");
+                                    mediaTypes.Add("DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)");
+                                }
+
+                                if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadDVDR)
+                                    mediaTypes.Add("DVD-R");
+                            }
+
+                            if(report.SCSI.MultiMediaDevice.Features != null &&
+                               !iomegaRev)
+                            {
+                                if(report.SCSI.MultiMediaDevice.Features.CanReadBD      ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadBDR     ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadBDRE1   ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadBDRE2   ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadBDROM   ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadOldBDR  ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadOldBDRE ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadOldBDROM)
+                                {
+                                    mediaTypes.Add("BD-ROM");
+                                    mediaTypes.Add("BD-R HTL (not LTH)");
+                                    mediaTypes.Add("BD-RE");
+                                    mediaTypes.Add("BD-R LTH");
+                                    mediaTypes.Add("BD-R Triple Layer (100Gb)");
+                                    mediaTypes.Add("BD-R Quad Layer (128Gb)");
+                                    mediaTypes.Add("Ultra HD Blu-ray movie");
+                                    mediaTypes.Add("PlayStation 3 game");
+                                    mediaTypes.Add("PlayStation 4 game");
+                                    mediaTypes.Add("PlayStation 5 game");
+                                    mediaTypes.Add("Xbox One game");
+                                    mediaTypes.Add("Nintendo Wii U game");
+                                }
+
+                                if(report.SCSI.MultiMediaDevice.Features.CanReadCD ||
+                                   report.SCSI.MultiMediaDevice.Features.MultiRead)
                                 {
                                     mediaTypes.Add("CD-ROM");
                                     mediaTypes.Add("Audio CD");
                                     mediaTypes.Add("Enhanced CD (aka E-CD, CD-Plus or CD+)");
-
-                                    if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadCDR)
-                                        mediaTypes.Add("CD-R");
-
-                                    if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadCDRW)
-                                    {
-                                        mediaTypes.Add("CD-RW Ultra Speed (marked 16x or higher)");
-                                        mediaTypes.Add("CD-RW High Speed (marked between 8x and 12x)");
-                                        mediaTypes.Add("CD-RW (marked 4x or lower)");
-                                    }
-
-                                    if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadDVDROM)
-                                        mediaTypes.Add("DVD-ROM");
-
-                                    if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadDVDRAM)
-                                    {
-                                        mediaTypes.Add("DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)");
-                                        mediaTypes.Add("DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)");
-                                    }
-
-                                    if(report.SCSI.MultiMediaDevice.ModeSense2A.ReadDVDR)
-                                        mediaTypes.Add("DVD-R");
-                                }
-
-                                if(report.SCSI.MultiMediaDevice.Features != null &&
-                                   !iomegaRev)
-                                {
-                                    if(report.SCSI.MultiMediaDevice.Features.CanReadBD      ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadBDR     ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadBDRE1   ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadBDRE2   ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadBDROM   ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadOldBDR  ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadOldBDRE ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadOldBDROM)
-                                    {
-                                        mediaTypes.Add("BD-ROM");
-                                        mediaTypes.Add("BD-R HTL (not LTH)");
-                                        mediaTypes.Add("BD-RE");
-                                        mediaTypes.Add("BD-R LTH");
-                                        mediaTypes.Add("BD-R Triple Layer (100Gb)");
-                                        mediaTypes.Add("BD-R Quad Layer (128Gb)");
-                                        mediaTypes.Add("Ultra HD Blu-ray movie");
-                                        mediaTypes.Add("PlayStation 3 game");
-                                        mediaTypes.Add("PlayStation 4 game");
-                                        mediaTypes.Add("PlayStation 5 game");
-                                        mediaTypes.Add("Xbox One game");
-                                        mediaTypes.Add("Nintendo Wii U game");
-                                    }
-
-                                    if(report.SCSI.MultiMediaDevice.Features.CanReadCD ||
-                                       report.SCSI.MultiMediaDevice.Features.MultiRead)
-                                    {
-                                        mediaTypes.Add("CD-ROM");
-                                        mediaTypes.Add("Audio CD");
-                                        mediaTypes.Add("Enhanced CD (aka E-CD, CD-Plus or CD+)");
-                                        mediaTypes.Add("CD-R");
-                                        mediaTypes.Add("CD-RW Ultra Speed (marked 16x or higher)");
-                                        mediaTypes.Add("CD-RW High Speed (marked between 8x and 12x)");
-                                        mediaTypes.Add("CD-RW (marked 4x or lower)");
-                                    }
-
-                                    if(report.SCSI.MultiMediaDevice.Features.CanReadCDMRW)
-                                        mediaTypes.Add("CD-MRW");
-
-                                    if(report.SCSI.MultiMediaDevice.Features.CanReadDDCD)
-                                    {
-                                        mediaTypes.Add("DDCD-ROM");
-                                        mediaTypes.Add("DDCD-R");
-                                        mediaTypes.Add("DDCD-RW");
-                                    }
-
-                                    if(report.SCSI.MultiMediaDevice.Features.CanReadDVD        ||
-                                       report.SCSI.MultiMediaDevice.Features.DVDMultiRead      ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadDVDPlusR   ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadDVDPlusRDL ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadDVDPlusRW  ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadDVDPlusRWDL)
-                                    {
-                                        mediaTypes.Add("DVD-ROM");
-                                        mediaTypes.Add("DVD-R");
-                                        mediaTypes.Add("DVD-RW");
-                                        mediaTypes.Add("DVD+R");
-                                        mediaTypes.Add("DVD+RW");
-                                        mediaTypes.Add("DVD-R DL");
-                                        mediaTypes.Add("DVD+R DL");
-                                        mediaTypes.Add("Nintendo GameCube game");
-                                        mediaTypes.Add("Nintendo Wii game");
-                                        mediaTypes.Add("DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)");
-                                        mediaTypes.Add("DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)");
-                                    }
-
-                                    if(report.SCSI.MultiMediaDevice.Features.CanReadDVDPlusMRW)
-                                        mediaTypes.Add("DVD+MRW");
-
-                                    if(report.SCSI.MultiMediaDevice.Features.CanReadHDDVD ||
-                                       report.SCSI.MultiMediaDevice.Features.CanReadHDDVDR)
-                                    {
-                                        mediaTypes.Add("HD DVD-ROM");
-                                        mediaTypes.Add("HD DVD-R");
-                                        mediaTypes.Add("HD DVD-RW");
-                                    }
-
-                                    if(report.SCSI.MultiMediaDevice.Features.CanReadHDDVDRAM)
-                                        mediaTypes.Add("HD DVD-RAM");
-                                }
-
-                                if(iomegaRev)
-                                {
-                                    mediaTypes.Add("REV 35Gb");
-                                    mediaTypes.Add("REV 70Gb");
-                                    mediaTypes.Add("REV 120Gb");
-                                }
-
-                                // Very old CD drives do not contain mode page 2Ah neither GET CONFIGURATION, so just try all CDs on them
-                                // Also don't get confident, some drives didn't know CD-RW but are able to read them
-                                if(mediaTypes.Count == 0 ||
-                                   mediaTypes.Contains("CD-ROM"))
-                                {
-                                    mediaTypes.Add("CD-ROM");
-                                    mediaTypes.Add("Audio CD");
                                     mediaTypes.Add("CD-R");
                                     mediaTypes.Add("CD-RW Ultra Speed (marked 16x or higher)");
                                     mediaTypes.Add("CD-RW High Speed (marked between 8x and 12x)");
                                     mediaTypes.Add("CD-RW (marked 4x or lower)");
-                                    mediaTypes.Add("Enhanced CD (aka E-CD, CD-Plus or CD+)");
                                 }
 
-                                mediaTypes = mediaTypes.Distinct().ToList();
-                                mediaTypes.Sort();
+                                if(report.SCSI.MultiMediaDevice.Features.CanReadCDMRW)
+                                    mediaTypes.Add("CD-MRW");
 
-                                bool tryPlextor      = false, tryHldtst = false, tryPioneer = false, tryNec = false,
-                                     tryMediaTekF106 = false;
-
-                                tryPlextor |= dev.Manufacturer.ToLowerInvariant() == "plextor";
-                                tryHldtst  |= dev.Manufacturer.ToLowerInvariant() == "hl-dt-st";
-                                tryPioneer |= dev.Manufacturer.ToLowerInvariant() == "pioneer";
-                                tryNec     |= dev.Manufacturer.ToLowerInvariant() == "nec";
-
-                                if(!iomegaRev)
+                                if(report.SCSI.MultiMediaDevice.Features.CanReadDDCD)
                                 {
-                                    if(!tryPlextor)
-                                        tryPlextor |=
-                                            AnsiConsole.
-                                                Confirm("[italic]Do you have want to try Plextor vendor commands? [red]THIS IS DANGEROUS AND CAN IRREVERSIBLY DESTROY YOUR DRIVE (IF IN DOUBT PRESS 'N')[/][/]",
-                                                        false);
-
-                                    if(!tryNec)
-                                        tryNec |=
-                                            AnsiConsole.
-                                                Confirm("[italic]Do you have want to try NEC vendor commands? [red]THIS IS DANGEROUS AND CAN IRREVERSIBLY DESTROY YOUR DRIVE (IF IN DOUBT PRESS 'N')[/][/]",
-                                                        false);
-
-                                    if(!tryPioneer)
-                                        tryPioneer |=
-                                            AnsiConsole.
-                                                Confirm("[italic]Do you have want to try Pioneer vendor commands? [red]THIS IS DANGEROUS AND CAN IRREVERSIBLY DESTROY YOUR DRIVE (IF IN DOUBT PRESS 'N')[/][/]",
-                                                        false);
-
-                                    if(!tryHldtst)
-                                        tryHldtst |=
-                                            AnsiConsole.
-                                                Confirm("[italic]Do you have want to try HL-DT-ST (aka LG) vendor commands? [red]THIS IS DANGEROUS AND CAN IRREVERSIBLY DESTROY YOUR DRIVE (IF IN DOUBT PRESS 'N')[/][/]",
-                                                        false);
-
-                                    tryMediaTekF106 =
-                                        AnsiConsole.
-                                            Confirm("[italic]Do you have want to try MediaTek vendor command F1h subcommand 06h? [red]THIS IS DANGEROUS AND CAN IRREVERSIBLY DESTROY YOUR DRIVE (IF IN DOUBT PRESS 'N')[/][/]",
-                                                    false);
+                                    mediaTypes.Add("DDCD-ROM");
+                                    mediaTypes.Add("DDCD-R");
+                                    mediaTypes.Add("DDCD-RW");
                                 }
 
-                                if(dev.Model.StartsWith("PD-", StringComparison.Ordinal))
-                                    mediaTypes.Add("PD-650");
-
-                                List<TestedMedia> mediaTests = new();
-
-                                foreach(string mediaType in mediaTypes)
+                                if(report.SCSI.MultiMediaDevice.Features.CanReadDVD        ||
+                                   report.SCSI.MultiMediaDevice.Features.DVDMultiRead      ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadDVDPlusR   ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadDVDPlusRDL ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadDVDPlusRW  ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadDVDPlusRWDL)
                                 {
-                                    if(!AnsiConsole.
-                                           Confirm($"[italic]Do you have a {mediaType} disc that you can insert in the drive?[/]"))
-                                        continue;
-
-                                    AaruConsole.
-                                        WriteLine("Please insert it in the drive and press any key when it is ready.");
-
-                                    System.Console.ReadKey(true);
-
-                                    bool mediaIsRecognized = true;
-
-                                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                                    {
-                                        ctx.AddTask("Waiting for drive to become ready").IsIndeterminate();
-                                        sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
-
-                                        if(!sense)
-                                            return;
-
-                                        DecodedSense? decSense = Sense.Decode(senseBuffer);
-
-                                        if(decSense.HasValue)
-                                        {
-                                            switch(decSense.Value.ASC)
-                                            {
-                                                case 0x3A:
-                                                {
-                                                    int leftRetries = 50;
-
-                                                    while(leftRetries > 0)
-                                                    {
-                                                        Thread.Sleep(2000);
-
-                                                        sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout,
-                                                            out _);
-
-                                                        if(!sense)
-                                                            break;
-
-                                                        leftRetries--;
-                                                    }
-
-                                                    AaruConsole.WriteLine();
-
-                                                    mediaIsRecognized &= !sense;
-
-                                                    break;
-                                                }
-
-                                                // These should be trapped by the OS but seems in some cases they're not
-                                                case 0x04 when decSense.Value.ASCQ == 0x01:
-                                                {
-                                                    int leftRetries = 50;
-
-                                                    while(leftRetries > 0)
-                                                    {
-                                                        Thread.Sleep(2000);
-
-                                                        sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout,
-                                                            out _);
-
-                                                        if(!sense)
-                                                            break;
-
-                                                        leftRetries--;
-                                                    }
-
-                                                    AaruConsole.WriteLine();
-
-                                                    mediaIsRecognized &= !sense;
-
-                                                    break;
-                                                }
-                                                case 0x28:
-                                                {
-                                                    int leftRetries = 50;
-
-                                                    while(leftRetries > 0)
-                                                    {
-                                                        Thread.Sleep(2000);
-
-                                                        sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout,
-                                                            out _);
-
-                                                        if(!sense)
-                                                            break;
-
-                                                        leftRetries--;
-                                                    }
-
-                                                    AaruConsole.WriteLine();
-
-                                                    mediaIsRecognized &= !sense;
-
-                                                    break;
-                                                }
-                                                default:
-                                                    AaruConsole.DebugWriteLine("Device-Report command",
-                                                                               "Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
-                                                                               decSense.Value.SenseKey,
-                                                                               decSense.Value.ASC, decSense.Value.ASCQ);
-
-                                                    mediaIsRecognized = false;
-
-                                                    break;
-                                            }
-                                        }
-                                        else
-                                        {
-                                            AaruConsole.DebugWriteLine("Device-Report command",
-                                                                       "Got sense status but no sense buffer");
-
-                                            mediaIsRecognized = false;
-                                        }
-                                    });
-
-                                    var mediaTest = new TestedMedia();
-
-                                    if(mediaIsRecognized)
-                                    {
-                                        mediaTest = reporter.ReportMmcMedia(mediaType, tryPlextor, tryPioneer, tryNec,
-                                                                            tryHldtst, tryMediaTekF106);
-
-                                        if(mediaTest is null)
-                                            continue;
-
-                                        if((mediaTest.SupportsReadLong   == true ||
-                                            mediaTest.SupportsReadLong16 == true)         &&
-                                           mediaTest.LongBlockSize == mediaTest.BlockSize &&
-                                           AnsiConsole.
-                                               Confirm("[italic]Drive supports SCSI READ LONG but I cannot find the correct size. Do you want me to try? (This can take hours)[/]"))
-                                        {
-                                            AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                                        Columns(new TaskDescriptionColumn(), new ProgressBarColumn(),
-                                                                new PercentageColumn()).Start(ctx =>
-                                                        {
-                                                            ProgressTask task = ctx.AddTask("Trying to READ LONG...");
-                                                            task.MaxValue = ushort.MaxValue;
-
-                                                            for(ushort i = (ushort)mediaTest.BlockSize;; i++)
-                                                            {
-                                                                task.Description =
-                                                                    $"Trying to READ LONG with a size of {i} bytes...";
-
-                                                                task.Value = i;
-
-                                                                sense = mediaTest.SupportsReadLong16 == true
-                                                                            ? dev.ReadLong16(out buffer,
-                                                                                out senseBuffer, false, 0, i,
-                                                                                dev.Timeout, out _)
-                                                                            : dev.ReadLong10(out buffer,
-                                                                                out senseBuffer, false, false, 0,
-                                                                                i, dev.Timeout, out _);
-
-                                                                if(!sense)
-                                                                {
-                                                                    mediaTest.LongBlockSize = i;
-
-                                                                    break;
-                                                                }
-
-                                                                if(i == ushort.MaxValue)
-                                                                    break;
-                                                            }
-                                                        });
-                                        }
-
-                                        if(mediaTest.SupportsReadLong == true &&
-                                           mediaTest.LongBlockSize    != mediaTest.BlockSize)
-                                        {
-                                            Core.Spectre.ProgressSingleSpinner(ctx =>
-                                            {
-                                                ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
-
-                                                sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0,
-                                                                       (ushort)mediaTest.LongBlockSize, dev.Timeout,
-                                                                       out _);
-                                            });
-
-                                            if(!sense)
-                                                mediaTest.ReadLong10Data = buffer;
-                                        }
-
-                                        if(mediaTest.SupportsReadLong16 == true &&
-                                           mediaTest.LongBlockSize      != mediaTest.BlockSize)
-                                        {
-                                            Core.Spectre.ProgressSingleSpinner(ctx =>
-                                            {
-                                                ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
-
-                                                sense = dev.ReadLong16(out buffer, out senseBuffer, false, 0,
-                                                                       mediaTest.LongBlockSize.Value, dev.Timeout,
-                                                                       out _);
-                                            });
-
-                                            if(!sense)
-                                                mediaTest.ReadLong16Data = buffer;
-                                        }
-                                    }
-
-                                    mediaTest.MediumTypeName    = mediaType;
-                                    mediaTest.MediaIsRecognized = mediaIsRecognized;
-                                    mediaTests.Add(mediaTest);
-
-                                    dev.AllowMediumRemoval(out buffer, dev.Timeout, out _);
-                                    dev.EjectTray(out buffer, dev.Timeout, out _);
+                                    mediaTypes.Add("DVD-ROM");
+                                    mediaTypes.Add("DVD-R");
+                                    mediaTypes.Add("DVD-RW");
+                                    mediaTypes.Add("DVD+R");
+                                    mediaTypes.Add("DVD+RW");
+                                    mediaTypes.Add("DVD-R DL");
+                                    mediaTypes.Add("DVD+R DL");
+                                    mediaTypes.Add("Nintendo GameCube game");
+                                    mediaTypes.Add("Nintendo Wii game");
+                                    mediaTypes.Add("DVD-RAM (1st gen, marked 2.6Gb or 5.2Gb)");
+                                    mediaTypes.Add("DVD-RAM (2nd gen, marked 4.7Gb or 9.4Gb)");
                                 }
 
-                                report.SCSI.MultiMediaDevice.TestedMedia = mediaTests;
-                            }
-                        }
+                                if(report.SCSI.MultiMediaDevice.Features.CanReadDVDPlusMRW)
+                                    mediaTypes.Add("DVD+MRW");
 
-                            break;
-                        case PeripheralDeviceTypes.SequentialAccess:
-                        {
-                            report.SCSI.SequentialDevice = reporter.ReportScsiSsc();
-
-                            List<TestedSequentialMedia> seqTests = new();
-
-                            while(AnsiConsole.Confirm("[italic]Do you have media that you can insert in the drive?[/]"))
-                            {
-                                AaruConsole.
-                                    WriteLine("Please insert it in the drive and press any key when it is ready.");
-
-                                System.Console.ReadKey(true);
-
-                                mediumTypeName =
-                                    AnsiConsole.
-                                        Ask<string>("Please write a description of the media type and press enter: ");
-
-                                mediumManufacturer =
-                                    AnsiConsole.Ask<string>("Please write the media manufacturer and press enter: ");
-
-                                mediumModel = AnsiConsole.Ask<string>("Please write the media model and press enter: ");
-
-                                bool mediaIsRecognized = true;
-
-                                Core.Spectre.ProgressSingleSpinner(ctx =>
+                                if(report.SCSI.MultiMediaDevice.Features.CanReadHDDVD ||
+                                   report.SCSI.MultiMediaDevice.Features.CanReadHDDVDR)
                                 {
-                                    ctx.AddTask("Waiting for drive to become ready").IsIndeterminate();
+                                    mediaTypes.Add("HD DVD-ROM");
+                                    mediaTypes.Add("HD DVD-R");
+                                    mediaTypes.Add("HD DVD-RW");
+                                }
 
-                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
-                                    AaruConsole.DebugWriteLine("Device reporting", "sense = {0}", sense);
-
-                                    if(!sense)
-                                        return;
-
-                                    DecodedSense? decSense = Sense.Decode(senseBuffer);
-
-                                    if(decSense.HasValue)
-                                    {
-                                        switch(decSense.Value.ASC)
-                                        {
-                                            case 0x3A:
-                                            {
-                                                int leftRetries = 50;
-
-                                                while(leftRetries > 0)
-                                                {
-                                                    Thread.Sleep(2000);
-
-                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
-
-                                                    if(!sense)
-                                                        break;
-
-                                                    leftRetries--;
-                                                }
-
-                                                AaruConsole.WriteLine();
-
-                                                mediaIsRecognized &= !sense;
-
-                                                break;
-                                            }
-
-                                            // These should be trapped by the OS but seems in some cases they're not
-                                            case 0x04 when decSense.Value.ASCQ == 0x01:
-                                            {
-                                                int leftRetries = 50;
-
-                                                while(leftRetries > 0)
-                                                {
-                                                    Thread.Sleep(2000);
-
-                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
-
-                                                    if(!sense)
-                                                        break;
-
-                                                    leftRetries--;
-                                                }
-
-                                                AaruConsole.WriteLine();
-
-                                                mediaIsRecognized &= !sense;
-
-                                                break;
-                                            }
-                                            case 0x28:
-                                            {
-                                                int leftRetries = 50;
-
-                                                while(leftRetries > 0)
-                                                {
-                                                    Thread.Sleep(2000);
-
-                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
-
-                                                    if(!sense)
-                                                        break;
-
-                                                    leftRetries--;
-                                                }
-
-                                                AaruConsole.WriteLine();
-
-                                                mediaIsRecognized &= !sense;
-
-                                                break;
-                                            }
-                                            default:
-                                                AaruConsole.DebugWriteLine("Device-Report command",
-                                                                           "Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
-                                                                           decSense.Value.SenseKey, decSense.Value.ASC,
-                                                                           decSense.Value.ASCQ);
-
-                                                mediaIsRecognized = false;
-
-                                                break;
-                                        }
-                                    }
-                                    else
-                                    {
-                                        AaruConsole.DebugWriteLine("Device-Report command",
-                                                                   "Got sense status but no sense buffer");
-
-                                        mediaIsRecognized = false;
-                                    }
-                                });
-
-                                var seqTest = new TestedSequentialMedia();
-
-                                if(mediaIsRecognized)
-                                    seqTest = reporter.ReportSscMedia();
-
-                                seqTest.MediumTypeName    = mediumTypeName;
-                                seqTest.Manufacturer      = mediumManufacturer;
-                                seqTest.Model             = mediumModel;
-                                seqTest.MediaIsRecognized = mediaIsRecognized;
-
-                                seqTests.Add(seqTest);
-
-                                Core.Spectre.ProgressSingleSpinner(ctx =>
-                                {
-                                    ctx.AddTask("Asking drive to unload tape (can take a few minutes)...").
-                                        IsIndeterminate();
-
-                                    dev.SpcAllowMediumRemoval(out buffer, dev.Timeout, out _);
-                                    dev.Unload(out buffer, dev.Timeout, out _);
-                                });
+                                if(report.SCSI.MultiMediaDevice.Features.CanReadHDDVDRAM)
+                                    mediaTypes.Add("HD DVD-RAM");
                             }
 
-                            report.SCSI.SequentialDevice.TestedMedia = seqTests;
-                        }
-
-                            break;
-                        case PeripheralDeviceTypes.BridgingExpander
-                            when dev.Model.StartsWith("MDM", StringComparison.Ordinal) ||
-                                 dev.Model.StartsWith("MDH", StringComparison.Ordinal):
-                        {
-                            List<string> mediaTypes = new()
+                            if(iomegaRev)
                             {
-                                "MD DATA (140Mb data MiniDisc)",
-                                "60 minutes rewritable MiniDisc",
-                                "74 minutes rewritable MiniDisc",
-                                "80 minutes rewritable MiniDisc",
-                                "Embossed Audio MiniDisc"
-                            };
+                                mediaTypes.Add("REV 35Gb");
+                                mediaTypes.Add("REV 70Gb");
+                                mediaTypes.Add("REV 120Gb");
+                            }
 
+                            // Very old CD drives do not contain mode page 2Ah neither GET CONFIGURATION, so just try all CDs on them
+                            // Also don't get confident, some drives didn't know CD-RW but are able to read them
+                            if(mediaTypes.Count == 0 ||
+                               mediaTypes.Contains("CD-ROM"))
+                            {
+                                mediaTypes.Add("CD-ROM");
+                                mediaTypes.Add("Audio CD");
+                                mediaTypes.Add("CD-R");
+                                mediaTypes.Add("CD-RW Ultra Speed (marked 16x or higher)");
+                                mediaTypes.Add("CD-RW High Speed (marked between 8x and 12x)");
+                                mediaTypes.Add("CD-RW (marked 4x or lower)");
+                                mediaTypes.Add("Enhanced CD (aka E-CD, CD-Plus or CD+)");
+                            }
+
+                            mediaTypes = mediaTypes.Distinct().ToList();
                             mediaTypes.Sort();
 
+                            bool tryPlextor      = false, tryHldtst = false, tryPioneer = false, tryNec = false,
+                                 tryMediaTekF106 = false;
+
+                            tryPlextor |= dev.Manufacturer.ToLowerInvariant() == "plextor";
+                            tryHldtst  |= dev.Manufacturer.ToLowerInvariant() == "hl-dt-st";
+                            tryPioneer |= dev.Manufacturer.ToLowerInvariant() == "pioneer";
+                            tryNec     |= dev.Manufacturer.ToLowerInvariant() == "nec";
+
+                            if(!iomegaRev)
+                            {
+                                if(!tryPlextor)
+                                    tryPlextor |=
+                                        AnsiConsole.
+                                            Confirm("[italic]Do you have want to try Plextor vendor commands? [red]THIS IS DANGEROUS AND CAN IRREVERSIBLY DESTROY YOUR DRIVE (IF IN DOUBT PRESS 'N')[/][/]",
+                                                    false);
+
+                                if(!tryNec)
+                                    tryNec |=
+                                        AnsiConsole.
+                                            Confirm("[italic]Do you have want to try NEC vendor commands? [red]THIS IS DANGEROUS AND CAN IRREVERSIBLY DESTROY YOUR DRIVE (IF IN DOUBT PRESS 'N')[/][/]",
+                                                    false);
+
+                                if(!tryPioneer)
+                                    tryPioneer |=
+                                        AnsiConsole.
+                                            Confirm("[italic]Do you have want to try Pioneer vendor commands? [red]THIS IS DANGEROUS AND CAN IRREVERSIBLY DESTROY YOUR DRIVE (IF IN DOUBT PRESS 'N')[/][/]",
+                                                    false);
+
+                                if(!tryHldtst)
+                                    tryHldtst |=
+                                        AnsiConsole.
+                                            Confirm("[italic]Do you have want to try HL-DT-ST (aka LG) vendor commands? [red]THIS IS DANGEROUS AND CAN IRREVERSIBLY DESTROY YOUR DRIVE (IF IN DOUBT PRESS 'N')[/][/]",
+                                                    false);
+
+                                tryMediaTekF106 =
+                                    AnsiConsole.
+                                        Confirm("[italic]Do you have want to try MediaTek vendor command F1h subcommand 06h? [red]THIS IS DANGEROUS AND CAN IRREVERSIBLY DESTROY YOUR DRIVE (IF IN DOUBT PRESS 'N')[/][/]",
+                                                false);
+                            }
+
+                            if(dev.Model.StartsWith("PD-", StringComparison.Ordinal))
+                                mediaTypes.Add("PD-650");
+
                             List<TestedMedia> mediaTests = new();
 
                             foreach(string mediaType in mediaTypes)
@@ -1159,7 +773,6 @@ namespace Aaru.Commands.Device
                                 Core.Spectre.ProgressSingleSpinner(ctx =>
                                 {
                                     ctx.AddTask("Waiting for drive to become ready").IsIndeterminate();
-
                                     sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
 
                                     if(!sense)
@@ -1179,7 +792,8 @@ namespace Aaru.Commands.Device
                                                 {
                                                     Thread.Sleep(2000);
 
-                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout,
+                                                        out _);
 
                                                     if(!sense)
                                                         break;
@@ -1187,6 +801,8 @@ namespace Aaru.Commands.Device
                                                     leftRetries--;
                                                 }
 
+                                                AaruConsole.WriteLine();
+
                                                 mediaIsRecognized &= !sense;
 
                                                 break;
@@ -1201,7 +817,8 @@ namespace Aaru.Commands.Device
                                                 {
                                                     Thread.Sleep(2000);
 
-                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout,
+                                                        out _);
 
                                                     if(!sense)
                                                         break;
@@ -1209,6 +826,8 @@ namespace Aaru.Commands.Device
                                                     leftRetries--;
                                                 }
 
+                                                AaruConsole.WriteLine();
+
                                                 mediaIsRecognized &= !sense;
 
                                                 break;
@@ -1221,7 +840,8 @@ namespace Aaru.Commands.Device
                                                 {
                                                     Thread.Sleep(2000);
 
-                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout,
+                                                        out _);
 
                                                     if(!sense)
                                                         break;
@@ -1229,6 +849,8 @@ namespace Aaru.Commands.Device
                                                     leftRetries--;
                                                 }
 
+                                                AaruConsole.WriteLine();
+
                                                 mediaIsRecognized &= !sense;
 
                                                 break;
@@ -1236,8 +858,8 @@ namespace Aaru.Commands.Device
                                             default:
                                                 AaruConsole.DebugWriteLine("Device-Report command",
                                                                            "Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
-                                                                           decSense.Value.SenseKey, decSense.Value.ASC,
-                                                                           decSense.Value.ASCQ);
+                                                                           decSense.Value.SenseKey,
+                                                                           decSense.Value.ASC, decSense.Value.ASCQ);
 
                                                 mediaIsRecognized = false;
 
@@ -1257,13 +879,598 @@ namespace Aaru.Commands.Device
 
                                 if(mediaIsRecognized)
                                 {
-                                    mediaTest = reporter.ReportScsiMedia();
+                                    mediaTest = reporter.ReportMmcMedia(mediaType, tryPlextor, tryPioneer, tryNec,
+                                                                        tryHldtst, tryMediaTekF106);
 
                                     if(mediaTest is null)
                                         continue;
 
-                                    if((mediaTest.SupportsReadLong == true || mediaTest.SupportsReadLong16 == true) &&
-                                       mediaTest.LongBlockSize == mediaTest.BlockSize                               &&
+                                    if((mediaTest.SupportsReadLong   == true ||
+                                        mediaTest.SupportsReadLong16 == true)         &&
+                                       mediaTest.LongBlockSize == mediaTest.BlockSize &&
+                                       AnsiConsole.
+                                           Confirm("[italic]Drive supports SCSI READ LONG but I cannot find the correct size. Do you want me to try? (This can take hours)[/]"))
+                                    {
+                                        AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                                                    Columns(new TaskDescriptionColumn(), new ProgressBarColumn(),
+                                                            new PercentageColumn()).Start(ctx =>
+                                                    {
+                                                        ProgressTask task = ctx.AddTask("Trying to READ LONG...");
+                                                        task.MaxValue = ushort.MaxValue;
+
+                                                        for(ushort i = (ushort)mediaTest.BlockSize;; i++)
+                                                        {
+                                                            task.Description =
+                                                                $"Trying to READ LONG with a size of {i} bytes...";
+
+                                                            task.Value = i;
+
+                                                            sense = mediaTest.SupportsReadLong16 == true
+                                                                        ? dev.ReadLong16(out buffer,
+                                                                            out senseBuffer, false, 0, i,
+                                                                            dev.Timeout, out _)
+                                                                        : dev.ReadLong10(out buffer,
+                                                                            out senseBuffer, false, false, 0,
+                                                                            i, dev.Timeout, out _);
+
+                                                            if(!sense)
+                                                            {
+                                                                mediaTest.LongBlockSize = i;
+
+                                                                break;
+                                                            }
+
+                                                            if(i == ushort.MaxValue)
+                                                                break;
+                                                        }
+                                                    });
+                                    }
+
+                                    if(mediaTest.SupportsReadLong == true &&
+                                       mediaTest.LongBlockSize    != mediaTest.BlockSize)
+                                    {
+                                        Core.Spectre.ProgressSingleSpinner(ctx =>
+                                        {
+                                            ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
+
+                                            sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0,
+                                                                   (ushort)mediaTest.LongBlockSize, dev.Timeout,
+                                                                   out _);
+                                        });
+
+                                        if(!sense)
+                                            mediaTest.ReadLong10Data = buffer;
+                                    }
+
+                                    if(mediaTest.SupportsReadLong16 == true &&
+                                       mediaTest.LongBlockSize      != mediaTest.BlockSize)
+                                    {
+                                        Core.Spectre.ProgressSingleSpinner(ctx =>
+                                        {
+                                            ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
+
+                                            sense = dev.ReadLong16(out buffer, out senseBuffer, false, 0,
+                                                                   mediaTest.LongBlockSize.Value, dev.Timeout,
+                                                                   out _);
+                                        });
+
+                                        if(!sense)
+                                            mediaTest.ReadLong16Data = buffer;
+                                    }
+                                }
+
+                                mediaTest.MediumTypeName    = mediaType;
+                                mediaTest.MediaIsRecognized = mediaIsRecognized;
+                                mediaTests.Add(mediaTest);
+
+                                dev.AllowMediumRemoval(out buffer, dev.Timeout, out _);
+                                dev.EjectTray(out buffer, dev.Timeout, out _);
+                            }
+
+                            report.SCSI.MultiMediaDevice.TestedMedia = mediaTests;
+                        }
+                    }
+
+                        break;
+                    case PeripheralDeviceTypes.SequentialAccess:
+                    {
+                        report.SCSI.SequentialDevice = reporter.ReportScsiSsc();
+
+                        List<TestedSequentialMedia> seqTests = new();
+
+                        while(AnsiConsole.Confirm("[italic]Do you have media that you can insert in the drive?[/]"))
+                        {
+                            AaruConsole.
+                                WriteLine("Please insert it in the drive and press any key when it is ready.");
+
+                            System.Console.ReadKey(true);
+
+                            mediumTypeName =
+                                AnsiConsole.
+                                    Ask<string>("Please write a description of the media type and press enter: ");
+
+                            mediumManufacturer =
+                                AnsiConsole.Ask<string>("Please write the media manufacturer and press enter: ");
+
+                            mediumModel = AnsiConsole.Ask<string>("Please write the media model and press enter: ");
+
+                            bool mediaIsRecognized = true;
+
+                            Core.Spectre.ProgressSingleSpinner(ctx =>
+                            {
+                                ctx.AddTask("Waiting for drive to become ready").IsIndeterminate();
+
+                                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+                                AaruConsole.DebugWriteLine("Device reporting", "sense = {0}", sense);
+
+                                if(!sense)
+                                    return;
+
+                                DecodedSense? decSense = Sense.Decode(senseBuffer);
+
+                                if(decSense.HasValue)
+                                {
+                                    switch(decSense.Value.ASC)
+                                    {
+                                        case 0x3A:
+                                        {
+                                            int leftRetries = 50;
+
+                                            while(leftRetries > 0)
+                                            {
+                                                Thread.Sleep(2000);
+
+                                                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+
+                                                if(!sense)
+                                                    break;
+
+                                                leftRetries--;
+                                            }
+
+                                            AaruConsole.WriteLine();
+
+                                            mediaIsRecognized &= !sense;
+
+                                            break;
+                                        }
+
+                                        // These should be trapped by the OS but seems in some cases they're not
+                                        case 0x04 when decSense.Value.ASCQ == 0x01:
+                                        {
+                                            int leftRetries = 50;
+
+                                            while(leftRetries > 0)
+                                            {
+                                                Thread.Sleep(2000);
+
+                                                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+
+                                                if(!sense)
+                                                    break;
+
+                                                leftRetries--;
+                                            }
+
+                                            AaruConsole.WriteLine();
+
+                                            mediaIsRecognized &= !sense;
+
+                                            break;
+                                        }
+                                        case 0x28:
+                                        {
+                                            int leftRetries = 50;
+
+                                            while(leftRetries > 0)
+                                            {
+                                                Thread.Sleep(2000);
+
+                                                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+
+                                                if(!sense)
+                                                    break;
+
+                                                leftRetries--;
+                                            }
+
+                                            AaruConsole.WriteLine();
+
+                                            mediaIsRecognized &= !sense;
+
+                                            break;
+                                        }
+                                        default:
+                                            AaruConsole.DebugWriteLine("Device-Report command",
+                                                                       "Device not ready. Sense {0} ASC {1:X2}h ASCQ {2:X2}h",
+                                                                       decSense.Value.SenseKey, decSense.Value.ASC,
+                                                                       decSense.Value.ASCQ);
+
+                                            mediaIsRecognized = false;
+
+                                            break;
+                                    }
+                                }
+                                else
+                                {
+                                    AaruConsole.DebugWriteLine("Device-Report command",
+                                                               "Got sense status but no sense buffer");
+
+                                    mediaIsRecognized = false;
+                                }
+                            });
+
+                            var seqTest = new TestedSequentialMedia();
+
+                            if(mediaIsRecognized)
+                                seqTest = reporter.ReportSscMedia();
+
+                            seqTest.MediumTypeName    = mediumTypeName;
+                            seqTest.Manufacturer      = mediumManufacturer;
+                            seqTest.Model             = mediumModel;
+                            seqTest.MediaIsRecognized = mediaIsRecognized;
+
+                            seqTests.Add(seqTest);
+
+                            Core.Spectre.ProgressSingleSpinner(ctx =>
+                            {
+                                ctx.AddTask("Asking drive to unload tape (can take a few minutes)...").
+                                    IsIndeterminate();
+
+                                dev.SpcAllowMediumRemoval(out buffer, dev.Timeout, out _);
+                                dev.Unload(out buffer, dev.Timeout, out _);
+                            });
+                        }
+
+                        report.SCSI.SequentialDevice.TestedMedia = seqTests;
+                    }
+
+                        break;
+                    case PeripheralDeviceTypes.BridgingExpander
+                        when dev.Model.StartsWith("MDM", StringComparison.Ordinal) ||
+                             dev.Model.StartsWith("MDH", StringComparison.Ordinal):
+                    {
+                        List<string> mediaTypes = new()
+                        {
+                            "MD DATA (140Mb data MiniDisc)",
+                            "60 minutes rewritable MiniDisc",
+                            "74 minutes rewritable MiniDisc",
+                            "80 minutes rewritable MiniDisc",
+                            "Embossed Audio MiniDisc"
+                        };
+
+                        mediaTypes.Sort();
+
+                        List<TestedMedia> mediaTests = new();
+
+                        foreach(string mediaType in mediaTypes)
+                        {
+                            if(!AnsiConsole.
+                                   Confirm($"[italic]Do you have a {mediaType} disc that you can insert in the drive?[/]"))
+                                continue;
+
+                            AaruConsole.
+                                WriteLine("Please insert it in the drive and press any key when it is ready.");
+
+                            System.Console.ReadKey(true);
+
+                            bool mediaIsRecognized = true;
+
+                            Core.Spectre.ProgressSingleSpinner(ctx =>
+                            {
+                                ctx.AddTask("Waiting for drive to become ready").IsIndeterminate();
+
+                                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+
+                                if(!sense)
+                                    return;
+
+                                DecodedSense? decSense = Sense.Decode(senseBuffer);
+
+                                if(decSense.HasValue)
+                                {
+                                    switch(decSense.Value.ASC)
+                                    {
+                                        case 0x3A:
+                                        {
+                                            int leftRetries = 50;
+
+                                            while(leftRetries > 0)
+                                            {
+                                                Thread.Sleep(2000);
+
+                                                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+
+                                                if(!sense)
+                                                    break;
+
+                                                leftRetries--;
+                                            }
+
+                                            mediaIsRecognized &= !sense;
+
+                                            break;
+                                        }
+
+                                        // These should be trapped by the OS but seems in some cases they're not
+                                        case 0x04 when decSense.Value.ASCQ == 0x01:
+                                        {
+                                            int leftRetries = 50;
+
+                                            while(leftRetries > 0)
+                                            {
+                                                Thread.Sleep(2000);
+
+                                                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+
+                                                if(!sense)
+                                                    break;
+
+                                                leftRetries--;
+                                            }
+
+                                            mediaIsRecognized &= !sense;
+
+                                            break;
+                                        }
+                                        case 0x28:
+                                        {
+                                            int leftRetries = 50;
+
+                                            while(leftRetries > 0)
+                                            {
+                                                Thread.Sleep(2000);
+
+                                                sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+
+                                                if(!sense)
+                                                    break;
+
+                                                leftRetries--;
+                                            }
+
+                                            mediaIsRecognized &= !sense;
+
+                                            break;
+                                        }
+                                        default:
+                                            AaruConsole.DebugWriteLine("Device-Report command",
+                                                                       "Device not ready. Sense {0}h ASC {1:X2}h ASCQ {2:X2}h",
+                                                                       decSense.Value.SenseKey, decSense.Value.ASC,
+                                                                       decSense.Value.ASCQ);
+
+                                            mediaIsRecognized = false;
+
+                                            break;
+                                    }
+                                }
+                                else
+                                {
+                                    AaruConsole.DebugWriteLine("Device-Report command",
+                                                               "Got sense status but no sense buffer");
+
+                                    mediaIsRecognized = false;
+                                }
+                            });
+
+                            var mediaTest = new TestedMedia();
+
+                            if(mediaIsRecognized)
+                            {
+                                mediaTest = reporter.ReportScsiMedia();
+
+                                if(mediaTest is null)
+                                    continue;
+
+                                if((mediaTest.SupportsReadLong == true || mediaTest.SupportsReadLong16 == true) &&
+                                   mediaTest.LongBlockSize == mediaTest.BlockSize                               &&
+                                   AnsiConsole.
+                                       Confirm("[italic]Drive supports SCSI READ LONG but I cannot find the correct size. Do you want me to try? (This can take hours)[/]"))
+                                {
+                                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(),
+                                                        new PercentageColumn()).Start(ctx =>
+                                                {
+                                                    ProgressTask task = ctx.AddTask("Trying to READ LONG...");
+                                                    task.MaxValue = ushort.MaxValue;
+
+                                                    for(ushort i = (ushort)mediaTest.BlockSize;; i++)
+                                                    {
+                                                        task.Value = i;
+
+                                                        task.Description =
+                                                            $"Trying to READ LONG with a size of {i} bytes...";
+
+                                                        sense = mediaTest.SupportsReadLong16 == true
+                                                                    ? dev.ReadLong16(out buffer, out senseBuffer,
+                                                                        false, 0, i, dev.Timeout, out _)
+                                                                    : dev.ReadLong10(out buffer, out senseBuffer,
+                                                                        false, false, 0, i, dev.Timeout,
+                                                                        out _);
+
+                                                        if(!sense)
+                                                        {
+                                                            mediaTest.LongBlockSize = i;
+
+                                                            break;
+                                                        }
+
+                                                        if(i == ushort.MaxValue)
+                                                            break;
+                                                    }
+
+                                                    AaruConsole.WriteLine();
+                                                });
+                                }
+
+                                if(mediaTest.SupportsReadLong == true &&
+                                   mediaTest.LongBlockSize    != mediaTest.BlockSize)
+                                {
+                                    Core.Spectre.ProgressSingleSpinner(ctx =>
+                                    {
+                                        ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
+
+                                        sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0,
+                                                               (ushort)mediaTest.LongBlockSize, dev.Timeout, out _);
+                                    });
+
+                                    if(!sense)
+                                        mediaTest.ReadLong10Data = buffer;
+                                }
+
+                                if(mediaTest.SupportsReadLong16 == true &&
+                                   mediaTest.LongBlockSize      != mediaTest.BlockSize)
+                                {
+                                    Core.Spectre.ProgressSingleSpinner(ctx =>
+                                    {
+                                        ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
+
+                                        sense = dev.ReadLong16(out buffer, out senseBuffer, false, 0,
+                                                               (ushort)mediaTest.LongBlockSize, dev.Timeout, out _);
+                                    });
+
+                                    if(!sense)
+                                        mediaTest.ReadLong16Data = buffer;
+                                }
+                            }
+
+                            switch(mediaType)
+                            {
+                                case "MD DATA (140Mb data MiniDisc)":
+                                    mediaTest.MediumTypeName = "MMD-140A";
+
+                                    break;
+                                case "60 minutes rewritable MiniDisc":
+                                    mediaTest.MediumTypeName = "MDW-60";
+
+                                    break;
+                                case "74 minutes rewritable MiniDisc":
+                                    mediaTest.MediumTypeName = "MDW-74";
+
+                                    break;
+                                case "80 minutes rewritable MiniDisc":
+                                    mediaTest.MediumTypeName = "MDW-80";
+
+                                    break;
+                                case "Embossed Audio MiniDisc":
+                                    mediaTest.MediumTypeName = "MiniDisc";
+
+                                    break;
+                            }
+
+                            mediaTest.Manufacturer      = "SONY";
+                            mediaTest.MediaIsRecognized = mediaIsRecognized;
+                            mediaTests.Add(mediaTest);
+
+                            dev.AllowMediumRemoval(out buffer, dev.Timeout, out _);
+                            dev.EjectTray(out buffer, dev.Timeout, out _);
+                        }
+
+                        report.SCSI.RemovableMedias = mediaTests;
+                    }
+
+                        break;
+                    default:
+                    {
+                        if(removable)
+                        {
+                            List<TestedMedia> mediaTests = new();
+
+                            while(AnsiConsole.
+                                  Confirm("[italic]Do you have media that you can insert in the drive?[/]"))
+                            {
+                                AaruConsole.
+                                    WriteLine("Please insert it in the drive and press any key when it is ready.");
+
+                                System.Console.ReadKey(true);
+
+                                mediumTypeName =
+                                    AnsiConsole.
+                                        Ask<
+                                            string>("Please write a description of the media type and press enter: ");
+
+                                mediumManufacturer =
+                                    AnsiConsole.
+                                        Ask<string>("Please write the media manufacturer and press enter: ");
+
+                                mediumModel =
+                                    AnsiConsole.Ask<string>("Please write the media model and press enter: ");
+
+                                bool mediaIsRecognized = true;
+
+                                Core.Spectre.ProgressSingleSpinner(ctx =>
+                                {
+                                    ctx.AddTask("Waiting for drive to become ready").IsIndeterminate();
+                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
+
+                                    if(!sense)
+                                        return;
+
+                                    DecodedSense? decSense = Sense.Decode(senseBuffer);
+
+                                    if(decSense.HasValue)
+                                        switch(decSense.Value.ASC)
+                                        {
+                                            case 0x3A:
+                                            {
+                                                int leftRetries = 20;
+
+                                                while(leftRetries > 0)
+                                                {
+                                                    Thread.Sleep(2000);
+
+                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout,
+                                                        out _);
+
+                                                    if(!sense)
+                                                        break;
+
+                                                    leftRetries--;
+                                                }
+
+                                                mediaIsRecognized &= !sense;
+
+                                                break;
+                                            }
+                                            case 0x04 when decSense.Value.ASCQ == 0x01:
+                                            {
+                                                int leftRetries = 20;
+
+                                                while(leftRetries > 0)
+                                                {
+                                                    Thread.Sleep(2000);
+
+                                                    sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout,
+                                                        out _);
+
+                                                    if(!sense)
+                                                        break;
+
+                                                    leftRetries--;
+                                                }
+
+                                                mediaIsRecognized &= !sense;
+
+                                                break;
+                                            }
+                                            default:
+                                                mediaIsRecognized = false;
+
+                                                break;
+                                        }
+                                    else
+                                        mediaIsRecognized = false;
+                                });
+
+                                var mediaTest = new TestedMedia();
+
+                                if(mediaIsRecognized)
+                                {
+                                    mediaTest = reporter.ReportScsiMedia();
+
+                                    if((mediaTest.SupportsReadLong   == true ||
+                                        mediaTest.SupportsReadLong16 == true)         &&
+                                       mediaTest.LongBlockSize == mediaTest.BlockSize &&
                                        AnsiConsole.
                                            Confirm("[italic]Drive supports SCSI READ LONG but I cannot find the correct size. Do you want me to try? (This can take hours)[/]"))
                                     {
@@ -1282,11 +1489,12 @@ namespace Aaru.Commands.Device
                                                                 $"Trying to READ LONG with a size of {i} bytes...";
 
                                                             sense = mediaTest.SupportsReadLong16 == true
-                                                                        ? dev.ReadLong16(out buffer, out senseBuffer,
-                                                                            false, 0, i, dev.Timeout, out _)
-                                                                        : dev.ReadLong10(out buffer, out senseBuffer,
-                                                                            false, false, 0, i, dev.Timeout,
-                                                                            out _);
+                                                                        ? dev.ReadLong16(out buffer,
+                                                                            out senseBuffer, false, 0, i,
+                                                                            dev.Timeout, out _)
+                                                                        : dev.ReadLong10(out buffer,
+                                                                            out senseBuffer, false, false, 0,
+                                                                            i, dev.Timeout, out _);
 
                                                             if(!sense)
                                                             {
@@ -1311,7 +1519,8 @@ namespace Aaru.Commands.Device
                                             ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
 
                                             sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0,
-                                                                   (ushort)mediaTest.LongBlockSize, dev.Timeout, out _);
+                                                                   (ushort)mediaTest.LongBlockSize, dev.Timeout,
+                                                                   out _);
                                         });
 
                                         if(!sense)
@@ -1326,7 +1535,8 @@ namespace Aaru.Commands.Device
                                             ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
 
                                             sense = dev.ReadLong16(out buffer, out senseBuffer, false, 0,
-                                                                   (ushort)mediaTest.LongBlockSize, dev.Timeout, out _);
+                                                                   (ushort)mediaTest.LongBlockSize, dev.Timeout,
+                                                                   out _);
                                         });
 
                                         if(!sense)
@@ -1334,32 +1544,11 @@ namespace Aaru.Commands.Device
                                     }
                                 }
 
-                                switch(mediaType)
-                                {
-                                    case "MD DATA (140Mb data MiniDisc)":
-                                        mediaTest.MediumTypeName = "MMD-140A";
-
-                                        break;
-                                    case "60 minutes rewritable MiniDisc":
-                                        mediaTest.MediumTypeName = "MDW-60";
-
-                                        break;
-                                    case "74 minutes rewritable MiniDisc":
-                                        mediaTest.MediumTypeName = "MDW-74";
-
-                                        break;
-                                    case "80 minutes rewritable MiniDisc":
-                                        mediaTest.MediumTypeName = "MDW-80";
-
-                                        break;
-                                    case "Embossed Audio MiniDisc":
-                                        mediaTest.MediumTypeName = "MiniDisc";
-
-                                        break;
-                                }
-
-                                mediaTest.Manufacturer      = "SONY";
+                                mediaTest.MediumTypeName    = mediumTypeName;
+                                mediaTest.Manufacturer      = mediumManufacturer;
+                                mediaTest.Model             = mediumModel;
                                 mediaTest.MediaIsRecognized = mediaIsRecognized;
+
                                 mediaTests.Add(mediaTest);
 
                                 dev.AllowMediumRemoval(out buffer, dev.Timeout, out _);
@@ -1368,307 +1557,117 @@ namespace Aaru.Commands.Device
 
                             report.SCSI.RemovableMedias = mediaTests;
                         }
-
-                            break;
-                        default:
+                        else
                         {
-                            if(removable)
+                            report.SCSI.ReadCapabilities = reporter.ReportScsi();
+
+                            if((report.SCSI.ReadCapabilities.SupportsReadLong   == true ||
+                                report.SCSI.ReadCapabilities.SupportsReadLong16 == true) &&
+                               report.SCSI.ReadCapabilities.LongBlockSize == report.SCSI.ReadCapabilities.BlockSize)
                             {
-                                List<TestedMedia> mediaTests = new();
-
-                                while(AnsiConsole.
-                                    Confirm("[italic]Do you have media that you can insert in the drive?[/]"))
+                                if(AnsiConsole.
+                                   Confirm("[italic]Drive supports SCSI READ LONG but I cannot find the correct size. Do you want me to try? (This can take hours)[/]"))
                                 {
-                                    AaruConsole.
-                                        WriteLine("Please insert it in the drive and press any key when it is ready.");
-
-                                    System.Console.ReadKey(true);
-
-                                    mediumTypeName =
-                                        AnsiConsole.
-                                            Ask<
-                                                string>("Please write a description of the media type and press enter: ");
-
-                                    mediumManufacturer =
-                                        AnsiConsole.
-                                            Ask<string>("Please write the media manufacturer and press enter: ");
-
-                                    mediumModel =
-                                        AnsiConsole.Ask<string>("Please write the media model and press enter: ");
-
-                                    bool mediaIsRecognized = true;
-
-                                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                                    {
-                                        ctx.AddTask("Waiting for drive to become ready").IsIndeterminate();
-                                        sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout, out _);
-
-                                        if(!sense)
-                                            return;
-
-                                        DecodedSense? decSense = Sense.Decode(senseBuffer);
-
-                                        if(decSense.HasValue)
-                                            switch(decSense.Value.ASC)
-                                            {
-                                                case 0x3A:
+                                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(),
+                                                        new PercentageColumn()).Start(ctx =>
                                                 {
-                                                    int leftRetries = 20;
+                                                    ProgressTask task = ctx.AddTask("Trying to READ LONG...");
+                                                    task.MaxValue = ushort.MaxValue;
 
-                                                    while(leftRetries > 0)
+                                                    for(ushort i = (ushort)report.SCSI.ReadCapabilities.BlockSize;;
+                                                        i++)
                                                     {
-                                                        Thread.Sleep(2000);
+                                                        task.Value = i;
 
-                                                        sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout,
-                                                            out _);
+                                                        task.Description =
+                                                            $"Trying to READ LONG with a size of {i} bytes...";
+
+                                                        sense =
+                                                            report.SCSI.ReadCapabilities.SupportsReadLong16 == true
+                                                                ? dev.ReadLong16(out buffer, out senseBuffer, false,
+                                                                    0, i, dev.Timeout, out _)
+                                                                : dev.ReadLong10(out buffer, out senseBuffer, false,
+                                                                    false, 0, i, dev.Timeout, out _);
 
                                                         if(!sense)
-                                                            break;
-
-                                                        leftRetries--;
-                                                    }
-
-                                                    mediaIsRecognized &= !sense;
-
-                                                    break;
-                                                }
-                                                case 0x04 when decSense.Value.ASCQ == 0x01:
-                                                {
-                                                    int leftRetries = 20;
-
-                                                    while(leftRetries > 0)
-                                                    {
-                                                        Thread.Sleep(2000);
-
-                                                        sense = dev.ScsiTestUnitReady(out senseBuffer, dev.Timeout,
-                                                            out _);
-
-                                                        if(!sense)
-                                                            break;
-
-                                                        leftRetries--;
-                                                    }
-
-                                                    mediaIsRecognized &= !sense;
-
-                                                    break;
-                                                }
-                                                default:
-                                                    mediaIsRecognized = false;
-
-                                                    break;
-                                            }
-                                        else
-                                            mediaIsRecognized = false;
-                                    });
-
-                                    var mediaTest = new TestedMedia();
-
-                                    if(mediaIsRecognized)
-                                    {
-                                        mediaTest = reporter.ReportScsiMedia();
-
-                                        if((mediaTest.SupportsReadLong   == true ||
-                                            mediaTest.SupportsReadLong16 == true)         &&
-                                           mediaTest.LongBlockSize == mediaTest.BlockSize &&
-                                           AnsiConsole.
-                                               Confirm("[italic]Drive supports SCSI READ LONG but I cannot find the correct size. Do you want me to try? (This can take hours)[/]"))
-                                        {
-                                            AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                                        Columns(new TaskDescriptionColumn(), new ProgressBarColumn(),
-                                                                new PercentageColumn()).Start(ctx =>
                                                         {
-                                                            ProgressTask task = ctx.AddTask("Trying to READ LONG...");
-                                                            task.MaxValue = ushort.MaxValue;
+                                                            report.SCSI.ReadCapabilities.LongBlockSize = i;
 
-                                                            for(ushort i = (ushort)mediaTest.BlockSize;; i++)
-                                                            {
-                                                                task.Value = i;
-
-                                                                task.Description =
-                                                                    $"Trying to READ LONG with a size of {i} bytes...";
-
-                                                                sense = mediaTest.SupportsReadLong16 == true
-                                                                            ? dev.ReadLong16(out buffer,
-                                                                                out senseBuffer, false, 0, i,
-                                                                                dev.Timeout, out _)
-                                                                            : dev.ReadLong10(out buffer,
-                                                                                out senseBuffer, false, false, 0,
-                                                                                i, dev.Timeout, out _);
-
-                                                                if(!sense)
-                                                                {
-                                                                    mediaTest.LongBlockSize = i;
-
-                                                                    break;
-                                                                }
-
-                                                                if(i == ushort.MaxValue)
-                                                                    break;
-                                                            }
-
-                                                            AaruConsole.WriteLine();
-                                                        });
-                                        }
-
-                                        if(mediaTest.SupportsReadLong == true &&
-                                           mediaTest.LongBlockSize    != mediaTest.BlockSize)
-                                        {
-                                            Core.Spectre.ProgressSingleSpinner(ctx =>
-                                            {
-                                                ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
-
-                                                sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0,
-                                                                       (ushort)mediaTest.LongBlockSize, dev.Timeout,
-                                                                       out _);
-                                            });
-
-                                            if(!sense)
-                                                mediaTest.ReadLong10Data = buffer;
-                                        }
-
-                                        if(mediaTest.SupportsReadLong16 == true &&
-                                           mediaTest.LongBlockSize      != mediaTest.BlockSize)
-                                        {
-                                            Core.Spectre.ProgressSingleSpinner(ctx =>
-                                            {
-                                                ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
-
-                                                sense = dev.ReadLong16(out buffer, out senseBuffer, false, 0,
-                                                                       (ushort)mediaTest.LongBlockSize, dev.Timeout,
-                                                                       out _);
-                                            });
-
-                                            if(!sense)
-                                                mediaTest.ReadLong16Data = buffer;
-                                        }
-                                    }
-
-                                    mediaTest.MediumTypeName    = mediumTypeName;
-                                    mediaTest.Manufacturer      = mediumManufacturer;
-                                    mediaTest.Model             = mediumModel;
-                                    mediaTest.MediaIsRecognized = mediaIsRecognized;
-
-                                    mediaTests.Add(mediaTest);
-
-                                    dev.AllowMediumRemoval(out buffer, dev.Timeout, out _);
-                                    dev.EjectTray(out buffer, dev.Timeout, out _);
-                                }
-
-                                report.SCSI.RemovableMedias = mediaTests;
-                            }
-                            else
-                            {
-                                report.SCSI.ReadCapabilities = reporter.ReportScsi();
-
-                                if((report.SCSI.ReadCapabilities.SupportsReadLong   == true ||
-                                    report.SCSI.ReadCapabilities.SupportsReadLong16 == true) &&
-                                   report.SCSI.ReadCapabilities.LongBlockSize == report.SCSI.ReadCapabilities.BlockSize)
-                                {
-                                    if(AnsiConsole.
-                                        Confirm("[italic]Drive supports SCSI READ LONG but I cannot find the correct size. Do you want me to try? (This can take hours)[/]"))
-                                    {
-                                        AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                                    Columns(new TaskDescriptionColumn(), new ProgressBarColumn(),
-                                                            new PercentageColumn()).Start(ctx =>
-                                                    {
-                                                        ProgressTask task = ctx.AddTask("Trying to READ LONG...");
-                                                        task.MaxValue = ushort.MaxValue;
-
-                                                        for(ushort i = (ushort)report.SCSI.ReadCapabilities.BlockSize;;
-                                                            i++)
-                                                        {
-                                                            task.Value = i;
-
-                                                            task.Description =
-                                                                $"Trying to READ LONG with a size of {i} bytes...";
-
-                                                            sense =
-                                                                report.SCSI.ReadCapabilities.SupportsReadLong16 == true
-                                                                    ? dev.ReadLong16(out buffer, out senseBuffer, false,
-                                                                        0, i, dev.Timeout, out _)
-                                                                    : dev.ReadLong10(out buffer, out senseBuffer, false,
-                                                                        false, 0, i, dev.Timeout, out _);
-
-                                                            if(!sense)
-                                                            {
-                                                                report.SCSI.ReadCapabilities.LongBlockSize = i;
-
-                                                                break;
-                                                            }
-
-                                                            if(i == ushort.MaxValue)
-                                                                break;
+                                                            break;
                                                         }
 
-                                                        AaruConsole.WriteLine();
-                                                    });
-                                    }
-                                }
+                                                        if(i == ushort.MaxValue)
+                                                            break;
+                                                    }
 
-                                if(report.SCSI.ReadCapabilities.SupportsReadLong == true &&
-                                   report.SCSI.ReadCapabilities.LongBlockSize != report.SCSI.ReadCapabilities.BlockSize)
-                                {
-                                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                                    {
-                                        ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
-
-                                        sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0,
-                                                               (ushort)report.SCSI.ReadCapabilities.LongBlockSize,
-                                                               dev.Timeout, out _);
-                                    });
-
-                                    if(!sense)
-                                        report.SCSI.ReadCapabilities.ReadLong10Data = buffer;
-                                }
-
-                                if(report.SCSI.ReadCapabilities.SupportsReadLong16 == true &&
-                                   report.SCSI.ReadCapabilities.LongBlockSize != report.SCSI.ReadCapabilities.BlockSize)
-                                {
-                                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                                    {
-                                        ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
-
-                                        sense = dev.ReadLong16(out buffer, out senseBuffer, false, 0,
-                                                               report.SCSI.ReadCapabilities.LongBlockSize.Value,
-                                                               dev.Timeout, out _);
-                                    });
-
-                                    if(!sense)
-                                        report.SCSI.ReadCapabilities.ReadLong16Data = buffer;
+                                                    AaruConsole.WriteLine();
+                                                });
                                 }
                             }
 
-                            break;
+                            if(report.SCSI.ReadCapabilities.SupportsReadLong == true &&
+                               report.SCSI.ReadCapabilities.LongBlockSize    != report.SCSI.ReadCapabilities.BlockSize)
+                            {
+                                Core.Spectre.ProgressSingleSpinner(ctx =>
+                                {
+                                    ctx.AddTask("Trying SCSI READ LONG (10)...").IsIndeterminate();
+
+                                    sense = dev.ReadLong10(out buffer, out senseBuffer, false, false, 0,
+                                                           (ushort)report.SCSI.ReadCapabilities.LongBlockSize,
+                                                           dev.Timeout, out _);
+                                });
+
+                                if(!sense)
+                                    report.SCSI.ReadCapabilities.ReadLong10Data = buffer;
+                            }
+
+                            if(report.SCSI.ReadCapabilities.SupportsReadLong16 == true &&
+                               report.SCSI.ReadCapabilities.LongBlockSize != report.SCSI.ReadCapabilities.BlockSize)
+                            {
+                                Core.Spectre.ProgressSingleSpinner(ctx =>
+                                {
+                                    ctx.AddTask("Trying SCSI READ LONG (16)...").IsIndeterminate();
+
+                                    sense = dev.ReadLong16(out buffer, out senseBuffer, false, 0,
+                                                           report.SCSI.ReadCapabilities.LongBlockSize.Value,
+                                                           dev.Timeout, out _);
+                                });
+
+                                if(!sense)
+                                    report.SCSI.ReadCapabilities.ReadLong16Data = buffer;
+                            }
                         }
+
+                        break;
                     }
+                }
 
-                    break;
-                default: throw new NotSupportedException("Unknown device type.");
-            }
-
-            var jsonFs = new FileStream(jsonFile, FileMode.Create);
-            var jsonSw = new StreamWriter(jsonFs);
-
-            jsonSw.Write(JsonConvert.SerializeObject(report, Formatting.Indented, new JsonSerializerSettings
-            {
-                NullValueHandling = NullValueHandling.Ignore
-            }));
-
-            jsonSw.Close();
-            jsonFs.Close();
-
-            using(var ctx = AaruContext.Create(Settings.Settings.LocalDbPath))
-            {
-                ctx.Reports.Add(new Report(report));
-                ctx.SaveChanges();
-            }
-
-            // TODO:
-            if(Settings.Settings.Current.ShareReports)
-                Remote.SubmitReport(report);
-
-            return (int)ErrorNumber.NoError;
+                break;
+            default: throw new NotSupportedException("Unknown device type.");
         }
+
+        var jsonFs = new FileStream(jsonFile, FileMode.Create);
+        var jsonSw = new StreamWriter(jsonFs);
+
+        jsonSw.Write(JsonConvert.SerializeObject(report, Formatting.Indented, new JsonSerializerSettings
+        {
+            NullValueHandling = NullValueHandling.Ignore
+        }));
+
+        jsonSw.Close();
+        jsonFs.Close();
+
+        using(var ctx = AaruContext.Create(Settings.Settings.LocalDbPath))
+        {
+            ctx.Reports.Add(new Report(report));
+            ctx.SaveChanges();
+        }
+
+        // TODO:
+        if(Settings.Settings.Current.ShareReports)
+            Remote.SubmitReport(report);
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Device/Info.cs b/Aaru/Commands/Device/Info.cs
index fa0957c57..02dfa8c2d 100644
--- a/Aaru/Commands/Device/Info.cs
+++ b/Aaru/Commands/Device/Info.cs
@@ -57,1145 +57,1144 @@ using DeviceInfo = Aaru.Core.Devices.Info.DeviceInfo;
 using Inquiry = Aaru.Decoders.SCSI.Inquiry;
 using Tuple = Aaru.Decoders.PCMCIA.Tuple;
 
-namespace Aaru.Commands.Device
-{
-    internal sealed class DeviceInfoCommand : Command
-    {
-        public DeviceInfoCommand() : base("info", "Gets information about a device.")
-        {
-            Add(new Option(new[]
-                {
-                    "--output-prefix", "-w"
-                }, "Prefix for saving binary information from device.")
-                {
-                    Argument = new Argument<string>(() => null),
-                    Required = false
-                });
+namespace Aaru.Commands.Device;
 
-            AddArgument(new Argument<string>
+internal sealed class DeviceInfoCommand : Command
+{
+    public DeviceInfoCommand() : base("info", "Gets information about a device.")
+    {
+        Add(new Option(new[]
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "Device path",
-                Name        = "device-path"
+                "--output-prefix", "-w"
+            }, "Prefix for saving binary information from device.")
+            {
+                Argument = new Argument<string>(() => null),
+                Required = false
             });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        AddArgument(new Argument<string>
+        {
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "Device path",
+            Name        = "device-path"
+        });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, string devicePath, string outputPrefix)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
+            {
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
+
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, string devicePath, string outputPrefix)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        Statistics.AddCommand("device-info");
+
+        AaruConsole.DebugWriteLine("Device-Info command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Device-Info command", "--device={0}", devicePath);
+        AaruConsole.DebugWriteLine("Device-Info command", "--output-prefix={0}", outputPrefix);
+        AaruConsole.DebugWriteLine("Device-Info command", "--verbose={0}", verbose);
+
+        if(devicePath.Length == 2   &&
+           devicePath[1]     == ':' &&
+           devicePath[0]     != '/' &&
+           char.IsLetter(devicePath[0]))
+            devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
+
+        Devices.Device dev;
+
+        try
         {
-            MainClass.PrintCopyright();
+            dev = new Devices.Device(devicePath);
 
-            if(debug)
+            if(dev.IsRemote)
+                Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
+                                     dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
+
+            if(dev.Error)
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
-
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            Statistics.AddCommand("device-info");
-
-            AaruConsole.DebugWriteLine("Device-Info command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Device-Info command", "--device={0}", devicePath);
-            AaruConsole.DebugWriteLine("Device-Info command", "--output-prefix={0}", outputPrefix);
-            AaruConsole.DebugWriteLine("Device-Info command", "--verbose={0}", verbose);
-
-            if(devicePath.Length == 2   &&
-               devicePath[1]     == ':' &&
-               devicePath[0]     != '/' &&
-               char.IsLetter(devicePath[0]))
-                devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
-
-            Devices.Device dev;
-
-            try
-            {
-                dev = new Devices.Device(devicePath);
-
-                if(dev.IsRemote)
-                    Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
-                                         dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
-
-                if(dev.Error)
-                {
-                    AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
-
-                    return (int)ErrorNumber.CannotOpenDevice;
-                }
-            }
-            catch(DeviceException e)
-            {
-                AaruConsole.ErrorWriteLine(e.Message);
+                AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
 
                 return (int)ErrorNumber.CannotOpenDevice;
             }
+        }
+        catch(DeviceException e)
+        {
+            AaruConsole.ErrorWriteLine(e.Message);
 
-            Statistics.AddDevice(dev);
+            return (int)ErrorNumber.CannotOpenDevice;
+        }
 
-            Table table;
+        Statistics.AddDevice(dev);
 
-            if(dev.IsUsb)
+        Table table;
+
+        if(dev.IsUsb)
+        {
+            table = new Table
             {
-                table = new Table
-                {
-                    Title = new TableTitle("[bold]USB device[/]")
-                };
+                Title = new TableTitle("[bold]USB device[/]")
+            };
 
-                table.HideHeaders();
-                table.AddColumn("");
-                table.AddColumn("");
-                table.Columns[0].RightAligned();
+            table.HideHeaders();
+            table.AddColumn("");
+            table.AddColumn("");
+            table.Columns[0].RightAligned();
 
-                if(dev.UsbDescriptors != null)
-                    table.AddRow("Descriptor size", $"{dev.UsbDescriptors.Length}");
+            if(dev.UsbDescriptors != null)
+                table.AddRow("Descriptor size", $"{dev.UsbDescriptors.Length}");
 
-                table.AddRow("Vendor ID", $"{dev.UsbVendorId:X4}");
-                table.AddRow("Product ID", $"{dev.UsbProductId:X4}");
-                table.AddRow("Manufacturer", $"{Markup.Escape(dev.UsbManufacturerString ?? "")}");
-                table.AddRow("Product", $"{Markup.Escape(dev.UsbProductString           ?? "")}");
-                table.AddRow("Serial number", $"{Markup.Escape(dev.UsbSerialString      ?? "")}");
+            table.AddRow("Vendor ID", $"{dev.UsbVendorId:X4}");
+            table.AddRow("Product ID", $"{dev.UsbProductId:X4}");
+            table.AddRow("Manufacturer", $"{Markup.Escape(dev.UsbManufacturerString ?? "")}");
+            table.AddRow("Product", $"{Markup.Escape(dev.UsbProductString           ?? "")}");
+            table.AddRow("Serial number", $"{Markup.Escape(dev.UsbSerialString      ?? "")}");
 
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
+        }
 
-            if(dev.IsFireWire)
+        if(dev.IsFireWire)
+        {
+            table = new Table
             {
-                table = new Table
-                {
-                    Title = new TableTitle("[bold]FireWire device[/]")
-                };
+                Title = new TableTitle("[bold]FireWire device[/]")
+            };
 
-                table.HideHeaders();
-                table.AddColumn("");
-                table.AddColumn("");
-                table.Columns[0].RightAligned();
+            table.HideHeaders();
+            table.AddColumn("");
+            table.AddColumn("");
+            table.Columns[0].RightAligned();
 
-                table.AddRow("Vendor ID", $"{dev.FireWireVendor:X6}");
-                table.AddRow("Model ID", $"{dev.FireWireModel:X6}");
-                table.AddRow("Vendor", $"{Markup.Escape(dev.FireWireVendorName ?? "")}");
-                table.AddRow("Model", $"{Markup.Escape(dev.FireWireModelName   ?? "")}");
-                table.AddRow("GUID", $"{dev.FireWireGuid:X16}");
+            table.AddRow("Vendor ID", $"{dev.FireWireVendor:X6}");
+            table.AddRow("Model ID", $"{dev.FireWireModel:X6}");
+            table.AddRow("Vendor", $"{Markup.Escape(dev.FireWireVendorName ?? "")}");
+            table.AddRow("Model", $"{Markup.Escape(dev.FireWireModelName   ?? "")}");
+            table.AddRow("GUID", $"{dev.FireWireGuid:X16}");
 
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
+        }
 
-            if(dev.IsPcmcia)
-            {
-                AaruConsole.WriteLine("[bold]PCMCIA device[/]");
-                AaruConsole.WriteLine("PCMCIA CIS is {0} bytes", dev.Cis.Length);
-                Tuple[] tuples = CIS.GetTuples(dev.Cis);
+        if(dev.IsPcmcia)
+        {
+            AaruConsole.WriteLine("[bold]PCMCIA device[/]");
+            AaruConsole.WriteLine("PCMCIA CIS is {0} bytes", dev.Cis.Length);
+            Tuple[] tuples = CIS.GetTuples(dev.Cis);
 
-                if(tuples != null)
-                    foreach(Tuple tuple in tuples)
-                        switch(tuple.Code)
-                        {
-                            case TupleCodes.CISTPL_NULL:
-                            case TupleCodes.CISTPL_END: break;
-                            case TupleCodes.CISTPL_DEVICEGEO:
-                            case TupleCodes.CISTPL_DEVICEGEO_A:
-                                AaruConsole.WriteLine("{0}", CIS.PrettifyDeviceGeometryTuple(tuple));
-
-                                break;
-                            case TupleCodes.CISTPL_MANFID:
-                                AaruConsole.WriteLine("{0}", CIS.PrettifyManufacturerIdentificationTuple(tuple));
-
-                                break;
-                            case TupleCodes.CISTPL_VERS_1:
-                                AaruConsole.WriteLine("{0}", CIS.PrettifyLevel1VersionTuple(tuple));
-
-                                break;
-                            case TupleCodes.CISTPL_ALTSTR:
-                            case TupleCodes.CISTPL_BAR:
-                            case TupleCodes.CISTPL_BATTERY:
-                            case TupleCodes.CISTPL_BYTEORDER:
-                            case TupleCodes.CISTPL_CFTABLE_ENTRY:
-                            case TupleCodes.CISTPL_CFTABLE_ENTRY_CB:
-                            case TupleCodes.CISTPL_CHECKSUM:
-                            case TupleCodes.CISTPL_CONFIG:
-                            case TupleCodes.CISTPL_CONFIG_CB:
-                            case TupleCodes.CISTPL_DATE:
-                            case TupleCodes.CISTPL_DEVICE:
-                            case TupleCodes.CISTPL_DEVICE_A:
-                            case TupleCodes.CISTPL_DEVICE_OA:
-                            case TupleCodes.CISTPL_DEVICE_OC:
-                            case TupleCodes.CISTPL_EXTDEVIC:
-                            case TupleCodes.CISTPL_FORMAT:
-                            case TupleCodes.CISTPL_FORMAT_A:
-                            case TupleCodes.CISTPL_FUNCE:
-                            case TupleCodes.CISTPL_FUNCID:
-                            case TupleCodes.CISTPL_GEOMETRY:
-                            case TupleCodes.CISTPL_INDIRECT:
-                            case TupleCodes.CISTPL_JEDEC_A:
-                            case TupleCodes.CISTPL_JEDEC_C:
-                            case TupleCodes.CISTPL_LINKTARGET:
-                            case TupleCodes.CISTPL_LONGLINK_A:
-                            case TupleCodes.CISTPL_LONGLINK_C:
-                            case TupleCodes.CISTPL_LONGLINK_CB:
-                            case TupleCodes.CISTPL_LONGLINK_MFC:
-                            case TupleCodes.CISTPL_NO_LINK:
-                            case TupleCodes.CISTPL_ORG:
-                            case TupleCodes.CISTPL_PWR_MGMNT:
-                            case TupleCodes.CISTPL_SPCL:
-                            case TupleCodes.CISTPL_SWIL:
-                            case TupleCodes.CISTPL_VERS_2:
-                                AaruConsole.DebugWriteLine("Device-Info command", "Found undecoded tuple ID {0}",
-                                                           tuple.Code);
-
-                                break;
-                            default:
-                                AaruConsole.DebugWriteLine("Device-Info command", "Found unknown tuple ID 0x{0:X2}",
-                                                           (byte)tuple.Code);
-
-                                break;
-                        }
-                else
-                    AaruConsole.DebugWriteLine("Device-Info command", "Could not get tuples");
-            }
-
-            var devInfo = new DeviceInfo(dev);
-
-            if(devInfo.AtaIdentify != null)
-            {
-                DataFile.WriteTo("Device-Info command", outputPrefix, "_ata_identify.bin", "ATA IDENTIFY",
-                                 devInfo.AtaIdentify);
-
-                Identify.IdentifyDevice? decodedIdentify = Identify.Decode(devInfo.AtaIdentify);
-                AaruConsole.WriteLine(Decoders.ATA.Identify.Prettify(decodedIdentify));
-
-                if(devInfo.AtaMcptError.HasValue)
-                {
-                    AaruConsole.WriteLine("Device supports the Media Card Pass Through Command Set");
-
-                    switch(devInfo.AtaMcptError.Value.DeviceHead & 0x7)
+            if(tuples != null)
+                foreach(Tuple tuple in tuples)
+                    switch(tuple.Code)
                     {
-                        case 0:
-                            AaruConsole.WriteLine("Device reports incorrect media card type");
+                        case TupleCodes.CISTPL_NULL:
+                        case TupleCodes.CISTPL_END: break;
+                        case TupleCodes.CISTPL_DEVICEGEO:
+                        case TupleCodes.CISTPL_DEVICEGEO_A:
+                            AaruConsole.WriteLine("{0}", CIS.PrettifyDeviceGeometryTuple(tuple));
 
                             break;
-                        case 1:
-                            AaruConsole.WriteLine("Device contains a Secure Digital card");
+                        case TupleCodes.CISTPL_MANFID:
+                            AaruConsole.WriteLine("{0}", CIS.PrettifyManufacturerIdentificationTuple(tuple));
 
                             break;
-                        case 2:
-                            AaruConsole.WriteLine("Device contains a MultiMediaCard ");
+                        case TupleCodes.CISTPL_VERS_1:
+                            AaruConsole.WriteLine("{0}", CIS.PrettifyLevel1VersionTuple(tuple));
 
                             break;
-                        case 3:
-                            AaruConsole.WriteLine("Device contains a Secure Digital I/O card");
-
-                            break;
-                        case 4:
-                            AaruConsole.WriteLine("Device contains a Smart Media card");
+                        case TupleCodes.CISTPL_ALTSTR:
+                        case TupleCodes.CISTPL_BAR:
+                        case TupleCodes.CISTPL_BATTERY:
+                        case TupleCodes.CISTPL_BYTEORDER:
+                        case TupleCodes.CISTPL_CFTABLE_ENTRY:
+                        case TupleCodes.CISTPL_CFTABLE_ENTRY_CB:
+                        case TupleCodes.CISTPL_CHECKSUM:
+                        case TupleCodes.CISTPL_CONFIG:
+                        case TupleCodes.CISTPL_CONFIG_CB:
+                        case TupleCodes.CISTPL_DATE:
+                        case TupleCodes.CISTPL_DEVICE:
+                        case TupleCodes.CISTPL_DEVICE_A:
+                        case TupleCodes.CISTPL_DEVICE_OA:
+                        case TupleCodes.CISTPL_DEVICE_OC:
+                        case TupleCodes.CISTPL_EXTDEVIC:
+                        case TupleCodes.CISTPL_FORMAT:
+                        case TupleCodes.CISTPL_FORMAT_A:
+                        case TupleCodes.CISTPL_FUNCE:
+                        case TupleCodes.CISTPL_FUNCID:
+                        case TupleCodes.CISTPL_GEOMETRY:
+                        case TupleCodes.CISTPL_INDIRECT:
+                        case TupleCodes.CISTPL_JEDEC_A:
+                        case TupleCodes.CISTPL_JEDEC_C:
+                        case TupleCodes.CISTPL_LINKTARGET:
+                        case TupleCodes.CISTPL_LONGLINK_A:
+                        case TupleCodes.CISTPL_LONGLINK_C:
+                        case TupleCodes.CISTPL_LONGLINK_CB:
+                        case TupleCodes.CISTPL_LONGLINK_MFC:
+                        case TupleCodes.CISTPL_NO_LINK:
+                        case TupleCodes.CISTPL_ORG:
+                        case TupleCodes.CISTPL_PWR_MGMNT:
+                        case TupleCodes.CISTPL_SPCL:
+                        case TupleCodes.CISTPL_SWIL:
+                        case TupleCodes.CISTPL_VERS_2:
+                            AaruConsole.DebugWriteLine("Device-Info command", "Found undecoded tuple ID {0}",
+                                                       tuple.Code);
 
                             break;
                         default:
-                            AaruConsole.WriteLine("Device contains unknown media card type {0}",
-                                                  devInfo.AtaMcptError.Value.DeviceHead & 0x07);
+                            AaruConsole.DebugWriteLine("Device-Info command", "Found unknown tuple ID 0x{0:X2}",
+                                                       (byte)tuple.Code);
 
                             break;
                     }
-
-                    if((devInfo.AtaMcptError.Value.DeviceHead & 0x08) == 0x08)
-                        AaruConsole.WriteLine("Media card is write protected");
-
-                    ushort specificData = (ushort)((devInfo.AtaMcptError.Value.CylinderHigh * 0x100) +
-                                                   devInfo.AtaMcptError.Value.CylinderLow);
-
-                    if(specificData != 0)
-                        AaruConsole.WriteLine("Card specific data: 0x{0:X4}", specificData);
-                }
-
-                if(decodedIdentify.HasValue)
-                {
-                    Identify.IdentifyDevice ataid = decodedIdentify.Value;
-
-                    ulong blocks;
-
-                    if(ataid.CurrentCylinders       > 0 &&
-                       ataid.CurrentHeads           > 0 &&
-                       ataid.CurrentSectorsPerTrack > 0)
-                    {
-                        blocks =
-                            (ulong)Math.Max(ataid.CurrentCylinders * ataid.CurrentHeads * ataid.CurrentSectorsPerTrack,
-                                            ataid.CurrentSectors);
-                    }
-                    else
-                    {
-                        blocks = (ulong)(ataid.Cylinders * ataid.Heads * ataid.SectorsPerTrack);
-                    }
-
-                    if(ataid.Capabilities.HasFlag(Identify.CapabilitiesBit.LBASupport))
-                        blocks = ataid.LBASectors;
-
-                    if(ataid.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
-                        blocks = ataid.LBA48Sectors;
-
-                    bool removable = ataid.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.Removable);
-
-                    MediaType mediaType = MediaTypeFromDevice.GetFromAta(dev.Manufacturer, dev.Model, removable,
-                                                                         dev.IsCompactFlash, dev.IsPcmcia, blocks);
-
-                    AaruConsole.WriteLine(removable ? "Media identified as {0}" : "Device identified as {0}",
-                                          mediaType);
-
-                    Statistics.AddMedia(mediaType, true);
-                }
-            }
-
-            if(devInfo.AtapiIdentify != null)
-            {
-                DataFile.WriteTo("Device-Info command", outputPrefix, "_atapi_identify.bin", "ATAPI IDENTIFY",
-                                 devInfo.AtapiIdentify);
-
-                AaruConsole.WriteLine(Decoders.ATA.Identify.Prettify(devInfo.AtapiIdentify));
-            }
-
-            if(devInfo.ScsiInquiry != null)
-            {
-                if(dev.Type != DeviceType.ATAPI)
-                    AaruConsole.WriteLine("[bold]SCSI device[/]");
-
-                DataFile.WriteTo("Device-Info command", outputPrefix, "_scsi_inquiry.bin", "SCSI INQUIRY",
-                                 devInfo.ScsiInquiryData);
-
-                AaruConsole.WriteLine(Inquiry.Prettify(devInfo.ScsiInquiry));
-
-                if(devInfo.ScsiEvpdPages != null)
-                    foreach(KeyValuePair<byte, byte[]> page in devInfo.ScsiEvpdPages)
-                        if(page.Key >= 0x01 &&
-                           page.Key <= 0x7F)
-                        {
-                            AaruConsole.WriteLine("ASCII Page {0:X2}h: {1}", page.Key,
-                                                  EVPD.DecodeASCIIPage(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, page.Value);
-                        }
-                        else if(page.Key == 0x80)
-                        {
-                            AaruConsole.WriteLine("Unit Serial Number: {0}", EVPD.DecodePage80(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0x81)
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_81(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0x82)
-                        {
-                            AaruConsole.WriteLine("ASCII implemented operating definitions: {0}",
-                                                  EVPD.DecodePage82(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0x83)
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_83(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0x84)
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_84(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0x85)
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_85(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0x86)
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_86(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0x89)
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_89(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0xB0)
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_B0(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0xB1)
-                        {
-                            AaruConsole.WriteLine("Manufacturer-assigned Serial Number: {0}",
-                                                  EVPD.DecodePageB1(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0xB2)
-                        {
-                            AaruConsole.WriteLine("TapeAlert Supported Flags Bitmap: 0x{0:X16}",
-                                                  EVPD.DecodePageB2(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0xB3)
-                        {
-                            AaruConsole.WriteLine("Automation Device Serial Number: {0}",
-                                                  EVPD.DecodePageB3(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0xB4)
-                        {
-                            AaruConsole.WriteLine("Data Transfer Device Element Address: 0x{0}",
-                                                  EVPD.DecodePageB4(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0xC0 &&
-                                StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
-                                               ToLowerInvariant().Trim() == "quantum")
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C0_Quantum(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0xC0 &&
-                                StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
-                                               ToLowerInvariant().Trim() == "seagate")
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C0_Seagate(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0xC0 &&
-                                StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
-                                               ToLowerInvariant().Trim() == "ibm")
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C0_IBM(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0xC1 &&
-                                StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
-                                               ToLowerInvariant().Trim() == "ibm")
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C1_IBM(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if((page.Key == 0xC0 || page.Key == 0xC1) &&
-                                StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
-                                               ToLowerInvariant().Trim() == "certance")
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C0_C1_Certance(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if((page.Key == 0xC2 || page.Key == 0xC3 || page.Key == 0xC4 || page.Key == 0xC5 ||
-                                 page.Key == 0xC6) &&
-                                StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
-                                               ToLowerInvariant().Trim() == "certance")
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C2_C3_C4_C5_C6_Certance(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if((page.Key == 0xC0 || page.Key == 0xC1 || page.Key == 0xC2 || page.Key == 0xC3 ||
-                                 page.Key == 0xC4 || page.Key == 0xC5) &&
-                                StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
-                                               ToLowerInvariant().Trim() == "hp")
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C0_to_C5_HP(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else if(page.Key == 0xDF &&
-                                StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
-                                               ToLowerInvariant().Trim() == "certance")
-                        {
-                            AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_DF_Certance(page.Value));
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-                        else
-                        {
-                            if(page.Key == 0x00)
-                                continue;
-
-                            AaruConsole.DebugWriteLine("Device-Info command", "Found undecoded SCSI VPD page 0x{0:X2}",
-                                                       page.Key);
-
-                            DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
-                                             $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
-                        }
-
-                if(devInfo.ScsiModeSense6 != null)
-                    DataFile.WriteTo("Device-Info command", outputPrefix, "_scsi_modesense6.bin", "SCSI MODE SENSE",
-                                     devInfo.ScsiModeSense6);
-
-                if(devInfo.ScsiModeSense10 != null)
-                    DataFile.WriteTo("Device-Info command", outputPrefix, "_scsi_modesense10.bin", "SCSI MODE SENSE",
-                                     devInfo.ScsiModeSense10);
-
-                if(devInfo.ScsiMode.HasValue)
-                    PrintScsiModePages.Print(devInfo.ScsiMode.Value,
-                                             (PeripheralDeviceTypes)devInfo.ScsiInquiry.Value.PeripheralDeviceType,
-                                             devInfo.ScsiInquiry.Value.VendorIdentification);
-
-                if(devInfo.MmcConfiguration != null)
-                {
-                    DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_getconfiguration.bin",
-                                     "MMC GET CONFIGURATION", devInfo.MmcConfiguration);
-
-                    Features.SeparatedFeatures ftr = Features.Separate(devInfo.MmcConfiguration);
-
-                    AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION length is {0} bytes",
-                                               ftr.DataLength);
-
-                    AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION current profile is {0:X4}h",
-                                               ftr.CurrentProfile);
-
-                    if(ftr.Descriptors != null)
-                    {
-                        AaruConsole.WriteLine("[bold]SCSI MMC GET CONFIGURATION Features:[/]");
-
-                        foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
-                        {
-                            AaruConsole.DebugWriteLine("Device-Info command", "Feature {0:X4}h", desc.Code);
-
-                            switch(desc.Code)
-                            {
-                                case 0x0000:
-                                    AaruConsole.WriteLine(Features.Prettify_0000(desc.Data));
-
-                                    break;
-                                case 0x0001:
-                                    AaruConsole.WriteLine(Features.Prettify_0001(desc.Data));
-
-                                    break;
-                                case 0x0002:
-                                    AaruConsole.WriteLine(Features.Prettify_0002(desc.Data));
-
-                                    break;
-                                case 0x0003:
-                                    AaruConsole.WriteLine(Features.Prettify_0003(desc.Data));
-
-                                    break;
-                                case 0x0004:
-                                    AaruConsole.WriteLine(Features.Prettify_0004(desc.Data));
-
-                                    break;
-                                case 0x0010:
-                                    AaruConsole.WriteLine(Features.Prettify_0010(desc.Data));
-
-                                    break;
-                                case 0x001D:
-                                    AaruConsole.WriteLine(Features.Prettify_001D(desc.Data));
-
-                                    break;
-                                case 0x001E:
-                                    AaruConsole.WriteLine(Features.Prettify_001E(desc.Data));
-
-                                    break;
-                                case 0x001F:
-                                    AaruConsole.WriteLine(Features.Prettify_001F(desc.Data));
-
-                                    break;
-                                case 0x0020:
-                                    AaruConsole.WriteLine(Features.Prettify_0020(desc.Data));
-
-                                    break;
-                                case 0x0021:
-                                    AaruConsole.WriteLine(Features.Prettify_0021(desc.Data));
-
-                                    break;
-                                case 0x0022:
-                                    AaruConsole.WriteLine(Features.Prettify_0022(desc.Data));
-
-                                    break;
-                                case 0x0023:
-                                    AaruConsole.WriteLine(Features.Prettify_0023(desc.Data));
-
-                                    break;
-                                case 0x0024:
-                                    AaruConsole.WriteLine(Features.Prettify_0024(desc.Data));
-
-                                    break;
-                                case 0x0025:
-                                    AaruConsole.WriteLine(Features.Prettify_0025(desc.Data));
-
-                                    break;
-                                case 0x0026:
-                                    AaruConsole.WriteLine(Features.Prettify_0026(desc.Data));
-
-                                    break;
-                                case 0x0027:
-                                    AaruConsole.WriteLine(Features.Prettify_0027(desc.Data));
-
-                                    break;
-                                case 0x0028:
-                                    AaruConsole.WriteLine(Features.Prettify_0028(desc.Data));
-
-                                    break;
-                                case 0x0029:
-                                    AaruConsole.WriteLine(Features.Prettify_0029(desc.Data));
-
-                                    break;
-                                case 0x002A:
-                                    AaruConsole.WriteLine(Features.Prettify_002A(desc.Data));
-
-                                    break;
-                                case 0x002B:
-                                    AaruConsole.WriteLine(Features.Prettify_002B(desc.Data));
-
-                                    break;
-                                case 0x002C:
-                                    AaruConsole.WriteLine(Features.Prettify_002C(desc.Data));
-
-                                    break;
-                                case 0x002D:
-                                    AaruConsole.WriteLine(Features.Prettify_002D(desc.Data));
-
-                                    break;
-                                case 0x002E:
-                                    AaruConsole.WriteLine(Features.Prettify_002E(desc.Data));
-
-                                    break;
-                                case 0x002F:
-                                    AaruConsole.WriteLine(Features.Prettify_002F(desc.Data));
-
-                                    break;
-                                case 0x0030:
-                                    AaruConsole.WriteLine(Features.Prettify_0030(desc.Data));
-
-                                    break;
-                                case 0x0031:
-                                    AaruConsole.WriteLine(Features.Prettify_0031(desc.Data));
-
-                                    break;
-                                case 0x0032:
-                                    AaruConsole.WriteLine(Features.Prettify_0032(desc.Data));
-
-                                    break;
-                                case 0x0033:
-                                    AaruConsole.WriteLine(Features.Prettify_0033(desc.Data));
-
-                                    break;
-                                case 0x0035:
-                                    AaruConsole.WriteLine(Features.Prettify_0035(desc.Data));
-
-                                    break;
-                                case 0x0037:
-                                    AaruConsole.WriteLine(Features.Prettify_0037(desc.Data));
-
-                                    break;
-                                case 0x0038:
-                                    AaruConsole.WriteLine(Features.Prettify_0038(desc.Data));
-
-                                    break;
-                                case 0x003A:
-                                    AaruConsole.WriteLine(Features.Prettify_003A(desc.Data));
-
-                                    break;
-                                case 0x003B:
-                                    AaruConsole.WriteLine(Features.Prettify_003B(desc.Data));
-
-                                    break;
-                                case 0x0040:
-                                    AaruConsole.WriteLine(Features.Prettify_0040(desc.Data));
-
-                                    break;
-                                case 0x0041:
-                                    AaruConsole.WriteLine(Features.Prettify_0041(desc.Data));
-
-                                    break;
-                                case 0x0042:
-                                    AaruConsole.WriteLine(Features.Prettify_0042(desc.Data));
-
-                                    break;
-                                case 0x0050:
-                                    AaruConsole.WriteLine(Features.Prettify_0050(desc.Data));
-
-                                    break;
-                                case 0x0051:
-                                    AaruConsole.WriteLine(Features.Prettify_0051(desc.Data));
-
-                                    break;
-                                case 0x0080:
-                                    AaruConsole.WriteLine(Features.Prettify_0080(desc.Data));
-
-                                    break;
-                                case 0x0100:
-                                    AaruConsole.WriteLine(Features.Prettify_0100(desc.Data));
-
-                                    break;
-                                case 0x0101:
-                                    AaruConsole.WriteLine(Features.Prettify_0101(desc.Data));
-
-                                    break;
-                                case 0x0102:
-                                    AaruConsole.WriteLine(Features.Prettify_0102(desc.Data));
-
-                                    break;
-                                case 0x0103:
-                                    AaruConsole.WriteLine(Features.Prettify_0103(desc.Data));
-
-                                    break;
-                                case 0x0104:
-                                    AaruConsole.WriteLine(Features.Prettify_0104(desc.Data));
-
-                                    break;
-                                case 0x0105:
-                                    AaruConsole.WriteLine(Features.Prettify_0105(desc.Data));
-
-                                    break;
-                                case 0x0106:
-                                    AaruConsole.WriteLine(Features.Prettify_0106(desc.Data));
-
-                                    break;
-                                case 0x0107:
-                                    AaruConsole.WriteLine(Features.Prettify_0107(desc.Data));
-
-                                    break;
-                                case 0x0108:
-                                    AaruConsole.WriteLine(Features.Prettify_0108(desc.Data));
-
-                                    break;
-                                case 0x0109:
-                                    AaruConsole.WriteLine(Features.Prettify_0109(desc.Data));
-
-                                    break;
-                                case 0x010A:
-                                    AaruConsole.WriteLine(Features.Prettify_010A(desc.Data));
-
-                                    break;
-                                case 0x010B:
-                                    AaruConsole.WriteLine(Features.Prettify_010B(desc.Data));
-
-                                    break;
-                                case 0x010C:
-                                    AaruConsole.WriteLine(Features.Prettify_010C(desc.Data));
-
-                                    break;
-                                case 0x010D:
-                                    AaruConsole.WriteLine(Features.Prettify_010D(desc.Data));
-
-                                    break;
-                                case 0x010E:
-                                    AaruConsole.WriteLine(Features.Prettify_010E(desc.Data));
-
-                                    break;
-                                case 0x0110:
-                                    AaruConsole.WriteLine(Features.Prettify_0110(desc.Data));
-
-                                    break;
-                                case 0x0113:
-                                    AaruConsole.WriteLine(Features.Prettify_0113(desc.Data));
-
-                                    break;
-                                case 0x0142:
-                                    AaruConsole.WriteLine(Features.Prettify_0142(desc.Data));
-
-                                    break;
-                                default:
-                                    AaruConsole.WriteLine("Found unknown feature code {0:X4}h", desc.Code);
-
-                                    break;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        AaruConsole.DebugWriteLine("Device-Info command",
-                                                   "GET CONFIGURATION returned no feature descriptors");
-                    }
-                }
-
-                if(devInfo.RPC != null)
-                    AaruConsole.WriteLine(CSS_CPRM.PrettifyRegionalPlaybackControlState(devInfo.RPC));
-
-                if(devInfo.PlextorFeatures?.Eeprom != null)
-                {
-                    DataFile.WriteTo("Device-Info command", outputPrefix, "_plextor_eeprom.bin", "PLEXTOR READ EEPROM",
-                                     devInfo.PlextorFeatures.Eeprom);
-
-                    AaruConsole.WriteLine("Drive has loaded a total of {0} discs", devInfo.PlextorFeatures.Discs);
-
-                    AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds reading CDs",
-                                          devInfo.PlextorFeatures.CdReadTime      / 3600,
-                                          devInfo.PlextorFeatures.CdReadTime / 60 % 60,
-                                          devInfo.PlextorFeatures.CdReadTime      % 60);
-
-                    AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds writing CDs",
-                                          devInfo.PlextorFeatures.CdWriteTime      / 3600,
-                                          devInfo.PlextorFeatures.CdWriteTime / 60 % 60,
-                                          devInfo.PlextorFeatures.CdWriteTime      % 60);
-
-                    if(devInfo.PlextorFeatures.IsDvd)
-                    {
-                        AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds reading DVDs",
-                                              devInfo.PlextorFeatures.DvdReadTime      / 3600,
-                                              devInfo.PlextorFeatures.DvdReadTime / 60 % 60,
-                                              devInfo.PlextorFeatures.DvdReadTime      % 60);
-
-                        AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds writing DVDs",
-                                              devInfo.PlextorFeatures.DvdWriteTime      / 3600,
-                                              devInfo.PlextorFeatures.DvdWriteTime / 60 % 60,
-                                              devInfo.PlextorFeatures.DvdWriteTime      % 60);
-                    }
-                }
-
-                if(devInfo.PlextorFeatures?.PoweRec == true)
-                {
-                    AaruConsole.Write("Drive supports PoweRec");
-
-                    if(devInfo.PlextorFeatures.PoweRecEnabled)
-                    {
-                        AaruConsole.Write(", has it enabled");
-
-                        if(devInfo.PlextorFeatures.PoweRecRecommendedSpeed > 0)
-                            AaruConsole.WriteLine(" and recommends {0} Kb/sec.",
-                                                  devInfo.PlextorFeatures.PoweRecRecommendedSpeed);
-                        else
-                            AaruConsole.WriteLine(".");
-
-                        if(devInfo.PlextorFeatures.PoweRecSelected > 0)
-                            AaruConsole.
-                                WriteLine("Selected PoweRec speed for currently inserted media is {0} Kb/sec ({1}x)",
-                                          devInfo.PlextorFeatures.PoweRecSelected,
-                                          devInfo.PlextorFeatures.PoweRecSelected / 177);
-
-                        if(devInfo.PlextorFeatures.PoweRecMax > 0)
-                            AaruConsole.
-                                WriteLine("Maximum PoweRec speed for currently inserted media is {0} Kb/sec ({1}x)",
-                                          devInfo.PlextorFeatures.PoweRecMax, devInfo.PlextorFeatures.PoweRecMax / 177);
-
-                        if(devInfo.PlextorFeatures.PoweRecLast > 0)
-                            AaruConsole.WriteLine("Last used PoweRec was {0} Kb/sec ({1}x)",
-                                                  devInfo.PlextorFeatures.PoweRecLast,
-                                                  devInfo.PlextorFeatures.PoweRecLast / 177);
-                    }
-                    else
-                    {
-                        AaruConsole.WriteLine(".");
-                        AaruConsole.WriteLine("PoweRec is disabled");
-                    }
-                }
-
-                if(devInfo.PlextorFeatures?.SilentMode == true)
-                {
-                    AaruConsole.WriteLine("Drive supports Plextor SilentMode");
-
-                    if(devInfo.PlextorFeatures.SilentModeEnabled)
-                    {
-                        AaruConsole.WriteLine("Plextor SilentMode is enabled:");
-
-                        AaruConsole.WriteLine(devInfo.PlextorFeatures.AccessTimeLimit == 2 ? "\tAccess time is slow"
-                                                  : "\tAccess time is fast");
-
-                        if(devInfo.PlextorFeatures.CdReadSpeedLimit > 0)
-                            AaruConsole.WriteLine("\tCD read speed limited to {0}x",
-                                                  devInfo.PlextorFeatures.CdReadSpeedLimit);
-
-                        if(devInfo.PlextorFeatures.DvdReadSpeedLimit > 0 &&
-                           devInfo.PlextorFeatures.IsDvd)
-                            AaruConsole.WriteLine("\tDVD read speed limited to {0}x",
-                                                  devInfo.PlextorFeatures.DvdReadSpeedLimit);
-
-                        if(devInfo.PlextorFeatures.CdWriteSpeedLimit > 0)
-                            AaruConsole.WriteLine("\tCD write speed limited to {0}x",
-                                                  devInfo.PlextorFeatures.CdWriteSpeedLimit);
-                    }
-                }
-
-                if(devInfo.PlextorFeatures?.GigaRec == true)
-                    AaruConsole.WriteLine("Drive supports Plextor GigaRec");
-
-                if(devInfo.PlextorFeatures?.SecuRec == true)
-                    AaruConsole.WriteLine("Drive supports Plextor SecuRec");
-
-                if(devInfo.PlextorFeatures?.SpeedRead == true)
-                {
-                    AaruConsole.Write("Drive supports Plextor SpeedRead");
-
-                    if(devInfo.PlextorFeatures.SpeedReadEnabled)
-                        AaruConsole.WriteLine("and has it enabled");
-                    else
-                        AaruConsole.WriteLine();
-                }
-
-                if(devInfo.PlextorFeatures?.Hiding == true)
-                {
-                    AaruConsole.WriteLine("Drive supports hiding CD-Rs and forcing single session");
-
-                    if(devInfo.PlextorFeatures.HidesRecordables)
-                        AaruConsole.WriteLine("Drive currently hides CD-Rs");
-
-                    if(devInfo.PlextorFeatures.HidesSessions)
-                        AaruConsole.WriteLine("Drive currently forces single session");
-                }
-
-                if(devInfo.PlextorFeatures?.VariRec == true)
-                    AaruConsole.WriteLine("Drive supports Plextor VariRec");
-
-                if(devInfo.PlextorFeatures?.IsDvd == true)
-                {
-                    if(devInfo.PlextorFeatures.VariRecDvd)
-                        AaruConsole.WriteLine("Drive supports Plextor VariRec for DVDs");
-
-                    if(devInfo.PlextorFeatures.BitSetting)
-                        AaruConsole.WriteLine("Drive supports bitsetting DVD+R book type");
-
-                    if(devInfo.PlextorFeatures.BitSettingDl)
-                        AaruConsole.WriteLine("Drive supports bitsetting DVD+R DL book type");
-
-                    if(devInfo.PlextorFeatures.DvdPlusWriteTest)
-                        AaruConsole.WriteLine("Drive supports test writing DVD+");
-                }
-
-                if(devInfo.ScsiInquiry.Value.KreonPresent)
-                {
-                    AaruConsole.WriteLine("[bold]Drive has kreon firmware:[/]");
-
-                    if(devInfo.KreonFeatures.HasFlag(KreonFeatures.ChallengeResponse))
-                        AaruConsole.WriteLine("\tCan do challenge/response with Xbox discs");
-
-                    if(devInfo.KreonFeatures.HasFlag(KreonFeatures.DecryptSs))
-                        AaruConsole.WriteLine("\tCan read and decrypt SS from Xbox discs");
-
-                    if(devInfo.KreonFeatures.HasFlag(KreonFeatures.XtremeUnlock))
-                        AaruConsole.WriteLine("\tCan set xtreme unlock state with Xbox discs");
-
-                    if(devInfo.KreonFeatures.HasFlag(KreonFeatures.WxripperUnlock))
-                        AaruConsole.WriteLine("\tCan set wxripper unlock state with Xbox discs");
-
-                    if(devInfo.KreonFeatures.HasFlag(KreonFeatures.ChallengeResponse360))
-                        AaruConsole.WriteLine("\tCan do challenge/response with Xbox 360 discs");
-
-                    if(devInfo.KreonFeatures.HasFlag(KreonFeatures.DecryptSs360))
-                        AaruConsole.WriteLine("\tCan read and decrypt SS from Xbox 360 discs");
-
-                    if(devInfo.KreonFeatures.HasFlag(KreonFeatures.XtremeUnlock360))
-                        AaruConsole.WriteLine("\tCan set xtreme unlock state with Xbox 360 discs");
-
-                    if(devInfo.KreonFeatures.HasFlag(KreonFeatures.WxripperUnlock360))
-                        AaruConsole.WriteLine("\tCan set wxripper unlock state with Xbox 360 discs");
-
-                    if(devInfo.KreonFeatures.HasFlag(KreonFeatures.Lock))
-                        AaruConsole.WriteLine("\tCan set locked state");
-
-                    if(devInfo.KreonFeatures.HasFlag(KreonFeatures.ErrorSkipping))
-                        AaruConsole.WriteLine("\tCan skip read errors");
-                }
-
-                if(devInfo.BlockLimits != null)
-                {
-                    DataFile.WriteTo("Device-Info command", outputPrefix, "_ssc_readblocklimits.bin",
-                                     "SSC READ BLOCK LIMITS", devInfo.BlockLimits);
-
-                    AaruConsole.WriteLine("Block limits for device:");
-                    AaruConsole.WriteLine(BlockLimits.Prettify(devInfo.BlockLimits));
-                }
-
-                if(devInfo.DensitySupport != null)
-                {
-                    DataFile.WriteTo("Device-Info command", outputPrefix, "_ssc_reportdensitysupport.bin",
-                                     "SSC REPORT DENSITY SUPPORT", devInfo.DensitySupport);
-
-                    if(devInfo.DensitySupportHeader.HasValue)
-                    {
-                        AaruConsole.WriteLine("Densities supported by device:");
-                        AaruConsole.WriteLine(DensitySupport.PrettifyDensity(devInfo.DensitySupportHeader));
-                    }
-                }
-
-                if(devInfo.MediumDensitySupport != null)
-                {
-                    DataFile.WriteTo("Device-Info command", outputPrefix, "_ssc_reportdensitysupport_medium.bin",
-                                     "SSC REPORT DENSITY SUPPORT (MEDIUM)", devInfo.MediumDensitySupport);
-
-                    if(devInfo.MediaTypeSupportHeader.HasValue)
-                    {
-                        AaruConsole.WriteLine("Medium types supported by device:");
-                        AaruConsole.WriteLine(DensitySupport.PrettifyMediumType(devInfo.MediaTypeSupportHeader));
-                    }
-
-                    AaruConsole.WriteLine(DensitySupport.PrettifyMediumType(devInfo.MediumDensitySupport));
-                }
-            }
-
-            switch(dev.Type)
-            {
-                case DeviceType.MMC:
-                {
-                    bool noInfo = true;
-
-                    if(devInfo.CID != null)
-                    {
-                        noInfo = false;
-                        DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_cid.bin", "MMC CID", devInfo.CID);
-                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(devInfo.CID));
-                    }
-
-                    if(devInfo.CSD != null)
-                    {
-                        noInfo = false;
-                        DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_csd.bin", "MMC CSD", devInfo.CSD);
-                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(devInfo.CSD));
-                    }
-
-                    if(devInfo.OCR != null)
-                    {
-                        noInfo = false;
-                        DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_ocr.bin", "MMC OCR", devInfo.OCR);
-                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(devInfo.OCR));
-                    }
-
-                    if(devInfo.ExtendedCSD != null)
-                    {
-                        noInfo = false;
-
-                        DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_ecsd.bin", "MMC Extended CSD",
-                                         devInfo.ExtendedCSD);
-
-                        AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(devInfo.ExtendedCSD));
-                    }
-
-                    if(noInfo)
-                        AaruConsole.WriteLine("Could not get any kind of information from the device !!!");
-                }
-
-                    break;
-                case DeviceType.SecureDigital:
-                {
-                    bool noInfo = true;
-
-                    if(devInfo.CID != null)
-                    {
-                        noInfo = false;
-
-                        DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_cid.bin", "SecureDigital CID",
-                                         devInfo.CID);
-
-                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(devInfo.CID));
-                    }
-
-                    if(devInfo.CSD != null)
-                    {
-                        noInfo = false;
-
-                        DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_csd.bin", "SecureDigital CSD",
-                                         devInfo.CSD);
-
-                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(devInfo.CSD));
-                    }
-
-                    if(devInfo.OCR != null)
-                    {
-                        noInfo = false;
-
-                        DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_ocr.bin", "SecureDigital OCR",
-                                         devInfo.OCR);
-
-                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(devInfo.OCR));
-                    }
-
-                    if(devInfo.SCR != null)
-                    {
-                        noInfo = false;
-
-                        DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_scr.bin", "SecureDigital SCR",
-                                         devInfo.SCR);
-
-                        AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(devInfo.SCR));
-                    }
-
-                    if(noInfo)
-                        AaruConsole.WriteLine("Could not get any kind of information from the device !!!");
-                }
-
-                    break;
-            }
-
-            dev.Close();
-
-            AaruConsole.WriteLine();
-
-            // Open main database
-            var ctx = AaruContext.Create(Settings.Settings.MainDbPath);
-
-            // Search for device in main database
-            Aaru.Database.Models.Device dbDev =
-                ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
-                                                d.Revision     == dev.FirmwareRevision);
-
-            if(dbDev is null)
-                AaruConsole.
-                    WriteLine("Device not in database, please create a device report and attach it to a Github issue.");
             else
-            {
-                AaruConsole.WriteLine($"Device in database since {dbDev.LastSynchronized}.");
+                AaruConsole.DebugWriteLine("Device-Info command", "Could not get tuples");
+        }
 
-                if(dbDev.OptimalMultipleSectorsRead > 0)
-                    AaruConsole.WriteLine($"Optimal multiple read is {dbDev.LastSynchronized} sectors.");
+        var devInfo = new DeviceInfo(dev);
+
+        if(devInfo.AtaIdentify != null)
+        {
+            DataFile.WriteTo("Device-Info command", outputPrefix, "_ata_identify.bin", "ATA IDENTIFY",
+                             devInfo.AtaIdentify);
+
+            Identify.IdentifyDevice? decodedIdentify = Identify.Decode(devInfo.AtaIdentify);
+            AaruConsole.WriteLine(Decoders.ATA.Identify.Prettify(decodedIdentify));
+
+            if(devInfo.AtaMcptError.HasValue)
+            {
+                AaruConsole.WriteLine("Device supports the Media Card Pass Through Command Set");
+
+                switch(devInfo.AtaMcptError.Value.DeviceHead & 0x7)
+                {
+                    case 0:
+                        AaruConsole.WriteLine("Device reports incorrect media card type");
+
+                        break;
+                    case 1:
+                        AaruConsole.WriteLine("Device contains a Secure Digital card");
+
+                        break;
+                    case 2:
+                        AaruConsole.WriteLine("Device contains a MultiMediaCard ");
+
+                        break;
+                    case 3:
+                        AaruConsole.WriteLine("Device contains a Secure Digital I/O card");
+
+                        break;
+                    case 4:
+                        AaruConsole.WriteLine("Device contains a Smart Media card");
+
+                        break;
+                    default:
+                        AaruConsole.WriteLine("Device contains unknown media card type {0}",
+                                              devInfo.AtaMcptError.Value.DeviceHead & 0x07);
+
+                        break;
+                }
+
+                if((devInfo.AtaMcptError.Value.DeviceHead & 0x08) == 0x08)
+                    AaruConsole.WriteLine("Media card is write protected");
+
+                ushort specificData = (ushort)((devInfo.AtaMcptError.Value.CylinderHigh * 0x100) +
+                                               devInfo.AtaMcptError.Value.CylinderLow);
+
+                if(specificData != 0)
+                    AaruConsole.WriteLine("Card specific data: 0x{0:X4}", specificData);
             }
 
-            if(dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
-                return (int)ErrorNumber.NoError;
+            if(decodedIdentify.HasValue)
+            {
+                Identify.IdentifyDevice ataid = decodedIdentify.Value;
 
-            // Search for read offset in main database
-            CdOffset cdOffset =
-                ctx.CdOffsets.FirstOrDefault(d => (d.Manufacturer == dev.Manufacturer ||
-                                                   d.Manufacturer == dev.Manufacturer.Replace('/', '-')) &&
-                                                  (d.Model == dev.Model || d.Model == dev.Model.Replace('/', '-')));
+                ulong blocks;
 
-            AaruConsole.WriteLine(cdOffset is null ? "CD reading offset not found in database."
-                                      : $"CD reading offset is {cdOffset.Offset} samples ({cdOffset.Offset * 4} bytes).");
+                if(ataid.CurrentCylinders       > 0 &&
+                   ataid.CurrentHeads           > 0 &&
+                   ataid.CurrentSectorsPerTrack > 0)
+                {
+                    blocks =
+                        (ulong)Math.Max(ataid.CurrentCylinders * ataid.CurrentHeads * ataid.CurrentSectorsPerTrack,
+                                        ataid.CurrentSectors);
+                }
+                else
+                {
+                    blocks = (ulong)(ataid.Cylinders * ataid.Heads * ataid.SectorsPerTrack);
+                }
 
-            return (int)ErrorNumber.NoError;
+                if(ataid.Capabilities.HasFlag(Identify.CapabilitiesBit.LBASupport))
+                    blocks = ataid.LBASectors;
+
+                if(ataid.CommandSet2.HasFlag(Identify.CommandSetBit2.LBA48))
+                    blocks = ataid.LBA48Sectors;
+
+                bool removable = ataid.GeneralConfiguration.HasFlag(Identify.GeneralConfigurationBit.Removable);
+
+                MediaType mediaType = MediaTypeFromDevice.GetFromAta(dev.Manufacturer, dev.Model, removable,
+                                                                     dev.IsCompactFlash, dev.IsPcmcia, blocks);
+
+                AaruConsole.WriteLine(removable ? "Media identified as {0}" : "Device identified as {0}",
+                                      mediaType);
+
+                Statistics.AddMedia(mediaType, true);
+            }
         }
+
+        if(devInfo.AtapiIdentify != null)
+        {
+            DataFile.WriteTo("Device-Info command", outputPrefix, "_atapi_identify.bin", "ATAPI IDENTIFY",
+                             devInfo.AtapiIdentify);
+
+            AaruConsole.WriteLine(Decoders.ATA.Identify.Prettify(devInfo.AtapiIdentify));
+        }
+
+        if(devInfo.ScsiInquiry != null)
+        {
+            if(dev.Type != DeviceType.ATAPI)
+                AaruConsole.WriteLine("[bold]SCSI device[/]");
+
+            DataFile.WriteTo("Device-Info command", outputPrefix, "_scsi_inquiry.bin", "SCSI INQUIRY",
+                             devInfo.ScsiInquiryData);
+
+            AaruConsole.WriteLine(Inquiry.Prettify(devInfo.ScsiInquiry));
+
+            if(devInfo.ScsiEvpdPages != null)
+                foreach(KeyValuePair<byte, byte[]> page in devInfo.ScsiEvpdPages)
+                    if(page.Key >= 0x01 &&
+                       page.Key <= 0x7F)
+                    {
+                        AaruConsole.WriteLine("ASCII Page {0:X2}h: {1}", page.Key,
+                                              EVPD.DecodeASCIIPage(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, page.Value);
+                    }
+                    else if(page.Key == 0x80)
+                    {
+                        AaruConsole.WriteLine("Unit Serial Number: {0}", EVPD.DecodePage80(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0x81)
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_81(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0x82)
+                    {
+                        AaruConsole.WriteLine("ASCII implemented operating definitions: {0}",
+                                              EVPD.DecodePage82(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0x83)
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_83(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0x84)
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_84(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0x85)
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_85(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0x86)
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_86(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0x89)
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_89(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0xB0)
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_B0(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0xB1)
+                    {
+                        AaruConsole.WriteLine("Manufacturer-assigned Serial Number: {0}",
+                                              EVPD.DecodePageB1(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0xB2)
+                    {
+                        AaruConsole.WriteLine("TapeAlert Supported Flags Bitmap: 0x{0:X16}",
+                                              EVPD.DecodePageB2(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0xB3)
+                    {
+                        AaruConsole.WriteLine("Automation Device Serial Number: {0}",
+                                              EVPD.DecodePageB3(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0xB4)
+                    {
+                        AaruConsole.WriteLine("Data Transfer Device Element Address: 0x{0}",
+                                              EVPD.DecodePageB4(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0xC0 &&
+                            StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
+                                           ToLowerInvariant().Trim() == "quantum")
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C0_Quantum(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0xC0 &&
+                            StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
+                                           ToLowerInvariant().Trim() == "seagate")
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C0_Seagate(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0xC0 &&
+                            StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
+                                           ToLowerInvariant().Trim() == "ibm")
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C0_IBM(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0xC1 &&
+                            StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
+                                           ToLowerInvariant().Trim() == "ibm")
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C1_IBM(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if((page.Key == 0xC0 || page.Key == 0xC1) &&
+                            StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
+                                           ToLowerInvariant().Trim() == "certance")
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C0_C1_Certance(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if((page.Key == 0xC2 || page.Key == 0xC3 || page.Key == 0xC4 || page.Key == 0xC5 ||
+                             page.Key == 0xC6) &&
+                            StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
+                                           ToLowerInvariant().Trim() == "certance")
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C2_C3_C4_C5_C6_Certance(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if((page.Key == 0xC0 || page.Key == 0xC1 || page.Key == 0xC2 || page.Key == 0xC3 ||
+                             page.Key == 0xC4 || page.Key == 0xC5) &&
+                            StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
+                                           ToLowerInvariant().Trim() == "hp")
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_C0_to_C5_HP(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else if(page.Key == 0xDF &&
+                            StringHandlers.CToString(devInfo.ScsiInquiry.Value.VendorIdentification).
+                                           ToLowerInvariant().Trim() == "certance")
+                    {
+                        AaruConsole.WriteLine("{0}", EVPD.PrettifyPage_DF_Certance(page.Value));
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+                    else
+                    {
+                        if(page.Key == 0x00)
+                            continue;
+
+                        AaruConsole.DebugWriteLine("Device-Info command", "Found undecoded SCSI VPD page 0x{0:X2}",
+                                                   page.Key);
+
+                        DataFile.WriteTo("Device-Info command", outputPrefix, $"_scsi_evpd_{page.Key:X2}h.bin",
+                                         $"SCSI INQUIRY EVPD {page.Key:X2}h", page.Value);
+                    }
+
+            if(devInfo.ScsiModeSense6 != null)
+                DataFile.WriteTo("Device-Info command", outputPrefix, "_scsi_modesense6.bin", "SCSI MODE SENSE",
+                                 devInfo.ScsiModeSense6);
+
+            if(devInfo.ScsiModeSense10 != null)
+                DataFile.WriteTo("Device-Info command", outputPrefix, "_scsi_modesense10.bin", "SCSI MODE SENSE",
+                                 devInfo.ScsiModeSense10);
+
+            if(devInfo.ScsiMode.HasValue)
+                PrintScsiModePages.Print(devInfo.ScsiMode.Value,
+                                         (PeripheralDeviceTypes)devInfo.ScsiInquiry.Value.PeripheralDeviceType,
+                                         devInfo.ScsiInquiry.Value.VendorIdentification);
+
+            if(devInfo.MmcConfiguration != null)
+            {
+                DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_getconfiguration.bin",
+                                 "MMC GET CONFIGURATION", devInfo.MmcConfiguration);
+
+                Features.SeparatedFeatures ftr = Features.Separate(devInfo.MmcConfiguration);
+
+                AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION length is {0} bytes",
+                                           ftr.DataLength);
+
+                AaruConsole.DebugWriteLine("Device-Info command", "GET CONFIGURATION current profile is {0:X4}h",
+                                           ftr.CurrentProfile);
+
+                if(ftr.Descriptors != null)
+                {
+                    AaruConsole.WriteLine("[bold]SCSI MMC GET CONFIGURATION Features:[/]");
+
+                    foreach(Features.FeatureDescriptor desc in ftr.Descriptors)
+                    {
+                        AaruConsole.DebugWriteLine("Device-Info command", "Feature {0:X4}h", desc.Code);
+
+                        switch(desc.Code)
+                        {
+                            case 0x0000:
+                                AaruConsole.WriteLine(Features.Prettify_0000(desc.Data));
+
+                                break;
+                            case 0x0001:
+                                AaruConsole.WriteLine(Features.Prettify_0001(desc.Data));
+
+                                break;
+                            case 0x0002:
+                                AaruConsole.WriteLine(Features.Prettify_0002(desc.Data));
+
+                                break;
+                            case 0x0003:
+                                AaruConsole.WriteLine(Features.Prettify_0003(desc.Data));
+
+                                break;
+                            case 0x0004:
+                                AaruConsole.WriteLine(Features.Prettify_0004(desc.Data));
+
+                                break;
+                            case 0x0010:
+                                AaruConsole.WriteLine(Features.Prettify_0010(desc.Data));
+
+                                break;
+                            case 0x001D:
+                                AaruConsole.WriteLine(Features.Prettify_001D(desc.Data));
+
+                                break;
+                            case 0x001E:
+                                AaruConsole.WriteLine(Features.Prettify_001E(desc.Data));
+
+                                break;
+                            case 0x001F:
+                                AaruConsole.WriteLine(Features.Prettify_001F(desc.Data));
+
+                                break;
+                            case 0x0020:
+                                AaruConsole.WriteLine(Features.Prettify_0020(desc.Data));
+
+                                break;
+                            case 0x0021:
+                                AaruConsole.WriteLine(Features.Prettify_0021(desc.Data));
+
+                                break;
+                            case 0x0022:
+                                AaruConsole.WriteLine(Features.Prettify_0022(desc.Data));
+
+                                break;
+                            case 0x0023:
+                                AaruConsole.WriteLine(Features.Prettify_0023(desc.Data));
+
+                                break;
+                            case 0x0024:
+                                AaruConsole.WriteLine(Features.Prettify_0024(desc.Data));
+
+                                break;
+                            case 0x0025:
+                                AaruConsole.WriteLine(Features.Prettify_0025(desc.Data));
+
+                                break;
+                            case 0x0026:
+                                AaruConsole.WriteLine(Features.Prettify_0026(desc.Data));
+
+                                break;
+                            case 0x0027:
+                                AaruConsole.WriteLine(Features.Prettify_0027(desc.Data));
+
+                                break;
+                            case 0x0028:
+                                AaruConsole.WriteLine(Features.Prettify_0028(desc.Data));
+
+                                break;
+                            case 0x0029:
+                                AaruConsole.WriteLine(Features.Prettify_0029(desc.Data));
+
+                                break;
+                            case 0x002A:
+                                AaruConsole.WriteLine(Features.Prettify_002A(desc.Data));
+
+                                break;
+                            case 0x002B:
+                                AaruConsole.WriteLine(Features.Prettify_002B(desc.Data));
+
+                                break;
+                            case 0x002C:
+                                AaruConsole.WriteLine(Features.Prettify_002C(desc.Data));
+
+                                break;
+                            case 0x002D:
+                                AaruConsole.WriteLine(Features.Prettify_002D(desc.Data));
+
+                                break;
+                            case 0x002E:
+                                AaruConsole.WriteLine(Features.Prettify_002E(desc.Data));
+
+                                break;
+                            case 0x002F:
+                                AaruConsole.WriteLine(Features.Prettify_002F(desc.Data));
+
+                                break;
+                            case 0x0030:
+                                AaruConsole.WriteLine(Features.Prettify_0030(desc.Data));
+
+                                break;
+                            case 0x0031:
+                                AaruConsole.WriteLine(Features.Prettify_0031(desc.Data));
+
+                                break;
+                            case 0x0032:
+                                AaruConsole.WriteLine(Features.Prettify_0032(desc.Data));
+
+                                break;
+                            case 0x0033:
+                                AaruConsole.WriteLine(Features.Prettify_0033(desc.Data));
+
+                                break;
+                            case 0x0035:
+                                AaruConsole.WriteLine(Features.Prettify_0035(desc.Data));
+
+                                break;
+                            case 0x0037:
+                                AaruConsole.WriteLine(Features.Prettify_0037(desc.Data));
+
+                                break;
+                            case 0x0038:
+                                AaruConsole.WriteLine(Features.Prettify_0038(desc.Data));
+
+                                break;
+                            case 0x003A:
+                                AaruConsole.WriteLine(Features.Prettify_003A(desc.Data));
+
+                                break;
+                            case 0x003B:
+                                AaruConsole.WriteLine(Features.Prettify_003B(desc.Data));
+
+                                break;
+                            case 0x0040:
+                                AaruConsole.WriteLine(Features.Prettify_0040(desc.Data));
+
+                                break;
+                            case 0x0041:
+                                AaruConsole.WriteLine(Features.Prettify_0041(desc.Data));
+
+                                break;
+                            case 0x0042:
+                                AaruConsole.WriteLine(Features.Prettify_0042(desc.Data));
+
+                                break;
+                            case 0x0050:
+                                AaruConsole.WriteLine(Features.Prettify_0050(desc.Data));
+
+                                break;
+                            case 0x0051:
+                                AaruConsole.WriteLine(Features.Prettify_0051(desc.Data));
+
+                                break;
+                            case 0x0080:
+                                AaruConsole.WriteLine(Features.Prettify_0080(desc.Data));
+
+                                break;
+                            case 0x0100:
+                                AaruConsole.WriteLine(Features.Prettify_0100(desc.Data));
+
+                                break;
+                            case 0x0101:
+                                AaruConsole.WriteLine(Features.Prettify_0101(desc.Data));
+
+                                break;
+                            case 0x0102:
+                                AaruConsole.WriteLine(Features.Prettify_0102(desc.Data));
+
+                                break;
+                            case 0x0103:
+                                AaruConsole.WriteLine(Features.Prettify_0103(desc.Data));
+
+                                break;
+                            case 0x0104:
+                                AaruConsole.WriteLine(Features.Prettify_0104(desc.Data));
+
+                                break;
+                            case 0x0105:
+                                AaruConsole.WriteLine(Features.Prettify_0105(desc.Data));
+
+                                break;
+                            case 0x0106:
+                                AaruConsole.WriteLine(Features.Prettify_0106(desc.Data));
+
+                                break;
+                            case 0x0107:
+                                AaruConsole.WriteLine(Features.Prettify_0107(desc.Data));
+
+                                break;
+                            case 0x0108:
+                                AaruConsole.WriteLine(Features.Prettify_0108(desc.Data));
+
+                                break;
+                            case 0x0109:
+                                AaruConsole.WriteLine(Features.Prettify_0109(desc.Data));
+
+                                break;
+                            case 0x010A:
+                                AaruConsole.WriteLine(Features.Prettify_010A(desc.Data));
+
+                                break;
+                            case 0x010B:
+                                AaruConsole.WriteLine(Features.Prettify_010B(desc.Data));
+
+                                break;
+                            case 0x010C:
+                                AaruConsole.WriteLine(Features.Prettify_010C(desc.Data));
+
+                                break;
+                            case 0x010D:
+                                AaruConsole.WriteLine(Features.Prettify_010D(desc.Data));
+
+                                break;
+                            case 0x010E:
+                                AaruConsole.WriteLine(Features.Prettify_010E(desc.Data));
+
+                                break;
+                            case 0x0110:
+                                AaruConsole.WriteLine(Features.Prettify_0110(desc.Data));
+
+                                break;
+                            case 0x0113:
+                                AaruConsole.WriteLine(Features.Prettify_0113(desc.Data));
+
+                                break;
+                            case 0x0142:
+                                AaruConsole.WriteLine(Features.Prettify_0142(desc.Data));
+
+                                break;
+                            default:
+                                AaruConsole.WriteLine("Found unknown feature code {0:X4}h", desc.Code);
+
+                                break;
+                        }
+                    }
+                }
+                else
+                {
+                    AaruConsole.DebugWriteLine("Device-Info command",
+                                               "GET CONFIGURATION returned no feature descriptors");
+                }
+            }
+
+            if(devInfo.RPC != null)
+                AaruConsole.WriteLine(CSS_CPRM.PrettifyRegionalPlaybackControlState(devInfo.RPC));
+
+            if(devInfo.PlextorFeatures?.Eeprom != null)
+            {
+                DataFile.WriteTo("Device-Info command", outputPrefix, "_plextor_eeprom.bin", "PLEXTOR READ EEPROM",
+                                 devInfo.PlextorFeatures.Eeprom);
+
+                AaruConsole.WriteLine("Drive has loaded a total of {0} discs", devInfo.PlextorFeatures.Discs);
+
+                AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds reading CDs",
+                                      devInfo.PlextorFeatures.CdReadTime      / 3600,
+                                      devInfo.PlextorFeatures.CdReadTime / 60 % 60,
+                                      devInfo.PlextorFeatures.CdReadTime      % 60);
+
+                AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds writing CDs",
+                                      devInfo.PlextorFeatures.CdWriteTime      / 3600,
+                                      devInfo.PlextorFeatures.CdWriteTime / 60 % 60,
+                                      devInfo.PlextorFeatures.CdWriteTime      % 60);
+
+                if(devInfo.PlextorFeatures.IsDvd)
+                {
+                    AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds reading DVDs",
+                                          devInfo.PlextorFeatures.DvdReadTime      / 3600,
+                                          devInfo.PlextorFeatures.DvdReadTime / 60 % 60,
+                                          devInfo.PlextorFeatures.DvdReadTime      % 60);
+
+                    AaruConsole.WriteLine("Drive has spent {0} hours, {1} minutes and {2} seconds writing DVDs",
+                                          devInfo.PlextorFeatures.DvdWriteTime      / 3600,
+                                          devInfo.PlextorFeatures.DvdWriteTime / 60 % 60,
+                                          devInfo.PlextorFeatures.DvdWriteTime      % 60);
+                }
+            }
+
+            if(devInfo.PlextorFeatures?.PoweRec == true)
+            {
+                AaruConsole.Write("Drive supports PoweRec");
+
+                if(devInfo.PlextorFeatures.PoweRecEnabled)
+                {
+                    AaruConsole.Write(", has it enabled");
+
+                    if(devInfo.PlextorFeatures.PoweRecRecommendedSpeed > 0)
+                        AaruConsole.WriteLine(" and recommends {0} Kb/sec.",
+                                              devInfo.PlextorFeatures.PoweRecRecommendedSpeed);
+                    else
+                        AaruConsole.WriteLine(".");
+
+                    if(devInfo.PlextorFeatures.PoweRecSelected > 0)
+                        AaruConsole.
+                            WriteLine("Selected PoweRec speed for currently inserted media is {0} Kb/sec ({1}x)",
+                                      devInfo.PlextorFeatures.PoweRecSelected,
+                                      devInfo.PlextorFeatures.PoweRecSelected / 177);
+
+                    if(devInfo.PlextorFeatures.PoweRecMax > 0)
+                        AaruConsole.
+                            WriteLine("Maximum PoweRec speed for currently inserted media is {0} Kb/sec ({1}x)",
+                                      devInfo.PlextorFeatures.PoweRecMax, devInfo.PlextorFeatures.PoweRecMax / 177);
+
+                    if(devInfo.PlextorFeatures.PoweRecLast > 0)
+                        AaruConsole.WriteLine("Last used PoweRec was {0} Kb/sec ({1}x)",
+                                              devInfo.PlextorFeatures.PoweRecLast,
+                                              devInfo.PlextorFeatures.PoweRecLast / 177);
+                }
+                else
+                {
+                    AaruConsole.WriteLine(".");
+                    AaruConsole.WriteLine("PoweRec is disabled");
+                }
+            }
+
+            if(devInfo.PlextorFeatures?.SilentMode == true)
+            {
+                AaruConsole.WriteLine("Drive supports Plextor SilentMode");
+
+                if(devInfo.PlextorFeatures.SilentModeEnabled)
+                {
+                    AaruConsole.WriteLine("Plextor SilentMode is enabled:");
+
+                    AaruConsole.WriteLine(devInfo.PlextorFeatures.AccessTimeLimit == 2 ? "\tAccess time is slow"
+                                              : "\tAccess time is fast");
+
+                    if(devInfo.PlextorFeatures.CdReadSpeedLimit > 0)
+                        AaruConsole.WriteLine("\tCD read speed limited to {0}x",
+                                              devInfo.PlextorFeatures.CdReadSpeedLimit);
+
+                    if(devInfo.PlextorFeatures.DvdReadSpeedLimit > 0 &&
+                       devInfo.PlextorFeatures.IsDvd)
+                        AaruConsole.WriteLine("\tDVD read speed limited to {0}x",
+                                              devInfo.PlextorFeatures.DvdReadSpeedLimit);
+
+                    if(devInfo.PlextorFeatures.CdWriteSpeedLimit > 0)
+                        AaruConsole.WriteLine("\tCD write speed limited to {0}x",
+                                              devInfo.PlextorFeatures.CdWriteSpeedLimit);
+                }
+            }
+
+            if(devInfo.PlextorFeatures?.GigaRec == true)
+                AaruConsole.WriteLine("Drive supports Plextor GigaRec");
+
+            if(devInfo.PlextorFeatures?.SecuRec == true)
+                AaruConsole.WriteLine("Drive supports Plextor SecuRec");
+
+            if(devInfo.PlextorFeatures?.SpeedRead == true)
+            {
+                AaruConsole.Write("Drive supports Plextor SpeedRead");
+
+                if(devInfo.PlextorFeatures.SpeedReadEnabled)
+                    AaruConsole.WriteLine("and has it enabled");
+                else
+                    AaruConsole.WriteLine();
+            }
+
+            if(devInfo.PlextorFeatures?.Hiding == true)
+            {
+                AaruConsole.WriteLine("Drive supports hiding CD-Rs and forcing single session");
+
+                if(devInfo.PlextorFeatures.HidesRecordables)
+                    AaruConsole.WriteLine("Drive currently hides CD-Rs");
+
+                if(devInfo.PlextorFeatures.HidesSessions)
+                    AaruConsole.WriteLine("Drive currently forces single session");
+            }
+
+            if(devInfo.PlextorFeatures?.VariRec == true)
+                AaruConsole.WriteLine("Drive supports Plextor VariRec");
+
+            if(devInfo.PlextorFeatures?.IsDvd == true)
+            {
+                if(devInfo.PlextorFeatures.VariRecDvd)
+                    AaruConsole.WriteLine("Drive supports Plextor VariRec for DVDs");
+
+                if(devInfo.PlextorFeatures.BitSetting)
+                    AaruConsole.WriteLine("Drive supports bitsetting DVD+R book type");
+
+                if(devInfo.PlextorFeatures.BitSettingDl)
+                    AaruConsole.WriteLine("Drive supports bitsetting DVD+R DL book type");
+
+                if(devInfo.PlextorFeatures.DvdPlusWriteTest)
+                    AaruConsole.WriteLine("Drive supports test writing DVD+");
+            }
+
+            if(devInfo.ScsiInquiry.Value.KreonPresent)
+            {
+                AaruConsole.WriteLine("[bold]Drive has kreon firmware:[/]");
+
+                if(devInfo.KreonFeatures.HasFlag(KreonFeatures.ChallengeResponse))
+                    AaruConsole.WriteLine("\tCan do challenge/response with Xbox discs");
+
+                if(devInfo.KreonFeatures.HasFlag(KreonFeatures.DecryptSs))
+                    AaruConsole.WriteLine("\tCan read and decrypt SS from Xbox discs");
+
+                if(devInfo.KreonFeatures.HasFlag(KreonFeatures.XtremeUnlock))
+                    AaruConsole.WriteLine("\tCan set xtreme unlock state with Xbox discs");
+
+                if(devInfo.KreonFeatures.HasFlag(KreonFeatures.WxripperUnlock))
+                    AaruConsole.WriteLine("\tCan set wxripper unlock state with Xbox discs");
+
+                if(devInfo.KreonFeatures.HasFlag(KreonFeatures.ChallengeResponse360))
+                    AaruConsole.WriteLine("\tCan do challenge/response with Xbox 360 discs");
+
+                if(devInfo.KreonFeatures.HasFlag(KreonFeatures.DecryptSs360))
+                    AaruConsole.WriteLine("\tCan read and decrypt SS from Xbox 360 discs");
+
+                if(devInfo.KreonFeatures.HasFlag(KreonFeatures.XtremeUnlock360))
+                    AaruConsole.WriteLine("\tCan set xtreme unlock state with Xbox 360 discs");
+
+                if(devInfo.KreonFeatures.HasFlag(KreonFeatures.WxripperUnlock360))
+                    AaruConsole.WriteLine("\tCan set wxripper unlock state with Xbox 360 discs");
+
+                if(devInfo.KreonFeatures.HasFlag(KreonFeatures.Lock))
+                    AaruConsole.WriteLine("\tCan set locked state");
+
+                if(devInfo.KreonFeatures.HasFlag(KreonFeatures.ErrorSkipping))
+                    AaruConsole.WriteLine("\tCan skip read errors");
+            }
+
+            if(devInfo.BlockLimits != null)
+            {
+                DataFile.WriteTo("Device-Info command", outputPrefix, "_ssc_readblocklimits.bin",
+                                 "SSC READ BLOCK LIMITS", devInfo.BlockLimits);
+
+                AaruConsole.WriteLine("Block limits for device:");
+                AaruConsole.WriteLine(BlockLimits.Prettify(devInfo.BlockLimits));
+            }
+
+            if(devInfo.DensitySupport != null)
+            {
+                DataFile.WriteTo("Device-Info command", outputPrefix, "_ssc_reportdensitysupport.bin",
+                                 "SSC REPORT DENSITY SUPPORT", devInfo.DensitySupport);
+
+                if(devInfo.DensitySupportHeader.HasValue)
+                {
+                    AaruConsole.WriteLine("Densities supported by device:");
+                    AaruConsole.WriteLine(DensitySupport.PrettifyDensity(devInfo.DensitySupportHeader));
+                }
+            }
+
+            if(devInfo.MediumDensitySupport != null)
+            {
+                DataFile.WriteTo("Device-Info command", outputPrefix, "_ssc_reportdensitysupport_medium.bin",
+                                 "SSC REPORT DENSITY SUPPORT (MEDIUM)", devInfo.MediumDensitySupport);
+
+                if(devInfo.MediaTypeSupportHeader.HasValue)
+                {
+                    AaruConsole.WriteLine("Medium types supported by device:");
+                    AaruConsole.WriteLine(DensitySupport.PrettifyMediumType(devInfo.MediaTypeSupportHeader));
+                }
+
+                AaruConsole.WriteLine(DensitySupport.PrettifyMediumType(devInfo.MediumDensitySupport));
+            }
+        }
+
+        switch(dev.Type)
+        {
+            case DeviceType.MMC:
+            {
+                bool noInfo = true;
+
+                if(devInfo.CID != null)
+                {
+                    noInfo = false;
+                    DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_cid.bin", "MMC CID", devInfo.CID);
+                    AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCID(devInfo.CID));
+                }
+
+                if(devInfo.CSD != null)
+                {
+                    noInfo = false;
+                    DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_csd.bin", "MMC CSD", devInfo.CSD);
+                    AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyCSD(devInfo.CSD));
+                }
+
+                if(devInfo.OCR != null)
+                {
+                    noInfo = false;
+                    DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_ocr.bin", "MMC OCR", devInfo.OCR);
+                    AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyOCR(devInfo.OCR));
+                }
+
+                if(devInfo.ExtendedCSD != null)
+                {
+                    noInfo = false;
+
+                    DataFile.WriteTo("Device-Info command", outputPrefix, "_mmc_ecsd.bin", "MMC Extended CSD",
+                                     devInfo.ExtendedCSD);
+
+                    AaruConsole.WriteLine("{0}", Decoders.MMC.Decoders.PrettifyExtendedCSD(devInfo.ExtendedCSD));
+                }
+
+                if(noInfo)
+                    AaruConsole.WriteLine("Could not get any kind of information from the device !!!");
+            }
+
+                break;
+            case DeviceType.SecureDigital:
+            {
+                bool noInfo = true;
+
+                if(devInfo.CID != null)
+                {
+                    noInfo = false;
+
+                    DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_cid.bin", "SecureDigital CID",
+                                     devInfo.CID);
+
+                    AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCID(devInfo.CID));
+                }
+
+                if(devInfo.CSD != null)
+                {
+                    noInfo = false;
+
+                    DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_csd.bin", "SecureDigital CSD",
+                                     devInfo.CSD);
+
+                    AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyCSD(devInfo.CSD));
+                }
+
+                if(devInfo.OCR != null)
+                {
+                    noInfo = false;
+
+                    DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_ocr.bin", "SecureDigital OCR",
+                                     devInfo.OCR);
+
+                    AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifyOCR(devInfo.OCR));
+                }
+
+                if(devInfo.SCR != null)
+                {
+                    noInfo = false;
+
+                    DataFile.WriteTo("Device-Info command", outputPrefix, "_sd_scr.bin", "SecureDigital SCR",
+                                     devInfo.SCR);
+
+                    AaruConsole.WriteLine("{0}", Decoders.SecureDigital.Decoders.PrettifySCR(devInfo.SCR));
+                }
+
+                if(noInfo)
+                    AaruConsole.WriteLine("Could not get any kind of information from the device !!!");
+            }
+
+                break;
+        }
+
+        dev.Close();
+
+        AaruConsole.WriteLine();
+
+        // Open main database
+        var ctx = AaruContext.Create(Settings.Settings.MainDbPath);
+
+        // Search for device in main database
+        Aaru.Database.Models.Device dbDev =
+            ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
+                                            d.Revision     == dev.FirmwareRevision);
+
+        if(dbDev is null)
+            AaruConsole.
+                WriteLine("Device not in database, please create a device report and attach it to a Github issue.");
+        else
+        {
+            AaruConsole.WriteLine($"Device in database since {dbDev.LastSynchronized}.");
+
+            if(dbDev.OptimalMultipleSectorsRead > 0)
+                AaruConsole.WriteLine($"Optimal multiple read is {dbDev.LastSynchronized} sectors.");
+        }
+
+        if(dev.ScsiType != PeripheralDeviceTypes.MultiMediaDevice)
+            return (int)ErrorNumber.NoError;
+
+        // Search for read offset in main database
+        CdOffset cdOffset =
+            ctx.CdOffsets.FirstOrDefault(d => (d.Manufacturer == dev.Manufacturer ||
+                                               d.Manufacturer == dev.Manufacturer.Replace('/', '-')) &&
+                                              (d.Model == dev.Model || d.Model == dev.Model.Replace('/', '-')));
+
+        AaruConsole.WriteLine(cdOffset is null ? "CD reading offset not found in database."
+                                  : $"CD reading offset is {cdOffset.Offset} samples ({cdOffset.Offset * 4} bytes).");
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Device/List.cs b/Aaru/Commands/Device/List.cs
index 773f2db92..3b36e76d1 100644
--- a/Aaru/Commands/Device/List.cs
+++ b/Aaru/Commands/Device/List.cs
@@ -40,92 +40,91 @@ using Aaru.Devices;
 using JetBrains.Annotations;
 using Spectre.Console;
 
-namespace Aaru.Commands.Device
+namespace Aaru.Commands.Device;
+
+internal sealed class ListDevicesCommand : Command
 {
-    internal sealed class ListDevicesCommand : Command
+    public ListDevicesCommand() : base("list", "Lists all connected devices.")
     {
-        public ListDevicesCommand() : base("list", "Lists all connected devices.")
+        AddArgument(new Argument<string>
         {
-            AddArgument(new Argument<string>
+            Arity       = ArgumentArity.ZeroOrOne,
+            Description = "aaruremote host",
+            Name        = "aaru-remote-host"
+        });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, [CanBeNull] string aaruRemoteHost)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                Arity       = ArgumentArity.ZeroOrOne,
-                Description = "aaruremote host",
-                Name        = "aaru-remote-host"
+                Out = new AnsiConsoleOutput(System.Console.Error)
             });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, [CanBeNull] string aaruRemoteHost)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        Statistics.AddCommand("list-devices");
+
+        AaruConsole.DebugWriteLine("List-Devices command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("List-Devices command", "--verbose={0}", verbose);
+
+        DeviceInfo[] devices = Devices.Device.ListDevices(out bool isRemote, out string serverApplication,
+                                                          out string serverVersion,
+                                                          out string serverOperatingSystem,
+                                                          out string serverOperatingSystemVersion,
+                                                          out string serverArchitecture, aaruRemoteHost);
+
+        if(isRemote)
         {
-            MainClass.PrintCopyright();
-
-            if(debug)
-            {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
-
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            Statistics.AddCommand("list-devices");
-
-            AaruConsole.DebugWriteLine("List-Devices command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("List-Devices command", "--verbose={0}", verbose);
-
-            DeviceInfo[] devices = Devices.Device.ListDevices(out bool isRemote, out string serverApplication,
-                                                              out string serverVersion,
-                                                              out string serverOperatingSystem,
-                                                              out string serverOperatingSystemVersion,
-                                                              out string serverArchitecture, aaruRemoteHost);
-
-            if(isRemote)
-            {
-                Statistics.AddRemote(serverApplication, serverVersion, serverOperatingSystem,
-                                     serverOperatingSystemVersion, serverArchitecture);
-            }
-
-            if(devices        == null ||
-               devices.Length == 0)
-            {
-                AaruConsole.WriteLine("No known devices attached.");
-            }
-            else
-            {
-                Table table = new();
-                table.AddColumn("Path");
-                table.AddColumn("Vendor");
-                table.AddColumn("Model");
-                table.AddColumn("Serial");
-                table.AddColumn("Bus");
-                table.AddColumn("Supported?");
-
-                foreach(DeviceInfo dev in devices.OrderBy(d => d.Path))
-                    table.AddRow(Markup.Escape(dev.Path  ?? ""), Markup.Escape(dev.Vendor ?? ""),
-                                 Markup.Escape(dev.Model ?? ""), Markup.Escape(dev.Serial ?? ""),
-                                 Markup.Escape(dev.Bus   ?? ""), dev.Supported ? "[green]✓[/]" : "[red]✗[/]");
-
-                AnsiConsole.Render(table);
-            }
-
-            return (int)ErrorNumber.NoError;
+            Statistics.AddRemote(serverApplication, serverVersion, serverOperatingSystem,
+                                 serverOperatingSystemVersion, serverArchitecture);
         }
+
+        if(devices        == null ||
+           devices.Length == 0)
+        {
+            AaruConsole.WriteLine("No known devices attached.");
+        }
+        else
+        {
+            Table table = new();
+            table.AddColumn("Path");
+            table.AddColumn("Vendor");
+            table.AddColumn("Model");
+            table.AddColumn("Serial");
+            table.AddColumn("Bus");
+            table.AddColumn("Supported?");
+
+            foreach(DeviceInfo dev in devices.OrderBy(d => d.Path))
+                table.AddRow(Markup.Escape(dev.Path  ?? ""), Markup.Escape(dev.Vendor ?? ""),
+                             Markup.Escape(dev.Model ?? ""), Markup.Escape(dev.Serial ?? ""),
+                             Markup.Escape(dev.Bus   ?? ""), dev.Supported ? "[green]✓[/]" : "[red]✗[/]");
+
+            AnsiConsole.Render(table);
+        }
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Filesystem/FilesystemFamily.cs b/Aaru/Commands/Filesystem/FilesystemFamily.cs
index d899af70b..e43ed4da5 100644
--- a/Aaru/Commands/Filesystem/FilesystemFamily.cs
+++ b/Aaru/Commands/Filesystem/FilesystemFamily.cs
@@ -32,19 +32,18 @@
 
 using System.CommandLine;
 
-namespace Aaru.Commands.Filesystem
-{
-    internal sealed class FilesystemFamily : Command
-    {
-        public FilesystemFamily() : base("filesystem", "Commands to manage filesystems")
-        {
-            AddAlias("fi");
-            AddAlias("fs");
+namespace Aaru.Commands.Filesystem;
 
-            AddCommand(new FilesystemInfoCommand());
-            AddCommand(new ListOptionsCommand());
-            AddCommand(new ExtractFilesCommand());
-            AddCommand(new LsCommand());
-        }
+internal sealed class FilesystemFamily : Command
+{
+    public FilesystemFamily() : base("filesystem", "Commands to manage filesystems")
+    {
+        AddAlias("fi");
+        AddAlias("fs");
+
+        AddCommand(new FilesystemInfoCommand());
+        AddCommand(new ListOptionsCommand());
+        AddCommand(new ExtractFilesCommand());
+        AddCommand(new LsCommand());
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Filesystem/Options.cs b/Aaru/Commands/Filesystem/Options.cs
index 3bdfbb9a4..5240057d9 100644
--- a/Aaru/Commands/Filesystem/Options.cs
+++ b/Aaru/Commands/Filesystem/Options.cs
@@ -43,103 +43,102 @@ using Aaru.Core;
 using JetBrains.Annotations;
 using Spectre.Console;
 
-namespace Aaru.Commands.Filesystem
+namespace Aaru.Commands.Filesystem;
+
+internal sealed class ListOptionsCommand : Command
 {
-    internal sealed class ListOptionsCommand : Command
+    public ListOptionsCommand() : base("options", "Lists all options supported by read-only filesystems.") =>
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+
+    public static int Invoke(bool debug, bool verbose)
     {
-        public ListOptionsCommand() : base("options", "Lists all options supported by read-only filesystems.") =>
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        MainClass.PrintCopyright();
 
-        public static int Invoke(bool debug, bool verbose)
+        if(debug)
         {
-            MainClass.PrintCopyright();
-
-            if(debug)
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            AaruConsole.DebugWriteLine("List-Options command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("List-Options command", "--verbose={0}", verbose);
-            Statistics.AddCommand("list-options");
-
-            PluginBase plugins = GetPluginBase.Instance;
-
-            AaruConsole.WriteLine("Read-only filesystems options:");
-
-            foreach(KeyValuePair<string, IReadOnlyFilesystem> kvp in plugins.ReadOnlyFilesystems)
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
             {
-                List<(string name, Type type, string description)> options = kvp.Value.SupportedOptions.ToList();
-
-                if(options.Count == 0)
-                    continue;
-
-                var table = new Table
-                {
-                    Title = new TableTitle($"Options for {kvp.Value.Name}:")
-                };
-
-                table.AddColumn("Name");
-                table.AddColumn("Type");
-                table.AddColumn("Description");
-
-                foreach((string name, Type type, string description) option in options.OrderBy(t => t.name))
-                    table.AddRow(Markup.Escape(option.name), $"[italic]{TypeToString(option.type)}[/]",
-                                 Markup.Escape(option.description));
-
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
-
-            return (int)ErrorNumber.NoError;
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        [NotNull]
-        static string TypeToString([NotNull] Type type)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        AaruConsole.DebugWriteLine("List-Options command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("List-Options command", "--verbose={0}", verbose);
+        Statistics.AddCommand("list-options");
+
+        PluginBase plugins = GetPluginBase.Instance;
+
+        AaruConsole.WriteLine("Read-only filesystems options:");
+
+        foreach(KeyValuePair<string, IReadOnlyFilesystem> kvp in plugins.ReadOnlyFilesystems)
         {
-            if(type == typeof(bool))
-                return "boolean";
+            List<(string name, Type type, string description)> options = kvp.Value.SupportedOptions.ToList();
 
-            if(type == typeof(sbyte) ||
-               type == typeof(short) ||
-               type == typeof(int)   ||
-               type == typeof(long))
-                return "signed number";
+            if(options.Count == 0)
+                continue;
 
-            if(type == typeof(byte)   ||
-               type == typeof(ushort) ||
-               type == typeof(uint)   ||
-               type == typeof(ulong))
-                return "number";
+            var table = new Table
+            {
+                Title = new TableTitle($"Options for {kvp.Value.Name}:")
+            };
 
-            if(type == typeof(float) ||
-               type == typeof(double))
-                return "float number";
+            table.AddColumn("Name");
+            table.AddColumn("Type");
+            table.AddColumn("Description");
 
-            if(type == typeof(Guid))
-                return "uuid";
+            foreach((string name, Type type, string description) option in options.OrderBy(t => t.name))
+                table.AddRow(Markup.Escape(option.name), $"[italic]{TypeToString(option.type)}[/]",
+                             Markup.Escape(option.description));
 
-            return type == typeof(string) ? "string" : type.ToString();
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
         }
+
+        return (int)ErrorNumber.NoError;
+    }
+
+    [NotNull]
+    static string TypeToString([NotNull] Type type)
+    {
+        if(type == typeof(bool))
+            return "boolean";
+
+        if(type == typeof(sbyte) ||
+           type == typeof(short) ||
+           type == typeof(int)   ||
+           type == typeof(long))
+            return "signed number";
+
+        if(type == typeof(byte)   ||
+           type == typeof(ushort) ||
+           type == typeof(uint)   ||
+           type == typeof(ulong))
+            return "number";
+
+        if(type == typeof(float) ||
+           type == typeof(double))
+            return "float number";
+
+        if(type == typeof(Guid))
+            return "uuid";
+
+        return type == typeof(string) ? "string" : type.ToString();
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Formats.cs b/Aaru/Commands/Formats.cs
index f97c065c2..e73d7e724 100644
--- a/Aaru/Commands/Formats.cs
+++ b/Aaru/Commands/Formats.cs
@@ -41,202 +41,201 @@ using Aaru.Console;
 using Aaru.Core;
 using Spectre.Console;
 
-namespace Aaru.Commands
+namespace Aaru.Commands;
+
+internal sealed class FormatsCommand : Command
 {
-    internal sealed class FormatsCommand : Command
+    public FormatsCommand() : base("formats",
+                                   "Lists all supported disc images, partition schemes and file systems.") =>
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+
+    public static int Invoke(bool verbose, bool debug)
     {
-        public FormatsCommand() : base("formats",
-                                       "Lists all supported disc images, partition schemes and file systems.") =>
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        MainClass.PrintCopyright();
 
-        public static int Invoke(bool verbose, bool debug)
+        if(debug)
         {
-            MainClass.PrintCopyright();
-
-            if(debug)
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            Statistics.AddCommand("formats");
-
-            AaruConsole.DebugWriteLine("Formats command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Formats command", "--verbose={0}", verbose);
-
-            PluginBase plugins     = GetPluginBase.Instance;
-            var        filtersList = new FiltersList();
-
-            Table table = new()
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
             {
-                Title = new TableTitle($"Supported filters ({filtersList.Filters.Count}):")
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
+        }
+
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
             };
 
+        Statistics.AddCommand("formats");
+
+        AaruConsole.DebugWriteLine("Formats command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Formats command", "--verbose={0}", verbose);
+
+        PluginBase plugins     = GetPluginBase.Instance;
+        var        filtersList = new FiltersList();
+
+        Table table = new()
+        {
+            Title = new TableTitle($"Supported filters ({filtersList.Filters.Count}):")
+        };
+
+        if(verbose)
+            table.AddColumn("GUID");
+
+        table.AddColumn("Filter");
+
+        foreach(KeyValuePair<string, IFilter> kvp in filtersList.Filters)
             if(verbose)
-                table.AddColumn("GUID");
+                table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
+            else
+                table.AddRow(Markup.Escape(kvp.Value.Name));
 
-            table.AddColumn("Filter");
+        AnsiConsole.Render(table);
 
-            foreach(KeyValuePair<string, IFilter> kvp in filtersList.Filters)
-                if(verbose)
-                    table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
-                else
-                    table.AddRow(Markup.Escape(kvp.Value.Name));
+        AaruConsole.WriteLine();
 
-            AnsiConsole.Render(table);
+        table = new Table
+        {
+            Title = new TableTitle(string.Format("Read-only media image formats ({0}):",
+                                                 plugins.ImagePluginsList.Count(t => !t.Value.GetType().
+                                                                                    GetInterfaces().
+                                                                                    Contains(typeof(IWritableImage)))))
+        };
 
-            AaruConsole.WriteLine();
+        if(verbose)
+            table.AddColumn("GUID");
 
-            table = new Table
-            {
-                Title = new TableTitle(string.Format("Read-only media image formats ({0}):",
-                                                     plugins.ImagePluginsList.Count(t => !t.Value.GetType().
-                                                         GetInterfaces().
-                                                         Contains(typeof(IWritableImage)))))
-            };
+        table.AddColumn("Media image format");
 
+        foreach(KeyValuePair<string, IMediaImage> kvp in plugins.ImagePluginsList.Where(t => !t.Value.GetType().
+                    GetInterfaces().Contains(typeof(IWritableImage))))
             if(verbose)
-                table.AddColumn("GUID");
+                table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
+            else
+                table.AddRow(Markup.Escape(kvp.Value.Name));
 
-            table.AddColumn("Media image format");
+        AnsiConsole.Render(table);
 
-            foreach(KeyValuePair<string, IMediaImage> kvp in plugins.ImagePluginsList.Where(t => !t.Value.GetType().
-                GetInterfaces().Contains(typeof(IWritableImage))))
-                if(verbose)
-                    table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
-                else
-                    table.AddRow(Markup.Escape(kvp.Value.Name));
+        AaruConsole.WriteLine();
 
-            AnsiConsole.Render(table);
+        table = new Table
+        {
+            Title = new TableTitle(string.Format("Read/write media image formats ({0}):",
+                                                 plugins.WritableImages.Count))
+        };
 
-            AaruConsole.WriteLine();
+        if(verbose)
+            table.AddColumn("GUID");
 
-            table = new Table
-            {
-                Title = new TableTitle(string.Format("Read/write media image formats ({0}):",
-                                                     plugins.WritableImages.Count))
-            };
+        table.AddColumn("Media image format");
 
+        foreach(KeyValuePair<string, IBaseWritableImage> kvp in plugins.WritableImages)
             if(verbose)
-                table.AddColumn("GUID");
+                table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
+            else
+                table.AddRow(Markup.Escape(kvp.Value.Name));
 
-            table.AddColumn("Media image format");
+        AnsiConsole.Render(table);
 
-            foreach(KeyValuePair<string, IBaseWritableImage> kvp in plugins.WritableImages)
-                if(verbose)
-                    table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
-                else
-                    table.AddRow(Markup.Escape(kvp.Value.Name));
+        AaruConsole.WriteLine();
 
-            AnsiConsole.Render(table);
-
-            AaruConsole.WriteLine();
-
-            table = new Table
-            {
-                Title =
-                    new TableTitle(string.Format("Supported filesystems for identification and information only ({0}):",
-                                                 plugins.PluginsList.Count(t => !t.Value.GetType().GetInterfaces().
+        table = new Table
+        {
+            Title =
+                new TableTitle(string.Format("Supported filesystems for identification and information only ({0}):",
+                                             plugins.PluginsList.Count(t => !t.Value.GetType().GetInterfaces().
                                                                                Contains(typeof(
                                                                                    IReadOnlyFilesystem)))))
-            };
+        };
 
+        if(verbose)
+            table.AddColumn("GUID");
+
+        table.AddColumn("Filesystem");
+
+        foreach(KeyValuePair<string, IFilesystem> kvp in plugins.PluginsList.Where(t => !t.Value.GetType().
+                    GetInterfaces().Contains(typeof(IReadOnlyFilesystem))))
             if(verbose)
-                table.AddColumn("GUID");
+                table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
+            else
+                table.AddRow(Markup.Escape(kvp.Value.Name));
 
-            table.AddColumn("Filesystem");
+        AnsiConsole.Render(table);
 
-            foreach(KeyValuePair<string, IFilesystem> kvp in plugins.PluginsList.Where(t => !t.Value.GetType().
-                GetInterfaces().Contains(typeof(IReadOnlyFilesystem))))
-                if(verbose)
-                    table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
-                else
-                    table.AddRow(Markup.Escape(kvp.Value.Name));
+        AaruConsole.WriteLine();
 
-            AnsiConsole.Render(table);
+        table = new Table
+        {
+            Title = new TableTitle(string.Format("Supported filesystems that can read their contents ({0}):",
+                                                 plugins.ReadOnlyFilesystems.Count))
+        };
 
-            AaruConsole.WriteLine();
+        if(verbose)
+            table.AddColumn("GUID");
 
-            table = new Table
-            {
-                Title = new TableTitle(string.Format("Supported filesystems that can read their contents ({0}):",
-                                                     plugins.ReadOnlyFilesystems.Count))
-            };
+        table.AddColumn("Filesystem");
 
+        foreach(KeyValuePair<string, IReadOnlyFilesystem> kvp in plugins.ReadOnlyFilesystems)
             if(verbose)
-                table.AddColumn("GUID");
+                table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
+            else
+                table.AddRow(Markup.Escape(kvp.Value.Name));
 
-            table.AddColumn("Filesystem");
+        AnsiConsole.Render(table);
 
-            foreach(KeyValuePair<string, IReadOnlyFilesystem> kvp in plugins.ReadOnlyFilesystems)
-                if(verbose)
-                    table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
-                else
-                    table.AddRow(Markup.Escape(kvp.Value.Name));
+        AaruConsole.WriteLine();
 
-            AnsiConsole.Render(table);
+        table = new Table
+        {
+            Title = new TableTitle(string.Format("Supported partitioning schemes ({0}):",
+                                                 plugins.PartPluginsList.Count))
+        };
 
-            AaruConsole.WriteLine();
+        if(verbose)
+            table.AddColumn("GUID");
 
-            table = new Table
-            {
-                Title = new TableTitle(string.Format("Supported partitioning schemes ({0}):",
-                                                     plugins.PartPluginsList.Count))
-            };
+        table.AddColumn("Scheme");
 
+        foreach(KeyValuePair<string, IPartition> kvp in plugins.PartPluginsList)
             if(verbose)
-                table.AddColumn("GUID");
+                table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
+            else
+                table.AddRow(Markup.Escape(kvp.Value.Name));
 
-            table.AddColumn("Scheme");
+        AnsiConsole.Render(table);
 
-            foreach(KeyValuePair<string, IPartition> kvp in plugins.PartPluginsList)
-                if(verbose)
-                    table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
-                else
-                    table.AddRow(Markup.Escape(kvp.Value.Name));
+        AaruConsole.WriteLine();
 
-            AnsiConsole.Render(table);
+        table = new Table
+        {
+            Title = new TableTitle(string.Format("Supported archive formats ({0}):", plugins.Archives.Count))
+        };
 
-            AaruConsole.WriteLine();
+        if(verbose)
+            table.AddColumn("GUID");
 
-            table = new Table
-            {
-                Title = new TableTitle(string.Format("Supported archive formats ({0}):", plugins.Archives.Count))
-            };
+        table.AddColumn("Archive format");
 
+        foreach(KeyValuePair<string, IArchive> kvp in plugins.Archives)
             if(verbose)
-                table.AddColumn("GUID");
+                table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
+            else
+                table.AddRow(Markup.Escape(kvp.Value.Name));
 
-            table.AddColumn("Archive format");
+        AnsiConsole.Render(table);
 
-            foreach(KeyValuePair<string, IArchive> kvp in plugins.Archives)
-                if(verbose)
-                    table.AddRow(kvp.Value.Id.ToString(), Markup.Escape(kvp.Value.Name));
-                else
-                    table.AddRow(Markup.Escape(kvp.Value.Name));
-
-            AnsiConsole.Render(table);
-
-            return (int)ErrorNumber.NoError;
-        }
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/CreateSidecar.cs b/Aaru/Commands/Image/CreateSidecar.cs
index 9087d1930..73d7a46d8 100644
--- a/Aaru/Commands/Image/CreateSidecar.cs
+++ b/Aaru/Commands/Image/CreateSidecar.cs
@@ -47,284 +47,189 @@ using JetBrains.Annotations;
 using Schemas;
 using Spectre.Console;
 
-namespace Aaru.Commands.Image
+namespace Aaru.Commands.Image;
+
+internal sealed class CreateSidecarCommand : Command
 {
-    internal sealed class CreateSidecarCommand : Command
+    static ProgressTask _progressTask1;
+    static ProgressTask _progressTask2;
+
+    public CreateSidecarCommand() : base("create-sidecar", "Creates CICM Metadata XML sidecar.")
     {
-        static ProgressTask _progressTask1;
-        static ProgressTask _progressTask2;
-
-        public CreateSidecarCommand() : base("create-sidecar", "Creates CICM Metadata XML sidecar.")
+        Add(new Option(new[]
+                       {
+                           "--block-size", "-b"
+                       },
+                       "Only used for tapes, indicates block size. Files in the folder whose size is not a multiple of this value will simply be ignored.")
         {
-            Add(new Option(new[]
-                           {
-                               "--block-size", "-b"
-                           },
-                           "Only used for tapes, indicates block size. Files in the folder whose size is not a multiple of this value will simply be ignored.")
+            Argument = new Argument<int>(() => 512),
+            Required = false
+        });
+
+        Add(new Option(new[]
             {
-                Argument = new Argument<int>(() => 512),
+                "--encoding", "-e"
+            }, "Name of character encoding to use.")
+            {
+                Argument = new Argument<string>(() => null),
                 Required = false
             });
 
-            Add(new Option(new[]
-                {
-                    "--encoding", "-e"
-                }, "Name of character encoding to use.")
-                {
-                    Argument = new Argument<string>(() => null),
-                    Required = false
-                });
+        Add(new Option(new[]
+                       {
+                           "--tape", "-t"
+                       },
+                       "When used indicates that input is a folder containing alphabetically sorted files extracted from a linear block-based tape with fixed block size (e.g. a SCSI tape device).")
+        {
+            Argument = new Argument<bool>(() => false),
+            Required = false
+        });
 
-            Add(new Option(new[]
-                           {
-                               "--tape", "-t"
-                           },
-                           "When used indicates that input is a folder containing alphabetically sorted files extracted from a linear block-based tape with fixed block size (e.g. a SCSI tape device).")
+        AddArgument(new Argument<string>
+        {
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "Media image path",
+            Name        = "image-path"
+        });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, uint blockSize, [CanBeNull] string encodingName,
+                             string imagePath, bool tape)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                Argument = new Argument<bool>(() => false),
-                Required = false
+                Out = new AnsiConsoleOutput(System.Console.Error)
             });
 
-            AddArgument(new Argument<string>
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "Media image path",
-                Name        = "image-path"
-            });
-
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, uint blockSize, [CanBeNull] string encodingName,
-                                 string imagePath, bool tape)
-        {
-            MainClass.PrintCopyright();
-
-            if(debug)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
+        Statistics.AddCommand("create-sidecar");
+
+        AaruConsole.DebugWriteLine("Create sidecar command", "--block-size={0}", blockSize);
+        AaruConsole.DebugWriteLine("Create sidecar command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Create sidecar command", "--encoding={0}", encodingName);
+        AaruConsole.DebugWriteLine("Create sidecar command", "--input={0}", imagePath);
+        AaruConsole.DebugWriteLine("Create sidecar command", "--tape={0}", tape);
+        AaruConsole.DebugWriteLine("Create sidecar command", "--verbose={0}", verbose);
+
+        Encoding encodingClass = null;
+
+        if(encodingName != null)
+            try
+            {
+                encodingClass = Claunia.Encoding.Encoding.GetEncoding(encodingName);
+
+                if(verbose)
+                    AaruConsole.VerboseWriteLine("Using encoding for {0}.", encodingClass.EncodingName);
+            }
+            catch(ArgumentException)
+            {
+                AaruConsole.ErrorWriteLine("Specified encoding is not supported.");
+
+                return (int)ErrorNumber.EncodingUnknown;
             }
 
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            Statistics.AddCommand("create-sidecar");
-
-            AaruConsole.DebugWriteLine("Create sidecar command", "--block-size={0}", blockSize);
-            AaruConsole.DebugWriteLine("Create sidecar command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Create sidecar command", "--encoding={0}", encodingName);
-            AaruConsole.DebugWriteLine("Create sidecar command", "--input={0}", imagePath);
-            AaruConsole.DebugWriteLine("Create sidecar command", "--tape={0}", tape);
-            AaruConsole.DebugWriteLine("Create sidecar command", "--verbose={0}", verbose);
-
-            Encoding encodingClass = null;
-
-            if(encodingName != null)
-                try
-                {
-                    encodingClass = Claunia.Encoding.Encoding.GetEncoding(encodingName);
-
-                    if(verbose)
-                        AaruConsole.VerboseWriteLine("Using encoding for {0}.", encodingClass.EncodingName);
-                }
-                catch(ArgumentException)
-                {
-                    AaruConsole.ErrorWriteLine("Specified encoding is not supported.");
-
-                    return (int)ErrorNumber.EncodingUnknown;
-                }
-
-            if(File.Exists(imagePath))
+        if(File.Exists(imagePath))
+        {
+            if(tape)
             {
-                if(tape)
-                {
-                    AaruConsole.ErrorWriteLine("You cannot use --tape option when input is a file.");
+                AaruConsole.ErrorWriteLine("You cannot use --tape option when input is a file.");
 
-                    return (int)ErrorNumber.NotDirectory;
-                }
+                return (int)ErrorNumber.NotDirectory;
+            }
 
-                var     filtersList = new FiltersList();
-                IFilter inputFilter = null;
+            var     filtersList = new FiltersList();
+            IFilter inputFilter = null;
+
+            Core.Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Identifying file filter...").IsIndeterminate();
+                inputFilter = filtersList.GetFilter(imagePath);
+            });
+
+            if(inputFilter == null)
+            {
+                AaruConsole.ErrorWriteLine("Cannot open specified file.");
+
+                return (int)ErrorNumber.CannotOpenFile;
+            }
+
+            try
+            {
+                IBaseImage imageFormat = null;
 
                 Core.Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Identifying file filter...").IsIndeterminate();
-                    inputFilter = filtersList.GetFilter(imagePath);
+                    ctx.AddTask("Identifying image format...").IsIndeterminate();
+                    imageFormat = ImageFormat.Detect(inputFilter);
                 });
 
-                if(inputFilter == null)
+                if(imageFormat == null)
                 {
-                    AaruConsole.ErrorWriteLine("Cannot open specified file.");
+                    AaruConsole.WriteLine("Image format not identified, not proceeding with analysis.");
 
-                    return (int)ErrorNumber.CannotOpenFile;
+                    return (int)ErrorNumber.UnrecognizedFormat;
                 }
 
+                if(verbose)
+                    AaruConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
+                                                 imageFormat.Id);
+                else
+                    AaruConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
+
                 try
                 {
-                    IBaseImage imageFormat = null;
+                    ErrorNumber opened = ErrorNumber.NoData;
 
                     Core.Spectre.ProgressSingleSpinner(ctx =>
                     {
-                        ctx.AddTask("Identifying image format...").IsIndeterminate();
-                        imageFormat = ImageFormat.Detect(inputFilter);
+                        ctx.AddTask("Opening image file...").IsIndeterminate();
+                        opened = imageFormat.Open(inputFilter);
                     });
 
-                    if(imageFormat == null)
+                    if(opened != ErrorNumber.NoError)
                     {
-                        AaruConsole.WriteLine("Image format not identified, not proceeding with analysis.");
+                        AaruConsole.WriteLine("Error {opened} opening image format");
 
-                        return (int)ErrorNumber.UnrecognizedFormat;
+                        return (int)opened;
                     }
 
-                    if(verbose)
-                        AaruConsole.VerboseWriteLine("Image format identified by {0} ({1}).", imageFormat.Name,
-                                                     imageFormat.Id);
-                    else
-                        AaruConsole.WriteLine("Image format identified by {0}.", imageFormat.Name);
-
-                    try
-                    {
-                        ErrorNumber opened = ErrorNumber.NoData;
-
-                        Core.Spectre.ProgressSingleSpinner(ctx =>
-                        {
-                            ctx.AddTask("Opening image file...").IsIndeterminate();
-                            opened = imageFormat.Open(inputFilter);
-                        });
-
-                        if(opened != ErrorNumber.NoError)
-                        {
-                            AaruConsole.WriteLine("Error {opened} opening image format");
-
-                            return (int)opened;
-                        }
-
-                        AaruConsole.DebugWriteLine("Create sidecar command", "Correctly opened image file.");
-                    }
-                    catch(Exception ex)
-                    {
-                        AaruConsole.ErrorWriteLine("Unable to open image format");
-                        AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
-
-                        return (int)ErrorNumber.CannotOpenFormat;
-                    }
-
-                    Statistics.AddMediaFormat(imageFormat.Format);
-                    Statistics.AddFilter(inputFilter.Name);
-
-                    var              sidecarClass = new Sidecar(imageFormat, imagePath, inputFilter.Id, encodingClass);
-                    CICMMetadataType sidecar      = new();
-
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
-                                {
-                                    sidecarClass.InitProgressEvent += () =>
-                                    {
-                                        _progressTask1 = ctx.AddTask("Progress");
-                                    };
-
-                                    sidecarClass.InitProgressEvent2 += () =>
-                                    {
-                                        _progressTask2 = ctx.AddTask("Progress");
-                                    };
-
-                                    sidecarClass.UpdateProgressEvent += (text, current, maximum) =>
-                                    {
-                                        _progressTask1             ??= ctx.AddTask("Progress");
-                                        _progressTask1.Description =   Markup.Escape(text);
-                                        _progressTask1.Value       =   current;
-                                        _progressTask1.MaxValue    =   maximum;
-                                    };
-
-                                    sidecarClass.UpdateProgressEvent2 += (text, current, maximum) =>
-                                    {
-                                        _progressTask2             ??= ctx.AddTask("Progress");
-                                        _progressTask2.Description =   Markup.Escape(text);
-                                        _progressTask2.Value       =   current;
-                                        _progressTask2.MaxValue    =   maximum;
-                                    };
-
-                                    sidecarClass.EndProgressEvent += () =>
-                                    {
-                                        _progressTask1?.StopTask();
-                                        _progressTask1 = null;
-                                    };
-
-                                    sidecarClass.EndProgressEvent2 += () =>
-                                    {
-                                        _progressTask2?.StopTask();
-                                        _progressTask2 = null;
-                                    };
-
-                                    sidecarClass.UpdateStatusEvent += text =>
-                                    {
-                                        AaruConsole.WriteLine(Markup.Escape(text));
-                                    };
-
-                                    System.Console.CancelKeyPress += (_, e) =>
-                                    {
-                                        e.Cancel = true;
-                                        sidecarClass.Abort();
-                                    };
-
-                                    sidecar = sidecarClass.Create();
-                                });
-
-                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Writing metadata sidecar").IsIndeterminate();
-
-                        var xmlFs =
-                            new
-                                FileStream(Path.Combine(Path.GetDirectoryName(imagePath) ?? throw new InvalidOperationException(), Path.GetFileNameWithoutExtension(imagePath) + ".cicm.xml"),
-                                           FileMode.CreateNew);
-
-                        var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
-                        xmlSer.Serialize(xmlFs, sidecar);
-                        xmlFs.Close();
-                    });
+                    AaruConsole.DebugWriteLine("Create sidecar command", "Correctly opened image file.");
                 }
                 catch(Exception ex)
                 {
-                    AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
-                    AaruConsole.DebugWriteLine("Create sidecar command", ex.StackTrace);
+                    AaruConsole.ErrorWriteLine("Unable to open image format");
+                    AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
 
-                    return (int)ErrorNumber.UnexpectedException;
-                }
-            }
-            else if(Directory.Exists(imagePath))
-            {
-                if(!tape)
-                {
-                    AaruConsole.ErrorWriteLine("Cannot create a sidecar from a directory.");
-
-                    return (int)ErrorNumber.IsDirectory;
+                    return (int)ErrorNumber.CannotOpenFormat;
                 }
 
-                string[]     contents = Directory.GetFiles(imagePath, "*", SearchOption.TopDirectoryOnly);
-                List<string> files    = contents.Where(file => new FileInfo(file).Length % blockSize == 0).ToList();
+                Statistics.AddMediaFormat(imageFormat.Format);
+                Statistics.AddFilter(inputFilter.Name);
 
-                files.Sort(StringComparer.CurrentCultureIgnoreCase);
-
-                var              sidecarClass = new Sidecar();
+                var              sidecarClass = new Sidecar(imageFormat, imagePath, inputFilter.Id, encodingClass);
                 CICMMetadataType sidecar      = new();
 
                 AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
@@ -380,7 +285,7 @@ namespace Aaru.Commands.Image
                                     sidecarClass.Abort();
                                 };
 
-                                sidecar = sidecarClass.BlockTape(Path.GetFileName(imagePath), files, blockSize);
+                                sidecar = sidecarClass.Create();
                             });
 
                 Core.Spectre.ProgressSingleSpinner(ctx =>
@@ -397,10 +302,104 @@ namespace Aaru.Commands.Image
                     xmlFs.Close();
                 });
             }
-            else
-                AaruConsole.ErrorWriteLine("The specified input file cannot be found.");
+            catch(Exception ex)
+            {
+                AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
+                AaruConsole.DebugWriteLine("Create sidecar command", ex.StackTrace);
 
-            return (int)ErrorNumber.NoError;
+                return (int)ErrorNumber.UnexpectedException;
+            }
         }
+        else if(Directory.Exists(imagePath))
+        {
+            if(!tape)
+            {
+                AaruConsole.ErrorWriteLine("Cannot create a sidecar from a directory.");
+
+                return (int)ErrorNumber.IsDirectory;
+            }
+
+            string[]     contents = Directory.GetFiles(imagePath, "*", SearchOption.TopDirectoryOnly);
+            List<string> files    = contents.Where(file => new FileInfo(file).Length % blockSize == 0).ToList();
+
+            files.Sort(StringComparer.CurrentCultureIgnoreCase);
+
+            var              sidecarClass = new Sidecar();
+            CICMMetadataType sidecar      = new();
+
+            AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                        Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                        Start(ctx =>
+                        {
+                            sidecarClass.InitProgressEvent += () =>
+                            {
+                                _progressTask1 = ctx.AddTask("Progress");
+                            };
+
+                            sidecarClass.InitProgressEvent2 += () =>
+                            {
+                                _progressTask2 = ctx.AddTask("Progress");
+                            };
+
+                            sidecarClass.UpdateProgressEvent += (text, current, maximum) =>
+                            {
+                                _progressTask1             ??= ctx.AddTask("Progress");
+                                _progressTask1.Description =   Markup.Escape(text);
+                                _progressTask1.Value       =   current;
+                                _progressTask1.MaxValue    =   maximum;
+                            };
+
+                            sidecarClass.UpdateProgressEvent2 += (text, current, maximum) =>
+                            {
+                                _progressTask2             ??= ctx.AddTask("Progress");
+                                _progressTask2.Description =   Markup.Escape(text);
+                                _progressTask2.Value       =   current;
+                                _progressTask2.MaxValue    =   maximum;
+                            };
+
+                            sidecarClass.EndProgressEvent += () =>
+                            {
+                                _progressTask1?.StopTask();
+                                _progressTask1 = null;
+                            };
+
+                            sidecarClass.EndProgressEvent2 += () =>
+                            {
+                                _progressTask2?.StopTask();
+                                _progressTask2 = null;
+                            };
+
+                            sidecarClass.UpdateStatusEvent += text =>
+                            {
+                                AaruConsole.WriteLine(Markup.Escape(text));
+                            };
+
+                            System.Console.CancelKeyPress += (_, e) =>
+                            {
+                                e.Cancel = true;
+                                sidecarClass.Abort();
+                            };
+
+                            sidecar = sidecarClass.BlockTape(Path.GetFileName(imagePath), files, blockSize);
+                        });
+
+            Core.Spectre.ProgressSingleSpinner(ctx =>
+            {
+                ctx.AddTask("Writing metadata sidecar").IsIndeterminate();
+
+                var xmlFs =
+                    new
+                        FileStream(Path.Combine(Path.GetDirectoryName(imagePath) ?? throw new InvalidOperationException(), Path.GetFileNameWithoutExtension(imagePath) + ".cicm.xml"),
+                                   FileMode.CreateNew);
+
+                var xmlSer = new XmlSerializer(typeof(CICMMetadataType));
+                xmlSer.Serialize(xmlFs, sidecar);
+                xmlFs.Close();
+            });
+        }
+        else
+            AaruConsole.ErrorWriteLine("The specified input file cannot be found.");
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Entropy.cs b/Aaru/Commands/Image/Entropy.cs
index f4ab22309..62d6d5c6a 100644
--- a/Aaru/Commands/Image/Entropy.cs
+++ b/Aaru/Commands/Image/Entropy.cs
@@ -39,234 +39,233 @@ using Aaru.Console;
 using Aaru.Core;
 using Spectre.Console;
 
-namespace Aaru.Commands.Image
+namespace Aaru.Commands.Image;
+
+internal sealed class EntropyCommand : Command
 {
-    internal sealed class EntropyCommand : Command
+    static ProgressTask _progressTask1;
+    static ProgressTask _progressTask2;
+
+    public EntropyCommand() : base("entropy", "Calculates entropy and/or duplicated sectors of an image.")
     {
-        static ProgressTask _progressTask1;
-        static ProgressTask _progressTask2;
-
-        public EntropyCommand() : base("entropy", "Calculates entropy and/or duplicated sectors of an image.")
-        {
-            Add(new Option(new[]
-                {
-                    "--duplicated-sectors", "-p"
-                }, "Calculates how many sectors are duplicated (have same exact data in user area).")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
-
-            Add(new Option(new[]
-                {
-                    "--separated-tracks", "-t"
-                }, "Calculates entropy for each track separately.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
-
-            Add(new Option(new[]
-                {
-                    "--whole-disc", "-w"
-                }, "Calculates entropy for the whole disc.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
-
-            AddArgument(new Argument<string>
+        Add(new Option(new[]
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "Media image path",
-                Name        = "image-path"
+                "--duplicated-sectors", "-p"
+            }, "Calculates how many sectors are duplicated (have same exact data in user area).")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
             });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        Add(new Option(new[]
+            {
+                "--separated-tracks", "-t"
+            }, "Calculates entropy for each track separately.")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
+            });
+
+        Add(new Option(new[]
+            {
+                "--whole-disc", "-w"
+            }, "Calculates entropy for the whole disc.")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
+            });
+
+        AddArgument(new Argument<string>
+        {
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "Media image path",
+            Name        = "image-path"
+        });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, bool duplicatedSectors, string imagePath,
+                             bool separatedTracks, bool wholeDisc)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
+            {
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
+
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, bool duplicatedSectors, string imagePath,
-                                 bool separatedTracks, bool wholeDisc)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        Statistics.AddCommand("entropy");
+
+        AaruConsole.DebugWriteLine("Entropy command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Entropy command", "--duplicated-sectors={0}", duplicatedSectors);
+        AaruConsole.DebugWriteLine("Entropy command", "--input={0}", imagePath);
+        AaruConsole.DebugWriteLine("Entropy command", "--separated-tracks={0}", separatedTracks);
+        AaruConsole.DebugWriteLine("Entropy command", "--verbose={0}", verbose);
+        AaruConsole.DebugWriteLine("Entropy command", "--whole-disc={0}", wholeDisc);
+
+        var     filtersList = new FiltersList();
+        IFilter inputFilter = null;
+
+        Core.Spectre.ProgressSingleSpinner(ctx =>
         {
-            MainClass.PrintCopyright();
+            ctx.AddTask("Identifying file filter...").IsIndeterminate();
+            inputFilter = filtersList.GetFilter(imagePath);
+        });
 
-            if(debug)
-            {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+        if(inputFilter == null)
+        {
+            AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
+            return (int)ErrorNumber.CannotOpenFile;
+        }
 
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
+        IBaseImage inputFormat = null;
 
-            Statistics.AddCommand("entropy");
+        Core.Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Identifying image format...").IsIndeterminate();
+            inputFormat = ImageFormat.Detect(inputFilter);
+        });
 
-            AaruConsole.DebugWriteLine("Entropy command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Entropy command", "--duplicated-sectors={0}", duplicatedSectors);
-            AaruConsole.DebugWriteLine("Entropy command", "--input={0}", imagePath);
-            AaruConsole.DebugWriteLine("Entropy command", "--separated-tracks={0}", separatedTracks);
-            AaruConsole.DebugWriteLine("Entropy command", "--verbose={0}", verbose);
-            AaruConsole.DebugWriteLine("Entropy command", "--whole-disc={0}", wholeDisc);
+        if(inputFormat == null)
+        {
+            AaruConsole.ErrorWriteLine("Unable to recognize image format, not checksumming");
 
-            var     filtersList = new FiltersList();
-            IFilter inputFilter = null;
+            return (int)ErrorNumber.UnrecognizedFormat;
+        }
 
-            Core.Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Identifying file filter...").IsIndeterminate();
-                inputFilter = filtersList.GetFilter(imagePath);
-            });
+        ErrorNumber opened = ErrorNumber.NoData;
 
-            if(inputFilter == null)
-            {
-                AaruConsole.ErrorWriteLine("Cannot open specified file.");
+        Core.Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Opening image file...").IsIndeterminate();
+            opened = inputFormat.Open(inputFilter);
+        });
 
-                return (int)ErrorNumber.CannotOpenFile;
-            }
+        if(opened != ErrorNumber.NoError)
+        {
+            AaruConsole.WriteLine("Error {opened} opening image format");
 
-            IBaseImage inputFormat = null;
+            return (int)opened;
+        }
 
-            Core.Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Identifying image format...").IsIndeterminate();
-                inputFormat = ImageFormat.Detect(inputFilter);
-            });
+        Statistics.AddMediaFormat(inputFormat.Format);
+        Statistics.AddMedia(inputFormat.Info.MediaType, false);
+        Statistics.AddFilter(inputFilter.Name);
 
-            if(inputFormat == null)
-            {
-                AaruConsole.ErrorWriteLine("Unable to recognize image format, not checksumming");
+        var entropyCalculator = new Entropy(debug, inputFormat);
 
-                return (int)ErrorNumber.UnrecognizedFormat;
-            }
-
-            ErrorNumber opened = ErrorNumber.NoData;
-
-            Core.Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Opening image file...").IsIndeterminate();
-                opened = inputFormat.Open(inputFilter);
-            });
-
-            if(opened != ErrorNumber.NoError)
-            {
-                AaruConsole.WriteLine("Error {opened} opening image format");
-
-                return (int)opened;
-            }
-
-            Statistics.AddMediaFormat(inputFormat.Format);
-            Statistics.AddMedia(inputFormat.Info.MediaType, false);
-            Statistics.AddFilter(inputFilter.Name);
-
-            var entropyCalculator = new Entropy(debug, inputFormat);
-
-            AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                        Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                        Start(ctx =>
+        AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                    Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                    Start(ctx =>
+                    {
+                        entropyCalculator.InitProgressEvent += () =>
                         {
-                            entropyCalculator.InitProgressEvent += () =>
+                            _progressTask1 = ctx.AddTask("Progress");
+                        };
+
+                        entropyCalculator.InitProgress2Event += () =>
+                        {
+                            _progressTask2 = ctx.AddTask("Progress");
+                        };
+
+                        entropyCalculator.UpdateProgressEvent += (text, current, maximum) =>
+                        {
+                            _progressTask1             ??= ctx.AddTask("Progress");
+                            _progressTask1.Description =   Markup.Escape(text);
+                            _progressTask1.Value       =   current;
+                            _progressTask1.MaxValue    =   maximum;
+                        };
+
+                        entropyCalculator.UpdateProgress2Event += (text, current, maximum) =>
+                        {
+                            _progressTask2             ??= ctx.AddTask("Progress");
+                            _progressTask2.Description =   Markup.Escape(text);
+                            _progressTask2.Value       =   current;
+                            _progressTask2.MaxValue    =   maximum;
+                        };
+
+                        entropyCalculator.EndProgressEvent += () =>
+                        {
+                            _progressTask1?.StopTask();
+                            _progressTask1 = null;
+                        };
+
+                        entropyCalculator.EndProgress2Event += () =>
+                        {
+                            _progressTask2?.StopTask();
+                            _progressTask2 = null;
+                        };
+
+                        if(wholeDisc && inputFormat is IOpticalMediaImage opticalFormat)
+                        {
+                            if(opticalFormat.Sessions?.Count > 1)
                             {
-                                _progressTask1 = ctx.AddTask("Progress");
-                            };
+                                AaruConsole.
+                                    ErrorWriteLine("Calculating disc entropy of multisession images is not yet implemented.");
 
-                            entropyCalculator.InitProgress2Event += () =>
-                            {
-                                _progressTask2 = ctx.AddTask("Progress");
-                            };
-
-                            entropyCalculator.UpdateProgressEvent += (text, current, maximum) =>
-                            {
-                                _progressTask1             ??= ctx.AddTask("Progress");
-                                _progressTask1.Description =   Markup.Escape(text);
-                                _progressTask1.Value       =   current;
-                                _progressTask1.MaxValue    =   maximum;
-                            };
-
-                            entropyCalculator.UpdateProgress2Event += (text, current, maximum) =>
-                            {
-                                _progressTask2             ??= ctx.AddTask("Progress");
-                                _progressTask2.Description =   Markup.Escape(text);
-                                _progressTask2.Value       =   current;
-                                _progressTask2.MaxValue    =   maximum;
-                            };
-
-                            entropyCalculator.EndProgressEvent += () =>
-                            {
-                                _progressTask1?.StopTask();
-                                _progressTask1 = null;
-                            };
-
-                            entropyCalculator.EndProgress2Event += () =>
-                            {
-                                _progressTask2?.StopTask();
-                                _progressTask2 = null;
-                            };
-
-                            if(wholeDisc && inputFormat is IOpticalMediaImage opticalFormat)
-                            {
-                                if(opticalFormat.Sessions?.Count > 1)
-                                {
-                                    AaruConsole.
-                                        ErrorWriteLine("Calculating disc entropy of multisession images is not yet implemented.");
-
-                                    wholeDisc = false;
-                                }
-
-                                if(opticalFormat.Tracks?.Count == 1)
-                                    separatedTracks = false;
+                                wholeDisc = false;
                             }
 
-                            if(separatedTracks)
+                            if(opticalFormat.Tracks?.Count == 1)
+                                separatedTracks = false;
+                        }
+
+                        if(separatedTracks)
+                        {
+                            EntropyResults[] tracksEntropy =
+                                entropyCalculator.CalculateTracksEntropy(duplicatedSectors);
+
+                            foreach(EntropyResults trackEntropy in tracksEntropy)
                             {
-                                EntropyResults[] tracksEntropy =
-                                    entropyCalculator.CalculateTracksEntropy(duplicatedSectors);
+                                AaruConsole.WriteLine("Entropy for track {0} is {1:F4}.", trackEntropy.Track,
+                                                      trackEntropy.Entropy);
 
-                                foreach(EntropyResults trackEntropy in tracksEntropy)
-                                {
-                                    AaruConsole.WriteLine("Entropy for track {0} is {1:F4}.", trackEntropy.Track,
-                                                          trackEntropy.Entropy);
-
-                                    if(trackEntropy.UniqueSectors != null)
-                                        AaruConsole.WriteLine("Track {0} has {1} unique sectors ({2:P3})",
-                                                              trackEntropy.Track, trackEntropy.UniqueSectors,
-                                                              (double)trackEntropy.UniqueSectors /
-                                                              trackEntropy.Sectors);
-                                }
+                                if(trackEntropy.UniqueSectors != null)
+                                    AaruConsole.WriteLine("Track {0} has {1} unique sectors ({2:P3})",
+                                                          trackEntropy.Track, trackEntropy.UniqueSectors,
+                                                          (double)trackEntropy.UniqueSectors /
+                                                          trackEntropy.Sectors);
                             }
+                        }
 
-                            if(!wholeDisc)
-                                return;
+                        if(!wholeDisc)
+                            return;
 
-                            EntropyResults entropy;
+                        EntropyResults entropy;
 
-                            entropy = inputFormat.Info.XmlMediaType == XmlMediaType.LinearMedia
-                                          ? entropyCalculator.CalculateLinearMediaEntropy()
-                                          : entropyCalculator.CalculateMediaEntropy(duplicatedSectors);
+                        entropy = inputFormat.Info.XmlMediaType == XmlMediaType.LinearMedia
+                                      ? entropyCalculator.CalculateLinearMediaEntropy()
+                                      : entropyCalculator.CalculateMediaEntropy(duplicatedSectors);
 
-                            AaruConsole.WriteLine("Entropy for disk is {0:F4}.", entropy.Entropy);
+                        AaruConsole.WriteLine("Entropy for disk is {0:F4}.", entropy.Entropy);
 
-                            if(entropy.UniqueSectors != null)
-                                AaruConsole.WriteLine("Disk has {0} unique sectors ({1:P3})", entropy.UniqueSectors,
-                                                      (double)entropy.UniqueSectors / entropy.Sectors);
-                        });
+                        if(entropy.UniqueSectors != null)
+                            AaruConsole.WriteLine("Disk has {0} unique sectors ({1:P3})", entropy.UniqueSectors,
+                                                  (double)entropy.UniqueSectors / entropy.Sectors);
+                    });
 
-            return (int)ErrorNumber.NoError;
-        }
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/ImageFamily.cs b/Aaru/Commands/Image/ImageFamily.cs
index dba135cfc..98fac7005 100644
--- a/Aaru/Commands/Image/ImageFamily.cs
+++ b/Aaru/Commands/Image/ImageFamily.cs
@@ -32,24 +32,23 @@
 
 using System.CommandLine;
 
-namespace Aaru.Commands.Image
-{
-    internal sealed class ImageFamily : Command
-    {
-        public ImageFamily() : base("image", "Commands to manage images")
-        {
-            AddAlias("i");
+namespace Aaru.Commands.Image;
 
-            AddCommand(new ChecksumCommand());
-            AddCommand(new CompareCommand());
-            AddCommand(new ConvertImageCommand());
-            AddCommand(new CreateSidecarCommand());
-            AddCommand(new DecodeCommand());
-            AddCommand(new EntropyCommand());
-            AddCommand(new ImageInfoCommand());
-            AddCommand(new ListOptionsCommand());
-            AddCommand(new PrintHexCommand());
-            AddCommand(new VerifyCommand());
-        }
+internal sealed class ImageFamily : Command
+{
+    public ImageFamily() : base("image", "Commands to manage images")
+    {
+        AddAlias("i");
+
+        AddCommand(new ChecksumCommand());
+        AddCommand(new CompareCommand());
+        AddCommand(new ConvertImageCommand());
+        AddCommand(new CreateSidecarCommand());
+        AddCommand(new DecodeCommand());
+        AddCommand(new EntropyCommand());
+        AddCommand(new ImageInfoCommand());
+        AddCommand(new ListOptionsCommand());
+        AddCommand(new PrintHexCommand());
+        AddCommand(new VerifyCommand());
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Info.cs b/Aaru/Commands/Image/Info.cs
index bf19ca418..bdd38c532 100644
--- a/Aaru/Commands/Image/Info.cs
+++ b/Aaru/Commands/Image/Info.cs
@@ -40,135 +40,134 @@ using Aaru.Console;
 using Aaru.Core;
 using Spectre.Console;
 
-namespace Aaru.Commands.Image
+namespace Aaru.Commands.Image;
+
+internal sealed class ImageInfoCommand : Command
 {
-    internal sealed class ImageInfoCommand : Command
+    public ImageInfoCommand() : base("info",
+                                     "Identifies a media image and shows information about the media it represents and metadata.")
     {
-        public ImageInfoCommand() : base("info",
-                                         "Identifies a media image and shows information about the media it represents and metadata.")
+        AddArgument(new Argument<string>
         {
-            AddArgument(new Argument<string>
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "Media image path",
+            Name        = "image-path"
+        });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, string imagePath)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "Media image path",
-                Name        = "image-path"
+                Out = new AnsiConsoleOutput(System.Console.Error)
             });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, string imagePath)
-        {
-            MainClass.PrintCopyright();
-
-            if(debug)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
+        Statistics.AddCommand("image-info");
 
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
+        AaruConsole.DebugWriteLine("Image-info command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Image-info command", "--input={0}", imagePath);
+        AaruConsole.DebugWriteLine("Image-info command", "--verbose={0}", verbose);
 
-            Statistics.AddCommand("image-info");
+        var     filtersList = new FiltersList();
+        IFilter inputFilter = null;
 
-            AaruConsole.DebugWriteLine("Image-info command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Image-info command", "--input={0}", imagePath);
-            AaruConsole.DebugWriteLine("Image-info command", "--verbose={0}", verbose);
+        Core.Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Identifying file filter...").IsIndeterminate();
+            inputFilter = filtersList.GetFilter(imagePath);
+        });
 
-            var     filtersList = new FiltersList();
-            IFilter inputFilter = null;
+        if(inputFilter == null)
+        {
+            AaruConsole.ErrorWriteLine("Cannot open specified file.");
+
+            return (int)ErrorNumber.CannotOpenFile;
+        }
+
+        try
+        {
+            IBaseImage imageFormat = null;
 
             Core.Spectre.ProgressSingleSpinner(ctx =>
             {
-                ctx.AddTask("Identifying file filter...").IsIndeterminate();
-                inputFilter = filtersList.GetFilter(imagePath);
+                ctx.AddTask("Identifying image format...").IsIndeterminate();
+                imageFormat = ImageFormat.Detect(inputFilter);
             });
 
-            if(inputFilter == null)
+            if(imageFormat == null)
             {
-                AaruConsole.ErrorWriteLine("Cannot open specified file.");
+                AaruConsole.WriteLine("Image format not identified.");
 
-                return (int)ErrorNumber.CannotOpenFile;
+                return (int)ErrorNumber.UnrecognizedFormat;
             }
 
+            AaruConsole.WriteLine("Image format identified by {0} ({1}).", imageFormat.Name, imageFormat.Id);
+            AaruConsole.WriteLine();
+
             try
             {
-                IBaseImage imageFormat = null;
+                ErrorNumber opened = ErrorNumber.NoData;
 
                 Core.Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    ctx.AddTask("Identifying image format...").IsIndeterminate();
-                    imageFormat = ImageFormat.Detect(inputFilter);
+                    ctx.AddTask("Opening image file...").IsIndeterminate();
+                    opened = imageFormat.Open(inputFilter);
                 });
 
-                if(imageFormat == null)
+                if(opened != ErrorNumber.NoError)
                 {
-                    AaruConsole.WriteLine("Image format not identified.");
+                    AaruConsole.WriteLine("Error {opened} opening image format");
 
-                    return (int)ErrorNumber.UnrecognizedFormat;
+                    return (int)opened;
                 }
 
-                AaruConsole.WriteLine("Image format identified by {0} ({1}).", imageFormat.Name, imageFormat.Id);
-                AaruConsole.WriteLine();
+                ImageInfo.PrintImageInfo(imageFormat);
 
-                try
-                {
-                    ErrorNumber opened = ErrorNumber.NoData;
-
-                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Opening image file...").IsIndeterminate();
-                        opened = imageFormat.Open(inputFilter);
-                    });
-
-                    if(opened != ErrorNumber.NoError)
-                    {
-                        AaruConsole.WriteLine("Error {opened} opening image format");
-
-                        return (int)opened;
-                    }
-
-                    ImageInfo.PrintImageInfo(imageFormat);
-
-                    Statistics.AddMediaFormat(imageFormat.Format);
-                    Statistics.AddMedia(imageFormat.Info.MediaType, false);
-                    Statistics.AddFilter(inputFilter.Name);
-                }
-                catch(Exception ex)
-                {
-                    AaruConsole.ErrorWriteLine("Unable to open image format");
-                    AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
-                    AaruConsole.DebugWriteLine("Image-info command", "Stack trace: {0}", ex.StackTrace);
-
-                    return (int)ErrorNumber.CannotOpenFormat;
-                }
+                Statistics.AddMediaFormat(imageFormat.Format);
+                Statistics.AddMedia(imageFormat.Info.MediaType, false);
+                Statistics.AddFilter(inputFilter.Name);
             }
             catch(Exception ex)
             {
-                AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
-                AaruConsole.DebugWriteLine("Image-info command", ex.StackTrace);
+                AaruConsole.ErrorWriteLine("Unable to open image format");
+                AaruConsole.ErrorWriteLine("Error: {0}", ex.Message);
+                AaruConsole.DebugWriteLine("Image-info command", "Stack trace: {0}", ex.StackTrace);
 
-                return (int)ErrorNumber.UnexpectedException;
+                return (int)ErrorNumber.CannotOpenFormat;
             }
-
-            return (int)ErrorNumber.NoError;
         }
+        catch(Exception ex)
+        {
+            AaruConsole.ErrorWriteLine($"Error reading file: {ex.Message}");
+            AaruConsole.DebugWriteLine("Image-info command", ex.StackTrace);
+
+            return (int)ErrorNumber.UnexpectedException;
+        }
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Options.cs b/Aaru/Commands/Image/Options.cs
index d733107e5..1d575445d 100644
--- a/Aaru/Commands/Image/Options.cs
+++ b/Aaru/Commands/Image/Options.cs
@@ -43,106 +43,105 @@ using Aaru.Core;
 using JetBrains.Annotations;
 using Spectre.Console;
 
-namespace Aaru.Commands.Image
+namespace Aaru.Commands.Image;
+
+internal sealed class ListOptionsCommand : Command
 {
-    internal sealed class ListOptionsCommand : Command
+    public ListOptionsCommand() : base("options", "Lists all options supported by writable media images.") =>
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+
+    public static int Invoke(bool debug, bool verbose)
     {
-        public ListOptionsCommand() : base("options", "Lists all options supported by writable media images.") =>
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        MainClass.PrintCopyright();
 
-        public static int Invoke(bool debug, bool verbose)
+        if(debug)
         {
-            MainClass.PrintCopyright();
-
-            if(debug)
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            AaruConsole.DebugWriteLine("List-Options command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("List-Options command", "--verbose={0}", verbose);
-            Statistics.AddCommand("list-options");
-
-            PluginBase plugins = GetPluginBase.Instance;
-
-            AaruConsole.WriteLine("Read/Write media images options:");
-
-            foreach(KeyValuePair<string, IBaseWritableImage> kvp in plugins.WritableImages)
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
             {
-                List<(string name, Type type, string description, object @default)> options =
-                    kvp.Value.SupportedOptions.ToList();
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
+        }
 
-                if(options.Count == 0)
-                    continue;
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
 
-                var table = new Table
-                {
-                    Title = new TableTitle($"Options for {kvp.Value.Name}:")
-                };
+        AaruConsole.DebugWriteLine("List-Options command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("List-Options command", "--verbose={0}", verbose);
+        Statistics.AddCommand("list-options");
 
-                table.AddColumn("Name");
-                table.AddColumn("Type");
-                table.AddColumn("Default");
-                table.AddColumn("Description");
+        PluginBase plugins = GetPluginBase.Instance;
 
-                foreach((string name, Type type, string description, object @default) option in
+        AaruConsole.WriteLine("Read/Write media images options:");
+
+        foreach(KeyValuePair<string, IBaseWritableImage> kvp in plugins.WritableImages)
+        {
+            List<(string name, Type type, string description, object @default)> options =
+                kvp.Value.SupportedOptions.ToList();
+
+            if(options.Count == 0)
+                continue;
+
+            var table = new Table
+            {
+                Title = new TableTitle($"Options for {kvp.Value.Name}:")
+            };
+
+            table.AddColumn("Name");
+            table.AddColumn("Type");
+            table.AddColumn("Default");
+            table.AddColumn("Description");
+
+            foreach((string name, Type type, string description, object @default) option in
                     options.OrderBy(t => t.name))
-                    table.AddRow(Markup.Escape(option.name), TypeToString(option.type),
-                                 option.@default?.ToString() ?? "", Markup.Escape(option.description));
+                table.AddRow(Markup.Escape(option.name), TypeToString(option.type),
+                             option.@default?.ToString() ?? "", Markup.Escape(option.description));
 
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
-
-            return (int)ErrorNumber.NoError;
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
         }
 
-        [NotNull]
-        static string TypeToString([NotNull] Type type)
-        {
-            if(type == typeof(bool))
-                return "boolean";
+        return (int)ErrorNumber.NoError;
+    }
 
-            if(type == typeof(sbyte) ||
-               type == typeof(short) ||
-               type == typeof(int)   ||
-               type == typeof(long))
-                return "signed number";
+    [NotNull]
+    static string TypeToString([NotNull] Type type)
+    {
+        if(type == typeof(bool))
+            return "boolean";
 
-            if(type == typeof(byte)   ||
-               type == typeof(ushort) ||
-               type == typeof(uint)   ||
-               type == typeof(ulong))
-                return "number";
+        if(type == typeof(sbyte) ||
+           type == typeof(short) ||
+           type == typeof(int)   ||
+           type == typeof(long))
+            return "signed number";
 
-            if(type == typeof(float) ||
-               type == typeof(double))
-                return "float number";
+        if(type == typeof(byte)   ||
+           type == typeof(ushort) ||
+           type == typeof(uint)   ||
+           type == typeof(ulong))
+            return "number";
 
-            if(type == typeof(Guid))
-                return "uuid";
+        if(type == typeof(float) ||
+           type == typeof(double))
+            return "float number";
 
-            return type == typeof(string) ? "string" : type.ToString();
-        }
+        if(type == typeof(Guid))
+            return "uuid";
+
+        return type == typeof(string) ? "string" : type.ToString();
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Image/Verify.cs b/Aaru/Commands/Image/Verify.cs
index f245d60a7..9346d4b88 100644
--- a/Aaru/Commands/Image/Verify.cs
+++ b/Aaru/Commands/Image/Verify.cs
@@ -42,287 +42,231 @@ using Aaru.Console;
 using Aaru.Core;
 using Spectre.Console;
 
-namespace Aaru.Commands.Image
+namespace Aaru.Commands.Image;
+
+internal sealed class VerifyCommand : Command
 {
-    internal sealed class VerifyCommand : Command
+    public VerifyCommand() : base("verify", "Verifies a disc image integrity, and if supported, sector integrity.")
     {
-        public VerifyCommand() : base("verify", "Verifies a disc image integrity, and if supported, sector integrity.")
-        {
-            Add(new Option(new[]
-                {
-                    "--verify-disc", "-w"
-                }, "Verify disc image if supported.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
-
-            Add(new Option(new[]
-                {
-                    "--verify-sectors", "-s"
-                }, "Verify all sectors if supported.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
-
-            AddArgument(new Argument<string>
+        Add(new Option(new[]
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "Disc image path",
-                Name        = "image-path"
+                "--verify-disc", "-w"
+            }, "Verify disc image if supported.")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
             });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        Add(new Option(new[]
+            {
+                "--verify-sectors", "-s"
+            }, "Verify all sectors if supported.")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
+            });
+
+        AddArgument(new Argument<string>
+        {
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "Disc image path",
+            Name        = "image-path"
+        });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, string imagePath, bool verifyDisc = true,
+                             bool verifySectors = true)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
+            {
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
+
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, string imagePath, bool verifyDisc = true,
-                                 bool verifySectors = true)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        Statistics.AddCommand("verify");
+
+        AaruConsole.DebugWriteLine("Verify command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Verify command", "--input={0}", imagePath);
+        AaruConsole.DebugWriteLine("Verify command", "--verbose={0}", verbose);
+        AaruConsole.DebugWriteLine("Verify command", "--verify-disc={0}", verifyDisc);
+        AaruConsole.DebugWriteLine("Verify command", "--verify-sectors={0}", verifySectors);
+
+        var     filtersList = new FiltersList();
+        IFilter inputFilter = null;
+
+        Core.Spectre.ProgressSingleSpinner(ctx =>
         {
-            MainClass.PrintCopyright();
+            ctx.AddTask("Identifying file filter...").IsIndeterminate();
+            inputFilter = filtersList.GetFilter(imagePath);
+        });
 
-            if(debug)
-            {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+        if(inputFilter == null)
+        {
+            AaruConsole.ErrorWriteLine("Cannot open specified file.");
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
+            return (int)ErrorNumber.CannotOpenFile;
+        }
 
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
+        IBaseImage inputFormat = null;
 
-            Statistics.AddCommand("verify");
+        Core.Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Identifying image format...").IsIndeterminate();
+            inputFormat = ImageFormat.Detect(inputFilter);
+        });
 
-            AaruConsole.DebugWriteLine("Verify command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Verify command", "--input={0}", imagePath);
-            AaruConsole.DebugWriteLine("Verify command", "--verbose={0}", verbose);
-            AaruConsole.DebugWriteLine("Verify command", "--verify-disc={0}", verifyDisc);
-            AaruConsole.DebugWriteLine("Verify command", "--verify-sectors={0}", verifySectors);
+        if(inputFormat == null)
+        {
+            AaruConsole.ErrorWriteLine("Unable to recognize image format, not verifying");
 
-            var     filtersList = new FiltersList();
-            IFilter inputFilter = null;
+            return (int)ErrorNumber.FormatNotFound;
+        }
+
+        ErrorNumber opened = ErrorNumber.NoData;
+
+        Core.Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Opening image file...").IsIndeterminate();
+            opened = inputFormat.Open(inputFilter);
+        });
+
+        if(opened != ErrorNumber.NoError)
+        {
+            AaruConsole.WriteLine("Unable to open image format");
+            AaruConsole.WriteLine("Error {0}", opened);
+
+            return (int)opened;
+        }
+
+        Statistics.AddMediaFormat(inputFormat.Format);
+        Statistics.AddMedia(inputFormat.Info.MediaType, false);
+        Statistics.AddFilter(inputFilter.Name);
+
+        bool? correctImage   = null;
+        long  errorSectors   = 0;
+        bool? correctSectors = null;
+        long  unknownSectors = 0;
+
+        var verifiableImage        = inputFormat as IVerifiableImage;
+        var verifiableSectorsImage = inputFormat as IVerifiableSectorsImage;
+
+        if(verifiableImage is null &&
+           verifiableSectorsImage is null)
+        {
+            AaruConsole.ErrorWriteLine("The specified image does not support any kind of verification");
+
+            return (int)ErrorNumber.NotVerifiable;
+        }
+
+        if(verifyDisc && verifiableImage != null)
+        {
+            bool?    discCheckStatus = null;
+            TimeSpan checkTime       = new();
 
             Core.Spectre.ProgressSingleSpinner(ctx =>
             {
-                ctx.AddTask("Identifying file filter...").IsIndeterminate();
-                inputFilter = filtersList.GetFilter(imagePath);
+                ctx.AddTask("Verifying image checksums...").IsIndeterminate();
+
+                DateTime startCheck = DateTime.UtcNow;
+                discCheckStatus = verifiableImage.VerifyMediaImage();
+                DateTime endCheck = DateTime.UtcNow;
+                checkTime = endCheck - startCheck;
             });
 
-            if(inputFilter == null)
+            switch(discCheckStatus)
             {
-                AaruConsole.ErrorWriteLine("Cannot open specified file.");
+                case true:
+                    AaruConsole.WriteLine("Disc image checksums are correct");
 
-                return (int)ErrorNumber.CannotOpenFile;
+                    break;
+                case false:
+                    AaruConsole.WriteLine("Disc image checksums are incorrect");
+
+                    break;
+                case null:
+                    AaruConsole.WriteLine("Disc image does not contain checksums");
+
+                    break;
             }
 
-            IBaseImage inputFormat = null;
+            correctImage = discCheckStatus;
+            AaruConsole.VerboseWriteLine("Checking disc image checksums took {0} seconds", checkTime.TotalSeconds);
+        }
 
-            Core.Spectre.ProgressSingleSpinner(ctx =>
+        if(verifySectors)
+        {
+            DateTime    startCheck  = DateTime.Now;
+            DateTime    endCheck    = startCheck;
+            List<ulong> failingLbas = new();
+            List<ulong> unknownLbas = new();
+
+            if(verifiableSectorsImage is IOpticalMediaImage { Tracks: {} } opticalMediaImage)
             {
-                ctx.AddTask("Identifying image format...").IsIndeterminate();
-                inputFormat = ImageFormat.Detect(inputFilter);
-            });
+                List<Track> inputTracks      = opticalMediaImage.Tracks;
+                ulong       currentSectorAll = 0;
 
-            if(inputFormat == null)
-            {
-                AaruConsole.ErrorWriteLine("Unable to recognize image format, not verifying");
+                startCheck = DateTime.UtcNow;
 
-                return (int)ErrorNumber.FormatNotFound;
-            }
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask discTask = ctx.AddTask("Checking tracks...");
+                                discTask.MaxValue = inputTracks.Count;
 
-            ErrorNumber opened = ErrorNumber.NoData;
-
-            Core.Spectre.ProgressSingleSpinner(ctx =>
-            {
-                ctx.AddTask("Opening image file...").IsIndeterminate();
-                opened = inputFormat.Open(inputFilter);
-            });
-
-            if(opened != ErrorNumber.NoError)
-            {
-                AaruConsole.WriteLine("Unable to open image format");
-                AaruConsole.WriteLine("Error {0}", opened);
-
-                return (int)opened;
-            }
-
-            Statistics.AddMediaFormat(inputFormat.Format);
-            Statistics.AddMedia(inputFormat.Info.MediaType, false);
-            Statistics.AddFilter(inputFilter.Name);
-
-            bool? correctImage   = null;
-            long  errorSectors   = 0;
-            bool? correctSectors = null;
-            long  unknownSectors = 0;
-
-            var verifiableImage        = inputFormat as IVerifiableImage;
-            var verifiableSectorsImage = inputFormat as IVerifiableSectorsImage;
-
-            if(verifiableImage is null &&
-               verifiableSectorsImage is null)
-            {
-                AaruConsole.ErrorWriteLine("The specified image does not support any kind of verification");
-
-                return (int)ErrorNumber.NotVerifiable;
-            }
-
-            if(verifyDisc && verifiableImage != null)
-            {
-                bool?    discCheckStatus = null;
-                TimeSpan checkTime       = new();
-
-                Core.Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Verifying image checksums...").IsIndeterminate();
-
-                    DateTime startCheck = DateTime.UtcNow;
-                    discCheckStatus = verifiableImage.VerifyMediaImage();
-                    DateTime endCheck = DateTime.UtcNow;
-                    checkTime = endCheck - startCheck;
-                });
-
-                switch(discCheckStatus)
-                {
-                    case true:
-                        AaruConsole.WriteLine("Disc image checksums are correct");
-
-                        break;
-                    case false:
-                        AaruConsole.WriteLine("Disc image checksums are incorrect");
-
-                        break;
-                    case null:
-                        AaruConsole.WriteLine("Disc image does not contain checksums");
-
-                        break;
-                }
-
-                correctImage = discCheckStatus;
-                AaruConsole.VerboseWriteLine("Checking disc image checksums took {0} seconds", checkTime.TotalSeconds);
-            }
-
-            if(verifySectors)
-            {
-                DateTime    startCheck  = DateTime.Now;
-                DateTime    endCheck    = startCheck;
-                List<ulong> failingLbas = new();
-                List<ulong> unknownLbas = new();
-
-                if(verifiableSectorsImage is IOpticalMediaImage { Tracks: {} } opticalMediaImage)
-                {
-                    List<Track> inputTracks      = opticalMediaImage.Tracks;
-                    ulong       currentSectorAll = 0;
-
-                    startCheck = DateTime.UtcNow;
-
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
+                                foreach(Track currentTrack in inputTracks)
                                 {
-                                    ProgressTask discTask = ctx.AddTask("Checking tracks...");
-                                    discTask.MaxValue = inputTracks.Count;
+                                    discTask.Description =
+                                        $"Checking track {discTask.Value + 1} of {inputTracks.Count}";
 
-                                    foreach(Track currentTrack in inputTracks)
-                                    {
-                                        discTask.Description =
-                                            $"Checking track {discTask.Value + 1} of {inputTracks.Count}";
+                                    ulong remainingSectors = currentTrack.EndSector - currentTrack.StartSector + 1;
 
-                                        ulong remainingSectors = currentTrack.EndSector - currentTrack.StartSector + 1;
+                                    ulong currentSector = 0;
 
-                                        ulong currentSector = 0;
-
-                                        ProgressTask trackTask = ctx.AddTask("Checking sector");
-                                        trackTask.MaxValue = remainingSectors;
-
-                                        while(remainingSectors > 0)
-                                        {
-                                            trackTask.Description =
-                                                $"Checking sector {currentSectorAll} of {inputFormat.Info.Sectors}, on track {currentTrack.Sequence}";
-
-                                            List<ulong> tempFailingLbas;
-                                            List<ulong> tempUnknownLbas;
-
-                                            if(remainingSectors < 512)
-                                                opticalMediaImage.VerifySectors(currentSector, (uint)remainingSectors,
-                                                                                    currentTrack.Sequence,
-                                                                                    out tempFailingLbas,
-                                                                                    out tempUnknownLbas);
-                                            else
-                                                opticalMediaImage.VerifySectors(currentSector, 512,
-                                                                                    currentTrack.Sequence,
-                                                                                    out tempFailingLbas,
-                                                                                    out tempUnknownLbas);
-
-                                            failingLbas.AddRange(tempFailingLbas);
-
-                                            unknownLbas.AddRange(tempUnknownLbas);
-
-                                            if(remainingSectors < 512)
-                                            {
-                                                currentSector    += remainingSectors;
-                                                currentSectorAll += remainingSectors;
-                                                trackTask.Value  += remainingSectors;
-                                                remainingSectors =  0;
-                                            }
-                                            else
-                                            {
-                                                currentSector    += 512;
-                                                currentSectorAll += 512;
-                                                trackTask.Value  += 512;
-                                                remainingSectors -= 512;
-                                            }
-                                        }
-
-                                        trackTask.StopTask();
-                                        discTask.Increment(1);
-                                    }
-
-                                    endCheck = DateTime.UtcNow;
-                                });
-                }
-                else if(verifiableSectorsImage != null)
-                {
-                    ulong remainingSectors = inputFormat.Info.Sectors;
-                    ulong currentSector    = 0;
-
-                    AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                                Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                                Start(ctx =>
-                                {
-                                    ProgressTask diskTask = ctx.AddTask("Checking sectors...");
-                                    diskTask.MaxValue = inputFormat.Info.Sectors;
-
-                                    startCheck = DateTime.UtcNow;
+                                    ProgressTask trackTask = ctx.AddTask("Checking sector");
+                                    trackTask.MaxValue = remainingSectors;
 
                                     while(remainingSectors > 0)
                                     {
-                                        diskTask.Description =
-                                            $"Checking sector {currentSector} of {inputFormat.Info.Sectors}";
+                                        trackTask.Description =
+                                            $"Checking sector {currentSectorAll} of {inputFormat.Info.Sectors}, on track {currentTrack.Sequence}";
 
                                         List<ulong> tempFailingLbas;
                                         List<ulong> tempUnknownLbas;
 
                                         if(remainingSectors < 512)
-                                            verifiableSectorsImage.VerifySectors(currentSector, (uint)remainingSectors,
-                                                out tempFailingLbas, out tempUnknownLbas);
+                                            opticalMediaImage.VerifySectors(currentSector, (uint)remainingSectors,
+                                                                            currentTrack.Sequence,
+                                                                            out tempFailingLbas,
+                                                                            out tempUnknownLbas);
                                         else
-                                            verifiableSectorsImage.VerifySectors(currentSector, 512,
-                                                out tempFailingLbas, out tempUnknownLbas);
+                                            opticalMediaImage.VerifySectors(currentSector, 512,
+                                                                            currentTrack.Sequence,
+                                                                            out tempFailingLbas,
+                                                                            out tempUnknownLbas);
 
                                         failingLbas.AddRange(tempFailingLbas);
 
@@ -331,79 +275,134 @@ namespace Aaru.Commands.Image
                                         if(remainingSectors < 512)
                                         {
                                             currentSector    += remainingSectors;
-                                            diskTask.Value   += remainingSectors;
+                                            currentSectorAll += remainingSectors;
+                                            trackTask.Value  += remainingSectors;
                                             remainingSectors =  0;
                                         }
                                         else
                                         {
                                             currentSector    += 512;
-                                            diskTask.Value   += 512;
+                                            currentSectorAll += 512;
+                                            trackTask.Value  += 512;
                                             remainingSectors -= 512;
                                         }
                                     }
 
-                                    endCheck = DateTime.UtcNow;
-                                });
-                }
+                                    trackTask.StopTask();
+                                    discTask.Increment(1);
+                                }
 
-                TimeSpan checkTime = endCheck - startCheck;
-
-                if(unknownSectors > 0)
-                    AaruConsole.WriteLine("There is at least one sector that does not contain a checksum");
-
-                if(errorSectors > 0)
-                    AaruConsole.WriteLine("There is at least one sector with incorrect checksum or errors");
-
-                if(unknownSectors == 0 &&
-                   errorSectors   == 0)
-                    AaruConsole.WriteLine("All sector checksums are correct");
-
-                AaruConsole.VerboseWriteLine("Checking sector checksums took {0} seconds", checkTime.TotalSeconds);
-
-                if(verbose)
-                {
-                    AaruConsole.VerboseWriteLine("[red]LBAs with error:[/]");
-
-                    if(failingLbas.Count == (int)inputFormat.Info.Sectors)
-                        AaruConsole.VerboseWriteLine("\t[red]all sectors.[/]");
-                    else
-                        foreach(ulong t in failingLbas)
-                            AaruConsole.VerboseWriteLine("\t{0}", t);
-
-                    AaruConsole.WriteLine("[yellow3_1]LBAs without checksum:[/]");
-
-                    if(unknownLbas.Count == (int)inputFormat.Info.Sectors)
-                        AaruConsole.VerboseWriteLine("\t[yellow3_1]all sectors.[/]");
-                    else
-                        foreach(ulong t in unknownLbas)
-                            AaruConsole.VerboseWriteLine("\t{0}", t);
-                }
-
-                AaruConsole.WriteLine("[italic]Total sectors...........[/] {0}", inputFormat.Info.Sectors);
-                AaruConsole.WriteLine("[italic]Total errors............[/] {0}", failingLbas.Count);
-                AaruConsole.WriteLine("[italic]Total unknowns..........[/] {0}", unknownLbas.Count);
-                AaruConsole.WriteLine("[italic]Total errors+unknowns...[/] {0}", failingLbas.Count + unknownLbas.Count);
-
-                if(failingLbas.Count > 0)
-                    correctSectors = false;
-                else if((ulong)unknownLbas.Count < inputFormat.Info.Sectors)
-                    correctSectors = true;
+                                endCheck = DateTime.UtcNow;
+                            });
             }
-
-            switch(correctImage)
+            else if(verifiableSectorsImage != null)
             {
-                case null when correctSectors is null:   return (int)ErrorNumber.NotVerifiable;
-                case null when correctSectors == false:  return (int)ErrorNumber.BadSectorsImageNotVerified;
-                case null when correctSectors == true:   return (int)ErrorNumber.CorrectSectorsImageNotVerified;
-                case false when correctSectors is null:  return (int)ErrorNumber.BadImageSectorsNotVerified;
-                case false when correctSectors == false: return (int)ErrorNumber.BadImageBadSectors;
-                case false when correctSectors == true:  return (int)ErrorNumber.CorrectSectorsBadImage;
-                case true when correctSectors is null:   return (int)ErrorNumber.CorrectImageSectorsNotVerified;
-                case true when correctSectors == false:  return (int)ErrorNumber.CorrectImageBadSectors;
-                case true when correctSectors == true:   return (int)ErrorNumber.NoError;
+                ulong remainingSectors = inputFormat.Info.Sectors;
+                ulong currentSector    = 0;
+
+                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                            Start(ctx =>
+                            {
+                                ProgressTask diskTask = ctx.AddTask("Checking sectors...");
+                                diskTask.MaxValue = inputFormat.Info.Sectors;
+
+                                startCheck = DateTime.UtcNow;
+
+                                while(remainingSectors > 0)
+                                {
+                                    diskTask.Description =
+                                        $"Checking sector {currentSector} of {inputFormat.Info.Sectors}";
+
+                                    List<ulong> tempFailingLbas;
+                                    List<ulong> tempUnknownLbas;
+
+                                    if(remainingSectors < 512)
+                                        verifiableSectorsImage.VerifySectors(currentSector, (uint)remainingSectors,
+                                                                             out tempFailingLbas, out tempUnknownLbas);
+                                    else
+                                        verifiableSectorsImage.VerifySectors(currentSector, 512,
+                                                                             out tempFailingLbas, out tempUnknownLbas);
+
+                                    failingLbas.AddRange(tempFailingLbas);
+
+                                    unknownLbas.AddRange(tempUnknownLbas);
+
+                                    if(remainingSectors < 512)
+                                    {
+                                        currentSector    += remainingSectors;
+                                        diskTask.Value   += remainingSectors;
+                                        remainingSectors =  0;
+                                    }
+                                    else
+                                    {
+                                        currentSector    += 512;
+                                        diskTask.Value   += 512;
+                                        remainingSectors -= 512;
+                                    }
+                                }
+
+                                endCheck = DateTime.UtcNow;
+                            });
             }
 
-            return (int)ErrorNumber.NoError;
+            TimeSpan checkTime = endCheck - startCheck;
+
+            if(unknownSectors > 0)
+                AaruConsole.WriteLine("There is at least one sector that does not contain a checksum");
+
+            if(errorSectors > 0)
+                AaruConsole.WriteLine("There is at least one sector with incorrect checksum or errors");
+
+            if(unknownSectors == 0 &&
+               errorSectors   == 0)
+                AaruConsole.WriteLine("All sector checksums are correct");
+
+            AaruConsole.VerboseWriteLine("Checking sector checksums took {0} seconds", checkTime.TotalSeconds);
+
+            if(verbose)
+            {
+                AaruConsole.VerboseWriteLine("[red]LBAs with error:[/]");
+
+                if(failingLbas.Count == (int)inputFormat.Info.Sectors)
+                    AaruConsole.VerboseWriteLine("\t[red]all sectors.[/]");
+                else
+                    foreach(ulong t in failingLbas)
+                        AaruConsole.VerboseWriteLine("\t{0}", t);
+
+                AaruConsole.WriteLine("[yellow3_1]LBAs without checksum:[/]");
+
+                if(unknownLbas.Count == (int)inputFormat.Info.Sectors)
+                    AaruConsole.VerboseWriteLine("\t[yellow3_1]all sectors.[/]");
+                else
+                    foreach(ulong t in unknownLbas)
+                        AaruConsole.VerboseWriteLine("\t{0}", t);
+            }
+
+            AaruConsole.WriteLine("[italic]Total sectors...........[/] {0}", inputFormat.Info.Sectors);
+            AaruConsole.WriteLine("[italic]Total errors............[/] {0}", failingLbas.Count);
+            AaruConsole.WriteLine("[italic]Total unknowns..........[/] {0}", unknownLbas.Count);
+            AaruConsole.WriteLine("[italic]Total errors+unknowns...[/] {0}", failingLbas.Count + unknownLbas.Count);
+
+            if(failingLbas.Count > 0)
+                correctSectors = false;
+            else if((ulong)unknownLbas.Count < inputFormat.Info.Sectors)
+                correctSectors = true;
         }
+
+        switch(correctImage)
+        {
+            case null when correctSectors is null:   return (int)ErrorNumber.NotVerifiable;
+            case null when correctSectors == false:  return (int)ErrorNumber.BadSectorsImageNotVerified;
+            case null when correctSectors == true:   return (int)ErrorNumber.CorrectSectorsImageNotVerified;
+            case false when correctSectors is null:  return (int)ErrorNumber.BadImageSectorsNotVerified;
+            case false when correctSectors == false: return (int)ErrorNumber.BadImageBadSectors;
+            case false when correctSectors == true:  return (int)ErrorNumber.CorrectSectorsBadImage;
+            case true when correctSectors is null:   return (int)ErrorNumber.CorrectImageSectorsNotVerified;
+            case true when correctSectors == false:  return (int)ErrorNumber.CorrectImageBadSectors;
+            case true when correctSectors == true:   return (int)ErrorNumber.NoError;
+        }
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/ListEncodings.cs b/Aaru/Commands/ListEncodings.cs
index d3557b0b2..eb8e46ebc 100644
--- a/Aaru/Commands/ListEncodings.cs
+++ b/Aaru/Commands/ListEncodings.cs
@@ -40,75 +40,74 @@ using Aaru.Console;
 using Aaru.Core;
 using Spectre.Console;
 
-namespace Aaru.Commands
+namespace Aaru.Commands;
+
+internal sealed class ListEncodingsCommand : Command
 {
-    internal sealed class ListEncodingsCommand : Command
+    public ListEncodingsCommand() : base("list-encodings", "Lists all supported text encodings and code pages.") =>
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+
+    public static int Invoke(bool debug, bool verbose)
     {
-        public ListEncodingsCommand() : base("list-encodings", "Lists all supported text encodings and code pages.") =>
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        MainClass.PrintCopyright();
 
-        public static int Invoke(bool debug, bool verbose)
+        if(debug)
         {
-            MainClass.PrintCopyright();
-
-            if(debug)
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            Statistics.AddCommand("list-encodings");
-
-            AaruConsole.DebugWriteLine("List-Encodings command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("List-Encodings command", "--verbose={0}", verbose);
-
-            List<CommonEncodingInfo> encodings = Encoding.GetEncodings().Select(info => new CommonEncodingInfo
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
             {
-                Name        = info.Name,
-                DisplayName = info.GetEncoding().EncodingName
-            }).ToList();
-
-            encodings.AddRange(Claunia.Encoding.Encoding.GetEncodings().Select(info => new CommonEncodingInfo
-            {
-                Name        = info.Name,
-                DisplayName = info.DisplayName
-            }));
-
-            Table table = new();
-            table.AddColumn("Name");
-            table.AddColumn("Description");
-
-            foreach(CommonEncodingInfo info in encodings.OrderBy(t => t.DisplayName))
-                table.AddRow(info.Name, info.DisplayName);
-
-            AnsiConsole.Render(table);
-
-            return (int)ErrorNumber.NoError;
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        struct CommonEncodingInfo
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        Statistics.AddCommand("list-encodings");
+
+        AaruConsole.DebugWriteLine("List-Encodings command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("List-Encodings command", "--verbose={0}", verbose);
+
+        List<CommonEncodingInfo> encodings = Encoding.GetEncodings().Select(info => new CommonEncodingInfo
         {
-            public string Name;
-            public string DisplayName;
-        }
+            Name        = info.Name,
+            DisplayName = info.GetEncoding().EncodingName
+        }).ToList();
+
+        encodings.AddRange(Claunia.Encoding.Encoding.GetEncodings().Select(info => new CommonEncodingInfo
+        {
+            Name        = info.Name,
+            DisplayName = info.DisplayName
+        }));
+
+        Table table = new();
+        table.AddColumn("Name");
+        table.AddColumn("Description");
+
+        foreach(CommonEncodingInfo info in encodings.OrderBy(t => t.DisplayName))
+            table.AddRow(info.Name, info.DisplayName);
+
+        AnsiConsole.Render(table);
+
+        return (int)ErrorNumber.NoError;
+    }
+
+    struct CommonEncodingInfo
+    {
+        public string Name;
+        public string DisplayName;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/ListNamespaces.cs b/Aaru/Commands/ListNamespaces.cs
index 432fced18..6dfb348f3 100644
--- a/Aaru/Commands/ListNamespaces.cs
+++ b/Aaru/Commands/ListNamespaces.cs
@@ -41,68 +41,67 @@ using Aaru.Console;
 using Aaru.Core;
 using Spectre.Console;
 
-namespace Aaru.Commands
+namespace Aaru.Commands;
+
+internal sealed class ListNamespacesCommand : Command
 {
-    internal sealed class ListNamespacesCommand : Command
+    public ListNamespacesCommand() : base("list-namespaces",
+                                          "Lists all namespaces supported by read-only filesystems.") =>
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+
+    public static int Invoke(bool debug, bool verbose)
     {
-        public ListNamespacesCommand() : base("list-namespaces",
-                                              "Lists all namespaces supported by read-only filesystems.") =>
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        MainClass.PrintCopyright();
 
-        public static int Invoke(bool debug, bool verbose)
+        if(debug)
         {
-            MainClass.PrintCopyright();
-
-            if(debug)
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
-
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            AaruConsole.DebugWriteLine("List-Namespaces command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("List-Namespaces command", "--verbose={0}", verbose);
-            Statistics.AddCommand("list-namespaces");
-
-            PluginBase plugins = GetPluginBase.Instance;
-
-            foreach(KeyValuePair<string, IReadOnlyFilesystem> kvp in
-                plugins.ReadOnlyFilesystems.Where(kvp => !(kvp.Value.Namespaces is null)))
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
             {
-                Table table = new()
-                {
-                    Title = new TableTitle($"Namespaces for {kvp.Value.Name}:")
-                };
-
-                table.AddColumn("Namespace");
-                table.AddColumn("Description");
-
-                foreach(KeyValuePair<string, string> @namespace in kvp.Value.Namespaces.OrderBy(t => t.Key))
-                    table.AddRow(@namespace.Key, @namespace.Value);
-
-                AnsiConsole.Render(table);
-                AaruConsole.WriteLine();
-            }
-
-            return (int)ErrorNumber.NoError;
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
+
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        AaruConsole.DebugWriteLine("List-Namespaces command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("List-Namespaces command", "--verbose={0}", verbose);
+        Statistics.AddCommand("list-namespaces");
+
+        PluginBase plugins = GetPluginBase.Instance;
+
+        foreach(KeyValuePair<string, IReadOnlyFilesystem> kvp in
+                plugins.ReadOnlyFilesystems.Where(kvp => !(kvp.Value.Namespaces is null)))
+        {
+            Table table = new()
+            {
+                Title = new TableTitle($"Namespaces for {kvp.Value.Name}:")
+            };
+
+            table.AddColumn("Namespace");
+            table.AddColumn("Description");
+
+            foreach(KeyValuePair<string, string> @namespace in kvp.Value.Namespaces.OrderBy(t => t.Key))
+                table.AddRow(@namespace.Key, @namespace.Value);
+
+            AnsiConsole.Render(table);
+            AaruConsole.WriteLine();
+        }
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Media/Dump.cs b/Aaru/Commands/Media/Dump.cs
index 56ace2a2f..ffc2ae9bf 100644
--- a/Aaru/Commands/Media/Dump.cs
+++ b/Aaru/Commands/Media/Dump.cs
@@ -54,426 +54,602 @@ using Aaru.Devices;
 using Schemas;
 using Spectre.Console;
 
-namespace Aaru.Commands.Media
+namespace Aaru.Commands.Media;
+
+// TODO: Add raw dumping
+internal sealed class DumpMediaCommand : Command
 {
-    // TODO: Add raw dumping
-    internal sealed class DumpMediaCommand : Command
+    static ProgressTask _progressTask1;
+    static ProgressTask _progressTask2;
+
+    public DumpMediaCommand() : base("dump", "Dumps the media inserted on a device to a media image.")
     {
-        static ProgressTask _progressTask1;
-        static ProgressTask _progressTask2;
-
-        public DumpMediaCommand() : base("dump", "Dumps the media inserted on a device to a media image.")
-        {
-            Add(new Option(new[]
-                {
-                    "--cicm-xml", "-x"
-                }, "Take metadata from existing CICM XML sidecar.")
-                {
-                    Argument = new Argument<string>(() => null),
-                    Required = false
-                });
-
-            Add(new Option(new[]
-                {
-                    "--encoding", "-e"
-                }, "Name of character encoding to use.")
-                {
-                    Argument = new Argument<string>(() => null),
-                    Required = false
-                });
-
-            Add(new Option("--first-pregap", "Try to read first track pregap. Only applicable to CD/DDCD/GD.")
+        Add(new Option(new[]
             {
-                Argument = new Argument<bool>(() => false),
-                Required = false
-            });
-
-            Add(new Option("--fix-offset", "Fix audio tracks offset. Only applicable to CD/GD.")
-            {
-                Argument = new Argument<bool>(() => true),
-                Required = false
-            });
-
-            Add(new Option(new[]
-                {
-                    "--force", "-f"
-                }, "Continue dump whatever happens.")
-                {
-                    Argument = new Argument<bool>(() => false),
-                    Required = false
-                });
-
-            Add(new Option(new[]
-                           {
-                               "--format", "-t"
-                           },
-                           "Format of the output image, as plugin name or plugin id. If not present, will try to detect it from output image extension.")
+                "--cicm-xml", "-x"
+            }, "Take metadata from existing CICM XML sidecar.")
             {
                 Argument = new Argument<string>(() => null),
                 Required = false
             });
 
-            Add(new Option("--metadata", "Enables creating CICM XML sidecar.")
+        Add(new Option(new[]
             {
-                Argument = new Argument<bool>(() => true),
+                "--encoding", "-e"
+            }, "Name of character encoding to use.")
+            {
+                Argument = new Argument<string>(() => null),
                 Required = false
             });
 
-            Add(new Option("--trim", "Enables trimming errored from skipped sectors.")
+        Add(new Option("--first-pregap", "Try to read first track pregap. Only applicable to CD/DDCD/GD.")
+        {
+            Argument = new Argument<bool>(() => false),
+            Required = false
+        });
+
+        Add(new Option("--fix-offset", "Fix audio tracks offset. Only applicable to CD/GD.")
+        {
+            Argument = new Argument<bool>(() => true),
+            Required = false
+        });
+
+        Add(new Option(new[]
             {
-                Argument = new Argument<bool>(() => true),
-                Required = false
-            });
-
-            Add(new Option(new[]
-                {
-                    "--options", "-O"
-                }, "Comma separated name=value pairs of options to pass to output image plugin.")
-                {
-                    Argument = new Argument<string>(() => null),
-                    Required = false
-                });
-
-            Add(new Option("--persistent", "Try to recover partial or incorrect data.")
+                "--force", "-f"
+            }, "Continue dump whatever happens.")
             {
                 Argument = new Argument<bool>(() => false),
                 Required = false
             });
 
-            Add(new Option(new[]
-                {
-                    "--resume", "-r"
-                }, "Create/use resume mapfile.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
+        Add(new Option(new[]
+                       {
+                           "--format", "-t"
+                       },
+                       "Format of the output image, as plugin name or plugin id. If not present, will try to detect it from output image extension.")
+        {
+            Argument = new Argument<string>(() => null),
+            Required = false
+        });
 
-            Add(new Option(new[]
-                {
-                    "--retry-passes", "-p"
-                }, "How many retry passes to do.")
-                {
-                    Argument = new Argument<ushort>(() => 5),
-                    Required = false
-                });
+        Add(new Option("--metadata", "Enables creating CICM XML sidecar.")
+        {
+            Argument = new Argument<bool>(() => true),
+            Required = false
+        });
 
-            Add(new Option(new[]
-                {
-                    "--skip", "-k"
-                }, "When an unreadable sector is found skip this many sectors.")
-                {
-                    Argument = new Argument<uint>(() => 512),
-                    Required = false
-                });
+        Add(new Option("--trim", "Enables trimming errored from skipped sectors.")
+        {
+            Argument = new Argument<bool>(() => true),
+            Required = false
+        });
 
-            Add(new Option(new[]
-                {
-                    "--stop-on-error", "-s"
-                }, "Stop media dump on first error.")
-                {
-                    Argument = new Argument<bool>(() => false),
-                    Required = false
-                });
-
-            Add(new Option("--subchannel",
-                           "Subchannel to dump. Only applicable to CD/GD. Values: any, rw, rw-or-pq, pq, none.")
+        Add(new Option(new[]
             {
-                Argument = new Argument<string>(() => "any"),
+                "--options", "-O"
+            }, "Comma separated name=value pairs of options to pass to output image plugin.")
+            {
+                Argument = new Argument<string>(() => null),
                 Required = false
             });
 
-            Add(new Option("--speed", "Speed to dump. Only applicable to optical drives, 0 for maximum.")
+        Add(new Option("--persistent", "Try to recover partial or incorrect data.")
+        {
+            Argument = new Argument<bool>(() => false),
+            Required = false
+        });
+
+        Add(new Option(new[]
             {
-                Argument = new Argument<byte>(() => 0),
+                "--resume", "-r"
+            }, "Create/use resume mapfile.")
+            {
+                Argument = new Argument<bool>(() => true),
                 Required = false
             });
 
-            AddArgument(new Argument<string>
+        Add(new Option(new[]
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "Device path",
-                Name        = "device-path"
+                "--retry-passes", "-p"
+            }, "How many retry passes to do.")
+            {
+                Argument = new Argument<ushort>(() => 5),
+                Required = false
             });
 
-            AddArgument(new Argument<string>
+        Add(new Option(new[]
             {
-                Arity = ArgumentArity.ExactlyOne,
-                Description =
-                    "Output image path. If filename starts with # and exists, it will be read as a list of output images, its extension will be used to detect the image output format, each media will be ejected and confirmation for the next one will be asked.",
-                Name = "output-path"
+                "--skip", "-k"
+            }, "When an unreadable sector is found skip this many sectors.")
+            {
+                Argument = new Argument<uint>(() => 512),
+                Required = false
             });
 
-            Add(new Option(new[]
-                {
-                    "--private"
-                }, "Do not store paths and serial numbers in log or metadata.")
-                {
-                    Argument = new Argument<bool>(() => false),
-                    Required = false
-                });
+        Add(new Option(new[]
+            {
+                "--stop-on-error", "-s"
+            }, "Stop media dump on first error.")
+            {
+                Argument = new Argument<bool>(() => false),
+                Required = false
+            });
 
-            Add(new Option(new[]
-                {
-                    "--fix-subchannel-position"
-                }, "Store subchannel according to the sector they describe.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
+        Add(new Option("--subchannel",
+                       "Subchannel to dump. Only applicable to CD/GD. Values: any, rw, rw-or-pq, pq, none.")
+        {
+            Argument = new Argument<string>(() => "any"),
+            Required = false
+        });
 
-            Add(new Option(new[]
-                {
-                    "--retry-subchannel"
-                }, "Retry subchannel. Implies fixing subchannel position.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
+        Add(new Option("--speed", "Speed to dump. Only applicable to optical drives, 0 for maximum.")
+        {
+            Argument = new Argument<byte>(() => 0),
+            Required = false
+        });
 
-            Add(new Option(new[]
-                {
-                    "--fix-subchannel"
-                }, "Try to fix subchannel. Implies fixing subchannel position.")
-                {
-                    Argument = new Argument<bool>(() => false),
-                    Required = false
-                });
+        AddArgument(new Argument<string>
+        {
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "Device path",
+            Name        = "device-path"
+        });
 
-            Add(new Option(new[]
-                {
-                    "--fix-subchannel-crc"
-                }, "If subchannel looks OK but CRC fails, rewrite it. Implies fixing subchannel.")
-                {
-                    Argument = new Argument<bool>(() => false),
-                    Required = false
-                });
+        AddArgument(new Argument<string>
+        {
+            Arity = ArgumentArity.ExactlyOne,
+            Description =
+                "Output image path. If filename starts with # and exists, it will be read as a list of output images, its extension will be used to detect the image output format, each media will be ejected and confirmation for the next one will be asked.",
+            Name = "output-path"
+        });
 
-            Add(new Option(new[]
-                {
-                    "--generate-subchannels"
-                }, "Generates missing subchannels (they don't count as dumped in resume file).")
-                {
-                    Argument = new Argument<bool>(() => false),
-                    Required = false
-                });
+        Add(new Option(new[]
+            {
+                "--private"
+            }, "Do not store paths and serial numbers in log or metadata.")
+            {
+                Argument = new Argument<bool>(() => false),
+                Required = false
+            });
 
-            Add(new Option(new[]
-                {
-                    "--skip-cdiready-hole"
-                }, "Skip the hole between data and audio in a CD-i Ready disc.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
+        Add(new Option(new[]
+            {
+                "--fix-subchannel-position"
+            }, "Store subchannel according to the sector they describe.")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
+            });
 
-            Add(new Option(new[]
-                {
-                    "--eject"
-                }, "Eject media after dump finishes.")
-                {
-                    Argument = new Argument<bool>(() => false),
-                    Required = false
-                });
+        Add(new Option(new[]
+            {
+                "--retry-subchannel"
+            }, "Retry subchannel. Implies fixing subchannel position.")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
+            });
 
-            Add(new Option(new[]
-                {
-                    "--max-blocks"
-                }, "Maximum number of blocks to read at once.")
-                {
-                    Argument = new Argument<uint>(() => 64),
-                    Required = false
-                });
+        Add(new Option(new[]
+            {
+                "--fix-subchannel"
+            }, "Try to fix subchannel. Implies fixing subchannel position.")
+            {
+                Argument = new Argument<bool>(() => false),
+                Required = false
+            });
 
-            Add(new Option(new[]
-                {
-                    "--use-buffered-reads"
-                }, "For MMC/SD, use OS buffered reads if CMD23 is not supported.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
+        Add(new Option(new[]
+            {
+                "--fix-subchannel-crc"
+            }, "If subchannel looks OK but CRC fails, rewrite it. Implies fixing subchannel.")
+            {
+                Argument = new Argument<bool>(() => false),
+                Required = false
+            });
 
-            Add(new Option(new[]
-                {
-                    "--store-encrypted"
-                }, "Store encrypted data as is.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
+        Add(new Option(new[]
+            {
+                "--generate-subchannels"
+            }, "Generates missing subchannels (they don't count as dumped in resume file).")
+            {
+                Argument = new Argument<bool>(() => false),
+                Required = false
+            });
 
-            Add(new Option(new[]
-                {
-                    "--title-keys"
-                }, "Try to read the title keys from CSS encrypted DVDs (very slow).")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
+        Add(new Option(new[]
+            {
+                "--skip-cdiready-hole"
+            }, "Skip the hole between data and audio in a CD-i Ready disc.")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
+            });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        Add(new Option(new[]
+            {
+                "--eject"
+            }, "Eject media after dump finishes.")
+            {
+                Argument = new Argument<bool>(() => false),
+                Required = false
+            });
+
+        Add(new Option(new[]
+            {
+                "--max-blocks"
+            }, "Maximum number of blocks to read at once.")
+            {
+                Argument = new Argument<uint>(() => 64),
+                Required = false
+            });
+
+        Add(new Option(new[]
+            {
+                "--use-buffered-reads"
+            }, "For MMC/SD, use OS buffered reads if CMD23 is not supported.")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
+            });
+
+        Add(new Option(new[]
+            {
+                "--store-encrypted"
+            }, "Store encrypted data as is.")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
+            });
+
+        Add(new Option(new[]
+            {
+                "--title-keys"
+            }, "Try to read the title keys from CSS encrypted DVDs (very slow).")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
+            });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, string cicmXml, string devicePath, bool resume,
+                             string encoding, bool firstPregap, bool fixOffset, bool force, bool metadata,
+                             bool trim, string outputPath, string options, bool persistent, ushort retryPasses,
+                             uint skip, byte speed, bool stopOnError, string format, string subchannel,
+                             bool @private, bool fixSubchannelPosition, bool retrySubchannel, bool fixSubchannel,
+                             bool fixSubchannelCrc, bool generateSubchannels, bool skipCdiReadyHole, bool eject,
+                             uint maxBlocks, bool useBufferedReads, bool storeEncrypted, bool titleKeys)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
+            {
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
+
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, string cicmXml, string devicePath, bool resume,
-                                 string encoding, bool firstPregap, bool fixOffset, bool force, bool metadata,
-                                 bool trim, string outputPath, string options, bool persistent, ushort retryPasses,
-                                 uint skip, byte speed, bool stopOnError, string format, string subchannel,
-                                 bool @private, bool fixSubchannelPosition, bool retrySubchannel, bool fixSubchannel,
-                                 bool fixSubchannelCrc, bool generateSubchannels, bool skipCdiReadyHole, bool eject,
-                                 uint maxBlocks, bool useBufferedReads, bool storeEncrypted, bool titleKeys)
-        {
-            MainClass.PrintCopyright();
-
-            if(debug)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        if(fixSubchannelCrc)
+            fixSubchannel = true;
+
+        if(retrySubchannel || fixSubchannel)
+            fixSubchannelPosition = true;
+
+        if(maxBlocks == 0)
+            maxBlocks = 64;
+
+        Statistics.AddCommand("dump-media");
+
+        AaruConsole.DebugWriteLine("Dump-Media command", "--cicm-xml={0}", cicmXml);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--device={0}", devicePath);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--encoding={0}", encoding);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--first-pregap={0}", firstPregap);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--fix-offset={0}", fixOffset);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--force={0}", force);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--format={0}", format);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--metadata={0}", metadata);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--options={0}", options);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--output={0}", outputPath);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--persistent={0}", persistent);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--resume={0}", resume);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--retry-passes={0}", retryPasses);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--skip={0}", skip);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--stop-on-error={0}", stopOnError);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--trim={0}", trim);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--verbose={0}", verbose);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--subchannel={0}", subchannel);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--private={0}", @private);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--fix-subchannel-position={0}", fixSubchannelPosition);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--retry-subchannel={0}", retrySubchannel);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--fix-subchannel={0}", fixSubchannel);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--fix-subchannel-crc={0}", fixSubchannelCrc);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--generate-subchannels={0}", generateSubchannels);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--skip-cdiready-hole={0}", skipCdiReadyHole);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--eject={0}", eject);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--max-blocks={0}", maxBlocks);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--use-buffered-reads={0}", useBufferedReads);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--store-encrypted={0}", storeEncrypted);
+        AaruConsole.DebugWriteLine("Dump-Media command", "--title-keys={0}", titleKeys);
+
+        // TODO: Disabled temporarily
+        //AaruConsole.DebugWriteLine("Dump-Media command", "--raw={0}",           raw);
+
+        Dictionary<string, string> parsedOptions = Core.Options.Parse(options);
+        AaruConsole.DebugWriteLine("Dump-Media command", "Parsed options:");
+
+        foreach(KeyValuePair<string, string> parsedOption in parsedOptions)
+            AaruConsole.DebugWriteLine("Dump-Media command", "{0} = {1}", parsedOption.Key, parsedOption.Value);
+
+        Encoding encodingClass = null;
+
+        if(encoding != null)
+            try
+            {
+                encodingClass = Claunia.Encoding.Encoding.GetEncoding(encoding);
+
+                if(verbose)
+                    AaruConsole.VerboseWriteLine("Using encoding for {0}.", encodingClass.EncodingName);
+            }
+            catch(ArgumentException)
+            {
+                AaruConsole.ErrorWriteLine("Specified encoding is not supported.");
+
+                return (int)ErrorNumber.EncodingUnknown;
+            }
+
+        DumpSubchannel wantedSubchannel = DumpSubchannel.Any;
+
+        switch(subchannel?.ToLowerInvariant())
+        {
+            case "any":
+            case null:
+                wantedSubchannel = DumpSubchannel.Any;
+
+                break;
+            case "rw":
+                wantedSubchannel = DumpSubchannel.Rw;
+
+                break;
+            case "rw-or-pq":
+                wantedSubchannel = DumpSubchannel.RwOrPq;
+
+                break;
+            case "pq":
+                wantedSubchannel = DumpSubchannel.Pq;
+
+                break;
+            case "none":
+                wantedSubchannel = DumpSubchannel.None;
+
+                break;
+            default:
+                AaruConsole.WriteLine("Incorrect subchannel type \"{0}\" requested.", subchannel);
+
+                break;
+        }
+
+        string filename = Path.GetFileNameWithoutExtension(outputPath);
+
+        bool isResponse = filename.StartsWith("#", StringComparison.OrdinalIgnoreCase) &&
+                          File.Exists(Path.Combine(Path.GetDirectoryName(outputPath),
+                                                   Path.GetFileNameWithoutExtension(outputPath)));
+
+        TextReader resReader;
+
+        if(isResponse)
+            resReader = new StreamReader(Path.Combine(Path.GetDirectoryName(outputPath),
+                                                      Path.GetFileNameWithoutExtension(outputPath)));
+        else
+            resReader = new StringReader(Path.GetFileNameWithoutExtension(outputPath));
+
+        if(isResponse)
+            eject = true;
+
+        PluginBase               plugins    = GetPluginBase.Instance;
+        List<IBaseWritableImage> candidates = new();
+        string                   extension  = Path.GetExtension(outputPath);
+
+        // Try extension
+        if(string.IsNullOrEmpty(format))
+            candidates.AddRange(plugins.WritableImages.Values.Where(t => t.KnownExtensions.Contains(extension)));
+
+        // Try Id
+        else if(Guid.TryParse(format, out Guid outId))
+            candidates.AddRange(plugins.WritableImages.Values.Where(t => t.Id.Equals(outId)));
+
+        // Try name
+        else
+            candidates.AddRange(plugins.WritableImages.Values.Where(t => string.Equals(t.Name, format,
+                                                                        StringComparison.
+                                                                            InvariantCultureIgnoreCase)));
+
+        if(candidates.Count == 0)
+        {
+            AaruConsole.WriteLine("No plugin supports requested extension.");
+
+            return (int)ErrorNumber.FormatNotFound;
+        }
+
+        if(candidates.Count > 1)
+        {
+            AaruConsole.WriteLine("More than one plugin supports requested extension.");
+
+            return (int)ErrorNumber.TooManyFormats;
+        }
+
+        while(true)
+        {
+            string responseLine = resReader.ReadLine();
+
+            if(responseLine is null)
+                break;
+
+            if(responseLine.Any(c => c < 0x20))
+            {
+                AaruConsole.ErrorWriteLine("Invalid characters found in list of files, exiting...");
+
+                return (int)ErrorNumber.InvalidArgument;
+            }
+
+            if(isResponse)
+            {
+                AaruConsole.WriteLine("Please insert media with title {0} and press any key to continue...",
+                                      responseLine);
+
+                System.Console.ReadKey();
+                Thread.Sleep(1000);
+            }
+
+            responseLine = responseLine.Replace('/', '／');
+
+            // Replace Windows forbidden filename characters with Japanese equivalents that are visually the same, but bigger.
+            if(DetectOS.IsWindows)
+                responseLine = responseLine.Replace('<', '\uFF1C').Replace('>', '\uFF1E').Replace(':', '\uFF1A').
+                                            Replace('"', '\u2033').Replace('\\', '＼').Replace('|', '｜').
+                                            Replace('?', '？').Replace('*', '＊');
+
+            if(devicePath.Length == 2   &&
+               devicePath[1]     == ':' &&
+               devicePath[0]     != '/' &&
+               char.IsLetter(devicePath[0]))
+                devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
+
+            Devices.Device dev = null;
+
+            try
+            {
+                Core.Spectre.ProgressSingleSpinner(ctx =>
                 {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
+                    ctx.AddTask("Opening device...").IsIndeterminate();
+                    dev = new Devices.Device(devicePath);
                 });
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
+                if(dev.IsRemote)
+                    Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
+                                         dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
+
+                if(dev.Error)
                 {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
+                    AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
+
+                    if(isResponse)
+                        continue;
+
+                    return (int)ErrorNumber.CannotOpenDevice;
+                }
+            }
+            catch(DeviceException e)
+            {
+                AaruConsole.ErrorWriteLine(e.Message ?? Error.Print(e.LastError));
+
+                if(isResponse)
+                    continue;
+
+                return (int)ErrorNumber.CannotOpenDevice;
             }
 
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
+            Statistics.AddDevice(dev);
 
-            if(fixSubchannelCrc)
-                fixSubchannel = true;
+            string outputPrefix = Path.Combine(Path.GetDirectoryName(outputPath), responseLine);
 
-            if(retrySubchannel || fixSubchannel)
-                fixSubchannelPosition = true;
+            Resume resumeClass = null;
+            var    xs          = new XmlSerializer(typeof(Resume));
 
-            if(maxBlocks == 0)
-                maxBlocks = 64;
-
-            Statistics.AddCommand("dump-media");
-
-            AaruConsole.DebugWriteLine("Dump-Media command", "--cicm-xml={0}", cicmXml);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--device={0}", devicePath);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--encoding={0}", encoding);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--first-pregap={0}", firstPregap);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--fix-offset={0}", fixOffset);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--force={0}", force);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--format={0}", format);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--metadata={0}", metadata);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--options={0}", options);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--output={0}", outputPath);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--persistent={0}", persistent);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--resume={0}", resume);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--retry-passes={0}", retryPasses);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--skip={0}", skip);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--stop-on-error={0}", stopOnError);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--trim={0}", trim);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--verbose={0}", verbose);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--subchannel={0}", subchannel);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--private={0}", @private);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--fix-subchannel-position={0}", fixSubchannelPosition);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--retry-subchannel={0}", retrySubchannel);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--fix-subchannel={0}", fixSubchannel);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--fix-subchannel-crc={0}", fixSubchannelCrc);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--generate-subchannels={0}", generateSubchannels);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--skip-cdiready-hole={0}", skipCdiReadyHole);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--eject={0}", eject);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--max-blocks={0}", maxBlocks);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--use-buffered-reads={0}", useBufferedReads);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--store-encrypted={0}", storeEncrypted);
-            AaruConsole.DebugWriteLine("Dump-Media command", "--title-keys={0}", titleKeys);
-
-            // TODO: Disabled temporarily
-            //AaruConsole.DebugWriteLine("Dump-Media command", "--raw={0}",           raw);
-
-            Dictionary<string, string> parsedOptions = Core.Options.Parse(options);
-            AaruConsole.DebugWriteLine("Dump-Media command", "Parsed options:");
-
-            foreach(KeyValuePair<string, string> parsedOption in parsedOptions)
-                AaruConsole.DebugWriteLine("Dump-Media command", "{0} = {1}", parsedOption.Key, parsedOption.Value);
-
-            Encoding encodingClass = null;
-
-            if(encoding != null)
+            if(File.Exists(outputPrefix + ".resume.xml") && resume)
                 try
                 {
-                    encodingClass = Claunia.Encoding.Encoding.GetEncoding(encoding);
-
-                    if(verbose)
-                        AaruConsole.VerboseWriteLine("Using encoding for {0}.", encodingClass.EncodingName);
+                    var sr = new StreamReader(outputPrefix + ".resume.xml");
+                    resumeClass = (Resume)xs.Deserialize(sr);
+                    sr.Close();
                 }
-                catch(ArgumentException)
+                catch
                 {
-                    AaruConsole.ErrorWriteLine("Specified encoding is not supported.");
+                    AaruConsole.ErrorWriteLine("Incorrect resume file, not continuing...");
 
-                    return (int)ErrorNumber.EncodingUnknown;
+                    if(isResponse)
+                        continue;
+
+                    return (int)ErrorNumber.InvalidResume;
                 }
 
-            DumpSubchannel wantedSubchannel = DumpSubchannel.Any;
-
-            switch(subchannel?.ToLowerInvariant())
+            if(resumeClass                 != null                                               &&
+               resumeClass.NextBlock       > resumeClass.LastBlock                               &&
+               resumeClass.BadBlocks.Count == 0                                                  &&
+               !resumeClass.Tape                                                                 &&
+               (resumeClass.BadSubchannels is null   || resumeClass.BadSubchannels.Count   == 0) &&
+               (resumeClass.MissingTitleKeys is null || resumeClass.MissingTitleKeys.Count == 0))
             {
-                case "any":
-                case null:
-                    wantedSubchannel = DumpSubchannel.Any;
+                AaruConsole.WriteLine("Media already dumped correctly, not continuing...");
 
-                    break;
-                case "rw":
-                    wantedSubchannel = DumpSubchannel.Rw;
+                if(isResponse)
+                    continue;
 
-                    break;
-                case "rw-or-pq":
-                    wantedSubchannel = DumpSubchannel.RwOrPq;
-
-                    break;
-                case "pq":
-                    wantedSubchannel = DumpSubchannel.Pq;
-
-                    break;
-                case "none":
-                    wantedSubchannel = DumpSubchannel.None;
-
-                    break;
-                default:
-                    AaruConsole.WriteLine("Incorrect subchannel type \"{0}\" requested.", subchannel);
-
-                    break;
+                return (int)ErrorNumber.AlreadyDumped;
             }
 
-            string filename = Path.GetFileNameWithoutExtension(outputPath);
+            CICMMetadataType sidecar   = null;
+            var              sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
 
-            bool isResponse = filename.StartsWith("#", StringComparison.OrdinalIgnoreCase) &&
-                              File.Exists(Path.Combine(Path.GetDirectoryName(outputPath),
-                                                       Path.GetFileNameWithoutExtension(outputPath)));
+            if(cicmXml != null)
+                if(File.Exists(cicmXml))
+                {
+                    try
+                    {
+                        var sr = new StreamReader(cicmXml);
+                        sidecar = (CICMMetadataType)sidecarXs.Deserialize(sr);
+                        sr.Close();
+                    }
+                    catch
+                    {
+                        AaruConsole.ErrorWriteLine("Incorrect metadata sidecar file, not continuing...");
 
-            TextReader resReader;
+                        if(isResponse)
+                            continue;
 
-            if(isResponse)
-                resReader = new StreamReader(Path.Combine(Path.GetDirectoryName(outputPath),
-                                                          Path.GetFileNameWithoutExtension(outputPath)));
-            else
-                resReader = new StringReader(Path.GetFileNameWithoutExtension(outputPath));
+                        return (int)ErrorNumber.InvalidSidecar;
+                    }
+                }
+                else
+                {
+                    AaruConsole.ErrorWriteLine("Could not find metadata sidecar, not continuing...");
 
-            if(isResponse)
-                eject = true;
+                    if(isResponse)
+                        continue;
 
-            PluginBase               plugins    = GetPluginBase.Instance;
-            List<IBaseWritableImage> candidates = new();
-            string                   extension  = Path.GetExtension(outputPath);
+                    return (int)ErrorNumber.NoSuchFile;
+                }
+
+            plugins    = GetPluginBase.Instance;
+            candidates = new List<IBaseWritableImage>();
 
             // Try extension
             if(string.IsNullOrEmpty(format))
-                candidates.AddRange(plugins.WritableImages.Values.Where(t => t.KnownExtensions.Contains(extension)));
+                candidates.AddRange(plugins.WritableImages.Values.Where(t =>
+                                                                            t.KnownExtensions.
+                                                                              Contains(Path.
+                                                                                  GetExtension(outputPath))));
 
             // Try Id
             else if(Guid.TryParse(format, out Guid outId))
@@ -485,332 +661,155 @@ namespace Aaru.Commands.Media
                                                                             StringComparison.
                                                                                 InvariantCultureIgnoreCase)));
 
-            if(candidates.Count == 0)
-            {
-                AaruConsole.WriteLine("No plugin supports requested extension.");
+            IBaseWritableImage outputFormat = candidates[0];
 
-                return (int)ErrorNumber.FormatNotFound;
+            var dumpLog = new DumpLog(outputPrefix + ".log", dev, @private);
+
+            if(verbose)
+            {
+                dumpLog.WriteLine("Output image format: {0} ({1}).", outputFormat.Name, outputFormat.Id);
+                AaruConsole.VerboseWriteLine("Output image format: {0} ({1}).", outputFormat.Name, outputFormat.Id);
+            }
+            else
+            {
+                dumpLog.WriteLine("Output image format: {0}.", outputFormat.Name);
+                AaruConsole.WriteLine("Output image format: {0}.", outputFormat.Name);
             }
 
-            if(candidates.Count > 1)
-            {
-                AaruConsole.WriteLine("More than one plugin supports requested extension.");
+            var errorLog = new ErrorLog(outputPrefix + ".error.log");
 
-                return (int)ErrorNumber.TooManyFormats;
-            }
+            var dumper = new Dump(resume, dev, devicePath, outputFormat, retryPasses, force, false, persistent,
+                                  stopOnError, resumeClass, dumpLog, encodingClass, outputPrefix,
+                                  outputPrefix + extension, parsedOptions, sidecar, skip, metadata, trim,
+                                  firstPregap, fixOffset, debug, wantedSubchannel, speed, @private,
+                                  fixSubchannelPosition, retrySubchannel, fixSubchannel, fixSubchannelCrc,
+                                  skipCdiReadyHole, errorLog, generateSubchannels, maxBlocks, useBufferedReads,
+                                  storeEncrypted, titleKeys);
 
-            while(true)
-            {
-                string responseLine = resReader.ReadLine();
-
-                if(responseLine is null)
-                    break;
-
-                if(responseLine.Any(c => c < 0x20))
-                {
-                    AaruConsole.ErrorWriteLine("Invalid characters found in list of files, exiting...");
-
-                    return (int)ErrorNumber.InvalidArgument;
-                }
-
-                if(isResponse)
-                {
-                    AaruConsole.WriteLine("Please insert media with title {0} and press any key to continue...",
-                                          responseLine);
-
-                    System.Console.ReadKey();
-                    Thread.Sleep(1000);
-                }
-
-                responseLine = responseLine.Replace('/', '／');
-
-                // Replace Windows forbidden filename characters with Japanese equivalents that are visually the same, but bigger.
-                if(DetectOS.IsWindows)
-                    responseLine = responseLine.Replace('<', '\uFF1C').Replace('>', '\uFF1E').Replace(':', '\uFF1A').
-                                                Replace('"', '\u2033').Replace('\\', '＼').Replace('|', '｜').
-                                                Replace('?', '？').Replace('*', '＊');
-
-                if(devicePath.Length == 2   &&
-                   devicePath[1]     == ':' &&
-                   devicePath[0]     != '/' &&
-                   char.IsLetter(devicePath[0]))
-                    devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
-
-                Devices.Device dev = null;
-
-                try
-                {
-                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Opening device...").IsIndeterminate();
-                        dev = new Devices.Device(devicePath);
-                    });
-
-                    if(dev.IsRemote)
-                        Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
-                                             dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
-
-                    if(dev.Error)
-                    {
-                        AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
-
-                        if(isResponse)
-                            continue;
-
-                        return (int)ErrorNumber.CannotOpenDevice;
-                    }
-                }
-                catch(DeviceException e)
-                {
-                    AaruConsole.ErrorWriteLine(e.Message ?? Error.Print(e.LastError));
-
-                    if(isResponse)
-                        continue;
-
-                    return (int)ErrorNumber.CannotOpenDevice;
-                }
-
-                Statistics.AddDevice(dev);
-
-                string outputPrefix = Path.Combine(Path.GetDirectoryName(outputPath), responseLine);
-
-                Resume resumeClass = null;
-                var    xs          = new XmlSerializer(typeof(Resume));
-
-                if(File.Exists(outputPrefix + ".resume.xml") && resume)
-                    try
-                    {
-                        var sr = new StreamReader(outputPrefix + ".resume.xml");
-                        resumeClass = (Resume)xs.Deserialize(sr);
-                        sr.Close();
-                    }
-                    catch
-                    {
-                        AaruConsole.ErrorWriteLine("Incorrect resume file, not continuing...");
-
-                        if(isResponse)
-                            continue;
-
-                        return (int)ErrorNumber.InvalidResume;
-                    }
-
-                if(resumeClass                 != null                                               &&
-                   resumeClass.NextBlock       > resumeClass.LastBlock                               &&
-                   resumeClass.BadBlocks.Count == 0                                                  &&
-                   !resumeClass.Tape                                                                 &&
-                   (resumeClass.BadSubchannels is null   || resumeClass.BadSubchannels.Count   == 0) &&
-                   (resumeClass.MissingTitleKeys is null || resumeClass.MissingTitleKeys.Count == 0))
-                {
-                    AaruConsole.WriteLine("Media already dumped correctly, not continuing...");
-
-                    if(isResponse)
-                        continue;
-
-                    return (int)ErrorNumber.AlreadyDumped;
-                }
-
-                CICMMetadataType sidecar   = null;
-                var              sidecarXs = new XmlSerializer(typeof(CICMMetadataType));
-
-                if(cicmXml != null)
-                    if(File.Exists(cicmXml))
-                    {
-                        try
+            AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                        Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                        Start(ctx =>
                         {
-                            var sr = new StreamReader(cicmXml);
-                            sidecar = (CICMMetadataType)sidecarXs.Deserialize(sr);
-                            sr.Close();
-                        }
-                        catch
-                        {
-                            AaruConsole.ErrorWriteLine("Incorrect metadata sidecar file, not continuing...");
-
-                            if(isResponse)
-                                continue;
-
-                            return (int)ErrorNumber.InvalidSidecar;
-                        }
-                    }
-                    else
-                    {
-                        AaruConsole.ErrorWriteLine("Could not find metadata sidecar, not continuing...");
-
-                        if(isResponse)
-                            continue;
-
-                        return (int)ErrorNumber.NoSuchFile;
-                    }
-
-                plugins    = GetPluginBase.Instance;
-                candidates = new List<IBaseWritableImage>();
-
-                // Try extension
-                if(string.IsNullOrEmpty(format))
-                    candidates.AddRange(plugins.WritableImages.Values.Where(t =>
-                                                                                t.KnownExtensions.
-                                                                                    Contains(Path.
-                                                                                        GetExtension(outputPath))));
-
-                // Try Id
-                else if(Guid.TryParse(format, out Guid outId))
-                    candidates.AddRange(plugins.WritableImages.Values.Where(t => t.Id.Equals(outId)));
-
-                // Try name
-                else
-                    candidates.AddRange(plugins.WritableImages.Values.Where(t => string.Equals(t.Name, format,
-                                                                                StringComparison.
-                                                                                    InvariantCultureIgnoreCase)));
-
-                IBaseWritableImage outputFormat = candidates[0];
-
-                var dumpLog = new DumpLog(outputPrefix + ".log", dev, @private);
-
-                if(verbose)
-                {
-                    dumpLog.WriteLine("Output image format: {0} ({1}).", outputFormat.Name, outputFormat.Id);
-                    AaruConsole.VerboseWriteLine("Output image format: {0} ({1}).", outputFormat.Name, outputFormat.Id);
-                }
-                else
-                {
-                    dumpLog.WriteLine("Output image format: {0}.", outputFormat.Name);
-                    AaruConsole.WriteLine("Output image format: {0}.", outputFormat.Name);
-                }
-
-                var errorLog = new ErrorLog(outputPrefix + ".error.log");
-
-                var dumper = new Dump(resume, dev, devicePath, outputFormat, retryPasses, force, false, persistent,
-                                      stopOnError, resumeClass, dumpLog, encodingClass, outputPrefix,
-                                      outputPrefix + extension, parsedOptions, sidecar, skip, metadata, trim,
-                                      firstPregap, fixOffset, debug, wantedSubchannel, speed, @private,
-                                      fixSubchannelPosition, retrySubchannel, fixSubchannel, fixSubchannelCrc,
-                                      skipCdiReadyHole, errorLog, generateSubchannels, maxBlocks, useBufferedReads,
-                                      storeEncrypted, titleKeys);
-
-                AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                            Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                            Start(ctx =>
+                            dumper.UpdateStatus += text =>
                             {
-                                dumper.UpdateStatus += text =>
+                                AaruConsole.WriteLine(Markup.Escape(text));
+                            };
+
+                            dumper.ErrorMessage += text =>
+                            {
+                                AaruConsole.ErrorWriteLine($"[red]{Markup.Escape(text)}[/]");
+                            };
+
+                            dumper.StoppingErrorMessage += text =>
+                            {
+                                AaruConsole.ErrorWriteLine($"[red]{Markup.Escape(text)}[/]");
+                            };
+
+                            dumper.UpdateProgress += (text, current, maximum) =>
+                            {
+                                _progressTask1             ??= ctx.AddTask("Progress");
+                                _progressTask1.Description =   Markup.Escape(text);
+                                _progressTask1.Value       =   current;
+                                _progressTask1.MaxValue    =   maximum;
+                            };
+
+                            dumper.PulseProgress += text =>
+                            {
+                                if(_progressTask1 is null)
+                                    ctx.AddTask(Markup.Escape(text)).IsIndeterminate();
+                                else
                                 {
-                                    AaruConsole.WriteLine(Markup.Escape(text));
-                                };
-
-                                dumper.ErrorMessage += text =>
-                                {
-                                    AaruConsole.ErrorWriteLine($"[red]{Markup.Escape(text)}[/]");
-                                };
-
-                                dumper.StoppingErrorMessage += text =>
-                                {
-                                    AaruConsole.ErrorWriteLine($"[red]{Markup.Escape(text)}[/]");
-                                };
-
-                                dumper.UpdateProgress += (text, current, maximum) =>
-                                {
-                                    _progressTask1             ??= ctx.AddTask("Progress");
-                                    _progressTask1.Description =   Markup.Escape(text);
-                                    _progressTask1.Value       =   current;
-                                    _progressTask1.MaxValue    =   maximum;
-                                };
-
-                                dumper.PulseProgress += text =>
-                                {
-                                    if(_progressTask1 is null)
-                                        ctx.AddTask(Markup.Escape(text)).IsIndeterminate();
-                                    else
-                                    {
-                                        _progressTask1.Description     = Markup.Escape(text);
-                                        _progressTask1.IsIndeterminate = true;
-                                    }
-                                };
-
-                                dumper.InitProgress += () =>
-                                {
-                                    _progressTask1 = ctx.AddTask("Progress");
-                                };
-
-                                dumper.EndProgress += () =>
-                                {
-                                    _progressTask1?.StopTask();
-                                    _progressTask1 = null;
-                                };
-
-                                dumper.InitProgress2 += () =>
-                                {
-                                    _progressTask2 = ctx.AddTask("Progress");
-                                };
-
-                                dumper.EndProgress2 += () =>
-                                {
-                                    _progressTask2?.StopTask();
-                                    _progressTask2 = null;
-                                };
-
-                                dumper.UpdateProgress2 += (text, current, maximum) =>
-                                {
-                                    _progressTask2             ??= ctx.AddTask("Progress");
-                                    _progressTask2.Description =   Markup.Escape(text);
-                                    _progressTask2.Value       =   current;
-                                    _progressTask2.MaxValue    =   maximum;
-                                };
-
-                                System.Console.CancelKeyPress += (sender, e) =>
-                                {
-                                    e.Cancel = true;
-                                    dumper.Abort();
-                                };
-
-                                dumper.Start();
-                            });
-
-                if(eject && dev.IsRemovable)
-                {
-                    Core.Spectre.ProgressSingleSpinner(ctx =>
-                    {
-                        ctx.AddTask("Ejecting media...").IsIndeterminate();
-
-                        switch(dev.Type)
-                        {
-                            case DeviceType.ATA:
-                                dev.DoorUnlock(out _, dev.Timeout, out _);
-                                dev.MediaEject(out _, dev.Timeout, out _);
-
-                                break;
-                            case DeviceType.ATAPI:
-                            case DeviceType.SCSI:
-                                switch(dev.ScsiType)
-                                {
-                                    case PeripheralDeviceTypes.DirectAccess:
-                                    case PeripheralDeviceTypes.SimplifiedDevice:
-                                    case PeripheralDeviceTypes.SCSIZonedBlockDevice:
-                                    case PeripheralDeviceTypes.WriteOnceDevice:
-                                    case PeripheralDeviceTypes.OpticalDevice:
-                                    case PeripheralDeviceTypes.OCRWDevice:
-                                        dev.SpcAllowMediumRemoval(out _, dev.Timeout, out _);
-                                        dev.EjectTray(out _, dev.Timeout, out _);
-
-                                        break;
-                                    case PeripheralDeviceTypes.MultiMediaDevice:
-                                        dev.AllowMediumRemoval(out _, dev.Timeout, out _);
-                                        dev.EjectTray(out _, dev.Timeout, out _);
-
-                                        break;
-                                    case PeripheralDeviceTypes.SequentialAccess:
-                                        dev.SpcAllowMediumRemoval(out _, dev.Timeout, out _);
-                                        dev.LoadUnload(out _, true, false, false, false, false, dev.Timeout, out _);
-
-                                        break;
+                                    _progressTask1.Description     = Markup.Escape(text);
+                                    _progressTask1.IsIndeterminate = true;
                                 }
+                            };
 
-                                break;
-                        }
-                    });
-                }
+                            dumper.InitProgress += () =>
+                            {
+                                _progressTask1 = ctx.AddTask("Progress");
+                            };
 
-                dev.Close();
+                            dumper.EndProgress += () =>
+                            {
+                                _progressTask1?.StopTask();
+                                _progressTask1 = null;
+                            };
+
+                            dumper.InitProgress2 += () =>
+                            {
+                                _progressTask2 = ctx.AddTask("Progress");
+                            };
+
+                            dumper.EndProgress2 += () =>
+                            {
+                                _progressTask2?.StopTask();
+                                _progressTask2 = null;
+                            };
+
+                            dumper.UpdateProgress2 += (text, current, maximum) =>
+                            {
+                                _progressTask2             ??= ctx.AddTask("Progress");
+                                _progressTask2.Description =   Markup.Escape(text);
+                                _progressTask2.Value       =   current;
+                                _progressTask2.MaxValue    =   maximum;
+                            };
+
+                            System.Console.CancelKeyPress += (sender, e) =>
+                            {
+                                e.Cancel = true;
+                                dumper.Abort();
+                            };
+
+                            dumper.Start();
+                        });
+
+            if(eject && dev.IsRemovable)
+            {
+                Core.Spectre.ProgressSingleSpinner(ctx =>
+                {
+                    ctx.AddTask("Ejecting media...").IsIndeterminate();
+
+                    switch(dev.Type)
+                    {
+                        case DeviceType.ATA:
+                            dev.DoorUnlock(out _, dev.Timeout, out _);
+                            dev.MediaEject(out _, dev.Timeout, out _);
+
+                            break;
+                        case DeviceType.ATAPI:
+                        case DeviceType.SCSI:
+                            switch(dev.ScsiType)
+                            {
+                                case PeripheralDeviceTypes.DirectAccess:
+                                case PeripheralDeviceTypes.SimplifiedDevice:
+                                case PeripheralDeviceTypes.SCSIZonedBlockDevice:
+                                case PeripheralDeviceTypes.WriteOnceDevice:
+                                case PeripheralDeviceTypes.OpticalDevice:
+                                case PeripheralDeviceTypes.OCRWDevice:
+                                    dev.SpcAllowMediumRemoval(out _, dev.Timeout, out _);
+                                    dev.EjectTray(out _, dev.Timeout, out _);
+
+                                    break;
+                                case PeripheralDeviceTypes.MultiMediaDevice:
+                                    dev.AllowMediumRemoval(out _, dev.Timeout, out _);
+                                    dev.EjectTray(out _, dev.Timeout, out _);
+
+                                    break;
+                                case PeripheralDeviceTypes.SequentialAccess:
+                                    dev.SpcAllowMediumRemoval(out _, dev.Timeout, out _);
+                                    dev.LoadUnload(out _, true, false, false, false, false, dev.Timeout, out _);
+
+                                    break;
+                            }
+
+                            break;
+                    }
+                });
             }
 
-            return (int)ErrorNumber.NoError;
+            dev.Close();
         }
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Media/Info.cs b/Aaru/Commands/Media/Info.cs
index 715c59d72..13ae8d99b 100644
--- a/Aaru/Commands/Media/Info.cs
+++ b/Aaru/Commands/Media/Info.cs
@@ -60,670 +60,669 @@ using DMI = Aaru.Decoders.Xbox.DMI;
 using Session = Aaru.Decoders.CD.Session;
 using Spare = Aaru.Decoders.DVD.Spare;
 
-namespace Aaru.Commands.Media
-{
-    internal sealed class MediaInfoCommand : Command
-    {
-        public MediaInfoCommand() : base("info", "Gets information about the media inserted on a device.")
-        {
-            Add(new Option(new[]
-                {
-                    "--output-prefix", "-w"
-                }, "Write binary responses from device with that prefix.")
-                {
-                    Argument = new Argument<string>(() => null),
-                    Required = false
-                });
+namespace Aaru.Commands.Media;
 
-            AddArgument(new Argument<string>
+internal sealed class MediaInfoCommand : Command
+{
+    public MediaInfoCommand() : base("info", "Gets information about the media inserted on a device.")
+    {
+        Add(new Option(new[]
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "Device path",
-                Name        = "device-path"
+                "--output-prefix", "-w"
+            }, "Write binary responses from device with that prefix.")
+            {
+                Argument = new Argument<string>(() => null),
+                Required = false
             });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        AddArgument(new Argument<string>
+        {
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "Device path",
+            Name        = "device-path"
+        });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, string devicePath, string outputPrefix)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
+            {
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
+
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, string devicePath, string outputPrefix)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        Statistics.AddCommand("media-info");
+
+        AaruConsole.DebugWriteLine("Media-Info command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Media-Info command", "--device={0}", devicePath);
+        AaruConsole.DebugWriteLine("Media-Info command", "--output-prefix={0}", outputPrefix);
+        AaruConsole.DebugWriteLine("Media-Info command", "--verbose={0}", verbose);
+
+        if(devicePath.Length == 2   &&
+           devicePath[1]     == ':' &&
+           devicePath[0]     != '/' &&
+           char.IsLetter(devicePath[0]))
+            devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
+
+        Devices.Device dev = null;
+
+        try
         {
-            MainClass.PrintCopyright();
-
-            if(debug)
+            Core.Spectre.ProgressSingleSpinner(ctx =>
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                ctx.AddTask("Opening device...").IsIndeterminate();
+                dev = new Devices.Device(devicePath);
+            });
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
+            if(dev.IsRemote)
+                Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
+                                     dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
 
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            Statistics.AddCommand("media-info");
-
-            AaruConsole.DebugWriteLine("Media-Info command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Media-Info command", "--device={0}", devicePath);
-            AaruConsole.DebugWriteLine("Media-Info command", "--output-prefix={0}", outputPrefix);
-            AaruConsole.DebugWriteLine("Media-Info command", "--verbose={0}", verbose);
-
-            if(devicePath.Length == 2   &&
-               devicePath[1]     == ':' &&
-               devicePath[0]     != '/' &&
-               char.IsLetter(devicePath[0]))
-                devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
-
-            Devices.Device dev = null;
-
-            try
+            if(dev.Error)
             {
-                Core.Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Opening device...").IsIndeterminate();
-                    dev = new Devices.Device(devicePath);
-                });
-
-                if(dev.IsRemote)
-                    Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
-                                         dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
-
-                if(dev.Error)
-                {
-                    AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
-
-                    return (int)ErrorNumber.CannotOpenDevice;
-                }
-            }
-            catch(DeviceException e)
-            {
-                AaruConsole.ErrorWriteLine(e.Message);
+                AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
 
                 return (int)ErrorNumber.CannotOpenDevice;
             }
+        }
+        catch(DeviceException e)
+        {
+            AaruConsole.ErrorWriteLine(e.Message);
 
-            Statistics.AddDevice(dev);
-
-            switch(dev.Type)
-            {
-                case DeviceType.ATA:
-                    DoAtaMediaInfo();
-
-                    break;
-                case DeviceType.MMC:
-                case DeviceType.SecureDigital:
-                    DoSdMediaInfo();
-
-                    break;
-                case DeviceType.NVMe:
-                    DoNvmeMediaInfo(outputPrefix, dev);
-
-                    break;
-                case DeviceType.ATAPI:
-                case DeviceType.SCSI:
-                    DoScsiMediaInfo(debug, outputPrefix, dev);
-
-                    break;
-                default: throw new NotSupportedException("Unknown device type.");
-            }
-
-            return (int)ErrorNumber.NoError;
+            return (int)ErrorNumber.CannotOpenDevice;
         }
 
-        static void DoAtaMediaInfo() => AaruConsole.ErrorWriteLine("Please use device-info command for ATA devices.");
+        Statistics.AddDevice(dev);
 
-        static void DoNvmeMediaInfo(string outputPrefix, Devices.Device dev) =>
-            throw new NotImplementedException("NVMe devices not yet supported.");
-
-        static void DoSdMediaInfo() => AaruConsole.ErrorWriteLine("Please use device-info command for MMC/SD devices.");
-
-        static void DoScsiMediaInfo(bool debug, string outputPrefix, Devices.Device dev)
+        switch(dev.Type)
         {
-            ScsiInfo scsiInfo = null;
+            case DeviceType.ATA:
+                DoAtaMediaInfo();
 
-            Core.Spectre.ProgressSingleSpinner(ctx =>
+                break;
+            case DeviceType.MMC:
+            case DeviceType.SecureDigital:
+                DoSdMediaInfo();
+
+                break;
+            case DeviceType.NVMe:
+                DoNvmeMediaInfo(outputPrefix, dev);
+
+                break;
+            case DeviceType.ATAPI:
+            case DeviceType.SCSI:
+                DoScsiMediaInfo(debug, outputPrefix, dev);
+
+                break;
+            default: throw new NotSupportedException("Unknown device type.");
+        }
+
+        return (int)ErrorNumber.NoError;
+    }
+
+    static void DoAtaMediaInfo() => AaruConsole.ErrorWriteLine("Please use device-info command for ATA devices.");
+
+    static void DoNvmeMediaInfo(string outputPrefix, Devices.Device dev) =>
+        throw new NotImplementedException("NVMe devices not yet supported.");
+
+    static void DoSdMediaInfo() => AaruConsole.ErrorWriteLine("Please use device-info command for MMC/SD devices.");
+
+    static void DoScsiMediaInfo(bool debug, string outputPrefix, Devices.Device dev)
+    {
+        ScsiInfo scsiInfo = null;
+
+        Core.Spectre.ProgressSingleSpinner(ctx =>
+        {
+            ctx.AddTask("Retrieving SCSI information...").IsIndeterminate();
+            scsiInfo = new ScsiInfo(dev);
+        });
+
+        if(!scsiInfo.MediaInserted)
+            return;
+
+        if(scsiInfo.DeviceInfo.ScsiModeSense6 != null)
+            DataFile.WriteTo("Media-Info command", outputPrefix, "_scsi_modesense6.bin", "SCSI MODE SENSE (6)",
+                             scsiInfo.DeviceInfo.ScsiModeSense6);
+
+        if(scsiInfo.DeviceInfo.ScsiModeSense10 != null)
+            DataFile.WriteTo("Media-Info command", outputPrefix, "_scsi_modesense10.bin", "SCSI MODE SENSE (10)",
+                             scsiInfo.DeviceInfo.ScsiModeSense10);
+
+        switch(dev.ScsiType)
+        {
+            case PeripheralDeviceTypes.DirectAccess:
+            case PeripheralDeviceTypes.MultiMediaDevice:
+            case PeripheralDeviceTypes.OCRWDevice:
+            case PeripheralDeviceTypes.OpticalDevice:
+            case PeripheralDeviceTypes.SimplifiedDevice:
+            case PeripheralDeviceTypes.WriteOnceDevice:
+            case PeripheralDeviceTypes.BridgingExpander
+                when dev.Model.StartsWith("MDM", StringComparison.Ordinal) ||
+                     dev.Model.StartsWith("MDH", StringComparison.Ordinal):
+                if(scsiInfo.ReadCapacity != null)
+                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readcapacity.bin", "SCSI READ CAPACITY",
+                                     scsiInfo.ReadCapacity);
+
+                if(scsiInfo.ReadCapacity16 != null)
+                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readcapacity16.bin",
+                                     "SCSI READ CAPACITY(16)", scsiInfo.ReadCapacity16);
+
+                if(scsiInfo.Blocks    != 0 &&
+                   scsiInfo.BlockSize != 0)
+                {
+                    ulong totalSize = scsiInfo.Blocks * scsiInfo.BlockSize;
+
+                    if(totalSize > 1099511627776)
+                        AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2:F3} TiB)",
+                                              scsiInfo.Blocks, scsiInfo.BlockSize, totalSize / 1099511627776d);
+                    else if(totalSize > 1073741824)
+                        AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2:F3} GiB)",
+                                              scsiInfo.Blocks, scsiInfo.BlockSize, totalSize / 1073741824d);
+                    else if(totalSize > 1048576)
+                        AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2:F3} MiB)",
+                                              scsiInfo.Blocks, scsiInfo.BlockSize, totalSize / 1048576d);
+                    else if(totalSize > 1024)
+                        AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2:F3} KiB)",
+                                              scsiInfo.Blocks, scsiInfo.BlockSize, totalSize / 1024d);
+                    else
+                        AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2} bytes)",
+                                              scsiInfo.Blocks, scsiInfo.BlockSize, totalSize);
+                }
+
+                break;
+            case PeripheralDeviceTypes.SequentialAccess:
+                if(scsiInfo.DensitySupport != null)
+                {
+                    DataFile.WriteTo("Media-Info command", outputPrefix, "_ssc_reportdensitysupport_media.bin",
+                                     "SSC REPORT DENSITY SUPPORT (MEDIA)", scsiInfo.DensitySupport);
+
+                    if(scsiInfo.DensitySupportHeader.HasValue)
+                    {
+                        AaruConsole.WriteLine("[bold]Densities supported by currently inserted media:[/]");
+                        AaruConsole.WriteLine(DensitySupport.PrettifyDensity(scsiInfo.DensitySupportHeader));
+                    }
+                }
+
+                if(scsiInfo.MediaTypeSupport != null)
+                {
+                    DataFile.WriteTo("Media-Info command", outputPrefix,
+                                     "_ssc_reportdensitysupport_medium_media.bin",
+                                     "SSC REPORT DENSITY SUPPORT (MEDIUM & MEDIA)", scsiInfo.MediaTypeSupport);
+
+                    if(scsiInfo.MediaTypeSupportHeader.HasValue)
+                    {
+                        AaruConsole.WriteLine("[bold]Medium types currently inserted in device:[/]");
+                        AaruConsole.WriteLine(DensitySupport.PrettifyMediumType(scsiInfo.MediaTypeSupportHeader));
+                    }
+
+                    AaruConsole.WriteLine(DensitySupport.PrettifyMediumType(scsiInfo.MediaTypeSupport));
+                }
+
+                break;
+        }
+
+        if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
+        {
+            if(scsiInfo.MmcConfiguration != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_getconfiguration_current.bin",
+                                 "SCSI GET CONFIGURATION", scsiInfo.MmcConfiguration);
+
+            if(scsiInfo.RecognizedFormatLayers != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_formatlayers.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.RecognizedFormatLayers);
+
+            if(scsiInfo.WriteProtectionStatus != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_writeprotection.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.WriteProtectionStatus);
+
+            if(scsiInfo.DvdPfi != null)
             {
-                ctx.AddTask("Retrieving SCSI information...").IsIndeterminate();
-                scsiInfo = new ScsiInfo(dev);
-            });
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_pfi.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdPfi);
 
-            if(!scsiInfo.MediaInserted)
-                return;
-
-            if(scsiInfo.DeviceInfo.ScsiModeSense6 != null)
-                DataFile.WriteTo("Media-Info command", outputPrefix, "_scsi_modesense6.bin", "SCSI MODE SENSE (6)",
-                                 scsiInfo.DeviceInfo.ScsiModeSense6);
-
-            if(scsiInfo.DeviceInfo.ScsiModeSense10 != null)
-                DataFile.WriteTo("Media-Info command", outputPrefix, "_scsi_modesense10.bin", "SCSI MODE SENSE (10)",
-                                 scsiInfo.DeviceInfo.ScsiModeSense10);
-
-            switch(dev.ScsiType)
-            {
-                case PeripheralDeviceTypes.DirectAccess:
-                case PeripheralDeviceTypes.MultiMediaDevice:
-                case PeripheralDeviceTypes.OCRWDevice:
-                case PeripheralDeviceTypes.OpticalDevice:
-                case PeripheralDeviceTypes.SimplifiedDevice:
-                case PeripheralDeviceTypes.WriteOnceDevice:
-                case PeripheralDeviceTypes.BridgingExpander
-                    when dev.Model.StartsWith("MDM", StringComparison.Ordinal) ||
-                         dev.Model.StartsWith("MDH", StringComparison.Ordinal):
-                    if(scsiInfo.ReadCapacity != null)
-                        DataFile.WriteTo("Media-Info command", outputPrefix, "_readcapacity.bin", "SCSI READ CAPACITY",
-                                         scsiInfo.ReadCapacity);
-
-                    if(scsiInfo.ReadCapacity16 != null)
-                        DataFile.WriteTo("Media-Info command", outputPrefix, "_readcapacity16.bin",
-                                         "SCSI READ CAPACITY(16)", scsiInfo.ReadCapacity16);
-
-                    if(scsiInfo.Blocks    != 0 &&
-                       scsiInfo.BlockSize != 0)
-                    {
-                        ulong totalSize = scsiInfo.Blocks * scsiInfo.BlockSize;
-
-                        if(totalSize > 1099511627776)
-                            AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2:F3} TiB)",
-                                                  scsiInfo.Blocks, scsiInfo.BlockSize, totalSize / 1099511627776d);
-                        else if(totalSize > 1073741824)
-                            AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2:F3} GiB)",
-                                                  scsiInfo.Blocks, scsiInfo.BlockSize, totalSize / 1073741824d);
-                        else if(totalSize > 1048576)
-                            AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2:F3} MiB)",
-                                                  scsiInfo.Blocks, scsiInfo.BlockSize, totalSize / 1048576d);
-                        else if(totalSize > 1024)
-                            AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2:F3} KiB)",
-                                                  scsiInfo.Blocks, scsiInfo.BlockSize, totalSize / 1024d);
-                        else
-                            AaruConsole.WriteLine("Media has {0} blocks of {1} bytes/each. (for a total of {2} bytes)",
-                                                  scsiInfo.Blocks, scsiInfo.BlockSize, totalSize);
-                    }
-
-                    break;
-                case PeripheralDeviceTypes.SequentialAccess:
-                    if(scsiInfo.DensitySupport != null)
-                    {
-                        DataFile.WriteTo("Media-Info command", outputPrefix, "_ssc_reportdensitysupport_media.bin",
-                                         "SSC REPORT DENSITY SUPPORT (MEDIA)", scsiInfo.DensitySupport);
-
-                        if(scsiInfo.DensitySupportHeader.HasValue)
-                        {
-                            AaruConsole.WriteLine("[bold]Densities supported by currently inserted media:[/]");
-                            AaruConsole.WriteLine(DensitySupport.PrettifyDensity(scsiInfo.DensitySupportHeader));
-                        }
-                    }
-
-                    if(scsiInfo.MediaTypeSupport != null)
-                    {
-                        DataFile.WriteTo("Media-Info command", outputPrefix,
-                                         "_ssc_reportdensitysupport_medium_media.bin",
-                                         "SSC REPORT DENSITY SUPPORT (MEDIUM & MEDIA)", scsiInfo.MediaTypeSupport);
-
-                        if(scsiInfo.MediaTypeSupportHeader.HasValue)
-                        {
-                            AaruConsole.WriteLine("[bold]Medium types currently inserted in device:[/]");
-                            AaruConsole.WriteLine(DensitySupport.PrettifyMediumType(scsiInfo.MediaTypeSupportHeader));
-                        }
-
-                        AaruConsole.WriteLine(DensitySupport.PrettifyMediumType(scsiInfo.MediaTypeSupport));
-                    }
-
-                    break;
+                if(scsiInfo.DecodedPfi.HasValue)
+                    AaruConsole.WriteLine("PFI:\n{0}", PFI.Prettify(scsiInfo.DecodedPfi));
             }
 
-            if(dev.ScsiType == PeripheralDeviceTypes.MultiMediaDevice)
+            if(scsiInfo.DvdDmi != null)
             {
-                if(scsiInfo.MmcConfiguration != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_getconfiguration_current.bin",
-                                     "SCSI GET CONFIGURATION", scsiInfo.MmcConfiguration);
-
-                if(scsiInfo.RecognizedFormatLayers != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_formatlayers.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.RecognizedFormatLayers);
-
-                if(scsiInfo.WriteProtectionStatus != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_writeprotection.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.WriteProtectionStatus);
-
-                if(scsiInfo.DvdPfi != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_pfi.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdPfi);
-
-                    if(scsiInfo.DecodedPfi.HasValue)
-                        AaruConsole.WriteLine("PFI:\n{0}", PFI.Prettify(scsiInfo.DecodedPfi));
-                }
-
-                if(scsiInfo.DvdDmi != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_dmi.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdDmi);
-
-                    if(DMI.IsXbox(scsiInfo.DvdDmi))
-                        AaruConsole.WriteLine("[bold]Xbox DMI:[/]\n{0}",
-                                              Markup.Escape(DMI.PrettifyXbox(scsiInfo.DvdDmi)));
-                    else if(DMI.IsXbox360(scsiInfo.DvdDmi))
-                        AaruConsole.WriteLine("[bold]Xbox 360 DMI:[/]\n{0}",
-                                              Markup.Escape(DMI.PrettifyXbox360(scsiInfo.DvdDmi)));
-                }
-
-                if(scsiInfo.DvdCmi != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_cmi.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdCmi);
-
-                    AaruConsole.WriteLine("[bold]Lead-In CMI:[/]\n{0}",
-                                          Markup.Escape(CSS_CPRM.PrettifyLeadInCopyright(scsiInfo.DvdCmi)));
-                }
-
-                if(scsiInfo.DvdDiscKey != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_disckey.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdDiscKey);
-
-                if(scsiInfo.DvdSectorCmi != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_sectorcmi.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdSectorCmi);
-
-                if(scsiInfo.DvdBca != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_bca.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdBca);
-
-                if(scsiInfo.DvdAacs != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_aacs.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdAacs);
-
-                if(scsiInfo.DvdRamDds != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdram_dds.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdRamDds);
-
-                    AaruConsole.WriteLine("[bold]Disc Definition Structure:[/]\n{0}",
-                                          Markup.Escape(DDS.Prettify(scsiInfo.DvdRamDds)));
-                }
-
-                if(scsiInfo.DvdRamCartridgeStatus != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdram_status.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdRamCartridgeStatus);
-
-                    AaruConsole.WriteLine("[bold]Medium Status:[/]\n{0}",
-                                          Markup.Escape(Cartridge.Prettify(scsiInfo.DvdRamCartridgeStatus)));
-                }
-
-                if(scsiInfo.DvdRamSpareArea != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdram_spare.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdRamSpareArea);
-
-                    AaruConsole.WriteLine("[bold]Spare Area Information:[/]\n{0}",
-                                          Markup.Escape(Spare.Prettify(scsiInfo.DvdRamSpareArea)));
-                }
-
-                if(scsiInfo.LastBorderOutRmd != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_lastrmd.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.LastBorderOutRmd);
-
-                if(scsiInfo.DvdPreRecordedInfo != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_pri.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdPreRecordedInfo);
-
-                    if(scsiInfo.DecodedDvdPrePitInformation.HasValue)
-                        AaruConsole.WriteLine("[bold]DVD-R(W) Pre-Recorded Information:[/]\n{0}",
-                                              Markup.Escape(PRI.Prettify(scsiInfo.DecodedDvdPrePitInformation)));
-                }
-
-                if(scsiInfo.DvdrMediaIdentifier != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdr_mediaid.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdrMediaIdentifier);
-
-                if(scsiInfo.DvdrPhysicalInformation != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdr_pfi.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdrPhysicalInformation);
-
-                    if(scsiInfo.DecodedDvdrPfi.HasValue)
-                        AaruConsole.WriteLine("[bold]DVD-R(W) PFI:[/]\n{0}",
-                                              Markup.Escape(PFI.Prettify(scsiInfo.DecodedDvdrPfi)));
-                }
-
-                if(scsiInfo.DvdPlusAdip != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd+_adip.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdPlusAdip);
-
-                if(scsiInfo.DvdPlusDcb != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd+_dcb.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdPlusDcb);
-
-                if(scsiInfo.HddvdCopyrightInformation != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_hddvd_cmi.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.HddvdCopyrightInformation);
-
-                if(scsiInfo.HddvdrMediumStatus != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_hddvdr_status.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.HddvdrMediumStatus);
-
-                if(scsiInfo.HddvdrLastRmd != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_hddvdr_lastrmd.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.HddvdrLastRmd);
-
-                if(scsiInfo.DvdrLayerCapacity != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdr_layercap.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdrLayerCapacity);
-
-                if(scsiInfo.DvdrDlMiddleZoneStart != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_mzs.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdrDlMiddleZoneStart);
-
-                if(scsiInfo.DvdrDlJumpIntervalSize != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_jis.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdrDlJumpIntervalSize);
-
-                if(scsiInfo.DvdrDlManualLayerJumpStartLba != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_manuallj.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdrDlManualLayerJumpStartLba);
-
-                if(scsiInfo.DvdrDlRemapAnchorPoint != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_remapanchor.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.DvdrDlRemapAnchorPoint);
-
-                if(scsiInfo.BlurayDiscInformation != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_di.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.BlurayDiscInformation);
-
-                    AaruConsole.WriteLine("[bold]Blu-ray Disc Information:[/]\n{0}",
-                                          Markup.Escape(DI.Prettify(scsiInfo.BlurayDiscInformation)));
-                }
-
-                if(scsiInfo.BlurayPac != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_pac.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.BlurayPac);
-
-                if(scsiInfo.BlurayBurstCuttingArea != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_bca.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.BlurayBurstCuttingArea);
-
-                    AaruConsole.WriteLine("[bold]Blu-ray Burst Cutting Area:[/]\n{0}",
-                                          Markup.Escape(BCA.Prettify(scsiInfo.BlurayBurstCuttingArea)));
-                }
-
-                if(scsiInfo.BlurayDds != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_dds.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.BlurayDds);
-
-                    AaruConsole.WriteLine("[bold]Blu-ray Disc Definition Structure:[/]\n{0}",
-                                          Markup.Escape(Decoders.Bluray.DDS.Prettify(scsiInfo.BlurayDds)));
-                }
-
-                if(scsiInfo.BlurayCartridgeStatus != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_cartstatus.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.BlurayCartridgeStatus);
-
-                    AaruConsole.WriteLine("[bold]Blu-ray Cartridge Status:[/]\n{0}",
-                                          Markup.Escape(Decoders.Bluray.Cartridge.Prettify(scsiInfo.
-                                                            BlurayCartridgeStatus)));
-                }
-
-                if(scsiInfo.BluraySpareAreaInformation != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_spare.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.BluraySpareAreaInformation);
-
-                    AaruConsole.WriteLine("[bold]Blu-ray Spare Area Information:[/]\n{0}",
-                                          Markup.Escape(Decoders.Bluray.Spare.Prettify(scsiInfo.
-                                                            BluraySpareAreaInformation)));
-                }
-
-                if(scsiInfo.BlurayRawDfl != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_dfl.bin",
-                                     "SCSI READ DISC STRUCTURE", scsiInfo.BlurayRawDfl);
-
-                if(scsiInfo.BlurayTrackResources != null)
-                {
-                    AaruConsole.WriteLine("[bold]Track Resources Information:[/]\n{0}",
-                                          Markup.Escape(DiscInformation.Prettify(scsiInfo.BlurayTrackResources)));
-
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscinformation_001b.bin",
-                                     "SCSI READ DISC INFORMATION", scsiInfo.BlurayTrackResources);
-                }
-
-                if(scsiInfo.BlurayPowResources != null)
-                {
-                    AaruConsole.WriteLine("[bold]POW Resources Information:[/]\n{0}",
-                                          Markup.Escape(DiscInformation.Prettify(scsiInfo.BlurayPowResources)));
-
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscinformation_010b.bin",
-                                     "SCSI READ DISC INFORMATION", scsiInfo.BlurayPowResources);
-                }
-
-                if(scsiInfo.Toc != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_toc.bin", "SCSI READ TOC/PMA/ATIP",
-                                     scsiInfo.Toc);
-
-                    if(scsiInfo.DecodedToc.HasValue)
-                        AaruConsole.WriteLine("[bold]TOC:[/]\n{0}", Markup.Escape(TOC.Prettify(scsiInfo.DecodedToc)));
-                }
-
-                if(scsiInfo.Atip != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_atip.bin", "SCSI READ TOC/PMA/ATIP",
-                                     scsiInfo.Atip);
-
-                    if(scsiInfo.DecodedAtip != null)
-                        AaruConsole.WriteLine("[bold]ATIP:[/]\n{0}",
-                                              Markup.Escape(ATIP.Prettify(scsiInfo.DecodedAtip)));
-                }
-
-                if(scsiInfo.DiscInformation != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscinformation_000b.bin",
-                                     "SCSI READ DISC INFORMATION", scsiInfo.DiscInformation);
-
-                    if(scsiInfo.DecodedDiscInformation.HasValue)
-                        AaruConsole.WriteLine("[bold]Standard Disc Information:[/]\n{0}",
-                                              Markup.Escape(DiscInformation.
-                                                                Prettify000b(scsiInfo.DecodedDiscInformation)));
-                }
-
-                if(scsiInfo.Session != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_session.bin", "SCSI READ TOC/PMA/ATIP",
-                                     scsiInfo.Session);
-
-                    if(scsiInfo.DecodedSession.HasValue)
-                        AaruConsole.WriteLine("[bold]Session information:[/]\n{0}",
-                                              Markup.Escape(Session.Prettify(scsiInfo.DecodedSession)));
-                }
-
-                if(scsiInfo.RawToc != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_rawtoc.bin", "SCSI READ TOC/PMA/ATIP",
-                                     scsiInfo.RawToc);
-
-                    if(scsiInfo.FullToc.HasValue)
-                        AaruConsole.WriteLine("[bold]Raw TOC:[/]\n{0}",
-                                              Markup.Escape(FullTOC.Prettify(scsiInfo.RawToc)));
-                }
-
-                if(scsiInfo.Pma != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_pma.bin", "SCSI READ TOC/PMA/ATIP",
-                                     scsiInfo.Pma);
-
-                    AaruConsole.WriteLine("[bold]PMA:\n[/]{0}", Markup.Escape(PMA.Prettify(scsiInfo.Pma)));
-                }
-
-                if(scsiInfo.CdTextLeadIn != null)
-                {
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_cdtext.bin", "SCSI READ TOC/PMA/ATIP",
-                                     scsiInfo.CdTextLeadIn);
-
-                    if(scsiInfo.DecodedCdTextLeadIn.HasValue)
-                        AaruConsole.WriteLine("[bold]CD-TEXT on Lead-In:[/]\n{0}",
-                                              Markup.Escape(CDTextOnLeadIn.Prettify(scsiInfo.DecodedCdTextLeadIn)));
-                }
-
-                if(!string.IsNullOrEmpty(scsiInfo.Mcn))
-                    AaruConsole.WriteLine("[bold]MCN:[/] {0}", Markup.Escape(scsiInfo.Mcn));
-
-                if(scsiInfo.Isrcs != null)
-                    foreach(KeyValuePair<byte, string> isrc in scsiInfo.Isrcs)
-                        AaruConsole.WriteLine("[bold]Track's {0} ISRC:[/] {1}", isrc.Key, Markup.Escape(isrc.Value));
-
-                if(scsiInfo.XboxSecuritySector != null)
-                    DataFile.WriteTo("Media-Info command", outputPrefix, "_xbox_ss.bin", "KREON EXTRACT SS",
-                                     scsiInfo.XboxSecuritySector);
-
-                if(scsiInfo.DecodedXboxSecuritySector.HasValue)
-                    AaruConsole.WriteLine("[bold]Xbox Security Sector:[/]\n{0}",
-                                          Markup.Escape(SS.Prettify(scsiInfo.DecodedXboxSecuritySector)));
-
-                if(scsiInfo.XgdInfo != null)
-                {
-                    AaruConsole.WriteLine("[bold]Video layer 0 size:[/] {0} sectors", scsiInfo.XgdInfo.L0Video);
-                    AaruConsole.WriteLine("[bold]Video layer 1 size:[/] {0} sectors", scsiInfo.XgdInfo.L1Video);
-                    AaruConsole.WriteLine("[bold]Middle zone size:[/] {0} sectors", scsiInfo.XgdInfo.MiddleZone);
-                    AaruConsole.WriteLine("[bold]Game data size:[/] {0} sectors", scsiInfo.XgdInfo.GameSize);
-                    AaruConsole.WriteLine("[bold]Total size:[/] {0} sectors", scsiInfo.XgdInfo.TotalSize);
-                    AaruConsole.WriteLine("[bold]Real layer break:[/] {0}", scsiInfo.XgdInfo.LayerBreak);
-                    AaruConsole.WriteLine();
-                }
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_dmi.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdDmi);
+
+                if(DMI.IsXbox(scsiInfo.DvdDmi))
+                    AaruConsole.WriteLine("[bold]Xbox DMI:[/]\n{0}",
+                                          Markup.Escape(DMI.PrettifyXbox(scsiInfo.DvdDmi)));
+                else if(DMI.IsXbox360(scsiInfo.DvdDmi))
+                    AaruConsole.WriteLine("[bold]Xbox 360 DMI:[/]\n{0}",
+                                          Markup.Escape(DMI.PrettifyXbox360(scsiInfo.DvdDmi)));
             }
 
-            if(scsiInfo.MediaSerialNumber != null)
+            if(scsiInfo.DvdCmi != null)
             {
-                DataFile.WriteTo("Media-Info command", outputPrefix, "_mediaserialnumber.bin",
-                                 "SCSI READ MEDIA SERIAL NUMBER", scsiInfo.MediaSerialNumber);
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_cmi.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdCmi);
 
-                AaruConsole.Write("[bold]Media Serial Number:[/] ");
+                AaruConsole.WriteLine("[bold]Lead-In CMI:[/]\n{0}",
+                                      Markup.Escape(CSS_CPRM.PrettifyLeadInCopyright(scsiInfo.DvdCmi)));
+            }
 
-                for(int i = 4; i < scsiInfo.MediaSerialNumber.Length; i++)
-                    AaruConsole.Write("{0:X2}", scsiInfo.MediaSerialNumber[i]);
+            if(scsiInfo.DvdDiscKey != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_disckey.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdDiscKey);
 
+            if(scsiInfo.DvdSectorCmi != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_sectorcmi.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdSectorCmi);
+
+            if(scsiInfo.DvdBca != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_bca.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdBca);
+
+            if(scsiInfo.DvdAacs != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_aacs.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdAacs);
+
+            if(scsiInfo.DvdRamDds != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdram_dds.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdRamDds);
+
+                AaruConsole.WriteLine("[bold]Disc Definition Structure:[/]\n{0}",
+                                      Markup.Escape(DDS.Prettify(scsiInfo.DvdRamDds)));
+            }
+
+            if(scsiInfo.DvdRamCartridgeStatus != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdram_status.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdRamCartridgeStatus);
+
+                AaruConsole.WriteLine("[bold]Medium Status:[/]\n{0}",
+                                      Markup.Escape(Cartridge.Prettify(scsiInfo.DvdRamCartridgeStatus)));
+            }
+
+            if(scsiInfo.DvdRamSpareArea != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdram_spare.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdRamSpareArea);
+
+                AaruConsole.WriteLine("[bold]Spare Area Information:[/]\n{0}",
+                                      Markup.Escape(Spare.Prettify(scsiInfo.DvdRamSpareArea)));
+            }
+
+            if(scsiInfo.LastBorderOutRmd != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_lastrmd.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.LastBorderOutRmd);
+
+            if(scsiInfo.DvdPreRecordedInfo != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_pri.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdPreRecordedInfo);
+
+                if(scsiInfo.DecodedDvdPrePitInformation.HasValue)
+                    AaruConsole.WriteLine("[bold]DVD-R(W) Pre-Recorded Information:[/]\n{0}",
+                                          Markup.Escape(PRI.Prettify(scsiInfo.DecodedDvdPrePitInformation)));
+            }
+
+            if(scsiInfo.DvdrMediaIdentifier != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdr_mediaid.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdrMediaIdentifier);
+
+            if(scsiInfo.DvdrPhysicalInformation != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdr_pfi.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdrPhysicalInformation);
+
+                if(scsiInfo.DecodedDvdrPfi.HasValue)
+                    AaruConsole.WriteLine("[bold]DVD-R(W) PFI:[/]\n{0}",
+                                          Markup.Escape(PFI.Prettify(scsiInfo.DecodedDvdrPfi)));
+            }
+
+            if(scsiInfo.DvdPlusAdip != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd+_adip.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdPlusAdip);
+
+            if(scsiInfo.DvdPlusDcb != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd+_dcb.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdPlusDcb);
+
+            if(scsiInfo.HddvdCopyrightInformation != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_hddvd_cmi.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.HddvdCopyrightInformation);
+
+            if(scsiInfo.HddvdrMediumStatus != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_hddvdr_status.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.HddvdrMediumStatus);
+
+            if(scsiInfo.HddvdrLastRmd != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_hddvdr_lastrmd.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.HddvdrLastRmd);
+
+            if(scsiInfo.DvdrLayerCapacity != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvdr_layercap.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdrLayerCapacity);
+
+            if(scsiInfo.DvdrDlMiddleZoneStart != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_mzs.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdrDlMiddleZoneStart);
+
+            if(scsiInfo.DvdrDlJumpIntervalSize != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_jis.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdrDlJumpIntervalSize);
+
+            if(scsiInfo.DvdrDlManualLayerJumpStartLba != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_manuallj.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdrDlManualLayerJumpStartLba);
+
+            if(scsiInfo.DvdrDlRemapAnchorPoint != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_dvd_remapanchor.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.DvdrDlRemapAnchorPoint);
+
+            if(scsiInfo.BlurayDiscInformation != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_di.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.BlurayDiscInformation);
+
+                AaruConsole.WriteLine("[bold]Blu-ray Disc Information:[/]\n{0}",
+                                      Markup.Escape(DI.Prettify(scsiInfo.BlurayDiscInformation)));
+            }
+
+            if(scsiInfo.BlurayPac != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_pac.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.BlurayPac);
+
+            if(scsiInfo.BlurayBurstCuttingArea != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_bca.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.BlurayBurstCuttingArea);
+
+                AaruConsole.WriteLine("[bold]Blu-ray Burst Cutting Area:[/]\n{0}",
+                                      Markup.Escape(BCA.Prettify(scsiInfo.BlurayBurstCuttingArea)));
+            }
+
+            if(scsiInfo.BlurayDds != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_dds.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.BlurayDds);
+
+                AaruConsole.WriteLine("[bold]Blu-ray Disc Definition Structure:[/]\n{0}",
+                                      Markup.Escape(Decoders.Bluray.DDS.Prettify(scsiInfo.BlurayDds)));
+            }
+
+            if(scsiInfo.BlurayCartridgeStatus != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_cartstatus.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.BlurayCartridgeStatus);
+
+                AaruConsole.WriteLine("[bold]Blu-ray Cartridge Status:[/]\n{0}",
+                                      Markup.Escape(Decoders.Bluray.Cartridge.Prettify(scsiInfo.
+                                                        BlurayCartridgeStatus)));
+            }
+
+            if(scsiInfo.BluraySpareAreaInformation != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_spare.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.BluraySpareAreaInformation);
+
+                AaruConsole.WriteLine("[bold]Blu-ray Spare Area Information:[/]\n{0}",
+                                      Markup.Escape(Decoders.Bluray.Spare.Prettify(scsiInfo.
+                                                        BluraySpareAreaInformation)));
+            }
+
+            if(scsiInfo.BlurayRawDfl != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscstructure_bd_dfl.bin",
+                                 "SCSI READ DISC STRUCTURE", scsiInfo.BlurayRawDfl);
+
+            if(scsiInfo.BlurayTrackResources != null)
+            {
+                AaruConsole.WriteLine("[bold]Track Resources Information:[/]\n{0}",
+                                      Markup.Escape(DiscInformation.Prettify(scsiInfo.BlurayTrackResources)));
+
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscinformation_001b.bin",
+                                 "SCSI READ DISC INFORMATION", scsiInfo.BlurayTrackResources);
+            }
+
+            if(scsiInfo.BlurayPowResources != null)
+            {
+                AaruConsole.WriteLine("[bold]POW Resources Information:[/]\n{0}",
+                                      Markup.Escape(DiscInformation.Prettify(scsiInfo.BlurayPowResources)));
+
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscinformation_010b.bin",
+                                 "SCSI READ DISC INFORMATION", scsiInfo.BlurayPowResources);
+            }
+
+            if(scsiInfo.Toc != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_toc.bin", "SCSI READ TOC/PMA/ATIP",
+                                 scsiInfo.Toc);
+
+                if(scsiInfo.DecodedToc.HasValue)
+                    AaruConsole.WriteLine("[bold]TOC:[/]\n{0}", Markup.Escape(TOC.Prettify(scsiInfo.DecodedToc)));
+            }
+
+            if(scsiInfo.Atip != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_atip.bin", "SCSI READ TOC/PMA/ATIP",
+                                 scsiInfo.Atip);
+
+                if(scsiInfo.DecodedAtip != null)
+                    AaruConsole.WriteLine("[bold]ATIP:[/]\n{0}",
+                                          Markup.Escape(ATIP.Prettify(scsiInfo.DecodedAtip)));
+            }
+
+            if(scsiInfo.DiscInformation != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_readdiscinformation_000b.bin",
+                                 "SCSI READ DISC INFORMATION", scsiInfo.DiscInformation);
+
+                if(scsiInfo.DecodedDiscInformation.HasValue)
+                    AaruConsole.WriteLine("[bold]Standard Disc Information:[/]\n{0}",
+                                          Markup.Escape(DiscInformation.
+                                                            Prettify000b(scsiInfo.DecodedDiscInformation)));
+            }
+
+            if(scsiInfo.Session != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_session.bin", "SCSI READ TOC/PMA/ATIP",
+                                 scsiInfo.Session);
+
+                if(scsiInfo.DecodedSession.HasValue)
+                    AaruConsole.WriteLine("[bold]Session information:[/]\n{0}",
+                                          Markup.Escape(Session.Prettify(scsiInfo.DecodedSession)));
+            }
+
+            if(scsiInfo.RawToc != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_rawtoc.bin", "SCSI READ TOC/PMA/ATIP",
+                                 scsiInfo.RawToc);
+
+                if(scsiInfo.FullToc.HasValue)
+                    AaruConsole.WriteLine("[bold]Raw TOC:[/]\n{0}",
+                                          Markup.Escape(FullTOC.Prettify(scsiInfo.RawToc)));
+            }
+
+            if(scsiInfo.Pma != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_pma.bin", "SCSI READ TOC/PMA/ATIP",
+                                 scsiInfo.Pma);
+
+                AaruConsole.WriteLine("[bold]PMA:\n[/]{0}", Markup.Escape(PMA.Prettify(scsiInfo.Pma)));
+            }
+
+            if(scsiInfo.CdTextLeadIn != null)
+            {
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_cdtext.bin", "SCSI READ TOC/PMA/ATIP",
+                                 scsiInfo.CdTextLeadIn);
+
+                if(scsiInfo.DecodedCdTextLeadIn.HasValue)
+                    AaruConsole.WriteLine("[bold]CD-TEXT on Lead-In:[/]\n{0}",
+                                          Markup.Escape(CDTextOnLeadIn.Prettify(scsiInfo.DecodedCdTextLeadIn)));
+            }
+
+            if(!string.IsNullOrEmpty(scsiInfo.Mcn))
+                AaruConsole.WriteLine("[bold]MCN:[/] {0}", Markup.Escape(scsiInfo.Mcn));
+
+            if(scsiInfo.Isrcs != null)
+                foreach(KeyValuePair<byte, string> isrc in scsiInfo.Isrcs)
+                    AaruConsole.WriteLine("[bold]Track's {0} ISRC:[/] {1}", isrc.Key, Markup.Escape(isrc.Value));
+
+            if(scsiInfo.XboxSecuritySector != null)
+                DataFile.WriteTo("Media-Info command", outputPrefix, "_xbox_ss.bin", "KREON EXTRACT SS",
+                                 scsiInfo.XboxSecuritySector);
+
+            if(scsiInfo.DecodedXboxSecuritySector.HasValue)
+                AaruConsole.WriteLine("[bold]Xbox Security Sector:[/]\n{0}",
+                                      Markup.Escape(SS.Prettify(scsiInfo.DecodedXboxSecuritySector)));
+
+            if(scsiInfo.XgdInfo != null)
+            {
+                AaruConsole.WriteLine("[bold]Video layer 0 size:[/] {0} sectors", scsiInfo.XgdInfo.L0Video);
+                AaruConsole.WriteLine("[bold]Video layer 1 size:[/] {0} sectors", scsiInfo.XgdInfo.L1Video);
+                AaruConsole.WriteLine("[bold]Middle zone size:[/] {0} sectors", scsiInfo.XgdInfo.MiddleZone);
+                AaruConsole.WriteLine("[bold]Game data size:[/] {0} sectors", scsiInfo.XgdInfo.GameSize);
+                AaruConsole.WriteLine("[bold]Total size:[/] {0} sectors", scsiInfo.XgdInfo.TotalSize);
+                AaruConsole.WriteLine("[bold]Real layer break:[/] {0}", scsiInfo.XgdInfo.LayerBreak);
                 AaruConsole.WriteLine();
             }
+        }
 
-            AaruConsole.WriteLine("[bold]Media identified as [italic]{0}[/][/]", scsiInfo.MediaType);
-            Statistics.AddMedia(scsiInfo.MediaType, true);
+        if(scsiInfo.MediaSerialNumber != null)
+        {
+            DataFile.WriteTo("Media-Info command", outputPrefix, "_mediaserialnumber.bin",
+                             "SCSI READ MEDIA SERIAL NUMBER", scsiInfo.MediaSerialNumber);
 
-            if(scsiInfo.Toc    != null ||
-               scsiInfo.RawToc != null)
+            AaruConsole.Write("[bold]Media Serial Number:[/] ");
+
+            for(int i = 4; i < scsiInfo.MediaSerialNumber.Length; i++)
+                AaruConsole.Write("{0:X2}", scsiInfo.MediaSerialNumber[i]);
+
+            AaruConsole.WriteLine();
+        }
+
+        AaruConsole.WriteLine("[bold]Media identified as [italic]{0}[/][/]", scsiInfo.MediaType);
+        Statistics.AddMedia(scsiInfo.MediaType, true);
+
+        if(scsiInfo.Toc    != null ||
+           scsiInfo.RawToc != null)
+        {
+            Track[] tracks = Dump.GetCdTracks(dev, null, false, out long lastSector, null, null, null, out _, null,
+                                              null);
+
+            if(tracks != null)
             {
-                Track[] tracks = Dump.GetCdTracks(dev, null, false, out long lastSector, null, null, null, out _, null,
-                                                  null);
+                uint firstLba = (uint)tracks.Min(t => t.StartSector);
 
-                if(tracks != null)
+                bool supportsPqSubchannel = Dump.SupportsPqSubchannel(dev, null, null, firstLba);
+                bool supportsRwSubchannel = Dump.SupportsRwSubchannel(dev, null, null, firstLba);
+
+                // Open main database
+                var ctx = AaruContext.Create(Settings.Settings.MainDbPath);
+
+                // Search for device in main database
+                Aaru.Database.Models.Device dbDev =
+                    ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
+                                                    d.Revision     == dev.FirmwareRevision);
+
+                Dump.SolveTrackPregaps(dev, null, null, tracks, supportsPqSubchannel, supportsRwSubchannel, dbDev,
+                                       out bool inexactPositioning, false);
+
+                for(int t = 1; t < tracks.Length; t++)
+                    tracks[t - 1].EndSector = tracks[t].StartSector - 1;
+
+                tracks[^1].EndSector = (ulong)lastSector;
+
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("[bold]Track calculations:[/]");
+
+                if(inexactPositioning)
+                    AaruConsole.
+                        WriteLine("[yellow]WARNING: The drive has returned incorrect Q positioning when calculating pregaps. A best effort has been tried but they may be incorrect.[/]");
+
+                if(firstLba > 0)
+                    AaruConsole.WriteLine("Hidden track starts at LBA {0}, ends at LBA {1}", 0, firstLba - 1);
+
+                foreach(Track track in tracks)
+                    AaruConsole.
+                        WriteLine("Track {0} starts at LBA {1}, ends at LBA {2}, has a pregap of {3} sectors and is of type {4}",
+                                  track.Sequence, track.StartSector, track.EndSector, track.Pregap, track.Type);
+
+                AaruConsole.WriteLine();
+                AaruConsole.WriteLine("[bold]Offsets:[/]");
+
+                // Search for read offset in main database
+                CdOffset cdOffset =
+                    ctx.CdOffsets.FirstOrDefault(d => (d.Manufacturer == dev.Manufacturer ||
+                                                       d.Manufacturer == dev.Manufacturer.Replace('/', '-')) &&
+                                                      (d.Model == dev.Model ||
+                                                       d.Model == dev.Model.Replace('/', '-')));
+
+                CompactDisc.GetOffset(cdOffset, dbDev, debug, dev, scsiInfo.MediaType, null, tracks, null,
+                                      out int? driveOffset, out int? combinedOffset, out _);
+
+                if(combinedOffset is null)
                 {
-                    uint firstLba = (uint)tracks.Min(t => t.StartSector);
-
-                    bool supportsPqSubchannel = Dump.SupportsPqSubchannel(dev, null, null, firstLba);
-                    bool supportsRwSubchannel = Dump.SupportsRwSubchannel(dev, null, null, firstLba);
-
-                    // Open main database
-                    var ctx = AaruContext.Create(Settings.Settings.MainDbPath);
-
-                    // Search for device in main database
-                    Aaru.Database.Models.Device dbDev =
-                        ctx.Devices.FirstOrDefault(d => d.Manufacturer == dev.Manufacturer && d.Model == dev.Model &&
-                                                        d.Revision     == dev.FirmwareRevision);
-
-                    Dump.SolveTrackPregaps(dev, null, null, tracks, supportsPqSubchannel, supportsRwSubchannel, dbDev,
-                                           out bool inexactPositioning, false);
-
-                    for(int t = 1; t < tracks.Length; t++)
-                        tracks[t - 1].EndSector = tracks[t].StartSector - 1;
-
-                    tracks[^1].EndSector = (ulong)lastSector;
-
-                    AaruConsole.WriteLine();
-                    AaruConsole.WriteLine("[bold]Track calculations:[/]");
-
-                    if(inexactPositioning)
-                        AaruConsole.
-                            WriteLine("[yellow]WARNING: The drive has returned incorrect Q positioning when calculating pregaps. A best effort has been tried but they may be incorrect.[/]");
-
-                    if(firstLba > 0)
-                        AaruConsole.WriteLine("Hidden track starts at LBA {0}, ends at LBA {1}", 0, firstLba - 1);
-
-                    foreach(Track track in tracks)
-                        AaruConsole.
-                            WriteLine("Track {0} starts at LBA {1}, ends at LBA {2}, has a pregap of {3} sectors and is of type {4}",
-                                      track.Sequence, track.StartSector, track.EndSector, track.Pregap, track.Type);
-
-                    AaruConsole.WriteLine();
-                    AaruConsole.WriteLine("[bold]Offsets:[/]");
-
-                    // Search for read offset in main database
-                    CdOffset cdOffset =
-                        ctx.CdOffsets.FirstOrDefault(d => (d.Manufacturer == dev.Manufacturer ||
-                                                           d.Manufacturer == dev.Manufacturer.Replace('/', '-')) &&
-                                                          (d.Model == dev.Model ||
-                                                           d.Model == dev.Model.Replace('/', '-')));
-
-                    CompactDisc.GetOffset(cdOffset, dbDev, debug, dev, scsiInfo.MediaType, null, tracks, null,
-                                          out int? driveOffset, out int? combinedOffset, out _);
-
-                    if(combinedOffset is null)
+                    if(driveOffset is null)
                     {
-                        if(driveOffset is null)
-                        {
-                            AaruConsole.WriteLine("[red]Drive reading offset not found in database.[/]");
-                            AaruConsole.WriteLine("[red]Disc offset cannot be calculated.[/]");
-                        }
-                        else
-                        {
-                            AaruConsole.
-                                WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
-
-                            AaruConsole.WriteLine("[red]Disc write offset is unknown.[/]");
-                        }
+                        AaruConsole.WriteLine("[red]Drive reading offset not found in database.[/]");
+                        AaruConsole.WriteLine("[red]Disc offset cannot be calculated.[/]");
                     }
                     else
                     {
-                        int offsetBytes = combinedOffset.Value;
+                        AaruConsole.
+                            WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
 
-                        if(driveOffset is null)
-                        {
-                            AaruConsole.WriteLine("[red]Drive reading offset not found in database.[/]");
+                        AaruConsole.WriteLine("[red]Disc write offset is unknown.[/]");
+                    }
+                }
+                else
+                {
+                    int offsetBytes = combinedOffset.Value;
 
-                            AaruConsole.
-                                WriteLine($"Combined disc and drive offset are {offsetBytes} bytes ({offsetBytes / 4} samples).");
-                        }
-                        else
-                        {
-                            AaruConsole.
-                                WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
+                    if(driveOffset is null)
+                    {
+                        AaruConsole.WriteLine("[red]Drive reading offset not found in database.[/]");
 
-                            AaruConsole.
-                                WriteLine($"Combined offset is {offsetBytes} bytes ({offsetBytes / 4} samples)");
+                        AaruConsole.
+                            WriteLine($"Combined disc and drive offset are {offsetBytes} bytes ({offsetBytes / 4} samples).");
+                    }
+                    else
+                    {
+                        AaruConsole.
+                            WriteLine($"Drive reading offset is {driveOffset} bytes ({driveOffset / 4} samples).");
 
-                            int? discOffset = offsetBytes - driveOffset;
+                        AaruConsole.
+                            WriteLine($"Combined offset is {offsetBytes} bytes ({offsetBytes / 4} samples)");
 
-                            AaruConsole.WriteLine($"Disc offset is {discOffset} bytes ({discOffset / 4} samples)");
-                        }
+                        int? discOffset = offsetBytes - driveOffset;
+
+                        AaruConsole.WriteLine($"Disc offset is {discOffset} bytes ({discOffset / 4} samples)");
                     }
                 }
             }
-
-            dev.Close();
         }
+
+        dev.Close();
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Media/MediaFamily.cs b/Aaru/Commands/Media/MediaFamily.cs
index 5f8b5adcc..7b5a2628c 100644
--- a/Aaru/Commands/Media/MediaFamily.cs
+++ b/Aaru/Commands/Media/MediaFamily.cs
@@ -32,17 +32,16 @@
 
 using System.CommandLine;
 
-namespace Aaru.Commands.Media
-{
-    internal sealed class MediaFamily : Command
-    {
-        public MediaFamily() : base("media", "Commands to manage media inserted in devices")
-        {
-            AddAlias("m");
+namespace Aaru.Commands.Media;
 
-            AddCommand(new DumpMediaCommand());
-            AddCommand(new MediaInfoCommand());
-            AddCommand(new MediaScanCommand());
-        }
+internal sealed class MediaFamily : Command
+{
+    public MediaFamily() : base("media", "Commands to manage media inserted in devices")
+    {
+        AddAlias("m");
+
+        AddCommand(new DumpMediaCommand());
+        AddCommand(new MediaInfoCommand());
+        AddCommand(new MediaScanCommand());
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Media/Scan.cs b/Aaru/Commands/Media/Scan.cs
index 4dbed83f5..5cea7ff41 100644
--- a/Aaru/Commands/Media/Scan.cs
+++ b/Aaru/Commands/Media/Scan.cs
@@ -39,215 +39,214 @@ using Aaru.Core.Devices.Scanning;
 using Aaru.Devices;
 using Spectre.Console;
 
-namespace Aaru.Commands.Media
+namespace Aaru.Commands.Media;
+
+internal sealed class MediaScanCommand : Command
 {
-    internal sealed class MediaScanCommand : Command
+    static ProgressTask _progressTask1;
+
+    public MediaScanCommand() : base("scan", "Scans the media inserted on a device.")
     {
-        static ProgressTask _progressTask1;
-
-        public MediaScanCommand() : base("scan", "Scans the media inserted on a device.")
-        {
-            Add(new Option(new[]
-                {
-                    "--mhdd-log", "-m"
-                }, "Write a log of the scan in the format used by MHDD.")
-                {
-                    Argument = new Argument<string>(() => null),
-                    Required = false
-                });
-
-            Add(new Option(new[]
-                {
-                    "--ibg-log", "-b"
-                }, "Write a log of the scan in the format used by ImgBurn.")
-                {
-                    Argument = new Argument<string>(() => null),
-                    Required = false
-                });
-
-            Add(new Option(new[]
-                {
-                    "--use-buffered-reads"
-                }, "For MMC/SD, use OS buffered reads if CMD23 is not supported.")
-                {
-                    Argument = new Argument<bool>(() => true),
-                    Required = false
-                });
-
-            AddArgument(new Argument<string>
+        Add(new Option(new[]
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "Device path",
-                Name        = "device-path"
+                "--mhdd-log", "-m"
+            }, "Write a log of the scan in the format used by MHDD.")
+            {
+                Argument = new Argument<string>(() => null),
+                Required = false
             });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+        Add(new Option(new[]
+            {
+                "--ibg-log", "-b"
+            }, "Write a log of the scan in the format used by ImgBurn.")
+            {
+                Argument = new Argument<string>(() => null),
+                Required = false
+            });
+
+        Add(new Option(new[]
+            {
+                "--use-buffered-reads"
+            }, "For MMC/SD, use OS buffered reads if CMD23 is not supported.")
+            {
+                Argument = new Argument<bool>(() => true),
+                Required = false
+            });
+
+        AddArgument(new Argument<string>
+        {
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "Device path",
+            Name        = "device-path"
+        });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, string devicePath, string ibgLog, string mhddLog,
+                             bool useBufferedReads)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
+            {
+                Out = new AnsiConsoleOutput(System.Console.Error)
+            });
+
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, string devicePath, string ibgLog, string mhddLog,
-                                 bool useBufferedReads)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        Statistics.AddCommand("media-scan");
+
+        AaruConsole.DebugWriteLine("Media-Scan command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Media-Scan command", "--device={0}", devicePath);
+        AaruConsole.DebugWriteLine("Media-Scan command", "--ibg-log={0}", ibgLog);
+        AaruConsole.DebugWriteLine("Media-Scan command", "--mhdd-log={0}", mhddLog);
+        AaruConsole.DebugWriteLine("Media-Scan command", "--verbose={0}", verbose);
+        AaruConsole.DebugWriteLine("Media-Scan command", "--use-buffered-reads={0}", useBufferedReads);
+
+        if(devicePath.Length == 2   &&
+           devicePath[1]     == ':' &&
+           devicePath[0]     != '/' &&
+           char.IsLetter(devicePath[0]))
+            devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
+
+        Devices.Device dev = null;
+
+        try
         {
-            MainClass.PrintCopyright();
-
-            if(debug)
+            Core.Spectre.ProgressSingleSpinner(ctx =>
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                ctx.AddTask("Opening device...").IsIndeterminate();
+                dev = new Devices.Device(devicePath);
+            });
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
+            if(dev.IsRemote)
+                Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
+                                     dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
 
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
-
-            Statistics.AddCommand("media-scan");
-
-            AaruConsole.DebugWriteLine("Media-Scan command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Media-Scan command", "--device={0}", devicePath);
-            AaruConsole.DebugWriteLine("Media-Scan command", "--ibg-log={0}", ibgLog);
-            AaruConsole.DebugWriteLine("Media-Scan command", "--mhdd-log={0}", mhddLog);
-            AaruConsole.DebugWriteLine("Media-Scan command", "--verbose={0}", verbose);
-            AaruConsole.DebugWriteLine("Media-Scan command", "--use-buffered-reads={0}", useBufferedReads);
-
-            if(devicePath.Length == 2   &&
-               devicePath[1]     == ':' &&
-               devicePath[0]     != '/' &&
-               char.IsLetter(devicePath[0]))
-                devicePath = "\\\\.\\" + char.ToUpper(devicePath[0]) + ':';
-
-            Devices.Device dev = null;
-
-            try
+            if(dev.Error)
             {
-                Core.Spectre.ProgressSingleSpinner(ctx =>
-                {
-                    ctx.AddTask("Opening device...").IsIndeterminate();
-                    dev = new Devices.Device(devicePath);
-                });
-
-                if(dev.IsRemote)
-                    Statistics.AddRemote(dev.RemoteApplication, dev.RemoteVersion, dev.RemoteOperatingSystem,
-                                         dev.RemoteOperatingSystemVersion, dev.RemoteArchitecture);
-
-                if(dev.Error)
-                {
-                    AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
-
-                    return (int)ErrorNumber.CannotOpenDevice;
-                }
-            }
-            catch(DeviceException e)
-            {
-                AaruConsole.ErrorWriteLine(e.Message);
+                AaruConsole.ErrorWriteLine(Error.Print(dev.LastError));
 
                 return (int)ErrorNumber.CannotOpenDevice;
             }
-
-            Statistics.AddDevice(dev);
-
-            var         scanner = new MediaScan(mhddLog, ibgLog, devicePath, dev, useBufferedReads);
-            ScanResults results = new();
-
-            AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
-                        Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
-                        Start(ctx =>
-                        {
-                            scanner.UpdateStatus += text =>
-                            {
-                                AaruConsole.WriteLine(Markup.Escape(text));
-                            };
-
-                            scanner.StoppingErrorMessage += text =>
-                            {
-                                AaruConsole.ErrorWriteLine($"[red]{Markup.Escape(text)}[/]");
-                            };
-
-                            scanner.UpdateProgress += (text, current, maximum) =>
-                            {
-                                _progressTask1             ??= ctx.AddTask("Progress");
-                                _progressTask1.Description =   Markup.Escape(text);
-                                _progressTask1.Value       =   current;
-                                _progressTask1.MaxValue    =   maximum;
-                            };
-
-                            scanner.PulseProgress += text =>
-                            {
-                                if(_progressTask1 is null)
-                                    ctx.AddTask(Markup.Escape(text)).IsIndeterminate();
-                                else
-                                {
-                                    _progressTask1.Description     = Markup.Escape(text);
-                                    _progressTask1.IsIndeterminate = true;
-                                }
-                            };
-
-                            scanner.InitProgress += () =>
-                            {
-                                _progressTask1 = ctx.AddTask("Progress");
-                            };
-
-                            scanner.EndProgress += () =>
-                            {
-                                _progressTask1?.StopTask();
-                                _progressTask1 = null;
-                            };
-
-                            System.Console.CancelKeyPress += (_, e) =>
-                            {
-                                e.Cancel = true;
-                                scanner.Abort();
-                            };
-
-                            results = scanner.Scan();
-                        });
-
-            AaruConsole.WriteLine("Took a total of {0} seconds ({1} processing commands).", results.TotalTime,
-                                  results.ProcessingTime);
-
-            AaruConsole.WriteLine("Average speed: {0:F3} MiB/sec.", results.AvgSpeed);
-            AaruConsole.WriteLine("Fastest speed burst: {0:F3} MiB/sec.", results.MaxSpeed);
-            AaruConsole.WriteLine("Slowest speed burst: {0:F3} MiB/sec.", results.MinSpeed);
-            AaruConsole.WriteLine();
-            AaruConsole.WriteLine("[bold]Summary:[/]");
-            AaruConsole.WriteLine("[lime]{0} sectors took less than 3 ms.[/]", results.A);
-            AaruConsole.WriteLine("[green]{0} sectors took less than 10 ms but more than 3 ms.[/]", results.B);
-            AaruConsole.WriteLine("[darkorange]{0} sectors took less than 50 ms but more than 10 ms.[/]", results.C);
-            AaruConsole.WriteLine("[olive]{0} sectors took less than 150 ms but more than 50 ms.[/]", results.D);
-            AaruConsole.WriteLine("[orange3]{0} sectors took less than 500 ms but more than 150 ms.[/]", results.E);
-            AaruConsole.WriteLine("[red]{0} sectors took more than 500 ms.[/]", results.F);
-            AaruConsole.WriteLine("[maroon]{0} sectors could not be read.[/]", results.UnreadableSectors.Count);
-
-            if(results.UnreadableSectors.Count > 0)
-                foreach(ulong bad in results.UnreadableSectors)
-                    AaruConsole.WriteLine("Sector {0} could not be read", bad);
-
-            AaruConsole.WriteLine();
-
-            if(results.SeekTotal > 0               ||
-               results.SeekMin   < double.MaxValue ||
-               results.SeekMax   > double.MinValue)
-
-                AaruConsole.
-                    WriteLine("Testing {0} seeks, longest seek took {1:F3} ms, fastest one took {2:F3} ms. ({3:F3} ms average)",
-                              results.SeekTimes, results.SeekMax, results.SeekMin, results.SeekTotal / 1000);
-
-            dev.Close();
-
-            return (int)ErrorNumber.NoError;
         }
+        catch(DeviceException e)
+        {
+            AaruConsole.ErrorWriteLine(e.Message);
+
+            return (int)ErrorNumber.CannotOpenDevice;
+        }
+
+        Statistics.AddDevice(dev);
+
+        var         scanner = new MediaScan(mhddLog, ibgLog, devicePath, dev, useBufferedReads);
+        ScanResults results = new();
+
+        AnsiConsole.Progress().AutoClear(true).HideCompleted(true).
+                    Columns(new TaskDescriptionColumn(), new ProgressBarColumn(), new PercentageColumn()).
+                    Start(ctx =>
+                    {
+                        scanner.UpdateStatus += text =>
+                        {
+                            AaruConsole.WriteLine(Markup.Escape(text));
+                        };
+
+                        scanner.StoppingErrorMessage += text =>
+                        {
+                            AaruConsole.ErrorWriteLine($"[red]{Markup.Escape(text)}[/]");
+                        };
+
+                        scanner.UpdateProgress += (text, current, maximum) =>
+                        {
+                            _progressTask1             ??= ctx.AddTask("Progress");
+                            _progressTask1.Description =   Markup.Escape(text);
+                            _progressTask1.Value       =   current;
+                            _progressTask1.MaxValue    =   maximum;
+                        };
+
+                        scanner.PulseProgress += text =>
+                        {
+                            if(_progressTask1 is null)
+                                ctx.AddTask(Markup.Escape(text)).IsIndeterminate();
+                            else
+                            {
+                                _progressTask1.Description     = Markup.Escape(text);
+                                _progressTask1.IsIndeterminate = true;
+                            }
+                        };
+
+                        scanner.InitProgress += () =>
+                        {
+                            _progressTask1 = ctx.AddTask("Progress");
+                        };
+
+                        scanner.EndProgress += () =>
+                        {
+                            _progressTask1?.StopTask();
+                            _progressTask1 = null;
+                        };
+
+                        System.Console.CancelKeyPress += (_, e) =>
+                        {
+                            e.Cancel = true;
+                            scanner.Abort();
+                        };
+
+                        results = scanner.Scan();
+                    });
+
+        AaruConsole.WriteLine("Took a total of {0} seconds ({1} processing commands).", results.TotalTime,
+                              results.ProcessingTime);
+
+        AaruConsole.WriteLine("Average speed: {0:F3} MiB/sec.", results.AvgSpeed);
+        AaruConsole.WriteLine("Fastest speed burst: {0:F3} MiB/sec.", results.MaxSpeed);
+        AaruConsole.WriteLine("Slowest speed burst: {0:F3} MiB/sec.", results.MinSpeed);
+        AaruConsole.WriteLine();
+        AaruConsole.WriteLine("[bold]Summary:[/]");
+        AaruConsole.WriteLine("[lime]{0} sectors took less than 3 ms.[/]", results.A);
+        AaruConsole.WriteLine("[green]{0} sectors took less than 10 ms but more than 3 ms.[/]", results.B);
+        AaruConsole.WriteLine("[darkorange]{0} sectors took less than 50 ms but more than 10 ms.[/]", results.C);
+        AaruConsole.WriteLine("[olive]{0} sectors took less than 150 ms but more than 50 ms.[/]", results.D);
+        AaruConsole.WriteLine("[orange3]{0} sectors took less than 500 ms but more than 150 ms.[/]", results.E);
+        AaruConsole.WriteLine("[red]{0} sectors took more than 500 ms.[/]", results.F);
+        AaruConsole.WriteLine("[maroon]{0} sectors could not be read.[/]", results.UnreadableSectors.Count);
+
+        if(results.UnreadableSectors.Count > 0)
+            foreach(ulong bad in results.UnreadableSectors)
+                AaruConsole.WriteLine("Sector {0} could not be read", bad);
+
+        AaruConsole.WriteLine();
+
+        if(results.SeekTotal > 0               ||
+           results.SeekMin   < double.MaxValue ||
+           results.SeekMax   > double.MinValue)
+
+            AaruConsole.
+                WriteLine("Testing {0} seeks, longest seek took {1:F3} ms, fastest one took {2:F3} ms. ({3:F3} ms average)",
+                          results.SeekTimes, results.SeekMax, results.SeekMin, results.SeekTotal / 1000);
+
+        dev.Close();
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Commands/Remote.cs b/Aaru/Commands/Remote.cs
index 3b8340e7d..048a152b2 100644
--- a/Aaru/Commands/Remote.cs
+++ b/Aaru/Commands/Remote.cs
@@ -41,91 +41,90 @@ using Aaru.Core;
 using Spectre.Console;
 using Remote = Aaru.Devices.Remote.Remote;
 
-namespace Aaru.Commands
+namespace Aaru.Commands;
+
+internal sealed class RemoteCommand : Command
 {
-    internal sealed class RemoteCommand : Command
+    public RemoteCommand() : base("remote", "Tests connection to a Aaru Remote Server.")
     {
-        public RemoteCommand() : base("remote", "Tests connection to a Aaru Remote Server.")
+        AddArgument(new Argument<string>
         {
-            AddArgument(new Argument<string>
+            Arity       = ArgumentArity.ExactlyOne,
+            Description = "aaru host",
+            Name        = "host"
+        });
+
+        Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+    }
+
+    public static int Invoke(bool debug, bool verbose, string host)
+    {
+        MainClass.PrintCopyright();
+
+        if(debug)
+        {
+            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
             {
-                Arity       = ArgumentArity.ExactlyOne,
-                Description = "aaru host",
-                Name        = "host"
+                Out = new AnsiConsoleOutput(System.Console.Error)
             });
 
-            Handler = CommandHandler.Create(GetType().GetMethod(nameof(Invoke)));
+            AaruConsole.DebugWriteLineEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    stderrConsole.MarkupLine(format);
+                else
+                    stderrConsole.MarkupLine(format, objects);
+            };
         }
 
-        public static int Invoke(bool debug, bool verbose, string host)
+        if(verbose)
+            AaruConsole.WriteEvent += (format, objects) =>
+            {
+                if(objects is null)
+                    AnsiConsole.Markup(format);
+                else
+                    AnsiConsole.Markup(format, objects);
+            };
+
+        Statistics.AddCommand("remote");
+
+        AaruConsole.DebugWriteLine("Remote command", "--debug={0}", debug);
+        AaruConsole.DebugWriteLine("Remote command", "--host={0}", host);
+        AaruConsole.DebugWriteLine("Remote command", "--verbose={0}", verbose);
+
+        try
         {
-            MainClass.PrintCopyright();
+            var remote = new Remote(new Uri(host));
 
-            if(debug)
+            Statistics.AddRemote(remote.ServerApplication, remote.ServerVersion, remote.ServerOperatingSystem,
+                                 remote.ServerOperatingSystemVersion, remote.ServerArchitecture);
+
+            Table table = new()
             {
-                IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
-                {
-                    Out = new AnsiConsoleOutput(System.Console.Error)
-                });
+                Title = new TableTitle("Server information")
+            };
 
-                AaruConsole.DebugWriteLineEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        stderrConsole.MarkupLine(format);
-                    else
-                        stderrConsole.MarkupLine(format, objects);
-                };
-            }
+            table.AddColumn("");
+            table.AddColumn("");
+            table.Columns[0].RightAligned();
 
-            if(verbose)
-                AaruConsole.WriteEvent += (format, objects) =>
-                {
-                    if(objects is null)
-                        AnsiConsole.Markup(format);
-                    else
-                        AnsiConsole.Markup(format, objects);
-                };
+            table.AddRow("Server application", $"{remote.ServerApplication} {remote.ServerVersion}");
 
-            Statistics.AddCommand("remote");
+            table.AddRow("Server operating system",
+                         $"{remote.ServerOperatingSystem} {remote.ServerOperatingSystemVersion} ({remote.ServerArchitecture})");
 
-            AaruConsole.DebugWriteLine("Remote command", "--debug={0}", debug);
-            AaruConsole.DebugWriteLine("Remote command", "--host={0}", host);
-            AaruConsole.DebugWriteLine("Remote command", "--verbose={0}", verbose);
+            table.AddRow("Server maximum protocol", $"{remote.ServerProtocolVersion}");
 
-            try
-            {
-                var remote = new Remote(new Uri(host));
-
-                Statistics.AddRemote(remote.ServerApplication, remote.ServerVersion, remote.ServerOperatingSystem,
-                                     remote.ServerOperatingSystemVersion, remote.ServerArchitecture);
-
-                Table table = new()
-                {
-                    Title = new TableTitle("Server information")
-                };
-
-                table.AddColumn("");
-                table.AddColumn("");
-                table.Columns[0].RightAligned();
-
-                table.AddRow("Server application", $"{remote.ServerApplication} {remote.ServerVersion}");
-
-                table.AddRow("Server operating system",
-                             $"{remote.ServerOperatingSystem} {remote.ServerOperatingSystemVersion} ({remote.ServerArchitecture})");
-
-                table.AddRow("Server maximum protocol", $"{remote.ServerProtocolVersion}");
-
-                AnsiConsole.Render(table);
-                remote.Disconnect();
-            }
-            catch(Exception)
-            {
-                AaruConsole.ErrorWriteLine("Error connecting to host.");
-
-                return (int)ErrorNumber.CannotOpenDevice;
-            }
-
-            return (int)ErrorNumber.NoError;
+            AnsiConsole.Render(table);
+            remote.Disconnect();
         }
+        catch(Exception)
+        {
+            AaruConsole.ErrorWriteLine("Error connecting to host.");
+
+            return (int)ErrorNumber.CannotOpenDevice;
+        }
+
+        return (int)ErrorNumber.NoError;
     }
 }
\ No newline at end of file
diff --git a/Aaru/Main.cs b/Aaru/Main.cs
index 2359d987d..62b7fb1d3 100644
--- a/Aaru/Main.cs
+++ b/Aaru/Main.cs
@@ -53,219 +53,218 @@ using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Spectre.Console;
 
-namespace Aaru
+namespace Aaru;
+
+internal class MainClass
 {
-    internal class MainClass
+    static string                                _assemblyCopyright;
+    static string                                _assemblyTitle;
+    static AssemblyInformationalVersionAttribute _assemblyVersion;
+
+    public static int Main([NotNull] string[] args)
     {
-        static string                                _assemblyCopyright;
-        static string                                _assemblyTitle;
-        static AssemblyInformationalVersionAttribute _assemblyVersion;
-
-        public static int Main([NotNull] string[] args)
+        IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
         {
-            IAnsiConsole stderrConsole = AnsiConsole.Create(new AnsiConsoleSettings
+            Out = new AnsiConsoleOutput(System.Console.Error)
+        });
+
+        object[] attributes = typeof(MainClass).Assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false);
+        _assemblyTitle = ((AssemblyTitleAttribute)attributes[0]).Title;
+        attributes     = typeof(MainClass).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
+
+        _assemblyVersion =
+            Attribute.GetCustomAttribute(typeof(MainClass).Assembly, typeof(AssemblyInformationalVersionAttribute))
+                as AssemblyInformationalVersionAttribute;
+
+        _assemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
+
+        if(args.Length                == 1 &&
+           args[0].ToLowerInvariant() == "gui")
+        {
+            return Gui.Main.Start(args);
+        }
+
+        AaruConsole.WriteLineEvent += (format, objects) =>
+        {
+            if(objects is null)
+                AnsiConsole.MarkupLine(format);
+            else
+                AnsiConsole.MarkupLine(format, objects);
+        };
+
+        AaruConsole.WriteEvent += (format, objects) =>
+        {
+            if(objects is null)
+                AnsiConsole.Markup(format);
+            else
+                AnsiConsole.Markup(format, objects);
+        };
+
+        AaruConsole.ErrorWriteLineEvent += (format, objects) =>
+        {
+            if(objects is null)
+                stderrConsole.MarkupLine(format);
+            else
+                stderrConsole.MarkupLine(format, objects);
+        };
+
+        Settings.Settings.LoadSettings();
+
+        AaruContext ctx =null;
+
+        try
+        {
+            ctx = AaruContext.Create(Settings.Settings.LocalDbPath, false);
+            ctx.Database.Migrate();
+        }
+        catch(NotSupportedException)
+        {
+            try
             {
-                Out = new AnsiConsoleOutput(System.Console.Error)
-            });
-
-            object[] attributes = typeof(MainClass).Assembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false);
-            _assemblyTitle = ((AssemblyTitleAttribute)attributes[0]).Title;
-            attributes     = typeof(MainClass).Assembly.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
-
-            _assemblyVersion =
-                Attribute.GetCustomAttribute(typeof(MainClass).Assembly, typeof(AssemblyInformationalVersionAttribute))
-                    as AssemblyInformationalVersionAttribute;
-
-            _assemblyCopyright = ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
-
-            if(args.Length                == 1 &&
-               args[0].ToLowerInvariant() == "gui")
+                ctx?.Database.CloseConnection();
+                ctx?.Dispose();
+            }
+            catch(Exception)
             {
-                return Gui.Main.Start(args);
+                // Should not ever arrive here, but if it does, keep trying to replace it anyway
             }
 
-            AaruConsole.WriteLineEvent += (format, objects) =>
+            File.Delete(Settings.Settings.LocalDbPath);
+            ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
+            ctx.Database.EnsureCreated();
+
+            ctx.Database.
+                ExecuteSqlRaw("CREATE TABLE IF NOT EXISTS \"__EFMigrationsHistory\" (\"MigrationId\" TEXT PRIMARY KEY, \"ProductVersion\" TEXT)");
+
+            foreach(string migration in ctx.Database.GetPendingMigrations())
             {
-                if(objects is null)
-                    AnsiConsole.MarkupLine(format);
-                else
-                    AnsiConsole.MarkupLine(format, objects);
-            };
+                ctx.Database.
+                    ExecuteSqlRaw($"INSERT INTO \"__EFMigrationsHistory\" (MigrationId, ProductVersion) VALUES ('{migration}', '0.0.0')");
+            }
 
-            AaruConsole.WriteEvent += (format, objects) =>
-            {
-                if(objects is null)
-                    AnsiConsole.Markup(format);
-                else
-                    AnsiConsole.Markup(format, objects);
-            };
+            ctx.SaveChanges();
+        }
 
-            AaruConsole.ErrorWriteLineEvent += (format, objects) =>
-            {
-                if(objects is null)
-                    stderrConsole.MarkupLine(format);
-                else
-                    stderrConsole.MarkupLine(format, objects);
-            };
+        // Remove duplicates
+        foreach(var duplicate in ctx.SeenDevices.AsEnumerable()!.GroupBy(a => new
+                {
+                    a.Manufacturer,
+                    a.Model,
+                    a.Revision,
+                    a.Bus
+                }).Where(a => a.Count() > 1).Distinct().Select(a => a.Key))
+            ctx.RemoveRange(ctx.SeenDevices!.
+                                Where(d => d.Manufacturer == duplicate.Manufacturer && d.Model == duplicate.Model &&
+                                           d.Revision     == duplicate.Revision     && d.Bus == duplicate.Bus).Skip(1));
 
-            Settings.Settings.LoadSettings();
+        // Remove nulls
+        ctx.RemoveRange(ctx.SeenDevices!.Where(d => d.Manufacturer == null && d.Model == null &&
+                                                    d.Revision     == null));
 
-            AaruContext ctx=null;
+        ctx.SaveChanges();
+
+        bool mainDbUpdate = false;
+
+        if(!File.Exists(Settings.Settings.MainDbPath))
+        {
+            mainDbUpdate = true;
+            UpdateCommand.DoUpdate(true);
+        }
+
+        var mainContext = AaruContext.Create(Settings.Settings.MainDbPath, false);
+
+        if(mainContext.Database.GetPendingMigrations().Any())
+        {
+            AaruConsole.WriteLine("New database version, updating...");
 
             try
             {
-                ctx = AaruContext.Create(Settings.Settings.LocalDbPath, false);
-                ctx.Database.Migrate();
+                File.Delete(Settings.Settings.MainDbPath);
             }
-            catch(NotSupportedException)
+            catch(Exception)
             {
-                try
-                {
-                    ctx?.Database.CloseConnection();
-                    ctx?.Dispose();
-                }
-                catch(Exception)
-                {
-                    // Should not ever arrive here, but if it does, keep trying to replace it anyway
-                }
+                AaruConsole.ErrorWriteLine("Exception trying to remove old database version, cannot continue...");
+                AaruConsole.ErrorWriteLine("Please manually remove file at {0}", Settings.Settings.MainDbPath);
 
-                File.Delete(Settings.Settings.LocalDbPath);
-                ctx = AaruContext.Create(Settings.Settings.LocalDbPath);
-                ctx.Database.EnsureCreated();
-
-                ctx.Database.
-                    ExecuteSqlRaw("CREATE TABLE IF NOT EXISTS \"__EFMigrationsHistory\" (\"MigrationId\" TEXT PRIMARY KEY, \"ProductVersion\" TEXT)");
-
-                foreach(string migration in ctx.Database.GetPendingMigrations())
-                {
-                    ctx.Database.
-                        ExecuteSqlRaw($"INSERT INTO \"__EFMigrationsHistory\" (MigrationId, ProductVersion) VALUES ('{migration}', '0.0.0')");
-                }
-
-                ctx.SaveChanges();
+                return (int)ErrorNumber.CannotRemoveDatabase;
             }
 
-            // Remove duplicates
-            foreach(var duplicate in ctx.SeenDevices.AsEnumerable()!.GroupBy(a => new
-            {
-                a.Manufacturer,
-                a.Model,
-                a.Revision,
-                a.Bus
-            }).Where(a => a.Count() > 1).Distinct().Select(a => a.Key))
-                ctx.RemoveRange(ctx.SeenDevices!.
-                                    Where(d => d.Manufacturer == duplicate.Manufacturer && d.Model == duplicate.Model &&
-                                               d.Revision     == duplicate.Revision && d.Bus == duplicate.Bus).Skip(1));
+            mainContext.Database.CloseConnection();
+            mainContext.Dispose();
+            UpdateCommand.DoUpdate(true);
+        }
 
-            // Remove nulls
-            ctx.RemoveRange(ctx.SeenDevices!.Where(d => d.Manufacturer == null && d.Model == null &&
-                                                        d.Revision     == null));
+        // GDPR level compliance does not match and there are no arguments or the arguments are neither GUI neither configure.
+        if(Settings.Settings.Current.GdprCompliance < DicSettings.GDPR_LEVEL &&
+           (args.Length < 1 || (args.Length                >= 1 && args[0].ToLowerInvariant() != "gui" &&
+                                args[0].ToLowerInvariant() != "configure")))
+            new ConfigureCommand().DoConfigure(true);
 
-            ctx.SaveChanges();
+        Statistics.LoadStats();
 
-            bool mainDbUpdate = false;
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 
-            if(!File.Exists(Settings.Settings.MainDbPath))
-            {
-                mainDbUpdate = true;
-                UpdateCommand.DoUpdate(true);
-            }
+        var rootCommand = new RootCommand();
 
-            var mainContext = AaruContext.Create(Settings.Settings.MainDbPath, false);
+        rootCommand.AddGlobalOption(new Option(new[]
+                                    {
+                                        "--verbose", "-v"
+                                    }, "Shows verbose output.")
+                                    {
+                                        Argument = new Argument<bool>(() => false)
+                                    });
 
-            if(mainContext.Database.GetPendingMigrations().Any())
-            {
-                AaruConsole.WriteLine("New database version, updating...");
+        rootCommand.AddGlobalOption(new Option(new[]
+                                    {
+                                        "--debug", "-d"
+                                    }, "Shows debug output from plugins.")
+                                    {
+                                        Argument = new Argument<bool>(() => false)
+                                    });
 
-                try
-                {
-                    File.Delete(Settings.Settings.MainDbPath);
-                }
-                catch(Exception)
-                {
-                    AaruConsole.ErrorWriteLine("Exception trying to remove old database version, cannot continue...");
-                    AaruConsole.ErrorWriteLine("Please manually remove file at {0}", Settings.Settings.MainDbPath);
+        rootCommand.AddGlobalOption(new Option(new[]
+                                    {
+                                        "--pause"
+                                    }, "Pauses before exiting.")
+                                    {
+                                        Argument = new Argument<bool>(() => false)
+                                    });
 
-                    return (int)ErrorNumber.CannotRemoveDatabase;
-                }
+        rootCommand.Description =
+            $"{_assemblyTitle} {_assemblyVersion?.InformationalVersion}\n{_assemblyCopyright}";
 
-                mainContext.Database.CloseConnection();
-                mainContext.Dispose();
-                UpdateCommand.DoUpdate(true);
-            }
+        rootCommand.AddCommand(new DatabaseFamily(mainDbUpdate));
+        rootCommand.AddCommand(new DeviceFamily());
+        rootCommand.AddCommand(new FilesystemFamily());
+        rootCommand.AddCommand(new ImageFamily());
+        rootCommand.AddCommand(new MediaFamily());
+        rootCommand.AddCommand(new ArchiveFamily());
 
-            // GDPR level compliance does not match and there are no arguments or the arguments are neither GUI neither configure.
-            if(Settings.Settings.Current.GdprCompliance < DicSettings.GDPR_LEVEL &&
-               (args.Length < 1 || (args.Length                >= 1 && args[0].ToLowerInvariant() != "gui" &&
-                                    args[0].ToLowerInvariant() != "configure")))
-                new ConfigureCommand().DoConfigure(true);
+        rootCommand.AddCommand(new ConfigureCommand());
+        rootCommand.AddCommand(new FormatsCommand());
+        rootCommand.AddCommand(new ListEncodingsCommand());
+        rootCommand.AddCommand(new ListNamespacesCommand());
+        rootCommand.AddCommand(new RemoteCommand());
 
-            Statistics.LoadStats();
+        int ret = rootCommand.Invoke(args);
 
-            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
-
-            var rootCommand = new RootCommand();
-
-            rootCommand.AddGlobalOption(new Option(new[]
-                                        {
-                                            "--verbose", "-v"
-                                        }, "Shows verbose output.")
-                                        {
-                                            Argument = new Argument<bool>(() => false)
-                                        });
-
-            rootCommand.AddGlobalOption(new Option(new[]
-                                        {
-                                            "--debug", "-d"
-                                        }, "Shows debug output from plugins.")
-                                        {
-                                            Argument = new Argument<bool>(() => false)
-                                        });
-
-            rootCommand.AddGlobalOption(new Option(new[]
-                                        {
-                                            "--pause"
-                                        }, "Pauses before exiting.")
-                                        {
-                                            Argument = new Argument<bool>(() => false)
-                                        });
-
-            rootCommand.Description =
-                $"{_assemblyTitle} {_assemblyVersion?.InformationalVersion}\n{_assemblyCopyright}";
-
-            rootCommand.AddCommand(new DatabaseFamily(mainDbUpdate));
-            rootCommand.AddCommand(new DeviceFamily());
-            rootCommand.AddCommand(new FilesystemFamily());
-            rootCommand.AddCommand(new ImageFamily());
-            rootCommand.AddCommand(new MediaFamily());
-            rootCommand.AddCommand(new ArchiveFamily());
-
-            rootCommand.AddCommand(new ConfigureCommand());
-            rootCommand.AddCommand(new FormatsCommand());
-            rootCommand.AddCommand(new ListEncodingsCommand());
-            rootCommand.AddCommand(new ListNamespacesCommand());
-            rootCommand.AddCommand(new RemoteCommand());
-
-            int ret = rootCommand.Invoke(args);
-
-            Statistics.SaveStats();
-
-            if(rootCommand.Parse(args).RootCommandResult.ValueForOption("--pause")?.Equals(true) != true)
-                return ret;
-
-            AaruConsole.WriteLine("Press any key to exit.");
-            System.Console.ReadKey();
+        Statistics.SaveStats();
 
+        if(rootCommand.Parse(args).RootCommandResult.ValueForOption("--pause")?.Equals(true) != true)
             return ret;
-        }
 
-        internal static void PrintCopyright()
-        {
-            AaruConsole.WriteLine("[bold][red]{0}[/] [green]{1}[/][/]", _assemblyTitle,
-                                  _assemblyVersion?.InformationalVersion);
+        AaruConsole.WriteLine("Press any key to exit.");
+        System.Console.ReadKey();
 
-            AaruConsole.WriteLine("[bold][blue]{0}[/][/]", _assemblyCopyright);
-            AaruConsole.WriteLine();
-        }
+        return ret;
+    }
+
+    internal static void PrintCopyright()
+    {
+        AaruConsole.WriteLine("[bold][red]{0}[/] [green]{1}[/][/]", _assemblyTitle,
+                              _assemblyVersion?.InformationalVersion);
+
+        AaruConsole.WriteLine("[bold][blue]{0}[/][/]", _assemblyCopyright);
+        AaruConsole.WriteLine();
     }
 }
\ No newline at end of file